mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-14 04:32:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Split playerItems and extract pointers

Browse Source
This commit is contained in:
octorock
2021-03-16 08:31:06 +01:00
parent 74b661df24
commit 626865956e
50 changed files with 8792 additions and 6006 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/const/playerItem/playerItem10.inc
+3
View File
@@ -0,0 +1,3 @@
gUnk_0812AA80:: @ 0812AA80
.4byte sub_080ACC04
.4byte sub_080ACC5C
data/const/playerItem/playerItem11.inc
+25 -5
View File
@@ -1,6 +1,26 @@
gUnk_08109AC8:: @ 08109AC8
.4byte sub_0805FBE8
.4byte sub_0805FC74
gUnk_08109AD0:: @ 08109AD0
.incbin "baserom.gba", 0x109AD0, 0x0000008
gUnk_080B3DD0:: @ 080B3DD0
.4byte sub_08018CBC
.4byte sub_08018DE8
.4byte sub_08018E68
.4byte sub_08018F6C
gUnk_080B3DE0:: @ 080B3DE0
.incbin "baserom.gba", 0x0B3DE0, 0x0000008
gUnk_080B3DE8:: @ 080B3DE8
.4byte gUnk_080B3E18
.4byte gUnk_080B3E20
.4byte gUnk_080B3E28
gUnk_080B3DF4:: @ 080B3DF4
.incbin "baserom.gba", 0x0B3DF4, 0x0000024
gUnk_080B3E18:: @ 080B3E18
.incbin "baserom.gba", 0x0B3E18, 0x0000008
gUnk_080B3E20:: @ 080B3E20
.incbin "baserom.gba", 0x0B3E20, 0x0000008
gUnk_080B3E28:: @ 080B3E28
.incbin "baserom.gba", 0x0B3E28, 0x0000008
data/const/playerItem/playerItem12.inc
+18
View File
@@ -0,0 +1,18 @@
gUnk_0811B98C:: @ 0811B98C
.4byte sub_08070100
.4byte sub_080701F8
.4byte sub_0807037C
.4byte sub_08070398
.4byte sub_080703BC
gUnk_0811B9A0:: @ 0811B9A0
.incbin "baserom.gba", 0x11B9A0, 0x0000008
gUnk_0811B9A8:: @ 0811B9A8
.incbin "baserom.gba", 0x11B9A8, 0x0000020
gUnk_0811B9C8:: @ 0811B9C8
.incbin "baserom.gba", 0x11B9C8, 0x0000008
gUnk_0811B9D0:: @ 0811B9D0
.incbin "baserom.gba", 0x11B9D0, 0x0000008
data/const/playerItem/playerItem13.inc
+20
View File
@@ -0,0 +1,20 @@
gUnk_081320A8:: @ 081320A8
.4byte sub_080ACF2C
.4byte sub_080ACFCC
.4byte sub_080AD040
.4byte sub_080AD274
gUnk_081320B8:: @ 081320B8
.incbin "baserom.gba", 0x1320B8, 0x000000C
gUnk_081320C4:: @ 081320C4
.incbin "baserom.gba", 0x1320C4, 0x0000008
gUnk_081320CC:: @ 081320CC
.incbin "baserom.gba", 0x1320CC, 0x0000008
gUnk_081320D4:: @ 081320D4
.incbin "baserom.gba", 0x1320D4, 0x0000010
gUnk_081320E4:: @ 081320E4
.incbin "baserom.gba", 0x1320E4, 0x000000C
data/const/playerItem/playerItem14.inc
+6
View File
@@ -0,0 +1,6 @@
gUnk_08109AC8:: @ 08109AC8
.4byte sub_0805FBE8
.4byte sub_0805FC74
gUnk_08109AD0:: @ 08109AD0
.incbin "baserom.gba", 0x109AD0, 0x0000008
data/const/playerItem/playerItem15.inc
+6
View File
@@ -0,0 +1,6 @@
gUnk_08127270:: @ 08127270
.4byte sub_080A3084
.4byte sub_080A310C
gUnk_08127278:: @ 08127278
.incbin "baserom.gba", 0x127278, 0x0000008
data/const/playerItem/playerItem3.inc
+12
View File
@@ -0,0 +1,12 @@
gUnk_080B77FC:: @ 080B77FC
.4byte sub_0801B4C8
.4byte sub_0801B584
.4byte sub_0801B680
.4byte sub_0801B7A8
.incbin "baserom.gba", 0x0B780C, 0x000001A
gUnk_080B7826:: @ 080B7826
.incbin "baserom.gba", 0x0B7826, 0x0000008
gUnk_080B782E:: @ 080B782E
.incbin "baserom.gba", 0x0B782E, 0x0000012
data/const/playerItem/playerItemBomb.inc
+16
View File
@@ -0,0 +1,16 @@
gUnk_080B77C8:: @ 080B77C8
.4byte sub_0801B250
.4byte sub_0801B2CC
.4byte sub_0801B318
.4byte sub_0801B38C
gUnk_080B77D8:: @ 080B77D8
.4byte sub_0801B330
.4byte sub_0801B340
.4byte sub_0801B354
.4byte sub_0801B368
.4byte sub_0801B384
.incbin "baserom.gba", 0x0B77EC, 0x0000008
gUnk_080B77F4:: @ 080B77F4
.incbin "baserom.gba", 0x0B77F4, 0x0000008
data/const/playerItem/playerItemBow.inc
+8
View File
@@ -0,0 +1,8 @@
gUnk_080B3E30:: @ 080B3E30
.4byte sub_08018FE4
.4byte sub_0801917C
.4byte sub_08019410
.4byte sub_08019444
gUnk_080B3E40:: @ 080B3E40
.incbin "baserom.gba", 0x0B3E40, 0x0000030
data/const/playerItem/playerItemC.inc
+9
View File
@@ -0,0 +1,9 @@
gUnk_080B7840:: @ 080B7840
.4byte sub_0801B8B0
.4byte sub_0801B8FC
gUnk_080B7848:: @ 080B7848
.incbin "baserom.gba", 0x0B7848, 0x0000008
gUnk_080B7850:: @ 080B7850
.incbin "baserom.gba", 0x0B7850, 0x0000020
data/const/playerItem/playerItemCellOverwriteSet.inc
+2
View File
@@ -0,0 +1,2 @@
gUnk_080B7B6C:: @ 080B7B6C
.incbin "baserom.gba", 0x0B7B6C, 0x0000008
data/const/playerItem/playerItemGustJar.inc
+91
View File
@@ -0,0 +1,91 @@
gUnk_08132700:: @ 08132700
.4byte sub_080ADA6C
.4byte sub_080ADAA8
.4byte sub_080ADAD4
.4byte sub_080ADC14
.4byte sub_080ADC60
gUnk_08132714:: @ 08132714
.4byte gUnk_08132AF4
.4byte gUnk_08132AEA
.4byte gUnk_08132AE0
.4byte gUnk_08132AEA
.4byte gUnk_08132B1A
.4byte gUnk_08132B0C
.4byte gUnk_08132AFE
.4byte gUnk_08132B0C
gUnk_08132734:: @ 08132734
.incbin "baserom.gba", 0x132734, 0x0000001
gUnk_08132735:: @ 08132735
.incbin "baserom.gba", 0x132735, 0x0000001
gUnk_08132736:: @ 08132736
.incbin "baserom.gba", 0x132736, 0x000000E
gUnk_08132744:: @ 08132744
.incbin "baserom.gba", 0x132744, 0x0000010
gUnk_08132754:: @ 08132754
.incbin "baserom.gba", 0x132754, 0x0000010
gUnk_08132764:: @ 08132764
.incbin "baserom.gba", 0x132764, 0x0000010
gUnk_08132774:: @ 08132774
.incbin "baserom.gba", 0x132774, 0x0000010
gUnk_08132784:: @ 08132784
.incbin "baserom.gba", 0x132784, 0x0000010
gUnk_08132794:: @ 08132794
.incbin "baserom.gba", 0x132794, 0x0000018
gUnk_081327AC:: @ 081327AC
.incbin "baserom.gba", 0x1327AC, 0x0000018
gUnk_081327C4:: @ 081327C4
.incbin "baserom.gba", 0x1327C4, 0x0000018
gUnk_081327DC:: @ 081327DC
.4byte gUnk_08132754
.4byte gUnk_08132744
.4byte gUnk_08132734
.4byte gUnk_08132744
.4byte gUnk_08132784
.4byte gUnk_08132774
.4byte gUnk_08132764
.4byte gUnk_08132774
.4byte gUnk_081327C4
.4byte gUnk_081327AC
.4byte gUnk_08132794
.4byte gUnk_081327AC
.4byte 00000000
gUnk_08132810:: @ 08132810
.incbin "baserom.gba", 0x132810, 0x0000017
gUnk_08132827:: @ 08132827
.incbin "baserom.gba", 0x132827, 0x00002B9
gUnk_08132AE0:: @ 08132AE0
.incbin "baserom.gba", 0x132AE0, 0x000000A
gUnk_08132AEA:: @ 08132AEA
.incbin "baserom.gba", 0x132AEA, 0x000000A
gUnk_08132AF4:: @ 08132AF4
.incbin "baserom.gba", 0x132AF4, 0x000000A
gUnk_08132AFE:: @ 08132AFE
.incbin "baserom.gba", 0x132AFE, 0x000000E
gUnk_08132B0C:: @ 08132B0C
.incbin "baserom.gba", 0x132B0C, 0x000000E
gUnk_08132B1A:: @ 08132B1A
.incbin "baserom.gba", 0x132B1A, 0x000000E
gUnk_08132B28:: @ 08132B28
.incbin "baserom.gba", 0x132B28, 0x0000008
data/const/playerItem/playerItemLantern.inc
+6
View File
@@ -0,0 +1,6 @@
gUnk_080FEEA8:: @ 080FEEA8
.4byte sub_08054A60
.4byte sub_08054AC8
gUnk_080FEEB0:: @ 080FEEB0
.incbin "baserom.gba", 0x0FEEB0, 0x0000008
data/const/playerItem/playerItemPacciCane.inc
+3
View File
@@ -0,0 +1,3 @@
gUnk_0811B9D8:: @ 0811B9D8
.4byte sub_080704D4
.4byte sub_080704FC
data/const/playerItem/playerItemShield.inc
+28
View File
@@ -0,0 +1,28 @@
gUnk_081271D4:: @ 081271D4
.4byte sub_080A2D98
.4byte sub_080A2E00
gUnk_081271DC:: @ 081271DC
.incbin "baserom.gba", 0x1271DC, 0x0000044
gUnk_08127220:: @ 08127220
.incbin "baserom.gba", 0x127220, 0x0000020
gUnk_08127240:: @ 08127240
.4byte gUnk_08127250
.4byte gUnk_08127258
.4byte gUnk_08127260
.4byte gUnk_08127268
gUnk_08127250:: @ 08127250
.incbin "baserom.gba", 0x127250, 0x0000008
gUnk_08127258:: @ 08127258
.incbin "baserom.gba", 0x127258, 0x0000008
gUnk_08127260:: @ 08127260
.incbin "baserom.gba", 0x127260, 0x0000008
gUnk_08127268:: @ 08127268
.incbin "baserom.gba", 0x127268, 0x0000008
data/const/playerItem/playerItemSword.inc
+18
View File
@@ -2,3 +2,21 @@ gUnk_0812905C:: @ 0812905C
.4byte sub_080A758C
.4byte sub_080A76CC
.4byte sub_080A7824
gUnk_08129068:: @ 08129068
.incbin "baserom.gba", 0x129068, 0x0000004
gUnk_0812906C:: @ 0812906C
.incbin "baserom.gba", 0x12906C, 0x0000006
gUnk_08129072:: @ 08129072
.incbin "baserom.gba", 0x129072, 0x000001C
gUnk_0812908E:: @ 0812908E
.incbin "baserom.gba", 0x12908E, 0x0000008
gUnk_08129096:: @ 08129096
.incbin "baserom.gba", 0x129096, 0x000024C
gUnk_081292E2:: @ 081292E2
.incbin "baserom.gba", 0x1292E2, 0x000003E
data/const/playerItem/playerItemSwordBeam.inc
+12
View File
@@ -0,0 +1,12 @@
gUnk_080B43F4:: @ 080B43F4
.4byte sub_08019498
.4byte sub_08019580
gUnk_080B43FC:: @ 080B43FC
.incbin "baserom.gba", 0x0B43FC, 0x0000004
gUnk_080B4400:: @ 080B4400
.incbin "baserom.gba", 0x0B4400, 0x0000008
gUnk_080B4408:: @ 080B4408
.incbin "baserom.gba", 0x0B4408, 0x0000008
data/const/playerItem/playerItemSwordSpin.inc
+9
View File
@@ -0,0 +1,9 @@
gUnk_080B7870:: @ 080B7870
.4byte sub_0801BA18
.4byte sub_0801BB2C
gUnk_080B7878:: @ 080B7878
.incbin "baserom.gba", 0x0B7878, 0x0000012
gUnk_080B788A:: @ 080B788A
.incbin "baserom.gba", 0x0B788A, 0x0000086
data/data_080029B4.s
+8 -1
View File
@@ -89,7 +89,14 @@ gUnk_080033F5:: @ 080033F5
.incbin "baserom.gba", 0x0033F5, 0x000000B
gUnk_08003400:: @ 08003400
.incbin "baserom.gba", 0x003400, 0x0000020
.4byte 00000000
.4byte gUnk_080CB67C
.4byte 00000000
.4byte 00000000
.4byte 00000000
.4byte gUnk_0812714C
.4byte 00000000
.4byte 00000000
gUnk_08003420:: @ 08003420
.incbin "baserom.gba", 0x003420, 0x0000014
data/data_080B3740.s
+12 -91
View File
@@ -44,40 +44,11 @@ gUnk_080B3D14:: @ 080B3D14
gUnk_080B3D20:: @ 080B3D20
.incbin "baserom.gba", 0x0B3D20, 0x00000B0
gUnk_080B3DD0:: @ 080B3DD0
.4byte sub_08018CBC
.4byte sub_08018DE8
.4byte sub_08018E68
.4byte sub_08018F6C
@ TODO convert .inc files into .s files and include them in linker.ld
.include "data/const/playerItem/playerItem11.inc"
gUnk_080B3DE0:: @ 080B3DE0
.incbin "baserom.gba", 0x0B3DE0, 0x0000008
.include "data/const/playerItem/playerItemBow.inc"
gUnk_080B3DE8:: @ 080B3DE8
.4byte gUnk_080B3E18
.4byte gUnk_080B3E20
.4byte gUnk_080B3E28
gUnk_080B3DF4:: @ 080B3DF4
.incbin "baserom.gba", 0x0B3DF4, 0x0000024
gUnk_080B3E18:: @ 080B3E18
.incbin "baserom.gba", 0x0B3E18, 0x0000008
gUnk_080B3E20:: @ 080B3E20
.incbin "baserom.gba", 0x0B3E20, 0x0000008
gUnk_080B3E28:: @ 080B3E28
.incbin "baserom.gba", 0x0B3E28, 0x0000008
gUnk_080B3E30:: @ 080B3E30
.4byte sub_08018FE4
.4byte sub_0801917C
.4byte sub_08019410
.4byte sub_08019444
gUnk_080B3E40:: @ 080B3E40
.incbin "baserom.gba", 0x0B3E40, 0x0000030
gUnk_080B3E70:: @ 080B3E70
.incbin "baserom.gba", 0x0B3E70, 0x0000001
@@ -94,18 +65,8 @@ gUnk_080B3E80:: @ 080B3E80
gUnk_080B4000:: @ 080B4000
.incbin "baserom.gba", 0x0B4000, 0x00003F4
gUnk_080B43F4:: @ 080B43F4
.4byte sub_08019498
.4byte sub_08019580
gUnk_080B43FC:: @ 080B43FC
.incbin "baserom.gba", 0x0B43FC, 0x0000004
gUnk_080B4400:: @ 080B4400
.incbin "baserom.gba", 0x0B4400, 0x0000008
gUnk_080B4408:: @ 080B4408
.incbin "baserom.gba", 0x0B4408, 0x0000008
@ TODO convert .inc files into .s files and include them in linker.ld
.include "data/const/playerItem/playerItemSwordBeam.inc"
gUnk_080B4410:: @ 080B4410
.incbin "baserom.gba", 0x0B4410, 0x0000048
@@ -2780,55 +2741,15 @@ gUnk_080B755C:: @ 080B755C
gUnk_080B77C0:: @ 080B77C0
.incbin "baserom.gba", 0x0B77C0, 0x0000008
gUnk_080B77C8:: @ 080B77C8
.4byte sub_0801B250
.4byte sub_0801B2CC
.4byte sub_0801B318
.4byte sub_0801B38C
@ TODO convert .inc files into .s files and include them in linker.ld
.include "data/const/playerItem/playerItemBomb.inc"
gUnk_080B77D8:: @ 080B77D8
.4byte sub_0801B330
.4byte sub_0801B340
.4byte sub_0801B354
.4byte sub_0801B368
.4byte sub_0801B384
.incbin "baserom.gba", 0x0B77EC, 0x0000008
.include "data/const/playerItem/playerItem3.inc"
gUnk_080B77F4:: @ 080B77F4
.incbin "baserom.gba", 0x0B77F4, 0x0000008
.include "data/const/playerItem/playerItemC.inc"
gUnk_080B77FC:: @ 080B77FC
.4byte sub_0801B4C8
.4byte sub_0801B584
.4byte sub_0801B680
.4byte sub_0801B7A8
.incbin "baserom.gba", 0x0B780C, 0x000001A
.include "data/const/playerItem/playerItemSwordSpin.inc"
gUnk_080B7826:: @ 080B7826
.incbin "baserom.gba", 0x0B7826, 0x0000008
gUnk_080B782E:: @ 080B782E
.incbin "baserom.gba", 0x0B782E, 0x0000012
gUnk_080B7840:: @ 080B7840
.4byte sub_0801B8B0
.4byte sub_0801B8FC
gUnk_080B7848:: @ 080B7848
.incbin "baserom.gba", 0x0B7848, 0x0000008
gUnk_080B7850:: @ 080B7850
.incbin "baserom.gba", 0x0B7850, 0x0000020
gUnk_080B7870:: @ 080B7870
.4byte sub_0801BA18
.4byte sub_0801BB2C
gUnk_080B7878:: @ 080B7878
.incbin "baserom.gba", 0x0B7878, 0x0000012
gUnk_080B788A:: @ 080B788A
.incbin "baserom.gba", 0x0B788A, 0x0000086
gUnk_080B7910:: @ 080B7910
.incbin "baserom.gba", 0x0B7910, 0x0000097
@@ -2839,8 +2760,8 @@ gUnk_080B79A7:: @ 080B79A7
gUnk_080B7A3E:: @ 080B7A3E
.incbin "baserom.gba", 0x0B7A3E, 0x000012E
gUnk_080B7B6C:: @ 080B7B6C
.incbin "baserom.gba", 0x0B7B6C, 0x0000008
.include "data/const/playerItem/playerItemCellOverwriteSet.inc"
gUnk_080B7B74:: @ 080B7B74
.incbin "baserom.gba", 0x0B7B74, 0x00004BA
data/data_080FC8A4.s
+1343 -295
View File
File diff suppressed because it is too large Load Diff
data/data_08108D30.s
+1 -1
View File
@@ -370,7 +370,7 @@ gUnk_08109AA8:: @ 08109AA8
gUnk_08109AB8:: @ 08109AB8
.incbin "baserom.gba", 0x109AB8, 0x0000010
.include "data/const/playerItem/playerItem11.inc"
.include "data/const/playerItem/playerItem14.inc"
@ TODO convert .inc files into .s files and include them in linker.ld
.include "data/animations/npc/gentari.inc"
data/data_08114208.s
+3 -16
View File
@@ -604,20 +604,7 @@ gUnk_0811B578:: @ 0811B578
gUnk_0811B940:: @ 0811B940
.incbin "baserom.gba", 0x11B940, 0x000004C
gUnk_0811B98C:: @ 0811B98C
.incbin "baserom.gba", 0x11B98C, 0x0000014
@ TODO convert .inc files into .s files and include them in linker.ld
.include "data/const/playerItem/playerItem12.inc"
gUnk_0811B9A0:: @ 0811B9A0
.incbin "baserom.gba", 0x11B9A0, 0x0000008
gUnk_0811B9A8:: @ 0811B9A8
.incbin "baserom.gba", 0x11B9A8, 0x0000020
gUnk_0811B9C8:: @ 0811B9C8
.incbin "baserom.gba", 0x11B9C8, 0x0000008
gUnk_0811B9D0:: @ 0811B9D0
.incbin "baserom.gba", 0x11B9D0, 0x0000008
gUnk_0811B9D8:: @ 0811B9D8
.incbin "baserom.gba", 0x11B9D8, 0x0000008
.include "data/const/playerItem/playerItemPacciCane.inc"
data/data_08124712.s
+1724 -163
View File
File diff suppressed because it is too large Load Diff
data/data_081320FC.s
+12 -69
View File
@@ -79,74 +79,8 @@ gUnk_081326CC:: @ 081326CC
gUnk_081326EC:: @ 081326EC
.incbin "baserom.gba", 0x1326EC, 0x0000014
gUnk_08132700:: @ 08132700
.incbin "baserom.gba", 0x132700, 0x0000014
gUnk_08132714:: @ 08132714
.incbin "baserom.gba", 0x132714, 0x0000020
gUnk_08132734:: @ 08132734
.incbin "baserom.gba", 0x132734, 0x0000001
gUnk_08132735:: @ 08132735
.incbin "baserom.gba", 0x132735, 0x0000001
gUnk_08132736:: @ 08132736
.incbin "baserom.gba", 0x132736, 0x000000E
gUnk_08132744:: @ 08132744
.incbin "baserom.gba", 0x132744, 0x0000010
gUnk_08132754:: @ 08132754
.incbin "baserom.gba", 0x132754, 0x0000010
gUnk_08132764:: @ 08132764
.incbin "baserom.gba", 0x132764, 0x0000010
gUnk_08132774:: @ 08132774
.incbin "baserom.gba", 0x132774, 0x0000010
gUnk_08132784:: @ 08132784
.incbin "baserom.gba", 0x132784, 0x0000010
gUnk_08132794:: @ 08132794
.incbin "baserom.gba", 0x132794, 0x0000018
gUnk_081327AC:: @ 081327AC
.incbin "baserom.gba", 0x1327AC, 0x0000018
gUnk_081327C4:: @ 081327C4
.incbin "baserom.gba", 0x1327C4, 0x0000018
gUnk_081327DC:: @ 081327DC
.incbin "baserom.gba", 0x1327DC, 0x0000034
gUnk_08132810:: @ 08132810
.incbin "baserom.gba", 0x132810, 0x0000017
gUnk_08132827:: @ 08132827
.incbin "baserom.gba", 0x132827, 0x00002B9
gUnk_08132AE0:: @ 08132AE0
.incbin "baserom.gba", 0x132AE0, 0x000000A
gUnk_08132AEA:: @ 08132AEA
.incbin "baserom.gba", 0x132AEA, 0x000000A
gUnk_08132AF4:: @ 08132AF4
.incbin "baserom.gba", 0x132AF4, 0x000000A
gUnk_08132AFE:: @ 08132AFE
.incbin "baserom.gba", 0x132AFE, 0x000000E
gUnk_08132B0C:: @ 08132B0C
.incbin "baserom.gba", 0x132B0C, 0x000000E
gUnk_08132B1A:: @ 08132B1A
.incbin "baserom.gba", 0x132B1A, 0x000000E
gUnk_08132B28:: @ 08132B28
.incbin "baserom.gba", 0x132B28, 0x0000008
@ TODO convert .inc files into .s files and include them in linker.ld
.include "data/const/playerItem/playerItemGustJar.inc"
gUnk_08132B30:: @ 08132B30
.incbin "baserom.gba", 0x132B30, 0x0000203
@@ -194,7 +128,16 @@ gUnk_081339F8:: @ 081339F8
.incbin "baserom.gba", 0x1339F8, 0x0000020
gUnk_08133A18:: @ 08133A18
.incbin "baserom.gba", 0x133A18, 0x0000028
.4byte sub_080AE3E4
.4byte sub_080AE3E8
.4byte sub_080AE3EC
.4byte sub_080AE408
.4byte sub_080AE424
.4byte sub_080AE440
.4byte sub_080AE45C
.4byte sub_080AE478
.4byte sub_080AE494
.4byte sub_080AE4B0
gUnk_08133A40:: @ 08133A40
.incbin "baserom.gba", 0x133A40, 0x000001A