diff options
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 170 |
1 files changed, 71 insertions, 99 deletions
@@ -1,4 +1,4 @@ -INCLUDE "includes.asm" +INCLUDE "constants.asm" SECTION "bank1", ROMX @@ -49,7 +49,7 @@ SECTION "bank4", ROMX INCLUDE "engine/pack.asm" INCLUDE "engine/time.asm" INCLUDE "engine/tmhm.asm" -INCLUDE "engine/namingscreen.asm" +INCLUDE "engine/naming_screen.asm" INCLUDE "engine/events/misc_scripts.asm" INCLUDE "engine/events/heal_machine_anim.asm" INCLUDE "engine/events/whiteout.asm" @@ -85,14 +85,12 @@ INCLUDE "engine/events/daycare.asm" INCLUDE "engine/events/print_unown.asm" INCLUDE "engine/events/print_photo.asm" INCLUDE "engine/breeding.asm" - - -INCLUDE "tilesets/data.asm" +INCLUDE "gfx/tilesets.asm" SECTION "Roofs", ROMX -INCLUDE "tilesets/roofs.asm" +INCLUDE "engine/mapgroup_roofs.asm" SECTION "Clock Reset", ROMX @@ -172,12 +170,12 @@ INCLUDE "data/trainers/parties.asm" SECTION "Battle Core", ROMX INCLUDE "engine/battle/core.asm" -INCLUDE "data/battle_command_pointers.asm" +INCLUDE "data/battle/effect_command_pointers.asm" SECTION "bank10", ROMX -INCLUDE "engine/pokedex.asm" +INCLUDE "engine/pokedex/pokedex.asm" INCLUDE "data/moves/moves.asm" INCLUDE "engine/evolve.asm" @@ -186,7 +184,7 @@ SECTION "bank11", ROMX INCLUDE "engine/events/fruit_trees.asm" INCLUDE "engine/battle/ai/move.asm" -INCLUDE "engine/pokedex_2.asm" +INCLUDE "engine/pokedex/pokedex_2.asm" INCLUDE "data/pokemon/dex_entry_pointers.asm" INCLUDE "engine/mail.asm" @@ -196,7 +194,7 @@ SECTION "Crystal Features 1", ROMX INCLUDE "engine/init_gender.asm" INCLUDE "engine/routines/drawkrispackgfx.asm" INCLUDE "engine/events/move_tutor.asm" -INCLUDE "engine/crystal_colors.asm" +INCLUDE "engine/crystal_layouts.asm" INCLUDE "engine/events/celebi.asm" INCLUDE "engine/main_menu.asm" INCLUDE "mobile/mobile_menu.asm" @@ -208,15 +206,7 @@ INCLUDE "engine/events/buena_menu.asm" SECTION "bank13", ROMX INCLUDE "engine/map_palettes.asm" -INCLUDE "tilesets/palette_maps.asm" - -; unreferenced -; 0x4ce05 -rept 26 - db $06 -endr -; 0x4ce1f - +INCLUDE "gfx/tilesets/palette_maps.asm" INCLUDE "data/collision_permissions.asm" INCLUDE "engine/routines/emptyallsrambanks.asm" INCLUDE "engine/routines/savemenu_copytilemapatonce.asm" @@ -226,14 +216,14 @@ INCLUDE "engine/routines/loadmappart.asm" INCLUDE "engine/routines/phonering_copytilemapatonce.asm" Shrink1Pic: ; 4d249 -INCBIN "gfx/shrink/shrink1.2bpp.lz" +INCBIN "gfx/new_game/shrink1.2bpp.lz" Shrink2Pic: ; 4d2d9 -INCBIN "gfx/shrink/shrink2.2bpp.lz" +INCBIN "gfx/new_game/shrink2.2bpp.lz" INCLUDE "engine/link_2.asm" INCLUDE "engine/delete_save_change_clock.asm" -INCLUDE "tilesets/tilesets.asm" +INCLUDE "data/tilesets.asm" INCLUDE "engine/routines/flagpredef.asm" INCLUDE "engine/routines/trademonfrontpic.asm" INCLUDE "engine/events/pokerus/check_pokerus.asm" @@ -244,7 +234,7 @@ INCLUDE "engine/stats_screen.asm" INCLUDE "engine/events/catch_tutorial.asm" INCLUDE "engine/evolution_animation.asm" INCLUDE "engine/init_hof_credits.asm" -INCLUDE "mobile/get_trainer_class.asm" +INCLUDE "engine/events/battle_tower/get_trainer_class.asm" INCLUDE "engine/battle/sliding_intro.asm" INCLUDE "mobile/print_opp_message.asm" INCLUDE "engine/battle/checkbattlescene.asm" @@ -263,29 +253,16 @@ INCLUDE "engine/events/basement_key.asm" INCLUDE "engine/events/sacred_ash.asm" INCLUDE "engine/tempmon.asm" INCLUDE "engine/types.asm" -INCLUDE "text/unused_gen_1_trainers.asm" +INCLUDE "engine/routines/unreferenced_getgen1trainerclassname.asm" INCLUDE "engine/mon_stats.asm" INCLUDE "engine/routines/initlist.asm" INCLUDE "engine/experience.asm" INCLUDE "engine/routines/switchpartymons.asm" -INCLUDE "gfx/load_pics.asm" +INCLUDE "engine/load_pics.asm" INCLUDE "engine/move_mon_wo_mail.asm" INCLUDE "data/pokemon/base_stats.asm" INCLUDE "data/pokemon/names.asm" - -Unknown_53d84: ; unreferenced - db $1a, $15 - db $33, $16 - db $4b, $17 - db $62, $18 - db $79, $19 - db $90, $1a - db $a8, $1b - db $c4, $1c - db $e0, $1d - db $f6, $1e - db $ff, $1f - db $ff, $20 +INCLUDE "data/unused/unknown_53d84.asm" UnknownEggPic:: ; 53d9c ; Another egg pic. This is shifted up a few pixels. @@ -294,7 +271,7 @@ INCBIN "gfx/unknown/unknown_egg.2bpp.lz" SECTION "Crystal Phone Text", ROMX -INCLUDE "text/phone/extra.asm" +INCLUDE "data/phone/text/extra.asm" SECTION "bank20", ROMX @@ -302,7 +279,7 @@ SECTION "bank20", ROMX INCLUDE "engine/player_movement.asm" INCLUDE "engine/engine_flags.asm" INCLUDE "engine/variables.asm" -INCLUDE "text/battle.asm" +INCLUDE "data/battle/battle_text.asm" INCLUDE "engine/debug.asm" @@ -318,10 +295,10 @@ SECTION "Crystal Features 2", ROMX INCLUDE "engine/events/kurt.asm" INCLUDE "engine/player_gfx.asm" INCLUDE "mobile/mobile_22.asm" -INCLUDE "engine/events/crystal_unown.asm" +INCLUDE "engine/events/unown_walls.asm" INCLUDE "engine/events/buena.asm" INCLUDE "engine/events/dratini.asm" -INCLUDE "engine/events/battle_tower_rules.asm" +INCLUDE "engine/events/battle_tower/rules.asm" INCLUDE "mobile/mobile_22_2.asm" @@ -354,28 +331,31 @@ INCLUDE "engine/phone/buenas_password.asm" SECTION "Phone Text", ROMX -INCLUDE "text/phone/anthony_overworld.asm" -INCLUDE "text/phone/todd_overworld.asm" -INCLUDE "text/phone/gina_overworld.asm" -INCLUDE "text/phone/irwin_overworld.asm" -INCLUDE "text/phone/arnie_overworld.asm" -INCLUDE "text/phone/alan_overworld.asm" -INCLUDE "text/phone/dana_overworld.asm" -INCLUDE "text/phone/chad_overworld.asm" -INCLUDE "text/phone/derek_overworld.asm" -INCLUDE "text/phone/tully_overworld.asm" -INCLUDE "text/phone/brent_overworld.asm" -INCLUDE "text/phone/tiffany_overworld.asm" -INCLUDE "text/phone/vance_overworld.asm" -INCLUDE "text/phone/wilton_overworld.asm" -INCLUDE "text/phone/kenji_overworld.asm" -INCLUDE "text/phone/parry_overworld.asm" -INCLUDE "text/phone/erin_overworld.asm" +INCLUDE "data/phone/text/anthony_overworld.asm" +INCLUDE "data/phone/text/todd_overworld.asm" +INCLUDE "data/phone/text/gina_overworld.asm" +INCLUDE "data/phone/text/irwin_overworld.asm" +INCLUDE "data/phone/text/arnie_overworld.asm" +INCLUDE "data/phone/text/alan_overworld.asm" +INCLUDE "data/phone/text/dana_overworld.asm" +INCLUDE "data/phone/text/chad_overworld.asm" +INCLUDE "data/phone/text/derek_overworld.asm" +INCLUDE "data/phone/text/tully_overworld.asm" +INCLUDE "data/phone/text/brent_overworld.asm" +INCLUDE "data/phone/text/tiffany_overworld.asm" +INCLUDE "data/phone/text/vance_overworld.asm" +INCLUDE "data/phone/text/wilton_overworld.asm" +INCLUDE "data/phone/text/kenji_overworld.asm" +INCLUDE "data/phone/text/parry_overworld.asm" +INCLUDE "data/phone/text/erin_overworld.asm" SECTION "bank2E", ROMX -INCLUDE "engine/events_3.asm" +INCLUDE "engine/events/map_name_sign.asm" +INCLUDE "engine/events/checkforhiddenitems.asm" +INCLUDE "engine/events/treemons.asm" +INCLUDE "engine/events/loadfishinggfx.asm" INCLUDE "engine/radio.asm" INCLUDE "engine/mail_2.asm" @@ -402,7 +382,7 @@ SECTION "Move Animations", ROMX INCLUDE "engine/events/bug_contest/display_stats.asm" INCLUDE "engine/battle_anims/anim_commands.asm" -INCLUDE "engine/battle_anims/engine.asm" +INCLUDE "engine/battle_anims/core.asm" INCLUDE "data/battle_anims/objects.asm" INCLUDE "engine/battle_anims/functions.asm" INCLUDE "engine/battle_anims/helpers.asm" @@ -450,15 +430,6 @@ INCLUDE "gfx/pokemon/unown_frames.asm" SECTION "bank38", ROMX INCLUDE "engine/events/print_unown_2.asm" - -Unknown_e00ed: -; Graphics for an unused Game Corner -; game were meant to be here. - -ret_e00ed: ; e00ed (38:40ed) -; How many coins? - ret - INCLUDE "engine/card_flip.asm" INCLUDE "engine/unown_puzzle.asm" INCLUDE "engine/dummy_game.asm" @@ -476,13 +447,13 @@ INCLUDE "engine/crystal_intro.asm" SECTION "bank3E", ROMX -INCLUDE "gfx/font.asm" +INCLUDE "engine/load_font.asm" INCLUDE "engine/time_capsule.asm" INCLUDE "engine/events/name_rater.asm" INCLUDE "engine/routines/playslowcry.asm" -INCLUDE "engine/routines/newpokedexentry.asm" +INCLUDE "engine/pokedex/newpokedexentry.asm" INCLUDE "engine/time_capsule_2.asm" -INCLUDE "engine/unown_dex.asm" +INCLUDE "engine/pokedex/unown_dex.asm" INCLUDE "engine/events/magikarp.asm" INCLUDE "engine/battle/hidden_power.asm" INCLUDE "engine/battle/misc.asm" @@ -490,7 +461,7 @@ INCLUDE "engine/battle/misc.asm" SECTION "bank3F", ROMX -INCLUDE "tilesets/animations.asm" +INCLUDE "engine/tileset_anims.asm" INCLUDE "engine/npctrade.asm" INCLUDE "engine/events/mom_phone.asm" @@ -506,7 +477,7 @@ INCLUDE "engine/warp_connection.asm" INCLUDE "engine/mystery_gift.asm" INCLUDE "engine/battle/used_move_text.asm" INCLUDE "mobile/mobile_41.asm" -INCLUDE "gfx/overworld_font.asm" +INCLUDE "engine/routines/loadoverworldfont.asm" SECTION "Mobile 42", ROMX @@ -534,7 +505,7 @@ INCLUDE "mobile/mobile_46.asm" SECTION "Battle Tower", ROMX -INCLUDE "mobile/battle_tower_47.asm" +INCLUDE "engine/events/battle_tower/trainer_text.asm" SECTION "bank5B", ROMX @@ -550,7 +521,7 @@ INCLUDE "mobile/mobile_5c.asm" SECTION "Crystal Phone Text 2", ROMX -INCLUDE "text/phone/extra2.asm" +INCLUDE "data/phone/text/extra2.asm" SECTION "UpdateBattleHUDs", ROMX @@ -570,31 +541,32 @@ INCLUDE "mobile/mobile_5f.asm" SECTION "Common Text 1", ROMX -INCLUDE "text/stdtext.asm" -INCLUDE "text/phone/jack_overworld.asm" -INCLUDE "text/phone/beverly_overworld.asm" -INCLUDE "text/phone/huey_overworld.asm" -INCLUDE "text/phone/gaven_overworld.asm" -INCLUDE "text/phone/beth_overworld.asm" -INCLUDE "text/phone/jose_overworld.asm" -INCLUDE "text/phone/reena_overworld.asm" -INCLUDE "text/phone/joey_overworld.asm" -INCLUDE "text/phone/wade_overworld.asm" -INCLUDE "text/phone/ralph_overworld.asm" -INCLUDE "text/phone/liz_overworld.asm" +INCLUDE "data/std_text.asm" +INCLUDE "data/phone/text/jack_overworld.asm" +INCLUDE "data/phone/text/beverly_overworld.asm" +INCLUDE "data/phone/text/huey_overworld.asm" +INCLUDE "data/phone/text/gaven_overworld.asm" +INCLUDE "data/phone/text/beth_overworld.asm" +INCLUDE "data/phone/text/jose_overworld.asm" +INCLUDE "data/phone/text/reena_overworld.asm" +INCLUDE "data/phone/text/joey_overworld.asm" +INCLUDE "data/phone/text/wade_overworld.asm" +INCLUDE "data/phone/text/ralph_overworld.asm" +INCLUDE "data/phone/text/liz_overworld.asm" SECTION "Special Phone Text", ROMX -INCLUDE "text/phone/mom.asm" -INCLUDE "text/phone/bill.asm" -INCLUDE "text/phone/elm.asm" -INCLUDE "text/phone/trainers1.asm" +INCLUDE "data/phone/text/mom.asm" +INCLUDE "data/phone/text/bill.asm" +INCLUDE "data/phone/text/elm.asm" +INCLUDE "data/phone/text/trainers1.asm" SECTION "Miscellaneous Text", ROMX INCLUDE "data/items/names.asm" +INCLUDE "engine/routines/printitemdescription.asm" INCLUDE "data/items/descriptions.asm" INCLUDE "data/moves/names.asm" INCLUDE "engine/landmarks.asm" @@ -612,7 +584,7 @@ SECTION "bank77_2", ROMX INCLUDE "engine/routines/printhoursmins.asm" INCLUDE "engine/diploma.asm" -INCLUDE "engine/pokedex_3.asm" +INCLUDE "engine/pokedex/pokedex_3.asm" INCLUDE "engine/events/catch_tutorial_input.asm" INCLUDE "engine/routines/townmap_convertlinebreakcharacters.asm" @@ -624,12 +596,12 @@ INCLUDE "engine/european_mail.asm" SECTION "Battle Tower Text", ROMX -INCLUDE "text/battle_tower.asm" +INCLUDE "data/battle_tower/trainer_text.asm" SECTION "Battle Tower Trainer Data", ROMX -INCLUDE "data/battle_tower_2.asm" +INCLUDE "data/battle_tower/unknown.asm" SECTION "Mobile News Data", ROMX @@ -639,13 +611,13 @@ INCLUDE "mobile/news/news.asm" SECTION "Crystal Events", ROMX -INCLUDE "engine/events/battle_tower.asm" +INCLUDE "engine/events/battle_tower/load_trainer.asm" INCLUDE "engine/events/odd_egg.asm" SECTION "Mobile Stadium 2", ROMX -if DEF(CRYSTAL11) +if DEF(_CRYSTAL11) INCBIN "mobile/stadium/stadium2_2.bin" else INCBIN "mobile/stadium/stadium2_1.bin" |