Skip to content

Commit 3ab5bf6

Browse files
Yanis002Yanis002
authored
Misc things (#30)
* match random init * UnkSystem2_UnkSubSystem1_Derived1 related docs * match func_ov031_020e9108 and FileSelect_UnkClass7::vfunc_00 * improve func_02017ea4 * rename next functions * actor rupee improvements * update gitignore * fix broken match * fileselectmain improvements * fix broken match * more misc progress * fix build issues * fix regressions
1 parent 7803163 commit 3ab5bf6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1063
-720
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ build.ninja
1919
.ninja_deps
2020
/wibo
2121
m2c*.c
22+
nonmatchings/

‎config/eur/arm9/delinks.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ src/Main/Player/TouchControl.cpp:
1919
src/Main/System/OverlayManager.cpp:
2020
.text start:0x020147fc end:0x02014944
2121

22+
src/Main/System/Random.cpp:
23+
.text start:0x02016384 end:0x02016404
24+
2225
src/Main/Game/GameModeLinkListNode.cpp:
2326
complete
2427
.text start:0x0201667c end:0x02016720

‎config/eur/arm9/overlays/ov000/symbols.txt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,8 @@ _ZN14UnkSubStruct1919func_ov000_02060b50Ev kind:function(arm,size=0x14) addr:0x0
435435
_ZN14UnkSubStruct1919func_ov000_02060b64Ev kind:function(arm,size=0x20) addr:0x02060b64
436436
func_ov000_02060b84 kind:function(arm,size=0x28) addr:0x02060b84
437437
func_ov000_02060bac kind:function(arm,size=0x2c) addr:0x02060bac
438-
func_ov000_02060bd8 kind:function(arm,size=0x50) addr:0x02060bd8
439-
func_ov000_02060c28 kind:function(arm,size=0xc) addr:0x02060c28
438+
_ZN14UnkSubStruct1919func_ov000_02060bd8Ei kind:function(arm,size=0x50) addr:0x02060bd8
439+
_ZN14UnkSubStruct1919func_ov000_02060c28Ev kind:function(arm,size=0xc) addr:0x02060c28
440440
func_ov000_02060c34 kind:function(arm,size=0x1c) addr:0x02060c34
441441
func_ov000_02060c50 kind:function(arm,size=0x2c) addr:0x02060c50
442442
func_ov000_02060c7c kind:function(arm,size=0x100) addr:0x02060c7c
@@ -2265,13 +2265,13 @@ _ZN8Actor_5c19func_ov000_020975f8Ev kind:function(arm,size=0x78) addr:0x020975f8
22652265
func_ov000_02097670 kind:function(arm,size=0xc) addr:0x02097670
22662266
_ZN9ActorTypeC2Ej kind:function(arm,size=0xa8) addr:0x0209767c
22672267
func_ov000_02097724 kind:function(arm,size=0x28) addr:0x02097724
2268-
func_ov000_0209774c kind:function(arm,size=0x8) addr:0x0209774c
2269-
func_ov000_02097754 kind:function(arm,size=0x7c) addr:0x02097754
2270-
func_ov000_020977d0 kind:function(arm,size=0x14) addr:0x020977d0
2268+
_ZN9ActorType8vfunc_04Ev kind:function(arm,size=0x8) addr:0x0209774c
2269+
_ZN9ActorType8vfunc_08Ev kind:function(arm,size=0x7c) addr:0x02097754
2270+
_ZN9ActorType8vfunc_0cEv kind:function(arm,size=0x14) addr:0x020977d0
22712271
func_ov000_020977e4 kind:function(arm,size=0x2c) addr:0x020977e4
2272-
func_ov000_02097810 kind:function(arm,size=0x4) addr:0x02097810
2273-
func_ov000_02097814 kind:function(arm,size=0x4) addr:0x02097814
2274-
func_ov000_02097818 kind:function(arm,size=0x4) addr:0x02097818
2272+
_ZN9ActorType8vfunc_10Ev kind:function(arm,size=0x4) addr:0x02097810
2273+
_ZN9ActorType8vfunc_14Ev kind:function(arm,size=0x4) addr:0x02097814
2274+
_ZN9ActorType8vfunc_18Ev kind:function(arm,size=0x4) addr:0x02097818
22752275
func_ov000_0209781c kind:function(arm,size=0x7c) addr:0x0209781c
22762276
func_ov000_02097898 kind:function(arm,size=0x30) addr:0x02097898
22772277
func_ov000_020978c8 kind:function(arm,size=0x14) addr:0x020978c8
@@ -2316,7 +2316,7 @@ _ZN5ActorD1Ev kind:function(arm,size=0x4) addr:0x02098470
23162316
_ZN5ActorD0Ev kind:function(arm,size=0x14) addr:0x02098474
23172317
_ZN5ActorD2Ev kind:function(arm,size=0x4) addr:0x02098488
23182318
_ZN5Actor19func_ov000_0209848cEP9ActorType kind:function(arm,size=0x1c) addr:0x0209848c
2319-
_ZN5Actor8vfunc_18Ev kind:function(arm,size=0x8) addr:0x020984a8
2319+
_ZN5Actor8vfunc_18Ei kind:function(arm,size=0x8) addr:0x020984a8
23202320
_ZN5Actor8vfunc_1cEv kind:function(arm,size=0x4) addr:0x020984b0
23212321
_ZN5Actor8vfunc_20Ev kind:function(arm,size=0x4) addr:0x020984b4
23222322
_ZN5Actor8vfunc_24Ev kind:function(arm,size=0x4) addr:0x020984b8
@@ -2345,7 +2345,7 @@ func_ov000_02098860 kind:function(arm,size=0xb0) addr:0x02098860
23452345
_ZN5Actor19func_ov000_02098910Eii kind:function(arm,size=0xd0) addr:0x02098910
23462346
func_ov000_020989e0 kind:function(arm,size=0x38) addr:0x020989e0
23472347
func_ov000_02098a18 kind:function(arm,size=0x48) addr:0x02098a18
2348-
func_ov000_02098a60 kind:function(arm,size=0x28) addr:0x02098a60
2348+
_ZN5Actor19func_ov000_02098a60Ei kind:function(arm,size=0x28) addr:0x02098a60
23492349
func_ov000_02098a88 kind:function(arm,size=0x2c) addr:0x02098a88
23502350
func_ov000_02098ab4 kind:function(arm,size=0x74) addr:0x02098ab4
23512351
func_ov000_02098b28 kind:function(arm,size=0x64) addr:0x02098b28

‎config/eur/arm9/overlays/ov017/symbols.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,16 @@ func_ov017_020bf688 kind:function(arm,size=0x88) addr:0x020bf688
7272
func_ov017_020bf710 kind:function(arm,size=0x98) addr:0x020bf710
7373
func_ov017_020bf7a8 kind:function(arm,size=0xec) addr:0x020bf7a8
7474
func_ov017_020bf894 kind:function(arm,size=0x60) addr:0x020bf894
75-
_ZN23ActorUnk_ov000_020a8bb08vfunc_40Ev kind:function(arm,size=0x44) addr:0x020bf8f4
76-
_ZN23ActorUnk_ov000_020a8bb08vfunc_44Ev kind:function(arm,size=0x64) addr:0x020bf938
75+
_ZN5Actor8vfunc_40Ev kind:function(arm,size=0x44) addr:0x020bf8f4
76+
_ZN5Actor8vfunc_44Ev kind:function(arm,size=0x64) addr:0x020bf938
7777
func_ov017_020bf99c kind:function(arm,size=0x2c) addr:0x020bf99c
7878
_ZN10ActorRupee19func_ov017_020bf9c8EP27UnkStruct_func_01fff3b4_ret kind:function(arm,size=0x88) addr:0x020bf9c8
7979
func_ov017_020bfa50 kind:function(arm,size=0x84) addr:0x020bfa50
8080
func_ov017_020bfad4 kind:function(arm,size=0x44) addr:0x020bfad4
8181
func_ov017_020bfb18 kind:function(arm,size=0x238) addr:0x020bfb18
82-
func_ov017_020bfd50 kind:function(arm,size=0x4c) addr:0x020bfd50
82+
_ZN5Actor8vfunc_14Ev kind:function(arm,size=0x4c) addr:0x020bfd50
8383
func_ov017_020bfd9c kind:function(arm,size=0x130) addr:0x020bfd9c
84-
_ZN23ActorUnk_ov000_020a8bb08vfunc_48Ev kind:function(arm,size=0x80) addr:0x020bfecc
84+
_ZN5Actor8vfunc_48Ev kind:function(arm,size=0x80) addr:0x020bfecc
8585
func_ov017_020bff4c kind:function(arm,size=0xc) addr:0x020bff4c
8686
func_ov017_020bff58 kind:function(arm,size=0xd4) addr:0x020bff58
8787
func_ov017_020c002c kind:function(arm,size=0x50) addr:0x020c002c

‎config/eur/arm9/overlays/ov019/symbols.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ _ZN19FileSelectSubScreenC1Ev kind:function(arm,size=0x35c) addr:0x020cf28c
208208
_ZN19FileSelectSubScreen8vfunc_08EP5InputP12TouchControl kind:function(arm,size=0x154) addr:0x020cf5e8
209209
_ZN19FileSelectSubScreen19func_ov019_020cf73cEii kind:function(arm,size=0x120) addr:0x020cf73c
210210
_ZN19FileSelectSubScreen8vfunc_10EPc kind:function(arm,size=0x14) addr:0x020cf85c
211-
_ZN13UnkStructSub2C1Ev kind:function(arm,size=0x18c) addr:0x020cf870
211+
_ZN20FileSelect_UnkClass7C1Ev kind:function(arm,size=0x18c) addr:0x020cf870
212212
_ZN20FileSelect_UnkClass78vfunc_00Ev kind:function(arm,size=0xd4) addr:0x020cf9fc
213213
_ZN20FileSelect_UnkClass78vfunc_04Ev kind:function(arm,size=0x58) addr:0x020cfad0
214214
_ZN19FileSelectSubScreenD1Ev kind:function(arm,size=0xec) addr:0x020cfb28
@@ -274,7 +274,7 @@ _ZN8SaveFile19func_ov019_020d1aacEiPKw kind:function(arm,size=0x68) addr:0x020d1
274274
_ZN8SaveFile19func_ov019_020d1b14Ei kind:function(arm,size=0x9c) addr:0x020d1b14
275275
data_ov019_020d1bb0 kind:data(any) addr:0x020d1bb0
276276
data_ov019_020d1bbc kind:data(any) addr:0x020d1bbc
277-
data_ov019_020d1bcc kind:data(any) addr:0x020d1bcc
277+
data_ov019_020d1bcc kind:data(byte[6]) addr:0x020d1bcc
278278
data_ov019_020d1bd4 kind:data(any) addr:0x020d1bd4
279279
data_ov019_020d1be8 kind:data(any) addr:0x020d1be8
280280
__sinit_GameModeFileSelect.cpp kind:function(arm,size=0x18) addr:0x020d1bfc

0 commit comments

Comments
 (0)