diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-04 18:51:12 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-04 18:51:12 -0500 |
| commit | acf290ec6f6127a4ac84403d30e50e4e7670693c (patch) | |
| tree | 5b25b91f7d9acbae8e0754fe89af800d0993fbaa /data | |
| parent | ed5f6107c4051c0a8056824ce0437862909b579d (diff) | |
| parent | b1a7733c1cead8ed3d4a58c42d638afd0ead8ab0 (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_anim_80CA710.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/battle_anim_80CA710.s b/data/battle_anim_80CA710.s index ba5d9f533..4430cd372 100644 --- a/data/battle_anim_80CA710.s +++ b/data/battle_anim_80CA710.s @@ -2505,7 +2505,7 @@ gSpriteTemplate_83D96C4:: @ 83D96C4 spr_template 10201, 10201, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D58FC .align 1 -gUnknown_083D96DC:: @ 83D96DC +gHeatedRockCoords:: @ 83D96DC .2byte -2, -5 .2byte -1, -1 .2byte 3, -6 |