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

great fairy ~70%

Browse Source
This commit is contained in:
theo
2020-06-09 00:20:29 -07:00
parent d04b9ff79b
commit 5ed687df73
62 changed files with 1471 additions and 1801 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/beedle.s
+2 -2
View File
@@ -316,7 +316,7 @@ sub_080634E4: @ 0x080634E4
thumb_func_start sub_080634EC
sub_080634EC: @ 0x080634EC
ldr r2, _080634FC @ =gUnk_02034350
ldr r2, _080634FC @ =gRoomVars
ldr r1, _08063500 @ =gUnk_0810C88C
ldrb r0, [r0, #0xb]
adds r0, r0, r1
@@ -324,7 +324,7 @@ sub_080634EC: @ 0x080634EC
strb r0, [r2, #6]
bx lr
.align 2, 0
_080634FC: .4byte gUnk_02034350
_080634FC: .4byte gRoomVars
_08063500: .4byte gUnk_0810C88C
thumb_func_start sub_08063504
asm/bigGoron.s
+6 -6
View File
@@ -152,7 +152,7 @@ _0806D028:
sub_0806D02C: @ 0x0806D02C
push {lr}
bl sub_0806D164
ldr r2, _0806D0A8 @ =gLCDControls
ldr r2, _0806D0A8 @ =gScreen
ldrh r1, [r2]
movs r3, #0x80
lsls r3, r3, #7
@@ -220,7 +220,7 @@ _0806D09C:
strh r0, [r1]
pop {pc}
.align 2, 0
_0806D0A8: .4byte gLCDControls
_0806D0A8: .4byte gScreen
_0806D0AC: .4byte 0x00003F3F
thumb_func_start sub_0806D0B0
@@ -243,7 +243,7 @@ sub_0806D0B0: @ 0x0806D0B0
adds r0, r4, #0
bl sub_0806D164
_0806D0DA:
ldr r0, _0806D0F0 @ =gLCDControls
ldr r0, _0806D0F0 @ =gScreen
ldr r1, _0806D0F4 @ =0x00001D47
strh r1, [r0, #0x14]
str r5, [r0, #0x1c]
@@ -253,7 +253,7 @@ _0806D0DA:
.align 2, 0
_0806D0E8: .4byte gUnk_0200B650
_0806D0EC: .4byte gUnk_02002F00
_0806D0F0: .4byte gLCDControls
_0806D0F0: .4byte gScreen
_0806D0F4: .4byte 0x00001D47
thumb_func_start sub_0806D0F8
@@ -325,7 +325,7 @@ sub_0806D164: @ 0x0806D164
ldrsh r1, [r0, r3]
subs r2, r2, r1
adds r2, #0xa0
ldr r4, _0806D1BC @ =gLCDControls
ldr r4, _0806D1BC @ =gScreen
movs r3, #0xf
adds r1, r2, #0
ands r1, r3
@@ -362,7 +362,7 @@ _0806D1A0:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0806D1B8: .4byte gRoomControls
_0806D1BC: .4byte gLCDControls
_0806D1BC: .4byte gScreen
_0806D1C0: .4byte gUnk_02006F00
_0806D1C4: .4byte 0xFFFFC000
_0806D1C8: .4byte 0x040000D4
asm/code_08016B30.s
+2 -2
View File
@@ -142,7 +142,7 @@ sub_08016C3C: @ 0x08016C3C
ldrb r0, [r2]
cmp r0, #0
beq _08016C6C
ldr r0, _08016C98 @ =gLCDControls
ldr r0, _08016C98 @ =gScreen
ldrh r1, [r0]
movs r0, #0x80
lsls r0, r0, #5
@@ -179,7 +179,7 @@ _08016C6C:
bx r0
.align 2, 0
_08016C94: .4byte gUnk_03000000
_08016C98: .4byte gLCDControls
_08016C98: .4byte gScreen
_08016C9C: .4byte 0x040000D4
_08016CA0: .4byte 0x84000100
_08016CA4: .4byte gBG0Settings
asm/code_08016DF8.s
+2 -2
View File
@@ -365,7 +365,7 @@ _080170C0:
beq _080170CE
b _080171EA
_080170CE:
ldr r3, _08017128 @ =gUnk_02034350
ldr r3, _08017128 @ =gRoomVars
strb r1, [r3, #0xa]
ldr r2, _0801712C @ =gUnk_02002A40
adds r0, r2, #0
@@ -411,7 +411,7 @@ _08017112:
b _0801715A
.align 2, 0
_08017124: .4byte gTextBox
_08017128: .4byte gUnk_02034350
_08017128: .4byte gRoomVars
_0801712C: .4byte gUnk_02002A40
_08017130: .4byte gUnk_0200AF00
_08017134: .4byte gUnk_030010A0
asm/code_08018500.s
+2 -2
View File
@@ -528,7 +528,7 @@ _080188FE:
ldr r1, _08018924 @ =gUnk_080FED58
adds r0, r0, r1
bl CreateEntity
ldr r2, _08018928 @ =gUnk_02034350
ldr r2, _08018928 @ =gRoomVars
ldrb r0, [r5, #1]
lsls r0, r0, #2
adds r2, #0x8c
@@ -540,7 +540,7 @@ _080188FE:
b _080189E4
.align 2, 0
_08018924: .4byte gUnk_080FED58
_08018928: .4byte gUnk_02034350
_08018928: .4byte gRoomVars
_0801892C: .4byte gUnk_080FED98
_08018930:
cmp r4, #0
asm/code_08019444.s
+8 -8
View File
@@ -336,7 +336,7 @@ sub_08019698: @ 0x08019698
movs r0, #1
strb r0, [r1]
bl sub_08000108
ldr r2, _08019734 @ =gLCDControls
ldr r2, _08019734 @ =gScreen
ldrh r1, [r2]
ldr r0, _08019738 @ =0x0000FEFF
ands r0, r1
@@ -375,7 +375,7 @@ _08019724: .4byte gUnk_02032EC0
_08019728: .4byte gUnk_080B4410
_0801972C: .4byte gRoomControls
_08019730: .4byte gUnk_02000070
_08019734: .4byte gLCDControls
_08019734: .4byte gScreen
_08019738: .4byte 0x0000FEFF
_0801973C: .4byte gUnk_02018EB0
@@ -3189,7 +3189,7 @@ sub_0801AC68: @ 0x0801AC68
push {r4, r5, lr}
adds r4, r0, #0
ldr r2, _0801AC84 @ =gUnk_0200B240
ldr r0, _0801AC88 @ =gUnk_02034350
ldr r0, _0801AC88 @ =gRoomVars
ldrh r3, [r0, #0xe]
movs r0, #0
cmp r0, r3
@@ -3203,7 +3203,7 @@ _0801AC78:
b _0801AC96
.align 2, 0
_0801AC84: .4byte gUnk_0200B240
_0801AC88: .4byte gUnk_02034350
_0801AC88: .4byte gRoomVars
_0801AC8C:
adds r2, #4
adds r0, #1
@@ -3572,7 +3572,7 @@ sub_0801AF48: @ 0x0801AF48
ldrb r0, [r0]
cmp r0, #0
bne _0801AF7A
ldr r2, _0801AF84 @ =gUnk_02034350
ldr r2, _0801AF84 @ =gRoomVars
ldrh r3, [r2, #0xe]
cmp r3, #0xff
bhi _0801AF7A
@@ -3590,7 +3590,7 @@ _0801AF7A:
.align 2, 0
_0801AF7C: .4byte 0x00003FFF
_0801AF80: .4byte gUnk_030010A0
_0801AF84: .4byte gUnk_02034350
_0801AF84: .4byte gRoomVars
_0801AF88: .4byte gUnk_0200B240
thumb_func_start sub_0801AF8C
@@ -3600,7 +3600,7 @@ sub_0801AF8C: @ 0x0801AF8C
lsls r1, r1, #0xc
orrs r4, r1
ldr r2, _0801AFB8 @ =gUnk_0200B240
ldr r0, _0801AFBC @ =gUnk_02034350
ldr r0, _0801AFBC @ =gRoomVars
ldrh r1, [r0, #0xe]
movs r3, #0
adds r5, r2, #0
@@ -3618,7 +3618,7 @@ sub_0801AF8C: @ 0x0801AF8C
b _0801AFE0
.align 2, 0
_0801AFB8: .4byte gUnk_0200B240
_0801AFBC: .4byte gUnk_02034350
_0801AFBC: .4byte gRoomVars
_0801AFC0:
adds r2, #4
adds r3, #1
asm/code_0801C370.s
+4 -4
View File
@@ -49,7 +49,7 @@ _0801C398:
lsls r1, r1, #4
adds r0, r4, #0
bl sub_0801D630
ldr r1, _0801C47C @ =gLCDControls
ldr r1, _0801C47C @ =gScreen
str r4, [r1, #0x10]
ldr r0, _0801C480 @ =0x00001F0C
strh r0, [r1, #8]
@@ -123,7 +123,7 @@ _0801C398:
_0801C470: .4byte gUnk_0200AF00
_0801C474: .4byte gUnk_02002A40
_0801C478: .4byte gUnk_02034CB0
_0801C47C: .4byte gLCDControls
_0801C47C: .4byte gScreen
_0801C480: .4byte 0x00001F0C
_0801C484: .4byte gUnk_03000000
_0801C488: .4byte 0x00000427
@@ -132,12 +132,12 @@ _0801C490: .4byte 0x0000042E
thumb_func_start sub_0801C494
sub_0801C494: @ 0x0801C494
ldr r1, _0801C49C @ =gLCDControls
ldr r1, _0801C49C @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
bx lr
.align 2, 0
_0801C49C: .4byte gLCDControls
_0801C49C: .4byte gScreen
thumb_func_start sub_0801C4A0
sub_0801C4A0: @ 0x0801C4A0
asm/code_0801C5E0.s
+2 -2
View File
@@ -89,7 +89,7 @@ sub_0801C66C: @ 0x0801C66C
movs r2, #2
_0801C684:
ldr r0, _0801C6A8 @ =gUnk_02034CF0
ldr r3, _0801C6AC @ =gLCDControls
ldr r3, _0801C6AC @ =gScreen
movs r1, #0
_0801C68A:
str r1, [r0]
@@ -109,4 +109,4 @@ _0801C6A2:
.align 2, 0
_0801C6A4: .4byte gUnk_0200AF00
_0801C6A8: .4byte gUnk_02034CF0
_0801C6AC: .4byte gLCDControls
_0801C6AC: .4byte gScreen
asm/code_0801C85C.s
+6 -6
View File
@@ -97,7 +97,7 @@ _0801C8BA:
orrs r0, r1
strh r0, [r2, #2]
_0801C90C:
ldr r0, _0801C94C @ =gLCDControls
ldr r0, _0801C94C @ =gScreen
strh r6, [r0, #0xe]
_0801C910:
ldr r0, _0801C930 @ =gLinkState
@@ -123,7 +123,7 @@ _0801C93C: .4byte 0x040000D4
_0801C940: .4byte gUnk_080C8F54
_0801C944: .4byte 0x8000000A
_0801C948: .4byte 0x000003FF
_0801C94C: .4byte gLCDControls
_0801C94C: .4byte gScreen
_0801C950: .4byte gUnk_0200AF00
_0801C954:
adds r0, r1, #1
@@ -194,14 +194,14 @@ _0801C9B2:
strh r0, [r1]
adds r1, #2
strh r0, [r1]
ldr r1, _0801C9E8 @ =gLCDControls
ldr r1, _0801C9E8 @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
b _0801CA50
.align 2, 0
_0801C9E0: .4byte gUnk_0200AF00
_0801C9E4: .4byte gUnk_020350E2
_0801C9E8: .4byte gLCDControls
_0801C9E8: .4byte gScreen
_0801C9EC:
ldrb r0, [r4, #0x10]
cmp r0, #0
@@ -225,7 +225,7 @@ _0801C9EC:
strh r0, [r2, #6]
adds r0, r3, #3
strh r0, [r1, #6]
ldr r1, _0801CA5C @ =gLCDControls
ldr r1, _0801CA5C @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
_0801CA1E:
@@ -259,7 +259,7 @@ _0801CA50:
.align 2, 0
_0801CA54: .4byte gUnk_020350E2
_0801CA58: .4byte 0x0000F01C
_0801CA5C: .4byte gLCDControls
_0801CA5C: .4byte gScreen
_0801CA60: .4byte gUnk_02002A40
_0801CA64: .4byte gUnk_02033A90
_0801CA68: .4byte 0x0000045C
asm/code_0801D79C.s
+14 -14
View File
@@ -29,14 +29,14 @@ sub_0801D7BC: @ 0x0801D7BC
adds r2, r0, #0
cmp r1, #0
beq _0801D7D4
ldr r1, _0801D7CC @ =gLCDControls
ldr r1, _0801D7CC @ =gScreen
ldr r0, _0801D7D0 @ =0x0000E0FF
b _0801D7D8
.align 2, 0
_0801D7CC: .4byte gLCDControls
_0801D7CC: .4byte gScreen
_0801D7D0: .4byte 0x0000E0FF
_0801D7D4:
ldr r1, _0801D7E4 @ =gLCDControls
ldr r1, _0801D7E4 @ =gScreen
ldr r0, _0801D7E8 @ =0x0000FFFF
_0801D7D8:
strh r0, [r1, #6]
@@ -45,7 +45,7 @@ _0801D7D8:
bl sub_0801D79C
pop {pc}
.align 2, 0
_0801D7E4: .4byte gLCDControls
_0801D7E4: .4byte gScreen
_0801D7E8: .4byte 0x0000FFFF
thumb_func_start sub_0801D7EC
@@ -436,7 +436,7 @@ sub_0801DA90: @ 0x0801DA90
strb r3, [r0]
ldr r0, _0801DAF4 @ =gUnk_03000FD0
strb r3, [r0]
ldr r5, _0801DAF8 @ =gLCDControls
ldr r5, _0801DAF8 @ =gScreen
adds r0, r5, #0
adds r0, #0x6d
strb r3, [r0]
@@ -470,7 +470,7 @@ sub_0801DA90: @ 0x0801DA90
_0801DAEC: .4byte gUnk_03001000
_0801DAF0: .4byte gUnk_03003DE0
_0801DAF4: .4byte gUnk_03000FD0
_0801DAF8: .4byte gLCDControls
_0801DAF8: .4byte gScreen
_0801DAFC: .4byte 0x040000B0
_0801DB00: .4byte 0x0000C5FF
_0801DB04: .4byte 0x00007FFF
@@ -502,7 +502,7 @@ _0801DB30: .4byte gUnk_03000020
thumb_func_start sub_0801DB34
sub_0801DB34: @ 0x0801DB34
push {r4, lr}
ldr r4, _0801DB6C @ =gLCDControls
ldr r4, _0801DB6C @ =gScreen
adds r0, r4, #0
movs r1, #0x7c
bl sub_0801D630
@@ -529,7 +529,7 @@ sub_0801DB34: @ 0x0801DB34
strh r0, [r4, #6]
pop {r4, pc}
.align 2, 0
_0801DB6C: .4byte gLCDControls
_0801DB6C: .4byte gScreen
_0801DB70: .4byte gUnk_02034CB0
_0801DB74: .4byte 0x00001F0C
_0801DB78: .4byte gUnk_02021F30
@@ -1278,7 +1278,7 @@ _0801E102:
thumb_func_start sub_0801E104
sub_0801E104: @ 0x0801E104
ldr r1, _0801E118 @ =gLCDControls
ldr r1, _0801E118 @ =gScreen
ldrh r2, [r1]
ldr r0, _0801E11C @ =0x00009FFF
ands r0, r2
@@ -1288,12 +1288,12 @@ sub_0801E104: @ 0x0801E104
strb r2, [r1]
bx lr
.align 2, 0
_0801E118: .4byte gLCDControls
_0801E118: .4byte gScreen
_0801E11C: .4byte 0x00009FFF
thumb_func_start sub_0801E120
sub_0801E120: @ 0x0801E120
ldr r3, _0801E14C @ =gLCDControls
ldr r3, _0801E14C @ =gScreen
ldrh r1, [r3]
movs r2, #0x80
lsls r2, r2, #6
@@ -1316,7 +1316,7 @@ sub_0801E120: @ 0x0801E120
strh r0, [r1]
bx lr
.align 2, 0
_0801E14C: .4byte gLCDControls
_0801E14C: .4byte gScreen
_0801E150: .4byte 0x00003F37
thumb_func_start sub_0801E154
@@ -1371,7 +1371,7 @@ _0801E1B4: .4byte 0xA2600001
thumb_func_start sub_0801E1B8
sub_0801E1B8: @ 0x0801E1B8
push {r4, lr}
ldr r2, _0801E1E8 @ =gLCDControls
ldr r2, _0801E1E8 @ =gScreen
mov ip, r2
ldrh r3, [r2]
movs r4, #0x80
@@ -1395,7 +1395,7 @@ sub_0801E1B8: @ 0x0801E1B8
strh r0, [r1]
pop {r4, pc}
.align 2, 0
_0801E1E8: .4byte gLCDControls
_0801E1E8: .4byte gScreen
thumb_func_start sub_0801E1EC
sub_0801E1EC: @ 0x0801E1EC
asm/code_08029A94.s
+4 -4
View File
@@ -1171,7 +1171,7 @@ sub_0802A334: @ 0x0802A334
ldr r2, _0802A380 @ =gRoomControls
movs r3, #0xa
ldrsh r0, [r2, r3]
ldr r3, _0802A384 @ =gLCDControls
ldr r3, _0802A384 @ =gScreen
subs r1, r1, r0
ldrh r5, [r3, #0x16]
adds r1, r1, r5
@@ -1204,7 +1204,7 @@ sub_0802A334: @ 0x0802A334
b _0802A392
.align 2, 0
_0802A380: .4byte gRoomControls
_0802A384: .4byte gLCDControls
_0802A384: .4byte gScreen
_0802A388: .4byte gUnk_02001A40
_0802A38C:
adds r1, r4, #0
@@ -1226,7 +1226,7 @@ sub_0802A39C: @ 0x0802A39C
ldr r2, _0802A3F0 @ =gRoomControls
movs r3, #0xa
ldrsh r0, [r2, r3]
ldr r3, _0802A3F4 @ =gLCDControls
ldr r3, _0802A3F4 @ =gScreen
subs r1, r1, r0
ldrh r6, [r3, #0x16]
adds r1, r1, r6
@@ -1261,7 +1261,7 @@ sub_0802A39C: @ 0x0802A39C
.align 2, 0
_0802A3EC: .4byte gLinkEntity
_0802A3F0: .4byte gRoomControls
_0802A3F4: .4byte gLCDControls
_0802A3F4: .4byte gScreen
_0802A3F8: .4byte gUnk_02001A40
_0802A3FC:
ldrb r1, [r5, #0x10]
asm/code_0802B234.s
+11 -11
View File
@@ -4079,7 +4079,7 @@ _0802D04C:
adds r0, r4, #0
adds r0, #0x75
strb r1, [r0]
ldr r1, _0802D088 @ =gLCDControls
ldr r1, _0802D088 @ =gScreen
ldrb r2, [r2]
adds r0, r1, #0
adds r0, #0x68
@@ -4091,7 +4091,7 @@ _0802D04C:
bl PlaySFX
b _0802D148
.align 2, 0
_0802D088: .4byte gLCDControls
_0802D088: .4byte gScreen
_0802D08C: .4byte 0x00001442
_0802D090:
ldrb r0, [r4, #0xe]
@@ -4111,7 +4111,7 @@ _0802D090:
ldrb r0, [r1]
subs r0, #1
strb r0, [r1]
ldr r2, _0802D0EC @ =gLCDControls
ldr r2, _0802D0EC @ =gScreen
ldrb r1, [r1]
ldrb r0, [r3]
lsls r0, r0, #8
@@ -4138,7 +4138,7 @@ _0802D0D2:
bl PlaySFX
b _0802D148
.align 2, 0
_0802D0EC: .4byte gLCDControls
_0802D0EC: .4byte gScreen
_0802D0F0: .4byte gLinkEntity
_0802D0F4:
movs r0, #0x94
@@ -4508,7 +4508,7 @@ sub_0802D3B8: @ 0x0802D3B8
bl GetProgressFlag
cmp r0, #0
beq _0802D3DE
ldr r2, _0802D3F4 @ =gLCDControls
ldr r2, _0802D3F4 @ =gScreen
ldrh r1, [r2]
ldr r0, _0802D3F8 @ =0x0000FDFF
ands r0, r1
@@ -4530,7 +4530,7 @@ _0802D3EA:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0802D3F4: .4byte gLCDControls
_0802D3F4: .4byte gScreen
_0802D3F8: .4byte 0x0000FDFF
_0802D3FC: .4byte gLinkEntity
_0802D400: .4byte _0802D404
@@ -6391,7 +6391,7 @@ _0802E218:
adds r2, #0x30
adds r7, r5, #0
adds r7, #0x7c
ldr r0, _0802E288 @ =gLCDControls
ldr r0, _0802E288 @ =gScreen
mov sb, r0
movs r1, #0x66
add r1, sb
@@ -6432,7 +6432,7 @@ _0802E23A:
.align 2, 0
_0802E280: .4byte gLinkEntity
_0802E284: .4byte gLinkState
_0802E288: .4byte gLCDControls
_0802E288: .4byte gScreen
_0802E28C:
adds r4, r7, #0
strh r6, [r4]
@@ -6537,7 +6537,7 @@ _0802E31E:
ldrb r0, [r1]
adds r0, #1
strb r0, [r1]
ldr r2, _0802E3A0 @ =gLCDControls
ldr r2, _0802E3A0 @ =gScreen
ldrb r1, [r1]
ldrb r0, [r3]
lsls r0, r0, #8
@@ -6571,7 +6571,7 @@ _0802E364:
ldrb r0, [r1]
subs r0, #1
strb r0, [r1]
ldr r2, _0802E3A0 @ =gLCDControls
ldr r2, _0802E3A0 @ =gScreen
ldrb r1, [r1]
ldrb r0, [r3]
lsls r0, r0, #8
@@ -6580,7 +6580,7 @@ _0802E364:
strh r1, [r2]
b _0802E428
.align 2, 0
_0802E3A0: .4byte gLCDControls
_0802E3A0: .4byte gScreen
_0802E3A4:
ldrb r1, [r2]
movs r0, #0x7f
asm/code_08033FFC.s
+10 -10
View File
@@ -91,7 +91,7 @@ _08034090:
strb r1, [r2, #0xd]
ldr r2, [r2, #0x74]
strb r0, [r2, #0xd]
ldr r1, _080340C0 @ =gLCDControls
ldr r1, _080340C0 @ =gScreen
adds r2, r1, #0
adds r2, #0x66
movs r0, #0xf4
@@ -102,14 +102,14 @@ _08034090:
strh r0, [r1]
b _0803413E
.align 2, 0
_080340C0: .4byte gLCDControls
_080340C0: .4byte gScreen
_080340C4:
ldrb r1, [r3, #0xe]
adds r1, #1
strb r1, [r3, #0xe]
lsls r2, r1, #0x18
lsrs r2, r2, #0x19
ldr r4, _08034110 @ =gLCDControls
ldr r4, _08034110 @ =gScreen
movs r0, #0x10
subs r0, r0, r2
lsls r0, r0, #8
@@ -143,7 +143,7 @@ _080340C4:
strh r0, [r1]
b _0803413E
.align 2, 0
_08034110: .4byte gLCDControls
_08034110: .4byte gScreen
_08034114:
ldr r0, [r3, #0x74]
ldrb r1, [r0, #0x10]
@@ -6006,7 +6006,7 @@ _08036D0A:
strb r0, [r1]
b _08036D42
_08036D14:
ldr r0, _08036D2C @ =gUnk_02034350
ldr r0, _08036D2C @ =gRoomVars
movs r2, #0xc
ldrsh r1, [r0, r2]
movs r0, #0x80
@@ -6018,7 +6018,7 @@ _08036D14:
strb r3, [r0]
b _08036D42
.align 2, 0
_08036D2C: .4byte gUnk_02034350
_08036D2C: .4byte gRoomVars
_08036D30:
ldr r0, _08036D44 @ =gUnk_080CF10C
bl sub_080028F4
@@ -6094,7 +6094,7 @@ sub_08036DA0: @ 0x08036DA0
ands r2, r0
cmp r2, #0
bne _08036DF0
ldr r0, _08036DD0 @ =gUnk_02034350
ldr r0, _08036DD0 @ =gRoomVars
movs r3, #0xc
ldrsh r1, [r0, r3]
movs r0, #0x80
@@ -6106,7 +6106,7 @@ sub_08036DA0: @ 0x08036DA0
strb r2, [r0]
b _08036DF8
.align 2, 0
_08036DD0: .4byte gUnk_02034350
_08036DD0: .4byte gRoomVars
_08036DD4:
ldr r0, _08036DE8 @ =gUnk_080CF13C
bl sub_080028F4
@@ -6174,7 +6174,7 @@ _08036E3E:
ldr r2, [sp]
cmp r0, #0
beq _08036E62
ldr r0, _08036E84 @ =gUnk_02034350
ldr r0, _08036E84 @ =gRoomVars
movs r3, #0xc
ldrsh r1, [r0, r3]
movs r0, #0x80
@@ -6198,7 +6198,7 @@ _08036E62:
bl PlaySFX
b _08036F00
.align 2, 0
_08036E84: .4byte gUnk_02034350
_08036E84: .4byte gRoomVars
_08036E88: .4byte 0x00000159
_08036E8C:
mov r1, r8
asm/code_0804AA84.s
+6 -6
View File
@@ -94,7 +94,7 @@ sub_0804AB24: @ 0x0804AB24
ldrb r1, [r5]
cmp r1, #0
bne _0804AB46
ldr r0, _0804AB4C @ =gLCDControls
ldr r0, _0804AB4C @ =gScreen
movs r4, #0
strh r1, [r0]
bl sub_0801E104
@@ -108,7 +108,7 @@ _0804AB46:
pop {r4, r5, pc}
.align 2, 0
_0804AB48: .4byte gUnk_03000FD0
_0804AB4C: .4byte gLCDControls
_0804AB4C: .4byte gScreen
_0804AB50: .4byte gUnk_02033A90
thumb_func_start sub_0804AB54
@@ -131,7 +131,7 @@ sub_0804AB70: @ 0x0804AB70
push {r4, r5, lr}
movs r0, #0
bl sub_0801DA90
ldr r1, _0804ABF8 @ =gLCDControls
ldr r1, _0804ABF8 @ =gScreen
movs r2, #0
movs r0, #0x92
lsls r0, r0, #5
@@ -189,7 +189,7 @@ _0804ABA4:
bl DoFade
pop {r4, r5, pc}
.align 2, 0
_0804ABF8: .4byte gLCDControls
_0804ABF8: .4byte gScreen
_0804ABFC: .4byte 0x00009E83
_0804AC00: .4byte gRoomControls
_0804AC04: .4byte gUnk_02033A90
@@ -235,7 +235,7 @@ _0804AC52:
movs r0, #0x9f
strh r0, [r3, #0xc]
_0804AC5E:
ldr r2, _0804ACA0 @ =gLCDControls
ldr r2, _0804ACA0 @ =gScreen
ldr r1, _0804AC9C @ =gRoomControls
ldrh r0, [r1, #0xa]
strh r0, [r2, #0x16]
@@ -264,7 +264,7 @@ _0804AC96:
.align 2, 0
_0804AC98: .4byte gUnk_02018EB0
_0804AC9C: .4byte gRoomControls
_0804ACA0: .4byte gLCDControls
_0804ACA0: .4byte gScreen
_0804ACA4: .4byte gUnk_02033A90
thumb_func_start sub_0804ACA8
asm/code_0804AEB0.s
+2 -2
View File
@@ -146,7 +146,7 @@ sub_0804AFB0: @ 0x0804AFB0
ldr r1, _0804AFD4 @ =gUnk_02017654
str r0, [r1]
movs r2, #0
ldr r0, _0804AFD8 @ =gUnk_02034350
ldr r0, _0804AFD8 @ =gRoomVars
adds r3, r1, #0
adds r4, r0, #0
adds r4, #0x6c
@@ -162,7 +162,7 @@ _0804AFC0:
pop {r4, pc}
.align 2, 0
_0804AFD4: .4byte gUnk_02017654
_0804AFD8: .4byte gUnk_02034350
_0804AFD8: .4byte gRoomVars
thumb_func_start sub_0804AFDC
sub_0804AFDC: @ 0x0804AFDC
asm/code_0804B058.s
+14 -14
View File
@@ -135,14 +135,14 @@ _0804B138: .4byte gUnk_02017654
_0804B13C:
cmp r2, #0x7f
bls _0804B150
ldr r0, _0804B14C @ =gUnk_02034350
ldr r0, _0804B14C @ =gRoomVars
movs r1, #7
ands r1, r2
lsls r1, r1, #2
adds r0, #0x8c
b _0804B162
.align 2, 0
_0804B14C: .4byte gUnk_02034350
_0804B14C: .4byte gRoomVars
_0804B150:
cmp r2, #7
bls _0804B15C
@@ -151,7 +151,7 @@ _0804B150:
ldr r0, [r0]
b _0804B166
_0804B15C:
ldr r0, _0804B168 @ =gUnk_02034350
ldr r0, _0804B168 @ =gRoomVars
lsls r1, r2, #2
adds r0, #0x6c
_0804B162:
@@ -160,7 +160,7 @@ _0804B162:
_0804B166:
pop {pc}
.align 2, 0
_0804B168: .4byte gUnk_02034350
_0804B168: .4byte gRoomVars
thumb_func_start sub_0804B16C
sub_0804B16C: @ 0x0804B16C
@@ -268,7 +268,7 @@ _0804B244:
bl sub_0804B27C
b _0804B252
_0804B24C:
ldr r1, _0804B25C @ =gUnk_02034350
ldr r1, _0804B25C @ =gRoomVars
ldrb r0, [r4, #3]
strb r0, [r1, #9]
_0804B252:
@@ -280,7 +280,7 @@ _0804B254:
_0804B25A:
pop {r4, pc}
.align 2, 0
_0804B25C: .4byte gUnk_02034350
_0804B25C: .4byte gRoomVars
thumb_func_start sub_0804B260
sub_0804B260: @ 0x0804B260
@@ -416,7 +416,7 @@ sub_0804B340: @ 0x0804B340
bl sub_0807B314
b _0804B380
_0804B35A:
ldr r1, _0804B384 @ =gUnk_02034350
ldr r1, _0804B384 @ =gRoomVars
ldrb r0, [r1, #1]
cmp r0, #0
bne _0804B380
@@ -436,7 +436,7 @@ _0804B35A:
_0804B380:
pop {r4, pc}
.align 2, 0
_0804B384: .4byte gUnk_02034350
_0804B384: .4byte gRoomVars
thumb_func_start sub_0804B388
sub_0804B388: @ 0x0804B388
@@ -1094,7 +1094,7 @@ _0804B7C8:
movs r0, #1
bl sub_0807CCB4
_0804B7D0:
ldr r2, _0804B7E0 @ =gUnk_02034350
ldr r2, _0804B7E0 @ =gRoomVars
ldr r1, _0804B7E4 @ =gUnk_080D6A74
lsls r0, r4, #2
adds r0, r0, r1
@@ -1103,7 +1103,7 @@ _0804B7D0:
movs r0, #1
pop {r4, pc}
.align 2, 0
_0804B7E0: .4byte gUnk_02034350
_0804B7E0: .4byte gRoomVars
_0804B7E4: .4byte gUnk_080D6A74
thumb_func_start sub_0804B7E8
@@ -1157,7 +1157,7 @@ _0804B84A:
movs r0, #2
bl sub_0807CCB4
_0804B852:
ldr r2, _0804B864 @ =gUnk_02034350
ldr r2, _0804B864 @ =gRoomVars
ldr r1, _0804B868 @ =gUnk_080D6B18
lsls r0, r4, #2
adds r0, r0, r1
@@ -1166,7 +1166,7 @@ _0804B852:
movs r0, #1
pop {r4, pc}
.align 2, 0
_0804B864: .4byte gUnk_02034350
_0804B864: .4byte gRoomVars
_0804B868: .4byte gUnk_080D6B18
thumb_func_start sub_0804B86C
@@ -1220,7 +1220,7 @@ _0804B8D0:
movs r0, #3
bl sub_0807CCB4
_0804B8D8:
ldr r2, _0804B8E8 @ =gUnk_02034350
ldr r2, _0804B8E8 @ =gRoomVars
ldr r1, _0804B8EC @ =gUnk_080D6BB8
lsls r0, r4, #2
adds r0, r0, r1
@@ -1229,7 +1229,7 @@ _0804B8D8:
movs r0, #1
pop {r4, pc}
.align 2, 0
_0804B8E8: .4byte gUnk_02034350
_0804B8E8: .4byte gRoomVars
_0804B8EC: .4byte gUnk_080D6BB8
thumb_func_start sub_0804B8F0
asm/code_0804B9F8.s
+49 -49
View File
@@ -40,7 +40,7 @@ sub_0804BA0C: @ 0x0804BA0C
ldr r0, _0804BA38 @ =gUnk_080D7038
bl LoadRoomEntityList
_0804BA1C:
ldr r0, _0804BA3C @ =gUnk_02034350
ldr r0, _0804BA3C @ =gRoomVars
ldrb r0, [r0]
cmp r0, #0
bne _0804BA32
@@ -55,7 +55,7 @@ _0804BA32:
.align 2, 0
_0804BA34: .4byte gUnk_02002A40
_0804BA38: .4byte gUnk_080D7038
_0804BA3C: .4byte gUnk_02034350
_0804BA3C: .4byte gRoomVars
thumb_func_start sub_0804BA40
sub_0804BA40: @ 0x0804BA40
@@ -111,7 +111,7 @@ sub_0804BA9C: @ 0x0804BA9C
bl GetProgressFlag
cmp r0, #0
beq _0804BAB2
ldr r0, _0804BAB8 @ =gUnk_02034350
ldr r0, _0804BAB8 @ =gRoomVars
ldr r1, _0804BABC @ =gUnk_080D7348
str r1, [r0, #0x6c]
movs r1, #0
@@ -120,7 +120,7 @@ _0804BAB2:
movs r0, #1
pop {pc}
.align 2, 0
_0804BAB8: .4byte gUnk_02034350
_0804BAB8: .4byte gRoomVars
_0804BABC: .4byte gUnk_080D7348
thumb_func_start sub_0804BAC0
@@ -172,7 +172,7 @@ sub_0804BB18: @ 0x0804BB18
bl GetProgressFlag
cmp r0, #0
beq _0804BB2E
ldr r0, _0804BB34 @ =gUnk_02034350
ldr r0, _0804BB34 @ =gRoomVars
ldr r1, _0804BB38 @ =gUnk_080D7410
str r1, [r0, #0x6c]
movs r1, #0
@@ -181,7 +181,7 @@ _0804BB2E:
movs r0, #1
pop {pc}
.align 2, 0
_0804BB34: .4byte gUnk_02034350
_0804BB34: .4byte gRoomVars
_0804BB38: .4byte gUnk_080D7410
thumb_func_start sub_0804BB3C
@@ -1078,7 +1078,7 @@ sub_0804C128: @ 0x0804C128
push {r4, r5, lr}
movs r0, #0
bl sub_080AF250
ldr r0, _0804C15C @ =gUnk_02034350
ldr r0, _0804C15C @ =gRoomVars
ldrb r0, [r0]
cmp r0, #0
bne _0804C13A
@@ -1102,7 +1102,7 @@ _0804C13A:
orrs r0, r1
b _0804C19A
.align 2, 0
_0804C15C: .4byte gUnk_02034350
_0804C15C: .4byte gRoomVars
_0804C160: .4byte gUnk_02033A90
_0804C164:
ldr r2, _0804C18C @ =gRoomControls
@@ -1481,14 +1481,14 @@ sub_0804C3CC: @ 0x0804C3CC
bl sub_0807CBD0
cmp r0, #0
bne _0804C3DE
ldr r1, _0804C3E4 @ =gUnk_02034350
ldr r1, _0804C3E4 @ =gRoomVars
ldr r0, _0804C3E8 @ =gUnk_080DA230
str r0, [r1, #0x6c]
_0804C3DE:
movs r0, #1
pop {pc}
.align 2, 0
_0804C3E4: .4byte gUnk_02034350
_0804C3E4: .4byte gRoomVars
_0804C3E8: .4byte gUnk_080DA230
thumb_func_start nullsub_203
@@ -2072,14 +2072,14 @@ sub_0804C730: @ 0x0804C730
bl sub_0807CBD0
cmp r0, #0
bne _0804C74C
ldr r1, _0804C750 @ =gUnk_02034350
ldr r1, _0804C750 @ =gRoomVars
ldr r0, _0804C754 @ =gUnk_080DB910
str r0, [r1, #0x70]
_0804C74C:
movs r0, #1
pop {pc}
.align 2, 0
_0804C750: .4byte gUnk_02034350
_0804C750: .4byte gRoomVars
_0804C754: .4byte gUnk_080DB910
thumb_func_start sub_0804C758
@@ -3405,14 +3405,14 @@ sub_0804CE80: @ 0x0804CE80
bl GetProgressFlag
cmp r0, #0
beq _0804CE92
ldr r1, _0804CE98 @ =gUnk_02034350
ldr r1, _0804CE98 @ =gRoomVars
ldr r0, _0804CE9C @ =gUnk_080E103C
str r0, [r1, #0x70]
_0804CE92:
movs r0, #1
pop {pc}
.align 2, 0
_0804CE98: .4byte gUnk_02034350
_0804CE98: .4byte gRoomVars
_0804CE9C: .4byte gUnk_080E103C
thumb_func_start nullsub_271
@@ -3495,7 +3495,7 @@ sub_0804CED8: @ 0x0804CED8
ldr r1, _0804CF04 @ =gUnk_0200B650
movs r0, #0
str r0, [r1]
ldr r2, _0804CF08 @ =gLCDControls
ldr r2, _0804CF08 @ =gScreen
ldrh r1, [r2]
ldr r0, _0804CF0C @ =0x0000FDFF
ands r0, r1
@@ -3507,7 +3507,7 @@ sub_0804CED8: @ 0x0804CED8
b _0804CF2E
.align 2, 0
_0804CF04: .4byte gUnk_0200B650
_0804CF08: .4byte gLCDControls
_0804CF08: .4byte gScreen
_0804CF0C: .4byte 0x0000FDFF
_0804CF10: .4byte gLinkEntity
_0804CF14: .4byte gUnk_080E1814
@@ -5539,7 +5539,7 @@ sub_0804D904: @ 0x0804D904
adds r5, r0, #0
cmp r5, #0
beq _0804D93C
ldr r1, _0804D930 @ =gUnk_02034350
ldr r1, _0804D930 @ =gRoomVars
ldr r0, _0804D934 @ =gUnk_080EB604
str r0, [r1, #0x6c]
movs r0, #0
@@ -5555,7 +5555,7 @@ sub_0804D904: @ 0x0804D904
str r1, [r2]
b _0804D96A
.align 2, 0
_0804D930: .4byte gUnk_02034350
_0804D930: .4byte gRoomVars
_0804D934: .4byte gUnk_080EB604
_0804D938: .4byte gUnk_02033A90
_0804D93C:
@@ -5563,7 +5563,7 @@ _0804D93C:
bl sub_0807CBD0
cmp r0, #0
beq _0804D96A
ldr r4, _0804D970 @ =gUnk_02034350
ldr r4, _0804D970 @ =gRoomVars
str r5, [r4, #0x6c]
movs r0, #0x7a
bl sub_0807CBD0
@@ -5583,7 +5583,7 @@ _0804D96A:
movs r0, #1
pop {r4, r5, pc}
.align 2, 0
_0804D970: .4byte gUnk_02034350
_0804D970: .4byte gRoomVars
_0804D974: .4byte gUnk_080EB5D4
_0804D978: .4byte sub_0804D9B0
@@ -5707,14 +5707,14 @@ sub_0804DA2C: @ 0x0804DA2C
adds r1, r0, #0
cmp r1, #0
bne _0804DA40
ldr r0, _0804DA44 @ =gUnk_02034350
ldr r0, _0804DA44 @ =gRoomVars
str r1, [r0, #0x6c]
str r1, [r0, #0x74]
_0804DA40:
movs r0, #1
pop {pc}
.align 2, 0
_0804DA44: .4byte gUnk_02034350
_0804DA44: .4byte gRoomVars
thumb_func_start sub_0804DA48
sub_0804DA48: @ 0x0804DA48
@@ -6021,14 +6021,14 @@ sub_0804DBC0: @ 0x0804DBC0
bl sub_0807CBD0
cmp r0, #0
beq _0804DBD2
ldr r1, _0804DBD8 @ =gUnk_02034350
ldr r1, _0804DBD8 @ =gRoomVars
movs r0, #0
str r0, [r1, #0x74]
_0804DBD2:
movs r0, #1
pop {pc}
.align 2, 0
_0804DBD8: .4byte gUnk_02034350
_0804DBD8: .4byte gRoomVars
thumb_func_start sub_0804DBDC
sub_0804DBDC: @ 0x0804DBDC
@@ -6085,7 +6085,7 @@ sub_0804DC28: @ 0x0804DC28
bl GetProgressFlag
cmp r0, #0
beq _0804DC3E
ldr r0, _0804DC44 @ =gUnk_02034350
ldr r0, _0804DC44 @ =gRoomVars
ldr r1, _0804DC48 @ =gUnk_080ED1E4
str r1, [r0, #0x6c]
movs r1, #0
@@ -6094,7 +6094,7 @@ _0804DC3E:
movs r0, #1
pop {pc}
.align 2, 0
_0804DC44: .4byte gUnk_02034350
_0804DC44: .4byte gRoomVars
_0804DC48: .4byte gUnk_080ED1E4
thumb_func_start sub_0804DC4C
@@ -6334,7 +6334,7 @@ sub_0804DD18: @ 0x0804DD18
bl sub_0807CBD0
cmp r0, #0
beq _0804DD2C
ldr r1, _0804DD30 @ =gUnk_02034350
ldr r1, _0804DD30 @ =gRoomVars
movs r0, #0
str r0, [r1, #0x74]
str r0, [r1, #0x6c]
@@ -6342,7 +6342,7 @@ _0804DD2C:
movs r0, #1
pop {pc}
.align 2, 0
_0804DD30: .4byte gUnk_02034350
_0804DD30: .4byte gRoomVars
thumb_func_start sub_0804DD34
sub_0804DD34: @ 0x0804DD34
@@ -6389,14 +6389,14 @@ sub_0804DD78: @ 0x0804DD78
bl sub_0807CBD0
cmp r0, #0
beq _0804DD8A
ldr r1, _0804DD90 @ =gUnk_02034350
ldr r1, _0804DD90 @ =gRoomVars
movs r0, #0
str r0, [r1, #0x74]
_0804DD8A:
movs r0, #1
pop {pc}
.align 2, 0
_0804DD90: .4byte gUnk_02034350
_0804DD90: .4byte gRoomVars
thumb_func_start sub_0804DD94
sub_0804DD94: @ 0x0804DD94
@@ -7057,14 +7057,14 @@ sub_0804E25C: @ 0x0804E25C
bl GetInventoryValue
cmp r0, #0
beq _0804E26E
ldr r1, _0804E274 @ =gUnk_02034350
ldr r1, _0804E274 @ =gRoomVars
ldr r0, _0804E278 @ =gUnk_080F09A0
str r0, [r1, #0x70]
_0804E26E:
movs r0, #1
pop {pc}
.align 2, 0
_0804E274: .4byte gUnk_02034350
_0804E274: .4byte gRoomVars
_0804E278: .4byte gUnk_080F09A0
thumb_func_start sub_0804E27C
@@ -8005,21 +8005,21 @@ sub_0804E998: @ 0x0804E998
bl sub_0807CBD0
cmp r0, #0
bne _0804E9BC
ldr r1, _0804E9B4 @ =gUnk_02034350
ldr r1, _0804E9B4 @ =gRoomVars
ldr r0, _0804E9B8 @ =gUnk_080F3EA4
b _0804E9C0
.align 2, 0
_0804E9B4: .4byte gUnk_02034350
_0804E9B4: .4byte gRoomVars
_0804E9B8: .4byte gUnk_080F3EA4
_0804E9BC:
ldr r1, _0804E9C8 @ =gUnk_02034350
ldr r1, _0804E9C8 @ =gRoomVars
ldr r0, _0804E9CC @ =gUnk_080F3D44
_0804E9C0:
str r0, [r1, #0x74]
movs r0, #1
pop {pc}
.align 2, 0
_0804E9C8: .4byte gUnk_02034350
_0804E9C8: .4byte gRoomVars
_0804E9CC: .4byte gUnk_080F3D44
thumb_func_start sub_0804E9D0
@@ -8343,7 +8343,7 @@ sub_0804EBDC: @ 0x0804EBDC
bl GetProgressFlag
cmp r0, #0
beq _0804EBF2
ldr r0, _0804EBF8 @ =gUnk_02034350
ldr r0, _0804EBF8 @ =gRoomVars
ldr r1, _0804EBFC @ =gUnk_080F4EB0
str r1, [r0, #0x6c]
movs r1, #0
@@ -8352,7 +8352,7 @@ _0804EBF2:
movs r0, #1
pop {pc}
.align 2, 0
_0804EBF8: .4byte gUnk_02034350
_0804EBF8: .4byte gRoomVars
_0804EBFC: .4byte gUnk_080F4EB0
thumb_func_start sub_0804EC00
@@ -8454,7 +8454,7 @@ sub_0804ECBC: @ 0x0804ECBC
bl GetProgressFlag
cmp r0, #0
beq _0804ECDA
ldr r1, _0804ECE0 @ =gUnk_02034350
ldr r1, _0804ECE0 @ =gRoomVars
ldr r0, _0804ECE4 @ =gUnk_080F5348
str r0, [r1, #0x6c]
adds r2, r1, #0
@@ -8467,7 +8467,7 @@ _0804ECDA:
movs r0, #1
pop {pc}
.align 2, 0
_0804ECE0: .4byte gUnk_02034350
_0804ECE0: .4byte gRoomVars
_0804ECE4: .4byte gUnk_080F5348
_0804ECE8: .4byte sub_0804ED18
@@ -9359,14 +9359,14 @@ sub_0804F308: @ 0x0804F308
bl GetInventoryValue
cmp r0, #0
bne _0804F324
ldr r1, _0804F328 @ =gUnk_02034350
ldr r1, _0804F328 @ =gRoomVars
ldr r0, _0804F32C @ =gUnk_080F7680
str r0, [r1, #0x74]
_0804F324:
movs r0, #1
pop {pc}
.align 2, 0
_0804F328: .4byte gUnk_02034350
_0804F328: .4byte gRoomVars
_0804F32C: .4byte gUnk_080F7680
thumb_func_start sub_0804F330
@@ -9513,7 +9513,7 @@ sub_0804F468: @ 0x0804F468
bl GetInventoryValue
cmp r0, #0
bne _0804F48A
ldr r0, _0804F4D0 @ =gUnk_02034350
ldr r0, _0804F4D0 @ =gRoomVars
ldr r1, _0804F4D4 @ =gUnk_080F7CD0
str r1, [r0, #0x6c]
adds r0, #0x88
@@ -9533,7 +9533,7 @@ _0804F48A:
adds r3, r0, #0
cmp r3, #0
bne _0804F4BA
ldr r1, _0804F4D0 @ =gUnk_02034350
ldr r1, _0804F4D0 @ =gRoomVars
ldr r0, _0804F4DC @ =gUnk_080F7C80
str r0, [r1, #0x6c]
adds r2, r1, #0
@@ -9552,7 +9552,7 @@ _0804F4CA:
movs r0, #1
pop {pc}
.align 2, 0
_0804F4D0: .4byte gUnk_02034350
_0804F4D0: .4byte gRoomVars
_0804F4D4: .4byte gUnk_080F7CD0
_0804F4D8: .4byte sub_0804F5E8
_0804F4DC: .4byte gUnk_080F7C80
@@ -10661,14 +10661,14 @@ sub_0804FC4C: @ 0x0804FC4C
bl sub_0801E7F4
cmp r0, #0
bne _0804FC5E
ldr r1, _0804FC64 @ =gUnk_02034350
ldr r1, _0804FC64 @ =gRoomVars
ldr r0, _0804FC68 @ =gUnk_080F9BF8
str r0, [r1, #0x6c]
_0804FC5E:
movs r0, #1
pop {pc}
.align 2, 0
_0804FC64: .4byte gUnk_02034350
_0804FC64: .4byte gRoomVars
_0804FC68: .4byte gUnk_080F9BF8
thumb_func_start sub_0804FC6C
@@ -11083,7 +11083,7 @@ sub_0804FDE0: @ 0x0804FDE0
bl GetProgressFlag
cmp r0, #0
beq _0804FDF6
ldr r0, _0804FDFC @ =gUnk_02034350
ldr r0, _0804FDFC @ =gRoomVars
ldr r1, _0804FE00 @ =gUnk_080FAD48
str r1, [r0, #0x6c]
movs r1, #0
@@ -11092,7 +11092,7 @@ _0804FDF6:
movs r0, #1
pop {pc}
.align 2, 0
_0804FDFC: .4byte gUnk_02034350
_0804FDFC: .4byte gRoomVars
_0804FE00: .4byte gUnk_080FAD48
thumb_func_start sub_0804FE04
asm/code_08050038.s
+34 -34
View File
@@ -57,7 +57,7 @@ _0805007E:
ldr r1, _080500E4 @ =gUnk_03000000
movs r0, #1
strb r0, [r1, #2]
ldr r2, _080500E8 @ =gLCDControls
ldr r2, _080500E8 @ =gScreen
ldrh r0, [r2, #0x14]
movs r1, #0x40
orrs r0, r1
@@ -100,7 +100,7 @@ _080500E0:
pop {r4, r5, pc}
.align 2, 0
_080500E4: .4byte gUnk_03000000
_080500E8: .4byte gLCDControls
_080500E8: .4byte gScreen
_080500EC: .4byte 0x0000FFFB
_080500F0: .4byte gUnk_0200B644
@@ -296,7 +296,7 @@ sub_08050230: @ 0x08050230
movs r0, #0xf
subs r2, r0, r2
_0805024A:
ldr r3, _08050264 @ =gLCDControls
ldr r3, _08050264 @ =gScreen
ldr r1, _08050268 @ =gUnk_080FC3C4
lsls r0, r2, #1
adds r0, r0, r1
@@ -309,7 +309,7 @@ _0805024A:
movs r0, #1
b _08050298
.align 2, 0
_08050264: .4byte gLCDControls
_08050264: .4byte gScreen
_08050268: .4byte gUnk_080FC3C4
_0805026C:
ldr r1, _0805029C @ =gUnk_03000000
@@ -440,7 +440,7 @@ sub_08050318: @ 0x08050318
beq _08050368
bl PlaySFX
_08050368:
ldr r1, _08050380 @ =gLCDControls
ldr r1, _08050380 @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
add sp, #0x18
@@ -449,7 +449,7 @@ _08050368:
_08050374: .4byte gUnk_080FC844
_08050378: .4byte gUnk_020227E8
_0805037C: .4byte gUnk_080FC85C
_08050380: .4byte gLCDControls
_08050380: .4byte gScreen
thumb_func_start sub_08050384
sub_08050384: @ 0x08050384
@@ -461,25 +461,25 @@ sub_08050384: @ 0x08050384
movs r1, #0x80
lsls r1, r1, #4
bl sub_0801D630
ldr r1, _080503A4 @ =gLCDControls
ldr r1, _080503A4 @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
pop {pc}
.align 2, 0
_080503A0: .4byte gUnk_02034CB0
_080503A4: .4byte gLCDControls
_080503A4: .4byte gScreen
thumb_func_start sub_080503A8
sub_080503A8: @ 0x080503A8
push {lr}
bl sub_0801D7EC
ldr r1, _080503B8 @ =gLCDControls
ldr r1, _080503B8 @ =gScreen
movs r0, #1
strh r0, [r1, #0x1a]
strh r0, [r1, #0x26]
pop {pc}
.align 2, 0
_080503B8: .4byte gLCDControls
_080503B8: .4byte gScreen
thumb_func_start sub_080503BC
sub_080503BC: @ 0x080503BC
@@ -574,7 +574,7 @@ sub_08050450: @ 0x08050450
beq _0805048A
movs r0, #0
strb r1, [r4, #2]
ldr r1, _080504E4 @ =gLCDControls
ldr r1, _080504E4 @ =gScreen
strh r0, [r1, #0xa]
strh r0, [r1, #0xc]
strh r0, [r1, #0x16]
@@ -618,7 +618,7 @@ _080504D4:
_080504D8: .4byte gUnk_080FC8A4
_080504DC: .4byte gUnk_03001000
_080504E0: .4byte gUnk_02032EC0
_080504E4: .4byte gLCDControls
_080504E4: .4byte gScreen
_080504E8: .4byte gUnk_02000080
_080504EC: .4byte gUnk_080FC8B0
_080504F0: .4byte gUnk_02019EE0
@@ -691,7 +691,7 @@ _08050586:
ldr r0, _080505EC @ =gUnk_080FC8D0
bl sub_080A70AC
bl sub_080507FC
ldr r1, _080505F0 @ =gLCDControls
ldr r1, _080505F0 @ =gScreen
ldrh r2, [r1]
movs r3, #0xf8
lsls r3, r3, #5
@@ -724,7 +724,7 @@ _080505E0: .4byte gUnk_02019EE0
_080505E4: .4byte 0x00000E28
_080505E8: .4byte gUnk_02032EC0
_080505EC: .4byte gUnk_080FC8D0
_080505F0: .4byte gLCDControls
_080505F0: .4byte gScreen
_080505F4: .4byte 0x00001E0B
_080505F8: .4byte 0x00000844
_080505FC: .4byte 0x00000A0F
@@ -1400,14 +1400,14 @@ sub_08050AFC: @ 0x08050AFC
adds r0, r5, r1
bl sub_08050B3C
_08050B28:
ldr r1, _08050B38 @ =gLCDControls
ldr r1, _08050B38 @ =gScreen
movs r0, #1
strh r0, [r1, #0x1a]
pop {r4, r5, pc}
.align 2, 0
_08050B30: .4byte gUnk_02021F30
_08050B34: .4byte gUnk_02019EE0
_08050B38: .4byte gLCDControls
_08050B38: .4byte gScreen
thumb_func_start sub_08050B3C
sub_08050B3C: @ 0x08050B3C
@@ -2100,7 +2100,7 @@ sub_08051090: @ 0x08051090
bl sub_08050790
bl sub_0805070C
bl sub_08051458
ldr r1, _080510B4 @ =gLCDControls
ldr r1, _080510B4 @ =gScreen
movs r0, #0xff
strh r0, [r1, #0x18]
strh r0, [r1, #0x24]
@@ -2108,7 +2108,7 @@ sub_08051090: @ 0x08051090
bl sub_080A7114
pop {pc}
.align 2, 0
_080510B4: .4byte gLCDControls
_080510B4: .4byte gScreen
thumb_func_start sub_080510B8
sub_080510B8: @ 0x080510B8
@@ -3381,7 +3381,7 @@ _08051AA8: .4byte gUnk_03001000
InitializeNewRoom: @ 0x08051AAC
push {lr}
bl sub_0805E5A8
ldr r1, _08051AE4 @ =gLCDControls
ldr r1, _08051AE4 @ =gScreen
movs r2, #0
movs r0, #0xba
lsls r0, r0, #5
@@ -3401,7 +3401,7 @@ InitializeNewRoom: @ 0x08051AAC
bl sub_0801855C
pop {pc}
.align 2, 0
_08051AE4: .4byte gLCDControls
_08051AE4: .4byte gScreen
_08051AE8: .4byte gUnk_03001000
_08051AEC: .4byte gUnk_030010A0
@@ -3473,7 +3473,7 @@ _08051B5A:
_08051B96:
bl sub_08052BF8
bl sub_08053178
ldr r0, _08051BCC @ =gUnk_02034350
ldr r0, _08051BCC @ =gRoomVars
ldrb r0, [r0]
cmp r0, #0
bne _08051BAE
@@ -3490,7 +3490,7 @@ _08051BBC: .4byte 0x00000864
_08051BC0: .4byte 0x800B0000
_08051BC4: .4byte gUnk_03001000
_08051BC8: .4byte gUnk_02034490
_08051BCC: .4byte gUnk_02034350
_08051BCC: .4byte gRoomVars
thumb_func_start sub_08051BD0
sub_08051BD0: @ 0x08051BD0
@@ -3677,7 +3677,7 @@ _08051D94: .4byte gUnk_02000070
sub_08051D98: @ 0x08051D98
push {lr}
bl sub_08052EA0
ldr r1, _08051DC8 @ =gUnk_02034350
ldr r1, _08051DC8 @ =gRoomVars
movs r0, #1
strb r0, [r1]
bl sub_0805E9A8
@@ -3691,7 +3691,7 @@ sub_08051D98: @ 0x08051D98
bl sub_08078A90
pop {pc}
.align 2, 0
_08051DC8: .4byte gUnk_02034350
_08051DC8: .4byte gRoomVars
thumb_func_start sub_08051DCC
sub_08051DCC: @ 0x08051DCC
@@ -3920,7 +3920,7 @@ sub_08051F9C: @ 0x08051F9C
push {r6}
adds r6, r2, #0
mov r8, r3
ldr r5, _08051FE0 @ =gLCDControls
ldr r5, _08051FE0 @ =gScreen
ldrh r2, [r5]
movs r4, #0xc0
lsls r4, r4, #7
@@ -3947,7 +3947,7 @@ sub_08051F9C: @ 0x08051F9C
mov r8, r3
pop {r4, r5, r6, pc}
.align 2, 0
_08051FE0: .4byte gLCDControls
_08051FE0: .4byte gScreen
_08051FE4: .4byte gRoomControls
_08051FE8: .4byte gUnk_02000070
_08051FEC: .4byte gUnk_0200B644
@@ -4003,7 +4003,7 @@ sub_08052010: @ 0x08052010
ldr r0, _08052084 @ =gUnk_02000080
movs r1, #0x30
bl sub_0801D630
ldr r1, _08052088 @ =gLCDControls
ldr r1, _08052088 @ =gScreen
ldrh r2, [r1]
movs r3, #0x80
lsls r3, r3, #5
@@ -4022,7 +4022,7 @@ sub_08052010: @ 0x08052010
_0805207C: .4byte gUnk_02021F30
_08052080: .4byte gUnk_020344B0
_08052084: .4byte gUnk_02000080
_08052088: .4byte gLCDControls
_08052088: .4byte gScreen
_0805208C: .4byte 0x00001C01
_08052090: .4byte 0x00001D05
@@ -4130,7 +4130,7 @@ _08052158:
movs r0, #0
movs r1, #0
bl sub_08052418
ldr r2, _08052190 @ =gLCDControls
ldr r2, _08052190 @ =gScreen
ldrh r0, [r2]
movs r3, #0xc0
lsls r3, r3, #3
@@ -4144,7 +4144,7 @@ _08052158:
bl DoFade
b _0805219C
.align 2, 0
_08052190: .4byte gLCDControls
_08052190: .4byte gScreen
_08052194: .4byte 0x0000FFFF
_08052198:
subs r0, #1
@@ -4306,7 +4306,7 @@ _080522BC:
.align 2, 0
_080522D0: .4byte gUnk_03000FF0
_080522D4:
ldr r2, _080522EC @ =gLCDControls
ldr r2, _080522EC @ =gScreen
ldrh r1, [r2]
ldr r0, _080522F0 @ =0x0000FDFF
ands r0, r1
@@ -4317,7 +4317,7 @@ _080522D4:
_080522E8:
pop {r4, pc}
.align 2, 0
_080522EC: .4byte gLCDControls
_080522EC: .4byte gScreen
_080522F0: .4byte 0x0000FDFF
thumb_func_start sub_080522F4
@@ -4345,7 +4345,7 @@ sub_080522F4: @ 0x080522F4
.align 2, 0
_08052320: .4byte gUnk_02000080
_08052324:
ldr r2, _08052340 @ =gLCDControls
ldr r2, _08052340 @ =gScreen
ldrh r1, [r2]
movs r4, #0x80
lsls r4, r4, #2
@@ -4359,7 +4359,7 @@ _08052324:
strh r0, [r3, #8]
b _080523CC
.align 2, 0
_08052340: .4byte gLCDControls
_08052340: .4byte gScreen
_08052344:
ldrb r4, [r3, #3]
ldr r0, _08052358 @ =gUnk_03000FF0
asm/code_080526F8.s
+24 -24
View File
@@ -993,7 +993,7 @@ _08052E9C: .4byte gUnk_02033ACC
thumb_func_start sub_08052EA0
sub_08052EA0: @ 0x08052EA0
push {r4, lr}
ldr r4, _08052EE4 @ =gUnk_02034350
ldr r4, _08052EE4 @ =gRoomVars
adds r0, r4, #0
movs r1, #0xcc
bl sub_0801D630
@@ -1020,7 +1020,7 @@ sub_08052EA0: @ 0x08052EA0
bl sub_080530C8
pop {r4, pc}
.align 2, 0
_08052EE4: .4byte gUnk_02034350
_08052EE4: .4byte gRoomVars
_08052EE8: .4byte gUnk_02033A90
_08052EEC: .4byte gUnk_08127D30
_08052EF0: .4byte gRoomControls
@@ -1056,7 +1056,7 @@ sub_08052F1C: @ 0x08052F1C
ands r0, r1
cmp r0, #0
beq _08052FCC
ldr r0, _08052F50 @ =gUnk_02034350
ldr r0, _08052F50 @ =gRoomVars
ldrb r0, [r0]
cmp r0, #0
beq _08052FCC
@@ -1074,7 +1074,7 @@ sub_08052F1C: @ 0x08052F1C
b _08052F72
.align 2, 0
_08052F4C: .4byte gUnk_02033A90
_08052F50: .4byte gUnk_02034350
_08052F50: .4byte gRoomVars
_08052F54: .4byte gRoomControls
_08052F58:
cmp r1, #2
@@ -1171,7 +1171,7 @@ sub_08052FF4: @ 0x08052FF4
ldr r0, _0805306C @ =gRoomControls
strb r6, [r0, #4]
strb r4, [r0, #5]
ldr r1, _08053070 @ =gLCDControls
ldr r1, _08053070 @ =gScreen
movs r0, #0xba
lsls r0, r0, #5
strh r0, [r1]
@@ -1221,7 +1221,7 @@ sub_08052FF4: @ 0x08052FF4
pop {r4, r5, r6, pc}
.align 2, 0
_0805306C: .4byte gRoomControls
_08053070: .4byte gLCDControls
_08053070: .4byte gScreen
_08053074: .4byte gUnk_020342CC
_08053078: .4byte gUnk_0811E214
_0805307C: .4byte gUnk_0810246C
@@ -1233,7 +1233,7 @@ _08053088: .4byte gUnk_080B755C
sub_0805308C: @ 0x0805308C
push {lr}
adds r1, r0, #0
ldr r2, _080530AC @ =gUnk_02034350
ldr r2, _080530AC @ =gRoomVars
movs r3, #0xc
ldrsh r0, [r2, r3]
adds r1, r1, r0
@@ -1250,7 +1250,7 @@ _080530A8:
strh r1, [r2, #0xc]
pop {pc}
.align 2, 0
_080530AC: .4byte gUnk_02034350
_080530AC: .4byte gRoomVars
thumb_func_start sub_080530B0
sub_080530B0: @ 0x080530B0
@@ -1388,7 +1388,7 @@ sub_08053178: @ 0x08053178
adds r0, r4, #0
movs r1, #8
bl sub_0805EA2C
ldr r0, _080531F0 @ =gUnk_02034350
ldr r0, _080531F0 @ =gRoomVars
ldrb r0, [r0]
cmp r0, #0
bne _080531DC
@@ -1412,7 +1412,7 @@ _080531E6:
.align 2, 0
_080531E8: .4byte gUnk_030010A0
_080531EC: .4byte gUnk_02033A90
_080531F0: .4byte gUnk_02034350
_080531F0: .4byte gRoomVars
_080531F4: .4byte gUnk_02002AA0
thumb_func_start sub_080531F8
@@ -1901,7 +1901,7 @@ sub_080535AC: @ 0x080535AC
strb r1, [r0, #6]
ldr r0, _080535E4 @ =gUnk_02000070
strb r1, [r0]
ldr r2, _080535E8 @ =gLCDControls
ldr r2, _080535E8 @ =gScreen
ldrh r1, [r2]
ldr r0, _080535EC @ =0x0000FEFF
ands r0, r1
@@ -1916,7 +1916,7 @@ sub_080535AC: @ 0x080535AC
_080535DC: .4byte gUnk_02000080
_080535E0: .4byte gUnk_02032EC0
_080535E4: .4byte gUnk_02000070
_080535E8: .4byte gLCDControls
_080535E8: .4byte gScreen
_080535EC: .4byte 0x0000FEFF
_080535F0: .4byte gUnk_080FCB94
@@ -2140,7 +2140,7 @@ sub_08053758: @ 0x08053758
bl sub_0801B170
movs r0, #0
bl sub_0801DA90
ldr r2, _080537F0 @ =gLCDControls
ldr r2, _080537F0 @ =gScreen
movs r0, #0x99
lsls r0, r0, #6
strh r0, [r2]
@@ -2182,7 +2182,7 @@ _080537E0: .4byte gUnk_02032EC0
_080537E4: .4byte gUnk_02025EB0
_080537E8: .4byte gUnk_0200B650
_080537EC: .4byte gRoomControls
_080537F0: .4byte gLCDControls
_080537F0: .4byte gScreen
_080537F4: .4byte 0x00002244
_080537F8: .4byte 0x00001C4E
_080537FC: .4byte 0x00001DC1
@@ -2228,7 +2228,7 @@ sub_08053800: @ 0x08053800
ldr r1, [r4]
adds r0, r5, #0
bl sub_0805F46C
ldr r2, _08053890 @ =gLCDControls
ldr r2, _08053890 @ =gScreen
movs r0, #1
strh r0, [r2, #0x1a]
adds r1, r2, #0
@@ -2253,7 +2253,7 @@ _08053880: .4byte gUnk_02000080
_08053884: .4byte gUnk_080FCCB4
_08053888: .4byte gUnk_02021F30
_0805388C: .4byte 0x00000F01
_08053890: .4byte gLCDControls
_08053890: .4byte gScreen
thumb_func_start sub_08053894
sub_08053894: @ 0x08053894
@@ -2289,7 +2289,7 @@ _080538BC:
adds r1, #1
strb r1, [r4, #7]
lsls r1, r1, #0x18
ldr r3, _08053900 @ =gLCDControls
ldr r3, _08053900 @ =gScreen
lsrs r2, r1, #0x10
lsrs r1, r1, #0x19
movs r0, #0x10
@@ -2311,7 +2311,7 @@ _080538F8:
pop {r4, pc}
.align 2, 0
_080538FC: .4byte gUnk_030010A0
_08053900: .4byte gLCDControls
_08053900: .4byte gScreen
thumb_func_start sub_08053904
sub_08053904: @ 0x08053904
@@ -2347,7 +2347,7 @@ _0805392C:
adds r1, #1
strb r1, [r4, #7]
lsls r1, r1, #0x18
ldr r3, _08053970 @ =gLCDControls
ldr r3, _08053970 @ =gScreen
lsrs r2, r1, #0x10
lsrs r1, r1, #0x19
movs r0, #0x10
@@ -2369,7 +2369,7 @@ _08053968:
pop {r4, pc}
.align 2, 0
_0805396C: .4byte gUnk_030010A0
_08053970: .4byte gLCDControls
_08053970: .4byte gScreen
thumb_func_start sub_08053974
sub_08053974: @ 0x08053974
@@ -2824,7 +2824,7 @@ sub_08053CC8: @ 0x08053CC8
bl LoadRoomEntityList
movs r5, #1
strb r5, [r6, #6]
ldr r2, _08053D28 @ =gLCDControls
ldr r2, _08053D28 @ =gScreen
ldrh r1, [r2]
ldr r0, _08053D2C @ =0x0000FEFF
ands r0, r1
@@ -2843,7 +2843,7 @@ _08053D1E:
.align 2, 0
_08053D20: .4byte gUnk_02000080
_08053D24: .4byte gUnk_080FCF04
_08053D28: .4byte gLCDControls
_08053D28: .4byte gScreen
_08053D2C: .4byte 0x0000FEFF
_08053D30: .4byte gUnk_02000070
@@ -3021,7 +3021,7 @@ sub_08053E74: @ 0x08053E74
ldrb r0, [r4, #6]
adds r0, #1
strb r0, [r4, #6]
ldr r2, _08053EB8 @ =gLCDControls
ldr r2, _08053EB8 @ =gScreen
ldrh r1, [r2]
ldr r0, _08053EBC @ =0x0000FEFF
ands r0, r1
@@ -3038,7 +3038,7 @@ sub_08053E74: @ 0x08053E74
.align 2, 0
_08053EB0: .4byte gUnk_080FCFB8
_08053EB4: .4byte gUnk_02000080
_08053EB8: .4byte gLCDControls
_08053EB8: .4byte gScreen
_08053EBC: .4byte 0x0000FEFF
_08053EC0: .4byte gUnk_02000070
asm/code_0805436C.s
+16 -16
View File
@@ -308,21 +308,21 @@ _08054560: .4byte gUnk_02034398
thumb_func_start sub_08054564
sub_08054564: @ 0x08054564
ldr r1, _0805456C @ =gUnk_02034350
ldr r1, _0805456C @ =gRoomVars
movs r0, #1
strb r0, [r1, #2]
bx lr
.align 2, 0
_0805456C: .4byte gUnk_02034350
_0805456C: .4byte gRoomVars
thumb_func_start sub_08054570
sub_08054570: @ 0x08054570
ldr r1, _08054578 @ =gUnk_02034350
ldr r1, _08054578 @ =gRoomVars
movs r0, #0
strb r0, [r1, #2]
bx lr
.align 2, 0
_08054578: .4byte gUnk_02034350
_08054578: .4byte gRoomVars
thumb_func_start sub_0805457C
sub_0805457C: @ 0x0805457C
@@ -330,7 +330,7 @@ sub_0805457C: @ 0x0805457C
sub sp, #0x20
adds r6, r0, #0
adds r3, r1, #0
ldr r0, _080545A4 @ =gUnk_02034350
ldr r0, _080545A4 @ =gRoomVars
ldrb r1, [r0, #2]
adds r5, r0, #0
cmp r1, #1
@@ -347,7 +347,7 @@ _08054590:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080545A4: .4byte gUnk_02034350
_080545A4: .4byte gRoomVars
_080545A8: .4byte gUnk_08001A1C
_080545AC: .4byte _080545B0
_080545B0: @ jump table
@@ -594,7 +594,7 @@ _080547A6:
bl GetInventoryValue
cmp r0, #0
beq _08054790
ldr r0, _080547FC @ =gUnk_02034350
ldr r0, _080547FC @ =gRoomVars
ldrb r0, [r0, #5]
cmp r0, #3
bhi _08054790
@@ -632,7 +632,7 @@ _080547DA:
movs r0, #1
b _0805480A
.align 2, 0
_080547FC: .4byte gUnk_02034350
_080547FC: .4byte gRoomVars
_08054800: .4byte gUnk_080FE1DD
_08054804: .4byte gLinkEntity
_08054808:
@@ -854,7 +854,7 @@ _080549BC:
movs r0, #1
strb r0, [r1]
_080549CE:
ldr r2, _08054A04 @ =gLCDControls
ldr r2, _08054A04 @ =gScreen
ldrh r1, [r2]
ldr r0, _08054A08 @ =0x00001FFF
ands r0, r1
@@ -879,7 +879,7 @@ _080549F4:
pop {r4, r5, r6, pc}
.align 2, 0
_08054A00: .4byte gUnk_02000070
_08054A04: .4byte gLCDControls
_08054A04: .4byte gScreen
_08054A08: .4byte 0x00001FFF
_08054A0C: .4byte gRoomControls
_08054A10: .4byte gUnk_02032EC0
@@ -1871,7 +1871,7 @@ sub_08055184: @ 0x08055184
movs r1, #0
ldrsh r0, [r4, r1]
bl sub_0801D7EC
ldr r2, _08055214 @ =gLCDControls
ldr r2, _08055214 @ =gScreen
ldrh r0, [r4, #2]
movs r6, #0
movs r3, #0
@@ -1922,7 +1922,7 @@ sub_08055184: @ 0x08055184
.align 2, 0
_0805520C: .4byte gUnk_02000080
_08055210: .4byte gUnk_080FF1D4
_08055214: .4byte gLCDControls
_08055214: .4byte gScreen
_08055218: .4byte 0x00001E05
_0805521C: .4byte 0x00003648
_08055220: .4byte gUnk_02000070
@@ -1984,7 +1984,7 @@ _08055274:
ldr r0, _080552AC @ =0x0000FFFF
cmp r1, r0
beq _080552B4
ldr r1, _080552B0 @ =gLCDControls
ldr r1, _080552B0 @ =gScreen
adds r0, r2, #1
strh r0, [r3, #0xa]
lsls r0, r2, #1
@@ -1997,9 +1997,9 @@ _08055274:
_080552A4: .4byte gUnk_030010A0
_080552A8: .4byte gUnk_080FF204
_080552AC: .4byte 0x0000FFFF
_080552B0: .4byte gLCDControls
_080552B0: .4byte gScreen
_080552B4:
ldr r1, _080552D8 @ =gLCDControls
ldr r1, _080552D8 @ =gScreen
ldrh r2, [r1]
ldr r0, _080552DC @ =0x0000F7FF
ands r0, r2
@@ -2018,7 +2018,7 @@ _080552B4:
_080552D6:
pop {r4, pc}
.align 2, 0
_080552D8: .4byte gLCDControls
_080552D8: .4byte gScreen
_080552DC: .4byte 0x0000F7FF
thumb_func_start sub_080552E0
asm/code_08055FF4.s
+8 -8
View File
@@ -205,7 +205,7 @@ sub_0805616C: @ 0x0805616C
push {lr}
ldr r0, _080561E8 @ =0x80040000
bl PlaySFX
ldr r0, _080561EC @ =gLCDControls
ldr r0, _080561EC @ =gScreen
adds r3, r0, #0
adds r3, #0x6c
ldrb r2, [r3]
@@ -273,7 +273,7 @@ _080561E6:
pop {pc}
.align 2, 0
_080561E8: .4byte 0x80040000
_080561EC: .4byte gLCDControls
_080561EC: .4byte gScreen
_080561F0: .4byte 0x040000B0
_080561F4: .4byte 0x0000C5FF
_080561F8: .4byte 0x00007FFF
@@ -286,7 +286,7 @@ sub_08056208: @ 0x08056208
push {lr}
ldr r0, _08056224 @ =0x80060000
bl PlaySFX
ldr r0, _08056228 @ =gLCDControls
ldr r0, _08056228 @ =gScreen
adds r3, r0, #0
adds r3, #0x6d
ldrb r2, [r3]
@@ -297,11 +297,11 @@ sub_08056208: @ 0x08056208
pop {pc}
.align 2, 0
_08056224: .4byte 0x80060000
_08056228: .4byte gLCDControls
_08056228: .4byte gScreen
thumb_func_start sub_0805622C
sub_0805622C: @ 0x0805622C
ldr r3, _08056248 @ =gLCDControls
ldr r3, _08056248 @ =gScreen
str r0, [r3, #0x70]
str r1, [r3, #0x74]
str r2, [r3, #0x78]
@@ -315,18 +315,18 @@ sub_0805622C: @ 0x0805622C
strb r0, [r1]
bx lr
.align 2, 0
_08056248: .4byte gLCDControls
_08056248: .4byte gScreen
_0805624C: .4byte gUnk_03003DE4
thumb_func_start sub_08056250
sub_08056250: @ 0x08056250
ldr r0, _0805625C @ =gLCDControls
ldr r0, _0805625C @ =gScreen
adds r0, #0x6c
movs r1, #0
strb r1, [r0]
bx lr
.align 2, 0
_0805625C: .4byte gLCDControls
_0805625C: .4byte gScreen
thumb_func_start sub_08056260
sub_08056260: @ 0x08056260
asm/code_08056418.s
+221 -221
View File
File diff suppressed because it is too large Load Diff
asm/code_0805E3B0.s
+2 -2
View File
@@ -324,7 +324,7 @@ _0805E5BC: .4byte gUnk_03003DC0
thumb_func_start sub_0805E5C0
sub_0805E5C0: @ 0x0805E5C0
push {lr}
ldr r0, _0805E5F0 @ =gUnk_02034350
ldr r0, _0805E5F0 @ =gRoomVars
ldrb r1, [r0, #4]
movs r2, #0
strb r1, [r0, #5]
@@ -340,7 +340,7 @@ sub_0805E5C0: @ 0x0805E5C0
bl sub_0805EE88
pop {pc}
.align 2, 0
_0805E5F0: .4byte gUnk_02034350
_0805E5F0: .4byte gRoomVars
_0805E5F4: .4byte gUnk_03005F40
thumb_func_start sub_0805E5F8
asm/code_0805E744.s
+8 -8
View File
@@ -2567,7 +2567,7 @@ sub_0805FA04: @ 0x0805FA04
movs r1, #0x80
lsls r1, r1, #5
bl sub_0801D630
ldr r0, _0805FA80 @ =gLCDControls
ldr r0, _0805FA80 @ =gScreen
movs r2, #0
movs r1, #0x94
lsls r1, r1, #4
@@ -2606,7 +2606,7 @@ sub_0805FA04: @ 0x0805FA04
.align 2, 0
_0805FA78: .4byte gUnk_02034CB0
_0805FA7C: .4byte gUnk_02001A40
_0805FA80: .4byte gLCDControls
_0805FA80: .4byte gScreen
_0805FA84: .4byte 0x00001E0F
_0805FA88: .4byte gUnk_02032EC0
_0805FA8C: .4byte gUnk_02000080
@@ -2664,7 +2664,7 @@ _0805FAE8:
strb r1, [r0, #0x10]
cmp r1, #0
bne _0805FB10
ldr r0, _0805FB08 @ =gLCDControls
ldr r0, _0805FB08 @ =gScreen
ldr r1, _0805FB0C @ =0x00001F0C
strh r1, [r0, #8]
subs r1, #0xfd
@@ -2672,17 +2672,17 @@ _0805FAE8:
b _0805FBA4
.align 2, 0
_0805FB04: .4byte gUnk_02000080
_0805FB08: .4byte gLCDControls
_0805FB08: .4byte gScreen
_0805FB0C: .4byte 0x00001F0C
_0805FB10:
ldr r0, _0805FB1C @ =gLCDControls
ldr r0, _0805FB1C @ =gScreen
ldr r1, _0805FB20 @ =0x00001F0F
strh r1, [r0, #8]
ldr r1, _0805FB24 @ =0x00001E0C
strh r1, [r0, #0x2c]
b _0805FBA4
.align 2, 0
_0805FB1C: .4byte gLCDControls
_0805FB1C: .4byte gScreen
_0805FB20: .4byte 0x00001F0F
_0805FB24: .4byte 0x00001E0C
_0805FB28:
@@ -2759,13 +2759,13 @@ _0805FBA4:
movs r1, #3
bl __modsi3
strb r0, [r4, #0x11]
ldr r1, _0805FBC0 @ =gLCDControls
ldr r1, _0805FBC0 @ =gScreen
movs r0, #1
strh r0, [r1, #0x32]
pop {r4, pc}
.align 2, 0
_0805FBBC: .4byte gUnk_02000080
_0805FBC0: .4byte gLCDControls
_0805FBC0: .4byte gScreen
thumb_func_start sub_0805FBC4
sub_0805FBC4: @ 0x0805FBC4
asm/code_0806FA6C.s
+4 -4
View File
@@ -1946,7 +1946,7 @@ _080708E4:
bl sub_080782C0
cmp r0, #0
beq _08070924
ldr r0, _08070920 @ =gUnk_02034350
ldr r0, _08070920 @ =gRoomVars
ldrb r0, [r0, #6]
cmp r0, #0
bne _08070902
@@ -1964,7 +1964,7 @@ _0807090C:
.align 2, 0
_08070918: .4byte gLinkState
_0807091C: .4byte 0x10000002
_08070920: .4byte gUnk_02034350
_08070920: .4byte gRoomVars
_08070924:
ldr r0, _0807094C @ =gLinkState
ldr r1, [r0, #0x30]
@@ -5632,7 +5632,7 @@ _0807254C:
strb r0, [r4, #0x18]
movs r0, #1
strb r0, [r4, #0xd]
ldr r0, _08072570 @ =gUnk_02034350
ldr r0, _08072570 @ =gRoomVars
ldrb r0, [r0]
cmp r0, #0
bne _08072588
@@ -5645,7 +5645,7 @@ _0807254C:
ldr r0, _08072578 @ =0x00000C18
b _08072580
.align 2, 0
_08072570: .4byte gUnk_02034350
_08072570: .4byte gRoomVars
_08072574: .4byte gLinkState
_08072578: .4byte 0x00000C18
_0807257C:
asm/code_08077B98.s
+6 -6
View File
@@ -931,7 +931,7 @@ _08078230:
.align 2, 0
_08078238: .4byte gUnk_0200AF00
_0807823C:
ldr r0, _0807824C @ =gUnk_02034350
ldr r0, _0807824C @ =gRoomVars
ldrb r0, [r0, #6]
ldr r6, _08078250 @ =gUnk_0200AF00
cmp r0, #0
@@ -939,7 +939,7 @@ _0807823C:
movs r4, #9
b _080782B6
.align 2, 0
_0807824C: .4byte gUnk_02034350
_0807824C: .4byte gRoomVars
_08078250: .4byte gUnk_0200AF00
_08078254:
movs r4, #6
@@ -1215,7 +1215,7 @@ _0807848E:
.align 2, 0
_080784A0: .4byte gUnk_03003DF0
_080784A4:
ldr r2, _080784B0 @ =gUnk_02034350
ldr r2, _080784B0 @ =gRoomVars
ldrb r0, [r2, #6]
cmp r0, #0
beq _080784B4
@@ -1223,7 +1223,7 @@ _080784AC:
movs r0, #0
b _080784C6
.align 2, 0
_080784B0: .4byte gUnk_02034350
_080784B0: .4byte gRoomVars
_080784B4:
adds r1, r6, #0
adds r1, #0x39
@@ -2173,7 +2173,7 @@ _08078BF0:
ands r0, r1
str r0, [r2, #0x30]
_08078BF8:
ldr r0, _08078C1C @ =gUnk_02034350
ldr r0, _08078C1C @ =gRoomVars
ldrb r0, [r0, #6]
cmp r0, #0
bne _08078C04
@@ -2191,7 +2191,7 @@ _08078C04:
pop {pc}
.align 2, 0
_08078C18: .4byte 0xFFFBFFFF
_08078C1C: .4byte gUnk_02034350
_08078C1C: .4byte gRoomVars
_08078C20: .4byte gLinkEntity
thumb_func_start sub_08078C24
asm/code_0807B9B8.s
+4 -4
View File
@@ -1242,7 +1242,7 @@ _0807C3BC:
orrs r0, r1
strh r0, [r2]
_0807C3CC:
ldr r2, _0807C3DC @ =gLCDControls
ldr r2, _0807C3DC @ =gScreen
ldrh r1, [r2]
ldr r0, _0807C3E0 @ =0x0000FDFF
ands r0, r1
@@ -1250,7 +1250,7 @@ _0807C3CC:
b _0807C444
.align 2, 0
_0807C3D8: .4byte gUnk_02025EB0
_0807C3DC: .4byte gLCDControls
_0807C3DC: .4byte gScreen
_0807C3E0: .4byte 0x0000FDFF
_0807C3E4:
ldr r0, _0807C3F8 @ =gUnk_0200B650
@@ -1283,7 +1283,7 @@ _0807C40E:
ldrh r0, [r0, #2]
strh r0, [r1]
_0807C41C:
ldr r2, _0807C458 @ =gLCDControls
ldr r2, _0807C458 @ =gScreen
ldrh r0, [r2]
movs r1, #0x80
lsls r1, r1, #4
@@ -1312,7 +1312,7 @@ _0807C444:
_0807C44C: .4byte gUnk_02025EB0
_0807C450: .4byte gUnk_080B77C0
_0807C454: .4byte gUnk_0200B650
_0807C458: .4byte gLCDControls
_0807C458: .4byte gScreen
_0807C45C: .4byte gUnk_02033A90
thumb_func_start sub_0807C460
asm/code_0807CC3C.s
+19 -19
View File
@@ -3352,7 +3352,7 @@ sub_0807E42C: @ 0x0807E42C
ldrh r6, [r0, #4]
cmp r4, #0
bne _0807E440
ldr r0, _0807E480 @ =gUnk_02034350
ldr r0, _0807E480 @ =gRoomVars
ldrb r4, [r0, #6]
ldrb r6, [r0, #7]
_0807E440:
@@ -3376,7 +3376,7 @@ _0807E456:
adds r1, r6, #0
movs r2, #0
bl sub_080A7C18
ldr r1, _0807E480 @ =gUnk_02034350
ldr r1, _0807E480 @ =gRoomVars
movs r0, #0
strb r0, [r1, #6]
strb r0, [r1, #7]
@@ -3388,7 +3388,7 @@ _0807E474:
strb r0, [r2, #7]
pop {r4, r5, r6, pc}
.align 2, 0
_0807E480: .4byte gUnk_02034350
_0807E480: .4byte gRoomVars
_0807E484: .4byte gUnk_02002A40
_0807E488: .4byte gUnk_02033280
@@ -3411,7 +3411,7 @@ _0807E4A8: .4byte gUnk_02033280
thumb_func_start sub_0807E4AC
sub_0807E4AC: @ 0x0807E4AC
ldr r0, _0807E4C4 @ =gUnk_02034350
ldr r0, _0807E4C4 @ =gRoomVars
ldrb r2, [r0, #6]
rsbs r0, r2, #0
orrs r0, r2
@@ -3424,7 +3424,7 @@ sub_0807E4AC: @ 0x0807E4AC
strb r0, [r2, #7]
bx lr
.align 2, 0
_0807E4C4: .4byte gUnk_02034350
_0807E4C4: .4byte gRoomVars
_0807E4C8: .4byte gUnk_02033280
thumb_func_start sub_0807E4CC
@@ -6166,7 +6166,7 @@ sub_0807F78C: @ 0x0807F78C
ldr r5, [r1, #4]
cmp r5, #0
bne _0807F79A
ldr r0, _0807F7BC @ =gUnk_02034350
ldr r0, _0807F7BC @ =gRoomVars
ldrb r5, [r0, #6]
_0807F79A:
adds r0, r5, #0
@@ -6184,7 +6184,7 @@ _0807F79A:
str r5, [r0, #0x10]
pop {r4, r5, r6, pc}
.align 2, 0
_0807F7BC: .4byte gUnk_02034350
_0807F7BC: .4byte gRoomVars
_0807F7C0: .4byte gTextBox
thumb_func_start sub_0807F7C4
@@ -6194,7 +6194,7 @@ sub_0807F7C4: @ 0x0807F7C4
ldr r0, [r4, #4]
cmp r0, #0
bne _0807F7D2
ldr r0, _0807F7F4 @ =gUnk_02034350
ldr r0, _0807F7F4 @ =gRoomVars
ldrb r0, [r0, #6]
_0807F7D2:
bl sub_08053FE0
@@ -6214,7 +6214,7 @@ _0807F7E4:
strb r0, [r2, #7]
pop {r4, pc}
.align 2, 0
_0807F7F4: .4byte gUnk_02034350
_0807F7F4: .4byte gRoomVars
_0807F7F8: .4byte gUnk_02002A40
_0807F7FC: .4byte gUnk_02033280
@@ -6224,7 +6224,7 @@ sub_0807F800: @ 0x0807F800
ldr r4, [r1, #4]
cmp r4, #0
bne _0807F80C
ldr r0, _0807F834 @ =gUnk_02034350
ldr r0, _0807F834 @ =gRoomVars
ldrb r4, [r0, #6]
_0807F80C:
adds r0, r4, #0
@@ -6235,7 +6235,7 @@ _0807F80C:
movs r1, #0
movs r2, #0
bl sub_080A7C18
ldr r1, _0807F834 @ =gUnk_02034350
ldr r1, _0807F834 @ =gRoomVars
movs r0, #0
strb r0, [r1, #6]
ldr r2, _0807F838 @ =gUnk_02033280
@@ -6245,7 +6245,7 @@ _0807F80C:
strb r0, [r2, #7]
pop {r4, pc}
.align 2, 0
_0807F834: .4byte gUnk_02034350
_0807F834: .4byte gRoomVars
_0807F838: .4byte gUnk_02033280
thumb_func_start sub_0807F83C
@@ -7236,7 +7236,7 @@ sub_0807FF6C: @ 0x0807FF6C
push {r4, lr}
movs r1, #1
strb r1, [r0, #3]
ldr r3, _0807FFC8 @ =gLCDControls
ldr r3, _0807FFC8 @ =gScreen
ldrh r1, [r3]
movs r2, #0x80
lsls r2, r2, #7
@@ -7277,7 +7277,7 @@ sub_0807FF6C: @ 0x0807FF6C
strb r0, [r1, #0x14]
b _0807FFD8
.align 2, 0
_0807FFC8: .4byte gLCDControls
_0807FFC8: .4byte gScreen
_0807FFCC: .4byte gUnk_03004030
_0807FFD0: .4byte gLinkEntity
_0807FFD4:
@@ -7386,7 +7386,7 @@ _0808009C:
ble _080800A8
movs r3, #0xa0
_080800A8:
ldr r2, _080800F0 @ =gLCDControls
ldr r2, _080800F0 @ =gScreen
movs r1, #0xff
ands r7, r1
lsls r0, r7, #8
@@ -7420,7 +7420,7 @@ _080800C6:
bl sub_08080C80
b _08080102
.align 2, 0
_080800F0: .4byte gLCDControls
_080800F0: .4byte gScreen
_080800F4: .4byte gUnk_08109194
_080800F8: .4byte gUnk_03004030
_080800FC:
@@ -7555,7 +7555,7 @@ _0808020C:
ble _08080214
movs r3, #0xa0
_08080214:
ldr r2, _08080260 @ =gLCDControls
ldr r2, _08080260 @ =gScreen
movs r1, #0xff
ands r7, r1
lsls r0, r7, #8
@@ -7577,7 +7577,7 @@ _08080232:
strb r0, [r5, #2]
strh r0, [r5]
bl sub_0805E5B4
ldr r1, _08080260 @ =gLCDControls
ldr r1, _08080260 @ =gScreen
ldrh r2, [r1]
ldr r0, _08080264 @ =0x0000BFFF
ands r0, r2
@@ -7594,7 +7594,7 @@ _08080232:
strh r0, [r1]
b _08080272
.align 2, 0
_08080260: .4byte gLCDControls
_08080260: .4byte gScreen
_08080264: .4byte 0x0000BFFF
_08080268:
ldr r0, _08080274 @ =gUnk_02000070
asm/code_08080974.s
+19 -19
View File
@@ -650,7 +650,7 @@ _08080F00:
ldrb r0, [r4, #0xa]
cmp r0, #0x5c
bne _08080F0E
ldr r1, _08080F1C @ =gUnk_02034350
ldr r1, _08080F1C @ =gRoomVars
ldrb r0, [r1, #4]
adds r0, #1
strb r0, [r1, #4]
@@ -660,7 +660,7 @@ _08080F0E:
pop {r4, pc}
.align 2, 0
_08080F18: .4byte gUnk_0811E7D4
_08080F1C: .4byte gUnk_02034350
_08080F1C: .4byte gRoomVars
thumb_func_start sub_08080F20
sub_08080F20: @ 0x08080F20
@@ -1965,7 +1965,7 @@ _080818C0:
strb r2, [r1]
movs r0, #3
strb r0, [r4, #0xc]
ldr r1, _080818E8 @ =gUnk_02034350
ldr r1, _080818E8 @ =gRoomVars
movs r0, #1
str r0, [r1, #0x68]
ldr r1, _080818EC @ =gLinkState
@@ -1973,7 +1973,7 @@ _080818C0:
strb r0, [r1, #0xc]
b _08081920
.align 2, 0
_080818E8: .4byte gUnk_02034350
_080818E8: .4byte gRoomVars
_080818EC: .4byte gLinkState
_080818F0:
adds r1, r4, #0
@@ -2074,7 +2074,7 @@ _080819B0: .4byte gLinkState
sub_080819B4: @ 0x080819B4
push {r4, r5, r6, lr}
adds r5, r0, #0
ldr r0, _08081A48 @ =gUnk_02034350
ldr r0, _08081A48 @ =gRoomVars
ldrb r0, [r0, #6]
cmp r0, #0
bne _080819D4
@@ -2095,7 +2095,7 @@ _080819D4:
ldr r4, _08081A50 @ =gLinkEntity
str r2, [r4, #0x74]
ldr r1, _08081A54 @ =gUnk_0200AF00
ldr r3, _08081A48 @ =gUnk_02034350
ldr r3, _08081A48 @ =gRoomVars
strb r2, [r3, #6]
adds r0, r1, #0
adds r0, #0x2c
@@ -2146,7 +2146,7 @@ _080819D4:
bl sub_08081A5C
pop {r4, r5, r6, pc}
.align 2, 0
_08081A48: .4byte gUnk_02034350
_08081A48: .4byte gRoomVars
_08081A4C: .4byte gLinkState
_08081A50: .4byte gLinkEntity
_08081A54: .4byte gUnk_0200AF00
@@ -2177,7 +2177,7 @@ _08081A7C: .4byte gUnk_03003DF0
sub_08081A80: @ 0x08081A80
push {lr}
adds r2, r0, #0
ldr r0, _08081A98 @ =gUnk_02034350
ldr r0, _08081A98 @ =gRoomVars
ldr r0, [r0, #0x68]
cmp r0, #0
bne _08081A9C
@@ -2185,7 +2185,7 @@ sub_08081A80: @ 0x08081A80
bl sub_0805E780
b _08081AAC
.align 2, 0
_08081A98: .4byte gUnk_02034350
_08081A98: .4byte gRoomVars
_08081A9C:
cmp r0, #2
bne _08081AAC
@@ -2201,7 +2201,7 @@ _08081AAC:
thumb_func_start sub_08081AB0
sub_08081AB0: @ 0x08081AB0
push {lr}
ldr r1, _08081AC4 @ =gUnk_02034350
ldr r1, _08081AC4 @ =gRoomVars
movs r0, #0
str r0, [r1, #0x68]
strb r0, [r1, #6]
@@ -2209,7 +2209,7 @@ sub_08081AB0: @ 0x08081AB0
bl sub_08078A90
pop {pc}
.align 2, 0
_08081AC4: .4byte gUnk_02034350
_08081AC4: .4byte gRoomVars
thumb_func_start sub_08081AC8
sub_08081AC8: @ 0x08081AC8
@@ -6947,7 +6947,7 @@ sub_08083EB0: @ 0x08083EB0
bl sub_0807CBE4
cmp r0, #0
beq _08083F0A
ldr r1, _08083F0C @ =gLCDControls
ldr r1, _08083F0C @ =gScreen
adds r2, r1, #0
adds r2, #0x66
movs r3, #0
@@ -6985,7 +6985,7 @@ sub_08083EB0: @ 0x08083EB0
_08083F0A:
pop {r4, pc}
.align 2, 0
_08083F0C: .4byte gLCDControls
_08083F0C: .4byte gScreen
_08083F10: .4byte gUnk_02034490
thumb_func_start sub_08083F14
@@ -7020,7 +7020,7 @@ sub_08083F14: @ 0x08083F14
adds r0, #1
strb r0, [r4, #0xf]
ands r2, r0
ldr r3, _08083F74 @ =gLCDControls
ldr r3, _08083F74 @ =gScreen
movs r0, #0x10
subs r0, r0, r2
lsls r0, r0, #8
@@ -7036,7 +7036,7 @@ sub_08083F14: @ 0x08083F14
bne _08083FE6
b _08083FCC
.align 2, 0
_08083F74: .4byte gLCDControls
_08083F74: .4byte gScreen
_08083F78:
ldr r5, _08083FA0 @ =gLinkEntity
adds r0, r4, #0
@@ -9254,7 +9254,7 @@ sub_08085028: @ 0x08085028
adds r1, #0x63
movs r0, #4
strb r0, [r1]
ldr r0, _080850A8 @ =gLCDControls
ldr r0, _080850A8 @ =gScreen
mov ip, r0
ldrh r1, [r0]
movs r2, #0x80
@@ -9304,7 +9304,7 @@ sub_08085028: @ 0x08085028
_080850A6:
pop {r4, pc}
.align 2, 0
_080850A8: .4byte gLCDControls
_080850A8: .4byte gScreen
_080850AC: .4byte gRoomControls
thumb_func_start sub_080850B0
@@ -9336,7 +9336,7 @@ sub_080850CC: @ 0x080850CC
lsls r0, r0, #0x18
cmp r0, #0
bne _080850F0
ldr r2, _080850F4 @ =gLCDControls
ldr r2, _080850F4 @ =gScreen
ldrh r1, [r2]
ldr r0, _080850F8 @ =0x0000DFFF
ands r0, r1
@@ -9346,7 +9346,7 @@ sub_080850CC: @ 0x080850CC
_080850F0:
pop {r4, pc}
.align 2, 0
_080850F4: .4byte gLCDControls
_080850F4: .4byte gScreen
_080850F8: .4byte 0x0000DFFF
thumb_func_start sub_080850FC
asm/code_080874A0.s
+90 -90
View File
@@ -1919,14 +1919,14 @@ _08088304:
ldr r1, _08088320 @ =gUnk_08120ACC
bl sub_0805F46C
_08088314:
ldr r1, _08088324 @ =gLCDControls
ldr r1, _08088324 @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
pop {r4, r5, r6, pc}
.align 2, 0
_0808831C: .4byte gUnk_08120AE4
_08088320: .4byte gUnk_08120ACC
_08088324: .4byte gLCDControls
_08088324: .4byte gScreen
thumb_func_start sub_08088328
sub_08088328: @ 0x08088328
@@ -2749,7 +2749,7 @@ sub_08088938: @ 0x08088938
lsls r1, r1, #0x10
lsrs r7, r1, #0x10
movs r4, #0
ldr r1, _080889A0 @ =gUnk_02034350
ldr r1, _080889A0 @ =gRoomVars
ldr r2, _080889A4 @ =gUnk_08120BEC
mov r8, r2
adds r3, r1, #0
@@ -2790,7 +2790,7 @@ _08088990:
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080889A0: .4byte gUnk_02034350
_080889A0: .4byte gRoomVars
_080889A4: .4byte gUnk_08120BEC
thumb_func_start sub_080889A8
@@ -2939,7 +2939,7 @@ _08088AA4:
bl sub_0800293E
cmp r0, #0
beq _08088B82
ldr r0, _08088AE0 @ =gUnk_02034350
ldr r0, _08088AE0 @ =gRoomVars
ldr r1, [r0, #0x68]
movs r2, #4
orrs r1, r2
@@ -2948,9 +2948,9 @@ _08088AA4:
.align 2, 0
_08088AD8: .4byte gUnk_02002A40
_08088ADC: .4byte gRoomControls
_08088AE0: .4byte gUnk_02034350
_08088AE0: .4byte gRoomVars
_08088AE4:
ldr r5, _08088B70 @ =gUnk_02034350
ldr r5, _08088B70 @ =gRoomVars
ldr r1, [r5, #0x68]
movs r6, #1
adds r0, r1, #0
@@ -3020,7 +3020,7 @@ _08088B42:
str r1, [r4, #0x68]
b _08088B82
.align 2, 0
_08088B70: .4byte gUnk_02034350
_08088B70: .4byte gRoomVars
_08088B74: .4byte gUnk_08120C1C
_08088B78: .4byte gUnk_08120C25
_08088B7C: .4byte gUnk_08120C2E
@@ -3268,7 +3268,7 @@ _08088D4C:
movs r0, #2
b _08088DAE
_08088D5A:
ldr r2, _08088D98 @ =gUnk_02034350
ldr r2, _08088D98 @ =gRoomVars
ldr r1, [r2, #0x68]
movs r0, #0x20
ands r0, r1
@@ -3301,7 +3301,7 @@ _08088D7A:
subs r0, r1, #2
b _08088D9E
.align 2, 0
_08088D98: .4byte gUnk_02034350
_08088D98: .4byte gRoomVars
_08088D9C:
adds r0, r1, #2
_08088D9E:
@@ -3335,7 +3335,7 @@ sub_08088DB4: @ 0x08088DB4
_08088DC8:
cmp r0, #4
bgt _08088E50
ldr r0, _08088DE8 @ =gUnk_02034350
ldr r0, _08088DE8 @ =gRoomVars
ldr r0, [r0, #0x68]
movs r1, #8
ands r0, r1
@@ -3349,7 +3349,7 @@ _08088DC8:
bne _08088E6E
b _08088E3E
.align 2, 0
_08088DE8: .4byte gUnk_02034350
_08088DE8: .4byte gRoomVars
_08088DEC:
movs r2, #1
movs r0, #1
@@ -3408,7 +3408,7 @@ _08088E50:
lsls r0, r0, #0x18
cmp r0, #0
bne _08088E6E
ldr r0, _08088E70 @ =gUnk_02034350
ldr r0, _08088E70 @ =gRoomVars
ldr r1, [r0, #0x68]
movs r2, #9
rsbs r2, r2, #0
@@ -3419,7 +3419,7 @@ _08088E50:
_08088E6E:
pop {r4, pc}
.align 2, 0
_08088E70: .4byte gUnk_02034350
_08088E70: .4byte gRoomVars
thumb_func_start sub_08088E74
sub_08088E74: @ 0x08088E74
@@ -3434,7 +3434,7 @@ sub_08088E74: @ 0x08088E74
adds r1, #0x38
movs r0, #2
strb r0, [r1]
ldr r2, _08088EB0 @ =gUnk_02034350
ldr r2, _08088EB0 @ =gRoomVars
ldr r0, [r2, #0x68]
movs r1, #8
orrs r0, r1
@@ -3444,7 +3444,7 @@ _08088E94:
bl sub_0806FB38
cmp r0, #0
beq _08088EB4
ldr r0, _08088EB0 @ =gUnk_02034350
ldr r0, _08088EB0 @ =gRoomVars
ldr r1, [r0, #0x68]
movs r2, #0x10
orrs r1, r2
@@ -3453,7 +3453,7 @@ _08088E94:
bl sub_0805E7BC
b _08088F14
.align 2, 0
_08088EB0: .4byte gUnk_02034350
_08088EB0: .4byte gRoomVars
_08088EB4:
ldr r0, _08088F18 @ =gUnk_030010A0
ldr r0, [r0]
@@ -3623,7 +3623,7 @@ _08088FEC:
strb r0, [r4, #0xc]
b _0808908E
_08089004:
ldr r0, _0808901C @ =gUnk_02034350
ldr r0, _0808901C @ =gRoomVars
ldr r0, [r0, #0x68]
movs r1, #0x10
ands r0, r1
@@ -3635,7 +3635,7 @@ _08089004:
strb r0, [r4, #0xe]
b _0808908E
.align 2, 0
_0808901C: .4byte gUnk_02034350
_0808901C: .4byte gRoomVars
_08089020:
ldrb r0, [r4, #0xe]
subs r0, #1
@@ -3649,14 +3649,14 @@ _08089020:
bl sub_0807CC60
cmp r0, #0
beq _08089048
ldr r0, _08089044 @ =gUnk_02034350
ldr r0, _08089044 @ =gRoomVars
ldr r1, [r0, #0x68]
movs r2, #2
b _0808904E
.align 2, 0
_08089044: .4byte gUnk_02034350
_08089044: .4byte gRoomVars
_08089048:
ldr r0, _08089090 @ =gUnk_02034350
ldr r0, _08089090 @ =gRoomVars
ldr r1, [r0, #0x68]
movs r2, #1
_0808904E:
@@ -3671,7 +3671,7 @@ _0808905C:
ldrb r0, [r4, #0xe]
cmp r0, #0
bne _0808908E
ldr r2, _08089090 @ =gUnk_02034350
ldr r2, _08089090 @ =gRoomVars
ldr r0, [r2, #0x68]
movs r1, #0x11
rsbs r1, r1, #0
@@ -3693,7 +3693,7 @@ _08089088:
_0808908E:
pop {r4, r5, pc}
.align 2, 0
_08089090: .4byte gUnk_02034350
_08089090: .4byte gRoomVars
thumb_func_start sub_08089094
sub_08089094: @ 0x08089094
@@ -4249,7 +4249,7 @@ sub_080894C8: @ 0x080894C8
push {r4, lr}
adds r3, r0, #0
movs r2, #0
ldr r1, _080894E0 @ =gUnk_02034350
ldr r1, _080894E0 @ =gRoomVars
adds r4, r1, #0
adds r4, #0xac
ldr r0, [r4]
@@ -4259,7 +4259,7 @@ sub_080894C8: @ 0x080894C8
str r3, [r4]
b _080894FA
.align 2, 0
_080894E0: .4byte gUnk_02034350
_080894E0: .4byte gRoomVars
_080894E4:
adds r2, #1
cmp r2, #7
@@ -4280,7 +4280,7 @@ sub_080894FC: @ 0x080894FC
push {r4, lr}
adds r3, r0, #0
movs r2, #0
ldr r1, _08089514 @ =gUnk_02034350
ldr r1, _08089514 @ =gRoomVars
adds r4, r1, #0
adds r4, #0xac
ldr r0, [r4]
@@ -4290,7 +4290,7 @@ sub_080894FC: @ 0x080894FC
str r2, [r4]
b _08089530
.align 2, 0
_08089514: .4byte gUnk_02034350
_08089514: .4byte gRoomVars
_08089518:
adds r2, #1
cmp r2, #7
@@ -10910,7 +10910,7 @@ sub_0808C6D4: @ 0x0808C6D4
ldrh r0, [r4, #0xe]
subs r1, #1
strb r0, [r1]
ldr r0, _0808C748 @ =gLCDControls
ldr r0, _0808C748 @ =gScreen
adds r0, #0x60
ldrh r1, [r0]
movs r0, #0xff
@@ -10937,7 +10937,7 @@ _0808C742:
pop {r4, r5, pc}
.align 2, 0
_0808C744: .4byte gUnk_081215E8
_0808C748: .4byte gLCDControls
_0808C748: .4byte gScreen
thumb_func_start sub_0808C74C
sub_0808C74C: @ 0x0808C74C
@@ -11070,7 +11070,7 @@ _0808C83C: .4byte gUnk_02036BB8
thumb_func_start sub_0808C840
sub_0808C840: @ 0x0808C840
push {lr}
ldr r0, _0808C854 @ =gLCDControls
ldr r0, _0808C854 @ =gScreen
adds r0, #0x66
movs r1, #0
strh r1, [r0]
@@ -11078,7 +11078,7 @@ sub_0808C840: @ 0x0808C840
bl sub_0805E780
pop {pc}
.align 2, 0
_0808C854: .4byte gLCDControls
_0808C854: .4byte gScreen
thumb_func_start sub_0808C858
sub_0808C858: @ 0x0808C858
@@ -11089,16 +11089,16 @@ sub_0808C858: @ 0x0808C858
ands r0, r1
cmp r0, #0
beq _0808C878
ldr r1, _0808C870 @ =gLCDControls
ldr r1, _0808C870 @ =gScreen
adds r3, r1, #0
adds r3, #0x66
ldr r0, _0808C874 @ =0x00003FBF
b _0808C880
.align 2, 0
_0808C870: .4byte gLCDControls
_0808C870: .4byte gScreen
_0808C874: .4byte 0x00003FBF
_0808C878:
ldr r1, _0808C898 @ =gLCDControls
ldr r1, _0808C898 @ =gScreen
adds r3, r1, #0
adds r3, #0x66
ldr r0, _0808C89C @ =0x00003FFF
@@ -11115,7 +11115,7 @@ _0808C880:
movs r0, #0
b _0808C8A6
.align 2, 0
_0808C898: .4byte gLCDControls
_0808C898: .4byte gScreen
_0808C89C: .4byte 0x00003FFF
_0808C8A0:
adds r1, r3, #0
@@ -11155,7 +11155,7 @@ _0808C8D6:
ands r0, r1
cmp r0, #0
beq _0808C8F8
ldr r0, _0808C8F4 @ =gLCDControls
ldr r0, _0808C8F4 @ =gScreen
ldrh r1, [r2]
lsls r1, r1, #0x10
asrs r1, r1, #0x14
@@ -11165,9 +11165,9 @@ _0808C8D6:
strh r2, [r0]
b _0808C904
.align 2, 0
_0808C8F4: .4byte gLCDControls
_0808C8F4: .4byte gScreen
_0808C8F8:
ldr r1, _0808C918 @ =gLCDControls
ldr r1, _0808C918 @ =gScreen
ldrh r0, [r2]
lsls r0, r0, #0x10
asrs r0, r0, #0x14
@@ -11184,7 +11184,7 @@ _0808C904:
_0808C914:
pop {pc}
.align 2, 0
_0808C918: .4byte gLCDControls
_0808C918: .4byte gScreen
thumb_func_start sub_0808C91C
sub_0808C91C: @ 0x0808C91C
@@ -12048,7 +12048,7 @@ sub_0808CF5C: @ 0x0808CF5C
bl sub_0801E1EC
b _0808D01E
_0808CF82:
ldr r0, _0808D020 @ =gLCDControls
ldr r0, _0808D020 @ =gScreen
adds r0, #0x62
movs r1, #0x10
strh r1, [r0]
@@ -12123,7 +12123,7 @@ _0808CFC6:
_0808D01E:
pop {r4, r5, r6, pc}
.align 2, 0
_0808D020: .4byte gLCDControls
_0808D020: .4byte gScreen
_0808D024: .4byte gUnk_02024490
_0808D028: .4byte gUnk_081216C8
_0808D02C: .4byte gUnk_02033A90
@@ -12380,7 +12380,7 @@ _0808D1FC:
ands r3, r0
cmp r3, #0
bne _0808D234
ldr r4, _0808D278 @ =gLCDControls
ldr r4, _0808D278 @ =gScreen
ldrb r2, [r5, #0xd]
lsls r1, r2, #8
movs r0, #0x10
@@ -12437,7 +12437,7 @@ _0808D272:
pop {r4, r5, r6, pc}
.align 2, 0
_0808D274: .4byte gUnk_030010A0
_0808D278: .4byte gLCDControls
_0808D278: .4byte gScreen
_0808D27C: .4byte gUnk_08121704
thumb_func_start sub_0808D280
@@ -12463,7 +12463,7 @@ sub_0808D280: @ 0x0808D280
movs r1, #4
orrs r0, r1
strb r0, [r2, #0x19]
ldr r1, _0808D2C8 @ =gLCDControls
ldr r1, _0808D2C8 @ =gScreen
adds r2, r1, #0
adds r2, #0x66
movs r0, #0xc8
@@ -12478,7 +12478,7 @@ _0808D2C4:
add sp, #4
pop {r4, pc}
.align 2, 0
_0808D2C8: .4byte gLCDControls
_0808D2C8: .4byte gScreen
thumb_func_start sub_0808D2CC
sub_0808D2CC: @ 0x0808D2CC
@@ -12601,7 +12601,7 @@ sub_0808D394: @ 0x0808D394
movs r1, #7
orrs r0, r1
strb r0, [r2]
ldr r1, _0808D3FC @ =gLCDControls
ldr r1, _0808D3FC @ =gScreen
adds r2, r1, #0
adds r2, #0x66
movs r0, #0xc8
@@ -12639,7 +12639,7 @@ _0808D3C4:
_0808D3F8:
pop {r4, r5, pc}
.align 2, 0
_0808D3FC: .4byte gLCDControls
_0808D3FC: .4byte gScreen
_0808D400: .4byte 0x00001003
_0808D404: .4byte gUnk_08121720
@@ -12732,7 +12732,7 @@ sub_0808D474: @ 0x0808D474
movs r1, #4
orrs r0, r1
strb r0, [r5, #0x19]
ldr r1, _0808D4CC @ =gLCDControls
ldr r1, _0808D4CC @ =gScreen
adds r2, r1, #0
adds r2, #0x66
movs r0, #0xc8
@@ -12746,7 +12746,7 @@ sub_0808D474: @ 0x0808D474
bl PlaySFX
b _0808D50E
.align 2, 0
_0808D4CC: .4byte gLCDControls
_0808D4CC: .4byte gScreen
_0808D4D0: .4byte 0x00000179
_0808D4D4:
movs r0, #8
@@ -12794,7 +12794,7 @@ sub_0808D518: @ 0x0808D518
ands r2, r0
cmp r2, #0
bne _0808D58A
ldr r3, _0808D590 @ =gLCDControls
ldr r3, _0808D590 @ =gScreen
ldrb r0, [r5, #0xe]
movs r1, #0x10
subs r1, r1, r0
@@ -12846,7 +12846,7 @@ _0808D58A:
pop {r4, r5, r6, pc}
.align 2, 0
_0808D58C: .4byte gUnk_030010A0
_0808D590: .4byte gLCDControls
_0808D590: .4byte gScreen
_0808D594: .4byte 0x00004069
_0808D598: .4byte gRoomControls
@@ -34707,7 +34707,7 @@ sub_08097C20: @ 0x08097C20
adds r0, #1
strb r0, [r4, #0xf]
ands r1, r0
ldr r6, _08097CA8 @ =gLCDControls
ldr r6, _08097CA8 @ =gScreen
movs r0, #0x10
subs r0, r0, r1
lsls r0, r0, #8
@@ -34742,7 +34742,7 @@ sub_08097C20: @ 0x08097C20
_08097CA6:
pop {r4, r5, r6, pc}
.align 2, 0
_08097CA8: .4byte gLCDControls
_08097CA8: .4byte gScreen
_08097CAC: .4byte gUnk_02034490
thumb_func_start sub_08097CB0
@@ -34772,7 +34772,7 @@ sub_08097CB4: @ 0x08097CB4
movs r1, #0x1e
strb r1, [r0, #0xe]
strb r3, [r0, #0xf]
ldr r1, _08097CF8 @ =gLCDControls
ldr r1, _08097CF8 @ =gScreen
adds r2, r1, #0
adds r2, #0x66
movs r0, #0xf4
@@ -34786,7 +34786,7 @@ sub_08097CB4: @ 0x08097CB4
bl PlaySFX
pop {pc}
.align 2, 0
_08097CF8: .4byte gLCDControls
_08097CF8: .4byte gScreen
thumb_func_start sub_08097CFC
sub_08097CFC: @ 0x08097CFC
@@ -35419,7 +35419,7 @@ sub_08098168: @ 0x08098168
strb r0, [r1]
adds r0, r4, #0
bl sub_08016A30
ldr r1, _080981CC @ =gLCDControls
ldr r1, _080981CC @ =gScreen
adds r2, r1, #0
adds r2, #0x66
movs r3, #0
@@ -35433,7 +35433,7 @@ sub_08098168: @ 0x08098168
ldr r0, _080981D0 @ =0x0000060A
b _080981D8
.align 2, 0
_080981CC: .4byte gLCDControls
_080981CC: .4byte gScreen
_080981D0: .4byte 0x0000060A
_080981D4:
adds r1, #0x68
@@ -39810,7 +39810,7 @@ _0809A394:
ldr r3, [r7, #0x78]
cmp r3, #0
bne _0809A3B4
ldr r0, _0809A3B0 @ =gUnk_02034350
ldr r0, _0809A3B0 @ =gRoomVars
movs r2, #0xc
ldrsh r1, [r0, r2]
movs r0, #0x80
@@ -39821,7 +39821,7 @@ _0809A394:
bl sub_0805308C
b _0809A632
.align 2, 0
_0809A3B0: .4byte gUnk_02034350
_0809A3B0: .4byte gRoomVars
_0809A3B4:
ldr r2, [r7, #0x50]
adds r0, r2, #0
@@ -40939,7 +40939,7 @@ sub_0809ABF4: @ 0x0809ABF4
movs r1, #4
orrs r0, r1
strb r0, [r2, #0x19]
ldr r1, _0809AC38 @ =gLCDControls
ldr r1, _0809AC38 @ =gScreen
adds r2, r1, #0
adds r2, #0x66
movs r0, #0xf4
@@ -40951,7 +40951,7 @@ sub_0809ABF4: @ 0x0809ABF4
_0809AC36:
pop {pc}
.align 2, 0
_0809AC38: .4byte gLCDControls
_0809AC38: .4byte gScreen
thumb_func_start sub_0809AC3C
sub_0809AC3C: @ 0x0809AC3C
@@ -40972,7 +40972,7 @@ sub_0809AC3C: @ 0x0809AC3C
strb r2, [r4, #0xf]
adds r1, r2, #0
ands r1, r3
ldr r6, _0809AC9C @ =gLCDControls
ldr r6, _0809AC9C @ =gScreen
lsls r3, r1, #8
movs r0, #0x10
subs r0, r0, r1
@@ -41005,7 +41005,7 @@ sub_0809AC3C: @ 0x0809AC3C
_0809AC9A:
pop {r4, r5, r6, pc}
.align 2, 0
_0809AC9C: .4byte gLCDControls
_0809AC9C: .4byte gScreen
thumb_func_start sub_0809ACA0
sub_0809ACA0: @ 0x0809ACA0
@@ -42570,7 +42570,7 @@ _0809B878:
movs r2, #2
_0809B89A:
strb r2, [r5, #0x14]
ldr r2, _0809B8C4 @ =gLCDControls
ldr r2, _0809B8C4 @ =gScreen
ldrh r1, [r2]
ldr r0, _0809B8C8 @ =0x0000BFFF
ands r0, r1
@@ -42589,7 +42589,7 @@ _0809B89A:
.align 2, 0
_0809B8BC: .4byte gRoomControls
_0809B8C0: .4byte gLinkEntity
_0809B8C4: .4byte gLCDControls
_0809B8C4: .4byte gScreen
_0809B8C8: .4byte 0x0000BFFF
_0809B8CC:
ldrb r0, [r4, #0xe]
@@ -42632,7 +42632,7 @@ _0809B914:
strb r0, [r4, #0xc]
movs r0, #0x3c
strb r0, [r4, #0xe]
ldr r2, _0809B938 @ =gLCDControls
ldr r2, _0809B938 @ =gScreen
ldrh r1, [r2]
ldr r0, _0809B93C @ =0x0000DFFF
ands r0, r1
@@ -42645,7 +42645,7 @@ _0809B914:
bl PlaySFX
b _0809B972
.align 2, 0
_0809B938: .4byte gLCDControls
_0809B938: .4byte gScreen
_0809B93C: .4byte 0x0000DFFF
_0809B940: .4byte gRoomControls
_0809B944: .4byte gLinkEntity
@@ -42656,7 +42656,7 @@ _0809B948:
lsls r0, r0, #0x18
cmp r0, #0
bne _0809B972
ldr r2, _0809B974 @ =gLCDControls
ldr r2, _0809B974 @ =gScreen
ldrh r1, [r2]
movs r3, #0x90
lsls r3, r3, #7
@@ -42673,7 +42673,7 @@ _0809B948:
_0809B972:
pop {r4, r5, pc}
.align 2, 0
_0809B974: .4byte gLCDControls
_0809B974: .4byte gScreen
_0809B978: .4byte gRoomControls
thumb_func_start sub_0809B97C
@@ -42703,7 +42703,7 @@ _0809B9A0:
ble _0809B9A6
movs r2, #0xf0
_0809B9A6:
ldr r1, _0809B9B8 @ =gLCDControls
ldr r1, _0809B9B8 @ =gScreen
lsls r0, r0, #8
orrs r0, r2
adds r1, #0x58
@@ -42711,7 +42711,7 @@ _0809B9A6:
pop {pc}
.align 2, 0
_0809B9B4: .4byte gRoomControls
_0809B9B8: .4byte gLCDControls
_0809B9B8: .4byte gScreen
thumb_func_start sub_0809B9BC
sub_0809B9BC: @ 0x0809B9BC
@@ -42752,7 +42752,7 @@ _0809B9DC:
movs r2, #2
_0809BA00:
strb r2, [r3, #0x14]
ldr r2, _0809BA2C @ =gLCDControls
ldr r2, _0809BA2C @ =gScreen
ldrh r1, [r2]
ldr r0, _0809BA30 @ =0x0000BFFF
ands r0, r1
@@ -42772,7 +42772,7 @@ _0809BA00:
.align 2, 0
_0809BA24: .4byte gRoomControls
_0809BA28: .4byte gLinkEntity
_0809BA2C: .4byte gLCDControls
_0809BA2C: .4byte gScreen
_0809BA30: .4byte 0x0000BFFF
_0809BA34:
ldrb r0, [r4, #0xe]
@@ -42835,7 +42835,7 @@ _0809BA9C:
ldr r1, _0809BAC4 @ =gRoomControls
movs r0, #4
strb r0, [r1, #0xe]
ldr r2, _0809BAC8 @ =gLCDControls
ldr r2, _0809BAC8 @ =gScreen
ldrh r1, [r2]
ldr r0, _0809BACC @ =0x0000D7FF
ands r0, r1
@@ -42848,7 +42848,7 @@ _0809BAC2:
pop {r4, r5, pc}
.align 2, 0
_0809BAC4: .4byte gRoomControls
_0809BAC8: .4byte gLCDControls
_0809BAC8: .4byte gScreen
_0809BACC: .4byte 0x0000D7FF
thumb_func_start sub_0809BAD0
@@ -42898,7 +42898,7 @@ _0809BB04:
movs r2, #2
_0809BB2C:
strb r2, [r3, #0x14]
ldr r1, _0809BB48 @ =gLCDControls
ldr r1, _0809BB48 @ =gScreen
adds r2, r1, #0
adds r2, #0x58
movs r0, #0x60
@@ -42910,7 +42910,7 @@ _0809BB2C:
.align 2, 0
_0809BB40: .4byte gRoomControls
_0809BB44: .4byte gLinkEntity
_0809BB48: .4byte gLCDControls
_0809BB48: .4byte gScreen
_0809BB4C:
adds r0, r4, #0
bl sub_0809BE78
@@ -42928,7 +42928,7 @@ _0809BB58:
beq _0809BB6A
b _0809BC68
_0809BB6A:
ldr r2, _0809BB80 @ =gLCDControls
ldr r2, _0809BB80 @ =gScreen
ldrh r1, [r2]
ldr r0, _0809BB84 @ =0x0000BFFF
ands r0, r1
@@ -42939,10 +42939,10 @@ _0809BB6A:
strh r0, [r2]
b _0809BC68
.align 2, 0
_0809BB80: .4byte gLCDControls
_0809BB80: .4byte gScreen
_0809BB84: .4byte 0x0000BFFF
_0809BB88:
ldr r2, _0809BBB8 @ =gLCDControls
ldr r2, _0809BBB8 @ =gScreen
adds r5, r2, #0
adds r5, #0x58
ldrh r0, [r5]
@@ -42967,7 +42967,7 @@ _0809BBA6:
strh r0, [r5]
b _0809BC68
.align 2, 0
_0809BBB8: .4byte gLCDControls
_0809BBB8: .4byte gScreen
_0809BBBC: .4byte gUnk_030010A0
_0809BBC0: .4byte 0x00000133
_0809BBC4:
@@ -43092,7 +43092,7 @@ _0809BC92:
movs r2, #2
_0809BCB4:
strb r2, [r3, #0x14]
ldr r1, _0809BCD4 @ =gLCDControls
ldr r1, _0809BCD4 @ =gScreen
adds r2, r1, #0
adds r2, #0x58
ldr r0, _0809BCD8 @ =0x000080F0
@@ -43106,7 +43106,7 @@ _0809BCB4:
.align 2, 0
_0809BCCC: .4byte gRoomControls
_0809BCD0: .4byte gLinkEntity
_0809BCD4: .4byte gLCDControls
_0809BCD4: .4byte gScreen
_0809BCD8: .4byte 0x000080F0
_0809BCDC:
adds r0, r4, #0
@@ -43126,7 +43126,7 @@ _0809BCDC:
bl DoFade
movs r0, #3
bl sub_0805AAF0
ldr r2, _0809BD18 @ =gLCDControls
ldr r2, _0809BD18 @ =gScreen
ldrh r1, [r2]
ldr r0, _0809BD1C @ =0x0000BFFF
ands r0, r1
@@ -43137,7 +43137,7 @@ _0809BCDC:
strh r0, [r2]
b _0809BDAE
.align 2, 0
_0809BD18: .4byte gLCDControls
_0809BD18: .4byte gScreen
_0809BD1C: .4byte 0x0000BFFF
_0809BD20:
ldrb r0, [r4, #0xd]
@@ -43159,7 +43159,7 @@ _0809BD38:
ldrb r0, [r4, #0xd]
subs r0, #1
strb r0, [r4, #0xd]
ldr r1, _0809BD60 @ =gLCDControls
ldr r1, _0809BD60 @ =gScreen
ldrb r0, [r4, #0xd]
lsls r0, r0, #8
movs r2, #0xf0
@@ -43170,13 +43170,13 @@ _0809BD38:
.align 2, 0
_0809BD58: .4byte gUnk_030010A0
_0809BD5C: .4byte 0x00000133
_0809BD60: .4byte gLCDControls
_0809BD60: .4byte gScreen
_0809BD64:
movs r0, #2
strb r0, [r4, #0xc]
movs r0, #0x78
strb r0, [r4, #0xe]
ldr r2, _0809BD90 @ =gLCDControls
ldr r2, _0809BD90 @ =gScreen
ldrh r1, [r2]
ldr r0, _0809BD94 @ =0x0000DFFF
ands r0, r1
@@ -43192,7 +43192,7 @@ _0809BD64:
bl PlaySFX
b _0809BDAE
.align 2, 0
_0809BD90: .4byte gLCDControls
_0809BD90: .4byte gScreen
_0809BD94: .4byte 0x0000DFFF
_0809BD98:
ldrb r0, [r4, #0xe]
asm/code_0809D498.s
+13 -13
View File
@@ -5965,7 +5965,7 @@ sub_080A01E0: @ 0x080A01E0
beq _080A0246
cmp r0, #0x41
bne _080A0246
ldr r2, _080A0284 @ =gLCDControls
ldr r2, _080A0284 @ =gScreen
ldrh r1, [r2]
ldr r0, _080A0288 @ =0x0000FDFF
ands r0, r1
@@ -5976,7 +5976,7 @@ sub_080A01E0: @ 0x080A01E0
_080A0246:
ldr r0, _080A028C @ =gUnk_0800A0B4
bl sub_0807DB2C
ldr r1, _080A0284 @ =gLCDControls
ldr r1, _080A0284 @ =gScreen
adds r2, r1, #0
adds r2, #0x66
movs r0, #0xc8
@@ -6002,7 +6002,7 @@ _080A027A:
.align 2, 0
_080A027C: .4byte gUnk_080FD1A0
_080A0280: .4byte 0x0000FF40
_080A0284: .4byte gLCDControls
_080A0284: .4byte gScreen
_080A0288: .4byte 0x0000FDFF
_080A028C: .4byte gUnk_0800A0B4
@@ -6062,7 +6062,7 @@ sub_080A02CC: @ 0x080A02CC
strb r0, [r4, #0xc]
movs r0, #0x2d
strb r0, [r4, #0xe]
ldr r0, _080A0344 @ =gLCDControls
ldr r0, _080A0344 @ =gScreen
adds r3, r0, #0
adds r3, #0x66
movs r1, #0xc8
@@ -6092,7 +6092,7 @@ sub_080A02CC: @ 0x080A02CC
_080A0342:
pop {r4, pc}
.align 2, 0
_080A0344: .4byte gLCDControls
_080A0344: .4byte gScreen
_080A0348: .4byte 0x80110000
thumb_func_start sub_080A034C
@@ -6366,13 +6366,13 @@ _080A0538:
_080A0540:
ldr r0, _080A054C @ =0x0000FFFF
ands r4, r0
ldr r0, _080A0550 @ =gLCDControls
ldr r0, _080A0550 @ =gScreen
adds r0, #0x68
strh r4, [r0]
pop {r4, r5, pc}
.align 2, 0
_080A054C: .4byte 0x0000FFFF
_080A0550: .4byte gLCDControls
_080A0550: .4byte gScreen
thumb_func_start sub_080A0554
sub_080A0554: @ 0x080A0554
@@ -8803,7 +8803,7 @@ _080A171E:
strh r0, [r1, #0x32]
str r7, [r1, #0x64]
str r1, [r7, #0xc]
ldr r2, _080A1830 @ =gLCDControls
ldr r2, _080A1830 @ =gScreen
ldr r0, _080A1834 @ =0x00001E07
strh r0, [r2, #0x2c]
ldrh r0, [r2]
@@ -8865,7 +8865,7 @@ _080A181C:
.align 2, 0
_080A1828: .4byte gUnk_03003DBC
_080A182C: .4byte gRoomControls
_080A1830: .4byte gLCDControls
_080A1830: .4byte gScreen
_080A1834: .4byte 0x00001E07
_080A1838: .4byte gUnk_030010A0
_080A183C: .4byte gLinkState
@@ -9521,7 +9521,7 @@ _080A1D4E:
ldrh r1, [r4]
subs r1, r1, r0
strh r1, [r4]
ldr r2, _080A1D6C @ =gLCDControls
ldr r2, _080A1D6C @ =gScreen
ldrh r0, [r3]
lsrs r0, r0, #8
strh r0, [r2, #0x2e]
@@ -9531,7 +9531,7 @@ _080A1D4E:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A1D68: .4byte gUnk_080C9160
_080A1D6C: .4byte gLCDControls
_080A1D6C: .4byte gScreen
thumb_func_start sub_080A1D70
sub_080A1D70: @ 0x080A1D70
@@ -10167,7 +10167,7 @@ _080A2212:
movs r3, #0
bl sub_0805EC9C
_080A221E:
ldr r2, _080A2254 @ =gLCDControls
ldr r2, _080A2254 @ =gScreen
ldrh r1, [r2]
movs r3, #0x80
lsls r3, r3, #8
@@ -10194,7 +10194,7 @@ _080A224E:
pop {r4, pc}
.align 2, 0
_080A2250: .4byte 0x0000FFFF
_080A2254: .4byte gLCDControls
_080A2254: .4byte gScreen
_080A2258: .4byte gRoomControls
thumb_func_start sub_080A225C
asm/code_080A3480.s
+16 -16
View File
@@ -274,7 +274,7 @@ _080A365E:
movs r0, #0
movs r1, #0
bl sub_0801D79C
ldr r2, _080A36B4 @ =gLCDControls
ldr r2, _080A36B4 @ =gScreen
movs r0, #0xc8
lsls r0, r0, #3
strh r0, [r2]
@@ -299,7 +299,7 @@ _080A365E:
pop {r4, r5, pc}
.align 2, 0
_080A36B0: .4byte gUnk_081272F0
_080A36B4: .4byte gLCDControls
_080A36B4: .4byte gScreen
_080A36B8: .4byte 0x00002442
_080A36BC: .4byte 0x00001E4D
@@ -355,7 +355,7 @@ sub_080A36F8: @ 0x080A36F8
movs r1, #0x80
lsls r1, r1, #4
bl sub_0801D630
ldr r1, _080A3764 @ =gLCDControls
ldr r1, _080A3764 @ =gScreen
movs r2, #0
movs r0, #1
strh r0, [r1, #0x1a]
@@ -384,7 +384,7 @@ _080A3754: .4byte gUnk_03000FD0
_080A3758: .4byte gUnk_02000080
_080A375C: .4byte gUnk_08127CEC
_080A3760: .4byte gUnk_02021F30
_080A3764: .4byte gLCDControls
_080A3764: .4byte gScreen
thumb_func_start sub_080A3768
sub_080A3768: @ 0x080A3768
@@ -419,7 +419,7 @@ _080A378A:
adds r1, r1, r2
ldr r1, [r1]
bl sub_0805F46C
ldr r1, _080A37C0 @ =gLCDControls
ldr r1, _080A37C0 @ =gScreen
movs r2, #0
movs r0, #1
strh r0, [r1, #0x1a]
@@ -431,7 +431,7 @@ _080A378A:
.align 2, 0
_080A37B8: .4byte gUnk_02021F30
_080A37BC: .4byte gUnk_081272E0
_080A37C0: .4byte gLCDControls
_080A37C0: .4byte gScreen
_080A37C4:
ldr r0, _080A37F8 @ =gUnk_03000FD0
ldrb r0, [r0]
@@ -447,7 +447,7 @@ _080A37C4:
strb r1, [r4, #0x18]
lsls r0, r1, #0x18
lsrs r3, r0, #0x18
ldr r2, _080A3800 @ =gLCDControls
ldr r2, _080A3800 @ =gScreen
movs r0, #0x10
subs r0, r0, r3
lsls r0, r0, #8
@@ -462,7 +462,7 @@ _080A37C4:
.align 2, 0
_080A37F8: .4byte gUnk_03000FD0
_080A37FC: .4byte gUnk_030010A0
_080A3800: .4byte gLCDControls
_080A3800: .4byte gScreen
_080A3804:
ldrh r0, [r4, #8]
subs r0, #1
@@ -483,7 +483,7 @@ _080A3812:
strb r1, [r4, #0x18]
lsls r0, r1, #0x18
lsrs r3, r0, #0x18
ldr r2, _080A3848 @ =gLCDControls
ldr r2, _080A3848 @ =gScreen
movs r0, #0x10
subs r0, r0, r3
lsls r0, r0, #8
@@ -500,7 +500,7 @@ _080A383C:
b _080A385E
.align 2, 0
_080A3844: .4byte gUnk_030010A0
_080A3848: .4byte gLCDControls
_080A3848: .4byte gScreen
_080A384C:
ldr r1, _080A3860 @ =gUnk_03000FD0
ldrb r0, [r1]
@@ -581,7 +581,7 @@ sub_080A38D0: @ 0x080A38D0
lsls r6, r6, #4
adds r1, r6, #0
bl sub_0801D630
ldr r4, _080A3924 @ =gLCDControls
ldr r4, _080A3924 @ =gScreen
movs r0, #0
mov r8, r0
movs r5, #1
@@ -607,7 +607,7 @@ _080A3914:
.align 2, 0
_080A391C: .4byte gUnk_03000FD0
_080A3920: .4byte gUnk_02021F30
_080A3924: .4byte gLCDControls
_080A3924: .4byte gScreen
_080A3928: .4byte gUnk_020344B0
_080A392C: .4byte gUnk_02000080
@@ -716,7 +716,7 @@ _080A39C8:
movs r0, #0
movs r1, #0
bl sub_08052418
ldr r2, _080A3A2C @ =gLCDControls
ldr r2, _080A3A2C @ =gScreen
ldrh r0, [r2]
movs r3, #0xc0
lsls r3, r3, #3
@@ -733,7 +733,7 @@ _080A39C8:
bl DoFade
b _080A3B36
.align 2, 0
_080A3A2C: .4byte gLCDControls
_080A3A2C: .4byte gScreen
_080A3A30: .4byte 0x00001C01
_080A3A34: .4byte 0x00001D05
_080A3A38:
@@ -852,7 +852,7 @@ _080A3AFC:
.align 2, 0
_080A3B10: .4byte gUnk_03000FF0
_080A3B14:
ldr r2, _080A3B38 @ =gLCDControls
ldr r2, _080A3B38 @ =gScreen
ldrh r1, [r2]
ldr r0, _080A3B3C @ =0x0000FDFF
ands r0, r1
@@ -870,7 +870,7 @@ _080A3B14:
_080A3B36:
pop {r4, r5, pc}
.align 2, 0
_080A3B38: .4byte gLCDControls
_080A3B38: .4byte gScreen
_080A3B3C: .4byte 0x0000FDFF
_080A3B40: .4byte gUnk_03001000
_080A3B44: .4byte gUnk_02000080
asm/code_080A3BD0.s
+32 -32
View File
@@ -38,7 +38,7 @@ _080A3C04:
_080A3C0A:
adds r0, #0x76
bl sub_0801D7EC
ldr r1, _080A3C58 @ =gLCDControls
ldr r1, _080A3C58 @ =gScreen
ldrh r2, [r1]
movs r3, #0xf0
lsls r3, r3, #5
@@ -68,7 +68,7 @@ _080A3C0A:
pop {r4, pc}
.align 2, 0
_080A3C54: .4byte gUnk_02000080
_080A3C58: .4byte gLCDControls
_080A3C58: .4byte gScreen
_080A3C5C: .4byte 0x00001C01
_080A3C60: .4byte 0x00001D02
_080A3C64: .4byte 0x00001E0B
@@ -358,7 +358,7 @@ _080A3E84:
strb r0, [r3, #6]
movs r0, #0x14
strh r0, [r3, #8]
ldr r3, _080A3ECC @ =gLCDControls
ldr r3, _080A3ECC @ =gScreen
ldrh r0, [r3]
movs r4, #0x80
lsls r4, r4, #6
@@ -389,7 +389,7 @@ _080A3E84:
_080A3EC8:
pop {r4, pc}
.align 2, 0
_080A3ECC: .4byte gLCDControls
_080A3ECC: .4byte gScreen
_080A3ED0: .4byte 0x00006887
_080A3ED4: .4byte 0x0000405F
_080A3ED8: .4byte 0x00003F90
@@ -397,7 +397,7 @@ _080A3ED8: .4byte 0x00003F90
thumb_func_start sub_080A3EDC
sub_080A3EDC: @ 0x080A3EDC
push {lr}
ldr r2, _080A3F08 @ =gLCDControls
ldr r2, _080A3F08 @ =gScreen
adds r1, r2, #0
adds r1, #0x6a
ldrh r0, [r1]
@@ -418,7 +418,7 @@ sub_080A3EDC: @ 0x080A3EDC
_080A3F04:
pop {pc}
.align 2, 0
_080A3F08: .4byte gLCDControls
_080A3F08: .4byte gScreen
_080A3F0C: .4byte 0x0000DFFF
thumb_func_start sub_080A3F10
@@ -1342,7 +1342,7 @@ sub_080A4608: @ 0x080A4608
movs r1, #0x80
lsls r1, r1, #5
bl sub_0801D630
ldr r2, _080A46AC @ =gLCDControls
ldr r2, _080A46AC @ =gScreen
adds r1, r2, #0
adds r1, #0x58
movs r0, #0xf0
@@ -1391,7 +1391,7 @@ _080A4694:
_080A46A0: .4byte gUnk_020176A0
_080A46A4: .4byte gUnk_02034CB0
_080A46A8: .4byte gUnk_02001A40
_080A46AC: .4byte gLCDControls
_080A46AC: .4byte gScreen
_080A46B0: .4byte 0x00007898
_080A46B4: .4byte gUnk_02000080
_080A46B8: .4byte gUnk_02032EC0
@@ -1484,7 +1484,7 @@ _080A475A:
movs r0, #0x20
subs r1, r0, r1
_080A476A:
ldr r0, _080A4784 @ =gLCDControls
ldr r0, _080A4784 @ =gScreen
adds r2, r0, #0
adds r2, #0x6a
strh r1, [r2]
@@ -1495,9 +1495,9 @@ _080A476A:
.align 2, 0
_080A477C: .4byte gUnk_02002B0E
_080A4780: .4byte gUnk_02000080
_080A4784: .4byte gLCDControls
_080A4784: .4byte gScreen
_080A4788:
ldr r2, _080A47C8 @ =gLCDControls
ldr r2, _080A47C8 @ =gScreen
adds r0, r2, #0
adds r0, #0x6a
strh r3, [r0]
@@ -1528,7 +1528,7 @@ _080A47BE:
_080A47C4:
pop {r4, pc}
.align 2, 0
_080A47C8: .4byte gLCDControls
_080A47C8: .4byte gScreen
_080A47CC: .4byte gUnk_0812813C
thumb_func_start sub_080A47D0
@@ -1575,20 +1575,20 @@ _080A4814:
adds r4, r0, #0
_080A481A:
strb r4, [r1, #0x1f]
ldr r1, _080A482C @ =gLCDControls
ldr r1, _080A482C @ =gScreen
adds r0, r4, #0
subs r0, #0x70
strh r0, [r1, #0x18]
pop {r4, pc}
.align 2, 0
_080A4828: .4byte gUnk_02000080
_080A482C: .4byte gLCDControls
_080A482C: .4byte gScreen
thumb_func_start sub_080A4830
sub_080A4830: @ 0x080A4830
push {lr}
bl sub_080A4608
ldr r2, _080A4858 @ =gLCDControls
ldr r2, _080A4858 @ =gScreen
ldrh r1, [r2]
movs r3, #0x80
lsls r3, r3, #6
@@ -1604,7 +1604,7 @@ sub_080A4830: @ 0x080A4830
bl sub_080A7114
pop {pc}
.align 2, 0
_080A4858: .4byte gLCDControls
_080A4858: .4byte gScreen
_080A485C: .4byte gUnk_0812813C
_080A4860: .4byte gUnk_02000080
@@ -1714,7 +1714,7 @@ _080A4916:
adds r5, r0, #0
_080A491C:
strb r5, [r6, #0x1f]
ldr r1, _080A4930 @ =gLCDControls
ldr r1, _080A4930 @ =gScreen
adds r0, r5, #0
subs r0, #0x70
strh r0, [r1, #0x18]
@@ -1723,7 +1723,7 @@ _080A4926:
.align 2, 0
_080A4928: .4byte gUnk_02002A40
_080A492C: .4byte gUnk_02000080
_080A4930: .4byte gLCDControls
_080A4930: .4byte gScreen
thumb_func_start sub_080A4934
sub_080A4934: @ 0x080A4934
@@ -2168,14 +2168,14 @@ _080A4CA4:
mov r1, sp
bl sub_0805F46C
_080A4CAC:
ldr r1, _080A4CB8 @ =gLCDControls
ldr r1, _080A4CB8 @ =gScreen
movs r0, #1
strh r0, [r1, #0x32]
_080A4CB2:
add sp, #0x54
pop {r4, r5, r6, pc}
.align 2, 0
_080A4CB8: .4byte gLCDControls
_080A4CB8: .4byte gScreen
thumb_func_start sub_080A4CBC
sub_080A4CBC: @ 0x080A4CBC
@@ -2206,7 +2206,7 @@ sub_080A4CBC: @ 0x080A4CBC
ldr r1, _080A4D18 @ =gUnk_08128190
bl sub_0805F46C
_080A4CF8:
ldr r1, _080A4D1C @ =gLCDControls
ldr r1, _080A4D1C @ =gScreen
movs r0, #1
strh r0, [r1, #0x1a]
_080A4CFE:
@@ -2222,7 +2222,7 @@ _080A4D0C: .4byte gUnk_02000080
_080A4D10: .4byte gUnk_02021F30
_080A4D14: .4byte 0x0600E000
_080A4D18: .4byte gUnk_08128190
_080A4D1C: .4byte gLCDControls
_080A4D1C: .4byte gScreen
_080A4D20:
adds r1, #0x40
adds r2, #1
@@ -2267,7 +2267,7 @@ _080A4D66:
adds r0, r1, #0
adds r0, #0x56
bl sub_0801D7EC
ldr r1, _080A4D80 @ =gLCDControls
ldr r1, _080A4D80 @ =gScreen
movs r0, #0
strh r0, [r1, #0x2e]
strh r0, [r1, #0x30]
@@ -2277,7 +2277,7 @@ _080A4D66:
strh r0, [r1, #0x32]
pop {pc}
.align 2, 0
_080A4D80: .4byte gLCDControls
_080A4D80: .4byte gScreen
_080A4D84: .4byte 0x00001E0B
thumb_func_start sub_080A4D88
@@ -2343,7 +2343,7 @@ sub_080A4DB8: @ 0x080A4DB8
lsls r0, r0, #3
ldr r1, _080A4E78 @ =gUnk_08128AD8
adds r4, r0, r1
ldr r1, _080A4E7C @ =gLCDControls
ldr r1, _080A4E7C @ =gScreen
ldrh r2, [r4, #2]
movs r5, #0xca
lsls r5, r5, #5
@@ -2389,7 +2389,7 @@ _080A4E6C: .4byte 0x0000FFFF
_080A4E70: .4byte gUnk_02034490
_080A4E74: .4byte gUnk_08128A38
_080A4E78: .4byte gUnk_08128AD8
_080A4E7C: .4byte gLCDControls
_080A4E7C: .4byte gScreen
_080A4E80: .4byte 0x00001E0B
thumb_func_start sub_080A4E84
@@ -2454,7 +2454,7 @@ _080A4EF0:
beq _080A4F00
ldr r1, _080A4F20 @ =0x00000E46
_080A4F00:
ldr r2, _080A4F24 @ =gLCDControls
ldr r2, _080A4F24 @ =gScreen
adds r0, r2, #0
adds r0, #0x66
strh r1, [r0]
@@ -2470,7 +2470,7 @@ _080A4F14:
_080A4F18: .4byte gUnk_08128B30
_080A4F1C: .4byte gUnk_08128A38
_080A4F20: .4byte 0x00000E46
_080A4F24: .4byte gLCDControls
_080A4F24: .4byte gScreen
thumb_func_start sub_080A4F28
sub_080A4F28: @ 0x080A4F28
@@ -2649,14 +2649,14 @@ _080A5080:
movs r1, #0x80
lsls r1, r1, #4
bl sub_0801D630
ldr r1, _080A509C @ =gLCDControls
ldr r1, _080A509C @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
_080A5096:
pop {r4, r5, pc}
.align 2, 0
_080A5098: .4byte gUnk_02034CB0
_080A509C: .4byte gLCDControls
_080A509C: .4byte gScreen
thumb_func_start sub_080A50A0
sub_080A50A0: @ 0x080A50A0
@@ -2682,7 +2682,7 @@ sub_080A50B8: @ 0x080A50B8
adds r0, #2
cmp r0, #0x10
ble _080A50D8
ldr r2, _080A50E0 @ =gLCDControls
ldr r2, _080A50E0 @ =gScreen
ldrh r1, [r2]
ldr r0, _080A50E4 @ =0x0000F8FF
ands r0, r1
@@ -2695,7 +2695,7 @@ _080A50D8:
pop {r4, pc}
.align 2, 0
_080A50DC: .4byte gUnk_02034490
_080A50E0: .4byte gLCDControls
_080A50E0: .4byte gScreen
_080A50E4: .4byte 0x0000F8FF
thumb_func_start sub_080A50E8
asm/code_080A5574.s
+30 -30
View File
@@ -747,23 +747,23 @@ sub_080A5AF4: @ 0x080A5AF4
ldrb r0, [r0, #7]
cmp r0, #0
bne _080A5B24
ldr r1, _080A5B1C @ =gLCDControls
ldr r1, _080A5B1C @ =gScreen
ldr r0, _080A5B20 @ =0x0000FFFC
strh r0, [r1, #0x18]
b _080A5B28
.align 2, 0
_080A5B18: .4byte gUnk_02000080
_080A5B1C: .4byte gLCDControls
_080A5B1C: .4byte gScreen
_080A5B20: .4byte 0x0000FFFC
_080A5B24:
ldr r0, _080A5B30 @ =gLCDControls
ldr r0, _080A5B30 @ =gScreen
strh r4, [r0, #0x18]
_080A5B28:
movs r0, #1
bl sub_080A7114
pop {r4, pc}
.align 2, 0
_080A5B30: .4byte gLCDControls
_080A5B30: .4byte gScreen
thumb_func_start sub_080A5B34
sub_080A5B34: @ 0x080A5B34
@@ -920,7 +920,7 @@ sub_080A5C44: @ 0x080A5C44
lsls r1, r1, #1
ldr r0, _080A5C94 @ =gUnk_08128D43
adds r1, r1, r0
ldr r2, _080A5C98 @ =gLCDControls
ldr r2, _080A5C98 @ =gScreen
movs r0, #0
ldrsb r0, [r1, r0]
ldrh r3, [r2, #0x16]
@@ -937,7 +937,7 @@ _080A5C88: .4byte gUnk_02000080
_080A5C8C: .4byte gUnk_08128D38
_080A5C90: .4byte gUnk_02033A90
_080A5C94: .4byte gUnk_08128D43
_080A5C98: .4byte gLCDControls
_080A5C98: .4byte gScreen
thumb_func_start sub_080A5C9C
sub_080A5C9C: @ 0x080A5C9C
@@ -1181,7 +1181,7 @@ _080A5E7C:
cmp r0, #0
beq _080A5F14
ldr r7, _080A5EA4 @ =gUnk_03001010
ldr r6, _080A5EBC @ =gLCDControls
ldr r6, _080A5EBC @ =gScreen
_080A5E88:
ldrb r0, [r5]
cmp r0, #2
@@ -1201,7 +1201,7 @@ _080A5EAC: .4byte gUnk_03001000
_080A5EB0: .4byte 0x000001FB
_080A5EB4: .4byte gUnk_080FDFD8
_080A5EB8: .4byte gUnk_02019EE0
_080A5EBC: .4byte gLCDControls
_080A5EBC: .4byte gScreen
_080A5EC0:
cmp r0, #3
beq _080A5EE0
@@ -1700,7 +1700,7 @@ sub_080A6290: @ 0x080A6290
str r0, [r4, #0xc]
movs r0, #0x81
bl sub_0801D7EC
ldr r1, _080A62D0 @ =gLCDControls
ldr r1, _080A62D0 @ =gScreen
ldr r0, _080A62D4 @ =0x0000FFFC
strh r0, [r1, #0x18]
strh r0, [r1, #0x24]
@@ -1718,7 +1718,7 @@ sub_080A6290: @ 0x080A6290
_080A62C4: .4byte gUnk_08128DD8
_080A62C8: .4byte gUnk_02000080
_080A62CC: .4byte gUnk_08128DD4
_080A62D0: .4byte gLCDControls
_080A62D0: .4byte gScreen
_080A62D4: .4byte 0x0000FFFC
_080A62D8: .4byte gUnk_02002A40
_080A62DC: .4byte 0x00010780
@@ -1980,7 +1980,7 @@ _080A64D2:
adds r4, #1
cmp r4, #0x10
bls _080A64B0
ldr r0, _080A64F4 @ =gLCDControls
ldr r0, _080A64F4 @ =gScreen
adds r0, #0x62
ldr r1, _080A64F8 @ =0x00003D3F
strh r1, [r0]
@@ -1990,7 +1990,7 @@ _080A64E4: .4byte gUnk_03001010
_080A64E8: .4byte gUnk_02002A40
_080A64EC: .4byte gUnk_08128DE8
_080A64F0: .4byte 0x000001FB
_080A64F4: .4byte gLCDControls
_080A64F4: .4byte gScreen
_080A64F8: .4byte 0x00003D3F
thumb_func_start sub_080A64FC
@@ -2026,7 +2026,7 @@ sub_080A6534: @ 0x080A6534
movs r0, #4
bl sub_080A4DB8
bl sub_080A6290
ldr r2, _080A6590 @ =gLCDControls
ldr r2, _080A6590 @ =gScreen
ldrh r1, [r2]
ldr r0, _080A6594 @ =0x0000F7FF
ands r0, r1
@@ -2062,7 +2062,7 @@ sub_080A6534: @ 0x080A6534
bl DoFade
pop {r4, pc}
.align 2, 0
_080A6590: .4byte gLCDControls
_080A6590: .4byte gScreen
_080A6594: .4byte 0x0000F7FF
_080A6598: .4byte gUnk_020176A0
_080A659C: .4byte gUnk_08128F4C
@@ -2132,7 +2132,7 @@ sub_080A6608: @ 0x080A6608
lsls r1, r1, #3
ldr r0, _080A6648 @ =gUnk_08128E94
adds r1, r1, r0
ldr r2, _080A664C @ =gLCDControls
ldr r2, _080A664C @ =gScreen
movs r0, #5
ldrsb r0, [r1, r0]
rsbs r0, r0, #0
@@ -2149,7 +2149,7 @@ sub_080A6608: @ 0x080A6608
_080A6640: .4byte gUnk_08128E78
_080A6644: .4byte gUnk_02000080
_080A6648: .4byte gUnk_08128E94
_080A664C: .4byte gLCDControls
_080A664C: .4byte gScreen
thumb_func_start sub_080A6650
sub_080A6650: @ 0x080A6650
@@ -2738,7 +2738,7 @@ sub_080A6AB8: @ 0x080A6AB8
lsls r1, r1, #3
ldr r0, _080A6AFC @ =gUnk_08128E94
adds r1, r1, r0
ldr r2, _080A6B00 @ =gLCDControls
ldr r2, _080A6B00 @ =gScreen
movs r0, #5
ldrsb r0, [r1, r0]
rsbs r0, r0, #0
@@ -2755,7 +2755,7 @@ sub_080A6AB8: @ 0x080A6AB8
_080A6AF4: .4byte gUnk_08128F1C
_080A6AF8: .4byte gUnk_02000080
_080A6AFC: .4byte gUnk_08128E94
_080A6B00: .4byte gLCDControls
_080A6B00: .4byte gScreen
thumb_func_start sub_080A6B04
sub_080A6B04: @ 0x080A6B04
@@ -3332,11 +3332,11 @@ sub_080A6F6C: @ 0x080A6F6C
adds r0, r4, #0
bl sub_0805F46C
_080A6F94:
ldr r1, _080A6FB0 @ =gLCDControls
ldr r1, _080A6FB0 @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
_080A6F9A:
ldr r1, _080A6FB0 @ =gLCDControls
ldr r1, _080A6FB0 @ =gScreen
movs r0, #2
strh r0, [r1, #0xc]
pop {r4, pc}
@@ -3344,7 +3344,7 @@ _080A6F9A:
_080A6FA4: .4byte gUnk_02000080
_080A6FA8: .4byte gUnk_020350F0
_080A6FAC: .4byte gUnk_08128FA8
_080A6FB0: .4byte gLCDControls
_080A6FB0: .4byte gScreen
thumb_func_start sub_080A6FB4
sub_080A6FB4: @ 0x080A6FB4
@@ -3401,11 +3401,11 @@ _080A6FFA:
adds r1, r5, #0
bl sub_0805F46C
_080A701E:
ldr r1, _080A703C @ =gLCDControls
ldr r1, _080A703C @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
_080A7024:
ldr r1, _080A703C @ =gLCDControls
ldr r1, _080A703C @ =gScreen
movs r0, #2
strh r0, [r1, #0xc]
pop {r4, r5, pc}
@@ -3414,7 +3414,7 @@ _080A702C: .4byte gUnk_08128FF0
_080A7030: .4byte gUnk_08128FD8
_080A7034: .4byte gUnk_02000080
_080A7038: .4byte gUnk_020350F0
_080A703C: .4byte gLCDControls
_080A703C: .4byte gScreen
thumb_func_start sub_080A7040
sub_080A7040: @ 0x080A7040
@@ -3448,7 +3448,7 @@ sub_080A7040: @ 0x080A7040
ldr r1, _080A70A4 @ =gUnk_08129004
bl sub_0805F46C
_080A7082:
ldr r0, _080A70A8 @ =gLCDControls
ldr r0, _080A70A8 @ =gScreen
movs r1, #3
strh r1, [r0, #0x18]
movs r1, #1
@@ -3462,7 +3462,7 @@ _080A7098: .4byte 0xFFFFFE00
_080A709C: .4byte 0x0600E000
_080A70A0: .4byte gUnk_08128D70
_080A70A4: .4byte gUnk_08129004
_080A70A8: .4byte gLCDControls
_080A70A8: .4byte gScreen
thumb_func_start sub_080A70AC
sub_080A70AC: @ 0x080A70AC
@@ -3692,7 +3692,7 @@ sub_080A7250: @ 0x080A7250
ldrb r0, [r0]
cmp r0, #0
bne _080A72E4
ldr r0, _080A72EC @ =gLCDControls
ldr r0, _080A72EC @ =gScreen
ldr r1, _080A72F0 @ =gUnk_03001020
movs r2, #0x7c
bl sub_0801D66C
@@ -3757,7 +3757,7 @@ _080A72E4:
pop {r4, pc}
.align 2, 0
_080A72E8: .4byte gUnk_03000FD0
_080A72EC: .4byte gLCDControls
_080A72EC: .4byte gScreen
_080A72F0: .4byte gUnk_03001020
_080A72F4: .4byte gUnk_020176A0
_080A72F8: .4byte gUnk_02024090
@@ -3881,7 +3881,7 @@ _080A73B4:
movs r2, #0x38
bl sub_0801D66C
ldr r0, _080A7494 @ =gUnk_03001020
ldr r1, _080A7498 @ =gLCDControls
ldr r1, _080A7498 @ =gScreen
movs r2, #0x7c
bl sub_0801D66C
ldrb r0, [r4, #4]
@@ -3921,7 +3921,7 @@ _080A7488: .4byte gUnk_02001A00
_080A748C: .4byte gUnk_02024490
_080A7490: .4byte gRoomControls
_080A7494: .4byte gUnk_03001020
_080A7498: .4byte gLCDControls
_080A7498: .4byte gScreen
_080A749C: .4byte gUnk_02033A90
_080A74A0: .4byte 0x0000085C
_080A74A4: .4byte 0x0000FFFF
asm/drawHealth.s
+2 -2
View File
@@ -187,7 +187,7 @@ _0801C7EE:
orrs r1, r2
strh r1, [r0, #2]
_0801C7FC:
ldr r1, _0801C820 @ =gLCDControls
ldr r1, _0801C820 @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
_0801C802:
@@ -201,4 +201,4 @@ _0801C810: .4byte 0x0000F010
_0801C814: .4byte 0x040000D4
_0801C818: .4byte gUnk_02034CF0
_0801C81C: .4byte 0xFFFFF000
_0801C820: .4byte gLCDControls
_0801C820: .4byte gScreen
asm/drawRupees.s
+4 -4
View File
@@ -36,14 +36,14 @@ _0801C4C8:
strh r0, [r4, #4]
strh r0, [r4, #6]
strh r0, [r4, #8]
ldr r1, _0801C4F8 @ =gLCDControls
ldr r1, _0801C4F8 @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
b _0801C5D0
.align 2, 0
_0801C4F0: .4byte gUnk_0200AF00
_0801C4F4: .4byte gUnk_02035160
_0801C4F8: .4byte gLCDControls
_0801C4F8: .4byte gScreen
_0801C4FC:
ldrb r0, [r6, #0xa]
cmp r0, #0
@@ -80,7 +80,7 @@ _0801C4FC:
strh r0, [r3, #8]
adds r0, r1, #5
strh r0, [r4, #8]
ldr r1, _0801C55C @ =gLCDControls
ldr r1, _0801C55C @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
movs r4, #1
@@ -90,7 +90,7 @@ _0801C54C: .4byte gUnk_02035160
_0801C550: .4byte gWalletSizes
_0801C554: .4byte gUnk_02002A40
_0801C558: .4byte 0x0000F070
_0801C55C: .4byte gLCDControls
_0801C55C: .4byte gScreen
_0801C560:
movs r4, #0
ldr r2, _0801C580 @ =gUnk_02002A40
asm/ghostBrothers.s
+12 -12
View File
@@ -137,7 +137,7 @@ _08065C8A:
ldr r0, _08065CB4 @ =0x0000FFFF
cmp r2, r0
beq _08065CBC
ldr r0, _08065CB8 @ =gLCDControls
ldr r0, _08065CB8 @ =gScreen
adds r0, #0x68
strh r2, [r0]
adds r1, #2
@@ -148,7 +148,7 @@ _08065C8A:
b _08065CCA
.align 2, 0
_08065CB4: .4byte 0x0000FFFF
_08065CB8: .4byte gLCDControls
_08065CB8: .4byte gScreen
_08065CBC:
ldrb r0, [r4, #0x18]
movs r1, #4
@@ -175,7 +175,7 @@ sub_08065CCC: @ 0x08065CCC
strb r1, [r0, #0x19]
ldr r1, _08065CF8 @ =gUnk_0811022E
str r1, [r0, #0x6c]
ldr r1, _08065CFC @ =gLCDControls
ldr r1, _08065CFC @ =gScreen
adds r2, r1, #0
adds r2, #0x66
movs r0, #0xfd
@@ -187,7 +187,7 @@ sub_08065CCC: @ 0x08065CCC
bx lr
.align 2, 0
_08065CF8: .4byte gUnk_0811022E
_08065CFC: .4byte gLCDControls
_08065CFC: .4byte gScreen
thumb_func_start sub_08065D00
sub_08065D00: @ 0x08065D00
@@ -233,7 +233,7 @@ sub_08065D18: @ 0x08065D18
adds r0, r4, #0
movs r1, #2
bl LoadAnimation
ldr r1, _08065D70 @ =gLCDControls
ldr r1, _08065D70 @ =gScreen
adds r2, r1, #0
adds r2, #0x66
movs r0, #0xfd
@@ -246,7 +246,7 @@ sub_08065D18: @ 0x08065D18
pop {r4, pc}
.align 2, 0
_08065D6C: .4byte gUnk_08110188
_08065D70: .4byte gLCDControls
_08065D70: .4byte gScreen
thumb_func_start sub_08065D74
sub_08065D74: @ 0x08065D74
@@ -263,7 +263,7 @@ sub_08065D74: @ 0x08065D74
ldr r0, _08065DA0 @ =0x0000FFFF
cmp r3, r0
beq _08065DA8
ldr r0, _08065DA4 @ =gLCDControls
ldr r0, _08065DA4 @ =gScreen
adds r0, #0x68
strh r3, [r0]
ldrh r0, [r2, #2]
@@ -273,7 +273,7 @@ sub_08065D74: @ 0x08065D74
b _08065DB4
.align 2, 0
_08065DA0: .4byte 0x0000FFFF
_08065DA4: .4byte gLCDControls
_08065DA4: .4byte gScreen
_08065DA8:
ldrb r0, [r1, #0xc]
adds r0, #1
@@ -387,7 +387,7 @@ _08065E74:
ldr r0, _08065E9C @ =0x0000FFFF
cmp r2, r0
beq _08065EA4
ldr r0, _08065EA0 @ =gLCDControls
ldr r0, _08065EA0 @ =gScreen
adds r0, #0x68
strh r2, [r0]
ldrh r0, [r1, #2]
@@ -397,7 +397,7 @@ _08065E74:
b _08065EB0
.align 2, 0
_08065E9C: .4byte 0x0000FFFF
_08065EA0: .4byte gLCDControls
_08065EA0: .4byte gScreen
_08065EA4:
ldr r1, _08065EB8 @ =gUnk_02018EB0
ldrb r0, [r1]
@@ -443,7 +443,7 @@ sub_08065EDC: @ 0x08065EDC
ldr r0, _08065F08 @ =0x0000FFFF
cmp r3, r0
beq _08065F10
ldr r0, _08065F0C @ =gLCDControls
ldr r0, _08065F0C @ =gScreen
adds r0, #0x68
strh r3, [r0]
adds r1, #2
@@ -454,7 +454,7 @@ sub_08065EDC: @ 0x08065EDC
b _08065F1C
.align 2, 0
_08065F08: .4byte 0x0000FFFF
_08065F0C: .4byte gLCDControls
_08065F0C: .4byte gScreen
_08065F10:
ldrb r0, [r2, #0xc]
adds r0, #1
asm/goronMerchant.s
+6 -6
View File
@@ -206,17 +206,17 @@ _080696AE:
thumb_func_start sub_080696B0
sub_080696B0: @ 0x080696B0
ldr r1, _080696B8 @ =gUnk_02034350
ldr r1, _080696B8 @ =gRoomVars
movs r0, #0
strb r0, [r1, #6]
bx lr
.align 2, 0
_080696B8: .4byte gUnk_02034350
_080696B8: .4byte gRoomVars
thumb_func_start sub_080696BC
sub_080696BC: @ 0x080696BC
push {r4, r5, lr}
ldr r0, _08069710 @ =gUnk_02034350
ldr r0, _08069710 @ =gRoomVars
ldrb r0, [r0, #7]
movs r5, #0
cmp r0, #0x70
@@ -259,7 +259,7 @@ _08069700:
ldrh r0, [r1]
pop {r4, r5, pc}
.align 2, 0
_08069710: .4byte gUnk_02034350
_08069710: .4byte gRoomVars
_08069714: .4byte gUnk_08111BA0
thumb_func_start sub_08069718
@@ -274,7 +274,7 @@ sub_08069718: @ 0x08069718
ldrh r0, [r0]
cmp r6, r0
bgt _08069764
ldr r5, _08069758 @ =gUnk_02034350
ldr r5, _08069758 @ =gRoomVars
ldrb r0, [r5, #7]
bl sub_0801E7D0
cmp r0, #0x62
@@ -292,7 +292,7 @@ sub_08069718: @ 0x08069718
b _0806976E
.align 2, 0
_08069754: .4byte gUnk_02002A40
_08069758: .4byte gUnk_02034350
_08069758: .4byte gRoomVars
_0806975C:
ldr r0, _08069760 @ =0x00002C1F
b _08069766
asm/greatFairy.s
-1007
View File
File diff suppressed because it is too large Load Diff
asm/greatFairy/sub_08087150.inc
+50
View File
@@ -0,0 +1,50 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
push {r4, lr}
adds r4, r0, #0
bl sub_08087380
ldrb r1, [r4, #0x18]
movs r0, #4
rsbs r0, r0, #0
ands r0, r1
movs r1, #1
orrs r0, r1
strb r0, [r4, #0x18]
ldrb r2, [r4, #0x1b]
movs r1, #0x3f
adds r0, r1, #0
ands r0, r2
strb r0, [r4, #0x1b]
ldrb r0, [r4, #0x19]
ands r1, r0
strb r1, [r4, #0x19]
adds r2, r4, #0
adds r2, #0x29
ldrb r1, [r2]
movs r0, #8
rsbs r0, r0, #0
ands r0, r1
movs r1, #3
orrs r0, r1
strb r0, [r2]
movs r0, #0x80
strh r0, [r4, #0x24]
movs r0, #0x10
strb r0, [r4, #0x15]
ldr r0, _080871A0 @ =gUnk_0812079C
ldrb r0, [r0]
movs r1, #0xf
ands r1, r0
lsls r0, r0, #4
orrs r0, r1
strb r0, [r4, #0x1a]
pop {r4, pc}
.align 2, 0
_080871A0: .4byte gUnk_0812079C
.syntax divided
asm/greatFairy/sub_080871F8.inc
+38
View File
@@ -0,0 +1,38 @@
.syntax unified
push {r4, r5, lr}
adds r4, r0, #0
ldr r3, [r4, #0x54]
movs r0, #0x2e
ldrsh r1, [r3, r0]
movs r2, #0x2e
ldrsh r0, [r4, r2]
cmp r1, r0
bne _0808721E
movs r5, #0x32
ldrsh r0, [r3, r5]
subs r0, #0x20
movs r2, #0x32
ldrsh r1, [r4, r2]
cmp r0, r1
bne _0808721E
movs r0, #2
strb r0, [r4, #0xc]
b _0808723C
_0808721E:
movs r5, #0x2e
ldrsh r0, [r4, r5]
movs r2, #0x32
ldrsh r1, [r4, r2]
movs r5, #0x2e
ldrsh r2, [r3, r5]
movs r5, #0x32
ldrsh r3, [r3, r5]
subs r3, #0x20
bl sub_080045D4
strb r0, [r4, #0x15]
adds r0, r4, #0
bl sub_0806F69C
_0808723C:
pop {r4, r5, pc}
.align 2, 0
.syntax divided
asm/greatFairy/sub_080872AC.inc
+38
View File
@@ -0,0 +1,38 @@
.syntax unified
push {r4, lr}
adds r4, r0, #0
ldrb r1, [r4, #0x18]
movs r0, #4
rsbs r0, r0, #0
ands r0, r1
movs r1, #1
orrs r0, r1
strb r0, [r4, #0x18]
ldrb r1, [r4, #0x1b]
movs r2, #0x3f
adds r0, r2, #0
ands r0, r1
movs r1, #0x40
orrs r0, r1
strb r0, [r4, #0x1b]
ldrb r0, [r4, #0x19]
ands r2, r0
strb r2, [r4, #0x19]
ldrh r1, [r4, #0x2e]
adds r0, r4, #0
adds r0, #0x68
strh r1, [r0]
ldrh r0, [r4, #0x32]
adds r1, r4, #0
adds r1, #0x6a
strh r0, [r1]
bl Random
movs r1, #0x1f
ands r0, r1
strb r0, [r4, #0x15]
movs r0, #0x20
strh r0, [r4, #0x24]
adds r0, r4, #0
bl sub_08087380
pop {r4, pc}
.syntax divided
asm/guardWithSpear.s
+2 -2
View File
@@ -426,7 +426,7 @@ _08063FF6:
thumb_func_start sub_08064030
sub_08064030: @ 0x08064030
ldr r0, _08064040 @ =gUnk_02034350
ldr r0, _08064040 @ =gRoomVars
ldr r2, [r0, #0x68]
rsbs r0, r2, #0
orrs r0, r2
@@ -434,7 +434,7 @@ sub_08064030: @ 0x08064030
str r0, [r1, #0x14]
bx lr
.align 2, 0
_08064040: .4byte gUnk_02034350
_08064040: .4byte gRoomVars
thumb_func_start sub_08064044
sub_08064044: @ 0x08064044
asm/kingGustaf.s
+4 -4
View File
@@ -32,7 +32,7 @@ sub_0806C0B0: @ 0x0806C0B0
bl sub_0805E3A0
adds r0, r4, #0
bl sub_0807DD50
ldr r1, _0806C100 @ =gLCDControls
ldr r1, _0806C100 @ =gScreen
adds r2, r1, #0
adds r2, #0x66
movs r0, #0xfd
@@ -46,7 +46,7 @@ sub_0806C0B0: @ 0x0806C0B0
str r5, [r4, #0x20]
b _0806C134
.align 2, 0
_0806C100: .4byte gLCDControls
_0806C100: .4byte gScreen
_0806C104:
adds r0, r4, #0
movs r1, #0
@@ -65,7 +65,7 @@ _0806C11E:
bgt _0806C124
movs r3, #4
_0806C124:
ldr r2, _0806C138 @ =gLCDControls
ldr r2, _0806C138 @ =gScreen
lsls r1, r3, #8
movs r0, #0x10
subs r0, r0, r3
@@ -76,4 +76,4 @@ _0806C124:
_0806C134:
pop {r4, r5, pc}
.align 2, 0
_0806C138: .4byte gLCDControls
_0806C138: .4byte gScreen
asm/phonograph.s
+2 -2
View File
@@ -238,7 +238,7 @@ sub_0806EABC: @ 0x0806EABC
ldr r0, _0806EAE8 @ =0x00003302
ldr r1, _0806EAEC @ =gUnk_081146B8
bl sub_0805F46C
ldr r1, _0806EAF0 @ =gLCDControls
ldr r1, _0806EAF0 @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
pop {r4, pc}
@@ -247,4 +247,4 @@ _0806EAE0: .4byte gUnk_020227E8
_0806EAE4: .4byte 0x00202020
_0806EAE8: .4byte 0x00003302
_0806EAEC: .4byte gUnk_081146B8
_0806EAF0: .4byte gLCDControls
_0806EAF0: .4byte gScreen
asm/rem.s
+6 -6
View File
@@ -981,7 +981,7 @@ _0806AA94: .4byte gUnk_081122B0
_0806AA98:
ldr r2, _0806AAD0 @ =gUnk_081122B8
_0806AA9A:
ldr r1, _0806AAD4 @ =gUnk_02034350
ldr r1, _0806AAD4 @ =gRoomVars
ldr r0, [r1, #0x68]
lsls r0, r0, #1
adds r0, r0, r2
@@ -1009,7 +1009,7 @@ _0806AAB6:
b _0806AB1C
.align 2, 0
_0806AAD0: .4byte gUnk_081122B8
_0806AAD4: .4byte gUnk_02034350
_0806AAD4: .4byte gRoomVars
_0806AAD8:
adds r0, r4, #0
adds r0, #0xac
@@ -1060,7 +1060,7 @@ _0806AB2C:
.align 2, 0
_0806AB34: .4byte 0x0000441E
_0806AB38:
ldr r0, _0806AB58 @ =gUnk_02034350
ldr r0, _0806AB58 @ =gRoomVars
ldr r1, [r5, #4]
lsls r1, r1, #2
adds r0, #0xac
@@ -1077,7 +1077,7 @@ _0806AB38:
strb r0, [r5, #0x18]
b _0806AB64
.align 2, 0
_0806AB58: .4byte gUnk_02034350
_0806AB58: .4byte gRoomVars
_0806AB5C:
movs r1, #0x36
ldrsh r0, [r6, r1]
@@ -1098,7 +1098,7 @@ _0806AB70: .4byte gUnk_02033280
sub_0806AB74: @ 0x0806AB74
push {lr}
adds r2, r0, #0
ldr r1, _0806AB94 @ =gUnk_02034350
ldr r1, _0806AB94 @ =gRoomVars
movs r0, #1
strb r0, [r1, #3]
movs r1, #0x32
@@ -1114,7 +1114,7 @@ sub_0806AB74: @ 0x0806AB74
_0806AB92:
pop {pc}
.align 2, 0
_0806AB94: .4byte gUnk_02034350
_0806AB94: .4byte gRoomVars
_0806AB98: .4byte gRoomControls
thumb_func_start sub_0806AB9C
asm/stockwell.s
+12 -12
View File
@@ -70,7 +70,7 @@ sub_080650CC: @ 0x080650CC
mov r7, r8
push {r7}
adds r5, r0, #0
ldr r6, _080650F8 @ =gUnk_02034350
ldr r6, _080650F8 @ =gRoomVars
ldr r0, [r6, #0x68]
movs r1, #1
ands r0, r1
@@ -87,7 +87,7 @@ sub_080650CC: @ 0x080650CC
bl sub_0807DB88
b _080651A6
.align 2, 0
_080650F8: .4byte gUnk_02034350
_080650F8: .4byte gRoomVars
_080650FC: .4byte gUnk_080143C0
_08065100:
adds r2, r5, #0
@@ -328,7 +328,7 @@ sub_080652B0: @ 0x080652B0
strb r0, [r2, #0xd]
movs r0, #0xa
strb r0, [r2, #0xe]
ldr r1, _080652E0 @ =gUnk_02034350
ldr r1, _080652E0 @ =gRoomVars
ldrb r0, [r2, #0xf]
str r0, [r1, #0x68]
movs r0, #0x36
@@ -339,7 +339,7 @@ _080652DA:
pop {pc}
.align 2, 0
_080652DC: .4byte gTextBox
_080652E0: .4byte gUnk_02034350
_080652E0: .4byte gRoomVars
thumb_func_start sub_080652E4
sub_080652E4: @ 0x080652E4
@@ -401,7 +401,7 @@ sub_08065338: @ 0x08065338
movs r0, #1
strb r0, [r2, #0xc]
strb r1, [r2, #0xd]
ldr r1, _08065364 @ =gUnk_02034350
ldr r1, _08065364 @ =gRoomVars
ldrb r0, [r2, #0xf]
str r0, [r1, #0x68]
adds r0, r2, #0
@@ -411,7 +411,7 @@ _0806535C:
pop {pc}
.align 2, 0
_08065360: .4byte gTextBox
_08065364: .4byte gUnk_02034350
_08065364: .4byte gRoomVars
thumb_func_start sub_08065368
sub_08065368: @ 0x08065368
@@ -428,7 +428,7 @@ sub_08065370: @ 0x08065370
adds r4, r0, #0
mov r8, r1
movs r6, #1
ldr r0, _0806539C @ =gUnk_02034350
ldr r0, _0806539C @ =gRoomVars
ldrb r5, [r0, #6]
movs r0, #0
mov sb, r0
@@ -444,7 +444,7 @@ sub_08065370: @ 0x08065370
beq _080653D0
b _0806543C
.align 2, 0
_0806539C: .4byte gUnk_02034350
_0806539C: .4byte gRoomVars
_080653A0:
cmp r5, #0x64
beq _08065414
@@ -539,7 +539,7 @@ _0806543C:
bhi _080654C0
rsbs r0, r6, #0
bl ModRupees
ldr r4, _080654A0 @ =gUnk_02034350
ldr r4, _080654A0 @ =gRoomVars
ldrb r1, [r4, #7]
adds r0, r5, #0
movs r2, #2
@@ -572,7 +572,7 @@ _0806548A:
_08065494: .4byte gUnk_02002A40
_08065498: .4byte 0x000003E6
_0806549C: .4byte 0x00002C0E
_080654A0: .4byte gUnk_02034350
_080654A0: .4byte gRoomVars
_080654A4: .4byte 0x00002C11
_080654A8:
cmp r6, #0x63
@@ -654,9 +654,9 @@ _08065524: .4byte gUnk_02033280
thumb_func_start sub_08065528
sub_08065528: @ 0x08065528
ldr r2, _08065530 @ =gUnk_02034350
ldr r2, _08065530 @ =gRoomVars
ldr r0, [r1, #4]
str r0, [r2, #0x68]
bx lr
.align 2, 0
_08065530: .4byte gUnk_02034350
_08065530: .4byte gRoomVars
asm/sub_0801C824.s
+2 -2
View File
@@ -27,7 +27,7 @@ _0801C83C:
str r2, [r1, #0xc]
str r2, [r1, #0x10]
str r2, [r1, #0x14]
ldr r1, _0801C858 @ =gLCDControls
ldr r1, _0801C858 @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
_0801C84E:
@@ -35,4 +35,4 @@ _0801C84E:
.align 2, 0
_0801C850: .4byte gUnk_0200AF00
_0801C854: .4byte gUnk_02034D30
_0801C858: .4byte gLCDControls
_0801C858: .4byte gScreen
asm/sub_08052418.s
+2 -2
View File
@@ -61,7 +61,7 @@ sub_08052418: @ 0x08052418
ldrh r0, [r2, #0xa]
mov r1, sp
bl sub_0805F46C
ldr r0, _080524A4 @ =gLCDControls
ldr r0, _080524A4 @ =gScreen
strh r5, [r0, #0x1a]
add sp, #0x18
pop {r4, r5, r6, pc}
@@ -70,4 +70,4 @@ _08052494: .4byte gUnk_02021F30
_08052498: .4byte gUnk_020227E8
_0805249C: .4byte gUnk_080FCA8C
_080524A0: .4byte gUnk_080FCAA4
_080524A4: .4byte gLCDControls
_080524A4: .4byte gScreen
asm/sub_080AD3F4.s
+2 -2
View File
@@ -35,7 +35,7 @@ sub_080AD3F4: @ 0x080AD3F4
_080AD42C:
adds r0, r1, #0
bl sub_0801D714
ldr r0, _080AD454 @ =gLCDControls
ldr r0, _080AD454 @ =gScreen
ldrh r1, [r0]
movs r3, #0x80
lsls r3, r3, #3
@@ -50,7 +50,7 @@ _080AD42C:
b _080AD45E
.align 2, 0
_080AD450: .4byte gUnk_02000080
_080AD454: .4byte gLCDControls
_080AD454: .4byte gScreen
_080AD458:
cmp r1, #1
bne _080AD45E
asm/sub_080AD474.s
+4 -4
View File
@@ -61,7 +61,7 @@ _080AD4D2:
ldrb r0, [r4, #7]
cmp r0, #0
bne _080AD524
ldr r2, _080AD510 @ =gLCDControls
ldr r2, _080AD510 @ =gScreen
adds r1, r2, #0
adds r1, #0x66
ldr r0, _080AD514 @ =0x00000844
@@ -86,13 +86,13 @@ _080AD4D2:
b _080AD55A
.align 2, 0
_080AD50C: .4byte gUnk_02024490
_080AD510: .4byte gLCDControls
_080AD510: .4byte gScreen
_080AD514: .4byte 0x00000844
_080AD518: .4byte 0x00001C09
_080AD51C: .4byte 0x00001E03
_080AD520: .4byte 0x0000FF60
_080AD524:
ldr r2, _080AD570 @ =gLCDControls
ldr r2, _080AD570 @ =gScreen
adds r1, r2, #0
adds r1, #0x66
ldr r0, _080AD574 @ =0x00000241
@@ -127,7 +127,7 @@ _080AD55A:
bl DoFade
b _080AD610
.align 2, 0
_080AD570: .4byte gLCDControls
_080AD570: .4byte gScreen
_080AD574: .4byte 0x00000241
_080AD578: .4byte 0x00000909
_080AD57C: .4byte 0x00001D02
asm/sub_080AD6Ac.s
+4 -4
View File
@@ -34,7 +34,7 @@ _080AD6CA:
ands r0, r1
cmp r0, #0
bne _080AD6E4
ldr r1, _080AD71C @ =gLCDControls
ldr r1, _080AD71C @ =gScreen
ldrh r0, [r1, #0x18]
adds r0, #1
strh r0, [r1, #0x18]
@@ -42,7 +42,7 @@ _080AD6E4:
bl sub_080AD84C
cmp r0, #2
beq _080AD6F4
ldr r0, _080AD71C @ =gLCDControls
ldr r0, _080AD71C @ =gScreen
ldrh r0, [r0, #0x18]
cmp r0, #0
bne _080AD76A
@@ -50,7 +50,7 @@ _080AD6F4:
ldrb r0, [r4, #6]
adds r0, #1
strb r0, [r4, #6]
ldr r1, _080AD71C @ =gLCDControls
ldr r1, _080AD71C @ =gScreen
strh r5, [r1, #0x18]
ldr r0, _080AD720 @ =0x00000C09
strh r0, [r1, #0x14]
@@ -64,7 +64,7 @@ _080AD6F4:
b _080AD76A
.align 2, 0
_080AD718: .4byte gUnk_03000FD0
_080AD71C: .4byte gLCDControls
_080AD71C: .4byte gScreen
_080AD720: .4byte 0x00000C09
_080AD724:
ldr r1, _080AD754 @ =gUnk_03000FD0
asm/sub_080AD76C.s
+2 -2
View File
@@ -31,7 +31,7 @@ _080AD78A:
bne _080AD82A
movs r0, #1
strb r0, [r1, #6]
ldr r2, _080AD7B0 @ =gLCDControls
ldr r2, _080AD7B0 @ =gScreen
ldrh r1, [r2]
movs r3, #0x80
lsls r3, r3, #3
@@ -43,7 +43,7 @@ _080AD78A:
b _080AD82A
.align 2, 0
_080AD7AC: .4byte gUnk_03000FD0
_080AD7B0: .4byte gLCDControls
_080AD7B0: .4byte gScreen
_080AD7B4:
ldr r0, [r1, #0x2c]
adds r0, #0x10
asm/sub_080AD89C.s
+2 -2
View File
@@ -33,7 +33,7 @@ _080AD8BC:
movs r1, #7
ands r0, r1
strb r0, [r4, #0x11]
ldr r1, _080AD8E8 @ =gLCDControls
ldr r1, _080AD8E8 @ =gScreen
ldr r2, _080AD8EC @ =gUnk_081320FC
ldrb r0, [r4, #0x11]
lsls r0, r0, #1
@@ -45,5 +45,5 @@ _080AD8E0:
pop {r4, pc}
.align 2, 0
_080AD8E4: .4byte gUnk_02000080
_080AD8E8: .4byte gLCDControls
_080AD8E8: .4byte gScreen
_080AD8EC: .4byte gUnk_081320FC
asm/updateBackgroundRegisters.s
+2 -2
View File
@@ -7,7 +7,7 @@
thumb_func_start sub_08016CF4
sub_08016CF4: @ 0x08016CF4
ldr r3, _08016DF0 @ =gLCDControls
ldr r3, _08016DF0 @ =gScreen
ldrh r1, [r3]
ldrh r0, [r3, #6]
ands r0, r1
@@ -134,5 +134,5 @@ sub_08016CF4: @ 0x08016CF4
strh r0, [r2]
bx lr
.align 2, 0
_08016DF0: .4byte gLCDControls
_08016DF0: .4byte gScreen
_08016DF4: .4byte 0x04000020
data/data_8.s
+2 -2
View File
@@ -34039,10 +34039,10 @@ gGreatFairyRippleOffsets:: @ 08120714
gGreatFairyWings:: @ 08120728
.incbin "baserom.gba", 0x120728, 0x000000C
gUnk_08120734:: @ 08120734
gGreatFairyWake:: @ 08120734
.incbin "baserom.gba", 0x120734, 0x0000008
gGreatFairyWake:: @ 0812073C
gGreatFairyMini:: @ 0812073C
.incbin "baserom.gba", 0x12073C, 0x000000C
gGreatFairyMiniAnim:: @ 08120748
include/entity.h
+23 -10
View File
@@ -24,7 +24,7 @@ union SplitWord {
} HALF;
};
typedef struct
typedef struct Entity
{
u32 *field_0x0;
u32 * field_0x4;
@@ -53,15 +53,28 @@ typedef struct
u8 ss7:1;
} __attribute__((packed)) b;
} __attribute__((packed)) spriteSettings;
u8 spriteOrder;
struct {
u8 b0:2;
u8 b1:2;
u8 b2:4;
} __attribute__((packed)) spriteOrder;
u8 palette;
u8 spriteOrientation[3];
struct {
u8 b0:4;
u8 b1:1;
u8 b2:3;
} __attribute__((packed)) spriteOrientation;
u8 filler[2];
u8 animationList;
u8 field_1f;
u16 field_0x20;
u32 field_0x20;
s16 nonPlanarMovement;
u8 spriteAnimation[3];
u8 ticks;
struct {
u8 b0:3;
u8 b1:5;
} __attribute__((packed)) ticks;
u16 collisions;
union SplitWord x;
union SplitWord y;
@@ -86,8 +99,8 @@ typedef struct
u8 field_0x4d;
u8 field_0x4e;
u8 field_0x4f;
void * parent;
u32 * attachedEntity;
struct Entity * parent;
struct Entity * attachedEntity;
u8 field_0x58;
u8 field_0x59;
union {
@@ -104,9 +117,10 @@ typedef struct
u16 spriteVramOffset;
u8 spriteRenderPositionOffset;
u8 field_0x63;
u8 * field_0x64;
u32 * otherEntity;
u8 filler2[8];
u16 field_0x68;
u16 field_0x6a;
u8 filler4[8];
u32 * heldObjectPtr;
u8 filler3[2];
u16 itemCooldown;
@@ -117,5 +131,4 @@ typedef struct
} Entity;
#endif
include/greatFairy.h
+46
View File
@@ -0,0 +1,46 @@
#ifndef GREATFAIRY_H
#define GREATFAIRY_H
extern u32 __modsi3(u32, u32);
extern void UpdateSprite(Entity *, u32);
extern void sub_08087380();
extern u32 sub_0807CC3C();
extern Entity *sub_080873AC(Entity*, u32, u32);
extern void PositionRelative();
extern void CopyPosition();
extern void DoFade();
extern void PlaySFX();
extern void sub_08004274();
extern void sub_0805EC9C();
extern void sub_0805EC60();
extern void sub_080873D0();
extern void sub_0805E7BC();
extern void sub_080045D4();
extern void sub_0806F69C();
extern u32 Random();
extern void (*gGreatFairy[11])(Entity *);
extern void (*gGreatFairyBehaviors[6])(Entity *);
extern void (*gGreatFairyWings[3])(Entity *);
extern void (*gGreatFairyWake[2])(Entity *);
extern void (*gGreatFairyMini[3])(Entity *);
extern void (*gGreatFairyMiniAnim[3])(Entity *);
extern void (*gGreatFairyDrip[2])(Entity *);
extern void (*gGreatFairyRipple[2])(Entity *);
extern void (*gGreatFairyBigRipple[2])(Entity *);
extern void (*gGreatFairyEnergy[2])(Entity *);
extern void (*gGreatFairyInteract1[4])(Entity *);
extern void (*gGreatFairyInteract2[5])(Entity *);
extern void (*gUnk_081207A4[2])(Entity *);
extern u32 gUnk_0810C2E4;
extern RoomControls gRoomControls;
extern Entity gLinkEntity;
extern s16 gGreatFairyRippleOffsets[10];
extern u32 gUnk_02034350;
extern RoomVars gRoomVars;
extern Screen gScreen;
extern u32 gUnk_02033280;
extern u8 gUnk_0812079C[8];
#endif
include/room.h
+11
View File
@@ -33,4 +33,15 @@ typedef struct {
Entity * cameraTarget;
} RoomControls;
typedef struct {
u8 filler[6];
u8 itemForSaleIndex;
u16 unk;
u8 unk2;
u16 filler2[3];
u8 filler3[4];
u8 filler4[52];
u8 filler5[28];
u32 greatFairyState;
} RoomVars;
#endif
include/bg.h → include/screen.h
+8 -1
View File
@@ -23,7 +23,6 @@ typedef struct {
u16 bg2yOffset;
u16 unk;
u32 unk2;
u16 unk3;
u16 bg3Control;
u16 bg3xOffset;
u16 bg3yOffset;
@@ -60,4 +59,12 @@ typedef struct {
u16 layerBrightness;
} BgControls;
typedef struct {
LcdControls lcd;
BgSettings bg1;
BgSettings bg2;
BgAffSettings affine;
BgControls controls;
} Screen;
#endif
linker.ld
+2 -2
View File
@@ -115,7 +115,7 @@ SECTIONS {
. = 0x000342CC; gUnk_020342CC = .;
. = 0x000342F8; gUnk_020342F8 = .;
. = 0x00034330; gUnk_02034330 = .;
. = 0x00034350; gUnk_02034350 = .;
. = 0x00034350; gRoomVars = .;
. = 0x00034364; gUnk_02034364 = .;
. = 0x00034398; gUnk_02034398 = .;
. = 0x00034480; gUnk_02034480 = .;
@@ -163,7 +163,7 @@ SECTIONS {
. = 0x00000C24; gUnk_03000C24 = .;
. = 0x00000C30; gUnk_03000C30 = .;
. = 0x00000E10; gUnk_03000E10 = .;
. = 0x00000F50; gLCDControls = .;
. = 0x00000F50; gScreen = .;
. = 0x00000F58; gBG0Settings = .;
. = 0x00000F64; gBG1Settings = .;
. = 0x00000F70; gBGAffSettings = .;
src/greatFairy.c
+493 -19
View File
@@ -1,24 +1,11 @@
#include "global.h"
#include "entity.h"
#include "room.h"
#include "screen.h"
#include "greatFairy.h"
extern u32 __modsi3(u32, u32);
extern void UpdateSprite(Entity *, u32);
extern void sub_08087380();
extern u32 sub_0807CC3C();
extern Entity *sub_080873AC(Entity*, u32, u32);
extern void PositionRelative();
extern void (*gGreatFairy[11])(Entity*);
extern void (*gGreatFairyBehaviors[6])(Entity*);
extern u32 gUnk_0810C2E4;
extern RoomControls gRoomControls;
extern Entity gLinkEntity;
extern s16 gGreatFairyRippleOffsets[10];
//Main
void sub_08086A90(Entity *ent)
{
u8 bVar1;
@@ -29,7 +16,8 @@ void sub_08086A90(Entity *ent)
gGreatFairy[(ent->entityType).parameter2](ent);
}
void GreatFairyBehaviors(Entity *ent)
//Behaviors
void sub_08086ABC(Entity *ent)
{
gGreatFairyBehaviors[ent->action](ent);
@@ -45,14 +33,15 @@ void GreatFairyBehaviors(Entity *ent)
}
}
//Init
void sub_08086AF8(Entity *ent)
{
sub_08087380();
ent->parameter3 = 0;
ent->cutsceneBeh = 290;
return;
}
//Dormant update
void sub_08086B10(Entity *ent)
{
u16 *pFrame; // r1@2
@@ -125,4 +114,489 @@ LABEL_16:
(s32)gGreatFairyRippleOffsets[ent->parameter3 + 1] << 16);
ent->parameter3 += 2;
}
}
}
//Create Great Fairy
void sub_08086BA0(Entity *ent)
{
Entity *gf;
gf = sub_080873AC(ent, 7, 0);
if (gf != NULL) {
PositionRelative(ent, gf, 0, 0x80000);
ent->action = 3;
}
}
//Great Fairy spawn-in update
void sub_08086BC4(Entity *ent)
{
Entity *mini;
u32 var;
if (gRoomVars.greatFairyState & 1)
{
mini = sub_080873AC(ent, 2, 0);
if (mini != NULL)
{
CopyPosition(ent, mini);
DoFade(6, 4);
PlaySFX(325);
ent->action = 4;
ent->parameter3 = 0x3c;
var = ent->spriteSettings.raw & ~0x3;
ent->spriteSettings.raw = (ent->spriteSettings.raw & var) | 1;
}
}
}
//Mini Great Fairy update
void sub_08086C18(Entity *ent)
{
Entity *target;
sub_08004274(ent);
if (ent->parameter3 != 0)
{
ent->parameter3 = ent->parameter3 - 1;
}
else {
target = sub_080873AC(ent, 1, 0);
if (target != NULL)
{
PositionRelative(ent, target, 0, -0x140000);
ent->action = 5;
ent->parameter3 = 120;
ent->field_0xf = 0;
}
}
}
//Final Great Fairy update
void sub_08086C58(Entity *ent)
{
Entity *target;
if (ent->parameter3 != 0)
{
ent->parameter3 = ent->parameter3 - 1;
}
else
{
if ((ent->field_0xf == 0) && (target = sub_080873AC(ent, 9, 0), target != NULL))
{
PositionRelative(ent, target, 0, -0x4C0000);
target->parent = ent;
ent->field_0xf = 1;
}
}
sub_08004274(ent);
}
//Wings
void sub_08086C9C(Entity *ent)
{
gGreatFairyWings[ent->action](ent);
}
void sub_08086CB4(Entity *ent)
{
sub_08087380();
ent->ticks.b0 = 5;
ent->spriteSettings.b.ss0 = 1;
ent->spriteOrder.b1 = 1;
gScreen.controls.windowOutsideControl = 3904;
gScreen.controls.mosaicSize = 2057;
ent->nonPlanarMovement = 1024;
sub_0805EC9C(ent, 1024, 256, 0);
}
//Wings init
void sub_08086D18(Entity *ent)
{
s32 iVar1;
iVar1 = (u16)ent->nonPlanarMovement - 32;
ent->nonPlanarMovement = (short)iVar1;
if (iVar1 * 65536 >> 16 == 256) {
ent->action = 2;
sub_0805EC60(ent);
gRoomVars.greatFairyState = gRoomVars.greatFairyState | 32;
gUnk_02033280 = gUnk_02033280 | 4;
}
else {
sub_0805EC9C(ent, ent->nonPlanarMovement, 256, 0);
}
}
void nullsub_116(void)
{
}
//Wake
void sub_08086D6C(Entity *ent)
{
gGreatFairyWake[ent->action](ent);
}
//Wake init
void sub_08086D84(Entity *ent)
{
sub_08087380();
ent->spriteSettings.b.ss0 = 1;
ent->ticks.b0 = 6;
}
//Wake update
void sub_08086DAC(Entity *ent)
{
sub_08004274(ent);
}
//Mini great fairy
void sub_08086DB4(Entity *ent)
{
gGreatFairyMini[ent->action](ent);
}
//Mini great fairy init
void sub_08086DCC(Entity *ent)
{
Entity *wake;
wake = sub_080873AC(ent, 4, 0);
if (wake != NULL) {
CopyPosition(ent, wake);
wake->parent = ent;
sub_08087380(ent);
ent->spriteSettings.b.ss0 = 1;
ent->field_0xf = 0;
}
}
//Mini great fairy pre-drip
void sub_08086E04(Entity *ent)
{
Entity *target;
sub_08004274(ent);
ent->height.WORD = ent->height.WORD + -32768;
if (ent->height.HALF.HI == -20) {
ent->action = 2;
PlaySFX(321);
}
else {
if (((ent->height.HALF.HI == -10) && (ent->field_0xf == 0)) &&
(target = sub_080873AC(ent, 5, 0), target != NULL)) {
PositionRelative(ent, target, 0, 0x40000);
ent->field_0xf = 1;
}
}
}
void sub_08086E64(Entity *ent)
{
sub_08004274(ent);
sub_080873D0(ent);
if ((gRoomVars.greatFairyState & 1) != 0) {
sub_0805E7BC(ent);
}
}
//Mini great fairy behaviors
void sub_08086E8C(Entity *ent)
{
gGreatFairyMiniAnim[ent->action](ent);
}
void sub_08086EA4(Entity *ent)
{
sub_08087380();
ent->ticks.b0 = 6;
ent->spriteSettings.b.ss0 = 1;
}
//Mini great fairy translate
void sub_08086ED0(Entity *ent)
{
Entity *parent = ent->parent;
CopyPosition(parent, ent);
if (ent->height.HALF.HI == -20) {
ent->action = 2;
ent->parameter3 = 90;
ent->nonPlanarMovement = 4096;
ent->spriteOrder.b0 = 3;
sub_0805EC9C(ent, 256, 256, 0);
}
}
//Mini great fairy stretch
void sub_08086F10(Entity *ent)
{
u32 bVar1;
s32 iVar2;
bVar1 = ent->parameter3 -= 1;
if (bVar1 == 0) {
gRoomVars.greatFairyState = gRoomVars.greatFairyState | 1;
ent->action = 3;
sub_0805EC60(ent);
}
else {
iVar2 = (u16)ent->nonPlanarMovement - 24;
ent->nonPlanarMovement = iVar2;
sub_0805EC9C(ent, 256, iVar2 * 65536 >> 20, 0);
}
}
//Drip
void sub_08086F54(Entity *ent)
{
gGreatFairyDrip[ent->action](ent);
}
//Drip init
void sub_08086F6C(Entity *ent)
{
sub_08087380();
ent->spriteSettings.b.ss0 = 1;
ent->height.HALF.HI = 0;
ent->ticks.b0 = 5;
PlaySFX(320);
}
//Drip update
void sub_08086FA0(Entity *ent)
{
sub_08004274(ent);
if ((ent->frames.all & 128) != 0) {
sub_0805E7BC(ent);
}
}
//Ripple
void sub_08086FC0(Entity *ent)
{
gGreatFairyRipple[ent->action](ent);
}
//Ripple init
void sub_08086FD8(Entity *ent)
{
sub_08087380();
ent->spriteSettings.b.ss0 = 1;
ent->ticks.b0 = 6;
}
//Ripple update
void sub_08087000(Entity *ent)
{
if ((gRoomVars.greatFairyState & 2) != 0) {
sub_0805E7BC(ent);
}
else {
sub_08004274(ent);
}
}
//Big ripple
void sub_08087024(Entity *ent)
{
gGreatFairyBigRipple[ent->action](ent);
}
//Big ripple init
void sub_0808703C(Entity *ent)
{
sub_08087380();
ent->parameter3 = 120;
ent->spriteSettings.b.ss0 = 1;
ent->ticks.b0 = 5;
PlaySFX(249);
}
//Big ripple update
void sub_0808706C(Entity *ent)
{
Entity *target;
sub_08004274(ent);
if (ent->parameter3 != 0) {
ent->parameter3 = ent->parameter3 - 1;
}
else {
target = sub_080873AC(ent,3,0);
if (target != NULL) {
PositionRelative(ent,target,0,-524288);
gRoomVars.greatFairyState = gRoomVars.greatFairyState | 2;
sub_0805E7BC(ent);
}
}
}
//Energy
void GreatFairyEnergy(Entity *ent)
{
gGreatFairyEnergy[ent->action](ent);
}
//Energy init
void sub_080870CC(Entity *ent)
{
sub_08087380();
ent->spriteSettings.b.ss0 = 1;
ent->ticks.b0 = 5;
}
//Energy update
void sub_080870F4(Entity *ent)
{
sub_08004274(ent);
if ((ent->frames.all & 128) != 0) {
sub_0805E7BC(ent);
}
}
void sub_08087114(Entity *ent)
{
if ((ent->entityType).parameter2 == 0) {
gGreatFairyInteract1[ent->action](ent);
}
else {
gGreatFairyInteract2[ent->action](ent);
sub_08004274(ent);
}
}
#ifdef NON_MATCHING
void sub_08087150(Entity *ent)
{
u8 var;
u32 var2;
sub_08087380(ent);
ent->spriteSettings.b.ss0 = 1;
ent->spriteOrientation &= 63;
ent->spriteOrder.b0 = 0;
ent->ticks.b0 = 3;
ent->nonPlanarMovement = 128;
ent->direction = 16;
var = gUnk_0812079C[0];
ent->palette = ((var & 15) * 16) | ent->direction;
}
#else
NAKED
void sub_08087150(Entity *ent)
{
asm(".include \"asm/greatFairy/sub_08087150.inc\"");
}
#endif
void nullsub_516()
{
}
void sub_080871A8(Entity *ent)
{
u32 bVar1;
bVar1 = ent->parameter3 -= 1;
if (bVar1 == 0) {
ent->action = 3;
ent->parameter3 = 60;
gRoomVars.greatFairyState = gRoomVars.greatFairyState | 4;
}
}
void sub_080871D0(Entity *ent)
{
u8 bVar1;
bVar1 = ent->parameter3 -= 1;
if (bVar1 == 0) {
gRoomVars.greatFairyState = gRoomVars.greatFairyState | 8;
sub_0805E7BC(ent);
}
}
#ifdef NON_MATCHING
void sub_080871F8(Entity *ent)
{
s32 bVar1;
if ((( ent->attachedEntity->x.HALF.HI == (ent->x).HALF.HI) &&
((Entity *)ent->attachedEntity)->y.HALF.HI + -32 == (ent->y).HALF.HI)) {
ent->action = 2;
}
else {
bVar1 = (ent->x).HALF.HI;
sub_080045D4();
ent->direction = bVar1;
sub_0806F69C(ent);
}
}
#else
NAKED
void sub_080871F8(Entity *ent)
{
asm(".include \"asm/greatFairy/sub_080871F8.inc\"");
}
#endif
void sub_08087240(Entity *ent)
{
if ((gRoomVars.greatFairyState & 4) != 0) {
ent->action = 3;
ent->parameter3 = 20;
ent->direction = 16;
}
}
void sub_08087264(Entity *ent)
{
if (ent->parameter3 != 0) {
ent->parameter3 = ent->parameter3 - 1;
sub_0806F69C(ent);
}
}
void sub_0808727C(Entity *ent)
{
u8 bVar1;
bVar1 = ent->parameter3 -= 1;
if (bVar1 == 0) {
sub_0805E7BC(ent);
}
}
void sub_08087294(Entity *ent)
{
gUnk_081207A4[ent->action](ent);
}
#ifdef NON_MATCHING
void sub_080872AC(Entity *ent)
{
ent->spriteSettings.b.ss0 = 1;
ent->spriteOrientation.b2 = 1;
ent->spriteOrder.b0 = 0;
ent->field_0x68 = (u16)(ent->x).HALF.HI;
ent->field_0x6a = (u16)(ent->y).HALF.HI;
ent->direction = (u8)Random() & 0x1F;
ent->nonPlanarMovement = 32;
sub_08087380(ent);
}
#else
NAKED
void sub_080872AC(Entity *ent)
{
asm(".include \"asm/greatFairy/sub_080872AC.inc\"");
}
#endif