mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-11 15:28:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge consecutive incbins

Browse Source
This commit is contained in:
octorock
2021-09-11 12:04:41 +02:00
parent 806e346375
commit e1008d3a4d
138 changed files with 930 additions and 7187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/const/code_08049D30.s
+1 -2
View File
@@ -78,8 +78,7 @@ gUnk_080D2C58:: @ 080D2C58
.4byte gUnk_080D3598
.incbin "baserom.gba", 0x0D2E10, 0x000000C
.4byte gUnk_080FD318
.incbin "baserom.gba", 0x0D2E20, 0x0000006
.incbin "baserom.gba", 0x0D2E26, 0x0000006
.incbin "baserom.gba", 0x0D2E20, 0x000000C
.4byte gUnk_080FD2C0
.incbin "baserom.gba", 0x0D2E30, 0x000000C
.4byte gUnk_080FD150
data/const/demoScreen.s
+2 -2
View File
@@ -12,7 +12,7 @@ demoFunctions::
.4byte sub_080A2F8C
gUnk_08127C98::
.incbin "baserom_demo.gba", 0x127c98, 0x30
.incbin "baserom_demo.gba", 0x127C98, 0x0000030
gUnk_08127CC8::
.incbin "baserom_demo.gba", 0x127CC8, 0x8
.incbin "baserom_demo.gba", 0x127CC8, 0x0000008
.endif
data/const/enemy/cuccoAggr.s
+1 -3
View File
@@ -37,9 +37,7 @@ gUnk_080CF7C2:: @ 080CF7C2
.incbin "baserom.gba", 0x0CF7C2, 0x0000002
gUnk_080CF7C4:: @ 080CF7C4
.incbin "baserom.gba", 0x0CF7C4, 0x0000037
.incbin "baserom.gba", 0x0CF7FB, 0x0000018
.incbin "baserom.gba", 0x0CF813, 0x0000011
.incbin "baserom.gba", 0x0CF7C4, 0x0000060
gUnk_080CF824:: @ 080CF824
.incbin "baserom.gba", 0x0CF824, 0x0000004
data/const/enemy/spinyBeetle.s
+1 -1
View File
@@ -5,7 +5,7 @@
.align 2
unusedLabel_0CEBDC::
.incbin "baserom.gba", 0x0CEBDC, 0x000010
.incbin "baserom.gba", 0x0CEBDC, 0x0000010
gUnk_080CEBEC:: @ 080CEBEC
.4byte sub_080337BC
data/const/enemy/vaatiArm.s
+5 -12
View File
@@ -88,8 +88,7 @@ gUnk_080D12D0:: @ 080D12D0
.4byte sub_080431E8
gUnk_080D12F8:: @ 080D12F8
.incbin "baserom.gba", 0x0D12F8, 0x0000006
.incbin "baserom.gba", 0x0D12FE, 0x0000002
.incbin "baserom.gba", 0x0D12F8, 0x0000008
gUnk_080D1300:: @ 080D1300
.incbin "baserom.gba", 0x0D1300, 0x0000004
@@ -98,8 +97,7 @@ gUnk_080D1304:: @ 080D1304
.incbin "baserom.gba", 0x0D1304, 0x0000008
gUnk_080D130C:: @ 080D130C
.incbin "baserom.gba", 0x0D130C, 0x0000001
.incbin "baserom.gba", 0x0D130D, 0x0000003
.incbin "baserom.gba", 0x0D130C, 0x0000004
gUnk_080D1310:: @ 080D1310
.incbin "baserom.gba", 0x0D1310, 0x0000004
@@ -163,15 +161,10 @@ gUnk_080D13EC:: @ 080D13EC
.incbin "baserom.gba", 0x0D13EC, 0x0000014
gUnk_080D1400:: @ 080D1400
.incbin "baserom.gba", 0x0D1400, 0x000000D
.incbin "baserom.gba", 0x0D140D, 0x0000005
.incbin "baserom.gba", 0x0D1412, 0x0000002
.incbin "baserom.gba", 0x0D1400, 0x0000014
gUnk_080D1414:: @ 080D1414
.incbin "baserom.gba", 0x0D1414, 0x0000003
.incbin "baserom.gba", 0x0D1417, 0x0000001
.incbin "baserom.gba", 0x0D1418, 0x0000001
.incbin "baserom.gba", 0x0D1414, 0x0000005
gUnk_080D1419:: @ 080D1419
.incbin "baserom.gba", 0x0D1419, 0x0000003
.incbin "baserom.gba", 0x0D141C, 0x0000002
.incbin "baserom.gba", 0x0D1419, 0x0000005
data/const/enemy/vaatiBall.s
+1 -2
View File
@@ -17,5 +17,4 @@ gUnk_080D1620:: @ 080D1620
.incbin "baserom.gba", 0x0D1620, 0x0000008
gUnk_080D1628:: @ 080D1628
.incbin "baserom.gba", 0x0D1628, 0x0000007
.incbin "baserom.gba", 0x0D162F, 0x0000009
.incbin "baserom.gba", 0x0D1628, 0x0000010
data/const/enemy/vaatiTransfigured.s
+1 -2
View File
@@ -47,8 +47,7 @@ gUnk_080D0B0C:: @ 080D0B0C
.4byte sub_080405D8
gUnk_080D0B18:: @ 080D0B18
.incbin "baserom.gba", 0x0D0B18, 0x0000011
.incbin "baserom.gba", 0x0D0B29, 0x000002F
.incbin "baserom.gba", 0x0D0B18, 0x0000040
gUnk_080D0B58:: @ 080D0B58
.incbin "baserom.gba", 0x0D0B58, 0x000000C
data/const/manager/manager1.s
+1 -2
View File
@@ -5,8 +5,7 @@
.align 2
gUnk_08107C1C:: @ 08107C1C
.incbin "baserom.gba", 0x107C1C, 0x000000E
.incbin "baserom.gba", 0x107C2A, 0x0000006
.incbin "baserom.gba", 0x107C1C, 0x0000014
gUnk_08107C30:: @ 08107C30
.incbin "baserom.gba", 0x107C30, 0x0000010
data/const/manager/manager13.s
+1 -2
View File
@@ -5,8 +5,7 @@
.align 2
gUnk_081084C8:: @ 081084C8
.incbin "baserom.gba", 0x1084C8, 0x000004A
.incbin "baserom.gba", 0x108512, 0x000001E
.incbin "baserom.gba", 0x1084C8, 0x0000068
gUnk_08108530:: @ 08108530
.incbin "baserom.gba", 0x108530, 0x0000058
data/const/manager/manager1A.s
+8 -16
View File
@@ -103,8 +103,7 @@ gUnk_081086FC:: @ 081086FC
.incbin "baserom.gba", 0x1086FC, 0x0000008
gUnk_08108704:: @ 08108704
.incbin "baserom.gba", 0x108704, 0x0000003
.incbin "baserom.gba", 0x108707, 0x0000005
.incbin "baserom.gba", 0x108704, 0x0000008
gUnk_0810870C:: @ 0810870C
.incbin "baserom.gba", 0x10870C, 0x0000008
@@ -128,8 +127,7 @@ gUnk_0810873C:: @ 0810873C
.incbin "baserom.gba", 0x10873C, 0x0000008
gUnk_08108744:: @ 08108744
.incbin "baserom.gba", 0x108744, 0x0000006
.incbin "baserom.gba", 0x10874A, 0x0000002
.incbin "baserom.gba", 0x108744, 0x0000008
gUnk_0810874C:: @ 0810874C
.incbin "baserom.gba", 0x10874C, 0x0000008
@@ -138,8 +136,7 @@ gUnk_08108754:: @ 08108754
.incbin "baserom.gba", 0x108754, 0x0000008
gUnk_0810875C:: @ 0810875C
.incbin "baserom.gba", 0x10875C, 0x0000002
.incbin "baserom.gba", 0x10875E, 0x0000006
.incbin "baserom.gba", 0x10875C, 0x0000008
gUnk_08108764:: @ 08108764
.incbin "baserom.gba", 0x108764, 0x0000020
@@ -154,18 +151,15 @@ gUnk_08108764:: @ 08108764
.4byte gUnk_081086A0
.incbin "baserom.gba", 0x1087D8, 0x0000010
.4byte gUnk_081086AC
.incbin "baserom.gba", 0x1087EC, 0x0000027
.incbin "baserom.gba", 0x108813, 0x0000001
.incbin "baserom.gba", 0x1087EC, 0x0000028
.4byte gUnk_081086DC
.incbin "baserom.gba", 0x108818, 0x0000010
.4byte gUnk_081086E4
.incbin "baserom.gba", 0x10882C, 0x0000010
.4byte gUnk_081086EC
.incbin "baserom.gba", 0x108840, 0x0000004
.incbin "baserom.gba", 0x108844, 0x000000C
.incbin "baserom.gba", 0x108840, 0x0000010
.4byte gUnk_081086F4
.incbin "baserom.gba", 0x108854, 0x0000010
.incbin "baserom.gba", 0x108864, 0x0000010
.incbin "baserom.gba", 0x108854, 0x0000020
.4byte gUnk_0810867C
.incbin "baserom.gba", 0x108878, 0x00001B8
.4byte gUnk_081086FC
@@ -177,8 +171,7 @@ gUnk_08108764:: @ 08108764
.4byte gUnk_08108714
.incbin "baserom.gba", 0x108A84, 0x0000010
.4byte gUnk_0810871C
.incbin "baserom.gba", 0x108A98, 0x0000003
.incbin "baserom.gba", 0x108A9B, 0x0000021
.incbin "baserom.gba", 0x108A98, 0x0000024
.4byte gUnk_08108724
.incbin "baserom.gba", 0x108AC0, 0x0000010
.4byte gUnk_0810872C
@@ -198,5 +191,4 @@ gUnk_08108764:: @ 08108764
.4byte gUnk_081086C4
.incbin "baserom.gba", 0x108B98, 0x0000010
.4byte gUnk_081086D0
.incbin "baserom.gba", 0x108BAC, 0x0000066
.incbin "baserom.gba", 0x108C12, 0x0000016
.incbin "baserom.gba", 0x108BAC, 0x000007C
data/const/manager/manager1C.s
+1 -2
View File
@@ -9,8 +9,7 @@ gUnk_08108C64:: @ 08108C64
.4byte sub_0805B55C
gUnk_08108C6C:: @ 08108C6C
.incbin "baserom.gba", 0x108C6C, 0x000000B
.incbin "baserom.gba", 0x108C77, 0x0000005
.incbin "baserom.gba", 0x108C6C, 0x0000010
gUnk_08108C7C:: @ 08108C7C
.incbin "baserom.gba", 0x108C7C, 0x0000004
data/const/manager/manager39.s
+1 -2
View File
@@ -15,8 +15,7 @@ gUnk_08108E30:: @ 08108E30
.incbin "baserom.gba", 0x108E30, 0x0000018
gUnk_08108E48:: @ 08108E48
.incbin "baserom.gba", 0x108E48, 0x0000002
.incbin "baserom.gba", 0x108E4A, 0x0000016
.incbin "baserom.gba", 0x108E48, 0x0000018
gUnk_08108E60:: @ 08108E60
.incbin "baserom.gba", 0x108E60, 0x000000C
data/const/manager/manager4.s
+1 -2
View File
@@ -27,8 +27,7 @@ gUnk_08107CE0:: @ 08107CE0
.incbin "baserom.gba", 0x107CE0, 0x0000018
gUnk_08107CF8:: @ 08107CF8
.incbin "baserom.gba", 0x107CF8, 0x000000A
.incbin "baserom.gba", 0x107D02, 0x0000006
.incbin "baserom.gba", 0x107CF8, 0x0000010
gUnk_08107D08:: @ 08107D08
.incbin "baserom.gba", 0x107D08, 0x0000018
data/const/npc/beedle.s
+1 -2
View File
@@ -11,8 +11,7 @@ gUnk_0810C894:: @ 0810C894
.incbin "baserom.gba", 0x10C894, 0x0000008
gUnk_0810C89C:: @ 0810C89C
.incbin "baserom.gba", 0x10C89C, 0x0000011
.incbin "baserom.gba", 0x10C8AD, 0x0000027
.incbin "baserom.gba", 0x10C89C, 0x0000038
gUnk_0810C8D4:: @ 0810C8D4
.incbin "baserom.gba", 0x10C8D4, 0x000000C
data/const/npc/bladeBrothers.s
+3 -10
View File
@@ -31,16 +31,13 @@ gUnk_081115EC:: @ 081115EC
.incbin "baserom.gba", 0x111610, 0x0000008
gUnk_08111618:: @ 08111618
.incbin "baserom.gba", 0x111618, 0x0000003
.incbin "baserom.gba", 0x11161B, 0x0000005
.incbin "baserom.gba", 0x111620, 0x0000003
.incbin "baserom.gba", 0x111618, 0x000000B
gUnk_08111623:: @ 08111623
.incbin "baserom.gba", 0x111623, 0x0000008
gUnk_0811162B:: @ 0811162B
.incbin "baserom.gba", 0x11162B, 0x000000D
.incbin "baserom.gba", 0x111638, 0x000002C
.incbin "baserom.gba", 0x11162B, 0x0000039
gUnk_08111664:: @ 08111664
.incbin "baserom.gba", 0x111664, 0x0000016
@@ -67,11 +64,7 @@ gUnk_081116FE:: @ 081116FE
.incbin "baserom.gba", 0x1116FE, 0x0000016
gUnk_08111714:: @ 08111714
.incbin "baserom.gba", 0x111714, 0x0000003
.incbin "baserom.gba", 0x111717, 0x0000001
.incbin "baserom.gba", 0x111718, 0x0000001
.incbin "baserom.gba", 0x111719, 0x0000001
.incbin "baserom.gba", 0x11171A, 0x0000010
.incbin "baserom.gba", 0x111714, 0x0000016
gUnk_0811172A:: @ 0811172A
.incbin "baserom.gba", 0x11172A, 0x0000016
data/const/npc/carpenter.s
+2 -5
View File
@@ -8,10 +8,7 @@ gUnk_08110CA8:: @ 08110CA8
.incbin "baserom.gba", 0x110CA8, 0x0000040
gUnk_08110CE8:: @ 08110CE8
.incbin "baserom.gba", 0x110CE8, 0x000000A
.incbin "baserom.gba", 0x110CF2, 0x000000C
.incbin "baserom.gba", 0x110CFE, 0x0000002
.incbin "baserom.gba", 0x110CE8, 0x0000018
gUnk_08110D00:: @ 08110D00
.incbin "baserom.gba", 0x110D00, 0x0000002
.incbin "baserom.gba", 0x110D02, 0x0000006
.incbin "baserom.gba", 0x110D00, 0x0000008
data/const/npc/cat.s
+3 -15
View File
@@ -8,15 +8,7 @@ gUnk_08110EF0:: @ 08110EF0
.incbin "baserom.gba", 0x110EF0, 0x0000008
gUnk_08110EF8:: @ 08110EF8
.incbin "baserom.gba", 0x110EF8, 0x0000002
.incbin "baserom.gba", 0x110EFA, 0x000000F
.incbin "baserom.gba", 0x110F09, 0x0000001
.incbin "baserom.gba", 0x110F0A, 0x0000002
.incbin "baserom.gba", 0x110F0C, 0x000000A
.incbin "baserom.gba", 0x110F16, 0x00000EA
.incbin "baserom.gba", 0x111000, 0x0000003
.incbin "baserom.gba", 0x111003, 0x000000A
.incbin "baserom.gba", 0x11100D, 0x00000CB
.incbin "baserom.gba", 0x110EF8, 0x00001E0
gCat:: @ 081110D8
.4byte sub_080677EC
@@ -36,11 +28,7 @@ gUnk_08111104:: @ 08111104
.incbin "baserom.gba", 0x111104, 0x0000008
gUnk_0811110C:: @ 0811110C
.incbin "baserom.gba", 0x11110C, 0x0000001
.incbin "baserom.gba", 0x11110D, 0x0000001
.incbin "baserom.gba", 0x11110E, 0x0000001
.incbin "baserom.gba", 0x11110C, 0x0000003
gUnk_0811110F:: @ 0811110F
.incbin "baserom.gba", 0x11110F, 0x0000002
.incbin "baserom.gba", 0x111111, 0x0000002
.incbin "baserom.gba", 0x111113, 0x0000001
.incbin "baserom.gba", 0x11110F, 0x0000005
data/const/npc/dog.s
+1 -2
View File
@@ -26,8 +26,7 @@ gUnk_08111DA8:: @ 08111DA8
.incbin "baserom.gba", 0x111DA8, 0x0000008
gUnk_08111DB0:: @ 08111DB0
.incbin "baserom.gba", 0x111DB0, 0x0000066
.incbin "baserom.gba", 0x111E16, 0x000001A
.incbin "baserom.gba", 0x111DB0, 0x0000080
gUnk_08111E30:: @ 08111E30
.incbin "baserom.gba", 0x111E30, 0x0000004
data/const/npc/forestMinish.s
+2 -7
View File
@@ -54,10 +54,7 @@ gUnk_08109D18:: @ 08109D18
.4byte script_0800CD04
gUnk_08109DC8:: @ 08109DC8
.incbin "baserom.gba", 0x109DC8, 0x000003F
.incbin "baserom.gba", 0x109E07, 0x000010E
.incbin "baserom.gba", 0x109F15, 0x0000052
.incbin "baserom.gba", 0x109F67, 0x0000005
.incbin "baserom.gba", 0x109DC8, 0x00001A4
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x109C30, 0x000002B
@@ -98,9 +95,7 @@ gUnk_08109DC8:: @ 08109DC8
.4byte sub_080601D4
.incbin "baserom.gba", 0x10A080, 0x0000004
.4byte sub_080601D4
.incbin "baserom.gba", 0x10A088, 0x00000D1
.incbin "baserom.gba", 0x10A159, 0x0000048
.incbin "baserom.gba", 0x10A1A1, 0x00001A7
.incbin "baserom.gba", 0x10A088, 0x00002C0
gUnk_0810A348:: @ 0810A348
.incbin "baserom.gba", 0x10A348, 0x000000C
data/const/npc/ghostBrothers.s
+1 -3
View File
@@ -21,9 +21,7 @@ gUnk_0811017C:: @ 0811017C
.4byte sub_08065DB8
gUnk_08110188:: @ 08110188
.incbin "baserom.gba", 0x110188, 0x0000055
.incbin "baserom.gba", 0x1101DD, 0x000001A
.incbin "baserom.gba", 0x1101F7, 0x0000037
.incbin "baserom.gba", 0x110188, 0x00000A6
gUnk_0811022E:: @ 0811022E
.incbin "baserom.gba", 0x11022E, 0x0000046
data/const/npc/guard.s
+2 -88
View File
@@ -5,96 +5,10 @@
.align 2
gUnk_0810CF4C:: @ 0810CF4C
.incbin "baserom.gba", 0x10CF4C, 0x000002B
.incbin "baserom.gba", 0x10CF77, 0x0000010
.incbin "baserom.gba", 0x10CF87, 0x0000057
.incbin "baserom.gba", 0x10CFDE, 0x0000039
.incbin "baserom.gba", 0x10D017, 0x000008D
.incbin "baserom.gba", 0x10CF4C, 0x0000158
gUnk_0810D0A4:: @ 0810D0A4
.incbin "baserom.gba", 0x10D0A4, 0x0000008
.incbin "baserom.gba", 0x10D0AC, 0x000001E
.incbin "baserom.gba", 0x10D0CA, 0x0000009
.incbin "baserom.gba", 0x10D0D3, 0x0000079
.incbin "baserom.gba", 0x10D14C, 0x0000227
.incbin "baserom.gba", 0x10D373, 0x0000003
.incbin "baserom.gba", 0x10D376, 0x0000013
.incbin "baserom.gba", 0x10D389, 0x000003E
.incbin "baserom.gba", 0x10D3C7, 0x0000040
.incbin "baserom.gba", 0x10D407, 0x00000C7
.incbin "baserom.gba", 0x10D4CE, 0x0000007
.incbin "baserom.gba", 0x10D4D5, 0x000003C
.incbin "baserom.gba", 0x10D511, 0x0000006
.incbin "baserom.gba", 0x10D517, 0x0000039
.incbin "baserom.gba", 0x10D550, 0x0000024
.incbin "baserom.gba", 0x10D574, 0x000005F
.incbin "baserom.gba", 0x10D5D3, 0x00000DE
.incbin "baserom.gba", 0x10D6B1, 0x0000056
.incbin "baserom.gba", 0x10D707, 0x00000D2
.incbin "baserom.gba", 0x10D7D9, 0x000002E
.incbin "baserom.gba", 0x10D807, 0x0000021
.incbin "baserom.gba", 0x10D828, 0x00000DF
.incbin "baserom.gba", 0x10D907, 0x0000100
.incbin "baserom.gba", 0x10DA07, 0x0000007
.incbin "baserom.gba", 0x10DA0E, 0x00000B2
.incbin "baserom.gba", 0x10DAC0, 0x0000041
.incbin "baserom.gba", 0x10DB01, 0x0000003
.incbin "baserom.gba", 0x10DB04, 0x0000005
.incbin "baserom.gba", 0x10DB09, 0x00000FB
.incbin "baserom.gba", 0x10DC04, 0x0000017
.incbin "baserom.gba", 0x10DC1B, 0x00000C0
.incbin "baserom.gba", 0x10DCDB, 0x0000001
.incbin "baserom.gba", 0x10DCDC, 0x000012B
.incbin "baserom.gba", 0x10DE07, 0x0000046
.incbin "baserom.gba", 0x10DE4D, 0x0000293
.incbin "baserom.gba", 0x10E0E0, 0x0000011
.incbin "baserom.gba", 0x10E0F1, 0x000000C
.incbin "baserom.gba", 0x10E0FD, 0x00000C6
.incbin "baserom.gba", 0x10E1C3, 0x000002D
.incbin "baserom.gba", 0x10E1F0, 0x00000FD
.incbin "baserom.gba", 0x10E2ED, 0x0000116
.incbin "baserom.gba", 0x10E403, 0x000000A
.incbin "baserom.gba", 0x10E40D, 0x0000009
.incbin "baserom.gba", 0x10E416, 0x0000072
.incbin "baserom.gba", 0x10E488, 0x000008E
.incbin "baserom.gba", 0x10E516, 0x000007B
.incbin "baserom.gba", 0x10E591, 0x000005A
.incbin "baserom.gba", 0x10E5EB, 0x000001C
.incbin "baserom.gba", 0x10E607, 0x00000E1
.incbin "baserom.gba", 0x10E6E8, 0x0000021
.incbin "baserom.gba", 0x10E709, 0x00000DB
.incbin "baserom.gba", 0x10E7E4, 0x000000B
.incbin "baserom.gba", 0x10E7EF, 0x0000009
.incbin "baserom.gba", 0x10E7F8, 0x000000F
.incbin "baserom.gba", 0x10E807, 0x0000001
.incbin "baserom.gba", 0x10E808, 0x00000F0
.incbin "baserom.gba", 0x10E8F8, 0x00000F8
.incbin "baserom.gba", 0x10E9F0, 0x0000100
.incbin "baserom.gba", 0x10EAF0, 0x000000E
.incbin "baserom.gba", 0x10EAFE, 0x000003E
.incbin "baserom.gba", 0x10EB3C, 0x000001F
.incbin "baserom.gba", 0x10EB5B, 0x0000064
.incbin "baserom.gba", 0x10EBBF, 0x0000010
.incbin "baserom.gba", 0x10EBCF, 0x0000010
.incbin "baserom.gba", 0x10EBDF, 0x0000029
.incbin "baserom.gba", 0x10EC08, 0x00000FC
.incbin "baserom.gba", 0x10ED04, 0x0000005
.incbin "baserom.gba", 0x10ED09, 0x00000E0
.incbin "baserom.gba", 0x10EDE9, 0x0000008
.incbin "baserom.gba", 0x10EDF1, 0x0000036
.incbin "baserom.gba", 0x10EE27, 0x0000056
.incbin "baserom.gba", 0x10EE7D, 0x0000080
.incbin "baserom.gba", 0x10EEFD, 0x0000148
.incbin "baserom.gba", 0x10F045, 0x00000AA
.incbin "baserom.gba", 0x10F0EF, 0x0000001
.incbin "baserom.gba", 0x10F0F0, 0x0000208
.incbin "baserom.gba", 0x10F2F8, 0x0000006
.incbin "baserom.gba", 0x10F2FE, 0x0000100
.incbin "baserom.gba", 0x10F3FE, 0x0000002
.incbin "baserom.gba", 0x10F400, 0x00000E6
.incbin "baserom.gba", 0x10F4E6, 0x000000B
.incbin "baserom.gba", 0x10F4F1, 0x0000007
.incbin "baserom.gba", 0x10F4F8, 0x000002C
.incbin "baserom.gba", 0x10D0A4, 0x0002480
gUnk_0810F524:: @ 0810F524
.incbin "baserom.gba", 0x10F524, 0x0000020
data/const/npc/hurdyGurdyMan.s
+1 -2
View File
@@ -8,5 +8,4 @@ gUnk_081144F0:: @ 081144F0
.incbin "baserom.gba", 0x1144F0, 0x000000C
gUnk_081144FC:: @ 081144FC
.incbin "baserom.gba", 0x1144FC, 0x0000035
.incbin "baserom.gba", 0x114531, 0x000000B
.incbin "baserom.gba", 0x1144FC, 0x0000040
data/const/npc/kid.s
+1 -4
View File
@@ -39,10 +39,7 @@ gUnk_0810BE0C:: @ 0810BE0C
gUnk_0810BE10:: @ 0810BE10
.4byte sub_08062130
.4byte sub_08062194
.incbin "baserom.gba", 0x10BE18, 0x0000029
.incbin "baserom.gba", 0x10BE41, 0x00000C2
.incbin "baserom.gba", 0x10BF03, 0x0000104
.incbin "baserom.gba", 0x10C007, 0x0000008
.incbin "baserom.gba", 0x10BE18, 0x00001F7
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10BCD3, 0x0000091
data/const/npc/maid.s
+1 -3
View File
@@ -11,6 +11,4 @@ gUnk_0810F88C:: @ 0810F88C
.incbin "baserom.gba", 0x10F88C, 0x0000008
gUnk_0810F894:: @ 0810F894
.incbin "baserom.gba", 0x10F894, 0x0000024
.incbin "baserom.gba", 0x10F8B8, 0x0000018
.incbin "baserom.gba", 0x10F8D0, 0x0000014
.incbin "baserom.gba", 0x10F894, 0x0000050
data/const/npc/melari.s
+1 -3
View File
@@ -5,9 +5,7 @@
.align 2
gUnk_08111520:: @ 08111520
.incbin "baserom.gba", 0x111520, 0x0000007
.incbin "baserom.gba", 0x111527, 0x0000002
.incbin "baserom.gba", 0x111529, 0x0000007
.incbin "baserom.gba", 0x111520, 0x0000010
gUnk_08111530:: @ 08111530
.4byte sub_08068708
data/const/npc/mountainMinish.s
+2 -7
View File
@@ -8,15 +8,10 @@ gUnk_08111284:: @ 08111284
.incbin "baserom.gba", 0x111284, 0x0000080
gUnk_08111304:: @ 08111304
.incbin "baserom.gba", 0x111304, 0x0000009
.incbin "baserom.gba", 0x11130D, 0x0000001
.incbin "baserom.gba", 0x111304, 0x000000A
gUnk_0811130E:: @ 0811130E
.incbin "baserom.gba", 0x11130E, 0x0000001
.incbin "baserom.gba", 0x11130F, 0x0000009
.incbin "baserom.gba", 0x111318, 0x0000006
.incbin "baserom.gba", 0x11131E, 0x0000025
.incbin "baserom.gba", 0x111343, 0x0000015
.incbin "baserom.gba", 0x11130E, 0x000004A
gUnk_08111358:: @ 08111358
.incbin "baserom.gba", 0x111358, 0x0000010
data/const/npc/postman.s
+1 -2
View File
@@ -5,8 +5,7 @@
.align 2
gUnk_0810A66C:: @ 0810A66C
.incbin "baserom.gba", 0x10A66C, 0x00000BC
.incbin "baserom.gba", 0x10A728, 0x0000040
.incbin "baserom.gba", 0x10A66C, 0x00000FC
gUnk_0810A768:: @ 0810A768
.incbin "baserom.gba", 0x10A768, 0x0000005
data/const/npc/sittingPerson.s
+1 -2
View File
@@ -8,8 +8,7 @@ gUnk_0810CB78:: @ 0810CB78
.incbin "baserom.gba", 0x10CB78, 0x0000048
gUnk_0810CBC0:: @ 0810CBC0
.incbin "baserom.gba", 0x10CBC0, 0x000000D
.incbin "baserom.gba", 0x10CBCD, 0x000000B
.incbin "baserom.gba", 0x10CBC0, 0x0000018
gUnk_0810CBD8:: @ 0810CBD8
.4byte sub_08063758
data/const/npc/smallTownMinish.s
+1 -4
View File
@@ -11,7 +11,4 @@ gUnk_08114304:: @ 08114304
.incbin "baserom.gba", 0x114304, 0x0000004
gUnk_08114308:: @ 08114308
.incbin "baserom.gba", 0x114308, 0x0000128
.incbin "baserom.gba", 0x114430, 0x0000002
.incbin "baserom.gba", 0x114432, 0x0000012
.incbin "baserom.gba", 0x114444, 0x0000084
.incbin "baserom.gba", 0x114308, 0x00001C0
data/const/npc/smith.s
+1 -2
View File
@@ -26,8 +26,7 @@ gUnk_08110390:: @ 08110390
.incbin "baserom.gba", 0x110390, 0x0000040
gUnk_081103D0:: @ 081103D0
.incbin "baserom.gba", 0x1103D0, 0x000000B
.incbin "baserom.gba", 0x1103DB, 0x0000005
.incbin "baserom.gba", 0x1103D0, 0x0000010
gUnk_081103E0:: @ 081103E0
.incbin "baserom.gba", 0x1103E0, 0x0000004
data/const/npc/sturgeon.s
+1 -4
View File
@@ -17,10 +17,7 @@ gUnk_0810FA54:: @ 0810FA54
.incbin "baserom.gba", 0x10FA54, 0x0000006
gUnk_0810FA5A:: @ 0810FA5A
.incbin "baserom.gba", 0x10FA5A, 0x0000097
.incbin "baserom.gba", 0x10FAF1, 0x0000002
.incbin "baserom.gba", 0x10FAF3, 0x0000004
.incbin "baserom.gba", 0x10FAF7, 0x000002D
.incbin "baserom.gba", 0x10FA5A, 0x00000CA
gUnk_0810FB24:: @ 0810FB24
.incbin "baserom.gba", 0x10FB24, 0x0000015
data/const/npc/townMinish.s
+1 -2
View File
@@ -5,8 +5,7 @@
.align 2
gUnk_081125F4:: @ 081125F4
.incbin "baserom.gba", 0x1125F4, 0x000000C
.incbin "baserom.gba", 0x112600, 0x0000074
.incbin "baserom.gba", 0x1125F4, 0x0000080
gUnk_08112674:: @ 08112674
.incbin "baserom.gba", 0x112674, 0x0000060
data/const/npc/townsperson.s
+5 -11
View File
@@ -5,9 +5,7 @@
.align 2
gUnk_0810B680:: @ 0810B680
.incbin "baserom.gba", 0x10B680, 0x000002A
.incbin "baserom.gba", 0x10B6AA, 0x0000009
.incbin "baserom.gba", 0x10B6B3, 0x0000021
.incbin "baserom.gba", 0x10B680, 0x0000054
gUnk_0810B6D4:: @ 0810B6D4
.incbin "baserom.gba", 0x10B6D4, 0x000000C
@@ -45,8 +43,7 @@ gUnk_0810B748:: @ 0810B748
.incbin "baserom.gba", 0x10B748, 0x0000002
gUnk_0810B74A:: @ 0810B74A
.incbin "baserom.gba", 0x10B74A, 0x0000018
.incbin "baserom.gba", 0x10B762, 0x0000012
.incbin "baserom.gba", 0x10B74A, 0x000002A
gUnk_0810B774:: @ 0810B774
.4byte sub_08061BC8
@@ -62,15 +59,13 @@ gUnk_0810B78C:: @ 0810B78C
.incbin "baserom.gba", 0x10B78C, 0x0000004
gUnk_0810B790:: @ 0810B790
.incbin "baserom.gba", 0x10B790, 0x000001C
.incbin "baserom.gba", 0x10B7AC, 0x000000E
.incbin "baserom.gba", 0x10B790, 0x000002A
gUnk_0810B7BA:: @ 0810B7BA
.incbin "baserom.gba", 0x10B7BA, 0x0000006
gUnk_0810B7C0:: @ 0810B7C0
.incbin "baserom.gba", 0x10B7C0, 0x000012B
.incbin "baserom.gba", 0x10B8EB, 0x0000037
.incbin "baserom.gba", 0x10B7C0, 0x0000162
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10B5E6, 0x0000049
@@ -121,8 +116,7 @@ gUnk_0810B7C0:: @ 0810B7C0
.endif
.incbin "baserom.gba", 0x10BB18, 0x0000044
.4byte sub_0806200C
.incbin "baserom.gba", 0x10BB60, 0x0000011
.incbin "baserom.gba", 0x10BB71, 0x000005B
.incbin "baserom.gba", 0x10BB60, 0x000006C
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10B890, 0x000009C
data/const/npc/zelda.s
+2 -4
View File
@@ -9,9 +9,7 @@ gUnk_08110BD8:: @ 08110BD8
.4byte sub_08066CF8
gUnk_08110BE0:: @ 08110BE0
.incbin "baserom.gba", 0x110BE0, 0x000001F
.incbin "baserom.gba", 0x110BFF, 0x0000001
.incbin "baserom.gba", 0x110BE0, 0x0000020
gUnk_08110C00:: @ 08110C00
.incbin "baserom.gba", 0x110C00, 0x0000003
.incbin "baserom.gba", 0x110C03, 0x0000009
.incbin "baserom.gba", 0x110C00, 0x000000C
data/const/object/beanstalk.s
+1 -6
View File
@@ -9,12 +9,7 @@ gUnk_08120DF4:: @ 08120DF4
.4byte sub_08089F08
gUnk_08120DFC:: @ 08120DFC
.incbin "baserom.gba", 0x120DFC, 0x0000004
.incbin "baserom.gba", 0x120E00, 0x0000001
.incbin "baserom.gba", 0x120E01, 0x0000001
.incbin "baserom.gba", 0x120E02, 0x0000006
.incbin "baserom.gba", 0x120E08, 0x000000B
.incbin "baserom.gba", 0x120E13, 0x0000001
.incbin "baserom.gba", 0x120DFC, 0x0000018
gUnk_08120E14:: @ 08120E14
.incbin "baserom.gba", 0x120E14, 0x0000028
data/const/object/bossDoor.s
+1 -3
View File
@@ -20,6 +20,4 @@ gUnk_081214FC:: @ 081214FC
.incbin "baserom.gba", 0x1214FC, 0x0000010
gUnk_0812150C:: @ 0812150C
.incbin "baserom.gba", 0x12150C, 0x0000001
.incbin "baserom.gba", 0x12150D, 0x0000005
.incbin "baserom.gba", 0x121512, 0x0000002
.incbin "baserom.gba", 0x12150C, 0x0000008
data/const/object/fileScreenObjects.s
+1 -2
View File
@@ -52,5 +52,4 @@ gUnk_08121D48:: @ 08121D48
.incbin "baserom.gba", 0x121D48, 0x000000C
gUnk_08121D54:: @ 08121D54
.incbin "baserom.gba", 0x121D54, 0x00000BD
.incbin "baserom.gba", 0x121E11, 0x0000013
.incbin "baserom.gba", 0x121D54, 0x00000D0
data/const/object/furniture.s
+1 -5
View File
@@ -5,8 +5,4 @@
.align 2
gUnk_08121EF8:: @ 08121EF8
.incbin "baserom.gba", 0x121EF8, 0x0000036
.incbin "baserom.gba", 0x121F2E, 0x00000D2
.incbin "baserom.gba", 0x122000, 0x000001C
.incbin "baserom.gba", 0x12201C, 0x0000016
.incbin "baserom.gba", 0x122032, 0x00000F6
.incbin "baserom.gba", 0x121EF8, 0x0000230
data/const/object/itemOnGround.s
+1 -6
View File
@@ -49,9 +49,4 @@ gUnk_0811E840:: @ 0811E840
.4byte sub_080813F0
gUnk_0811E84C:: @ 0811E84C
.incbin "baserom.gba", 0x11E84C, 0x00000B0
.incbin "baserom.gba", 0x11E8FC, 0x00000FA
.incbin "baserom.gba", 0x11E9F6, 0x0000001
.incbin "baserom.gba", 0x11E9F7, 0x0000124
.incbin "baserom.gba", 0x11EB1B, 0x00000DE
.incbin "baserom.gba", 0x11EBF9, 0x0000003
.incbin "baserom.gba", 0x11E84C, 0x00003B0
data/const/object/jailBars.s
+1 -2
View File
@@ -11,8 +11,7 @@ gUnk_08124950:: @ 08124950
.4byte nullsub_127
gUnk_08124960:: @ 08124960
.incbin "baserom.gba", 0x124960, 0x0000005
.incbin "baserom.gba", 0x124965, 0x0000015
.incbin "baserom.gba", 0x124960, 0x000001A
gUnk_0812497A:: @ 0812497A
.incbin "baserom.gba", 0x12497A, 0x000001A
data/const/object/object3A.s
+1 -4
View File
@@ -5,10 +5,7 @@
.align 2
gUnk_081215E8:: @ 081215E8
.incbin "baserom.gba", 0x1215E8, 0x000002A
.incbin "baserom.gba", 0x121612, 0x0000002
.incbin "baserom.gba", 0x121614, 0x000000D
.incbin "baserom.gba", 0x121621, 0x0000017
.incbin "baserom.gba", 0x1215E8, 0x0000050
gUnk_08121638:: @ 08121638
.4byte sub_0808C6D4
data/const/object/object3E.s
+1 -5
View File
@@ -17,11 +17,7 @@ gUnk_081216DC:: @ 081216DC
.4byte sub_0808D194
gUnk_08121704:: @ 08121704
.incbin "baserom.gba", 0x121704, 0x0000010
.incbin "baserom.gba", 0x121714, 0x0000002
.incbin "baserom.gba", 0x121716, 0x0000001
.incbin "baserom.gba", 0x121717, 0x0000002
.incbin "baserom.gba", 0x121719, 0x0000007
.incbin "baserom.gba", 0x121704, 0x000001C
gUnk_08121720:: @ 08121720
.incbin "baserom.gba", 0x121720, 0x000000C
data/const/object/pushableGrave.s
+1 -2
View File
@@ -12,8 +12,7 @@ gUnk_081232AC:: @ 081232AC
.4byte nullsub_528
gUnk_081232C0:: @ 081232C0
.incbin "baserom.gba", 0x1232C0, 0x000001D
.incbin "baserom.gba", 0x1232DD, 0x0000001
.incbin "baserom.gba", 0x1232C0, 0x000001E
gUnk_081232DE:: @ 081232DE
.incbin "baserom.gba", 0x1232DE, 0x0000006
data/const/object/pushableStatue.s
+1 -2
View File
@@ -22,8 +22,7 @@ gUnk_08120CBC:: @ 08120CBC
.incbin "baserom.gba", 0x120CBC, 0x0000010
gUnk_08120CCC:: @ 08120CCC
.incbin "baserom.gba", 0x120CCC, 0x000003D
.incbin "baserom.gba", 0x120D09, 0x0000063
.incbin "baserom.gba", 0x120CCC, 0x00000A0
gUnk_08120D6C:: @ 08120D6C
.incbin "baserom.gba", 0x120D6C, 0x000001A
data/const/playerItem/playerItemGustJar.s
+2 -5
View File
@@ -22,9 +22,7 @@ gUnk_08132714:: @ 08132714
.4byte gUnk_08132B0C
gUnk_08132734:: @ 08132734
.incbin "baserom.gba", 0x132734, 0x0000001
.incbin "baserom.gba", 0x132735, 0x0000001
.incbin "baserom.gba", 0x132736, 0x000000E
.incbin "baserom.gba", 0x132734, 0x0000010
gUnk_08132744:: @ 08132744
.incbin "baserom.gba", 0x132744, 0x0000010
@@ -66,8 +64,7 @@ gUnk_081327DC:: @ 081327DC
.4byte 00000000
gUnk_08132810:: @ 08132810
.incbin "baserom.gba", 0x132810, 0x0000017
.incbin "baserom.gba", 0x132827, 0x00002B9
.incbin "baserom.gba", 0x132810, 0x00002D0
gUnk_08132AE0:: @ 08132AE0
.incbin "baserom.gba", 0x132AE0, 0x000000A