diff options
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 30 |
1 files changed, 12 insertions, 18 deletions
@@ -117,10 +117,8 @@ INCLUDE "engine/events/prof_oaks_pc.asm" INCLUDE "engine/overworld/decorations.asm" INCLUDE "engine/pokemon/level_up_happiness.asm" INCLUDE "engine/battle/read_trainer_dvs.asm" -INCLUDE "data/trainers/dvs.asm" INCLUDE "engine/battle/returntobattle_useball.asm" INCLUDE "engine/battle/consume_held_item.asm" -INCLUDE "data/moves/effects_pointers.asm" INCLUDE "data/moves/effects.asm" INCLUDE "engine/events/kurt_selectquantity_interpretjoypad.asm" @@ -131,10 +129,10 @@ INCLUDE "engine/link/link.asm" INCLUDE "engine/overworld/wildmons.asm" INCLUDE "engine/battle/link_result.asm" -ChrisBackpic: ; 2ba1a +ChrisBackpic: INCBIN "gfx/player/chris_back.2bpp.lz" -DudeBackpic: ; 2bbaa +DudeBackpic: INCBIN "gfx/battle/dude.2bpp.lz" @@ -162,10 +160,7 @@ SECTION "Enemy Trainers", ROMX INCLUDE "engine/battle/ai/items.asm" INCLUDE "engine/battle/ai/scoring.asm" INCLUDE "engine/battle/read_trainer_attributes.asm" -INCLUDE "data/trainers/attributes.asm" INCLUDE "engine/battle/read_trainer_party.asm" -INCLUDE "data/trainers/party_pointers.asm" -INCLUDE "data/trainers/parties.asm" SECTION "Battle Core", ROMX @@ -186,7 +181,6 @@ SECTION "bank11", ROMX INCLUDE "engine/events/fruit_trees.asm" INCLUDE "engine/battle/ai/move.asm" INCLUDE "engine/pokedex/pokedex_2.asm" -INCLUDE "data/pokemon/dex_entry_pointers.asm" INCLUDE "engine/pokemon/mail.asm" @@ -216,10 +210,10 @@ INCLUDE "data/maps/scenes.asm" INCLUDE "engine/overworld/load_map_part.asm" INCLUDE "engine/phone/phonering_copytilemapatonce.asm" -Shrink1Pic: ; 4d249 +Shrink1Pic: INCBIN "gfx/new_game/shrink1.2bpp.lz" -Shrink2Pic: ; 4d2d9 +Shrink2Pic: INCBIN "gfx/new_game/shrink2.2bpp.lz" INCLUDE "engine/link/link_2.asm" @@ -264,9 +258,9 @@ INCLUDE "engine/gfx/load_pics.asm" INCLUDE "engine/pokemon/move_mon_wo_mail.asm" INCLUDE "data/pokemon/base_stats.asm" INCLUDE "data/pokemon/names.asm" -INCLUDE "data/unused_53d84.asm" +INCLUDE "data/pokemon/unused_pic_banks.asm" -UnknownEggPic:: ; 53d9c +UnknownEggPic:: ; Another egg pic. This is shifted up a few pixels. INCBIN "gfx/unknown/unknown_egg.2bpp.lz" @@ -287,6 +281,7 @@ INCLUDE "engine/menus/debug.asm" SECTION "bank21", ROMX +INCLUDE "engine/printer/printer_serial.asm" INCLUDE "engine/printer/printer.asm" INCLUDE "gfx/battle_anims.asm" INCLUDE "engine/events/halloffame.asm" @@ -376,7 +371,7 @@ INCLUDE "engine/battle_anims/bg_effects.asm" INCLUDE "data/moves/animations.asm" INCLUDE "engine/events/poisonstep_pals.asm" -TheEndGFX:: ; cbd2e +TheEndGFX:: INCBIN "gfx/credits/theend.2bpp" @@ -440,7 +435,7 @@ INCLUDE "engine/pokemon/bills_pc.asm" SECTION "bank39", ROMX -CopyrightGFX:: ; e4000 +CopyrightGFX:: INCBIN "gfx/splash/copyright.2bpp" INCLUDE "engine/menus/options_menu.asm" @@ -489,7 +484,7 @@ INCLUDE "mobile/mobile_42.asm" SECTION "Intro Logo", ROMX -IntroLogoGFX: ; 109407 +IntroLogoGFX: INCBIN "gfx/intro/logo.2bpp.lz" @@ -569,14 +564,13 @@ SECTION "Miscellaneous Text", ROMX INCLUDE "data/items/names.asm" INCLUDE "engine/items/print_item_description.asm" -INCLUDE "data/items/descriptions.asm" INCLUDE "data/moves/names.asm" INCLUDE "engine/overworld/landmarks.asm" SECTION "bank77", ROMX -UnownFont: ; 1dc000 +UnownFont: INCBIN "gfx/font/unown_font.2bpp" INCLUDE "engine/printer/print_party.asm" @@ -590,7 +584,7 @@ INCLUDE "engine/pokedex/pokedex_3.asm" INCLUDE "engine/events/catch_tutorial_input.asm" INCLUDE "engine/pokegear/townmap_convertlinebreakcharacters.asm" -PokegearGFX: ; 1de2e4 +PokegearGFX: INCBIN "gfx/pokegear/pokegear.2bpp.lz" INCLUDE "engine/pokemon/european_mail.asm" |