diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-28 22:17:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-28 22:17:13 -0500 |
| commit | b97a1acf3d676ca1c776e37ff4cfa48164ffc92b (patch) | |
| tree | 59b5db70690a9f9041e4964adae1722b4d178a1b /main.asm | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
| parent | b9a68fec2589eb6969be63e6ed1eb3fca312c307 (diff) | |
Merge pull request #445 from roukaour/master
Rename Pokémon animation files; consistent (x, y) coords; document design flaws
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -416,12 +416,12 @@ SECTION "Pic Animations 1", ROMX INCLUDE "engine/pic_animation.asm" INCLUDE "gfx/pokemon/anim_pointers.asm" INCLUDE "gfx/pokemon/anims.asm" -INCLUDE "gfx/pokemon/extra_pointers.asm" -INCLUDE "gfx/pokemon/extras.asm" +INCLUDE "gfx/pokemon/idle_pointers.asm" +INCLUDE "gfx/pokemon/idles.asm" INCLUDE "gfx/pokemon/unown_anim_pointers.asm" INCLUDE "gfx/pokemon/unown_anims.asm" -INCLUDE "gfx/pokemon/unown_extra_pointers.asm" -INCLUDE "gfx/pokemon/unown_extras.asm" +INCLUDE "gfx/pokemon/unown_idle_pointers.asm" +INCLUDE "gfx/pokemon/unown_idles.asm" INCLUDE "gfx/pokemon/bitmask_pointers.asm" INCLUDE "gfx/pokemon/bitmasks.asm" INCLUDE "gfx/pokemon/unown_bitmask_pointers.asm" @@ -645,8 +645,8 @@ INCLUDE "engine/events/odd_egg.asm" SECTION "Mobile Stadium 2", ROMX -IF DEF(CRYSTAL11) +if DEF(CRYSTAL11) INCBIN "mobile/stadium/stadium2_2.bin" -ELSE +else INCBIN "mobile/stadium/stadium2_1.bin" -ENDC +endc |