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

Add JP variant

Browse Source
This commit is contained in:
octorock
2021-06-17 20:35:06 +02:00
parent b0510402ab
commit 57ab4df1a0
90 changed files with 3002 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+3 -2
View File
@@ -18,11 +18,12 @@ BUILD_NAME := tmc
else
ifeq ($(GAME_VERSION), DEMO)
GAME_CODE := BZHE
BUILD_NAME := tmc
BUILD_NAME := tmc_demo
else
ifeq ($(GAME_VERSION), JP)
GAME_CODE := BZMJ
BUILD_NAME := tmc
BUILD_NAME := tmc_jp
GAME_LANGUAGE := JAPANESE
else
$(error unknown version $(GAME_VERSION))
endif
asm/code_080043E8.s
+5
View File
@@ -2257,8 +2257,13 @@ gUnk_08007D07:: @ 08007D07
.ifdef DEMO
@ TODO only one byte differs
.incbin "baserom_demo.gba", 0x007D07, 0x00000CF
.else
.ifdef JP
@ TODO only one byte differs
.incbin "baserom_jp.gba", 0x007D07, 0x00000CF
.else
.incbin "baserom.gba", 0x007D07, 0x00000CF
.endif
.endif
non_word_aligned_thumb_func_start sub_08007DD6
asm/code_08018500.s
+8
View File
@@ -169,7 +169,11 @@ sub_0801862C: @ 0x0801862C
strb r0, [r1, #0xc]
ldr r5, _08018650 @ =gScreenTransition
adds r0, r5, #0
.ifdef JP
adds r0, #0x34
.else
adds r0, #0x35
.endif
strb r2, [r0]
ldr r4, _08018654 @ =gUnk_02033AB8
ldrb r0, [r4]
@@ -627,7 +631,11 @@ _080189D0:
beq _080189E4
movs r0, #0x80
lsls r0, r0, #1
.ifdef JP
movs r1, #0x77
.else
movs r1, #0x79
.endif
bl SetLocalFlagByOffset
ldr r0, _080189E8 @ =gUnk_080FEE38
bl LoadRoomEntityList
asm/code_0801967C.s
+2
View File
@@ -985,10 +985,12 @@ _08019DE4:
bne _08019DEE
b _0801A2A4
_08019DEE:
.ifndef JP
ldrb r0, [r4, #0xa]
cmp r0, #0
beq _08019DF6
b _0801A2A4
.endif
_08019DF6:
ldr r2, _08019E40 @ =gPlayerEntity
ldrb r0, [r2, #0x14]
asm/code_0801D79C.s
+4
View File
@@ -2190,6 +2190,9 @@ _0801E8D2:
thumb_func_start sub_0801E8D4
sub_0801E8D4: @ 0x0801E8D4
.ifdef JP
.incbin "baserom_jp.gba", 0x01E8B8, 0x90 @nocheckin
.else
push {r4, r5, lr}
movs r5, #0xa
_0801E8D8:
@@ -2289,6 +2292,7 @@ _0801E990:
pop {r4, r5, pc}
.align 2, 0
_0801E998: .4byte gUnk_02002C8E
.endif
thumb_func_start sub_0801E99C
sub_0801E99C: @ 0x0801E99C
asm/code_080526F8.s
+10
View File
@@ -620,7 +620,11 @@ sub_08052BB8: @ 0x08052BB8
push {lr}
ldr r0, _08052BE0 @ =gScreenTransition
adds r2, r0, #0
.ifdef JP
adds r2, #0x34
.else
adds r2, #0x35
.endif
ldrb r1, [r2]
adds r3, r0, #0
cmp r1, #0
@@ -649,6 +653,7 @@ _08052BEE:
bl TextBoxAtYPosition
pop {pc}
.ifndef JP
thumb_func_start sub_08052BF8
sub_08052BF8: @ 0x08052BF8
push {lr}
@@ -682,6 +687,7 @@ _08052C30:
.align 2, 0
_08052C34: .4byte gScreenTransition
_08052C38: .4byte gArea
.endif
thumb_func_start sub_08052C3C
sub_08052C3C: @ 0x08052C3C
@@ -1309,7 +1315,11 @@ _0805310C:
_0805311A:
movs r0, #0x80
lsls r0, r0, #1
.ifdef JP
movs r1, #0x9b
.else
movs r1, #0x9c
.endif
bl CheckLocalFlagByOffset
cmp r0, #0
beq _0805312C
asm/code_08054C04.s
+4
View File
@@ -383,7 +383,11 @@ sub_08054EB8: @ 0x08054EB8
adds r1, #0x35
movs r0, #1
strb r0, [r1]
.ifdef JP
movs r0, #0x77
.else
movs r0, #0x79
.endif
strh r0, [r3, #0x3e]
adds r0, r3, #0
movs r1, #6
asm/code_08078778.s
+4
View File
@@ -312,7 +312,11 @@ sub_08078AA8: @ 0x08078AA8
strb r2, [r3, #0xc]
ldr r2, _08078ABC @ =gScreenTransition
strh r0, [r2, #0x36]
.ifdef JP
adds r2, #0x34
.else
adds r2, #0x35
.endif
strb r1, [r2]
bx lr
.align 2, 0
asm/code_0807F0D8.s
+2
View File
@@ -1582,6 +1582,7 @@ sub_0807FBFC: @ 0x0807FBFC
.align 2, 0
_0807FC20: .4byte gSave
.ifndef JP
thumb_func_start sub_0807FC24
sub_0807FC24: @ 0x0807FC24
push {lr}
@@ -1597,6 +1598,7 @@ _0807FC32:
pop {pc}
.align 2, 0
_0807FC3C: .4byte gRoomControls
.endif
thumb_func_start UpdateScroll
UpdateScroll: @ 0xUpdateScroll
asm/figurineDevice.s
+29
View File
@@ -428,6 +428,14 @@ _08087ED8:
movs r3, #0xa
_08087EF0:
ldrh r1, [r6, #4]
.ifdef JP
cmp r1, #0x40
beq _08087F04
cmp r1, #0x80
beq _08087F0E
b _08087F16
.align 2, 0
.else
ldr r0, _08087F00 @ =0xFFFFFEFF
ands r1, r0
cmp r1, #0x40
@@ -437,6 +445,7 @@ _08087EF0:
b _08087F16
.align 2, 0
_08087F00: .4byte 0xFFFFFEFF
.endif
_08087F04:
adds r0, r4, #0
adds r1, r3, #0
@@ -512,6 +521,9 @@ _08087F90: .4byte 0x00004022
thumb_func_start sub_08087F94
sub_08087F94: @ 0x08087F94
.ifdef JP
.incbin "baserom_jp.gba", 0x087dac, 0xb0 @TODO disassemble
.else
push {r4, r5, r6, r7, lr}
adds r5, r0, #0
adds r4, r1, #0
@@ -596,6 +608,7 @@ _08088028:
bl SoundReq
_08088032:
pop {r4, r5, r6, r7, pc}
.endif
thumb_func_start sub_08088034
sub_08088034: @ 0x08088034
@@ -667,7 +680,11 @@ _080880A4:
_080880B2:
movs r0, #0x80
lsls r0, r0, #1
.ifdef JP
movs r1, #0x9b
.else
movs r1, #0x9c
.endif
bl CheckLocalFlagByOffset
cmp r0, #0
beq _080880C4
@@ -759,6 +776,9 @@ _0808815C: .4byte gSave
thumb_func_start sub_08088160
sub_08088160: @ 0x08088160
.ifdef JP
.incbin "baserom_jp.gba", 0x087f88, 0xe8
.else
push {r4, lr}
adds r2, r0, #0
lsls r1, r1, #3
@@ -793,7 +813,9 @@ _08088194:
b _08088262
_0808819E:
ldrh r0, [r1, #4]
.ifndef JP
bl CheckKinstoneFused
.endif
b _08088262
_080881A6:
ldrh r0, [r1, #4]
@@ -886,6 +908,7 @@ _08088266:
_08088268:
adds r0, r4, #0
pop {r4, pc}
.endif
thumb_func_start sub_0808826C
sub_0808826C: @ 0x0808826C
@@ -1366,6 +1389,9 @@ _08088618: .4byte gSave
thumb_func_start sub_0808861C
sub_0808861C: @ 0x0808861C
.ifdef JP
.incbin "baserom_jp.gba", 0x088420, 0x34 @TODO disassemble
.else
push {r4, lr}
adds r4, r1, #0
movs r0, #0xa8
@@ -1395,7 +1421,9 @@ _08088642:
.align 2, 0
_08088650: .4byte gPlayerEntity
_08088654: .4byte gActiveScriptInfo
.endif
.ifndef JP
thumb_func_start sub_08088658
sub_08088658: @ 0x08088658
push {r4, lr}
@@ -1423,3 +1451,4 @@ _08088678:
.align 2, 0
_08088684: .4byte gPlayerEntity
_08088688: .4byte gActiveScriptInfo
.endif
asm/fileScreen.s
+6 -1
View File
@@ -255,6 +255,9 @@ _08051B5A:
bl sub_08078A90
ldr r0, _08051BC8 @ =gUnk_02034490
strb r4, [r0]
.ifdef JP
bl sub_08053178
.endif
adds r0, r5, #0
adds r0, #0x28
ldrb r0, [r0]
@@ -262,8 +265,10 @@ _08051B5A:
beq _08051B96
bl sub_0801855C
_08051B96:
.ifndef JP
bl sub_08052BF8
bl sub_08053178
.endif
ldr r0, _08051BCC @ =gRoomVars
ldrb r0, [r0]
cmp r0, #0
@@ -424,7 +429,7 @@ _08051D28: .4byte gScreenTransition
thumb_func_start sub_08051D2C
sub_08051D2C: @ 0x08051D2C
.ifdef DEMO
.incbin "baserom_demo.gba", 0x051df4, 0x14 @nocheckin
.incbin "baserom_demo.gba", 0x051df4, 0x14 @TODO disassemble
.else
push {lr}
movs r0, #7
asm/manager37.s
+4
View File
@@ -34,6 +34,9 @@ _0805DE64: .4byte gUnk_08108DC4
thumb_func_start sub_0805DE68
sub_0805DE68: @ 0x0805DE68
.ifdef JP
.incbin "baserom_jp.gba", 0x05dcbc, 0x3c @TODO disassemble
.else
push {r4, lr}
adds r4, r0, #0
movs r0, #0x7b
@@ -70,6 +73,7 @@ _0805DE7A:
_0805DEAC: .4byte gScreenTransition
_0805DEB0: .4byte gSave
_0805DEB4: .4byte 0x00001194
.endif
thumb_func_start sub_0805DEB8
sub_0805DEB8: @ 0x0805DEB8
asm/managerF.s
+3
View File
@@ -851,8 +851,10 @@ _08059540:
.align 2, 0
_08059544: .4byte gArea
thumb_func_start sub_08059548
sub_08059548: @ 0x08059548
.ifndef JP
push {lr}
movs r1, #6
bl sub_0805E3A0
@@ -871,3 +873,4 @@ _0805955C:
.align 2, 0
_08059568: .4byte gPlayerEntity
_0805956C: .4byte gInput
.endif
asm/non_matching/sittingPerson/sub_0806387C.inc
+16
View File
@@ -2,16 +2,28 @@
push {r4, r5, r6, lr}
adds r6, r0, #0
movs r4, #3
.ifdef JP
movs r0, #0xd7
.else
movs r0, #0xda
.endif
bl CheckLocalFlag
cmp r0, #0
bne _08063896
movs r4, #0
.ifdef JP
movs r0, #0xd7
.else
movs r0, #0xda
.endif
bl SetLocalFlag
b _080638D6
_08063896:
.ifdef JP
movs r0, #0xce
.else
movs r0, #0xd1
.endif
bl CheckLocalFlag
cmp r0, #0
bne _080638D6
@@ -32,7 +44,11 @@ _080638B2:
cmp r5, #0x81
ble _080638D6
movs r4, #2
.ifdef JP
movs r0, #0xce
.else
movs r0, #0xd1
.endif
bl SetLocalFlag
ldr r0, _080638FC @ =0x00000A17
movs r1, #1
asm/non_matching/sittingPerson/sub_0806390C.inc
+8
View File
@@ -2,12 +2,20 @@
push {r4, r5, lr}
adds r4, r0, #0
movs r5, #1
.ifdef JP
movs r0, #0xd6
.else
movs r0, #0xd9
.endif
bl CheckLocalFlag
cmp r0, #0
bne _0806392E
movs r5, #0
.ifdef JP
movs r0, #0xd6
.else
movs r0, #0xd9
.endif
bl SetLocalFlag
adds r0, r4, #0
adds r0, #0x84
asm/non_matching/sub_0804C128.inc
+4
View File
@@ -116,7 +116,11 @@ _0804C206:
bne _0804C250
movs r0, #1
bl sub_080AF250
.ifdef JP
movs r0, #0x5a
.else
movs r0, #0x5c
.endif
bl CheckLocalFlag
cmp r0, #0
bne _0804C228
asm/non_matching/sub_0804DE00.inc
+4
View File
@@ -67,7 +67,11 @@ _0804DE5C:
strh r0, [r1, #0x10]
bl sub_08052EA0
bl sub_0804AF90
.ifdef JP
movs r0, #0xca
.else
movs r0, #0xcd
.endif
bl CheckLocalFlag
cmp r0, #0
bne _0804DEC4
asm/non_matching/sub_0804E150.inc
+4
View File
@@ -24,7 +24,11 @@ _0804E17C:
ldrh r0, [r4, #2]
cmp r0, #0
bne _0804E168
.ifdef JP
movs r0, #0xce
.else
movs r0, #0xd1
.endif
bl CheckLocalFlag
cmp r0, #0
bne _0804E1BA
asm/octorokBoss.s
+4
View File
@@ -176,6 +176,9 @@ _080352FA:
thumb_func_start sub_080352FC
sub_080352FC: @ 0x080352FC
.ifdef JP
.incbin "baserom_jp.gba", 0x0352a0, 0x1fc @TODO disassemble
.else
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
@@ -421,6 +424,7 @@ _080354E8:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080354F4: .4byte 0x00000109
.endif
thumb_func_start sub_080354F8
sub_080354F8: @ 0x080354F8
asm/playerItem/playerItem15.s
+4 -5
View File
@@ -206,20 +206,19 @@ _080A3200:
// DEMO only functions
.ifdef DEMO
// @nocheckin
thumb_func_start HandleChooseDemoScreen
HandleChooseDemoScreen: @ 0x080A2E18
.incbin "baserom_demo.gba", 0x0a2e18, 0x28
.incbin "baserom_demo.gba", 0x0a2e18, 0x28 @TODO disassemble
thumb_func_start sub_080A2E40
sub_080A2E40: @ 0x080A2E40
.incbin "baserom_demo.gba", 0x0a2e40, 0x14c
.incbin "baserom_demo.gba", 0x0a2e40, 0x14c @TODO disassemble
thumb_func_start sub_080A2F8C
sub_080A2F8C: @ 0x080A2F8C
.incbin "baserom_demo.gba", 0x0A2F8C, 0x44
.incbin "baserom_demo.gba", 0x0A2F8C, 0x44 @TODO disassemble
thumb_func_start sub_080A2FD0
sub_080A2FD0: @ 0x080A2FD0
.incbin "baserom_demo.gba", 0x0A2FD0, 0x210
.incbin "baserom_demo.gba", 0x0A2FD0, 0x210 @TODO disassemble
.endif
asm/playerItem/playerItemSwordSpin.s
+4
View File
@@ -166,7 +166,11 @@ sub_0801BB2C: @ 0x0801BB2C
ldrb r0, [r5, #0xb]
adds r1, r4, #0
movs r2, #5
.ifdef JP
bl CreateItemEntity
.else
bl sub_080A7C18
.endif
ldr r0, _0801BB8C @ =0x00000109
bl SoundReq
_0801BB64:
asm/vaatiArm.s
+8
View File
@@ -1004,7 +1004,11 @@ _08042C92:
_08042C9E:
ldrh r0, [r3, #0x20]
adds r0, r1, r0
.ifdef JP
subs r0, #0x20
.else
subs r0, #0x40
.endif
cmp r0, r5
bge _08042CAA
adds r5, r0, #0
@@ -3156,6 +3160,9 @@ _08043C8C:
thumb_func_start sub_08043C98
sub_08043C98: @ 0x08043C98
.ifdef JP
.incbin "baserom_jp.gba", 0x043BB0, 0x20 @TODO disassemble
.else
push {lr}
adds r3, r0, #0
ldr r0, [r3, #0x64]
@@ -3187,6 +3194,7 @@ _08043CD0:
movs r0, #0
_08043CD2:
pop {pc}
.endif
thumb_func_start sub_08043CD4
sub_08043CD4: @ 0x08043CD4
asm/vaatiWrath.s
+6
View File
@@ -64,6 +64,9 @@ _0804139C: .4byte gUnk_080D0E1C
thumb_func_start sub_080413A0
sub_080413A0: @ 0x080413A0
.ifdef JP
.incbin "baserom_jp.gba", 0x041344, 0x18 @TODO disassemble
.else
push {r4, lr}
adds r4, r0, #0
bl sub_080423A4
@@ -77,6 +80,7 @@ sub_080413A0: @ 0x080413A0
pop {r4, pc}
.align 2, 0
_080413BC: .4byte gUnk_080D0E2C
.endif
thumb_func_start sub_080413C0
sub_080413C0: @ 0x080413C0
@@ -2130,6 +2134,7 @@ sub_0804235C: @ 0x0804235C
bl InitializeAnimation
pop {r4, r5, pc}
.ifndef JP
thumb_func_start sub_080423A4
sub_080423A4: @ 0x080423A4
push {r4, lr}
@@ -2196,6 +2201,7 @@ _0804241C:
.align 2, 0
_08042420: .4byte gPlayerState
_08042424: .4byte gPlayerEntity
.endif
thumb_func_start sub_08042428
sub_08042428: @ 0x08042428
asm/windTribeTeleporter.s
+4
View File
@@ -115,6 +115,9 @@ _080A0FFE:
thumb_func_start sub_080A1000
sub_080A1000: @ 0x080A1000
.ifdef JP
.incbin "baserom_jp.gba", 0x0a0dc8, 0xd0
.else
push {r4, lr}
adds r4, r0, #0
ldrb r1, [r4, #0xd]
@@ -232,6 +235,7 @@ _080A10D4:
.align 2, 0
_080A10D8: .4byte gScreenTransition
_080A10DC: .4byte gPlayerEntity
.endif
thumb_func_start sub_080A10E0
sub_080A10E0: @ 0x080A10E0
data/animations/npc/guard.s
+10
View File
@@ -23,10 +23,20 @@ gUnk_0810F60E:: @ 0810F60E
.incbin "baserom.gba", 0x10F60E, 0x0000005
gUnk_0810F613:: @ 0810F613
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10F2D7, 0x0000007
.else
.incbin "baserom.gba", 0x10F613, 0x0000007
.endif
gUnk_0810F61A:: @ 0810F61A
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10F2DE, 0x000002E
.else
.incbin "baserom.gba", 0x10F61A, 0x000002E
.endif
gUnk_0810F648:: @ 0810F648
.incbin "baserom.gba", 0x10F648, 0x000003A
data/const/enemy/gyorgFemale.s
+21
View File
@@ -20,16 +20,37 @@ gUnk_080D1A84:: @ 080D1A84
.incbin "baserom.gba", 0x0D1A84, 0x0000010
gUnk_080D1A94:: @ 080D1A94
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0D1834, 0x0000018
.else
.incbin "baserom.gba", 0x0D1A94, 0x0000018
.endif
gUnk_080D1AAC:: @ 080D1AAC
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0D184C, 0x0000018
.else
.incbin "baserom.gba", 0x0D1AAC, 0x0000018
.endif
gUnk_080D1AC4:: @ 080D1AC4
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0D1864, 0x0000018
.else
.incbin "baserom.gba", 0x0D1AC4, 0x0000018
.endif
gUnk_080D1ADC:: @ 080D1ADC
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0D187C, 0x0000018
.else
.incbin "baserom.gba", 0x0D1ADC, 0x0000018
.endif
gUnk_080D1AF4:: @ 080D1AF4
.incbin "baserom.gba", 0x0D1AF4, 0x0000004
data/const/manager/managerF.s
+2
View File
@@ -20,7 +20,9 @@ gUnk_08108314:: @ 08108314
.4byte sub_08059424
.4byte sub_0805947C
.4byte sub_080594DC
.ifndef JP
.4byte sub_08059548
.endif
gUnk_08108354:: @ 08108354
.incbin "baserom.gba", 0x108354, 0x000002C
data/const/npc/forestMinish.s
+11
View File
@@ -66,10 +66,21 @@ gUnk_08109F67:: @ 08109F67
.incbin "baserom.gba", 0x109F67, 0x0000005
gUnk_08109F6C:: @ 08109F6C
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x109C30, 0x000002B
.else
.incbin "baserom.gba", 0x109F6C, 0x000002B
.endif
gUnk_08109F97:: @ 08109F97
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x109C5B, 0x00000B1
.else
.incbin "baserom.gba", 0x109F97, 0x00000B1
.endif
gUnk_0810A048:: @ 0810A048
.incbin "baserom.gba", 0x10A048, 0x0000024
data/const/npc/kid.s
+5
View File
@@ -51,7 +51,12 @@ gUnk_0810C007:: @ 0810C007
.incbin "baserom.gba", 0x10C007, 0x0000008
gUnk_0810C00F:: @ 0810C00F
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10BCD3, 0x0000091
.else
.incbin "baserom.gba", 0x10C00F, 0x0000091
.endif
gUnk_0810C0A0:: @ 0810C0A0
.incbin "baserom.gba", 0x10C0A0, 0x0000024
data/const/npc/townsperson.s
+20
View File
@@ -83,16 +83,31 @@ gUnk_0810B8EB:: @ 0810B8EB
.incbin "baserom.gba", 0x10B8EB, 0x0000037
gUnk_0810B922:: @ 0810B922
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10B5E6, 0x0000049
.else
.incbin "baserom.gba", 0x10B922, 0x0000049
.endif
gUnk_0810B96B:: @ 0810B96B
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10B62F, 0x0000065
.else
.incbin "baserom.gba", 0x10B96B, 0x0000065
.endif
gUnk_0810B9D0:: @ 0810B9D0
.incbin "baserom.gba", 0x10B9D0, 0x0000031
gUnk_0810BA01:: @ 0810BA01
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10B6C5, 0x0000117
.else
.incbin "baserom.gba", 0x10BA01, 0x0000117
.endif
gUnk_0810BB18:: @ 0810BB18
.incbin "baserom.gba", 0x10BB18, 0x0000044
@@ -103,7 +118,12 @@ gUnk_0810BB71:: @ 0810BB71
.incbin "baserom.gba", 0x10BB71, 0x000005B
gUnk_0810BBCC:: @ 0810BBCC
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10B890, 0x000009C
.else
.incbin "baserom.gba", 0x10BBCC, 0x000009C
.endif
gUnk_0810BC68:: @ 0810BC68
.incbin "baserom.gba", 0x10BC68, 0x0000098
data/const/npc/windTribespeople.s
+10
View File
@@ -46,10 +46,20 @@ gUnk_08113B22:: @ 08113B22
.incbin "baserom.gba", 0x113B22, 0x0000006
gUnk_08113B28:: @ 08113B28
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1137EC, 0x0000008
.else
.incbin "baserom.gba", 0x113B28, 0x0000008
.endif
gUnk_08113B30:: @ 08113B30
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1137F4, 0x0000008
.else
.incbin "baserom.gba", 0x113B30, 0x0000008
.endif
gUnk_08113B38:: @ 08113B38
.incbin "baserom.gba", 0x113B38, 0x0000007
data/const/object/object96.s
+4
View File
@@ -20,7 +20,11 @@ gUnk_08123FB0:: @ 08123FB0
.4byte 00000000
.4byte 0x00001800
.4byte 0x00180000
.ifdef JP
.4byte 0x000000CD
.else
.4byte 0x000000d0
.endif
.4byte sub_0809D91C
.4byte 00000000
.4byte 00000000
data/const/object/pinwheel.s
+4
View File
@@ -5,7 +5,11 @@
.align 2
gUnk_08125050:: @ 08125050
.ifdef JP
.incbin "baserom_jp.gba", 0x124D14, 0x000000C
.else
.incbin "baserom.gba", 0x125050, 0x000000C
.endif
gUnk_0812505C:: @ 0812505C
.4byte sub_080A23DC
data/const/playerItem/playerItem15.s
+1 -1
View File
@@ -19,7 +19,7 @@ something:
.4byte sub_080A2F8C
something2::
.incbin "baserom_demo.gba", 0x127c98, 0x38 @nocheckin
.incbin "baserom_demo.gba", 0x127c98, 0x38
.endif
data/data_080B3740.s
+5
View File
@@ -42,4 +42,9 @@ gUnk_080B3D14:: @ 080B3D14
.incbin "baserom.gba", 0x0B3D14, 0x000000C
gUnk_080B3D20:: @ 080B3D20
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0B3AC0, 0x00000B0
.else
.incbin "baserom.gba", 0x0B3D20, 0x00000B0
.endif
data/data_080B4410.s
+5
View File
@@ -5,7 +5,12 @@
.align 2
gUnk_080B4410:: @ 080B4410
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0B41B0, 0x0000048
.else
.incbin "baserom.gba", 0x0B4410, 0x0000048
.endif
gUnk_080B4458:: @ 080B4458
.4byte sub_08019698
data/data_080B7B74.s
+5
View File
@@ -593,7 +593,12 @@ gUnk_080C2F35:: @ 080C2F35
.incbin "baserom.gba", 0x0C2F35, 0x000010A
gUnk_080C303F:: @ 080C303F
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0C2DDF, 0x00032A4
.else
.incbin "baserom.gba", 0x0C303F, 0x00032A4
.endif
gUnk_080C62E3:: @ 080C62E3
.incbin "baserom.gba", 0x0C62E3, 0x000207D
data/data_080C93E0.s
+45
View File
@@ -77,19 +77,39 @@ gUnk_080C9864:: @ 080C9864
.4byte gUnk_080C9854
gUnk_080C9870:: @ 080C9870
.ifdef JP
.incbin "baserom_jp.gba", 0x0C9610, 0x0000078
.else
.incbin "baserom.gba", 0x0C9870, 0x0000078
.endif
gUnk_080C98E8:: @ 080C98E8
.ifdef JP
.incbin "baserom_jp.gba", 0x0C9688, 0x0000040
.else
.incbin "baserom.gba", 0x0C98E8, 0x0000040
.endif
gUnk_080C9928:: @ 080C9928
.ifdef JP
.incbin "baserom_jp.gba", 0x0C96C8, 0x0000060
.else
.incbin "baserom.gba", 0x0C9928, 0x0000060
.endif
gUnk_080C9988:: @ 080C9988
.ifdef JP
.incbin "baserom_jp.gba", 0x0C9728, 0x0000060
.else
.incbin "baserom.gba", 0x0C9988, 0x0000060
.endif
gUnk_080C99E8:: @ 080C99E8
.ifdef JP
.incbin "baserom_jp.gba", 0x0C9788, 0x0000048
.else
.incbin "baserom.gba", 0x0C99E8, 0x0000048
.endif
gUnk_080C9A30:: @ 080C9A30
.4byte gUnk_080C9870
@@ -99,19 +119,39 @@ gUnk_080C9A30:: @ 080C9A30
.4byte gUnk_080C99E8
gUnk_080C9A44:: @ 080C9A44
.ifdef JP
.incbin "baserom_jp.gba", 0x0C97E4, 0x0000038
.else
.incbin "baserom.gba", 0x0C9A44, 0x0000038
.endif
gUnk_080C9A7C:: @ 080C9A7C
.ifdef JP
.incbin "baserom_jp.gba", 0x0C981C, 0x00000B0
.else
.incbin "baserom.gba", 0x0C9A7C, 0x00000B0
.endif
gUnk_080C9B2C:: @ 080C9B2C
.ifdef JP
.incbin "baserom_jp.gba", 0x0C98CC, 0x0000088
.else
.incbin "baserom.gba", 0x0C9B2C, 0x0000088
.endif
gUnk_080C9BB4:: @ 080C9BB4
.ifdef JP
.incbin "baserom_jp.gba", 0x0C9954, 0x0000068
.else
.incbin "baserom.gba", 0x0C9BB4, 0x0000068
.endif
gUnk_080C9C1C:: @ 080C9C1C
.ifdef JP
.incbin "baserom_jp.gba", 0x0C99BC, 0x0000020
.else
.incbin "baserom.gba", 0x0C9C1C, 0x0000020
.endif
gUnk_080C9C3C:: @ 080C9C3C
.4byte gUnk_080C9A44
@@ -139,7 +179,12 @@ gUnk_080C9CAC:: @ 080C9CAC
.4byte sub_0801E0A0
gUnk_080C9CBC:: @ 080C9CBC
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0C9A5C, 0x00003B0
.else
.incbin "baserom.gba", 0x0C9CBC, 0x00003B0
.endif
gUnk_080CA06C:: @ 080CA06C
.incbin "baserom.gba", 0x0CA06C, 0x00000B0
data/data_080D5360.s
+353 -1
View File
@@ -1888,11 +1888,21 @@ Area_EzloCutscene_Main:: @ 080D8F98
.4byte nullsub_195
gUnk_080D8FB8:: @ 080D8FB8
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0D8D58, 0x000005C
.else
.incbin "baserom.gba", 0x0D8FB8, 0x000005C
.endif
.4byte script_08009698
.incbin "baserom.gba", 0x0D9018, 0x000000C
.4byte script_08009740
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0D8DC8, 0x0000020
.else
.incbin "baserom.gba", 0x0D9028, 0x0000020
.endif
gUnk_080D9048:: @ 080D9048
.incbin "baserom.gba", 0x0D9048, 0x0000050
@@ -1917,13 +1927,23 @@ gUnk_080D9108:: @ 080D9108
.incbin "baserom.gba", 0x0D9108, 0x0000020
gUnk_080D9128:: @ 080D9128
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0D8EC8, 0x00000C0
.else
.incbin "baserom.gba", 0x0D9128, 0x00000C0
.endif
gUnk_080D91E8:: @ 080D91E8
.incbin "baserom.gba", 0x0D91E8, 0x0000090
gUnk_080D9278:: @ 080D9278
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0D9018, 0x0000018
.else
.incbin "baserom.gba", 0x0D9278, 0x0000018
.endif
Room_RoyalValley_Main:: @ 080D9290
.4byte gUnk_080D8FB8
@@ -1945,7 +1965,12 @@ gUnk_080D92E0:: @ 080D92E0
.incbin "baserom.gba", 0x0D92E0, 0x0000048
gUnk_080D9328:: @ 080D9328
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0D90C8, 0x0000010
.else
.incbin "baserom.gba", 0x0D9328, 0x0000010
.endif
gUnk_080D9338:: @ 080D9338
.incbin "baserom.gba", 0x0D9338, 0x0000008
@@ -2118,7 +2143,12 @@ Room_MinishRafters_Bakery:: @ 080D9AB8
.4byte sub_0804C324
gUnk_080D9AD8:: @ 080D9AD8
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0D9878, 0x000004C
.else
.incbin "baserom.gba", 0x0D9AD8, 0x000004C
.endif
.4byte script_0800B200
.incbin "baserom.gba", 0x0D9B28, 0x000000C
.4byte script_0800B308
@@ -2128,13 +2158,22 @@ gUnk_080D9AD8:: @ 080D9AD8
.4byte script_0800B284
.incbin "baserom.gba", 0x0D9B58, 0x000000C
.4byte script_0800B2B4
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0D9908, 0x00000D0
.else
.incbin "baserom.gba", 0x0D9B68, 0x00000D0
.endif
gUnk_080D9C38:: @ 080D9C38
.incbin "baserom.gba", 0x0D9C38, 0x0000070
gUnk_080D9CA8:: @ 080D9CA8
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0D9A48, 0x0000020
.else
.incbin "baserom.gba", 0x0D9CA8, 0x0000020
.endif
gUnk_080D9CC8:: @ 080D9CC8
.incbin "baserom.gba", 0x0D9CC8, 0x0000020
@@ -2154,7 +2193,12 @@ gUnk_080D9E28:: @ 080D9E28
.incbin "baserom.gba", 0x0D9E28, 0x0000030
gUnk_080D9E58:: @ 080D9E58
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0D9BF8, 0x0000010
.else
.incbin "baserom.gba", 0x0D9E58, 0x0000010
.endif
gUnk_080D9E68:: @ 080D9E68
.incbin "baserom.gba", 0x0D9E68, 0x0000040
@@ -2454,7 +2498,11 @@ Room_GardenFountains_East:: @ 080DA514
.4byte nullsub_208
gUnk_080DA534:: @ 080DA534
.ifdef JP
.incbin "baserom_jp.gba", 0x0DA2D4, 0x40
.else
.incbin "baserom.gba", 0x0DA534, 0x0000050
.endif
gUnk_080DA584:: @ 080DA584
.incbin "baserom.gba", 0x0DA584, 0x0000010
@@ -4077,7 +4125,12 @@ Room_MelarisMine_Main:: @ 080DD31C
.4byte gUnk_080DD274
gUnk_080DD344:: @ 080DD344
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0DD0D4, 0x0000020
.else
.incbin "baserom.gba", 0x0DD344, 0x0000020
.endif
gUnk_080DD364:: @ 080DD364
.incbin "baserom.gba", 0x0DD364, 0x000000C
@@ -4104,7 +4157,12 @@ Room_CloudTops_House:: @ 080DD3EC
.4byte sub_0804CA54
gUnk_080DD40C:: @ 080DD40C
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0DD19C, 0x0000090
.else
.incbin "baserom.gba", 0x0DD40C, 0x0000090
.endif
gUnk_080DD49C:: @ 080DD49C
.incbin "baserom.gba", 0x0DD49C, 0x0000130
@@ -4116,7 +4174,12 @@ gUnk_080DD6BC:: @ 080DD6BC
.incbin "baserom.gba", 0x0DD6BC, 0x0000010
gUnk_080DD6CC:: @ 080DD6CC
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0DD45C, 0x0000040
.else
.incbin "baserom.gba", 0x0DD6CC, 0x0000040
.endif
Room_CloudTops_Middle:: @ 080DD70C
.4byte gUnk_080DD40C
@@ -4142,16 +4205,31 @@ gUnk_080DD750:: @ 080DD750
.incbin "baserom.gba", 0x0DD780, 0x0000010
gUnk_080DD790:: @ 080DD790
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0DD520, 0x0000050
.else
.incbin "baserom.gba", 0x0DD790, 0x0000050
.endif
gUnk_080DD7E0:: @ 080DD7E0
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0DD570, 0x0000040
.else
.incbin "baserom.gba", 0x0DD7E0, 0x0000040
.endif
gUnk_080DD820:: @ 080DD820
.incbin "baserom.gba", 0x0DD820, 0x0000020
gUnk_080DD840:: @ 080DD840
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0DD5D0, 0x0000040
.else
.incbin "baserom.gba", 0x0DD840, 0x0000040
.endif
gUnk_080DD880:: @ 080DD880
.incbin "baserom.gba", 0x0DD880, 0x0000020
@@ -4230,7 +4308,12 @@ Room_CloudTops_Bottom:: @ 080DDBC8
.4byte gUnk_080DD880
gUnk_080DDC00:: @ 080DDC00
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0DD990, 0x0000020
.else
.incbin "baserom.gba", 0x0DDC00, 0x0000020
.endif
gUnk_080DDC20:: @ 080DDC20
.incbin "baserom.gba", 0x0DDC20, 0x0000030
@@ -4239,7 +4322,12 @@ gUnk_080DDC50:: @ 080DDC50
.incbin "baserom.gba", 0x0DDC50, 0x0000080
gUnk_080DDCD0:: @ 080DDCD0
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0DDA60, 0x0000010
.else
.incbin "baserom.gba", 0x0DDCD0, 0x0000010
.endif
gUnk_080DDCE0:: @ 080DDCE0
.incbin "baserom.gba", 0x0DDCE0, 0x0000010
@@ -4275,7 +4363,12 @@ gUnk_080DDD74:: @ 080DDD74
.incbin "baserom.gba", 0x0DDD74, 0x0000010
gUnk_080DDD84:: @ 080DDD84
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0DDB14, 0x0000030
.else
.incbin "baserom.gba", 0x0DDD84, 0x0000030
.endif
gUnk_080DDDB4:: @ 080DDDB4
.incbin "baserom.gba", 0x0DDDB4, 0x0000040
@@ -4302,7 +4395,12 @@ Room_Ruins_Beanstalk:: @ 080DDE20
.4byte gUnk_080DDE0C
gUnk_080DDE48:: @ 080DDE48
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0DDBD8, 0x0000040
.else
.incbin "baserom.gba", 0x0DDE48, 0x0000040
.endif
gUnk_080DDE88:: @ 080DDE88
.incbin "baserom.gba", 0x0DDE88, 0x0000020
@@ -4361,7 +4459,12 @@ Room_Ruins_LadderToTektites:: @ 080DDFC8
.4byte nullsub_38
gUnk_080DDFE8:: @ 080DDFE8
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0DDD78, 0x0000018
.else
.incbin "baserom.gba", 0x0DDFE8, 0x0000018
.endif
gUnk_080DE000:: @ 080DE000
.incbin "baserom.gba", 0x0DE000, 0x0000008
@@ -4378,7 +4481,12 @@ gUnk_080DE048:: @ 080DE048
.incbin "baserom.gba", 0x0DE048, 0x00000A0
gUnk_080DE0E8:: @ 080DE0E8
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0DDE78, 0x0000030
.else
.incbin "baserom.gba", 0x0DE0E8, 0x0000030
.endif
gUnk_080DE118:: @ 080DE118
.incbin "baserom.gba", 0x0DE118, 0x0000014
@@ -4395,7 +4503,12 @@ Room_Ruins_FortressEntrance:: @ 080DE12C
.4byte gUnk_080DE118
gUnk_080DE150:: @ 080DE150
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0DDEE0, 0x0000090
.else
.incbin "baserom.gba", 0x0DE150, 0x0000090
.endif
gUnk_080DE1E0:: @ 080DE1E0
.incbin "baserom.gba", 0x0DE1E0, 0x0000020
@@ -4416,7 +4529,12 @@ gUnk_080DE2B0:: @ 080DE2B0
.incbin "baserom.gba", 0x0DE2B0, 0x0000070
gUnk_080DE320:: @ 080DE320
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0DE0B0, 0x0000018
.else
.incbin "baserom.gba", 0x0DE320, 0x0000018
.endif
gUnk_080DE338:: @ 080DE338
.incbin "baserom.gba", 0x0DE338, 0x0000014
@@ -4771,7 +4889,11 @@ Room_DeepwoodShrine_BossKey:: @ 080DF46C
.4byte nullsub_253
gUnk_080DF48C:: @ 080DF48C
.ifdef JP
.incbin "baserom_jp.gba", 0x0DF21C, 0x00000E0
.else
.incbin "baserom.gba", 0x0DF48C, 0x00000F0
.endif
gUnk_080DF57C:: @ 080DF57C
.incbin "baserom.gba", 0x0DF57C, 0x0000020
@@ -4834,7 +4956,11 @@ gUnk_080DF72C:: @ 080DF72C
.incbin "baserom.gba", 0x0DF72C, 0x00000D2
gUnk_080DF7FE:: @ 080DF7FE
.ifdef JP
.incbin "baserom_jp.gba", 0x0DF57E, 0x000002E
.else
.incbin "baserom.gba", 0x0DF7FE, 0x000003E
.endif
gUnk_080DF83C:: @ 080DF83C
.incbin "baserom.gba", 0x0DF83C, 0x0000020
@@ -6271,7 +6397,11 @@ Room_FortressOfWinds_Stalfos:: @ 080E2D60
.4byte gUnk_080E2D00
gUnk_080E2D84:: @ 080E2D84
.ifdef JP
.incbin "baserom_jp.gba", 0x0E2AF4, 0x0000090
.else
.incbin "baserom.gba", 0x0E2D84, 0x00000B0
.endif
gUnk_080E2E34:: @ 080E2E34
.incbin "baserom.gba", 0x0E2E34, 0x0000010
@@ -8905,7 +9035,11 @@ Room_DarkHyruleCastleBridge_Main:: @ 080EAC40
.4byte sub_0804D758
gUnk_080EAC60:: @ 080EAC60
.ifdef JP
.incbin "baserom_jp.gba", 0x0EA9B0, 0x0000020
.else
.incbin "baserom.gba", 0x0EAC60, 0x0000030
.endif
gUnk_080EAC90:: @ 080EAC90
.incbin "baserom.gba", 0x0EAC90, 0x0000010
@@ -8924,7 +9058,11 @@ Room_VaatisArms_First:: @ 080EACA8
.4byte nullsub_74
gUnk_080EACC8:: @ 080EACC8
.ifdef JP
.incbin "baserom_jp.gba", 0x0EAA08, 0x0000020
.else
.incbin "baserom.gba", 0x0EACC8, 0x0000030
.endif
gUnk_080EACF8:: @ 080EACF8
.incbin "baserom.gba", 0x0EACF8, 0x0000010
@@ -10483,7 +10621,12 @@ gUnk_080EE7EC:: @ 080EE7EC
.4byte nullsub_374
gUnk_080EE80C:: @ 080EE80C
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0EE53C, 0x000006C
.else
.incbin "baserom.gba", 0x0EE80C, 0x000006C
.endif
.4byte script_08010AE4
.incbin "baserom.gba", 0x0EE87C, 0x0000010
@@ -10563,7 +10706,12 @@ gUnk_080EEABC:: @ 080EEABC
.incbin "baserom.gba", 0x0EEABC, 0x0000020
gUnk_080EEADC:: @ 080EEADC
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0EE80C, 0x0000090
.else
.incbin "baserom.gba", 0x0EEADC, 0x0000090
.endif
gUnk_080EEB6C:: @ 080EEB6C
.incbin "baserom.gba", 0x0EEB6C, 0x0000020
@@ -10588,13 +10736,22 @@ gUnk_080EEBCC:: @ 080EEBCC
.incbin "baserom.gba", 0x0EEC3C, 0x0000010
gUnk_080EEC4C:: @ 080EEC4C
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0EE97C, 0x0000070
.else
.incbin "baserom.gba", 0x0EEC4C, 0x0000070
.endif
gUnk_080EECBC:: @ 080EECBC
.incbin "baserom.gba", 0x0EECBC, 0x0000020
gUnk_080EECDC:: @ 080EECDC
.ifdef JP
.incbin "baserom_jp.gba", 0x0EEA0C, 0x0000048
.else
.incbin "baserom.gba", 0x0EECDC, 0x0000050
.endif
gUnk_080EED2C:: @ 080EED2C
.incbin "baserom.gba", 0x0EED2C, 0x000004E
@@ -11502,7 +11659,12 @@ Room_HyruleTownUnderground_Well:: @ 080F0610
.4byte nullsub_088
gUnk_080F0630:: @ 080F0630
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F0358, 0x0000020
.else
.incbin "baserom.gba", 0x0F0630, 0x0000020
.endif
gUnk_080F0650:: @ 080F0650
.incbin "baserom.gba", 0x0F0650, 0x000000C
@@ -11610,10 +11772,20 @@ gUnk_080F0920:: @ 080F0920
.incbin "baserom.gba", 0x0F0930, 0x0000010
gUnk_080F0940:: @ 080F0940
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F0668, 0x0000060
.else
.incbin "baserom.gba", 0x0F0940, 0x0000060
.endif
gUnk_080F09A0:: @ 080F09A0
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F06C8, 0x0000060
.else
.incbin "baserom.gba", 0x0F09A0, 0x0000060
.endif
gUnk_080F0A00:: @ 080F0A00
.incbin "baserom.gba", 0x0F0A00, 0x0000002
@@ -11628,7 +11800,12 @@ gUnk_080F0A10:: @ 080F0A10
.incbin "baserom.gba", 0x0F0A10, 0x0000001
gUnk_080F0A11:: @ 080F0A11
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F0739, 0x000001F
.else
.incbin "baserom.gba", 0x0F0A11, 0x000001F
.endif
gUnk_080F0A30:: @ 080F0A30
.incbin "baserom.gba", 0x0F0A30, 0x0000020
@@ -12621,7 +12798,11 @@ Room_HouseInteriors2_B:: @ 080F2B78
.4byte gUnk_080F2B58
gUnk_080F2B9C:: @ 080F2B9C
.ifdef JP
.incbin "baserom_jp.gba", 0x0F28C4, 0x00000BC
.else
.incbin "baserom.gba", 0x0F2B9C, 0x00000CC
.endif
.4byte script_08010120
.incbin "baserom.gba", 0x0F2C6C, 0x0000010
@@ -13096,7 +13277,12 @@ gUnk_080F40AC:: @ 080F40AC
.incbin "baserom.gba", 0x0F40AC, 0x0000010
gUnk_080F40BC:: @ 080F40BC
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F3DD4, 0x0000030
.else
.incbin "baserom.gba", 0x0F40BC, 0x0000030
.endif
gUnk_080F40EC:: @ 080F40EC
.incbin "baserom.gba", 0x0F40EC, 0x00000A0
@@ -13408,8 +13594,13 @@ Room_OuterFortressOfWinds_SmallKey:: @ 080F4CDC
gEntities_MinishWoods_0:: @ 080F4D00
object_minish_lilypad x=0x1F8, y=0x3D8, room_property=0x12
object_minish_lilypad x=0x1A8, y=0x3B8, room_property=0x13
.ifdef JP
object_item x=0xC8, y=0x134, item=0x63, flag=0x3B, collision=1
object_item x=0x198, y=0x2B4, item=0x63, flag=0x3C, collision=1
.else
object_item x=0xC8, y=0x134, item=0x63, flag=0x3C, collision=1
object_item x=0x198, y=0x2B4, item=0x63, flag=0x3D, collision=1
.endif
entity_list_end
gUnk_080F4D50:: @ 080F4D50
@@ -13535,13 +13726,25 @@ gUnk_080F51F0:: @ 080F51F0
.incbin "baserom.gba", 0x0F51F0, 0x0000030
gRoomTiles_MinishWoods_0:: @ 080F5220
.ifdef JP
.byte 0x0A, 0x01, 0x35, 0x00, 0x0A, 0x08, 0x1D, 0x00
.byte 0x0A, 0x01, 0x36, 0x00, 0x0B, 0x08, 0x1D, 0x00
.byte 0x0A, 0x01, 0x37, 0x00, 0x83, 0x0D, 0x1D, 0x00
.byte 0x0A, 0x01, 0x38, 0x00, 0x84, 0x0D, 0x1D, 0x00
.byte 0x0A, 0x01, 0x39, 0x00, 0x85, 0x0D, 0x1D, 0x00
.else
.byte 0x0A, 0x01, 0x36, 0x00, 0x0A, 0x08, 0x1D, 0x00
.byte 0x0A, 0x01, 0x37, 0x00, 0x0B, 0x08, 0x1D, 0x00
.byte 0x0A, 0x01, 0x38, 0x00, 0x83, 0x0D, 0x1D, 0x00
.byte 0x0A, 0x01, 0x39, 0x00, 0x84, 0x0D, 0x1D, 0x00
.byte 0x0A, 0x01, 0x3A, 0x00, 0x85, 0x0D, 0x1D, 0x00
.endif
.byte 0x05, 0x00, 0x00, 0x05, 0x6A, 0x01, 0x05, 0x06
.ifdef JP
.byte 0x05, 0x00, 0x00, 0x17, 0xDB, 0x03, 0x17, 0x06
.else
.byte 0x05, 0x00, 0x00, 0x1F, 0xDB, 0x03, 0x1F, 0x06
.endif
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
Room_MinishWoods_Main:: @ 080F5260
@@ -14451,7 +14654,12 @@ gUnk_080F6F1C:: @ 080F6F1C
.incbin "baserom.gba", 0x0F6F1C, 0x0000010
gUnk_080F6F2C:: @ 080F6F2C
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F6C44, 0x0000050
.else
.incbin "baserom.gba", 0x0F6F2C, 0x0000050
.endif
gUnk_080F6F7C:: @ 080F6F7C
.incbin "baserom.gba", 0x0F6F7C, 0x0000040
@@ -14498,13 +14706,23 @@ gUnk_080F70D8:: @ 080F70D8
.incbin "baserom.gba", 0x0F70E8, 0x0000010
gUnk_080F70F8:: @ 080F70F8
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F6E10, 0x0000060
.else
.incbin "baserom.gba", 0x0F70F8, 0x0000060
.endif
gUnk_080F7158:: @ 080F7158
.incbin "baserom.gba", 0x0F7158, 0x00000C0
gUnk_080F7218:: @ 080F7218
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F6F30, 0x0000088
.else
.incbin "baserom.gba", 0x0F7218, 0x0000088
.endif
gUnk_080F72A0:: @ 080F72A0
.incbin "baserom.gba", 0x0F72A0, 0x0000010
@@ -14534,7 +14752,12 @@ gUnk_080F734C:: @ 080F734C
.incbin "baserom.gba", 0x0F734C, 0x0000040
gUnk_080F738C:: @ 080F738C
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F70A4, 0x0000020
.else
.incbin "baserom.gba", 0x0F738C, 0x0000020
.endif
Room_HyruleField_FromMinishWoods:: @ 080F73AC
.4byte gUnk_080F72EC
@@ -14550,13 +14773,23 @@ gUnk_080F73CC:: @ 080F73CC
.incbin "baserom.gba", 0x0F73CC, 0x0000010
gUnk_080F73DC:: @ 080F73DC
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F70F4, 0x0000040
.else
.incbin "baserom.gba", 0x0F73DC, 0x0000040
.endif
gUnk_080F741C:: @ 080F741C
.incbin "baserom.gba", 0x0F741C, 0x0000070
gUnk_080F748C:: @ 080F748C
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F71A4, 0x0000018
.else
.incbin "baserom.gba", 0x0F748C, 0x0000018
.endif
gUnk_080F74A4:: @ 080F74A4
.incbin "baserom.gba", 0x0F74A4, 0x0000010
@@ -14615,7 +14848,12 @@ gUnk_080F7680:: @ 080F7680
.incbin "baserom.gba", 0x0F7680, 0x0000040
gUnk_080F76C0:: @ 080F76C0
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F73D8, 0x0000038
.else
.incbin "baserom.gba", 0x0F76C0, 0x0000038
.endif
Room_HyruleField_Farmers:: @ 080F76F8
.4byte gUnk_080F74F0
@@ -14630,7 +14868,12 @@ Room_HyruleField_Farmers:: @ 080F76F8
.4byte gUnk_080F7570
gUnk_080F7720:: @ 080F7720
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F7438, 0x0000050
.else
.incbin "baserom.gba", 0x0F7720, 0x0000050
.endif
gUnk_080F7770:: @ 080F7770
.incbin "baserom.gba", 0x0F7770, 0x0000050
@@ -14674,7 +14917,12 @@ gUnk_080F78C0:: @ 080F78C0
.incbin "baserom.gba", 0x0F78CC, 0x0000014
gUnk_080F78E0:: @ 080F78E0
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F75F8, 0x00000F0
.else
.incbin "baserom.gba", 0x0F78E0, 0x00000F0
.endif
gUnk_080F79D0:: @ 080F79D0
.incbin "baserom.gba", 0x0F79D0, 0x0000050
@@ -14688,7 +14936,12 @@ gUnk_080F7A44:: @ 080F7A44
.incbin "baserom.gba", 0x0F7A44, 0x00000B0
gUnk_080F7AF4:: @ 080F7AF4
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F780C, 0x0000048
.else
.incbin "baserom.gba", 0x0F7AF4, 0x0000048
.endif
gUnk_080F7B3C:: @ 080F7B3C
.incbin "baserom.gba", 0x0F7B3C, 0x0000018
@@ -14730,7 +14983,12 @@ EntityData_HyruleField_OutsideCastle:: @ 080F7BF0
.incbin "baserom.gba", 0x0F7BF0, 0x0000010
ManagerData_HyruleField_OutsideCastle:: @ 080F7C00
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F7918, 0x0000080
.else
.incbin "baserom.gba", 0x0F7C00, 0x0000080
.endif
gUnk_080F7C80:: @ 080F7C80
.incbin "baserom.gba", 0x0F7C80, 0x000000C
@@ -14785,7 +15043,12 @@ EnemyData_HyruleField_OutsideCastle:: @ 080F7E20
.incbin "baserom.gba", 0x0F7E20, 0x00000F0
TileData_HyruleField_OutsideCastle:: @ 080F7F10
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F7C28, 0x0000070
.else
.incbin "baserom.gba", 0x0F7F10, 0x0000070
.endif
gUnk_080F7F80:: @ 080F7F80
.incbin "baserom.gba", 0x0F7F80, 0x0000018
@@ -14828,13 +15091,23 @@ gUnk_080F806C:: @ 080F806C
.incbin "baserom.gba", 0x0F807C, 0x0000010
ManagerData_HyruleField_OutsideCastleWest:: @ 080F808C
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F7DA4, 0x0000060
.else
.incbin "baserom.gba", 0x0F808C, 0x0000060
.endif
EnemyData_HyruleField_OutsideCastleWest:: @ 080F80EC
.incbin "baserom.gba", 0x0F80EC, 0x00000B0
TileData_HyruleField_OutsideCastleWest:: @ 080F819C
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F7EB4, 0x0000028
.else
.incbin "baserom.gba", 0x0F819C, 0x0000028
.endif
gUnk_080F81C4:: @ 080F81C4
.incbin "baserom.gba", 0x0F81C4, 0x0000010
@@ -14855,7 +15128,11 @@ Room_HyruleField_OutsideCastleWest:: @ 080F81E8
.4byte gUnk_080F81D4
EntityData_HyruleField_TrilbyHighlands:: @ 080F8210
.ifdef JP
.incbin "baserom_jp.gba", 0x0F7F28, 0x00000B0
.else
.incbin "baserom.gba", 0x0F8210, 0x00000D0
.endif
gUnk_080F82E0:: @ 080F82E0
.incbin "baserom.gba", 0x0F82E0, 0x000000C
@@ -14869,7 +15146,12 @@ EnemyData_HyruleField_TrilbyHighlands:: @ 080F8320
.incbin "baserom.gba", 0x0F8320, 0x00000C0
TileData_HyruleField_TrilbyHighlands:: @ 080F83E0
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F80D8, 0x0000020
.else
.incbin "baserom.gba", 0x0F83E0, 0x0000020
.endif
Room_HyruleField_TrilbyHighlands:: @ 080F8400
.4byte EntityData_HyruleField_TrilbyHighlands
@@ -15223,7 +15505,11 @@ Room_Caves_LonLonRanchWallet:: @ 080F8CD4
.4byte nullsub_90
gUnk_080F8CF4:: @ 080F8CF4
.ifdef JP
.incbin "baserom_jp.gba", 0x0F89EC, 0x0000100
.else
.incbin "baserom.gba", 0x0F8CF4, 0x0000110
.endif
gUnk_080F8E04:: @ 080F8E04
.incbin "baserom.gba", 0x0F8E04, 0x0000010
@@ -15242,7 +15528,11 @@ Room_Caves_RupeeLinksHouse:: @ 080F8E1C
.4byte nullsub_91
gUnk_080F8E3C:: @ 080F8E3C
.ifdef JP
.incbin "baserom_jp.gba", 0x0F8B24, 0x0000100
.else
.incbin "baserom.gba", 0x0F8E3C, 0x0000110
.endif
gUnk_080F8F4C:: @ 080F8F4C
.incbin "baserom.gba", 0x0F8F4C, 0x0000010
@@ -15261,7 +15551,11 @@ Room_Caves_RupeeTrilbyHighlands:: @ 080F8F64
.4byte nullsub_92
gUnk_080F8F84:: @ 080F8F84
.ifdef JP
.incbin "baserom_jp.gba", 0x0F8C5C, 0x0000050
.else
.incbin "baserom.gba", 0x0F8F84, 0x0000060
.endif
gUnk_080F8FE4:: @ 080F8FE4
.incbin "baserom.gba", 0x0F8FE4, 0x0000010
@@ -15337,7 +15631,11 @@ Room_Caves_HeartPieceHallway:: @ 080F9154
.4byte nullsub_96
gUnk_080F9174:: @ 080F9174
.ifdef JP
.incbin "baserom_jp.gba", 0x0F8E3C, 0x0000040
.else
.incbin "baserom.gba", 0x0F9174, 0x0000050
.endif
gUnk_080F91C4:: @ 080F91C4
.incbin "baserom.gba", 0x0F91C4, 0x0000010
@@ -15375,7 +15673,12 @@ Room_Caves_KinstoneBusinessScrub:: @ 080F9244
.4byte nullsub_98
gUnk_080F9264:: @ 080F9264
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F8F1C, 0x00000A0
.else
.incbin "baserom.gba", 0x0F9264, 0x00000A0
.endif
gUnk_080F9304:: @ 080F9304
.incbin "baserom.gba", 0x0F9304, 0x000000C
@@ -15400,7 +15703,12 @@ gUnk_080F9354:: @ 080F9354
.incbin "baserom.gba", 0x0F9354, 0x0000120
gUnk_080F9474:: @ 080F9474
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F912C, 0x0000010
.else
.incbin "baserom.gba", 0x0F9474, 0x0000010
.endif
gUnk_080F9484:: @ 080F9484
.incbin "baserom.gba", 0x0F9484, 0x0000010
@@ -15622,7 +15930,12 @@ gUnk_080F9B78:: @ 080F9B78
.incbin "baserom.gba", 0x0F9BC8, 0x0000030
gUnk_080F9BF8:: @ 080F9BF8
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0F98B0, 0x000002C
.else
.incbin "baserom.gba", 0x0F9BF8, 0x000002C
.endif
.4byte script_08009320
.incbin "baserom.gba", 0x0F9C28, 0x0000010
@@ -16385,10 +16698,20 @@ Room_TreeInteriors_1F:: @ 080FAC08
.4byte nullsub_463
gUnk_080FAC28:: @ 080FAC28
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FA8E0, 0x0000060
.else
.incbin "baserom.gba", 0x0FAC28, 0x0000060
.endif
gUnk_080FAC88:: @ 080FAC88
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FA940, 0x0000030
.else
.incbin "baserom.gba", 0x0FAC88, 0x0000030
.endif
gUnk_080FACB8:: @ 080FACB8
.incbin "baserom.gba", 0x0FACB8, 0x0000090
@@ -16445,7 +16768,12 @@ gUnk_080FAEBC:: @ 080FAEBC
.incbin "baserom.gba", 0x0FAEBC, 0x00000E0
gUnk_080FAF9C:: @ 080FAF9C
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FAC54, 0x0000018
.else
.incbin "baserom.gba", 0x0FAF9C, 0x0000018
.endif
Room_MtCrenel_WallClimb:: @ 080FAFB4
.4byte gUnk_080FAE9C
@@ -16477,7 +16805,12 @@ gUnk_080FB104:: @ 080FB104
.incbin "baserom.gba", 0x0FB104, 0x00000F0
gUnk_080FB1F4:: @ 080FB1F4
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FAEAC, 0x0000020
.else
.incbin "baserom.gba", 0x0FB1F4, 0x0000020
.endif
gUnk_080FB214:: @ 080FB214
.incbin "baserom.gba", 0x0FB214, 0x0000020
@@ -16512,7 +16845,12 @@ gUnk_080FB2E0:: @ 080FB2E0
.incbin "baserom.gba", 0x0FB2E0, 0x0000130
gUnk_080FB410:: @ 080FB410
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FB0C8, 0x0000050
.else
.incbin "baserom.gba", 0x0FB410, 0x0000050
.endif
Room_MtCrenel_GustJarShortcut:: @ 080FB460
.4byte gUnk_080FB2A0
@@ -16525,7 +16863,12 @@ Room_MtCrenel_GustJarShortcut:: @ 080FB460
.4byte nullsub_464
gUnk_080FB480:: @ 080FB480
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FB138, 0x0000150
.else
.incbin "baserom.gba", 0x0FB480, 0x0000150
.endif
gUnk_080FB5D0:: @ 080FB5D0
.incbin "baserom.gba", 0x0FB5D0, 0x0000030
@@ -16534,7 +16877,11 @@ gUnk_080FB600:: @ 080FB600
.incbin "baserom.gba", 0x0FB600, 0x0000100
gUnk_080FB700:: @ 080FB700
.ifdef JP
.incbin "baserom_jp.gba", 0x0FB3B8, 0x0000040
.else
.incbin "baserom.gba", 0x0FB700, 0x0000048
.endif
gUnk_080FB748:: @ 080FB748
.incbin "baserom.gba", 0x0FB748, 0x0000020
@@ -16942,7 +17289,12 @@ gUnk_080FC3C4:: @ 080FC3C4
.incbin "baserom.gba", 0x0FC3C4, 0x0000020
gUnk_080FC3E4:: @ 080FC3E4
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FC094, 0x0000460
.else
.incbin "baserom.gba", 0x0FC3E4, 0x0000460
.endif
gUnk_080FC844:: @ 080FC844
.incbin "baserom.gba", 0x0FC844, 0x0000018
data/data_080FC8A4.s
+30
View File
@@ -126,7 +126,12 @@ gUnk_080FCB38:: @ 080FCB38
.incbin "baserom.gba", 0x0FCB38, 0x000002A
gUnk_080FCB62:: @ 080FCB62
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FC812, 0x0000032
.else
.incbin "baserom.gba", 0x0FCB62, 0x0000032
.endif
gUnk_080FCB94:: @ 080FCB94
.incbin "baserom.gba", 0x0FCB94, 0x0000020
@@ -1210,10 +1215,20 @@ gUnk_080FE2AC:: @ 080FE2AC
.4byte sub_08055D80
gUnk_080FE320:: @ 080FE320
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FDFD0, 0x00002F0
.else
.incbin "baserom.gba", 0x0FE320, 0x00002F0
.endif
gUnk_080FE610:: @ 080FE610
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FE2C0, 0x00004B8
.else
.incbin "baserom.gba", 0x0FE610, 0x00004B8
.endif
gUnk_080FEAC8:: @ 080FEAC8
.incbin "baserom.gba", 0x0FEAC8, 0x0000003
@@ -1222,10 +1237,20 @@ gUnk_080FEACB:: @ 080FEACB
.incbin "baserom.gba", 0x0FEACB, 0x0000023
gUnk_080FEAEE:: @ 080FEAEE
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FE79E, 0x000002C
.else
.incbin "baserom.gba", 0x0FEAEE, 0x000002C
.endif
gUnk_080FEB1A:: @ 080FEB1A
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FE7CA, 0x00000C2
.else
.incbin "baserom.gba", 0x0FEB1A, 0x00000C2
.endif
gUnk_080FEBDC:: @ 080FEBDC
.incbin "baserom.gba", 0x0FEBDC, 0x000000C
@@ -1275,7 +1300,12 @@ gUnk_080FEE48:: @ 080FEE48
.incbin "baserom.gba", 0x0FEE48, 0x0000010
gUnk_080FEE58:: @ 080FEE58
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FEB08, 0x0000020
.else
.incbin "baserom.gba", 0x0FEE58, 0x0000020
.endif
gUnk_080FEE78:: @ 080FEE78
.incbin "baserom.gba", 0x0FEE78, 0x0000030
data/data_080FEEB8.s
+112 -1
View File
@@ -36,7 +36,11 @@ gUnk_080FEF3C:: @ 080FEF3C
gUnk_080FEF48:: @ 080FEF48
.incbin "baserom.gba", 0x0FEF48, 0x000000C
.4byte script_0800BC50
.ifdef JP
.incbin "baserom_jp.gba", 0x0FEC08, 0x0000020
.else
.incbin "baserom.gba", 0x0FEF58, 0x0000020
.endif
gUnk_080FEF78:: @ 080FEF78
.incbin "baserom.gba", 0x0FEF78, 0x000000C
@@ -1106,13 +1110,26 @@ gUnk_080FFB90:: @ 080FFB90
.incbin "baserom.gba", 0x0FFB90, 0x0000018
gUnk_080FFBA8:: @ 080FFBA8
.ifdef JP
.incbin "baserom_jp.gba", 0x0FF858, 0x0000035
.else
.incbin "baserom.gba", 0x0FFBA8, 0x0000035
.endif
gUnk_080FFBDD:: @ 080FFBDD
.ifdef JP
.incbin "baserom_jp.gba", 0x0FF88D, 0x000001f
.else
.incbin "baserom.gba", 0x0FFBDD, 0x0000013
.endif
gUnk_080FFBF0:: @ 080FFBF0
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FF8AC, 0x0000024
.else
.incbin "baserom.gba", 0x0FFBF0, 0x0000024
.endif
gUnk_080FFC14:: @ 080FFC14
.incbin "baserom.gba", 0x0FFC14, 0x0000024
@@ -1121,7 +1138,12 @@ gUnk_080FFC38:: @ 080FFC38
.incbin "baserom.gba", 0x0FFC38, 0x0000030
gUnk_080FFC68:: @ 080FFC68
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FF924, 0x0000018
.else
.incbin "baserom.gba", 0x0FFC68, 0x0000018
.endif
gUnk_080FFC80:: @ 080FFC80
.incbin "baserom.gba", 0x0FFC80, 0x000000C
@@ -1139,16 +1161,36 @@ gUnk_080FFCC8:: @ 080FFCC8
.incbin "baserom.gba", 0x0FFCC8, 0x000000C
gUnk_080FFCD4:: @ 080FFCD4
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FF990, 0x0000018
.else
.incbin "baserom.gba", 0x0FFCD4, 0x0000018
.endif
gUnk_080FFCEC:: @ 080FFCEC
.incbin "baserom.gba", 0x0FFCEC, 0x0000001
gUnk_080FFCED:: @ 080FFCED
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FF9A9, 0x0000017
.else
.incbin "baserom.gba", 0x0FFCED, 0x0000017
.endif
gUnk_080FFD04:: @ 080FFD04
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FF9C0, 0x0000018
.else
.incbin "baserom.gba", 0x0FFD04, 0x0000018
.endif
.ifdef JP
gUnk_080FF9D8:: @ 080FF9D8
.incbin "baserom_jp.gba", 0x0FF9D8, 0x000000C
.endif
gUnk_080FFD1C:: @ 080FFD1C
.incbin "baserom.gba", 0x0FFD1C, 0x000000C
@@ -1433,7 +1475,12 @@ gUnk_08100358:: @ 08100358
.incbin "baserom.gba", 0x100358, 0x0000030
gUnk_08100388:: @ 08100388
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x100050, 0x0000054
.else
.incbin "baserom.gba", 0x100388, 0x0000054
.endif
gUnk_081003DC:: @ 081003DC
.incbin "baserom.gba", 0x1003DC, 0x0000024
@@ -1442,34 +1489,79 @@ gUnk_08100400:: @ 08100400
.incbin "baserom.gba", 0x100400, 0x0000001
gUnk_08100401:: @ 08100401
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1000C9, 0x0000006
.else
.incbin "baserom.gba", 0x100401, 0x0000006
.endif
gUnk_08100407:: @ 08100407
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1000CF, 0x000001D
.else
.incbin "baserom.gba", 0x100407, 0x000001D
.endif
gUnk_08100424:: @ 08100424
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1000EC, 0x0000048
.else
.incbin "baserom.gba", 0x100424, 0x0000048
.endif
gUnk_0810046C:: @ 0810046C
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x100134, 0x0000048
.else
.incbin "baserom.gba", 0x10046C, 0x0000048
.endif
gUnk_081004B4:: @ 081004B4
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10017C, 0x0000018
.else
.incbin "baserom.gba", 0x1004B4, 0x0000018
.endif
gUnk_081004CC:: @ 081004CC
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x100194, 0x0000024
.else
.incbin "baserom.gba", 0x1004CC, 0x0000024
.endif
gUnk_081004F0:: @ 081004F0
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1001B8, 0x0000008
.else
.incbin "baserom.gba", 0x1004F0, 0x0000008
.endif
gUnk_081004F8:: @ 081004F8
.incbin "baserom.gba", 0x1004F8, 0x0000002
gUnk_081004FA:: @ 081004FA
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1001C2, 0x0000004
.else
.incbin "baserom.gba", 0x1004FA, 0x0000004
.endif
gUnk_081004FE:: @ 081004FE
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1001C6, 0x0000012
.else
.incbin "baserom.gba", 0x1004FE, 0x0000012
.endif
gUnk_08100510:: @ 08100510
.incbin "baserom.gba", 0x100510, 0x0000001
@@ -1628,7 +1720,12 @@ gUnk_08100940:: @ 08100940
.incbin "baserom.gba", 0x100940, 0x0000030
gUnk_08100970:: @ 08100970
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x100638, 0x000003C
.else
.incbin "baserom.gba", 0x100970, 0x000003C
.endif
gUnk_081009AC:: @ 081009AC
.incbin "baserom.gba", 0x1009AC, 0x000000C
@@ -1670,10 +1767,20 @@ gUnk_08100A0C:: @ 08100A0C
.incbin "baserom.gba", 0x100A0C, 0x0000005
gUnk_08100A11:: @ 08100A11
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1006D9, 0x000001F
.else
.incbin "baserom.gba", 0x100A11, 0x000001F
.endif
gUnk_08100A30:: @ 08100A30
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1006F8, 0x0000054
.else
.incbin "baserom.gba", 0x100A30, 0x0000054
.endif
gUnk_08100A84:: @ 08100A84
.incbin "baserom.gba", 0x100A84, 0x000000C
@@ -1696,7 +1803,11 @@ gUnk_08100AA8:: @ 08100AA8
.4byte gUnk_080FFC8C
.4byte gUnk_080FFCEC
.4byte gUnk_080FFD04
.4byte gUnk_080FFD1C
.ifdef JP
.4byte gUnk_080FF9D8
.else
.4byte gUnk_080FFD1C
.endif
.4byte gUnk_080FFC98
.4byte gUnk_080FFCB0
.4byte gUnk_080FFCC8
data/data_0812AA88.s
+794 -1
View File
@@ -451,6 +451,768 @@ gUnk_0812B1F8:: @ 0812B1F8
gUnk_0812B204:: @ 0812B204
.incbin "baserom.gba", 0x12B204, 0x0000008
.ifdef JP
ENUM_12AED0:
.4byte gUnk_0812B204
.4byte ENUM_12AED0_LV1_CLEAR_MES
.4byte ENUM_12AED0_LV2_CLEAR_MES
.4byte ENUM_12AED0_LV3_CLEAR_MES
.4byte ENUM_12AED0_LV4_CLEAR_MES
.4byte ENUM_12AED0_LV5_CLEAR_MES
.4byte ENUM_12AED0_MIZUUMI_00_BENT
.4byte ENUM_12AED0_MIZUUMI_00_00
.4byte ENUM_12AED0_MIZUUMI_00_H00
.4byte ENUM_12AED0_MIZUUMI_00_H01
.4byte ENUM_12AED0_MIZUUMI_00_H02
.4byte ENUM_12AED0_HIKYOU_00_T0
.4byte ENUM_12AED0_HIKYOU_00_T1
.4byte ENUM_12AED0_MAENIWA_00_00
.4byte ENUM_12AED0_MAENIWA_00_01
.4byte ENUM_12AED0_MAENIWA_00_02
.4byte ENUM_12AED0_MAENIWA_00_BENT
.4byte ENUM_12AED0_MAENIWA_00_WARP
.4byte ENUM_12AED0_MAENIWA_00_T0
.4byte ENUM_12AED0_MAENIWA_00_T1
.4byte ENUM_12AED0_MAENIWA_00_CAP_0
.4byte ENUM_12AED0_NAKANIWA_00_EZERO
.4byte ENUM_12AED0_HIKYOU_00_00
.4byte ENUM_12AED0_HIKYOU_00_01
.4byte ENUM_12AED0_HIKYOU_00_02
.4byte ENUM_12AED0_HIKYOU_00_03
.4byte ENUM_12AED0_HIKYOU_00_04
.4byte ENUM_12AED0_HIKYOU_00_CAP_0
.4byte ENUM_12AED0_HIKYOU_00_CAP_1
.4byte ENUM_12AED0_HIKYOU_00_CAP_2
.4byte ENUM_12AED0_HIKYOU_00_SEKIZOU
.4byte ENUM_12AED0_HIKYOU_00_14
.4byte ENUM_12AED0_HIKYOU_00_BOSEKI
.4byte ENUM_12AED0_HIKYOU_00_H00
.4byte ENUM_12AED0_HIKYOU_00_M0
.4byte ENUM_12AED0_HIKYOU_00_M1
.4byte ENUM_12AED0_HIKYOU_00_M2
.4byte ENUM_12AED0_LOST_00_ENTER
.4byte ENUM_12AED0_LOST_00_00
.4byte ENUM_12AED0_LOST_00_01
.4byte ENUM_12AED0_LOST_02_00
.4byte ENUM_12AED0_LOST_03_00
.4byte ENUM_12AED0_LOST_03_T0
.4byte ENUM_12AED0_LOST_04_00
.4byte ENUM_12AED0_LOST_04_SIBA0
.4byte ENUM_12AED0_LOST_04_SIBA1
.4byte ENUM_12AED0_LOST_04_SIBA2
.4byte ENUM_12AED0_LOST_04_SIBA3
.4byte ENUM_12AED0_LOST_04_SIBA4
.4byte ENUM_12AED0_LOST_05_00
.4byte ENUM_12AED0_LOST_05_01
.4byte ENUM_12AED0_LOST_05_T0
.4byte ENUM_12AED0_LOST_05_T1
.4byte ENUM_12AED0_MORI_00_HIBI_0
.4byte ENUM_12AED0_MORI_00_HIBI_1
.4byte ENUM_12AED0_MORI_00_HIBI_2
.4byte ENUM_12AED0_MORI_00_HIBI_3
.4byte ENUM_12AED0_MORI_00_HIBI_4
.4byte ENUM_12AED0_MORI_00_KOBITO
.4byte ENUM_12AED0_MORI_00_H0
.4byte ENUM_12AED0_MORI_00_H1
.4byte ENUM_12AED0_MORI_ENTRANCE_1ST
.4byte ENUM_12AED0_YAMA_00_00
.4byte ENUM_12AED0_YAMA_00_01
.4byte ENUM_12AED0_YAMA_01_BW00
.4byte ENUM_12AED0_YAMA_02_00
.4byte ENUM_12AED0_YAMA_03_00
.4byte ENUM_12AED0_YAMA_03_01
.4byte ENUM_12AED0_YAMA_03_02
.4byte ENUM_12AED0_YAMA_03_DOKU_0
.4byte ENUM_12AED0_YAMA_03_DOKU_1
.4byte ENUM_12AED0_YAMA_03_DOKU_2
.4byte ENUM_12AED0_YAMA_04_CAP_0
.4byte ENUM_12AED0_YAMA_04_R00
.4byte ENUM_12AED0_YAMA_04_HIBI_0
.4byte ENUM_12AED0_YAMA_04_HIBI_1
.4byte ENUM_12AED0_YAMA_04_00
.4byte ENUM_12AED0_YAMA_04_01
.4byte ENUM_12AED0_YAMA_04_04
.4byte ENUM_12AED0_YAMA_04_05
.4byte ENUM_12AED0_YAMA_04_06
.4byte ENUM_12AED0_YAMA_04_ENTHOUSHI
.4byte ENUM_12AED0_YAMA_04_ANAHOUSHI
.4byte ENUM_12AED0_YAMA_04_BOMBWALL0
.4byte ENUM_12AED0_HAKA_BUNSHIN_00
.4byte ENUM_12AED0_HAKA_BOSEKI_00
.4byte ENUM_12AED0_HAKA_BOSEKI_01
.4byte ENUM_12AED0_HAKA_BOSEKI_02
.4byte ENUM_12AED0_HAKA_00_CAP_0
.4byte ENUM_12AED0_HAKA_00_BW00
.4byte ENUM_12AED0_HAKA_01_T0
.4byte ENUM_12AED0_HAKA_KEY_GET
.4byte ENUM_12AED0_SOUGEN_01_WAKAGI_0
.4byte ENUM_12AED0_SOUGEN_01_WAKAGI_1
.4byte ENUM_12AED0_SOUGEN_01_WAKAGI_2
.4byte ENUM_12AED0_SOUGEN_01_WAKAGI_3
.4byte ENUM_12AED0_SOUGEN_01_WAKAGI_4
.4byte ENUM_12AED0_SOUGEN_01_WAKAGI_5
.4byte ENUM_12AED0_SOUGEN_01_WAKAGI_6
.4byte ENUM_12AED0_SOUGEN_01_WAKAGI_7
.4byte ENUM_12AED0_SOUGEN_01_WAKAGI_8
.4byte ENUM_12AED0_SOUGEN_01_WAKAGI_9
.4byte ENUM_12AED0_SOUGEN_01_WAKAGI_10
.4byte ENUM_12AED0_SOUGEN_01_WAKAGI_11
.4byte ENUM_12AED0_SOUGEN_01_WAKAGI_12
.4byte ENUM_12AED0_SOUGEN_01_00
.4byte ENUM_12AED0_SOUGEN_01_BENT
.4byte ENUM_12AED0_SOUGEN_01_ZELDA
.4byte ENUM_12AED0_SOUGEN_02_HIBI_0
.4byte ENUM_12AED0_SOUGEN_02_HIBI_1
.4byte ENUM_12AED0_SOUGEN_03_BOMBWALL
.4byte ENUM_12AED0_SOUGEN_04_HIBI_0
.4byte ENUM_12AED0_SOUGEN_04_HIBI_1
.4byte ENUM_12AED0_SOUGEN_04_HIBI_2
.4byte ENUM_12AED0_SOUGEN_04_HIBI_3
.4byte ENUM_12AED0_SOUGEN_05_HIBI_0
.4byte ENUM_12AED0_SOUGEN_05_HIBI_1
.4byte ENUM_12AED0_SOUGEN_05_HIBI_2
.4byte ENUM_12AED0_SOUGEN_05_HIBI_3
.4byte ENUM_12AED0_SOUGEN_05_BOMB_00
.4byte ENUM_12AED0_SOUGEN_05_00
.4byte ENUM_12AED0_SOUGEN_05_01
.4byte ENUM_12AED0_SOUGEN_05_IWA02
.4byte ENUM_12AED0_SOUGEN_05_BENT
.4byte ENUM_12AED0_SOUGEN_05_H00
.4byte ENUM_12AED0_SOUGEN_05_R0
.4byte ENUM_12AED0_SOUGEN_05_CAP_0
.4byte ENUM_12AED0_SOUGEN_06_WAKAGI_0
.4byte ENUM_12AED0_SOUGEN_06_WAKAGI_1
.4byte ENUM_12AED0_SOUGEN_06_WAKAGI_2
.4byte ENUM_12AED0_SOUGEN_06_WAKAGI_3
.4byte ENUM_12AED0_SOUGEN_06_HIBI_0
.4byte ENUM_12AED0_SOUGEN_06_HIBI_1
.4byte ENUM_12AED0_SOUGEN_06_HIBI_2
.4byte ENUM_12AED0_SOUGEN_06_HIBI_3
.4byte ENUM_12AED0_SOUGEN_06_HIBI_4
.4byte ENUM_12AED0_SOUGEN_06_IWA_0
.4byte ENUM_12AED0_SOUGEN_06_AKINDO
.4byte ENUM_12AED0_SOUGEN_06_SAIKAI
.4byte ENUM_12AED0_SOUGEN_06_BENT
.4byte ENUM_12AED0_SOUGEN_06_SLIDE
.4byte ENUM_12AED0_SOUGEN_06_R1
.4byte ENUM_12AED0_SOUGEN_07_00
.4byte ENUM_12AED0_SOUGEN_07_01
.4byte ENUM_12AED0_SOUGEN_07_02
.4byte ENUM_12AED0_SOUGEN_07_H00
.4byte ENUM_12AED0_SOUGEN_08_00
.4byte ENUM_12AED0_SOUGEN_08_01
.4byte ENUM_12AED0_SOUGEN_08_02
.4byte ENUM_12AED0_SOUGEN_08_03
.4byte ENUM_12AED0_SOUGEN_08_04
.4byte ENUM_12AED0_SOUGEN_08_05
.4byte ENUM_12AED0_SOUGEN_08_06
.4byte ENUM_12AED0_SOUGEN_08_07
.4byte ENUM_12AED0_SOUGEN_08_08
.4byte ENUM_12AED0_SOUGEN_08_TORITSUKI
.4byte ENUM_12AED0_SOUGEN_08_T00
.4byte ENUM_12AED0_CASTLE_00_00
.4byte ENUM_12AED0_CASTLE_04_MEZAME
.4byte ENUM_12AED0_CASTLE_04_MAID_TALK
.4byte ENUM_12AED0_SUIGEN_00_h0
.4byte ENUM_12AED0_SUIGEN_00_T0
.4byte ENUM_12AED0_SUIGEN_00_r0
.4byte ENUM_12AED0_SUIGEN_00_r1
.4byte ENUM_12AED0_SUIGEN_00_r2
.4byte ENUM_12AED0_SUIGEN_00_CAP_0
.4byte ENUM_12AED0_SUIGEN_00_CAP_1
.4byte ENUM_12AED0_SUIGEN_00_R0
.4byte ENUM_12AED0_SUIGEN_00_R1
.4byte ENUM_12AED0_SUIGEN_00_h1
.4byte ENUM_12AED0_SUIGENGORON_00_CAP_0
.4byte ENUM_12AED0_DAIGORON_SHIELD
.4byte ENUM_12AED0_DAIGORON_EXCHG
.4byte ENUM_12AED0_BEANDEMO_00
.4byte ENUM_12AED0_BEANDEMO_01
.4byte ENUM_12AED0_BEANDEMO_02
.4byte ENUM_12AED0_BEANDEMO_03
.4byte ENUM_12AED0_BEANDEMO_04
.4byte ENUM_12AED0_KAKERA_TAKARA_A
.4byte ENUM_12AED0_KAKERA_TAKARA_E
.4byte ENUM_12AED0_KAKERA_TAKARA_K
.4byte ENUM_12AED0_KAKERA_TAKARA_L
.4byte ENUM_12AED0_KAKERA_TAKARA_M
.4byte ENUM_12AED0_KAKERA_TAKARA_N
.4byte ENUM_12AED0_KAKERA_TAKARA_O
.4byte ENUM_12AED0_KAKERA_TAKARA_P
.4byte ENUM_12AED0_KAKERA_TAKARA_Q
.4byte ENUM_12AED0_KAKERA_TAKARA_R
.4byte ENUM_12AED0_KAKERA_TAKARA_S
.4byte ENUM_12AED0_KAKERA_TAKARA_T
.4byte ENUM_12AED0_KAKERA_TAKARA_U
.4byte ENUM_12AED0_KAKERA_TAKARA_V
.4byte ENUM_12AED0_KAKERA_TAKARA_W
.4byte ENUM_12AED0_KAKERA_TAKARA_X
.4byte ENUM_12AED0_KAKERA_TAKARA_Y
.4byte ENUM_12AED0_KAKERA_TAKARA_Z
.4byte ENUM_12AED0_MACHI_02_HEISHI_TALK
.4byte ENUM_12AED0_MACHI00_00
.4byte ENUM_12AED0_MACHI00_02
.4byte ENUM_12AED0_MACHI00_03
.4byte ENUM_12AED0_MACHI_00_T00
.4byte ENUM_12AED0_MACHI_00_T01
.4byte ENUM_12AED0_MACHI_01_DEMO
.4byte ENUM_12AED0_MACHI_02_HEISHI
.4byte ENUM_12AED0_MACHI_02_DOG
.4byte ENUM_12AED0_MACHI_07_BELL
.4byte ENUM_12AED0_SHOP05_OPEN
.4byte ENUM_12AED0_MACHI_MES_20
.4byte ENUM_12AED0_MACHI_MES_21
.4byte ENUM_12AED0_MACHI_MES_22
.4byte ENUM_12AED0_MACHI_MES_23
.4byte ENUM_12AED0_MACHI_MES_24
.4byte ENUM_12AED0_MACHI_MES_30
.4byte ENUM_12AED0_MACHI_MES_40
.4byte ENUM_12AED0_MACHI_MES_60
.4byte ENUM_12AED0_MACHI_MES_50
.4byte ENUM_12AED0_MACHI_DOG_C
.4byte ENUM_12AED0_KUMOUE_00_CAP_0
.4byte ENUM_12AED0_KUMOUE_01_CAP_0
.4byte ENUM_12AED0_KUMOUE_01_T0
.4byte ENUM_12AED0_KUMOUE_01_T1
.4byte ENUM_12AED0_KUMOUE_01_T2
.4byte ENUM_12AED0_KUMOUE_01_T3
.4byte ENUM_12AED0_KUMOUE_01_T4
.4byte ENUM_12AED0_KUMOUE_01_T5
.4byte ENUM_12AED0_KUMOUE_01_T6
.4byte ENUM_12AED0_KUMOUR_01_K0
.4byte ENUM_12AED0_KUMOUR_01_K1
.4byte ENUM_12AED0_KUMOUR_01_K2
.4byte ENUM_12AED0_KUMOUR_01_K3
.4byte ENUM_12AED0_KUMOUR_01_K4
.4byte ENUM_12AED0_KUMOUR_01_K5
.4byte ENUM_12AED0_KUMOUR_01_K6
.4byte ENUM_12AED0_KUMONOUE_01_KAKERA
.4byte ENUM_12AED0_KUMOUE_02_CAP_0
.4byte ENUM_12AED0_KUMOUE_02_AWASE_01
.4byte ENUM_12AED0_KUMOUE_02_AWASE_02
.4byte ENUM_12AED0_KUMOUE_02_AWASE_03
.4byte ENUM_12AED0_KUMOUE_02_AWASE_04
.4byte ENUM_12AED0_KUMOUE_02_AWASE_05
.4byte ENUM_12AED0_KUMOUE_02_00
.4byte ENUM_12AED0_KUMOUE_02_01
.4byte ENUM_12AED0_KUMOUE_02_02
.4byte ENUM_12AED0_KUMOUE_02_03
.4byte ENUM_12AED0_KUMOUE_UNCLE_TALK
.4byte ENUM_12AED0_KUMOUE_GIRL_TALK
.4byte ENUM_12AED0_MIZUUMI_00_CAP_0
.4byte ENUM_12AED0_SUIGEN_00_R2
.4byte ENUM_12AED0_YAMA_04_CAP_1
.4byte ENUM_12AED0_LOST_05_02
.4byte ENUM_12AED0_LOST_05_03
.4byte ENUM_12AED0_KAKERA_TAKARA_J
.4byte gUnk_0812AC84
ENUM_12AED0_KAKERA_TAKARA_J:
.ascii "KAKERA_TAKARA_J\0"
ENUM_12AED0_LOST_05_03:
.ascii "LOST_05_03\0\0"
ENUM_12AED0_LOST_05_02:
.ascii "LOST_05_02\0\0"
ENUM_12AED0_YAMA_04_CAP_1:
.ascii "YAMA_04_CAP_1\0\0\0"
ENUM_12AED0_SUIGEN_00_R2:
.ascii "SUIGEN_00_R2\0\0\0\0"
ENUM_12AED0_MIZUUMI_00_CAP_0:
.ascii "MIZUUMI_00_CAP_0\0\0\0\0"
ENUM_12AED0_KUMOUE_GIRL_TALK:
.ascii "KUMOUE_GIRL_TALK\0\0\0\0"
ENUM_12AED0_KUMOUE_UNCLE_TALK:
.ascii "KUMOUE_UNCLE_TALK\0\0\0"
ENUM_12AED0_KUMOUE_02_03:
.ascii "KUMOUE_02_03\0\0\0\0"
ENUM_12AED0_KUMOUE_02_02:
.ascii "KUMOUE_02_02\0\0\0\0"
ENUM_12AED0_KUMOUE_02_01:
.ascii "KUMOUE_02_01\0\0\0\0"
ENUM_12AED0_KUMOUE_02_00:
.ascii "KUMOUE_02_00\0\0\0\0"
ENUM_12AED0_KUMOUE_02_AWASE_05:
.ascii "KUMOUE_02_AWASE_05\0\0"
ENUM_12AED0_KUMOUE_02_AWASE_04:
.ascii "KUMOUE_02_AWASE_04\0\0"
ENUM_12AED0_KUMOUE_02_AWASE_03:
.ascii "KUMOUE_02_AWASE_03\0\0"
ENUM_12AED0_KUMOUE_02_AWASE_02:
.ascii "KUMOUE_02_AWASE_02\0\0"
ENUM_12AED0_KUMOUE_02_AWASE_01:
.ascii "KUMOUE_02_AWASE_01\0\0"
ENUM_12AED0_KUMOUE_02_CAP_0:
.ascii "KUMOUE_02_CAP_0\0"
ENUM_12AED0_KUMONOUE_01_KAKERA:
.ascii "KUMONOUE_01_KAKERA\0\0"
ENUM_12AED0_KUMOUR_01_K6:
.ascii "KUMOUR_01_K6\0\0\0\0"
ENUM_12AED0_KUMOUR_01_K5:
.ascii "KUMOUR_01_K5\0\0\0\0"
ENUM_12AED0_KUMOUR_01_K4:
.ascii "KUMOUR_01_K4\0\0\0\0"
ENUM_12AED0_KUMOUR_01_K3:
.ascii "KUMOUR_01_K3\0\0\0\0"
ENUM_12AED0_KUMOUR_01_K2:
.ascii "KUMOUR_01_K2\0\0\0\0"
ENUM_12AED0_KUMOUR_01_K1:
.ascii "KUMOUR_01_K1\0\0\0\0"
ENUM_12AED0_KUMOUR_01_K0:
.ascii "KUMOUR_01_K0\0\0\0\0"
ENUM_12AED0_KUMOUE_01_T6:
.ascii "KUMOUE_01_T6\0\0\0\0"
ENUM_12AED0_KUMOUE_01_T5:
.ascii "KUMOUE_01_T5\0\0\0\0"
ENUM_12AED0_KUMOUE_01_T4:
.ascii "KUMOUE_01_T4\0\0\0\0"
ENUM_12AED0_KUMOUE_01_T3:
.ascii "KUMOUE_01_T3\0\0\0\0"
ENUM_12AED0_KUMOUE_01_T2:
.ascii "KUMOUE_01_T2\0\0\0\0"
ENUM_12AED0_KUMOUE_01_T1:
.ascii "KUMOUE_01_T1\0\0\0\0"
ENUM_12AED0_KUMOUE_01_T0:
.ascii "KUMOUE_01_T0\0\0\0\0"
ENUM_12AED0_KUMOUE_01_CAP_0:
.ascii "KUMOUE_01_CAP_0\0"
ENUM_12AED0_KUMOUE_00_CAP_0:
.ascii "KUMOUE_00_CAP_0\0"
ENUM_12AED0_MACHI_DOG_C:
.ascii "MACHI_DOG_C\0"
ENUM_12AED0_MACHI_MES_50:
.ascii "MACHI_MES_50\0\0\0\0"
ENUM_12AED0_MACHI_MES_60:
.ascii "MACHI_MES_60\0\0\0\0"
ENUM_12AED0_MACHI_MES_40:
.ascii "MACHI_MES_40\0\0\0\0"
ENUM_12AED0_MACHI_MES_30:
.ascii "MACHI_MES_30\0\0\0\0"
ENUM_12AED0_MACHI_MES_24:
.ascii "MACHI_MES_24\0\0\0\0"
ENUM_12AED0_MACHI_MES_23:
.ascii "MACHI_MES_23\0\0\0\0"
ENUM_12AED0_MACHI_MES_22:
.ascii "MACHI_MES_22\0\0\0\0"
ENUM_12AED0_MACHI_MES_21:
.ascii "MACHI_MES_21\0\0\0\0"
ENUM_12AED0_MACHI_MES_20:
.ascii "MACHI_MES_20\0\0\0\0"
ENUM_12AED0_SHOP05_OPEN:
.ascii "SHOP05_OPEN\0"
ENUM_12AED0_MACHI_07_BELL:
.ascii "MACHI_07_BELL\0\0\0"
ENUM_12AED0_MACHI_02_DOG:
.ascii "MACHI_02_DOG\0\0\0\0"
ENUM_12AED0_MACHI_02_HEISHI:
.ascii "MACHI_02_HEISHI\0"
ENUM_12AED0_MACHI_01_DEMO:
.ascii "MACHI_01_DEMO\0\0\0"
ENUM_12AED0_MACHI_00_T01:
.ascii "MACHI_00_T01\0\0\0\0"
ENUM_12AED0_MACHI_00_T00:
.ascii "MACHI_00_T00\0\0\0\0"
ENUM_12AED0_MACHI00_03:
.ascii "MACHI00_03\0\0"
ENUM_12AED0_MACHI00_02:
.ascii "MACHI00_02\0\0"
ENUM_12AED0_MACHI00_00:
.ascii "MACHI00_00\0\0"
ENUM_12AED0_MACHI_02_HEISHI_TALK:
.ascii "MACHI_02_HEISHI_TALK\0\0\0\0"
ENUM_12AED0_KAKERA_TAKARA_Z:
.ascii "KAKERA_TAKARA_Z\0"
ENUM_12AED0_KAKERA_TAKARA_Y:
.ascii "KAKERA_TAKARA_Y\0"
ENUM_12AED0_KAKERA_TAKARA_X:
.ascii "KAKERA_TAKARA_X\0"
ENUM_12AED0_KAKERA_TAKARA_W:
.ascii "KAKERA_TAKARA_W\0"
ENUM_12AED0_KAKERA_TAKARA_V:
.ascii "KAKERA_TAKARA_V\0"
ENUM_12AED0_KAKERA_TAKARA_U:
.ascii "KAKERA_TAKARA_U\0"
ENUM_12AED0_KAKERA_TAKARA_T:
.ascii "KAKERA_TAKARA_T\0"
ENUM_12AED0_KAKERA_TAKARA_S:
.ascii "KAKERA_TAKARA_S\0"
ENUM_12AED0_KAKERA_TAKARA_R:
.ascii "KAKERA_TAKARA_R\0"
ENUM_12AED0_KAKERA_TAKARA_Q:
.ascii "KAKERA_TAKARA_Q\0"
ENUM_12AED0_KAKERA_TAKARA_P:
.ascii "KAKERA_TAKARA_P\0"
ENUM_12AED0_KAKERA_TAKARA_O:
.ascii "KAKERA_TAKARA_O\0"
ENUM_12AED0_KAKERA_TAKARA_N:
.ascii "KAKERA_TAKARA_N\0"
ENUM_12AED0_KAKERA_TAKARA_M:
.ascii "KAKERA_TAKARA_M\0"
ENUM_12AED0_KAKERA_TAKARA_L:
.ascii "KAKERA_TAKARA_L\0"
ENUM_12AED0_KAKERA_TAKARA_K:
.ascii "KAKERA_TAKARA_K\0"
ENUM_12AED0_KAKERA_TAKARA_E:
.ascii "KAKERA_TAKARA_E\0"
ENUM_12AED0_KAKERA_TAKARA_A:
.ascii "KAKERA_TAKARA_A\0"
ENUM_12AED0_BEANDEMO_04:
.ascii "BEANDEMO_04\0"
ENUM_12AED0_BEANDEMO_03:
.ascii "BEANDEMO_03\0"
ENUM_12AED0_BEANDEMO_02:
.ascii "BEANDEMO_02\0"
ENUM_12AED0_BEANDEMO_01:
.ascii "BEANDEMO_01\0"
ENUM_12AED0_BEANDEMO_00:
.ascii "BEANDEMO_00\0"
ENUM_12AED0_DAIGORON_EXCHG:
.ascii "DAIGORON_EXCHG\0\0"
ENUM_12AED0_DAIGORON_SHIELD:
.ascii "DAIGORON_SHIELD\0"
ENUM_12AED0_SUIGENGORON_00_CAP_0:
.ascii "SUIGENGORON_00_CAP_0\0\0\0\0"
ENUM_12AED0_SUIGEN_00_h1:
.ascii "SUIGEN_00_h1\0\0\0\0"
ENUM_12AED0_SUIGEN_00_R1:
.ascii "SUIGEN_00_R1\0\0\0\0"
ENUM_12AED0_SUIGEN_00_R0:
.ascii "SUIGEN_00_R0\0\0\0\0"
ENUM_12AED0_SUIGEN_00_CAP_1:
.ascii "SUIGEN_00_CAP_1\0"
ENUM_12AED0_SUIGEN_00_CAP_0:
.ascii "SUIGEN_00_CAP_0\0"
ENUM_12AED0_SUIGEN_00_r2:
.ascii "SUIGEN_00_r2\0\0\0\0"
ENUM_12AED0_SUIGEN_00_r1:
.ascii "SUIGEN_00_r1\0\0\0\0"
ENUM_12AED0_SUIGEN_00_r0:
.ascii "SUIGEN_00_r0\0\0\0\0"
ENUM_12AED0_SUIGEN_00_T0:
.ascii "SUIGEN_00_T0\0\0\0\0"
ENUM_12AED0_SUIGEN_00_h0:
.ascii "SUIGEN_00_h0\0\0\0\0"
ENUM_12AED0_CASTLE_04_MAID_TALK:
.ascii "CASTLE_04_MAID_TALK\0"
ENUM_12AED0_CASTLE_04_MEZAME:
.ascii "CASTLE_04_MEZAME\0\0\0\0"
ENUM_12AED0_CASTLE_00_00:
.ascii "CASTLE_00_00\0\0\0\0"
ENUM_12AED0_SOUGEN_08_T00:
.ascii "SOUGEN_08_T00\0\0\0"
ENUM_12AED0_SOUGEN_08_TORITSUKI:
.ascii "SOUGEN_08_TORITSUKI\0"
ENUM_12AED0_SOUGEN_08_08:
.ascii "SOUGEN_08_08\0\0\0\0"
ENUM_12AED0_SOUGEN_08_07:
.ascii "SOUGEN_08_07\0\0\0\0"
ENUM_12AED0_SOUGEN_08_06:
.ascii "SOUGEN_08_06\0\0\0\0"
ENUM_12AED0_SOUGEN_08_05:
.ascii "SOUGEN_08_05\0\0\0\0"
ENUM_12AED0_SOUGEN_08_04:
.ascii "SOUGEN_08_04\0\0\0\0"
ENUM_12AED0_SOUGEN_08_03:
.ascii "SOUGEN_08_03\0\0\0\0"
ENUM_12AED0_SOUGEN_08_02:
.ascii "SOUGEN_08_02\0\0\0\0"
ENUM_12AED0_SOUGEN_08_01:
.ascii "SOUGEN_08_01\0\0\0\0"
ENUM_12AED0_SOUGEN_08_00:
.ascii "SOUGEN_08_00\0\0\0\0"
ENUM_12AED0_SOUGEN_07_H00:
.ascii "SOUGEN_07_H00\0\0\0"
ENUM_12AED0_SOUGEN_07_02:
.ascii "SOUGEN_07_02\0\0\0\0"
ENUM_12AED0_SOUGEN_07_01:
.ascii "SOUGEN_07_01\0\0\0\0"
ENUM_12AED0_SOUGEN_07_00:
.ascii "SOUGEN_07_00\0\0\0\0"
ENUM_12AED0_SOUGEN_06_R1:
.ascii "SOUGEN_06_R1\0\0\0\0"
ENUM_12AED0_SOUGEN_06_SLIDE:
.ascii "SOUGEN_06_SLIDE\0"
ENUM_12AED0_SOUGEN_06_BENT:
.ascii "SOUGEN_06_BENT\0\0"
ENUM_12AED0_SOUGEN_06_SAIKAI:
.ascii "SOUGEN_06_SAIKAI\0\0\0\0"
ENUM_12AED0_SOUGEN_06_AKINDO:
.ascii "SOUGEN_06_AKINDO\0\0\0\0"
ENUM_12AED0_SOUGEN_06_IWA_0:
.ascii "SOUGEN_06_IWA_0\0"
ENUM_12AED0_SOUGEN_06_HIBI_4:
.ascii "SOUGEN_06_HIBI_4\0\0\0\0"
ENUM_12AED0_SOUGEN_06_HIBI_3:
.ascii "SOUGEN_06_HIBI_3\0\0\0\0"
ENUM_12AED0_SOUGEN_06_HIBI_2:
.ascii "SOUGEN_06_HIBI_2\0\0\0\0"
ENUM_12AED0_SOUGEN_06_HIBI_1:
.ascii "SOUGEN_06_HIBI_1\0\0\0\0"
ENUM_12AED0_SOUGEN_06_HIBI_0:
.ascii "SOUGEN_06_HIBI_0\0\0\0\0"
ENUM_12AED0_SOUGEN_06_WAKAGI_3:
.ascii "SOUGEN_06_WAKAGI_3\0\0"
ENUM_12AED0_SOUGEN_06_WAKAGI_2:
.ascii "SOUGEN_06_WAKAGI_2\0\0"
ENUM_12AED0_SOUGEN_06_WAKAGI_1:
.ascii "SOUGEN_06_WAKAGI_1\0\0"
ENUM_12AED0_SOUGEN_06_WAKAGI_0:
.ascii "SOUGEN_06_WAKAGI_0\0\0"
ENUM_12AED0_SOUGEN_05_CAP_0:
.ascii "SOUGEN_05_CAP_0\0"
ENUM_12AED0_SOUGEN_05_R0:
.ascii "SOUGEN_05_R0\0\0\0\0"
ENUM_12AED0_SOUGEN_05_H00:
.ascii "SOUGEN_05_H00\0\0\0"
ENUM_12AED0_SOUGEN_05_BENT:
.ascii "SOUGEN_05_BENT\0\0"
ENUM_12AED0_SOUGEN_05_IWA02:
.ascii "SOUGEN_05_IWA02\0"
ENUM_12AED0_SOUGEN_05_01:
.ascii "SOUGEN_05_01\0\0\0\0"
ENUM_12AED0_SOUGEN_05_00:
.ascii "SOUGEN_05_00\0\0\0\0"
ENUM_12AED0_SOUGEN_05_BOMB_00:
.ascii "SOUGEN_05_BOMB_00\0\0\0"
ENUM_12AED0_SOUGEN_05_HIBI_3:
.ascii "SOUGEN_05_HIBI_3\0\0\0\0"
ENUM_12AED0_SOUGEN_05_HIBI_2:
.ascii "SOUGEN_05_HIBI_2\0\0\0\0"
ENUM_12AED0_SOUGEN_05_HIBI_1:
.ascii "SOUGEN_05_HIBI_1\0\0\0\0"
ENUM_12AED0_SOUGEN_05_HIBI_0:
.ascii "SOUGEN_05_HIBI_0\0\0\0\0"
ENUM_12AED0_SOUGEN_04_HIBI_3:
.ascii "SOUGEN_04_HIBI_3\0\0\0\0"
ENUM_12AED0_SOUGEN_04_HIBI_2:
.ascii "SOUGEN_04_HIBI_2\0\0\0\0"
ENUM_12AED0_SOUGEN_04_HIBI_1:
.ascii "SOUGEN_04_HIBI_1\0\0\0\0"
ENUM_12AED0_SOUGEN_04_HIBI_0:
.ascii "SOUGEN_04_HIBI_0\0\0\0\0"
ENUM_12AED0_SOUGEN_03_BOMBWALL:
.ascii "SOUGEN_03_BOMBWALL\0\0"
ENUM_12AED0_SOUGEN_02_HIBI_1:
.ascii "SOUGEN_02_HIBI_1\0\0\0\0"
ENUM_12AED0_SOUGEN_02_HIBI_0:
.ascii "SOUGEN_02_HIBI_0\0\0\0\0"
ENUM_12AED0_SOUGEN_01_ZELDA:
.ascii "SOUGEN_01_ZELDA\0"
ENUM_12AED0_SOUGEN_01_BENT:
.ascii "SOUGEN_01_BENT\0\0"
ENUM_12AED0_SOUGEN_01_00:
.ascii "SOUGEN_01_00\0\0\0\0"
ENUM_12AED0_SOUGEN_01_WAKAGI_12:
.ascii "SOUGEN_01_WAKAGI_12\0"
ENUM_12AED0_SOUGEN_01_WAKAGI_11:
.ascii "SOUGEN_01_WAKAGI_11\0"
ENUM_12AED0_SOUGEN_01_WAKAGI_10:
.ascii "SOUGEN_01_WAKAGI_10\0"
ENUM_12AED0_SOUGEN_01_WAKAGI_9:
.ascii "SOUGEN_01_WAKAGI_9\0\0"
ENUM_12AED0_SOUGEN_01_WAKAGI_8:
.ascii "SOUGEN_01_WAKAGI_8\0\0"
ENUM_12AED0_SOUGEN_01_WAKAGI_7:
.ascii "SOUGEN_01_WAKAGI_7\0\0"
ENUM_12AED0_SOUGEN_01_WAKAGI_6:
.ascii "SOUGEN_01_WAKAGI_6\0\0"
ENUM_12AED0_SOUGEN_01_WAKAGI_5:
.ascii "SOUGEN_01_WAKAGI_5\0\0"
ENUM_12AED0_SOUGEN_01_WAKAGI_4:
.ascii "SOUGEN_01_WAKAGI_4\0\0"
ENUM_12AED0_SOUGEN_01_WAKAGI_3:
.ascii "SOUGEN_01_WAKAGI_3\0\0"
ENUM_12AED0_SOUGEN_01_WAKAGI_2:
.ascii "SOUGEN_01_WAKAGI_2\0\0"
ENUM_12AED0_SOUGEN_01_WAKAGI_1:
.ascii "SOUGEN_01_WAKAGI_1\0\0"
ENUM_12AED0_SOUGEN_01_WAKAGI_0:
.ascii "SOUGEN_01_WAKAGI_0\0\0"
ENUM_12AED0_HAKA_KEY_GET:
.ascii "HAKA_KEY_GET\0\0\0\0"
ENUM_12AED0_HAKA_01_T0:
.ascii "HAKA_01_T0\0\0"
ENUM_12AED0_HAKA_00_BW00:
.ascii "HAKA_00_BW00\0\0\0\0"
ENUM_12AED0_HAKA_00_CAP_0:
.ascii "HAKA_00_CAP_0\0\0\0"
ENUM_12AED0_HAKA_BOSEKI_02:
.ascii "HAKA_BOSEKI_02\0\0"
ENUM_12AED0_HAKA_BOSEKI_01:
.ascii "HAKA_BOSEKI_01\0\0"
ENUM_12AED0_HAKA_BOSEKI_00:
.ascii "HAKA_BOSEKI_00\0\0"
ENUM_12AED0_HAKA_BUNSHIN_00:
.ascii "HAKA_BUNSHIN_00\0"
ENUM_12AED0_YAMA_04_BOMBWALL0:
.ascii "YAMA_04_BOMBWALL0\0\0\0"
ENUM_12AED0_YAMA_04_ANAHOUSHI:
.ascii "YAMA_04_ANAHOUSHI\0\0\0"
ENUM_12AED0_YAMA_04_ENTHOUSHI:
.ascii "YAMA_04_ENTHOUSHI\0\0\0"
ENUM_12AED0_YAMA_04_06:
.ascii "YAMA_04_06\0\0"
ENUM_12AED0_YAMA_04_05:
.ascii "YAMA_04_05\0\0"
ENUM_12AED0_YAMA_04_04:
.ascii "YAMA_04_04\0\0"
ENUM_12AED0_YAMA_04_01:
.ascii "YAMA_04_01\0\0"
ENUM_12AED0_YAMA_04_00:
.ascii "YAMA_04_00\0\0"
ENUM_12AED0_YAMA_04_HIBI_1:
.ascii "YAMA_04_HIBI_1\0\0"
ENUM_12AED0_YAMA_04_HIBI_0:
.ascii "YAMA_04_HIBI_0\0\0"
ENUM_12AED0_YAMA_04_R00:
.ascii "YAMA_04_R00\0"
ENUM_12AED0_YAMA_04_CAP_0:
.ascii "YAMA_04_CAP_0\0\0\0"
ENUM_12AED0_YAMA_03_DOKU_2:
.ascii "YAMA_03_DOKU_2\0\0"
ENUM_12AED0_YAMA_03_DOKU_1:
.ascii "YAMA_03_DOKU_1\0\0"
ENUM_12AED0_YAMA_03_DOKU_0:
.ascii "YAMA_03_DOKU_0\0\0"
ENUM_12AED0_YAMA_03_02:
.ascii "YAMA_03_02\0\0"
ENUM_12AED0_YAMA_03_01:
.ascii "YAMA_03_01\0\0"
ENUM_12AED0_YAMA_03_00:
.ascii "YAMA_03_00\0\0"
ENUM_12AED0_YAMA_02_00:
.ascii "YAMA_02_00\0\0"
ENUM_12AED0_YAMA_01_BW00:
.ascii "YAMA_01_BW00\0\0\0\0"
ENUM_12AED0_YAMA_00_01:
.ascii "YAMA_00_01\0\0"
ENUM_12AED0_YAMA_00_00:
.ascii "YAMA_00_00\0\0"
ENUM_12AED0_MORI_ENTRANCE_1ST:
.ascii "MORI_ENTRANCE_1ST\0\0\0"
ENUM_12AED0_MORI_00_H1:
.ascii "MORI_00_H1\0\0"
ENUM_12AED0_MORI_00_H0:
.ascii "MORI_00_H0\0\0"
ENUM_12AED0_MORI_00_KOBITO:
.ascii "MORI_00_KOBITO\0\0"
ENUM_12AED0_MORI_00_HIBI_4:
.ascii "MORI_00_HIBI_4\0\0"
ENUM_12AED0_MORI_00_HIBI_3:
.ascii "MORI_00_HIBI_3\0\0"
ENUM_12AED0_MORI_00_HIBI_2:
.ascii "MORI_00_HIBI_2\0\0"
ENUM_12AED0_MORI_00_HIBI_1:
.ascii "MORI_00_HIBI_1\0\0"
ENUM_12AED0_MORI_00_HIBI_0:
.ascii "MORI_00_HIBI_0\0\0"
ENUM_12AED0_LOST_05_T1:
.ascii "LOST_05_T1\0\0"
ENUM_12AED0_LOST_05_T0:
.ascii "LOST_05_T0\0\0"
ENUM_12AED0_LOST_05_01:
.ascii "LOST_05_01\0\0"
ENUM_12AED0_LOST_05_00:
.ascii "LOST_05_00\0\0"
ENUM_12AED0_LOST_04_SIBA4:
.ascii "LOST_04_SIBA4\0\0\0"
ENUM_12AED0_LOST_04_SIBA3:
.ascii "LOST_04_SIBA3\0\0\0"
ENUM_12AED0_LOST_04_SIBA2:
.ascii "LOST_04_SIBA2\0\0\0"
ENUM_12AED0_LOST_04_SIBA1:
.ascii "LOST_04_SIBA1\0\0\0"
ENUM_12AED0_LOST_04_SIBA0:
.ascii "LOST_04_SIBA0\0\0\0"
ENUM_12AED0_LOST_04_00:
.ascii "LOST_04_00\0\0"
ENUM_12AED0_LOST_03_T0:
.ascii "LOST_03_T0\0\0"
ENUM_12AED0_LOST_03_00:
.ascii "LOST_03_00\0\0"
ENUM_12AED0_LOST_02_00:
.ascii "LOST_02_00\0\0"
ENUM_12AED0_LOST_00_01:
.ascii "LOST_00_01\0\0"
ENUM_12AED0_LOST_00_00:
.ascii "LOST_00_00\0\0"
ENUM_12AED0_LOST_00_ENTER:
.ascii "LOST_00_ENTER\0\0\0"
ENUM_12AED0_HIKYOU_00_M2:
.ascii "HIKYOU_00_M2\0\0\0\0"
ENUM_12AED0_HIKYOU_00_M1:
.ascii "HIKYOU_00_M1\0\0\0\0"
ENUM_12AED0_HIKYOU_00_M0:
.ascii "HIKYOU_00_M0\0\0\0\0"
ENUM_12AED0_HIKYOU_00_H00:
.ascii "HIKYOU_00_H00\0\0\0"
ENUM_12AED0_HIKYOU_00_BOSEKI:
.ascii "HIKYOU_00_BOSEKI\0\0\0\0"
ENUM_12AED0_HIKYOU_00_14:
.ascii "HIKYOU_00_14\0\0\0\0"
ENUM_12AED0_HIKYOU_00_SEKIZOU:
.ascii "HIKYOU_00_SEKIZOU\0\0\0"
ENUM_12AED0_HIKYOU_00_CAP_2:
.ascii "HIKYOU_00_CAP_2\0"
ENUM_12AED0_HIKYOU_00_CAP_1:
.ascii "HIKYOU_00_CAP_1\0"
ENUM_12AED0_HIKYOU_00_CAP_0:
.ascii "HIKYOU_00_CAP_0\0"
ENUM_12AED0_HIKYOU_00_04:
.ascii "HIKYOU_00_04\0\0\0\0"
ENUM_12AED0_HIKYOU_00_03:
.ascii "HIKYOU_00_03\0\0\0\0"
ENUM_12AED0_HIKYOU_00_02:
.ascii "HIKYOU_00_02\0\0\0\0"
ENUM_12AED0_HIKYOU_00_01:
.ascii "HIKYOU_00_01\0\0\0\0"
ENUM_12AED0_HIKYOU_00_00:
.ascii "HIKYOU_00_00\0\0\0\0"
ENUM_12AED0_NAKANIWA_00_EZERO:
.ascii "NAKANIWA_00_EZERO\0\0\0"
ENUM_12AED0_MAENIWA_00_CAP_0:
.ascii "MAENIWA_00_CAP_0\0\0\0\0"
ENUM_12AED0_MAENIWA_00_T1:
.ascii "MAENIWA_00_T1\0\0\0"
ENUM_12AED0_MAENIWA_00_T0:
.ascii "MAENIWA_00_T0\0\0\0"
ENUM_12AED0_MAENIWA_00_WARP:
.ascii "MAENIWA_00_WARP\0"
ENUM_12AED0_MAENIWA_00_BENT:
.ascii "MAENIWA_00_BENT\0"
ENUM_12AED0_MAENIWA_00_02:
.ascii "MAENIWA_00_02\0\0\0"
ENUM_12AED0_MAENIWA_00_01:
.ascii "MAENIWA_00_01\0\0\0"
ENUM_12AED0_MAENIWA_00_00:
.ascii "MAENIWA_00_00\0\0\0"
ENUM_12AED0_HIKYOU_00_T1:
.ascii "HIKYOU_00_T1\0\0\0\0"
ENUM_12AED0_HIKYOU_00_T0:
.ascii "HIKYOU_00_T0\0\0\0\0"
ENUM_12AED0_MIZUUMI_00_H02:
.ascii "MIZUUMI_00_H02\0\0"
ENUM_12AED0_MIZUUMI_00_H01:
.ascii "MIZUUMI_00_H01\0\0"
ENUM_12AED0_MIZUUMI_00_H00:
.ascii "MIZUUMI_00_H00\0\0"
ENUM_12AED0_MIZUUMI_00_00:
.ascii "MIZUUMI_00_00\0\0\0"
ENUM_12AED0_MIZUUMI_00_BENT:
.ascii "MIZUUMI_00_BENT\0"
ENUM_12AED0_LV5_CLEAR_MES:
.ascii "LV5_CLEAR_MES\0\0\0"
ENUM_12AED0_LV4_CLEAR_MES:
.ascii "LV4_CLEAR_MES\0\0\0"
ENUM_12AED0_LV3_CLEAR_MES:
.ascii "LV3_CLEAR_MES\0\0\0"
ENUM_12AED0_LV2_CLEAR_MES:
.ascii "LV2_CLEAR_MES\0\0\0"
ENUM_12AED0_LV1_CLEAR_MES:
.ascii "LV1_CLEAR_MES\0\0\0"
.else
.4byte gUnk_0812B204
.4byte gUnk_0812C5F0
.4byte gUnk_0812C5E0
@@ -462,6 +1224,7 @@ gUnk_0812B204:: @ 0812B204
.4byte gUnk_0812C580
.4byte gUnk_0812C570
.4byte gUnk_0812C560
@.4byte 0000
.4byte gUnk_0812C54C
.4byte gUnk_0812C53C
.4byte gUnk_0812C52C
@@ -701,11 +1464,14 @@ gUnk_0812B204:: @ 0812B204
.4byte gUnk_0812B638
.4byte gUnk_0812B624
.4byte gUnk_0812B61C
.ifndef JP
.4byte gUnk_0812B614
.4byte gUnk_0812B60C
.4byte gUnk_0812B604
.4byte gUnk_0812AC84
.endif
.ifndef JP
gUnk_0812B604:: @ 0812B604
.incbin "baserom.gba", 0x12B604, 0x0000008
@@ -717,6 +1483,13 @@ gUnk_0812B614:: @ 0812B614
gUnk_0812B61C:: @ 0812B61C
.incbin "baserom.gba", 0x12B61C, 0x0000008
.else
gUnk_0812B61C::
.space 0x3c
.endif
gUnk_0812B624:: @ 0812B624
.incbin "baserom.gba", 0x12B624, 0x0000014
@@ -1470,6 +2243,7 @@ gUnk_0812C5E0:: @ 0812C5E0
gUnk_0812C5F0:: @ 0812C5F0
.incbin "baserom.gba", 0x12C5F0, 0x0000010
.endif
.4byte gUnk_0812B204
.4byte gUnk_0812D688
@@ -1678,13 +2452,16 @@ gUnk_0812C5F0:: @ 0812C5F0
.4byte gUnk_0812C99C
.4byte gUnk_0812C98C
.4byte gUnk_0812C97C
.ifndef JP
.4byte gUnk_0812C974
.4byte gUnk_0812C96C
.4byte gUnk_0812C964
.4byte gUnk_0812C95C
.4byte gUnk_0812C954
.endif
.4byte gUnk_0812AC84
.ifndef JP
gUnk_0812C954:: @ 0812C954
.incbin "baserom.gba", 0x12C954, 0x0000008
@@ -1699,6 +2476,7 @@ gUnk_0812C96C:: @ 0812C96C
gUnk_0812C974:: @ 0812C974
.incbin "baserom.gba", 0x12C974, 0x0000008
.endif
gUnk_0812C97C:: @ 0812C97C
.incbin "baserom.gba", 0x12C97C, 0x0000010
@@ -2516,12 +3294,19 @@ gUnk_0812D688:: @ 0812D688
.4byte gUnk_0812DA04
.4byte gUnk_0812D9F4
.4byte gUnk_0812D9E8
.ifdef JP
.4byte gUnk_0812D9D0
.else
.4byte gUnk_0812D9D0
.4byte gUnk_0812D9C8
.endif
.4byte gUnk_0812AC84
.ifndef JP
gUnk_0812D9C8:: @ 0812D9C8
.incbin "baserom.gba", 0x12D9C8, 0x0000008
.endif
gUnk_0812D9D0:: @ 0812D9D0
.incbin "baserom.gba", 0x12D9D0, 0x0000018
@@ -3258,14 +4043,17 @@ gUnk_0812E5FC:: @ 0812E5FC
.4byte gUnk_0812E8A4
.4byte gUnk_0812E88C
.4byte gUnk_0812E874
.ifndef JP
.4byte gUnk_0812E86C
.4byte gUnk_0812E864
.4byte gUnk_0812E85C
.4byte gUnk_0812E854
.4byte gUnk_0812E84C
.4byte gUnk_0812E844
.endif
.4byte gUnk_0812AC84
.ifndef JP
gUnk_0812E844:: @ 0812E844
.incbin "baserom.gba", 0x12E844, 0x0000008
@@ -3280,13 +4068,14 @@ gUnk_0812E85C:: @ 0812E85C
gUnk_0812E864:: @ 0812E864
.incbin "baserom.gba", 0x12E864, 0x0000008
gUnk_0812E86C:: @ 0812E86C
.incbin "baserom.gba", 0x12E86C, 0x0000008
.endif
gUnk_0812E874:: @ 0812E874
.incbin "baserom.gba", 0x12E874, 0x0000018
gUnk_0812E88C:: @ 0812E88C
.incbin "baserom.gba", 0x12E88C, 0x0000018
@@ -3781,11 +4570,15 @@ gUnk_0812F494:: @ 0812F494
.4byte gUnk_0812F630
.4byte gUnk_0812F624
.4byte gUnk_0812F614
.ifndef JP
.4byte gUnk_0812F604
.endif
.4byte gUnk_0812AC84
.ifndef JP
gUnk_0812F604:: @ 0812F604
.incbin "baserom.gba", 0x12F604, 0x0000010
.endif
gUnk_0812F614:: @ 0812F614
.incbin "baserom.gba", 0x12F614, 0x0000010
data/data_081320FC.s
+4
View File
@@ -30,7 +30,11 @@ gUnk_0813210C:: @ 0813210C
.incbin "baserom.gba", 0x1321B4, 0x000000C
.4byte gUnk_080FD150
.incbin "baserom.gba", 0x1321C4, 0x000000C
.ifdef JP
.4byte gUnk_080FD150
.else
.4byte gUnk_080FD180
.endif
.incbin "baserom.gba", 0x1321D4, 0x000000C
.4byte gUnk_080FD150
.incbin "baserom.gba", 0x1321E4, 0x000000C
data/data_08132B30.s
+13
View File
@@ -2617,7 +2617,12 @@ gUnk_0813ABE4:: @ 0813ABE4
.incbin "baserom.gba", 0x13ABE4, 0x0000014
gUnk_0813ABF8:: @ 0813ABF8
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x13A824, 0x0000014
.else
.incbin "baserom.gba", 0x13ABF8, 0x0000014
.endif
gUnk_0813AC0C:: @ 0813AC0C
.incbin "baserom.gba", 0x13AC0C, 0x0000014
@@ -10874,6 +10879,11 @@ gUnk_08544301:: @ 08544301
gUnk_08545666:: @ 08545666
.incbin "baserom.gba", 0x545666, 0x0000F00
@ TODO JP differs from here
.ifdef JP
.incbin "baserom_jp.gba", 0x546192, 0x5C98E
.else
gUnk_08546566:: @ 08546566
.incbin "baserom.gba", 0x546566, 0x00019E4
@@ -11174,6 +11184,9 @@ gUnk_085A0464:: @ 085A0464
gUnk_085A0806:: @ 085A0806
.incbin "baserom.gba", 0x5A0806, 0x000267A
.endif
@ TODO JP differs to here
gGlobalGfxAndPalettes:: @ 085A2E80
.incbin "baserom.gba", 0x5A2E80, 0x0001382
data/map_headers.s
+804
View File
File diff suppressed because it is too large Load Diff
data/metatile_headers.s
+70
View File
@@ -269,62 +269,132 @@ gAreaMetatiles_PalaceOfWinds:: @ 08102EA4
metatile_types_top 0x220C54, 0xD88, 1, 1
gAreaMetatiles_PalaceOfWindsBoss:: @ 08102ED4
.ifdef JP
metatiles_top 0x223680, 0x108, 1
metatile_types_top 0x2236C8, 0x42, 1, 1
.else
metatiles_top 0x22360C, 0x108, 1
metatile_types_top 0x223654, 0x42, 1, 1
.endif
gAreaMetatiles_Sanctuary:: @ 08102EEC
.ifdef JP
metatiles_bottom 0x233418, 0x3620, 1
metatiles_top 0x235320, 0x3620, 1
metatile_types_bottom 0x236424, 0xD88, 1
metatile_types_top 0x236788, 0xD88, 1, 1
.else
metatiles_bottom 0x2333A4, 0x3620, 1
metatiles_top 0x2352AC, 0x3620, 1
metatile_types_bottom 0x2363B0, 0xD88, 1
metatile_types_top 0x236714, 0xD88, 1, 1
.endif
gAreaMetatiles_HyruleCastle:: @ 08102F1C
.ifdef JP
metatiles_bottom 0x23D224, 0x37C0, 1
metatiles_top 0x23EF98, 0x3610, 1
metatile_types_bottom 0x240440, 0xDF0, 1
metatile_types_top 0x24086C, 0xD84, 1, 1
.else
metatiles_bottom 0x23D1B0, 0x37C0, 1
metatiles_top 0x23EF24, 0x3610, 1
metatile_types_bottom 0x2403CC, 0xDF0, 1
metatile_types_top 0x2407F8, 0xD84, 1, 1
.endif
gAreaMetatiles_SanctuaryEntrance:: @ 08102F4C
.ifdef JP
metatiles_bottom 0x246158, 0x1478, 1
metatiles_top 0x246CAC, 0xFF0, 1
metatile_types_bottom 0x24702C, 0x51E, 1
metatile_types_top 0x24719C, 0x3FC, 1, 1
.else
metatiles_bottom 0x2460E4, 0x1478, 1
metatiles_top 0x246C38, 0xFF0, 1
metatile_types_bottom 0x246FB8, 0x51E, 1
metatile_types_top 0x247128, 0x3FC, 1, 1
.endif
gAreaMetatiles_DarkHyruleCastle:: @ 08102F7C
.ifdef JP
metatiles_bottom 0x24D940, 0x3FD8, 1
metatiles_top 0x250680, 0x37C0, 1
metatile_types_bottom 0x2524F4, 0xFF6, 1
metatile_types_top 0x252A7C, 0xDF0, 1, 1
.else
metatiles_bottom 0x24D8CC, 0x3FD8, 1
metatiles_top 0x25060C, 0x37C0, 1
metatile_types_bottom 0x252480, 0xFF6, 1
metatile_types_top 0x252A08, 0xDF0, 1, 1
.endif
gAreaMetatiles_DarkHyruleCastleOutside:: @ 08102FAC
.ifdef JP
metatiles_bottom 0x273EE8, 0x3340, 1
metatiles_top 0x27540C, 0x1EF0, 1
metatile_types_bottom 0x276048, 0xCD0, 1
metatile_types_top 0x276324, 0x7BC, 1, 1
.else
metatiles_bottom 0x273E74, 0x3340, 1
metatiles_top 0x275398, 0x1EF0, 1
metatile_types_bottom 0x275FD4, 0xCD0, 1
metatile_types_top 0x2762B0, 0x7BC, 1, 1
.endif
gAreaMetatiles_DarkHyruleCastleBridge:: @ 08102FDC
.ifdef JP
metatiles_bottom 0x256688, 0x3610, 1
metatiles_top 0x257468, 0x3610, 1
metatile_types_bottom 0x257D78, 0xD84, 1
metatile_types_top 0x257FEC, 0xD84, 1, 1
.else
metatiles_bottom 0x256614, 0x3610, 1
metatiles_top 0x2573F4, 0x3610, 1
metatile_types_bottom 0x257D04, 0xD84, 1
metatile_types_top 0x257F78, 0xD84, 1, 1
.endif
gAreaMetatiles_VaatisArms:: @ 0810300C
.ifdef JP
metatiles_bottom 0x263D70, 0x17C8, 1
metatiles_top 0x264A38, 0xBC0, 1
metatile_types_bottom 0x264DBC, 0x5F2, 1
metatile_types_top 0x264EC0, 0x2F0, 1, 1
.else
metatiles_bottom 0x263CFC, 0x17C8, 1
metatiles_top 0x2649C4, 0xBC0, 1
metatile_types_bottom 0x264D48, 0x5F2, 1
metatile_types_top 0x264E4C, 0x2F0, 1, 1
.endif
gAreaMetatiles_Vaati3:: @ 0810303C
.ifdef JP
metatiles_bottom 0x25C730, 0xE80, 1
metatiles_top 0x25CDE8, 0x9B8, 1
metatile_types_bottom 0x25CFC4, 0x3A0, 1
metatile_types_top 0x25D098, 0x26E, 1, 1
.else
metatiles_bottom 0x25C6BC, 0xE80, 1
metatiles_top 0x25CD74, 0x9B8, 1
metatile_types_bottom 0x25CF50, 0x3A0, 1
metatile_types_top 0x25D024, 0x26E, 1, 1
.endif
gAreaMetatiles_Vaati2:: @ 0810306C
.ifdef JP
metatiles_bottom 0x260864, 0x850, 1
metatiles_top 0x260C90, 0x298, 1
metatile_types_bottom 0x260D30, 0x214, 1
metatile_types_top 0x260DAC, 0xA6, 1, 1
.else
metatiles_bottom 0x2607F0, 0x850, 1
metatiles_top 0x260C1C, 0x298, 1
metatile_types_bottom 0x260CBC, 0x214, 1
metatile_types_top 0x260D38, 0xA6, 1, 1
.endif
gAreaMetatiles:: @ 0810309C
.4byte gAreaMetatiles_MinishWoods @ 0x0
data/scripts/script_0800939A.inc
+13
View File
@@ -1,5 +1,9 @@
SCRIPT_START script_0800939A
.ifdef JP
CheckLocalFlag 0x00ac
.else
CheckLocalFlag 0x00ae
.endif
JumpIf script_0800943E
CheckInventory1 0x000d
JumpIf script_080093BC
@@ -18,7 +22,11 @@ script_080093BC:
Jump script_08009376
script_080093DA:
SetIntVariable 0x00001d05
.ifdef JP
CheckLocalFlag 0x00ab
.else
CheckLocalFlag 0x00ad
.endif
JumpIf script_080093EE
SetIntVariable 0x00001d04
script_080093EE:
@@ -35,8 +43,13 @@ script_080093EE:
Wait 0x00b4
Call sub_0806D70C
Wait 0x0078
.ifdef JP
SetLocalFlag 0x00ac
SetLocalFlag 0x00ab
.else
SetLocalFlag 0x00ae
SetLocalFlag 0x00ad
.endif
Call sub_0806D5D4
_0807EB8C
TextboxNoOverlap 0x1d09
data/scripts/script_08009464.inc
+4
View File
@@ -5,7 +5,11 @@ SCRIPT_START script_08009464
Wait 0x003c
Call sub_0806D70C
Wait 0x003c
.ifdef JP
ClearLocalFlag 0x00ac
.else
ClearLocalFlag 0x00ae
.endif
Call sub_0806D620
Wait 0x003c
WaitPlayerAction8
data/scripts/script_080098D4.inc
+9 -1
View File
@@ -7,9 +7,17 @@ script_080098D8:
script_080098E0:
CheckInventory1 0x003c
JumpIfNot script_080098E0
CheckLocalFlag 0x005d
.ifdef JP
CheckLocalFlag 0x5b
.else
CheckLocalFlag 0x5d
.endif
JumpIf script_08009910
.ifdef JP
SetLocalFlag 0x005b
.else
SetLocalFlag 0x005d
.endif
_0807E864
Call sub_0807F9A4
Call sub_0807DF28
data/scripts/script_08009E88.inc
+4
View File
@@ -2,7 +2,11 @@ SCRIPT_START script_08009E88
BeginBlock
Call sub_0807DF28
_0807E864
.ifdef JP
SetLocalFlag 0x009e
.else
SetLocalFlag 0x009f
.endif
EndBlock
Wait 0x003c
_0807E778 0x0004
data/scripts/script_0800B200.inc
+8
View File
@@ -1,7 +1,11 @@
SCRIPT_START script_0800B200
BeginBlock
_0807E5F8 0x00000000
.ifdef JP
CheckLocalFlag 0x001e
.else
CheckLocalFlag 0x001d
.endif
JumpIf script_0800B252
SetEntitySpeed 0x00c0
EndBlock
@@ -18,7 +22,11 @@ script_0800B216:
CameraTargetPlayer
Wait 0x0008
_0807E878
.ifdef JP
CheckLocalFlag 0x001e
.else
CheckLocalFlag 0x001d
.endif
JumpIfNot script_0800B216
script_0800B252:
SCRIPT_END
data/scripts/script_0800B308.inc
+8
View File
@@ -1,6 +1,10 @@
SCRIPT_START script_0800B308
BeginBlock
.ifdef JP
CheckLocalFlag 0x001e
.else
CheckLocalFlag 0x001d
.endif
JumpIf script_0800B39C
DoPostScriptAction 0x0001
SetEntitySpeed 0x0040
@@ -36,7 +40,11 @@ script_0800B350:
CheckKinstoneFused 0x0008
JumpIfNot script_0800B350
EndBlock
.ifdef JP
SetLocalFlag 0x001e
.else
SetLocalFlag 0x001d
.endif
PlaySound SFX_SECRET
script_0800B39C:
DoPostScriptAction 0x0006
data/scripts/script_0800D6D0.inc
+8
View File
@@ -1,11 +1,19 @@
SCRIPT_START script_0800D6D0
BeginBlock
.ifdef JP
CheckLocalFlag 0x00f0
.else
CheckLocalFlag 0x00f3
.endif
JumpIf script_0800D6E8
DoPostScriptAction 0x0008
EndBlock
script_0800D6E0:
.ifdef JP
CheckLocalFlag 0x00f0
.else
CheckLocalFlag 0x00f3
.endif
JumpIfNot script_0800D6E0
script_0800D6E8:
DoPostScriptAction 0x0007
data/scripts/script_0800D6F0.inc
+8
View File
@@ -1,11 +1,19 @@
SCRIPT_START script_0800D6F0
BeginBlock
.ifdef JP
CheckLocalFlag 0x00f2
.else
CheckLocalFlag 0x00f5
.endif
JumpIf script_0800D6E8
DoPostScriptAction 0x0008
EndBlock
script_0800D700:
.ifdef JP
CheckLocalFlag 0x00f2
.else
CheckLocalFlag 0x00f5
.endif
JumpIfNot script_0800D700
DoPostScriptAction 0x0007
SCRIPT_END
data/scripts/script_0800E0BC.inc
+11 -1
View File
@@ -301,10 +301,17 @@ SCRIPT_START script_0800E4A4
CheckLocalFlag 0x007c
JumpIf script_0800E4FA
script_0800E4B6:
.ifdef JP
CheckPlayerInRegion 0x0088, 0x0100, 0x0820
.else
CheckPlayerInRegion 0x0088, 0x00f8, 0x0820
.endif
JumpIfNot script_0800E4B6
BeginBlock
_0807E864
_0807E864
.ifdef JP
Call sub_0805E544
.endif
EndBlock
Call sub_0807F3F8
Wait 0x003c
@@ -320,6 +327,9 @@ script_0800E4B6:
BeginBlock
PlayBgm BGM_FIGHT_THEME2
SetLocalFlag 0x007c
.ifdef JP
Call UnfreezeTime
.endif
script_0800E4FA:
_0807E878
DoPostScriptAction 0x0006
data/scripts/script_0800F554.inc
+10
View File
@@ -105,6 +105,8 @@ script_0800F662:
DoPostScriptAction 0x0000
Jump script_0800F662
.2byte 0x0000
SCRIPT_START script_0800F688
BeginBlock
_0807EB44 0x0004
@@ -119,7 +121,11 @@ script_0800F6A0:
_0807E864
_0807EB74
CallWithArg sub_0807F3D8, 0x00000004
.ifdef JP
CheckLocalFlag 0x00ca
.else
CheckLocalFlag 0x00cd
.endif
JumpIf script_0800F6C4
TextboxNoOverlap 0x2512
Jump script_0800F6C8
@@ -140,7 +146,11 @@ SCRIPT_START script_0800F6E0
Call sub_08062788
EndBlock
script_0800F6F4:
.ifdef JP
CheckLocalFlag 0x00ca
.else
CheckLocalFlag 0x00cd
.endif
JumpIf script_0800F718
CheckEntityInteractType
JumpIfNot script_0800F6F4
data/scripts/script_0800F724.inc
+14
View File
@@ -3,12 +3,22 @@ SCRIPT_START script_0800F724
DoPostScriptAction 0x0008
EndBlock
script_0800F72C:
.ifdef JP
CheckLocalFlag 0x00ca
.else
CheckLocalFlag 0x00cd
.endif
JumpIfNot script_0800F72C
DoPostScriptAction 0x0007
Jump script_0800F584
SCRIPT_START script_0800F73C
.ifdef JP
CheckLocalFlag 0x00ca
.else
CheckLocalFlag 0x00cd
.endif
JumpIf script_0800FA4C
_0807E864
Call sub_0807DF28
@@ -168,7 +178,11 @@ SCRIPT_START script_0800F73C
Wait 0x000a
_0807E5F8 0x00000002
Call sub_08063C44
.ifdef JP
SetLocalFlag 0x00ca
.else
SetLocalFlag 0x00cd
.endif
Call sub_0807DF50
_0807E878
script_0800FA4C:
data/scripts/script_0800FD0C.inc
+8
View File
@@ -1,11 +1,19 @@
SCRIPT_START script_0800FD0C
.ifdef JP
CheckLocalFlag 0x00ca
.else
CheckLocalFlag 0x00cd
.endif
JumpIf script_0800FD50
WaitForSomething2 0x00000010
script_0800FD1A:
CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040
JumpIfNot script_0800FD1A
.ifdef JP
CheckLocalFlag 0x00ca
.else
CheckLocalFlag 0x00cd
.endif
JumpIf script_0800FD5C
_0807E864
Call sub_0807F9A4
data/scripts/script_0800FF74.inc
+24
View File
@@ -4,17 +4,29 @@ SCRIPT_START script_0800FF74
_0807E9D4
CallWithArg sub_0807F3D8, 0x00000008
Call sub_080644A4
.ifdef JP
ClearLocalFlag 0x00c4
.else
ClearLocalFlag 0x00c7
.endif
EndBlock
script_0800FF92:
EndBlock
BeginBlock
DoPostScriptAction 0x000a
.ifdef JP
CheckLocalFlag 0x00cb
.else
CheckLocalFlag 0x00ce
.endif
JumpIf script_0800FFCC
DoPostScriptAction 0x000b
Call sub_08064198
.ifdef JP
CheckLocalFlag 0x00c4
.else
CheckLocalFlag 0x00c7
.endif
JumpIfNot script_0800FFCC
Call sub_08064488
CheckPlayerInRegion2 0x4040
@@ -25,7 +37,11 @@ script_0800FFCC:
CheckEntityInteractType
JumpIfNot script_0800FF92
EndBlock
.ifdef JP
SetLocalFlag 0x00c4
.else
SetLocalFlag 0x00c7
.endif
_0807E864
_0807EB74
CallWithArg sub_0807F3D8, 0x00000008
@@ -35,7 +51,11 @@ script_0800FFCC:
_0807EA94
Jump script_08010060
script_0800FFF8:
.ifdef JP
CheckLocalFlag 0x00cb
.else
CheckLocalFlag 0x00ce
.endif
JumpIfNot script_0801000A
TextboxNoOverlap 0x340b
_0807EA94
@@ -60,7 +80,11 @@ script_08010014:
_0807EDD4 0x0018, 0x0108
_0807EB44 0x0002
CallWithArg sub_0807F3D8, 0x00000008
.ifdef JP
SetLocalFlag 0x00cb
.else
SetLocalFlag 0x00ce
.endif
script_08010060:
Call sub_080644A4
CallWithArg sub_0807F5B0, 0x0000000a
data/scripts/script_08010264.inc
+2
View File
@@ -501,7 +501,9 @@ script_08010860:
TextboxNoOverlap 0x2c21
Jump script_080108B2
script_080108AA:
.ifndef JP
SetLocalFlag 0x00fa
.endif
TextboxNoOverlap 0x2c20
script_080108B2:
_0807EA94
data/scripts/script_08010964.inc
+6
View File
@@ -14,10 +14,16 @@ script_08010994:
Call sub_0807DF50
_0807E878
Jump script_08010964
SCRIPT_START script_080109A0
BeginBlock
EndBlock
.ifdef JP
CheckLocalFlag 0x00ce
.else
CheckLocalFlag 0x00d1
.endif
JumpIf script_080109EA
CheckPlayerInRegion2 0x0808
JumpIfNot script_080109A0
data/scripts/script_08011128.inc
+7
View File
@@ -2,6 +2,10 @@ SCRIPT_START script_08011128
BeginBlock
_0807EB44 0x0004
DoPostScriptAction 0x0000
.ifdef JP
_0807E9D4
DoPostScriptAction 0x000a
.endif
EndBlock
script_08011134:
CheckPlayerInRegion 0x01f8, 0x0048, 0x1040
@@ -35,3 +39,6 @@ script_08011134:
_0807E5F8 0x00000008
DoPostScriptAction 0x0006
SCRIPT_END
.ifdef JP
.2byte 0x0000
.endif
data/scripts/script_0801194C.inc
+5
View File
@@ -127,6 +127,7 @@ script_08011AC4:
_0807EA94
_0807E878
Jump script_08011AC4
SCRIPT_START script_08011AE4
CheckRoomFlag 0x000f
JumpIfNot script_08011AE4
@@ -136,7 +137,11 @@ SCRIPT_START script_08011AE4
script_08011AFA:
TextboxNoOverlapFollowPos 0x1321, 0x0007
_0807EA94
.ifdef JP
SetLocalFlag 0x0011
.else
SetLocalFlag 0x0010
.endif
CallWithArg sub_0806DA1C, 0x00000003
_0807E878
Call sub_0807DF50
data/scripts/script_08011C7C.inc
+18 -2
View File
@@ -360,8 +360,10 @@ script_08012070:
TextboxNoOverlap 0x3125
_0807EA94
_0807F034 0x0031
WaitPlayerAction8
WaitPlayerAction8
.ifndef JP
Call sub_0807FC24
.endif
Jump script_0801209E
script_0801209A:
TextboxNoOverlap 0x3127
@@ -371,7 +373,11 @@ script_0801209E:
_0807EB44 0x0004
DoPostScriptAction 0x0001
Jump script_0801203A
.ifndef JP
.2byte 0x0000
.endif
SCRIPT_START script_080120B0
BeginBlock
Call sub_08064928
@@ -407,8 +413,10 @@ script_080120FC:
TextboxNoOverlap 0x3119
_0807EA94
_0807F034 0x002f
WaitPlayerAction8
WaitPlayerAction8
.ifndef JP
Call sub_0807FC24
.endif
Jump script_0801212A
script_08012126:
TextboxNoOverlap 0x311b
@@ -418,7 +426,10 @@ script_0801212A:
_0807EB44 0x0004
DoPostScriptAction 0x0001
Jump script_080120C6
.ifndef JP
.2byte 0x0000
.endif
SCRIPT_START script_0801213C
BeginBlock
Call sub_08064A28
@@ -455,7 +466,9 @@ script_08012188:
_0807EA94
_0807F034 0x0030
WaitPlayerAction8
.ifndef JP
Call sub_0807FC24
.endif
Jump script_080121B6
script_080121B2:
TextboxNoOverlap 0x3121
@@ -465,7 +478,10 @@ script_080121B6:
_0807EB44 0x0004
DoPostScriptAction 0x0001
Jump script_08012152
.ifndef JP
.2byte 0x0000
.endif
SCRIPT_START script_080121C8
BeginBlock
Call sub_08064828
data/scripts/script_08012430.inc
+2
View File
@@ -18,7 +18,9 @@ script_08012440:
SetLocalFlag 0x00b3
_0807F034 0x0062
WaitPlayerAction8
.ifndef JP
SetLocalFlag 0x00d0
.endif
script_08012474:
_0807E878
_0807E930 0x0000
data/scripts/script_08012C68.inc
+5
View File
@@ -15,6 +15,7 @@ script_08012C7E:
SetGlobalFlag 0x0022
_0807E878
Jump script_08012C7E
SCRIPT_START script_08012C98
CheckGlobalFlag 0x0014
JumpIfNot script_08012C98
@@ -30,7 +31,11 @@ script_08012CA0:
Call sub_0807DF28
_0807EB28 0x2202
_0807EA94
.ifdef JP
SetLocalFlag 0x003a
.else
SetLocalFlag 0x003b
.endif
Call sub_0807DF50
_0807E878
script_08012CD2:
data/scripts/script_08012CD8.inc
+4
View File
@@ -12,7 +12,11 @@ SCRIPT_START script_08012CD8
EndBlock
_0807EB28 0x2203
_0807EA94
.ifdef JP
SetLocalFlag 0x003d
.else
SetLocalFlag 0x003e
.endif
Call sub_0807DF50
_0807E878
DoPostScriptAction 0x0006
data/scripts/script_08012D70.inc
+4
View File
@@ -8,7 +8,11 @@ SCRIPT_START script_08012D70
WaitForSomething2 0x00000001
_0807EB28 0x132d
_0807EA94
.ifdef JP
SetLocalFlag 0x0015
.else
SetLocalFlag 0x0014
.endif
Call sub_0807DF50
_0807E878
DoPostScriptAction 0x0006
data/scripts/script_08014450.inc
+7
View File
@@ -35,7 +35,9 @@ script_080144B8:
Jump script_080144C8
script_080144C0:
SetLocalFlag 0x0093
.ifndef JP
SetLocalFlag 0x00d3
.endif
script_080144C8:
ModRupees 0xfff6
TextboxNoOverlapFollow 0x420c
@@ -54,6 +56,11 @@ script_080144FC:
_0807E878
CheckRoomFlag 0x0000
JumpIfNot script_08014462
.ifndef JP
_0807E9DC
.endif
SCRIPT_END
.ifndef JP
.2byte 0x0000
.endif
data/scripts/script_080145E8.inc
+7
View File
@@ -17,6 +17,7 @@ script_08014608:
Call sub_0807DF50
_0807E878
Jump script_080145F8
SCRIPT_START script_08014628
BeginBlock
_0807E9D4
@@ -40,7 +41,11 @@ script_0801463A:
TextboxNoOverlapFollowPos 0x432b, 0x000c
Jump script_080147CE
script_08014672:
.ifdef JP
CheckPlayerInRegion 0x0078, 0x0078, 0x0810
.else
Call sub_08088658
.endif
JumpIfNot script_0801463A
_0807E864
_0807EB28 0x431f
@@ -144,4 +149,6 @@ script_080147CE:
Wait 0x0004
_0807E878
Jump script_0801463A
.ifndef JP
.2byte 0x0000
.endif
data/scripts/script_08014CDC.inc
+4
View File
@@ -53,7 +53,11 @@ script_08014D96:
TextboxNoOverlap 0x1014
_0807EA94
_0807EC64 0x0018
.ifdef JP
SetLocalFlag 0x006b
.else
SetLocalFlag 0x006d
.endif
Call sub_0807DF50
_0807E878
DoPostScriptAction 0x0006
data/scripts/script_08014E14.inc
+4
View File
@@ -239,7 +239,11 @@ script_08015104:
PlaySound SFX_SECRET
_0807F0B4 0x0004
CameraTargetPlayer
.ifdef JP
SetLocalFlag 0x008a
.else
SetLocalFlag 0x008c
.endif
_0807EB28 0x130c
_0807EA94
CameraTargetPlayer
data/scripts/script_080157AC.inc
+4
View File
@@ -63,7 +63,11 @@ script_08015888:
_0807EA94
_0807E5F8 0x00000001
WaitForSomething2 0x00000002
.ifdef JP
SetLocalFlag 0x0089
.else
SetLocalFlag 0x008b
.endif
Call sub_08066FB8
Call sub_0807DF50
_0807E878
data/scripts/script_08015B34.inc
+4
View File
@@ -1,7 +1,11 @@
SCRIPT_START script_08015B34
EndBlock
BeginBlock
.ifdef JP
CheckLocalFlag 0x0089
.else
CheckLocalFlag 0x008b
.endif
JumpIf script_08015B7E
CallWithArg sub_0807F6B4, 0x00000318
JumpIfNot script_08015B34
data/scripts/script_08015BA8.inc
+4
View File
@@ -1,6 +1,10 @@
SCRIPT_START script_08015BA8
BeginBlock
.ifdef JP
SetLocalFlag 0x008c
.else
SetLocalFlag 0x008e
.endif
_0807E864
MoveEntityToPlayer
CameraTargetEntity
data/scripts/script_08015BE8.inc
+4
View File
@@ -31,7 +31,11 @@ script_08015BF0:
PlayBGM
_0807EB28 0x131f
_0807EA94
.ifdef JP
SetLocalFlag 0x009b
.else
SetLocalFlag 0x009c
.endif
Call sub_0807FBCC
Call sub_0807DF50
_0807E878
data/scripts/script_08016384.inc
+4
View File
@@ -17,7 +17,11 @@ SCRIPT_START script_08016384
CheckInventory2 0x0001
HasRoomItemForSale
CheckLocalFlag 0x0067
.ifdef JP
CheckLocalFlagByOffset 0x0100, 0x0069
.else
CheckLocalFlagByOffset 0x0100, 0x006b
.endif
CheckGlobalFlag 0x0013
CheckRoomFlag 0x0000
CheckPlayerInRegion 0x0000, 0x0000, 0x0000
data/strings.s
+4
View File
@@ -5,4 +5,8 @@
.align 2
gUnk_089B1D90:: @ 089B1D90
.ifdef JP
.incbin "baserom_jp.gba", 0x9B1A30, 0x2BCC0
.else
.incbin "translations/USA.bin"
.endif
data/tileset_headers.s
+61
View File
@@ -868,89 +868,150 @@ gAreaTilesets_PalaceOfWinds:: @ 08102150
gAreaTileset_PalaceOfWindsBoss_0:: @ 08102154
tileset_tiles 0x22131C, 0x6000000, 0x4000, 1
tileset_tiles 0x222634, 0x6004000, 0x4000, 1
.ifdef JP
tileset_tiles 0x224510, 0x600F000, 0x800, 1
.else
tileset_tiles 0x22449C, 0x600F000, 0x800, 1
.endif
tileset_palette_set 162, 1
gAreaTilesets_PalaceOfWindsBoss:: @ 08102184
.4byte gAreaTileset_PalaceOfWindsBoss_0
gAreaTileset_Sanctuary_0:: @ 08102188
.ifdef JP
tileset_tiles 0x22E250, 0x6000000, 0x4000, 1
tileset_tiles 0x22FFA4, 0x6004000, 0x4000, 1
tileset_tiles 0x232028, 0x6008000, 0x4000, 1
.else
tileset_tiles 0x22E1DC, 0x6000000, 0x4000, 1
tileset_tiles 0x22FF30, 0x6004000, 0x4000, 1
tileset_tiles 0x231FB4, 0x6008000, 0x4000, 1
.endif
tileset_palette_set 57, 1
gAreaTilesets_Sanctuary:: @ 081021B8
.4byte gAreaTileset_Sanctuary_0
gAreaTileset_HyruleCastle_0:: @ 081021BC
.ifdef JP
tileset_tiles 0x2379C0, 0x6000000, 0x4000, 1
tileset_tiles 0x239B50, 0x6004000, 0x4000, 1
tileset_tiles 0x23B8C8, 0x6008000, 0x4000, 1
.else
tileset_tiles 0x23794C, 0x6000000, 0x4000, 1
tileset_tiles 0x239ADC, 0x6004000, 0x4000, 1
tileset_tiles 0x23B854, 0x6008000, 0x4000, 1
.endif
tileset_palette_set 58, 1
gAreaTilesets_HyruleCastle:: @ 081021EC
.4byte gAreaTileset_HyruleCastle_0
gAreaTileset_SanctuaryEntrance_0:: @ 081021F0
.ifdef JP
tileset_tiles 0x242430, 0x6000000, 0x4000, 1
tileset_tiles 0x243F6C, 0x6004000, 0x4000, 1
tileset_tiles 0x245558, 0x6008000, 0x4000, 1
.else
tileset_tiles 0x2423BC, 0x6000000, 0x4000, 1
tileset_tiles 0x243EF8, 0x6004000, 0x4000, 1
tileset_tiles 0x2454E4, 0x6008000, 0x4000, 1
.endif
tileset_palette_set 145, 1
gAreaTilesets_SanctuaryEntrance:: @ 08102220
.4byte gAreaTileset_SanctuaryEntrance_0
gAreaTileset_DarkHyruleCastle_0:: @ 08102224
.ifdef JP
tileset_tiles 0x247560, 0x6000000, 0x4000, 1
tileset_tiles 0x249734, 0x6004000, 0x4000, 1
tileset_tiles 0x24B99C, 0x6008000, 0x4000, 1
.else
tileset_tiles 0x2474EC, 0x6000000, 0x4000, 1
tileset_tiles 0x2496C0, 0x6004000, 0x4000, 1
tileset_tiles 0x24B928, 0x6008000, 0x4000, 1
.endif
tileset_palette_set 59, 1
gAreaTilesets_DarkHyruleCastle:: @ 08102254
.4byte gAreaTileset_DarkHyruleCastle_0
gAreaTileset_DarkHyruleCastleOutside_0:: @ 08102258
.ifdef JP
tileset_tiles 0x26E430, 0x6000000, 0x4000, 1
tileset_tiles 0x270420, 0x6004000, 0x4000, 1
tileset_tiles 0x2720A4, 0x6008000, 0x4000, 1
.else
tileset_tiles 0x26E3BC, 0x6000000, 0x4000, 1
tileset_tiles 0x2703AC, 0x6004000, 0x4000, 1
tileset_tiles 0x272030, 0x6008000, 0x4000, 1
.endif
tileset_palette_set 144, 1
gAreaTilesets_DarkHyruleCastleOutside:: @ 08102288
.4byte gAreaTileset_DarkHyruleCastleOutside_0
gAreaTileset_DarkHyruleCastleBridge_0:: @ 0810228C
.ifdef JP
tileset_tiles 0x252F6C, 0x6000000, 0x4000, 1
tileset_tiles 0x254090, 0x6004000, 0x4000, 1
tileset_tiles 0x2557CC, 0x6008000, 0x4000, 1
.else
tileset_tiles 0x252EF8, 0x6000000, 0x4000, 1
tileset_tiles 0x25401C, 0x6004000, 0x4000, 1
tileset_tiles 0x255758, 0x6008000, 0x4000, 1
.endif
tileset_palette_set 180, 1
gAreaTilesets_DarkHyruleCastleBridge:: @ 081022BC
.4byte gAreaTileset_DarkHyruleCastleBridge_0
gAreaTileset_VaatisArms_0:: @ 081022C0
.ifdef JP
tileset_tiles 0x260DFC, 0x6000000, 0x4000, 1
tileset_tiles 0x2625A4, 0x6004000, 0x4000, 1
tileset_tiles 0x262F78, 0x6008000, 0x4000, 1
.else
tileset_tiles 0x260D88, 0x6000000, 0x4000, 1
tileset_tiles 0x262530, 0x6004000, 0x4000, 1
tileset_tiles 0x262F04, 0x6008000, 0x4000, 1
.endif
tileset_palette_set 155, 1
gAreaTilesets_VaatisArms:: @ 081022F0
.4byte gAreaTileset_VaatisArms_0
gAreaTileset_Vaati3_0:: @ 081022F4
.ifdef JP
tileset_tiles 0x258204, 0x6000000, 0x4000, 1
tileset_tiles 0x259310, 0x6004000, 0x4000, 1
tileset_tiles 0x25A52C, 0x6008000, 0x4000, 1
.else
tileset_tiles 0x258190, 0x6000000, 0x4000, 1
tileset_tiles 0x25929C, 0x6004000, 0x4000, 1
tileset_tiles 0x25A4B8, 0x6008000, 0x4000, 1
.endif
tileset_palette_set 156, 1
gAreaTilesets_Vaati3:: @ 08102324
.4byte gAreaTileset_Vaati3_0
gAreaTileset_Vaati2_0:: @ 08102328
.ifdef JP
tileset_tiles 0x25D128, 0x6000000, 0x4000, 1
tileset_tiles 0x25DC08, 0x6004000, 0x4000, 1
tileset_tiles 0x25EE50, 0x6008000, 0x4000, 1
tileset_tiles 0x26E13C, 0x600F000, 0x800, 1
.else
tileset_tiles 0x25D0B4, 0x6000000, 0x4000, 1
tileset_tiles 0x25DB94, 0x6004000, 0x4000, 1
tileset_tiles 0x25EDDC, 0x6008000, 0x4000, 1
tileset_tiles 0x26E0C8, 0x600F000, 0x800, 1
.endif
tileset_palette_set 169, 1
gAreaTilesets_Vaati2:: @ 08102364
src/enemy/businessScrub.c
+2
View File
@@ -266,7 +266,9 @@ void sub_08028CE8(Entity* this) {
this->actionDelay = 4;
this->field_0x80.HALF.HI = 0;
sub_080290E0(this, 3);
#ifndef JP
SetLocalFlag(0x87);
#endif
return;
case 1:
CreateItemEntity(offer->field_0x8, offer->field_0x9, 0);
src/fileScreen.c
+1 -1
View File
@@ -413,7 +413,7 @@ void sub_08050940(void) {
keys &= ~(DPAD_UP | DPAD_DOWN);
}
num_rows = gUnk_02000000->gameLanguage > GAME_LANGUAGE ? NUM_SAVE_SLOTS + 1 : NUM_SAVE_SLOTS;
num_rows = gUnk_02000000->gameLanguage > 1 ? NUM_SAVE_SLOTS + 1 : NUM_SAVE_SLOTS;
mode = gUnk_02032EC0.lastState;
switch (keys) {
case DPAD_UP:
src/intro.c
+33
View File
@@ -192,11 +192,17 @@ static void HandleTitlescreen(void) {
}
break;
case 2:
#ifdef JP
if (GetAdvanceState()) {
#else
if (--gIntroState.timer == 0) {
#endif
gIntroState.timer = 3600;
gIntroState.state++;
}
#ifndef JP
UpdatePressStartIcon();
#endif
break;
default:
advance = GetAdvanceState();
@@ -209,7 +215,16 @@ static void HandleTitlescreen(void) {
AdvanceIntroSequence(advance);
SoundReq(SONG_VOL_FADE_OUT);
}
#ifdef JP
gOamCmd._4 = 0;
gOamCmd._6 = 0;
gOamCmd._8 = 0xE020;
gOamCmd.x = 120;
gOamCmd.y = 152;
sub_080ADA14(511, 1);
#else
UpdatePressStartIcon();
#endif
if ((gIntroState.timer & 0x20) == 0) {
gOamCmd._8 = 0xe000;
gOamCmd.y = 0x84;
@@ -225,6 +240,7 @@ static void HandleTitlescreen(void) {
sub_080AD9B0();
}
#ifndef JP
static void UpdatePressStartIcon(void) {
gOamCmd._4 = 0;
gOamCmd._6 = 0;
@@ -233,6 +249,7 @@ static void UpdatePressStartIcon(void) {
gOamCmd.y = 152;
sub_080ADA14(511, 1);
}
#endif
static void UpdateSwordBgAffineData(void) {
struct BgAffineSrcData aff;
@@ -269,7 +286,11 @@ static void HandleJapaneseTitlescreenAnimationIntro(void) {
if (!gFadeControl.active) {
gFadeControl.field_0x4 = -1;
gIntroState.subState++;
#ifdef JP
gIntroState.timer = 120;
#else
gIntroState.timer = 90;
#endif
pEVar2 = CreateObject(OBJECT_B4, 0, 0);
if (pEVar2 != NULL) {
pEVar2->x.HALF.HI = 0;
@@ -280,7 +301,11 @@ static void HandleJapaneseTitlescreenAnimationIntro(void) {
case 2:
if (GetAdvanceState() != ADVANCE_NONE) {
gIntroState.state++;
#ifdef JP
gIntroState.timer = 30;
#else
gIntroState.timer = 60;
#endif
}
}
}
@@ -306,7 +331,11 @@ static void HandleTitlescreenAnimationIntro(void) {
break;
case 2:
if (--gIntroState.timer == 0) {
#ifdef JP
gIntroState.timer = 360;
#else
gIntroState.timer = 300;
#endif
gIntroState.subState++;
CreateObject(OBJECT_BD, 0, 0);
DoFade(6, 16);
@@ -316,7 +345,11 @@ static void HandleTitlescreenAnimationIntro(void) {
default:
if (!gFadeControl.active && GetAdvanceState() != ADVANCE_NONE) {
gIntroState.state++;
#ifdef JP
gIntroState.timer = 30;
#else
gIntroState.timer = 60;
#endif
}
break;
}
src/manager/manager7.c
+2
View File
@@ -56,7 +56,9 @@ void Manager7_Main(Manager7* this) {
}
if (gRoomControls.unk2)
return;
#ifndef JP
tmp = this->unk_20;
#endif
tmp2 = &gUnk_081080A4[tmp << 4];
switch (this->manager.unk_0e) {
case 0:
src/npc/castleMaid.c
+8
View File
@@ -97,9 +97,17 @@ void sub_0806464C(Entity* this) {
s32 tmp;
if (CheckGlobalFlag(0x15) != 0) {
tmp = 2;
#ifdef JP
} else if (CheckLocalFlag(0x9f) == 0) {
#else
} else if (CheckLocalFlag(0xa0) == 0) {
#endif
tmp = 0;
#ifdef JP
SetLocalFlag(0x9f);
#else
SetLocalFlag(0xa0);
#endif
} else {
tmp = 1;
}
src/npc/castorWildsStatue.c
+4
View File
@@ -58,7 +58,11 @@ void sub_08067418(Entity* this) {
this->spriteOrientation.flipY = 1;
this->spriteRendering.b3 = 1;
this->spritePriority.b0 = 2;
#ifdef JP
if (CheckLocalFlag(0x1e) == 0) {
#else
if (CheckLocalFlag(0x1d) == 0) {
#endif
SetTile(0x4022, 0xe81, 1);
SetTile(0x4022, 0xe82, 1);
SetTile(0x4022, 0xe83, 1);
src/npc/dog.c
+28
View File
@@ -74,7 +74,11 @@ void sub_08069B44(Entity* this) {
if (((this->type == 0) && ((gPlayerState.flags.all & 0x80) == 0)) && (GetInventoryValue(0x36) != 2)) {
this->action = 4;
}
#ifdef JP
if ((this->type == 2) && (CheckLocalFlag(0xcc) == 0)) {
#else
if ((this->type == 2) && (CheckLocalFlag(0xcf) == 0)) {
#endif
SetTile(0x4072, TILE(this->x.HALF.HI, this->y.HALF.HI - 8), this->collisionLayer);
}
}
@@ -258,7 +262,11 @@ void sub_08069F6C(Entity* this) {
}
u32 sub_08069F90(Entity* this) {
#ifdef JP
if ((this->type == 2) && (CheckLocalFlag(0xcc) == 0)) {
#else
if ((this->type == 2) && (CheckLocalFlag(0xcf) == 0)) {
#endif
return 1;
} else {
return sub_080041A0(this, &gPlayerEntity, 0x14, 0x14);
@@ -312,19 +320,39 @@ void sub_0806A0A4(Entity* this) {
if ((gPlayerState.flags.all & 0x80) != 0) {
dialog = 4;
#ifdef JP
if (CheckLocalFlag(0xcc) == 0) {
#else
if (CheckLocalFlag(0xcf) == 0) {
#endif
dialog = 3;
#ifdef JP
SetLocalFlag(0xcc);
#else
SetLocalFlag(0xcf);
#endif
sub_0807BA8C(TILE(this->x.HALF.HI, this->y.HALF.HI - 8), (u32)this->collisionLayer);
}
} else {
dialog = 2;
#ifdef JP
if (CheckLocalFlag(0xcc) == 0) {
#else
if (CheckLocalFlag(0xcf) == 0) {
#endif
dialog = 1;
#ifdef JP
if (CheckLocalFlag(0xd8) == 0) {
#else
if (CheckLocalFlag(0xdb) == 0) {
#endif
dialog = 0;
#ifdef JP
SetLocalFlag(0xd8);
#else
SetLocalFlag(0xdb);
#endif
}
}
}
src/npc/gina.c
+2
View File
@@ -29,7 +29,9 @@ void Gina(Entity* this) {
case 2:
if (UpdateFuseInteraction(this) != 0) {
this->action = 1;
#ifndef JP
SetLocalFlag(0x88);
#endif
}
break;
}
src/npc/npc4E.c
+26
View File
@@ -105,19 +105,39 @@ void sub_0806DAD0(Entity* this) {
void sub_0806DAE8(Entity* this) {
switch (this->type - 1) {
case 0:
#ifdef JP
SetLocalFlag(0xeb);
#else
SetLocalFlag(0xee);
#endif
break;
case 1:
#ifdef JP
SetLocalFlag(0xec);
#else
SetLocalFlag(0xef);
#endif
break;
case 2:
#ifdef JP
SetLocalFlag(0xed);
#else
SetLocalFlag(0xf0);
#endif
break;
case 3:
#ifdef JP
SetLocalFlag(0xee);
#else
SetLocalFlag(0xf1);
#endif
break;
case 4:
#ifdef JP
SetLocalFlag(0xef);
#else
SetLocalFlag(0xf2);
#endif
break;
}
@@ -127,8 +147,14 @@ void sub_0806DAE8(Entity* this) {
void sub_0806DB44(Entity* this, ScriptExecutionContext* context) {
context->condition = 0;
#ifdef JP
if (CheckLocalFlag(0xeb) != 0 && CheckLocalFlag(0xec) != 0 && CheckLocalFlag(0xed) != 0 &&
CheckLocalFlag(0xee) != 0 && CheckLocalFlag(0xef) != 0) {
#else
if (CheckLocalFlag(0xee) != 0 && CheckLocalFlag(0xef) != 0 && CheckLocalFlag(0xf0) != 0 &&
CheckLocalFlag(0xf1) != 0 && CheckLocalFlag(0xf2) != 0) {
#endif
context->condition = 1;
}
}
src/room.c
+123 -4
View File
@@ -566,9 +566,14 @@ void sub_0804BAC0(void) {
if (!CheckGlobalFlag(LV2_CLEAR)) {
LoadRoomEntityList(&gUnk_080D7328);
}
#ifdef JP
if (CheckGlobalFlag(CASTLE_BGM) || CheckGlobalFlag(ENDING)) {
#else
if (CheckGlobalFlag(CASTLE_BGM)) {
gArea.pMusicIndex = 0x1b;
} else if (CheckGlobalFlag(ENDING)) {
#endif
gArea.pMusicIndex = gArea.musicIndex;
}
}
@@ -636,13 +641,21 @@ u32 sub_0804BC34() {
extern EntityData gUnk_080D7690;
void sub_0804bc38(void) {
#ifdef JP
if (CheckLocalFlag(0x9b)) {
#else
if (CheckLocalFlag(0x9c)) {
#endif
LoadRoomEntityList(&gUnk_080D7690);
}
}
u32 sub_0804BC50(void) {
#ifdef JP
if (!CheckLocalFlag(0x9e)) {
#else
if (!CheckLocalFlag(0x9f)) {
#endif
gScreenTransition.field_0xf = 5;
ClearGlobalFlag(ZELDA_CHASE);
}
@@ -652,7 +665,11 @@ u32 sub_0804BC50(void) {
extern u32 script_08009E88;
void sub_0804BC70(void) {
#ifdef JP
if (!CheckLocalFlag(0x9e)) {
#else
if (!CheckLocalFlag(0x9f)) {
#endif
DoFade(5, 0x100);
gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0xb0;
gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x40;
@@ -660,11 +677,21 @@ void sub_0804BC70(void) {
}
if (!CheckGlobalFlag(TABIDACHI)) {
sub_08052878();
#ifndef JP
} else {
if (CheckGlobalFlag(CASTLE_BGM)) {
gArea.pMusicIndex = 0x1b;
}
#else
}
#endif
if (CheckGlobalFlag(CASTLE_BGM)) {
#ifdef JP
gArea.pMusicIndex = gArea.musicIndex;
#else
gArea.pMusicIndex = 0x1b;
#endif
}
#ifndef JP
}
#endif
}
extern ScreenTransitionData gUnk_0813AB80;
@@ -1952,12 +1979,20 @@ void sub_0804CAA0(void) {
if (CheckGlobalFlag(KUMOTATSUMAKI)) {
sub_0809F814(0x6de);
}
#ifdef JP
if (CheckLocalFlag(0xf0)) {
#else
if (CheckLocalFlag(0xf3)) {
#endif
sub_0809F814(0xe0);
} else {
LoadRoomEntityList(&gUnk_080DD7E0);
}
#ifdef JP
if (CheckLocalFlag(0xf2)) {
#else
if (CheckLocalFlag(0xf5)) {
#endif
sub_0809F814(0xba3);
} else {
LoadRoomEntityList(&gUnk_080DD840);
@@ -1970,7 +2005,11 @@ u32 sub_0804CAF4() {
void sub_0804CAF8() {
sub_080300E8();
#ifdef JP
SetLocalFlag(0x25);
#else
SetLocalFlag(0x24);
#endif
}
u32 sub_0804CB08() {
@@ -1994,8 +2033,11 @@ void sub_0804CB14(void) {
}
void sub_0804CB2C(void) {
#ifdef JP
if (CheckLocalFlagByOffset(0x100, 0x28)) {
#else
if (CheckLocalFlagByOffset(0x100, 0x27)) {
#endif
SetDirtTile(0x85);
}
}
@@ -2031,10 +2073,18 @@ extern EntityData gUnk_080DE200;
void sub_0804CB7C(void) {
sub_080300E8();
#ifdef JP
if (!CheckLocalFlag(0x31)) {
#else
if (!CheckLocalFlag(0x30)) {
#endif
LoadRoomEntityList(&gUnk_080DE1E0);
}
#ifdef JP
if (!CheckLocalFlag(0x32)) {
#else
if (!CheckLocalFlag(0x31)) {
#endif
LoadRoomEntityList(&gUnk_080DE200);
}
}
@@ -4238,7 +4288,9 @@ void LoadHyruleTown(void) {
sub_08054570();
TryLoadPrologueHyruleTown();
#ifndef JP
SetTileType(0x176, 0x66b, 1);
#endif
if (gSave.unk8 == 1) {
sub_0801D000(0);
} else {
@@ -4296,7 +4348,11 @@ void LoadHyruleTown(void) {
LoadRoomEntityList(&gUnk_080EEA5C);
}
// rocs cape
#ifdef JP
if (!CheckLocalFlag(0xcd) && GetInventoryValue(0x14)) {
#else
if (!CheckLocalFlag(0xd0) && GetInventoryValue(0x14)) {
#endif
LoadRoomEntityList(&gUnk_080EEABC);
}
if ((gSave.unk8 > 3) && CheckGlobalFlag(INLOCK)) {
@@ -4438,10 +4494,18 @@ void sub_0804E27C(void) {
SetGlobalFlag(CASTLE_BGM);
} else {
if (CheckGlobalFlag(CASTLE_BGM)) {
#ifdef JP
gArea.pMusicIndex = gArea.musicIndex;
#else
gArea.pMusicIndex = 0x1b;
#endif
}
}
#ifdef JP
if (!CheckLocalFlag(0x9b)) {
#else
if (!CheckLocalFlag(0x9c)) {
#endif
LoadRoomEntityList(&gUnk_080F0800);
SetTileType(0x4072, 600, 1);
SetTileType(0x4072, 0x298, 1);
@@ -4464,9 +4528,17 @@ void sub_0804E27C(void) {
}
SetTileType(0x4072, 600, 1);
SetTileType(0x4072, 0x298, 1);
#ifdef JP
if (CheckLocalFlag(0x11)) {
#else
if (CheckLocalFlag(0x10)) {
#endif
LoadRoomEntityList(&gUnk_080F0920);
#ifdef JP
ClearLocalFlag(0x11);
#else
ClearLocalFlag(0x10);
#endif
}
}
sub_080AF284();
@@ -5055,8 +5127,13 @@ void sub_0804EC00(void) {
if (!CheckGlobalFlag(EZERO_1ST)) {
LoadRoomEntityList(&gUnk_080F4D50);
}
#ifdef JP
if (!CheckLocalFlag(0x3d)) {
if (!CheckLocalFlag(0x3a)) {
#else
if (!CheckLocalFlag(0x3e)) {
if (!CheckLocalFlag(0x3b)) {
#endif
LoadRoomEntityList(&gUnk_080F4DB0);
} else {
LoadRoomEntityList(&gUnk_080F4DD0);
@@ -5106,7 +5183,11 @@ void sub_0804ECEC(void) {
// white sword
if (GetInventoryValue(0x2)) {
LoadRoomEntityList(&gUnk_080F5328);
#ifdef JP
if (!CheckLocalFlag(0x15)) {
#else
if (!CheckLocalFlag(0x14)) {
#endif
LoadRoomEntityList(&gUnk_080F5308);
}
}
@@ -5291,7 +5372,11 @@ u32 sub_0804F02C() {
extern EntityData gUnk_080F5E68;
void sub_0804F030(void) {
#ifdef JP
if (!CheckLocalFlagByOffset(0x100, 0xce)) {
#else
if (!CheckLocalFlagByOffset(0x100, 0xd1)) {
#endif
LoadRoomEntityList(&gUnk_080F5E68);
}
}
@@ -5331,7 +5416,11 @@ void nullsub_400() {
}
u32 sub_0804F09C(void) {
#ifdef JP
if (CheckGlobalFlag(KUMOTATSUMAKI) && CheckLocalFlagByOffset(0x100, 0xd9)) {
#else
if (CheckGlobalFlag(KUMOTATSUMAKI) && CheckLocalFlagByOffset(0x100, 0xdc)) {
#endif
SetGlobalFlag(WARP_EVENT_END);
}
return 1;
@@ -5340,7 +5429,11 @@ u32 sub_0804F09C(void) {
extern EntityData gUnk_080F61BC;
void sub_0804F0C0(void) {
#ifdef JP
if (CheckLocalFlagByOffset(0x100, 0xd9)) {
#else
if (CheckLocalFlagByOffset(0x100, 0xdc)) {
#endif
SetLocalFlag(0x90);
}
if (CheckKinstoneFused(0xf)) {
@@ -5487,7 +5580,11 @@ void sub_0804F230() {
}
u32 sub_0804F23C(void) {
#ifdef JP
if (!CheckLocalFlag(0x6b)) {
#else
if (!CheckLocalFlag(0x6d)) {
#endif
DoFade(7, 0x100);
}
SetGlobalFlag(OUTDOOR);
@@ -5500,7 +5597,11 @@ extern EntityData gUnk_080F7088;
void sub_0804F25C(void) {
sub_0805ADD8(0);
#ifdef JP
if (!CheckLocalFlag(0x6b)) {
#else
if (!CheckLocalFlag(0x6d)) {
#endif
LoadRoomEntityList(&gUnk_080F70A8);
ClearGlobalFlag(ZELDA_CHASE);
}
@@ -5606,7 +5707,11 @@ u32 Vars_HyruleField_OutsideCastle(void) {
gRoomVars.field_0x6c = &gUnk_080F7CD0;
gRoomVars.field_0x88 = sub_0804F5E8;
}
#ifdef JP
if (CheckGlobalFlag(LV2_CLEAR) && GetInventoryValue(0x3) && !CheckLocalFlag(0x8a)) {
#else
if (CheckGlobalFlag(LV2_CLEAR) && GetInventoryValue(0x3) && !CheckLocalFlag(0x8c)) {
#endif
gRoomVars.field_0x6c = &gUnk_080F7C80;
gRoomVars.field_0x88 = sub_0804F4E4;
gRoomVars.field_0x74 = NULL;
@@ -5626,7 +5731,11 @@ extern EntityData gUnk_080F7D70;
void Load_HyruleField_OutsideCastle(void) {
sub_0804F4E4();
#ifdef JP
if (!CheckLocalFlag(0x89)) {
#else
if (!CheckLocalFlag(0x8b)) {
#endif
LoadRoomEntityList(&gUnk_080F7D70);
SetTileType(0x174, 0x7a2, 1);
SetTileType(0x174, 0x7a3, 1);
@@ -5642,7 +5751,11 @@ void Load_HyruleField_OutsideCastle(void) {
extern EntityData gUnk_080F7DC0;
void sub_0804F578(void) {
#ifdef JP
if (!CheckLocalFlag(0x8c)) {
#else
if (!CheckLocalFlag(0x8e)) {
#endif
LoadRoomEntityList(&gUnk_080F7DC0);
} else {
SetTileType(0x37, 0x94a, 1);
@@ -5810,7 +5923,11 @@ extern EntityData gUnk_080F82E0;
void Load_HyruleField_TrilbyHighlands(void) {
sub_0805ADD8(0);
#ifdef JP
if (CheckGlobalFlag(LV2_CLEAR) && GetInventoryValue(0x3) && !CheckLocalFlag(0x9b)) {
#else
if (CheckGlobalFlag(LV2_CLEAR) && GetInventoryValue(0x3) && !CheckLocalFlag(0x9c)) {
#endif
LoadRoomEntityList(&gUnk_080F82E0);
}
}
@@ -6462,7 +6579,9 @@ u32 sub_0804FED4() {
}
void sub_0804FED8(void) {
#ifndef JP
SetTileType(0x176, 0x66f, 1);
#endif
}
u32 sub_0804FEEC() {
src/save.c
+6 -1
View File
@@ -53,9 +53,14 @@ static SaveResult (*const sSaveHandlers[])(u32) = { HandleSaveInit, HandleSaveIn
#ifdef DEMO
asm(".incbin \"baserom_demo.gba\", 0x11e010, 0xf0c"); // @nocheckin
asm(".incbin \"baserom_demo.gba\", 0x11e010, 0xf0c"); // TODO
#else
#ifdef JP
static const char sSignatureLong[32] = "AGBZELDA:THE MINISH CAP:ZELDA 3";
#else
static const char sSignatureLong[32] = "AGBZELDA:THE MINISH CAP:ZELDA 5";
#endif
// Save file is untouched
static const SaveFileStatus sSaveDescInit = { 0xffff, 0xffff, 'TINI' };