From 5e86c8468ccb0852b507dcb1e7515f62d20e312d Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 16 Nov 2019 11:09:24 +1000 Subject: [PATCH] Decompile func0f0008e0 and func0f0008f0 --- ld/stage1.ld | 2 ++ src/game/game_0008e0.c | 22 ++++------------------ src/game/game_0008f0.c | 9 +++++++++ src/include/game/game_0008e0.h | 3 +-- src/include/game/game_0008f0.h | 8 ++++++++ 5 files changed, 24 insertions(+), 20 deletions(-) create mode 100644 src/game/game_0008f0.c create mode 100644 src/include/game/game_0008f0.h diff --git a/ld/stage1.ld b/ld/stage1.ld index 0338686ec..6066983bf 100644 --- a/ld/stage1.ld +++ b/ld/stage1.ld @@ -37,6 +37,7 @@ SECTIONS src/game/game_000850.o (.text); src/game/game_000870.o (.text); src/game/game_0008e0.o (.text); + src/game/game_0008f0.o (.text); src/game/game_000900.o (.text); src/game/game_000910.o (.text); src/game/game_000920.o (.text); @@ -116,6 +117,7 @@ SECTIONS src/game/game_000850.o (.rodata); src/game/game_000870.o (.rodata); src/game/game_0008e0.o (.rodata); + src/game/game_0008f0.o (.rodata); src/game/game_000900.o (.rodata); src/game/game_000910.o (.rodata); src/game/game_000920.o (.rodata); diff --git a/src/game/game_0008e0.c b/src/game/game_0008e0.c index 96688b439..0afdd2b86 100644 --- a/src/game/game_0008e0.c +++ b/src/game/game_0008e0.c @@ -1,23 +1,9 @@ #include #include "constants.h" #include "gvars/gvars.h" -#include "setup/setup_000000.h" -#include "setup/setup_0160b0.h" -#include "setup/setup_020df0.h" #include "types.h" -GLOBAL_ASM( -glabel func0f0008e0 -/* f0008e0: 03e00008 */ jr $ra -/* f0008e4: 00000000 */ sll $zero,$zero,0x0 -/* f0008e8: 00000000 */ sll $zero,$zero,0x0 -/* f0008ec: 00000000 */ sll $zero,$zero,0x0 -); - -GLOBAL_ASM( -glabel func0f0008f0 -/* f0008f0: 03e00008 */ jr $ra -/* f0008f4: 00000000 */ sll $zero,$zero,0x0 -/* f0008f8: 00000000 */ sll $zero,$zero,0x0 -/* f0008fc: 00000000 */ sll $zero,$zero,0x0 -); \ No newline at end of file +void func0f0008e0(void) +{ + // empty +} diff --git a/src/game/game_0008f0.c b/src/game/game_0008f0.c new file mode 100644 index 000000000..ba2b4dece --- /dev/null +++ b/src/game/game_0008f0.c @@ -0,0 +1,9 @@ +#include +#include "constants.h" +#include "gvars/gvars.h" +#include "types.h" + +void func0f0008f0(void) +{ + // empty +} diff --git a/src/include/game/game_0008e0.h b/src/include/game/game_0008e0.h index a24899945..ebdd555bc 100644 --- a/src/include/game/game_0008e0.h +++ b/src/include/game/game_0008e0.h @@ -3,7 +3,6 @@ #include #include "types.h" -u32 func0f0008e0(void); -u32 func0f0008f0(void); +void func0f0008e0(void); #endif diff --git a/src/include/game/game_0008f0.h b/src/include/game/game_0008f0.h new file mode 100644 index 000000000..1a0603114 --- /dev/null +++ b/src/include/game/game_0008f0.h @@ -0,0 +1,8 @@ +#ifndef IN_GAME_GAME_0008F0_H +#define IN_GAME_GAME_0008F0_H +#include +#include "types.h" + +void func0f0008f0(void); + +#endif