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

Merge remote-tracking branch 'upstream/master' into m

Browse Source
This commit is contained in:
theo3
2021-11-05 01:58:55 -07:00
parent 9cfbb3a27a 90ed4a86ce
commit a9bb5184d0
440 changed files with 7319 additions and 11526 deletions
Download Patch File Download Diff File Expand all files Collapse all files
INSTALL.md
+8 -6
View File
@@ -4,12 +4,14 @@ First, you must put a The Legend of Zelda: The Minish Cap (U) ROM (with SHA1: `b
## Building other variants
To build other variants, you currently need a combination of different baseroms, depending on the variant.
| | USA | DEMO | JP | EU |
| - | :-: | :-: | :-: | :-: |
| baserom.gba | X | X | X | X |
| baserom_demo.gba | | X | | |
| baserom_jp.gba | | | X | X |
| baserom_eu.gba | | | | X |
| | USA | JP | EU | DEMO_USA | DEMO_JP |
| - | :-: | :-: | :-: | :-: | :-: |
| baserom.gba | X | X | X | X | X |
| baserom_jp.gba | | X | X | | X |
| baserom_eu.gba | | | X | | |
| baserom_demo.gba | | | | X | |
| baserom_demo_jp.gba | | | | | X |
## Prerequisites
Jenkinsfile
Vendored
+2 -1
View File
@@ -9,6 +9,7 @@ pipeline {
sh 'cd ${AGBCC} && ./install.sh ${WORKSPACE} && cd ${WORKSPACE}'
sh 'cp /usr/local/etc/roms/tmc.us.gba baserom.gba'
sh 'cp /usr/local/etc/roms/tmc.demo.gba baserom_demo.gba'
sh 'cp /usr/local/etc/roms/tmc.demo.jp.gba baserom_demo_jp.gba'
sh 'cp /usr/local/etc/roms/tmc.jp.gba baserom_jp.gba'
sh 'cp /usr/local/etc/roms/tmc.eu.gba baserom_eu.gba'
sh 'make -j setup'
@@ -16,7 +17,7 @@ pipeline {
}
stage('Build') {
steps {
sh 'make usa demo jp eu -j'
sh 'make usa demo_usa jp demo_jp eu -j'
}
}
stage('Report Progress') {
Makefile
+31 -8
View File
@@ -16,15 +16,20 @@ ifeq ($(GAME_VERSION), USA)
GAME_CODE := BZME
BUILD_NAME := tmc
else
ifeq ($(GAME_VERSION), DEMO)
ifeq ($(GAME_VERSION), DEMO_USA)
GAME_CODE := BZHE
BUILD_NAME := tmc_demo
BUILD_NAME := tmc_demo_usa
else
ifeq ($(GAME_VERSION), JP)
GAME_CODE := BZMJ
BUILD_NAME := tmc_jp
GAME_LANGUAGE := JAPANESE
else
ifeq ($(GAME_VERSION), DEMO_JP)
GAME_CODE := BZMJ
BUILD_NAME := tmc_demo_jp
GAME_LANGUAGE := JAPANESE
else
ifeq ($(GAME_VERSION), EU)
GAME_CODE := BZMP
BUILD_NAME := tmc_eu
@@ -34,6 +39,7 @@ endif
endif
endif
endif
endif
SHELL := /bin/bash -o pipefail
@@ -166,8 +172,9 @@ clean: mostlyclean clean-tools
tidy:
rm -f tmc.gba tmc.elf tmc.map
rm -f tmc_demo.gba tmc_demo.elf tmc_demo.map
rm -f tmc_demo_usa.gba tmc_demo_usa.elf tmc_demo_usa.map
rm -f tmc_jp.gba tmc_jp.elf tmc_jp.map
rm -f tmc_demo_jp.gba tmc_demo_jp.elf tmc_demo_jp.map
rm -f tmc_eu.gba tmc_eu.elf tmc_eu.map
rm -r build/*
@@ -240,32 +247,47 @@ $(ROM): $(ELF)
$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@
usa: ; @$(MAKE) GAME_VERSION=USA
demo: ; @$(MAKE) GAME_VERSION=DEMO
demo_usa: ; @$(MAKE) GAME_VERSION=DEMO_USA
jp: ; @$(MAKE) GAME_VERSION=JP
demo_jp: ; @$(MAKE) GAME_VERSION=DEMO_JP
eu: ; @$(MAKE) GAME_VERSION=EU
ifeq ($(GAME_VERSION), USA)
baserom.gba:
$(error "You need to provide a USA ROM as baserom.gba")
.PHONY: baserom_demo.gba baserom_jp.gba baserom_eu.gba
.PHONY: baserom_demo.gba baserom_jp.gba baserom_eu.gba baserom_demo_jp.gba
baserom_demo.gba:
baserom_jp.gba:
baserom_eu.gba:
baserom_demo_jp.gba:
endif
ifeq ($(GAME_VERSION), DEMO)
ifeq ($(GAME_VERSION), DEMO_USA)
baserom.gba:
$(error "You need to provide a USA ROM as baserom.gba")
baserom_demo.gba:
$(error "You need to provide a DEMO ROM as baserom_demo.gba")
.PHONY: baserom_jp.gba baserom_eu.gba
.PHONY: baserom_jp.gba baserom_eu.gba baserom_demo_jp.gba
baserom_jp.gba:
baserom_eu.gba:
baserom_demo_jp.gba:
endif
ifeq ($(GAME_VERSION), JP)
baserom.gba:
$(error "You need to provide a USA ROM as baserom.gba")
baserom_jp.gba:
$(error "You need to provide a JP ROM as baserom_jp.gba")
.PHONY: baserom_demo.gba baserom_eu.gba baserom_demo_jp.gba
baserom_demo.gba:
baserom_eu.gba:
baserom_demo_jp.gba:
endif
ifeq ($(GAME_VERSION), DEMO_JP)
baserom.gba:
$(error "You need to provide a USA ROM as baserom.gba")
baserom_jp.gba:
$(error "You need to provide a JP ROM as baserom_jp.gba")
baserom_demo_jp.gba:
$(error "You need to provide a DEMO JP ROM as baserom_demo_jp.gba")
.PHONY: baserom_demo.gba baserom_eu.gba
baserom_demo.gba:
baserom_eu.gba:
@@ -277,6 +299,7 @@ baserom_jp.gba:
$(error "You need to provide a JP ROM as baserom_jp.gba")
baserom_eu.gba:
$(error "You need to provide a EU ROM as baserom_eu.gba")
.PHONY: baserom_demo.gba
.PHONY: baserom_demo.gba baserom_demo_jp.gba
baserom_demo.gba:
baserom_demo_jp.gba:
endif
README.md
+2 -1
View File
@@ -19,7 +19,8 @@ It can target the following ROMs:
* [**tmc.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=1841) `sha1: b4bd50e4131b027c334547b4524e2dbbd4227130`
* [**tmc_jp.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=1719) `sha1: 6c5404a1effb17f481f352181d0f1c61a2765c5d`
* [**tmc_eu.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=1734) `sha1: cff199b36ff173fb6faf152653d1bccf87c26fb7`
* [**tmc_demo.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=x051) `sha1: 63fcad218f9047b6a9edbb68c98bd0dec322d7a1`
* [**tmc_demo_usa.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=x051) `sha1: 63fcad218f9047b6a9edbb68c98bd0dec322d7a1`
* [**tmc_demo_jp.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=x430) `sha1: 9cdb56fa79bba13158b81925c1f3641251326412`
**Note:** This repository does not include any of the assets necessary to build the ROM.
A prior copy of the game is required to extract the needed assets.
asm/code_08000108.s
+36
View File
@@ -40,7 +40,43 @@ _08000144EU:
.byte 0x33, 0x5A, 0x43, 0x4D
.4byte gUnk_03007FA0
.4byte gUnk_03006C14
.else
.ifdef DEMO_JP @ TODO deduplicate
thumb_func_start sub_08000118
sub_08000118: @ 0x08000118
add r0, pc, #0x28
ldm r0!, {r1, r2, r3}
_0800011C:
subs r2, #4
str r1, [r2]
cmp r2, r3
bgt _0800011C
bx lr
non_word_aligned_thumb_func_start sub_08000126
sub_08000126: @ 0x08000126
add r0, pc, #0x1C
ldm r0!, {r1, r2, r3}
_0800012A:
ldr r0, [r3]
adds r3, #4
cmp r0, r1
beq _0800012A
subs r2, #0xa0
_08000134:
ldr r0, [r2]
adds r2, #4
cmp r0, r1
beq _08000134
subs r1, r2, #4
subs r0, r3, #4
bx lr
.align 2, 0
_08000144EU:
.byte 0x33, 0x5A, 0x43, 0x4D
.4byte gUnk_03007FA0
.4byte gUnk_03006C14
.endif
.endif
thumb_func_start sub_08000108
asm/code_080043E8.s
+6 -1
View File
@@ -2254,7 +2254,11 @@ gUnk_08007CAC:: @ 08007CAC
.incbin "baserom.gba", 0x007CAC, 0x000005B
gUnk_08007D07:: @ 08007D07
.ifdef DEMO
.ifdef DEMO_JP
@ TODO only one byte differs
.incbin "baserom_demo_jp.gba", 0x007D4F, 0x00000CF
.else
.ifdef DEMO_USA
@ TODO only one byte differs
.incbin "baserom_demo.gba", 0x007D07, 0x00000CF
.else
@@ -2269,6 +2273,7 @@ gUnk_08007D07:: @ 08007D07
.incbin "baserom.gba", 0x007D07, 0x00000CF
.endif
.endif
.endif
.endif
non_word_aligned_thumb_func_start sub_08007DD6
asm/code_08018500.s
+4
View File
@@ -640,9 +640,13 @@ _080189D0:
.else
.ifdef EU
movs r1, #0x77
.else
.ifdef DEMO_JP
movs r1, #0x77 @ TODO deduplicate
.else
movs r1, #0x79
.endif
.endif
.endif
bl SetLocalFlagByOffset
ldr r0, _080189E8 @ =gUnk_080FEE38
asm/code_0801967C.s
+8 -1
View File
@@ -991,11 +991,18 @@ _08019DEE:
beq _08019DF6
b _0801A2A4
.else
.ifdef DEMO
.ifdef DEMO_USA
ldrb r0, [r4, #0xa]
cmp r0, #0
beq _08019DF6
b _0801A2A4
.else
.ifdef DEMO_JP @ TODO deduplicate
ldrb r0, [r4, #0xa]
cmp r0, #0
beq _08019DF6
b _0801A2A4
.endif
.endif
.endif
_08019DF6:
asm/code_0801D79C.s
+98
View File
@@ -2190,6 +2190,103 @@ _0801E8D2:
thumb_func_start sub_0801E8D4
sub_0801E8D4: @ 0x0801E8D4
.ifdef DEMO_JP
push {r4, r5, lr}
movs r5, #0xa
_0801E914:
adds r0, r5, #0
bl CheckKinstoneFused
cmp r0, #0
beq _0801E9C4
adds r0, r5, #0
bl sub_0801E810
cmp r0, #0
bne _0801E9C4
ldr r1, _0801E94C @ =0x080C9500
lsls r0, r5, #3
adds r0, r0, r1
ldrb r1, [r0, #4]
lsls r0, r1, #2
adds r0, r0, r1
lsls r0, r0, #2
ldr r1, _0801E950 @ =0x080FDB04
adds r2, r0, r1
ldrh r3, [r2, #0x12]
ldrb r0, [r2, #0x10]
cmp r0, #9
bhi _0801E9B0
lsls r0, r0, #2
ldr r1, _0801E954 @ =_0801E958
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0801E94C: .4byte 0x080C9500
_0801E950: .4byte 0x080FDB04
_0801E954: .4byte _0801E958
_0801E958: @ jump table
.4byte _0801E980 @ case 0
.4byte _0801E984 @ case 1
.4byte _0801E988 @ case 2
.4byte _0801E98C @ case 3
.4byte _0801E990 @ case 4
.4byte _0801E994 @ case 5
.4byte _0801E99A @ case 6
.4byte _0801E9A0 @ case 7
.4byte _0801E9A6 @ case 8
.4byte _0801E9AC @ case 9
_0801E980:
movs r4, #0
b _0801E9B0
_0801E984:
ldrb r4, [r2, #0x11]
b _0801E9B0
_0801E988:
movs r4, #0xf
b _0801E9B0
_0801E98C:
movs r4, #0x10
b _0801E9B0
_0801E990:
movs r4, #0x11
b _0801E9B0
_0801E994:
movs r4, #4
movs r3, #0x83
b _0801E9B0
_0801E99A:
movs r4, #4
movs r3, #0x84
b _0801E9B0
_0801E9A0:
movs r4, #4
movs r3, #0x87
b _0801E9B0
_0801E9A6:
movs r4, #4
movs r3, #0x88
b _0801E9B0
_0801E9AC:
movs r4, #4
movs r3, #0x8b
_0801E9B0:
adds r0, r4, #0
adds r1, r3, #0
bl sub_0807CB24
cmp r0, #0
beq _0801E9C4
ldr r0, _0801E9CC @ =gUnk_02002C8E
adds r1, r5, #0
bl WriteBit
_0801E9C4:
adds r5, #1
cmp r5, #0x64
bls _0801E914
pop {r4, r5, pc}
.align 2, 0
_0801E9CC: .4byte gUnk_02002C8E
.else
.ifdef JP
push {r4, r5, lr}
movs r4, #0xa
@@ -2431,6 +2528,7 @@ _0801E990:
.align 2, 0
_0801E998: .4byte gUnk_02002C8E
.endif
.endif
.endif
thumb_func_start sub_0801E99C
asm/code_080526F8.s
+37 -2
View File
@@ -696,7 +696,7 @@ _08052C30:
_08052C34: .4byte gScreenTransition
_08052C38: .4byte gArea
.else
.ifdef DEMO @TODO deduplicate
.ifdef DEMO_USA @TODO deduplicate
thumb_func_start sub_08052BF8
sub_08052BF8: @ 0x08052BF8
push {lr}
@@ -733,6 +733,37 @@ _08052C38: .4byte gArea
.endif
.endif
.ifdef DEMO_JP
thumb_func_start sub_08052BF8
sub_08052BF8: @ 0x08052BF8
push {lr}
ldr r0, _08052B38 @ =gScreenTransition
adds r1, r0, #0
adds r1, #0x31
ldrb r0, [r1]
cmp r0, #0
bne _08052B36
movs r0, #1
strb r0, [r1]
bl GetEmptyManager
adds r1, r0, #0
cmp r1, #0
beq _08052B36
movs r0, #9
strb r0, [r1, #8]
movs r0, #0xf
strb r0, [r1, #9]
strb r0, [r1, #0xa]
adds r0, r1, #0
movs r1, #0
bl AppendEntityToList
_08052B36:
pop {pc}
.align 2, 0
_08052B38: .4byte gScreenTransition
.endif
thumb_func_start sub_08052C3C
sub_08052C3C: @ 0x08052C3C
push {lr}
@@ -1359,14 +1390,18 @@ _0805310C:
_0805311A:
movs r0, #0x80
lsls r0, r0, #1
.ifdef JP
.ifdef JP @ TODO deduplicate
movs r1, #0x9b
.else
.ifdef EU
movs r1, #0x9b
.else
.ifdef DEMO_JP
movs r1, #0x9b
.else
movs r1, #0x9c
.endif
.endif
.endif
bl CheckLocalFlagByOffset
cmp r0, #0
asm/code_08054C04.s
+4
View File
@@ -388,9 +388,13 @@ sub_08054EB8: @ 0x08054EB8
.else
.ifdef EU
movs r0, #0x77
.else
.ifdef DEMO_JP
movs r0, #0x77 @ TODO deduplicate
.else
movs r0, #0x79
.endif
.endif
.endif
strh r0, [r3, #0x3e]
adds r0, r3, #0
asm/code_080A3BD0.s
+13 -2
View File
@@ -1302,7 +1302,11 @@ _080A45A2:
thumb_func_start sub_080A45A4
sub_080A45A4: @ 0x080A45A4
.ifdef DEMO
.ifdef DEMO_USA
bx lr
.align 2, 0
.else
.ifdef DEMO_JP
bx lr
.align 2, 0
.else
@@ -1344,6 +1348,7 @@ _080A45E0:
.align 2, 0
_080A4600: .4byte gUnk_0812814C
_080A4604: .4byte gMenu
.endif
.endif
thumb_func_start sub_080A4608
@@ -3219,7 +3224,12 @@ _080A52DC: .4byte gInput
_080A52E0:
cmp r4, #0x10
bne _080A52EC
.ifdef DEMO
.ifdef DEMO_USA
movs r0, #0x6d
bl SoundReq
b _080A5336
.else
.ifdef DEMO_JP @ TODO same as DEMO_USA
movs r0, #0x6d
bl SoundReq
b _080A5336
@@ -3228,6 +3238,7 @@ _080A52E0:
bl sub_080A4E84
b _080A530A
.endif
.endif
_080A52EC:
ldr r0, _080A5314 @ =gMenu
adds r0, #0x10
asm/code_080A5574.s
+35 -6
View File
@@ -202,11 +202,15 @@ _080A570C:
cmp r0, #1
bne _080A575E
ldrb r3, [r2, #3]
.ifdef DEMO
.ifdef DEMO_USA
movs r4, #0
.else
.ifdef DEMO_JP
movs r4, #0
.else
movs r1, #0
.endif
.endif
cmp r3, #2
beq _080A572E
cmp r3, #2
@@ -227,23 +231,39 @@ _080A572E:
ldrb r0, [r0]
cmp r0, #0
beq _080A574E
.ifdef DEMO
.ifdef DEMO_USA
movs r4, #8
.else
.ifdef DEMO_JP
movs r4, #8
.else
movs r1, #8
.endif
.endif
cmp r3, #0
bne _080A574E
.ifdef DEMO
.ifdef DEMO_USA
movs r4, #7
.else
.ifdef DEMO_JP
movs r4, #7
.else
movs r1, #7
.endif
.endif
b _080A5752
.align 2, 0
_080A5744: .4byte gMenu
_080A5748:
.ifdef DEMO
.ifdef DEMO_USA
movs r0, #0x6d
bl SoundReq
b _080A574E
_080A574C:
movs r0, #0x6d
bl SoundReq
.else
.ifdef DEMO_JP
movs r0, #0x6d
bl SoundReq
b _080A574E
@@ -256,19 +276,28 @@ _080A574C:
_080A574C:
movs r1, #0xa
.endif
.endif
_080A574E:
.ifdef DEMO
.ifdef DEMO_USA
cmp r4, #0
.else
.ifdef DEMO_JP
cmp r4, #0
.else
cmp r1, #0
.endif
.endif
beq _080A575E
_080A5752:
.ifdef DEMO
.ifdef DEMO_USA
adds r0, r4, #0
.else
.ifdef DEMO_JP
adds r0, r4, #0
.else
adds r0, r1, #0
.endif
.endif
bl sub_080A4E84
movs r0, #0x6a
bl SoundReq
asm/crt0.s
+10
View File
@@ -24,6 +24,12 @@ start_vector:
ldr r1, unk_function
mov lr, pc
bx r1
.else
.ifdef DEMO_JP
ldr r1, unk_function
mov lr, pc
bx r1
.endif
.endif
ldr r1, =AgbMain
mov lr, pc
@@ -36,4 +42,8 @@ INTR_VECTOR_BUF: .4byte 0x03007FFC
intr_main: .4byte gIntrMain
.ifdef EU
unk_function: .4byte sub_08000118
.else
.ifdef DEMO_JP
unk_function: .4byte sub_08000118
.endif
.endif
asm/figurineDevice.s
+35
View File
@@ -987,9 +987,13 @@ _080880B2:
.else
.ifdef EU
movs r1, #0x9b
.else
.ifdef DEMO_JP
movs r1, #0x9b @ TODO deduplicate
.else
movs r1, #0x9c
.endif
.endif
.endif
bl CheckLocalFlagByOffset
cmp r0, #0
@@ -2192,5 +2196,36 @@ _08088678:
.align 2, 0
_08088684: .4byte gPlayerEntity
_08088688: .4byte gActiveScriptInfo
.else
.ifdef DEMO_JP @ TODO deduplicate
thumb_func_start sub_08088658
sub_08088658: @ 0x08088658
push {r4, lr}
adds r4, r1, #0
movs r0, #0x78
movs r1, #0x78
movs r2, #0x10
movs r3, #8
bl CheckPlayerInRegion
str r0, [r4, #0x14]
ldr r0, _08088684 @ =gPlayerEntity
movs r1, #0x36
ldrsh r0, [r0, r1]
cmp r0, #0
beq _08088678
movs r0, #0
str r0, [r4, #0x14]
_08088678:
ldr r2, _08088688 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
strb r0, [r2, #7]
pop {r4, pc}
.align 2, 0
_08088684: .4byte gPlayerEntity
_08088688: .4byte gActiveScriptInfo
.endif
.endif
.endif
asm/fileScreen.s
+32 -2
View File
@@ -5,7 +5,7 @@
.text
.ifdef DEMO
.ifdef DEMO_USA
thumb_func_start HandleGameplayScreen
HandleGameplayScreen: @ 08051A28
push {r4, lr}
@@ -340,9 +340,30 @@ _08051B5A:
bl sub_08078A90
ldr r0, _08051BC8 @ =gUnk_02034490
strb r4, [r0]
.ifdef DEMO_JP
ldr r0, _08051C30 @ =gUnk_030010A0
adds r0,#0x31
ldrb r0,[r0,#0x0]
cmp r0,#0x0
beq _08051bee
bl sub_08053178
_08051bee:
adds r0,r5,#0x0
adds r0,#0x28
ldrb r0,[r0,#0x0]
cmp r0,#0xff
beq _08051bfc
bl sub_0801855C
_08051bfc:
bl sub_08052BF8
.else
.ifdef JP
bl sub_08053178
.endif
.ifndef EU
adds r0, r5, #0
adds r0, #0x28
@@ -356,10 +377,16 @@ _08051B96:
bl sub_08053178 @ TODO fix addresses
bl sub_08053178
.else
.ifdef DEMO_JP
bl sub_08053178 @ TODO fix addresses
bl sub_08053178
.else
.ifndef JP
bl sub_08052BF8
bl sub_08053178
.endif
.endif
.endif
.endif
ldr r0, _08051BCC @ =gRoomVars
ldrb r0, [r0]
@@ -380,6 +407,9 @@ _08051BBC: .4byte 0x00000864
_08051BC0: .4byte 0x800B0000
_08051BC4: .4byte gMain
_08051BC8: .4byte gUnk_02034490
.ifdef DEMO_JP
_08051C30: .4byte gUnk_030010A0
.endif
_08051BCC: .4byte gRoomVars
.endif
@@ -523,7 +553,7 @@ _08051D28: .4byte gScreenTransition
thumb_func_start sub_08051D2C
sub_08051D2C: @ 0x08051D2C
.ifdef DEMO
.ifdef DEMO_USA
push {lr}
ldr r0, _08051E04 @ =0x03000FD0
ldrb r0, [r0]
asm/intr.s
+308
View File
@@ -881,6 +881,56 @@ sub_080B19C8: @ 0x080B19C8
ldm sp!, {lr}
b _080B1C40EU
.else
.ifdef DEMO_JP @ TODO deduplicate same as EU
push {r4, r5, r6, r7, r8, sb, sl, fp, lr}
ldr fp, _080B2A30 @ =gUnk_03000000
ldrb r2, [fp, #3]
cmp r2, #0x80
bhs _080B19C0EU
add r0, pc, #0x54 @ =_080B19C0
str r0, [fp, #0x18]
str sp, [fp, #0x14]
ldrb r0, [fp, #0xf]
cmp r0, #0xff
bne _080B1984
bl _080B1FBC
_080B1980:
mov r0, #0x0
_080B1984:
ldr r1, _080B2154 @ =0x03006958
ldr r1, [r1, r0, lsl #2]
str r1, [fp, #0x1c]
ldr r0, _080B2A34 @ =gUnk_081326EC
ldr r0, [r0]
bl sub_080B19C8
ldr r0, _080B2A38 @ =gUnk_081326EC
ldr r0, [r0, #4]
bl sub_080B19C8
ldr r0, _080B2A3C @ =gUnk_081326EC
ldr r0, [r0, #8]
bl sub_080B19C8
ldr r0, _080B2A40 @ =gUnk_081326EC
ldr r0, [r0, #0xc]
bl sub_080B19C8
_080B19C0EU:
pop {r4, r5, r6, r7, r8, sb, sl, fp, lr}
bx lr
arm_func_start sub_080B19C8
sub_080B19C8: @ 0x080B19C8
ldrb r2, [r0]
cmp r2, #0
bxeq lr
ldr r1, _080B2A44 @ =0x08131D3C
ldr r1, [r1, #0x10]
mov r2, #0
strb r2, [r1]
stmdb sp!, {lr}
bl ResolveOamDrawPriority
bl sub_080B2534
ldm sp!, {lr}
b _080B1C40EU
.else
push {r4, r5, r6, r7, r8, sb, sl, fp, lr}
ldr fp, _080B2A30 @ =gUnk_03000000
ldrb r2, [fp, #3]
@@ -919,6 +969,7 @@ sub_080B2448: @ 0x080B2448
bl sub_080B2534
ldm sp!, {lr}
b _080B26B4
.endif
.endif
arm_func_start ResolveOamDrawPriority
@@ -1008,7 +1059,142 @@ sub_080B255C: @ 0x080B255C
bl sub_080B299C
ldr r3, [fp, #0x1c]
mov lr, pc
.ifdef DEMO_JP
bx r3
.else
bxne r3
.endif
mov r5, #0
strb r5, [fp, #0x12]
ldrsb r2, [r4, #0x29]
ands r2, r2, #8
beq _080B1BB8
ldrsh r3, [r4, #0x36]
cmp r3, #0
bmi _080B1BA4
mov r1, #0
mov r2, #0
bl sub_080B1BCC
ldrb r1, [r4, #0x18]
and r1, r1, #0x30
mov r1, r1
cmp r0, #0x19
beq _080B1B98
cmp r0, #0x2f
beq _080B1B64
cmp r0, #0xf
bne _080B1BA4
mov r5, #2
strb r5, [fp, #0x12]
add r7, r7, r5
ldrb r2, [fp, #1]
and r2, r2, #0x18
add r2, r2, #0x80
lsr r2, r2, #2
b _080B1B74
_080B1B64:
ldrb r2, [r4, #0x2e]
ldrb r3, [r4, #0x32]
eor r2, r2, r3
and r2, r2, #6
_080B1B74:
ldr r3, _080B2A48 @ =gUnk_030068CC
add r2, r1, r2, lsl #1
ldr sl, [r3, r2]
push {r4, r8, sb}
mov r8, #0
and sb, sb, #0xc00
bl _080B2874
pop {r4, r8, sb, lr}
b _080B2718
_080B1B98:
mov r5, #2
strb r5, [fp, #0x12]
add r7, r7, r5
_080B1BA4:
stmdb sp!, {r4}
mov r0, r4
bl _080B2718
pop {r4, lr}
b _080B1BC0
_080B1BB8:
ldm sp!, {lr}
b _080B2718
_080B1BC0:
ldrsh r1, [r4, #0x36]
ldrb r0, [r4, #0x29]
tst r0, #0x10
beq _080B1BD8
cmp r1, #0
bxpl lr
_080B1BD8:
tst r0, #0x20
beq _080B1BEC
ldrb r0, [fp, #1]
tst r0, #1
bxne lr
_080B1BEC:
mov r2, r7
cmp r1, #0
submi r2, r2, r1
ldr r3, _080B2A4C @ =gUnk_081326EC
ldr r3, [r3, #0x10]
ldrb r0, [r3]
cmp r0, #0x40
bxhs lr
add r0, r0, #1
strb r0, [r3]
add r3, r3, r0, lsl #2
lsr r0, sb, #0xa
and r0, r0, #3
orr r0, r0, r2, lsl #6
strh r0, [r3, #2]
ldrb r0, [r4, #0x18]
and r0, r0, #0x30
lsr r0, r0, #4
orr r0, r0, r6, lsl #6
strh r0, [r3]
bx lr
_080B1C40EU:
ldr r4, _080B2A50 @ =gUnk_081326EC
ldr r4, [r4, #0x10]
ldrb r5, [r4]
cmp r5, #0
bxeq lr
stmdb sp!, {lr}
add r4, r4, #4
_080B1C5C:
ldrsh r0, [r4]
asr r6, r0, #6
and r1, r0, #7
ldr sl, _080B2A54 @ =gUnk_0300694C
ldr sl, [sl, r1, lsl #2]
ldrsh r0, [r4, #2]
asr r7, r0, #6
and r1, r0, #3
lsl sb, r1, #0xa
mov r8, #0
push {r4, r5}
bl _080B2874
pop {r4, r5}
add r4, r4, #4
subs r5, r5, #1
bgt _080B1C5C
ldm sp!, {lr}
bx lr
.else
.ifdef DEMO_JP @ TODO deduplicate nearly same as EU
stmdb sp!, {lr}
mov r4, r0
bl sub_080B299C
ldr r3, [fp, #0x1c]
mov lr, pc
.ifdef DEMO_JP
bx r3
.else
bxne r3
.endif
mov r5, #0
strb r5, [fp, #0x12]
ldrsb r2, [r4, #0x29]
@@ -1252,6 +1438,7 @@ _080B26D0:
bx lr
.endif
.endif
_080B2718:
@@ -1593,11 +1780,129 @@ _080B2144:
.4byte gUnk_030068F0
.4byte gUnk_0300689C
.endif
.ifdef DEMO_JP @ TODO deduplicate same as EU
_080B1FBC:
mov sl, lr
ldrsh r0, [fp, #0x1c]
ldrsh r1, [fp, #0x1e]
ldrsh r2, [fp, #4]
sub r0, r0, r2
ldrsh r3, [fp, #6]
sub r1, r1, r3
mov r2, #0
mov r3, #0
bl sub_080B20ECEU
mov r5, #0
ldr r4, _080B2194 @ =0x03003DF8
_080B1FECEU:
ldr r0, [r4, #8]
cmp r0, #0
beq _080B2074EU
ldrsh r6, [r0, #0x2e]
ldrsh r7, [r0, #0x32]
ldr r3, [r4, #4]
cmp r3, #0
beq _080B2024
ldrsb r0, [r3]
add r6, r6, r0
ldrsb r0, [r3, #1]
add r7, r7, r0
add r3, r3, #2
b _080B202C
_080B2024:
ldr r3, [r0, #0x48]
add r3, r3, #6
_080B202C:
ldrsh r0, [fp, #4]
sub r6, r6, r0
ldrsh r0, [fp, #6]
sub r7, r7, r0
ldrb r0, [r3]
ldrb r1, [r3, #1]
ldr r2, [fp, #1]
and r2, r2, #3
lsl r3, r2, #0x1c
lsrs r2, r2, #1
rsblo r0, r0, #0
subhs r0, r0, #8
rsbeq r1, r1, #0
subne r1, r1, #8
add r0, r0, r6
add r1, r1, r7
mov r2, #0
bl sub_080B20ECEU
_080B2074EU:
add r4, r4, #0xc
add r5, r5, #1
cmp r5, #0x1f
bls _080B1FECEU
bx sl
arm_func_start sub_080B2088
sub_080B2088: @ 0x080B2088
ldr r5, [r4, #0x48]
cmp r5, #0
bxeq lr
ldrb r0, [r5, #6]
ldrb r1, [r5, #7]
ldr r2, [fp, #1]
and r2, r2, #3
lsl r3, r2, #0x1c
lsrs r2, r2, #1
rsblo r0, r0, #0
subhs r0, r0, #8
rsbeq r1, r1, #0
subne r1, r1, #8
ldrsb r2, [r5]
add r0, r6, r0
add r0, r0, r2
ldrsb r2, [r5, #1]
add r1, r7, r1
add r1, r1, r2
mov r2, sb
b sub_080B20ECEU
_080B20DC:
mov r0, r6
mov r1, r7
mov r2, r9
mov r3, #0x0
arm_func_start sub_080B20ECEU
sub_080B20ECEU: @ 0x080B20EC
add ip, r1, #7
cmp ip, #0xa8
bxhs lr
add ip, r0, #7
cmp ip, #0xf8
bxhs lr
and r1, r1, #0xff
lsl r0, r0, #0x17
orr r0, r1, r0, lsr #7
eor r0, r0, r3
and r1, r2, #0xc00
add r1, r1, #0xff
ldrb r3, [fp, #3]
add ip, fp, #0x20
add ip, ip, r3, lsl #3
str r0, [ip]
strh r1, [ip, #4]
add r3, r3, #1
cmp r3, #0x80
bhs _080B298C
strb r3, [fp, #3]
bx lr
_080B2144:
.4byte gUnk_03006954
.4byte gUnk_030068F0
.4byte gUnk_0300689C
.endif
_080B2A30: .4byte gUnk_03000000
.ifdef EU
_080B2154: .4byte 0x03006958 @TODO make pointer?
.endif
.ifdef DEMO_JP @ TODO deduplicate same as EU
_080B2154: .4byte 0x03006958 @TODO make pointer?
.endif
_080B2A34: .4byte gUnk_081326EC
_080B2A38: .4byte gUnk_081326EC
_080B2A3C: .4byte gUnk_081326EC
@@ -1616,3 +1921,6 @@ _080B2A6C: .4byte 0x3E003F00
.ifdef EU
_080B2194: .4byte 0x03003DF8 @TODO pointer?
.endif
.ifdef DEMO_JP @ TODO deduplicate same as EU
_080B2194: .4byte 0x03003DF8 @TODO pointer?
.endif
asm/non_matching/playerItem10/sub_080ACC78.inc
-168
View File
@@ -1,168 +0,0 @@
.syntax unified
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
ldrb r2, [r4, #0xa]
ldr r0, _080ACD20 @ =gScreenTransition
ldr r0, [r0]
adds r0, r2, r0
movs r1, #1
ands r0, r1
cmp r0, #0
beq _080ACCF8
ldr r0, _080ACD24 @ =gUnk_0812AAAC
lsls r1, r2, #2
adds r1, r1, r0
ldr r7, [r1]
ldr r0, [r4, #0x74]
adds r0, r7, r0
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #0
bne _080ACCA4
str r0, [r4, #0x74]
_080ACCA4:
ldr r0, [r4, #0x74]
adds r0, r7, r0
movs r2, #0
ldrsb r2, [r0, r2]
movs r3, #1
ldrsb r3, [r0, r3]
adds r0, r4, #0
movs r1, #0xe
bl sub_08008782
adds r5, r0, #0
cmp r5, #0
beq _080ACCF2
ldrb r1, [r5, #5]
ldrb r2, [r5, #2]
movs r0, #0x11
bl CreateObject
adds r6, r0, #0
cmp r6, #0
beq _080ACCF2
ldrb r0, [r5, #3]
strb r0, [r6, #0xe]
ldr r0, [r4, #0x74]
adds r0, r7, r0
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
ldrh r1, [r4, #0x2e]
adds r0, r0, r1
strh r0, [r6, #0x2e]
ldr r0, [r4, #0x74]
adds r0, r0, r7
ldrb r0, [r0, #1]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
ldrh r1, [r4, #0x32]
adds r0, r0, r1
strh r0, [r6, #0x32]
_080ACCF2:
ldr r0, [r4, #0x74]
adds r0, #2
str r0, [r4, #0x74]
_080ACCF8:
ldr r2, [r4, #0x54]
cmp r2, #0
bne _080ACD08
ldr r0, [r4, #0x70]
cmp r0, #2
bls _080ACD08
movs r0, #1
str r0, [r4, #0x70]
_080ACD08:
ldr r0, [r4, #0x70]
subs r0, #1
str r0, [r4, #0x70]
movs r1, #1
rsbs r1, r1, #0
cmp r0, r1
bne _080ACDAE
cmp r2, #0
bne _080ACD28
movs r0, #2
b _080ACD32
.align 2, 0
_080ACD20: .4byte gScreenTransition
_080ACD24: .4byte gUnk_0812AAAC
_080ACD28:
ldr r0, _080ACD74 @ =gUnk_0812AABC
ldrb r1, [r4, #0xa]
adds r1, r1, r0
movs r0, #0
ldrsb r0, [r1, r0]
_080ACD32:
str r0, [r4, #0x70]
movs r0, #0x17
movs r1, #0
movs r2, #0
bl CreateObject
adds r6, r0, #0
cmp r6, #0
beq _080ACDAE
bl Random
adds r2, r0, #0
movs r0, #0xf
ands r2, r0
ldr r3, [r4, #0x48]
ldrb r1, [r3, #6]
cmp r1, r2
bge _080ACD58
adds r2, r1, #0
_080ACD58:
movs r0, #1
ands r0, r2
cmp r0, #0
beq _080ACD62
rsbs r2, r2, #0
_080ACD62:
ldrb r0, [r4, #0x14]
lsrs r0, r0, #1
cmp r0, #1
beq _080ACD9C
cmp r0, #1
bgt _080ACD78
cmp r0, #0
beq _080ACD82
b _080ACDAE
.align 2, 0
_080ACD74: .4byte gUnk_0812AABC
_080ACD78:
cmp r0, #2
beq _080ACD8C
cmp r0, #3
beq _080ACDA2
b _080ACDAE
_080ACD82:
ldrb r0, [r3, #7]
ldrh r1, [r4, #0x32]
subs r1, r1, r0
strh r1, [r6, #0x32]
b _080ACD94
_080ACD8C:
ldrh r0, [r4, #0x32]
ldrb r3, [r3, #7]
adds r0, r0, r3
strh r0, [r6, #0x32]
_080ACD94:
ldrh r0, [r4, #0x2e]
adds r0, r0, r2
strh r0, [r6, #0x2e]
b _080ACDAE
_080ACD9C:
ldrh r0, [r4, #0x2e]
adds r0, r0, r1
b _080ACDA6
_080ACDA2:
ldrh r0, [r4, #0x2e]
subs r0, r0, r1
_080ACDA6:
strh r0, [r6, #0x2e]
ldrh r0, [r4, #0x32]
adds r0, r0, r2
strh r0, [r6, #0x32]
_080ACDAE:
pop {r4, r5, r6, r7, pc}
.syntax divided
asm/non_matching/playerItemSwordSpin/sub_0801BB2C.inc
+4
View File
@@ -26,9 +26,13 @@
.else
.ifdef EU
bl CreateItemEntity
.else
.ifdef DEMO_JP
bl CreateItemEntity @ TODO deduplicate
.else
bl sub_080A7C18
.endif
.endif
.endif
ldr r0, _0801BB8C @ =0x00000109
bl SoundReq
asm/non_matching/sittingPerson/sub_0806387C.inc
+16
View File
@@ -7,9 +7,13 @@
.else
.ifdef EU
movs r0, #0xd7
.else
.ifdef DEMO_JP
movs r0, #0xd7 @ TODO deduplicate
.else
movs r0, #0xda
.endif
.endif
.endif
bl CheckLocalFlag
cmp r0, #0
@@ -20,9 +24,13 @@
.else
.ifdef EU
movs r0, #0xd7
.else
.ifdef DEMO_JP
movs r0, #0xd7 @ TODO deduplicate
.else
movs r0, #0xda
.endif
.endif
.endif
bl SetLocalFlag
b _080638D6
@@ -32,9 +40,13 @@ _08063896:
.else
.ifdef EU
movs r0, #0xce
.else
.ifdef DEMO_JP
movs r0, #0xce @ TODO deduplicate
.else
movs r0, #0xd1
.endif
.endif
.endif
bl CheckLocalFlag
cmp r0, #0
@@ -61,9 +73,13 @@ _080638B2:
.else
.ifdef EU
movs r0, #0xce
.else
.ifdef DEMO_JP
movs r0, #0xce @ TODO deduplicate
.else
movs r0, #0xd1
.endif
.endif
.endif
bl SetLocalFlag
ldr r0, _080638FC @ =0x00000A17
asm/non_matching/sittingPerson/sub_0806390C.inc
+8
View File
@@ -7,9 +7,13 @@
.else
.ifdef EU
movs r0, #0xd6
.else
.ifdef DEMO_JP
movs r0, #0xd6 @ TODO deduplicate
.else
movs r0, #0xd9
.endif
.endif
.endif
bl CheckLocalFlag
cmp r0, #0
@@ -20,9 +24,13 @@
.else
.ifdef EU
movs r0, #0xd6
.else
.ifdef DEMO_JP
movs r0, #0xd6 @ TODO deduplicate
.else
movs r0, #0xd9
.endif
.endif
.endif
bl SetLocalFlag
adds r0, r4, #0
asm/non_matching/sub_0804C128.inc
+4
View File
@@ -121,9 +121,13 @@ _0804C206:
.else
.ifdef EU
movs r0, #0x5a
.else
.ifdef DEMO_JP
movs r0, #0x5a @ TODO deduplicate
.else
movs r0, #0x5c
.endif
.endif
.endif
bl CheckLocalFlag
cmp r0, #0
asm/non_matching/sub_0804DE00.inc
+4
View File
@@ -72,9 +72,13 @@ _0804DE5C:
.else
.ifdef EU
movs r0, #0xca
.else
.ifdef DEMO_JP
movs r0, #0xca @ TODO deduplicate
.else
movs r0, #0xcd
.endif
.endif
.endif
bl CheckLocalFlag
cmp r0, #0
asm/non_matching/sub_0804E150.inc
+4
View File
@@ -29,9 +29,13 @@ _0804E17C:
.else
.ifdef EU
movs r0, #0xce
.else
.ifdef DEMO_JP
movs r0, #0xce @ TODO deduplicate
.else
movs r0, #0xd1
.endif
.endif
.endif
bl CheckLocalFlag
cmp r0, #0
asm/octorokBoss.s
+249
View File
@@ -423,6 +423,254 @@ _0803548C:
.align 2, 0
_08035498: .4byte 0x00000109
.else
.ifdef DEMO_JP @ TODO same as JP
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
mov r5, r8
push {r5, r6, r7}
adds r5, r0, #0
adds r0, #0x7c
ldrb r0, [r0]
movs r6, #1
adds r4, r6, #0
ands r4, r0
cmp r4, #0
bne _08035390
adds r0, r5, #0
adds r0, #0x84
ldr r1, [r0]
ldr r1, [r1, #0xc]
adds r1, #0x7d
ldrb r2, [r1]
mov sb, r0
cmp r2, #0
beq _080352D0
subs r0, r2, #1
strb r0, [r1]
_080352D0:
ldr r3, _08035334 @ =gRoomControls
movs r0, #0x84
lsls r0, r0, #1
adds r1, r0, #0
ldrh r0, [r3, #6]
adds r1, r1, r0
ldrh r0, [r5, #0x2e]
subs r1, r1, r0
adds r1, #4
lsls r1, r1, #0x10
lsrs r1, r1, #0x10
ldrh r0, [r3, #8]
ldrh r2, [r5, #0x32]
subs r0, r0, r2
adds r0, #0x8c
lsls r0, r0, #0x10
lsrs r0, r0, #0x10
cmp r1, #8
bhi _080352FAJP
cmp r0, #8
bls _08035338
_080352FAJP:
mov r1, sb
ldr r0, [r1]
strb r6, [r0, #2]
ldrh r0, [r3, #6]
movs r1, #0x84
lsls r1, r1, #1
adds r0, r0, r1
lsls r0, r0, #0x10
ldr r1, [r5, #0x2c]
subs r0, r0, r1
ldrh r1, [r3, #8]
adds r1, #0x88
lsls r1, r1, #0x10
ldr r2, [r5, #0x30]
subs r1, r1, r2
bl sub_080045DA
asrs r0, r0, #3
strb r0, [r5, #0x15]
movs r0, #0x80
lsls r0, r0, #1
strh r0, [r5, #0x24]
adds r0, r5, #0
bl ProcessMovement
adds r7, r5, #0
adds r7, #0x79
b _080353FA
.align 2, 0
_08035334: .4byte gRoomControls
_08035338:
ldrb r0, [r5, #0xb]
cmp r0, #0
bne _0803537C
adds r0, r5, #0
movs r1, #0x87
movs r2, #5
movs r3, #0
bl CreateObjectWithParent
adds r0, r5, #0
movs r1, #0x87
movs r2, #5
movs r3, #1
bl CreateObjectWithParent
adds r0, r5, #0
movs r1, #0x87
movs r2, #5
movs r3, #2
bl CreateObjectWithParent
adds r0, r5, #0
movs r1, #0x87
movs r2, #5
movs r3, #3
bl CreateObjectWithParent
adds r0, r5, #0
movs r1, #0x87
movs r2, #5
movs r3, #4
bl CreateObjectWithParent
strb r6, [r5, #0xb]
_0803537C:
mov r1, sb
ldr r0, [r1]
strb r4, [r0, #2]
adds r1, r5, #0
adds r1, #0x79
ldrb r0, [r1]
subs r0, #1
strb r0, [r1]
adds r7, r1, #0
b _080353FA
_08035390:
adds r0, r5, #0
adds r0, #0x84
ldr r1, [r0]
ldrb r1, [r1, #1]
subs r4, r1, #1
mov sb, r0
adds r7, r5, #0
adds r7, #0x79
cmp r4, #0
beq _080353DC
mov ip, sb
movs r0, #1
mov sl, r0
lsls r0, r4, #2
subs r6, r0, #4
movs r1, #3
mov r8, r1
_080353B2:
mov r1, ip
ldr r0, [r1]
adds r0, #0xc
adds r0, r0, r6
ldr r3, [r0]
ldrb r2, [r3, #0x18]
lsls r1, r2, #0x1e
lsrs r1, r1, #0x1e
mov r0, sl
orrs r1, r0
mov r0, r8
ands r1, r0
movs r0, #4
rsbs r0, r0, #0
ands r0, r2
orrs r0, r1
strb r0, [r3, #0x18]
subs r6, #4
subs r4, #1
cmp r4, #0
bne _080353B2
_080353DC:
ldr r1, _08035450 @ =gScreenTransition
ldr r0, [r1]
movs r1, #2
ands r0, r1
cmp r0, #0
beq _080353F4
adds r0, r5, #0
movs r1, #0x87
movs r2, #6
movs r3, #0
bl CreateObjectWithParent
_080353F4:
ldrb r0, [r7]
subs r0, #1
strb r0, [r7]
_080353FA:
ldrb r0, [r7]
cmp r0, #0
bne _0803548C
movs r0, #2
strb r0, [r5, #0xd]
adds r4, r5, #0
adds r4, #0x7c
ldrb r0, [r4]
adds r0, #1
strb r0, [r4]
adds r0, r5, #0
bl sub_080AE068
ldrb r1, [r4]
movs r0, #1
ands r0, r1
cmp r0, #0
bne _08035454
adds r1, r5, #0
adds r1, #0x3f
movs r0, #0x5f
strb r0, [r1]
movs r1, #0x84
lsls r1, r1, #1
adds r0, r5, #0
bl LoadFixedGFX
adds r0, r5, #0
movs r1, #0xef
bl sub_0801D2B4
adds r0, r5, #0
movs r1, #0xef
bl sub_08036F14
mov r1, sb
ldr r0, [r1]
ldr r0, [r0, #0xc]
movs r1, #1
bl InitAnimationForceUpdate
b _08035480
.align 2, 0
_08035450: .4byte gScreenTransition
_08035454:
adds r1, r5, #0
adds r1, #0x3f
movs r0, #0x61
strb r0, [r1]
ldr r1, _08035498 @ =0x00000109
adds r0, r5, #0
bl LoadFixedGFX
adds r0, r5, #0
movs r1, #0xf0
bl sub_0801D2B4
adds r0, r5, #0
movs r1, #0xf3
bl sub_08036F14
mov r1, sb
ldr r0, [r1]
ldr r0, [r0, #0xc]
movs r1, #2
bl InitAnimationForceUpdate
_08035480:
adds r0, r5, #0
movs r1, #0x87
movs r2, #8
movs r3, #0
bl CreateObjectWithParent
_0803548C:
pop {r3, r4, r5}
mov r8, r3
mov sb, r4
mov sl, r5
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08035498: .4byte 0x00000109
.else
.ifdef EU
push {r4, r5, r6, r7, lr}
@@ -918,6 +1166,7 @@ _080354E8:
.align 2, 0
_080354F4: .4byte 0x00000109
.endif
.endif
.endif
thumb_func_start sub_080354F8
asm/windTribeTeleporter.s
+116
View File
@@ -115,6 +115,121 @@ _080A0FFE:
thumb_func_start sub_080A1000
sub_080A1000: @ 0x080A1000
.ifdef DEMO_JP
push {r4, lr}
adds r4, r0, #0
ldrb r1, [r4, #0xd]
cmp r1, #1
beq _080A0B52
cmp r1, #1
bgt _080A0B3C
cmp r1, #0
beq _080A0B46
b _080A0BB0
_080A0B3C:
cmp r1, #2
beq _080A0B60
cmp r1, #3
beq _080A0B8C
b _080A0BB0
_080A0B46:
movs r0, #0x1e
strb r0, [r4, #0xe]
ldrb r0, [r4, #0xd]
adds r0, #1
strb r0, [r4, #0xd]
b _080A0BF0
_080A0B52:
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
lsls r0, r0, #0x18
cmp r0, #0
bne _080A0BF0
b _080A0B98
_080A0B60:
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
lsls r0, r0, #0x18
cmp r0, #0
bne _080A0B7E
ldrb r0, [r4, #0xd]
adds r0, #1
strb r0, [r4, #0xd]
movs r0, #0x1e
strb r0, [r4, #0xe]
adds r0, #0xf5
bl SoundReq
b _080A0BF0
_080A0B7E:
ldr r0, _080A0B88 @ =gScreenTransition
ldr r0, [r0]
movs r1, #7
b _080A0BDE
.align 2, 0
_080A0B88: .4byte gScreenTransition
_080A0B8C:
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
lsls r0, r0, #0x18
cmp r0, #0
bne _080A0BA4
_080A0B98:
ldrb r0, [r4, #0xd]
adds r0, #1
strb r0, [r4, #0xd]
movs r0, #0x1e
strb r0, [r4, #0xe]
b _080A0BF0
_080A0BA4:
ldr r0, _080A0BAC @ =gScreenTransition
ldr r0, [r0]
b _080A0BDE
.align 2, 0
_080A0BAC: .4byte gScreenTransition
_080A0BB0:
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
lsls r0, r0, #0x18
cmp r0, #0
bne _080A0BD8
movs r0, #0xfc
bl SetLocalFlag
ldrb r1, [r4, #0xb]
lsls r0, r1, #2
adds r0, r0, r1
lsls r0, r0, #2
ldr r1, _080A0BD4 @ =0x0813AA10
adds r0, r0, r1
bl DoExitTransition
b _080A0BF0
.align 2, 0
_080A0BD4: .4byte 0x0813AA10
_080A0BD8:
ldr r0, _080A0BF4 @ =gScreenTransition
ldr r0, [r0]
movs r1, #1
_080A0BDE:
ands r0, r1
cmp r0, #0
bne _080A0BF0
ldr r0, _080A0BF8 @ =gPlayerEntity
ldrb r1, [r0, #0x14]
adds r1, #2
movs r2, #6
ands r1, r2
strb r1, [r0, #0x14]
_080A0BF0:
pop {r4, pc}
.align 2, 0
_080A0BF4: .4byte gScreenTransition
_080A0BF8: .4byte gPlayerEntity
.else
.ifdef JP
push {lr}
adds r1, r0, #0
@@ -460,6 +575,7 @@ _080A10D4:
_080A10D8: .4byte gScreenTransition
_080A10DC: .4byte gPlayerEntity
.endif
.endif
.endif
thumb_func_start sub_080A10E0
data/const/demoScreen.s
+1 -1
View File
@@ -4,7 +4,7 @@
.section .rodata
.align 2
.ifdef DEMO
.ifdef DEMO_USA
@ TODO choose demo screen
demoFunctions::
.4byte sub_080A2E40
data/const/enemy/gyorgFemale.s
+20
View File
@@ -24,12 +24,17 @@ gUnk_080D1A94:: @ 080D1A94
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0D1834, 0x0000018
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0D1834, 0x0000018
.else
.ifdef EU
.incbin "baserom_eu.gba", 0x0D11C0, 0x0000018
.else
.incbin "baserom.gba", 0x0D1A94, 0x0000018
.endif
.endif
.endif
gUnk_080D1AAC:: @ 080D1AAC
@@ -37,36 +42,51 @@ gUnk_080D1AAC:: @ 080D1AAC
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0D184C, 0x0000018
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0D184C, 0x0000018
.else
.ifdef EU
.incbin "baserom_eu.gba", 0x0D11D8, 0x0000018
.else
.incbin "baserom.gba", 0x0D1AAC, 0x0000018
.endif
.endif
.endif
gUnk_080D1AC4:: @ 080D1AC4
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0D1864, 0x0000018
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0D1864, 0x0000018
.else
.ifdef EU
.incbin "baserom_eu.gba", 0x0D11F0, 0x0000018
.else
.incbin "baserom.gba", 0x0D1AC4, 0x0000018
.endif
.endif
.endif
gUnk_080D1ADC:: @ 080D1ADC
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0D187C, 0x0000018
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0D187C, 0x0000018
.else
.ifdef EU
.incbin "baserom_eu.gba", 0x0D1208, 0x0000018
.else
.incbin "baserom.gba", 0x0D1ADC, 0x0000018
.endif
.endif
.endif
gUnk_080D1AF4:: @ 080D1AF4
.incbin "baserom.gba", 0x0D1AF4, 0x0000004
data/const/npc/forestMinish.s
+10
View File
@@ -70,12 +70,17 @@ gUnk_08109F6C:: @ 08109F6C
@ TODO only small differences
.incbin "baserom_jp.gba", 0x109C30, 0x000002B
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x109C30, 0x000002B
.else
.ifdef EU
.incbin "baserom_jp.gba", 0x109C30, 0x000002B
.else
.incbin "baserom.gba", 0x109F6C, 0x000002B
.endif
.endif
.endif
gUnk_08109F97:: @ 08109F97
@@ -83,12 +88,17 @@ gUnk_08109F97:: @ 08109F97
@ TODO only small differences
.incbin "baserom_jp.gba", 0x109C5B, 0x00000B1
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x109C5B, 0x00000B1
.else
.ifdef EU
.incbin "baserom_jp.gba", 0x109C5B, 0x00000B1
.else
.incbin "baserom.gba", 0x109F97, 0x00000B1
.endif
.endif
.endif
gUnk_0810A048:: @ 0810A048
.incbin "baserom.gba", 0x10A048, 0x0000024
data/const/npc/kid.s
+5
View File
@@ -55,12 +55,17 @@ gUnk_0810C00F:: @ 0810C00F
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10BCD3, 0x0000091
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10BCD3, 0x0000091
.else
.ifdef EU
.incbin "baserom_jp.gba", 0x10BCD3, 0x0000091
.else
.incbin "baserom.gba", 0x10C00F, 0x0000091
.endif
.endif
.endif
gUnk_0810C0A0:: @ 0810C0A0
.incbin "baserom.gba", 0x10C0A0, 0x0000024
data/const/npc/townsperson.s
+20
View File
@@ -87,24 +87,34 @@ gUnk_0810B922:: @ 0810B922
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10B5E6, 0x0000049
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10B5E6, 0x0000049
.else
.ifdef EU
.incbin "baserom_jp.gba", 0x10B5E6, 0x0000049
.else
.incbin "baserom.gba", 0x10B922, 0x0000049
.endif
.endif
.endif
gUnk_0810B96B:: @ 0810B96B
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10B62F, 0x0000065
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10B62F, 0x0000065
.else
.ifdef EU
.incbin "baserom_jp.gba", 0x10B62F, 0x0000065
.else
.incbin "baserom.gba", 0x10B96B, 0x0000065
.endif
.endif
.endif
gUnk_0810B9D0:: @ 0810B9D0
.incbin "baserom.gba", 0x10B9D0, 0x0000031
@@ -114,12 +124,17 @@ gUnk_0810BA01:: @ 0810BA01
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10B6C5, 0x0000117
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10B6C5, 0x0000117
.else
.ifdef EU
.incbin "baserom_jp.gba", 0x10B6C5, 0x0000117
.else
.incbin "baserom.gba", 0x10BA01, 0x0000117
.endif
.endif
.endif
gUnk_0810BB18:: @ 0810BB18
.incbin "baserom.gba", 0x10BB18, 0x0000044
@@ -134,12 +149,17 @@ gUnk_0810BBCC:: @ 0810BBCC
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10B890, 0x000009C
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10B890, 0x000009C
.else
.ifdef EU
.incbin "baserom_jp.gba", 0x10B890, 0x000009C
.else
.incbin "baserom.gba", 0x10BBCC, 0x000009C
.endif
.endif
.endif
gUnk_0810BC68:: @ 0810BC68
.incbin "baserom.gba", 0x10BC68, 0x0000098
data/const/npc/windTribespeople.s
+10
View File
@@ -50,24 +50,34 @@ gUnk_08113B28:: @ 08113B28
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1137EC, 0x0000008
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1137EC, 0x0000008
.else
.ifdef EU
.incbin "baserom_jp.gba", 0x1137EC, 0x0000008
.else
.incbin "baserom.gba", 0x113B28, 0x0000008
.endif
.endif
.endif
gUnk_08113B30:: @ 08113B30
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1137F4, 0x0000008
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1137F4, 0x0000008
.else
.ifdef EU
.incbin "baserom_jp.gba", 0x1137F4, 0x0000008
.else
.incbin "baserom.gba", 0x113B30, 0x0000008
.endif
.endif
.endif
gUnk_08113B38:: @ 08113B38
.incbin "baserom.gba", 0x113B38, 0x0000007
data/const/object/object96.s
+5 -1
View File
@@ -23,11 +23,15 @@ gUnk_08123FB0:: @ 08123FB0
.ifdef JP
.4byte 0x000000CD
.else
.ifdef EU
.ifdef DEMO_JP
.4byte 0x000000CD
.else
.ifdef EU
.4byte 0x000000CD @ TODO deduplicate
.else
.4byte 0x000000d0
.endif
.endif
.endif
.4byte sub_0809D91C
.4byte 00000000
data/const/object/pinwheel.s
+4
View File
@@ -8,12 +8,16 @@ gUnk_08125050:: @ 08125050
.ifdef JP
.incbin "baserom_jp.gba", 0x124D14, 0x000000C
.else
.ifdef DEMO_JP
.incbin "baserom_jp.gba", 0x124D14, 0x000000C
.else
.ifdef EU
.incbin "baserom_jp.gba", 0x124D14, 0x000000C
.else
.incbin "baserom.gba", 0x125050, 0x000000C
.endif
.endif
.endif
gUnk_0812505C:: @ 0812505C
.4byte sub_080A23DC
data/data_080B2A70.s
+4
View File
@@ -24,9 +24,13 @@ gUnk_080B2A70:: @ 080B2A70
@ TODO contains some pointers to iwram
.ifdef EU
.incbin "baserom_eu.gba", 0x0B21D0, 0x0000230
.else
.ifdef DEMO_JP
.incbin "baserom_eu.gba", 0x0B21D0, 0x0000230
.else
.incbin "baserom.gba", 0x0B2AA8, 0x0000230
.endif
.endif
data/data_080B3740.s
+4
View File
@@ -58,7 +58,11 @@ gUnk_080B3D20:: @ 080B3D20
.else
.ifdef EU
.incbin "baserom_jp.gba", 0x0B3AC0, 0x00000B0
.else
.ifdef DEMO_JP
.incbin "baserom_jp.gba", 0x0B3AC0, 0x00000B0 @ TODO deduplicate
.else
.incbin "baserom.gba", 0x0B3D20, 0x00000B0
.endif
.endif
.endif
data/data_080B4410.s
+4
View File
@@ -11,10 +11,14 @@ gUnk_080B4410:: @ 080B4410
.else
.ifdef EU
.incbin "baserom_jp.gba", 0x0B41B0, 0x0000048
.else
.ifdef DEMO_JP
.incbin "baserom_jp.gba", 0x0B41B0, 0x0000048 @ TODO deduplicate
.else
.incbin "baserom.gba", 0x0B4410, 0x0000048
.endif
.endif
.endif
gUnk_080B4458:: @ 080B4458
.4byte sub_08019698
data/data_080C93E0.s
+40
View File
@@ -148,10 +148,14 @@ gUnk_080C9870:: @ 080C9870
.else
.ifdef JP
.incbin "baserom_jp.gba", 0x0C9610, 0x0000078
.else
.ifdef DEMO_JP
.incbin "baserom_jp.gba", 0x0C9610, 0x0000078 @ TODO deduplicate
.else
.incbin "baserom.gba", 0x0C9870, 0x0000078
.endif
.endif
.endif
gUnk_080C98E8:: @ 080C98E8
.ifdef EU
@@ -160,10 +164,14 @@ gUnk_080C98E8:: @ 080C98E8
.else
.ifdef JP
.incbin "baserom_jp.gba", 0x0C9688, 0x0000040
.else
.ifdef DEMO_JP
.incbin "baserom_jp.gba", 0x0C9688, 0x0000040 @ TODO deduplicate
.else
.incbin "baserom.gba", 0x0C98E8, 0x0000040
.endif
.endif
.endif
gUnk_080C9928:: @ 080C9928
.ifdef EU
@@ -172,10 +180,14 @@ gUnk_080C9928:: @ 080C9928
.else
.ifdef JP
.incbin "baserom_jp.gba", 0x0C96C8, 0x0000060
.else
.ifdef DEMO_JP
.incbin "baserom_jp.gba", 0x0C96C8, 0x0000060 @ TODO deduplicate
.else
.incbin "baserom.gba", 0x0C9928, 0x0000060
.endif
.endif
.endif
gUnk_080C9988:: @ 080C9988
.ifdef EU
@@ -184,10 +196,14 @@ gUnk_080C9988:: @ 080C9988
.else
.ifdef JP
.incbin "baserom_jp.gba", 0x0C9728, 0x0000060
.else
.ifdef DEMO_JP
.incbin "baserom_jp.gba", 0x0C9728, 0x0000060 @ TODO deduplicate
.else
.incbin "baserom.gba", 0x0C9988, 0x0000060
.endif
.endif
.endif
gUnk_080C99E8:: @ 080C99E8
.ifdef EU
@@ -196,10 +212,14 @@ gUnk_080C99E8:: @ 080C99E8
.else
.ifdef JP
.incbin "baserom_jp.gba", 0x0C9788, 0x0000048
.else
.ifdef DEMO_JP
.incbin "baserom_jp.gba", 0x0C9788, 0x0000048 @ TODO deduplicate
.else
.incbin "baserom.gba", 0x0C99E8, 0x0000048
.endif
.endif
.endif
gUnk_080C9A30:: @ 080C9A30
.4byte gUnk_080C9870
@@ -215,10 +235,14 @@ gUnk_080C9A44:: @ 080C9A44
.else
.ifdef JP
.incbin "baserom_jp.gba", 0x0C97E4, 0x0000038
.else
.ifdef DEMO_JP
.incbin "baserom_jp.gba", 0x0C97E4, 0x0000038 @ TODO deduplicate
.else
.incbin "baserom.gba", 0x0C9A44, 0x0000038
.endif
.endif
.endif
gUnk_080C9A7C:: @ 080C9A7C
.ifdef EU
@@ -227,10 +251,14 @@ gUnk_080C9A7C:: @ 080C9A7C
.else
.ifdef JP
.incbin "baserom_jp.gba", 0x0C981C, 0x00000B0
.else
.ifdef DEMO_JP
.incbin "baserom_jp.gba", 0x0C981C, 0x00000B0 @ TODO deduplicate
.else
.incbin "baserom.gba", 0x0C9A7C, 0x00000B0
.endif
.endif
.endif
gUnk_080C9B2C:: @ 080C9B2C
.ifdef EU
@@ -239,10 +267,14 @@ gUnk_080C9B2C:: @ 080C9B2C
.else
.ifdef JP
.incbin "baserom_jp.gba", 0x0C98CC, 0x0000088
.else
.ifdef DEMO_JP
.incbin "baserom_jp.gba", 0x0C98CC, 0x0000088 @ TODO deduplicate
.else
.incbin "baserom.gba", 0x0C9B2C, 0x0000088
.endif
.endif
.endif
gUnk_080C9BB4:: @ 080C9BB4
.ifdef EU
@@ -251,10 +283,14 @@ gUnk_080C9BB4:: @ 080C9BB4
.else
.ifdef JP
.incbin "baserom_jp.gba", 0x0C9954, 0x0000068
.else
.ifdef DEMO_JP
.incbin "baserom_jp.gba", 0x0C9954, 0x0000068 @ TODO deduplicate
.else
.incbin "baserom.gba", 0x0C9BB4, 0x0000068
.endif
.endif
.endif
gUnk_080C9C1C:: @ 080C9C1C
.ifdef EU
@@ -263,10 +299,14 @@ gUnk_080C9C1C:: @ 080C9C1C
.else
.ifdef JP
.incbin "baserom_jp.gba", 0x0C99BC, 0x0000020
.else
.ifdef DEMO_JP
.incbin "baserom_jp.gba", 0x0C99BC, 0x0000020 @ TODO deduplicate
.else
.incbin "baserom.gba", 0x0C9C1C, 0x0000020
.endif
.endif
.endif
gUnk_080C9C3C:: @ 080C9C3C
.4byte gUnk_080C9A44
data/data_080D5360.s
+331
View File
File diff suppressed because it is too large Load Diff
data/data_080FC8A4.s
+30
View File
@@ -130,12 +130,17 @@ gUnk_080FCB62:: @ 080FCB62
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FC812, 0x0000032
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FC812, 0x0000032
.else
.ifdef EU
.incbin "baserom_jp.gba", 0x0FC812, 0x0000032
.else
.incbin "baserom.gba", 0x0FCB62, 0x0000032
.endif
.endif
.endif
gUnk_080FCB94:: @ 080FCB94
.incbin "baserom.gba", 0x0FCB94, 0x0000020
@@ -1228,24 +1233,34 @@ gUnk_080FE320:: @ 080FE320
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FDFD0, 0x00002F0
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FDFD0, 0x00002F0
.else
.ifdef EU
.incbin "baserom_jp.gba", 0x0FDFD0, 0x00002F0
.else
.incbin "baserom.gba", 0x0FE320, 0x00002F0
.endif
.endif
.endif
gUnk_080FE610:: @ 080FE610
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FE2C0, 0x00004B8
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_demo_jp.gba", 0x0FDDF4, 0x00004B8
.else
.ifdef EU
.incbin "baserom_jp.gba", 0x0FE2C0, 0x00004B8
.else
.incbin "baserom.gba", 0x0FE610, 0x00004B8
.endif
.endif
.endif
gUnk_080FEAC8:: @ 080FEAC8
.incbin "baserom.gba", 0x0FEAC8, 0x0000003
@@ -1258,24 +1273,34 @@ gUnk_080FEAEE:: @ 080FEAEE
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FE79E, 0x000002C
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FE79E, 0x000002C
.else
.ifdef EU
.incbin "baserom_jp.gba", 0x0FE79E, 0x000002C
.else
.incbin "baserom.gba", 0x0FEAEE, 0x000002C
.endif
.endif
.endif
gUnk_080FEB1A:: @ 080FEB1A
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FE7CA, 0x00000C2
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_demo_jp.gba", 0x0FE2FE, 0x00000C2
.else
.ifdef EU
.incbin "baserom_jp.gba", 0x0FE7CA, 0x00000C2
.else
.incbin "baserom.gba", 0x0FEB1A, 0x00000C2
.endif
.endif
.endif
gUnk_080FEBDC:: @ 080FEBDC
.incbin "baserom.gba", 0x0FEBDC, 0x000000C
@@ -1329,12 +1354,17 @@ gUnk_080FEE58:: @ 080FEE58
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FEB08, 0x0000020
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FEB08, 0x0000020
.else
.ifdef EU
.incbin "baserom_jp.gba", 0x0FEB08, 0x0000020
.else
.incbin "baserom.gba", 0x0FEE58, 0x0000020
.endif
.endif
.endif
gUnk_080FEE78:: @ 080FEE78
.incbin "baserom.gba", 0x0FEE78, 0x0000030
data/data_080FEEB8.s
+111
View File
@@ -39,12 +39,16 @@ gUnk_080FEF48:: @ 080FEF48
.ifdef JP
.incbin "baserom_jp.gba", 0x0FEC08, 0x0000020
.else
.ifdef DEMO_JP
.incbin "baserom_jp.gba", 0x0FEC08, 0x0000020 @ TODO deduplicate
.else
.ifdef EU
.incbin "baserom_jp.gba", 0x0FEC08, 0x0000020
.else
.incbin "baserom.gba", 0x0FEF58, 0x0000020
.endif
.endif
.endif
gUnk_080FEF78:: @ 080FEF78
.incbin "baserom.gba", 0x0FEF78, 0x000000C
@@ -1912,10 +1916,14 @@ gUnk_080FFBA8:: @ 080FFBA8
.else
.ifdef EU
.incbin "baserom_eu.gba", 0x0FF0DC, 0x0000048
.else
.ifdef DEMO_JP
.incbin "baserom_jp.gba", 0x0FF858, 0x0000035
.else
.incbin "baserom.gba", 0x0FFBA8, 0x0000035
.endif
.endif
.endif
gUnk_080FFBDD:: @ 080FFBDD
.ifdef JP
@@ -1923,10 +1931,14 @@ gUnk_080FFBDD:: @ 080FFBDD
.else
.ifdef EU
.incbin "baserom_eu.gba", 0x0FF124, 0x0000054
.else
.ifdef DEMO_JP
.incbin "baserom_jp.gba", 0x0FF88D, 0x000001f
.else
.incbin "baserom.gba", 0x0FFBDD, 0x0000013
.endif
.endif
.endif
gUnk_080FFBF0:: @ 080FFBF0
.ifdef JP
@@ -1935,10 +1947,15 @@ gUnk_080FFBF0:: @ 080FFBF0
.else
.ifdef EU
.incbin "baserom_eu.gba", 0x0FF178, 0x0000054
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FF8AC, 0x0000024
.else
.incbin "baserom.gba", 0x0FFBF0, 0x0000024
.endif
.endif
.endif
gUnk_080FFC14:: @ 080FFC14
.incbin "baserom.gba", 0x0FFC14, 0x0000024
@@ -1950,9 +1967,14 @@ gUnk_080FFC68:: @ 080FFC68
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FF924, 0x0000018
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FF924, 0x0000018
.else
.incbin "baserom.gba", 0x0FFC68, 0x0000018
.endif
.endif
gUnk_080FFC80:: @ 080FFC80
.incbin "baserom.gba", 0x0FFC80, 0x000000C
@@ -1973,9 +1995,14 @@ gUnk_080FFCD4:: @ 080FFCD4
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FF990, 0x0000018
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FF990, 0x0000018
.else
.incbin "baserom.gba", 0x0FFCD4, 0x0000018
.endif
.endif
gUnk_080FFCEC:: @ 080FFCEC
.incbin "baserom.gba", 0x0FFCEC, 0x0000001
@@ -1984,21 +2011,36 @@ gUnk_080FFCED:: @ 080FFCED
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FF9A9, 0x0000017
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FF9A9, 0x0000017
.else
.incbin "baserom.gba", 0x0FFCED, 0x0000017
.endif
.endif
gUnk_080FFD04:: @ 080FFD04
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FF9C0, 0x0000018
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x0FF9C0, 0x0000018
.else
.incbin "baserom.gba", 0x0FFD04, 0x0000018
.endif
.endif
.ifdef JP
gUnk_080FF9D8:: @ 080FF9D8
.incbin "baserom_jp.gba", 0x0FF9D8, 0x000000C
.else
.ifdef DEMO_JP
gUnk_080FF9D8:: @ 080FF9D8
.incbin "baserom_jp.gba", 0x0FF9D8, 0x000000C @ TODO deduplicate
.endif
.endif
gUnk_080FFD1C:: @ 080FFD1C
@@ -2287,9 +2329,14 @@ gUnk_08100388:: @ 08100388
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x100050, 0x0000054
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x100050, 0x0000054
.else
.incbin "baserom.gba", 0x100388, 0x0000054
.endif
.endif
gUnk_081003DC:: @ 081003DC
.incbin "baserom.gba", 0x1003DC, 0x0000024
@@ -2301,57 +2348,92 @@ gUnk_08100401:: @ 08100401
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1000C9, 0x0000006
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1000C9, 0x0000006
.else
.incbin "baserom.gba", 0x100401, 0x0000006
.endif
.endif
gUnk_08100407:: @ 08100407
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1000CF, 0x000001D
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1000CF, 0x000001D
.else
.incbin "baserom.gba", 0x100407, 0x000001D
.endif
.endif
gUnk_08100424:: @ 08100424
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1000EC, 0x0000048
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1000EC, 0x0000048
.else
.incbin "baserom.gba", 0x100424, 0x0000048
.endif
.endif
gUnk_0810046C:: @ 0810046C
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x100134, 0x0000048
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x100134, 0x0000048
.else
.incbin "baserom.gba", 0x10046C, 0x0000048
.endif
.endif
gUnk_081004B4:: @ 081004B4
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10017C, 0x0000018
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10017C, 0x0000018
.else
.incbin "baserom.gba", 0x1004B4, 0x0000018
.endif
.endif
gUnk_081004CC:: @ 081004CC
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x100194, 0x0000024
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x100194, 0x0000024
.else
.incbin "baserom.gba", 0x1004CC, 0x0000024
.endif
.endif
gUnk_081004F0:: @ 081004F0
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1001B8, 0x0000008
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1001B8, 0x0000008
.else
.incbin "baserom.gba", 0x1004F0, 0x0000008
.endif
.endif
gUnk_081004F8:: @ 081004F8
.incbin "baserom.gba", 0x1004F8, 0x0000002
@@ -2360,17 +2442,27 @@ gUnk_081004FA:: @ 081004FA
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1001C2, 0x0000004
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1001C2, 0x0000004
.else
.incbin "baserom.gba", 0x1004FA, 0x0000004
.endif
.endif
gUnk_081004FE:: @ 081004FE
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1001C6, 0x0000012
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1001C6, 0x0000012
.else
.incbin "baserom.gba", 0x1004FE, 0x0000012
.endif
.endif
gUnk_08100510:: @ 08100510
.incbin "baserom.gba", 0x100510, 0x0000001
@@ -2532,9 +2624,14 @@ gUnk_08100970:: @ 08100970
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x100638, 0x000003C
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x100638, 0x000003C
.else
.incbin "baserom.gba", 0x100970, 0x000003C
.endif
.endif
gUnk_081009AC:: @ 081009AC
.incbin "baserom.gba", 0x1009AC, 0x000000C
@@ -2579,17 +2676,27 @@ gUnk_08100A11:: @ 08100A11
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1006D9, 0x000001F
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1006D9, 0x000001F
.else
.incbin "baserom.gba", 0x100A11, 0x000001F
.endif
.endif
gUnk_08100A30:: @ 08100A30
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1006F8, 0x0000054
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x1006F8, 0x0000054
.else
.incbin "baserom.gba", 0x100A30, 0x0000054
.endif
.endif
gUnk_08100A84:: @ 08100A84
.incbin "baserom.gba", 0x100A84, 0x000000C
@@ -2614,8 +2721,12 @@ gUnk_08100AA8:: @ 08100AA8
.4byte gUnk_080FFD04
.ifdef JP
.4byte gUnk_080FF9D8
.else
.ifdef DEMO_JP
.4byte gUnk_080FF9D8
.else
.4byte gUnk_080FFD1C
.endif
.endif
.4byte gUnk_080FFC98
.4byte gUnk_080FFCB0
data/data_0812AA88.s
-8209
View File
File diff suppressed because it is too large Load Diff
data/data_081320FC.s
+6
View File
@@ -4,6 +4,12 @@
.section .rodata
.align 2
.ifdef DEMO_JP
@ TODO check whether this is the same save as one of the DEMO_USA ones
.incbin "baserom_demo_jp.gba", 0x131830, 0x500
.endif
gUnk_0813210C:: @ 0813210C
.incbin "baserom.gba", 0x13210C, 0x0000004
.4byte gUnk_0813235C
data/data_08132B30.s
+6 -2
View File
@@ -2540,7 +2540,7 @@ gUnk_0813A7F0:: @ 0813A7F0
.4byte gUnk_08133FDC
.4byte gUnk_08133FDC
.4byte gUnk_08133FDC
.ifndef DEMO
.ifndef DEMO_USA
.4byte gUnk_08139108
.4byte gUnk_081391D0
.4byte gUnk_081391FC
@@ -11041,7 +11041,10 @@ gUnk_08545666:: @ 08545666
.ifdef JP
.incbin "baserom_jp.gba", 0x546192, 0x5C98E
.else
@ TODO JP differs from here
.ifdef DEMO_JP
.incbin "baserom_jp.gba", 0x546192, 0x5C98E
.else
gUnk_08546566:: @ 08546566
.incbin "baserom.gba", 0x546566, 0x00019E4
@@ -11344,6 +11347,7 @@ gUnk_085A0806:: @ 085A0806
.endif
.endif
.endif
@ TODO JP and EU differ to here
data/map_headers.s
+804
View File
File diff suppressed because it is too large Load Diff
data/metatile_headers.s
+68
View File
@@ -561,6 +561,10 @@ gAreaMetatiles_PalaceOfWindsBoss:: @ 08102ED4
metatiles_top 0x223680, 0x108, 1
metatile_types_top 0x2236C8, 0x42, 1, 1
.else
.ifdef DEMO_JP
metatiles_top 0x223680, 0x108, 1
metatile_types_top 0x2236C8, 0x42, 1, 1
.else
.ifdef EU
metatiles_top 0x22360C+0x48, 0x108, 1
metatile_types_top 0x223654+0x48, 0x42, 1, 1
@@ -569,6 +573,7 @@ gAreaMetatiles_PalaceOfWindsBoss:: @ 08102ED4
metatile_types_top 0x223654, 0x42, 1, 1
.endif
.endif
.endif
gAreaMetatiles_Sanctuary:: @ 08102EEC
.ifdef JP
@@ -577,6 +582,12 @@ gAreaMetatiles_Sanctuary:: @ 08102EEC
metatile_types_bottom 0x236424, 0xD88, 1
metatile_types_top 0x236788, 0xD88, 1, 1
.else
.ifdef DEMO_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
.ifdef EU
metatiles_bottom 0x2333A4+0x48, 0x3620, 1
metatiles_top 0x2352AC+0x48, 0x3620, 1
@@ -589,6 +600,7 @@ gAreaMetatiles_Sanctuary:: @ 08102EEC
metatile_types_top 0x236714, 0xD88, 1, 1
.endif
.endif
.endif
gAreaMetatiles_HyruleCastle:: @ 08102F1C
@@ -598,6 +610,12 @@ gAreaMetatiles_HyruleCastle:: @ 08102F1C
metatile_types_bottom 0x240440, 0xDF0, 1
metatile_types_top 0x24086C, 0xD84, 1, 1
.else
.ifdef DEMO_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
.ifdef EU
metatiles_bottom 0x23D1B0+0x48, 0x37C0, 1
metatiles_top 0x23EF24+0x48, 0x3610, 1
@@ -610,6 +628,7 @@ gAreaMetatiles_HyruleCastle:: @ 08102F1C
metatile_types_top 0x2407F8, 0xD84, 1, 1
.endif
.endif
.endif
gAreaMetatiles_SanctuaryEntrance:: @ 08102F4C
.ifdef JP
@@ -618,6 +637,12 @@ gAreaMetatiles_SanctuaryEntrance:: @ 08102F4C
metatile_types_bottom 0x24702C, 0x51E, 1
metatile_types_top 0x24719C, 0x3FC, 1, 1
.else
.ifdef DEMO_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
.ifdef EU
metatiles_bottom 0x2460E4+0x48, 0x1478, 1
metatiles_top 0x246C38+0x48, 0xFF0, 1
@@ -630,6 +655,7 @@ gAreaMetatiles_SanctuaryEntrance:: @ 08102F4C
metatile_types_top 0x247128, 0x3FC, 1, 1
.endif
.endif
.endif
gAreaMetatiles_DarkHyruleCastle:: @ 08102F7C
.ifdef JP
@@ -638,6 +664,12 @@ gAreaMetatiles_DarkHyruleCastle:: @ 08102F7C
metatile_types_bottom 0x2524F4, 0xFF6, 1
metatile_types_top 0x252A7C, 0xDF0, 1, 1
.else
.ifdef DEMO_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
.ifdef EU
metatiles_bottom 0x24D8CC+0x48, 0x3FD8, 1
metatiles_top 0x25060C+0x48, 0x37C0, 1
@@ -650,6 +682,7 @@ gAreaMetatiles_DarkHyruleCastle:: @ 08102F7C
metatile_types_top 0x252A08, 0xDF0, 1, 1
.endif
.endif
.endif
gAreaMetatiles_DarkHyruleCastleOutside:: @ 08102FAC
.ifdef JP
@@ -658,6 +691,12 @@ gAreaMetatiles_DarkHyruleCastleOutside:: @ 08102FAC
metatile_types_bottom 0x276048, 0xCD0, 1
metatile_types_top 0x276324, 0x7BC, 1, 1
.else
.ifdef DEMO_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
.ifdef EU
metatiles_bottom 0x273E74+0x48, 0x3340, 1
metatiles_top 0x275398+0x48, 0x1EF0, 1
@@ -670,6 +709,7 @@ gAreaMetatiles_DarkHyruleCastleOutside:: @ 08102FAC
metatile_types_top 0x2762B0, 0x7BC, 1, 1
.endif
.endif
.endif
gAreaMetatiles_DarkHyruleCastleBridge:: @ 08102FDC
.ifdef JP
@@ -678,6 +718,12 @@ gAreaMetatiles_DarkHyruleCastleBridge:: @ 08102FDC
metatile_types_bottom 0x257D78, 0xD84, 1
metatile_types_top 0x257FEC, 0xD84, 1, 1
.else
.ifdef DEMO_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
.ifdef EU
metatiles_bottom 0x256614+0x48, 0x3610, 1
metatiles_top 0x2573F4+0x48, 0x3610, 1
@@ -690,6 +736,7 @@ gAreaMetatiles_DarkHyruleCastleBridge:: @ 08102FDC
metatile_types_top 0x257F78, 0xD84, 1, 1
.endif
.endif
.endif
gAreaMetatiles_VaatisArms:: @ 0810300C
.ifdef JP
@@ -698,6 +745,12 @@ gAreaMetatiles_VaatisArms:: @ 0810300C
metatile_types_bottom 0x264DBC, 0x5F2, 1
metatile_types_top 0x264EC0, 0x2F0, 1, 1
.else
.ifdef DEMO_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
.ifdef EU
metatiles_bottom 0x263CFC+0x48, 0x17C8, 1
metatiles_top 0x2649C4+0x48, 0xBC0, 1
@@ -710,6 +763,7 @@ gAreaMetatiles_VaatisArms:: @ 0810300C
metatile_types_top 0x264E4C, 0x2F0, 1, 1
.endif
.endif
.endif
gAreaMetatiles_Vaati3:: @ 0810303C
.ifdef JP
@@ -718,6 +772,12 @@ gAreaMetatiles_Vaati3:: @ 0810303C
metatile_types_bottom 0x25CFC4, 0x3A0, 1
metatile_types_top 0x25D098, 0x26E, 1, 1
.else
.ifdef DEMO_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
.ifdef EU
metatiles_bottom 0x25C6BC+0x48, 0xE80, 1
metatiles_top 0x25CD74+0x48, 0x9B8, 1
@@ -730,6 +790,7 @@ gAreaMetatiles_Vaati3:: @ 0810303C
metatile_types_top 0x25D024, 0x26E, 1, 1
.endif
.endif
.endif
gAreaMetatiles_Vaati2:: @ 0810306C
.ifdef JP
@@ -738,6 +799,12 @@ gAreaMetatiles_Vaati2:: @ 0810306C
metatile_types_bottom 0x260D30, 0x214, 1
metatile_types_top 0x260DAC, 0xA6, 1, 1
.else
.ifdef DEMO_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
.ifdef EU
metatiles_bottom 0x2607F0+0x48, 0x850, 1
metatiles_top 0x260C1C+0x48, 0x298, 1
@@ -750,6 +817,7 @@ gAreaMetatiles_Vaati2:: @ 0810306C
metatile_types_top 0x260D38, 0xA6, 1, 1
.endif
.endif
.endif
gAreaMetatiles:: @ 0810309C
data/scripts/script_08008B5C.inc
+24 -24
View File
@@ -1,60 +1,60 @@
SCRIPT_START script_08008B5C
BeginBlock
_0807E9D4
BeginBlock
_0807E9D4
_0807EB44 0x0004
_0807E930 0x0000
DoPostScriptAction 0x000a
EndBlock
EndBlock
script_08008B6E:
_0807E944
_0807E864
_0807E944
_0807E864
_0807E930 0x0004
Call sub_0807F2D4
Call sub_0806BBB0
_0807EA94
_0807EA94
_0807E930 0x0008
_0807E878
_0807E878
Jump script_08008B6E
.2byte 0x0000
SCRIPT_START script_08008B90
BeginBlock
_0807E9D4
BeginBlock
_0807E9D4
_0807EB44 0x0004
DoPostScriptAction 0x000a
_0807E930 0x0000
EndBlock
EndBlock
script_08008BA2:
_0807E944
_0807E864
_0807E944
_0807E864
_0807E930 0x0004
Call sub_0807F2D4
MessageFromTarget 0x4912
_0807EA94
_0807E930 0x0008
_0807E878
_0807E878
Jump script_08008BA2
SCRIPT_START script_08008BC0
BeginBlock
_0807E9D4
BeginBlock
_0807E9D4
_0807EB44 0x0004
DoPostScriptAction 0x000a
_0807E930 0x0000
.ifdef EU
SetGlobalFlag 0x0061
.endif
EndBlock
EndBlock
script_08008BD2:
_0807E944
_0807E864
_0807E944
_0807E864
.ifndef EU
SetGlobalFlag 0x0061
.endif
_0807E930 0x0004
Call sub_0807F2D4
_0807EA94
_0807EA94
Call sub_0806BA34
JumpIfNot script_08008C54
_0807EA94
_0807EA94
CallWithArg sub_0806BB1C, 0x00000000
Call sub_0807F2D4
CallWithArg sub_0806BB1C, 0x00000001
@@ -78,18 +78,18 @@ script_08008C54:
_0807E930 0x0008
Wait 0x000f
script_08008C5C:
_0807EA94
_0807E878
_0807EA94
_0807E878
Jump script_08008BD2
SCRIPT_START script_08008C64
BeginBlock
BeginBlock
SetEntityPositionRelative 0x0068, 0x0018
DoPostScriptAction 0x000f
_0807EB44 0x0004
_0807E930 0x0004
SetEntitySpeed 0x0300
PlaySound SFX_STAIRS
EndBlock
EndBlock
WaitForSomething 0x00000002
MessageNoOverlap 0x490d
_0807EA94
data/scripts/script_08008D50.inc
+4 -4
View File
@@ -1,15 +1,15 @@
SCRIPT_START script_08008D50
BeginBlock
BeginBlock
SetEntityPositionRelative 0x0068, 0x0068
_0807F0B4 0x0004
CameraTargetEntity
EndBlock
CameraTargetEntity
EndBlock
Wait 0x001e
_0807E5F8 0x00000002
WaitForSomething 0x00000001
Wait 0x000f
_0807F0B4 0x0004
CameraTargetPlayer
CameraTargetPlayer
Wait 0x001e
_0807E5F8 0x00000004
DoPostScriptAction 0x0006
data/scripts/script_08008D8C.inc
+27 -27
View File
@@ -1,52 +1,52 @@
SCRIPT_START script_08008D8C
BeginBlock
BeginBlock
Call sub_08061FD8
Call sub_08061E70
DoPostScriptAction 0x000a
EndBlock
EndBlock
script_08008DA0:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_08008DA0
_0807E864
_0807EB74
_0807E864
_0807EB74
Call sub_08061FD8
Call sub_08062048
_0807EA94
_0807E878
_0807EA94
_0807E878
Jump script_08008DA0
.2byte 0x0000
SCRIPT_START script_08008DC0
BeginBlock
_0807E9D4
BeginBlock
_0807E9D4
DoPostScriptAction 0x000a
_0807EB44 0x0004
CallWithArg sub_0807F3D8, 0x00000000
EndBlock
EndBlock
script_08008DD8:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_08008DD8
_0807E864
_0807EB74
_0807E864
_0807EB74
CallWithArg sub_0807F3D8, 0x00000000
Call sub_080643D8
_0807EA94
_0807E878
_0807EA94
_0807E878
_0807EB44 0x0004
CallWithArg sub_0807F3D8, 0x00000000
Jump script_08008DD8
SCRIPT_START script_08008E08
BeginBlock
BeginBlock
SetEntityPositionRelative 0x0088, 0x0078
EndBlock
EndBlock
script_08008E12:
CheckPlayerInRegion 0x00d8, 0x0098, 0x4020
JumpIfNot script_08008E12
_0807E864
_0807E864
Call sub_0807F9A4
Call sub_0807DF28
_0807F0B4 0x0001
CameraTargetEntity
WaitForPlayerAction0x17
CameraTargetEntity
WaitForPlayerAction0x17
Wait 0x003c
StartPlayerScript script_08008F74
WaitForSomething2 0x00000020
@@ -81,32 +81,32 @@ script_08008E12:
_0807E5F8 0x00000001
WaitForSomething2 0x00000002
_0807F034 0x0035
WaitPlayerAction8
WaitPlayerAction8
StartPlayerScript script_08008FC0
WaitForSomething2 0x00000020
_0807E8E4_0
_0807E8E4_0
_0807E5F8 0x00000080
WaitForSomething2 0x00000100
_0807E5F8 0x00000010
Wait 0x0078
_0807E5F8 0x00000080
WaitForSomething2 0x00000100
_0807E8E4_1
_0807E8E4_1
_0807E5F8 0x00000001
WaitForSomething2 0x00000002
_0807F034 0x0047
WaitPlayerAction8
WaitPlayerAction8
SetIntVariable 0x00000003
Call sub_0807F420
_0807E8E4_0
_0807E8E4_0
_0807E5F8 0x00000080
WaitForSomething2 0x00000100
_0807F0B4 0x0004
CameraTargetPlayer
CameraTargetPlayer
SetGlobalFlag 0x0015
Call sub_0806DCC0
Call sub_0807DF50
_0807E878
_0807E878
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000
data/scripts/script_08008F74.inc
+2 -2
View File
@@ -1,7 +1,7 @@
SCRIPT_START script_08008F74
BeginBlock
BeginBlock
SetEntitySpeed 0x0100
EndBlock
EndBlock
DoPostScriptAction 0x0001
_0807EDD4 0x00b8, 0x0090
_0807EB44 0x0006
data/scripts/script_08008FFC.inc
+2 -2
View File
@@ -1,8 +1,8 @@
SCRIPT_START script_08008FFC
BeginBlock
BeginBlock
_0807EB44 0x0000
_0807E930 0x0000
EndBlock
EndBlock
WaitForSomething 0x00000010
PlaySound SFX_11C
_0807E930 0x0001
data/scripts/script_0800903C.inc
+41 -41
View File
@@ -1,8 +1,8 @@
SCRIPT_START script_0800903C
BeginBlock
BeginBlock
_0807EB44 0x0004
DoPostScriptAction 0x0000
EndBlock
EndBlock
WaitForSomething2 0x00000004
PlaySound SFX_PLY_JUMP
_0807EF3C 0x0180, 0x0030
@@ -11,20 +11,20 @@ SCRIPT_START script_0800903C
WaitForSomething2 0x00000004
_0807EB44 0x0004
_0807E5F8 0x00000008
BeginBlock
_0807E9D4
BeginBlock
_0807E9D4
DoPostScriptAction 0x000a
Jump script_0800927E
.2byte 0x0000
SCRIPT_START script_08009080
BeginBlock
BeginBlock
Call sub_0807F348
SetEntitySpeed 0x0100
_0807EB44 0x0004
DoPostScriptAction 0x0000
_0807E9D4
_0807E9D4
DoPostScriptAction 0x000a
EndBlock
EndBlock
WaitForSomething2 0x00000080
_0807EB44 0x0004
_0807ECC4 0x0008
@@ -74,23 +74,23 @@ SCRIPT_START script_08009080
DoPostScriptAction 0x0000
_0807E5F8 0x00000100
script_0800917C:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_0800917C
_0807E864
_0807EB74
_0807E864
_0807EB74
Call sub_0806673C
_0807EA94
_0807EA94
Wait 0x000f
_0807E878
_0807E878
Jump script_0800917C
SCRIPT_START script_08009198
BeginBlock
BeginBlock
Call sub_0807F348
_0807EB44 0x0006
DoPostScriptAction 0x0000
EndBlock
EndBlock
WaitForSomething2 0x00000001
_0807EB74
_0807EB74
DoPostScriptAction 0x0001
MessageFromTargetPos 0x105b, 0x0000
_0807EA94
@@ -111,86 +111,86 @@ SCRIPT_START script_08009198
WaitForSomething2 0x00000001
DoPostScriptAction 0x0004
Wait 0x003c
_0807EB74
_0807EB8C
_0807EB74
_0807EB8C
DoPostScriptAction 0x0001
MessageFromTargetPos 0x1055, 0x0000
_0807EA94
DoPostScriptAction 0x0000
_0807E5F8 0x00000002
WaitForSomething2 0x00000001
_0807EB74
_0807EB74
_0807E5F8 0x00000002
WaitForSomething2 0x00000001
SetEntitySpeed 0x0080
DoPostScriptAction 0x0001
_0807EDD4 0x0098, 0x0078
_0807EB74
_0807EB74
DoPostScriptAction 0x0000
DoPostScriptAction 0x0001
MessageFromTargetPos 0x1059, 0x0000
_0807EA94
DoPostScriptAction 0x0000
_0807E5F8 0x00000002
BeginBlock
_0807E9D4
BeginBlock
_0807E9D4
DoPostScriptAction 0x000a
Jump script_080092B2
.2byte 0x0000
SCRIPT_START script_08009274
BeginBlock
BeginBlock
_0807EB44 0x0004
DoPostScriptAction 0x0000
script_0800927E:
Call sub_080668F0
DoPostScriptAction 0x000a
EndBlock
EndBlock
script_0800928A:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_0800928A
_0807E864
_0807EB74
_0807E864
_0807EB74
Call sub_08066904
_0807EA94
_0807EA94
Wait 0x000f
_0807E878
_0807E878
Jump script_0800928A
.2byte 0x0000
SCRIPT_START script_080092A8
BeginBlock
BeginBlock
_0807EB44 0x0006
DoPostScriptAction 0x0000
script_080092B2:
_0807E9D4
_0807E9D4
DoPostScriptAction 0x000a
EndBlock
EndBlock
script_080092BA:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_080092BA
_0807E864
_0807EB74
MessageNoOverlap 0x105e
_0807EA94
Wait 0x000f
_0807E878
_0807E878
Jump script_080092BA
SCRIPT_START script_080092D4
BeginBlock
BeginBlock
_0807EB44 0x0004
DoPostScriptAction 0x0000
Call sub_0806672C
DoPostScriptAction 0x000a
EndBlock
EndBlock
Jump script_0800917C
.2byte 0x0000
SCRIPT_START script_080092F0
BeginBlock
BeginBlock
DoPostScriptAction 0x000a
Call sub_08066E38
_0807E9D4
EndBlock
_0807E9D4
EndBlock
script_08009300:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_08009300
_0807E864
_0807EB74
@@ -200,7 +200,7 @@ script_08009300:
Jump script_08009300
.2byte 0x0000
SCRIPT_START script_08009318
BeginBlock
EndBlock
BeginBlock
EndBlock
SCRIPT_END
.2byte 0x0000
data/scripts/script_08009320.inc
+2 -2
View File
@@ -1,8 +1,8 @@
SCRIPT_START script_08009320
BeginBlock
BeginBlock
Call sub_0806D650
SetEntitySpeed 0x0010
EndBlock
EndBlock
script_0800932E:
_0807EEF4 0xfff8, 0x0000
_0807EEF4 0x0008, 0x0000
data/scripts/script_08009340.inc
+2 -2
View File
@@ -1,5 +1,5 @@
SCRIPT_START script_08009340
BeginBlock
EndBlock
BeginBlock
EndBlock
SCRIPT_END
.2byte 0x0000
data/scripts/script_08009348.inc
+9 -9
View File
@@ -1,27 +1,27 @@
SCRIPT_START script_08009348
BeginBlock
_0807E9D4
EndBlock
BeginBlock
_0807E9D4
EndBlock
script_0800934E:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_0800934E
_0807E864
_0807E864
Call sub_0807DF28
Call sub_0806D638
_0807F0B4 0x0001
CameraTargetEntity
CameraTargetEntity
CheckGlobalFlag 0x0055
JumpIf script_0800939A
MessageNoOverlap 0x1d01
_0807EA94
script_08009376:
_0807EA94
_0807EA94
Call sub_0806D640
_0807F0B4 0x0001
CameraTargetPlayer
CameraTargetPlayer
Wait 0x002d
_0807F0B4 0x0004
_0807E878
_0807E878
Call sub_0807DF50
Jump script_0800934E
SCRIPT_END
data/scripts/script_0800939A.inc
+13
View File
@@ -4,9 +4,13 @@ SCRIPT_START script_0800939A
.else
.ifdef EU
CheckLocalFlag 0x00ac
.else
.ifdef DEMO_JP @ TODO deduplicate
CheckLocalFlag 0x00ac
.else
CheckLocalFlag 0x00ae
.endif
.endif
.endif
JumpIf script_0800943E
CheckInventory1 0x000d
@@ -31,9 +35,13 @@ script_080093DA:
.else
.ifdef EU
CheckLocalFlag 0x00ab
.else
.ifdef DEMO_JP
CheckLocalFlag 0x00ab @ TODO deduplicate
.else
CheckLocalFlag 0x00ad
.endif
.endif
.endif
JumpIf script_080093EE
SetIntVariable 0x00001d04
@@ -58,10 +66,15 @@ script_080093EE:
.ifdef EU
SetLocalFlag 0x00ac
SetLocalFlag 0x00ab
.else
.ifdef DEMO_JP
SetLocalFlag 0x00ac @ TODO deduplicate
SetLocalFlag 0x00ab
.else
SetLocalFlag 0x00ae
SetLocalFlag 0x00ad
.endif
.endif
.endif
Call sub_0806D5D4
_0807EB8C
data/scripts/script_08009464.inc
+7 -3
View File
@@ -10,9 +10,13 @@ SCRIPT_START script_08009464
.else
.ifdef EU
ClearLocalFlag 0x00ac
.else
.ifdef DEMO_JP
ClearLocalFlag 0x00ac @ TODO deduplicate
.else
ClearLocalFlag 0x00ae
.endif
.endif
.endif
Call sub_0806D620
Wait 0x003c
@@ -24,14 +28,14 @@ SCRIPT_START script_08009464
Jump script_08009376
.2byte 0x0000
SCRIPT_START script_080094A4
BeginBlock
BeginBlock
Call sub_0806D7C4
SetEntitySpeed 0x0080
EndBlock
EndBlock
Wait 0x003c
SetEntity0x20 0x00018000
script_080094BC:
_0807EE30
_0807EE30
JumpIfNot script_080094BC
Wait 0x003c
DoPostScriptAction 0x0006
data/scripts/script_080094CC.inc
+3 -3
View File
@@ -1,13 +1,13 @@
SCRIPT_START script_080094CC
BeginBlock
BeginBlock
Call sub_0806D804
SetEntitySpeed 0x0180
EndBlock
EndBlock
Wait 0x003c
SetEntity0x20 0x00018000
Call sub_0806D858
script_080094EA:
_0807EE30
_0807EE30
JumpIfNot script_080094EA
Wait 0x001e
DoPostScriptAction 0x0006
data/scripts/script_080094FC.inc
+23 -23
View File
@@ -1,73 +1,73 @@
SCRIPT_START script_080094FC
BeginBlock
BeginBlock
Call sub_08067100
DoPostScriptAction 0x000a
_0807EB44 0x0004
DoPostScriptAction 0x0000
EndBlock
EndBlock
script_08009512:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_08009512
_0807E864
_0807E864
DoPostScriptAction 0x0001
_0807EB74
_0807EB74
Call sub_080670B4
_0807EA94
_0807E878
_0807EA94
_0807E878
_0807EB44 0x0004
DoPostScriptAction 0x0000
Jump script_08009512
.2byte 0x0000
SCRIPT_START script_08009538
BeginBlock
BeginBlock
Call sub_08067100
DoPostScriptAction 0x000a
_0807EB44 0x0004
DoPostScriptAction 0x0000
EndBlock
EndBlock
script_0800954E:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_0800954E
_0807E864
_0807E864
DoPostScriptAction 0x0001
_0807EB74
_0807EB74
Call sub_080670E4
_0807EA94
_0807E878
_0807EA94
_0807E878
_0807EB44 0x0004
DoPostScriptAction 0x0000
Jump script_0800954E
.2byte 0x0000
SCRIPT_START script_08009574
BeginBlock
BeginBlock
Call sub_08067314
DoPostScriptAction 0x000a
_0807EB44 0x0004
SetIntVariable 0x00000000
Call sub_080672B0
EndBlock
EndBlock
script_08009592:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_08009592
_0807E864
_0807EB74
_0807E864
_0807EB74
SetIntVariable 0x00000004
Call sub_080672B0
Call sub_080672C8
_0807EA94
_0807EA94
Wait 0x000f
_0807E878
_0807E878
_0807EB44 0x0004
SetIntVariable 0x00000000
Call sub_080672B0
Jump script_08009592
.2byte 0x0000
SCRIPT_START script_080095CC
BeginBlock
BeginBlock
Call sub_0806BE3C
DoPostScriptAction 0x000a
DoPostScriptAction 0x0007
EndBlock
EndBlock
script_080095DE:
Call sub_0806BF44
JumpIf script_080095F2
data/scripts/script_080095F2.inc
+20 -20
View File
@@ -1,11 +1,11 @@
SCRIPT_START script_080095F2
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_080095DE
_0807E864
_0807EB74
_0807E864
_0807EB74
DoPostScriptAction 0x0001
Call sub_0806BE84
_0807EA94
_0807EA94
JumpIfNot script_08009622
PlaySound SFX_109
_0807F088 0x003c
@@ -14,55 +14,55 @@ SCRIPT_START script_080095F2
_0807EA94
_0807F078 0x003c, 0x0001
script_08009622:
_0807E878
_0807E878
DoPostScriptAction 0x0000
Jump script_080095DE
SCRIPT_START script_0800962C
BeginBlock
BeginBlock
DoPostScriptAction 0x000b
DoPostScriptAction 0x0008
EndBlock
EndBlock
script_08009638:
EndBlock
BeginBlock
EndBlock
BeginBlock
CheckGlobalFlag 0x0020
JumpIfNot script_08009638
EndBlock
EndBlock
script_08009646:
Call sub_0806BF44
JumpIf script_08009646
EndBlock
EndBlock
Call sub_0806BE3C
DoPostScriptAction 0x000a
DoPostScriptAction 0x0007
script_08009660:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_08009660
_0807E864
_0807EB74
_0807E864
_0807EB74
DoPostScriptAction 0x0001
Call sub_0806BEC8
_0807EA94
_0807EA94
JumpIfNot script_0800968E
PlaySound SFX_111
PlaySound SFX_SECRET
_0807F078 0x003c, 0x0002
Call sub_0806BEFC
script_0800968E:
_0807E878
_0807E878
DoPostScriptAction 0x0000
Jump script_08009660
SCRIPT_START script_08009698
BeginBlock
BeginBlock
DoPostScriptAction 0x0007
Jump script_080096FC
CheckGlobalFlag 0x0020
JumpIf script_080096FC
EndBlock
EndBlock
script_080096AC:
CheckPlayerInRegion 0x0188, 0x01c0, 0x1020
JumpIfNot script_080096AC
_0807E864
_0807E864
Call sub_0807F9A4
Call sub_0807DF28
StartPlayerScript script_08009704
@@ -77,7 +77,7 @@ script_080096EC:
CheckGlobalFlag 0x0020
JumpIfNot script_080096EC
Call sub_0807DF50
_0807E878
_0807E878
script_080096FC:
Call sub_0808692C
SCRIPT_END
data/scripts/script_08009740.inc
+13 -13
View File
@@ -1,31 +1,31 @@
SCRIPT_START script_08009740
BeginBlock
BeginBlock
Call sub_08065D00
_0807EB44 0x0004
DoPostScriptAction 0x0000
DoPostScriptAction 0x000a
DoPostScriptAction 0x0007
EndBlock
EndBlock
script_0800975A:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_0800975A
_0807E864
_0807EB74
_0807E864
_0807EB74
DoPostScriptAction 0x0000
Call sub_08065F64
_0807EA94
_0807E878
_0807EA94
_0807E878
Jump script_0800975A
.2byte 0x0000
SCRIPT_START script_08009778
_0807E864
_0807E864
Call sub_0807F9A4
Call sub_0807DF28
PlaySound SFX_1F3
Call sub_0807F40C
_0807E8E4_1
_0807E8E4_1
Wait 0x000a
_0807E8E4_3
_0807E8E4_3
Wait 0x0032
_0807E5F8 0x00000002
WaitForSomething2 0x00000004
@@ -37,11 +37,11 @@ SCRIPT_START script_08009778
WaitForSomething2 0x00000040
_0807F078 0x003c, 0x0000
SetGlobalFlag 0x0020
_0807E8E4_3
_0807E8E4_3
Wait 0x001e
_0807EB28 0x2809
_0807EA94
_0807EA94
Call sub_0807DF50
_0807E878
_0807E878
DoPostScriptAction 0x0006
SCRIPT_END
data/scripts/script_080097F0.inc
+6 -6
View File
@@ -1,19 +1,19 @@
SCRIPT_START script_080097F0
BeginBlock
BeginBlock
_0807E930 0x0003
DoPostScriptAction 0x0007
SetEntitySpeed 0x0300
Call sub_0807F348
EndBlock
EndBlock
WaitForSomething2 0x00000002
PlaySound SFX_123
Call sub_0807F1A0
script_08009816:
EndBlock
BeginBlock
_0807EE30
EndBlock
BeginBlock
_0807EE30
JumpIfNot script_08009816
EndBlock
EndBlock
_0807E5F8 0x00000004
Call sub_0807FBD4
PlaySound SFX_1F3
data/scripts/script_08009838.inc
+2 -2
View File
@@ -1,10 +1,10 @@
SCRIPT_START script_08009838
BeginBlock
BeginBlock
_0807E930 0x0003
DoPostScriptAction 0x0007
SetEntitySpeed 0x0300
Call sub_0807F348
EndBlock
EndBlock
WaitForSomething2 0x00000008
Call sub_0809E0A0
Call sub_0809E0D4
data/scripts/script_080098D4.inc
+13 -5
View File
@@ -1,6 +1,6 @@
SCRIPT_START script_080098D4
BeginBlock
EndBlock
BeginBlock
EndBlock
script_080098D8:
CheckGlobalFlag 0x0020
JumpIfNot script_080098D8
@@ -12,9 +12,13 @@ script_080098E0:
.else
.ifdef EU
CheckLocalFlag 0x5b
.else
.ifdef DEMO_JP
CheckLocalFlag 0x5b @ TODO deduplicate
.else
CheckLocalFlag 0x5d
.endif
.endif
.endif
JumpIf script_08009910
.ifdef JP
@@ -22,17 +26,21 @@ script_080098E0:
.else
.ifdef EU
SetLocalFlag 0x005b
.else
.ifdef DEMO_JP
SetLocalFlag 0x005b @ TODO deduplicate
.else
SetLocalFlag 0x005d
.endif
.endif
_0807E864
.endif
_0807E864
Call sub_0807F9A4
Call sub_0807DF28
_0807EB28 0x280a
_0807EA94
_0807EA94
Call sub_0807DF50
_0807E878
_0807E878
script_08009910:
DoPostScriptAction 0x0006
SCRIPT_END
data/scripts/script_08009918.inc
+5 -5
View File
@@ -1,15 +1,15 @@
SCRIPT_START script_08009918
BeginBlock
BeginBlock
Call sub_0807DF28
_0807E864
_0807E864
_0807E5F8 0x00000000
EndBlock
WaitFor_2
EndBlock
WaitFor_2
Wait 0x0078
_0807E5F8 0x00000004
WaitForSomething2 0x00000001
SetGlobalFlag 0x001c
Call sub_0807DF50
_0807E878
_0807E878
Call sub_0807921C
SCRIPT_END
data/scripts/script_08009950.inc
+6 -6
View File
@@ -1,16 +1,16 @@
SCRIPT_START script_08009950
BeginBlock
BeginBlock
Call sub_0807F348
SetEntitySpeed 0x0040
_0807EB44 0x0004
_0807E930 0x000c
_0807E908 0x0003
EndBlock
EndBlock
Wait 0x001e
CameraTargetEntity
CameraTargetEntity
_0807E778 0x0004
_0807E800 0x00000000
WaitFor_2
WaitFor_2
WaitForSomething2 0x00000008
DoPostScriptAction 0x0004
Wait 0x001e
@@ -31,7 +31,7 @@ SCRIPT_START script_08009950
DoPostScriptAction 0x0000
Wait 0x001e
_0807E778 0x0002
DoFade5
WaitFor_2
DoFade5
WaitFor_2
Call sub_08053634
SCRIPT_END
data/scripts/script_080099DC.inc
+2 -2
View File
@@ -1,10 +1,10 @@
SCRIPT_START script_080099DC
BeginBlock
BeginBlock
Call sub_0807F348
SetEntitySpeed 0x00c0
_0807EB44 0x0002
DoPostScriptAction 0x0008
EndBlock
EndBlock
WaitForSomething2 0x00000004
DoPostScriptAction 0x0007
_0807EDD4 0x0068, 0x0060
data/scripts/script_08009A34.inc
+3 -3
View File
@@ -8,13 +8,13 @@ script_08009A38:
Jump script_08009A38
SCRIPT_START script_08009A50
SetEntityPositionRelative 0x0240, 0x0178
CameraTargetEntity
CameraTargetEntity
SetEntitySpeed 0x0080
Wait 0x0078
PlayBgm BGM_MINISH_CAP
_0807E778 0x0002
DoFade4
WaitFor_2
DoFade4
WaitFor_2
Wait 0x0078
_0807E5F8 0x00000004
Call sub_08053648
data/scripts/script_08009A84.inc
+3 -3
View File
@@ -1,16 +1,16 @@
SCRIPT_START script_08009A84
BeginBlock
BeginBlock
SetEntityPositionRelative 0x01e8, 0x0110
SetEntitySpeed 0x00c0
DoPostScriptAction 0x0008
EndBlock
EndBlock
WaitForSomething2 0x00000004
DoPostScriptAction 0x0007
_0807EDD4 0x01e8, 0x0200
_0807EDD4 0x01f8, 0x0218
_0807EDD4 0x0220, 0x0228
_0807EDD4 0x0240, 0x0228
CameraTargetEntity
CameraTargetEntity
_0807EDD4 0x0290, 0x0228
_0807EDD4 0x0290, 0x01f8
SetEntitySpeed 0x0080
data/scripts/script_08009AF8.inc
+3 -3
View File
@@ -1,6 +1,6 @@
SCRIPT_START script_08009AF8
BeginBlock
EndBlock
BeginBlock
EndBlock
WaitForSomething2 0x00000010
PlaySound SFX_F0
DoPostScriptAction 0x0008
@@ -10,7 +10,7 @@ SCRIPT_START script_08009AF8
Wait 0x005a
_0807E778 0x0004
_0807E80C 0x00000000
WaitFor_2
WaitFor_2
Call sub_0805367C
SCRIPT_END
.2byte 0x0000
data/scripts/script_08009B30.inc
+5 -5
View File
@@ -1,10 +1,10 @@
SCRIPT_START script_08009B30
BeginBlock
BeginBlock
Call sub_0807DF28
_0807E864
_0807E864
SetLocalFlag 0x0046
EndBlock
WaitFor_2
EndBlock
WaitFor_2
Wait 0x001e
MessageFromTarget 0x1005
_0807EA94
@@ -14,7 +14,7 @@ SCRIPT_START script_08009B30
DoPostScriptAction 0x0014
Wait 0x001e
Call sub_08053250
_0807E878
_0807E878
Call sub_0807DF50
Call sub_080791D0
SCRIPT_END
data/scripts/script_08009B78.inc
+9 -9
View File
@@ -1,15 +1,15 @@
SCRIPT_START script_08009B78
BeginBlock
BeginBlock
_0807EB44 0x0006
SetEntitySpeed 0x0080
_0807E9D4
_0807E9D4
Call sub_0807F348
EndBlock
EndBlock
CheckGlobalFlag 0x0013
JumpIf script_08009C4C
_0807E888
_0807E888
Wait 0x000a
_0807E864
_0807E864
StartPlayerScript script_08009CFC
Call sub_0807DF28
WaitForSomething2 0x00000008
@@ -24,7 +24,7 @@ SCRIPT_START script_08009B78
DoPostScriptAction 0x0000
_0807E5F8 0x00000004
WaitForSomething2 0x00000008
_0807EB8C
_0807EB8C
DoPostScriptAction 0x0001
MessageFromTargetPos 0x100b, 0x0000
_0807EA94
@@ -42,8 +42,8 @@ SCRIPT_START script_08009B78
WaitForSomething2 0x00000008
Call sub_08053250
_0807F034 0x0034
WaitPlayerAction8
_0807E8E4_1
WaitPlayerAction8
_0807E8E4_1
DoPostScriptAction 0x0001
MessageFromTargetPos 0x100c, 0x0000
_0807EA94
@@ -52,7 +52,7 @@ SCRIPT_START script_08009B78
script_08009C4C:
DoPostScriptAction 0x000a
script_08009C50:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_08009C50
_0807E864
_0807EB74
data/scripts/script_08009C68.inc
+11 -11
View File
@@ -1,26 +1,26 @@
SCRIPT_START script_08009C68
BeginBlock
BeginBlock
_0807EB44 0x0002
SetEntitySpeed 0x0100
Call sub_0807F348
EndBlock
EndBlock
WaitForSomething2 0x00000004
DoPostScriptAction 0x0004
_0807EB74
_0807EB74
WaitForSomething2 0x00000004
_0807EB74
_0807EB74
WaitForSomething2 0x00000004
_0807EB74
_0807EB8C
_0807EB74
_0807EB8C
DoPostScriptAction 0x0001
MessageFromTargetPos 0x100a, 0x0000
_0807EA94
DoPostScriptAction 0x0000
_0807E5F8 0x00000008
WaitForSomething2 0x00000004
_0807EB8C
_0807EB8C
DoPostScriptAction 0x0001
_0807EB8C
_0807EB8C
_0807EB44 0x0002
MessageFromTargetPos 0x100d, 0x0000
_0807EA94
@@ -29,11 +29,11 @@ SCRIPT_START script_08009C68
_0807EDD4 0x0000, 0x0060
Call sub_080536A8
Wait 0x001e
BeginBlock
BeginBlock
SetGlobalFlag 0x0013
Call sub_0807DF50
Call sub_080791D0
_0807E878
EndBlock
_0807E878
EndBlock
SCRIPT_END
.2byte 0x0000
data/scripts/script_08009CFC.inc
+5 -5
View File
@@ -1,8 +1,8 @@
SCRIPT_START script_08009CFC
BeginBlock
_0807E8E4_1
BeginBlock
_0807E8E4_1
SetEntitySpeed 0x00c0
EndBlock
EndBlock
_0807E5F8 0x00000004
DoPostScriptAction 0x0004
Wait 0x003c
@@ -10,7 +10,7 @@ SCRIPT_START script_08009CFC
_0807EDD4 0x0060, 0x0068
_0807E5F8 0x00000004
DoPostScriptAction 0x0000
_0807E8E4_0
_0807E8E4_0
Wait 0x000f
PlaySound SFX_VO_ZELDA1
DoPostScriptAction 0x0000
@@ -18,7 +18,7 @@ SCRIPT_START script_08009CFC
_0807E5F8 0x00000008
WaitForSomething2 0x00000002
_0807EDD4 0x0070, 0x005c
_0807E8E4_1
_0807E8E4_1
DoPostScriptAction 0x0000
Wait 0x000f
_0807E5F8 0x00000008
data/scripts/script_08009D6C.inc
+4 -4
View File
@@ -1,8 +1,8 @@
SCRIPT_START script_08009D6C
BeginBlock
BeginBlock
SetEntitySpeed 0x0100
_0807EB44 0x0006
EndBlock
EndBlock
_0807EDD4 0x0078, 0x0060
_0807EDD4 0x0078, 0x007c
Wait 0x001e
@@ -11,8 +11,8 @@ SCRIPT_START script_08009D6C
_0807EDD4 0x0078, 0x0098
DoPostScriptAction 0x0008
_0807E778 0x0010
DoFade5
WaitFor_2
DoFade5
WaitFor_2
Call sub_08053634
DoPostScriptAction 0x0006
SCRIPT_END
data/scripts/script_08009DB0.inc
+12 -12
View File
@@ -1,44 +1,44 @@
SCRIPT_START script_08009DB0
BeginBlock
BeginBlock
Call sub_0807F348
Call sub_08066288
Call sub_08066274
DoPostScriptAction 0x000a
_0807E930 0x000c
_0807E908 0x0003
EndBlock
EndBlock
script_08009DD2:
_0807E944
_0807E944
_0807E908 0x0002
Call sub_0806622C
_0807EA94
_0807EA94
_0807E908 0x0003
_0807E930 0x000c
Jump script_08009DD2
SCRIPT_START script_08009DEC
BeginBlock
EndBlock
BeginBlock
EndBlock
script_08009DF0:
CheckPlayerInRegion 0x00a0, 0x0038, 0x1830
JumpIfNot script_08009DF0
_0807E864
_0807E864
Call sub_0807F9A4
Wait 0x0008
_0807EB28 0x3207
_0807E3E8
_0807E3E8
JumpIfNot script_08009E4E
Call sub_0807DF28
_0807E778 0x0002
DoFade5
WaitFor_2
DoFade5
WaitFor_2
Call sub_0804E864
Wait 0x001e
_0807E5F8 0x00000002
WaitForSomething2 0x00000001
_0807EB28 0x3209
Wait 0x000f
_0807EA94
_0807E878
_0807EA94
_0807E878
Call sub_0807DF50
DoPostScriptAction 0x0006
SCRIPT_END
data/scripts/script_08009E4E.inc
+1 -1
View File
@@ -1,5 +1,5 @@
SCRIPT_START script_08009E4E
_0807E878
_0807E878
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000
data/scripts/script_08009E58.inc
+4 -4
View File
@@ -1,11 +1,11 @@
SCRIPT_START script_08009E58
BeginBlock
BeginBlock
Call sub_0807DF28
EndBlock
EndBlock
WaitForSomething2 0x00000002
_0807E778 0x0002
DoFade4
WaitFor_2
DoFade4
WaitFor_2
DoPostScriptAction 0x0014
Wait 0x001e
_0807E5F8 0x00000001
data/scripts/script_08009E80.inc
+2 -2
View File
@@ -1,5 +1,5 @@
SCRIPT_START script_08009E80
BeginBlock
EndBlock
BeginBlock
EndBlock
SCRIPT_END
.2byte 0x0000
data/scripts/script_08009E88.inc
+10 -6
View File
@@ -1,28 +1,32 @@
SCRIPT_START script_08009E88
BeginBlock
BeginBlock
Call sub_0807DF28
_0807E864
_0807E864
.ifdef JP
SetLocalFlag 0x009e
.else
.ifdef EU
SetLocalFlag 0x009e
.else
.ifdef DEMO_JP
SetLocalFlag 0x009e @ TODO deduplicate
.else
SetLocalFlag 0x009f
.endif
.endif
EndBlock
.endif
EndBlock
Wait 0x003c
_0807E778 0x0004
DoFade4
WaitFor_2
DoFade4
WaitFor_2
script_08009EA4:
Call sub_0807F0D8
JumpIfNot script_08009EA4
DoPostScriptAction 0x0014
Wait 0x000a
Call sub_08053250
_0807E878
_0807E878
Call sub_0807DF50
Call sub_080791D0
SCRIPT_END
data/scripts/script_08009ECC.inc
+4 -4
View File
@@ -1,11 +1,11 @@
SCRIPT_START script_08009ECC
BeginBlock
BeginBlock
SetIntVariable 0x00000002
DoPostScriptAction 0x0001
EndBlock
EndBlock
WaitForSomething2 0x00000004
BeginBlock
BeginBlock
SetIntVariable 0x00000003
DoPostScriptAction 0x0001
EndBlock
EndBlock
SCRIPT_END
data/scripts/script_08009EF0.inc
+4 -4
View File
@@ -1,11 +1,11 @@
SCRIPT_START script_08009EF0
BeginBlock
BeginBlock
SetIntVariable 0x00000000
DoPostScriptAction 0x0001
EndBlock
EndBlock
WaitForSomething2 0x00000004
BeginBlock
BeginBlock
SetIntVariable 0x00000001
DoPostScriptAction 0x0001
EndBlock
EndBlock
SCRIPT_END
data/scripts/script_08009F14.inc
+33 -33
View File
@@ -1,5 +1,5 @@
SCRIPT_START script_08009F14
BeginBlock
BeginBlock
_0807EB44 0x0004
Call sub_08060090
DoPostScriptAction 0x000a
@@ -7,15 +7,15 @@ SCRIPT_START script_08009F14
JumpIf script_08009FD2
CheckInventory1 0x0007
JumpIf script_08009F84
EndBlock
EndBlock
script_08009F36:
EndBlock
BeginBlock
EndBlock
BeginBlock
Call sub_08060158
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_08009F36
EndBlock
_0807E864
EndBlock
_0807E864
Call sub_0807DF28
DoPostScriptAction 0x000b
StartPlayerScript script_0800A088
@@ -25,42 +25,42 @@ script_08009F36:
_0807EA94
Wait 0x001e
_0807F034 0x0065
WaitPlayerAction8
WaitPlayerAction8
DoPostScriptAction 0x000a
Call sub_0807DF50
_0807E878
_0807E878
script_08009F84:
EndBlock
EndBlock
script_08009F86:
EndBlock
BeginBlock
EndBlock
BeginBlock
Call sub_08060158
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_08009F86
EndBlock
_0807E864
EndBlock
_0807E864
Call sub_080602BC
_0807EA94
_0807EA94
CallWithArg sub_0807F970, 0x00001f03
JumpIf script_08009FB6
_0807E878
_0807E878
Jump script_08009F86
script_08009FB6:
Wait 0x0008
PlaySound SFX_103
CallWithArg sub_0806030C, 0x00000063
Wait 0x0008
_0807E878
_0807E878
Jump script_08009F86
script_08009FD2:
EndBlock
EndBlock
CheckLocalFlag 0x00b0
JumpIf script_0800A024
script_08009FDC:
EndBlock
BeginBlock
EndBlock
BeginBlock
Call sub_08060158
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_08009FDC
EndBlock
_0807E864
@@ -68,47 +68,47 @@ script_08009FDC:
_0807EA94
_0807E3E8
JumpIf script_0800A002
_0807E878
_0807E878
Jump script_08009FDC
script_0800A002:
Wait 0x0008
_0807F034 0x0008
Call sub_08060318
WaitPlayerAction8
WaitPlayerAction8
Wait 0x0008
_0807EB8C
MessageFromTarget 0x1f13
_0807EA94
SetLocalFlag 0x00b0
_0807E878
_0807E878
script_0800A024:
EndBlock
BeginBlock
EndBlock
BeginBlock
Call sub_08060158
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_0800A024
EndBlock
_0807E864
EndBlock
_0807E864
CheckInventory1 0x0008
JumpIf script_0800A052
MessageNoOverlap 0x1f14
_0807EA94
_0807E3E8
JumpIf script_0800A002
_0807E878
_0807E878
Jump script_0800A024
script_0800A052:
MessageNoOverlap 0x1f11
_0807EA94
_0807E3E8
JumpIf script_0800A064
_0807E878
_0807E878
Jump script_0800A024
script_0800A064:
Wait 0x0008
_0807F034 0x0007
Call sub_08060318
WaitPlayerAction8
WaitPlayerAction8
Wait 0x0008
_0807EB8C
MessageFromTarget 0x1f10
data/scripts/script_0800A088.inc
+2 -2
View File
@@ -1,7 +1,7 @@
SCRIPT_START script_0800A088
BeginBlock
BeginBlock
SetEntitySpeed 0x0100
EndBlock
EndBlock
_0807ECC4 0x0010
_0807EDD4 0x0078, 0x0060
_0807EB44 0x0000
data/scripts/script_0800A0B4.inc
+5 -5
View File
@@ -1,16 +1,16 @@
SCRIPT_START script_0800A0B4
BeginBlock
BeginBlock
SetEntitySpeed 0x0140
_0807E864
_0807E864
Call sub_0807DF28
EndBlock
EndBlock
Wait 0x0078
PlayBgm BGM_ELEMENT_THEME
Call sub_080A0464
script_0800A0D2:
_0807EE30
_0807EE30
JumpIfNot script_0800A0D2
_0807E8E4_0
_0807E8E4_0
Wait 0x0008
DoPostScriptAction 0x0000
_0807E5F8 0x00000004
data/scripts/script_0800A0FC.inc
+7 -7
View File
@@ -1,10 +1,10 @@
SCRIPT_START script_0800A0FC
EndBlock
EndBlock
script_0800A0FE:
CheckGlobalFlag 0x0051
JumpIfNot script_0800A0FE
BeginBlock
_0807E864
BeginBlock
_0807E864
Call sub_0807DF28
StopBgm
.ifndef EU
@@ -12,14 +12,14 @@ script_0800A0FE:
.endif
SetEntityPositionRelative 0x00b0, 0x0058
Call sub_0807F844
_0807E8E4_3
_0807E8E4_3
CallWithArg sub_0807F75C, 0x00d00060
CallWithArg sub_08094AE8, script_0800A160
PlaySound SFX_APPARATE
_0807E778 0x0002
DoFade6
EndBlock
WaitFor_2
DoFade6
EndBlock
WaitFor_2
WaitForSomething2 0x00000004
CallWithArg sub_0806DA1C, 0x00000006
DoPostScriptAction 0x0006
data/scripts/script_0800A160.inc
+2 -2
View File
@@ -1,5 +1,5 @@
SCRIPT_START script_0800A160
BeginBlock
BeginBlock
SetEntitySpeed 0x0080
DoPostScriptAction 0x0007
DoPostScriptAction 0x000b
@@ -7,7 +7,7 @@ SCRIPT_START script_0800A160
SetEntityPositionRelative 0x00b0, 0x0080
CallWithArg sub_0807F98C, 0xff800000
CallWithArg sub_080960C4, script_0800A1B4
EndBlock
EndBlock
PlaySound SFX_SPARKLES
_0807EF3C 0xff80, 0x0000
PlaySound SFX_143
data/scripts/script_0800A1B4.inc
+2 -2
View File
@@ -1,9 +1,9 @@
SCRIPT_START script_0800A1B4
BeginBlock
BeginBlock
DoPostScriptAction 0x0007
DoPostScriptAction 0x000b
CallWithArg sub_0807F994, 0x0000fff8
EndBlock
EndBlock
WaitForSomething 0x00000002
DoPostScriptAction 0x0006
SCRIPT_END
data/scripts/script_0800A1D8.inc
+6 -6
View File
@@ -1,12 +1,12 @@
SCRIPT_START script_0800A1D8
BeginBlock
_0807E864
BeginBlock
_0807E864
Call sub_0807DF28
SetEntityPositionRelative 0x0088, 0x0080
Call sub_0807F844
_0807E8E4_3
_0807E8E4_3
CallWithArg sub_0807F75C, 0x00a80088
EndBlock
EndBlock
Wait 0x003c
StartPlayerScript script_0800A310
WaitForSomething2 0x00000001
@@ -18,7 +18,7 @@ SCRIPT_START script_0800A1D8
_0807E5F8 0x00000010
WaitForSomething2 0x00000200
_0807E5F8 0x00000004
_0807E8E4_0
_0807E8E4_0
WaitForSomething2 0x00000080
_0807E5F8 0x00000010
WaitForSomething2 0x00000200
@@ -37,7 +37,7 @@ SCRIPT_START script_0800A1D8
_0807E5F8 0x00000008
WaitForSomething2 0x00000100
Wait 0x003c
_0807E8E4_3
_0807E8E4_3
_0807E5F8 0x00000004
WaitForSomething2 0x00000080
Wait 0x003c
data/scripts/script_0800A310.inc
+3 -3
View File
@@ -1,5 +1,5 @@
SCRIPT_START script_0800A310
EndBlock
EndBlock
_0807EB44 0x0002
Wait 0x000a
_0807EB44 0x0006
@@ -12,13 +12,13 @@ SCRIPT_START script_0800A310
Call sub_080791BC
.2byte 0x0000
SCRIPT_START script_0800A340
BeginBlock
BeginBlock
DoPostScriptAction 0x0008
SetEntitySpeed 0x0080
DoPostScriptAction 0x000b
_0807EB44 0x0004
CallWithArg sub_0807F3D8, 0x00000000
EndBlock
EndBlock
WaitForSomething2 0x00000002
_0807E930 0x000e
DoPostScriptAction 0x0007
data/scripts/script_0800A3D8.inc
+4 -4
View File
@@ -1,16 +1,16 @@
SCRIPT_START script_0800A3D8
BeginBlock
BeginBlock
SetEntitySpeed 0x0100
DoPostScriptAction 0x0007
DoPostScriptAction 0x000b
_0807EB44 0x0002
DoPostScriptAction 0x0000
EndBlock
EndBlock
WaitForSomething2 0x00000004
BeginBlock
BeginBlock
DoPostScriptAction 0x0004
Call sub_0807F3F8
EndBlock
EndBlock
Wait 0x003c
_0807EC94 0x0010
_0807EB44 0x0002
data/scripts/script_0800A500.inc
+2 -2
View File
@@ -1,11 +1,11 @@
SCRIPT_START script_0800A500
BeginBlock
BeginBlock
SetEntitySpeed 0x0080
DoPostScriptAction 0x0007
DoPostScriptAction 0x000b
_0807E930 0x0005
Call sub_0807F348
EndBlock
EndBlock
WaitForSomething2 0x00000008
PlaySound SFX_SPARKLES
_0807E610 0x00000800
data/scripts/script_0800A590.inc
+3 -3
View File
@@ -1,13 +1,13 @@
SCRIPT_START script_0800A590
BeginBlock
BeginBlock
SetEntitySpeed 0x0080
SetEntity0x20 0x00000000
DoPostScriptAction 0x0008
_0807EB44 0x0000
Call sub_0807F714
MoveEntityToPlayer
MoveEntityToPlayer
CallWithArg sub_0807F98C, 0xfff00000
EndBlock
EndBlock
_0807E930 0x0023
WaitForSomething2 0x00000010
CallWithArg sub_0807F6E8, 0x00000008
data/scripts/script_0800A638.inc
+2 -2
View File
@@ -1,9 +1,9 @@
SCRIPT_START script_0800A638
BeginBlock
BeginBlock
DoPostScriptAction 0x0007
DoPostScriptAction 0x000b
CallWithArg sub_0807F994, 0x0000fff8
EndBlock
EndBlock
WaitForSomething 0x00001000
DoPostScriptAction 0x0006
SCRIPT_END
data/scripts/script_0800A65C.inc
+2 -2
View File
@@ -1,9 +1,9 @@
SCRIPT_START script_0800A65C
BeginBlock
BeginBlock
DoPostScriptAction 0x0007
DoPostScriptAction 0x000b
CallWithArg sub_0807F994, 0x0000fff8
EndBlock
EndBlock
WaitForSomething 0x00000800
DoPostScriptAction 0x0006
SCRIPT_END
data/scripts/script_0800A680.inc
+2 -2
View File
@@ -1,9 +1,9 @@
SCRIPT_START script_0800A680
BeginBlock
BeginBlock
DoPostScriptAction 0x0007
DoPostScriptAction 0x000b
CallWithArg sub_0807F994, 0x0000fff8
EndBlock
EndBlock
WaitForSomething 0x00000020
DoPostScriptAction 0x0006
SCRIPT_END
data/scripts/script_0800A6A4.inc
+3 -3
View File
@@ -1,10 +1,10 @@
SCRIPT_START script_0800A6A4
BeginBlock
_0807E864
BeginBlock
_0807E864
Call sub_0807DF28
SetEntityPositionRelative 0x0088, 0x0068
Call sub_0807F844
EndBlock
EndBlock
Wait 0x003c
PlaySound SFX_EVAPORATE
CallWithArg sub_0806DA1C, 0x00000008
data/scripts/script_0800A6D4.inc
+3 -3
View File
@@ -1,11 +1,11 @@
SCRIPT_START script_0800A6D4
BeginBlock
_0807E864
BeginBlock
_0807E864
Call sub_0807DF28
SetEntityPositionRelative 0x0088, 0x0070
Call sub_0807F844
PlaySound SFX_APPARATE
EndBlock
EndBlock
Wait 0x003c
CallWithArg sub_0806DA1C, 0x00000009
DoPostScriptAction 0x0006
data/scripts/script_0800A704.inc
+3 -3
View File
@@ -1,10 +1,10 @@
SCRIPT_START script_0800A704
BeginBlock
_0807E864
BeginBlock
_0807E864
Call sub_0807DF28
SetEntityPositionRelative 0x0198, 0x01c8
Call sub_0807F844
EndBlock
EndBlock
Wait 0x003c
PlaySound SFX_EVAPORATE
CallWithArg sub_0806DA1C, 0x0000000a
data/scripts/script_0800A734.inc
+3 -3
View File
@@ -1,11 +1,11 @@
SCRIPT_START script_0800A734
BeginBlock
_0807E864
BeginBlock
_0807E864
Call sub_0807DF28
SetEntityPositionRelative 0x00d8, 0x01c8
Call sub_0807F844
PlaySound SFX_APPARATE
EndBlock
EndBlock
Wait 0x003c
CallWithArg sub_0806DA1C, 0x0000000b
DoPostScriptAction 0x0006

Some files were not shown because too many files have changed in this diff Show More