diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-02-26 14:07:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-26 14:07:48 -0500 |
| commit | e3447d23664117985dd882698a2c0badfb2ac212 (patch) | |
| tree | 58e224842c27d9c4ceb644ec63f42e809e81c048 /asm | |
| parent | 13f14218e139f4a552dd88dc1049e958005597d9 (diff) | |
| parent | 44c9109c2a04fbbf01268f53f0f4a57174563fb1 (diff) | |
Merge pull request #269 from GriffinRichards/doc-pallet
Document Pallet Town scripts
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/field_control_avatar.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index f1bef0721..d036f25e2 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -798,7 +798,7 @@ sub_806CEA0: @ 806CEA0 movs r0, 0 b _0806CED2 _0806CEB8: - ldr r0, _0806CED8 @ =gUnknown_8168CE4 + ldr r0, _0806CED8 @ =PalletTown_PlayersHouse_2F_EventScript_PC cmp r4, r0 beq _0806CECA ldr r0, _0806CEDC @ =EventScript_PC @@ -815,7 +815,7 @@ _0806CED2: pop {r1} bx r1 .align 2, 0 -_0806CED8: .4byte gUnknown_8168CE4 +_0806CED8: .4byte PalletTown_PlayersHouse_2F_EventScript_PC _0806CEDC: .4byte EventScript_PC thumb_func_end sub_806CEA0 |