From 7a2009cab93127754c636199e29cab1a886ceef2 Mon Sep 17 00:00:00 2001 From: Aetias Date: Mon, 20 Jan 2025 20:09:15 +0100 Subject: [PATCH] Move ov000 documentation from Ghidra --- config/eur/arm9/overlays/ov000/symbols.txt | 206 +++++++++--------- config/usa/arm9/overlays/ov000/symbols.txt | 206 +++++++++--------- include/Cutscene/CutsceneHandler.hpp | 57 ++++- include/Map/MapData.hpp | 20 +- include/Map/TriggerAABB.hpp | 9 + include/Map/TriggerAABB_Unk1.hpp | 7 + include/Map/TriggerAABB_Unk2.hpp | 39 +++- include/Map/TriggerBase.hpp | 17 +- include/Map/TriggerSphere.hpp | 8 + include/Render/ModelRender.hpp | 11 + include/Save/AdventureFlags.hpp | 7 +- include/Unknown/UnkStruct_ov000_020b1528.hpp | 27 +++ include/Unknown/UnkStruct_ov000_020e2f04.hpp | 45 ++++ src/00_Core/Cutscene/CutsceneHandler.cpp | 16 ++ src/00_Core/Map/MapBase.cpp | 4 +- src/00_Core/Map/MapData.cpp | 16 ++ src/00_Core/Map/Trigger.cpp | 40 ++++ src/00_Core/Render/ModelRender.cpp | 25 +++ src/00_Core/Save/AdventureFlags.cpp | 1 - src/00_Core/Save/FlagsUnk.cpp | 5 + .../Unknown/UnkStruct_ov000_020b1528.cpp | 9 + 21 files changed, 555 insertions(+), 220 deletions(-) create mode 100644 include/Unknown/UnkStruct_ov000_020b1528.hpp create mode 100644 include/Unknown/UnkStruct_ov000_020e2f04.hpp create mode 100644 src/00_Core/Cutscene/CutsceneHandler.cpp create mode 100644 src/00_Core/Map/MapData.cpp create mode 100644 src/00_Core/Map/Trigger.cpp create mode 100644 src/00_Core/Render/ModelRender.cpp create mode 100644 src/00_Core/Save/FlagsUnk.cpp create mode 100644 src/00_Core/Unknown/UnkStruct_ov000_020b1528.cpp diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 5173e57d..e6882143 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -387,10 +387,10 @@ _ZN7MapBase18func_ov00_0207f948Ei kind:function(arm,size=0x10) addr:0x207f948 _ZN7MapBase10AddTriggerEP13TriggerParams kind:function(arm,size=0x150) addr:0x207f958 _ZN11TriggerBase8vfunc_08Ev kind:function(arm,size=0x4) addr:0x207faa8 _ZN7MapBase21GetTriggerBoundingBoxEiP4AABB kind:function(arm,size=0xb0) addr:0x207faac -_ZN11TriggerBase14GetBoundingBoxEv kind:function(arm,size=0x8) addr:0x207fb5c +_ZN11TriggerBase14GetBoundingBoxEP4AABB kind:function(arm,size=0x8) addr:0x207fb5c _ZN7MapBase23GetTriggerBoundingBoxesEiP4AABBi kind:function(arm,size=0xc8) addr:0x207fb64 _ZN7MapBase21GetOverlappingTriggerEP5Vec3p kind:function(arm,size=0x64) addr:0x207fc2c -_ZN11TriggerBase8OverlapsEv kind:function(arm,size=0x8) addr:0x207fc90 +_ZN11TriggerBase8OverlapsEP5Vec3p kind:function(arm,size=0x8) addr:0x207fc90 _ZN7MapBase11FindTriggerEi kind:function(arm,size=0x48) addr:0x207fc98 _ZN7MapBase22GetOverlappingTriggersEP5Vec3pPP11TriggerBasei kind:function(arm,size=0x78) addr:0x207fce0 _ZN7MapBase23IsTriggerTypeOverlappedEiP5Vec3p kind:function(arm,size=0x78) addr:0x207fd58 @@ -1198,35 +1198,35 @@ func_ov000_02095390 kind:function(arm,size=0x8) addr:0x2095390 func_ov000_02095398 kind:function(arm,size=0x8) addr:0x2095398 func_ov000_020953a0 kind:function(arm,size=0x40) addr:0x20953a0 func_ov000_020953e0 kind:function(arm,size=0x1c) addr:0x20953e0 -func_ov000_020953fc kind:function(arm,size=0x48) addr:0x20953fc -func_ov000_02095444 kind:function(arm,size=0x40) addr:0x2095444 -func_ov000_02095484 kind:function(arm,size=0x4) addr:0x2095484 -func_ov000_02095488 kind:function(arm,size=0x14) addr:0x2095488 -func_ov000_0209549c kind:function(arm,size=0x4) addr:0x209549c -func_ov000_020954a0 kind:function(arm,size=0xb4) addr:0x20954a0 -func_ov000_02095554 kind:function(arm,size=0xb4) addr:0x2095554 -func_ov000_02095608 kind:function(arm,size=0x14) addr:0x2095608 -func_ov000_0209561c kind:function(arm,size=0x1c) addr:0x209561c -func_ov000_02095638 kind:function(arm,size=0x14) addr:0x2095638 -func_ov000_0209564c kind:function(arm,size=0xd4) addr:0x209564c -func_ov000_02095720 kind:function(arm,size=0x44) addr:0x2095720 -func_ov000_02095764 kind:function(arm,size=0x14) addr:0x2095764 -func_ov000_02095778 kind:function(arm,size=0x1c) addr:0x2095778 -func_ov000_02095794 kind:function(arm,size=0x88) addr:0x2095794 -func_ov000_0209581c kind:function(arm,size=0x54) addr:0x209581c -func_ov000_02095870 kind:function(arm,size=0x38) addr:0x2095870 -func_ov000_020958a8 kind:function(arm,size=0x68) addr:0x20958a8 -func_ov000_02095910 kind:function(arm,size=0x70) addr:0x2095910 -func_ov000_02095980 kind:function(arm,size=0x18) addr:0x2095980 -func_ov000_02095998 kind:function(arm,size=0x370) addr:0x2095998 -func_ov000_02095d08 kind:function(arm,size=0x50) addr:0x2095d08 -func_ov000_02095d58 kind:function(arm,size=0x60) addr:0x2095d58 -func_ov000_02095db8 kind:function(arm,size=0x40) addr:0x2095db8 -func_ov000_02095df8 kind:function(arm,size=0x48) addr:0x2095df8 -func_ov000_02095e40 kind:function(arm,size=0x74) addr:0x2095e40 -func_ov000_02095eb4 kind:function(arm,size=0x10) addr:0x2095eb4 -func_ov000_02095ec4 kind:function(arm,size=0x10) addr:0x2095ec4 -func_ov000_02095ed4 kind:function(arm,size=0x38) addr:0x2095ed4 +_ZN11TriggerBaseC2EP13TriggerParams kind:function(arm,size=0x48) addr:0x20953fc +_ZN11TriggerBaseC2Ehjjj kind:function(arm,size=0x40) addr:0x2095444 +_ZN11TriggerBaseD1Ev kind:function(arm,size=0x4) addr:0x2095484 +_ZN11TriggerBaseD0Ev kind:function(arm,size=0x14) addr:0x2095488 +_ZN11TriggerBaseD2Ev kind:function(arm,size=0x4) addr:0x209549c +_ZN11TriggerAABBC2EP13TriggerParams kind:function(arm,size=0xb4) addr:0x20954a0 +_ZN11TriggerAABBC2Ehjjj kind:function(arm,size=0xb4) addr:0x2095554 +_ZN11TriggerAABBD1Ev kind:function(arm,size=0x14) addr:0x2095608 +_ZN11TriggerAABBD0Ev kind:function(arm,size=0x1c) addr:0x209561c +_ZN11TriggerAABBD2Ev kind:function(arm,size=0x14) addr:0x2095638 +_ZN13TriggerSphereC2EP13TriggerParams kind:function(arm,size=0xd4) addr:0x209564c +_ZN13TriggerSphereC2Ehjjj kind:function(arm,size=0x44) addr:0x2095720 +_ZN13TriggerSphereD1Ev kind:function(arm,size=0x14) addr:0x2095764 +_ZN13TriggerSphereD0Ev kind:function(arm,size=0x1c) addr:0x2095778 +_ZN13TriggerSphere14GetBoundingBoxEP4AABB kind:function(arm,size=0x88) addr:0x2095794 +_ZN16TriggerAABB_Unk2C2EP13TriggerParams kind:function(arm,size=0x54) addr:0x209581c +_ZN21TriggerAABB_Unk2_Unk1C2Ev kind:function(arm,size=0x38) addr:0x2095870 +_ZN16TriggerAABB_Unk2D1Ev kind:function(arm,size=0x68) addr:0x20958a8 +_ZN16TriggerAABB_Unk2D0Ev kind:function(arm,size=0x70) addr:0x2095910 +_ZN16TriggerAABB_Unk28vfunc_08Ev kind:function(arm,size=0x18) addr:0x2095980 +_ZN16TriggerAABB_Unk28vfunc_0cEv kind:function(arm,size=0x370) addr:0x2095998 +_ZN16TriggerAABB_Unk28vfunc_10Ev kind:function(arm,size=0x50) addr:0x2095d08 +_ZN16TriggerAABB_Unk1C2EP13TriggerParams kind:function(arm,size=0x60) addr:0x2095d58 +_ZN16TriggerAABB_Unk1D1Ev kind:function(arm,size=0x40) addr:0x2095db8 +_ZN16TriggerAABB_Unk1D0Ev kind:function(arm,size=0x48) addr:0x2095df8 +_ZN16TriggerAABB_Unk18vfunc_08Ev kind:function(arm,size=0x74) addr:0x2095e40 +_ZN13TriggerSphere8OverlapsEP5Vec3p kind:function(arm,size=0x10) addr:0x2095eb4 +_ZN11TriggerAABB8OverlapsEP5Vec3p kind:function(arm,size=0x10) addr:0x2095ec4 +_ZN11TriggerAABB14GetBoundingBoxEP4AABB kind:function(arm,size=0x38) addr:0x2095ed4 func_ov000_02095f0c kind:function(arm,size=0x34) addr:0x2095f0c func_ov000_02095f40 kind:function(arm,size=0x1c) addr:0x2095f40 func_ov000_02095f5c kind:function(arm,size=0x48) addr:0x2095f5c @@ -1260,20 +1260,20 @@ func_ov000_020971b8 kind:function(arm,size=0x48) addr:0x20971b8 func_ov000_02097200 kind:function(arm,size=0x28) addr:0x2097200 func_ov000_02097228 kind:function(arm,size=0x8) addr:0x2097228 func_ov000_02097230 kind:function(arm,size=0x10) addr:0x2097230 -func_ov000_02097240 kind:function(arm,size=0xa0) addr:0x2097240 -func_ov000_020972e0 kind:function(arm,size=0x4) addr:0x20972e0 -func_ov000_020972e4 kind:function(arm,size=0x70) addr:0x20972e4 -func_ov000_02097354 kind:function(arm,size=0xb8) addr:0x2097354 -func_ov000_0209740c kind:function(arm,size=0x4c) addr:0x209740c -func_ov000_02097458 kind:function(arm,size=0x20) addr:0x2097458 -func_ov000_02097478 kind:function(arm,size=0x4c) addr:0x2097478 -func_ov000_020974c4 kind:function(arm,size=0x20) addr:0x20974c4 -func_ov000_020974e4 kind:function(arm,size=0x4c) addr:0x20974e4 -func_ov000_02097530 kind:function(arm,size=0x20) addr:0x2097530 -func_ov000_02097550 kind:function(arm,size=0x4c) addr:0x2097550 -func_ov000_0209759c kind:function(arm,size=0x20) addr:0x209759c -func_ov000_020975bc kind:function(arm,size=0x4c) addr:0x20975bc -func_ov000_02097608 kind:function(arm,size=0x20) addr:0x2097608 +_ZN7MapDataC1EPhccii kind:function(arm,size=0xa0) addr:0x2097240 +_ZN7MapDataD1Ev kind:function(arm,size=0x4) addr:0x20972e0 +_ZN7MapData19func_ov000_020972e4EPtPib kind:function(arm,size=0x70) addr:0x20972e4 +_ZN7MapData19func_ov000_02097354Ev kind:function(arm,size=0xb8) addr:0x2097354 +_ZN7MapData8SetFlag0Ejb kind:function(arm,size=0x4c) addr:0x209740c +_ZN7MapData8GetFlag0Ej kind:function(arm,size=0x20) addr:0x2097458 +_ZN7MapData8SetFlag1Ejb kind:function(arm,size=0x4c) addr:0x2097478 +_ZN7MapData8GetFlag1Ej kind:function(arm,size=0x20) addr:0x20974c4 +_ZN7MapData8SetFlag2Ejb kind:function(arm,size=0x4c) addr:0x20974e4 +_ZN7MapData8GetFlag2Ej kind:function(arm,size=0x20) addr:0x2097530 +_ZN7MapData8SetFlag3Ejb kind:function(arm,size=0x4c) addr:0x2097550 +_ZN7MapData8GetFlag3Ej kind:function(arm,size=0x20) addr:0x209759c +_ZN7MapData8SetFlag4Ejb kind:function(arm,size=0x4c) addr:0x20975bc +_ZN7MapData8GetFlag4Ej kind:function(arm,size=0x20) addr:0x2097608 _ZN14AdventureFlags6ExistsEv kind:function(arm,size=0x1c) addr:0x2097628 _ZN14AdventureFlags6CopyToEPi kind:function(arm,size=0x30) addr:0x2097644 _ZN14AdventureFlags18func_ov00_02097674Ev kind:function(arm,size=0x10) addr:0x2097674 @@ -1321,23 +1321,23 @@ _ZN14AdventureFlags18func_ov00_02098074Eisiib kind:function(arm,size=0x28) addr: _ZN14AdventureFlags18func_ov00_0209809cEv kind:function(arm,size=0x10) addr:0x209809c _ZN14AdventureFlags18func_ov00_020980acEv kind:function(arm,size=0x10) addr:0x20980ac _ZN14AdventureFlags18func_ov00_020980bcEi kind:function(arm,size=0x14) addr:0x20980bc -_ZN14AdventureFlags18func_ov00_020980d0Ev kind:function(arm,size=0x24) addr:0x20980d0 -func_ov000_020980f4 kind:function(arm,size=0x4) addr:0x20980f4 -func_ov000_020980f8 kind:function(arm,size=0x4) addr:0x20980f8 -func_ov000_020980fc kind:function(arm,size=0x18) addr:0x20980fc -func_ov000_02098114 kind:function(arm,size=0x3c) addr:0x2098114 -func_ov000_02098150 kind:function(arm,size=0x68) addr:0x2098150 -func_ov000_020981b8 kind:function(arm,size=0x408) addr:0x20981b8 -func_ov000_020985c0 kind:function(arm,size=0x4) addr:0x20985c0 -func_ov000_020985c4 kind:function(arm,size=0x54) addr:0x20985c4 -func_ov000_02098618 kind:function(arm,size=0x40) addr:0x2098618 -func_ov000_02098658 kind:function(arm,size=0x3c) addr:0x2098658 -func_ov000_02098694 kind:function(arm,size=0x130) addr:0x2098694 -func_ov000_020987c4 kind:function(arm,size=0x70) addr:0x20987c4 -func_ov000_02098834 kind:function(arm,size=0x2c) addr:0x2098834 -func_ov000_02098860 kind:function(arm,size=0x30) addr:0x2098860 -func_ov000_02098890 kind:function(arm,size=0x90) addr:0x2098890 -func_ov000_02098920 kind:function(arm,size=0x88) addr:0x2098920 +_ZN8FlagsUnkD1Ev kind:function(arm,size=0x24) addr:0x20980d0 +_ZN9FlagsUnk2D1Ev kind:function(arm,size=0x4) addr:0x20980f4 +_ZN8FlagsUnk19func_ov000_020980f8Ev kind:function(arm,size=0x4) addr:0x20980f8 +_ZN15CutsceneHandler19func_ov000_020980fcEiiPPv kind:function(arm,size=0x18) addr:0x20980fc +_ZN15CutsceneHandler19func_ov000_02098114Ev kind:function(arm,size=0x3c) addr:0x2098114 +_ZN15CutsceneHandler12SkipCutsceneEi kind:function(arm,size=0x68) addr:0x2098150 +_ZN15CutsceneHandler19func_ov000_020981b8EPi kind:function(arm,size=0x408) addr:0x20981b8 +_ZN15CutsceneHandler19func_ov000_020985c0Ev kind:function(arm,size=0x4) addr:0x20985c0 +_ZN15CutsceneHandler19func_ov000_020985c4Ev kind:function(arm,size=0x54) addr:0x20985c4 +_ZN15CutsceneHandler19func_ov000_02098618EiiPPv kind:function(arm,size=0x40) addr:0x2098618 +_ZN15CutsceneHandler19func_ov000_02098658Ev kind:function(arm,size=0x3c) addr:0x2098658 +_ZN15CutsceneHandler19func_ov000_02098694Ei kind:function(arm,size=0x130) addr:0x2098694 +_ZN15CutsceneHandler19func_ov000_020987c4Eisiib kind:function(arm,size=0x70) addr:0x20987c4 +_ZN15CutsceneHandler19func_ov000_02098834Ev kind:function(arm,size=0x2c) addr:0x2098834 +_ZN15CutsceneHandler19func_ov000_02098860Ev kind:function(arm,size=0x30) addr:0x2098860 +_ZN15CutsceneHandler19func_ov000_02098890Eii kind:function(arm,size=0x90) addr:0x2098890 +_ZN15CutsceneHandler19func_ov000_02098920Ei kind:function(arm,size=0x88) addr:0x2098920 func_ov000_020989a8 kind:function(arm,size=0x18c) addr:0x20989a8 func_ov000_02098b34 kind:function(arm,size=0xc) addr:0x2098b34 func_ov000_02098b40 kind:function(arm,size=0xc) addr:0x2098b40 @@ -1986,32 +1986,32 @@ _ZN12TouchGestureD2Ev kind:function(arm,size=0x4) addr:0x20a9544 _ZN16TouchGestureBaseD2Ev kind:function(arm,size=0x4) addr:0x20a9548 _ZN16TouchGestureBase17ResetTouchHistoryEv kind:function(arm,size=0xc) addr:0x20a954c _ZN16TouchGestureBaseD1Ev kind:function(arm,size=0x14) addr:0x20a9558 -func_ov000_020a956c kind:function(thumb,size=0x1c) addr:0x20a956c -func_ov000_020a9588 kind:function(thumb,size=0x1c) addr:0x20a9588 -func_ov000_020a95a4 kind:function(thumb,size=0x20) addr:0x20a95a4 -func_ov000_020a95c4 kind:function(thumb,size=0x28) addr:0x20a95c4 -func_ov000_020a95ec kind:function(thumb,size=0x20) addr:0x20a95ec -func_ov000_020a960c kind:function(arm,size=0x8) addr:0x20a960c -func_ov000_020a9614 kind:function(arm,size=0x10) addr:0x20a9614 -func_ov000_020a9624 kind:function(arm,size=0x2c) addr:0x20a9624 -func_ov000_020a9650 kind:function(arm,size=0x84) addr:0x20a9650 -func_ov000_020a96d4 kind:function(arm,size=0x6c) addr:0x20a96d4 -func_ov000_020a9740 kind:function(arm,size=0x24) addr:0x20a9740 -func_ov000_020a9764 kind:function(arm,size=0x6c) addr:0x20a9764 -func_ov000_020a97d0 kind:function(arm,size=0x10) addr:0x20a97d0 -func_ov000_020a97e0 kind:function(arm,size=0x18) addr:0x20a97e0 -func_ov000_020a97f8 kind:function(arm,size=0x6c) addr:0x20a97f8 -func_ov000_020a9864 kind:function(arm,size=0x2c) addr:0x20a9864 -func_ov000_020a9890 kind:function(arm,size=0x2c) addr:0x20a9890 -func_ov000_020a98bc kind:function(arm,size=0x2c) addr:0x20a98bc -func_ov000_020a98e8 kind:function(arm,size=0x24) addr:0x20a98e8 -func_ov000_020a990c kind:function(arm,size=0x2c) addr:0x20a990c -func_ov000_020a9938 kind:function(thumb,size=0x28) addr:0x20a9938 -func_ov000_020a9960 kind:function(arm,size=0x8) addr:0x20a9960 -func_ov000_020a9968 kind:function(arm,size=0x2c) addr:0x20a9968 -func_ov000_020a9994 kind:function(arm,size=0x4) addr:0x20a9994 -func_ov000_020a9998 kind:function(arm,size=0x28) addr:0x20a9998 -func_ov000_020a99c0 kind:function(arm,size=0x20) addr:0x20a99c0 +_ZN11ModelRenderC2Ev kind:function(thumb,size=0x1c) addr:0x20a956c +_ZN11ModelRenderC1Ev kind:function(thumb,size=0x1c) addr:0x20a9588 +_ZN11ModelRenderD1Ev kind:function(thumb,size=0x20) addr:0x20a95a4 +_ZN11ModelRenderD0Ev kind:function(thumb,size=0x28) addr:0x20a95c4 +_ZN11ModelRenderD2Ev kind:function(thumb,size=0x20) addr:0x20a95ec +_ZN11ModelRender14GetLcdcAddressEv kind:function(arm,size=0x8) addr:0x20a960c +_ZN11ModelRender8vfunc_0cEP9ItemModel kind:function(arm,size=0x10) addr:0x20a9614 +_ZN11ModelRender19func_ov000_020a9624Ei kind:function(arm,size=0x2c) addr:0x20a9624 +_ZN11ModelRender12SetTransformEP5Vec3pP5Mat3pS1_ kind:function(arm,size=0x84) addr:0x20a9650 +_ZN11ModelRender22SetRotationTranslationEP5Mat3pP5Vec3p kind:function(arm,size=0x6c) addr:0x20a96d4 +_ZN11ModelRender14SetTranslationEP5Vec3p kind:function(arm,size=0x24) addr:0x20a9740 +_ZN11ModelRender20PushGeometryCommandsEv kind:function(arm,size=0x6c) addr:0x20a9764 +_ZN11ModelRender8vfunc_20Ev kind:function(arm,size=0x10) addr:0x20a97d0 +_ZN11ModelRender8vfunc_24Ei kind:function(arm,size=0x18) addr:0x20a97e0 +_ZN11ModelRender8vfunc_28Ev kind:function(arm,size=0x6c) addr:0x20a97f8 +_ZN11ModelRender8vfunc_2cEv kind:function(arm,size=0x2c) addr:0x20a9864 +_ZN11ModelRender8vfunc_34Ev kind:function(arm,size=0x2c) addr:0x20a9890 +_ZN11ModelRender8vfunc_30Ev kind:function(arm,size=0x2c) addr:0x20a98bc +_ZN11ModelRender19func_ov000_020a98e8Ei kind:function(arm,size=0x24) addr:0x20a98e8 +_ZN11ModelRender19func_ov000_020a990cEi kind:function(arm,size=0x2c) addr:0x20a990c +_ZN11ModelRender19func_ov000_020a9938Ei kind:function(thumb,size=0x28) addr:0x20a9938 +_ZN11ModelRender19func_ov000_020a9960Ei kind:function(arm,size=0x8) addr:0x20a9960 +_ZN11ModelRender8vfunc_38Ev kind:function(arm,size=0x2c) addr:0x20a9968 +_ZN11ModelRender8vfunc_3cEv kind:function(arm,size=0x4) addr:0x20a9994 +_ZN11ModelRender19func_ov000_020a9998Eii kind:function(arm,size=0x28) addr:0x20a9998 +_ZN11ModelRender19func_ov000_020a99c0Ev kind:function(arm,size=0x20) addr:0x20a99c0 func_ov000_020a99e0 kind:function(thumb,size=0x40) addr:0x20a99e0 func_ov000_020a9a20 kind:function(thumb,size=0x20) addr:0x20a9a20 func_ov000_020a9a40 kind:function(thumb,size=0x28) addr:0x20a9a40 @@ -2230,16 +2230,16 @@ _ZN13PlayerControl14IsTouchingFastEv kind:function(arm,size=0x30) addr:0x20b134c _ZN13PlayerControl11IsTappedNowEv kind:function(arm,size=0x48) addr:0x20b137c _ZN13PlayerControl18func_ov00_020b13c4Ev kind:function(arm,size=0xd4) addr:0x20b13c4 func_ov000_020b1498 kind:function(arm,size=0x90) addr:0x20b1498 -func_ov000_020b1528 kind:function(thumb,size=0x14) addr:0x20b1528 -func_ov000_020b153c kind:function(thumb,size=0x14) addr:0x20b153c -func_ov000_020b1550 kind:function(thumb,size=0xc) addr:0x20b1550 -func_ov000_020b155c kind:function(thumb,size=0x14) addr:0x20b155c -func_ov000_020b1570 kind:function(thumb,size=0xc) addr:0x20b1570 -func_ov000_020b157c kind:function(arm,size=0x1c) addr:0x20b157c -func_ov000_020b1598 kind:function(arm,size=0x8) addr:0x20b1598 -func_ov000_020b15a0 kind:function(arm,size=0x8) addr:0x20b15a0 -func_ov000_020b15a8 kind:function(arm,size=0x198) addr:0x20b15a8 -func_ov000_020b1740 kind:function(arm,size=0x4c) addr:0x20b1740 +_ZN24UnkStruct_ov000_020b1528C2Ev kind:function(thumb,size=0x14) addr:0x20b1528 +_ZN24UnkStruct_ov000_020b1528C1Ev kind:function(thumb,size=0x14) addr:0x20b153c +_ZN24UnkStruct_ov000_020b1528D1Ev kind:function(thumb,size=0xc) addr:0x20b1550 +_ZN24UnkStruct_ov000_020b1528D0Ev kind:function(thumb,size=0x14) addr:0x20b155c +_ZN24UnkStruct_ov000_020b1528D2Ev kind:function(thumb,size=0xc) addr:0x20b1570 +_ZN24UnkStruct_ov000_020b15285ClearEv kind:function(arm,size=0x1c) addr:0x20b157c +_ZN24UnkStruct_ov000_020b15288vfunc_08Ev kind:function(arm,size=0x8) addr:0x20b1598 +_ZN24UnkStruct_ov000_020b15288vfunc_0cEv kind:function(arm,size=0x8) addr:0x20b15a0 +_ZN24UnkStruct_ov000_020b15288vfunc_10EPi kind:function(arm,size=0x198) addr:0x20b15a8 +_ZN24UnkStruct_ov000_020b15288vfunc_14EPti kind:function(arm,size=0x4c) addr:0x20b1740 func_ov000_020b178c kind:function(arm,size=0x60) addr:0x20b178c func_ov000_020b17ec kind:function(arm,size=0xec) addr:0x20b17ec func_ov000_020b18d8 kind:function(arm,size=0x68) addr:0x20b18d8 @@ -4081,11 +4081,11 @@ data_ov000_020e2f68 kind:data(any) addr:0x20e2f68 data_ov000_020e2f98 kind:data(any) addr:0x20e2f98 data_ov000_020e2fa8 kind:data(any) addr:0x20e2fa8 data_ov000_020e2fb4 kind:data(any) addr:0x20e2fb4 -data_ov000_020e2fd4 kind:data(any) addr:0x20e2fd4 -data_ov000_020e2ff8 kind:data(any) addr:0x20e2ff8 -data_ov000_020e301c kind:data(any) addr:0x20e301c -data_ov000_020e3040 kind:data(any) addr:0x20e3040 -data_ov000_020e3064 kind:data(any) addr:0x20e3064 +_ZTV16TriggerAABB_Unk1 kind:data(any) addr:0x20e2fd4 +_ZTV16TriggerAABB_Unk2 kind:data(any) addr:0x20e2ff8 +_ZTV13TriggerSphere kind:data(any) addr:0x20e301c +_ZTV11TriggerAABB kind:data(any) addr:0x20e3040 +_ZTV11TriggerBase kind:data(any) addr:0x20e3064 data_ov000_020e3080 kind:data(any) addr:0x20e3080 data_ov000_020e3084 kind:data(any) addr:0x20e3084 data_ov000_020e3088 kind:data(any) addr:0x20e3088 diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index 2cbd9f7a..a73991be 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -387,10 +387,10 @@ _ZN7MapBase18func_ov00_0207f948Ei kind:function(arm,size=0x10) addr:0x207f8e8 _ZN7MapBase10AddTriggerEP13TriggerParams kind:function(arm,size=0x150) addr:0x207f8f8 _ZN11TriggerBase8vfunc_08Ev kind:function(arm,size=0x4) addr:0x207fa48 _ZN7MapBase21GetTriggerBoundingBoxEiP4AABB kind:function(arm,size=0xb0) addr:0x207fa4c -_ZN11TriggerBase14GetBoundingBoxEv kind:function(arm,size=0x8) addr:0x207fafc +_ZN11TriggerBase14GetBoundingBoxEP4AABB kind:function(arm,size=0x8) addr:0x207fafc _ZN7MapBase23GetTriggerBoundingBoxesEiP4AABBi kind:function(arm,size=0xc8) addr:0x207fb04 _ZN7MapBase21GetOverlappingTriggerEP5Vec3p kind:function(arm,size=0x64) addr:0x207fbcc -_ZN11TriggerBase8OverlapsEv kind:function(arm,size=0x8) addr:0x207fc30 +_ZN11TriggerBase8OverlapsEP5Vec3p kind:function(arm,size=0x8) addr:0x207fc30 _ZN7MapBase11FindTriggerEi kind:function(arm,size=0x48) addr:0x207fc38 _ZN7MapBase22GetOverlappingTriggersEP5Vec3pPP11TriggerBasei kind:function(arm,size=0x78) addr:0x207fc80 _ZN7MapBase23IsTriggerTypeOverlappedEiP5Vec3p kind:function(arm,size=0x78) addr:0x207fcf8 @@ -1198,35 +1198,35 @@ func_ov000_02095390 kind:function(arm,size=0x8) addr:0x2095330 func_ov000_02095398 kind:function(arm,size=0x8) addr:0x2095338 func_ov000_020953a0 kind:function(arm,size=0x40) addr:0x2095340 func_ov000_020953e0 kind:function(arm,size=0x1c) addr:0x2095380 -func_ov000_020953fc kind:function(arm,size=0x48) addr:0x209539c -func_ov000_02095444 kind:function(arm,size=0x40) addr:0x20953e4 -func_ov000_02095484 kind:function(arm,size=0x4) addr:0x2095424 -func_ov000_02095488 kind:function(arm,size=0x14) addr:0x2095428 -func_ov000_0209549c kind:function(arm,size=0x4) addr:0x209543c -func_ov000_020954a0 kind:function(arm,size=0xb4) addr:0x2095440 -func_ov000_02095554 kind:function(arm,size=0xb4) addr:0x20954f4 -func_ov000_02095608 kind:function(arm,size=0x14) addr:0x20955a8 -func_ov000_0209561c kind:function(arm,size=0x1c) addr:0x20955bc -func_ov000_02095638 kind:function(arm,size=0x14) addr:0x20955d8 -func_ov000_0209564c kind:function(arm,size=0xd4) addr:0x20955ec -func_ov000_02095720 kind:function(arm,size=0x44) addr:0x20956c0 -func_ov000_02095764 kind:function(arm,size=0x14) addr:0x2095704 -func_ov000_02095778 kind:function(arm,size=0x1c) addr:0x2095718 -func_ov000_02095794 kind:function(arm,size=0x88) addr:0x2095734 -func_ov000_0209581c kind:function(arm,size=0x54) addr:0x20957bc -func_ov000_02095870 kind:function(arm,size=0x38) addr:0x2095810 -func_ov000_020958a8 kind:function(arm,size=0x68) addr:0x2095848 -func_ov000_02095910 kind:function(arm,size=0x70) addr:0x20958b0 -func_ov000_02095980 kind:function(arm,size=0x18) addr:0x2095920 -func_ov000_02095998 kind:function(arm,size=0x370) addr:0x2095938 -func_ov000_02095d08 kind:function(arm,size=0x50) addr:0x2095ca8 -func_ov000_02095d58 kind:function(arm,size=0x60) addr:0x2095cf8 -func_ov000_02095db8 kind:function(arm,size=0x40) addr:0x2095d58 -func_ov000_02095df8 kind:function(arm,size=0x48) addr:0x2095d98 -func_ov000_02095e40 kind:function(arm,size=0x74) addr:0x2095de0 -func_ov000_02095eb4 kind:function(arm,size=0x10) addr:0x2095e54 -func_ov000_02095ec4 kind:function(arm,size=0x10) addr:0x2095e64 -func_ov000_02095ed4 kind:function(arm,size=0x38) addr:0x2095e74 +_ZN11TriggerBaseC2EP13TriggerParams kind:function(arm,size=0x48) addr:0x209539c +_ZN11TriggerBaseC2Ehjjj kind:function(arm,size=0x40) addr:0x20953e4 +_ZN11TriggerBaseD1Ev kind:function(arm,size=0x4) addr:0x2095424 +_ZN11TriggerBaseD0Ev kind:function(arm,size=0x14) addr:0x2095428 +_ZN11TriggerBaseD2Ev kind:function(arm,size=0x4) addr:0x209543c +_ZN11TriggerAABBC2EP13TriggerParams kind:function(arm,size=0xb4) addr:0x2095440 +_ZN11TriggerAABBC2Ehjjj kind:function(arm,size=0xb4) addr:0x20954f4 +_ZN11TriggerAABBD1Ev kind:function(arm,size=0x14) addr:0x20955a8 +_ZN11TriggerAABBD0Ev kind:function(arm,size=0x1c) addr:0x20955bc +_ZN11TriggerAABBD2Ev kind:function(arm,size=0x14) addr:0x20955d8 +_ZN13TriggerSphereC2EP13TriggerParams kind:function(arm,size=0xd4) addr:0x20955ec +_ZN13TriggerSphereC2Ehjjj kind:function(arm,size=0x44) addr:0x20956c0 +_ZN13TriggerSphereD1Ev kind:function(arm,size=0x14) addr:0x2095704 +_ZN13TriggerSphereD0Ev kind:function(arm,size=0x1c) addr:0x2095718 +_ZN13TriggerSphere14GetBoundingBoxEP4AABB kind:function(arm,size=0x88) addr:0x2095734 +_ZN16TriggerAABB_Unk2C2EP13TriggerParams kind:function(arm,size=0x54) addr:0x20957bc +_ZN21TriggerAABB_Unk2_Unk1C2Ev kind:function(arm,size=0x38) addr:0x2095810 +_ZN16TriggerAABB_Unk2D1Ev kind:function(arm,size=0x68) addr:0x2095848 +_ZN16TriggerAABB_Unk2D0Ev kind:function(arm,size=0x70) addr:0x20958b0 +_ZN16TriggerAABB_Unk28vfunc_08Ev kind:function(arm,size=0x18) addr:0x2095920 +_ZN16TriggerAABB_Unk28vfunc_0cEv kind:function(arm,size=0x370) addr:0x2095938 +_ZN16TriggerAABB_Unk28vfunc_10Ev kind:function(arm,size=0x50) addr:0x2095ca8 +_ZN16TriggerAABB_Unk1C2EP13TriggerParams kind:function(arm,size=0x60) addr:0x2095cf8 +_ZN16TriggerAABB_Unk1D1Ev kind:function(arm,size=0x40) addr:0x2095d58 +_ZN16TriggerAABB_Unk1D0Ev kind:function(arm,size=0x48) addr:0x2095d98 +_ZN16TriggerAABB_Unk18vfunc_08Ev kind:function(arm,size=0x74) addr:0x2095de0 +_ZN13TriggerSphere8OverlapsEP5Vec3p kind:function(arm,size=0x10) addr:0x2095e54 +_ZN11TriggerAABB8OverlapsEP5Vec3p kind:function(arm,size=0x10) addr:0x2095e64 +_ZN11TriggerAABB14GetBoundingBoxEP4AABB kind:function(arm,size=0x38) addr:0x2095e74 func_ov000_02095f0c kind:function(arm,size=0x34) addr:0x2095eac func_ov000_02095f40 kind:function(arm,size=0x1c) addr:0x2095ee0 func_ov000_02095f5c kind:function(arm,size=0x48) addr:0x2095efc @@ -1260,20 +1260,20 @@ func_ov000_020971b8 kind:function(arm,size=0x48) addr:0x2097158 func_ov000_02097200 kind:function(arm,size=0x28) addr:0x20971a0 func_ov000_02097228 kind:function(arm,size=0x8) addr:0x20971c8 func_ov000_02097230 kind:function(arm,size=0x10) addr:0x20971d0 -func_ov000_02097240 kind:function(arm,size=0xa0) addr:0x20971e0 -func_ov000_020972e0 kind:function(arm,size=0x4) addr:0x2097280 -func_ov000_020972e4 kind:function(arm,size=0x70) addr:0x2097284 -func_ov000_02097354 kind:function(arm,size=0xb8) addr:0x20972f4 -func_ov000_0209740c kind:function(arm,size=0x4c) addr:0x20973ac -func_ov000_02097458 kind:function(arm,size=0x20) addr:0x20973f8 -func_ov000_02097478 kind:function(arm,size=0x4c) addr:0x2097418 -func_ov000_020974c4 kind:function(arm,size=0x20) addr:0x2097464 -func_ov000_020974e4 kind:function(arm,size=0x4c) addr:0x2097484 -func_ov000_02097530 kind:function(arm,size=0x20) addr:0x20974d0 -func_ov000_02097550 kind:function(arm,size=0x4c) addr:0x20974f0 -func_ov000_0209759c kind:function(arm,size=0x20) addr:0x209753c -func_ov000_020975bc kind:function(arm,size=0x4c) addr:0x209755c -func_ov000_02097608 kind:function(arm,size=0x20) addr:0x20975a8 +_ZN7MapDataC1EPhccii kind:function(arm,size=0xa0) addr:0x20971e0 +_ZN7MapDataD1Ev kind:function(arm,size=0x4) addr:0x2097280 +_ZN7MapData19func_ov000_020972e4EPtPib kind:function(arm,size=0x70) addr:0x2097284 +_ZN7MapData19func_ov000_02097354Ev kind:function(arm,size=0xb8) addr:0x20972f4 +_ZN7MapData8SetFlag0Ejb kind:function(arm,size=0x4c) addr:0x20973ac +_ZN7MapData8GetFlag0Ej kind:function(arm,size=0x20) addr:0x20973f8 +_ZN7MapData8SetFlag1Ejb kind:function(arm,size=0x4c) addr:0x2097418 +_ZN7MapData8GetFlag1Ej kind:function(arm,size=0x20) addr:0x2097464 +_ZN7MapData8SetFlag2Ejb kind:function(arm,size=0x4c) addr:0x2097484 +_ZN7MapData8GetFlag2Ej kind:function(arm,size=0x20) addr:0x20974d0 +_ZN7MapData8SetFlag3Ejb kind:function(arm,size=0x4c) addr:0x20974f0 +_ZN7MapData8GetFlag3Ej kind:function(arm,size=0x20) addr:0x209753c +_ZN7MapData8SetFlag4Ejb kind:function(arm,size=0x4c) addr:0x209755c +_ZN7MapData8GetFlag4Ej kind:function(arm,size=0x20) addr:0x20975a8 _ZN14AdventureFlags6ExistsEv kind:function(arm,size=0x1c) addr:0x20975c8 _ZN14AdventureFlags6CopyToEPi kind:function(arm,size=0x30) addr:0x20975e4 _ZN14AdventureFlags18func_ov00_02097674Ev kind:function(arm,size=0x10) addr:0x2097614 @@ -1321,23 +1321,23 @@ _ZN14AdventureFlags18func_ov00_02098074Eisiib kind:function(arm,size=0x28) addr: _ZN14AdventureFlags18func_ov00_0209809cEv kind:function(arm,size=0x10) addr:0x209803c _ZN14AdventureFlags18func_ov00_020980acEv kind:function(arm,size=0x10) addr:0x209804c _ZN14AdventureFlags18func_ov00_020980bcEi kind:function(arm,size=0x14) addr:0x209805c -_ZN14AdventureFlags18func_ov00_020980d0Ev kind:function(arm,size=0x24) addr:0x2098070 -func_ov000_020980f4 kind:function(arm,size=0x4) addr:0x2098094 -func_ov000_020980f8 kind:function(arm,size=0x4) addr:0x2098098 -func_ov000_020980fc kind:function(arm,size=0x18) addr:0x209809c -func_ov000_02098114 kind:function(arm,size=0x3c) addr:0x20980b4 -func_ov000_02098150 kind:function(arm,size=0x68) addr:0x20980f0 -func_ov000_020981b8 kind:function(arm,size=0x408) addr:0x2098158 -func_ov000_020985c0 kind:function(arm,size=0x4) addr:0x2098560 -func_ov000_020985c4 kind:function(arm,size=0x54) addr:0x2098564 -func_ov000_02098618 kind:function(arm,size=0x40) addr:0x20985b8 -func_ov000_02098658 kind:function(arm,size=0x3c) addr:0x20985f8 -func_ov000_02098694 kind:function(arm,size=0x130) addr:0x2098634 -func_ov000_020987c4 kind:function(arm,size=0x70) addr:0x2098764 -func_ov000_02098834 kind:function(arm,size=0x2c) addr:0x20987d4 -func_ov000_02098860 kind:function(arm,size=0x30) addr:0x2098800 -func_ov000_02098890 kind:function(arm,size=0x90) addr:0x2098830 -func_ov000_02098920 kind:function(arm,size=0x88) addr:0x20988c0 +_ZN8FlagsUnkD1Ev kind:function(arm,size=0x24) addr:0x2098070 +_ZN9FlagsUnk2D1Ev kind:function(arm,size=0x4) addr:0x2098094 +_ZN8FlagsUnk19func_ov000_020980f8Ev kind:function(arm,size=0x4) addr:0x2098098 +_ZN15CutsceneHandler19func_ov000_020980fcEiiPPv kind:function(arm,size=0x18) addr:0x209809c +_ZN15CutsceneHandler19func_ov000_02098114Ev kind:function(arm,size=0x3c) addr:0x20980b4 +_ZN15CutsceneHandler12SkipCutsceneEi kind:function(arm,size=0x68) addr:0x20980f0 +_ZN15CutsceneHandler19func_ov000_020981b8EPi kind:function(arm,size=0x408) addr:0x2098158 +_ZN15CutsceneHandler19func_ov000_020985c0Ev kind:function(arm,size=0x4) addr:0x2098560 +_ZN15CutsceneHandler19func_ov000_020985c4Ev kind:function(arm,size=0x54) addr:0x2098564 +_ZN15CutsceneHandler19func_ov000_02098618EiiPPv kind:function(arm,size=0x40) addr:0x20985b8 +_ZN15CutsceneHandler19func_ov000_02098658Ev kind:function(arm,size=0x3c) addr:0x20985f8 +_ZN15CutsceneHandler19func_ov000_02098694Ei kind:function(arm,size=0x130) addr:0x2098634 +_ZN15CutsceneHandler19func_ov000_020987c4Eisiib kind:function(arm,size=0x70) addr:0x2098764 +_ZN15CutsceneHandler19func_ov000_02098834Ev kind:function(arm,size=0x2c) addr:0x20987d4 +_ZN15CutsceneHandler19func_ov000_02098860Ev kind:function(arm,size=0x30) addr:0x2098800 +_ZN15CutsceneHandler19func_ov000_02098890Eii kind:function(arm,size=0x90) addr:0x2098830 +_ZN15CutsceneHandler19func_ov000_02098920Ei kind:function(arm,size=0x88) addr:0x20988c0 func_ov000_020989a8 kind:function(arm,size=0x18c) addr:0x2098948 func_ov000_02098b34 kind:function(arm,size=0xc) addr:0x2098ad4 func_ov000_02098b40 kind:function(arm,size=0xc) addr:0x2098ae0 @@ -1986,32 +1986,32 @@ _ZN12TouchGestureD2Ev kind:function(arm,size=0x4) addr:0x20a94e4 _ZN16TouchGestureBaseD2Ev kind:function(arm,size=0x4) addr:0x20a94e8 _ZN16TouchGestureBase17ResetTouchHistoryEv kind:function(arm,size=0xc) addr:0x20a94ec _ZN16TouchGestureBaseD1Ev kind:function(arm,size=0x14) addr:0x20a94f8 -func_ov000_020a956c kind:function(thumb,size=0x1c) addr:0x20a950c -func_ov000_020a9588 kind:function(thumb,size=0x1c) addr:0x20a9528 -func_ov000_020a95a4 kind:function(thumb,size=0x20) addr:0x20a9544 -func_ov000_020a95c4 kind:function(thumb,size=0x28) addr:0x20a9564 -func_ov000_020a95ec kind:function(thumb,size=0x20) addr:0x20a958c -func_ov000_020a960c kind:function(arm,size=0x8) addr:0x20a95ac -func_ov000_020a9614 kind:function(arm,size=0x10) addr:0x20a95b4 -func_ov000_020a9624 kind:function(arm,size=0x2c) addr:0x20a95c4 -func_ov000_020a9650 kind:function(arm,size=0x84) addr:0x20a95f0 -func_ov000_020a96d4 kind:function(arm,size=0x6c) addr:0x20a9674 -func_ov000_020a9740 kind:function(arm,size=0x24) addr:0x20a96e0 -func_ov000_020a9764 kind:function(arm,size=0x6c) addr:0x20a9704 -func_ov000_020a97d0 kind:function(arm,size=0x10) addr:0x20a9770 -func_ov000_020a97e0 kind:function(arm,size=0x18) addr:0x20a9780 -func_ov000_020a97f8 kind:function(arm,size=0x6c) addr:0x20a9798 -func_ov000_020a9864 kind:function(arm,size=0x2c) addr:0x20a9804 -func_ov000_020a9890 kind:function(arm,size=0x2c) addr:0x20a9830 -func_ov000_020a98bc kind:function(arm,size=0x2c) addr:0x20a985c -func_ov000_020a98e8 kind:function(arm,size=0x24) addr:0x20a9888 -func_ov000_020a990c kind:function(arm,size=0x2c) addr:0x20a98ac -func_ov000_020a9938 kind:function(thumb,size=0x28) addr:0x20a98d8 -func_ov000_020a9960 kind:function(arm,size=0x8) addr:0x20a9900 -func_ov000_020a9968 kind:function(arm,size=0x2c) addr:0x20a9908 -func_ov000_020a9994 kind:function(arm,size=0x4) addr:0x20a9934 -func_ov000_020a9998 kind:function(arm,size=0x28) addr:0x20a9938 -func_ov000_020a99c0 kind:function(arm,size=0x20) addr:0x20a9960 +_ZN11ModelRenderC2Ev kind:function(thumb,size=0x1c) addr:0x20a950c +_ZN11ModelRenderC1Ev kind:function(thumb,size=0x1c) addr:0x20a9528 +_ZN11ModelRenderD1Ev kind:function(thumb,size=0x20) addr:0x20a9544 +_ZN11ModelRenderD0Ev kind:function(thumb,size=0x28) addr:0x20a9564 +_ZN11ModelRenderD2Ev kind:function(thumb,size=0x20) addr:0x20a958c +_ZN11ModelRender14GetLcdcAddressEv kind:function(arm,size=0x8) addr:0x20a95ac +_ZN11ModelRender8vfunc_0cEP9ItemModel kind:function(arm,size=0x10) addr:0x20a95b4 +_ZN11ModelRender19func_ov000_020a9624Ei kind:function(arm,size=0x2c) addr:0x20a95c4 +_ZN11ModelRender12SetTransformEP5Vec3pP5Mat3pS1_ kind:function(arm,size=0x84) addr:0x20a95f0 +_ZN11ModelRender22SetRotationTranslationEP5Mat3pP5Vec3p kind:function(arm,size=0x6c) addr:0x20a9674 +_ZN11ModelRender14SetTranslationEP5Vec3p kind:function(arm,size=0x24) addr:0x20a96e0 +_ZN11ModelRender20PushGeometryCommandsEv kind:function(arm,size=0x6c) addr:0x20a9704 +_ZN11ModelRender8vfunc_20Ev kind:function(arm,size=0x10) addr:0x20a9770 +_ZN11ModelRender8vfunc_24Ei kind:function(arm,size=0x18) addr:0x20a9780 +_ZN11ModelRender8vfunc_28Ev kind:function(arm,size=0x6c) addr:0x20a9798 +_ZN11ModelRender8vfunc_2cEv kind:function(arm,size=0x2c) addr:0x20a9804 +_ZN11ModelRender8vfunc_34Ev kind:function(arm,size=0x2c) addr:0x20a9830 +_ZN11ModelRender8vfunc_30Ev kind:function(arm,size=0x2c) addr:0x20a985c +_ZN11ModelRender19func_ov000_020a98e8Ei kind:function(arm,size=0x24) addr:0x20a9888 +_ZN11ModelRender19func_ov000_020a990cEi kind:function(arm,size=0x2c) addr:0x20a98ac +_ZN11ModelRender19func_ov000_020a9938Ei kind:function(thumb,size=0x28) addr:0x20a98d8 +_ZN11ModelRender19func_ov000_020a9960Ei kind:function(arm,size=0x8) addr:0x20a9900 +_ZN11ModelRender8vfunc_38Ev kind:function(arm,size=0x2c) addr:0x20a9908 +_ZN11ModelRender8vfunc_3cEv kind:function(arm,size=0x4) addr:0x20a9934 +_ZN11ModelRender19func_ov000_020a9998Eii kind:function(arm,size=0x28) addr:0x20a9938 +_ZN11ModelRender19func_ov000_020a99c0Ev kind:function(arm,size=0x20) addr:0x20a9960 func_ov000_020a99e0 kind:function(thumb,size=0x40) addr:0x20a9980 func_ov000_020a9a20 kind:function(thumb,size=0x20) addr:0x20a99c0 func_ov000_020a9a40 kind:function(thumb,size=0x28) addr:0x20a99e0 @@ -2230,16 +2230,16 @@ _ZN13PlayerControl14IsTouchingFastEv kind:function(arm,size=0x30) addr:0x20b12ec _ZN13PlayerControl11IsTappedNowEv kind:function(arm,size=0x48) addr:0x20b131c _ZN13PlayerControl18func_ov00_020b13c4Ev kind:function(arm,size=0xd4) addr:0x20b1364 func_ov000_020b1498 kind:function(arm,size=0x90) addr:0x20b1438 -func_ov000_020b1528 kind:function(thumb,size=0x14) addr:0x20b14c8 -func_ov000_020b153c kind:function(thumb,size=0x14) addr:0x20b14dc -func_ov000_020b1550 kind:function(thumb,size=0xc) addr:0x20b14f0 -func_ov000_020b155c kind:function(thumb,size=0x14) addr:0x20b14fc -func_ov000_020b1570 kind:function(thumb,size=0xc) addr:0x20b1510 -func_ov000_020b157c kind:function(arm,size=0x1c) addr:0x20b151c -func_ov000_020b1598 kind:function(arm,size=0x8) addr:0x20b1538 -func_ov000_020b15a0 kind:function(arm,size=0x8) addr:0x20b1540 -func_ov000_020b15a8 kind:function(arm,size=0x198) addr:0x20b1548 -func_ov000_020b1740 kind:function(arm,size=0x4c) addr:0x20b16e0 +_ZN24UnkStruct_ov000_020b1528C2Ev kind:function(thumb,size=0x14) addr:0x20b14c8 +_ZN24UnkStruct_ov000_020b1528C1Ev kind:function(thumb,size=0x14) addr:0x20b14dc +_ZN24UnkStruct_ov000_020b1528D1Ev kind:function(thumb,size=0xc) addr:0x20b14f0 +_ZN24UnkStruct_ov000_020b1528D0Ev kind:function(thumb,size=0x14) addr:0x20b14fc +_ZN24UnkStruct_ov000_020b1528D2Ev kind:function(thumb,size=0xc) addr:0x20b1510 +_ZN24UnkStruct_ov000_020b15285ClearEv kind:function(arm,size=0x1c) addr:0x20b151c +_ZN24UnkStruct_ov000_020b15288vfunc_08Ev kind:function(arm,size=0x8) addr:0x20b1538 +_ZN24UnkStruct_ov000_020b15288vfunc_0cEv kind:function(arm,size=0x8) addr:0x20b1540 +_ZN24UnkStruct_ov000_020b15288vfunc_10EPi kind:function(arm,size=0x198) addr:0x20b1548 +_ZN24UnkStruct_ov000_020b15288vfunc_14EPti kind:function(arm,size=0x4c) addr:0x20b16e0 func_ov000_020b178c kind:function(arm,size=0x60) addr:0x20b172c func_ov000_020b17ec kind:function(arm,size=0xec) addr:0x20b178c func_ov000_020b18d8 kind:function(arm,size=0x68) addr:0x20b1878 @@ -4081,11 +4081,11 @@ data_ov000_020e2f68 kind:data(any) addr:0x20e2f08 data_ov000_020e2f98 kind:data(any) addr:0x20e2f38 data_ov000_020e2fa8 kind:data(any) addr:0x20e2f48 data_ov000_020e2fb4 kind:data(any) addr:0x20e2f54 -data_ov000_020e2fd4 kind:data(any) addr:0x20e2f74 -data_ov000_020e2ff8 kind:data(any) addr:0x20e2f98 -data_ov000_020e301c kind:data(any) addr:0x20e2fbc -data_ov000_020e3040 kind:data(any) addr:0x20e2fe0 -data_ov000_020e3064 kind:data(any) addr:0x20e3004 +_ZTV16TriggerAABB_Unk1 kind:data(any) addr:0x20e2f74 +_ZTV16TriggerAABB_Unk2 kind:data(any) addr:0x20e2f98 +_ZTV13TriggerSphere kind:data(any) addr:0x20e2fbc +_ZTV11TriggerAABB kind:data(any) addr:0x20e2fe0 +_ZTV11TriggerBase kind:data(any) addr:0x20e3004 data_ov000_020e3080 kind:data(any) addr:0x20e3020 data_ov000_020e3084 kind:data(any) addr:0x20e3024 data_ov000_020e3088 kind:data(any) addr:0x20e3028 diff --git a/include/Cutscene/CutsceneHandler.hpp b/include/Cutscene/CutsceneHandler.hpp index 3f1858df..50f0c1cb 100644 --- a/include/Cutscene/CutsceneHandler.hpp +++ b/include/Cutscene/CutsceneHandler.hpp @@ -3,4 +3,59 @@ #include "global.h" #include "types.h" -class CutsceneHandler; +#include + +#include "Render/FadeControl.hpp" + +class CutsceneHandler { +public: + /* 00 */ u32 mFlags1; + /* 04 */ u32 mFlags2; + /* 08 */ bool mCutsceneActive; + /* 09 */ bool mSkipping; + /* 0a */ bool mUnk_0a; + /* 0b */ unk8 mUnk_0b; + /* 0c */ unk32 mCutsceneTimer1; + /* 10 */ unk32 mCutsceneTimer2; + /* 14 */ unk32 mCutsceneEnd; + /* 18 */ unk32 mFreeze; + /* 1c */ u32 mUnk_1c; + /* 20 */ unk8 mUnk_20; + /* 21 */ char mUnk_21; + /* 22 */ unk8 mUnk_22; + /* 23 */ unk8 mUnk_23; + /* 24 */ unk16 mUnk_24; + /* 26 */ unk8 mUnk_26[0x2]; + /* 28 */ s32 mUnk_28; + /* 2c */ s32 mUnk_2c; + /* 30 */ unk32 mUnk_30; + /* 34 */ unk32 mUnk_34; + /* 38 */ unk32 mUnk_38; + /* 3c */ unk32 mUnk_3c; + /* 40 */ unk32 mUnk_40; + /* 44 */ unk32 mUnk_44; + /* 48 */ unk16 mUnk_48; + /* 4a */ unk8 mUnk_4a[0x2]; + /* 4c */ Mat4x3p mUnk_4c; + /* 7c */ FadeControl *mFadeControl; + /* 80 */ s32 **mUnk_80; + /* 84 */ s32 *mUnk_84; + /* 88 */ s32 mUnk_88; + /* 8c */ + + CutsceneHandler(); + s32 func_ov000_020980fc(unk32 param1, unk32 param2, void **param3); + bool func_ov000_02098114(); + bool SkipCutscene(s32 param1); + unk32 func_ov000_020981b8(unk32 *param1); + void func_ov000_020985c0(); + void func_ov000_020985c4(); + void func_ov000_02098618(s32 param1, unk32 param2, void **param3); + void func_ov000_02098658(); + bool func_ov000_02098694(unk32 param1); + bool func_ov000_020987c4(unk32 param1, unk16 param2, unk32 param3, unk32 param4, bool param5); + bool func_ov000_02098834(); + bool func_ov000_02098860(); + unk32 func_ov000_02098890(unk32 param1, s32 param2); + static unk32 func_ov000_02098920(unk32 param1); +}; diff --git a/include/Map/MapData.hpp b/include/Map/MapData.hpp index 295e2309..35dbc007 100644 --- a/include/Map/MapData.hpp +++ b/include/Map/MapData.hpp @@ -21,8 +21,22 @@ public: /* 20 */ unk32 mFlags0[1]; /* 24 */ unk32 mFlags1[8]; /* 44 */ unk32 mFlags2[2]; - /* 4c */ unk32 mFlags3[1]; - /* 50 */ unk32 mUnk_50; - /* 54 */ unk32 mUnk_54; + /* 4c */ unk32 mFlags3[2]; + /* 54 */ unk32 mFlags4[1]; /* 58 */ + + MapData(u8 *map, unk8 param2, unk8 param3, unk32 param4, unk32 param5); + ~MapData(); + void func_ov000_020972e4(u16 *param1, unk32 *param2, bool param3); + void func_ov000_02097354(); + void SetFlag0(u32 index, bool value); + bool GetFlag0(u32 index); + void SetFlag1(u32 index, bool value); + bool GetFlag1(u32 index); + void SetFlag2(u32 index, bool value); + bool GetFlag2(u32 index); + void SetFlag3(u32 index, bool value); + bool GetFlag3(u32 index); + void SetFlag4(u32 index, bool value); + bool GetFlag4(u32 index); }; diff --git a/include/Map/TriggerAABB.hpp b/include/Map/TriggerAABB.hpp index a1d7e782..331f25ad 100644 --- a/include/Map/TriggerAABB.hpp +++ b/include/Map/TriggerAABB.hpp @@ -7,7 +7,16 @@ #include "Physics/AABB.hpp" class TriggerAABB : public TriggerBase { +public: /* 00 (base) */ /* 14 */ AABB mAABB; /* 2c */ + + /* 00 */ virtual ~TriggerAABB() override; + /* 14 */ virtual bool Overlaps(Vec3p *point) override; + /* 18 */ virtual bool GetBoundingBox(AABB *bbox) override; + /* 1c */ + + TriggerAABB(TriggerParams *params); + TriggerAABB(u8 id, u32 param2, u32 param3, u32 param4); }; diff --git a/include/Map/TriggerAABB_Unk1.hpp b/include/Map/TriggerAABB_Unk1.hpp index 55edbfca..59692b6b 100644 --- a/include/Map/TriggerAABB_Unk1.hpp +++ b/include/Map/TriggerAABB_Unk1.hpp @@ -6,6 +6,7 @@ #include "Map/TriggerAABB.hpp" class TriggerAABB_Unk1 : public TriggerAABB { +public: /* 00 (base) */ /* 2c */ unk8 mUnk_2c; /* 2d */ unk8 mUnk_2d[3]; @@ -17,4 +18,10 @@ class TriggerAABB_Unk1 : public TriggerAABB { /* 3c */ unk32 mUnk_3c; /* 40 */ unk32 mUnk_40; /* 44 */ + + /* 00 */ virtual ~TriggerAABB_Unk1() override; + /* 08 */ virtual void vfunc_08() override; + /* 1c */ + + TriggerAABB_Unk1(TriggerParams *params); }; diff --git a/include/Map/TriggerAABB_Unk2.hpp b/include/Map/TriggerAABB_Unk2.hpp index c87c34ba..93030c31 100644 --- a/include/Map/TriggerAABB_Unk2.hpp +++ b/include/Map/TriggerAABB_Unk2.hpp @@ -4,10 +4,47 @@ #include "types.h" #include "Map/TriggerAABB.hpp" +#include "Unknown/UnkStruct_ov000_020e2f04.hpp" + +class TriggerAABB_Unk2_Unk1 : public UnkStruct_ov000_020e2f04 { +public: + /* 00 (base) */ + /* 10 */ unk32 mUnk_10; + /* 14 */ AABB mUnk_14; + /* 2c */ + + /* 00 */ ~TriggerAABB_Unk2_Unk1() override; + /* 08 */ unk32 vfunc_08() override; + /* 14 */ void vfunc_14(AABB *param1, unk32 param2, unk32 param3, unk32 param4) override; + /* 20 */ void SetBoundingBox(AABB *param1) override; + /* 2c */ void GetBoundingBox(AABB *bbox) override; + /* 30 */ void SetPosition(Vec3p *pos) override; + /* 34 */ void vfunc_34() override; + /* 38 */ void vfunc_38() override; + /* 3c */ void GetPosition(Vec3p *pos) override; + /* 40 */ q20 GetSizeXZ() override; + /* 44 */ q20 GetHeight() override; + /* 48 */ bool ContainsInXZ(Vec3p *pos) override; + /* 4c */ bool Contains(Vec3p *pos) override; + /* 50 */ bool IntersectsCube(Cube *cube) override; + /* 54 */ void vfunc_54(Cube *param1, Vec3p *param2, u32 *param3) override; + /* 5c */ + + TriggerAABB_Unk2_Unk1(); +}; class TriggerAABB_Unk2 : public TriggerAABB { +public: /* 00 (base) */ /* 2c */ unk32 mUnk_2c; - /* 30 */ unk8 mUnk_30[0x2c][4]; // non-documented class which inherits from base class + /* 30 */ TriggerAABB_Unk2_Unk1 mUnk_30[4]; /* e0 */ + + /* 00 */ virtual ~TriggerAABB_Unk2() override; + /* 08 */ virtual void vfunc_08() override; + /* 0c */ virtual unk32 vfunc_0c() override; + /* 10 */ virtual unk32 vfunc_10() override; + /* 1c */ + + TriggerAABB_Unk2(TriggerParams *params); }; diff --git a/include/Map/TriggerBase.hpp b/include/Map/TriggerBase.hpp index 03046e71..49311e1e 100644 --- a/include/Map/TriggerBase.hpp +++ b/include/Map/TriggerBase.hpp @@ -3,6 +3,9 @@ #include "global.h" #include "types.h" +#include "nds/math.h" + +#include "Physics/AABB.hpp" #include "System/SysNew.hpp" struct TriggerParams { @@ -21,6 +24,7 @@ struct TriggerParams { }; class TriggerBase : public SysObject { +public: /* 00 (vtable) */ /* 04 */ unk8 mUnk_04; /* 05 */ u8 mId; @@ -31,10 +35,13 @@ class TriggerBase : public SysObject { /* 14 */ /* 00 */ virtual ~TriggerBase(); - /* 08 */ void vfunc_08(); - /* 0c */ unk32 vfunc_0c(); - /* 10 */ unk32 vfunc_10(); - /* 14 */ bool Overlaps(); - /* 18 */ bool GetBoundingBox(); + /* 08 */ virtual void vfunc_08(); + /* 0c */ virtual unk32 vfunc_0c(); + /* 10 */ virtual unk32 vfunc_10(); + /* 14 */ virtual bool Overlaps(Vec3p *point); + /* 18 */ virtual bool GetBoundingBox(AABB *bbox); /* 1c */ + + TriggerBase(TriggerParams *params); + TriggerBase(u8 id, u32 param2, u32 param3, u32 param4); }; diff --git a/include/Map/TriggerSphere.hpp b/include/Map/TriggerSphere.hpp index 56a874df..12d6d9e1 100644 --- a/include/Map/TriggerSphere.hpp +++ b/include/Map/TriggerSphere.hpp @@ -11,4 +11,12 @@ class TriggerSphere : public TriggerBase { /* 14 */ Sphere mSphere; /* 24 */ s32 mHeight; /* 28 */ + + /* 00 */ virtual ~TriggerSphere() override; + /* 14 */ virtual bool Overlaps(Vec3p *point) override; + /* 18 */ virtual bool GetBoundingBox(AABB *bbox) override; + /* 1c */ + + TriggerSphere(TriggerParams *params); + TriggerSphere(u8 id, u32 param2, u32 param3, u32 param4); }; diff --git a/include/Render/ModelRender.hpp b/include/Render/ModelRender.hpp index e6c26635..a9242578 100644 --- a/include/Render/ModelRender.hpp +++ b/include/Render/ModelRender.hpp @@ -3,6 +3,8 @@ #include "global.h" #include "types.h" +#include + #include "System/SysNew.hpp" class ItemModel; @@ -37,4 +39,13 @@ public: /* 38 */ virtual void vfunc_38(); /* 3c */ virtual void vfunc_3c(); /* 40 */ + + ModelRender(); + void *func_ov000_020a9624(s32 param1); + void func_ov000_020a98e8(unk32 param1); + void func_ov000_020a990c(unk32 param1); + void func_ov000_020a9938(unk32 param1); + void func_ov000_020a9960(unk32 param1); + void func_ov000_020a9998(unk32 param1, unk32 param2); + void func_ov000_020a99c0(); }; diff --git a/include/Save/AdventureFlags.hpp b/include/Save/AdventureFlags.hpp index 2a353075..dc2b2bfa 100644 --- a/include/Save/AdventureFlags.hpp +++ b/include/Save/AdventureFlags.hpp @@ -51,6 +51,8 @@ struct FlagsUnk2 { /* 16 */ unk8 mUnk_16; /* 17 */ unk8 mUnk_17; /* 18 */ + + ~FlagsUnk2(); }; struct FlagsUnk { @@ -69,6 +71,10 @@ struct FlagsUnk { /* 4a */ unk8 mUnk_4a; /* 4b */ unk8 mUnk_4b; /* 4c */ + + ~FlagsUnk(); + + void func_ov000_020980f8(); }; class AdventureFlags : public SysObject { @@ -125,7 +131,6 @@ public: bool func_ov00_0209809c(); bool func_ov00_020980ac(); void func_ov00_020980bc(s32 param1); - void func_ov00_020980d0(); }; extern AdventureFlags *gAdventureFlags; diff --git a/include/Unknown/UnkStruct_ov000_020b1528.hpp b/include/Unknown/UnkStruct_ov000_020b1528.hpp new file mode 100644 index 00000000..2169564b --- /dev/null +++ b/include/Unknown/UnkStruct_ov000_020b1528.hpp @@ -0,0 +1,27 @@ +#pragma once + +#include "global.h" +#include "types.h" + +#include + +class UnkStruct_ov000_020b1528 { +public: + /* 00 (vtable) */ + /* 04 */ unk16 mUnk_04; + /* 06 */ unk8 mUnk_06[0x2]; + /* 08 */ Vec3p mUnk_08; + /* 14 */ u32 mUnk_14; + /* 18 */ unk32 mUnk_18; + /* 1c */ + + /* 00 */ virtual ~UnkStruct_ov000_020b1528(); + /* 08 */ virtual bool vfunc_08(); + /* 0c */ virtual bool vfunc_0c(); + /* 10 */ virtual bool vfunc_10(s32 *param1); + /* 14 */ virtual bool vfunc_14(u16 *index, unk32 param2); + /* 18 */ virtual void Clear(); + /* 1c */ + + UnkStruct_ov000_020b1528(); +}; diff --git a/include/Unknown/UnkStruct_ov000_020e2f04.hpp b/include/Unknown/UnkStruct_ov000_020e2f04.hpp new file mode 100644 index 00000000..f3e226a6 --- /dev/null +++ b/include/Unknown/UnkStruct_ov000_020e2f04.hpp @@ -0,0 +1,45 @@ +#pragma once + +#include "global.h" +#include "types.h" + +class UnkStruct_ov000_020e2f04 { +public: + /* 00 (vtable) */ + /* 04 */ unk8 mUnk_04; + /* 05 */ unk8 mUnk_05; + /* 06 */ unk8 mUnk_06[0x2]; + /* 08 */ unk32 mUnk_08; + /* 0c */ unk32 mUnk_0c; + /* 10 */ + + /* 00 */ virtual ~UnkStruct_ov000_020e2f04(); + /* 08 */ virtual unk32 vfunc_08() = 0; + /* 0c */ virtual void vfunc_0c(); + /* 10 */ virtual void vfunc_10(); + /* 14 */ virtual void vfunc_14(AABB *param1, unk32 param2, unk32 param3, unk32 param4); + /* 18 */ virtual void vfunc_18(); + /* 1c */ virtual void vfunc_1c(); + /* 20 */ virtual void SetBoundingBox(AABB *param1); + /* 24 */ virtual void vfunc_24(); + /* 28 */ virtual void vfunc_28(); + /* 2c */ virtual void GetBoundingBox(AABB *bbox); + /* 30 */ virtual void SetPosition(Vec3p *pos) = 0; + /* 34 */ virtual void vfunc_34() = 0; + /* 38 */ virtual void vfunc_38() = 0; + /* 3c */ virtual void GetPosition(Vec3p *pos) = 0; + /* 40 */ virtual q20 GetSizeXZ() = 0; + /* 44 */ virtual q20 GetHeight() = 0; + /* 48 */ virtual bool ContainsInXZ(Vec3p *pos) = 0; + /* 4c */ virtual bool Contains(Vec3p *pos) = 0; + /* 50 */ virtual bool IntersectsCube(Cube *cube) = 0; + /* 54 */ virtual void vfunc_54(Cube *param1, Vec3p *param2, u32 *param3) = 0; + /* 58 */ virtual void vfunc_58(unk32 param1, unk32 param2, s32 param3); + /* 5c */ + + inline UnkStruct_ov000_020e2f04() : + mUnk_04(1), + mUnk_05(0), + mUnk_08(0), + mUnk_0c(0) {} +}; diff --git a/src/00_Core/Cutscene/CutsceneHandler.cpp b/src/00_Core/Cutscene/CutsceneHandler.cpp new file mode 100644 index 00000000..c55730ba --- /dev/null +++ b/src/00_Core/Cutscene/CutsceneHandler.cpp @@ -0,0 +1,16 @@ +#include "Cutscene/CutsceneHandler.hpp" + +s32 CutsceneHandler::func_ov000_020980fc(unk32 param1, unk32 param2, void **param3) {} +bool CutsceneHandler::func_ov000_02098114() {} +bool CutsceneHandler::SkipCutscene(s32 param1) {} +unk32 CutsceneHandler::func_ov000_020981b8(unk32 *param1) {} +void CutsceneHandler::func_ov000_020985c0() {} +void CutsceneHandler::func_ov000_020985c4() {} +void CutsceneHandler::func_ov000_02098618(s32 param1, unk32 param2, void **param3) {} +void CutsceneHandler::func_ov000_02098658() {} +bool CutsceneHandler::func_ov000_02098694(unk32 param1) {} +bool CutsceneHandler::func_ov000_020987c4(unk32 param1, unk16 param2, unk32 param3, unk32 param4, bool param5) {} +bool CutsceneHandler::func_ov000_02098834() {} +bool CutsceneHandler::func_ov000_02098860() {} +unk32 CutsceneHandler::func_ov000_02098890(unk32 param1, s32 param2) {} +unk32 CutsceneHandler::func_ov000_02098920(unk32 param1) {} diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp index 8d6d3c96..46f4e40b 100644 --- a/src/00_Core/Map/MapBase.cpp +++ b/src/00_Core/Map/MapBase.cpp @@ -69,10 +69,10 @@ unk8 MapBase::func_ov00_0207f948(unk32 param_2) {} void MapBase::AddTrigger(TriggerParams *param_2) {} void TriggerBase::vfunc_08() {} s32 MapBase::GetTriggerBoundingBox(unk32 param_2, AABB *param_3) {} -bool TriggerBase::GetBoundingBox() {} +bool TriggerBase::GetBoundingBox(AABB *bbox) {} unk8 MapBase::GetTriggerBoundingBoxes(unk32 param_2, AABB *param_3, unk32 param_4) {} unk32 MapBase::GetOverlappingTrigger(Vec3p *param_2) {} -bool TriggerBase::Overlaps() {} +bool TriggerBase::Overlaps(Vec3p *point) {} unk8 MapBase::FindTrigger(unk32 type) {} unk8 MapBase::GetOverlappingTriggers(Vec3p *param_2, TriggerBase **triggers, unk32 capacity) {} bool MapBase::IsTriggerTypeOverlapped(unk32 type, Vec3p *param_3) {} diff --git a/src/00_Core/Map/MapData.cpp b/src/00_Core/Map/MapData.cpp new file mode 100644 index 00000000..2df3b5c8 --- /dev/null +++ b/src/00_Core/Map/MapData.cpp @@ -0,0 +1,16 @@ +#include "Map/MapData.hpp" + +MapData::MapData(u8 *map, unk8 param2, unk8 param3, unk32 param4, unk32 param5) {} +MapData::~MapData() {} +void MapData::func_ov000_020972e4(u16 *param1, unk32 *param2, bool param3) {} +void MapData::func_ov000_02097354() {} +void MapData::SetFlag0(u32 index, bool value) {} +bool MapData::GetFlag0(u32 index) {} +void MapData::SetFlag1(u32 index, bool value) {} +bool MapData::GetFlag1(u32 index) {} +void MapData::SetFlag2(u32 index, bool value) {} +bool MapData::GetFlag2(u32 index) {} +void MapData::SetFlag3(u32 index, bool value) {} +bool MapData::GetFlag3(u32 index) {} +void MapData::SetFlag4(u32 index, bool value) {} +bool MapData::GetFlag4(u32 index) {} diff --git a/src/00_Core/Map/Trigger.cpp b/src/00_Core/Map/Trigger.cpp new file mode 100644 index 00000000..7e1bb785 --- /dev/null +++ b/src/00_Core/Map/Trigger.cpp @@ -0,0 +1,40 @@ +#include "Map/TriggerAABB.hpp" +#include "Map/TriggerAABB_Unk1.hpp" +#include "Map/TriggerAABB_Unk2.hpp" +#include "Map/TriggerBase.hpp" +#include "Map/TriggerSphere.hpp" + +TriggerBase::TriggerBase(TriggerParams *params) {} +TriggerBase::TriggerBase(u8 id, u32 param2, u32 param3, u32 param4) {} +TriggerBase::~TriggerBase() {} + +TriggerAABB::TriggerAABB(TriggerParams *params) : + TriggerBase(params) {} +TriggerAABB::TriggerAABB(u8 id, u32 param2, u32 param3, u32 param4) : + TriggerBase(id, param2, param3, param4) {} +TriggerAABB::~TriggerAABB() {} + +TriggerSphere::TriggerSphere(TriggerParams *params) : + TriggerBase(params) {} +TriggerSphere::TriggerSphere(u8 id, u32 param2, u32 param3, u32 param4) : + TriggerBase(id, param2, param3, param4) {} +TriggerSphere::~TriggerSphere() {} +bool TriggerSphere::GetBoundingBox(AABB *bbox) {} + +TriggerAABB_Unk2::TriggerAABB_Unk2(TriggerParams *params) : + TriggerAABB(params) {} +TriggerAABB_Unk2_Unk1::TriggerAABB_Unk2_Unk1() {} +TriggerAABB_Unk2::~TriggerAABB_Unk2() {} +void TriggerAABB_Unk2::vfunc_08() {} +unk32 TriggerAABB_Unk2::vfunc_0c() {} +unk32 TriggerAABB_Unk2::vfunc_10() {} + +TriggerAABB_Unk1::TriggerAABB_Unk1(TriggerParams *params) : + TriggerAABB(params) {} +TriggerAABB_Unk1::~TriggerAABB_Unk1() {} +void TriggerAABB_Unk1::vfunc_08() {} + +bool TriggerSphere::Overlaps(Vec3p *point) {} + +bool TriggerAABB::Overlaps(Vec3p *point) {} +bool TriggerAABB::GetBoundingBox(AABB *bbox) {} diff --git a/src/00_Core/Render/ModelRender.cpp b/src/00_Core/Render/ModelRender.cpp new file mode 100644 index 00000000..03a66133 --- /dev/null +++ b/src/00_Core/Render/ModelRender.cpp @@ -0,0 +1,25 @@ +#include "Render/ModelRender.hpp" + +ModelRender::ModelRender() {} +ModelRender::~ModelRender() {} +void *ModelRender::GetLcdcAddress() {} +void ModelRender::vfunc_0c(ItemModel *model) {} +void *ModelRender::func_ov000_020a9624(s32 param1) {} +void ModelRender::SetTransform(Vec3p *scale, Mat3p *rotation, Vec3p *translation) {} +void ModelRender::SetRotationTranslation(Mat3p *rotation, Vec3p *translation) {} +void ModelRender::SetTranslation(Vec3p *translation) {} +void ModelRender::PushGeometryCommands() {} +void ModelRender::vfunc_20() {} +void ModelRender::vfunc_24(unk32 param1) {} +void ModelRender::vfunc_28() {} +void ModelRender::vfunc_2c() {} +void ModelRender::vfunc_34() {} +void ModelRender::vfunc_30() {} +void ModelRender::func_ov000_020a98e8(unk32 param1) {} +void ModelRender::func_ov000_020a990c(unk32 param1) {} +void ModelRender::func_ov000_020a9938(unk32 param1) {} +void ModelRender::func_ov000_020a9960(unk32 param1) {} +void ModelRender::vfunc_38() {} +void ModelRender::vfunc_3c() {} +void ModelRender::func_ov000_020a9998(unk32 param1, unk32 param2) {} +void ModelRender::func_ov000_020a99c0() {} diff --git a/src/00_Core/Save/AdventureFlags.cpp b/src/00_Core/Save/AdventureFlags.cpp index a6a944b5..7ba5f7c6 100644 --- a/src/00_Core/Save/AdventureFlags.cpp +++ b/src/00_Core/Save/AdventureFlags.cpp @@ -47,4 +47,3 @@ bool AdventureFlags::func_ov00_02098074(unk32 param1, unk16 param2, unk32 param3 bool AdventureFlags::func_ov00_0209809c() {} bool AdventureFlags::func_ov00_020980ac() {} void AdventureFlags::func_ov00_020980bc(s32 param1) {} -void AdventureFlags::func_ov00_020980d0() {} diff --git a/src/00_Core/Save/FlagsUnk.cpp b/src/00_Core/Save/FlagsUnk.cpp new file mode 100644 index 00000000..11d43a92 --- /dev/null +++ b/src/00_Core/Save/FlagsUnk.cpp @@ -0,0 +1,5 @@ +#include "Save/AdventureFlags.hpp" + +FlagsUnk::~FlagsUnk() {} +FlagsUnk2::~FlagsUnk2() {} +void FlagsUnk::func_ov000_020980f8() {} diff --git a/src/00_Core/Unknown/UnkStruct_ov000_020b1528.cpp b/src/00_Core/Unknown/UnkStruct_ov000_020b1528.cpp new file mode 100644 index 00000000..ed9b3d16 --- /dev/null +++ b/src/00_Core/Unknown/UnkStruct_ov000_020b1528.cpp @@ -0,0 +1,9 @@ +#include "Unknown/UnkStruct_ov000_020b1528.hpp" + +UnkStruct_ov000_020b1528::UnkStruct_ov000_020b1528() {} +UnkStruct_ov000_020b1528::~UnkStruct_ov000_020b1528() {} +void UnkStruct_ov000_020b1528::Clear() {} +bool UnkStruct_ov000_020b1528::vfunc_08() {} +bool UnkStruct_ov000_020b1528::vfunc_0c() {} +bool UnkStruct_ov000_020b1528::vfunc_10(s32 *param1) {} +bool UnkStruct_ov000_020b1528::vfunc_14(u16 *index, unk32 param2) {}