diff options
139 files changed, 1061 insertions, 1020 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 19e42c9e9..1d12dc6a4 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,5 +1,7 @@ #include "constants/global.h" #include "constants/battle.h" +#include "constants/battle_pike.h" +#include "constants/battle_pyramid.h" #include "constants/battle_frontier.h" #include "constants/battle_setup.h" #include "constants/berry.h" @@ -10,6 +12,7 @@ #include "constants/event_objects.h" #include "constants/event_object_movement_constants.h" #include "constants/field_effects.h" +#include "constants/field_poison.h" #include "constants/field_specials.h" #include "constants/flags.h" #include "constants/game_stat.h" @@ -22,6 +25,7 @@ #include "constants/maps.h" #include "constants/metatile_labels.h" #include "constants/moves.h" +#include "constants/party_menu.h" #include "constants/pokemon.h" #include "constants/script_menu.h" #include "constants/secret_bases.h" @@ -900,7 +904,7 @@ EventScript_PickItemUp:: @ 8271C3A waitfanfare waitmessage bufferitemnameplural 1, VAR_0x8004, VAR_0x8005 - setvar VAR_0x8004, 12 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN special CallBattlePyramidFunction compare VAR_RESULT, 1 goto_if_eq EventScript_271C86 @@ -1296,7 +1300,7 @@ RusturfTunnel_EventScript_272216:: @ 8272216 EventScript_27222B:: @ 827222B delay 30 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 showobjectat 255, MAP_PETALBURG_CITY delay 30 diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index 975715fc2..87830e500 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -31,14 +31,14 @@ AquaHideout_B2F_EventScript_233E09:: @ 8233E09 AquaHideout_B2F_EventScript_233E25:: @ 8233E25 setvar VAR_0x8008, 1 setvar VAR_0x8009, 4 - applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft + applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 20 applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 msgbox AquaHideout_B2F_Text_233FA6, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft + applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestLeft applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80 waitmovement 0 removeobject VAR_0x8009 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index a44b51ef5..5ef17d381 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -43,7 +43,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD compare VAR_RESULT, 0 call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C938 - applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 call BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C970, MSGBOX_DEFAULT @@ -114,7 +114,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7 case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0 BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F - applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 setvar VAR_0x8004, 4 special CallBattleDomeFunction @@ -163,7 +163,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9:: @ 824BED9 return BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0 - applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 compare VAR_TEMP_2, 0 call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 9c76544f6..68e6194cf 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -304,12 +304,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA:: @ 825B1AA end BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4:: @ 825B1B4 - applymovement 1, Common_Movement_WalkInPlaceRight - applymovement 3, Common_Movement_WalkInPlaceRight - applymovement 4, Common_Movement_WalkInPlaceRight - applymovement 5, Common_Movement_WalkInPlaceLeft - applymovement 6, Common_Movement_WalkInPlaceLeft - applymovement 7, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceFastestRight + applymovement 3, Common_Movement_WalkInPlaceFastestRight + applymovement 4, Common_Movement_WalkInPlaceFastestRight + applymovement 5, Common_Movement_WalkInPlaceFastestLeft + applymovement 6, Common_Movement_WalkInPlaceFastestLeft + applymovement 7, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 605807580..0513e2bb3 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -278,10 +278,10 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 + applymovement 2, Common_Movement_WalkInPlaceLeft waitmovement 0 - applymovement 1, Common_Movement_WalkInPlaceRight - applymovement 3, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight + applymovement 3, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 @@ -321,10 +321,10 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 + applymovement 2, Common_Movement_WalkInPlaceLeft waitmovement 0 - applymovement 1, Common_Movement_WalkInPlaceRight - applymovement 3, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight + applymovement 3, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc index 20e14b72b..44027d7ce 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc @@ -13,9 +13,9 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special CallFrontierUtilFunc - setvar VAR_0x8004, 20 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_CLEAR_TRAINER_IDS special CallBattlePikeFunction - setvar VAR_0x8004, 24 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED setvar VAR_0x8005, 1 special CallBattlePikeFunction applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80B diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index c3f5e80de..541ffd313 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -26,16 +26,16 @@ BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707 BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710 special HealPlayerParty - setvar VAR_0x8004, 27 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS special CallBattlePikeFunction lockall msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallBattlePikeFunction - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA setvar VAR_0x8005, 4 setvar VAR_0x8006, 0 special CallBattlePikeFunction @@ -68,21 +68,21 @@ BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D msgbox BattleFrontier_BattlePikeLobby_Text_241520, 9 setvar VAR_0x8004, 8 special CallFrontierUtilFunc - setvar VAR_0x8004, 1 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA setvar VAR_0x8005, 3 special CallBattlePikeFunction addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA setvar VAR_0x8005, 3 copyvar VAR_0x8006, VAR_RESULT special CallBattlePikeFunction special LoadPlayerParty special HealPlayerParty - setvar VAR_0x8004, 27 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS special CallBattlePikeFunction message BattleFrontier_BattlePikeLobby_Text_25C1DF waitmessage - setvar VAR_0x8004, 8 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_8 setvar VAR_0x8005, 0 special CallBattlePikeFunction playse SE_SAVE @@ -103,15 +103,15 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 special CallFrontierUtilFunc - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA setvar VAR_0x8005, 4 setvar VAR_0x8006, 0 special CallBattlePikeFunction special LoadPlayerParty special HealPlayerParty - setvar VAR_0x8004, 27 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS special CallBattlePikeFunction - setvar VAR_0x8004, 8 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_8 setvar VAR_0x8005, 0 special CallBattlePikeFunction playse SE_SAVE @@ -176,17 +176,17 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 special CallFrontierUtilFunc - setvar VAR_0x8004, 28 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_INIT_CHALLENGE special CallBattlePikeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 special CallFrontierUtilFunc - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA setvar VAR_0x8005, 4 setvar VAR_0x8006, 1 special CallBattlePikeFunction - setvar VAR_0x8004, 26 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS special CallBattlePikeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 @@ -197,7 +197,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C delay 2 call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 - setvar VAR_0x8004, 26 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS special CallBattlePikeFunction compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc index ea959387b..565e28d47 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc @@ -11,7 +11,7 @@ BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167: @ 825D167 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171:: @ 825D171 setvar VAR_TEMP_0, 1 - setvar VAR_0x8004, 5 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE special CallBattlePikeFunction switch VAR_RESULT case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6 @@ -27,7 +27,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6:: @ 825D1C6 delay 16 applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795 waitmovement 0 - setvar VAR_0x8004, 21 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG setvar VAR_0x8005, 0 special CallBattlePikeFunction msgbox gStringVar4, MSGBOX_DEFAULT @@ -63,7 +63,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231 closemessage applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795 waitmovement 0 - setvar VAR_0x8004, 21 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG setvar VAR_0x8005, 0 special CallBattlePikeFunction msgbox gStringVar4, MSGBOX_DEFAULT @@ -102,7 +102,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF lockall applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF waitmovement 0 - setvar VAR_0x8004, 23 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_MONS_BEFORE_QUEEN special CallBattlePikeFunction switch VAR_RESULT case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC @@ -136,7 +136,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB waitse applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7 waitmovement 0 - setvar VAR_0x8004, 22 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_QUEEN_FIGHT_TYPE special CallBattlePikeFunction switch VAR_RESULT case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416 @@ -217,11 +217,11 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D:: @ 825D49D waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC waitmovement 0 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA setvar VAR_0x8005, 1 special CallBattlePikeFunction addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallBattlePikeFunction @@ -279,7 +279,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB waitmovement 0 - setvar VAR_0x8004, 21 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG setvar VAR_0x8005, 0 special CallBattlePikeFunction msgbox gStringVar4, MSGBOX_DEFAULT @@ -287,7 +287,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E delay 16 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD waitmovement 0 - setvar VAR_0x8004, 21 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG setvar VAR_0x8005, 1 special CallBattlePikeFunction msgbox gStringVar4, MSGBOX_DEFAULT @@ -317,7 +317,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605 message BattleFrontier_BattlePikeRandomRoom1_Text_25DBD1 applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA waitmovement 0 - setvar VAR_0x8004, 12 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON special CallBattlePikeFunction copyvar VAR_0x8004, VAR_RESULT compare VAR_0x8004, 0 @@ -335,7 +335,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 waitse playmoncry SPECIES_KIRLIA, 0 waitmoncry - setvar VAR_0x8004, 11 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS special CallBattlePikeFunction compare VAR_RESULT, 2 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751 @@ -345,7 +345,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F compare VAR_RESULT, 4 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766 - setvar VAR_0x8004, 15 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE special CallBattlePikeFunction waitstate applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2 @@ -372,13 +372,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5 waitse playmoncry SPECIES_DUSCLOPS, 0 waitmoncry - setvar VAR_0x8004, 11 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS special CallBattlePikeFunction compare VAR_RESULT, 0 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D compare VAR_RESULT, 1 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774 - setvar VAR_0x8004, 15 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE special CallBattlePikeFunction waitstate applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2 @@ -578,7 +578,7 @@ BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA: @ 825D7EA step_end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED - setvar VAR_0x8004, 5 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE special CallBattlePikeFunction switch VAR_RESULT case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B @@ -588,7 +588,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B lock faceplayer - setvar VAR_0x8004, 14 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_NPC_MSG special CallBattlePikeFunction msgbox gStringVar4, MSGBOX_DEFAULT waitmessage @@ -605,7 +605,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831:: @ 825D831 end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E - setvar VAR_0x8004, 13 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS special CallBattlePikeFunction compare VAR_RESULT, 2 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc index 9a4448226..a18ccda4c 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc @@ -11,7 +11,7 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A: @ 825E42A BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C:: @ 825E43C setvar VAR_TEMP_0, 1 - setvar VAR_0x8004, 6 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_6 special CallBattlePikeFunction end diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index 927222e8c..6416ad4d7 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -35,7 +35,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4 lockall message BattleFrontier_BattlePikeThreePathRoom_Text_25CD75 waitmessage - setvar VAR_0x8004, 8 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_8 setvar VAR_0x8005, 1 special CallBattlePikeFunction playse SE_SAVE @@ -137,7 +137,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD message BattleFrontier_BattlePikeThreePathRoom_Text_25CE08 waitmessage special LoadPlayerParty - setvar VAR_0x8004, 8 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_8 setvar VAR_0x8005, 2 special CallBattlePikeFunction playse SE_SAVE @@ -161,12 +161,12 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A waitmessage multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT - case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222 + case 0, BattleFrontier_BattlePike_EventScript_Retire release end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78 - setvar VAR_0x8004, 17 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HINT_ROOM special CallBattlePikeFunction compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91 @@ -189,7 +189,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB - setvar VAR_0x8004, 19 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT special CallBattlePikeFunction compare VAR_RESULT, 4 goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2 @@ -209,7 +209,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00:: @ 825CB00 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A:: @ 825CB0A - setvar VAR_0x8004, 18 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HINT_ROOM_ID special CallBattlePikeFunction switch VAR_RESULT case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39 @@ -230,7 +230,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB53:: @ 825CB53 goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60:: @ 825CB60 - setvar VAR_0x8004, 19 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT special CallBattlePikeFunction switch VAR_RESULT case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc index 723c666d8..ba862ebdf 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc @@ -12,7 +12,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43: @ 8252A43 BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D lockall - setvar VAR_0x8004, 13 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT setvar VAR_0x8005, 4 setvar VAR_0x8006, 1 setvar VAR_0x8007, 55 @@ -38,7 +38,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98 end BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 - setvar VAR_0x8004, 15 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE special CallBattlePyramidFunction setvar VAR_0x8004, 0 special CallFrontierUtilFunc @@ -67,7 +67,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 setvar VAR_TEMP_D, 1 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39 - setvar VAR_0x8004, 17 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY special CallBattlePyramidFunction end @@ -77,18 +77,18 @@ BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special CallFrontierUtilFunc - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA setvar VAR_0x8005, 7 setvar VAR_0x8006, 255 special CallBattlePyramidFunction BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66:: @ 8252B66 BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66 - setvar VAR_0x8004, 13 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallBattlePyramidFunction - setvar VAR_0x8004, 14 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS special CallBattlePyramidFunction special HealPlayerParty warpsilent MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 @@ -96,7 +96,7 @@ BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66 end BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D - setvar VAR_0x8004, 3 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3 setvar VAR_0x8005, 1 special CallBattlePyramidFunction special SavePlayerParty @@ -104,7 +104,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc - setvar VAR_0x8004, 9 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS special CallBattlePyramidFunction setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 @@ -118,7 +118,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA: @ 8252BCA end BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5 - setvar VAR_0x8004, 13 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT setvar VAR_0x8005, 32 setvar VAR_0x8006, 0 special CallBattlePyramidFunction @@ -136,7 +136,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8 special CallFrontierUtilFunc compare VAR_RESULT, 7 goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45 - setvar VAR_0x8004, 6 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR special CallBattlePyramidFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 @@ -154,7 +154,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45 BattlePyramid_TrainerBattle:: @ 8252C4F trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText - setvar VAR_0x8004, 10 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SHOW_HINT_TEXT special CallBattlePyramidFunction waitmessage waitbuttonpress @@ -163,12 +163,12 @@ BattlePyramid_TrainerBattle:: @ 8252C4F end BattlePyramid_FindItemBall:: @ 8252C6A - setvar VAR_0x8004, 7 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_ITEM special CallBattlePyramidFunction callstd STD_FIND_ITEM compare VAR_0x8007, 0 goto_if_eq BattlePyramid_FindItemBall_End - setvar VAR_0x8004, 8 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_HIDE_ITEM special CallBattlePyramidFunction BattlePyramid_FindItemBall_End:: @ 8252C87 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index b2f7d4579..72abed5ef 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -32,11 +32,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768 playse SE_EXPMAX waitse closemessage - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallBattlePyramidFunction - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 special CallBattlePyramidFunction @@ -68,7 +68,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA setvar VAR_0x8004, 8 special CallFrontierUtilFunc special LoadPlayerParty - setvar VAR_0x8004, 14 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS special CallBattlePyramidFunction special HealPlayerParty message BattleFrontier_BattlePyramidLobby_Text_2519F8 @@ -81,9 +81,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA msgbox BattleFrontier_BattlePyramidLobby_Text_241520, 9 message BattleFrontier_BattlePyramidLobby_Text_251A77 waitmessage - setvar VAR_0x8004, 4 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_REWARD special CallBattlePyramidFunction - setvar VAR_0x8004, 3 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3 setvar VAR_0x8005, 0 special CallBattlePyramidFunction playse SE_SAVE @@ -98,7 +98,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852 setvar VAR_0x8004, 8 special CallFrontierUtilFunc special LoadPlayerParty - setvar VAR_0x8004, 14 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS special CallBattlePyramidFunction special HealPlayerParty lockall @@ -108,11 +108,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852 waitse message BattleFrontier_BattlePyramidLobby_Text_251A77 waitmessage - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 special CallBattlePyramidFunction - setvar VAR_0x8004, 3 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3 setvar VAR_0x8005, 0 special CallBattlePyramidFunction playse SE_SAVE @@ -179,9 +179,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 special CallFrontierUtilFunc - setvar VAR_0x8004, 0 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_CHALLENGE special CallBattlePyramidFunction - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special CallBattlePyramidFunction @@ -193,9 +193,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc - setvar VAR_0x8004, 6 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR special CallBattlePyramidFunction - setvar VAR_0x8004, 9 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS special CallBattlePyramidFunction special LoadPlayerParty closemessage @@ -282,7 +282,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B27:: @ 8250B27 BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28 msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT - setvar VAR_0x8004, 1 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA setvar VAR_0x8005, 5 special CallBattlePyramidFunction compare VAR_RESULT, 0 @@ -292,7 +292,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28 return BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA setvar VAR_0x8005, 3 special CallBattlePyramidFunction goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 @@ -300,7 +300,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53 BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66 msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT - setvar VAR_0x8004, 1 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA setvar VAR_0x8005, 6 special CallBattlePyramidFunction compare VAR_RESULT, 0 @@ -310,7 +310,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66 return BattleFrontier_BattlePyramidLobby_EventScript_250B91:: @ 8250B91 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA setvar VAR_0x8005, 4 special CallBattlePyramidFunction goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 @@ -437,7 +437,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DCD waitmovement 0 msgbox BattleFrontier_BattlePyramidLobby_Text_251569, MSGBOX_DEFAULT - setvar VAR_0x8004, 1 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA setvar VAR_0x8005, 1 special CallBattlePyramidFunction compare VAR_RESULT, 0 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index 211ab0c87..8906d4c42 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -6,7 +6,7 @@ BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1 .byte 0 BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6 - setvar VAR_0x8004, 13 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT setvar VAR_0x8005, 200 setvar VAR_0x8006, 0 special CallBattlePyramidFunction @@ -69,7 +69,7 @@ BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A end BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193 - setvar VAR_0x8004, 3 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3 setvar VAR_0x8005, 1 special CallBattlePyramidFunction special SavePlayerParty @@ -77,7 +77,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc - setvar VAR_0x8004, 9 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS special CallBattlePyramidFunction setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index ce171e3c0..f2c6ca0ac 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -230,7 +230,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA:: @ 8241EBA BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_24219A waitmovement 0 - applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2725B6 + applymovement 3, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_PIN applymovement 2, Common_Movement_ExclamationMark diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc index 097e732ab..786f1fa3e 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc @@ -68,8 +68,8 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248ED5 waitmovement 0 delay 40 - applymovement 3, Common_Movement_WalkInPlaceUp - applymovement 2, Common_Movement_WalkInPlaceUp + applymovement 3, Common_Movement_WalkInPlaceFastestUp + applymovement 2, Common_Movement_WalkInPlaceFastestUp waitmovement 0 opendoor 7, 1 waitdooranim diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index 64cca60dd..d053c33e4 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -6,7 +6,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92 .byte 0 BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7 - setvar VAR_0x8004, 17 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY special CallBattlePyramidFunction end @@ -64,7 +64,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77 waitmovement 0 copyobjectxytoperm 1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT special HealPlayerParty @@ -104,7 +104,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5 msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, MSGBOX_DEFAULT closemessage - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 opendoor 10, 1 waitdooranim diff --git a/data/maps/BattleFrontier_Lounge7/scripts.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc index 82b04023f..854a1d360 100644 --- a/data/maps/BattleFrontier_Lounge7/scripts.inc +++ b/data/maps/BattleFrontier_Lounge7/scripts.inc @@ -265,7 +265,7 @@ BattleFrontier_Lounge7_EventScript_265696:: @ 8265696 fadescreen 1 special CloseBattlePointsWindow special CloseBattleFrontierTutorWindow - special sub_81B892C + special OpenPartyMenuForMoveTutor waitstate compare VAR_RESULT, 0 goto_if_eq BattleFrontier_Lounge7_EventScript_265645 diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc index 06e3a4ff6..1f3d61628 100644 --- a/data/maps/BattleFrontier_OutsideWest/scripts.inc +++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc @@ -63,7 +63,7 @@ BattleFrontier_OutsideWest_EventScript_23D4AE:: @ 823D4AE BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 hideobjectat 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST @@ -126,16 +126,16 @@ BattleFrontier_OutsideWest_EventScript_23D53D:: @ 823D53D end BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544 - applymovement 9, Common_Movement_WalkInPlaceRight + applymovement 9, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox BattleFrontier_OutsideWest_Text_23DB7D, MSGBOX_DEFAULT - applymovement 10, Common_Movement_WalkInPlaceLeft + applymovement 10, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox BattleFrontier_OutsideWest_Text_23DBCE, MSGBOX_DEFAULT closemessage delay 25 - applymovement 9, Common_Movement_WalkInPlaceUp - applymovement 10, Common_Movement_WalkInPlaceUp + applymovement 9, Common_Movement_WalkInPlaceFastestUp + applymovement 10, Common_Movement_WalkInPlaceFastestUp waitmovement 0 release end @@ -157,7 +157,7 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F end BattleFrontier_OutsideWest_EventScript_23D5BA:: @ 823D5BA - applymovement 14, Common_Movement_WalkInPlaceUp + applymovement 14, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index 3eac4655b..640309975 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -38,9 +38,9 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT msgbox BattleFrontier_ReceptionGate_Text_266703, MSGBOX_DEFAULT closemessage - applymovement 1, Common_Movement_WalkInPlaceUp - applymovement 2, Common_Movement_WalkInPlaceUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp + applymovement 2, Common_Movement_WalkInPlaceFastestUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN applymovement 1, Common_Movement_ExclamationMark diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index b2d054380..eeb6f6904 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -227,22 +227,22 @@ BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8 end BattleFrontier_ScottsHouse_EventScript_263A13:: @ 8263A13 - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_263A1E:: @ 8263A1E - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_263A29:: @ 8263A29 - applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_263A34:: @ 8263A34 - applymovement 1, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index 9ef54cdc8..a42152183 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -9,7 +9,7 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D goto_if_eq BirthIsland_Harbor_EventScript_2680A2 msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 hideobjectat 1, MAP_BIRTH_ISLAND_HARBOR diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc index 3b130e756..5a6383199 100644 --- a/data/maps/CaveOfOrigin_B1F/scripts.inc +++ b/data/maps/CaveOfOrigin_B1F/scripts.inc @@ -6,7 +6,7 @@ CaveOfOrigin_B1F_EventScript_2357A9:: @ 82357A9 faceplayer msgbox CaveOfOrigin_B1F_Text_23586E, MSGBOX_DEFAULT closemessage - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 60 playse SE_PIN diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index 2e6fd2cdd..9790753cf 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -53,7 +53,7 @@ DewfordTown_Hall_EventScript_1FD547:: @ 81FD547 call DewfordTown_Hall_EventScript_271E8B msgbox DewfordTown_Hall_Text_1FDA5C, MSGBOX_DEFAULT closemessage - applymovement 4, Common_Movement_WalkInPlaceUp + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 release end @@ -64,7 +64,7 @@ DewfordTown_Hall_EventScript_1FD563:: @ 81FD563 call DewfordTown_Hall_EventScript_271E8B msgbox DewfordTown_Hall_Text_1FDA99, MSGBOX_DEFAULT closemessage - applymovement 5, Common_Movement_WalkInPlaceUp + applymovement 5, Common_Movement_WalkInPlaceFastestUp waitmovement 0 release end @@ -200,7 +200,7 @@ DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B compare VAR_FACING, DIR_EAST goto_if_eq DewfordTown_Hall_EventScript_1FD739 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -224,19 +224,19 @@ DewfordTown_Hall_EventScript_1FD793:: @ 81FD793 return DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 compare VAR_FACING, DIR_WEST goto_if_eq DewfordTown_Hall_EventScript_1FD739 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 99a1a6eb3..aae6c0b13 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -22,7 +22,7 @@ EverGrandeCity_ChampionsRoom_MapScript2_228A14: @ 8228A14 EverGrandeCity_ChampionsRoom_EventScript_228A1E:: @ 8228A1E lockall - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725C1 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp4 waitmovement 0 delay 40 applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228A42 @@ -105,26 +105,26 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 addobject 3 applymovement 3, EverGrandeCity_ChampionsRoom_Movement_228C43 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT call EverGrandeCity_ChampionsRoom_EventScript_272184 msgbox EverGrandeCity_ChampionsRoom_Text_22934D, MSGBOX_DEFAULT - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_229399, MSGBOX_DEFAULT closemessage delay 30 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3B applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C1D - applymovement 3, Common_Movement_WalkInPlaceUp + applymovement 3, Common_Movement_WalkInPlaceFastestUp applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C38 waitmovement 0 delay 20 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT checkplayergender @@ -153,7 +153,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228BF4:: @ 8228BF4 EverGrandeCity_ChampionsRoom_EventScript_228BFD:: @ 8228BFD applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C26 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index ebfcb3311..638e18eb5 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -20,8 +20,8 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 applymovement 1, EverGrandeCity_HallOfFame_Movement_229901 applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229901 waitmovement 0 - applymovement 1, Common_Movement_WalkInPlaceRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceFastestRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_22990E, MSGBOX_DEFAULT closemessage @@ -29,13 +29,13 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229908 waitmovement 0 delay 20 - applymovement 1, Common_Movement_WalkInPlaceRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceFastestRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT closemessage - applymovement 1, Common_Movement_WalkInPlaceUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 dofieldeffect FLDEFF_HALL_OF_FAME_RECORD diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json index 9248eec87..60b0be26a 100644 --- a/data/maps/FallarborTown_Mart/map.json +++ b/data/maps/FallarborTown_Mart/map.json @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_Mart_EventScript_2C80B6", + "script": "FallarborTown_Mart_EventScript_MetronomeTutor", "flag": "0" } ], diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc index e0d54233b..f69bca377 100644 --- a/data/maps/FarawayIsland_Entrance/scripts.inc +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -24,7 +24,7 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 goto_if_eq FarawayIsland_Entrance_EventScript_267CE7 msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 hideobjectat 1, MAP_FARAWAY_ISLAND_ENTRANCE diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index 30f617f78..a36031664 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -72,7 +72,7 @@ FortreeCity_EventScript_1E2630:: @ 81E2630 FortreeCity_EventScript_1E2645:: @ 81E2645 msgbox FortreeCity_Text_1E2A48, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, FortreeCity_Movement_2723C7 + applymovement VAR_LAST_TALKED, Movement_KecleonAppears waitmovement 0 waitse playmoncry SPECIES_KECLEON, 2 diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json index 17f928fe9..492590c6c 100644 --- a/data/maps/FortreeCity_House2/map.json +++ b/data/maps/FortreeCity_House2/map.json @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House2_EventScript_2C811E", + "script": "FortreeCity_House2_EventScript_SleepTalkTutor", "flag": "0" } ], diff --git a/data/maps/GraniteCave_B1F/scripts.inc b/data/maps/GraniteCave_B1F/scripts.inc index 099e5a501..61e143e23 100644 --- a/data/maps/GraniteCave_B1F/scripts.inc +++ b/data/maps/GraniteCave_B1F/scripts.inc @@ -1,10 +1,10 @@ GraniteCave_B1F_MapScripts:: @ 822DC5E - map_script MAP_SCRIPT_ON_FRAME_TABLE, GraniteCave_B1F_MapScript2_2A8327 - map_script MAP_SCRIPT_ON_TRANSITION, GraniteCave_B1F_MapScript1_2A8331 - map_script MAP_SCRIPT_ON_RESUME, GraniteCave_B1F_MapScript1_22DC6E + map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_MapScript2_CheckFallDownHole + map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_MapScript1_FixCrackedGround + map_script MAP_SCRIPT_ON_RESUME, GraniteCave_B1F_MapScript1_SetHoleWarp .byte 0 -GraniteCave_B1F_MapScript1_22DC6E: @ 822DC6E +GraniteCave_B1F_MapScript1_SetHoleWarp: @ 822DC6E setstepcallback 7 setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0 end diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index eb9bf1018..ee689ed29 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -110,7 +110,7 @@ LavaridgeTown_EventScript_1EA635:: @ 81EA635 return LavaridgeTown_EventScript_1EA63A:: @ 81EA63A - applymovement 8, Common_Movement_WalkInPlaceUp + applymovement 8, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN applymovement 8, Common_Movement_ExclamationMark @@ -127,14 +127,14 @@ LavaridgeTown_EventScript_1EA65C:: @ 81EA65C waitmovement 0 closedoor 12, 15 waitdooranim - applymovement 8, Common_Movement_WalkInPlaceLeft + applymovement 8, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 playse SE_PIN applymovement 8, Common_Movement_ExclamationMark waitmovement 0 applymovement 8, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json index a0cd74f59..83416a7c0 100644 --- a/data/maps/LavaridgeTown_House/map.json +++ b/data/maps/LavaridgeTown_House/map.json @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_House_EventScript_2C804E", + "script": "LavaridgeTown_House_EventScript_MimicTutor", "flag": "0" } ], diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 8edf1b385..ed0239819 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -387,7 +387,7 @@ LilycoveCity_EventScript_1E2FFD:: @ 81E2FFD LilycoveCity_EventScript_1E3006:: @ 81E3006 closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index 87e4c0afd..d4e630e4a 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -44,7 +44,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211 waitmovement 0 applymovement 1, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, MSGBOX_DEFAULT closemessage diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc index 83a43a5b6..d7061d7e4 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc @@ -114,7 +114,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E0:: @ 82207E0 LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5 special CloseDeptStoreElevatorWindow closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 waitse special MoveElevator diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json index 7514a548a..06159b81a 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186", + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_SubstituteTutor", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index a99f92862..36057b3bb 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -22,7 +22,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C copyvar VAR_0x8008, VAR_RESULT special BufferLottoTicketNumber msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, MSGBOX_DEFAULT - applymovement 2, Common_Movement_WalkInPlaceRight + applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 playse SE_PC_ON special DoLotteryCornerComputerEffect diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index 3226e6961..79943cec3 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -141,7 +141,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22009C:: @ 822009C LilycoveCity_DepartmentStore_5F_EventScript_2200A7:: @ 82200A7 msgbox LilycoveCity_DepartmentStore_5F_Text_2201C4, MSGBOX_DEFAULT closemessage - applymovement 7, Common_Movement_WalkInPlaceUp + applymovement 7, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 292180d31..5ef4852d3 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -247,7 +247,7 @@ LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime:: @ 821E350 call LilycoveCity_Harbor_EventScript_GetEventTicketSailor msgbox EventTicket_Text_OldSeaMapTooFar, MSGBOX_DEFAULT closemessage - applymovement 4, Common_Movement_WalkInPlaceUp + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN applymovement 4, Common_Movement_ExclamationMark @@ -329,12 +329,12 @@ LilycoveCity_Harbor_EventScript_MultipleEventTicketsFirstTime:: @ 821E44D LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect:: @ 821E4B6 msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT closemessage - applymovement 4, Common_Movement_WalkInPlaceUp + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 30 removeobject 4 delay 30 - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 showobjectat 1, MAP_LILYCOVE_CITY_HARBOR delay 30 @@ -343,7 +343,7 @@ LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect:: @ 821E4B6 end LilycoveCity_Harbor_EventScript_GetEventTicketSailor:: @ 821E4EE - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR @@ -355,7 +355,7 @@ LilycoveCity_Harbor_EventScript_GetEventTicketSailor:: @ 821E4EE return LilycoveCity_Harbor_EventScript_BoardFerryWithSailor:: @ 821E514 - applymovement 4, Common_Movement_WalkInPlaceUp + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 30 removeobject 4 @@ -419,7 +419,7 @@ LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind:: @ 821E5C0 LilycoveCity_Harbor_EventScript_BoardFerry:: @ 821E5CC msgbox LilycoveCity_Harbor_Text_PleaseBoard, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR @@ -499,22 +499,22 @@ LilycoveCity_Harbor_Movement_SailorOutOfWayEast: @ 821E671 step_end LilycoveCity_Harbor_EventScript_BrineyFaceSailorNorth:: @ 821E675 - applymovement 5, Common_Movement_WalkInPlaceLeft + applymovement 5, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return LilycoveCity_Harbor_EventScript_BrineyFaceSailorEast:: @ 821E680 - applymovement 5, Common_Movement_WalkInPlaceDown + applymovement 5, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return LilycoveCity_Harbor_EventScript_BrineyFacePlayerNorth:: @ 821E68B - applymovement 5, Common_Movement_WalkInPlaceDown + applymovement 5, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return LilycoveCity_Harbor_EventScript_BrineyFacePlayerEast:: @ 821E696 - applymovement 5, Common_Movement_WalkInPlaceLeft + applymovement 5, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index d9ba545fb..8b0cf40ac 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -9,18 +9,18 @@ LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790 LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A lockall - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807 waitmovement 0 diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index c55f1db86..8825d1899 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -357,9 +357,9 @@ LittlerootTown_Movement_1E8118: @ 81E8118 LittlerootTown_EventScript_1E811F:: @ 81E811F lockall - applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT @@ -490,12 +490,12 @@ LittlerootTown_EventScript_1E828C:: @ 81E828C return LittlerootTown_EventScript_1E8297:: @ 81E8297 - applymovement 4, Common_Movement_WalkInPlaceRight + applymovement 4, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return LittlerootTown_EventScript_1E82A2:: @ 81E82A2 - applymovement 4, Common_Movement_WalkInPlaceLeft + applymovement 4, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -530,70 +530,70 @@ LittlerootTown_EventScript_1E82F0:: @ 81E82F0 return LittlerootTown_EventScript_1E8333:: @ 81E8333 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85D1 waitmovement 0 return LittlerootTown_EventScript_1E8348:: @ 81E8348 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85D8 waitmovement 0 return LittlerootTown_EventScript_1E835D:: @ 81E835D - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85DF waitmovement 0 return LittlerootTown_EventScript_1E8372:: @ 81E8372 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85E4 waitmovement 0 return LittlerootTown_EventScript_1E8387:: @ 81E8387 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85EA waitmovement 0 return LittlerootTown_EventScript_1E839C:: @ 81E839C - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85ED waitmovement 0 return LittlerootTown_EventScript_1E83B1:: @ 81E83B1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F1 waitmovement 0 return LittlerootTown_EventScript_1E83C6:: @ 81E83C6 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F5 waitmovement 0 return LittlerootTown_EventScript_1E83DB:: @ 81E83DB - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F8 waitmovement 0 return LittlerootTown_EventScript_1E83F0:: @ 81E83F0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85FE waitmovement 0 @@ -894,7 +894,7 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_EventScript_1E828C call LittlerootTown_EventScript_1E8693 - applymovement 4, Common_Movement_WalkInPlaceUp + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 397bdfb8f..3d6284600 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -94,7 +94,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E waitmovement 0 applymovement 4, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C waitmovement 0 special GetRivalSonDaughterString @@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78A3:: @ 81F78A3 lockall setvar VAR_0x8004, 1 setvar VAR_0x8005, 0 - applymovement VAR_0x8004, Common_Movement_WalkInPlaceLeft + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_292765 end @@ -181,7 +181,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 end LittlerootTown_BrendansHouse_1F_EventScript_1F7981:: @ 81F7981 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 87551999a..130781f23 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -93,7 +93,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage @@ -105,7 +105,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507 LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85D7 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage @@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536 LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85E8 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage @@ -129,7 +129,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565 LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85FD waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 510f8c249..74654f7ee 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -94,7 +94,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE waitmovement 0 applymovement 4, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC waitmovement 0 special GetRivalSonDaughterString @@ -154,7 +154,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A4C:: @ 81F8A4C lockall setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - applymovement VAR_0x8004, Common_Movement_WalkInPlaceRight + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestRight waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_292765 end @@ -218,7 +218,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B end LittlerootTown_MaysHouse_1F_EventScript_1F8B2A:: @ 81F8B2A - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 5ded4592a..31a097ead 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -94,7 +94,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9473 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage @@ -106,7 +106,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage @@ -118,7 +118,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9 LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F949D waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage @@ -129,7 +129,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418 LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94AD waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index b0275642c..4cb9af230 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -167,8 +167,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 delay 10 playse SE_TK_KASYA delay 20 - applymovement 3, Common_Movement_WalkInPlaceRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement 3, Common_Movement_WalkInPlaceFastestRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 checkplayergender compare VAR_RESULT, MALE @@ -180,8 +180,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 delay 20 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F58 waitmovement 0 - applymovement 3, Common_Movement_WalkInPlaceUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement 3, Common_Movement_WalkInPlaceFastestUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, MSGBOX_DEFAULT playfanfare MUS_FANFA4 @@ -286,7 +286,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB release compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, Common_Movement_WalkInPlaceRight + applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 drawmonpic SPECIES_CYNDAQUIL, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO @@ -299,7 +299,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF release compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, Common_Movement_WalkInPlaceRight + applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 drawmonpic SPECIES_TOTODILE, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO @@ -312,7 +312,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023 release compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, Common_Movement_WalkInPlaceRight + applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 drawmonpic SPECIES_CHIKORITA, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO @@ -530,7 +530,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 closemessage applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 checkplayergender compare VAR_RESULT, MALE diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index de6790a25..ce2229396 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -18,7 +18,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 playfanfare MUS_ME_TAMA playse SE_TAMA special sub_80B0534 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 150 removeobject 7 @@ -50,7 +50,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 waitmovement 0 msgbox MagmaHideout_4F_Text_23AADA, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 applymovement 6, Common_Movement_FacePlayer diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index 4163f4d9d..d5dc8ae99 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -162,7 +162,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_2C7F7E", + "script": "MauvilleCity_EventScript_RolloutTutor", "flag": "0" }, { diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 548004f59..52ff2237c 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -86,7 +86,7 @@ MauvilleCity_EventScript_1DF43D:: @ 81DF43D MauvilleCity_EventScript_1DF452:: @ 81DF452 lockall goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF690 - applymovement 6, Common_Movement_WalkInPlaceRight + applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DF8B9, MSGBOX_DEFAULT @@ -118,7 +118,7 @@ MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0 applymovement 6, MauvilleCity_Movement_1DF6A8 applymovement 7, MauvilleCity_Movement_1DF6E2 waitmovement 0 - applymovement 6, Common_Movement_WalkInPlaceRight + applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6EE @@ -138,7 +138,7 @@ MauvilleCity_EventScript_1DF53D:: @ 81DF53D applymovement 6, MauvilleCity_Movement_1DF6AE applymovement 7, MauvilleCity_Movement_1DF6E8 waitmovement 0 - applymovement 6, Common_Movement_WalkInPlaceRight + applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 applymovement 7, MauvilleCity_Movement_1DF6F7 @@ -164,7 +164,7 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593 call_if_eq MauvilleCity_EventScript_1DF5F3 compare VAR_FACING, DIR_EAST call_if_eq MauvilleCity_EventScript_1DF601 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT closemessage @@ -205,13 +205,13 @@ MauvilleCity_EventScript_1DF628:: @ 81DF628 MauvilleCity_EventScript_1DF63A:: @ 81DF63A msgbox MauvilleCity_Text_1DFB6D, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_1DFB96 - applymovement 6, Common_Movement_WalkInPlaceRight + applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox MauvilleCity_Text_1DFBC3, MSGBOX_DEFAULT applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox MauvilleCity_Text_1DFBED, MSGBOX_DEFAULT - applymovement 6, Common_Movement_WalkInPlaceRight + applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox MauvilleCity_Text_1DFC8A, MSGBOX_DEFAULT return diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index 8211034a6..dc81427bc 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -19,12 +19,12 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceDown waitmovement 0 delay 30 - applymovement 5, MeteorFalls_1F_1R_Movement_2725B4 + applymovement 5, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22BF47, MSGBOX_DEFAULT closemessage - applymovement 5, Common_Movement_WalkInPlaceUp - applymovement 6, Common_Movement_WalkInPlaceUp + applymovement 5, Common_Movement_WalkInPlaceFastestUp + applymovement 6, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN applymovement 5, Common_Movement_ExclamationMark @@ -37,9 +37,9 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22BFE4, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft - applymovement 5, Common_Movement_WalkInPlaceLeft - applymovement 6, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement 5, Common_Movement_WalkInPlaceFastestLeft + applymovement 6, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 addobject 7 addobject 8 @@ -49,8 +49,8 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F applymovement 8, MeteorFalls_1F_1R_Movement_22BEE0 applymovement 9, MeteorFalls_1F_1R_Movement_22BEE8 waitmovement 0 - applymovement 5, Common_Movement_WalkInPlaceLeft - applymovement 6, Common_Movement_WalkInPlaceLeft + applymovement 5, Common_Movement_WalkInPlaceFastestLeft + applymovement 6, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C04E, MSGBOX_DEFAULT closemessage @@ -68,10 +68,10 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F applymovement 9, MeteorFalls_1F_1R_Movement_22BF18 waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C268, MSGBOX_DEFAULT - applymovement 7, Common_Movement_WalkInPlaceDown + applymovement 7, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C292, MSGBOX_DEFAULT - applymovement 7, Common_Movement_WalkInPlaceLeft + applymovement 7, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C2FC, MSGBOX_DEFAULT closemessage diff --git a/data/maps/MirageTower_2F/scripts.inc b/data/maps/MirageTower_2F/scripts.inc index d22a7c6ff..6fa89f400 100644 --- a/data/maps/MirageTower_2F/scripts.inc +++ b/data/maps/MirageTower_2F/scripts.inc @@ -1,10 +1,10 @@ MirageTower_2F_MapScripts:: @ 823AD11 - map_script MAP_SCRIPT_ON_FRAME_TABLE, MirageTower_2F_MapScript2_2A8327 - map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_2F_MapScript1_2A8331 - map_script MAP_SCRIPT_ON_RESUME, MirageTower_2F_MapScript1_23AD21 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_MapScript2_CheckFallDownHole + map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_MapScript1_FixCrackedGround + map_script MAP_SCRIPT_ON_RESUME, MirageTower_2F_MapScript1_SetHoleWarp .byte 0 -MirageTower_2F_MapScript1_23AD21: @ 823AD21 +MirageTower_2F_MapScript1_SetHoleWarp: @ 823AD21 setstepcallback 7 setholewarp MAP_MIRAGE_TOWER_1F, 255, 0, 0 end diff --git a/data/maps/MirageTower_3F/scripts.inc b/data/maps/MirageTower_3F/scripts.inc index f29f542fc..05cac7c03 100644 --- a/data/maps/MirageTower_3F/scripts.inc +++ b/data/maps/MirageTower_3F/scripts.inc @@ -1,10 +1,10 @@ MirageTower_3F_MapScripts:: @ 823AD2C - map_script MAP_SCRIPT_ON_FRAME_TABLE, MirageTower_3F_MapScript2_2A8327 - map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_3F_MapScript1_2A8331 - map_script MAP_SCRIPT_ON_RESUME, MirageTower_3F_MapScript1_23AD3C + map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_MapScript2_CheckFallDownHole + map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_MapScript1_FixCrackedGround + map_script MAP_SCRIPT_ON_RESUME, MirageTower_3F_MapScript1_SetHoleWarp .byte 0 -MirageTower_3F_MapScript1_23AD3C: @ 823AD3C +MirageTower_3F_MapScript1_SetHoleWarp: @ 823AD3C setstepcallback 7 setholewarp MAP_MIRAGE_TOWER_2F, 255, 0, 0 end diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index db24a9b3b..580b4ca62 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -222,7 +222,7 @@ "movement_range_y": 3, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_EventScript_2C81EE", + "script": "MossdeepCity_EventScript_DynamicPunchTutor", "flag": "0" }, { diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 0f9af5b04..1058761c5 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -82,7 +82,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 compare VAR_RESULT, 1 call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22305A closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight waitmovement 0 release end @@ -106,7 +106,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063 MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A msgbox MossdeepCity_SpaceCenter_1F_Text_2234B7, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight waitmovement 0 release end @@ -139,14 +139,14 @@ MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight waitmovement 0 release end MossdeepCity_SpaceCenter_1F_EventScript_223119:: @ 8223119 msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight waitmovement 0 release end diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 58b7e3f73..32c34ed23 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -57,13 +57,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 trainerbattle_no_intro TRAINER_GRUNT_34, MossdeepCity_SpaceCenter_2F_Text_224461 applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_35, MossdeepCity_SpaceCenter_2F_Text_224499 applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1 @@ -238,13 +238,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C msgbox MossdeepCity_SpaceCenter_2F_Text_224854, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 releaseall end MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 special SavePlayerParty fadescreen 1 @@ -270,19 +270,19 @@ MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032 switch VAR_RESULT case 1, MossdeepCity_SpaceCenter_2F_EventScript_224071 fadescreen 1 - special sp0C8_whiteout_maybe + special SetCB2WhiteOut waitstate MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, MSGBOX_DEFAULT closemessage delay 20 - applymovement 9, Common_Movement_WalkInPlaceLeft - applymovement 8, Common_Movement_WalkInPlaceDown + applymovement 9, Common_Movement_WalkInPlaceFastestLeft + applymovement 8, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 60 - applymovement 9, Common_Movement_WalkInPlaceUp - applymovement 8, Common_Movement_WalkInPlaceRight + applymovement 9, Common_Movement_WalkInPlaceFastestUp + applymovement 8, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 20 msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, MSGBOX_DEFAULT diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 677f1d382..33b30e1d0 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -28,7 +28,7 @@ MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0 MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA lockall - applymovement 1, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 playse SE_PIN applymovement 1, Common_Movement_ExclamationMark diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 9f11cedc0..c4a013108 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -60,7 +60,7 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B call_if_eq MtChimney_EventScript_22EEC7 compare VAR_FACING, DIR_NORTH call_if_eq MtChimney_EventScript_22EED2 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT closemessage diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index 150c08df4..2c8a93155 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -1,10 +1,10 @@ MtPyre_2F_MapScripts:: @ 82310FB - map_script MAP_SCRIPT_ON_FRAME_TABLE, MtPyre_2F_MapScript2_2A8327 - map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_2F_MapScript1_2A8331 - map_script MAP_SCRIPT_ON_RESUME, MtPyre_2F_MapScript1_23110B + map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_MapScript2_CheckFallDownHole + map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_MapScript1_FixCrackedGround + map_script MAP_SCRIPT_ON_RESUME, MtPyre_2F_MapScript1_SetHoleWarp .byte 0 -MtPyre_2F_MapScript1_23110B: @ 823110B +MtPyre_2F_MapScript1_SetHoleWarp: @ 823110B setstepcallback 7 setholewarp MAP_MT_PYRE_1F, 255, 0, 0 end diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index eb61c4c2d..4049a1f29 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -34,7 +34,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C playbgm MUS_AQA_0, 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 - applymovement 2, Common_Movement_WalkInPlaceDown + applymovement 2, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 50 compare VAR_0x8008, 0 @@ -86,7 +86,7 @@ MtPyre_Summit_EventScript_2320EC:: @ 82320EC MtPyre_Summit_EventScript_2320F7:: @ 82320F7 applymovement 3, MtPyre_Summit_Movement_23212C waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -98,7 +98,7 @@ MtPyre_Summit_EventScript_23210C:: @ 823210C MtPyre_Summit_EventScript_232117:: @ 8232117 applymovement 3, MtPyre_Summit_Movement_232132 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -207,7 +207,7 @@ MtPyre_Summit_EventScript_232204:: @ 8232204 end MtPyre_Summit_EventScript_232210:: @ 8232210 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 60 compare VAR_0x8008, 0 @@ -292,7 +292,7 @@ MtPyre_Summit_EventScript_23235A:: @ 823235A applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323ED waitmovement 0 - applymovement 2, Common_Movement_WalkInPlaceRight + applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -300,7 +300,7 @@ MtPyre_Summit_EventScript_232376:: @ 8232376 applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323F3 waitmovement 0 - applymovement 2, Common_Movement_WalkInPlaceRight + applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -308,7 +308,7 @@ MtPyre_Summit_EventScript_232392:: @ 8232392 applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323F8 waitmovement 0 - applymovement 2, Common_Movement_WalkInPlaceRight + applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc index 873b4fd3b..6538b2b8e 100644 --- a/data/maps/NavelRock_Harbor/scripts.inc +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -9,7 +9,7 @@ NavelRock_Harbor_EventScript_2690BD:: @ 82690BD goto_if_eq NavelRock_Harbor_EventScript_269102 msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 hideobjectat 1, MAP_NAVEL_ROCK_HARBOR diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index 1fadc7b7d..9b31454fd 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -23,7 +23,7 @@ NewMauville_Entrance_OnTransition: @ 82372FB NewMauville_Entrance_EventScript_2372FF:: @ 82372FF lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox NewMauville_Entrance_Text_237382, MSGBOX_DEFAULT checkitem ITEM_BASEMENT_KEY, 1 diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 7b124bc68..8e3950cae 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -227,7 +227,7 @@ OldaleTown_EventScript_1E9086:: @ 81E9086 lockall applymovement 4, OldaleTown_Movement_1E9170 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_1E90E6 @@ -237,7 +237,7 @@ OldaleTown_EventScript_1E90A6:: @ 81E90A6 lockall applymovement 4, OldaleTown_Movement_1E9173 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_1E90E6 @@ -247,7 +247,7 @@ OldaleTown_EventScript_1E90C6:: @ 81E90C6 lockall applymovement 4, OldaleTown_Movement_1E9175 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_1E90E6 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json index 690243277..83fdd1f79 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE", + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_ExplosionTutor", "flag": "0" } ], diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index e95fc9d92..c20b3fa30 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -44,7 +44,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E special StartWallyTutorialBattle waitstate msgbox PetalburgCity_Text_1EC271, MSGBOX_DEFAULT - applymovement 2, Common_Movement_WalkInPlaceLeft, MAP_PETALBURG_CITY + applymovement 2, Common_Movement_WalkInPlaceFastestLeft, MAP_PETALBURG_CITY waitmovement 2, MAP_PETALBURG_CITY msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT closemessage @@ -290,8 +290,8 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA compare VAR_0x8008, 3 call_if_eq PetalburgCity_EventScript_1DC5FF msgbox PetalburgCity_Text_1DC91B, MSGBOX_DEFAULT - applymovement 8, Common_Movement_WalkInPlaceRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement 8, Common_Movement_WalkInPlaceFastestRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox PetalburgCity_Text_1DC93E, MSGBOX_DEFAULT closemessage @@ -304,7 +304,7 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA PetalburgCity_EventScript_1DC57F:: @ 81DC57F applymovement 8, PetalburgCity_Movement_1DC615 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -316,14 +316,14 @@ PetalburgCity_EventScript_1DC594:: @ 81DC594 PetalburgCity_EventScript_1DC59F:: @ 81DC59F applymovement 8, PetalburgCity_Movement_1DC61D waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return PetalburgCity_EventScript_1DC5B4:: @ 81DC5B4 applymovement 8, PetalburgCity_Movement_1DC622 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -549,17 +549,17 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 waitmovement 0 applymovement 9, PetalburgCity_Movement_1DC7DB waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 setvar VAR_SCOTT_STATE, 1 msgbox PetalburgCity_Text_1DCB31, MSGBOX_DEFAULT closemessage - applymovement 9, Common_Movement_WalkInPlaceRight + applymovement 9, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 msgbox PetalburgCity_Text_1DCB82, MSGBOX_DEFAULT closemessage - applymovement 9, Common_Movement_WalkInPlaceLeft + applymovement 9, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 30 msgbox PetalburgCity_Text_1DCC09, MSGBOX_DEFAULT diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index f48f5a538..4da701395 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -90,14 +90,14 @@ PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 msgbox PetalburgCity_Gym_Text_205B32, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_205B4C, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement 10, PetalburgCity_Gym_Movement_2049EC waitmovement 0 playse SE_KAIDAN removeobject 10 setflag FLAG_HIDE_PETALBURG_CITY_WALLY delay 30 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox PetalburgCity_Gym_Text_205C40, MSGBOX_DEFAULT setvar VAR_PETALBURG_GYM_STATE, 2 @@ -228,7 +228,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC end PetalburgCity_Gym_EventScript_204C31:: @ 8204C31 - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown applymovement 10, PetalburgCity_Gym_Movement_2050EB waitmovement 0 return @@ -236,20 +236,20 @@ PetalburgCity_Gym_EventScript_204C31:: @ 8204C31 PetalburgCity_Gym_EventScript_204C43:: @ 8204C43 applymovement 10, PetalburgCity_Gym_Movement_2050E1 waitmovement 0 - applymovement 1, Common_Movement_WalkInPlaceRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return PetalburgCity_Gym_EventScript_204C5F:: @ 8204C5F - applymovement 1, Common_Movement_WalkInPlaceDown - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement 10, PetalburgCity_Gym_Movement_2050EB waitmovement 0 return PetalburgCity_Gym_EventScript_204C78:: @ 8204C78 - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown applymovement 10, PetalburgCity_Gym_Movement_205102 applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_205111 waitmovement 0 @@ -274,45 +274,45 @@ PetalburgCity_Gym_EventScript_204CB5:: @ 8204CB5 return PetalburgCity_Gym_EventScript_204CC7:: @ 8204CC7 - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return PetalburgCity_Gym_EventScript_204CD2:: @ 8204CD2 - applymovement 1, Common_Movement_WalkInPlaceDown - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return PetalburgCity_Gym_EventScript_204CE4:: @ 8204CE4 - applymovement 1, Common_Movement_WalkInPlaceRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceFastestRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return PetalburgCity_Gym_EventScript_204CF6:: @ 8204CF6 - applymovement 1, Common_Movement_WalkInPlaceLeft - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceFastestLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return PetalburgCity_Gym_EventScript_204D08:: @ 8204D08 - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return PetalburgCity_Gym_EventScript_204D13:: @ 8204D13 - applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return PetalburgCity_Gym_EventScript_204D1E:: @ 8204D1E - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return PetalburgCity_Gym_EventScript_204D29:: @ 8204D29 - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -322,7 +322,7 @@ PetalburgCity_Gym_EventScript_204D34:: @ 8204D34 return PetalburgCity_Gym_EventScript_204D3F:: @ 8204D3F - applymovement 10, Common_Movement_WalkInPlaceDown + applymovement 10, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -350,7 +350,7 @@ PetalburgCity_Gym_EventScript_204D72:: @ 8204D72 return PetalburgCity_Gym_EventScript_204D73:: @ 8204D73 - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -504,47 +504,47 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 end PetalburgCity_Gym_EventScript_204FCC:: @ 8204FCC - applymovement 11, Common_Movement_WalkInPlaceUp + applymovement 11, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return PetalburgCity_Gym_EventScript_204FD7:: @ 8204FD7 - applymovement 11, Common_Movement_WalkInPlaceRight + applymovement 11, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return PetalburgCity_Gym_EventScript_204FE2:: @ 8204FE2 - applymovement 11, Common_Movement_WalkInPlaceLeft + applymovement 11, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return PetalburgCity_Gym_EventScript_204FED:: @ 8204FED applymovement 11, PetalburgCity_Gym_Movement_2050C3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft - applymovement 1, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return PetalburgCity_Gym_EventScript_205009:: @ 8205009 applymovement 11, PetalburgCity_Gym_Movement_2050CA waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return PetalburgCity_Gym_EventScript_205025:: @ 8205025 applymovement 11, PetalburgCity_Gym_Movement_2050D0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return PetalburgCity_Gym_EventScript_205041:: @ 8205041 applymovement 11, PetalburgCity_Gym_Movement_20507E - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2050A1 waitmovement 0 return diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index da07716db..5a194c721 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -15,7 +15,7 @@ PetalburgWoods_EventScript_22DFD7:: @ 822DFD7 closemessage applymovement 3, PetalburgWoods_Movement_22E1F6 waitmovement 0 - applymovement 4, Common_Movement_WalkInPlaceUp + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT closemessage @@ -41,7 +41,7 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 call PetalburgWoods_EventScript_22E124 applymovement 4, PetalburgWoods_Movement_22E1D0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox PetalburgWoods_Text_22E34F, MSGBOX_DEFAULT closemessage @@ -52,14 +52,14 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 closemessage applymovement 3, PetalburgWoods_Movement_22E205 waitmovement 0 - applymovement 4, Common_Movement_WalkInPlaceUp + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT closemessage applymovement 4, PetalburgWoods_Movement_22E1EA waitmovement 0 msgbox PetalburgWoods_Text_22E457, MSGBOX_DEFAULT - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_22E542 @@ -85,7 +85,7 @@ PetalburgWoods_EventScript_22E138:: @ 822E138 applymovement 3, PetalburgWoods_Movement_22E1FD waitmovement 0 removeobject 3 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox PetalburgWoods_Text_22E63D, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 73bfe570c..4b8556286 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -30,7 +30,7 @@ Route101_EventScript_1EBCDE:: @ 81EBCDE applymovement 4, Route101_Movement_1EBD96 applymovement 2, Route101_Movement_1EBDC8 waitmovement 0 - applymovement 2, Common_Movement_WalkInPlaceRight + applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, Route101_Movement_1EBDBD applymovement 2, Route101_Movement_1EBDEF @@ -223,7 +223,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16 fadescreen 1 removeobject 4 setobjectxy EVENT_OBJ_ID_PLAYER, 6, 13 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 special ChooseStarter waitstate diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 0eaf5d487..c943066f9 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -51,7 +51,7 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 setflag FLAG_HIDE_RUSBORO_CITY_RIVAL setvar VAR_RUSTBORO_CITY_STATE, 8 setvar VAR_ROUTE104_STATE, 2 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 10 addobject 34 diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 140687c2e..cafd99a9c 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -307,7 +307,7 @@ Route110_EventScript_1EF64A:: @ 81EF64A Route110_EventScript_1EF661:: @ 81EF661 lockall - applymovement 21, Common_Movement_WalkInPlaceRight + applymovement 21, Common_Movement_WalkInPlaceFastestRight waitmovement 0 call Route110_EventScript_1EF673 releaseall @@ -383,7 +383,7 @@ Route110_EventScript_1EF76E:: @ 81EF76E call_if_eq Route110_EventScript_1EF7E1 compare VAR_RESULT, FEMALE call_if_eq Route110_EventScript_1EF7E6 - applymovement 28, Common_Movement_WalkInPlaceDown + applymovement 28, Common_Movement_WalkInPlaceFastestDown waitmovement 0 applymovement 28, Common_Movement_ExclamationMark waitmovement 0 @@ -631,13 +631,13 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 msgbox Route110_Text_1F0AB5, MSGBOX_DEFAULT closemessage delay 20 - applymovement 36, Common_Movement_WalkInPlaceLeft + applymovement 36, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 10 - applymovement 36, Common_Movement_WalkInPlaceRight + applymovement 36, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 20 - applymovement 36, Common_Movement_WalkInPlaceDown + applymovement 36, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 msgbox Route110_Text_1F0AFF, MSGBOX_DEFAULT diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index a8f4e96e5..46c4c316e 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -212,22 +212,22 @@ Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002 return Route110_TrickHouseEnd_EventScript_26B015:: @ 826B015 - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return Route110_TrickHouseEnd_EventScript_26B020:: @ 826B020 - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return Route110_TrickHouseEnd_EventScript_26B02B:: @ 826B02B - applymovement 1, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return Route110_TrickHouseEnd_EventScript_26B036:: @ 826B036 - applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -241,7 +241,7 @@ Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041 applymovement 1, Route110_TrickHouseEnd_Movement_26B08B waitmovement 0 playse SE_W153 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Route110_TrickHouseEnd_Text_26B8BD, MSGBOX_DEFAULT closemessage diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 0e729d333..173151c37 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -334,7 +334,7 @@ Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51 applymovement 1, Common_Movement_Delay48 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26A9AF, MSGBOX_DEFAULT - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end @@ -432,7 +432,7 @@ Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end @@ -506,7 +506,7 @@ Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126 setmetatile 5, 1, METATILE_GenericBuilding_TrickHouse_Stairs_Down, 0 special DrawWholeMapView delay 20 - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_2725C9 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_26A1A7 waitmovement 0 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 88b2f1add..fceacdfcc 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -285,7 +285,7 @@ Route111_EventScript_1F0FC5:: @ 81F0FC5 Route111_EventScript_1F0FE7:: @ 81F0FE7 msgbox Route111_Text_1F1523, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_1F1542 - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 call Route111_EventScript_1F113C msgbox Route111_Text_1F156F, MSGBOX_DEFAULT @@ -303,7 +303,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 call Route111_EventScript_1F1143 msgbox Route111_Text_1F159D, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_1F1616 - applymovement 2, Common_Movement_WalkInPlaceUp + applymovement 2, Common_Movement_WalkInPlaceFastestUp waitmovement 0 call Route111_EventScript_1F113C msgbox Route111_Text_1F1645, MSGBOX_DEFAULT @@ -321,7 +321,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 call Route111_EventScript_1F1143 msgbox Route111_Text_1F167E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VIVI, Route111_Text_1F16C6 - applymovement 3, Common_Movement_WalkInPlaceUp + applymovement 3, Common_Movement_WalkInPlaceFastestUp waitmovement 0 call Route111_EventScript_1F113C msgbox Route111_Text_1F16DC, MSGBOX_DEFAULT @@ -341,7 +341,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 trainerbattle_no_intro TRAINER_VICKY, Route111_Text_1F1756 msgbox Route111_Text_1F1788, MSGBOX_DEFAULT closemessage - applymovement 4, Common_Movement_WalkInPlaceUp + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 call Route111_EventScript_1F113C applymovement 4, Route111_Movement_1F114A diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 58109bd40..0659095f6 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -10,7 +10,7 @@ Route112_OnTransition: @ 81F1DAE Route112_EventScript_1F1DB7:: @ 81F1DB7 lockall delay 40 - applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 20 msgbox Route112_Text_1F1F3F, MSGBOX_DEFAULT @@ -18,7 +18,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 6, Common_Movement_WalkInPlaceLeft + applymovement 6, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 20 msgbox Route112_Text_1F1F7A, MSGBOX_DEFAULT @@ -26,7 +26,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 20 msgbox Route112_Text_1F1FBA, MSGBOX_DEFAULT @@ -34,7 +34,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 6, Common_Movement_WalkInPlaceLeft + applymovement 6, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 20 msgbox Route112_Text_1F2003, MSGBOX_DEFAULT diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 3de7350ac..8c5ec779d 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -23,8 +23,8 @@ Route114_FossilManiacsTunnel_EventScript_22AF53:: @ 822AF53 Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 lockall - applymovement 1, Common_Movement_WalkInPlaceUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT setvar VAR_FOSSIL_MANIAC_STATE, 2 diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 4c565cb08..a314a454d 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -151,8 +151,8 @@ Route116_EventScript_1F2D84:: @ 81F2D84 Route116_EventScript_1F2D95:: @ 81F2D95 lockall - applymovement 11, Common_Movement_WalkInPlaceRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement 11, Common_Movement_WalkInPlaceFastestRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox Route116_Text_1F309D, MSGBOX_DEFAULT setvar VAR_ROUTE116_STATE, 2 diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index c84ff9db1..badd5d14e 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -477,7 +477,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_EventScript_27231C", + "script": "Route119_EventScript_Kecleon1", "flag": "FLAG_HIDE_ROUTE_119_KECLEON_1" }, { @@ -490,7 +490,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_EventScript_272329", + "script": "Route119_EventScript_Kecleon2", "flag": "FLAG_HIDE_ROUTE_119_KECLEON_2" }, { diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 1dff6a6e2..ef2d0e0e2 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -51,7 +51,7 @@ Route119_EventScript_1F4488:: @ 81F4488 call_if_eq Route119_EventScript_1F46C6 compare VAR_TEMP_1, 2 call_if_eq Route119_EventScript_1F46D1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 compare VAR_TEMP_1, 1 diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index fccf5c88e..47f472a3d 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -412,8 +412,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_1F57BC", - "flag": "FLAG_HIDE_ROUTE_120_KECLEON_1" + "script": "Route120_EventScript_InvisibleBridgeKecleon", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_INVISIBLE" }, { "graphics_id": "EVENT_OBJ_GFX_STEVEN", @@ -425,7 +425,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_1F5641", + "script": "Route120_EventScript_Steven", "flag": "FLAG_HIDE_ROUTE_120_STEVEN" }, { @@ -491,7 +491,7 @@ "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", - "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE" + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_VISIBLE" }, { "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", @@ -503,8 +503,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_2722DB", - "flag": "FLAG_HIDE_ROUTE_120_KECLEON_2" + "script": "Route120_EventScript_Kecleon1", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_1" }, { "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", @@ -516,8 +516,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_2722E8", - "flag": "FLAG_HIDE_ROUTE_120_KECLEON_3" + "script": "Route120_EventScript_Kecleon2", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_2" }, { "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", @@ -529,8 +529,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_2722F5", - "flag": "FLAG_HIDE_ROUTE_120_KECLEON_4" + "script": "Route120_EventScript_Kecleon3", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_3" }, { "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", @@ -542,8 +542,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_27230F", - "flag": "FLAG_HIDE_ROUTE_120_KECLEON_6" + "script": "Route120_EventScript_Kecleon5", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_5" }, { "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", @@ -555,8 +555,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_272302", - "flag": "FLAG_HIDE_ROUTE_120_KECLEON_5" + "script": "Route120_EventScript_Kecleon4", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_4" }, { "graphics_id": "EVENT_OBJ_GFX_GIRL_3", diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index fa74c60cf..2578c5527 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -1,39 +1,39 @@ Route120_MapScripts:: @ 81F53EC - map_script MAP_SCRIPT_ON_RESUME, Route120_MapScript1_1F53FC + map_script MAP_SCRIPT_ON_RESUME, Route120_MapScript1_OnResume map_script MAP_SCRIPT_ON_TRANSITION, Route120_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route120_MapScript1_1F5474 .byte 0 -Route120_MapScript1_1F53FC: @ 81F53FC - call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route120_EventScript_1F5406 +Route120_MapScript1_OnResume: @ 81F53FC + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route120_EventScript_RemoveKecleonObject end -Route120_EventScript_1F5406:: @ 81F5406 +Route120_EventScript_RemoveKecleonObject:: @ 81F5406 compare VAR_0x8009, 0 - call_if_eq Route120_EventScript_1F5449 + call_if_eq Route120_EventScript_RemoveBridgeKecleon compare VAR_0x8009, 1 - call_if_eq Route120_EventScript_1F5460 + call_if_eq Route120_EventScript_RemoveKecleon compare VAR_0x8009, 2 - call_if_eq Route120_EventScript_1F5460 + call_if_eq Route120_EventScript_RemoveKecleon compare VAR_0x8009, 3 - call_if_eq Route120_EventScript_1F5460 + call_if_eq Route120_EventScript_RemoveKecleon compare VAR_0x8009, 4 - call_if_eq Route120_EventScript_1F5460 + call_if_eq Route120_EventScript_RemoveKecleon compare VAR_0x8009, 5 - call_if_eq Route120_EventScript_1F5460 + call_if_eq Route120_EventScript_RemoveKecleon return -Route120_EventScript_1F5449:: @ 81F5449 +Route120_EventScript_RemoveBridgeKecleon:: @ 81F5449 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn - removeobject 30 - removeobject 36 + removeobject 30 @ Invisible Bridge Kecleon + removeobject 36 @ Visible Bridge Kecleon return -Route120_EventScript_1F5460:: @ 81F5460 +Route120_EventScript_RemoveKecleon:: @ 81F5460 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return @@ -166,44 +166,44 @@ Route120_EventScript_1F5638:: @ 81F5638 msgbox Route120_Text_2A7183, MSGBOX_DEFAULT return -Route120_EventScript_1F5641:: @ 81F5641 +Route120_EventScript_Steven:: @ 81F5641 lock faceplayer goto_if_set FLAG_NOT_READY_FOR_BATTLE_ROUTE_120, Route120_EventScript_1F5672 - msgbox Route120_Text_1F5998, MSGBOX_YESNO + msgbox Route120_Text_StevenGreeting, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq Route120_EventScript_1F5665 - goto Route120_EventScript_1F568B + goto_if_eq Route120_EventScript_StevenNotReady + goto Route120_EventScript_StevenBattleKecleon end -Route120_EventScript_1F5665:: @ 81F5665 +Route120_EventScript_StevenNotReady:: @ 81F5665 msgbox Route120_Text_1F5AAC, MSGBOX_DEFAULT setflag FLAG_NOT_READY_FOR_BATTLE_ROUTE_120 release end Route120_EventScript_1F5672:: @ 81F5672 - msgbox Route120_Text_1F5ADE, MSGBOX_YESNO + msgbox Route120_Text_StevenReadyForBattle, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq Route120_EventScript_1F5665 - goto Route120_EventScript_1F568B + goto_if_eq Route120_EventScript_StevenNotReady + goto Route120_EventScript_StevenBattleKecleon end -Route120_EventScript_1F568B:: @ 81F568B - msgbox Route120_Text_1F5B0F, MSGBOX_DEFAULT +Route120_EventScript_StevenBattleKecleon:: @ 81F568B + msgbox Route120_Text_StevenShowMeYourPower, MSGBOX_DEFAULT closemessage compare VAR_FACING, DIR_NORTH - call_if_eq Route120_EventScript_1F57A3 + call_if_eq Route120_EventScript_PlayerApproachKecleonNorth compare VAR_FACING, DIR_WEST - call_if_eq Route120_EventScript_1F57AE - applymovement 31, Common_Movement_WalkInPlaceLeft + call_if_eq Route120_EventScript_PlayerApproachKecleonWest + applymovement 31, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 20 - msgbox Route120_Text_1F5B43, MSGBOX_DEFAULT + msgbox Route120_Text_StevenUsedDevonScope, MSGBOX_DEFAULT closemessage - applymovement 30, Common_Movement_WalkInPlaceRight + applymovement 30, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement 30, Route120_Movement_2723C7 + applymovement 30, Movement_KecleonAppears waitmovement 0 waitse playmoncry SPECIES_KECLEON, 2 @@ -215,33 +215,33 @@ Route120_EventScript_1F568B:: @ 81F568B dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 - goto_if_eq Route120_EventScript_1F571C - compare VAR_RESULT, 4 - goto_if_eq Route120_EventScript_1F571C - compare VAR_RESULT, 5 - goto_if_eq Route120_EventScript_1F571C - goto Route120_EventScript_1F572C + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq Route120_EventScript_RemoveBridgeKecleonPostBattle + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq Route120_EventScript_RemoveBridgeKecleonPostBattle + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq Route120_EventScript_RemoveBridgeKecleonPostBattle + goto Route120_EventScript_StevenGiveDeconScope end -Route120_EventScript_1F571C:: @ 81F571C +Route120_EventScript_RemoveBridgeKecleonPostBattle:: @ 81F571C fadescreenswapbuffers 1 - removeobject 30 - removeobject 36 + removeobject 30 @ Invisible Bridge Kecleon + removeobject 36 @ Visible Bridge Kecleon fadescreenswapbuffers 0 - goto Route120_EventScript_1F572C + goto Route120_EventScript_StevenGiveDeconScope end -Route120_EventScript_1F572C:: @ 81F572C - applymovement 31, Common_Movement_WalkInPlaceDown - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp +Route120_EventScript_StevenGiveDeconScope:: @ 81F572C + applymovement 31, Common_Movement_WalkInPlaceFastestDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox Route120_Text_1F5BAF, MSGBOX_DEFAULT + msgbox Route120_Text_StevenGiveDevonScope, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_SCOPE setflag FLAG_RECEIVED_DEVON_SCOPE - msgbox Route120_Text_1F5C7B, MSGBOX_DEFAULT + msgbox Route120_Text_StevenGoodbye, MSGBOX_DEFAULT closemessage - applymovement 31, Common_Movement_WalkInPlaceDown + applymovement 31, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 @@ -257,23 +257,23 @@ Route120_EventScript_1F572C:: @ 81F572C release end -Route120_EventScript_1F57A3:: @ 81F57A3 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft +Route120_EventScript_PlayerApproachKecleonNorth:: @ 81F57A3 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -Route120_EventScript_1F57AE:: @ 81F57AE - applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_1F57B9 +Route120_EventScript_PlayerApproachKecleonWest:: @ 81F57AE + applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_ApproachKecleonWest waitmovement 0 return -Route120_Movement_1F57B9: @ 81F57B9 +Route120_Movement_ApproachKecleonWest: @ 81F57B9 walk_down walk_left step_end -Route120_EventScript_1F57BC:: @ 81F57BC - msgbox Route120_Text_1F5D00, MSGBOX_NPC +Route120_EventScript_InvisibleBridgeKecleon:: @ 81F57BC + msgbox Kecleon_Text_SomethingUnseeable, MSGBOX_NPC end Route120_EventScript_1F57C5:: @ 81F57C5 @@ -383,7 +383,7 @@ Route120_EventScript_1F5981:: @ 81F5981 msgbox Route120_Text_29F002, MSGBOX_AUTOCLOSE end -Route120_Text_1F5998: @ 81F5998 +Route120_Text_StevenGreeting: @ 81F5998 .string "STEVEN: Hm? {PLAYER}{KUN}, hi.\n" .string "It's been a while.\p" .string "There's something here that you can't\n" @@ -400,21 +400,21 @@ Route120_Text_1F5AAC: @ 81F5AAC .string "STEVEN: No?\p" .string "I'll wait here, so you can get ready.$" -Route120_Text_1F5ADE: @ 81F5ADE +Route120_Text_StevenReadyForBattle: @ 81F5ADE .string "STEVEN: {PLAYER}{KUN}, are your POKéMON\n" .string "ready for battle?$" -Route120_Text_1F5B0F: @ 81F5B0F +Route120_Text_StevenShowMeYourPower: @ 81F5B0F .string "STEVEN: {PLAYER}{KUN}, show me your true\n" .string "power as a TRAINER!$" -Route120_Text_1F5B43: @ 81F5B43 +Route120_Text_StevenUsedDevonScope: @ 81F5B43 .string "STEVEN used the DEVON SCOPE.\p" .string "An invisible POKéMON became completely\n" .string "visible!\p" .string "The startled POKéMON attacked!$" -Route120_Text_1F5BAF: @ 81F5BAF +Route120_Text_StevenGiveDevonScope: @ 81F5BAF .string "STEVEN: I see…\n" .string "Your battle style is intriguing.\p" .string "Your POKéMON have obviously grown\n" @@ -424,22 +424,21 @@ Route120_Text_1F5BAF: @ 81F5BAF .string "Who knows, there may be other\n" .string "concealed POKéMON.$" -Route120_Text_1F5C7B: @ 81F5C7B +Route120_Text_StevenGoodbye: @ 81F5C7B .string "STEVEN: {PLAYER}{KUN}.\p" .string "I enjoy seeing POKéMON and TRAINERS\n" .string "who strive together.\p" .string "I think you're doing great.\p" .string "Well, let's meet again somewhere.$" -Route119_Text_1F5D00: @ 81F5D00 -Route120_Text_1F5D00: @ 81F5D00 +Kecleon_Text_SomethingUnseeable: @ 81F5D00 .string "Something unseeable is in the way.$" -Route119_Text_1F5D23: @ 81F5D23 +Kecleon_Text_WantToUseDevonScope: @ 81F5D23 .string "Something unseeable is in the way.\p" .string "Want to use the DEVON SCOPE?$" -Route119_Text_1F5D63: @ 81F5D63 +Kecleon_Text_UseDevonScopeMonAttacked: @ 81F5D63 .string "{PLAYER} used the DEVON SCOPE.\p" .string "An invisible POKéMON became completely\n" .string "visible!\p" diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index edca585c9..6aa82857f 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -16,7 +16,7 @@ Route121_EventScript_1F5E0F:: @ 81F5E0F Route121_EventScript_1F5E18:: @ 81F5E18 lockall playbgm MUS_AQA_0, 0 - applymovement 13, Route121_Movement_2725B8 + applymovement 13, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox Route121_Text_1F605A, MSGBOX_DEFAULT closemessage diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index d0c950cf5..88c4ac03d 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -46,7 +46,7 @@ Route121_SafariZoneEntrance_EventScript_22BC0E:: @ 822BC0E Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 showmoneybox 0, 0, 0 msgbox Route121_SafariZoneEntrance_Text_2A4F74, MSGBOX_YESNO diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index bad74f451..a19c0edf9 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -24,18 +24,18 @@ Route128_EventScript_1F6B57:: @ 81F6B57 closemessage applymovement 5, Route128_Movement_1F6CAD waitmovement 0 - applymovement 4, Common_Movement_WalkInPlaceUp + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox Route128_Text_1F6E5A, MSGBOX_DEFAULT closemessage applymovement 5, Route128_Movement_1F6CBB waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox Route128_Text_1F6F1E, MSGBOX_DEFAULT closemessage applymovement 4, Route128_Movement_1F6C96 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement 5, Route128_Movement_1F6CA8 waitmovement 0 msgbox Route128_Text_1F704F, MSGBOX_DEFAULT @@ -53,19 +53,19 @@ Route128_EventScript_1F6B57:: @ 81F6B57 addobject 3 applymovement 3, Route128_Movement_1F6C87 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox Route128_Text_1F70C9, MSGBOX_DEFAULT closemessage applymovement 3, Route128_Movement_1F6C85 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox Route128_Text_1F70EA, MSGBOX_DEFAULT - applymovement 3, Common_Movement_WalkInPlaceDown + applymovement 3, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Route128_Text_1F721B, MSGBOX_DEFAULT closemessage - applymovement 3, Common_Movement_WalkInPlaceDown + applymovement 3, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 666691135..28a5f8278 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -46,14 +46,14 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 waitmovement 0 applymovement 15, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 applymovement 15, RustboroCity_Movement_1E084E waitmovement 0 msgbox RustboroCity_Text_1E22A5, MSGBOX_DEFAULT closemessage setflag FLAG_HAS_MATCH_CALL - applymovement 15, Common_Movement_WalkInPlaceLeft + applymovement 15, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 playse SE_TK_KASYA delay 10 @@ -63,7 +63,7 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 delay 10 playse SE_TK_KASYA delay 20 - applymovement 15, Common_Movement_WalkInPlaceDown + applymovement 15, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox RustboroCity_Text_1E2331, MSGBOX_DEFAULT closemessage @@ -344,7 +344,7 @@ RustboroCity_EventScript_1E0A6E:: @ 81E0A6E RustboroCity_EventScript_1E0A79:: @ 81E0A79 applymovement 9, RustboroCity_Movement_1E0AD5 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -500,43 +500,43 @@ RustboroCity_EventScript_1E0B2E:: @ 81E0B2E end RustboroCity_EventScript_1E0B6F:: @ 81E0B6F - applymovement 9, Common_Movement_WalkInPlaceUp + applymovement 9, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN applymovement 9, Common_Movement_ExclamationMark waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return RustboroCity_EventScript_1E0B9B:: @ 81E0B9B - applymovement 9, Common_Movement_WalkInPlaceLeft + applymovement 9, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 playse SE_PIN applymovement 9, Common_Movement_ExclamationMark waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AC + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceRight waitmovement 0 return RustboroCity_EventScript_1E0BC7:: @ 81E0BC7 - applymovement 9, Common_Movement_WalkInPlaceDown + applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 9, Common_Movement_ExclamationMark waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return RustboroCity_EventScript_1E0BF3:: @ 81E0BF3 - applymovement 9, Common_Movement_WalkInPlaceDown + applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 9, Common_Movement_ExclamationMark @@ -545,7 +545,7 @@ RustboroCity_EventScript_1E0BF3:: @ 81E0BF3 waitmovement 0 applymovement 9, RustboroCity_Movement_1E0C29 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -608,43 +608,43 @@ RustboroCity_EventScript_1E0CD3:: @ 81E0CD3 return RustboroCity_EventScript_1E0CDC:: @ 81E0CDC - applymovement 9, Common_Movement_WalkInPlaceUp + applymovement 9, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN applymovement 9, Common_Movement_ExclamationMark waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return RustboroCity_EventScript_1E0D08:: @ 81E0D08 - applymovement 9, Common_Movement_WalkInPlaceRight + applymovement 9, Common_Movement_WalkInPlaceFastestRight waitmovement 0 playse SE_PIN applymovement 9, Common_Movement_ExclamationMark waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AE + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceLeft waitmovement 0 return RustboroCity_EventScript_1E0D34:: @ 81E0D34 - applymovement 9, Common_Movement_WalkInPlaceDown + applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 9, Common_Movement_ExclamationMark waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return RustboroCity_EventScript_1E0D60:: @ 81E0D60 - applymovement 9, Common_Movement_WalkInPlaceDown + applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 9, Common_Movement_ExclamationMark @@ -653,12 +653,12 @@ RustboroCity_EventScript_1E0D60:: @ 81E0D60 waitmovement 0 applymovement 9, RustboroCity_Movement_1E0C29 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return RustboroCity_EventScript_1E0D96:: @ 81E0D96 - applymovement 9, Common_Movement_WalkInPlaceLeft + applymovement 9, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 playse SE_PIN applymovement 9, Common_Movement_ExclamationMark @@ -694,7 +694,7 @@ RustboroCity_EventScript_1E0DEE:: @ 81E0DEE RustboroCity_EventScript_1E0DF3:: @ 81E0DF3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, Common_Movement_WalkInPlaceDown + applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 14, Common_Movement_ExclamationMark @@ -703,14 +703,14 @@ RustboroCity_EventScript_1E0DF3:: @ 81E0DF3 waitmovement 0 applymovement 14, RustboroCity_Movement_1E120E waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0E33:: @ 81E0E33 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, Common_Movement_WalkInPlaceDown + applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 14, Common_Movement_ExclamationMark @@ -719,14 +719,14 @@ RustboroCity_EventScript_1E0E33:: @ 81E0E33 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1215 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0E73:: @ 81E0E73 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, Common_Movement_WalkInPlaceDown + applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 14, Common_Movement_ExclamationMark @@ -735,14 +735,14 @@ RustboroCity_EventScript_1E0E73:: @ 81E0E73 waitmovement 0 applymovement 14, RustboroCity_Movement_1E121B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0EB3:: @ 81E0EB3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, Common_Movement_WalkInPlaceDown + applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 14, Common_Movement_ExclamationMark @@ -751,14 +751,14 @@ RustboroCity_EventScript_1E0EB3:: @ 81E0EB3 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1220 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0EF3:: @ 81E0EF3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, Common_Movement_WalkInPlaceDown + applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 14, Common_Movement_ExclamationMark @@ -767,14 +767,14 @@ RustboroCity_EventScript_1E0EF3:: @ 81E0EF3 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1224 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0F33:: @ 81E0F33 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, Common_Movement_WalkInPlaceDown + applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 14, Common_Movement_ExclamationMark @@ -783,14 +783,14 @@ RustboroCity_EventScript_1E0F33:: @ 81E0F33 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1227 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0F73:: @ 81E0F73 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, Common_Movement_WalkInPlaceDown + applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 14, Common_Movement_ExclamationMark @@ -799,14 +799,14 @@ RustboroCity_EventScript_1E0F73:: @ 81E0F73 waitmovement 0 applymovement 14, RustboroCity_Movement_1E122B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0FB3:: @ 81E0FB3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, Common_Movement_WalkInPlaceDown + applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 14, Common_Movement_ExclamationMark @@ -815,7 +815,7 @@ RustboroCity_EventScript_1E0FB3:: @ 81E0FB3 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1230 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index 17ffe0584..db4bf21f0 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -87,7 +87,7 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 setflag FLAG_RECEIVED_QUICK_CLAW release @@ -106,7 +106,7 @@ RustboroCity_PokemonSchool_EventScript_213FF0:: @ 8213FF0 RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB msgbox RustboroCity_PokemonSchool_Text_2144C8, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 release end diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 8cb20e372..9bdec7e8e 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -94,7 +94,7 @@ RusturfTunnel_EventScript_22CF6F:: @ 822CF6F applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045 applymovement 1, RusturfTunnel_Movement_22D06C waitmovement 0 - applymovement 10, Common_Movement_WalkInPlaceDown + applymovement 10, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -102,14 +102,14 @@ RusturfTunnel_EventScript_22CF8B:: @ 822CF8B applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045 applymovement 1, RusturfTunnel_Movement_22D06C waitmovement 0 - applymovement 10, Common_Movement_WalkInPlaceDown + applymovement 10, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return RusturfTunnel_EventScript_22CFA7:: @ 822CFA7 - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index ec231ccdd..f91cc6a3b 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -201,7 +201,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219 lockall applymovement 5, SSTidalCorridor_Movement_23C26D waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox SSTidalCorridor_Text_23C28F, MSGBOX_DEFAULT closemessage diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index 16ae074b1..e10b52d00 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -29,7 +29,7 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 copyobjectxytoperm 1 msgbox SeafloorCavern_Entrance_Text_234544, MSGBOX_DEFAULT closemessage - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end @@ -43,23 +43,23 @@ SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED call_if_eq SeafloorCavern_Entrance_EventScript_234539 msgbox SeafloorCavern_Entrance_Text_2346C8, MSGBOX_DEFAULT closemessage - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end SeafloorCavern_Entrance_EventScript_234523:: @ 8234523 - applymovement 1, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return SeafloorCavern_Entrance_EventScript_23452E:: @ 823452E - applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return SeafloorCavern_Entrance_EventScript_234539:: @ 8234539 - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 49981d335..026c29700 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_0x8005, 3 setvar VAR_0x8006, 4 setvar VAR_0x8007, 5 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_23505C waitmovement 0 @@ -15,12 +15,12 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 msgbox SeafloorCavern_Room9_Text_23505F, MSGBOX_DEFAULT closemessage addobject VAR_0x8004 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23502A waitmovement 0 msgbox SeafloorCavern_Room9_Text_23507C, MSGBOX_DEFAULT - applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox SeafloorCavern_Room9_Text_2350A6, MSGBOX_DEFAULT applymovement VAR_0x8004, Common_Movement_FacePlayer @@ -30,7 +30,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 msgbox SeafloorCavern_Room9_Text_2351E5, MSGBOX_DEFAULT setweather WEATHER_NONE doweather - special sub_80B05B4 + special Script_FadeOutMapMusic waitstate msgbox SeafloorCavern_Room9_Text_235279, MSGBOX_DEFAULT special WaitWeather @@ -47,8 +47,8 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 playfanfare MUS_ME_TAMA playse SE_TAMA special sub_80B0534 - applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 150 removeobject 7 @@ -82,7 +82,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_0x8007, 5 msgbox SeafloorCavern_Room9_Text_2352A7, MSGBOX_DEFAULT playse SE_PC_LOGIN - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox SeafloorCavern_Room9_Text_2352F6, MSGBOX_DEFAULT closemessage @@ -92,7 +92,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 closemessage playse SE_PC_OFF delay 20 - applymovement VAR_0x8004, Common_Movement_WalkInPlaceDown + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox SeafloorCavern_Room9_Text_23546F, MSGBOX_DEFAULT closemessage @@ -103,7 +103,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_235057 applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_23504E waitmovement 0 - applymovement VAR_0x8004, Common_Movement_WalkInPlaceLeft + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox SeafloorCavern_Room9_Text_2354F0, MSGBOX_DEFAULT playse SE_PIN diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc index dcbff3642..710dd9372 100644 --- a/data/maps/SkyPillar_2F/scripts.inc +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -1,20 +1,20 @@ SkyPillar_2F_MapScripts:: @ 823962B - map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_2F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_MapScript2_CheckFallDownHole map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_2F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, SkyPillar_2F_MapScript1_239650 + map_script MAP_SCRIPT_ON_RESUME, SkyPillar_2F_MapScript1_SetHoleWarp .byte 0 SkyPillar_2F_OnTransition: @ 823963B compare VAR_SKY_PILLAR_STATE, 2 call_if_lt SkyPillar_2F_EventScript_CleanFloor - copyvar VAR_ICE_STEP_COUNT, 0x1 + copyvar VAR_ICE_STEP_COUNT, 1 end SkyPillar_2F_EventScript_CleanFloor:: @ 823964C setmaplayoutindex LAYOUT_SKY_PILLAR_2F_CLEAN return -SkyPillar_2F_MapScript1_239650: @ 8239650 +SkyPillar_2F_MapScript1_SetHoleWarp: @ 8239650 setstepcallback 7 setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0 end diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc index 413f56521..5b13ab4f1 100644 --- a/data/maps/SkyPillar_4F/scripts.inc +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -1,20 +1,20 @@ SkyPillar_4F_MapScripts:: @ 8239671 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_4F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_MapScript2_CheckFallDownHole map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_4F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, SkyPillar_4F_MapScript1_239696 + map_script MAP_SCRIPT_ON_RESUME, SkyPillar_4F_MapScript1_SetHoleWarp .byte 0 SkyPillar_4F_OnTransition: @ 8239681 compare VAR_SKY_PILLAR_STATE, 2 call_if_lt SkyPillar_4F_EventScript_CleanFloor - copyvar VAR_ICE_STEP_COUNT, 0x1 + copyvar VAR_ICE_STEP_COUNT, 1 end SkyPillar_4F_EventScript_CleanFloor:: @ 8239692 setmaplayoutindex LAYOUT_SKY_PILLAR_4F_CLEAN return -SkyPillar_4F_MapScript1_239696: @ 8239696 +SkyPillar_4F_MapScript1_SetHoleWarp: @ 8239696 setstepcallback 7 setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0 end diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index 9262ca4c4..72748842b 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -36,7 +36,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 lockall applymovement 1, SkyPillar_Outside_Movement_2393D3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT closemessage @@ -60,13 +60,13 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 special ShakeCamera waitstate delay 20 - applymovement 1, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 10 - applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 20 - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index e4753b501..d7fab0171 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -61,11 +61,11 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C waitmovement 0 msgbox SlateportCity_Text_1DF032, MSGBOX_DEFAULT closemessage - applymovement 35, Common_Movement_WalkInPlaceLeft + applymovement 35, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 60 msgbox SlateportCity_Text_1DF0FE, MSGBOX_DEFAULT - applymovement 35, Common_Movement_WalkInPlaceRight + applymovement 35, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox SlateportCity_Text_1DF12B, MSGBOX_DEFAULT closemessage @@ -563,10 +563,10 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 msgbox SlateportCity_Text_1DE502, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE54A, MSGBOX_DEFAULT closemessage - applymovement 10, Common_Movement_WalkInPlaceRight + applymovement 10, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 10 - applymovement 9, Common_Movement_WalkInPlaceDown + applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 25 applymovement 11, SlateportCity_Movement_1DD33C @@ -577,18 +577,18 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 removeobject 10 removeobject 9 msgbox SlateportCity_Text_1DE5F7, MSGBOX_DEFAULT - applymovement 11, Common_Movement_WalkInPlaceUp + applymovement 11, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox SlateportCity_Text_1DE64F, MSGBOX_DEFAULT playbgm MUS_AQA_0, 0 msgbox SlateportCity_Text_1DE724, MSGBOX_DEFAULT - applymovement 6, Common_Movement_WalkInPlaceLeft - applymovement 1, Common_Movement_WalkInPlaceLeft + applymovement 6, Common_Movement_WalkInPlaceFastestLeft + applymovement 1, Common_Movement_WalkInPlaceFastestLeft applymovement 7, SlateportCity_Movement_1DD309 - applymovement 3, SlateportCity_Movement_272596 + applymovement 3, Common_Movement_QuestionMark applymovement 2, SlateportCity_Movement_1DD311 waitmovement 0 - applymovement 11, Common_Movement_WalkInPlaceDown + applymovement 11, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox SlateportCity_Text_1DE7F7, MSGBOX_DEFAULT playse SE_PIN @@ -596,7 +596,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 waitmovement 0 applymovement 11, Common_Movement_Delay48 waitmovement 0 - applymovement 11, Common_Movement_WalkInPlaceUp + applymovement 11, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox SlateportCity_Text_1DE860, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE8A0, MSGBOX_DEFAULT diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index 5ab5b78e9..fcbfa025c 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -44,7 +44,7 @@ SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65 SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 msgbox SlateportCity_BattleTentCorridor_Text_25AB96, MSGBOX_DEFAULT closemessage - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 opendoor 2, 1 waitdooranim diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 0994eceae..aa0eaab77 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -48,10 +48,10 @@ SlateportCity_Harbor_EventScript_20C9DF:: @ 820C9DF end SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 - applymovement 7, Common_Movement_WalkInPlaceDown + applymovement 7, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 6, Common_Movement_WalkInPlaceDown - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement 6, Common_Movement_WalkInPlaceFastestDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox SlateportCity_Harbor_Text_20D291, MSGBOX_DEFAULT closemessage @@ -85,21 +85,21 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 SlateportCity_Harbor_EventScript_20CA89:: @ 820CA89 applymovement 4, SlateportCity_Harbor_Movement_20CAE0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return SlateportCity_Harbor_EventScript_20CA9E:: @ 820CA9E applymovement 4, SlateportCity_Harbor_Movement_20CAE6 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3 applymovement 4, SlateportCity_Harbor_Movement_20CAEB waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -226,7 +226,7 @@ SlateportCity_Harbor_EventScript_20CBDD:: @ 820CBDD SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 msgbox SlateportCity_Harbor_Text_20CFCB, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index e596664db..f0a4305c1 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -7,14 +7,14 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AD96:: @ 820AD96 SlateportCity_OceanicMuseum_1F_EventScript_20AD9F:: @ 820AD9F lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 end SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0 lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 end diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index d2d4613db..ab47c1dea 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -43,8 +43,8 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 trainerbattle_no_intro TRAINER_GRUNT_15, SlateportCity_OceanicMuseum_2F_Text_20BF66 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCEF waitmovement 0 - applymovement 3, Common_Movement_WalkInPlaceDown - applymovement 4, Common_Movement_WalkInPlaceUp + applymovement 3, Common_Movement_WalkInPlaceFastestDown + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_20BF7A, MSGBOX_DEFAULT closemessage @@ -68,7 +68,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 fadescreen 0 delay 30 setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, MSGBOX_DEFAULT setvar VAR_0x8004, ITEM_DEVON_GOODS @@ -96,12 +96,12 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BC8C:: @ 820BC8C return SlateportCity_OceanicMuseum_2F_EventScript_20BC92:: @ 820BC92 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return SlateportCity_OceanicMuseum_2F_EventScript_20BC9D:: @ 820BC9D - applymovement 1, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json index 045a0c315..faf7e7db2 100644 --- a/data/maps/SlateportCity_PokemonFanClub/map.json +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonFanClub_EventScript_2C7F16", + "script": "SlateportCity_PokemonFanClub_EventScript_SwaggerTutor", "flag": "0" } ], diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index b30345111..817ae4402 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -219,8 +219,8 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946 setvar VAR_0x8004, 0 special Script_DoRayquazaScene waitstate - applymovement 10, Common_Movement_WalkInPlaceLeft - applymovement 9, Common_Movement_WalkInPlaceRight + applymovement 10, Common_Movement_WalkInPlaceFastestLeft + applymovement 9, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 60 waitse @@ -319,8 +319,8 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82 setvar VAR_0x8004, 0 special Script_DoRayquazaScene waitstate - applymovement 10, Common_Movement_WalkInPlaceLeft - applymovement 9, Common_Movement_WalkInPlaceRight + applymovement 10, Common_Movement_WalkInPlaceFastestLeft + applymovement 9, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 60 waitse diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index cba0e189d..e6e522908 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -37,7 +37,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_227A21 waitmovement 0 copyobjectxytoperm 1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json index 90a8dcdad..a2307dc10 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_PokemonCenter_1F_EventScript_2C8256", + "script": "SootopolisCity_PokemonCenter_1F_EventScript_DoubleEdgeTutor", "flag": "0" } ], diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index 2ee0ae602..f5879e1e8 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -14,7 +14,7 @@ SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 goto_if_eq SouthernIsland_Exterior_EventScript_242A17 msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 840822780..3b9fb77a4 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -114,7 +114,7 @@ TrainerHill_Entrance_EventScript_2681EF:: @ 82681EF TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD lock faceplayer - setvar VAR_0x8004, TRAINER_HILL_FUNC_10 + setvar VAR_0x8004, TRAINER_HILL_FUNC_IS_IN special CallTrainerHillFunction compare VAR_RESULT, 0 goto_if_eq TrainerHill_Entrance_EventScript_26821F diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index fd8c05546..9a764cd58 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -77,8 +77,8 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_202581 waitmovement 0 removeobject 2 - applymovement 3, Common_Movement_WalkInPlaceDown - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 3, Common_Movement_WalkInPlaceFastestDown + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, MSGBOX_DEFAULT special LoadPlayerParty @@ -121,8 +121,8 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8:: @ 82024B8 case MULTI_B_PRESSED, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA:: @ 82024EA - applymovement 3, Common_Movement_WalkInPlaceRight - applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 3, Common_Movement_WalkInPlaceFastestRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 closemessage goto VerdanturfTown_BattleTentBattleRoom_EventScript_20236F diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json index f9df06d33..c437aeece 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6", + "script": "VerdanturfTown_PokemonCenter_1F_EventScript_FuryCutterTutor", "flag": "0" } ], diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index b6983eac0..9b7c00c62 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -38,7 +38,7 @@ VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8 end VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox VictoryRoad_1F_Text_235EE6, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_235FFC diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc index 581a789e4..9892ffb7b 100644 --- a/data/scripts/battle_pike.inc +++ b/data/scripts/battle_pike.inc @@ -3,9 +3,9 @@ BattleFrontier_BattlePikeRandomRoom1_MapScripts_2C3E1B: @ 82C3E1B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25: @ 82C3E25 - setvar VAR_0x8004, 4 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_UP_ROOM_OBJECTS special CallBattlePikeFunction - setvar VAR_0x8004, 5 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE special CallBattlePikeFunction switch VAR_RESULT case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 @@ -50,7 +50,7 @@ BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE: @ 82C3EDE BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST - setvar VAR_0x8004, 5 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE special CallBattlePikeFunction compare VAR_RESULT, 3 goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 @@ -92,11 +92,11 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64:: @ 82C3F64 end BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F - setvar VAR_0x8004, 1 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA setvar VAR_0x8005, 1 special CallBattlePikeFunction addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallBattlePikeFunction @@ -108,9 +108,9 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - setvar VAR_0x8004, 0 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_ROOM_TYPE special CallBattlePikeFunction - setvar VAR_0x8004, 5 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE special CallBattlePikeFunction switch VAR_RESULT case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 @@ -167,17 +167,17 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D:: @ 82C408D end BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2 - setvar VAR_0x8004, 25 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_CAN_PARTY_BE_HEALED special CallBattlePikeFunction compare VAR_RESULT, 1 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128 compare VAR_RESULT, 1 call_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA setvar VAR_0x8005, 1 special CallBattlePikeFunction addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallBattlePikeFunction @@ -189,7 +189,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - setvar VAR_0x8004, 3 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_IN_FINAL_ROOM special CallBattlePikeFunction compare VAR_RESULT, 1 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144 @@ -200,14 +200,14 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128:: @ 82C4128 BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128:: @ 82C4128 - setvar VAR_0x8004, 24 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED setvar VAR_0x8005, 1 special CallBattlePikeFunction return BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136:: @ 82C4136 BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136:: @ 82C4136 - setvar VAR_0x8004, 24 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED setvar VAR_0x8005, 0 special CallBattlePikeFunction return @@ -229,19 +229,19 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C:: @ 82C415C return BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 - setvar VAR_0x8004, 7 + setvar VAR_0x8004,BATTLE_PIKE_FUNC_7 special CallBattlePikeFunction - setvar VAR_0x8004, 25 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_CAN_PARTY_BE_HEALED special CallBattlePikeFunction compare VAR_RESULT, 1 call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128 compare VAR_RESULT, 1 call_if_ne BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA setvar VAR_0x8005, 1 special CallBattlePikeFunction addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallBattlePikeFunction @@ -253,7 +253,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - setvar VAR_0x8004, 3 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_IN_FINAL_ROOM special CallBattlePikeFunction compare VAR_RESULT, 1 call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144 @@ -275,7 +275,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D:: @ 82C420D closemessage end -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222:: @ 82C4222 +BattleFrontier_BattlePike_EventScript_Retire:: @ 82C4222 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 3fcb25807..693860be4 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -312,7 +312,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276DD5:: @ 8276DD5 OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0 lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox OldaleTown_PokemonCenter_2F_Text_27964A, MSGBOX_DEFAULT closemessage diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc index 86689fdb0..0852149a6 100644 --- a/data/scripts/cave_hole.inc +++ b/data/scripts/cave_hole.inc @@ -1,23 +1,15 @@ -GraniteCave_B1F_MapScript2_2A8327: @ 82A8327 -MirageTower_2F_MapScript2_2A8327: @ 82A8327 -MirageTower_3F_MapScript2_2A8327: @ 82A8327 -MtPyre_2F_MapScript2_2A8327: @ 82A8327 -SkyPillar_2F_MapScript2_2A8327: @ 82A8327 -SkyPillar_4F_MapScript2_2A8327: @ 82A8327 +CaveHole_MapScript2_CheckFallDownHole: @ 82A8327 map_script_2 VAR_ICE_STEP_COUNT, 0, EventScript_FallDownHole .2byte 0 -GraniteCave_B1F_MapScript1_2A8331: @ 82A8331 -MirageTower_2F_MapScript1_2A8331: @ 82A8331 -MirageTower_3F_MapScript1_2A8331: @ 82A8331 -MtPyre_2F_MapScript1_2A8331: @ 82A8331 - copyvar VAR_ICE_STEP_COUNT, 0x1 +CaveHole_MapScript1_FixCrackedGround: @ 82A8331 + copyvar VAR_ICE_STEP_COUNT, 1 end EventScript_FallDownHole:: @ 82A8337 lockall delay 20 - applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_B1F_Movement_2A8369 + applymovement EVENT_OBJ_ID_PLAYER, Movement_SetInvisible waitmovement 0 playse SE_RU_HYUU delay 60 @@ -25,10 +17,10 @@ EventScript_FallDownHole:: @ 82A8337 waitstate end -gUnknown_082A8350:: @ 82A8350 +EventScript_FallDownHoleMtPyre:: @ 82A8350 lockall delay 20 - applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_B1F_Movement_2A8369 + applymovement EVENT_OBJ_ID_PLAYER, Movement_SetInvisible waitmovement 0 playse SE_RU_HYUU delay 60 @@ -36,6 +28,6 @@ gUnknown_082A8350:: @ 82A8350 waitstate end -GraniteCave_B1F_Movement_2A8369: @ 82A8369 +Movement_SetInvisible: @ 82A8369 set_invisible step_end diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc index c6b8d5578..c60e3889e 100644 --- a/data/scripts/elite_four.inc +++ b/data/scripts/elite_four.inc @@ -3,7 +3,7 @@ EverGrandeCity_GlaciasRoom_EventScript_2723F8:: @ 82723F8 EverGrandeCity_PhoebesRoom_EventScript_2723F8:: @ 82723F8 EverGrandeCity_SidneysRoom_EventScript_2723F8:: @ 82723F8 PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725C6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay32 waitmovement 0 playse SE_DOOR setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 @@ -25,7 +25,7 @@ EverGrandeCity_DrakesRoom_EventScript_272475:: @ 8272475 EverGrandeCity_GlaciasRoom_EventScript_272475:: @ 8272475 EverGrandeCity_PhoebesRoom_EventScript_272475:: @ 8272475 EverGrandeCity_SidneysRoom_EventScript_272475:: @ 8272475 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725BA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp6 waitmovement 0 playse SE_TRACK_DOOR setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc index 9f8058e4e..2ca9c7b06 100644 --- a/data/scripts/field_poison.inc +++ b/data/scripts/field_poison.inc @@ -1,51 +1,51 @@ -EventScript_Poison:: @ 82736BC +EventScript_FieldPoison:: @ 82736BC lockall - special ExecuteWhiteOut + special TryFieldPoisonWhiteOut waitstate - compare VAR_RESULT, 1 - goto_if_eq EventScript_2736D9 - compare VAR_RESULT, 2 - goto_if_eq EventScript_2736F8 + compare VAR_RESULT, FLDPSN_WHITEOUT + goto_if_eq EventScript_FieldWhiteOut + compare VAR_RESULT, FLDPSN_FRONTIER_WHITEOUT + goto_if_eq EventScript_FrontierFieldWhiteOut releaseall end -EventScript_2736D9:: @ 82736D9 +EventScript_FieldWhiteOut:: @ 82736D9 message gText_PlayerWhitedOut waitmessage waitbuttonpress - special sub_80B05B4 + special Script_FadeOutMapMusic waitstate fadescreen 1 - call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_2736F4 - special sp0C8_whiteout_maybe + call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_SetRespawnLavaridgePkmnCenter + special SetCB2WhiteOut waitstate end -EventScript_2736F4:: @ 82736F4 +EventScript_SetRespawnLavaridgePkmnCenter:: @ 82736F4 setrespawn HEAL_LOCATION_LAVARIDGE_TOWN return -EventScript_2736F8:: @ 82736F8 +EventScript_FrontierFieldWhiteOut:: @ 82736F8 message gText_PlayerWhitedOut waitmessage waitbuttonpress - setvar VAR_0x8004, 16 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_IN special CallBattlePikeFunction compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222 - setvar VAR_0x8004, 12 + goto_if_eq BattleFrontier_BattlePike_EventScript_Retire + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN special CallBattlePyramidFunction compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - setvar VAR_0x8004, TRAINER_HILL_FUNC_10 + setvar VAR_0x8004, TRAINER_HILL_FUNC_IS_IN special CallTrainerHillFunction compare VAR_RESULT, 1 - goto_if_eq TrainerHill_1F_EventScript_2C83C9 - special sub_80B05B4 + goto_if_eq TrainerHill_1F_EventScript_Lost + special Script_FadeOutMapMusic waitstate fadescreen 1 - special sp0C8_whiteout_maybe + special SetCB2WhiteOut waitstate end diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index be8277baa..0f8d71f6b 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -232,13 +232,13 @@ Route111_EventScript_28CF94:: @ 828CF94 Route111_EventScript_28CF9F:: @ 828CF9F applymovement VAR_0x8004, Route111_Movement_28D04F - applymovement VAR_0x8005, Common_Movement_WalkInPlaceUp + applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return Route111_EventScript_28CFB1:: @ 828CFB1 applymovement VAR_0x8004, Route111_Movement_28D051 - applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft + applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/scripts/kecleon.inc b/data/scripts/kecleon.inc index e4118d3e1..ac0931fd8 100644 --- a/data/scripts/kecleon.inc +++ b/data/scripts/kecleon.inc @@ -1,74 +1,73 @@ -Route120_EventScript_2722DB:: @ 82722DB +Route120_EventScript_Kecleon1:: @ 82722DB lock faceplayer setvar VAR_0x8009, 1 - goto Route120_EventScript_272336 + goto EventScript_Kecleon end -Route120_EventScript_2722E8:: @ 82722E8 +Route120_EventScript_Kecleon2:: @ 82722E8 lock faceplayer setvar VAR_0x8009, 2 - goto Route120_EventScript_272336 + goto EventScript_Kecleon end -Route120_EventScript_2722F5:: @ 82722F5 +Route120_EventScript_Kecleon3:: @ 82722F5 lock faceplayer setvar VAR_0x8009, 3 - goto Route120_EventScript_272336 + goto EventScript_Kecleon end -Route120_EventScript_272302:: @ 8272302 +Route120_EventScript_Kecleon4:: @ 8272302 lock faceplayer setvar VAR_0x8009, 4 - goto Route120_EventScript_272336 + goto EventScript_Kecleon end -Route120_EventScript_27230F:: @ 827230F +Route120_EventScript_Kecleon5:: @ 827230F lock faceplayer setvar VAR_0x8009, 5 - goto Route120_EventScript_272336 + goto EventScript_Kecleon end -Route119_EventScript_27231C:: @ 827231C +Route119_EventScript_Kecleon1:: @ 827231C lock faceplayer setvar VAR_0x8009, 6 - goto Route119_EventScript_272336 + goto EventScript_Kecleon end -Route119_EventScript_272329:: @ 8272329 +Route119_EventScript_Kecleon2:: @ 8272329 lock faceplayer setvar VAR_0x8009, 7 - goto Route119_EventScript_272336 + goto EventScript_Kecleon end -Route119_EventScript_272336:: @ 8272336 -Route120_EventScript_272336:: @ 8272336 +EventScript_Kecleon:: @ 8272336 checkitem ITEM_DEVON_SCOPE, 1 compare VAR_RESULT, 1 - goto_if_eq Route119_EventScript_272350 - msgbox Route119_Text_1F5D00, MSGBOX_DEFAULT + goto_if_eq EventScript_AskUseDevonScope + msgbox Kecleon_Text_SomethingUnseeable, MSGBOX_DEFAULT release end -Route119_EventScript_272350:: @ 8272350 - msgbox Route119_Text_1F5D23, MSGBOX_YESNO +EventScript_AskUseDevonScope:: @ 8272350 + msgbox Kecleon_Text_WantToUseDevonScope, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq Route119_EventScript_272365 + goto_if_eq EventScript_BattleKecleon release end -Route119_EventScript_272365:: @ 8272365 - msgbox Route119_Text_1F5D63, MSGBOX_DEFAULT +EventScript_BattleKecleon:: @ 8272365 + msgbox Kecleon_Text_UseDevonScopeMonAttacked, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - applymovement VAR_LAST_TALKED, Route119_Movement_2723C7 + applymovement VAR_LAST_TALKED, Movement_KecleonAppears waitmovement 0 waitse playmoncry SPECIES_KECLEON, 2 @@ -79,11 +78,11 @@ Route119_EventScript_272365:: @ 8272365 dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq EventScript_RemoveKecleon - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq EventScript_RemoveKecleon - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq EventScript_RemoveKecleon release end @@ -92,9 +91,7 @@ EventScript_RemoveKecleon:: @ 82723C1 goto Common_EventScript_RemoveStaticPokemon end -FortreeCity_Movement_2723C7: @ 82723C7 -Route119_Movement_2723C7: @ 82723C7 -Route120_Movement_2723C7: @ 82723C7 +Movement_KecleonAppears: @ 82723C7 set_visible delay_4 set_invisible diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index 8780b9994..b6ba75e0d 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -1,309 +1,300 @@ -SlateportCity_PokemonFanClub_EventScript_2C7F16:: @ 82C7F16 +SlateportCity_PokemonFanClub_EventScript_SwaggerTutor:: @ 82C7F16 lock faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SWAGGER, SlateportCity_PokemonFanClub_EventScript_2C7F74 - msgbox SlateportCity_PokemonFanClub_Text_2C6E37, MSGBOX_YESNO + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SWAGGER, MoveTutor_EventScript_SwaggerTaught + msgbox MoveTutor_Text_SwaggerTeach, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A - call SlateportCity_PokemonFanClub_EventScript_2C832D + goto_if_eq MoveTutor_EventScript_SwaggerDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A - msgbox SlateportCity_PokemonFanClub_Text_2C6F66, MSGBOX_DEFAULT - setvar VAR_0x8005, 23 - call EventScript_ShowPartyMenu + goto_if_eq MoveTutor_EventScript_SwaggerDeclined + msgbox MoveTutor_Text_SwaggerWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_SWAGGER + call MoveTutor_EventScript_OpenPartyMenu compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A + goto_if_eq MoveTutor_EventScript_SwaggerDeclined setflag FLAG_MOVE_TUTOR_TAUGHT_SWAGGER - goto SlateportCity_PokemonFanClub_EventScript_2C7F74 + goto MoveTutor_EventScript_SwaggerTaught end -SlateportCity_PokemonFanClub_EventScript_2C7F6A:: @ 82C7F6A - msgbox SlateportCity_PokemonFanClub_Text_2C6F33, MSGBOX_DEFAULT +MoveTutor_EventScript_SwaggerDeclined:: @ 82C7F6A + msgbox MoveTutor_Text_SwaggerDeclined, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_2C7F74:: @ 82C7F74 - msgbox SlateportCity_PokemonFanClub_Text_2C6F9E, MSGBOX_DEFAULT +MoveTutor_EventScript_SwaggerTaught:: @ 82C7F74 + msgbox MoveTutor_Text_SwaggerTaught, MSGBOX_DEFAULT release end -MauvilleCity_EventScript_2C7F7E:: @ 82C7F7E +MauvilleCity_EventScript_RolloutTutor:: @ 82C7F7E lock faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT, MauvilleCity_EventScript_2C7FDC - msgbox MauvilleCity_Text_2C6FDB, MSGBOX_YESNO + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT, MoveTutor_EventScript_RolloutTaught + msgbox MoveTutor_Text_RolloutTeach, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_EventScript_2C7FD2 - call MauvilleCity_EventScript_2C832D + goto_if_eq MoveTutor_EventScript_RolloutDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_EventScript_2C7FD2 - msgbox MauvilleCity_Text_2C70F3, MSGBOX_DEFAULT - setvar VAR_0x8005, 16 - call EventScript_ShowPartyMenu + goto_if_eq MoveTutor_EventScript_RolloutDeclined + msgbox MoveTutor_Text_RolloutWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_ROLLOUT + call MoveTutor_EventScript_OpenPartyMenu compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_EventScript_2C7FD2 + goto_if_eq MoveTutor_EventScript_RolloutDeclined setflag FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT - goto MauvilleCity_EventScript_2C7FDC + goto MoveTutor_EventScript_RolloutTaught end -MauvilleCity_EventScript_2C7FD2:: @ 82C7FD2 - msgbox MauvilleCity_Text_2C70C4, MSGBOX_DEFAULT +MoveTutor_EventScript_RolloutDeclined:: @ 82C7FD2 + msgbox MoveTutor_Text_RolloutDeclined, MSGBOX_DEFAULT release end -MauvilleCity_EventScript_2C7FDC:: @ 82C7FDC - msgbox MauvilleCity_Text_2C7133, MSGBOX_DEFAULT +MoveTutor_EventScript_RolloutTaught:: @ 82C7FDC + msgbox MoveTutor_Text_RolloutTaught, MSGBOX_DEFAULT release end -VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6:: @ 82C7FE6 +VerdanturfTown_PokemonCenter_1F_EventScript_FuryCutterTutor:: @ 82C7FE6 lock faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER, VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7174, MSGBOX_YESNO + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER, MoveTutor_EventScript_FuryCutterTaught + msgbox MoveTutor_Text_FuryCutterTeach, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A - call VerdanturfTown_PokemonCenter_1F_EventScript_2C832D + goto_if_eq MoveTutor_EventScript_FuryCutterDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce compare VAR_RESULT, 0 - goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7243, MSGBOX_DEFAULT - setvar VAR_0x8005, 29 - call EventScript_ShowPartyMenu + goto_if_eq MoveTutor_EventScript_FuryCutterDeclined + msgbox MoveTutor_Text_FuryCutterWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_FURY_CUTTER + call MoveTutor_EventScript_OpenPartyMenu compare VAR_RESULT, 0 - goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A + goto_if_eq MoveTutor_EventScript_FuryCutterDeclined setflag FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER - goto VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 + goto MoveTutor_EventScript_FuryCutterTaught end -VerdanturfTown_PokemonCenter_1F_EventScript_2C803A:: @ 82C803A - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7221, MSGBOX_DEFAULT +MoveTutor_EventScript_FuryCutterDeclined:: @ 82C803A + msgbox MoveTutor_Text_FuryCutterDeclined, MSGBOX_DEFAULT release end -VerdanturfTown_PokemonCenter_1F_EventScript_2C8044:: @ 82C8044 - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C726E, MSGBOX_DEFAULT +MoveTutor_EventScript_FuryCutterTaught:: @ 82C8044 + msgbox MoveTutor_Text_FuryCutterTaught, MSGBOX_DEFAULT release end -LavaridgeTown_House_EventScript_2C804E:: @ 82C804E +LavaridgeTown_House_EventScript_MimicTutor:: @ 82C804E lock faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_MIMIC, LavaridgeTown_House_EventScript_2C80AC - msgbox LavaridgeTown_House_Text_2C72B6, MSGBOX_YESNO + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_MIMIC, MoveTutor_EventScript_MimicTaught + msgbox MoveTutor_MimicTeach, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_House_EventScript_2C80A2 - call LavaridgeTown_House_EventScript_2C832D + goto_if_eq MoveTutor_EventScript_MimicDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_House_EventScript_2C80A2 - msgbox LavaridgeTown_House_Text_2C73B1, MSGBOX_DEFAULT - setvar VAR_0x8005, 7 - call EventScript_ShowPartyMenu + goto_if_eq MoveTutor_EventScript_MimicDeclined + msgbox MoveTutor_Text_MimicWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_MIMIC + call MoveTutor_EventScript_OpenPartyMenu compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_House_EventScript_2C80A2 + goto_if_eq MoveTutor_EventScript_MimicDeclined setflag FLAG_MOVE_TUTOR_TAUGHT_MIMIC - goto LavaridgeTown_House_EventScript_2C80AC + goto MoveTutor_EventScript_MimicTaught end -LavaridgeTown_House_EventScript_2C80A2:: @ 82C80A2 - msgbox LavaridgeTown_House_Text_2C737F, MSGBOX_DEFAULT +MoveTutor_EventScript_MimicDeclined:: @ 82C80A2 + msgbox MoveTutor_MimicDeclined, MSGBOX_DEFAULT release end -LavaridgeTown_House_EventScript_2C80AC:: @ 82C80AC - msgbox LavaridgeTown_House_Text_2C73F6, MSGBOX_DEFAULT +MoveTutor_EventScript_MimicTaught:: @ 82C80AC + msgbox MoveTutor_Text_MimicTaught, MSGBOX_DEFAULT release end -FallarborTown_Mart_EventScript_2C80B6:: @ 82C80B6 +FallarborTown_Mart_EventScript_MetronomeTutor:: @ 82C80B6 lock faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_METRONOME, FallarborTown_Mart_EventScript_2C8114 - msgbox FallarborTown_Mart_Text_2C7449, MSGBOX_YESNO + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_METRONOME, MoveTutor_EventScript_MetronomeTaught + msgbox MoveTutor_Text_MetronomeTeach, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq FallarborTown_Mart_EventScript_2C810A - call FallarborTown_Mart_EventScript_2C832D + goto_if_eq MoveTutor_EventScript_MetronomeDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce compare VAR_RESULT, 0 - goto_if_eq FallarborTown_Mart_EventScript_2C810A - msgbox FallarborTown_Mart_Text_2C7582, MSGBOX_DEFAULT - setvar VAR_0x8005, 8 - call EventScript_ShowPartyMenu + goto_if_eq MoveTutor_EventScript_MetronomeDeclined + msgbox MoveTutor_Text_MetronomeWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_METRONOME + call MoveTutor_EventScript_OpenPartyMenu compare VAR_RESULT, 0 - goto_if_eq FallarborTown_Mart_EventScript_2C810A + goto_if_eq MoveTutor_EventScript_MetronomeDeclined setflag FLAG_MOVE_TUTOR_TAUGHT_METRONOME - goto FallarborTown_Mart_EventScript_2C8114 + goto MoveTutor_EventScript_MetronomeTaught end -FallarborTown_Mart_EventScript_2C810A:: @ 82C810A - msgbox FallarborTown_Mart_Text_2C7556, MSGBOX_DEFAULT +MoveTutor_EventScript_MetronomeDeclined:: @ 82C810A + msgbox MoveTutor_Text_MetronomeDeclined, MSGBOX_DEFAULT release end -FallarborTown_Mart_EventScript_2C8114:: @ 82C8114 - msgbox FallarborTown_Mart_Text_2C75B5, MSGBOX_DEFAULT +MoveTutor_EventScript_MetronomeTaught:: @ 82C8114 + msgbox MoveTutor_Text_MetronomeTaught, MSGBOX_DEFAULT release end -FortreeCity_House2_EventScript_2C811E:: @ 82C811E +FortreeCity_House2_EventScript_SleepTalkTutor:: @ 82C811E lock faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK, FortreeCity_House2_EventScript_2C817C - msgbox FortreeCity_House2_Text_2C7637, MSGBOX_YESNO + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK, MoveTutor_EventScript_SleepTalkTaught + msgbox MoveTutor_Text_SleepTalkTeach, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq FortreeCity_House2_EventScript_2C8172 - call FortreeCity_House2_EventScript_2C832D + goto_if_eq MoveTutor_EventScript_SleepTalkDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce compare VAR_RESULT, 0 - goto_if_eq FortreeCity_House2_EventScript_2C8172 - msgbox FortreeCity_House2_Text_2C7721, MSGBOX_DEFAULT - setvar VAR_0x8005, 24 - call EventScript_ShowPartyMenu + goto_if_eq MoveTutor_EventScript_SleepTalkDeclined + msgbox MoveTutor_Text_SleepTalkWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_SLEEP_TALK + call MoveTutor_EventScript_OpenPartyMenu compare VAR_RESULT, 0 - goto_if_eq FortreeCity_House2_EventScript_2C8172 + goto_if_eq MoveTutor_EventScript_SleepTalkDeclined setflag FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK - goto FortreeCity_House2_EventScript_2C817C + goto MoveTutor_EventScript_SleepTalkTaught end -FortreeCity_House2_EventScript_2C8172:: @ 82C8172 - msgbox FortreeCity_House2_Text_2C76E2, MSGBOX_DEFAULT +MoveTutor_EventScript_SleepTalkDeclined:: @ 82C8172 + msgbox MoveTutor_Text_SleepTalkDeclined, MSGBOX_DEFAULT release end -FortreeCity_House2_EventScript_2C817C:: @ 82C817C - msgbox FortreeCity_House2_Text_2C775A, MSGBOX_DEFAULT +MoveTutor_EventScript_SleepTalkTaught:: @ 82C817C + msgbox MoveTutor_Text_SleepTalkTaught, MSGBOX_DEFAULT release end -LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186:: @ 82C8186 +LilycoveCity_DepartmentStoreRooftop_EventScript_SubstituteTutor:: @ 82C8186 lock faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE, LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C77C6, MSGBOX_YESNO + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE, MoveTutor_EventScript_SubstituteTaught + msgbox MoveTutor_Text_SubstituteTeach, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA - call LilycoveCity_DepartmentStoreRooftop_EventScript_2C832D + goto_if_eq MoveTutor_EventScript_SubstituteDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C7911, MSGBOX_DEFAULT - setvar VAR_0x8005, 14 - call EventScript_ShowPartyMenu + goto_if_eq MoveTutor_EventScript_SubstituteDeclined + msgbox MoveTutor_Text_SubstituteWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_SUBSTITUTE + call MoveTutor_EventScript_OpenPartyMenu compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA + goto_if_eq MoveTutor_EventScript_SubstituteDeclined setflag FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE - goto LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 + goto MoveTutor_EventScript_SubstituteTaught end -LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA:: @ 82C81DA - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C78D1, MSGBOX_DEFAULT +MoveTutor_EventScript_SubstituteDeclined:: @ 82C81DA + msgbox MoveTutor_Text_SubstituteDeclined, MSGBOX_DEFAULT release end -LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4:: @ 82C81E4 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C794B, MSGBOX_DEFAULT +MoveTutor_EventScript_SubstituteTaught:: @ 82C81E4 + msgbox MoveTutor_Text_SubstituteTaught, MSGBOX_DEFAULT release end -MossdeepCity_EventScript_2C81EE:: @ 82C81EE +MossdeepCity_EventScript_DynamicPunchTutor:: @ 82C81EE lock faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH, MossdeepCity_EventScript_2C824C - msgbox MossdeepCity_Text_2C79A6, MSGBOX_YESNO + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH, MoveTutor_EventScript_DynamicPunchTaught + msgbox MoveTutor_Text_DynamicPunchTeach, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_EventScript_2C8242 - call MossdeepCity_EventScript_2C832D + goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_EventScript_2C8242 - msgbox MossdeepCity_Text_2C7B0D, MSGBOX_DEFAULT - setvar VAR_0x8005, 15 - call EventScript_ShowPartyMenu + goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined + msgbox MoveTutor_Text_DynamicPunchWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_DYNAMIC_PUNCH + call MoveTutor_EventScript_OpenPartyMenu compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_EventScript_2C8242 + goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined setflag FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH - goto MossdeepCity_EventScript_2C824C + goto MoveTutor_EventScript_DynamicPunchTaught end -MossdeepCity_EventScript_2C8242:: @ 82C8242 - msgbox MossdeepCity_Text_2C7AD4, MSGBOX_DEFAULT +MoveTutor_EventScript_DynamicPunchDeclined:: @ 82C8242 + msgbox MoveTutor_Text_DynamicPunchDeclined, MSGBOX_DEFAULT release end -MossdeepCity_EventScript_2C824C:: @ 82C824C - msgbox MossdeepCity_Text_2C7B4F, MSGBOX_DEFAULT +MoveTutor_EventScript_DynamicPunchTaught:: @ 82C824C + msgbox MoveTutor_Text_DynamicPunchTaught, MSGBOX_DEFAULT release end -SootopolisCity_PokemonCenter_1F_EventScript_2C8256:: @ 82C8256 +SootopolisCity_PokemonCenter_1F_EventScript_DoubleEdgeTutor:: @ 82C8256 lock faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE, SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7B8E, MSGBOX_YESNO + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE, MoveTutor_EventScript_DoubleEdgeTaught + msgbox MoveTutor_Text_DoubleEdgeTeach, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA - call SootopolisCity_PokemonCenter_1F_EventScript_2C832D + goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C98, MSGBOX_DEFAULT - setvar VAR_0x8005, 4 - call EventScript_ShowPartyMenu + goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined + msgbox MoveTutor_Text_DoubleEdgeWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_DOUBLE_EDGE + call MoveTutor_EventScript_OpenPartyMenu compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA + goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined setflag FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE - goto SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 + goto MoveTutor_EventScript_DoubleEdgeTaught end -SootopolisCity_PokemonCenter_1F_EventScript_2C82AA:: @ 82C82AA - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C7E, MSGBOX_DEFAULT +MoveTutor_EventScript_DoubleEdgeDeclined:: @ 82C82AA + msgbox MoveTutor_Text_DoubleEdgeDeclined, MSGBOX_DEFAULT release end -SootopolisCity_PokemonCenter_1F_EventScript_2C82B4:: @ 82C82B4 - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7CC8, MSGBOX_DEFAULT +MoveTutor_EventScript_DoubleEdgeTaught:: @ 82C82B4 + msgbox MoveTutor_Text_DoubleEdgeTaught, MSGBOX_DEFAULT release end -PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE:: @ 82C82BE +PacifidlogTown_PokemonCenter_1F_EventScript_ExplosionTutor:: @ 82C82BE lock faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION, PacifidlogTown_PokemonCenter_1F_EventScript_2C831C - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7CFA, MSGBOX_YESNO + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION, MoveTutor_EventScript_ExplosionTaught + msgbox MoveTutor_Text_ExplosionTeach, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 - call PacifidlogTown_PokemonCenter_1F_EventScript_2C832D + goto_if_eq MoveTutor_EventScript_ExplosionDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce compare VAR_RESULT, 0 - goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E40, MSGBOX_DEFAULT - setvar VAR_0x8005, 12 - call EventScript_ShowPartyMenu + goto_if_eq MoveTutor_EventScript_ExplosionDeclined + msgbox MoveTutor_Text_ExplosionWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_EXPLOSION + call MoveTutor_EventScript_OpenPartyMenu compare VAR_RESULT, 0 - goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 + goto_if_eq MoveTutor_EventScript_ExplosionDeclined setflag FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION - goto PacifidlogTown_PokemonCenter_1F_EventScript_2C831C + goto MoveTutor_EventScript_ExplosionTaught end -PacifidlogTown_PokemonCenter_1F_EventScript_2C8312:: @ 82C8312 - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E04, MSGBOX_DEFAULT +MoveTutor_EventScript_ExplosionDeclined:: @ 82C8312 + msgbox MoveTutor_Text_ExplosionDeclined, MSGBOX_DEFAULT release end -PacifidlogTown_PokemonCenter_1F_EventScript_2C831C:: @ 82C831C - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E7A, MSGBOX_DEFAULT +MoveTutor_EventScript_ExplosionTaught:: @ 82C831C + msgbox MoveTutor_Text_ExplosionTaught, MSGBOX_DEFAULT release end -EventScript_ShowPartyMenu:: @ 82C8326 - special sub_81B892C +MoveTutor_EventScript_OpenPartyMenu:: @ 82C8326 + special OpenPartyMenuForMoveTutor waitstate lock faceplayer return -FallarborTown_Mart_EventScript_2C832D:: @ 82C832D -FortreeCity_House2_EventScript_2C832D:: @ 82C832D -LavaridgeTown_House_EventScript_2C832D:: @ 82C832D -LilycoveCity_DepartmentStoreRooftop_EventScript_2C832D:: @ 82C832D -MauvilleCity_EventScript_2C832D:: @ 82C832D -MossdeepCity_EventScript_2C832D:: @ 82C832D -PacifidlogTown_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D -SlateportCity_PokemonFanClub_EventScript_2C832D:: @ 82C832D -SootopolisCity_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D -VerdanturfTown_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D - msgbox MauvilleCity_Text_2C6E05, MSGBOX_YESNO +MoveTutor_EventScript_CanOnlyBeLearnedOnce:: @ 82C832D + msgbox MoveTutor_Text_ThisMoveCanOnlyBeLearnedOnce, MSGBOX_YESNO return diff --git a/data/scripts/movement.inc b/data/scripts/movement.inc index b7abceae4..3dd1a8144 100644 --- a/data/scripts/movement.inc +++ b/data/scripts/movement.inc @@ -1,4 +1,4 @@ -SlateportCity_Movement_272596: @ 8272596 +Common_Movement_QuestionMark: @ 8272596 emote_question_mark step_end @@ -24,27 +24,27 @@ Common_Movement_FaceOriginalDirection: @ 82725A2 face_original_direction step_end -Common_Movement_WalkInPlaceLeft: @ 82725A4 +Common_Movement_WalkInPlaceFastestLeft: @ 82725A4 walk_in_place_fastest_left step_end -Common_Movement_WalkInPlaceUp: @ 82725A6 +Common_Movement_WalkInPlaceFastestUp: @ 82725A6 walk_in_place_fastest_up step_end -Common_Movement_WalkInPlaceRight: @ 82725A8 +Common_Movement_WalkInPlaceFastestRight: @ 82725A8 walk_in_place_fastest_right step_end -Common_Movement_WalkInPlaceDown: @ 82725AA +Common_Movement_WalkInPlaceFastestDown: @ 82725AA walk_in_place_fastest_down step_end -RustboroCity_Movement_2725AC: @ 82725AC +Common_Movement_FaceRight: @ 82725AC face_right step_end -RustboroCity_Movement_2725AE: @ 82725AE +Common_Movement_FaceLeft: @ 82725AE face_left step_end @@ -56,21 +56,19 @@ Common_Movement_FaceUp: @ 82725B2 face_up step_end -BattleFrontier_BattleDomeBattleRoom_Movement_2725B4: @ 82725B4 -MeteorFalls_1F_1R_Movement_2725B4: @ 82725B4 +Common_Movement_WalkInPlaceDown: @ 82725B4 walk_in_place_down step_end -BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6: @ 82725B6 -BattleFrontier_BattleTowerBattleRoom_Movement_2725B6: @ 82725B6 +Common_Movement_WalkInPlaceLeft: @ 82725B6 walk_in_place_left step_end -Route121_Movement_2725B8: @ 82725B8 +Common_Movement_WalkInPlaceRight: @ 82725B8 walk_in_place_right step_end -EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA +Common_Movement_WalkUp6: @ 82725BA walk_up walk_up walk_up @@ -79,23 +77,24 @@ EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA walk_up step_end -EverGrandeCity_ChampionsRoom_Movement_2725C1: @ 82725C1 +Common_Movement_WalkUp4: @ 82725C1 walk_up walk_up walk_up walk_up step_end -EverGrandeCity_SidneysRoom_Movement_2725C6: @ 82725C6 +Common_Movement_Delay32: @ 82725C6 delay_16 delay_16 step_end -Route110_TrickHouseEntrance_Movement_2725C9: @ 82725C9 +Common_Movement_WalkUp: @ 82725C9 walk_up step_end -Movement_2725CB:: @ 82725CB +@ Unused +Common_Movement_WalkUp2:: @ 82725CB walk_up walk_up step_end diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index bfeba79e3..0d4be2c0d 100644 --- a/data/scripts/pkmn_center_nurse.inc +++ b/data/scripts/pkmn_center_nurse.inc @@ -38,11 +38,11 @@ EventScript_PkmnCenterNurse_IllTakeYourPkmn2:: @ 827198D return EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 8271993 - applymovement VAR_0x800B, Common_Movement_WalkInPlaceLeft + applymovement VAR_0x800B, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 dofieldeffect FLDEFF_POKECENTER_HEAL waitfieldeffect FLDEFF_POKECENTER_HEAL - applymovement VAR_0x800B, Common_Movement_WalkInPlaceDown + applymovement VAR_0x800B, Common_Movement_WalkInPlaceFastestDown waitmovement 0 special HealPlayerParty return diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 741b7f41e..f88d3af6c 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -16,18 +16,18 @@ LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704 closemessage setvar VAR_LITTLEROOT_INTRO_STATE, 4 applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292763 - applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end LittlerootTown_BrendansHouse_1F_EventScript_29274D:: @ 829274D - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -39,7 +39,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765 LittlerootTown_MaysHouse_1F_EventScript_292765:: @ 8292765 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AF0 waitmovement 0 releaseall @@ -82,7 +82,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_2927DF:: @ 82927DF addobject VAR_0x8008 applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292850 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT closemessage @@ -95,7 +95,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29280F:: @ 829280F addobject VAR_0x8008 applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_29285B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT closemessage @@ -154,7 +154,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292866:: @ 8292866 end LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D - applymovement VAR_0x8005, Common_Movement_WalkInPlaceRight + applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_29294B applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE0 @@ -167,7 +167,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE6 waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_29296C - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, MSGBOX_DEFAULT @@ -179,7 +179,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D end LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC - applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft + applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_29294B applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AE8 @@ -192,7 +192,7 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AEE waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_29296C - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, MSGBOX_DEFAULT @@ -216,7 +216,7 @@ LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B LittlerootTown_BrendansHouse_1F_EventScript_29296C:: @ 829296C LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, MSGBOX_DEFAULT fadedefaultbgm @@ -586,28 +586,28 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D13:: @ 8292D13 LittlerootTown_BrendansHouse_1F_EventScript_292D1E:: @ 8292D1E applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD7 waitmovement 0 - applymovement VAR_0x800A, Common_Movement_WalkInPlaceLeft + applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D33:: @ 8292D33 applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DDE waitmovement 0 - applymovement VAR_0x800A, Common_Movement_WalkInPlaceRight + applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D48:: @ 8292D48 applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292999 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D5D:: @ 8292D5D applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_29299B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -624,14 +624,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D7D:: @ 8292D7D LittlerootTown_BrendansHouse_1F_EventScript_292D88:: @ 8292D88 applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929AF waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929B3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc index 5b43118d1..7d898a93d 100644 --- a/data/scripts/trainer_hill.inc +++ b/data/scripts/trainer_hill.inc @@ -10,11 +10,11 @@ TrainerHill_Roof_MapScript1_2C8336: @ 82C8336 setvar VAR_0x8005, 5 special CallFrontierUtilFunc compare VAR_RESULT, B_OUTCOME_LOST - goto_if_eq TrainerHill_1F_EventScript_2C83C9 + goto_if_eq TrainerHill_1F_EventScript_Lost compare VAR_RESULT, B_OUTCOME_DREW - goto_if_eq TrainerHill_1F_EventScript_2C83C9 + goto_if_eq TrainerHill_1F_EventScript_Lost compare VAR_RESULT, B_OUTCOME_FORFEITED - goto_if_eq TrainerHill_1F_EventScript_2C83C9 + goto_if_eq TrainerHill_1F_EventScript_Lost end TrainerHill_1F_MapScript2_2C8372: @ 82C8372 @@ -56,7 +56,7 @@ TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF waitstate end -TrainerHill_1F_EventScript_2C83C9:: @ 82C83C9 +TrainerHill_1F_EventScript_Lost:: @ 82C83C9 setvar VAR_0x8004, TRAINER_HILL_FUNC_12 special CallTrainerHillFunction setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_LOST diff --git a/data/specials.inc b/data/specials.inc index 6a328ca9e..bd2cac1b0 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -210,8 +210,8 @@ gSpecials:: @ 81DBA64 def_special ShowLinkBattleRecords def_special IsEnoughForCostInVar0x8005 def_special SubtractMoneyFromVar0x8005 - def_special ExecuteWhiteOut - def_special sp0C8_whiteout_maybe + def_special TryFieldPoisonWhiteOut + def_special SetCB2WhiteOut def_special RotatingGate_InitPuzzle def_special RotatingGate_InitPuzzleAndGraphics def_special SetSSTidalFlag @@ -342,7 +342,7 @@ gSpecials:: @ 81DBA64 def_special TryInitBattleTowerAwardManEventObject def_special MoveOutOfSecretBaseFromOutside def_special LoadPlayerBag - def_special sub_80B05B4 + def_special Script_FadeOutMapMusic def_special SetPacifidlogTMReceivedDay def_special GetDaysUntilPacifidlogTMAvailable def_special HasAllHoennMons @@ -485,7 +485,7 @@ gSpecials:: @ 81DBA64 def_special BufferBattleFrontierTutorMoveName def_special CloseBattleFrontierTutorWindow def_special sub_813ADD4 - def_special sub_81B892C + def_special OpenPartyMenuForMoveTutor def_special GetBattleFrontierTutorMoveIndex def_special sub_813AF48 def_special DoDeoxysRockInteraction diff --git a/data/text/move_tutors.inc b/data/text/move_tutors.inc index 6f3910b80..baadad73d 100644 --- a/data/text/move_tutors.inc +++ b/data/text/move_tutors.inc @@ -1,8 +1,8 @@ -MauvilleCity_Text_2C6E05: @ 82C6E05 +MoveTutor_Text_ThisMoveCanOnlyBeLearnedOnce: @ 82C6E05 .string "This move can be learned only\n" .string "once. Is that okay?$" -SlateportCity_PokemonFanClub_Text_2C6E37: @ 82C6E37 +MoveTutor_Text_SwaggerTeach: @ 82C6E37 .string "Heh! My POKéMON totally rules!\n" .string "It's cooler than any POKéMON!\p" .string "I was lipping off with a swagger in\n" @@ -12,19 +12,19 @@ SlateportCity_PokemonFanClub_Text_2C6E37: @ 82C6E37 .string "If you'd like, I'll teach the move\n" .string "SWAGGER to a POKéMON of yours.$" -SlateportCity_PokemonFanClub_Text_2C6F33: @ 82C6F33 +MoveTutor_Text_SwaggerDeclined: @ 82C6F33 .string "What, no? Can't you get into\n" .string "the spirit of things?$" -SlateportCity_PokemonFanClub_Text_2C6F66: @ 82C6F66 +MoveTutor_Text_SwaggerWhichMon: @ 82C6F66 .string "All right, which POKéMON wants to\n" .string "learn how to SWAGGER?$" -SlateportCity_PokemonFanClub_Text_2C6F9E: @ 82C6F9E +MoveTutor_Text_SwaggerTaught: @ 82C6F9E .string "I'll just praise my POKéMON from now\n" .string "on without the swagger.$" -MauvilleCity_Text_2C6FDB: @ 82C6FDB +MoveTutor_Text_RolloutTeach: @ 82C6FDB .string "Did you know that you can go from\n" .string "here a long way in that direction\l" .string "without changing direction?\p" @@ -35,19 +35,19 @@ MauvilleCity_Text_2C6FDB: @ 82C6FDB .string "I can teach one the move ROLLOUT\n" .string "if you'd like.$" -MauvilleCity_Text_2C70C4: @ 82C70C4 +MoveTutor_Text_RolloutDeclined: @ 82C70C4 .string "You don't need to be shy about it.\n" .string "Let's roll!$" -MauvilleCity_Text_2C70F3: @ 82C70F3 +MoveTutor_Text_RolloutWhichMon: @ 82C70F3 .string "Ehehe, sure thing! It'd be great if\n" .string "the POKéMON looked like me.$" -MauvilleCity_Text_2C7133: @ 82C7133 +MoveTutor_Text_RolloutTaught: @ 82C7133 .string "Rolling around in the grass makes me\n" .string "happy. Come on, let's roll!$" -VerdanturfTown_PokemonCenter_1F_Text_2C7174: @ 82C7174 +MoveTutor_Text_FuryCutterTeach: @ 82C7174 .string "There's a move that gets stronger\n" .string "when you keep using it in a row.\p" .string "It's a BUG-type move, and it is\n" @@ -55,18 +55,18 @@ VerdanturfTown_PokemonCenter_1F_Text_2C7174: @ 82C7174 .string "It's called FURY CUTTER.\n" .string "Want me to teach it to a POKéMON?$" -VerdanturfTown_PokemonCenter_1F_Text_2C7221: @ 82C7221 +MoveTutor_Text_FuryCutterDeclined: @ 82C7221 .string "We're not on the same wavelength.$" -VerdanturfTown_PokemonCenter_1F_Text_2C7243: @ 82C7243 +MoveTutor_Text_FuryCutterWhichMon: @ 82C7243 .string "Yay!\n" .string "Show me which POKéMON I should teach.$" -VerdanturfTown_PokemonCenter_1F_Text_2C726E: @ 82C726E +MoveTutor_Text_FuryCutterTaught: @ 82C726E .string "I get a thrill watching to see if\n" .string "the move keeps hitting in succession!$" -LavaridgeTown_House_Text_2C72B6: @ 82C72B6 +MoveTutor_MimicTeach: @ 82C72B6 .string "Ah, young one!\p" .string "I am also a young one, but I mimic\n" .string "the styles and speech of the elderly\l" @@ -75,21 +75,21 @@ LavaridgeTown_House_Text_2C72B6: @ 82C72B6 .string "Would you agree to it if I were to\l" .string "offer to teach the move MIMIC?$" -LavaridgeTown_House_Text_2C737F: @ 82C737F +MoveTutor_MimicDeclined: @ 82C737F .string "Oh, boo! I wanted to teach MIMIC\n" .string "to your POKéMON!$" -LavaridgeTown_House_Text_2C73B1: @ 82C73B1 +MoveTutor_Text_MimicWhichMon: @ 82C73B1 .string "Fwofwo! And so I shall!\n" .string "Let me see the POKéMON\l" .string "you wish me to teach.$" -LavaridgeTown_House_Text_2C73F6: @ 82C73F6 +MoveTutor_Text_MimicTaught: @ 82C73F6 .string "MIMIC is a move of great depth.\p" .string "Could you execute it to perfection\n" .string "as well as me…?$" -FallarborTown_Mart_Text_2C7449: @ 82C7449 +MoveTutor_Text_MetronomeTeach: @ 82C7449 .string "I want all sorts of things!\n" .string "But I used up my allowance…\p" .string "Wouldn't it be nice if there were\n" @@ -100,22 +100,22 @@ FallarborTown_Mart_Text_2C7449: @ 82C7449 .string "Money won't appear, but your POKéMON\n" .string "will waggle a finger. Yes?$" -FallarborTown_Mart_Text_2C7556: @ 82C7556 +MoveTutor_Text_MetronomeDeclined: @ 82C7556 .string "Okay. I'll be here if you change\n" .string "your mind.$" -FallarborTown_Mart_Text_2C7582: @ 82C7582 +MoveTutor_Text_MetronomeWhichMon: @ 82C7582 .string "Okay! I'll teach it!\n" .string "Which POKéMON should I teach?$" -FallarborTown_Mart_Text_2C75B5: @ 82C75B5 +MoveTutor_Text_MetronomeTaught: @ 82C75B5 .string "When a POKéMON waggles its finger\n" .string "like a METRONOME, all sorts of nice\l" .string "things happen.\p" .string "Wouldn't it be nice if we could\n" .string "use it, too?$" -FortreeCity_House2_Text_2C7637: @ 82C7637 +MoveTutor_Text_SleepTalkTeach: @ 82C7637 .string "Humph! My wife relies on HIDDEN\n" .string "POWER to stay awake.\p" .string "She should just take a nap like I do,\n" @@ -123,21 +123,21 @@ FortreeCity_House2_Text_2C7637: @ 82C7637 .string "I can teach your POKéMON how to\n" .string "SLEEP TALK instead. Interested?$" -FortreeCity_House2_Text_2C76E2: @ 82C76E2 +MoveTutor_Text_SleepTalkDeclined: @ 82C76E2 .string "Oh, fine, fine. You want to stay awake\n" .string "with HIDDEN POWER, too…$" -FortreeCity_House2_Text_2C7721: @ 82C7721 +MoveTutor_Text_SleepTalkWhichMon: @ 82C7721 .string "Ah, an appreciative child!\n" .string "Which POKéMON should I teach?$" -FortreeCity_House2_Text_2C775A: @ 82C775A +MoveTutor_Text_SleepTalkTaught: @ 82C775A .string "I've never once gotten my wife's\n" .string "coin trick right.\p" .string "I would be happy if I got it right\n" .string "even as I SLEEP TALK…$" -LilycoveCity_DepartmentStoreRooftop_Text_2C77C6: @ 82C77C6 +MoveTutor_Text_SubstituteTeach: @ 82C77C6 .string "When I see the wide world from up\n" .string "here on the roof…\p" .string "I think about how nice it would be\n" @@ -148,22 +148,22 @@ LilycoveCity_DepartmentStoreRooftop_Text_2C77C6: @ 82C77C6 .string "I know! Would you be interested in\n" .string "having a POKéMON learn SUBSTITUTE?$" -LilycoveCity_DepartmentStoreRooftop_Text_2C78D1: @ 82C78D1 +MoveTutor_Text_SubstituteDeclined: @ 82C78D1 .string "Oh, no?\p" .string "A POKéMON can make a copy of\n" .string "itself using it, you know.$" -LilycoveCity_DepartmentStoreRooftop_Text_2C7911: @ 82C7911 +MoveTutor_Text_SubstituteWhichMon: @ 82C7911 .string "Giggle…\n" .string "Which POKéMON do you want me to\l" .string "teach SUBSTITUTE?$" -LilycoveCity_DepartmentStoreRooftop_Text_2C794B: @ 82C794B +MoveTutor_Text_SubstituteTaught: @ 82C794B .string "We human beings should enjoy our\n" .string "own lives to the utmost!\p" .string "I hope you'll get that way, too!$" -MossdeepCity_Text_2C79A6: @ 82C79A6 +MoveTutor_Text_DynamicPunchTeach: @ 82C79A6 .string "I can't do this anymore!\p" .string "It's utterly hopeless!\p" .string "I'm a FIGHTING-type TRAINER,\n" @@ -176,19 +176,19 @@ MossdeepCity_Text_2C79A6: @ 82C79A6 .string "Or do you want me to teach your\n" .string "POKéMON DYNAMICPUNCH?$" -MossdeepCity_Text_2C7AD4: @ 82C7AD4 +MoveTutor_Text_DynamicPunchDeclined: @ 82C7AD4 .string "Darn! You're even making fun of me?\n" .string "Punch! Punch! Punch!$" -MossdeepCity_Text_2C7B0D: @ 82C7B0D +MoveTutor_Text_DynamicPunchWhichMon: @ 82C7B0D .string "What? You do? You're a good person!\n" .string "Which POKéMON should I teach?$" -MossdeepCity_Text_2C7B4F: @ 82C7B4F +MoveTutor_Text_DynamicPunchTaught: @ 82C7B4F .string "I want you to win at the MOSSDEEP GYM\n" .string "using that DYNAMICPUNCH!$" -SootopolisCity_PokemonCenter_1F_Text_2C7B8E: @ 82C7B8E +MoveTutor_Text_DoubleEdgeTeach: @ 82C7B8E .string "Sigh…\p" .string "SOOTOPOLIS's GYM LEADER is really\n" .string "lovably admirable.\p" @@ -199,19 +199,19 @@ SootopolisCity_PokemonCenter_1F_Text_2C7B8E: @ 82C7B8E .string "Please, let me teach your POKéMON\n" .string "the move DOUBLE-EDGE!$" -SootopolisCity_PokemonCenter_1F_Text_2C7C7E: @ 82C7C7E +MoveTutor_Text_DoubleEdgeDeclined: @ 82C7C7E .string "Oh…\n" .string "Even you rejected me…$" -SootopolisCity_PokemonCenter_1F_Text_2C7C98: @ 82C7C98 +MoveTutor_Text_DoubleEdgeWhichMon: @ 82C7C98 .string "Okay, which POKéMON should I teach\n" .string "DOUBLE-EDGE?$" -SootopolisCity_PokemonCenter_1F_Text_2C7CC8: @ 82C7CC8 +MoveTutor_Text_DoubleEdgeTaught: @ 82C7CC8 .string "I won't live for love anymore!\n" .string "I'll become tough!$" -PacifidlogTown_PokemonCenter_1F_Text_2C7CFA: @ 82C7CFA +MoveTutor_Text_ExplosionTeach: @ 82C7CFA .string "I don't intend to be going nowhere\n" .string "fast in the sticks like this forever.\p" .string "You watch me, I'll get out to the city\n" @@ -221,15 +221,15 @@ PacifidlogTown_PokemonCenter_1F_Text_2C7CFA: @ 82C7CFA .string "If you overheard that, I'll happily\n" .string "teach EXPLOSION to your POKéMON!$" -PacifidlogTown_PokemonCenter_1F_Text_2C7E04: @ 82C7E04 +MoveTutor_Text_ExplosionDeclined: @ 82C7E04 .string "Gaah! You're turning me down because\n" .string "I live in the country?$" -PacifidlogTown_PokemonCenter_1F_Text_2C7E40: @ 82C7E40 +MoveTutor_Text_ExplosionWhichMon: @ 82C7E40 .string "Fine! An EXPLOSION it is!\n" .string "Which POKéMON wants to blow up?$" -PacifidlogTown_PokemonCenter_1F_Text_2C7E7A: @ 82C7E7A +MoveTutor_Text_ExplosionTaught: @ 82C7E7A .string "For a long time, I've taught POKéMON\n" .string "how to use EXPLOSION, but I've yet\l" .string "to ignite my own EXPLOSION…\p" diff --git a/include/constants/battle_pike.h b/include/constants/battle_pike.h new file mode 100644 index 000000000..e92c4a006 --- /dev/null +++ b/include/constants/battle_pike.h @@ -0,0 +1,49 @@ +#ifndef GUARD_CONSTANTS_BATTLE_PIKE_H +#define GUARD_CONSTANTS_BATTLE_PIKE_H + +#define PIKE_ROOM_SINGLE_BATTLE 0 +#define PIKE_ROOM_HEAL_FULL 1 +#define PIKE_ROOM_NPC 2 +#define PIKE_ROOM_STATUS 3 +#define PIKE_ROOM_HEAL_PART 4 +#define PIKE_ROOM_WILD_MONS 5 +#define PIKE_ROOM_HARD_BATTLE 6 +#define PIKE_ROOM_DOUBLE_BATTLE 7 +#define PIKE_ROOM_BRAIN 8 + +// For the room with a status effect. +#define PIKE_STATUS_KIRLIA 0 +#define PIKE_STATUS_DUSCLOPS 1 + +// Function IDs for sBattlePikeFunctions / CallBattlePikeFunction +#define BATTLE_PIKE_FUNC_SET_ROOM_TYPE 0 +#define BATTLE_PIKE_FUNC_GET_DATA 1 +#define BATTLE_PIKE_FUNC_SET_DATA 2 +#define BATTLE_PIKE_FUNC_IN_FINAL_ROOM 3 +#define BATTLE_PIKE_FUNC_SET_UP_ROOM_OBJECTS 4 +#define BATTLE_PIKE_FUNC_GET_ROOM_TYPE 5 +#define BATTLE_PIKE_FUNC_6 6 +#define BATTLE_PIKE_FUNC_7 7 +#define BATTLE_PIKE_FUNC_8 8 +#define BATTLE_PIKE_FUNC_NULL_9 9 +#define BATTLE_PIKE_FUNC_NULL_10 10 +#define BATTLE_PIKE_FUNC_GET_ROOM_STATUS 11 +#define BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON 12 +#define BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS 13 +#define BATTLE_PIKE_FUNC_BUFFER_NPC_MSG 14 +#define BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE 15 +#define BATTLE_PIKE_FUNC_IS_IN 16 +#define BATTLE_PIKE_FUNC_SET_HINT_ROOM 17 +#define BATTLE_PIKE_FUNC_SET_HINT_ROOM_ID 18 +#define BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT 19 +#define BATTLE_PIKE_FUNC_CLEAR_TRAINER_IDS 20 +#define BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG 21 +#define BATTLE_PIKE_FUNC_GET_QUEEN_FIGHT_TYPE 22 +#define BATTLE_PIKE_FUNC_HEAL_MONS_BEFORE_QUEEN 23 +#define BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED 24 +#define BATTLE_PIKE_FUNC_CAN_PARTY_BE_HEALED 25 +#define BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS 26 +#define BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS 27 +#define BATTLE_PIKE_FUNC_INIT_CHALLENGE 28 + +#endif // GUARD_CONSTANTS_BATTLE_PIKE_H diff --git a/include/constants/battle_pyramid.h b/include/constants/battle_pyramid.h new file mode 100644 index 000000000..0d59ae94d --- /dev/null +++ b/include/constants/battle_pyramid.h @@ -0,0 +1,49 @@ +#ifndef GUARD_CONSTANTS_BATTLE_PYRAMID_H +#define GUARD_CONSTANTS_BATTLE_PYRAMID_H + +#define TOTAL_ROUNDS 20 +#define PICKUP_ITEMS_PER_ROUND 10 + +#define FLOOR_WALKABLE_METATILE 0x28D +#define FLOOR_EXIT_METATILE 0x28E + +#define HINT_EXIT_DIRECTION 0 +#define HINT_REMAINING_ITEMS 1 +#define HINT_REMAINING_TRAINERS 2 +#define HINT_EXIT_SHORT_REMAINING_TRAINERS 3 +#define HINT_EXIT_SHORT_REMAINING_ITEMS 4 +#define HINT_EXIT_MEDIUM_REMAINING_TRAINERS 5 +#define HINT_EXIT_MEDIUM_REMAINING_ITEMS 6 +#define HINT_EXIT_FAR_REMAINING_TRAINERS 7 +#define HINT_EXIT_FAR_REMAINING_ITEMS 8 + +#define OBJ_TRAINERS 0 +#define OBJ_ITEMS 1 + +#define OBJ_POSITIONS_UNIFORM 0 +#define OBJ_POSITIONS_IN_AND_NEAR_ENTRANCE 1 +#define OBJ_POSITIONS_IN_AND_NEAR_EXIT 2 +#define OBJ_POSITIONS_NEAR_ENTRANCE 3 +#define OBJ_POSITIONS_NEAR_EXIT 4 + +// Functions IDs for sBattlePyramidFunctions / CallBattlePyramidFunction +#define BATTLE_PYRAMID_FUNC_INIT_CHALLENGE 0 +#define BATTLE_PYRAMID_FUNC_GET_DATA 1 +#define BATTLE_PYRAMID_FUNC_SET_DATA 2 +#define BATTLE_PYRAMID_FUNC_3 3 +#define BATTLE_PYRAMID_FUNC_SET_REWARD 4 +#define BATTLE_PYRAMID_FUNC_GIVE_REWARD 5 +#define BATTLE_PYRAMID_FUNC_SEED_FLOOR 6 +#define BATTLE_PYRAMID_FUNC_SET_ITEM 7 +#define BATTLE_PYRAMID_FUNC_HIDE_ITEM 8 +#define BATTLE_PYRAMID_FUNC_INIT_TRAINERS 9 +#define BATTLE_PYRAMID_FUNC_SHOW_HINT_TEXT 10 +#define BATTLE_PYRAMID_FUNC_UPDATE_STREAK 11 +#define BATTLE_PYRAMID_FUNC_IS_IN 12 +#define BATTLE_PYRAMID_FUNC_UPDATE_LIGHT 13 +#define BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS 14 +#define BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE 15 +#define BATTLE_PYRAMID_FUNC_16 16 +#define BATTLE_PYRAMID_FUNC_RESTORE_PARTY 17 + +#endif // GUARD_CONSTANTS_BATTLE_PYRAMID_H diff --git a/include/constants/field_poison.h b/include/constants/field_poison.h new file mode 100644 index 000000000..f74c3fb56 --- /dev/null +++ b/include/constants/field_poison.h @@ -0,0 +1,12 @@ +#ifndef GUARD_CONSTANTS_FIELD_POISON_H +#define GUARD_CONSTANTS_FIELD_POISON_H + +#define FLDPSN_NONE 0 +#define FLDPSN_PSN 1 +#define FLDPSN_FNT 2 + +#define FLDPSN_NO_WHITEOUT 0 +#define FLDPSN_WHITEOUT 1 +#define FLDPSN_FRONTIER_WHITEOUT 2 + +#endif //GUARD_CONSTANTS_FIELD_POISON_H
\ No newline at end of file diff --git a/include/constants/flags.h b/include/constants/flags.h index d90451ad7..750990697 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -925,7 +925,7 @@ #define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN 0x3C7 #define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL 0x3C8 #define FLAG_HIDE_FORTREE_CITY_KECLEON 0x3C9 -#define FLAG_HIDE_ROUTE_120_KECLEON_1 0x3CA +#define FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_INVISIBLE 0x3CA #define FLAG_HIDE_LILYCOVE_CITY_RIVAL 0x3CB #define FLAG_HIDE_ROUTE_120_STEVEN 0x3CC #define FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN 0x3CD @@ -936,14 +936,14 @@ #define FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2 0x3D2 #define FLAG_HIDE_OLDALE_TOWN_RIVAL 0x3D3 #define FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE 0x3D4 -#define FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE 0x3D5 -#define FLAG_HIDE_ROUTE_120_KECLEON_2 0x3D6 +#define FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_VISIBLE 0x3D5 +#define FLAG_HIDE_ROUTE_120_KECLEON_1 0x3D6 #define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN 0x3D7 #define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN 0x3D8 -#define FLAG_HIDE_ROUTE_120_KECLEON_3 0x3D9 -#define FLAG_HIDE_ROUTE_120_KECLEON_4 0x3DA -#define FLAG_HIDE_ROUTE_120_KECLEON_5 0x3DB -#define FLAG_HIDE_ROUTE_120_KECLEON_6 0x3DC +#define FLAG_HIDE_ROUTE_120_KECLEON_2 0x3D9 +#define FLAG_HIDE_ROUTE_120_KECLEON_3 0x3DA +#define FLAG_HIDE_ROUTE_120_KECLEON_4 0x3DB +#define FLAG_HIDE_ROUTE_120_KECLEON_5 0x3DC #define FLAG_HIDE_ROUTE_119_KECLEON_1 0x3DD #define FLAG_HIDE_ROUTE_119_KECLEON_2 0x3DE #define FLAG_HIDE_ROUTE_101_BOY 0x3DF diff --git a/include/constants/party_menu.h b/include/constants/party_menu.h new file mode 100644 index 000000000..213263b47 --- /dev/null +++ b/include/constants/party_menu.h @@ -0,0 +1,52 @@ +#ifndef GUARD_CONSTANTS_PARTY_MENU_H +#define GUARD_CONSTANTS_PARTY_MENU_H + +#define AILMENT_NONE 0 +#define AILMENT_PSN 1 +#define AILMENT_PRZ 2 +#define AILMENT_SLP 3 +#define AILMENT_FRZ 4 +#define AILMENT_BRN 5 +#define AILMENT_PKRS 6 +#define AILMENT_FNT 7 + +#define PARTY_CHOOSE_MON 0 +#define PARTY_MUST_CHOOSE_MON 1 +#define PARTY_CANT_SWITCH 2 +#define PARTY_USE_ITEM_ON 3 +#define PARTY_ABILITY_PREVENTS 4 +#define PARTY_GIVE_ITEM 5 + +#define TUTOR_MOVE_MEGA_PUNCH 0 +#define TUTOR_MOVE_SWORDS_DANCE 1 +#define TUTOR_MOVE_MEGA_KICK 2 +#define TUTOR_MOVE_BODY_SLAM 3 +#define TUTOR_MOVE_DOUBLE_EDGE 4 +#define TUTOR_MOVE_COUNTER 5 +#define TUTOR_MOVE_SEISMIC_TOSS 6 +#define TUTOR_MOVE_MIMIC 7 +#define TUTOR_MOVE_METRONOME 8 +#define TUTOR_MOVE_SOFT_BOILED 9 +#define TUTOR_MOVE_DREAM_EATER 10 +#define TUTOR_MOVE_THUNDER_WAVE 11 +#define TUTOR_MOVE_EXPLOSION 12 +#define TUTOR_MOVE_ROCK_SLIDE 13 +#define TUTOR_MOVE_SUBSTITUTE 14 +#define TUTOR_MOVE_DYNAMIC_PUNCH 15 +#define TUTOR_MOVE_ROLLOUT 16 +#define TUTOR_MOVE_PSYCH_UP 17 +#define TUTOR_MOVE_SNORE 18 +#define TUTOR_MOVE_ICY_WIND 19 +#define TUTOR_MOVE_ENDURE 20 +#define TUTOR_MOVE_MUD_SLAP 21 +#define TUTOR_MOVE_ICE_PUNCH 22 +#define TUTOR_MOVE_SWAGGER 23 +#define TUTOR_MOVE_SLEEP_TALK 24 +#define TUTOR_MOVE_SWIFT 25 +#define TUTOR_MOVE_DEFENSE_CURL 26 +#define TUTOR_MOVE_THUNDER_PUNCH 27 +#define TUTOR_MOVE_FIRE_PUNCH 28 +#define TUTOR_MOVE_FURY_CUTTER 29 +#define TUTOR_MOVE_COUNT 30 + +#endif // GUARD_CONSTANTS_PARTY_MENU_H diff --git a/include/constants/trainer_hill.h b/include/constants/trainer_hill.h index 4aae1dbbc..cab56a5ac 100644 --- a/include/constants/trainer_hill.h +++ b/include/constants/trainer_hill.h @@ -11,7 +11,7 @@ #define TRAINER_HILL_FUNC_7 7 #define TRAINER_HILL_FUNC_8 8 #define TRAINER_HILL_FUNC_9 9 -#define TRAINER_HILL_FUNC_10 10 +#define TRAINER_HILL_FUNC_IS_IN 10 #define TRAINER_HILL_FUNC_11 11 #define TRAINER_HILL_FUNC_12 12 #define TRAINER_HILL_FUNC_13 13 diff --git a/include/event_scripts.h b/include/event_scripts.h index 02265413e..fbc7e04a2 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -548,7 +548,7 @@ extern const u8 EventScript_UseDive[]; extern const u8 EventScript_UseDiveUnderwater[]; extern const u8 EventScript_FallDownHole[]; extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8[]; -extern const u8 EventScript_Poison[]; +extern const u8 EventScript_FieldPoison[]; extern const u8 EventScript_EggHatch[]; extern const u8 UnusualWeather_EventScript_EndEventAndCleanup_1[]; extern const u8 IslandCave_EventScript_238EAF[]; @@ -558,7 +558,7 @@ extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6[]; extern const u8 RustboroCity_Gym_EventScript_21307B[]; extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224175[]; extern const u8 SSTidalCorridor_EventScript_23C050[]; -extern const u8 gUnknown_082A8350[]; +extern const u8 EventScript_FallDownHoleMtPyre[]; // Secret Base extern const u8 SecretBase_EventScript_PC[]; diff --git a/include/field_poison.h b/include/field_poison.h index a23a93ca5..e9de7878e 100644 --- a/include/field_poison.h +++ b/include/field_poison.h @@ -7,13 +7,7 @@ // Exported ROM declarations -enum { - FLDPSN_NONE, - FLDPSN_PSN, - FLDPSN_FNT -}; - -void ExecuteWhiteOut(void); +void TryFieldPoisonWhiteOut(void); s32 DoPoisonFieldEffect(void); #endif //GUARD_FIELD_POISON_H diff --git a/include/party_menu.h b/include/party_menu.h index d76e50788..84b6c1ad8 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -4,62 +4,7 @@ #include "main.h" #include "task.h" -enum -{ - AILMENT_NONE, - AILMENT_PSN, - AILMENT_PRZ, - AILMENT_SLP, - AILMENT_FRZ, - AILMENT_BRN, - AILMENT_PKRS, - AILMENT_FNT -}; - -enum -{ - PARTY_CHOOSE_MON, - PARTY_MUST_CHOOSE_MON, - PARTY_CANT_SWITCH, - PARTY_USE_ITEM_ON, - PARTY_ABILITY_PREVENTS, - PARTY_GIVE_ITEM, -}; - -enum -{ - TUTOR_MOVE_MEGA_PUNCH, - TUTOR_MOVE_SWORDS_DANCE, - TUTOR_MOVE_MEGA_KICK, - TUTOR_MOVE_BODY_SLAM, - TUTOR_MOVE_DOUBLE_EDGE, - TUTOR_MOVE_COUNTER, - TUTOR_MOVE_SEISMIC_TOSS, - TUTOR_MOVE_MIMIC, - TUTOR_MOVE_METRONOME, - TUTOR_MOVE_SOFT_BOILED, - TUTOR_MOVE_DREAM_EATER, - TUTOR_MOVE_THUNDER_WAVE, - TUTOR_MOVE_EXPLOSION, - TUTOR_MOVE_ROCK_SLIDE, - TUTOR_MOVE_SUBSTITUTE, - TUTOR_MOVE_DYNAMIC_PUNCH, - TUTOR_MOVE_ROLLOUT, - TUTOR_MOVE_PSYCH_UP, - TUTOR_MOVE_SNORE, - TUTOR_MOVE_ICY_WIND, - TUTOR_MOVE_ENDURE, - TUTOR_MOVE_MUD_SLAP, - TUTOR_MOVE_ICE_PUNCH, - TUTOR_MOVE_SWAGGER, - TUTOR_MOVE_SLEEP_TALK, - TUTOR_MOVE_SWIFT, - TUTOR_MOVE_DEFENSE_CURL, - TUTOR_MOVE_THUNDER_PUNCH, - TUTOR_MOVE_FIRE_PUNCH, - TUTOR_MOVE_FURY_CUTTER, - TUTOR_MOVE_COUNT -}; +#include "constants/party_menu.h" struct Struct203CEC8 { @@ -123,7 +68,7 @@ void sub_81B8448(void); void InitChooseHalfPartyForBattle(u8 unused); void sub_81B8558(void); void sub_81B8904(u8 initArg, MainCallback callback); -void sub_81B892C(void); +void OpenPartyMenuForMoveTutor(void); void sub_81B8958(void); void OpenPartyMenuInBattle(u8 arg); void sub_81B89F0(void); diff --git a/include/trainer_hill.h b/include/trainer_hill.h index 31480287a..a592ef580 100644 --- a/include/trainer_hill.h +++ b/include/trainer_hill.h @@ -57,7 +57,7 @@ u8 GetTrainerHillTrainerFrontSpriteId(u16 trainerId); void InitTrainerHillBattleStruct(void); void FreeTrainerHillBattleStruct(void); void CopyTrainerHillTrainerText(u8 which, u16 trainerId); -bool8 sub_81D5C18(void); +bool8 InTrainerHillChallenge(void); void nullsub_129(void); void PrintOnTrainerHillRecordsWindow(void); void sub_81D5DF8(void); diff --git a/src/battle_pike.c b/src/battle_pike.c index bfb87f679..a81d88145 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -22,20 +22,7 @@ #include "constants/trainers.h" #include "constants/species.h" #include "constants/moves.h" - -#define PIKE_ROOM_SINGLE_BATTLE 0 -#define PIKE_ROOM_HEAL_FULL 1 -#define PIKE_ROOM_NPC 2 -#define PIKE_ROOM_STATUS 3 -#define PIKE_ROOM_HEAL_PART 4 -#define PIKE_ROOM_WILD_MONS 5 -#define PIKE_ROOM_HARD_BATTLE 6 -#define PIKE_ROOM_DOUBLE_BATTLE 7 -#define PIKE_ROOM_BRAIN 8 - -// For the room with a status effect. -#define PIKE_STATUS_KIRLIA 0 -#define PIKE_STATUS_DUSCLOPS 1 +#include "constants/battle_pike.h" struct PikeRoomNPC { diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 6bcf00748..6dcd4063b 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -27,6 +27,7 @@ #include "overworld.h" #include "event_scripts.h" #include "constants/battle_frontier.h" +#include "constants/battle_pyramid.h" #include "constants/event_objects.h" #include "constants/event_object_movement_constants.h" #include "constants/items.h" @@ -39,38 +40,7 @@ extern const struct MapLayout *const gMapLayouts[]; extern const u16 gUnknown_08D856C8[][16]; -#define TOTAL_ROUNDS 20 -#define PICKUP_ITEMS_PER_ROUND 10 -#define FLOOR_WALKABLE_METATILE 0x28D -#define FLOOR_EXIT_METATILE 0x28E -enum -{ - HINT_EXIT_DIRECTION, - HINT_REMAINING_ITEMS, - HINT_REMAINING_TRAINERS, - HINT_EXIT_SHORT_REMAINING_TRAINERS, - HINT_EXIT_SHORT_REMAINING_ITEMS, - HINT_EXIT_MEDIUM_REMAINING_TRAINERS, - HINT_EXIT_MEDIUM_REMAINING_ITEMS, - HINT_EXIT_FAR_REMAINING_TRAINERS, - HINT_EXIT_FAR_REMAINING_ITEMS, -}; - -enum -{ - OBJ_TRAINERS, - OBJ_ITEMS, -}; - -enum -{ - OBJ_POSITIONS_UNIFORM, - OBJ_POSITIONS_IN_AND_NEAR_ENTRANCE, - OBJ_POSITIONS_IN_AND_NEAR_EXIT, - OBJ_POSITIONS_NEAR_ENTRANCE, - OBJ_POSITIONS_NEAR_EXIT, -}; struct PyramidWildMon { diff --git a/src/battle_setup.c b/src/battle_setup.c index c2d7cb6c6..3c9de6b79 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1273,7 +1273,7 @@ void BattleSetup_StartTrainerBattle(void) MarkApproachingPyramidTrainersAsBattled(); } - else if (sub_81D5C18()) + else if (InTrainerHillChallenge()) { gBattleTypeFlags |= BATTLE_TYPE_TRAINER_HILL; @@ -1291,7 +1291,7 @@ void BattleSetup_StartTrainerBattle(void) gUnknown_03006080 = 0; gMain.savedCallback = CB2_EndTrainerBattle; - if (InBattlePyramid() || sub_81D5C18()) + if (InBattlePyramid() || InTrainerHillChallenge()) sub_80B0828(); else DoTrainerBattle(); @@ -1307,7 +1307,7 @@ static void CB2_EndTrainerBattle(void) } else if (IsPlayerDefeated(gBattleOutcome) == TRUE) { - if (InBattlePyramid() || sub_81D5C18()) + if (InBattlePyramid() || InTrainerHillChallenge()) SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); else SetMainCallback2(CB2_WhiteOut); @@ -1315,7 +1315,7 @@ static void CB2_EndTrainerBattle(void) else { SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); - if (!InBattlePyramid() && !sub_81D5C18()) + if (!InBattlePyramid() && !InTrainerHillChallenge()) { RegisterTrainerInMatchCall(); SetBattledTrainersFlags(); @@ -1361,7 +1361,7 @@ void ShowTrainerIntroSpeech(void) sub_80982B8(); } - else if (sub_81D5C18()) + else if (InTrainerHillChallenge()) { if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1) CopyTrainerHillTrainerText(2, LocalIdToHillTrainerId(gSpecialVar_LastTalked)); diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index f3f9be530..bde49b663 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -547,7 +547,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior) { if (UpdatePoisonStepCounter() == TRUE) { - ScriptContext1_SetupScript(EventScript_Poison); + ScriptContext1_SetupScript(EventScript_FieldPoison); return TRUE; } if (ShouldEggHatch()) @@ -733,7 +733,7 @@ static bool8 TryStartWarpEventScript(struct MapPosition *position, u16 metatileB } if (MetatileBehavior_IsMtPyreHole(metatileBehavior) == TRUE) { - ScriptContext1_SetupScript(gUnknown_082A8350); + ScriptContext1_SetupScript(EventScript_FallDownHoleMtPyre); return TRUE; } if (MetatileBehavior_IsMossdeepGymWarp(metatileBehavior) == TRUE) diff --git a/src/field_poison.c b/src/field_poison.c index 532c7f027..d10a28a76 100644 --- a/src/field_poison.c +++ b/src/field_poison.c @@ -14,6 +14,7 @@ #include "strings.h" #include "task.h" #include "trainer_hill.h" +#include "constants/field_poison.h" #include "constants/species.h" static bool32 IsMonValidSpecies(struct Pokemon *pokemon) @@ -62,7 +63,7 @@ static bool32 MonFaintedFromPoison(u8 partyIdx) return FALSE; } -static void Task_WhiteOut(u8 taskId) +static void Task_TryFieldPoisonWhiteOut(u8 taskId) { s16 *data = gTasks[taskId].data; switch (data[0]) @@ -89,18 +90,18 @@ static void Task_WhiteOut(u8 taskId) case 2: if (AllMonsFainted()) { - if (InBattlePyramid() | InBattlePike() || sub_81D5C18()) + if (InBattlePyramid() | InBattlePike() || InTrainerHillChallenge()) { - gSpecialVar_Result = 2; + gSpecialVar_Result = FLDPSN_FRONTIER_WHITEOUT; } else { - gSpecialVar_Result = 1; + gSpecialVar_Result = FLDPSN_WHITEOUT; } } else { - gSpecialVar_Result = 0; + gSpecialVar_Result = FLDPSN_NO_WHITEOUT; } EnableBothScriptContexts(); DestroyTask(taskId); @@ -108,9 +109,9 @@ static void Task_WhiteOut(u8 taskId) } } -void ExecuteWhiteOut(void) +void TryFieldPoisonWhiteOut(void) { - CreateTask(Task_WhiteOut, 80); + CreateTask(Task_TryFieldPoisonWhiteOut, 80); ScriptContext1_Stop(); } diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 9a5d47156..e6768167b 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -48,7 +48,7 @@ static bool32 WaitForWeatherFadeIn(void); static void task0A_mpl_807E31C(u8 taskId); static void sub_80AFA0C(u8 taskId); static void sub_80AFA88(u8 taskId); -static void task50_0807F0C8(u8); +static void Task_EnableScriptAfterMusicFade(u8 taskId); // const const u16 sFlashLevelPixelRadii[] = { 200, 72, 64, 56, 48, 40, 32, 24, 0 }; @@ -1231,13 +1231,13 @@ void sub_80B058C(void) gTasks[taskId].data[0] = 6; } -void sub_80B05B4(void) +void Script_FadeOutMapMusic(void) { Overworld_FadeOutMapMusic(); - CreateTask(task50_0807F0C8, 80); + CreateTask(Task_EnableScriptAfterMusicFade, 80); } -static void task50_0807F0C8(u8 taskId) +static void Task_EnableScriptAfterMusicFade(u8 taskId) { if (BGMusicStopped() == TRUE) { diff --git a/src/party_menu.c b/src/party_menu.c index b3938ef2a..03c013f39 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -6756,7 +6756,7 @@ void sub_81B8904(u8 initArg, MainCallback callback) InitPartyMenu(initArg, 0, 0, 0, 0, sub_81B1370, callback); } -void sub_81B892C(void) +void OpenPartyMenuForMoveTutor(void) { InitPartyMenu(0, 0, 12, 0, 4, sub_81B1370, CB2_ReturnToFieldContinueScriptPlayMapMusic); } diff --git a/src/pokemon.c b/src/pokemon.c index 55f9a93f3..c555ca3d7 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5704,7 +5704,7 @@ u8 GetTrainerEncounterMusicId(u16 trainerOpponentId) { if (InBattlePyramid()) return GetBattlePyramindTrainerEncounterMusicId(trainerOpponentId); - else if (sub_81D5C18()) + else if (InTrainerHillChallenge()) return GetTrainerEncounterMusicIdInTrainerHill(trainerOpponentId); else return TRAINER_ENCOUNTER_MUSIC(trainerOpponentId); diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c index 3cbf6ecd2..41ad37fbf 100644 --- a/src/post_battle_event_funcs.c +++ b/src/post_battle_event_funcs.c @@ -86,7 +86,7 @@ int GameClear(void) return 0; } -bool8 sp0C8_whiteout_maybe(void) +bool8 SetCB2WhiteOut(void) { SetMainCallback2(CB2_WhiteOut); return FALSE; diff --git a/src/trainer_hill.c b/src/trainer_hill.c index 995dc164a..af6b0621d 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -63,7 +63,7 @@ static void TrainerHillGetChallengeStatus(void); static void sub_81D5B2C(void); static void sub_81D5BBC(void); static void sub_81D5C00(void); -static void sub_81D5C5C(void); +static void GetInTrainerHill(void); static void sub_81D62B4(void); static void sub_81D64AC(void); static void sub_81D64DC(void); @@ -231,7 +231,7 @@ static void (* const sHillFunctions[])(void) = sub_81D5B2C, sub_81D5BBC, sub_81D5C00, - sub_81D5C5C, + GetInTrainerHill, sub_81D62B4, sub_81D64AC, sub_81D64DC, @@ -534,7 +534,7 @@ static void sub_81D5C00(void) FreeDataStruct(); } -bool8 sub_81D5C18(void) +bool8 InTrainerHillChallenge(void) { if (VarGet(VAR_TRAINER_HILL_IS_ACTIVE) == 0) return FALSE; @@ -546,9 +546,9 @@ bool8 sub_81D5C18(void) return FALSE; } -static void sub_81D5C5C(void) +static void GetInTrainerHill(void) { - if (!sub_81D5C18()) + if (!InTrainerHillChallenge()) gSpecialVar_Result = 0; else gSpecialVar_Result = 1; @@ -997,7 +997,7 @@ static void sub_81D6518(void) bool32 sub_81D6534(void) { - if (!sub_81D5C18() || GetCurrentTrainerHillMapId() == 6) + if (!InTrainerHillChallenge() || GetCurrentTrainerHillMapId() == 6) return FALSE; sub_81D5C00(); |