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
+14 -14
View File
@@ -291,7 +291,7 @@ sub_08028FFC: @ 0x08028FFC
strh r0, [r4, #0x32]
adds r0, r4, #0
movs r1, #0
bl sub_08004260
bl UpdateSprite
ldr r0, _08029074 @ =0x00004022
adds r1, r4, #0
adds r1, #0x76
@@ -365,7 +365,7 @@ sub_080290E0: @ 0x080290E0
adds r3, r3, r2
ldrb r2, [r3]
orrs r1, r2
bl sub_08004260
bl UpdateSprite
pop {pc}
.align 2, 0
_080290F8: .4byte gUnk_080CCA04
@@ -607,7 +607,7 @@ sub_08029270: @ 0x08029270
strb r0, [r2, #0x18]
adds r0, r2, #0
movs r1, #0xe
bl sub_08004260
bl UpdateSprite
b _0802929C
_08029296:
adds r0, r2, #0
@@ -703,10 +703,10 @@ _08029338:
bne _08029356
adds r0, r4, #0
movs r1, #0
bl sub_08004260
bl UpdateSprite
ldr r0, [r4, #0x54]
movs r1, #4
bl sub_08004260
bl UpdateSprite
_08029356:
movs r1, #0
movs r0, #4
@@ -884,11 +884,11 @@ sub_08029474: @ 0x08029474
strb r0, [r4, #0x14]
ldrb r1, [r4, #0x14]
adds r0, r4, #0
bl sub_08004260
bl UpdateSprite
ldr r0, [r4, #0x54]
ldrb r1, [r4, #0x14]
adds r1, #4
bl sub_08004260
bl UpdateSprite
b _080294D2
.align 2, 0
_080294BC: .4byte gLinkEntity
@@ -946,10 +946,10 @@ _0802951C:
strb r0, [r4, #0x10]
adds r0, r4, #0
movs r1, #3
bl sub_08004260
bl UpdateSprite
ldr r0, [r4, #0x54]
movs r1, #7
bl sub_08004260
bl UpdateSprite
_08029538:
pop {r4, pc}
.align 2, 0
@@ -1153,10 +1153,10 @@ sub_0802969C: @ 0x0802969C
strb r4, [r5, #0x14]
adds r0, r5, #0
adds r1, r4, #0
bl sub_08004260
bl UpdateSprite
ldr r0, [r5, #0x54]
adds r1, r4, #4
bl sub_08004260
bl UpdateSprite
_080296C4:
pop {r4, r5, pc}
.align 2, 0
@@ -1292,7 +1292,7 @@ sub_08029770: @ 0x08029770
str r0, [r4, #0x48]
adds r0, r4, #0
movs r1, #2
bl sub_08004260
bl UpdateSprite
ldr r2, [r4, #0x54]
ldrb r1, [r2, #0x18]
movs r0, #4
@@ -1303,7 +1303,7 @@ sub_08029770: @ 0x08029770
strb r0, [r2, #0x18]
ldr r0, [r4, #0x54]
movs r1, #6
bl sub_08004260
bl UpdateSprite
adds r0, r4, #0
bl sub_080A29BC
_080297E8:
@@ -1356,7 +1356,7 @@ sub_080297F0: @ 0x080297F0
strh r0, [r1]
adds r0, r4, #0
movs r1, #0x54
bl sub_08004260
bl UpdateSprite
pop {r4, pc}
.align 2, 0
_08029850: .4byte 0x00000143