Skip to content

Commit 053e1d5

Browse files
committed
sa1: progress on player.c alignment
1 parent fb83759 commit 053e1d5

5 files changed

Lines changed: 1233 additions & 320 deletions

File tree

include/game/sa1/stage/enemies/boss_xtra_super_egg_robo.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,6 @@ extern ExtraBossTaskData gExtraBossTaskData;
5050

5151
typedef s32 CapsuleState;
5252

53-
typedef struct {
54-
/* 0x00 */ s8 pid;
55-
/* 0x04 */ u32 unk4; // TODO: Check the type!
56-
} player_0_Task; /* size: 0x8 */
57-
58-
typedef struct {
59-
/* 0x00 */ player_0_Task unk0;
60-
/* 0x08 */ s32 unk8; // counter of some kind
61-
/* 0x0C */ s32 qXs[16];
62-
/* 0x0C */ s32 qYs[16];
63-
} MaybeSuperSonic; /* size: 0x8C */
64-
6553
s32 ExtraBoss__CapsuleGetCaptureState(SomeTaskManager_7C *mgr, Sprite *s, SuperEggRobo *extraBoss, Player *p);
6654

6755
#define EXTRA_BOSS__INITIAL_RING_COUNT 50

include/game/shared/stage/player.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,20 @@ typedef struct Player_ {
279279
#endif
280280
} Player;
281281

282+
typedef struct {
283+
/* 0x00 */ s8 pid;
284+
/* 0x04 */ u32 unk4; // TODO: Check the type!
285+
} player_0_Task; /* size: 0x8 */
286+
287+
#if (GAME == GAME_SA1)
288+
typedef struct {
289+
/* 0x00 */ player_0_Task unk0;
290+
/* 0x08 */ s32 unk8; // counter of some kind
291+
/* 0x0C */ s32 qXs[16];
292+
/* 0x0C */ s32 qYs[16];
293+
} MaybeSuperSonic; /* size: 0x8C */
294+
#endif
295+
282296
s32 SA2_LABEL(sub_8022F58)(u8 param0, Player *p);
283297

284298
extern Player gPlayer;

0 commit comments

Comments
 (0)