summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi@gmail.com>2018-05-30 12:00:34 -0400
committerRangi <remy.oukaour+rangi@gmail.com>2018-05-30 12:00:34 -0400
commit3c6e9ccabc31a60aaa0563009aaeb16ff5bacb03 (patch)
treeabce978ad44ff1a5de23dde7b732767efd9600b3
parent6ef9138b8a6c41c66c15e6b98a06f81002d22718 (diff)
Organize graphics like pokecrystal
-rw-r--r--Makefile16
-rw-r--r--gfx/battle/exp_bar.png (renamed from gfx/exp_bar.png)bin104 -> 104 bytes
-rw-r--r--gfx/battle/hp_exp_bar_border.png (renamed from gfx/battle_hud_2.png)bin140 -> 140 bytes
-rw-r--r--gfx/battle_anims/attack_animations.png (renamed from gfx/attack_animations.png)bin5822 -> 5822 bytes
-rw-r--r--gfx/emotion_bubbles.pngbin149 -> 0 bytes
-rw-r--r--gfx/fire_notes.pngbin228 -> 0 bytes
-rw-r--r--gfx/font/alphabet.png (renamed from gfx/alphabet.png)bin401 -> 401 bytes
-rw-r--r--gfx/font/annon_alphabet.png (renamed from gfx/annon_alphabet.png)bin285 -> 285 bytes
-rw-r--r--gfx/font/font.png (renamed from gfx/font.png)bin2071 -> 2071 bytes
-rw-r--r--gfx/font/font_battle_extra.png (renamed from gfx/battle_hud_1.png)bin279 -> 279 bytes
-rw-r--r--gfx/font/font_extra.png (renamed from gfx/font_extra.png)bin287 -> 287 bytes
-rw-r--r--gfx/font/gfx_f9322.png (renamed from gfx/gfx_f9322.png)bin90 -> 90 bytes
-rw-r--r--gfx/frames/frames.png (renamed from gfx/text_box_borders.png)bin330 -> 330 bytes
-rw-r--r--gfx/hud/hud.png (renamed from gfx/gfx_f8fc2.png)bin156 -> 156 bytes
-rw-r--r--gfx/icons/mail.png (renamed from gfx/mail.png)bin135 -> 135 bytes
-rw-r--r--gfx/icons/mon_icons.png (renamed from gfx/mon_party_sprites.png)bin2202 -> 2202 bytes
-rw-r--r--gfx/intro/forest.png (renamed from gfx/intro_forest.png)bin630 -> 630 bytes
-rw-r--r--gfx/intro/fushigibana.png (renamed from gfx/intro_fushigibana.png)bin610 -> 610 bytes
-rw-r--r--gfx/intro/kamex.png (renamed from gfx/intro_kamekkusu.png)bin548 -> 548 bytes
-rw-r--r--gfx/intro/lizardon_1.png (renamed from gfx/intro_rizado_1.png)bin772 -> 772 bytes
-rw-r--r--gfx/intro/lizardon_2.png (renamed from gfx/intro_rizado_2.png)bin796 -> 796 bytes
-rw-r--r--gfx/intro/lizardon_3.png (renamed from gfx/intro_rizado_3.png)bin872 -> 872 bytes
-rw-r--r--gfx/intro/lizardon_flames.png (renamed from gfx/intro_rizado_flames.png)bin229 -> 229 bytes
-rw-r--r--gfx/intro/purin_pikachu.png (renamed from gfx/intro_purin_pika.png)bin1388 -> 1388 bytes
-rw-r--r--gfx/intro/underwater.png (renamed from gfx/intro_underwater.png)bin1157 -> 1157 bytes
-rw-r--r--gfx/intro/water_pokemon.png (renamed from gfx/intro_water_pokemon.png)bin1288 -> 1288 bytes
-rw-r--r--gfx/minigames/15_puzzle.png (renamed from gfx/15_puzzle.png)bin409 -> 409 bytes
-rw-r--r--gfx/minigames/matches.png (renamed from gfx/matches.png)bin445 -> 445 bytes
-rw-r--r--gfx/minigames/picross.png (renamed from gfx/picross.png)bin336 -> 336 bytes
-rw-r--r--gfx/minigames/picross_cursor.png (renamed from gfx/picross_cursor.png)bin77 -> 77 bytes
-rw-r--r--gfx/minigames/poker.png (renamed from gfx/poker.png)bin1124 -> 1124 bytes
-rw-r--r--gfx/minigames/slots.png (renamed from gfx/slot_machine.png)bin469 -> 469 bytes
-rw-r--r--gfx/minigames/slots_2.png (renamed from gfx/slot_machine_2.png)bin1278 -> 1278 bytes
-rw-r--r--gfx/overworld/gfx_84bf.png (renamed from gfx/gfx_84bf.png)bin140 -> 140 bytes
-rw-r--r--gfx/overworld/shadow.png (renamed from gfx/ledge_hopping_shadow.png)bin84 -> 84 bytes
-rw-r--r--gfx/pack/pack_icons.png (renamed from gfx/pack_icons.png)bin237 -> 237 bytes
-rw-r--r--gfx/pokedex/buttons.png (renamed from gfx/pokedex_buttons.png)bin541 -> 541 bytes
-rw-r--r--gfx/pokedex/cursors.png (renamed from gfx/pokedex_cursors.png)bin113 -> 113 bytes
-rw-r--r--gfx/pokedex/m_kg.png (renamed from gfx/m_kg.png)bin104 -> 104 bytes
-rw-r--r--gfx/pokedex/poke_ball.png (renamed from gfx/pokedex_pokeball.png)bin89 -> 89 bytes
-rw-r--r--gfx/pokedex/pokedex.png (renamed from gfx/pokedex.png)bin145 -> 145 bytes
-rw-r--r--gfx/pokedex/search.png (renamed from gfx/gfx_44745.png)bin346 -> 346 bytes
-rw-r--r--gfx/pokegear/dexmap_nest_icon.png (renamed from gfx/mon_nest_icon.png)bin86 -> 86 bytes
-rw-r--r--gfx/pokegear/pokegear.png (renamed from gfx/pokegear.png)bin420 -> 420 bytes
-rw-r--r--gfx/pokegear/town_map.png (renamed from gfx/town_map.png)bin394 -> 394 bytes
-rw-r--r--gfx/pokegear/town_map_cursor.png (renamed from gfx/town_map_cursor.png)bin93 -> 93 bytes
-rw-r--r--gfx/sgb/sgb_border.png (renamed from gfx/sgb_border.png)bin589 -> 589 bytes
-rw-r--r--gfx/sgb/sgb_border_alt.png (renamed from gfx/sgb_border_alt.png)bin608 -> 608 bytes
-rw-r--r--gfx/splash/game_freak_logo.png (renamed from gfx/gamefreak_logo.png)bin270 -> 270 bytes
-rw-r--r--gfx/splash/game_freak_logo_oam.png (renamed from gfx/gamefreak_logo_oam.png)bin143 -> 143 bytes
-rw-r--r--gfx/stats/separator.png (renamed from gfx/status_screen_separator.png)bin75 -> 75 bytes
-rw-r--r--gfx/stats/stats.png (renamed from gfx/status_screen.png)bin204 -> 204 bytes
-rw-r--r--gfx/title/title.png (renamed from gfx/titlescreen.png)bin1511 -> 1511 bytes
-rw-r--r--gfx/trade/gameboy.png (renamed from gfx/gameboy.png)bin427 -> 427 bytes
-rw-r--r--gfx/trainer_card/leaders.png (renamed from gfx/leader_faces_names.png)bin317 -> 317 bytes
-rw-r--r--gfx/trainer_card/trainer_card.png (renamed from gfx/trainer_card.png)bin619 -> 619 bytes
-rw-r--r--gfx/trainer_card/unused_leader_name.png (renamed from gfx/unused_leader_name.png)bin92 -> 92 bytes
-rw-r--r--main.asm178
58 files changed, 123 insertions, 71 deletions
diff --git a/Makefile b/Makefile
index 344662b..f88940a 100644
--- a/Makefile
+++ b/Makefile
@@ -44,13 +44,13 @@ clean:
rm -rf $(ROMS) $(OBJS) $(ROMS:.gb=.sym) build/* shim.asm
find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' -o -iname '*.pcm' \) -exec rm {} +
-gfx/sgb_border_alt.2bpp: tools/gfx += --trim-whitespace
-gfx/sgb_border.2bpp: tools/gfx += --trim-whitespace
-gfx/titlescreen.2bpp: tools/gfx += --trim-whitespace
-gfx/leader_faces_names.2bpp: tools/gfx += --trim-whitespace
-gfx/slot_machine.2bpp: tools/gfx += --trim-whitespace
-gfx/poker.2bpp: tools/gfx += --trim-whitespace
-gfx/intro_purin_pika.2bpp: tools/gfx += --trim-whitespace
+gfx/sgb/sgb_border_alt.2bpp: tools/gfx += --trim-whitespace
+gfx/sgb/sgb_border.2bpp: tools/gfx += --trim-whitespace
+gfx/title/title.2bpp: tools/gfx += --trim-whitespace
+gfx/trainer_card/leaders.2bpp: tools/gfx += --trim-whitespace
+gfx/minigames/slots.2bpp: tools/gfx += --trim-whitespace
+gfx/minigames/poker.2bpp: tools/gfx += --trim-whitespace
+gfx/intro/purin_pikachu.2bpp: tools/gfx += --trim-whitespace
%.2bpp: %.png
rgbgfx -o $@ $<
@@ -66,4 +66,4 @@ gfx/intro_purin_pika.2bpp: tools/gfx += --trim-whitespace
rgbgfx -t $@ $<
%.pic: %.2bpp
- tools/pkmncompress $< $@ \ No newline at end of file
+ tools/pkmncompress $< $@
diff --git a/gfx/exp_bar.png b/gfx/battle/exp_bar.png
index 304d62d..304d62d 100644
--- a/gfx/exp_bar.png
+++ b/gfx/battle/exp_bar.png
Binary files differ
diff --git a/gfx/battle_hud_2.png b/gfx/battle/hp_exp_bar_border.png
index b2017a5..b2017a5 100644
--- a/gfx/battle_hud_2.png
+++ b/gfx/battle/hp_exp_bar_border.png
Binary files differ
diff --git a/gfx/attack_animations.png b/gfx/battle_anims/attack_animations.png
index 96e60c2..96e60c2 100644
--- a/gfx/attack_animations.png
+++ b/gfx/battle_anims/attack_animations.png
Binary files differ
diff --git a/gfx/emotion_bubbles.png b/gfx/emotion_bubbles.png
deleted file mode 100644
index 31deacf..0000000
--- a/gfx/emotion_bubbles.png
+++ /dev/null
Binary files differ
diff --git a/gfx/fire_notes.png b/gfx/fire_notes.png
deleted file mode 100644
index 5e5fcd0..0000000
--- a/gfx/fire_notes.png
+++ /dev/null
Binary files differ
diff --git a/gfx/alphabet.png b/gfx/font/alphabet.png
index 6e73442..6e73442 100644
--- a/gfx/alphabet.png
+++ b/gfx/font/alphabet.png
Binary files differ
diff --git a/gfx/annon_alphabet.png b/gfx/font/annon_alphabet.png
index 4fd46d4..4fd46d4 100644
--- a/gfx/annon_alphabet.png
+++ b/gfx/font/annon_alphabet.png
Binary files differ
diff --git a/gfx/font.png b/gfx/font/font.png
index 15aa6de..15aa6de 100644
--- a/gfx/font.png
+++ b/gfx/font/font.png
Binary files differ
diff --git a/gfx/battle_hud_1.png b/gfx/font/font_battle_extra.png
index 7c3f7ee..7c3f7ee 100644
--- a/gfx/battle_hud_1.png
+++ b/gfx/font/font_battle_extra.png
Binary files differ
diff --git a/gfx/font_extra.png b/gfx/font/font_extra.png
index d0eb38f..d0eb38f 100644
--- a/gfx/font_extra.png
+++ b/gfx/font/font_extra.png
Binary files differ
diff --git a/gfx/gfx_f9322.png b/gfx/font/gfx_f9322.png
index e386063..e386063 100644
--- a/gfx/gfx_f9322.png
+++ b/gfx/font/gfx_f9322.png
Binary files differ
diff --git a/gfx/text_box_borders.png b/gfx/frames/frames.png
index 9cc73b9..9cc73b9 100644
--- a/gfx/text_box_borders.png
+++ b/gfx/frames/frames.png
Binary files differ
diff --git a/gfx/gfx_f8fc2.png b/gfx/hud/hud.png
index 54195df..54195df 100644
--- a/gfx/gfx_f8fc2.png
+++ b/gfx/hud/hud.png
Binary files differ
diff --git a/gfx/mail.png b/gfx/icons/mail.png
index 7ad25ed..7ad25ed 100644
--- a/gfx/mail.png
+++ b/gfx/icons/mail.png
Binary files differ
diff --git a/gfx/mon_party_sprites.png b/gfx/icons/mon_icons.png
index 24f970d..24f970d 100644
--- a/gfx/mon_party_sprites.png
+++ b/gfx/icons/mon_icons.png
Binary files differ
diff --git a/gfx/intro_forest.png b/gfx/intro/forest.png
index 2f97b65..2f97b65 100644
--- a/gfx/intro_forest.png
+++ b/gfx/intro/forest.png
Binary files differ
diff --git a/gfx/intro_fushigibana.png b/gfx/intro/fushigibana.png
index 784a1c0..784a1c0 100644
--- a/gfx/intro_fushigibana.png
+++ b/gfx/intro/fushigibana.png
Binary files differ
diff --git a/gfx/intro_kamekkusu.png b/gfx/intro/kamex.png
index 255ca08..255ca08 100644
--- a/gfx/intro_kamekkusu.png
+++ b/gfx/intro/kamex.png
Binary files differ
diff --git a/gfx/intro_rizado_1.png b/gfx/intro/lizardon_1.png
index 0aa062c..0aa062c 100644
--- a/gfx/intro_rizado_1.png
+++ b/gfx/intro/lizardon_1.png
Binary files differ
diff --git a/gfx/intro_rizado_2.png b/gfx/intro/lizardon_2.png
index a3e7ff3..a3e7ff3 100644
--- a/gfx/intro_rizado_2.png
+++ b/gfx/intro/lizardon_2.png
Binary files differ
diff --git a/gfx/intro_rizado_3.png b/gfx/intro/lizardon_3.png
index be9e22a..be9e22a 100644
--- a/gfx/intro_rizado_3.png
+++ b/gfx/intro/lizardon_3.png
Binary files differ
diff --git a/gfx/intro_rizado_flames.png b/gfx/intro/lizardon_flames.png
index 2b99a62..2b99a62 100644
--- a/gfx/intro_rizado_flames.png
+++ b/gfx/intro/lizardon_flames.png
Binary files differ
diff --git a/gfx/intro_purin_pika.png b/gfx/intro/purin_pikachu.png
index eab3c2d..eab3c2d 100644
--- a/gfx/intro_purin_pika.png
+++ b/gfx/intro/purin_pikachu.png
Binary files differ
diff --git a/gfx/intro_underwater.png b/gfx/intro/underwater.png
index fc446fd..fc446fd 100644
--- a/gfx/intro_underwater.png
+++ b/gfx/intro/underwater.png
Binary files differ
diff --git a/gfx/intro_water_pokemon.png b/gfx/intro/water_pokemon.png
index f7caa9b..f7caa9b 100644
--- a/gfx/intro_water_pokemon.png
+++ b/gfx/intro/water_pokemon.png
Binary files differ
diff --git a/gfx/15_puzzle.png b/gfx/minigames/15_puzzle.png
index 70c1078..70c1078 100644
--- a/gfx/15_puzzle.png
+++ b/gfx/minigames/15_puzzle.png
Binary files differ
diff --git a/gfx/matches.png b/gfx/minigames/matches.png
index e0f1d32..e0f1d32 100644
--- a/gfx/matches.png
+++ b/gfx/minigames/matches.png
Binary files differ
diff --git a/gfx/picross.png b/gfx/minigames/picross.png
index 37f7e62..37f7e62 100644
--- a/gfx/picross.png
+++ b/gfx/minigames/picross.png
Binary files differ
diff --git a/gfx/picross_cursor.png b/gfx/minigames/picross_cursor.png
index efee734..efee734 100644
--- a/gfx/picross_cursor.png
+++ b/gfx/minigames/picross_cursor.png
Binary files differ
diff --git a/gfx/poker.png b/gfx/minigames/poker.png
index 00218f7..00218f7 100644
--- a/gfx/poker.png
+++ b/gfx/minigames/poker.png
Binary files differ
diff --git a/gfx/slot_machine.png b/gfx/minigames/slots.png
index 44993f6..44993f6 100644
--- a/gfx/slot_machine.png
+++ b/gfx/minigames/slots.png
Binary files differ
diff --git a/gfx/slot_machine_2.png b/gfx/minigames/slots_2.png
index cae4177..cae4177 100644
--- a/gfx/slot_machine_2.png
+++ b/gfx/minigames/slots_2.png
Binary files differ
diff --git a/gfx/gfx_84bf.png b/gfx/overworld/gfx_84bf.png
index 709f347..709f347 100644
--- a/gfx/gfx_84bf.png
+++ b/gfx/overworld/gfx_84bf.png
Binary files differ
diff --git a/gfx/ledge_hopping_shadow.png b/gfx/overworld/shadow.png
index ba3dab5..ba3dab5 100644
--- a/gfx/ledge_hopping_shadow.png
+++ b/gfx/overworld/shadow.png
Binary files differ
diff --git a/gfx/pack_icons.png b/gfx/pack/pack_icons.png
index 5dc1a41..5dc1a41 100644
--- a/gfx/pack_icons.png
+++ b/gfx/pack/pack_icons.png
Binary files differ
diff --git a/gfx/pokedex_buttons.png b/gfx/pokedex/buttons.png
index f6669f5..f6669f5 100644
--- a/gfx/pokedex_buttons.png
+++ b/gfx/pokedex/buttons.png
Binary files differ
diff --git a/gfx/pokedex_cursors.png b/gfx/pokedex/cursors.png
index 265a41f..265a41f 100644
--- a/gfx/pokedex_cursors.png
+++ b/gfx/pokedex/cursors.png
Binary files differ
diff --git a/gfx/m_kg.png b/gfx/pokedex/m_kg.png
index e26dada..e26dada 100644
--- a/gfx/m_kg.png
+++ b/gfx/pokedex/m_kg.png
Binary files differ
diff --git a/gfx/pokedex_pokeball.png b/gfx/pokedex/poke_ball.png
index 8c198cb..8c198cb 100644
--- a/gfx/pokedex_pokeball.png
+++ b/gfx/pokedex/poke_ball.png
Binary files differ
diff --git a/gfx/pokedex.png b/gfx/pokedex/pokedex.png
index 143835e..143835e 100644
--- a/gfx/pokedex.png
+++ b/gfx/pokedex/pokedex.png
Binary files differ
diff --git a/gfx/gfx_44745.png b/gfx/pokedex/search.png
index 5b35c7a..5b35c7a 100644
--- a/gfx/gfx_44745.png
+++ b/gfx/pokedex/search.png
Binary files differ
diff --git a/gfx/mon_nest_icon.png b/gfx/pokegear/dexmap_nest_icon.png
index 87c644d..87c644d 100644
--- a/gfx/mon_nest_icon.png
+++ b/gfx/pokegear/dexmap_nest_icon.png
Binary files differ
diff --git a/gfx/pokegear.png b/gfx/pokegear/pokegear.png
index 2c8d3e9..2c8d3e9 100644
--- a/gfx/pokegear.png
+++ b/gfx/pokegear/pokegear.png
Binary files differ
diff --git a/gfx/town_map.png b/gfx/pokegear/town_map.png
index 7889b09..7889b09 100644
--- a/gfx/town_map.png
+++ b/gfx/pokegear/town_map.png
Binary files differ
diff --git a/gfx/town_map_cursor.png b/gfx/pokegear/town_map_cursor.png
index 9eea705..9eea705 100644
--- a/gfx/town_map_cursor.png
+++ b/gfx/pokegear/town_map_cursor.png
Binary files differ
diff --git a/gfx/sgb_border.png b/gfx/sgb/sgb_border.png
index 2fda111..2fda111 100644
--- a/gfx/sgb_border.png
+++ b/gfx/sgb/sgb_border.png
Binary files differ
diff --git a/gfx/sgb_border_alt.png b/gfx/sgb/sgb_border_alt.png
index 054ab48..054ab48 100644
--- a/gfx/sgb_border_alt.png
+++ b/gfx/sgb/sgb_border_alt.png
Binary files differ
diff --git a/gfx/gamefreak_logo.png b/gfx/splash/game_freak_logo.png
index 8883d51..8883d51 100644
--- a/gfx/gamefreak_logo.png
+++ b/gfx/splash/game_freak_logo.png
Binary files differ
diff --git a/gfx/gamefreak_logo_oam.png b/gfx/splash/game_freak_logo_oam.png
index 3341412..3341412 100644
--- a/gfx/gamefreak_logo_oam.png
+++ b/gfx/splash/game_freak_logo_oam.png
Binary files differ
diff --git a/gfx/status_screen_separator.png b/gfx/stats/separator.png
index b847b97..b847b97 100644
--- a/gfx/status_screen_separator.png
+++ b/gfx/stats/separator.png
Binary files differ
diff --git a/gfx/status_screen.png b/gfx/stats/stats.png
index 84aa59c..84aa59c 100644
--- a/gfx/status_screen.png
+++ b/gfx/stats/stats.png
Binary files differ
diff --git a/gfx/titlescreen.png b/gfx/title/title.png
index 1b6ba5d..1b6ba5d 100644
--- a/gfx/titlescreen.png
+++ b/gfx/title/title.png
Binary files differ
diff --git a/gfx/gameboy.png b/gfx/trade/gameboy.png
index 0788ba4..0788ba4 100644
--- a/gfx/gameboy.png
+++ b/gfx/trade/gameboy.png
Binary files differ
diff --git a/gfx/leader_faces_names.png b/gfx/trainer_card/leaders.png
index dceb21f..dceb21f 100644
--- a/gfx/leader_faces_names.png
+++ b/gfx/trainer_card/leaders.png
Binary files differ
diff --git a/gfx/trainer_card.png b/gfx/trainer_card/trainer_card.png
index 8fa51d1..8fa51d1 100644
--- a/gfx/trainer_card.png
+++ b/gfx/trainer_card/trainer_card.png
Binary files differ
diff --git a/gfx/unused_leader_name.png b/gfx/trainer_card/unused_leader_name.png
index daff9f5..daff9f5 100644
--- a/gfx/unused_leader_name.png
+++ b/gfx/trainer_card/unused_leader_name.png
Binary files differ
diff --git a/main.asm b/main.asm
index 58da46e..2ada8ec 100644
--- a/main.asm
+++ b/main.asm
@@ -7,8 +7,10 @@ SECTION "Title screen", ROMX[$5D8C],BANK[$01]
INCLUDE "engine/title.asm"
SECTION "Title Screen Sprites", ROMX[$5EB8], BANK[$01]
-TitleFlameNoteGfx::
- INCBIN "gfx/fire_notes.2bpp"
+TitleFireGFX::
+INCBIN "gfx/title/fire.2bpp"
+TitleNotesGFX::
+INCBIN "gfx/title/notes.2bpp"
SECTION "Predef pointers", ROMX[$62B0],BANK[$01]
INCLUDE "engine/predef.asm"
@@ -36,40 +38,57 @@ MainMenuStrings: ; 01:5428
db "じかんセット@"
; 01:5457
-SECTION "Nest Icon", ROMX[$4A0F], BANK[$02]
- INCBIN "gfx/mon_nest_icon.1bpp"
+SECTION "Mon Nest Icon", ROMX[$4A0F], BANK[$02]
+PokedexNestIconGFX::
+INCBIN "gfx/pokegear/dexmap_nest_icon.1bpp"
SECTION "Bank 2 Misc GFX", ROMX[$44bf], BANK[$02]
- INCBIN "gfx/gfx_84bf.2bpp"
- INCBIN "gfx/ledge_hopping_shadow.2bpp"
- INCBIN "gfx/emotion_bubbles.2bpp"
+INCBIN "gfx/overworld/gfx_84bf.2bpp"
+JumpShadowGFX::
+INCBIN "gfx/overworld/shadow.2bpp"
+ShockEmoteGFX::
+INCBIN "gfx/overworld/shock.2bpp"
+QuestionEmoteGFX::
+INCBIN "gfx/overworld/question.2bpp"
+HappyEmoteGFX::
+INCBIN "gfx/overworld/happy.2bpp"
SECTION "Pokegear GFX", ROMX[$4F32], BANK[$02]
- INCBIN "gfx/pokegear.2bpp"
+PokegearGFX::
+INCBIN "gfx/pokegear/pokegear.2bpp"
SECTION "Unused SGB Border GFX", ROMX[$62CC], BANK[$02]
- INCBIN "gfx/sgb_border_alt.2bpp"
+UnusedSGBBorderGFX::
+INCBIN "gfx/sgb/sgb_border_alt.2bpp"
SECTION "SGB Border GFX", ROMX[$6B1C], BANK[$02]
- INCBIN "gfx/sgb_border.2bpp"
+SGBBorderGFX::
+INCBIN "gfx/sgb/sgb_border.2bpp"
SECTION "Title Screen GFX", ROMX[$47CF], BANK[$04]
- INCBIN "gfx/titlescreen.2bpp"
+TitleScreenGFX::
+INCBIN "gfx/title/title.2bpp"
SECTION "Mail Icon GFX", ROMX[$5BB1], BANK[$04]
- INCBIN "gfx/mail.2bpp"
+MailIconGFX::
+INCBIN "gfx/icons/mail.2bpp"
SECTION "TM/HM Moves", ROMX[$52D1],BANK[$04]
INCLUDE "data/moves/tmhm_moves.asm"
SECTION "Trainer Card GFX", ROMX[$7171], BANK[$04]
- INCBIN "gfx/trainer_card.2bpp"
- INCBIN "gfx/leader_faces_names.2bpp"
+TrainerCardGFX::
+INCBIN "gfx/trainer_card/trainer_card.2bpp"
+TrainerCardLeadersGFX::
+INCBIN "gfx/trainer_card/leaders.2bpp"
+
SECTION "Unused Leader", ROMX[$7BA3], BANK[$04]
- INCBIN "gfx/unused_leader_name.2bpp"
+UnusedLeaderNameGFX::
+INCBIN "gfx/trainer_card/unused_leader_name.2bpp"
SECTION "Gameboy GFX", ROMX[$5641], BANK[$0A]
- INCBIN "gfx/gameboy.2bpp"
+TradeGameBoyGFX::
+INCBIN "gfx/trade/gameboy.2bpp"
SECTION "Type Matchups", ROMX[$506D],BANK[$0D]
INCLUDE "data/types/type_matchups.asm"
@@ -83,10 +102,14 @@ SECTION "Evolutions and Attacks", ROMX[$6493],BANK[$10]
INCLUDE "data/pokemon/evos_attacks.asm"
SECTION "Pokedex GFX", ROMX[$40D5], BANK[$11]
- INCBIN "gfx/pokedex_buttons.2bpp"
- INCBIN "gfx/pokedex_pokeball.2bpp"
- INCBIN "gfx/pokedex_cursors.2bpp"
- INCBIN "gfx/gfx_44745.2bpp"
+PokedexButtonsGFX::
+INCBIN "gfx/pokedex/buttons.2bpp"
+PokedexPokeBallGFX::
+INCBIN "gfx/pokedex/poke_ball.2bpp"
+PokedexCursorsGFX::
+INCBIN "gfx/pokedex/cursors.2bpp"
+PokedexSearchGFX::
+INCBIN "gfx/pokedex/search.2bpp"
SECTION "Base Data", ROMX[$4F10],BANK[$14]
INCLUDE "data/pokemon/base_stats.asm"
@@ -101,70 +124,99 @@ INCLUDE "gfx/pokemon/annon_pic_ptrs.asm"
INCLUDE "gfx/pokemon/annon_pics.asm"
SECTION "Attack Animation GFX", ROMX[$4000], BANK[$21]
- INCBIN "gfx/attack_animations.2bpp"
+INCBIN "gfx/battle_anims/attack_animations.2bpp"
SECTION "Pokemon Party Sprites", ROMX[$60CC], BANK[$23]
- INCBIN "gfx/mon_party_sprites.2bpp"
+INCBIN "gfx/icons/mon_icons.2bpp"
SECTION "Slot Machine GFX", ROMX[$4FDB], BANK[$24]
- INCBIN "gfx/slot_machine.2bpp"
- INCBIN "gfx/slot_machine_2.2bpp"
+SlotMachineGFX::
+INCBIN "gfx/minigames/slots.2bpp"
+SlotMachine2GFX::
+INCBIN "gfx/minigames/slots_2.2bpp"
SECTION "Poker GFX", ROMX[$5403], BANK[$38]
- INCBIN "gfx/poker.2bpp"
+PokerGFX::
+INCBIN "gfx/minigames/poker.2bpp"
SECTION "15 Puzzle GFX", ROMX[$5F93], BANK[$38]
- INCBIN "gfx/15_puzzle.2bpp"
+FifteenPuzzleGFX::
+INCBIN "gfx/minigames/15_puzzle.2bpp"
SECTION "Matches GFX", ROMX[$6606], BANK[$38]
- INCBIN "gfx/matches.2bpp"
+MemoryGameGFX::
+INCBIN "gfx/minigames/matches.2bpp"
SECTION "Picross GFX", ROMX[$75B7], BANK[$38]
- INCBIN "gfx/picross.2bpp"
- INCBIN "gfx/picross_cursor.2bpp"
+PicrossGFX::
+INCBIN "gfx/minigames/picross.2bpp"
+PicrossCursorGFX::
+INCBIN "gfx/minigames/picross_cursor.2bpp"
SECTION "Gamefreak Logo GFX", ROMX[$41FF], BANK[$39]
- INCBIN "gfx/gamefreak_logo.1bpp"
- INCBIN "gfx/gamefreak_logo_oam.2bpp"
+GameFreakLogoGFX::
+INCBIN "gfx/splash/game_freak_logo.1bpp"
+GameFreakLogoSparkleGFX::
+INCBIN "gfx/splash/game_freak_logo_oam.2bpp"
SECTION "Intro Underwater GFX", ROMX[$4ADF], BANK[$39]
- INCBIN "gfx/intro_underwater.2bpp"
+IntroUnderwaterGFX::
+INCBIN "gfx/intro/underwater.2bpp"
SECTION "Intro Water Mon and Forest GFX", ROMX[$55EF], BANK[$39]
- INCBIN "gfx/intro_water_pokemon.2bpp"
- INCBIN "gfx/intro_forest.2bpp"
+IntroWaterPokemonGFX::
+INCBIN "gfx/intro/water_pokemon.2bpp"
+IntroForestGFX::
+INCBIN "gfx/intro/forest.2bpp"
SECTION "Intro Mon", ROMX[$626F], BANK[$39]
- INCBIN "gfx/intro_purin_pika.2bpp"
- INCBIN "gfx/intro_rizado_1.2bpp"
- INCBIN "gfx/intro_rizado_2.2bpp"
- INCBIN "gfx/intro_rizado_3.2bpp"
- INCBIN "gfx/intro_rizado_flames.2bpp"
- INCBIN "gfx/intro_kamekkusu.2bpp"
- INCBIN "gfx/intro_fushigibana.2bpp"
+IntroPurinPikachuGFX::
+INCBIN "gfx/intro/purin_pikachu.2bpp"
+IntroLizardon1GFX::
+INCBIN "gfx/intro/lizardon_1.2bpp"
+IntroLizardon2GFX::
+INCBIN "gfx/intro/lizardon_2.2bpp"
+IntroLizardon3GFX::
+INCBIN "gfx/intro/lizardon_3.2bpp"
+IntroLizardonFlamesGFX::
+INCBIN "gfx/intro/lizardon_flames.2bpp"
+IntroKamexGFX::
+INCBIN "gfx/intro/kamex.2bpp"
+IntroFushigibanaGFX::
+INCBIN "gfx/intro/fushigibana.2bpp"
SECTION "Misc GFX", ROMX[$4162], BANK[$3E]
-FontExtraGfx::
- INCBIN "gfx/font_extra.2bpp"
- INCBIN "gfx/font.1bpp"
-FontBattleExtraGfx::
- INCBIN "gfx/battle_hud_1.2bpp"
-BorderGfx::
- INCBIN "gfx/text_box_borders.1bpp"
- INCBIN "gfx/status_screen_separator.2bpp"
- INCBIN "gfx/status_screen.2bpp"
- INCBIN "gfx/battle_hud_2.1bpp"
- INCBIN "gfx/exp_bar.2bpp"
- INCBIN "gfx/m_kg.2bpp"
- INCBIN "gfx/pokedex.2bpp"
- INCBIN "gfx/town_map.2bpp"
- INCBIN "gfx/gfx_f8fc2.2bpp"
-BoldFontGfx::
- INCBIN "gfx/alphabet.1bpp"
- INCBIN "gfx/annon_alphabet.1bpp"
- INCBIN "gfx/gfx_f9322.1bpp"
-PackIconGfx::
- INCBIN "gfx/pack_icons.2bpp"
+FontExtraGFX::
+INCBIN "gfx/font/font_extra.2bpp"
+FontGFX::
+INCBIN "gfx/font/font.1bpp"
+FontBattleExtraGFX::
+INCBIN "gfx/font/font_battle_extra.2bpp"
+INCBIN "gfx/frames/frames.1bpp"
+StatsSeparatorGFX::
+INCBIN "gfx/stats/separator.2bpp"
+StatsGFX::
+INCBIN "gfx/stats/stats.2bpp"
+HPExpBarBorderGFX::
+INCBIN "gfx/battle/hp_exp_bar_border.1bpp"
+ExpBarGFX::
+INCBIN "gfx/battle/exp_bar.2bpp"
+PokedexUnitsGFX::
+INCBIN "gfx/pokedex/m_kg.2bpp"
+PokedexGFX::
+INCBIN "gfx/pokedex/pokedex.2bpp"
+TownMapGFX::
+INCBIN "gfx/pokegear/town_map.2bpp"
+HUD_GFX::
+INCBIN "gfx/hud/hud.2bpp"
+BoldAlphabetGFX::
+INCBIN "gfx/font/alphabet.1bpp"
+AnnonAlphabetGFX::
+INCBIN "gfx/font/annon_alphabet.1bpp"
+INCBIN "gfx/font/gfx_f9322.1bpp"
+PackIconGFX::
+INCBIN "gfx/pack/pack_icons.2bpp"
SECTION "Town Map Cursor", ROMX[$506F], BANK[$3F]
- INCBIN "gfx/town_map_cursor.2bpp"
+TownMapCursorGFX::
+INCBIN "gfx/pokegear/town_map_cursor.2bpp"