diff options
| author | mike8699 <mikebuntu68@gmail.com> | 2025-01-02 22:48:00 -0500 |
|---|---|---|
| committer | mike8699 <mikebuntu68@gmail.com> | 2025-04-28 22:29:29 -0400 |
| commit | 09070e2242c46a567f0aea42bed9d96afc2d90e1 (patch) | |
| tree | 43f4933c5e214d613e09fe125a3e4aaca8c78255 | |
| parent | dc075c39db89c26073f1421ffe1939e6aff2449a (diff) | |
Decomp `AdventureFlags::Exists` and `AdventureFlags::func_ov00_02097674`
| -rw-r--r-- | config/eur/arm9/overlays/ov000/symbols.txt | 2 | ||||
| -rw-r--r-- | config/usa/arm9/overlays/ov000/symbols.txt | 2 | ||||
| -rw-r--r-- | src/00_Core/Save/AdventureFlags.cpp | 13 |
3 files changed, 13 insertions, 4 deletions
diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 07ca6e05..7e31a949 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -1323,7 +1323,7 @@ _ZN14AdventureFlags18func_ov00_020980acEv kind:function(arm,size=0x10) addr:0x20 _ZN14AdventureFlags18func_ov00_020980bcEi kind:function(arm,size=0x14) addr:0x20980bc _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 +_Z19func_ov000_020980f8P15CutsceneHandler 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 diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index 84b9f721..480eb261 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -1323,7 +1323,7 @@ _ZN14AdventureFlags18func_ov00_020980acEv kind:function(arm,size=0x10) addr:0x20 _ZN14AdventureFlags18func_ov00_020980bcEi kind:function(arm,size=0x14) addr:0x209805c _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 +_Z19func_ov000_020980f8P15CutsceneHandler 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 diff --git a/src/00_Core/Save/AdventureFlags.cpp b/src/00_Core/Save/AdventureFlags.cpp index 7ba5f7c6..98d5dc96 100644 --- a/src/00_Core/Save/AdventureFlags.cpp +++ b/src/00_Core/Save/AdventureFlags.cpp @@ -1,8 +1,17 @@ #include "Save/AdventureFlags.hpp" -bool AdventureFlags::Exists() {} +extern void func_ov000_020980f8(CutsceneHandler *cutsceneHandler); + +bool AdventureFlags::Exists() { + return gAdventureFlags != NULL; +} + void AdventureFlags::CopyTo(unk32 *flags) {} -void AdventureFlags::func_ov00_02097674() {} + +void AdventureFlags::func_ov00_02097674() { + func_ov000_020980f8(this->mCutsceneHandler); +} + s32 AdventureFlags::func_ov00_02097684() {} void AdventureFlags::Load() {} void AdventureFlags::func_ov00_020976c8() {} |