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

Merge pull request #116 from notyourav/misc

Browse Source 
Filescreen finished
This commit is contained in:
notyourav
2021-02-03 17:43:29 -08:00
committed by GitHub
parent 4d0765487f be1598afbb
commit 8774c8939d
135 changed files with 6019 additions and 6358 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -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 -Wno-multichar -O2
override CFLAGS += -O2 -Wimplicit -Wparentheses -Werror -Wno-multichar
# -fhex-asm
ifeq ($(DINFO),1)
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
+2 -2
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
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/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/code_08016DF8.s
+15 -15
View File
@@ -128,7 +128,7 @@ _08016ED6:
cmp r1, #0
beq _08016EFC
ldr r2, _08016F14 @ =0x040000D4
ldr r0, _08016F24 @ =gUnk_020344B0
ldr r0, _08016F24 @ =gBG2Buffer
str r0, [r2]
ldrh r1, [r1]
movs r0, #0xf8
@@ -155,13 +155,13 @@ _08016F14: .4byte 0x040000D4
_08016F18: .4byte gBG1Buffer
_08016F1C: .4byte 0x84000170
_08016F20: .4byte gUnk_0200B650
_08016F24: .4byte gUnk_020344B0
_08016F24: .4byte gBG2Buffer
thumb_func_start sub_08016F28
sub_08016F28: @ 0x08016F28
push {r4, r5, lr}
adds r4, r0, #0
ldr r0, _08016F44 @ =gUnk_02002A40
ldr r0, _08016F44 @ =gSave
adds r0, #0xba
ldrb r0, [r0]
cmp r0, #0
@@ -173,7 +173,7 @@ sub_08016F28: @ 0x08016F28
orrs r1, r2
b _08016F54
.align 2, 0
_08016F44: .4byte gUnk_02002A40
_08016F44: .4byte gSave
_08016F48: .4byte gPlayerState
_08016F4C:
ldr r0, _08016F98 @ =gPlayerState
@@ -367,7 +367,7 @@ _080170C0:
_080170CE:
ldr r3, _08017128 @ =gRoomVars
strb r1, [r3, #0xa]
ldr r2, _0801712C @ =gUnk_02002A40
ldr r2, _0801712C @ =gSave
adds r0, r2, #0
adds r0, #0xab
ldrb r0, [r0]
@@ -400,7 +400,7 @@ _080170E8:
ldr r0, _08017138 @ =0x0000011F
bl EnqueueSFX
_08017112:
ldr r0, _0801712C @ =gUnk_02002A40
ldr r0, _0801712C @ =gSave
adds r2, r0, #0
adds r2, #0xb2
ldrb r1, [r2]
@@ -412,7 +412,7 @@ _08017112:
.align 2, 0
_08017124: .4byte gTextBox
_08017128: .4byte gRoomVars
_0801712C: .4byte gUnk_02002A40
_0801712C: .4byte gSave
_08017130: .4byte gUnk_0200AF00
_08017134: .4byte gScreenTransition
_08017138: .4byte 0x0000011F
@@ -433,7 +433,7 @@ _08017150:
ldr r0, _0801716C @ =0x000001B3
bl PlaySFX
_0801715A:
ldr r0, _08017170 @ =gUnk_02002A40
ldr r0, _08017170 @ =gSave
adds r3, r0, #0
adds r3, #0xb3
ldrb r1, [r3]
@@ -444,7 +444,7 @@ _0801715A:
b _080171A4
.align 2, 0
_0801716C: .4byte 0x000001B3
_08017170: .4byte gUnk_02002A40
_08017170: .4byte gSave
_08017174:
adds r2, r0, #0
adds r2, #0xc6
@@ -471,7 +471,7 @@ _08017196:
adds r0, r5, #0
bl CreateSparkle
_080171A4:
ldr r0, _080171B8 @ =gUnk_02002A40
ldr r0, _080171B8 @ =gSave
adds r3, r0, #0
adds r3, #0xba
ldrb r1, [r3]
@@ -481,7 +481,7 @@ _080171A4:
strh r1, [r0]
b _080171EA
.align 2, 0
_080171B8: .4byte gUnk_02002A40
_080171B8: .4byte gSave
_080171BC:
adds r2, r0, #0
adds r2, #0xc8
@@ -1397,7 +1397,7 @@ sub_08017874: @ 0x08017874
adds r0, r2, #0
adds r0, #0x44
ldrb r1, [r0]
ldr r0, _08017898 @ =gUnk_02002A40
ldr r0, _08017898 @ =gSave
adds r0, #0xb2
ldrb r0, [r0]
cmp r0, #0x2f
@@ -1406,7 +1406,7 @@ sub_08017874: @ 0x08017874
beq _080178A8
b _080178AE
.align 2, 0
_08017898: .4byte gUnk_02002A40
_08017898: .4byte gSave
_0801789C:
adds r0, r1, #0
cmp r1, #0
@@ -1438,7 +1438,7 @@ _080178C6:
ldrb r0, [r2, #8]
cmp r0, #8
bne _080178F6
ldr r0, _080178E4 @ =gUnk_02002A40
ldr r0, _080178E4 @ =gSave
adds r0, #0xb2
ldrb r0, [r0]
cmp r0, #0x30
@@ -1447,7 +1447,7 @@ _080178C6:
beq _080178F4
b _080178F6
.align 2, 0
_080178E4: .4byte gUnk_02002A40
_080178E4: .4byte gSave
_080178E8:
lsls r0, r1, #1
adds r0, r0, r1
asm/code_08019444.s
+10 -10
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:
asm/code_0801C370.s
+4 -4
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
@@ -121,7 +121,7 @@ _0801C398:
pop {r4, r5, r6, pc}
.align 2, 0
_0801C470: .4byte gUnk_0200AF00
_0801C474: .4byte gUnk_02002A40
_0801C474: .4byte gSave
_0801C478: .4byte gBG0Buffer
_0801C47C: .4byte gScreen
_0801C480: .4byte 0x00001F0C
asm/code_0801C85C.s
+8 -8
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
@@ -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
asm/code_0801D79C.s
+15 -15
View File
@@ -378,7 +378,7 @@ sub_0801DB34: @ 0x0801DB34
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]
@@ -398,7 +398,7 @@ _0801DB70: .4byte gBG0Buffer
_0801DB74: .4byte 0x00001F0C
_0801DB78: .4byte gBG1Buffer
_0801DB7C: .4byte 0x00001C01
_0801DB80: .4byte gUnk_020344B0
_0801DB80: .4byte gBG2Buffer
_0801DB84: .4byte 0x00001D02
_0801DB88: .4byte gBG3Buffer
_0801DB8C: .4byte 0x00001E03
@@ -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_08049D30.s
+2 -2
View File
@@ -1543,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]
@@ -1594,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
+40 -40
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
@@ -1574,7 +1574,7 @@ sub_08053320: @ 0x08053320
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 @ =gBG3Buffer
@@ -1604,7 +1604,7 @@ _08053362:
.align 2, 0
_0805337C: .4byte gBG0Buffer
_08053380: .4byte gBG1Buffer
_08053384: .4byte gUnk_020344B0
_08053384: .4byte gBG2Buffer
_08053388: .4byte gBG3Buffer
_0805338C: .4byte gRoomControls
@@ -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
@@ -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
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_08056418.s
+8 -8
View File
@@ -19,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
@@ -81,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:
@@ -422,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
@@ -433,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
@@ -603,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
@@ -619,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
@@ -665,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
@@ -678,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
asm/code_0805EC04.s
+3 -3
View File
@@ -85,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
@@ -117,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
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
+4 -4
View File
@@ -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 -2
View File
@@ -1127,7 +1127,7 @@ sub_08071D04: @ 0x08071D04
adds r1, r0, #0
cmp r1, #0
beq _08071D3A
ldr r0, _08071D6C @ =gUnk_02002A40
ldr r0, _08071D6C @ =gSave
adds r0, r0, r1
adds r0, #0xb5
movs r1, #0x20
@@ -1162,7 +1162,7 @@ _08071D3A:
strb r3, [r1]
b _08071D7A
.align 2, 0
_08071D6C: .4byte gUnk_02002A40
_08071D6C: .4byte gSave
_08071D70: .4byte gPlayerState
_08071D74:
ldr r1, _08071D7C @ =gScreenTransition
asm/code_080732D0.s
+8 -8
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
@@ -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
+10 -10
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:
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
+8 -8
View File
@@ -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_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_0807F0D8.s
+6 -6
View File
@@ -7,7 +7,7 @@
thumb_func_start sub_0807F0D8
sub_0807F0D8: @ 0x0807F0D8
ldr r0, _0807F0E8 @ =gUnk_03000FF0
ldr r0, _0807F0E8 @ =gInput
ldrh r2, [r0, #2]
rsbs r0, r2, #0
orrs r0, r2
@@ -15,7 +15,7 @@ sub_0807F0D8: @ 0x0807F0D8
str r0, [r1, #0x14]
bx lr
.align 2, 0
_0807F0E8: .4byte gUnk_03000FF0
_0807F0E8: .4byte gInput
thumb_func_start sub_0807F0EC
sub_0807F0EC: @ 0x0807F0EC
@@ -1010,7 +1010,7 @@ sub_0807F7C4: @ 0x0807F7C4
_0807F7D2:
bl sub_08053FE0
movs r2, #0
ldr r1, _0807F7F8 @ =gUnk_02002A40
ldr r1, _0807F7F8 @ =gSave
adds r1, #0xc0
ldrh r1, [r1]
cmp r0, r1
@@ -1026,7 +1026,7 @@ _0807F7E4:
pop {r4, pc}
.align 2, 0
_0807F7F4: .4byte gRoomVars
_0807F7F8: .4byte gUnk_02002A40
_0807F7F8: .4byte gSave
_0807F7FC: .4byte gUnk_02033280
thumb_func_start sub_0807F800
@@ -1562,7 +1562,7 @@ _0807FBF8: .4byte gUnk_02033280
thumb_func_start sub_0807FBFC
sub_0807FBFC: @ 0x0807FBFC
ldr r3, _0807FC20 @ =gUnk_02002A40
ldr r3, _0807FC20 @ =gSave
adds r0, r3, #0
adds r0, #0xb2
movs r1, #0
@@ -1580,7 +1580,7 @@ sub_0807FBFC: @ 0x0807FBFC
strh r1, [r0]
bx lr
.align 2, 0
_0807FC20: .4byte gUnk_02002A40
_0807FC20: .4byte gSave
thumb_func_start sub_0807FC24
sub_0807FC24: @ 0x0807FC24
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
+12 -12
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
@@ -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]
@@ -608,7 +608,7 @@ _080A3914:
_080A391C: .4byte gFadeControl
_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
asm/code_080A3BD0.s
+36 -36
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
@@ -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]
@@ -749,7 +749,7 @@ _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
@@ -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
@@ -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
@@ -1327,7 +1327,7 @@ _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,7 +1698,7 @@ _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
@@ -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
@@ -1908,7 +1908,7 @@ _080A4ABE:
b _080A4B3A
.align 2, 0
_080A4B1C: .4byte gUnk_03001010
_080A4B20: .4byte gUnk_02002A40
_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
@@ -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
@@ -2249,7 +2249,7 @@ sub_080A4DB8: @ 0x080A4DB8
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
@@ -2314,7 +2314,7 @@ _080A4E54:
.align 2, 0
_080A4E58: .4byte gBG0Buffer
_080A4E5C: .4byte gBG1Buffer
_080A4E60: .4byte gUnk_020344B0
_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
@@ -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:
@@ -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
@@ -3046,7 +3046,7 @@ _080A53E0:
b _080A542C
.align 2, 0
_080A5400: .4byte gUnk_03001010
_080A5404: .4byte gUnk_02002A40
_080A5404: .4byte gSave
_080A5408: .4byte gMenu
_080A540C: .4byte gUnk_08128B64
_080A5410: .4byte gBombBagSizes
@@ -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]
@@ -3200,4 +3200,4 @@ _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
+59 -59
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
@@ -485,7 +485,7 @@ _080A5920:
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
@@ -523,7 +523,7 @@ _080A5976:
_080A5980: .4byte gUnk_080FDFD8
_080A5984: .4byte gMenu
_080A5988: .4byte gUnk_03001010
_080A598C: .4byte gUnk_02002A40
_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
@@ -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
@@ -1405,7 +1405,7 @@ sub_080A6044: @ 0x080A6044
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
@@ -1460,7 +1460,7 @@ _080A60C2:
_080A60CC: .4byte gMenu
_080A60D0: .4byte gUnk_08128D51
_080A60D4: .4byte gUnk_03001010
_080A60D8: .4byte gUnk_02002A40
_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:
@@ -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
@@ -1889,7 +1889,7 @@ sub_080A6438: @ 0x080A6438
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]
@@ -1923,7 +1923,7 @@ _080A6482:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A6484: .4byte gUnk_03001010
_080A6488: .4byte gUnk_02002A40
_080A6488: .4byte gSave
_080A648C: .4byte gMenu
_080A6490: .4byte gUnk_08128F58
_080A6494: .4byte 0x000001FB
@@ -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:
@@ -1971,7 +1971,7 @@ _080A64D2:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A64E4: .4byte gUnk_03001010
_080A64E8: .4byte gUnk_02002A40
_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
@@ -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]
@@ -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
@@ -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
@@ -3221,7 +3221,7 @@ _080A6EC8:
_080A6ED0: .4byte gUnk_03001010
_080A6ED4: .4byte gMenu
_080A6ED8: .4byte 0x000001FB
_080A6EDC: .4byte gUnk_02002A40
_080A6EDC: .4byte gSave
thumb_func_start sub_080A6EE0
sub_080A6EE0: @ 0x080A6EE0
@@ -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
asm/code_080AD90C.s
+2 -2
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]
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
+4 -4
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
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/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/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
+1220
View File
File diff suppressed because it is too large Load Diff
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/hurdyGurdyMan.s
+2 -2
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
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/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/manager16.s
+2 -2
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]
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/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/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/modArrows.s
+2 -2
View File
@@ -10,7 +10,7 @@
ModArrows: @ 0x08054330
push {lr}
adds r3, r0, #0
ldr r1, _08054354 @ =gUnk_02002A40
ldr r1, _08054354 @ =gSave
adds r0, r1, #0
adds r0, #0xad
ldrb r0, [r0]
@@ -26,7 +26,7 @@ ModArrows: @ 0x08054330
movs r3, #0
b _08054362
.align 2, 0
_08054354: .4byte gUnk_02002A40
_08054354: .4byte gSave
_08054358: .4byte gQuiverSizes
_0805435C:
cmp r2, r3
asm/modBombs.s
+2 -2
View File
@@ -10,7 +10,7 @@
ModBombs: @ 0x080542F4
push {lr}
adds r3, r0, #0
ldr r1, _08054318 @ =gUnk_02002A40
ldr r1, _08054318 @ =gSave
adds r0, r1, #0
adds r0, #0xac
ldrb r0, [r0]
@@ -26,7 +26,7 @@ ModBombs: @ 0x080542F4
movs r3, #0
b _08054326
.align 2, 0
_08054318: .4byte gUnk_02002A40
_08054318: .4byte gSave
_0805431C: .4byte gBombBagSizes
_08054320:
cmp r2, r3
asm/nayru.s
+2 -2
View File
@@ -89,7 +89,7 @@ sub_08064928: @ 0x08064928
adds r4, r0, #0
bl sub_0801E99C
adds r5, r0, #0
ldr r6, _08064958 @ =gUnk_02002A40
ldr r6, _08064958 @ =gSave
adds r0, r4, #0
bl sub_08002632
ldr r2, _0806495C @ =0x00000141
@@ -108,7 +108,7 @@ _0806494E:
bl sub_08078784
pop {r4, r5, r6, pc}
.align 2, 0
_08064958: .4byte gUnk_02002A40
_08064958: .4byte gSave
_0806495C: .4byte 0x00000141
thumb_func_start Nayru_Fusion
asm/non_matching/code_0805457C.inc
+4 -4
View File
@@ -77,7 +77,7 @@ _0805463C:
bne _08054642
b _0805474C
_08054642:
ldr r0, _08054658 @ =gUnk_02002A40
ldr r0, _08054658 @ =gSave
adds r0, #0xb3
ldrb r1, [r0]
cmp r1, #0
@@ -87,7 +87,7 @@ _08054642:
.align 2, 0
_08054650: .4byte gUnk_0800161C
_08054654: .4byte gUnk_02034398
_08054658: .4byte gUnk_02002A40
_08054658: .4byte gSave
_0805465C: .4byte gUnk_08001A1C
_08054660:
lsls r1, r1, #5
@@ -97,7 +97,7 @@ _08054666:
mov r0, sp
adds r1, r4, #0
bl sub_08000F14
ldr r4, _08054740 @ =gUnk_02002A40
ldr r4, _08054740 @ =gSave
adds r0, r4, #0
adds r0, #0xaa
ldrb r0, [r0]
@@ -205,7 +205,7 @@ _08054726:
b _0805474E
.align 2, 0
_0805473C: .4byte gUnk_0800143C
_08054740: .4byte gUnk_02002A40
_08054740: .4byte gSave
_08054744: .4byte gUnk_08001A1C
_08054748: .4byte gUnk_080FE1B4
_0805474C:
asm/non_matching/fileScreen/sub_08050EF4.inc
+138
View File
@@ -0,0 +1,138 @@
.syntax unified
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
ldr r0, _08050F40 @ =gUnk_02019EE0
ldrb r1, [r0]
adds r6, r0, #0
cmp r1, #0
bne _08050FF4
ldrb r1, [r6, #6]
ldr r0, _08050F44 @ =0x000004B4
muls r1, r0, r1
adds r0, r6, #0
adds r0, #0xc
adds r1, r1, r0
ldr r0, _08050F48 @ =gMenu
ldrb r3, [r0, #1]
adds r4, r1, #3
mov ip, r0
cmp r3, #0
bne _08050F1E
adds r4, r1, #2
_08050F1E:
ldrb r2, [r4]
movs r5, #0
ldr r0, _08050F4C @ =gInput
ldrh r0, [r0, #2]
mov r8, r2
cmp r0, #0x10
beq _08050F7A
cmp r0, #0x10
bgt _08050F56
cmp r0, #2
beq _08050F8C
cmp r0, #2
bgt _08050F50
cmp r0, #1
beq _08050F82
b _08050F8E
.align 2, 0
_08050F40: .4byte gUnk_02019EE0
_08050F44: .4byte 0x000004B4
_08050F48: .4byte gMenu
_08050F4C: .4byte gInput
_08050F50:
cmp r0, #8
beq _08050F82
b _08050F8E
_08050F56:
cmp r0, #0x40
beq _08050F6A
cmp r0, #0x40
bgt _08050F64
cmp r0, #0x20
beq _08050F72
b _08050F8E
_08050F64:
cmp r0, #0x80
beq _08050F6E
b _08050F8E
_08050F6A:
movs r3, #0
b _08050F8E
_08050F6E:
movs r3, #1
b _08050F8E
_08050F72:
cmp r2, #0
beq _08050F8E
subs r2, #1
b _08050F8E
_08050F7A:
cmp r2, #1
bhi _08050F8E
adds r2, #1
b _08050F8E
_08050F82:
ldrh r0, [r6, #4]
movs r5, #2
ldrh r7, [r1, #2]
cmp r0, r7
bne _08050F8E
_08050F8C:
movs r5, #3
_08050F8E:
cmp r5, #0
beq _08050FD0
cmp r5, #2
beq _08050F9C
cmp r5, #3
beq _08050FAC
b _08050FBA
_08050F9C:
movs r0, #8
movs r1, #0
bl CreateDialogBox
movs r0, #0x6a
bl PlaySFX
b _08050FBA
_08050FAC:
ldrb r0, [r6, #4]
strb r0, [r1, #2]
ldrb r0, [r6, #5]
strb r0, [r1, #3]
movs r0, #0x6c
bl PlaySFX
_08050FBA:
adds r0, r5, #0
bl sub_080A7114
ldr r0, _08050FCC @ =gUnk_02019EE0
ldrb r0, [r0, #6]
bl SetActiveSave
b _08050FF4
.align 2, 0
_08050FCC: .4byte gUnk_02019EE0
_08050FD0:
mov r1, ip
ldrb r0, [r1, #1]
cmp r0, r3
beq _08050FE2
strb r3, [r1, #1]
movs r0, #0x69
bl PlaySFX
b _08050FF4
_08050FE2:
cmp r2, r8
beq _08050FF4
strb r2, [r4]
ldrb r0, [r6, #6]
bl LoadOptionsFromSave
movs r0, #0x69
bl PlaySFX
_08050FF4:
pop {r3}
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
.syntax divided
asm/non_matching/fileScreen/sub_08051738.inc
+65
View File
@@ -0,0 +1,65 @@
.syntax unified
push {r4, r5, r6, r7, lr}
ldr r1, _08051768 @ =gUnk_02019EE0
movs r0, #4
strb r0, [r1, #7]
movs r4, #0
movs r3, #0
adds r5, r1, #0
adds r7, r5, #0
adds r7, #8
ldr r6, _0805176C @ =gUnk_02000090
_0805174C:
adds r0, r3, r7
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #1
bne _08051770
ldrb r1, [r5, #6]
movs r2, #4
eors r1, r3
rsbs r0, r1, #0
orrs r0, r1
asrs r0, r0, #0x1f
ands r2, r0
b _08051774
.align 2, 0
_08051768: .4byte gUnk_02019EE0
_0805176C: .4byte gUnk_02000090
_08051770:
adds r4, #1
adds r2, r4, #0
_08051774:
adds r0, r3, r6
strb r2, [r0]
adds r3, #1
cmp r3, #2
bls _0805174C
cmp r4, #0
bne _0805179C
ldr r1, _08051798 @ =gMenu
movs r0, #0x3c
strh r0, [r1, #8]
movs r0, #1
movs r1, #0
bl CreateDialogBox
movs r0, #3
bl sub_080A7114
b _080517A2
.align 2, 0
_08051798: .4byte gMenu
_0805179C:
movs r0, #1
bl sub_080A7114
_080517A2:
adds r4, #1
ldr r0, _080517B0 @ =gMenu
strb r4, [r0, #0x16]
movs r1, #4
strb r1, [r0, #0x13]
strb r4, [r0, #0x14]
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080517B0: .4byte gMenu
.syntax divided
asm/non_matching/fileScreen/sub_080517B4.inc
+32
View File
@@ -0,0 +1,32 @@
.syntax unified
push {r4, lr}
adds r2, r0, #0
ldr r0, _080517E4 @ =gUnk_02019EE0
ldrb r1, [r0, #7]
adds r4, r0, #0
cmp r2, #0
beq _080517DE
adds r1, r1, r2
cmp r1, #4
bhi _080517DC
ldr r3, _080517E8 @ =gUnk_02000090
_080517CA:
adds r0, r1, r3
ldrb r0, [r0]
cmp r0, #0
beq _080517D6
cmp r0, #4
bne _080517DE
_080517D6:
adds r1, r1, r2
cmp r1, #4
bls _080517CA
_080517DC:
ldrb r1, [r4, #7]
_080517DE:
adds r0, r1, #0
pop {r4, pc}
.align 2, 0
_080517E4: .4byte gUnk_02019EE0
_080517E8: .4byte gUnk_02000090
.syntax divided
asm/non_matching/fileScreen/sub_080610B8.inc
+348
View File
@@ -0,0 +1,348 @@
.syntax unified
push {r4, r5, r6, r7, lr}
ldr r0, _080510E4 @ =gUnk_02019EE0
ldrb r0, [r0]
cmp r0, #0
beq _080510C4
b _0805134C
_080510C4:
movs r7, #0
ldr r0, _080510E8 @ =gInput
ldrh r1, [r0, #2]
adds r2, r0, #0
cmp r1, #8
bne _080510D2
b _080511C8
_080510D2:
cmp r1, #8
bgt _080510EC
cmp r1, #1
bne _080510DC
b _080511F2
_080510DC:
cmp r1, #2
beq _080511B8
b _08051100
.align 2, 0
_080510E4: .4byte gUnk_02019EE0
_080510E8: .4byte gInput
_080510EC:
movs r0, #0x80
lsls r0, r0, #1
cmp r1, r0
bne _080510F6
b _0805122C
_080510F6:
movs r0, #0x80
lsls r0, r0, #2
cmp r1, r0
bne _08051100
b _0805121C
_08051100:
movs r6, #0
movs r5, #0
ldrh r0, [r2, #4]
cmp r0, #0x20
beq _08051128
cmp r0, #0x20
bgt _08051114
cmp r0, #0x10
beq _0805112E
b _08051130
_08051114:
cmp r0, #0x40
beq _0805111E
cmp r0, #0x80
beq _08051124
b _08051130
_0805111E:
movs r5, #1
rsbs r5, r5, #0
b _08051130
_08051124:
movs r5, #1
b _08051130
_08051128:
movs r6, #1
rsbs r6, r6, #0
b _08051130
_0805112E:
movs r6, #1
_08051130:
ldr r4, _0805117C @ =gMenu
ldrb r0, [r4, #0x11]
adds r0, r0, r5
adds r0, #6
movs r1, #6
bl __modsi3
strb r0, [r4, #0x11]
orrs r5, r6
cmp r5, #0
beq _0805114C
movs r0, #0x67
bl PlaySFX
_0805114C:
cmp r6, #0
beq _0805123A
ldrb r0, [r4, #0x11]
cmp r0, #5
beq _08051184
ldrb r0, [r4, #0x10]
adds r0, r0, r6
adds r0, #0xd
movs r1, #0xd
bl __modsi3
strb r0, [r4, #0x10]
ldr r1, _08051180 @ =gUnk_080FC980
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r0, [r0, #7]
cmp r0, #0
beq _08051172
adds r1, #0x10
_08051172:
ldrb r0, [r4, #0x10]
adds r0, r1, r0
ldrb r0, [r0]
strb r0, [r4, #0x12]
b _0805123A
.align 2, 0
_0805117C: .4byte gMenu
_08051180: .4byte gUnk_080FC980
_08051184:
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r0, [r0, #7]
adds r5, r0, #0
movs r1, #4
cmp r5, #0
bne _08051194
movs r1, #5
_08051194:
ldrb r0, [r4, #0x12]
adds r0, r0, r6
adds r0, r0, r1
bl __modsi3
strb r0, [r4, #0x12]
ldr r1, _080511B4 @ =gUnk_080FC9A0
cmp r5, #0
beq _080511A8
adds r1, #8
_080511A8:
ldrb r0, [r4, #0x12]
adds r0, r1, r0
ldrb r0, [r0]
strb r0, [r4, #0x10]
b _0805123A
.align 2, 0
_080511B4: .4byte gUnk_080FC9A0
_080511B8:
ldr r0, _080511C4 @ =gMenu
ldrb r0, [r0, #0x13]
cmp r0, #0
beq _080511EC
movs r7, #5
b _0805123A
.align 2, 0
_080511C4: .4byte gMenu
_080511C8:
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r0, [r0, #7]
movs r1, #3
cmp r0, #0
bne _080511D6
movs r1, #4
_080511D6:
ldr r2, _080511E8 @ =gMenu
ldrb r0, [r2, #0x11]
cmp r0, #5
bne _080511EC
ldrb r2, [r2, #0x12]
cmp r1, r2
bne _080511EC
movs r7, #8
b _0805123A
.align 2, 0
_080511E8: .4byte gMenu
_080511EC:
bl sub_08051358
b _0805123A
_080511F2:
ldr r1, _08051210 @ =gMenu
ldrb r0, [r1, #0x11]
cmp r0, #5
bne _08051218
ldr r2, _08051214 @ =gUnk_080FC970
ldrb r1, [r1, #0x12]
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r0, [r0, #7]
cmp r0, #0
beq _0805120A
adds r1, #8
_0805120A:
adds r0, r1, r2
ldrb r7, [r0]
b _0805123A
.align 2, 0
_08051210: .4byte gMenu
_08051214: .4byte gUnk_080FC970
_08051218:
movs r7, #6
b _0805123A
_0805121C:
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r0, [r0, #7]
movs r7, #1
cmp r0, #0
bne _0805123A
movs r7, #4
b _0805123A
_0805122C:
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r0, [r0, #7]
movs r7, #2
cmp r0, #0
bne _0805123A
movs r7, #7
_0805123A:
ldr r0, _08051250 @ =gMenu
ldrb r4, [r0, #1]
subs r0, r7, #1
cmp r0, #7
bhi _08051322
lsls r0, r0, #2
ldr r1, _08051254 @ =_08051258
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08051250: .4byte gMenu
_08051254: .4byte _08051258
_08051258: @ jump table
.4byte _08051278 @ case 0
.4byte _0805127C @ case 1
.4byte _08051280 @ case 2
.4byte _08051284 @ case 3
.4byte _08051288 @ case 4
.4byte _080512C0 @ case 5
.4byte _080512B8 @ case 6
.4byte _080512EC @ case 7
_08051278:
movs r4, #0
b _08051322
_0805127C:
movs r4, #1
b _08051322
_08051280:
movs r4, #2
b _08051322
_08051284:
adds r4, #1
b _08051322
_08051288:
ldr r3, _080512B0 @ =gMenu
ldrb r0, [r3, #0x13]
cmp r0, #0
beq _08051322
subs r0, #1
movs r2, #0
strb r0, [r3, #0x13]
ldr r1, _080512B4 @ =gSave
ldrb r0, [r3, #0x13]
adds r1, #0x80
adds r0, r0, r1
strb r2, [r0]
ldrb r0, [r3, #0x13]
adds r0, #1
adds r0, r0, r1
strb r2, [r0]
movs r0, #0x6c
bl sub_08051574
b _08051322
.align 2, 0
_080512B0: .4byte gMenu
_080512B4: .4byte gSave
_080512B8:
movs r0, #0
bl sub_08051480
b _08051322
_080512C0:
ldr r2, _080512E4 @ =gBG3Buffer
ldr r0, _080512E8 @ =gMenu
ldrb r1, [r0, #0x10]
lsls r1, r1, #1
ldrb r0, [r0, #0x11]
lsls r0, r0, #6
adds r0, #0xc3
adds r1, r1, r0
lsls r1, r1, #1
adds r1, r1, r2
ldrh r0, [r1]
lsrs r0, r0, #1
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
bl sub_08051480
b _08051322
.align 2, 0
_080512E4: .4byte gBG3Buffer
_080512E8: .4byte gMenu
_080512EC:
movs r3, #5
ldr r0, _08051350 @ =gSave
adds r6, r0, #0
adds r6, #0x80
movs r5, #0
_080512F6:
adds r2, r3, r6
ldrb r1, [r2]
cmp r1, #0
beq _08051302
cmp r1, #0x20
bne _0805130A
_08051302:
strb r5, [r2]
subs r3, #1
cmp r3, #0
bge _080512F6
_0805130A:
adds r0, #0x80
ldrb r0, [r0]
movs r7, #3
cmp r0, #0
beq _08051316
movs r7, #2
_08051316:
movs r0, #0x6a
bl sub_08051574
adds r0, r7, #0
bl sub_080A7114
_08051322:
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r0, [r0, #7]
movs r1, #2
cmp r0, #0
bne _08051330
movs r1, #3
_08051330:
adds r0, r4, r1
bl __modsi3
adds r4, r0, #0
ldr r1, _08051354 @ =gMenu
ldrb r0, [r1, #1]
cmp r0, r4
beq _0805134C
strb r4, [r1, #1]
bl sub_08051458
movs r0, #0x68
bl PlaySFX
_0805134C:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08051350: .4byte gSave
_08051354: .4byte gMenu
.syntax divided
asm/non_matching/pesto/sub_08024E4C.inc
+2 -2
View File
@@ -31,7 +31,7 @@
adds r2, r2, r1
strb r2, [r3]
_08024E84:
ldr r0, _08024EC8 @ =gUnk_02002A40
ldr r0, _08024EC8 @ =gSave
adds r0, #0xaa
ldrb r0, [r0]
adds r2, r4, #0
@@ -65,7 +65,7 @@ _08024E9A:
bl sub_08024A14
b _08024F46
.align 2, 0
_08024EC8: .4byte gUnk_02002A40
_08024EC8: .4byte gSave
_08024ECC:
ldr r6, _08024F48 @ =gPlayerEntity
bl ResetPlayer
asm/non_matching/putItemOnSlot.s
+4 -4
View File
@@ -18,7 +18,7 @@ _080543A8:
cmp r0, #0x1e
bhi _08054410
movs r1, #2
ldr r2, _080543C0 @ =gUnk_02002A40
ldr r2, _080543C0 @ =gSave
adds r0, r2, #0
adds r0, #0xb4
ldrb r0, [r0]
@@ -27,7 +27,7 @@ _080543A8:
movs r1, #0
b _080543D0
.align 2, 0
_080543C0: .4byte gUnk_02002A40
_080543C0: .4byte gSave
_080543C4:
adds r0, r2, #0
adds r0, #0xb5
@@ -88,7 +88,7 @@ ForceEquipItem: @ 0x08054414
bne _0805442A
movs r2, #1
_0805442A:
ldr r0, _08054458 @ =gUnk_02002A40
ldr r0, _08054458 @ =gSave
adds r0, #0xb4
adds r6, r1, r0
ldrb r7, [r6]
@@ -114,7 +114,7 @@ _0805444A:
_08054456:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08054458: .4byte gUnk_02002A40
_08054458: .4byte gSave
_0805445C: .4byte gUnk_080FD5B4
_08054460: .4byte gUnk_0200AF00
.syntax divided
asm/non_matching/save/sub_08050B3C.inc
+125
View File
@@ -0,0 +1,125 @@
.syntax unified
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
mov r5, r8
push {r5, r6, r7}
sub sp, #8
str r0, [sp]
ldr r1, _08050C18 @ =gSave
adds r0, r1, #0
adds r0, #0xaa
ldrb r0, [r0]
lsrs r2, r0, #1
cmp r2, #0
bne _08050B5A
movs r2, #1
_08050B5A:
adds r0, r1, #0
adds r0, #0xab
ldrb r0, [r0]
lsrs r3, r0, #1
cmp r3, #0
beq RETURN
cmp r2, r3
ble _08050B6C
adds r2, r3, #0
_08050B6C:
movs r0, #3
ands r0, r2
str r0, [sp, #4]
adds r0, r2, #0
asrs r5, r0, #2
mov ip, r5
cmp r5, #0xa
ble _08050B80
movs r2, #0xa
mov ip, r2
_08050B80:
adds r6, r5, #0
subs r6, #0xa
mov sb, r6
cmp r6, #0
bge _08050B8E
movs r7, #0
mov sb, r7
_08050B8E:
adds r0, r3, #0
asrs r3, r0, #2
adds r0, r3, #0
cmp r3, #0xa
ble _08050B9A
movs r3, #0xa
_08050B9A:
adds r4, r0, #0
subs r4, #0xa
ldr r2, [sp]
ldr r0, _08050C1C @ =0x0000F24C
mov sl, r0
strh r0, [r2]
ldr r1, _08050C20 @ =0x040000D4
movs r7, #0xa
mov r8, r7
mov r0, r8
mov r7, ip @ var5
subs r0, r0, r7 @ 10 - var5
lsls r0, r0, #1
ldr r7, _08050C24 @ =gUnk_080FC914
mov ip, r7
add r0, ip
str r0, [r1]
adds r0, r2, #2
str r0, [r1, #4]
movs r0, #0x80
lsls r0, r0, #0x18
orrs r3, r0
str r3, [r1, #8]
ldr r0, [r1, #8]
cmp r4, #0
ble _08050BEE
adds r2, #0x40
mov r3, sl
strh r3, [r2]
mov r7, r8
mov r3, sb
subs r0, r7, r3
lsls r0, r0, #1
add r0, ip
str r0, [r1]
adds r0, r2, #2
str r0, [r1, #4]
movs r7, #0x80
lsls r7, r7, #0x18
orrs r4, r7
str r4, [r1, #8]
ldr r0, [r1, #8]
_08050BEE:
ldr r0, [sp, #4]
cmp r0, #0
beq RETURN
ldr r2, [sp]
cmp r5, #9
ble _08050BFE
adds r5, r6, #0
adds r2, #0x40
_08050BFE:
lsls r0, r5, #1
adds r0, r0, r2
ldr r2, [sp, #4]
ldr r3, _08050C28 @ =0xFFFFF24D
adds r1, r2, r3
strh r1, [r0, #2]
RETURN:
add sp, #8
pop {r3, r4, r5}
mov r8, r3
mov sb, r4
mov sl, r5
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08050C18: .4byte gSave
_08050C1C: .4byte 0x0000F24C
_08050C20: .4byte 0x040000D4
_08050C24: .4byte gUnk_080FC914
_08050C28: .4byte 0xFFFFF24D
.syntax divided
asm/non_matching/sub_0804DE00.inc
+2 -2
View File
@@ -21,7 +21,7 @@ _0804DE22:
bl SetGlobalFlag
_0804DE32:
ldr r5, _0804DE50 @ =gAreaRoomEntities_HyruleTown
ldr r4, _0804DE54 @ =gUnk_02002A40
ldr r4, _0804DE54 @ =gSave
ldrb r0, [r4, #8]
lsls r0, r0, #2
adds r0, r0, r5
@@ -36,7 +36,7 @@ _0804DE32:
b _0804DECC
.align 2, 0
_0804DE50: .4byte gAreaRoomEntities_HyruleTown
_0804DE54: .4byte gUnk_02002A40
_0804DE54: .4byte gSave
_0804DE58: .4byte gUnk_02017654
_0804DE5C:
movs r0, #0x1c
asm/non_matching/sub_0804E150.inc
+6 -6
View File
@@ -1,14 +1,14 @@
.syntax unified
push {r4, r5, lr}
ldr r4, _0804E160 @ =gUnk_080EED2C
ldr r0, _0804E164 @ =gUnk_02002A40
ldr r0, _0804E164 @ =gSave
movs r5, #1
ldrb r0, [r0, #8]
lsls r5, r0
b _0804E17C
.align 2, 0
_0804E160: .4byte gUnk_080EED2C
_0804E164: .4byte gUnk_02002A40
_0804E164: .4byte gSave
_0804E168:
ldrh r0, [r4]
ands r0, r5
@@ -29,14 +29,14 @@ _0804E17C:
cmp r0, #0
bne _0804E1BA
ldr r4, _0804E198 @ =gUnk_080EED7A
ldr r0, _0804E19C @ =gUnk_02002A40
ldr r0, _0804E19C @ =gSave
movs r5, #1
ldrb r0, [r0, #8]
lsls r5, r0
b _0804E1B4
.align 2, 0
_0804E198: .4byte gUnk_080EED7A
_0804E19C: .4byte gUnk_02002A40
_0804E19C: .4byte gSave
_0804E1A0:
ldrh r0, [r4]
ands r0, r5
@@ -58,14 +58,14 @@ _0804E1BA:
cmp r0, #0
bne _0804E1F2
ldr r4, _0804E1D0 @ =gUnk_080EED8C
ldr r0, _0804E1D4 @ =gUnk_02002A40
ldr r0, _0804E1D4 @ =gSave
movs r5, #1
ldrb r0, [r0, #8]
lsls r5, r0
b _0804E1EC
.align 2, 0
_0804E1D0: .4byte gUnk_080EED8C
_0804E1D4: .4byte gUnk_02002A40
_0804E1D4: .4byte gSave
_0804E1D8:
ldrh r0, [r4]
ands r0, r5
asm/non_matching/textbox/sub_080564EC.inc
+2 -2
View File
@@ -38,7 +38,7 @@ _08056520:
strb r0, [r3, #1]
adds r3, #2
movs r2, #0
ldr r0, _080565A8 @ =gUnk_02002A40
ldr r0, _080565A8 @ =gSave
adds r0, #0x80
ldrb r1, [r0]
cmp r1, #0
@@ -84,7 +84,7 @@ _08056598: .4byte gUnk_02036A40
_0805659C: .4byte gUnk_02024030
_080565A0: .4byte gUnk_02022780
_080565A4: .4byte gTextBox
_080565A8: .4byte gUnk_02002A40
_080565A8: .4byte gSave
_080565AC: .4byte gUnk_08107BE0
_080565B0: .4byte gUnk_02000D00
.syntax divided
asm/object37.s
+2 -2
View File
@@ -47,7 +47,7 @@ sub_0808BE00: @ 0x0808BE00
sub_0808BE2C: @ 0x0808BE2C
push {r4, lr}
adds r2, r0, #0
ldr r0, _0808BE78 @ =gUnk_02002A40
ldr r0, _0808BE78 @ =gSave
ldr r1, _0808BE7C @ =0x0000024E
adds r4, r0, r1
ldrb r0, [r4]
@@ -83,6 +83,6 @@ _0808BE6C:
_0808BE74:
pop {r4, pc}
.align 2, 0
_0808BE78: .4byte gUnk_02002A40
_0808BE78: .4byte gSave
_0808BE7C: .4byte 0x0000024E
_0808BE80: .4byte gPlayerEntity
asm/objectB.s
+7 -7
View File
@@ -184,13 +184,13 @@ _08083CDC:
beq _08083D00
cmp r0, #0x63
bne _08083D16
ldr r0, _08083CFC @ =gUnk_02002A40
ldr r0, _08083CFC @ =gSave
adds r0, #0xa9
ldrb r0, [r0]
adds r1, r1, r0
b _08083D16
.align 2, 0
_08083CFC: .4byte gUnk_02002A40
_08083CFC: .4byte gSave
_08083D00:
ldrb r0, [r4, #0xb]
cmp r0, #1
@@ -248,7 +248,7 @@ _08083D60:
bne _08083DD0
movs r0, #0xa0
bl ModHealth
ldr r0, _08083DA8 @ =gUnk_02002A40
ldr r0, _08083DA8 @ =gSave
adds r1, r0, #0
adds r1, #0xa9
ldrb r0, [r1]
@@ -261,7 +261,7 @@ _08083D60:
movs r0, #0
strb r0, [r1]
_08083D88:
ldr r0, _08083DA8 @ =gUnk_02002A40
ldr r0, _08083DA8 @ =gSave
adds r1, r0, #0
adds r1, #0xab
ldrb r0, [r1]
@@ -278,21 +278,21 @@ _08083DA0:
bl ModHealth
b _08083DD0
.align 2, 0
_08083DA8: .4byte gUnk_02002A40
_08083DA8: .4byte gSave
_08083DAC:
ldrb r0, [r4, #0xa]
bl sub_080544DC
adds r1, r0, #0
cmp r1, #0
beq _08083DC8
ldr r0, _08083DC4 @ =gUnk_02002A40
ldr r0, _08083DC4 @ =gSave
adds r0, r0, r1
adds r0, #0xb5
movs r1, #0x20
strb r1, [r0]
b _08083DD0
.align 2, 0
_08083DC4: .4byte gUnk_02002A40
_08083DC4: .4byte gSave
_08083DC8:
ldrb r0, [r4, #0xa]
movs r1, #2
asm/objectB9.s
+4 -4
View File
@@ -285,13 +285,13 @@ _080A140C:
beq _080A1430
b _080A1444
_080A1412:
ldr r0, _080A1418 @ =gUnk_02002A40
ldr r0, _080A1418 @ =gSave
adds r0, #0xbb
b _080A1424
.align 2, 0
_080A1418: .4byte gUnk_02002A40
_080A1418: .4byte gSave
_080A141C:
ldr r0, _080A142C @ =gUnk_02002A40
ldr r0, _080A142C @ =gSave
movs r1, #0x8b
lsls r1, r1, #1
adds r0, r0, r1
@@ -301,7 +301,7 @@ _080A1424:
beq _080A1444
b _080A1454
.align 2, 0
_080A142C: .4byte gUnk_02002A40
_080A142C: .4byte gSave
_080A1430:
movs r0, #0x4f
bl CheckGlobalFlag
asm/percy.s
+2 -2
View File
@@ -67,7 +67,7 @@ _0806B5AC:
bne _0806B600
movs r0, #3
strb r0, [r4, #0x18]
ldr r0, _0806B5D8 @ =gUnk_02002A40
ldr r0, _0806B5D8 @ =gSave
adds r0, #0xbb
ldrb r0, [r0]
cmp r0, #0
@@ -79,7 +79,7 @@ _0806B5AC:
b _0806B5E6
.align 2, 0
_0806B5D4: .4byte gTextBox
_0806B5D8: .4byte gUnk_02002A40
_0806B5D8: .4byte gSave
_0806B5DC:
movs r0, #0x3f
movs r1, #0x64
asm/phonograph.s
+4 -4
View File
@@ -51,7 +51,7 @@ sub_0806E964: @ 0x0806E964
push {r6, r7}
mov sb, r0
adds r2, r1, #0
ldr r0, _0806E984 @ =gUnk_03000FF0
ldr r0, _0806E984 @ =gInput
mov r8, r0
ldrh r1, [r0, #2]
movs r0, #2
@@ -61,7 +61,7 @@ sub_0806E964: @ 0x0806E964
bl sub_08050384
b _0806EAAA
.align 2, 0
_0806E984: .4byte gUnk_03000FF0
_0806E984: .4byte gInput
_0806E988:
ldrb r0, [r2, #0x18]
adds r1, r0, #0
@@ -152,7 +152,7 @@ _0806EA0A:
strh r0, [r6]
_0806EA28:
strh r4, [r7]
ldr r0, _0806EA74 @ =gUnk_03000FF0
ldr r0, _0806EA74 @ =gInput
ldrh r1, [r0, #2]
movs r0, #1
ands r0, r1
@@ -190,7 +190,7 @@ _0806EA4E:
strh r0, [r6]
b _0806EA86
.align 2, 0
_0806EA74: .4byte gUnk_03000FF0
_0806EA74: .4byte gInput
_0806EA78: .4byte gUnk_081145E4
_0806EA7C:
ldr r0, _0806EAB4 @ =0x80010000
asm/pina.s
+2 -2
View File
@@ -305,7 +305,7 @@ _08063C8C:
thumb_func_start sub_08063C90
sub_08063C90: @ 0x08063C90
push {lr}
ldr r1, _08063CA4 @ =gUnk_02002A40
ldr r1, _08063CA4 @ =gSave
ldrb r1, [r1, #8]
lsls r1, r1, #3
ldr r2, _08063CA8 @ =gUnk_0810CE04
@@ -313,7 +313,7 @@ sub_08063C90: @ 0x08063C90
bl ShowNPCDialogue
pop {pc}
.align 2, 0
_08063CA4: .4byte gUnk_02002A40
_08063CA4: .4byte gSave
_08063CA8: .4byte gUnk_0810CE04
thumb_func_start sub_08063CAC
asm/sittingPerson.s
+4 -4
View File
@@ -218,7 +218,7 @@ _080638B2:
movs r1, #1
bl sub_0807BA8C
_080638D6:
ldr r0, _08063904 @ =gUnk_02002A40
ldr r0, _08063904 @ =gSave
ldrb r0, [r0, #8]
subs r1, r0, #6
cmp r1, #0
@@ -238,7 +238,7 @@ _080638E2:
_080638F8: .4byte gUnk_02002B0E
_080638FC: .4byte 0x00000A17
_08063900: .4byte 0x00000A57
_08063904: .4byte gUnk_02002A40
_08063904: .4byte gSave
_08063908: .4byte gUnk_0810CBE4
thumb_func_start sub_0806390C
@@ -275,7 +275,7 @@ sub_08063944: @ 0x08063944
adds r3, r0, #0
movs r0, #0
str r0, [r1, #0x14]
ldr r0, _0806396C @ =gUnk_02002A40
ldr r0, _0806396C @ =gSave
ldrb r0, [r0, #8]
subs r0, #2
cmp r0, #0
@@ -292,7 +292,7 @@ _08063958:
bl ShowNPCDialogue
pop {pc}
.align 2, 0
_0806396C: .4byte gUnk_02002A40
_0806396C: .4byte gSave
_08063970: .4byte gUnk_0810CC08
thumb_func_start SittingPerson_Head
asm/smallTownMinish.s
+2 -2
View File
@@ -61,7 +61,7 @@ _0806E2DA:
sub_0806E2DC: @ 0x0806E2DC
push {lr}
adds r3, r0, #0
ldr r0, _0806E300 @ =gUnk_02002A40
ldr r0, _0806E300 @ =gSave
ldrb r0, [r0, #8]
subs r0, #2
cmp r0, #0
@@ -78,5 +78,5 @@ _0806E2EC:
bl ShowNPCDialogue
pop {pc}
.align 2, 0
_0806E300: .4byte gUnk_02002A40
_0806E300: .4byte gSave
_0806E304: .4byte gUnk_08114308
asm/stockwell.s
+7 -7
View File
@@ -459,7 +459,7 @@ _080653AA:
cmp r5, #0x6f
bhi _0806543C
ldr r2, _080653C8 @ =gQuiverSizes
ldr r1, _080653CC @ =gUnk_02002A40
ldr r1, _080653CC @ =gSave
adds r0, r1, #0
adds r0, #0xaf
ldrb r0, [r0]
@@ -468,7 +468,7 @@ _080653AA:
b _080653FA
.align 2, 0
_080653C8: .4byte gQuiverSizes
_080653CC: .4byte gUnk_02002A40
_080653CC: .4byte gSave
_080653D0:
movs r0, #0xd
bl GetInventoryValue
@@ -485,7 +485,7 @@ _080653E4:
_080653E8: .4byte 0x00002C0B
_080653EC:
ldr r2, _08065408 @ =gBombBagSizes
ldr r1, _0806540C @ =gUnk_02002A40
ldr r1, _0806540C @ =gSave
adds r0, r1, #0
adds r0, #0xae
ldrb r0, [r0]
@@ -500,7 +500,7 @@ _080653FA:
b _080654C2
.align 2, 0
_08065408: .4byte gBombBagSizes
_0806540C: .4byte gUnk_02002A40
_0806540C: .4byte gSave
_08065410: .4byte 0x00002C0E
_08065414:
movs r1, #0x55
@@ -515,7 +515,7 @@ _08065420:
mov sb, r1
b _0806543C
_08065426:
ldr r0, _08065494 @ =gUnk_02002A40
ldr r0, _08065494 @ =gSave
adds r0, #0xc2
ldrh r1, [r0]
ldr r0, _08065498 @ =0x000003E6
@@ -531,7 +531,7 @@ _0806543C:
adds r0, r5, #0
bl sub_08053FE0
adds r6, r0, #0
ldr r7, _08065494 @ =gUnk_02002A40
ldr r7, _08065494 @ =gSave
adds r0, r7, #0
adds r0, #0xc0
ldrh r0, [r0]
@@ -569,7 +569,7 @@ _0806548A:
ldr r0, _080654A4 @ =0x00002C11
b _080654B6
.align 2, 0
_08065494: .4byte gUnk_02002A40
_08065494: .4byte gSave
_08065498: .4byte 0x000003E6
_0806549C: .4byte 0x00002C0E
_080654A0: .4byte gRoomVars
asm/sub_0807CA18.s
+2 -2
View File
@@ -8,7 +8,7 @@
thumb_func_start sub_0807CA18
sub_0807CA18: @ 0x0807CA18
push {lr}
ldr r0, _0807CA7C @ =gUnk_02002A40
ldr r0, _0807CA7C @ =gSave
mov ip, r0
ldrh r1, [r0]
movs r0, #0x80
@@ -59,5 +59,5 @@ _0807CA78:
movs r0, #1
pop {pc}
.align 2, 0
_0807CA7C: .4byte gUnk_02002A40
_0807CA7C: .4byte gSave
_0807CA80: .4byte gUnk_0811E470
asm/takkuri.s
+2 -2
View File
@@ -716,7 +716,7 @@ sub_0803C0AC: @ 0x0803C0AC
adds r5, r0, #0
cmp r5, #0
beq _0803C11C
ldr r0, _0803C0D4 @ =gUnk_02002A40
ldr r0, _0803C0D4 @ =gSave
adds r0, #0xc0
ldrh r1, [r0]
ldr r0, _0803C0D8 @ =0x000001F3
@@ -729,7 +729,7 @@ sub_0803C0AC: @ 0x0803C0AC
bl ModRupees
b _0803C118
.align 2, 0
_0803C0D4: .4byte gUnk_02002A40
_0803C0D4: .4byte gSave
_0803C0D8: .4byte 0x000001F3
_0803C0DC:
cmp r1, #0x63
asm/tingleSiblings.s
+4 -4
View File
@@ -193,7 +193,7 @@ sub_08064F28: @ 0x08064F28
bl CheckRoomFlag
cmp r0, #0
bne _08064F84
ldr r4, _08064F64 @ =gUnk_02002A40
ldr r4, _08064F64 @ =gSave
adds r0, r6, #0
bl sub_08002632
ldr r1, _08064F68 @ =0x00000141
@@ -206,7 +206,7 @@ sub_08064F28: @ 0x08064F28
b _08064F7E
.align 2, 0
_08064F60: .4byte gUnk_0810FC50
_08064F64: .4byte gUnk_02002A40
_08064F64: .4byte gSave
_08064F68: .4byte 0x00000141
_08064F6C:
movs r0, #0xc
@@ -226,7 +226,7 @@ _08064F84:
bl CheckGlobalFlag
cmp r0, #0
bne _08064FCE
ldr r0, _08064FB0 @ =gUnk_02002A40
ldr r0, _08064FB0 @ =gSave
ldr r1, _08064FB4 @ =0x00000117
adds r0, r0, r1
ldrb r1, [r0]
@@ -243,7 +243,7 @@ _08064F84:
str r0, [r1, #0x14]
b _08064FD2
.align 2, 0
_08064FB0: .4byte gUnk_02002A40
_08064FB0: .4byte gSave
_08064FB4: .4byte 0x00000117
_08064FB8:
movs r5, #7
asm/vaatiWrath.s
+2 -2
View File
@@ -2141,7 +2141,7 @@ sub_080423A4: @ 0x080423A4
ands r0, r1
cmp r0, #0
bne _0804241C
ldr r0, _080423D0 @ =gUnk_02002A40
ldr r0, _080423D0 @ =gSave
movs r2, #0x93
lsls r2, r2, #3
adds r1, r0, r2
@@ -2153,7 +2153,7 @@ sub_080423A4: @ 0x080423A4
b _0804241C
.align 2, 0
_080423CC: .4byte gScreenTransition
_080423D0: .4byte gUnk_02002A40
_080423D0: .4byte gSave
_080423D4:
ldr r2, _08042420 @ =gPlayerState
adds r0, r2, #0
data/data_080D5360.s
-1929
View File
File diff suppressed because it is too large Load Diff
data/data_080FC8A4.s
+1916
View File
File diff suppressed because it is too large Load Diff
data/data_08107BC8.s
-9
View File
@@ -4,15 +4,6 @@
.section .rodata
.align 2
gUnk_08107BC8:: @ 08107BC8
.incbin "baserom.gba", 0x107BC8, 0x0000018
gUnk_08107BE0:: @ 08107BE0
.incbin "baserom.gba", 0x107BE0, 0x0000014
gUnk_08107BF4:: @ 08107BF4
.incbin "baserom.gba", 0x107BF4, 0x0000018
gUnk_08107C0C:: @ 08107C0C
.incbin "baserom.gba", 0x107C0C, 0x0000003
data/data_0811E454.s
-24
View File
@@ -4,30 +4,6 @@
.section .rodata
.align 2
gUnk_0811E454:: @ 0811E454
.incbin "baserom.gba", 0x11E454, 0x000001C
gUnk_0811E470:: @ 0811E470
.incbin "baserom.gba", 0x11E470, 0x0000008
gUnk_0811E478:: @ 0811E478
.incbin "baserom.gba", 0x11E478, 0x000000C
gUnk_0811E484:: @ 0811E484
.incbin "baserom.gba", 0x11E484, 0x0000020
gUnk_0811E4A4:: @ 0811E4A4
.incbin "baserom.gba", 0x11E4A4, 0x0000008
gUnk_0811E4AC:: @ 0811E4AC
.incbin "baserom.gba", 0x11E4AC, 0x0000001
gUnk_0811E4AD:: @ 0811E4AD
.incbin "baserom.gba", 0x11E4AD, 0x0000007
gUnk_0811E4B4:: @ 0811E4B4
.incbin "baserom.gba", 0x11E4B4, 0x0000008
gUnk_0811E4BC:: @ 0811E4BC
.incbin "baserom.gba", 0x11E4BC, 0x0000054
include/fileScreen.h
+89
View File
@@ -0,0 +1,89 @@
#ifndef FILESELECT_H
#define FILESELECT_H
#include "global.h"
#include "functions.h"
#include "main.h"
#include "player.h"
#include "readKeyInput.h"
#include "screen.h"
#include "menu.h"
#include "save.h"
typedef struct {
u8 filler0[0x5];
u8 state;
u8 subState;
u16 timer;
u8 fillerA[0x26];
} ChooseFileState;
// TODO: This occupies the same memory region as gMenu
extern ChooseFileState gChooseFileState;
typedef struct {
u8 filler0[0x1];
u8 unk1;
u8 charColor;
u8 bgColor;
u16 unk4;
u16 unk6;
u8* unk8;
} struct_02036540;
typedef struct {
u8 filler0[0x10];
u16 unk10;
u8 filler12[0x6];
} struct_080FC844;
typedef struct {
u8 filler0[0x4];
} struct_020227E8;
extern struct_020227E8 gUnk_020227E8;
typedef struct {
/*0x00*/ u8 isTransitioning;
/*0x01*/ u8 unk1;
/*0x02*/ u8 unk2;
/*0x03*/ u8 unk3;
/*0x04*/ u8 unk4;
/*0x05*/ u8 unk5;
/*0x06*/ u8 unk6;
/*0x07*/ u8 unk7;
/*0x08*/ s8 saveStatus[3];
/*0x0b*/ SaveFile saves[3];
} struct_02019EE0;
extern struct_02019EE0 gUnk_02019EE0;
struct OAMCommand {
u16 x;
u16 y;
u16 _4;
u16 _6;
u16 _8;
} extern gUnk_03001010;
extern void sub_08056FEC(u32, struct_020227E8*);
extern void sub_0805F46C(u32, struct_080FC844*);
extern void sub_0801C4A0(u32, u32);
extern void sub_08080668(void);
extern void sub_0805194C(u32);
extern void LoadPalettes(const u8*, int, int);
extern struct_02036540* sub_0805F2C8(void);
extern void sub_0805F7DC(u32, struct_02036540*);
extern void sub_0805F300(struct_02036540*);
extern void sub_08050A64(u32);
extern void sub_08050AFC(u32);
extern const struct_080FC844 gUnk_080FC844;
extern const u16 gUnk_080FC85C[][3];
extern void (*const gUnk_080FC908[])(void);
extern const u8 gGlobalGfxAndPalettes[];
extern void (*const gUnk_080FC93C[])();
extern u32 gUsedPalettes;
extern u8 gUnk_02000D00[];
extern u8 gUnk_02001B40;
extern u8 gUnk_02022030;
#endif
include/functions.h
+6 -16
View File
@@ -65,12 +65,6 @@ extern u32 IsItemEquipped(u32);
extern void DeleteManager(Manager*);
extern bool32 CheckPlayerInRegion(u32 centerX, u32 centerY, u32 radiusX, u32 radiusY);
extern u32 CheckIsDungeon();
extern void HandleIntroScreen(void);
extern void HandleChooseFileScreen(void);
extern void HandleGameplayScreen(void);
extern void HandleGameOverScreen(void);
extern void HandleCreditsScreen(void);
extern void HandleDebugTextScreen(void);
extern u32 GetTileTypeByEntity(Entity*);
// Unidentified
@@ -136,7 +130,7 @@ extern s32 sub_0807887C(Entity*, u32, u32);
extern s32 sub_08078904();
extern void sub_0805E5A8(void);
extern void sub_0805E5C0(void);
extern void sub_080AD90C(void);
extern void FlushSprites(void);
extern void sub_080AD9B0(void);
extern void sub_080AD918(void);
extern void sub_0801E104(void);
@@ -190,7 +184,7 @@ extern void sub_0804F578(void);
extern void sub_08059994(void);
extern s32 sub_0801CFA8(u32);
extern void sub_080A3210(void);
extern void sub_080ADA14(u32, u32);
extern void sub_080ADA14(u32, u32); // trampoline to sub_080B27F4
extern void sub_0801E1B8(u32, u32);
extern void sub_0801E1EC(s32, s32, s32);
extern void sub_08050008(void);
@@ -203,7 +197,6 @@ extern u32 sub_080A4494(void);
extern void sub_080A4528(void);
extern void sub_080A4398(void);
extern void sub_0801E738(u32);
extern void sub_080A70AC(const void*);
extern void sub_080A7114(u32);
extern void sub_08001324(Entity*);
extern void sub_08001242(Entity*);
@@ -219,7 +212,7 @@ extern void sub_0807A108(void);
extern void sub_0801766C(Entity*);
extern void sub_08004168(Entity*);
extern u32 sub_08052638(u32);
extern void sub_0805616C(void);
extern void InitDMA(void);
extern u32 sub_0807CF08(u32, u8*);
extern void sub_0807CF48(u32);
extern u32 sub_0807CF10(u8*);
@@ -227,12 +220,11 @@ extern void sub_08056208(void);
extern void sub_08050384();
extern void sub_080B1520(u32);
extern struct_0807D1C4* sub_0807D1C4(u32);
extern u32 sub_0807D24C(u32, char*, u32);
extern u32 sub_0807D24C(u32, const char*, u32);
extern void sub_0807CF68(u32);
extern void sub_0807D20C(u32, char*, u32);
extern void sub_0807D20C(u32, const char*, u32);
extern u32 sub_0807CF88(u32, u8*);
extern u32 sub_0807D008(u32, void*);
extern void sub_0807D184(u32, char*);
extern void sub_0807D184(u32, const char*);
extern u32 sub_0806F520();
extern void sub_0806F4E8(Entity*);
extern u32 sub_0806F3E4(Entity*);
@@ -258,7 +250,6 @@ extern void sub_08097B24(Entity*);
extern u32 sub_08079F8C(void);
extern void sub_080787CC(Entity*);
extern void sub_080526F8(s32);
extern int sub_0807CF28(u32, SaveFile*);
extern u32 sub_080044EC(Entity*, u32);
extern u32 sub_080002B8(Entity*);
extern u32 sub_08049F84(Entity*, u32);
@@ -323,7 +314,6 @@ extern void sub_08008790(Entity*, u32);
extern void sub_0804ACF8();
extern void sub_08073904(Entity*);
extern u32 sub_08056134(void);
extern u32 sub_0807CF30(void*);
extern void sub_08004484(Entity*, Entity*);
extern void sub_080564C8(u32);
extern void sub_08056F70(void);
include/main.h
+33 -10
View File
@@ -13,6 +13,26 @@ typedef struct { // 0x03001000
u8 field_0xb;
u32 spritePriority;
} MainStruct;
#define SIGNATURE 'MCZ3'
#define MAX_MSG_SPEED 3
#define NUM_SAVE_SLOTS 3
#define MAX_BRIGHTNESS 3
typedef enum {
LANGUAGE_JP,
LANGUAGE_EN,
LANGUAGE_FR,
LANGUAGE_DE,
LANGUAGE_ES,
LANGUAGE_IT,
NUM_LANGUAGES,
} Language;
#ifdef ENGLISH
#define GAME_LANGUAGE LANGUAGE_EN
#else
#define GAME_LANGUAGE LANGUAGE_JP
#endif
enum {
SCREEN_INTRO,
@@ -23,13 +43,6 @@ enum {
SCREEN_DEBUG_TEXT,
};
#define GAME_LANGUAGE GAME_LANGUAGE_EN
#define SIGNATURE 'MCZ3'
#define GAME_LANGUAGE_EN 1
#define MAX_MSG_SPEED 3
#define MAX_SAVE_FILES 3
#define MAX_BRIGHTNESS 3
typedef struct {
u8 interruptFlag;
u8 field_0x1;
@@ -47,7 +60,7 @@ typedef struct {
typedef struct {
/*0x00*/ u16 nextToLoad;
/*0x02*/ u8 transitionType;
/*0x02*/ u8 lastState;
/*0x03*/ u8 field_0x3;
/*0x04*/ u8 state;
/*0x05*/ u8 field_0x5;
@@ -62,7 +75,7 @@ static_assert(sizeof(UI) == 0x3b4);
extern Main gUnk_03001000;
extern UI gUnk_02032EC0;
extern void sub_080A3204(void);
extern void InitSound(void);
extern void sub_0807CE90(void);
extern void sub_080560B8(void);
extern void sub_08056208(void);
@@ -76,9 +89,19 @@ extern void ReadKeyInput(void);
extern void DoSoftReset(void);
extern void sub_08056260(void);
extern void VBlankIntrWait();
extern s32 _call_via_r0(s32);
extern void sub_08056458(void);
extern void sub_08050154(void);
extern void sub_080A3480(void);
extern u8 gUnk_03003DE4;
extern void sub_0804FF84(u32);
extern u16 gPaletteBuffer[];
extern void VBlankInterruptWait(void);
extern void DisableInterruptsAndDMA(void);
extern void sub_08016B34(void);
static void sub_08055F70(void);
static bool32 SoftResetKeysPressed(void);
#endif
include/menu.h
+21 -2
View File
@@ -17,9 +17,24 @@ typedef struct {
u32 filler3[3];
} MenuControls;
typedef struct {
u8 aButtonX;
u8 aButtonY;
u8 aButtonText;
u8 bButtonX;
u8 bButtonY;
u8 bButtonText;
u8 rButtonX;
u8 rButtonY;
u8 rButtonText;
u8 settingDict[0];
} PACKED KeyButtonLayout;
extern void sub_080A70AC(const KeyButtonLayout*);
typedef struct {
u8 field_0x0;
u8 field_0x1;
u8 column_idx;
u8 field_0x2;
u8 field_0x3;
u8 field_0x4;
@@ -35,7 +50,11 @@ typedef struct {
u8 unk14;
u8 unk15;
u8 unk16;
u8 filler17[0x13];
// While struct offsets are usually loaded indirectly, this one is often loaded
// directly in the code. This happens when you take the address off the field with '&`.
// Perhaps they had a macro to cast this to different sized arrays.
u8 selectMtx;
u8 filler18[0x12];
u8 unk2a;
int field_0x2c;
} Menu;
include/object.h
+1 -1
View File
@@ -76,7 +76,7 @@ extern void Object44(Entity*);
extern void Object45(Entity*);
extern void GiantBookLadder(Entity*);
extern void HeartContainer(Entity*);
extern void Object48(Entity*);
extern void FileScreenObjects(Entity*);
extern void Object49(Entity*);
extern void BackgroundCloud(Entity*);
extern void Object4B(Entity*);
include/readKeyInput.h
+1 -1
View File
@@ -6,4 +6,4 @@ typedef struct {
u8 unk7;
} Input;
extern Input gUnk_03000FF0;
extern Input gInput;
include/save.h
+52
View File
@@ -0,0 +1,52 @@
#ifndef SAVE_H
#define SAVE_H
#include "global.h"
#include "entity.h"
#include "functions.h"
#include "menu.h"
#include "structures.h"
#define FILENAME_LENGTH 6
typedef enum {
SAVE_BUSY = 0,
SAVE_OK = 1,
SAVE_ERROR = -1,
} SaveResult;
typedef enum {
SAVE_INIT,
SAVE_IN_PROGRESS,
SAVE_DONE,
} SaveState;
extern SaveResult sub_0807CDA4(SaveState state);
typedef struct {
/*0x000*/ u8 filler0[0x2];
/*0x002*/ u8 messageSpeed;
/*0x003*/ u8 brightnessPref;
/*0x004*/ u8 filler4[0x2];
/*0x006*/ u8 unk6;
/*0x007*/ u8 unk7;
/*0x008*/ u8 unk8;
/*0x009*/ u8 field_0x9[0x34];
/*0x040*/ u32 windcrests;
/*0x044*/ u8 filler44[0xC];
/*0x050*/ u32 unk50;
/*0x054*/ u8 filler54[0x2C];
/*0x080*/ u8 playerName[FILENAME_LENGTH];
/*0x086*/ u8 filler86[0x22];
/*0x0A8*/ Stats stats;
/*0x0D0*/ u8 fillerD0[0x3c0];
/*0x490*/ u32 unk490;
/*0x494*/ u8 filler494[0x20];
} SaveFile;
extern SaveFile gSave;
s32 sub_0807CF28(u32, SaveFile*);
u32 sub_0807CF30(SaveFile*);
#endif
include/structures.h
+3 -38
View File
@@ -42,29 +42,6 @@ typedef struct {
extern struct_02000010 gUnk_02000010;
typedef struct {
/*0x000*/ u8 filler0[0x2];
/*0x002*/ u8 messageSpeed;
/*0x003*/ u8 brightnessPref;
/*0x004*/ u8 filler4[0x2];
/*0x006*/ u8 unk6;
/*0x007*/ u8 unk7;
/*0x008*/ u8 unk8;
/*0x009*/ u8 field_0x9[0x34];
/*0x040*/ u32 windcrests;
/*0x044*/ u8 filler44[0xC];
/*0x050*/ u32 unk50;
/*0x054*/ u8 filler54[0x2C];
/*0x080*/ u8 playerName[6];
/*0x086*/ u8 filler86[0x22];
/*0x0A8*/ Stats stats;
/*0x0D0*/ u8 fillerD0[0x3c0];
/*0x490*/ u32 unk490;
/*0x494*/ u8 filler494[0x20];
} SaveFile;
extern SaveFile gUnk_02002A40;
typedef struct {
u32 frameCount; // regular frame count? does anything reset it?
u8 field_0x4[0x4];
@@ -113,19 +90,6 @@ typedef struct {
u16 transitionSFX;
} ScreenTransitionData;
typedef struct {
/*0x00*/ u8 unk0;
/*0x01*/ u8 unk1;
/*0x02*/ u8 unk2;
/*0x03*/ u8 unk3;
/*0x04*/ u8 filler4[0x2];
/*0x06*/ u8 unk6;
/*0x07*/ u8 unk7;
/*0x08*/ s8 unk8[0xE20];
} struct_02019EE0;
extern struct_02019EE0 gUnk_02019EE0;
typedef struct {
u8 active;
u8 field_0x1;
@@ -147,9 +111,9 @@ extern struct_03000FD0 gFadeControl;
typedef struct {
u8 filler0[0x1A];
u16 unk1A;
u16 rButtonX;
u8 filler1C[0x4];
u16 unk20;
u16 rButtonY;
u8 filler22[0x2];
u8 ezloNagFuncIndex;
u8 filler25[0x30F];
@@ -200,6 +164,7 @@ typedef struct {
} BGBuffer;
extern BGBuffer gBG0Buffer;
extern BGBuffer gBG1Buffer;
extern BGBuffer gBG2Buffer;
static_assert(sizeof(BGBuffer) == 0x800);
/*
include/textbox.h
+39 -3
View File
@@ -19,10 +19,46 @@ typedef struct {
u16 field_0xe;
u32 field_0x10;
} TextBox;
extern TextBox gTextBox;
void TextboxNoOverlap(u32 index, Entity* ent);
typedef struct {
u8 _0;
u8 _1;
u8 _2;
u8 _3[5];
u16 _8;
u8 _b[0x16];
u8 _20;
u8 _21;
u8 _22[0xa];
void* _2c;
u8 _30[0x23];
u8 _53;
u16 _54;
u8 _56[0x2];
void* _58;
u8 _5c;
u8 _5d;
u8 _5e[24];
u8 _76;
u8 _77[0x11];
u8 _88;
u8 _89;
u8 _8a;
u8 _8b[0xe];
u8 _99;
u8 _9a;
u8 _9b;
u8 _9c;
u8 _9d;
u8 _9e[0xa];
} struct_02022780;
extern struct_02022780 gUnk_02022780;
static_assert(sizeof(struct_02022780) == 0xa8);
void ShowTextbox(u32 index);
void TextboxAtPosition(u32 index, u32 x, u32 y);
void TextboxNoOverlap(u32 index, Entity* ent);
void TextboxNoOverlapFollow(u32 index);
extern void TextboxNoOverlapFollow(u32 index);
#endif
linker.ld
+19 -12
View File
@@ -28,7 +28,7 @@ SECTIONS {
. = 0x00001A3C; gUnk_02001A3C = .;
. = 0x00001A40; gBG3Buffer = .;
. = 0x00001B40; gUnk_02001B40 = .;
. = 0x00002A40; gUnk_02002A40 = .;
. = 0x00002A40; gSave = .;
. = 0x00002AA0; gUnk_02002AA0 = .;
. = 0x00002AC0; gUnk_02002AC0 = .;
. = 0x00002AC8; gUnk_02002AC8 = .;
@@ -73,7 +73,6 @@ SECTIONS {
. = 0x00018EB0; gUnk_02018EB0 = .;
. = 0x00018EE0; gUnk_02018EE0 = .;
. = 0x00019EE0; gUnk_02019EE0 = .;
. = 0x00019EEC; gSaveFiles = .;
. = 0x00019F6C; gUnk_02019F6C = .;
. = 0x0001AEE0; gUnk_0201AEE0 = .;
. = 0x00021EE0; gUnk_02021EE0 = .;
@@ -87,7 +86,11 @@ SECTIONS {
. = 0x00022740; gUnk_02022740 = .;
. = 0x00022750; gUnk_02022750 = .;
. = 0x00022780; gUnk_02022780 = .;
. = 0x000227DC; gUnk_020227DC = .;
. = 0x000227E8; gUnk_020227E8 = .;
. = 0x000227F0; gUnk_020227F0 = .;
. = 0x000227F8; gUnk_020227F8 = .;
. = 0x00022800; gUnk_02022800 = .;
. = 0x0002281E; gUnk_0202281E = .;
. = 0x00022830; gUnk_02022830 = .;
. = 0x00024030; gUnk_02024030 = .;
@@ -124,7 +127,7 @@ SECTIONS {
. = 0x00034490; gUnk_02034490 = .;
. = 0x00034492; gUnk_02034492 = .;
. = 0x000344A0; gUnk_020344A0 = .;
. = 0x000344B0; gUnk_020344B0 = .;
. = 0x000344B0; gBG2Buffer = .;
. = 0x000344F0; gUnk_020344F0 = .;
. = 0x00034CB0; gBG0Buffer = .;
. = 0x00034CB2; gUnk_02034CB2 = .;
@@ -172,7 +175,7 @@ SECTIONS {
. = 0x00000F88; gBgControls = .;
. = 0x00000FBC; gUnk_03000FBC = .;
. = 0x00000FD0; gFadeControl = .;
. = 0x00000FF0; gUnk_03000FF0 = .;
. = 0x00000FF0; gInput = .;
. = 0x00001000; gUnk_03001000 = .;
. = 0x00001010; gUnk_03001010 = .;
. = 0x00001020; gUnk_03001020 = .;
@@ -452,8 +455,8 @@ SECTIONS {
src/sub_08050008.o(.text);
src/sub_08050024.o(.text);
asm/code_08050038.o(.text);
src/chooseFile.o(.text);
asm/chooseFile.o(.text);
src/fileScreen.o(.text);
asm/fileScreen.o(.text);
asm/sub_08052418.o(.text);
src/initializePlayer.o(.text);
src/area.o(.text);
@@ -671,7 +674,7 @@ SECTIONS {
asm/getInventoryValue.o(.text);
asm/code_0807CAA0.o(.text);
src/flags.o(.text);
src/code_0807CC3C.o(.text);
src/save.o(.text);
asm/code_0807CC3C.o(.text);
src/executeScriptCommandSet.o(.text);
asm/code_0807F0D8.o(.text);
@@ -755,7 +758,7 @@ SECTIONS {
asm/object45.o(.text);
asm/giantBookLadder.o(.text);
src/object/heartContainer.o(.text);
src/object/object48.o(.text);
src/object/fileScreenObjects.o(.text);
src/object/object49.o(.text);
src/object/backgroundCloud.o(.text);
asm/object4B.o(.text);
@@ -992,20 +995,23 @@ SECTIONS {
data/data_080D3D94.o(.rodata);
data/entity_headers.o(.rodata);
data/data_080D5360.o(.rodata);
src/fileScreen.o(.rodata);
data/data_080FC8A4.o(.rodata);
src/main.o(.rodata);
data/tileset_headers.o(.rodata);
data/metatile_headers.o(.rodata);
data/map_headers.o(.rodata);
src/textbox.o(.rodata);
data/data_08107BC8.o(.rodata);
src/manager/manager5.o(.rodata);
src/manager/manager7.o(.rodata);
. = ALIGN(4);
src/manager/manager9.o(.rodata);
src/manager/managerA.o(.rodata);
src/manager/manager9.o(.rodata);
src/manager/managerA.o(.rodata);
src/manager/managerB.o(.rodata);
src/manager/managerC.o(.rodata);
data/data_08108308.o(.rodata);
src/manager/manager1E.o(.rodata);
src/manager/manager1E.o(.rodata);
data/data_08108C94.o(.rodata);
src/manager/manager26.o(.rodata);
src/manager/manager27.o(.rodata);
@@ -1014,8 +1020,9 @@ SECTIONS {
src/item.o(.rodata);
data/data_0811BD44.o(.rodata);
data/room_headers.o(.rodata);
src/save.o(.rodata);
data/data_0811E454.o(.rodata);
src/executeScriptCommandSet.o(.rodata);
src/executeScriptCommandSet.o(.rodata);
data/data_0811E750.o(.rodata);
src/object/greatFairy.o(.rodata);
data/animations/greatFairy.o(.rodata);
src/chooseFile.c
-557
View File
@@ -1,557 +0,0 @@
#include "global.h"
#include "functions.h"
#include "main.h"
#include "player.h"
#include "readKeyInput.h"
#include "screen.h"
typedef struct {
u8 filler0[0x5];
u8 state;
u8 subState;
u16 timer;
u8 fillerA[0x26];
} ChooseFileState;
// TODO: This occupies the same memory region as gMenu
extern ChooseFileState gChooseFileState;
typedef struct {
u8 filler0[0x1];
u8 unk1;
u8 unk2;
u8 unk3;
u16 unk4;
u16 unk6;
u8* unk8;
} struct_02036540;
typedef struct {
u8 filler0[0x10];
u16 unk10;
u8 filler12[0x6];
} struct_080FC844;
typedef struct {
u8 filler0[0x4];
} struct_020227E8;
extern struct_020227E8 gUnk_020227E8;
extern SaveFile gSaveFiles[];
extern u32 gUsedPalettes;
extern u8 gUnk_02000D00[];
extern u16 gUnk_03001010[5];
static void sub_08050624(u32);
static void sub_0805066C(void);
static void sub_080507FC(void);
extern void sub_08056FEC(u32, struct_020227E8*);
extern void sub_0805F46C(u32, struct_080FC844*);
extern void sub_0801C4A0(u32, u32);
extern void sub_08080668(void);
extern void sub_0805194C(u32);
extern void LoadPalettes(const u8*, int, int);
extern struct_02036540* sub_0805F2C8(void);
extern void sub_0805F7DC(u32, struct_02036540*);
extern void sub_0805F300(struct_02036540*);
extern void sub_08050A64(u32);
extern void sub_08050AFC(u32);
extern const struct_080FC844 gUnk_080FC844;
extern const u16 gUnk_080FC85C[][3];
extern void (*const gUnk_080FC8A4[])(void);
extern void (*const gUnk_080FC8B0[])(void);
extern void (*const gUnk_080FC8FC[])(void);
extern void (*const gUnk_080FC908[])(void);
extern const u8 gUnk_080FC8D0[];
extern const u16 gUnk_080FC8DE[];
extern const u8 gGlobalGfxAndPalettes[];
void sub_08050318(u32 arg0, u32 arg1) {
u32 sfx;
struct_080FC844 var0;
sub_08050384();
_DmaCopy(&gUnk_080FC844, &var0, sizeof(gUnk_080FC844));
sub_08056FEC(arg1, &gUnk_020227E8);
var0.unk10 |= gUnk_080FC85C[arg0][0] << 0xC;
sub_0805F46C(gUnk_080FC85C[arg0][1], &var0);
sfx = gUnk_080FC85C[arg0][2];
if (sfx) {
PlaySFX(sfx);
}
gScreen.bg.bg3Control = 1;
}
void sub_08050384(void) {
sub_0801C4A0(0, 0);
_DmaZero(&gBG0Buffer, sizeof(gBG0Buffer));
gScreen.bg.bg3Control = 1;
}
void sub_080503A8(u32 gfxGroup) {
LoadGfxGroup(gfxGroup);
gScreen.bg.bg2yOffset = 1;
gScreen.affine.unk = 1;
}
void sub_080503BC(u8 state) {
gUnk_02032EC0.state = state;
_DmaZero(&gBG0Buffer, sizeof(gBG0Buffer));
_DmaZero(&gBG1Buffer, sizeof(gBG1Buffer));
}
void sub_080503E4(u32 saveFileId) {
u8 messageSpeed;
u8 brightnessPref;
if (saveFileId > 2) {
messageSpeed = 1;
brightnessPref = 1;
} else {
SaveFile* saveFile = &gSaveFiles[saveFileId];
messageSpeed = saveFile->messageSpeed;
brightnessPref = saveFile->brightnessPref;
}
((struct_02000000*)0x2000000)->messageSpeed = messageSpeed;
((struct_02000000*)0x2000000)->brightnessPref = brightnessPref;
gUsedPalettes = 0xFFFFFFFF;
}
void sub_0805041C(u32 saveFileId) {
SaveFile* saveFile;
if (saveFileId < 3) {
((struct_02000000*)0x2000000)->saveFileId = saveFileId;
saveFile = &gSaveFiles[saveFileId];
_DmaCopy(saveFile, &gUnk_02002A40, sizeof(*saveFile));
}
sub_080503E4(saveFileId);
}
void HandleChooseFileScreen(void) {
sub_080AD90C();
gUnk_080FC8A4[gUnk_03001000.funcIndex]();
if (gUnk_02032EC0.transitionType != gUnk_02032EC0.state) {
gUnk_02032EC0.transitionType = gUnk_02032EC0.state;
gScreen.bg.bg1Control = 0;
gScreen.bg.bg2Control = 0;
gScreen.bg.bg1yOffset = 0;
gScreen.bg.bg2xOffset = 0;
gScreen.affine.bg2xOffset = 0;
gScreen.affine.bg2yOffset = 0;
_DmaZero(&gChooseFileState, sizeof(gChooseFileState));
}
sub_080507FC();
gUnk_080FC8B0[gUnk_02032EC0.transitionType]();
gUnk_02019EE0.unk0 = 0;
sub_0805E5C0();
sub_0805066C();
sub_0801C1D4();
sub_0801C208();
sub_080AD9B0();
sub_080AD918();
if (gUnk_02019EE0.unk3 != ((struct_02000000*)0x2000000)->gameLanguage) {
gUnk_02019EE0.unk3 = ((struct_02000000*)0x2000000)->gameLanguage;
sub_080503A8(0x6);
sub_080503A8(0xF);
}
}
void sub_080504F4(void) {
u32 i;
sub_0801DA90(1);
sub_080A3210();
_DmaZero((void*)VRAM, 0x80);
sub_08056418();
EraseAllEntities();
sub_08080668();
sub_080ADD30();
sub_0801CFA8(0);
_DmaZero(&gUnk_0200AF00, sizeof(gUnk_0200AF00));
_DmaZero(&gUnk_02019EE0, sizeof(gUnk_02019EE0));
gUnk_02019EE0.unk3 = 7;
gUnk_02019EE0.unk6 = ((struct_02000000*)0x2000000)->gameLanguage > 1 ? 3 : 0;
_DmaZero(&gUnk_02032EC0, sizeof(gUnk_02032EC0));
gUnk_02032EC0.transitionType = 8;
sub_080503BC(0);
sub_0805616C();
sub_08050624(0);
sub_08050624(1);
sub_08050624(2);
sub_08056208();
sub_080503A8(0x5);
LoadPaletteGroup(0x9);
for (i = 0; i < 26; i++) {
CreateObject(0x48, i, 0);
}
sub_080A70AC(gUnk_080FC8D0);
sub_080507FC();
gScreen.lcd.displayControl |= 0x1F00;
gScreen.affine.bg3Control = 0x1E0B;
gScreen.controls.layerFXControl = 0x844;
gScreen.controls.alphaBlend = BLDALPHA_BLEND(15, 10);
gUnk_02024490.unk0 = 1;
gUnk_03001000.funcIndex = 1;
PlaySFX(0x7);
DoFade(4, 8);
}
void nullsub_479(void) {
}
void sub_0805060C(void) {
if (!gFadeControl.active) {
InitScreen(SCREEN_GAMEPLAY);
}
}
static void sub_08050624(u32 saveFileId) {
SaveFile* saveFile = &gSaveFiles[saveFileId];
int var0 = sub_0807CF28(saveFileId, saveFile);
switch (var0) {
case -1:
sub_0807CF48(saveFileId);
// fallthrough
case 0:
sub_0805194C(saveFileId);
break;
}
gUnk_02019EE0.unk8[saveFileId] = var0;
}
static void sub_0805066C(void) {
u32 loadNewPalette;
const u8* paletteOffset;
loadNewPalette = FALSE;
if (--gUnk_02019EE0.unk1 == 0) {
gUnk_02019EE0.unk1 = 16;
gUnk_02019EE0.unk2 = (gUnk_02019EE0.unk2 + 1) % 15;
loadNewPalette = TRUE;
}
if (gUnk_02019EE0.unk2 == 0) {
gUnk_02019EE0.unk2 = 1;
gUnk_02019EE0.unk1 = (Random() & 0x7) * 16 + 8;
loadNewPalette = TRUE;
}
if (loadNewPalette) {
paletteOffset = &gGlobalGfxAndPalettes[gUnk_080FC8DE[gUnk_02019EE0.unk2]];
LoadPalettes(&paletteOffset[0x11AA0], 11, 1);
LoadPalettes(&paletteOffset[0x11BA0], 12, 1);
LoadPalettes(&paletteOffset[0x11CA0], 13, 1);
LoadPalettes(&paletteOffset[0x11DA0], 14, 1);
}
}
void sub_0805070C(void) {
u32 i;
int j;
struct_02036540* var0;
u8* playerName;
var0 = sub_0805F2C8();
if (var0) {
var0->unk2 = 0;
var0->unk3 = 5;
var0->unk1 = 1;
var0->unk4 = 0x30;
var0->unk8 = gUnk_02000D00;
for (i = 0; i < 3; i++) {
var0->unk6 = 0;
_DmaZero(var0->unk8, 0x200);
playerName = gSaveFiles[i].playerName;
for (j = 0; j < 6; j++) {
sub_0805F7DC(playerName[j], var0);
}
_DmaCopy(var0->unk8, (void*)(OBJ_VRAM0 + 0x4000 + i * 0x200), 0x200);
}
sub_0805F300(var0);
}
}
void sub_08050790(void) {
u32 i, j;
struct_02036540* var0;
u32 var1;
var0 = sub_0805F2C8();
if (var0) {
var0->unk2 = 0;
var0->unk3 = 5;
var0->unk1 = 1;
var0->unk4 = 0x80;
var0->unk8 = gUnk_02000D00;
for (i = 0; i < 16; i++) {
var0->unk6 = 0;
var1 = i * 16;
for (j = 0; j < 16; j++) {
sub_0805F7DC(var1, var0);
var1++;
}
_DmaCopy(gUnk_02000D00, (void*)(BG_VRAM + i * 0x400), 0x400);
}
sub_0805F300(var0);
}
}
static void sub_080507FC(void) {
gUnk_0200AF00.unk1A = 0x140;
gUnk_0200AF00.unk20 = 0x24;
}
void sub_08050810(void) {
gUnk_0200AF00.unk1A = 0xD0;
gUnk_0200AF00.unk20 = 0x24;
}
void sub_08050820(void) {
gUnk_080FC8FC[gChooseFileState.state]();
sub_08050A64(gUnk_02019EE0.unk6);
}
void sub_08050848(void) {
sub_080503A8(0x7);
sub_0805070C();
gUnk_02019EE0.unk7 = 0;
sub_08050AFC(gUnk_02019EE0.unk6);
sub_080A7114(1);
}
void sub_0805086C(void) {
gUnk_080FC908[gChooseFileState.subState]();
}
void sub_08050888(void) {
if (!gFadeControl.active) {
switch (gUnk_02019EE0.unk8[gUnk_02019EE0.unk7]) {
case 0:
sub_0805194C(gUnk_02019EE0.unk7);
gChooseFileState.subState = 2;
break;
case 1:
gChooseFileState.subState = 2;
break;
default:
sub_0805194C(gUnk_02019EE0.unk7);
sub_08050318(0, gUnk_02019EE0.unk7 + 1);
gChooseFileState.timer = 30;
gChooseFileState.subState = 1;
break;
}
}
}
void sub_080508E4(void) {
if (gChooseFileState.timer == 0) {
if (gUnk_03000FF0.newKeys & (A_BUTTON | START_BUTTON)) {
gChooseFileState.subState = 2;
}
} else {
gChooseFileState.timer--;
}
}
void sub_08050910(void) {
sub_08050384();
if (++gUnk_02019EE0.unk7 > 2) {
sub_080A7114(2);
} else {
gChooseFileState.subState = 0;
}
}
void sub_08050940(void) {
int saveFileId;
u32 newKeys;
int var1;
u32 var2;
if (gUnk_02019EE0.unk0) {
return;
}
saveFileId = gUnk_02019EE0.unk6;
newKeys = gUnk_03000FF0.newKeys;
if ((gUnk_03000FF0.heldKeys & L_BUTTON) && gUnk_02019EE0.unk8[saveFileId] == 1) {
newKeys &= ~(DPAD_UP | DPAD_DOWN);
}
var1 = ((struct_02000000*)0x2000000)->gameLanguage > 1 ? 4 : 3;
var2 = gUnk_02032EC0.transitionType;
switch (newKeys) {
case DPAD_UP:
if (saveFileId > 0) {
saveFileId--;
}
break;
case DPAD_DOWN:
if (var1 - 1 > saveFileId) {
saveFileId++;
}
break;
case R_BUTTON:
if (gUnk_02019EE0.unk8[saveFileId] == 1) {
var2 = 3;
}
break;
case A_BUTTON:
case START_BUTTON:
sub_0805041C(saveFileId);
if (saveFileId == 3) {
var2 = 2;
} else {
switch (gUnk_02019EE0.unk8[saveFileId]) {
case 0:
var2 = 1;
break;
case 1:
var2 = 4;
break;
}
}
break;
}
if (gUnk_02032EC0.transitionType != var2) {
sub_080503BC(var2);
PlaySFX(0x6A);
}
saveFileId = (saveFileId + var1) % var1;
if (gUnk_02019EE0.unk6 != saveFileId) {
gUnk_02019EE0.unk6 = saveFileId;
sub_08050AFC(saveFileId);
PlaySFX(0x69);
}
if (gUnk_02019EE0.unk8[gUnk_02019EE0.unk6] == 1) {
sub_08050810();
}
}
void sub_08050A64(u32 saveFileId) {
if (gUnk_02019EE0.unk8[saveFileId] != 1) {
return;
}
gUnk_03001010[2] = 0;
gUnk_03001010[3] = 0;
gUnk_03001010[4] = 0x400;
// Draw the save file's obtained elements.
if (GetInventoryValue(0x40)) {
gUnk_03001010[0] = 0xA2;
gUnk_03001010[1] = 0x36;
sub_080ADA14(0x145, 0x24);
}
if (GetInventoryValue(0x41)) {
gUnk_03001010[0] = 0x96;
gUnk_03001010[1] = 0x3D;
sub_080ADA14(0x145, 0x22);
}
if (GetInventoryValue(0x42)) {
gUnk_03001010[0] = 0xAE;
gUnk_03001010[1] = 0x3D;
sub_080ADA14(0x145, 0x23);
}
if (GetInventoryValue(0x43)) {
gUnk_03001010[0] = 0xA2;
gUnk_03001010[1] = 0x44;
sub_080ADA14(0x145, 0x21);
}
}
void sub_08050B3C(u16*);
void sub_08050AFC(u32 saveFileId) {
sub_0805041C(saveFileId);
_DmaZero(&gBG1Buffer, sizeof(gBG1Buffer));
if (gUnk_02019EE0.unk8[saveFileId] == 1) {
sub_08050B3C(&gBG1Buffer.unk29C);
}
gScreen.bg.bg2yOffset = 1;
}
// typedef struct {
// u16* unk0;
// u32 unk4;
// } unk_08050B3C;
// extern const u16 gUnk_080FC914[];
// void sub_08050B3C(u16* arg0) {
// unk_08050B3C sp;
// int var0;
// int var1;
// int var2;
// int var3;
// int var4;
// int var5;
// int var6;
// int var7;
// u16* var8;
// sp.unk0 = arg0;
// var0 = gUnk_02002A40.stats.health * 2;
// if (var0 == 0) {
// var0 = 1;
// }
// var1 = gUnk_02002A40.stats.maxHealth * 2;
// if (var1 == 0) {
// return;
// }
// if (var0 > var1) {
// var0 = var1;
// }
// sp.unk4 = var0 & 0x3;
// var2 = var0 >> 2;
// var5 = var2;
// if (var2 > 10) {
// var5 = 10;
// }
// var6 = var2;
// var6 -= 10;
// var7 = var6;
// if (var6 < 0) {
// var7 = 0;
// }
// var1 = var1 >> 2;
// var4 = var1;
// if (var1 > 10) {
// var1 = 10;
// }
// var4 -= 10;
// sp.unk0[0] = 0xF24C;
// DmaCopy16(3, &gUnk_080FC914[10 - var5], &sp.unk0[1], var1 * 2);
// if (var4 > 0) {
// sp.unk0[0x20] = 0xF24C;
// DmaCopy16(3, &gUnk_080FC914[10 - var7], &sp.unk0[1], var4 * 2);
// }
// if (!sp.unk4) {
// return;
// }
// var8 = sp.unk0;
// if (var2 >= 10) {
// var2 = var6;
// var8 += 0x20;
// }
// var8[var2 + 1] = sp.unk4 - 0xDB3;
// }
src/code_0804AA84.c
+1 -1
View File
@@ -47,7 +47,7 @@ void sub_0804AAD4(void) {
void sub_0804AB04(void) {
sub_0805E5C0();
if (gArea.field_0x10 != 0) {
sub_080AD90C();
FlushSprites();
sub_080AD9B0();
sub_080AD918();
}
src/code_0805436C.c
+14 -14
View File
@@ -19,7 +19,7 @@ typedef struct {
u8 unk;
} ScreenTransition;
extern SaveFile gUnk_02002A40;
extern SaveFile gSave;
extern struct_080FD5B4 gUnk_080FD5B4[];
extern ScreenTransition gScreenTransition;
@@ -33,9 +33,9 @@ extern void (*const gUnk_080FE2A0[])();
u32 IsItemEquipped(u32 itemID) {
u32 ret;
if (itemID == gUnk_02002A40.stats.itemOnA)
if (itemID == gSave.stats.itemOnA)
ret = 0;
else if (itemID == gUnk_02002A40.stats.itemOnB)
else if (itemID == gSave.stats.itemOnB)
ret = 1;
else
ret = 2;
@@ -50,17 +50,17 @@ void PutItemOnSlot(u32 itemID) {
}
if (itemID - 1 < 0x1f) {
itemSlot = 2;
if (gUnk_02002A40.stats.itemOnA == 0) {
if (gSave.stats.itemOnA == 0) {
itemSlot = 0;
} else if (gUnk_02002A40.stats.itemOnB == 0) {
} else if (gSave.stats.itemOnB == 0) {
itemSlot = 1;
}
if (itemSlot == 2) {
u8 temp = gUnk_080FD5B4[itemID].unk;
if (temp == gUnk_080FD5B4[gUnk_02002A40.stats.itemOnA].unk) {
if (temp == gUnk_080FD5B4[gSave.stats.itemOnA].unk) {
itemSlot = 0;
} else {
if (temp == gUnk_080FD5B4[gUnk_02002A40.stats.itemOnB].unk) {
if (temp == gUnk_080FD5B4[gSave.stats.itemOnB].unk) {
itemSlot = 1;
}
}
@@ -82,19 +82,19 @@ u32 SetBottleContents(u32 itemID, u32 bottleIndex) {
if (bottleIndex > 3) {
bottleIndex = 0;
if (gUnk_02002A40.stats.filler2[0] != 0x20) {
if (gSave.stats.filler2[0] != 0x20) {
do {
bottleIndex++;
if (bottleIndex > 3) {
return bottleIndex;
}
} while (gUnk_02002A40.stats.filler2[bottleIndex] != 0x20);
} while (gSave.stats.filler2[bottleIndex] != 0x20);
}
if (bottleIndex > 3) {
return bottleIndex;
}
}
gUnk_02002A40.stats.filler2[bottleIndex] = itemID;
gSave.stats.filler2[bottleIndex] = itemID;
return bottleIndex;
}
@@ -134,13 +134,13 @@ u32 sub_080544C8(u32 arg0) {
}
u32 sub_080544DC(u32 arg0) {
if (arg0 == gUnk_02002A40.stats.filler2[0]) {
if (arg0 == gSave.stats.filler2[0]) {
return 1;
} else if (arg0 == gUnk_02002A40.stats.filler2[1]) {
} else if (arg0 == gSave.stats.filler2[1]) {
return 2;
} else if (arg0 == gUnk_02002A40.stats.filler2[2]) {
} else if (arg0 == gSave.stats.filler2[2]) {
return 3;
} else if (arg0 == gUnk_02002A40.stats.filler2[3]) {
} else if (arg0 == gSave.stats.filler2[3]) {
return 4;
} else {
return 0;
src/code_0808091C.c
-3
View File
@@ -39,7 +39,6 @@ void sub_08080910(void) {
void sub_0808091C(ScreenTransitionData* param_1, u32 param_2) {
DoExitTransition(param_1);
gScreenTransition.transitionType = param_2;
return;
}
void sub_08080930(void)
@@ -50,7 +49,6 @@ void sub_08080930(void)
gRoomControls.unk2 = 2;
gRoomControls.filler[0] = 0;
sub_0805E5A8();
return;
}
u32* GetLayerByIndex(u32 param_1) {
@@ -65,7 +63,6 @@ u32* GetLayerByIndex(u32 param_1) {
void sub_08080964(u32 time, u32 magnitude) {
gRoomControls.screenShakeTime = time;
gRoomControls.screenShakeMagnitude = magnitude & 7;
return;
}
void sub_08080974(u32 arg0, u32 arg1) {

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