diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-12-05 08:43:55 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-12-05 08:43:55 -0500 |
| commit | c14c6d36f8a60fd561f7c24339b575807bc6066f (patch) | |
| tree | 68348c229e4360cdb2366c5649233e0ff6e20c24 /asm/battle_controller_safari.s | |
| parent | d08f95be8afc1b400d791f93b05fe9e8daf0ee7a (diff) | |
Rename most special vars
Diffstat (limited to 'asm/battle_controller_safari.s')
| -rw-r--r-- | asm/battle_controller_safari.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s index 10e702da5..405d4c45b 100644 --- a/asm/battle_controller_safari.s +++ b/asm/battle_controller_safari.s @@ -431,7 +431,7 @@ CompleteWhenChosePokeblock: @ 80DD85C ands r0, r1 cmp r0, 0 bne _080DD882 - ldr r0, _080DD894 @ =gUnknown_203AD30 + ldr r0, _080DD894 @ =gSpecialVar_ItemId ldrh r1, [r0] movs r0, 0x1 bl EmitOneReturnValue @@ -443,7 +443,7 @@ _080DD882: _080DD888: .4byte gMain _080DD88C: .4byte sub_8011100 _080DD890: .4byte gPaletteFade -_080DD894: .4byte gUnknown_203AD30 +_080DD894: .4byte gSpecialVar_ItemId thumb_func_end CompleteWhenChosePokeblock thumb_func_start CompleteOnFinishedBattleAnimation_3 |