Move events/ to engine/events/

This commit is contained in:
Remy Oukaour 2017-12-27 00:09:12 -05:00
parent 47e4f21e62
commit 86fd37af16
64 changed files with 65 additions and 65 deletions

View File

@ -1,4 +1,4 @@
; StdScripts indexes (see events/std_scripts.asm) ; StdScripts indexes (see engine/events/std_scripts.asm)
; also used in TileCollisionStdScripts (see data/collision_stdscripts.asm) ; also used in TileCollisionStdScripts (see data/collision_stdscripts.asm)
enum_start enum_start
enum pokecenternurse enum pokecenternurse

View File

@ -1,5 +1,5 @@
BuenaPrizeItems: ; 8b15e BuenaPrizeItems: ; 8b15e
; there are NUM_BUENA_PRIZES items (see events/buena.asm) ; there are NUM_BUENA_PRIZES items (see engine/events/buena.asm)
db ULTRA_BALL, 2 db ULTRA_BALL, 2
db FULL_RESTORE, 2 db FULL_RESTORE, 2
db NUGGET, 3 db NUGGET, 3

View File

@ -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 ## Daisy's grooming doesn't always increase happiness
This is a bug with `MassageOrHaircut` in [events/special.asm](/events/special.asm): This is a bug with `MassageOrHaircut` in [engine/events/special.asm](/engine/events/special.asm):
```asm ```asm
; Bug: Subtracting $ff from $ff fails to set c. ; 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 ## Magikarp lengths can be miscalculated
This is a bug with `CalcMagikarpLength.BCLessThanDE` in [events/magikarp.asm](/events/magikarp.asm): This is a bug with `CalcMagikarpLength.BCLessThanDE` in [engine/events/magikarp.asm](/engine/events/magikarp.asm):
```asm ```asm
.BCLessThanDE: ; fbc9a .BCLessThanDE: ; fbc9a
@ -1348,7 +1348,7 @@ In [engine/events.asm](/engine/events.asm):
## `Special_CheckBugContestContestantFlag` can read beyond its data table ## `Special_CheckBugContestContestantFlag` can read beyond its data table
In [events/bug_contest/contest_2.asm](/events/bug_contest/contest_2.asm): In [engine/events/bug_contest/contest_2.asm](/engine/events/bug_contest/contest_2.asm):
```asm ```asm
Special_CheckBugContestContestantFlag: ; 139ed Special_CheckBugContestContestantFlag: ; 139ed

120
main.asm
View File

@ -13,8 +13,8 @@ INCLUDE "engine/routines/checknickerrors.asm"
INCLUDE "engine/math.asm" INCLUDE "engine/math.asm"
INCLUDE "data/items/item_attributes.asm" INCLUDE "data/items/item_attributes.asm"
INCLUDE "engine/npc_movement.asm" INCLUDE "engine/npc_movement.asm"
INCLUDE "events/happiness_egg.asm" INCLUDE "engine/events/happiness_egg.asm"
INCLUDE "events/special.asm" INCLUDE "engine/events/special.asm"
SECTION "bank2", ROMX SECTION "bank2", ROMX
@ -31,14 +31,14 @@ INCLUDE "engine/routines/checktime.asm"
INCLUDE "engine/specials.asm" INCLUDE "engine/specials.asm"
INCLUDE "engine/printnum.asm" INCLUDE "engine/printnum.asm"
INCLUDE "engine/health.asm" INCLUDE "engine/health.asm"
INCLUDE "events/overworld.asm" INCLUDE "engine/events/overworld.asm"
INCLUDE "engine/items.asm" INCLUDE "engine/items.asm"
INCLUDE "engine/player_step.asm" INCLUDE "engine/player_step.asm"
INCLUDE "engine/battle/anim_hp_bar.asm" INCLUDE "engine/battle/anim_hp_bar.asm"
INCLUDE "engine/move_mon.asm" INCLUDE "engine/move_mon.asm"
INCLUDE "engine/billspctop.asm" INCLUDE "engine/billspctop.asm"
INCLUDE "engine/routines/getbreedmonlevelgrowth.asm" INCLUDE "engine/routines/getbreedmonlevelgrowth.asm"
INCLUDE "events/bug_contest/caught_mon.asm" INCLUDE "engine/events/bug_contest/caught_mon.asm"
INCLUDE "engine/item_effects.asm" INCLUDE "engine/item_effects.asm"
INCLUDE "engine/battle_anims/getpokeballwobble.asm" INCLUDE "engine/battle_anims/getpokeballwobble.asm"
INCLUDE "engine/routines/knowsmove.asm" INCLUDE "engine/routines/knowsmove.asm"
@ -50,20 +50,20 @@ INCLUDE "engine/pack.asm"
INCLUDE "engine/time.asm" INCLUDE "engine/time.asm"
INCLUDE "engine/tmhm.asm" INCLUDE "engine/tmhm.asm"
INCLUDE "engine/namingscreen.asm" INCLUDE "engine/namingscreen.asm"
INCLUDE "events/misc_scripts.asm" INCLUDE "engine/events/misc_scripts.asm"
INCLUDE "events/heal_machine_anim.asm" INCLUDE "engine/events/heal_machine_anim.asm"
INCLUDE "events/whiteout.asm" INCLUDE "engine/events/whiteout.asm"
INCLUDE "events/forced_movement.asm" INCLUDE "engine/events/forced_movement.asm"
INCLUDE "events/itemfinder.asm" INCLUDE "engine/events/itemfinder.asm"
INCLUDE "engine/start_menu.asm" INCLUDE "engine/start_menu.asm"
INCLUDE "engine/select_menu.asm" INCLUDE "engine/select_menu.asm"
INCLUDE "events/elevator.asm" INCLUDE "engine/events/elevator.asm"
INCLUDE "events/bug_contest/contest.asm" INCLUDE "engine/events/bug_contest/contest.asm"
INCLUDE "events/misc_scripts_2.asm" INCLUDE "engine/events/misc_scripts_2.asm"
INCLUDE "events/std_collision.asm" INCLUDE "engine/events/std_collision.asm"
INCLUDE "events/bug_contest/judging.asm" INCLUDE "engine/events/bug_contest/judging.asm"
INCLUDE "events/pokerus/apply_pokerus_tick.asm" INCLUDE "engine/events/pokerus/apply_pokerus_tick.asm"
INCLUDE "events/bug_contest/contest_2.asm" INCLUDE "engine/events/bug_contest/contest_2.asm"
INCLUDE "engine/routines/correcterrorsinplayerparty.asm" INCLUDE "engine/routines/correcterrorsinplayerparty.asm"
INCLUDE "engine/routines/getsquareroot.asm" INCLUDE "engine/routines/getsquareroot.asm"
@ -76,14 +76,14 @@ INCLUDE "engine/tile_events.asm"
INCLUDE "engine/save.asm" INCLUDE "engine/save.asm"
INCLUDE "engine/spawn_points.asm" INCLUDE "engine/spawn_points.asm"
INCLUDE "engine/map_setup.asm" INCLUDE "engine/map_setup.asm"
INCLUDE "events/pokecenter_pc.asm" INCLUDE "engine/events/pokecenter_pc.asm"
INCLUDE "engine/mart.asm" INCLUDE "engine/mart.asm"
INCLUDE "engine/money.asm" INCLUDE "engine/money.asm"
INCLUDE "data/items/marts.asm" INCLUDE "data/items/marts.asm"
INCLUDE "events/mom.asm" INCLUDE "engine/events/mom.asm"
INCLUDE "events/daycare.asm" INCLUDE "engine/events/daycare.asm"
INCLUDE "events/print_unown.asm" INCLUDE "engine/events/print_unown.asm"
INCLUDE "events/print_photo.asm" INCLUDE "engine/events/print_photo.asm"
INCLUDE "engine/breeding.asm" INCLUDE "engine/breeding.asm"
@ -105,7 +105,7 @@ SECTION "bank9", ROMX
INCLUDE "data/text_buffers.asm" INCLUDE "data/text_buffers.asm"
INCLUDE "engine/menu.asm" INCLUDE "engine/menu.asm"
INCLUDE "engine/routines/updateitemdescription.asm" INCLUDE "engine/routines/updateitemdescription.asm"
INCLUDE "events/pokepic.asm" INCLUDE "engine/events/pokepic.asm"
INCLUDE "engine/map_objects_2.asm" INCLUDE "engine/map_objects_2.asm"
INCLUDE "engine/scrolling_menu.asm" INCLUDE "engine/scrolling_menu.asm"
INCLUDE "engine/switch_items.asm" INCLUDE "engine/switch_items.asm"
@ -114,7 +114,7 @@ INCLUDE "engine/mon_menu.asm"
INCLUDE "engine/battle/menu.asm" INCLUDE "engine/battle/menu.asm"
INCLUDE "engine/buy_sell_toss.asm" INCLUDE "engine/buy_sell_toss.asm"
INCLUDE "engine/trainer_card.asm" INCLUDE "engine/trainer_card.asm"
INCLUDE "events/prof_oaks_pc.asm" INCLUDE "engine/events/prof_oaks_pc.asm"
INCLUDE "engine/decorations.asm" INCLUDE "engine/decorations.asm"
INCLUDE "engine/routines/leveluphappinessmod.asm" INCLUDE "engine/routines/leveluphappinessmod.asm"
INCLUDE "data/trainers/trainer_dvs.asm" INCLUDE "data/trainers/trainer_dvs.asm"
@ -122,7 +122,7 @@ INCLUDE "engine/battle/returntobattle_useball.asm"
INCLUDE "engine/battle/consumehelditem.asm" INCLUDE "engine/battle/consumehelditem.asm"
INCLUDE "data/moves/move_effects_pointers.asm" INCLUDE "data/moves/move_effects_pointers.asm"
INCLUDE "data/moves/move_effects.asm" INCLUDE "data/moves/move_effects.asm"
INCLUDE "events/kurt_selectquantity_interpretjoypad.asm" INCLUDE "engine/events/kurt_selectquantity_interpretjoypad.asm"
SECTION "bankA", ROMX SECTION "bankA", ROMX
@ -143,11 +143,11 @@ SECTION "bankB", ROMX
INCLUDE "engine/battle/trainer_huds.asm" INCLUDE "engine/battle/trainer_huds.asm"
INCLUDE "data/trainers/trainer_class_names.asm" INCLUDE "data/trainers/trainer_class_names.asm"
INCLUDE "engine/battle/ai/redundant.asm" INCLUDE "engine/battle/ai/redundant.asm"
INCLUDE "events/move_deleter.asm" INCLUDE "engine/events/move_deleter.asm"
INCLUDE "engine/mystery_gift_2.asm" INCLUDE "engine/mystery_gift_2.asm"
INCLUDE "engine/tmhm2.asm" INCLUDE "engine/tmhm2.asm"
INCLUDE "data/moves/move_descriptions.asm" INCLUDE "data/moves/move_descriptions.asm"
INCLUDE "events/pokerus/pokerus.asm" INCLUDE "engine/events/pokerus/pokerus.asm"
INCLUDE "engine/battle/start_battle.asm" INCLUDE "engine/battle/start_battle.asm"
INCLUDE "engine/routines/placegraphic.asm" INCLUDE "engine/routines/placegraphic.asm"
@ -183,7 +183,7 @@ INCLUDE "engine/evolve.asm"
SECTION "bank11", ROMX SECTION "bank11", ROMX
INCLUDE "events/fruit_trees.asm" INCLUDE "engine/events/fruit_trees.asm"
INCLUDE "engine/battle/ai/move.asm" INCLUDE "engine/battle/ai/move.asm"
INCLUDE "engine/pokedex_2.asm" INCLUDE "engine/pokedex_2.asm"
INCLUDE "data/pokemon/dex_entry_pointers.asm" INCLUDE "data/pokemon/dex_entry_pointers.asm"
@ -194,14 +194,14 @@ SECTION "Crystal Features 1", ROMX
INCLUDE "engine/init_gender.asm" INCLUDE "engine/init_gender.asm"
INCLUDE "engine/routines/drawkrispackgfx.asm" INCLUDE "engine/routines/drawkrispackgfx.asm"
INCLUDE "events/move_tutor.asm" INCLUDE "engine/events/move_tutor.asm"
INCLUDE "engine/crystal_colors.asm" INCLUDE "engine/crystal_colors.asm"
INCLUDE "events/celebi.asm" INCLUDE "engine/events/celebi.asm"
INCLUDE "engine/main_menu.asm" INCLUDE "engine/main_menu.asm"
INCLUDE "mobile/mobile_menu.asm" INCLUDE "mobile/mobile_menu.asm"
INCLUDE "engine/search.asm" INCLUDE "engine/search.asm"
INCLUDE "mobile/mobile_12_2.asm" INCLUDE "mobile/mobile_12_2.asm"
INCLUDE "events/buena_menu.asm" INCLUDE "engine/events/buena_menu.asm"
SECTION "bank13", ROMX SECTION "bank13", ROMX
@ -235,12 +235,12 @@ INCLUDE "engine/delete_save_change_clock.asm"
INCLUDE "tilesets/tilesets.asm" INCLUDE "tilesets/tilesets.asm"
INCLUDE "engine/routines/flagpredef.asm" INCLUDE "engine/routines/flagpredef.asm"
INCLUDE "engine/routines/trademonfrontpic.asm" INCLUDE "engine/routines/trademonfrontpic.asm"
INCLUDE "events/pokerus/check_pokerus.asm" INCLUDE "engine/events/pokerus/check_pokerus.asm"
INCLUDE "events/lucky_number.asm" INCLUDE "engine/events/lucky_number.asm"
INCLUDE "engine/caught_data.asm" INCLUDE "engine/caught_data.asm"
INCLUDE "engine/search2.asm" INCLUDE "engine/search2.asm"
INCLUDE "engine/stats_screen.asm" INCLUDE "engine/stats_screen.asm"
INCLUDE "events/catch_tutorial.asm" INCLUDE "engine/events/catch_tutorial.asm"
INCLUDE "engine/evolution_animation.asm" INCLUDE "engine/evolution_animation.asm"
INCLUDE "engine/init_hof_credits.asm" INCLUDE "engine/init_hof_credits.asm"
INCLUDE "mobile/get_trainer_class.asm" INCLUDE "mobile/get_trainer_class.asm"
@ -248,18 +248,18 @@ INCLUDE "engine/battle/sliding_intro.asm"
INCLUDE "mobile/print_opp_message.asm" INCLUDE "mobile/print_opp_message.asm"
INCLUDE "engine/battle/checkbattlescene.asm" INCLUDE "engine/battle/checkbattlescene.asm"
INCLUDE "engine/gbc_only.asm" INCLUDE "engine/gbc_only.asm"
INCLUDE "events/poke_seer.asm" INCLUDE "engine/events/poke_seer.asm"
SECTION "bank14", ROMX SECTION "bank14", ROMX
INCLUDE "engine/party_menu.asm" INCLUDE "engine/party_menu.asm"
INCLUDE "events/poisonstep.asm" INCLUDE "engine/events/poisonstep.asm"
INCLUDE "events/sweet_scent.asm" INCLUDE "engine/events/sweet_scent.asm"
INCLUDE "events/squirtbottle.asm" INCLUDE "engine/events/squirtbottle.asm"
INCLUDE "events/card_key.asm" INCLUDE "engine/events/card_key.asm"
INCLUDE "events/basement_key.asm" INCLUDE "engine/events/basement_key.asm"
INCLUDE "events/sacred_ash.asm" INCLUDE "engine/events/sacred_ash.asm"
INCLUDE "engine/tempmon.asm" INCLUDE "engine/tempmon.asm"
INCLUDE "engine/types.asm" INCLUDE "engine/types.asm"
INCLUDE "text/unused_gen_1_trainers.asm" INCLUDE "text/unused_gen_1_trainers.asm"
@ -309,18 +309,18 @@ SECTION "bank21", ROMX
INCLUDE "engine/printer.asm" INCLUDE "engine/printer.asm"
INCLUDE "gfx/battle_anims.asm" INCLUDE "gfx/battle_anims.asm"
INCLUDE "events/halloffame.asm" INCLUDE "engine/events/halloffame.asm"
SECTION "Crystal Features 2", ROMX SECTION "Crystal Features 2", ROMX
INCLUDE "events/kurt.asm" INCLUDE "engine/events/kurt.asm"
INCLUDE "engine/player_gfx.asm" INCLUDE "engine/player_gfx.asm"
INCLUDE "mobile/mobile_22.asm" INCLUDE "mobile/mobile_22.asm"
INCLUDE "events/crystal_unown.asm" INCLUDE "engine/events/crystal_unown.asm"
INCLUDE "events/buena.asm" INCLUDE "engine/events/buena.asm"
INCLUDE "events/dratini.asm" INCLUDE "engine/events/dratini.asm"
INCLUDE "events/battle_tower_rules.asm" INCLUDE "engine/events/battle_tower_rules.asm"
INCLUDE "mobile/mobile_22_2.asm" INCLUDE "mobile/mobile_22_2.asm"
@ -328,8 +328,8 @@ SECTION "bank23", ROMX
INCLUDE "engine/timeofdaypals.asm" INCLUDE "engine/timeofdaypals.asm"
INCLUDE "engine/battle/battle_transition.asm" INCLUDE "engine/battle/battle_transition.asm"
INCLUDE "events/field_moves.asm" INCLUDE "engine/events/field_moves.asm"
INCLUDE "events/magnet_train.asm" INCLUDE "engine/events/magnet_train.asm"
INCLUDE "engine/battle/battlestart_copytilemapatonce.asm" INCLUDE "engine/battle/battlestart_copytilemapatonce.asm"
INCLUDE "engine/sprites.asm" INCLUDE "engine/sprites.asm"
INCLUDE "engine/mon_icons.asm" INCLUDE "engine/mon_icons.asm"
@ -340,7 +340,7 @@ SECTION "bank24", ROMX
INCLUDE "engine/phone/phone.asm" INCLUDE "engine/phone/phone.asm"
INCLUDE "engine/timeset.asm" INCLUDE "engine/timeset.asm"
INCLUDE "engine/pokegear.asm" INCLUDE "engine/pokegear.asm"
INCLUDE "events/fish.asm" INCLUDE "engine/events/fish.asm"
INCLUDE "engine/slot_machine.asm" INCLUDE "engine/slot_machine.asm"
@ -381,17 +381,17 @@ INCLUDE "engine/mail_2.asm"
SECTION "bank2F", ROMX SECTION "bank2F", ROMX
INCLUDE "events/std_scripts.asm" INCLUDE "engine/events/std_scripts.asm"
INCLUDE "engine/phone/phone_scripts.asm" INCLUDE "engine/phone/phone_scripts.asm"
INCLUDE "engine/phone/generic_calls.asm" INCLUDE "engine/phone/generic_calls.asm"
INCLUDE "events/trainer_scripts.asm" INCLUDE "engine/events/trainer_scripts.asm"
SECTION "bank32", ROMX SECTION "bank32", ROMX
INCLUDE "engine/battle_anims/bg_effects.asm" INCLUDE "engine/battle_anims/bg_effects.asm"
INCLUDE "data/moves/move_anims.asm" INCLUDE "data/moves/move_anims.asm"
INCLUDE "events/poisonstep_pals.asm" INCLUDE "engine/events/poisonstep_pals.asm"
TheEndGFX:: ; cbd2e TheEndGFX:: ; cbd2e
INCBIN "gfx/credits/theend.2bpp" INCBIN "gfx/credits/theend.2bpp"
@ -399,7 +399,7 @@ INCBIN "gfx/credits/theend.2bpp"
SECTION "Move Animations", ROMX SECTION "Move Animations", ROMX
INCLUDE "events/bug_contest/display_stats.asm" INCLUDE "engine/events/bug_contest/display_stats.asm"
INCLUDE "engine/battle_anims/anim_commands.asm" INCLUDE "engine/battle_anims/anim_commands.asm"
INCLUDE "engine/battle_anims/engine.asm" INCLUDE "engine/battle_anims/engine.asm"
INCLUDE "data/battle_anims/objects.asm" INCLUDE "data/battle_anims/objects.asm"
@ -448,7 +448,7 @@ INCLUDE "gfx/pokemon/unown_frames.asm"
SECTION "bank38", ROMX SECTION "bank38", ROMX
INCLUDE "events/print_unown_2.asm" INCLUDE "engine/events/print_unown_2.asm"
Unknown_e00ed: Unknown_e00ed:
; Graphics for an unused Game Corner ; Graphics for an unused Game Corner
@ -477,12 +477,12 @@ SECTION "bank3E", ROMX
INCLUDE "gfx/font.asm" INCLUDE "gfx/font.asm"
INCLUDE "engine/time_capsule.asm" INCLUDE "engine/time_capsule.asm"
INCLUDE "events/name_rater.asm" INCLUDE "engine/events/name_rater.asm"
INCLUDE "engine/routines/playslowcry.asm" INCLUDE "engine/routines/playslowcry.asm"
INCLUDE "engine/routines/newpokedexentry.asm" INCLUDE "engine/routines/newpokedexentry.asm"
INCLUDE "engine/time_capsule_2.asm" INCLUDE "engine/time_capsule_2.asm"
INCLUDE "engine/unown_dex.asm" INCLUDE "engine/unown_dex.asm"
INCLUDE "events/magikarp.asm" INCLUDE "engine/events/magikarp.asm"
INCLUDE "engine/battle/hidden_power.asm" INCLUDE "engine/battle/hidden_power.asm"
INCLUDE "engine/battle/misc.asm" INCLUDE "engine/battle/misc.asm"
@ -491,7 +491,7 @@ SECTION "bank3F", ROMX
INCLUDE "tilesets/animations.asm" INCLUDE "tilesets/animations.asm"
INCLUDE "engine/npctrade.asm" INCLUDE "engine/npctrade.asm"
INCLUDE "events/mom_phone.asm" INCLUDE "engine/events/mom_phone.asm"
INCLUDE "mobile/mobile_40.asm" INCLUDE "mobile/mobile_40.asm"
@ -612,7 +612,7 @@ SECTION "bank77_2", ROMX
INCLUDE "engine/routines/printhoursmins.asm" INCLUDE "engine/routines/printhoursmins.asm"
INCLUDE "engine/diploma.asm" INCLUDE "engine/diploma.asm"
INCLUDE "engine/pokedex_3.asm" INCLUDE "engine/pokedex_3.asm"
INCLUDE "events/catch_tutorial_input.asm" INCLUDE "engine/events/catch_tutorial_input.asm"
INCLUDE "engine/routines/townmap_convertlinebreakcharacters.asm" INCLUDE "engine/routines/townmap_convertlinebreakcharacters.asm"
PokegearGFX: ; 1de2e4 PokegearGFX: ; 1de2e4
@ -638,8 +638,8 @@ INCLUDE "mobile/news/news.asm"
SECTION "Crystal Events", ROMX SECTION "Crystal Events", ROMX
INCLUDE "events/battle_tower.asm" INCLUDE "engine/events/battle_tower.asm"
INCLUDE "events/odd_egg.asm" INCLUDE "engine/events/odd_egg.asm"
SECTION "Mobile Stadium 2", ROMX SECTION "Mobile Stadium 2", ROMX