split npcs

This commit is contained in:
theo
2020-06-06 19:12:44 -07:00
parent 50ed8b3e43
commit 83d240e9a5
130 changed files with 33510 additions and 32863 deletions
+41 -41
View File
@@ -25,7 +25,7 @@ sub_08023E10: @ 0x08023E10
strb r0, [r2]
adds r0, r4, #0
movs r1, #5
bl sub_08004260
bl UpdateSprite
_08023E36:
adds r0, r4, #0
bl sub_08004274
@@ -370,7 +370,7 @@ sub_0802409C: @ 0x0802409C
strb r0, [r1]
ldrb r1, [r4, #0x14]
adds r0, r4, #0
bl sub_08004260
bl UpdateSprite
adds r0, r4, #0
bl sub_080A29BC
pop {r4, pc}
@@ -1582,7 +1582,7 @@ sub_080249DC: @ 0x080249DC
lsrs r1, r1, #2
strb r1, [r0, #0x14]
ldrb r1, [r0, #0x14]
bl sub_08004260
bl UpdateSprite
pop {pc}
.align 2, 0
@@ -1601,7 +1601,7 @@ sub_080249F4: @ 0x080249F4
strb r1, [r2, #0x14]
ldrb r1, [r2, #0x14]
adds r0, r2, #0
bl sub_08004260
bl UpdateSprite
_08024A12:
pop {pc}
@@ -2480,7 +2480,7 @@ _0802508A:
ldrb r1, [r4, #0x14]
adds r1, #4
adds r0, r4, #0
bl sub_08004260
bl UpdateSprite
adds r1, r4, #0
adds r1, #0x59
movs r0, #6
@@ -2602,7 +2602,7 @@ sub_08025180: @ 0x08025180
ldrb r1, [r4, #0x14]
adds r1, #4
adds r0, r4, #0
bl sub_08004260
bl UpdateSprite
adds r0, r4, #0
bl sub_0804AA1C
pop {r4, pc}
@@ -2670,7 +2670,7 @@ sub_080251FC: @ 0x080251FC
bl sub_080256B4
adds r0, r4, #0
movs r1, #0
bl sub_08004260
bl UpdateSprite
pop {r4, r5, pc}
.align 2, 0
@@ -2847,7 +2847,7 @@ _08025352:
str r0, [r4, #0x20]
adds r0, r4, #0
movs r1, #1
bl sub_08004260
bl UpdateSprite
_08025388:
pop {r4, r5, pc}
.align 2, 0
@@ -2884,7 +2884,7 @@ _080253AE:
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #2
bl sub_08004260
bl UpdateSprite
_080253CC:
pop {r4, pc}
.align 2, 0
@@ -2908,7 +2908,7 @@ sub_080253D4: @ 0x080253D4
strb r0, [r4, #0xc]
adds r0, r4, #0
movs r1, #3
bl sub_08004260
bl UpdateSprite
b _0802541A
_080253FE:
movs r0, #6
@@ -2917,7 +2917,7 @@ _080253FE:
strb r0, [r4, #0xe]
adds r0, r4, #0
movs r1, #3
bl sub_08004260
bl UpdateSprite
adds r0, r4, #0
bl sub_08025A54
adds r0, r4, #0
@@ -2946,7 +2946,7 @@ sub_0802541C: @ 0x0802541C
str r0, [r4, #0x20]
adds r0, r4, #0
movs r1, #1
bl sub_08004260
bl UpdateSprite
_08025448:
pop {r4, pc}
.align 2, 0
@@ -2973,7 +2973,7 @@ _08025460:
bl sub_080256B4
adds r0, r4, #0
movs r1, #0
bl sub_08004260
bl UpdateSprite
_0802547A:
pop {r4, pc}
@@ -3048,7 +3048,7 @@ _080254F6:
_08025502:
adds r0, r4, #0
movs r1, #0
bl sub_08004260
bl UpdateSprite
b _08025512
_0802550C:
adds r0, r4, #0
@@ -3995,7 +3995,7 @@ sub_08025C2C: @ 0x08025C2C
adds r1, #0x80
strb r2, [r1]
movs r1, #8
bl sub_08004260
bl UpdateSprite
pop {pc}
.align 2, 0
@@ -4100,7 +4100,7 @@ sub_08025CD4: @ 0x08025CD4
strb r3, [r0, #3]
ldr r0, [r4, #0x54]
movs r1, #9
bl sub_080042AC
bl LoadAnimation
b _08025D9C
_08025CFE:
adds r5, r4, #0
@@ -4270,7 +4270,7 @@ _08025DF2:
bne _08025E4C
adds r0, r5, #0
movs r1, #0
bl sub_080042AC
bl LoadAnimation
b _08025E58
.align 2, 0
_08025E48: .4byte gUnk_080CC1B8
@@ -4279,7 +4279,7 @@ _08025E4C:
adds r0, r0, r6
ldrb r1, [r0]
adds r0, r5, #0
bl sub_08004260
bl UpdateSprite
_08025E58:
ldrb r0, [r5, #0xa]
movs r6, #3
@@ -5137,7 +5137,7 @@ sub_080264AC: @ 0x080264AC
beq _080264D2
ldr r0, [r4, #0x54]
movs r1, #4
bl sub_080042AC
bl LoadAnimation
adds r0, r4, #0
bl sub_08027D20
_080264D2:
@@ -5220,7 +5220,7 @@ sub_0802653C: @ 0x0802653C
bl sub_08027548
ldr r0, [r4, #0x54]
movs r1, #0
bl sub_080042AC
bl LoadAnimation
ldr r0, _0802657C @ =gUnk_02034490
strb r5, [r0]
_08026572:
@@ -5530,7 +5530,7 @@ sub_08026774: @ 0x08026774
strb r0, [r1, #3]
ldr r0, [r4, #0x54]
movs r1, #1
bl sub_080042AC
bl LoadAnimation
_080267C6:
adds r0, r4, #0
bl sub_080277F8
@@ -5561,7 +5561,7 @@ sub_080267D0: @ 0x080267D0
bl sub_08027B98
ldr r0, [r4, #0x54]
movs r1, #2
bl sub_080042AC
bl LoadAnimation
_08026802:
add sp, #4
pop {r4, pc}
@@ -5653,7 +5653,7 @@ _08026888:
bl sub_08027870
ldr r0, [r4, #0x54]
movs r1, #3
bl sub_080042AC
bl LoadAnimation
ldr r0, _080268C4 @ =0x000001A1
bl PlaySFX
_080268BE:
@@ -5696,7 +5696,7 @@ sub_080268EC: @ 0x080268EC
beq _08026912
ldr r0, [r4, #0x54]
movs r1, #4
bl sub_080042AC
bl LoadAnimation
adds r0, r4, #0
bl sub_08027D20
_08026912:
@@ -5722,7 +5722,7 @@ sub_08026914: @ 0x08026914
bl sub_08027548
ldr r0, [r4, #0x54]
movs r1, #0
bl sub_080042AC
bl LoadAnimation
_08026942:
adds r0, r4, #0
bl sub_080277F8
@@ -5883,7 +5883,7 @@ _08026A3E:
beq _08026A7E
adds r0, r5, #0
movs r1, #6
bl sub_080042AC
bl LoadAnimation
b _08026A7E
_08026A6C:
adds r0, r5, #0
@@ -5893,7 +5893,7 @@ _08026A6C:
beq _08026A7E
adds r0, r5, #0
movs r1, #5
bl sub_080042AC
bl LoadAnimation
_08026A7E:
lsls r0, r4, #0x18
cmp r0, #0
@@ -6183,7 +6183,7 @@ _08026C9C:
beq _08026CCC
adds r0, r4, #0
movs r1, #8
bl sub_080042AC
bl LoadAnimation
b _08026CCC
_08026CBA:
adds r0, r4, #0
@@ -6193,7 +6193,7 @@ _08026CBA:
beq _08026CCC
adds r0, r4, #0
movs r1, #7
bl sub_080042AC
bl LoadAnimation
_08026CCC:
adds r0, r5, #0
adds r0, #0x7c
@@ -6459,7 +6459,7 @@ _08026EA0:
strb r6, [r0, #3]
ldr r0, [r4, #0x54]
movs r1, #0
bl sub_080042AC
bl LoadAnimation
str r6, [sp]
adds r0, r4, #0
movs r1, #0x80
@@ -6647,7 +6647,7 @@ _08026FFE:
beq _0802705C
adds r0, r1, #0
movs r1, #8
bl sub_080042AC
bl LoadAnimation
b _0802705C
.align 2, 0
_08027044: .4byte 0x00000155
@@ -6660,7 +6660,7 @@ _08027048:
beq _0802705C
adds r0, r1, #0
movs r1, #7
bl sub_080042AC
bl LoadAnimation
_0802705C:
adds r0, r4, #0
bl sub_08027870
@@ -7238,7 +7238,7 @@ _080274AE:
beq _08027532
adds r0, r6, #0
movs r1, #0xc
bl sub_080042AC
bl LoadAnimation
b _08027532
_080274E0:
adds r0, r6, #0
@@ -7248,7 +7248,7 @@ _080274E0:
beq _08027532
adds r0, r6, #0
movs r1, #0xb
bl sub_080042AC
bl LoadAnimation
b _08027532
_080274F4:
adds r0, r6, #0
@@ -7258,7 +7258,7 @@ _080274F4:
beq _08027532
adds r0, r6, #0
movs r1, #0xa
bl sub_080042AC
bl LoadAnimation
b _08027532
_08027508:
ldr r0, [r6, #0x54]
@@ -8579,7 +8579,7 @@ _08027EA6:
strb r0, [r4, #0xe]
adds r0, r4, #0
movs r1, #1
bl sub_08004260
bl UpdateSprite
b _08027EE4
_08027EC4:
movs r3, #0
@@ -8596,7 +8596,7 @@ _08027EC4:
strb r2, [r0]
adds r0, r4, #0
movs r1, #0
bl sub_08004260
bl UpdateSprite
_08027EE4:
movs r0, #0
strb r0, [r4, #0x15]
@@ -8672,7 +8672,7 @@ _08027F68:
strb r0, [r4, #0x10]
adds r0, r4, #0
movs r1, #2
bl sub_08004260
bl UpdateSprite
_08027F7C:
pop {r4, pc}
.align 2, 0
@@ -8700,7 +8700,7 @@ sub_08027F84: @ 0x08027F84
strb r0, [r4, #0x18]
adds r0, r4, #0
movs r1, #0
bl sub_08004260
bl UpdateSprite
adds r0, r4, #0
bl sub_080A29BC
_08027FB0:
@@ -8766,7 +8766,7 @@ sub_08027FE0: @ 0x08027FE0
strb r0, [r3]
adds r0, r4, #0
movs r1, #1
bl sub_08004260
bl UpdateSprite
_08028028:
pop {r4, pc}
.align 2, 0
@@ -9825,7 +9825,7 @@ _0802881C:
_0802881E:
adds r0, r3, #0
adds r1, r2, #0
bl sub_08004260
bl UpdateSprite
pop {pc}
thumb_func_start sub_08028828