diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 23:00:22 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 23:00:22 -0500 |
| commit | dfcca93b451cecb6857f8b6bc6b9f67e997b09c9 (patch) | |
| tree | acf41a46e600fa3452536f97dc3f934968b3c839 /engine/pack.asm | |
| parent | 5c28d05bb40b47f084a34eb732da92c899e18db6 (diff) | |
| parent | 6c5cd7a963fb2b5eed109aeef25f041eabba0004 (diff) | |
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
# Conflicts:
# engine/battle/core.asm
# engine/save.asm
Diffstat (limited to 'engine/pack.asm')
| -rw-r--r-- | engine/pack.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/pack.asm b/engine/pack.asm index 2d1210346..e4d9eea4d 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -1705,7 +1705,7 @@ TextJump_YouCantUseItInABattle: ; 0x10b11 db "@" ; 0x10b16 -PackMenuGFX: +PackMenuGFX:: INCBIN "gfx/pack/pack_menu.2bpp" PackGFX: INCBIN "gfx/pack/pack.2bpp" |