diff --git a/Makefile b/Makefile index b7d4990a..3e3935a6 100644 --- a/Makefile +++ b/Makefile @@ -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) diff --git a/include/game/shared/stage/camera.h b/include/game/shared/stage/camera.h index f745f401..075bdbbb 100644 --- a/include/game/shared/stage/camera.h +++ b/include/game/shared/stage/camera.h @@ -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) \ diff --git a/include/game/shared/stage/player.h b/include/game/shared/stage/player.h index 131aed5c..713d2784 100644 --- a/include/game/shared/stage/player.h +++ b/include/game/shared/stage/player.h @@ -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; @@ -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 \ No newline at end of file +#endif // GUARD_SA3_PLAYER_H diff --git a/src/game/sa3/code_2.c b/src/game/sa3/code_2.c index 3dbf6176..cebacac7 100644 --- a/src/game/sa3/code_2.c +++ b/src/game/sa3/code_2.c @@ -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); diff --git a/src/game/sa3/stage/player.c b/src/game/sa3/stage/player.c index 5f5f6581..125760da 100644 --- a/src/game/sa3/stage/player.c +++ b/src/game/sa3/stage/player.c @@ -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) { diff --git a/src/platform/shared/stub.c b/src/platform/shared/stub.c index 021934b5..7b881a8c 100644 --- a/src/platform/shared/stub.c +++ b/src/platform/shared/stub.c @@ -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;