diff options
| author | mike8699 <mikebuntu68@gmail.com> | 2025-01-02 22:51:19 -0500 |
|---|---|---|
| committer | mike8699 <mikebuntu68@gmail.com> | 2025-04-28 22:30:30 -0400 |
| commit | c4d19db62a63bf9f9ec95d7fc8ee56a9d1554129 (patch) | |
| tree | cb58e4da5fcec12dfa03c45eaa49c3e4d254e2b0 | |
| parent | 09070e2242c46a567f0aea42bed9d96afc2d90e1 (diff) | |
Decomp `AdventureFlags::func_ov00_02097684`
| -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 | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 7e31a949..f8687c88 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -1324,7 +1324,7 @@ _ZN14AdventureFlags18func_ov00_020980bcEi kind:function(arm,size=0x14) addr:0x20 _ZN8FlagsUnkD1Ev kind:function(arm,size=0x24) addr:0x20980d0 _ZN9FlagsUnk2D1Ev kind:function(arm,size=0x4) addr:0x20980f4 _Z19func_ov000_020980f8P15CutsceneHandler kind:function(arm,size=0x4) addr:0x20980f8 -_ZN15CutsceneHandler19func_ov000_020980fcEiiPPv kind:function(arm,size=0x18) addr:0x20980fc +_Z19func_ov000_020980fcP15CutsceneHandler 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 diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index 480eb261..d49f2f43 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -1324,7 +1324,7 @@ _ZN14AdventureFlags18func_ov00_020980bcEi kind:function(arm,size=0x14) addr:0x20 _ZN8FlagsUnkD1Ev kind:function(arm,size=0x24) addr:0x2098070 _ZN9FlagsUnk2D1Ev kind:function(arm,size=0x4) addr:0x2098094 _Z19func_ov000_020980f8P15CutsceneHandler kind:function(arm,size=0x4) addr:0x2098098 -_ZN15CutsceneHandler19func_ov000_020980fcEiiPPv kind:function(arm,size=0x18) addr:0x209809c +_Z19func_ov000_020980fcP15CutsceneHandler 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 diff --git a/src/00_Core/Save/AdventureFlags.cpp b/src/00_Core/Save/AdventureFlags.cpp index 98d5dc96..ac292f9e 100644 --- a/src/00_Core/Save/AdventureFlags.cpp +++ b/src/00_Core/Save/AdventureFlags.cpp @@ -1,6 +1,7 @@ #include "Save/AdventureFlags.hpp" extern void func_ov000_020980f8(CutsceneHandler *cutsceneHandler); +extern unk32 func_ov000_020980fc(CutsceneHandler *cutsceneHandler); bool AdventureFlags::Exists() { return gAdventureFlags != NULL; @@ -12,7 +13,10 @@ void AdventureFlags::func_ov00_02097674() { func_ov000_020980f8(this->mCutsceneHandler); } -s32 AdventureFlags::func_ov00_02097684() {} +s32 AdventureFlags::func_ov00_02097684() { + return func_ov000_020980fc(this->mCutsceneHandler); +} + void AdventureFlags::Load() {} void AdventureFlags::func_ov00_020976c8() {} void AdventureFlags::func_ov00_02097700() {} |