mirror of https://github.com/zeldaret/tmc.git
eliminate known raw pointers
This commit is contained in:
jiangzhengwenjz
parent
43225434d7
commit
a73e0f69d9
52
asm/code.s
52
asm/code.s
|
|
@ -13924,7 +13924,7 @@ sub_0801EE18: @ 0x0801EE18
|
|||
beq _0801EE9E
|
||||
cmp r4, #2
|
||||
beq _0801EE40
|
||||
ldr r0, _0801EE3C @ =0x080012C8
|
||||
ldr r0, _0801EE3C @ =gUnk_080012C8
|
||||
lsls r1, r4, #2
|
||||
adds r1, r1, r0
|
||||
ldr r1, [r1]
|
||||
|
|
@ -13932,7 +13932,7 @@ sub_0801EE18: @ 0x0801EE18
|
|||
bl _call_via_r1
|
||||
b _0801EEE0
|
||||
.align 2, 0
|
||||
_0801EE3C: .4byte 0x080012C8
|
||||
_0801EE3C: .4byte gUnk_080012C8
|
||||
_0801EE40:
|
||||
adds r2, r5, #0
|
||||
adds r2, #0x3a
|
||||
|
|
@ -24323,7 +24323,7 @@ _08023BAC:
|
|||
adds r1, r0, #0
|
||||
cmp r1, #0
|
||||
beq _08023BD8
|
||||
ldr r0, _08023BD4 @ =0x080012C8
|
||||
ldr r0, _08023BD4 @ =gUnk_080012C8
|
||||
lsls r1, r1, #2
|
||||
adds r1, r1, r0
|
||||
ldr r1, [r1]
|
||||
|
|
@ -24331,7 +24331,7 @@ _08023BAC:
|
|||
bl _call_via_r1
|
||||
b _08023C06
|
||||
.align 2, 0
|
||||
_08023BD4: .4byte 0x080012C8
|
||||
_08023BD4: .4byte gUnk_080012C8
|
||||
_08023BD8:
|
||||
ldr r4, _08023BFC @ =gUnk_080CBDD4
|
||||
adds r0, r5, #0
|
||||
|
|
@ -38653,7 +38653,7 @@ sub_0802A804: @ 0x0802A804
|
|||
adds r1, r0, #0
|
||||
cmp r1, #0
|
||||
beq _0802A830
|
||||
ldr r0, _0802A82C @ =0x080012C8
|
||||
ldr r0, _0802A82C @ =gUnk_080012C8
|
||||
lsls r1, r1, #2
|
||||
adds r1, r1, r0
|
||||
ldr r1, [r1]
|
||||
|
|
@ -38661,7 +38661,7 @@ sub_0802A804: @ 0x0802A804
|
|||
bl _call_via_r1
|
||||
b _0802A844
|
||||
.align 2, 0
|
||||
_0802A82C: .4byte 0x080012C8
|
||||
_0802A82C: .4byte gUnk_080012C8
|
||||
_0802A830:
|
||||
ldr r4, _0802A848 @ =gUnk_080CD0F0
|
||||
adds r0, r5, #0
|
||||
|
|
@ -40434,7 +40434,7 @@ sub_0802B4D8: @ 0x0802B4D8
|
|||
adds r1, r0, #0
|
||||
cmp r1, #0
|
||||
beq _0802B4FC
|
||||
ldr r0, _0802B4F8 @ =0x080012C8
|
||||
ldr r0, _0802B4F8 @ =gUnk_080012C8
|
||||
lsls r1, r1, #2
|
||||
adds r1, r1, r0
|
||||
ldr r1, [r1]
|
||||
|
|
@ -40442,7 +40442,7 @@ sub_0802B4D8: @ 0x0802B4D8
|
|||
bl _call_via_r1
|
||||
b _0802B510
|
||||
.align 2, 0
|
||||
_0802B4F8: .4byte 0x080012C8
|
||||
_0802B4F8: .4byte gUnk_080012C8
|
||||
_0802B4FC:
|
||||
ldr r4, _0802B514 @ =gUnk_080CD27C
|
||||
adds r0, r5, #0
|
||||
|
|
@ -53701,7 +53701,7 @@ sub_08031864: @ 0x08031864
|
|||
adds r0, r5, #0
|
||||
bl sub_08032338
|
||||
_08031886:
|
||||
ldr r0, _08031898 @ =0x080012C8
|
||||
ldr r0, _08031898 @ =gUnk_080012C8
|
||||
lsls r1, r4, #2
|
||||
adds r1, r1, r0
|
||||
ldr r1, [r1]
|
||||
|
|
@ -53709,7 +53709,7 @@ _08031886:
|
|||
bl _call_via_r1
|
||||
b _080318BE
|
||||
.align 2, 0
|
||||
_08031898: .4byte 0x080012C8
|
||||
_08031898: .4byte gUnk_080012C8
|
||||
_0803189C:
|
||||
ldr r4, _080318C0 @ =gUnk_080CE56C
|
||||
adds r0, r5, #0
|
||||
|
|
@ -65448,7 +65448,7 @@ sub_0803704C: @ 0x0803704C
|
|||
adds r1, r0, #0
|
||||
cmp r1, #0
|
||||
beq _08037070
|
||||
ldr r0, _0803706C @ =0x080012C8
|
||||
ldr r0, _0803706C @ =gUnk_080012C8
|
||||
lsls r1, r1, #2
|
||||
adds r1, r1, r0
|
||||
ldr r1, [r1]
|
||||
|
|
@ -65456,7 +65456,7 @@ sub_0803704C: @ 0x0803704C
|
|||
bl _call_via_r1
|
||||
b _08037084
|
||||
.align 2, 0
|
||||
_0803706C: .4byte 0x080012C8
|
||||
_0803706C: .4byte gUnk_080012C8
|
||||
_08037070:
|
||||
ldr r4, _08037088 @ =gUnk_080CF244
|
||||
adds r0, r5, #0
|
||||
|
|
@ -67032,7 +67032,7 @@ sub_08037C3C: @ 0x08037C3C
|
|||
bl sub_080012DC
|
||||
cmp r0, #0
|
||||
beq _08037C5C
|
||||
ldr r0, _08037C58 @ =0x080012C8
|
||||
ldr r0, _08037C58 @ =gUnk_080012C8
|
||||
lsls r1, r4, #2
|
||||
adds r1, r1, r0
|
||||
ldr r1, [r1]
|
||||
|
|
@ -67040,7 +67040,7 @@ sub_08037C3C: @ 0x08037C3C
|
|||
bl _call_via_r1
|
||||
b _08037C7E
|
||||
.align 2, 0
|
||||
_08037C58: .4byte 0x080012C8
|
||||
_08037C58: .4byte gUnk_080012C8
|
||||
_08037C5C:
|
||||
ldr r4, _08037C80 @ =gUnk_080CF46C
|
||||
adds r0, r5, #0
|
||||
|
|
@ -67745,7 +67745,7 @@ sub_080381AC: @ 0x080381AC
|
|||
adds r1, r0, #0
|
||||
cmp r1, #0
|
||||
beq _080381D0
|
||||
ldr r0, _080381CC @ =0x080012C8
|
||||
ldr r0, _080381CC @ =gUnk_080012C8
|
||||
lsls r1, r1, #2
|
||||
adds r1, r1, r0
|
||||
ldr r1, [r1]
|
||||
|
|
@ -67753,7 +67753,7 @@ sub_080381AC: @ 0x080381AC
|
|||
bl _call_via_r1
|
||||
b _080381F2
|
||||
.align 2, 0
|
||||
_080381CC: .4byte 0x080012C8
|
||||
_080381CC: .4byte gUnk_080012C8
|
||||
_080381D0:
|
||||
ldr r4, _080381F4 @ =gUnk_080CF4C8
|
||||
adds r0, r5, #0
|
||||
|
|
@ -69198,7 +69198,7 @@ sub_08038CA4: @ 0x08038CA4
|
|||
adds r1, r0, #0
|
||||
cmp r1, #0
|
||||
beq _08038CC8
|
||||
ldr r0, _08038CC4 @ =0x080012C8
|
||||
ldr r0, _08038CC4 @ =gUnk_080012C8
|
||||
lsls r1, r1, #2
|
||||
adds r1, r1, r0
|
||||
ldr r1, [r1]
|
||||
|
|
@ -69206,7 +69206,7 @@ sub_08038CA4: @ 0x08038CA4
|
|||
bl _call_via_r1
|
||||
b _08038CF0
|
||||
.align 2, 0
|
||||
_08038CC4: .4byte 0x080012C8
|
||||
_08038CC4: .4byte gUnk_080012C8
|
||||
_08038CC8:
|
||||
ldr r4, _08038CF4 @ =gUnk_080CF778
|
||||
adds r0, r5, #0
|
||||
|
|
@ -71175,7 +71175,7 @@ sub_08039BA0: @ 0x08039BA0
|
|||
adds r1, r0, #0
|
||||
cmp r1, #0
|
||||
beq _08039BC4
|
||||
ldr r0, _08039BC0 @ =0x080012C8
|
||||
ldr r0, _08039BC0 @ =gUnk_080012C8
|
||||
lsls r1, r1, #2
|
||||
adds r1, r1, r0
|
||||
ldr r1, [r1]
|
||||
|
|
@ -71183,7 +71183,7 @@ sub_08039BA0: @ 0x08039BA0
|
|||
bl _call_via_r1
|
||||
b _08039BD8
|
||||
.align 2, 0
|
||||
_08039BC0: .4byte 0x080012C8
|
||||
_08039BC0: .4byte gUnk_080012C8
|
||||
_08039BC4:
|
||||
ldr r4, _08039BDC @ =gUnk_080CFB84
|
||||
adds r0, r5, #0
|
||||
|
|
@ -133060,7 +133060,7 @@ sub_08055F70: @ 0x08055F70
|
|||
adds r1, r2, #0
|
||||
bl sub_0801D630
|
||||
ldr r0, _08055FDC @ =gUnk_080B2CD8
|
||||
ldr r3, _08055FE0 @ =0x080B197C
|
||||
ldr r3, _08055FE0 @ =sub_080B197C
|
||||
subs r2, r0, r3
|
||||
cmp r2, #0
|
||||
beq _08055FAA
|
||||
|
|
@ -133088,7 +133088,7 @@ _08055FD0: .4byte 0x00004014
|
|||
_08055FD4: .4byte 0x0003FFD0
|
||||
_08055FD8: .4byte gUnk_02000030
|
||||
_08055FDC: .4byte gUnk_080B2CD8
|
||||
_08055FE0: .4byte 0x080B197C
|
||||
_08055FE0: .4byte sub_080B197C
|
||||
_08055FE4: .4byte gUnk_030056F0
|
||||
_08055FE8: .4byte gUnk_080B2CD8
|
||||
_08055FEC: .4byte gUnk_080B2CD8
|
||||
|
|
@ -202108,7 +202108,7 @@ _08076ABC:
|
|||
_08076AC2:
|
||||
strh r0, [r1, #0x24]
|
||||
adds r5, r1, #0
|
||||
ldr r1, _08076B04 @ =0x0800275C
|
||||
ldr r1, _08076B04 @ =gUnk_0800275C
|
||||
ldrb r2, [r5, #0x14]
|
||||
movs r6, #0xe
|
||||
adds r0, r6, #0
|
||||
|
|
@ -202139,7 +202139,7 @@ _08076AC2:
|
|||
b _08076B72
|
||||
.align 2, 0
|
||||
_08076B00: .4byte gUnk_03001160
|
||||
_08076B04: .4byte 0x0800275C
|
||||
_08076B04: .4byte gUnk_0800275C
|
||||
_08076B08:
|
||||
movs r0, #1
|
||||
strb r0, [r4, #8]
|
||||
|
|
@ -223685,7 +223685,7 @@ sub_08080BC4: @ 0x08080BC4
|
|||
movs r1, #0xe
|
||||
ands r2, r1
|
||||
adds r0, r0, r2
|
||||
ldr r1, _08080C44 @ =0x080169A4
|
||||
ldr r1, _08080C44 @ =gUnk_080169A4
|
||||
adds r2, r0, r1
|
||||
ldr r4, _08080C48 @ =gUnk_02025EB0
|
||||
ldr r1, [r4]
|
||||
|
|
@ -223725,7 +223725,7 @@ _08080C30:
|
|||
b _08080C76
|
||||
.align 2, 0
|
||||
_08080C40: .4byte gUnk_03000BF0
|
||||
_08080C44: .4byte 0x080169A4
|
||||
_08080C44: .4byte gUnk_080169A4
|
||||
_08080C48: .4byte gUnk_02025EB0
|
||||
_08080C4C: .4byte gUnk_0200B650
|
||||
_08080C50:
|
||||
|
|
|
|||
|
|
@ -33,14 +33,14 @@ _08000136:
|
|||
pop {r4, pc}
|
||||
_08000138:
|
||||
_08000138: .4byte gUnk_030056F1
|
||||
_0800013C: .4byte 0x0807D281
|
||||
_08000140: .4byte 0x0807D46D
|
||||
_08000144: .4byte 0x0807D6D9
|
||||
_0800013C: .4byte sub_0807D280
|
||||
_08000140: .4byte sub_0807D46C
|
||||
_08000144: .4byte sub_0807D6D8
|
||||
|
||||
thumb_func_start sub_08000148
|
||||
sub_08000148: @ 0x08000148
|
||||
lsls r2, r2, #2
|
||||
ldr r3, _08000204 @ =0x08000248
|
||||
ldr r3, _08000204 @ =gUnk_08000248
|
||||
ldr r2, [r3, r2]
|
||||
strb r0, [r2, r1]
|
||||
bx lr
|
||||
|
|
@ -58,7 +58,7 @@ sub_08000152: @ 0x08000152
|
|||
sub_0800015E: @ 0x0800015E
|
||||
push {r4, r5, r6, r7, lr}
|
||||
lsls r3, r2, #3
|
||||
ldr r4, _08000208 @ =0x08000228
|
||||
ldr r4, _08000208 @ =gUnk_08000228
|
||||
ldr r5, [r4, r3]
|
||||
lsls r6, r1, #1
|
||||
ldrh r7, [r5, r6]
|
||||
|
|
@ -107,7 +107,7 @@ _080001CC: .4byte gUnk_0202BEB4
|
|||
thumb_func_start sub_080001D0
|
||||
sub_080001D0: @ 0x080001D0
|
||||
lsls r2, r2, #2
|
||||
ldr r3, _08000220 @ =0x08000278
|
||||
ldr r3, _08000220 @ =gUnk_08000278
|
||||
ldr r3, [r3, r2]
|
||||
strb r0, [r3, r1]
|
||||
bx lr
|
||||
|
|
@ -115,7 +115,7 @@ sub_080001D0: @ 0x080001D0
|
|||
non_word_aligned_thumb_func_start sub_080001DA
|
||||
sub_080001DA: @ 0x080001DA
|
||||
lsls r1, r1, #3
|
||||
ldr r2, _08000224 @ =0x08000228
|
||||
ldr r2, _08000224 @ =gUnk_08000228
|
||||
ldr r1, [r2, r1]
|
||||
lsls r0, r0, #1
|
||||
ldrh r0, [r1, r0]
|
||||
|
|
@ -128,39 +128,44 @@ _080001F4: .4byte gUnk_02021F70
|
|||
_080001F8: .4byte gUnk_0200B650
|
||||
_080001FC: .4byte gUnk_02002F00
|
||||
_08000200: .4byte gUnk_020344F0
|
||||
_08000204: .4byte 0x08000248
|
||||
_08000208: .4byte 0x08000228
|
||||
_08000204: .4byte gUnk_08000248
|
||||
_08000208: .4byte gUnk_08000228
|
||||
_0800020C: .4byte 0x00004000
|
||||
_08000210: .4byte gUnk_080B7910
|
||||
_08000214: .4byte gUnk_080B79A7
|
||||
_08000218: .4byte gUnk_080B37A0
|
||||
_0800021C: .4byte gUnk_080B3E80
|
||||
_08000220: .4byte 0x08000278
|
||||
_08000224: .4byte 0x08000228
|
||||
_08000228: .4byte gUnk_02025EB4
|
||||
_0800022C: .4byte gUnk_0202AEB4
|
||||
_08000230: .4byte gUnk_02025EB4
|
||||
_08000234: .4byte gUnk_0202AEB4
|
||||
_08000238: .4byte gUnk_0200B654
|
||||
_0800023C: .4byte gUnk_02010654
|
||||
_08000240: .4byte gUnk_02025EB4
|
||||
_08000244: .4byte gUnk_0202AEB4
|
||||
_08000248: .4byte gUnk_02027EB4
|
||||
_0800024C: .4byte gUnk_02027EB4
|
||||
_08000250: .4byte gUnk_0200D654
|
||||
_08000254: .4byte gUnk_02027EB4
|
||||
_08000258: .4byte gUnk_02028EB4
|
||||
_0800025C: .4byte gUnk_0202AEB4
|
||||
_08000260: .4byte gUnk_02028EB4
|
||||
_08000264: .4byte gUnk_0202AEB4
|
||||
_08000268: .4byte gUnk_0200E654
|
||||
_0800026C: .4byte gUnk_02010654
|
||||
_08000270: .4byte gUnk_02028EB4
|
||||
_08000274: .4byte gUnk_0202AEB4
|
||||
_08000278: .4byte gUnk_02030EB4
|
||||
_0800027C: .4byte gUnk_02030EB4
|
||||
_08000280: .4byte gUnk_02016654
|
||||
_08000284: .4byte gUnk_02030EB4
|
||||
_08000220: .4byte gUnk_08000278
|
||||
_08000224: .4byte gUnk_08000228
|
||||
gUnk_08000228::
|
||||
.4byte gUnk_02025EB4
|
||||
gUnk_0800022C::
|
||||
.4byte gUnk_0202AEB4
|
||||
.4byte gUnk_02025EB4
|
||||
.4byte gUnk_0202AEB4
|
||||
.4byte gUnk_0200B654
|
||||
.4byte gUnk_02010654
|
||||
.4byte gUnk_02025EB4
|
||||
.4byte gUnk_0202AEB4
|
||||
gUnk_08000248::
|
||||
.4byte gUnk_02027EB4
|
||||
.4byte gUnk_02027EB4
|
||||
.4byte gUnk_0200D654
|
||||
.4byte gUnk_02027EB4
|
||||
gUnk_08000258::
|
||||
.4byte gUnk_02028EB4
|
||||
.4byte gUnk_0202AEB4
|
||||
.4byte gUnk_02028EB4
|
||||
.4byte gUnk_0202AEB4
|
||||
.4byte gUnk_0200E654
|
||||
.4byte gUnk_02010654
|
||||
.4byte gUnk_02028EB4
|
||||
.4byte gUnk_0202AEB4
|
||||
gUnk_08000278::
|
||||
.4byte gUnk_02030EB4
|
||||
.4byte gUnk_02030EB4
|
||||
.4byte gUnk_02016654
|
||||
.4byte gUnk_02030EB4
|
||||
|
||||
thumb_func_start sub_08000288
|
||||
sub_08000288: @ 0x08000288
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ _0800128C:
|
|||
sub_08001290: @ 0x08001290
|
||||
cmp r1, #0
|
||||
beq _0800129C
|
||||
ldr r2, _08001368 @ =0x080012C8
|
||||
ldr r2, _08001368 @ =gUnk_080012C8
|
||||
lsls r1, r1, #2
|
||||
ldr r1, [r2, r1]
|
||||
bx r1
|
||||
|
|
@ -135,7 +135,7 @@ sub_0800129E: @ 0x0800129E
|
|||
bl sub_080012DC
|
||||
cmp r0, #0
|
||||
beq _080012B2
|
||||
ldr r1, _0800136C @ =0x080012C8
|
||||
ldr r1, _0800136C @ =gUnk_080012C8
|
||||
b _080012BA
|
||||
_080012B2:
|
||||
adds r0, r4, #0
|
||||
|
|
@ -149,11 +149,13 @@ _080012BA:
|
|||
mov lr, r3
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_080012C8: .4byte 0x00000000
|
||||
_080012CC: .4byte 0x08001215
|
||||
_080012D0: .4byte 0x080043A9
|
||||
_080012D4: .4byte 0x080043AD
|
||||
_080012D8: .4byte 0x080043B1
|
||||
|
||||
gUnk_080012C8::
|
||||
.4byte 0x00000000
|
||||
_080012CC: .4byte sub_08001214
|
||||
_080012D0: .4byte sub_080043A8
|
||||
_080012D4: .4byte sub_080043AC
|
||||
_080012D8: .4byte sub_080043B0
|
||||
|
||||
thumb_func_start sub_080012DC
|
||||
sub_080012DC: @ 0x080012DC
|
||||
|
|
@ -236,11 +238,11 @@ _08001352:
|
|||
bx lr
|
||||
.align 2, 0
|
||||
_08001358: .4byte gUnk_080D3BF8
|
||||
_0800135C: .4byte 0x08004277
|
||||
_08001360: .4byte 0x080043B5
|
||||
_0800135C: .4byte sub_08004276
|
||||
_08001360: .4byte sub_080043B4
|
||||
_08001364: .4byte 0x00001800
|
||||
_08001368: .4byte 0x080012C8
|
||||
_0800136C: .4byte 0x080012C8
|
||||
_08001368: .4byte gUnk_080012C8
|
||||
_0800136C: .4byte gUnk_080012C8
|
||||
_08001370: .4byte sub_080AF18C
|
||||
_08001374: .4byte sub_080AF1BC
|
||||
_08001378: .4byte sub_080045C4
|
||||
|
|
@ -1043,14 +1045,15 @@ _0800268C:
|
|||
.byte 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00
|
||||
_0800269C: .4byte gUnk_0800232E
|
||||
_080026A0: .4byte gUnk_08002342
|
||||
_080026A4: .4byte gUnk_020000B0
|
||||
_080026A8: .4byte gUnk_03003D68
|
||||
_080026AC: .4byte gUnk_03003DB0
|
||||
_080026B0: .4byte gUnk_03005FBC
|
||||
_080026B4: .4byte gUnk_020000B0
|
||||
_080026B8: .4byte gUnk_03003DA8
|
||||
_080026BC: .4byte gUnk_03003DB8
|
||||
_080026C0: .4byte gUnk_03005FBC
|
||||
gUnk_080026A4::
|
||||
.4byte gUnk_020000B0
|
||||
.4byte gUnk_03003D68
|
||||
.4byte gUnk_03003DB0
|
||||
.4byte gUnk_03005FBC
|
||||
.4byte gUnk_020000B0
|
||||
.4byte gUnk_03003DA8
|
||||
.4byte gUnk_03003DB8
|
||||
.4byte gUnk_03005FBC
|
||||
|
||||
thumb_func_start sub_080026C4
|
||||
sub_080026C4: @ 0x080026C4
|
||||
|
|
@ -1142,7 +1145,8 @@ _0800272A:
|
|||
subs r2, #1
|
||||
bne _0800272A
|
||||
pop {r4, r5, pc}
|
||||
_0800275C:
|
||||
|
||||
gUnk_0800275C::
|
||||
.byte 0x06, 0x00, 0x06, 0x60
|
||||
.byte 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x00, 0x60, 0x60, 0x60
|
||||
.byte 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x06
|
||||
|
|
@ -1220,7 +1224,7 @@ sub_080027EA: @ 0x080027EA
|
|||
adds r2, r4, #0
|
||||
ldr r1, _0800296C @ =0x00000100
|
||||
_08002812:
|
||||
ldr r4, _08002970 @ =0x0800275C
|
||||
ldr r4, _08002970 @ =gUnk_0800275C
|
||||
lsls r2, r2, #1
|
||||
ldrh r4, [r4, r2]
|
||||
lsls r2, r2, #3
|
||||
|
|
@ -1424,7 +1428,7 @@ _08002968:
|
|||
pop {r4, r5, r6, r7, pc}
|
||||
.align 2, 0
|
||||
_0800296C: .4byte 0x00000100
|
||||
_08002970: .4byte 0x0800275C
|
||||
_08002970: .4byte gUnk_0800275C
|
||||
_08002974: .4byte 0x0000EE00
|
||||
_08002978: .4byte gUnk_080C9160
|
||||
_0800297C: .4byte gUnk_080C91E0
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@ _080040F2:
|
|||
movs r3, #0x38
|
||||
ldrb r3, [r0, r3]
|
||||
lsls r3, r3, #2
|
||||
ldr r4, _08004380 @ =0x08000248
|
||||
ldr r4, _08004380 @ =gUnk_08000248
|
||||
ldr r3, [r4, r3]
|
||||
ldrb r4, [r3, r2]
|
||||
pop {r2, r3}
|
||||
|
|
@ -399,7 +399,7 @@ _0800423C:
|
|||
movs r4, #0x38
|
||||
ldrb r4, [r0, r4]
|
||||
lsls r4, r4, #3
|
||||
ldr r3, _08004394 @ =0x08000228
|
||||
ldr r3, _08004394 @ =gUnk_08000228
|
||||
adds r3, r3, r4
|
||||
ldr r4, [r3]
|
||||
ldrh r1, [r4, r2]
|
||||
|
|
@ -573,12 +573,12 @@ _08004370: .4byte 0x0000011E
|
|||
_08004374: .4byte gUnk_03000BF6
|
||||
_08004378: .4byte gUnk_03000BF8
|
||||
_0800437C: .4byte 0x000003F0
|
||||
_08004380: .4byte 0x08000248
|
||||
_08004380: .4byte gUnk_08000248
|
||||
_08004384: .4byte 0x000FFFFF
|
||||
_08004388: .4byte 0x00080000
|
||||
_0800438C: .4byte 0x0000EE00
|
||||
_08004390: .4byte 0x00001FFF
|
||||
_08004394: .4byte 0x08000228
|
||||
_08004394: .4byte gUnk_08000228
|
||||
_08004398: .4byte 0x00004000
|
||||
_0800439C: .4byte gUnk_080029B4
|
||||
_080043A0: .4byte gUnk_080029B4
|
||||
|
|
@ -675,10 +675,10 @@ sub_0800442E: @ 0x0800442E
|
|||
_08004448:
|
||||
movs r0, #0
|
||||
pop {r1, pc}
|
||||
_0800444C: .4byte 0x080043B5
|
||||
_08004450: .4byte 0x080043A9
|
||||
_08004454: .4byte 0x080043AD
|
||||
_08004458: .4byte 0x080043B1
|
||||
_0800444C: .4byte sub_080043B4
|
||||
_08004450: .4byte sub_080043A8
|
||||
_08004454: .4byte sub_080043AC
|
||||
_08004458: .4byte sub_080043B0
|
||||
|
||||
thumb_func_start sub_0800445C
|
||||
sub_0800445C: @ 0x0800445C
|
||||
|
|
@ -977,12 +977,14 @@ _08004644:
|
|||
_0800464A:
|
||||
subs r0, r0, r2
|
||||
pop {pc}
|
||||
_0800464E:
|
||||
|
||||
gUnk_0800464E::
|
||||
.byte 0x00, 0x01
|
||||
.byte 0x02, 0x03, 0x04, 0x00, 0x00, 0x00, 0x08, 0x07, 0x06, 0x05, 0x04, 0x00, 0x00, 0x00, 0x10, 0x0F
|
||||
.byte 0x0E, 0x0D, 0x0C, 0x00, 0x00, 0x00, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x1F
|
||||
.byte 0x1E, 0x1D, 0x1C, 0x00, 0x00, 0x00, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x00, 0x00, 0x00, 0x10, 0x11
|
||||
.byte 0x12, 0x13, 0x14, 0x00, 0x00, 0x00, 0x18, 0x17, 0x16, 0x15, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
|
||||
_08004690: .4byte gUnk_030060F0
|
||||
_08004694: .4byte gUnk_030060F0
|
||||
_08004698: .4byte gUnk_080C93E0
|
||||
|
|
|
|||
|
|
@ -203,7 +203,7 @@ sub_080086D8: @ 0x080086D8
|
|||
movs r3, #0x38
|
||||
ldrb r3, [r2, r3]
|
||||
lsls r3, r3, #2
|
||||
ldr r1, _080088C4 @ =0x08000248
|
||||
ldr r1, _080088C4 @ =gUnk_08000248
|
||||
ldr r1, [r1, r3]
|
||||
ldrb r2, [r0, r1]
|
||||
push {r2}
|
||||
|
|
@ -443,7 +443,7 @@ _080088B4: .4byte gUnk_03000BF6
|
|||
_080088B8: .4byte gUnk_03000BF8
|
||||
_080088BC: .4byte gUnk_03001160
|
||||
_080088C0: .4byte 0x000003F0
|
||||
_080088C4: .4byte 0x08000248
|
||||
_080088C4: .4byte gUnk_08000248
|
||||
_080088C8: .4byte gUnk_03003F80
|
||||
_080088CC: .4byte gUnk_0800823C
|
||||
_080088D0: .4byte gUnk_08007DF4
|
||||
|
|
@ -455,8 +455,12 @@ _080088E4: .4byte 0x00004000
|
|||
_080088E8: .4byte 0x0000FFFF
|
||||
_080088EC:
|
||||
.byte 0x00, 0xFD, 0x03, 0xFD
|
||||
.byte 0x03, 0x00, 0x03, 0x03, 0x00, 0x03, 0xFD, 0x03, 0xFD, 0x00, 0xFD, 0xFD, 0x00, 0xF6, 0x0A, 0xF6
|
||||
.byte 0x0A, 0x00, 0x0A, 0x0A, 0x00, 0x0A, 0xF6, 0x0A, 0xF6, 0x00, 0xF6, 0xF6, 0x00, 0x06, 0xFA, 0x00
|
||||
.byte 0x03, 0x00, 0x03, 0x03, 0x00, 0x03, 0xFD, 0x03, 0xFD, 0x00, 0xFD, 0xFD
|
||||
_080088FC:
|
||||
.byte 0x00, 0xF6, 0x0A, 0xF6
|
||||
.byte 0x0A, 0x00, 0x0A, 0x0A, 0x00, 0x0A, 0xF6, 0x0A, 0xF6, 0x00, 0xF6, 0xF6
|
||||
_0800890C:
|
||||
.byte 0x00, 0x06, 0xFA, 0x00
|
||||
.byte 0x00, 0xFA, 0x06, 0x00, 0x13, 0x12, 0x12, 0x10, 0x10, 0x11, 0x11, 0x13
|
||||
_0800891C:
|
||||
push {r0}
|
||||
|
|
@ -511,7 +515,7 @@ _08008960:
|
|||
beq _0800891C
|
||||
cmp r3, #1
|
||||
beq _0800891C
|
||||
ldr r4, _08008A74 @ =0x080088FC
|
||||
ldr r4, _08008A74 @ =_080088FC
|
||||
ldrb r3, [r1, #2]
|
||||
adds r1, r2, #0
|
||||
orrs r3, r3
|
||||
|
|
@ -527,7 +531,7 @@ _08008960:
|
|||
adds r2, #2
|
||||
movs r4, #7
|
||||
ands r2, r4
|
||||
ldr r4, _08008A78 @ =0x080088EC
|
||||
ldr r4, _08008A78 @ =_080088EC
|
||||
cmp r2, #4
|
||||
beq _08008992
|
||||
bhs _080089A8
|
||||
|
|
@ -547,7 +551,7 @@ _080089A8:
|
|||
ldrb r3, [r0, r3]
|
||||
lsrs r3, r3, #1
|
||||
lsls r3, r3, #1
|
||||
ldr r4, _08008A7C @ =0x0800890C
|
||||
ldr r4, _08008A7C @ =_0800890C
|
||||
adds r4, r4, r3
|
||||
movs r3, #0
|
||||
ldrsb r2, [r4, r3]
|
||||
|
|
@ -650,9 +654,9 @@ _08008A60:
|
|||
_08008A68: .4byte gUnk_03003F80
|
||||
_08008A6C: .4byte gUnk_03003F80
|
||||
_08008A70: .4byte gUnk_03003F80
|
||||
_08008A74: .4byte 0x080088FC
|
||||
_08008A78: .4byte 0x080088EC
|
||||
_08008A7C: .4byte 0x0800890C
|
||||
_08008A74: .4byte _080088FC
|
||||
_08008A78: .4byte _080088EC
|
||||
_08008A7C: .4byte _0800890C
|
||||
_08008A80: .4byte gUnk_03003F80
|
||||
_08008A84: .4byte gUnk_03003F80
|
||||
|
||||
|
|
@ -4016,7 +4020,8 @@ sub_08016998: @ 0x08016998
|
|||
orrs r0, r1
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_080169A4:
|
||||
|
||||
gUnk_080169A4::
|
||||
.byte 0x01, 0xFF, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0x01, 0x00
|
||||
.byte 0xFF, 0x01, 0x00, 0x00, 0x02, 0xFF, 0x01, 0xFE, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0x01, 0xFF, 0x02
|
||||
.byte 0x00, 0x00, 0x01, 0x01, 0x02, 0xFF, 0x02, 0xFE, 0xFE, 0x02, 0xFF, 0x03, 0xFD, 0xFF, 0xFE, 0x01
|
||||
|
|
|
|||
65
asm/intr.s
65
asm/intr.s
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_080B197C
|
||||
sub_080B197C: @ 0x080B197C
|
||||
.code 16
|
||||
sub_080B197C:: @ 0x080B197C
|
||||
push {r4, r5, r6}
|
||||
ldr r2, _080B19C0 @ =gUnk_03000BF0
|
||||
ldrh r3, [r2, #0xa]
|
||||
|
|
@ -65,7 +65,7 @@ sub_080B19CC: @ 0x080B19CC
|
|||
lsr r1, r1, #0x1a
|
||||
add r0, r0, r1, lsl #6
|
||||
mov r1, r2
|
||||
ldr r2, _080B1C14 @ =0x08000258
|
||||
ldr r2, _080B1C14 @ =gUnk_08000258
|
||||
b _080B1A64
|
||||
|
||||
arm_func_start sub_080B1A0C
|
||||
|
|
@ -96,7 +96,7 @@ _080B1A34:
|
|||
|
||||
arm_func_start sub_080B1A60
|
||||
sub_080B1A60: @ 0x080B1A60
|
||||
ldr r2, _080B1C1C @ =0x08000228
|
||||
ldr r2, _080B1C1C @ =gUnk_08000228
|
||||
_080B1A64:
|
||||
add r2, r2, r1, lsl #3
|
||||
ldr r1, [r2]
|
||||
|
|
@ -134,7 +134,7 @@ _080B1AB4:
|
|||
lsr r1, r1, #0x1a
|
||||
add r0, r0, r1, lsl #6
|
||||
mov r1, r2
|
||||
ldr r2, _080B1C24 @ =0x08000278
|
||||
ldr r2, _080B1C24 @ =gUnk_08000278
|
||||
ldr r2, [r2, r1, lsl #2]
|
||||
ldrb r0, [r2, r0]
|
||||
bx lr
|
||||
|
|
@ -164,7 +164,7 @@ _080B1B18:
|
|||
lsr r1, r1, #0x1a
|
||||
add r0, r0, r1, lsl #6
|
||||
mov r1, r2
|
||||
ldr r2, _080B1C2C @ =0x08000248
|
||||
ldr r2, _080B1C2C @ =gUnk_08000248
|
||||
ldr r1, [r2, r1, lsl #2]
|
||||
ldrb r0, [r1, r0]
|
||||
bx lr
|
||||
|
|
@ -181,7 +181,7 @@ sub_080B1B54: @ 0x080B1B54
|
|||
sub_080B1B68: @ 0x080B1B68
|
||||
lsrs r2, r0, #0xe
|
||||
bxne lr
|
||||
ldr r2, _080B1C38 @ =0x0800022C
|
||||
ldr r2, _080B1C38 @ =gUnk_0800022C
|
||||
ldr r1, [r2, r1, lsl #3]
|
||||
lsl r0, r0, #1
|
||||
ldrh r0, [r1, r0]
|
||||
|
|
@ -225,29 +225,29 @@ sub_080B1BCC: @ 0x080B1BCC
|
|||
and r1, r1, #0x3f0
|
||||
and r2, r2, #0x3f0
|
||||
add r1, r1, r2, lsl #6
|
||||
ldr r2, _080B1C50 @ =0x08000278
|
||||
ldr r2, _080B1C50 @ =gUnk_08000278
|
||||
ldrb r3, [r0, #0x38]
|
||||
ldr r2, [r2, r3, lsl #2]
|
||||
ldrb r0, [r2, r1, lsr #4]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_080B1C10: .4byte gUnk_03000BF0
|
||||
_080B1C14: .4byte 0x08000258
|
||||
_080B1C14: .4byte gUnk_08000258
|
||||
_080B1C18: .4byte gUnk_03000BF0
|
||||
_080B1C1C: .4byte 0x08000228
|
||||
_080B1C1C: .4byte gUnk_08000228
|
||||
_080B1C20: .4byte gUnk_03000BF0
|
||||
_080B1C24: .4byte 0x08000278
|
||||
_080B1C24: .4byte gUnk_08000278
|
||||
_080B1C28: .4byte gUnk_03000BF0
|
||||
_080B1C2C: .4byte 0x08000248
|
||||
_080B1C2C: .4byte gUnk_08000248
|
||||
_080B1C30: .4byte gUnk_080B37A0
|
||||
_080B1C34: .4byte gUnk_080B7910
|
||||
_080B1C38: .4byte 0x0800022C
|
||||
_080B1C38: .4byte gUnk_0800022C
|
||||
_080B1C3C: .4byte gUnk_08000360
|
||||
_080B1C40: .4byte gUnk_080B7A3E
|
||||
_080B1C44: .4byte gUnk_08000360
|
||||
_080B1C48: .4byte gUnk_080B7A3E
|
||||
_080B1C4C: .4byte gUnk_03000BF0
|
||||
_080B1C50: .4byte 0x08000278
|
||||
_080B1C50: .4byte gUnk_08000278
|
||||
|
||||
arm_func_start sub_080B1C54
|
||||
sub_080B1C54: @ 0x080B1C54
|
||||
|
|
@ -265,7 +265,7 @@ sub_080B1C54: @ 0x080B1C54
|
|||
arm_func_start sub_080B1C7C
|
||||
sub_080B1C7C: @ 0x080B1C7C
|
||||
push {r4, r5, r6, r7, r8, sb, sl, lr}
|
||||
add r0, pc, #0x104 @ =0x080B1D8C
|
||||
add r0, pc, #0x104 @ =_080B1D8C
|
||||
ldm r0, {r8, sb, sl}
|
||||
ldrb sl, [sl]
|
||||
cmp sl, #0
|
||||
|
|
@ -395,7 +395,7 @@ sub_080B1D98: @ 0x080B1D98
|
|||
and r3, r3, #0x20
|
||||
adds r2, r2, r3, lsr #2
|
||||
beq _080B1E74
|
||||
add r3, pc, #0x180 @ =0x080B1FEC
|
||||
add r3, pc, #0x180 @ =_080B1FEC
|
||||
ldr r2, [r3, r2]
|
||||
mov lr, pc
|
||||
bx r2
|
||||
|
|
@ -436,7 +436,7 @@ _080B1ED4:
|
|||
and r1, r1, #0x80
|
||||
lsr r1, r1, #4
|
||||
add r0, r0, r1
|
||||
add r1, pc, #0xF4 @ =0x080B1FFC
|
||||
add r1, pc, #0xF4 @ =_080B1FFC
|
||||
ldr r0, [r1, r0]
|
||||
mov lr, pc
|
||||
bx r0
|
||||
|
|
@ -657,8 +657,8 @@ sub_080B21B0: @ 0x080B21B0
|
|||
ldr sp, [fp, #0xc]
|
||||
ldr r8, [fp, #4]
|
||||
ldr r0, [fp, #8]
|
||||
add pc, pc, #0x60 @ =0x080B2230
|
||||
ldr r1, _080B2274 @ =0x080026A4
|
||||
add pc, pc, #0x60 @ =_080B2230
|
||||
ldr r1, _080B2274 @ =gUnk_080026A4
|
||||
add r1, r1, r0, lsl #4
|
||||
push {r4, r5, r6, r7, r8, sb, sl, fp, lr}
|
||||
ldr fp, _080B2278 @ =gUnk_03003DD0
|
||||
|
|
@ -686,6 +686,7 @@ _080B2224:
|
|||
ldr r0, [fp, #8]
|
||||
cmp r0, r4
|
||||
bleq sub_080B1C54
|
||||
_080B2230:
|
||||
ldr r4, [r0, #4]
|
||||
b _080B21FC
|
||||
_080B2238:
|
||||
|
|
@ -693,18 +694,18 @@ _080B2238:
|
|||
str r0, [fp, #8]
|
||||
pop {r4, r5, r6, r7, r8, sb, sl, fp, lr}
|
||||
bx lr
|
||||
_080B2248: .4byte 0x0805E781
|
||||
_080B224C: .4byte 0x08016F29
|
||||
_080B2250: .4byte 0x0805E781
|
||||
_080B2254: .4byte 0x080011C5
|
||||
_080B2258: .4byte 0x08016AE5
|
||||
_080B225C: .4byte 0x0805E781
|
||||
_080B2260: .4byte 0x080174A5
|
||||
_080B2264: .4byte 0x08017531
|
||||
_080B2268: .4byte 0x08017339
|
||||
_080B226C: .4byte 0x08017509
|
||||
_080B2248: .4byte sub_0805E780
|
||||
_080B224C: .4byte sub_08016F28
|
||||
_080B2250: .4byte sub_0805E780
|
||||
_080B2254: .4byte sub_080011C4
|
||||
_080B2258: .4byte sub_08016AE4
|
||||
_080B225C: .4byte sub_0805E780
|
||||
_080B2260: .4byte sub_080174A4
|
||||
_080B2264: .4byte sub_08017530
|
||||
_080B2268: .4byte sub_08017338
|
||||
_080B226C: .4byte sub_08017508
|
||||
_080B2270: .4byte gUnk_03003DD0
|
||||
_080B2274: .4byte 0x080026A4
|
||||
_080B2274: .4byte gUnk_080026A4
|
||||
_080B2278: .4byte gUnk_03003DD0
|
||||
|
||||
arm_func_start sub_080B227C
|
||||
|
|
@ -804,11 +805,11 @@ sub_080B237C: @ 0x080B237C
|
|||
addhs r3, r3, r1
|
||||
cmp r2, r3
|
||||
addhs r0, r0, #1
|
||||
ldr r1, _080B23EC @ =0x0800464E
|
||||
ldr r1, _080B23EC @ =gUnk_0800464E
|
||||
ldrb r0, [r1, r0]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_080B23EC: .4byte 0x0800464E
|
||||
_080B23EC: .4byte gUnk_0800464E
|
||||
|
||||
arm_func_start sub_080B23F0
|
||||
sub_080B23F0: @ 0x080B23F0
|
||||
|
|
|
|||
Loading…
Reference in New Issue