diff options
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 282 |
1 files changed, 143 insertions, 139 deletions
@@ -11,10 +11,10 @@ INCLUDE "engine/init_map.asm" INCLUDE "engine/learn.asm" INCLUDE "engine/routines/checknickerrors.asm" INCLUDE "engine/math.asm" -INCLUDE "data/items/item_attributes.asm" +INCLUDE "data/items/attributes.asm" INCLUDE "engine/npc_movement.asm" -INCLUDE "event/happiness_egg.asm" -INCLUDE "event/special.asm" +INCLUDE "engine/events/happiness_egg.asm" +INCLUDE "engine/events/special.asm" SECTION "bank2", ROMX @@ -31,16 +31,16 @@ INCLUDE "engine/routines/checktime.asm" INCLUDE "engine/specials.asm" INCLUDE "engine/printnum.asm" INCLUDE "engine/health.asm" -INCLUDE "event/overworld.asm" +INCLUDE "engine/events/overworld.asm" INCLUDE "engine/items.asm" INCLUDE "engine/player_step.asm" -INCLUDE "engine/anim_hp_bar.asm" +INCLUDE "engine/battle/anim_hp_bar.asm" INCLUDE "engine/move_mon.asm" INCLUDE "engine/billspctop.asm" INCLUDE "engine/routines/getbreedmonlevelgrowth.asm" -INCLUDE "event/bug_contest/caught_mon.asm" +INCLUDE "engine/events/bug_contest/caught_mon.asm" INCLUDE "engine/item_effects.asm" -INCLUDE "engine/routines/getpokeballwobble.asm" +INCLUDE "engine/battle_anims/getpokeballwobble.asm" INCLUDE "engine/routines/knowsmove.asm" @@ -50,20 +50,20 @@ INCLUDE "engine/pack.asm" INCLUDE "engine/time.asm" INCLUDE "engine/tmhm.asm" INCLUDE "engine/namingscreen.asm" -INCLUDE "event/misc_scripts.asm" -INCLUDE "event/heal_machine_anim.asm" -INCLUDE "event/whiteout.asm" -INCLUDE "event/forced_movement.asm" -INCLUDE "event/itemfinder.asm" +INCLUDE "engine/events/misc_scripts.asm" +INCLUDE "engine/events/heal_machine_anim.asm" +INCLUDE "engine/events/whiteout.asm" +INCLUDE "engine/events/forced_movement.asm" +INCLUDE "engine/events/itemfinder.asm" INCLUDE "engine/start_menu.asm" INCLUDE "engine/select_menu.asm" -INCLUDE "event/elevator.asm" -INCLUDE "event/bug_contest/contest.asm" -INCLUDE "event/misc_scripts_2.asm" -INCLUDE "event/std_collision.asm" -INCLUDE "event/bug_contest/judging.asm" -INCLUDE "engine/pokerus/apply_pokerus_tick.asm" -INCLUDE "event/bug_contest/contest_2.asm" +INCLUDE "engine/events/elevator.asm" +INCLUDE "engine/events/bug_contest/contest.asm" +INCLUDE "engine/events/misc_scripts_2.asm" +INCLUDE "engine/events/std_collision.asm" +INCLUDE "engine/events/bug_contest/judging.asm" +INCLUDE "engine/events/pokerus/apply_pokerus_tick.asm" +INCLUDE "engine/events/bug_contest/contest_2.asm" INCLUDE "engine/routines/correcterrorsinplayerparty.asm" INCLUDE "engine/routines/getsquareroot.asm" @@ -76,14 +76,14 @@ INCLUDE "engine/tile_events.asm" INCLUDE "engine/save.asm" INCLUDE "engine/spawn_points.asm" INCLUDE "engine/map_setup.asm" -INCLUDE "engine/pokecenter_pc.asm" +INCLUDE "engine/events/pokecenter_pc.asm" INCLUDE "engine/mart.asm" INCLUDE "engine/money.asm" INCLUDE "data/items/marts.asm" -INCLUDE "event/mom.asm" -INCLUDE "event/daycare.asm" -INCLUDE "event/print_unown.asm" -INCLUDE "event/print_photo.asm" +INCLUDE "engine/events/mom.asm" +INCLUDE "engine/events/daycare.asm" +INCLUDE "engine/events/print_unown.asm" +INCLUDE "engine/events/print_photo.asm" INCLUDE "engine/breeding.asm" @@ -105,31 +105,32 @@ SECTION "bank9", ROMX INCLUDE "data/text_buffers.asm" INCLUDE "engine/menu.asm" INCLUDE "engine/routines/updateitemdescription.asm" -INCLUDE "engine/pokepic.asm" +INCLUDE "engine/events/pokepic.asm" INCLUDE "engine/map_objects_2.asm" INCLUDE "engine/scrolling_menu.asm" INCLUDE "engine/switch_items.asm" INCLUDE "engine/menu_2.asm" INCLUDE "engine/mon_menu.asm" -INCLUDE "battle/menu.asm" +INCLUDE "engine/battle/menu.asm" INCLUDE "engine/buy_sell_toss.asm" INCLUDE "engine/trainer_card.asm" -INCLUDE "engine/prof_oaks_pc.asm" +INCLUDE "engine/events/prof_oaks_pc.asm" INCLUDE "engine/decorations.asm" INCLUDE "engine/routines/leveluphappinessmod.asm" -INCLUDE "data/trainers/trainer_dvs.asm" -INCLUDE "engine/routines/returntobattle_useball.asm" -INCLUDE "engine/routines/consumehelditem.asm" -INCLUDE "battle/moves/move_effects_pointers.asm" -INCLUDE "battle/moves/move_effects.asm" -INCLUDE "engine/routines/kurt_selectquantity_interpretjoypad.asm" +INCLUDE "engine/battle/read_trainer_dvs.asm" +INCLUDE "data/trainers/dvs.asm" +INCLUDE "engine/battle/returntobattle_useball.asm" +INCLUDE "engine/battle/consumehelditem.asm" +INCLUDE "data/moves/effects_pointers.asm" +INCLUDE "data/moves/effects.asm" +INCLUDE "engine/events/kurt_selectquantity_interpretjoypad.asm" SECTION "bankA", ROMX INCLUDE "engine/link.asm" INCLUDE "engine/wildmons.asm" -INCLUDE "battle/link_result.asm" +INCLUDE "engine/battle/link_result.asm" ChrisBackpic: ; 2ba1a INCBIN "gfx/player/chris_back.2bpp.lz" @@ -140,68 +141,68 @@ INCBIN "gfx/battle/dude.2bpp.lz" SECTION "bankB", ROMX -INCLUDE "battle/trainer_huds.asm" -INCLUDE "data/trainers/trainer_class_names.asm" -INCLUDE "battle/ai/redundant.asm" -INCLUDE "event/move_deleter.asm" +INCLUDE "engine/battle/trainer_huds.asm" +INCLUDE "data/trainers/class_names.asm" +INCLUDE "engine/battle/ai/redundant.asm" +INCLUDE "engine/events/move_deleter.asm" INCLUDE "engine/mystery_gift_2.asm" INCLUDE "engine/tmhm2.asm" -INCLUDE "battle/moves/move_descriptions.asm" -INCLUDE "engine/pokerus/pokerus.asm" -INCLUDE "engine/start_battle.asm" +INCLUDE "data/moves/descriptions.asm" +INCLUDE "engine/events/pokerus/pokerus.asm" +INCLUDE "engine/battle/start_battle.asm" INCLUDE "engine/routines/placegraphic.asm" SECTION "Effect Commands", ROMX -INCLUDE "battle/effect_commands.asm" +INCLUDE "engine/battle/effect_commands.asm" SECTION "Enemy Trainers", ROMX -INCLUDE "battle/ai/items.asm" -INCLUDE "battle/ai/scoring.asm" -INCLUDE "engine/read_trainer_attributes.asm" -INCLUDE "data/trainers/trainer_attributes.asm" -INCLUDE "engine/read_trainer_party.asm" +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 -INCLUDE "battle/core.asm" -INCLUDE "battle/effect_command_pointers.asm" +INCLUDE "engine/battle/core.asm" +INCLUDE "data/battle_command_pointers.asm" SECTION "bank10", ROMX INCLUDE "engine/pokedex.asm" -INCLUDE "battle/moves/moves.asm" +INCLUDE "data/moves/moves.asm" INCLUDE "engine/evolve.asm" SECTION "bank11", ROMX -INCLUDE "engine/fruit_trees.asm" -INCLUDE "battle/ai/move.asm" +INCLUDE "engine/events/fruit_trees.asm" +INCLUDE "engine/battle/ai/move.asm" INCLUDE "engine/pokedex_2.asm" INCLUDE "data/pokemon/dex_entry_pointers.asm" INCLUDE "engine/mail.asm" -SECTION "Crystal Unique", ROMX +SECTION "Crystal Features 1", ROMX INCLUDE "engine/init_gender.asm" INCLUDE "engine/routines/drawkrispackgfx.asm" -INCLUDE "event/move_tutor.asm" +INCLUDE "engine/events/move_tutor.asm" INCLUDE "engine/crystal_colors.asm" -INCLUDE "event/celebi.asm" +INCLUDE "engine/events/celebi.asm" INCLUDE "engine/main_menu.asm" INCLUDE "mobile/mobile_menu.asm" INCLUDE "engine/search.asm" INCLUDE "mobile/mobile_12_2.asm" -INCLUDE "event/buena_menu.asm" +INCLUDE "engine/events/buena_menu.asm" SECTION "bank13", ROMX @@ -220,7 +221,7 @@ INCLUDE "data/collision_permissions.asm" INCLUDE "engine/routines/emptyallsrambanks.asm" INCLUDE "engine/routines/savemenu_copytilemapatonce.asm" INCLUDE "engine/routines/checksave.asm" -INCLUDE "data/maps/map_scenes.asm" +INCLUDE "data/maps/scenes.asm" INCLUDE "engine/routines/loadmappart.asm" INCLUDE "engine/routines/phonering_copytilemapatonce.asm" @@ -232,36 +233,36 @@ INCBIN "gfx/shrink/shrink2.2bpp.lz" INCLUDE "engine/link_2.asm" INCLUDE "engine/delete_save_change_clock.asm" -INCLUDE "tilesets/tileset_headers.asm" +INCLUDE "tilesets/tilesets.asm" INCLUDE "engine/routines/flagpredef.asm" INCLUDE "engine/routines/trademonfrontpic.asm" -INCLUDE "engine/pokerus/check_pokerus.asm" -INCLUDE "event/lucky_number.asm" +INCLUDE "engine/events/pokerus/check_pokerus.asm" +INCLUDE "engine/events/lucky_number.asm" INCLUDE "engine/caught_data.asm" INCLUDE "engine/search2.asm" INCLUDE "engine/stats_screen.asm" -INCLUDE "event/catch_tutorial.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 "battle/sliding_intro.asm" +INCLUDE "engine/battle/sliding_intro.asm" INCLUDE "mobile/print_opp_message.asm" -INCLUDE "engine/routines/checkbattlescene.asm" +INCLUDE "engine/battle/checkbattlescene.asm" INCLUDE "engine/gbc_only.asm" -INCLUDE "event/poke_seer.asm" +INCLUDE "engine/events/poke_seer.asm" SECTION "bank14", ROMX INCLUDE "engine/party_menu.asm" -INCLUDE "event/poisonstep.asm" -INCLUDE "event/sweet_scent.asm" -INCLUDE "event/squirtbottle.asm" -INCLUDE "event/card_key.asm" -INCLUDE "event/basement_key.asm" -INCLUDE "event/sacred_ash.asm" +INCLUDE "engine/events/poisonstep.asm" +INCLUDE "engine/events/sweet_scent.asm" +INCLUDE "engine/events/squirtbottle.asm" +INCLUDE "engine/events/card_key.asm" +INCLUDE "engine/events/basement_key.asm" +INCLUDE "engine/events/sacred_ash.asm" INCLUDE "engine/tempmon.asm" -INCLUDE "text/types.asm" +INCLUDE "engine/types.asm" INCLUDE "text/unused_gen_1_trainers.asm" INCLUDE "engine/mon_stats.asm" INCLUDE "engine/routines/initlist.asm" @@ -270,7 +271,7 @@ INCLUDE "engine/routines/switchpartymons.asm" INCLUDE "gfx/load_pics.asm" INCLUDE "engine/move_mon_wo_mail.asm" INCLUDE "data/pokemon/base_stats.asm" -INCLUDE "data/pokemon/pokemon_names.asm" +INCLUDE "data/pokemon/names.asm" Unknown_53d84: ; unreferenced db $1a, $15 @@ -308,29 +309,29 @@ INCLUDE "engine/debug.asm" SECTION "bank21", ROMX INCLUDE "engine/printer.asm" -INCLUDE "battle/anim_gfx.asm" -INCLUDE "event/halloffame.asm" +INCLUDE "gfx/battle_anims.asm" +INCLUDE "engine/events/halloffame.asm" -SECTION "bank22", ROMX +SECTION "Crystal Features 2", ROMX -INCLUDE "event/kurt.asm" +INCLUDE "engine/events/kurt.asm" INCLUDE "engine/player_gfx.asm" INCLUDE "mobile/mobile_22.asm" -INCLUDE "event/unown.asm" -INCLUDE "event/buena.asm" -INCLUDE "event/dratini.asm" -INCLUDE "event/battle_tower.asm" +INCLUDE "engine/events/crystal_unown.asm" +INCLUDE "engine/events/buena.asm" +INCLUDE "engine/events/dratini.asm" +INCLUDE "engine/events/battle_tower_rules.asm" INCLUDE "mobile/mobile_22_2.asm" SECTION "bank23", ROMX INCLUDE "engine/timeofdaypals.asm" -INCLUDE "engine/battle_transition.asm" -INCLUDE "event/field_moves.asm" -INCLUDE "event/magnet_train.asm" -INCLUDE "engine/routines/battlestart_copytilemapatonce.asm" +INCLUDE "engine/battle/battle_transition.asm" +INCLUDE "engine/events/field_moves.asm" +INCLUDE "engine/events/magnet_train.asm" +INCLUDE "engine/battle/battlestart_copytilemapatonce.asm" INCLUDE "engine/sprites.asm" INCLUDE "engine/mon_icons.asm" @@ -340,7 +341,7 @@ SECTION "bank24", ROMX INCLUDE "engine/phone/phone.asm" INCLUDE "engine/timeset.asm" INCLUDE "engine/pokegear.asm" -INCLUDE "engine/fish.asm" +INCLUDE "engine/events/fish.asm" INCLUDE "engine/slot_machine.asm" @@ -376,55 +377,61 @@ SECTION "bank2E", ROMX INCLUDE "engine/events_3.asm" INCLUDE "engine/radio.asm" -INCLUDE "gfx/mail.asm" +INCLUDE "engine/mail_2.asm" SECTION "bank2F", ROMX -INCLUDE "engine/std_scripts.asm" +INCLUDE "engine/events/std_scripts.asm" INCLUDE "engine/phone/phone_scripts.asm" INCLUDE "engine/phone/generic_calls.asm" -INCLUDE "engine/trainer_scripts.asm" +INCLUDE "engine/events/trainer_scripts.asm" SECTION "bank32", ROMX -INCLUDE "battle/bg_effects.asm" -INCLUDE "battle/anims.asm" -INCLUDE "event/poisonstep_pals.asm" +INCLUDE "engine/battle_anims/bg_effects.asm" +INCLUDE "data/moves/animations.asm" +INCLUDE "engine/events/poisonstep_pals.asm" TheEndGFX:: ; cbd2e INCBIN "gfx/credits/theend.2bpp" -SECTION "bank33", ROMX +SECTION "Move Animations", ROMX -INCLUDE "event/bug_contest/display_stats.asm" -INCLUDE "battle/anim_commands.asm" -INCLUDE "battle/anim_objects.asm" +INCLUDE "engine/events/bug_contest/display_stats.asm" +INCLUDE "engine/battle_anims/anim_commands.asm" +INCLUDE "engine/battle_anims/engine.asm" +INCLUDE "data/battle_anims/objects.asm" +INCLUDE "engine/battle_anims/functions.asm" +INCLUDE "engine/battle_anims/helpers.asm" +INCLUDE "data/battle_anims/framesets.asm" +INCLUDE "data/battle_anims/oam.asm" +INCLUDE "data/battle_anims/object_gfx.asm" SECTION "Pic Animations 1", ROMX -INCLUDE "gfx/pics/animation.asm" -INCLUDE "gfx/pics/anim_pointers.asm" -INCLUDE "gfx/pics/anims.asm" -INCLUDE "gfx/pics/extra_pointers.asm" -INCLUDE "gfx/pics/extras.asm" -INCLUDE "gfx/pics/unown_anim_pointers.asm" -INCLUDE "gfx/pics/unown_anims.asm" -INCLUDE "gfx/pics/unown_extra_pointers.asm" -INCLUDE "gfx/pics/unown_extras.asm" -INCLUDE "gfx/pics/bitmask_pointers.asm" -INCLUDE "gfx/pics/bitmasks.asm" -INCLUDE "gfx/pics/unown_bitmask_pointers.asm" -INCLUDE "gfx/pics/unown_bitmasks.asm" +INCLUDE "engine/pic_animation.asm" +INCLUDE "gfx/pokemon/anim_pointers.asm" +INCLUDE "gfx/pokemon/anims.asm" +INCLUDE "gfx/pokemon/extra_pointers.asm" +INCLUDE "gfx/pokemon/extras.asm" +INCLUDE "gfx/pokemon/unown_anim_pointers.asm" +INCLUDE "gfx/pokemon/unown_anims.asm" +INCLUDE "gfx/pokemon/unown_extra_pointers.asm" +INCLUDE "gfx/pokemon/unown_extras.asm" +INCLUDE "gfx/pokemon/bitmask_pointers.asm" +INCLUDE "gfx/pokemon/bitmasks.asm" +INCLUDE "gfx/pokemon/unown_bitmask_pointers.asm" +INCLUDE "gfx/pokemon/unown_bitmasks.asm" SECTION "Pic Animations 2", ROMX -INCLUDE "gfx/pics/frame_pointers.asm" -INCLUDE "gfx/pics/kanto_frames.asm" +INCLUDE "gfx/pokemon/frame_pointers.asm" +INCLUDE "gfx/pokemon/kanto_frames.asm" SECTION "Font Inversed", ROMX @@ -435,14 +442,14 @@ INCBIN "gfx/font/font_inversed.1bpp" SECTION "Pic Animations 3", ROMX -INCLUDE "gfx/pics/johto_frames.asm" -INCLUDE "gfx/pics/unown_frame_pointers.asm" -INCLUDE "gfx/pics/unown_frames.asm" +INCLUDE "gfx/pokemon/johto_frames.asm" +INCLUDE "gfx/pokemon/unown_frame_pointers.asm" +INCLUDE "gfx/pokemon/unown_frames.asm" SECTION "bank38", ROMX -INCLUDE "event/print_unown_2.asm" +INCLUDE "engine/events/print_unown_2.asm" Unknown_e00ed: ; Graphics for an unused Game Corner @@ -471,21 +478,21 @@ SECTION "bank3E", ROMX INCLUDE "gfx/font.asm" INCLUDE "engine/time_capsule.asm" -INCLUDE "event/name_rater.asm" +INCLUDE "engine/events/name_rater.asm" INCLUDE "engine/routines/playslowcry.asm" INCLUDE "engine/routines/newpokedexentry.asm" INCLUDE "engine/time_capsule_2.asm" INCLUDE "engine/unown_dex.asm" -INCLUDE "event/magikarp.asm" -INCLUDE "battle/hidden_power.asm" -INCLUDE "battle/misc.asm" +INCLUDE "engine/events/magikarp.asm" +INCLUDE "engine/battle/hidden_power.asm" +INCLUDE "engine/battle/misc.asm" SECTION "bank3F", ROMX INCLUDE "tilesets/animations.asm" INCLUDE "engine/npctrade.asm" -INCLUDE "event/mom_phone.asm" +INCLUDE "engine/events/mom_phone.asm" INCLUDE "mobile/mobile_40.asm" @@ -497,12 +504,12 @@ INCLUDE "engine/dma_transfer.asm" INCLUDE "gfx/emotes.asm" INCLUDE "engine/warp_connection.asm" INCLUDE "engine/mystery_gift.asm" -INCLUDE "battle/used_move_text.asm" +INCLUDE "engine/battle/used_move_text.asm" INCLUDE "mobile/mobile_41.asm" INCLUDE "gfx/overworld_font.asm" -SECTION "mobile_42", ROMX +SECTION "Mobile 42", ROMX INCLUDE "mobile/mobile_42.asm" @@ -513,7 +520,7 @@ IntroLogoGFX: ; 109407 INCBIN "gfx/intro/logo.2bpp.lz" -SECTION "bank43", ROMX +SECTION "Title", ROMX INCLUDE "engine/unused_title.asm" INCLUDE "engine/title.asm" @@ -525,7 +532,7 @@ INCLUDE "mobile/mobile_45.asm" INCLUDE "mobile/mobile_46.asm" -SECTION "battle_tower_47", ROMX +SECTION "Battle Tower", ROMX INCLUDE "mobile/battle_tower_47.asm" @@ -536,7 +543,7 @@ INCLUDE "mobile/mobile_5b.asm" INCLUDE "engine/link_trade.asm" -SECTION "mobile_5c", ROMX +SECTION "Mobile 5C", ROMX INCLUDE "mobile/mobile_5c.asm" @@ -546,17 +553,17 @@ SECTION "Crystal Phone Text 2", ROMX INCLUDE "text/phone/extra2.asm" -SECTION "bank5E", ROMX +SECTION "UpdateBattleHUDs", ROMX -INCLUDE "engine/routines/updatebattlehuds.asm" +INCLUDE "engine/battle/updatebattlehuds.asm" -SECTION "mobile_5e", ROMX +SECTION "Mobile 5E", ROMX INCLUDE "mobile/mobile_5e.asm" -SECTION "bank5F", ROMX +SECTION "Mobile 5F", ROMX INCLUDE "mobile/mobile_5f.asm" @@ -585,11 +592,11 @@ INCLUDE "text/phone/elm.asm" INCLUDE "text/phone/trainers1.asm" -SECTION "bank72", ROMX +SECTION "Miscellaneous Text", ROMX -INCLUDE "data/items/item_names.asm" -INCLUDE "data/items/item_descriptions.asm" -INCLUDE "battle/move_names.asm" +INCLUDE "data/items/names.asm" +INCLUDE "data/items/descriptions.asm" +INCLUDE "data/moves/names.asm" INCLUDE "engine/landmarks.asm" @@ -606,7 +613,7 @@ SECTION "bank77_2", ROMX INCLUDE "engine/routines/printhoursmins.asm" INCLUDE "engine/diploma.asm" INCLUDE "engine/pokedex_3.asm" -INCLUDE "event/catch_tutorial_input.asm" +INCLUDE "engine/events/catch_tutorial_input.asm" INCLUDE "engine/routines/townmap_convertlinebreakcharacters.asm" PokegearGFX: ; 1de2e4 @@ -630,13 +637,10 @@ SECTION "Mobile News Data", ROMX INCLUDE "mobile/news/news.asm" -SECTION "bank7E", ROMX +SECTION "Crystal Events", ROMX -INCLUDE "engine/battle_tower.asm" -INCLUDE "engine/odd_eggs.asm" - - -SECTION "bank7F", ROMX +INCLUDE "engine/events/battle_tower.asm" +INCLUDE "engine/events/odd_egg.asm" SECTION "Mobile Stadium 2", ROMX |