diff options
Diffstat (limited to 'main.asm')
| -rwxr-xr-x | main.asm | 223 |
1 files changed, 114 insertions, 109 deletions
@@ -4,46 +4,46 @@ INCLUDE "constants.asm" SECTION "bank1", ROMX INCLUDE "data/facing.asm" -INCLUDE "engine/black_out.asm" +INCLUDE "engine/events/black_out.asm" MewPicFront:: INCBIN "gfx/pokemon/front/mew.pic" MewPicBack:: INCBIN "gfx/pokemon/back/mewb.pic" INCLUDE "data/baseStats/mew.asm" INCLUDE "engine/battle/safari_zone.asm" -INCLUDE "engine/titlescreen.asm" -INCLUDE "engine/load_mon_data.asm" +INCLUDE "engine/movie/titlescreen.asm" +INCLUDE "engine/pokemon/load_mon_data.asm" INCLUDE "data/item_prices.asm" INCLUDE "text/item_names.asm" INCLUDE "text/unused_names.asm" -INCLUDE "engine/overworld/oam.asm" -INCLUDE "engine/oam_dma.asm" -INCLUDE "engine/print_waiting_text.asm" -INCLUDE "engine/overworld/map_sprite_functions1.asm" -INCLUDE "engine/test_battle.asm" -INCLUDE "engine/overworld/item.asm" +INCLUDE "engine/gfx/sprite_oam.asm" +INCLUDE "engine/gfx/oam_dma.asm" +INCLUDE "engine/link/print_waiting_text.asm" +INCLUDE "engine/overworld/sprite_collisions.asm" +INCLUDE "engine/debug/test_battle.asm" +INCLUDE "engine/events/pick_up_item.asm" INCLUDE "engine/overworld/movement.asm" -INCLUDE "engine/cable_club.asm" -INCLUDE "engine/menu/main_menu.asm" -INCLUDE "engine/oak_speech.asm" -INCLUDE "engine/special_warps.asm" -INCLUDE "engine/debug1.asm" -INCLUDE "engine/menu/naming_screen.asm" -INCLUDE "engine/oak_speech2.asm" -INCLUDE "engine/subtract_paid_money.asm" -INCLUDE "engine/menu/swap_items.asm" -INCLUDE "engine/overworld/pokemart.asm" -INCLUDE "engine/learn_move.asm" -INCLUDE "engine/overworld/pokecenter.asm" -INCLUDE "engine/overworld/set_blackout_map.asm" -INCLUDE "engine/display_text_id_init.asm" -INCLUDE "engine/menu/draw_start_menu.asm" -INCLUDE "engine/overworld/cable_club_npc.asm" -INCLUDE "engine/menu/text_box.asm" -INCLUDE "engine/battle/moveEffects/drain_hp_effect.asm" -INCLUDE "engine/menu/players_pc.asm" -INCLUDE "engine/remove_pokemon.asm" -INCLUDE "engine/display_pokedex.asm" +INCLUDE "engine/link/cable_club.asm" +INCLUDE "engine/menus/main_menu.asm" +INCLUDE "engine/movie/oak_speech/oak_speech.asm" +INCLUDE "engine/overworld/special_warps.asm" +INCLUDE "engine/debug/debug_party.asm" +INCLUDE "engine/menus/naming_screen.asm" +INCLUDE "engine/movie/oak_speech/oak_speech2.asm" +INCLUDE "engine/items/subtract_paid_money.asm" +INCLUDE "engine/menus/swap_items.asm" +INCLUDE "engine/events/pokemart.asm" +INCLUDE "engine/pokemon/learn_move.asm" +INCLUDE "engine/events/pokecenter.asm" +INCLUDE "engine/events/set_blackout_map.asm" +INCLUDE "engine/menus/display_text_id_init.asm" +INCLUDE "engine/menus/draw_start_menu.asm" +INCLUDE "engine/link/cable_club_npc.asm" +INCLUDE "engine/menus/text_box.asm" +INCLUDE "engine/battle/move_effects/drain_hp.asm" +INCLUDE "engine/menus/players_pc.asm" +INCLUDE "engine/pokemon/remove_mon.asm" +INCLUDE "engine/events/display_pokedex.asm" SECTION "bank3", ROMX @@ -53,28 +53,28 @@ INCLUDE "data/map_songs.asm" INCLUDE "data/map_header_banks.asm" INCLUDE "engine/overworld/clear_variables.asm" INCLUDE "engine/overworld/player_state.asm" -INCLUDE "engine/overworld/poison.asm" -INCLUDE "engine/overworld/tileset_header.asm" +INCLUDE "engine/events/poison.asm" +INCLUDE "engine/overworld/tilesets.asm" INCLUDE "engine/overworld/daycare_exp.asm" INCLUDE "data/hide_show_data.asm" INCLUDE "engine/overworld/field_move_messages.asm" INCLUDE "engine/items/inventory.asm" INCLUDE "engine/overworld/wild_mons.asm" -INCLUDE "engine/items/items.asm" -INCLUDE "engine/menu/draw_badges.asm" +INCLUDE "engine/items/item_effects.asm" +INCLUDE "engine/menus/draw_badges.asm" INCLUDE "engine/overworld/update_map.asm" INCLUDE "engine/overworld/cut.asm" INCLUDE "engine/overworld/missable_objects.asm" INCLUDE "engine/overworld/push_boulder.asm" -INCLUDE "engine/add_mon.asm" +INCLUDE "engine/pokemon/add_mon.asm" INCLUDE "engine/flag_action.asm" -INCLUDE "engine/heal_party.asm" -INCLUDE "engine/bcd.asm" -INCLUDE "engine/init_player_data.asm" -INCLUDE "engine/get_bag_item_quantity.asm" -INCLUDE "engine/pathfinding.asm" -INCLUDE "engine/hp_bar.asm" -INCLUDE "engine/hidden_object_functions3.asm" +INCLUDE "engine/events/heal_party.asm" +INCLUDE "engine/math/bcd.asm" +INCLUDE "engine/movie/oak_speech/init_player_data.asm" +INCLUDE "engine/items/get_bag_item_quantity.asm" +INCLUDE "engine/overworld/pathfinding.asm" +INCLUDE "engine/gfx/hp_bar.asm" +INCLUDE "engine/events/hidden_object_functions3.asm" SECTION "Graphics (BANK 4)", ROMX @@ -106,33 +106,33 @@ PlayerCharacterTitleGraphicsEnd: SECTION "Battle (BANK 4)", ROMX INCLUDE "engine/overworld/is_player_just_outside_map.asm" -INCLUDE "engine/menu/status_screen.asm" -INCLUDE "engine/menu/party_menu.asm" +INCLUDE "engine/pokemon/status_screen.asm" +INCLUDE "engine/menus/party_menu.asm" RedPicFront:: INCBIN "gfx/player/red.pic" ShrinkPic1:: INCBIN "gfx/player/shrink1.pic" ShrinkPic2:: INCBIN "gfx/player/shrink2.pic" -INCLUDE "engine/turn_sprite.asm" -INCLUDE "engine/menu/start_sub_menus.asm" +INCLUDE "engine/overworld/turn_sprite.asm" +INCLUDE "engine/menus/start_sub_menus.asm" INCLUDE "engine/items/tms.asm" INCLUDE "engine/battle/end_of_battle.asm" INCLUDE "engine/battle/wild_encounters.asm" -INCLUDE "engine/battle/moveEffects/recoil_effect.asm" -INCLUDE "engine/battle/moveEffects/conversion_effect.asm" -INCLUDE "engine/battle/moveEffects/haze_effect.asm" +INCLUDE "engine/battle/move_effects/recoil.asm" +INCLUDE "engine/battle/move_effects/conversion.asm" +INCLUDE "engine/battle/move_effects/haze.asm" INCLUDE "engine/battle/get_trainer_name.asm" -INCLUDE "engine/random.asm" +INCLUDE "engine/math/random.asm" SECTION "Battle (BANK 5)", ROMX -INCLUDE "engine/load_pokedex_tiles.asm" +INCLUDE "engine/gfx/load_pokedex_tiles.asm" INCLUDE "engine/overworld/map_sprites.asm" INCLUDE "engine/overworld/emotion_bubbles.asm" -INCLUDE "engine/evolve_trade.asm" -INCLUDE "engine/battle/moveEffects/substitute_effect.asm" -INCLUDE "engine/menu/pc.asm" +INCLUDE "engine/events/evolve_trade.asm" +INCLUDE "engine/battle/move_effects/substitute.asm" +INCLUDE "engine/menus/pc.asm" SECTION "bank6_1", ROMX @@ -142,7 +142,7 @@ INCLUDE "engine/play_time.asm" SECTION "bank6_2", ROMX -INCLUDE "engine/overworld/npc_movement.asm" +INCLUDE "engine/overworld/auto_movement.asm" INCLUDE "engine/overworld/doors.asm" INCLUDE "engine/overworld/ledges.asm" @@ -150,26 +150,31 @@ INCLUDE "engine/overworld/ledges.asm" SECTION "bank7_1", ROMX INCLUDE "text/monster_names.asm" -INCLUDE "engine/clear_save.asm" -INCLUDE "engine/predefs7.asm" +INCLUDE "engine/movie/oak_speech/clear_save.asm" +INCLUDE "engine/events/elevator.asm" SECTION "bank7_2", ROMX -INCLUDE "engine/menu/oaks_pc.asm" -INCLUDE "engine/hidden_object_functions7.asm" +INCLUDE "engine/menus/oaks_pc.asm" +INCLUDE "engine/events/hidden_object_functions7.asm" + + +SECTION "Bill's PC", ROMX + +INCLUDE "engine/pokemon/bills_pc.asm" SECTION "Battle (BANK 9)", ROMX INCLUDE "engine/battle/print_type.asm" INCLUDE "engine/battle/save_trainer_name.asm" -INCLUDE "engine/battle/moveEffects/focus_energy_effect.asm" +INCLUDE "engine/battle/move_effects/focus_energy.asm" SECTION "Battle (BANK A)", ROMX -INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm" +INCLUDE "engine/battle/move_effects/leech_seed.asm" SECTION "Battle (BANK B)", ROMX @@ -184,24 +189,24 @@ BadgeNumbersTileGraphics: INCBIN "gfx/trainer_card/badge_numbers.2bpp" INCLUDE "engine/items/tmhm.asm" INCLUDE "engine/battle/scale_sprites.asm" -INCLUDE "engine/battle/moveEffects/pay_day_effect.asm" -INCLUDE "engine/game_corner_slots2.asm" +INCLUDE "engine/battle/move_effects/pay_day.asm" +INCLUDE "engine/slots/game_corner_slots2.asm" SECTION "Battle (BANK C)", ROMX -INCLUDE "engine/battle/moveEffects/mist_effect.asm" -INCLUDE "engine/battle/moveEffects/one_hit_ko_effect.asm" +INCLUDE "engine/battle/move_effects/mist.asm" +INCLUDE "engine/battle/move_effects/one_hit_ko.asm" SECTION "Battle (BANK D)", ROMX -INCLUDE "engine/titlescreen2.asm" +INCLUDE "engine/movie/titlescreen2.asm" INCLUDE "engine/battle/link_battle_versus_text.asm" -INCLUDE "engine/slot_machine.asm" -INCLUDE "engine/overworld/pewter_guys.asm" -INCLUDE "engine/multiply_divide.asm" -INCLUDE "engine/game_corner_slots.asm" +INCLUDE "engine/slots/slot_machine.asm" +INCLUDE "engine/events/pewter_guys.asm" +INCLUDE "engine/math/multiply_divide.asm" +INCLUDE "engine/slots/game_corner_slots.asm" SECTION "bankE", ROMX @@ -223,10 +228,10 @@ TradingAnimationGraphicsEnd: TradingAnimationGraphics2: INCBIN "gfx/trade/cable_ball.2bpp" TradingAnimationGraphics2End: -INCLUDE "engine/evos_moves.asm" -INCLUDE "engine/battle/moveEffects/heal_effect.asm" -INCLUDE "engine/battle/moveEffects/transform_effect.asm" -INCLUDE "engine/battle/moveEffects/reflect_light_screen_effect.asm" +INCLUDE "engine/pokemon/evos_moves.asm" +INCLUDE "engine/battle/move_effects/heal.asm" +INCLUDE "engine/battle/move_effects/transform.asm" +INCLUDE "engine/battle/move_effects/reflect_light_screen.asm" SECTION "bankF", ROMX @@ -237,15 +242,15 @@ INCLUDE "engine/battle/effects.asm" SECTION "bank10", ROMX -INCLUDE "engine/menu/pokedex.asm" -INCLUDE "engine/trade.asm" -INCLUDE "engine/intro.asm" -INCLUDE "engine/trade2.asm" +INCLUDE "engine/menus/pokedex.asm" +INCLUDE "engine/movie/trade.asm" +INCLUDE "engine/movie/intro.asm" +INCLUDE "engine/movie/trade2.asm" SECTION "bank11_1", ROMX -INCLUDE "engine/pokedex_rating.asm" +INCLUDE "engine/events/pokedex_rating.asm" SECTION "bank11_2", ROMX @@ -255,22 +260,22 @@ INCLUDE "engine/overworld/hidden_objects.asm" SECTION "bank12", ROMX -INCLUDE "engine/predefs12.asm" +INCLUDE "engine/gfx/screen_effects.asm" SECTION "bank13", ROMX -INCLUDE "engine/give_pokemon.asm" +INCLUDE "engine/events/give_pokemon.asm" INCLUDE "engine/predefs.asm" SECTION "bank14", ROMX INCLUDE "engine/battle/init_battle_variables.asm" -INCLUDE "engine/battle/moveEffects/paralyze_effect.asm" -INCLUDE "engine/overworld/card_key.asm" -INCLUDE "engine/menu/prize_menu.asm" -INCLUDE "engine/hidden_object_functions14.asm" +INCLUDE "engine/battle/move_effects/paralyze.asm" +INCLUDE "engine/events/card_key.asm" +INCLUDE "engine/events/prize_menu.asm" +INCLUDE "engine/events/hidden_object_functions14.asm" SECTION "bank15_1", ROMX @@ -280,41 +285,41 @@ INCLUDE "engine/battle/experience.asm" SECTION "bank15_2", ROMX -INCLUDE "engine/menu/diploma.asm" -INCLUDE "engine/overworld/trainers.asm" +INCLUDE "engine/events/diploma.asm" +INCLUDE "engine/overworld/trainer_sight.asm" SECTION "bank16_1", ROMX INCLUDE "engine/battle/common_text.asm" -INCLUDE "engine/experience.asm" -INCLUDE "engine/overworld/oaks_aide.asm" +INCLUDE "engine/pokemon/experience.asm" +INCLUDE "engine/events/oaks_aide.asm" SECTION "bank16_2", ROMX -INCLUDE "engine/overworld/saffron_guards.asm" +INCLUDE "engine/events/saffron_guards.asm" SECTION "bank17_1", ROMX -INCLUDE "engine/predefs17.asm" +INCLUDE "engine/events/starter_dex.asm" SECTION "bank17_2", ROMX -INCLUDE "engine/predefs17_2.asm" -INCLUDE "engine/hidden_object_functions17.asm" +INCLUDE "engine/pokemon/set_types.asm" +INCLUDE "engine/events/hidden_object_functions17.asm" SECTION "bank18_1", ROMX -INCLUDE "engine/overworld/cinnabar_lab.asm" +INCLUDE "engine/events/cinnabar_lab.asm" SECTION "bank18_2", ROMX -INCLUDE "engine/hidden_object_functions18.asm" +INCLUDE "engine/events/hidden_object_functions18.asm" SECTION "bank1A", ROMX @@ -333,42 +338,42 @@ Version_GFXEnd: SECTION "bank1C", ROMX -INCLUDE "engine/gamefreak.asm" -INCLUDE "engine/hall_of_fame.asm" +INCLUDE "engine/movie/gamefreak.asm" +INCLUDE "engine/movie/hall_of_fame.asm" INCLUDE "engine/overworld/healing_machine.asm" INCLUDE "engine/overworld/player_animations.asm" INCLUDE "engine/battle/ghost_marowak_anim.asm" INCLUDE "engine/battle/battle_transitions.asm" -INCLUDE "engine/town_map.asm" -INCLUDE "engine/mon_party_sprites.asm" -INCLUDE "engine/in_game_trades.asm" -INCLUDE "engine/palettes.asm" -INCLUDE "engine/save.asm" +INCLUDE "engine/items/town_map.asm" +INCLUDE "engine/gfx/mon_icons.asm" +INCLUDE "engine/events/in_game_trades.asm" +INCLUDE "engine/gfx/palettes.asm" +INCLUDE "engine/menus/save.asm" SECTION "bank1D_1", ROMX -INCLUDE "engine/HoF_room_pc.asm" -INCLUDE "engine/status_ailments.asm" +INCLUDE "engine/movie/credits.asm" +INCLUDE "engine/pokemon/status_ailments.asm" INCLUDE "engine/items/itemfinder.asm" SECTION "bank1D_2", ROMX -INCLUDE "engine/menu/vending_machine.asm" +INCLUDE "engine/events/vending_machine.asm" SECTION "bank1D_3", ROMX -INCLUDE "engine/menu/league_pc.asm" -INCLUDE "engine/overworld/hidden_items.asm" +INCLUDE "engine/menus/league_pc.asm" +INCLUDE "engine/events/hidden_items.asm" SECTION "bank1E", ROMX INCLUDE "engine/battle/animations.asm" INCLUDE "engine/overworld/cut2.asm" -INCLUDE "engine/overworld/ssanne.asm" +INCLUDE "engine/overworld/dust_smoke.asm" RedFishingTilesFront: INCBIN "gfx/overworld/red_fish_front.2bpp" RedFishingTilesBack: INCBIN "gfx/overworld/red_fish_back.2bpp" @@ -376,6 +381,6 @@ RedFishingTilesSide: INCBIN "gfx/overworld/red_fish_side.2bpp" RedFishingRodTiles: INCBIN "gfx/overworld/fishing_rod.2bpp" INCLUDE "data/animations.asm" -INCLUDE "engine/evolution.asm" +INCLUDE "engine/movie/evolution.asm" INCLUDE "engine/overworld/elevator.asm" INCLUDE "engine/items/tm_prices.asm" |