mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-05-31 01:16:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5 from zeldaret/master

Browse Source 
Merge
This commit is contained in:
Macrepeh
2021-02-21 14:09:58 -05:00
committed by GitHub
parent b9a264bc7e 870f735dbf
commit 684ccaf3f6
434 changed files with 33674 additions and 41135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/lint_pr.yml
+11
View File
@@ -0,0 +1,11 @@
name: lint_pr
on: pull_request
jobs:
clang-format:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: DoozyX/clang-format-lint-action@v0.8
with:
source: './src ./include'
clangFormatVersion: 10
.gitignore
+2 -1
View File
@@ -64,4 +64,5 @@ types_*.taghl
_Deparsed_XSubs.pm
*.py
*.sna
__pycache__
__pycache__
.vscode/settings.json
Jenkinsfile
Vendored
+37
View File
@@ -0,0 +1,37 @@
pipeline {
agent any
stages {
stage('Setup') {
steps {
echo 'Setting up...'
sh 'cp /usr/local/etc/roms/baserom_tmc.gba baserom.gba'
sh 'make -j setup'
}
}
stage('Build') {
when {
not {
branch 'master'
}
}
steps {
sh 'make -j'
}
}
stage('Report Progress') {
when {
branch 'master'
}
steps {
sh 'python3 progress.py -c >> /var/www/html/reports/progress.csv'
sh 'python3 progress.py -mc >> /var/www/html/reports/progress_matching.csv'
}
}
}
post {
always {
cleanWs()
}
}
}
Makefile
+2 -1
View File
@@ -38,7 +38,7 @@ MID_BUILDDIR = $(OBJ_DIR)/$(MID_SUBDIR)
ASFLAGS := -mcpu=arm7tdmi --defsym $(GAME_VERSION)=1 --defsym REVISION=$(REVISION) --defsym $(GAME_LANGUAGE)=1
CC1 := tools/agbcc/bin/agbcc
override CFLAGS += -Wimplicit -Wparentheses -Werror -O2
override CFLAGS += -O2 -Wimplicit -Wparentheses -Werror -Wno-multichar
# -fhex-asm
ifeq ($(DINFO),1)
@@ -83,6 +83,7 @@ NODEP := 1
endif
#$(C_BUILDDIR)/need_interworking_file_name.o: CFLAGS += -mthumb-interwork
$(C_BUILDDIR)/arm_proxy.o: CFLAGS += -mthumb-interwork
C_SRCS := $(wildcard $(C_SUBDIR)/*.c $(C_SUBDIR)/*/*.c)
C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))
README.md
+1 -1
View File
@@ -1,6 +1,6 @@
# The Legend of Zelda: The Minish Cap
**Progress:** [⬛⬛⬛⬛⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜] 20%
**Progress:** [⬛⬛⬛⬛⬛⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜] 25%
```diff
- WARNING! -
asm/bigBarrel.s
+4 -4
View File
@@ -43,14 +43,14 @@ sub_08088A68: @ 0x08088A68
bl CheckGlobalFlag
cmp r0, #0
beq _08088AA0
ldr r0, _08088A9C @ =gUnk_02002A40
ldr r0, _08088A9C @ =gSave
ldrb r0, [r0, #7]
adds r0, #1
b _08088AA4
.align 2, 0
_08088A9C: .4byte gUnk_02002A40
_08088A9C: .4byte gSave
_08088AA0:
ldr r0, _08088AD8 @ =gUnk_02002A40
ldr r0, _08088AD8 @ =gSave
ldrb r0, [r0, #7]
_08088AA4:
strb r0, [r4, #0x1e]
@@ -77,7 +77,7 @@ _08088AA4:
str r1, [r0, #0x68]
b _08088B82
.align 2, 0
_08088AD8: .4byte gUnk_02002A40
_08088AD8: .4byte gSave
_08088ADC: .4byte gRoomControls
_08088AE0: .4byte gRoomVars
_08088AE4:
asm/bigGoron.s
+4 -4
View File
@@ -775,7 +775,7 @@ sub_0806D5D4: @ 0x0806D5D4
adds r1, r0, #0
cmp r1, #2
beq _0806D5F0
ldr r0, _0806D5FC @ =gUnk_02002A40
ldr r0, _0806D5FC @ =gSave
adds r0, #0xb4
adds r0, r1, r0
movs r1, #0
@@ -786,13 +786,13 @@ _0806D5F0:
bl sub_0807CAA0
pop {pc}
.align 2, 0
_0806D5FC: .4byte gUnk_02002A40
_0806D5FC: .4byte gSave
thumb_func_start sub_0806D600
sub_0806D600: @ 0x0806D600
push {lr}
movs r2, #0
ldr r0, _0806D618 @ =gUnk_02002A40
ldr r0, _0806D618 @ =gSave
ldr r3, _0806D61C @ =0x00000494
adds r0, r0, r3
ldr r0, [r0]
@@ -803,7 +803,7 @@ _0806D612:
str r2, [r1, #0x14]
pop {pc}
.align 2, 0
_0806D618: .4byte gUnk_02002A40
_0806D618: .4byte gSave
_0806D61C: .4byte 0x00000494
thumb_func_start sub_0806D620
asm/bird.s
+2 -2
View File
@@ -304,7 +304,7 @@ _0809D454:
ldrb r0, [r5, #0xc]
cmp r0, #2
bne _0809D478
ldr r0, _0809D494 @ =gUnk_02002A40
ldr r0, _0809D494 @ =gSave
ldr r1, [r0, #0x40]
movs r2, #0x80
lsls r2, r2, #0x15
@@ -328,7 +328,7 @@ _0809D488:
mov sl, r5
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0809D494: .4byte gUnk_02002A40
_0809D494: .4byte gSave
thumb_func_start sub_0809D498
sub_0809D498: @ 0x0809D498
asm/bowUse.s
+3 -3
View File
@@ -279,7 +279,7 @@ _08019390:
movs r0, #0xe
strb r0, [r1]
_08019398:
ldr r0, _08019404 @ =gUnk_02002A40
ldr r0, _08019404 @ =gSave
adds r0, #0xad
ldrb r5, [r0]
ldrb r1, [r4, #0x1e]
@@ -334,6 +334,6 @@ _080193FA:
_08019402:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08019404: .4byte gUnk_02002A40
_08019404: .4byte gSave
_08019408: .4byte gPlayerEntity
_0801940C: .4byte gPlayerState
_0801940C: .4byte gPlayerState
asm/brocco.s
+2 -2
View File
@@ -233,7 +233,7 @@ _080636D4:
thumb_func_start sub_080636D8
sub_080636D8: @ 0x080636D8
push {lr}
ldr r1, _080636EC @ =gUnk_02002A40
ldr r1, _080636EC @ =gSave
ldrb r1, [r1, #8]
lsls r1, r1, #3
ldr r2, _080636F0 @ =gUnk_0810CAAC
@@ -241,7 +241,7 @@ sub_080636D8: @ 0x080636D8
bl ShowNPCDialogue
pop {pc}
.align 2, 0
_080636EC: .4byte gUnk_02002A40
_080636EC: .4byte gSave
_080636F0: .4byte gUnk_0810CAAC
thumb_func_start sub_080636F4
asm/castleMaid.s
+2 -2
View File
@@ -212,7 +212,7 @@ _08064684: .4byte gUnk_0810F88C
thumb_func_start sub_08064688
sub_08064688: @ 0x08064688
push {lr}
ldr r1, _0806469C @ =gUnk_02002A40
ldr r1, _0806469C @ =gSave
ldrb r1, [r1, #8]
lsls r1, r1, #3
ldr r2, _080646A0 @ =gUnk_0810F894
@@ -220,7 +220,7 @@ sub_08064688: @ 0x08064688
bl ShowNPCDialogue
pop {pc}
.align 2, 0
_0806469C: .4byte gUnk_02002A40
_0806469C: .4byte gSave
_080646A0: .4byte gUnk_0810F894
thumb_func_start sub_080646A4
asm/castorWildsStatue.s
+2 -2
View File
@@ -552,7 +552,7 @@ sub_08067790: @ 0x08067790
lsls r1, r2, #2
adds r1, r1, r2
lsls r1, r1, #4
ldr r2, _080677AC @ =gUnk_02002A40
ldr r2, _080677AC @ =gSave
ldrb r2, [r2, #8]
lsls r2, r2, #3
ldr r3, _080677B0 @ =gUnk_08110EF8
@@ -561,5 +561,5 @@ sub_08067790: @ 0x08067790
bl ShowNPCDialogue
pop {pc}
.align 2, 0
_080677AC: .4byte gUnk_02002A40
_080677AC: .4byte gSave
_080677B0: .4byte gUnk_08110EF8
asm/cat.s
+1 -1
View File
@@ -854,4 +854,4 @@ _08067E22:
bl UpdateAnimationSingleFrame
_08067E28:
pop {pc}
.align 2, 0
.align 2, 0
asm/cellOverwriteSet.s
+4 -4
View File
@@ -67,7 +67,7 @@ _0801BF62:
movs r0, #0x80
orrs r0, r1
strb r0, [r2, #0x1a]
ldr r6, _0801C000 @ =gUnk_03000FF0
ldr r6, _0801C000 @ =gInput
ldrh r1, [r6]
movs r3, #0x80
lsls r3, r3, #1
@@ -137,7 +137,7 @@ _0801BFF0: .4byte gPlayerEntity
_0801BFF4: .4byte gUnk_080B7B6C
_0801BFF8: .4byte gRoomControls
_0801BFFC: .4byte gPlayerState
_0801C000: .4byte gUnk_03000FF0
_0801C000: .4byte gInput
_0801C004:
ldrh r2, [r6, #2]
movs r6, #0x10
@@ -247,7 +247,7 @@ _0801C074:
strb r0, [r1, #0x1a]
bl DeleteThisEntity
_0801C0D4:
ldr r0, _0801C1D0 @ =gUnk_03000FF0
ldr r0, _0801C1D0 @ =gInput
ldrh r1, [r0]
movs r0, #2
ands r0, r1
@@ -369,4 +369,4 @@ _0801C1BE:
.align 2, 0
_0801C1C8: .4byte gUnk_080B7B6C
_0801C1CC: .4byte gRoomControls
_0801C1D0: .4byte gUnk_03000FF0
_0801C1D0: .4byte gInput
asm/chooseFile.s
-3066
View File
File diff suppressed because it is too large Load Diff
asm/chuchuBoss.s
-33
View File
@@ -6,39 +6,6 @@
.text
thumb_func_start ChuchuBoss
ChuchuBoss: @ 0x08025CA0
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _08025CB8 @ =gUnk_080CC19C
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
adds r0, r5, #0
bl _call_via_r1
pop {r4, r5, pc}
.align 2, 0
_08025CB8: .4byte gUnk_080CC19C
thumb_func_start sub_08025CBC
sub_08025CBC: @ 0x08025CBC
push {r4, lr}
adds r4, r0, #0
bl sub_08001324
thumb_func_start sub_08025CC4
sub_08025CC4: @ 0x08025CC4
ldrb r0, [r4, #0xa]
cmp r0, #0
bne _08025CD0
adds r0, r4, #0
bl sub_08027870
_08025CD0:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_08025CD4
sub_08025CD4: @ 0x08025CD4
push {r4, r5, lr}
asm/code_08000F10.s
+1 -1
View File
@@ -48,4 +48,4 @@ _08000F40:
pop {r4, r5, r6, r7}
bx lr
.align 2, 0
_08000F50: .4byte gUnk_03005E60
_08000F50: .4byte gUnk_03005E60
asm/code_080011C4.s
+3 -3
View File
@@ -71,7 +71,7 @@ _08001230:
ldr r3, _0800135C @ =UpdateAnimationVariableFrames
bx r3
_0800123E:
ldr r3, _08001360 @ =sub_080043B4
ldr r3, _08001360 @ =CreateItemOnGround
bx r3
non_word_aligned_thumb_func_start sub_08001242
@@ -154,7 +154,7 @@ gUnk_080012C8::
.4byte 0x00000000
_080012CC: .4byte sub_08001214
_080012D0: .4byte sub_080043A8
_080012D4: .4byte sub_080043AC
_080012D4: .4byte CreateChestSpawner
_080012D8: .4byte sub_080043B0
thumb_func_start sub_080012DC
@@ -239,7 +239,7 @@ _08001352:
.align 2, 0
_08001358: .4byte gEnemyFunctions
_0800135C: .4byte UpdateAnimationVariableFrames
_08001360: .4byte sub_080043B4
_08001360: .4byte CreateItemOnGround
_08001364: .4byte 0x00001800
_08001368: .4byte gUnk_080012C8
_0800136C: .4byte gUnk_080012C8
asm/code_08003FC4.s
+76 -32
View File
@@ -414,18 +414,22 @@ _0800425C:
pop {r4}
bx lr
thumb_func_start InitializeAnimation
thumb_func_start InitializeAnimation @ r0 = Entity*, r1 = Frame*
InitializeAnimation: @ 0x08004260
movs r2, #0x58
movs r2, #0x58 @ anim idx
strb r1, [r0, r2]
ldrh r3, [r0, #0x12]
lsls r3, r3, #4
ldr r2, _0800439C @ =gUnk_080029B4
ldr r2, [r2, r3]
lsls r1, r1, #2
ldr r1, [r2, r1]
ldrh r3, [r0, #0x12] @ Sprite idx
lsls r3, r3, #4 @ *= 16
ldr r2, _0800439C @ =gSpritePtrs
ldr r2, [r2, r3] @ Load AnimData
lsls r1, r1, #2 @ *= 4
ldr r1, [r2, r1] @ AnimData->???
str r1, [r0, #0x5c]
b _0800432A
b FrameZero
thumb_func_start GetNextFrame
GetNextFrame: @ 0x08004274
@@ -434,31 +438,43 @@ GetNextFrame: @ 0x08004274
non_word_aligned_thumb_func_start UpdateAnimationVariableFrames
UpdateAnimationVariableFrames: @ 0x08004276
movs r3, #0x59
ldrb r2, [r0, r3]
ldrb r2, [r0, r3] @ Decrease frame timer
subs r2, r2, r1
beq _0800432A
ble _08004284
beq FrameZero @ Frame timer is 0
ble FrameNeg @ Frame timer is below 0
strb r2, [r0, r3]
bx lr
_08004284:
ldr r1, [r0, #0x5c]
FrameNeg:
ldr r1, [r0, #0x5c] @ Load frame data
_08004286:
ldrb r3, [r1, #1]
adds r2, r2, r3
bgt _0800429C
bgt _0800429C @ Frame idx greater (?)
ldrb r3, [r1, #3]
adds r1, #4
lsrs r3, r3, #8
lsrs r3, r3, #8 @ Branch if != 0xFF
blo _08004286
ldrb r3, [r1]
lsls r3, r3, #2
subs r1, r1, r3
b _08004286
_0800429C:
str r1, [r0, #0x5c]
push {r2, lr}
bl _0800432A
bl FrameZero
pop {r2, r3}
movs r1, #0x59
strb r2, [r0, r1]
bx r3
@@ -479,27 +495,34 @@ UpdateAnimationSingleFrame: @ 0x080042B8
sub_080042BA: @ 0x080042BA
push {lr}
bl UpdateAnimationVariableFrames
_080042C0:
pop {r1}
mov lr, r1
ldrb r1, [r0, #0x1e]
ldrb r3, [r0, #0x1f]
strb r1, [r0, #0x1f]
cmp r1, r3
beq _08004328
ldrh r2, [r0, #0x12]
thumb_func_start sub_080042D0
sub_080042D0: @ 0x080042D0
cmp r1, #0xff
beq _08004328
lsls r2, r2, #4
lsls r3, r1, #2
ldr r1, _080043A0 @ =gUnk_080029B4
ldr r1, _080043A0 @ =gSpritePtrs
adds r1, r1, r2
ldr r2, [r1, #4]
cmp r2, #0
beq _08004328
ldr r1, [r1, #8]
adds r2, r2, r3
ldrb r3, [r2]
@@ -538,31 +561,41 @@ _08004326:
pop {r4, r5}
_08004328:
bx lr
_0800432A:
ldrb r3, [r0, #0x1e]
strb r3, [r0, #0x1f]
FrameZero: @ r0 = Entity*
ldrb r3, [r0, #0x1e] @ Get frame idx
strb r3, [r0, #0x1f] @ Set it to last frame idx
ldr r1, [r0, #0x5c]
ldrb r3, [r1]
ldrb r3, [r1] @ Store new frame idx
strb r3, [r0, #0x1e]
ldrb r3, [r1, #1]
movs r2, #0x59
strb r3, [r0, r2]
ldrb r3, [r1, #2]
movs r2, #0x5b
strb r3, [r0, r2]
ldrb r3, [r1, #3]
movs r2, #0x5a
strb r3, [r0, r2]
adds r1, #4
lsrs r3, r3, #8
blo _08004352
ldrb r3, [r1]
lsls r3, r3, #2
subs r1, r1, r3
_08004352:
str r1, [r0, #0x5c]
bx lr
.align 2, 0
_08004358: .4byte gUnk_081326EC
_0800435C: .4byte gUnk_02024048
_08004360: .4byte gUnk_02021F20
@@ -580,8 +613,8 @@ _0800438C: .4byte 0x0000EE00
_08004390: .4byte 0x00001FFF
_08004394: .4byte gUnk_08000228
_08004398: .4byte 0x00004000
_0800439C: .4byte gUnk_080029B4
_080043A0: .4byte gUnk_080029B4
_0800439C: .4byte gSpritePtrs
_080043A0: .4byte gSpritePtrs
_080043A4: .4byte gUnk_02024494
thumb_func_start sub_080043A8
@@ -589,8 +622,8 @@ sub_080043A8: @ 0x080043A8
movs r1, #0xb
b _080043B6
thumb_func_start sub_080043AC
sub_080043AC: @ 0x080043AC
thumb_func_start CreateChestSpawner
CreateChestSpawner: @ 0x080043AC
movs r1, #0xc
b _080043B6
@@ -599,31 +632,42 @@ sub_080043B0: @ 0x080043AC
movs r1, #0x52
b _080043B6
thumb_func_start sub_080043B4
sub_080043B4: @ 0x080043B4
thumb_func_start CreateItemOnGround
CreateItemOnGround: @ 0x080043B4
movs r1, #0
_080043B6:
push {r4, lr}
adds r4, r0, #0
movs r0, #0xf
movs r2, #0
bl CreateObject
cmp r0, #0
beq _080043E0
beq _080043E0 @ Branch if entity could not be created
movs r1, #0x48
ldr r1, [r4, r1]
ldr r1, [r4, r1] @ Unused?
ldrh r3, [r4, #0x2e]
strh r3, [r0, #0x2e]
ldrh r3, [r4, #0x32]
strh r3, [r0, #0x32]
ldrh r3, [r4, #0x36]
strh r3, [r0, #0x36]
ldrb r3, [r4, #8]
cmp r3, #3
cmp r3, #3 @ Is the spawner an enemy?
bne _080043E0
movs r1, #1
strb r1, [r0, #0xb]
strb r1, [r0, #0xb] @ Set base parameter
_080043E0:
adds r0, r4, #0
bl DeleteEntity
pop {r4, pc}
asm/code_080041E8.s
-295
View File
@@ -1,295 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_080041E8
sub_080041E8: @ 0x080041E8
subs r0, r0, r2
subs r1, r1, r3
thumb_func_start sub_080041EC
sub_080041EC: @ 0x080041EC
adds r2, r0, #0
muls r0, r2, r0
adds r3, r1, #0
muls r1, r3, r1
push {lr}
adds r0, r0, r1
lsls r0, r0, #8
bl Sqrt
pop {r3}
bx r3
non_word_aligned_thumb_func_start sub_08004202
sub_08004202: @ 0x08004202
push {r1, lr}
ldrb r1, [r0, #0x14]
bl sub_08004212
pop {r0}
str r1, [r0]
adds r0, r2, #0
pop {pc}
non_word_aligned_thumb_func_start sub_08004212
sub_08004212: @ 0x08004212
push {r4}
adds r4, r1, #0
movs r3, #3
tst r4, r3
beq _08004226
movs r3, #2
lsrs r4, r4, #3
blo _08004224
rsbs r3, r3, #0
_08004224:
adds r2, r2, r3
_08004226:
adds r4, r1, #0
movs r3, #3
ands r4, r3
cmp r4, #2
beq _0800423C
movs r3, #0x80
adds r1, #1
lsrs r1, r1, #3
bhs _0800423A
rsbs r3, r3, #0
_0800423A:
adds r2, r2, r3
_0800423C:
ldr r3, _08004390 @ =0x00001FFF
ands r2, r3
movs r4, #0x38
ldrb r4, [r0, r4]
lsls r4, r4, #3
ldr r3, _08004394 @ =gUnk_08000228
adds r3, r3, r4
ldr r4, [r3]
ldrh r1, [r4, r2]
ldr r4, _08004398 @ =0x00004000
tst r1, r4
bne _0800425C
lsls r1, r1, #0x11
lsrs r1, r1, #0x10
ldr r4, [r3, #4]
ldrh r1, [r4, r1]
_0800425C:
pop {r4}
bx lr
thumb_func_start InitializeAnimation
InitializeAnimation: @ 0x08004260
movs r2, #0x58
strb r1, [r0, r2]
ldrh r3, [r0, #0x12]
lsls r3, r3, #4
ldr r2, _0800439C @ =gUnk_080029B4
ldr r2, [r2, r3]
lsls r1, r1, #2
ldr r1, [r2, r1]
str r1, [r0, #0x5c]
b _0800432A
thumb_func_start GetNextFrame
GetNextFrame: @ 0x08004274
movs r1, #1
non_word_aligned_thumb_func_start UpdateAnimationVariableFrames
UpdateAnimationVariableFrames: @ 0x08004276
movs r3, #0x59
ldrb r2, [r0, r3]
subs r2, r2, r1
beq _0800432A
ble _08004284
strb r2, [r0, r3]
bx lr
_08004284:
ldr r1, [r0, #0x5c]
_08004286:
ldrb r3, [r1, #1]
adds r2, r2, r3
bgt _0800429C
ldrb r3, [r1, #3]
adds r1, #4
lsrs r3, r3, #8
blo _08004286
ldrb r3, [r1]
lsls r3, r3, #2
subs r1, r1, r3
b _08004286
_0800429C:
str r1, [r0, #0x5c]
push {r2, lr}
bl _0800432A
pop {r2, r3}
movs r1, #0x59
strb r2, [r0, r1]
bx r3
thumb_func_start InitAnimationForceUpdate
InitAnimationForceUpdate: @ 0x080042AC
push {lr}
bl InitializeAnimation
movs r2, #0xff
strb r2, [r0, #0x1f]
b _080042C0
thumb_func_start UpdateAnimationSingleFrame
UpdateAnimationSingleFrame: @ 0x080042B8
movs r1, #1
non_word_aligned_thumb_func_start sub_080042BA
sub_080042BA: @ 0x080042BA
push {lr}
bl UpdateAnimationVariableFrames
_080042C0:
pop {r1}
mov lr, r1
ldrb r1, [r0, #0x1e]
ldrb r3, [r0, #0x1f]
strb r1, [r0, #0x1f]
cmp r1, r3
beq _08004328
ldrh r2, [r0, #0x12]
thumb_func_start sub_080042D0
sub_080042D0: @ 0x080042D0
cmp r1, #0xff
beq _08004328
lsls r2, r2, #4
lsls r3, r1, #2
ldr r1, _080043A0 @ =gUnk_080029B4
adds r1, r1, r2
ldr r2, [r1, #4]
cmp r2, #0
beq _08004328
ldr r1, [r1, #8]
adds r2, r2, r3
ldrb r3, [r2]
cmp r3, #0
beq _08004328
push {r4, r5}
movs r3, #0x26
ldrb r3, [r0, r3]
movs r4, #0xc
muls r3, r4, r3
ldr r4, _080043A4 @ =gUnk_02024494
adds r4, r4, r3
ldrb r3, [r4]
movs r5, #0xf
ands r3, r5
cmp r3, #5
blo _08004326
ldrb r5, [r4, #6]
ldrb r3, [r2]
strb r3, [r4, #6]
subs r5, r5, r3
ldrh r3, [r2, #2]
lsls r3, r3, #5
adds r1, r1, r3
ldr r2, [r4, #8]
str r1, [r4, #8]
subs r2, r2, r1
orrs r5, r2
beq _08004326
movs r2, #0xf0
ldrb r1, [r4]
bics r1, r2
adds r1, #0x30
strb r1, [r4]
_08004326:
pop {r4, r5}
_08004328:
bx lr
_0800432A:
ldrb r3, [r0, #0x1e]
strb r3, [r0, #0x1f]
ldr r1, [r0, #0x5c]
ldrb r3, [r1]
strb r3, [r0, #0x1e]
ldrb r3, [r1, #1]
movs r2, #0x59
strb r3, [r0, r2]
ldrb r3, [r1, #2]
movs r2, #0x5b
strb r3, [r0, r2]
ldrb r3, [r1, #3]
movs r2, #0x5a
strb r3, [r0, r2]
adds r1, #4
lsrs r3, r3, #8
blo _08004352
ldrb r3, [r1]
lsls r3, r3, #2
subs r1, r1, r3
_08004352:
str r1, [r0, #0x5c]
bx lr
.align 2, 0
_08004358: .4byte gUnk_081326EC
_0800435C: .4byte gUnk_02024048
_08004360: .4byte gUnk_02021F20
_08004364: .4byte gUnk_02024048
_08004368: .4byte gRoomControls
_0800436C: .4byte 0x0000016E
_08004370: .4byte 0x0000011E
_08004374: .4byte gUnk_03000BF6
_08004378: .4byte gUnk_03000BF8
_0800437C: .4byte 0x000003F0
_08004380: .4byte gUnk_08000248
_08004384: .4byte 0x000FFFFF
_08004388: .4byte 0x00080000
_0800438C: .4byte 0x0000EE00
_08004390: .4byte 0x00001FFF
_08004394: .4byte gUnk_08000228
_08004398: .4byte 0x00004000
_0800439C: .4byte gUnk_080029B4
_080043A0: .4byte gUnk_080029B4
_080043A4: .4byte gUnk_02024494
thumb_func_start sub_080043A8
sub_080043A8: @ 0x080043A8
movs r1, #0xb
b _080043B6
thumb_func_start sub_080043AC
sub_080043AC: @ 0x080043AC
movs r1, #0xc
b _080043B6
thumb_func_start sub_080043B0
sub_080043B0: @ 0x080043AC
movs r1, #0x52
b _080043B6
thumb_func_start sub_080043B4
sub_080043B4: @ 0x080043B4
movs r1, #0
_080043B6:
push {r4, lr}
adds r4, r0, #0
movs r0, #0xf
movs r2, #0
bl CreateObject
cmp r0, #0
beq _080043E0
movs r1, #0x48
ldr r1, [r4, r1]
ldrh r3, [r4, #0x2e]
strh r3, [r0, #0x2e]
ldrh r3, [r4, #0x32]
strh r3, [r0, #0x32]
ldrh r3, [r4, #0x36]
strh r3, [r0, #0x36]
ldrb r3, [r4, #8]
cmp r3, #3
bne _080043E0
movs r1, #1
strb r1, [r0, #0xb]
_080043E0:
adds r0, r4, #0
bl DeleteEntity
pop {r4, pc}
asm/code_080043E8.s
+3 -3
View File
@@ -52,9 +52,9 @@ sub_0800442E: @ 0x0800442E
_08004448:
movs r0, #0
pop {r1, pc}
_0800444C: .4byte sub_080043B4
_0800444C: .4byte CreateItemOnGround
_08004450: .4byte sub_080043A8
_08004454: .4byte sub_080043AC
_08004454: .4byte CreateChestSpawner
_08004458: .4byte sub_080043B0
thumb_func_start sub_0800445C
@@ -1849,4 +1849,4 @@ _08007DE2:
ldrh r3, [r1, #2]
movs r2, #1
_08007DF2:
bx lr
bx lr
asm/code_08016DF8.s
+5 -1386
View File
File diff suppressed because it is too large Load Diff
asm/code_08019444.s
+11 -11
View File
@@ -359,7 +359,7 @@ sub_08019698: @ 0x08019698
_08019700:
movs r0, #0x11
bl LoadGfxGroup
bl sub_080AD90C
bl FlushSprites
bl sub_080AD9B0
bl sub_080AD918
movs r0, #4
@@ -402,7 +402,7 @@ _08019760: .4byte gUnk_02018EB0
thumb_func_start sub_08019764
sub_08019764: @ 0x08019764
push {lr}
bl sub_080AD90C
bl FlushSprites
bl sub_0805E5C0
bl sub_080AD9B0
bl sub_080AD918
@@ -413,7 +413,7 @@ sub_08019764: @ 0x08019764
lsls r0, r0, #0x10
cmp r0, #0
beq _08019790
ldr r0, _0801979C @ =gUnk_03000FF0
ldr r0, _0801979C @ =gInput
ldrh r1, [r0, #2]
movs r0, #0xa
ands r0, r1
@@ -427,7 +427,7 @@ _08019796:
pop {pc}
.align 2, 0
_08019798: .4byte gUnk_02018EB0
_0801979C: .4byte gUnk_03000FF0
_0801979C: .4byte gInput
thumb_func_start sub_080197A0
sub_080197A0: @ 0x080197A0
@@ -5053,7 +5053,7 @@ sub_0801BA18: @ 0x0801BA18
b _0801BA34
_0801BA2A:
ldrb r1, [r1]
ldr r0, _0801BA4C @ =gUnk_02002A40
ldr r0, _0801BA4C @ =gSave
adds r0, r0, r1
adds r0, #0x9a
ldrb r0, [r0]
@@ -5070,7 +5070,7 @@ _0801BA34:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0801BA4C: .4byte gUnk_02002A40
_0801BA4C: .4byte gSave
_0801BA50: .4byte _0801BA54
_0801BA54: @ jump table
.4byte _0801BA9C @ case 0
@@ -5306,7 +5306,7 @@ _0801BC76:
movs r5, #0xa0
b _0801BC98
_0801BC7A:
ldr r1, _0801BCB0 @ =gUnk_02002A40
ldr r1, _0801BCB0 @ =gSave
adds r0, r4, #0
adds r0, #0x6f
ldrb r0, [r0]
@@ -5331,7 +5331,7 @@ _0801BC98:
bl SetBottleContents
pop {r4, r5, r6, pc}
.align 2, 0
_0801BCB0: .4byte gUnk_02002A40
_0801BCB0: .4byte gSave
thumb_func_start sub_0801BCB4
sub_0801BCB4: @ 0x0801BCB4
@@ -5403,7 +5403,7 @@ _0801BD40:
bl ModHealth
b _0801BD6C
_0801BD54:
ldr r1, _0801BD88 @ =gUnk_02002A40
ldr r1, _0801BD88 @ =gSave
ldrb r0, [r5]
adds r2, r1, #0
adds r2, #0xb2
@@ -5429,7 +5429,7 @@ _0801BD6C:
beq _0801BDA2
b _0801BDAE
.align 2, 0
_0801BD88: .4byte gUnk_02002A40
_0801BD88: .4byte gSave
_0801BD8C: .4byte 0x000001CF
_0801BD90: .4byte gPlayerEntity
_0801BD94:
@@ -5620,4 +5620,4 @@ _0801BEEE:
pop {r4, pc}
.align 2, 0
_0801BEF0: .4byte gPlayerEntity
_0801BEF4: .4byte gUnk_080B7878
_0801BEF4: .4byte gUnk_080B7878
asm/code_0801C1D4.s
+2 -2
View File
@@ -39,7 +39,7 @@ _0801C204: .4byte gUnk_080C8F8C
sub_0801C208: @ 0x0801C208
push {r4, r5, lr}
movs r5, #0
ldr r4, _0801C250 @ =gUnk_03001010
ldr r4, _0801C250 @ =gOamCmd
_0801C20E:
lsls r1, r5, #5
ldr r0, _0801C254 @ =gUnk_0200AF34
@@ -75,7 +75,7 @@ _0801C248:
bls _0801C20E
pop {r4, r5, pc}
.align 2, 0
_0801C250: .4byte gUnk_03001010
_0801C250: .4byte gOamCmd
_0801C254: .4byte gUnk_0200AF34
_0801C258: .4byte gUnk_080C8F8C
asm/code_0801C370.s
+7 -7
View File
@@ -11,7 +11,7 @@ sub_0801C370: @ 0x0801C370
push {r4, r5, r6, lr}
cmp r0, #0
bne _0801C390
ldr r0, _0801C388 @ =gUnk_02002A40
ldr r0, _0801C388 @ =gSave
adds r1, r0, #0
adds r1, #0xaa
ldrb r1, [r1]
@@ -21,7 +21,7 @@ sub_0801C370: @ 0x0801C370
ldr r5, _0801C38C @ =gUnk_0200AF00
b _0801C398
.align 2, 0
_0801C388: .4byte gUnk_02002A40
_0801C388: .4byte gSave
_0801C38C: .4byte gUnk_0200AF00
_0801C390:
ldr r0, _0801C470 @ =gUnk_0200AF00
@@ -35,7 +35,7 @@ _0801C398:
bl _DmaZero
strb r6, [r5, #3]
strh r4, [r5, #0xe]
ldr r0, _0801C474 @ =gUnk_02002A40
ldr r0, _0801C474 @ =gSave
adds r0, #0xab
ldrb r0, [r0]
lsrs r0, r0, #1
@@ -44,7 +44,7 @@ _0801C398:
bl LoadPaletteGroup
movs r0, #0x10
bl LoadGfxGroup
ldr r4, _0801C478 @ =gUnk_02034CB0
ldr r4, _0801C478 @ =gBG0Buffer
movs r1, #0x80
lsls r1, r1, #4
adds r0, r4, #0
@@ -121,8 +121,8 @@ _0801C398:
pop {r4, r5, r6, pc}
.align 2, 0
_0801C470: .4byte gUnk_0200AF00
_0801C474: .4byte gUnk_02002A40
_0801C478: .4byte gUnk_02034CB0
_0801C474: .4byte gSave
_0801C478: .4byte gBG0Buffer
_0801C47C: .4byte gScreen
_0801C480: .4byte 0x00001F0C
_0801C484: .4byte gUnk_03000000
@@ -148,4 +148,4 @@ sub_0801C4A0: @ 0x0801C4A0
strb r0, [r1, #0xa]
bx lr
.align 2, 0
_0801C4AC: .4byte gUnk_0200AF00
_0801C4AC: .4byte gUnk_0200AF00
asm/code_0801C85C.s
+11 -11
View File
@@ -229,7 +229,7 @@ _0801C9EC:
movs r0, #1
strh r0, [r1, #0xe]
_0801CA1E:
ldr r0, _0801CA60 @ =gUnk_02002A40
ldr r0, _0801CA60 @ =gSave
ldr r3, _0801CA64 @ =gArea
ldrb r1, [r3, #3]
ldr r5, _0801CA68 @ =0x0000045C
@@ -260,7 +260,7 @@ _0801CA50:
_0801CA54: .4byte gUnk_020350E2
_0801CA58: .4byte 0x0000F01C
_0801CA5C: .4byte gScreen
_0801CA60: .4byte gUnk_02002A40
_0801CA60: .4byte gSave
_0801CA64: .4byte gArea
_0801CA68: .4byte 0x0000045C
@@ -375,7 +375,7 @@ sub_0801CB20: @ 0x0801CB20
bne _0801CB76
ldrh r1, [r1, #6]
lsls r1, r1, #4
ldr r0, _0801CB54 @ =gUnk_080029B4
ldr r0, _0801CB54 @ =gSpritePtrs
adds r1, r1, r0
ldrb r0, [r3, #0x10]
lsls r0, r0, #2
@@ -395,7 +395,7 @@ sub_0801CB20: @ 0x0801CB20
strb r0, [r3]
b _0801CB74
.align 2, 0
_0801CB54: .4byte gUnk_080029B4
_0801CB54: .4byte gSpritePtrs
_0801CB58:
ldrb r0, [r3, #0x19]
cmp r0, r2
@@ -569,7 +569,7 @@ sub_0801CC80: @ 0x0801CC80
rsbs r0, r1, #0
orrs r0, r1
lsrs r0, r0, #0x1f
ldr r5, _0801CCAC @ =gUnk_02002A40
ldr r5, _0801CCAC @ =gSave
adds r1, r5, #0
adds r1, #0xb4
adds r0, r0, r1
@@ -585,7 +585,7 @@ _0801CCA8:
adds r0, r4, #0
pop {r4, r5, pc}
.align 2, 0
_0801CCAC: .4byte gUnk_02002A40
_0801CCAC: .4byte gSave
thumb_func_start sub_0801CCB0
sub_0801CCB0: @ 0x0801CCB0
@@ -630,7 +630,7 @@ _0801CCF4:
ble _0801CD28
cmp r0, #0xa
bgt _0801CD60
ldr r1, _0801CD24 @ =gUnk_02002A40
ldr r1, _0801CD24 @ =gSave
adds r0, r1, #0
adds r0, #0xad
ldrb r2, [r0]
@@ -645,9 +645,9 @@ _0801CCF4:
.align 2, 0
_0801CD1C: .4byte gUnk_080FDFD8
_0801CD20: .4byte gUnk_0200AF13
_0801CD24: .4byte gUnk_02002A40
_0801CD24: .4byte gSave
_0801CD28:
ldr r5, _0801CD44 @ =gUnk_02002A40
ldr r5, _0801CD44 @ =gSave
adds r0, r5, #0
adds r0, #0xac
ldrb r2, [r0]
@@ -663,7 +663,7 @@ _0801CD3C:
adds r0, #0xae
b _0801CD52
.align 2, 0
_0801CD44: .4byte gUnk_02002A40
_0801CD44: .4byte gSave
_0801CD48: .4byte gBombBagSizes
_0801CD4C:
ldr r1, _0801CD5C @ =gQuiverSizes
@@ -866,4 +866,4 @@ _0801CEB4:
pop {r4, pc}
.align 2, 0
_0801CEB8: .4byte gUnk_0200AF00
_0801CEBC: .4byte gTextBox
_0801CEBC: .4byte gTextBox
asm/code_0801CEC0.s
+1 -1
View File
@@ -860,4 +860,4 @@ ClearBit: @ 0x0801D5D4
bics r1, r2
strb r1, [r3]
ands r0, r2
bx lr
bx lr
asm/code_0801D79C.s
+23 -23
View File
@@ -324,7 +324,7 @@ sub_0801DA90: @ 0x0801DA90
ldr r0, _0801DB08 @ =0x0600C000
movs r1, #0x20
bl _DmaZero
ldr r0, _0801DB0C @ =gUnk_02034CB0
ldr r0, _0801DB0C @ =gBG0Buffer
movs r1, #0x80
lsls r1, r1, #4
bl _DmaZero
@@ -339,7 +339,7 @@ _0801DAFC: .4byte 0x040000B0
_0801DB00: .4byte 0x0000C5FF
_0801DB04: .4byte 0x00007FFF
_0801DB08: .4byte 0x0600C000
_0801DB0C: .4byte gUnk_02034CB0
_0801DB0C: .4byte gBG0Buffer
thumb_func_start sub_0801DB10
sub_0801DB10: @ 0x0801DB10
@@ -370,19 +370,19 @@ sub_0801DB34: @ 0x0801DB34
adds r0, r4, #0
movs r1, #0x7c
bl _DmaZero
ldr r0, _0801DB70 @ =gUnk_02034CB0
ldr r0, _0801DB70 @ =gBG0Buffer
str r0, [r4, #0x10]
ldr r0, _0801DB74 @ =0x00001F0C
strh r0, [r4, #8]
ldr r0, _0801DB78 @ =gUnk_02021F30
ldr r0, _0801DB78 @ =gBG1Buffer
str r0, [r4, #0x1c]
ldr r0, _0801DB7C @ =0x00001C01
strh r0, [r4, #0x14]
ldr r0, _0801DB80 @ =gUnk_020344B0
ldr r0, _0801DB80 @ =gBG2Buffer
str r0, [r4, #0x28]
ldr r0, _0801DB84 @ =0x00001D02
strh r0, [r4, #0x20]
ldr r0, _0801DB88 @ =gUnk_02001A40
ldr r0, _0801DB88 @ =gBG3Buffer
str r0, [r4, #0x34]
ldr r0, _0801DB8C @ =0x00001E03
strh r0, [r4, #0x2c]
@@ -394,13 +394,13 @@ sub_0801DB34: @ 0x0801DB34
pop {r4, pc}
.align 2, 0
_0801DB6C: .4byte gScreen
_0801DB70: .4byte gUnk_02034CB0
_0801DB70: .4byte gBG0Buffer
_0801DB74: .4byte 0x00001F0C
_0801DB78: .4byte gUnk_02021F30
_0801DB78: .4byte gBG1Buffer
_0801DB7C: .4byte 0x00001C01
_0801DB80: .4byte gUnk_020344B0
_0801DB80: .4byte gBG2Buffer
_0801DB84: .4byte 0x00001D02
_0801DB88: .4byte gUnk_02001A40
_0801DB88: .4byte gBG3Buffer
_0801DB8C: .4byte 0x00001E03
_0801DB90: .4byte 0x0000FFFF
@@ -1924,7 +1924,7 @@ _0801E6E4:
subs r0, r1, #1
cmp r0, #0x7e
bhi _0801E70A
ldr r0, _0801E72C @ =gUnk_02002A40
ldr r0, _0801E72C @ =gSave
ldr r2, _0801E730 @ =0x000001C1
adds r0, r0, r2
adds r1, r1, r0
@@ -1953,7 +1953,7 @@ _0801E722:
.align 2, 0
_0801E724: .4byte gUnk_02022740
_0801E728: .4byte gUnk_02002C01
_0801E72C: .4byte gUnk_02002A40
_0801E72C: .4byte gSave
_0801E730: .4byte 0x000001C1
_0801E734: .4byte gUnk_03003DF0
@@ -1972,7 +1972,7 @@ sub_0801E738: @ 0x0801E738
cmp r1, #0
bge _0801E76E
movs r1, #0
ldr r0, _0801E794 @ =gUnk_02002A40
ldr r0, _0801E794 @ =gSave
movs r3, #0x8c
lsls r3, r3, #1
adds r2, r0, r3
@@ -1988,7 +1988,7 @@ _0801E764:
_0801E76E:
cmp r1, #0x11
bhi _0801E790
ldr r2, _0801E794 @ =gUnk_02002A40
ldr r2, _0801E794 @ =gSave
movs r3, #0x8c
lsls r3, r3, #1
adds r0, r2, r3
@@ -2007,7 +2007,7 @@ _0801E78E:
_0801E790:
pop {r4, pc}
.align 2, 0
_0801E794: .4byte gUnk_02002A40
_0801E794: .4byte gSave
thumb_func_start sub_0801E798
sub_0801E798: @ 0x0801E798
@@ -2016,7 +2016,7 @@ sub_0801E798: @ 0x0801E798
adds r1, r0, #0
cmp r1, #0
blt _0801E7C4
ldr r2, _0801E7C8 @ =gUnk_02002A40
ldr r2, _0801E7C8 @ =gSave
ldr r3, _0801E7CC @ =0x0000012B
adds r0, r2, r3
adds r3, r1, r0
@@ -2036,7 +2036,7 @@ _0801E7C2:
_0801E7C4:
pop {r4, pc}
.align 2, 0
_0801E7C8: .4byte gUnk_02002A40
_0801E7C8: .4byte gSave
_0801E7CC: .4byte 0x0000012B
thumb_func_start sub_0801E7D0
@@ -2046,14 +2046,14 @@ sub_0801E7D0: @ 0x0801E7D0
adds r1, r0, #0
cmp r1, #0
blt _0801E7F0
ldr r0, _0801E7E8 @ =gUnk_02002A40
ldr r0, _0801E7E8 @ =gSave
ldr r2, _0801E7EC @ =0x0000012B
adds r0, r0, r2
adds r0, r1, r0
ldrb r0, [r0]
b _0801E7F2
.align 2, 0
_0801E7E8: .4byte gUnk_02002A40
_0801E7E8: .4byte gSave
_0801E7EC: .4byte 0x0000012B
_0801E7F0:
movs r0, #0
@@ -2305,7 +2305,7 @@ sub_0801E99C: @ 0x0801E99C
bl GetInventoryValue
cmp r0, #0
beq _0801EA56
ldr r1, _0801E9E8 @ =gUnk_02002A40
ldr r1, _0801E9E8 @ =gSave
ldrb r0, [r7]
ldrb r2, [r1, #8]
cmp r0, r2
@@ -2329,7 +2329,7 @@ _0801E9D6:
b _0801EA10
.align 2, 0
_0801E9E4: .4byte gUnk_08001DCC
_0801E9E8: .4byte gUnk_02002A40
_0801E9E8: .4byte gSave
_0801E9EC: .4byte 0x000001C1
_0801E9F0:
cmp r5, #0xf2
@@ -2370,7 +2370,7 @@ _0801EA1C:
_0801EA32:
movs r5, #0xf3
_0801EA34:
ldr r1, _0801EA5C @ =gUnk_02002A40
ldr r1, _0801EA5C @ =gSave
ldr r2, _0801EA60 @ =0x000001C1
adds r0, r1, r2
add r0, r8
@@ -2389,7 +2389,7 @@ _0801EA56:
movs r0, #0
b _0801EA6E
.align 2, 0
_0801EA5C: .4byte gUnk_02002A40
_0801EA5C: .4byte gSave
_0801EA60: .4byte 0x000001C1
_0801EA64:
subs r0, r5, #1
asm/code_08049CD4.s → asm/code_08049D30.s
+2 -54
View File
@@ -6,58 +6,6 @@
.text
thumb_func_start sub_08049CD4
sub_08049CD4: @ 0x08049CD4
push {r4, lr}
movs r0, #1
rsbs r0, r0, #0
ldr r4, _08049CEC @ =gUnk_02024050
adds r1, r4, #0
movs r2, #0x40
bl _DmaFill32
ldr r0, _08049CF0 @ =gUnk_020354B0
str r4, [r0]
pop {r4, pc}
.align 2, 0
_08049CEC: .4byte gUnk_02024050
_08049CF0: .4byte gUnk_020354B0
thumb_func_start sub_08049CF4
sub_08049CF4: @ 0x08049CF4
push {lr}
adds r0, #0x6c
ldrb r3, [r0]
movs r0, #0x80
ands r0, r3
cmp r0, #0
beq _08049D14
ldr r0, _08049D18 @ =gUnk_020354B0
ldr r2, [r0]
movs r0, #0x1f
ands r3, r0
movs r1, #1
lsls r1, r3
ldr r0, [r2, #4]
orrs r0, r1
str r0, [r2, #4]
_08049D14:
pop {pc}
.align 2, 0
_08049D18: .4byte gUnk_020354B0
thumb_func_start sub_08049D1C
sub_08049D1C: @ 0x08049D1C
ldr r1, _08049D2C @ =gUnk_020354B0
ldr r1, [r1]
ldr r1, [r1, #4]
lsrs r1, r0
movs r0, #1
bics r0, r1
bx lr
.align 2, 0
_08049D2C: .4byte gUnk_020354B0
thumb_func_start sub_08049D30
sub_08049D30: @ 0x08049D30
push {r4, r5, r6, lr}
@@ -1595,7 +1543,7 @@ _0804A864:
bne _0804A934
adds r0, r5, #0
bl sub_08049CF4
ldr r1, _0804A8E8 @ =gUnk_02002A40
ldr r1, _0804A8E8 @ =gSave
ldr r0, [r1, #0x50]
adds r0, #1
str r0, [r1, #0x50]
@@ -1646,7 +1594,7 @@ _0804A8CA:
bl DeleteEntity
b _0804A982
.align 2, 0
_0804A8E8: .4byte gUnk_02002A40
_0804A8E8: .4byte gSave
_0804A8EC:
adds r0, r5, #0
adds r0, #0x41
asm/code_0804AA84.s
+3 -3
View File
@@ -120,7 +120,7 @@ _0804AC5E:
strh r0, [r2, #0x16]
ldrh r0, [r1, #0xc]
strh r0, [r2, #0x18]
bl sub_080AD90C
bl FlushSprites
bl sub_080AD9B0
bl sub_080AD918
ldr r0, _0804AC98 @ =gUnk_02018EB0
@@ -149,7 +149,7 @@ _0804ACA4: .4byte gArea
thumb_func_start sub_0804ACA8
sub_0804ACA8: @ 0x0804ACA8
push {lr}
ldr r0, _0804ACC0 @ =gUnk_03000FF0
ldr r0, _0804ACC0 @ =gInput
ldrh r1, [r0, #2]
movs r0, #0x81
lsls r0, r0, #1
@@ -159,7 +159,7 @@ sub_0804ACA8: @ 0x0804ACA8
bl sub_0804AD18
b _0804ACC6
.align 2, 0
_0804ACC0: .4byte gUnk_03000FF0
_0804ACC0: .4byte gInput
_0804ACC4:
movs r0, #0
_0804ACC6:
asm/code_080526F8.s
+49 -49
View File
@@ -47,7 +47,7 @@ sub_08052734: @ 0x08052734
bl sub_08052724
cmp r0, #0
beq _0805274C
ldr r0, _08052758 @ =gUnk_02002A40
ldr r0, _08052758 @ =gSave
ldr r1, _0805275C @ =gArea
ldr r2, _08052760 @ =0x0000045C
adds r0, r0, r2
@@ -62,7 +62,7 @@ _0805274C:
_08052754:
pop {r4, pc}
.align 2, 0
_08052758: .4byte gUnk_02002A40
_08052758: .4byte gSave
_0805275C: .4byte gArea
_08052760: .4byte 0x0000045C
@@ -72,7 +72,7 @@ sub_08052764: @ 0x08052764
bl sub_08052724
cmp r0, #0
beq _08052784
ldr r0, _08052790 @ =gUnk_02002A40
ldr r0, _08052790 @ =gSave
ldr r1, _08052794 @ =gArea
ldr r2, _08052798 @ =0x0000046C
adds r0, r0, r2
@@ -91,7 +91,7 @@ _08052784:
_0805278C:
pop {r4, pc}
.align 2, 0
_08052790: .4byte gUnk_02002A40
_08052790: .4byte gSave
_08052794: .4byte gArea
_08052798: .4byte 0x0000046C
@@ -101,7 +101,7 @@ sub_0805279C: @ 0x0805279C
bl sub_08052724
cmp r0, #0
beq _080527C8
ldr r0, _080527BC @ =gUnk_02002A40
ldr r0, _080527BC @ =gSave
ldr r1, _080527C0 @ =gArea
ldr r2, _080527C4 @ =0x0000046C
adds r0, r0, r2
@@ -113,7 +113,7 @@ sub_0805279C: @ 0x0805279C
ands r0, r1
b _080527CA
.align 2, 0
_080527BC: .4byte gUnk_02002A40
_080527BC: .4byte gSave
_080527C0: .4byte gArea
_080527C4: .4byte 0x0000046C
_080527C8:
@@ -127,7 +127,7 @@ sub_080527CC: @ 0x080527CC
bl sub_08052724
cmp r0, #0
beq _080527F8
ldr r0, _080527EC @ =gUnk_02002A40
ldr r0, _080527EC @ =gSave
ldr r1, _080527F0 @ =gArea
ldr r2, _080527F4 @ =0x0000046C
adds r0, r0, r2
@@ -138,7 +138,7 @@ sub_080527CC: @ 0x080527CC
ands r0, r1
b _080527FA
.align 2, 0
_080527EC: .4byte gUnk_02002A40
_080527EC: .4byte gSave
_080527F0: .4byte gArea
_080527F4: .4byte 0x0000046C
_080527F8:
@@ -293,7 +293,7 @@ sub_0805291C: @ 0x0805291C
ldrb r0, [r4, #8]
cmp r0, #0
beq _080529F4
ldr r0, _0805294C @ =gUnk_02002A40
ldr r0, _0805294C @ =gSave
adds r0, #0xaa
ldrb r0, [r0]
cmp r0, #0
@@ -311,7 +311,7 @@ sub_0805291C: @ 0x0805291C
b _080529F6
.align 2, 0
_08052948: .4byte gScreenTransition
_0805294C: .4byte gUnk_02002A40
_0805294C: .4byte gSave
_08052950: .4byte gPlayerState
_08052954:
ldrb r0, [r4, #9]
@@ -546,7 +546,7 @@ _08052B22:
thumb_func_start sub_08052B24
sub_08052B24: @ 0x08052B24
push {lr}
ldr r0, _08052B90 @ =gUnk_03000FF0
ldr r0, _08052B90 @ =gInput
ldrh r1, [r0]
movs r0, #4
ands r0, r1
@@ -600,7 +600,7 @@ _08052B8A:
movs r0, #0
b _08052BB4
.align 2, 0
_08052B90: .4byte gUnk_03000FF0
_08052B90: .4byte gInput
_08052B94: .4byte gPlayerState
_08052B98: .4byte gUnk_02034490
_08052B9C: .4byte gUnk_0200AF00
@@ -1322,11 +1322,11 @@ _0805312C:
beq _08053138
movs r4, #2
_08053138:
ldr r0, _08053140 @ =gUnk_02002A40
ldr r0, _08053140 @ =gSave
strb r4, [r0, #8]
pop {r4, r5, pc}
.align 2, 0
_08053140: .4byte gUnk_02002A40
_08053140: .4byte gSave
thumb_func_start sub_08053144
sub_08053144: @ 0x08053144
@@ -1513,12 +1513,12 @@ _080532BC:
beq _080532D0
b _080532DC
_080532C2:
ldr r1, _080532CC @ =gUnk_02002A40
ldr r1, _080532CC @ =gSave
movs r0, #0
strb r0, [r1, #7]
b _080532E0
.align 2, 0
_080532CC: .4byte gUnk_02002A40
_080532CC: .4byte gSave
_080532D0:
bl sub_080530B0
b _080532E0
@@ -1566,18 +1566,18 @@ _0805331C: .4byte gScreenTransition
thumb_func_start sub_08053320
sub_08053320: @ 0x08053320
push {r4, lr}
ldr r0, _0805337C @ =gUnk_02034CB0
ldr r0, _0805337C @ =gBG0Buffer
movs r4, #0x80
lsls r4, r4, #4
adds r1, r4, #0
bl _DmaZero
ldr r0, _08053380 @ =gUnk_02021F30
ldr r0, _08053380 @ =gBG1Buffer
adds r1, r4, #0
bl _DmaZero
ldr r0, _08053384 @ =gUnk_020344B0
ldr r0, _08053384 @ =gBG2Buffer
adds r1, r4, #0
bl _DmaZero
ldr r0, _08053388 @ =gUnk_02001A40
ldr r0, _08053388 @ =gBG3Buffer
movs r1, #0x80
lsls r1, r1, #5
bl _DmaZero
@@ -1602,10 +1602,10 @@ _08053362:
bl sub_0801D79C
pop {r4, pc}
.align 2, 0
_0805337C: .4byte gUnk_02034CB0
_08053380: .4byte gUnk_02021F30
_08053384: .4byte gUnk_020344B0
_08053388: .4byte gUnk_02001A40
_0805337C: .4byte gBG0Buffer
_08053380: .4byte gBG1Buffer
_08053384: .4byte gBG2Buffer
_08053388: .4byte gBG3Buffer
_0805338C: .4byte gRoomControls
thumb_func_start sub_08053390
@@ -1721,7 +1721,7 @@ _0805345C: .4byte gArea
thumb_func_start sub_08053460
sub_08053460: @ 0x08053460
push {lr}
ldr r0, _08053488 @ =gUnk_02002A40
ldr r0, _08053488 @ =gSave
ldr r1, _0805348C @ =0x0000048C
adds r0, r0, r1
movs r1, #0
@@ -1739,20 +1739,20 @@ _08053480:
bl sub_0805356C
pop {pc}
.align 2, 0
_08053488: .4byte gUnk_02002A40
_08053488: .4byte gSave
_0805348C: .4byte 0x0000048C
_08053490: .4byte gUnk_080FCB38
thumb_func_start sub_08053494
sub_08053494: @ 0x08053494
ldr r0, _080534A0 @ =gUnk_02002A40
ldr r0, _080534A0 @ =gSave
ldr r1, _080534A4 @ =0x0000048C
adds r0, r0, r1
ldr r1, _080534A8 @ =0x00002A30
str r1, [r0]
bx lr
.align 2, 0
_080534A0: .4byte gUnk_02002A40
_080534A0: .4byte gSave
_080534A4: .4byte 0x0000048C
_080534A8: .4byte 0x00002A30
@@ -1769,7 +1769,7 @@ sub_080534AC: @ 0x080534AC
adds r0, r4, #0
movs r1, #0x7c
bl ClearLocalFlagByOffset
ldr r0, _080534D8 @ =gUnk_02002A40
ldr r0, _080534D8 @ =gSave
ldr r1, _080534DC @ =0x0000048C
adds r0, r0, r1
movs r1, #0
@@ -1779,7 +1779,7 @@ sub_080534AC: @ 0x080534AC
_080534D6:
pop {r4, pc}
.align 2, 0
_080534D8: .4byte gUnk_02002A40
_080534D8: .4byte gSave
_080534DC: .4byte 0x0000048C
_080534E0: .4byte 0x80100000
@@ -1803,14 +1803,14 @@ _080534FC: .4byte gRoomControls
thumb_func_start sub_08053500
sub_08053500: @ 0x08053500
ldr r0, _0805350C @ =gUnk_02002A40
ldr r0, _0805350C @ =gSave
ldr r1, _08053510 @ =0x00000494
adds r0, r0, r1
ldr r1, _08053514 @ =0x00008CA0
str r1, [r0]
bx lr
.align 2, 0
_0805350C: .4byte gUnk_02002A40
_0805350C: .4byte gSave
_08053510: .4byte 0x00000494
_08053514: .4byte 0x00008CA0
@@ -2219,7 +2219,7 @@ sub_08053800: @ 0x08053800
adds r0, r5, #0
adds r0, #0x3a
bl LoadGfxGroup
ldr r0, _08053888 @ =gUnk_02021F30
ldr r0, _08053888 @ =gBG1Buffer
movs r1, #0x80
lsls r1, r1, #4
bl _DmaZero
@@ -2251,7 +2251,7 @@ _0805387A:
_0805387C: .4byte gFadeControl
_08053880: .4byte gMenu
_08053884: .4byte gUnk_080FCCB4
_08053888: .4byte gUnk_02021F30
_08053888: .4byte gBG1Buffer
_0805388C: .4byte 0x00000F01
_08053890: .4byte gScreen
@@ -3300,7 +3300,7 @@ _080540D0:
cmp r0, #0
bne _080540C6
adds r6, r4, #0
ldr r0, _08054100 @ =gUnk_02002A40
ldr r0, _08054100 @ =gSave
adds r0, #0xb6
adds r1, r5, r0
ldrb r0, [r1]
@@ -3316,10 +3316,10 @@ _080540EE:
bl PutItemOnSlot
b _0805427C
.align 2, 0
_08054100: .4byte gUnk_02002A40
_08054100: .4byte gSave
_08054104:
movs r5, #0
ldr r0, _08054144 @ =gUnk_02002A40
ldr r0, _08054144 @ =gSave
adds r2, r0, #0
adds r2, #0xb6
ldrb r1, [r2]
@@ -3353,14 +3353,14 @@ _0805412C:
bl PlaySFX
b _0805427C
.align 2, 0
_08054144: .4byte gUnk_02002A40
_08054144: .4byte gSave
_08054148: .4byte 0x00000109
_0805414C:
movs r0, #1
bl sub_080526F8
b _0805424E
_08054154:
ldr r1, _08054168 @ =gUnk_02002A40
ldr r1, _08054168 @ =gSave
ldr r0, _0805416C @ =gArea
ldr r2, _08054170 @ =0x0000046C
adds r1, r1, r2
@@ -3371,7 +3371,7 @@ _08054154:
orrs r0, r2
b _0805427A
.align 2, 0
_08054168: .4byte gUnk_02002A40
_08054168: .4byte gSave
_0805416C: .4byte gArea
_08054170: .4byte 0x0000046C
_08054174:
@@ -3417,7 +3417,7 @@ _080541B6:
bl PutItemOnSlot
b _080541E2
_080541CA:
ldr r0, _080541EC @ =gUnk_02002A40
ldr r0, _080541EC @ =gSave
adds r1, r0, #0
adds r1, #0xae
ldrb r0, [r1]
@@ -3434,7 +3434,7 @@ _080541E2:
bl ModBombs
b _0805427C
.align 2, 0
_080541EC: .4byte gUnk_02002A40
_080541EC: .4byte gSave
_080541F0:
ldrb r0, [r4, #2]
bl ModBombs
@@ -3452,7 +3452,7 @@ _0805420A:
bl ModArrows
b _080541B0
_08054212:
ldr r0, _08054234 @ =gUnk_02002A40
ldr r0, _08054234 @ =gSave
adds r1, r0, #0
adds r1, #0xaf
ldrb r0, [r1]
@@ -3469,7 +3469,7 @@ _0805422A:
bl ModArrows
b _0805427C
.align 2, 0
_08054234: .4byte gUnk_02002A40
_08054234: .4byte gSave
_08054238:
ldrb r0, [r4, #2]
bl ModArrows
@@ -3491,7 +3491,7 @@ _0805425C:
bl sub_0801E738
b _0805427C
_08054264:
ldr r0, _08054284 @ =gUnk_02002A40
ldr r0, _08054284 @ =gSave
adds r1, r0, #0
adds r1, #0xa8
ldrb r0, [r1]
@@ -3510,7 +3510,7 @@ _0805427C:
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08054284: .4byte gUnk_02002A40
_08054284: .4byte gSave
thumb_func_start sub_08054288
sub_08054288: @ 0x08054288
@@ -3554,7 +3554,7 @@ sub_080542C0: @ 0x080542C0
bne _080542CA
movs r2, #1
_080542CA:
ldr r1, _080542DC @ =gUnk_02002A40
ldr r1, _080542DC @ =gSave
adds r0, r1, #0
adds r0, #0xc2
ldrh r0, [r0]
@@ -3564,7 +3564,7 @@ _080542CA:
movs r2, #0
b _080542E8
.align 2, 0
_080542DC: .4byte gUnk_02002A40
_080542DC: .4byte gSave
_080542E0:
ldr r3, _080542F0 @ =0x000003E7
cmp r2, r3
@@ -3577,4 +3577,4 @@ _080542E8:
pop {pc}
.align 2, 0
_080542F0: .4byte 0x000003E7
asm/code_0805436C.s
+5 -5
View File
@@ -57,7 +57,7 @@ sub_080548E8: @ 0x080548E8
adds r0, r0, r1
ldr r0, [r0]
bl _call_via_r0
bl sub_080AD90C
bl FlushSprites
bl sub_0805E5C0
bl sub_080AD9B0
bl sub_080AD918
@@ -1102,7 +1102,7 @@ sub_08055114: @ 0x08055114
push {r4, lr}
ldr r0, _08055150 @ =gUnk_080FF17C
bl LoadRoomEntityList
ldr r0, _08055154 @ =gUnk_02002A40
ldr r0, _08055154 @ =gSave
ldrb r0, [r0, #8]
cmp r0, #9
beq _0805512A
@@ -1127,7 +1127,7 @@ _0805512A:
pop {r4, pc}
.align 2, 0
_08055150: .4byte gUnk_080FF17C
_08055154: .4byte gUnk_02002A40
_08055154: .4byte gSave
_08055158: .4byte 0x00000DB4
_0805515C: .4byte gMenu
_08055160: .4byte gUnk_02000070
@@ -2024,7 +2024,7 @@ sub_08055834: @ 0x08055834
push {r4, lr}
ldr r0, _08055870 @ =gUnk_080FF2C0
bl LoadRoomEntityList
ldr r0, _08055874 @ =gUnk_02002A40
ldr r0, _08055874 @ =gSave
ldrb r0, [r0, #8]
cmp r0, #9
beq _0805584A
@@ -2049,7 +2049,7 @@ _0805584A:
pop {r4, pc}
.align 2, 0
_08055870: .4byte gUnk_080FF2C0
_08055874: .4byte gUnk_02002A40
_08055874: .4byte gSave
_08055878: .4byte 0x00000DB4
_0805587C: .4byte gMenu
_08055880: .4byte gUnk_02000070
asm/code_08055FF4.s
-369
View File
@@ -1,369 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_080560B8
sub_080560B8: @ 0x080560B8
push {r4, lr}
bl sub_08056134
cmp r0, #0
bne _080560F8
movs r0, #0x80
lsls r0, r0, #0x12
bl sub_0807CF30
adds r1, r0, #0
movs r0, #1
rsbs r0, r0, #0
cmp r1, r0
blt _080560E4
cmp r1, #0
ble _080560E4
cmp r1, #1
bne _080560E4
bl sub_08056134
cmp r0, #0
bne _080560F8
_080560E4:
ldr r0, _08056128 @ =gUnk_08100CD4
movs r4, #0x80
lsls r4, r4, #0x12
adds r1, r4, #0
movs r2, #0x10
bl _DmaCopy
adds r0, r4, #0
bl sub_0807CF10
_080560F8:
ldr r2, _0805612C @ =gUnk_02000010
ldr r1, [r2]
ldr r0, _08056130 @ =0x4D435A33
eors r1, r0
rsbs r0, r1, #0
orrs r0, r1
lsrs r0, r0, #0x1f
ldrb r1, [r2, #4]
cmp r1, #0
beq _08056112
cmp r1, #0xc1
beq _08056112
movs r0, #1
_08056112:
cmp r0, #0
beq _08056124
ldr r4, _0805612C @ =gUnk_02000010
adds r0, r4, #0
movs r1, #0x20
bl _DmaZero
ldr r0, _08056130 @ =0x4D435A33
str r0, [r4]
_08056124:
pop {r4, pc}
.align 2, 0
_08056128: .4byte gUnk_08100CD4
_0805612C: .4byte gUnk_02000010
_08056130: .4byte 0x4D435A33
thumb_func_start sub_08056134
sub_08056134: @ 0x08056134
push {lr}
movs r2, #0x80
lsls r2, r2, #0x12
ldr r1, [r2]
ldr r0, _08056164 @ =0x4D435A33
cmp r1, r0
bne _08056160
ldrb r0, [r2, #4]
cmp r0, #2
bhi _08056160
ldrb r0, [r2, #5]
cmp r0, #2
bhi _08056160
ldrb r0, [r2, #6]
cmp r0, #2
bhi _08056160
ldrb r0, [r2, #7]
cmp r0, #1
bne _08056160
ldrb r0, [r2, #0xe]
cmp r0, #0
beq _08056168
_08056160:
movs r0, #0
b _0805616A
.align 2, 0
_08056164: .4byte 0x4D435A33
_08056168:
movs r0, #1
_0805616A:
pop {pc}
thumb_func_start sub_0805616C
sub_0805616C: @ 0x0805616C
push {lr}
ldr r0, _080561E8 @ =0x80040000
bl PlaySFX
ldr r0, _080561EC @ =gScreen
adds r3, r0, #0
adds r3, #0x6c
ldrb r2, [r3]
adds r0, #0x6d
movs r1, #0
strb r2, [r0]
strb r1, [r3]
ldr r1, _080561F0 @ =0x040000B0
ldrh r2, [r1, #0xa]
ldr r0, _080561F4 @ =0x0000C5FF
ands r0, r2
strh r0, [r1, #0xa]
ldrh r2, [r1, #0xa]
ldr r0, _080561F8 @ =0x00007FFF
ands r0, r2
strh r0, [r1, #0xa]
ldrh r0, [r1, #0xa]
ldr r0, [r1, #8]
movs r2, #0x80
lsls r2, r2, #0x18
cmp r0, #0
bge _080561AA
_080561A2:
ldr r0, [r1, #8]
ands r0, r2
cmp r0, #0
bne _080561A2
_080561AA:
ldr r2, _080561FC @ =0x040000BC
ldr r0, [r2, #8]
movs r1, #0x80
lsls r1, r1, #0x18
cmp r0, #0
bge _080561BE
_080561B6:
ldr r0, [r2, #8]
ands r0, r1
cmp r0, #0
bne _080561B6
_080561BE:
ldr r2, _08056200 @ =0x040000C8
ldr r0, [r2, #8]
movs r1, #0x80
lsls r1, r1, #0x18
cmp r0, #0
bge _080561D2
_080561CA:
ldr r0, [r2, #8]
ands r0, r1
cmp r0, #0
bne _080561CA
_080561D2:
ldr r2, _08056204 @ =0x040000D4
ldr r0, [r2, #8]
movs r1, #0x80
lsls r1, r1, #0x18
cmp r0, #0
bge _080561E6
_080561DE:
ldr r0, [r2, #8]
ands r0, r1
cmp r0, #0
bne _080561DE
_080561E6:
pop {pc}
.align 2, 0
_080561E8: .4byte 0x80040000
_080561EC: .4byte gScreen
_080561F0: .4byte 0x040000B0
_080561F4: .4byte 0x0000C5FF
_080561F8: .4byte 0x00007FFF
_080561FC: .4byte 0x040000BC
_08056200: .4byte 0x040000C8
_08056204: .4byte 0x040000D4
thumb_func_start sub_08056208
sub_08056208: @ 0x08056208
push {lr}
ldr r0, _08056224 @ =0x80060000
bl PlaySFX
ldr r0, _08056228 @ =gScreen
adds r3, r0, #0
adds r3, #0x6d
ldrb r2, [r3]
adds r0, #0x6c
movs r1, #0
strb r2, [r0]
strb r1, [r3]
pop {pc}
.align 2, 0
_08056224: .4byte 0x80060000
_08056228: .4byte gScreen
thumb_func_start sub_0805622C
sub_0805622C: @ 0x0805622C
ldr r3, _08056248 @ =gScreen
str r0, [r3, #0x70]
str r1, [r3, #0x74]
str r2, [r3, #0x78]
adds r3, #0x6c
movs r2, #1
movs r0, #1
strb r0, [r3]
ldr r1, _0805624C @ =gUnk_03003DE4
ldrb r0, [r1]
eors r0, r2
strb r0, [r1]
bx lr
.align 2, 0
_08056248: .4byte gScreen
_0805624C: .4byte gUnk_03003DE4
thumb_func_start sub_08056250
sub_08056250: @ 0x08056250
ldr r0, _0805625C @ =gScreen
adds r0, #0x6c
movs r1, #0
strb r1, [r0]
bx lr
.align 2, 0
_0805625C: .4byte gScreen
thumb_func_start sub_08056260
sub_08056260: @ 0x08056260
push {r4, r5, r6, lr}
mov r6, sb
mov r5, r8
push {r5, r6}
movs r1, #0x80
lsls r1, r1, #0x13
movs r0, #0x80
strh r0, [r1]
ldr r1, _080562B8 @ =0x04000132
ldr r2, _080562BC @ =0x00008304
adds r0, r2, #0
strh r0, [r1]
ldr r6, _080562C0 @ =0x04000208
movs r0, #0
mov r8, r0
strh r0, [r6]
ldr r5, _080562C4 @ =0x04000200
ldrh r4, [r5]
movs r1, #0xc0
lsls r1, r1, #6
adds r0, r1, #0
strh r0, [r5]
movs r2, #1
mov sb, r2
strh r2, [r6]
bl SoundBiasReset
svc #3
bl SoundBiasSet
mov r0, r8
strh r0, [r6]
strh r4, [r5]
mov r1, sb
strh r1, [r6]
ldr r0, _080562C8 @ =gUnk_03001000
ldrb r1, [r0, #1]
mov r2, r8
strb r2, [r0, #1]
pop {r3, r4}
mov r8, r3
mov sb, r4
pop {r4, r5, r6, pc}
.align 2, 0
_080562B8: .4byte 0x04000132
_080562BC: .4byte 0x00008304
_080562C0: .4byte 0x04000208
_080562C4: .4byte 0x04000200
_080562C8: .4byte gUnk_03001000
thumb_func_start sub_080562CC
sub_080562CC: @ 0x080562CC
push {r4, r5, r6, lr}
ldr r6, _080562FC @ =gRoomControls
movs r4, #0xa
ldrsh r5, [r6, r4]
ldrh r4, [r6, #6]
subs r5, r5, r4
subs r5, r5, r0
adds r5, #0xf0
movs r4, #0xc
ldrsh r0, [r6, r4]
ldrh r4, [r6, #8]
subs r0, r0, r4
subs r0, r0, r1
adds r0, #0xa0
adds r2, #0xf0
adds r3, #0xa0
movs r1, #0
cmp r5, r2
bhs _080562F8
cmp r0, r3
bhs _080562F8
movs r1, #1
_080562F8:
adds r0, r1, #0
pop {r4, r5, r6, pc}
.align 2, 0
_080562FC: .4byte gRoomControls
thumb_func_start sub_08056300
sub_08056300: @ 0x08056300
push {r4, lr}
adds r4, r0, #0
b _0805631C
_08056306:
ldrh r0, [r4, #2]
ldrh r1, [r4, #4]
ldrh r2, [r4, #6]
ldrh r3, [r4, #8]
bl sub_080562CC
cmp r0, #0
beq _0805631A
ldrh r0, [r4]
b _08056324
_0805631A:
adds r4, #0xa
_0805631C:
ldrh r0, [r4]
cmp r0, #0xff
bne _08056306
movs r0, #0xff
_08056324:
pop {r4, pc}
.align 2, 0
thumb_func_start NulledItem
NulledItem: @ 0x08056328
push {lr}
bl DeleteThisEntity
pop {pc}
thumb_func_start sub_08056330
sub_08056330: @ 0x08056330
push {lr}
bl DeleteThisEntity
pop {pc}
thumb_func_start sub_08056338
sub_08056338: @ 0x08056338
push {lr}
movs r2, #1
rsbs r2, r2, #0
ldr r0, _08056358 @ =gTextBox
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
cmp r0, #0
bne _08056354
ldr r1, _0805635C @ =gUnk_02000040
ldrb r0, [r1]
cmp r0, #3
bne _08056354
ldrb r2, [r1, #1]
_08056354:
adds r0, r2, #0
pop {pc}
.align 2, 0
_08056358: .4byte gTextBox
_0805635C: .4byte gUnk_02000040
asm/code_08056418.s
+14 -319
View File
@@ -6,311 +6,6 @@
.text
thumb_func_start sub_08056458
sub_08056458: @ 0x08056458
push {r4, r5, lr}
ldr r0, _08056484 @ =gTextBox
ldrb r0, [r0]
cmp r0, #1
bne _08056470
ldr r0, _08056488 @ =gUnk_02022780
movs r1, #0xa8
bl _DmaZero
movs r0, #1
bl sub_080564C8
_08056470:
ldr r2, _08056488 @ =gUnk_02022780
adds r1, r2, #0
adds r1, #0x8a
ldrb r0, [r1]
cmp r0, #0
beq _0805648C
subs r0, #1
strb r0, [r1]
b _080564A2
.align 2, 0
_08056484: .4byte gTextBox
_08056488: .4byte gUnk_02022780
_0805648C:
ldr r5, _080564C0 @ =gUnk_08107BC8
adds r4, r2, #0
adds r4, #0x88
_08056492:
ldrb r0, [r4]
lsls r0, r0, #2
adds r0, r0, r5
ldr r0, [r0]
bl _call_via_r0
cmp r0, #0
bne _08056492
_080564A2:
ldr r0, _080564C4 @ =gUnk_02022780
adds r1, r0, #0
adds r1, #0x9d
ldrb r0, [r1]
cmp r0, #0
beq _080564B6
movs r0, #0
strb r0, [r1]
bl sub_08056F70
_080564B6:
bl sub_08056C68
bl sub_08056D70
pop {r4, r5, pc}
.align 2, 0
_080564C0: .4byte gUnk_08107BC8
_080564C4: .4byte gUnk_02022780
thumb_func_start sub_080564C8
sub_080564C8: @ 0x080564C8
ldr r1, _080564D8 @ =gUnk_02022780
adds r2, r1, #0
adds r2, #0x88
movs r3, #0
strb r0, [r2]
adds r1, #0x89
strb r3, [r1]
bx lr
.align 2, 0
_080564D8: .4byte gUnk_02022780
thumb_func_start sub_080564DC
sub_080564DC: @ 0x080564DC
ldr r0, _080564E8 @ =gUnk_02022780
adds r0, #0x99
movs r1, #0
strb r1, [r0]
movs r0, #0
bx lr
.align 2, 0
_080564E8: .4byte gUnk_02022780
thumb_func_start sub_080564EC
sub_080564EC: @ 0x080564EC
push {r4, lr}
ldr r0, _08056598 @ =gUnk_02036A40
movs r1, #8
bl _DmaZero
ldr r0, _0805659C @ =gUnk_02024030
movs r1, #0x18
bl _DmaZero
ldr r4, _080565A0 @ =gUnk_02022780
adds r0, r4, #0
movs r1, #0xa8
bl _DmaZero
ldr r0, _080565A4 @ =gTextBox
adds r1, r4, #0
movs r2, #0x20
bl _DmaCopy
ldrb r0, [r4, #2]
cmp r0, #0x63
bne _08056520
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r0, [r0, #5]
strb r0, [r4, #2]
_08056520:
adds r1, r4, #0
adds r1, #0x9c
movs r0, #0xff
strb r0, [r1]
adds r0, r4, #0
adds r0, #0x20
ldrh r1, [r4, #8]
bl sub_0805EEB4
adds r3, r4, #0
adds r3, #0x5c
movs r0, #2
strb r0, [r3]
movs r0, #0xe
strb r0, [r3, #1]
adds r3, #2
movs r2, #0
ldr r0, _080565A8 @ =gUnk_02002A40
adds r0, #0x80
ldrb r1, [r0]
cmp r1, #0
beq _08056560
adds r4, r0, #0
_0805654E:
strb r1, [r3]
adds r3, #1
adds r2, #1
cmp r2, #5
bhi _08056560
adds r0, r2, r4
ldrb r1, [r0]
cmp r1, #0
bne _0805654E
_08056560:
movs r0, #2
strb r0, [r3]
movs r0, #0xf
strb r0, [r3, #1]
movs r0, #0
strb r0, [r3, #2]
ldr r4, _080565A0 @ =gUnk_02022780
adds r0, r4, #0
bl sub_08056FBC
ldr r0, _080565AC @ =gUnk_08107BE0
str r0, [r4, #0x2c]
ldr r0, _080565B0 @ =gUnk_02000D00
str r0, [r4, #0x58]
adds r4, #0x54
movs r0, #0xd0
strh r0, [r4]
movs r0, #2
bl sub_08056C54
movs r0, #0
bl sub_08056BDC
movs r0, #2
bl sub_080564C8
movs r0, #1
pop {r4, pc}
.align 2, 0
_08056598: .4byte gUnk_02036A40
_0805659C: .4byte gUnk_02024030
_080565A0: .4byte gUnk_02022780
_080565A4: .4byte gTextBox
_080565A8: .4byte gUnk_02002A40
_080565AC: .4byte gUnk_08107BE0
_080565B0: .4byte gUnk_02000D00
thumb_func_start sub_080565B4
sub_080565B4: @ 0x080565B4
push {r4, lr}
ldr r4, _080565F4 @ =gUnk_02022780
adds r1, r4, #0
adds r1, #0x89
ldrb r0, [r1]
cmp r0, #0
bne _080565DA
movs r0, #1
strb r0, [r1]
adds r1, #0x10
strb r0, [r1]
ldrb r0, [r4, #3]
subs r1, #0x46
ldrb r1, [r1]
bl sub_08056F88
movs r0, #0x65
bl PlaySFX
_080565DA:
movs r0, #1
bl sub_08056CC0
cmp r0, #0
beq _080565F0
adds r1, r4, #0
adds r1, #0x99
movs r0, #2
strb r0, [r1]
bl sub_080564C8
_080565F0:
movs r0, #0
pop {r4, pc}
.align 2, 0
_080565F4: .4byte gUnk_02022780
thumb_func_start sub_080565F8
sub_080565F8: @ 0x080565F8
push {r4, lr}
ldr r4, _0805663C @ =gUnk_02022780
adds r1, r4, #0
adds r1, #0x89
ldrb r0, [r1]
cmp r0, #0
bne _0805661C
movs r0, #1
strb r0, [r1]
adds r1, #0x10
movs r0, #3
strb r0, [r1]
movs r0, #0
bl sub_08056BDC
movs r0, #0x66
bl PlaySFX
_0805661C:
movs r0, #1
rsbs r0, r0, #0
bl sub_08056CC0
cmp r0, #0
beq _08056636
adds r1, r4, #0
adds r1, #0x99
movs r0, #0
strb r0, [r1]
movs r0, #2
bl sub_080564C8
_08056636:
movs r0, #0
pop {r4, pc}
.align 2, 0
_0805663C: .4byte gUnk_02022780
thumb_func_start sub_08056640
sub_08056640: @ 0x08056640
push {lr}
movs r0, #0
bl sub_08056C54
movs r0, #0
bl sub_080564C8
movs r0, #0
pop {pc}
.align 2, 0
thumb_func_start sub_08056654
sub_08056654: @ 0x08056654
push {lr}
movs r0, #4
bl sub_08056C54
ldr r2, _0805667C @ =gUnk_08107BF4
ldr r0, _08056680 @ =gUnk_02022780
adds r1, r0, #0
adds r1, #0x89
ldrb r1, [r1]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
movs r0, #0
bl sub_08056CC0
movs r0, #0
pop {pc}
.align 2, 0
_0805667C: .4byte gUnk_08107BF4
_08056680: .4byte gUnk_02022780
thumb_func_start sub_08056684
sub_08056684: @ 0x08056684
push {r4, lr}
adds r2, r0, #0
ldr r4, _080566AC @ =gUnk_02022780
adds r0, r4, #0
adds r0, #0x20
ldrb r1, [r0]
movs r3, #1
adds r0, r3, #0
ands r0, r1
cmp r0, #0
bne _080566B0
adds r0, r4, #0
adds r0, #0x99
ldrb r0, [r0]
cmp r0, #0
bne _080566B6
movs r0, #5
bl sub_080564C8
b _080566B6
.align 2, 0
_080566AC: .4byte gUnk_02022780
_080566B0:
adds r0, r2, #0
adds r0, #0x89
strb r3, [r0]
_080566B6:
pop {r4, pc}
thumb_func_start sub_080566B8
sub_080566B8: @ 0x080566B8
push {r4, r5, r6, r7, lr}
@@ -324,7 +19,7 @@ sub_080566B8: @ 0x080566B8
strb r0, [r1]
b _0805674E
_080566CC:
ldr r0, _08056740 @ =gUnk_03000FF0
ldr r0, _08056740 @ =gInput
ldrh r1, [r0]
movs r0, #2
ands r0, r1
@@ -386,7 +81,7 @@ _08056732:
strb r1, [r0]
b _0805674E
.align 2, 0
_08056740: .4byte gUnk_03000FF0
_08056740: .4byte gInput
_08056744: .4byte gUnk_08107C0C
_08056748: .4byte gUnk_02022780
_0805674C:
@@ -727,7 +422,7 @@ sub_080569D4: @ 0x080569D4
ldr r0, _080569F0 @ =gUnk_02024030
movs r5, #3
ldrsb r5, [r0, r5]
ldr r0, _080569F4 @ =gUnk_03000FF0
ldr r0, _080569F4 @ =gInput
ldrh r0, [r0, #2]
cmp r0, #8
beq _08056A02
@@ -738,7 +433,7 @@ sub_080569D4: @ 0x080569D4
b _08056A6A
.align 2, 0
_080569F0: .4byte gUnk_02024030
_080569F4: .4byte gUnk_03000FF0
_080569F4: .4byte gInput
_080569F8:
cmp r0, #0x10
beq _08056A68
@@ -908,7 +603,7 @@ sub_08056B1C: @ 0x08056B1C
.align 2, 0
_08056B44: .4byte gTextBox
_08056B48:
ldr r0, _08056B68 @ =gUnk_03000FF0
ldr r0, _08056B68 @ =gInput
ldrh r1, [r0, #2]
ldr r0, _08056B6C @ =0x000001F3
ands r0, r1
@@ -924,7 +619,7 @@ _08056B48:
movs r0, #4
b _08056B78
.align 2, 0
_08056B68: .4byte gUnk_03000FF0
_08056B68: .4byte gInput
_08056B6C: .4byte 0x000001F3
_08056B70:
adds r1, r4, #0
@@ -970,7 +665,7 @@ sub_08056BA0: @ 0x08056BA0
beq _08056BCE
cmp r0, #2
beq _08056BC8
ldr r0, _08056BD4 @ =gUnk_03000FF0
ldr r0, _08056BD4 @ =gInput
ldrh r1, [r0, #2]
ldr r0, _08056BD8 @ =0x000001F3
ands r0, r1
@@ -983,7 +678,7 @@ _08056BCE:
pop {r4, pc}
.align 2, 0
_08056BD0: .4byte gTextBox
_08056BD4: .4byte gUnk_03000FF0
_08056BD4: .4byte gInput
_08056BD8: .4byte 0x000001F3
thumb_func_start sub_08056BDC
@@ -1071,7 +766,7 @@ sub_08056C68: @ 0x08056C68
ldrb r1, [r5, #4]
adds r0, r0, r1
lsls r0, r0, #1
ldr r1, _08056CBC @ =gUnk_02034CB0
ldr r1, _08056CBC @ =gBG0Buffer
adds r1, r0, r1
ldrb r0, [r5, #7]
adds r0, #2
@@ -1101,7 +796,7 @@ _08056CB4:
pop {r4, r5, r6, pc}
.align 2, 0
_08056CB8: .4byte gUnk_02036A38
_08056CBC: .4byte gUnk_02034CB0
_08056CBC: .4byte gBG0Buffer
thumb_func_start sub_08056CC0
sub_08056CC0: @ 0x08056CC0
@@ -1215,7 +910,7 @@ sub_08056D70: @ 0x08056D70
ldrb r1, [r4, #4]
adds r0, r0, r1
lsls r0, r0, #1
ldr r1, _08056DBC @ =gUnk_02034CB0
ldr r1, _08056DBC @ =gBG0Buffer
adds r0, r0, r1
ldr r3, _08056DC0 @ =0x0000F07B
ldrb r1, [r4, #6]
@@ -1234,7 +929,7 @@ _08056DB0:
.align 2, 0
_08056DB4: .4byte gUnk_02022780
_08056DB8: .4byte gUnk_02036A40
_08056DBC: .4byte gUnk_02034CB0
_08056DBC: .4byte gBG0Buffer
_08056DC0: .4byte 0x0000F07B
_08056DC4: .4byte gUnk_02036A38
@@ -1438,7 +1133,7 @@ sub_08056F1C: @ 0x08056F1C
ldrb r0, [r2, #4]
adds r1, r1, r0
lsls r1, r1, #1
ldr r0, _08056F68 @ =gUnk_02034CB0
ldr r0, _08056F68 @ =gBG0Buffer
adds r1, r1, r0
ldrb r0, [r2, #7]
adds r0, #1
@@ -1458,7 +1153,7 @@ _08056F58: .4byte gUnk_02022780
_08056F5C: .4byte 0x0010FF00
_08056F60: .4byte 0x00100200
_08056F64: .4byte gUnk_02036A40
_08056F68: .4byte gUnk_02034CB0
_08056F68: .4byte gBG0Buffer
_08056F6C: .4byte 0x0000F080
thumb_func_start sub_08056F70
asm/code_0805EC04.s
+3 -838
View File
@@ -4,167 +4,6 @@
.syntax unified
.text
thumb_func_start sub_0805EC04
sub_0805EC04: @ 0x0805EC04
push {r4, r5, r6, r7, lr}
adds r3, r0, #0
movs r2, #1
ldr r0, _0805EC4C @ =gUnk_03000000
movs r5, #1
movs r6, #0x3f
rsbs r6, r6, #0
movs r7, #4
rsbs r7, r7, #0
adds r4, r0, #0
adds r4, #8
_0805EC1A:
ldr r0, _0805EC50 @ =0x00000426
adds r1, r4, r0
ldrb r0, [r1]
cmp r0, #0
bne _0805EC54
strb r5, [r1]
movs r0, #0x1f
ands r2, r0
lsls r2, r2, #1
ldrb r1, [r3, #0x1b]
adds r0, r6, #0
ands r0, r1
orrs r0, r2
strb r0, [r3, #0x1b]
ldrb r2, [r3, #0x19]
lsls r1, r2, #0x1e
lsrs r1, r1, #0x1e
orrs r1, r5
adds r0, r7, #0
ands r0, r2
orrs r0, r1
strb r0, [r3, #0x19]
movs r0, #1
b _0805EC5E
.align 2, 0
_0805EC4C: .4byte gUnk_03000000
_0805EC50: .4byte 0x00000426
_0805EC54:
adds r4, #8
adds r2, #1
cmp r2, #0x1f
bls _0805EC1A
movs r0, #0
_0805EC5E:
pop {r4, r5, r6, r7, pc}
thumb_func_start sub_0805EC60
sub_0805EC60: @ 0x0805EC60
push {lr}
adds r3, r0, #0
ldrb r1, [r3, #0x19]
lsls r0, r1, #0x1e
cmp r0, #0
beq _0805EC90
movs r0, #4
rsbs r0, r0, #0
ands r0, r1
strb r0, [r3, #0x19]
ldrb r2, [r3, #0x1b]
lsls r1, r2, #0x1a
lsrs r1, r1, #0x1b
movs r0, #0x3f
rsbs r0, r0, #0
ands r0, r2
strb r0, [r3, #0x1b]
ldr r0, _0805EC94 @ =gUnk_03000000
lsls r1, r1, #3
adds r1, r1, r0
ldr r0, _0805EC98 @ =0x00000426
adds r1, r1, r0
movs r0, #0
strb r0, [r1]
_0805EC90:
pop {pc}
.align 2, 0
_0805EC94: .4byte gUnk_03000000
_0805EC98: .4byte 0x00000426
thumb_func_start sub_0805EC9C
sub_0805EC9C: @ 0x0805EC9C
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
adds r5, r1, #0
adds r6, r2, #0
adds r7, r3, #0
ldrb r0, [r4, #0x1b]
lsls r0, r0, #0x1a
lsrs r0, r0, #0x1b
cmp r0, #0
bne _0805ECBE
adds r0, r4, #0
bl sub_0805EC04
cmp r0, #0
bne _0805ECBE
movs r0, #0
b _0805ECE0
_0805ECBE:
ldr r1, _0805ECE4 @ =gUnk_03000000
ldr r0, _0805ECE8 @ =0x00000427
adds r2, r1, r0
movs r0, #1
strb r0, [r2]
ldrb r0, [r4, #0x1b]
lsls r0, r0, #0x1a
lsrs r0, r0, #0x1b
lsls r0, r0, #3
movs r2, #0x84
lsls r2, r2, #3
adds r1, r1, r2
adds r0, r0, r1
strh r5, [r0]
strh r6, [r0, #2]
strh r7, [r0, #4]
movs r0, #1
_0805ECE0:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0805ECE4: .4byte gUnk_03000000
_0805ECE8: .4byte 0x00000427
thumb_func_start sub_0805ECEC
sub_0805ECEC: @ 0x0805ECEC
push {r4, r5, r6, lr}
ldr r5, _0805ED0C @ =gUnk_03000000
ldr r4, _0805ED10 @ =0x00000427
adds r6, r5, r4
movs r4, #1
strb r4, [r6]
lsls r0, r0, #3
movs r4, #0x84
lsls r4, r4, #3
adds r5, r5, r4
adds r0, r0, r5
strh r1, [r0]
strh r2, [r0, #2]
strh r3, [r0, #4]
pop {r4, r5, r6, pc}
.align 2, 0
_0805ED0C: .4byte gUnk_03000000
_0805ED10: .4byte 0x00000427
thumb_func_start sub_0805ED14
sub_0805ED14: @ 0x0805ED14
ldr r2, _0805ED2C @ =gPlayerState
adds r1, r2, #0
adds r1, #0x9c
str r0, [r1]
adds r0, r2, #0
adds r0, #0x98
movs r1, #0
strh r1, [r0]
adds r0, #2
strh r1, [r0]
bx lr
.align 2, 0
_0805ED2C: .4byte gPlayerState
thumb_func_start sub_0805ED30
sub_0805ED30: @ 0x0805ED30
@@ -246,14 +85,14 @@ _0805EDAC:
_0805EDB4:
movs r0, #0
strb r0, [r2]
ldr r0, _0805EDF8 @ =gUnk_03000FF0
ldr r0, _0805EDF8 @ =gInput
ldrh r0, [r0]
bl sub_0805EE04
adds r1, r4, #0
adds r1, #0x90
strh r0, [r1]
_0805EDC6:
ldr r0, _0805EDF8 @ =gUnk_03000FF0
ldr r0, _0805EDF8 @ =gInput
ldrh r1, [r0]
_0805EDCA:
adds r0, r1, #0
@@ -278,7 +117,7 @@ _0805EDCA:
strb r0, [r3, #0xd]
pop {r4, pc}
.align 2, 0
_0805EDF8: .4byte gUnk_03000FF0
_0805EDF8: .4byte gInput
_0805EDFC: .4byte gPlayerState
_0805EE00: .4byte gUnk_08109202
@@ -1579,677 +1418,3 @@ _0805F7D2:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_0805F7DC
sub_0805F7DC: @ 0x0805F7DC
push {r4, r5, r6, r7, lr}
adds r6, r0, #0
adds r4, r1, #0
ldrh r0, [r4, #4]
ldrh r1, [r4, #6]
cmp r0, r1
bhi _0805F7EE
movs r0, #0
b _0805F81E
_0805F7EE:
adds r0, r6, #0
bl sub_0805F25C
adds r5, r0, #0
ldrh r7, [r4, #6]
lsrs r0, r6, #8
cmp r0, #4
bls _0805F808
adds r0, r4, #0
adds r1, r5, #0
bl sub_0805F820
adds r5, #0x40
_0805F808:
adds r0, r4, #0
adds r1, r5, #0
bl sub_0805F820
ldrh r1, [r4, #4]
ldrh r0, [r4, #6]
cmp r0, r1
bls _0805F81A
strh r1, [r4, #6]
_0805F81A:
ldrh r0, [r4, #6]
subs r0, r0, r7
_0805F81E:
pop {r4, r5, r6, r7, pc}
thumb_func_start sub_0805F820
sub_0805F820: @ 0x0805F820
push {r4, r5, r6, r7, lr}
mov r7, sb
mov r6, r8
push {r6, r7}
adds r7, r0, #0
adds r4, r1, #0
ldrh r0, [r7, #4]
ldrh r1, [r7, #6]
subs r0, r0, r1
cmp r0, #0
ble _0805F8DC
ldr r1, _0805F854 @ =gUnk_02036A58
adds r0, r4, #0
bl sub_08002724
ldrb r0, [r7, #1]
cmp r0, #0
bne _0805F858
ldr r0, [r4]
bl sub_0805F7A0
movs r1, #0xf
ands r1, r0
lsrs r4, r0, #8
b _0805F85C
.align 2, 0
_0805F854: .4byte gUnk_02036A58
_0805F858:
movs r1, #0
movs r4, #8
_0805F85C:
ldrh r0, [r7, #4]
ldrh r3, [r7, #6]
subs r0, r0, r3
cmp r0, #8
ble _0805F868
movs r0, #8
_0805F868:
cmp r0, r4
bge _0805F86E
adds r4, r0, #0
_0805F86E:
ldr r0, _0805F8BC @ =gUnk_02036A58
adds r6, r1, r0
ldr r0, [r7, #8]
mov sb, r0
ldrb r0, [r7, #3]
lsls r2, r0, #1
adds r2, r2, r0
lsls r2, r2, #6
ldrb r0, [r7, #2]
lsls r0, r0, #5
ldr r1, _0805F8C0 @ =gUnk_0810942E
adds r0, r0, r1
adds r2, r2, r0
mov r8, r2
adds r5, r3, #0
adds r0, r5, r4
strh r0, [r7, #6]
ldrb r0, [r7]
lsrs r0, r0, #4
cmp r0, #1
beq _0805F8D4
adds r0, r4, #0
subs r4, #1
cmp r0, #0
ble _0805F8DC
_0805F8A0:
adds r0, r6, #0
mov r1, sb
mov r2, r8
adds r3, r5, #0
bl sub_080026C4
adds r6, #1
adds r5, #1
adds r0, r4, #0
subs r4, #1
cmp r0, #0
bgt _0805F8A0
b _0805F8DC
.align 2, 0
_0805F8BC: .4byte gUnk_02036A58
_0805F8C0: .4byte gUnk_0810942E
_0805F8C4:
adds r0, r6, #0
mov r1, sb
mov r2, r8
adds r3, r5, #0
bl sub_080026F2
adds r6, #1
adds r5, #1
_0805F8D4:
adds r0, r4, #0
subs r4, #1
cmp r0, #0
bgt _0805F8C4
_0805F8DC:
pop {r3, r4}
mov r8, r3
mov sb, r4
pop {r4, r5, r6, r7, pc}
thumb_func_start sub_0805F8E4
sub_0805F8E4: @ 0x0805F8E4
push {r4, r5, lr}
adds r4, r1, #0
ldrb r5, [r4, #1]
movs r1, #1
strb r1, [r4, #1]
adds r1, r4, #0
bl sub_0805F7DC
strb r5, [r4, #1]
pop {r4, r5, pc}
thumb_func_start sub_0805F8F8
sub_0805F8F8: @ 0x0805F8F8
lsls r1, r0, #1
adds r1, r1, r0
lsls r1, r1, #6
ldr r0, _0805F910 @ =gUnk_081094CE
adds r1, r1, r0
ldr r2, _0805F914 @ =gUnk_0810926C
ldrb r0, [r1, #0xa]
lsls r0, r0, #2
adds r0, r0, r2
ldr r0, [r0]
bx lr
.align 2, 0
_0805F910: .4byte gUnk_081094CE
_0805F914: .4byte gUnk_0810926C
thumb_func_start sub_0805F918
sub_0805F918: @ 0x0805F918
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
mov r5, r8
push {r5, r6, r7}
adds r4, r0, #0
adds r5, r1, #0
mov sl, r2
adds r0, r5, #0
bl sub_0805F8F8
ldr r1, _0805F990 @ =gUnk_02036AD8
movs r2, #0xe0
bl _DmaFill32
ldr r0, _0805F994 @ =gUnk_081092AC
lsls r4, r4, #2
adds r4, r4, r0
ldr r4, [r4]
mov r8, r4
lsls r0, r5, #1
adds r0, r0, r5
lsls r0, r0, #6
ldr r1, _0805F998 @ =gUnk_081094CE
adds r0, r0, r1
mov sb, r0
movs r7, #0
movs r6, #0
_0805F950:
ldr r4, _0805F99C @ =gUnk_02036A58
mov r0, r8
adds r1, r4, #0
bl sub_08002724
movs r0, #0x40
add r8, r0
movs r5, #0
adds r6, #1
_0805F962:
adds r0, r4, #0
ldr r1, _0805F990 @ =gUnk_02036AD8
mov r2, sb
adds r3, r7, #0
bl sub_080026C4
adds r4, #1
adds r7, #1
adds r5, #1
cmp r5, #7
bls _0805F962
cmp r6, #2
bls _0805F950
ldr r0, _0805F990 @ =gUnk_02036AD8
mov r1, sl
movs r2, #0xe0
bl LoadAssetAsync
pop {r3, r4, r5}
mov r8, r3
mov sb, r4
mov sl, r5
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0805F990: .4byte gUnk_02036AD8
_0805F994: .4byte gUnk_081092AC
_0805F998: .4byte gUnk_081094CE
_0805F99C: .4byte gUnk_02036A58
thumb_func_start sub_0805F9A0
sub_0805F9A0: @ 0x0805F9A0
push {lr}
adds r2, r0, #0
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r0, [r0, #7]
cmp r0, #0
bne _0805F9D0
ldr r1, _0805F9C4 @ =gUnk_081092D4
movs r3, #0
_0805F9B2:
ldrh r0, [r1]
cmp r0, r2
beq _0805F9C8
adds r3, #1
adds r1, #2
ldrh r0, [r1]
cmp r0, #0
bne _0805F9B2
b _0805F9D8
.align 2, 0
_0805F9C4: .4byte gUnk_081092D4
_0805F9C8:
movs r1, #0x80
lsls r1, r1, #4
adds r0, r3, r1
b _0805F9E2
_0805F9D0:
ldr r0, _0805F9E4 @ =0x0000031A
cmp r2, r0
bne _0805F9D8
movs r2, #1
_0805F9D8:
movs r0, #0xff
ands r0, r2
movs r1, #0x80
lsls r1, r1, #4
adds r0, r0, r1
_0805F9E2:
pop {pc}
.align 2, 0
_0805F9E4: .4byte 0x0000031A
thumb_func_start HandleDebugTextScreen
HandleDebugTextScreen: @ 0x0805F9E8
push {lr}
ldr r1, _0805F9FC @ =gUnk_08109A30
ldr r0, _0805FA00 @ =gUnk_03001000
ldrb r0, [r0, #3]
lsls r0, r0, #2
adds r0, r0, r1
ldr r0, [r0]
bl _call_via_r0
pop {pc}
.align 2, 0
_0805F9FC: .4byte gUnk_08109A30
_0805FA00: .4byte gUnk_03001000
thumb_func_start sub_0805FA04
sub_0805FA04: @ 0x0805FA04
push {r4, r5, lr}
movs r0, #1
bl sub_0801DA90
ldr r0, _0805FA78 @ =gUnk_02034CB0
movs r1, #0x80
lsls r1, r1, #4
bl _DmaZero
ldr r0, _0805FA7C @ =gUnk_02001A40
movs r1, #0x80
lsls r1, r1, #5
bl _DmaZero
ldr r0, _0805FA80 @ =gScreen
movs r2, #0
movs r1, #0x94
lsls r1, r1, #4
strh r1, [r0]
strh r2, [r0, #0xa]
strh r2, [r0, #0xc]
strh r2, [r0, #0x2e]
strh r2, [r0, #0x30]
ldr r1, _0805FA84 @ =0x00001E0F
strh r1, [r0, #0x2c]
movs r5, #1
movs r1, #1
strh r1, [r0, #0x32]
bl sub_08056418
ldr r0, _0805FA88 @ =gUnk_02032EC0
movs r1, #0xed
lsls r1, r1, #2
bl _DmaZero
ldr r4, _0805FA8C @ =gMenu
adds r0, r4, #0
movs r1, #0x30
bl _DmaZero
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r0, [r0, #7]
strb r0, [r4, #0x16]
bl sub_08053320
ldr r1, _0805FA90 @ =0x00001144
movs r0, #0
bl sub_0801D79C
ldr r0, _0805FA94 @ =gUnk_03001000
strb r5, [r0, #3]
bl sub_080A3210
bl sub_08050008
pop {r4, r5, pc}
.align 2, 0
_0805FA78: .4byte gUnk_02034CB0
_0805FA7C: .4byte gUnk_02001A40
_0805FA80: .4byte gScreen
_0805FA84: .4byte 0x00001E0F
_0805FA88: .4byte gUnk_02032EC0
_0805FA8C: .4byte gMenu
_0805FA90: .4byte 0x00001144
_0805FA94: .4byte gUnk_03001000
thumb_func_start sub_0805FA98
sub_0805FA98: @ 0x0805FA98
push {r4, lr}
ldr r0, _0805FAB4 @ =gUnk_03000FF0
ldrh r1, [r0, #2]
adds r2, r0, #0
cmp r1, #0x80
beq _0805FAD8
cmp r1, #0x80
bgt _0805FAB8
cmp r1, #2
beq _0805FB44
cmp r1, #0x40
beq _0805FACA
b _0805FB4A
.align 2, 0
_0805FAB4: .4byte gUnk_03000FF0
_0805FAB8:
movs r0, #0x80
lsls r0, r0, #1
cmp r1, r0
beq _0805FB28
movs r0, #0x80
lsls r0, r0, #2
cmp r1, r0
beq _0805FAE8
b _0805FB4A
_0805FACA:
ldr r1, _0805FAD4 @ =gMenu
ldrb r0, [r1, #0x11]
subs r0, #1
strb r0, [r1, #0x11]
b _0805FBA4
.align 2, 0
_0805FAD4: .4byte gMenu
_0805FAD8:
ldr r1, _0805FAE4 @ =gMenu
ldrb r0, [r1, #0x11]
adds r0, #1
strb r0, [r1, #0x11]
b _0805FBA4
.align 2, 0
_0805FAE4: .4byte gMenu
_0805FAE8:
ldr r0, _0805FB04 @ =gMenu
ldrb r1, [r0, #0x10]
movs r2, #1
eors r1, r2
strb r1, [r0, #0x10]
cmp r1, #0
bne _0805FB10
ldr r0, _0805FB08 @ =gScreen
ldr r1, _0805FB0C @ =0x00001F0C
strh r1, [r0, #8]
subs r1, #0xfd
strh r1, [r0, #0x2c]
b _0805FBA4
.align 2, 0
_0805FB04: .4byte gMenu
_0805FB08: .4byte gScreen
_0805FB0C: .4byte 0x00001F0C
_0805FB10:
ldr r0, _0805FB1C @ =gScreen
ldr r1, _0805FB20 @ =0x00001F0F
strh r1, [r0, #8]
ldr r1, _0805FB24 @ =0x00001E0C
strh r1, [r0, #0x2c]
b _0805FBA4
.align 2, 0
_0805FB1C: .4byte gScreen
_0805FB20: .4byte 0x00001F0F
_0805FB24: .4byte 0x00001E0C
_0805FB28:
movs r2, #0x80
lsls r2, r2, #0x12
ldr r1, _0805FB40 @ =gMenu
ldrb r0, [r1, #0x16]
strb r0, [r2, #7]
ldrb r0, [r1, #0x14]
lsls r0, r0, #8
ldrb r1, [r1, #0x15]
adds r0, r0, r1
bl TextboxNoOverlapFollow
b _0805FBA4
.align 2, 0
_0805FB40: .4byte gMenu
_0805FB44:
bl sub_08056418
b _0805FBA4
_0805FB4A:
ldrh r0, [r2, #4]
cmp r0, #0x10
beq _0805FB5A
cmp r0, #0x20
bne _0805FB5E
movs r1, #1
rsbs r1, r1, #0
b _0805FB60
_0805FB5A:
movs r1, #1
b _0805FB60
_0805FB5E:
movs r1, #0
_0805FB60:
ldr r4, _0805FB74 @ =gMenu
ldrb r0, [r4, #0x11]
cmp r0, #1
beq _0805FB8E
cmp r0, #1
bgt _0805FB78
cmp r0, #0
beq _0805FB7E
b _0805FBA4
.align 2, 0
_0805FB74: .4byte gMenu
_0805FB78:
cmp r0, #2
beq _0805FB96
b _0805FBA4
_0805FB7E:
ldrb r0, [r4, #0x14]
adds r0, r0, r1
adds r0, #0x50
movs r1, #0x50
bl __modsi3
strb r0, [r4, #0x14]
b _0805FBA4
_0805FB8E:
ldrb r0, [r4, #0x15]
adds r0, r0, r1
strb r0, [r4, #0x15]
b _0805FBA4
_0805FB96:
ldrb r0, [r4, #0x16]
adds r0, r0, r1
adds r0, #7
movs r1, #7
bl __modsi3
strb r0, [r4, #0x16]
_0805FBA4:
ldr r4, _0805FBBC @ =gMenu
ldrb r0, [r4, #0x11]
adds r0, #3
movs r1, #3
bl __modsi3
strb r0, [r4, #0x11]
ldr r1, _0805FBC0 @ =gScreen
movs r0, #1
strh r0, [r1, #0x32]
pop {r4, pc}
.align 2, 0
_0805FBBC: .4byte gMenu
_0805FBC0: .4byte gScreen
thumb_func_start sub_0805FBC4
sub_0805FBC4: @ 0x0805FBC4
push {lr}
movs r0, #0
bl InitScreen
pop {pc}
.align 2, 0
thumb_func_start sub_0805FBD0
sub_0805FBD0: @ 0x0805FBD0
push {lr}
ldr r2, _0805FBE4 @ =gUnk_08109AC8
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_0805FBE4: .4byte gUnk_08109AC8
thumb_func_start sub_0805FBE8
sub_0805FBE8: @ 0x0805FBE8
push {r4, r5, lr}
adds r5, r0, #0
ldr r4, _0805FC68 @ =gPlayerEntity
adds r0, r4, #0
adds r1, r5, #0
bl CopyPosition
ldrb r0, [r5, #0xc]
adds r0, #1
strb r0, [r5, #0xc]
ldrb r1, [r5, #0x18]
movs r0, #4
rsbs r0, r0, #0
ands r0, r1
movs r1, #1
orrs r0, r1
strb r0, [r5, #0x18]
adds r4, #0x3c
ldrb r0, [r4]
adds r0, #1
adds r1, r5, #0
adds r1, #0x3c
strb r0, [r1]
ldr r0, _0805FC6C @ =gUnk_08109AD0
str r0, [r5, #0x48]
movs r0, #0xe0
lsls r0, r0, #2
strh r0, [r5, #0x24]
ldrb r1, [r5, #0x14]
movs r0, #0x7f
ands r0, r1
strb r0, [r5, #0x14]
adds r0, r5, #0
adds r0, #0x38
ldrb r0, [r0]
cmp r0, #2
bne _0805FC36
movs r0, #1
strb r0, [r5, #0xb]
_0805FC36:
ldrb r1, [r5, #0x14]
lsls r0, r1, #2
strb r0, [r5, #0x15]
movs r0, #0x3c
str r0, [r5, #0x6c]
lsls r1, r1, #0x18
lsrs r1, r1, #0x19
adds r1, #0xc
adds r0, r5, #0
bl InitializeAnimation
adds r0, r5, #0
bl sub_0801766C
adds r0, r5, #0
bl sub_0806F69C
adds r0, r5, #0
bl sub_0805FC74
ldr r0, _0805FC70 @ =0x0000013F
bl PlaySFX
pop {r4, r5, pc}
.align 2, 0
_0805FC68: .4byte gPlayerEntity
_0805FC6C: .4byte gUnk_08109AD0
_0805FC70: .4byte 0x0000013F
thumb_func_start sub_0805FC74
sub_0805FC74: @ 0x0805FC74
push {r4, r5, lr}
adds r4, r0, #0
ldr r0, [r4, #0x6c]
subs r0, #1
str r0, [r4, #0x6c]
movs r1, #1
rsbs r1, r1, #0
cmp r0, r1
beq _0805FD1C
adds r0, r4, #0
bl GetNextFrame
adds r0, r4, #0
bl sub_0806F69C
ldrb r0, [r4, #0xe]
adds r0, #1
strb r0, [r4, #0xe]
ldrb r0, [r4, #0xb]
cmp r0, #0
bne _0805FCA4
adds r0, r4, #0
bl sub_0800451C
_0805FCA4:
movs r1, #0x2e
ldrsh r0, [r4, r1]
ldr r2, _0805FD10 @ =gRoomControls
ldrh r1, [r2, #6]
subs r0, r0, r1
asrs r0, r0, #4
movs r3, #0x3f
ands r0, r3
movs r5, #0x32
ldrsh r1, [r4, r5]
ldrh r2, [r2, #8]
subs r1, r1, r2
asrs r1, r1, #4
ands r1, r3
lsls r1, r1, #6
orrs r0, r1
ldr r1, _0805FD14 @ =gPlayerEntity
adds r1, #0x38
ldrb r1, [r1]
movs r2, #0x80
bl sub_080002F0
cmp r0, #0
bne _0805FCF6
ldr r1, _0805FD18 @ =gUnk_08003E44
movs r0, #0x2e
ldrsh r2, [r4, r0]
movs r5, #0x32
ldrsh r3, [r4, r5]
adds r0, r4, #0
bl sub_080040D8
cmp r0, #0
beq _0805FCF6
adds r0, r4, #0
movs r1, #0x19
movs r2, #0
bl CreateFx
bl DeleteThisEntity
_0805FCF6:
adds r0, r4, #0
adds r0, #0x41
ldrb r0, [r0]
cmp r0, #0
beq _0805FD20
adds r0, r4, #0
movs r1, #0x19
movs r2, #0
bl CreateFx
bl DeleteThisEntity
b _0805FD20
.align 2, 0
_0805FD10: .4byte gRoomControls
_0805FD14: .4byte gPlayerEntity
_0805FD18: .4byte gUnk_08003E44
_0805FD1C:
bl DeleteThisEntity
_0805FD20:
pop {r4, r5, pc}
.align 2, 0
asm/code_0806EC20.s
+1 -1
View File
@@ -167,4 +167,4 @@ _0806ECD0:
_0806ED4A:
pop {r4, r5, pc}
.align 2, 0
_0806ED4C: .4byte gUnk_08114EE4
_0806ED4C: .4byte gUnk_08114EE4
asm/code_0806ED78.s
+2 -2
View File
@@ -598,7 +598,7 @@ sub_0806F188: @ 0x0806F188
adds r1, r0, #0
cmp r1, #0
beq _0806F1A0
ldr r0, _0806F1A4 @ =gUnk_02002A40
ldr r0, _0806F1A4 @ =gSave
ldr r2, _0806F1A8 @ =0x000001C1
adds r0, r0, r2
adds r0, r1, r0
@@ -607,7 +607,7 @@ sub_0806F188: @ 0x0806F188
_0806F1A0:
pop {pc}
.align 2, 0
_0806F1A4: .4byte gUnk_02002A40
_0806F1A4: .4byte gSave
_0806F1A8: .4byte 0x000001C1
thumb_func_start ShowNPCDialogue
asm/code_0806FA6C.s
+6 -6
View File
@@ -802,7 +802,7 @@ sub_0807007C: @ 0x0807007C
beq _080700C4
ldrh r0, [r2, #2]
lsls r0, r0, #4
ldr r1, _080700C0 @ =gUnk_080029B4
ldr r1, _080700C0 @ =gSpritePtrs
adds r3, r0, r1
ldr r1, [r3, #4]
cmp r1, #0
@@ -820,7 +820,7 @@ sub_0807007C: @ 0x0807007C
movs r0, #1
b _080700C6
.align 2, 0
_080700C0: .4byte gUnk_080029B4
_080700C0: .4byte gSpritePtrs
_080700C4:
movs r0, #0
_080700C6:
@@ -1462,7 +1462,7 @@ _080705A8: .4byte gUnk_02034490
thumb_func_start sub_080705AC
sub_080705AC: @ 0x080705AC
push {lr}
ldr r0, _08070614 @ =gUnk_03000FF0
ldr r0, _08070614 @ =gInput
ldrh r1, [r0, #2]
movs r0, #8
ands r0, r1
@@ -1482,7 +1482,7 @@ sub_080705AC: @ 0x080705AC
ands r0, r1
cmp r0, #0
bne _08070674
ldr r1, _08070624 @ =gUnk_02002A40
ldr r1, _08070624 @ =gSave
adds r0, r1, #0
adds r0, #0xaa
ldrb r0, [r0]
@@ -1513,11 +1513,11 @@ sub_080705AC: @ 0x080705AC
ldrb r0, [r0]
b _08070632
.align 2, 0
_08070614: .4byte gUnk_03000FF0
_08070614: .4byte gInput
_08070618: .4byte gFadeControl
_0807061C: .4byte gUnk_02034490
_08070620: .4byte gTextBox
_08070624: .4byte gUnk_02002A40
_08070624: .4byte gSave
_08070628: .4byte gPlayerState
_0807062C: .4byte gUnk_03003DC0
_08070630:
asm/code_08070698.s
+2 -1677
View File
File diff suppressed because it is too large Load Diff
asm/code_080732D0.s
+12 -12
View File
@@ -2319,7 +2319,7 @@ sub_0807441C: @ 0x0807441C
ldrb r0, [r0]
cmp r0, #4
bne _08074502
ldr r6, _08074444 @ =gUnk_02002A40
ldr r6, _08074444 @ =gSave
adds r4, r6, #0
adds r4, #0xb4
ldrb r0, [r4]
@@ -2330,7 +2330,7 @@ sub_0807441C: @ 0x0807441C
b _0807444E
.align 2, 0
_08074440: .4byte gPlayerState
_08074444: .4byte gUnk_02002A40
_08074444: .4byte gSave
_08074448:
adds r0, r6, #0
adds r0, #0xb5
@@ -3437,7 +3437,7 @@ sub_08074C68: @ 0x08074C68
adds r0, r4, #0
adds r0, #0x84
ldr r1, [r0]
ldr r0, _08074CA4 @ =gUnk_02022750
ldr r0, _08074CA4 @ =gPlayerScriptExecutionContext
cmp r1, r0
bne _08074CF2
movs r0, #1
@@ -3449,7 +3449,7 @@ sub_08074C68: @ 0x08074C68
b _08074CF2
.align 2, 0
_08074CA0: .4byte gPlayerState
_08074CA4: .4byte gUnk_02022750
_08074CA4: .4byte gPlayerScriptExecutionContext
_08074CA8:
ldrb r1, [r4, #0x18]
movs r0, #4
@@ -4195,7 +4195,7 @@ sub_080751E8: @ 0x080751E8
adds r7, r0, #0
adds r5, r1, #0
adds r6, r2, #0
ldr r4, _08075230 @ =gUnk_02022750
ldr r4, _08075230 @ =gPlayerScriptExecutionContext
adds r0, r4, #0
movs r1, #0x24
bl _DmaZero
@@ -4226,7 +4226,7 @@ sub_080751E8: @ 0x080751E8
ldr r6, _0807523C @ =gUnk_08009ECC
b _08075244
.align 2, 0
_08075230: .4byte gUnk_02022750
_08075230: .4byte gPlayerScriptExecutionContext
_08075234: .4byte gPlayerEntity
_08075238: .4byte gPlayerState
_0807523C: .4byte gUnk_08009ECC
@@ -5810,7 +5810,7 @@ sub_08075E40: @ 0x08075E40
movs r0, #0x7f
ands r0, r1
strb r0, [r4, #9]
ldr r0, _08075EA4 @ =gUnk_02002A40
ldr r0, _08075EA4 @ =gSave
adds r0, #0xad
ldrb r0, [r0]
cmp r0, #0
@@ -5825,7 +5825,7 @@ sub_08075E40: @ 0x08075E40
b _08075EB8
.align 2, 0
_08075EA0: .4byte gPlayerState
_08075EA4: .4byte gUnk_02002A40
_08075EA4: .4byte gSave
_08075EA8:
adds r1, r6, #0
adds r1, #0x21
@@ -5845,7 +5845,7 @@ sub_08075EC0: @ 0x08075EC0
push {r4, r5, r6, lr}
adds r4, r0, #0
adds r6, r1, #0
ldr r0, _08075F04 @ =gUnk_02002A40
ldr r0, _08075F04 @ =gSave
adds r0, #0xad
ldrb r5, [r0]
adds r0, r4, #0
@@ -5875,7 +5875,7 @@ _08075EF0:
bl sub_08077E78
b _08075F32
.align 2, 0
_08075F04: .4byte gUnk_02002A40
_08075F04: .4byte gSave
_08075F08: .4byte gPlayerState
_08075F0C:
ldr r2, _08075F34 @ =gPlayerState
@@ -7323,7 +7323,7 @@ _080769CC:
adds r5, r0, #0
cmp r5, #0
beq _08076A70
ldr r6, _08076A34 @ =gUnk_02002A40
ldr r6, _08076A34 @ =gSave
adds r4, r6, #0
adds r4, #0xb4
ldrb r0, [r4]
@@ -7333,7 +7333,7 @@ _080769CC:
ldrb r1, [r4]
b _08076A3E
.align 2, 0
_08076A34: .4byte gUnk_02002A40
_08076A34: .4byte gSave
_08076A38:
adds r0, r6, #0
adds r0, #0xb5
asm/code_08076C80.s
+11 -11
View File
@@ -939,7 +939,7 @@ sub_08077534: @ 0x08077534
orrs r0, r1
strb r0, [r4, #9]
ldrb r1, [r4, #1]
ldr r0, _08077574 @ =gUnk_02002A40
ldr r0, _08077574 @ =gSave
adds r0, r0, r1
adds r0, #0x9a
ldrb r0, [r0]
@@ -955,7 +955,7 @@ sub_08077534: @ 0x08077534
mov pc, r0
.align 2, 0
_08077570: .4byte gPlayerEntity
_08077574: .4byte gUnk_02002A40
_08077574: .4byte gSave
_08077578: .4byte _0807757C
_0807757C: @ jump table
.4byte _080775C4 @ case 0
@@ -1125,7 +1125,7 @@ sub_08077698: @ 0x08077698
bl sub_080777A0
cmp r0, #0
bne _08077700
ldr r4, _08077720 @ =gUnk_02002A40
ldr r4, _08077720 @ =gSave
adds r0, r4, #0
adds r0, #0xb4
ldrb r0, [r0]
@@ -1156,7 +1156,7 @@ _08077712:
pop {r4, r5, pc}
.align 2, 0
_0807771C: .4byte gPlayerState
_08077720: .4byte gUnk_02002A40
_08077720: .4byte gSave
_08077724: .4byte gUnk_03000B80
thumb_func_start sub_08077728
@@ -1164,7 +1164,7 @@ sub_08077728: @ 0x08077728
push {lr}
cmp r0, #0
bne _08077744
ldr r0, _08077740 @ =gUnk_02002A40
ldr r0, _08077740 @ =gSave
adds r0, #0xb4
ldrb r0, [r0]
movs r1, #1
@@ -1172,9 +1172,9 @@ sub_08077728: @ 0x08077728
bl sub_08077880
b _08077752
.align 2, 0
_08077740: .4byte gUnk_02002A40
_08077740: .4byte gSave
_08077744:
ldr r0, _08077754 @ =gUnk_02002A40
ldr r0, _08077754 @ =gSave
adds r0, #0xb5
ldrb r0, [r0]
movs r1, #2
@@ -1183,7 +1183,7 @@ _08077744:
_08077752:
pop {pc}
.align 2, 0
_08077754: .4byte gUnk_02002A40
_08077754: .4byte gSave
thumb_func_start sub_08077758
sub_08077758: @ 0x08077758
@@ -1640,7 +1640,7 @@ _08077A96:
thumb_func_start sub_08077A98
sub_08077A98: @ 0x08077A98
push {lr}
ldr r0, _08077AB8 @ =gUnk_02002A40
ldr r0, _08077AB8 @ =gSave
adds r0, #0xac
ldrb r0, [r0]
cmp r0, #0
@@ -1656,7 +1656,7 @@ sub_08077A98: @ 0x08077A98
adds r0, r1, #0
b _08077AC6
.align 2, 0
_08077AB8: .4byte gUnk_02002A40
_08077AB8: .4byte gSave
_08077ABC: .4byte gPlayerState
_08077AC0: .4byte gUnk_03000B80
_08077AC4:
@@ -1718,4 +1718,4 @@ sub_08077B20: @ 0x08077B20
push {lr}
bl ResetPlayer
bl sub_08077AEC
pop {pc}
pop {pc}
asm/code_08077B98.s
+4 -4
View File
@@ -25,7 +25,7 @@ _08078004: .4byte gUnk_0811BFE8
sub_08078008: @ 0x08078008
push {r4, r5, r6, lr}
adds r4, r0, #0
ldr r6, _08078060 @ =gUnk_02002A40
ldr r6, _08078060 @ =gSave
adds r5, r6, #0
adds r5, #0xb4
ldrb r0, [r5]
@@ -69,7 +69,7 @@ _08078036:
strb r2, [r4, #2]
b _0807806C
.align 2, 0
_08078060: .4byte gUnk_02002A40
_08078060: .4byte gSave
_08078064: .4byte gPlayerState
_08078068:
movs r0, #0
@@ -529,7 +529,7 @@ _080783B6:
bhi _0807842C
movs r0, #0
bl sub_0801E738
ldr r0, _08078410 @ =gUnk_02002A40
ldr r0, _08078410 @ =gSave
ldr r1, _08078414 @ =0x0000012B
adds r0, r0, r1
ldrb r0, [r0]
@@ -550,7 +550,7 @@ _08078400: .4byte gPlayerEntity
_08078404: .4byte 0x00000206
_08078408: .4byte gPlayerState
_0807840C: .4byte gUnk_03003DF0
_08078410: .4byte gUnk_02002A40
_08078410: .4byte gSave
_08078414: .4byte 0x0000012B
_08078418:
ldr r0, _08078428 @ =0x00000B65
asm/code_08078778.s
+10 -10
View File
@@ -813,7 +813,7 @@ sub_08078E84: @ 0x08078E84
adds r1, #1
strb r0, [r1]
_08078EAC:
ldr r0, _08078ED4 @ =gUnk_080029B4
ldr r0, _08078ED4 @ =gSpritePtrs
ldrh r2, [r4, #0x12]
lsls r2, r2, #4
adds r0, #4
@@ -832,7 +832,7 @@ _08078EAC:
b _08078EE2
.align 2, 0
_08078ED0: .4byte gPlayerEntity
_08078ED4: .4byte gUnk_080029B4
_08078ED4: .4byte gSpritePtrs
_08078ED8:
adds r0, r4, #0
movs r1, #3
@@ -3221,7 +3221,7 @@ sub_0807A094: @ 0x0807A094
.align 2, 0
_0807A0AC: .4byte gPlayerState
_0807A0B0:
ldr r0, _0807A0F0 @ =gUnk_02002A40
ldr r0, _0807A0F0 @ =gSave
adds r1, r0, #0
adds r1, #0xb2
ldrb r1, [r1]
@@ -3254,7 +3254,7 @@ _0807A0D6:
beq _0807A0FA
b _0807A102
.align 2, 0
_0807A0F0: .4byte gUnk_02002A40
_0807A0F0: .4byte gSave
_0807A0F4:
cmp r0, #0x31
beq _0807A0FE
@@ -3315,7 +3315,7 @@ _0807A154: .4byte gPlayerEntity
thumb_func_start sub_0807A158
sub_0807A158: @ 0x0807A158
push {r4, lr}
ldr r4, _0807A178 @ =gUnk_02002A40
ldr r4, _0807A178 @ =gSave
adds r0, r4, #0
adds r0, #0xb4
ldrb r0, [r0]
@@ -3328,7 +3328,7 @@ sub_0807A158: @ 0x0807A158
bl sub_0805449C
b _0807A17E
.align 2, 0
_0807A178: .4byte gUnk_02002A40
_0807A178: .4byte gSave
_0807A17C:
movs r0, #1
_0807A17E:
@@ -5289,7 +5289,7 @@ sub_0807B014: @ 0x0807B014
ands r0, r1
cmp r0, #0
beq _0807B044
ldr r0, _0807B040 @ =gUnk_02002A40
ldr r0, _0807B040 @ =gSave
adds r1, r0, #0
adds r1, #0xaa
adds r0, #0xab
@@ -5301,7 +5301,7 @@ sub_0807B014: @ 0x0807B014
b _0807B066
.align 2, 0
_0807B03C: .4byte gPlayerState
_0807B040: .4byte gUnk_02002A40
_0807B040: .4byte gSave
_0807B044:
adds r0, r2, #0
adds r0, #0xac
@@ -5310,7 +5310,7 @@ _0807B044:
ands r0, r1
cmp r0, #0
beq _0807B064
ldr r0, _0807B060 @ =gUnk_02002A40
ldr r0, _0807B060 @ =gSave
adds r0, #0xaa
ldrb r0, [r0]
cmp r0, #8
@@ -5318,7 +5318,7 @@ _0807B044:
movs r0, #0x16
b _0807B066
.align 2, 0
_0807B060: .4byte gUnk_02002A40
_0807B060: .4byte gSave
_0807B064:
movs r0, #0
_0807B066:
asm/code_0807B9B8.s
+1 -1
View File
@@ -1994,4 +1994,4 @@ _0807C956:
mov r8, r3
mov sb, r4
pop {r4, r5, r6, r7, pc}
.align 2, 0
.align 2, 0
asm/code_0807CAA0.s
+4 -4
View File
@@ -29,7 +29,7 @@ _0807CAC4: .4byte gUnk_02002B32
thumb_func_start sub_0807CAC8
sub_0807CAC8: @ 0x0807CAC8
ldr r2, _0807CAE0 @ =gUnk_02002A40
ldr r2, _0807CAE0 @ =gSave
ldr r1, _0807CAE4 @ =gArea
ldr r3, _0807CAE8 @ =0x0000047C
adds r2, r2, r3
@@ -42,14 +42,14 @@ sub_0807CAC8: @ 0x0807CAC8
strb r1, [r2]
bx lr
.align 2, 0
_0807CAE0: .4byte gUnk_02002A40
_0807CAE0: .4byte gSave
_0807CAE4: .4byte gArea
_0807CAE8: .4byte 0x0000047C
thumb_func_start sub_0807CAEC
sub_0807CAEC: @ 0x0807CAEC
adds r2, r0, #0
ldr r0, _0807CB04 @ =gUnk_02002A40
ldr r0, _0807CB04 @ =gSave
ldr r1, _0807CB08 @ =gArea
ldr r3, _0807CB0C @ =0x0000047C
adds r0, r0, r3
@@ -61,7 +61,7 @@ sub_0807CAEC: @ 0x0807CAEC
ands r0, r1
bx lr
.align 2, 0
_0807CB04: .4byte gUnk_02002A40
_0807CB04: .4byte gSave
_0807CB08: .4byte gArea
_0807CB0C: .4byte 0x0000047C
asm/code_0807CC3C.s
-7973
View File
File diff suppressed because it is too large Load Diff
asm/code_0807F0D8.s
+3251
View File
File diff suppressed because it is too large Load Diff
asm/code_0808091C.s
+1 -1
View File
@@ -433,4 +433,4 @@ _08080DEE:
_08080E00:
pop {r4, r5, pc}
.align 2, 0
_08080E04: .4byte gScreenTransition
_08080E04: .4byte gScreenTransition
asm/code_080A29BC.s
+2 -2
View File
@@ -982,8 +982,8 @@ _080A3200:
pop {r4, r5, pc}
.align 2, 0
thumb_func_start sub_080A3204
sub_080A3204: @ 0x080A3204
thumb_func_start InitSound
InitSound: @ 0xInitSound
push {lr}
bl sub_080A3210
bl m4aSoundInit
asm/code_080A3480.s
+19 -19
View File
@@ -224,7 +224,7 @@ _080A3604: .4byte gUnk_03001000
thumb_func_start sub_080A3608
sub_080A3608: @ 0x080A3608
push {r4, r5, lr}
ldr r0, _080A3640 @ =gUnk_02002A40
ldr r0, _080A3640 @ =gSave
movs r5, #0
movs r4, #1
strb r4, [r0, #6]
@@ -250,7 +250,7 @@ sub_080A3608: @ 0x080A3608
ldr r0, _080A364C @ =gUnk_08127998
b _080A365E
.align 2, 0
_080A3640: .4byte gUnk_02002A40
_080A3640: .4byte gSave
_080A3644: .4byte gUnk_03001000
_080A3648: .4byte gMenu
_080A364C: .4byte gUnk_08127998
@@ -351,7 +351,7 @@ sub_080A36F8: @ 0x080A36F8
bl LoadPaletteGroup
ldrb r0, [r4, #1]
bl LoadGfxGroup
ldr r0, _080A3760 @ =gUnk_02021F30
ldr r0, _080A3760 @ =gBG1Buffer
movs r1, #0x80
lsls r1, r1, #4
bl _DmaZero
@@ -383,7 +383,7 @@ _080A3752:
_080A3754: .4byte gFadeControl
_080A3758: .4byte gMenu
_080A375C: .4byte gUnk_08127CEC
_080A3760: .4byte gUnk_02021F30
_080A3760: .4byte gBG1Buffer
_080A3764: .4byte gScreen
thumb_func_start sub_080A3768
@@ -407,7 +407,7 @@ _080A3780:
beq _080A3812
b _080A384C
_080A378A:
ldr r0, _080A37B8 @ =gUnk_02021F30
ldr r0, _080A37B8 @ =gBG1Buffer
movs r1, #0x80
lsls r1, r1, #4
bl _DmaZero
@@ -429,7 +429,7 @@ _080A378A:
strb r2, [r4, #0x18]
b _080A385E
.align 2, 0
_080A37B8: .4byte gUnk_02021F30
_080A37B8: .4byte gBG1Buffer
_080A37BC: .4byte gUnk_081272E0
_080A37C0: .4byte gScreen
_080A37C4:
@@ -576,7 +576,7 @@ sub_080A38D0: @ 0x080A38D0
ldrb r0, [r0]
cmp r0, #0
bne _080A3914
ldr r0, _080A3920 @ =gUnk_02021F30
ldr r0, _080A3920 @ =gBG1Buffer
movs r6, #0x80
lsls r6, r6, #4
adds r1, r6, #0
@@ -586,7 +586,7 @@ sub_080A38D0: @ 0x080A38D0
mov r8, r0
movs r5, #1
strh r5, [r4, #0x1a]
ldr r0, _080A3928 @ =gUnk_020344B0
ldr r0, _080A3928 @ =gBG2Buffer
adds r1, r6, #0
bl _DmaZero
strh r5, [r4, #0x26]
@@ -606,9 +606,9 @@ _080A3914:
pop {r4, r5, r6, pc}
.align 2, 0
_080A391C: .4byte gFadeControl
_080A3920: .4byte gUnk_02021F30
_080A3920: .4byte gBG1Buffer
_080A3924: .4byte gScreen
_080A3928: .4byte gUnk_020344B0
_080A3928: .4byte gBG2Buffer
_080A392C: .4byte gMenu
thumb_func_start sub_080A3930
@@ -753,7 +753,7 @@ _080A3A42:
_080A3A50: .4byte gFadeControl
_080A3A54:
ldrb r4, [r2, #3]
ldr r0, _080A3A68 @ =gUnk_03000FF0
ldr r0, _080A3A68 @ =gInput
ldrh r0, [r0, #2]
cmp r0, #0x40
beq _080A3A72
@@ -763,7 +763,7 @@ _080A3A54:
beq _080A3A7A
b _080A3A9A
.align 2, 0
_080A3A68: .4byte gUnk_03000FF0
_080A3A68: .4byte gInput
_080A3A6C:
cmp r0, #0x80
beq _080A3A76
@@ -782,7 +782,7 @@ _080A3A7A:
_080A3A82:
movs r0, #8
movs r1, #0
bl sub_08050318
bl CreateDialogBox
movs r0, #2
_080A3A8C:
ldr r1, _080A3AB4 @ =gMenu
@@ -827,7 +827,7 @@ _080A3ADC:
strh r0, [r4, #8]
movs r0, #9
movs r1, #0
bl sub_08050318
bl CreateDialogBox
movs r0, #3
strb r0, [r4, #6]
b _080A3B36
@@ -840,7 +840,7 @@ _080A3AEE:
strh r0, [r1, #8]
b _080A3B36
_080A3AFC:
ldr r0, _080A3B10 @ =gUnk_03000FF0
ldr r0, _080A3B10 @ =gInput
ldrh r1, [r0, #2]
movs r0, #0xb
ands r0, r1
@@ -850,7 +850,7 @@ _080A3AFC:
strb r0, [r2, #6]
b _080A3B36
.align 2, 0
_080A3B10: .4byte gUnk_03000FF0
_080A3B10: .4byte gInput
_080A3B14:
ldr r2, _080A3B38 @ =gScreen
ldrh r1, [r2]
@@ -879,7 +879,7 @@ _080A3B44: .4byte gMenu
sub_080A3B48: @ 0x080A3B48
push {lr}
movs r1, #0
ldr r0, _080A3B6C @ =gUnk_02002A40
ldr r0, _080A3B6C @ =gSave
ldr r3, _080A3B70 @ =0x0000012B
adds r2, r0, r3
ldrb r0, [r2]
@@ -897,7 +897,7 @@ _080A3B66:
adds r0, r1, #0
pop {pc}
.align 2, 0
_080A3B6C: .4byte gUnk_02002A40
_080A3B6C: .4byte gSave
_080A3B70: .4byte 0x0000012B
thumb_func_start sub_080A3B74
@@ -908,4 +908,4 @@ sub_080A3B74: @ 0x080A3B74
strb r1, [r0]
bx lr
.align 2, 0
_080A3B80: .4byte gMenu
_080A3B80: .4byte gMenu
asm/code_080A3BD0.s
+74 -74
View File
@@ -86,7 +86,7 @@ _080A3CF0:
movs r0, #0x69
bl PlaySFX
_080A3CFE:
ldr r2, _080A3D28 @ =gUnk_03000FF0
ldr r2, _080A3D28 @ =gInput
ldrh r1, [r2, #2]
ldr r0, _080A3D2C @ =0x0000020A
ands r0, r1
@@ -102,7 +102,7 @@ _080A3D18: .4byte 0x0001FFFF
_080A3D1C: .4byte gUnk_081280EE
_080A3D20: .4byte 0x00000666
_080A3D24: .4byte 0x0000FFFF
_080A3D28: .4byte gUnk_03000FF0
_080A3D28: .4byte gInput
_080A3D2C: .4byte 0x0000020A
_080A3D30:
adds r0, r5, #0
@@ -143,7 +143,7 @@ _080A3D5E:
adds r0, r0, r1
_080A3D70:
asrs r4, r0, #0x10
ldr r0, _080A3DB4 @ =gUnk_02002A40
ldr r0, _080A3DB4 @ =gSave
movs r1, #0x8c
lsls r1, r1, #1
adds r0, r0, r1
@@ -177,7 +177,7 @@ _080A3DA8:
.align 2, 0
_080A3DAC: .4byte gMenu
_080A3DB0: .4byte 0x0000FFFF
_080A3DB4: .4byte gUnk_02002A40
_080A3DB4: .4byte gSave
thumb_func_start sub_080A3DB8
sub_080A3DB8: @ 0x080A3DB8
@@ -545,7 +545,7 @@ _080A407C: .4byte gUnk_02019EE0
thumb_func_start sub_080A4080
sub_080A4080: @ 0x080A4080
push {r4, r5, r6, r7, lr}
ldr r4, _080A4134 @ =gUnk_03001010
ldr r4, _080A4134 @ =gOamCmd
movs r0, #0
strh r0, [r4, #4]
strh r0, [r4, #6]
@@ -631,7 +631,7 @@ _080A411C:
_080A4130:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A4134: .4byte gUnk_03001010
_080A4134: .4byte gOamCmd
_080A4138: .4byte gMenu
_080A413C: .4byte 0x000001FB
_080A4140: .4byte gUnk_03001000
@@ -644,7 +644,7 @@ sub_080A414C: @ 0x080A414C
mov r7, sb
mov r6, r8
push {r6, r7}
ldr r4, _080A4210 @ =gUnk_03001010
ldr r4, _080A4210 @ =gOamCmd
movs r0, #0
strh r0, [r4, #4]
strh r0, [r4, #6]
@@ -715,7 +715,7 @@ _080A41CE:
mov r1, sb
adds r0, r3, r1
ldrb r1, [r0]
ldr r0, _080A4228 @ =gUnk_02002A40
ldr r0, _080A4228 @ =gSave
cmp r5, #0
bne _080A41EE
ldrb r2, [r2, #1]
@@ -743,13 +743,13 @@ _080A4200:
mov sb, r4
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A4210: .4byte gUnk_03001010
_080A4210: .4byte gOamCmd
_080A4214: .4byte gMenu
_080A4218: .4byte 0x00000B21
_080A421C: .4byte gSineTable
_080A4220: .4byte gUnk_02002B6B
_080A4224: .4byte 0x0000FFFF
_080A4228: .4byte gUnk_02002A40
_080A4228: .4byte gSave
thumb_func_start sub_080A422C
sub_080A422C: @ 0x080A422C
@@ -772,7 +772,7 @@ sub_080A422C: @ 0x080A422C
adds r2, r4, #0
movs r3, #0
bl sub_0805ECEC
ldr r1, _080A42AC @ =gUnk_03001010
ldr r1, _080A42AC @ =gOamCmd
movs r0, #0
strh r4, [r1, #4]
strh r0, [r1, #6]
@@ -811,7 +811,7 @@ sub_080A422C: @ 0x080A422C
.align 2, 0
_080A42A4: .4byte gMenu
_080A42A8: .4byte gUnk_08128120
_080A42AC: .4byte gUnk_03001010
_080A42AC: .4byte gOamCmd
_080A42B0:
cmp r0, #6
beq _080A42C6
@@ -826,7 +826,7 @@ _080A42B6:
_080A42C4:
movs r4, #0x8a
_080A42C6:
ldr r0, _080A42D8 @ =gUnk_03001010
ldr r0, _080A42D8 @ =gOamCmd
strh r4, [r0]
ldr r0, _080A42DC @ =gUnk_02022740
ldrb r0, [r0, #3]
@@ -834,7 +834,7 @@ _080A42C6:
bl sub_080A42E0
pop {r4, r5, pc}
.align 2, 0
_080A42D8: .4byte gUnk_03001010
_080A42D8: .4byte gOamCmd
_080A42DC: .4byte gUnk_02022740
thumb_func_start sub_080A42E0
@@ -873,7 +873,7 @@ _080A42FA:
adds r1, r4, #0
bl sub_0801C2F0
_080A4324:
ldr r1, _080A434C @ =gUnk_03001010
ldr r1, _080A434C @ =gOamCmd
ldr r2, _080A4350 @ =0x00003AE0
adds r0, r5, r2
strh r0, [r1, #8]
@@ -893,7 +893,7 @@ _080A4324:
b _080A4362
.align 2, 0
_080A4348: .4byte gUnk_02019EE0
_080A434C: .4byte gUnk_03001010
_080A434C: .4byte gOamCmd
_080A4350: .4byte 0x00003AE0
_080A4354: .4byte gMenu
_080A4358:
@@ -907,7 +907,7 @@ _080A4362:
movs r0, #0
movs r1, #5
bl sub_080ADA14
ldr r0, _080A4394 @ =gUnk_03001010
ldr r0, _080A4394 @ =gOamCmd
strh r4, [r0]
strh r5, [r0, #2]
_080A4372:
@@ -921,14 +921,14 @@ _080A4372:
lsls r2, r2, #2
adds r0, r0, r2
orrs r1, r0
ldr r0, _080A4394 @ =gUnk_03001010
ldr r0, _080A4394 @ =gOamCmd
strh r1, [r0, #8]
movs r0, #0
movs r1, #3
bl sub_080ADA14
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A4394: .4byte gUnk_03001010
_080A4394: .4byte gOamCmd
thumb_func_start sub_080A4398
sub_080A4398: @ 0x080A4398
@@ -1207,7 +1207,7 @@ _080A45A2:
thumb_func_start sub_080A45A4
sub_080A45A4: @ 0x080A45A4
push {lr}
bl sub_080AD90C
bl FlushSprites
ldr r0, _080A45C4 @ =gUnk_02032EC0
ldrb r0, [r0, #3]
cmp r0, #0xff
@@ -1266,11 +1266,11 @@ sub_080A4608: @ 0x080A4608
adds r1, r4, r2
ldrh r1, [r1]
bl sub_0801D79C
ldr r0, _080A46A4 @ =gUnk_02034CB0
ldr r0, _080A46A4 @ =gBG0Buffer
movs r1, #0x80
lsls r1, r1, #4
bl _DmaZero
ldr r0, _080A46A8 @ =gUnk_02001A40
ldr r0, _080A46A8 @ =gBG3Buffer
movs r1, #0x80
lsls r1, r1, #5
bl _DmaZero
@@ -1303,7 +1303,7 @@ _080A4674:
bge _080A4674
ldr r0, _080A46B8 @ =gUnk_02032EC0
ldrb r1, [r0, #3]
ldr r0, _080A46BC @ =gUnk_02002A40
ldr r0, _080A46BC @ =gSave
ldrb r0, [r0, #6]
movs r2, #0x88
cmp r0, #0
@@ -1321,13 +1321,13 @@ _080A4694:
pop {r4, pc}
.align 2, 0
_080A46A0: .4byte gPaletteBuffer
_080A46A4: .4byte gUnk_02034CB0
_080A46A8: .4byte gUnk_02001A40
_080A46A4: .4byte gBG0Buffer
_080A46A8: .4byte gBG3Buffer
_080A46AC: .4byte gScreen
_080A46B0: .4byte 0x00007898
_080A46B4: .4byte gMenu
_080A46B8: .4byte gUnk_02032EC0
_080A46BC: .4byte gUnk_02002A40
_080A46BC: .4byte gSave
thumb_func_start sub_080A46C0
sub_080A46C0: @ 0x080A46C0
@@ -1469,7 +1469,7 @@ sub_080A47D0: @ 0x080A47D0
ldr r0, _080A47EC @ =gMenu
movs r4, #0x1f
ldrsb r4, [r0, r4]
ldr r0, _080A47F0 @ =gUnk_03000FF0
ldr r0, _080A47F0 @ =gInput
ldrh r0, [r0, #4]
cmp r0, #8
beq _080A47FE
@@ -1480,7 +1480,7 @@ sub_080A47D0: @ 0x080A47D0
b _080A480A
.align 2, 0
_080A47EC: .4byte gMenu
_080A47F0: .4byte gUnk_03000FF0
_080A47F0: .4byte gInput
_080A47F4:
cmp r0, #0x10
beq _080A4804
@@ -1551,7 +1551,7 @@ sub_080A4864: @ 0x080A4864
movs r5, #0x1f
ldrsb r5, [r0, r5]
ldrb r4, [r0, #0x1c]
ldr r0, _080A489C @ =gUnk_03000FF0
ldr r0, _080A489C @ =gInput
ldrh r1, [r0, #4]
cmp r1, #0x20
beq _080A48DC
@@ -1569,7 +1569,7 @@ sub_080A4864: @ 0x080A4864
.align 2, 0
_080A4894: .4byte gFadeControl
_080A4898: .4byte gMenu
_080A489C: .4byte gUnk_03000FF0
_080A489C: .4byte gInput
_080A48A0:
cmp r1, #0x80
beq _080A48D4
@@ -1610,7 +1610,7 @@ _080A48D8:
_080A48DC:
subs r5, #8
_080A48DE:
ldr r0, _080A4928 @ =gUnk_02002A40
ldr r0, _080A4928 @ =gSave
ldrb r0, [r0, #6]
movs r1, #0x88
cmp r0, #0
@@ -1653,7 +1653,7 @@ _080A491C:
_080A4926:
pop {r4, r5, r6, pc}
.align 2, 0
_080A4928: .4byte gUnk_02002A40
_080A4928: .4byte gSave
_080A492C: .4byte gMenu
_080A4930: .4byte gScreen
@@ -1676,7 +1676,7 @@ sub_080A4948: @ 0x080A4948
push {r4, lr}
adds r1, r0, #0
movs r4, #0
ldr r3, _080A4974 @ =gUnk_02002A40
ldr r3, _080A4974 @ =gSave
ldrb r0, [r3, #6]
movs r2, #0x88
cmp r0, #0
@@ -1698,14 +1698,14 @@ _080A4970:
adds r0, r4, #0
pop {r4, pc}
.align 2, 0
_080A4974: .4byte gUnk_02002A40
_080A4974: .4byte gSave
thumb_func_start sub_080A4978
sub_080A4978: @ 0x080A4978
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
ldr r5, _080A4B1C @ =gUnk_03001010
ldr r5, _080A4B1C @ =gOamCmd
movs r0, #0
strh r0, [r5, #4]
strh r0, [r5, #6]
@@ -1721,7 +1721,7 @@ sub_080A4978: @ 0x080A4978
adds r0, r7, #0
movs r1, #0
bl sub_080ADA14
ldr r0, _080A4B20 @ =gUnk_02002A40
ldr r0, _080A4B20 @ =gSave
ldrb r0, [r0, #6]
movs r2, #0x88
cmp r0, #0
@@ -1793,7 +1793,7 @@ _080A4A10:
ldrb r0, [r5, #0x1e]
cmp r0, #0
beq _080A4A6A
ldr r4, _080A4B1C @ =gUnk_03001010
ldr r4, _080A4B1C @ =gOamCmd
strh r2, [r4, #2]
movs r0, #0x1f
ldrsb r0, [r5, r0]
@@ -1833,7 +1833,7 @@ _080A4A6A:
ands r0, r1
cmp r0, #0
beq _080A4ABE
ldr r1, _080A4B1C @ =gUnk_03001010
ldr r1, _080A4B1C @ =gOamCmd
movs r0, #0x10
strh r0, [r1, #2]
ldrb r4, [r2, #0x1c]
@@ -1873,7 +1873,7 @@ _080A4ABE:
bl sub_080A4948
cmp r0, #0
beq _080A4B3A
ldr r1, _080A4B1C @ =gUnk_03001010
ldr r1, _080A4B1C @ =gOamCmd
movs r0, #0x2c
strh r0, [r1]
movs r0, #0x48
@@ -1907,8 +1907,8 @@ _080A4ABE:
bl LZ77UnCompVram
b _080A4B3A
.align 2, 0
_080A4B1C: .4byte gUnk_03001010
_080A4B20: .4byte gUnk_02002A40
_080A4B1C: .4byte gOamCmd
_080A4B20: .4byte gSave
_080A4B24: .4byte gMenu
_080A4B28: .4byte gUnk_03001000
_080A4B2C: .4byte gUnk_081281A8
@@ -2007,7 +2007,7 @@ sub_080A4BA0: @ 0x080A4BA0
mov r0, sp
strb r6, [r0, #0x14]
_080A4BEE:
ldr r0, _080A4C10 @ =gUnk_02002A40
ldr r0, _080A4C10 @ =gSave
ldrb r0, [r0, #6]
movs r1, #0x88
cmp r0, #0
@@ -2025,7 +2025,7 @@ _080A4C02:
.align 2, 0
_080A4C08: .4byte gUnk_0812816C
_080A4C0C: .4byte gUnk_08128184
_080A4C10: .4byte gUnk_02002A40
_080A4C10: .4byte gSave
_080A4C14:
ldr r1, _080A4C30 @ =gUnk_020227E8
ldr r2, _080A4C34 @ =0x00303030
@@ -2118,7 +2118,7 @@ sub_080A4CBC: @ 0x080A4CBC
cmp r0, r6
beq _080A4CFE
strb r6, [r1, #0x1a]
ldr r4, _080A4D10 @ =gUnk_02021F30
ldr r4, _080A4D10 @ =gBG1Buffer
movs r5, #0x80
lsls r5, r5, #4
adds r0, r4, #0
@@ -2151,7 +2151,7 @@ _080A4CFE:
b _080A4D28
.align 2, 0
_080A4D0C: .4byte gMenu
_080A4D10: .4byte gUnk_02021F30
_080A4D10: .4byte gBG1Buffer
_080A4D14: .4byte 0x0600E000
_080A4D18: .4byte gUnk_08128190
_080A4D1C: .4byte gScreen
@@ -2175,7 +2175,7 @@ sub_080A4D34: @ 0x080A4D34
bl sub_08053320
movs r0, #0xb5
bl LoadPaletteGroup
ldr r1, _080A4D50 @ =gUnk_02002A40
ldr r1, _080A4D50 @ =gSave
adds r2, r1, #0
adds r2, #0xaa
ldrb r0, [r2]
@@ -2184,7 +2184,7 @@ sub_080A4D34: @ 0x080A4D34
movs r1, #2
b _080A4D66
.align 2, 0
_080A4D50: .4byte gUnk_02002A40
_080A4D50: .4byte gSave
_080A4D54:
adds r0, r1, #0
adds r0, #0xab
@@ -2241,15 +2241,15 @@ sub_080A4DB8: @ 0x080A4DB8
push {r4, r5, lr}
adds r5, r0, #0
bl sub_08056250
ldr r0, _080A4E58 @ =gUnk_02034CB0
ldr r0, _080A4E58 @ =gBG0Buffer
movs r4, #0x80
lsls r4, r4, #4
adds r1, r4, #0
bl _DmaZero
ldr r0, _080A4E5C @ =gUnk_02021F30
ldr r0, _080A4E5C @ =gBG1Buffer
adds r1, r4, #0
bl _DmaZero
ldr r0, _080A4E60 @ =gUnk_020344B0
ldr r0, _080A4E60 @ =gBG2Buffer
adds r1, r4, #0
bl _DmaZero
ldr r0, _080A4E64 @ =gUnk_0200AF34
@@ -2312,9 +2312,9 @@ _080A4E4A:
_080A4E54:
pop {r4, r5, pc}
.align 2, 0
_080A4E58: .4byte gUnk_02034CB0
_080A4E5C: .4byte gUnk_02021F30
_080A4E60: .4byte gUnk_020344B0
_080A4E58: .4byte gBG0Buffer
_080A4E5C: .4byte gBG1Buffer
_080A4E60: .4byte gBG2Buffer
_080A4E64: .4byte gUnk_0200AF34
_080A4E68: .4byte gMenu
_080A4E6C: .4byte 0x0000FFFF
@@ -2357,7 +2357,7 @@ sub_080A4EA0: @ 0x080A4EA0
.align 2, 0
_080A4EB8: .4byte gUnk_02034490
_080A4EBC:
bl sub_080AD90C
bl FlushSprites
ldr r1, _080A4F18 @ =gUnk_08128B30
ldrb r0, [r4, #0x11]
lsls r0, r0, #2
@@ -2483,7 +2483,7 @@ sub_080A4FB8: @ 0x080A4FB8
beq _080A5052
movs r4, #1
rsbs r4, r4, #0
ldr r0, _080A4FE8 @ =gUnk_03000FF0
ldr r0, _080A4FE8 @ =gInput
ldrh r1, [r0, #2]
cmp r1, #8
beq _080A4FFE
@@ -2494,7 +2494,7 @@ sub_080A4FB8: @ 0x080A4FB8
b _080A500C
.align 2, 0
_080A4FE4: .4byte gMenu
_080A4FE8: .4byte gUnk_03000FF0
_080A4FE8: .4byte gInput
_080A4FEC:
movs r0, #0x80
lsls r0, r0, #1
@@ -2577,7 +2577,7 @@ _080A507C: .4byte gUnk_02034490
_080A5080:
movs r0, #3
bl sub_080A4E90
ldr r0, _080A5098 @ =gUnk_02034CB0
ldr r0, _080A5098 @ =gBG0Buffer
movs r1, #0x80
lsls r1, r1, #4
bl _DmaZero
@@ -2587,7 +2587,7 @@ _080A5080:
_080A5096:
pop {r4, r5, pc}
.align 2, 0
_080A5098: .4byte gUnk_02034CB0
_080A5098: .4byte gBG0Buffer
_080A509C: .4byte gScreen
thumb_func_start sub_080A50A0
@@ -2715,7 +2715,7 @@ _080A515A:
_080A5182:
str r0, [sp, #0x10]
str r1, [sp, #0x14]
ldr r4, _080A51CC @ =gUnk_03001010
ldr r4, _080A51CC @ =gOamCmd
movs r0, #0
strh r0, [r4, #4]
strh r0, [r4, #6]
@@ -2748,7 +2748,7 @@ _080A51C6:
add sp, #0x18
pop {r4, r5, pc}
.align 2, 0
_080A51CC: .4byte gUnk_03001010
_080A51CC: .4byte gOamCmd
_080A51D0: .4byte 0x000001FB
thumb_func_start sub_080A51D4
@@ -2869,7 +2869,7 @@ sub_080A529C: @ 0x080A529C
lsls r1, r4, #3
ldr r0, _080A52D8 @ =gUnk_08128B64
adds r1, r1, r0
ldr r0, _080A52DC @ =gUnk_03000FF0
ldr r0, _080A52DC @ =gInput
ldrh r2, [r0, #2]
adds r3, r0, #0
cmp r2, #1
@@ -2886,7 +2886,7 @@ sub_080A529C: @ 0x080A529C
_080A52D0: .4byte gMenu
_080A52D4: .4byte gUnk_08128BF4
_080A52D8: .4byte gUnk_08128B64
_080A52DC: .4byte gUnk_03000FF0
_080A52DC: .4byte gInput
_080A52E0:
cmp r4, #0x10
bne _080A52EC
@@ -2960,13 +2960,13 @@ _080A535C: .4byte gMenu
_080A5360:
cmp r1, #0
beq _080A5376
ldr r0, _080A5370 @ =gUnk_02002A40
ldr r0, _080A5370 @ =gSave
adds r0, r0, r1
adds r0, #0x9a
ldrb r1, [r0]
b _080A5376
.align 2, 0
_080A5370: .4byte gUnk_02002A40
_080A5370: .4byte gSave
_080A5374:
movs r1, #0x73
_080A5376:
@@ -2985,7 +2985,7 @@ sub_080A5384: @ 0x080A5384
mov r6, sb
mov r5, r8
push {r5, r6, r7}
ldr r0, _080A5400 @ =gUnk_03001010
ldr r0, _080A5400 @ =gOamCmd
movs r2, #0
movs r1, #0x80
lsls r1, r1, #3
@@ -2993,7 +2993,7 @@ sub_080A5384: @ 0x080A5384
strh r2, [r0, #6]
strh r2, [r0, #8]
movs r5, #0
ldr r4, _080A5404 @ =gUnk_02002A40
ldr r4, _080A5404 @ =gSave
movs r0, #0xb6
adds r0, r0, r4
mov sl, r0
@@ -3014,7 +3014,7 @@ _080A53B4:
ldr r0, _080A540C @ =gUnk_08128B64
adds r1, r6, r0
ldrb r0, [r1, #6]
ldr r3, _080A5400 @ =gUnk_03001010
ldr r3, _080A5400 @ =gOamCmd
strh r0, [r3]
ldrb r0, [r1, #7]
strh r0, [r3, #2]
@@ -3045,8 +3045,8 @@ _080A53E0:
bhi _080A542E
b _080A542C
.align 2, 0
_080A5400: .4byte gUnk_03001010
_080A5404: .4byte gUnk_02002A40
_080A5400: .4byte gOamCmd
_080A5404: .4byte gSave
_080A5408: .4byte gMenu
_080A540C: .4byte gUnk_08128B64
_080A5410: .4byte gBombBagSizes
@@ -3075,7 +3075,7 @@ _080A542E:
adds r1, r7, #0
orrs r0, r1
orrs r2, r0
ldr r0, _080A5530 @ =gUnk_03001010
ldr r0, _080A5530 @ =gOamCmd
strh r2, [r0, #8]
ldr r1, _080A5534 @ =gUnk_080FDFD8
lsls r0, r3, #2
@@ -3090,7 +3090,7 @@ _080A5456:
adds r5, #1
cmp r5, #0x10
bls _080A53B4
ldr r0, _080A5530 @ =gUnk_03001010
ldr r0, _080A5530 @ =gOamCmd
movs r1, #0x80
lsls r1, r1, #4
strh r1, [r0, #8]
@@ -3149,7 +3149,7 @@ _080A54B6:
adds r0, r6, #0
movs r1, #0x22
bl sub_080ADA14
ldr r7, _080A5548 @ =gUnk_02002A40
ldr r7, _080A5548 @ =gSave
adds r0, r7, #0
adds r0, #0xb4
ldrb r0, [r0]
@@ -3194,10 +3194,10 @@ _080A5522:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A552C: .4byte gQuiverSizes
_080A5530: .4byte gUnk_03001010
_080A5530: .4byte gOamCmd
_080A5534: .4byte gUnk_080FDFD8
_080A5538: .4byte gMenu
_080A553C: .4byte gUnk_08128B64
_080A5540: .4byte gUnk_03001000
_080A5544: .4byte 0x000001FB
_080A5548: .4byte gUnk_02002A40
_080A5548: .4byte gSave
asm/code_080A5574.s
+91 -91
View File
@@ -100,7 +100,7 @@ _080A5646:
strb r5, [r0, #0x10]
_080A564A:
ldr r0, _080A5698 @ =gMenu
ldr r1, _080A569C @ =gUnk_02002A40
ldr r1, _080A569C @ =gSave
adds r1, #0xa9
ldrb r1, [r1]
adds r1, #1
@@ -138,7 +138,7 @@ _080A5688:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A5698: .4byte gMenu
_080A569C: .4byte gUnk_02002A40
_080A569C: .4byte gSave
thumb_func_start sub_080A56A0
sub_080A56A0: @ 0x080A56A0
@@ -156,7 +156,7 @@ _080A56AC:
ldr r1, _080A56D8 @ =gUnk_08128C14
adds r4, r0, r1
movs r3, #0xff
ldr r0, _080A56DC @ =gUnk_03000FF0
ldr r0, _080A56DC @ =gInput
ldrh r1, [r0, #4]
cmp r1, #0x20
beq _080A56F2
@@ -169,7 +169,7 @@ _080A56AC:
_080A56D0: .4byte gMenu
_080A56D4: .4byte gUnk_08128C00
_080A56D8: .4byte gUnk_08128C14
_080A56DC: .4byte gUnk_03000FF0
_080A56DC: .4byte gInput
_080A56E0:
cmp r1, #0x40
beq _080A56EA
@@ -325,7 +325,7 @@ sub_080A57F4: @ 0x080A57F4
mov r7, sb
mov r6, r8
push {r6, r7}
ldr r2, _080A5890 @ =gUnk_03001010
ldr r2, _080A5890 @ =gOamCmd
movs r1, #0
movs r0, #0x80
lsls r0, r0, #3
@@ -382,7 +382,7 @@ _080A5854:
lsls r5, r3, #3
mov r0, sb
adds r3, r0, r5
ldr r4, _080A5890 @ =gUnk_03001010
ldr r4, _080A5890 @ =gOamCmd
ldrb r0, [r7, #1]
strh r0, [r4]
ldrb r2, [r7, #2]
@@ -401,7 +401,7 @@ _080A5854:
ldr r0, _080A58A4 @ =0x000001FB
b _080A58E4
.align 2, 0
_080A5890: .4byte gUnk_03001010
_080A5890: .4byte gOamCmd
_080A5894: .4byte gUnk_08128C94
_080A5898: .4byte gUnk_08128C14
_080A589C: .4byte gMenu
@@ -455,7 +455,7 @@ _080A58E8:
ldrb r0, [r4, #0x12]
cmp r0, #0
beq _080A5920
ldr r2, _080A5988 @ =gUnk_03001010
ldr r2, _080A5988 @ =gOamCmd
movs r3, #0x80
lsls r3, r3, #4
adds r1, r3, #0
@@ -478,14 +478,14 @@ _080A5920:
bne _080A5976
mov r3, sb
adds r3, #0x18
ldr r1, _080A5988 @ =gUnk_03001010
ldr r1, _080A5988 @ =gOamCmd
ldrb r0, [r3, #6]
adds r0, #8
strh r0, [r1]
ldrb r0, [r3, #7]
adds r0, #8
strh r0, [r1, #2]
ldr r0, _080A598C @ =gUnk_02002A40
ldr r0, _080A598C @ =gSave
adds r0, #0xc2
ldrh r4, [r0]
movs r0, #0
@@ -522,8 +522,8 @@ _080A5976:
.align 2, 0
_080A5980: .4byte gUnk_080FDFD8
_080A5984: .4byte gMenu
_080A5988: .4byte gUnk_03001010
_080A598C: .4byte gUnk_02002A40
_080A5988: .4byte gOamCmd
_080A598C: .4byte gSave
thumb_func_start sub_080A5990
sub_080A5990: @ 0x080A5990
@@ -563,7 +563,7 @@ sub_080A59C8: @ 0x080A59C8
ldr r1, _080A59EC @ =gMenu
ldrb r2, [r1, #3]
movs r3, #0
ldr r0, _080A59F0 @ =gUnk_03000FF0
ldr r0, _080A59F0 @ =gInput
ldrh r0, [r0, #2]
cmp r0, #2
beq _080A5A02
@@ -574,7 +574,7 @@ sub_080A59C8: @ 0x080A59C8
b _080A5A0C
.align 2, 0
_080A59EC: .4byte gMenu
_080A59F0: .4byte gUnk_03000FF0
_080A59F0: .4byte gInput
_080A59F4:
cmp r0, #0x40
beq _080A59FE
@@ -602,7 +602,7 @@ _080A5A10:
bne _080A5A2E
movs r0, #8
movs r1, #0
bl sub_08050318
bl CreateDialogBox
movs r0, #2
bl sub_080A7114
movs r0, #0x6a
@@ -649,7 +649,7 @@ _080A5A70:
_080A5A76:
movs r0, #9
movs r1, #0
bl sub_08050318
bl CreateDialogBox
ldr r1, _080A5A8C @ =gMenu
movs r0, #0x3c
strh r0, [r1, #8]
@@ -676,7 +676,7 @@ sub_080A5A90: @ 0x080A5A90
.align 2, 0
_080A5AA4: .4byte gMenu
_080A5AA8:
ldr r0, _080A5ABC @ =gUnk_03000FF0
ldr r0, _080A5ABC @ =gInput
ldrh r1, [r0, #2]
movs r0, #0xb
ands r0, r1
@@ -686,7 +686,7 @@ _080A5AA8:
strh r0, [r2, #8]
b _080A5AD2
.align 2, 0
_080A5ABC: .4byte gUnk_03000FF0
_080A5ABC: .4byte gInput
_080A5AC0:
ldr r0, _080A5AD4 @ =gUnk_02034490
ldrb r0, [r0, #1]
@@ -758,7 +758,7 @@ sub_080A5B34: @ 0x080A5B34
ldr r1, _080A5B58 @ =gMenu
ldrb r4, [r1, #3]
movs r5, #0
ldr r0, _080A5B5C @ =gUnk_03000FF0
ldr r0, _080A5B5C @ =gInput
ldrh r0, [r0, #2]
adds r6, r1, #0
cmp r0, #2
@@ -770,7 +770,7 @@ sub_080A5B34: @ 0x080A5B34
b _080A5B76
.align 2, 0
_080A5B58: .4byte gMenu
_080A5B5C: .4byte gUnk_03000FF0
_080A5B5C: .4byte gInput
_080A5B60:
cmp r0, #0x10
beq _080A5B70
@@ -936,7 +936,7 @@ sub_080A5C9C: @ 0x080A5C9C
adds r3, r0, r1
ldr r1, _080A5CCC @ =gMenu
ldrb r2, [r1, #3]
ldr r0, _080A5CD0 @ =gUnk_03000FF0
ldr r0, _080A5CD0 @ =gInput
ldrh r0, [r0, #2]
cmp r0, #0x40
beq _080A5CD4
@@ -947,7 +947,7 @@ sub_080A5C9C: @ 0x080A5C9C
_080A5CC4: .4byte gArea
_080A5CC8: .4byte gUnk_080C9C6C
_080A5CCC: .4byte gMenu
_080A5CD0: .4byte gUnk_03000FF0
_080A5CD0: .4byte gInput
_080A5CD4:
cmp r2, #0
ble _080A5CE6
@@ -1004,7 +1004,7 @@ sub_080A5D1C: @ 0x080A5D1C
ldrb r6, [r0]
bl sub_0801DB94
mov r8, r0
ldr r5, _080A5EA4 @ =gUnk_03001010
ldr r5, _080A5EA4 @ =gOamCmd
movs r0, #0x80
lsls r0, r0, #3
strh r0, [r5, #4]
@@ -1133,7 +1133,7 @@ _080A5E42:
ldr r0, _080A5EB0 @ =0x000001FB
bl sub_080ADA14
_080A5E48:
ldr r1, _080A5EA4 @ =gUnk_03001010
ldr r1, _080A5EA4 @ =gOamCmd
movs r0, #0
strh r0, [r1, #8]
movs r0, #0x34
@@ -1164,7 +1164,7 @@ _080A5E7C:
ldrb r0, [r5]
cmp r0, #0
beq _080A5F14
ldr r7, _080A5EA4 @ =gUnk_03001010
ldr r7, _080A5EA4 @ =gOamCmd
ldr r6, _080A5EBC @ =gScreen
_080A5E88:
ldrb r0, [r5]
@@ -1179,7 +1179,7 @@ _080A5E88:
_080A5E98: .4byte gArea
_080A5E9C: .4byte gUnk_080C9C6C
_080A5EA0: .4byte gUnk_08128D3C
_080A5EA4: .4byte gUnk_03001010
_080A5EA4: .4byte gOamCmd
_080A5EA8: .4byte gMenu
_080A5EAC: .4byte gUnk_03001000
_080A5EB0: .4byte 0x000001FB
@@ -1271,7 +1271,7 @@ sub_080A5F48: @ 0x080A5F48
bhi _080A5F5C
cmp r4, #0x1c
blo _080A5F5C
ldr r0, _080A5F9C @ =gUnk_02002A40
ldr r0, _080A5F9C @ =gSave
adds r0, r0, r4
adds r0, #0x9a
ldrb r4, [r0]
@@ -1304,11 +1304,11 @@ _080A5F5C:
blo _080A5FBE
cmp r4, #8
bhi _080A5FB4
ldr r0, _080A5F9C @ =gUnk_02002A40
ldr r0, _080A5F9C @ =gSave
adds r0, #0xac
b _080A5FBC
.align 2, 0
_080A5F9C: .4byte gUnk_02002A40
_080A5F9C: .4byte gSave
_080A5FA0: .4byte 0x06010000
_080A5FA4: .4byte gUnk_080FDFD8
_080A5FA8: .4byte gUnk_08003DD4
@@ -1317,7 +1317,7 @@ _080A5FB0: .4byte 0x84000040
_080A5FB4:
cmp r4, #0xa
bhi _080A5FBE
ldr r0, _080A5FF8 @ =gUnk_02002A40
ldr r0, _080A5FF8 @ =gSave
adds r0, #0xad
_080A5FBC:
ldrb r0, [r0]
@@ -1353,7 +1353,7 @@ _080A5FD0:
_080A5FF6:
pop {r4, r5, pc}
.align 2, 0
_080A5FF8: .4byte gUnk_02002A40
_080A5FF8: .4byte gSave
_080A5FFC: .4byte 0x040000D4
_080A6000: .4byte gUnk_085C4620
_080A6004: .4byte 0x84000008
@@ -1399,13 +1399,13 @@ sub_080A6044: @ 0x080A6044
ldr r0, _080A60CC @ =gMenu
ldr r1, _080A60D0 @ =gUnk_08128D51
str r1, [r0, #0xc]
ldr r1, _080A60D4 @ =gUnk_03001010
ldr r1, _080A60D4 @ =gOamCmd
movs r0, #0
strh r0, [r1, #4]
strh r0, [r1, #6]
movs r5, #0
movs r4, #0
ldr r0, _080A60D8 @ =gUnk_02002A40
ldr r0, _080A60D8 @ =gSave
movs r2, #0x8c
lsls r2, r2, #1
adds r3, r0, r2
@@ -1459,8 +1459,8 @@ _080A60C2:
.align 2, 0
_080A60CC: .4byte gMenu
_080A60D0: .4byte gUnk_08128D51
_080A60D4: .4byte gUnk_03001010
_080A60D8: .4byte gUnk_02002A40
_080A60D4: .4byte gOamCmd
_080A60D8: .4byte gSave
_080A60DC: .4byte 0x0000012B
thumb_func_start sub_080A60E0
@@ -1505,7 +1505,7 @@ sub_080A612C: @ 0x080A612C
beq _080A6178
ldr r1, _080A614C @ =gMenu
ldrb r2, [r1, #3]
ldr r0, _080A6150 @ =gUnk_03000FF0
ldr r0, _080A6150 @ =gInput
ldrh r0, [r0, #2]
cmp r0, #0x10
beq _080A6154
@@ -1515,7 +1515,7 @@ sub_080A612C: @ 0x080A612C
b _080A6156
.align 2, 0
_080A614C: .4byte gMenu
_080A6150: .4byte gUnk_03000FF0
_080A6150: .4byte gInput
_080A6154:
adds r2, #1
_080A6156:
@@ -1545,7 +1545,7 @@ sub_080A617C: @ 0x080A617C
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
ldr r6, _080A6260 @ =gUnk_03001010
ldr r6, _080A6260 @ =gOamCmd
movs r0, #0
strh r0, [r6, #4]
strh r0, [r6, #6]
@@ -1653,7 +1653,7 @@ _080A6250:
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A6260: .4byte gUnk_03001010
_080A6260: .4byte gOamCmd
_080A6264: .4byte gMenu
_080A6268: .4byte gUnk_03001000
_080A626C: .4byte gUnk_08128D70
@@ -1688,7 +1688,7 @@ sub_080A6290: @ 0x080A6290
ldr r0, _080A62D4 @ =0x0000FFFC
strh r0, [r1, #0x18]
strh r0, [r1, #0x24]
ldr r2, _080A62D8 @ =gUnk_02002A40
ldr r2, _080A62D8 @ =gSave
ldr r0, [r2, #0x40]
ldr r1, _080A62DC @ =0x00010780
orrs r0, r1
@@ -1704,7 +1704,7 @@ _080A62C8: .4byte gMenu
_080A62CC: .4byte gUnk_08128DD4
_080A62D0: .4byte gScreen
_080A62D4: .4byte 0x0000FFFC
_080A62D8: .4byte gUnk_02002A40
_080A62D8: .4byte gSave
_080A62DC: .4byte 0x00010780
thumb_func_start sub_080A62E0
@@ -1720,7 +1720,7 @@ sub_080A62E0: @ 0x080A62E0
adds r1, r1, r0
movs r4, #1
rsbs r4, r4, #0
ldr r0, _080A6318 @ =gUnk_03000FF0
ldr r0, _080A6318 @ =gInput
ldrh r2, [r0, #2]
cmp r2, #0x20
beq _080A634E
@@ -1734,7 +1734,7 @@ sub_080A62E0: @ 0x080A62E0
.align 2, 0
_080A6310: .4byte gMenu
_080A6314: .4byte gUnk_08128DE8
_080A6318: .4byte gUnk_03000FF0
_080A6318: .4byte gInput
_080A631C:
cmp r2, #0x40
beq _080A6344
@@ -1742,7 +1742,7 @@ _080A631C:
beq _080A634A
b _080A635A
_080A6326:
ldr r0, _080A6340 @ =gUnk_02002A40
ldr r0, _080A6340 @ =gSave
lsls r2, r3
ldr r0, [r0, #0x40]
ands r0, r2
@@ -1754,7 +1754,7 @@ _080A6326:
bl sub_080A4E84
b _080A635A
.align 2, 0
_080A6340: .4byte gUnk_02002A40
_080A6340: .4byte gSave
_080A6344:
ldrb r0, [r1]
lsls r0, r0, #0x1b
@@ -1804,7 +1804,7 @@ sub_080A6378: @ 0x080A6378
beq _080A6392
bl sub_080A6438
_080A6392:
ldr r5, _080A6424 @ =gUnk_03001010
ldr r5, _080A6424 @ =gOamCmd
movs r0, #0x80
lsls r0, r0, #3
strh r0, [r5, #4]
@@ -1852,7 +1852,7 @@ _080A63EA:
lsls r0, r0, #3
ldr r1, _080A6434 @ =gUnk_08128DE8
adds r0, r0, r1
ldr r2, _080A6424 @ =gUnk_03001010
ldr r2, _080A6424 @ =gOamCmd
ldrb r1, [r0, #6]
strh r1, [r2]
ldrb r0, [r0, #7]
@@ -1873,7 +1873,7 @@ _080A63EA:
pop {r4, r5, r6, pc}
.align 2, 0
_080A6420: .4byte gMenu
_080A6424: .4byte gUnk_03001010
_080A6424: .4byte gOamCmd
_080A6428: .4byte gScreenTransition
_080A642C: .4byte gPlayerState
_080A6430: .4byte 0x000001FB
@@ -1882,14 +1882,14 @@ _080A6434: .4byte gUnk_08128DE8
thumb_func_start sub_080A6438
sub_080A6438: @ 0x080A6438
push {r4, r5, r6, r7, lr}
ldr r2, _080A6484 @ =gUnk_03001010
ldr r2, _080A6484 @ =gOamCmd
movs r1, #0
movs r0, #0x80
lsls r0, r0, #3
strh r0, [r2, #4]
strh r1, [r2, #6]
strh r1, [r2, #8]
ldr r0, _080A6488 @ =gUnk_02002A40
ldr r0, _080A6488 @ =gSave
ldr r1, _080A648C @ =gMenu
ldrh r0, [r0, #0x20]
ldrh r5, [r1, #0x10]
@@ -1922,8 +1922,8 @@ _080A6478:
_080A6482:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A6484: .4byte gUnk_03001010
_080A6488: .4byte gUnk_02002A40
_080A6484: .4byte gOamCmd
_080A6488: .4byte gSave
_080A648C: .4byte gMenu
_080A6490: .4byte gUnk_08128F58
_080A6494: .4byte 0x000001FB
@@ -1931,7 +1931,7 @@ _080A6494: .4byte 0x000001FB
thumb_func_start sub_080A6498
sub_080A6498: @ 0x080A6498
push {r4, r5, r6, r7, lr}
ldr r0, _080A64E4 @ =gUnk_03001010
ldr r0, _080A64E4 @ =gOamCmd
movs r2, #0
movs r1, #0x80
lsls r1, r1, #4
@@ -1939,7 +1939,7 @@ sub_080A6498: @ 0x080A6498
strh r2, [r0, #6]
strh r2, [r0, #8]
movs r4, #0
ldr r7, _080A64E8 @ =gUnk_02002A40
ldr r7, _080A64E8 @ =gSave
adds r6, r0, #0
movs r5, #0x28
_080A64B0:
@@ -1970,8 +1970,8 @@ _080A64D2:
strh r1, [r0]
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A64E4: .4byte gUnk_03001010
_080A64E8: .4byte gUnk_02002A40
_080A64E4: .4byte gOamCmd
_080A64E8: .4byte gSave
_080A64EC: .4byte gUnk_08128DE8
_080A64F0: .4byte 0x000001FB
_080A64F4: .4byte gScreen
@@ -1980,7 +1980,7 @@ _080A64F8: .4byte 0x00003D3F
thumb_func_start sub_080A64FC
sub_080A64FC: @ 0x080A64FC
push {r4, lr}
bl sub_080AD90C
bl FlushSprites
ldr r1, _080A652C @ =gUnk_08128E70
ldr r4, _080A6530 @ =gMenu
ldrb r0, [r4, #5]
@@ -2027,7 +2027,7 @@ sub_080A6534: @ 0x080A6534
lsls r0, r0, #1
adds r0, r0, r1
ldrh r2, [r0]
ldr r3, _080A65A4 @ =gUnk_02002A40
ldr r3, _080A65A4 @ =gSave
ldrh r1, [r3, #0x20]
adds r0, r2, #0
orrs r0, r1
@@ -2051,7 +2051,7 @@ _080A6594: .4byte 0x0000F7FF
_080A6598: .4byte gPaletteBuffer
_080A659C: .4byte gUnk_08128F4C
_080A65A0: .4byte gUnk_02032EC0
_080A65A4: .4byte gUnk_02002A40
_080A65A4: .4byte gSave
_080A65A8: .4byte gMenu
thumb_func_start sub_080A65AC
@@ -2087,7 +2087,7 @@ _080A65DA:
_080A65E4: .4byte gFadeControl
_080A65E8: .4byte gMenu
_080A65EC:
ldr r0, _080A6604 @ =gUnk_03000FF0
ldr r0, _080A6604 @ =gInput
ldrh r0, [r0, #2]
cmp r0, #1
blt _080A6600
@@ -2100,7 +2100,7 @@ _080A65FC:
_080A6600:
pop {r4, pc}
.align 2, 0
_080A6604: .4byte gUnk_03000FF0
_080A6604: .4byte gInput
thumb_func_start sub_080A6608
sub_080A6608: @ 0x080A6608
@@ -2165,7 +2165,7 @@ sub_080A667C: @ 0x080A667C
ldr r1, _080A66A4 @ =gUnk_08128E94
adds r3, r0, r1
ldrh r1, [r2, #0xa]
ldr r0, _080A66A8 @ =gUnk_03000FF0
ldr r0, _080A66A8 @ =gInput
ldrh r0, [r0]
cmp r0, #0x40
beq _080A66AC
@@ -2176,7 +2176,7 @@ sub_080A667C: @ 0x080A667C
_080A669C: .4byte gMenu
_080A66A0: .4byte gUnk_08128E80
_080A66A4: .4byte gUnk_08128E94
_080A66A8: .4byte gUnk_03000FF0
_080A66A8: .4byte gInput
_080A66AC:
cmp r1, #0
beq _080A66C2
@@ -2206,7 +2206,7 @@ sub_080A66D0: @ 0x080A66D0
mov r6, sb
mov r5, r8
push {r5, r6, r7}
ldr r6, _080A677C @ =gUnk_03001010
ldr r6, _080A677C @ =gOamCmd
movs r0, #0
strh r0, [r6, #4]
strh r0, [r6, #6]
@@ -2260,7 +2260,7 @@ _080A6738:
ldr r1, _080A6780 @ =gMenu
ldrh r0, [r1, #0xa]
mov r8, r0
ldr r2, _080A677C @ =gUnk_03001010
ldr r2, _080A677C @ =gOamCmd
movs r0, #0
strh r0, [r2, #4]
strh r0, [r2, #6]
@@ -2288,7 +2288,7 @@ _080A676E:
lsrs r1, r5, #0x1f
b _080A6796
.align 2, 0
_080A677C: .4byte gUnk_03001010
_080A677C: .4byte gOamCmd
_080A6780: .4byte gMenu
_080A6784: .4byte gUnk_08128E94
_080A6788: .4byte 0x000001FB
@@ -2478,7 +2478,7 @@ _080A68E6:
bl sub_080A698C
bl sub_080A6F40
adds r6, r0, #0
ldr r0, _080A6918 @ =gUnk_02002A40
ldr r0, _080A6918 @ =gSave
ldrh r0, [r0, #0x20]
ands r6, r0
ldr r4, _080A691C @ =gUnk_08128F58
@@ -2488,7 +2488,7 @@ _080A68E6:
_080A690C: .4byte gPlayerState
_080A6910: .4byte gScreenTransition
_080A6914: .4byte 0x000001FB
_080A6918: .4byte gUnk_02002A40
_080A6918: .4byte gSave
_080A691C: .4byte gUnk_08128F58
_080A6920:
movs r0, #1
@@ -2710,7 +2710,7 @@ _080A6AB6:
thumb_func_start sub_080A6AB8
sub_080A6AB8: @ 0x080A6AB8
push {r4, lr}
bl sub_080AD90C
bl FlushSprites
ldr r1, _080A6AF4 @ =gUnk_08128F1C
ldr r4, _080A6AF8 @ =gMenu
ldrb r0, [r4, #5]
@@ -2787,7 +2787,7 @@ sub_080A6B04: @ 0x080A6B04
adds r1, r4, #0
bl sub_0801D79C
ldr r0, _080A6C04 @ =0x00005001
ldr r1, _080A6C08 @ =gUnk_02001A40
ldr r1, _080A6C08 @ =gBG3Buffer
movs r2, #0x80
lsls r2, r2, #5
bl _DmaFill16
@@ -2857,7 +2857,7 @@ _080A6BF8: .4byte gUnk_080FE320
_080A6BFC: .4byte gMenu
_080A6C00: .4byte 0x0000475F
_080A6C04: .4byte 0x00005001
_080A6C08: .4byte gUnk_02001A40
_080A6C08: .4byte gBG3Buffer
_080A6C0C: .4byte gPlayerState
_080A6C10: .4byte gScreenTransition
_080A6C14: .4byte 0x000001FB
@@ -2882,7 +2882,7 @@ _080A6C34: .4byte gFadeControl
_080A6C38: .4byte gMenu
_080A6C3C:
bl sub_080A66D0
ldr r0, _080A6C58 @ =gUnk_03000FF0
ldr r0, _080A6C58 @ =gInput
ldrh r0, [r0, #2]
cmp r0, #1
blt _080A6C6A
@@ -2894,7 +2894,7 @@ _080A6C50:
bl sub_080A71DC
b _080A6C6A
.align 2, 0
_080A6C58: .4byte gUnk_03000FF0
_080A6C58: .4byte gInput
_080A6C5C:
ldr r0, _080A6C6C @ =0x00000103
bl PlaySFX
@@ -2912,7 +2912,7 @@ _080A6C70: .4byte gMenu
thumb_func_start sub_080A6C74
sub_080A6C74: @ 0x080A6C74
push {r4, lr}
bl sub_080AD90C
bl FlushSprites
ldr r1, _080A6CA0 @ =gUnk_08128F24
ldr r4, _080A6CA4 @ =gMenu
ldrb r0, [r4, #5]
@@ -2963,7 +2963,7 @@ sub_080A6CD8: @ 0x080A6CD8
movs r0, #1
strb r0, [r1]
movs r4, #0
ldr r0, _080A6D10 @ =gUnk_03000FF0
ldr r0, _080A6D10 @ =gInput
ldrh r0, [r0, #2]
adds r2, r1, #0
cmp r0, #0x10
@@ -2980,7 +2980,7 @@ sub_080A6CD8: @ 0x080A6CD8
.align 2, 0
_080A6D08: .4byte gFadeControl
_080A6D0C: .4byte gMenu
_080A6D10: .4byte gUnk_03000FF0
_080A6D10: .4byte gInput
_080A6D14:
cmp r0, #8
beq _080A6D38
@@ -3039,7 +3039,7 @@ _080A6D70: .4byte gMenu
sub_080A6D74: @ 0x080A6D74
push {r4, r5, lr}
adds r3, r0, #0
ldr r0, _080A6DA4 @ =gUnk_02002A40
ldr r0, _080A6DA4 @ =gSave
ldr r0, [r0, #0x40]
lsrs r2, r0, #0x18
ldr r0, _080A6DA8 @ =gMenu
@@ -3063,7 +3063,7 @@ _080A6D92:
beq _080A6D92
b _080A6DC6
.align 2, 0
_080A6DA4: .4byte gUnk_02002A40
_080A6DA4: .4byte gSave
_080A6DA8: .4byte gMenu
_080A6DAC:
cmp r2, #0
@@ -3171,7 +3171,7 @@ _080A6E6C: .4byte gUnk_08128024
thumb_func_start sub_080A6E70
sub_080A6E70: @ 0x080A6E70
push {r4, r5, lr}
ldr r1, _080A6ED0 @ =gUnk_03001010
ldr r1, _080A6ED0 @ =gOamCmd
movs r0, #0
strh r0, [r1, #4]
strh r0, [r1, #6]
@@ -3197,7 +3197,7 @@ _080A6EA0:
ldr r0, _080A6ED8 @ =0x000001FB
bl sub_080ADA14
movs r4, #0
ldr r5, _080A6EDC @ =gUnk_02002A40
ldr r5, _080A6EDC @ =gSave
_080A6EAA:
adds r0, r4, #0
adds r0, #0x18
@@ -3218,10 +3218,10 @@ _080A6EC8:
bls _080A6EAA
pop {r4, r5, pc}
.align 2, 0
_080A6ED0: .4byte gUnk_03001010
_080A6ED0: .4byte gOamCmd
_080A6ED4: .4byte gMenu
_080A6ED8: .4byte 0x000001FB
_080A6EDC: .4byte gUnk_02002A40
_080A6EDC: .4byte gSave
thumb_func_start sub_080A6EE0
sub_080A6EE0: @ 0x080A6EE0
@@ -3247,7 +3247,7 @@ sub_080A6EE0: @ 0x080A6EE0
adds r3, r3, r0
ldrh r0, [r1, #2]
adds r4, r4, r0
ldr r6, _080A6F3C @ =gUnk_03001010
ldr r6, _080A6F3C @ =gOamCmd
lsls r0, r3, #2
adds r0, r0, r3
lsls r0, r0, #5
@@ -3268,7 +3268,7 @@ sub_080A6EE0: @ 0x080A6EE0
.align 2, 0
_080A6F34: .4byte gUnk_08128024
_080A6F38: .4byte gAreaRoomHeaders
_080A6F3C: .4byte gUnk_03001010
_080A6F3C: .4byte gOamCmd
thumb_func_start sub_080A6F40
sub_080A6F40: @ 0x080A6F40
@@ -3343,7 +3343,7 @@ sub_080A6FB4: @ 0x080A6FB4
beq _080A6FD6
b _080A6FFA
_080A6FC8:
ldr r0, _080A6FE4 @ =gUnk_02002A40
ldr r0, _080A6FE4 @ =gSave
movs r1, #1
lsls r1, r2
ldr r0, [r0, #0x40]
@@ -3358,7 +3358,7 @@ _080A6FD6:
ldr r5, _080A6FEC @ =gUnk_08128FC0
b _080A6FFA
.align 2, 0
_080A6FE4: .4byte gUnk_02002A40
_080A6FE4: .4byte gSave
_080A6FE8: .4byte gUnk_08127F94
_080A6FEC: .4byte gUnk_08128FC0
_080A6FF0:
@@ -3955,7 +3955,7 @@ sub_080A74F4: @ 0x080A74F4
ldr r1, _080A7524 @ =gUnk_03001000
movs r0, #0
strb r0, [r1, #0xb]
bl sub_080AD90C
bl FlushSprites
bl sub_0805E5C0
bl sub_0805E5F8
bl sub_0801C344
@@ -4910,7 +4910,7 @@ GiveItemWithCutscene: @ 0x080A7C38
adds r7, r2, #0
cmp r5, #0x3f
bne _080A7C52
ldr r0, _080A7C78 @ =gUnk_02002A40
ldr r0, _080A7C78 @ =gSave
adds r0, #0xbb
ldrb r0, [r0]
cmp r0, #0
@@ -4936,7 +4936,7 @@ _080A7C72:
adds r0, r4, #0
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A7C78: .4byte gUnk_02002A40
_080A7C78: .4byte gSave
thumb_func_start sub_080A7C7C
sub_080A7C7C: @ 0x080A7C7C
@@ -12666,7 +12666,7 @@ _080AB60A:
b _080AB62E
_080AB610:
adds r0, r4, #0
bl sub_080043B4
bl CreateItemOnGround
movs r0, #1
b _080AB630
_080AB61A:
@@ -12676,7 +12676,7 @@ _080AB61A:
b _080AB630
_080AB624:
adds r0, r4, #0
bl sub_080043AC
bl CreateChestSpawner
movs r0, #1
b _080AB630
_080AB62E:
asm/code_080AD90C.s
+5 -5
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_080AD90C
sub_080AD90C: @ 0x080AD90C
thumb_func_start FlushSprites
FlushSprites: @ 0x080AD90C
ldr r1, _080AD914 @ =gUnk_03000000
movs r0, #0
strb r0, [r1, #3]
@@ -148,13 +148,13 @@ sub_080ADA14: @ 0x080ADA14
adds r3, r0, #0
adds r2, r1, #0
ldr r4, _080ADA28 @ =gUnk_03006580
ldr r0, _080ADA2C @ =gUnk_03001010
ldr r0, _080ADA2C @ =gOamCmd
adds r1, r3, #0
bl _call_via_r4
pop {r4, pc}
.align 2, 0
_080ADA28: .4byte gUnk_03006580
_080ADA2C: .4byte gUnk_03001010
_080ADA2C: .4byte gOamCmd
thumb_func_start sub_080ADA30
sub_080ADA30: @ 0x080ADA30
@@ -3527,4 +3527,4 @@ _080AF300:
.align 2, 0
_080AF304: .4byte gArea
_080AF308: .4byte 0x0000085C
_080AF30C: .4byte gUnk_0813A76C
_080AF30C: .4byte gUnk_0813A76C
asm/code_080B1520.s
+1 -1
View File
@@ -548,4 +548,4 @@ _080B1912:
pop {r1}
bx r1
.align 2, 0
asm/createBowEntity.s
-13
View File
@@ -6,19 +6,6 @@
.text
thumb_func_start sub_08018FCC
sub_08018FCC: @ 0x08018FCC
push {lr}
ldr r2, _08018FE0 @ =gUnk_080B3E30
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_08018FE0: .4byte gUnk_080B3E30
thumb_func_start sub_08018FE4
sub_08018FE4: @ 0x08018FE4
push {r4, r5, r6, lr}
asm/cucco.s
+2 -2
View File
@@ -278,7 +278,7 @@ sub_0806E6A8: @ 0x0806E6A8
adds r4, r0, #0
movs r5, #0
bl sub_08002632
ldr r1, _0806E6D4 @ =gUnk_02002A40
ldr r1, _0806E6D4 @ =gSave
ldr r2, _0806E6D8 @ =0x000001C1
adds r1, r1, r2
adds r0, r0, r1
@@ -295,7 +295,7 @@ _0806E6C2:
bl TextboxNoOverlap
pop {r4, r5, pc}
.align 2, 0
_0806E6D4: .4byte gUnk_02002A40
_0806E6D4: .4byte gSave
_0806E6D8: .4byte 0x000001C1
_0806E6DC: .4byte gUnk_081145D0
asm/din.s
+2 -2
View File
@@ -89,7 +89,7 @@ sub_08064828: @ 0x08064828
adds r4, r0, #0
bl sub_0801E99C
adds r5, r0, #0
ldr r6, _08064858 @ =gUnk_02002A40
ldr r6, _08064858 @ =gSave
adds r0, r4, #0
bl sub_08002632
ldr r2, _0806485C @ =0x00000141
@@ -108,7 +108,7 @@ _0806484E:
bl sub_08078784
pop {r4, r5, r6, pc}
.align 2, 0
_08064858: .4byte gUnk_02002A40
_08064858: .4byte gSave
_0806485C: .4byte 0x00000141
thumb_func_start Din_Fusion
asm/dog.s
+5 -5
View File
@@ -727,7 +727,7 @@ sub_0806A080: @ 0x0806A080
lsls r1, r2, #2
adds r1, r1, r2
lsls r1, r1, #4
ldr r2, _0806A09C @ =gUnk_02002A40
ldr r2, _0806A09C @ =gSave
ldrb r2, [r2, #8]
lsls r2, r2, #3
ldr r3, _0806A0A0 @ =gUnk_08111E34
@@ -736,7 +736,7 @@ sub_0806A080: @ 0x0806A080
bl ShowNPCDialogue
pop {pc}
.align 2, 0
_0806A09C: .4byte gUnk_02002A40
_0806A09C: .4byte gSave
_0806A0A0: .4byte gUnk_08111E34
thumb_func_start sub_0806A0A4
@@ -798,7 +798,7 @@ _0806A100:
bl SetLocalFlag
_0806A120:
ldr r2, _0806A13C @ =gUnk_08111F74
ldr r0, _0806A140 @ =gUnk_02002A40
ldr r0, _0806A140 @ =gSave
ldrb r1, [r0, #8]
lsls r0, r1, #2
adds r0, r0, r1
@@ -811,7 +811,7 @@ _0806A120:
pop {r4, r5, r6, pc}
.align 2, 0
_0806A13C: .4byte gUnk_08111F74
_0806A140: .4byte gUnk_02002A40
_0806A140: .4byte gSave
thumb_func_start sub_0806A144
sub_0806A144: @ 0x0806A144
@@ -884,4 +884,4 @@ _0806A1CE:
bl GetNextFrame
_0806A1D4:
pop {r4, pc}
.align 2, 0
.align 2, 0
asm/drLeft.s
+2 -2
View File
@@ -110,7 +110,7 @@ sub_0806C028: @ 0x0806C028
sub_0806C038: @ 0x0806C038
push {r4, r5, lr}
adds r5, r0, #0
ldr r0, _0806C074 @ =gUnk_02002A40
ldr r0, _0806C074 @ =gSave
ldrb r0, [r0, #8]
subs r4, r0, #5
cmp r4, #0
@@ -135,7 +135,7 @@ _0806C048:
bl SetLocalFlag
b _0806C086
.align 2, 0
_0806C074: .4byte gUnk_02002A40
_0806C074: .4byte gSave
_0806C078:
movs r4, #7
movs r0, #0x3a
asm/drawHealth.s
+2 -2
View File
@@ -23,7 +23,7 @@ sub_0801C6B0: @ 0x0801C6B0
.align 2, 0
_0801C6CC: .4byte gUnk_0200AF00
_0801C6D0:
ldr r5, _0801C6F8 @ =gUnk_02002A40
ldr r5, _0801C6F8 @ =gSave
adds r0, r5, #0
adds r0, #0xab
ldrb r0, [r0]
@@ -43,7 +43,7 @@ _0801C6EA:
lsrs r1, r0, #1
b _0801C6FE
.align 2, 0
_0801C6F8: .4byte gUnk_02002A40
_0801C6F8: .4byte gSave
_0801C6FC:
movs r1, #1
_0801C6FE:
asm/drawRupees.s
+6 -6
View File
@@ -54,7 +54,7 @@ _0801C4FC:
adds r4, r3, #0
adds r4, #0x40
ldr r1, _0801C550 @ =gWalletSizes
ldr r2, _0801C554 @ =gUnk_02002A40
ldr r2, _0801C554 @ =gSave
adds r0, r2, #0
adds r0, #0xa8
ldrb r0, [r0]
@@ -88,12 +88,12 @@ _0801C4FC:
.align 2, 0
_0801C54C: .4byte gUnk_02035160
_0801C550: .4byte gWalletSizes
_0801C554: .4byte gUnk_02002A40
_0801C554: .4byte gSave
_0801C558: .4byte 0x0000F070
_0801C55C: .4byte gScreen
_0801C560:
movs r4, #0
ldr r2, _0801C580 @ =gUnk_02002A40
ldr r2, _0801C580 @ =gSave
_0801C564:
adds r5, r6, #0
adds r0, r2, #0
@@ -109,7 +109,7 @@ _0801C564:
strh r0, [r5, #0xe]
b _0801C588
.align 2, 0
_0801C580: .4byte gUnk_02002A40
_0801C580: .4byte gSave
_0801C584:
subs r0, r1, #1
strh r0, [r6, #0xe]
@@ -133,7 +133,7 @@ _0801C5A4:
ldrh r3, [r4, #0xe]
movs r2, #0
ldr r1, _0801C5D8 @ =gWalletSizes
ldr r0, _0801C5DC @ =gUnk_02002A40
ldr r0, _0801C5DC @ =gSave
adds r0, #0xa8
ldrb r0, [r0]
lsls r0, r0, #2
@@ -157,4 +157,4 @@ _0801C5D0:
.align 2, 0
_0801C5D4: .4byte gUnk_0200AF00
_0801C5D8: .4byte gWalletSizes
_0801C5DC: .4byte gUnk_02002A40
_0801C5DC: .4byte gSave
asm/drawUI.s
+1 -1
View File
@@ -23,4 +23,4 @@ sub_0801C344: @ 0x0801C344
bl sub_0801C1D4
pop {r4, r5, pc}
.align 2, 0
_0801C36C: .4byte gUnk_0200AF00
_0801C36C: .4byte gUnk_0200AF00
asm/enemy5F.s
+1 -1
View File
@@ -471,4 +471,4 @@ sub_080485FC: @ 0x080485FC
pop {r4, pc}
.align 2, 0
_08048638: .4byte gUnk_080D1D98
_0804863C: .4byte gUnk_080D1D78
_0804863C: .4byte gUnk_080D1D78
asm/evilSpirit/sub_080862B8.inc
+1 -1
View File
@@ -97,4 +97,4 @@ _08086360:
adds r0, r4, #0
bl sub_08086370
pop {r4, r5, pc}
.syntax divided
.syntax divided
asm/ezloCap.s
+2 -2
View File
@@ -510,7 +510,7 @@ _0806DC36:
thumb_func_start sub_0806DC3C
sub_0806DC3C: @ 0x0806DC3C
ldr r2, _0806DC54 @ =gUnk_02002A40
ldr r2, _0806DC54 @ =gSave
adds r1, r2, #0
adds r1, #0xb4
ldrb r3, [r1]
@@ -523,7 +523,7 @@ sub_0806DC3C: @ 0x0806DC3C
strb r1, [r0]
bx lr
.align 2, 0
_0806DC54: .4byte gUnk_02002A40
_0806DC54: .4byte gSave
thumb_func_start sub_0806DC58
sub_0806DC58: @ 0x0806DC58
asm/farore.s
+2 -2
View File
@@ -89,7 +89,7 @@ sub_08064A28: @ 0x08064A28
adds r4, r0, #0
bl sub_0801E99C
adds r5, r0, #0
ldr r6, _08064A58 @ =gUnk_02002A40
ldr r6, _08064A58 @ =gSave
adds r0, r4, #0
bl sub_08002632
ldr r2, _08064A5C @ =0x00000141
@@ -108,7 +108,7 @@ _08064A4E:
bl sub_08078784
pop {r4, r5, r6, pc}
.align 2, 0
_08064A58: .4byte gUnk_02002A40
_08064A58: .4byte gSave
_08064A5C: .4byte 0x00000141
thumb_func_start Farore_Fusion
asm/festari.s
+1 -1
View File
@@ -103,4 +103,4 @@ _0805FFCE:
bl UpdateAnimationSingleFrame
_0805FFD4:
pop {r4, pc}
.align 2, 0
.align 2, 0
asm/figurineDevice.s
+23 -23
View File
@@ -398,7 +398,7 @@ _08087EAC:
subs r0, #1
strb r0, [r4, #0xe]
_08087EB6:
ldr r6, _08087ED4 @ =gUnk_03000FF0
ldr r6, _08087ED4 @ =gInput
ldrh r0, [r6, #2]
ands r1, r0
cmp r1, #0
@@ -412,7 +412,7 @@ _08087EB6:
bl sub_08050384
b _08087F4E
.align 2, 0
_08087ED4: .4byte gUnk_03000FF0
_08087ED4: .4byte gInput
_08087ED8:
adds r2, r4, #0
adds r2, #0x81
@@ -560,7 +560,7 @@ _08087FEA:
adds r1, #0x81
ldrb r6, [r1]
adds r2, r6, r4
ldr r0, _0808801C @ =gUnk_02002A40
ldr r0, _0808801C @ =gSave
adds r0, #0xc2
ldrh r0, [r0]
cmp r2, r0
@@ -583,7 +583,7 @@ _08088014:
bl sub_08088034
b _08088032
.align 2, 0
_0808801C: .4byte gUnk_02002A40
_0808801C: .4byte gSave
_08088020:
movs r3, #0x64
mov r0, ip
@@ -617,14 +617,14 @@ sub_0808804C: @ 0x0808804C
push {r4, r5, lr}
adds r5, r0, #0
movs r4, #0
ldr r0, _08088060 @ =gUnk_02002A40
ldr r0, _08088060 @ =gSave
ldrb r0, [r0, #6]
cmp r0, #0
beq _08088064
movs r4, #9
b _080880D0
.align 2, 0
_08088060: .4byte gUnk_02002A40
_08088060: .4byte gSave
_08088064:
movs r0, #6
bl CheckGlobalFlag
@@ -723,7 +723,7 @@ _0808810A:
lsrs r0, r0, #0x18
cmp r0, #4
bne _08088156
ldr r5, _0808815C @ =gUnk_02002A40
ldr r5, _0808815C @ =gSave
adds r0, r7, #0
adds r0, #0x80
ldrb r1, [r5, #9]
@@ -743,7 +743,7 @@ _0808813A:
bl CheckLocalFlag
cmp r0, #0
beq _08088156
ldr r0, _0808815C @ =gUnk_02002A40
ldr r0, _0808815C @ =gSave
adds r0, #0xb0
ldrb r1, [r4]
ldrb r0, [r0]
@@ -755,7 +755,7 @@ _08088156:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08088158: .4byte gUnk_08120AAC
_0808815C: .4byte gUnk_02002A40
_0808815C: .4byte gSave
thumb_func_start sub_08088160
sub_08088160: @ 0x08088160
@@ -894,7 +894,7 @@ sub_0808826C: @ 0x0808826C
movs r4, #0x64
adds r0, #0x80
ldrb r1, [r0]
ldr r0, _080882A4 @ =gUnk_02002A40
ldr r0, _080882A4 @ =gSave
adds r0, #0xb0
ldrb r0, [r0]
subs r0, r1, r0
@@ -917,7 +917,7 @@ _08088298:
strb r4, [r0]
pop {r4, r5, pc}
.align 2, 0
_080882A4: .4byte gUnk_02002A40
_080882A4: .4byte gSave
thumb_func_start sub_080882A8
sub_080882A8: @ 0x080882A8
@@ -1075,7 +1075,7 @@ _080883DE:
cmp r5, #0
beq _08088414
_080883E2:
ldr r0, _08088404 @ =gUnk_02002A40
ldr r0, _08088404 @ =gSave
adds r0, #0xb0
ldrb r1, [r0]
adds r1, #1
@@ -1091,7 +1091,7 @@ _080883E2:
bl SetRoomFlag
b _08088414
.align 2, 0
_08088404: .4byte gUnk_02002A40
_08088404: .4byte gSave
_08088408:
movs r0, #0x5f
bl SetLocalFlag
@@ -1111,7 +1111,7 @@ _08088414:
sub_08088424: @ 0x08088424
push {lr}
adds r1, r0, #0
ldr r0, _08088440 @ =gUnk_02002A40
ldr r0, _08088440 @ =gSave
adds r0, #0xb0
ldrb r0, [r0]
cmp r0, #0x31
@@ -1124,7 +1124,7 @@ sub_08088424: @ 0x08088424
movs r0, #0xf
b _08088474
.align 2, 0
_08088440: .4byte gUnk_02002A40
_08088440: .4byte gSave
_08088444:
cmp r0, #0x4f
bhi _08088456
@@ -1180,7 +1180,7 @@ _0808849C:
.align 2, 0
_080884A0: .4byte 0x00004325
_080884A4:
ldr r1, _080884C0 @ =gUnk_02002A40
ldr r1, _080884C0 @ =gSave
adds r0, r1, #0
adds r0, #0xb0
ldrb r0, [r0]
@@ -1194,7 +1194,7 @@ _080884A4:
ldr r1, _080884C4 @ =0x00004329
b _080884D2
.align 2, 0
_080884C0: .4byte gUnk_02002A40
_080884C0: .4byte gSave
_080884C4: .4byte 0x00004329
_080884C8:
ldrb r0, [r1, #6]
@@ -1229,7 +1229,7 @@ _08088500: .4byte gPlayerEntity
thumb_func_start sub_08088504
sub_08088504: @ 0x08088504
push {lr}
ldr r0, _08088518 @ =gUnk_02002A40
ldr r0, _08088518 @ =gSave
adds r0, #0xb0
ldrb r0, [r0]
cmp r0, #0x82
@@ -1239,7 +1239,7 @@ sub_08088504: @ 0x08088504
ldr r0, _0808851C @ =0x0000432F
b _0808852A
.align 2, 0
_08088518: .4byte gUnk_02002A40
_08088518: .4byte gSave
_0808851C: .4byte 0x0000432F
_08088520:
ldr r0, _08088524 @ =0x00004314
@@ -1263,7 +1263,7 @@ _08088540: .4byte gTextBox
thumb_func_start sub_08088544
sub_08088544: @ 0x08088544
push {lr}
ldr r0, _08088568 @ =gUnk_02002A40
ldr r0, _08088568 @ =gSave
adds r0, #0xb0
ldrb r0, [r0]
ldr r1, _0808856C @ =0x00004315
@@ -1280,7 +1280,7 @@ _08088554:
strb r1, [r0, #7]
pop {pc}
.align 2, 0
_08088568: .4byte gUnk_02002A40
_08088568: .4byte gSave
_0808856C: .4byte 0x00004315
_08088570: .4byte gTextBox
@@ -1340,7 +1340,7 @@ sub_080885B0: @ 0x080885B0
_080885E0: .4byte 0x00004326
_080885E4: .4byte gTextBox
_080885E8:
ldr r1, _08088618 @ =gUnk_02002A40
ldr r1, _08088618 @ =gSave
adds r0, r1, #0
adds r0, #0xb1
ldrb r0, [r0]
@@ -1362,7 +1362,7 @@ _0808860A:
bl ClearRoomFlag
pop {pc}
.align 2, 0
_08088618: .4byte gUnk_02002A40
_08088618: .4byte gSave
thumb_func_start sub_0808861C
sub_0808861C: @ 0x0808861C
asm/fileScreen.s
Executable
+848
View File
@@ -0,0 +1,848 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start HandleGameplayScreen
HandleGameplayScreen: @ 0x08051988
push {lr}
ldr r1, _080519A4 @ =gScreenTransition
ldr r0, [r1]
adds r0, #1
str r0, [r1]
ldr r1, _080519A8 @ =gUnk_080FC9D8
ldr r0, _080519AC @ =gUnk_03001000
ldrb r0, [r0, #3]
lsls r0, r0, #2
adds r0, r0, r1
ldr r0, [r0]
bl _call_via_r0
pop {pc}
.align 2, 0
_080519A4: .4byte gScreenTransition
_080519A8: .4byte gUnk_080FC9D8
_080519AC: .4byte gUnk_03001000
thumb_func_start sub_080519B0
sub_080519B0: @ 0x080519B0
push {r4, r5, lr}
ldr r0, _08051A04 @ =gFadeControl
ldrb r5, [r0]
cmp r5, #0
bne _08051A02
movs r0, #1
bl sub_0801DA90
bl sub_080A3210
bl sub_0801DA7C
bl sub_080A7124
bl sub_0807059C
ldr r4, _08051A08 @ =gScreenTransition
adds r0, r4, #0
movs r1, #0xb0
bl _DmaZero
bl sub_08049CD4
bl sub_080300AC
bl sub_0807CA18
ldr r0, _08051A0C @ =gUnk_02002AC8
adds r1, r4, #0
adds r1, #0xc
movs r2, #0x20
bl _DmaCopy
movs r0, #4
strb r0, [r4, #9]
bl sub_08053518
ldr r1, _08051A10 @ =gUnk_03001000
movs r0, #1
strb r0, [r1, #3]
strb r5, [r1, #4]
_08051A02:
pop {r4, r5, pc}
.align 2, 0
_08051A04: .4byte gFadeControl
_08051A08: .4byte gScreenTransition
_08051A0C: .4byte gUnk_02002AC8
_08051A10: .4byte gUnk_03001000
thumb_func_start sub_08051A14
sub_08051A14: @ 0x08051A14
push {lr}
movs r0, #1
bl sub_0801DA90
ldr r1, _08051A70 @ =gFadeControl
movs r0, #1
rsbs r0, r0, #0
str r0, [r1, #4]
ldr r0, _08051A74 @ =gUnk_03000000
ldr r1, _08051A78 @ =0x00000B74
bl _DmaZero
ldr r0, _08051A7C @ =gUnk_02032EC0
movs r1, #0xed
lsls r1, r1, #2
bl _DmaZero
bl EraseAllEntities
bl sub_080197AC
bl sub_08080668
bl sub_080ADD30
movs r0, #1
bl sub_0801CFA8
bl sub_0806FD8C
ldr r2, _08051A80 @ =gRoomControls
ldr r1, _08051A84 @ =gScreenTransition
ldrb r0, [r1, #0xc]
strb r0, [r2, #4]
ldrb r0, [r1, #0xd]
strb r0, [r2, #5]
bl sub_08053320
ldr r1, _08051A88 @ =gUnk_02024490
movs r0, #1
strb r0, [r1]
ldr r1, _08051A8C @ =gUnk_03001000
movs r0, #2
strb r0, [r1, #3]
pop {pc}
.align 2, 0
_08051A70: .4byte gFadeControl
_08051A74: .4byte gUnk_03000000
_08051A78: .4byte 0x00000B74
_08051A7C: .4byte gUnk_02032EC0
_08051A80: .4byte gRoomControls
_08051A84: .4byte gScreenTransition
_08051A88: .4byte gUnk_02024490
_08051A8C: .4byte gUnk_03001000
thumb_func_start sub_08051A90
sub_08051A90: @ 0x08051A90
push {lr}
ldr r1, _08051AA4 @ =gUnk_080FC9E8
ldr r0, _08051AA8 @ =gUnk_03001000
ldrb r0, [r0, #4]
lsls r0, r0, #2
adds r0, r0, r1
ldr r0, [r0]
bl _call_via_r0
pop {pc}
.align 2, 0
_08051AA4: .4byte gUnk_080FC9E8
_08051AA8: .4byte gUnk_03001000
thumb_func_start InitializeNewRoom
InitializeNewRoom: @ 0x08051AAC
push {lr}
bl sub_0805E5A8
ldr r1, _08051AE4 @ =gScreen
movs r2, #0
movs r0, #0xba
lsls r0, r0, #5
strh r0, [r1]
ldr r1, _08051AE8 @ =gUnk_03001000
movs r0, #1
strb r0, [r1, #4]
ldr r0, _08051AEC @ =gScreenTransition
strb r2, [r0, #8]
strb r2, [r0, #4]
strb r2, [r0, #5]
bl sub_08056418
bl sub_08052CFC
movs r0, #0
bl sub_0801C370
bl InitializeEntities
bl sub_0801855C
pop {pc}
.align 2, 0
_08051AE4: .4byte gScreen
_08051AE8: .4byte gUnk_03001000
_08051AEC: .4byte gScreenTransition
thumb_func_start sub_08051AF0
sub_08051AF0: @ 0x08051AF0
push {r4, r5, lr}
bl sub_0805E5C0
bl sub_0805BBBC
cmp r0, #0
bne _08051B02
bl sub_0807FC40
_08051B02:
bl sub_0801B060
bl sub_08000108
bl sub_0801C344
bl sub_0805E5F8
bl FlushSprites
bl sub_0801C208
bl sub_08078CB4
bl sub_080AD9B0
bl sub_080AD918
ldr r0, _08051BB0 @ =gFadeControl
ldrb r0, [r0]
cmp r0, #0
bne _08051BAE
ldr r0, _08051BB4 @ =gRoomControls
ldrh r0, [r0]
cmp r0, #0
bne _08051BAE
bl sub_08052F1C
ldr r5, _08051BB8 @ =gArea
movs r0, #0x86
lsls r0, r0, #4
adds r3, r5, r0
ldr r1, _08051BBC @ =0x00000864
adds r0, r5, r1
ldr r1, [r3]
ldr r2, [r0]
cmp r1, r2
beq _08051B5A
str r2, [r3]
ldr r0, _08051BC0 @ =0x800B0000
orrs r2, r0
adds r0, r2, #0
bl PlaySFX
_08051B5A:
bl sub_0805E9F4
bl sub_0805BC04
adds r4, r0, #0
cmp r4, #0
bne _08051BAE
bl sub_08052C5C
bl sub_0805E5B4
bl sub_08051E04
bl sub_080300C4
ldr r1, _08051BC4 @ =gUnk_03001000
movs r0, #2
strb r0, [r1, #4]
movs r0, #0
bl sub_08078A90
ldr r0, _08051BC8 @ =gUnk_02034490
strb r4, [r0]
adds r0, r5, #0
adds r0, #0x28
ldrb r0, [r0]
cmp r0, #0xff
beq _08051B96
bl sub_0801855C
_08051B96:
bl sub_08052BF8
bl sub_08053178
ldr r0, _08051BCC @ =gRoomVars
ldrb r0, [r0]
cmp r0, #0
bne _08051BAE
movs r0, #0
movs r1, #1
bl sub_0805E4E0
_08051BAE:
pop {r4, r5, pc}
.align 2, 0
_08051BB0: .4byte gFadeControl
_08051BB4: .4byte gRoomControls
_08051BB8: .4byte gArea
_08051BBC: .4byte 0x00000864
_08051BC0: .4byte 0x800B0000
_08051BC4: .4byte gUnk_03001000
_08051BC8: .4byte gUnk_02034490
_08051BCC: .4byte gRoomVars
thumb_func_start sub_08051BD0
sub_08051BD0: @ 0x08051BD0
push {lr}
bl sub_080705AC
cmp r0, #0
bne _08051C9C
bl sub_0804AA84
cmp r0, #0
bne _08051C9C
bl sub_0805340C
ldr r0, _08051C5C @ =gUnk_03001000
ldrb r0, [r0, #4]
cmp r0, #2
bne _08051C9C
ldr r0, _08051C60 @ =gTextBox
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
cmp r0, #0
bne _08051C02
ldr r0, _08051C64 @ =gUnk_03003DC0
ldrh r0, [r0, #8]
cmp r0, #0
beq _08051C06
_08051C02:
bl sub_08078B48
_08051C06:
bl FlushSprites
bl sub_0805E5C0
bl sub_08080A40
bl sub_080175F4
bl sub_0807FC40
bl sub_0801B060
bl sub_08000108
bl sub_08052C3C
bl sub_0801C344
bl sub_0805E5F8
bl sub_0801C208
bl sub_08078CB4
bl sub_080AD9B0
bl sub_0805291C
bl sub_08052C5C
bl sub_080528B4
bl sub_080185F8
bl sub_080AD918
ldr r0, _08051C68 @ =gRoomControls
ldrh r2, [r0]
cmp r2, #1
beq _08051C6C
cmp r2, #2
beq _08051C88
b _08051C9C
.align 2, 0
_08051C5C: .4byte gUnk_03001000
_08051C60: .4byte gTextBox
_08051C64: .4byte gUnk_03003DC0
_08051C68: .4byte gRoomControls
_08051C6C:
ldr r0, _08051C80 @ =gPlayerState
movs r1, #0x17
strb r1, [r0, #0xc]
ldr r0, _08051C84 @ =gUnk_03001000
strb r2, [r0, #4]
bl sub_0805E59C
bl sub_08051D98
b _08051C9C
.align 2, 0
_08051C80: .4byte gPlayerState
_08051C84: .4byte gUnk_03001000
_08051C88:
ldr r1, _08051CA0 @ =gPlayerState
movs r0, #0x17
strb r0, [r1, #0xc]
ldr r1, _08051CA4 @ =gUnk_03001000
movs r0, #1
strb r0, [r1, #4]
bl sub_0805E59C
bl sub_08051DCC
_08051C9C:
pop {pc}
.align 2, 0
_08051CA0: .4byte gPlayerState
_08051CA4: .4byte gUnk_03001000
thumb_func_start sub_08051CA8
sub_08051CA8: @ 0x08051CA8
push {lr}
bl sub_080705AC
cmp r0, #0
bne _08051CEA
bl sub_0805E5C0
bl sub_080175F4
bl sub_0801C344
bl sub_0805E5F8
bl FlushSprites
bl sub_0801C208
bl sub_08078CB4
bl sub_080AD9B0
bl sub_0805291C
bl sub_080528B4
bl sub_080AD918
ldr r0, _08051CEC @ =gFadeControl
ldrb r0, [r0]
cmp r0, #0
bne _08051CEA
bl sub_0805E5B4
_08051CEA:
pop {pc}
.align 2, 0
_08051CEC: .4byte gFadeControl
thumb_func_start sub_08051CF0
sub_08051CF0: @ 0x08051CF0
push {r4, r5, r6, lr}
bl FlushSprites
bl sub_0801C208
bl sub_080AD9B0
ldr r5, _08051D20 @ =gUnk_03001000
movs r6, #1
strb r6, [r5, #0xb]
bl sub_080AD918
ldr r0, _08051D24 @ =gFadeControl
ldrb r4, [r0]
cmp r4, #0
bne _08051D1E
movs r0, #1
bl sub_0801DA90
strb r6, [r5, #3]
strb r4, [r5, #4]
ldr r0, _08051D28 @ =gScreenTransition
strb r6, [r0, #8]
_08051D1E:
pop {r4, r5, r6, pc}
.align 2, 0
_08051D20: .4byte gUnk_03001000
_08051D24: .4byte gFadeControl
_08051D28: .4byte gScreenTransition
thumb_func_start sub_08051D2C
sub_08051D2C: @ 0x08051D2C
push {lr}
movs r0, #7
movs r1, #8
bl DoFade
movs r0, #3
bl InitScreen
pop {pc}
.align 2, 0
thumb_func_start InitializeEntities
InitializeEntities: @ 0x08051D40
push {lr}
bl sub_08052EA0
bl sub_0804AF90
bl sub_0804AFDC
bl InitializePlayer
ldr r1, _08051D90 @ =gUnk_03004030
movs r0, #0
str r0, [r1]
bl sub_0807C740
ldr r1, _08051D94 @ =gUnk_02000070
movs r0, #1
strb r0, [r1]
bl sub_0805283C
movs r0, #0
movs r1, #0
bl sub_0801D79C
bl LoadRoom
bl CreateZeldaFollower
bl sub_0804AFF4
bl sub_0805329C
bl sub_08000108
movs r0, #1
rsbs r0, r0, #0
bl sub_0805BB74
bl sub_080531F8
pop {pc}
.align 2, 0
_08051D90: .4byte gUnk_03004030
_08051D94: .4byte gUnk_02000070
thumb_func_start sub_08051D98
sub_08051D98: @ 0x08051D98
push {lr}
bl sub_08052EA0
ldr r1, _08051DC8 @ =gRoomVars
movs r0, #1
strb r0, [r1]
bl sub_0805E9A8
bl sub_0804AF90
bl sub_0804AFDC
bl sub_0807C0DC
bl sub_0805283C
bl LoadRoom
bl sub_0804AFF4
movs r0, #1
bl sub_08078A90
pop {pc}
.align 2, 0
_08051DC8: .4byte gRoomVars
thumb_func_start sub_08051DCC
sub_08051DCC: @ 0x08051DCC
push {r4, lr}
ldr r1, _08051DFC @ =gRoomControls
ldr r4, _08051E00 @ =gScreenTransition
ldrb r0, [r4, #0xc]
strb r0, [r1, #4]
ldrb r0, [r4, #0xd]
strb r0, [r1, #5]
bl sub_080528F0
movs r0, #3
strb r0, [r4, #9]
bl sub_08052CFC
bl sub_08052EA0
bl sub_0805E9A8
bl sub_0804AF90
bl sub_0804AFDC
bl sub_0805283C
pop {r4, pc}
.align 2, 0
_08051DFC: .4byte gRoomControls
_08051E00: .4byte gScreenTransition
thumb_func_start sub_08051E04
sub_08051E04: @ 0x08051E04
push {lr}
bl sub_08052620
cmp r0, #0
beq _08051E60
ldr r1, _08051E2C @ =gPlayerEntity
movs r2, #0x2e
ldrsh r0, [r1, r2]
cmp r0, #0
bge _08051E1A
adds r0, #0xf
_08051E1A:
asrs r2, r0, #4
movs r3, #0x32
ldrsh r0, [r1, r3]
cmp r0, #0
bge _08051E26
adds r0, #0xf
_08051E26:
asrs r1, r0, #4
ldr r3, _08051E30 @ =gUnk_08127F94
b _08051E36
.align 2, 0
_08051E2C: .4byte gPlayerEntity
_08051E30: .4byte gUnk_08127F94
_08051E34:
adds r3, #8
_08051E36:
ldrb r0, [r3]
cmp r0, #0xff
beq _08051E60
cmp r0, r2
bhi _08051E34
ldrb r0, [r3, #2]
cmp r0, r2
blo _08051E34
ldrb r0, [r3, #1]
cmp r0, r1
bhi _08051E34
ldrb r0, [r3, #3]
cmp r0, r1
blo _08051E34
ldr r2, _08051E64 @ =gSave
movs r1, #1
ldrb r3, [r3, #4]
lsls r1, r3
ldr r0, [r2, #0x40]
orrs r0, r1
str r0, [r2, #0x40]
_08051E60:
pop {pc}
.align 2, 0
_08051E64: .4byte gSave
thumb_func_start sub_08051E68
sub_08051E68: @ 0x08051E68
push {lr}
ldr r1, _08051E7C @ =gUnk_080FCA08
ldr r0, _08051E80 @ =gMenu
ldrb r0, [r0, #5]
lsls r0, r0, #2
adds r0, r0, r1
ldr r0, [r0]
bl _call_via_r0
pop {pc}
.align 2, 0
_08051E7C: .4byte gUnk_080FCA08
_08051E80: .4byte gMenu
thumb_func_start sub_08051E84
sub_08051E84: @ 0x08051E84
push {r4, r5, r6, lr}
ldr r0, _08051EF0 @ =gUnk_02032EC0
ldrb r4, [r0, #3]
lsls r4, r4, #3
ldr r0, _08051EF4 @ =gUnk_080FCA20
adds r4, r4, r0
ldr r5, _08051EF8 @ =gRoomControls
ldrb r0, [r4]
strb r0, [r5, #4]
ldrb r0, [r4, #1]
strb r0, [r5, #5]
bl sub_08053320
ldrb r0, [r5, #4]
bl sub_08052D58
ldr r1, _08051EFC @ =gArea
movs r6, #0
strh r0, [r1, #4]
ldrb r0, [r4]
ldrb r1, [r4, #1]
bl SetCurrentRoomPropertyList
ldrb r0, [r4]
ldrb r1, [r4, #1]
bl sub_08052FD8
ldrh r0, [r4, #4]
ldrh r1, [r5, #6]
adds r0, r0, r1
strh r0, [r5, #0xa]
ldrh r0, [r4, #6]
ldrh r1, [r5, #8]
adds r0, r0, r1
strh r0, [r5, #0xc]
ldr r1, _08051F00 @ =gMenu
ldrb r0, [r4, #2]
strb r0, [r1]
ldrb r2, [r4, #3]
movs r0, #0xf
ands r0, r2
strb r0, [r1, #3]
str r4, [r1, #0xc]
ldrb r0, [r1, #5]
adds r0, #1
strb r0, [r1, #5]
strb r6, [r1, #6]
movs r0, #0x96
lsls r0, r0, #1
strh r0, [r1, #8]
bl sub_08051F04
pop {r4, r5, r6, pc}
.align 2, 0
_08051EF0: .4byte gUnk_02032EC0
_08051EF4: .4byte gUnk_080FCA20
_08051EF8: .4byte gRoomControls
_08051EFC: .4byte gArea
_08051F00: .4byte gMenu
thumb_func_start sub_08051F04
sub_08051F04: @ 0x08051F04
push {lr}
ldr r1, _08051F38 @ =gUnk_080FCA14
ldr r0, _08051F3C @ =gMenu
ldrb r0, [r0]
lsls r0, r0, #2
adds r0, r0, r1
ldr r0, [r0]
bl _call_via_r0
bl FlushSprites
bl sub_0805E5C0
bl sub_080AD9B0
bl sub_080AD918
bl sub_0807FC40
bl sub_0801B060
bl sub_0805E5F8
bl sub_08000108
pop {pc}
.align 2, 0
_08051F38: .4byte gUnk_080FCA14
_08051F3C: .4byte gMenu
thumb_func_start sub_08051F40
sub_08051F40: @ 0x08051F40
push {lr}
ldr r0, _08051F60 @ =gUnk_080FCA20
ldr r2, _08051F64 @ =gUnk_02032EC0
ldrb r1, [r2, #3]
lsls r1, r1, #3
adds r1, r1, r0
ldrb r1, [r1, #3]
movs r0, #0xf0
ands r0, r1
cmp r0, #0
beq _08051F68
lsrs r1, r1, #4
movs r0, #2
bl MenuFadeIn
b _08051F76
.align 2, 0
_08051F60: .4byte gUnk_080FCA20
_08051F64: .4byte gUnk_02032EC0
_08051F68:
movs r0, #3
strb r0, [r2]
movs r0, #0x10
bl sub_080500F4
bl sub_08056418
_08051F76:
pop {pc}
thumb_func_start sub_08051F78
sub_08051F78: @ 0x08051F78
push {lr}
ldr r0, _08051F94 @ =gUnk_02032EC0
ldrb r3, [r0, #3]
lsls r3, r3, #3
ldr r0, _08051F98 @ =gUnk_080FCA20
adds r3, r3, r0
ldrb r0, [r3]
ldrb r1, [r3, #1]
ldrh r2, [r3, #4]
ldrh r3, [r3, #6]
bl sub_08051F9C
pop {pc}
.align 2, 0
_08051F94: .4byte gUnk_02032EC0
_08051F98: .4byte gUnk_080FCA20
thumb_func_start sub_08051F9C
sub_08051F9C: @ 0x08051F9C
push {r4, r5, r6, lr}
mov r6, r8
push {r6}
adds r6, r2, #0
mov r8, r3
ldr r5, _08051FE0 @ =gScreen
ldrh r2, [r5]
movs r4, #0xc0
lsls r4, r4, #7
ands r4, r2
bl sub_08052FF4
ldr r1, _08051FE4 @ =gRoomControls
ldrh r0, [r1, #6]
adds r0, r0, r6
movs r6, #0
strh r0, [r1, #0xa]
ldrh r0, [r1, #8]
add r0, r8
strh r0, [r1, #0xc]
bl sub_0807C740
ldr r1, _08051FE8 @ =gUnk_02000070
movs r0, #1
strb r0, [r1]
ldr r0, _08051FEC @ =gUsedPalettes
str r6, [r0]
ldrh r0, [r5]
orrs r4, r0
strh r4, [r5]
pop {r3}
mov r8, r3
pop {r4, r5, r6, pc}
.align 2, 0
_08051FE0: .4byte gScreen
_08051FE4: .4byte gRoomControls
_08051FE8: .4byte gUnk_02000070
_08051FEC: .4byte gUsedPalettes
thumb_func_start sub_08051FF0
sub_08051FF0: @ 0x08051FF0
push {lr}
ldr r0, _08052000 @ =gMenu
ldr r1, [r0, #0xc]
ldrb r0, [r1]
ldrb r1, [r1, #1]
bl sub_0804B0B0
pop {pc}
.align 2, 0
_08052000: .4byte gMenu
thumb_func_start sub_08052004
sub_08052004: @ 0x08052004
ldr r1, _0805200C @ =gMenu
movs r0, #2
strb r0, [r1, #5]
bx lr
.align 2, 0
_0805200C: .4byte gMenu
thumb_func_start sub_08052010
sub_08052010: @ 0x08052010
push {r4, lr}
bl sub_080A3210
bl sub_08056418
movs r0, #1
bl sub_0801DA90
ldr r0, _0805207C @ =gBG1Buffer
movs r4, #0x80
lsls r4, r4, #4
adds r1, r4, #0
bl _DmaZero
ldr r0, _08052080 @ =gBG2Buffer
adds r1, r4, #0
bl _DmaZero
bl sub_080A4D34
movs r0, #0xa
bl LoadPaletteGroup
movs r0, #0
movs r1, #0
bl sub_0801D79C
movs r0, #4
bl LoadGfxGroup
movs r0, #0xc0
lsls r0, r0, #0x13
movs r1, #0x20
bl _DmaZero
ldr r0, _08052084 @ =gMenu
movs r1, #0x30
bl _DmaZero
ldr r1, _08052088 @ =gScreen
ldrh r2, [r1]
movs r3, #0x80
lsls r3, r3, #5
adds r0, r3, #0
orrs r0, r2
strh r0, [r1]
ldr r0, _0805208C @ =0x00001C01
strh r0, [r1, #0x14]
ldr r0, _08052090 @ =0x00001D05
strh r0, [r1, #0x20]
movs r0, #1
strh r0, [r1, #0x1a]
strh r0, [r1, #0x26]
pop {r4, pc}
.align 2, 0
_0805207C: .4byte gBG1Buffer
_08052080: .4byte gBG2Buffer
_08052084: .4byte gMenu
_08052088: .4byte gScreen
_0805208C: .4byte 0x00001C01
_08052090: .4byte 0x00001D05
thumb_func_start HandleGameOverScreen
HandleGameOverScreen: @ 0x08052094
push {r4, lr}
ldr r1, _080520BC @ =gUnk_080FCA70
ldr r4, _080520C0 @ =gUnk_03001000
ldrb r0, [r4, #3]
lsls r0, r0, #2
adds r0, r0, r1
ldr r0, [r0]
bl _call_via_r0
ldrb r0, [r4, #3]
cmp r0, #0
beq _080520B8
bl FlushSprites
bl sub_080523D4
bl sub_080AD918
_080520B8:
pop {r4, pc}
.align 2, 0
_080520BC: .4byte gUnk_080FCA70
_080520C0: .4byte gUnk_03001000
thumb_func_start sub_080520C4
sub_080520C4: @ 0x080520C4
push {lr}
ldr r1, _080520D4 @ =gUnk_03001000
strb r0, [r1, #3]
movs r0, #0
bl sub_080A7114
pop {pc}
.align 2, 0
_080520D4: .4byte gUnk_03001000
thumb_func_start sub_080520D8
sub_080520D8: @ 0x080520D8
push {r4, lr}
ldr r4, _08052118 @ =gFadeControl
ldrb r0, [r4]
cmp r0, #0
bne _08052114
bl sub_08052010
ldr r1, _0805211C @ =gMenu
movs r0, #0x50
strb r0, [r1, #0x10]
movs r2, #0x3c
movs r0, #0x3c
strh r0, [r1, #8]
ldr r0, _08052120 @ =gSave
adds r0, #0xaa
movs r1, #0x18
strb r1, [r0]
ldr r0, _08052124 @ =gUnk_03001000
strb r2, [r0, #5]
movs r0, #0xa
bl PlaySFX
movs r0, #4
bl sub_080500F4
ldr r0, _08052128 @ =0xFFFF0001
str r0, [r4, #4]
movs r0, #1
bl sub_080520C4
_08052114:
pop {r4, pc}
.align 2, 0
_08052118: .4byte gFadeControl
_0805211C: .4byte gMenu
_08052120: .4byte gSave
_08052124: .4byte gUnk_03001000
_08052128: .4byte 0xFFFF0001
asm/fusionMenuNPC.s
+1 -1
View File
@@ -50,4 +50,4 @@ FusionMenuNPC_Head: @ 0x0806E8F8
_0806E916:
pop {pc}
.align 2, 0
_0806E918: .4byte gNPCFunctions
_0806E918: .4byte gNPCFunctions
asm/getInventoryValue.s
+1 -1
View File
@@ -20,4 +20,4 @@ GetInventoryValue: @ 0x0807CA84
ands r0, r1
bx lr
.align 2, 0
_0807CA9C: .4byte gUnk_02002B32
_0807CA9C: .4byte gUnk_02002B32
asm/ghostBrothers.s
+2 -2
View File
@@ -505,7 +505,7 @@ _08065F60: .4byte gUnk_0811033C
sub_08065F64: @ 0x08065F64
push {lr}
adds r3, r0, #0
ldr r0, _08065F88 @ =gUnk_02002A40
ldr r0, _08065F88 @ =gSave
ldrb r0, [r0, #8]
subs r0, #2
cmp r0, #0
@@ -522,7 +522,7 @@ _08065F74:
bl ShowNPCDialogue
pop {pc}
.align 2, 0
_08065F88: .4byte gUnk_02002A40
_08065F88: .4byte gSave
_08065F8C: .4byte gUnk_08110280
thumb_func_start GhostBrothers_Fusion
asm/goronMerchant.s
+2 -2
View File
@@ -13,7 +13,7 @@ sub_08069718: @ 0x08069718
adds r7, r1, #0
bl sub_080696BC
adds r6, r0, #0
ldr r0, _08069754 @ =gUnk_02002A40
ldr r0, _08069754 @ =gSave
adds r0, #0xc0
ldrh r0, [r0]
cmp r6, r0
@@ -35,7 +35,7 @@ sub_08069718: @ 0x08069718
movs r0, #1
b _0806976E
.align 2, 0
_08069754: .4byte gUnk_02002A40
_08069754: .4byte gSave
_08069758: .4byte gRoomVars
_0806975C:
ldr r0, _08069760 @ =0x00002C1F
asm/guardWithSpear.s
+2 -2
View File
@@ -496,7 +496,7 @@ _08064424: .4byte gUnk_0810F6D4
sub_08064428: @ 0x08064428
push {lr}
adds r3, r0, #0
ldr r0, _0806444C @ =gUnk_02002A40
ldr r0, _0806444C @ =gSave
ldrb r0, [r0, #8]
subs r1, r0, #2
cmp r1, #0
@@ -513,7 +513,7 @@ _08064438:
ldr r1, _08064450 @ =gUnk_0810CF4C
b _08064460
.align 2, 0
_0806444C: .4byte gUnk_02002A40
_0806444C: .4byte gSave
_08064450: .4byte gUnk_0810CF4C
_08064454:
movs r0, #0x7f
asm/gyorgMale.s
-3466
View File
File diff suppressed because it is too large Load Diff
asm/hurdyGurdyMan.s
+3 -3
View File
@@ -141,7 +141,7 @@ HurdyGurdyMan_Head: @ 0x0806E3E4
sub_0806E418: @ 0x0806E418
push {lr}
adds r2, r0, #0
ldr r0, _0806E438 @ =gUnk_02002A40
ldr r0, _0806E438 @ =gSave
ldrb r0, [r0, #8]
subs r0, #2
cmp r0, #0
@@ -155,7 +155,7 @@ _0806E428:
bl ShowNPCDialogue
pop {pc}
.align 2, 0
_0806E438: .4byte gUnk_02002A40
_0806E438: .4byte gSave
_0806E43C: .4byte gUnk_081144FC
thumb_func_start sub_0806E440
@@ -206,4 +206,4 @@ _0806E498:
adds r0, r4, #0
bl GetNextFrame
_0806E49E:
pop {r4, pc}
pop {r4, pc}
asm/item11.s
+1 -1
View File
@@ -191,4 +191,4 @@ _08018FBC:
bl PlaySFX
pop {pc}
.align 2, 0
_08018FC8: .4byte gPlayerEntity
_08018FC8: .4byte gPlayerEntity
asm/kid.s
+2 -2
View File
@@ -747,7 +747,7 @@ _08062658: .4byte gUnk_0810BDE8
sub_0806265C: @ 0x0806265C
push {lr}
adds r2, r0, #0
ldr r3, _08062674 @ =gUnk_02002A40
ldr r3, _08062674 @ =gSave
ldrb r0, [r3, #8]
cmp r0, #0
bne _08062678
@@ -756,7 +756,7 @@ sub_0806265C: @ 0x0806265C
bl TextboxNoOverlap
b _08062690
.align 2, 0
_08062674: .4byte gUnk_02002A40
_08062674: .4byte gSave
_08062678:
ldrb r0, [r2, #0xa]
lsls r1, r0, #3
asm/kingGustaf.s
+1 -1
View File
@@ -76,4 +76,4 @@ _0806C124:
_0806C134:
pop {r4, r5, pc}
.align 2, 0
_0806C138: .4byte gScreen
_0806C138: .4byte gScreen
asm/loadRoomEntity.s
+1 -1
View File
@@ -98,4 +98,4 @@ _0804AEAA:
adds r0, r5, #0
_0804AEAC:
pop {r4, r5, r6, r7, pc}
.align 2, 0
.align 2, 0
asm/m4a.s
+1 -1
View File
@@ -3024,4 +3024,4 @@ ply_xswee: @ 0x080B14AC
nullsub_544: @ 0x080B14C0
bx lr
.align 2, 0
asm/m4a_asm.s
+8 -4
View File
@@ -463,7 +463,9 @@ _080AF706:
str r1, [r0, #0x2c]
_080AF70A:
bx lr
_080AF70C:
thumb_func_start ply_fine
ply_fine: @ 0x080AF70C
push {r4, r5, lr}
adds r5, r1, #0
ldr r4, [r5, #0x20]
@@ -542,7 +544,9 @@ sub_080AF77A: @ 0x080AF77A
ldrb r3, [r2]
b _080AF75E
.align 2, 0
_080AF784:
thumb_func_start ply_goto
ply_goto:
push {lr}
_080AF786:
ldr r2, [r1, #0x40]
@@ -573,9 +577,9 @@ ply_patt: @ 0x080AF7A4
ldrb r2, [r1, #2]
adds r2, #1
strb r2, [r1, #2]
b _080AF784
b ply_goto
_080AF7BC:
b _080AF70C
b ply_fine
.align 2, 0
thumb_func_start ply_pend
asm/macroMushroomStalks.s
+1 -1
View File
@@ -17,4 +17,4 @@ MacroMushromStalks: @ 0x0808C91C
bl _call_via_r1
pop {pc}
.align 2, 0
_0808C930: .4byte gUnk_08121668
_0808C930: .4byte gUnk_08121668
asm/mama.s
+2 -2
View File
@@ -172,7 +172,7 @@ _0806C4D8:
thumb_func_start sub_0806C4DC
sub_0806C4DC: @ 0x0806C4DC
push {lr}
ldr r1, _0806C4F0 @ =gUnk_02002A40
ldr r1, _0806C4F0 @ =gSave
ldrb r1, [r1, #8]
lsls r1, r1, #3
ldr r2, _0806C4F4 @ =gUnk_08113760
@@ -180,7 +180,7 @@ sub_0806C4DC: @ 0x0806C4DC
bl ShowNPCDialogue
pop {pc}
.align 2, 0
_0806C4F0: .4byte gUnk_02002A40
_0806C4F0: .4byte gSave
_0806C4F4: .4byte gUnk_08113760
thumb_func_start sub_0806C4F8
asm/manager1.s
+2 -2
View File
@@ -404,7 +404,7 @@ sub_08057450: @ 0x08057450
_08057474:
asrs r0, r1, #6
lsls r0, r0, #9
ldr r1, _0805750C @ =gUnk_02001A40
ldr r1, _0805750C @ =gBG3Buffer
adds r1, r0, r1
str r1, [r4, #0x34]
ldr r0, [r3, #0x34]
@@ -479,7 +479,7 @@ _08057502:
.align 2, 0
_08057504: .4byte gScreen
_08057508: .4byte gRoomControls
_0805750C: .4byte gUnk_02001A40
_0805750C: .4byte gBG3Buffer
_08057510: .4byte gScreenTransition
_08057514: .4byte gUnk_08107C30
_08057518: .4byte gUnk_085B4180
asm/manager10.s
+2 -2
View File
@@ -333,7 +333,7 @@ _080597F4:
bl LoadGfxGroup
b _08059838
_08059800:
ldr r4, _0805981C @ =gUnk_02001A40
ldr r4, _0805981C @ =gBG3Buffer
movs r5, #0x80
lsls r5, r5, #4
adds r0, r4, #0
@@ -345,7 +345,7 @@ _08059800:
bl LoadAssetAsync
b _08059838
.align 2, 0
_0805981C: .4byte gUnk_02001A40
_0805981C: .4byte gBG3Buffer
_08059820: .4byte 0x0600E800
_08059824:
ldr r0, _0805983C @ =gUnk_0200B650
asm/manager11.s
+1 -1
View File
@@ -30,4 +30,4 @@ _080599D6:
bl SetFlag
bl DeleteThisEntity
_080599EA:
pop {r4, pc}
pop {r4, pc}
asm/manager16.s
+3 -3
View File
@@ -78,7 +78,7 @@ _0805ABC8:
adds r0, r2, r1
lsls r0, r0, #4
adds r4, r0, r4
ldr r0, _0805ABF8 @ =gUnk_02002A40
ldr r0, _0805ABF8 @ =gSave
movs r5, #1
mov sl, r5
mov r7, sl
@@ -94,7 +94,7 @@ _0805ABC8:
.align 2, 0
_0805ABF0: .4byte gArea
_0805ABF4: .4byte gUnk_02031EC0
_0805ABF8: .4byte gUnk_02002A40
_0805ABF8: .4byte gSave
_0805ABFC: .4byte gUnk_020342F8
_0805AC00:
ldrh r0, [r4, #4]
@@ -126,7 +126,7 @@ _0805AC1A:
ldr r0, [r4, #8]
cmp r0, #0
beq _0805AC48
bl sub_0807DAA0
bl CreateScriptExecutionContext
mov sb, r0
cmp r0, #0
beq _0805ACA6
asm/manager18.s
+1 -1
View File
@@ -192,4 +192,4 @@ sub_0805AF3C: @ 0x0805AF3C
bx lr
.align 2, 0
_0805AF58: .4byte gScreen
_0805AF5C: .4byte 0x0000F7FF
_0805AF5C: .4byte 0x0000F7FF
asm/manager1E.s
-81
View File
@@ -1,81 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_0805B668
sub_0805B668: @ 0x0805B668
push {lr}
ldr r2, _0805B67C @ =gUnk_08108C8C
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_0805B67C: .4byte gUnk_08108C8C
thumb_func_start sub_0805B680
sub_0805B680: @ 0x0805B680
push {r4, lr}
adds r4, r0, #0
movs r0, #1
strb r0, [r4, #0xc]
ldrh r1, [r4, #0x34]
lsrs r1, r1, #1
strh r1, [r4, #0x34]
ldrh r0, [r4, #0x38]
adds r0, r0, r1
strh r0, [r4, #0x38]
ldrh r1, [r4, #0x36]
lsrs r1, r1, #1
strh r1, [r4, #0x36]
ldrh r0, [r4, #0x3a]
adds r0, r0, r1
strh r0, [r4, #0x3a]
ldrb r0, [r4, #0xa]
cmp r0, #0
bne _0805B6B8
ldrh r0, [r4, #0x3e]
bl CheckFlags
cmp r0, #0
beq _0805B6B8
adds r0, r4, #0
bl DeleteManager
b _0805B6BE
_0805B6B8:
adds r0, r4, #0
bl sub_0805B6C0
_0805B6BE:
pop {r4, pc}
thumb_func_start sub_0805B6C0
sub_0805B6C0: @ 0x0805B6C0
push {r4, lr}
adds r4, r0, #0
movs r1, #0x38
ldrsh r0, [r4, r1]
movs r2, #0x3a
ldrsh r1, [r4, r2]
ldrh r2, [r4, #0x34]
ldrh r3, [r4, #0x36]
bl CheckPlayerInRegion
cmp r0, #0
beq _0805B6EC
ldrh r0, [r4, #0x3e]
bl SetFlag
ldrb r0, [r4, #0xa]
cmp r0, #0
bne _0805B6F2
adds r0, r4, #0
bl DeleteManager
b _0805B6F2
_0805B6EC:
ldrh r0, [r4, #0x3e]
bl ClearFlag
_0805B6F2:
pop {r4, pc}
asm/manager26.s
-200
View File
@@ -1,200 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_0805C6B8
sub_0805C6B8: @ 0x0805C6B8
push {lr}
ldr r2, _0805C6CC @ =gUnk_08108D04
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_0805C6CC: .4byte gUnk_08108D04
thumb_func_start sub_0805C6D0
sub_0805C6D0: @ 0x0805C6D0
push {r4, r5, r6, r7, lr}
sub sp, #4
adds r5, r0, #0
ldrb r0, [r5, #0xa]
bl GetCurrentRoomProperty
adds r4, r0, #0
cmp r4, #0
bne _0805C6EA
adds r0, r5, #0
bl DeleteManager
b _0805C79A
_0805C6EA:
ldr r3, _0805C784 @ =gRoomControls
ldrh r0, [r3, #8]
ldrb r1, [r5, #0xe]
adds r0, r0, r1
movs r1, #0
strh r0, [r5, #0x2a]
strb r1, [r5, #0xe]
adds r0, r5, #0
adds r0, #0x28
strb r1, [r0]
adds r2, r5, #0
adds r2, #0x29
strb r1, [r2]
ldrb r0, [r4]
cmp r0, #0xff
beq _0805C778
ldrb r0, [r5, #0xe]
cmp r0, #0x1f
bhi _0805C778
adds r7, r3, #0
movs r3, #1
adds r6, r2, #0
_0805C716:
ldrb r1, [r4, #1]
ldrb r2, [r4, #2]
movs r0, #0x4c
str r3, [sp]
bl CreateObject
adds r2, r0, #0
ldr r3, [sp]
cmp r2, #0
beq _0805C762
ldrb r0, [r4, #3]
strb r0, [r2, #0xe]
ldrh r0, [r4, #4]
ldrh r1, [r7, #6]
adds r0, r0, r1
strh r0, [r2, #0x2e]
ldrh r0, [r4, #6]
ldrh r1, [r7, #8]
adds r0, r0, r1
strh r0, [r2, #0x32]
str r5, [r2, #0x50]
adds r0, r2, #0
adds r0, #0x38
strb r3, [r0]
ldrb r0, [r5, #0xe]
adds r1, r2, #0
adds r1, #0x83
strb r0, [r1]
ldrb r1, [r4]
adds r0, r2, #0
adds r0, #0x82
strb r1, [r0]
adds r0, r3, #0
ldrb r1, [r5, #0xe]
lsls r0, r1
ldrb r1, [r6]
orrs r0, r1
strb r0, [r6]
_0805C762:
adds r4, #8
ldrb r0, [r5, #0xe]
adds r1, r0, #1
strb r1, [r5, #0xe]
ldrb r0, [r4]
cmp r0, #0xff
beq _0805C778
lsls r0, r1, #0x18
lsrs r0, r0, #0x18
cmp r0, #0x1f
bls _0805C716
_0805C778:
ldrb r0, [r5, #0xb]
cmp r0, #0xff
bne _0805C788
movs r0, #2
b _0805C798
.align 2, 0
_0805C784: .4byte gRoomControls
_0805C788:
ldrb r0, [r5, #0xb]
bl CheckLocalFlag
cmp r0, #0
beq _0805C796
movs r0, #2
b _0805C798
_0805C796:
movs r0, #1
_0805C798:
strb r0, [r5, #0xc]
_0805C79A:
add sp, #4
pop {r4, r5, r6, r7, pc}
.align 2, 0
thumb_func_start sub_0805C7A0
sub_0805C7A0: @ 0x0805C7A0
push {r4, lr}
adds r4, r0, #0
adds r0, #0x28
adds r1, r4, #0
adds r1, #0x29
ldrb r0, [r0]
ldrb r1, [r1]
cmp r0, r1
bne _0805C7BC
movs r0, #2
strb r0, [r4, #0xc]
ldrb r0, [r4, #0xb]
bl SetLocalFlag
_0805C7BC:
adds r0, r4, #0
bl sub_0805C7CC
pop {r4, pc}
thumb_func_start sub_0805C7C4
sub_0805C7C4: @ 0x0805C7C4
push {lr}
bl sub_0805C7CC
pop {pc}
thumb_func_start sub_0805C7CC
sub_0805C7CC: @ 0x0805C7CC
push {lr}
adds r2, r0, #0
ldr r0, _0805C7F0 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x80
ands r0, r1
cmp r0, #0
beq _0805C7FC
ldr r0, _0805C7F4 @ =gPlayerEntity
movs r3, #0x32
ldrsh r1, [r0, r3]
ldrh r0, [r2, #0x2a]
adds r0, #0x10
cmp r1, r0
bge _0805C7F8
movs r0, #1
b _0805C816
.align 2, 0
_0805C7F0: .4byte gPlayerState
_0805C7F4: .4byte gPlayerEntity
_0805C7F8:
movs r0, #0
b _0805C816
_0805C7FC:
ldr r0, _0805C810 @ =gPlayerEntity
movs r3, #0x32
ldrsh r1, [r0, r3]
ldrh r0, [r2, #0x2a]
adds r0, #0x28
cmp r1, r0
bge _0805C814
movs r0, #3
b _0805C816
.align 2, 0
_0805C810: .4byte gPlayerEntity
_0805C814:
movs r0, #2
_0805C816:
strb r0, [r2, #0xd]
pop {pc}
.align 2, 0
asm/manager28.s
-342
View File
@@ -1,342 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_0805C934
sub_0805C934: @ 0x0805C934
push {lr}
ldr r2, _0805C948 @ =gUnk_08108D28
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_0805C948: .4byte gUnk_08108D28
thumb_func_start sub_0805C94C
sub_0805C94C: @ 0x0805C94C
push {r4, r5, r6, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xa]
cmp r0, #0
bne _0805C9B0
adds r6, r4, #0
adds r6, #0x20
adds r1, r6, #0
movs r2, #0
adds r0, r4, #0
adds r0, #0x3c
_0805C962:
str r2, [r0]
subs r0, #4
cmp r0, r1
bge _0805C962
adds r0, r4, #0
bl sub_0805CA6C
adds r5, r0, #0
cmp r5, #1
ble _0805C9A8
bl GetEmptyManager
adds r2, r0, #0
cmp r2, #0
beq _0805C9A8
movs r0, #9
strb r0, [r2, #8]
movs r0, #0x28
strb r0, [r2, #9]
movs r0, #1
strb r0, [r2, #0xa]
strb r5, [r2, #0xe]
adds r1, r2, #0
adds r1, #0x20
adds r0, r6, #0
ldm r0!, {r3, r5, r6}
stm r1!, {r3, r5, r6}
ldm r0!, {r3, r5, r6}
stm r1!, {r3, r5, r6}
ldm r0!, {r3, r5}
stm r1!, {r3, r5}
adds r0, r2, #0
movs r1, #6
bl AppendEntityToList
_0805C9A8:
adds r0, r4, #0
bl DeleteManager
b _0805C9B8
_0805C9B0:
movs r1, #0
movs r0, #1
strb r0, [r4, #0xc]
strb r1, [r4, #0xf]
_0805C9B8:
pop {r4, r5, r6, pc}
.align 2, 0
thumb_func_start sub_0805C9BC
sub_0805C9BC: @ 0x0805C9BC
push {r4, r5, r6, r7, lr}
mov r7, sb
mov r6, r8
push {r6, r7}
sub sp, #4
adds r6, r0, #0
bl sub_0805CB48
ldrb r0, [r6, #0xe]
subs r0, #1
mov sb, r0
ldrb r1, [r6, #0xf]
adds r0, r1, #1
strb r0, [r6, #0xf]
movs r0, #1
ands r0, r1
cmp r0, #0
beq _0805CA22
movs r2, #0
cmp r2, sb
bge _0805CA62
movs r0, #0x20
adds r0, r0, r6
mov r8, r0
_0805C9EC:
lsls r1, r2, #2
adds r0, r6, #0
adds r0, #0x20
adds r0, r0, r1
ldr r3, [r0]
adds r4, r2, #1
adds r5, r4, #0
ldrb r1, [r6, #0xe]
cmp r5, r1
bge _0805CA1A
lsls r0, r5, #2
mov r1, r8
adds r7, r0, r1
_0805CA06:
ldm r7!, {r1}
adds r0, r3, #0
str r3, [sp]
bl sub_08004484
adds r4, #1
ldr r3, [sp]
ldrb r0, [r6, #0xe]
cmp r4, r0
blt _0805CA06
_0805CA1A:
adds r2, r5, #0
cmp r2, sb
blt _0805C9EC
b _0805CA62
_0805CA22:
movs r2, #0
cmp r2, sb
bge _0805CA62
movs r1, #0x20
adds r1, r1, r6
mov r8, r1
_0805CA2E:
lsls r1, r2, #2
adds r0, r6, #0
adds r0, #0x20
adds r0, r0, r1
ldr r3, [r0]
adds r4, r2, #1
adds r5, r4, #0
ldrb r0, [r6, #0xe]
cmp r5, r0
bge _0805CA5C
lsls r0, r5, #2
mov r1, r8
adds r7, r0, r1
_0805CA48:
ldm r7!, {r0}
adds r1, r3, #0
str r3, [sp]
bl sub_08004484
adds r4, #1
ldr r3, [sp]
ldrb r0, [r6, #0xe]
cmp r4, r0
blt _0805CA48
_0805CA5C:
adds r2, r5, #0
cmp r2, sb
blt _0805CA2E
_0805CA62:
add sp, #4
pop {r3, r4}
mov r8, r3
mov sb, r4
pop {r4, r5, r6, r7, pc}
thumb_func_start sub_0805CA6C
sub_0805CA6C: @ 0x0805CA6C
push {r4, r5, r6, lr}
adds r6, r0, #0
movs r5, #0
ldrb r0, [r6, #0xb]
bl GetCurrentRoomProperty
adds r4, r0, #0
cmp r4, #0
bne _0805CACE
movs r0, #0
b _0805CAE4
_0805CA82:
movs r0, #8
b _0805CAE4
_0805CA86:
movs r0, #0xf
ands r0, r2
cmp r0, #3
bne _0805CACC
adds r0, r4, #0
bl sub_0805CAF0
adds r2, r0, #0
cmp r2, #0
beq _0805CACC
movs r3, #0
cmp r3, r5
bhs _0805CAB8
ldr r0, [r6, #0x20]
cmp r0, r2
beq _0805CAB8
adds r1, r6, #0
adds r1, #0x20
_0805CAAA:
adds r1, #4
adds r3, #1
cmp r3, r5
bhs _0805CAB8
ldr r0, [r1]
cmp r0, r2
bne _0805CAAA
_0805CAB8:
cmp r3, r5
bne _0805CACC
lsls r1, r5, #2
adds r0, r6, #0
adds r0, #0x20
adds r0, r0, r1
str r2, [r0]
adds r5, #1
cmp r5, #8
beq _0805CA82
_0805CACC:
adds r4, #0x10
_0805CACE:
ldrb r2, [r4]
adds r0, r2, #0
cmp r0, #0xff
beq _0805CAE2
ldr r0, [r4]
ldr r1, _0805CAE8 @ =0x00FF000F
ands r0, r1
ldr r1, _0805CAEC @ =0x00280009
cmp r0, r1
bne _0805CA86
_0805CAE2:
adds r0, r5, #0
_0805CAE4:
pop {r4, r5, r6, pc}
.align 2, 0
_0805CAE8: .4byte 0x00FF000F
_0805CAEC: .4byte 0x00280009
thumb_func_start sub_0805CAF0
sub_0805CAF0: @ 0x0805CAF0
push {r4, r5, r6, lr}
adds r3, r0, #0
ldrh r1, [r3, #8]
ldr r2, _0805CB34 @ =gRoomControls
ldrh r0, [r2, #6]
adds r5, r1, r0
ldrh r1, [r3, #0xa]
ldrh r0, [r2, #8]
adds r4, r1, r0
ldr r1, _0805CB38 @ =gUnk_03003D90
ldr r2, [r1, #4]
cmp r2, r1
beq _0805CB42
_0805CB0A:
movs r6, #0x2e
ldrsh r0, [r2, r6]
cmp r5, r0
bne _0805CB3C
movs r6, #0x32
ldrsh r0, [r2, r6]
cmp r4, r0
bne _0805CB3C
ldrb r0, [r3, #2]
ldrb r6, [r2, #9]
cmp r0, r6
bne _0805CB3C
ldrb r0, [r2, #8]
cmp r0, #3
bne _0805CB3C
ldrb r0, [r3, #3]
ldrb r6, [r2, #0xa]
cmp r0, r6
bne _0805CB3C
adds r0, r2, #0
b _0805CB44
.align 2, 0
_0805CB34: .4byte gRoomControls
_0805CB38: .4byte gUnk_03003D90
_0805CB3C:
ldr r2, [r2, #4]
cmp r2, r1
bne _0805CB0A
_0805CB42:
movs r0, #0
_0805CB44:
pop {r4, r5, r6, pc}
.align 2, 0
thumb_func_start sub_0805CB48
sub_0805CB48: @ 0x0805CB48
push {r4, r5, r6, lr}
adds r4, r0, #0
movs r5, #0
ldrb r1, [r4, #0xe]
cmp r5, r1
bge _0805CB84
adds r3, r4, #0
adds r3, #0x20
adds r6, r3, #0
_0805CB5A:
ldr r0, [r3]
ldr r2, [r0, #4]
cmp r2, #0
bne _0805CB7A
subs r0, r1, #1
cmp r0, r5
bne _0805CB6C
str r2, [r3]
b _0805CB74
_0805CB6C:
lsls r0, r0, #2
adds r0, r6, r0
ldr r0, [r0]
str r0, [r3]
_0805CB74:
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
_0805CB7A:
adds r3, #4
adds r5, #1
ldrb r1, [r4, #0xe]
cmp r5, r1
blt _0805CB5A
_0805CB84:
ldrb r0, [r4, #0xe]
cmp r0, #1
bhi _0805CB8E
bl DeleteThisEntity
_0805CB8E:
pop {r4, r5, r6, pc}
asm/manager32.s
+2 -2
View File
@@ -275,7 +275,7 @@ _0805D988: .4byte 0x0000F7FF
sub_0805D98C: @ 0x0805D98C
push {lr}
adds r2, r0, #0
ldr r3, _0805D9D4 @ =gUnk_03000FF0
ldr r3, _0805D9D4 @ =gInput
ldrh r1, [r3]
movs r0, #0x40
ands r0, r1
@@ -313,7 +313,7 @@ _0805D9C2:
_0805D9D0:
pop {pc}
.align 2, 0
_0805D9D4: .4byte gUnk_03000FF0
_0805D9D4: .4byte gInput
thumb_func_start sub_0805D9D8
sub_0805D9D8: @ 0x0805D9D8
asm/manager34.s
+1 -1
View File
@@ -140,4 +140,4 @@ sub_0805DC70: @ 0x0805DC70
bl DoExitTransition
pop {pc}
.align 2, 0
_0805DC80: .4byte gUnk_0813AC48
_0805DC80: .4byte gUnk_0813AC48
asm/manager37.s
+2 -2
View File
@@ -59,7 +59,7 @@ _0805DE7A:
strb r1, [r0]
adds r0, #1
strb r1, [r0]
ldr r0, _0805DEB0 @ =gUnk_02002A40
ldr r0, _0805DEB0 @ =gSave
movs r1, #0x93
lsls r1, r1, #3
adds r0, r0, r1
@@ -68,7 +68,7 @@ _0805DE7A:
pop {r4, pc}
.align 2, 0
_0805DEAC: .4byte gScreenTransition
_0805DEB0: .4byte gUnk_02002A40
_0805DEB0: .4byte gSave
_0805DEB4: .4byte 0x00001194
thumb_func_start sub_0805DEB8
asm/manager39.s
-292
View File
@@ -1,292 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_0805E0FC
sub_0805E0FC: @ 0x0805E0FC
push {r4, lr}
adds r4, r0, #0
ldr r1, _0805E134 @ =gUnk_08108E28
ldrb r0, [r4, #0xc]
lsls r0, r0, #2
adds r0, r0, r1
ldr r1, [r0]
adds r0, r4, #0
bl _call_via_r1
ldr r0, _0805E138 @ =gRoomControls
adds r1, r4, #0
adds r1, #0x20
ldrb r0, [r0, #5]
ldrb r1, [r1]
cmp r0, r1
bne _0805E12A
ldr r0, _0805E13C @ =gTextBox
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
cmp r0, #0
beq _0805E130
_0805E12A:
adds r0, r4, #0
bl sub_0805E1D8
_0805E130:
pop {r4, pc}
.align 2, 0
_0805E134: .4byte gUnk_08108E28
_0805E138: .4byte gRoomControls
_0805E13C: .4byte gTextBox
thumb_func_start sub_0805E140
sub_0805E140: @ 0x0805E140
push {r4, lr}
ldrb r2, [r0, #0x10]
movs r1, #0x20
orrs r1, r2
strb r1, [r0, #0x10]
movs r1, #1
strb r1, [r0, #0xc]
ldr r1, _0805E180 @ =gRoomControls
ldrb r2, [r1, #5]
adds r1, r0, #0
adds r1, #0x20
strb r2, [r1]
movs r1, #0x78
strb r1, [r0, #0xe]
movs r1, #0x3c
strb r1, [r0, #0xf]
movs r1, #7
bl sub_0805E3A0
ldr r1, _0805E184 @ =gUnk_08108DE8
ldr r0, _0805E188 @ =gArea
ldrb r0, [r0, #1]
lsls r0, r0, #1
adds r0, r0, r1
ldrh r4, [r0]
bl CheckIsDungeon
adds r1, r0, #0
adds r0, r4, #0
bl sub_0805E1F8
pop {r4, pc}
.align 2, 0
_0805E180: .4byte gRoomControls
_0805E184: .4byte gUnk_08108DE8
_0805E188: .4byte gArea
thumb_func_start sub_0805E18C
sub_0805E18C: @ 0x0805E18C
push {r4, lr}
adds r4, r0, #0
ldr r0, _0805E1D0 @ =gFadeControl
ldrb r0, [r0]
cmp r0, #0
bne _0805E1CC
ldrb r0, [r4, #0xb]
cmp r0, #0
beq _0805E1BA
ldrb r0, [r4, #0xf]
subs r0, #1
strb r0, [r4, #0xf]
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
cmp r0, #0
bne _0805E1BA
strb r0, [r4, #0xb]
ldr r0, _0805E1D4 @ =gPlayerState
adds r0, #0x8b
movs r1, #1
strb r1, [r0]
bl sub_0805E5B4
_0805E1BA:
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
lsls r0, r0, #0x18
cmp r0, #0
bne _0805E1CC
adds r0, r4, #0
bl sub_0805E1D8
_0805E1CC:
pop {r4, pc}
.align 2, 0
_0805E1D0: .4byte gFadeControl
_0805E1D4: .4byte gPlayerState
thumb_func_start sub_0805E1D8
sub_0805E1D8: @ 0x0805E1D8
push {lr}
ldr r0, _0805E1F0 @ =gUnk_02034DF0
movs r1, #0x80
bl _DmaZero
ldr r1, _0805E1F4 @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
bl DeleteThisEntity
pop {pc}
.align 2, 0
_0805E1F0: .4byte gUnk_02034DF0
_0805E1F4: .4byte gScreen
thumb_func_start sub_0805E1F8
sub_0805E1F8: @ 0x0805E1F8
push {r4, r5, lr}
sub sp, #0xc
adds r4, r0, #0
adds r5, r1, #0
ldr r0, _0805E234 @ =gUnk_02034DF0
movs r1, #0x80
bl _DmaZero
ldr r0, _0805E238 @ =gUnk_08108E60
mov r1, sp
movs r2, #9
bl _DmaCopy
mov r1, sp
lsrs r0, r4, #8
strb r0, [r1, #4]
mov r0, sp
strb r4, [r0, #5]
ldr r1, _0805E23C @ =gUnk_08108E48
cmp r5, #0
bne _0805E224
ldr r1, _0805E240 @ =gUnk_08108E30
_0805E224:
mov r0, sp
bl sub_0805F46C
ldr r1, _0805E244 @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
add sp, #0xc
pop {r4, r5, pc}
.align 2, 0
_0805E234: .4byte gUnk_02034DF0
_0805E238: .4byte gUnk_08108E60
_0805E23C: .4byte gUnk_08108E48
_0805E240: .4byte gUnk_08108E30
_0805E244: .4byte gScreen
thumb_func_start sub_0805E248
sub_0805E248: @ 0x0805E248
push {r4, r5, lr}
ldr r0, _0805E2C8 @ =gUnk_03004030
ldr r0, [r0]
ldrh r5, [r0, #6]
ldr r0, _0805E2CC @ =gRoomControls
ldrb r0, [r0, #4]
cmp r0, #0xa
beq _0805E25C
cmp r0, #0x16
bne _0805E2E8
_0805E25C:
movs r0, #0x9f
lsls r0, r0, #2
adds r4, r5, #0
subs r4, #0x41
adds r1, r4, #0
movs r2, #1
bl SetTileType
ldr r0, _0805E2D0 @ =0x00000283
adds r1, r4, #0
movs r2, #2
bl SetTileType
ldr r0, _0805E2D4 @ =0x0000027D
adds r4, #1
adds r1, r4, #0
movs r2, #1
bl SetTileType
movs r0, #0xa1
lsls r0, r0, #2
adds r1, r4, #0
movs r2, #2
bl SetTileType
ldr r0, _0805E2D8 @ =0x0000027E
adds r4, #1
adds r1, r4, #0
movs r2, #1
bl SetTileType
ldr r0, _0805E2DC @ =0x00000285
adds r1, r4, #0
movs r2, #2
bl SetTileType
ldr r0, _0805E2E0 @ =0x0000027F
subs r1, r5, #1
movs r2, #1
bl SetTileType
movs r0, #0xa0
lsls r0, r0, #2
adds r1, r5, #0
movs r2, #1
bl SetTileType
ldr r0, _0805E2E4 @ =0x00000282
adds r1, r5, #1
movs r2, #1
bl SetTileType
b _0805E350
.align 2, 0
_0805E2C8: .4byte gUnk_03004030
_0805E2CC: .4byte gRoomControls
_0805E2D0: .4byte 0x00000283
_0805E2D4: .4byte 0x0000027D
_0805E2D8: .4byte 0x0000027E
_0805E2DC: .4byte 0x00000285
_0805E2E0: .4byte 0x0000027F
_0805E2E4: .4byte 0x00000282
_0805E2E8:
movs r0, #0x9b
lsls r0, r0, #2
adds r4, r5, #0
subs r4, #0x41
adds r1, r4, #0
movs r2, #1
bl SetTileType
ldr r0, _0805E358 @ =0x00000273
adds r1, r4, #0
movs r2, #2
bl SetTileType
ldr r0, _0805E35C @ =0x0000026D
adds r4, #1
adds r1, r4, #0
movs r2, #1
bl SetTileType
movs r0, #0x9d
lsls r0, r0, #2
adds r1, r4, #0
movs r2, #2
bl SetTileType
ldr r0, _0805E360 @ =0x0000026E
adds r4, #1
adds r1, r4, #0
movs r2, #1
bl SetTileType
ldr r0, _0805E364 @ =0x00000275
adds r1, r4, #0
movs r2, #2
bl SetTileType
ldr r0, _0805E368 @ =0x0000026F
subs r1, r5, #1
movs r2, #1
bl SetTileType
movs r0, #0x9c
lsls r0, r0, #2
adds r1, r5, #0
movs r2, #1
bl SetTileType
ldr r0, _0805E36C @ =0x00000272
adds r1, r5, #1
movs r2, #1
bl SetTileType
_0805E350:
ldr r1, _0805E370 @ =gUnk_02000070
movs r0, #0
strb r0, [r1]
pop {r4, r5, pc}
.align 2, 0
_0805E358: .4byte 0x00000273
_0805E35C: .4byte 0x0000026D
_0805E360: .4byte 0x0000026E
_0805E364: .4byte 0x00000275
_0805E368: .4byte 0x0000026F
_0805E36C: .4byte 0x00000272
_0805E370: .4byte gUnk_02000070
asm/manager9.s
-217
View File
@@ -1,217 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_080581D8
sub_080581D8: @ 0x080581D8
push {r4, lr}
adds r4, r0, #0
bl sub_08058210
ldrb r1, [r4, #0xc]
cmp r1, #0
bne _080581F8
movs r0, #1
strb r0, [r4, #0xc]
ldr r0, _080581FC @ =gScreen
strh r1, [r0, #0x1a]
ldr r1, _08058200 @ =sub_08058204
adds r0, r4, #0
movs r2, #0
bl sub_08052D74
_080581F8:
pop {r4, pc}
.align 2, 0
_080581FC: .4byte gScreen
_08058200: .4byte sub_08058204
thumb_func_start sub_08058204
sub_08058204: @ 0x08058204
push {lr}
ldrb r0, [r0, #0xa]
bl sub_08058324
pop {pc}
.align 2, 0
thumb_func_start sub_08058210
sub_08058210: @ 0x08058210
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xa]
bl sub_08058244
adds r3, r0, #0
ldr r0, [r4, #0x3c]
cmp r0, r3
beq _08058234
str r3, [r4, #0x3c]
ldr r1, _08058238 @ =gUnk_02006F00
ldr r2, _0805823C @ =gUnk_02001A40
adds r0, r3, #0
bl sub_080582A0
ldr r1, _08058240 @ =gScreen
movs r0, #1
strh r0, [r1, #0x1a]
_08058234:
pop {r4, pc}
.align 2, 0
_08058238: .4byte gUnk_02006F00
_0805823C: .4byte gUnk_02001A40
_08058240: .4byte gScreen
thumb_func_start sub_08058244
sub_08058244: @ 0x08058244
push {r4, r5, r6, lr}
mov r6, r8
push {r6}
adds r6, r0, #0
ldr r5, _08058294 @ =gRoomControls
movs r1, #0xc
ldrsh r0, [r5, r1]
ldrh r4, [r5, #8]
subs r0, r0, r4
lsls r0, r0, #5
ldrh r1, [r5, #0x20]
subs r1, #0xa0
bl __divsi3
ldr r2, _08058298 @ =gScreen
mov r8, r2
adds r4, r4, r0
strh r4, [r2, #0x18]
movs r0, #0xa
ldrsh r1, [r5, r0]
ldrh r0, [r5, #6]
subs r1, r1, r0
ldr r0, _0805829C @ =gUnk_081081EC
lsls r6, r6, #1
adds r6, r6, r0
ldrh r0, [r6]
muls r0, r1, r0
ldrh r1, [r5, #0x1e]
subs r1, #0xf0
bl __divsi3
movs r2, #0xf
adds r1, r0, #0
ands r1, r2
mov r2, r8
strh r1, [r2, #0x16]
pop {r3}
mov r8, r3
pop {r4, r5, r6, pc}
.align 2, 0
_08058294: .4byte gRoomControls
_08058298: .4byte gScreen
_0805829C: .4byte gUnk_081081EC
thumb_func_start sub_080582A0
sub_080582A0: @ 0x080582A0
push {r4, r5, r6, lr}
movs r4, #0x20
lsrs r0, r0, #4
lsls r0, r0, #2
adds r1, r1, r0
ldr r3, _080582C8 @ =0x040000D4
ldr r6, _080582CC @ =0x80000020
movs r5, #0x80
lsls r5, r5, #1
_080582B2:
str r1, [r3]
str r2, [r3, #4]
str r6, [r3, #8]
ldr r0, [r3, #8]
adds r1, r1, r5
adds r2, #0x40
subs r4, #1
cmp r4, #0
bne _080582B2
pop {r4, r5, r6, pc}
.align 2, 0
_080582C8: .4byte 0x040000D4
_080582CC: .4byte 0x80000020
thumb_func_start sub_080582D0
sub_080582D0: @ 0x080582D0
push {r4, r5, lr}
ldr r4, _080582F4 @ =gMapDataTopSpecial
movs r0, #0x80
lsls r0, r0, #7
adds r5, r4, r0
adds r0, r4, #0
adds r1, r5, #0
bl sub_080582F8
movs r0, #0x80
lsls r0, r0, #4
adds r4, r4, r0
adds r5, #0x40
adds r0, r4, #0
adds r1, r5, #0
bl sub_080582F8
pop {r4, r5, pc}
.align 2, 0
_080582F4: .4byte gMapDataTopSpecial
thumb_func_start sub_080582F8
sub_080582F8: @ 0x080582F8
push {r4, r5, r6, lr}
adds r3, r0, #0
movs r4, #0
ldr r2, _0805831C @ =0x040000D4
ldr r6, _08058320 @ =0x80000020
movs r5, #0x80
lsls r5, r5, #1
_08058306:
str r3, [r2]
str r1, [r2, #4]
str r6, [r2, #8]
ldr r0, [r2, #8]
adds r4, #1
adds r3, #0x40
adds r1, r1, r5
cmp r4, #0x1f
bls _08058306
pop {r4, r5, r6, pc}
.align 2, 0
_0805831C: .4byte 0x040000D4
_08058320: .4byte 0x80000020
thumb_func_start sub_08058324
sub_08058324: @ 0x08058324
push {r4, lr}
adds r4, r0, #0
ldr r1, _0805836C @ =gUnk_0200B650
movs r0, #0
str r0, [r1]
adds r0, r4, #0
adds r0, #0x86
bl LoadPaletteGroup
adds r0, r4, #0
adds r0, #0x36
bl LoadGfxGroup
bl sub_080582D0
adds r0, r4, #0
bl sub_08058244
ldr r1, _08058370 @ =gUnk_02006F00
ldr r4, _08058374 @ =gUnk_02001A40
adds r2, r4, #0
bl sub_080582A0
ldr r1, _08058378 @ =gScreen
ldr r0, _0805837C @ =0x00001D47
strh r0, [r1, #0x14]
str r4, [r1, #0x1c]
movs r0, #1
strh r0, [r1, #0x1a]
ldrh r2, [r1]
movs r3, #0x80
lsls r3, r3, #2
adds r0, r3, #0
orrs r0, r2
strh r0, [r1]
pop {r4, pc}
.align 2, 0
_0805836C: .4byte gUnk_0200B650
_08058370: .4byte gUnk_02006F00
_08058374: .4byte gUnk_02001A40
_08058378: .4byte gScreen
_0805837C: .4byte 0x00001D47
asm/managerC.s
-712
View File
@@ -1,712 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_0805884C
sub_0805884C: @ 0x0805884C
push {r4, lr}
adds r4, r0, #0
ldr r1, _08058880 @ =gUnk_0810821C
ldrb r0, [r4, #0xc]
lsls r0, r0, #2
adds r0, r0, r1
ldr r1, [r0]
adds r0, r4, #0
bl _call_via_r1
adds r0, r4, #0
bl sub_08058BC8
ldr r0, _08058884 @ =gUnk_03003DE4
ldrb r1, [r0]
lsls r0, r1, #2
adds r0, r0, r1
lsls r0, r0, #9
ldr r1, _08058888 @ =gUnk_02017AA0
adds r0, r0, r1
ldr r1, _0805888C @ =0x04000020
ldr r2, _08058890 @ =0xA2600008
bl sub_0805622C
pop {r4, pc}
.align 2, 0
_08058880: .4byte gUnk_0810821C
_08058884: .4byte gUnk_03003DE4
_08058888: .4byte gUnk_02017AA0
_0805888C: .4byte 0x04000020
_08058890: .4byte 0xA2600008
thumb_func_start sub_08058894
sub_08058894: @ 0x08058894
push {r4, lr}
adds r4, r0, #0
movs r0, #1
strb r0, [r4, #0xc]
ldr r0, _080588C4 @ =0x00001234
str r0, [r4, #0x28]
movs r0, #0x15
movs r1, #2
bl CheckLocalFlags
rsbs r1, r0, #0
orrs r1, r0
lsrs r1, r1, #0x1f
strb r1, [r4, #0xe]
adds r0, r4, #0
bl sub_08058CB0
ldr r1, _080588C8 @ =sub_08058D34
adds r0, r4, #0
movs r2, #0
bl sub_08052D74
pop {r4, pc}
.align 2, 0
_080588C4: .4byte 0x00001234
_080588C8: .4byte sub_08058D34
thumb_func_start sub_080588CC
sub_080588CC: @ 0x080588CC
push {r4, lr}
adds r4, r0, #0
bl sub_08058CFC
adds r0, r4, #0
bl sub_08058A04
ldr r0, _080588E8 @ =gScreenTransition
ldrb r0, [r0, #8]
cmp r0, #0
beq _080588EC
movs r0, #2
strb r0, [r4, #0xc]
b _080588F2
.align 2, 0
_080588E8: .4byte gScreenTransition
_080588EC:
adds r0, r4, #0
bl sub_080588F8
_080588F2:
pop {r4, pc}
thumb_func_start nullsub_108
nullsub_108: @ 0x080588F4
bx lr
.align 2, 0
thumb_func_start sub_080588F8
sub_080588F8: @ 0x080588F8
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xf]
cmp r0, #0
bne _08058952
movs r0, #0x26
ldrsh r2, [r4, r0]
ldr r0, [r4, #0x28]
subs r1, r0, r2
cmp r1, #0
blt _08058914
cmp r1, #8
bhi _0805891A
b _08058968
_08058914:
subs r0, r2, r0
cmp r0, #8
bls _08058968
_0805891A:
ldr r0, _08058934 @ =0x00001234
str r0, [r4, #0x28]
movs r2, #0x26
ldrsh r1, [r4, r2]
ldr r0, _08058938 @ =0x0000FFFE
ands r1, r0
cmp r1, #0xa0
beq _08058940
cmp r1, #0xa0
bgt _0805893C
cmp r1, #0x48
beq _08058940
b _08058968
.align 2, 0
_08058934: .4byte 0x00001234
_08058938: .4byte 0x0000FFFE
_0805893C:
cmp r1, #0xf0
bne _08058968
_08058940:
movs r3, #0x26
ldrsh r0, [r4, r3]
str r0, [r4, #0x28]
movs r0, #0x2d
strb r0, [r4, #0xf]
movs r0, #0x8c
bl PlaySFX
b _08058968
_08058952:
subs r0, #1
strb r0, [r4, #0xf]
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
cmp r0, #0x29
bls _08058964
ldr r0, [r4, #0x28]
subs r0, #2
b _08058966
_08058964:
ldr r0, [r4, #0x28]
_08058966:
strh r0, [r4, #0x26]
_08058968:
ldrb r0, [r4, #0xe]
cmp r0, #0
beq _080589DE
ldr r0, _080589A4 @ =gPlayerEntity
movs r2, #0x32
ldrsh r1, [r0, r2]
ldr r0, _080589A8 @ =gRoomControls
ldrh r0, [r0, #8]
subs r2, r1, r0
adds r1, r2, #0
subs r1, #0x50
cmp r1, #0
bge _08058986
movs r1, #0x50
subs r1, r1, r2
_08058986:
lsrs r1, r1, #3
lsls r0, r1, #1
adds r0, r0, r1
lsls r0, r0, #0xc
movs r3, #0x80
lsls r3, r3, #7
adds r1, r0, r3
ldrb r0, [r4, #0xf]
cmp r0, #0
bne _080589DE
cmp r2, #0x48
bgt _080589AC
ldr r0, [r4, #0x24]
subs r0, r0, r1
b _080589B4
.align 2, 0
_080589A4: .4byte gPlayerEntity
_080589A8: .4byte gRoomControls
_080589AC:
cmp r2, #0x57
ble _080589B6
ldr r0, [r4, #0x24]
adds r0, r0, r1
_080589B4:
str r0, [r4, #0x24]
_080589B6:
ldr r2, [r4, #0x2c]
ldr r0, [r4, #0x24]
subs r1, r2, r0
adds r3, r0, #0
cmp r1, #0
blt _080589CC
movs r0, #0x80
lsls r0, r0, #0xd
cmp r1, r0
bhi _080589D6
b _080589DE
_080589CC:
subs r1, r3, r2
movs r0, #0x80
lsls r0, r0, #0xd
cmp r1, r0
bls _080589DE
_080589D6:
str r3, [r4, #0x2c]
movs r0, #0x8b
bl PlaySFX
_080589DE:
movs r0, #0x26
ldrsh r1, [r4, r0]
str r1, [r4, #0x20]
cmp r1, #0
bge _080589F0
ldr r0, _080589EC @ =0x000001FF
b _080589F8
.align 2, 0
_080589EC: .4byte 0x000001FF
_080589F0:
ldr r0, _08058A00 @ =0x000001FF
cmp r1, r0
ble _080589FC
movs r0, #0
_080589F8:
str r0, [r4, #0x20]
strh r0, [r4, #0x26]
_080589FC:
pop {r4, pc}
.align 2, 0
_08058A00: .4byte 0x000001FF
thumb_func_start sub_08058A04
sub_08058A04: @ 0x08058A04
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
adds r4, r0, #0
ldr r6, _08058A68 @ =gPlayerEntity
movs r0, #0x2e
ldrsh r1, [r6, r0]
ldr r7, _08058A6C @ =gRoomControls
ldrh r0, [r7, #6]
subs r1, r1, r0
mov r8, r1
movs r0, #0x32
ldrsh r1, [r6, r0]
ldrh r0, [r7, #8]
subs r5, r1, r0
ldr r0, [r4, #0x20]
ldr r1, _08058A70 @ =0xFFFFFEE8
adds r0, r0, r1
cmp r0, #0xc
bhi _08058A78
movs r0, #0x17
bl CheckGlobalFlag
cmp r0, #0
beq _08058A78
mov r0, r8
subs r0, #0x6d
cmp r0, #0x16
bhi _08058A78
adds r0, r5, #0
subs r0, #0x45
cmp r0, #0x16
bhi _08058A78
movs r0, #0x36
ldrsh r2, [r6, r0]
cmp r2, #0
bne _08058A78
ldr r0, _08058A74 @ =gPlayerState
movs r1, #3
strb r1, [r0, #0xc]
adds r0, #0x38
strb r2, [r0]
ldrh r0, [r7, #6]
adds r0, #0x78
strh r0, [r6, #0x2e]
ldrh r0, [r7, #8]
adds r0, #0x50
strh r0, [r6, #0x32]
b _08058AFC
.align 2, 0
_08058A68: .4byte gPlayerEntity
_08058A6C: .4byte gRoomControls
_08058A70: .4byte 0xFFFFFEE8
_08058A74: .4byte gPlayerState
_08058A78:
mov r1, r8
cmp r1, #0x77
bgt _08058AC0
cmp r5, #0x4f
bgt _08058AA0
ldr r3, _08058A9C @ =gUnk_08108228
adds r0, r4, #0
movs r1, #0x88
movs r2, #0xb0
bl sub_08058B08
cmp r0, #0
beq _08058AFC
adds r0, r4, #0
movs r1, #0
bl sub_08058B5C
b _08058AFC
.align 2, 0
_08058A9C: .4byte gUnk_08108228
_08058AA0:
ldr r3, _08058ABC @ =gUnk_08108258
adds r0, r4, #0
movs r1, #0x38
movs r2, #0x60
bl sub_08058B08
cmp r0, #0
beq _08058AFC
adds r0, r4, #0
movs r1, #1
bl sub_08058B5C
b _08058AFC
.align 2, 0
_08058ABC: .4byte gUnk_08108258
_08058AC0:
cmp r5, #0x4f
bgt _08058AE4
movs r2, #0x84
lsls r2, r2, #1
ldr r3, _08058AE0 @ =gUnk_08108288
adds r0, r4, #0
movs r1, #0xe0
bl sub_08058B08
cmp r0, #0
beq _08058AFC
adds r0, r4, #0
movs r1, #2
bl sub_08058B5C
b _08058AFC
.align 2, 0
_08058AE0: .4byte gUnk_08108288
_08058AE4:
ldr r3, _08058B04 @ =gUnk_081082B8
adds r0, r4, #0
movs r1, #0x90
movs r2, #0xb8
bl sub_08058B08
cmp r0, #0
beq _08058AFC
adds r0, r4, #0
movs r1, #3
bl sub_08058B5C
_08058AFC:
pop {r3}
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08058B04: .4byte gUnk_081082B8
thumb_func_start sub_08058B08
sub_08058B08: @ 0x08058B08
push {r4, r5, lr}
adds r4, r3, #0
ldr r0, [r0, #0x20]
cmp r0, r1
blo _08058B16
cmp r0, r2
bls _08058B1A
_08058B16:
movs r0, #0
b _08058B50
_08058B1A:
subs r0, r0, r1
lsrs r0, r0, #3
lsls r0, r0, #3
adds r4, r4, r0
ldr r3, _08058B54 @ =gPlayerEntity
movs r0, #0x2e
ldrsh r2, [r3, r0]
ldr r1, _08058B58 @ =gRoomControls
ldrh r0, [r1, #6]
subs r2, r2, r0
ldrh r0, [r4]
subs r2, r2, r0
movs r5, #0x32
ldrsh r0, [r3, r5]
ldrh r1, [r1, #8]
subs r0, r0, r1
ldrh r1, [r4, #2]
subs r0, r0, r1
movs r1, #0
ldrh r3, [r4, #4]
cmp r2, r3
bhs _08058B4E
ldrh r4, [r4, #6]
cmp r0, r4
bhs _08058B4E
movs r1, #1
_08058B4E:
adds r0, r1, #0
_08058B50:
pop {r4, r5, pc}
.align 2, 0
_08058B54: .4byte gPlayerEntity
_08058B58: .4byte gRoomControls
thumb_func_start sub_08058B5C
sub_08058B5C: @ 0x08058B5C
push {r4, r5, lr}
ldr r3, _08058BB4 @ =gScreenTransition
movs r0, #0
movs r4, #1
strb r4, [r3, #8]
strb r0, [r3, #9]
movs r5, #4
movs r0, #4
strb r0, [r3, #0xf]
ldr r0, _08058BB8 @ =gRoomControls
ldrb r0, [r0, #4]
strb r0, [r3, #0xc]
movs r0, #6
strb r0, [r3, #0xd]
adds r2, r1, #0
ands r2, r4
rsbs r0, r2, #0
orrs r0, r2
asrs r0, r0, #0x1f
ands r0, r5
strb r0, [r3, #0xe]
ldr r4, _08058BBC @ =gUnk_081082E8
lsls r2, r1, #1
adds r2, r2, r1
lsls r0, r2, #1
adds r0, r0, r4
ldrh r0, [r0]
strh r0, [r3, #0x10]
adds r0, r2, #1
lsls r0, r0, #1
adds r0, r0, r4
ldrh r0, [r0]
strh r0, [r3, #0x12]
ldr r1, _08058BC0 @ =gUnk_02002A40
adds r2, #2
lsls r2, r2, #1
adds r2, r2, r4
ldrh r0, [r2]
strb r0, [r1, #7]
ldr r0, _08058BC4 @ =0x00000121
bl PlaySFX
pop {r4, r5, pc}
.align 2, 0
_08058BB4: .4byte gScreenTransition
_08058BB8: .4byte gRoomControls
_08058BBC: .4byte gUnk_081082E8
_08058BC0: .4byte gUnk_02002A40
_08058BC4: .4byte 0x00000121
thumb_func_start sub_08058BC8
sub_08058BC8: @ 0x08058BC8
push {r4, r5, r6, r7, lr}
mov r7, sb
mov r6, r8
push {r6, r7}
sub sp, #0x14
mov sb, r0
ldr r0, _08058C9C @ =gUnk_03003DE4
ldrb r1, [r0]
lsls r0, r1, #2
adds r0, r0, r1
lsls r0, r0, #9
ldr r1, _08058CA0 @ =gUnk_02017AA0
adds r4, r0, r1
movs r0, #0x80
lsls r0, r0, #9
str r0, [sp]
mov r1, sp
movs r2, #0
movs r0, #0x78
strh r0, [r1, #8]
movs r0, #0x80
strh r0, [r1, #0xa]
mov r0, sp
strh r2, [r0, #0x10]
movs r1, #0x80
lsls r1, r1, #1
strh r1, [r0, #0xe]
strh r1, [r0, #0xc]
movs r5, #0
mov r6, sp
ldr r0, _08058CA4 @ =gSineTable
mov r8, r0
adds r7, r1, #0
_08058C0A:
lsls r0, r5, #7
movs r1, #0xa0
bl __divsi3
movs r1, #0xff
ands r0, r1
lsls r1, r0, #1
add r1, r8
movs r3, #0
ldrsh r2, [r1, r3]
lsls r1, r2, #1
adds r1, r1, r2
asrs r1, r1, #2
adds r1, r1, r7
strh r1, [r6, #0xc]
lsls r0, r0, #2
add r0, r8
movs r1, #0
ldrsh r0, [r0, r1]
asrs r0, r0, #4
subs r0, r7, r0
strh r0, [r6, #0xe]
mov r3, sb
ldr r0, [r3, #0x20]
adds r0, r0, r5
lsls r0, r0, #8
str r0, [sp, #4]
mov r0, sp
adds r1, r4, #0
movs r2, #1
bl BgAffineSet
adds r4, #0x10
adds r5, #1
cmp r5, #0x9f
bls _08058C0A
ldr r0, _08058C9C @ =gUnk_03003DE4
ldrb r1, [r0]
lsls r0, r1, #2
adds r0, r0, r1
lsls r0, r0, #9
ldr r1, _08058CA8 @ =gUnk_02017BA0
adds r4, r0, r1
ldr r2, _08058CAC @ =gScreen
ldrh r0, [r4]
strh r0, [r2, #0x38]
ldrh r0, [r4, #2]
strh r0, [r2, #0x3a]
ldrh r0, [r4, #4]
strh r0, [r2, #0x3c]
ldrh r0, [r4, #6]
strh r0, [r2, #0x3e]
ldrh r1, [r4, #8]
adds r0, r2, #0
adds r0, #0x40
strh r1, [r0]
ldrh r0, [r4, #0xa]
adds r1, r2, #0
adds r1, #0x42
strh r0, [r1]
ldrh r1, [r4, #0xc]
adds r0, r2, #0
adds r0, #0x44
strh r1, [r0]
ldrh r1, [r4, #0xe]
adds r0, #2
strh r1, [r0]
add sp, #0x14
pop {r3, r4}
mov r8, r3
mov sb, r4
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08058C9C: .4byte gUnk_03003DE4
_08058CA0: .4byte gUnk_02017AA0
_08058CA4: .4byte gSineTable
_08058CA8: .4byte gUnk_02017BA0
_08058CAC: .4byte gScreen
thumb_func_start sub_08058CB0
sub_08058CB0: @ 0x08058CB0
push {r4, lr}
adds r4, r0, #0
ldr r2, _08058CD8 @ =gPlayerEntity
movs r0, #0x2e
ldrsh r1, [r2, r0]
ldr r3, _08058CDC @ =gRoomControls
ldrh r0, [r3, #6]
subs r1, r1, r0
movs r0, #0x32
ldrsh r2, [r2, r0]
ldrh r0, [r3, #8]
subs r2, r2, r0
cmp r1, #0x77
bhi _08058CE0
movs r1, #1
cmp r2, #0x4f
bhi _08058CE8
movs r1, #0
b _08058CE8
.align 2, 0
_08058CD8: .4byte gPlayerEntity
_08058CDC: .4byte gRoomControls
_08058CE0:
movs r1, #3
cmp r2, #0x4f
bhi _08058CE8
movs r1, #2
_08058CE8:
ldr r0, _08058CF8 @ =gUnk_08108300
lsls r1, r1, #1
adds r1, r1, r0
ldrh r0, [r1]
str r0, [r4, #0x20]
strh r0, [r4, #0x26]
pop {r4, pc}
.align 2, 0
_08058CF8: .4byte gUnk_08108300
thumb_func_start sub_08058CFC
sub_08058CFC: @ 0x08058CFC
push {r4, r5, lr}
ldr r5, _08058D2C @ =gPlayerEntity
movs r1, #0x32
ldrsh r0, [r5, r1]
ldr r1, _08058D30 @ =gRoomControls
movs r2, #0xc
ldrsh r1, [r1, r2]
subs r4, r0, r1
cmp r4, #0x4b
bhi _08058D1A
adds r0, r5, #0
movs r1, #0xc0
movs r2, #0x10
bl sub_080044AE
_08058D1A:
cmp r4, #0x54
bls _08058D28
adds r0, r5, #0
movs r1, #0xc0
movs r2, #0
bl sub_080044AE
_08058D28:
pop {r4, r5, pc}
.align 2, 0
_08058D2C: .4byte gPlayerEntity
_08058D30: .4byte gRoomControls
thumb_func_start sub_08058D34
sub_08058D34: @ 0x08058D34
push {r4, lr}
movs r0, #0x28
bl LoadPaletteGroup
ldr r0, _08058DAC @ =gUnk_02017700
movs r2, #0x90
lsls r2, r2, #2
adds r1, r0, r2
movs r2, #0x20
bl _DmaCopy
ldr r2, _08058DB0 @ =gUsedPalettes
ldr r0, [r2]
movs r1, #0x80
lsls r1, r1, #0xe
orrs r0, r1
str r0, [r2]
movs r0, #0x16
bl LoadGfxGroup
ldr r1, _08058DB4 @ =gScreen
ldrh r0, [r1]
movs r3, #0
movs r2, #1
movs r4, #0
orrs r0, r2
strh r0, [r1]
ldr r0, _08058DB8 @ =0x0000BC82
strh r0, [r1, #0x20]
ldr r0, _08058DBC @ =0x00005E86
strh r0, [r1, #0x14]
strh r3, [r1, #0x16]
strh r3, [r1, #0x18]
adds r2, r1, #0
adds r2, #0x66
ldr r0, _08058DC0 @ =0x00003456
strh r0, [r2]
adds r1, #0x68
ldr r0, _08058DC4 @ =0x00000909
strh r0, [r1]
ldr r0, _08058DC8 @ =gArea
movs r2, #0x86
lsls r2, r2, #4
adds r1, r0, r2
adds r2, #4
adds r0, r0, r2
ldr r0, [r0]
str r0, [r1]
ldr r0, _08058DCC @ =gUnk_02000070
strb r4, [r0]
movs r0, #0x17
bl CheckGlobalFlag
cmp r0, #0
beq _08058DA8
movs r0, #0x4a
bl LoadGfxGroup
_08058DA8:
pop {r4, pc}
.align 2, 0
_08058DAC: .4byte gUnk_02017700
_08058DB0: .4byte gUsedPalettes
_08058DB4: .4byte gScreen
_08058DB8: .4byte 0x0000BC82
_08058DBC: .4byte 0x00005E86
_08058DC0: .4byte 0x00003456
_08058DC4: .4byte 0x00000909
_08058DC8: .4byte gArea
_08058DCC: .4byte gUnk_02000070
asm/managerF.s
+2 -2
View File
@@ -862,7 +862,7 @@ sub_08059548: @ 0x08059548
bne _0805955C
bl DeleteThisEntity
_0805955C:
ldr r2, _0805956C @ =gUnk_03000FF0
ldr r2, _0805956C @ =gInput
ldrh r1, [r2]
movs r0, #4
orrs r0, r1
@@ -870,4 +870,4 @@ _0805955C:
pop {pc}
.align 2, 0
_08059568: .4byte gPlayerEntity
_0805956C: .4byte gUnk_03000FF0
_0805956C: .4byte gInput
asm/mazaalHead.s
+1 -1
View File
@@ -1850,4 +1850,4 @@ _08034C54:
_08034C5A:
pop {r4, pc}
.align 2, 0
_08034C5C: .4byte gUnk_080CED9C
_08034C5C: .4byte gUnk_080CED9C

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