From dae16acd6f4e2e2c177e3776be6ed549af070c4f Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 26 Dec 2017 21:55:57 -0500 Subject: [PATCH] =?UTF-8?q?event/=20=E2=86=92=20events/,=20and=20move=20so?= =?UTF-8?q?me=20appropriate=20engine/=20files=20there?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/map_data_constants.asm | 1 + constants/std_constants.asm | 2 +- data/default_names.asm | 39 ++++++ data/items/buena_prizes.asm | 2 +- docs/bugs_and_glitches.md | 6 +- engine/player_gfx.asm | 40 +----- engine/specials.asm | 1 - {event => events}/basement_key.asm | 0 {event => events}/battle_tower.asm | 0 {event => events}/buena.asm | 0 {event => events}/buena_menu.asm | 0 {event => events}/bug_contest/caught_mon.asm | 0 {event => events}/bug_contest/contest.asm | 0 {event => events}/bug_contest/contest_2.asm | 0 .../bug_contest/display_stats.asm | 0 {event => events}/bug_contest/judging.asm | 0 {event => events}/card_key.asm | 0 {event => events}/catch_tutorial.asm | 0 {event => events}/catch_tutorial_input.asm | 0 {event => events}/celebi.asm | 0 event/unown.asm => events/crystal_unown.asm | 0 {event => events}/daycare.asm | 0 {event => events}/dratini.asm | 0 {event => events}/elevator.asm | 0 {event => events}/field_moves.asm | 0 {engine => events}/fish.asm | 0 {event => events}/forced_movement.asm | 0 {engine => events}/fruit_trees.asm | 0 {event => events}/halloffame.asm | 0 {event => events}/happiness_egg.asm | 0 {event => events}/heal_machine_anim.asm | 0 {event => events}/itemfinder.asm | 0 {event => events}/kurt.asm | 0 .../kurt_selectquantity_interpretjoypad.asm | 0 {event => events}/lucky_number.asm | 0 {event => events}/magikarp.asm | 0 {event => events}/magnet_train.asm | 0 {event => events}/misc_scripts.asm | 0 {event => events}/misc_scripts_2.asm | 0 {event => events}/mom.asm | 0 {event => events}/mom_phone.asm | 0 {event => events}/move_deleter.asm | 0 {event => events}/move_tutor.asm | 0 {event => events}/name_rater.asm | 0 {event => events}/overworld.asm | 0 {event => events}/poisonstep.asm | 0 {event => events}/poisonstep_pals.asm | 0 {event => events}/poke_seer.asm | 0 {engine => events}/pokecenter_pc.asm | 0 {engine => events}/pokepic.asm | 0 .../pokerus/apply_pokerus_tick.asm | 0 {engine => events}/pokerus/check_pokerus.asm | 0 {engine => events}/pokerus/pokerus.asm | 0 {event => events}/print_photo.asm | 0 {event => events}/print_unown.asm | 0 {event => events}/print_unown_2.asm | 0 {engine => events}/prof_oaks_pc.asm | 0 {event => events}/sacred_ash.asm | 0 {event => events}/special.asm | 0 {event => events}/squirtbottle.asm | 0 {event => events}/std_collision.asm | 0 {engine => events}/std_scripts.asm | 0 {event => events}/sweet_scent.asm | 0 {engine/battle => events}/trainer_scripts.asm | 0 {event => events}/whiteout.asm | 0 main.asm | 116 +++++++++--------- 66 files changed, 104 insertions(+), 103 deletions(-) create mode 100644 data/default_names.asm rename {event => events}/basement_key.asm (100%) rename {event => events}/battle_tower.asm (100%) rename {event => events}/buena.asm (100%) rename {event => events}/buena_menu.asm (100%) rename {event => events}/bug_contest/caught_mon.asm (100%) rename {event => events}/bug_contest/contest.asm (100%) rename {event => events}/bug_contest/contest_2.asm (100%) rename {event => events}/bug_contest/display_stats.asm (100%) rename {event => events}/bug_contest/judging.asm (100%) rename {event => events}/card_key.asm (100%) rename {event => events}/catch_tutorial.asm (100%) rename {event => events}/catch_tutorial_input.asm (100%) rename {event => events}/celebi.asm (100%) rename event/unown.asm => events/crystal_unown.asm (100%) rename {event => events}/daycare.asm (100%) rename {event => events}/dratini.asm (100%) rename {event => events}/elevator.asm (100%) rename {event => events}/field_moves.asm (100%) rename {engine => events}/fish.asm (100%) rename {event => events}/forced_movement.asm (100%) rename {engine => events}/fruit_trees.asm (100%) rename {event => events}/halloffame.asm (100%) rename {event => events}/happiness_egg.asm (100%) rename {event => events}/heal_machine_anim.asm (100%) rename {event => events}/itemfinder.asm (100%) rename {event => events}/kurt.asm (100%) rename {event => events}/kurt_selectquantity_interpretjoypad.asm (100%) rename {event => events}/lucky_number.asm (100%) rename {event => events}/magikarp.asm (100%) rename {event => events}/magnet_train.asm (100%) rename {event => events}/misc_scripts.asm (100%) rename {event => events}/misc_scripts_2.asm (100%) rename {event => events}/mom.asm (100%) rename {event => events}/mom_phone.asm (100%) rename {event => events}/move_deleter.asm (100%) rename {event => events}/move_tutor.asm (100%) rename {event => events}/name_rater.asm (100%) rename {event => events}/overworld.asm (100%) rename {event => events}/poisonstep.asm (100%) rename {event => events}/poisonstep_pals.asm (100%) rename {event => events}/poke_seer.asm (100%) rename {engine => events}/pokecenter_pc.asm (100%) rename {engine => events}/pokepic.asm (100%) rename {engine => events}/pokerus/apply_pokerus_tick.asm (100%) rename {engine => events}/pokerus/check_pokerus.asm (100%) rename {engine => events}/pokerus/pokerus.asm (100%) rename {event => events}/print_photo.asm (100%) rename {event => events}/print_unown.asm (100%) rename {event => events}/print_unown_2.asm (100%) rename {engine => events}/prof_oaks_pc.asm (100%) rename {event => events}/sacred_ash.asm (100%) rename {event => events}/special.asm (100%) rename {event => events}/squirtbottle.asm (100%) rename {event => events}/std_collision.asm (100%) rename {engine => events}/std_scripts.asm (100%) rename {event => events}/sweet_scent.asm (100%) rename {engine/battle => events}/trainer_scripts.asm (100%) rename {event => events}/whiteout.asm (100%) diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index d99264136..5d3f23c08 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -250,6 +250,7 @@ const_value SET 1 const FRUITTREE_FUCHSIA_CITY ; 1e NUM_FRUIT_TREES EQU const_value +- 1 + ; elevator floors ; used by `elevfloor` const_def diff --git a/constants/std_constants.asm b/constants/std_constants.asm index 21fb6791f..efe775c05 100644 --- a/constants/std_constants.asm +++ b/constants/std_constants.asm @@ -1,4 +1,4 @@ -; StdScripts indexes (see engine/std_scripts.asm) +; StdScripts indexes (see events/std_scripts.asm) ; also used in TileCollisionStdScripts (see data/collision_stdscripts.asm) enum_start enum pokecenternurse diff --git a/data/default_names.asm b/data/default_names.asm new file mode 100644 index 000000000..87c341652 --- /dev/null +++ b/data/default_names.asm @@ -0,0 +1,39 @@ +ChrisNameMenuHeader: ; 882b5 + db $40 ; flags + db 00, 00 ; start coords + db 11, 10 ; end coords + dw .MaleNames + db 1 ; ???? + db 0 ; default option + +.MaleNames: ; 882be + db $91 ; flags + db 5 ; items + db "NEW NAME@" +MalePlayerNameArray: ; 882c9 + db "CHRIS@" + db "MAT@" + db "ALLAN@" + db "JON@" + db 2 ; displacement + db " NAME @" ; title + +KrisNameMenuHeader: ; 882e5 + db $40 ; flags + db 00, 00 ; start coords + db 11, 10 ; end coords + dw .FemaleNames + db 1 ; ???? + db 0 ; default option + +.FemaleNames: ; 882ee + db $91 ; flags + db 5 ; items + db "NEW NAME@" +FemalePlayerNameArray: ; 882f9 + db "KRIS@" + db "AMANDA@" + db "JUANA@" + db "JODI@" + db 2 ; displacement + db " NAME @" ; title diff --git a/data/items/buena_prizes.asm b/data/items/buena_prizes.asm index 8aecf2bd0..7ddcaab7c 100644 --- a/data/items/buena_prizes.asm +++ b/data/items/buena_prizes.asm @@ -1,5 +1,5 @@ BuenaPrizeItems: ; 8b15e -; there are NUM_BUENA_PRIZES items (see event/buena.asm) +; there are NUM_BUENA_PRIZES items (see events/buena.asm) db ULTRA_BALL, 2 db FULL_RESTORE, 2 db NUGGET, 3 diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 9275c6572..6e346f60d 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -678,7 +678,7 @@ This is a bug with `ItemAttributes` in [items/item_attributes.asm](/items/item_a ## Daisy's grooming doesn't always increase happiness -This is a bug with `MassageOrHaircut` in [event/special.asm](/event/special.asm): +This is a bug with `MassageOrHaircut` in [events/special.asm](/events/special.asm): ```asm ; Bug: Subtracting $ff from $ff fails to set c. @@ -753,7 +753,7 @@ This is a bug with `LoadEnemyMon.CheckMagikarpArea` in [engine/battle/core.asm]( ## Magikarp lengths can be miscalculated -This is a bug with `CalcMagikarpLength.BCLessThanDE` in [event/magikarp.asm](/event/magikarp.asm): +This is a bug with `CalcMagikarpLength.BCLessThanDE` in [events/magikarp.asm](/events/magikarp.asm): ```asm .BCLessThanDE: ; fbc9a @@ -1348,7 +1348,7 @@ In [engine/events.asm](/engine/events.asm): ## `Special_CheckBugContestContestantFlag` can read beyond its data table -In [event/bug_contest_2.asm](/event/bug_contest_2.asm): +In [events/bug_contest/contest_2.asm](/events/bug_contest/contest_2.asm): ```asm Special_CheckBugContestContestantFlag: ; 139ed diff --git a/engine/player_gfx.asm b/engine/player_gfx.asm index 1af444d73..6ffaa77c8 100644 --- a/engine/player_gfx.asm +++ b/engine/player_gfx.asm @@ -71,45 +71,7 @@ ShowPlayerNamingChoices: ; 88297 call CloseWindow ret -ChrisNameMenuHeader: ; 882b5 - db $40 ; flags - db 00, 00 ; start coords - db 11, 10 ; end coords - dw .MaleNames - db 1 ; ???? - db 0 ; default option - -.MaleNames: ; 882be - db $91 ; flags - db 5 ; items - db "NEW NAME@" -MalePlayerNameArray: ; 882c9 - db "CHRIS@" - db "MAT@" - db "ALLAN@" - db "JON@" - db 2 ; displacement - db " NAME @" ; title - -KrisNameMenuHeader: ; 882e5 - db $40 ; flags - db 00, 00 ; start coords - db 11, 10 ; end coords - dw .FemaleNames - db 1 ; ???? - db 0 ; default option - -.FemaleNames: ; 882ee - db $91 ; flags - db 5 ; items - db "NEW NAME@" -FemalePlayerNameArray: ; 882f9 - db "KRIS@" - db "AMANDA@" - db "JUANA@" - db "JODI@" - db 2 ; displacement - db " NAME @" ; title +INCLUDE "data/default_names.asm" GetPlayerNameArray: ; 88318 This Function is never called ld hl, PlayerName diff --git a/engine/specials.asm b/engine/specials.asm index 82b42d8c1..cd2394b96 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -1,4 +1,3 @@ - Special:: ; c01b ; Run script special de. ld hl, SpecialsPointers diff --git a/event/basement_key.asm b/events/basement_key.asm similarity index 100% rename from event/basement_key.asm rename to events/basement_key.asm diff --git a/event/battle_tower.asm b/events/battle_tower.asm similarity index 100% rename from event/battle_tower.asm rename to events/battle_tower.asm diff --git a/event/buena.asm b/events/buena.asm similarity index 100% rename from event/buena.asm rename to events/buena.asm diff --git a/event/buena_menu.asm b/events/buena_menu.asm similarity index 100% rename from event/buena_menu.asm rename to events/buena_menu.asm diff --git a/event/bug_contest/caught_mon.asm b/events/bug_contest/caught_mon.asm similarity index 100% rename from event/bug_contest/caught_mon.asm rename to events/bug_contest/caught_mon.asm diff --git a/event/bug_contest/contest.asm b/events/bug_contest/contest.asm similarity index 100% rename from event/bug_contest/contest.asm rename to events/bug_contest/contest.asm diff --git a/event/bug_contest/contest_2.asm b/events/bug_contest/contest_2.asm similarity index 100% rename from event/bug_contest/contest_2.asm rename to events/bug_contest/contest_2.asm diff --git a/event/bug_contest/display_stats.asm b/events/bug_contest/display_stats.asm similarity index 100% rename from event/bug_contest/display_stats.asm rename to events/bug_contest/display_stats.asm diff --git a/event/bug_contest/judging.asm b/events/bug_contest/judging.asm similarity index 100% rename from event/bug_contest/judging.asm rename to events/bug_contest/judging.asm diff --git a/event/card_key.asm b/events/card_key.asm similarity index 100% rename from event/card_key.asm rename to events/card_key.asm diff --git a/event/catch_tutorial.asm b/events/catch_tutorial.asm similarity index 100% rename from event/catch_tutorial.asm rename to events/catch_tutorial.asm diff --git a/event/catch_tutorial_input.asm b/events/catch_tutorial_input.asm similarity index 100% rename from event/catch_tutorial_input.asm rename to events/catch_tutorial_input.asm diff --git a/event/celebi.asm b/events/celebi.asm similarity index 100% rename from event/celebi.asm rename to events/celebi.asm diff --git a/event/unown.asm b/events/crystal_unown.asm similarity index 100% rename from event/unown.asm rename to events/crystal_unown.asm diff --git a/event/daycare.asm b/events/daycare.asm similarity index 100% rename from event/daycare.asm rename to events/daycare.asm diff --git a/event/dratini.asm b/events/dratini.asm similarity index 100% rename from event/dratini.asm rename to events/dratini.asm diff --git a/event/elevator.asm b/events/elevator.asm similarity index 100% rename from event/elevator.asm rename to events/elevator.asm diff --git a/event/field_moves.asm b/events/field_moves.asm similarity index 100% rename from event/field_moves.asm rename to events/field_moves.asm diff --git a/engine/fish.asm b/events/fish.asm similarity index 100% rename from engine/fish.asm rename to events/fish.asm diff --git a/event/forced_movement.asm b/events/forced_movement.asm similarity index 100% rename from event/forced_movement.asm rename to events/forced_movement.asm diff --git a/engine/fruit_trees.asm b/events/fruit_trees.asm similarity index 100% rename from engine/fruit_trees.asm rename to events/fruit_trees.asm diff --git a/event/halloffame.asm b/events/halloffame.asm similarity index 100% rename from event/halloffame.asm rename to events/halloffame.asm diff --git a/event/happiness_egg.asm b/events/happiness_egg.asm similarity index 100% rename from event/happiness_egg.asm rename to events/happiness_egg.asm diff --git a/event/heal_machine_anim.asm b/events/heal_machine_anim.asm similarity index 100% rename from event/heal_machine_anim.asm rename to events/heal_machine_anim.asm diff --git a/event/itemfinder.asm b/events/itemfinder.asm similarity index 100% rename from event/itemfinder.asm rename to events/itemfinder.asm diff --git a/event/kurt.asm b/events/kurt.asm similarity index 100% rename from event/kurt.asm rename to events/kurt.asm diff --git a/event/kurt_selectquantity_interpretjoypad.asm b/events/kurt_selectquantity_interpretjoypad.asm similarity index 100% rename from event/kurt_selectquantity_interpretjoypad.asm rename to events/kurt_selectquantity_interpretjoypad.asm diff --git a/event/lucky_number.asm b/events/lucky_number.asm similarity index 100% rename from event/lucky_number.asm rename to events/lucky_number.asm diff --git a/event/magikarp.asm b/events/magikarp.asm similarity index 100% rename from event/magikarp.asm rename to events/magikarp.asm diff --git a/event/magnet_train.asm b/events/magnet_train.asm similarity index 100% rename from event/magnet_train.asm rename to events/magnet_train.asm diff --git a/event/misc_scripts.asm b/events/misc_scripts.asm similarity index 100% rename from event/misc_scripts.asm rename to events/misc_scripts.asm diff --git a/event/misc_scripts_2.asm b/events/misc_scripts_2.asm similarity index 100% rename from event/misc_scripts_2.asm rename to events/misc_scripts_2.asm diff --git a/event/mom.asm b/events/mom.asm similarity index 100% rename from event/mom.asm rename to events/mom.asm diff --git a/event/mom_phone.asm b/events/mom_phone.asm similarity index 100% rename from event/mom_phone.asm rename to events/mom_phone.asm diff --git a/event/move_deleter.asm b/events/move_deleter.asm similarity index 100% rename from event/move_deleter.asm rename to events/move_deleter.asm diff --git a/event/move_tutor.asm b/events/move_tutor.asm similarity index 100% rename from event/move_tutor.asm rename to events/move_tutor.asm diff --git a/event/name_rater.asm b/events/name_rater.asm similarity index 100% rename from event/name_rater.asm rename to events/name_rater.asm diff --git a/event/overworld.asm b/events/overworld.asm similarity index 100% rename from event/overworld.asm rename to events/overworld.asm diff --git a/event/poisonstep.asm b/events/poisonstep.asm similarity index 100% rename from event/poisonstep.asm rename to events/poisonstep.asm diff --git a/event/poisonstep_pals.asm b/events/poisonstep_pals.asm similarity index 100% rename from event/poisonstep_pals.asm rename to events/poisonstep_pals.asm diff --git a/event/poke_seer.asm b/events/poke_seer.asm similarity index 100% rename from event/poke_seer.asm rename to events/poke_seer.asm diff --git a/engine/pokecenter_pc.asm b/events/pokecenter_pc.asm similarity index 100% rename from engine/pokecenter_pc.asm rename to events/pokecenter_pc.asm diff --git a/engine/pokepic.asm b/events/pokepic.asm similarity index 100% rename from engine/pokepic.asm rename to events/pokepic.asm diff --git a/engine/pokerus/apply_pokerus_tick.asm b/events/pokerus/apply_pokerus_tick.asm similarity index 100% rename from engine/pokerus/apply_pokerus_tick.asm rename to events/pokerus/apply_pokerus_tick.asm diff --git a/engine/pokerus/check_pokerus.asm b/events/pokerus/check_pokerus.asm similarity index 100% rename from engine/pokerus/check_pokerus.asm rename to events/pokerus/check_pokerus.asm diff --git a/engine/pokerus/pokerus.asm b/events/pokerus/pokerus.asm similarity index 100% rename from engine/pokerus/pokerus.asm rename to events/pokerus/pokerus.asm diff --git a/event/print_photo.asm b/events/print_photo.asm similarity index 100% rename from event/print_photo.asm rename to events/print_photo.asm diff --git a/event/print_unown.asm b/events/print_unown.asm similarity index 100% rename from event/print_unown.asm rename to events/print_unown.asm diff --git a/event/print_unown_2.asm b/events/print_unown_2.asm similarity index 100% rename from event/print_unown_2.asm rename to events/print_unown_2.asm diff --git a/engine/prof_oaks_pc.asm b/events/prof_oaks_pc.asm similarity index 100% rename from engine/prof_oaks_pc.asm rename to events/prof_oaks_pc.asm diff --git a/event/sacred_ash.asm b/events/sacred_ash.asm similarity index 100% rename from event/sacred_ash.asm rename to events/sacred_ash.asm diff --git a/event/special.asm b/events/special.asm similarity index 100% rename from event/special.asm rename to events/special.asm diff --git a/event/squirtbottle.asm b/events/squirtbottle.asm similarity index 100% rename from event/squirtbottle.asm rename to events/squirtbottle.asm diff --git a/event/std_collision.asm b/events/std_collision.asm similarity index 100% rename from event/std_collision.asm rename to events/std_collision.asm diff --git a/engine/std_scripts.asm b/events/std_scripts.asm similarity index 100% rename from engine/std_scripts.asm rename to events/std_scripts.asm diff --git a/event/sweet_scent.asm b/events/sweet_scent.asm similarity index 100% rename from event/sweet_scent.asm rename to events/sweet_scent.asm diff --git a/engine/battle/trainer_scripts.asm b/events/trainer_scripts.asm similarity index 100% rename from engine/battle/trainer_scripts.asm rename to events/trainer_scripts.asm diff --git a/event/whiteout.asm b/events/whiteout.asm similarity index 100% rename from event/whiteout.asm rename to events/whiteout.asm diff --git a/main.asm b/main.asm index cf9add7cc..3cb765aae 100644 --- a/main.asm +++ b/main.asm @@ -13,8 +13,8 @@ INCLUDE "engine/routines/checknickerrors.asm" INCLUDE "engine/math.asm" INCLUDE "data/items/item_attributes.asm" INCLUDE "engine/npc_movement.asm" -INCLUDE "event/happiness_egg.asm" -INCLUDE "event/special.asm" +INCLUDE "events/happiness_egg.asm" +INCLUDE "events/special.asm" SECTION "bank2", ROMX @@ -31,14 +31,14 @@ INCLUDE "engine/routines/checktime.asm" INCLUDE "engine/specials.asm" INCLUDE "engine/printnum.asm" INCLUDE "engine/health.asm" -INCLUDE "event/overworld.asm" +INCLUDE "events/overworld.asm" INCLUDE "engine/items.asm" INCLUDE "engine/player_step.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 "events/bug_contest/caught_mon.asm" INCLUDE "engine/item_effects.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 "events/misc_scripts.asm" +INCLUDE "events/heal_machine_anim.asm" +INCLUDE "events/whiteout.asm" +INCLUDE "events/forced_movement.asm" +INCLUDE "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 "events/elevator.asm" +INCLUDE "events/bug_contest/contest.asm" +INCLUDE "events/misc_scripts_2.asm" +INCLUDE "events/std_collision.asm" +INCLUDE "events/bug_contest/judging.asm" +INCLUDE "events/pokerus/apply_pokerus_tick.asm" +INCLUDE "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 "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 "events/mom.asm" +INCLUDE "events/daycare.asm" +INCLUDE "events/print_unown.asm" +INCLUDE "events/print_photo.asm" INCLUDE "engine/breeding.asm" @@ -105,7 +105,7 @@ SECTION "bank9", ROMX INCLUDE "data/text_buffers.asm" INCLUDE "engine/menu.asm" INCLUDE "engine/routines/updateitemdescription.asm" -INCLUDE "engine/pokepic.asm" +INCLUDE "events/pokepic.asm" INCLUDE "engine/map_objects_2.asm" INCLUDE "engine/scrolling_menu.asm" INCLUDE "engine/switch_items.asm" @@ -114,7 +114,7 @@ INCLUDE "engine/mon_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 "events/prof_oaks_pc.asm" INCLUDE "engine/decorations.asm" INCLUDE "engine/routines/leveluphappinessmod.asm" INCLUDE "data/trainers/trainer_dvs.asm" @@ -122,7 +122,7 @@ INCLUDE "engine/battle/returntobattle_useball.asm" INCLUDE "engine/battle/consumehelditem.asm" INCLUDE "data/moves/move_effects_pointers.asm" INCLUDE "data/moves/move_effects.asm" -INCLUDE "event/kurt_selectquantity_interpretjoypad.asm" +INCLUDE "events/kurt_selectquantity_interpretjoypad.asm" SECTION "bankA", ROMX @@ -143,11 +143,11 @@ SECTION "bankB", ROMX INCLUDE "engine/battle/trainer_huds.asm" INCLUDE "data/trainers/trainer_class_names.asm" INCLUDE "engine/battle/ai/redundant.asm" -INCLUDE "event/move_deleter.asm" +INCLUDE "events/move_deleter.asm" INCLUDE "engine/mystery_gift_2.asm" INCLUDE "engine/tmhm2.asm" INCLUDE "data/moves/move_descriptions.asm" -INCLUDE "engine/pokerus/pokerus.asm" +INCLUDE "events/pokerus/pokerus.asm" INCLUDE "engine/battle/start_battle.asm" INCLUDE "engine/routines/placegraphic.asm" @@ -183,7 +183,7 @@ INCLUDE "engine/evolve.asm" SECTION "bank11", ROMX -INCLUDE "engine/fruit_trees.asm" +INCLUDE "events/fruit_trees.asm" INCLUDE "engine/battle/ai/move.asm" INCLUDE "engine/pokedex_2.asm" INCLUDE "data/pokemon/dex_entry_pointers.asm" @@ -194,14 +194,14 @@ SECTION "Crystal Unique", ROMX INCLUDE "engine/init_gender.asm" INCLUDE "engine/routines/drawkrispackgfx.asm" -INCLUDE "event/move_tutor.asm" +INCLUDE "events/move_tutor.asm" INCLUDE "engine/crystal_colors.asm" -INCLUDE "event/celebi.asm" +INCLUDE "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 "events/buena_menu.asm" SECTION "bank13", ROMX @@ -235,12 +235,12 @@ INCLUDE "engine/delete_save_change_clock.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 "events/pokerus/check_pokerus.asm" +INCLUDE "events/lucky_number.asm" INCLUDE "engine/caught_data.asm" INCLUDE "engine/search2.asm" INCLUDE "engine/stats_screen.asm" -INCLUDE "event/catch_tutorial.asm" +INCLUDE "events/catch_tutorial.asm" INCLUDE "engine/evolution_animation.asm" INCLUDE "engine/init_hof_credits.asm" INCLUDE "mobile/get_trainer_class.asm" @@ -248,18 +248,18 @@ INCLUDE "engine/battle/sliding_intro.asm" INCLUDE "mobile/print_opp_message.asm" INCLUDE "engine/battle/checkbattlescene.asm" INCLUDE "engine/gbc_only.asm" -INCLUDE "event/poke_seer.asm" +INCLUDE "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 "events/poisonstep.asm" +INCLUDE "events/sweet_scent.asm" +INCLUDE "events/squirtbottle.asm" +INCLUDE "events/card_key.asm" +INCLUDE "events/basement_key.asm" +INCLUDE "events/sacred_ash.asm" INCLUDE "engine/tempmon.asm" INCLUDE "engine/types.asm" INCLUDE "text/unused_gen_1_trainers.asm" @@ -309,18 +309,18 @@ SECTION "bank21", ROMX INCLUDE "engine/printer.asm" INCLUDE "gfx/battle_anims.asm" -INCLUDE "event/halloffame.asm" +INCLUDE "events/halloffame.asm" SECTION "bank22", ROMX -INCLUDE "event/kurt.asm" +INCLUDE "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 "events/crystal_unown.asm" +INCLUDE "events/buena.asm" +INCLUDE "events/dratini.asm" +INCLUDE "events/battle_tower.asm" INCLUDE "mobile/mobile_22_2.asm" @@ -328,8 +328,8 @@ SECTION "bank23", ROMX INCLUDE "engine/timeofdaypals.asm" INCLUDE "engine/battle/battle_transition.asm" -INCLUDE "event/field_moves.asm" -INCLUDE "event/magnet_train.asm" +INCLUDE "events/field_moves.asm" +INCLUDE "events/magnet_train.asm" INCLUDE "engine/battle/battlestart_copytilemapatonce.asm" INCLUDE "engine/sprites.asm" INCLUDE "engine/mon_icons.asm" @@ -340,7 +340,7 @@ SECTION "bank24", ROMX INCLUDE "engine/phone/phone.asm" INCLUDE "engine/timeset.asm" INCLUDE "engine/pokegear.asm" -INCLUDE "engine/fish.asm" +INCLUDE "events/fish.asm" INCLUDE "engine/slot_machine.asm" @@ -381,17 +381,17 @@ INCLUDE "engine/mail_2.asm" SECTION "bank2F", ROMX -INCLUDE "engine/std_scripts.asm" +INCLUDE "events/std_scripts.asm" INCLUDE "engine/phone/phone_scripts.asm" INCLUDE "engine/phone/generic_calls.asm" -INCLUDE "engine/battle/trainer_scripts.asm" +INCLUDE "events/trainer_scripts.asm" SECTION "bank32", ROMX INCLUDE "engine/battle_anims/bg_effects.asm" INCLUDE "data/moves/move_anims.asm" -INCLUDE "event/poisonstep_pals.asm" +INCLUDE "events/poisonstep_pals.asm" TheEndGFX:: ; cbd2e INCBIN "gfx/credits/theend.2bpp" @@ -399,7 +399,7 @@ INCBIN "gfx/credits/theend.2bpp" SECTION "Move Animations", ROMX -INCLUDE "event/bug_contest/display_stats.asm" +INCLUDE "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" @@ -448,7 +448,7 @@ INCLUDE "gfx/pokemon/unown_frames.asm" SECTION "bank38", ROMX -INCLUDE "event/print_unown_2.asm" +INCLUDE "events/print_unown_2.asm" Unknown_e00ed: ; Graphics for an unused Game Corner @@ -477,12 +477,12 @@ SECTION "bank3E", ROMX INCLUDE "gfx/font.asm" INCLUDE "engine/time_capsule.asm" -INCLUDE "event/name_rater.asm" +INCLUDE "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 "events/magikarp.asm" INCLUDE "engine/battle/hidden_power.asm" INCLUDE "engine/battle/misc.asm" @@ -491,7 +491,7 @@ SECTION "bank3F", ROMX INCLUDE "tilesets/animations.asm" INCLUDE "engine/npctrade.asm" -INCLUDE "event/mom_phone.asm" +INCLUDE "events/mom_phone.asm" INCLUDE "mobile/mobile_40.asm" @@ -612,7 +612,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 "events/catch_tutorial_input.asm" INCLUDE "engine/routines/townmap_convertlinebreakcharacters.asm" PokegearGFX: ; 1de2e4