diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-06-01 13:24:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-01 13:24:28 -0400 |
| commit | a923cf6b5286e2b2a75e8e9a48c501df97066200 (patch) | |
| tree | b2ccbbf2fb8746b66465db6d8bfef78bdf3f9dd1 /asm/battle_controller_safari.s | |
| parent | 2812a2bd7aa298acb9fbcfd456a31b9cfb02ce0e (diff) | |
| parent | e4136de32e7518521d595e601a86e9e8f6349aba (diff) | |
Merge pull request #60 from garakmon/split_battle_anims
Split battle_anim_80A22E8
Diffstat (limited to 'asm/battle_controller_safari.s')
| -rw-r--r-- | asm/battle_controller_safari.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s index e8edcb7fd..b0f53b7d9 100644 --- a/asm/battle_controller_safari.s +++ b/asm/battle_controller_safari.s @@ -259,7 +259,7 @@ _080DD724: .4byte gActiveBattler sub_80DD728: @ 80DD728 push {lr} ldr r2, _080DD750 @ =gSprites - ldr r1, _080DD754 @ =gUnknown_2023D44 + ldr r1, _080DD754 @ =gBattlerSpriteIds ldr r0, _080DD758 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 @@ -279,7 +279,7 @@ _080DD74C: bx r0 .align 2, 0 _080DD750: .4byte gSprites -_080DD754: .4byte gUnknown_2023D44 +_080DD754: .4byte gBattlerSpriteIds _080DD758: .4byte gActiveBattler _080DD75C: .4byte SpriteCallbackDummy thumb_func_end sub_80DD728 @@ -646,7 +646,7 @@ SafariHandleDrawTrainerPic: @ 80DD9C4 movs r1, 0x50 movs r3, 0x1E bl CreateSprite - ldr r6, _080DDA8C @ =gUnknown_2023D44 + ldr r6, _080DDA8C @ =gBattlerSpriteIds ldrb r1, [r5] adds r1, r6 strb r0, [r1] @@ -706,7 +706,7 @@ _080DDA7C: .4byte gSaveBlock2Ptr _080DDA80: .4byte gActiveBattler _080DDA84: .4byte gMultiuseSpriteTemplate _080DDA88: .4byte gUnknown_8239F8C -_080DDA8C: .4byte gUnknown_2023D44 +_080DDA8C: .4byte gBattlerSpriteIds _080DDA90: .4byte gSprites _080DDA94: .4byte 0x0000fffe _080DDA98: .4byte sub_8033EEC |