From 97c511cd2f271252cbc9e9746668081422231ca5 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Wed, 14 Mar 2018 13:28:36 +0100 Subject: [PATCH] Organize the engine/ directory, take 2 Renamed `game` to `games` and `menu` to `menus`. Moved some functions from `engine/routines/` to their fitting subdirectories. Made two new subdirectories: * engine/rtc: Contains all RTC-related things. Menus, hardware, misc functions. * engine/items: Contains all item-related things. Pack, item effects, other item handlers. --- engine/{game => games}/card_flip.asm | 0 engine/{game => games}/dummy_game.asm | 0 engine/{game => games}/slot_machine.asm | 0 engine/{game => games}/unown_puzzle.asm | 0 engine/{routines => gfx}/drawkrispackgfx.asm | 0 .../{routines => gfx}/loadoverworldfont.asm | 0 engine/{routines => gfx}/placegraphic.asm | 0 engine/{routines => gfx}/trademonfrontpic.asm | 0 engine/{menu => items}/buy_sell_toss.asm | 0 engine/{ => items}/item_effects.asm | 0 engine/{ => items}/items.asm | 0 engine/{menu => items}/mart.asm | 0 engine/{menu => items}/pack.asm | 0 .../printitemdescription.asm | 0 engine/{menu => items}/switch_items.asm | 0 engine/{menu => items}/tmhm.asm | 0 .../updateitemdescription.asm | 0 engine/{menu => menus}/main_menu.asm | 0 engine/{menu => menus}/menu.asm | 0 engine/{menu => menus}/menu_2.asm | 0 engine/{menu => menus}/naming_screen.asm | 0 engine/{menu => menus}/options_menu.asm | 0 engine/{menu => menus}/scrolling_menu.asm | 0 engine/{menu => menus}/start_menu.asm | 0 engine/{menu => menus}/trainer_card.asm | 0 .../{routines => overworld}/loadmappart.asm | 0 .../getbreedmonlevelgrowth.asm | 0 engine/{routines => pokemon}/knowsmove.asm | 0 .../leveluphappinessmod.asm | 0 engine/{menu => pokemon}/mon_menu.asm | 0 .../{routines => pokemon}/switchpartymons.asm | 0 engine/{menu => rtc}/clock_reset.asm | 0 .../delete_save_change_clock.asm | 0 engine/{routines => rtc}/printhoursmins.asm | 0 engine/{ => rtc}/rtc.asm | 0 engine/{menu => rtc}/timeset.asm | 0 main.asm | 72 +++++++++---------- 37 files changed, 36 insertions(+), 36 deletions(-) rename engine/{game => games}/card_flip.asm (100%) rename engine/{game => games}/dummy_game.asm (100%) rename engine/{game => games}/slot_machine.asm (100%) rename engine/{game => games}/unown_puzzle.asm (100%) rename engine/{routines => gfx}/drawkrispackgfx.asm (100%) rename engine/{routines => gfx}/loadoverworldfont.asm (100%) rename engine/{routines => gfx}/placegraphic.asm (100%) rename engine/{routines => gfx}/trademonfrontpic.asm (100%) rename engine/{menu => items}/buy_sell_toss.asm (100%) rename engine/{ => items}/item_effects.asm (100%) rename engine/{ => items}/items.asm (100%) rename engine/{menu => items}/mart.asm (100%) rename engine/{menu => items}/pack.asm (100%) rename engine/{routines => items}/printitemdescription.asm (100%) rename engine/{menu => items}/switch_items.asm (100%) rename engine/{menu => items}/tmhm.asm (100%) rename engine/{routines => items}/updateitemdescription.asm (100%) rename engine/{menu => menus}/main_menu.asm (100%) rename engine/{menu => menus}/menu.asm (100%) rename engine/{menu => menus}/menu_2.asm (100%) rename engine/{menu => menus}/naming_screen.asm (100%) rename engine/{menu => menus}/options_menu.asm (100%) rename engine/{menu => menus}/scrolling_menu.asm (100%) rename engine/{menu => menus}/start_menu.asm (100%) rename engine/{menu => menus}/trainer_card.asm (100%) rename engine/{routines => overworld}/loadmappart.asm (100%) rename engine/{routines => pokemon}/getbreedmonlevelgrowth.asm (100%) rename engine/{routines => pokemon}/knowsmove.asm (100%) rename engine/{routines => pokemon}/leveluphappinessmod.asm (100%) rename engine/{menu => pokemon}/mon_menu.asm (100%) rename engine/{routines => pokemon}/switchpartymons.asm (100%) rename engine/{menu => rtc}/clock_reset.asm (100%) rename engine/{menu => rtc}/delete_save_change_clock.asm (100%) rename engine/{routines => rtc}/printhoursmins.asm (100%) rename engine/{ => rtc}/rtc.asm (100%) rename engine/{menu => rtc}/timeset.asm (100%) diff --git a/engine/game/card_flip.asm b/engine/games/card_flip.asm similarity index 100% rename from engine/game/card_flip.asm rename to engine/games/card_flip.asm diff --git a/engine/game/dummy_game.asm b/engine/games/dummy_game.asm similarity index 100% rename from engine/game/dummy_game.asm rename to engine/games/dummy_game.asm diff --git a/engine/game/slot_machine.asm b/engine/games/slot_machine.asm similarity index 100% rename from engine/game/slot_machine.asm rename to engine/games/slot_machine.asm diff --git a/engine/game/unown_puzzle.asm b/engine/games/unown_puzzle.asm similarity index 100% rename from engine/game/unown_puzzle.asm rename to engine/games/unown_puzzle.asm diff --git a/engine/routines/drawkrispackgfx.asm b/engine/gfx/drawkrispackgfx.asm similarity index 100% rename from engine/routines/drawkrispackgfx.asm rename to engine/gfx/drawkrispackgfx.asm diff --git a/engine/routines/loadoverworldfont.asm b/engine/gfx/loadoverworldfont.asm similarity index 100% rename from engine/routines/loadoverworldfont.asm rename to engine/gfx/loadoverworldfont.asm diff --git a/engine/routines/placegraphic.asm b/engine/gfx/placegraphic.asm similarity index 100% rename from engine/routines/placegraphic.asm rename to engine/gfx/placegraphic.asm diff --git a/engine/routines/trademonfrontpic.asm b/engine/gfx/trademonfrontpic.asm similarity index 100% rename from engine/routines/trademonfrontpic.asm rename to engine/gfx/trademonfrontpic.asm diff --git a/engine/menu/buy_sell_toss.asm b/engine/items/buy_sell_toss.asm similarity index 100% rename from engine/menu/buy_sell_toss.asm rename to engine/items/buy_sell_toss.asm diff --git a/engine/item_effects.asm b/engine/items/item_effects.asm similarity index 100% rename from engine/item_effects.asm rename to engine/items/item_effects.asm diff --git a/engine/items.asm b/engine/items/items.asm similarity index 100% rename from engine/items.asm rename to engine/items/items.asm diff --git a/engine/menu/mart.asm b/engine/items/mart.asm similarity index 100% rename from engine/menu/mart.asm rename to engine/items/mart.asm diff --git a/engine/menu/pack.asm b/engine/items/pack.asm similarity index 100% rename from engine/menu/pack.asm rename to engine/items/pack.asm diff --git a/engine/routines/printitemdescription.asm b/engine/items/printitemdescription.asm similarity index 100% rename from engine/routines/printitemdescription.asm rename to engine/items/printitemdescription.asm diff --git a/engine/menu/switch_items.asm b/engine/items/switch_items.asm similarity index 100% rename from engine/menu/switch_items.asm rename to engine/items/switch_items.asm diff --git a/engine/menu/tmhm.asm b/engine/items/tmhm.asm similarity index 100% rename from engine/menu/tmhm.asm rename to engine/items/tmhm.asm diff --git a/engine/routines/updateitemdescription.asm b/engine/items/updateitemdescription.asm similarity index 100% rename from engine/routines/updateitemdescription.asm rename to engine/items/updateitemdescription.asm diff --git a/engine/menu/main_menu.asm b/engine/menus/main_menu.asm similarity index 100% rename from engine/menu/main_menu.asm rename to engine/menus/main_menu.asm diff --git a/engine/menu/menu.asm b/engine/menus/menu.asm similarity index 100% rename from engine/menu/menu.asm rename to engine/menus/menu.asm diff --git a/engine/menu/menu_2.asm b/engine/menus/menu_2.asm similarity index 100% rename from engine/menu/menu_2.asm rename to engine/menus/menu_2.asm diff --git a/engine/menu/naming_screen.asm b/engine/menus/naming_screen.asm similarity index 100% rename from engine/menu/naming_screen.asm rename to engine/menus/naming_screen.asm diff --git a/engine/menu/options_menu.asm b/engine/menus/options_menu.asm similarity index 100% rename from engine/menu/options_menu.asm rename to engine/menus/options_menu.asm diff --git a/engine/menu/scrolling_menu.asm b/engine/menus/scrolling_menu.asm similarity index 100% rename from engine/menu/scrolling_menu.asm rename to engine/menus/scrolling_menu.asm diff --git a/engine/menu/start_menu.asm b/engine/menus/start_menu.asm similarity index 100% rename from engine/menu/start_menu.asm rename to engine/menus/start_menu.asm diff --git a/engine/menu/trainer_card.asm b/engine/menus/trainer_card.asm similarity index 100% rename from engine/menu/trainer_card.asm rename to engine/menus/trainer_card.asm diff --git a/engine/routines/loadmappart.asm b/engine/overworld/loadmappart.asm similarity index 100% rename from engine/routines/loadmappart.asm rename to engine/overworld/loadmappart.asm diff --git a/engine/routines/getbreedmonlevelgrowth.asm b/engine/pokemon/getbreedmonlevelgrowth.asm similarity index 100% rename from engine/routines/getbreedmonlevelgrowth.asm rename to engine/pokemon/getbreedmonlevelgrowth.asm diff --git a/engine/routines/knowsmove.asm b/engine/pokemon/knowsmove.asm similarity index 100% rename from engine/routines/knowsmove.asm rename to engine/pokemon/knowsmove.asm diff --git a/engine/routines/leveluphappinessmod.asm b/engine/pokemon/leveluphappinessmod.asm similarity index 100% rename from engine/routines/leveluphappinessmod.asm rename to engine/pokemon/leveluphappinessmod.asm diff --git a/engine/menu/mon_menu.asm b/engine/pokemon/mon_menu.asm similarity index 100% rename from engine/menu/mon_menu.asm rename to engine/pokemon/mon_menu.asm diff --git a/engine/routines/switchpartymons.asm b/engine/pokemon/switchpartymons.asm similarity index 100% rename from engine/routines/switchpartymons.asm rename to engine/pokemon/switchpartymons.asm diff --git a/engine/menu/clock_reset.asm b/engine/rtc/clock_reset.asm similarity index 100% rename from engine/menu/clock_reset.asm rename to engine/rtc/clock_reset.asm diff --git a/engine/menu/delete_save_change_clock.asm b/engine/rtc/delete_save_change_clock.asm similarity index 100% rename from engine/menu/delete_save_change_clock.asm rename to engine/rtc/delete_save_change_clock.asm diff --git a/engine/routines/printhoursmins.asm b/engine/rtc/printhoursmins.asm similarity index 100% rename from engine/routines/printhoursmins.asm rename to engine/rtc/printhoursmins.asm diff --git a/engine/rtc.asm b/engine/rtc/rtc.asm similarity index 100% rename from engine/rtc.asm rename to engine/rtc/rtc.asm diff --git a/engine/menu/timeset.asm b/engine/rtc/timeset.asm similarity index 100% rename from engine/menu/timeset.asm rename to engine/rtc/timeset.asm diff --git a/main.asm b/main.asm index af4b61b75..6a5102545 100644 --- a/main.asm +++ b/main.asm @@ -32,30 +32,30 @@ INCLUDE "engine/events/specials.asm" INCLUDE "engine/routines/printnum.asm" INCLUDE "engine/pokemon/health.asm" INCLUDE "engine/events/overworld.asm" -INCLUDE "engine/items.asm" +INCLUDE "engine/items/items.asm" INCLUDE "engine/overworld/player_step.asm" INCLUDE "engine/battle/anim_hp_bar.asm" INCLUDE "engine/pokemon/move_mon.asm" INCLUDE "engine/pokemon/billspctop.asm" -INCLUDE "engine/routines/getbreedmonlevelgrowth.asm" +INCLUDE "engine/pokemon/getbreedmonlevelgrowth.asm" INCLUDE "engine/events/bug_contest/caught_mon.asm" -INCLUDE "engine/item_effects.asm" +INCLUDE "engine/items/item_effects.asm" INCLUDE "engine/battle_anims/getpokeballwobble.asm" -INCLUDE "engine/routines/knowsmove.asm" +INCLUDE "engine/pokemon/knowsmove.asm" SECTION "bank4", ROMX -INCLUDE "engine/menu/pack.asm" +INCLUDE "engine/items/pack.asm" INCLUDE "engine/overworld/time.asm" -INCLUDE "engine/menu/tmhm.asm" -INCLUDE "engine/menu/naming_screen.asm" +INCLUDE "engine/items/tmhm.asm" +INCLUDE "engine/menus/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/menu/start_menu.asm" +INCLUDE "engine/menus/start_menu.asm" INCLUDE "engine/overworld/select_menu.asm" INCLUDE "engine/events/elevator.asm" INCLUDE "engine/events/bug_contest/contest.asm" @@ -70,14 +70,14 @@ INCLUDE "engine/routines/getsquareroot.asm" SECTION "bank5", ROMX -INCLUDE "engine/rtc.asm" +INCLUDE "engine/rtc/rtc.asm" INCLUDE "engine/overworld/overworld.asm" INCLUDE "engine/overworld/tile_events.asm" INCLUDE "engine/save.asm" INCLUDE "engine/overworld/spawn_points.asm" INCLUDE "engine/overworld/map_setup.asm" INCLUDE "engine/events/pokecenter_pc.asm" -INCLUDE "engine/menu/mart.asm" +INCLUDE "engine/items/mart.asm" INCLUDE "engine/money.asm" INCLUDE "data/items/marts.asm" INCLUDE "engine/events/mom.asm" @@ -95,26 +95,26 @@ INCLUDE "engine/gfx/mapgroup_roofs.asm" SECTION "Clock Reset", ROMX -INCLUDE "engine/menu/clock_reset.asm" +INCLUDE "engine/rtc/clock_reset.asm" SECTION "bank9", ROMX INCLUDE "data/text_buffers.asm" -INCLUDE "engine/menu/menu.asm" -INCLUDE "engine/routines/updateitemdescription.asm" +INCLUDE "engine/menus/menu.asm" +INCLUDE "engine/items/updateitemdescription.asm" INCLUDE "engine/events/pokepic.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/menus/scrolling_menu.asm" +INCLUDE "engine/items/switch_items.asm" +INCLUDE "engine/menus/menu_2.asm" +INCLUDE "engine/pokemon/mon_menu.asm" INCLUDE "engine/battle/menu.asm" -INCLUDE "engine/menu/buy_sell_toss.asm" -INCLUDE "engine/menu/trainer_card.asm" +INCLUDE "engine/items/buy_sell_toss.asm" +INCLUDE "engine/menus/trainer_card.asm" INCLUDE "engine/events/prof_oaks_pc.asm" INCLUDE "engine/overworld/decorations.asm" -INCLUDE "engine/routines/leveluphappinessmod.asm" +INCLUDE "engine/pokemon/leveluphappinessmod.asm" INCLUDE "engine/battle/read_trainer_dvs.asm" INCLUDE "data/trainers/dvs.asm" INCLUDE "engine/battle/returntobattle_useball.asm" @@ -148,7 +148,7 @@ INCLUDE "engine/pokemon/tmhm.asm" INCLUDE "data/moves/descriptions.asm" INCLUDE "engine/events/pokerus/pokerus.asm" INCLUDE "engine/battle/start_battle.asm" -INCLUDE "engine/routines/placegraphic.asm" +INCLUDE "engine/gfx/placegraphic.asm" SECTION "Effect Commands", ROMX @@ -192,11 +192,11 @@ INCLUDE "engine/pokemon/mail.asm" SECTION "Crystal Features 1", ROMX INCLUDE "engine/init_gender.asm" -INCLUDE "engine/routines/drawkrispackgfx.asm" +INCLUDE "engine/gfx/drawkrispackgfx.asm" INCLUDE "engine/events/move_tutor.asm" INCLUDE "engine/gfx/crystal_layouts.asm" INCLUDE "engine/events/celebi.asm" -INCLUDE "engine/menu/main_menu.asm" +INCLUDE "engine/menus/main_menu.asm" INCLUDE "mobile/mobile_menu.asm" INCLUDE "engine/pokemon/search.asm" INCLUDE "mobile/mobile_12_2.asm" @@ -212,7 +212,7 @@ INCLUDE "engine/routines/emptyallsrambanks.asm" INCLUDE "engine/routines/savemenu_copytilemapatonce.asm" INCLUDE "engine/routines/checksave.asm" INCLUDE "data/maps/scenes.asm" -INCLUDE "engine/routines/loadmappart.asm" +INCLUDE "engine/overworld/loadmappart.asm" INCLUDE "engine/routines/phonering_copytilemapatonce.asm" Shrink1Pic: ; 4d249 @@ -222,10 +222,10 @@ Shrink2Pic: ; 4d2d9 INCBIN "gfx/new_game/shrink2.2bpp.lz" INCLUDE "engine/link/link_2.asm" -INCLUDE "engine/menu/delete_save_change_clock.asm" +INCLUDE "engine/rtc/delete_save_change_clock.asm" INCLUDE "data/tilesets.asm" INCLUDE "engine/routines/flagpredef.asm" -INCLUDE "engine/routines/trademonfrontpic.asm" +INCLUDE "engine/gfx/trademonfrontpic.asm" INCLUDE "engine/events/pokerus/check_pokerus.asm" INCLUDE "engine/events/lucky_number.asm" INCLUDE "engine/pokemon/caught_data.asm" @@ -257,7 +257,7 @@ INCLUDE "engine/routines/unreferenced_getgen1trainerclassname.asm" INCLUDE "engine/pokemon/mon_stats.asm" INCLUDE "engine/routines/initlist.asm" INCLUDE "engine/pokemon/experience.asm" -INCLUDE "engine/routines/switchpartymons.asm" +INCLUDE "engine/pokemon/switchpartymons.asm" INCLUDE "engine/gfx/load_pics.asm" INCLUDE "engine/pokemon/move_mon_wo_mail.asm" INCLUDE "data/pokemon/base_stats.asm" @@ -316,10 +316,10 @@ INCLUDE "engine/gfx/mon_icons.asm" SECTION "bank24", ROMX INCLUDE "engine/phone/phone.asm" -INCLUDE "engine/menu/timeset.asm" +INCLUDE "engine/rtc/timeset.asm" INCLUDE "engine/pokegear/pokegear.asm" INCLUDE "engine/events/fish.asm" -INCLUDE "engine/game/slot_machine.asm" +INCLUDE "engine/games/slot_machine.asm" SECTION "Phone Engine", ROMX @@ -430,9 +430,9 @@ INCLUDE "gfx/pokemon/unown_frames.asm" SECTION "bank38", ROMX INCLUDE "engine/events/print_unown_2.asm" -INCLUDE "engine/game/card_flip.asm" -INCLUDE "engine/game/unown_puzzle.asm" -INCLUDE "engine/game/dummy_game.asm" +INCLUDE "engine/games/card_flip.asm" +INCLUDE "engine/games/unown_puzzle.asm" +INCLUDE "engine/games/dummy_game.asm" INCLUDE "engine/pokemon/billspc.asm" @@ -441,7 +441,7 @@ SECTION "bank39", ROMX CopyrightGFX:: ; e4000 INCBIN "gfx/splash/copyright.2bpp" -INCLUDE "engine/menu/options_menu.asm" +INCLUDE "engine/menus/options_menu.asm" INCLUDE "engine/title/crystal_intro.asm" @@ -477,7 +477,7 @@ 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" +INCLUDE "engine/gfx/loadoverworldfont.asm" SECTION "Mobile 42", ROMX @@ -566,7 +566,7 @@ INCLUDE "data/phone/text/trainers.asm" SECTION "Miscellaneous Text", ROMX INCLUDE "data/items/names.asm" -INCLUDE "engine/routines/printitemdescription.asm" +INCLUDE "engine/items/printitemdescription.asm" INCLUDE "data/items/descriptions.asm" INCLUDE "data/moves/names.asm" INCLUDE "engine/overworld/landmarks.asm" @@ -582,7 +582,7 @@ INCLUDE "engine/printer/print_party.asm" SECTION "bank77_2", ROMX -INCLUDE "engine/routines/printhoursmins.asm" +INCLUDE "engine/rtc/printhoursmins.asm" INCLUDE "engine/events/diploma.asm" INCLUDE "engine/pokedex/pokedex_3.asm" INCLUDE "engine/events/catch_tutorial_input.asm"