mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-23 15:01:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove static initializers from ov00_init.s

Browse Source
This commit is contained in:
Aetias
2024-04-06 10:59:27 +02:00
parent c0cc540ee8
commit cbc47c82db
10 changed files with 3369 additions and 3800 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov00/ov00_020773c0.inc
+7
View File
@@ -23,12 +23,16 @@
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0d40
.extern data_027e0d48
.extern data_027e0d54
.extern data_027e0e28
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f74
.extern data_027e0f7c
.extern data_027e1054
.extern data_ov00_020ec718
.extern data_ov00_020ec7dc
.extern func_01ff9b4c
.extern func_01ff9bc4
.extern func_02000b60
@@ -124,6 +128,7 @@
.extern func_02042bb8
.extern func_0204366c
.extern func_02047280
.extern func_0204f8d4
.extern func_ov00_0207bc48
.extern func_ov00_0207c170
.extern func_ov00_02082e1c
@@ -150,6 +155,8 @@
.extern func_ov03_020f0b8c
.extern func_ov03_020f4b7c
.extern func_ov04_02100b6c
.extern func_ov08_02112ee0
.extern func_ov08_02113a40
.extern func_ov09_021136c4
.extern func_ov09_0211d860
.extern func_ov09_0211d8a0
asm/ov00/ov00_020773c0.s
+41 -207
View File
@@ -6906,6 +6906,43 @@ data_ov00_020d8796: ; 0x020d8796
data_ov00_020d8797: ; 0x020d8797
.byte 0x00
.section .init, 4, 1, 4
.global func_ov00_020df338
arm_func_start func_ov00_020df338
func_ov00_020df338: ; 0x020df338
ldr ip, _020df344 ; =func_ov08_02113a40
ldr r0, _020df348 ; =data_ov00_020e9360
bx ip
.align 2, 0
arm_func_end func_ov00_020df338
_020df344: .word func_ov08_02113a40
_020df348: .word data_ov00_020e9360
.global func_ov00_020df34c
arm_func_start func_ov00_020df34c
func_ov00_020df34c: ; 0x020df34c
stmdb sp!, {r3, lr}
ldr r0, _020df36c ; =data_027e0d54
bl func_ov08_02112ee0
ldr r0, _020df36c ; =data_027e0d54
ldr r1, _020df370 ; =func_ov00_0207a2fc
ldr r2, _020df374 ; =data_027e0d48
bl func_0204f8d4
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020df34c
_020df36c: .word data_027e0d54
_020df370: .word func_ov00_0207a2fc - 1
_020df374: .word data_027e0d48
.section .ctor, 4, 1, 4
.global data_ov00_020e1e88
data_ov00_020e1e88: ; 0x020e1e88
.word func_ov00_020df338
.global data_ov00_020e1e8c
data_ov00_020e1e8c: ; 0x020e1e8c
.word func_ov00_020df34c
.data
.global data_ov00_020e1f80
data_ov00_020e1f80: ; 0x020e1f80
@@ -7047,212 +7084,9 @@ data_ov00_020e9358:
.global data_ov00_020e935c
data_ov00_020e935c:
.space 0x4
.sbss
.global data_ov00_020ec718
data_ov00_020ec718:
.global data_ov00_020e9360
data_ov00_020e9360:
.space 0x4
.global data_ov00_020ec71c
data_ov00_020ec71c:
.space 0x4
.global data_ov00_020ec720
data_ov00_020ec720:
.space 0x4
.global data_ov00_020ec724
data_ov00_020ec724:
.space 0x4
.global data_ov00_020ec728
data_ov00_020ec728:
.space 0x4
.global data_ov00_020ec72c
data_ov00_020ec72c:
.space 0x4
.global data_ov00_020ec730
data_ov00_020ec730:
.space 0x4
.global data_ov00_020ec734
data_ov00_020ec734:
.space 0x4
.global data_ov00_020ec738
data_ov00_020ec738:
.space 0x4
.global data_ov00_020ec73c
data_ov00_020ec73c:
.space 0x4
.global data_ov00_020ec740
data_ov00_020ec740:
.space 0x4
.global data_ov00_020ec744
data_ov00_020ec744:
.space 0x4
.global data_ov00_020ec748
data_ov00_020ec748:
.space 0x4
.global data_ov00_020ec74c
data_ov00_020ec74c:
.space 0x4
.global data_ov00_020ec750
data_ov00_020ec750:
.space 0x4
.global data_ov00_020ec754
data_ov00_020ec754:
.space 0x4
.global data_ov00_020ec758
data_ov00_020ec758:
.space 0x4
.global data_ov00_020ec75c
data_ov00_020ec75c:
.space 0x4
.global data_ov00_020ec760
data_ov00_020ec760:
.space 0x4
.global data_ov00_020ec764
data_ov00_020ec764:
.space 0x4
.global data_ov00_020ec768
data_ov00_020ec768:
.space 0x4
.global data_ov00_020ec76c
data_ov00_020ec76c:
.space 0x4
.global data_ov00_020ec770
data_ov00_020ec770:
.space 0x4
.global data_ov00_020ec774
data_ov00_020ec774:
.space 0x4
.global data_ov00_020ec778
data_ov00_020ec778:
.space 0x4
.global data_ov00_020ec77c
data_ov00_020ec77c:
.space 0x4
.global data_ov00_020ec780
data_ov00_020ec780:
.space 0x4
.global data_ov00_020ec784
data_ov00_020ec784:
.space 0x4
.global data_ov00_020ec788
data_ov00_020ec788:
.space 0x4
.global data_ov00_020ec78c
data_ov00_020ec78c:
.space 0x4
.global data_ov00_020ec790
data_ov00_020ec790:
.space 0x4
.global data_ov00_020ec794
data_ov00_020ec794:
.space 0x4
.global data_ov00_020ec798
data_ov00_020ec798:
.space 0x4
.global data_ov00_020ec79c
data_ov00_020ec79c:
.space 0x4
.global data_ov00_020ec7a0
data_ov00_020ec7a0:
.space 0x4
.global data_ov00_020ec7a4
data_ov00_020ec7a4:
.space 0x4
.global data_ov00_020ec7a8
data_ov00_020ec7a8:
.space 0x4
.global data_ov00_020ec7ac
data_ov00_020ec7ac:
.space 0x4
.global data_ov00_020ec7b0
data_ov00_020ec7b0:
.space 0x4
.global data_ov00_020ec7b4
data_ov00_020ec7b4:
.space 0x4
.global data_ov00_020ec7b8
data_ov00_020ec7b8:
.space 0x4
.global data_ov00_020ec7bc
data_ov00_020ec7bc:
.space 0x4
.global data_ov00_020ec7c0
data_ov00_020ec7c0:
.space 0x4
.global data_ov00_020ec7c4
data_ov00_020ec7c4:
.space 0x4
.global data_ov00_020ec7c8
data_ov00_020ec7c8:
.space 0x4
.global data_ov00_020ec7cc
data_ov00_020ec7cc:
.space 0x4
.global data_ov00_020ec7d0
data_ov00_020ec7d0:
.space 0x4
.global data_ov00_020ec7d4
data_ov00_020ec7d4:
.space 0x4
.global data_ov00_020ec7d8
data_ov00_020ec7d8:
.space 0x4
.global data_ov00_020ec7dc
data_ov00_020ec7dc:
.space 0x4
.global data_ov00_020ec7e0
data_ov00_020ec7e0:
.space 0x4
.global data_ov00_020ec7e4
data_ov00_020ec7e4:
.space 0x4
.global data_ov00_020ec7e8
data_ov00_020ec7e8:
.space 0x4
.global data_ov00_020ec7ec
data_ov00_020ec7ec:
.space 0x1
.global data_ov00_020ec7ed
data_ov00_020ec7ed:
.space 0x1
.global data_ov00_020ec7ee
data_ov00_020ec7ee:
.space 0x1
.global data_ov00_020ec7ef
data_ov00_020ec7ef:
.space 0x1
.global data_ov00_020ec7f0
data_ov00_020ec7f0:
.space 0x4
.global data_ov00_020ec7f4
data_ov00_020ec7f4:
.space 0x4
.global data_ov00_020ec7f8
data_ov00_020ec7f8:
.space 0x4
.global data_ov00_020ec7fc
data_ov00_020ec7fc:
.space 0x4
.global data_ov00_020ec800
data_ov00_020ec800:
.space 0x4
.global data_ov00_020ec804
data_ov00_020ec804:
.space 0x4
.global data_ov00_020ec808
data_ov00_020ec808:
.space 0x4
.global data_ov00_020ec80c
data_ov00_020ec80c:
.space 0x4
.global data_ov00_020ec810
data_ov00_020ec810:
.space 0x4
.global data_ov00_020ec814
data_ov00_020ec814:
.space 0x4
.global data_ov00_020ec818
data_ov00_020ec818:
.space 0x4
.global data_ov00_020ec81c
data_ov00_020ec81c:
.global data_ov00_020e9364
data_ov00_020e9364:
.space 0x4
asm/ov00/ov00_0207af9c.inc
+20 -2
View File
@@ -34,13 +34,19 @@
.extern data_027e0d3c
.extern data_027e0d44
.extern data_027e0d54
.extern data_027e0d6c
.extern data_027e0d78
.extern data_027e0db0
.extern data_027e0db4
.extern data_027e0db8
.extern data_027e0dbc
.extern data_027e0de4
.extern data_027e0de8
.extern data_027e0e08
.extern data_027e0e28
.extern data_027e0e2c
.extern data_027e0e58
.extern data_027e0e5c
.extern data_027e0e60
.extern data_027e0f64
.extern data_027e0f68
@@ -66,8 +72,7 @@
.extern data_027e103c
.extern data_027e10a4
.extern data_ov00_020e5868
.extern data_ov00_020ec718
.extern data_ov00_020ec81c
.extern data_ov00_020e9360
.extern data_ov00_020eec68
.extern data_ov00_020eec9c
.extern data_ov09_0211f5dc
@@ -147,6 +152,7 @@
.extern func_020078c0
.extern func_020078d8
.extern func_020078f4
.extern func_02007938
.extern func_02007984
.extern func_02007a18
.extern func_02007ad8
@@ -188,6 +194,7 @@
.extern func_0202b734
.extern func_0202b7e4
.extern func_0202b8e4
.extern func_0202bac0
.extern func_0202c69c
.extern func_0202d56c
.extern func_0202d598
@@ -210,6 +217,10 @@
.extern func_020350b4
.extern func_0203516c
.extern func_020351b8
.extern func_0203e784
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern func_0203fe60
.extern func_02040464
.extern func_02042b40
@@ -390,6 +401,13 @@
.extern func_ov05_02111c6c
.extern func_ov05_02111c70
.extern func_ov05_02112268
.extern func_ov08_02113080
.extern func_ov08_0211351c
.extern func_ov08_021135b8
.extern func_ov08_021136fc
.extern func_ov08_02113730
.extern func_ov08_02113a0c
.extern func_ov08_02113aa8
.extern func_ov09_02114810
.extern func_ov12_0212b358
.extern func_ov12_02133c40
asm/ov00/ov00_0207af9c.s
+2264 -6
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_020a8e04.s
-26
View File
@@ -2387,29 +2387,3 @@ data_ov00_020e58e0: ; 0x020e58e0
.global data_ov00_020e58e4
data_ov00_020e58e4: ; 0x020e58e4
.word func_ov00_020a9eb4 - 1
.sbss
.global data_ov00_020ee178
data_ov00_020ee178:
.space 0x4
.global data_ov00_020ee17c
data_ov00_020ee17c:
.space 0x4
.global data_ov00_020ee180
data_ov00_020ee180:
.space 0x4
.global data_ov00_020ee184
data_ov00_020ee184:
.space 0x4
.global data_ov00_020ee188
data_ov00_020ee188:
.space 0x4
.global data_ov00_020ee18c
data_ov00_020ee18c:
.space 0x4
.global data_ov00_020ee190
data_ov00_020ee190:
.space 0x4
.global data_ov00_020ee194
data_ov00_020ee194:
.space 0x4
asm/ov00/ov00_020ae7a4.inc → asm/ov00/ov00_020b1498.inc
+15
View File
@@ -141,6 +141,8 @@
.extern data_ov00_020e9360
.extern data_ov00_020e9370
.extern data_ov00_020e9c88
.extern data_ov00_020ee178
.extern data_ov00_020ee184
.extern data_ov09_0211f5b4
.extern func_01ff80f8
.extern func_01ff81f8
@@ -299,7 +301,9 @@
.extern func_0202ea24
.extern func_0202ea34
.extern func_0202ea50
.extern func_0203005c
.extern func_020300cc
.extern func_0203010c
.extern func_020313c8
.extern func_02033780
.extern func_020337d8
@@ -373,6 +377,8 @@
.extern func_0203e0c8
.extern func_0203e1b0
.extern func_0203e284
.extern func_0203e784
.extern func_0203e7b4
.extern func_0203e868
.extern func_0203efd8
.extern func_0203f378
@@ -489,6 +495,7 @@
.extern func_ov00_020a19fc
.extern func_ov00_020a41e4
.extern func_ov00_020a5e9c
.extern func_ov00_020a5ef8
.extern func_ov00_020a6110
.extern func_ov00_020a8f2c
.extern func_ov00_020a8f4c
@@ -614,6 +621,14 @@
.extern func_ov05_02110228
.extern func_ov05_0211058c
.extern func_ov05_021113d0
.extern func_ov08_021130d0
.extern func_ov08_02113150
.extern func_ov08_02113284
.extern func_ov08_02113314
.extern func_ov08_021133bc
.extern func_ov08_02113460
.extern func_ov08_021134b8
.extern func_ov08_021136ec
.extern func_ov09_0211b6e8
.extern func_ov09_0211b6f8
.extern func_ov09_0211b708
asm/ov00/ov00_020ae7a4.s → asm/ov00/ov00_020b1498.s
+1021 -1
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_init.inc
-273
View File
@@ -1,273 +0,0 @@
#pragma once
.extern Divide
.extern data_02057840
.extern data_0205785c
.extern data_02057878
.extern data_027e0d0c
.extern data_027e0d48
.extern data_027e0d54
.extern data_027e0d6c
.extern data_027e0d78
.extern data_027e0db0
.extern data_027e0dbc
.extern data_027e0de4
.extern data_027e0de8
.extern data_027e0e08
.extern data_027e0e28
.extern data_027e0e2c
.extern data_027e0e5c
.extern data_027e0f8c
.extern data_027e0f94
.extern data_027e0fa0
.extern data_027e0ffc
.extern data_ov00_020dbf88
.extern data_ov00_020e24a4
.extern data_ov00_020e24c8
.extern data_ov00_020e24d0
.extern data_ov00_020e24d8
.extern data_ov00_020e24e0
.extern data_ov00_020e24e8
.extern data_ov00_020e24f0
.extern data_ov00_020e24f8
.extern data_ov00_020e2500
.extern data_ov00_020e2fa8
.extern data_ov00_020e30ec
.extern data_ov00_020e31ec
.extern data_ov00_020e32ec
.extern data_ov00_020e33ec
.extern data_ov00_020e34ec
.extern data_ov00_020e35ec
.extern data_ov00_020e36ec
.extern data_ov00_020e37ec
.extern data_ov00_020e38ec
.extern data_ov00_020e39ec
.extern data_ov00_020e50ec
.extern data_ov00_020e50f4
.extern data_ov00_020e50fc
.extern data_ov00_020e5104
.extern data_ov00_020e5134
.extern data_ov00_020e518c
.extern data_ov00_020e699c
.extern data_ov00_020e69b0
.extern data_ov00_020e69cc
.extern data_ov00_020e69dc
.extern data_ov00_020e69ec
.extern data_ov00_020e6a08
.extern data_ov00_020e6a2c
.extern data_ov00_020e6a3c
.extern data_ov00_020e6a4c
.extern data_ov00_020e6a5c
.extern data_ov00_020e6a6c
.extern data_ov00_020e6a7c
.extern data_ov00_020e6a8c
.extern data_ov00_020e6aa8
.extern data_ov00_020e6ac4
.extern data_ov00_020e6ae0
.extern data_ov00_020e6b04
.extern data_ov00_020e6b24
.extern data_ov00_020e6b40
.extern data_ov00_020e6b5c
.extern data_ov00_020e6b78
.extern data_ov00_020e6b94
.extern data_ov00_020e6ba8
.extern data_ov00_020e6bbc
.extern data_ov00_020e6bd8
.extern data_ov00_020e6bec
.extern data_ov00_020e6c00
.extern data_ov00_020e6c1c
.extern data_ov00_020e8964
.extern data_ov00_020e9360
.extern data_ov00_020e9370
.extern data_ov00_020e9c88
.extern data_ov00_020e9e0c
.extern data_ov00_020e9e18
.extern data_ov00_020ec7dc
.extern data_ov00_020ec964
.extern data_ov00_020ec970
.extern data_ov00_020ec97c
.extern data_ov00_020ec988
.extern data_ov00_020ec994
.extern data_ov00_020ec9a0
.extern data_ov00_020ec9ac
.extern data_ov00_020ec9b8
.extern data_ov00_020ecd50
.extern data_ov00_020ecd58
.extern data_ov00_020ecd64
.extern data_ov00_020ecd70
.extern data_ov00_020ecd84
.extern data_ov00_020ecd90
.extern data_ov00_020ecda4
.extern data_ov00_020ecdb0
.extern data_ov00_020ecdc4
.extern data_ov00_020ecdcc
.extern data_ov00_020ecdd8
.extern data_ov00_020ecde4
.extern data_ov00_020edde4
.extern data_ov00_020ee094
.extern data_ov00_020ee0a0
.extern data_ov00_020ee0e8
.extern data_ov00_020ee0f4
.extern data_ov00_020ee108
.extern data_ov00_020ee110
.extern data_ov00_020ee11c
.extern data_ov00_020ee128
.extern data_ov00_020ee13c
.extern data_ov00_020ee148
.extern data_ov00_020ee154
.extern data_ov00_020ee160
.extern data_ov00_020ee16c
.extern data_ov00_020ee178
.extern data_ov00_020ee184
.extern data_ov00_020ee1a0
.extern data_ov00_020ee1ac
.extern data_ov00_020ee1c0
.extern data_ov00_020ee1cc
.extern data_ov00_020ee1d8
.extern data_ov00_020ee1e4
.extern data_ov00_020ee1fc
.extern data_ov00_020ee208
.extern data_ov00_020ee214
.extern data_ov00_020ee220
.extern data_ov00_020ee22c
.extern data_ov00_020ee238
.extern data_ov00_020ee244
.extern data_ov00_020ee250
.extern data_ov00_020ee25c
.extern data_ov00_020ee268
.extern data_ov00_020ee274
.extern data_ov00_020ee280
.extern data_ov00_020ee28c
.extern data_ov00_020ee298
.extern data_ov00_020ee2a4
.extern data_ov00_020ee2b0
.extern data_ov00_020ee2bc
.extern data_ov00_020ee2c8
.extern data_ov00_020ee2d4
.extern data_ov00_020ee2e0
.extern data_ov00_020ee2ec
.extern data_ov00_020ee2f8
.extern data_ov00_020ee304
.extern data_ov00_020ee310
.extern data_ov00_020ee31c
.extern data_ov00_020ee328
.extern data_ov00_020ee334
.extern data_ov00_020ee340
.extern data_ov00_020ee34c
.extern data_ov00_020ee35c
.extern data_ov00_020ee36c
.extern data_ov00_020ee37c
.extern data_ov00_020ee38c
.extern data_ov00_020ee39c
.extern data_ov00_020ee3ac
.extern data_ov00_020ee3bc
.extern data_ov00_020ee3cc
.extern data_ov00_020ee3e0
.extern data_ov00_020ee3f4
.extern data_ov00_020ee408
.extern data_ov00_020ee41c
.extern data_ov00_020ee430
.extern data_ov00_020ee444
.extern data_ov00_020ee458
.extern data_ov00_020ee46c
.extern data_ov00_020ee480
.extern data_ov00_020ee494
.extern data_ov00_020ee4a8
.extern data_ov00_020ee4bc
.extern data_ov00_020ee4d0
.extern data_ov00_020ee4e4
.extern data_ov00_020ee4f8
.extern data_ov00_020ee50c
.extern data_ov00_020ee520
.extern data_ov00_020ee534
.extern data_ov00_020ee548
.extern data_ov00_020ee55c
.extern data_ov00_020ee568
.extern data_ov00_020ee590
.extern data_ov00_020ee59c
.extern data_ov00_020ee5b0
.extern data_ov00_020ee5bc
.extern data_ov00_020ee5d0
.extern data_ov00_020ee5dc
.extern data_ov00_020ee5f0
.extern data_ov00_020ee5fc
.extern data_ov00_020ee610
.extern data_ov00_020ee61c
.extern data_ov00_020ee630
.extern data_ov00_020ee63c
.extern data_ov00_020ee650
.extern data_ov00_020ee65c
.extern data_ov00_020ee670
.extern data_ov00_020ee67c
.extern data_ov00_020ee68c
.extern data_ov00_020ee698
.extern data_ov00_020ee6c8
.extern data_ov00_020ee6d4
.extern data_ov00_020ee6f8
.extern data_ov00_020ee734
.extern data_ov00_020ee820
.extern data_ov00_020eec60
.extern data_ov00_020eec64
.extern data_ov00_020eec68
.extern data_ov00_020eec9c
.extern data_ov00_020eed2c
.extern func_02007938
.extern func_0202bac0
.extern func_0203005c
.extern func_0203010c
.extern func_0203e784
.extern func_0203e7b4
.extern func_0203eba8
.extern func_0203ebc8
.extern func_0204f8d4
.extern func_ov00_0207a2fc
.extern func_ov00_0207af9c
.extern func_ov00_0207b278
.extern func_ov00_0207bab4
.extern func_ov00_0207bcb4
.extern func_ov00_0207dd9c
.extern func_ov00_02086cd0
.extern func_ov00_0208f69c
.extern func_ov00_0208fa70
.extern func_ov00_020903a8
.extern func_ov00_020904f4
.extern func_ov00_02093c9c
.extern func_ov00_020980d0
.extern func_ov00_0209e8b8
.extern func_ov00_020a10f0
.extern func_ov00_020a1c98
.extern func_ov00_020a5ef8
.extern func_ov00_020b80e0
.extern func_ov00_020b8110
.extern func_ov00_020b8134
.extern func_ov00_020b862c
.extern func_ov00_020be198
.extern func_ov00_020c0b64
.extern func_ov00_020c96a4
.extern func_ov00_020c9ca4
.extern func_ov00_020ca20c
.extern func_ov00_020ce704
.extern func_ov00_020d3020
.extern func_ov00_020d32e4
.extern func_ov00_020d3fc8
.extern func_ov00_020d433c
.extern func_ov00_020d435c
.extern func_ov00_020d50f8
.extern func_ov00_020d5284
.extern func_ov00_020d6c04
.extern func_ov08_02112ee0
.extern func_ov08_02113080
.extern func_ov08_021130d0
.extern func_ov08_02113150
.extern func_ov08_02113284
.extern func_ov08_02113314
.extern func_ov08_021133bc
.extern func_ov08_02113460
.extern func_ov08_021134b8
.extern func_ov08_0211351c
.extern func_ov08_021135b8
.extern func_ov08_021136ec
.extern func_ov08_021136fc
.extern func_ov08_02113730
.extern func_ov08_02113a0c
.extern func_ov08_02113a40
.extern func_ov08_02113aa8
asm/ov00/ov00_init.s
-3283
View File
File diff suppressed because it is too large Load Diff
tools/lcf.py
+1 -2
View File
@@ -52,8 +52,7 @@ ov00 = Overlay(name='ov00', after='ARM9', objects=[
'src/00_Core/Player/PlayerControl.cpp',
'asm/ov00/Player/PlayerControl.s',
'asm/ov00/ov00_020ae7a4.s',
'asm/ov00/ov00_init.s'
'asm/ov00/ov00_020b1498.s',
])
ov01 = Overlay(name='ov01', after=[ov00], objects=[
'asm/ov01.s'