diff options
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 178 |
1 files changed, 115 insertions, 63 deletions
@@ -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" |