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

textbox

Browse Source
This commit is contained in:
theo
2020-05-26 23:00:23 -07:00
parent bf919c8006
commit 731ce9b7a5
64 changed files with 110566 additions and 110456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/InitializeLink.s
+2 -2
View File
@@ -23,7 +23,7 @@ InitializeLink: @ 0x080524A8
adds r0, r4, #0
movs r1, #0x88
bl sub_0801D630
ldr r0, _0805251C @ =gUnk_03000BF0
ldr r0, _0805251C @ =gRoomControls
str r4, [r0, #0x30]
ldr r1, _08052520 @ =gUnk_080FCAC8
ldr r5, _08052524 @ =gUnk_030010A0
@@ -54,7 +54,7 @@ _080524FA:
_08052510: .4byte gUnk_03000B80
_08052514: .4byte gUnk_03003F80
_08052518: .4byte gLinkEntity
_0805251C: .4byte gUnk_03000BF0
_0805251C: .4byte gRoomControls
_08052520: .4byte gUnk_080FCAC8
_08052524: .4byte gUnk_030010A0
_08052528: .4byte _0805252C
asm/code_080011C4.s
+4 -4
View File
@@ -1375,7 +1375,7 @@ _08002902:
non_word_aligned_thumb_func_start sub_0800290E
sub_0800290E: @ 0x0800290E
push {r4, r5, r6, lr}
ldr r4, _080029A8 @ =gUnk_03000BF0
ldr r4, _080029A8 @ =gRoomControls
ldrh r5, [r4, #0xa]
ldrh r6, [r4, #6]
subs r5, r5, r6
@@ -1403,7 +1403,7 @@ _0800293A:
non_word_aligned_thumb_func_start sub_0800293E
sub_0800293E: @ 0x0800293E
push {r4, r5, r6, r7, lr}
ldr r4, _080029AC @ =gUnk_03000BF0
ldr r4, _080029AC @ =gRoomControls
ldr r7, _080029B0 @ =gLinkEntity
ldrh r6, [r4, #6]
ldrh r5, [r7, #0x2e]
@@ -1442,6 +1442,6 @@ _08002998: .4byte 0x0000E004
_0800299C: .4byte 0x00000E02
_080029A0: .4byte 0x0000E040
_080029A4: .4byte 0x00000E20
_080029A8: .4byte gUnk_03000BF0
_080029AC: .4byte gUnk_03000BF0
_080029A8: .4byte gRoomControls
_080029AC: .4byte gRoomControls
_080029B0: .4byte gLinkEntity
asm/code_08003FC4.s
+2 -2
View File
@@ -143,7 +143,7 @@ sub_080040A2: @ 0x080040A2
thumb_func_start sub_080040A8
sub_080040A8: @ 0x080040A8
ldr r1, _08004368 @ =gUnk_03000BF0
ldr r1, _08004368 @ =gRoomControls
movs r2, #0x2e
ldrsh r2, [r0, r2]
ldrh r3, [r1, #0xa]
@@ -567,7 +567,7 @@ _08004358: .4byte gUnk_081326EC
_0800435C: .4byte gUnk_02024048
_08004360: .4byte gUnk_02021F20
_08004364: .4byte gUnk_02024048
_08004368: .4byte gUnk_03000BF0
_08004368: .4byte gRoomControls
_0800436C: .4byte 0x0000016E
_08004370: .4byte 0x0000011E
_08004374: .4byte gUnk_03000BF6
asm/code_080041E8.s
+1 -1
View File
@@ -233,7 +233,7 @@ _08004358: .4byte gUnk_081326EC
_0800435C: .4byte gUnk_02024048
_08004360: .4byte gUnk_02021F20
_08004364: .4byte gUnk_02024048
_08004368: .4byte gUnk_03000BF0
_08004368: .4byte gRoomControls
_0800436C: .4byte 0x0000016E
_08004370: .4byte 0x0000011E
_08004374: .4byte gUnk_03000BF6
asm/code_0800857C.s
+4 -41
View File
@@ -306,7 +306,7 @@ sub_08008790: @ 0x08008790
sub_08008796: @ 0x08008796
push {r4, r5, r6, r7, lr}
push {r2, r3}
ldr r2, _080088D4 @ =gUnk_03000BF0
ldr r2, _080088D4 @ =gRoomControls
ldrh r3, [r2]
movs r2, #1
cmp r2, r3
@@ -389,7 +389,7 @@ _0800882C:
strb r1, [r0, r3]
bl sub_08016A04
_0800883A:
ldr r1, _080088E0 @ =gUnk_03000BF0
ldr r1, _080088E0 @ =gRoomControls
ldrh r0, [r1, #6]
subs r2, r6, r0
lsrs r2, r2, #4
@@ -447,10 +447,10 @@ _080088C4: .4byte gUnk_08000248
_080088C8: .4byte gUnk_03003F80
_080088CC: .4byte gUnk_0800823C
_080088D0: .4byte gUnk_08007DF4
_080088D4: .4byte gUnk_03000BF0
_080088D4: .4byte gRoomControls
_080088D8: .4byte gUnk_080046A4
_080088DC: .4byte gUnk_080047F6
_080088E0: .4byte gUnk_03000BF0
_080088E0: .4byte gRoomControls
_080088E4: .4byte 0x00004000
_080088E8: .4byte 0x0000FFFF
_080088EC:
@@ -4126,40 +4126,3 @@ sub_08016AD2: @ 0x08016AD2
bl sub_08016A04
pop {r0, r4, pc}
thumb_func_start sub_08016AE4
sub_08016AE4: @ 0x08016AE4
mov r3, lr
push {r3, r4}
adds r4, r0, #0
ldrb r2, [r0, #0xc]
cmp r2, #0
bne _08016AFC
bl sub_080A7D80
cmp r0, #0
bne _08016B0A
bl sub_0805E780
_08016AFC:
bl sub_0805E3B0
cmp r0, #0
bne _08016B22
adds r0, r4, #0
bl sub_080028E0
_08016B0A:
adds r0, r4, #0
ldrb r1, [r0, #9]
lsls r1, r1, #2
ldr r2, _08016B2C @ =gUnk_08129320
ldr r1, [r2, r1]
bl _call_via_r1
movs r1, #0x41
movs r3, #0x7f
ldrb r2, [r4, r1]
ands r2, r3
strb r2, [r4, r1]
_08016B22:
adds r0, r4, #0
bl sub_0800404C
pop {r3, r4}
bx r3
.align 2, 0
_08016B2C: .4byte gUnk_08129320
asm/code_08016B30.s
+4 -4
View File
@@ -142,7 +142,7 @@ sub_08016C3C: @ 0x08016C3C
ldrb r0, [r2]
cmp r0, #0
beq _08016C6C
ldr r0, _08016C98 @ =gUnk_03000F50
ldr r0, _08016C98 @ =gLCDControls
ldrh r1, [r0]
movs r0, #0x80
lsls r0, r0, #5
@@ -162,7 +162,7 @@ sub_08016C3C: @ 0x08016C3C
str r0, [r1, #8]
ldr r0, [r1, #8]
_08016C6C:
ldr r4, _08016CA4 @ =gUnk_03000F58
ldr r4, _08016CA4 @ =gBG0Settings
adds r0, r4, #0
bl sub_08016CA8
adds r0, r4, #0
@@ -179,10 +179,10 @@ _08016C6C:
bx r0
.align 2, 0
_08016C94: .4byte gUnk_03000000
_08016C98: .4byte gUnk_03000F50
_08016C98: .4byte gLCDControls
_08016C9C: .4byte 0x040000D4
_08016CA0: .4byte 0x84000100
_08016CA4: .4byte gUnk_03000F58
_08016CA4: .4byte gBG0Settings
thumb_func_start sub_08016CA8
sub_08016CA8: @ 0x08016CA8
asm/code_08016DF8.s
+4 -4
View File
@@ -357,7 +357,7 @@ _080170B4:
beq _080170C0
b _080171EA
_080170C0:
ldr r0, _08017124 @ =gUnk_02000050
ldr r0, _08017124 @ =gTextBox
ldrb r0, [r0]
movs r1, #0x7f
ands r1, r0
@@ -410,7 +410,7 @@ _08017112:
strh r1, [r0]
b _0801715A
.align 2, 0
_08017124: .4byte gUnk_02000050
_08017124: .4byte gTextBox
_08017128: .4byte gUnk_02034350
_0801712C: .4byte gUnk_02002A40
_08017130: .4byte gUnk_0200AF00
@@ -1003,7 +1003,7 @@ _080175A4:
lsls r0, r1, #4
subs r0, #0x10
adds r2, r0, r2
ldr r3, _080175E4 @ =gUnk_03000BF0
ldr r3, _080175E4 @ =gRoomControls
ldrh r0, [r4, #0x2e]
ldrh r1, [r3, #6]
subs r0, r0, r1
@@ -1023,7 +1023,7 @@ _080175D2:
_080175D8: .4byte gUnk_020342F8
_080175DC: .4byte gUnk_080B313C
_080175E0: .4byte gUnk_02031EC0
_080175E4: .4byte gUnk_03000BF0
_080175E4: .4byte gRoomControls
thumb_func_start sub_080175E8
sub_080175E8: @ 0x080175E8
asm/code_08018500.s
+89 -89
View File
@@ -320,7 +320,7 @@ sub_08018738: @ 0x08018738
lsls r0, r0, #2
ldr r1, _08018764 @ =gUnk_080FE320
adds r0, r0, r1
ldr r1, _08018768 @ =gUnk_03000BF0
ldr r1, _08018768 @ =gRoomControls
ldrh r0, [r0, #2]
ldrh r1, [r1, #4]
cmp r0, r1
@@ -334,7 +334,7 @@ _08018760:
pop {r4, pc}
.align 2, 0
_08018764: .4byte gUnk_080FE320
_08018768: .4byte gUnk_03000BF0
_08018768: .4byte gRoomControls
thumb_func_start sub_0801876C
sub_0801876C: @ 0x0801876C
@@ -553,7 +553,7 @@ _08018930:
adds r2, r0, #0
cmp r2, #0
beq _08018958
ldr r0, _08018978 @ =gUnk_03000BF0
ldr r0, _08018978 @ =gRoomControls
ldrh r1, [r0, #6]
ldrh r3, [r5, #8]
adds r1, r1, r3
@@ -579,7 +579,7 @@ _08018958:
b _0801899C
.align 2, 0
_08018974: .4byte gUnk_080FEE78
_08018978: .4byte gUnk_03000BF0
_08018978: .4byte gRoomControls
_0801897C:
ldrh r4, [r5, #8]
lsrs r4, r4, #4
@@ -1715,7 +1715,7 @@ _0801920E:
_0801921A:
movs r1, #0x2e
ldrsh r0, [r4, r1]
ldr r2, _08019288 @ =gUnk_03000BF0
ldr r2, _08019288 @ =gRoomControls
ldrh r1, [r2, #6]
subs r0, r0, r1
asrs r0, r0, #4
@@ -1765,7 +1765,7 @@ _0801921A:
bl sub_08004260
b _080192A2
.align 2, 0
_08019288: .4byte gUnk_03000BF0
_08019288: .4byte gRoomControls
_0801928C: .4byte gLinkEntity
_08019290: .4byte gUnk_08003E44
_08019294:
@@ -2181,7 +2181,7 @@ sub_08019580: @ 0x08019580
_080195B0:
movs r1, #0x2e
ldrsh r0, [r4, r1]
ldr r2, _0801962C @ =gUnk_03000BF0
ldr r2, _0801962C @ =gRoomControls
ldrh r1, [r2, #6]
subs r0, r0, r1
asrs r0, r0, #4
@@ -2236,7 +2236,7 @@ _0801961A:
bl sub_0805E780
b _0801963C
.align 2, 0
_0801962C: .4byte gUnk_03000BF0
_0801962C: .4byte gRoomControls
_08019630: .4byte gLinkEntity
_08019634: .4byte gUnk_08003E44
_08019638:
@@ -2309,7 +2309,7 @@ sub_08019698: @ 0x08019698
ldrh r0, [r4]
ldrh r1, [r4, #2]
bl sub_08052FD8
ldr r5, _0801972C @ =gUnk_03000BF0
ldr r5, _0801972C @ =gRoomControls
ldrh r0, [r4, #6]
ldrh r1, [r5, #0xa]
adds r0, r0, r1
@@ -2322,7 +2322,7 @@ sub_08019698: @ 0x08019698
movs r0, #1
strb r0, [r1]
bl sub_08000108
ldr r2, _08019734 @ =gUnk_03000F50
ldr r2, _08019734 @ =gLCDControls
ldrh r1, [r2]
ldr r0, _08019738 @ =0x0000FEFF
ands r0, r1
@@ -2359,9 +2359,9 @@ _08019700:
.align 2, 0
_08019724: .4byte gUnk_02032EC0
_08019728: .4byte gUnk_080B4410
_0801972C: .4byte gUnk_03000BF0
_0801972C: .4byte gRoomControls
_08019730: .4byte gUnk_02000070
_08019734: .4byte gUnk_03000F50
_08019734: .4byte gLCDControls
_08019738: .4byte 0x0000FEFF
_0801973C: .4byte gUnk_02018EB0
@@ -2426,7 +2426,7 @@ sub_080197A0: @ 0x080197A0
thumb_func_start sub_080197AC
sub_080197AC: @ 0x080197AC
ldr r0, _080197C4 @ =gUnk_02025EB0
ldr r1, _080197C8 @ =gUnk_03000F70
ldr r1, _080197C8 @ =gBGAffSettings
str r1, [r0]
ldr r2, _080197CC @ =gUnk_080B77C0
ldrh r0, [r2]
@@ -2439,7 +2439,7 @@ sub_080197AC: @ 0x080197AC
bx lr
.align 2, 0
_080197C4: .4byte gUnk_02025EB0
_080197C8: .4byte gUnk_03000F70
_080197C8: .4byte gBGAffSettings
_080197CC: .4byte gUnk_080B77C0
_080197D0: .4byte gUnk_0200B650
@@ -2565,7 +2565,7 @@ _0801989E:
adds r4, r0, #0
cmp r4, #0xff
beq _0801997C
ldr r5, _08019960 @ =gUnk_03000BF0
ldr r5, _08019960 @ =gRoomControls
ldrb r1, [r5, #0xf]
movs r0, #4
ands r0, r1
@@ -2646,7 +2646,7 @@ _0801995A:
movs r0, #3
bl _0801A2A6
.align 2, 0
_08019960: .4byte gUnk_03000BF0
_08019960: .4byte gRoomControls
_08019964: .4byte gUnk_080B4490
_08019968: .4byte 0x00010002
_0801996C:
@@ -2675,7 +2675,7 @@ _0801997C:
movs r2, #0
ldrsh r1, [r6, r2]
adds r0, r0, r1
ldr r3, _080199E4 @ =gUnk_03000BF0
ldr r3, _080199E4 @ =gRoomControls
ldrh r1, [r3, #6]
subs r0, r0, r1
asrs r7, r0, #4
@@ -2706,7 +2706,7 @@ _0801997C:
.align 2, 0
_080199DC: .4byte gLinkEntity
_080199E0: .4byte gUnk_080B4468
_080199E4: .4byte gUnk_03000BF0
_080199E4: .4byte gRoomControls
_080199E8: .4byte 0x00003FFF
_080199EC:
adds r4, r6, #0
@@ -3013,7 +3013,7 @@ _08019C02:
adds r6, r0, r1
movs r1, #0x2e
ldrsh r0, [r5, r1]
ldr r4, _08019C58 @ =gUnk_03000BF0
ldr r4, _08019C58 @ =gRoomControls
ldrh r1, [r4, #6]
subs r0, r0, r1
movs r2, #0
@@ -3046,7 +3046,7 @@ _08019C38:
.align 2, 0
_08019C50: .4byte gUnk_03003F80
_08019C54: .4byte gUnk_080B4478
_08019C58: .4byte gUnk_03000BF0
_08019C58: .4byte gRoomControls
_08019C5C:
ldrh r0, [r2, #2]
ldrh r4, [r4, #6]
@@ -3560,7 +3560,7 @@ _0801A02A:
ands r0, r1
lsls r0, r0, #4
adds r0, #8
ldr r2, _0801A090 @ =gUnk_03000BF0
ldr r2, _0801A090 @ =gRoomControls
ldrh r1, [r2, #6]
adds r1, r1, r0
strh r1, [r5, #0x2e]
@@ -3597,7 +3597,7 @@ _0801A080: .4byte 0x0000FFFF
_0801A084: .4byte 0x00000FFF
_0801A088: .4byte gUnk_03004040
_0801A08C: .4byte gLinkEntity
_0801A090: .4byte gUnk_03000BF0
_0801A090: .4byte gRoomControls
_0801A094:
movs r0, #0xa0
strb r0, [r2, #6]
@@ -3946,7 +3946,7 @@ _0801A32C:
beq _0801A36C
movs r1, #0x3f
ands r1, r4
ldr r0, _0801A368 @ =gUnk_03000BF0
ldr r0, _0801A368 @ =gRoomControls
lsls r1, r1, #4
ldrh r2, [r0, #6]
adds r1, r1, r2
@@ -3967,7 +3967,7 @@ _0801A32C:
b _0801A36E
.align 2, 0
_0801A364: .4byte 0x00002004
_0801A368: .4byte gUnk_03000BF0
_0801A368: .4byte gRoomControls
_0801A36C:
movs r0, #0
_0801A36E:
@@ -4146,7 +4146,7 @@ _0801A4B0:
beq _0801A4F0
movs r1, #0x3f
ands r1, r4
ldr r0, _0801A4EC @ =gUnk_03000BF0
ldr r0, _0801A4EC @ =gRoomControls
lsls r1, r1, #4
ldrh r2, [r0, #6]
adds r1, r1, r2
@@ -4167,7 +4167,7 @@ _0801A4B0:
b _0801A4F2
.align 2, 0
_0801A4E8: .4byte 0x00002004
_0801A4EC: .4byte gUnk_03000BF0
_0801A4EC: .4byte gRoomControls
_0801A4F0:
movs r0, #0
_0801A4F2:
@@ -4282,7 +4282,7 @@ _0801A5B6:
_0801A5BC:
movs r1, #0x2e
ldrsh r0, [r6, r1]
ldr r2, _0801A66C @ =gUnk_03000BF0
ldr r2, _0801A66C @ =gRoomControls
ldrh r1, [r2, #6]
subs r0, r0, r1
asrs r4, r0, #4
@@ -4376,13 +4376,13 @@ _0801A65E:
b _0801A8B4
.align 2, 0
_0801A668: .4byte 0x00005004
_0801A66C: .4byte gUnk_03000BF0
_0801A66C: .4byte gRoomControls
_0801A670: .4byte 0xFFFFFC97
_0801A674: .4byte 0x00001FC4
_0801A678:
movs r0, #0x2e
ldrsh r1, [r6, r0]
ldr r3, _0801A730 @ =gUnk_03000BF0
ldr r3, _0801A730 @ =gRoomControls
ldrh r0, [r3, #6]
subs r0, #0xa
subs r1, r1, r0
@@ -4480,13 +4480,13 @@ _0801A722:
beq _0801A71A
b _0801A8B4
.align 2, 0
_0801A730: .4byte gUnk_03000BF0
_0801A730: .4byte gRoomControls
_0801A734: .4byte 0x00000369
_0801A738: .4byte 0x00002004
_0801A73C:
movs r1, #0x2e
ldrsh r0, [r6, r1]
ldr r2, _0801A7E8 @ =gUnk_03000BF0
ldr r2, _0801A7E8 @ =gRoomControls
ldrh r1, [r2, #6]
subs r0, r0, r1
asrs r4, r0, #4
@@ -4576,7 +4576,7 @@ _0801A7D6:
beq _0801A7D6
b _0801A8B4
.align 2, 0
_0801A7E8: .4byte gUnk_03000BF0
_0801A7E8: .4byte gRoomControls
_0801A7EC: .4byte 0x0000036F
_0801A7F0: .4byte 0x00000372
_0801A7F4: .4byte 0x00000369
@@ -4584,7 +4584,7 @@ _0801A7F8: .4byte 0x00002004
_0801A7FC:
movs r0, #0x2e
ldrsh r1, [r6, r0]
ldr r3, _0801A890 @ =gUnk_03000BF0
ldr r3, _0801A890 @ =gRoomControls
ldrh r0, [r3, #6]
adds r0, #0xa
subs r1, r1, r0
@@ -4660,7 +4660,7 @@ _0801A87C:
ldrb r0, [r1]
b _0801A8B0
.align 2, 0
_0801A890: .4byte gUnk_03000BF0
_0801A890: .4byte gRoomControls
_0801A894: .4byte 0x0000036F
_0801A898: .4byte 0x00000372
_0801A89C: .4byte 0x00000369
@@ -4710,7 +4710,7 @@ sub_0801A8D0: @ 0x0801A8D0
bne _0801A92C
movs r1, #0x2e
ldrsh r0, [r5, r1]
ldr r2, _0801A91C @ =gUnk_03000BF0
ldr r2, _0801A91C @ =gRoomControls
ldrh r1, [r2, #6]
subs r0, r0, r1
asrs r4, r0, #4
@@ -4734,7 +4734,7 @@ sub_0801A8D0: @ 0x0801A8D0
subs r0, r4, #1
b _0801A97A
.align 2, 0
_0801A91C: .4byte gUnk_03000BF0
_0801A91C: .4byte gRoomControls
_0801A920: .4byte 0x00004055
_0801A924:
ldr r0, _0801A928 @ =0x00004056
@@ -4744,7 +4744,7 @@ _0801A928: .4byte 0x00004056
_0801A92C:
movs r0, #0x2e
ldrsh r1, [r5, r0]
ldr r3, _0801A960 @ =gUnk_03000BF0
ldr r3, _0801A960 @ =gRoomControls
ldrh r0, [r3, #6]
adds r0, #8
subs r1, r1, r0
@@ -4769,7 +4769,7 @@ _0801A92C:
subs r0, #0x40
b _0801A97A
.align 2, 0
_0801A960: .4byte gUnk_03000BF0
_0801A960: .4byte gRoomControls
_0801A964: .4byte 0x00004057
_0801A968:
ldr r0, _0801A974 @ =0x00004058
@@ -4806,7 +4806,7 @@ sub_0801A980: @ 0x0801A980
movs r3, #0
ldrsh r1, [r2, r3]
adds r0, r0, r1
ldr r5, _0801A9E8 @ =gUnk_03000BF0
ldr r5, _0801A9E8 @ =gRoomControls
ldrh r1, [r5, #6]
subs r0, r0, r1
asrs r0, r0, #4
@@ -4838,7 +4838,7 @@ _0801A9DC:
.align 2, 0
_0801A9E0: .4byte gLinkEntity
_0801A9E4: .4byte gUnk_080B44A8
_0801A9E8: .4byte gUnk_03000BF0
_0801A9E8: .4byte gRoomControls
_0801A9EC: .4byte 0x00003FFF
thumb_func_start sub_0801A9F0
@@ -4943,7 +4943,7 @@ _0801AA94:
ands r0, r1
lsls r0, r0, #4
adds r0, #8
ldr r2, _0801AAF8 @ =gUnk_03000BF0
ldr r2, _0801AAF8 @ =gRoomControls
ldrh r1, [r2, #6]
adds r1, r1, r0
strh r1, [r4, #0x2e]
@@ -4977,7 +4977,7 @@ _0801AA94:
.align 2, 0
_0801AAF0: .4byte gUnk_080B4488
_0801AAF4: .4byte 0x00002004
_0801AAF8: .4byte gUnk_03000BF0
_0801AAF8: .4byte gRoomControls
_0801AAFC: .4byte gUnk_03003F80
_0801AB00:
movs r0, #0
@@ -5208,7 +5208,7 @@ sub_0801AC98: @ 0x0801AC98
mov r5, r8
push {r5, r6, r7}
sub sp, #8
ldr r0, _0801ACD0 @ =gUnk_03000BF0
ldr r0, _0801ACD0 @ =gRoomControls
ldrh r1, [r0, #0x1e]
lsrs r1, r1, #4
mov r8, r1
@@ -5233,7 +5233,7 @@ _0801ACC4:
mov sb, r0
b _0801ACDA
.align 2, 0
_0801ACD0: .4byte gUnk_03000BF0
_0801ACD0: .4byte gRoomControls
_0801ACD4: .4byte gUnk_080B44C0
_0801ACD8:
adds r5, #0xc
@@ -5337,7 +5337,7 @@ sub_0801AD6C: @ 0x0801AD6C
ands r0, r1
lsls r0, r0, #4
adds r0, #8
ldr r2, _0801ADD4 @ =gUnk_03000BF0
ldr r2, _0801ADD4 @ =gRoomControls
ldrh r1, [r2, #6]
adds r1, r1, r0
movs r3, #0
@@ -5363,7 +5363,7 @@ sub_0801AD6C: @ 0x0801AD6C
bl sub_0805EA2C
b _0801AE26
.align 2, 0
_0801ADD4: .4byte gUnk_03000BF0
_0801ADD4: .4byte gRoomControls
_0801ADD8: .4byte gUnk_081091E4
_0801ADDC:
bl sub_0805E8D4
@@ -5383,7 +5383,7 @@ _0801ADDC:
ands r0, r1
lsls r0, r0, #4
adds r0, #8
ldr r2, _0801AE28 @ =gUnk_03000BF0
ldr r2, _0801AE28 @ =gRoomControls
ldrh r1, [r2, #6]
adds r1, r1, r0
strh r1, [r3, #0x38]
@@ -5404,7 +5404,7 @@ _0801ADDC:
_0801AE26:
pop {r4, r5, r6, pc}
.align 2, 0
_0801AE28: .4byte gUnk_03000BF0
_0801AE28: .4byte gRoomControls
_0801AE2C: .4byte gUnk_081091E4
thumb_func_start sub_0801AE30
@@ -5414,20 +5414,20 @@ sub_0801AE30: @ 0x0801AE30
thumb_func_start sub_0801AE34
sub_0801AE34: @ 0x0801AE34
ldr r0, _0801AE40 @ =gUnk_03000BF0
ldr r0, _0801AE40 @ =gRoomControls
ldrb r0, [r0, #0xf]
lsrs r0, r0, #1
movs r1, #1
ands r0, r1
bx lr
.align 2, 0
_0801AE40: .4byte gUnk_03000BF0
_0801AE40: .4byte gRoomControls
thumb_func_start sub_0801AE44
sub_0801AE44: @ 0x0801AE44
push {r4, lr}
adds r4, r0, #0
ldr r1, _0801AEE0 @ =gUnk_03000BF0
ldr r1, _0801AEE0 @ =gRoomControls
movs r0, #0
str r0, [r1, #0x34]
bl sub_0807BFD0
@@ -5477,7 +5477,7 @@ _0801AE9A:
ldr r0, [r0]
bl _call_via_r1
_0801AEB6:
ldr r0, _0801AEE0 @ =gUnk_03000BF0
ldr r0, _0801AEE0 @ =gRoomControls
ldrb r1, [r0, #0xf]
movs r0, #1
ands r0, r1
@@ -5498,7 +5498,7 @@ _0801AED0:
bl sub_0801AB08
b _0801AF10
.align 2, 0
_0801AEE0: .4byte gUnk_03000BF0
_0801AEE0: .4byte gRoomControls
_0801AEE4: .4byte gUnk_030010A0
_0801AEE8: .4byte gUnk_02033A90
_0801AEEC: .4byte 0x0600F000
@@ -5634,7 +5634,7 @@ sub_0801AFE4: @ 0x0801AFE4
mov r5, r8
push {r5, r6, r7}
ldr r3, _0801B018 @ =gUnk_02027EB4
ldr r0, _0801B01C @ =gUnk_03000BF0
ldr r0, _0801B01C @ =gRoomControls
ldrh r1, [r0, #0x1e]
lsrs r1, r1, #4
mov sl, r1
@@ -5657,7 +5657,7 @@ _0801B00E:
b _0801B026
.align 2, 0
_0801B018: .4byte gUnk_02027EB4
_0801B01C: .4byte gUnk_03000BF0
_0801B01C: .4byte gRoomControls
_0801B020: .4byte gUnk_080B44D0
_0801B024:
adds r1, #4
@@ -6614,7 +6614,7 @@ _0801B6DC:
_0801B6FE:
movs r1, #0x2e
ldrsh r0, [r4, r1]
ldr r2, _0801B780 @ =gUnk_03000BF0
ldr r2, _0801B780 @ =gRoomControls
ldrh r1, [r2, #6]
subs r0, r0, r1
asrs r0, r0, #4
@@ -6679,7 +6679,7 @@ _0801B76C:
movs r0, #0x1e
b _0801B792
.align 2, 0
_0801B780: .4byte gUnk_03000BF0
_0801B780: .4byte gRoomControls
_0801B784: .4byte gLinkEntity
_0801B788: .4byte gUnk_08003E44
_0801B78C:
@@ -7631,7 +7631,7 @@ sub_0801BEF8: @ 0x0801BEF8
lsls r1, r1, #0x18
asrs r1, r1, #0x18
adds r0, r0, r1
ldr r4, _0801BFF8 @ =gUnk_03000BF0
ldr r4, _0801BFF8 @ =gRoomControls
ldrh r1, [r4, #6]
subs r0, r0, r1
asrs r0, r0, #4
@@ -7695,7 +7695,7 @@ _0801BF62:
lsls r1, r1, #0x18
asrs r1, r1, #0x18
adds r0, r0, r1
ldr r4, _0801BFF8 @ =gUnk_03000BF0
ldr r4, _0801BFF8 @ =gRoomControls
ldrh r1, [r4, #6]
subs r0, r0, r1
asrs r0, r0, #4
@@ -7737,7 +7737,7 @@ _0801BFDA:
.align 2, 0
_0801BFF0: .4byte gLinkEntity
_0801BFF4: .4byte gUnk_080B7B6C
_0801BFF8: .4byte gUnk_03000BF0
_0801BFF8: .4byte gRoomControls
_0801BFFC: .4byte gUnk_03003F80
_0801C000: .4byte gUnk_03000FF0
_0801C004:
@@ -7817,7 +7817,7 @@ _0801C074:
lsls r2, r2, #0x18
asrs r2, r2, #0x18
adds r1, r1, r2
ldr r5, _0801C1CC @ =gUnk_03000BF0
ldr r5, _0801C1CC @ =gRoomControls
ldrh r2, [r5, #6]
subs r1, r1, r2
asrs r1, r1, #4
@@ -7865,7 +7865,7 @@ _0801C0D4:
movs r2, #0
ldrsb r2, [r6, r2]
adds r1, r1, r2
ldr r5, _0801C1CC @ =gUnk_03000BF0
ldr r5, _0801C1CC @ =gRoomControls
ldrh r2, [r5, #6]
subs r1, r1, r2
asrs r1, r1, #4
@@ -7970,7 +7970,7 @@ _0801C1BE:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0801C1C8: .4byte gUnk_080B7B6C
_0801C1CC: .4byte gUnk_03000BF0
_0801C1CC: .4byte gRoomControls
_0801C1D0: .4byte gUnk_03000FF0
thumb_func_start sub_0801C1D4
@@ -8224,7 +8224,7 @@ _0801C398:
lsls r1, r1, #4
adds r0, r4, #0
bl sub_0801D630
ldr r1, _0801C47C @ =gUnk_03000F50
ldr r1, _0801C47C @ =gLCDControls
str r4, [r1, #0x10]
ldr r0, _0801C480 @ =0x00001F0C
strh r0, [r1, #8]
@@ -8298,7 +8298,7 @@ _0801C398:
_0801C470: .4byte gUnk_0200AF00
_0801C474: .4byte gUnk_02002A40
_0801C478: .4byte gUnk_02034CB0
_0801C47C: .4byte gUnk_03000F50
_0801C47C: .4byte gLCDControls
_0801C480: .4byte 0x00001F0C
_0801C484: .4byte gUnk_03000000
_0801C488: .4byte 0x00000427
@@ -8307,12 +8307,12 @@ _0801C490: .4byte 0x0000042E
thumb_func_start sub_0801C494
sub_0801C494: @ 0x0801C494
ldr r1, _0801C49C @ =gUnk_03000F50
ldr r1, _0801C49C @ =gLCDControls
movs r0, #1
strh r0, [r1, #0xe]
bx lr
.align 2, 0
_0801C49C: .4byte gUnk_03000F50
_0801C49C: .4byte gLCDControls
thumb_func_start sub_0801C4A0
sub_0801C4A0: @ 0x0801C4A0
@@ -8355,14 +8355,14 @@ _0801C4C8:
strh r0, [r4, #4]
strh r0, [r4, #6]
strh r0, [r4, #8]
ldr r1, _0801C4F8 @ =gUnk_03000F50
ldr r1, _0801C4F8 @ =gLCDControls
movs r0, #1
strh r0, [r1, #0xe]
b _0801C5D0
.align 2, 0
_0801C4F0: .4byte gUnk_0200AF00
_0801C4F4: .4byte gUnk_02035160
_0801C4F8: .4byte gUnk_03000F50
_0801C4F8: .4byte gLCDControls
_0801C4FC:
ldrb r0, [r6, #0xa]
cmp r0, #0
@@ -8399,7 +8399,7 @@ _0801C4FC:
strh r0, [r3, #8]
adds r0, r1, #5
strh r0, [r4, #8]
ldr r1, _0801C55C @ =gUnk_03000F50
ldr r1, _0801C55C @ =gLCDControls
movs r0, #1
strh r0, [r1, #0xe]
movs r4, #1
@@ -8409,7 +8409,7 @@ _0801C54C: .4byte gUnk_02035160
_0801C550: .4byte gUnk_080FD590
_0801C554: .4byte gUnk_02002A40
_0801C558: .4byte 0x0000F070
_0801C55C: .4byte gUnk_03000F50
_0801C55C: .4byte gLCDControls
_0801C560:
movs r4, #0
ldr r2, _0801C580 @ =gUnk_02002A40
@@ -8561,7 +8561,7 @@ sub_0801C66C: @ 0x0801C66C
movs r2, #2
_0801C684:
ldr r0, _0801C6A8 @ =gUnk_02034CF0
ldr r3, _0801C6AC @ =gUnk_03000F50
ldr r3, _0801C6AC @ =gLCDControls
movs r1, #0
_0801C68A:
str r1, [r0]
@@ -8581,7 +8581,7 @@ _0801C6A2:
.align 2, 0
_0801C6A4: .4byte gUnk_0200AF00
_0801C6A8: .4byte gUnk_02034CF0
_0801C6AC: .4byte gUnk_03000F50
_0801C6AC: .4byte gLCDControls
thumb_func_start sub_0801C6B0
sub_0801C6B0: @ 0x0801C6B0
@@ -8764,7 +8764,7 @@ _0801C7EE:
orrs r1, r2
strh r1, [r0, #2]
_0801C7FC:
ldr r1, _0801C820 @ =gUnk_03000F50
ldr r1, _0801C820 @ =gLCDControls
movs r0, #1
strh r0, [r1, #0xe]
_0801C802:
@@ -8778,7 +8778,7 @@ _0801C810: .4byte 0x0000F010
_0801C814: .4byte 0x040000D4
_0801C818: .4byte gUnk_02034CF0
_0801C81C: .4byte 0xFFFFF000
_0801C820: .4byte gUnk_03000F50
_0801C820: .4byte gLCDControls
thumb_func_start sub_0801C824
sub_0801C824: @ 0x0801C824
@@ -8801,7 +8801,7 @@ _0801C83C:
str r2, [r1, #0xc]
str r2, [r1, #0x10]
str r2, [r1, #0x14]
ldr r1, _0801C858 @ =gUnk_03000F50
ldr r1, _0801C858 @ =gLCDControls
movs r0, #1
strh r0, [r1, #0xe]
_0801C84E:
@@ -8809,7 +8809,7 @@ _0801C84E:
.align 2, 0
_0801C850: .4byte gUnk_0200AF00
_0801C854: .4byte gUnk_02034D30
_0801C858: .4byte gUnk_03000F50
_0801C858: .4byte gLCDControls
thumb_func_start sub_0801C85C
sub_0801C85C: @ 0x0801C85C
@@ -8902,7 +8902,7 @@ _0801C8BA:
orrs r0, r1
strh r0, [r2, #2]
_0801C90C:
ldr r0, _0801C94C @ =gUnk_03000F50
ldr r0, _0801C94C @ =gLCDControls
strh r6, [r0, #0xe]
_0801C910:
ldr r0, _0801C930 @ =gUnk_03003F80
@@ -8928,7 +8928,7 @@ _0801C93C: .4byte 0x040000D4
_0801C940: .4byte gUnk_080C8F54
_0801C944: .4byte 0x8000000A
_0801C948: .4byte 0x000003FF
_0801C94C: .4byte gUnk_03000F50
_0801C94C: .4byte gLCDControls
_0801C950: .4byte gUnk_0200AF00
_0801C954:
adds r0, r1, #1
@@ -8999,14 +8999,14 @@ _0801C9B2:
strh r0, [r1]
adds r1, #2
strh r0, [r1]
ldr r1, _0801C9E8 @ =gUnk_03000F50
ldr r1, _0801C9E8 @ =gLCDControls
movs r0, #1
strh r0, [r1, #0xe]
b _0801CA50
.align 2, 0
_0801C9E0: .4byte gUnk_0200AF00
_0801C9E4: .4byte gUnk_020350E2
_0801C9E8: .4byte gUnk_03000F50
_0801C9E8: .4byte gLCDControls
_0801C9EC:
ldrb r0, [r4, #0x10]
cmp r0, #0
@@ -9030,7 +9030,7 @@ _0801C9EC:
strh r0, [r2, #6]
adds r0, r3, #3
strh r0, [r1, #6]
ldr r1, _0801CA5C @ =gUnk_03000F50
ldr r1, _0801CA5C @ =gLCDControls
movs r0, #1
strh r0, [r1, #0xe]
_0801CA1E:
@@ -9064,7 +9064,7 @@ _0801CA50:
.align 2, 0
_0801CA54: .4byte gUnk_020350E2
_0801CA58: .4byte 0x0000F01C
_0801CA5C: .4byte gUnk_03000F50
_0801CA5C: .4byte gLCDControls
_0801CA60: .4byte gUnk_02002A40
_0801CA64: .4byte gUnk_02033A90
_0801CA68: .4byte 0x0000045C
@@ -9284,7 +9284,7 @@ sub_0801CBC8: @ 0x0801CBC8
ands r0, r1
cmp r0, #0
bne _0801CBF6
ldr r0, _0801CC0C @ =gUnk_02000050
ldr r0, _0801CC0C @ =gTextBox
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -9302,7 +9302,7 @@ _0801CBF6:
b _0801CC1E
.align 2, 0
_0801CC08: .4byte gUnk_0200AF00
_0801CC0C: .4byte gUnk_02000050
_0801CC0C: .4byte gTextBox
_0801CC10:
ldr r1, _0801CC7C @ =gUnk_0200AF00
ldrb r0, [r5, #1]
@@ -9633,7 +9633,7 @@ sub_0801CE58: @ 0x0801CE58
ands r0, r1
cmp r0, #0
bne _0801CEB4
ldr r0, _0801CEBC @ =gUnk_02000050
ldr r0, _0801CEBC @ =gTextBox
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -9671,7 +9671,7 @@ _0801CEB4:
pop {r4, pc}
.align 2, 0
_0801CEB8: .4byte gUnk_0200AF00
_0801CEBC: .4byte gUnk_02000050
_0801CEBC: .4byte gTextBox
thumb_func_start sub_0801CEC0
sub_0801CEC0: @ 0x0801CEC0
@@ -9766,7 +9766,7 @@ sub_0801CF60: @ 0x0801CF60
ldrb r0, [r5]
cmp r0, #4
bhi _0801CF7C
ldr r0, _0801CF90 @ =gUnk_02000050
ldr r0, _0801CF90 @ =gTextBox
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -9782,7 +9782,7 @@ _0801CF7C:
b _0801CFA4
.align 2, 0
_0801CF8C: .4byte gUnk_0200AF00
_0801CF90: .4byte gUnk_02000050
_0801CF90: .4byte gTextBox
_0801CF94:
adds r0, r4, #0
bl sub_0801CAD0
asm/code_0801D79C.s
+405 -405
View File
File diff suppressed because it is too large Load Diff
asm/code_0804AA84.s
+13 -13
View File
@@ -94,7 +94,7 @@ sub_0804AB24: @ 0x0804AB24
ldrb r1, [r5]
cmp r1, #0
bne _0804AB46
ldr r0, _0804AB4C @ =gUnk_03000F50
ldr r0, _0804AB4C @ =gLCDControls
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 gUnk_03000F50
_0804AB4C: .4byte gLCDControls
_0804AB50: .4byte gUnk_02033A90
thumb_func_start sub_0804AB54
@@ -131,14 +131,14 @@ sub_0804AB70: @ 0x0804AB70
push {r4, r5, lr}
movs r0, #0
bl sub_0801DA90
ldr r1, _0804ABF8 @ =gUnk_03000F50
ldr r1, _0804ABF8 @ =gLCDControls
movs r2, #0
movs r0, #0x92
lsls r0, r0, #5
strh r0, [r1]
ldr r0, _0804ABFC @ =0x00009E83
strh r0, [r1, #0x14]
ldr r0, _0804AC00 @ =gUnk_03000BF0
ldr r0, _0804AC00 @ =gRoomControls
strh r2, [r1, #0x16]
strh r2, [r0, #0xa]
strh r2, [r1, #0x18]
@@ -189,9 +189,9 @@ _0804ABA4:
bl sub_08050054
pop {r4, r5, pc}
.align 2, 0
_0804ABF8: .4byte gUnk_03000F50
_0804ABF8: .4byte gLCDControls
_0804ABFC: .4byte 0x00009E83
_0804AC00: .4byte gUnk_03000BF0
_0804AC00: .4byte gRoomControls
_0804AC04: .4byte gUnk_02033A90
_0804AC08: .4byte gUnk_02032EC0
_0804AC0C: .4byte gUnk_080D4138
@@ -207,7 +207,7 @@ sub_0804AC1C: @ 0x0804AC1C
ldr r2, [r0, #0x14]
cmp r2, #0
beq _0804AC5E
ldr r3, _0804AC9C @ =gUnk_03000BF0
ldr r3, _0804AC9C @ =gRoomControls
movs r1, #0xc
ldrsh r0, [r3, r1]
movs r4, #0x32
@@ -235,8 +235,8 @@ _0804AC52:
movs r0, #0x9f
strh r0, [r3, #0xc]
_0804AC5E:
ldr r2, _0804ACA0 @ =gUnk_03000F50
ldr r1, _0804AC9C @ =gUnk_03000BF0
ldr r2, _0804ACA0 @ =gLCDControls
ldr r1, _0804AC9C @ =gRoomControls
ldrh r0, [r1, #0xa]
strh r0, [r2, #0x16]
ldrh r0, [r1, #0xc]
@@ -263,8 +263,8 @@ _0804AC96:
pop {r4, pc}
.align 2, 0
_0804AC98: .4byte gUnk_02018EB0
_0804AC9C: .4byte gUnk_03000BF0
_0804ACA0: .4byte gUnk_03000F50
_0804AC9C: .4byte gRoomControls
_0804ACA0: .4byte gLCDControls
_0804ACA4: .4byte gUnk_02033A90
thumb_func_start sub_0804ACA8
@@ -314,7 +314,7 @@ sub_0804ACF8: @ 0x0804ACF8
bl sub_0804AD18
cmp r0, #0
beq _0804AD12
ldr r0, _0804AD14 @ =gUnk_03000BF0
ldr r0, _0804AD14 @ =gRoomControls
bl sub_0804AD6C
bl sub_0805E5A8
movs r0, #0xf8
@@ -322,7 +322,7 @@ sub_0804ACF8: @ 0x0804ACF8
_0804AD12:
pop {pc}
.align 2, 0
_0804AD14: .4byte gUnk_03000BF0
_0804AD14: .4byte gRoomControls
thumb_func_start sub_0804AD18
sub_0804AD18: @ 0x0804AD18
asm/code_0804AEB0.s
+6 -6
View File
@@ -74,7 +74,7 @@ _0804AF26:
beq _0804AF64
b _0804AF88
_0804AF2C:
ldr r0, _0804AF3C @ =gUnk_03000BF0
ldr r0, _0804AF3C @ =gRoomControls
ldrh r1, [r0, #6]
ldrh r3, [r2, #8]
adds r1, r1, r3
@@ -82,7 +82,7 @@ _0804AF2C:
ldrh r0, [r0, #8]
b _0804AF58
.align 2, 0
_0804AF3C: .4byte gUnk_03000BF0
_0804AF3C: .4byte gRoomControls
_0804AF40:
adds r3, r4, #0
adds r3, #0x6d
@@ -90,7 +90,7 @@ _0804AF40:
movs r0, #0x20
orrs r0, r1
strb r0, [r3]
ldr r1, _0804AF60 @ =gUnk_03000BF0
ldr r1, _0804AF60 @ =gRoomControls
ldrh r0, [r1, #6]
ldrh r3, [r2, #8]
adds r0, r0, r3
@@ -102,9 +102,9 @@ _0804AF58:
strh r0, [r4, #0x32]
b _0804AF88
.align 2, 0
_0804AF60: .4byte gUnk_03000BF0
_0804AF60: .4byte gRoomControls
_0804AF64:
ldr r1, _0804AF8C @ =gUnk_03000BF0
ldr r1, _0804AF8C @ =gRoomControls
ldrh r0, [r1, #6]
ldrh r3, [r2, #8]
adds r0, r0, r3
@@ -123,7 +123,7 @@ _0804AF64:
_0804AF88:
pop {r4, pc}
.align 2, 0
_0804AF8C: .4byte gUnk_03000BF0
_0804AF8C: .4byte gRoomControls
thumb_func_start sub_0804AF90
sub_0804AF90: @ 0x0804AF90
asm/code_0804B058.s
+10 -10
View File
@@ -335,7 +335,7 @@ _0804B2A4:
ands r0, r1
cmp r0, #0
beq _0804B2FC
ldr r0, _0804B2F0 @ =gUnk_03000BF0
ldr r0, _0804B2F0 @ =gRoomControls
ldrb r1, [r0, #0xf]
movs r0, #2
ands r0, r1
@@ -356,7 +356,7 @@ _0804B2A4:
b _0804B2FC
.align 2, 0
_0804B2EC: .4byte gUnk_02017660
_0804B2F0: .4byte gUnk_03000BF0
_0804B2F0: .4byte gRoomControls
_0804B2F4:
adds r1, #1
adds r4, #8
@@ -811,7 +811,7 @@ sub_0804B580: @ 0x0804B580
ldr r0, _0804B5A0 @ =gLinkEntity
movs r1, #0x32
ldrsh r0, [r0, r1]
ldr r1, _0804B5A4 @ =gUnk_03000BF0
ldr r1, _0804B5A4 @ =gRoomControls
ldrh r1, [r1, #8]
subs r0, r0, r1
cmp r0, #0x40
@@ -822,7 +822,7 @@ _0804B59E:
pop {pc}
.align 2, 0
_0804B5A0: .4byte gLinkEntity
_0804B5A4: .4byte gUnk_03000BF0
_0804B5A4: .4byte gRoomControls
_0804B5A8: .4byte gUnk_080D6138
thumb_func_start sub_0804B5AC
@@ -1120,7 +1120,7 @@ sub_0804B7E8: @ 0x0804B7E8
movs r0, #5
bl sub_08050054
ldr r2, _0804B820 @ =gLinkEntity
ldr r1, _0804B824 @ =gUnk_03000BF0
ldr r1, _0804B824 @ =gRoomControls
ldrh r0, [r1, #6]
adds r0, #0x50
strh r0, [r2, #0x2e]
@@ -1135,7 +1135,7 @@ _0804B81E:
pop {pc}
.align 2, 0
_0804B820: .4byte gLinkEntity
_0804B824: .4byte gUnk_03000BF0
_0804B824: .4byte gRoomControls
_0804B828: .4byte gUnk_08010A5C
thumb_func_start sub_0804B82C
@@ -1183,7 +1183,7 @@ sub_0804B86C: @ 0x0804B86C
movs r0, #5
bl sub_08050054
ldr r2, _0804B8A4 @ =gLinkEntity
ldr r1, _0804B8A8 @ =gUnk_03000BF0
ldr r1, _0804B8A8 @ =gRoomControls
ldrh r0, [r1, #6]
adds r0, #0x50
strh r0, [r2, #0x2e]
@@ -1198,7 +1198,7 @@ _0804B8A2:
pop {pc}
.align 2, 0
_0804B8A4: .4byte gLinkEntity
_0804B8A8: .4byte gUnk_03000BF0
_0804B8A8: .4byte gRoomControls
_0804B8AC: .4byte gUnk_08010A5C
thumb_func_start sub_0804B8B0
@@ -1246,7 +1246,7 @@ sub_0804B8F0: @ 0x0804B8F0
movs r0, #5
bl sub_08050054
ldr r2, _0804B928 @ =gLinkEntity
ldr r1, _0804B92C @ =gUnk_03000BF0
ldr r1, _0804B92C @ =gRoomControls
ldrh r0, [r1, #6]
adds r0, #0x60
strh r0, [r2, #0x2e]
@@ -1261,7 +1261,7 @@ _0804B926:
pop {pc}
.align 2, 0
_0804B928: .4byte gLinkEntity
_0804B92C: .4byte gUnk_03000BF0
_0804B92C: .4byte gRoomControls
_0804B930: .4byte gUnk_08010A5C
thumb_func_start sub_0804B934
asm/code_0804B9F8.s
+21 -21
View File
@@ -351,7 +351,7 @@ sub_0804BC70: @ 0x0804BC70
movs r0, #5
bl sub_08050054
ldr r2, _0804BCB0 @ =gLinkEntity
ldr r1, _0804BCB4 @ =gUnk_03000BF0
ldr r1, _0804BCB4 @ =gRoomControls
ldrh r0, [r1, #6]
adds r0, #0xb0
strh r0, [r2, #0x2e]
@@ -371,7 +371,7 @@ _0804BCA0:
b _0804BCD0
.align 2, 0
_0804BCB0: .4byte gLinkEntity
_0804BCB4: .4byte gUnk_03000BF0
_0804BCB4: .4byte gRoomControls
_0804BCB8: .4byte gUnk_08009E88
_0804BCBC:
movs r0, #0x64
@@ -865,7 +865,7 @@ sub_0804BF38: @ 0x0804BF38
movs r5, #0
cmp r5, r8
bhs _0804BFE8
ldr r7, _0804C004 @ =gUnk_03000BF0
ldr r7, _0804C004 @ =gRoomControls
movs r1, #0
mov sl, r1
movs r6, #0
@@ -940,7 +940,7 @@ _0804BFE8:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0804C000: .4byte gUnk_080D8E50
_0804C004: .4byte gUnk_03000BF0
_0804C004: .4byte gRoomControls
_0804C008: .4byte 0x0000FFF4
thumb_func_start sub_0804C00C
@@ -1105,7 +1105,7 @@ _0804C13A:
_0804C15C: .4byte gUnk_02034350
_0804C160: .4byte gUnk_02033A90
_0804C164:
ldr r2, _0804C18C @ =gUnk_03000BF0
ldr r2, _0804C18C @ =gRoomControls
ldr r1, _0804C190 @ =gUnk_080D9338
lsls r4, r3, #0x1c
lsrs r0, r4, #0x1d
@@ -1126,7 +1126,7 @@ _0804C164:
strb r1, [r5, #0xd]
b _0804C19C
.align 2, 0
_0804C18C: .4byte gUnk_03000BF0
_0804C18C: .4byte gRoomControls
_0804C190: .4byte gUnk_080D9338
_0804C194:
movs r0, #0xf
@@ -1140,7 +1140,7 @@ _0804C19C:
ands r0, r3
cmp r0, #0
bne _0804C1DE
ldr r2, _0804C1D0 @ =gUnk_03000BF0
ldr r2, _0804C1D0 @ =gRoomControls
ldr r1, _0804C1D4 @ =gUnk_080D9340
lsls r4, r3, #0x18
lsrs r0, r4, #0x1c
@@ -1161,7 +1161,7 @@ _0804C19C:
strb r1, [r5, #0xd]
b _0804C1DE
.align 2, 0
_0804C1D0: .4byte gUnk_03000BF0
_0804C1D0: .4byte gRoomControls
_0804C1D4: .4byte gUnk_080D9340
_0804C1D8:
movs r0, #0xf
@@ -2875,7 +2875,7 @@ sub_0804CBB0: @ 0x0804CBB0
ldr r0, _0804CBD8 @ =gLinkEntity
movs r2, #0x32
ldrsh r1, [r0, r2]
ldr r2, _0804CBDC @ =gUnk_03000BF0
ldr r2, _0804CBDC @ =gRoomControls
ldrh r0, [r2, #8]
subs r1, r1, r0
ldrh r0, [r2, #0x20]
@@ -2892,7 +2892,7 @@ _0804CBD6:
pop {pc}
.align 2, 0
_0804CBD8: .4byte gLinkEntity
_0804CBDC: .4byte gUnk_03000BF0
_0804CBDC: .4byte gRoomControls
_0804CBE0: .4byte gUnk_080DE4C8
thumb_func_start sub_0804CBE4
@@ -3495,7 +3495,7 @@ sub_0804CED8: @ 0x0804CED8
ldr r1, _0804CF04 @ =gUnk_0200B650
movs r0, #0
str r0, [r1]
ldr r2, _0804CF08 @ =gUnk_03000F50
ldr r2, _0804CF08 @ =gLCDControls
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 gUnk_03000F50
_0804CF08: .4byte gLCDControls
_0804CF0C: .4byte 0x0000FDFF
_0804CF10: .4byte gLinkEntity
_0804CF14: .4byte gUnk_080E1814
@@ -6516,7 +6516,7 @@ _0804DE5C:
ldr r0, [r4]
ldrh r5, [r0, #4]
ldrh r6, [r0, #6]
ldr r1, _0804DEBC @ =gUnk_03000BF0
ldr r1, _0804DEBC @ =gRoomControls
movs r2, #0
movs r0, #0x15
strb r0, [r1, #4]
@@ -6548,7 +6548,7 @@ _0804DE5C:
.align 2, 0
_0804DEB4: .4byte gUnk_02033A90
_0804DEB8: .4byte 0x0000085C
_0804DEBC: .4byte gUnk_03000BF0
_0804DEBC: .4byte gRoomControls
_0804DEC0: .4byte gUnk_030010A0
_0804DEC4:
movs r0, #6
@@ -7829,7 +7829,7 @@ _0804E860: .4byte gUnk_080F31D8
sub_0804E864: @ 0x0804E864
push {lr}
ldr r2, _0804E888 @ =gLinkEntity
ldr r1, _0804E88C @ =gUnk_03000BF0
ldr r1, _0804E88C @ =gRoomControls
ldrh r0, [r1, #6]
adds r0, #0x90
strh r0, [r2, #0x2e]
@@ -7845,7 +7845,7 @@ sub_0804E864: @ 0x0804E864
pop {pc}
.align 2, 0
_0804E888: .4byte gLinkEntity
_0804E88C: .4byte gUnk_03000BF0
_0804E88C: .4byte gRoomControls
_0804E890: .4byte gUnk_08009E58
thumb_func_start sub_0804E894
@@ -9738,7 +9738,7 @@ sub_0804F680: @ 0x0804F680
adds r2, r0, #0
cmp r2, #0
beq _0804F6A2
ldr r0, _0804F6A4 @ =gUnk_03000BF0
ldr r0, _0804F6A4 @ =gRoomControls
ldrh r1, [r0, #6]
adds r1, r1, r4
strh r1, [r2, #0x2e]
@@ -9748,7 +9748,7 @@ sub_0804F680: @ 0x0804F680
_0804F6A2:
pop {r4, r5, pc}
.align 2, 0
_0804F6A4: .4byte gUnk_03000BF0
_0804F6A4: .4byte gRoomControls
thumb_func_start sub_0804F6A8
sub_0804F6A8: @ 0x0804F6A8
@@ -9885,7 +9885,7 @@ sub_0804F79C: @ 0x0804F79C
movs r0, #0x3f
ands r0, r1
strb r0, [r2, #0x19]
ldr r1, _0804F804 @ =gUnk_03000BF0
ldr r1, _0804F804 @ =gRoomControls
movs r3, #0xdc
lsls r3, r3, #1
adds r0, r3, #0
@@ -9910,7 +9910,7 @@ _0804F7D0:
movs r0, #0x3f
ands r0, r1
strb r0, [r2, #0x19]
ldr r1, _0804F804 @ =gUnk_03000BF0
ldr r1, _0804F804 @ =gRoomControls
movs r3, #0x8e
lsls r3, r3, #2
adds r0, r3, #0
@@ -9926,7 +9926,7 @@ _0804F7D0:
_0804F802:
pop {r4, pc}
.align 2, 0
_0804F804: .4byte gUnk_03000BF0
_0804F804: .4byte gRoomControls
thumb_func_start sub_0804F808
sub_0804F808: @ 0x0804F808
asm/code_08050038.s
+44 -111
View File
@@ -57,7 +57,7 @@ _0805007E:
ldr r1, _080500E4 @ =gUnk_03000000
movs r0, #1
strb r0, [r1, #2]
ldr r2, _080500E8 @ =gUnk_03000F50
ldr r2, _080500E8 @ =gLCDControls
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 gUnk_03000F50
_080500E8: .4byte gLCDControls
_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 @ =gUnk_03000F50
ldr r3, _08050264 @ =gLCDControls
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 gUnk_03000F50
_08050264: .4byte gLCDControls
_08050268: .4byte gUnk_080FC3C4
_0805026C:
ldr r1, _0805029C @ =gUnk_03000000
@@ -440,7 +440,7 @@ sub_08050318: @ 0x08050318
beq _08050368
bl sub_080A3268
_08050368:
ldr r1, _08050380 @ =gUnk_03000F50
ldr r1, _08050380 @ =gLCDControls
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 gUnk_03000F50
_08050380: .4byte gLCDControls
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 @ =gUnk_03000F50
ldr r1, _080503A4 @ =gLCDControls
movs r0, #1
strh r0, [r1, #0xe]
pop {pc}
.align 2, 0
_080503A0: .4byte gUnk_02034CB0
_080503A4: .4byte gUnk_03000F50
_080503A4: .4byte gLCDControls
thumb_func_start sub_080503A8
sub_080503A8: @ 0x080503A8
push {lr}
bl sub_0801D7EC
ldr r1, _080503B8 @ =gUnk_03000F50
ldr r1, _080503B8 @ =gLCDControls
movs r0, #1
strh r0, [r1, #0x1a]
strh r0, [r1, #0x26]
pop {pc}
.align 2, 0
_080503B8: .4byte gUnk_03000F50
_080503B8: .4byte gLCDControls
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 @ =gUnk_03000F50
ldr r1, _080504E4 @ =gLCDControls
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 gUnk_03000F50
_080504E4: .4byte gLCDControls
_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 @ =gUnk_03000F50
ldr r1, _080505F0 @ =gLCDControls
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 gUnk_03000F50
_080505F0: .4byte gLCDControls
_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 @ =gUnk_03000F50
ldr r1, _08050B38 @ =gLCDControls
movs r0, #1
strh r0, [r1, #0x1a]
pop {r4, r5, pc}
.align 2, 0
_08050B30: .4byte gUnk_02021F30
_08050B34: .4byte gUnk_02019EE0
_08050B38: .4byte gUnk_03000F50
_08050B38: .4byte gLCDControls
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 @ =gUnk_03000F50
ldr r1, _080510B4 @ =gLCDControls
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 gUnk_03000F50
_080510B4: .4byte gLCDControls
thumb_func_start sub_080510B8
sub_080510B8: @ 0x080510B8
@@ -3338,7 +3338,7 @@ sub_08051A14: @ 0x08051A14
movs r0, #1
bl sub_0801CFA8
bl sub_0806FD8C
ldr r2, _08051A80 @ =gUnk_03000BF0
ldr r2, _08051A80 @ =gRoomControls
ldr r1, _08051A84 @ =gUnk_030010A0
ldrb r0, [r1, #0xc]
strb r0, [r2, #4]
@@ -3357,7 +3357,7 @@ _08051A70: .4byte gUnk_03000FD0
_08051A74: .4byte gUnk_03000000
_08051A78: .4byte 0x00000B74
_08051A7C: .4byte gUnk_02032EC0
_08051A80: .4byte gUnk_03000BF0
_08051A80: .4byte gRoomControls
_08051A84: .4byte gUnk_030010A0
_08051A88: .4byte gUnk_02024490
_08051A8C: .4byte gUnk_03001000
@@ -3381,7 +3381,7 @@ _08051AA8: .4byte gUnk_03001000
sub_08051AAC: @ 0x08051AAC
push {lr}
bl sub_0805E5A8
ldr r1, _08051AE4 @ =gUnk_03000F50
ldr r1, _08051AE4 @ =gLCDControls
movs r2, #0
movs r0, #0xba
lsls r0, r0, #5
@@ -3401,7 +3401,7 @@ sub_08051AAC: @ 0x08051AAC
bl sub_0801855C
pop {pc}
.align 2, 0
_08051AE4: .4byte gUnk_03000F50
_08051AE4: .4byte gLCDControls
_08051AE8: .4byte gUnk_03001000
_08051AEC: .4byte gUnk_030010A0
@@ -3427,7 +3427,7 @@ _08051B02:
ldrb r0, [r0]
cmp r0, #0
bne _08051BAE
ldr r0, _08051BB4 @ =gUnk_03000BF0
ldr r0, _08051BB4 @ =gRoomControls
ldrh r0, [r0]
cmp r0, #0
bne _08051BAE
@@ -3484,7 +3484,7 @@ _08051BAE:
pop {r4, r5, pc}
.align 2, 0
_08051BB0: .4byte gUnk_03000FD0
_08051BB4: .4byte gUnk_03000BF0
_08051BB4: .4byte gRoomControls
_08051BB8: .4byte gUnk_02033A90
_08051BBC: .4byte 0x00000864
_08051BC0: .4byte 0x800B0000
@@ -3506,7 +3506,7 @@ sub_08051BD0: @ 0x08051BD0
ldrb r0, [r0, #4]
cmp r0, #2
bne _08051C9C
ldr r0, _08051C60 @ =gUnk_02000050
ldr r0, _08051C60 @ =gTextBox
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -3537,7 +3537,7 @@ _08051C06:
bl sub_080528B4
bl sub_080185F8
bl sub_080AD918
ldr r0, _08051C68 @ =gUnk_03000BF0
ldr r0, _08051C68 @ =gRoomControls
ldrh r2, [r0]
cmp r2, #1
beq _08051C6C
@@ -3546,9 +3546,9 @@ _08051C06:
b _08051C9C
.align 2, 0
_08051C5C: .4byte gUnk_03001000
_08051C60: .4byte gUnk_02000050
_08051C60: .4byte gTextBox
_08051C64: .4byte gUnk_03003DC0
_08051C68: .4byte gUnk_03000BF0
_08051C68: .4byte gRoomControls
_08051C6C:
ldr r0, _08051C80 @ =gUnk_03003F80
movs r1, #0x17
@@ -3696,7 +3696,7 @@ _08051DC8: .4byte gUnk_02034350
thumb_func_start sub_08051DCC
sub_08051DCC: @ 0x08051DCC
push {r4, lr}
ldr r1, _08051DFC @ =gUnk_03000BF0
ldr r1, _08051DFC @ =gRoomControls
ldr r4, _08051E00 @ =gUnk_030010A0
ldrb r0, [r4, #0xc]
strb r0, [r1, #4]
@@ -3713,7 +3713,7 @@ sub_08051DCC: @ 0x08051DCC
bl sub_0805283C
pop {r4, pc}
.align 2, 0
_08051DFC: .4byte gUnk_03000BF0
_08051DFC: .4byte gRoomControls
_08051E00: .4byte gUnk_030010A0
thumb_func_start sub_08051E04
@@ -3794,7 +3794,7 @@ sub_08051E84: @ 0x08051E84
lsls r4, r4, #3
ldr r0, _08051EF4 @ =gUnk_080FCA20
adds r4, r4, r0
ldr r5, _08051EF8 @ =gUnk_03000BF0
ldr r5, _08051EF8 @ =gRoomControls
ldrb r0, [r4]
strb r0, [r5, #4]
ldrb r0, [r4, #1]
@@ -3839,7 +3839,7 @@ sub_08051E84: @ 0x08051E84
.align 2, 0
_08051EF0: .4byte gUnk_02032EC0
_08051EF4: .4byte gUnk_080FCA20
_08051EF8: .4byte gUnk_03000BF0
_08051EF8: .4byte gRoomControls
_08051EFC: .4byte gUnk_02033A90
_08051F00: .4byte gUnk_02000080
@@ -3920,13 +3920,13 @@ sub_08051F9C: @ 0x08051F9C
push {r6}
adds r6, r2, #0
mov r8, r3
ldr r5, _08051FE0 @ =gUnk_03000F50
ldr r5, _08051FE0 @ =gLCDControls
ldrh r2, [r5]
movs r4, #0xc0
lsls r4, r4, #7
ands r4, r2
bl sub_08052FF4
ldr r1, _08051FE4 @ =gUnk_03000BF0
ldr r1, _08051FE4 @ =gRoomControls
ldrh r0, [r1, #6]
adds r0, r0, r6
movs r6, #0
@@ -3947,8 +3947,8 @@ sub_08051F9C: @ 0x08051F9C
mov r8, r3
pop {r4, r5, r6, pc}
.align 2, 0
_08051FE0: .4byte gUnk_03000F50
_08051FE4: .4byte gUnk_03000BF0
_08051FE0: .4byte gLCDControls
_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 @ =gUnk_03000F50
ldr r1, _08052088 @ =gLCDControls
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 gUnk_03000F50
_08052088: .4byte gLCDControls
_0805208C: .4byte 0x00001C01
_08052090: .4byte 0x00001D05
@@ -4130,7 +4130,7 @@ _08052158:
movs r0, #0
movs r1, #0
bl sub_08052418
ldr r2, _08052190 @ =gUnk_03000F50
ldr r2, _08052190 @ =gLCDControls
ldrh r0, [r2]
movs r3, #0xc0
lsls r3, r3, #3
@@ -4144,7 +4144,7 @@ _08052158:
bl sub_08050054
b _0805219C
.align 2, 0
_08052190: .4byte gUnk_03000F50
_08052190: .4byte gLCDControls
_08052194: .4byte 0x0000FFFF
_08052198:
subs r0, #1
@@ -4306,7 +4306,7 @@ _080522BC:
.align 2, 0
_080522D0: .4byte gUnk_03000FF0
_080522D4:
ldr r2, _080522EC @ =gUnk_03000F50
ldr r2, _080522EC @ =gLCDControls
ldrh r1, [r2]
ldr r0, _080522F0 @ =0x0000FDFF
ands r0, r1
@@ -4317,7 +4317,7 @@ _080522D4:
_080522E8:
pop {r4, pc}
.align 2, 0
_080522EC: .4byte gUnk_03000F50
_080522EC: .4byte gLCDControls
_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 @ =gUnk_03000F50
ldr r2, _08052340 @ =gLCDControls
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 gUnk_03000F50
_08052340: .4byte gLCDControls
_08052344:
ldrb r4, [r3, #3]
ldr r0, _08052358 @ =gUnk_03000FF0
@@ -4468,70 +4468,3 @@ _08052408: .4byte gUnk_03001010
_0805240C: .4byte gUnk_02000080
_08052410: .4byte gUnk_080FCA84
_08052414: .4byte 0x000001FD
thumb_func_start sub_08052418
sub_08052418: @ 0x08052418
push {r4, r5, r6, lr}
sub sp, #0x18
adds r6, r0, #0
adds r4, r1, #0
ldr r0, _08052494 @ =gUnk_02021F30
movs r1, #0x80
lsls r1, r1, #4
bl sub_0801D630
ldr r0, _08052498 @ =gUnk_020227E8
movs r1, #0xf
str r1, [r0]
str r1, [r0, #8]
str r1, [r0, #0x10]
str r1, [r0, #0x18]
lsls r4, r4, #3
adds r0, #1
adds r4, r4, r0
movs r5, #1
strb r5, [r4]
ldr r4, _0805249C @ =gUnk_080FCA8C
adds r0, r4, #0
mov r1, sp
movs r2, #0x18
bl sub_0801D66C
lsls r2, r6, #1
adds r2, r2, r6
lsls r2, r2, #2
ldr r0, _080524A0 @ =gUnk_080FCAA4
adds r2, r2, r0
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r1, [r0, #7]
adds r1, r2, r1
ldrb r0, [r2, #8]
lsls r0, r0, #5
ldrb r1, [r1]
adds r0, r0, r1
lsls r0, r0, #1
ldr r1, [r4]
adds r1, r1, r0
str r1, [sp]
mov r4, sp
ldrb r0, [r2, #9]
adds r1, r5, #0
ands r1, r0
ldrb r3, [r4, #0x13]
movs r0, #2
rsbs r0, r0, #0
ands r0, r3
orrs r0, r1
strb r0, [r4, #0x13]
ldrh r0, [r2, #0xa]
mov r1, sp
bl sub_0805F46C
ldr r0, _080524A4 @ =gUnk_03000F50
strh r5, [r0, #0x1a]
add sp, #0x18
pop {r4, r5, r6, pc}
.align 2, 0
_08052494: .4byte gUnk_02021F30
_08052498: .4byte gUnk_020227E8
_0805249C: .4byte gUnk_080FCA8C
_080524A0: .4byte gUnk_080FCAA4
_080524A4: .4byte gUnk_03000F50
asm/code_08052620.s
-35
View File
@@ -1,35 +0,0 @@
.include "asm/macros.inc"
.text
.syntax unified
thumb_func_start sub_08052620
sub_08052620: @ 0x08052620
push {lr}
movs r1, #0
ldr r0, _08052634 @ =gUnk_02033A90
ldrb r0, [r0]
cmp r0, #0x81
bne _0805262E
movs r1, #1
_0805262E:
adds r0, r1, #0
pop {pc}
.align 2, 0
_08052634: .4byte gUnk_02033A90
thumb_func_start sub_08052638
sub_08052638: @ 0x08052638
push {lr}
movs r2, #0
ldr r1, _08052650 @ =gUnk_08127D30
lsls r0, r0, #2
adds r0, r0, r1
ldrb r0, [r0]
cmp r0, #0x81
bne _0805264A
movs r2, #1
_0805264A:
adds r0, r2, #0
pop {pc}
.align 2, 0
_08052650: .4byte gUnk_08127D30
asm/code_080526CC.s
+86 -86
View File
@@ -206,7 +206,7 @@ sub_0805283C: @ 0x0805283C
ldr r1, _0805286C @ =0x00000864
adds r4, r0, r1
ldr r1, _08052870 @ =gUnk_08127D30
ldr r0, _08052874 @ =gUnk_03000BF0
ldr r0, _08052874 @ =gRoomControls
ldrb r0, [r0, #4]
lsls r0, r0, #2
adds r0, r0, r1
@@ -226,7 +226,7 @@ _08052864:
_08052868: .4byte gUnk_02033A90
_0805286C: .4byte 0x00000864
_08052870: .4byte gUnk_08127D30
_08052874: .4byte gUnk_03000BF0
_08052874: .4byte gRoomControls
thumb_func_start sub_08052878
sub_08052878: @ 0x08052878
@@ -473,7 +473,7 @@ sub_08052A4C: @ 0x08052A4C
movs r0, #1
strb r0, [r2, #8]
ldr r5, _08052A8C @ =gLinkEntity
ldr r3, _08052A90 @ =gUnk_03000BF0
ldr r3, _08052A90 @ =gRoomControls
ldrh r0, [r5, #0x2e]
ldrh r1, [r3, #6]
subs r0, r0, r1
@@ -500,7 +500,7 @@ sub_08052A4C: @ 0x08052A4C
.align 2, 0
_08052A88: .4byte gUnk_030010A0
_08052A8C: .4byte gLinkEntity
_08052A90: .4byte gUnk_03000BF0
_08052A90: .4byte gRoomControls
thumb_func_start sub_08052A94
sub_08052A94: @ 0x08052A94
@@ -655,7 +655,7 @@ sub_08052BB8: @ 0x08052BB8
ldr r0, _08052BE4 @ =gLinkEntity
movs r2, #0x32
ldrsh r1, [r0, r2]
ldr r0, _08052BE8 @ =gUnk_03000BF0
ldr r0, _08052BE8 @ =gRoomControls
movs r2, #0xc
ldrsh r0, [r0, r2]
subs r1, r1, r0
@@ -667,7 +667,7 @@ sub_08052BB8: @ 0x08052BB8
.align 2, 0
_08052BE0: .4byte gUnk_030010A0
_08052BE4: .4byte gLinkEntity
_08052BE8: .4byte gUnk_03000BF0
_08052BE8: .4byte gRoomControls
_08052BEC:
ldrb r2, [r2]
_08052BEE:
@@ -819,7 +819,7 @@ sub_08052CFC: @ 0x08052CFC
ldr r1, _08052D48 @ =0x00000894
adds r0, r4, #0
bl sub_0801D630
ldr r0, _08052D4C @ =gUnk_03000BF0
ldr r0, _08052D4C @ =gRoomControls
ldrb r1, [r0, #4]
lsls r1, r1, #2
ldr r0, _08052D50 @ =gUnk_08127D30
@@ -849,7 +849,7 @@ sub_08052CFC: @ 0x08052CFC
.align 2, 0
_08052D44: .4byte gUnk_02033A90
_08052D48: .4byte 0x00000894
_08052D4C: .4byte gUnk_03000BF0
_08052D4C: .4byte gRoomControls
_08052D50: .4byte gUnk_08127D30
_08052D54: .4byte gUnk_0811E454
@@ -899,7 +899,7 @@ _08052DA4: .4byte 0x0000088C
sub_08052DA8: @ 0x08052DA8
push {r4, r5, r6, r7, lr}
ldr r1, _08052DF8 @ =gUnk_0811E214
ldr r0, _08052DFC @ =gUnk_03000BF0
ldr r0, _08052DFC @ =gRoomControls
ldrb r0, [r0, #4]
lsls r0, r0, #2
adds r0, r0, r1
@@ -915,7 +915,7 @@ _08052DC4:
ldrh r0, [r4, #8]
cmp r0, r6
beq _08052DD8
ldr r0, _08052DFC @ =gUnk_03000BF0
ldr r0, _08052DFC @ =gRoomControls
ldrb r2, [r0, #4]
adds r0, r7, #0
adds r1, r4, #0
@@ -939,7 +939,7 @@ _08052DE8:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08052DF8: .4byte gUnk_0811E214
_08052DFC: .4byte gUnk_03000BF0
_08052DFC: .4byte gRoomControls
_08052E00: .4byte gUnk_02033ACC
_08052E04: .4byte 0x0000FFFF
_08052E08: .4byte gUnk_02033A90
@@ -1007,14 +1007,14 @@ _08052E88: .4byte gUnk_080D50FC
thumb_func_start sub_08052E8C
sub_08052E8C: @ 0x08052E8C
ldr r0, _08052E98 @ =gUnk_03000BF0
ldr r0, _08052E98 @ =gRoomControls
ldrb r0, [r0, #5]
lsls r0, r0, #5
ldr r1, _08052E9C @ =gUnk_02033ACC
adds r0, r0, r1
bx lr
.align 2, 0
_08052E98: .4byte gUnk_03000BF0
_08052E98: .4byte gRoomControls
_08052E9C: .4byte gUnk_02033ACC
thumb_func_start sub_08052EA0
@@ -1033,7 +1033,7 @@ sub_08052EA0: @ 0x08052EA0
strh r0, [r4, #0xc]
ldr r2, _08052EE8 @ =gUnk_02033A90
ldr r1, _08052EEC @ =gUnk_08127D30
ldr r0, _08052EF0 @ =gUnk_03000BF0
ldr r0, _08052EF0 @ =gRoomControls
ldrb r0, [r0, #4]
lsls r0, r0, #2
adds r0, r0, r1
@@ -1050,14 +1050,14 @@ sub_08052EA0: @ 0x08052EA0
_08052EE4: .4byte gUnk_02034350
_08052EE8: .4byte gUnk_02033A90
_08052EEC: .4byte gUnk_08127D30
_08052EF0: .4byte gUnk_03000BF0
_08052EF0: .4byte gRoomControls
thumb_func_start sub_08052EF4
sub_08052EF4: @ 0x08052EF4
push {lr}
cmp r0, #0
bge _08052EFE
ldr r0, _08052F10 @ =gUnk_03000BF0
ldr r0, _08052F10 @ =gRoomControls
ldrb r0, [r0, #4]
_08052EFE:
lsls r0, r0, #2
@@ -1070,7 +1070,7 @@ _08052EFE:
ldrh r0, [r0]
pop {pc}
.align 2, 0
_08052F10: .4byte gUnk_03000BF0
_08052F10: .4byte gRoomControls
_08052F14: .4byte gUnk_08127D30
_08052F18: .4byte gUnk_0811E454
@@ -1089,7 +1089,7 @@ sub_08052F1C: @ 0x08052F1C
beq _08052FCC
movs r5, #0
movs r4, #0
ldr r0, _08052F54 @ =gUnk_03000BF0
ldr r0, _08052F54 @ =gRoomControls
ldrb r1, [r0, #0x10]
adds r3, r0, #0
cmp r1, #1
@@ -1102,7 +1102,7 @@ sub_08052F1C: @ 0x08052F1C
.align 2, 0
_08052F4C: .4byte gUnk_02033A90
_08052F50: .4byte gUnk_02034350
_08052F54: .4byte gUnk_03000BF0
_08052F54: .4byte gRoomControls
_08052F58:
cmp r1, #2
beq _08052F62
@@ -1179,14 +1179,14 @@ _08052FD4: .4byte gUnk_03003D70
sub_08052FD8: @ 0x08052FD8
push {lr}
bl sub_08052FF4
ldr r1, _08052FF0 @ =gUnk_03000BF0
ldr r1, _08052FF0 @ =gRoomControls
movs r0, #0
str r0, [r1, #0x30]
bl sub_0807C860
bl sub_0807C740
pop {pc}
.align 2, 0
_08052FF0: .4byte gUnk_03000BF0
_08052FF0: .4byte gRoomControls
thumb_func_start sub_08052FF4
sub_08052FF4: @ 0x08052FF4
@@ -1195,10 +1195,10 @@ sub_08052FF4: @ 0x08052FF4
adds r4, r1, #0
bl sub_08080668
bl sub_080197AC
ldr r0, _0805306C @ =gUnk_03000BF0
ldr r0, _0805306C @ =gRoomControls
strb r6, [r0, #4]
strb r4, [r0, #5]
ldr r1, _08053070 @ =gUnk_03000F50
ldr r1, _08053070 @ =gLCDControls
movs r0, #0xba
lsls r0, r0, #5
strh r0, [r1]
@@ -1247,8 +1247,8 @@ sub_08052FF4: @ 0x08052FF4
str r0, [r5, #0x14]
pop {r4, r5, r6, pc}
.align 2, 0
_0805306C: .4byte gUnk_03000BF0
_08053070: .4byte gUnk_03000F50
_0805306C: .4byte gRoomControls
_08053070: .4byte gLCDControls
_08053074: .4byte gUnk_020342CC
_08053078: .4byte gUnk_0811E214
_0805307C: .4byte gUnk_0810246C
@@ -1464,7 +1464,7 @@ sub_080531F8: @ 0x080531F8
beq _08053238
adds r1, r5, #0
subs r1, #0xc
ldr r2, _0805324C @ =gUnk_03000BF0
ldr r2, _0805324C @ =gRoomControls
ldrb r0, [r2, #4]
strb r0, [r1, #0x16]
ldrb r0, [r2, #5]
@@ -1480,7 +1480,7 @@ _0805323C: .4byte gUnk_03003F80
_08053240: .4byte gLinkEntity
_08053244: .4byte gUnk_030010AC
_08053248: .4byte gUnk_02002AC8
_0805324C: .4byte gUnk_03000BF0
_0805324C: .4byte gRoomControls
thumb_func_start sub_08053250
sub_08053250: @ 0x08053250
@@ -1489,7 +1489,7 @@ sub_08053250: @ 0x08053250
movs r1, #0
strb r1, [r0, #0xf]
ldr r3, _08053290 @ =gLinkEntity
ldr r4, _08053294 @ =gUnk_03000BF0
ldr r4, _08053294 @ =gRoomControls
ldrh r1, [r3, #0x2e]
ldrh r2, [r4, #6]
subs r1, r1, r2
@@ -1515,7 +1515,7 @@ sub_08053250: @ 0x08053250
.align 2, 0
_0805328C: .4byte gUnk_030010A0
_08053290: .4byte gLinkEntity
_08053294: .4byte gUnk_03000BF0
_08053294: .4byte gRoomControls
_08053298: .4byte gUnk_02002AC8
thumb_func_start sub_0805329C
@@ -1524,7 +1524,7 @@ sub_0805329C: @ 0x0805329C
bl sub_08053144
cmp r0, #0
beq _080532E0
ldr r0, _080532B8 @ =gUnk_03000BF0
ldr r0, _080532B8 @ =gRoomControls
ldrb r0, [r0, #4]
cmp r0, #0x48
beq _080532C2
@@ -1534,7 +1534,7 @@ sub_0805329C: @ 0x0805329C
beq _080532D6
b _080532DC
.align 2, 0
_080532B8: .4byte gUnk_03000BF0
_080532B8: .4byte gRoomControls
_080532BC:
cmp r0, #0x50
beq _080532D0
@@ -1612,7 +1612,7 @@ sub_08053320: @ 0x08053320
bl sub_0801D7EC
movs r0, #0x17
bl sub_0801D7EC
ldr r0, _0805338C @ =gUnk_03000BF0
ldr r0, _0805338C @ =gRoomControls
ldrb r0, [r0, #4]
cmp r0, #4
bne _08053362
@@ -1633,7 +1633,7 @@ _0805337C: .4byte gUnk_02034CB0
_08053380: .4byte gUnk_02021F30
_08053384: .4byte gUnk_020344B0
_08053388: .4byte gUnk_02001A40
_0805338C: .4byte gUnk_03000BF0
_0805338C: .4byte gRoomControls
thumb_func_start sub_08053390
sub_08053390: @ 0x08053390
@@ -1814,7 +1814,7 @@ _080534E0: .4byte 0x80100000
sub_080534E4: @ 0x080534E4
push {lr}
adds r1, r0, #0
ldr r0, _080534FC @ =gUnk_03000BF0
ldr r0, _080534FC @ =gRoomControls
ldrb r0, [r0, #4]
cmp r0, #0x1a
beq _080534FA
@@ -1826,7 +1826,7 @@ sub_080534E4: @ 0x080534E4
_080534FA:
pop {pc}
.align 2, 0
_080534FC: .4byte gUnk_03000BF0
_080534FC: .4byte gRoomControls
thumb_func_start sub_08053500
sub_08053500: @ 0x08053500
@@ -1928,7 +1928,7 @@ sub_080535AC: @ 0x080535AC
strb r1, [r0, #6]
ldr r0, _080535E4 @ =gUnk_02000070
strb r1, [r0]
ldr r2, _080535E8 @ =gUnk_03000F50
ldr r2, _080535E8 @ =gLCDControls
ldrh r1, [r2]
ldr r0, _080535EC @ =0x0000FEFF
ands r0, r1
@@ -1943,7 +1943,7 @@ sub_080535AC: @ 0x080535AC
_080535DC: .4byte gUnk_02000080
_080535E0: .4byte gUnk_02032EC0
_080535E4: .4byte gUnk_02000070
_080535E8: .4byte gUnk_03000F50
_080535E8: .4byte gLCDControls
_080535EC: .4byte 0x0000FEFF
_080535F0: .4byte gUnk_080FCB94
@@ -2006,7 +2006,7 @@ sub_08053648: @ 0x08053648
adds r2, r0, #0
cmp r2, #0
beq _08053674
ldr r0, _08053678 @ =gUnk_03000BF0
ldr r0, _08053678 @ =gRoomControls
movs r3, #0xb4
lsls r3, r3, #2
adds r1, r3, #0
@@ -2022,7 +2022,7 @@ sub_08053648: @ 0x08053648
_08053674:
pop {pc}
.align 2, 0
_08053678: .4byte gUnk_03000BF0
_08053678: .4byte gRoomControls
thumb_func_start sub_0805367C
sub_0805367C: @ 0x0805367C
@@ -2160,14 +2160,14 @@ sub_08053758: @ 0x08053758
str r2, [r0]
ldr r0, _080537E8 @ =gUnk_0200B650
str r2, [r0]
ldr r0, _080537EC @ =gUnk_03000BF0
ldr r0, _080537EC @ =gRoomControls
str r2, [r0, #0x30]
strh r2, [r0, #0xc]
strh r2, [r0, #0xa]
bl sub_0801B170
movs r0, #0
bl sub_0801DA90
ldr r2, _080537F0 @ =gUnk_03000F50
ldr r2, _080537F0 @ =gLCDControls
movs r0, #0x99
lsls r0, r0, #6
strh r0, [r2]
@@ -2208,8 +2208,8 @@ _080537DC: .4byte gUnk_02000080
_080537E0: .4byte gUnk_02032EC0
_080537E4: .4byte gUnk_02025EB0
_080537E8: .4byte gUnk_0200B650
_080537EC: .4byte gUnk_03000BF0
_080537F0: .4byte gUnk_03000F50
_080537EC: .4byte gRoomControls
_080537F0: .4byte gLCDControls
_080537F4: .4byte 0x00002244
_080537F8: .4byte 0x00001C4E
_080537FC: .4byte 0x00001DC1
@@ -2255,7 +2255,7 @@ sub_08053800: @ 0x08053800
ldr r1, [r4]
adds r0, r5, #0
bl sub_0805F46C
ldr r2, _08053890 @ =gUnk_03000F50
ldr r2, _08053890 @ =gLCDControls
movs r0, #1
strh r0, [r2, #0x1a]
adds r1, r2, #0
@@ -2280,7 +2280,7 @@ _08053880: .4byte gUnk_02000080
_08053884: .4byte gUnk_080FCCB4
_08053888: .4byte gUnk_02021F30
_0805388C: .4byte 0x00000F01
_08053890: .4byte gUnk_03000F50
_08053890: .4byte gLCDControls
thumb_func_start sub_08053894
sub_08053894: @ 0x08053894
@@ -2316,7 +2316,7 @@ _080538BC:
adds r1, #1
strb r1, [r4, #7]
lsls r1, r1, #0x18
ldr r3, _08053900 @ =gUnk_03000F50
ldr r3, _08053900 @ =gLCDControls
lsrs r2, r1, #0x10
lsrs r1, r1, #0x19
movs r0, #0x10
@@ -2338,7 +2338,7 @@ _080538F8:
pop {r4, pc}
.align 2, 0
_080538FC: .4byte gUnk_030010A0
_08053900: .4byte gUnk_03000F50
_08053900: .4byte gLCDControls
thumb_func_start sub_08053904
sub_08053904: @ 0x08053904
@@ -2374,7 +2374,7 @@ _0805392C:
adds r1, #1
strb r1, [r4, #7]
lsls r1, r1, #0x18
ldr r3, _08053970 @ =gUnk_03000F50
ldr r3, _08053970 @ =gLCDControls
lsrs r2, r1, #0x10
lsrs r1, r1, #0x19
movs r0, #0x10
@@ -2396,7 +2396,7 @@ _08053968:
pop {r4, pc}
.align 2, 0
_0805396C: .4byte gUnk_030010A0
_08053970: .4byte gUnk_03000F50
_08053970: .4byte gLCDControls
thumb_func_start sub_08053974
sub_08053974: @ 0x08053974
@@ -2494,8 +2494,8 @@ sub_08053A1C: @ 0x08053A1C
movs r0, #8
strh r0, [r1, #8]
ldr r0, _08053A54 @ =0x00000F07
bl sub_08056378
ldr r1, _08053A58 @ =gUnk_02000050
bl TextboxTryNoOverlap
ldr r1, _08053A58 @ =gTextBox
movs r0, #1
strb r0, [r1, #6]
strb r4, [r1, #7]
@@ -2507,12 +2507,12 @@ _08053A4E:
.align 2, 0
_08053A50: .4byte gUnk_02000080
_08053A54: .4byte 0x00000F07
_08053A58: .4byte gUnk_02000050
_08053A58: .4byte gTextBox
thumb_func_start sub_08053A5C
sub_08053A5C: @ 0x08053A5C
push {lr}
ldr r0, _08053A88 @ =gUnk_02000050
ldr r0, _08053A88 @ =gTextBox
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -2534,7 +2534,7 @@ sub_08053A5C: @ 0x08053A5C
_08053A86:
pop {pc}
.align 2, 0
_08053A88: .4byte gUnk_02000050
_08053A88: .4byte gTextBox
_08053A8C: .4byte gUnk_02000080
thumb_func_start sub_08053A90
@@ -2851,7 +2851,7 @@ sub_08053CC8: @ 0x08053CC8
bl LoadRoomEntityList
movs r5, #1
strb r5, [r6, #6]
ldr r2, _08053D28 @ =gUnk_03000F50
ldr r2, _08053D28 @ =gLCDControls
ldrh r1, [r2]
ldr r0, _08053D2C @ =0x0000FEFF
ands r0, r1
@@ -2870,7 +2870,7 @@ _08053D1E:
.align 2, 0
_08053D20: .4byte gUnk_02000080
_08053D24: .4byte gUnk_080FCF04
_08053D28: .4byte gUnk_03000F50
_08053D28: .4byte gLCDControls
_08053D2C: .4byte 0x0000FEFF
_08053D30: .4byte gUnk_02000070
@@ -2957,7 +2957,7 @@ sub_08053DB4: @ 0x08053DB4
ldr r1, _08053E28 @ =gUnk_02000070
movs r0, #1
strb r0, [r1]
ldr r1, _08053E2C @ =gUnk_03000BF0
ldr r1, _08053E2C @ =gRoomControls
movs r0, #6
ldrsb r0, [r4, r0]
ldrh r2, [r1, #0xa]
@@ -2993,7 +2993,7 @@ _08053E1C:
_08053E20: .4byte gUnk_03000FD0
_08053E24: .4byte gUnk_02000080
_08053E28: .4byte gUnk_02000070
_08053E2C: .4byte gUnk_03000BF0
_08053E2C: .4byte gRoomControls
thumb_func_start sub_08053E30
sub_08053E30: @ 0x08053E30
@@ -3048,7 +3048,7 @@ sub_08053E74: @ 0x08053E74
ldrb r0, [r4, #6]
adds r0, #1
strb r0, [r4, #6]
ldr r2, _08053EB8 @ =gUnk_03000F50
ldr r2, _08053EB8 @ =gLCDControls
ldrh r1, [r2]
ldr r0, _08053EBC @ =0x0000FEFF
ands r0, r1
@@ -3065,7 +3065,7 @@ sub_08053E74: @ 0x08053E74
.align 2, 0
_08053EB0: .4byte gUnk_080FCFB8
_08053EB4: .4byte gUnk_02000080
_08053EB8: .4byte gUnk_03000F50
_08053EB8: .4byte gLCDControls
_08053EBC: .4byte 0x0000FEFF
_08053EC0: .4byte gUnk_02000070
@@ -3135,7 +3135,7 @@ sub_08053F20: @ 0x08053F20
ldr r1, _08053F80 @ =gUnk_02000070
movs r0, #1
strb r0, [r1]
ldr r1, _08053F84 @ =gUnk_03000BF0
ldr r1, _08053F84 @ =gRoomControls
movs r0, #0xa
ldrsb r0, [r4, r0]
ldrh r2, [r1, #0xa]
@@ -3163,7 +3163,7 @@ _08053F74:
_08053F78: .4byte gUnk_03000FD0
_08053F7C: .4byte gUnk_02000080
_08053F80: .4byte gUnk_02000070
_08053F84: .4byte gUnk_03000BF0
_08053F84: .4byte gRoomControls
thumb_func_start sub_08053F88
sub_08053F88: @ 0x08053F88
@@ -3546,7 +3546,7 @@ sub_08054288: @ 0x08054288
lsls r0, r0, #3
adds r0, r0, r1
ldrh r0, [r0, #6]
bl sub_08056378
bl TextboxTryNoOverlap
pop {pc}
.align 2, 0
_08054298: .4byte gUnk_080FD5B4
@@ -4490,7 +4490,7 @@ sub_08054974: @ 0x08054974
ldrb r0, [r6, #2]
ldrb r1, [r6, #3]
bl sub_0804B0C0
ldr r4, _080549B4 @ =gUnk_03000BF0
ldr r4, _080549B4 @ =gRoomControls
ldrb r0, [r6, #2]
strb r0, [r4, #4]
ldrb r0, [r6, #3]
@@ -4508,7 +4508,7 @@ sub_08054974: @ 0x08054974
b _080549CE
.align 2, 0
_080549B0: .4byte gUnk_080FE320
_080549B4: .4byte gUnk_03000BF0
_080549B4: .4byte gRoomControls
_080549B8: .4byte gUnk_02033A90
_080549BC:
ldrb r0, [r6, #2]
@@ -4519,12 +4519,12 @@ _080549BC:
movs r0, #1
strb r0, [r1]
_080549CE:
ldr r2, _08054A04 @ =gUnk_03000F50
ldr r2, _08054A04 @ =gLCDControls
ldrh r1, [r2]
ldr r0, _08054A08 @ =0x00001FFF
ands r0, r1
strh r0, [r2]
ldr r1, _08054A0C @ =gUnk_03000BF0
ldr r1, _08054A0C @ =gRoomControls
ldrh r0, [r6, #4]
ldrh r2, [r1, #6]
adds r0, r0, r2
@@ -4544,9 +4544,9 @@ _080549F4:
pop {r4, r5, r6, pc}
.align 2, 0
_08054A00: .4byte gUnk_02000070
_08054A04: .4byte gUnk_03000F50
_08054A04: .4byte gLCDControls
_08054A08: .4byte 0x00001FFF
_08054A0C: .4byte gUnk_03000BF0
_08054A0C: .4byte gRoomControls
_08054A10: .4byte gUnk_02032EC0
thumb_func_start sub_08054A14
@@ -5163,7 +5163,7 @@ sub_08054EB8: @ 0x08054EB8
strb r0, [r3, #8]
movs r0, #0x24
strb r0, [r3, #9]
ldr r2, _08054EF8 @ =gUnk_03000BF0
ldr r2, _08054EF8 @ =gRoomControls
ldrh r0, [r4, #0x2e]
ldrh r1, [r2, #6]
subs r0, r0, r1
@@ -5185,7 +5185,7 @@ sub_08054EB8: @ 0x08054EB8
_08054EF6:
pop {r4, pc}
.align 2, 0
_08054EF8: .4byte gUnk_03000BF0
_08054EF8: .4byte gRoomControls
thumb_func_start sub_08054EFC
sub_08054EFC: @ 0x08054EFC
@@ -5193,7 +5193,7 @@ sub_08054EFC: @ 0x08054EFC
adds r4, r0, #0
movs r0, #0x2e
ldrsh r1, [r4, r0]
ldr r2, _08054F5C @ =gUnk_03000BF0
ldr r2, _08054F5C @ =gRoomControls
ldrh r0, [r2, #6]
subs r1, r1, r0
asrs r1, r1, #4
@@ -5234,7 +5234,7 @@ _08054F54:
bl sub_080A3268
pop {r4, r5, pc}
.align 2, 0
_08054F5C: .4byte gUnk_03000BF0
_08054F5C: .4byte gRoomControls
_08054F60: .4byte 0x00004074
thumb_func_start sub_08054F64
@@ -5536,7 +5536,7 @@ sub_08055184: @ 0x08055184
movs r1, #0
ldrsh r0, [r4, r1]
bl sub_0801D7EC
ldr r2, _08055214 @ =gUnk_03000F50
ldr r2, _08055214 @ =gLCDControls
ldrh r0, [r4, #2]
movs r6, #0
movs r3, #0
@@ -5587,7 +5587,7 @@ sub_08055184: @ 0x08055184
.align 2, 0
_0805520C: .4byte gUnk_02000080
_08055210: .4byte gUnk_080FF1D4
_08055214: .4byte gUnk_03000F50
_08055214: .4byte gLCDControls
_08055218: .4byte 0x00001E05
_0805521C: .4byte 0x00003648
_08055220: .4byte gUnk_02000070
@@ -5649,7 +5649,7 @@ _08055274:
ldr r0, _080552AC @ =0x0000FFFF
cmp r1, r0
beq _080552B4
ldr r1, _080552B0 @ =gUnk_03000F50
ldr r1, _080552B0 @ =gLCDControls
adds r0, r2, #1
strh r0, [r3, #0xa]
lsls r0, r2, #1
@@ -5662,9 +5662,9 @@ _08055274:
_080552A4: .4byte gUnk_030010A0
_080552A8: .4byte gUnk_080FF204
_080552AC: .4byte 0x0000FFFF
_080552B0: .4byte gUnk_03000F50
_080552B0: .4byte gLCDControls
_080552B4:
ldr r1, _080552D8 @ =gUnk_03000F50
ldr r1, _080552D8 @ =gLCDControls
ldrh r2, [r1]
ldr r0, _080552DC @ =0x0000F7FF
ands r0, r2
@@ -5683,7 +5683,7 @@ _080552B4:
_080552D6:
pop {r4, pc}
.align 2, 0
_080552D8: .4byte gUnk_03000F50
_080552D8: .4byte gLCDControls
_080552DC: .4byte 0x0000F7FF
thumb_func_start sub_080552E0
@@ -5831,7 +5831,7 @@ sub_080553E0: @ 0x080553E0
adds r2, r0, #0
cmp r2, #0
beq _08055408
ldr r0, _08055410 @ =gUnk_03000BF0
ldr r0, _08055410 @ =gRoomControls
ldrh r1, [r0, #6]
ldrh r3, [r4, #8]
adds r1, r1, r3
@@ -5844,7 +5844,7 @@ _08055408:
pop {r4, pc}
.align 2, 0
_0805540C: .4byte gUnk_02000080
_08055410: .4byte gUnk_03000BF0
_08055410: .4byte gRoomControls
thumb_func_start sub_08055414
sub_08055414: @ 0x08055414
@@ -6133,7 +6133,7 @@ sub_08055634: @ 0x08055634
adds r2, r0, #0
cmp r2, #0
beq _0805565C
ldr r0, _08055670 @ =gUnk_03000BF0
ldr r0, _08055670 @ =gRoomControls
ldrh r1, [r5, #8]
ldrh r3, [r0, #6]
adds r1, r1, r3
@@ -6152,7 +6152,7 @@ _0805565C:
pop {r4, r5, pc}
.align 2, 0
_0805566C: .4byte gUnk_02000080
_08055670: .4byte gUnk_03000BF0
_08055670: .4byte gRoomControls
thumb_func_start sub_08055674
sub_08055674: @ 0x08055674
@@ -6823,7 +6823,7 @@ sub_08055B70: @ 0x08055B70
cmp r3, #0
beq _08055BA2
ldrh r0, [r4, #8]
ldr r1, _08055BAC @ =gUnk_03000BF0
ldr r1, _08055BAC @ =gRoomControls
adds r0, r0, r5
ldrh r2, [r1, #6]
adds r0, r0, r2
@@ -6838,7 +6838,7 @@ _08055BA2:
.align 2, 0
_08055BA4: .4byte gUnk_02000080
_08055BA8: .4byte gUnk_080FF378
_08055BAC: .4byte gUnk_03000BF0
_08055BAC: .4byte gRoomControls
thumb_func_start sub_08055BB0
sub_08055BB0: @ 0x08055BB0
@@ -7115,7 +7115,7 @@ sub_08055DC0: @ 0x08055DC0
cmp r0, #0
bne _08055DDC
ldr r0, _08055DE4 @ =0x00000A01
bl sub_08056378
bl TextboxTryNoOverlap
ldr r1, _08055DE8 @ =gUnk_02000080
ldrb r0, [r1, #6]
adds r0, #1
asm/code_08055FF4.s
+12 -16596
View File
File diff suppressed because it is too large Load Diff
asm/code_08056418.s
+16461
View File
File diff suppressed because it is too large Load Diff
asm/code_0805E3B0.s
+2 -2
View File
@@ -35,7 +35,7 @@ _0805E3DC: .4byte gUnk_03003DC0
_0805E3E0:
ldrb r2, [r1, #1]
_0805E3E2:
ldr r0, _0805E408 @ =gUnk_02000050
ldr r0, _0805E408 @ =gTextBox
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
@@ -57,7 +57,7 @@ _0805E402:
_0805E404:
pop {pc}
.align 2, 0
_0805E408: .4byte gUnk_02000050
_0805E408: .4byte gTextBox
thumb_func_start sub_0805E40C
sub_0805E40C: @ 0x0805E40C
asm/code_0805E744.s
+255 -2020
View File
File diff suppressed because it is too large Load Diff
asm/code_0806ED78.s
+1749
View File
File diff suppressed because it is too large Load Diff
asm/code_0806FA6C.s
+87 -2312
View File
File diff suppressed because it is too large Load Diff
asm/code_0807B9B8.s
+2028
View File
File diff suppressed because it is too large Load Diff
asm/code_0807CC3C.s
+107 -71261
View File
File diff suppressed because it is too large Load Diff
asm/code_08080974.s
+71161
View File
File diff suppressed because it is too large Load Diff
asm/code_080A29BC.s
+55 -17395
View File
File diff suppressed because it is too large Load Diff
asm/code_080A5574.s
+16610
View File
File diff suppressed because it is too large Load Diff
asm/code_080AD90C.s
+6 -6
View File
@@ -104,7 +104,7 @@ sub_080AD9B0: @ 0x080AD9B0
movs r1, #0xf
_080AD9C2:
strb r1, [r2, #0xe]
ldr r1, _080AD9FC @ =gUnk_03000BF0
ldr r1, _080AD9FC @ =gRoomControls
adds r0, r1, #0
adds r0, #0x24
ldrb r0, [r0]
@@ -130,7 +130,7 @@ _080AD9C2:
.align 2, 0
_080AD9F4: .4byte gUnk_03000000
_080AD9F8: .4byte gUnk_030010A0
_080AD9FC: .4byte gUnk_03000BF0
_080AD9FC: .4byte gRoomControls
_080ADA00: .4byte gUnk_03006164
thumb_func_start sub_080ADA04
@@ -1628,7 +1628,7 @@ sub_080AE4CC: @ 0x080AE4CC
adds r6, r1, #0
adds r5, r2, #0
adds r4, r3, #0
ldr r1, _080AE4FC @ =gUnk_03000BF0
ldr r1, _080AE4FC @ =gRoomControls
ldrh r2, [r1, #6]
subs r2, r6, r2
asrs r2, r2, #4
@@ -1648,7 +1648,7 @@ sub_080AE4CC: @ 0x080AE4CC
beq _080AE588
b _080AE516
.align 2, 0
_080AE4FC: .4byte gUnk_03000BF0
_080AE4FC: .4byte gRoomControls
_080AE500:
cmp r3, #0xf
bhi _080AE53E
@@ -3467,7 +3467,7 @@ _080AF280: .4byte gUnk_08135168
thumb_func_start sub_080AF284
sub_080AF284: @ 0x080AF284
push {lr}
ldr r0, _080AF2AC @ =gUnk_03000BF0
ldr r0, _080AF2AC @ =gRoomControls
ldrh r1, [r0, #0x20]
subs r1, #0x50
movs r0, #0x78
@@ -3484,7 +3484,7 @@ sub_080AF284: @ 0x080AF284
ldr r1, _080AF2B8 @ =gUnk_08135048
b _080AF2D4
.align 2, 0
_080AF2AC: .4byte gUnk_03000BF0
_080AF2AC: .4byte gRoomControls
_080AF2B0: .4byte gUnk_02033A90
_080AF2B4: .4byte 0x0000085C
_080AF2B8: .4byte gUnk_08135048
asm/createEntity.s
+2 -2
View File
@@ -77,7 +77,7 @@ _0804AE1C:
strb r0, [r1]
b _0804AEAA
_0804AE88:
ldr r0, _0804AEA0 @ =gUnk_03000BF0
ldr r0, _0804AEA0 @ =gRoomControls
ldrb r1, [r0, #0xf]
movs r0, #2
ands r0, r1
@@ -90,7 +90,7 @@ _0804AE94:
strb r0, [r1]
b _0804AEAA
.align 2, 0
_0804AEA0: .4byte gUnk_03000BF0
_0804AEA0: .4byte gRoomControls
_0804AEA4:
adds r0, r5, #0
bl sub_08016A30
asm/intr.s
+12 -12
View File
@@ -8,7 +8,7 @@
.code 16
sub_080B197C:: @ 0x080B197C
push {r4, r5, r6}
ldr r2, _080B19C0 @ =gUnk_03000BF0
ldr r2, _080B19C0 @ =gRoomControls
ldrh r3, [r2, #0xa]
ldrh r4, [r2, #6]
subs r3, r3, r4
@@ -45,7 +45,7 @@ _080B19B4:
pop {r4, r5, r6}
bx lr
.align 2, 0
_080B19C0: .4byte gUnk_03000BF0
_080B19C0: .4byte gRoomControls
_080B19C4: .4byte 0x80000020
_080B19C8: .4byte 0x040000D4
@@ -54,7 +54,7 @@ sub_080B19CC: @ 0x080B19CC
ldrb r2, [r0, #0x38]
ldrh r1, [r0, #0x32]
ldrh r0, [r0, #0x2e]
ldr ip, _080B1C10 @ =gUnk_03000BF0
ldr ip, _080B1C10 @ =gRoomControls
ldrh r3, [ip, #6]
sub r0, r0, r3
ldrh r3, [ip, #8]
@@ -82,7 +82,7 @@ _080B1A28:
ldrh r1, [r0, #0x32]
ldrh r0, [r0, #0x2e]
_080B1A34:
ldr ip, _080B1C18 @ =gUnk_03000BF0
ldr ip, _080B1C18 @ =gRoomControls
ldrh r3, [ip, #6]
sub r0, r0, r3
ldrh r3, [ip, #8]
@@ -123,7 +123,7 @@ _080B1AA8:
ldrh r1, [r0, #0x32]
ldrh r0, [r0, #0x2e]
_080B1AB4:
ldr ip, _080B1C20 @ =gUnk_03000BF0
ldr ip, _080B1C20 @ =gRoomControls
ldrh r3, [ip, #6]
sub r0, r0, r3
ldrh r3, [ip, #8]
@@ -153,7 +153,7 @@ _080B1B0C:
ldrh r1, [r0, #0x32]
ldrh r0, [r0, #0x2e]
_080B1B18:
ldr ip, _080B1C28 @ =gUnk_03000BF0
ldr ip, _080B1C28 @ =gRoomControls
ldrh r3, [ip, #6]
sub r0, r0, r3
ldrh r3, [ip, #8]
@@ -217,7 +217,7 @@ sub_080B1BCC: @ 0x080B1BCC
add r1, r1, r3
ldrh r3, [r0, #0x32]
add r2, r2, r3
ldr ip, _080B1C4C @ =gUnk_03000BF0
ldr ip, _080B1C4C @ =gRoomControls
ldrh r3, [ip, #6]
sub r1, r1, r3
ldrh r3, [ip, #8]
@@ -231,13 +231,13 @@ sub_080B1BCC: @ 0x080B1BCC
ldrb r0, [r2, r1, lsr #4]
bx lr
.align 2, 0
_080B1C10: .4byte gUnk_03000BF0
_080B1C10: .4byte gRoomControls
_080B1C14: .4byte gUnk_08000258
_080B1C18: .4byte gUnk_03000BF0
_080B1C18: .4byte gRoomControls
_080B1C1C: .4byte gUnk_08000228
_080B1C20: .4byte gUnk_03000BF0
_080B1C20: .4byte gRoomControls
_080B1C24: .4byte gUnk_08000278
_080B1C28: .4byte gUnk_03000BF0
_080B1C28: .4byte gRoomControls
_080B1C2C: .4byte gUnk_08000248
_080B1C30: .4byte gUnk_080B37A0
_080B1C34: .4byte gUnk_080B7910
@@ -246,7 +246,7 @@ _080B1C3C: .4byte gUnk_08000360
_080B1C40: .4byte gUnk_080B7A3E
_080B1C44: .4byte gUnk_08000360
_080B1C48: .4byte gUnk_080B7A3E
_080B1C4C: .4byte gUnk_03000BF0
_080B1C4C: .4byte gRoomControls
_080B1C50: .4byte gUnk_08000278
arm_func_start sub_080B1C54
asm/sub_08007DE0.s
+22
View File
@@ -0,0 +1,22 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_08007DE0
sub_08007DE0: @ 0x08007DE0
subs r1, #4
_08007DE2:
adds r1, #4
ldrh r3, [r1]
cmp r3, #0
beq _08007DF2
cmp r0, r3
bne _08007DE2
ldrh r3, [r1, #2]
movs r2, #1
_08007DF2:
bx lr
asm/sub_08016AE4.s
+44
View File
@@ -0,0 +1,44 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_08016AE4
sub_08016AE4: @ 0x08016AE4
mov r3, lr
push {r3, r4}
adds r4, r0, #0
ldrb r2, [r0, #0xc]
cmp r2, #0
bne _08016AFC
bl sub_080A7D80
cmp r0, #0
bne _08016B0A
bl sub_0805E780
_08016AFC:
bl sub_0805E3B0
cmp r0, #0
bne _08016B22
adds r0, r4, #0
bl sub_080028E0
_08016B0A:
adds r0, r4, #0
ldrb r1, [r0, #9]
lsls r1, r1, #2
ldr r2, _08016B2C @ =gUnk_08129320
ldr r1, [r2, r1]
bl _call_via_r1
movs r1, #0x41
movs r3, #0x7f
ldrb r2, [r4, r1]
ands r2, r3
strb r2, [r4, r1]
_08016B22:
adds r0, r4, #0
bl sub_0800404C
pop {r3, r4}
bx r3
.align 2, 0
_08016B2C: .4byte gUnk_08129320
asm/sub_08052418.s
+73
View File
@@ -0,0 +1,73 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_08052418
sub_08052418: @ 0x08052418
push {r4, r5, r6, lr}
sub sp, #0x18
adds r6, r0, #0
adds r4, r1, #0
ldr r0, _08052494 @ =gUnk_02021F30
movs r1, #0x80
lsls r1, r1, #4
bl sub_0801D630
ldr r0, _08052498 @ =gUnk_020227E8
movs r1, #0xf
str r1, [r0]
str r1, [r0, #8]
str r1, [r0, #0x10]
str r1, [r0, #0x18]
lsls r4, r4, #3
adds r0, #1
adds r4, r4, r0
movs r5, #1
strb r5, [r4]
ldr r4, _0805249C @ =gUnk_080FCA8C
adds r0, r4, #0
mov r1, sp
movs r2, #0x18
bl sub_0801D66C
lsls r2, r6, #1
adds r2, r2, r6
lsls r2, r2, #2
ldr r0, _080524A0 @ =gUnk_080FCAA4
adds r2, r2, r0
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r1, [r0, #7]
adds r1, r2, r1
ldrb r0, [r2, #8]
lsls r0, r0, #5
ldrb r1, [r1]
adds r0, r0, r1
lsls r0, r0, #1
ldr r1, [r4]
adds r1, r1, r0
str r1, [sp]
mov r4, sp
ldrb r0, [r2, #9]
adds r1, r5, #0
ands r1, r0
ldrb r3, [r4, #0x13]
movs r0, #2
rsbs r0, r0, #0
ands r0, r3
orrs r0, r1
strb r0, [r4, #0x13]
ldrh r0, [r2, #0xa]
mov r1, sp
bl sub_0805F46C
ldr r0, _080524A4 @ =gLCDControls
strh r5, [r0, #0x1a]
add sp, #0x18
pop {r4, r5, r6, pc}
.align 2, 0
_08052494: .4byte gUnk_02021F30
_08052498: .4byte gUnk_020227E8
_0805249C: .4byte gUnk_080FCA8C
_080524A0: .4byte gUnk_080FCAA4
_080524A4: .4byte gLCDControls
asm/sub_080AD380.s
+65
View File
@@ -0,0 +1,65 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_080AD380
sub_080AD380: @ 0x080AD380
push {r4, lr}
bl sub_080AD90C
ldr r4, _080AD398 @ =gUnk_03001000
ldrb r0, [r4, #3]
cmp r0, #1
beq _080AD3BC
cmp r0, #1
bgt _080AD39C
cmp r0, #0
beq _080AD3A2
b _080AD3EA
.align 2, 0
_080AD398: .4byte gUnk_03001000
_080AD39C:
cmp r0, #2
beq _080AD3D8
b _080AD3EA
_080AD3A2:
bl sub_08056418
ldr r0, _080AD3B8 @ =gUnk_02032EC0
movs r1, #0xed
lsls r1, r1, #2
bl sub_0801D630
movs r0, #0
bl IntroSetTransition
b _080AD3EA
.align 2, 0
_080AD3B8: .4byte gUnk_02032EC0
_080AD3BC:
ldr r1, _080AD3D0 @ =gUnk_081320F0
ldr r0, _080AD3D4 @ =gUnk_02032EC0
ldrb r0, [r0, #2]
lsls r0, r0, #2
adds r0, r0, r1
ldr r0, [r0]
bl _call_via_r0
b _080AD3EA
.align 2, 0
_080AD3D0: .4byte gUnk_081320F0
_080AD3D4: .4byte gUnk_02032EC0
_080AD3D8:
ldr r0, _080AD3F0 @ =gUnk_03000FD0
ldrb r0, [r0]
cmp r0, #0
bne _080AD3EE
movs r0, #1
bl sub_0801DA90
movs r0, #1
strb r0, [r4, #3]
_080AD3EA:
bl sub_080AD918
_080AD3EE:
pop {r4, pc}
.align 2, 0
_080AD3F0: .4byte gUnk_03000FD0
asm/sub_080AD3F4.s
+68
View File
@@ -0,0 +1,68 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_080AD3F4
sub_080AD3F4: @ 0x080AD3F4
push {r4, r5, lr}
bl sub_080AD84C
adds r1, r0, #0
ldr r4, _080AD450 @ =gUnk_02000080
ldrb r0, [r4, #5]
cmp r0, #0
bne _080AD458
movs r0, #1
bl sub_0801DA90
movs r5, #1
strb r5, [r4, #5]
movs r0, #0x78
strh r0, [r4, #8]
movs r0, #0x10
bl sub_0801D7EC
movs r0, #1
bl sub_0801D7EC
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r0, [r0, #7]
movs r1, #2
cmp r0, #0
bne _080AD42C
movs r1, #1
_080AD42C:
adds r0, r1, #0
bl sub_0801D714
ldr r0, _080AD454 @ =gLCDControls
ldrh r1, [r0]
movs r3, #0x80
lsls r3, r3, #3
adds r2, r3, #0
orrs r1, r2
strh r1, [r0]
strh r5, [r0, #0x1a]
movs r0, #6
movs r1, #8
bl sub_08050054
movs r1, #0
b _080AD45E
.align 2, 0
_080AD450: .4byte gUnk_02000080
_080AD454: .4byte gLCDControls
_080AD458:
cmp r1, #1
bne _080AD45E
movs r1, #2
_080AD45E:
cmp r1, #2
bne _080AD46C
ldr r1, _080AD470 @ =gUnk_02000010
movs r0, #1
strb r0, [r1, #5]
bl IntroSetTransition
_080AD46C:
pop {r4, r5, pc}
.align 2, 0
_080AD470: .4byte gUnk_02000010
asm/sub_080AD474.s
+224
View File
@@ -0,0 +1,224 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_080AD474
sub_080AD474: @ 0x080AD474
push {r4, r5, r6, lr}
ldr r5, _080AD490 @ =gUnk_02000080
ldrb r0, [r5, #0x12]
adds r0, #1
strb r0, [r5, #0x12]
ldrb r0, [r5, #5]
cmp r0, #1
bne _080AD486
b _080AD588
_080AD486:
cmp r0, #1
bgt _080AD494
cmp r0, #0
beq _080AD49C
b _080AD5C8
.align 2, 0
_080AD490: .4byte gUnk_02000080
_080AD494:
cmp r0, #2
bne _080AD49A
b _080AD5AA
_080AD49A:
b _080AD5C8
_080AD49C:
movs r4, #1
strb r4, [r5, #5]
strb r0, [r5, #6]
movs r6, #0
movs r0, #0x1e
strh r0, [r5, #8]
movs r0, #7
strb r0, [r5, #4]
bl sub_0805E60C
movs r0, #0
bl sub_0801CFA8
bl sub_080ADD30
ldr r0, _080AD50C @ =gUnk_02024490
strb r4, [r0]
movs r0, #2
bl sub_0801D7EC
movs r4, #0x80
lsls r4, r4, #0x12
ldrb r0, [r4, #7]
movs r1, #4
cmp r0, #0
bne _080AD4D2
movs r1, #3
_080AD4D2:
adds r0, r1, #0
bl sub_0801D714
ldrb r0, [r4, #7]
cmp r0, #0
bne _080AD524
ldr r2, _080AD510 @ =gLCDControls
adds r1, r2, #0
adds r1, #0x66
ldr r0, _080AD514 @ =0x00000844
strh r0, [r1]
adds r1, #2
adds r0, #0xc5
strh r0, [r1]
ldr r0, _080AD518 @ =0x00001C09
strh r0, [r2, #0x14]
adds r0, #0xf9
strh r0, [r2, #0x20]
ldr r0, _080AD51C @ =0x00001E03
strh r0, [r2, #0x2c]
ldrh r0, [r2]
movs r3, #0xf0
lsls r3, r3, #5
adds r1, r3, #0
orrs r0, r1
strh r0, [r2]
ldr r0, _080AD520 @ =0x0000FF60
strh r0, [r2, #0x18]
b _080AD55A
.align 2, 0
_080AD50C: .4byte gUnk_02024490
_080AD510: .4byte gLCDControls
_080AD514: .4byte 0x00000844
_080AD518: .4byte 0x00001C09
_080AD51C: .4byte 0x00001E03
_080AD520: .4byte 0x0000FF60
_080AD524:
ldr r2, _080AD570 @ =gLCDControls
adds r1, r2, #0
adds r1, #0x66
ldr r0, _080AD574 @ =0x00000241
strh r0, [r1]
adds r1, #2
ldr r0, _080AD578 @ =0x00000909
strh r0, [r1]
ldr r0, _080AD57C @ =0x00001D02
strh r0, [r2, #8]
ldr r0, _080AD580 @ =0x00001E03
strh r0, [r2, #0x14]
ldr r0, _080AD584 @ =0x00007C89
strh r0, [r2, #0x20]
ldrh r0, [r2]
movs r1, #1
orrs r0, r1
orrs r0, r6
movs r3, #0x98
lsls r3, r3, #5
adds r1, r3, #0
orrs r0, r1
strh r0, [r2]
movs r0, #0x10
str r0, [r5, #0x2c]
bl sub_080AD670
_080AD55A:
bl sub_080A3210
movs r0, #3
bl sub_080A3268
movs r0, #6
movs r1, #8
bl sub_08050054
b _080AD610
.align 2, 0
_080AD570: .4byte gLCDControls
_080AD574: .4byte 0x00000241
_080AD578: .4byte 0x00000909
_080AD57C: .4byte 0x00001D02
_080AD580: .4byte 0x00001E03
_080AD584: .4byte 0x00007C89
_080AD588:
ldr r0, _080AD5A0 @ =gUnk_03000FD0
ldrb r0, [r0]
cmp r0, #0
bne _080AD632
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r0, [r0, #7]
cmp r0, #0
bne _080AD5A4
bl sub_080AD6AC
b _080AD610
.align 2, 0
_080AD5A0: .4byte gUnk_03000FD0
_080AD5A4:
bl sub_080AD76C
b _080AD610
_080AD5AA:
ldrh r0, [r5, #8]
subs r0, #1
strh r0, [r5, #8]
lsls r0, r0, #0x10
cmp r0, #0
bne _080AD5C2
movs r0, #0xe1
lsls r0, r0, #4
strh r0, [r5, #8]
ldrb r0, [r5, #5]
adds r0, #1
strb r0, [r5, #5]
_080AD5C2:
bl sub_080AD644
b _080AD610
_080AD5C8:
bl sub_080AD84C
adds r4, r0, #0
cmp r4, #0
beq _080AD5EC
cmp r4, #2
bne _080AD5DE
movs r0, #0x6a
bl sub_080A3268
b _080AD5E0
_080AD5DE:
movs r4, #0
_080AD5E0:
adds r0, r4, #0
bl IntroSetTransition
ldr r0, _080AD634 @ =0x80080000
bl sub_080A3268
_080AD5EC:
bl sub_080AD644
ldr r0, _080AD638 @ =gUnk_02000080
ldrh r1, [r0, #8]
movs r0, #0x20
ands r0, r1
cmp r0, #0
bne _080AD610
ldr r1, _080AD63C @ =gUnk_03001010
movs r0, #0xe0
lsls r0, r0, #8
strh r0, [r1, #8]
movs r0, #0x84
strh r0, [r1, #2]
ldr r0, _080AD640 @ =0x000001FF
movs r1, #0
bl sub_080ADA14
_080AD610:
ldr r2, _080AD638 @ =gUnk_02000080
movs r0, #0x80
lsls r0, r0, #0x12
ldrb r1, [r0, #7]
ldrb r0, [r2, #4]
cmp r0, r1
beq _080AD626
strb r1, [r2, #4]
movs r0, #3
bl sub_0801D7EC
_080AD626:
bl sub_080AD89C
bl sub_0805E5C0
bl sub_080AD9B0
_080AD632:
pop {r4, r5, r6, pc}
.align 2, 0
_080AD634: .4byte 0x80080000
_080AD638: .4byte gUnk_02000080
_080AD63C: .4byte gUnk_03001010
_080AD640: .4byte 0x000001FF
asm/sub_080AD670.s
+38
View File
@@ -0,0 +1,38 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_080AD670
sub_080AD670: @ 0x080AD670
push {lr}
sub sp, #0x14
movs r0, #0x80
lsls r0, r0, #8
str r0, [sp, #4]
str r0, [sp]
mov r1, sp
movs r2, #0
movs r0, #0x78
strh r0, [r1, #8]
movs r0, #0x48
strh r0, [r1, #0xa]
mov r0, sp
strh r2, [r0, #0x10]
mov r2, sp
ldr r0, _080AD6A4 @ =gUnk_02000080
ldr r0, [r0, #0x2c]
strh r0, [r1, #0xc]
strh r0, [r2, #0xe]
ldr r1, _080AD6A8 @ =gBgControls
mov r0, sp
movs r2, #1
bl BgAffineSet
add sp, #0x14
pop {pc}
.align 2, 0
_080AD6A4: .4byte gUnk_02000080
_080AD6A8: .4byte gBgControls
asm/sub_080AD6Ac.s
+105
View File
@@ -0,0 +1,105 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_080AD6AC
sub_080AD6AC: @ 0x080AD6AC
push {r4, r5, r6, lr}
ldr r4, _080AD6C0 @ =gUnk_02000080
ldrb r0, [r4, #6]
cmp r0, #1
beq _080AD724
cmp r0, #1
bgt _080AD6C4
cmp r0, #0
beq _080AD6CA
b _080AD76A
.align 2, 0
_080AD6C0: .4byte gUnk_02000080
_080AD6C4:
cmp r0, #2
beq _080AD758
b _080AD76A
_080AD6CA:
ldr r6, _080AD718 @ =gUnk_03000FD0
ldrb r5, [r6]
cmp r5, #0
bne _080AD76A
ldrb r1, [r4, #0x12]
movs r0, #1
ands r0, r1
cmp r0, #0
bne _080AD6E4
ldr r1, _080AD71C @ =gLCDControls
ldrh r0, [r1, #0x18]
adds r0, #1
strh r0, [r1, #0x18]
_080AD6E4:
bl sub_080AD84C
cmp r0, #2
beq _080AD6F4
ldr r0, _080AD71C @ =gLCDControls
ldrh r0, [r0, #0x18]
cmp r0, #0
bne _080AD76A
_080AD6F4:
ldrb r0, [r4, #6]
adds r0, #1
strb r0, [r4, #6]
ldr r1, _080AD71C @ =gLCDControls
strh r5, [r1, #0x18]
ldr r0, _080AD720 @ =0x00000C09
strh r0, [r1, #0x14]
movs r0, #0x40
str r0, [r6, #4]
movs r0, #6
movs r1, #0x10
bl sub_08050054
movs r0, #0xf8
bl sub_080A3268
b _080AD76A
.align 2, 0
_080AD718: .4byte gUnk_03000FD0
_080AD71C: .4byte gLCDControls
_080AD720: .4byte 0x00000C09
_080AD724:
ldr r1, _080AD754 @ =gUnk_03000FD0
ldrb r5, [r1]
cmp r5, #0
bne _080AD76A
movs r0, #1
rsbs r0, r0, #0
str r0, [r1, #4]
ldrb r0, [r4, #6]
adds r0, #1
strb r0, [r4, #6]
movs r0, #0x5a
strh r0, [r4, #8]
movs r0, #0xb4
movs r1, #0
movs r2, #0
bl CreateObject
adds r1, r0, #0
cmp r1, #0
beq _080AD76A
strh r5, [r1, #0x2e]
movs r0, #0x48
strh r0, [r1, #0x32]
b _080AD76A
.align 2, 0
_080AD754: .4byte gUnk_03000FD0
_080AD758:
bl sub_080AD84C
cmp r0, #0
beq _080AD76A
ldrb r0, [r4, #5]
adds r0, #1
strb r0, [r4, #5]
movs r0, #0x3c
strh r0, [r4, #8]
_080AD76A:
pop {r4, r5, r6, pc}
asm/sub_080AD76C.s
+108
View File
@@ -0,0 +1,108 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_080AD76C
sub_080AD76C: @ 0x080AD76C
push {lr}
ldr r1, _080AD780 @ =gUnk_02000080
ldrb r0, [r1, #6]
cmp r0, #1
beq _080AD7B4
cmp r0, #1
bgt _080AD784
cmp r0, #0
beq _080AD78A
b _080AD80E
.align 2, 0
_080AD780: .4byte gUnk_02000080
_080AD784:
cmp r0, #2
beq _080AD7DC
b _080AD80E
_080AD78A:
ldr r0, _080AD7AC @ =gUnk_03000FD0
ldrb r0, [r0]
cmp r0, #0
bne _080AD82A
movs r0, #1
strb r0, [r1, #6]
ldr r2, _080AD7B0 @ =gLCDControls
ldrh r1, [r2]
movs r3, #0x80
lsls r3, r3, #3
adds r0, r3, #0
orrs r0, r1
strh r0, [r2]
movs r0, #0xf6
bl sub_080A3268
b _080AD82A
.align 2, 0
_080AD7AC: .4byte gUnk_03000FD0
_080AD7B0: .4byte gLCDControls
_080AD7B4:
ldr r0, [r1, #0x2c]
adds r0, #0x10
str r0, [r1, #0x2c]
movs r2, #0x80
lsls r2, r2, #1
cmp r0, r2
ble _080AD7D6
str r2, [r1, #0x2c]
movs r0, #0x28
strh r0, [r1, #8]
ldrb r0, [r1, #6]
adds r0, #1
strb r0, [r1, #6]
movs r0, #6
movs r1, #0x10
bl sub_08050054
_080AD7D6:
bl sub_080AD670
b _080AD82A
_080AD7DC:
ldrh r0, [r1, #8]
subs r0, #1
strh r0, [r1, #8]
lsls r0, r0, #0x10
cmp r0, #0
bne _080AD82A
movs r0, #0x96
lsls r0, r0, #1
strh r0, [r1, #8]
ldrb r0, [r1, #6]
adds r0, #1
strb r0, [r1, #6]
movs r0, #0xbd
movs r1, #0
movs r2, #0
bl CreateObject
movs r0, #6
movs r1, #0x10
bl sub_08050054
movs r0, #0xf8
bl sub_080A3268
b _080AD82A
_080AD80E:
ldr r0, _080AD82C @ =gUnk_03000FD0
ldrb r0, [r0]
cmp r0, #0
bne _080AD82A
bl sub_080AD84C
cmp r0, #0
beq _080AD82A
ldr r0, _080AD830 @ =gUnk_02000080
ldrb r1, [r0, #5]
adds r1, #1
strb r1, [r0, #5]
movs r1, #0x3c
strh r1, [r0, #8]
_080AD82A:
pop {pc}
.align 2, 0
_080AD82C: .4byte gUnk_03000FD0
_080AD830: .4byte gUnk_02000080
asm/sub_080AD84C.s
+51
View File
@@ -0,0 +1,51 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_080AD84C
sub_080AD84C: @ 0x080AD84C
push {lr}
ldr r0, _080AD864 @ =gUnk_03000FD0
ldrb r0, [r0]
cmp r0, #0
bne _080AD894
ldr r0, _080AD868 @ =gUnk_02000010
ldrb r0, [r0, #5]
cmp r0, #0
bne _080AD86C
movs r2, #0
b _080AD874
.align 2, 0
_080AD864: .4byte gUnk_03000FD0
_080AD868: .4byte gUnk_02000010
_080AD86C:
ldr r0, _080AD888 @ =gUnk_03000FF0
ldrh r0, [r0, #2]
movs r2, #9
ands r2, r0
_080AD874:
ldr r1, _080AD88C @ =gUnk_02000080
ldrh r0, [r1, #8]
subs r0, #1
strh r0, [r1, #8]
lsls r0, r0, #0x10
cmp r0, #0
bne _080AD890
movs r0, #1
b _080AD89A
.align 2, 0
_080AD888: .4byte gUnk_03000FF0
_080AD88C: .4byte gUnk_02000080
_080AD890:
cmp r2, #0
bne _080AD898
_080AD894:
movs r0, #0
b _080AD89A
_080AD898:
movs r0, #2
_080AD89A:
pop {pc}
asm/sub_080AD89C.s
+49
View File
@@ -0,0 +1,49 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_080AD89C
sub_080AD89C: @ 0x080AD89C
push {r4, lr}
ldr r4, _080AD8E4 @ =gUnk_02000080
ldrb r1, [r4, #0x12]
movs r0, #7
ands r0, r1
cmp r0, #0
bne _080AD8BC
ldrb r0, [r4, #0x10]
adds r0, #1
movs r1, #3
ands r0, r1
strb r0, [r4, #0x10]
ldrb r0, [r4, #0x10]
adds r0, #5
bl sub_0801D714
_080AD8BC:
ldrb r1, [r4, #0x12]
movs r0, #0x1f
ands r0, r1
cmp r0, #0
bne _080AD8E0
ldrb r0, [r4, #0x11]
adds r0, #1
movs r1, #7
ands r0, r1
strb r0, [r4, #0x11]
ldr r1, _080AD8E8 @ =gLCDControls
ldr r2, _080AD8EC @ =gUnk_081320FC
ldrb r0, [r4, #0x11]
lsls r0, r0, #1
adds r0, r0, r2
ldrh r0, [r0]
adds r1, #0x68
strh r0, [r1]
_080AD8E0:
pop {r4, pc}
.align 2, 0
_080AD8E4: .4byte gUnk_02000080
_080AD8E8: .4byte gLCDControls
_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 @ =gUnk_03000F50
ldr r3, _08016DF0 @ =gLCDControls
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 gUnk_03000F50
_08016DF0: .4byte gLCDControls
_08016DF4: .4byte 0x04000020
include/New Text Document.txt
-1
View File
@@ -1 +0,0 @@
void LoadRoom(void);
include/bg.h
+63
View File
@@ -0,0 +1,63 @@
#ifndef BG_H
#define BG_H
#include "global.h"
typedef struct {
u16 lcdControl2;
u32 unk;
u16 lcdControl1;
} LcdControls;
typedef struct {
u16 bg0Control;
u16 bg0xOffset;
u16 bg0yOffset;
u16 bg0Updated;
u32 unk;
} BgSettings;
typedef struct {
u16 bg2Control;
u16 bg2xOffset;
u16 bg2yOffset;
u16 unk;
u32 unk2;
u16 unk3;
u16 bg3Control;
u16 bg3xOffset;
u16 bg3yOffset;
u16 unk4;
u32 unk5;
} BgAffSettings;
typedef struct {
u16 bg2dx;
u16 bg2dmx;
u16 bg2dy;
u16 bg2dmy;
u16 bg2xPointLeastSig;
u16 bg2xPointMostSig;
u16 bg2yPointLeastSig;
u16 bg2yPointMostSig;
u16 bg3dx;
u16 bg3dmx;
u16 bg3dy;
u16 bg3dmy;
u16 bg3xPointLeastSig;
u16 bg3xPointMostSig;
u16 bg3yPointLeastSig;
u16 bg3yPointMostSig;
u16 window0HorizontalDimensions;
u16 window1HorizontalDimensions;
u16 window0VerticalDimensions;
u16 window1VerticalDimensions;
u16 windowInsideControl;
u16 windowOutsideControl;
u16 mosaicSize;
u16 layerFXControl;
u16 alphaBlend;
u16 layerBrightness;
} BgControls;
#endif
include/entity.h
+5
View File
@@ -18,6 +18,11 @@ union SplitWord {
u16 LO, HI;
};
typedef struct {
u16 LO;
u16 HI;
} Pos;
typedef struct
{
u32 *field_0x0;
include/menu.h
+20
View File
@@ -0,0 +1,20 @@
#ifndef MENU_H
#define MENU_H
#include "global.h"
typedef struct {
u16 unk;
u8 transitionType;
u8 unk4;
u8 state;
u8 unk6;
u8 unk7;
u8 unk8;
u16 unk2;
u16 fadeInTime;
u8 filler2 [4];
u32 filler3[3];
} Menu;
#endif
include/room.h
+32
View File
@@ -0,0 +1,32 @@
#ifndef ROOM_H
#define ROOM_H
#include "global.h"
#include "entity.h"
/*
typedef struct {
u8 areaID;
u8 roomID;
} RoomID;
*/
typedef struct {
u16 unk2;
u8 unk3;
u8 unk4;
u8 areaID;
u8 roomID;
u16 roomOriginX;
u16 roomOriginY;
s16 roomScrollX;
s16 roomScrollY;
u8 filler[8];
u16 screenShakeTime;
u16 filler2[6];
u8 filler3[4];
u16 filler4[4];
Entity * cameraTarget;
} RoomControls;
#endif
include/textbox.h
+19
View File
@@ -0,0 +1,19 @@
#ifndef TEXTBOX_H
#define TEXTBOX_H
#include "global.h"
typedef struct {
u8 doTextBox;
u8 unk;
u8 textSpeed;
u8 unk3; //HI?
u8 textWindowWidth;
u8 textWindowHeight;
u8 textWindowPosX;
u8 textWindowPosY;
u16 textIndex;
u16 unk2; //HI?
} TextBox;
#endif
linker.ld
+34 -8
View File
@@ -13,7 +13,7 @@ SECTIONS {
. = 0x00000020; gUnk_02000020 = .;
. = 0x00000030; gUnk_02000030 = .;
. = 0x00000040; gUnk_02000040 = .;
. = 0x00000050; gUnk_02000050 = .;
. = 0x00000050; gTextBox = .;
. = 0x0000005C; gUnk_0200005C = .;
. = 0x00000070; gUnk_02000070 = .;
. = 0x00000080; gUnk_02000080 = .;
@@ -157,17 +157,17 @@ SECTIONS {
. = 0x00000420; gUnk_03000420 = .;
. = 0x00000B80; gUnk_03000B80 = .;
. = 0x00000BD4; gUnk_03000BD4 = .;
. = 0x00000BF0; gUnk_03000BF0 = .;
. = 0x00000BF0; gRoomControls = .;
. = 0x00000BF6; gUnk_03000BF6 = .;
. = 0x00000BF8; gUnk_03000BF8 = .;
. = 0x00000C24; gUnk_03000C24 = .;
. = 0x00000C30; gUnk_03000C30 = .;
. = 0x00000E10; gUnk_03000E10 = .;
. = 0x00000F50; gUnk_03000F50 = .;
. = 0x00000F58; gUnk_03000F58 = .;
. = 0x00000F64; gUnk_03000F64 = .;
. = 0x00000F70; gUnk_03000F70 = .;
. = 0x00000F88; gUnk_03000F88 = .;
. = 0x00000F50; gLCDControls = .;
. = 0x00000F58; gBG0Settings = .;
. = 0x00000F64; gBG1Settings = .;
. = 0x00000F70; gBGAffSettings = .;
. = 0x00000F88; gBgControls = .;
. = 0x00000FBC; gUnk_03000FBC = .;
. = 0x00000FD0; gUnk_03000FD0 = .;
. = 0x00000FF0; gUnk_03000FF0 = .;
@@ -290,6 +290,7 @@ SECTIONS {
asm/code_080043E8.o(.text);
data/data_6.o(.rodata);
asm/code_0800857C.o(.text);
asm/sub_08016AE4.o(.text);
/* C source compiled with interworking */
@@ -320,8 +321,10 @@ SECTIONS {
src/sub_08050008.o(.text);
src/sub_08050024.o(.text);
asm/code_08050038.o(.text);
asm/sub_08052418.o(.text);
asm/initializeLink.o(.text);
asm/code_08052620.o(.text);
src/sub_08052620.o(.text);
src/sub_08052638.o(.text);
src/bitGetters.o(.text);
src/modHealth.o(.text);
asm/code_080526CC.o(.text);
@@ -330,17 +333,26 @@ SECTIONS {
asm/mainLoop.o(.text);
asm/sub_08055F70.o(.text);
asm/code_08055FF4.o(.text);
src/textbox.o(.text);
asm/code_08056418.o(.text);
src/sub_0805E374.o(.text);
src/sub_0805E3A0.o(.text);
asm/code_0805E3B0.o(.text);
asm/getEmptyEntity.o(.text);
asm/code_0805E744.o(.text);
src/createNPC.o(.text);
asm/code_0806ED78.o(.text);
src/sub_0806F9EC.o(.text);
src/sub_0806FA04.o(.text);
src/sub_0806FA24.o(.text);
src/sub_0806FA30.o(.text);
src/positionRelative.o(.text);
asm/code_0806FA6C.o(.text);
src/sub_0807B7D8.o(.text);
src/sub_0807B820.o(.text);
src/sub_0807B8A8.o(.text);
src/sub_0807B930.o(.text);
asm/code_0807B9B8.o(.text);
src/sub_0807C998.o(.text);
src/sub_0801D754.o(.text);
asm/sub_0807CA18.o(.text);
@@ -348,12 +360,26 @@ SECTIONS {
asm/code_0807CAA0.o(.text);
src/getProgressFlag.o(.text);
asm/code_0807CC3C.o(.text);
asm/code_08080974.o(.text);
asm/sub_080A2838.o(.text);
asm/sub_080A285C.o(.text);
src/createObject.o(.text);
asm/sub_080A2988.o(.text);
asm/createFx.o(.text);
asm/code_080A29BC.o(.text);
src/sub_080A554C.o(.text);
asm/code_080A5574.o(.text);
src/introSetTransition.o(.text);
asm/sub_080AD380.o(.text);
asm/sub_080AD3F4.o(.text);
asm/sub_080AD474.o(.text);
src/sub_080AD644.o(.text);
asm/sub_080AD670.o(.text);
asm/sub_080AD6Ac.o(.text);
asm/sub_080AD76C.o(.text);
src/sub_080AD834.o(.text);
asm/sub_080AD84C.o(.text);
asm/sub_080AD89C.o(.text);
asm/sub_080AD8F0.o(.text);
asm/code_080AD90C.o(.text);
/* library functions */
src/bitGetters.c
-3
View File
@@ -1,8 +1,5 @@
#include "global.h"
extern u8 gUnk_02033A90;
#include "global.h"
extern u8 gUnk_02033A90;
u32 sub_08052654()
src/createEntity.c
+2 -2
View File
@@ -7,7 +7,7 @@
// extern void sub_0804AEB0(Entity *, EntityData *);
// extern u32 sub_0804AF0C(Entity *, EntityData *);
// extern void sub_08016A30(Entity *);
// extern u32 gUnk_03000BF0;
// extern u32 gRoomControls;
// Entity * CreateEntity(EntityData *param_1)
// {
@@ -37,7 +37,7 @@
// entity->collisionLayer = 2;
// return entity;
// }
// if ((gUnk_03000BF0 & 2) == 0) {
// if ((gRoomControls & 2) == 0) {
// sub_08016A30(entity);
// return entity;
// }
src/createNPC.c
+22
View File
@@ -0,0 +1,22 @@
#include "global.h"
#include "entity.h"
extern Entity * GetEmptyEntity();
extern void sub_0805EA2C(Entity *, u8);
Entity * CreateNPC(u32 subtype,u32 parameter1,u32 parameter2)
{
Entity *pEVar1;
pEVar1 = GetEmptyEntity();
if (pEVar1 != NULL) {
(pEVar1->entityType).type = 7;
(pEVar1->entityType).subtype = subtype;
(pEVar1->entityType).parameter1 = parameter1;
(pEVar1->entityType).parameter2 = parameter2;
sub_0805EA2C(pEVar1,7);
}
return pEVar1;
}
src/introSetTransition.c
+29
View File
@@ -0,0 +1,29 @@
#include "global.h"
#include "menu.h"
typedef struct {
u8 unk;
u8 unk2;
u8 unk3;
u8 functionIndex;
u16 unk6;
u8 filler[5];
u32 ticks;
u16 unk7;
} TransitionStruct;
extern u32 sub_08050054(u32, u32);
extern void sub_0801D630(u32 *, u32, u32);
extern u32 gUnk_02000080;
extern TransitionStruct gUnk_03001000;
extern Menu gUnk_02032EC0;
u32 IntroSetTransition(u8 transition,u32 param_2,u32 param_3)
{
gUnk_02032EC0.transitionType = transition;
gUnk_03001000.functionIndex = 2;
sub_0801D630(&gUnk_02000080,48,param_3);
return sub_08050054(7,8);
}
src/sub_08052620.c
+8
View File
@@ -0,0 +1,8 @@
#include "global.h"
extern u8 gUnk_02033A90;
bool32 sub_08052620(u32 r0)
{
return gUnk_02033A90 == 0x81;
}
src/sub_08052638.c
+11
View File
@@ -0,0 +1,11 @@
#include "global.h"
extern u8 gUnk_08127D30[69];
u32 sub_08052638(u32 r0)
{
//u32 r1 = gUnk_08127D30;
//u32 r1 = gUnk_08127D30;
return gUnk_08127D30[r0 * 4] == 129;
}
src/sub_0807B7D8.c
+22
View File
@@ -0,0 +1,22 @@
#include "global.h"
extern void sub_08000152(u32);
extern void sub_0807B778(u32, u32);
extern void sub_0807B314(u32, u32, u32);
void sub_0807B7D8(u32 param_1,u32 param_2,u32 param_3)
{
if (param_1 == 53) {
sub_08000152(53);
sub_0807B778(param_2,param_3);
sub_0807B778(param_2 + 1,param_3);
sub_0807B778(param_2 + -1,param_3);
sub_0807B778(param_2 + 64,param_3);
sub_0807B778(param_2 + -64,param_3);
}
else {
sub_0807B314(param_1,param_2,param_3);
}
return;
}
src/sub_0807B820.c
+18
View File
@@ -0,0 +1,18 @@
#include "global.h"
extern void sub_0807B314(u32, u32, u32);
void sub_0807B820(u32 param_1)
{
sub_0807B314(620,param_1 + -65,1);
sub_0807B314(627,param_1 + -65,2);
sub_0807B314(621,param_1 + -64,1);
sub_0807B314(628,param_1 + -64,2);
sub_0807B314(622,param_1 + -63,1);
sub_0807B314(629,param_1 + -63,2);
sub_0807B314(623,param_1 + -1,1);
sub_0807B314(624,param_1,1);
sub_0807B314(626,param_1 + 1,1);
return;
}
src/sub_0807B8A8.c
+18
View File
@@ -0,0 +1,18 @@
#include "global.h"
extern void sub_0807B314(u32, u32, u32);
void sub_0807B8A8(u32 param_1)
{
sub_0807B314(636,param_1 + -65,1);
sub_0807B314(643,param_1 + -65,2);
sub_0807B314(637,param_1 + -64,1);
sub_0807B314(644,param_1 + -64,2);
sub_0807B314(638,param_1 + -63,1);
sub_0807B314(645,param_1 + -63,2);
sub_0807B314(639,param_1 + -1,1);
sub_0807B314(640,param_1,1);
sub_0807B314(642,param_1 + 1,1);
return;
}
src/sub_0807B930.c
+19
View File
@@ -0,0 +1,19 @@
#include "global.h"
extern void sub_0807B314(u32, u32, u32);
void sub_0807B930(int param_1)
{
sub_0807B314(652,param_1 + -65,1);
sub_0807B314(659,param_1 + -65,2);
sub_0807B314(653,param_1 + -64,1);
sub_0807B314(660,param_1 + -64,2);
sub_0807B314(654,param_1 + -63,1);
sub_0807B314(661,param_1 + -63,2);
sub_0807B314(655,param_1 + -1,1);
sub_0807B314(656,param_1,1);
sub_0807B314(658,param_1 + 1,1);
return;
}
src/sub_080A554C.c
+20
View File
@@ -0,0 +1,20 @@
#include "global.h"
extern u8 gUnk_02000090;
u32 sub_080A554C(u32 param_1)
{
u32 uVar1;
if (param_1 != 0) {
uVar1 = 0;
do {
if (param_1 == (&gUnk_02000090)[uVar1]) {
return uVar1;
}
uVar1 = uVar1 + 1;
} while (uVar1 < 17);
}
return 17;
}
src/sub_080AD644.c
+17
View File
@@ -0,0 +1,17 @@
#include "global.h"
extern s32 sub_080ADA14(u32, u32);
extern u16 gUnk_03001010[4];
void sub_080AD644(void)
{
gUnk_03001010[2] = 0;
gUnk_03001010[3] = 0;
gUnk_03001010[4] = 57376;
gUnk_03001010[0] = 120;
gUnk_03001010[1] = 152;
sub_080ADA14(511,1);
return;
}
src/sub_080AD834.c
+13
View File
@@ -0,0 +1,13 @@
#include "global.h"
extern void sub_08056010(u32);
extern u8 gUnk_03000FD0;
void sub_080AD834(void)
{
if (gUnk_03000FD0 == '\0') {
sub_08056010(1);
}
return;
}
src/sub_08127D30.c
+11
View File
@@ -0,0 +1,11 @@
#include "global.h"
extern u8 gUnk_08127D30[69];
u32 sub_08052654(u32 r0)
{
//u32 r1 = gUnk_08127D30;
//u32 r1 = gUnk_08127D30;
return gUnk_08127D30[r0 * 4] == 129;
}
src/textbox.c
+92
View File
@@ -0,0 +1,92 @@
#include "global.h"
#include "room.h"
#include "entity.h"
#include "textbox.h"
void TextboxNoOverlap(u32 index,Entity *ent);
void sub_0801D630();
void ShowTextbox();
void TextboxAtPosition();
extern TextBox gTextBox;
extern RoomControls gRoomControls;
extern u32 gUnk_02022780;
extern u32 gUnk_02036A40;
extern u32 gUnk_02036A38;
extern u32 gUnk_02000040;
void sub_08056360()
{
if ((gTextBox.doTextBox & 127) != 0) {
gTextBox.doTextBox = 136;
}
return;
}
void TextboxTryNoOverlap(u32 index)
{
if (gRoomControls.cameraTarget != NULL) {
TextboxNoOverlap(index, gRoomControls.cameraTarget);
}
else {
ShowTextbox(index);
}
return;
}
void TextboxNoOverlap(u32 index,Entity *ent)
{
s16 y;
s16 h;
ShowTextbox(index);
y = *(&ent->y.HI + 1);
h = *(&ent->height.HI + 1);
if (88 < ((y + h) - gRoomControls.roomScrollY)) {
gTextBox.textWindowPosY = 1;
}
return;
}
void sub_080563C8(u32 param_1,u32 param_2)
{
TextboxAtPosition(param_1,1,param_2);
return;
}
void TextboxAtPosition(u32 index,u32 x,u32 y)
{
ShowTextbox(index);
gTextBox.textWindowPosX = x;
gTextBox.textWindowPosY = y;
return;
}
void ShowTextbox(u32 index,u32 param_2,u32 *dest)
{
sub_0801D630(&gTextBox, 32, dest);
gTextBox.textIndex = index;
gTextBox.textSpeed = 99;
gTextBox.textWindowWidth = 26;
gTextBox.textWindowHeight = 4;
gTextBox.textWindowPosX = 1;
gTextBox.textWindowPosY = 12;
gTextBox.doTextBox = 1;
return;
}
void sub_08056418()
{
sub_0801D630(&gTextBox,32);
sub_0801D630(&gUnk_02022780,168);
sub_0801D630(&gUnk_02036A40,8);
sub_0801D630(&gUnk_02036A38,8);
sub_0801D630(&gUnk_02000040,4);
return;
}