mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-23 09:20:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into asset-extraction

Browse Source
This commit is contained in:
octorock
2021-11-06 00:33:07 +01:00
parent 1a0f416bac 3592e47cd6
commit a6d133e42d
413 changed files with 6686 additions and 12843 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+3 -1
View File
@@ -65,4 +65,6 @@ _Deparsed_XSubs.pm
*.py
*.sna
__pycache__
.vscode/settings.json
.vscode/settings.json
.vscode/c_cpp_properties.json
.vscode/tasks.json
Jenkinsfile
Vendored
+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'
Makefile
+4 -4
View File
@@ -68,12 +68,12 @@ ASSET_BUILDDIR = $(OBJ_DIR)/$(ASSET_SUBDIR)
ASFLAGS := -mcpu=arm7tdmi --defsym $(GAME_VERSION)=1 --defsym REVISION=$(REVISION) --defsym $(GAME_LANGUAGE)=1 -I $(ASSET_SUBDIR) -I $(ASSET_BUILDDIR)
CC1 := tools/agbcc/bin/agbcc
override CFLAGS += -O2 -Wimplicit -Wparentheses -Werror -Wno-multichar
override CFLAGS += -O2 -Wimplicit -Wparentheses -Werror -Wno-multichar -g3
# -fhex-asm
ifeq ($(DINFO),1)
override CFLAGS += -g
endif
# ifeq ($(DINFO),1)
# override CFLAGS += -g
# endif
CPPFLAGS := -I tools/agbcc -I tools/agbcc/include -iquote include -nostdinc -undef -D$(GAME_VERSION) -DREVISION=$(REVISION) -D$(GAME_LANGUAGE)
README.md
+7 -6
View File
@@ -1,23 +1,24 @@
# The Legend of Zelda: The Minish Cap
**Progress:** [⬛⬛⬛⬛⬛⬛⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜] 30%
**Progress:** [⬛⬛⬛⬛⬛⬛⬛⬛⬛⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜] 45%
```diff
- WARNING! -
The ROM this repository builds cannot be 'shifted', primarily due to some hardcoded pointers which have yet
to be dumped. Thus this repository is currently in an experimental and research phase and cannot yet be used
traditionally as a source code base for general changes.
This repository is a work in progress, and while it can be used to make certain changes, it's still
constantly evolving. If you use it for modding purposes in its current state, please be aware that
the codebase can drastically change at any time. Also note that some parts of the ROM may not be
'shiftable' yet, so modifying them could be difficult at this point.
```
This is a WIP decompilation of The Legend of Zelda: The Minish Cap.
The purpose of the project is to recreate a source code base for the game from scratch, using information found inside the game along with static and/or dynamic analysis.
It builds the following ROMs:
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_eu.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=1734) `sha1: cff199b36ff173fb6faf152653d1bccf87c26fb7`
* [**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_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`
asm/bird.s
+2 -2
View File
@@ -128,7 +128,7 @@ _0809D2D6:
mov r8, r3
cmp r0, #0
beq _0809D3A8
ldr r0, _0809D434 @ =gTextBox
ldr r0, _0809D434 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -285,7 +285,7 @@ _0809D3DA:
b _0809D454
.align 2, 0
_0809D430: .4byte gPlayerEntity
_0809D434: .4byte gTextBox
_0809D434: .4byte gMessage
_0809D438: .4byte gPlayerState
_0809D43C: .4byte gUnk_03003DC0
_0809D440: .4byte gUnk_02034490
asm/chestSpawner.s
+1 -1
View File
@@ -126,7 +126,7 @@ sub_08083F14: @ 0x08083F14
movs r2, #0x32
ldrsh r1, [r4, r2]
movs r2, #2
bl sub_080577AC
bl CreateMagicSparkles
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
asm/code_080011C4.s
+8 -5
View File
@@ -1129,14 +1129,17 @@ _0800268C:
.byte 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00
_0800269C: .4byte gUnk_0800232E
_080026A0: .4byte gUnk_08002342
gUnk_080026A4::
.4byte gUnk_020000B0
.4byte gUnk_03003D68
.4byte gUnk_03003DB0
.4byte gUnk_03005FBC
@ normal entities
.4byte gUnk_020000B0 @ enemy target? (player)
.4byte gUnk_03003D68 @ first linked list
.4byte gUnk_03003DB0 @ last linked list
.4byte gUnk_03005FBC @ entity table
@ managers
.4byte gUnk_020000B0
.4byte gUnk_03003DA8
.4byte gHitboxCount
.4byte gCollidableCount
.4byte gUnk_03005FBC
thumb_func_start sub_080026C4
asm/code_08016B30.s
+2 -2
View File
@@ -13,7 +13,7 @@ sub_08016B30: @ 0x08016B30
thumb_func_start sub_08016B34
sub_08016B34: @ 0x08016B34
ldr r1, _08016B54 @ =0x03007FFC
ldr r0, _08016B58 @ =IntrMain
ldr r0, _08016B58 @ =gIntrMain
str r0, [r1]
ldr r1, _08016B5C @ =0x04000004
ldr r2, _08016B60 @ =0x00005028
@@ -29,7 +29,7 @@ sub_08016B34: @ 0x08016B34
bx lr
.align 2, 0
_08016B54: .4byte 0x03007FFC
_08016B58: .4byte IntrMain
_08016B58: .4byte gIntrMain
_08016B5C: .4byte 0x04000004
_08016B60: .4byte 0x00005028
_08016B64: .4byte 0x04000200
asm/code_0801C370.s
+4 -4
View File
@@ -130,8 +130,8 @@ _0801C488: .4byte 0x00000427
_0801C48C: .4byte 0x00000426
_0801C490: .4byte 0x0000042E
thumb_func_start sub_0801C494
sub_0801C494: @ 0x0801C494
thumb_func_start RefreshUI
RefreshUI: @ 0x0801C494
ldr r1, _0801C49C @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
@@ -139,8 +139,8 @@ sub_0801C494: @ 0x0801C494
.align 2, 0
_0801C49C: .4byte gScreen
thumb_func_start sub_0801C4A0
sub_0801C4A0: @ 0x0801C4A0
thumb_func_start RecoverUI
RecoverUI: @ 0x0801C4A0
ldr r1, _0801C4AC @ =gUnk_0200AF00
movs r0, #0
strb r0, [r1, #2]
asm/code_0801C85C.s
+5 -5
View File
@@ -479,7 +479,7 @@ sub_0801CBC8: @ 0x0801CBC8
ands r0, r1
cmp r0, #0
bne _0801CBF6
ldr r0, _0801CC0C @ =gTextBox
ldr r0, _0801CC0C @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -497,7 +497,7 @@ _0801CBF6:
b _0801CC1E
.align 2, 0
_0801CC08: .4byte gUnk_0200AF00
_0801CC0C: .4byte gTextBox
_0801CC0C: .4byte gMessage
_0801CC10:
ldr r1, _0801CC7C @ =gUnk_0200AF00
ldrb r0, [r5, #1]
@@ -575,7 +575,7 @@ sub_0801CC80: @ 0x0801CC80
adds r0, r0, r1
ldrb r4, [r0]
adds r0, r4, #0
bl sub_080544C8
bl ItemIsBottle
cmp r0, #0
beq _0801CCA8
adds r0, r5, r4
@@ -828,7 +828,7 @@ sub_0801CE58: @ 0x0801CE58
ands r0, r1
cmp r0, #0
bne _0801CEB4
ldr r0, _0801CEBC @ =gTextBox
ldr r0, _0801CEBC @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -866,4 +866,4 @@ _0801CEB4:
pop {r4, pc}
.align 2, 0
_0801CEB8: .4byte gUnk_0200AF00
_0801CEBC: .4byte gTextBox
_0801CEBC: .4byte gMessage
asm/code_0801D79C.s
+12 -12
View File
@@ -660,8 +660,8 @@ _0801DD7C: .4byte gAreaRoomHeaders
_0801DD80: .4byte gArea
_0801DD84: .4byte 0x0000085C
thumb_func_start sub_0801DD88
sub_0801DD88: @ 0x0801DD88
thumb_func_start LoadDungeonMap
LoadDungeonMap: @ 0x0801DD88
push {lr}
ldr r0, _0801DD98 @ =gUnk_0201AEE0
ldr r1, _0801DD9C @ =0x06006000
@@ -1034,7 +1034,7 @@ _0801E040: .4byte gUnk_02022740
thumb_func_start sub_0801E044
sub_0801E044: @ 0x0801E044
push {lr}
ldr r0, _0801E06C @ =gTextBox
ldr r0, _0801E06C @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -1053,7 +1053,7 @@ sub_0801E044: @ 0x0801E044
_0801E06A:
pop {pc}
.align 2, 0
_0801E06C: .4byte gTextBox
_0801E06C: .4byte gMessage
_0801E070: .4byte gUnk_02022740
thumb_func_start sub_0801E074
@@ -1086,7 +1086,7 @@ _0801E09C: .4byte gUnk_02022740
thumb_func_start sub_0801E0A0
sub_0801E0A0: @ 0x0801E0A0
push {r4, lr}
ldr r0, _0801E0D8 @ =gTextBox
ldr r0, _0801E0D8 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -1116,7 +1116,7 @@ _0801E0D2:
_0801E0D4:
pop {r4, pc}
.align 2, 0
_0801E0D8: .4byte gTextBox
_0801E0D8: .4byte gMessage
_0801E0DC: .4byte gUnk_02022740
thumb_func_start sub_0801E0E0
@@ -1130,13 +1130,13 @@ sub_0801E0E0: @ 0x0801E0E0
cmp r1, #0
beq _0801E0FC
adds r0, r2, #0
bl TextboxNoOverlap
bl MessageNoOverlap
b _0801E102
.align 2, 0
_0801E0F8: .4byte gUnk_02022740
_0801E0FC:
adds r0, r2, #0
bl TextboxNoOverlapFollow
bl MessageFromTarget
_0801E102:
pop {pc}
@@ -2299,14 +2299,14 @@ _0801E8BC:
bl sub_0801E810
cmp r0, #0
bne _0801E93A
ldr r1, _0801E8F4 @ =0x080C9A5C
ldr r1, _0801E8F4 @ =gUnk_080FC3E4
lsls r0, r4, #3
adds r0, r0, r1
ldrb r1, [r0, #4]
lsls r0, r1, #2
adds r0, r0, r1
lsls r0, r0, #2
ldr r1, _0801E8F8 @ =0x080FDFD0
ldr r1, _0801E8F8 @ =gUnk_080FE320
adds r2, r0, r1
ldrb r0, [r2, #0x10]
cmp r0, #4
@@ -2317,8 +2317,8 @@ _0801E8BC:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0801E8F4: .4byte 0x080C9A5C
_0801E8F8: .4byte 0x080FDFD0
_0801E8F4: .4byte gUnk_080C9CBC
_0801E8F8: .4byte gUnk_080FE320
_0801E8FC: .4byte _0801E900
_0801E900: @ jump table
.4byte _0801E914 @ case 0
asm/code_08050038.s
+2 -2
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_08050154
sub_08050154: @ 0x08050154
thumb_func_start UpdateFade
UpdateFade: @ 0x08050154
push {r4, r5, r6, lr}
ldr r4, _08050180 @ =gFadeControl
ldrh r0, [r4, #8]
asm/code_080526F8.s
+8 -8
View File
@@ -658,7 +658,7 @@ _08052BEC:
_08052BEE:
ldrh r0, [r3, #0x36]
adds r1, r2, #0
bl TextBoxAtYPosition
bl MessageAtHeight
pop {pc}
.ifdef USA
@@ -2560,8 +2560,8 @@ sub_08053A1C: @ 0x08053A1C
movs r0, #8
strh r0, [r1, #8]
ldr r0, _08053A54 @ =0x00000F07
bl TextboxNoOverlapFollow
ldr r1, _08053A58 @ =gTextBox
bl MessageFromTarget
ldr r1, _08053A58 @ =gMessage
movs r0, #1
strb r0, [r1, #6]
strb r4, [r1, #7]
@@ -2573,12 +2573,12 @@ _08053A4E:
.align 2, 0
_08053A50: .4byte gMenu
_08053A54: .4byte 0x00000F07
_08053A58: .4byte gTextBox
_08053A58: .4byte gMessage
thumb_func_start sub_08053A5C
sub_08053A5C: @ 0x08053A5C
push {lr}
ldr r0, _08053A88 @ =gTextBox
ldr r0, _08053A88 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -2600,7 +2600,7 @@ sub_08053A5C: @ 0x08053A5C
_08053A86:
pop {pc}
.align 2, 0
_08053A88: .4byte gTextBox
_08053A88: .4byte gMessage
_08053A8C: .4byte gMenu
thumb_func_start sub_08053A90
@@ -3314,7 +3314,7 @@ _08054014:
mov r8, r2
_08054018:
adds r0, r6, #0
bl sub_080544C8
bl ItemIsBottle
cmp r0, #0
bne _08054034
adds r0, r6, #0
@@ -3612,7 +3612,7 @@ sub_08054288: @ 0x08054288
lsls r0, r0, #3
adds r0, r0, r1
ldrh r0, [r0, #6]
bl TextboxNoOverlapFollow
bl MessageFromTarget
pop {pc}
.align 2, 0
_08054298: .4byte gUnk_080FD5B4
asm/code_08054C04.s
+1 -1
View File
@@ -2335,7 +2335,7 @@ sub_08055DC0: @ 0x08055DC0
cmp r0, #0
bne _08055DDC
ldr r0, _08055DE4 @ =0x00000A01
bl TextboxNoOverlapFollow
bl MessageFromTarget
ldr r1, _08055DE8 @ =gMenu
ldrb r0, [r1, #6]
adds r0, #1
asm/code_0805E3B0.s
+2 -2
View File
@@ -35,7 +35,7 @@ _0805E3DC: .4byte gUnk_03003DC0
_0805E3E0:
ldrb r2, [r1, #1]
_0805E3E2:
ldr r0, _0805E408 @ =gTextBox
ldr r0, _0805E408 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -57,7 +57,7 @@ _0805E402:
_0805E404:
pop {pc}
.align 2, 0
_0805E408: .4byte gTextBox
_0805E408: .4byte gMessage
thumb_func_start sub_0805E40C
sub_0805E40C: @ 0x0805E40C
asm/code_0805EC04.s
+8 -8
View File
@@ -396,8 +396,8 @@ _0805EFE4:
adds r0, r4, #0
pop {r4, pc}
thumb_func_start sub_0805EFE8
sub_0805EFE8: @ 0x0805EFE8
thumb_func_start GetCharacter
GetCharacter: @ 0x0805EFE8
push {r4, r5, r6, r7, lr}
adds r6, r0, #0
_0805EFEC:
@@ -794,8 +794,8 @@ _0805F320:
pop {pc}
.align 2, 0
thumb_func_start sub_GetFontStrWidth
sub_GetFontStrWidth: @ 0xGetFontStrWidth
thumb_func_start GetFontStrWith
GetFontStrWith: @ 0xGetFontStrWidth
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
@@ -822,7 +822,7 @@ _0805F34C:
mov sb, r2
_0805F352:
mov r0, sp
bl sub_0805EFE8
bl GetCharacter
adds r6, r0, #0
cmp r6, #0xe
bhi _0805F3B4
@@ -1028,7 +1028,7 @@ _0805F486:
str r0, [r4, #4]
mov r0, sp
movs r1, #1
bl sub_GetFontStrWidth
bl GetFontStrWith
lsrs r2, r0, #0x18
ldrb r1, [r4, #0x16]
muls r2, r1, r2
@@ -1161,7 +1161,7 @@ sub_0805F5CC: @ 0x0805F5CC
bl MemFill32
adds r0, r6, #0
movs r1, #0
bl sub_GetFontStrWidth
bl GetFontStrWith
adds r2, r0, #0
ldrb r1, [r4, #0x13]
movs r0, #1
@@ -1266,7 +1266,7 @@ sub_0805F6A4: @ 0x0805F6A4
movs r6, #0
_0805F6AC:
adds r0, r5, #0
bl sub_0805EFE8
bl GetCharacter
movs r7, #1
cmp r0, #0xe
bhi _0805F746
asm/code_0806ED78.s
+2 -2
View File
@@ -818,10 +818,10 @@ _0806F34E:
cmp r7, #0
beq _0806F35A
mov r1, r8
bl TextboxNoOverlap
bl MessageNoOverlap
b _0806F35E
_0806F35A:
bl TextboxNoOverlapFollow
bl MessageFromTarget
_0806F35E:
pop {r3}
mov r8, r3
asm/code_0807059C.s
+2 -2
View File
@@ -33,7 +33,7 @@ sub_080705AC: @ 0x080705AC
ldrb r0, [r0]
cmp r0, #0
bne _08070674
ldr r0, _08070620 @ =gTextBox
ldr r0, _08070620 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -73,7 +73,7 @@ sub_080705AC: @ 0x080705AC
_08070614: .4byte gInput
_08070618: .4byte gFadeControl
_0807061C: .4byte gUnk_02034490
_08070620: .4byte gTextBox
_08070620: .4byte gMessage
_08070624: .4byte gSave
_08070628: .4byte gPlayerState
_0807062C: .4byte gUnk_03003DC0
asm/code_080732D0.s
+1 -1
View File
@@ -2323,7 +2323,7 @@ sub_0807441C: @ 0x0807441C
adds r4, r6, #0
adds r4, #0xb4
ldrb r0, [r4]
bl sub_0805449C
bl ItemIsSword
cmp r0, #0
beq _08074448
ldrb r0, [r4]
asm/code_08077B98.s
+2 -2
View File
@@ -29,13 +29,13 @@ sub_08078008: @ 0x08078008
adds r5, r6, #0
adds r5, #0xb4
ldrb r0, [r5]
bl sub_0805449C
bl ItemIsSword
cmp r0, #0
bne _0807802C
adds r5, r6, #0
adds r5, #0xb5
ldrb r0, [r5]
bl sub_0805449C
bl ItemIsSword
movs r2, #0
cmp r0, #0
beq _0807802E
asm/code_08078778.s
+4 -4
View File
@@ -3185,7 +3185,7 @@ sub_0807A050: @ 0x0807A050
ldrb r2, [r3, #0xf]
cmp r2, #0
beq _0807A06A
ldr r0, _0807A08C @ =gTextBox
ldr r0, _0807A08C @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -3209,7 +3209,7 @@ _0807A084:
pop {pc}
.align 2, 0
_0807A088: .4byte gPlayerState
_0807A08C: .4byte gTextBox
_0807A08C: .4byte gMessage
_0807A090: .4byte gPlayerEntity
thumb_func_start sub_0807A094
@@ -3327,13 +3327,13 @@ sub_0807A158: @ 0x0807A158
adds r0, r4, #0
adds r0, #0xb4
ldrb r0, [r0]
bl sub_0805449C
bl ItemIsSword
cmp r0, #0
bne _0807A17C
adds r0, r4, #0
adds r0, #0xb5
ldrb r0, [r0]
bl sub_0805449C
bl ItemIsSword
b _0807A17E
.align 2, 0
_0807A178: .4byte gSave
asm/code_0807F0D8.s
-1633
View File
File diff suppressed because it is too large Load Diff
asm/code_080A3BD0.s
+15 -15
View File
@@ -430,7 +430,7 @@ _080A3F96:
bl SoundReq
ldr r0, _080A3FC8 @ =0x00000702
movs r1, #0xe
bl TextBoxAtYPosition
bl MessageAtHeight
movs r0, #1
strb r0, [r5, #6]
movs r0, #0x78
@@ -447,7 +447,7 @@ _080A3FC8: .4byte 0x00000702
thumb_func_start sub_080A3FCC
sub_080A3FCC: @ 0x080A3FCC
push {lr}
ldr r0, _080A3FE8 @ =gTextBox
ldr r0, _080A3FE8 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -461,7 +461,7 @@ sub_080A3FCC: @ 0x080A3FCC
_080A3FE6:
pop {pc}
.align 2, 0
_080A3FE8: .4byte gTextBox
_080A3FE8: .4byte gMessage
_080A3FEC: .4byte gMenu
_080A3FF0: .4byte 0x00000147
@@ -1170,7 +1170,7 @@ sub_080A4494: @ 0x080A4494
adds r4, r0, #0
cmp r4, #0
beq _080A44D0
ldr r0, _080A44D4 @ =gUnk_02000D00
ldr r0, _080A44D4 @ =gTextGfxBuffer
str r0, [r4, #8]
movs r1, #0
strb r1, [r4, #2]
@@ -1194,7 +1194,7 @@ _080A44D0:
adds r0, r5, #0
pop {r4, r5, pc}
.align 2, 0
_080A44D4: .4byte gUnk_02000D00
_080A44D4: .4byte gTextGfxBuffer
_080A44D8: .4byte gUnk_02002AC0
_080A44DC: .4byte gUnk_02022740
@@ -3201,7 +3201,7 @@ sub_080A529C: @ 0x080A529C
str r0, [r1, #0xc]
ldrb r4, [r1, #3]
lsls r1, r4, #3
ldr r0, _080A52D8 @ =gUnk_08128B64
ldr r0, _080A52D8 @ =gItemMenuTable
adds r1, r1, r0
ldr r0, _080A52DC @ =gInput
ldrh r2, [r0, #2]
@@ -3219,7 +3219,7 @@ sub_080A529C: @ 0x080A529C
.align 2, 0
_080A52D0: .4byte gMenu
_080A52D4: .4byte gUnk_08128BF4
_080A52D8: .4byte gUnk_08128B64
_080A52D8: .4byte gItemMenuTable
_080A52DC: .4byte gInput
_080A52E0:
cmp r4, #0x10
@@ -3358,7 +3358,7 @@ _080A4BC8:
ldrb r0, [r2]
cmp r0, #0
beq _080A4C68
ldr r0, _080A4C20 @ =gUnk_08128B64
ldr r0, _080A4C20 @ =gItemMenuTable
adds r1, r6, r0
ldrb r0, [r1, #6]
ldr r3, _080A4C14EU @ =gOamCmd
@@ -3395,7 +3395,7 @@ _080A4BF4:
_080A4C14EU: .4byte gOamCmd
_080A4C18: .4byte gSave
_080A4C1C: .4byte gChooseFileState
_080A4C20: .4byte gUnk_08128B64
_080A4C20: .4byte gItemMenuTable
_080A4C24: .4byte gBombBagSizes
_080A4C28:
cmp r3, #0xa
@@ -3453,7 +3453,7 @@ _080A4C68:
movs r1, #0x11
_080A4C8E:
lsls r0, r1, #3
ldr r1, _080A4D54EU @ =gUnk_08128B64
ldr r1, _080A4D54EU @ =gItemMenuTable
mov r8, r1
adds r1, r0, r1
mov r4, sb
@@ -3545,7 +3545,7 @@ _080A4D44: .4byte gOamCmd
_080A4D48: .4byte gSpriteAnimations_322
_080A4D4C: .4byte 0x00000141
_080A4D50EU: .4byte gChooseFileState
_080A4D54EU: .4byte gUnk_08128B64
_080A4D54EU: .4byte gItemMenuTable
_080A4D58: .4byte gMain
_080A4D5C: .4byte gSave
.else
@@ -3580,7 +3580,7 @@ _080A53B4:
ldrb r0, [r2]
cmp r0, #0
beq _080A5456
ldr r0, _080A540C @ =gUnk_08128B64
ldr r0, _080A540C @ =gItemMenuTable
adds r1, r6, r0
ldrb r0, [r1, #6]
ldr r3, _080A5400 @ =gOamCmd
@@ -3617,7 +3617,7 @@ _080A53E0:
_080A5400: .4byte gOamCmd
_080A5404: .4byte gSave
_080A5408: .4byte gMenu
_080A540C: .4byte gUnk_08128B64
_080A540C: .4byte gItemMenuTable
_080A5410: .4byte gBombBagSizes
_080A5414:
cmp r3, #0xa
@@ -3676,7 +3676,7 @@ _080A5456:
movs r1, #0x11
_080A547C:
lsls r0, r1, #3
ldr r1, _080A553C @ =gUnk_08128B64
ldr r1, _080A553C @ =gItemMenuTable
mov r8, r1
adds r1, r0, r1
mov r4, sb
@@ -3766,7 +3766,7 @@ _080A552C: .4byte gQuiverSizes
_080A5530: .4byte gOamCmd
_080A5534: .4byte gSpriteAnimations_322
_080A5538: .4byte gMenu
_080A553C: .4byte gUnk_08128B64
_080A553C: .4byte gItemMenuTable
_080A5540: .4byte gMain
_080A5544: .4byte 0x000001FB
_080A5548: .4byte gSave
asm/code_080A5574.s
+2 -2
View File
@@ -1259,7 +1259,7 @@ sub_080A5CFC: @ 0x080A5CFC
push {r4, lr}
adds r4, r0, #0
bl sub_0801DDA0
bl sub_0801DD88
bl LoadDungeonMap
ldr r1, _080A5D18 @ =gUnk_02019EE0
movs r2, #0x80
lsls r2, r2, #3
@@ -4085,7 +4085,7 @@ _080A6D38:
strb r0, [r2]
bl sub_080A7114
ldr r0, _080A6D48 @ =0x00000704
bl TextboxNoOverlapFollow
bl MessageFromTarget
b _080A6D54
.align 2, 0
_080A6D48: .4byte 0x00000704
asm/code_080A7C00.s
+1 -1
View File
@@ -192,7 +192,7 @@ sub_080A7D44: @ 0x080A7D44
bl sub_08078AA8
b _080A7D56
_080A7D52:
bl TextboxNoOverlapFollow
bl MessageFromTarget
_080A7D56:
pop {pc}
asm/crt0.s
+1 -1
View File
@@ -39,7 +39,7 @@ _080000F0:
sp_irq: .4byte gUnk_03007FA0
sp_usr: .4byte gUnk_03007F00
INTR_VECTOR_BUF: .4byte 0x03007FFC
intr_main: .4byte IntrMain
intr_main: .4byte gIntrMain
.ifdef EU
unk_function: .4byte sub_08000118
.else
asm/figurineDevice.s
+23 -23
View File
@@ -465,8 +465,8 @@ _080878EA:
movs r0, #3
bl SetRoomFlag
ldr r0, _08087910 @ =0x0000431A
bl TextboxNoOverlapFollow
ldr r1, _08087914 @ =gTextBox
bl MessageFromTarget
ldr r1, _08087914 @ =gMessage
adds r0, r4, #0
adds r0, #0x81
ldrb r0, [r0]
@@ -475,7 +475,7 @@ _0808790C:
pop {r4, r5, r6, pc}
.align 2, 0
_08087910: .4byte 0x0000431A
_08087914: .4byte gTextBox
_08087914: .4byte gMessage
.else
push {r4, r5, r6, r7, lr}
@@ -599,8 +599,8 @@ _08087F24:
movs r0, #3
bl SetRoomFlag
ldr r0, _08087F50 @ =0x0000431A
bl TextboxNoOverlapFollow
ldr r1, _08087F54 @ =gTextBox
bl MessageFromTarget
ldr r1, _08087F54 @ =gMessage
movs r0, #1
strb r0, [r1, #6]
movs r0, #0xc
@@ -613,7 +613,7 @@ _08087F4E:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08087F50: .4byte 0x0000431A
_08087F54: .4byte gTextBox
_08087F54: .4byte gMessage
.endif
thumb_func_start sub_08087F58
@@ -1102,7 +1102,7 @@ sub_08088160: @ 0x08088160
push {r4, lr}
adds r2, r0, #0
lsls r1, r1, #3
ldr r0, _08087FB0 @ =0x080FC094
ldr r0, _08087FB0 @ =gUnk_080FC3E4
adds r1, r1, r0
movs r4, #0
adds r0, r2, #0
@@ -1120,7 +1120,7 @@ sub_08088160: @ 0x08088160
beq _08087FBC
b _0808806A
.align 2, 0
_08087FB0: .4byte 0x080FC094
_08087FB0: .4byte gUnk_080FC3E4
_08087FB4:
cmp r0, #0x20
beq _08087FCA
@@ -1940,8 +1940,8 @@ _080884D0:
ldr r1, _080884F8 @ =0x00004327
_080884D2:
adds r0, r1, #0
bl TextboxNoOverlapFollow
ldr r1, _080884FC @ =gTextBox
bl MessageFromTarget
ldr r1, _080884FC @ =gMessage
movs r0, #1
strb r0, [r1, #6]
movs r0, #0xc
@@ -1960,7 +1960,7 @@ _080884EA:
.align 2, 0
_080884F4: .4byte 0x00004328
_080884F8: .4byte 0x00004327
_080884FC: .4byte gTextBox
_080884FC: .4byte gMessage
.ifndef EU
_08088500: .4byte gPlayerEntity
.endif
@@ -1988,8 +1988,8 @@ _08088524: .4byte 0x00004314
_08088528:
ldr r0, _0808853C @ =0x00004311
_0808852A:
bl TextboxNoOverlapFollow
ldr r0, _08088540 @ =gTextBox
bl MessageFromTarget
ldr r0, _08088540 @ =gMessage
movs r1, #1
strb r1, [r0, #6]
movs r1, #0xc
@@ -1997,7 +1997,7 @@ _0808852A:
pop {pc}
.align 2, 0
_0808853C: .4byte 0x00004311
_08088540: .4byte gTextBox
_08088540: .4byte gMessage
thumb_func_start sub_08088544
sub_08088544: @ 0x08088544
@@ -2011,8 +2011,8 @@ sub_08088544: @ 0x08088544
subs r1, #7
_08088554:
adds r0, r1, #0
bl TextboxNoOverlapFollow
ldr r0, _08088570 @ =gTextBox
bl MessageFromTarget
ldr r0, _08088570 @ =gMessage
movs r1, #1
strb r1, [r0, #6]
movs r1, #0xc
@@ -2021,7 +2021,7 @@ _08088554:
.align 2, 0
_08088568: .4byte gSave
_0808856C: .4byte 0x00004315
_08088570: .4byte gTextBox
_08088570: .4byte gMessage
thumb_func_start sub_08088574
sub_08088574: @ 0x08088574
@@ -2047,8 +2047,8 @@ _08088594:
ldr r1, _080885A8 @ =0x0000430B
_08088596:
adds r0, r1, #0
bl TextboxNoOverlapFollow
ldr r0, _080885AC @ =gTextBox
bl MessageFromTarget
ldr r0, _080885AC @ =gMessage
movs r1, #1
strb r1, [r0, #6]
movs r1, #0xc
@@ -2056,7 +2056,7 @@ _08088596:
pop {pc}
.align 2, 0
_080885A8: .4byte 0x0000430B
_080885AC: .4byte gTextBox
_080885AC: .4byte gMessage
thumb_func_start sub_080885B0
sub_080885B0: @ 0x080885B0
@@ -2072,8 +2072,8 @@ sub_080885B0: @ 0x080885B0
movs r0, #5
bl ModRupees
ldr r0, _080885E0 @ =0x00004326
bl TextboxNoOverlapFollow
ldr r1, _080885E4 @ =gTextBox
bl MessageFromTarget
ldr r1, _080885E4 @ =gMessage
movs r0, #1
strb r0, [r1, #6]
movs r0, #0xc
@@ -2081,7 +2081,7 @@ sub_080885B0: @ 0x080885B0
b _0808860A
.align 2, 0
_080885E0: .4byte 0x00004326
_080885E4: .4byte gTextBox
_080885E4: .4byte gMessage
_080885E8:
ldr r1, _08088618 @ =gSave
adds r0, r1, #0
asm/fileScreen.s
+2 -2
View File
@@ -427,7 +427,7 @@ sub_08051BD0: @ 0x08051BD0
ldrb r0, [r0, #4]
cmp r0, #2
bne _08051C9C
ldr r0, _08051C60 @ =gTextBox
ldr r0, _08051C60 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -467,7 +467,7 @@ _08051C06:
b _08051C9C
.align 2, 0
_08051C5C: .4byte gMain
_08051C60: .4byte gTextBox
_08051C60: .4byte gMessage
_08051C64: .4byte gUnk_03003DC0
_08051C68: .4byte gRoomControls
_08051C6C:
asm/fourElements.s
+3 -3
View File
@@ -276,7 +276,7 @@ sub_080A03B8: @ 0x080A03B8
ldrb r0, [r4, #0xa]
bl sub_0805429C
adds r1, r4, #0
bl TextboxNoOverlap
bl MessageNoOverlap
_080A03E4:
pop {r4, pc}
.align 2, 0
@@ -287,7 +287,7 @@ sub_080A03E8: @ 0x080A03E8
movs r0, #0
movs r1, #0xa
bl sub_0805E4E0
ldr r0, _080A041C @ =gTextBox
ldr r0, _080A041C @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -306,7 +306,7 @@ sub_080A03E8: @ 0x080A03E8
_080A041A:
pop {pc}
.align 2, 0
_080A041C: .4byte gTextBox
_080A041C: .4byte gMessage
_080A0420: .4byte gPlayerState
thumb_func_start sub_080A0424
asm/intr.s
+94 -71
View File
@@ -6,6 +6,10 @@
.text
.code 16
.global RAMFUNCS_BASE
RAMFUNCS_BASE::
sub_080B197C:: @ 0x080B197C
push {r4, r5, r6}
ldr r2, _080B19C0 @ =gRoomControls
@@ -250,13 +254,14 @@ _080B1C48: .4byte gUnk_080B7A3E
_080B1C4C: .4byte gRoomControls
_080B1C50: .4byte gUnk_08000278
arm_func_start sub_080B1C54
sub_080B1C54: @ 0x080B1C54
arm_func_start UpdateCollision
UpdateCollision: @ 0x080B1C54
@ r0 : Entity* this
ldrb r1, [r0, #0x10]
ands r1, r1, #0x80
ands r1, r1, #0x80 @ disable collision flag
bxeq lr
ldr r2, _080B200C @ =gUnk_03000E10
ldr r3, _080B2010 @ =gHitboxCount
ldr r2, _080B200C @ =gCollidableList
ldr r3, _080B2010 @ =gCollidableCount
ldrb r1, [r3]
str r0, [r2, r1, lsl #2]
add r1, r1, #1
@@ -340,8 +345,8 @@ _080B1D84:
pop {r4, r5, r6, r7, r8, sb, sl, lr}
bx lr
_080B1D8C: .4byte gUnk_02018EA0
_080B1D90: .4byte gUnk_03000E10
_080B1D94: .4byte gHitboxCount
_080B1D90: .4byte gCollidableList
_080B1D94: .4byte gCollidableCount
arm_func_start sub_080B1D98
sub_080B1D98: @ 0x080B1D98
@@ -525,33 +530,33 @@ _080B1FFC: .4byte gUnk_03005D5C
_080B2000: .4byte gUnk_03005D24
_080B2004: .4byte gUnk_03005D18
_080B2008: .4byte gUnk_03005D58
_080B200C: .4byte gUnk_03000E10
_080B2010: .4byte gHitboxCount
_080B200C: .4byte gCollidableList
_080B2010: .4byte gCollidableCount
_080B2014: .4byte gUnk_080B7B74
_080B2018: .4byte gUnk_080B3744
arm_func_start sub_080B201C
sub_080B201C: @ 0x080B201C
arm_func_start IntrMain
IntrMain:
mov r3, #0x4000000
add r3, r3, #0x200
ldr r2, [r3]
ldrh r1, [r3, #8]
ldr r2, [r3] @ lo 16: interrupt_enable, hi 16: interrupt_request
ldrh r1, [r3, #8] @ interrupt master enable
mrs r0, spsr
push {r0, r1, r2, r3, lr}
and r1, r2, r2, lsr #16
ands r0, r1, #0x2000
ands r0, r1, #0x2000 @ external irq
bne _080B20D4
mov ip, #4
ands r0, r1, #0x80
ands r0, r1, #0x80 @ serial comm
bne _080B2074
mov ip, #0xc
ands r0, r1, #4
ands r0, r1, #4 @ vcount
bne _080B2074
mov ip, #0x10
ands r0, r1, #1
ands r0, r1, #1 @ vblank
bne _080B2074
mov ip, #0x14
ands r0, r1, #0x40
ands r0, r1, #0x40 @ timer 3 overflow
bne _080B2074
mov ip, #0
_080B2074:
@@ -610,8 +615,8 @@ _080B20FC:
mov r0, #1
bx lr
arm_func_start sub_080B2124
sub_080B2124: @ 0x080B2124
arm_func_start MakeFadeBuff256
MakeFadeBuff256: @ 0x080B2124
push {r4, r5, r6, r7, r8, sb, sl, fp}
mul r3, r2, r3
mov r4, #0x400
@@ -652,50 +657,60 @@ _080B21AC: .4byte gUnk_08000F54
arm_func_start UpdateEntities
UpdateEntities: @ 0x080B21B0
ldr fp, _080B2270 @ =gUnk_03003DD0
ldr r1, [fp]
ldm r1, {r7, r8, sb, sl}
ldr sp, [fp, #0xc]
ldr r8, [fp, #4]
ldr r0, [fp, #8]
ldr r11, _080B2270 @ =gUnk_03003DD0
ldr r1, [r11]
ldm r1, {r7, r8, r9, r10}
ldr sp, [r11, #0xc]
ldr r8, [r11, #4]
ldr r0, [r11, #8]
add pc, pc, #0x60 @ =_080B2230
@ gUnk_03003DD0 {
@ void* chosen_table;
@ void* linked_list_top;
@ void* curr_entity;
@ void* restore_sp;
@ }
@ UpdateEntities starts here
@ arg0 (r0) : 0 = entities, 1 = managers
ldr r1, _080B2274 @ =gUnk_080026A4
add r1, r1, r0, lsl #4
push {r4, r5, r6, r7, r8, sb, sl, fp, lr}
ldr fp, _080B2278 @ =gUnk_03003DD0
str r1, [fp]
str sp, [fp, #0xc]
ldm r1, {r7, r8, sb, sl}
_080B21E8:
push {r4 - r11, lr}
ldr r11, _080B2278 @ =gUnk_03003DD0
str r1, [r11, #0x0]
str sp, [r11, #0xc]
ldm r1, {r7, r8, r9, r10}
next_list: @ traverse entity linked list
add r8, r8, #8
str r8, [fp, #4]
cmp r8, sb
bhs _080B2238
ldr r4, [r8, #4]
_080B21FC:
str r8, [r11, #4]
cmp r8, r9
bhs lists_complete
ldr r4, [r8, #4] @ entity -> next
next_entity:
cmp r4, r8
beq _080B21E8
beq next_list
mov r0, #0
str r0, [r7]
str r4, [fp, #8]
ldrb r1, [r4, #8]
ldr r1, [sl, r1, lsl #2]
str r4, [r11, #8]
ldrb r1, [r4, #8] @ entity -> kind
ldr r1, [r10, r1, lsl #2]
mov r0, r4
mov lr, pc
bx r1 @ Jump to address stored in r1
_080B2224:
ldr r0, [fp, #8]
cmp r0, r4
bleq sub_080B1C54
bx r1 @ call entity kind update function
ldr r0, [r11, #8]
cmp r0, r4 @ update collision if entity is still alive
bleq UpdateCollision
_080B2230: @ jumped here if ClearAndUpdateEntities
ldr r4, [r0, #4]
b _080B21FC
_080B2238:
b next_entity
lists_complete:
mov r0, #0
str r0, [fp, #8]
pop {r4, r5, r6, r7, r8, sb, sl, fp, lr}
str r0, [r11, #8]
pop {r4 - r11, lr}
bx lr
_080B2248::
_080B2248: .4byte DeleteThisEntity @ 0x3005fbc
_080B224C: .4byte PlayerUpdate
_080B2250: .4byte DeleteThisEntity
@@ -706,6 +721,7 @@ _080B2260: .4byte ObjectUpdate
_080B2264: .4byte NPCUpdate
_080B2268: .4byte ItemUpdate
_080B226C: .4byte ManagerUpdate
_080B2270: .4byte gUnk_03003DD0
_080B2274: .4byte gUnk_080026A4
_080B2278: .4byte gUnk_03003DD0
@@ -860,7 +876,7 @@ sub_080B19C8: @ 0x080B19C8
mov r2, #0
strb r2, [r1]
stmdb sp!, {lr}
bl sub_080B2478
bl ResolveOamDrawPriority
bl sub_080B2534
ldm sp!, {lr}
b _080B1C40EU
@@ -910,7 +926,7 @@ sub_080B19C8: @ 0x080B19C8
mov r2, #0
strb r2, [r1]
stmdb sp!, {lr}
bl sub_080B2478
bl ResolveOamDrawPriority
bl sub_080B2534
ldm sp!, {lr}
b _080B1C40EU
@@ -949,15 +965,18 @@ sub_080B2448: @ 0x080B2448
mov r2, #0
strb r2, [r1]
stmdb sp!, {lr}
bl sub_080B2478
bl ResolveOamDrawPriority
bl sub_080B2534
ldm sp!, {lr}
b _080B26B4
.endif
.endif
arm_func_start sub_080B2478
sub_080B2478: @ 0x080B2478
arm_func_start ResolveOamDrawPriority
ResolveOamDrawPriority: @ 0x080B2478
prio_a .req r8
prio_b .req r5
mov sb, r0
mov r1, r0
ldrb r2, [r1], #4
@@ -965,7 +984,7 @@ sub_080B2478: @ 0x080B2478
sub sl, r2, #1
add r2, r1, sl, lsl #2
cmp sl, #0
beq _080B252C
beq no_objs
_080B2498:
lsl r3, sl, #2
mov r6, #0
@@ -977,40 +996,44 @@ _080B24A0:
_080B24B0:
cmp r1, ip
blo _080B251C
# sprite A
ldr r4, [r1]
# pos
ldr r8, [r4, #0x30]
add r8, r8, #-0x80000000
lsr r8, r8, #3
add r8, #0x80000000
lsr r8, #3
# load priority bits, NOT so 0 = highest priority
ldrb r0, [r4, #0x29]
mvn r0, r0
orr r8, r8, r0, lsl #29
orr prio_a, r8, r0, lsl #29
add r7, r1, r3
_080B24D8:
next_sprite:
cmp r2, r7
blo _080B2510
blo a_priority
# sprite B
ldr r5, [r7]
ldr r0, [r5, #0x30]
add r0, r0, #-0x80000000
lsr r0, r0, #3
add r0, #0x80000000
lsr r0, #3
ldrb r5, [r5, #0x29]
mvn r5, r5
orr r5, r0, r5, lsl #29
cmp r8, r5
bhs _080B2510
orr prio_b, r0, r5, lsl #29
cmp prio_a, prio_b
bhs a_priority
ldr r5, [r7], -r3
str r5, [r7], r3, lsl #1
b _080B24D8
_080B2510:
b next_sprite
a_priority:
str r4, [r7, -r3]!
sub r1, r1, r3
b _080B24B0
_080B251C:
add r6, r6, #1
add r6, #1
b _080B24A0
_080B2524:
lsrs sl, sl, #1
lsrs sl, #1
bne _080B2498
_080B252C:
no_objs:
mov r0, sb
bx lr
asm/itemForSale.s
+1 -1
View File
@@ -148,7 +148,7 @@ _080818F0:
adds r0, #0x2f
movs r1, #2
strb r1, [r0]
bl sub_08056360
bl MessageClose
_08081920:
pop {r4, pc}
.align 2, 0
asm/jarPortal.s
-441
View File
@@ -6,444 +6,3 @@
.text
thumb_func_start JarPortal
JarPortal: @ 0x0808BE84
push {lr}
ldr r2, _0808BE98 @ =gUnk_08121488
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_0808BE98: .4byte gUnk_08121488
thumb_func_start sub_0808BE9C
sub_0808BE9C: @ 0x0808BE9C
push {r4, r5, lr}
adds r4, r0, #0
ldrb r1, [r4, #0x10]
movs r0, #0x80
movs r2, #0
orrs r0, r1
strb r0, [r4, #0x10]
adds r0, r4, #0
adds r0, #0x3f
movs r5, #1
strb r5, [r0]
adds r1, r4, #0
adds r1, #0x3c
movs r0, #0x47
strb r0, [r1]
adds r1, #4
movs r0, #0x44
strb r0, [r1]
subs r1, #5
movs r0, #0x80
strb r0, [r1]
adds r0, r4, #0
adds r0, #0x68
strb r2, [r0]
ldrb r0, [r4, #0xa]
bl CheckLocalFlag
cmp r0, #0
beq _0808BEEE
adds r0, r4, #0
adds r0, #0x7c
ldrb r0, [r0]
cmp r0, #0
bne _0808BEF8
movs r0, #3
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #1
bl InitAnimationForceUpdate
b _0808BF10
_0808BEEE:
adds r0, r4, #0
adds r0, #0x7c
ldrb r0, [r0]
cmp r0, #0
bne _0808BF04
_0808BEF8:
strb r5, [r4, #0xc]
adds r0, r4, #0
movs r1, #0
bl InitAnimationForceUpdate
b _0808BF10
_0808BF04:
movs r0, #3
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #1
bl InitAnimationForceUpdate
_0808BF10:
pop {r4, r5, pc}
.align 2, 0
thumb_func_start sub_0808BF14
sub_0808BF14: @ 0x0808BF14
push {r4, lr}
adds r4, r0, #0
bl sub_0808C128
cmp r0, #0
beq _0808BF4C
ldrb r0, [r4, #0xc]
adds r0, #1
strb r0, [r4, #0xc]
adds r0, r4, #0
bl sub_0808C13C
adds r0, r4, #0
adds r0, #0x7c
ldrb r0, [r0]
cmp r0, #0
bne _0808BF3E
ldrb r0, [r4, #0xa]
bl SetLocalFlag
b _0808BF44
_0808BF3E:
ldrb r0, [r4, #0xa]
bl ClearLocalFlag
_0808BF44:
adds r0, r4, #0
movs r1, #0
bl sub_0808C148
_0808BF4C:
adds r0, r4, #0
movs r1, #0
bl sub_0808C01C
pop {r4, pc}
.align 2, 0
thumb_func_start sub_0808BF58
sub_0808BF58: @ 0x0808BF58
push {r4, lr}
adds r4, r0, #0
movs r1, #0x80
lsls r1, r1, #6
bl sub_08003FC4
ldrb r0, [r4, #0xd]
cmp r0, #1
beq _0808BF94
cmp r0, #1
bgt _0808BF74
cmp r0, #0
beq _0808BF7A
b _0808BFD6
_0808BF74:
cmp r0, #2
beq _0808BFB0
b _0808BFD6
_0808BF7A:
ldr r1, [r4, #0x20]
ldr r0, _0808BF90 @ =0x00017FFF
cmp r1, r0
bgt _0808BFD6
movs r0, #1
strb r0, [r4, #0xd]
adds r0, r4, #0
movs r1, #2
bl InitAnimationForceUpdate
b _0808BFD6
.align 2, 0
_0808BF90: .4byte 0x00017FFF
_0808BF94:
adds r0, r4, #0
bl UpdateAnimationSingleFrame
movs r1, #0x36
ldrsh r0, [r4, r1]
cmp r0, #0
bne _0808BFD6
ldrb r0, [r4, #0xd]
adds r0, #1
strb r0, [r4, #0xd]
movs r0, #0x80
lsls r0, r0, #8
str r0, [r4, #0x20]
b _0808BFD6
_0808BFB0:
adds r0, r4, #0
bl UpdateAnimationSingleFrame
movs r0, #0x36
ldrsh r1, [r4, r0]
cmp r1, #0
bne _0808BFD6
ldrb r0, [r4, #0xc]
adds r0, #1
strb r0, [r4, #0xc]
strb r1, [r4, #0xf]
adds r0, r4, #0
movs r1, #1
bl InitAnimationForceUpdate
adds r0, r4, #0
movs r1, #1
bl sub_0808C148
_0808BFD6:
pop {r4, pc}
thumb_func_start sub_0808BFD8
sub_0808BFD8: @ 0x0808BFD8
push {r4, lr}
adds r4, r0, #0
bl sub_0808C128
cmp r0, #0
beq _0808C010
ldrb r0, [r4, #0xc]
adds r0, #1
strb r0, [r4, #0xc]
adds r0, r4, #0
bl sub_0808C13C
adds r0, r4, #0
adds r0, #0x7c
ldrb r0, [r0]
cmp r0, #0
bne _0808C002
ldrb r0, [r4, #0xa]
bl ClearLocalFlag
b _0808C008
_0808C002:
ldrb r0, [r4, #0xa]
bl SetLocalFlag
_0808C008:
adds r0, r4, #0
movs r1, #0
bl sub_0808C148
_0808C010:
adds r0, r4, #0
movs r1, #1
bl sub_0808C01C
pop {r4, pc}
.align 2, 0
thumb_func_start sub_0808C01C
sub_0808C01C: @ 0x0808C01C
push {r4, r5, r6, lr}
adds r4, r0, #0
adds r5, r1, #0
movs r1, #0x2e
ldrsh r0, [r4, r1]
subs r0, #0x18
movs r2, #0x32
ldrsh r1, [r4, r2]
subs r1, #0x18
movs r2, #0x30
movs r3, #0x30
bl CheckPlayerProximity
cmp r0, #0
beq _0808C0A6
ldr r2, _0808C06C @ =gArea
ldrh r0, [r4, #0x2e]
strh r0, [r2, #0x12]
ldrh r0, [r4, #0x32]
strh r0, [r2, #0x14]
movs r6, #2
strb r6, [r2, #0x16]
movs r0, #4
cmp r5, #0
beq _0808C050
movs r0, #2
_0808C050:
strb r0, [r2, #0x17]
cmp r5, #1
bne _0808C0A6
ldr r3, _0808C070 @ =gPlayerState
ldr r0, [r3, #0x30]
movs r1, #0x20
ands r0, r1
cmp r0, #0
beq _0808C074
ldrb r0, [r3, #2]
cmp r0, #0
bne _0808C074
strb r6, [r2, #0x18]
b _0808C082
.align 2, 0
_0808C06C: .4byte gArea
_0808C070: .4byte gPlayerState
_0808C074:
bl sub_08057810
cmp r0, #0
beq _0808C082
ldr r1, _0808C0A8 @ =gArea
movs r0, #3
strb r0, [r1, #0x18]
_0808C082:
movs r1, #0x2e
ldrsh r0, [r4, r1]
movs r2, #0x32
ldrsh r1, [r4, r2]
adds r2, r4, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_080577AC
ldrb r0, [r4, #0xf]
cmp r0, #0
bne _0808C0A6
movs r0, #1
strb r0, [r4, #0xf]
movs r0, #0xa9
lsls r0, r0, #1
bl SoundReq
_0808C0A6:
pop {r4, r5, r6, pc}
.align 2, 0
_0808C0A8: .4byte gArea
thumb_func_start sub_0808C0AC
sub_0808C0AC: @ 0x0808C0AC
push {r4, lr}
adds r4, r0, #0
movs r1, #0x80
lsls r1, r1, #6
bl sub_08003FC4
ldrb r0, [r4, #0xd]
cmp r0, #1
beq _0808C0E8
cmp r0, #1
bgt _0808C0C8
cmp r0, #0
beq _0808C0CE
b _0808C126
_0808C0C8:
cmp r0, #2
beq _0808C104
b _0808C126
_0808C0CE:
ldr r1, [r4, #0x20]
ldr r0, _0808C0E4 @ =0x00017FFF
cmp r1, r0
bgt _0808C126
movs r0, #1
strb r0, [r4, #0xd]
adds r0, r4, #0
movs r1, #3
bl InitAnimationForceUpdate
b _0808C126
.align 2, 0
_0808C0E4: .4byte 0x00017FFF
_0808C0E8:
adds r0, r4, #0
bl UpdateAnimationSingleFrame
movs r1, #0x36
ldrsh r0, [r4, r1]
cmp r0, #0
bne _0808C126
ldrb r0, [r4, #0xd]
adds r0, #1
strb r0, [r4, #0xd]
movs r0, #0x80
lsls r0, r0, #8
str r0, [r4, #0x20]
b _0808C126
_0808C104:
adds r0, r4, #0
bl UpdateAnimationSingleFrame
movs r1, #0x36
ldrsh r0, [r4, r1]
cmp r0, #0
bne _0808C126
movs r0, #1
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #0
bl InitAnimationForceUpdate
adds r0, r4, #0
movs r1, #1
bl sub_0808C148
_0808C126:
pop {r4, pc}
thumb_func_start sub_0808C128
sub_0808C128: @ 0x0808C128
push {lr}
movs r1, #0
adds r0, #0x41
ldrb r0, [r0]
cmp r0, #0x9d
bne _0808C136
movs r1, #1
_0808C136:
adds r0, r1, #0
pop {pc}
.align 2, 0
thumb_func_start sub_0808C13C
sub_0808C13C: @ 0x0808C13C
movs r1, #0
strb r1, [r0, #0xd]
movs r1, #0xa0
lsls r1, r1, #0xa
str r1, [r0, #0x20]
bx lr
thumb_func_start sub_0808C148
sub_0808C148: @ 0x0808C148
push {r4, r5, r6, lr}
adds r6, r0, #0
movs r2, #0x2e
ldrsh r0, [r6, r2]
ldr r4, _0808C1A4 @ =gRoomControls
ldrh r2, [r4, #6]
subs r0, r0, r2
asrs r5, r0, #4
movs r3, #0x3f
ands r5, r3
movs r2, #0x32
ldrsh r0, [r6, r2]
ldrh r2, [r4, #8]
subs r0, r0, r2
asrs r0, r0, #4
ands r0, r3
lsls r0, r0, #6
orrs r5, r0
cmp r1, #0
bne _0808C1B8
ldr r0, _0808C1A8 @ =0x00004092
subs r1, r5, #1
adds r4, r6, #0
adds r4, #0x38
ldrb r2, [r4]
bl SetTile
ldr r0, _0808C1AC @ =0x00004093
ldrb r2, [r4]
adds r1, r5, #0
bl SetTile
ldr r0, _0808C1B0 @ =0x00004094
adds r1, r5, #0
adds r1, #0x3f
ldrb r2, [r4]
bl SetTile
ldr r0, _0808C1B4 @ =0x00004095
adds r1, r5, #0
adds r1, #0x40
ldrb r2, [r4]
bl SetTile
b _0808C1E0
.align 2, 0
_0808C1A4: .4byte gRoomControls
_0808C1A8: .4byte 0x00004092
_0808C1AC: .4byte 0x00004093
_0808C1B0: .4byte 0x00004094
_0808C1B4: .4byte 0x00004095
_0808C1B8:
subs r0, r5, #1
adds r4, r6, #0
adds r4, #0x38
ldrb r1, [r4]
bl sub_0807BA8C
ldrb r1, [r4]
adds r0, r5, #0
bl sub_0807BA8C
adds r0, r5, #0
adds r0, #0x3f
ldrb r1, [r4]
bl sub_0807BA8C
adds r0, r5, #0
adds r0, #0x40
ldrb r1, [r4]
bl sub_0807BA8C
_0808C1E0:
pop {r4, r5, r6, pc}
.align 2, 0
asm/macros.inc
+1
View File
@@ -1,5 +1,6 @@
.include "asm/macros/asm.inc"
.include "asm/macros/function.inc"
.include "asm/macros/ram.inc"
.include "asm/macros/m4a.inc"
.include "asm/macros/map.inc"
.include "asm/macros/entity.inc"
asm/macros/ram.inc
+20
View File
@@ -0,0 +1,20 @@
.ifndef GUARD_ASM_MACROS_RAM_INC
.set GUARD_ASM_MACROS_RAM_INC, 1
.ifdef EU
.set RAM_DIFF, 0x050AC28C - 0xaa0
.endif
.ifdef USA
.set RAM_DIFF, 0x050AC28C
.endif
.ifdef JP
.set RAM_DIFF, 0x050AC28C - 0x260
.endif
.macro ram_addr x
.4byte \x - RAM_DIFF
.endm
.endif @ GUARD_ASM_MACROS_RAM_INC
asm/macros/scripts.inc
+7 -7
View File
@@ -329,7 +329,7 @@
.2byte \s
.endm
.macro _0807E788 w:req
.macro SetFadeMask w:req
.2byte 0x0c39
.4byte \w
.endm
@@ -479,33 +479,33 @@
.2byte 0x0459
.endm
.macro TextboxNoOverlapFollow s:req
.macro MessageFromTarget s:req
.2byte 0x085a
.2byte \s
.endm
.macro TextboxNoOverlap s:req
.macro MessageNoOverlap s:req
.2byte 0x085b
.2byte \s
.endm
.macro TextboxNoOverlapFollowPos a:req, b:req
.macro MessageFromTargetPos a:req, b:req
.2byte 0x0c5c
.2byte \a
.2byte \b
.endm
.macro TextboxNoOverlapFollowPos_1 s:req
.macro MessageFromTargetPos_1 s:req
.2byte 0x085c
.2byte \s
.endm
.macro TextboxNoOverlapFollowTable labels:vararg
.macro MessageFromTargetTable labels:vararg
RecursiveOpcode 0x5d 1 \labels
RecursiveArgs .2byte \labels
.endm
.macro TextboxNoOverlapVar
.macro MessageNoOverlapVar
.2byte 0x045e
.endm
asm/non_matching/brocco/sub_08063584.inc
+1 -1
View File
@@ -54,7 +54,7 @@ _080635D0:
ldrb r0, [r4, #0xe]
ldr r1, _08063604 @ =0x00000A01
adds r0, r0, r1
bl TextboxNoOverlapFollow
bl MessageFromTarget
_080635FC:
adds r0, r4, #0
bl sub_0806ED78
asm/non_matching/castleMaid/sub_08064570.inc
+2 -2
View File
@@ -90,7 +90,7 @@ _080645EA:
.align 2, 0
_08064628: .4byte gPlayerEntity
_0806462C:
ldr r0, _08064640 @ =gTextBox
ldr r0, _08064640 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -101,5 +101,5 @@ _0806462C:
_0806463C:
pop {r4, r5, pc}
.align 2, 0
_08064640: .4byte gTextBox
_08064640: .4byte gMessage
.syntax divided
asm/non_matching/cucco/sub_0806E6A8.inc
+1 -1
View File
@@ -17,7 +17,7 @@ _0806E6C2:
adds r1, r1, r0
ldrh r0, [r1]
adds r1, r4, #0
bl TextboxNoOverlap
bl MessageNoOverlap
pop {r4, r5, pc}
.align 2, 0
_0806E6D4: .4byte gSave
asm/non_matching/eu/HandlePlayerLife.inc
+2 -2
View File
@@ -99,7 +99,7 @@ _080170F8:
beq _08017104
b _08017222
_08017104:
ldr r0, _08017160 @ =gTextBox
ldr r0, _08017160 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -148,7 +148,7 @@ _0801714E:
strh r1, [r0]
b _08017192
.align 2, 0
_08017160: .4byte gTextBox
_08017160: .4byte gMessage
_08017164: .4byte gUnk_0200AF00
_08017168: .4byte gScreenTransition
_0801716C: .4byte gSave
asm/non_matching/eu/TextBoxHandlerQuestion.inc
+13 -13
View File
@@ -5,7 +5,7 @@
mov r5, r8
push {r5, r6, r7}
adds r6, r0, #0
ldr r0, _08056570 @ =gUnk_02024030
ldr r0, _08056570 @ =gMessageChoices
movs r7, #3
ldrsb r7, [r0, r7]
ldr r0, _08056574 @ =gInput
@@ -18,7 +18,7 @@
beq _08056582
b _080565EA
.align 2, 0
_08056570: .4byte gUnk_02024030
_08056570: .4byte gMessageChoices
_08056574: .4byte gInput
_08056578:
cmp r0, #0x10
@@ -27,7 +27,7 @@ _08056578:
beq _080565E4
b _080565EA
_08056582:
ldr r0, _08056598EU @ =gUnk_02024030
ldr r0, _08056598EU @ =gMessageChoices
lsls r1, r7, #1
adds r0, #0x10
adds r1, r1, r0
@@ -39,7 +39,7 @@ _08056582:
adds r0, #0x20
b _080565B0EU
.align 2, 0
_08056598EU: .4byte gUnk_02024030
_08056598EU: .4byte gMessageChoices
_0805659CEU: .4byte gUnk_08107C14
_080565A0EU:
strh r1, [r6, #8]
@@ -52,7 +52,7 @@ _080565A0EU:
_080565B0EU:
bl sub_0805EF40
ldr r2, _080565DC @ =gUnk_02000040
ldr r0, _080565E0 @ =gUnk_02024030
ldr r0, _080565E0 @ =gMessageChoices
ldrb r1, [r0, #3]
strb r1, [r2, #1]
movs r1, #3
@@ -69,14 +69,14 @@ _080565B0EU:
.align 2, 0
_080565D8: .4byte gUnk_08107C0F
_080565DC: .4byte gUnk_02000040
_080565E0: .4byte gUnk_02024030
_080565E0: .4byte gMessageChoices
_080565E4:
subs r7, #1
b _080565EA
_080565E8:
adds r7, #1
_080565EA:
ldr r4, _0805660C @ =gUnk_02024030
ldr r4, _0805660C @ =gMessageChoices
movs r1, #2
ldrsb r1, [r4, r1]
adds r0, r7, r1
@@ -92,7 +92,7 @@ _080565EA:
movs r1, #1
b _08056612
.align 2, 0
_0805660C: .4byte gUnk_02024030
_0805660C: .4byte gMessageChoices
_08056610:
movs r1, #0
_08056612:
@@ -100,7 +100,7 @@ _08056612:
ldrb r0, [r2]
cmp r0, #1
bne _08056624
ldr r1, _08056678 @ =gUnk_02024030
ldr r1, _08056678 @ =gMessageChoices
movs r0, #2
strb r0, [r2]
strb r0, [r1]
@@ -108,14 +108,14 @@ _08056612:
_08056624:
cmp r1, #0
beq _0805666A
ldr r0, _0805667C @ =gCurrentTextBox
ldr r0, _0805667C @ =gTextRender
mov sl, r0
movs r1, #0x56
add r1, sl
mov sb, r1
ldrh r0, [r1]
mov r8, r0
ldr r4, _08056678 @ =gUnk_02024030
ldr r4, _08056678 @ =gMessageChoices
lsls r0, r5, #1
adds r4, #8
adds r0, r0, r4
@@ -147,7 +147,7 @@ _0805666A:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08056674: .4byte gUnk_02000040
_08056678: .4byte gUnk_02024030
_0805667C: .4byte gCurrentTextBox
_08056678: .4byte gMessageChoices
_0805667C: .4byte gTextRender
_08056680: .4byte 0x0202281D
.syntax divided
asm/non_matching/ghostBrothers/sub_08065D74.inc
+1 -1
View File
@@ -28,7 +28,7 @@ _08065DA8:
adds r0, #1
strb r0, [r1, #0xc]
movs r0, #0
bl TextboxNoOverlapFollow
bl MessageFromTarget
_08065DB4:
pop {pc}
.align 2, 0
asm/non_matching/ghostBrothers/sub_08065DB8.inc
+5 -5
View File
@@ -18,7 +18,7 @@ _08065DD0: @ jump table
.4byte _08065E34 @ case 3
.4byte _08065E4E @ case 4
_08065DE4:
ldr r0, _08065E04 @ =gTextBox
ldr r0, _08065E04 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -34,7 +34,7 @@ _08065DE4:
bl InitAnimationForceUpdate
b _08065EB0
.align 2, 0
_08065E04: .4byte gTextBox
_08065E04: .4byte gMessage
_08065E08:
ldrb r0, [r4, #0xe]
subs r0, #1
@@ -65,13 +65,13 @@ _08065E34:
cmp r0, #0
bne _08065EB0
movs r0, #0
bl TextboxNoOverlapFollow
bl MessageFromTarget
ldrb r0, [r4, #0xd]
adds r0, #1
strb r0, [r4, #0xd]
b _08065EB0
_08065E4E:
ldr r0, _08065E6C @ =gTextBox
ldr r0, _08065E6C @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -86,7 +86,7 @@ _08065E4E:
str r0, [r4, #0x6c]
b _08065EB0
.align 2, 0
_08065E6C: .4byte gTextBox
_08065E6C: .4byte gMessage
_08065E70: .4byte gUnk_0811022E
_08065E74:
ldrb r0, [r4, #0xe]
asm/non_matching/guardWithSpear/sub_080643D8.inc
+1 -1
View File
@@ -33,7 +33,7 @@ _08064406:
adds r1, r1, r2
ldrh r0, [r1]
adds r1, r4, #0
bl TextboxNoOverlap
bl MessageNoOverlap
pop {r4, pc}
.align 2, 0
_08064424: .4byte gUnk_0810F6D4
asm/non_matching/itemPegasusBoots/sub_08076964.inc
+1 -1
View File
@@ -92,7 +92,7 @@ _080769CC:
adds r4, r6, #0
adds r4, #0xb4
ldrb r0, [r4]
bl sub_0805449C
bl ItemIsSword
cmp r0, #0
beq _08076A38
ldrb r1, [r4]
asm/non_matching/kid/sub_080621AC.inc
+2 -2
View File
@@ -150,7 +150,7 @@ _080622C8: .4byte gPlayerEntity
_080622CC:
adds r0, r4, #0
bl GetNextFrame
ldr r0, _080622E0 @ =gTextBox
ldr r0, _080622E0 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -158,7 +158,7 @@ _080622CC:
bne _080622F2
b _080622EE
.align 2, 0
_080622E0: .4byte gTextBox
_080622E0: .4byte gMessage
_080622E4:
adds r0, r4, #0
bl UpdateFuseInteraction
asm/non_matching/kid/sub_08062634.inc
+1 -1
View File
@@ -14,7 +14,7 @@
adds r1, r1, r0
ldrh r0, [r1]
adds r1, r5, #0
bl TextboxNoOverlap
bl MessageNoOverlap
pop {r4, r5, pc}
.align 2, 0
_08062658: .4byte gUnk_0810BDE8
asm/non_matching/kid/sub_0806265C.inc
+1 -1
View File
@@ -9,7 +9,7 @@
bne _08062678
movs r0, #0
adds r1, r2, #0
bl TextboxNoOverlap
bl MessageNoOverlap
b _08062690
.align 2, 0
_08062674: .4byte gSave
asm/non_matching/librarians/sub_0806BA34.inc
+1 -1
View File
@@ -104,7 +104,7 @@ _0806BAF8:
_0806BB06:
mov r0, r8
mov r1, sb
bl TextboxNoOverlap
bl MessageNoOverlap
pop {r3, r4}
mov r8, r3
mov sb, r4
asm/non_matching/mountainMinish/sub_08067EF0.inc
+2 -2
View File
@@ -110,7 +110,7 @@ _08067F98:
.align 2, 0
_08067FD8: .4byte gPlayerEntity
_08067FDC:
ldr r0, _08067FFC @ =gTextBox
ldr r0, _08067FFC @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -126,7 +126,7 @@ _08067FF2:
bl InitializeAnimation
b _0806801A
.align 2, 0
_08067FFC: .4byte gTextBox
_08067FFC: .4byte gMessage
_08068000:
adds r0, r5, #0
bl UpdateFuseInteraction
asm/non_matching/mountainMinish/sub_08068190.inc
+1 -1
View File
@@ -30,7 +30,7 @@ _080681C0:
adds r0, r0, r2
ldrh r0, [r0]
adds r1, r6, #0
bl TextboxNoOverlap
bl MessageNoOverlap
pop {r4, r5, r6, pc}
.align 2, 0
_080681D4: .4byte gUnk_0811130E
asm/non_matching/npc5/sub_08061B18.inc
+1 -1
View File
@@ -29,7 +29,7 @@
_08061B4C:
ldrh r0, [r2]
adds r1, r4, #0
bl TextboxNoOverlap
bl MessageNoOverlap
_08061B54:
pop {r4, pc}
.align 2, 0
asm/non_matching/picolyteBottles/sub_0806E140.inc
+5 -5
View File
@@ -36,21 +36,21 @@ _0806E172:
movs r0, #0
str r0, [r5, #0x14]
ldr r0, _0806E190 @ =0x0000421B
bl TextboxNoOverlapFollow
bl MessageFromTarget
b _0806E1C0
.align 2, 0
_0806E18C: .4byte 0x000003E7
_0806E190: .4byte 0x0000421B
_0806E194:
ldr r0, _0806E1A4 @ =0x00004218
bl TextboxNoOverlapFollow
ldr r1, _0806E1A8 @ =gTextBox
bl MessageFromTarget
ldr r1, _0806E1A8 @ =gMessage
ldrh r0, [r4]
str r0, [r1, #0x10]
b _0806E1C0
.align 2, 0
_0806E1A4: .4byte 0x00004218
_0806E1A8: .4byte gTextBox
_0806E1A8: .4byte gMessage
_0806E1AC:
str r1, [r5, #0x14]
adds r0, r3, #0
@@ -60,7 +60,7 @@ _0806E1AC:
adds r4, #0x76
strh r1, [r4]
ldr r0, _0806E1D4 @ =0x0000421C
bl TextboxNoOverlapFollow
bl MessageFromTarget
_0806E1C0:
ldr r1, _0806E1D8 @ =gScreenTransition
ldrh r0, [r4]
asm/non_matching/pina/sub_08063AC0.inc
+1 -1
View File
@@ -54,7 +54,7 @@ _08063B0C:
ldrb r0, [r4, #0xe]
ldr r1, _08063B40 @ =0x00000A01
adds r0, r0, r1
bl TextboxNoOverlapFollow
bl MessageFromTarget
_08063B38:
adds r0, r4, #0
bl sub_0806ED78
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/rem/sub_0806AA50.inc
+1 -1
View File
@@ -55,7 +55,7 @@ _0806AA9A:
_0806AAB6:
adds r0, r7, #0
adds r1, r6, #0
bl TextboxNoOverlap
bl MessageNoOverlap
ldr r0, [r5, #4]
cmp r0, #1
beq _0806AAEE
asm/non_matching/sittingPerson/sub_0806387C.inc
+1 -1
View File
@@ -103,7 +103,7 @@ _080638E2:
adds r0, r0, r2
ldrh r0, [r0]
adds r1, r6, #0
bl TextboxNoOverlap
bl MessageNoOverlap
pop {r4, r5, r6, pc}
.align 2, 0
_080638F8: .4byte gUnk_02002B0E
asm/non_matching/sittingPerson/sub_0806390C.inc
+1 -1
View File
@@ -44,7 +44,7 @@ _0806392E:
adds r1, r1, r0
ldrh r0, [r1]
adds r1, r4, #0
bl TextboxNoOverlap
bl MessageNoOverlap
pop {r4, r5, pc}
.align 2, 0
_08063940: .4byte gUnk_0810CC04
asm/non_matching/stockwell/sub_080650CC.inc
+3 -3
View File
@@ -70,8 +70,8 @@ _0806513C:
_0806515E:
adds r0, r7, #0
adds r1, r5, #0
bl TextboxNoOverlap
ldr r1, _08065178 @ =gTextBox
bl MessageNoOverlap
ldr r1, _08065178 @ =gMessage
mov r2, r8
lsls r0, r2, #0x10
lsrs r0, r0, #0x10
@@ -79,7 +79,7 @@ _0806515E:
b _080651A6
.align 2, 0
_08065174: .4byte script_08014384
_08065178: .4byte gTextBox
_08065178: .4byte gMessage
_0806517C:
ldrb r1, [r2]
movs r0, #0x40
asm/non_matching/stockwell/sub_08065370.inc
+4 -4
View File
@@ -97,7 +97,7 @@ _08064E94:
bls _08064EAA
ldr r0, _08064F0C @ =0x00002C0E
adds r1, r4, #0
bl TextboxNoOverlap
bl MessageNoOverlap
movs r6, #0
_08064EAA:
cmp r6, #0
@@ -167,7 +167,7 @@ _08064F30:
ldr r0, _08064F48 @ =0x00002C0D
_08064F32:
adds r1, r4, #0
bl TextboxNoOverlap
bl MessageNoOverlap
_08064F38:
movs r0, #0
mov r1, r8
@@ -282,7 +282,7 @@ _08065426:
bls _0806543C
ldr r0, _0806549C @ =0x00002C0E
adds r1, r4, #0
bl TextboxNoOverlap
bl MessageNoOverlap
movs r6, #0
_0806543C:
cmp r6, #0
@@ -352,7 +352,7 @@ _080654C0:
ldr r0, _080654D8 @ =0x00002C0D
_080654C2:
adds r1, r4, #0
bl TextboxNoOverlap
bl MessageNoOverlap
_080654C8:
movs r0, #0
mov r1, r8
asm/non_matching/textbox/TextBoxFunction1.inc
+11 -11
View File
@@ -3,14 +3,14 @@
ldr r0, _08056598 @ =gNewWindow
movs r1, #8
bl MemClear
ldr r0, _0805659C @ =gUnk_02024030
ldr r0, _0805659C @ =gMessageChoices
movs r1, #0x18
bl MemClear
ldr r4, _080565A0 @ =gCurrentTextBox
ldr r4, _080565A0 @ =gTextRender
adds r0, r4, #0
movs r1, #0xa8
bl MemClear
ldr r0, _080565A4 @ =gTextBox
ldr r0, _080565A4 @ =gMessage
adds r1, r4, #0
movs r2, #0x20
bl MemCopy
@@ -61,12 +61,12 @@ _08056560:
strb r0, [r3, #1]
movs r0, #0
strb r0, [r3, #2]
ldr r4, _080565A0 @ =gCurrentTextBox
ldr r4, _080565A0 @ =gTextRender
adds r0, r4, #0
bl sub_08056FBC
ldr r0, _080565AC @ =gUnk_08107BE0
str r0, [r4, #0x2c]
ldr r0, _080565B0 @ =gUnk_02000D00
ldr r0, _080565B0 @ =gTextGfxBuffer
str r0, [r4, #0x58]
adds r4, #0x54
movs r0, #0xd0
@@ -74,17 +74,17 @@ _08056560:
movs r0, #2
bl SetDoTextBox
movs r0, #0
bl sub_08056BDC
bl MsgChangeLine
movs r0, #2
bl sub_080564C8
bl StatusUpdate
movs r0, #1
pop {r4, pc}
.align 2, 0
_08056598: .4byte gNewWindow
_0805659C: .4byte gUnk_02024030
_080565A0: .4byte gCurrentTextBox
_080565A4: .4byte gTextBox
_0805659C: .4byte gMessageChoices
_080565A0: .4byte gTextRender
_080565A4: .4byte gMessage
_080565A8: .4byte gSave
_080565AC: .4byte gUnk_08107BE0
_080565B0: .4byte gUnk_02000D00
_080565B0: .4byte gTextGfxBuffer
.syntax divided
asm/non_matching/textbox/sub_08056750.inc
+21 -21
View File
@@ -13,7 +13,7 @@ _0805675C:
adds r4, r5, #0
adds r4, #0x20
adds r0, r4, #0
bl sub_0805EFE8
bl GetCharacter
adds r7, r0, #0
cmp r7, #0xe
bls _0805676E
@@ -54,7 +54,7 @@ _080567B8:
.ifndef EU
movs r0, #0
movs r1, #0
bl sub_08056ABC
bl SwitchChoice
.endif
b _08056942
.align 2, 0
@@ -74,7 +74,7 @@ _080567DE:
cmp r0, #0
bne _080567F8
movs r0, #1
bl sub_08056BDC
bl MsgChangeLine
b _08056942
_080567F8:
adds r1, r5, #0
@@ -84,16 +84,16 @@ _080567F8:
b _08056942
_08056802:
movs r0, #3
bl sub_080564C8
bl StatusUpdate
b _08056942
_0805680A:
movs r0, #4
bl sub_080564C8
bl StatusUpdate
b _08056942
_08056812:
adds r0, r4, #0
movs r1, #0
bl sub_GetFontStrWidth
bl GetFontStrWith
adds r3, r0, #0
adds r4, r5, #0
adds r4, #0x56
@@ -110,12 +110,12 @@ _08056812:
strh r2, [r4]
b _08056942
_08056838:
ldr r1, _08056840 @ =gTextBox
ldr r1, _08056840 @ =gMessage
ldrh r0, [r5, #0x22]
strb r0, [r1, #1]
b _08056942
.align 2, 0
_08056840: .4byte gTextBox
_08056840: .4byte gMessage
_08056844:
ldr r0, _08056854 @ =gUnk_0200005C
ldrh r1, [r5, #0x22]
@@ -152,14 +152,14 @@ _0805687A:
strb r0, [r1]
adds r0, r5, #0
adds r1, r3, #0
bl sub_080569C4
bl PaletteChange
b _08056942
_0805688C:
ldrh r0, [r5, #0x22]
bl SoundReq
b _08056942
_08056894:
ldr r1, _080568A8 @ =gCurrentTextBox
ldr r1, _080568A8 @ =gTextRender
ldrh r0, [r5, #0x22]
strb r0, [r1, #3]
ldrh r0, [r5, #0x22]
@@ -169,7 +169,7 @@ _08056894:
bl sub_08056F88
b _08056942
.align 2, 0
_080568A8: .4byte gCurrentTextBox
_080568A8: .4byte gTextRender
_080568AC:
ldrh r0, [r5, #0x22]
strb r0, [r5, #7]
@@ -182,7 +182,7 @@ _080568B2:
adds r0, r6, #0
movs r1, #4
bl MemClear
ldr r4, _08056910 @ =gUnk_02024030
ldr r4, _08056910 @ =gMessageChoices
adds r0, r4, #0
movs r1, #0x18
bl MemClear
@@ -190,7 +190,7 @@ _080568B2:
strb r0, [r4]
strb r0, [r6]
_080568D2:
ldr r2, _08056910 @ =gUnk_02024030
ldr r2, _08056910 @ =gMessageChoices
movs r0, #2
ldrsb r0, [r2, r0]
cmp r0, #3
@@ -220,7 +220,7 @@ _080568D2:
b _08056942
.align 2, 0
_0805690C: .4byte gUnk_02000040
_08056910: .4byte gUnk_02024030
_08056910: .4byte gMessageChoices
_08056914:
ldrh r3, [r5, #0x22]
cmp r3, #0xfe
@@ -256,19 +256,19 @@ _08056942:
movs r0, #0
b _080569C2
_0805694C:
ldr r0, _08056960 @ =gCurrentTextBox
ldr r0, _08056960 @ =gTextRender
adds r0, #0x99
ldrb r0, [r0]
cmp r0, #2
beq _08056964
movs r0, #3
bl sub_080564C8
bl StatusUpdate
movs r0, #0
b _080569C2
.align 2, 0
_08056960: .4byte gCurrentTextBox
_08056960: .4byte gTextRender
_08056964:
ldr r1, _08056994 @ =gTextBox
ldr r1, _08056994 @ =gMessage
ldrb r0, [r1, #1]
cmp r0, #0
bne _08056970
@@ -290,10 +290,10 @@ _08056970:
strb r1, [r2]
adds r0, r5, #0
movs r1, #0
bl sub_080569C4
bl PaletteChange
b _080569B4
.align 2, 0
_08056994: .4byte gTextBox
_08056994: .4byte gMessage
_08056998:
adds r2, r5, #0
adds r2, #0x90
@@ -307,7 +307,7 @@ _08056998:
strb r0, [r2]
adds r0, r5, #0
adds r1, r3, #0
bl sub_080569C4
bl PaletteChange
_080569B4:
adds r1, r5, #0
adds r1, #0x50
asm/non_matching/tingleSiblings/sub_08064F28.inc
+3 -3
View File
@@ -93,10 +93,10 @@ _08064FD2:
adds r0, r0, r2
ldrh r0, [r0]
adds r1, r6, #0
bl TextboxNoOverlap
bl MessageNoOverlap
cmp r4, #0
ble _08064FF4
ldr r1, _0806500C @ =gTextBox
ldr r1, _0806500C @ =gMessage
lsls r0, r4, #0x10
lsrs r0, r0, #0x10
str r0, [r1, #0x10]
@@ -110,7 +110,7 @@ _08064FF4:
b _08065016
.align 2, 0
_08065008: .4byte gUnk_0810FC08
_0806500C: .4byte gTextBox
_0806500C: .4byte gMessage
_08065010:
adds r0, r7, #0
bl ClearRoomFlag
asm/object6.s
+2 -2
View File
@@ -156,7 +156,7 @@ sub_080829E4: @ 0x080829E4
ands r0, r2
orrs r0, r1
strb r0, [r5, #0x1a]
ldr r3, _08082A14 @ =gTextBox
ldr r3, _08082A14 @ =gMessage
ldrb r0, [r3]
movs r1, #0x7f
ands r1, r0
@@ -167,7 +167,7 @@ sub_080829E4: @ 0x080829E4
b _08082AB4
.align 2, 0
_08082A10: .4byte gPlayerEntity
_08082A14: .4byte gTextBox
_08082A14: .4byte gMessage
_08082A18:
cmp r1, #5
beq _08082A9C
asm/object6A.s
+2 -2
View File
@@ -972,7 +972,7 @@ _080950C8:
.align 2, 0
_080950EC: .4byte 0x00001F1F
_080950F0:
ldr r0, _0809511C @ =gTextBox
ldr r0, _0809511C @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -992,7 +992,7 @@ _0809510A:
strb r4, [r5, #0xa]
pop {r4, r5, pc}
.align 2, 0
_0809511C: .4byte gTextBox
_0809511C: .4byte gMessage
thumb_func_start sub_08095120
sub_08095120: @ 0x08095120
asm/object74.s
+1 -1
View File
@@ -118,7 +118,7 @@ sub_08097C20: @ 0x08097C20
adds r2, r4, #0
adds r2, #0x38
ldrb r2, [r2]
bl sub_080577AC
bl CreateMagicSparkles
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
asm/object9.s
+2 -2
View File
@@ -23,7 +23,7 @@ Object9: @ 0x0808386C
bgt _08083894
cmp r0, #0
blt _08083894
ldr r0, _080838D0 @ =gTextBox
ldr r0, _080838D0 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -59,7 +59,7 @@ _080838B6:
.align 2, 0
_080838C8: .4byte gPlayerState
_080838CC: .4byte gUnk_02022740
_080838D0: .4byte gTextBox
_080838D0: .4byte gMessage
_080838D4: .4byte gUnk_03003DF0
_080838D8: .4byte gUnk_0811F754
asm/object91.s
+3 -3
View File
@@ -580,7 +580,7 @@ _0809C82A:
cmp r0, #0xff
bne _0809C84A
ldr r0, _0809C850 @ =0x00000B43
bl TextboxNoOverlapFollow
bl MessageFromTarget
movs r0, #1
strb r0, [r5, #0xd]
movs r0, #8
@@ -595,7 +595,7 @@ _0809C850: .4byte 0x00000B43
sub_0809C854: @ 0x0809C854
push {r4, r5, lr}
adds r4, r0, #0
ldr r0, _0809C8A8 @ =gTextBox
ldr r0, _0809C8A8 @ =gMessage
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -635,7 +635,7 @@ _0809C892:
bl SoundReq
b _0809C8B8
.align 2, 0
_0809C8A8: .4byte gTextBox
_0809C8A8: .4byte gMessage
_0809C8AC: .4byte gRoomControls
_0809C8B0:
movs r0, #3
asm/objectB.s
+3 -3
View File
@@ -206,14 +206,14 @@ _08083D14:
adds r1, #1
_08083D16:
adds r0, r1, #0
bl TextboxNoOverlapFollow
ldr r1, _08083D24 @ =gTextBox
bl MessageFromTarget
ldr r1, _08083D24 @ =gMessage
ldrb r0, [r4, #0xb]
str r0, [r1, #0x10]
_08083D22:
pop {r4, pc}
.align 2, 0
_08083D24: .4byte gTextBox
_08083D24: .4byte gMessage
thumb_func_start sub_08083D28
sub_08083D28: @ 0x08083D28
asm/objectB9.s
+8 -8
View File
@@ -246,14 +246,14 @@ sub_080A13B4: @ 0x080A13B4
cmp r1, r0
blt _080A13D8
ldr r0, _080A13D4 @ =0x0000300C
bl TextboxNoOverlapFollow
bl MessageFromTarget
movs r0, #1
b _080A13E0
.align 2, 0
_080A13D4: .4byte 0x0000300C
_080A13D8:
ldr r0, _080A13E4 @ =0x00003005
bl TextboxNoOverlapFollow
bl MessageFromTarget
movs r0, #0
_080A13E0:
str r0, [r4, #0x14]
@@ -353,8 +353,8 @@ _080A1472:
bl ModRupees
ldr r0, _080A14A0 @ =0x00003007
adds r1, r5, #0
bl TextboxNoOverlap
ldr r1, _080A14A4 @ =gTextBox
bl MessageNoOverlap
ldr r1, _080A14A4 @ =gMessage
lsls r0, r4, #0x10
lsrs r0, r0, #0x10
str r0, [r1, #0x10]
@@ -362,7 +362,7 @@ _080A1472:
.align 2, 0
_080A149C: .4byte gUnk_08124ECC
_080A14A0: .4byte 0x00003007
_080A14A4: .4byte gTextBox
_080A14A4: .4byte gMessage
thumb_func_start sub_080A14A8
sub_080A14A8: @ 0x080A14A8
@@ -557,8 +557,8 @@ sub_080A1608: @ 0x080A1608
adds r4, #4
_080A1618:
adds r0, r4, #0
bl TextboxNoOverlapFollow
ldr r4, _080A1640 @ =gTextBox
bl MessageFromTarget
ldr r4, _080A1640 @ =gMessage
movs r1, #0
movs r0, #1
strb r0, [r4, #6]
@@ -574,7 +574,7 @@ _080A1618:
pop {r4, pc}
.align 2, 0
_080A163C: .4byte 0x00003002
_080A1640: .4byte gTextBox
_080A1640: .4byte gMessage
_080A1644: .4byte gUnk_08124C20
thumb_func_start sub_080A1648
asm/objectC1.s
+2 -2
View File
@@ -182,7 +182,7 @@ _080A269C:
_080A26B4:
adds r0, r4, #0
bl UpdateAnimationSingleFrame
ldr r0, _080A2764 @ =gTextBox
ldr r0, _080A2764 @ =gMessage
ldrb r1, [r0]
adds r0, r7, #0
ands r0, r1
@@ -268,5 +268,5 @@ _080A273C:
_080A2762:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A2764: .4byte gTextBox
_080A2764: .4byte gMessage
_080A2768: .4byte gPlayerState
asm/sub_0807CA18.s
-174
View File
@@ -1,174 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
.ifdef DEMO_USA
thumb_func_start sub_0807CA18
sub_0807CA18:
push {r4, r5, r6, lr}
ldr r4, _0807CA38 @ =0x02002A40
ldrh r1, [r4, #0x00]
movs r0, #0x80
lsls r0, r0, #0x01
cmp r1, r0
beq _0807C9BA
movs r2, #0x00
strb r2, [r4, #0x00]
movs r3, #0x01
strb r3, [r4, #0x01]
strb r3, [r4, #0x08]
adds r1, r4, #0x0
adds r1, #0xAA
movs r0, #0x18
strb r0, [r1, #0x00]
adds r1, #0x01
strb r0, [r1, #0x00]
subs r1, #0x23
movs r0, #0x22
strb r0, [r1, #0x00]
adds r1, #0x01
movs r0, #0x15
strb r0, [r1, #0x00]
adds r0, r4, #0x0
adds r0, #0x8A
strb r2, [r0, #0x00]
adds r0, #0x01
strb r2, [r0, #0x00]
adds r0, #0x05
strb r3, [r0, #0x00]
adds r1, #0x03
movs r0, #0x90
strh r0, [r1, #0x00]
adds r1, #0x02
movs r0, #0x38
strh r0, [r1, #0x00]
_0807C9BA:
adds r5, r4, #0x0
adds r5, #0x80
ldrb r0, [r5, #0x00]
cmp r0, #0x00
bne _0807C9CE
ldr r0, _0807CA3C @ =0x0811DFF4
adds r1, r5, #0x0
movs r2, #0x05
bl MemCopy
_0807C9CE:
ldr r1, _0807CA40 @ =0x0811EF10
movs r6, #0x80
lsls r6, r6, #0x12
ldrb r0, [r6, #0x04]
lsls r0, r0, #0x02
adds r0, r0, r1
ldr r0, [r0, #0x00]
ldr r2, _0807CA44 @ =0x000004B4
adds r1, r4, #0x0
bl MemCopy
ldrb r0, [r6, #0x07]
adds r2, r0, #0x0
cmp r2, #0x00
bne _0807CA04
movs r0, #0x97
strb r0, [r5, #0x00]
adds r1, r4, #0x0
adds r1, #0x81
movs r0, #0x7F
strb r0, [r1, #0x00]
adds r1, #0x01
movs r0, #0xDD
strb r0, [r1, #0x00]
adds r0, r4, #0x0
adds r0, #0x83
strb r2, [r0, #0x00]
_0807CA04:
movs r0, #0xA0
bl ModHealth
ldr r0, _0807CA48 @ =0xFFFFD8F1
bl ModRupees
ldr r0, _0807CA4C @ =0x02000010
ldrb r1, [r0, #0x07]
lsls r0, r1, #0x01
adds r0, r0, r1
ldr r1, _0807CA50 @ =0x0811DFF9
adds r0, r0, r1
movs r1, #0x95
lsls r1, r1, #0x03
adds r2, r4, r1
ldrb r1, [r6, #0x04]
adds r0, r0, r1
ldrb r1, [r0, #0x00]
lsls r0, r1, #0x03
subs r0, r0, r1
lsls r0, r0, #0x05
adds r0, r0, r1
lsls r0, r0, #0x04
str r0, [r2, #0x00]
movs r0, #0x01
pop {r4, r5, r6, pc}
_0807CA38: .4byte gSave
_0807CA3C: .4byte gUnk_0811E470
_0807CA40: .4byte demoPointers
_0807CA44: .4byte 0x000004B4
_0807CA48: .4byte 0xFFFFD8F1
_0807CA4C: .4byte gUnk_02000010
_0807CA50: .4byte demoUnknown1
.else
thumb_func_start sub_0807CA18
sub_0807CA18: @ 0x0807CA18
push {lr}
ldr r0, _0807CA7C @ =gSave
mov ip, r0
ldrh r1, [r0]
movs r0, #0x80
lsls r0, r0, #1
cmp r1, r0
beq _0807CA66
movs r2, #0
mov r0, ip
strb r2, [r0]
movs r3, #1
strb r3, [r0, #1]
strb r3, [r0, #8]
mov r1, ip
adds r1, #0xaa
movs r0, #0x18
strb r0, [r1]
adds r1, #1
strb r0, [r1]
subs r1, #0x23
movs r0, #0x22
strb r0, [r1]
adds r1, #1
movs r0, #0x15
strb r0, [r1]
mov r0, ip
adds r0, #0x8a
strb r2, [r0]
adds r0, #1
strb r2, [r0]
adds r0, #5
strb r3, [r0]
adds r1, #3
movs r0, #0x90
strh r0, [r1]
adds r1, #2
movs r0, #0x38
strh r0, [r1]
_0807CA66:
mov r1, ip
adds r1, #0x80
ldrb r0, [r1]
cmp r0, #0
bne _0807CA78
ldr r0, _0807CA80 @ =gUnk_0811E470
movs r2, #5
bl MemCopy
_0807CA78:
movs r0, #1
pop {pc}
.align 2, 0
_0807CA7C: .4byte gSave
_0807CA80: .4byte gUnk_0811E470
.endif
asm/windTribeTeleporter.s
+2 -2
View File
@@ -316,12 +316,12 @@ _080A0E50:
lsls r0, r1, #2
adds r0, r0, r1
lsls r0, r0, #2
ldr r1, _080A0E70 @ =0x0813AA18
ldr r1, _080A0E70 @ =gUnk_0813ADEC
adds r0, r0, r1
bl DoExitTransition
b _080A0E8C
.align 2, 0
_080A0E70: .4byte 0x0813AA18
_080A0E70: .4byte gUnk_0813ADEC
_080A0E74:
ldr r0, _080A0E90 @ =0x030010A0
ldr r0, [r0]
asmdiff.sh
+2 -2
View File
@@ -1,7 +1,7 @@
#!/bin/bash
buildname=tmc_eu
baserom=baserom_eu
buildname=$3
baserom=$4
OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb"
OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"
assets/assets.json
+22 -22
View File
@@ -40392,121 +40392,121 @@
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Vaati_0.bin",
"path": "animations/gSpriteAnimations_Vaati_2_0.bin",
"start": 1116224,
"size": 25,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Vaati_1.bin",
"path": "animations/gSpriteAnimations_Vaati_2_1.bin",
"start": 1116249,
"size": 5,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Vaati_2.bin",
"path": "animations/gSpriteAnimations_Vaati_2_2.bin",
"start": 1116254,
"size": 25,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Vaati_3.bin",
"path": "animations/gSpriteAnimations_Vaati_2_3.bin",
"start": 1116279,
"size": 5,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Vaati_4.bin",
"path": "animations/gSpriteAnimations_Vaati_2_4.bin",
"start": 1116284,
"size": 30,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Vaati_6.bin",
"path": "animations/gSpriteAnimations_Vaati_2_6.bin",
"start": 1116314,
"size": 25,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Vaati_16.bin",
"path": "animations/gSpriteAnimations_Vaati_2_16.bin",
"start": 1116339,
"size": 25,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Vaati_18.bin",
"path": "animations/gSpriteAnimations_Vaati_2_18.bin",
"start": 1116364,
"size": 25,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Vaati_24.bin",
"path": "animations/gSpriteAnimations_Vaati_2_24.bin",
"start": 1116389,
"size": 13,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Vaati_26.bin",
"path": "animations/gSpriteAnimations_Vaati_2_26.bin",
"start": 1116402,
"size": 13,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Vaati_40.bin",
"path": "animations/gSpriteAnimations_Vaati_2_40.bin",
"start": 1116415,
"size": 25,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Vaati_28.bin",
"path": "animations/gSpriteAnimations_Vaati_2_28.bin",
"start": 1116440,
"size": 5,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Vaati_30.bin",
"path": "animations/gSpriteAnimations_Vaati_2_30.bin",
"start": 1116445,
"size": 5,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Vaati_31.bin",
"path": "animations/gSpriteAnimations_Vaati_2_31.bin",
"start": 1116450,
"size": 5,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Vaati_29.bin",
"path": "animations/gSpriteAnimations_Vaati_2_29.bin",
"start": 1116455,
"size": 5,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Vaati_44.bin",
"path": "animations/gSpriteAnimations_Vaati_2_44.bin",
"start": 1116460,
"size": 5,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Vaati_32.bin",
"path": "animations/gSpriteAnimations_Vaati_2_32.bin",
"start": 1116465,
"size": 193,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Vaati_36.bin",
"path": "animations/gSpriteAnimations_Vaati_2_36.bin",
"start": 1116658,
"size": 229,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Vaati_48.bin",
"path": "animations/gSpriteAnimations_Vaati_2_48.bin",
"start": 1116887,
"size": 21,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Vaati_50.bin",
"path": "animations/gSpriteAnimations_Vaati_2_50.bin",
"start": 1116908,
"size": 24,
"type": "animation"
@@ -47969,13 +47969,13 @@
"size": 12
},
{
"path": "animations/gSpriteAnimations_Object6A_9_0.bin",
"path": "animations/gSpriteAnimations_Object6A_10_0.bin",
"start": 1190732,
"size": 9,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6A_9_1.bin",
"path": "animations/gSpriteAnimations_Object6A_10_1.bin",
"start": 1190741,
"size": 15,
"type": "animation"
assets/sounds.json
+1 -1
View File
@@ -2978,7 +2978,7 @@
}
},
{
"path": "sounds/sfx152.s",
"path": "sounds/sfxNearPortal.s",
"start": 14563276,
"type": "midi",
"options": {
constants/audio_constants.inc
+1 -1
View File
@@ -336,7 +336,7 @@
.equiv SFX_14F, 0x14f
.equiv SFX_150, 0x150
.equiv SFX_151, 0x151
.equiv SFX_152, 0x152
.equiv SFX_NEAR_PORTAL, 0x152
.equiv SFX_153, 0x153
.equiv SFX_154, 0x154
.equiv SFX_155, 0x155
data/animations/npc/vaati.s
+92 -92
View File
@@ -74,117 +74,117 @@ gSpriteAnimations_Vaati_1:: @ 081107CC
.4byte gSpriteAnimations_Vaati_1_24
.4byte 00000000
gSpriteAnimations_Vaati_0:: @ 08110840
.include "animations/gSpriteAnimations_Vaati_0.s"
gSpriteAnimations_Vaati_2_0:: @ 08110840
.include "animations/gSpriteAnimations_Vaati_2_0.s"
gSpriteAnimations_Vaati_1:: @ 08110859
.include "animations/gSpriteAnimations_Vaati_1.s"
gSpriteAnimations_Vaati_2_1:: @ 08110859
.include "animations/gSpriteAnimations_Vaati_2_1.s"
gSpriteAnimations_Vaati_2:: @ 0811085E
.include "animations/gSpriteAnimations_Vaati_2.s"
gSpriteAnimations_Vaati_2_2:: @ 0811085E
.include "animations/gSpriteAnimations_Vaati_2_2.s"
gSpriteAnimations_Vaati_3:: @ 08110877
.include "animations/gSpriteAnimations_Vaati_3.s"
gSpriteAnimations_Vaati_2_3:: @ 08110877
.include "animations/gSpriteAnimations_Vaati_2_3.s"
gSpriteAnimations_Vaati_4:: @ 0811087C
.include "animations/gSpriteAnimations_Vaati_4.s"
gSpriteAnimations_Vaati_2_4:: @ 0811087C
.include "animations/gSpriteAnimations_Vaati_2_4.s"
gSpriteAnimations_Vaati_6:: @ 0811089A
.include "animations/gSpriteAnimations_Vaati_6.s"
gSpriteAnimations_Vaati_2_6:: @ 0811089A
.include "animations/gSpriteAnimations_Vaati_2_6.s"
gSpriteAnimations_Vaati_16:: @ 081108B3
.include "animations/gSpriteAnimations_Vaati_16.s"
gSpriteAnimations_Vaati_2_16:: @ 081108B3
.include "animations/gSpriteAnimations_Vaati_2_16.s"
gSpriteAnimations_Vaati_18:: @ 081108CC
.include "animations/gSpriteAnimations_Vaati_18.s"
gSpriteAnimations_Vaati_2_18:: @ 081108CC
.include "animations/gSpriteAnimations_Vaati_2_18.s"
gSpriteAnimations_Vaati_24:: @ 081108E5
.include "animations/gSpriteAnimations_Vaati_24.s"
gSpriteAnimations_Vaati_2_24:: @ 081108E5
.include "animations/gSpriteAnimations_Vaati_2_24.s"
gSpriteAnimations_Vaati_26:: @ 081108F2
.include "animations/gSpriteAnimations_Vaati_26.s"
gSpriteAnimations_Vaati_2_26:: @ 081108F2
.include "animations/gSpriteAnimations_Vaati_2_26.s"
gSpriteAnimations_Vaati_40:: @ 081108FF
.include "animations/gSpriteAnimations_Vaati_40.s"
gSpriteAnimations_Vaati_2_40:: @ 081108FF
.include "animations/gSpriteAnimations_Vaati_2_40.s"
gSpriteAnimations_Vaati_28:: @ 08110918
.include "animations/gSpriteAnimations_Vaati_28.s"
gSpriteAnimations_Vaati_2_28:: @ 08110918
.include "animations/gSpriteAnimations_Vaati_2_28.s"
gSpriteAnimations_Vaati_30:: @ 0811091D
.include "animations/gSpriteAnimations_Vaati_30.s"
gSpriteAnimations_Vaati_2_30:: @ 0811091D
.include "animations/gSpriteAnimations_Vaati_2_30.s"
gSpriteAnimations_Vaati_31:: @ 08110922
.include "animations/gSpriteAnimations_Vaati_31.s"
gSpriteAnimations_Vaati_2_31:: @ 08110922
.include "animations/gSpriteAnimations_Vaati_2_31.s"
gSpriteAnimations_Vaati_29:: @ 08110927
.include "animations/gSpriteAnimations_Vaati_29.s"
gSpriteAnimations_Vaati_2_29:: @ 08110927
.include "animations/gSpriteAnimations_Vaati_2_29.s"
gSpriteAnimations_Vaati_44:: @ 0811092C
.include "animations/gSpriteAnimations_Vaati_44.s"
gSpriteAnimations_Vaati_2_44:: @ 0811092C
.include "animations/gSpriteAnimations_Vaati_2_44.s"
gSpriteAnimations_Vaati_32:: @ 08110931
.include "animations/gSpriteAnimations_Vaati_32.s"
gSpriteAnimations_Vaati_2_32:: @ 08110931
.include "animations/gSpriteAnimations_Vaati_2_32.s"
gSpriteAnimations_Vaati_36:: @ 081109F2
.include "animations/gSpriteAnimations_Vaati_36.s"
gSpriteAnimations_Vaati_2_36:: @ 081109F2
.include "animations/gSpriteAnimations_Vaati_2_36.s"
gSpriteAnimations_Vaati_48:: @ 08110AD7
.include "animations/gSpriteAnimations_Vaati_48.s"
gSpriteAnimations_Vaati_2_48:: @ 08110AD7
.include "animations/gSpriteAnimations_Vaati_2_48.s"
gSpriteAnimations_Vaati_50:: @ 08110AEC
.include "animations/gSpriteAnimations_Vaati_50.s"
gSpriteAnimations_Vaati_2_50:: @ 08110AEC
.include "animations/gSpriteAnimations_Vaati_2_50.s"
gSpriteAnimations_Vaati:: @ 08110B04
.4byte gSpriteAnimations_Vaati_0
.4byte gSpriteAnimations_Vaati_1
.4byte gSpriteAnimations_Vaati_2
.4byte gSpriteAnimations_Vaati_3
.4byte gSpriteAnimations_Vaati_4
.4byte gSpriteAnimations_Vaati_4
.4byte gSpriteAnimations_Vaati_6
.4byte gSpriteAnimations_Vaati_4
.4byte gSpriteAnimations_Vaati_0
.4byte gSpriteAnimations_Vaati_1
.4byte gSpriteAnimations_Vaati_2
.4byte gSpriteAnimations_Vaati_3
.4byte gSpriteAnimations_Vaati_4
.4byte gSpriteAnimations_Vaati_4
.4byte gSpriteAnimations_Vaati_6
.4byte gSpriteAnimations_Vaati_4
.4byte gSpriteAnimations_Vaati_16
.4byte gSpriteAnimations_Vaati_16
.4byte gSpriteAnimations_Vaati_18
.4byte gSpriteAnimations_Vaati_16
.4byte gSpriteAnimations_Vaati_16
.4byte gSpriteAnimations_Vaati_16
.4byte gSpriteAnimations_Vaati_18
.4byte gSpriteAnimations_Vaati_16
.4byte gSpriteAnimations_Vaati_24
.4byte gSpriteAnimations_Vaati_24
.4byte gSpriteAnimations_Vaati_26
.4byte gSpriteAnimations_Vaati_24
.4byte gSpriteAnimations_Vaati_28
.4byte gSpriteAnimations_Vaati_29
.4byte gSpriteAnimations_Vaati_30
.4byte gSpriteAnimations_Vaati_31
.4byte gSpriteAnimations_Vaati_32
.4byte gSpriteAnimations_Vaati_32
.4byte gSpriteAnimations_Vaati_32
.4byte gSpriteAnimations_Vaati_32
.4byte gSpriteAnimations_Vaati_36
.4byte gSpriteAnimations_Vaati_36
.4byte gSpriteAnimations_Vaati_36
.4byte gSpriteAnimations_Vaati_36
.4byte gSpriteAnimations_Vaati_40
.4byte gSpriteAnimations_Vaati_40
.4byte gSpriteAnimations_Vaati_40
.4byte gSpriteAnimations_Vaati_40
.4byte gSpriteAnimations_Vaati_44
.4byte gSpriteAnimations_Vaati_44
.4byte gSpriteAnimations_Vaati_44
.4byte gSpriteAnimations_Vaati_44
.4byte gSpriteAnimations_Vaati_48
.4byte gSpriteAnimations_Vaati_48
.4byte gSpriteAnimations_Vaati_50
.4byte gSpriteAnimations_Vaati_50
.4byte gSpriteAnimations_Vaati_2_0
.4byte gSpriteAnimations_Vaati_2_1
.4byte gSpriteAnimations_Vaati_2_2
.4byte gSpriteAnimations_Vaati_2_3
.4byte gSpriteAnimations_Vaati_2_4
.4byte gSpriteAnimations_Vaati_2_4
.4byte gSpriteAnimations_Vaati_2_6
.4byte gSpriteAnimations_Vaati_2_4
.4byte gSpriteAnimations_Vaati_2_0
.4byte gSpriteAnimations_Vaati_2_1
.4byte gSpriteAnimations_Vaati_2_2
.4byte gSpriteAnimations_Vaati_2_3
.4byte gSpriteAnimations_Vaati_2_4
.4byte gSpriteAnimations_Vaati_2_4
.4byte gSpriteAnimations_Vaati_2_6
.4byte gSpriteAnimations_Vaati_2_4
.4byte gSpriteAnimations_Vaati_2_16
.4byte gSpriteAnimations_Vaati_2_16
.4byte gSpriteAnimations_Vaati_2_18
.4byte gSpriteAnimations_Vaati_2_16
.4byte gSpriteAnimations_Vaati_2_16
.4byte gSpriteAnimations_Vaati_2_16
.4byte gSpriteAnimations_Vaati_2_18
.4byte gSpriteAnimations_Vaati_2_16
.4byte gSpriteAnimations_Vaati_2_24
.4byte gSpriteAnimations_Vaati_2_24
.4byte gSpriteAnimations_Vaati_2_26
.4byte gSpriteAnimations_Vaati_2_24
.4byte gSpriteAnimations_Vaati_2_28
.4byte gSpriteAnimations_Vaati_2_29
.4byte gSpriteAnimations_Vaati_2_30
.4byte gSpriteAnimations_Vaati_2_31
.4byte gSpriteAnimations_Vaati_2_32
.4byte gSpriteAnimations_Vaati_2_32
.4byte gSpriteAnimations_Vaati_2_32
.4byte gSpriteAnimations_Vaati_2_32
.4byte gSpriteAnimations_Vaati_2_36
.4byte gSpriteAnimations_Vaati_2_36
.4byte gSpriteAnimations_Vaati_2_36
.4byte gSpriteAnimations_Vaati_2_36
.4byte gSpriteAnimations_Vaati_2_40
.4byte gSpriteAnimations_Vaati_2_40
.4byte gSpriteAnimations_Vaati_2_40
.4byte gSpriteAnimations_Vaati_2_40
.4byte gSpriteAnimations_Vaati_2_44
.4byte gSpriteAnimations_Vaati_2_44
.4byte gSpriteAnimations_Vaati_2_44
.4byte gSpriteAnimations_Vaati_2_44
.4byte gSpriteAnimations_Vaati_2_48
.4byte gSpriteAnimations_Vaati_2_48
.4byte gSpriteAnimations_Vaati_2_50
.4byte gSpriteAnimations_Vaati_2_50
.4byte 00000000
data/animations/object/object6A.s
+7 -7
View File
@@ -5,15 +5,15 @@
.align 2
gSpriteAnimations_Object6A_9_0:: @ 08122B4C
.include "animations/gSpriteAnimations_Object6A_9_0.s"
gSpriteAnimations_Object6A_10_0:: @ 08122B4C
.include "animations/gSpriteAnimations_Object6A_10_0.s"
gSpriteAnimations_Object6A_9_1:: @ 08122B55
.include "animations/gSpriteAnimations_Object6A_9_1.s"
gSpriteAnimations_Object6A_10_1:: @ 08122B55
.include "animations/gSpriteAnimations_Object6A_10_1.s"
gSpriteAnimations_Object6A_9:: @ 08122B64
.4byte gSpriteAnimations_Object6A_9_0
.4byte gSpriteAnimations_Object6A_9_1
gSpriteAnimations_Object6A_10:: @ 08122B64
.4byte gSpriteAnimations_Object6A_10_0
.4byte gSpriteAnimations_Object6A_10_1
.4byte 00000000
gSpriteAnimations_Object6A_5_2:: @ 08122B70
data/data_08107BC8.s
-14
View File
@@ -1,14 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08107C0C:: @ 08107C0C
.incbin "data_08107BC8/gUnk_08107C0C.bin"
gUnk_08107C0F:: @ 08107C0F
.incbin "data_08107BC8/gUnk_08107C0F.bin"
gUnk_08107C14:: @ 08107C14
.incbin "data_08107BC8/gUnk_08107C14.bin"
data/data_08128A38.s
-154
View File
@@ -68,157 +68,3 @@ gUnk_08128B48:: @ 08128B48
gUnk_08128B50:: @ 08128B50
.incbin "data_08127280/gUnk_08128B50.bin"
gUnk_08128B64:: @ 08128B64
.incbin "data_08127280/gUnk_08128B64.bin"
gUnk_08128BF4:: @ 08128BF4
.incbin "data_08127280/gUnk_08128BF4.bin"
gUnk_08128BF8:: @ 08128BF8
.4byte sub_080A5594
.4byte sub_080A56A0
gUnk_08128C00:: @ 08128C00
.incbin "data_08127280/gUnk_08128C00.bin"
gUnk_08128C04:: @ 08128C04
.incbin "data_08127280/gUnk_08128C04.bin"
gUnk_08128C14:: @ 08128C14
.incbin "data_08127280/gUnk_08128C14.bin"
gUnk_08128C94:: @ 08128C94
.incbin "data_08127280/gUnk_08128C94.bin"
gUnk_08128D14:: @ 08128D14
.4byte sub_080A59AC
.4byte sub_080A59C8
.4byte sub_080A5A54
.4byte sub_080A5A90
gUnk_08128D24:: @ 08128D24
.4byte sub_080A5AF4
.4byte sub_080A5B34
.4byte sub_080A5BB8
gUnk_08128D30:: @ 08128D30
.4byte sub_080A5C44
.4byte sub_080A5C9C
gUnk_08128D38:: @ 08128D38
.incbin "data_08127280/gUnk_08128D38.bin"
gUnk_08128D3C:: @ 08128D3C
.incbin "data_08127280/gUnk_08128D3C.bin"
gUnk_08128D43:: @ 08128D43
.incbin "data_08127280/gUnk_08128D43.bin"
gUnk_08128D51:: @ 08128D51
.incbin "data_08127280/gUnk_08128D51.bin"
gUnk_08128D58:: @ 08128D58
.4byte sub_080A6024
.4byte sub_080A6044
gUnk_08128D60:: @ 08128D60
.incbin "data_08127280/gUnk_08128D60.bin"
gUnk_08128D70:: @ 08128D70
.incbin "data_08127280/gUnk_08128D70.bin"
gUnk_08128DB0:: @ 08128DB0
.4byte sub_080A6108
.4byte sub_080A612C
gUnk_08128DB8:: @ 08128DB8
.incbin "data_08127280/gUnk_08128DB8.bin"
gUnk_08128DBC:: @ 08128DBC
.incbin "data_08127280/gUnk_08128DBC.bin"
gUnk_08128DCC:: @ 08128DCC
.4byte sub_080A6290
.4byte sub_080A62E0
gUnk_08128DD4:: @ 08128DD4
.incbin "data_08127280/gUnk_08128DD4.bin"
gUnk_08128DD8:: @ 08128DD8
.incbin "data_08127280/gUnk_08128DD8.bin"
gUnk_08128DE8:: @ 08128DE8
.incbin "data_08127280/gUnk_08128DE8.bin"
gUnk_08128E70:: @ 08128E70
.4byte sub_080A6534
.4byte sub_080A65AC
gUnk_08128E78:: @ 08128E78
.4byte sub_080A6650
.4byte sub_080A667C
gUnk_08128E80:: @ 08128E80
.incbin "data_08127280/gUnk_08128E80.bin"
gUnk_08128E84:: @ 08128E84
.incbin "data_08127280/gUnk_08128E84.bin"
gUnk_08128E94:: @ 08128E94
.incbin "data_08127280/gUnk_08128E94.bin"
gUnk_08128F1C:: @ 08128F1C
.4byte sub_080A6B04
.4byte sub_080A6C1C
gUnk_08128F24:: @ 08128F24
.4byte sub_080A6CA8
.4byte sub_080A6CD8
.4byte sub_080A6DD0
.4byte sub_080A6DF8
.4byte sub_080A6E44
gUnk_08128F38:: @ 08128F38
.incbin "data_08127280/gUnk_08128F38.bin"
gUnk_08128F4C:: @ 08128F4C
.incbin "data_08127280/gUnk_08128F4C.bin"
gUnk_08128F58:: @ 08128F58
.incbin "data_08127280/gUnk_08128F58.bin"
gUnk_08128FA8:: @ 08128FA8
.incbin "data_08127280/gUnk_08128FA8.bin"
gUnk_08128FC0:: @ 08128FC0
.incbin "data_08127280/gUnk_08128FC0.bin"
gUnk_08128FD8:: @ 08128FD8
.incbin "data_08127280/gUnk_08128FD8.bin"
gUnk_08128FF0:: @ 08128FF0
.incbin "data_08127280/gUnk_08128FF0.bin"
gUnk_08129004:: @ 08129004
.incbin "data_08127280/gUnk_08129004.bin"
gUnk_0812901C:: @ 0812901C
.4byte sub_080A7250
.4byte sub_080A7328
.4byte sub_080A7528
.4byte sub_080A73A8
.4byte sub_080A74C8
gUnk_08129030:: @ 08129030
.4byte sub_080A71DC
.4byte sub_080A4EA0
.4byte sub_080A71DC
.4byte sub_080A64FC
.4byte DrawKinstoneMenu
.4byte sub_08051E68
.4byte sub_0804AB54
.4byte sub_080A45A4
.4byte sub_08054870
.4byte sub_080A6C74
.4byte sub_080A6AB8
data/data_08128BF4.s
+156
View File
@@ -0,0 +1,156 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08128BF4:: @ 08128BF4
.incbin "data_08127280/gUnk_08128BF4.bin"
gUnk_08128BF8:: @ 08128BF8
.4byte sub_080A5594
.4byte sub_080A56A0
gUnk_08128C00:: @ 08128C00
.incbin "data_08127280/gUnk_08128C00.bin"
gUnk_08128C04:: @ 08128C04
.incbin "data_08127280/gUnk_08128C04.bin"
gUnk_08128C14:: @ 08128C14
.incbin "data_08127280/gUnk_08128C14.bin"
gUnk_08128C94:: @ 08128C94
.incbin "data_08127280/gUnk_08128C94.bin"
gUnk_08128D14:: @ 08128D14
.4byte sub_080A59AC
.4byte sub_080A59C8
.4byte sub_080A5A54
.4byte sub_080A5A90
gUnk_08128D24:: @ 08128D24
.4byte sub_080A5AF4
.4byte sub_080A5B34
.4byte sub_080A5BB8
gUnk_08128D30:: @ 08128D30
.4byte sub_080A5C44
.4byte sub_080A5C9C
gUnk_08128D38:: @ 08128D38
.incbin "data_08127280/gUnk_08128D38.bin"
gUnk_08128D3C:: @ 08128D3C
.incbin "data_08127280/gUnk_08128D3C.bin"
gUnk_08128D43:: @ 08128D43
.incbin "data_08127280/gUnk_08128D43.bin"
gUnk_08128D51:: @ 08128D51
.incbin "data_08127280/gUnk_08128D51.bin"
gUnk_08128D58:: @ 08128D58
.4byte sub_080A6024
.4byte sub_080A6044
gUnk_08128D60:: @ 08128D60
.incbin "data_08127280/gUnk_08128D60.bin"
gUnk_08128D70:: @ 08128D70
.incbin "data_08127280/gUnk_08128D70.bin"
gUnk_08128DB0:: @ 08128DB0
.4byte sub_080A6108
.4byte sub_080A612C
gUnk_08128DB8:: @ 08128DB8
.incbin "data_08127280/gUnk_08128DB8.bin"
gUnk_08128DBC:: @ 08128DBC
.incbin "data_08127280/gUnk_08128DBC.bin"
gUnk_08128DCC:: @ 08128DCC
.4byte sub_080A6290
.4byte sub_080A62E0
gUnk_08128DD4:: @ 08128DD4
.incbin "data_08127280/gUnk_08128DD4.bin"
gUnk_08128DD8:: @ 08128DD8
.incbin "data_08127280/gUnk_08128DD8.bin"
gUnk_08128DE8:: @ 08128DE8
.incbin "data_08127280/gUnk_08128DE8.bin"
gUnk_08128E70:: @ 08128E70
.4byte sub_080A6534
.4byte sub_080A65AC
gUnk_08128E78:: @ 08128E78
.4byte sub_080A6650
.4byte sub_080A667C
gUnk_08128E80:: @ 08128E80
.incbin "data_08127280/gUnk_08128E80.bin"
gUnk_08128E84:: @ 08128E84
.incbin "data_08127280/gUnk_08128E84.bin"
gUnk_08128E94:: @ 08128E94
.incbin "data_08127280/gUnk_08128E94.bin"
gUnk_08128F1C:: @ 08128F1C
.4byte sub_080A6B04
.4byte sub_080A6C1C
gUnk_08128F24:: @ 08128F24
.4byte sub_080A6CA8
.4byte sub_080A6CD8
.4byte sub_080A6DD0
.4byte sub_080A6DF8
.4byte sub_080A6E44
gUnk_08128F38:: @ 08128F38
.incbin "data_08127280/gUnk_08128F38.bin"
gUnk_08128F4C:: @ 08128F4C
.incbin "data_08127280/gUnk_08128F4C.bin"
gUnk_08128F58:: @ 08128F58
.incbin "data_08127280/gUnk_08128F58.bin"
gUnk_08128FA8:: @ 08128FA8
.incbin "data_08127280/gUnk_08128FA8.bin"
gUnk_08128FC0:: @ 08128FC0
.incbin "data_08127280/gUnk_08128FC0.bin"
gUnk_08128FD8:: @ 08128FD8
.incbin "data_08127280/gUnk_08128FD8.bin"
gUnk_08128FF0:: @ 08128FF0
.incbin "data_08127280/gUnk_08128FF0.bin"
gUnk_08129004:: @ 08129004
.incbin "data_08127280/gUnk_08129004.bin"
gUnk_0812901C:: @ 0812901C
.4byte sub_080A7250
.4byte sub_080A7328
.4byte sub_080A7528
.4byte sub_080A73A8
.4byte sub_080A74C8
gUnk_08129030:: @ 08129030
.4byte sub_080A71DC
.4byte sub_080A4EA0
.4byte sub_080A71DC
.4byte sub_080A64FC
.4byte DrawKinstoneMenu
.4byte sub_08051E68
.4byte sub_0804AB54
.4byte sub_080A45A4
.4byte sub_08054870
.4byte sub_080A6C74
.4byte sub_080A6AB8
data/data_0812AA88.s
-42
View File
@@ -1,42 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0812AA88:: @ 0812AA88
.incbin "data_0812AA88/gUnk_0812AA88.bin"
gUnk_0812AA91:: @ 0812AA91
.incbin "data_0812AA88/gUnk_0812AA91.bin"
gUnk_0812AA9A:: @ 0812AA9A
.incbin "data_0812AA88/gUnk_0812AA9A.bin"
gUnk_0812AAAC:: @ 0812AAAC
.4byte gUnk_0812AA88
.4byte gUnk_0812AA91
.4byte gUnk_0812AA91
.4byte gUnk_0812AA9A
gUnk_0812AABC:: @ 0812AABC
.incbin "data_0812AA88/gUnk_0812AABC.bin"
gUnk_0812AAC0:: @ 0812AAC0
.incbin "data_0812AA88/gUnk_0812AAC0.bin"
gUnk_0812AAC8:: @ 0812AAC8
.incbin "data_0812AA88/gUnk_0812AAC8.bin"
gUnk_0812AAD0:: @ 0812AAD0
.incbin "data_0812AA88/gUnk_0812AAD0.bin"
gUnk_0812AAD8:: @ 0812AAD8
.4byte gUnk_0812AAC0
.4byte gUnk_0812AAC8
.4byte gUnk_0812AAC8
.4byte gUnk_0812AAD0
gUnk_0812AAE8:: @ 0812AAE8
.4byte 0x10100c00
data/enums.s
-7780
View File
File diff suppressed because it is too large Load Diff
data/gfx/sprite_ptrs.s
+1 -1
View File
@@ -1641,7 +1641,7 @@ gMoreSpritePtrs:: @ 08003DD4
.4byte 00000000
.4byte 00000000
.4byte gSpriteAnimations_Object6A_9
.4byte gSpriteAnimations_Object6A_10
.4byte 00000000
.4byte 00000000
.4byte 00000000
data/scripts/script_08008B5C.inc
+4 -4
View File
@@ -28,7 +28,7 @@ script_08008BA2:
_0807E864
_0807E930 0x0004
Call sub_0807F2D4
TextboxNoOverlapFollow 0x4912
MessageFromTarget 0x4912
WaitUntilTextboxCloses
_0807E930 0x0008
_0807E878
@@ -60,7 +60,7 @@ script_08008BD2:
CallWithArg sub_0806BB1C, 0x00000001
Call sub_0806BB7C
JumpIfNot script_08008C5C
TextboxNoOverlap 0x490c
MessageNoOverlap 0x490c
WaitUntilTextboxCloses
LoadRoomEntityList gUnk_080D6784
WaitForSomething 0x00000001
@@ -69,7 +69,7 @@ script_08008BD2:
PlaySound SFX_SECRET
_0807E930 0x0004
Call sub_0807F2D4
TextboxNoOverlap 0x4913
MessageNoOverlap 0x4913
WaitUntilTextboxCloses
_0807E930 0x0008
Call sub_0807F2D4
@@ -91,7 +91,7 @@ SCRIPT_START script_08008C64
PlaySound SFX_STAIRS
EndBlock
WaitForSomething 0x00000002
TextboxNoOverlap 0x490d
MessageNoOverlap 0x490d
WaitUntilTextboxCloses
DoPostScriptAction 0x0007
Call sub_08064D08
data/scripts/script_08008D8C.inc
+1 -1
View File
@@ -64,7 +64,7 @@ script_08008E12:
WaitForSomething2 0x00000100
_0807E5F8 0x00000004
WaitForSomething2 0x00000008
TextboxNoOverlapFollowPos 0x1053, 0x000e
MessageFromTargetPos 0x1053, 0x000e
WaitUntilTextboxCloses
_0807E5F8 0x00000080
WaitForSomething2 0x00000100
data/scripts/script_08008FC0.inc
+1 -1
View File
@@ -4,7 +4,7 @@ SCRIPT_START script_08008FC0
PlaySound SFX_109
CallWithArg sub_0807F238, 0x0000045f
Call sub_0807F304
TextboxNoOverlapFollowPos 0x0501, 0x000e
MessageFromTargetPos 0x0501, 0x000e
WaitUntilTextboxCloses
_0807E5F8 0x00000020
Call sub_080791BC
data/scripts/script_0800903C.inc
+18 -18
View File
@@ -29,20 +29,20 @@ SCRIPT_START script_08009080
_0807EB44 0x0004
_0807ECC4 0x0008
_0807E930 0x0004
TextboxNoOverlapFollowPos 0x1050, 0x000e
MessageFromTargetPos 0x1050, 0x000e
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
_0807E5F8 0x00000100
WaitForSomething2 0x00000080
_0807E930 0x0004
TextboxNoOverlapFollowPos 0x1052, 0x000e
MessageFromTargetPos 0x1052, 0x000e
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
_0807E5F8 0x00000100
WaitForSomething2 0x00000080
_0807EB44 0x0006
_0807E930 0x0005
TextboxNoOverlapFollowPos 0x1054, 0x000e
MessageFromTargetPos 0x1054, 0x000e
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
_0807E5F8 0x00000100
@@ -51,25 +51,25 @@ SCRIPT_START script_08009080
_0807E5F8 0x00000100
WaitForSomething2 0x00000080
_0807E930 0x0004
TextboxNoOverlapFollowPos 0x1056, 0x000e
MessageFromTargetPos 0x1056, 0x000e
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
_0807E5F8 0x00000100
WaitForSomething2 0x00000080
_0807E930 0x0004
TextboxNoOverlapFollowPos 0x1057, 0x000e
MessageFromTargetPos 0x1057, 0x000e
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
_0807E5F8 0x00000100
WaitForSomething2 0x00000080
_0807E930 0x0004
TextboxNoOverlapFollowPos 0x1058, 0x000e
MessageFromTargetPos 0x1058, 0x000e
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
_0807E5F8 0x00000100
WaitForSomething2 0x00000080
_0807E930 0x0004
TextboxNoOverlapFollowPos 0x105c, 0x000e
MessageFromTargetPos 0x105c, 0x000e
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
_0807E5F8 0x00000100
@@ -92,7 +92,7 @@ SCRIPT_START script_08009198
WaitForSomething2 0x00000001
_0807EB74
DoPostScriptAction 0x0001
TextboxNoOverlapFollowPos 0x105b, 0x0000
MessageFromTargetPos 0x105b, 0x0000
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
_0807E5F8 0x00000002
@@ -104,7 +104,7 @@ SCRIPT_START script_08009198
DoPostScriptAction 0x0005
Wait 0x003c
DoPostScriptAction 0x0001
TextboxNoOverlapFollowPos 0x1051, 0x0000
MessageFromTargetPos 0x1051, 0x0000
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
_0807E5F8 0x00000002
@@ -114,7 +114,7 @@ SCRIPT_START script_08009198
_0807EB74
_0807EB8C
DoPostScriptAction 0x0001
TextboxNoOverlapFollowPos 0x1055, 0x0000
MessageFromTargetPos 0x1055, 0x0000
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
_0807E5F8 0x00000002
@@ -128,7 +128,7 @@ SCRIPT_START script_08009198
_0807EB74
DoPostScriptAction 0x0000
DoPostScriptAction 0x0001
TextboxNoOverlapFollowPos 0x1059, 0x0000
MessageFromTargetPos 0x1059, 0x0000
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
_0807E5F8 0x00000002
@@ -167,9 +167,9 @@ script_080092B2:
script_080092BA:
CheckEntityInteractType
JumpIfNot script_080092BA
_0807E864
_0807EB74
TextboxNoOverlap 0x105e
_0807E864
_0807EB74
MessageNoOverlap 0x105e
WaitUntilTextboxCloses
Wait 0x000f
_0807E878
@@ -192,11 +192,11 @@ SCRIPT_START script_080092F0
script_08009300:
CheckEntityInteractType
JumpIfNot script_08009300
_0807E864
_0807EB74
TextboxNoOverlap 0x1071
_0807E864
_0807EB74
MessageNoOverlap 0x1071
WaitUntilTextboxCloses
_0807E878
_0807E878
Jump script_08009300
.2byte 0x0000
SCRIPT_START script_08009318
data/scripts/script_08009348.inc
+1 -1
View File
@@ -12,7 +12,7 @@ script_0800934E:
CameraTargetEntity
CheckGlobalFlag 0x0055
JumpIf script_0800939A
TextboxNoOverlap 0x1d01
MessageNoOverlap 0x1d01
WaitUntilTextboxCloses
script_08009376:
WaitUntilTextboxCloses
data/scripts/script_0800939A.inc
+9 -9
View File
@@ -17,14 +17,14 @@ SCRIPT_START script_0800939A
JumpIf script_080093BC
CheckInventory1 0x000e
JumpIf script_080093BC
TextboxNoOverlap 0x1d02
MessageNoOverlap 0x1d02
WaitUntilTextboxCloses
Jump script_08009376
script_080093BC:
CheckInventory1 0x000e
JumpIfNot script_080093DA
Call sub_0806D788
TextboxNoOverlap 0x1d03
MessageNoOverlap 0x1d03
WaitUntilTextboxCloses
Call sub_0806D70C
Jump script_08009376
@@ -46,12 +46,12 @@ script_080093DA:
JumpIf script_080093EE
SetIntVariable 0x00001d04
script_080093EE:
TextboxNoOverlapVar
MessageNoOverlapVar
WaitUntilTextboxCloses
_0807E3E8
_0807E3E8
JumpIfNot script_08009376
Wait 0x001e
TextboxNoOverlap 0x1d08
MessageNoOverlap 0x1d08
WaitUntilTextboxCloses
LoadRoomEntityList gUnk_080F9C38
Wait 0x0078
@@ -77,19 +77,19 @@ script_080093EE:
.endif
.endif
Call sub_0806D5D4
_0807EB8C
TextboxNoOverlap 0x1d09
_0807EB8C
MessageNoOverlap 0x1d09
WaitUntilTextboxCloses
Wait 0x000a
Jump script_08009376
script_0800943E:
Call sub_0806D600
JumpIf script_08009452
TextboxNoOverlap 0x1d0a
MessageNoOverlap 0x1d0a
WaitUntilTextboxCloses
JumpIfNot script_08009376
script_08009452:
TextboxNoOverlap 0x1d0b
MessageNoOverlap 0x1d0b
WaitUntilTextboxCloses
Call sub_0806D74C
_0807F0C8 0xffff, 0x0000
data/scripts/script_08009464.inc
+3 -3
View File
@@ -20,9 +20,9 @@ SCRIPT_START script_08009464
.endif
Call sub_0806D620
Wait 0x003c
WaitPlayerAction8
_0807EB8C
TextboxNoOverlap 0x1d0c
WaitPlayerAction8
_0807EB8C
MessageNoOverlap 0x1d0c
WaitUntilTextboxCloses
Wait 0x000a
Jump script_08009376
data/scripts/script_080095F2.inc
+2 -2
View File
@@ -9,8 +9,8 @@ SCRIPT_START script_080095F2
JumpIfNot script_08009622
PlaySound SFX_109
_0807F088 0x003c
TextboxNoOverlapFollow 0x053c
WaitPlayerAction8
MessageFromTarget 0x053c
WaitPlayerAction8
WaitUntilTextboxCloses
_0807F078 0x003c, 0x0001
script_08009622:
data/scripts/script_08009950.inc
+2 -2
View File
@@ -16,7 +16,7 @@ SCRIPT_START script_08009950
Wait 0x001e
_0807E930 0x000b
Wait 0x001e
TextboxNoOverlapFollow 0x1002
MessageFromTarget 0x1002
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
_0807E5F8 0x00000004
@@ -26,7 +26,7 @@ SCRIPT_START script_08009950
_0807EDD4 0x00b8, 0x005c
_0807EB44 0x0006
DoPostScriptAction 0x0001
TextboxNoOverlapFollow 0x1004
MessageFromTarget 0x1004
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
Wait 0x001e
data/scripts/script_080099DC.inc
+2 -2
View File
@@ -9,13 +9,13 @@ SCRIPT_START script_080099DC
DoPostScriptAction 0x0007
_0807EDD4 0x0068, 0x0060
Wait 0x000f
TextboxNoOverlapFollow 0x1001
MessageFromTarget 0x1001
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
_0807E5F8 0x00000008
WaitForSomething2 0x00000004
DoPostScriptAction 0x0001
TextboxNoOverlapFollow 0x1003
MessageFromTarget 0x1003
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
_0807E5F8 0x00000008
data/scripts/script_08009B30.inc
+1 -1
View File
@@ -6,7 +6,7 @@ SCRIPT_START script_08009B30
EndBlock
WaitFor_2
Wait 0x001e
TextboxNoOverlapFollow 0x1005
MessageFromTarget 0x1005
WaitUntilTextboxCloses
Wait 0x003c
Call sub_0807529C
data/scripts/script_08009B78.inc
+8 -8
View File
@@ -18,15 +18,15 @@ SCRIPT_START script_08009B78
DoPostScriptAction 0x0000
Wait 0x000f
DoPostScriptAction 0x0001
TextboxNoOverlapFollowPos 0x1009, 0x0000
_0807E8E4_1
MessageFromTargetPos 0x1009, 0x0000
_0807E8E4_1
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
_0807E5F8 0x00000004
WaitForSomething2 0x00000008
_0807EB8C
DoPostScriptAction 0x0001
TextboxNoOverlapFollowPos 0x100b, 0x0000
MessageFromTargetPos 0x100b, 0x0000
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
_0807E5F8 0x00000002
@@ -45,7 +45,7 @@ SCRIPT_START script_08009B78
WaitPlayerAction8
_0807E8E4_1
DoPostScriptAction 0x0001
TextboxNoOverlapFollowPos 0x100c, 0x0000
MessageFromTargetPos 0x100c, 0x0000
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
_0807E5F8 0x00000004
@@ -54,10 +54,10 @@ script_08009C4C:
script_08009C50:
CheckEntityInteractType
JumpIfNot script_08009C50
_0807E864
_0807EB74
TextboxNoOverlap 0x100e
_0807E878
_0807E864
_0807EB74
MessageNoOverlap 0x100e
_0807E878
Jump script_08009C50
SCRIPT_END
.2byte 0x0000
data/scripts/script_08009C68.inc
+2 -2
View File
@@ -13,7 +13,7 @@ SCRIPT_START script_08009C68
_0807EB74
_0807EB8C
DoPostScriptAction 0x0001
TextboxNoOverlapFollowPos 0x100a, 0x0000
MessageFromTargetPos 0x100a, 0x0000
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
_0807E5F8 0x00000008
@@ -22,7 +22,7 @@ SCRIPT_START script_08009C68
DoPostScriptAction 0x0001
_0807EB8C
_0807EB44 0x0002
TextboxNoOverlapFollowPos 0x100d, 0x0000
MessageFromTargetPos 0x100d, 0x0000
WaitUntilTextboxCloses
DoPostScriptAction 0x0000
_0807EDD4 0x0028, 0x0060
data/scripts/script_08009F14.inc
+14 -14
View File
@@ -21,7 +21,7 @@ script_08009F36:
StartPlayerScript script_0800A088
WaitForSomething2 0x00000002
Call sub_0806014C
TextboxNoOverlapFollowPos 0x1f01, 0x0000
MessageFromTargetPos 0x1f01, 0x0000
WaitUntilTextboxCloses
Wait 0x001e
_0807F034 0x0065
@@ -62,11 +62,11 @@ script_08009FDC:
Call sub_08060158
CheckEntityInteractType
JumpIfNot script_08009FDC
EndBlock
_0807E864
TextboxNoOverlap 0x1f0e
EndBlock
_0807E864
MessageNoOverlap 0x1f0e
WaitUntilTextboxCloses
_0807E3E8
_0807E3E8
JumpIf script_0800A002
_0807E878
Jump script_08009FDC
@@ -76,8 +76,8 @@ script_0800A002:
Call sub_08060318
WaitPlayerAction8
Wait 0x0008
_0807EB8C
TextboxNoOverlapFollow 0x1f13
_0807EB8C
MessageFromTarget 0x1f13
WaitUntilTextboxCloses
SetLocalFlag 0x00b0
_0807E878
@@ -91,16 +91,16 @@ script_0800A024:
_0807E864
CheckInventory1 0x0008
JumpIf script_0800A052
TextboxNoOverlap 0x1f14
MessageNoOverlap 0x1f14
WaitUntilTextboxCloses
_0807E3E8
_0807E3E8
JumpIf script_0800A002
_0807E878
Jump script_0800A024
script_0800A052:
TextboxNoOverlap 0x1f11
MessageNoOverlap 0x1f11
WaitUntilTextboxCloses
_0807E3E8
_0807E3E8
JumpIf script_0800A064
_0807E878
Jump script_0800A024
@@ -110,9 +110,9 @@ script_0800A064:
Call sub_08060318
WaitPlayerAction8
Wait 0x0008
_0807EB8C
TextboxNoOverlapFollow 0x1f10
_0807EB8C
MessageFromTarget 0x1f10
WaitUntilTextboxCloses
_0807E878
_0807E878
Jump script_0800A024
.2byte 0x0000
data/scripts/script_0800A1D8.inc
+5 -5
View File
@@ -12,7 +12,7 @@ SCRIPT_START script_0800A1D8
WaitForSomething2 0x00000001
_0807E5F8 0x00000004
WaitForSomething2 0x00000080
TextboxNoOverlapFollowPos 0x1659, 0x0000
MessageFromTargetPos 0x1659, 0x0000
WaitUntilTextboxCloses
Wait 0x003c
_0807E5F8 0x00000010
@@ -27,10 +27,10 @@ SCRIPT_START script_0800A1D8
_0807E5F8 0x00000004
Call sub_0807F3F8
WaitForSomething2 0x00000080
TextboxNoOverlapFollowPos 0x165a, 0x000e
MessageFromTargetPos 0x165a, 0x000e
WaitUntilTextboxCloses
Wait 0x003c
TextboxNoOverlapFollowPos 0x165b, 0x000e
MessageFromTargetPos 0x165b, 0x000e
WaitUntilTextboxCloses
_0807E5F8 0x00000002
WaitForSomething2 0x00000040
@@ -45,10 +45,10 @@ SCRIPT_START script_0800A1D8
WaitForSomething2 0x00000100
_0807E5F8 0x00000006
WaitForSomething2 0x000000c0
TextboxNoOverlapFollowPos 0x165c, 0x000e
MessageFromTargetPos 0x165c, 0x000e
WaitUntilTextboxCloses
StopBgm
TextboxNoOverlapFollowPos 0x165d, 0x000e
MessageFromTargetPos 0x165d, 0x000e
WaitUntilTextboxCloses
_0807E5F8 0x00000006
WaitForSomething2 0x000000c0
data/scripts/script_0800AB08.inc
+2 -2
View File
@@ -13,9 +13,9 @@ SCRIPT_START script_0800AB08
_0807F0B4 0x0001
SetEntityPositionRelative 0x0088, 0x0078
Call sub_0807F5C0
TextboxNoOverlapFollowPos 0x1664, 0x0000
MessageFromTargetPos 0x1664, 0x0000
WaitUntilTextboxCloses
TextboxNoOverlapFollowPos 0x165e, 0x000e
MessageFromTargetPos 0x165e, 0x000e
WaitUntilTextboxCloses
CallWithArg CreateManager36, 0x00000001
_0807F0C8 0xffff, 0x0000

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