ref: d5089d3c623e2b147b035cf12569810d604bf47d
parent: 4b853ad676e061a6c4b0fcc030855a2705776864
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Sat Jun 27 12:27:30 EDT 2020
Organize gfx/
--- a/.gitattributes
+++ b/.gitattributes
@@ -12,7 +12,7 @@
*.rle binary
*.tilecoll binary
*.bst binary
-*.map binary
+*.tilemap binary
*.wav binary
*.blk binary
*.pic binary
--- a/Makefile
+++ b/Makefile
@@ -83,16 +83,21 @@
### Misc file-specific graphics rules
-gfx/blue/intro_purin_1.2bpp: $(RGBGFX) += -h
-gfx/blue/intro_purin_2.2bpp: $(RGBGFX) += -h
-gfx/blue/intro_purin_3.2bpp: $(RGBGFX) += -h
-gfx/red/intro_nido_1.2bpp: $(RGBGFX) += -h
-gfx/red/intro_nido_2.2bpp: $(RGBGFX) += -h
-gfx/red/intro_nido_3.2bpp: $(RGBGFX) += -h
+gfx/battle/attack_anim_1.2bpp: tools/gfx += --trim-whitespace
+gfx/battle/attack_anim_2.2bpp: tools/gfx += --trim-whitespace
-gfx/game_boy.2bpp: tools/gfx += --remove-duplicates
-gfx/theend.2bpp: tools/gfx += --interleave --png=$<
+gfx/intro_credits/blue_jigglypuff_1.2bpp: $(RGBGFX) += -h
+gfx/intro_credits/blue_jigglypuff_2.2bpp: $(RGBGFX) += -h
+gfx/intro_credits/blue_jigglypuff_3.2bpp: $(RGBGFX) += -h
+gfx/intro_credits/red_nidorino_1.2bpp: $(RGBGFX) += -h
+gfx/intro_credits/red_nidorino_2.2bpp: $(RGBGFX) += -h
+gfx/intro_credits/red_nidorino_3.2bpp: $(RGBGFX) += -h
+
+gfx/intro_credits/the_end.2bpp: tools/gfx += --interleave --png=$<
+
gfx/tilesets/%.2bpp: tools/gfx += --trim-whitespace
+
+gfx/trade/game_boy.2bpp: tools/gfx += --remove-duplicates
### Catch-all graphics rules
--- a/data/sgb_border.asm
+++ b/data/sgb_border.asm
@@ -1,9 +1,9 @@
BorderPalettes:
IF DEF(_RED)
- INCBIN "gfx/red/sgbborder.map"
+ INCBIN "gfx/sgb/red_border.tilemap"
ENDC
IF DEF(_BLUE)
- INCBIN "gfx/blue/sgbborder.map"
+ INCBIN "gfx/sgb/blue_border.tilemap"
ENDC
ds $100
@@ -55,8 +55,8 @@
SGBBorderGraphics:
IF DEF(_RED)
- INCBIN "gfx/red/sgbborder.2bpp"
+ INCBIN "gfx/sgb/red_border.2bpp"
ENDC
IF DEF(_BLUE)
- INCBIN "gfx/blue/sgbborder.2bpp"
+ INCBIN "gfx/sgb/blue_border.2bpp"
ENDC
--- a/engine/HoF_room_pc.asm
+++ b/engine/HoF_room_pc.asm
@@ -266,5 +266,5 @@
INCLUDE "text/credits_text.asm"
TheEndGfx:
- INCBIN "gfx/theend.2bpp"
+ INCBIN "gfx/intro_credits/the_end.2bpp"
TheEndGfxEnd:
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -361,17 +361,17 @@
db $FF
AnimationTileset1:
- INCBIN "gfx/attack_anim_1.2bpp"
+ INCBIN "gfx/battle/attack_anim_1.2bpp"
AnimationTileset2:
- INCBIN "gfx/attack_anim_2.2bpp"
+ INCBIN "gfx/battle/attack_anim_2.2bpp"
SlotMachineTiles2:
IF DEF(_RED)
- INCBIN "gfx/red/slotmachine2.2bpp"
+ INCBIN "gfx/slots/red_slots_2.2bpp"
ENDC
IF DEF(_BLUE)
- INCBIN "gfx/blue/slotmachine2.2bpp"
+ INCBIN "gfx/slots/blue_slots_2.2bpp"
ENDC
MoveAnimation:
@@ -1710,7 +1710,7 @@
jp AnimationShowMonPic
MinimizedMonSprite:
- INCBIN "gfx/minimized_mon_sprite.1bpp"
+ INCBIN "gfx/battle/minimize.1bpp"
MinimizedMonSpriteEnd:
AnimationSlideMonDownAndHide:
--- a/engine/battle/battle_transitions.asm
+++ b/engine/battle/battle_transitions.asm
@@ -160,7 +160,7 @@
jp CopyVideoData
BattleTransitionTile:
- INCBIN "gfx/battle_transition.2bpp"
+ INCBIN "gfx/overworld/battle_transition.2bpp"
BattleTransitionTileEnd:
BattleTransition_BlackScreen:
--- a/engine/battle/draw_hud_pokeball_gfx.asm
+++ b/engine/battle/draw_hud_pokeball_gfx.asm
@@ -188,5 +188,5 @@
; four tiles: pokeball, black pokeball (status ailment), crossed out pokeball (fainted) and pokeball slot (no mon)
PokeballTileGraphics::
- INCBIN "gfx/pokeball.2bpp"
+ INCBIN "gfx/battle/balls.2bpp"
PokeballTileGraphicsEnd:
--- a/engine/gamefreak.asm
+++ b/engine/gamefreak.asm
@@ -239,5 +239,5 @@
GameFreakShootingStarOAMDataEnd:
FallingStar:
- INCBIN "gfx/falling_star.2bpp"
+ INCBIN "gfx/intro_credits/falling_star.2bpp"
FallingStarEnd:
--- a/engine/intro.asm
+++ b/engine/intro.asm
@@ -438,35 +438,33 @@
db ANIMATION_END
GameFreakIntro:
- INCBIN "gfx/gamefreak_intro.2bpp"
- INCBIN "gfx/gamefreak_logo.2bpp"
- rept 16
- db $00 ; blank tile
- endr
+ INCBIN "gfx/intro_credits/gamefreak_presents.2bpp"
+ INCBIN "gfx/intro_credits/gamefreak_logo.2bpp"
+ ds 16, $00 ; blank tile
GameFreakIntroEnd:
FightIntroBackMon:
- INCBIN "gfx/intro_fight.2bpp"
+ INCBIN "gfx/intro_credits/gengar.2bpp"
FightIntroBackMonEnd:
FightIntroFrontMon:
IF DEF(_RED)
- INCBIN "gfx/red/intro_nido_1.2bpp"
+ INCBIN "gfx/intro_credits/red_nidorino_1.2bpp"
FightIntroFrontMon2:
- INCBIN "gfx/red/intro_nido_2.2bpp"
+ INCBIN "gfx/intro_credits/red_nidorino_2.2bpp"
FightIntroFrontMon3:
- INCBIN "gfx/red/intro_nido_3.2bpp"
+ INCBIN "gfx/intro_credits/red_nidorino_3.2bpp"
ENDC
IF DEF(_BLUE)
- INCBIN "gfx/blue/intro_purin_1.2bpp"
+ INCBIN "gfx/intro_credits/blue_jigglypuff_1.2bpp"
FightIntroFrontMon2:
- INCBIN "gfx/blue/intro_purin_2.2bpp"
+ INCBIN "gfx/intro_credits/blue_jigglypuff_2.2bpp"
FightIntroFrontMon3:
- INCBIN "gfx/blue/intro_purin_3.2bpp"
+ INCBIN "gfx/intro_credits/blue_jigglypuff_3.2bpp"
ENDC
FightIntroFrontMonEnd:
- ds $10 ; blank tile
+ ds 16, $00 ; blank tile
--- a/engine/menu/draw_badges.asm
+++ b/engine/menu/draw_badges.asm
@@ -117,4 +117,4 @@
db $20, $28, $30, $38, $40, $48, $50, $58
GymLeaderFaceAndBadgeTileGraphics:
- INCBIN "gfx/badges.2bpp"
+ INCBIN "gfx/trainer_card/badges.2bpp"
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -332,7 +332,7 @@
jp CopyVideoDataDouble
ED_Tile:
- INCBIN "gfx/ED_tile.1bpp"
+ INCBIN "gfx/font/ED.1bpp"
ED_TileEnd:
PrintAlphabet:
--- a/engine/menu/status_screen.asm
+++ b/engine/menu/status_screen.asm
@@ -241,8 +241,8 @@
ld [hl], $6f ; ← (halfarrow ending)
ret
-PTile: ; This is a single 1bpp "P" tile
- INCBIN "gfx/p_tile.1bpp"
+PTile:
+ INCBIN "gfx/font/P.1bpp"
PTileEnd:
PrintStatsBox:
--- a/engine/mon_party_sprites.asm
+++ b/engine/mon_party_sprites.asm
@@ -281,4 +281,4 @@
INCLUDE "data/mon_party_sprites.asm"
MonPartySprites:
- INCBIN "gfx/mon_ow_sprites.2bpp"
+ INCBIN "gfx/trade/mon_ow_sprites.2bpp"
--- a/engine/overworld/emotion_bubbles.asm
+++ b/engine/overworld/emotion_bubbles.asm
@@ -62,9 +62,9 @@
jp UpdateSprites
EmotionBubblesPointerTable:
- dw EmotionBubbles
- dw EmotionBubbles + $40
- dw EmotionBubbles + $80
+ dw ShockEmote
+ dw QuestionEmote
+ dw HappyEmote
EmotionBubblesOAM:
db $F8,$00,$F9,$00
@@ -71,4 +71,6 @@
db $FA,$00,$FB,$00
EmotionBubbles:
- INCBIN "gfx/emotion_bubbles.2bpp"
+ShockEmote: INCBIN "gfx/emotes/shock.2bpp"
+QuestionEmote: INCBIN "gfx/emotes/question.2bpp"
+HappyEmote: INCBIN "gfx/emotes/happy.2bpp"
--- a/engine/overworld/healing_machine.asm
+++ b/engine/overworld/healing_machine.asm
@@ -63,7 +63,7 @@
jp UpdateSprites
PokeCenterFlashingMonitorAndHealBall:
- INCBIN "gfx/pokecenter_ball.2bpp"
+ INCBIN "gfx/overworld/heal_machine.2bpp"
PokeCenterOAMData:
db $24,$34,$7C,$10 ; heal machine monitor
--- a/engine/overworld/ledges.asm
+++ b/engine/overworld/ledges.asm
@@ -68,7 +68,7 @@
ret
LedgeHoppingShadow:
- INCBIN "gfx/ledge_hopping_shadow.1bpp"
+ INCBIN "gfx/overworld/shadow.1bpp"
LedgeHoppingShadowEnd:
LedgeHoppingShadowOAM:
--- a/engine/overworld/ssanne.asm
+++ b/engine/overworld/ssanne.asm
@@ -89,5 +89,5 @@
jp CopyVideoData
SSAnneSmokePuffTile:
- INCBIN "gfx/ss_anne_smoke_puff.2bpp"
+ INCBIN "gfx/overworld/smoke.2bpp"
SSAnneSmokePuffTileEnd:
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -878,7 +878,7 @@
jp SlotMachine_AnimWheel3
SlotMachineMap:
- INCBIN "gfx/tilemaps/slotmachine.map"
+ INCBIN "gfx/slots/slots.tilemap"
SlotMachineMapEnd:
INCLUDE "data/slot_machine_wheels.asm"
@@ -885,8 +885,8 @@
SlotMachineTiles1:
IF DEF(_RED)
- INCBIN "gfx/red/slotmachine1.2bpp"
+ INCBIN "gfx/slots/red_slots_1.2bpp"
ENDC
IF DEF(_BLUE)
- INCBIN "gfx/blue/slotmachine1.2bpp"
+ INCBIN "gfx/slots/blue_slots_1.2bpp"
ENDC
--- a/engine/town_map.asm
+++ b/engine/town_map.asm
@@ -106,7 +106,7 @@
INCLUDE "data/town_map_order.asm"
TownMapCursor:
- INCBIN "gfx/town_map_cursor.1bpp"
+ INCBIN "gfx/town_map/town_map_cursor.1bpp"
TownMapCursorEnd:
LoadTownMap_Nest:
@@ -271,7 +271,7 @@
ret
TownMapUpArrow:
- INCBIN "gfx/up_arrow.1bpp"
+ INCBIN "gfx/town_map/up_arrow.1bpp"
TownMapUpArrowEnd:
LoadTownMap:
@@ -325,8 +325,7 @@
ret
CompressedMap:
-; you can decompress this file with the redrle program in the extras/ dir
- INCBIN "gfx/town_map.rle"
+ INCBIN "gfx/town_map/town_map.rle"
ExitTownMap:
; clear town map graphics data and load usual graphics data
@@ -587,7 +586,7 @@
INCLUDE "text/map_names.asm"
MonNestIcon:
- INCBIN "gfx/mon_nest_icon.1bpp"
+ INCBIN "gfx/pokedex/mon_nest_icon.1bpp"
MonNestIconEnd:
TownMapSpriteBlinkingAnimation::
binary files a/gfx/AB.png /dev/null differ
binary files a/gfx/ED_tile.png /dev/null differ
binary files a/gfx/attack_anim_1.png /dev/null differ
binary files a/gfx/attack_anim_2.png /dev/null differ
binary files a/gfx/badge_numbers.png /dev/null differ
binary files a/gfx/badges.png /dev/null differ
binary files /dev/null b/gfx/battle/attack_anim_1.png differ
binary files /dev/null b/gfx/battle/attack_anim_2.png differ
binary files /dev/null b/gfx/battle/balls.png differ
binary files /dev/null b/gfx/battle/battle_hud_1.png differ
binary files /dev/null b/gfx/battle/battle_hud_2.png differ
binary files /dev/null b/gfx/battle/battle_hud_3.png differ
binary files /dev/null b/gfx/battle/minimize.png differ
binary files a/gfx/battle_hud1.png /dev/null differ
binary files a/gfx/battle_hud2.png /dev/null differ
binary files a/gfx/battle_hud3.png /dev/null differ
binary files a/gfx/battle_transition.png /dev/null differ
binary files a/gfx/blank_leader_names.png /dev/null differ
binary files a/gfx/blue/blueversion.png /dev/null differ
binary files a/gfx/blue/intro_purin_1.png /dev/null differ
binary files a/gfx/blue/intro_purin_2.png /dev/null differ
binary files a/gfx/blue/intro_purin_3.png /dev/null differ
binary files a/gfx/blue/sgbborder.map /dev/null differ
binary files a/gfx/blue/sgbborder.png /dev/null differ
binary files a/gfx/blue/slotmachine1.png /dev/null differ
binary files a/gfx/blue/slotmachine2.png /dev/null differ
binary files a/gfx/circle_tile.png /dev/null differ
binary files a/gfx/copyright.png /dev/null differ
binary files /dev/null b/gfx/emotes/happy.png differ
binary files /dev/null b/gfx/emotes/question.png differ
binary files /dev/null b/gfx/emotes/shock.png differ
binary files a/gfx/emotion_bubbles.png /dev/null differ
binary files a/gfx/falling_star.png /dev/null differ
binary files a/gfx/font.png /dev/null differ
binary files /dev/null b/gfx/font/AB.png differ
binary files /dev/null b/gfx/font/ED.png differ
binary files /dev/null b/gfx/font/P.png differ
binary files /dev/null b/gfx/font/font.png differ
binary files /dev/null b/gfx/font/font_battle_extra.png differ
binary files /dev/null b/gfx/font/font_extra.png differ
binary files a/gfx/game_boy.png /dev/null differ
binary files a/gfx/gamefreak.png /dev/null differ
binary files a/gfx/gamefreak_intro.png /dev/null differ
binary files a/gfx/gamefreak_logo.png /dev/null differ
binary files a/gfx/hp_bar_and_status.png /dev/null differ
binary files /dev/null b/gfx/intro_credits/blue_jigglypuff_1.png differ
binary files /dev/null b/gfx/intro_credits/blue_jigglypuff_2.png differ
binary files /dev/null b/gfx/intro_credits/blue_jigglypuff_3.png differ
binary files /dev/null b/gfx/intro_credits/copyright.png differ
binary files /dev/null b/gfx/intro_credits/falling_star.png differ
binary files /dev/null b/gfx/intro_credits/gamefreak_logo.png differ
binary files /dev/null b/gfx/intro_credits/gamefreak_presents.png differ
binary files /dev/null b/gfx/intro_credits/gengar.png differ
binary files /dev/null b/gfx/intro_credits/red_nidorino_1.png differ
binary files /dev/null b/gfx/intro_credits/red_nidorino_2.png differ
binary files /dev/null b/gfx/intro_credits/red_nidorino_3.png differ
binary files /dev/null b/gfx/intro_credits/the_end.png differ
binary files a/gfx/intro_fight.png /dev/null differ
binary files a/gfx/ledge_hopping_shadow.png /dev/null differ
binary files a/gfx/link_cable.png /dev/null differ
binary files a/gfx/minimized_mon_sprite.png /dev/null differ
binary files a/gfx/mon_nest_icon.png /dev/null differ
binary files a/gfx/mon_ow_sprites.png /dev/null differ
binary files /dev/null b/gfx/overworld/battle_transition.png differ
binary files /dev/null b/gfx/overworld/fishing_rod.png differ
binary files /dev/null b/gfx/overworld/heal_machine.png differ
binary files /dev/null b/gfx/overworld/red_fish_back.png differ
binary files /dev/null b/gfx/overworld/red_fish_front.png differ
binary files /dev/null b/gfx/overworld/red_fish_side.png differ
binary files /dev/null b/gfx/overworld/shadow.png differ
binary files /dev/null b/gfx/overworld/smoke.png differ
binary files /dev/null b/gfx/overworld/spinners.png differ
binary files a/gfx/p_tile.png /dev/null differ
binary files a/gfx/player_title.png /dev/null differ
binary files a/gfx/pokeball.png /dev/null differ
binary files a/gfx/pokecenter_ball.png /dev/null differ
binary files a/gfx/pokedex.png /dev/null differ
binary files /dev/null b/gfx/pokedex/mon_nest_icon.png differ
binary files /dev/null b/gfx/pokedex/pokedex.png differ
binary files a/gfx/pokemon_logo.png /dev/null differ
binary files a/gfx/red/intro_nido_1.png /dev/null differ
binary files a/gfx/red/intro_nido_2.png /dev/null differ
binary files a/gfx/red/intro_nido_3.png /dev/null differ
binary files a/gfx/red/redgreenversion.png /dev/null differ
binary files a/gfx/red/sgbborder.map /dev/null differ
binary files a/gfx/red/sgbborder.png /dev/null differ
binary files a/gfx/red/slotmachine1.png /dev/null differ
binary files a/gfx/red/slotmachine2.png /dev/null differ
binary files a/gfx/red_fishing_tile_back.png /dev/null differ
binary files a/gfx/red_fishing_tile_front.png /dev/null differ
binary files a/gfx/red_fishing_tile_side.png /dev/null differ
binary files a/gfx/red_fishingrod_tiles.png /dev/null differ
binary files /dev/null b/gfx/sgb/blue_border.png differ
binary files /dev/null b/gfx/sgb/blue_border.tilemap differ
binary files /dev/null b/gfx/sgb/red_border.png differ
binary files /dev/null b/gfx/sgb/red_border.tilemap differ
binary files /dev/null b/gfx/slots/blue_slots_1.png differ
binary files /dev/null b/gfx/slots/blue_slots_2.png differ
binary files /dev/null b/gfx/slots/red_slots_1.png differ
binary files /dev/null b/gfx/slots/red_slots_2.png differ
binary files /dev/null b/gfx/slots/slots.tilemap differ
binary files a/gfx/spinner_arrow.png /dev/null differ
binary files a/gfx/ss_anne_smoke_puff.png /dev/null differ
binary files a/gfx/text_box.png /dev/null differ
binary files a/gfx/theend.png /dev/null differ
binary files a/gfx/tilemaps/slotmachine.map /dev/null differ
binary files /dev/null b/gfx/title/blue_version.png differ
binary files /dev/null b/gfx/title/gamefreak_inc.png differ
binary files /dev/null b/gfx/title/player.png differ
binary files /dev/null b/gfx/title/pokemon_logo.png differ
binary files /dev/null b/gfx/title/red_version.png differ
binary files a/gfx/town_map.png /dev/null differ
--- a/gfx/town_map.rle
+++ /dev/null
@@ -1,1 +1,0 @@
-uls�Dlqd�BbQdq�sQtbAbqaQsdqc�a�Ab�a�gqcq�BbqaqasQrQsQCbqaqaqeqcqCbqaqaq��cqcqCbrQaqC�aqcqCa��aqaqaCaQt�B�Baqaq�C�dq�BCaQ��EatCC�qA�B�cqbDD�A��rQsa�DC�q�B�aq�HCaQq����IOE
\ No newline at end of file
binary files /dev/null b/gfx/town_map/town_map.png differ
--- /dev/null
+++ b/gfx/town_map/town_map.rle
@@ -1,0 +1,1 @@
+uls�Dlqd�BbQdq�sQtbAbqaQsdqc�a�Ab�a�gqcq�BbqaqasQrQsQCbqaqaqeqcqCbqaqaq��cqcqCbrQaqC�aqcqCa��aqaqaCaQt�B�Baqaq�C�dq�BCaQ��EatCC�qA�B�cqbDD�A��rQsa�DC�q�B�aq�HCaQq����IOE
\ No newline at end of file
binary files /dev/null b/gfx/town_map/town_map_cursor.png differ
binary files /dev/null b/gfx/town_map/up_arrow.png differ
binary files a/gfx/town_map_cursor.png /dev/null differ
binary files /dev/null b/gfx/trade/cable_ball.png differ
binary files /dev/null b/gfx/trade/game_boy.png differ
binary files /dev/null b/gfx/trade/link_cable.png differ
binary files /dev/null b/gfx/trade/mon_ow_sprites.png differ
binary files a/gfx/trade2.png /dev/null differ
binary files /dev/null b/gfx/trainer_card/badge_numbers.png differ
binary files /dev/null b/gfx/trainer_card/badges.png differ
binary files /dev/null b/gfx/trainer_card/blank_leader_names.png differ
binary files /dev/null b/gfx/trainer_card/circle_tile.png differ
binary files /dev/null b/gfx/trainer_card/trainer_info.png differ
binary files a/gfx/trainer_info.png /dev/null differ
binary files a/gfx/up_arrow.png /dev/null differ
binary files a/gfx/yellow/slotmachine1.png /dev/null differ
binary files a/gfx/yellow/slotmachine2.png /dev/null differ
--- a/main.asm
+++ b/main.asm
@@ -79,27 +79,27 @@
SECTION "Graphics (BANK 4)", ROMX
-PokemonLogoGraphics: INCBIN "gfx/pokemon_logo.2bpp"
-FontGraphics:: INCBIN "gfx/font.1bpp"
+PokemonLogoGraphics: INCBIN "gfx/title/pokemon_logo.2bpp"
+FontGraphics:: INCBIN "gfx/font/font.1bpp"
FontGraphicsEnd::
-ABTiles: INCBIN "gfx/AB.2bpp"
-HpBarAndStatusGraphics:: INCBIN "gfx/hp_bar_and_status.2bpp"
+ABTiles: INCBIN "gfx/font/AB.2bpp"
+HpBarAndStatusGraphics:: INCBIN "gfx/font/font_battle_extra.2bpp"
HpBarAndStatusGraphicsEnd::
-BattleHudTiles1: INCBIN "gfx/battle_hud1.1bpp"
+BattleHudTiles1: INCBIN "gfx/battle/battle_hud_1.1bpp"
BattleHudTiles1End:
-BattleHudTiles2: INCBIN "gfx/battle_hud2.1bpp"
-BattleHudTiles3: INCBIN "gfx/battle_hud3.1bpp"
+BattleHudTiles2: INCBIN "gfx/battle/battle_hud_2.1bpp"
+BattleHudTiles3: INCBIN "gfx/battle/battle_hud_3.1bpp"
BattleHudTiles3End:
-NintendoCopyrightLogoGraphics: INCBIN "gfx/copyright.2bpp"
-GamefreakLogoGraphics: INCBIN "gfx/gamefreak.2bpp"
+NintendoCopyrightLogoGraphics: INCBIN "gfx/intro_credits/copyright.2bpp"
+GamefreakLogoGraphics: INCBIN "gfx/title/gamefreak_inc.2bpp"
GamefreakLogoGraphicsEnd:
-TextBoxGraphics:: INCBIN "gfx/text_box.2bpp"
+TextBoxGraphics:: INCBIN "gfx/font/font_extra.2bpp"
TextBoxGraphicsEnd::
-PokedexTileGraphics: INCBIN "gfx/pokedex.2bpp"
+PokedexTileGraphics: INCBIN "gfx/pokedex/pokedex.2bpp"
PokedexTileGraphicsEnd:
-WorldMapTileGraphics: INCBIN "gfx/town_map.2bpp"
+WorldMapTileGraphics: INCBIN "gfx/town_map/town_map.2bpp"
WorldMapTileGraphicsEnd:
-PlayerCharacterTitleGraphics: INCBIN "gfx/player_title.2bpp"
+PlayerCharacterTitleGraphics: INCBIN "gfx/title/player.2bpp"
PlayerCharacterTitleGraphicsEnd:
@@ -176,11 +176,11 @@
INCLUDE "engine/battle/display_effectiveness.asm"
-TrainerInfoTextBoxTileGraphics: INCBIN "gfx/trainer_info.2bpp"
+TrainerInfoTextBoxTileGraphics: INCBIN "gfx/trainer_card/trainer_info.2bpp"
TrainerInfoTextBoxTileGraphicsEnd:
-BlankLeaderNames: INCBIN "gfx/blank_leader_names.2bpp"
-CircleTile: INCBIN "gfx/circle_tile.2bpp"
-BadgeNumbersTileGraphics: INCBIN "gfx/badge_numbers.2bpp"
+BlankLeaderNames: INCBIN "gfx/trainer_card/blank_leader_names.2bpp"
+CircleTile: INCBIN "gfx/trainer_card/circle_tile.2bpp"
+BadgeNumbersTileGraphics: INCBIN "gfx/trainer_card/badge_numbers.2bpp"
INCLUDE "engine/items/tmhm.asm"
INCLUDE "engine/battle/scale_sprites.asm"
@@ -215,12 +215,12 @@
INCLUDE "engine/battle/draw_hud_pokeball_gfx.asm"
TradingAnimationGraphics:
-INCBIN "gfx/game_boy.2bpp"
-INCBIN "gfx/link_cable.2bpp"
+INCBIN "gfx/trade/game_boy.2bpp"
+INCBIN "gfx/trade/link_cable.2bpp"
TradingAnimationGraphicsEnd:
; Pokeball traveling through the link cable.
-TradingAnimationGraphics2: INCBIN "gfx/trade2.2bpp"
+TradingAnimationGraphics2: INCBIN "gfx/trade/cable_ball.2bpp"
TradingAnimationGraphics2End:
INCLUDE "engine/evos_moves.asm"
@@ -323,10 +323,10 @@
Version_GFX:
IF DEF(_RED)
- INCBIN "gfx/red/redgreenversion.1bpp" ; 10 tiles
+ INCBIN "gfx/title/red_version.1bpp" ; 10 tiles
ENDC
IF DEF(_BLUE)
- INCBIN "gfx/blue/blueversion.1bpp" ; 8 tiles
+ INCBIN "gfx/title/blue_version.1bpp" ; 8 tiles
ENDC
Version_GFXEnd:
@@ -370,10 +370,10 @@
INCLUDE "engine/overworld/cut2.asm"
INCLUDE "engine/overworld/ssanne.asm"
-RedFishingTilesFront: INCBIN "gfx/red_fishing_tile_front.2bpp"
-RedFishingTilesBack: INCBIN "gfx/red_fishing_tile_back.2bpp"
-RedFishingTilesSide: INCBIN "gfx/red_fishing_tile_side.2bpp"
-RedFishingRodTiles: INCBIN "gfx/red_fishingrod_tiles.2bpp"
+RedFishingTilesFront: INCBIN "gfx/overworld/red_fish_front.2bpp"
+RedFishingTilesBack: INCBIN "gfx/overworld/red_fish_back.2bpp"
+RedFishingTilesSide: INCBIN "gfx/overworld/red_fish_side.2bpp"
+RedFishingRodTiles: INCBIN "gfx/overworld/fishing_rod.2bpp"
INCLUDE "data/animations.asm"
INCLUDE "engine/evolution.asm"
--- a/scripts/RocketHideoutB2F.asm
+++ b/scripts/RocketHideoutB2F.asm
@@ -411,7 +411,7 @@
; these tiles are the animation for the tiles that push the player in dungeons like Rocket HQ
SpinnerArrowAnimTiles:
- INCBIN "gfx/spinner_arrow.2bpp"
+ INCBIN "gfx/overworld/spinners.2bpp"
RocketHideoutB2F_TextPointers:
dw RocketHideout2Text1
--- a/tilesets.asm
+++ b/tilesets.asm
@@ -5,7 +5,7 @@
RedsHouse1_GFX::
RedsHouse2_GFX:: INCBIN "gfx/tilesets/reds_house.2bpp"
- ds 16
+ ds 16, $00 ; blank tile
RedsHouse1_Block::
RedsHouse2_Block:: INCBIN "gfx/blocksets/reds_house.bst"