diff options
| author | theo <arisstephenson2@gmail.com> | 2020-06-06 19:12:44 -0700 |
|---|---|---|
| committer | theo <arisstephenson2@gmail.com> | 2020-06-06 19:12:44 -0700 |
| commit | 83d240e9a50dfd9cbfce76e037df5bd689a0e045 (patch) | |
| tree | 7b93474f454087bc993ec16a3388ac9644053d36 /asm/code_08016DF8.s | |
| parent | 50ed8b3e437e084122aa70865a0c468ca3c8b543 (diff) | |
split npcs
Diffstat (limited to 'asm/code_08016DF8.s')
| -rw-r--r-- | asm/code_08016DF8.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/code_08016DF8.s b/asm/code_08016DF8.s index 7671f1ea..3af3f1cc 100644 --- a/asm/code_08016DF8.s +++ b/asm/code_08016DF8.s @@ -891,7 +891,7 @@ _080174D0: bl sub_0805E3B0 cmp r0, #0 bne _080174F6 - ldr r1, _08017504 @ =gUnk_080B2D4C + ldr r1, _08017504 @ =gObjectFunctions ldrb r0, [r4, #9] lsls r0, r0, #2 adds r0, r0, r1 @@ -911,7 +911,7 @@ _080174F6: pop {r0} bx r0 .align 2, 0 -_08017504: .4byte gUnk_080B2D4C +_08017504: .4byte gObjectFunctions thumb_func_start sub_08017508 sub_08017508: @ 0x08017508 @@ -966,7 +966,7 @@ _08017566: bl sub_0805E3B0 cmp r0, #0 bne _08017584 - ldr r2, _080175DC @ =gUnk_080B313C + ldr r2, _080175DC @ =gNPCFunctions ldrb r1, [r4, #9] lsls r0, r1, #1 adds r0, r0, r1 @@ -979,7 +979,7 @@ _08017584: ldr r0, [r4, #4] cmp r0, #0 beq _080175D2 - ldr r2, _080175DC @ =gUnk_080B313C + ldr r2, _080175DC @ =gNPCFunctions ldrb r1, [r4, #9] lsls r0, r1, #1 adds r0, r0, r1 @@ -1021,7 +1021,7 @@ _080175D2: bx r0 .align 2, 0 _080175D8: .4byte gUnk_020342F8 -_080175DC: .4byte gUnk_080B313C +_080175DC: .4byte gNPCFunctions _080175E0: .4byte gUnk_02031EC0 _080175E4: .4byte gRoomControls |