diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index ef196184..3dfe41b7 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -1358,7 +1358,7 @@ _ZN8GameModeD0Ev kind:function(thumb,size=0xc) addr:0x0202c0ac _ZN8GameMode13func_0202c0b8Ev kind:function(thumb,size=0x2) addr:0x0202c0b8 _ZN8GameMode8vfunc_0cEPt kind:function(thumb,size=0x2) addr:0x0202c0bc _ZN8GameMode8vfunc_10EPt kind:function(thumb,size=0x2) addr:0x0202c0c0 -_ZN8GameMode8vfunc_14EPt kind:function(thumb,size=0x2) addr:0x0202c0c4 +_ZN8GameMode8vfunc_14Eb kind:function(thumb,size=0x2) addr:0x0202c0c4 _ZN8GameMode8vfunc_18Ev kind:function(thumb,size=0x2) addr:0x0202c0c8 func_0202c0cc kind:function(thumb,size=0x5c) addr:0x0202c0cc func_0202c128 kind:function(thumb,size=0x27c) addr:0x0202c128 diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt index b8b242ee..02f69854 100644 --- a/config/usa/arm9/symbols.txt +++ b/config/usa/arm9/symbols.txt @@ -1358,7 +1358,7 @@ _ZN8GameModeD0Ev kind:function(thumb,size=0xc) addr:0x0202c094 _ZN8GameMode13func_0202c0b8Ev kind:function(thumb,size=0x2) addr:0x0202c0a0 _ZN8GameMode8vfunc_0cEPt kind:function(thumb,size=0x2) addr:0x0202c0a4 _ZN8GameMode8vfunc_10EPt kind:function(thumb,size=0x2) addr:0x0202c0a8 -_ZN8GameMode8vfunc_14EPt kind:function(thumb,size=0x2) addr:0x0202c0ac +_ZN8GameMode8vfunc_14Eb kind:function(thumb,size=0x2) addr:0x0202c0ac _ZN8GameMode8vfunc_18Ev kind:function(thumb,size=0x2) addr:0x0202c0b0 func_0202c0cc kind:function(thumb,size=0x5c) addr:0x0202c0b4 func_0202c128 kind:function(thumb,size=0x27c) addr:0x0202c110 diff --git a/include/Game/GameMode.hpp b/include/Game/GameMode.hpp index 2a80d115..d1f5c4e9 100644 --- a/include/Game/GameMode.hpp +++ b/include/Game/GameMode.hpp @@ -24,10 +24,10 @@ public: /* 008 */ /* 00 */ virtual ~GameMode(); - /* 08 */ virtual unk32 vfunc_08(unk32 param1) = 0; + /* 08 */ virtual GameModeId vfunc_08(bool param1) = 0; /* 0c */ virtual void vfunc_0c(u16 *param1); /* 10 */ virtual void vfunc_10(u16 *param1); - /* 14 */ virtual void vfunc_14(u16 *param1); + /* 14 */ virtual void vfunc_14(bool param1); /* 18 */ virtual void vfunc_18(); /* 1c */ diff --git a/include/Game/GameModeAdventure.hpp b/include/Game/GameModeAdventure.hpp index 934a6a10..18ef4981 100644 --- a/include/Game/GameModeAdventure.hpp +++ b/include/Game/GameModeAdventure.hpp @@ -102,7 +102,7 @@ public: /* 018 */ /* 00 */ virtual ~GameModeAdventure() override; - /* 08 */ virtual unk32 vfunc_08(unk32 param1) override; + /* 08 */ virtual unk32 vfunc_08(bool param1) override; /* 0c */ virtual void vfunc_0c(u16 *param1) override; /* 10 */ virtual void vfunc_10(u16 *param1) override; /* 14 */ virtual void vfunc_14(u16 *param1) override; diff --git a/src/09_Adventure/Game/GameModeAdventure.cpp b/src/09_Adventure/Game/GameModeAdventure.cpp index dbfa9690..4bfa2526 100644 --- a/src/09_Adventure/Game/GameModeAdventure.cpp +++ b/src/09_Adventure/Game/GameModeAdventure.cpp @@ -100,7 +100,7 @@ THUMB GameModeAdventure::~GameModeAdventure() { } // non-matching -ARM unk32 GameModeAdventure::vfunc_08(unk32 param1) { +ARM unk32 GameModeAdventure::vfunc_08(bool param1) { unk32 uVar2 = 0; if (data_027e0d38->mUnk_14 == 1) { diff --git a/src/Main/Game/GameMode.cpp b/src/Main/Game/GameMode.cpp index fd68c708..6e1792bb 100644 --- a/src/Main/Game/GameMode.cpp +++ b/src/Main/Game/GameMode.cpp @@ -4,5 +4,5 @@ THUMB GameMode::~GameMode() {} THUMB void GameMode::func_0202c0b8() {} THUMB void GameMode::vfunc_0c(u16 *param1) {} THUMB void GameMode::vfunc_10(u16 *param1) {} -THUMB void GameMode::vfunc_14(u16 *param1) {} +THUMB void GameMode::vfunc_14(bool param1) {} THUMB void GameMode::vfunc_18() {}