diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-08-29 18:12:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-29 18:12:10 -0400 |
| commit | 462b7521b221a3766d7f21a9e1c7c1f11f72c52a (patch) | |
| tree | cf2614dafb2ae728cfd74b2eb19c03408b49e5d2 /gfx.asm | |
| parent | e9e60965a8ebe4939eb226832e21449c188d8e46 (diff) | |
| parent | 6a7378d76ff86c8f011779f57000621aa3b48266 (diff) | |
Merge pull request #60 from SatoMew/master
Replace Pokégear with Trainer Gear in relevant labels
Diffstat (limited to 'gfx.asm')
| -rw-r--r-- | gfx.asm | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "gfx.asm@Mon Nest Icon", ROMX PokedexNestIconGFX:: -INCBIN "gfx/pokegear/dexmap_nest_icon.1bpp" +INCBIN "gfx/trainer_gear/dexmap_nest_icon.1bpp" SECTION "gfx.asm@Bank 2 Misc GFX", ROMX UnknownBouncingOrbGFX:: @@ -18,13 +18,13 @@ INCBIN "gfx/overworld/happy.2bpp" UnknownBallGFX:: INCBIN "gfx/overworld/gfx_85cf.2bpp" -SECTION "gfx.asm@Pokegear GFX", ROMX -Pokegear1GFX:: -INCBIN "gfx/pokegear/pokegear_1.2bpp" -Pokegear2GFX:: -INCBIN "gfx/pokegear/pokegear_2.2bpp" +SECTION "gfx.asm@Trainer Gear GFX", ROMX +TrainerGearGFX:: +INCBIN "gfx/trainer_gear/trainer_gear.2bpp" +RadioGFX:: +INCBIN "gfx/trainer_gear/radio.2bpp" VerticalPipeGFX:: -INCBIN "gfx/pokegear/vertical_pipe.2bpp" +INCBIN "gfx/trainer_gear/vertical_pipe.2bpp" SECTION "gfx.asm@Title Screen BG Decoration Border", ROMX TitleBGDecorationBorder:: @@ -509,7 +509,7 @@ PokedexGFX:: INCBIN "gfx/pokedex/pokedex.2bpp" PokedexGFXEnd:: PokedexLocationGFX:: INCBIN "gfx/pokedex/locations.2bpp" ; 0x0f8dc2--0x0f8e12 PokedexLocationGFXEnd:: -TownMapGFX:: INCBIN "gfx/pokegear/town_map.2bpp" ; 0x0f8e12--0x0f8fc2 +TownMapGFX:: INCBIN "gfx/trainer_gear/town_map.2bpp" ; 0x0f8e12--0x0f8fc2 TownMapGFXEnd:: HUD_GFX:: INCBIN "gfx/hud/hud.2bpp" ; 0x0f8fc2--0x0f9052 HUD_GFXEnd:: @@ -524,4 +524,4 @@ PackIconGFXEnd:: SECTION "gfx.asm@Town Map Cursor", ROMX TownMapCursorGFX:: -INCBIN "gfx/pokegear/town_map_cursor.2bpp"
\ No newline at end of file +INCBIN "gfx/trainer_gear/town_map_cursor.2bpp" |