Skip to content

Commit 9524d5e

Browse files
fresholliefreshollie
committed
various player documentation
1 parent c801fab commit 9524d5e

File tree

29 files changed

+180
-245
lines changed

29 files changed

+180
-245
lines changed

‎asm/non_matching/game/interactables_1/Task_Rotating.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ _0805ED4E:
9797
bl Player_TransitionCancelFlyingAndBoost
9898
adds r0, r5, #0
9999
movs r1, #9
100-
bl Player_SetSpriteOffsetY
100+
bl Player_HandleSpriteYOffsetChange
101101
movs r0, #6
102102
strb r0, [r5, #0x16]
103103
movs r0, #9

‎asm/non_matching/game/multiplayer/mp_player__Task_CreateMultiplayerPlayer.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ _080164C4:
380380
str r0, [r4, #0x20]
381381
adds r0, r4, #0
382382
movs r1, #0xe
383-
bl Player_SetSpriteOffsetY
383+
bl Player_HandleSpriteYOffsetChange
384384
movs r0, #6
385385
strb r0, [r4, #0x16]
386386
movs r0, #0xe

‎asm/non_matching/game/sa1_sa2_shared/collision__sub_800D0A0.inc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ _0800D2EA:
341341
str r0, [r6, #0x20]
342342
adds r0, r6, #0
343343
movs r1, #0xe
344-
bl Player_SetSpriteOffsetY
344+
bl Player_HandleSpriteYOffsetChange
345345
movs r0, #6
346346
strb r0, [r6, #0x16]
347347
movs r0, #0xe
@@ -419,7 +419,7 @@ _0800D38E:
419419
str r0, [r6, #0x20]
420420
adds r0, r6, #0
421421
movs r1, #0xe
422-
bl Player_SetSpriteOffsetY
422+
bl Player_HandleSpriteYOffsetChange
423423
movs r1, #0
424424
movs r0, #6
425425
strb r0, [r6, #0x16]
@@ -528,7 +528,7 @@ _0800D47C:
528528
str r0, [r5, #0x20]
529529
adds r0, r5, #0
530530
movs r1, #0xe
531-
bl Player_SetSpriteOffsetY
531+
bl Player_HandleSpriteYOffsetChange
532532
movs r0, #6
533533
strb r0, [r5, #0x16]
534534
movs r0, #0xe
@@ -592,7 +592,7 @@ _0800D500:
592592
str r0, [r5, #0x20]
593593
adds r0, r5, #0
594594
movs r1, #0xe
595-
bl Player_SetSpriteOffsetY
595+
bl Player_HandleSpriteYOffsetChange
596596
movs r1, #0
597597
movs r0, #6
598598
strb r0, [r5, #0x16]
@@ -779,7 +779,7 @@ _0800D66A:
779779
strh r3, [r6, #0x10]
780780
adds r0, r6, #0
781781
movs r1, #0xe
782-
bl Player_SetSpriteOffsetY
782+
bl Player_HandleSpriteYOffsetChange
783783
movs r0, #6
784784
strb r0, [r6, #0x16]
785785
movs r0, #0xe
@@ -847,7 +847,7 @@ _0800D6EA:
847847
str r0, [r6, #0x20]
848848
adds r0, r6, #0
849849
movs r1, #0xe
850-
bl Player_SetSpriteOffsetY
850+
bl Player_HandleSpriteYOffsetChange
851851
movs r0, #6
852852
strb r0, [r6, #0x16]
853853
movs r0, #0xe
@@ -877,7 +877,7 @@ _0800D738:
877877
str r4, [sp, #0x30]
878878
adds r0, r6, #0
879879
movs r1, #0xe
880-
bl Player_SetSpriteOffsetY
880+
bl Player_HandleSpriteYOffsetChange
881881
movs r0, #6
882882
strb r0, [r6, #0x16]
883883
movs r0, #0xe
@@ -954,7 +954,7 @@ _0800D7D8:
954954
strh r0, [r6, #0x10]
955955
adds r0, r6, #0
956956
movs r1, #0xe
957-
bl Player_SetSpriteOffsetY
957+
bl Player_HandleSpriteYOffsetChange
958958
movs r0, #6
959959
strb r0, [r6, #0x16]
960960
movs r0, #0xe
@@ -1041,7 +1041,7 @@ _0800D868:
10411041
strh r0, [r5, #0x10]
10421042
adds r0, r5, #0
10431043
movs r1, #0xe
1044-
bl Player_SetSpriteOffsetY
1044+
bl Player_HandleSpriteYOffsetChange
10451045
movs r0, #6
10461046
strb r0, [r5, #0x16]
10471047
movs r0, #0xe
@@ -1112,7 +1112,7 @@ _0800D8F2:
11121112
str r0, [r5, #0x20]
11131113
adds r0, r5, #0
11141114
movs r1, #0xe
1115-
bl Player_SetSpriteOffsetY
1115+
bl Player_HandleSpriteYOffsetChange
11161116
movs r0, #6
11171117
strb r0, [r5, #0x16]
11181118
movs r0, #0xe
@@ -1148,7 +1148,7 @@ _0800D93C:
11481148
str r0, [r5]
11491149
adds r0, r5, #0
11501150
movs r1, #0xe
1151-
bl Player_SetSpriteOffsetY
1151+
bl Player_HandleSpriteYOffsetChange
11521152
movs r0, #6
11531153
strb r0, [r5, #0x16]
11541154
movs r0, #0xe
@@ -1213,7 +1213,7 @@ _0800D9BE:
12131213
strh r0, [r5, #0x10]
12141214
adds r0, r5, #0
12151215
movs r1, #0xe
1216-
bl Player_SetSpriteOffsetY
1216+
bl Player_HandleSpriteYOffsetChange
12171217
movs r0, #6
12181218
strb r0, [r5, #0x16]
12191219
movs r0, #0xe

‎include/game/boost_effect.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ void sub_801561C(void);
99
void sub_8015750(void);
1010
void GetPreviousPlayerPos(Vec2_32 *pos, u8 pastFrameDelta);
1111
void CreateBoostEffectTasks(void);
12-
void sub_8015790(void);
13-
void sub_80156D0(void);
12+
void BoostEffect_StorePlayerPos(void);
13+
void BoostEffect_StorePlayerState(void);
1414

1515
extern const AnimId sCharacterPalettesBoostEffect[NUM_CHARACTERS];
1616

‎include/game/sa1_sa2_shared/globals.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ extern RoomEvent gRoomEventQueue[16];
195195

196196
extern CheeseTarget gCheeseTarget;
197197

198-
extern u8 gUnknown_030055D0[4];
198+
extern u8 gFrameInputsBuf[4];
199199

200200
#if 0
201201
extern u8 gNewInputCountersIndex;
@@ -210,7 +210,7 @@ extern u8 gNewInputCountersIndex;
210210
extern struct InputCounters gNewInputCounters[32];
211211
#endif
212212

213-
extern u8 gUnknown_030055D8;
213+
extern u8 gFrameInputsBufIndex;
214214

215215
#if (GAME == GAME_SA1) && !defined(BUG_FIX)
216216
#define LIVES_BOUND_CHECK_A(lives) (lives)

‎include/game/sa1_sa2_shared/input_buffer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include "game/sa1_sa2_shared/player.h"
55

6-
void sub_800E0C0(u16 param0, u16 param1);
7-
void sub_800DF8C(Player *p);
6+
void InputBuffer_NewFrameInput(u16 param0, u16 param1);
7+
void InputBuffer_HandleFrameInput(Player *p);
88

99
extern const u8 *unk_8C87198[3];
1010
extern const u8 *unk_8C871A4[3];

‎include/game/sa1_sa2_shared/player.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ typedef struct Player_ {
175175
/* 0x85 */ s8 character;
176176
/* 0x86 */ s8 secondsUntilDrown;
177177
/* 0x87 */ s8 framesUntilDrownCountDecrement;
178-
/* 0x88 */ s8 unk88;
178+
/* 0x88 */ s8 framesUntilWaterSurfaceEffect;
179179
/* 0x88 */ u8 filler88[3];
180180
/* 0x8C */ struct Task *spriteTask;
181181
/* 0x90 */ PlayerSpriteInfo *spriteInfoBody; // for character sprites

‎include/game/stage/player.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ void Player_ClearMovestate_IsInScriptedSequence(void);
2121
void InitializePlayer(Player *p);
2222
void DestroyPlayerTasks(Player *player);
2323
void Player_TransitionCancelFlyingAndBoost(Player *p);
24-
void Player_SetSpriteOffsetY(Player *, s32);
24+
void Player_HandleSpriteYOffsetChange(Player *, s32);
2525
void sub_8023260(Player *);
2626
void sub_80232D0(Player *);
2727
void Player_AirInputControls(Player *);
@@ -63,12 +63,12 @@ bool32 Player_TryAttack(Player *);
6363

6464
#define PLAYERFN_SET_SHIFT_OFFSETS(player, x, y) \
6565
{ \
66-
player->spriteOffsetX = x; \
67-
player->spriteOffsetY = y; \
66+
(player)->spriteOffsetX = x; \
67+
(player)->spriteOffsetY = y; \
6868
}
6969
#define PLAYERFN_CHANGE_SHIFT_OFFSETS(player, x, y) \
7070
{ \
71-
Player_SetSpriteOffsetY(player, y); \
71+
Player_HandleSpriteYOffsetChange(player, y); \
7272
PLAYERFN_SET_SHIFT_OFFSETS(player, x, y) \
7373
}
7474

‎include/trig.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ extern const s16 gSineTable[1280];
2222
#define COS_24_8(radAngle) Q_2_14_TO_Q_24_8(COS(radAngle))
2323

2424
#define DEG_TO_SIN(deg) ((int)((((double)(deg)) / 360.0) * SIN_PERIOD))
25+
#define SIN_TO_TURNS(s) ((s) / 4)
26+
#define TURNS_TO_SIN(t) ((t)*4)
27+
#define DEG_TO_TURNS(d) SIN_TO_TURNS(DEG_TO_SIN(d))
2528

2629
// NOTE: Returns a Q_24_8!
2730
#define SIN_DEG(degrees) Q_2_14_TO_Q_24_8(gSineTable[DEG_TO_SIN(degrees)])

‎src/game/boost_effect.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void sub_801561C(void)
7878
sPlayerStateBufferIndex = 0;
7979
}
8080

81-
void sub_80156D0(void)
81+
void BoostEffect_StorePlayerState(void)
8282
{
8383
Player *p = &gPlayer;
8484
u32 oldMovestate = p->moveState;
@@ -115,7 +115,7 @@ void sub_8015750(void)
115115
sPlayerPosBufferIndex = 0;
116116
}
117117

118-
void sub_8015790(void)
118+
void BoostEffect_StorePlayerPos(void)
119119
{
120120
u32 index;
121121

0 commit comments

Comments
 (0)