diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-27 15:01:18 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-27 15:01:18 -0400 |
| commit | 00c7dee919c8f93b8519a7eede2c41ba2ddcaf08 (patch) | |
| tree | 5707f8764920abcd4cffca84c675e5c53c32559d /asm/pokemon_summary_screen.s | |
| parent | 3d9eb18add0d8a9eb5bfa77fc64cd7b1f37fea5d (diff) | |
| parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) | |
Merge branch 'master' into pokemon_data
Diffstat (limited to 'asm/pokemon_summary_screen.s')
| -rw-r--r-- | asm/pokemon_summary_screen.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 20231a0bb..fea619ac8 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -8398,7 +8398,7 @@ sub_80A1DE8: @ 80A1DE8 lsls r0, r4, 1 adds r0, r4 lsls r0, 3 - ldr r1, _080A1E48 @ =gSpriteTemplate_820AAB4 + ldr r1, _080A1E48 @ =gBallSpriteTemplates adds r0, r1 movs r1, 0x6 movs r2, 0x88 @@ -8429,7 +8429,7 @@ sub_80A1DE8: @ 80A1DE8 pop {r0} bx r0 .align 2, 0 -_080A1E48: .4byte gSpriteTemplate_820AAB4 +_080A1E48: .4byte gBallSpriteTemplates _080A1E4C: .4byte 0x02018000 _080A1E50: .4byte gSprites _080A1E54: .4byte SpriteCallbackDummy |