Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ endif
ifeq ($(PLATFORM),gba)
LIBS := $(ROOT_DIR)/tools/agbcc/lib/libgcc.a $(ROOT_DIR)/tools/agbcc/lib/libc.a $(LIBABGSYSCALL_LIBS)
else ifeq ($(PLATFORM),sdl)
LIBS := $(shell sdl2-config --cflags --libs)
LIBS := $(shell sdl2-config --cflags --libs) -lm
else ifeq ($(PLATFORM),sdl_win32)
LIBS := -mwin32 -lkernel32 -lwinmm -lmingw32 -lxinput $(SDL_MINGW_LIBS)
else ifeq ($(PLATFORM), win32)
Expand Down
2 changes: 1 addition & 1 deletion include/game/shared/stage/camera.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ struct Camera {
/* 0x6A */ s16 unk6A;
}; /* size (SA3): 0x6C */

struct Camera gCamera;
extern struct Camera gCamera;

// TODO: Merge all these into one!
#define IS_OUT_OF_RANGE_2(x, y, radiusX, radiusY) \
Expand Down
4 changes: 2 additions & 2 deletions include/game/shared/stage/player.h
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ typedef struct Struc_3001150 {
/* 0x01C */ Struc_3001150_1C unk1C;
/* 0x164 */ Struc_3001150_164 unk164;
} Struc_3001150; /* 0x468 */
Struc_3001150 gUnknown_03001150;
extern Struc_3001150 gUnknown_03001150;

typedef struct Strc_80E3254 {
Struc_3001150_InputRes funcA;
Expand Down Expand Up @@ -428,4 +428,4 @@ bool32 sub_8020E3C(Sprite *s, s32 param1, s32 param2, s16 param3, Player *p);

void ResolvePlayerSpriteCollision(Sprite *s, Player *p);

#endif // GUARD_SA3_PLAYER_H
#endif // GUARD_SA3_PLAYER_H
2 changes: 1 addition & 1 deletion src/game/sa3/code_2.c
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ void TaskDestructor_809E858(Task *t);
bool32 sub_809E828(Code_2_1 *strc);
void Task_570_809C620(void);
void Task_60_809CA64(void);
bool32 sub_809E354();
bool32 sub_809E354(Code_2_0__60 *strc);
void sub_809E5E4(Code_2_0__3C *strc);
bool32 sub_809E5AC(Code_2_0__3C *strc);
void sub_809CC80(u8 *vram, u8 *param1, u8 param2);
Expand Down
1 change: 1 addition & 0 deletions src/game/sa3/stage/player.c
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ extern TileInfoShield sTileInfoShields[];
extern u16 gUnknown_08E2EAD0[][3];
extern u16 gUnknown_08E2EB04[NUM_CHARACTERS][2];
extern u16 gCheeseTileInfo[][2];
Struc_3001150 gUnknown_03001150;

static inline void SongStopCheck_inline(Player *p, u16 song)
{
Expand Down
12 changes: 0 additions & 12 deletions src/platform/shared/stub.c
Original file line number Diff line number Diff line change
Expand Up @@ -121,18 +121,6 @@ void sub_80C59E8() { }
void /* 0x080C7558 */ SoundBiasReset() { }
void /* 0x080C7560 */ SoundBiasSet() { }

typedef struct MusicManagerState {
u8 unk0;
u8 unk1;
u8 unk2;
u8 unk3;
u8 unk4;
u8 unk5;
u16 fadeoutSpeed;
} MusicManagerState; /* size: 8 */

MusicManagerState gMusicManagerState;

typedef struct SomeSubStruct_3001BF0 {
/* 0x00 */ s32 qWorldX;
/* 0x04 */ s32 qWorldY;
Expand Down