diff --git a/Makefile b/Makefile index 4a63a9128..cb2c366d0 100644 --- a/Makefile +++ b/Makefile @@ -21,8 +21,8 @@ data/maps/map_data.o \ data/pokemon/dex_entries.o \ data/pokemon/egg_moves.o \ data/pokemon/evos_attacks.o \ -engine/credits.o \ -engine/events.o \ +engine/title/credits.o \ +engine/overworld/events.o \ gfx/pics.o \ gfx/sprites.o \ lib/mobile/main.o diff --git a/engine/diploma.asm b/engine/events/diploma.asm similarity index 100% rename from engine/diploma.asm rename to engine/events/diploma.asm diff --git a/engine/card_flip.asm b/engine/game/card_flip.asm similarity index 100% rename from engine/card_flip.asm rename to engine/game/card_flip.asm diff --git a/engine/dummy_game.asm b/engine/game/dummy_game.asm similarity index 100% rename from engine/dummy_game.asm rename to engine/game/dummy_game.asm diff --git a/engine/slot_machine.asm b/engine/game/slot_machine.asm similarity index 100% rename from engine/slot_machine.asm rename to engine/game/slot_machine.asm diff --git a/engine/unown_puzzle.asm b/engine/game/unown_puzzle.asm similarity index 100% rename from engine/unown_puzzle.asm rename to engine/game/unown_puzzle.asm diff --git a/engine/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm similarity index 100% rename from engine/cgb_layouts.asm rename to engine/gfx/cgb_layouts.asm diff --git a/engine/color.asm b/engine/gfx/color.asm similarity index 99% rename from engine/color.asm rename to engine/gfx/color.asm index b0bc653b0..6cf896ff4 100644 --- a/engine/color.asm +++ b/engine/gfx/color.asm @@ -1,4 +1,4 @@ -INCLUDE "engine/sgb_layouts.asm" +INCLUDE "engine/gfx/sgb_layouts.asm" SHINY_ATK_BIT EQU 5 SHINY_DEF_VAL EQU 10 @@ -445,7 +445,7 @@ LoadMailPalettes: .MailPals: INCLUDE "gfx/mail/mail.pal" -INCLUDE "engine/cgb_layouts.asm" +INCLUDE "engine/gfx/cgb_layouts.asm" Unreferenced_Function95f0: ld hl, .Palette diff --git a/engine/crystal_layouts.asm b/engine/gfx/crystal_layouts.asm similarity index 99% rename from engine/crystal_layouts.asm rename to engine/gfx/crystal_layouts.asm index d6b193e9d..0133916e5 100755 --- a/engine/crystal_layouts.asm +++ b/engine/gfx/crystal_layouts.asm @@ -203,7 +203,7 @@ Function49496: ; 49496 ret ; 494ac -INCLUDE "engine/tileset_palettes.asm" +INCLUDE "engine/gfx/tileset_palettes.asm" MG_Mobile_Layout02: ; 49706 ld hl, .Palette_49732 diff --git a/engine/evolution_animation.asm b/engine/gfx/evolution_animation.asm similarity index 100% rename from engine/evolution_animation.asm rename to engine/gfx/evolution_animation.asm diff --git a/engine/gbc_only.asm b/engine/gfx/gbc_only.asm similarity index 100% rename from engine/gbc_only.asm rename to engine/gfx/gbc_only.asm diff --git a/engine/load_font.asm b/engine/gfx/load_font.asm similarity index 100% rename from engine/load_font.asm rename to engine/gfx/load_font.asm diff --git a/engine/load_pics.asm b/engine/gfx/load_pics.asm similarity index 100% rename from engine/load_pics.asm rename to engine/gfx/load_pics.asm diff --git a/engine/map_palettes.asm b/engine/gfx/map_palettes.asm similarity index 100% rename from engine/map_palettes.asm rename to engine/gfx/map_palettes.asm diff --git a/engine/mapgroup_roofs.asm b/engine/gfx/mapgroup_roofs.asm similarity index 100% rename from engine/mapgroup_roofs.asm rename to engine/gfx/mapgroup_roofs.asm diff --git a/engine/mon_icons.asm b/engine/gfx/mon_icons.asm similarity index 100% rename from engine/mon_icons.asm rename to engine/gfx/mon_icons.asm diff --git a/engine/pic_animation.asm b/engine/gfx/pic_animation.asm similarity index 100% rename from engine/pic_animation.asm rename to engine/gfx/pic_animation.asm diff --git a/engine/player_gfx.asm b/engine/gfx/player_gfx.asm similarity index 100% rename from engine/player_gfx.asm rename to engine/gfx/player_gfx.asm diff --git a/engine/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm similarity index 100% rename from engine/sgb_layouts.asm rename to engine/gfx/sgb_layouts.asm diff --git a/engine/sprite_anims.asm b/engine/gfx/sprite_anims.asm similarity index 100% rename from engine/sprite_anims.asm rename to engine/gfx/sprite_anims.asm diff --git a/engine/sprites.asm b/engine/gfx/sprites.asm similarity index 99% rename from engine/sprites.asm rename to engine/gfx/sprites.asm index 99d1d2ae4..63666c624 100755 --- a/engine/sprites.asm +++ b/engine/gfx/sprites.asm @@ -552,7 +552,7 @@ Unreferenced_BrokenGetStdGraphics: ; 8d1ac INCLUDE "data/sprite_anims/sequences.asm" -INCLUDE "engine/sprite_anims.asm" +INCLUDE "engine/gfx/sprite_anims.asm" INCLUDE "data/sprite_anims/framesets.asm" diff --git a/engine/tileset_anims.asm b/engine/gfx/tileset_anims.asm similarity index 100% rename from engine/tileset_anims.asm rename to engine/gfx/tileset_anims.asm diff --git a/engine/tileset_palettes.asm b/engine/gfx/tileset_palettes.asm similarity index 100% rename from engine/tileset_palettes.asm rename to engine/gfx/tileset_palettes.asm diff --git a/engine/timeofdaypals.asm b/engine/gfx/timeofdaypals.asm similarity index 100% rename from engine/timeofdaypals.asm rename to engine/gfx/timeofdaypals.asm diff --git a/engine/trade_animation.asm b/engine/gfx/trade_animation.asm similarity index 100% rename from engine/trade_animation.asm rename to engine/gfx/trade_animation.asm diff --git a/engine/link.asm b/engine/link/link.asm similarity index 99% rename from engine/link.asm rename to engine/link/link.asm index c693e6919..86af41c01 100755 --- a/engine/link.asm +++ b/engine/link/link.asm @@ -2029,7 +2029,7 @@ Unreferenced_Function28f09: ; 28f09 ret ; 28f24 -INCLUDE "engine/trade_animation.asm" +INCLUDE "engine/gfx/trade_animation.asm" CheckTimeCapsuleCompatibility: ; 29bfb ; Checks to see if your party is compatible with the Gen 1 games. diff --git a/engine/link_2.asm b/engine/link/link_2.asm similarity index 100% rename from engine/link_2.asm rename to engine/link/link_2.asm diff --git a/engine/link_trade.asm b/engine/link/link_trade.asm similarity index 100% rename from engine/link_trade.asm rename to engine/link/link_trade.asm diff --git a/engine/mystery_gift.asm b/engine/link/mystery_gift.asm similarity index 100% rename from engine/mystery_gift.asm rename to engine/link/mystery_gift.asm diff --git a/engine/mystery_gift_2.asm b/engine/link/mystery_gift_2.asm similarity index 100% rename from engine/mystery_gift_2.asm rename to engine/link/mystery_gift_2.asm diff --git a/engine/time_capsule.asm b/engine/link/time_capsule.asm similarity index 100% rename from engine/time_capsule.asm rename to engine/link/time_capsule.asm diff --git a/engine/time_capsule_2.asm b/engine/link/time_capsule_2.asm similarity index 100% rename from engine/time_capsule_2.asm rename to engine/link/time_capsule_2.asm diff --git a/engine/buy_sell_toss.asm b/engine/menu/buy_sell_toss.asm similarity index 100% rename from engine/buy_sell_toss.asm rename to engine/menu/buy_sell_toss.asm diff --git a/engine/clock_reset.asm b/engine/menu/clock_reset.asm similarity index 100% rename from engine/clock_reset.asm rename to engine/menu/clock_reset.asm diff --git a/engine/delete_save_change_clock.asm b/engine/menu/delete_save_change_clock.asm similarity index 100% rename from engine/delete_save_change_clock.asm rename to engine/menu/delete_save_change_clock.asm diff --git a/engine/main_menu.asm b/engine/menu/main_menu.asm similarity index 100% rename from engine/main_menu.asm rename to engine/menu/main_menu.asm diff --git a/engine/mart.asm b/engine/menu/mart.asm similarity index 100% rename from engine/mart.asm rename to engine/menu/mart.asm diff --git a/engine/menu.asm b/engine/menu/menu.asm similarity index 100% rename from engine/menu.asm rename to engine/menu/menu.asm diff --git a/engine/menu_2.asm b/engine/menu/menu_2.asm similarity index 100% rename from engine/menu_2.asm rename to engine/menu/menu_2.asm diff --git a/engine/mon_menu.asm b/engine/menu/mon_menu.asm similarity index 100% rename from engine/mon_menu.asm rename to engine/menu/mon_menu.asm diff --git a/engine/naming_screen.asm b/engine/menu/naming_screen.asm similarity index 100% rename from engine/naming_screen.asm rename to engine/menu/naming_screen.asm diff --git a/engine/options_menu.asm b/engine/menu/options_menu.asm similarity index 100% rename from engine/options_menu.asm rename to engine/menu/options_menu.asm diff --git a/engine/pack.asm b/engine/menu/pack.asm similarity index 100% rename from engine/pack.asm rename to engine/menu/pack.asm diff --git a/engine/scrolling_menu.asm b/engine/menu/scrolling_menu.asm similarity index 100% rename from engine/scrolling_menu.asm rename to engine/menu/scrolling_menu.asm diff --git a/engine/start_menu.asm b/engine/menu/start_menu.asm similarity index 100% rename from engine/start_menu.asm rename to engine/menu/start_menu.asm diff --git a/engine/switch_items.asm b/engine/menu/switch_items.asm similarity index 100% rename from engine/switch_items.asm rename to engine/menu/switch_items.asm diff --git a/engine/timeset.asm b/engine/menu/timeset.asm similarity index 100% rename from engine/timeset.asm rename to engine/menu/timeset.asm diff --git a/engine/tmhm.asm b/engine/menu/tmhm.asm similarity index 100% rename from engine/tmhm.asm rename to engine/menu/tmhm.asm diff --git a/engine/trainer_card.asm b/engine/menu/trainer_card.asm similarity index 100% rename from engine/trainer_card.asm rename to engine/menu/trainer_card.asm diff --git a/engine/decorations.asm b/engine/overworld/decorations.asm similarity index 100% rename from engine/decorations.asm rename to engine/overworld/decorations.asm diff --git a/engine/events.asm b/engine/overworld/events.asm similarity index 99% rename from engine/events.asm rename to engine/overworld/events.asm index 35a54138b..cc2c8c574 100644 --- a/engine/events.asm +++ b/engine/overworld/events.asm @@ -1106,6 +1106,6 @@ ChangeDirectionScript: ; 9 end ; 96c56 -INCLUDE "engine/scripting.asm" +INCLUDE "engine/overworld/scripting.asm" -INCLUDE "engine/events_2.asm" +INCLUDE "engine/overworld/events_2.asm" diff --git a/engine/events_2.asm b/engine/overworld/events_2.asm similarity index 100% rename from engine/events_2.asm rename to engine/overworld/events_2.asm diff --git a/engine/init_map.asm b/engine/overworld/init_map.asm similarity index 100% rename from engine/init_map.asm rename to engine/overworld/init_map.asm diff --git a/engine/landmarks.asm b/engine/overworld/landmarks.asm similarity index 100% rename from engine/landmarks.asm rename to engine/overworld/landmarks.asm diff --git a/engine/map_object_action.asm b/engine/overworld/map_object_action.asm similarity index 100% rename from engine/map_object_action.asm rename to engine/overworld/map_object_action.asm diff --git a/engine/map_objects.asm b/engine/overworld/map_objects.asm similarity index 99% rename from engine/map_objects.asm rename to engine/overworld/map_objects.asm index 78d9062ef..8d6f4082f 100644 --- a/engine/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -185,7 +185,7 @@ _HandleObjectAction ret ; 445f -INCLUDE "engine/map_object_action.asm" +INCLUDE "engine/overworld/map_object_action.asm" CopyNextCoordsTileToStandingCoordsTile: ; 4600 ld hl, OBJECT_NEXT_MAP_X @@ -1990,7 +1990,7 @@ DoMovementFunction: ; 506b ret ; 5075 -INCLUDE "engine/movement.asm" +INCLUDE "engine/overworld/movement.asm" ; 54b8 ApplyMovementToFollower: ; 54b8 diff --git a/engine/map_objects_2.asm b/engine/overworld/map_objects_2.asm similarity index 100% rename from engine/map_objects_2.asm rename to engine/overworld/map_objects_2.asm diff --git a/engine/map_setup.asm b/engine/overworld/map_setup.asm similarity index 100% rename from engine/map_setup.asm rename to engine/overworld/map_setup.asm diff --git a/engine/movement.asm b/engine/overworld/movement.asm similarity index 100% rename from engine/movement.asm rename to engine/overworld/movement.asm diff --git a/engine/npc_movement.asm b/engine/overworld/npc_movement.asm similarity index 100% rename from engine/npc_movement.asm rename to engine/overworld/npc_movement.asm diff --git a/engine/overworld.asm b/engine/overworld/overworld.asm similarity index 100% rename from engine/overworld.asm rename to engine/overworld/overworld.asm diff --git a/engine/player_movement.asm b/engine/overworld/player_movement.asm similarity index 100% rename from engine/player_movement.asm rename to engine/overworld/player_movement.asm diff --git a/engine/player_object.asm b/engine/overworld/player_object.asm similarity index 100% rename from engine/player_object.asm rename to engine/overworld/player_object.asm diff --git a/engine/player_step.asm b/engine/overworld/player_step.asm similarity index 100% rename from engine/player_step.asm rename to engine/overworld/player_step.asm diff --git a/engine/scripting.asm b/engine/overworld/scripting.asm similarity index 100% rename from engine/scripting.asm rename to engine/overworld/scripting.asm diff --git a/engine/select_menu.asm b/engine/overworld/select_menu.asm similarity index 100% rename from engine/select_menu.asm rename to engine/overworld/select_menu.asm diff --git a/engine/spawn_points.asm b/engine/overworld/spawn_points.asm similarity index 100% rename from engine/spawn_points.asm rename to engine/overworld/spawn_points.asm diff --git a/engine/tile_events.asm b/engine/overworld/tile_events.asm similarity index 100% rename from engine/tile_events.asm rename to engine/overworld/tile_events.asm diff --git a/engine/time.asm b/engine/overworld/time.asm similarity index 100% rename from engine/time.asm rename to engine/overworld/time.asm diff --git a/engine/variables.asm b/engine/overworld/variables.asm similarity index 100% rename from engine/variables.asm rename to engine/overworld/variables.asm diff --git a/engine/warp_connection.asm b/engine/overworld/warp_connection.asm similarity index 100% rename from engine/warp_connection.asm rename to engine/overworld/warp_connection.asm diff --git a/engine/wildmons.asm b/engine/overworld/wildmons.asm similarity index 100% rename from engine/wildmons.asm rename to engine/overworld/wildmons.asm diff --git a/engine/pokegear.asm b/engine/pokegear/pokegear.asm similarity index 100% rename from engine/pokegear.asm rename to engine/pokegear/pokegear.asm diff --git a/engine/radio.asm b/engine/pokegear/radio.asm similarity index 100% rename from engine/radio.asm rename to engine/pokegear/radio.asm diff --git a/engine/billspc.asm b/engine/pokemon/billspc.asm similarity index 100% rename from engine/billspc.asm rename to engine/pokemon/billspc.asm diff --git a/engine/billspctop.asm b/engine/pokemon/billspctop.asm similarity index 100% rename from engine/billspctop.asm rename to engine/pokemon/billspctop.asm diff --git a/engine/breeding.asm b/engine/pokemon/breeding.asm similarity index 100% rename from engine/breeding.asm rename to engine/pokemon/breeding.asm diff --git a/engine/caught_data.asm b/engine/pokemon/caught_data.asm similarity index 100% rename from engine/caught_data.asm rename to engine/pokemon/caught_data.asm diff --git a/engine/european_mail.asm b/engine/pokemon/european_mail.asm similarity index 100% rename from engine/european_mail.asm rename to engine/pokemon/european_mail.asm diff --git a/engine/evolve.asm b/engine/pokemon/evolve.asm similarity index 100% rename from engine/evolve.asm rename to engine/pokemon/evolve.asm diff --git a/engine/experience.asm b/engine/pokemon/experience.asm similarity index 100% rename from engine/experience.asm rename to engine/pokemon/experience.asm diff --git a/engine/health.asm b/engine/pokemon/health.asm similarity index 100% rename from engine/health.asm rename to engine/pokemon/health.asm diff --git a/engine/learn.asm b/engine/pokemon/learn.asm similarity index 100% rename from engine/learn.asm rename to engine/pokemon/learn.asm diff --git a/engine/mail.asm b/engine/pokemon/mail.asm similarity index 100% rename from engine/mail.asm rename to engine/pokemon/mail.asm diff --git a/engine/mail_2.asm b/engine/pokemon/mail_2.asm similarity index 100% rename from engine/mail_2.asm rename to engine/pokemon/mail_2.asm diff --git a/engine/mon_stats.asm b/engine/pokemon/mon_stats.asm similarity index 100% rename from engine/mon_stats.asm rename to engine/pokemon/mon_stats.asm diff --git a/engine/move_mon.asm b/engine/pokemon/move_mon.asm similarity index 100% rename from engine/move_mon.asm rename to engine/pokemon/move_mon.asm diff --git a/engine/move_mon_wo_mail.asm b/engine/pokemon/move_mon_wo_mail.asm similarity index 100% rename from engine/move_mon_wo_mail.asm rename to engine/pokemon/move_mon_wo_mail.asm diff --git a/engine/party_menu.asm b/engine/pokemon/party_menu.asm similarity index 100% rename from engine/party_menu.asm rename to engine/pokemon/party_menu.asm diff --git a/engine/search.asm b/engine/pokemon/search.asm similarity index 100% rename from engine/search.asm rename to engine/pokemon/search.asm diff --git a/engine/search2.asm b/engine/pokemon/search2.asm similarity index 100% rename from engine/search2.asm rename to engine/pokemon/search2.asm diff --git a/engine/stats_screen.asm b/engine/pokemon/stats_screen.asm similarity index 100% rename from engine/stats_screen.asm rename to engine/pokemon/stats_screen.asm diff --git a/engine/tempmon.asm b/engine/pokemon/tempmon.asm similarity index 100% rename from engine/tempmon.asm rename to engine/pokemon/tempmon.asm diff --git a/engine/tmhm2.asm b/engine/pokemon/tmhm.asm similarity index 100% rename from engine/tmhm2.asm rename to engine/pokemon/tmhm.asm diff --git a/engine/types.asm b/engine/pokemon/types.asm similarity index 100% rename from engine/types.asm rename to engine/pokemon/types.asm diff --git a/engine/print_party.asm b/engine/printer/print_party.asm similarity index 100% rename from engine/print_party.asm rename to engine/printer/print_party.asm diff --git a/engine/printer.asm b/engine/printer/printer.asm similarity index 99% rename from engine/printer.asm rename to engine/printer/printer.asm index b9e55ef2a..0264b4f7a 100755 --- a/engine/printer.asm +++ b/engine/printer/printer.asm @@ -1,4 +1,4 @@ -INCLUDE "engine/printer_serial.asm" +INCLUDE "engine/printer/printer_serial.asm" SendScreenToPrinter: ; 843f0 .loop diff --git a/engine/printer_serial.asm b/engine/printer/printer_serial.asm similarity index 100% rename from engine/printer_serial.asm rename to engine/printer/printer_serial.asm diff --git a/engine/math.asm b/engine/routines/math.asm similarity index 100% rename from engine/math.asm rename to engine/routines/math.asm diff --git a/engine/printnum.asm b/engine/routines/printnum.asm similarity index 100% rename from engine/printnum.asm rename to engine/routines/printnum.asm diff --git a/engine/credits.asm b/engine/title/credits.asm similarity index 100% rename from engine/credits.asm rename to engine/title/credits.asm diff --git a/engine/crystal_intro.asm b/engine/title/crystal_intro.asm similarity index 100% rename from engine/crystal_intro.asm rename to engine/title/crystal_intro.asm diff --git a/engine/init_hof_credits.asm b/engine/title/init_hof_credits.asm similarity index 100% rename from engine/init_hof_credits.asm rename to engine/title/init_hof_credits.asm diff --git a/engine/title.asm b/engine/title/title.asm similarity index 100% rename from engine/title.asm rename to engine/title/title.asm diff --git a/engine/unused_title.asm b/engine/title/unused_title.asm similarity index 100% rename from engine/unused_title.asm rename to engine/title/unused_title.asm diff --git a/main.asm b/main.asm index 64be1ded4..af4b61b75 100644 --- a/main.asm +++ b/main.asm @@ -5,38 +5,38 @@ SECTION "bank1", ROMX INCLUDE "engine/routines/placewaitingtext.asm" INCLUDE "engine/routines/loadpushoam.asm" -INCLUDE "engine/map_objects.asm" +INCLUDE "engine/overworld/map_objects.asm" INCLUDE "engine/intro_menu.asm" -INCLUDE "engine/init_map.asm" -INCLUDE "engine/learn.asm" +INCLUDE "engine/overworld/init_map.asm" +INCLUDE "engine/pokemon/learn.asm" INCLUDE "engine/routines/checknickerrors.asm" -INCLUDE "engine/math.asm" +INCLUDE "engine/routines/math.asm" INCLUDE "data/items/attributes.asm" -INCLUDE "engine/npc_movement.asm" +INCLUDE "engine/overworld/npc_movement.asm" INCLUDE "engine/events/happiness_egg.asm" INCLUDE "engine/events/specials_2.asm" SECTION "bank2", ROMX -INCLUDE "engine/player_object.asm" +INCLUDE "engine/overworld/player_object.asm" INCLUDE "engine/routines/sine.asm" INCLUDE "engine/predef.asm" -INCLUDE "engine/color.asm" +INCLUDE "engine/gfx/color.asm" SECTION "bank3", ROMX INCLUDE "engine/routines/checktime.asm" INCLUDE "engine/events/specials.asm" -INCLUDE "engine/printnum.asm" -INCLUDE "engine/health.asm" +INCLUDE "engine/routines/printnum.asm" +INCLUDE "engine/pokemon/health.asm" INCLUDE "engine/events/overworld.asm" INCLUDE "engine/items.asm" -INCLUDE "engine/player_step.asm" +INCLUDE "engine/overworld/player_step.asm" INCLUDE "engine/battle/anim_hp_bar.asm" -INCLUDE "engine/move_mon.asm" -INCLUDE "engine/billspctop.asm" +INCLUDE "engine/pokemon/move_mon.asm" +INCLUDE "engine/pokemon/billspctop.asm" INCLUDE "engine/routines/getbreedmonlevelgrowth.asm" INCLUDE "engine/events/bug_contest/caught_mon.asm" INCLUDE "engine/item_effects.asm" @@ -46,17 +46,17 @@ INCLUDE "engine/routines/knowsmove.asm" SECTION "bank4", ROMX -INCLUDE "engine/pack.asm" -INCLUDE "engine/time.asm" -INCLUDE "engine/tmhm.asm" -INCLUDE "engine/naming_screen.asm" +INCLUDE "engine/menu/pack.asm" +INCLUDE "engine/overworld/time.asm" +INCLUDE "engine/menu/tmhm.asm" +INCLUDE "engine/menu/naming_screen.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 "engine/menu/start_menu.asm" +INCLUDE "engine/overworld/select_menu.asm" INCLUDE "engine/events/elevator.asm" INCLUDE "engine/events/bug_contest/contest.asm" INCLUDE "engine/events/misc_scripts_2.asm" @@ -71,49 +71,49 @@ INCLUDE "engine/routines/getsquareroot.asm" SECTION "bank5", ROMX INCLUDE "engine/rtc.asm" -INCLUDE "engine/overworld.asm" -INCLUDE "engine/tile_events.asm" +INCLUDE "engine/overworld/overworld.asm" +INCLUDE "engine/overworld/tile_events.asm" INCLUDE "engine/save.asm" -INCLUDE "engine/spawn_points.asm" -INCLUDE "engine/map_setup.asm" +INCLUDE "engine/overworld/spawn_points.asm" +INCLUDE "engine/overworld/map_setup.asm" INCLUDE "engine/events/pokecenter_pc.asm" -INCLUDE "engine/mart.asm" +INCLUDE "engine/menu/mart.asm" INCLUDE "engine/money.asm" INCLUDE "data/items/marts.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" +INCLUDE "engine/pokemon/breeding.asm" INCLUDE "gfx/tilesets.asm" SECTION "Roofs", ROMX -INCLUDE "engine/mapgroup_roofs.asm" +INCLUDE "engine/gfx/mapgroup_roofs.asm" SECTION "Clock Reset", ROMX -INCLUDE "engine/clock_reset.asm" +INCLUDE "engine/menu/clock_reset.asm" SECTION "bank9", ROMX INCLUDE "data/text_buffers.asm" -INCLUDE "engine/menu.asm" +INCLUDE "engine/menu/menu.asm" INCLUDE "engine/routines/updateitemdescription.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 "engine/overworld/map_objects_2.asm" +INCLUDE "engine/menu/scrolling_menu.asm" +INCLUDE "engine/menu/switch_items.asm" +INCLUDE "engine/menu/menu_2.asm" +INCLUDE "engine/menu/mon_menu.asm" INCLUDE "engine/battle/menu.asm" -INCLUDE "engine/buy_sell_toss.asm" -INCLUDE "engine/trainer_card.asm" +INCLUDE "engine/menu/buy_sell_toss.asm" +INCLUDE "engine/menu/trainer_card.asm" INCLUDE "engine/events/prof_oaks_pc.asm" -INCLUDE "engine/decorations.asm" +INCLUDE "engine/overworld/decorations.asm" INCLUDE "engine/routines/leveluphappinessmod.asm" INCLUDE "engine/battle/read_trainer_dvs.asm" INCLUDE "data/trainers/dvs.asm" @@ -126,8 +126,8 @@ INCLUDE "engine/events/kurt_selectquantity_interpretjoypad.asm" SECTION "bankA", ROMX -INCLUDE "engine/link.asm" -INCLUDE "engine/wildmons.asm" +INCLUDE "engine/link/link.asm" +INCLUDE "engine/overworld/wildmons.asm" INCLUDE "engine/battle/link_result.asm" ChrisBackpic: ; 2ba1a @@ -143,8 +143,8 @@ 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 "engine/link/mystery_gift_2.asm" +INCLUDE "engine/pokemon/tmhm.asm" INCLUDE "data/moves/descriptions.asm" INCLUDE "engine/events/pokerus/pokerus.asm" INCLUDE "engine/battle/start_battle.asm" @@ -177,7 +177,7 @@ SECTION "bank10", ROMX INCLUDE "engine/pokedex/pokedex.asm" INCLUDE "data/moves/moves.asm" -INCLUDE "engine/evolve.asm" +INCLUDE "engine/pokemon/evolve.asm" SECTION "bank11", ROMX @@ -186,7 +186,7 @@ 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/mail.asm" +INCLUDE "engine/pokemon/mail.asm" SECTION "Crystal Features 1", ROMX @@ -194,18 +194,18 @@ SECTION "Crystal Features 1", ROMX INCLUDE "engine/init_gender.asm" INCLUDE "engine/routines/drawkrispackgfx.asm" INCLUDE "engine/events/move_tutor.asm" -INCLUDE "engine/crystal_layouts.asm" +INCLUDE "engine/gfx/crystal_layouts.asm" INCLUDE "engine/events/celebi.asm" -INCLUDE "engine/main_menu.asm" +INCLUDE "engine/menu/main_menu.asm" INCLUDE "mobile/mobile_menu.asm" -INCLUDE "engine/search.asm" +INCLUDE "engine/pokemon/search.asm" INCLUDE "mobile/mobile_12_2.asm" INCLUDE "engine/events/buena_menu.asm" SECTION "bank13", ROMX -INCLUDE "engine/map_palettes.asm" +INCLUDE "engine/gfx/map_palettes.asm" INCLUDE "gfx/tileset_palette_maps.asm" INCLUDE "data/collision_permissions.asm" INCLUDE "engine/routines/emptyallsrambanks.asm" @@ -221,45 +221,45 @@ INCBIN "gfx/new_game/shrink1.2bpp.lz" Shrink2Pic: ; 4d2d9 INCBIN "gfx/new_game/shrink2.2bpp.lz" -INCLUDE "engine/link_2.asm" -INCLUDE "engine/delete_save_change_clock.asm" +INCLUDE "engine/link/link_2.asm" +INCLUDE "engine/menu/delete_save_change_clock.asm" INCLUDE "data/tilesets.asm" INCLUDE "engine/routines/flagpredef.asm" INCLUDE "engine/routines/trademonfrontpic.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 "engine/pokemon/caught_data.asm" +INCLUDE "engine/pokemon/search2.asm" +INCLUDE "engine/pokemon/stats_screen.asm" INCLUDE "engine/events/catch_tutorial.asm" -INCLUDE "engine/evolution_animation.asm" -INCLUDE "engine/init_hof_credits.asm" +INCLUDE "engine/gfx/evolution_animation.asm" +INCLUDE "engine/title/init_hof_credits.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" -INCLUDE "engine/gbc_only.asm" +INCLUDE "engine/gfx/gbc_only.asm" INCLUDE "engine/events/poke_seer.asm" SECTION "bank14", ROMX -INCLUDE "engine/party_menu.asm" +INCLUDE "engine/pokemon/party_menu.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 "engine/types.asm" +INCLUDE "engine/pokemon/tempmon.asm" +INCLUDE "engine/pokemon/types.asm" INCLUDE "engine/routines/unreferenced_getgen1trainerclassname.asm" -INCLUDE "engine/mon_stats.asm" +INCLUDE "engine/pokemon/mon_stats.asm" INCLUDE "engine/routines/initlist.asm" -INCLUDE "engine/experience.asm" +INCLUDE "engine/pokemon/experience.asm" INCLUDE "engine/routines/switchpartymons.asm" -INCLUDE "engine/load_pics.asm" -INCLUDE "engine/move_mon_wo_mail.asm" +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" @@ -276,16 +276,16 @@ INCLUDE "data/phone/text/extra.asm" SECTION "bank20", ROMX -INCLUDE "engine/player_movement.asm" +INCLUDE "engine/overworld/player_movement.asm" INCLUDE "engine/engine_flags.asm" -INCLUDE "engine/variables.asm" +INCLUDE "engine/overworld/variables.asm" INCLUDE "data/text/battle.asm" INCLUDE "engine/debug.asm" SECTION "bank21", ROMX -INCLUDE "engine/printer.asm" +INCLUDE "engine/printer/printer.asm" INCLUDE "gfx/battle_anims.asm" INCLUDE "engine/events/halloffame.asm" @@ -293,7 +293,7 @@ INCLUDE "engine/events/halloffame.asm" SECTION "Crystal Features 2", ROMX INCLUDE "engine/events/kurt.asm" -INCLUDE "engine/player_gfx.asm" +INCLUDE "engine/gfx/player_gfx.asm" INCLUDE "mobile/mobile_22.asm" INCLUDE "engine/events/unown_walls.asm" INCLUDE "engine/events/buena.asm" @@ -304,22 +304,22 @@ INCLUDE "mobile/mobile_22_2.asm" SECTION "bank23", ROMX -INCLUDE "engine/timeofdaypals.asm" +INCLUDE "engine/gfx/timeofdaypals.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" +INCLUDE "engine/gfx/sprites.asm" +INCLUDE "engine/gfx/mon_icons.asm" SECTION "bank24", ROMX INCLUDE "engine/phone/phone.asm" -INCLUDE "engine/timeset.asm" -INCLUDE "engine/pokegear.asm" +INCLUDE "engine/menu/timeset.asm" +INCLUDE "engine/pokegear/pokegear.asm" INCLUDE "engine/events/fish.asm" -INCLUDE "engine/slot_machine.asm" +INCLUDE "engine/game/slot_machine.asm" SECTION "Phone Engine", ROMX @@ -356,8 +356,8 @@ 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" +INCLUDE "engine/pokegear/radio.asm" +INCLUDE "engine/pokemon/mail_2.asm" SECTION "bank2F", ROMX @@ -393,7 +393,7 @@ INCLUDE "data/battle_anims/object_gfx.asm" SECTION "Pic Animations 1", ROMX -INCLUDE "engine/pic_animation.asm" +INCLUDE "engine/gfx/pic_animation.asm" INCLUDE "gfx/pokemon/anim_pointers.asm" INCLUDE "gfx/pokemon/anims.asm" INCLUDE "gfx/pokemon/idle_pointers.asm" @@ -430,10 +430,10 @@ INCLUDE "gfx/pokemon/unown_frames.asm" SECTION "bank38", ROMX INCLUDE "engine/events/print_unown_2.asm" -INCLUDE "engine/card_flip.asm" -INCLUDE "engine/unown_puzzle.asm" -INCLUDE "engine/dummy_game.asm" -INCLUDE "engine/billspc.asm" +INCLUDE "engine/game/card_flip.asm" +INCLUDE "engine/game/unown_puzzle.asm" +INCLUDE "engine/game/dummy_game.asm" +INCLUDE "engine/pokemon/billspc.asm" SECTION "bank39", ROMX @@ -441,18 +441,18 @@ SECTION "bank39", ROMX CopyrightGFX:: ; e4000 INCBIN "gfx/splash/copyright.2bpp" -INCLUDE "engine/options_menu.asm" -INCLUDE "engine/crystal_intro.asm" +INCLUDE "engine/menu/options_menu.asm" +INCLUDE "engine/title/crystal_intro.asm" SECTION "bank3E", ROMX -INCLUDE "engine/load_font.asm" -INCLUDE "engine/time_capsule.asm" +INCLUDE "engine/gfx/load_font.asm" +INCLUDE "engine/link/time_capsule.asm" INCLUDE "engine/events/name_rater.asm" INCLUDE "engine/routines/playslowcry.asm" INCLUDE "engine/pokedex/newpokedexentry.asm" -INCLUDE "engine/time_capsule_2.asm" +INCLUDE "engine/link/time_capsule_2.asm" INCLUDE "engine/pokedex/unown_dex.asm" INCLUDE "engine/events/magikarp.asm" INCLUDE "engine/battle/hidden_power.asm" @@ -461,7 +461,7 @@ INCLUDE "engine/battle/misc.asm" SECTION "bank3F", ROMX -INCLUDE "engine/tileset_anims.asm" +INCLUDE "engine/gfx/tileset_anims.asm" INCLUDE "engine/events/npc_trade.asm" INCLUDE "engine/events/mom_phone.asm" @@ -473,8 +473,8 @@ SECTION "bank41", ROMX INCLUDE "engine/dma_transfer.asm" INCLUDE "gfx/emotes.asm" -INCLUDE "engine/warp_connection.asm" -INCLUDE "engine/mystery_gift.asm" +INCLUDE "engine/overworld/warp_connection.asm" +INCLUDE "engine/link/mystery_gift.asm" INCLUDE "engine/battle/used_move_text.asm" INCLUDE "mobile/mobile_41.asm" INCLUDE "engine/routines/loadoverworldfont.asm" @@ -493,8 +493,8 @@ INCBIN "gfx/intro/logo.2bpp.lz" SECTION "Title", ROMX -INCLUDE "engine/unused_title.asm" -INCLUDE "engine/title.asm" +INCLUDE "engine/title/unused_title.asm" +INCLUDE "engine/title/title.asm" INCLUDE "mobile/mobile_45.asm" @@ -511,7 +511,7 @@ INCLUDE "engine/events/battle_tower/trainer_text.asm" SECTION "bank5B", ROMX INCLUDE "mobile/mobile_5b.asm" -INCLUDE "engine/link_trade.asm" +INCLUDE "engine/link/link_trade.asm" SECTION "Mobile 5C", ROMX @@ -569,7 +569,7 @@ INCLUDE "data/items/names.asm" INCLUDE "engine/routines/printitemdescription.asm" INCLUDE "data/items/descriptions.asm" INCLUDE "data/moves/names.asm" -INCLUDE "engine/landmarks.asm" +INCLUDE "engine/overworld/landmarks.asm" SECTION "bank77", ROMX @@ -577,13 +577,13 @@ SECTION "bank77", ROMX UnownFont: ; 1dc000 INCBIN "gfx/font/unown_font.2bpp" -INCLUDE "engine/print_party.asm" +INCLUDE "engine/printer/print_party.asm" SECTION "bank77_2", ROMX INCLUDE "engine/routines/printhoursmins.asm" -INCLUDE "engine/diploma.asm" +INCLUDE "engine/events/diploma.asm" INCLUDE "engine/pokedex/pokedex_3.asm" INCLUDE "engine/events/catch_tutorial_input.asm" INCLUDE "engine/routines/townmap_convertlinebreakcharacters.asm" @@ -591,7 +591,7 @@ INCLUDE "engine/routines/townmap_convertlinebreakcharacters.asm" PokegearGFX: ; 1de2e4 INCBIN "gfx/pokegear/pokegear.2bpp.lz" -INCLUDE "engine/european_mail.asm" +INCLUDE "engine/pokemon/european_mail.asm" SECTION "Battle Tower Text", ROMX