diff options
Diffstat (limited to 'data')
388 files changed, 2194 insertions, 13843 deletions
diff --git a/data/easy_chat.s b/data/easy_chat.s deleted file mode 100644 index 4725f15d9..000000000 --- a/data/easy_chat.s +++ /dev/null @@ -1,480 +0,0 @@ -#include "constants/easy_chat.h" -#include "constants/moves.h" -#include "constants/species.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_08597530:: @ 8597530 - .4byte 0x0000001a - .4byte sub_811A8CC - .4byte 0x00000019 - .4byte sub_811A8F0 - .4byte 0x0000001c - .4byte sub_811A914 - .4byte 0x0000001b - .4byte sub_811A938 - -gEasyChatScreenTemplates:: @ 8597550 - .byte 0x00, 0x02, 0x02, 0x00 - - .align 2 - .4byte gText_Profile - .4byte gText_CombineFourWordsOrPhrases - .4byte gText_AndMakeYourProfile - .4byte gText_YourProfile - .4byte gText_IsAsShownOkay - - .byte 0x01, 0x02, 0x03, 0x01 - - .align 2 - .4byte gText_AtTheBattlesStart - .4byte gText_CombineSixWordsOrPhrases - .4byte gText_AndMakeAMessage - .4byte gText_YourFeelingAtTheBattlesStart - .4byte gText_IsAsShownOkay - - .byte 0x02, 0x02, 0x03, 0x01 - - .align 2 - .4byte gText_UponWinningABattle - .4byte gText_CombineSixWordsOrPhrases - .4byte gText_AndMakeAMessage - .4byte gText_WhatYouSayIfYouWin - .4byte gText_IsAsShownOkay - - .byte 0x03, 0x02, 0x03, 0x01 - - .align 2 - .4byte gText_UponLosingABattle - .4byte gText_CombineSixWordsOrPhrases - .4byte gText_AndMakeAMessage - .4byte gText_WhatYouSayIfYouLose - .4byte gText_IsAsShownOkay - - .byte 0x04, 0x02, 0x05, 0x02 - - .align 2 - .4byte NULL - .4byte gText_CombineNineWordsOrPhrases - .4byte gText_AndMakeAMessage2 - .4byte gText_TheMailMessage - .4byte gText_IsAsShownOkay - - .byte 0x05, 0x02, 0x02, 0x05 - - .align 2 - .4byte gText_Interview - .4byte gText_CombineFourWordsOrPhrases - .4byte gText_LetsReplyToTheInterview - .4byte gText_TheAnswer - .4byte gText_IsAsShownOkay - - .byte 0x06, 0x02, 0x03, 0x01 - - .align 2 - .4byte gText_TheBardsSong - .4byte gText_ChangeJustOneWordOrPhrase - .4byte gText_AndImproveTheBardsSong - .4byte gText_TheBardsSong2 - .4byte gText_IsAsShownOkay - - .byte 0x07, 0x01, 0x01, 0x04 - - .align 2 - .4byte gText_Interview - .4byte gText_FindWordsThatDescribeYour - .4byte gText_FeelingsRightNow - .4byte gText_TheAnswer - .4byte gText_IsAsShownOkay - - .byte 0x09, 0x02, 0x01, 0x03 - - .align 2 - .4byte gText_WhatsHipAndHappening - .4byte gText_CombineTwoWordsOrPhrases - .4byte gText_AndMakeATrendySaying - .4byte gText_TheTrendySaying - .4byte gText_IsAsShownOkay - - .byte 0x10, 0x02, 0x05, 0x87 - - .align 2 - .4byte NULL - .4byte gText_AfterYouHaveReadTheQuiz - .4byte gText_QuestionPressTheAButton - .4byte NULL - .4byte NULL - - .byte 0x0f, 0x01, 0x01, 0x86 - - .align 2 - .4byte gText_TheQuizAnswerIs - .4byte gText_OutOfTheListedChoices - .4byte gText_SelectTheAnswerToTheQuiz - .4byte gText_TheAnswerColon - .4byte gText_IsAsShownOkay - - .byte 0x11, 0x02, 0x05, 0x88 - - .align 2 - .4byte NULL - .4byte gText_CombineNineWordsOrPhrases - .4byte gText_AndCreateAQuiz - .4byte gText_IsThisQuizOK - .4byte NULL - - .byte 0x12, 0x01, 0x01, 0x86 - - .align 2 - .4byte gText_TheQuizAnswerIs - .4byte gText_PickAWordOrPhraseAnd - .4byte gText_SetTheQuizAnswer - .4byte gText_IsThisQuizOK - .4byte NULL - - .byte 0x06, 0x02, 0x03, 0x01 - - .align 2 - .4byte gText_TheBardsSong - .4byte gText_ChangeJustOneWordOrPhrase - .4byte gText_AndImproveTheBardsSong - .4byte gText_TheBardsSong2 - .4byte gText_IsAsShownOkay - - .byte 0x13, 0x02, 0x03, 0x01 - - .align 2 - .4byte gText_ApprenticesPhrase - .4byte gText_FindWordsWhichFit - .4byte gText_TheTrainersImage - .4byte gText_ApprenticePhrase - .4byte gText_IsAsShownOkay - - .byte 0x0d, 0x02, 0x01, 0x03 - - .align 2 - .4byte gText_GoodSaying - .4byte gText_CombineTwoWordsOrPhrases2 - .4byte gText_ToTeachHerAGoodSaying - .4byte gText_TheAnswer - .4byte gText_IsAsShownOkay - - .byte 0x0a, 0x01, 0x01, 0x04 - - .align 2 - .4byte gText_Interview - .4byte gText_FindWordsThatDescribeYour - .4byte gText_FeelingsRightNow - .4byte gText_TheAnswer - .4byte gText_IsAsShownOkay - - .byte 0x0c, 0x01, 0x01, 0x04 - - .align 2 - .4byte gText_Interview - .4byte gText_FindWordsThatDescribeYour - .4byte gText_FeelingsRightNow - .4byte gText_TheAnswer - .4byte gText_IsAsShownOkay - - .byte 0x0b, 0x01, 0x01, 0x04 - - .align 2 - .4byte gText_Interview - .4byte gText_FindWordsThatDescribeYour - .4byte gText_FeelingsRightNow - .4byte gText_TheAnswer - .4byte gText_IsAsShownOkay - - .byte 0x0e, 0x01, 0x01, 0x04 - - .align 2 - .4byte gText_FansQuestion - .4byte gText_FindWordsWhichFit - .4byte gText_TheTrainersImage - .4byte gText_TheImage - .4byte gText_IsAsShownOkay - - .byte 0x14, 0x02, 0x02, 0x00 - - .align 2 - .4byte gText_Questionnaire - .4byte gText_CombineFourWordsOrPhrases - .4byte gText_AndFillOutTheQuestionnaire - .4byte gText_TheAnswer - .4byte gText_IsAsShownOkay - -gUnknown_08597748:: @ 8597748 - .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00 - .byte 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00 - .byte 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13 - .byte 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a - -gUnknown_08597764:: @ 8597764 - .2byte 0x0209, 0x140b, 0x1030, 0x102a - -gUnknown_0859776C:: @ 859776C - .2byte 0x1240, 0x0628 - .2byte 0x061f, 0x2204 - .2byte 0x1422, 0x0197 - .2byte 0x0415, 0x0198 - .2byte 0x2207, 0x0449 - - .align 2 -gUnknown_08597780:: @ 8597780 - .incbin "graphics/misc/interview_triangle_cursor.gbapal" - - .align 2 -gUnknown_085977A0:: @ 85977A0 - .incbin "graphics/misc/interview_triangle_cursor.4bpp" - - .align 2 -gUnknown_085977C0:: @ 85977C0 - .incbin "graphics/misc/interview_arrow.4bpp" - - .align 2 -gUnknown_085978C0:: @ 85978C0 - .incbin "graphics/misc/interview_buttons.4bpp" - - .align 2 -gUnknown_085979C0:: @ 85979C0 - .incbin "graphics/misc/interview_frame.gbapal" - - .align 2 -gUnknown_085979E0:: @ 85979E0 - .incbin "graphics/misc/interview_frame.4bpp.lz" - - .align 2 -gUnknown_08597B14:: @ 8597B14 - .incbin "graphics/misc/interview_frame_orange.gbapal" - - .align 2 -gUnknown_08597B34:: @ 8597B34 - .incbin "graphics/misc/interview_frame_green.gbapal" - - .align 2 -gUnknown_08597B54:: @ 8597B54 - .incbin "graphics/misc/interview_frame_2.4bpp.lz" - - .align 2 -gUnknown_08597C1C:: @ 8597C1C - .incbin "graphics/misc/8597C1C.gbapal" - - .align 2 -gUnknown_08597C24:: @ 8597C24 - .incbin "graphics/misc/8597C24.gbapal" - -gUnknown_08597C30:: @ 8597C30 - .byte 0x83, 0x18, 0x04, 0x00, 0x63, 0x18, 0x06, 0x00, 0x03, 0x18, 0x0a, 0x00, 0xa3, 0x18, 0x02, 0x00, 0xb0, 0x0c, 0x02, 0x00, 0x83, 0x18, 0x04, 0x00, 0x89, 0x0c, 0x02, 0x01, 0x65, 0x14, 0x0a, 0x03 - .byte 0x03, 0x18, 0x0a, 0x02 - - .align 2 -gUnknown_08597C54:: @ 8597C54 - .4byte 0x000001c0, 0x000011dd, 0x002021e2, 0x000031fb - - .align 2 -gUnknown_08597C64:: @ 8597C64 - window_template 0x01, 0x06, 0x00, 0x12, 0x02, 0x0a, 0x0010 - window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0f, 0x000a - window_template 0x02, 0x01, 0x00, 0x1c, 0x20, 0x03, 0x0000 - null_window_template - - .align 2 -gUnknown_08597C84:: @ 8597C84 - window_template 0x00, 0x16, 0x09, 0x05, 0x04, 0x0f, 0x006a - -gUnknown_08597C8C:: @ 8597C8C - .string "{CLEAR 17}$" - - .align 2 -gUnknown_08597C90:: @ 8597C90 - .4byte gUnknown_862B810 - .4byte gUnknown_862B832 - .4byte gUnknown_862B84B - .4byte gUnknown_862B86C - - .align 2 -gUnknown_08597CA0:: @ 8597CA0 - obj_tiles gUnknown_085977A0, 0x0020, 0x0000 - obj_tiles gUnknown_085977C0, 0x0100, 0x0002 - obj_tiles gUnknown_085978C0, 0x0100, 0x0003 - null_obj_tiles - - .align 2 -gUnknown_08597CC0:: @ 8597CC0 - obj_pal gUnknown_08597780, 0x0000 - obj_pal gEasyChatCursor_Pal, 0x0001 - obj_pal gEasyChatRightWindow_Pal, 0x0002 - obj_pal gUnknown_085979C0, 0x0003 - null_obj_pal - - .align 2 -gUnknown_08597CE8:: @ 8597CE8 - obj_tiles gUnknown_085979E0, 0x0800, 0x0005 - obj_tiles gEasyChatCursor_Gfx, 0x1000, 0x0001 - obj_tiles gEasyChatRightWindow_Gfx, 0x0800, 0x0006 - obj_tiles gEasyChatMode_Gfx, 0x1000, 0x0004 - -gUnknown_08597D08:: @ 8597D08 - .byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x00 - - .align 2 -gOamData_8597D10:: @ 8597D10 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0C00 - - .align 2 -gUnknown_08597D18:: @ 8597D18 - spr_template 0x0000, 0x0000, gOamData_8597D10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_811DF28 - - .align 2 -gUnknown_08597D30:: @ 8597D30 - .2byte 0x4000, 0xc000, 0x0400, 0x0000 - - .align 2 -gUnknown_08597D38:: @ 8597D38 - .2byte 0x0000, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597D40:: @ 8597D40 - .2byte 0x0020, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597D48:: @ 8597D48 - .2byte 0x0040, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597D50:: @ 8597D50 - .2byte 0x0060, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597D58:: @ 8597D58 - .4byte gUnknown_08597D38 - .4byte gUnknown_08597D40 - .4byte gUnknown_08597D48 - .4byte gUnknown_08597D50 - - .align 2 -gUnknown_08597D68:: @ 8597D68 - spr_template 0x0001, 0x0001, gUnknown_08597D30, gUnknown_08597D58, NULL, gDummySpriteAffineAnimTable, sub_811DF28 - - .align 2 -gUnknown_08597D80:: @ 8597D80 - .2byte 0x4000, 0xc000, 0x0400, 0x0000 - - .align 2 -gUnknown_08597D88:: @ 8597D88 - .2byte 0x0060, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597D90:: @ 8597D90 - .2byte 0x0040, 0x0004, 0x0020, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_08597D9C:: @ 8597D9C - .2byte 0x0040, 0x0004, 0x0000, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_08597DA8:: @ 8597DA8 - .2byte 0x0040, 0x0004, 0x0060, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597DB4:: @ 8597DB4 - .2byte 0x0040, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_08597DBC:: @ 8597DBC - .4byte gUnknown_08597D88 - .4byte gUnknown_08597D90 - .4byte gUnknown_08597D9C - .4byte gUnknown_08597DA8 - .4byte gUnknown_08597DB4 - - .align 2 -gUnknown_08597DD0:: @ 8597DD0 - spr_template 0x0004, 0x0002, gUnknown_08597D80, gUnknown_08597DBC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_08597DE8:: @ 8597DE8 - .2byte 0x0000, 0xc000, 0x0c00, 0x0000 - - .align 2 -gUnknown_08597DF0:: @ 8597DF0 - spr_template 0x0006, 0x0002, gUnknown_08597DE8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_08597E08:: @ 8597E08 - .2byte 0x4000, 0x4000, 0x0400, 0x0000 - - .align 2 -gUnknown_08597E10:: @ 8597E10 - .2byte 0x0000, 0x4000, 0x0400, 0x0000 - - .align 2 -gUnknown_08597E18:: @ 8597E18 - .2byte 0x0000, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597E20:: @ 8597E20 - .2byte 0x0004, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08597E28:: @ 8597E28 - .4byte gUnknown_08597E18 - .4byte gUnknown_08597E20 - - .align 2 -gUnknown_08597E30:: @ 8597E30 - spr_template 0x0003, 0x0002, gUnknown_08597E08, gUnknown_08597E28, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_08597E48:: @ 8597E48 - spr_template 0x0002, 0x0002, gUnknown_08597E10, gUnknown_08597E28, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_08597E60:: @ 8597E60 - .byte 0x10, 0x6f, 0xc4, 0x00, 0x10, 0x4e, 0x82, 0xa0, 0x10, 0x50, 0x86, 0xaa - - .align 2 -gUnknown_08597E6C:: @ 8597E6C - .4byte gText_DelAll - .4byte gText_Cancel5 - .4byte gText_Ok2 - .4byte NULL - - .4byte gText_DelAll - .4byte gText_Cancel5 - .4byte gText_Ok2 - .4byte gText_Quiz - - .4byte gText_DelAll - .4byte gText_Cancel5 - .4byte gText_Ok2 - .4byte gText_Answer - -@ 8597E9C - .include "data/text/easy_chat/easy_chat_groups.inc" - -@ 859D0B4 - .include "data/text/easy_chat/easy_chat_words_by_letter.inc" - -@ 859E5D4 - .include "data/text/easy_chat/easy_chat_group_name_pointers.inc" - -gUnknown_0859E62C:: @ 859E62C - .2byte 0x0a29, 0x1020, 0x020e, 0x0a33 - -gUnknown_0859E634:: @ 859E634 - .2byte 0x100f, 0x0a02, 0x0e25, 0x0c03, 0x0803, 0x0c00 - -gUnknown_0859E640:: @ 859E640 - .2byte 0x0c3a, 0x0c3a, 0x0c01, 0x0a2a, 0x0607, 0x0c01 - -gUnknown_0859E64C:: @ 859E64C - .2byte 0x1039, 0x122e, 0x0c04, 0x0a3d, 0x0630, 0x0c04 - -gUnknown_0859E658:: @ 859E658 - .2byte 0x019a, 0x0000 diff --git a/data/event_scripts.s b/data/event_scripts.s index 3975fd361..257143ef5 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -8,6 +8,7 @@ #include "constants/items.h" #include "constants/heal_locations.h" #include "constants/layouts.h" +#include "constants/map_scripts.h" #include "constants/maps.h" #include "constants/moves.h" #include "constants/songs.h" @@ -824,27 +825,12 @@ Std_10: @ 8271347 EventScript_27134E: @ 827134E return -BattleFrontier_BattleArenaLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattleDomeLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattleFactoryLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattlePalaceLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattlePikeLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattlePyramidLobby_EventScript_27134F:: @ 827134F -BattleFrontier_BattleTowerLobby_EventScript_27134F:: @ 827134F -FallarborTown_BattleTentLobby_EventScript_27134F:: @ 827134F -LilycoveCity_ContestLobby_EventScript_27134F:: @ 827134F -MossdeepCity_GameCorner_1F_EventScript_27134F:: @ 827134F -OldaleTown_PokemonCenter_2F_EventScript_27134F:: @ 827134F -SecretBase_RedCave1_EventScript_27134F:: @ 827134F -SlateportCity_BattleTentLobby_EventScript_27134F:: @ 827134F -SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F:: @ 827134F -TrainerHill_Entrance_EventScript_27134F:: @ 827134F -VerdanturfTown_BattleTentLobby_EventScript_27134F:: @ 827134F +Common_EventScript_SaveGame:: @ 827134F special SaveGame waitstate return - EventScript_271354:: @ 8271354 +EventScript_271354:: @ 8271354 cmdD8 cmdD9 @@ -1114,7 +1100,7 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY - setvar VAR_0x40C6, 2 + setvar VAR_STEVENS_HOUSE_STATE, 2 setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY clearflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL @@ -1148,8 +1134,8 @@ EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F return EverGrandeCity_HallOfFame_EventScript_271843:: @ 8271843 - setvar VAR_0x4082, 3 - setvar VAR_0x408C, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3 clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD return @@ -1162,12 +1148,12 @@ EventScript_WhiteOut:: @ 8271857 goto EventScript_ResetMrBriney end -EventScript_ResetMrBriney:: @ 8271862 - compare VAR_0x4096, 1 +EventScript_271862:: @ 8271862 + compare VAR_BRINEY_LOCATION, 1 goto_if_eq EventScript_MoveMrBrineyToHouse - compare VAR_0x4096, 2 + compare VAR_BRINEY_LOCATION, 2 goto_if_eq EventScript_MoveMrBrineyToDewford - compare VAR_0x4096, 3 + compare VAR_BRINEY_LOCATION, 3 goto_if_eq EventScript_MoveMrBrineyToRoute108 end @@ -1208,7 +1194,7 @@ EverGrandeCity_HallOfFame_EventScript_2718CC:: @ 82718CC clearflag FLAG_DEFEATED_ELITE_4_PHOEBE clearflag FLAG_DEFEATED_ELITE_4_GLACIA clearflag FLAG_DEFEATED_ELITE_4_DRAKE - setvar VAR_0x409C, 0 + setvar VAR_ELITE_4_STATE, 0 return DewfordTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE @@ -1220,23 +1206,23 @@ PetalburgCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE RustboroCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE SlateportCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE VerdanturfTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE - goto_if_unset FLAG_RECEIVED_POKENAV, OldaleTown_PokemonCenter_1F_EventScript_27374E - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, OldaleTown_PokemonCenter_1F_EventScript_27374E + goto_if_unset FLAG_RECEIVED_POKENAV, Common_EventScript_NopReturn + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, Common_EventScript_NopReturn goto_if_unset FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT, OldaleTown_PokemonCenter_1F_EventScript_27190C goto_if_unset FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, OldaleTown_PokemonCenter_1F_EventScript_271912 goto_if_unset FLAG_HIDE_ROUTE_108_MR_BRINEY, OldaleTown_PokemonCenter_1F_EventScript_271918 return OldaleTown_PokemonCenter_1F_EventScript_27190C:: @ 827190C - setvar VAR_0x4096, 1 + setvar VAR_BRINEY_LOCATION, 1 return OldaleTown_PokemonCenter_1F_EventScript_271912:: @ 8271912 - setvar VAR_0x4096, 2 + setvar VAR_BRINEY_LOCATION, 2 return OldaleTown_PokemonCenter_1F_EventScript_271918:: @ 8271918 - setvar VAR_0x4096, 3 + setvar VAR_BRINEY_LOCATION, 3 return BattleFrontier_PokemonCenter_1F_EventScript_27191E:: @ 827191E @@ -1295,11 +1281,11 @@ OldaleTown_PokemonCenter_1F_EventScript_27198D:: @ 827198D return OldaleTown_PokemonCenter_1F_EventScript_271993:: @ 8271993 - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_2725A4 + applymovement VAR_0x800B, Common_Movement_WalkInPlaceLeft waitmovement 0 dofieldeffect FLDEFF_POKECENTER_HEAL waitfieldeffect FLDEFF_POKECENTER_HEAL - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_2725AA + applymovement VAR_0x800B, Common_Movement_WalkInPlaceDown waitmovement 0 special HealPlayerParty return @@ -1363,9 +1349,9 @@ OldaleTown_PokemonCenter_1F_EventScript_271A68:: @ 8271A68 setflag FLAG_OLDALE_NURSE_MENTIONS_GOLD_CARD msgbox gUnknown_082727F5, MSGBOX_DEFAULT playse SE_PIN - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_272598 + applymovement VAR_0x800B, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_27259A + applymovement VAR_0x800B, Common_Movement_Delay48 waitmovement 0 msgbox gUnknown_08272860, MSGBOX_YESNO compare VAR_RESULT, 1 @@ -1542,7 +1528,7 @@ EventScript_271C9B:: @ 8271C9B EventScript_271CA1:: @ 8271CA1 msgbox gUnknown_08272A78, MSGBOX_DEFAULT - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return @@ -1594,7 +1580,7 @@ EventScript_271D2A:: @ 8271D2A EventScript_271D47:: @ 8271D47 msgbox gUnknown_08272ABF, MSGBOX_DEFAULT - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT setvar VAR_RESULT, 0 releaseall end @@ -1689,38 +1675,12 @@ EventScript_271E54:: @ 8271E54 goto EventScript_271DBC end -BattleFrontier_OutsideWest_EventScript_271E6A:: @ 8271E6A -FallarborTown_EventScript_271E6A:: @ 8271E6A -FortreeCity_EventScript_271E6A:: @ 8271E6A -LavaridgeTown_EventScript_271E6A:: @ 8271E6A -MauvilleCity_EventScript_271E6A:: @ 8271E6A -MossdeepCity_EventScript_271E6A:: @ 8271E6A -OldaleTown_EventScript_271E6A:: @ 8271E6A -PetalburgCity_EventScript_271E6A:: @ 8271E6A -RustboroCity_EventScript_271E6A:: @ 8271E6A -SlateportCity_EventScript_271E6A:: @ 8271E6A -SootopolisCity_EventScript_271E6A:: @ 8271E6A -VerdanturfTown_EventScript_271E6A:: @ 8271E6A - msgbox gUnknown_08272B6A, MSGBOX_SIGN - end - -BattleFrontier_OutsideEast_EventScript_271E73:: @ 8271E73 -DewfordTown_EventScript_271E73:: @ 8271E73 -EverGrandeCity_EventScript_271E73:: @ 8271E73 -FallarborTown_EventScript_271E73:: @ 8271E73 -FortreeCity_EventScript_271E73:: @ 8271E73 -LavaridgeTown_EventScript_271E73:: @ 8271E73 -LilycoveCity_EventScript_271E73:: @ 8271E73 -MauvilleCity_EventScript_271E73:: @ 8271E73 -MossdeepCity_EventScript_271E73:: @ 8271E73 -OldaleTown_EventScript_271E73:: @ 8271E73 -PacifidlogTown_EventScript_271E73:: @ 8271E73 -PetalburgCity_EventScript_271E73:: @ 8271E73 -RustboroCity_EventScript_271E73:: @ 8271E73 -SlateportCity_EventScript_271E73:: @ 8271E73 -SootopolisCity_EventScript_271E73:: @ 8271E73 -VerdanturfTown_EventScript_271E73:: @ 8271E73 - msgbox gUnknown_08272B9E, MSGBOX_SIGN +Common_EventScript_ShowPokemartSign:: @ 8271E6A + msgbox gText_PokemartSign, MSGBOX_SIGN + end + +Common_EventScript_ShowPokemonCenterSign:: @ 8271E73 + msgbox gText_PokemonCenterSign, MSGBOX_SIGN end BattleFrontier_BattleTowerLobby_EventScript_271E7C:: @ 8271E7C @@ -1756,8 +1716,8 @@ DewfordTown_Hall_EventScript_271E8B:: @ 8271E8B DewfordTown_EventScript_271E95:: @ 8271E95 Route104_MrBrineysHouse_EventScript_271E95:: @ 8271E95 Route109_EventScript_271E95:: @ 8271E95 - copyvar VAR_0x8008, VAR_0x4096 - setvar VAR_0x4096, 0 + copyvar VAR_0x8008, VAR_BRINEY_LOCATION + setvar VAR_BRINEY_LOCATION, 0 return EventScript_UseSurf:: @ 8271EA0 @@ -1779,17 +1739,7 @@ EventScript_271ED5:: @ 8271ED5 EventScript_271ED6:: @ 8271ED6 end -EverGrandeCity_ChampionsRoom_EventScript_271ED7:: @ 8271ED7 -LavaridgeTown_EventScript_271ED7:: @ 8271ED7 -LilycoveCity_EventScript_271ED7:: @ 8271ED7 -LittlerootTown_EventScript_271ED7:: @ 8271ED7 -LittlerootTown_ProfessorBirchsLab_EventScript_271ED7:: @ 8271ED7 -OldaleTown_EventScript_271ED7:: @ 8271ED7 -Route103_EventScript_271ED7:: @ 8271ED7 -Route104_EventScript_271ED7:: @ 8271ED7 -Route110_EventScript_271ED7:: @ 8271ED7 -Route119_EventScript_271ED7:: @ 8271ED7 -RustboroCity_EventScript_271ED7:: @ 8271ED7 +Common_EventScript_SetupRivalGender:: @ 8271ED7 checkplayergender compare VAR_RESULT, MALE goto_if_eq RustboroCity_EventScript_271EEF @@ -1805,9 +1755,7 @@ RustboroCity_EventScript_271EF5:: @ 8271EF5 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return -LavaridgeTown_EventScript_271EFB:: @ 8271EFB -Route110_EventScript_271EFB:: @ 8271EFB -Route119_EventScript_271EFB:: @ 8271EFB +Common_EventScript_SetupRivalOnBikeGender:: @ 8271EFB checkplayergender compare VAR_RESULT, MALE goto_if_eq LavaridgeTown_EventScript_271F13 @@ -1939,119 +1887,34 @@ DewfordTown_Gym_EventScript_272035:: @ 8272035 settrainerflag TRAINER_DAPHNE return -DewfordTown_Gym_EventScript_272054:: @ 8272054 -DewfordTown_Hall_EventScript_272054:: @ 8272054 -FallarborTown_House1_EventScript_272054:: @ 8272054 -FortreeCity_Gym_EventScript_272054:: @ 8272054 -FortreeCity_House2_EventScript_272054:: @ 8272054 -FortreeCity_House4_EventScript_272054:: @ 8272054 -LavaridgeTown_Gym_1F_EventScript_272054:: @ 8272054 -LavaridgeTown_HerbShop_EventScript_272054:: @ 8272054 -LilycoveCity_EventScript_272054:: @ 8272054 -LilycoveCity_House2_EventScript_272054:: @ 8272054 -LittlerootTown_BrendansHouse_1F_EventScript_272054:: @ 8272054 -MauvilleCity_EventScript_272054:: @ 8272054 -MauvilleCity_Gym_EventScript_272054:: @ 8272054 -MossdeepCity_EventScript_272054:: @ 8272054 -MossdeepCity_Gym_EventScript_272054:: @ 8272054 -MossdeepCity_SpaceCenter_1F_EventScript_272054:: @ 8272054 -MtPyre_1F_EventScript_272054:: @ 8272054 -PacifidlogTown_House2_EventScript_272054:: @ 8272054 -PetalburgCity_Gym_EventScript_272054:: @ 8272054 -PetalburgWoods_EventScript_272054:: @ 8272054 -Route104_EventScript_272054:: @ 8272054 -Route104_PrettyPetalFlowerShop_EventScript_272054:: @ 8272054 -Route109_EventScript_272054:: @ 8272054 -Route111_EventScript_272054:: @ 8272054 -Route111_WinstrateFamilysHouse_EventScript_272054:: @ 8272054 -Route114_EventScript_272054:: @ 8272054 -Route114_FossilManiacsHouse_EventScript_272054:: @ 8272054 -Route120_EventScript_272054:: @ 8272054 -Route123_BerryMastersHouse_EventScript_272054:: @ 8272054 -Route123_EventScript_272054:: @ 8272054 -RustboroCity_DevonCorp_3F_EventScript_272054:: @ 8272054 -RustboroCity_Flat2_2F_EventScript_272054:: @ 8272054 -RustboroCity_Gym_EventScript_272054:: @ 8272054 -RustboroCity_PokemonSchool_EventScript_272054:: @ 8272054 -SSTidalRooms_EventScript_272054:: @ 8272054 -ShoalCave_LowTideEntranceRoom_EventScript_272054:: @ 8272054 -ShoalCave_LowTideInnerRoom_EventScript_272054:: @ 8272054 -ShoalCave_LowTideLowerRoom_EventScript_272054:: @ 8272054 -ShoalCave_LowTideStairsRoom_EventScript_272054:: @ 8272054 -SlateportCity_BattleTentLobby_EventScript_272054:: @ 8272054 -SlateportCity_Harbor_EventScript_272054:: @ 8272054 -SlateportCity_PokemonFanClub_EventScript_272054:: @ 8272054 -SootopolisCity_EventScript_272054:: @ 8272054 -SootopolisCity_Gym_1F_EventScript_272054:: @ 8272054 -SootopolisCity_House1_EventScript_272054:: @ 8272054 -VerdanturfTown_BattleTentLobby_EventScript_272054:: @ 8272054 - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT +Common_EventScript_ShowBagIsFull:: @ 8272054 + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT release end -DewfordTown_Gym_EventScript_27205E:: @ 827205E -FortreeCity_Gym_EventScript_27205E:: @ 827205E -LavaridgeTown_Gym_1F_EventScript_27205E:: @ 827205E -LilycoveCity_ContestLobby_EventScript_27205E:: @ 827205E -LinkContestRoom1_EventScript_27205E:: @ 827205E -MauvilleCity_GameCorner_EventScript_27205E:: @ 827205E -MauvilleCity_Gym_EventScript_27205E:: @ 827205E -MossdeepCity_Gym_EventScript_27205E:: @ 827205E -PetalburgCity_Gym_EventScript_27205E:: @ 827205E -Route110_TrickHouseEnd_EventScript_27205E:: @ 827205E -Route110_TrickHouseEntrance_EventScript_27205E:: @ 827205E -Route113_GlassWorkshop_EventScript_27205E:: @ 827205E -SootopolisCity_Gym_1F_EventScript_27205E:: @ 827205E - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT +Common_EventScript_BagIsFull:: @ 827205E + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT return Route114_LanettesHouse_EventScript_272067:: @ 8272067 - msgbox gUnknown_08272B1A, MSGBOX_DEFAULT + msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT release end -LilycoveCity_LilycoveMuseum_2F_EventScript_272071:: @ 8272071 -MauvilleCity_GameCorner_EventScript_272071:: @ 8272071 -Route110_TrickHouseEnd_EventScript_272071:: @ 8272071 -Route110_TrickHouseEntrance_EventScript_272071:: @ 8272071 -Route113_GlassWorkshop_EventScript_272071:: @ 8272071 - msgbox gUnknown_08272B1A, MSGBOX_DEFAULT - return - -EverGrandeCity_EventScript_27207A:: @ 827207A -LilycoveCity_EventScript_27207A:: @ 827207A -MossdeepCity_EventScript_27207A:: @ 827207A -Route124_EventScript_27207A:: @ 827207A -Route125_EventScript_27207A:: @ 827207A -Route126_EventScript_27207A:: @ 827207A -Route127_EventScript_27207A:: @ 827207A -Route128_EventScript_27207A:: @ 827207A -Route129_EventScript_27207A:: @ 827207A -Route130_EventScript_27207A:: @ 827207A -Route131_EventScript_27207A:: @ 827207A -SkyPillar_Outside_EventScript_27207A:: @ 827207A -SootopolisCity_EventScript_27207A:: @ 827207A - setweather 15 - return - -DewfordTown_Gym_EventScript_27207E:: @ 827207E -FortreeCity_Gym_EventScript_27207E:: @ 827207E -LavaridgeTown_Gym_1F_EventScript_27207E:: @ 827207E -LilycoveCity_CoveLilyMotel_2F_EventScript_27207E:: @ 827207E -MauvilleCity_Gym_EventScript_27207E:: @ 827207E -MossdeepCity_Gym_EventScript_27207E:: @ 827207E -PetalburgCity_Gym_EventScript_27207E:: @ 827207E -RustboroCity_Gym_EventScript_27207E:: @ 827207E -SootopolisCity_Gym_1F_EventScript_27207E:: @ 827207E +Common_EventScript_NoRoomLeftForAnother:: @ 8272071 + msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT + return + +Common_EventScript_SetWeather15:: @ 827207A + setweather WEATHER_ALTERNATING + return + +Common_EventScript_PlayGymBadgeFanfare:: @ 827207E playfanfare MUS_ME_BACHI waitfanfare return -LittlerootTown_BrendansHouse_1F_EventScript_272083:: @ 8272083 -Route111_OldLadysRestStop_EventScript_272083:: @ 8272083 -Route119_WeatherInstitute_1F_EventScript_272083:: @ 8272083 -RustboroCity_DevonCorp_3F_EventScript_272083:: @ 8272083 -SSTidalRooms_EventScript_272083:: @ 8272083 +Common_EventScript_OutOfCenterPartyHeal:: @ 8272083 fadescreen 1 playfanfare MUS_ME_ASA waitfanfare @@ -2061,7 +1924,7 @@ SSTidalRooms_EventScript_272083:: @ 8272083 EventScript_RegionMap:: @ 827208F lockall - msgbox LittlerootTown_BrendansHouse_2F_Text_1F8820, MSGBOX_DEFAULT + msgbox Common_Text_LookCloserAtMap, MSGBOX_DEFAULT fadescreen 1 special FieldShowRegionMap waitstate @@ -2085,8 +1948,8 @@ Route109_EventScript_2720A8:: @ 82720A8 LittlerootTown_ProfessorBirchsLab_EventScript_2720AD:: @ 82720AD Route101_EventScript_2720AD:: @ 82720AD Route103_EventScript_2720AD:: @ 82720AD - compare VAR_0x4085, 0 - goto_if_eq Route101_EventScript_27374E + compare VAR_PETALBURG_GYM_STATE, 0 + goto_if_eq Common_EventScript_NopReturn goto_if_set FLAG_SYS_GAME_CLEAR, Route101_EventScript_27211A compare VAR_BIRCH_STATE, 0 call_if_eq Route101_EventScript_27211A @@ -2167,7 +2030,7 @@ Route101_EventScript_272184:: @ 8272184 msgbox gUnknown_082A5D2C, MSGBOX_DEFAULT call Route101_EventScript_272179 compare VAR_0x800A, 0 - goto_if_eq Route101_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setvar VAR_0x8004, 1 specialvar VAR_RESULT, ScriptGetPokedexInfo copyvar VAR_0x8008, VAR_0x8005 @@ -2204,7 +2067,7 @@ PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO - setvar VAR_0x4096, 0 + setvar VAR_BRINEY_LOCATION, 0 return RusturfTunnel_EventScript_272216:: @ 8272216 @@ -2218,7 +2081,7 @@ RusturfTunnel_EventScript_272216:: @ 8272216 EventScript_27222B:: @ 827222B delay 30 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 showobjectat 255, MAP_PETALBURG_CITY delay 30 @@ -2361,7 +2224,7 @@ Route119_EventScript_272350:: @ 8272350 Route119_EventScript_272365:: @ 8272365 msgbox Route119_Text_1F5D63, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route119_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 applymovement VAR_LAST_TALKED, Route119_Movement_2723C7 waitmovement 0 @@ -2413,11 +2276,7 @@ Route120_Movement_2723C7: @ 82723C7 set_visible step_end -LittlerootTown_ProfessorBirchsLab_EventScript_2723DD:: @ 82723DD -MossdeepCity_StevensHouse_EventScript_2723DD:: @ 82723DD -Route119_WeatherInstitute_2F_EventScript_2723DD:: @ 82723DD -RustboroCity_DevonCorp_2F_EventScript_2723DD:: @ 82723DD -SlateportCity_House1_EventScript_2723DD:: @ 82723DD +Common_EventScript_NameReceivedPokemon:: @ 82723DD fadescreen 1 special ChangePokemonNickname waitstate @@ -2512,354 +2371,41 @@ SlateportCity_Movement_272596: @ 8272596 emote_question_mark step_end -AquaHideout_B2F_Movement_272598: @ 8272598 -BattleFrontier_BattleTowerBattleRoom_Movement_272598: @ 8272598 -BattleFrontier_ReceptionGate_Movement_272598: @ 8272598 -CaveOfOrigin_B1F_Movement_272598: @ 8272598 -EverGrandeCity_ChampionsRoom_Movement_272598: @ 8272598 -FarawayIsland_Interior_Movement_272598: @ 8272598 -JaggedPass_Movement_272598: @ 8272598 -LavaridgeTown_Movement_272598: @ 8272598 -LilycoveCity_ContestLobby_Movement_272598: @ 8272598 -LilycoveCity_CoveLilyMotel_1F_Movement_272598: @ 8272598 -LilycoveCity_Harbor_Movement_272598: @ 8272598 -LittlerootTown_BrendansHouse_1F_Movement_272598: @ 8272598 -LittlerootTown_BrendansHouse_2F_Movement_272598: @ 8272598 -LittlerootTown_MaysHouse_1F_Movement_272598: @ 8272598 -LittlerootTown_MaysHouse_2F_Movement_272598: @ 8272598 -LittlerootTown_Movement_272598: @ 8272598 -MauvilleCity_House2_Movement_272598: @ 8272598 -MauvilleCity_Movement_272598: @ 8272598 -MeteorFalls_1F_1R_Movement_272598: @ 8272598 -MeteorFalls_StevensCave_Movement_272598: @ 8272598 -MossdeepCity_SpaceCenter_2F_Movement_272598: @ 8272598 -MossdeepCity_StevensHouse_Movement_272598: @ 8272598 -MtChimney_Movement_272598: @ 8272598 -MtPyre_Summit_Movement_272598: @ 8272598 -OldaleTown_PokemonCenter_1F_Movement_272598: @ 8272598 -PetalburgCity_Gym_Movement_272598: @ 8272598 -PetalburgCity_Movement_272598: @ 8272598 -Route103_Movement_272598: @ 8272598 -Route104_Movement_272598: @ 8272598 -Route110_Movement_272598: @ 8272598 -Route110_TrickHouseEnd_Movement_272598: @ 8272598 -Route110_TrickHouseEntrance_Movement_272598: @ 8272598 -Route110_TrickHousePuzzle5_Movement_272598: @ 8272598 -Route119_WeatherInstitute_2F_Movement_272598: @ 8272598 -RustboroCity_DevonCorp_2F_Movement_272598: @ 8272598 -RustboroCity_Movement_272598: @ 8272598 -RusturfTunnel_Movement_272598: @ 8272598 -SeafloorCavern_Entrance_Movement_272598: @ 8272598 -SeafloorCavern_Room9_Movement_272598: @ 8272598 -SlateportCity_Movement_272598: @ 8272598 -SlateportCity_OceanicMuseum_1F_Movement_272598: @ 8272598 -SlateportCity_PokemonFanClub_Movement_272598: @ 8272598 +Common_Movement_ExclamationMark: @ 8272598 emote_exclamation_mark step_end -BattleFrontier_BattleTowerBattleRoom_Movement_27259A: @ 827259A -BattleFrontier_ReceptionGate_Movement_27259A: @ 827259A -CaveOfOrigin_B1F_Movement_27259A: @ 827259A -EverGrandeCity_ChampionsRoom_Movement_27259A: @ 827259A -FarawayIsland_Interior_Movement_27259A: @ 827259A -JaggedPass_Movement_27259A: @ 827259A -LavaridgeTown_Movement_27259A: @ 827259A -LilycoveCity_CoveLilyMotel_1F_Movement_27259A: @ 827259A -LilycoveCity_Harbor_Movement_27259A: @ 827259A -LittlerootTown_BrendansHouse_1F_Movement_27259A: @ 827259A -LittlerootTown_BrendansHouse_2F_Movement_27259A: @ 827259A -LittlerootTown_MaysHouse_1F_Movement_27259A: @ 827259A -LittlerootTown_MaysHouse_2F_Movement_27259A: @ 827259A -MauvilleCity_House2_Movement_27259A: @ 827259A -MauvilleCity_Movement_27259A: @ 827259A -MeteorFalls_1F_1R_Movement_27259A: @ 827259A -MeteorFalls_StevensCave_Movement_27259A: @ 827259A -MossdeepCity_SpaceCenter_2F_Movement_27259A: @ 827259A -MossdeepCity_StevensHouse_Movement_27259A: @ 827259A -MtChimney_Movement_27259A: @ 827259A -MtPyre_Summit_Movement_27259A: @ 827259A -OldaleTown_PokemonCenter_1F_Movement_27259A: @ 827259A -PetalburgCity_Gym_Movement_27259A: @ 827259A -PetalburgCity_Movement_27259A: @ 827259A -Route103_Movement_27259A: @ 827259A -Route104_Movement_27259A: @ 827259A -Route110_Movement_27259A: @ 827259A -Route110_TrickHouseEntrance_Movement_27259A: @ 827259A -Route110_TrickHousePuzzle5_Movement_27259A: @ 827259A -Route119_WeatherInstitute_2F_Movement_27259A: @ 827259A -RustboroCity_DevonCorp_2F_Movement_27259A: @ 827259A -RustboroCity_Movement_27259A: @ 827259A -RusturfTunnel_Movement_27259A: @ 827259A -SeafloorCavern_Entrance_Movement_27259A: @ 827259A -SeafloorCavern_Room9_Movement_27259A: @ 827259A -SlateportCity_Movement_27259A: @ 827259A -SlateportCity_OceanicMuseum_1F_Movement_27259A: @ 827259A -SlateportCity_PokemonFanClub_Movement_27259A: @ 827259A +Common_Movement_Delay48: @ 827259A delay_16 delay_16 delay_16 step_end -AquaHideout_B2F_Movement_27259E: @ 827259E -BattleFrontier_BattlePyramidLobby_Movement_27259E: @ 827259E -BattleFrontier_ScottsHouse_Movement_27259E: @ 827259E -CaveOfOrigin_B1F_Movement_27259E: @ 827259E -EverGrandeCity_PokemonLeague_1F_Movement_27259E: @ 827259E -FallarborTown_House2_Movement_27259E: @ 827259E -FortreeCity_House4_Movement_27259E: @ 827259E -JaggedPass_Movement_27259E: @ 827259E -LilycoveCity_ContestHall_Movement_27259E: @ 827259E -LilycoveCity_CoveLilyMotel_1F_Movement_27259E: @ 827259E -LilycoveCity_DepartmentStore_1F_Movement_27259E: @ 827259E -LilycoveCity_DepartmentStore_5F_Movement_27259E: @ 827259E -LilycoveCity_Harbor_Movement_27259E: @ 827259E -LilycoveCity_LilycoveMuseum_1F_Movement_27259E: @ 827259E -LilycoveCity_LilycoveMuseum_2F_Movement_27259E: @ 827259E -LilycoveCity_MoveDeletersHouse_Movement_27259E: @ 827259E -LilycoveCity_Movement_27259E: @ 827259E -LittlerootTown_BrendansHouse_1F_Movement_27259E: @ 827259E -LittlerootTown_BrendansHouse_2F_Movement_27259E: @ 827259E -MagmaHideout_4F_Movement_27259E: @ 827259E -MauvilleCity_Movement_27259E: @ 827259E -MeteorFalls_StevensCave_Movement_27259E: @ 827259E -MossdeepCity_SpaceCenter_2F_Movement_27259E: @ 827259E -MtChimney_Movement_27259E: @ 827259E -OldaleTown_Movement_27259E: @ 827259E -PetalburgCity_Gym_Movement_27259E: @ 827259E -PetalburgCity_Movement_27259E: @ 827259E -Route103_Movement_27259E: @ 827259E -Route104_Movement_27259E: @ 827259E -Route110_TrickHouseEnd_Movement_27259E: @ 827259E -Route110_TrickHouseEntrance_Movement_27259E: @ 827259E -Route110_TrickHousePuzzle5_Movement_27259E: @ 827259E -Route111_Movement_27259E: @ 827259E -Route119_Movement_27259E: @ 827259E -RustboroCity_Flat1_2F_Movement_27259E: @ 827259E -RustboroCity_Movement_27259E: @ 827259E -RusturfTunnel_Movement_27259E: @ 827259E -SeafloorCavern_Room9_Movement_27259E: @ 827259E -SlateportCity_Movement_27259E: @ 827259E -SlateportCity_SternsShipyard_1F_Movement_27259E: @ 827259E -SootopolisCity_Movement_27259E: @ 827259E +Common_Movement_FacePlayer: @ 827259E face_player step_end -BattleFrontier_OutsideWest_Movement_2725A0: @ 82725A0 +Common_Movement_FaceAwayPlayer: @ 82725A0 face_away_player step_end -BattleFrontier_Lounge3_Movement_2725A2: @ 82725A2 -BattleFrontier_OutsideWest_Movement_2725A2: @ 82725A2 -EverGrandeCity_PokemonLeague_1F_Movement_2725A2: @ 82725A2 -JaggedPass_Movement_2725A2: @ 82725A2 -LilycoveCity_ContestHall_Movement_2725A2: @ 82725A2 -LilycoveCity_ContestLobby_Movement_2725A2: @ 82725A2 -LilycoveCity_CoveLilyMotel_1F_Movement_2725A2: @ 82725A2 -LilycoveCity_House3_Movement_2725A2: @ 82725A2 -LilycoveCity_LilycoveMuseum_1F_Movement_2725A2: @ 82725A2 -LilycoveCity_Movement_2725A2: @ 82725A2 -LittlerootTown_Movement_2725A2: @ 82725A2 -MauvilleCity_GameCorner_Movement_2725A2: @ 82725A2 -MauvilleCity_Movement_2725A2: @ 82725A2 -MossdeepCity_Movement_2725A2: @ 82725A2 -MossdeepCity_SpaceCenter_1F_Movement_2725A2: @ 82725A2 -MossdeepCity_SpaceCenter_2F_Movement_2725A2: @ 82725A2 -MtChimney_Movement_2725A2: @ 82725A2 -OldaleTown_Movement_2725A2: @ 82725A2 -PetalburgCity_Movement_2725A2: @ 82725A2 -Route109_Movement_2725A2: @ 82725A2 -Route110_Movement_2725A2: @ 82725A2 -Route111_Movement_2725A2: @ 82725A2 -Route111_WinstrateFamilysHouse_Movement_2725A2: @ 82725A2 -Route112_Movement_2725A2: @ 82725A2 -Route119_Movement_2725A2: @ 82725A2 -RustboroCity_DevonCorp_3F_Movement_2725A2: @ 82725A2 -RustboroCity_Movement_2725A2: @ 82725A2 -RusturfTunnel_Movement_2725A2: @ 82725A2 -SlateportCity_Harbor_Movement_2725A2: @ 82725A2 -SlateportCity_Movement_2725A2: @ 82725A2 -SlateportCity_OceanicMuseum_2F_Movement_2725A2: @ 82725A2 -SlateportCity_SternsShipyard_1F_Movement_2725A2: @ 82725A2 -SootopolisCity_Movement_2725A2: @ 82725A2 -VerdanturfTown_Movement_2725A2: @ 82725A2 +Common_Movement_FaceOriginalDirection: @ 82725A2 face_original_direction step_end -AquaHideout_B2F_Movement_2725A4: @ 82725A4 -BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4: @ 82725A4 -BattleFrontier_OutsideWest_Movement_2725A4: @ 82725A4 -BattleFrontier_ScottsHouse_Movement_2725A4: @ 82725A4 -DewfordTown_Hall_Movement_2725A4: @ 82725A4 -EverGrandeCity_ChampionsRoom_Movement_2725A4: @ 82725A4 -EverGrandeCity_HallOfFame_Movement_2725A4: @ 82725A4 -LavaridgeTown_Movement_2725A4: @ 82725A4 -LilycoveCity_Harbor_Movement_2725A4: @ 82725A4 -LilycoveCity_PokemonTrainerFanClub_Movement_2725A4: @ 82725A4 -LittlerootTown_BrendansHouse_1F_Movement_2725A4: @ 82725A4 -LittlerootTown_BrendansHouse_2F_Movement_2725A4: @ 82725A4 -LittlerootTown_MaysHouse_1F_Movement_2725A4: @ 82725A4 -LittlerootTown_MaysHouse_2F_Movement_2725A4: @ 82725A4 -LittlerootTown_Movement_2725A4: @ 82725A4 -LittlerootTown_ProfessorBirchsLab_Movement_2725A4: @ 82725A4 -MeteorFalls_1F_1R_Movement_2725A4: @ 82725A4 -MossdeepCity_SpaceCenter_2F_Movement_2725A4: @ 82725A4 -MossdeepCity_StevensHouse_Movement_2725A4: @ 82725A4 -MtChimney_Movement_2725A4: @ 82725A4 -MtPyre_Summit_Movement_2725A4: @ 82725A4 -OldaleTown_PokemonCenter_1F_Movement_2725A4: @ 82725A4 -PetalburgCity_Gym_Movement_2725A4: @ 82725A4 -PetalburgCity_Movement_2725A4: @ 82725A4 -PetalburgWoods_Movement_2725A4: @ 82725A4 -Route101_Movement_2725A4: @ 82725A4 -Route110_Movement_2725A4: @ 82725A4 -Route110_TrickHouseEnd_Movement_2725A4: @ 82725A4 -Route111_Movement_2725A4: @ 82725A4 -Route112_Movement_2725A4: @ 82725A4 -Route116_Movement_2725A4: @ 82725A4 -Route120_Movement_2725A4: @ 82725A4 -Route128_Movement_2725A4: @ 82725A4 -RustboroCity_Movement_2725A4: @ 82725A4 -SeafloorCavern_Entrance_Movement_2725A4: @ 82725A4 -SeafloorCavern_Room9_Movement_2725A4: @ 82725A4 -SkyPillar_Outside_Movement_2725A4: @ 82725A4 -SlateportCity_Movement_2725A4: @ 82725A4 -SlateportCity_OceanicMuseum_1F_Movement_2725A4: @ 82725A4 -SlateportCity_OceanicMuseum_2F_Movement_2725A4: @ 82725A4 -SootopolisCity_Movement_2725A4: @ 82725A4 +Common_Movement_WalkInPlaceLeft: @ 82725A4 walk_in_place_fastest_left step_end -BattleFrontier_BattleTowerCorridor2_Movement_2725A6: @ 82725A6 -BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6: @ 82725A6 -BattleFrontier_OutsideWest_Movement_2725A6: @ 82725A6 -BattleFrontier_ReceptionGate_Movement_2725A6: @ 82725A6 -BattleFrontier_ScottsHouse_Movement_2725A6: @ 82725A6 -CaveOfOrigin_B1F_Movement_2725A6: @ 82725A6 -DewfordTown_Hall_Movement_2725A6: @ 82725A6 -EverGrandeCity_ChampionsRoom_Movement_2725A6: @ 82725A6 -EverGrandeCity_HallOfFame_Movement_2725A6: @ 82725A6 -LavaridgeTown_Movement_2725A6: @ 82725A6 -LilycoveCity_DepartmentStore_5F_Movement_2725A6: @ 82725A6 -LilycoveCity_Harbor_Movement_2725A6: @ 82725A6 -LittlerootTown_BrendansHouse_1F_Movement_2725A6: @ 82725A6 -LittlerootTown_BrendansHouse_2F_Movement_2725A6: @ 82725A6 -LittlerootTown_MaysHouse_2F_Movement_2725A6: @ 82725A6 -LittlerootTown_Movement_2725A6: @ 82725A6 -LittlerootTown_ProfessorBirchsLab_Movement_2725A6: @ 82725A6 -MagmaHideout_4F_Movement_2725A6: @ 82725A6 -MeteorFalls_1F_1R_Movement_2725A6: @ 82725A6 -MossdeepCity_SpaceCenter_2F_Movement_2725A6: @ 82725A6 -MtPyre_Summit_Movement_2725A6: @ 82725A6 -NewMauville_Entrance_Movement_2725A6: @ 82725A6 -OldaleTown_PokemonCenter_2F_Movement_2725A6: @ 82725A6 -PetalburgCity_Gym_Movement_2725A6: @ 82725A6 -PetalburgCity_Movement_2725A6: @ 82725A6 -PetalburgWoods_Movement_2725A6: @ 82725A6 -Route104_Movement_2725A6: @ 82725A6 -Route110_TrickHouseEnd_Movement_2725A6: @ 82725A6 -Route110_TrickHouseEntrance_Movement_2725A6: @ 82725A6 -Route111_Movement_2725A6: @ 82725A6 -Route114_FossilManiacsTunnel_Movement_2725A6: @ 82725A6 -Route120_Movement_2725A6: @ 82725A6 -Route121_SafariZoneEntrance_Movement_2725A6: @ 82725A6 -Route128_Movement_2725A6: @ 82725A6 -RustboroCity_Movement_2725A6: @ 82725A6 -RusturfTunnel_Movement_2725A6: @ 82725A6 -SeafloorCavern_Entrance_Movement_2725A6: @ 82725A6 -SeafloorCavern_Room9_Movement_2725A6: @ 82725A6 -SlateportCity_BattleTentCorridor_Movement_2725A6: @ 82725A6 -SlateportCity_Harbor_Movement_2725A6: @ 82725A6 -SlateportCity_Movement_2725A6: @ 82725A6 -SlateportCity_OceanicMuseum_2F_Movement_2725A6: @ 82725A6 -SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6: @ 82725A6 -VerdanturfTown_BattleTentBattleRoom_Movement_2725A6: @ 82725A6 +Common_Movement_WalkInPlaceUp: @ 82725A6 walk_in_place_fastest_up step_end -BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8: @ 82725A8 -BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8: @ 82725A8 -BattleFrontier_OutsideWest_Movement_2725A8: @ 82725A8 -BattleFrontier_ScottsHouse_Movement_2725A8: @ 82725A8 -DewfordTown_Hall_Movement_2725A8: @ 82725A8 -EverGrandeCity_ChampionsRoom_Movement_2725A8: @ 82725A8 -EverGrandeCity_HallOfFame_Movement_2725A8: @ 82725A8 -LavaridgeTown_Movement_2725A8: @ 82725A8 -LilycoveCity_DepartmentStore_1F_Movement_2725A8: @ 82725A8 -LilycoveCity_PokemonTrainerFanClub_Movement_2725A8: @ 82725A8 -LittlerootTown_BrendansHouse_1F_Movement_2725A8: @ 82725A8 -LittlerootTown_BrendansHouse_2F_Movement_2725A8: @ 82725A8 -LittlerootTown_MaysHouse_1F_Movement_2725A8: @ 82725A8 -LittlerootTown_Movement_2725A8: @ 82725A8 -LittlerootTown_ProfessorBirchsLab_Movement_2725A8: @ 82725A8 -MagmaHideout_4F_Movement_2725A8: @ 82725A8 -MauvilleCity_Movement_2725A8: @ 82725A8 -MossdeepCity_SpaceCenter_1F_Movement_2725A8: @ 82725A8 -MossdeepCity_SpaceCenter_2F_Movement_2725A8: @ 82725A8 -MtPyre_Summit_Movement_2725A8: @ 82725A8 -OldaleTown_Movement_2725A8: @ 82725A8 -PetalburgCity_Gym_Movement_2725A8: @ 82725A8 -PetalburgCity_Movement_2725A8: @ 82725A8 -Route101_Movement_2725A8: @ 82725A8 -Route110_Movement_2725A8: @ 82725A8 -Route110_TrickHouseEnd_Movement_2725A8: @ 82725A8 -Route112_Movement_2725A8: @ 82725A8 -Route116_Movement_2725A8: @ 82725A8 -Route120_Movement_2725A8: @ 82725A8 -Route128_Movement_2725A8: @ 82725A8 -RustboroCity_Movement_2725A8: @ 82725A8 -SSTidalCorridor_Movement_2725A8: @ 82725A8 -SeafloorCavern_Entrance_Movement_2725A8: @ 82725A8 -SkyPillar_Outside_Movement_2725A8: @ 82725A8 -SlateportCity_Harbor_Movement_2725A8: @ 82725A8 -SlateportCity_Movement_2725A8: @ 82725A8 -SlateportCity_OceanicMuseum_1F_Movement_2725A8: @ 82725A8 -SlateportCity_OceanicMuseum_2F_Movement_2725A8: @ 82725A8 -SootopolisCity_Movement_2725A8: @ 82725A8 -VerdanturfTown_BattleTentBattleRoom_Movement_2725A8: @ 82725A8 +Common_Movement_WalkInPlaceRight: @ 82725A8 walk_in_place_fastest_right step_end -BattleFrontier_OutsideWest_Movement_2725AA: @ 82725AA -BattleFrontier_ScottsHouse_Movement_2725AA: @ 82725AA -BirthIsland_Harbor_Movement_2725AA: @ 82725AA -DewfordTown_Hall_Movement_2725AA: @ 82725AA -EverGrandeCity_ChampionsRoom_Movement_2725AA: @ 82725AA -FarawayIsland_Entrance_Movement_2725AA: @ 82725AA -LilycoveCity_CoveLilyMotel_1F_Movement_2725AA: @ 82725AA -LilycoveCity_DepartmentStoreElevator_Movement_2725AA: @ 82725AA -LilycoveCity_Harbor_Movement_2725AA: @ 82725AA -LilycoveCity_Movement_2725AA: @ 82725AA -LilycoveCity_PokemonTrainerFanClub_Movement_2725AA: @ 82725AA -LittlerootTown_BrendansHouse_1F_Movement_2725AA: @ 82725AA -LittlerootTown_MaysHouse_1F_Movement_2725AA: @ 82725AA -LittlerootTown_Movement_2725AA: @ 82725AA -MauvilleCity_Movement_2725AA: @ 82725AA -MeteorFalls_1F_1R_Movement_2725AA: @ 82725AA -MossdeepCity_SpaceCenter_2F_Movement_2725AA: @ 82725AA -MtPyre_Summit_Movement_2725AA: @ 82725AA -NavelRock_Harbor_Movement_2725AA: @ 82725AA -OldaleTown_PokemonCenter_1F_Movement_2725AA: @ 82725AA -PetalburgCity_Gym_Movement_2725AA: @ 82725AA -PetalburgCity_Movement_2725AA: @ 82725AA -PetalburgWoods_Movement_2725AA: @ 82725AA -Route110_Movement_2725AA: @ 82725AA -Route110_TrickHouseEnd_Movement_2725AA: @ 82725AA -Route114_FossilManiacsTunnel_Movement_2725AA: @ 82725AA -Route119_Movement_2725AA: @ 82725AA -Route120_Movement_2725AA: @ 82725AA -Route128_Movement_2725AA: @ 82725AA -RustboroCity_Movement_2725AA: @ 82725AA -RustboroCity_PokemonSchool_Movement_2725AA: @ 82725AA -RusturfTunnel_Movement_2725AA: @ 82725AA -SeafloorCavern_Entrance_Movement_2725AA: @ 82725AA -SeafloorCavern_Room9_Movement_2725AA: @ 82725AA -SkyPillar_Outside_Movement_2725AA: @ 82725AA -SlateportCity_Harbor_Movement_2725AA: @ 82725AA -SlateportCity_Movement_2725AA: @ 82725AA -SlateportCity_OceanicMuseum_2F_Movement_2725AA: @ 82725AA -SouthernIsland_Exterior_Movement_2725AA: @ 82725AA -VerdanturfTown_BattleTentBattleRoom_Movement_2725AA: @ 82725AA -VictoryRoad_1F_Movement_2725AA: @ 82725AA +Common_Movement_WalkInPlaceDown: @ 82725AA walk_in_place_fastest_down step_end @@ -2871,17 +2417,11 @@ RustboroCity_Movement_2725AE: @ 82725AE face_left step_end -BattleFrontier_Mart_Movement_2725B0: @ 82725B0 -MeteorFalls_1F_1R_Movement_2725B0: @ 82725B0 +Common_Movement_FaceDown: @ 82725B0 face_down step_end -MarineCave_End_Movement_2725B2: @ 82725B2 -MtPyre_Summit_Movement_2725B2: @ 82725B2 -Route118_Movement_2725B2: @ 82725B2 -SkyPillar_Top_Movement_2725B2: @ 82725B2 -SlateportCity_Movement_2725B2: @ 82725B2 -TerraCave_End_Movement_2725B2: @ 82725B2 +Common_Movement_FaceUp: @ 82725B2 face_up step_end @@ -3033,7 +2573,7 @@ gUnknown_08272A9A:: @ 8272A9A gUnknown_08272ABF:: @ 8272ABF .string "{PLAYER} found one {STR_VAR_2}!$" -gUnknown_08272AD0:: @ 8272AD0 +gText_TooBadBagIsFull:: @ 8272AD0 .string "Too bad!\nThe BAG is full…$" gUnknown_08272AEA:: @ 8272AEA @@ -3042,16 +2582,16 @@ gUnknown_08272AEA:: @ 8272AEA gUnknown_08272B09:: @ 8272B09 .string "Obtained the {STR_VAR_2}!$" -gUnknown_08272B1A:: @ 8272B1A +gText_NoRoomLeftForAnother:: @ 8272B1A .string "Too bad! There's no room left for\nanother {STR_VAR_2}…$" gUnknown_08272B48:: @ 8272B48 .string "The {STR_VAR_2} was transferred\nto the PC.$" -gUnknown_08272B6A:: @ 8272B6A +gText_PokemartSign:: @ 8272B6A .string "“Selected items for your convenience!”\nPOKéMON MART$" -gUnknown_08272B9E:: @ 8272B9E +gText_PokemonCenterSign:: @ 8272B9E .string "“Rejuvenate your tired partners!”\nPOKéMON CENTER$" gUnknown_08272BCF:: @ 8272BCF @@ -3229,28 +2769,7 @@ EventScript_2736F8:: @ 82736F8 waitstate end -AncientTomb_EventScript_27374E:: @ 827374E -AquaHideout_B1F_EventScript_27374E:: @ 827374E -BattleFrontier_BattleDomeBattleRoom_EventScript_27374E:: @ 827374E -BattleFrontier_OutsideEast_EventScript_27374E:: @ 827374E -BirthIsland_Exterior_EventScript_27374E:: @ 827374E -DesertRuins_EventScript_27374E:: @ 827374E -EverGrandeCity_PokemonCenter_1F_EventScript_27374E:: @ 827374E -FarawayIsland_Interior_EventScript_27374E:: @ 827374E -IslandCave_EventScript_27374E:: @ 827374E -LilycoveCity_Harbor_EventScript_27374E:: @ 827374E -MarineCave_End_EventScript_27374E:: @ 827374E -NavelRock_Bottom_EventScript_27374E:: @ 827374E -NavelRock_Top_EventScript_27374E:: @ 827374E -NewMauville_Inside_EventScript_27374E:: @ 827374E -OldaleTown_PokemonCenter_1F_EventScript_27374E:: @ 827374E -PacifidlogTown_House2_EventScript_27374E:: @ 827374E -Route101_EventScript_27374E:: @ 827374E -Route119_EventScript_27374E:: @ 827374E -Route120_EventScript_27374E:: @ 827374E -SkyPillar_Top_EventScript_27374E:: @ 827374E -SouthernIsland_Interior_EventScript_27374E:: @ 827374E -TerraCave_End_EventScript_27374E:: @ 827374E +Common_EventScript_NopReturn:: @ 827374E return EventScript_27374F:: @ 827374F @@ -3440,12 +2959,12 @@ EventScript_Questionnaire:: @ 827381B EventScript_27386D:: @ 827386D goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, EventScript_2738FF - applymovement VAR_0x8008, BattleFrontier_Mart_Movement_2725B0 + applymovement VAR_0x8008, Common_Movement_FaceDown waitmovement 0 playse SE_PIN - applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_272598 + applymovement VAR_0x8008, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_27259A + applymovement VAR_0x8008, Common_Movement_Delay48 waitmovement 0 msgbox gUnknown_08273506, MSGBOX_DEFAULT setflag FLAG_SYS_MYSTERY_EVENT_ENABLE @@ -3456,12 +2975,12 @@ EventScript_27386D:: @ 827386D EventScript_2738B5:: @ 82738B5 goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, EventScript_2738FF - applymovement VAR_0x8008, BattleFrontier_Mart_Movement_2725B0 + applymovement VAR_0x8008, Common_Movement_FaceDown waitmovement 0 playse SE_PIN - applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_272598 + applymovement VAR_0x8008, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_27259A + applymovement VAR_0x8008, Common_Movement_Delay48 waitmovement 0 msgbox gUnknown_08273446, MSGBOX_DEFAULT setflag FLAG_SYS_MYSTERY_GIFT_ENABLE @@ -3474,7 +2993,7 @@ EventScript_2738FD:: @ 82738FD end EventScript_2738FF:: @ 82738FF - applymovement VAR_0x8008, BattleFrontier_Mart_Movement_2725B0 + applymovement VAR_0x8008, Common_Movement_FaceDown waitmovement 0 msgbox gUnknown_082733D8, MSGBOX_DEFAULT releaseall @@ -3655,14 +3174,14 @@ Route105_EventScript_273D17:: @ 8273D17 Route125_EventScript_273D17:: @ 8273D17 Route127_EventScript_273D17:: @ 8273D17 Route129_EventScript_273D17:: @ 8273D17 - setweather 13 + setweather WEATHER_RAIN_HEAVY return Route114_EventScript_273D1B:: @ 8273D1B Route115_EventScript_273D1B:: @ 8273D1B Route116_EventScript_273D1B:: @ 8273D1B Route118_EventScript_273D1B:: @ 8273D1B - setweather 12 + setweather WEATHER_DROUGHT return gUnknown_08273D1F:: @ 8273D1F @@ -3677,7 +3196,7 @@ gUnknown_08273D1F:: @ 8273D1F Route105_EventScript_273D31:: @ 8273D31 closemessage fadescreenswapbuffers 1 - setweather 2 + setweather WEATHER_SUNNY doweather call Route105_EventScript_273D6D special DrawWholeMapView @@ -4467,13 +3986,13 @@ LilycoveCity_ContestLobby_EventScript_28CB21:: @ 828CB21 end LilycoveCity_ContestLobby_EventScript_28CB2B:: @ 828CB2B - compare VAR_0x4086, 2 + compare VAR_LINK_CONTEST_ROOM_STATE, 2 goto_if_ne LilycoveCity_ContestLobby_EventScript_28CB95 setvar VAR_0x8005, 6 special InterviewBefore compare VAR_RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB95 - switch VAR_0x4088 + switch VAR_CONTEST_LOCATION case 0, LilycoveCity_ContestLobby_EventScript_28CB95 case 2, LilycoveCity_ContestLobby_EventScript_28CB91 case 1, LilycoveCity_ContestLobby_EventScript_28CB91 @@ -4560,7 +4079,7 @@ BattleFrontier_BattleTowerLobby_EventScript_28CC7A:: @ 828CC7A end BattleFrontier_BattleTowerLobby_EventScript_28CC84:: @ 828CC84 - compare VAR_0x40BC, 0 + compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 setvar VAR_0x8005, 7 special InterviewBefore @@ -5974,8 +5493,8 @@ gBattleDomeMatchNumberText15:: .string "Final Match$" BattleFrontier_BattlePikeRandomRoom1_MapScripts_2C3E1B: @ 82C3E1B - map_script 3, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 - map_script 4, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25: @ 82C3E25 setvar VAR_0x8004, 4 @@ -7113,7 +6632,7 @@ SlateportCity_PokemonFanClub_EventScript_2C7F16:: @ 82C7F16 goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A msgbox SlateportCity_PokemonFanClub_Text_2C6F66, MSGBOX_DEFAULT setvar VAR_0x8005, 23 - call SlateportCity_PokemonFanClub_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A setflag FLAG_MOVE_TUTOR_TAUGHT_SWAGGER @@ -7142,7 +6661,7 @@ MauvilleCity_EventScript_2C7F7E:: @ 82C7F7E goto_if_eq MauvilleCity_EventScript_2C7FD2 msgbox MauvilleCity_Text_2C70F3, MSGBOX_DEFAULT setvar VAR_0x8005, 16 - call MauvilleCity_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq MauvilleCity_EventScript_2C7FD2 setflag FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT @@ -7171,7 +6690,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6:: @ 82C7FE6 goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7243, MSGBOX_DEFAULT setvar VAR_0x8005, 29 - call VerdanturfTown_PokemonCenter_1F_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A setflag FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER @@ -7200,7 +6719,7 @@ LavaridgeTown_House_EventScript_2C804E:: @ 82C804E goto_if_eq LavaridgeTown_House_EventScript_2C80A2 msgbox LavaridgeTown_House_Text_2C73B1, MSGBOX_DEFAULT setvar VAR_0x8005, 7 - call LavaridgeTown_House_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq LavaridgeTown_House_EventScript_2C80A2 setflag FLAG_MOVE_TUTOR_TAUGHT_MIMIC @@ -7229,7 +6748,7 @@ FallarborTown_Mart_EventScript_2C80B6:: @ 82C80B6 goto_if_eq FallarborTown_Mart_EventScript_2C810A msgbox FallarborTown_Mart_Text_2C7582, MSGBOX_DEFAULT setvar VAR_0x8005, 8 - call FallarborTown_Mart_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq FallarborTown_Mart_EventScript_2C810A setflag FLAG_MOVE_TUTOR_TAUGHT_METRONOME @@ -7258,7 +6777,7 @@ FortreeCity_House2_EventScript_2C811E:: @ 82C811E goto_if_eq FortreeCity_House2_EventScript_2C8172 msgbox FortreeCity_House2_Text_2C7721, MSGBOX_DEFAULT setvar VAR_0x8005, 24 - call FortreeCity_House2_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq FortreeCity_House2_EventScript_2C8172 setflag FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK @@ -7287,7 +6806,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186:: @ 82C8186 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C7911, MSGBOX_DEFAULT setvar VAR_0x8005, 14 - call LilycoveCity_DepartmentStoreRooftop_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA setflag FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE @@ -7316,7 +6835,7 @@ MossdeepCity_EventScript_2C81EE:: @ 82C81EE goto_if_eq MossdeepCity_EventScript_2C8242 msgbox MossdeepCity_Text_2C7B0D, MSGBOX_DEFAULT setvar VAR_0x8005, 15 - call MossdeepCity_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq MossdeepCity_EventScript_2C8242 setflag FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH @@ -7345,7 +6864,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_2C8256:: @ 82C8256 goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C98, MSGBOX_DEFAULT setvar VAR_0x8005, 4 - call SootopolisCity_PokemonCenter_1F_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA setflag FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE @@ -7374,7 +6893,7 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE:: @ 82C82BE goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E40, MSGBOX_DEFAULT setvar VAR_0x8005, 12 - call PacifidlogTown_PokemonCenter_1F_EventScript_2C8326 + call EventScript_ShowPartyMenu compare VAR_RESULT, 0 goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 setflag FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION @@ -7391,16 +6910,7 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2C831C:: @ 82C831C release end -FallarborTown_Mart_EventScript_2C8326:: @ 82C8326 -FortreeCity_House2_EventScript_2C8326:: @ 82C8326 -LavaridgeTown_House_EventScript_2C8326:: @ 82C8326 -LilycoveCity_DepartmentStoreRooftop_EventScript_2C8326:: @ 82C8326 -MauvilleCity_EventScript_2C8326:: @ 82C8326 -MossdeepCity_EventScript_2C8326:: @ 82C8326 -PacifidlogTown_PokemonCenter_1F_EventScript_2C8326:: @ 82C8326 -SlateportCity_PokemonFanClub_EventScript_2C8326:: @ 82C8326 -SootopolisCity_PokemonCenter_1F_EventScript_2C8326:: @ 82C8326 -VerdanturfTown_PokemonCenter_1F_EventScript_2C8326:: @ 82C8326 +EventScript_ShowPartyMenu:: @ 82C8326 special sub_81B892C waitstate lock diff --git a/data/map_events.s b/data/map_events.s index c6f88d305..cd42bfe75 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -3,6 +3,7 @@ #include "constants/event_objects.h" #include "constants/flags.h" #include "constants/items.h" +#include "constants/map_scripts.h" #include "constants/maps.h" #include "constants/secret_bases.h" #include "constants/vars.h" diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index e89d72c23..e69666120 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -1,6 +1,6 @@ AbandonedShip_Corridors_B1F_MapScripts:: @ 8237D84 - map_script 5, AbandonedShip_Corridors_B1F_MapScript1_237D8F - map_script 1, AbandonedShip_Corridors_B1F_MapScript1_237D98 + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_MapScript1_237D8F + map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_MapScript1_237D98 .byte 0 AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F diff --git a/data/maps/AbandonedShip_Deck/scripts.inc b/data/maps/AbandonedShip_Deck/scripts.inc index 1f0c0e2f2..041c54593 100644 --- a/data/maps/AbandonedShip_Deck/scripts.inc +++ b/data/maps/AbandonedShip_Deck/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_Deck_MapScripts:: @ 823799A - map_script 3, AbandonedShip_Deck_MapScript1_2379A0 + map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_MapScript1_2379A0 .byte 0 AbandonedShip_Deck_MapScript1_2379A0: @ 82379A0 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc index f8b5bcc65..1c495c377 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc @@ -1,6 +1,6 @@ AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 823896C - map_script 5, AbandonedShip_HiddenFloorCorridors_MapScript1_238977 - map_script 1, AbandonedShip_HiddenFloorCorridors_MapScript1_238980 + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_MapScript1_238977 + map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_MapScript1_238980 .byte 0 AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc index f8ecc9001..1c517735e 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_HiddenFloorRooms_MapScripts:: @ 8238C49 - map_script 2, AbandonedShip_HiddenFloorRooms_MapScript2_238C4F + map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_MapScript2_238C4F .byte 0 AbandonedShip_HiddenFloorRooms_MapScript2_238C4F: @ 8238C4F diff --git a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc index 470ae8987..05223592e 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_Rooms_B1F_MapScripts:: @ 8237FB7 - map_script 5, AbandonedShip_Rooms_B1F_MapScript1_237FBD + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_MapScript1_237FBD .byte 0 AbandonedShip_Rooms_B1F_MapScript1_237FBD: @ 8237FBD diff --git a/data/maps/AbandonedShip_Underwater1/scripts.inc b/data/maps/AbandonedShip_Underwater1/scripts.inc index 7e39b1939..b957bb6be 100644 --- a/data/maps/AbandonedShip_Underwater1/scripts.inc +++ b/data/maps/AbandonedShip_Underwater1/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater1_MapScripts:: @ 8238096 - map_script 5, AbandonedShip_Underwater1_MapScript1_23809C + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_MapScript1_23809C .byte 0 AbandonedShip_Underwater1_MapScript1_23809C: @ 823809C diff --git a/data/maps/AbandonedShip_Underwater2/scripts.inc b/data/maps/AbandonedShip_Underwater2/scripts.inc index 17f52c691..cc000b09c 100644 --- a/data/maps/AbandonedShip_Underwater2/scripts.inc +++ b/data/maps/AbandonedShip_Underwater2/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater2_MapScripts:: @ 823895D - map_script 5, AbandonedShip_Underwater2_MapScript1_238963 + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_MapScript1_238963 .byte 0 AbandonedShip_Underwater2_MapScript1_238963: @ 8238963 diff --git a/data/maps/AlteringCave/scripts.inc b/data/maps/AlteringCave/scripts.inc index a9faddc36..185466c80 100644 --- a/data/maps/AlteringCave/scripts.inc +++ b/data/maps/AlteringCave/scripts.inc @@ -1,5 +1,5 @@ AlteringCave_MapScripts:: @ 823B177 - map_script 3, AlteringCave_MapScript1_23B17D + map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_MapScript1_23B17D .byte 0 AlteringCave_MapScript1_23B17D: @ 823B17D diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index 241cb50f1..8d1c029c3 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -1,7 +1,7 @@ AncientTomb_MapScripts:: @ 8238FB3 - map_script 5, AncientTomb_MapScript1_238FC3 - map_script 1, AncientTomb_MapScript1_238FF2 - map_script 3, AncientTomb_MapScript1_238FE1 + map_script MAP_SCRIPT_ON_RESUME, AncientTomb_MapScript1_238FC3 + map_script MAP_SCRIPT_ON_LOAD, AncientTomb_MapScript1_238FF2 + map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_MapScript1_238FE1 .byte 0 AncientTomb_MapScript1_238FC3: @ 8238FC3 @@ -11,7 +11,7 @@ AncientTomb_MapScript1_238FC3: @ 8238FC3 AncientTomb_EventScript_238FCD:: @ 8238FCD specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne AncientTomb_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 1763bcd5d..2995f48dc 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -1,6 +1,6 @@ AquaHideout_B1F_MapScripts:: @ 82339A7 - map_script 5, AquaHideout_B1F_MapScript1_2339B2 - map_script 3, AquaHideout_B1F_MapScript1_2339D0 + map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_MapScript1_2339B2 + map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_MapScript1_2339D0 .byte 0 AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 @@ -10,7 +10,7 @@ AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 AquaHideout_B1F_EventScript_2339BC:: @ 82339BC specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne AquaHideout_B1F_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index ba20cb681..cdfe3f58e 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -1,5 +1,5 @@ AquaHideout_B2F_MapScripts:: @ 8233DCF - map_script 3, AquaHideout_B2F_MapScript1_233DD5 + map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B2F_MapScript1_233DD5 .byte 0 AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5 @@ -14,9 +14,9 @@ AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5 lockall setvar VAR_0x8008, 1 playse SE_PIN - applymovement VAR_0x8008, AquaHideout_B2F_Movement_272598 + applymovement VAR_0x8008, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E + applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 setvar VAR_TEMP_1, 1 releaseall @@ -31,19 +31,19 @@ AquaHideout_B2F_EventScript_233E09:: @ 8233E09 AquaHideout_B2F_EventScript_233E25:: @ 8233E25 setvar VAR_0x8008, 1 setvar VAR_0x8009, 4 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4 + applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 20 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E + applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 msgbox AquaHideout_B2F_Text_233FA6, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4 + applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80 waitmovement 0 removeobject VAR_0x8009 delay 20 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E + applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT setflag FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE diff --git a/data/maps/ArtisanCave_B1F/scripts.inc b/data/maps/ArtisanCave_B1F/scripts.inc index e46737583..433991bea 100644 --- a/data/maps/ArtisanCave_B1F/scripts.inc +++ b/data/maps/ArtisanCave_B1F/scripts.inc @@ -1,5 +1,5 @@ ArtisanCave_B1F_MapScripts:: @ 823AFAD - map_script 3, ArtisanCave_B1F_MapScript1_23AFB3 + map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_MapScript1_23AFB3 .byte 0 ArtisanCave_B1F_MapScript1_23AFB3: @ 823AFB3 diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index cec596b2d..f3a0ecfb4 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattleArenaBattleRoom_MapScripts:: @ 8257487 - map_script 3, BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0 - map_script 2, BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2 - map_script 4, BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C - map_script 5, BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C .byte 0 BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C: @ 825749C diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc index f83f6f339..cc362f5f0 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleArenaCorridor_MapScripts:: @ 82573B9 - map_script 2, BattleFrontier_BattleArenaCorridor_MapScript2_2573BF + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaCorridor_MapScript2_2573BF .byte 0 BattleFrontier_BattleArenaCorridor_MapScript2_2573BF: @ 82573BF diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 2c53b7ed6..5df47aed1 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleArenaLobby_MapScripts:: @ 8255C36 - map_script 2, BattleFrontier_BattleArenaLobby_MapScript2_255C55 - map_script 4, BattleFrontier_BattleArenaLobby_MapScript2_255C41 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaLobby_MapScript2_255C55 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaLobby_MapScript2_255C41 .byte 0 BattleFrontier_BattleArenaLobby_MapScript2_255C41: @ 8255C41 @@ -199,7 +199,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattleArenaLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index 7dbeee042..e50ad9f0a 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C - map_script 3, BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1 - map_script 2, BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00 - map_script 4, BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481 - map_script 5, BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0 .byte 0 BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1 @@ -966,14 +966,14 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919 random 2 copyvar VAR_TEMP_D, VAR_RESULT compare VAR_TEMP_D, 0 - goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setobjectxyperm 6, 2, 0 setobjectmovementtype 6, MOVEMENT_TYPE_FACE_RIGHT return BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938 compare VAR_TEMP_D, 0 - goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_24C95E return diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc index ac43ee9a4..c777f7a7a 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleDomeCorridor_MapScripts:: @ 824B0FE - map_script 2, BattleFrontier_BattleDomeCorridor_MapScript2_24B104 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeCorridor_MapScript2_24B104 .byte 0 BattleFrontier_BattleDomeCorridor_MapScript2_24B104: @ 824B104 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 35c32c3fa..68ecf802b 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2 - map_script 5, BattleFrontier_BattleDomeLobby_MapScript1_2497F2 - map_script 2, BattleFrontier_BattleDomeLobby_MapScript2_24980F - map_script 4, BattleFrontier_BattleDomeLobby_MapScript2_2497FB + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeLobby_MapScript1_2497F2 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_24980F + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_2497FB .byte 0 BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2 @@ -248,7 +248,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattleDomeLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index 6cf1c7817..3901201bb 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleDomePreBattleRoom_MapScripts:: @ 824B1F9 - map_script 2, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218 - map_script 4, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204 .byte 0 BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 8c22a9bc9..9c76544f6 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapScripts:: @ 825ADAB - map_script 3, BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB - map_script 4, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00 - map_script 2, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31 .byte 0 BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB @@ -304,12 +304,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA:: @ 825B1AA end BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4:: @ 825B1B4 - applymovement 1, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8 - applymovement 3, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8 - applymovement 4, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8 - applymovement 5, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4 - applymovement 6, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4 - applymovement 7, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4 + 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 waitmovement 0 return diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index 39d729846..a9e57dde6 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleFactoryLobby_MapScripts:: @ 82583E8 - map_script 2, BattleFrontier_BattleFactoryLobby_MapScript2_258407 - map_script 4, BattleFrontier_BattleFactoryLobby_MapScript2_2583F3 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryLobby_MapScript2_258407 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryLobby_MapScript2_2583F3 .byte 0 BattleFrontier_BattleFactoryLobby_MapScript2_2583F3: @ 82583F3 @@ -208,7 +208,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 special CallFrontierUtilFunc closemessage delay 2 - call BattleFrontier_BattleFactoryLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258783 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index 21681b70a..0049b3f58 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleFactoryPreBattleRoom_MapScripts:: @ 8259ABA - map_script 2, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF - map_script 4, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5 .byte 0 BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5: @ 8259AC5 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 529bcd0c3..bdd4a9ff4 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattlePalaceBattleRoom_MapScripts:: @ 824F815 - map_script 3, BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825 - map_script 2, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861 - map_script 4, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34 .byte 0 BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825 @@ -280,8 +280,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 special CallFrontierUtilFunc applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 waitmovement 0 - applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 - applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 3, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 @@ -323,8 +323,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 special CallFrontierUtilFunc applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 waitmovement 0 - applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 - applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 3, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc index 071f61a09..d5219636c 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePalaceCorridor_MapScripts:: @ 824F4A3 - map_script 2, BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9 .byte 0 BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9: @ 824F4A9 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index 56edda8ad..40205e9b5 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePalaceLobby_MapScripts:: @ 824D77E - map_script 2, BattleFrontier_BattlePalaceLobby_MapScript2_24D79D - map_script 4, BattleFrontier_BattlePalaceLobby_MapScript2_24D789 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceLobby_MapScript2_24D79D + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceLobby_MapScript2_24D789 .byte 0 BattleFrontier_BattlePalaceLobby_MapScript2_24D789: @ 824D789 @@ -223,7 +223,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattlePalaceLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc index 1155cd67b..c7421c2c8 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePikeCorridor_MapScripts:: @ 825C771 - map_script 2, BattleFrontier_BattlePikeCorridor_MapScript2_25C77C - map_script 4, BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeCorridor_MapScript2_25C77C + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7 .byte 0 BattleFrontier_BattlePikeCorridor_MapScript2_25C77C: @ 825C77C diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index 70d7f3c6c..51d6023c8 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePikeLobby_MapScripts:: @ 825B6C6 - map_script 2, BattleFrontier_BattlePikeLobby_MapScript2_25B6D1 - map_script 4, BattleFrontier_BattlePikeLobby_MapScript2_25B6F3 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeLobby_MapScript2_25B6D1 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeLobby_MapScript2_25B6F3 .byte 0 BattleFrontier_BattlePikeLobby_MapScript2_25B6D1: @ 825B6D1 @@ -195,7 +195,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattlePikeLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 setvar VAR_0x8004, 26 special CallBattlePikeFunction diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc index 1c810900c..87f83371c 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattlePikeRandomRoom1_MapScripts:: @ 825D152 - map_script 5, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E - map_script 3, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 - map_script 2, BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167 - map_script 4, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE .byte 0 BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167: @ 825D167 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc index f46760e17..5d438d8bd 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePikeRandomRoom2_MapScripts:: @ 825E392 - map_script 2, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D - map_script 4, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE .byte 0 BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D: @ 825E39D diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc index 4beb26724..9f2dfec16 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattlePikeRandomRoom3_MapScripts:: @ 825E41A - map_script 5, BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A - map_script 2, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A - map_script 4, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466 .byte 0 BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A: @ 825E42A diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index cac594516..54f11f071 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattlePikeThreePathRoom_MapScripts:: @ 825C843 - map_script 5, BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E - map_script 2, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853 - map_script 4, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D .byte 0 BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853: @ 825C853 diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc index 43586bba0..723c666d8 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScripts:: @ 8252A33 - map_script 5, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2 - map_script 2, BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43 - map_script 3, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA .byte 0 BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43: @ 8252A43 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index 686a1bfb2..667c4847e 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePyramidLobby_MapScripts:: @ 8250716 - map_script 2, BattleFrontier_BattlePyramidLobby_MapScript2_250735 - map_script 4, BattleFrontier_BattlePyramidLobby_MapScript2_2497FB + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidLobby_MapScript2_250735 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidLobby_MapScript2_2497FB .byte 0 BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721 @@ -200,7 +200,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattlePyramidLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA @@ -260,7 +260,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250ACC:: @ 8250ACC BattleFrontier_BattlePyramidLobby_EventScript_250ACE:: @ 8250ACE lockall - applymovement 2, BattleFrontier_BattlePyramidLobby_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidLobby_EventScript_250AF0 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index d04fe23f2..39bb39f49 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1 - map_script 5, BattleFrontier_BattlePyramidTop_MapScript1_2550F4 - map_script 2, BattleFrontier_BattlePyramidTop_MapScript2_25516E - map_script 3, BattleFrontier_BattlePyramidTop_MapScript1_2550B6 - map_script 4, BattleFrontier_BattlePyramidTop_MapScript2_2550CE + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidTop_MapScript1_2550F4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidTop_MapScript2_25516E + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidTop_MapScript1_2550B6 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidTop_MapScript2_2550CE .byte 0 BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index b89d2e061..6e3f0c8fa 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleTowerBattleRoom_MapScripts:: @ 8241B40 - map_script 2, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62 - map_script 4, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B .byte 0 BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B: @ 8241B4B @@ -233,9 +233,9 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2725B6 waitmovement 0 playse SE_PIN - applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2421A6 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_2421AB diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index 2699fe9d6..8ebb7ed25 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8 - map_script 3, BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8 - map_script 4, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33 - map_script 2, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43 .byte 0 BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc index 55e21dedb..cf0a50e98 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA - map_script 1, BattleFrontier_BattleTowerCorridor_MapScript1_241AB5 - map_script 2, BattleFrontier_BattleTowerCorridor_MapScript2_241AE6 + map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_BattleTowerCorridor_MapScript1_241AB5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor_MapScript2_241AE6 .byte 0 BattleFrontier_BattleTowerCorridor_MapScript1_241AB5: @ 8241AB5 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc index 73b14fc2e..efab7be70 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A - map_script 3, BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A - map_script 4, BattleFrontier_BattleTowerCorridor2_MapScript2_248D95 - map_script 2, BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerCorridor2_MapScript2_248D95 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2 .byte 0 BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A @@ -68,8 +68,8 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248ED5 waitmovement 0 delay 40 - applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_2725A6 - applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceUp + applymovement 2, Common_Movement_WalkInPlaceUp waitmovement 0 opendoor 7, 1 waitdooranim diff --git a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc index 3dbd5eca3..0d07f5be2 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleTowerElevator_MapScripts:: @ 82419DB - map_script 2, BattleFrontier_BattleTowerElevator_MapScript2_2419E6 - map_script 4, BattleFrontier_BattleTowerElevator_MapScript2_241A96 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerElevator_MapScript2_2419E6 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerElevator_MapScript2_241A96 .byte 0 BattleFrontier_BattleTowerElevator_MapScript2_2419E6: @ 82419E6 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index e1bec2c21..8d407ac1d 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattleTowerLobby_MapScripts:: @ 823E67B - map_script 5, BattleFrontier_BattleTowerLobby_MapScript1_23E690 - map_script 3, BattleFrontier_BattleTowerLobby_MapScript1_23E694 - map_script 2, BattleFrontier_BattleTowerLobby_MapScript2_23E6DD - map_script 4, BattleFrontier_BattleTowerLobby_MapScript2_23E6C9 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleTowerLobby_MapScript1_23E690 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerLobby_MapScript1_23E694 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerLobby_MapScript2_23E6DD + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerLobby_MapScript2_23E6C9 .byte 0 BattleFrontier_BattleTowerLobby_MapScript1_23E690: @ 823E690 @@ -231,7 +231,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE end BattleFrontier_BattleTowerLobby_EventScript_23E930:: @ 823E930 - setvar VAR_0x40BC, 1 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1 return BattleFrontier_BattleTowerLobby_EventScript_23E936:: @ 823E936 @@ -300,12 +300,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattleTowerLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 - setvar VAR_0x40BC, 1 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1 goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 end @@ -380,12 +380,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattleTowerLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 - setvar VAR_0x40BC, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 end @@ -461,12 +461,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattleTowerLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 - setvar VAR_0x40BC, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 end @@ -544,7 +544,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 setvar VAR_0x8004, 6 setvar VAR_0x8005, 0 special sub_8161F74 - call BattleFrontier_BattleTowerLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 @@ -995,7 +995,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3A6:: @ 823F3A6 BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF incrementgamestat 30 - setvar VAR_0x40BC, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 message BattleFrontier_BattleTowerLobby_Text_24144D waitmessage setvar VAR_0x8004, 6 @@ -1058,7 +1058,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463 BattleFrontier_BattleTowerLobby_EventScript_23F496:: @ 823F496 incrementgamestat 30 - setvar VAR_0x40BC, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 message BattleFrontier_BattleTowerLobby_Text_24144D waitmessage setvar VAR_0x8004, 6 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index 7dbfbbc13..0bc74b1bd 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92 - map_script 5, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7 - map_script 3, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0 - map_script 4, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14 - map_script 2, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23 .byte 0 BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7 @@ -64,7 +64,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77 waitmovement 0 moveobjectoffscreen 1 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp 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, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 opendoor 10, 1 waitdooranim diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc index 6a817d50a..7977e75b4 100644 --- a/data/maps/BattleFrontier_Lounge3/scripts.inc +++ b/data/maps/BattleFrontier_Lounge3/scripts.inc @@ -198,7 +198,7 @@ BattleFrontier_Lounge3_EventScript_261FE1:: @ 8261FE1 BattleFrontier_Lounge3_EventScript_261FF1:: @ 8261FF1 closemessage - applymovement VAR_LAST_TALKED, BattleFrontier_Lounge3_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/BattleFrontier_Mart/scripts.inc b/data/maps/BattleFrontier_Mart/scripts.inc index 725fce863..d84b2cb0a 100644 --- a/data/maps/BattleFrontier_Mart/scripts.inc +++ b/data/maps/BattleFrontier_Mart/scripts.inc @@ -36,7 +36,7 @@ BattleFrontier_Mart_EventScript_267B02:: @ 8267B02 BattleFrontier_Mart_EventScript_267B0B:: @ 8267B0B lock - applymovement 2, BattleFrontier_Mart_Movement_2725B0 + applymovement 2, Common_Movement_FaceDown waitmovement 0 msgbox BattleFrontier_Mart_Text_267B8F, MSGBOX_DEFAULT release diff --git a/data/maps/BattleFrontier_OutsideEast/map.json b/data/maps/BattleFrontier_OutsideEast/map.json index e119f89a0..341b20321 100644 --- a/data/maps/BattleFrontier_OutsideEast/map.json +++ b/data/maps/BattleFrontier_OutsideEast/map.json @@ -515,7 +515,7 @@ "y": 51, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "BattleFrontier_OutsideEast_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -523,7 +523,7 @@ "y": 51, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "BattleFrontier_OutsideEast_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" } ] }
\ No newline at end of file diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index 9a90f23f9..5c1af6700 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_OutsideEast_MapScripts:: @ 8242C04 - map_script 5, BattleFrontier_OutsideEast_MapScript1_242C0F - map_script 3, BattleFrontier_OutsideEast_MapScript1_242C2D + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_OutsideEast_MapScript1_242C0F + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideEast_MapScript1_242C2D .byte 0 BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F @@ -10,12 +10,12 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne BattleFrontier_OutsideEast_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D - setvar VAR_0x40BC, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 setflag FLAG_HIDE_BATTLE_TOWER_REPORTER call_if_unset FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_242C3F end diff --git a/data/maps/BattleFrontier_OutsideWest/map.json b/data/maps/BattleFrontier_OutsideWest/map.json index 6f97192ed..a2972e0b4 100644 --- a/data/maps/BattleFrontier_OutsideWest/map.json +++ b/data/maps/BattleFrontier_OutsideWest/map.json @@ -444,7 +444,7 @@ "y": 51, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "BattleFrontier_OutsideWest_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -452,7 +452,7 @@ "y": 51, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "BattleFrontier_OutsideWest_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" } ] }
\ No newline at end of file diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc index da5724259..2d2bdb1c0 100644 --- a/data/maps/BattleFrontier_OutsideWest/scripts.inc +++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc @@ -1,9 +1,9 @@ BattleFrontier_OutsideWest_MapScripts:: @ 823D3E1 - map_script 3, BattleFrontier_OutsideWest_MapScript1_23D3E7 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideWest_MapScript1_23D3E7 .byte 0 BattleFrontier_OutsideWest_MapScript1_23D3E7: @ 823D3E7 - setvar VAR_0x40BC, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 setflag FLAG_HIDE_BATTLE_TOWER_REPORTER end @@ -63,7 +63,7 @@ BattleFrontier_OutsideWest_EventScript_23D4AE:: @ 823D4AE BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA closemessage - applymovement VAR_LAST_TALKED, BattleFrontier_OutsideWest_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST @@ -105,7 +105,7 @@ BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518 faceplayer message BattleFrontier_OutsideWest_Text_23DA60 waitmessage - applymovement 18, BattleFrontier_OutsideWest_Movement_2725A0 + applymovement 18, Common_Movement_FaceAwayPlayer waitmovement 0 waitbuttonpress release @@ -126,16 +126,16 @@ BattleFrontier_OutsideWest_EventScript_23D53D:: @ 823D53D end BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544 - applymovement 9, BattleFrontier_OutsideWest_Movement_2725A8 + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox BattleFrontier_OutsideWest_Text_23DB7D, MSGBOX_DEFAULT - applymovement 10, BattleFrontier_OutsideWest_Movement_2725A4 + applymovement 10, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox BattleFrontier_OutsideWest_Text_23DBCE, MSGBOX_DEFAULT closemessage delay 25 - applymovement 9, BattleFrontier_OutsideWest_Movement_2725A6 - applymovement 10, BattleFrontier_OutsideWest_Movement_2725A6 + applymovement 9, Common_Movement_WalkInPlaceUp + applymovement 10, Common_Movement_WalkInPlaceUp waitmovement 0 release end @@ -157,7 +157,7 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F end BattleFrontier_OutsideWest_EventScript_23D5BA:: @ 823D5BA - applymovement 14, BattleFrontier_OutsideWest_Movement_2725A6 + applymovement 14, Common_Movement_WalkInPlaceUp waitmovement 0 return @@ -298,7 +298,7 @@ BattleFrontier_OutsideWest_EventScript_23D6D7:: @ 823D6D7 faceplayer msgbox BattleFrontier_OutsideWest_Text_23E410, MSGBOX_DEFAULT closemessage - applymovement 23, BattleFrontier_OutsideWest_Movement_2725A2 + applymovement 23, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc index 42c6db053..c99a0de38 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9 - map_script 3, BattleFrontier_PokemonCenter_1F_MapScript1_267904 - map_script 5, BattleFrontier_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_MapScript1_267904 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_PokemonCenter_1F_MapScript1_277C30 .byte 0 BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904 diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc index 7d3c3a2f1..c6ae8da2a 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4 - map_script 2, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B - map_script 4, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C - map_script 1, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE - map_script 3, BattleFrontier_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_2F_MapScript1_276ACF .byte 0 BattleFrontier_PokemonCenter_2F_EventScript_267AB9:: @ 8267AB9 diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index 5ed97bd60..574415c4c 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA - map_script 2, BattleFrontier_ReceptionGate_MapScript2_2661E9 - map_script 3, BattleFrontier_ReceptionGate_MapScript1_2661E5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_ReceptionGate_MapScript2_2661E9 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_MapScript1_2661E5 .byte 0 BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5 @@ -15,9 +15,9 @@ BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3 lockall setvar VAR_0x40D0, 1 playse SE_PIN - applymovement 1, BattleFrontier_ReceptionGate_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, BattleFrontier_ReceptionGate_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_266580, MSGBOX_DEFAULT closemessage @@ -38,14 +38,14 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT msgbox BattleFrontier_ReceptionGate_Text_266703, MSGBOX_DEFAULT closemessage - applymovement 1, BattleFrontier_ReceptionGate_Movement_2725A6 - applymovement 2, BattleFrontier_ReceptionGate_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 2, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 1, BattleFrontier_ReceptionGate_Movement_272598 - applymovement 2, BattleFrontier_ReceptionGate_Movement_272598 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark + applymovement 2, Common_Movement_ExclamationMark + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_266733, MSGBOX_DEFAULT closemessage diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index 6f8d6ee4b..9278252e6 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -181,7 +181,7 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943 compare VAR_FACING, 3 call_if_eq BattleFrontier_ScottsHouse_EventScript_263A34 msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT - applymovement 1, BattleFrontier_ScottsHouse_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox BattleFrontier_ScottsHouse_Text_263BD4, MSGBOX_DEFAULT compare VAR_0x40D1, 13 @@ -227,22 +227,22 @@ BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8 end BattleFrontier_ScottsHouse_EventScript_263A13:: @ 8263A13 - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_263A1E:: @ 8263A1E - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_263A29:: @ 8263A29 - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_263A34:: @ 8263A34 - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 5bff32eb6..594790ff3 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -1,7 +1,7 @@ BirthIsland_Exterior_MapScripts:: @ 8267F15 - map_script 3, BirthIsland_Exterior_MapScript1_267F29 - map_script 5, BirthIsland_Exterior_MapScript1_267F65 - map_script 7, BirthIsland_Exterior_MapScript1_267F25 + map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_MapScript1_267F29 + map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_MapScript1_267F65 + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_MapScript1_267F25 .byte 0 BirthIsland_Exterior_MapScript1_267F25: @ 8267F25 @@ -23,7 +23,7 @@ BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E return BirthIsland_Exterior_EventScript_267F55:: @ 8267F55 - goto_if_set FLAG_DEFEATED_DEOXYS, BirthIsland_Exterior_EventScript_27374E + goto_if_set FLAG_DEFEATED_DEOXYS, Common_EventScript_NopReturn clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE clearflag FLAG_DEOXYS_ROCK_COMPLETE return @@ -35,7 +35,7 @@ BirthIsland_Exterior_MapScript1_267F65: @ 8267F65 BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne BirthIsland_Exterior_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 2 return diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index 1a5ef87ec..5f850ed7b 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 BirthIsland_Harbor_Text_2A6A5D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, BirthIsland_Harbor_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 1, MAP_BIRTH_ISLAND_HARBOR diff --git a/data/maps/CaveOfOrigin_1F/scripts.inc b/data/maps/CaveOfOrigin_1F/scripts.inc index 1804e58ea..e8d722dee 100644 --- a/data/maps/CaveOfOrigin_1F/scripts.inc +++ b/data/maps/CaveOfOrigin_1F/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_1F_MapScripts:: @ 8235768 - map_script 3, CaveOfOrigin_1F_MapScript1_23576E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_1F_MapScript1_23576E .byte 0 CaveOfOrigin_1F_MapScript1_23576E: @ 823576E diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc index 371ea1ba5..c36b60111 100644 --- a/data/maps/CaveOfOrigin_B1F/scripts.inc +++ b/data/maps/CaveOfOrigin_B1F/scripts.inc @@ -6,16 +6,16 @@ CaveOfOrigin_B1F_EventScript_2357A9:: @ 82357A9 faceplayer msgbox CaveOfOrigin_B1F_Text_23586E, MSGBOX_DEFAULT closemessage - applymovement 1, CaveOfOrigin_B1F_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 delay 60 playse SE_PIN - applymovement 1, CaveOfOrigin_B1F_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, CaveOfOrigin_B1F_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 delay 30 - applymovement 1, CaveOfOrigin_B1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 message CaveOfOrigin_B1F_Text_235ACE waitmessage diff --git a/data/maps/CaveOfOrigin_Entrance/scripts.inc b/data/maps/CaveOfOrigin_Entrance/scripts.inc index 1a771ae82..53228f63c 100644 --- a/data/maps/CaveOfOrigin_Entrance/scripts.inc +++ b/data/maps/CaveOfOrigin_Entrance/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_Entrance_MapScripts:: @ 8235759 - map_script 5, CaveOfOrigin_Entrance_MapScript1_23575F + map_script MAP_SCRIPT_ON_RESUME, CaveOfOrigin_Entrance_MapScript1_23575F .byte 0 CaveOfOrigin_Entrance_MapScript1_23575F: @ 823575F diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc index 79c00f28c..e3e296945 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778 - map_script 3, CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E .byte 0 CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E: @ 823577E diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc index 6f9812c38..417a7369a 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788 - map_script 3, CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E .byte 0 CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E: @ 823578E diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc index baa40934a..51d9b8654 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798 - map_script 3, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E .byte 0 CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E: @ 823579E diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 34ae21224..75fcf061c 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -1,7 +1,7 @@ DesertRuins_MapScripts:: @ 822D95B - map_script 5, DesertRuins_MapScript1_22D96B - map_script 1, DesertRuins_MapScript1_22D989 - map_script 3, DesertRuins_MapScript1_22D9CA + map_script MAP_SCRIPT_ON_RESUME, DesertRuins_MapScript1_22D96B + map_script MAP_SCRIPT_ON_LOAD, DesertRuins_MapScript1_22D989 + map_script MAP_SCRIPT_ON_TRANSITION, DesertRuins_MapScript1_22D9CA .byte 0 DesertRuins_MapScript1_22D96B: @ 822D96B @@ -11,7 +11,7 @@ DesertRuins_MapScript1_22D96B: @ 822D96B DesertRuins_EventScript_22D975:: @ 822D975 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne DesertRuins_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/DesertUnderpass/scripts.inc b/data/maps/DesertUnderpass/scripts.inc index c64597d6c..9c5e83180 100644 --- a/data/maps/DesertUnderpass/scripts.inc +++ b/data/maps/DesertUnderpass/scripts.inc @@ -1,5 +1,5 @@ DesertUnderpass_MapScripts:: @ 823AF37 - map_script 3, DesertUnderpass_MapScript1_23AF3D + map_script MAP_SCRIPT_ON_TRANSITION, DesertUnderpass_MapScript1_23AF3D .byte 0 DesertUnderpass_MapScript1_23AF3D: @ 823AF3D diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 8cd863588..32fe0c313 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -152,7 +152,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "DewfordTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -160,7 +160,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "DewfordTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 6c66f4860..d1f382e36 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -1,5 +1,5 @@ DewfordTown_MapScripts:: @ 81E9507 - map_script 3, DewfordTown_MapScript1_1E950D + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_MapScript1_1E950D .byte 0 DewfordTown_MapScript1_1E950D: @ 81E950D @@ -138,10 +138,10 @@ DewfordTown_EventScript_1E9660:: @ 81E9660 clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN hideobjectat 4, MAP_DEWFORD_TOWN - setvar VAR_0x408E, 2 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 2 resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 - copyvar VAR_0x4096, VAR_0x8008 + copyvar VAR_BRINEY_LOCATION, VAR_0x8008 waitstate release end @@ -177,7 +177,7 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7 call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9790 call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9799 closemessage - copyvar VAR_0x4096, VAR_0x8008 + copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN resetobjectpriority 2, MAP_ROUTE109 moveobjectoffscreen 2 diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 90fd3d4ae..3b39fc5d0 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -1,5 +1,5 @@ DewfordTown_Gym_MapScripts:: @ 81FC63C - map_script 3, DewfordTown_Gym_MapScript1_1FC642 + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_Gym_MapScript1_1FC642 .byte 0 DewfordTown_Gym_MapScript1_1FC642: @ 81FC642 @@ -169,12 +169,12 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 call DewfordTown_Gym_EventScript_1FC75D message DewfordTown_Gym_Text_1FD07D waitmessage - call DewfordTown_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox DewfordTown_Gym_Text_1FD0A8, MSGBOX_DEFAULT setflag FLAG_DEFEATED_DEWFORD_GYM setflag FLAG_BADGE02_GET - addvar VAR_0x4085, 1 - compare VAR_0x4085, 6 + addvar VAR_PETALBURG_GYM_STATE, 1 + compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq DewfordTown_Gym_EventScript_271E84 setvar VAR_0x8008, 2 call DewfordTown_Gym_EventScript_271F43 @@ -195,7 +195,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 giveitem_std ITEM_TM08 compare VAR_RESULT, 0 - goto_if_eq DewfordTown_Gym_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM08 return @@ -203,7 +203,7 @@ DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 DewfordTown_Gym_EventScript_1FC878:: @ 81FC878 giveitem_std ITEM_TM08 compare VAR_RESULT, 0 - goto_if_eq DewfordTown_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM08 release diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index 0d9cf514c..22bf5ed6a 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, DewfordTown_Hall_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp 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, DewfordTown_Hall_Movement_2725A6 + applymovement 5, Common_Movement_WalkInPlaceUp waitmovement 0 release end @@ -200,7 +200,7 @@ DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B compare VAR_FACING, 4 goto_if_eq DewfordTown_Hall_EventScript_1FD739 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -224,19 +224,19 @@ DewfordTown_Hall_EventScript_1FD793:: @ 81FD793 return DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 compare VAR_FACING, 3 goto_if_eq DewfordTown_Hall_EventScript_1FD739 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -256,7 +256,7 @@ DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA msgbox DewfordTown_Hall_Text_1FE142, MSGBOX_DEFAULT giveitem_std ITEM_TM36 compare VAR_RESULT, 0 - goto_if_eq DewfordTown_Hall_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM36 release end diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc index e21fd13af..b4f5fc4c6 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523 - map_script 3, DewfordTown_PokemonCenter_1F_MapScript1_1FC52E - map_script 5, DewfordTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_MapScript1_1FC52E + map_script MAP_SCRIPT_ON_RESUME, DewfordTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 DewfordTown_PokemonCenter_1F_MapScript1_1FC52E: @ 81FC52E diff --git a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc index f2a30ecd2..58b0b63a1 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615 - map_script 2, DewfordTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, DewfordTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, DewfordTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, DewfordTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, DewfordTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 DewfordTown_PokemonCenter_2F_EventScript_1FC62A:: @ 81FC62A diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json index 502aae2fc..90175db1d 100644 --- a/data/maps/EverGrandeCity/map.json +++ b/data/maps/EverGrandeCity/map.json @@ -166,7 +166,7 @@ "y": 48, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "EverGrandeCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -190,7 +190,7 @@ "y": 48, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "EverGrandeCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" } ] }
\ No newline at end of file diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc index 75327b839..ffbf5a6cd 100644 --- a/data/maps/EverGrandeCity/scripts.inc +++ b/data/maps/EverGrandeCity/scripts.inc @@ -1,9 +1,9 @@ EverGrandeCity_MapScripts:: @ 81E7D1B - map_script 3, EverGrandeCity_MapScript1_1E7D21 + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_MapScript1_1E7D21 .byte 0 EverGrandeCity_MapScript1_1E7D21: @ 81E7D21 - call_if_set FLAG_SYS_WEATHER_CTRL, EverGrandeCity_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end EverGrandeCity_EventScript_1E7D2B:: @ 81E7D2B diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 149c54cd8..49411aeb4 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -1,11 +1,11 @@ EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF - map_script 3, EverGrandeCity_ChampionsRoom_MapScript1_2289FF - map_script 4, EverGrandeCity_ChampionsRoom_MapScript2_228A05 - map_script 2, EverGrandeCity_ChampionsRoom_MapScript2_228A14 + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_MapScript1_2289FF + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A05 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A14 .byte 0 EverGrandeCity_ChampionsRoom_MapScript1_2289FF: @ 82289FF - call EverGrandeCity_ChampionsRoom_EventScript_271ED7 + call Common_EventScript_SetupRivalGender end EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05 @@ -78,9 +78,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6 msgbox EverGrandeCity_ChampionsRoom_Text_2290CA, MSGBOX_DEFAULT delay 40 playse SE_PIN - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_228C12 msgbox EverGrandeCity_ChampionsRoom_Text_22910B, MSGBOX_DEFAULT @@ -91,9 +91,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228AFB:: @ 8228AFB msgbox EverGrandeCity_ChampionsRoom_Text_229152, MSGBOX_DEFAULT delay 40 playse SE_PIN - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_228C12 msgbox EverGrandeCity_ChampionsRoom_Text_2291A2, MSGBOX_DEFAULT @@ -105,26 +105,26 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 addobject 3 applymovement 3, EverGrandeCity_ChampionsRoom_Movement_228C43 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT call EverGrandeCity_ChampionsRoom_EventScript_272184 msgbox EverGrandeCity_ChampionsRoom_Text_22934D, MSGBOX_DEFAULT - applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 delay 20 - applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown 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, EverGrandeCity_ChampionsRoom_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceUp applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C38 waitmovement 0 delay 20 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown 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, EverGrandeCity_ChampionsRoom_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index 2c0949842..ed8d82be2 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -1,7 +1,7 @@ EverGrandeCity_DrakesRoom_MapScripts:: @ 822869C - map_script 2, EverGrandeCity_DrakesRoom_MapScript2_2286BB - map_script 1, EverGrandeCity_DrakesRoom_MapScript1_2286D2 - map_script 4, EverGrandeCity_DrakesRoom_MapScript2_227F3E + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_DrakesRoom_MapScript2_2286BB + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_DrakesRoom_MapScript1_2286D2 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_DrakesRoom_MapScript2_227F3E .byte 0 EverGrandeCity_DrakesRoom_MapScript2_2286AC: @ 82286AC @@ -13,19 +13,19 @@ EverGrandeCity_DrakesRoom_EventScript_2286B6:: @ 82286B6 end EverGrandeCity_DrakesRoom_MapScript2_2286BB: @ 82286BB - map_script_2 VAR_0x409C, 3, EverGrandeCity_DrakesRoom_EventScript_2286C5 + map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_2286C5 .2byte 0 EverGrandeCity_DrakesRoom_EventScript_2286C5:: @ 82286C5 lockall call EverGrandeCity_DrakesRoom_EventScript_272475 - setvar VAR_0x409C, 4 + setvar VAR_ELITE_4_STATE, 4 releaseall end EverGrandeCity_DrakesRoom_MapScript1_2286D2: @ 82286D2 call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_2286E7 - compare VAR_0x409C, 4 + compare VAR_ELITE_4_STATE, 4 call_if_eq EverGrandeCity_DrakesRoom_EventScript_2286ED end diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 7510f468f..24960d95e 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -1,7 +1,7 @@ EverGrandeCity_GlaciasRoom_MapScripts:: @ 8228412 - map_script 2, EverGrandeCity_GlaciasRoom_MapScript2_228431 - map_script 1, EverGrandeCity_GlaciasRoom_MapScript1_228448 - map_script 4, EverGrandeCity_GlaciasRoom_MapScript2_228422 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_228431 + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_GlaciasRoom_MapScript1_228448 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_228422 .byte 0 EverGrandeCity_GlaciasRoom_MapScript2_228422: @ 8228422 @@ -13,19 +13,19 @@ EverGrandeCity_GlaciasRoom_EventScript_22842C:: @ 822842C end EverGrandeCity_GlaciasRoom_MapScript2_228431: @ 8228431 - map_script_2 VAR_0x409C, 2, EverGrandeCity_GlaciasRoom_EventScript_22843B + map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_22843B .2byte 0 EverGrandeCity_GlaciasRoom_EventScript_22843B:: @ 822843B lockall call EverGrandeCity_GlaciasRoom_EventScript_272475 - setvar VAR_0x409C, 3 + setvar VAR_ELITE_4_STATE, 3 releaseall end EverGrandeCity_GlaciasRoom_MapScript1_228448: @ 8228448 call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_22845D - compare VAR_0x409C, 3 + compare VAR_ELITE_4_STATE, 3 call_if_eq EverGrandeCity_GlaciasRoom_EventScript_228463 end diff --git a/data/maps/EverGrandeCity_Hall1/scripts.inc b/data/maps/EverGrandeCity_Hall1/scripts.inc index a5b7764d7..d9a7adfe3 100644 --- a/data/maps/EverGrandeCity_Hall1/scripts.inc +++ b/data/maps/EverGrandeCity_Hall1/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall1_MapScripts:: @ 8229569 - map_script 4, EverGrandeCity_Hall1_MapScript2_22956F + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall1_MapScript2_22956F .byte 0 EverGrandeCity_Hall1_MapScript2_22956F: @ 822956F diff --git a/data/maps/EverGrandeCity_Hall2/scripts.inc b/data/maps/EverGrandeCity_Hall2/scripts.inc index 565d68168..b831d0fd5 100644 --- a/data/maps/EverGrandeCity_Hall2/scripts.inc +++ b/data/maps/EverGrandeCity_Hall2/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall2_MapScripts:: @ 822957E - map_script 4, EverGrandeCity_Hall2_MapScript2_229584 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall2_MapScript2_229584 .byte 0 EverGrandeCity_Hall2_MapScript2_229584: @ 8229584 diff --git a/data/maps/EverGrandeCity_Hall3/scripts.inc b/data/maps/EverGrandeCity_Hall3/scripts.inc index 85d0bb2f6..d75cf95b6 100644 --- a/data/maps/EverGrandeCity_Hall3/scripts.inc +++ b/data/maps/EverGrandeCity_Hall3/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall3_MapScripts:: @ 8229593 - map_script 4, EverGrandeCity_Hall3_MapScript2_229599 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall3_MapScript2_229599 .byte 0 EverGrandeCity_Hall3_MapScript2_229599: @ 8229599 diff --git a/data/maps/EverGrandeCity_Hall4/scripts.inc b/data/maps/EverGrandeCity_Hall4/scripts.inc index 29f56829a..faf20646a 100644 --- a/data/maps/EverGrandeCity_Hall4/scripts.inc +++ b/data/maps/EverGrandeCity_Hall4/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall4_MapScripts:: @ 82295A8 - map_script 4, EverGrandeCity_Hall4_MapScript2_2295AE + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall4_MapScript2_2295AE .byte 0 EverGrandeCity_Hall4_MapScript2_2295AE: @ 82295AE diff --git a/data/maps/EverGrandeCity_Hall5/scripts.inc b/data/maps/EverGrandeCity_Hall5/scripts.inc index d492c28d2..e586958c2 100644 --- a/data/maps/EverGrandeCity_Hall5/scripts.inc +++ b/data/maps/EverGrandeCity_Hall5/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall5_MapScripts:: @ 82295BD - map_script 4, EverGrandeCity_Hall5_MapScript2_2295C3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall5_MapScript2_2295C3 .byte 0 EverGrandeCity_Hall5_MapScript2_2295C3: @ 82295C3 diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index ddb9ade89..f61547c14 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -1,6 +1,6 @@ EverGrandeCity_HallOfFame_MapScripts:: @ 822982C - map_script 2, EverGrandeCity_HallOfFame_MapScript2_229846 - map_script 4, EverGrandeCity_HallOfFame_MapScript2_229837 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_HallOfFame_MapScript2_229846 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_HallOfFame_MapScript2_229837 .byte 0 EverGrandeCity_HallOfFame_MapScript2_229837: @ 8229837 @@ -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, EverGrandeCity_HallOfFame_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft 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, EverGrandeCity_HallOfFame_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT closemessage - applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 20 dofieldeffect 62 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 77f951d76..971eff7ca 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -1,7 +1,7 @@ EverGrandeCity_PhoebesRoom_MapScripts:: @ 8228174 - map_script 1, EverGrandeCity_PhoebesRoom_MapScript1_2281AA - map_script 4, EverGrandeCity_PhoebesRoom_MapScript2_228184 - map_script 2, EverGrandeCity_PhoebesRoom_MapScript2_228193 + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PhoebesRoom_MapScript1_2281AA + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_228184 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_228193 .byte 0 EverGrandeCity_PhoebesRoom_MapScript2_228184: @ 8228184 @@ -13,19 +13,19 @@ EverGrandeCity_PhoebesRoom_EventScript_22818E:: @ 822818E end EverGrandeCity_PhoebesRoom_MapScript2_228193: @ 8228193 - map_script_2 VAR_0x409C, 1, EverGrandeCity_PhoebesRoom_EventScript_22819D + map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_22819D .2byte 0 EverGrandeCity_PhoebesRoom_EventScript_22819D:: @ 822819D lockall call EverGrandeCity_PhoebesRoom_EventScript_272475 - setvar VAR_0x409C, 2 + setvar VAR_ELITE_4_STATE, 2 releaseall end EverGrandeCity_PhoebesRoom_MapScript1_2281AA: @ 82281AA call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_2281BF - compare VAR_0x409C, 2 + compare VAR_ELITE_4_STATE, 2 call_if_eq EverGrandeCity_PhoebesRoom_EventScript_2281C5 end diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 0ec0acbb2..827c08e54 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34 - map_script 3, EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F - map_script 5, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F + map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F @@ -9,7 +9,7 @@ EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F end EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C - goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonCenter_1F_EventScript_27374E + goto_if_unset FLAG_BADGE06_GET, Common_EventScript_NopReturn clearflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT return diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc index 09d382b2b..40408c1f8 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0 - map_script 2, EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, EverGrandeCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 EverGrandeCity_PokemonCenter_2F_EventScript_229CF5:: @ 8229CF5 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index ce4be66f8..95345af5c 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -1,6 +1,6 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2 - map_script 3, EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD - map_script 5, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD + map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30 .byte 0 EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD @@ -90,11 +90,11 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2296AE:: @ 82296AE end EverGrandeCity_PokemonLeague_1F_EventScript_2296BB:: @ 82296BB - applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox EverGrandeCity_PokemonLeague_1F_Text_2297EF, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc index d3a77a051..2d2d916a3 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07 - map_script 2, EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B - map_script 4, EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C - map_script 1, EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE - map_script 3, EverGrandeCity_PokemonLeague_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_2F_MapScript1_276ACF .byte 0 EverGrandeCity_PokemonLeague_2F_EventScript_229D1C:: @ 8229D1C diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 9152254b3..1713a6d3e 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -1,8 +1,8 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01 - map_script 1, EverGrandeCity_SidneysRoom_MapScript1_227F1D - map_script 4, EverGrandeCity_SidneysRoom_MapScript2_227F3E - map_script 3, EverGrandeCity_SidneysRoom_MapScript1_227F16 - map_script 2, EverGrandeCity_SidneysRoom_MapScript2_227F4D + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_MapScript1_227F1D + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F3E + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_SidneysRoom_MapScript1_227F16 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F4D .byte 0 EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16 @@ -12,7 +12,7 @@ EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16 EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_227F32 - compare VAR_0x409C, 1 + compare VAR_ELITE_4_STATE, 1 call_if_eq EverGrandeCity_SidneysRoom_EventScript_227F38 end @@ -34,13 +34,13 @@ EverGrandeCity_SidneysRoom_EventScript_227F48:: @ 8227F48 end EverGrandeCity_SidneysRoom_MapScript2_227F4D: @ 8227F4D - map_script_2 VAR_0x409C, 0, EverGrandeCity_SidneysRoom_EventScript_227F57 + map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_227F57 .2byte 0 EverGrandeCity_SidneysRoom_EventScript_227F57:: @ 8227F57 lockall call EverGrandeCity_SidneysRoom_EventScript_272475 - setvar VAR_0x409C, 1 + setvar VAR_ELITE_4_STATE, 1 releaseall end diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 4afffa73c..863319184 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -123,7 +123,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -131,7 +131,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -147,7 +147,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -163,7 +163,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index 5e06ed4cb..50e19cfe5 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -1,10 +1,10 @@ FallarborTown_MapScripts:: @ 81EB1FA - map_script 3, FallarborTown_MapScript1_1EB200 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_MapScript1_1EB200 .byte 0 FallarborTown_MapScript1_1EB200: @ 81EB200 setflag FLAG_VISITED_FALLARBOR_TOWN - setvar VAR_0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 clearflag FLAG_CONTEST_SKETCH_CREATED end diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index dff1d26e0..b376f72e4 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -1,7 +1,7 @@ FallarborTown_BattleTentBattleRoom_MapScripts:: @ 8200899 - map_script 3, FallarborTown_BattleTentBattleRoom_MapScript1_2008A9 - map_script 2, FallarborTown_BattleTentBattleRoom_MapScript2_2008DD - map_script 4, FallarborTown_BattleTentBattleRoom_MapScript2_200BB0 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_BattleTentBattleRoom_MapScript1_2008A9 + map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentBattleRoom_MapScript2_2008DD + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentBattleRoom_MapScript2_200BB0 .byte 0 FallarborTown_BattleTentBattleRoom_MapScript1_2008A9: @ 82008A9 diff --git a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc index f3d0a924e..327033829 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc @@ -1,5 +1,5 @@ FallarborTown_BattleTentCorridor_MapScripts:: @ 82006A7 - map_script 2, FallarborTown_BattleTentCorridor_MapScript2_2006AD + map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentCorridor_MapScript2_2006AD .byte 0 FallarborTown_BattleTentCorridor_MapScript2_2006AD: @ 82006AD diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index 5d05570cc..6d7ea6be5 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -1,6 +1,6 @@ FallarborTown_BattleTentLobby_MapScripts:: @ 81FFE66 - map_script 2, FallarborTown_BattleTentLobby_MapScript2_1FFE85 - map_script 4, FallarborTown_BattleTentLobby_MapScript2_1FFE71 + map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentLobby_MapScript2_1FFE85 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentLobby_MapScript2_1FFE71 .byte 0 FallarborTown_BattleTentLobby_MapScript2_1FFE71: @ 81FFE71 @@ -191,7 +191,7 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2 special LoadPlayerParty closemessage delay 2 - call FallarborTown_BattleTentLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq FallarborTown_BattleTentLobby_EventScript_2001AB diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc index caf915e85..2255f90d3 100644 --- a/data/maps/FallarborTown_House1/scripts.inc +++ b/data/maps/FallarborTown_House1/scripts.inc @@ -20,7 +20,7 @@ FallarborTown_House1_EventScript_200F38:: @ 8200F38 msgbox FallarborTown_House1_Text_201159, MSGBOX_DEFAULT giveitem_std ITEM_TM27 compare VAR_RESULT, 0 - goto_if_eq FallarborTown_House1_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setvar VAR_0x8004, 280 call FallarborTown_House1_EventScript_2723E4 setflag FLAG_RECEIVED_TM27 diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc index 962c4f64e..2f2ec1b3f 100644 --- a/data/maps/FallarborTown_House2/scripts.inc +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -3,7 +3,7 @@ FallarborTown_House2_MapScripts:: @ 8201382 FallarborTown_House2_EventScript_201383:: @ 8201383 lockall - applymovement 1, FallarborTown_House2_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_2013A8 msgbox FallarborTown_House2_Text_20145C, MSGBOX_DEFAULT diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index c9a7ef27c..d34e139eb 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD - map_script 3, FallarborTown_PokemonCenter_1F_MapScript1_200BD8 - map_script 5, FallarborTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_MapScript1_200BD8 + map_script MAP_SCRIPT_ON_RESUME, FallarborTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 FallarborTown_PokemonCenter_1F_MapScript1_200BD8: @ 8200BD8 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc index 93482e860..8fce8e729 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB - map_script 2, FallarborTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, FallarborTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, FallarborTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, FallarborTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, FallarborTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 FallarborTown_PokemonCenter_2F_EventScript_200F00:: @ 8200F00 diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc index 37c16885f..347c89aa0 100644 --- a/data/maps/FarawayIsland_Entrance/scripts.inc +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -1,5 +1,5 @@ FarawayIsland_Entrance_MapScripts:: @ 8267C8E - map_script 3, FarawayIsland_Entrance_MapScript1_267C94 + map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Entrance_MapScript1_267C94 .byte 0 FarawayIsland_Entrance_MapScript1_267C94: @ 8267C94 @@ -24,7 +24,7 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 goto_if_eq FarawayIsland_Entrance_EventScript_267CE7 msgbox FarawayIsland_Entrance_Text_2A6A5D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, FarawayIsland_Entrance_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 1, MAP_FARAWAY_ISLAND_ENTRANCE diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index a1038edac..7051d376c 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -1,8 +1,8 @@ FarawayIsland_Interior_MapScripts:: @ 8267CFA - map_script 5, FarawayIsland_Interior_MapScript1_267D54 - map_script 3, FarawayIsland_Interior_MapScript1_267D72 - map_script 2, FarawayIsland_Interior_MapScript2_267D98 - map_script 7, FarawayIsland_Interior_MapScript1_267D0F + map_script MAP_SCRIPT_ON_RESUME, FarawayIsland_Interior_MapScript1_267D54 + map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Interior_MapScript1_267D72 + map_script MAP_SCRIPT_ON_FRAME_TABLE, FarawayIsland_Interior_MapScript2_267D98 + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, FarawayIsland_Interior_MapScript1_267D0F .byte 0 FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F @@ -33,7 +33,7 @@ FarawayIsland_Interior_MapScript1_267D54: @ 8267D54 FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne FarawayIsland_Interior_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return @@ -44,7 +44,7 @@ FarawayIsland_Interior_MapScript1_267D72: @ 8267D72 end FarawayIsland_Interior_EventScript_267D86:: @ 8267D86 - goto_if_set FLAG_DEFEATED_MEW, FarawayIsland_Interior_EventScript_27374E + goto_if_set FLAG_DEFEATED_MEW, Common_EventScript_NopReturn clearflag FLAG_HIDE_MEW setvar VAR_TEMP_1, 0 return @@ -56,9 +56,9 @@ FarawayIsland_Interior_MapScript2_267D98: @ 8267D98 FarawayIsland_Interior_EventScript_267DA2:: @ 8267DA2 lockall playse SE_PIN - applymovement 1, FarawayIsland_Interior_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, FarawayIsland_Interior_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 applymovement 1, FarawayIsland_Interior_Movement_267DCE waitmovement 0 diff --git a/data/maps/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc index 3888c61ef..ddba0dc0b 100644 --- a/data/maps/FieryPath/scripts.inc +++ b/data/maps/FieryPath/scripts.inc @@ -1,5 +1,5 @@ FieryPath_MapScripts:: @ 8230F24 - map_script 3, FieryPath_MapScript1_230F2A + map_script MAP_SCRIPT_ON_TRANSITION, FieryPath_MapScript1_230F2A .byte 0 FieryPath_MapScript1_230F2A: @ 8230F2A diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index d66ec1f4b..454fc34d3 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -198,7 +198,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -206,7 +206,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -222,7 +222,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -230,7 +230,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" } ] }
\ No newline at end of file diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index d5c1ab29e..1c464df9d 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -1,6 +1,6 @@ FortreeCity_MapScripts:: @ 81E25A4 - map_script 3, FortreeCity_MapScript1_1E25AF - map_script 5, FortreeCity_MapScript1_1E25B3 + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_MapScript1_1E25AF + map_script MAP_SCRIPT_ON_RESUME, FortreeCity_MapScript1_1E25B3 .byte 0 FortreeCity_MapScript1_1E25AF: @ 81E25AF diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 17633c0d5..30cf8736a 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -1,6 +1,6 @@ FortreeCity_Gym_MapScripts:: @ 82165AB - map_script 3, FortreeCity_Gym_MapScript1_2165B6 - map_script 4, FortreeCity_Gym_MapScript2_2165BA + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_MapScript1_2165B6 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_Gym_MapScript2_2165BA .byte 0 FortreeCity_Gym_MapScript1_2165B6: @ 82165B6 @@ -28,7 +28,7 @@ FortreeCity_Gym_EventScript_2165C8:: @ 82165C8 FortreeCity_Gym_EventScript_2165FD:: @ 82165FD message FortreeCity_Gym_Text_216EEC waitmessage - call FortreeCity_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox FortreeCity_Gym_Text_216F17, MSGBOX_DEFAULT setflag FLAG_DEFEATED_FORTREE_GYM setflag FLAG_BADGE06_GET @@ -51,7 +51,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD FortreeCity_Gym_EventScript_216646:: @ 8216646 giveitem_std ITEM_TM40 compare VAR_RESULT, 0 - goto_if_eq FortreeCity_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM40 release @@ -60,7 +60,7 @@ FortreeCity_Gym_EventScript_216646:: @ 8216646 FortreeCity_Gym_EventScript_21666A:: @ 821666A giveitem_std ITEM_TM40 compare VAR_RESULT, 0 - goto_if_eq FortreeCity_Gym_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM40 return diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc index cebd18884..34344bca3 100644 --- a/data/maps/FortreeCity_House2/scripts.inc +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -21,7 +21,7 @@ FortreeCity_House2_EventScript_2177CB:: @ 82177CB msgbox FortreeCity_House2_Text_217A28, MSGBOX_DEFAULT giveitem_std ITEM_TM10 compare VAR_RESULT, 0 - goto_if_eq FortreeCity_House2_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM10 msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT release diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index fe4aefe5f..5dc9d769a 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -21,25 +21,25 @@ FortreeCity_House4_EventScript_217C8A:: @ 8217C8A end FortreeCity_House4_EventScript_217CC4:: @ 8217CC4 - applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox FortreeCity_House4_Text_217DD2, MSGBOX_DEFAULT releaseall end FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 - applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox FortreeCity_House4_Text_217E05, MSGBOX_DEFAULT giveitem_std ITEM_MENTAL_HERB compare VAR_RESULT, 0 - goto_if_eq FortreeCity_House4_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MENTAL_HERB releaseall end FortreeCity_House4_EventScript_217D06:: @ 8217D06 - applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox FortreeCity_House4_Text_217EA8, MSGBOX_DEFAULT releaseall diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc index 339cae9eb..070956590 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8 - map_script 3, FortreeCity_PokemonCenter_1F_MapScript1_2173E3 - map_script 5, FortreeCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_MapScript1_2173E3 + map_script MAP_SCRIPT_ON_RESUME, FortreeCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 FortreeCity_PokemonCenter_1F_MapScript1_2173E3: @ 82173E3 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc index f631aa3c6..dbe2e31ec 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E - map_script 2, FortreeCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, FortreeCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, FortreeCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, FortreeCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, FortreeCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 FortreeCity_PokemonCenter_2F_EventScript_217653:: @ 8217653 diff --git a/data/maps/GraniteCave_B1F/scripts.inc b/data/maps/GraniteCave_B1F/scripts.inc index 360b10a08..099e5a501 100644 --- a/data/maps/GraniteCave_B1F/scripts.inc +++ b/data/maps/GraniteCave_B1F/scripts.inc @@ -1,7 +1,7 @@ GraniteCave_B1F_MapScripts:: @ 822DC5E - map_script 2, GraniteCave_B1F_MapScript2_2A8327 - map_script 3, GraniteCave_B1F_MapScript1_2A8331 - map_script 5, GraniteCave_B1F_MapScript1_22DC6E + 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 .byte 0 GraniteCave_B1F_MapScript1_22DC6E: @ 822DC6E diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json index d6bbd2f46..eefeed365 100644 --- a/data/maps/InsideOfTruck/map.json +++ b/data/maps/InsideOfTruck/map.json @@ -83,7 +83,7 @@ "x": 3, "y": 1, "elevation": 3, - "var": "VAR_0x4092", + "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "0", "script": "InsideOfTruck_EventScript_23BF04" }, @@ -92,7 +92,7 @@ "x": 3, "y": 2, "elevation": 3, - "var": "VAR_0x4092", + "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "0", "script": "InsideOfTruck_EventScript_23BF04" }, @@ -101,7 +101,7 @@ "x": 3, "y": 3, "elevation": 3, - "var": "VAR_0x4092", + "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "0", "script": "InsideOfTruck_EventScript_23BF04" } diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index 858975d7a..672b2003b 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -1,6 +1,6 @@ InsideOfTruck_MapScripts:: @ 823BEDA - map_script 1, InsideOfTruck_MapScript1_23BEE5 - map_script 5, InsideOfTruck_MapScript1_23BF01 + map_script MAP_SCRIPT_ON_LOAD, InsideOfTruck_MapScript1_23BEE5 + map_script MAP_SCRIPT_ON_RESUME, InsideOfTruck_MapScript1_23BF01 .byte 0 InsideOfTruck_MapScript1_23BEE5: @ 823BEE5 @@ -25,26 +25,26 @@ InsideOfTruck_EventScript_23BF04:: @ 823BF04 InsideOfTruck_EventScript_23BF20:: @ 823BF20 setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F - setvar VAR_0x4092, 1 + setvar VAR_LITTLEROOT_INTRO_STATE, 1 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL - setvar VAR_0x408C, 1 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 releaseall end InsideOfTruck_EventScript_23BF46:: @ 823BF46 setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F - setvar VAR_0x4092, 2 + setvar VAR_LITTLEROOT_INTRO_STATE, 2 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL - setvar VAR_0x4082, 1 + setvar VAR_LITTLEROOT_HOUSES_STATE, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 releaseall end diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index 3d0efa1ca..cb400e817 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -1,7 +1,7 @@ IslandCave_MapScripts:: @ 8238E2A - map_script 5, IslandCave_MapScript1_238E3A - map_script 1, IslandCave_MapScript1_238E58 - map_script 3, IslandCave_MapScript1_238E99 + map_script MAP_SCRIPT_ON_RESUME, IslandCave_MapScript1_238E3A + map_script MAP_SCRIPT_ON_LOAD, IslandCave_MapScript1_238E58 + map_script MAP_SCRIPT_ON_TRANSITION, IslandCave_MapScript1_238E99 .byte 0 IslandCave_MapScript1_238E3A: @ 8238E3A @@ -11,7 +11,7 @@ IslandCave_MapScript1_238E3A: @ 8238E3A IslandCave_EventScript_238E44:: @ 8238E44 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne IslandCave_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 93788a703..3df62fc7d 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -1,7 +1,7 @@ JaggedPass_MapScripts:: @ 8230656 - map_script 5, JaggedPass_MapScript1_230666 - map_script 3, JaggedPass_MapScript1_23068B - map_script 1, JaggedPass_MapScript1_23069C + map_script MAP_SCRIPT_ON_RESUME, JaggedPass_MapScript1_230666 + map_script MAP_SCRIPT_ON_TRANSITION, JaggedPass_MapScript1_23068B + map_script MAP_SCRIPT_ON_LOAD, JaggedPass_MapScript1_23069C .byte 0 JaggedPass_MapScript1_230666: @ 8230666 @@ -21,7 +21,7 @@ JaggedPass_EventScript_230685:: @ 8230685 return JaggedPass_MapScript1_23068B: @ 823068B - compare VAR_0x40BD, 1 + compare VAR_JAGGED_PASS_ASH_WEATHER, 1 call_if_eq JaggedPass_EventScript_230697 end @@ -71,27 +71,27 @@ JaggedPass_EventScript_230718:: @ 8230718 goto_if_set FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS, JaggedPass_EventScript_230766 waitse playse SE_PIN - applymovement 5, JaggedPass_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, JaggedPass_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 - applymovement 5, JaggedPass_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 msgbox JaggedPass_Text_230CCB, MSGBOX_DEFAULT closemessage trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_230D2D setflag FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS - applymovement 5, JaggedPass_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end JaggedPass_EventScript_230766:: @ 8230766 - applymovement 5, JaggedPass_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 msgbox JaggedPass_Text_230D65, MSGBOX_DEFAULT closemessage - applymovement 5, JaggedPass_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index 9bec14bd1..65a6a25d3 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -216,7 +216,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -232,7 +232,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -240,7 +240,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -248,7 +248,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "hidden_item", diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 899df4d2c..5c1612199 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -1,17 +1,17 @@ LavaridgeTown_MapScripts:: @ 81EA4D3 - map_script 3, LavaridgeTown_MapScript1_1EA4DE - map_script 2, LavaridgeTown_MapScript2_1EA547 + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_MapScript1_1EA4DE + map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_MapScript2_1EA547 .byte 0 LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE setflag FLAG_VISITED_LAVARIDGE_TOWN call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, LavaridgeTown_EventScript_1EA514 call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F - call LavaridgeTown_EventScript_271ED7 - call LavaridgeTown_EventScript_271EFB - compare VAR_0x4053, 1 + call Common_EventScript_SetupRivalGender + call Common_EventScript_SetupRivalOnBikeGender + compare VAR_LAVARIDGE_RIVAL_STATE, 1 call_if_eq LavaridgeTown_EventScript_1EA518 - compare VAR_0x4053, 1 + compare VAR_LAVARIDGE_RIVAL_STATE, 1 call_if_eq LavaridgeTown_EventScript_1EA543 end @@ -41,7 +41,7 @@ LavaridgeTown_EventScript_1EA543:: @ 81EA543 return LavaridgeTown_MapScript2_1EA547: @ 81EA547 - map_script_2 VAR_0x4053, 1, LavaridgeTown_EventScript_1EA551 + map_script_2 VAR_LAVARIDGE_RIVAL_STATE, 1, LavaridgeTown_EventScript_1EA551 .2byte 0 LavaridgeTown_EventScript_1EA551:: @ 81EA551 @@ -94,7 +94,7 @@ LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF compare VAR_0x8008, 9 call_if_ne LavaridgeTown_EventScript_1EA6C9 removeobject 7 - setvar VAR_0x4053, 2 + setvar VAR_LAVARIDGE_RIVAL_STATE, 2 clearflag FLAG_SPECIAL_FLAG_0x4000 savebgm MUS_DUMMY fadedefaultbgm @@ -110,12 +110,12 @@ LavaridgeTown_EventScript_1EA635:: @ 81EA635 return LavaridgeTown_EventScript_1EA63A:: @ 81EA63A - applymovement 8, LavaridgeTown_Movement_2725A6 + applymovement 8, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 8, LavaridgeTown_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, LavaridgeTown_Movement_27259A + applymovement 8, Common_Movement_Delay48 waitmovement 0 return @@ -127,14 +127,14 @@ LavaridgeTown_EventScript_1EA65C:: @ 81EA65C waitmovement 0 closedoor 12, 15 waitdooranim - applymovement 8, LavaridgeTown_Movement_2725A4 + applymovement 8, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_PIN - applymovement 8, LavaridgeTown_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, LavaridgeTown_Movement_27259A + applymovement 8, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LavaridgeTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index bf48225ec..bccd1dfef 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -1,5 +1,5 @@ LavaridgeTown_Gym_1F_MapScripts:: @ 81FE6F4 - map_script 3, LavaridgeTown_Gym_1F_MapScript1_1FE6FA + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_1F_MapScript1_1FE6FA .byte 0 LavaridgeTown_Gym_1F_MapScript1_1FE6FA: @ 81FE6FA @@ -71,18 +71,18 @@ LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 message LavaridgeTown_Gym_1F_Text_1FF32F waitmessage - call LavaridgeTown_Gym_1F_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox LavaridgeTown_Gym_1F_Text_1FF359, MSGBOX_DEFAULT setflag FLAG_FLANNERY_GIVES_BADGE_INFO setflag FLAG_DEFEATED_LAVARIDGE_GYM setflag FLAG_BADGE04_GET - addvar VAR_0x4085, 1 - compare VAR_0x4085, 6 + addvar VAR_PETALBURG_GYM_STATE, 1 + compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq LavaridgeTown_Gym_1F_EventScript_271E84 setvar VAR_0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_271F43 setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY - setvar VAR_0x4053, 1 + setvar VAR_LAVARIDGE_RIVAL_STATE, 1 call LavaridgeTown_Gym_1F_EventScript_1FE841 closemessage delay 30 @@ -98,7 +98,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D giveitem_std ITEM_TM50 compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_Gym_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM50 release @@ -107,7 +107,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841 giveitem_std ITEM_TM50 compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_Gym_1F_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM50 return diff --git a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc index a8a6eaa54..d2e8d90b5 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc @@ -1,5 +1,5 @@ LavaridgeTown_Gym_B1F_MapScripts:: @ 81FF87E - map_script 3, LavaridgeTown_Gym_B1F_MapScript1_1FF884 + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_B1F_MapScript1_1FF884 .byte 0 LavaridgeTown_Gym_B1F_MapScript1_1FF884: @ 81FF884 diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc index e57996318..f6ad8e26b 100644 --- a/data/maps/LavaridgeTown_HerbShop/scripts.inc +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -32,7 +32,7 @@ LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 msgbox LavaridgeTown_HerbShop_Text_1FE584, MSGBOX_DEFAULT giveitem_std ITEM_CHARCOAL compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_HerbShop_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLFLAG_RECEIVED_CHARCOAL release end diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc index f4fabbf72..2a0cb4a1e 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA - map_script 3, LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05 - map_script 5, LavaridgeTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05 + map_script MAP_SCRIPT_ON_RESUME, LavaridgeTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05: @ 81FFB05 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc index b1491f621..b022df141 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 81FFC97 - map_script 2, LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, LavaridgeTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 LavaridgeTown_PokemonCenter_2F_EventScript_1FFCAC:: @ 81FFCAC diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index 63c5925fd..ea771c3b5 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -428,7 +428,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LilycoveCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -444,7 +444,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LilycoveCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index cfa6b3867..7f4c9e3fd 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -1,14 +1,14 @@ LilycoveCity_MapScripts:: @ 81E2B3C - map_script 3, LilycoveCity_MapScript1_1E2B47 - map_script 1, LilycoveCity_MapScript1_1E2B61 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_MapScript1_1E2B47 + map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_MapScript1_1E2B61 .byte 0 LilycoveCity_MapScript1_1E2B47: @ 81E2B47 setflag FLAG_VISITED_LILYCOVE_CITY - setvar VAR_0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER - call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_27207A - call LilycoveCity_EventScript_271ED7 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 + call Common_EventScript_SetupRivalGender end LilycoveCity_MapScript1_1E2B61: @ 81E2B61 @@ -40,7 +40,7 @@ LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_LILYCOVE_RECEIVED_BERRY msgbox LilycoveCity_Text_2A72E3, MSGBOX_DEFAULT release @@ -134,13 +134,13 @@ LilycoveCity_EventScript_1E2CD4:: @ 81E2CD4 LilycoveCity_EventScript_1E2CDD:: @ 81E2CDD lockall msgbox LilycoveCity_Text_1E494D, MSGBOX_NPC - applymovement 20, LilycoveCity_Movement_2725A2 + applymovement 20, Common_Movement_FaceOriginalDirection end LilycoveCity_EventScript_1E2CEE:: @ 81E2CEE lockall msgbox LilycoveCity_Text_1E49F4, MSGBOX_NPC - applymovement 19, LilycoveCity_Movement_2725A2 + applymovement 19, Common_Movement_FaceOriginalDirection end LilycoveCity_EventScript_1E2CFF:: @ 81E2CFF @@ -197,10 +197,10 @@ LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D lockall goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_1E2DB0 msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, LilycoveCity_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_Text_1E3D4A, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_MET_WAILMER_TRAINER releaseall @@ -387,7 +387,7 @@ LilycoveCity_EventScript_1E2FFD:: @ 81E2FFD LilycoveCity_EventScript_1E3006:: @ 81E3006 closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 diff --git a/data/maps/LilycoveCity_ContestHall/scripts.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc index f6a53cc5e..5823b6da4 100644 --- a/data/maps/LilycoveCity_ContestHall/scripts.inc +++ b/data/maps/LilycoveCity_ContestHall/scripts.inc @@ -22,7 +22,7 @@ LilycoveCity_ContestHall_EventScript_21B4A9:: @ 821B4A9 faceplayer msgbox LilycoveCity_ContestHall_Text_21B977, MSGBOX_DEFAULT closemessage - applymovement 4, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 4, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -32,7 +32,7 @@ LilycoveCity_ContestHall_EventScript_21B4C0:: @ 821B4C0 faceplayer msgbox LilycoveCity_ContestHall_Text_21B9DC, MSGBOX_DEFAULT closemessage - applymovement 5, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -42,7 +42,7 @@ LilycoveCity_ContestHall_EventScript_21B4D7:: @ 821B4D7 faceplayer msgbox LilycoveCity_ContestHall_Text_21BA44, MSGBOX_DEFAULT closemessage - applymovement 6, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -52,7 +52,7 @@ LilycoveCity_ContestHall_EventScript_21B4EE:: @ 821B4EE faceplayer msgbox LilycoveCity_ContestHall_Text_21BAD5, MSGBOX_DEFAULT closemessage - applymovement 7, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -62,7 +62,7 @@ LilycoveCity_ContestHall_EventScript_21B505:: @ 821B505 faceplayer msgbox LilycoveCity_ContestHall_Text_21BB84, MSGBOX_DEFAULT closemessage - applymovement 8, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -72,7 +72,7 @@ LilycoveCity_ContestHall_EventScript_21B51C:: @ 821B51C faceplayer msgbox LilycoveCity_ContestHall_Text_21BBDD, MSGBOX_DEFAULT closemessage - applymovement 9, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 9, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -86,7 +86,7 @@ LilycoveCity_ContestHall_EventScript_21B53C:: @ 821B53C faceplayer msgbox LilycoveCity_ContestHall_Text_21BC89, MSGBOX_DEFAULT closemessage - applymovement 12, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 12, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -96,7 +96,7 @@ LilycoveCity_ContestHall_EventScript_21B553:: @ 821B553 faceplayer msgbox LilycoveCity_ContestHall_Text_21BD30, MSGBOX_DEFAULT closemessage - applymovement 22, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 22, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -106,7 +106,7 @@ LilycoveCity_ContestHall_EventScript_21B56A:: @ 821B56A faceplayer msgbox LilycoveCity_ContestHall_Text_21BD70, MSGBOX_DEFAULT closemessage - applymovement 11, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 11, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -116,7 +116,7 @@ LilycoveCity_ContestHall_EventScript_21B581:: @ 821B581 faceplayer msgbox LilycoveCity_ContestHall_Text_21BDDD, MSGBOX_DEFAULT closemessage - applymovement 13, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 13, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -126,7 +126,7 @@ LilycoveCity_ContestHall_EventScript_21B598:: @ 821B598 faceplayer msgbox LilycoveCity_ContestHall_Text_21BE16, MSGBOX_DEFAULT closemessage - applymovement 14, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 14, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -136,7 +136,7 @@ LilycoveCity_ContestHall_EventScript_21B5AF:: @ 821B5AF faceplayer msgbox LilycoveCity_ContestHall_Text_21BE77, MSGBOX_DEFAULT closemessage - applymovement 15, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 15, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -146,7 +146,7 @@ LilycoveCity_ContestHall_EventScript_21B5C6:: @ 821B5C6 faceplayer msgbox LilycoveCity_ContestHall_Text_21BEDE, MSGBOX_DEFAULT closemessage - applymovement 16, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 16, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -156,7 +156,7 @@ LilycoveCity_ContestHall_EventScript_21B5DD:: @ 821B5DD faceplayer msgbox LilycoveCity_ContestHall_Text_21BF6E, MSGBOX_DEFAULT closemessage - applymovement 17, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 17, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -166,7 +166,7 @@ LilycoveCity_ContestHall_EventScript_21B5F4:: @ 821B5F4 faceplayer msgbox LilycoveCity_ContestHall_Text_21BFE3, MSGBOX_DEFAULT closemessage - applymovement 18, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 18, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -176,7 +176,7 @@ LilycoveCity_ContestHall_EventScript_21B60B:: @ 821B60B faceplayer msgbox LilycoveCity_ContestHall_Text_21C07F, MSGBOX_DEFAULT closemessage - applymovement 19, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 19, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -186,7 +186,7 @@ LilycoveCity_ContestHall_EventScript_21B622:: @ 821B622 faceplayer msgbox LilycoveCity_ContestHall_Text_21C0D8, MSGBOX_DEFAULT closemessage - applymovement 21, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 21, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -196,7 +196,7 @@ LilycoveCity_ContestHall_EventScript_21B639:: @ 821B639 faceplayer msgbox LilycoveCity_ContestHall_Text_21C137, MSGBOX_DEFAULT closemessage - applymovement 20, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 20, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -206,7 +206,7 @@ LilycoveCity_ContestHall_EventScript_21B650:: @ 821B650 faceplayer msgbox LilycoveCity_ContestHall_Text_21C1A4, MSGBOX_DEFAULT closemessage - applymovement 23, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 23, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -216,7 +216,7 @@ LilycoveCity_ContestHall_EventScript_21B667:: @ 821B667 faceplayer msgbox LilycoveCity_ContestHall_Text_21C215, MSGBOX_DEFAULT closemessage - applymovement 24, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 24, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -226,7 +226,7 @@ LilycoveCity_ContestHall_EventScript_21B67E:: @ 821B67E faceplayer msgbox LilycoveCity_ContestHall_Text_21C27F, MSGBOX_DEFAULT closemessage - applymovement 25, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 25, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -236,7 +236,7 @@ LilycoveCity_ContestHall_EventScript_21B695:: @ 821B695 faceplayer msgbox LilycoveCity_ContestHall_Text_21C2BB, MSGBOX_DEFAULT closemessage - applymovement 26, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 26, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -246,7 +246,7 @@ LilycoveCity_ContestHall_EventScript_21B6AC:: @ 821B6AC faceplayer msgbox LilycoveCity_ContestHall_Text_21C307, MSGBOX_DEFAULT closemessage - applymovement 27, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 27, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -256,18 +256,18 @@ LilycoveCity_ContestHall_EventScript_21B6C3:: @ 821B6C3 faceplayer msgbox LilycoveCity_ContestHall_Text_21C365, MSGBOX_DEFAULT closemessage - applymovement 28, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 28, Common_Movement_FaceOriginalDirection waitmovement 0 release end LilycoveCity_ContestHall_EventScript_21B6DA:: @ 821B6DA lockall - applymovement 29, LilycoveCity_ContestHall_Movement_27259E + applymovement 29, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_ContestHall_Text_21C3F4, MSGBOX_DEFAULT closemessage - applymovement 29, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 29, Common_Movement_FaceOriginalDirection waitmovement 0 delay 25 msgbox LilycoveCity_ContestHall_Text_21C411, MSGBOX_DEFAULT @@ -279,7 +279,7 @@ LilycoveCity_ContestHall_EventScript_21B705:: @ 821B705 faceplayer msgbox LilycoveCity_ContestHall_Text_21C4B1, MSGBOX_DEFAULT closemessage - applymovement 31, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -289,7 +289,7 @@ LilycoveCity_ContestHall_EventScript_21B71C:: @ 821B71C faceplayer msgbox LilycoveCity_ContestHall_Text_21C445, MSGBOX_DEFAULT closemessage - applymovement 30, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 30, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 42ce7beeb..d5dac8bfd 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_ContestLobby_MapScripts:: @ 821A211 - map_script 3, LilycoveCity_ContestLobby_MapScript1_21A21C - map_script 2, LilycoveCity_ContestLobby_MapScript2_21A243 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_ContestLobby_MapScript1_21A21C + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_ContestLobby_MapScript2_21A243 .byte 0 LilycoveCity_ContestLobby_MapScript1_21A21C: @ 821A21C @@ -22,13 +22,13 @@ LilycoveCity_ContestLobby_EventScript_21A23C:: @ 821A23C return LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243 - map_script_2 VAR_0x4099, 1, LilycoveCity_ContestLobby_EventScript_21A255 - map_script_2 VAR_0x4099, 2, LilycoveCity_ContestLobby_EventScript_21A427 + map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1, LilycoveCity_ContestLobby_EventScript_21A255 + map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2, LilycoveCity_ContestLobby_EventScript_21A427 .2byte 0 LilycoveCity_ContestLobby_EventScript_21A255:: @ 821A255 goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_21A264 - setvar VAR_0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 end LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264 @@ -55,7 +55,7 @@ LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA msgbox LilycoveCity_ContestLobby_Text_21AF63, MSGBOX_DEFAULT closemessage special sub_80F88DC - setvar VAR_0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 specialvar VAR_RESULT, GiveMonArtistRibbon compare VAR_RESULT, 1 call_if_eq LilycoveCity_ContestLobby_EventScript_21A314 @@ -75,7 +75,7 @@ LilycoveCity_ContestLobby_EventScript_21A2E4:: @ 821A2E4 closemessage applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F waitmovement 0 - setvar VAR_0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 removeobject 4 releaseall end @@ -86,7 +86,7 @@ LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314 applymovement 4, LilycoveCity_ContestLobby_Movement_21A41A waitmovement 0 playse SE_PIN - applymovement 4, LilycoveCity_ContestLobby_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 applymovement 4, LilycoveCity_ContestLobby_Movement_21A41E waitmovement 0 @@ -202,7 +202,7 @@ LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E LilycoveCity_ContestLobby_EventScript_21A427:: @ 821A427 goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_21A436 - setvar VAR_0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 end LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436 @@ -227,7 +227,7 @@ LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A msgbox LilycoveCity_ContestLobby_Text_21AF63, MSGBOX_DEFAULT closemessage special sub_80F88DC - setvar VAR_0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 specialvar VAR_RESULT, GiveMonArtistRibbon compare VAR_RESULT, 1 call_if_eq LilycoveCity_ContestLobby_EventScript_21A4E4 @@ -247,7 +247,7 @@ LilycoveCity_ContestLobby_EventScript_21A4B4:: @ 821A4B4 closemessage applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C waitmovement 0 - setvar VAR_0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 removeobject 11 releaseall end @@ -259,7 +259,7 @@ LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4 applymovement 11, LilycoveCity_ContestLobby_Movement_21A547 waitmovement 0 playse SE_PIN - applymovement 11, LilycoveCity_ContestLobby_Movement_272598 + applymovement 11, Common_Movement_ExclamationMark waitmovement 0 applymovement 11, LilycoveCity_ContestLobby_Movement_21A54B waitmovement 0 @@ -338,28 +338,28 @@ LilycoveCity_ContestLobby_EventScript_21A585:: @ 821A585 return LilycoveCity_ContestLobby_EventScript_21A5B7:: @ 821A5B7 - setvar VAR_0x4088, 1 + setvar VAR_CONTEST_LOCATION, 1 return LilycoveCity_ContestLobby_EventScript_21A5BD:: @ 821A5BD - setvar VAR_0x4088, 2 + setvar VAR_CONTEST_LOCATION, 2 return LilycoveCity_ContestLobby_EventScript_21A5C3:: @ 821A5C3 - setvar VAR_0x4088, 3 + setvar VAR_CONTEST_LOCATION, 3 return LilycoveCity_ContestLobby_EventScript_21A5C9:: @ 821A5C9 - setvar VAR_0x4088, 4 + setvar VAR_CONTEST_LOCATION, 4 return LilycoveCity_ContestLobby_EventScript_21A5CF:: @ 821A5CF setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - copyvar VAR_0x4094, 0x1 + copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 giveitem ITEM_CONTEST_PASS, 1 setvar VAR_0x800B, 8 setvar VAR_CONTEST_RANK, 3 - setvar VAR_0x4099, 1 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 setflag FLAG_SYS_RIBBON_GET end @@ -614,7 +614,7 @@ LilycoveCity_ContestLobby_EventScript_21A7E9:: @ 821A7E9 LilycoveCity_ContestLobby_EventScript_21A7F9:: @ 821A7F9 closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_ContestLobby_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -642,7 +642,7 @@ LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856 msgbox LilycoveCity_ContestLobby_Text_27BD17, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F - call LilycoveCity_ContestLobby_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F message LilycoveCity_ContestLobby_Text_27C8FD @@ -833,9 +833,9 @@ LilycoveCity_ContestLobby_EventScript_21AB17:: @ 821AB17 waitmessage subvar VAR_0x8004, 1 call LilycoveCity_ContestLobby_EventScript_21AC49 - setvar VAR_0x4086, 1 + setvar VAR_LINK_CONTEST_ROOM_STATE, 1 special sub_80F8AFC - setvar VAR_0x4088, 5 + setvar VAR_CONTEST_LOCATION, 5 setvar VAR_CONTEST_RANK, 3 call LilycoveCity_ContestLobby_EventScript_21A5EF end diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index 7ccc8b82f..87e4c0afd 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -6,33 +6,33 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218189:: @ 8218189 goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3 msgbox LilycoveCity_CoveLilyMotel_1F_Text_218264, MSGBOX_DEFAULT - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_21831E, MSGBOX_DEFAULT closemessage - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3:: @ 82181C3 msgbox LilycoveCity_CoveLilyMotel_1F_Text_2183C3, MSGBOX_DEFAULT - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_218470, MSGBOX_DEFAULT closemessage - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA msgbox LilycoveCity_CoveLilyMotel_1F_Text_218544, MSGBOX_DEFAULT - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_2185F4, MSGBOX_DEFAULT closemessage - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -40,11 +40,11 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211 lockall playse SE_PIN - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, MSGBOX_DEFAULT closemessage diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index 03ac733f9..4a761a706 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -26,7 +26,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_218702:: @ 8218702 LilycoveCity_CoveLilyMotel_2F_EventScript_21870F:: @ 821870F message LilycoveCity_CoveLilyMotel_2F_Text_21881C waitmessage - call LilycoveCity_CoveLilyMotel_2F_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare special Special_ShowDiploma waitstate release diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc index 80a93df47..18fc0404b 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 sub_8139C10 closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 waitse special ShakeScreenInElevator diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index d5379f96a..f1c974dd9 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207 - map_script 3, LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D .byte 0 LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D: @ 822020D diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index ffa2244f4..ec1d89b66 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, LilycoveCity_DepartmentStore_1F_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 playse SE_PC_ON special DoLotteryCornerComputerEffect @@ -30,7 +30,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C delay 220 special EndLotteryCornerComputerEffect delay 10 - applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x8004, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index b278d3e14..e62537422 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStore_5F_MapScripts:: @ 821FF7A - map_script 4, LilycoveCity_DepartmentStore_5F_MapScript2_21FF80 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_DepartmentStore_5F_MapScript2_21FF80 .byte 0 LilycoveCity_DepartmentStore_5F_MapScript2_21FF80: @ 821FF80 @@ -123,7 +123,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22006C:: @ 822006C LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075 lockall - applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_27259E + applymovement 7, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 0 goto_if_eq LilycoveCity_DepartmentStore_5F_EventScript_22009C @@ -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, LilycoveCity_DepartmentStore_5F_Movement_2725A6 + applymovement 7, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 5e9157826..67b05c692 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -1,5 +1,5 @@ LilycoveCity_Harbor_MapScripts:: @ 821E000 - map_script 3, LilycoveCity_Harbor_MapScript1_21E006 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_Harbor_MapScript1_21E006 .byte 0 LilycoveCity_Harbor_MapScript1_21E006: @ 821E006 @@ -107,45 +107,45 @@ LilycoveCity_Harbor_EventScript_21E171:: @ 821E171 LilycoveCity_Harbor_EventScript_21E194:: @ 821E194 setvar VAR_TEMP_E, 0 - goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_SYS_HAS_EON_TICKET, Common_EventScript_NopReturn checkitem ITEM_EON_TICKET, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setvar VAR_TEMP_E, 1 - goto_if_set FLAG_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_HAS_EON_TICKET, Common_EventScript_NopReturn setvar VAR_TEMP_E, 2 return LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6 setvar VAR_TEMP_D, 0 - goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, Common_EventScript_NopReturn checkitem ITEM_AURORA_TICKET, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setvar VAR_TEMP_D, 1 - goto_if_set FLAG_HAS_AURORA_TICKET, LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_HAS_AURORA_TICKET, Common_EventScript_NopReturn setvar VAR_TEMP_D, 2 return LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8 setvar VAR_TEMP_C, 0 - goto_if_unset FLAG_ENABLE_SHIP_FARAWAY_ISLAND, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_ENABLE_SHIP_FARAWAY_ISLAND, Common_EventScript_NopReturn checkitem ITEM_OLD_SEA_MAP, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setvar VAR_TEMP_C, 1 - goto_if_set FLAG_HAS_OLD_SEA_MAP, LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_HAS_OLD_SEA_MAP, Common_EventScript_NopReturn setvar VAR_TEMP_C, 2 return LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A setvar VAR_TEMP_9, 0 - goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, Common_EventScript_NopReturn checkitem ITEM_MYSTIC_TICKET, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq Common_EventScript_NopReturn setvar VAR_TEMP_9, 1 - goto_if_set FLAG_HAS_MYSTIC_TICKET, LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_HAS_MYSTIC_TICKET, Common_EventScript_NopReturn setvar VAR_TEMP_9, 2 return @@ -246,12 +246,12 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 call LilycoveCity_Harbor_EventScript_21E4EE msgbox LilycoveCity_Harbor_Text_2C68A5, MSGBOX_DEFAULT closemessage - applymovement 4, LilycoveCity_Harbor_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 4, LilycoveCity_Harbor_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, LilycoveCity_Harbor_Movement_27259A + applymovement 4, Common_Movement_Delay48 waitmovement 0 compare VAR_FACING, 2 call_if_eq LilycoveCity_Harbor_EventScript_21E656 @@ -328,12 +328,12 @@ LilycoveCity_Harbor_EventScript_21E44D:: @ 821E44D LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 msgbox LilycoveCity_Harbor_Text_2A6A82, MSGBOX_DEFAULT closemessage - applymovement 4, LilycoveCity_Harbor_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 removeobject 4 delay 30 - applymovement 1, LilycoveCity_Harbor_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 showobjectat 1, MAP_LILYCOVE_CITY_HARBOR delay 30 @@ -342,19 +342,19 @@ LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 end LilycoveCity_Harbor_EventScript_21E4EE:: @ 821E4EE - applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR delay 60 addobject 4 delay 30 - applymovement 4, LilycoveCity_Harbor_Movement_27259E + applymovement 4, Common_Movement_FacePlayer waitmovement 0 return LilycoveCity_Harbor_EventScript_21E514:: @ 821E514 - applymovement 4, LilycoveCity_Harbor_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 removeobject 4 @@ -415,7 +415,7 @@ LilycoveCity_Harbor_EventScript_21E5C0:: @ 821E5C0 LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC msgbox LilycoveCity_Harbor_Text_21E89D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR @@ -494,22 +494,22 @@ LilycoveCity_Harbor_Movement_21E671: @ 821E671 step_end LilycoveCity_Harbor_EventScript_21E675:: @ 821E675 - applymovement 5, LilycoveCity_Harbor_Movement_2725A4 + applymovement 5, Common_Movement_WalkInPlaceLeft waitmovement 0 return LilycoveCity_Harbor_EventScript_21E680:: @ 821E680 - applymovement 5, LilycoveCity_Harbor_Movement_2725AA + applymovement 5, Common_Movement_WalkInPlaceDown waitmovement 0 return LilycoveCity_Harbor_EventScript_21E68B:: @ 821E68B - applymovement 5, LilycoveCity_Harbor_Movement_2725AA + applymovement 5, Common_Movement_WalkInPlaceDown waitmovement 0 return LilycoveCity_Harbor_EventScript_21E696:: @ 821E696 - applymovement 5, LilycoveCity_Harbor_Movement_2725A4 + applymovement 5, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc index 92adafe5a..0a0792bfd 100644 --- a/data/maps/LilycoveCity_House2/scripts.inc +++ b/data/maps/LilycoveCity_House2/scripts.inc @@ -8,7 +8,7 @@ LilycoveCity_House2_EventScript_21ED75:: @ 821ED75 msgbox LilycoveCity_House2_Text_21EDB6, MSGBOX_DEFAULT giveitem_std ITEM_TM44 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_House2_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM44 msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT release diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index 644c50113..ad8989b4c 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -1,5 +1,5 @@ LilycoveCity_House3_MapScripts:: @ 821EE3C - map_script 3, LilycoveCity_House3_MapScript1_21EE42 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_House3_MapScript1_21EE42 .byte 0 LilycoveCity_House3_MapScript1_21EE42: @ 821EE42 @@ -15,7 +15,7 @@ LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B goto_if_eq LilycoveCity_House3_EventScript_21EE75 msgbox LilycoveCity_House3_Text_21F0F8, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -23,7 +23,7 @@ LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B LilycoveCity_House3_EventScript_21EE75:: @ 821EE75 msgbox LilycoveCity_House3_Text_21F0A9, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -33,7 +33,7 @@ LilycoveCity_House3_EventScript_21EE8A:: @ 821EE8A faceplayer msgbox LilycoveCity_House3_Text_21F430, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index 89ac90dc6..8f2cdde28 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -7,7 +7,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9:: @ 8218CB9 LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2 lockall - applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_27259E + applymovement 2, Common_Movement_FacePlayer message LilycoveCity_LilycoveMuseum_1F_Text_218EBC waitmessage multichoice 20, 8, 16, 1 @@ -154,7 +154,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B:: @ 8218E2B faceplayer msgbox LilycoveCity_LilycoveMuseum_1F_Text_2195FF, MSGBOX_DEFAULT closemessage - applymovement 8, LilycoveCity_LilycoveMuseum_1F_Movement_2725A2 + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index f73fbf092..3bbfa8a38 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 821973A - map_script 1, LilycoveCity_LilycoveMuseum_2F_MapScript1_219745 - map_script 2, LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE + map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_LilycoveMuseum_2F_MapScript1_219745 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE .byte 0 LilycoveCity_LilycoveMuseum_2F_MapScript1_219745: @ 8219745 @@ -57,12 +57,12 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB:: @ 82197EB end LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE: @ 82197FE - map_script_2 VAR_0x4094, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219808 + map_script_2 VAR_LILYCOVE_MUSEUM_2F_STATE, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219808 .2byte 0 LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 lockall - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_2199EB, MSGBOX_SIGN @@ -71,12 +71,12 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219863 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_219A0D, MSGBOX_SIGN - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_219BC4, MSGBOX_SIGN - copyvar VAR_0x4094, 0x1 + copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 releaseall end @@ -107,7 +107,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA:: @ 82198BA end LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3 - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DD4, MSGBOX_DEFAULT applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863 @@ -116,7 +116,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3 end LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, MSGBOX_DEFAULT givedecoration_std 44 compare VAR_RESULT, 0 @@ -127,7 +127,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA end LilycoveCity_LilycoveMuseum_2F_EventScript_219911:: @ 8219911 - call LilycoveCity_LilycoveMuseum_2F_EventScript_272071 + call Common_EventScript_NoRoomLeftForAnother msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EED, MSGBOX_DEFAULT closemessage releaseall diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index c5c2188e5..e94fa43f1 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -3,7 +3,7 @@ LilycoveCity_MoveDeletersHouse_MapScripts:: @ 821EA0A LilycoveCity_MoveDeletersHouse_EventScript_21EA0B:: @ 821EA0B lockall - applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_MoveDeletersHouse_Text_21EAFD, MSGBOX_YESNO switch VAR_RESULT diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index dd0dff376..0d8da38d5 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2 - map_script 3, LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD - map_script 5, LilycoveCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD + map_script MAP_SCRIPT_ON_RESUME, LilycoveCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD: @ 821C5BD diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc index f4a25f137..1e8035483 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ LilycoveCity_PokemonCenter_2F_MapScripts:: @ 821C75D - map_script 2, LilycoveCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, LilycoveCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, LilycoveCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, LilycoveCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 LilycoveCity_PokemonCenter_2F_EventScript_21C772:: @ 821C772 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index 77bc40635..f65d901bb 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785 - map_script 2, LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790 - map_script 3, LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D .byte 0 LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790 @@ -9,18 +9,18 @@ LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790 LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A lockall - applymovement 1, LilycoveCity_PokemonTrainerFanClub_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown 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, LilycoveCity_PokemonTrainerFanClub_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_PokemonTrainerFanClub_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807 waitmovement 0 diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc index e756c2bc6..b81f35834 100644 --- a/data/maps/LinkContestRoom1/scripts.inc +++ b/data/maps/LinkContestRoom1/scripts.inc @@ -1,9 +1,9 @@ LinkContestRoom1_MapScripts:: @ 823B781 - map_script 4, LinkContestRoom1_MapScript2_23B81F - map_script 2, LinkContestRoom1_MapScript2_23B815 - map_script 3, LinkContestRoom1_MapScript1_23B79F - map_script 5, LinkContestRoom1_MapScript1_23B803 - map_script 7, LinkContestRoom1_MapScript1_23B79B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LinkContestRoom1_MapScript2_23B81F + map_script MAP_SCRIPT_ON_FRAME_TABLE, LinkContestRoom1_MapScript2_23B815 + map_script MAP_SCRIPT_ON_TRANSITION, LinkContestRoom1_MapScript1_23B79F + map_script MAP_SCRIPT_ON_RESUME, LinkContestRoom1_MapScript1_23B803 + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, LinkContestRoom1_MapScript1_23B79B .byte 0 LinkContestRoom1_MapScript1_23B79B: @ 823B79B @@ -61,11 +61,11 @@ LinkContestRoom1_EventScript_23B80F:: @ 823B80F return LinkContestRoom1_MapScript2_23B815: @ 823B815 - map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B829 + map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_23B829 .2byte 0 LinkContestRoom1_MapScript2_23B81F: @ 823B81F - map_script_2 VAR_0x4086, 1, LinkContestRoom1_EventScript_23B834 + map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_23B834 .2byte 0 LinkContestRoom1_EventScript_23B829:: @ 823B829 @@ -303,7 +303,7 @@ LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B specialvar VAR_RESULT, sub_80F9160 compare VAR_RESULT, 1 goto_if_eq LinkContestRoom1_EventScript_23BD86 - switch VAR_0x4088 + switch VAR_CONTEST_LOCATION case 1, LinkContestRoom1_EventScript_23BB78 case 2, LinkContestRoom1_EventScript_23BB8B case 3, LinkContestRoom1_EventScript_23BBE6 @@ -407,7 +407,7 @@ LinkContestRoom1_EventScript_23BD86:: @ 823BD86 LinkContestRoom1_EventScript_23BE44:: @ 823BE44 special sub_80F9154 - switch VAR_0x4088 + switch VAR_CONTEST_LOCATION case 1, LinkContestRoom1_EventScript_23BE84 case 2, LinkContestRoom1_EventScript_23BE8E case 3, LinkContestRoom1_EventScript_23BE98 diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 5d9161cb4..e133169ba 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -1,24 +1,24 @@ LittlerootTown_MapScripts:: @ 81E7DCB - map_script 3, LittlerootTown_MapScript1_1E7DDB - map_script 2, LittlerootTown_MapScript2_1E7EC1 - map_script 4, LittlerootTown_MapScript2_1E7FE2 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MapScript1_1E7DDB + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MapScript2_1E7EC1 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MapScript2_1E7FE2 .byte 0 LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB setflag FLAG_VISITED_LITTLEROOT_TOWN - call LittlerootTown_EventScript_271ED7 - compare VAR_0x4092, 2 + call Common_EventScript_SetupRivalGender + compare VAR_LITTLEROOT_INTRO_STATE, 2 call_if_eq LittlerootTown_EventScript_1E7E67 call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E7E6F compare VAR_0x4050, 3 call_if_eq LittlerootTown_EventScript_1E7E92 - compare VAR_0x4082, 4 + compare VAR_LITTLEROOT_HOUSES_STATE, 4 call_if_eq LittlerootTown_EventScript_1E7E5C - compare VAR_0x408C, 4 + compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 call_if_eq LittlerootTown_EventScript_1E7E5C - compare VAR_0x40C7, 1 + compare VAR_OLDALE_STATE, 1 call_if_eq LittlerootTown_EventScript_1E7E53 - compare VAR_0x408D, 3 + compare VAR_LITTLEROOT_RIVAL_STATE, 3 call_if_eq LittlerootTown_EventScript_1E7E4F compare VAR_0x40D3, 1 call_if_eq LittlerootTown_EventScript_1E7E4B @@ -39,13 +39,13 @@ LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F return LittlerootTown_EventScript_1E7E53:: @ 81E7E53 - setvar VAR_0x40C7, 2 + setvar VAR_OLDALE_STATE, 2 setflag FLAG_HIDE_OLDALE_TOWN_RIVAL return LittlerootTown_EventScript_1E7E5C:: @ 81E7E5C - setvar VAR_0x4082, 5 - setvar VAR_0x408C, 5 + setvar VAR_LITTLEROOT_HOUSES_STATE, 5 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 5 return LittlerootTown_EventScript_1E7E67:: @ 81E7E67 @@ -83,8 +83,8 @@ LittlerootTown_EventScript_1E7EB9:: @ 81E7EB9 return LittlerootTown_MapScript2_1E7EC1: @ 81E7EC1 - map_script_2 VAR_0x4092, 1, LittlerootTown_EventScript_1E7EDB - map_script_2 VAR_0x4092, 2, LittlerootTown_EventScript_1E7EF9 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_1E7EDB + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_1E7EF9 map_script_2 VAR_0x40D3, 1, LittlerootTown_EventScript_1E7FB1 .2byte 0 @@ -136,7 +136,7 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17 applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FA9 waitmovement 0 setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE - setvar VAR_0x4092, 3 + setvar VAR_LITTLEROOT_INTRO_STATE, 3 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim @@ -186,7 +186,7 @@ LittlerootTown_Movement_1E7FAC: @ 81E7FAC LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 lockall playse SE_PIN - applymovement 8, LittlerootTown_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 delay 80 msgbox LittlerootTown_Text_1E8DA2, MSGBOX_DEFAULT @@ -246,7 +246,7 @@ LittlerootTown_EventScript_1E805D:: @ 81E805D special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT closemessage - applymovement 1, LittlerootTown_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setvar VAR_0x4050, 2 release @@ -357,14 +357,14 @@ LittlerootTown_Movement_1E8118: @ 81E8118 LittlerootTown_EventScript_1E811F:: @ 81E811F lockall - applymovement 1, LittlerootTown_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT closemessage - applymovement 1, LittlerootTown_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setvar VAR_0x4050, 2 releaseall @@ -490,12 +490,12 @@ LittlerootTown_EventScript_1E828C:: @ 81E828C return LittlerootTown_EventScript_1E8297:: @ 81E8297 - applymovement 4, LittlerootTown_Movement_2725A8 + applymovement 4, Common_Movement_WalkInPlaceRight waitmovement 0 return LittlerootTown_EventScript_1E82A2:: @ 81E82A2 - applymovement 4, LittlerootTown_Movement_2725A4 + applymovement 4, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -530,70 +530,70 @@ LittlerootTown_EventScript_1E82F0:: @ 81E82F0 return LittlerootTown_EventScript_1E8333:: @ 81E8333 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85D1 waitmovement 0 return LittlerootTown_EventScript_1E8348:: @ 81E8348 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85D8 waitmovement 0 return LittlerootTown_EventScript_1E835D:: @ 81E835D - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85DF waitmovement 0 return LittlerootTown_EventScript_1E8372:: @ 81E8372 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85E4 waitmovement 0 return LittlerootTown_EventScript_1E8387:: @ 81E8387 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85EA waitmovement 0 return LittlerootTown_EventScript_1E839C:: @ 81E839C - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85ED waitmovement 0 return LittlerootTown_EventScript_1E83B1:: @ 81E83B1 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F1 waitmovement 0 return LittlerootTown_EventScript_1E83C6:: @ 81E83C6 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F5 waitmovement 0 return LittlerootTown_EventScript_1E83DB:: @ 81E83DB - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F8 waitmovement 0 return LittlerootTown_EventScript_1E83F0:: @ 81E83F0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight 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, LittlerootTown_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index ca5ee92de..d6d4af86c 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -135,7 +135,7 @@ "x": 8, "y": 8, "elevation": 0, - "var": "VAR_0x4092", + "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "4", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78A3" }, @@ -144,7 +144,7 @@ "x": 7, "y": 3, "elevation": 0, - "var": "VAR_0x408D", + "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78BE" }, @@ -153,7 +153,7 @@ "x": 8, "y": 4, "elevation": 0, - "var": "VAR_0x408D", + "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78CA" }, @@ -162,7 +162,7 @@ "x": 9, "y": 3, "elevation": 0, - "var": "VAR_0x408D", + "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78D6" } diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 42cfe308b..31a526a25 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -1,11 +1,11 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755 - map_script 1, LittlerootTown_BrendansHouse_1F_MapScript1_1F7765 - map_script 3, LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4 - map_script 2, LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA + map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_BrendansHouse_1F_MapScript1_1F7765 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA .byte 0 LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765 - compare VAR_0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_1F777A call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_1F778D end @@ -26,11 +26,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F779A:: @ 81F779A return LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4 - compare VAR_0x4092, 3 + compare VAR_LITTLEROOT_INTRO_STATE, 3 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77DE - compare VAR_0x4092, 5 + compare VAR_LITTLEROOT_INTRO_STATE, 5 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77C6 - compare VAR_0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77D2 end @@ -50,11 +50,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F77DE:: @ 81F77DE return LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA: @ 81F77EA - map_script_2 VAR_0x4092, 3, LittlerootTown_BrendansHouse_1F_EventScript_1F783C - map_script_2 VAR_0x4092, 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7814 - map_script_2 VAR_0x4092, 6, LittlerootTown_BrendansHouse_1F_EventScript_1F784D - map_script_2 VAR_0x4082, 1, LittlerootTown_BrendansHouse_1F_EventScript_1F785E - map_script_2 VAR_0x4082, 3, LittlerootTown_BrendansHouse_1F_EventScript_292AF2 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_1F783C + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7814 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_1F784D + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 1, LittlerootTown_BrendansHouse_1F_EventScript_1F785E + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_292AF2 .2byte 0 LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814 @@ -90,17 +90,17 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F784D:: @ 81F784D LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E lockall playse SE_PIN - applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_27259A + applymovement 4, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C waitmovement 0 special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT setflag FLAG_MET_RIVAL_MOM - setvar VAR_0x4082, 2 + setvar VAR_LITTLEROOT_HOUSES_STATE, 2 releaseall end @@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78A3:: @ 81F78A3 lockall setvar VAR_0x8004, 1 setvar VAR_0x8005, 0 - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceLeft waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_292765 end @@ -146,9 +146,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 addobject 7 delay 30 playse SE_PIN - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_272598 + applymovement 7, Common_Movement_ExclamationMark waitmovement 0 - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_27259A + applymovement 7, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 1 call_if_ne LittlerootTown_BrendansHouse_1F_EventScript_1F7981 @@ -173,7 +173,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM delay 30 - setvar VAR_0x408D, 3 + setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setvar VAR_0x4050, 1 savebgm MUS_DUMMY fadedefaultbgm @@ -181,7 +181,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 end LittlerootTown_BrendansHouse_1F_EventScript_1F7981:: @ 81F7981 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index ea00693a8..87e0e58cc 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -1,14 +1,14 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81F83E3 - map_script 3, LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE - map_script 4, LittlerootTown_BrendansHouse_2F_MapScript2_1F846A + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_BrendansHouse_2F_MapScript2_1F846A .byte 0 LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE - compare VAR_0x408D, 2 + compare VAR_LITTLEROOT_RIVAL_STATE, 2 call_if_lt LittlerootTown_BrendansHouse_2F_EventScript_1F8457 - compare VAR_0x408D, 3 + compare VAR_LITTLEROOT_RIVAL_STATE, 3 call_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F841A - compare VAR_0x4092, 4 + compare VAR_LITTLEROOT_INTRO_STATE, 4 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2926FE call LittlerootTown_BrendansHouse_2F_EventScript_275CE1 setvar VAR_0x4089, 0 @@ -16,7 +16,7 @@ LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F8433 - compare VAR_0x4084, 2 + compare VAR_BIRCH_LAB_STATE, 2 goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F8456 goto LittlerootTown_BrendansHouse_2F_EventScript_1F8433 @@ -40,7 +40,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8457:: @ 81F8457 return LittlerootTown_BrendansHouse_2F_EventScript_1F8464:: @ 81F8464 - setvar VAR_0x408D, 2 + setvar VAR_LITTLEROOT_RIVAL_STATE, 2 return LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A @@ -55,7 +55,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474 LittlerootTown_BrendansHouse_2F_EventScript_1F8481:: @ 81F8481 lockall - compare VAR_0x408D, 2 + compare VAR_LITTLEROOT_RIVAL_STATE, 2 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8497 msgbox LittlerootTown_BrendansHouse_2F_Text_1F9991, MSGBOX_DEFAULT releaseall @@ -67,9 +67,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85BC waitmovement 0 playse SE_PIN - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 delay 10 playbgm MUS_BOY_SUP, 1 @@ -81,7 +81,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8565 compare VAR_FACING, 4 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8594 - setvar VAR_0x408D, 3 + setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM setvar VAR_0x4050, 1 @@ -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, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight 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, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight 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, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight 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, LittlerootTown_BrendansHouse_2F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage @@ -307,7 +307,7 @@ LittlerootTown_BrendansHouse_2F_Text_1F877F: @ 81F877F .string "Record your progress with SAVE.\p" .string "The remaining pages are blank…$" -LittlerootTown_BrendansHouse_2F_Text_1F8820: @ 81F8820 +Common_Text_LookCloserAtMap: @ 81F8820 .string "{PLAYER} took a closer look at the\n" .string "HOENN region map.$" diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json index e1f7d823a..0938e6966 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -135,7 +135,7 @@ "x": 2, "y": 8, "elevation": 0, - "var": "VAR_0x4092", + "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "4", "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A4C" }, @@ -144,7 +144,7 @@ "x": 1, "y": 3, "elevation": 0, - "var": "VAR_0x408D", + "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A67" }, @@ -153,7 +153,7 @@ "x": 2, "y": 4, "elevation": 0, - "var": "VAR_0x408D", + "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A73" }, @@ -162,7 +162,7 @@ "x": 3, "y": 3, "elevation": 0, - "var": "VAR_0x408D", + "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A7F" } diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 36bda7e03..6b226da24 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -1,11 +1,11 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5 - map_script 1, LittlerootTown_MaysHouse_1F_MapScript1_1F88B5 - map_script 3, LittlerootTown_MaysHouse_1F_MapScript1_1F88F4 - map_script 2, LittlerootTown_MaysHouse_1F_MapScript2_1F893A + map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_MaysHouse_1F_MapScript1_1F88B5 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_1F_MapScript1_1F88F4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MaysHouse_1F_MapScript2_1F893A .byte 0 LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5 - compare VAR_0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if_lt LittlerootTown_MaysHouse_1F_EventScript_1F88CA call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_1F88DD end @@ -26,11 +26,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1F88EA:: @ 81F88EA return LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4 - compare VAR_0x4092, 3 + compare VAR_LITTLEROOT_INTRO_STATE, 3 call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F892E - compare VAR_0x4092, 5 + compare VAR_LITTLEROOT_INTRO_STATE, 5 call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8916 - compare VAR_0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8922 end @@ -50,11 +50,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1F892E:: @ 81F892E return LittlerootTown_MaysHouse_1F_MapScript2_1F893A: @ 81F893A - map_script_2 VAR_0x4092, 3, LittlerootTown_MaysHouse_1F_EventScript_1F898C - map_script_2 VAR_0x4092, 5, LittlerootTown_MaysHouse_1F_EventScript_1F8964 - map_script_2 VAR_0x4092, 6, LittlerootTown_MaysHouse_1F_EventScript_1F899D - map_script_2 VAR_0x408C, 1, LittlerootTown_MaysHouse_1F_EventScript_1F89AE - map_script_2 VAR_0x4082, 3, LittlerootTown_MaysHouse_1F_EventScript_292AF2 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_1F898C + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_1F8964 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_1F899D + map_script_2 VAR_LITTLEROOT_HOUSES_STATE_2, 1, LittlerootTown_MaysHouse_1F_EventScript_1F89AE + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_292AF2 .2byte 0 LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964 @@ -90,17 +90,17 @@ LittlerootTown_MaysHouse_1F_EventScript_1F899D:: @ 81F899D LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE lockall playse SE_PIN - applymovement 4, LittlerootTown_MaysHouse_1F_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, LittlerootTown_MaysHouse_1F_Movement_27259A + applymovement 4, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC waitmovement 0 special GetRivalSonDaughterString msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT setflag FLAG_MET_RIVAL_MOM - setvar VAR_0x408C, 2 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 2 releaseall end @@ -119,7 +119,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3 faceplayer goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_1F8A33 goto_if_set FLAG_SYS_POKEMON_GET, LittlerootTown_BrendansHouse_1F_EventScript_1F8A29 - compare VAR_0x408D, 3 + compare VAR_LITTLEROOT_RIVAL_STATE, 3 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, MSGBOX_DEFAULT @@ -154,7 +154,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A4C:: @ 81F8A4C lockall setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - applymovement VAR_0x8004, LittlerootTown_MaysHouse_1F_Movement_2725A8 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceRight waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_292765 end @@ -183,9 +183,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B addobject 7 delay 30 playse SE_PIN - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_272598 + applymovement 7, Common_Movement_ExclamationMark waitmovement 0 - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_27259A + applymovement 7, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 1 call_if_ne LittlerootTown_MaysHouse_1F_EventScript_1F8B2A @@ -210,7 +210,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM delay 30 - setvar VAR_0x408D, 3 + setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setvar VAR_0x4050, 1 savebgm MUS_DUMMY fadedefaultbgm @@ -218,7 +218,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B end LittlerootTown_MaysHouse_1F_EventScript_1F8B2A:: @ 81F8B2A - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 353437ad4..e11d2a991 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -1,14 +1,14 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 81F9296 - map_script 3, LittlerootTown_MaysHouse_2F_MapScript1_1F92A1 - map_script 4, LittlerootTown_MaysHouse_2F_MapScript2_1F931D + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_2F_MapScript1_1F92A1 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MaysHouse_2F_MapScript2_1F931D .byte 0 LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 - compare VAR_0x408D, 2 + compare VAR_LITTLEROOT_RIVAL_STATE, 2 call_if_lt LittlerootTown_MaysHouse_2F_EventScript_1F930A - compare VAR_0x408D, 3 + compare VAR_LITTLEROOT_RIVAL_STATE, 3 call_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F92CD - compare VAR_0x4092, 4 + compare VAR_LITTLEROOT_INTRO_STATE, 4 call_if_eq LittlerootTown_MaysHouse_2F_EventScript_2926FE call LittlerootTown_MaysHouse_2F_EventScript_275CE1 setvar VAR_0x4089, 0 @@ -16,7 +16,7 @@ LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_MaysHouse_2F_EventScript_1F92E6 - compare VAR_0x4084, 2 + compare VAR_BIRCH_LAB_STATE, 2 goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309 goto LittlerootTown_MaysHouse_2F_EventScript_1F92E6 @@ -41,7 +41,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F930A:: @ 81F930A return LittlerootTown_MaysHouse_2F_EventScript_1F9317:: @ 81F9317 - setvar VAR_0x408D, 2 + setvar VAR_LITTLEROOT_RIVAL_STATE, 2 return LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D @@ -56,7 +56,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327 LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334 lockall - compare VAR_0x408D, 2 + compare VAR_LITTLEROOT_RIVAL_STATE, 2 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, MSGBOX_DEFAULT releaseall @@ -68,9 +68,9 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F946F waitmovement 0 playse SE_PIN - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 delay 10 playbgm MUS_GIRL_SUP, 1 @@ -82,7 +82,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9418 compare VAR_FACING, 4 call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9440 - setvar VAR_0x408D, 3 + setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM setvar VAR_0x4050, 1 @@ -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, LittlerootTown_MaysHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft 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, LittlerootTown_MaysHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft 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, LittlerootTown_MaysHouse_2F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp 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, LittlerootTown_MaysHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage @@ -268,7 +268,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F94ED:: @ 81F94ED end LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7 - applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 checkplayergender compare VAR_RESULT, MALE diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 5c762743c..88b1c6929 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -1,11 +1,11 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91 - map_script 3, LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1 - map_script 4, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06 - map_script 2, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9 .byte 0 LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1 - call LittlerootTown_ProfessorBirchsLab_EventScript_271ED7 + call Common_EventScript_SetupRivalGender call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD compare VAR_0x40D3, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7 @@ -38,7 +38,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7 end LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06: @ 81F9D06 - map_script_2 VAR_0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40 + map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40 map_script_2 VAR_0x40D3, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45 map_script_2 VAR_0x40D3, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45 map_script_2 VAR_0x40D3, 3, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71 @@ -85,8 +85,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75:: @ 81F9D75 end LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9: @ 81F9DB9 - map_script_2 VAR_0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB - map_script_2 VAR_0x4084, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67 + map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB + map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67 map_script_2 VAR_0x40D3, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80 map_script_2 VAR_0x40D3, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62 .2byte 0 @@ -107,7 +107,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07 setvar VAR_0x8004, 0 - call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17 end @@ -122,7 +122,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA9D5, MSGBOX_DEFAULT clearflag FLAG_HIDE_ROUTE_101_BOY - setvar VAR_0x4084, 3 + setvar VAR_BIRCH_LAB_STATE, 3 releaseall end @@ -167,8 +167,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 delay 10 playse SE_TK_KASYA delay 20 - applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A4 + applymovement 3, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft 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, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, MSGBOX_DEFAULT playfanfare MUS_FANFA4 @@ -264,7 +264,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C: @ 81F9F7C LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84 lock faceplayer - compare VAR_0x4084, 3 + compare VAR_BIRCH_LAB_STATE, 3 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1 goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, MSGBOX_DEFAULT @@ -286,7 +286,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB release compare VAR_0x40D3, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight 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_0x40D3, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight 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_0x40D3, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 drawmonpic SPECIES_CHIKORITA, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO @@ -351,7 +351,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1 compare VAR_RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD call LittlerootTown_ProfessorBirchsLab_EventScript_27378B - call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD end @@ -396,7 +396,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142 compare VAR_RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E call LittlerootTown_ProfessorBirchsLab_EventScript_27378B - call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E end @@ -441,7 +441,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3 compare VAR_RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F call LittlerootTown_ProfessorBirchsLab_EventScript_27378B - call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F end @@ -502,7 +502,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141 compare VAR_0x40D3, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_272141 - compare VAR_0x4084, 5 + compare VAR_BIRCH_LAB_STATE, 5 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, MSGBOX_DEFAULT release @@ -530,17 +530,17 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 closemessage applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 checkplayergender compare VAR_RESULT, MALE call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA352 compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F - setvar VAR_0x4084, 5 + setvar VAR_BIRCH_LAB_STATE, 5 setflag FLAG_ADVENTURE_STARTED - setvar VAR_0x4051, 1 - setvar VAR_0x408D, 4 + setvar VAR_ROUTE102_ACCESSIBLE, 1 + setvar VAR_LITTLEROOT_RIVAL_STATE, 4 setvar VAR_0x4050, 3 releaseall end diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc index 56ad204a9..0e0360990 100644 --- a/data/maps/MagmaHideout_1F/scripts.inc +++ b/data/maps/MagmaHideout_1F/scripts.inc @@ -1,9 +1,9 @@ MagmaHideout_1F_MapScripts:: @ 8239880 - map_script 3, MagmaHideout_1F_MapScript1_239886 + map_script MAP_SCRIPT_ON_TRANSITION, MagmaHideout_1F_MapScript1_239886 .byte 0 MagmaHideout_1F_MapScript1_239886: @ 8239886 - setvar VAR_0x40BD, 0 + setvar VAR_JAGGED_PASS_ASH_WEATHER, 0 end MagmaHideout_1F_EventScript_23988C:: @ 823988C diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index ba585c98a..77c339b11 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, MagmaHideout_4F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 150 removeobject 7 @@ -50,10 +50,10 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 waitmovement 0 msgbox MagmaHideout_4F_Text_23AADA, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MagmaHideout_4F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 delay 30 - applymovement 6, MagmaHideout_4F_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox MagmaHideout_4F_Text_23AB33, MSGBOX_DEFAULT closemessage @@ -62,9 +62,9 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 closemessage clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN clearflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY - setvar VAR_0x4058, 1 + setvar VAR_SLATEPORT_STATE, 1 setflag FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT - setvar VAR_0x40A0, 1 + setvar VAR_SLATEPORT_HARBOR_STATE, 1 fadescreen 1 removeobject 6 removeobject 2 diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index aae89cb8a..036fa7724 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -1,6 +1,6 @@ MarineCave_End_MapScripts:: @ 823AFDF - map_script 5, MarineCave_End_MapScript1_23AFEA - map_script 3, MarineCave_End_MapScript1_23B008 + map_script MAP_SCRIPT_ON_RESUME, MarineCave_End_MapScript1_23AFEA + map_script MAP_SCRIPT_ON_TRANSITION, MarineCave_End_MapScript1_23B008 .byte 0 MarineCave_End_MapScript1_23AFEA: @ 823AFEA @@ -10,7 +10,7 @@ MarineCave_End_MapScript1_23AFEA: @ 823AFEA MarineCave_End_EventScript_23AFF4:: @ 823AFF4 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne MarineCave_End_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 1 return @@ -25,7 +25,7 @@ MarineCave_End_EventScript_23B012:: @ 823B012 MarineCave_End_EventScript_23B01B:: @ 823B01B lockall - applymovement EVENT_OBJ_ID_PLAYER, MarineCave_End_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 1, MarineCave_End_Movement_23B09D waitmovement 0 diff --git a/data/maps/MarineCave_Entrance/scripts.inc b/data/maps/MarineCave_Entrance/scripts.inc index 24b288050..82ff756e1 100644 --- a/data/maps/MarineCave_Entrance/scripts.inc +++ b/data/maps/MarineCave_Entrance/scripts.inc @@ -1,5 +1,5 @@ MarineCave_Entrance_MapScripts:: @ 823AFD0 - map_script 5, MarineCave_Entrance_MapScript1_23AFD6 + map_script MAP_SCRIPT_ON_RESUME, MarineCave_Entrance_MapScript1_23AFD6 .byte 0 MarineCave_Entrance_MapScript1_23AFD6: @ 823AFD6 diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index f3bde6eb9..e44bc78dd 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -238,7 +238,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -254,7 +254,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -262,7 +262,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -270,7 +270,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 21f654888..120fc9f51 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -1,5 +1,5 @@ MauvilleCity_MapScripts:: @ 81DF385 - map_script 3, MauvilleCity_MapScript1_1DF38B + map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_MapScript1_1DF38B .byte 0 MauvilleCity_MapScript1_1DF38B: @ 81DF38B @@ -8,7 +8,7 @@ MauvilleCity_MapScript1_1DF38B: @ 81DF38B clearflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION setflag FLAG_SYS_TV_START clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE - setvar VAR_0x4093, 0 + setvar VAR_MAUVILLE_GYM_STATE, 0 call_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF3A9 end @@ -70,7 +70,7 @@ MauvilleCity_EventScript_1DF41D:: @ 81DF41D goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF43D msgbox MauvilleCity_Text_1DF7DC, MSGBOX_DEFAULT closemessage - applymovement 7, MauvilleCity_Movement_2725A2 + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -78,7 +78,7 @@ MauvilleCity_EventScript_1DF41D:: @ 81DF41D MauvilleCity_EventScript_1DF43D:: @ 81DF43D msgbox MauvilleCity_Text_1DFAA5, MSGBOX_DEFAULT closemessage - applymovement 7, MauvilleCity_Movement_2725A2 + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -86,17 +86,17 @@ MauvilleCity_EventScript_1DF43D:: @ 81DF43D MauvilleCity_EventScript_1DF452:: @ 81DF452 lockall goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF690 - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DF8B9, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DF963, MSGBOX_DEFAULT - applymovement 6, MauvilleCity_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 6, MauvilleCity_Movement_272598 + applymovement 6, Common_Movement_ExclamationMark waitmovement 0 - applymovement 6, MauvilleCity_Movement_27259A + applymovement 6, Common_Movement_Delay48 waitmovement 0 msgbox MauvilleCity_Text_1DF9B2, MSGBOX_YESNO goto MauvilleCity_EventScript_1DF4AD @@ -118,7 +118,7 @@ MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0 applymovement 6, MauvilleCity_Movement_1DF6A8 applymovement 7, MauvilleCity_Movement_1DF6E2 waitmovement 0 - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight 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, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight 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, 4 call_if_eq MauvilleCity_EventScript_1DF601 - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown 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, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox MauvilleCity_Text_1DFBC3, MSGBOX_DEFAULT - applymovement 6, MauvilleCity_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox MauvilleCity_Text_1DFBED, MSGBOX_DEFAULT - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox MauvilleCity_Text_1DFC8A, MSGBOX_DEFAULT return @@ -223,7 +223,7 @@ MauvilleCity_EventScript_1DF683:: @ 81DF683 end MauvilleCity_EventScript_1DF690:: @ 81DF690 - applymovement 6, MauvilleCity_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox MauvilleCity_Text_1DFB42, MSGBOX_YESNO goto MauvilleCity_EventScript_1DF4AD @@ -421,7 +421,7 @@ MauvilleCity_EventScript_1DF73A:: @ 81DF73A lock faceplayer goto_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF7B0 - compare VAR_0x40BA, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_EventScript_1DF784 goto_if_set FLAG_GOT_BASEMENT_KEY_FROM_WATTSON, MauvilleCity_EventScript_1DF77A msgbox MauvilleCity_Text_1DFFE4, MSGBOX_DEFAULT @@ -440,7 +440,7 @@ MauvilleCity_EventScript_1DF784:: @ 81DF784 msgbox MauvilleCity_Text_1E020E, MSGBOX_DEFAULT giveitem_std ITEM_TM24 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_GOT_TM24_FROM_WATTSON msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT release diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 34125b421..88b1ded16 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -215,7 +215,7 @@ MauvilleCity_GameCorner_EventScript_20FE79:: @ 820FE79 end MauvilleCity_GameCorner_EventScript_20FE87:: @ 820FE87 - call MauvilleCity_GameCorner_EventScript_272071 + call Common_EventScript_NoRoomLeftForAnother goto MauvilleCity_GameCorner_EventScript_20FD20 end @@ -383,7 +383,7 @@ MauvilleCity_GameCorner_EventScript_2100FF:: @ 82100FF end MauvilleCity_GameCorner_EventScript_21010D:: @ 821010D - call MauvilleCity_GameCorner_EventScript_27205E + call Common_EventScript_BagIsFull goto MauvilleCity_GameCorner_EventScript_20FECE end @@ -448,7 +448,7 @@ MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0 end MauvilleCity_GameCorner_EventScript_2101FA:: @ 82101FA - call MauvilleCity_GameCorner_EventScript_272071 + call Common_EventScript_NoRoomLeftForAnother msgbox MauvilleCity_GameCorner_Text_2107A9, MSGBOX_DEFAULT release end @@ -513,7 +513,7 @@ MauvilleCity_GameCorner_EventScript_210299:: @ 8210299 MauvilleCity_GameCorner_EventScript_2102A9:: @ 82102A9 closemessage - applymovement VAR_LAST_TALKED, MauvilleCity_GameCorner_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index 76bceae56..de4bd0ddf 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -1,10 +1,10 @@ MauvilleCity_Gym_MapScripts:: @ 820DD6E - map_script 1, MauvilleCity_Gym_MapScript1_20DD74 + map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_Gym_MapScript1_20DD74 .byte 0 MauvilleCity_Gym_MapScript1_20DD74: @ 820DD74 goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20DEE7 - switch VAR_0x4093 + switch VAR_MAUVILLE_GYM_STATE case 0, MauvilleCity_Gym_EventScript_20DDBA case 1, MauvilleCity_Gym_EventScript_20DEAF case 2, MauvilleCity_Gym_EventScript_20DEBD @@ -79,7 +79,7 @@ MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB compare VAR_RESULT, 1 goto_if_eq MauvilleCity_Gym_EventScript_20DFDE goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_20DF8D - compare VAR_0x40BA, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_20DFD4 msgbox MauvilleCity_Gym_Text_20E8E3, MSGBOX_DEFAULT release @@ -88,14 +88,14 @@ MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B message MauvilleCity_Gym_Text_20E77F waitmessage - call MauvilleCity_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox MauvilleCity_Gym_Text_20E7AA, MSGBOX_DEFAULT setvar VAR_0x40D2, 3 clearflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT setflag FLAG_DEFEATED_MAUVILLE_GYM setflag FLAG_BADGE03_GET - addvar VAR_0x4085, 1 - compare VAR_0x4085, 6 + addvar VAR_PETALBURG_GYM_STATE, 1 + compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq MauvilleCity_Gym_EventScript_271E84 setvar VAR_0x8008, 3 call MauvilleCity_Gym_EventScript_271F43 @@ -117,7 +117,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D giveitem_std ITEM_TM34 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM34 release @@ -126,7 +126,7 @@ MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D MauvilleCity_Gym_EventScript_20DFB1:: @ 820DFB1 giveitem_std ITEM_TM34 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_Gym_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM34 return @@ -144,9 +144,9 @@ MauvilleCity_Gym_EventScript_20DFDE:: @ 820DFDE MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9 lockall goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD - compare VAR_0x4093, 1 + compare VAR_MAUVILLE_GYM_STATE, 1 goto_if_eq MauvilleCity_Gym_EventScript_20E0AD - setvar VAR_0x4093, 1 + setvar VAR_MAUVILLE_GYM_STATE, 1 setvar VAR_0x8004, 0 goto MauvilleCity_Gym_EventScript_20E08D end @@ -154,9 +154,9 @@ MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9 MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E lockall goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD - compare VAR_0x4093, 2 + compare VAR_MAUVILLE_GYM_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_20E0AD - setvar VAR_0x4093, 2 + setvar VAR_MAUVILLE_GYM_STATE, 2 setvar VAR_0x8004, 1 goto MauvilleCity_Gym_EventScript_20E08D end @@ -164,9 +164,9 @@ MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E MauvilleCity_Gym_EventScript_20E043:: @ 820E043 lockall goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD - compare VAR_0x4093, 3 + compare VAR_MAUVILLE_GYM_STATE, 3 goto_if_eq MauvilleCity_Gym_EventScript_20E0AD - setvar VAR_0x4093, 3 + setvar VAR_MAUVILLE_GYM_STATE, 3 setvar VAR_0x8004, 2 goto MauvilleCity_Gym_EventScript_20E08D end @@ -174,9 +174,9 @@ MauvilleCity_Gym_EventScript_20E043:: @ 820E043 MauvilleCity_Gym_EventScript_20E068:: @ 820E068 lockall goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD - compare VAR_0x4093, 4 + compare VAR_MAUVILLE_GYM_STATE, 4 goto_if_eq MauvilleCity_Gym_EventScript_20E0AD - setvar VAR_0x4093, 4 + setvar VAR_MAUVILLE_GYM_STATE, 4 setvar VAR_0x8004, 3 goto MauvilleCity_Gym_EventScript_20E08D end diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc index c49052914..b683b8c15 100644 --- a/data/maps/MauvilleCity_House2/scripts.inc +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -14,9 +14,9 @@ MauvilleCity_House2_EventScript_210C5D:: @ 8210C5D MauvilleCity_House2_EventScript_210C82:: @ 8210C82 playse SE_PIN - applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_272598 + applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_27259A + applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 msgbox MauvilleCity_House2_Text_210D76, MSGBOX_YESNO compare VAR_RESULT, 1 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index 1eac0efc9..a866e6aa4 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B - map_script 3, MauvilleCity_PokemonCenter_1F_MapScript1_210E66 - map_script 5, MauvilleCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_MapScript1_210E66 + map_script MAP_SCRIPT_ON_RESUME, MauvilleCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc index 196d49a26..a289886a3 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8211008 - map_script 2, MauvilleCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, MauvilleCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, MauvilleCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, MauvilleCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 MauvilleCity_PokemonCenter_2F_EventScript_21101D:: @ 821101D diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index 3492e05bc..586de013f 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -195,7 +195,7 @@ "x": 14, "y": 18, "elevation": 4, - "var": "VAR_0x40BF", + "var": "VAR_METEOR_FALLS_STATE", "var_value": "0", "script": "MeteorFalls_1F_1R_EventScript_22BD5F" } diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index ea161ba23..bd1b8d090 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -1,5 +1,5 @@ MeteorFalls_1F_1R_MapScripts:: @ 822BD2A - map_script 1, MeteorFalls_1F_1R_MapScript1_22BD30 + map_script MAP_SCRIPT_ON_LOAD, MeteorFalls_1F_1R_MapScript1_22BD30 .byte 0 MeteorFalls_1F_1R_MapScript1_22BD30: @ 822BD30 @@ -16,20 +16,20 @@ MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F lockall playbgm MUS_MGM0, 0 - applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_2725B0 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceDown waitmovement 0 delay 30 applymovement 5, MeteorFalls_1F_1R_Movement_2725B4 waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22BF47, MSGBOX_DEFAULT closemessage - applymovement 5, MeteorFalls_1F_1R_Movement_2725A6 - applymovement 6, MeteorFalls_1F_1R_Movement_2725A6 + applymovement 5, Common_Movement_WalkInPlaceUp + applymovement 6, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 5, MeteorFalls_1F_1R_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, MeteorFalls_1F_1R_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22BF84, MSGBOX_DEFAULT closemessage @@ -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, MeteorFalls_1F_1R_Movement_2725A4 - applymovement 5, MeteorFalls_1F_1R_Movement_2725A4 - applymovement 6, MeteorFalls_1F_1R_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement 5, Common_Movement_WalkInPlaceLeft + applymovement 6, Common_Movement_WalkInPlaceLeft 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, MeteorFalls_1F_1R_Movement_2725A4 - applymovement 6, MeteorFalls_1F_1R_Movement_2725A4 + applymovement 5, Common_Movement_WalkInPlaceLeft + applymovement 6, Common_Movement_WalkInPlaceLeft 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, MeteorFalls_1F_1R_Movement_2725AA + applymovement 7, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C292, MSGBOX_DEFAULT - applymovement 7, MeteorFalls_1F_1R_Movement_2725A4 + applymovement 7, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C2FC, MSGBOX_DEFAULT closemessage @@ -86,7 +86,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F setflag FLAG_HIDE_ROUTE_112_TEAM_MAGMA setflag FLAG_MET_ARCHIE_METEOR_FALLS setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT - setvar VAR_0x40BF, 1 + setvar VAR_METEOR_FALLS_STATE, 1 releaseall end diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc index ba8d807c5..31baad43c 100644 --- a/data/maps/MeteorFalls_StevensCave/scripts.inc +++ b/data/maps/MeteorFalls_StevensCave/scripts.inc @@ -6,11 +6,11 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 goto_if_set FLAG_DEFEATED_METEOR_FALLS_STEVEN, MeteorFalls_StevensCave_EventScript_23B1CD waitse playse SE_PIN - applymovement 1, MeteorFalls_StevensCave_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, MeteorFalls_StevensCave_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 - applymovement 1, MeteorFalls_StevensCave_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox MeteorFalls_StevensCave_Text_23B1E1, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_23B32D @@ -20,7 +20,7 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 end MeteorFalls_StevensCave_EventScript_23B1CD:: @ 823B1CD - applymovement 1, MeteorFalls_StevensCave_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT release diff --git a/data/maps/MirageTower_1F/scripts.inc b/data/maps/MirageTower_1F/scripts.inc index 94aed55d0..9f6c35a84 100644 --- a/data/maps/MirageTower_1F/scripts.inc +++ b/data/maps/MirageTower_1F/scripts.inc @@ -1,5 +1,5 @@ MirageTower_1F_MapScripts:: @ 823AD01 - map_script 3, MirageTower_1F_MapScript1_23AD07 + map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_1F_MapScript1_23AD07 .byte 0 MirageTower_1F_MapScript1_23AD07: @ 823AD07 diff --git a/data/maps/MirageTower_2F/scripts.inc b/data/maps/MirageTower_2F/scripts.inc index 79f3cce2a..d22a7c6ff 100644 --- a/data/maps/MirageTower_2F/scripts.inc +++ b/data/maps/MirageTower_2F/scripts.inc @@ -1,7 +1,7 @@ MirageTower_2F_MapScripts:: @ 823AD11 - map_script 2, MirageTower_2F_MapScript2_2A8327 - map_script 3, MirageTower_2F_MapScript1_2A8331 - map_script 5, MirageTower_2F_MapScript1_23AD21 + 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 .byte 0 MirageTower_2F_MapScript1_23AD21: @ 823AD21 diff --git a/data/maps/MirageTower_3F/scripts.inc b/data/maps/MirageTower_3F/scripts.inc index 1ec82de55..f29f542fc 100644 --- a/data/maps/MirageTower_3F/scripts.inc +++ b/data/maps/MirageTower_3F/scripts.inc @@ -1,7 +1,7 @@ MirageTower_3F_MapScripts:: @ 823AD2C - map_script 2, MirageTower_3F_MapScript2_2A8327 - map_script 3, MirageTower_3F_MapScript1_2A8331 - map_script 5, MirageTower_3F_MapScript1_23AD3C + 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 .byte 0 MirageTower_3F_MapScript1_23AD3C: @ 823AD3C diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index 767a99584..952ff253c 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -439,7 +439,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -447,7 +447,7 @@ "y": 18, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -463,7 +463,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -471,7 +471,7 @@ "y": 18, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index b504d7004..b01e9cae8 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -1,5 +1,5 @@ MossdeepCity_MapScripts:: @ 81E4A96 - map_script 3, MossdeepCity_MapScript1_1E4A9C + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_MapScript1_1E4A9C .byte 0 MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C @@ -7,7 +7,7 @@ MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 - call_if_set FLAG_SYS_WEATHER_CTRL, MossdeepCity_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2 @@ -216,7 +216,7 @@ MossdeepCity_EventScript_1E4C10:: @ 81E4C10 lock faceplayer msgbox MossdeepCity_Text_1E5213, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -231,7 +231,7 @@ MossdeepCity_EventScript_1E4C26:: @ 81E4C26 msgbox MossdeepCity_Text_1E4D5B, MSGBOX_DEFAULT giveitem_std ITEM_KINGS_ROCK compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_KINGS_ROCK release end diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc index ed10a8309..db9a1f854 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc @@ -1,15 +1,15 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27 - map_script 2, MossdeepCity_GameCorner_1F_MapScript2_224B41 - map_script 4, MossdeepCity_GameCorner_1F_MapScript2_224B37 - map_script 1, MossdeepCity_GameCorner_1F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B41 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B37 + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_GameCorner_1F_MapScript1_276BBE .byte 0 MossdeepCity_GameCorner_1F_MapScript2_224B37: @ 8224B37 - map_script_2 VAR_0x4087, 8, MossdeepCity_GameCorner_1F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 8, MossdeepCity_GameCorner_1F_EventScript_276BAE .2byte 0 MossdeepCity_GameCorner_1F_MapScript2_224B41: @ 8224B41 - map_script_2 VAR_0x4087, 8, MossdeepCity_GameCorner_1F_EventScript_276C9D + map_script_2 VAR_CABLE_CLUB_STATE, 8, MossdeepCity_GameCorner_1F_EventScript_276C9D .2byte 0 MossdeepCity_GameCorner_1F_EventScript_224B4B:: @ 8224B4B diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index fc1a73b4d..7638f6119 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -1,5 +1,5 @@ MossdeepCity_Gym_MapScripts:: @ 8220800 - map_script 1, MossdeepCity_Gym_MapScript1_220806 + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_Gym_MapScript1_220806 .byte 0 MossdeepCity_Gym_MapScript1_220806: @ 8220806 @@ -57,7 +57,7 @@ MossdeepCity_Gym_EventScript_220898:: @ 8220898 MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 message MossdeepCity_Gym_Text_22196A waitmessage - call MossdeepCity_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox MossdeepCity_Gym_Text_221999, MSGBOX_DEFAULT setflag FLAG_DEFEATED_MOSSDEEP_GYM setflag FLAG_BADGE07_GET @@ -89,7 +89,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 MossdeepCity_Gym_EventScript_220937:: @ 8220937 giveitem_std ITEM_TM04 compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM04 release @@ -98,7 +98,7 @@ MossdeepCity_Gym_EventScript_220937:: @ 8220937 MossdeepCity_Gym_EventScript_22095B:: @ 822095B giveitem_std ITEM_TM04 compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_Gym_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM04 return diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc index 28573a3c1..9dbead25e 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F - map_script 3, MossdeepCity_PokemonCenter_1F_MapScript1_22224A - map_script 5, MossdeepCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_MapScript1_22224A + map_script MAP_SCRIPT_ON_RESUME, MossdeepCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 MossdeepCity_PokemonCenter_1F_MapScript1_22224A: @ 822224A diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc index e8fbb6e02..922c9a064 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334 - map_script 2, MossdeepCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, MossdeepCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, MossdeepCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, MossdeepCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 MossdeepCity_PokemonCenter_2F_EventScript_222349:: @ 8222349 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 6d9022065..43bd56d3a 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -1,6 +1,6 @@ MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41 - map_script 1, MossdeepCity_SpaceCenter_1F_MapScript1_222FC2 - map_script 3, MossdeepCity_SpaceCenter_1F_MapScript1_222F4C + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_SpaceCenter_1F_MapScript1_222FC2 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_1F_MapScript1_222F4C .byte 0 MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C @@ -60,7 +60,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 compare VAR_RESULT, 1 call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22301B closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -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, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight 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, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight waitmovement 0 release end @@ -120,7 +120,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E msgbox MossdeepCity_SpaceCenter_1F_Text_223540, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, MSGBOX_DEFAULT release @@ -136,17 +136,17 @@ MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight waitmovement 0 release end MossdeepCity_SpaceCenter_1F_EventScript_223119:: @ 8223119 msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight waitmovement 0 release end @@ -186,7 +186,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168 MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F msgbox MossdeepCity_SpaceCenter_1F_Text_22375B, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -194,7 +194,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F MossdeepCity_SpaceCenter_1F_EventScript_2231A4:: @ 82231A4 msgbox MossdeepCity_SpaceCenter_1F_Text_2237B5, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -203,7 +203,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_2231B9:: @ 82231B9 lock faceplayer msgbox MossdeepCity_SpaceCenter_1F_Text_223849, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 72c43febe..797e553c6 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -1,6 +1,6 @@ MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58 - map_script 3, MossdeepCity_SpaceCenter_2F_MapScript1_223D63 - map_script 2, MossdeepCity_SpaceCenter_2F_MapScript2_223DB5 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_2F_MapScript1_223D63 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_SpaceCenter_2F_MapScript2_223DB5 .byte 0 MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63 @@ -32,9 +32,9 @@ MossdeepCity_SpaceCenter_2F_MapScript2_223DB5: @ 8223DB5 MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF playse SE_PIN - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_272598 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_27259A + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48 waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, MSGBOX_YESNO compare VAR_RESULT, 1 @@ -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, MossdeepCity_SpaceCenter_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft 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, MossdeepCity_SpaceCenter_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1 @@ -173,7 +173,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F59:: @ 8223F59 lock faceplayer msgbox MossdeepCity_SpaceCenter_2F_Text_2245D9, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -231,20 +231,20 @@ MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF step_end MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, MSGBOX_YESNO compare VAR_RESULT, 1 goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C msgbox MossdeepCity_SpaceCenter_2F_Text_224854, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 releaseall end MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 special SavePlayerParty fadescreen 1 @@ -277,12 +277,12 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, MSGBOX_DEFAULT closemessage delay 20 - applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A4 - applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceLeft + applymovement 8, Common_Movement_WalkInPlaceDown waitmovement 0 delay 60 - applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A6 - applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725A8 + applymovement 9, Common_Movement_WalkInPlaceUp + applymovement 8, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, MSGBOX_DEFAULT @@ -315,7 +315,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 removeobject 4 setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN - setvar VAR_0x40C6, 1 + setvar VAR_STEVENS_HOUSE_STATE, 1 setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT removeobject 3 setobjectxyperm 3, 5, 6 diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 51f1ac16e..15b94133d 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -1,7 +1,7 @@ MossdeepCity_StevensHouse_MapScripts:: @ 8222784 - map_script 1, MossdeepCity_StevensHouse_MapScript1_222794 - map_script 3, MossdeepCity_StevensHouse_MapScript1_2227A8 - map_script 2, MossdeepCity_StevensHouse_MapScript2_2227C0 + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_StevensHouse_MapScript1_222794 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_StevensHouse_MapScript1_2227A8 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_StevensHouse_MapScript2_2227C0 .byte 0 MossdeepCity_StevensHouse_MapScript1_222794: @ 8222794 @@ -13,7 +13,7 @@ MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E return MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8 - compare VAR_0x40C6, 2 + compare VAR_STEVENS_HOUSE_STATE, 2 call_if_eq MossdeepCity_StevensHouse_EventScript_2227B4 end @@ -23,17 +23,17 @@ MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4 return MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0 - map_script_2 VAR_0x40C6, 1, MossdeepCity_StevensHouse_EventScript_2227CA + map_script_2 VAR_STEVENS_HOUSE_STATE, 1, MossdeepCity_StevensHouse_EventScript_2227CA .2byte 0 MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA lockall - applymovement 1, MossdeepCity_StevensHouse_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_PIN - applymovement 1, MossdeepCity_StevensHouse_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, MossdeepCity_StevensHouse_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 applymovement 1, MossdeepCity_StevensHouse_Movement_222833 waitmovement 0 @@ -48,7 +48,7 @@ MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA waitmovement 0 setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT setflag FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT - setvar VAR_0x40C6, 2 + setvar VAR_STEVENS_HOUSE_STATE, 2 releaseall end @@ -99,7 +99,7 @@ MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895 compare VAR_RESULT, 0 goto_if_eq MossdeepCity_StevensHouse_EventScript_222901 call MossdeepCity_StevensHouse_EventScript_27378B - call MossdeepCity_StevensHouse_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto MossdeepCity_StevensHouse_EventScript_222901 end diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 3bfc33f6a..db1fd59ef 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -1,10 +1,10 @@ MtChimney_MapScripts:: @ 822EDC1 - map_script 5, MtChimney_MapScript1_22EDD2 - map_script 3, MtChimney_MapScript1_22EDCC + map_script MAP_SCRIPT_ON_RESUME, MtChimney_MapScript1_22EDD2 + map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_MapScript1_22EDCC .byte 0 MtChimney_MapScript1_22EDCC: @ 822EDCC - setvar VAR_0x40BD, 1 + setvar VAR_JAGGED_PASS_ASH_WEATHER, 1 end MtChimney_MapScript1_22EDD2: @ 822EDD2 @@ -17,7 +17,7 @@ MtChimney_EventScript_22EDD5:: @ 822EDD5 call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EDF9 call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EE02 closemessage - applymovement 1, MtChimney_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_EVIL_LEADER_PLEASE_STOP release @@ -35,12 +35,12 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B lockall playbgm MUS_MGM0, 0 msgbox MtChimney_Text_22F26A, MSGBOX_DEFAULT - applymovement 2, MtChimney_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 2, MtChimney_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, MtChimney_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 msgbox MtChimney_Text_22F32E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_MAXIE_2, MtChimney_Text_22F5CF @@ -60,7 +60,7 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B call_if_eq MtChimney_EventScript_22EEC7 compare VAR_FACING, 2 call_if_eq MtChimney_EventScript_22EED2 - applymovement EVENT_OBJ_ID_PLAYER, MtChimney_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT closemessage @@ -121,7 +121,7 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3 end MtChimney_EventScript_22EF51:: @ 822EF51 - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT hidemoneybox nop nop diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 6c389e2ad..057001111 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -1,10 +1,10 @@ MtChimney_CableCarStation_MapScripts:: @ 822ABFA - map_script 3, MtChimney_CableCarStation_MapScript1_22AC05 - map_script 2, MtChimney_CableCarStation_MapScript2_22AC1D + map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_CableCarStation_MapScript1_22AC05 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MtChimney_CableCarStation_MapScript2_22AC1D .byte 0 MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05 - compare VAR_0x40A3, 1 + compare VAR_CABLE_CAR_STATION_STATE, 1 call_if_eq MtChimney_CableCarStation_EventScript_22AC11 end @@ -14,7 +14,7 @@ MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11 return MtChimney_CableCarStation_MapScript2_22AC1D: @ 822AC1D - map_script_2 VAR_0x40A3, 1, MtChimney_CableCarStation_EventScript_22AC27 + map_script_2 VAR_CABLE_CAR_STATION_STATE, 1, MtChimney_CableCarStation_EventScript_22AC27 .2byte 0 MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27 @@ -22,7 +22,7 @@ MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27 applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_22ACB4 applymovement 1, MtChimney_CableCarStation_Movement_22ACAA waitmovement 0 - setvar VAR_0x40A3, 0 + setvar VAR_CABLE_CAR_STATION_STATE, 0 setobjectxyperm 1, 6, 7 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN releaseall @@ -45,7 +45,7 @@ MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_22ACAF waitmovement 0 setvar VAR_0x8004, 1 - setvar VAR_0x40A3, 2 + setvar VAR_CABLE_CAR_STATION_STATE, 2 incrementgamestat 48 special CableCarWarp special CableCar diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc index 676df4aee..a06f34a29 100644 --- a/data/maps/MtPyre_1F/scripts.inc +++ b/data/maps/MtPyre_1F/scripts.inc @@ -8,7 +8,7 @@ MtPyre_1F_EventScript_230F3F:: @ 8230F3F msgbox MtPyre_1F_Text_230F8A, MSGBOX_DEFAULT giveitem_std ITEM_CLEANSE_TAG compare VAR_RESULT, 0 - goto_if_eq MtPyre_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_CLEANSE_TAG release end diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index cdf2cb98b..150c08df4 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -1,7 +1,7 @@ MtPyre_2F_MapScripts:: @ 82310FB - map_script 2, MtPyre_2F_MapScript2_2A8327 - map_script 3, MtPyre_2F_MapScript1_2A8331 - map_script 5, MtPyre_2F_MapScript1_23110B + 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 .byte 0 MtPyre_2F_MapScript1_23110B: @ 823110B diff --git a/data/maps/MtPyre_Exterior/scripts.inc b/data/maps/MtPyre_Exterior/scripts.inc index fe51946dc..e24f8ea68 100644 --- a/data/maps/MtPyre_Exterior/scripts.inc +++ b/data/maps/MtPyre_Exterior/scripts.inc @@ -1,5 +1,5 @@ MtPyre_Exterior_MapScripts:: @ 8231FCC - map_script 3, MtPyre_Exterior_MapScript1_231FD2 + map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Exterior_MapScript1_231FD2 .byte 0 MtPyre_Exterior_MapScript1_231FD2: @ 8231FD2 diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index fedde68e8..78780ba19 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -148,7 +148,7 @@ "x": 22, "y": 7, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "0", "script": "MtPyre_Summit_EventScript_232018" }, @@ -157,7 +157,7 @@ "x": 23, "y": 7, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "0", "script": "MtPyre_Summit_EventScript_232024" }, @@ -166,7 +166,7 @@ "x": 24, "y": 7, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "0", "script": "MtPyre_Summit_EventScript_232030" }, @@ -175,7 +175,7 @@ "x": 22, "y": 9, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "2", "script": "MtPyre_Summit_EventScript_2321EC" }, @@ -184,7 +184,7 @@ "x": 23, "y": 9, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "2", "script": "MtPyre_Summit_EventScript_2321F8" }, @@ -193,7 +193,7 @@ "x": 24, "y": 9, "elevation": 3, - "var": "VAR_0x40B9", + "var": "VAR_MT_PYRE_STATE", "var_value": "2", "script": "MtPyre_Summit_EventScript_232204" } diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 6eaf6265f..a0da7e907 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -1,9 +1,9 @@ MtPyre_Summit_MapScripts:: @ 8231FF7 - map_script 3, MtPyre_Summit_MapScript1_231FFD + map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Summit_MapScript1_231FFD .byte 0 MtPyre_Summit_MapScript1_231FFD: @ 8231FFD - compare VAR_0x40B9, 2 + compare VAR_MT_PYRE_STATE, 2 call_if_eq MtPyre_Summit_EventScript_232009 end @@ -32,9 +32,9 @@ MtPyre_Summit_EventScript_232030:: @ 8232030 MtPyre_Summit_EventScript_23203C:: @ 823203C playbgm MUS_AQA_0, 0 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725AA + applymovement 2, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 compare VAR_0x8008, 0 @@ -56,7 +56,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C fadedefaultbgm fadescreen 0 delay 20 - setvar VAR_0x40B9, 1 + setvar VAR_MT_PYRE_STATE, 1 compare VAR_0x8008, 0 call_if_eq MtPyre_Summit_EventScript_2320F7 compare VAR_0x8008, 1 @@ -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, MtPyre_Summit_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight 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, MtPyre_Summit_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -165,7 +165,7 @@ MtPyre_Summit_EventScript_2321A2:: @ 82321A2 lock faceplayer goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_2321E2 - compare VAR_0x40B9, 3 + compare VAR_MT_PYRE_STATE, 3 call_if_ge MtPyre_Summit_EventScript_2321CB goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_2321D8 msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT @@ -207,7 +207,7 @@ MtPyre_Summit_EventScript_232204:: @ 8232204 end MtPyre_Summit_EventScript_232210:: @ 8232210 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 60 compare VAR_0x8008, 0 @@ -217,9 +217,9 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 compare VAR_0x8008, 2 call_if_eq MtPyre_Summit_EventScript_2322F6 playse SE_PIN - applymovement 8, MtPyre_Summit_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, MtPyre_Summit_Movement_27259A + applymovement 8, Common_Movement_Delay48 waitmovement 0 delay 30 compare VAR_0x8008, 0 @@ -242,7 +242,7 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 waitmovement 0 removeobject 2 removeobject 8 - setvar VAR_0x40B9, 3 + setvar VAR_MT_PYRE_STATE, 3 releaseall end @@ -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, MtPyre_Summit_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight 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, MtPyre_Summit_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight 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, MtPyre_Summit_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 return diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc index cd26de91d..8a617236c 100644 --- a/data/maps/NavelRock_Bottom/scripts.inc +++ b/data/maps/NavelRock_Bottom/scripts.inc @@ -1,6 +1,6 @@ NavelRock_Bottom_MapScripts:: @ 8269255 - map_script 3, NavelRock_Bottom_MapScript1_269260 - map_script 5, NavelRock_Bottom_MapScript1_269284 + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Bottom_MapScript1_269260 + map_script MAP_SCRIPT_ON_RESUME, NavelRock_Bottom_MapScript1_269284 .byte 0 NavelRock_Bottom_MapScript1_269260: @ 8269260 @@ -13,7 +13,7 @@ NavelRock_Bottom_EventScript_269273:: @ 8269273 return NavelRock_Bottom_EventScript_269277:: @ 8269277 - goto_if_set FLAG_DEFEATED_LUGIA, NavelRock_Bottom_EventScript_27374E + goto_if_set FLAG_DEFEATED_LUGIA, Common_EventScript_NopReturn clearflag FLAG_HIDE_LUGIA return @@ -24,7 +24,7 @@ NavelRock_Bottom_MapScript1_269284: @ 8269284 NavelRock_Bottom_EventScript_26928E:: @ 826928E specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne NavelRock_Bottom_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 1 return diff --git a/data/maps/NavelRock_Exterior/scripts.inc b/data/maps/NavelRock_Exterior/scripts.inc index 21034a4e0..33bbb6391 100644 --- a/data/maps/NavelRock_Exterior/scripts.inc +++ b/data/maps/NavelRock_Exterior/scripts.inc @@ -1,5 +1,5 @@ NavelRock_Exterior_MapScripts:: @ 82690B2 - map_script 3, NavelRock_Exterior_MapScript1_2690B8 + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Exterior_MapScript1_2690B8 .byte 0 NavelRock_Exterior_MapScript1_2690B8: @ 82690B8 diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc index 4df8343fb..332e6dbea 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 NavelRock_Harbor_Text_2A6A5D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, NavelRock_Harbor_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 1, MAP_NAVEL_ROCK_HARBOR diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index 423d998a7..af011e058 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -1,6 +1,6 @@ NavelRock_Top_MapScripts:: @ 8269113 - map_script 3, NavelRock_Top_MapScript1_26911E - map_script 5, NavelRock_Top_MapScript1_269151 + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Top_MapScript1_26911E + map_script MAP_SCRIPT_ON_RESUME, NavelRock_Top_MapScript1_269151 .byte 0 NavelRock_Top_MapScript1_26911E: @ 826911E @@ -15,7 +15,7 @@ NavelRock_Top_EventScript_269131:: @ 8269131 NavelRock_Top_EventScript_26913A:: @ 826913A setvar VAR_TEMP_1, 1 - goto_if_set FLAG_DEFEATED_HO_OH, NavelRock_Top_EventScript_27374E + goto_if_set FLAG_DEFEATED_HO_OH, Common_EventScript_NopReturn setvar VAR_TEMP_1, 0 clearflag FLAG_HIDE_HO_OH return @@ -27,7 +27,7 @@ NavelRock_Top_MapScript1_269151: @ 8269151 NavelRock_Top_EventScript_26915B:: @ 826915B specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne NavelRock_Top_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 1 return diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json index 00467c1d9..d36763350 100644 --- a/data/maps/NewMauville_Entrance/map.json +++ b/data/maps/NewMauville_Entrance/map.json @@ -36,7 +36,7 @@ "x": 4, "y": 2, "elevation": 3, - "var": "VAR_0x40BA", + "var": "VAR_NEW_MAUVILLE_STATE", "var_value": "0", "script": "NewMauville_Entrance_EventScript_2372FF" } diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index d841f0374..c3ed930a5 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -1,10 +1,10 @@ NewMauville_Entrance_MapScripts:: @ 82372AD - map_script 1, NewMauville_Entrance_MapScript1_2372B8 - map_script 3, NewMauville_Entrance_MapScript1_2372FB + map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_MapScript1_2372B8 + map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Entrance_MapScript1_2372FB .byte 0 NewMauville_Entrance_MapScript1_2372B8: @ 82372B8 - compare VAR_0x40BA, 0 + compare VAR_NEW_MAUVILLE_STATE, 0 call_if_eq NewMauville_Entrance_EventScript_2372C4 end @@ -23,7 +23,7 @@ NewMauville_Entrance_MapScript1_2372FB: @ 82372FB NewMauville_Entrance_EventScript_2372FF:: @ 82372FF lockall - applymovement EVENT_OBJ_ID_PLAYER, NewMauville_Entrance_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox NewMauville_Entrance_Text_237382, MSGBOX_DEFAULT checkitem ITEM_BASEMENT_KEY, 1 @@ -41,7 +41,7 @@ NewMauville_Entrance_EventScript_2372FF:: @ 82372FF setmetatile 5, 1, 717, 1 special DrawWholeMapView playse SE_BAN - setvar VAR_0x40BA, 1 + setvar VAR_NEW_MAUVILLE_STATE, 1 releaseall end diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index fe7959703..b13d6059d 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -215,7 +215,7 @@ "x": 33, "y": 6, "elevation": 3, - "var": "VAR_0x40BA", + "var": "VAR_NEW_MAUVILLE_STATE", "var_value": "1", "script": "NewMauville_Inside_EventScript_237725" } diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index b3d9d868f..15d2cb02a 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -1,7 +1,7 @@ NewMauville_Inside_MapScripts:: @ 82373D7 - map_script 5, NewMauville_Inside_MapScript1_2373E7 - map_script 3, NewMauville_Inside_MapScript1_23741B - map_script 1, NewMauville_Inside_MapScript1_23744D + map_script MAP_SCRIPT_ON_RESUME, NewMauville_Inside_MapScript1_2373E7 + map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Inside_MapScript1_23741B + map_script MAP_SCRIPT_ON_LOAD, NewMauville_Inside_MapScript1_23744D .byte 0 NewMauville_Inside_MapScript1_2373E7: @ 82373E7 @@ -15,7 +15,7 @@ NewMauville_Inside_MapScript1_2373E7: @ 82373E7 NewMauville_Inside_EventScript_237407:: @ 8237407 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne NewMauville_Inside_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return @@ -40,7 +40,7 @@ NewMauville_Inside_EventScript_237449:: @ 8237449 return NewMauville_Inside_MapScript1_23744D: @ 823744D - compare VAR_0x40BA, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 call_if_eq NewMauville_Inside_EventScript_23773A end @@ -148,7 +148,7 @@ NewMauville_Inside_EventScript_237725:: @ 8237725 lockall msgbox NewMauville_Inside_Text_237932, MSGBOX_DEFAULT call NewMauville_Inside_EventScript_23773A - setvar VAR_0x40BA, 2 + setvar VAR_NEW_MAUVILLE_STATE, 2 releaseall end @@ -167,7 +167,7 @@ NewMauville_Inside_EventScript_23773A:: @ 823773A NewMauville_Inside_EventScript_23778F:: @ 823778F lockall - compare VAR_0x40BA, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq NewMauville_Inside_EventScript_2377A5 msgbox NewMauville_Inside_Text_237896, MSGBOX_DEFAULT releaseall diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 164cd3eae..37b6105f2 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -119,7 +119,7 @@ "x": 0, "y": 10, "elevation": 3, - "var": "VAR_0x4051", + "var": "VAR_ROUTE102_ACCESSIBLE", "var_value": "0", "script": "OldaleTown_EventScript_1E903F" }, @@ -128,7 +128,7 @@ "x": 8, "y": 19, "elevation": 3, - "var": "VAR_0x40C7", + "var": "VAR_OLDALE_STATE", "var_value": "1", "script": "OldaleTown_EventScript_1E9086" }, @@ -137,7 +137,7 @@ "x": 9, "y": 19, "elevation": 3, - "var": "VAR_0x40C7", + "var": "VAR_OLDALE_STATE", "var_value": "1", "script": "OldaleTown_EventScript_1E90A6" }, @@ -146,7 +146,7 @@ "x": 10, "y": 19, "elevation": 3, - "var": "VAR_0x40C7", + "var": "VAR_OLDALE_STATE", "var_value": "1", "script": "OldaleTown_EventScript_1E90C6" } @@ -166,7 +166,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "OldaleTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -174,7 +174,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "OldaleTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -182,7 +182,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "OldaleTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -190,7 +190,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "OldaleTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" } ] }
\ No newline at end of file diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 7431cbf2a..c68ecbd08 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -1,9 +1,9 @@ OldaleTown_MapScripts:: @ 81E8EA2 - map_script 3, OldaleTown_MapScript1_1E8EA8 + map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_MapScript1_1E8EA8 .byte 0 OldaleTown_MapScript1_1E8EA8: @ 81E8EA8 - call OldaleTown_EventScript_271ED7 + call Common_EventScript_SetupRivalGender setflag FLAG_VISITED_OLDALE_TOWN call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E8ED2 call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_1E8EDE @@ -11,7 +11,7 @@ OldaleTown_MapScript1_1E8EA8: @ 81E8EA8 end OldaleTown_EventScript_1E8ECC:: @ 81E8ECC - setvar VAR_0x4051, 1 + setvar VAR_ROUTE102_ACCESSIBLE, 1 return OldaleTown_EventScript_1E8ED2:: @ 81E8ED2 @@ -85,7 +85,7 @@ OldaleTown_EventScript_1E8FB9:: @ 81E8FB9 end OldaleTown_EventScript_1E8FC3:: @ 81E8FC3 - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT fadedefaultbgm release end @@ -193,7 +193,7 @@ OldaleTown_EventScript_1E901F:: @ 81E901F goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E9066 msgbox OldaleTown_Text_1E939A, MSGBOX_DEFAULT closemessage - applymovement 3, OldaleTown_Movement_2725A2 + applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -217,7 +217,7 @@ OldaleTown_EventScript_1E9066:: @ 81E9066 OldaleTown_EventScript_1E9070:: @ 81E9070 lockall - applymovement 4, OldaleTown_Movement_27259E + applymovement 4, Common_Movement_FacePlayer waitmovement 0 setvar VAR_0x8009, 0 goto OldaleTown_EventScript_1E90E6 @@ -227,7 +227,7 @@ OldaleTown_EventScript_1E9086:: @ 81E9086 lockall applymovement 4, OldaleTown_Movement_1E9170 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight 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, OldaleTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight 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, OldaleTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_1E90E6 @@ -280,7 +280,7 @@ OldaleTown_EventScript_1E911A:: @ 81E911A applymovement 4, OldaleTown_Movement_1E9177 waitmovement 0 removeobject 4 - setvar VAR_0x40C7, 2 + setvar VAR_OLDALE_STATE, 2 setflag FLAG_HIDE_OLDALE_TOWN_RIVAL releaseall end diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index 19f7d8f67..49452da71 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006 - map_script 3, OldaleTown_PokemonCenter_1F_MapScript1_1FC011 - map_script 5, OldaleTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_MapScript1_1FC011 + map_script MAP_SCRIPT_ON_RESUME, OldaleTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 OldaleTown_PokemonCenter_1F_MapScript1_1FC011: @ 81FC011 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc index 788157beb..b6795876b 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ OldaleTown_PokemonCenter_2F_MapScripts:: @ 81FC218 - map_script 2, OldaleTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, OldaleTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, OldaleTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, OldaleTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, OldaleTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 OldaleTown_PokemonCenter_2F_EventScript_1FC22D:: @ 81FC22D diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index 971bf5b86..3070d9c07 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -117,7 +117,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PacifidlogTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -133,7 +133,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PacifidlogTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" } ] }
\ No newline at end of file diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc index 6125ed386..0ae0a53a8 100644 --- a/data/maps/PacifidlogTown/scripts.inc +++ b/data/maps/PacifidlogTown/scripts.inc @@ -1,6 +1,6 @@ PacifidlogTown_MapScripts:: @ 81EBAB1 - map_script 3, PacifidlogTown_MapScript1_1EBABC - map_script 5, PacifidlogTown_MapScript1_1EBAC0 + map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_MapScript1_1EBABC + map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_MapScript1_1EBAC0 .byte 0 PacifidlogTown_MapScript1_1EBABC: @ 81EBABC diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index c7c04c0bd..4f646ff43 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -20,7 +20,7 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792 end PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE - goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_27374E + goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, Common_EventScript_NopReturn specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable compare VAR_RESULT, 0 call_if_eq PacifidlogTown_House2_EventScript_203812 @@ -43,7 +43,7 @@ PacifidlogTown_House2_EventScript_203816:: @ 8203816 msgbox PacifidlogTown_House2_Text_20396D, MSGBOX_DEFAULT giveitem_std ITEM_TM27 compare VAR_RESULT, 0 - goto_if_eq PacifidlogTown_House2_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT @@ -59,7 +59,7 @@ PacifidlogTown_House2_EventScript_20384F:: @ 820384F msgbox PacifidlogTown_House2_Text_203A2F, MSGBOX_DEFAULT giveitem_std ITEM_TM21 compare VAR_RESULT, 0 - goto_if_eq PacifidlogTown_House2_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc index ddad843fb..89fec7f6b 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7 - map_script 3, PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2 - map_script 5, PacifidlogTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2 + map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2: @ 82034B2 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc index 0199c2215..cb28d577e 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8203635 - map_script 2, PacifidlogTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, PacifidlogTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, PacifidlogTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, PacifidlogTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, PacifidlogTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 PacifidlogTown_PokemonCenter_2F_EventScript_20364A:: @ 820364A diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index d8f77168b..3d09ae706 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -193,7 +193,7 @@ "x": 8, "y": 10, "elevation": 3, - "var": "VAR_0x4057", + "var": "VAR_PETALBURG_STATE", "var_value": "0", "script": "PetalburgCity_EventScript_1DC49A" }, @@ -202,7 +202,7 @@ "x": 8, "y": 11, "elevation": 3, - "var": "VAR_0x4057", + "var": "VAR_PETALBURG_STATE", "var_value": "0", "script": "PetalburgCity_EventScript_1DC4A6" }, @@ -211,7 +211,7 @@ "x": 8, "y": 12, "elevation": 3, - "var": "VAR_0x4057", + "var": "VAR_PETALBURG_STATE", "var_value": "0", "script": "PetalburgCity_EventScript_1DC4B2" }, @@ -220,7 +220,7 @@ "x": 8, "y": 13, "elevation": 3, - "var": "VAR_0x4057", + "var": "VAR_PETALBURG_STATE", "var_value": "0", "script": "PetalburgCity_EventScript_1DC4BE" }, @@ -276,7 +276,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -284,7 +284,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -300,7 +300,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -308,7 +308,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index f69eb3a3a..e2f5d2a86 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -1,17 +1,17 @@ PetalburgCity_MapScripts:: - map_script 3, PetalburgCity_MapScript1_1DC2D7 - map_script 2, PetalburgCity_MapScript2_1DC31C + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_MapScript1_1DC2D7 + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_MapScript2_1DC31C .byte 0 PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7 setflag FLAG_VISITED_PETALBURG_CITY - compare VAR_0x4057, 0 + compare VAR_PETALBURG_STATE, 0 call_if_eq PetalburgCity_EventScript_1DC307 - compare VAR_0x4057, 2 + compare VAR_PETALBURG_STATE, 2 call_if_eq PetalburgCity_EventScript_1DC30F - compare VAR_0x4057, 4 + compare VAR_PETALBURG_STATE, 4 call_if_eq PetalburgCity_EventScript_1DC30F - compare VAR_0x4085, 8 + compare VAR_PETALBURG_GYM_STATE, 8 call_if_eq PetalburgCity_EventScript_1DC316 end @@ -25,12 +25,12 @@ PetalburgCity_EventScript_1DC30F:: @ 81DC30F return PetalburgCity_EventScript_1DC316:: @ 81DC316 - setvar VAR_0x4085, 7 + setvar VAR_PETALBURG_GYM_STATE, 7 return PetalburgCity_MapScript2_1DC31C: @ 81DC31C - map_script_2 VAR_0x4057, 2, PetalburgCity_EventScript_1DC32E - map_script_2 VAR_0x4057, 4, PetalburgCity_EventScript_1DC390 + map_script_2 VAR_PETALBURG_STATE, 2, PetalburgCity_EventScript_1DC32E + map_script_2 VAR_PETALBURG_STATE, 4, PetalburgCity_EventScript_1DC390 .2byte 0 PetalburgCity_EventScript_1DC32E:: @ 81DC32E @@ -44,16 +44,16 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E special StartWallyTutorialBattle waitstate msgbox PetalburgCity_Text_1EC271, MSGBOX_DEFAULT - applymovement 2, PetalburgCity_Movement_2725A4, MAP_PETALBURG_CITY + applymovement 2, Common_Movement_WalkInPlaceLeft, MAP_PETALBURG_CITY waitmovement 2, MAP_PETALBURG_CITY msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT closemessage clearflag FLAG_SPECIAL_FLAG_0x4000 - setvar VAR_0x4057, 3 + setvar VAR_PETALBURG_STATE, 3 fadedefaultbgm clearflag FLAG_SPECIAL_FLAG_0x4001 special LoadPlayerParty - setvar VAR_0x4085, 1 + setvar VAR_PETALBURG_GYM_STATE, 1 warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 waitstate releaseall @@ -89,7 +89,7 @@ PetalburgCity_EventScript_1DC3E6:: @ 81DC3E6 faceplayer msgbox PetalburgCity_Text_1DC985, MSGBOX_DEFAULT closemessage - applymovement 3, PetalburgCity_Movement_2725A2 + applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -263,13 +263,13 @@ PetalburgCity_EventScript_1DC4BE:: @ 81DC4BE end PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA - applymovement 8, PetalburgCity_Movement_27259E + applymovement 8, Common_Movement_FacePlayer waitmovement 0 playbgm MUS_TSURETEK, 0 playse SE_PIN - applymovement 8, PetalburgCity_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, PetalburgCity_Movement_27259A + applymovement 8, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 0 call_if_eq PetalburgCity_EventScript_1DC57F @@ -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, PetalburgCity_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A8 + applymovement 8, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight 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, PetalburgCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown 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, PetalburgCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return PetalburgCity_EventScript_1DC5B4:: @ 81DC5B4 applymovement 8, PetalburgCity_Movement_1DC622 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return @@ -543,23 +543,23 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 applymovement 9, PetalburgCity_Movement_1DC7D6 waitmovement 0 playse SE_PIN - applymovement 9, PetalburgCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, PetalburgCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement 9, PetalburgCity_Movement_1DC7DB waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 setvar VAR_0x40D1, 1 msgbox PetalburgCity_Text_1DCB31, MSGBOX_DEFAULT closemessage - applymovement 9, PetalburgCity_Movement_2725A8 + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 delay 30 msgbox PetalburgCity_Text_1DCB82, MSGBOX_DEFAULT closemessage - applymovement 9, PetalburgCity_Movement_2725A4 + applymovement 9, Common_Movement_WalkInPlaceLeft 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 915cdc93e..1f0fdd91c 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -1,14 +1,14 @@ PetalburgCity_Gym_MapScripts:: @ 8204889 - map_script 1, PetalburgCity_Gym_MapScript1_20489E - map_script 3, PetalburgCity_Gym_MapScript1_20492D - map_script 4, PetalburgCity_Gym_MapScript2_20498B - map_script 2, PetalburgCity_Gym_MapScript2_20499A + map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_MapScript1_20489E + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_Gym_MapScript1_20492D + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_Gym_MapScript2_20498B + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_Gym_MapScript2_20499A .byte 0 PetalburgCity_Gym_MapScript1_20489E: @ 820489E - compare VAR_0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 goto_if_eq PetalburgCity_Gym_EventScript_2048B5 - compare VAR_0x4085, 7 + compare VAR_PETALBURG_GYM_STATE, 7 call_if_ge PetalburgCity_Gym_EventScript_2048FF end @@ -44,9 +44,9 @@ PetalburgCity_Gym_EventScript_2048FF:: @ 82048FF return PetalburgCity_Gym_MapScript1_20492D: @ 820492D - compare VAR_0x4085, 1 + compare VAR_PETALBURG_GYM_STATE, 1 call_if_eq PetalburgCity_Gym_EventScript_20494D - compare VAR_0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 call_if_lt PetalburgCity_Gym_EventScript_204955 call_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_20495D end @@ -64,17 +64,17 @@ PetalburgCity_Gym_EventScript_20495D:: @ 820495D specialvar VAR_RESULT, IsTrainerReadyForRematch compare VAR_RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_204985 - compare VAR_0x4085, 8 + compare VAR_PETALBURG_GYM_STATE, 8 goto_if_eq PetalburgCity_Gym_EventScript_204985 setobjectxyperm 1, 4, 107 return PetalburgCity_Gym_EventScript_204985:: @ 8204985 - setvar VAR_0x4085, 8 + setvar VAR_PETALBURG_GYM_STATE, 8 end PetalburgCity_Gym_MapScript2_20498B: @ 820498B - map_script_2 VAR_0x4085, 1, PetalburgCity_Gym_EventScript_204995 + map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_204995 .2byte 0 PetalburgCity_Gym_EventScript_204995:: @ 8204995 @@ -82,7 +82,7 @@ PetalburgCity_Gym_EventScript_204995:: @ 8204995 end PetalburgCity_Gym_MapScript2_20499A: @ 820499A - map_script_2 VAR_0x4085, 1, PetalburgCity_Gym_EventScript_2049A4 + map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_2049A4 .2byte 0 PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 @@ -90,17 +90,17 @@ 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, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown 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, PetalburgCity_Gym_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox PetalburgCity_Gym_Text_205C40, MSGBOX_DEFAULT - setvar VAR_0x4085, 2 + setvar VAR_PETALBURG_GYM_STATE, 2 releaseall end @@ -114,7 +114,7 @@ PetalburgCity_Gym_Movement_2049EC: @ 82049EC PetalburgCity_Gym_EventScript_2049F1:: @ 82049F1 lock faceplayer - switch VAR_0x4085 + switch VAR_PETALBURG_GYM_STATE case 2, PetalburgCity_Gym_EventScript_204D4A case 3, PetalburgCity_Gym_EventScript_204D54 case 4, PetalburgCity_Gym_EventScript_204D5E @@ -216,8 +216,8 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC call_if_eq PetalburgCity_Gym_EventScript_204CB5 removeobject 10 setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT - setvar VAR_0x4085, 1 - setvar VAR_0x4057, 2 + setvar VAR_PETALBURG_GYM_STATE, 1 + setvar VAR_PETALBURG_STATE, 2 clearflag FLAG_HIDE_PETALBURG_CITY_WALLY clearflag FLAG_HIDE_PETALBURG_GYM_WALLY setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL @@ -228,7 +228,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC end PetalburgCity_Gym_EventScript_204C31:: @ 8204C31 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown 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, PetalburgCity_Gym_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return PetalburgCity_Gym_EventScript_204C5F:: @ 8204C5F - applymovement 1, PetalburgCity_Gym_Movement_2725AA - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement 10, PetalburgCity_Gym_Movement_2050EB waitmovement 0 return PetalburgCity_Gym_EventScript_204C78:: @ 8204C78 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown applymovement 10, PetalburgCity_Gym_Movement_205102 applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_205111 waitmovement 0 @@ -274,55 +274,55 @@ PetalburgCity_Gym_EventScript_204CB5:: @ 8204CB5 return PetalburgCity_Gym_EventScript_204CC7:: @ 8204CC7 - applymovement 1, PetalburgCity_Gym_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 return PetalburgCity_Gym_EventScript_204CD2:: @ 8204CD2 - applymovement 1, PetalburgCity_Gym_Movement_2725AA - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return PetalburgCity_Gym_EventScript_204CE4:: @ 8204CE4 - applymovement 1, PetalburgCity_Gym_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return PetalburgCity_Gym_EventScript_204CF6:: @ 8204CF6 - applymovement 1, PetalburgCity_Gym_Movement_2725A4 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return PetalburgCity_Gym_EventScript_204D08:: @ 8204D08 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_204D13:: @ 8204D13 - applymovement 1, PetalburgCity_Gym_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 return PetalburgCity_Gym_EventScript_204D1E:: @ 8204D1E - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_204D29:: @ 8204D29 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_204D34:: @ 8204D34 - applymovement 10, PetalburgCity_Gym_Movement_27259E + applymovement 10, Common_Movement_FacePlayer waitmovement 0 return PetalburgCity_Gym_EventScript_204D3F:: @ 8204D3F - applymovement 10, PetalburgCity_Gym_Movement_2725AA + applymovement 10, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -350,7 +350,7 @@ PetalburgCity_Gym_EventScript_204D72:: @ 8204D72 return PetalburgCity_Gym_EventScript_204D73:: @ 8204D73 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -403,7 +403,7 @@ PetalburgCity_Gym_EventScript_204E17:: @ 8204E17 PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D giveitem_std ITEM_ENIGMA_BERRY compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setvar VAR_ENIGMA_BERRY_AVAILABLE, 0 release end @@ -413,10 +413,10 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B trainerbattle_no_intro TRAINER_NORMAN_1, PetalburgCity_Gym_Text_206107 message PetalburgCity_Gym_Text_206162 waitmessage - call PetalburgCity_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox PetalburgCity_Gym_Text_20618A, MSGBOX_DEFAULT setflag FLAG_DEFEATED_PETALBURG_GYM - setvar VAR_0x4085, 7 + setvar VAR_PETALBURG_GYM_STATE, 7 setflag FLAG_BADGE05_GET special sub_813B9A0 call PetalburgCity_Gym_EventScript_2721F8 @@ -444,7 +444,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2 giveitem_std ITEM_TM42 compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull setflag FLAG_RECEIVED_TM42 msgbox PetalburgCity_Gym_Text_206254, MSGBOX_DEFAULT return @@ -465,9 +465,9 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 applymovement 11, PetalburgCity_Gym_Movement_2050BB waitmovement 0 playse SE_PIN - applymovement 11, PetalburgCity_Gym_Movement_272598 + applymovement 11, Common_Movement_ExclamationMark waitmovement 0 - applymovement 11, PetalburgCity_Gym_Movement_27259A + applymovement 11, Common_Movement_Delay48 waitmovement 0 delay 10 compare VAR_0x8008, 1 @@ -496,7 +496,7 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 compare VAR_0x8008, 3 call_if_eq PetalburgCity_Gym_EventScript_20506C removeobject 11 - setvar VAR_0x4057, 4 + setvar VAR_PETALBURG_STATE, 4 clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE warp MAP_PETALBURG_CITY, 255, 15, 8 waitstate @@ -504,47 +504,47 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 end PetalburgCity_Gym_EventScript_204FCC:: @ 8204FCC - applymovement 11, PetalburgCity_Gym_Movement_2725A6 + applymovement 11, Common_Movement_WalkInPlaceUp waitmovement 0 return PetalburgCity_Gym_EventScript_204FD7:: @ 8204FD7 - applymovement 11, PetalburgCity_Gym_Movement_2725A8 + applymovement 11, Common_Movement_WalkInPlaceRight waitmovement 0 return PetalburgCity_Gym_EventScript_204FE2:: @ 8204FE2 - applymovement 11, PetalburgCity_Gym_Movement_2725A4 + applymovement 11, Common_Movement_WalkInPlaceLeft waitmovement 0 return PetalburgCity_Gym_EventScript_204FED:: @ 8204FED applymovement 11, PetalburgCity_Gym_Movement_2050C3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A4 - applymovement 1, PetalburgCity_Gym_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return PetalburgCity_Gym_EventScript_205009:: @ 8205009 applymovement 11, PetalburgCity_Gym_Movement_2050CA waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_205025:: @ 8205025 applymovement 11, PetalburgCity_Gym_Movement_2050D0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_205041:: @ 8205041 applymovement 11, PetalburgCity_Gym_Movement_20507E - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2050A1 waitmovement 0 return @@ -783,7 +783,7 @@ PetalburgCity_Gym_EventScript_20512D:: @ 820512D PetalburgCity_Gym_EventScript_205137:: @ 8205137 lockall - compare VAR_0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 85 @@ -813,7 +813,7 @@ PetalburgCity_Gym_EventScript_20517D:: @ 820517D PetalburgCity_Gym_EventScript_205187:: @ 8205187 lockall - compare VAR_0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 98 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index 1bbeb8fad..382847bc7 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8 - map_script 3, PetalburgCity_PokemonCenter_1F_MapScript1_2079F3 - map_script 5, PetalburgCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_MapScript1_2079F3 + map_script MAP_SCRIPT_ON_RESUME, PetalburgCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 PetalburgCity_PokemonCenter_1F_MapScript1_2079F3: @ 82079F3 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc index 38d01972a..7b5f5af55 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ PetalburgCity_PokemonCenter_2F_MapScripts:: @ 8207D41 - map_script 2, PetalburgCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, PetalburgCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, PetalburgCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, PetalburgCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 PetalburgCity_PokemonCenter_2F_EventScript_207D56:: @ 8207D56 diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index ac41aaa28..8b1421abb 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -1,10 +1,10 @@ PetalburgCity_WallysHouse_MapScripts:: @ 8204229 - map_script 2, PetalburgCity_WallysHouse_MapScript2_204247 - map_script 4, PetalburgCity_WallysHouse_MapScript2_204234 + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_MapScript2_204247 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_WallysHouse_MapScript2_204234 .byte 0 PetalburgCity_WallysHouse_MapScript2_204234: @ 8204234 - map_script_2 VAR_0x4057, 4, PetalburgCity_WallysHouse_EventScript_20423E + map_script_2 VAR_PETALBURG_STATE, 4, PetalburgCity_WallysHouse_EventScript_20423E .2byte 0 PetalburgCity_WallysHouse_EventScript_20423E:: @ 820423E @@ -13,7 +13,7 @@ PetalburgCity_WallysHouse_EventScript_20423E:: @ 820423E end PetalburgCity_WallysHouse_MapScript2_204247: @ 8204247 - map_script_2 VAR_0x4057, 4, PetalburgCity_WallysHouse_EventScript_204251 + map_script_2 VAR_PETALBURG_STATE, 4, PetalburgCity_WallysHouse_EventScript_204251 .2byte 0 PetalburgCity_WallysHouse_EventScript_204251:: @ 8204251 @@ -22,7 +22,7 @@ PetalburgCity_WallysHouse_EventScript_204251:: @ 8204251 giveitem_std ITEM_HM03 setflag FLAG_RECEIVED_HM03 msgbox PetalburgCity_WallysHouse_Text_20461A, MSGBOX_DEFAULT - setvar VAR_0x4057, 5 + setvar VAR_PETALBURG_STATE, 5 releaseall end diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index 4921b88ae..4bca7bb5e 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -234,7 +234,7 @@ "x": 26, "y": 23, "elevation": 3, - "var": "VAR_0x4098", + "var": "VAR_PETALBURG_WOODS_STATE", "var_value": "0", "script": "PetalburgWoods_EventScript_22DFD7" }, @@ -243,7 +243,7 @@ "x": 27, "y": 23, "elevation": 3, - "var": "VAR_0x4098", + "var": "VAR_PETALBURG_WOODS_STATE", "var_value": "0", "script": "PetalburgWoods_EventScript_22E079" } diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index eec9100f1..423d4c432 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, PetalburgWoods_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp 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, PetalburgWoods_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft 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, PetalburgWoods_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp 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, PetalburgWoods_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp 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, PetalburgWoods_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox PetalburgWoods_Text_22E63D, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL @@ -109,7 +109,7 @@ PetalburgWoods_EventScript_22E18B:: @ 822E18B PetalburgWoods_EventScript_22E1A7:: @ 822E1A7 removeobject 4 - setvar VAR_0x4098, 1 + setvar VAR_PETALBURG_WOODS_STATE, 1 releaseall end @@ -253,7 +253,7 @@ PetalburgWoods_EventScript_22E222:: @ 822E222 msgbox PetalburgWoods_Text_22EAFE, MSGBOX_DEFAULT giveitem_std ITEM_MIRACLE_SEED compare VAR_RESULT, 0 - goto_if_eq PetalburgWoods_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MIRACLE_SEED release end diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index 97c303c1c..44d8b2137 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -111,7 +111,7 @@ "x": 10, "y": 19, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "1", "script": "Route101_EventScript_1EBCDE" }, @@ -120,7 +120,7 @@ "x": 11, "y": 19, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "1", "script": "Route101_EventScript_1EBCDE" }, @@ -129,7 +129,7 @@ "x": 10, "y": 18, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "2", "script": "Route101_EventScript_1EBD4E" }, @@ -138,7 +138,7 @@ "x": 11, "y": 18, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "2", "script": "Route101_EventScript_1EBD4E" }, @@ -147,7 +147,7 @@ "x": 6, "y": 16, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "2", "script": "Route101_EventScript_1EBD64" }, @@ -156,7 +156,7 @@ "x": 6, "y": 15, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "2", "script": "Route101_EventScript_1EBD64" }, @@ -165,7 +165,7 @@ "x": 6, "y": 17, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "2", "script": "Route101_EventScript_1EBD64" }, @@ -174,7 +174,7 @@ "x": 6, "y": 18, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "2", "script": "Route101_EventScript_1EBD64" }, @@ -183,7 +183,7 @@ "x": 7, "y": 13, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_ROUTE101_STATE", "var_value": "2", "script": "Route101_EventScript_1EBD7A" } diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 15722a3f3..aa20ba2da 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -1,6 +1,6 @@ Route101_MapScripts:: @ 81EBCBA - map_script 3, Route101_MapScript1_1EBCC5 - map_script 2, Route101_MapScript2_1EBCCB + map_script MAP_SCRIPT_ON_TRANSITION, Route101_MapScript1_1EBCC5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_MapScript2_1EBCCB .byte 0 Route101_MapScript1_1EBCC5: @ 81EBCC5 @@ -8,12 +8,12 @@ Route101_MapScript1_1EBCC5: @ 81EBCC5 end Route101_MapScript2_1EBCCB: @ 81EBCCB - map_script_2 VAR_0x4060, 0, Route101_EventScript_1EBCD5 + map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_1EBCD5 .2byte 0 Route101_EventScript_1EBCD5:: @ 81EBCD5 setflag FLAG_SPECIAL_FLAG_0x4000 - setvar VAR_0x4060, 1 + setvar VAR_ROUTE101_STATE, 1 end Route101_EventScript_1EBCDE:: @ 81EBCDE @@ -30,14 +30,14 @@ Route101_EventScript_1EBCDE:: @ 81EBCDE applymovement 4, Route101_Movement_1EBD96 applymovement 2, Route101_Movement_1EBDC8 waitmovement 0 - applymovement 2, Route101_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, Route101_Movement_1EBDBD applymovement 2, Route101_Movement_1EBDEF waitmovement 0 msgbox Route101_Text_1EBE9A, MSGBOX_DEFAULT closemessage - setvar VAR_0x4060, 2 + setvar VAR_ROUTE101_STATE, 2 releaseall end @@ -223,7 +223,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16 fadescreen 1 removeobject 4 setobjectxy EVENT_OBJ_ID_PLAYER, 6, 13 - applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 special ChooseStarter waitstate @@ -234,8 +234,8 @@ Route101_EventScript_1EBE16:: @ 81EBE16 setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH setflag FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG - setvar VAR_0x4084, 2 - setvar VAR_0x4060, 3 + setvar VAR_BIRCH_LAB_STATE, 2 + setvar VAR_ROUTE101_STATE, 3 clearflag FLAG_SPECIAL_FLAG_0x4000 checkplayergender compare VAR_RESULT, MALE diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index e13bad76d..f711416fd 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -1,10 +1,10 @@ Route103_MapScripts:: @ 81EC38E - map_script 3, Route103_MapScript1_1EC399 - map_script 1, Route103_MapScript1_1EC3A4 + map_script MAP_SCRIPT_ON_TRANSITION, Route103_MapScript1_1EC399 + map_script MAP_SCRIPT_ON_LOAD, Route103_MapScript1_1EC3A4 .byte 0 Route103_MapScript1_1EC399: @ 81EC399 - call Route103_EventScript_271ED7 + call Common_EventScript_SetupRivalGender call Route103_EventScript_2720AD end @@ -30,11 +30,11 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA msgbox Route103_Text_1EC7A6, MSGBOX_DEFAULT closemessage playbgm MUS_GIRL_SUP, 1 - applymovement 2, Route103_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 - applymovement 2, Route103_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, Route103_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 msgbox Route103_Text_1EC7DE, MSGBOX_DEFAULT switch VAR_STARTER_MON @@ -47,11 +47,11 @@ Route103_EventScript_1EC434:: @ 81EC434 msgbox Route103_Text_1EC989, MSGBOX_DEFAULT closemessage playbgm MUS_BOY_SUP, 1 - applymovement 2, Route103_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 - applymovement 2, Route103_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, Route103_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 msgbox Route103_Text_1EC9CE, MSGBOX_DEFAULT switch VAR_STARTER_MON @@ -140,10 +140,10 @@ Route103_EventScript_1EC585:: @ 81EC585 Route103_EventScript_1EC5A2:: @ 81EC5A2 removeobject 2 - setvar VAR_0x4084, 4 + setvar VAR_BIRCH_LAB_STATE, 4 clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL setflag FLAG_DEFEATED_RIVAL_ROUTE103 - setvar VAR_0x40C7, 1 + setvar VAR_OLDALE_STATE, 1 clearflag FLAG_HIDE_OLDALE_TOWN_RIVAL savebgm MUS_DUMMY fadedefaultbgm diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index e904f69b7..1daa9e52c 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -1,10 +1,10 @@ Route104_MapScripts:: @ 81ECC32 - map_script 2, Route104_MapScript2_1ECC3D - map_script 3, Route104_MapScript1_1ECC4E + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route104_MapScript2_1ECC3D + map_script MAP_SCRIPT_ON_TRANSITION, Route104_MapScript1_1ECC4E .byte 0 Route104_MapScript2_1ECC3D: @ 81ECC3D - map_script_2 VAR_0x408E, 1, Route104_EventScript_1ECC47 + map_script_2 VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1, Route104_EventScript_1ECC47 .2byte 0 Route104_EventScript_1ECC47:: @ 81ECC47 @@ -13,7 +13,7 @@ Route104_EventScript_1ECC47:: @ 81ECC47 end Route104_MapScript1_1ECC4E: @ 81ECC4E - call Route104_EventScript_271ED7 + call Common_EventScript_SetupRivalGender call Route104_EventScript_1ECC78 call Route104_EventScript_1ECC5E end @@ -29,7 +29,7 @@ Route104_EventScript_1ECC74:: @ 81ECC74 return Route104_EventScript_1ECC78:: @ 81ECC78 - compare VAR_0x408E, 1 + compare VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1 goto_if_ge Route104_EventScript_1ECC9D goto_if_set FLAG_MET_RIVAL_RUSTBORO, Route104_EventScript_1ECC9D goto_if_unset FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_1ECC9D @@ -42,16 +42,16 @@ Route104_EventScript_1ECC9D:: @ 81ECC9D Route104_EventScript_1ECC9E:: @ 81ECC9E lockall setvar VAR_0x8008, 1 - applymovement 34, Route104_Movement_27259E + applymovement 34, Common_Movement_FacePlayer waitmovement 0 goto Route104_EventScript_1ECD33 Route104_EventScript_1ECCB3:: @ 81ECCB3 lockall setflag FLAG_HIDE_RUSBORO_CITY_RIVAL - setvar VAR_0x405A, 8 + setvar VAR_RUSTBORO_STATE, 8 setvar VAR_0x4063, 2 - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 10 addobject 34 @@ -64,9 +64,9 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 setvar VAR_0x8008, 0 call Route104_EventScript_1E0DD1 playse SE_PIN - applymovement 34, Route104_Movement_272598 + applymovement 34, Common_Movement_ExclamationMark waitmovement 0 - applymovement 34, Route104_Movement_27259A + applymovement 34, Common_Movement_Delay48 waitmovement 0 goto Route104_EventScript_1ECD33 @@ -270,7 +270,7 @@ Route104_EventScript_1ECF8C:: @ 81ECF8C msgbox Route104_Text_2A6D86, MSGBOX_DEFAULT giveitem_std ITEM_CHESTO_BERRY compare VAR_RESULT, 0 - goto_if_eq Route104_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104 msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT release @@ -288,7 +288,7 @@ Route104_EventScript_1ECFCD:: @ 81ECFCD msgbox Route104_Text_1ED96A, MSGBOX_DEFAULT giveitem_std ITEM_WHITE_HERB compare VAR_RESULT, 0 - goto_if_eq Route104_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_WHITE_HERB release end @@ -341,7 +341,7 @@ Route104_EventScript_1ED057:: @ 81ED057 msgbox Route104_Text_1ED838, MSGBOX_DEFAULT giveitem_std ITEM_TM09 compare VAR_RESULT, 0 - goto_if_eq Route104_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM09 release end @@ -413,11 +413,11 @@ Route104_EventScript_1ED139:: @ 81ED139 call Route104_EventScript_2720A8 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT hideobjectat 7, MAP_ROUTE104 - copyvar VAR_0x4096, VAR_0x8008 + copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 - setvar VAR_0x408E, 0 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0 goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1B4 goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1BE end diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index 17ed47206..8a4af48cd 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -1,10 +1,10 @@ Route104_MrBrineysHouse_MapScripts:: @ 8229D2E - map_script 3, Route104_MrBrineysHouse_MapScript1_229D34 + map_script MAP_SCRIPT_ON_TRANSITION, Route104_MrBrineysHouse_MapScript1_229D34 .byte 0 Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34 setflag FLAG_LANDMARK_MR_BRINEY_HOUSE - compare VAR_0x4090, 1 + compare VAR_BRINEY_HOUSE_STATE, 1 call_if_eq Route104_MrBrineysHouse_EventScript_229D50 call_if_set FLAG_RECEIVED_POKENAV, Route104_MrBrineysHouse_EventScript_229D4C end @@ -75,11 +75,11 @@ Route104_MrBrineysHouse_EventScript_229E1D:: @ 8229E1D Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27 msgbox Route104_MrBrineysHouse_Text_229FE9, MSGBOX_DEFAULT call Route104_MrBrineysHouse_EventScript_271E95 - setvar VAR_0x408E, 1 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1 clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO - setvar VAR_0x405A, 8 + setvar VAR_RUSTBORO_STATE, 8 setvar VAR_0x4063, 2 setflag FLAG_HIDE_RUSBORO_CITY_RIVAL setflag FLAG_HIDE_ROUTE_104_RIVAL diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index 7f5e35287..26dfe7f8a 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -1,5 +1,5 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 822A34C - map_script 3, Route104_PrettyPetalFlowerShop_MapScript1_22A352 + map_script MAP_SCRIPT_ON_TRANSITION, Route104_PrettyPetalFlowerShop_MapScript1_22A352 .byte 0 Route104_PrettyPetalFlowerShop_MapScript1_22A352: @ 822A352 @@ -91,7 +91,7 @@ Route104_PrettyPetalFlowerShop_EventScript_22A442:: @ 822A442 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT release diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index b4213af5b..6ad11bc52 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -1,7 +1,7 @@ Route105_MapScripts:: @ 81EE1DB - map_script 1, Route105_MapScript1_1EE1EB - map_script 3, Route105_MapScript1_1EE21E - map_script 2, Route105_MapScript2_1EE240 + map_script MAP_SCRIPT_ON_LOAD, Route105_MapScript1_1EE1EB + map_script MAP_SCRIPT_ON_TRANSITION, Route105_MapScript1_1EE21E + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route105_MapScript2_1EE240 .byte 0 Route105_MapScript1_1EE1EB: @ 81EE1EB diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index ebf9398d1..a036296e3 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -55,7 +55,7 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5 hideobjectat 1, MAP_ROUTE109 msgbox Route109_Text_1E9C1D, MSGBOX_DEFAULT closemessage - copyvar VAR_0x4096, VAR_0x8008 + copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 @@ -319,7 +319,7 @@ Route109_EventScript_1EE99E:: @ 81EE99E faceplayer msgbox Route109_Text_1EEFB0, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -332,9 +332,9 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 msgbox Route109_Text_1EEFDE, MSGBOX_DEFAULT giveitem_std ITEM_SOFT_SAND compare VAR_RESULT, 0 - goto_if_eq Route109_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull closemessage - applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_RECEIVED_SOFT_SAND release @@ -342,7 +342,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 Route109_EventScript_1EE9F2:: @ 81EE9F2 msgbox Route109_Text_1EEFF1, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index 951356409..ed27e32ff 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -1,5 +1,5 @@ Route109_SeashoreHouse_MapScripts:: @ 82693F4 - map_script 3, Route109_SeashoreHouse_MapScript1_2693FA + map_script MAP_SCRIPT_ON_TRANSITION, Route109_SeashoreHouse_MapScript1_2693FA .byte 0 Route109_SeashoreHouse_MapScript1_2693FA: @ 82693FA @@ -75,7 +75,7 @@ Route109_SeashoreHouse_EventScript_2694C8:: @ 82694C8 end Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5 - msgbox gUnknown_08272AD0, MSGBOX_DEFAULT + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT hidemoneybox nop nop diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json index 404155652..a9ac7796a 100644 --- a/data/maps/Route110/map.json +++ b/data/maps/Route110/map.json @@ -567,7 +567,7 @@ "x": 33, "y": 56, "elevation": 3, - "var": "VAR_0x4069", + "var": "VAR_ROUTE110_STATE", "var_value": "0", "script": "Route110_EventScript_1EF74D" }, @@ -576,7 +576,7 @@ "x": 34, "y": 56, "elevation": 3, - "var": "VAR_0x4069", + "var": "VAR_ROUTE110_STATE", "var_value": "0", "script": "Route110_EventScript_1EF758" }, @@ -585,7 +585,7 @@ "x": 35, "y": 56, "elevation": 3, - "var": "VAR_0x4069", + "var": "VAR_ROUTE110_STATE", "var_value": "0", "script": "Route110_EventScript_1EF763" }, diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 7c98cc603..cddfbebcc 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -1,7 +1,7 @@ Route110_MapScripts:: @ 81EF269 - map_script 5, Route110_MapScript1_1EF279 - map_script 3, Route110_MapScript1_1EF27D - map_script 2, Route110_MapScript2_1EF297 + map_script MAP_SCRIPT_ON_RESUME, Route110_MapScript1_1EF279 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_MapScript1_1EF27D + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_MapScript2_1EF297 .byte 0 Route110_MapScript1_1EF279: @ 81EF279 @@ -9,8 +9,8 @@ Route110_MapScript1_1EF279: @ 81EF279 end Route110_MapScript1_1EF27D: @ 81EF27D - call Route110_EventScript_271ED7 - call Route110_EventScript_271EFB + call Common_EventScript_SetupRivalGender + call Common_EventScript_SetupRivalOnBikeGender compare VAR_CYCLING_CHALLENGE_STATE, 1 call_if_eq Route110_EventScript_1EF293 end @@ -32,7 +32,7 @@ Route110_EventScript_1EF2AA:: @ 81EF2AA lock faceplayer msgbox Route110_Text_1EFB5D, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -41,7 +41,7 @@ Route110_EventScript_1EF2C0:: @ 81EF2C0 lock faceplayer msgbox Route110_Text_1EFB93, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -50,7 +50,7 @@ Route110_EventScript_1EF2D6:: @ 81EF2D6 lock faceplayer msgbox Route110_Text_1EFBCA, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -59,7 +59,7 @@ Route110_EventScript_1EF2EC:: @ 81EF2EC lock faceplayer msgbox Route110_Text_1EFC0D, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -307,7 +307,7 @@ Route110_EventScript_1EF64A:: @ 81EF64A Route110_EventScript_1EF661:: @ 81EF661 lockall - applymovement 21, Route110_Movement_2725A8 + applymovement 21, Common_Movement_WalkInPlaceRight waitmovement 0 call Route110_EventScript_1EF673 releaseall @@ -383,11 +383,11 @@ Route110_EventScript_1EF76E:: @ 81EF76E call_if_eq Route110_EventScript_1EF7E1 compare VAR_RESULT, FEMALE call_if_eq Route110_EventScript_1EF7E6 - applymovement 28, Route110_Movement_2725AA + applymovement 28, Common_Movement_WalkInPlaceDown waitmovement 0 - applymovement 28, Route110_Movement_272598 + applymovement 28, Common_Movement_ExclamationMark waitmovement 0 - applymovement 28, Route110_Movement_27259A + applymovement 28, Common_Movement_Delay48 waitmovement 0 delay 30 compare VAR_0x8008, 1 @@ -496,7 +496,7 @@ Route110_EventScript_1EF8EC:: @ 81EF8EC compare VAR_0x8008, 3 call_if_eq Route110_EventScript_1EF985 removeobject 29 - setvar VAR_0x4069, 1 + setvar VAR_ROUTE110_STATE, 1 savebgm MUS_DUMMY fadedefaultbgm releaseall @@ -616,9 +616,9 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 applymovement 36, Route110_Movement_1EFB30 waitmovement 0 playse SE_PIN - applymovement 36, Route110_Movement_272598 + applymovement 36, Common_Movement_ExclamationMark waitmovement 0 - applymovement 36, Route110_Movement_27259A + applymovement 36, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 1 call_if_eq Route110_EventScript_1EFAD8 @@ -631,13 +631,13 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 msgbox Route110_Text_1F0AB5, MSGBOX_DEFAULT closemessage delay 20 - applymovement 36, Route110_Movement_2725A4 + applymovement 36, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 10 - applymovement 36, Route110_Movement_2725A8 + applymovement 36, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 - applymovement 36, Route110_Movement_2725AA + applymovement 36, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 msgbox Route110_Text_1F0AFF, MSGBOX_DEFAULT diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index a993364e6..1d353dcdd 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 826EBA1 - map_script 3, Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7 .byte 0 Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7: @ 826EBA7 diff --git a/data/maps/Route110_TrickHouseCorridor/scripts.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc index cf520c81f..996f9d605 100644 --- a/data/maps/Route110_TrickHouseCorridor/scripts.inc +++ b/data/maps/Route110_TrickHouseCorridor/scripts.inc @@ -1,8 +1,8 @@ Route110_TrickHouseCorridor_MapScripts:: @ 826B903 - map_script 3, Route110_TrickHouseCorridor_MapScript1_26B909 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseCorridor_MapScript1_26B909 .byte 0 Route110_TrickHouseCorridor_MapScript1_26B909: @ 826B909 - setvar VAR_0x40B5, 1 + setvar VAR_TRICK_HOUSE_STATE, 1 end diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 8326a7c02..7902cb95d 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -1,8 +1,8 @@ Route110_TrickHouseEnd_MapScripts:: @ 826ACAF - map_script 5, Route110_TrickHouseEnd_MapScript1_26ACC4 - map_script 3, Route110_TrickHouseEnd_MapScript1_26ACD0 - map_script 2, Route110_TrickHouseEnd_MapScript2_26ACF5 - map_script 4, Route110_TrickHouseEnd_MapScript2_26ACDE + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHouseEnd_MapScript1_26ACC4 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEnd_MapScript1_26ACD0 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEnd_MapScript2_26ACF5 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEnd_MapScript2_26ACDE .byte 0 Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4 @@ -59,7 +59,7 @@ Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17 Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84 msgbox Route110_TrickHouseEnd_Text_26B0BC, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_RARE_CANDY compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF @@ -72,7 +72,7 @@ Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84 Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0 msgbox Route110_TrickHouseEnd_Text_26B13B, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_TIMER_BALL compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF @@ -85,7 +85,7 @@ Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0 Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC msgbox Route110_TrickHouseEnd_Text_26B1AD, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_HARD_STONE compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF @@ -98,7 +98,7 @@ Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38 msgbox Route110_TrickHouseEnd_Text_26B223, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_SMOKE_BALL compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF @@ -111,7 +111,7 @@ Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38 Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74 msgbox Route110_TrickHouseEnd_Text_26B293, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_TM12 compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF @@ -124,7 +124,7 @@ Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74 Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0 msgbox Route110_TrickHouseEnd_Text_26B315, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_MAGNET compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF @@ -137,7 +137,7 @@ Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0 Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC msgbox Route110_TrickHouseEnd_Text_26B365, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_PP_MAX compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF @@ -161,11 +161,11 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 delay 30 msgbox Route110_TrickHouseEnd_Text_26B3FA, MSGBOX_DEFAULT closemessage - applymovement 1, Route110_TrickHouseEnd_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 delay 30 msgbox Route110_TrickHouseEnd_Text_26B485, MSGBOX_DEFAULT - setvar VAR_0x40C1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 call Route110_TrickHouseEnd_EventScript_26AFA5 compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_26B002 @@ -200,34 +200,34 @@ Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF return Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF - call Route110_TrickHouseEnd_EventScript_27205E + call Common_EventScript_BagIsFull msgbox Route110_TrickHouseEnd_Text_26B760, MSGBOX_DEFAULT - setvar VAR_0x40C1, 1 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 return Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002 - call Route110_TrickHouseEnd_EventScript_272071 + call Common_EventScript_NoRoomLeftForAnother msgbox Route110_TrickHouseEnd_Text_26B615, MSGBOX_DEFAULT - setvar VAR_0x40C1, 1 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 return Route110_TrickHouseEnd_EventScript_26B015:: @ 826B015 - applymovement 1, Route110_TrickHouseEnd_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return Route110_TrickHouseEnd_EventScript_26B020:: @ 826B020 - applymovement 1, Route110_TrickHouseEnd_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 return Route110_TrickHouseEnd_EventScript_26B02B:: @ 826B02B - applymovement 1, Route110_TrickHouseEnd_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return Route110_TrickHouseEnd_EventScript_26B036:: @ 826B036 - applymovement 1, Route110_TrickHouseEnd_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -235,13 +235,13 @@ Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041 lockall turnobject 1, 3 playse SE_PIN - applymovement 1, Route110_TrickHouseEnd_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 delay 20 applymovement 1, Route110_TrickHouseEnd_Movement_26B08B waitmovement 0 playse SE_W153 - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEnd_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox Route110_TrickHouseEnd_Text_26B8BD, MSGBOX_DEFAULT closemessage diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json index 59280848e..ce188feec 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.json +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -57,7 +57,7 @@ "x": 4, "y": 7, "elevation": 3, - "var": "VAR_0x40A5", + "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1", "var_value": "0", "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" }, @@ -66,7 +66,7 @@ "x": 5, "y": 6, "elevation": 3, - "var": "VAR_0x40A5", + "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1", "var_value": "0", "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" }, @@ -75,7 +75,7 @@ "x": 6, "y": 6, "elevation": 3, - "var": "VAR_0x40A5", + "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1", "var_value": "0", "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" }, @@ -84,7 +84,7 @@ "x": 7, "y": 7, "elevation": 3, - "var": "VAR_0x40A5", + "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1", "var_value": "0", "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" } diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index b2aa22f6c..a83d50dc3 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -1,24 +1,24 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8269A50 - map_script 3, Route110_TrickHouseEntrance_MapScript1_269A60 - map_script 2, Route110_TrickHouseEntrance_MapScript2_269CEE - map_script 4, Route110_TrickHouseEntrance_MapScript2_269BD3 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEntrance_MapScript1_269A60 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEntrance_MapScript2_269CEE + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEntrance_MapScript2_269BD3 .byte 0 Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 setflag FLAG_LANDMARK_TRICK_HOUSE - compare VAR_0x40B5, 1 + compare VAR_TRICK_HOUSE_STATE, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_269AF3 - compare VAR_0x40C1, 1 + compare VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_269AD7 - compare VAR_0x40A6, 1 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_269BB3 - compare VAR_0x40A7, 5 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 call_if_eq Route110_TrickHouseEntrance_EventScript_269B03 - compare VAR_0x40A7, 3 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 call_if_eq Route110_TrickHouseEntrance_EventScript_269B03 - compare VAR_0x40A7, 0 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_269B03 - switch VAR_0x40A7 + switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 case 0, Route110_TrickHouseEntrance_EventScript_269BBB case 1, Route110_TrickHouseEntrance_EventScript_269BC1 case 3, Route110_TrickHouseEntrance_EventScript_269BC7 @@ -26,24 +26,24 @@ Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 end Route110_TrickHouseEntrance_EventScript_269AD7:: @ 8269AD7 - setvar VAR_0x40A5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 compare VAR_0x4044, 8 goto_if_eq Route110_TrickHouseEntrance_EventScript_269AED - setvar VAR_0x40A7, 2 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2 end Route110_TrickHouseEntrance_EventScript_269AED:: @ 8269AED - setvar VAR_0x40A7, 6 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6 end Route110_TrickHouseEntrance_EventScript_269AF3:: @ 8269AF3 - setvar VAR_0x40B5, 0 - setvar VAR_0x40A7, 5 - setvar VAR_0x40A5, 1 + setvar VAR_TRICK_HOUSE_STATE, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 end Route110_TrickHouseEntrance_EventScript_269B03:: @ 8269B03 - setvar VAR_0x40A7, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 compare VAR_0x4044, 1 call_if_eq Route110_TrickHouseEntrance_EventScript_269B61 compare VAR_0x4044, 2 @@ -91,11 +91,11 @@ Route110_TrickHouseEntrance_EventScript_269B9D:: @ 8269B9D return Route110_TrickHouseEntrance_EventScript_269BA7:: @ 8269BA7 - setvar VAR_0x40A7, 4 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4 return Route110_TrickHouseEntrance_EventScript_269BAD:: @ 8269BAD - setvar VAR_0x40A7, 3 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 return Route110_TrickHouseEntrance_EventScript_269BB3:: @ 8269BB3 @@ -103,30 +103,30 @@ Route110_TrickHouseEntrance_EventScript_269BB3:: @ 8269BB3 end Route110_TrickHouseEntrance_EventScript_269BBB:: @ 8269BBB - setvar VAR_0x40A5, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 0 end Route110_TrickHouseEntrance_EventScript_269BC1:: @ 8269BC1 - setvar VAR_0x40A5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 end Route110_TrickHouseEntrance_EventScript_269BC7:: @ 8269BC7 - setvar VAR_0x40A5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 end Route110_TrickHouseEntrance_EventScript_269BCD:: @ 8269BCD - setvar VAR_0x40A5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 end Route110_TrickHouseEntrance_MapScript2_269BD3: @ 8269BD3 - map_script_2 VAR_0x40A6, 1, Route110_TrickHouseEntrance_EventScript_269C15 - map_script_2 VAR_0x40A7, 0, Route110_TrickHouseEntrance_EventScript_269C26 - map_script_2 VAR_0x40A7, 1, Route110_TrickHouseEntrance_EventScript_269CCC - map_script_2 VAR_0x40A7, 2, Route110_TrickHouseEntrance_EventScript_269CD0 - map_script_2 VAR_0x40A7, 3, Route110_TrickHouseEntrance_EventScript_269CD0 - map_script_2 VAR_0x40A7, 4, Route110_TrickHouseEntrance_EventScript_269CCC - map_script_2 VAR_0x40A7, 5, Route110_TrickHouseEntrance_EventScript_269CCC - map_script_2 VAR_0x40A7, 6, Route110_TrickHouseEntrance_EventScript_269CDF + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_269C15 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0, Route110_TrickHouseEntrance_EventScript_269C26 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1, Route110_TrickHouseEntrance_EventScript_269CCC + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2, Route110_TrickHouseEntrance_EventScript_269CD0 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3, Route110_TrickHouseEntrance_EventScript_269CD0 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4, Route110_TrickHouseEntrance_EventScript_269CCC + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5, Route110_TrickHouseEntrance_EventScript_269CCC + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6, Route110_TrickHouseEntrance_EventScript_269CDF .2byte 0 Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15 @@ -199,7 +199,7 @@ Route110_TrickHouseEntrance_EventScript_269CDF:: @ 8269CDF end Route110_TrickHouseEntrance_MapScript2_269CEE: @ 8269CEE - map_script_2 VAR_0x40A6, 1, Route110_TrickHouseEntrance_EventScript_269CF8 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_269CF8 .2byte 0 Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8 @@ -216,8 +216,8 @@ Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8 applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F waitmovement 0 removeobject 1 - setvar VAR_0x40A7, 1 - setvar VAR_0x40A6, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 0 releaseall end @@ -227,7 +227,7 @@ Route110_TrickHouseEntrance_EventScript_269D39:: @ 8269D39 Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B lockall - switch VAR_0x40A7 + switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 case 0, Route110_TrickHouseEntrance_EventScript_269D6E case 2, Route110_TrickHouseEntrance_EventScript_269E8F case 3, Route110_TrickHouseEntrance_EventScript_269E51 @@ -236,9 +236,9 @@ Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E playse SE_PIN - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_272598 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_27259A + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48 waitmovement 0 compare VAR_0x4044, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_269DEE @@ -257,7 +257,7 @@ Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E compare VAR_0x4044, 7 call_if_eq Route110_TrickHouseEntrance_EventScript_269E2D closemessage - setvar VAR_0x40A6, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 warpsilent MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 waitstate releaseall @@ -326,21 +326,21 @@ Route110_TrickHouseEntrance_EventScript_269E48:: @ 8269E48 Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51 msgbox Route110_TrickHouseEntrance_Text_26A921, MSGBOX_DEFAULT closemessage - applymovement 1, Route110_TrickHouseEntrance_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 1, Route110_TrickHouseEntrance_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, Route110_TrickHouseEntrance_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26A9AF, MSGBOX_DEFAULT - applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F - applymovement 1, Route110_TrickHouseEntrance_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26AA82, MSGBOX_DEFAULT compare VAR_0x4044, 1 @@ -364,7 +364,7 @@ Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -374,7 +374,7 @@ Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -384,7 +384,7 @@ Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -394,7 +394,7 @@ Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -404,7 +404,7 @@ Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -414,7 +414,7 @@ Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -424,28 +424,28 @@ Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Common_EventScript_BagIsFull msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023 - setvar VAR_0x40C1, 0 - setvar VAR_0x40A7, 3 - applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039 - applymovement 1, Route110_TrickHouseEntrance_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26AB2C, MSGBOX_DEFAULT call Route110_TrickHouseEntrance_EventScript_26A070 compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A09A compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_272071 + call_if_eq Common_EventScript_NoRoomLeftForAnother msgbox Route110_TrickHouseEntrance_Text_26ABBD, MSGBOX_DEFAULT releaseall end @@ -475,14 +475,14 @@ Route110_TrickHouseEntrance_EventScript_26A09A:: @ 826A09A applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F waitmovement 0 removeobject 1 - setvar VAR_0x40C1, 0 - setvar VAR_0x40A7, 5 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 releaseall end Route110_TrickHouseEntrance_EventScript_26A0D3:: @ 826A0D3 lockall - switch VAR_0x40A7 + switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 case 0, Route110_TrickHouseEntrance_EventScript_26A106 case 1, Route110_TrickHouseEntrance_EventScript_26A110 case 4, Route110_TrickHouseEntrance_EventScript_26A201 @@ -604,88 +604,88 @@ Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A end Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 - compare VAR_0x40AB, 0 + compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle1_Text_26B98D, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40AB, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 - compare VAR_0x40AC, 0 + compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle2_Text_26BCBA, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40AC, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB - compare VAR_0x40AD, 0 + compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle3_Text_26C609, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40AD, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 - compare VAR_0x40AE, 0 + compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle4_Text_26C8C3, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40AE, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D - compare VAR_0x40AF, 0 + compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle5_Text_26D660, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40AF, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 - compare VAR_0x40B0, 0 + compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle6_Text_26DE26, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40B0, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F - compare VAR_0x40B1, 0 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle7_EventScript_26E413, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40B1, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8 - compare VAR_0x40B2, 0 + compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle8_EventScript_26E864, MSGBOX_DEFAULT playse SE_PIN - setvar VAR_0x40B2, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall @@ -733,7 +733,7 @@ Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8 call_if_eq Route110_TrickHouseEntrance_EventScript_26A439 compare VAR_0x4044, 2 call_if_eq Route110_TrickHouseEntrance_EventScript_26A449 - setvar VAR_0x40A5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1 end Route110_TrickHouseEntrance_EventScript_26A429:: @ 826A429 diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index b34a9d555..73526d3ee 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 826B90F - map_script 1, Route110_TrickHousePuzzle1_MapScript1_26B915 + map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle1_MapScript1_26B915 .byte 0 Route110_TrickHousePuzzle1_MapScript1_26B915: @ 826B915 - compare VAR_0x40AB, 2 + compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2 goto_if_eq Route110_TrickHousePuzzle1_EventScript_26B921 end @@ -13,13 +13,13 @@ Route110_TrickHousePuzzle1_EventScript_26B921:: @ 826B921 Route110_TrickHousePuzzle1_EventScript_26B92B:: @ 826B92B lockall - compare VAR_0x40AB, 0 + compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0 goto_if_eq Route110_TrickHousePuzzle1_EventScript_26B93D goto Route110_TrickHousePuzzle1_EventScript_26A3DB end Route110_TrickHousePuzzle1_EventScript_26B93D:: @ 826B93D - setvar VAR_0x40AB, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 1 goto Route110_TrickHousePuzzle1_EventScript_26A3E5 end diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index 560d10060..2c8ef8cb0 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 826BB73 - map_script 5, Route110_TrickHousePuzzle2_MapScript1_26BB7E - map_script 3, Route110_TrickHousePuzzle2_MapScript1_26BBAB + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle2_MapScript1_26BB7E + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle2_MapScript1_26BBAB .byte 0 Route110_TrickHousePuzzle2_MapScript1_26BB7E: @ 826BB7E @@ -23,13 +23,13 @@ Route110_TrickHousePuzzle2_MapScript1_26BBAB: @ 826BBAB Route110_TrickHousePuzzle2_EventScript_26BBC0:: @ 826BBC0 lockall - compare VAR_0x40AC, 0 + compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0 goto_if_eq Route110_TrickHousePuzzle2_EventScript_26BBD2 goto Route110_TrickHousePuzzle2_EventScript_26A3DB end Route110_TrickHousePuzzle2_EventScript_26BBD2:: @ 826BBD2 - setvar VAR_0x40AC, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 1 goto Route110_TrickHousePuzzle2_EventScript_26A3E5 end diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index b26c5473d..d93ef95e8 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 826BED8 - map_script 5, Route110_TrickHousePuzzle3_MapScript1_26BEE3 - map_script 3, Route110_TrickHousePuzzle3_MapScript1_26BEFF + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle3_MapScript1_26BEE3 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle3_MapScript1_26BEFF .byte 0 Route110_TrickHousePuzzle3_MapScript1_26BEE3: @ 826BEE3 @@ -291,13 +291,13 @@ Route110_TrickHousePuzzle3_EventScript_26C5A0:: @ 826C5A0 Route110_TrickHousePuzzle3_EventScript_26C5A7:: @ 826C5A7 lockall - compare VAR_0x40AD, 0 + compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0 goto_if_eq Route110_TrickHousePuzzle3_EventScript_26C5B9 goto Route110_TrickHousePuzzle3_EventScript_26A3DB end Route110_TrickHousePuzzle3_EventScript_26C5B9:: @ 826C5B9 - setvar VAR_0x40AD, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 1 goto Route110_TrickHousePuzzle3_EventScript_26A3E5 end diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc index 71bb32db8..fcb10b3ab 100644 --- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc @@ -3,13 +3,13 @@ Route110_TrickHousePuzzle4_MapScripts:: @ 826C860 Route110_TrickHousePuzzle4_EventScript_26C861:: @ 826C861 lockall - compare VAR_0x40AE, 0 + compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0 goto_if_eq Route110_TrickHousePuzzle4_EventScript_26C873 goto Route110_TrickHousePuzzle4_EventScript_26A3DB end Route110_TrickHousePuzzle4_EventScript_26C873:: @ 826C873 - setvar VAR_0x40AE, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 1 goto Route110_TrickHousePuzzle4_EventScript_26A3E5 end diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 4c199a993..86b950e8a 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle5_MapScripts:: @ 826CAF0 - map_script 3, Route110_TrickHousePuzzle5_MapScript1_26CAF6 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle5_MapScript1_26CAF6 .byte 0 Route110_TrickHousePuzzle5_MapScript1_26CAF6: @ 826CAF6 @@ -13,19 +13,19 @@ Route110_TrickHousePuzzle5_MapScript1_26CAF6: @ 826CAF6 Route110_TrickHousePuzzle5_EventScript_26CB15:: @ 826CB15 lockall - compare VAR_0x40AF, 0 + compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26CB27 goto Route110_TrickHousePuzzle5_EventScript_26A3DB end Route110_TrickHousePuzzle5_EventScript_26CB27:: @ 826CB27 - setvar VAR_0x40AF, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 1 goto Route110_TrickHousePuzzle5_EventScript_26A3E5 end Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32 lockall - applymovement 1, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_1, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -35,7 +35,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32 Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53 lockall - applymovement 2, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_2, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -45,7 +45,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53 Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74 lockall - applymovement 3, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 3, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_3, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -55,7 +55,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74 Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95 lockall - applymovement 4, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 4, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_4, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -65,7 +65,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95 Route110_TrickHousePuzzle5_EventScript_26CBB6:: @ 826CBB6 lockall - applymovement 5, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_5, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -215,9 +215,9 @@ Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB setvar VAR_TEMP_1, 1 setvar VAR_TEMP_8, 1 playse SE_PIN - applymovement 1, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 @@ -239,9 +239,9 @@ Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A setvar VAR_TEMP_2, 1 setvar VAR_TEMP_8, 2 playse SE_PIN - applymovement 2, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_26D2CC @@ -265,9 +265,9 @@ Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4 setvar VAR_TEMP_3, 1 setvar VAR_TEMP_8, 3 playse SE_PIN - applymovement 3, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 3, Common_Movement_ExclamationMark waitmovement 0 - applymovement 3, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 3, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 @@ -289,9 +289,9 @@ Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73 setvar VAR_TEMP_4, 1 setvar VAR_TEMP_8, 4 playse SE_PIN - applymovement 4, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 4, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 @@ -313,9 +313,9 @@ Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2 setvar VAR_TEMP_5, 1 setvar VAR_TEMP_8, 5 playse SE_PIN - applymovement 5, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox Route110_TrickHousePuzzle5_Text_26DC78, MSGBOX_DEFAULT random 3 diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index 2cb784b50..a5b433d13 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHousePuzzle6_MapScripts:: @ 826DDA7 - map_script 3, Route110_TrickHousePuzzle6_MapScript1_26DDB2 - map_script 4, Route110_TrickHousePuzzle6_MapScript2_26DDB6 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle6_MapScript1_26DDB2 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHousePuzzle6_MapScript2_26DDB6 .byte 0 Route110_TrickHousePuzzle6_MapScript1_26DDB2: @ 826DDB2 @@ -17,13 +17,13 @@ Route110_TrickHousePuzzle6_EventScript_26DDC0:: @ 826DDC0 Route110_TrickHousePuzzle6_EventScript_26DDC4:: @ 826DDC4 lockall - compare VAR_0x40B0, 0 + compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0 goto_if_eq Route110_TrickHousePuzzle6_EventScript_26DDD6 goto Route110_TrickHousePuzzle6_EventScript_26A3DB end Route110_TrickHousePuzzle6_EventScript_26DDD6:: @ 826DDD6 - setvar VAR_0x40B0, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 1 goto Route110_TrickHousePuzzle6_EventScript_26A3E5 end diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 3babdbd45..b4bd782cf 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -1,8 +1,8 @@ Route110_TrickHousePuzzle7_MapScripts:: @ 826E091 - map_script 5, Route110_TrickHousePuzzle7_MapScript1_26E0A6 - map_script 3, Route110_TrickHousePuzzle7_MapScript1_26E198 - map_script 1, Route110_TrickHousePuzzle7_MapScript1_26E1B4 - map_script 2, Route110_TrickHousePuzzle7_MapScript2_26E1C0 + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle7_MapScript1_26E0A6 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle7_MapScript1_26E198 + map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle7_MapScript1_26E1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHousePuzzle7_MapScript2_26E1C0 .byte 0 Route110_TrickHousePuzzle7_MapScript1_26E0A6: @ 826E0A6 @@ -68,7 +68,7 @@ Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185 return Route110_TrickHousePuzzle7_MapScript1_26E198: @ 826E198 - compare VAR_0x40B6, 1 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1B3 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 @@ -81,33 +81,33 @@ Route110_TrickHousePuzzle7_EventScript_26E1B3:: @ 826E1B3 end Route110_TrickHousePuzzle7_MapScript1_26E1B4: @ 826E1B4 - compare VAR_0x40B6, 1 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 call_if_eq Route110_TrickHousePuzzle7_EventScript_26E0AC end Route110_TrickHousePuzzle7_MapScript2_26E1C0: @ 826E1C0 - map_script_2 VAR_0x40B6, 1, Route110_TrickHousePuzzle7_EventScript_26E1CA + map_script_2 VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1, Route110_TrickHousePuzzle7_EventScript_26E1CA .2byte 0 Route110_TrickHousePuzzle7_EventScript_26E1CA:: @ 826E1CA - setvar VAR_0x40B6, 0 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 0 end Route110_TrickHousePuzzle7_EventScript_26E1D0:: @ 826E1D0 lockall - compare VAR_0x40B1, 0 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0 goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1E2 goto Route110_TrickHousePuzzle7_EventScript_26A3DB end Route110_TrickHousePuzzle7_EventScript_26E1E2:: @ 826E1E2 - setvar VAR_0x40B1, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 1 goto Route110_TrickHousePuzzle7_EventScript_26A3E5 end Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED lockall - setvar VAR_0x40B6, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19 waitstate releaseall diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc index 7efb9f67b..dcb12e366 100644 --- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc @@ -3,13 +3,13 @@ Route110_TrickHousePuzzle8_MapScripts:: @ 826E801 Route110_TrickHousePuzzle8_EventScript_26E802:: @ 826E802 lockall - compare VAR_0x40B2, 0 + compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0 goto_if_eq Route110_TrickHousePuzzle8_EventScript_26E814 goto Route110_TrickHousePuzzle8_EventScript_26A3DB end Route110_TrickHousePuzzle8_EventScript_26E814:: @ 826E814 - setvar VAR_0x40B2, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 1 goto Route110_TrickHousePuzzle8_EventScript_26A3E5 end diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 74ee42c64..754369014 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -1,8 +1,8 @@ Route111_MapScripts:: @ 81F0CA7 - map_script 1, Route111_MapScript1_1F0CBC - map_script 3, Route111_MapScript1_1F0D87 - map_script 4, Route111_MapScript2_1F0E46 - map_script 2, Route111_MapScript2_1F0E56 + map_script MAP_SCRIPT_ON_LOAD, Route111_MapScript1_1F0CBC + map_script MAP_SCRIPT_ON_TRANSITION, Route111_MapScript1_1F0D87 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route111_MapScript2_1F0E46 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route111_MapScript2_1F0E56 .byte 0 Route111_MapScript1_1F0CBC: @ 81F0CBC @@ -164,7 +164,7 @@ Route111_EventScript_1F0EB9:: @ 81F0EB9 msgbox Route111_Text_2A6EBD, MSGBOX_DEFAULT giveitem_std ITEM_RAZZ_BERRY compare VAR_RESULT, 0 - goto_if_eq Route111_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_111_RECEIVED_BERRY special GetPlayerBigGuyGirlString msgbox Route111_Text_2A6F3D, MSGBOX_DEFAULT @@ -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, Route111_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp 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, Route111_Movement_2725A6 + applymovement 2, Common_Movement_WalkInPlaceUp 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, Route111_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceUp 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, Route111_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 call Route111_EventScript_1F113C applymovement 4, Route111_Movement_1F114A @@ -437,11 +437,11 @@ Route111_EventScript_1F11DA:: @ 81F11DA Route111_EventScript_1F11E4:: @ 81F11E4 lockall - applymovement 46, Route111_Movement_27259E + applymovement 46, Common_Movement_FacePlayer waitmovement 0 msgbox Route111_Text_1F1CCA, MSGBOX_DEFAULT closemessage - applymovement 46, Route111_Movement_2725A2 + applymovement 46, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc index 5a89f40ed..9427e8692 100644 --- a/data/maps/Route111_OldLadysRestStop/scripts.inc +++ b/data/maps/Route111_OldLadysRestStop/scripts.inc @@ -1,5 +1,5 @@ Route111_OldLadysRestStop_MapScripts:: @ 822A916 - map_script 3, Route111_OldLadysRestStop_MapScript1_22A91C + map_script MAP_SCRIPT_ON_TRANSITION, Route111_OldLadysRestStop_MapScript1_22A91C .byte 0 Route111_OldLadysRestStop_MapScript1_22A91C: @ 822A91C @@ -19,7 +19,7 @@ Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920 Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941 msgbox Route111_OldLadysRestStop_Text_22A9EC, MSGBOX_DEFAULT closemessage - call Route111_OldLadysRestStop_EventScript_272083 + call Common_EventScript_OutOfCenterPartyHeal msgbox Route111_OldLadysRestStop_Text_22AA16, MSGBOX_YESNO compare VAR_RESULT, 1 goto_if_eq Route111_OldLadysRestStop_EventScript_22A941 diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index b54fe564e..312bf739f 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -17,7 +17,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A4A2:: @ 822A4A2 msgbox Route111_WinstrateFamilysHouse_Text_22A5F4, MSGBOX_DEFAULT giveitem_std ITEM_MACHO_BRACE compare VAR_RESULT, 0 - goto_if_eq Route111_WinstrateFamilysHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MACHO_BRACE goto Route111_WinstrateFamilysHouse_EventScript_22A52C end @@ -52,7 +52,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A51E:: @ 822A51E Route111_WinstrateFamilysHouse_EventScript_22A52C:: @ 822A52C closemessage - applymovement VAR_0x8008, Route111_WinstrateFamilysHouse_Movement_2725A2 + applymovement VAR_0x8008, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 995102fe7..abc3ca4cd 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -1,45 +1,45 @@ Route112_MapScripts:: @ 81F1DA8 - map_script 3, Route112_MapScript1_1F1DAE + map_script MAP_SCRIPT_ON_TRANSITION, Route112_MapScript1_1F1DAE .byte 0 Route112_MapScript1_1F1DAE: @ 81F1DAE clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE - setvar VAR_0x40BD, 0 + setvar VAR_JAGGED_PASS_ASH_WEATHER, 0 end Route112_EventScript_1F1DB7:: @ 81F1DB7 lockall delay 40 - applymovement 1, Route112_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 msgbox Route112_Text_1F1F3F, MSGBOX_DEFAULT closemessage - applymovement 1, Route112_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 6, Route112_Movement_2725A4 + applymovement 6, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 20 msgbox Route112_Text_1F1F7A, MSGBOX_DEFAULT closemessage - applymovement 6, Route112_Movement_2725A2 + applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 1, Route112_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 msgbox Route112_Text_1F1FBA, MSGBOX_DEFAULT closemessage - applymovement 1, Route112_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 6, Route112_Movement_2725A4 + applymovement 6, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 20 msgbox Route112_Text_1F2003, MSGBOX_DEFAULT closemessage - applymovement 6, Route112_Movement_2725A2 + applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index a430a497e..f3cdae8f9 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -1,11 +1,11 @@ Route112_CableCarStation_MapScripts:: @ 822AABE - map_script 3, Route112_CableCarStation_MapScript1_22AAC9 - map_script 2, Route112_CableCarStation_MapScript2_22AAE9 + map_script MAP_SCRIPT_ON_TRANSITION, Route112_CableCarStation_MapScript1_22AAC9 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route112_CableCarStation_MapScript2_22AAE9 .byte 0 Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9 setescapewarp MAP_ROUTE112, 255, 28, 28 - compare VAR_0x40A3, 2 + compare VAR_CABLE_CAR_STATION_STATE, 2 call_if_eq Route112_CableCarStation_EventScript_22AADD end @@ -15,7 +15,7 @@ Route112_CableCarStation_EventScript_22AADD:: @ 822AADD return Route112_CableCarStation_MapScript2_22AAE9: @ 822AAE9 - map_script_2 VAR_0x40A3, 2, Route112_CableCarStation_EventScript_22AAF3 + map_script_2 VAR_CABLE_CAR_STATION_STATE, 2, Route112_CableCarStation_EventScript_22AAF3 .2byte 0 Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3 @@ -23,7 +23,7 @@ Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3 applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_22AB80 applymovement 1, Route112_CableCarStation_Movement_22AB76 waitmovement 0 - setvar VAR_0x40A3, 0 + setvar VAR_CABLE_CAR_STATION_STATE, 0 setobjectxyperm 1, 6, 7 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN releaseall @@ -46,7 +46,7 @@ Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_22AB7B waitmovement 0 setvar VAR_0x8004, 0 - setvar VAR_0x40A3, 1 + setvar VAR_CABLE_CAR_STATION_STATE, 1 incrementgamestat 48 special CableCarWarp special CableCar diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index ac27784da..6efd05d6e 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -1,6 +1,6 @@ Route113_MapScripts:: @ 81F2153 - map_script 5, Route113_MapScript1_1F215E - map_script 3, Route113_MapScript1_1F2161 + map_script MAP_SCRIPT_ON_RESUME, Route113_MapScript1_1F215E + map_script MAP_SCRIPT_ON_TRANSITION, Route113_MapScript1_1F2161 .byte 0 Route113_MapScript1_1F215E: @ 81F215E diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index 959c27799..46134a3d5 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -1,29 +1,29 @@ Route113_GlassWorkshop_MapScripts:: @ 826ED03 - map_script 3, Route113_GlassWorkshop_MapScript1_26ED09 + map_script MAP_SCRIPT_ON_TRANSITION, Route113_GlassWorkshop_MapScript1_26ED09 .byte 0 Route113_GlassWorkshop_MapScript1_26ED09: @ 826ED09 setflag FLAG_LANDMARK_GLASS_WORKSHOP - compare VAR_0x40BE, 1 + compare VAR_GLASS_WORKSHOP_STATE, 1 call_if_eq Route113_GlassWorkshop_EventScript_26ED18 end Route113_GlassWorkshop_EventScript_26ED18:: @ 826ED18 - setvar VAR_0x40BE, 2 + setvar VAR_GLASS_WORKSHOP_STATE, 2 return Route113_GlassWorkshop_EventScript_26ED1E:: @ 826ED1E lock faceplayer - compare VAR_0x40BE, 10 + compare VAR_GLASS_WORKSHOP_STATE, 10 goto_if_ge Route113_GlassWorkshop_EventScript_26F090 - compare VAR_0x40BE, 2 + compare VAR_GLASS_WORKSHOP_STATE, 2 goto_if_eq Route113_GlassWorkshop_EventScript_26ED6E - compare VAR_0x40BE, 1 + compare VAR_GLASS_WORKSHOP_STATE, 1 goto_if_eq Route113_GlassWorkshop_EventScript_26ED64 msgbox Route113_GlassWorkshop_Text_26F19D, MSGBOX_DEFAULT giveitem_std ITEM_SOOT_SACK - setvar VAR_0x40BE, 1 + setvar VAR_GLASS_WORKSHOP_STATE, 1 msgbox Route113_GlassWorkshop_Text_26F252, MSGBOX_DEFAULT release end @@ -76,7 +76,7 @@ Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 10 + setvar VAR_GLASS_WORKSHOP_STATE, 10 subvar VAR_ASH_GATHER_COUNT, 250 goto Route113_GlassWorkshop_EventScript_26F00F end @@ -90,7 +90,7 @@ Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 11 + setvar VAR_GLASS_WORKSHOP_STATE, 11 subvar VAR_ASH_GATHER_COUNT, 500 goto Route113_GlassWorkshop_EventScript_26F00F end @@ -104,7 +104,7 @@ Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96 msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 12 + setvar VAR_GLASS_WORKSHOP_STATE, 12 subvar VAR_ASH_GATHER_COUNT, 500 goto Route113_GlassWorkshop_EventScript_26F00F end @@ -118,7 +118,7 @@ Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2 msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 13 + setvar VAR_GLASS_WORKSHOP_STATE, 13 subvar VAR_ASH_GATHER_COUNT, 1000 goto Route113_GlassWorkshop_EventScript_26F00F end @@ -132,7 +132,7 @@ Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 14 + setvar VAR_GLASS_WORKSHOP_STATE, 14 subvar VAR_ASH_GATHER_COUNT, 1000 goto Route113_GlassWorkshop_EventScript_26F00F end @@ -147,7 +147,7 @@ Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 15 + setvar VAR_GLASS_WORKSHOP_STATE, 15 subvar VAR_ASH_GATHER_COUNT, 6000 goto Route113_GlassWorkshop_EventScript_26F00F end @@ -162,7 +162,7 @@ Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_26F003 - setvar VAR_0x40BE, 16 + setvar VAR_GLASS_WORKSHOP_STATE, 16 subvar VAR_ASH_GATHER_COUNT, 8000 goto Route113_GlassWorkshop_EventScript_26F00F end @@ -206,7 +206,7 @@ Route113_GlassWorkshop_EventScript_26F00F:: @ 826F00F call_if_eq Route113_GlassWorkshop_EventScript_26F047 compare VAR_0x8009, 1 call_if_eq Route113_GlassWorkshop_EventScript_26F05F - setvar VAR_0x40BE, 2 + setvar VAR_GLASS_WORKSHOP_STATE, 2 release end @@ -223,19 +223,19 @@ Route113_GlassWorkshop_EventScript_26F05F:: @ 826F05F return Route113_GlassWorkshop_EventScript_26F072:: @ 826F072 - call Route113_GlassWorkshop_EventScript_27205E + call Common_EventScript_BagIsFull msgbox Route113_GlassWorkshop_Text_26F6B7, MSGBOX_DEFAULT release end Route113_GlassWorkshop_EventScript_26F081:: @ 826F081 - call Route113_GlassWorkshop_EventScript_272071 + call Common_EventScript_NoRoomLeftForAnother msgbox Route113_GlassWorkshop_Text_26F715, MSGBOX_DEFAULT release end Route113_GlassWorkshop_EventScript_26F090:: @ 826F090 - switch VAR_0x40BE + switch VAR_GLASS_WORKSHOP_STATE case 10, Route113_GlassWorkshop_EventScript_26F0E3 case 11, Route113_GlassWorkshop_EventScript_26F0F7 case 12, Route113_GlassWorkshop_EventScript_26F10B @@ -300,7 +300,7 @@ Route113_GlassWorkshop_EventScript_26F16F:: @ 826F16F call_if_eq Route113_GlassWorkshop_EventScript_26F047 compare VAR_0x8009, 1 call_if_eq Route113_GlassWorkshop_EventScript_26F05F - setvar VAR_0x40BE, 2 + setvar VAR_GLASS_WORKSHOP_STATE, 2 release end diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index cccc8de5f..d4327a2f4 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -1,7 +1,7 @@ Route114_MapScripts:: @ 81F252F - map_script 3, Route114_MapScript1_1F253F - map_script 1, Route114_MapScript1_1F2561 - map_script 2, Route114_MapScript2_1F2578 + map_script MAP_SCRIPT_ON_TRANSITION, Route114_MapScript1_1F253F + map_script MAP_SCRIPT_ON_LOAD, Route114_MapScript1_1F2561 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route114_MapScript2_1F2578 .byte 0 Route114_MapScript1_1F253F: @ 81F253F @@ -35,7 +35,7 @@ Route114_EventScript_1F2582:: @ 81F2582 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route114_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_114_RECEIVED_BERRY msgbox Route114_Text_2A7034, MSGBOX_DEFAULT release @@ -53,7 +53,7 @@ Route114_EventScript_1F25D1:: @ 81F25D1 msgbox Route114_Text_1F2809, MSGBOX_DEFAULT giveitem_std ITEM_TM05 compare VAR_RESULT, 0 - goto_if_eq Route114_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM05 msgbox Route114_Text_1F2872, MSGBOX_DEFAULT release diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc index e229c756d..c6b63d8da 100644 --- a/data/maps/Route114_FossilManiacsHouse/scripts.inc +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsHouse_MapScripts:: @ 822AD30 - map_script 3, Route114_FossilManiacsHouse_MapScript1_22AD36 + map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsHouse_MapScript1_22AD36 .byte 0 Route114_FossilManiacsHouse_MapScript1_22AD36: @ 822AD36 @@ -13,7 +13,7 @@ Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A msgbox Route114_FossilManiacsHouse_Text_22AD85, MSGBOX_DEFAULT giveitem_std ITEM_TM28 compare VAR_RESULT, 0 - goto_if_eq Route114_FossilManiacsHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM28 release end diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 96d591d2d..1a84082ab 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -1,6 +1,6 @@ Route114_FossilManiacsTunnel_MapScripts:: @ 822AF28 - map_script 3, Route114_FossilManiacsTunnel_MapScript1_22AF33 - map_script 1, Route114_FossilManiacsTunnel_MapScript1_22AF49 + map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsTunnel_MapScript1_22AF33 + map_script MAP_SCRIPT_ON_LOAD, Route114_FossilManiacsTunnel_MapScript1_22AF49 .byte 0 Route114_FossilManiacsTunnel_MapScript1_22AF33: @ 822AF33 @@ -23,8 +23,8 @@ Route114_FossilManiacsTunnel_EventScript_22AF53:: @ 822AF53 Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 lockall - applymovement 1, Route114_FossilManiacsTunnel_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, Route114_FossilManiacsTunnel_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT setvar VAR_0x40CC, 2 diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc index b54365523..1cf7ffb47 100644 --- a/data/maps/Route114_LanettesHouse/scripts.inc +++ b/data/maps/Route114_LanettesHouse/scripts.inc @@ -1,5 +1,5 @@ Route114_LanettesHouse_MapScripts:: @ 822B2C8 - map_script 3, Route114_LanettesHouse_MapScript1_22B2CE + map_script MAP_SCRIPT_ON_TRANSITION, Route114_LanettesHouse_MapScript1_22B2CE .byte 0 Route114_LanettesHouse_MapScript1_22B2CE: @ 822B2CE diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 560c360af..9cb3ea2e0 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -1,7 +1,7 @@ Route115_MapScripts:: @ 81F2920 - map_script 1, Route115_MapScript1_1F2930 - map_script 3, Route115_MapScript1_1F2947 - map_script 2, Route115_MapScript2_1F2969 + map_script MAP_SCRIPT_ON_LOAD, Route115_MapScript1_1F2930 + map_script MAP_SCRIPT_ON_TRANSITION, Route115_MapScript1_1F2947 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route115_MapScript2_1F2969 .byte 0 Route115_MapScript1_1F2930: @ 81F2930 diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 79aa60e75..27eb381d0 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -433,7 +433,7 @@ "x": 47, "y": 9, "elevation": 3, - "var": "VAR_0x406F", + "var": "VAR_ROUTE116_STATE", "var_value": "1", "script": "Route116_EventScript_1F2D95" } diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 623c74e3c..90ae29f5b 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -1,7 +1,7 @@ Route116_MapScripts:: @ 81F2C0C - map_script 3, Route116_MapScript1_1F2C1C - map_script 1, Route116_MapScript1_1F2C4F - map_script 2, Route116_MapScript2_1F2C66 + map_script MAP_SCRIPT_ON_TRANSITION, Route116_MapScript1_1F2C1C + map_script MAP_SCRIPT_ON_LOAD, Route116_MapScript1_1F2C4F + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route116_MapScript2_1F2C66 .byte 0 Route116_MapScript1_1F2C1C: @ 81F2C1C @@ -145,17 +145,17 @@ Route116_EventScript_1F2D84:: @ 81F2D84 lock faceplayer msgbox Route116_Text_1F309D, MSGBOX_DEFAULT - setvar VAR_0x406F, 2 + setvar VAR_ROUTE116_STATE, 2 release end Route116_EventScript_1F2D95:: @ 81F2D95 lockall - applymovement 11, Route116_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, Route116_Movement_2725A4 + applymovement 11, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox Route116_Text_1F309D, MSGBOX_DEFAULT - setvar VAR_0x406F, 2 + setvar VAR_ROUTE116_STATE, 2 releaseall end diff --git a/data/maps/Route116_TunnelersRestHouse/scripts.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc index 89ccdce8d..bdd22aadd 100644 --- a/data/maps/Route116_TunnelersRestHouse/scripts.inc +++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc @@ -1,5 +1,5 @@ Route116_TunnelersRestHouse_MapScripts:: @ 822B850 - map_script 3, Route116_TunnelersRestHouse_MapScript1_22B856 + map_script MAP_SCRIPT_ON_TRANSITION, Route116_TunnelersRestHouse_MapScript1_22B856 .byte 0 Route116_TunnelersRestHouse_MapScript1_22B856: @ 822B856 diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 4a51c17d8..08571690f 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -1,5 +1,5 @@ Route117_MapScripts:: @ 81F397D - map_script 3, Route117_MapScript1_1F3983 + map_script MAP_SCRIPT_ON_TRANSITION, Route117_MapScript1_1F3983 .byte 0 Route117_MapScript1_1F3983: @ 81F3983 diff --git a/data/maps/Route117_PokemonDayCare/scripts.inc b/data/maps/Route117_PokemonDayCare/scripts.inc index b2e9ddfaa..ea9894ffc 100644 --- a/data/maps/Route117_PokemonDayCare/scripts.inc +++ b/data/maps/Route117_PokemonDayCare/scripts.inc @@ -1,5 +1,5 @@ Route117_PokemonDayCare_MapScripts:: @ 822BBB1 - map_script 3, Route117_PokemonDayCare_MapScript1_22BBB7 + map_script MAP_SCRIPT_ON_TRANSITION, Route117_PokemonDayCare_MapScript1_22BBB7 .byte 0 Route117_PokemonDayCare_MapScript1_22BBB7: @ 822BBB7 diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json index 66b7a1789..7fc1e45c7 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -326,7 +326,7 @@ "x": 43, "y": 11, "elevation": 3, - "var": "VAR_0x4071", + "var": "VAR_ROUTE118_STATE", "var_value": "0", "script": "Route118_EventScript_1F3E8E" }, @@ -335,7 +335,7 @@ "x": 44, "y": 11, "elevation": 3, - "var": "VAR_0x4071", + "var": "VAR_ROUTE118_STATE", "var_value": "0", "script": "Route118_EventScript_1F3EAE" }, @@ -344,7 +344,7 @@ "x": 45, "y": 11, "elevation": 3, - "var": "VAR_0x4071", + "var": "VAR_ROUTE118_STATE", "var_value": "0", "script": "Route118_EventScript_1F3EC4" } diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 45b8665b0..758804137 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -1,7 +1,7 @@ Route118_MapScripts:: @ 81F3DBC - map_script 3, Route118_MapScript1_1F3DCC - map_script 1, Route118_MapScript1_1F3DF3 - map_script 2, Route118_MapScript2_1F3E0A + map_script MAP_SCRIPT_ON_TRANSITION, Route118_MapScript1_1F3DCC + map_script MAP_SCRIPT_ON_LOAD, Route118_MapScript1_1F3DF3 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route118_MapScript2_1F3E0A .byte 0 Route118_MapScript1_1F3DCC: @ 81F3DCC @@ -69,7 +69,7 @@ Route118_EventScript_1F3E85:: @ 81F3E85 Route118_EventScript_1F3E8E:: @ 81F3E8E lockall setvar VAR_0x8008, 0 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 19, Route118_Movement_1F3F61 waitmovement 0 @@ -79,7 +79,7 @@ Route118_EventScript_1F3E8E:: @ 81F3E8E Route118_EventScript_1F3EAE:: @ 81F3EAE lockall setvar VAR_0x8008, 1 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 goto Route118_EventScript_1F3EE4 end @@ -87,7 +87,7 @@ Route118_EventScript_1F3EAE:: @ 81F3EAE Route118_EventScript_1F3EC4:: @ 81F3EC4 lockall setvar VAR_0x8008, 2 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 19, Route118_Movement_1F3F63 waitmovement 0 @@ -107,7 +107,7 @@ Route118_EventScript_1F3EE4:: @ 81F3EE4 call_if_eq Route118_EventScript_1F3F3A compare VAR_0x8008, 2 call_if_eq Route118_EventScript_1F3F4C - setvar VAR_0x4071, 1 + setvar VAR_ROUTE118_STATE, 1 removeobject 19 releaseall end diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index bdb3e923d..2146d5ec7 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -607,7 +607,7 @@ "x": 25, "y": 31, "elevation": 0, - "var": "VAR_0x4072", + "var": "VAR_ROUTE119_STATE", "var_value": "0", "script": "Route119_EventScript_1F4472" }, @@ -616,7 +616,7 @@ "x": 26, "y": 31, "elevation": 0, - "var": "VAR_0x4072", + "var": "VAR_ROUTE119_STATE", "var_value": "0", "script": "Route119_EventScript_1F447D" }, diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index dee76d71d..83ff4707f 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -1,6 +1,6 @@ Route119_MapScripts:: @ 81F4424 - map_script 5, Route119_MapScript1_1F442F - map_script 3, Route119_MapScript1_1F444D + map_script MAP_SCRIPT_ON_RESUME, Route119_MapScript1_1F442F + map_script MAP_SCRIPT_ON_TRANSITION, Route119_MapScript1_1F444D .byte 0 Route119_MapScript1_1F442F: @ 81F442F @@ -10,13 +10,13 @@ Route119_MapScript1_1F442F: @ 81F442F Route119_EventScript_1F4439:: @ 81F4439 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne Route119_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return Route119_MapScript1_1F444D: @ 81F444D - call Route119_EventScript_271ED7 - call Route119_EventScript_271EFB + call Common_EventScript_SetupRivalGender + call Common_EventScript_SetupRivalOnBikeGender compare VAR_WEATHER_INSTITUTE_STATE, 1 call_if_eq Route119_EventScript_1F4466 special SetRoute119Weather @@ -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, Route119_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 compare VAR_TEMP_1, 1 @@ -156,7 +156,7 @@ Route119_EventScript_1F460F:: @ 81F460F compare VAR_TEMP_1, 2 call_if_eq Route119_EventScript_1F46EE removeobject 25 - setvar VAR_0x4072, 1 + setvar VAR_ROUTE119_STATE, 1 savebgm MUS_DUMMY fadedefaultbgm delay 60 @@ -459,7 +459,7 @@ Route119_EventScript_1F49A3:: @ 81F49A3 faceplayer msgbox Route119_Text_1F50EB, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route119_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -469,7 +469,7 @@ Route119_EventScript_1F49BA:: @ 81F49BA faceplayer msgbox Route119_Text_1F5147, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route119_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index ae0fea259..09ed3c4f5 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -1,5 +1,5 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 826FA86 - map_script 3, Route119_WeatherInstitute_1F_MapScript1_26FA8C + map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_1F_MapScript1_26FA8C .byte 0 Route119_WeatherInstitute_1F_MapScript1_26FA8C: @ 826FA8C @@ -57,7 +57,7 @@ Route119_WeatherInstitute_1F_EventScript_26FB18:: @ 826FB18 lockall msgbox Route119_WeatherInstitute_1F_Text_26FEFC, MSGBOX_DEFAULT closemessage - call Route119_WeatherInstitute_1F_EventScript_272083 + call Common_EventScript_OutOfCenterPartyHeal releaseall end diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index bbee65df8..7d557fdef 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -1,5 +1,5 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E - map_script 3, Route119_WeatherInstitute_2F_MapScript1_26FF24 + map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_2F_MapScript1_26FF24 .byte 0 Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24 @@ -55,9 +55,9 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 msgbox Route119_WeatherInstitute_2F_Text_270568, MSGBOX_DEFAULT closemessage playse SE_PIN - applymovement 3, Route119_WeatherInstitute_2F_Movement_272598 + applymovement 3, Common_Movement_ExclamationMark waitmovement 0 - applymovement 3, Route119_WeatherInstitute_2F_Movement_27259A + applymovement 3, Common_Movement_Delay48 waitmovement 0 msgbox Route119_WeatherInstitute_2F_Text_2705DD, MSGBOX_DEFAULT closemessage @@ -98,7 +98,7 @@ Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085 compare VAR_RESULT, 0 goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700EA call Route119_WeatherInstitute_2F_EventScript_27378B - call Route119_WeatherInstitute_2F_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto Route119_WeatherInstitute_2F_EventScript_2700EA end diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index a66026283..40c9ee09a 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -1,7 +1,7 @@ Route120_MapScripts:: @ 81F53EC - map_script 5, Route120_MapScript1_1F53FC - map_script 3, Route120_MapScript1_1F54CD - map_script 1, Route120_MapScript1_1F5474 + map_script MAP_SCRIPT_ON_RESUME, Route120_MapScript1_1F53FC + map_script MAP_SCRIPT_ON_TRANSITION, Route120_MapScript1_1F54CD + map_script MAP_SCRIPT_ON_LOAD, Route120_MapScript1_1F5474 .byte 0 Route120_MapScript1_1F53FC: @ 81F53FC @@ -26,7 +26,7 @@ Route120_EventScript_1F5406:: @ 81F5406 Route120_EventScript_1F5449:: @ 81F5449 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne Route120_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 30 removeobject 36 return @@ -34,7 +34,7 @@ Route120_EventScript_1F5449:: @ 81F5449 Route120_EventScript_1F5460:: @ 81F5460 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne Route120_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return @@ -147,7 +147,7 @@ Route120_EventScript_1F55F6:: @ 81F55F6 Route120_EventScript_1F5601:: @ 81F5601 giveitem_std VAR_0x8004 compare VAR_RESULT, 0 - goto_if_eq Route120_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_120_RECEIVED_BERRY msgbox Route120_Text_2A71D5, MSGBOX_DEFAULT release @@ -196,12 +196,12 @@ Route120_EventScript_1F568B:: @ 81F568B call_if_eq Route120_EventScript_1F57A3 compare VAR_FACING, 3 call_if_eq Route120_EventScript_1F57AE - applymovement 31, Route120_Movement_2725A4 + applymovement 31, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 20 msgbox Route120_Text_1F5B43, MSGBOX_DEFAULT closemessage - applymovement 30, Route120_Movement_2725A8 + applymovement 30, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 30, Route120_Movement_2723C7 waitmovement 0 @@ -233,15 +233,15 @@ Route120_EventScript_1F571C:: @ 81F571C end Route120_EventScript_1F572C:: @ 81F572C - applymovement 31, Route120_Movement_2725AA - applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_2725A6 + applymovement 31, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route120_Text_1F5BAF, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_SCOPE setflag FLAG_RECEIVED_DEVON_SCOPE msgbox Route120_Text_1F5C7B, MSGBOX_DEFAULT closemessage - applymovement 31, Route120_Movement_2725AA + applymovement 31, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 @@ -258,7 +258,7 @@ Route120_EventScript_1F572C:: @ 81F572C end Route120_EventScript_1F57A3:: @ 81F57A3 - applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index ad20a8119..4339b149d 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -423,7 +423,7 @@ "x": 25, "y": 5, "elevation": 3, - "var": "VAR_0x4074", + "var": "VAR_ROUTE121_STATE", "var_value": "0", "script": "Route121_EventScript_1F5E18" }, @@ -432,7 +432,7 @@ "x": 25, "y": 6, "elevation": 3, - "var": "VAR_0x4074", + "var": "VAR_ROUTE121_STATE", "var_value": "0", "script": "Route121_EventScript_1F5E18" }, @@ -441,7 +441,7 @@ "x": 25, "y": 7, "elevation": 3, - "var": "VAR_0x4074", + "var": "VAR_ROUTE121_STATE", "var_value": "0", "script": "Route121_EventScript_1F5E18" }, @@ -450,7 +450,7 @@ "x": 25, "y": 8, "elevation": 3, - "var": "VAR_0x4074", + "var": "VAR_ROUTE121_STATE", "var_value": "0", "script": "Route121_EventScript_1F5E18" } diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index ee361d30c..edca585c9 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -28,7 +28,7 @@ Route121_EventScript_1F5E18:: @ 81F5E18 removeobject 12 removeobject 13 removeobject 14 - setvar VAR_0x4074, 1 + setvar VAR_ROUTE121_STATE, 1 releaseall end diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index d4ef73f9b..69f5ea80d 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -1,16 +1,16 @@ Route121_SafariZoneEntrance_MapScripts:: @ 822BBBB - map_script 2, Route121_SafariZoneEntrance_MapScript2_22BBC1 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route121_SafariZoneEntrance_MapScript2_22BBC1 .byte 0 Route121_SafariZoneEntrance_MapScript2_22BBC1: @ 822BBC1 - map_script_2 VAR_0x40A4, 1, Route121_SafariZoneEntrance_EventScript_22BBCB + map_script_2 VAR_SAFARI_ZONE_STATE, 1, Route121_SafariZoneEntrance_EventScript_22BBCB .2byte 0 Route121_SafariZoneEntrance_EventScript_22BBCB:: @ 822BBCB lockall applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BBDD waitmovement 0 - setvar VAR_0x40A4, 0 + setvar VAR_SAFARI_ZONE_STATE, 0 releaseall end @@ -46,7 +46,7 @@ Route121_SafariZoneEntrance_EventScript_22BC0E:: @ 822BC0E Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 lockall - applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 showmoneybox 0, 0, 0 msgbox Route121_SafariZoneEntrance_Text_2A4F74, MSGBOX_YESNO @@ -81,7 +81,7 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BD18 waitmovement 0 special EnterSafariMode - setvar VAR_0x40A4, 2 + setvar VAR_SAFARI_ZONE_STATE, 2 clearflag FLAG_GOOD_LUCK_SAFARI_ZONE warp MAP_SAFARI_ZONE_SOUTH, 255, 32, 33 waitstate diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index 86a6e767e..8e1692114 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -1,5 +1,5 @@ Route123_MapScripts:: @ 81F6147 - map_script 3, Route123_MapScript1_1F614D + map_script MAP_SCRIPT_ON_TRANSITION, Route123_MapScript1_1F614D .byte 0 Route123_MapScript1_1F614D: @ 81F614D @@ -17,7 +17,7 @@ Route123_EventScript_1F6151:: @ 81F6151 msgbox Route123_Text_1F645D, MSGBOX_DEFAULT giveitem_std ITEM_TM19 compare VAR_RESULT, 0 - goto_if_eq Route123_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM19 msgbox Route123_Text_1F64CF, MSGBOX_DEFAULT release diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index a7175e698..6d4afa30a 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -1,5 +1,5 @@ Route123_BerryMastersHouse_MapScripts:: @ 826F83B - map_script 3, Route123_BerryMastersHouse_MapScript1_26F841 + map_script MAP_SCRIPT_ON_TRANSITION, Route123_BerryMastersHouse_MapScript1_26F841 .byte 0 Route123_BerryMastersHouse_MapScript1_26F841: @ 826F841 @@ -17,7 +17,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY msgbox Route123_BerryMastersHouse_Text_2A7428, MSGBOX_DEFAULT random 10 @@ -25,7 +25,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox Route123_BerryMastersHouse_Text_2A7445, MSGBOX_DEFAULT release end @@ -78,7 +78,7 @@ Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull goto Route123_BerryMastersHouse_EventScript_26FA79 release end @@ -88,7 +88,7 @@ Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_SPELON_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SPELON_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end @@ -98,7 +98,7 @@ Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_PAMTRE_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_PAMTRE_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end @@ -108,7 +108,7 @@ Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_WATMEL_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_WATMEL_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end @@ -118,7 +118,7 @@ Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_DURIN_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_DURIN_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end @@ -128,7 +128,7 @@ Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_BELUE_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_BELUE_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 97aa6f4be..34e315792 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -1,9 +1,9 @@ Route124_MapScripts:: @ 81F656C - map_script 3, Route124_MapScript1_1F6572 + map_script MAP_SCRIPT_ON_TRANSITION, Route124_MapScript1_1F6572 .byte 0 Route124_MapScript1_1F6572: @ 81F6572 - call_if_set FLAG_SYS_WEATHER_CTRL, Route124_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end Route124_EventScript_1F657C:: @ 81F657C diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc index 934c6757d..250a5ba51 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc @@ -1,5 +1,5 @@ Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8270A28 - map_script 3, Route124_DivingTreasureHuntersHouse_MapScript1_270A2E + map_script MAP_SCRIPT_ON_TRANSITION, Route124_DivingTreasureHuntersHouse_MapScript1_270A2E .byte 0 Route124_DivingTreasureHuntersHouse_MapScript1_270A2E: @ 8270A2E diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index e5ad32697..4812b9691 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -1,11 +1,11 @@ Route125_MapScripts:: @ 81F6748 - map_script 3, Route125_MapScript1_1F6758 - map_script 1, Route125_MapScript1_1F6783 - map_script 2, Route125_MapScript2_1F679A + map_script MAP_SCRIPT_ON_TRANSITION, Route125_MapScript1_1F6758 + map_script MAP_SCRIPT_ON_LOAD, Route125_MapScript1_1F6783 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route125_MapScript2_1F679A .byte 0 Route125_MapScript1_1F6758: @ 81F6758 - call_if_set FLAG_SYS_WEATHER_CTRL, Route125_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 compare VAR_0x4039, 1 call_if_eq Route125_EventScript_273D13 compare VAR_0x4037, 11 diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 4fa47e0bb..71bc77b28 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -1,9 +1,9 @@ Route126_MapScripts:: @ 81F68C6 - map_script 3, Route126_MapScript1_1F68CC + map_script MAP_SCRIPT_ON_TRANSITION, Route126_MapScript1_1F68CC .byte 0 Route126_MapScript1_1F68CC: @ 81F68CC - call_if_set FLAG_SYS_WEATHER_CTRL, Route126_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end Route126_EventScript_1F68D6:: @ 81F68D6 diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 28f20bfb3..7d5eee844 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -1,11 +1,11 @@ Route127_MapScripts:: @ 81F69D9 - map_script 3, Route127_MapScript1_1F69E9 - map_script 1, Route127_MapScript1_1F6A14 - map_script 2, Route127_MapScript2_1F6A2B + map_script MAP_SCRIPT_ON_TRANSITION, Route127_MapScript1_1F69E9 + map_script MAP_SCRIPT_ON_LOAD, Route127_MapScript1_1F6A14 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route127_MapScript2_1F6A2B .byte 0 Route127_MapScript1_1F69E9: @ 81F69E9 - call_if_set FLAG_SYS_WEATHER_CTRL, Route127_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 compare VAR_0x4039, 1 call_if_eq Route127_EventScript_273D13 compare VAR_0x4037, 13 diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index bb4f8d150..647d62b6a 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -1,14 +1,14 @@ Route128_MapScripts:: @ 81F6B38 - map_script 3, Route128_MapScript1_1F6B43 - map_script 2, Route128_MapScript2_1F6B4D + map_script MAP_SCRIPT_ON_TRANSITION, Route128_MapScript1_1F6B43 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route128_MapScript2_1F6B4D .byte 0 Route128_MapScript1_1F6B43: @ 81F6B43 - call_if_set FLAG_SYS_WEATHER_CTRL, Route128_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end Route128_MapScript2_1F6B4D: @ 81F6B4D - map_script_2 VAR_0x407B, 1, Route128_EventScript_1F6B57 + map_script_2 VAR_ROUTE128_STATE, 1, Route128_EventScript_1F6B57 .2byte 0 Route128_EventScript_1F6B57:: @ 81F6B57 @@ -24,18 +24,18 @@ Route128_EventScript_1F6B57:: @ 81F6B57 closemessage applymovement 5, Route128_Movement_1F6CAD waitmovement 0 - applymovement 4, Route128_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route128_Text_1F6E5A, MSGBOX_DEFAULT closemessage applymovement 5, Route128_Movement_1F6CBB waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route128_Text_1F6F1E, MSGBOX_DEFAULT closemessage applymovement 4, Route128_Movement_1F6C96 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft 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, Route128_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox Route128_Text_1F70C9, MSGBOX_DEFAULT closemessage applymovement 3, Route128_Movement_1F6C85 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route128_Text_1F70EA, MSGBOX_DEFAULT - applymovement 3, Route128_Movement_2725AA + applymovement 3, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox Route128_Text_1F721B, MSGBOX_DEFAULT closemessage - applymovement 3, Route128_Movement_2725AA + applymovement 3, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 @@ -74,7 +74,7 @@ Route128_EventScript_1F6B57:: @ 81F6B57 removeobject 3 waitfieldeffect 30 clearflag FLAG_SPECIAL_FLAG_0x4000 - setvar VAR_0x407B, 2 + setvar VAR_ROUTE128_STATE, 2 releaseall end diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index 177dc626a..8aec4bc28 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -1,7 +1,7 @@ Route129_MapScripts:: @ 81F7284 - map_script 3, Route129_MapScript1_1F72AB - map_script 1, Route129_MapScript1_1F7294 - map_script 2, Route129_MapScript2_1F72E2 + map_script MAP_SCRIPT_ON_TRANSITION, Route129_MapScript1_1F72AB + map_script MAP_SCRIPT_ON_LOAD, Route129_MapScript1_1F7294 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route129_MapScript2_1F72E2 .byte 0 Route129_MapScript1_1F7294: @ 81F7294 @@ -23,7 +23,7 @@ Route129_MapScript1_1F72AB: @ 81F72AB end Route129_EventScript_1F72D8:: @ 81F72D8 - call_if_set FLAG_SYS_WEATHER_CTRL, Route129_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 return Route129_MapScript2_1F72E2: @ 81F72E2 diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 8ca9dcbb0..18dce324d 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -1,5 +1,5 @@ Route130_MapScripts:: @ 81F735F - map_script 3, Route130_MapScript1_1F7365 + map_script MAP_SCRIPT_ON_TRANSITION, Route130_MapScript1_1F7365 .byte 0 Route130_MapScript1_1F7365: @ 81F7365 @@ -31,7 +31,7 @@ Route130_EventScript_1F73B1:: @ 81F73B1 end Route130_EventScript_1F73B5:: @ 81F73B5 - call_if_set FLAG_SYS_WEATHER_CTRL, Route130_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 return Route130_EventScript_1F73BF:: @ 81F73BF diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index e709a14ef..7f50b2273 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -1,5 +1,5 @@ Route131_MapScripts:: @ 81F7404 - map_script 3, Route131_MapScript1_1F740A + map_script MAP_SCRIPT_ON_TRANSITION, Route131_MapScript1_1F740A .byte 0 Route131_MapScript1_1F740A: @ 81F740A @@ -13,7 +13,7 @@ Route131_EventScript_1F741B:: @ 81F741B return Route131_EventScript_1F741F:: @ 81F741F - call_if_set FLAG_SYS_WEATHER_CTRL, Route131_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 return Route131_EventScript_1F7429:: @ 81F7429 diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc index f6f4feee3..a941e19b5 100644 --- a/data/maps/Route134/scripts.inc +++ b/data/maps/Route134/scripts.inc @@ -1,5 +1,5 @@ Route134_MapScripts:: @ 81F7644 - map_script 5, Route134_MapScript1_1F764A + map_script MAP_SCRIPT_ON_RESUME, Route134_MapScript1_1F764A .byte 0 Route134_MapScript1_1F764A: @ 81F764A diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index d43f7c33b..04c68baa3 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -331,7 +331,7 @@ "x": 23, "y": 20, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "1", "script": "RustboroCity_EventScript_1E095A" }, @@ -340,7 +340,7 @@ "x": 23, "y": 21, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "1", "script": "RustboroCity_EventScript_1E0971" }, @@ -349,7 +349,7 @@ "x": 23, "y": 22, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "1", "script": "RustboroCity_EventScript_1E0988" }, @@ -358,7 +358,7 @@ "x": 23, "y": 23, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "1", "script": "RustboroCity_EventScript_1E099F" }, @@ -367,7 +367,7 @@ "x": 23, "y": 24, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "1", "script": "RustboroCity_EventScript_1E09B6" }, @@ -376,7 +376,7 @@ "x": 30, "y": 9, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "2", "script": "RustboroCity_EventScript_1E0AFE" }, @@ -385,7 +385,7 @@ "x": 29, "y": 10, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "2", "script": "RustboroCity_EventScript_1E0B0A" }, @@ -394,7 +394,7 @@ "x": 30, "y": 11, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "2", "script": "RustboroCity_EventScript_1E0B16" }, @@ -403,7 +403,7 @@ "x": 30, "y": 12, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "2", "script": "RustboroCity_EventScript_1E0B22" }, @@ -412,7 +412,7 @@ "x": 30, "y": 9, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "4", "script": "RustboroCity_EventScript_1E0C2B" }, @@ -421,7 +421,7 @@ "x": 31, "y": 10, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "4", "script": "RustboroCity_EventScript_1E0C37" }, @@ -430,7 +430,7 @@ "x": 30, "y": 11, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "4", "script": "RustboroCity_EventScript_1E0C43" }, @@ -439,7 +439,7 @@ "x": 30, "y": 12, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "4", "script": "RustboroCity_EventScript_1E0C4F" }, @@ -448,7 +448,7 @@ "x": 12, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0DF3" }, @@ -457,7 +457,7 @@ "x": 13, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0E33" }, @@ -466,7 +466,7 @@ "x": 14, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0E73" }, @@ -475,7 +475,7 @@ "x": 15, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0EB3" }, @@ -484,7 +484,7 @@ "x": 16, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0EF3" }, @@ -493,7 +493,7 @@ "x": 17, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0F33" }, @@ -502,7 +502,7 @@ "x": 18, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0F73" }, @@ -511,7 +511,7 @@ "x": 19, "y": 53, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_RUSTBORO_STATE", "var_value": "7", "script": "RustboroCity_EventScript_1E0FB3" } @@ -539,7 +539,7 @@ "y": 45, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -547,7 +547,7 @@ "y": 38, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -563,7 +563,7 @@ "y": 45, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -571,7 +571,7 @@ "y": 38, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 8ffbf8373..f93711344 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -1,15 +1,15 @@ RustboroCity_MapScripts:: @ 81E06BD - map_script 3, RustboroCity_MapScript1_1E06C8 - map_script 2, RustboroCity_MapScript2_1E070B + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_MapScript1_1E06C8 + map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_MapScript2_1E070B .byte 0 RustboroCity_MapScript1_1E06C8: @ 81E06C8 setflag FLAG_VISITED_RUSTBORO_CITY - call RustboroCity_EventScript_271ED7 - compare VAR_0x405A, 6 + call Common_EventScript_SetupRivalGender + compare VAR_RUSTBORO_STATE, 6 call_if_eq RustboroCity_EventScript_1E0707 getplayerxy VAR_TEMP_0, VAR_TEMP_1 - compare VAR_0x405A, 6 + compare VAR_RUSTBORO_STATE, 6 goto_if_eq RustboroCity_EventScript_1E06EC end @@ -28,7 +28,7 @@ RustboroCity_EventScript_1E0707:: @ 81E0707 return RustboroCity_MapScript2_1E070B: @ 81E070B - map_script_2 VAR_0x405A, 6, RustboroCity_EventScript_1E0715 + map_script_2 VAR_RUSTBORO_STATE, 6, RustboroCity_EventScript_1E0715 .2byte 0 RustboroCity_EventScript_1E0715:: @ 81E0715 @@ -42,18 +42,18 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 applymovement 15, RustboroCity_Movement_1E0852 waitmovement 0 playse SE_PIN - applymovement 15, RustboroCity_Movement_272598 + applymovement 15, Common_Movement_ExclamationMark waitmovement 0 - applymovement 15, RustboroCity_Movement_27259A + applymovement 15, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 applymovement 15, RustboroCity_Movement_1E084E waitmovement 0 msgbox RustboroCity_Text_1E22A5, MSGBOX_DEFAULT closemessage setflag FLAG_HAS_MATCH_CALL - applymovement 15, RustboroCity_Movement_2725A4 + applymovement 15, Common_Movement_WalkInPlaceLeft 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, RustboroCity_Movement_2725AA + applymovement 15, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox RustboroCity_Text_1E2331, MSGBOX_DEFAULT closemessage @@ -99,7 +99,7 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD playse SE_KAIDAN removeobject 15 setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST - setvar VAR_0x405A, 7 + setvar VAR_RUSTBORO_STATE, 7 clearflag FLAG_SPECIAL_FLAG_0x4000 releaseall end @@ -221,7 +221,7 @@ RustboroCity_EventScript_1E0922:: @ 81E0922 lock faceplayer msgbox RustboroCity_Text_1E16F4, MSGBOX_DEFAULT - applymovement 7, RustboroCity_Movement_2725A2 + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -230,7 +230,7 @@ RustboroCity_EventScript_1E0938:: @ 81E0938 lock faceplayer msgbox RustboroCity_Text_1E174B, MSGBOX_DEFAULT - applymovement 8, RustboroCity_Movement_2725A2 + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -302,9 +302,9 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD setobjectxyperm 9, 30, 10 clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 setflag FLAG_DEVON_GOODS_STOLEN - setvar VAR_0x405A, 2 + setvar VAR_RUSTBORO_STATE, 2 setvar VAR_RUSTURF_TUNNEL_STATE, 2 - setvar VAR_0x406F, 1 + setvar VAR_ROUTE116_STATE, 1 clearflag FLAG_HIDE_ROUTE_116_MR_BRINEY clearflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO clearflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT @@ -344,7 +344,7 @@ RustboroCity_EventScript_1E0A6E:: @ 81E0A6E RustboroCity_EventScript_1E0A79:: @ 81E0A79 applymovement 9, RustboroCity_Movement_1E0AD5 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return @@ -493,59 +493,59 @@ RustboroCity_EventScript_1E0B2E:: @ 81E0B2E compare VAR_TEMP_1, 3 call_if_eq RustboroCity_EventScript_1E0BF3 setflag FLAG_INTERACTED_WITH_DEVON_EMPLOYEE_GOODS_STOLEN - setvar VAR_0x405A, 3 + setvar VAR_RUSTBORO_STATE, 3 moveobjectoffscreen 9 msgbox RustboroCity_Text_1E183E, MSGBOX_DEFAULT releaseall end RustboroCity_EventScript_1E0B6F:: @ 81E0B6F - applymovement 9, RustboroCity_Movement_2725A6 + applymovement 9, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return RustboroCity_EventScript_1E0B9B:: @ 81E0B9B - applymovement 9, RustboroCity_Movement_2725A4 + applymovement 9, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AC waitmovement 0 return RustboroCity_EventScript_1E0BC7:: @ 81E0BC7 - applymovement 9, RustboroCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return RustboroCity_EventScript_1E0BF3:: @ 81E0BF3 - applymovement 9, RustboroCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement 9, RustboroCity_Movement_1E0C29 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return @@ -596,7 +596,7 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B closemessage setflag FLAG_RETURNED_DEVON_GOODS setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 - setvar VAR_0x405A, 5 + setvar VAR_RUSTBORO_STATE, 5 delay 30 warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 waitstate @@ -608,69 +608,69 @@ RustboroCity_EventScript_1E0CD3:: @ 81E0CD3 return RustboroCity_EventScript_1E0CDC:: @ 81E0CDC - applymovement 9, RustboroCity_Movement_2725A6 + applymovement 9, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return RustboroCity_EventScript_1E0D08:: @ 81E0D08 - applymovement 9, RustboroCity_Movement_2725A8 + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AE waitmovement 0 return RustboroCity_EventScript_1E0D34:: @ 81E0D34 - applymovement 9, RustboroCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return RustboroCity_EventScript_1E0D60:: @ 81E0D60 - applymovement 9, RustboroCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement 9, RustboroCity_Movement_1E0C29 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return RustboroCity_EventScript_1E0D96:: @ 81E0D96 - applymovement 9, RustboroCity_Movement_2725A4 + applymovement 9, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 return RustboroCity_EventScript_1E0DB8:: @ 81E0DB8 lockall call_if_unset FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_27259E + applymovement 14, Common_Movement_FacePlayer waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -694,128 +694,128 @@ RustboroCity_EventScript_1E0DEE:: @ 81E0DEE RustboroCity_EventScript_1E0DF3:: @ 81E0DF3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E120E waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0E33:: @ 81E0E33 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1215 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0E73:: @ 81E0E73 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E121B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0EB3:: @ 81E0EB3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1220 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0EF3:: @ 81E0EF3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1224 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0F33:: @ 81E0F33 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1227 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0F73:: @ 81E0F73 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E122B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0FB3:: @ 81E0FB3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1230 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -840,7 +840,7 @@ RustboroCity_EventScript_1E100B:: @ 81E100B closemessage delay 30 setflag FLAG_ENABLE_RIVAL_MATCH_CALL - setvar VAR_0x405A, 8 + setvar VAR_RUSTBORO_STATE, 8 setvar VAR_0x4063, 2 setvar VAR_0x8008, 0 msgbox RustboroCity_Text_1E1AFA, MSGBOX_YESNO @@ -911,7 +911,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114 closemessage delay 30 setflag FLAG_ENABLE_RIVAL_MATCH_CALL - setvar VAR_0x405A, 8 + setvar VAR_RUSTBORO_STATE, 8 setvar VAR_0x4063, 2 msgbox RustboroCity_Text_1E1E34, MSGBOX_YESNO compare VAR_RESULT, 1 diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc index a7a84335b..4f1971c80 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc @@ -1,5 +1,5 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8211245 - map_script 3, RustboroCity_DevonCorp_1F_MapScript1_21124B + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_1F_MapScript1_21124B .byte 0 RustboroCity_DevonCorp_1F_MapScript1_21124B: @ 821124B diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index cce9ae394..5c6138c6c 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -1,20 +1,20 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 8211857 - map_script 3, RustboroCity_DevonCorp_2F_MapScript1_21185D + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_2F_MapScript1_21185D .byte 0 RustboroCity_DevonCorp_2F_MapScript1_21185D: @ 821185D - compare VAR_0x40C4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 end RustboroCity_DevonCorp_2F_EventScript_211869:: @ 8211869 - setvar VAR_0x40C4, 2 + setvar VAR_FOSSIL_RESURRECTION_STATE, 2 return RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F lock faceplayer - compare VAR_0x40C4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 msgbox RustboroCity_DevonCorp_2F_Text_211BFB, MSGBOX_DEFAULT release @@ -23,7 +23,7 @@ RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F RustboroCity_DevonCorp_2F_EventScript_211886:: @ 8211886 lock faceplayer - compare VAR_0x40C4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_2118A6 msgbox RustboroCity_DevonCorp_2F_Text_211C50, MSGBOX_DEFAULT @@ -38,7 +38,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118A6:: @ 82118A6 RustboroCity_DevonCorp_2F_EventScript_2118B0:: @ 82118B0 lock faceplayer - compare VAR_0x40C4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_2118D0 msgbox RustboroCity_DevonCorp_2F_Text_211D9F, MSGBOX_DEFAULT @@ -53,7 +53,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118D0:: @ 82118D0 RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA lock faceplayer - compare VAR_0x40C4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 msgbox RustboroCity_DevonCorp_2F_Text_211EE0, MSGBOX_DEFAULT release @@ -62,9 +62,9 @@ RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1 lock faceplayer - compare VAR_0x40C4, 2 + compare VAR_FOSSIL_RESURRECTION_STATE, 2 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A03 - compare VAR_0x40C4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119F9 msgbox RustboroCity_DevonCorp_2F_Text_211F48, MSGBOX_DEFAULT checkitem ITEM_ROOT_FOSSIL, 1 @@ -79,9 +79,9 @@ RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1 RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933 closemessage playse SE_PIN - applymovement 5, RustboroCity_DevonCorp_2F_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO compare VAR_RESULT, 0 @@ -96,17 +96,17 @@ RustboroCity_DevonCorp_2F_EventScript_211974:: @ 8211974 bufferitemname 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT takeitem ITEM_ROOT_FOSSIL, 1 - setvar VAR_0x40C4, 1 - setvar VAR_0x40C5, 1 + setvar VAR_FOSSIL_RESURRECTION_STATE, 1 + setvar VAR_WHICH_FOSSIL_REVIVED, 1 release end RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991 closemessage playse SE_PIN - applymovement 5, RustboroCity_DevonCorp_2F_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO compare VAR_RESULT, 0 @@ -121,8 +121,8 @@ RustboroCity_DevonCorp_2F_EventScript_2119D2:: @ 82119D2 bufferitemname 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT takeitem ITEM_CLAW_FOSSIL, 1 - setvar VAR_0x40C4, 1 - setvar VAR_0x40C5, 2 + setvar VAR_FOSSIL_RESURRECTION_STATE, 1 + setvar VAR_WHICH_FOSSIL_REVIVED, 2 release end @@ -137,9 +137,9 @@ RustboroCity_DevonCorp_2F_EventScript_2119F9:: @ 82119F9 end RustboroCity_DevonCorp_2F_EventScript_211A03:: @ 8211A03 - compare VAR_0x40C5, 1 + compare VAR_WHICH_FOSSIL_REVIVED, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A1A - compare VAR_0x40C5, 2 + compare VAR_WHICH_FOSSIL_REVIVED, 2 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A2C end @@ -171,7 +171,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E compare VAR_RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AD7 call RustboroCity_DevonCorp_2F_EventScript_27378B - call RustboroCity_DevonCorp_2F_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto RustboroCity_DevonCorp_2F_EventScript_211AD7 end @@ -199,7 +199,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AC4:: @ 8211AC4 return RustboroCity_DevonCorp_2F_EventScript_211AD7:: @ 8211AD7 - setvar VAR_0x40C4, 0 + setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON release end @@ -220,7 +220,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11 compare VAR_RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B7A call RustboroCity_DevonCorp_2F_EventScript_27378B - call RustboroCity_DevonCorp_2F_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon goto RustboroCity_DevonCorp_2F_EventScript_211B7A end @@ -248,7 +248,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B67:: @ 8211B67 return RustboroCity_DevonCorp_2F_EventScript_211B7A:: @ 8211B7A - setvar VAR_0x40C4, 0 + setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON release end @@ -279,9 +279,9 @@ RustboroCity_DevonCorp_2F_EventScript_211BCD:: @ 8211BCD RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF lock faceplayer - compare VAR_0x40C4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 - compare VAR_0x405A, 6 + compare VAR_RUSTBORO_STATE, 6 goto_if_ge RustboroCity_DevonCorp_2F_EventScript_211BF1 msgbox RustboroCity_DevonCorp_2F_Text_212338, MSGBOX_DEFAULT release diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 9d5fbe58b..6d0a78a42 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -1,11 +1,11 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 821242D - map_script 3, RustboroCity_DevonCorp_3F_MapScript1_21243D - map_script 4, RustboroCity_DevonCorp_3F_MapScript2_212455 - map_script 2, RustboroCity_DevonCorp_3F_MapScript2_212464 + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_3F_MapScript1_21243D + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_DevonCorp_3F_MapScript2_212455 + map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_DevonCorp_3F_MapScript2_212464 .byte 0 RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D - compare VAR_0x408F, 0 + compare VAR_DEVON_CORP_3F_STATE, 0 call_if_eq RustboroCity_DevonCorp_3F_EventScript_212449 end @@ -15,7 +15,7 @@ RustboroCity_DevonCorp_3F_EventScript_212449:: @ 8212449 return RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455 - map_script_2 VAR_0x408F, 0, RustboroCity_DevonCorp_3F_EventScript_21245F + map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_21245F .2byte 0 RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F @@ -23,7 +23,7 @@ RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F end RustboroCity_DevonCorp_3F_MapScript2_212464: @ 8212464 - map_script_2 VAR_0x408F, 0, RustboroCity_DevonCorp_3F_EventScript_21246E + map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_21246E .2byte 0 RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E @@ -58,17 +58,17 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E setflag FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT msgbox RustboroCity_DevonCorp_3F_Text_212837, MSGBOX_DEFAULT closemessage - call RustboroCity_DevonCorp_3F_EventScript_272083 + call Common_EventScript_OutOfCenterPartyHeal msgbox RustboroCity_DevonCorp_3F_Text_2129D2, MSGBOX_DEFAULT setflag FLAG_HIDE_ROUTE_116_TUNNELER clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO - setvar VAR_0x4096, 1 + setvar VAR_BRINEY_LOCATION, 1 clearflag FLAG_HIDE_RUSBORO_CITY_RIVAL - setvar VAR_0x408F, 1 - setvar VAR_0x405A, 6 + setvar VAR_DEVON_CORP_3F_STATE, 1 + setvar VAR_RUSTBORO_STATE, 6 releaseall end @@ -154,7 +154,7 @@ RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_212595 msgbox RustboroCity_DevonCorp_3F_Text_212A09, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -163,11 +163,11 @@ RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 msgbox RustboroCity_DevonCorp_3F_Text_212A29, MSGBOX_DEFAULT giveitem_std ITEM_EXP_SHARE compare VAR_RESULT, 0 - goto_if_eq RustboroCity_DevonCorp_3F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_EXP_SHARE msgbox RustboroCity_DevonCorp_3F_Text_212A9E, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -175,7 +175,7 @@ RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 RustboroCity_DevonCorp_3F_EventScript_2125CC:: @ 82125CC msgbox RustboroCity_DevonCorp_3F_Text_212B78, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc index 7798e72e6..ec59115ef 100644 --- a/data/maps/RustboroCity_Flat1_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc @@ -59,7 +59,7 @@ RustboroCity_Flat1_2F_EventScript_2151F8:: @ 82151F8 msgbox RustboroCity_Flat1_2F_Text_215535, MSGBOX_DEFAULT call RustboroCity_Flat1_2F_EventScript_215238 msgbox RustboroCity_Flat1_2F_Text_215565, MSGBOX_DEFAULT - applymovement 6, RustboroCity_Flat1_2F_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox RustboroCity_Flat1_2F_Text_215792, MSGBOX_DEFAULT release diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc index 639e93884..d4b940c9f 100644 --- a/data/maps/RustboroCity_Flat2_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc @@ -12,7 +12,7 @@ RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 msgbox RustboroCity_Flat2_2F_Text_21605A, MSGBOX_DEFAULT giveitem_std ITEM_PREMIER_BALL compare VAR_RESULT, 0 - goto_if_eq RustboroCity_Flat2_2F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO release end diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 4581707ce..aaa3b3f0b 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -14,15 +14,15 @@ RustboroCity_Gym_EventScript_212F31:: @ 8212F31 RustboroCity_Gym_EventScript_212F66:: @ 8212F66 message RustboroCity_Gym_Text_2137EC waitmessage - call RustboroCity_Gym_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox RustboroCity_Gym_Text_213816, MSGBOX_DEFAULT setflag FLAG_DEFEATED_RUSTBORO_GYM setflag FLAG_BADGE01_GET - setvar VAR_0x405A, 1 - addvar VAR_0x4085, 1 + setvar VAR_RUSTBORO_STATE, 1 + addvar VAR_PETALBURG_GYM_STATE, 1 setvar VAR_0x8008, 1 call RustboroCity_Gym_EventScript_271F43 - compare VAR_0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq RustboroCity_Gym_EventScript_271E84 goto RustboroCity_Gym_EventScript_212FA4 end @@ -30,7 +30,7 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66 RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4 giveitem_std ITEM_TM39 compare VAR_RESULT, 0 - goto_if_eq RustboroCity_Gym_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM39 msgbox RustboroCity_Gym_Text_2138B1, MSGBOX_DEFAULT release diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index f76603dbd..e7bea0f0d 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62 - map_script 3, RustboroCity_PokemonCenter_1F_MapScript1_214D6D - map_script 5, RustboroCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_MapScript1_214D6D + map_script MAP_SCRIPT_ON_RESUME, RustboroCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 RustboroCity_PokemonCenter_1F_MapScript1_214D6D: @ 8214D6D diff --git a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc index a1bdeba5b..fac3cb059 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ RustboroCity_PokemonCenter_2F_MapScripts:: @ 8214EDE - map_script 2, RustboroCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, RustboroCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, RustboroCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, RustboroCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, RustboroCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 RustboroCity_PokemonCenter_2F_EventScript_214EF3:: @ 8214EF3 diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index c01e4a436..74394f9a5 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -85,9 +85,9 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 msgbox RustboroCity_PokemonSchool_Text_214433, MSGBOX_DEFAULT giveitem_std ITEM_QUICK_CLAW compare VAR_RESULT, 0 - goto_if_eq RustboroCity_PokemonSchool_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull closemessage - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown 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, RustboroCity_PokemonSchool_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 release end diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 59d0789ba..8e7e2342e 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -1,6 +1,6 @@ RusturfTunnel_MapScripts:: @ 822CE27 - map_script 3, RusturfTunnel_MapScript1_22CE44 - map_script 2, RusturfTunnel_MapScript2_22CE32 + map_script MAP_SCRIPT_ON_TRANSITION, RusturfTunnel_MapScript1_22CE44 + map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_MapScript2_22CE32 .byte 0 RusturfTunnel_MapScript2_22CE32: @ 822CE32 @@ -23,7 +23,7 @@ RusturfTunnel_EventScript_22CE5F:: @ 822CE5F faceplayer msgbox RusturfTunnel_Text_22D7A3, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -35,7 +35,7 @@ RusturfTunnel_EventScript_22CE76:: @ 822CE76 setflag FLAG_TEMP_1 msgbox RusturfTunnel_Text_22D510, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -43,7 +43,7 @@ RusturfTunnel_EventScript_22CE76:: @ 822CE76 RusturfTunnel_EventScript_22CE99:: @ 822CE99 msgbox RusturfTunnel_Text_22D5F3, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -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, RusturfTunnel_Movement_2725AA + applymovement 10, Common_Movement_WalkInPlaceDown 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, RusturfTunnel_Movement_2725AA + applymovement 10, Common_Movement_WalkInPlaceDown waitmovement 0 return RusturfTunnel_EventScript_22CFA7:: @ 822CFA7 - applymovement 1, RusturfTunnel_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -142,9 +142,9 @@ RusturfTunnel_EventScript_22CFE6:: @ 822CFE6 RusturfTunnel_EventScript_22CFFF:: @ 822CFFF playse SE_PIN - applymovement 1, RusturfTunnel_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, RusturfTunnel_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 return @@ -328,7 +328,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 applymovement 5, RusturfTunnel_Movement_22D1A4 waitmovement 0 msgbox RusturfTunnel_Text_22D395, MSGBOX_DEFAULT - applymovement 5, RusturfTunnel_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 message RusturfTunnel_Text_22D3BA waitmessage @@ -345,8 +345,8 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 removeobject 7 clearflag FLAG_DEVON_GOODS_STOLEN setflag FLAG_RECOVERED_DEVON_GOODS - setvar VAR_0x405A, 4 - setvar VAR_0x4090, 1 + setvar VAR_RUSTBORO_STATE, 4 + setvar VAR_BRINEY_HOUSE_STATE, 1 setflag FLAG_HIDE_ROUTE_116_MR_BRINEY release end diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 204d70e14..ededf1e5f 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -1,5 +1,5 @@ SSTidalCorridor_MapScripts:: @ 823BFCF - map_script 2, SSTidalCorridor_MapScript2_23BFD5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_MapScript2_23BFD5 .byte 0 SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5 @@ -201,7 +201,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219 lockall applymovement 5, SSTidalCorridor_Movement_23C26D waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox SSTidalCorridor_Text_23C28F, MSGBOX_DEFAULT closemessage diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index a021f5272..3b8df90a3 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -8,7 +8,7 @@ SSTidalRooms_EventScript_23C9F2:: @ 823C9F2 msgbox SSTidalRooms_Text_23D098, MSGBOX_DEFAULT giveitem_std ITEM_TM49 compare VAR_RESULT, 0 - goto_if_eq SSTidalRooms_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM49 msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT release @@ -23,7 +23,7 @@ SSTidalRooms_EventScript_23CA33:: @ 823CA33 lockall msgbox SSTidalRooms_Text_23CAF2, MSGBOX_DEFAULT closemessage - call SSTidalRooms_EventScript_272083 + call Common_EventScript_OutOfCenterPartyHeal call SSTidalRooms_EventScript_23C0A7 releaseall end diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc index ab6f70f86..75ec95d33 100644 --- a/data/maps/SafariZone_South/scripts.inc +++ b/data/maps/SafariZone_South/scripts.inc @@ -1,10 +1,10 @@ SafariZone_South_MapScripts:: @ 823D279 - map_script 3, SafariZone_South_MapScript1_23D2B1 - map_script 2, SafariZone_South_MapScript2_23D284 + map_script MAP_SCRIPT_ON_TRANSITION, SafariZone_South_MapScript1_23D2B1 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SafariZone_South_MapScript2_23D284 .byte 0 SafariZone_South_MapScript2_23D284: @ 823D284 - map_script_2 VAR_0x40A4, 2, SafariZone_South_EventScript_23D28E + map_script_2 VAR_SAFARI_ZONE_STATE, 2, SafariZone_South_EventScript_23D28E .2byte 0 SafariZone_South_EventScript_23D28E:: @ 823D28E @@ -14,12 +14,12 @@ SafariZone_South_EventScript_23D28E:: @ 823D28E applymovement 1, SafariZone_South_Movement_23D2C7 waitmovement 0 setobjectxyperm 1, 32, 34 - setvar VAR_0x40A4, 0 + setvar VAR_SAFARI_ZONE_STATE, 0 releaseall end SafariZone_South_MapScript1_23D2B1: @ 823D2B1 - compare VAR_0x40A4, 2 + compare VAR_SAFARI_ZONE_STATE, 2 call_if_eq SafariZone_South_EventScript_23D2BD end @@ -90,7 +90,7 @@ SafariZone_South_EventScript_23D359:: @ 823D359 end SafariZone_South_EventScript_23D373:: @ 823D373 - setvar VAR_0x40A4, 1 + setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate diff --git a/data/maps/ScorchedSlab/scripts.inc b/data/maps/ScorchedSlab/scripts.inc index f83724ec5..62a546780 100644 --- a/data/maps/ScorchedSlab/scripts.inc +++ b/data/maps/ScorchedSlab/scripts.inc @@ -1,5 +1,5 @@ ScorchedSlab_MapScripts:: @ 8239291 - map_script 3, ScorchedSlab_MapScript1_239297 + map_script MAP_SCRIPT_ON_TRANSITION, ScorchedSlab_MapScript1_239297 .byte 0 ScorchedSlab_MapScript1_239297: @ 8239297 diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index 9bbb9cbdc..045c0e065 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -1,5 +1,5 @@ SeafloorCavern_Entrance_MapScripts:: @ 823446E - map_script 5, SeafloorCavern_Entrance_MapScript1_234474 + map_script MAP_SCRIPT_ON_RESUME, SeafloorCavern_Entrance_MapScript1_234474 .byte 0 SeafloorCavern_Entrance_MapScript1_234474: @ 8234474 @@ -13,9 +13,9 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 goto_if_eq SeafloorCavern_Entrance_EventScript_2344ED waitse playse SE_PIN - applymovement 1, SeafloorCavern_Entrance_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, SeafloorCavern_Entrance_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 delay 20 compare VAR_FACING, 3 @@ -29,7 +29,7 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 moveobjectoffscreen 1 msgbox SeafloorCavern_Entrance_Text_234544, MSGBOX_DEFAULT closemessage - applymovement 1, SeafloorCavern_Entrance_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp 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, SeafloorCavern_Entrance_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end SeafloorCavern_Entrance_EventScript_234523:: @ 8234523 - applymovement 1, SeafloorCavern_Entrance_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return SeafloorCavern_Entrance_EventScript_23452E:: @ 823452E - applymovement 1, SeafloorCavern_Entrance_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 return SeafloorCavern_Entrance_EventScript_234539:: @ 8234539 - applymovement 1, SeafloorCavern_Entrance_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index fe02ad28b..f4f7fd336 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -121,7 +121,7 @@ "x": 17, "y": 42, "elevation": 3, - "var": "VAR_0x40A2", + "var": "VAR_SEAFLOOR_CAVERN_STATE", "var_value": "0", "script": "SeafloorCavern_Room9_EventScript_234DC9" } diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 6ab802ee4..7fe6386c3 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, SeafloorCavern_Room9_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_23505C waitmovement 0 @@ -15,15 +15,15 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 msgbox SeafloorCavern_Room9_Text_23505F, MSGBOX_DEFAULT closemessage addobject VAR_0x8004 - applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23502A waitmovement 0 msgbox SeafloorCavern_Room9_Text_23507C, MSGBOX_DEFAULT - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SeafloorCavern_Room9_Text_2350A6, MSGBOX_DEFAULT - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259E + applymovement VAR_0x8004, Common_Movement_FacePlayer waitmovement 0 msgbox SeafloorCavern_Room9_Text_23512C, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_2351BC @@ -47,8 +47,8 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 playfanfare MUS_ME_TAMA playse SE_TAMA special sub_80B0534 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A6 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp 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, SeafloorCavern_Room9_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft 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, SeafloorCavern_Room9_Movement_2725AA + applymovement VAR_0x8004, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox SeafloorCavern_Room9_Text_23546F, MSGBOX_DEFAULT closemessage @@ -103,13 +103,13 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_235057 applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_23504E waitmovement 0 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A4 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox SeafloorCavern_Room9_Text_2354F0, MSGBOX_DEFAULT playse SE_PIN - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_272598 + applymovement VAR_0x8004, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259A + applymovement VAR_0x8004, Common_Movement_Delay48 waitmovement 0 msgbox SeafloorCavern_Room9_Text_2355C2, MSGBOX_DEFAULT msgbox SeafloorCavern_Room9_Text_235692, MSGBOX_DEFAULT @@ -118,7 +118,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23503A waitmovement 0 msgbox SeafloorCavern_Room9_Text_235723, MSGBOX_DEFAULT - setvar VAR_0x407B, 1 + setvar VAR_ROUTE128_STATE, 1 setvar VAR_0x405E, 1 clearflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN clearflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE @@ -133,8 +133,8 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setflag FLAG_SYS_WEATHER_CTRL setflag FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN - setvar VAR_0x40C6, 2 - setvar VAR_0x40A2, 1 + setvar VAR_STEVENS_HOUSE_STATE, 2 + setvar VAR_SEAFLOOR_CAVERN_STATE, 1 setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc index 4b461a684..71e6426fe 100644 --- a/data/maps/SealedChamber_OuterRoom/scripts.inc +++ b/data/maps/SealedChamber_OuterRoom/scripts.inc @@ -1,7 +1,7 @@ SealedChamber_OuterRoom_MapScripts:: @ 8239106 - map_script 5, SealedChamber_OuterRoom_MapScript1_239116 - map_script 3, SealedChamber_OuterRoom_MapScript1_239127 - map_script 1, SealedChamber_OuterRoom_MapScript1_23912B + map_script MAP_SCRIPT_ON_RESUME, SealedChamber_OuterRoom_MapScript1_239116 + map_script MAP_SCRIPT_ON_TRANSITION, SealedChamber_OuterRoom_MapScript1_239127 + map_script MAP_SCRIPT_ON_LOAD, SealedChamber_OuterRoom_MapScript1_23912B .byte 0 SealedChamber_OuterRoom_MapScript1_239116: @ 8239116 diff --git a/data/maps/SecretBase_YellowCave4/scripts.inc b/data/maps/SecretBase_YellowCave4/scripts.inc index 32da39388..cb26f924e 100644 --- a/data/maps/SecretBase_YellowCave4/scripts.inc +++ b/data/maps/SecretBase_YellowCave4/scripts.inc @@ -1,8 +1,8 @@ SecretBase_YellowCave4_MapScripts:: @ 823B483 - map_script 4, SecretBase_RedCave1_MapScript2_23B498 - map_script 3, SecretBase_RedCave1_MapScript1_23B4A2 - map_script 2, SecretBase_RedCave1_MapScript2_23B4AE - map_script 5, SecretBase_RedCave1_MapScript1_23B4B8 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_RedCave1_MapScript2_23B498 + map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_RedCave1_MapScript1_23B4A2 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_RedCave1_MapScript2_23B4AE + map_script MAP_SCRIPT_ON_RESUME, SecretBase_RedCave1_MapScript1_23B4B8 .byte 0 SecretBase_RedCave1_MapScript2_23B498: @ 823B498 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index 2874da963..218cabc67 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 8236DBA - map_script 3, ShoalCave_LowTideEntranceRoom_MapScript1_236DC0 + map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideEntranceRoom_MapScript1_236DC0 .byte 0 ShoalCave_LowTideEntranceRoom_MapScript1_236DC0: @ 8236DC0 @@ -39,7 +39,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 takeitem ITEM_SHOAL_SHELL, 4 giveitem_std ITEM_SHELL_BELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, MSGBOX_DEFAULT setflag FLAG_TEMP_2 release diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index c54aa1d4f..f1a29b28a 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 8236EF5 - map_script 1, ShoalCave_LowTideInnerRoom_MapScript1_236F16 - map_script 3, ShoalCave_LowTideInnerRoom_MapScript1_236F00 + map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideInnerRoom_MapScript1_236F16 + map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideInnerRoom_MapScript1_236F00 .byte 0 ShoalCave_LowTideInnerRoom_MapScript1_236F00: @ 8236F00 @@ -64,7 +64,7 @@ ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 41, 20, 859, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SHELL_1 @@ -81,7 +81,7 @@ ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6 goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 41, 10, 859, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SHELL_2 @@ -93,7 +93,7 @@ ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028 goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 6, 9, 859, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SHELL_3 @@ -105,7 +105,7 @@ ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 16, 13, 859, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SHELL_4 @@ -117,7 +117,7 @@ ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_2370BE giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 31, 8, 858, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SALT_1 @@ -134,7 +134,7 @@ ShoalCave_LowTideInnerRoom_EventScript_2370C8:: @ 82370C8 goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_2370BE giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 14, 26, 858, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SALT_2 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc index 60a6039be..8492afe5b 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideLowerRoom_MapScripts:: @ 8237156 - map_script 1, ShoalCave_LowTideLowerRoom_MapScript1_23715C + map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideLowerRoom_MapScript1_23715C .byte 0 ShoalCave_LowTideLowerRoom_MapScript1_23715C: @ 823715C @@ -19,7 +19,7 @@ ShoalCave_LowTideLowerRoom_EventScript_237176:: @ 8237176 goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_2371A8 giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 18, 2, 858, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SALT_4 @@ -38,7 +38,7 @@ ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2 msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, MSGBOX_DEFAULT giveitem_std ITEM_FOCUS_BAND compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FOCUS_BAND release end diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc index 40275d809..74b653a5f 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideStairsRoom_MapScripts:: @ 82370FA - map_script 1, ShoalCave_LowTideStairsRoom_MapScript1_237100 + map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideStairsRoom_MapScript1_237100 .byte 0 ShoalCave_LowTideStairsRoom_MapScript1_237100: @ 8237100 @@ -19,7 +19,7 @@ ShoalCave_LowTideStairsRoom_EventScript_23711A:: @ 823711A goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_23714C giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setmetatile 11, 11, 858, 0 special DrawWholeMapView setflag FLAG_RECEIVED_SHOAL_SALT_3 diff --git a/data/maps/SkyPillar_1F/scripts.inc b/data/maps/SkyPillar_1F/scripts.inc index a0b62df25..b1ec3b74a 100644 --- a/data/maps/SkyPillar_1F/scripts.inc +++ b/data/maps/SkyPillar_1F/scripts.inc @@ -1,5 +1,5 @@ SkyPillar_1F_MapScripts:: @ 8239615 - map_script 3, SkyPillar_1F_MapScript1_23961B + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_1F_MapScript1_23961B .byte 0 SkyPillar_1F_MapScript1_23961B: @ 823961B diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc index a0a4aeaf3..8c1424fd9 100644 --- a/data/maps/SkyPillar_2F/scripts.inc +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -1,7 +1,7 @@ SkyPillar_2F_MapScripts:: @ 823962B - map_script 2, SkyPillar_2F_MapScript2_2A8327 - map_script 3, SkyPillar_2F_MapScript1_23963B - map_script 5, SkyPillar_2F_MapScript1_239650 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_2F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_2F_MapScript1_23963B + map_script MAP_SCRIPT_ON_RESUME, SkyPillar_2F_MapScript1_239650 .byte 0 SkyPillar_2F_MapScript1_23963B: @ 823963B diff --git a/data/maps/SkyPillar_3F/scripts.inc b/data/maps/SkyPillar_3F/scripts.inc index d78ee6266..9bc7eda27 100644 --- a/data/maps/SkyPillar_3F/scripts.inc +++ b/data/maps/SkyPillar_3F/scripts.inc @@ -1,5 +1,5 @@ SkyPillar_3F_MapScripts:: @ 823965B - map_script 3, SkyPillar_3F_MapScript1_239661 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_3F_MapScript1_239661 .byte 0 SkyPillar_3F_MapScript1_239661: @ 8239661 diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc index 3904e954f..254d61a59 100644 --- a/data/maps/SkyPillar_4F/scripts.inc +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -1,7 +1,7 @@ SkyPillar_4F_MapScripts:: @ 8239671 - map_script 2, SkyPillar_4F_MapScript2_2A8327 - map_script 3, SkyPillar_4F_MapScript1_239681 - map_script 5, SkyPillar_4F_MapScript1_239696 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_4F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_4F_MapScript1_239681 + map_script MAP_SCRIPT_ON_RESUME, SkyPillar_4F_MapScript1_239696 .byte 0 SkyPillar_4F_MapScript1_239681: @ 8239681 diff --git a/data/maps/SkyPillar_5F/scripts.inc b/data/maps/SkyPillar_5F/scripts.inc index 20478e77e..af5a5ffe1 100644 --- a/data/maps/SkyPillar_5F/scripts.inc +++ b/data/maps/SkyPillar_5F/scripts.inc @@ -1,5 +1,5 @@ SkyPillar_5F_MapScripts:: @ 82396A2 - map_script 3, SkyPillar_5F_MapScript1_2396A8 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_5F_MapScript1_2396A8 .byte 0 SkyPillar_5F_MapScript1_2396A8: @ 82396A8 diff --git a/data/maps/SkyPillar_Entrance/scripts.inc b/data/maps/SkyPillar_Entrance/scripts.inc index 09ee9eae2..40d57a485 100644 --- a/data/maps/SkyPillar_Entrance/scripts.inc +++ b/data/maps/SkyPillar_Entrance/scripts.inc @@ -1,5 +1,5 @@ SkyPillar_Entrance_MapScripts:: @ 823929E - map_script 3, SkyPillar_Entrance_MapScript1_2392A4 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Entrance_MapScript1_2392A4 .byte 0 SkyPillar_Entrance_MapScript1_2392A4: @ 82392A4 diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index eb57d1227..c68dc03e3 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -1,7 +1,7 @@ SkyPillar_Outside_MapScripts:: @ 82392A8 - map_script 3, SkyPillar_Outside_MapScript1_2392B8 - map_script 1, SkyPillar_Outside_MapScript1_2392DD - map_script 2, SkyPillar_Outside_MapScript2_2392FA + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Outside_MapScript1_2392B8 + map_script MAP_SCRIPT_ON_LOAD, SkyPillar_Outside_MapScript1_2392DD + map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_Outside_MapScript2_2392FA .byte 0 SkyPillar_Outside_MapScript1_2392B8: @ 82392B8 @@ -16,7 +16,7 @@ SkyPillar_Outside_EventScript_2392CF:: @ 82392CF return SkyPillar_Outside_EventScript_2392D3:: @ 82392D3 - call_if_set FLAG_SYS_WEATHER_CTRL, SkyPillar_Outside_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 return SkyPillar_Outside_MapScript1_2392DD: @ 82392DD @@ -36,7 +36,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 lockall applymovement 1, SkyPillar_Outside_Movement_2393D3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT closemessage @@ -60,19 +60,19 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 special sub_8139560 waitstate delay 20 - applymovement 1, SkyPillar_Outside_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 10 - applymovement 1, SkyPillar_Outside_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 - applymovement 1, SkyPillar_Outside_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT closemessage setflag FLAG_SYS_WEATHER_CTRL - setweather WEATHER_15 + setweather WEATHER_ALTERNATING doweather special WaitWeather waitstate diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index 4ca4c4681..3d031293d 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -1,7 +1,7 @@ SkyPillar_Top_MapScripts:: @ 82396B8 - map_script 5, SkyPillar_Top_MapScript1_2396C8 - map_script 3, SkyPillar_Top_MapScript1_2396E6 - map_script 4, SkyPillar_Top_MapScript2_239713 + map_script MAP_SCRIPT_ON_RESUME, SkyPillar_Top_MapScript1_2396C8 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Top_MapScript1_2396E6 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SkyPillar_Top_MapScript2_239713 .byte 0 SkyPillar_Top_MapScript1_2396C8: @ 82396C8 @@ -11,7 +11,7 @@ SkyPillar_Top_MapScript1_2396C8: @ 82396C8 SkyPillar_Top_EventScript_2396D2:: @ 82396D2 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne SkyPillar_Top_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return @@ -94,7 +94,7 @@ SkyPillar_Top_EventScript_239785:: @ 8239785 SkyPillar_Top_EventScript_23979A:: @ 823979A lockall fadeoutbgm 1 - applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Top_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 special SpawnCameraObject applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_239858 diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index ee9f3c379..126519096 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -591,7 +591,7 @@ "y": 19, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SlateportCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -599,7 +599,7 @@ "y": 19, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SlateportCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -607,7 +607,7 @@ "y": 26, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SlateportCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -623,7 +623,7 @@ "y": 26, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SlateportCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 2e7859fba..9f4310c4a 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -1,12 +1,12 @@ SlateportCity_MapScripts:: @ 81DCC61 - map_script 3, SlateportCity_MapScript1_1DCC6C - map_script 2, SlateportCity_MapScript2_1DCD12 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_MapScript1_1DCC6C + map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_MapScript2_1DCD12 .byte 0 SlateportCity_MapScript1_1DCC6C: @ 81DCC6C - setvar VAR_0x40AA, 0 + setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0 call SlateportCity_EventScript_1DCC8D - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCC99 compare VAR_0x40D2, 1 call_if_eq SlateportCity_EventScript_1DCCE7 @@ -14,7 +14,7 @@ SlateportCity_MapScript1_1DCC6C: @ 81DCC6C SlateportCity_EventScript_1DCC8D:: @ 81DCC8D setflag FLAG_VISITED_SLATEPORT_CITY - setvar VAR_0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER return @@ -61,11 +61,11 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C waitmovement 0 msgbox SlateportCity_Text_1DF032, MSGBOX_DEFAULT closemessage - applymovement 35, SlateportCity_Movement_2725A4 + applymovement 35, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 60 msgbox SlateportCity_Text_1DF0FE, MSGBOX_DEFAULT - applymovement 35, SlateportCity_Movement_2725A8 + applymovement 35, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox SlateportCity_Text_1DF12B, MSGBOX_DEFAULT closemessage @@ -170,7 +170,7 @@ SlateportCity_EventScript_1DCE38:: @ 81DCE38 SlateportCity_EventScript_1DCE42:: @ 81DCE42 lock faceplayer - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCE59 msgbox SlateportCity_Text_1DD81A, MSGBOX_DEFAULT release @@ -184,7 +184,7 @@ SlateportCity_EventScript_1DCE59:: @ 81DCE59 SlateportCity_EventScript_1DCE63:: @ 81DCE63 lock faceplayer - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCE7A msgbox SlateportCity_Text_1DD8A6, MSGBOX_DEFAULT release @@ -198,7 +198,7 @@ SlateportCity_EventScript_1DCE7A:: @ 81DCE7A SlateportCity_EventScript_1DCE84:: @ 81DCE84 lock faceplayer - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCEA4 goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_1DCEAE msgbox SlateportCity_Text_1DD93D, MSGBOX_DEFAULT @@ -218,7 +218,7 @@ SlateportCity_EventScript_1DCEAE:: @ 81DCEAE SlateportCity_EventScript_1DCEB8:: @ 81DCEB8 lock faceplayer - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCECF msgbox SlateportCity_Text_1DDA34, MSGBOX_DEFAULT release @@ -230,7 +230,7 @@ SlateportCity_EventScript_1DCECF:: @ 81DCECF end SlateportCity_EventScript_1DCED9:: @ 81DCED9 - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 goto_if_eq SlateportCity_EventScript_1DCEED msgbox SlateportCity_Text_1DDA9A, MSGBOX_NPC end @@ -242,7 +242,7 @@ SlateportCity_EventScript_1DCEED:: @ 81DCEED SlateportCity_EventScript_1DCEF6:: @ 81DCEF6 lock faceplayer - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCF0D msgbox SlateportCity_Text_1DDB21, MSGBOX_DEFAULT release @@ -323,7 +323,7 @@ SlateportCity_EventScript_1DCFB2:: @ 81DCFB2 SlateportCity_EventScript_1DCFBB:: @ 81DCFBB lock faceplayer - compare VAR_0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if_eq SlateportCity_EventScript_1DCFD2 msgbox SlateportCity_Text_1DE10E, MSGBOX_DEFAULT release @@ -359,7 +359,7 @@ SlateportCity_EventScript_1DD009:: @ 81DD009 faceplayer msgbox SlateportCity_Text_1DDC4F, MSGBOX_DEFAULT closemessage - applymovement 5, SlateportCity_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -369,7 +369,7 @@ SlateportCity_EventScript_1DD020:: @ 81DD020 faceplayer msgbox SlateportCity_Text_1DDC8A, MSGBOX_DEFAULT closemessage - applymovement 18, SlateportCity_Movement_2725A2 + applymovement 18, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -379,7 +379,7 @@ SlateportCity_EventScript_1DD037:: @ 81DD037 faceplayer msgbox SlateportCity_Text_1DDCD5, MSGBOX_DEFAULT closemessage - applymovement 19, SlateportCity_Movement_2725A2 + applymovement 19, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -389,7 +389,7 @@ SlateportCity_EventScript_1DD04E:: @ 81DD04E faceplayer msgbox SlateportCity_Text_1DDD18, MSGBOX_DEFAULT closemessage - applymovement 26, SlateportCity_Movement_2725A2 + applymovement 26, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -399,7 +399,7 @@ SlateportCity_EventScript_1DD065:: @ 81DD065 faceplayer msgbox SlateportCity_Text_1DDD7D, MSGBOX_DEFAULT closemessage - applymovement 27, SlateportCity_Movement_2725A2 + applymovement 27, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -409,7 +409,7 @@ SlateportCity_EventScript_1DD07C:: @ 81DD07C faceplayer msgbox SlateportCity_Text_1DDDC0, MSGBOX_DEFAULT closemessage - applymovement 28, SlateportCity_Movement_2725A2 + applymovement 28, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -419,7 +419,7 @@ SlateportCity_EventScript_1DD093:: @ 81DD093 faceplayer msgbox SlateportCity_Text_1DDDDF, MSGBOX_DEFAULT closemessage - applymovement 29, SlateportCity_Movement_2725A2 + applymovement 29, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -429,7 +429,7 @@ SlateportCity_EventScript_1DD0AA:: @ 81DD0AA faceplayer msgbox SlateportCity_Text_1DDE2F, MSGBOX_DEFAULT closemessage - applymovement 30, SlateportCity_Movement_2725A2 + applymovement 30, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -438,31 +438,31 @@ SlateportCity_EventScript_1DD0C1:: @ 81DD0C1 lock faceplayer playse SE_PIN - applymovement 31, SlateportCity_Movement_272598 + applymovement 31, Common_Movement_ExclamationMark waitmovement 0 - applymovement 31, SlateportCity_Movement_27259A + applymovement 31, Common_Movement_Delay48 waitmovement 0 msgbox SlateportCity_Text_1DDE6E, MSGBOX_DEFAULT closemessage - applymovement 31, SlateportCity_Movement_2725A2 + applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 applymovement 31, SlateportCity_Movement_1DD147 waitmovement 0 - applymovement 31, SlateportCity_Movement_27259E + applymovement 31, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_Text_1DDE86, MSGBOX_DEFAULT closemessage - applymovement 31, SlateportCity_Movement_2725A2 + applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 applymovement 31, SlateportCity_Movement_1DD147 waitmovement 0 msgbox SlateportCity_Text_1DDEB8, MSGBOX_DEFAULT closemessage - applymovement 31, SlateportCity_Movement_27259E + applymovement 31, Common_Movement_FacePlayer waitmovement 0 applymovement 31, SlateportCity_Movement_1DD147 waitmovement 0 - applymovement 31, SlateportCity_Movement_2725A2 + applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -481,7 +481,7 @@ SlateportCity_EventScript_1DD153:: @ 81DD153 faceplayer msgbox SlateportCity_Text_1DDF8D, MSGBOX_DEFAULT closemessage - applymovement 33, SlateportCity_Movement_2725A2 + applymovement 33, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -563,10 +563,10 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 msgbox SlateportCity_Text_1DE502, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE54A, MSGBOX_DEFAULT closemessage - applymovement 10, SlateportCity_Movement_2725A8 + applymovement 10, Common_Movement_WalkInPlaceRight waitmovement 0 delay 10 - applymovement 9, SlateportCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 delay 25 applymovement 11, SlateportCity_Movement_1DD33C @@ -577,26 +577,26 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 removeobject 10 removeobject 9 msgbox SlateportCity_Text_1DE5F7, MSGBOX_DEFAULT - applymovement 11, SlateportCity_Movement_2725A6 + applymovement 11, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SlateportCity_Text_1DE64F, MSGBOX_DEFAULT playbgm MUS_AQA_0, 0 msgbox SlateportCity_Text_1DE724, MSGBOX_DEFAULT - applymovement 6, SlateportCity_Movement_2725A4 - applymovement 1, SlateportCity_Movement_2725A4 + applymovement 6, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceLeft applymovement 7, SlateportCity_Movement_1DD309 applymovement 3, SlateportCity_Movement_272596 applymovement 2, SlateportCity_Movement_1DD311 waitmovement 0 - applymovement 11, SlateportCity_Movement_2725AA + applymovement 11, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox SlateportCity_Text_1DE7F7, MSGBOX_DEFAULT playse SE_PIN - applymovement 11, SlateportCity_Movement_272598 + applymovement 11, Common_Movement_ExclamationMark waitmovement 0 - applymovement 11, SlateportCity_Movement_27259A + applymovement 11, Common_Movement_Delay48 waitmovement 0 - applymovement 11, SlateportCity_Movement_2725A6 + applymovement 11, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SlateportCity_Text_1DE860, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE8A0, MSGBOX_DEFAULT @@ -609,7 +609,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE - setvar VAR_0x4058, 2 + setvar VAR_SLATEPORT_STATE, 2 warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14 waitstate releaseall @@ -885,7 +885,7 @@ SlateportCity_EventScript_1DD5CE:: @ 81DD5CE SlateportCity_EventScript_1DD5DC:: @ 81DD5DC lockall - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 opendoor 10, 12 waitdooranim diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index 9df0e0a6a..a5e2a493c 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -1,7 +1,7 @@ SlateportCity_BattleTentBattleRoom_MapScripts:: @ 8209960 - map_script 3, SlateportCity_BattleTentBattleRoom_MapScript1_209970 - map_script 4, SlateportCity_BattleTentBattleRoom_MapScript2_20999A - map_script 2, SlateportCity_BattleTentBattleRoom_MapScript2_2099B4 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_BattleTentBattleRoom_MapScript1_209970 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentBattleRoom_MapScript2_20999A + map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentBattleRoom_MapScript2_2099B4 .byte 0 SlateportCity_BattleTentBattleRoom_MapScript1_209970: @ 8209970 diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index 4bd28996b..27f7fa3b9 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -1,6 +1,6 @@ SlateportCity_BattleTentCorridor_MapScripts:: @ 8208E26 - map_script 2, SlateportCity_BattleTentCorridor_MapScript2_208E5B - map_script 4, SlateportCity_BattleTentCorridor_MapScript2_208E31 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentCorridor_MapScript2_208E5B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentCorridor_MapScript2_208E31 .byte 0 SlateportCity_BattleTentCorridor_MapScript2_208E31: @ 8208E31 @@ -44,7 +44,7 @@ SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65 SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 msgbox SlateportCity_BattleTentCorridor_Text_25AB96, MSGBOX_DEFAULT closemessage - applymovement 1, SlateportCity_BattleTentCorridor_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 opendoor 2, 1 waitdooranim diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index 8851c5fa8..19416c91b 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -1,6 +1,6 @@ SlateportCity_BattleTentLobby_MapScripts:: @ 8208730 - map_script 2, SlateportCity_BattleTentLobby_MapScript2_20874F - map_script 4, SlateportCity_BattleTentLobby_MapScript2_20873B + map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentLobby_MapScript2_20874F + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentLobby_MapScript2_20873B .byte 0 SlateportCity_BattleTentLobby_MapScript2_20873B: @ 820873B @@ -165,7 +165,7 @@ SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950 special CallFrontierUtilFunc closemessage delay 2 - call SlateportCity_BattleTentLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq SlateportCity_BattleTentLobby_EventScript_208A14 @@ -249,7 +249,7 @@ SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D msgbox SlateportCity_BattleTentLobby_Text_208B4E, MSGBOX_DEFAULT giveitem_std ITEM_TM41 compare VAR_RESULT, 0 - goto_if_eq SlateportCity_BattleTentLobby_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM41 msgbox SlateportCity_BattleTentLobby_Text_208C5C, MSGBOX_DEFAULT release diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index 4c9b45683..c61c5a5e6 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -155,7 +155,7 @@ "x": 8, "y": 11, "elevation": 3, - "var": "VAR_0x40A0", + "var": "VAR_SLATEPORT_HARBOR_STATE", "var_value": "1", "script": "SlateportCity_Harbor_EventScript_20C9BB" }, @@ -164,7 +164,7 @@ "x": 8, "y": 12, "elevation": 3, - "var": "VAR_0x40A0", + "var": "VAR_SLATEPORT_HARBOR_STATE", "var_value": "1", "script": "SlateportCity_Harbor_EventScript_20C9C7" }, @@ -173,7 +173,7 @@ "x": 8, "y": 13, "elevation": 3, - "var": "VAR_0x40A0", + "var": "VAR_SLATEPORT_HARBOR_STATE", "var_value": "1", "script": "SlateportCity_Harbor_EventScript_20C9D3" }, @@ -182,7 +182,7 @@ "x": 8, "y": 14, "elevation": 3, - "var": "VAR_0x40A0", + "var": "VAR_SLATEPORT_HARBOR_STATE", "var_value": "1", "script": "SlateportCity_Harbor_EventScript_20C9DF" } diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 24e139edf..8f9f77e97 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -1,11 +1,11 @@ SlateportCity_Harbor_MapScripts:: @ 820C97D - map_script 3, SlateportCity_Harbor_MapScript1_20C983 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_Harbor_MapScript1_20C983 .byte 0 SlateportCity_Harbor_MapScript1_20C983: @ 820C983 setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 setvar VAR_TEMP_1, 0 - compare VAR_0x40A0, 1 + compare VAR_SLATEPORT_HARBOR_STATE, 1 call_if_eq SlateportCity_Harbor_EventScript_20C9A9 call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20C9A5 end @@ -48,10 +48,10 @@ SlateportCity_Harbor_EventScript_20C9DF:: @ 820C9DF end SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 - applymovement 7, SlateportCity_Harbor_Movement_2725AA + applymovement 7, Common_Movement_WalkInPlaceDown waitmovement 0 - applymovement 6, SlateportCity_Harbor_Movement_2725AA - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A6 + applymovement 6, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SlateportCity_Harbor_Text_20D291, MSGBOX_DEFAULT closemessage @@ -62,7 +62,7 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 removeobject 6 removeobject 7 removeobject 8 - setvar VAR_0x40A0, 2 + setvar VAR_SLATEPORT_HARBOR_STATE, 2 setflag FLAG_MET_TEAM_AQUA_HARBOR setflag FLAG_HIDE_LILCOVE_MOTEL_SCOTT compare VAR_0x8008, 0 @@ -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, SlateportCity_Harbor_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return SlateportCity_Harbor_EventScript_20CA9E:: @ 820CA9E applymovement 4, SlateportCity_Harbor_Movement_20CAE6 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3 applymovement 4, SlateportCity_Harbor_Movement_20CAEB waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight 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, SlateportCity_Harbor_Movement_2725A6 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR @@ -296,11 +296,11 @@ SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_20CD00 goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_20CCF6 goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_20CCE9 - compare VAR_0x40A0, 2 + compare VAR_SLATEPORT_HARBOR_STATE, 2 goto_if_eq SlateportCity_Harbor_EventScript_20CCDF msgbox SlateportCity_Harbor_Text_20D232, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -358,7 +358,7 @@ SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B goto_if_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_TOOTH compare VAR_RESULT, 0 - goto_if_eq SlateportCity_Harbor_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT setflag FLAG_EXCHANGED_SCANNER @@ -371,7 +371,7 @@ SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB goto_if_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_SCALE compare VAR_RESULT, 0 - goto_if_eq SlateportCity_Harbor_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT setflag FLAG_EXCHANGED_SCANNER diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc index 2e973663b..155081a1b 100644 --- a/data/maps/SlateportCity_House1/scripts.inc +++ b/data/maps/SlateportCity_House1/scripts.inc @@ -57,7 +57,7 @@ SlateportCity_House1_EventScript_209B50:: @ 8209B50 SlateportCity_House1_EventScript_209B5A:: @ 8209B5A msgbox SlateportCity_House1_Text_209CA4, MSGBOX_DEFAULT - call SlateportCity_House1_EventScript_2723DD + call Common_EventScript_NameReceivedPokemon specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index 517647bd1..eefb843f4 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -226,7 +226,7 @@ "x": 9, "y": 7, "elevation": 3, - "var": "VAR_0x40AA", + "var": "VAR_SLATEPORT_MUSEUM_1F_STATE", "var_value": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD9F" }, @@ -235,7 +235,7 @@ "x": 10, "y": 7, "elevation": 3, - "var": "VAR_0x40AA", + "var": "VAR_SLATEPORT_MUSEUM_1F_STATE", "var_value": "0", "script": "SlateportCity_OceanicMuseum_1F_EventScript_20ADB0" } diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index b574ce448..5a4947c8a 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, SlateportCity_OceanicMuseum_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 end SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0 lockall - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 end @@ -42,7 +42,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8 updatemoneybox 0, 0 nop msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, MSGBOX_DEFAULT - setvar VAR_0x40AA, 1 + setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 hidemoneybox nop nop @@ -63,7 +63,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18 SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39 msgbox SlateportCity_OceanicMuseum_1F_Text_20B075, MSGBOX_DEFAULT - setvar VAR_0x40AA, 1 + setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 hidemoneybox nop nop @@ -155,9 +155,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 faceplayer delay 8 playse SE_PIN - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_272598 + applymovement 13, Common_Movement_ExclamationMark waitmovement 0 - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_27259A + applymovement 13, Common_Movement_Delay48 waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, MSGBOX_DEFAULT giveitem_std ITEM_TM46 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 204ffb4eb..641c4dd86 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, SlateportCity_OceanicMuseum_2F_Movement_2725AA - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceDown + applymovement 4, Common_Movement_WalkInPlaceUp 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, SlateportCity_OceanicMuseum_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, MSGBOX_DEFAULT setvar VAR_0x8004, 269 @@ -96,12 +96,12 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BC8C:: @ 820BC8C return SlateportCity_OceanicMuseum_2F_EventScript_20BC92:: @ 820BC92 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return SlateportCity_OceanicMuseum_2F_EventScript_20BC9D:: @ 820BC9D - applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -268,7 +268,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BD76:: @ 820BD76 faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_20C4C2, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc index db8cc19d7..8c1f87e63 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF - map_script 3, SlateportCity_PokemonCenter_1F_MapScript1_20DACA - map_script 5, SlateportCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_1F_MapScript1_20DACA + map_script MAP_SCRIPT_ON_RESUME, SlateportCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 SlateportCity_PokemonCenter_1F_MapScript1_20DACA: @ 820DACA diff --git a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc index 3138f20d6..1ddbcc0be 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ SlateportCity_PokemonCenter_2F_MapScripts:: @ 820DC21 - map_script 2, SlateportCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, SlateportCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, SlateportCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, SlateportCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, SlateportCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 SlateportCity_PokemonCenter_2F_EventScript_20DC36:: @ 820DC36 diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index 3faf350fc..866bf2963 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -6,7 +6,7 @@ SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96 faceplayer goto_if_unset FLAG_ENTERED_LINK_CONTEST, SlateportCity_PokemonFanClub_EventScript_20A152 call_if_unset FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_20A172 - switch VAR_0x40B7 + switch VAR_SLATEPORT_FAN_CLUB_STATE case 0, SlateportCity_PokemonFanClub_EventScript_209ED2 case 1, SlateportCity_PokemonFanClub_EventScript_209EE5 case 2, SlateportCity_PokemonFanClub_EventScript_209F3B @@ -14,7 +14,7 @@ SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96 end SlateportCity_PokemonFanClub_EventScript_209ED2:: @ 8209ED2 - setvar VAR_0x40B7, 1 + setvar VAR_SLATEPORT_FAN_CLUB_STATE, 1 msgbox SlateportCity_PokemonFanClub_Text_20A445, MSGBOX_DEFAULT goto SlateportCity_PokemonFanClub_EventScript_209F45 end @@ -28,7 +28,7 @@ SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5 call_if_set FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0 compare VAR_TEMP_2, 5 call_if_eq SlateportCity_PokemonFanClub_EventScript_209FCA - compare VAR_0x40B7, 2 + compare VAR_SLATEPORT_FAN_CLUB_STATE, 2 goto_if_eq SlateportCity_PokemonFanClub_EventScript_209F3B msgbox SlateportCity_PokemonFanClub_Text_20A62A, MSGBOX_DEFAULT goto SlateportCity_PokemonFanClub_EventScript_209F45 @@ -59,7 +59,7 @@ SlateportCity_PokemonFanClub_EventScript_209F45:: @ 8209F45 end SlateportCity_PokemonFanClub_EventScript_209FCA:: @ 8209FCA - setvar VAR_0x40B7, 2 + setvar VAR_SLATEPORT_FAN_CLUB_STATE, 2 return SlateportCity_PokemonFanClub_EventScript_209FD0:: @ 8209FD0 @@ -211,14 +211,14 @@ SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3 playse SE_PIN - applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_272598 + applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_27259A + applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 msgbox SlateportCity_PokemonFanClub_Text_20AB63, MSGBOX_DEFAULT giveitem_std ITEM_SOOTHE_BELL compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SOOTHE_BELL release end diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc index adf1bd3a2..6c554387a 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc @@ -8,11 +8,11 @@ SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40 goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_207FD9 goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_207FBA msgbox SlateportCity_SternsShipyard_1F_Text_208008, MSGBOX_DEFAULT - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_2080A5, MSGBOX_DEFAULT closemessage - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_DOCK_REJECTED_DEVON_GOODS setflag FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA @@ -20,31 +20,31 @@ SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40 end SlateportCity_SternsShipyard_1F_EventScript_207F92:: @ 8207F92 - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_208323, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FA6:: @ 8207FA6 - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_2082A8, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FBA:: @ 8207FBA - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_2081A5, MSGBOX_DEFAULT closemessage - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FD9:: @ 8207FD9 - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_208213, MSGBOX_DEFAULT releaseall diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index 76ababed8..183c3ce46 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -358,7 +358,7 @@ "y": 29, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -366,7 +366,7 @@ "y": 31, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -374,7 +374,7 @@ "y": 31, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -382,7 +382,7 @@ "y": 29, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 1cd4611e9..98c9af1ee 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -1,9 +1,9 @@ SootopolisCity_MapScripts:: @ 81E565C - map_script 1, SootopolisCity_MapScript1_1E5676 - map_script 3, SootopolisCity_MapScript1_1E56EF - map_script 5, SootopolisCity_MapScript1_1E590B - map_script 2, SootopolisCity_MapScript2_1E5914 - map_script 4, SootopolisCity_MapScript2_1E58DB + map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_MapScript1_1E5676 + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MapScript1_1E56EF + map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_MapScript1_1E590B + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MapScript2_1E5914 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_MapScript2_1E58DB .byte 0 SootopolisCity_MapScript1_1E5676: @ 81E5676 @@ -110,7 +110,7 @@ SootopolisCity_EventScript_1E5805:: @ 81E5805 compare VAR_0x40CA, 1 goto_if_eq SootopolisCity_EventScript_1E583E compare VAR_0x40CA, 1 - goto_if_le SootopolisCity_EventScript_27207A + goto_if_le Common_EventScript_SetWeather15 return SootopolisCity_EventScript_1E583D:: @ 81E583D @@ -214,13 +214,13 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946 special RemoveCameraObject delay 60 fadescreenspeed 1, 8 - setweather WEATHER_15 + setweather WEATHER_ALTERNATING doweather setvar VAR_0x8004, 0 special sub_813B7D8 waitstate - applymovement 10, SootopolisCity_Movement_2725A4 - applymovement 9, SootopolisCity_Movement_2725A8 + applymovement 10, Common_Movement_WalkInPlaceLeft + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 delay 60 waitse @@ -314,13 +314,13 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82 special RemoveCameraObject delay 60 fadescreenspeed 1, 8 - setweather WEATHER_15 + setweather WEATHER_ALTERNATING doweather setvar VAR_0x8004, 0 special sub_813B7D8 waitstate - applymovement 10, SootopolisCity_Movement_2725A4 - applymovement 9, SootopolisCity_Movement_2725A8 + applymovement 10, Common_Movement_WalkInPlaceLeft + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 delay 60 waitse @@ -730,7 +730,7 @@ SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8 goto_if_eq SootopolisCity_EventScript_1E5F10 msgbox SootopolisCity_Text_1E6BFF, MSGBOX_DEFAULT closemessage - applymovement 3, SootopolisCity_Movement_2725A2 + applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -751,7 +751,7 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_SOOTOPOLIS_RECEIVED_BERRY msgbox SootopolisCity_Text_2A7C7C, MSGBOX_DEFAULT random 2 @@ -764,7 +764,7 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B SootopolisCity_EventScript_1E5F79:: @ 81E5F79 giveitem_std ITEM_FIGY_BERRY compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT release end @@ -772,7 +772,7 @@ SootopolisCity_EventScript_1E5F79:: @ 81E5F79 SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A giveitem_std ITEM_IAPAPA_BERRY compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT release end @@ -792,13 +792,13 @@ SootopolisCity_EventScript_1E5FD8:: @ 81E5FD8 SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2 lockall - applymovement 2, SootopolisCity_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E600D msgbox SootopolisCity_Text_1E71A1, MSGBOX_DEFAULT closemessage - applymovement 2, SootopolisCity_Movement_2725A2 + applymovement 2, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -838,7 +838,7 @@ SootopolisCity_EventScript_1E6038:: @ 81E6038 SootopolisCity_EventScript_1E6065:: @ 81E6065 msgbox SootopolisCity_Text_1E7078, MSGBOX_DEFAULT closemessage - applymovement 8, SootopolisCity_Movement_2725A2 + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -855,7 +855,7 @@ SootopolisCity_EventScript_1E6084:: @ 81E6084 SootopolisCity_EventScript_1E608E:: @ 81E608E lockall - applymovement 4, SootopolisCity_Movement_27259E + applymovement 4, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E60D9 @@ -865,7 +865,7 @@ SootopolisCity_EventScript_1E608E:: @ 81E608E goto_if_le SootopolisCity_EventScript_1E60CF msgbox SootopolisCity_Text_1E690B, MSGBOX_DEFAULT closemessage - applymovement 4, SootopolisCity_Movement_2725A2 + applymovement 4, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -882,7 +882,7 @@ SootopolisCity_EventScript_1E60D9:: @ 81E60D9 SootopolisCity_EventScript_1E60E3:: @ 81E60E3 lockall - applymovement 5, SootopolisCity_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E612D @@ -893,7 +893,7 @@ SootopolisCity_EventScript_1E60E3:: @ 81E60E3 goto_if_le SootopolisCity_EventScript_1E6141 msgbox SootopolisCity_Text_1E6692, MSGBOX_DEFAULT closemessage - applymovement 5, SootopolisCity_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -927,7 +927,7 @@ EventScript_ClosedSootopolisDoor:: @ 81E615D SootopolisCity_EventScript_1E6166:: @ 81E6166 lockall - applymovement 7, SootopolisCity_Movement_27259E + applymovement 7, Common_Movement_FacePlayer waitmovement 0 call_if_unset FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_1E61CC compare VAR_0x405E, 2 @@ -1261,13 +1261,13 @@ SootopolisCity_Movement_1E635A: @ 81E635A SootopolisCity_EventScript_1E635D:: @ 81E635D lockall - applymovement 15, SootopolisCity_Movement_27259E + applymovement 15, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E6388 msgbox SootopolisCity_Text_1E67DC, MSGBOX_DEFAULT closemessage - applymovement 15, SootopolisCity_Movement_2725A2 + applymovement 15, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -1284,17 +1284,17 @@ SootopolisCity_EventScript_1E6393:: @ 81E6393 goto_if_eq SootopolisCity_EventScript_1E63C7 msgbox SootopolisCity_Text_1E6936, MSGBOX_DEFAULT closemessage - applymovement 14, SootopolisCity_Movement_27259E + applymovement 14, Common_Movement_FacePlayer waitmovement 0 msgbox SootopolisCity_Text_1E696C, MSGBOX_DEFAULT closemessage - applymovement 14, SootopolisCity_Movement_2725A2 + applymovement 14, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end SootopolisCity_EventScript_1E63C7:: @ 81E63C7 - applymovement 14, SootopolisCity_Movement_27259E + applymovement 14, Common_Movement_FacePlayer waitmovement 0 msgbox SootopolisCity_Text_1E69B8, MSGBOX_DEFAULT releaseall @@ -1302,13 +1302,13 @@ SootopolisCity_EventScript_1E63C7:: @ 81E63C7 SootopolisCity_EventScript_1E63DB:: @ 81E63DB lockall - applymovement 13, SootopolisCity_Movement_27259E + applymovement 13, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E6406 msgbox SootopolisCity_Text_1E6C7C, MSGBOX_DEFAULT closemessage - applymovement 13, SootopolisCity_Movement_2725A2 + applymovement 13, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -1321,13 +1321,13 @@ SootopolisCity_EventScript_1E6406:: @ 81E6406 SootopolisCity_EventScript_1E6411:: @ 81E6411 lockall - applymovement 12, SootopolisCity_Movement_27259E + applymovement 12, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E643C msgbox SootopolisCity_Text_1E6A50, MSGBOX_DEFAULT closemessage - applymovement 12, SootopolisCity_Movement_2725A2 + applymovement 12, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -1435,7 +1435,7 @@ SootopolisCity_EventScript_1E654C:: @ 81E654C setflag FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE clearflag FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE clearflag FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE - setvar VAR_0x40B9, 2 + setvar VAR_MT_PYRE_STATE, 2 warpsilent MAP_SOOTOPOLIS_CITY, 255, 31, 34 waitstate releaseall diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 22cd864cf..06bc91f21 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -1,8 +1,8 @@ SootopolisCity_Gym_1F_MapScripts:: @ 8224E4C - map_script 2, SootopolisCity_Gym_1F_MapScript2_224ECB - map_script 5, SootopolisCity_Gym_1F_MapScript1_224E67 - map_script 1, SootopolisCity_Gym_1F_MapScript1_224E6A - map_script 3, SootopolisCity_Gym_1F_MapScript1_224E61 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_Gym_1F_MapScript2_224ECB + map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_Gym_1F_MapScript1_224E67 + map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_Gym_1F_MapScript1_224E6A + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_Gym_1F_MapScript1_224E61 .byte 0 SootopolisCity_Gym_1F_MapScript1_224E61: @ 8224E61 @@ -99,7 +99,7 @@ SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 message SootopolisCity_Gym_1F_Text_225598 waitmessage - call SootopolisCity_Gym_1F_EventScript_27207E + call Common_EventScript_PlayGymBadgeFanfare msgbox SootopolisCity_Gym_1F_Text_2255BE, MSGBOX_DEFAULT setflag FLAG_DEFEATED_SOOTOPOLIS_GYM setflag FLAG_BADGE08_GET @@ -125,7 +125,7 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 giveitem_std ITEM_TM03 compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_Gym_1F_EventScript_27205E + goto_if_eq Common_EventScript_BagIsFull msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM03 return @@ -133,7 +133,7 @@ SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 SootopolisCity_Gym_1F_EventScript_224FF7:: @ 8224FF7 giveitem_std ITEM_TM03 compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_Gym_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM03 release diff --git a/data/maps/SootopolisCity_House1/scripts.inc b/data/maps/SootopolisCity_House1/scripts.inc index 9dcc1031d..13b581c71 100644 --- a/data/maps/SootopolisCity_House1/scripts.inc +++ b/data/maps/SootopolisCity_House1/scripts.inc @@ -8,7 +8,7 @@ SootopolisCity_House1_EventScript_22694D:: @ 822694D msgbox SootopolisCity_House1_Text_2269A1, MSGBOX_DEFAULT giveitem_std ITEM_TM31 compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_House1_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM31 msgbox SootopolisCity_House1_Text_226A13, MSGBOX_DEFAULT release diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc index efa197c8d..0f175478a 100644 --- a/data/maps/SootopolisCity_House6/scripts.inc +++ b/data/maps/SootopolisCity_House6/scripts.inc @@ -28,7 +28,7 @@ SootopolisCity_House6_EventScript_226FA3:: @ 8226FA3 SootopolisCity_House6_EventScript_226FAD:: @ 8226FAD bufferdecorationname 1, 117 - msgbox gUnknown_08272B1A, MSGBOX_DEFAULT + msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT msgbox SootopolisCity_House6_Text_22704A, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index c85712d1d..c7ceb0a4f 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -1,6 +1,6 @@ SootopolisCity_MysteryEventsHouse_1F_MapScripts:: @ 8227953 - map_script 3, SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E - map_script 2, SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D .byte 0 SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E @@ -8,7 +8,7 @@ SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E special CallFrontierUtilFunc compare VAR_RESULT, 0 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D - compare VAR_0x40C0, 0 + compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 0 call_if_ne SootopolisCity_MysteryEventsHouse_1F_EventScript_227991 end @@ -25,9 +25,9 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991 return SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D: @ 822799D - map_script_2 VAR_0x40C0, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 - map_script_2 VAR_0x40C0, 2, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 - map_script_2 VAR_0x40C0, 3, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 + map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 + map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 + map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7 .2byte 0 SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 @@ -37,16 +37,16 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_227A21 waitmovement 0 moveobjectoffscreen 1 - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 - compare VAR_0x40C0, 1 + compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04 - compare VAR_0x40C0, 2 + compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D - compare VAR_0x40C0, 3 + compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16 special LoadPlayerParty - setvar VAR_0x40C0, 0 + setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 0 releaseall end @@ -102,7 +102,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 compare VAR_RESULT, 0 goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special LoadPlayerParty - call SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special SavePlayerParty diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc index 0de8651d7..374aa6270 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc @@ -1,6 +1,6 @@ SootopolisCity_MysteryEventsHouse_B1F_MapScripts:: @ 8227E4F - map_script 3, SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A - map_script 2, SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E .byte 0 SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A: @ 8227E5A @@ -40,19 +40,19 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 end SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF:: @ 8227ECF - setvar VAR_0x40C0, 3 + setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3 msgbox SootopolisCity_MysteryEventsHouse_B1F_Text_227D40, MSGBOX_DEFAULT return SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD:: @ 8227EDD - setvar VAR_0x40C0, 1 + setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1 special ShowFieldMessageStringVar4 waitmessage waitbuttonpress return SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8:: @ 8227EE8 - setvar VAR_0x40C0, 2 + setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2 special ShowFieldMessageStringVar4 waitmessage waitbuttonpress diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index 2e7e804ce..96f766f7b 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1 - map_script 3, SootopolisCity_PokemonCenter_1F_MapScript1_2264FC - map_script 5, SootopolisCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_MapScript1_2264FC + map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 SootopolisCity_PokemonCenter_1F_MapScript1_2264FC: @ 82264FC diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc index 43d8a9d2f..275fe3046 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ SootopolisCity_PokemonCenter_2F_MapScripts:: @ 822676D - map_script 2, SootopolisCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, SootopolisCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, SootopolisCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, SootopolisCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 SootopolisCity_PokemonCenter_2F_EventScript_226782:: @ 8226782 diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index 388410821..618ce864a 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -1,5 +1,5 @@ SouthernIsland_Exterior_MapScripts:: @ 82429C8 - map_script 3, SouthernIsland_Exterior_MapScript1_2429CE + map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Exterior_MapScript1_2429CE .byte 0 SouthernIsland_Exterior_MapScript1_2429CE: @ 82429CE @@ -14,7 +14,7 @@ SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 goto_if_eq SouthernIsland_Exterior_EventScript_242A17 msgbox SouthernIsland_Exterior_Text_2A6A5D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SouthernIsland_Exterior_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 4f8dba7e5..a24bc772f 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -1,6 +1,6 @@ SouthernIsland_Interior_MapScripts:: @ 8242A45 - map_script 5, SouthernIsland_Interior_MapScript1_242A50 - map_script 3, SouthernIsland_Interior_MapScript1_242A6E + map_script MAP_SCRIPT_ON_RESUME, SouthernIsland_Interior_MapScript1_242A50 + map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Interior_MapScript1_242A6E .byte 0 SouthernIsland_Interior_MapScript1_242A50: @ 8242A50 @@ -10,7 +10,7 @@ SouthernIsland_Interior_MapScript1_242A50: @ 8242A50 SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne SouthernIsland_Interior_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 2 return diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index a3164136d..3f892315d 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -1,6 +1,6 @@ TerraCave_End_MapScripts:: @ 823B0B0 - map_script 5, TerraCave_End_MapScript1_23B0BB - map_script 3, TerraCave_End_MapScript1_23B0D9 + map_script MAP_SCRIPT_ON_RESUME, TerraCave_End_MapScript1_23B0BB + map_script MAP_SCRIPT_ON_TRANSITION, TerraCave_End_MapScript1_23B0D9 .byte 0 TerraCave_End_MapScript1_23B0BB: @ 823B0BB @@ -10,7 +10,7 @@ TerraCave_End_MapScript1_23B0BB: @ 823B0BB TerraCave_End_EventScript_23B0C5:: @ 823B0C5 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne TerraCave_End_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject 1 return @@ -25,7 +25,7 @@ TerraCave_End_EventScript_23B0E3:: @ 823B0E3 TerraCave_End_EventScript_23B0EC:: @ 823B0EC lockall - applymovement EVENT_OBJ_ID_PLAYER, TerraCave_End_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 1, TerraCave_End_Movement_23B16E waitmovement 0 diff --git a/data/maps/TerraCave_Entrance/scripts.inc b/data/maps/TerraCave_Entrance/scripts.inc index b9a17701b..b9e3e5910 100644 --- a/data/maps/TerraCave_Entrance/scripts.inc +++ b/data/maps/TerraCave_Entrance/scripts.inc @@ -1,5 +1,5 @@ TerraCave_Entrance_MapScripts:: @ 823B0A6 - map_script 3, TerraCave_Entrance_MapScript1_23B0AC + map_script MAP_SCRIPT_ON_TRANSITION, TerraCave_Entrance_MapScript1_23B0AC .byte 0 TerraCave_Entrance_MapScript1_23B0AC: @ 823B0AC diff --git a/data/maps/TrainerHill_1F/scripts.inc b/data/maps/TrainerHill_1F/scripts.inc index 465a6d781..e726f8566 100644 --- a/data/maps/TrainerHill_1F/scripts.inc +++ b/data/maps/TrainerHill_1F/scripts.inc @@ -1,6 +1,6 @@ TrainerHill_1F_MapScripts:: @ 8268F71 - map_script 5, TrainerHill_1F_MapScript1_2C8336 - map_script 4, TrainerHill_1F_MapScript2_2C8372 - map_script 2, TrainerHill_1F_MapScript2_2C8381 + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_1F_MapScript1_2C8336 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_1F_MapScript2_2C8372 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_1F_MapScript2_2C8381 .byte 0 diff --git a/data/maps/TrainerHill_2F/scripts.inc b/data/maps/TrainerHill_2F/scripts.inc index ca8eeff72..dd1f356de 100644 --- a/data/maps/TrainerHill_2F/scripts.inc +++ b/data/maps/TrainerHill_2F/scripts.inc @@ -1,6 +1,6 @@ TrainerHill_2F_MapScripts:: @ 8268F81 - map_script 5, TrainerHill_2F_MapScript1_2C8336 - map_script 4, TrainerHill_2F_MapScript2_2C8372 - map_script 2, TrainerHill_2F_MapScript2_2C8381 + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_2F_MapScript1_2C8336 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_2F_MapScript2_2C8372 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_2F_MapScript2_2C8381 .byte 0 diff --git a/data/maps/TrainerHill_3F/scripts.inc b/data/maps/TrainerHill_3F/scripts.inc index 921a8d808..b4793f457 100644 --- a/data/maps/TrainerHill_3F/scripts.inc +++ b/data/maps/TrainerHill_3F/scripts.inc @@ -1,5 +1,5 @@ TrainerHill_3F_MapScripts:: @ 8268F91 - map_script 5, TrainerHill_3F_MapScript1_2C8336 - map_script 2, TrainerHill_3F_MapScript2_2C8381 + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_3F_MapScript1_2C8336 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_3F_MapScript2_2C8381 .byte 0 diff --git a/data/maps/TrainerHill_4F/scripts.inc b/data/maps/TrainerHill_4F/scripts.inc index 0f710152c..66b8ed3bb 100644 --- a/data/maps/TrainerHill_4F/scripts.inc +++ b/data/maps/TrainerHill_4F/scripts.inc @@ -1,5 +1,5 @@ TrainerHill_4F_MapScripts:: @ 8268F9C - map_script 5, TrainerHill_4F_MapScript1_2C8336 - map_script 2, TrainerHill_4F_MapScript2_2C8381 + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_4F_MapScript1_2C8336 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_4F_MapScript2_2C8381 .byte 0 diff --git a/data/maps/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc index c3a71d492..ecc48a9e9 100644 --- a/data/maps/TrainerHill_Elevator/scripts.inc +++ b/data/maps/TrainerHill_Elevator/scripts.inc @@ -1,5 +1,5 @@ TrainerHill_Elevator_MapScripts:: @ 826934F - map_script 2, TrainerHill_Elevator_MapScript2_269355 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Elevator_MapScript2_269355 .byte 0 TrainerHill_Elevator_MapScript2_269355: @ 8269355 diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 846b7f6c3..5339f49e3 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -1,9 +1,9 @@ TrainerHill_Entrance_MapScripts:: @ 82680AC - map_script 5, TrainerHill_Entrance_MapScript1_2680D0 - map_script 7, TrainerHill_Entrance_MapScript1_26811B - map_script 3, TrainerHill_Entrance_MapScript1_2680C6 - map_script 1, TrainerHill_Entrance_MapScript1_268128 - map_script 2, TrainerHill_Entrance_MapScript2_26813E + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Entrance_MapScript1_2680D0 + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerHill_Entrance_MapScript1_26811B + map_script MAP_SCRIPT_ON_TRANSITION, TrainerHill_Entrance_MapScript1_2680C6 + map_script MAP_SCRIPT_ON_LOAD, TrainerHill_Entrance_MapScript1_268128 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Entrance_MapScript2_26813E .byte 0 TrainerHill_Entrance_MapScript1_2680C6: @ 82680C6 @@ -194,7 +194,7 @@ TrainerHill_Entrance_EventScript_26832E:: @ 826832E setvar VAR_0x8004, 14 special CallTrainerHillFunction setvar VAR_TEMP_5, 1 - call TrainerHill_Entrance_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq TrainerHill_Entrance_EventScript_26835C setvar VAR_0x8004, 14 diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc index b959481f2..fc1ca200f 100644 --- a/data/maps/TrainerHill_Roof/scripts.inc +++ b/data/maps/TrainerHill_Roof/scripts.inc @@ -1,6 +1,6 @@ TrainerHill_Roof_MapScripts:: @ 8268FA7 - map_script 5, TrainerHill_Roof_MapScript1_2C8336 - map_script 2, TrainerHill_Roof_MapScript2_2C8381 + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Roof_MapScript1_2C8336 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Roof_MapScript2_2C8381 .byte 0 TrainerHill_Roof_EventScript_268FB2:: @ 8268FB2 diff --git a/data/maps/Underwater3/scripts.inc b/data/maps/Underwater3/scripts.inc index 463f7a0ff..99f0efcf0 100644 --- a/data/maps/Underwater3/scripts.inc +++ b/data/maps/Underwater3/scripts.inc @@ -1,5 +1,5 @@ Underwater3_MapScripts:: @ 81F7724 - map_script 5, Underwater3_MapScript1_1F772A + map_script MAP_SCRIPT_ON_RESUME, Underwater3_MapScript1_1F772A .byte 0 Underwater3_MapScript1_1F772A: @ 81F772A diff --git a/data/maps/Underwater5/scripts.inc b/data/maps/Underwater5/scripts.inc index 9d0cc373c..ea37514eb 100644 --- a/data/maps/Underwater5/scripts.inc +++ b/data/maps/Underwater5/scripts.inc @@ -1,5 +1,5 @@ Underwater5_MapScripts:: @ 81F7731 - map_script 5, Underwater5_MapScript1_1F7737 + map_script MAP_SCRIPT_ON_RESUME, Underwater5_MapScript1_1F7737 .byte 0 Underwater5_MapScript1_1F7737: @ 81F7737 diff --git a/data/maps/Underwater6/scripts.inc b/data/maps/Underwater6/scripts.inc index 047628c9c..fee91dc75 100644 --- a/data/maps/Underwater6/scripts.inc +++ b/data/maps/Underwater6/scripts.inc @@ -1,5 +1,5 @@ Underwater6_MapScripts:: @ 81F773D - map_script 5, Underwater6_MapScript1_1F7743 + map_script MAP_SCRIPT_ON_RESUME, Underwater6_MapScript1_1F7743 .byte 0 Underwater6_MapScript1_1F7743: @ 81F7743 diff --git a/data/maps/Underwater7/scripts.inc b/data/maps/Underwater7/scripts.inc index dd757f98a..a0eba386a 100644 --- a/data/maps/Underwater7/scripts.inc +++ b/data/maps/Underwater7/scripts.inc @@ -1,5 +1,5 @@ Underwater7_MapScripts:: @ 81F7749 - map_script 5, Underwater7_MapScript1_1F774F + map_script MAP_SCRIPT_ON_RESUME, Underwater7_MapScript1_1F774F .byte 0 Underwater7_MapScript1_1F774F: @ 81F774F diff --git a/data/maps/Underwater_MarineCave/scripts.inc b/data/maps/Underwater_MarineCave/scripts.inc index d6a3aa0db..9309d51f4 100644 --- a/data/maps/Underwater_MarineCave/scripts.inc +++ b/data/maps/Underwater_MarineCave/scripts.inc @@ -1,6 +1,6 @@ Underwater_MarineCave_MapScripts:: @ 823AFB8 - map_script 5, Underwater_MarineCave_MapScript1_23AFC7 - map_script 3, Underwater_MarineCave_MapScript1_23AFC3 + map_script MAP_SCRIPT_ON_RESUME, Underwater_MarineCave_MapScript1_23AFC7 + map_script MAP_SCRIPT_ON_TRANSITION, Underwater_MarineCave_MapScript1_23AFC3 .byte 0 Underwater_MarineCave_MapScript1_23AFC3: @ 823AFC3 diff --git a/data/maps/Underwater_Route134/scripts.inc b/data/maps/Underwater_Route134/scripts.inc index 786de1757..acffa23a2 100644 --- a/data/maps/Underwater_Route134/scripts.inc +++ b/data/maps/Underwater_Route134/scripts.inc @@ -1,5 +1,5 @@ Underwater_Route134_MapScripts:: @ 82390B5 - map_script 5, Underwater_Route134_MapScript1_2390BB + map_script MAP_SCRIPT_ON_RESUME, Underwater_Route134_MapScript1_2390BB .byte 0 Underwater_Route134_MapScript1_2390BB: @ 82390BB diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc index efd2e9438..9dc5b406a 100644 --- a/data/maps/Underwater_SeafloorCavern/scripts.inc +++ b/data/maps/Underwater_SeafloorCavern/scripts.inc @@ -1,7 +1,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 823433B - map_script 5, Underwater_SeafloorCavern_MapScript1_2343D3 - map_script 3, Underwater_SeafloorCavern_MapScript1_23434B - map_script 1, Underwater_SeafloorCavern_MapScript1_23435C + map_script MAP_SCRIPT_ON_RESUME, Underwater_SeafloorCavern_MapScript1_2343D3 + map_script MAP_SCRIPT_ON_TRANSITION, Underwater_SeafloorCavern_MapScript1_23434B + map_script MAP_SCRIPT_ON_LOAD, Underwater_SeafloorCavern_MapScript1_23435C .byte 0 Underwater_SeafloorCavern_MapScript1_23434B: @ 823434B diff --git a/data/maps/Underwater_SealedChamber/scripts.inc b/data/maps/Underwater_SealedChamber/scripts.inc index de6ed50d1..9ec884781 100644 --- a/data/maps/Underwater_SealedChamber/scripts.inc +++ b/data/maps/Underwater_SealedChamber/scripts.inc @@ -1,5 +1,5 @@ Underwater_SealedChamber_MapScripts:: @ 82390C4 - map_script 6, Underwater_SealedChamber_MapScript1_2390CA + map_script MAP_SCRIPT_ON_DIVE_WARP, Underwater_SealedChamber_MapScript1_2390CA .byte 0 Underwater_SealedChamber_MapScript1_2390CA: @ 82390CA diff --git a/data/maps/Underwater_SootopolisCity/scripts.inc b/data/maps/Underwater_SootopolisCity/scripts.inc index cbeefcb1d..d5040dba0 100644 --- a/data/maps/Underwater_SootopolisCity/scripts.inc +++ b/data/maps/Underwater_SootopolisCity/scripts.inc @@ -1,5 +1,5 @@ Underwater_SootopolisCity_MapScripts:: @ 822D94C - map_script 5, Underwater_SootopolisCity_MapScript1_22D952 + map_script MAP_SCRIPT_ON_RESUME, Underwater_SootopolisCity_MapScript1_22D952 .byte 0 Underwater_SootopolisCity_MapScript1_22D952: @ 822D952 diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc index f71c40e3d..0871ae033 100644 --- a/data/maps/UnionRoom/scripts.inc +++ b/data/maps/UnionRoom/scripts.inc @@ -1,6 +1,6 @@ UnionRoom_MapScripts:: @ 823D1A6 - map_script 5, UnionRoom_MapScript1_23D1B1 - map_script 3, UnionRoom_MapScript1_23D1E5 + map_script MAP_SCRIPT_ON_RESUME, UnionRoom_MapScript1_23D1B1 + map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_MapScript1_23D1E5 .byte 0 UnionRoom_MapScript1_23D1B1: @ 823D1B1 diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index 3f8f4fe45..7aef48724 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -137,7 +137,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "VerdanturfTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -153,7 +153,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "VerdanturfTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -169,7 +169,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "VerdanturfTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -177,7 +177,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "VerdanturfTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index c929633dd..bd2bce048 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -1,10 +1,10 @@ VerdanturfTown_MapScripts:: @ 81EB566 - map_script 3, VerdanturfTown_MapScript1_1EB56C + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_MapScript1_1EB56C .byte 0 VerdanturfTown_MapScript1_1EB56C: @ 81EB56C setflag FLAG_VISITED_VERDANTURF_TOWN - setvar VAR_0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 end VerdanturfTown_EventScript_1EB575:: @ 81EB575 @@ -12,14 +12,14 @@ VerdanturfTown_EventScript_1EB575:: @ 81EB575 faceplayer goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_1EB594 msgbox VerdanturfTown_Text_1EB5FD, MSGBOX_DEFAULT - applymovement 2, VerdanturfTown_Movement_2725A2 + applymovement 2, Common_Movement_FaceOriginalDirection waitmovement 0 release end VerdanturfTown_EventScript_1EB594:: @ 81EB594 msgbox VerdanturfTown_Text_1EB6E0, MSGBOX_DEFAULT - applymovement 2, VerdanturfTown_Movement_2725A2 + applymovement 2, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index 52aed7618..9d98e790c 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -1,7 +1,7 @@ VerdanturfTown_BattleTentBattleRoom_MapScripts:: @ 82022FA - map_script 3, VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A - map_script 2, VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E - map_script 4, VerdanturfTown_BattleTentBattleRoom_MapScript2_202541 + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A + map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_BattleTentBattleRoom_MapScript2_202541 .byte 0 VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A: @ 820230A @@ -77,8 +77,8 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_202581 waitmovement 0 removeobject 2 - applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725AA - applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, MSGBOX_DEFAULT special LoadPlayerParty @@ -121,8 +121,8 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8:: @ 82024B8 case 127, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA:: @ 82024EA - applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725A8 - applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A8 + applymovement 3, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 closemessage goto VerdanturfTown_BattleTentBattleRoom_EventScript_20236F diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc index e5d7e45e9..907ef3fd6 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc @@ -1,5 +1,5 @@ VerdanturfTown_BattleTentCorridor_MapScripts:: @ 820208A - map_script 2, VerdanturfTown_BattleTentCorridor_MapScript2_202090 + map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentCorridor_MapScript2_202090 .byte 0 VerdanturfTown_BattleTentCorridor_MapScript2_202090: @ 8202090 diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index df56f41ed..f6bb194a3 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -1,6 +1,6 @@ VerdanturfTown_BattleTentLobby_MapScripts:: @ 82016D0 - map_script 2, VerdanturfTown_BattleTentLobby_MapScript2_2016EF - map_script 4, VerdanturfTown_BattleTentLobby_MapScript2_2016DB + map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentLobby_MapScript2_2016EF + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_BattleTentLobby_MapScript2_2016DB .byte 0 VerdanturfTown_BattleTentLobby_MapScript2_2016DB: @ 82016DB @@ -192,7 +192,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954 special LoadPlayerParty closemessage delay 2 - call VerdanturfTown_BattleTentLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_201A1D @@ -281,7 +281,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, MSGBOX_DEFAULT giveitem_std ITEM_TM45 compare VAR_RESULT, 0 - goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM45 msgbox VerdanturfTown_BattleTentLobby_Text_201E43, MSGBOX_DEFAULT release diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc index da8676aec..474448132 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8202726 - map_script 3, VerdanturfTown_PokemonCenter_1F_MapScript1_202731 - map_script 5, VerdanturfTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_1F_MapScript1_202731 + map_script MAP_SCRIPT_ON_RESUME, VerdanturfTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 VerdanturfTown_PokemonCenter_1F_MapScript1_202731: @ 8202731 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc index 9e93a628e..b09335fb2 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ VerdanturfTown_PokemonCenter_2F_MapScripts:: @ 8202897 - map_script 2, VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, VerdanturfTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 VerdanturfTown_PokemonCenter_2F_EventScript_2028AC:: @ 82028AC diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 65636a49e..05eb2b795 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -175,7 +175,7 @@ "x": 2, "y": 23, "elevation": 4, - "var": "VAR_0x40C3", + "var": "VAR_VICTORY_ROAD_1F_STATE", "var_value": "0", "script": "VictoryRoad_1F_EventScript_235DAF" }, @@ -184,7 +184,7 @@ "x": 3, "y": 23, "elevation": 4, - "var": "VAR_0x40C3", + "var": "VAR_VICTORY_ROAD_1F_STATE", "var_value": "0", "script": "VictoryRoad_1F_EventScript_235DC8" } diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 2d1c63027..96f3c6f42 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -1,11 +1,11 @@ VictoryRoad_1F_MapScripts:: @ 8235D7A - map_script 3, VictoryRoad_1F_MapScript1_235D80 + map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_MapScript1_235D80 .byte 0 VictoryRoad_1F_MapScript1_235D80: @ 8235D80 - compare VAR_0x40C3, 1 + compare VAR_VICTORY_ROAD_1F_STATE, 1 call_if_eq VictoryRoad_1F_EventScript_235D97 - compare VAR_0x40C3, 2 + compare VAR_VICTORY_ROAD_1F_STATE, 2 call_if_eq VictoryRoad_1F_EventScript_235DA3 end @@ -38,7 +38,7 @@ VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8 end VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 - applymovement EVENT_OBJ_ID_PLAYER, VictoryRoad_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox VictoryRoad_1F_Text_235EE6, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_235FFC @@ -46,7 +46,7 @@ VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 clearflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY moveobjectoffscreen 4 setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD - copyvar VAR_0x40C3, VAR_0x8008 + copyvar VAR_VICTORY_ROAD_1F_STATE, VAR_0x8008 releaseall end diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index aa904b0bf..24a075181 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -1,5 +1,6 @@ #include "constants/flags.h" #include "constants/items.h" +#include "constants/map_scripts.h" #include "constants/moves.h" #include "constants/songs.h" #include "constants/species.h" diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 5c413a7c1..645ba92b0 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -101,14 +101,14 @@ RustboroCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C SlateportCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C SootopolisCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C - map_script_2 VAR_0x4087, 1, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_0x4087, 2, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_0x4087, 5, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_0x4087, 3, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_0x4087, 4, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_0x4087, 6, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_0x4087, 7, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_0x4087, 8, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 3, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 4, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 6, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 7, OldaleTown_PokemonCenter_2F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, 8, OldaleTown_PokemonCenter_2F_EventScript_276BAE .2byte 0 MossdeepCity_GameCorner_1F_EventScript_276BAE:: @ 8276BAE @@ -138,21 +138,21 @@ RustboroCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE SlateportCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE SootopolisCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE - compare VAR_0x4087, 1 + compare VAR_CABLE_CLUB_STATE, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare VAR_0x4087, 2 + compare VAR_CABLE_CLUB_STATE, 2 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare VAR_0x4087, 5 + compare VAR_CABLE_CLUB_STATE, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare VAR_0x4087, 3 + compare VAR_CABLE_CLUB_STATE, 3 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C1D - compare VAR_0x4087, 4 + compare VAR_CABLE_CLUB_STATE, 4 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C23 - compare VAR_0x4087, 6 + compare VAR_CABLE_CLUB_STATE, 6 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C29 - compare VAR_0x4087, 7 + compare VAR_CABLE_CLUB_STATE, 7 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C2F - compare VAR_0x4087, 8 + compare VAR_CABLE_CLUB_STATE, 8 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C35 end @@ -198,14 +198,14 @@ SlateportCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B SootopolisCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B map_script_2 VAR_0x40CD, 1, OldaleTown_PokemonCenter_2F_EventScript_276DE0 - map_script_2 VAR_0x4087, 1, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_0x4087, 2, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_0x4087, 5, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_0x4087, 3, OldaleTown_PokemonCenter_2F_EventScript_276CE7 - map_script_2 VAR_0x4087, 4, OldaleTown_PokemonCenter_2F_EventScript_276D2C - map_script_2 VAR_0x4087, 6, OldaleTown_PokemonCenter_2F_EventScript_276D6C - map_script_2 VAR_0x4087, 7, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_0x4087, 8, OldaleTown_PokemonCenter_2F_EventScript_276C9D + map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276C85 + map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_276C85 + map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_276C85 + map_script_2 VAR_CABLE_CLUB_STATE, 3, OldaleTown_PokemonCenter_2F_EventScript_276CE7 + map_script_2 VAR_CABLE_CLUB_STATE, 4, OldaleTown_PokemonCenter_2F_EventScript_276D2C + map_script_2 VAR_CABLE_CLUB_STATE, 6, OldaleTown_PokemonCenter_2F_EventScript_276D6C + map_script_2 VAR_CABLE_CLUB_STATE, 7, OldaleTown_PokemonCenter_2F_EventScript_276C85 + map_script_2 VAR_CABLE_CLUB_STATE, 8, OldaleTown_PokemonCenter_2F_EventScript_276C9D .2byte 0 OldaleTown_PokemonCenter_2F_EventScript_276C85:: @ 8276C85 @@ -231,7 +231,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276C9D:: @ 8276C9D OldaleTown_PokemonCenter_2F_EventScript_276CB5:: @ 8276CB5 special CloseLink - setvar VAR_0x4087, 0 + setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D @@ -254,7 +254,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276CE7:: @ 8276CE7 OldaleTown_PokemonCenter_2F_EventScript_276CFF:: @ 8276CFF special CloseLink - setvar VAR_0x4087, 0 + setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E @@ -276,7 +276,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D2C:: @ 8276D2C OldaleTown_PokemonCenter_2F_EventScript_276D44:: @ 8276D44 special CloseLink - setvar VAR_0x4087, 0 + setvar VAR_CABLE_CLUB_STATE, 0 applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F waitmovement 0 compare VAR_0x8007, 0 @@ -298,7 +298,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D6C:: @ 8276D6C end OldaleTown_PokemonCenter_2F_EventScript_276D84:: @ 8276D84 - setvar VAR_0x4087, 0 + setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E @@ -328,7 +328,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276DD5:: @ 8276DD5 OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0 lockall - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox OldaleTown_PokemonCenter_2F_Text_27964A, MSGBOX_DEFAULT closemessage @@ -425,7 +425,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F55:: @ 8276F55 end OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60 - call OldaleTown_PokemonCenter_2F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC message gText_PleaseWaitForLink @@ -450,7 +450,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD special HealPlayerParty special SavePlayerParty special LoadPlayerBag - copyvar VAR_0x4087, VAR_0x8004 + copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197 waitmessage call OldaleTown_PokemonCenter_2F_EventScript_277BE4 @@ -527,7 +527,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2 call OldaleTown_PokemonCenter_2F_EventScript_277199 compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - call OldaleTown_PokemonCenter_2F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC message gText_PleaseWaitForLink @@ -554,7 +554,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2 OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A setvar VAR_0x8004, 3 - copyvar VAR_0x4087, VAR_0x8004 + copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197 waitmessage call OldaleTown_PokemonCenter_2F_EventScript_277BE4 @@ -602,7 +602,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2771CD:: @ 82771CD OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB copyvar VAR_0x8007, VAR_LAST_TALKED - call OldaleTown_PokemonCenter_2F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC message gText_PleaseWaitForLink @@ -629,7 +629,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C setvar VAR_0x8004, 4 - copyvar VAR_0x4087, VAR_0x8004 + copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197 waitmessage call OldaleTown_PokemonCenter_2F_EventScript_277BE4 @@ -1025,14 +1025,14 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F call OldaleTown_PokemonCenter_2F_EventScript_277626 compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - call OldaleTown_PokemonCenter_2F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC msgbox OldaleTown_PokemonCenter_2F_Text_27961C, MSGBOX_DEFAULT closemessage special HealPlayerParty setvar VAR_0x8004, 6 - copyvar VAR_0x4087, VAR_0x8004 + copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 call OldaleTown_PokemonCenter_2F_EventScript_277BBE special DrawWholeMapView playse SE_TK_KASYA @@ -1236,7 +1236,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277923:: @ 8277923 end OldaleTown_PokemonCenter_2F_EventScript_277931:: @ 8277931 - call OldaleTown_PokemonCenter_2F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC switch VAR_0x8004 @@ -1515,7 +1515,7 @@ MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9 waitstate compare VAR_0x8004, 6 goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9 - call MossdeepCity_GameCorner_1F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 setvar VAR_0x8004, 4 @@ -1534,7 +1534,7 @@ MossdeepCity_GameCorner_1F_EventScript_277D35:: @ 8277D35 waitstate compare VAR_0x8004, 6 goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9 - call MossdeepCity_GameCorner_1F_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 setvar VAR_0x8004, 6 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index f85ebd3d2..6c19cdc0c 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -1,7 +1,7 @@ LilycoveCity_ContestLobby_EventScript_279CC5:: @ 8279CC5 lock faceplayer - compare VAR_0x408A, 0 + compare VAR_CONTEST_PRIZE_PICKUP, 0 goto_if_ne LilycoveCity_ContestLobby_EventScript_279D13 call_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_279CEA call_if_unset FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_279CF3 @@ -21,7 +21,7 @@ LilycoveCity_ContestLobby_EventScript_279CF3:: @ 8279CF3 LilycoveCity_ContestLobby_EventScript_279D13:: @ 8279D13 msgbox LilycoveCity_ContestLobby_Text_27B67B, MSGBOX_DEFAULT - switch VAR_0x408A + switch VAR_CONTEST_PRIZE_PICKUP case 4, LilycoveCity_ContestLobby_EventScript_279D2C end @@ -29,13 +29,13 @@ LilycoveCity_ContestLobby_EventScript_279D2C:: @ 8279D2C giveitem_std ITEM_LUXURY_BALL compare VAR_RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_279D4B - setvar VAR_0x408A, 0 + setvar VAR_CONTEST_PRIZE_PICKUP, 0 closemessage release end LilycoveCity_ContestLobby_EventScript_279D4B:: @ 8279D4B - call LilycoveCity_ContestLobby_EventScript_27205E + call Common_EventScript_BagIsFull msgbox LilycoveCity_ContestLobby_Text_27B6E7, MSGBOX_DEFAULT release end @@ -181,7 +181,7 @@ LilycoveCity_ContestLobby_EventScript_279F87:: @ 8279F87 msgbox LilycoveCity_ContestLobby_Text_27B5E2, MSGBOX_DEFAULT closemessage releaseall - setvar VAR_0x4086, 1 + setvar VAR_LINK_CONTEST_ROOM_STATE, 1 return LinkContestRoom1_EventScript_279F97:: @ 8279F97 @@ -204,7 +204,7 @@ LinkContestRoom1_EventScript_279F97:: @ 8279F97 call LinkContestRoom1_EventScript_27A9D4 call LinkContestRoom1_EventScript_27AA1B call LinkContestRoom1_EventScript_27AB36 - setvar VAR_0x4086, 2 + setvar VAR_LINK_CONTEST_ROOM_STATE, 2 return LinkContestRoom1_EventScript_279FF2:: @ 8279FF2 @@ -271,7 +271,7 @@ LinkContestRoom1_EventScript_27A097:: @ 827A097 return LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A0C7 lockall msgbox LinkContestRoom1_Text_27B711, MSGBOX_DEFAULT @@ -391,7 +391,7 @@ LinkContestRoom1_EventScript_27A1D2:: @ 827A1D2 return LinkContestRoom1_EventScript_27A217:: @ 827A217 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A229 message LinkContestRoom1_Text_27B815 waitmessage @@ -419,7 +419,7 @@ LinkContestRoom1_EventScript_27A230:: @ 827A230 return LinkContestRoom1_EventScript_27A26C:: @ 827A26C - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A280 msgbox LinkContestRoom1_Text_27B830, MSGBOX_DEFAULT return @@ -445,7 +445,7 @@ LinkContestRoom1_EventScript_27A297:: @ 827A297 return LinkContestRoom1_EventScript_27A2B9:: @ 827A2B9 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A2CA message LinkContestRoom1_Text_27B8F2 return @@ -483,15 +483,15 @@ LinkContestRoom1_EventScript_27A2D5:: @ 827A2D5 LinkContestRoom1_EventScript_27A34F:: @ 827A34F special sub_80F82FC - compare VAR_0x4088, 1 + compare VAR_CONTEST_LOCATION, 1 call_if_eq LinkContestRoom1_EventScript_27A454 - compare VAR_0x4088, 2 + compare VAR_CONTEST_LOCATION, 2 call_if_eq LinkContestRoom1_EventScript_27A4B2 - compare VAR_0x4088, 3 + compare VAR_CONTEST_LOCATION, 3 call_if_eq LinkContestRoom1_EventScript_27A510 - compare VAR_0x4088, 4 + compare VAR_CONTEST_LOCATION, 4 call_if_eq LinkContestRoom1_EventScript_27A56E - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 call_if_eq LinkContestRoom1_EventScript_27A5CC setvar VAR_TEMP_1, 9 setvar VAR_TEMP_2, 9 @@ -843,7 +843,7 @@ LinkContestRoom1_EventScript_27A801:: @ 827A801 return LinkContestRoom1_EventScript_27A853:: @ 827A853 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A867 msgbox LinkContestRoom1_Text_27B904, MSGBOX_DEFAULT return @@ -893,7 +893,7 @@ LinkContestRoom1_EventScript_27A8A5:: @ 827A8A5 return LinkContestRoom1_EventScript_27A8FB:: @ 827A8FB - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A90F msgbox LinkContestRoom1_Text_27BA15, MSGBOX_DEFAULT return @@ -906,7 +906,7 @@ LinkContestRoom1_EventScript_27A90F:: @ 827A90F return LinkContestRoom1_EventScript_27A91E:: @ 827A91E - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A932 msgbox LinkContestRoom1_Text_27BA30, MSGBOX_DEFAULT return @@ -919,7 +919,7 @@ LinkContestRoom1_EventScript_27A932:: @ 827A932 return LinkContestRoom1_EventScript_27A941:: @ 827A941 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A955 msgbox LinkContestRoom1_Text_27BAAC, MSGBOX_DEFAULT return @@ -932,7 +932,7 @@ LinkContestRoom1_EventScript_27A955:: @ 827A955 return LinkContestRoom1_EventScript_27A964:: @ 827A964 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27A978 msgbox LinkContestRoom1_Text_27BB25, MSGBOX_DEFAULT return @@ -983,7 +983,7 @@ LinkContestRoom1_EventScript_27A9D4:: @ 827A9D4 return LinkContestRoom1_EventScript_27AA00:: @ 827AA00 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27AA14 msgbox LinkContestRoom1_Text_27BB4C, MSGBOX_DEFAULT return @@ -996,7 +996,7 @@ LinkContestRoom1_EventScript_27AA14:: @ 827AA14 LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B addvar VAR_TEMP_1, 1 lockall - compare VAR_0x4088, 1 + compare VAR_CONTEST_LOCATION, 1 call_if_gt LinkContestRoom1_EventScript_27AA6F applymovement 9, LinkContestRoom1_Movement_27AD3B applymovement 12, LinkContestRoom1_Movement_27AD3F @@ -1081,7 +1081,7 @@ LinkContestRoom1_EventScript_27AA6F:: @ 827AA6F return LinkContestRoom1_EventScript_27AB36:: @ 827AB36 - compare VAR_0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_27ABD8 call LinkContestRoom1_EventScript_27AB9E goto_if_set FLAG_TEMP_2, LinkContestRoom1_EventScript_27AB82 @@ -1135,7 +1135,7 @@ LinkContestRoom1_EventScript_27ABCE:: @ 827ABCE return LinkContestRoom1_EventScript_27ABD2:: @ 827ABD2 - setvar VAR_0x4099, 1 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 return LinkContestRoom1_EventScript_27ABD8:: @ 827ABD8 @@ -1149,7 +1149,7 @@ LinkContestRoom1_EventScript_27ABD8:: @ 827ABD8 return LinkContestRoom1_EventScript_27ABF1:: @ 827ABF1 - setvar VAR_0x4099, 2 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2 return LinkContestRoom1_EventScript_27ABF7:: @ 827ABF7 @@ -1201,7 +1201,7 @@ LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E return LinkContestRoom1_EventScript_27AC77:: @ 827AC77 - compare VAR_0x4088, 2 + compare VAR_CONTEST_LOCATION, 2 call_if_eq LinkContestRoom1_EventScript_27ABCE specialvar VAR_RESULT, sub_80F7F7C compare VAR_RESULT, 0 @@ -1215,10 +1215,10 @@ LinkContestRoom1_EventScript_27AC77:: @ 827AC77 LinkContestRoom1_EventScript_27ACA8:: @ 827ACA8 lockall - call LinkContestRoom1_EventScript_27205E + call Common_EventScript_BagIsFull msgbox LinkContestRoom1_Text_27BC2F, MSGBOX_DEFAULT releaseall - setvar VAR_0x408A, 4 + setvar VAR_CONTEST_PRIZE_PICKUP, 4 return LinkContestRoom1_EventScript_27ACBD:: @ 827ACBD diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 39de44ba6..ee0e533bc 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, Route111_Movement_2725A6 + applymovement VAR_0x8005, Common_Movement_WalkInPlaceUp waitmovement 0 return Route111_EventScript_28CFB1:: @ 828CFB1 applymovement VAR_0x8004, Route111_Movement_28D051 - applymovement VAR_0x8005, Route111_Movement_2725A4 + applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index eb29ef6e0..306157561 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -1,12 +1,12 @@ LittlerootTown_BrendansHouse_2F_EventScript_2926FE:: @ 82926FE LittlerootTown_MaysHouse_2F_EventScript_2926FE:: @ 82926FE - setvar VAR_0x4092, 5 + setvar VAR_LITTLEROOT_INTRO_STATE, 5 return LittlerootTown_BrendansHouse_1F_EventScript_292704:: @ 8292704 LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_27259E + applymovement VAR_0x8004, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x8005, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_29274D @@ -14,20 +14,20 @@ LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292758 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, MSGBOX_DEFAULT closemessage - setvar VAR_0x4092, 4 + setvar VAR_LITTLEROOT_INTRO_STATE, 4 applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292763 - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end LittlerootTown_BrendansHouse_1F_EventScript_29274D:: @ 829274D - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft 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, LittlerootTown_BrendansHouse_1F_Movement_2725A6 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AF0 waitmovement 0 releaseall @@ -63,7 +63,7 @@ LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799 msgbox LittlerootTown_BrendansHouse_2F_Text_1F8668, MSGBOX_DEFAULT call LittlerootTown_BrendansHouse_2F_EventScript_292849 delay 30 - setvar VAR_0x4092, 6 + setvar VAR_LITTLEROOT_INTRO_STATE, 6 setflag FLAG_SET_WALL_CLOCK setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 @@ -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, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight 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, LittlerootTown_BrendansHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT closemessage @@ -149,12 +149,12 @@ LittlerootTown_BrendansHouse_2F_Movement_292862: @ 8292862 LittlerootTown_BrendansHouse_1F_EventScript_292866:: @ 8292866 LittlerootTown_MaysHouse_1F_EventScript_292866:: @ 8292866 - setvar VAR_0x4092, 7 + setvar VAR_LITTLEROOT_INTRO_STATE, 7 releaseall end LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement VAR_0x8005, Common_Movement_WalkInPlaceRight 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, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft 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, LittlerootTown_MaysHouse_1F_Movement_2725A4 + applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft 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, LittlerootTown_MaysHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, MSGBOX_DEFAULT @@ -206,9 +206,9 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC LittlerootTown_BrendansHouse_1F_EventScript_29294B:: @ 829294B LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B playse SE_PIN - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_272598 + applymovement VAR_0x8005, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_27259A + applymovement VAR_0x8005, Common_Movement_Delay48 waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B96, MSGBOX_DEFAULT closemessage @@ -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, LittlerootTown_BrendansHouse_1F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, MSGBOX_DEFAULT fadedefaultbgm @@ -313,15 +313,15 @@ LittlerootTown_BrendansHouse_1F_EventScript_2929C5:: @ 82929C5 LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5 lock faceplayer - compare VAR_0x4082, 4 + compare VAR_LITTLEROOT_HOUSES_STATE, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F - compare VAR_0x408C, 4 + compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F goto_if_set FLAG_HAS_MATCH_CALL, LittlerootTown_BrendansHouse_1F_EventScript_292A19 goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_BrendansHouse_1F_EventScript_292A86 compare VAR_TEMP_1, 1 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94 - compare VAR_0x4092, 7 + compare VAR_LITTLEROOT_INTRO_STATE, 7 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292AB0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT release @@ -355,7 +355,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A51:: @ 8292A51 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, MSGBOX_DEFAULT giveitem_std ITEM_AMULET_COIN compare VAR_RESULT, 0 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT setflag FLAG_MOM_SAYS_GOODBYE release @@ -373,7 +373,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A94:: @ 8292A94 LittlerootTown_BrendansHouse_1F_EventScript_292A9E:: @ 8292A9E closemessage - call LittlerootTown_BrendansHouse_1F_EventScript_272083 + call Common_EventScript_OutOfCenterPartyHeal incrementgamestat 16 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D5C, MSGBOX_DEFAULT release @@ -446,12 +446,12 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D08 compare VAR_0x8008, 1 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D13 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_27259E + applymovement VAR_0x8009, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_272598 + applymovement VAR_0x8009, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_27259A + applymovement VAR_0x8009, Common_Movement_Delay48 waitmovement 0 delay 20 compare VAR_0x8008, 0 @@ -513,8 +513,8 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 copyvar VAR_0x40D5, VAR_RESULT msgbox LittlerootTown_BrendansHouse_1F_Text_1F83A1, MSGBOX_DEFAULT closemessage - setvar VAR_0x4082, 4 - setvar VAR_0x408C, 4 + setvar VAR_LITTLEROOT_HOUSES_STATE, 4 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4 releaseall end @@ -585,28 +585,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, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement VAR_0x800A, Common_Movement_WalkInPlaceLeft waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D33:: @ 8292D33 applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DDE waitmovement 0 - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement VAR_0x800A, Common_Movement_WalkInPlaceRight waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D48:: @ 8292D48 applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292999 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D5D:: @ 8292D5D applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_29299B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -623,14 +623,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, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929B3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index c2a580a61..a26ecb4c9 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -333,7 +333,7 @@ EventScript_Pblock1_NoPokeblock: @ 8293D43 LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D lockall setvar VAR_0x8009, 2 - applymovement 10, LilycoveCity_ContestLobby_Movement_2725A2 + applymovement 10, Common_Movement_FaceOriginalDirection applymovement 3, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_293201, MSGBOX_YESNO @@ -398,8 +398,8 @@ LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E lockall setvar VAR_0x8008, 15 setvar VAR_0x8009, 3 - applymovement 9, LilycoveCity_ContestLobby_Movement_2725A2 - applymovement 17, LilycoveCity_ContestLobby_Movement_2725A2 + applymovement 9, Common_Movement_FaceOriginalDirection + applymovement 17, Common_Movement_FaceOriginalDirection applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_YESNO @@ -602,7 +602,7 @@ EventScript_PblocLink_NoBerries: @ 82940B1 end EventScript_PblocLink_TryConnect: @ 82940BB - call LilycoveCity_ContestLobby_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq EventScript_PblocLink_End specialvar VAR_RESULT, IsWirelessAdapterConnected diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 1fcf5d166..3539e0970 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -1,11 +1,11 @@ EventScript_2A4B4C:: @ 82A4B4C - setvar VAR_0x40A4, 1 + setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 end EventScript_2A4B5D:: @ 82A4B5D - setvar VAR_0x40A4, 1 + setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index db8aece85..770bc9a5b 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -660,7 +660,7 @@ SecretBase_RedCave1_EventScript_275DD6:: @ 8275DD6 goto_if_eq SecretBase_RedCave1_EventScript_275E2F setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_275E2F msgbox SecretBase_RedCave1_Text_274939, MSGBOX_DEFAULT @@ -696,7 +696,7 @@ SecretBase_RedCave1_EventScript_275E4E:: @ 8275E4E goto_if_eq SecretBase_RedCave1_EventScript_275EA7 setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_275EA7 msgbox SecretBase_RedCave1_Text_274CB0, MSGBOX_DEFAULT @@ -732,7 +732,7 @@ SecretBase_RedCave1_EventScript_275EC6:: @ 8275EC6 goto_if_eq SecretBase_RedCave1_EventScript_275F1F setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_275F1F msgbox SecretBase_RedCave1_Text_274FCA, MSGBOX_DEFAULT @@ -768,7 +768,7 @@ SecretBase_RedCave1_EventScript_275F3E:: @ 8275F3E goto_if_eq SecretBase_RedCave1_EventScript_275F97 setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_275F97 msgbox SecretBase_RedCave1_Text_275315, MSGBOX_DEFAULT @@ -804,7 +804,7 @@ SecretBase_RedCave1_EventScript_275FB6:: @ 8275FB6 goto_if_eq SecretBase_RedCave1_EventScript_27600F setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_27600F msgbox SecretBase_RedCave1_Text_275679, MSGBOX_DEFAULT @@ -840,7 +840,7 @@ SecretBase_RedCave1_EventScript_27602E:: @ 827602E goto_if_eq SecretBase_RedCave1_EventScript_276087 setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_276087 msgbox SecretBase_RedCave1_Text_274AFA, MSGBOX_DEFAULT @@ -876,7 +876,7 @@ SecretBase_RedCave1_EventScript_2760A6:: @ 82760A6 goto_if_eq SecretBase_RedCave1_EventScript_2760FF setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_2760FF msgbox SecretBase_RedCave1_Text_274E41, MSGBOX_DEFAULT @@ -912,7 +912,7 @@ SecretBase_RedCave1_EventScript_27611E:: @ 827611E goto_if_eq SecretBase_RedCave1_EventScript_276177 setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_276177 msgbox SecretBase_RedCave1_Text_2751AF, MSGBOX_DEFAULT @@ -948,7 +948,7 @@ SecretBase_RedCave1_EventScript_276196:: @ 8276196 goto_if_eq SecretBase_RedCave1_EventScript_2761EF setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_2761EF msgbox SecretBase_RedCave1_Text_2754B2, MSGBOX_DEFAULT @@ -984,7 +984,7 @@ SecretBase_RedCave1_EventScript_27620E:: @ 827620E goto_if_eq SecretBase_RedCave1_EventScript_276267 setvar VAR_RESULT, 1 special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F + call Common_EventScript_SaveGame compare VAR_RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_276267 msgbox SecretBase_RedCave1_Text_275884, MSGBOX_DEFAULT diff --git a/data/specials.inc b/data/specials.inc index 8437e5cd2..69eef4b77 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -503,7 +503,7 @@ gSpecials:: @ 81DBA64 def_special sub_813B374 def_special sub_813B490 def_special sub_80A08CC - def_special sub_813B484 + def_special Unused_SetWeatherSunny def_special sub_81AFDA0 def_special sub_813B4E0 def_special ShouldDoBrailleRegicePuzzle diff --git a/data/text/easy_chat/easy_chat_group_actions.s b/data/text/easy_chat/easy_chat_group_actions.s deleted file mode 100644 index 432323e95..000000000 --- a/data/text/easy_chat/easy_chat_group_actions.s +++ /dev/null @@ -1,547 +0,0 @@ -gEasyChatWord_Meets:: @ 859B058 - .string "MEETS$" - -gEasyChatWord_Concede:: @ 859B05E - .string "CONCEDE$" - -gEasyChatWord_Give:: @ 859B066 - .string "GIVE$" - -gEasyChatWord_Gives:: @ 859B06B - .string "GIVES$" - -gEasyChatWord_Played:: @ 859B071 - .string "PLAYED$" - -gEasyChatWord_Plays:: @ 859B078 - .string "PLAYS$" - -gEasyChatWord_Collect:: @ 859B07E - .string "COLLECT$" - -gEasyChatWord_Walking:: @ 859B086 - .string "WALKING$" - -gEasyChatWord_Walks:: @ 859B08E - .string "WALKS$" - -gEasyChatWord_Says:: @ 859B094 - .string "SAYS$" - -gEasyChatWord_Went:: @ 859B099 - .string "WENT$" - -gEasyChatWord_Said:: @ 859B09E - .string "SAID$" - -gEasyChatWord_WakeUp:: @ 859B0A3 - .string "WAKE UP$" - -gEasyChatWord_WakesUp:: @ 859B0AB - .string "WAKES UP$" - -gEasyChatWord_Angers:: @ 859B0B4 - .string "ANGERS$" - -gEasyChatWord_Teach:: @ 859B0BB - .string "TEACH$" - -gEasyChatWord_Teaches:: @ 859B0C1 - .string "TEACHES$" - -gEasyChatWord_Please:: @ 859B0C9 - .string "PLEASE$" - -gEasyChatWord_Learn:: @ 859B0D0 - .string "LEARN$" - -gEasyChatWord_Change:: @ 859B0D6 - .string "CHANGE$" - -gEasyChatWord_Story:: @ 859B0DD - .string "STORY$" - -gEasyChatWord_Trust:: @ 859B0E3 - .string "TRUST$" - -gEasyChatWord_Lavish:: @ 859B0E9 - .string "LAVISH$" - -gEasyChatWord_Listens:: @ 859B0F0 - .string "LISTENS$" - -gEasyChatWord_Hearing:: @ 859B0F8 - .string "HEARING$" - -gEasyChatWord_Trains:: @ 859B100 - .string "TRAINS$" - -gEasyChatWord_Choose:: @ 859B107 - .string "CHOOSE$" - -gEasyChatWord_Come:: @ 859B10E - .string "COME$" - -gEasyChatWord_Came:: @ 859B113 - .string "CAME$" - -gEasyChatWord_Search:: @ 859B118 - .string "SEARCH$" - -gEasyChatWord_Make:: @ 859B11F - .string "MAKE$" - -gEasyChatWord_Cause:: @ 859B124 - .string "CAUSE$" - -gEasyChatWord_Know:: @ 859B12A - .string "KNOW$" - -gEasyChatWord_Knows:: @ 859B12F - .string "KNOWS$" - -gEasyChatWord_Refuse:: @ 859B135 - .string "REFUSE$" - -gEasyChatWord_Stores:: @ 859B13C - .string "STORES$" - -gEasyChatWord_Brag:: @ 859B143 - .string "BRAG$" - -gEasyChatWord_Ignorant:: @ 859B148 - .string "IGNORANT$" - -gEasyChatWord_Thinks:: @ 859B151 - .string "THINKS$" - -gEasyChatWord_Believe:: @ 859B158 - .string "BELIEVE$" - -gEasyChatWord_Slide:: @ 859B160 - .string "SLIDE$" - -gEasyChatWord_Eats:: @ 859B166 - .string "EATS$" - -gEasyChatWord_Use:: @ 859B16B - .string "USE$" - -gEasyChatWord_Uses:: @ 859B16F - .string "USES$" - -gEasyChatWord_Using:: @ 859B174 - .string "USING$" - -gEasyChatWord_Couldnt:: @ 859B17A - .string "COULDN'T$" - -gEasyChatWord_Capable:: @ 859B183 - .string "CAPABLE$" - -gEasyChatWord_Disappear:: @ 859B18B - .string "DISAPPEAR$" - -gEasyChatWord_Appear:: @ 859B195 - .string "APPEAR$" - -gEasyChatWord_Throw:: @ 859B19C - .string "THROW$" - -gEasyChatWord_Worry:: @ 859B1A2 - .string "WORRY$" - -gEasyChatWord_Slept:: @ 859B1A8 - .string "SLEPT$" - -gEasyChatWord_Sleep:: @ 859B1AE - .string "SLEEP$" - -gEasyChatWord_Release:: @ 859B1B4 - .string "RELEASE$" - -gEasyChatWord_Drinks:: @ 859B1BC - .string "DRINKS$" - -gEasyChatWord_Runs:: @ 859B1C3 - .string "RUNS$" - -gEasyChatWord_Run:: @ 859B1C8 - .string "RUN$" - -gEasyChatWord_Works:: @ 859B1CC - .string "WORKS$" - -gEasyChatWord_Working:: @ 859B1D2 - .string "WORKING$" - -gEasyChatWord_Talking:: @ 859B1DA - .string "TALKING$" - -gEasyChatWord_Talk:: @ 859B1E2 - .string "TALK$" - -gEasyChatWord_Sink:: @ 859B1E7 - .string "SINK$" - -gEasyChatWord_Smack:: @ 859B1EC - .string "SMACK$" - -gEasyChatWord_Pretend:: @ 859B1F2 - .string "PRETEND$" - -gEasyChatWord_Praise:: @ 859B1FA - .string "PRAISE$" - -gEasyChatWord_Overdo:: @ 859B201 - .string "OVERDO$" - -gEasyChatWord_Show:: @ 859B208 - .string "SHOW$" - -gEasyChatWord_Looks:: @ 859B20D - .string "LOOKS$" - -gEasyChatWord_Sees:: @ 859B213 - .string "SEES$" - -gEasyChatWord_Seek:: @ 859B218 - .string "SEEK$" - -gEasyChatWord_Own:: @ 859B21D - .string "OWN$" - -gEasyChatWord_Take:: @ 859B221 - .string "TAKE$" - -gEasyChatWord_Allow:: @ 859B226 - .string "ALLOW$" - -gEasyChatWord_Forget:: @ 859B22C - .string "FORGET$" - -gEasyChatWord_Forgets:: @ 859B233 - .string "FORGETS$" - -gEasyChatWord_Appears:: @ 859B23B - .string "APPEARS$" - -gEasyChatWord_Faint:: @ 859B243 - .string "FAINT$" - -gEasyChatWord_Fainted:: @ 859B249 - .string "FAINTED$" - - .align 2 -gEasyChatGroup_Actions:: @ 859B254 - .4byte gEasyChatWord_Meets - .4byte 72 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Concede - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Give - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gives - .4byte 75 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Played - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Plays - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Collect - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Walking - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Walks - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Says - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Went - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Said - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WakeUp - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WakesUp - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Angers - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Teach - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Teaches - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Please - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Learn - .4byte 76 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Change - .4byte 77 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Story - .4byte 73 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Trust - .4byte 74 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lavish - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Listens - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hearing - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Trains - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Choose - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Come - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Came - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Search - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Make - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cause - .4byte 67 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Know - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Knows - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Refuse - .4byte 65 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Stores - .4byte 70 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Brag - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ignorant - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Thinks - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Believe - .4byte 64 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Slide - .4byte 63 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Eats - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Use - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Uses - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Using - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Couldnt - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Capable - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Disappear - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Appear - .4byte 69 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Throw - .4byte 68 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Worry - .4byte 66 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Slept - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sleep - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Release - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Drinks - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Runs - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Run - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Works - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Working - .4byte 71 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Talking - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Talk - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sink - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Smack - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pretend - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Praise - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Overdo - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Show - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Looks - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sees - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Seek - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Own - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Take - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Allow - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Forget - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Forgets - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Appears - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Faint - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fainted - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_adjectives.s b/data/text/easy_chat/easy_chat_group_adjectives.s deleted file mode 100644 index 08142d41c..000000000 --- a/data/text/easy_chat/easy_chat_group_adjectives.s +++ /dev/null @@ -1,253 +0,0 @@ -gEasyChatWord_Wandering:: @ 859C3B8 - .string "WANDERING$" - -gEasyChatWord_Rickety:: @ 859C3C2 - .string "RICKETY$" - -gEasyChatWord_RockSolid:: @ 859C3CA - .string "ROCK-SOLID$" - -gEasyChatWord_Hungry:: @ 859C3D5 - .string "HUNGRY$" - -gEasyChatWord_Tight:: @ 859C3DC - .string "TIGHT$" - -gEasyChatWord_Ticklish:: @ 859C3E2 - .string "TICKLISH$" - -gEasyChatWord_Twirling:: @ 859C3EB - .string "TWIRLING$" - -gEasyChatWord_Spiraling:: @ 859C3F4 - .string "SPIRALING$" - -gEasyChatWord_Thirsty:: @ 859C3FE - .string "THIRSTY$" - -gEasyChatWord_Lolling:: @ 859C406 - .string "LOLLING$" - -gEasyChatWord_Silky:: @ 859C40E - .string "SILKY$" - -gEasyChatWord_Sadly:: @ 859C414 - .string "SADLY$" - -gEasyChatWord_Hopeless:: @ 859C41A - .string "HOPELESS$" - -gEasyChatWord_Useless:: @ 859C423 - .string "USELESS$" - -gEasyChatWord_Drooling:: @ 859C42B - .string "DROOLING$" - -gEasyChatWord_Exciting:: @ 859C434 - .string "EXCITING$" - -gEasyChatWord_Thick:: @ 859C43D - .string "THICK$" - -gEasyChatWord_Smooth:: @ 859C443 - .string "SMOOTH$" - -gEasyChatWord_Slimy:: @ 859C44A - .string "SLIMY$" - -gEasyChatWord_Thin:: @ 859C450 - .string "THIN$" - -gEasyChatWord_Break:: @ 859C455 - .string "BREAK$" - -gEasyChatWord_Voracious:: @ 859C45B - .string "VORACIOUS$" - -gEasyChatWord_Scatter:: @ 859C465 - .string "SCATTER$" - -gEasyChatWord_Awesome:: @ 859C46D - .string "AWESOME$" - -gEasyChatWord_Wimpy:: @ 859C475 - .string "WIMPY$" - -gEasyChatWord_Wobbly:: @ 859C47B - .string "WOBBLY$" - -gEasyChatWord_Shaky:: @ 859C482 - .string "SHAKY$" - -gEasyChatWord_Ripped:: @ 859C488 - .string "RIPPED$" - -gEasyChatWord_Shredded:: @ 859C48F - .string "SHREDDED$" - -gEasyChatWord_Increasing:: @ 859C498 - .string "INCREASING$" - -gEasyChatWord_Yet:: @ 859C4A3 - .string "YET$" - -gEasyChatWord_Destroyed:: @ 859C4A7 - .string "DESTROYED$" - -gEasyChatWord_Fiery:: @ 859C4B1 - .string "FIERY$" - -gEasyChatWord_LoveyDovey:: @ 859C4B7 - .string "LOVEY-DOVEY$" - -gEasyChatWord_Happily:: @ 859C4C3 - .string "HAPPILY$" - -gEasyChatWord_Anticipation:: @ 859C4CB - .string "ANTICIPATION$" - - .align 2 -gEasyChatGroup_Adjectives:: @ 859C4D8 - .4byte gEasyChatWord_Wandering - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rickety - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_RockSolid - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hungry - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tight - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ticklish - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Twirling - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Spiraling - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Thirsty - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lolling - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Silky - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sadly - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hopeless - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Useless - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Drooling - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Exciting - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Thick - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Smooth - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Slimy - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Thin - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Break - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Voracious - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Scatter - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Awesome - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wimpy - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wobbly - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shaky - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ripped - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shredded - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Increasing - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yet - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Destroyed - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fiery - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_LoveyDovey - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Happily - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Anticipation - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_battle.s b/data/text/easy_chat/easy_chat_group_battle.s deleted file mode 100644 index 1f1175980..000000000 --- a/data/text/easy_chat/easy_chat_group_battle.s +++ /dev/null @@ -1,442 +0,0 @@ -gEasyChatWord_MatchUp:: @ 8598B3C - .string "MATCH UP$" - -gEasyChatWord_Go:: @ 8598B45 - .string "GO$" - -gEasyChatWord_No1:: @ 8598B48 - .string "NO. 1$" - -gEasyChatWord_Decide:: @ 8598B4E - .string "DECIDE$" - -gEasyChatWord_LetMeWin:: @ 8598B55 - .string "LET ME WIN$" - -gEasyChatWord_Wins:: @ 8598B60 - .string "WINS$" - -gEasyChatWord_Win:: @ 8598B65 - .string "WIN$" - -gEasyChatWord_Won:: @ 8598B69 - .string "WON$" - -gEasyChatWord_IfIWin:: @ 8598B6D - .string "IF I WIN$" - -gEasyChatWord_WhenIWin:: @ 8598B76 - .string "WHEN I WIN$" - -gEasyChatWord_CantWin:: @ 8598B81 - .string "CAN'T WIN$" - -gEasyChatWord_CanWin:: @ 8598B8B - .string "CAN WIN$" - -gEasyChatWord_NoMatch:: @ 8598B93 - .string "NO MATCH$" - -gEasyChatWord_Spirit:: @ 8598B9C - .string "SPIRIT$" - -gEasyChatWord_Decided:: @ 8598BA3 - .string "DECIDED$" - -gEasyChatWord_TrumpCard:: @ 8598BAB - .string "TRUMP CARD$" - -gEasyChatWord_TakeThat:: @ 8598BB6 - .string "TAKE THAT$" - -gEasyChatWord_ComeOn:: @ 8598BC0 - .string "COME ON$" - -gEasyChatWord_Attack:: @ 8598BC8 - .string "ATTACK$" - -gEasyChatWord_Surrender:: @ 8598BCF - .string "SURRENDER$" - -gEasyChatWord_Gutsy:: @ 8598BD9 - .string "GUTSY$" - -gEasyChatWord_Talent:: @ 8598BDF - .string "TALENT$" - -gEasyChatWord_Strategy:: @ 8598BE6 - .string "STRATEGY$" - -gEasyChatWord_Smite:: @ 8598BEF - .string "SMITE$" - -gEasyChatWord_Match:: @ 8598BF5 - .string "MATCH$" - -gEasyChatWord_Victory:: @ 8598BFB - .string "VICTORY$" - -gEasyChatWord_Offensive:: @ 8598C03 - .string "OFFENSIVE$" - -gEasyChatWord_Sense:: @ 8598C0D - .string "SENSE$" - -gEasyChatWord_Versus:: @ 8598C13 - .string "VERSUS$" - -gEasyChatWord_Fights:: @ 8598C1A - .string "FIGHTS$" - -gEasyChatWord_Power:: @ 8598C21 - .string "POWER$" - -gEasyChatWord_Challenge:: @ 8598C27 - .string "CHALLENGE$" - -gEasyChatWord_Strong:: @ 8598C31 - .string "STRONG$" - -gEasyChatWord_TooStrong:: @ 8598C38 - .string "TOO STRONG$" - -gEasyChatWord_GoEasy:: @ 8598C43 - .string "GO EASY$" - -gEasyChatWord_Foe:: @ 8598C4B - .string "FOE$" - -gEasyChatWord_Genius:: @ 8598C4F - .string "GENIUS$" - -gEasyChatWord_Legend:: @ 8598C56 - .string "LEGEND$" - -gEasyChatWord_Escape:: @ 8598C5D - .string "ESCAPE$" - -gEasyChatWord_Aim:: @ 8598C64 - .string "AIM$" - -gEasyChatWord_Battle:: @ 8598C68 - .string "BATTLE$" - -gEasyChatWord_Fight:: @ 8598C6F - .string "FIGHT$" - -gEasyChatWord_Resuscitate:: @ 8598C75 - .string "RESUSCITATE$" - -gEasyChatWord_Points:: @ 8598C81 - .string "POINTS$" - -gEasyChatWord_Serious:: @ 8598C88 - .string "SERIOUS$" - -gEasyChatWord_GiveUp:: @ 8598C90 - .string "GIVE UP$" - -gEasyChatWord_Loss:: @ 8598C98 - .string "LOSS$" - -gEasyChatWord_IfILose:: @ 8598C9D - .string "IF I LOSE$" - -gEasyChatWord_Lost:: @ 8598CA7 - .string "LOST$" - -gEasyChatWord_Lose:: @ 8598CAC - .string "LOSE$" - -gEasyChatWord_Guard:: @ 8598CB1 - .string "GUARD$" - -gEasyChatWord_Partner:: @ 8598CB7 - .string "PARTNER$" - -gEasyChatWord_Reject:: @ 8598CBF - .string "REJECT$" - -gEasyChatWord_Accept:: @ 8598CC6 - .string "ACCEPT$" - -gEasyChatWord_Invincible:: @ 8598CCD - .string "INVINCIBLE$" - -gEasyChatWord_Received:: @ 8598CD8 - .string "RECEIVED$" - -gEasyChatWord_Easy:: @ 8598CE1 - .string "EASY$" - -gEasyChatWord_Weak:: @ 8598CE6 - .string "WEAK$" - -gEasyChatWord_TooWeak:: @ 8598CEB - .string "TOO WEAK$" - -gEasyChatWord_Pushover:: @ 8598CF4 - .string "PUSHOVER$" - -gEasyChatWord_Leader:: @ 8598CFD - .string "LEADER$" - -gEasyChatWord_Rule:: @ 8598D04 - .string "RULE$" - -gEasyChatWord_Move:: @ 8598D09 - .string "MOVE$" - - .align 2 -gEasyChatGroup_Battle:: @ 8598D10 - .4byte gEasyChatWord_MatchUp - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Go - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_No1 - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Decide - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_LetMeWin - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wins - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Win - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Won - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_IfIWin - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WhenIWin - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_CantWin - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_CanWin - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_NoMatch - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Spirit - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Decided - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_TrumpCard - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_TakeThat - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ComeOn - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Attack - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Surrender - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gutsy - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Talent - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Strategy - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Smite - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Match - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Victory - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Offensive - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sense - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Versus - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fights - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Power - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Challenge - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Strong - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_TooStrong - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_GoEasy - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Foe - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Genius - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Legend - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Escape - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Aim - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Battle - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fight - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Resuscitate - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Points - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Serious - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_GiveUp - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Loss - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_IfILose - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lost - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lose - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Guard - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Partner - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Reject - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Accept - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Invincible - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Received - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Easy - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Weak - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_TooWeak - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pushover - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Leader - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rule - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Move - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_conditions.s b/data/text/easy_chat/easy_chat_group_conditions.s deleted file mode 100644 index 2afbca020..000000000 --- a/data/text/easy_chat/easy_chat_group_conditions.s +++ /dev/null @@ -1,484 +0,0 @@ -gEasyChatWord_Hot:: @ 859AB2C - .string "HOT$" - -gEasyChatWord_Exists:: @ 859AB30 - .string "EXISTS$" - -gEasyChatWord_Excess:: @ 859AB37 - .string "EXCESS$" - -gEasyChatWord_Approved:: @ 859AB3E - .string "APPROVED$" - -gEasyChatWord_Has:: @ 859AB47 - .string "HAS$" - -gEasyChatWord_Good:: @ 859AB4B - .string "GOOD$" - -gEasyChatWord_Less:: @ 859AB50 - .string "LESS$" - -gEasyChatWord_Momentum:: @ 859AB55 - .string "MOMENTUM$" - -gEasyChatWord_Going:: @ 859AB5E - .string "GOING$" - -gEasyChatWord_Weird:: @ 859AB64 - .string "WEIRD$" - -gEasyChatWord_Busy:: @ 859AB6A - .string "BUSY$" - -gEasyChatWord_Together:: @ 859AB6F - .string "TOGETHER$" - -gEasyChatWord_Full:: @ 859AB78 - .string "FULL$" - -gEasyChatWord_Absent:: @ 859AB7D - .string "ABSENT$" - -gEasyChatWord_Being:: @ 859AB84 - .string "BEING$" - -gEasyChatWord_Need:: @ 859AB8A - .string "NEED$" - -gEasyChatWord_Tasty:: @ 859AB8F - .string "TASTY$" - -gEasyChatWord_Skilled:: @ 859AB95 - .string "SKILLED$" - -gEasyChatWord_Noisy:: @ 859AB9D - .string "NOISY$" - -gEasyChatWord_Big:: @ 859ABA3 - .string "BIG$" - -gEasyChatWord_Late:: @ 859ABA7 - .string "LATE$" - -gEasyChatWord_Close:: @ 859ABAC - .string "CLOSE$" - -gEasyChatWord_Docile:: @ 859ABB2 - .string "DOCILE$" - -gEasyChatWord_Amusing:: @ 859ABB9 - .string "AMUSING$" - -gEasyChatWord_Entertaining:: @ 859ABC1 - .string "ENTERTAINING$" - -gEasyChatWord_Perfection:: @ 859ABCE - .string "PERFECTION$" - -gEasyChatWord_Pretty:: @ 859ABD9 - .string "PRETTY$" - -gEasyChatWord_Healthy:: @ 859ABE0 - .string "HEALTHY$" - -gEasyChatWord_Excellent:: @ 859ABE8 - .string "EXCELLENT$" - -gEasyChatWord_UpsideDown:: @ 859ABF2 - .string "UPSIDE DOWN$" - -gEasyChatWord_Cold:: @ 859ABFE - .string "COLD$" - -gEasyChatWord_Refreshing:: @ 859AC03 - .string "REFRESHING$" - -gEasyChatWord_Unavoidable:: @ 859AC0E - .string "UNAVOIDABLE$" - -gEasyChatWord_Much:: @ 859AC1A - .string "MUCH$" - -gEasyChatWord_Overwhelming:: @ 859AC1F - .string "OVERWHELMING$" - -gEasyChatWord_Fabulous:: @ 859AC2C - .string "FABULOUS$" - -gEasyChatWord_Else:: @ 859AC35 - .string "ELSE$" - -gEasyChatWord_Expensive:: @ 859AC3A - .string "EXPENSIVE$" - -gEasyChatWord_Correct:: @ 859AC44 - .string "CORRECT$" - -gEasyChatWord_Impossible:: @ 859AC4C - .string "IMPOSSIBLE$" - -gEasyChatWord_Small:: @ 859AC57 - .string "SMALL$" - -gEasyChatWord_Different:: @ 859AC5D - .string "DIFFERENT$" - -gEasyChatWord_Tired:: @ 859AC67 - .string "TIRED$" - -gEasyChatWord_Skill:: @ 859AC6D - .string "SKILL$" - -gEasyChatWord_Top:: @ 859AC73 - .string "TOP$" - -gEasyChatWord_NonStop:: @ 859AC77 - .string "NON-STOP$" - -gEasyChatWord_Preposterous:: @ 859AC80 - .string "PREPOSTEROUS$" - -gEasyChatWord_None:: @ 859AC8D - .string "NONE$" - -gEasyChatWord_Nothing:: @ 859AC92 - .string "NOTHING$" - -gEasyChatWord_Natural:: @ 859AC9A - .string "NATURAL$" - -gEasyChatWord_Becomes:: @ 859ACA2 - .string "BECOMES$" - -gEasyChatWord_Lukewarm:: @ 859ACAA - .string "LUKEWARM$" - -gEasyChatWord_Fast:: @ 859ACB3 - .string "FAST$" - -gEasyChatWord_Low:: @ 859ACB8 - .string "LOW$" - -gEasyChatWord_Awful:: @ 859ACBC - .string "AWFUL$" - -gEasyChatWord_Alone:: @ 859ACC2 - .string "ALONE$" - -gEasyChatWord_Bored:: @ 859ACC8 - .string "BORED$" - -gEasyChatWord_Secret:: @ 859ACCE - .string "SECRET$" - -gEasyChatWord_Mystery:: @ 859ACD5 - .string "MYSTERY$" - -gEasyChatWord_Lacks:: @ 859ACDD - .string "LACKS$" - -gEasyChatWord_Best:: @ 859ACE3 - .string "BEST$" - -gEasyChatWord_Lousy:: @ 859ACE8 - .string "LOUSY$" - -gEasyChatWord_Mistake:: @ 859ACEE - .string "MISTAKE$" - -gEasyChatWord_Kind:: @ 859ACF6 - .string "KIND$" - -gEasyChatWord_Well:: @ 859ACFB - .string "WELL$" - -gEasyChatWord_Weakened:: @ 859AD00 - .string "WEAKENED$" - -gEasyChatWord_Simple:: @ 859AD09 - .string "SIMPLE$" - -gEasyChatWord_Seems:: @ 859AD10 - .string "SEEMS$" - -gEasyChatWord_Badly:: @ 859AD16 - .string "BADLY$" - - .align 2 -gEasyChatGroup_Conditions:: @ 859AD1C - .4byte gEasyChatWord_Hot - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Exists - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Excess - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Approved - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Has - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Good - .4byte 68 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Less - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Momentum - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Going - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Weird - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Busy - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Together - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Full - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Absent - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Being - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Need - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tasty - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Skilled - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Noisy - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Big - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Late - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Close - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Docile - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Amusing - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Entertaining - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Perfection - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pretty - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Healthy - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Excellent - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_UpsideDown - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cold - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Refreshing - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Unavoidable - .4byte 63 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Much - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Overwhelming - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fabulous - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Else - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Expensive - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Correct - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Impossible - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Small - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Different - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tired - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Skill - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Top - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_NonStop - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Preposterous - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_None - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nothing - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Natural - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Becomes - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lukewarm - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fast - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Low - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Awful - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Alone - .4byte 67 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Bored - .4byte 66 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Secret - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mystery - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lacks - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Best - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lousy - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mistake - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Kind - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Well - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Weakened - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Simple - .4byte 65 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Seems - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Badly - .4byte 64 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_endings.s b/data/text/easy_chat/easy_chat_group_endings.s deleted file mode 100644 index 4d79c9a69..000000000 --- a/data/text/easy_chat/easy_chat_group_endings.s +++ /dev/null @@ -1,484 +0,0 @@ -gEasyChatWord_Will:: @ 859A158 - .string "WILL$" - -gEasyChatWord_WillBeHere:: @ 859A15D - .string "WILL BE HERE$" - -gEasyChatWord_Or:: @ 859A16A - .string "OR$" - -gEasyChatWord_Times:: @ 859A16D - .string "TIMES$" - -gEasyChatWord_Wonder:: @ 859A173 - .string "WONDER$" - -gEasyChatWord_IsItQues:: @ 859A17A - .string "IS IT?$" - -gEasyChatWord_Be:: @ 859A181 - .string "BE$" - -gEasyChatWord_Gimme:: @ 859A184 - .string "GIMME$" - -gEasyChatWord_Could:: @ 859A18A - .string "COULD$" - -gEasyChatWord_LikelyTo:: @ 859A190 - .string "LIKELY TO$" - -gEasyChatWord_Would:: @ 859A19A - .string "WOULD$" - -gEasyChatWord_Is:: @ 859A1A0 - .string "IS$" - -gEasyChatWord_IsntItQues:: @ 859A1A3 - .string "ISN'T IT?$" - -gEasyChatWord_Lets:: @ 859A1AD - .string "LET'S$" - -gEasyChatWord_Other:: @ 859A1B3 - .string "OTHER$" - -gEasyChatWord_Are:: @ 859A1B9 - .string "ARE$" - -gEasyChatWord_Was:: @ 859A1BD - .string "WAS$" - -gEasyChatWord_Were:: @ 859A1C1 - .string "WERE$" - -gEasyChatWord_Those:: @ 859A1C6 - .string "THOSE$" - -gEasyChatWord_Isnt:: @ 859A1CC - .string "ISN'T$" - -gEasyChatWord_Wont:: @ 859A1D2 - .string "WON'T$" - -gEasyChatWord_Cant:: @ 859A1D8 - .string "CAN'T$" - -gEasyChatWord_Can:: @ 859A1DE - .string "CAN$" - -gEasyChatWord_Dont:: @ 859A1E2 - .string "DON'T$" - -gEasyChatWord_Do:: @ 859A1E8 - .string "DO$" - -gEasyChatWord_Does:: @ 859A1EB - .string "DOES$" - -gEasyChatWord_Whom:: @ 859A1F0 - .string "WHOM$" - -gEasyChatWord_Which:: @ 859A1F5 - .string "WHICH$" - -gEasyChatWord_Wasnt:: @ 859A1FB - .string "WASN'T$" - -gEasyChatWord_Werent:: @ 859A202 - .string "WEREN'T$" - -gEasyChatWord_Have:: @ 859A20A - .string "HAVE$" - -gEasyChatWord_Havent:: @ 859A20F - .string "HAVEN'T$" - -gEasyChatWord_A:: @ 859A217 - .string "A$" - -gEasyChatWord_An:: @ 859A219 - .string "AN$" - -gEasyChatWord_Not:: @ 859A21C - .string "NOT$" - -gEasyChatWord_There:: @ 859A220 - .string "THERE$" - -gEasyChatWord_OkQues:: @ 859A226 - .string "OK?$" - -gEasyChatWord_So:: @ 859A22A - .string "SO$" - -gEasyChatWord_Maybe:: @ 859A22D - .string "MAYBE$" - -gEasyChatWord_About:: @ 859A233 - .string "ABOUT$" - -gEasyChatWord_Over:: @ 859A239 - .string "OVER$" - -gEasyChatWord_It:: @ 859A23E - .string "IT$" - -gEasyChatWord_All:: @ 859A241 - .string "ALL$" - -gEasyChatWord_For:: @ 859A245 - .string "FOR$" - -gEasyChatWord_On:: @ 859A249 - .string "ON$" - -gEasyChatWord_Off:: @ 859A24C - .string "OFF$" - -gEasyChatWord_As:: @ 859A250 - .string "AS$" - -gEasyChatWord_To:: @ 859A253 - .string "TO$" - -gEasyChatWord_With:: @ 859A256 - .string "WITH$" - -gEasyChatWord_Better:: @ 859A25B - .string "BETTER$" - -gEasyChatWord_Ever:: @ 859A262 - .string "EVER$" - -gEasyChatWord_Since:: @ 859A267 - .string "SINCE$" - -gEasyChatWord_Of:: @ 859A26D - .string "OF$" - -gEasyChatWord_BelongsTo:: @ 859A270 - .string "BELONGS TO$" - -gEasyChatWord_At:: @ 859A27B - .string "AT$" - -gEasyChatWord_In:: @ 859A27E - .string "IN$" - -gEasyChatWord_Out:: @ 859A281 - .string "OUT$" - -gEasyChatWord_Too:: @ 859A285 - .string "TOO$" - -gEasyChatWord_Like:: @ 859A289 - .string "LIKE$" - -gEasyChatWord_Did:: @ 859A28E - .string "DID$" - -gEasyChatWord_Didnt:: @ 859A292 - .string "DIDN'T$" - -gEasyChatWord_Doesnt:: @ 859A299 - .string "DOESN'T$" - -gEasyChatWord_Without:: @ 859A2A1 - .string "WITHOUT$" - -gEasyChatWord_After:: @ 859A2A9 - .string "AFTER$" - -gEasyChatWord_Before:: @ 859A2AF - .string "BEFORE$" - -gEasyChatWord_While:: @ 859A2B6 - .string "WHILE$" - -gEasyChatWord_Than:: @ 859A2BC - .string "THAN$" - -gEasyChatWord_Once:: @ 859A2C1 - .string "ONCE$" - -gEasyChatWord_Anywhere:: @ 859A2C6 - .string "ANYWHERE$" - - .align 2 -gEasyChatGroup_Endings:: @ 859A2D0 - .4byte gEasyChatWord_Will - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WillBeHere - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Or - .4byte 63 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Times - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wonder - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_IsItQues - .4byte 68 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Be - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gimme - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Could - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_LikelyTo - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Would - .4byte 64 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Is - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_IsntItQues - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lets - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Other - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Are - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Was - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Were - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Those - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Isnt - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wont - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cant - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Can - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dont - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Do - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Does - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Whom - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Which - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wasnt - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Werent - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Have - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Havent - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_A - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_An - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Not - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_There - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_OkQues - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_So - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Maybe - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_About - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Over - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_It - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_All - .4byte 67 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_For - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_On - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Off - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_As - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_To - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_With - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Better - .4byte 66 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ever - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Since - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Of - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_BelongsTo - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_At - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_In - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Out - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Too - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Like - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Did - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Didnt - .4byte 65 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Doesnt - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Without - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_After - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Before - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_While - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Than - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Once - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Anywhere - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_events.s b/data/text/easy_chat/easy_chat_group_events.s deleted file mode 100644 index f603908b7..000000000 --- a/data/text/easy_chat/easy_chat_group_events.s +++ /dev/null @@ -1,204 +0,0 @@ -gEasyChatWord_Appeal:: @ 859C688 - .string "APPEAL$" - -gEasyChatWord_Events:: @ 859C68F - .string "EVENTS$" - -gEasyChatWord_StayAtHome:: @ 859C696 - .string "STAY-AT-HOME$" - -gEasyChatWord_Berry:: @ 859C6A3 - .string "BERRY$" - -gEasyChatWord_Contest:: @ 859C6A9 - .string "CONTEST$" - -gEasyChatWord_Mc:: @ 859C6B1 - .string "MC$" - -gEasyChatWord_Judge:: @ 859C6B4 - .string "JUDGE$" - -gEasyChatWord_Super:: @ 859C6BA - .string "SUPER$" - -gEasyChatWord_Stage:: @ 859C6C0 - .string "STAGE$" - -gEasyChatWord_HallOfFame:: @ 859C6C6 - .string "HALL OF FAME$" - -gEasyChatWord_Evolution:: @ 859C6D3 - .string "EVOLUTION$" - -gEasyChatWord_Hyper:: @ 859C6DD - .string "HYPER$" - -gEasyChatWord_BattleTower:: @ 859C6E3 - .string "BATTLE TOWER$" - -gEasyChatWord_Leaders:: @ 859C6F0 - .string "LEADERS$" - -gEasyChatWord_BattleRoom:: @ 859C6F8 - .string "BATTLE ROOM$" - -gEasyChatWord_Hidden:: @ 859C704 - .string "HIDDEN$" - -gEasyChatWord_SecretBase:: @ 859C70B - .string "SECRET BASE$" - -gEasyChatWord_Blend:: @ 859C717 - .string "BLEND$" - -gEasyChatWord_POKEBLOCK:: @ 859C71D - .string "{POKEBLOCK}$" - -gEasyChatWord_Master:: @ 859C723 - .string "MASTER$" - -gEasyChatWord_Rank:: @ 859C72A - .string "RANK$" - -gEasyChatWord_Ribbon:: @ 859C72F - .string "RIBBON$" - -gEasyChatWord_Crush:: @ 859C736 - .string "CRUSH$" - -gEasyChatWord_Direct:: @ 859C73C - .string "DIRECT$" - -gEasyChatWord_Tower:: @ 859C743 - .string "TOWER$" - -gEasyChatWord_Union:: @ 859C749 - .string "UNION$" - -gEasyChatWord_Room:: @ 859C74F - .string "ROOM$" - -gEasyChatWord_Wireless:: @ 859C754 - .string "WIRELESS$" - -gEasyChatWord_Frontier:: @ 859C75D - .string "FRONTIER$" - - .align 2 -gEasyChatGroup_Events:: @ 859C768 - .4byte gEasyChatWord_Appeal - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Events - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_StayAtHome - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Berry - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Contest - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mc - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Judge - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Super - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Stage - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HallOfFame - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Evolution - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hyper - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_BattleTower - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Leaders - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_BattleRoom - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hidden - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SecretBase - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Blend - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_POKEBLOCK - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Master - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rank - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ribbon - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Crush - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Direct - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tower - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Union - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Room - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wireless - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Frontier - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_feelings.s b/data/text/easy_chat/easy_chat_group_feelings.s deleted file mode 100644 index 4cda319cc..000000000 --- a/data/text/easy_chat/easy_chat_group_feelings.s +++ /dev/null @@ -1,484 +0,0 @@ -gEasyChatWord_Meet:: @ 859A60C - .string "MEET$" - -gEasyChatWord_Play:: @ 859A611 - .string "PLAY$" - -gEasyChatWord_Hurried:: @ 859A616 - .string "HURRIED$" - -gEasyChatWord_Goes:: @ 859A61E - .string "GOES$" - -gEasyChatWord_Giddy:: @ 859A623 - .string "GIDDY$" - -gEasyChatWord_Happy:: @ 859A629 - .string "HAPPY$" - -gEasyChatWord_Happiness:: @ 859A62F - .string "HAPPINESS$" - -gEasyChatWord_Excite:: @ 859A639 - .string "EXCITE$" - -gEasyChatWord_Important:: @ 859A640 - .string "IMPORTANT$" - -gEasyChatWord_Funny:: @ 859A64A - .string "FUNNY$" - -gEasyChatWord_Got:: @ 859A650 - .string "GOT$" - -gEasyChatWord_GoHome:: @ 859A654 - .string "GO HOME$" - -gEasyChatWord_Disappointed:: @ 859A65C - .string "DISAPPOINTED$" - -gEasyChatWord_Disappoints:: @ 859A669 - .string "DISAPPOINTS$" - -gEasyChatWord_Sad:: @ 859A675 - .string "SAD$" - -gEasyChatWord_Try:: @ 859A679 - .string "TRY$" - -gEasyChatWord_Tries:: @ 859A67D - .string "TRIES$" - -gEasyChatWord_Hears:: @ 859A683 - .string "HEARS$" - -gEasyChatWord_Think:: @ 859A689 - .string "THINK$" - -gEasyChatWord_Hear:: @ 859A68F - .string "HEAR$" - -gEasyChatWord_Wants:: @ 859A694 - .string "WANTS$" - -gEasyChatWord_Misheard:: @ 859A69A - .string "MISHEARD$" - -gEasyChatWord_Dislike:: @ 859A6A3 - .string "DISLIKE$" - -gEasyChatWord_Angry:: @ 859A6AB - .string "ANGRY$" - -gEasyChatWord_Anger:: @ 859A6B1 - .string "ANGER$" - -gEasyChatWord_Scary:: @ 859A6B7 - .string "SCARY$" - -gEasyChatWord_Lonesome:: @ 859A6BD - .string "LONESOME$" - -gEasyChatWord_Disappoint:: @ 859A6C6 - .string "DISAPPOINT$" - -gEasyChatWord_Joy:: @ 859A6D1 - .string "JOY$" - -gEasyChatWord_Gets:: @ 859A6D5 - .string "GETS$" - -gEasyChatWord_Never:: @ 859A6DA - .string "NEVER$" - -gEasyChatWord_Darn:: @ 859A6E0 - .string "DARN$" - -gEasyChatWord_Downcast:: @ 859A6E5 - .string "DOWNCAST$" - -gEasyChatWord_Incredible:: @ 859A6EE - .string "INCREDIBLE$" - -gEasyChatWord_Likes:: @ 859A6F9 - .string "LIKES$" - -gEasyChatWord_Dislikes:: @ 859A6FF - .string "DISLIKES$" - -gEasyChatWord_Boring:: @ 859A708 - .string "BORING$" - -gEasyChatWord_Care:: @ 859A70F - .string "CARE$" - -gEasyChatWord_Cares:: @ 859A714 - .string "CARES$" - -gEasyChatWord_AllRight:: @ 859A71A - .string "ALL RIGHT$" - -gEasyChatWord_Adore:: @ 859A724 - .string "ADORE$" - -gEasyChatWord_Disaster:: @ 859A72A - .string "DISASTER$" - -gEasyChatWord_Enjoy:: @ 859A733 - .string "ENJOY$" - -gEasyChatWord_Enjoys:: @ 859A739 - .string "ENJOYS$" - -gEasyChatWord_Eat:: @ 859A740 - .string "EAT$" - -gEasyChatWord_Lacking:: @ 859A744 - .string "LACKING$" - -gEasyChatWord_Bad:: @ 859A74C - .string "BAD$" - -gEasyChatWord_Hard:: @ 859A750 - .string "HARD$" - -gEasyChatWord_Terrible:: @ 859A755 - .string "TERRIBLE$" - -gEasyChatWord_Should:: @ 859A75E - .string "SHOULD$" - -gEasyChatWord_Nice:: @ 859A765 - .string "NICE$" - -gEasyChatWord_Drink:: @ 859A76A - .string "DRINK$" - -gEasyChatWord_Surprise:: @ 859A770 - .string "SURPRISE$" - -gEasyChatWord_Fear:: @ 859A779 - .string "FEAR$" - -gEasyChatWord_Want:: @ 859A77E - .string "WANT$" - -gEasyChatWord_Wait:: @ 859A783 - .string "WAIT$" - -gEasyChatWord_Satisfied:: @ 859A788 - .string "SATISFIED$" - -gEasyChatWord_See:: @ 859A792 - .string "SEE$" - -gEasyChatWord_Rare:: @ 859A796 - .string "RARE$" - -gEasyChatWord_Negative:: @ 859A79B - .string "NEGATIVE$" - -gEasyChatWord_Done:: @ 859A7A4 - .string "DONE$" - -gEasyChatWord_Danger:: @ 859A7A9 - .string "DANGER$" - -gEasyChatWord_Defeated:: @ 859A7B0 - .string "DEFEATED$" - -gEasyChatWord_Beat:: @ 859A7B9 - .string "BEAT$" - -gEasyChatWord_Great:: @ 859A7BE - .string "GREAT$" - -gEasyChatWord_Romantic:: @ 859A7C4 - .string "ROMANTIC$" - -gEasyChatWord_Question:: @ 859A7CD - .string "QUESTION$" - -gEasyChatWord_Understand:: @ 859A7D6 - .string "UNDERSTAND$" - -gEasyChatWord_Understands:: @ 859A7E1 - .string "UNDERSTANDS$" - - .align 2 -gEasyChatGroup_Feelings:: @ 859A7F0 - .4byte gEasyChatWord_Meet - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Play - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hurried - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Goes - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Giddy - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Happy - .4byte 63 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Happiness - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Excite - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Important - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Funny - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Got - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_GoHome - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Disappointed - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Disappoints - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sad - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Try - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tries - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hears - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Think - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hear - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wants - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Misheard - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dislike - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Angry - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Anger - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Scary - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lonesome - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Disappoint - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Joy - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gets - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Never - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Darn - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Downcast - .4byte 64 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Incredible - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Likes - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dislikes - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Boring - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Care - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cares - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_AllRight - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Adore - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Disaster - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Enjoy - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Enjoys - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Eat - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lacking - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Bad - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hard - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Terrible - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Should - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nice - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Drink - .4byte 66 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Surprise - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fear - .4byte 65 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Want - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wait - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Satisfied - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_See - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rare - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Negative - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Done - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Danger - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Defeated - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Beat - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Great - .4byte 67 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Romantic - .4byte 68 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Question - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Understand - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Understands - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_greetings.s b/data/text/easy_chat/easy_chat_group_greetings.s deleted file mode 100644 index 98db7acea..000000000 --- a/data/text/easy_chat/easy_chat_group_greetings.s +++ /dev/null @@ -1,295 +0,0 @@ -gEasyChatWord_Thanks:: @ 8599004 - .string "THANKS$" - -gEasyChatWord_Yes:: @ 859900B - .string "YES$" - -gEasyChatWord_HereGoes:: @ 859900F - .string "HERE GOES$" - -gEasyChatWord_HereICome:: @ 8599019 - .string "HERE I COME$" - -gEasyChatWord_HereItIs:: @ 8599025 - .string "HERE IT IS$" - -gEasyChatWord_Yeah:: @ 8599030 - .string "YEAH$" - -gEasyChatWord_Welcome:: @ 8599035 - .string "WELCOME$" - -gEasyChatWord_Oi:: @ 859903D - .string "OI$" - -gEasyChatWord_HowDo:: @ 8599040 - .string "HOW DO$" - -gEasyChatWord_Congrats:: @ 8599047 - .string "CONGRATS$" - -gEasyChatWord_GiveMe:: @ 8599050 - .string "GIVE ME$" - -gEasyChatWord_Sorry:: @ 8599058 - .string "SORRY$" - -gEasyChatWord_Apologize:: @ 859905E - .string "APOLOGIZE$" - -gEasyChatWord_Forgive:: @ 8599068 - .string "FORGIVE$" - -gEasyChatWord_HeyThere:: @ 8599070 - .string "HEY, THERE$" - -gEasyChatWord_Hello:: @ 859907B - .string "HELLO$" - -gEasyChatWord_GoodBye:: @ 8599081 - .string "GOOD-BYE$" - -gEasyChatWord_ThankYou:: @ 859908A - .string "THANK YOU$" - -gEasyChatWord_IveArrived:: @ 8599094 - .string "I'VE ARRIVED$" - -gEasyChatWord_Pardon:: @ 85990A1 - .string "PARDON$" - -gEasyChatWord_Excuse:: @ 85990A8 - .string "EXCUSE$" - -gEasyChatWord_SeeYa:: @ 85990AF - .string "SEE YA$" - -gEasyChatWord_ExcuseMe:: @ 85990B6 - .string "EXCUSE ME$" - -gEasyChatWord_WellThen:: @ 85990C0 - .string "WELL, THEN$" - -gEasyChatWord_GoAhead:: @ 85990CB - .string "GO AHEAD$" - -gEasyChatWord_Appreciate:: @ 85990D4 - .string "APPRECIATE$" - -gEasyChatWord_HeyQues:: @ 85990DF - .string "HEY?$" - -gEasyChatWord_WhatsUpQues:: @ 85990E4 - .string "WHAT'S UP?$" - -gEasyChatWord_HuhQues:: @ 85990EF - .string "HUH?$" - -gEasyChatWord_No:: @ 85990F4 - .string "NO$" - -gEasyChatWord_Hi:: @ 85990F7 - .string "HI$" - -gEasyChatWord_YeahYeah:: @ 85990FA - .string "YEAH, YEAH$" - -gEasyChatWord_ByeBye:: @ 8599105 - .string "BYE-BYE$" - -gEasyChatWord_MeetYou:: @ 859910D - .string "MEET YOU$" - -gEasyChatWord_Hey:: @ 8599116 - .string "HEY$" - -gEasyChatWord_Smell:: @ 859911A - .string "SMELL$" - -gEasyChatWord_Listening:: @ 8599120 - .string "LISTENING$" - -gEasyChatWord_HooHah:: @ 859912A - .string "HOO-HAH$" - -gEasyChatWord_Yahoo:: @ 8599132 - .string "YAHOO$" - -gEasyChatWord_Yo:: @ 8599138 - .string "YO$" - -gEasyChatWord_ComeOver:: @ 859913B - .string "COME OVER$" - -gEasyChatWord_CountOn:: @ 8599145 - .string "COUNT ON$" - - .align 2 -gEasyChatGroup_Greetings:: @ 8599150 - .4byte gEasyChatWord_Thanks - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yes - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HereGoes - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HereICome - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HereItIs - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yeah - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Welcome - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Oi - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HowDo - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Congrats - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_GiveMe - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sorry - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Apologize - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Forgive - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HeyThere - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hello - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_GoodBye - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ThankYou - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_IveArrived - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pardon - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Excuse - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SeeYa - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ExcuseMe - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WellThen - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_GoAhead - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Appreciate - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HeyQues - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WhatsUpQues - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HuhQues - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_No - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hi - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_YeahYeah - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ByeBye - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_MeetYou - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hey - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Smell - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Listening - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HooHah - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yahoo - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yo - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ComeOver - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_CountOn - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_hobbies.s b/data/text/easy_chat/easy_chat_group_hobbies.s deleted file mode 100644 index f3fb02b0b..000000000 --- a/data/text/easy_chat/easy_chat_group_hobbies.s +++ /dev/null @@ -1,379 +0,0 @@ -gEasyChatWord_Idol:: @ 859B960 - .string "IDOL$" - -gEasyChatWord_Anime:: @ 859B965 - .string "ANIME$" - -gEasyChatWord_Song:: @ 859B96B - .string "SONG$" - -gEasyChatWord_Movie:: @ 859B970 - .string "MOVIE$" - -gEasyChatWord_Sweets:: @ 859B976 - .string "SWEETS$" - -gEasyChatWord_Chat:: @ 859B97D - .string "CHAT$" - -gEasyChatWord_ChildsPlay:: @ 859B982 - .string "CHILD'S PLAY$" - -gEasyChatWord_Toys:: @ 859B98F - .string "TOYS$" - -gEasyChatWord_Music:: @ 859B994 - .string "MUSIC$" - -gEasyChatWord_Cards:: @ 859B99A - .string "CARDS$" - -gEasyChatWord_Shopping:: @ 859B9A0 - .string "SHOPPING$" - -gEasyChatWord_Camera:: @ 859B9A9 - .string "CAMERA$" - -gEasyChatWord_Viewing:: @ 859B9B0 - .string "VIEWING$" - -gEasyChatWord_Spectator:: @ 859B9B8 - .string "SPECTATOR$" - -gEasyChatWord_Gourmet:: @ 859B9C2 - .string "GOURMET$" - -gEasyChatWord_Game:: @ 859B9CA - .string "GAME$" - -gEasyChatWord_Rpg:: @ 859B9CF - .string "RPG$" - -gEasyChatWord_Collection:: @ 859B9D3 - .string "COLLECTION$" - -gEasyChatWord_Complete:: @ 859B9DE - .string "COMPLETE$" - -gEasyChatWord_Magazine:: @ 859B9E7 - .string "MAGAZINE$" - -gEasyChatWord_Walk:: @ 859B9F0 - .string "WALK$" - -gEasyChatWord_Bike:: @ 859B9F5 - .string "BIKE$" - -gEasyChatWord_Hobby:: @ 859B9FA - .string "HOBBY$" - -gEasyChatWord_Sports:: @ 859BA00 - .string "SPORTS$" - -gEasyChatWord_Software:: @ 859BA07 - .string "SOFTWARE$" - -gEasyChatWord_Songs:: @ 859BA10 - .string "SONGS$" - -gEasyChatWord_Diet:: @ 859BA16 - .string "DIET$" - -gEasyChatWord_Treasure:: @ 859BA1B - .string "TREASURE$" - -gEasyChatWord_Travel:: @ 859BA24 - .string "TRAVEL$" - -gEasyChatWord_Dance:: @ 859BA2B - .string "DANCE$" - -gEasyChatWord_Channel:: @ 859BA31 - .string "CHANNEL$" - -gEasyChatWord_Making:: @ 859BA39 - .string "MAKING$" - -gEasyChatWord_Fishing:: @ 859BA40 - .string "FISHING$" - -gEasyChatWord_Date:: @ 859BA48 - .string "DATE$" - -gEasyChatWord_Design:: @ 859BA4D - .string "DESIGN$" - -gEasyChatWord_Locomotive:: @ 859BA54 - .string "LOCOMOTIVE$" - -gEasyChatWord_PlushDoll:: @ 859BA5F - .string "PLUSH DOLL$" - -gEasyChatWord_Pc:: @ 859BA6A - .string "PC$" - -gEasyChatWord_Flowers:: @ 859BA6D - .string "FLOWERS$" - -gEasyChatWord_Hero:: @ 859BA75 - .string "HERO$" - -gEasyChatWord_Nap:: @ 859BA7A - .string "NAP$" - -gEasyChatWord_Heroine:: @ 859BA7E - .string "HEROINE$" - -gEasyChatWord_Fashion:: @ 859BA86 - .string "FASHION$" - -gEasyChatWord_Adventure:: @ 859BA8E - .string "ADVENTURE$" - -gEasyChatWord_Board:: @ 859BA98 - .string "BOARD$" - -gEasyChatWord_Ball:: @ 859BA9E - .string "BALL$" - -gEasyChatWord_Book:: @ 859BAA3 - .string "BOOK$" - -gEasyChatWord_Festival:: @ 859BAA8 - .string "FESTIVAL$" - -gEasyChatWord_Comics:: @ 859BAB1 - .string "COMICS$" - -gEasyChatWord_Holiday:: @ 859BAB8 - .string "HOLIDAY$" - -gEasyChatWord_Plans:: @ 859BAC0 - .string "PLANS$" - -gEasyChatWord_Trendy:: @ 859BAC6 - .string "TRENDY$" - -gEasyChatWord_Vacation:: @ 859BACD - .string "VACATION$" - -gEasyChatWord_Look:: @ 859BAD6 - .string "LOOK$" - - .align 2 -gEasyChatGroup_Hobbies:: @ 859BADC - .4byte gEasyChatWord_Idol - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Anime - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Song - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Movie - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sweets - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Chat - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ChildsPlay - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Toys - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Music - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cards - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shopping - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Camera - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Viewing - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Spectator - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gourmet - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Game - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rpg - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Collection - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Complete - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Magazine - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Walk - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Bike - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hobby - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sports - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Software - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Songs - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Diet - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Treasure - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Travel - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dance - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Channel - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Making - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fishing - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Date - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Design - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Locomotive - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_PlushDoll - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pc - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Flowers - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hero - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nap - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Heroine - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fashion - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Adventure - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Board - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ball - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Book - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Festival - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Comics - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Holiday - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Plans - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Trendy - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Vacation - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Look - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_lifestyle.s b/data/text/easy_chat/easy_chat_group_lifestyle.s deleted file mode 100644 index 356095cd5..000000000 --- a/data/text/easy_chat/easy_chat_group_lifestyle.s +++ /dev/null @@ -1,316 +0,0 @@ -gEasyChatWord_Chores:: @ 859B5FC - .string "CHORES$" - -gEasyChatWord_Home:: @ 859B603 - .string "HOME$" - -gEasyChatWord_Money:: @ 859B608 - .string "MONEY$" - -gEasyChatWord_Allowance:: @ 859B60E - .string "ALLOWANCE$" - -gEasyChatWord_Bath:: @ 859B618 - .string "BATH$" - -gEasyChatWord_Conversation:: @ 859B61D - .string "CONVERSATION$" - -gEasyChatWord_School:: @ 859B62A - .string "SCHOOL$" - -gEasyChatWord_Commemorate:: @ 859B631 - .string "COMMEMORATE$" - -gEasyChatWord_Habit:: @ 859B63D - .string "HABIT$" - -gEasyChatWord_Group:: @ 859B643 - .string "GROUP$" - -gEasyChatWord_Word:: @ 859B649 - .string "WORD$" - -gEasyChatWord_Store:: @ 859B64E - .string "STORE$" - -gEasyChatWord_Service:: @ 859B654 - .string "SERVICE$" - -gEasyChatWord_Work:: @ 859B65C - .string "WORK$" - -gEasyChatWord_System:: @ 859B661 - .string "SYSTEM$" - -gEasyChatWord_Train:: @ 859B668 - .string "TRAIN$" - -gEasyChatWord_Class:: @ 859B66E - .string "CLASS$" - -gEasyChatWord_Lessons:: @ 859B674 - .string "LESSONS$" - -gEasyChatWord_Information:: @ 859B67C - .string "INFORMATION$" - -gEasyChatWord_Living:: @ 859B688 - .string "LIVING$" - -gEasyChatWord_Teacher:: @ 859B68F - .string "TEACHER$" - -gEasyChatWord_Tournament:: @ 859B697 - .string "TOURNAMENT$" - -gEasyChatWord_Letter:: @ 859B6A2 - .string "LETTER$" - -gEasyChatWord_Event:: @ 859B6A9 - .string "EVENT$" - -gEasyChatWord_Digital:: @ 859B6AF - .string "DIGITAL$" - -gEasyChatWord_Test:: @ 859B6B7 - .string "TEST$" - -gEasyChatWord_DeptStore:: @ 859B6BC - .string "DEPT. STORE$" - -gEasyChatWord_Television:: @ 859B6C8 - .string "TELEVISION$" - -gEasyChatWord_Phone:: @ 859B6D3 - .string "PHONE$" - -gEasyChatWord_Item:: @ 859B6D9 - .string "ITEM$" - -gEasyChatWord_Name:: @ 859B6DE - .string "NAME$" - -gEasyChatWord_News:: @ 859B6E3 - .string "NEWS$" - -gEasyChatWord_Popular:: @ 859B6E8 - .string "POPULAR$" - -gEasyChatWord_Party:: @ 859B6F0 - .string "PARTY$" - -gEasyChatWord_Study:: @ 859B6F6 - .string "STUDY$" - -gEasyChatWord_Machine:: @ 859B6FC - .string "MACHINE$" - -gEasyChatWord_Mail:: @ 859B704 - .string "MAIL$" - -gEasyChatWord_Message:: @ 859B709 - .string "MESSAGE$" - -gEasyChatWord_Promise:: @ 859B711 - .string "PROMISE$" - -gEasyChatWord_Dream:: @ 859B719 - .string "DREAM$" - -gEasyChatWord_Kindergarten:: @ 859B71F - .string "KINDERGARTEN$" - -gEasyChatWord_Life:: @ 859B72C - .string "LIFE$" - -gEasyChatWord_Radio:: @ 859B731 - .string "RADIO$" - -gEasyChatWord_Rental:: @ 859B737 - .string "RENTAL$" - -gEasyChatWord_World:: @ 859B73E - .string "WORLD$" - - .align 2 -gEasyChatGroup_Lifestyle:: @ 859B744 - .4byte gEasyChatWord_Chores - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Home - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Money - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Allowance - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Bath - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Conversation - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_School - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Commemorate - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Habit - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Group - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Word - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Store - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Service - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Work - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_System - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Train - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Class - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lessons - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Information - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Living - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Teacher - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tournament - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Letter - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Event - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Digital - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Test - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_DeptStore - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Television - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Phone - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Item - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Name - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_News - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Popular - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Party - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Study - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Machine - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mail - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Message - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Promise - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dream - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Kindergarten - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Life - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Radio - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rental - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_World - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_misc.s b/data/text/easy_chat/easy_chat_group_misc.s deleted file mode 100644 index 19ca730d5..000000000 --- a/data/text/easy_chat/easy_chat_group_misc.s +++ /dev/null @@ -1,295 +0,0 @@ -gEasyChatWord_Highs:: @ 859C0B4 - .string "HIGHS$" - -gEasyChatWord_Lows:: @ 859C0BA - .string "LOWS$" - -gEasyChatWord_Um:: @ 859C0BF - .string "UM$" - -gEasyChatWord_Rear:: @ 859C0C2 - .string "REAR$" - -gEasyChatWord_Things:: @ 859C0C7 - .string "THINGS$" - -gEasyChatWord_Thing:: @ 859C0CE - .string "THING$" - -gEasyChatWord_Below:: @ 859C0D4 - .string "BELOW$" - -gEasyChatWord_Above:: @ 859C0DA - .string "ABOVE$" - -gEasyChatWord_Back:: @ 859C0E0 - .string "BACK$" - -gEasyChatWord_High:: @ 859C0E5 - .string "HIGH$" - -gEasyChatWord_Here:: @ 859C0EA - .string "HERE$" - -gEasyChatWord_Inside:: @ 859C0EF - .string "INSIDE$" - -gEasyChatWord_Outside:: @ 859C0F6 - .string "OUTSIDE$" - -gEasyChatWord_Beside:: @ 859C0FE - .string "BESIDE$" - -gEasyChatWord_ThisIsItExcl:: @ 859C105 - .string "THIS IS IT!$" - -gEasyChatWord_This:: @ 859C111 - .string "THIS$" - -gEasyChatWord_Every:: @ 859C116 - .string "EVERY$" - -gEasyChatWord_These:: @ 859C11C - .string "THESE$" - -gEasyChatWord_TheseWere:: @ 859C122 - .string "THESE WERE$" - -gEasyChatWord_Down:: @ 859C12D - .string "DOWN$" - -gEasyChatWord_That:: @ 859C132 - .string "THAT$" - -gEasyChatWord_ThoseAre:: @ 859C137 - .string "THOSE ARE$" - -gEasyChatWord_ThoseWere:: @ 859C141 - .string "THOSE WERE$" - -gEasyChatWord_ThatsItExcl:: @ 859C14C - .string "THAT'S IT!$" - -gEasyChatWord_Am:: @ 859C157 - .string "AM$" - -gEasyChatWord_ThatWas:: @ 859C15A - .string "THAT WAS$" - -gEasyChatWord_Front:: @ 859C163 - .string "FRONT$" - -gEasyChatWord_Up:: @ 859C169 - .string "UP$" - -gEasyChatWord_Choice:: @ 859C16C - .string "CHOICE$" - -gEasyChatWord_Far:: @ 859C173 - .string "FAR$" - -gEasyChatWord_Away:: @ 859C177 - .string "AWAY$" - -gEasyChatWord_Near:: @ 859C17C - .string "NEAR$" - -gEasyChatWord_Where:: @ 859C181 - .string "WHERE$" - -gEasyChatWord_When:: @ 859C187 - .string "WHEN$" - -gEasyChatWord_What:: @ 859C18C - .string "WHAT$" - -gEasyChatWord_Deep:: @ 859C191 - .string "DEEP$" - -gEasyChatWord_Shallow:: @ 859C196 - .string "SHALLOW$" - -gEasyChatWord_Why:: @ 859C19E - .string "WHY$" - -gEasyChatWord_Confused:: @ 859C1A2 - .string "CONFUSED$" - -gEasyChatWord_Opposite:: @ 859C1AB - .string "OPPOSITE$" - -gEasyChatWord_Left:: @ 859C1B4 - .string "LEFT$" - -gEasyChatWord_Right:: @ 859C1B9 - .string "RIGHT$" - - .align 2 -gEasyChatGroup_Misc:: @ 859C1C0 - .4byte gEasyChatWord_Highs - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lows - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Um - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rear - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Things - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Thing - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Below - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Above - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Back - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_High - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Here - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Inside - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Outside - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Beside - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ThisIsItExcl - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_This - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Every - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_These - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_TheseWere - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Down - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_That - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ThoseAre - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ThoseWere - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ThatsItExcl - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Am - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ThatWas - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Front - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Up - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Choice - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Far - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Away - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Near - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Where - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_When - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_What - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Deep - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shallow - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Why - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Confused - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Opposite - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Left - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Right - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_move_1.s b/data/text/easy_chat/easy_chat_group_move_1.s deleted file mode 100644 index 595dfd158..000000000 --- a/data/text/easy_chat/easy_chat_group_move_1.s +++ /dev/null @@ -1,156 +0,0 @@ - .align 2 -gEasyChatGroup_Move1:: @ 859C8C4 - .2byte MOVE_ABSORB - .2byte MOVE_AEROBLAST - .2byte MOVE_AGILITY - .2byte MOVE_AIR_CUTTER - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_AROMATHERAPY - .2byte MOVE_ASTONISH - .2byte MOVE_AURORA_BEAM - .2byte MOVE_BIDE - .2byte MOVE_BIND - .2byte MOVE_BITE - .2byte MOVE_BRICK_BREAK - .2byte MOVE_BUBBLE - .2byte MOVE_CHARGE - .2byte MOVE_CHARM - .2byte MOVE_CLAMP - .2byte MOVE_CONFUSE_RAY - .2byte MOVE_CONSTRICT - .2byte MOVE_COSMIC_POWER - .2byte MOVE_COUNTER - .2byte MOVE_CRABHAMMER - .2byte MOVE_CROSS_CHOP - .2byte MOVE_CRUNCH - .2byte MOVE_CUT - .2byte MOVE_DIG - .2byte MOVE_DISABLE - .2byte MOVE_DOUBLE_TEAM - .2byte MOVE_DOUBLE_EDGE - .2byte MOVE_DOUBLE_SLAP - .2byte MOVE_EARTHQUAKE - .2byte MOVE_ENCORE - .2byte MOVE_ENDEAVOR - .2byte MOVE_ENDURE - .2byte MOVE_EXTRASENSORY - .2byte MOVE_EXTREME_SPEED - .2byte MOVE_FACADE - .2byte MOVE_FAKE_TEARS - .2byte MOVE_FISSURE - .2byte MOVE_FLAIL - .2byte MOVE_FLAME_WHEEL - .2byte MOVE_FLAMETHROWER - .2byte MOVE_FLATTER - .2byte MOVE_FLY - .2byte MOVE_FOCUS_ENERGY - .2byte MOVE_FOCUS_PUNCH - .2byte MOVE_FOLLOW_ME - .2byte MOVE_GIGA_DRAIN - .2byte MOVE_GRASS_WHISTLE - .2byte MOVE_GROWTH - .2byte MOVE_GRUDGE - .2byte MOVE_GUST - .2byte MOVE_HAIL - .2byte MOVE_HARDEN - .2byte MOVE_HAZE - .2byte MOVE_HEADBUTT - .2byte MOVE_HEAL_BELL - .2byte MOVE_HYPNOSIS - .2byte MOVE_ICE_BALL - .2byte MOVE_ICY_WIND - .2byte MOVE_IRON_TAIL - .2byte MOVE_KARATE_CHOP - .2byte MOVE_KINESIS - .2byte MOVE_LEECH_LIFE - .2byte MOVE_LICK - .2byte MOVE_LOVELY_KISS - .2byte MOVE_LOW_KICK - .2byte MOVE_MEAN_LOOK - .2byte MOVE_MEMENTO - .2byte MOVE_METAL_SOUND - .2byte MOVE_METEOR_MASH - .2byte MOVE_MIND_READER - .2byte MOVE_MIRROR_MOVE - .2byte MOVE_MIST - .2byte MOVE_MORNING_SUN - .2byte MOVE_NATURE_POWER - .2byte MOVE_NIGHTMARE - .2byte MOVE_OCTAZOOKA - .2byte MOVE_ODOR_SLEUTH - .2byte MOVE_OUTRAGE - .2byte MOVE_OVERHEAT - .2byte MOVE_PAIN_SPLIT - .2byte MOVE_POWDER_SNOW - .2byte MOVE_PSYBEAM - .2byte MOVE_PSYCH_UP - .2byte MOVE_PSYCHIC - .2byte MOVE_PSYCHO_BOOST - .2byte MOVE_PSYWAVE - .2byte MOVE_PURSUIT - .2byte MOVE_RAGE - .2byte MOVE_RAIN_DANCE - .2byte MOVE_RAPID_SPIN - .2byte MOVE_RAZOR_WIND - .2byte MOVE_RECOVER - .2byte MOVE_RETURN - .2byte MOVE_REVERSAL - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_ROCK_SMASH - .2byte MOVE_ROCK_THROW - .2byte MOVE_ROCK_TOMB - .2byte MOVE_ROLLOUT - .2byte MOVE_SACRED_FIRE - .2byte MOVE_SAFEGUARD - .2byte MOVE_SAND_TOMB - .2byte MOVE_SAND_ATTACK - .2byte MOVE_SANDSTORM - .2byte MOVE_SCARY_FACE - .2byte MOVE_SCREECH - .2byte MOVE_SELF_DESTRUCT - .2byte MOVE_SHADOW_BALL - .2byte MOVE_SHADOW_PUNCH - .2byte MOVE_SHARPEN - .2byte MOVE_SHEER_COLD - .2byte MOVE_SIGNAL_BEAM - .2byte MOVE_SILVER_WIND - .2byte MOVE_SING - .2byte MOVE_SKETCH - .2byte MOVE_SKILL_SWAP - .2byte MOVE_SKY_ATTACK - .2byte MOVE_SKY_UPPERCUT - .2byte MOVE_SLASH - .2byte MOVE_SMELLING_SALT - .2byte MOVE_SMOG - .2byte MOVE_SMOKESCREEN - .2byte MOVE_SNORE - .2byte MOVE_SOLAR_BEAM - .2byte MOVE_SONIC_BOOM - .2byte MOVE_SPARK - .2byte MOVE_SPIDER_WEB - .2byte MOVE_SPITE - .2byte MOVE_SPORE - .2byte MOVE_STRENGTH - .2byte MOVE_STRING_SHOT - .2byte MOVE_STUN_SPORE - .2byte MOVE_SUBMISSION - .2byte MOVE_SUPER_FANG - .2byte MOVE_SWAGGER - .2byte MOVE_SWEET_SCENT - .2byte MOVE_SWIFT - .2byte MOVE_SYNTHESIS - .2byte MOVE_TAIL_WHIP - .2byte MOVE_THRASH - .2byte MOVE_THUNDER - .2byte MOVE_THUNDERBOLT - .2byte MOVE_THUNDER_PUNCH - .2byte MOVE_TICKLE - .2byte MOVE_TORMENT - .2byte MOVE_UPROAR - .2byte MOVE_VITAL_THROW - .2byte MOVE_WATER_SPOUT - .2byte MOVE_WEATHER_BALL - .2byte MOVE_WHIRLPOOL - .2byte MOVE_WILL_O_WISP - .2byte MOVE_WITHDRAW - .2byte MOVE_YAWN diff --git a/data/text/easy_chat/easy_chat_group_move_2.s b/data/text/easy_chat/easy_chat_group_move_2.s deleted file mode 100644 index e08a07767..000000000 --- a/data/text/easy_chat/easy_chat_group_move_2.s +++ /dev/null @@ -1,202 +0,0 @@ - .align 2 -gEasyChatGroup_Move2:: @ 859C9F8 - .2byte MOVE_ACID - .2byte MOVE_ACID_ARMOR - .2byte MOVE_AERIAL_ACE - .2byte MOVE_AMNESIA - .2byte MOVE_ARM_THRUST - .2byte MOVE_ASSIST - .2byte MOVE_ATTRACT - .2byte MOVE_BARRAGE - .2byte MOVE_BARRIER - .2byte MOVE_BATON_PASS - .2byte MOVE_BEAT_UP - .2byte MOVE_BELLY_DRUM - .2byte MOVE_BLAST_BURN - .2byte MOVE_BLAZE_KICK - .2byte MOVE_BLIZZARD - .2byte MOVE_BLOCK - .2byte MOVE_BODY_SLAM - .2byte MOVE_BONE_CLUB - .2byte MOVE_BONE_RUSH - .2byte MOVE_BONEMERANG - .2byte MOVE_BOUNCE - .2byte MOVE_BUBBLE_BEAM - .2byte MOVE_BULK_UP - .2byte MOVE_BULLET_SEED - .2byte MOVE_CALM_MIND - .2byte MOVE_CAMOUFLAGE - .2byte MOVE_COMET_PUNCH - .2byte MOVE_CONFUSION - .2byte MOVE_CONVERSION - .2byte MOVE_CONVERSION_2 - .2byte MOVE_COTTON_SPORE - .2byte MOVE_COVET - .2byte MOVE_CRUSH_CLAW - .2byte MOVE_CURSE - .2byte MOVE_DEFENSE_CURL - .2byte MOVE_DESTINY_BOND - .2byte MOVE_DETECT - .2byte MOVE_DIVE - .2byte MOVE_DIZZY_PUNCH - .2byte MOVE_DOOM_DESIRE - .2byte MOVE_DOUBLE_KICK - .2byte MOVE_DRAGON_CLAW - .2byte MOVE_DRAGON_DANCE - .2byte MOVE_DRAGON_RAGE - .2byte MOVE_DRAGON_BREATH - .2byte MOVE_DREAM_EATER - .2byte MOVE_DRILL_PECK - .2byte MOVE_DYNAMIC_PUNCH - .2byte MOVE_EGG_BOMB - .2byte MOVE_EMBER - .2byte MOVE_ERUPTION - .2byte MOVE_EXPLOSION - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_FAKE_OUT - .2byte MOVE_FALSE_SWIPE - .2byte MOVE_FEATHER_DANCE - .2byte MOVE_FIRE_BLAST - .2byte MOVE_FIRE_PUNCH - .2byte MOVE_FIRE_SPIN - .2byte MOVE_FLASH - .2byte MOVE_FORESIGHT - .2byte MOVE_FRENZY_PLANT - .2byte MOVE_FRUSTRATION - .2byte MOVE_FURY_ATTACK - .2byte MOVE_FURY_CUTTER - .2byte MOVE_FURY_SWIPES - .2byte MOVE_FUTURE_SIGHT - .2byte MOVE_GLARE - .2byte MOVE_GROWL - .2byte MOVE_GUILLOTINE - .2byte MOVE_HEAT_WAVE - .2byte MOVE_HELPING_HAND - .2byte MOVE_HI_JUMP_KICK - .2byte MOVE_HIDDEN_POWER - .2byte MOVE_HORN_ATTACK - .2byte MOVE_HORN_DRILL - .2byte MOVE_HOWL - .2byte MOVE_HYDRO_CANNON - .2byte MOVE_HYDRO_PUMP - .2byte MOVE_HYPER_BEAM - .2byte MOVE_HYPER_FANG - .2byte MOVE_HYPER_VOICE - .2byte MOVE_ICE_BEAM - .2byte MOVE_ICE_PUNCH - .2byte MOVE_ICICLE_SPEAR - .2byte MOVE_IMPRISON - .2byte MOVE_INGRAIN - .2byte MOVE_IRON_DEFENSE - .2byte MOVE_JUMP_KICK - .2byte MOVE_KNOCK_OFF - .2byte MOVE_LEAF_BLADE - .2byte MOVE_LEECH_SEED - .2byte MOVE_LEER - .2byte MOVE_LIGHT_SCREEN - .2byte MOVE_LOCK_ON - .2byte MOVE_LUSTER_PURGE - .2byte MOVE_MACH_PUNCH - .2byte MOVE_MAGIC_COAT - .2byte MOVE_MAGICAL_LEAF - .2byte MOVE_MAGNITUDE - .2byte MOVE_MEDITATE - .2byte MOVE_MEGA_DRAIN - .2byte MOVE_MEGA_KICK - .2byte MOVE_MEGA_PUNCH - .2byte MOVE_MEGAHORN - .2byte MOVE_METAL_CLAW - .2byte MOVE_METRONOME - .2byte MOVE_MILK_DRINK - .2byte MOVE_MIMIC - .2byte MOVE_MINIMIZE - .2byte MOVE_MIRROR_COAT - .2byte MOVE_MIST_BALL - .2byte MOVE_MOONLIGHT - .2byte MOVE_MUD_SHOT - .2byte MOVE_MUD_SPORT - .2byte MOVE_MUD_SLAP - .2byte MOVE_MUDDY_WATER - .2byte MOVE_NEEDLE_ARM - .2byte MOVE_NIGHT_SHADE - .2byte MOVE_PAY_DAY - .2byte MOVE_PECK - .2byte MOVE_PERISH_SONG - .2byte MOVE_PETAL_DANCE - .2byte MOVE_PIN_MISSILE - .2byte MOVE_POISON_FANG - .2byte MOVE_POISON_GAS - .2byte MOVE_POISON_STING - .2byte MOVE_POISON_TAIL - .2byte MOVE_POISON_POWDER - .2byte MOVE_POUND - .2byte MOVE_PRESENT - .2byte MOVE_PROTECT - .2byte MOVE_QUICK_ATTACK - .2byte MOVE_RAZOR_LEAF - .2byte MOVE_RECYCLE - .2byte MOVE_REFLECT - .2byte MOVE_REFRESH - .2byte MOVE_REST - .2byte MOVE_REVENGE - .2byte MOVE_ROAR - .2byte MOVE_ROCK_BLAST - .2byte MOVE_ROLE_PLAY - .2byte MOVE_ROLLING_KICK - .2byte MOVE_SCRATCH - .2byte MOVE_SECRET_POWER - .2byte MOVE_SEISMIC_TOSS - .2byte MOVE_SHOCK_WAVE - .2byte MOVE_SKULL_BASH - .2byte MOVE_SLACK_OFF - .2byte MOVE_SLAM - .2byte MOVE_SLEEP_POWDER - .2byte MOVE_SLEEP_TALK - .2byte MOVE_SLUDGE - .2byte MOVE_SLUDGE_BOMB - .2byte MOVE_SNATCH - .2byte MOVE_SOFT_BOILED - .2byte MOVE_SPIKE_CANNON - .2byte MOVE_SPIKES - .2byte MOVE_SPIT_UP - .2byte MOVE_SPLASH - .2byte MOVE_STEEL_WING - .2byte MOVE_STOCKPILE - .2byte MOVE_STOMP - .2byte MOVE_STRUGGLE - .2byte MOVE_SUBSTITUTE - .2byte MOVE_SUNNY_DAY - .2byte MOVE_SUPERPOWER - .2byte MOVE_SUPERSONIC - .2byte MOVE_SURF - .2byte MOVE_SWALLOW - .2byte MOVE_SWEET_KISS - .2byte MOVE_SWORDS_DANCE - .2byte MOVE_TACKLE - .2byte MOVE_TAIL_GLOW - .2byte MOVE_TAKE_DOWN - .2byte MOVE_TAUNT - .2byte MOVE_TEETER_DANCE - .2byte MOVE_TELEPORT - .2byte MOVE_THIEF - .2byte MOVE_THUNDER_WAVE - .2byte MOVE_THUNDER_SHOCK - .2byte MOVE_TOXIC - .2byte MOVE_TRANSFORM - .2byte MOVE_TRI_ATTACK - .2byte MOVE_TRICK - .2byte MOVE_TRIPLE_KICK - .2byte MOVE_TWINEEDLE - .2byte MOVE_TWISTER - .2byte MOVE_VICE_GRIP - .2byte MOVE_VINE_WHIP - .2byte MOVE_VOLT_TACKLE - .2byte MOVE_WATER_GUN - .2byte MOVE_WATER_PULSE - .2byte MOVE_WATER_SPORT - .2byte MOVE_WATERFALL - .2byte MOVE_WHIRLWIND - .2byte MOVE_WING_ATTACK - .2byte MOVE_WISH - .2byte MOVE_WRAP - .2byte MOVE_ZAP_CANNON diff --git a/data/text/easy_chat/easy_chat_group_name_pointers.inc b/data/text/easy_chat/easy_chat_group_name_pointers.inc deleted file mode 100644 index 375614b86..000000000 --- a/data/text/easy_chat/easy_chat_group_name_pointers.inc +++ /dev/null @@ -1,24 +0,0 @@ - .align 2 -gEasyChatGroupNamePointers:: @ 859E5D4 - .4byte gEasyChatGroupName_Pokemon - .4byte gEasyChatGroupName_Trainer - .4byte gEasyChatGroupName_Status - .4byte gEasyChatGroupName_Battle - .4byte gEasyChatGroupName_Greetings - .4byte gEasyChatGroupName_People - .4byte gEasyChatGroupName_Voices - .4byte gEasyChatGroupName_Speech - .4byte gEasyChatGroupName_Endings - .4byte gEasyChatGroupName_Feelings - .4byte gEasyChatGroupName_Conditions - .4byte gEasyChatGroupName_Actions - .4byte gEasyChatGroupName_Lifestyle - .4byte gEasyChatGroupName_Hobbies - .4byte gEasyChatGroupName_Time - .4byte gEasyChatGroupName_Misc - .4byte gEasyChatGroupName_Adjectives - .4byte gEasyChatGroupName_Events - .4byte gEasyChatGroupName_Move1 - .4byte gEasyChatGroupName_Move2 - .4byte gEasyChatGroupName_TrendySaying - .4byte gEasyChatGroupName_Pokemon2 diff --git a/data/text/easy_chat/easy_chat_group_people.s b/data/text/easy_chat/easy_chat_group_people.s deleted file mode 100644 index fb74aba91..000000000 --- a/data/text/easy_chat/easy_chat_group_people.s +++ /dev/null @@ -1,526 +0,0 @@ -gEasyChatWord_Opponent:: @ 8599348 - .string "OPPONENT$" - -gEasyChatWord_I:: @ 8599351 - .string "I$" - -gEasyChatWord_You:: @ 8599353 - .string "YOU$" - -gEasyChatWord_Yours:: @ 8599357 - .string "YOURS$" - -gEasyChatWord_Son:: @ 859935D - .string "SON$" - -gEasyChatWord_Your:: @ 8599361 - .string "YOUR$" - -gEasyChatWord_Youre:: @ 8599366 - .string "YOU'RE$" - -gEasyChatWord_Youve:: @ 859936D - .string "YOU'VE$" - -gEasyChatWord_Mother:: @ 8599374 - .string "MOTHER$" - -gEasyChatWord_Grandfather:: @ 859937B - .string "GRANDFATHER$" - -gEasyChatWord_Uncle:: @ 8599387 - .string "UNCLE$" - -gEasyChatWord_Father:: @ 859938D - .string "FATHER$" - -gEasyChatWord_Boy:: @ 8599394 - .string "BOY$" - -gEasyChatWord_Adult:: @ 8599398 - .string "ADULT$" - -gEasyChatWord_Brother:: @ 859939E - .string "BROTHER$" - -gEasyChatWord_Sister:: @ 85993A6 - .string "SISTER$" - -gEasyChatWord_Grandmother:: @ 85993AD - .string "GRANDMOTHER$" - -gEasyChatWord_Aunt:: @ 85993B9 - .string "AUNT$" - -gEasyChatWord_Parent:: @ 85993BE - .string "PARENT$" - -gEasyChatWord_Man:: @ 85993C5 - .string "MAN$" - -gEasyChatWord_Me:: @ 85993C9 - .string "ME$" - -gEasyChatWord_Girl:: @ 85993CC - .string "GIRL$" - -gEasyChatWord_Babe:: @ 85993D1 - .string "BABE$" - -gEasyChatWord_Family:: @ 85993D6 - .string "FAMILY$" - -gEasyChatWord_Her:: @ 85993DD - .string "HER$" - -gEasyChatWord_Him:: @ 85993E1 - .string "HIM$" - -gEasyChatWord_He:: @ 85993E5 - .string "HE$" - -gEasyChatWord_Place:: @ 85993E8 - .string "PLACE$" - -gEasyChatWord_Daughter:: @ 85993EE - .string "DAUGHTER$" - -gEasyChatWord_His:: @ 85993F7 - .string "HIS$" - -gEasyChatWord_Hes:: @ 85993FB - .string "HE'S$" - -gEasyChatWord_Arent:: @ 8599400 - .string "AREN'T$" - -gEasyChatWord_Siblings:: @ 8599407 - .string "SIBLINGS$" - -gEasyChatWord_Kid:: @ 8599410 - .string "KID$" - -gEasyChatWord_Children:: @ 8599414 - .string "CHILDREN$" - -gEasyChatWord_Mr:: @ 859941D - .string "MR.$" - -gEasyChatWord_Mrs:: @ 8599421 - .string "MRS.$" - -gEasyChatWord_Myself:: @ 8599426 - .string "MYSELF$" - -gEasyChatWord_IWas:: @ 859942D - .string "I WAS$" - -gEasyChatWord_ToMe:: @ 8599433 - .string "TO ME$" - -gEasyChatWord_My:: @ 8599439 - .string "MY$" - -gEasyChatWord_IAm:: @ 859943C - .string "I AM$" - -gEasyChatWord_Ive:: @ 8599441 - .string "I'VE$" - -gEasyChatWord_Who:: @ 8599446 - .string "WHO$" - -gEasyChatWord_Someone:: @ 859944A - .string "SOMEONE$" - -gEasyChatWord_WhoWas:: @ 8599452 - .string "WHO WAS$" - -gEasyChatWord_ToWhom:: @ 859945A - .string "TO WHOM$" - -gEasyChatWord_Whose:: @ 8599462 - .string "WHOSE$" - -gEasyChatWord_WhoIs:: @ 8599468 - .string "WHO IS$" - -gEasyChatWord_Its:: @ 859946F - .string "IT'S$" - -gEasyChatWord_Lady:: @ 8599474 - .string "LADY$" - -gEasyChatWord_Friend:: @ 8599479 - .string "FRIEND$" - -gEasyChatWord_Ally:: @ 8599480 - .string "ALLY$" - -gEasyChatWord_Person:: @ 8599485 - .string "PERSON$" - -gEasyChatWord_Dude:: @ 859948C - .string "DUDE$" - -gEasyChatWord_They:: @ 8599491 - .string "THEY$" - -gEasyChatWord_TheyWere:: @ 8599496 - .string "THEY WERE$" - -gEasyChatWord_ToThem:: @ 85994A0 - .string "TO THEM$" - -gEasyChatWord_Their:: @ 85994A8 - .string "THEIR$" - -gEasyChatWord_Theyre:: @ 85994AE - .string "THEY'RE$" - -gEasyChatWord_Theyve:: @ 85994B6 - .string "THEY'VE$" - -gEasyChatWord_We:: @ 85994BE - .string "WE$" - -gEasyChatWord_Been:: @ 85994C1 - .string "BEEN$" - -gEasyChatWord_ToUs:: @ 85994C6 - .string "TO US$" - -gEasyChatWord_Our:: @ 85994CC - .string "OUR$" - -gEasyChatWord_WeAre:: @ 85994D0 - .string "WE'RE$" - -gEasyChatWord_Rival:: @ 85994D6 - .string "RIVAL$" - -gEasyChatWord_Weve:: @ 85994DC - .string "WE'VE$" - -gEasyChatWord_Woman:: @ 85994E2 - .string "WOMAN$" - -gEasyChatWord_She:: @ 85994E8 - .string "SHE$" - -gEasyChatWord_SheWas:: @ 85994EC - .string "SHE WAS$" - -gEasyChatWord_ToHer:: @ 85994F4 - .string "TO HER$" - -gEasyChatWord_Hers:: @ 85994FB - .string "HERS$" - -gEasyChatWord_SheIs:: @ 8599500 - .string "SHE IS$" - -gEasyChatWord_Some:: @ 8599507 - .string "SOME$" - - .align 2 -gEasyChatGroup_People:: @ 859950C - .4byte gEasyChatWord_Opponent - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_I - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_You - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yours - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Son - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Your - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Youre - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Youve - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mother - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Grandfather - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Uncle - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Father - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Boy - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Adult - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Brother - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sister - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Grandmother - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Aunt - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Parent - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Man - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Me - .4byte 72 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Girl - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Babe - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Family - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Her - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Him - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_He - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Place - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Daughter - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_His - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hes - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Arent - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Siblings - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Kid - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Children - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mr - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mrs - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Myself - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_IWas - .4byte 64 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ToMe - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_My - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_IAm - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ive - .4byte 66 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Who - .4byte 69 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Someone - .4byte 73 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WhoWas - .4byte 70 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ToWhom - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Whose - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WhoIs - .4byte 74 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Its - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lady - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Friend - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ally - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Person - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dude - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_They - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_TheyWere - .4byte 71 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ToThem - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Their - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Theyre - .4byte 63 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Theyve - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_We - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Been - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ToUs - .4byte 65 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Our - .4byte 67 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WeAre - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rival - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Weve - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Woman - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_She - .4byte 68 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SheWas - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ToHer - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hers - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SheIs - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Some - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_pokemon.s b/data/text/easy_chat/easy_chat_group_pokemon.s deleted file mode 100644 index 571c68736..000000000 --- a/data/text/easy_chat/easy_chat_group_pokemon.s +++ /dev/null @@ -1,204 +0,0 @@ - .align 2 -gEasyChatGroup_Pokemon:: @ 8597E9C - .2byte SPECIES_ABRA - .2byte SPECIES_ABSOL - .2byte SPECIES_AGGRON - .2byte SPECIES_ALAKAZAM - .2byte SPECIES_ALTARIA - .2byte SPECIES_ANORITH - .2byte SPECIES_ARMALDO - .2byte SPECIES_ARON - .2byte SPECIES_AZUMARILL - .2byte SPECIES_AZURILL - .2byte SPECIES_BAGON - .2byte SPECIES_BALTOY - .2byte SPECIES_BANETTE - .2byte SPECIES_BARBOACH - .2byte SPECIES_BEAUTIFLY - .2byte SPECIES_BELDUM - .2byte SPECIES_BELLOSSOM - .2byte SPECIES_BLAZIKEN - .2byte SPECIES_BRELOOM - .2byte SPECIES_CACNEA - .2byte SPECIES_CACTURNE - .2byte SPECIES_CAMERUPT - .2byte SPECIES_CARVANHA - .2byte SPECIES_CASCOON - .2byte SPECIES_CASTFORM - .2byte SPECIES_CHIMECHO - .2byte SPECIES_CHINCHOU - .2byte SPECIES_CLAMPERL - .2byte SPECIES_CLAYDOL - .2byte SPECIES_COMBUSKEN - .2byte SPECIES_CORPHISH - .2byte SPECIES_CORSOLA - .2byte SPECIES_CRADILY - .2byte SPECIES_CRAWDAUNT - .2byte SPECIES_CROBAT - .2byte SPECIES_DELCATTY - .2byte SPECIES_DEOXYS - .2byte SPECIES_DODRIO - .2byte SPECIES_DODUO - .2byte SPECIES_DONPHAN - .2byte SPECIES_DUSCLOPS - .2byte SPECIES_DUSKULL - .2byte SPECIES_DUSTOX - .2byte SPECIES_ELECTRIKE - .2byte SPECIES_ELECTRODE - .2byte SPECIES_EXPLOUD - .2byte SPECIES_FEEBAS - .2byte SPECIES_FLYGON - .2byte SPECIES_GARDEVOIR - .2byte SPECIES_GEODUDE - .2byte SPECIES_GIRAFARIG - .2byte SPECIES_GLALIE - .2byte SPECIES_GLOOM - .2byte SPECIES_GOLBAT - .2byte SPECIES_GOLDEEN - .2byte SPECIES_GOLDUCK - .2byte SPECIES_GOLEM - .2byte SPECIES_GOREBYSS - .2byte SPECIES_GRAVELER - .2byte SPECIES_GRIMER - .2byte SPECIES_GROUDON - .2byte SPECIES_GROVYLE - .2byte SPECIES_GRUMPIG - .2byte SPECIES_GULPIN - .2byte SPECIES_GYARADOS - .2byte SPECIES_HARIYAMA - .2byte SPECIES_HERACROSS - .2byte SPECIES_HORSEA - .2byte SPECIES_HUNTAIL - .2byte SPECIES_IGGLYBUFF - .2byte SPECIES_ILLUMISE - .2byte SPECIES_JIGGLYPUFF - .2byte SPECIES_JIRACHI - .2byte SPECIES_KADABRA - .2byte SPECIES_KECLEON - .2byte SPECIES_KINGDRA - .2byte SPECIES_KIRLIA - .2byte SPECIES_KOFFING - .2byte SPECIES_KYOGRE - .2byte SPECIES_LAIRON - .2byte SPECIES_LANTURN - .2byte SPECIES_LATIAS - .2byte SPECIES_LATIOS - .2byte SPECIES_LILEEP - .2byte SPECIES_LINOONE - .2byte SPECIES_LOMBRE - .2byte SPECIES_LOTAD - .2byte SPECIES_LOUDRED - .2byte SPECIES_LUDICOLO - .2byte SPECIES_LUNATONE - .2byte SPECIES_LUVDISC - .2byte SPECIES_MACHAMP - .2byte SPECIES_MACHOKE - .2byte SPECIES_MACHOP - .2byte SPECIES_MAGCARGO - .2byte SPECIES_MAGIKARP - .2byte SPECIES_MAGNEMITE - .2byte SPECIES_MAGNETON - .2byte SPECIES_MAKUHITA - .2byte SPECIES_MANECTRIC - .2byte SPECIES_MARILL - .2byte SPECIES_MARSHTOMP - .2byte SPECIES_MASQUERAIN - .2byte SPECIES_MAWILE - .2byte SPECIES_MEDICHAM - .2byte SPECIES_MEDITITE - .2byte SPECIES_METAGROSS - .2byte SPECIES_METANG - .2byte SPECIES_MIGHTYENA - .2byte SPECIES_MILOTIC - .2byte SPECIES_MINUN - .2byte SPECIES_MUDKIP - .2byte SPECIES_MUK - .2byte SPECIES_NATU - .2byte SPECIES_NINCADA - .2byte SPECIES_NINETALES - .2byte SPECIES_NINJASK - .2byte SPECIES_NOSEPASS - .2byte SPECIES_NUMEL - .2byte SPECIES_NUZLEAF - .2byte SPECIES_ODDISH - .2byte SPECIES_PELIPPER - .2byte SPECIES_PHANPY - .2byte SPECIES_PICHU - .2byte SPECIES_PIKACHU - .2byte SPECIES_PINSIR - .2byte SPECIES_PLUSLE - .2byte SPECIES_POOCHYENA - .2byte SPECIES_PSYDUCK - .2byte SPECIES_RAICHU - .2byte SPECIES_RALTS - .2byte SPECIES_RAYQUAZA - .2byte SPECIES_REGICE - .2byte SPECIES_REGIROCK - .2byte SPECIES_REGISTEEL - .2byte SPECIES_RELICANTH - .2byte SPECIES_RHYDON - .2byte SPECIES_RHYHORN - .2byte SPECIES_ROSELIA - .2byte SPECIES_SABLEYE - .2byte SPECIES_SALAMENCE - .2byte SPECIES_SANDSHREW - .2byte SPECIES_SANDSLASH - .2byte SPECIES_SCEPTILE - .2byte SPECIES_SEADRA - .2byte SPECIES_SEAKING - .2byte SPECIES_SEALEO - .2byte SPECIES_SEEDOT - .2byte SPECIES_SEVIPER - .2byte SPECIES_SHARPEDO - .2byte SPECIES_SHEDINJA - .2byte SPECIES_SHELGON - .2byte SPECIES_SHIFTRY - .2byte SPECIES_SHROOMISH - .2byte SPECIES_SHUPPET - .2byte SPECIES_SILCOON - .2byte SPECIES_SKARMORY - .2byte SPECIES_SKITTY - .2byte SPECIES_SLAKING - .2byte SPECIES_SLAKOTH - .2byte SPECIES_SLUGMA - .2byte SPECIES_SNORUNT - .2byte SPECIES_SOLROCK - .2byte SPECIES_SPHEAL - .2byte SPECIES_SPINDA - .2byte SPECIES_SPOINK - .2byte SPECIES_STARMIE - .2byte SPECIES_STARYU - .2byte SPECIES_SURSKIT - .2byte SPECIES_SWABLU - .2byte SPECIES_SWALOT - .2byte SPECIES_SWAMPERT - .2byte SPECIES_SWELLOW - .2byte SPECIES_TAILLOW - .2byte SPECIES_TENTACOOL - .2byte SPECIES_TENTACRUEL - .2byte SPECIES_TORCHIC - .2byte SPECIES_TORKOAL - .2byte SPECIES_TRAPINCH - .2byte SPECIES_TREECKO - .2byte SPECIES_TROPIUS - .2byte SPECIES_VIBRAVA - .2byte SPECIES_VIGOROTH - .2byte SPECIES_VILEPLUME - .2byte SPECIES_VOLBEAT - .2byte SPECIES_VOLTORB - .2byte SPECIES_VULPIX - .2byte SPECIES_WAILMER - .2byte SPECIES_WAILORD - .2byte SPECIES_WALREIN - .2byte SPECIES_WEEZING - .2byte SPECIES_WHISCASH - .2byte SPECIES_WHISMUR - .2byte SPECIES_WIGGLYTUFF - .2byte SPECIES_WINGULL - .2byte SPECIES_WOBBUFFET - .2byte SPECIES_WURMPLE - .2byte SPECIES_WYNAUT - .2byte SPECIES_XATU - .2byte SPECIES_ZANGOOSE - .2byte SPECIES_ZIGZAGOON - .2byte SPECIES_ZUBAT diff --git a/data/text/easy_chat/easy_chat_group_pokemon2.s b/data/text/easy_chat/easy_chat_group_pokemon2.s deleted file mode 100644 index e2f58e496..000000000 --- a/data/text/easy_chat/easy_chat_group_pokemon2.s +++ /dev/null @@ -1,253 +0,0 @@ - .align 2 -gEasyChatGroup_Pokemon2:: @ 859CE0C - .2byte SPECIES_ABRA - .2byte SPECIES_AERODACTYL - .2byte SPECIES_AIPOM - .2byte SPECIES_ALAKAZAM - .2byte SPECIES_AMPHAROS - .2byte SPECIES_ARBOK - .2byte SPECIES_ARCANINE - .2byte SPECIES_ARIADOS - .2byte SPECIES_ARTICUNO - .2byte SPECIES_AZUMARILL - .2byte SPECIES_BAYLEEF - .2byte SPECIES_BEEDRILL - .2byte SPECIES_BELLOSSOM - .2byte SPECIES_BELLSPROUT - .2byte SPECIES_BLASTOISE - .2byte SPECIES_BLISSEY - .2byte SPECIES_BULBASAUR - .2byte SPECIES_BUTTERFREE - .2byte SPECIES_CATERPIE - .2byte SPECIES_CELEBI - .2byte SPECIES_CHANSEY - .2byte SPECIES_CHARIZARD - .2byte SPECIES_CHARMANDER - .2byte SPECIES_CHARMELEON - .2byte SPECIES_CHIKORITA - .2byte SPECIES_CHINCHOU - .2byte SPECIES_CLEFABLE - .2byte SPECIES_CLEFAIRY - .2byte SPECIES_CLEFFA - .2byte SPECIES_CLOYSTER - .2byte SPECIES_CORSOLA - .2byte SPECIES_CROBAT - .2byte SPECIES_CROCONAW - .2byte SPECIES_CUBONE - .2byte SPECIES_CYNDAQUIL - .2byte SPECIES_DELIBIRD - .2byte SPECIES_DEWGONG - .2byte SPECIES_DIGLETT - .2byte SPECIES_DITTO - .2byte SPECIES_DODRIO - .2byte SPECIES_DODUO - .2byte SPECIES_DONPHAN - .2byte SPECIES_DRAGONAIR - .2byte SPECIES_DRAGONITE - .2byte SPECIES_DRATINI - .2byte SPECIES_DROWZEE - .2byte SPECIES_DUGTRIO - .2byte SPECIES_DUNSPARCE - .2byte SPECIES_EEVEE - .2byte SPECIES_EKANS - .2byte SPECIES_ELECTABUZZ - .2byte SPECIES_ELECTRODE - .2byte SPECIES_ELEKID - .2byte SPECIES_ENTEI - .2byte SPECIES_ESPEON - .2byte SPECIES_EXEGGCUTE - .2byte SPECIES_EXEGGUTOR - .2byte SPECIES_FARFETCHD - .2byte SPECIES_FEAROW - .2byte SPECIES_FERALIGATR - .2byte SPECIES_FLAAFFY - .2byte SPECIES_FLAREON - .2byte SPECIES_FORRETRESS - .2byte SPECIES_FURRET - .2byte SPECIES_GASTLY - .2byte SPECIES_GENGAR - .2byte SPECIES_GEODUDE - .2byte SPECIES_GIRAFARIG - .2byte SPECIES_GLIGAR - .2byte SPECIES_GLOOM - .2byte SPECIES_GOLBAT - .2byte SPECIES_GOLDEEN - .2byte SPECIES_GOLDUCK - .2byte SPECIES_GOLEM - .2byte SPECIES_GRANBULL - .2byte SPECIES_GRAVELER - .2byte SPECIES_GRIMER - .2byte SPECIES_GROWLITHE - .2byte SPECIES_GYARADOS - .2byte SPECIES_HAUNTER - .2byte SPECIES_HERACROSS - .2byte SPECIES_HITMONCHAN - .2byte SPECIES_HITMONLEE - .2byte SPECIES_HITMONTOP - .2byte SPECIES_HO_OH - .2byte SPECIES_HOOTHOOT - .2byte SPECIES_HOPPIP - .2byte SPECIES_HORSEA - .2byte SPECIES_HOUNDOOM - .2byte SPECIES_HOUNDOUR - .2byte SPECIES_HYPNO - .2byte SPECIES_IGGLYBUFF - .2byte SPECIES_IVYSAUR - .2byte SPECIES_JIGGLYPUFF - .2byte SPECIES_JOLTEON - .2byte SPECIES_JUMPLUFF - .2byte SPECIES_JYNX - .2byte SPECIES_KABUTO - .2byte SPECIES_KABUTOPS - .2byte SPECIES_KADABRA - .2byte SPECIES_KAKUNA - .2byte SPECIES_KANGASKHAN - .2byte SPECIES_KINGDRA - .2byte SPECIES_KINGLER - .2byte SPECIES_KOFFING - .2byte SPECIES_KRABBY - .2byte SPECIES_LANTURN - .2byte SPECIES_LAPRAS - .2byte SPECIES_LARVITAR - .2byte SPECIES_LEDIAN - .2byte SPECIES_LEDYBA - .2byte SPECIES_LICKITUNG - .2byte SPECIES_LUGIA - .2byte SPECIES_MACHAMP - .2byte SPECIES_MACHOKE - .2byte SPECIES_MACHOP - .2byte SPECIES_MAGBY - .2byte SPECIES_MAGCARGO - .2byte SPECIES_MAGIKARP - .2byte SPECIES_MAGMAR - .2byte SPECIES_MAGNEMITE - .2byte SPECIES_MAGNETON - .2byte SPECIES_MANKEY - .2byte SPECIES_MANTINE - .2byte SPECIES_MAREEP - .2byte SPECIES_MARILL - .2byte SPECIES_MAROWAK - .2byte SPECIES_MEGANIUM - .2byte SPECIES_MEOWTH - .2byte SPECIES_METAPOD - .2byte SPECIES_MEW - .2byte SPECIES_MEWTWO - .2byte SPECIES_MILTANK - .2byte SPECIES_MISDREAVUS - .2byte SPECIES_MOLTRES - .2byte SPECIES_MR_MIME - .2byte SPECIES_MUK - .2byte SPECIES_MURKROW - .2byte SPECIES_NATU - .2byte SPECIES_NIDOKING - .2byte SPECIES_NIDOQUEEN - .2byte SPECIES_NIDORAN_F - .2byte SPECIES_NIDORAN_M - .2byte SPECIES_NIDORINA - .2byte SPECIES_NIDORINO - .2byte SPECIES_NINETALES - .2byte SPECIES_NOCTOWL - .2byte SPECIES_OCTILLERY - .2byte SPECIES_ODDISH - .2byte SPECIES_OMANYTE - .2byte SPECIES_OMASTAR - .2byte SPECIES_ONIX - .2byte SPECIES_PARAS - .2byte SPECIES_PARASECT - .2byte SPECIES_PERSIAN - .2byte SPECIES_PHANPY - .2byte SPECIES_PICHU - .2byte SPECIES_PIDGEOT - .2byte SPECIES_PIDGEOTTO - .2byte SPECIES_PIDGEY - .2byte SPECIES_PIKACHU - .2byte SPECIES_PILOSWINE - .2byte SPECIES_PINECO - .2byte SPECIES_PINSIR - .2byte SPECIES_POLITOED - .2byte SPECIES_POLIWAG - .2byte SPECIES_POLIWHIRL - .2byte SPECIES_POLIWRATH - .2byte SPECIES_PONYTA - .2byte SPECIES_PORYGON - .2byte SPECIES_PORYGON2 - .2byte SPECIES_PRIMEAPE - .2byte SPECIES_PSYDUCK - .2byte SPECIES_PUPITAR - .2byte SPECIES_QUAGSIRE - .2byte SPECIES_QUILAVA - .2byte SPECIES_QWILFISH - .2byte SPECIES_RAICHU - .2byte SPECIES_RAIKOU - .2byte SPECIES_RAPIDASH - .2byte SPECIES_RATICATE - .2byte SPECIES_RATTATA - .2byte SPECIES_REMORAID - .2byte SPECIES_RHYDON - .2byte SPECIES_RHYHORN - .2byte SPECIES_SANDSHREW - .2byte SPECIES_SANDSLASH - .2byte SPECIES_SCIZOR - .2byte SPECIES_SCYTHER - .2byte SPECIES_SEADRA - .2byte SPECIES_SEAKING - .2byte SPECIES_SEEL - .2byte SPECIES_SENTRET - .2byte SPECIES_SHELLDER - .2byte SPECIES_SHUCKLE - .2byte SPECIES_SKARMORY - .2byte SPECIES_SKIPLOOM - .2byte SPECIES_SLOWBRO - .2byte SPECIES_SLOWKING - .2byte SPECIES_SLOWPOKE - .2byte SPECIES_SLUGMA - .2byte SPECIES_SMEARGLE - .2byte SPECIES_SMOOCHUM - .2byte SPECIES_SNEASEL - .2byte SPECIES_SNORLAX - .2byte SPECIES_SNUBBULL - .2byte SPECIES_SPEAROW - .2byte SPECIES_SPINARAK - .2byte SPECIES_SQUIRTLE - .2byte SPECIES_STANTLER - .2byte SPECIES_STARMIE - .2byte SPECIES_STARYU - .2byte SPECIES_STEELIX - .2byte SPECIES_SUDOWOODO - .2byte SPECIES_SUICUNE - .2byte SPECIES_SUNFLORA - .2byte SPECIES_SUNKERN - .2byte SPECIES_SWINUB - .2byte SPECIES_TANGELA - .2byte SPECIES_TAUROS - .2byte SPECIES_TEDDIURSA - .2byte SPECIES_TENTACOOL - .2byte SPECIES_TENTACRUEL - .2byte SPECIES_TOGEPI - .2byte SPECIES_TOGETIC - .2byte SPECIES_TOTODILE - .2byte SPECIES_TYPHLOSION - .2byte SPECIES_TYRANITAR - .2byte SPECIES_TYROGUE - .2byte SPECIES_UMBREON - .2byte SPECIES_UNOWN - .2byte SPECIES_URSARING - .2byte SPECIES_VAPOREON - .2byte SPECIES_VENOMOTH - .2byte SPECIES_VENONAT - .2byte SPECIES_VENUSAUR - .2byte SPECIES_VICTREEBEL - .2byte SPECIES_VILEPLUME - .2byte SPECIES_VOLTORB - .2byte SPECIES_VULPIX - .2byte SPECIES_WARTORTLE - .2byte SPECIES_WEEDLE - .2byte SPECIES_WEEPINBELL - .2byte SPECIES_WEEZING - .2byte SPECIES_WIGGLYTUFF - .2byte SPECIES_WOBBUFFET - .2byte SPECIES_WOOPER - .2byte SPECIES_XATU - .2byte SPECIES_YANMA - .2byte SPECIES_ZAPDOS - .2byte SPECIES_ZUBAT diff --git a/data/text/easy_chat/easy_chat_group_speech.s b/data/text/easy_chat/easy_chat_group_speech.s deleted file mode 100644 index 4cfea7eca..000000000 --- a/data/text/easy_chat/easy_chat_group_speech.s +++ /dev/null @@ -1,421 +0,0 @@ -gEasyChatWord_Listen:: @ 8599CE8 - .string "LISTEN$" - -gEasyChatWord_NotVery:: @ 8599CEF - .string "NOT VERY$" - -gEasyChatWord_Mean:: @ 8599CF8 - .string "MEAN$" - -gEasyChatWord_Lie:: @ 8599CFD - .string "LIE$" - -gEasyChatWord_Lay:: @ 8599D01 - .string "LAY$" - -gEasyChatWord_Recommend:: @ 8599D05 - .string "RECOMMEND$" - -gEasyChatWord_Nitwit:: @ 8599D0F - .string "NITWIT$" - -gEasyChatWord_Quite:: @ 8599D16 - .string "QUITE$" - -gEasyChatWord_From:: @ 8599D1C - .string "FROM$" - -gEasyChatWord_Feeling:: @ 8599D21 - .string "FEELING$" - -gEasyChatWord_But:: @ 8599D29 - .string "BUT$" - -gEasyChatWord_However:: @ 8599D2D - .string "HOWEVER$" - -gEasyChatWord_Case:: @ 8599D35 - .string "CASE$" - -gEasyChatWord_The:: @ 8599D3A - .string "THE$" - -gEasyChatWord_Miss:: @ 8599D3E - .string "MISS$" - -gEasyChatWord_How:: @ 8599D43 - .string "HOW$" - -gEasyChatWord_Hit:: @ 8599D47 - .string "HIT$" - -gEasyChatWord_Enough:: @ 8599D4B - .string "ENOUGH$" - -gEasyChatWord_ALot:: @ 8599D52 - .string "A LOT$" - -gEasyChatWord_ALittle:: @ 8599D58 - .string "A LITTLE$" - -gEasyChatWord_Absolutely:: @ 8599D61 - .string "ABSOLUTELY$" - -gEasyChatWord_And:: @ 8599D6C - .string "AND$" - -gEasyChatWord_Only:: @ 8599D70 - .string "ONLY$" - -gEasyChatWord_Around:: @ 8599D75 - .string "AROUND$" - -gEasyChatWord_Probably:: @ 8599D7C - .string "PROBABLY$" - -gEasyChatWord_If:: @ 8599D85 - .string "IF$" - -gEasyChatWord_Very:: @ 8599D88 - .string "VERY$" - -gEasyChatWord_ATinyBit:: @ 8599D8D - .string "A TINY BIT$" - -gEasyChatWord_Wild:: @ 8599D98 - .string "WILD$" - -gEasyChatWord_Thats:: @ 8599D9D - .string "THAT'S$" - -gEasyChatWord_Just:: @ 8599DA4 - .string "JUST$" - -gEasyChatWord_EvenSo:: @ 8599DA9 - .string "EVEN SO,$" - -gEasyChatWord_MustBe:: @ 8599DB2 - .string "MUST BE$" - -gEasyChatWord_Naturally:: @ 8599DBA - .string "NATURALLY$" - -gEasyChatWord_ForNow:: @ 8599DC4 - .string "FOR NOW,$" - -gEasyChatWord_Understood:: @ 8599DCD - .string "UNDERSTOOD$" - -gEasyChatWord_Joking:: @ 8599DD8 - .string "JOKING$" - -gEasyChatWord_Ready:: @ 8599DDF - .string "READY$" - -gEasyChatWord_Something:: @ 8599DE5 - .string "SOMETHING$" - -gEasyChatWord_Somehow:: @ 8599DEF - .string "SOMEHOW$" - -gEasyChatWord_Although:: @ 8599DF7 - .string "ALTHOUGH$" - -gEasyChatWord_Also:: @ 8599E00 - .string "ALSO$" - -gEasyChatWord_Perfect:: @ 8599E05 - .string "PERFECT$" - -gEasyChatWord_AsMuchAs:: @ 8599E0D - .string "AS MUCH AS$" - -gEasyChatWord_Really:: @ 8599E18 - .string "REALLY$" - -gEasyChatWord_Truly:: @ 8599E1F - .string "TRULY$" - -gEasyChatWord_Seriously:: @ 8599E25 - .string "SERIOUSLY$" - -gEasyChatWord_Totally:: @ 8599E2F - .string "TOTALLY$" - -gEasyChatWord_Until:: @ 8599E37 - .string "UNTIL$" - -gEasyChatWord_AsIf:: @ 8599E3D - .string "AS IF$" - -gEasyChatWord_Mood:: @ 8599E43 - .string "MOOD$" - -gEasyChatWord_Rather:: @ 8599E48 - .string "RATHER$" - -gEasyChatWord_Awfully:: @ 8599E4F - .string "AWFULLY$" - -gEasyChatWord_Mode:: @ 8599E57 - .string "MODE$" - -gEasyChatWord_More:: @ 8599E5C - .string "MORE$" - -gEasyChatWord_TooLate:: @ 8599E61 - .string "TOO LATE$" - -gEasyChatWord_Finally:: @ 8599E6A - .string "FINALLY$" - -gEasyChatWord_Any:: @ 8599E72 - .string "ANY$" - -gEasyChatWord_Instead:: @ 8599E76 - .string "INSTEAD$" - -gEasyChatWord_Fantastic:: @ 8599E7E - .string "FANTASTIC$" - - .align 2 -gEasyChatGroup_Speech:: @ 8599E88 - .4byte gEasyChatWord_Listen - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_NotVery - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mean - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lie - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lay - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Recommend - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nitwit - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Quite - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_From - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Feeling - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_But - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_However - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Case - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_The - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Miss - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_How - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hit - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Enough - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ALot - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ALittle - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Absolutely - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_And - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Only - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Around - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Probably - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_If - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Very - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ATinyBit - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wild - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Thats - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Just - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_EvenSo - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_MustBe - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Naturally - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ForNow - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Understood - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Joking - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ready - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Something - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Somehow - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Although - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Also - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Perfect - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_AsMuchAs - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Really - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Truly - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Seriously - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Totally - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Until - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_AsIf - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mood - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rather - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Awfully - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mode - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_More - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_TooLate - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Finally - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Any - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Instead - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fantastic - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_status.s b/data/text/easy_chat/easy_chat_group_status.s deleted file mode 100644 index db945423f..000000000 --- a/data/text/easy_chat/easy_chat_group_status.s +++ /dev/null @@ -1,764 +0,0 @@ -gEasyChatWord_Dark:: @ 8598234 - .string "DARK$" - -gEasyChatWord_Stench:: @ 8598239 - .string "STENCH$" - -gEasyChatWord_ThickFat:: @ 8598240 - .string "THICK FAT$" - -gEasyChatWord_RainDish:: @ 859824A - .string "RAIN DISH$" - -gEasyChatWord_Drizzle:: @ 8598254 - .string "DRIZZLE$" - -gEasyChatWord_ArenaTrap:: @ 859825C - .string "ARENA TRAP$" - -gEasyChatWord_Intimidate:: @ 8598267 - .string "INTIMIDATE$" - -gEasyChatWord_RockHead:: @ 8598272 - .string "ROCK HEAD$" - -gEasyChatWord_Color:: @ 859827C - .string "COLOR$" - -gEasyChatWord_AltColor:: @ 8598282 - .string "ALT. COLOR$" - -gEasyChatWord_Rock:: @ 859828D - .string "ROCK$" - -gEasyChatWord_Beautiful:: @ 8598292 - .string "BEAUTIFUL$" - -gEasyChatWord_Beauty:: @ 859829C - .string "BEAUTY$" - -gEasyChatWord_AirLock:: @ 85982A3 - .string "AIR LOCK$" - -gEasyChatWord_Psychic:: @ 85982AC - .string "PSYCHIC$" - -gEasyChatWord_HyperCutter:: @ 85982B4 - .string "HYPER CUTTER$" - -gEasyChatWord_Fighting:: @ 85982C1 - .string "FIGHTING$" - -gEasyChatWord_ShadowTag:: @ 85982CA - .string "SHADOW TAG$" - -gEasyChatWord_Smart:: @ 85982D5 - .string "SMART$" - -gEasyChatWord_Smartness:: @ 85982DB - .string "SMARTNESS$" - -gEasyChatWord_SpeedBoost:: @ 85982E5 - .string "SPEED BOOST$" - -gEasyChatWord_Cool:: @ 85982F1 - .string "COOL$" - -gEasyChatWord_Coolness:: @ 85982F6 - .string "COOLNESS$" - -gEasyChatWord_BattleArmor:: @ 85982FF - .string "BATTLE ARMOR$" - -gEasyChatWord_Cute:: @ 859830C - .string "CUTE$" - -gEasyChatWord_Cuteness:: @ 8598311 - .string "CUTENESS$" - -gEasyChatWord_Sturdy:: @ 859831A - .string "STURDY$" - -gEasyChatWord_SuctionCups:: @ 8598321 - .string "SUCTION CUPS$" - -gEasyChatWord_Grass:: @ 859832E - .string "GRASS$" - -gEasyChatWord_ClearBody:: @ 8598334 - .string "CLEAR BODY$" - -gEasyChatWord_Torrent:: @ 859833F - .string "TORRENT$" - -gEasyChatWord_Ghost:: @ 8598347 - .string "GHOST$" - -gEasyChatWord_Ice:: @ 859834D - .string "ICE$" - -gEasyChatWord_Guts:: @ 8598351 - .string "GUTS$" - -gEasyChatWord_RoughSkin:: @ 8598356 - .string "ROUGH SKIN$" - -gEasyChatWord_ShellArmor:: @ 8598361 - .string "SHELL ARMOR$" - -gEasyChatWord_NaturalCure:: @ 859836D - .string "NATURAL CURE$" - -gEasyChatWord_Damp:: @ 859837A - .string "DAMP$" - -gEasyChatWord_Ground:: @ 859837F - .string "GROUND$" - -gEasyChatWord_Limber:: @ 8598386 - .string "LIMBER$" - -gEasyChatWord_MagnetPull:: @ 859838D - .string "MAGNET PULL$" - -gEasyChatWord_WhiteSmoke:: @ 8598399 - .string "WHITE SMOKE$" - -gEasyChatWord_Synchronize:: @ 85983A5 - .string "SYNCHRONIZE$" - -gEasyChatWord_Overgrow:: @ 85983B1 - .string "OVERGROW$" - -gEasyChatWord_SwiftSwim:: @ 85983BA - .string "SWIFT SWIM$" - -gEasyChatWord_SandStream:: @ 85983C5 - .string "SAND STREAM$" - -gEasyChatWord_SandVeil:: @ 85983D1 - .string "SAND VEIL$" - -gEasyChatWord_KeenEye:: @ 85983DB - .string "KEEN EYE$" - -gEasyChatWord_InnerFocus:: @ 85983E4 - .string "INNER FOCUS$" - -gEasyChatWord_Static:: @ 85983F0 - .string "STATIC$" - -gEasyChatWord_Type:: @ 85983F7 - .string "TYPE$" - -gEasyChatWord_Tough:: @ 85983FC - .string "TOUGH$" - -gEasyChatWord_Toughness:: @ 8598402 - .string "TOUGHNESS$" - -gEasyChatWord_ShedSkin:: @ 859840C - .string "SHED SKIN$" - -gEasyChatWord_HugePower:: @ 8598416 - .string "HUGE POWER$" - -gEasyChatWord_VoltAbsorb:: @ 8598421 - .string "VOLT ABSORB$" - -gEasyChatWord_WaterAbsorb:: @ 859842D - .string "WATER ABSORB$" - -gEasyChatWord_Electric:: @ 859843A - .string "ELECTRIC$" - -gEasyChatWord_Forecast:: @ 8598443 - .string "FORECAST$" - -gEasyChatWord_SereneGrace:: @ 859844C - .string "SERENE GRACE$" - -gEasyChatWord_Poison:: @ 8598459 - .string "POISON$" - -gEasyChatWord_PoisonPoint:: @ 8598460 - .string "POISON POINT$" - -gEasyChatWord_Dragon:: @ 859846D - .string "DRAGON$" - -gEasyChatWord_Trace:: @ 8598474 - .string "TRACE$" - -gEasyChatWord_Oblivious:: @ 859847A - .string "OBLIVIOUS$" - -gEasyChatWord_Truant:: @ 8598484 - .string "TRUANT$" - -gEasyChatWord_RunAway:: @ 859848B - .string "RUN AWAY$" - -gEasyChatWord_StickyHold:: @ 8598494 - .string "STICKY HOLD$" - -gEasyChatWord_CloudNine:: @ 85984A0 - .string "CLOUD NINE$" - -gEasyChatWord_Normal:: @ 85984AB - .string "NORMAL$" - -gEasyChatWord_Steel:: @ 85984B2 - .string "STEEL$" - -gEasyChatWord_Illuminate:: @ 85984B8 - .string "ILLUMINATE$" - -gEasyChatWord_EarlyBird:: @ 85984C3 - .string "EARLY BIRD$" - -gEasyChatWord_Hustle:: @ 85984CE - .string "HUSTLE$" - -gEasyChatWord_Shine:: @ 85984D5 - .string "SHINE$" - -gEasyChatWord_Flying:: @ 85984DB - .string "FLYING$" - -gEasyChatWord_Drought:: @ 85984E2 - .string "DROUGHT$" - -gEasyChatWord_Lightningrod:: @ 85984EA - .string "LIGHTNINGROD$" - -gEasyChatWord_Compoundeyes:: @ 85984F7 - .string "COMPOUNDEYES$" - -gEasyChatWord_MarvelScale:: @ 8598504 - .string "MARVEL SCALE$" - -gEasyChatWord_WonderGuard:: @ 8598511 - .string "WONDER GUARD$" - -gEasyChatWord_Insomnia:: @ 859851E - .string "INSOMNIA$" - -gEasyChatWord_Levitate:: @ 8598527 - .string "LEVITATE$" - -gEasyChatWord_Plus:: @ 8598530 - .string "PLUS$" - -gEasyChatWord_Pressure:: @ 8598535 - .string "PRESSURE$" - -gEasyChatWord_LiquidOoze:: @ 859853E - .string "LIQUID OOZE$" - -gEasyChatWord_ColorChange:: @ 859854A - .string "COLOR CHANGE$" - -gEasyChatWord_Soundproof:: @ 8598557 - .string "SOUNDPROOF$" - -gEasyChatWord_EffectSpore:: @ 8598562 - .string "EFFECT SPORE$" - -gEasyChatWord_Pkrs:: @ 859856F - .string "{PK}RS$" - -gEasyChatWord_Fire:: @ 8598573 - .string "FIRE$" - -gEasyChatWord_FlameBody:: @ 8598578 - .string "FLAME BODY$" - -gEasyChatWord_Minus:: @ 8598583 - .string "MINUS$" - -gEasyChatWord_OwnTempo:: @ 8598589 - .string "OWN TEMPO$" - -gEasyChatWord_MagmaArmor:: @ 8598593 - .string "MAGMA ARMOR$" - -gEasyChatWord_Water:: @ 859859F - .string "WATER$" - -gEasyChatWord_WaterVeil:: @ 85985A5 - .string "WATER VEIL$" - -gEasyChatWord_Bug:: @ 85985B0 - .string "BUG$" - -gEasyChatWord_Swarm:: @ 85985B4 - .string "SWARM$" - -gEasyChatWord_CuteCharm:: @ 85985BA - .string "CUTE CHARM$" - -gEasyChatWord_Immunity:: @ 85985C5 - .string "IMMUNITY$" - -gEasyChatWord_Blaze:: @ 85985CE - .string "BLAZE$" - -gEasyChatWord_Pickup:: @ 85985D4 - .string "PICKUP$" - -gEasyChatWord_Pattern:: @ 85985DB - .string "PATTERN$" - -gEasyChatWord_FlashFire:: @ 85985E3 - .string "FLASH FIRE$" - -gEasyChatWord_VitalSpirit:: @ 85985EE - .string "VITAL SPIRIT$" - -gEasyChatWord_Chlorophyll:: @ 85985FB - .string "CHLOROPHYLL$" - -gEasyChatWord_PurePower:: @ 8598607 - .string "PURE POWER$" - -gEasyChatWord_ShieldDust:: @ 8598612 - .string "SHIELD DUST$" - - .align 2 -gEasyChatGroup_Status:: @ 8598620 - .4byte gEasyChatWord_Dark - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Stench - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ThickFat - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_RainDish - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Drizzle - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ArenaTrap - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Intimidate - .4byte 101 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_RockHead - .4byte 97 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Color - .4byte 106 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_AltColor - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Rock - .4byte 68 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Beautiful - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Beauty - .4byte 86 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_AirLock - .4byte 78 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Psychic - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HyperCutter - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fighting - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ShadowTag - .4byte 99 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Smart - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Smartness - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SpeedBoost - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cool - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Coolness - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_BattleArmor - .4byte 76 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cute - .4byte 72 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cuteness - .4byte 88 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sturdy - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SuctionCups - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Grass - .4byte 90 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ClearBody - .4byte 91 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Torrent - .4byte 104 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ghost - .4byte 75 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ice - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Guts - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_RoughSkin - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ShellArmor - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_NaturalCure - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Damp - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ground - .4byte 73 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Limber - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_MagnetPull - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WhiteSmoke - .4byte 71 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Synchronize - .4byte 100 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Overgrow - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SwiftSwim - .4byte 81 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SandStream - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SandVeil - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_KeenEye - .4byte 82 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_InnerFocus - .4byte 77 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Static - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Type - .4byte 85 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tough - .4byte 94 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Toughness - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ShedSkin - .4byte 79 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HugePower - .4byte 92 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_VoltAbsorb - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WaterAbsorb - .4byte 69 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Electric - .4byte 64 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Forecast - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SereneGrace - .4byte 93 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Poison - .4byte 103 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_PoisonPoint - .4byte 102 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dragon - .4byte 89 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Trace - .4byte 83 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Oblivious - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Truant - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_RunAway - .4byte 84 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_StickyHold - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_CloudNine - .4byte 107 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Normal - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Steel - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Illuminate - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_EarlyBird - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hustle - .4byte 66 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shine - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Flying - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Drought - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lightningrod - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Compoundeyes - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_MarvelScale - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WonderGuard - .4byte 108 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Insomnia - .4byte 74 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Levitate - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Plus - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pressure - .4byte 87 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_LiquidOoze - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ColorChange - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Soundproof - .4byte 70 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_EffectSpore - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pkrs - .4byte 67 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fire - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_FlameBody - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Minus - .4byte 98 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_OwnTempo - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_MagmaArmor - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Water - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WaterVeil - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Bug - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Swarm - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_CuteCharm - .4byte 63 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Immunity - .4byte 65 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Blaze - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pickup - .4byte 105 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pattern - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_FlashFire - .4byte 95 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_VitalSpirit - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Chlorophyll - .4byte 96 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_PurePower - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ShieldDust - .4byte 80 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_time.s b/data/text/easy_chat/easy_chat_group_time.s deleted file mode 100644 index 1604eaf50..000000000 --- a/data/text/easy_chat/easy_chat_group_time.s +++ /dev/null @@ -1,316 +0,0 @@ -gEasyChatWord_Fall:: @ 859BD64 - .string "FALL$" - -gEasyChatWord_Morning:: @ 859BD69 - .string "MORNING$" - -gEasyChatWord_Tomorrow:: @ 859BD71 - .string "TOMORROW$" - -gEasyChatWord_Last:: @ 859BD7A - .string "LAST$" - -gEasyChatWord_Day:: @ 859BD7F - .string "DAY$" - -gEasyChatWord_Sometime:: @ 859BD83 - .string "SOMETIME$" - -gEasyChatWord_Always:: @ 859BD8C - .string "ALWAYS$" - -gEasyChatWord_Current:: @ 859BD93 - .string "CURRENT$" - -gEasyChatWord_Forever:: @ 859BD9B - .string "FOREVER$" - -gEasyChatWord_Days:: @ 859BDA3 - .string "DAYS$" - -gEasyChatWord_End:: @ 859BDA8 - .string "END$" - -gEasyChatWord_Tuesday:: @ 859BDAC - .string "TUESDAY$" - -gEasyChatWord_Yesterday:: @ 859BDB4 - .string "YESTERDAY$" - -gEasyChatWord_Today:: @ 859BDBE - .string "TODAY$" - -gEasyChatWord_Friday:: @ 859BDC4 - .string "FRIDAY$" - -gEasyChatWord_Monday:: @ 859BDCB - .string "MONDAY$" - -gEasyChatWord_Later:: @ 859BDD2 - .string "LATER$" - -gEasyChatWord_Earlier:: @ 859BDD8 - .string "EARLIER$" - -gEasyChatWord_Another:: @ 859BDE0 - .string "ANOTHER$" - -gEasyChatWord_Time:: @ 859BDE8 - .string "TIME$" - -gEasyChatWord_Finish:: @ 859BDED - .string "FINISH$" - -gEasyChatWord_Wednesday:: @ 859BDF4 - .string "WEDNESDAY$" - -gEasyChatWord_Soon:: @ 859BDFE - .string "SOON$" - -gEasyChatWord_Start:: @ 859BE03 - .string "START$" - -gEasyChatWord_Month:: @ 859BE09 - .string "MONTH$" - -gEasyChatWord_Stop:: @ 859BE0F - .string "STOP$" - -gEasyChatWord_Now:: @ 859BE14 - .string "NOW$" - -gEasyChatWord_Final:: @ 859BE18 - .string "FINAL$" - -gEasyChatWord_Next:: @ 859BE1E - .string "NEXT$" - -gEasyChatWord_Age:: @ 859BE23 - .string "AGE$" - -gEasyChatWord_Saturday:: @ 859BE27 - .string "SATURDAY$" - -gEasyChatWord_Summer:: @ 859BE30 - .string "SUMMER$" - -gEasyChatWord_Sunday:: @ 859BE37 - .string "SUNDAY$" - -gEasyChatWord_Beginning:: @ 859BE3E - .string "BEGINNING$" - -gEasyChatWord_Spring:: @ 859BE48 - .string "SPRING$" - -gEasyChatWord_Daytime:: @ 859BE4F - .string "DAYTIME$" - -gEasyChatWord_Winter:: @ 859BE57 - .string "WINTER$" - -gEasyChatWord_Daily:: @ 859BE5E - .string "DAILY$" - -gEasyChatWord_Olden:: @ 859BE64 - .string "OLDEN$" - -gEasyChatWord_Almost:: @ 859BE6A - .string "ALMOST$" - -gEasyChatWord_Nearly:: @ 859BE71 - .string "NEARLY$" - -gEasyChatWord_Thursday:: @ 859BE78 - .string "THURSDAY$" - -gEasyChatWord_Nighttime:: @ 859BE81 - .string "NIGHTTIME$" - -gEasyChatWord_Night:: @ 859BE8B - .string "NIGHT$" - -gEasyChatWord_Week:: @ 859BE91 - .string "WEEK$" - - .align 2 -gEasyChatGroup_Time:: @ 859BE98 - .4byte gEasyChatWord_Fall - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Morning - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tomorrow - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Last - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Day - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sometime - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Always - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Current - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Forever - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Days - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_End - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tuesday - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yesterday - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Today - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Friday - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Monday - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Later - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Earlier - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Another - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Time - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Finish - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wednesday - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Soon - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Start - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Month - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Stop - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Now - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Final - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Next - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Age - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Saturday - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Summer - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sunday - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Beginning - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Spring - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Daytime - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Winter - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Daily - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Olden - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Almost - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nearly - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Thursday - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nighttime - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Night - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Week - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_trainer.s b/data/text/easy_chat/easy_chat_group_trainer.s deleted file mode 100644 index 23a3b0b6a..000000000 --- a/data/text/easy_chat/easy_chat_group_trainer.s +++ /dev/null @@ -1,190 +0,0 @@ -gEasyChatWord_IChooseYou:: @ 8598030 - .string "I CHOOSE YOU$" - -gEasyChatWord_Gotcha:: @ 859803D - .string "GOTCHA$" - -gEasyChatWord_Trade:: @ 8598044 - .string "TRADE$" - -gEasyChatWord_Sapphire:: @ 859804A - .string "SAPPHIRE$" - -gEasyChatWord_Evolve:: @ 8598053 - .string "EVOLVE$" - -gEasyChatWord_Encyclopedia:: @ 859805A - .string "ENCYCLOPEDIA$" - -gEasyChatWord_Nature:: @ 8598067 - .string "NATURE$" - -gEasyChatWord_Center:: @ 859806E - .string "CENTER$" - -gEasyChatWord_Egg:: @ 8598075 - .string "EGG$" - -gEasyChatWord_Link:: @ 8598079 - .string "LINK$" - -gEasyChatWord_SpAbility:: @ 859807E - .string "SP. ABILITY$" - -gEasyChatWord_Trainer:: @ 859808A - .string "TRAINER$" - -gEasyChatWord_Version:: @ 8598092 - .string "VERSION$" - -gEasyChatWord_Pokenav:: @ 859809A - .string "POKéNAV$" - -gEasyChatWord_Pokemon:: @ 85980A2 - .string "POKéMON$" - -gEasyChatWord_Get:: @ 85980AA - .string "GET$" - -gEasyChatWord_Pokedex:: @ 85980AE - .string "POKéDEX$" - -gEasyChatWord_Ruby:: @ 85980B6 - .string "RUBY$" - -gEasyChatWord_Level:: @ 85980BB - .string "LEVEL$" - -gEasyChatWord_Red:: @ 85980C1 - .string "RED$" - -gEasyChatWord_Green:: @ 85980C5 - .string "GREEN$" - -gEasyChatWord_Bag:: @ 85980CB - .string "BAG$" - -gEasyChatWord_Flame:: @ 85980CF - .string "FLAME$" - -gEasyChatWord_Gold:: @ 85980D5 - .string "GOLD$" - -gEasyChatWord_Leaf:: @ 85980DA - .string "LEAF$" - -gEasyChatWord_Silver:: @ 85980DF - .string "SILVER$" - -gEasyChatWord_Emerald:: @ 85980E6 - .string "EMERALD$" - - .align 2 -gEasyChatGroup_Trainer:: @ 85980F0 - .4byte gEasyChatWord_IChooseYou - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gotcha - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Trade - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sapphire - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Evolve - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Encyclopedia - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nature - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Center - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Egg - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Link - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SpAbility - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Trainer - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Version - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pokenav - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pokemon - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Get - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Pokedex - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ruby - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Level - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Red - .4byte 19 @ alphabetical order - .4byte FALSE @ enabled - - .4byte gEasyChatWord_Green - .4byte 17 @ alphabetical order - .4byte FALSE @ enabled - - .4byte gEasyChatWord_Bag - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Flame - .4byte 25 @ alphabetical order - .4byte FALSE @ enabled - - .4byte gEasyChatWord_Gold - .4byte 10 @ alphabetical order - .4byte FALSE @ enabled - - .4byte gEasyChatWord_Leaf - .4byte 2 @ alphabetical order - .4byte FALSE @ enabled - - .4byte gEasyChatWord_Silver - .4byte 11 @ alphabetical order - .4byte FALSE @ enabled - - .4byte gEasyChatWord_Emerald - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_trendy_saying.s b/data/text/easy_chat/easy_chat_group_trendy_saying.s deleted file mode 100644 index 3e9f7291e..000000000 --- a/data/text/easy_chat/easy_chat_group_trendy_saying.s +++ /dev/null @@ -1,232 +0,0 @@ -gEasyChatWord_KthxBye:: @ 859CB88 - .string "KTHX, BYE.$" - -gEasyChatWord_YesSirExcl:: @ 859CB93 - .string "YES, SIR!$" - -gEasyChatWord_AvantGarde:: @ 859CB9D - .string "AVANT GARDE$" - -gEasyChatWord_Couple:: @ 859CBA9 - .string "COUPLE$" - -gEasyChatWord_MuchObliged:: @ 859CBB0 - .string "MUCH OBLIGED$" - -gEasyChatWord_YeehawExcl:: @ 859CBBD - .string "YEEHAW!$" - -gEasyChatWord_Mega:: @ 859CBC5 - .string "MEGA$" - -gEasyChatWord_1HitKOExcl:: @ 859CBCA - .string "1-HIT KO!$" - -gEasyChatWord_Destiny:: @ 859CBD4 - .string "DESTINY$" - -gEasyChatWord_Cancel:: @ 859CBDC - .string "CANCEL$" - -gEasyChatWord_New:: @ 859CBE3 - .string "NEW$" - -gEasyChatWord_Flatten:: @ 859CBE7 - .string "FLATTEN$" - -gEasyChatWord_Kidding:: @ 859CBEF - .string "KIDDING$" - -gEasyChatWord_Loser:: @ 859CBF7 - .string "LOSER$" - -gEasyChatWord_Losing:: @ 859CBFD - .string "LOSING$" - -gEasyChatWord_Happening:: @ 859CC04 - .string "HAPPENING$" - -gEasyChatWord_HipAnd:: @ 859CC0E - .string "HIP AND$" - -gEasyChatWord_Shake:: @ 859CC16 - .string "SHAKE$" - -gEasyChatWord_Shady:: @ 859CC1C - .string "SHADY$" - -gEasyChatWord_Upbeat:: @ 859CC22 - .string "UPBEAT$" - -gEasyChatWord_Modern:: @ 859CC29 - .string "MODERN$" - -gEasyChatWord_SmellYa:: @ 859CC30 - .string "SMELL YA$" - -gEasyChatWord_Bang:: @ 859CC39 - .string "BANG$" - -gEasyChatWord_Knockout:: @ 859CC3E - .string "KNOCKOUT$" - -gEasyChatWord_Hassle:: @ 859CC47 - .string "HASSLE$" - -gEasyChatWord_Winner:: @ 859CC4E - .string "WINNER$" - -gEasyChatWord_Fever:: @ 859CC55 - .string "FEVER$" - -gEasyChatWord_Wannabe:: @ 859CC5B - .string "WANNABE$" - -gEasyChatWord_Baby:: @ 859CC63 - .string "BABY$" - -gEasyChatWord_Heart:: @ 859CC68 - .string "HEART$" - -gEasyChatWord_Old:: @ 859CC6E - .string "OLD$" - -gEasyChatWord_Young:: @ 859CC72 - .string "YOUNG$" - -gEasyChatWord_Ugly:: @ 859CC78 - .string "UGLY$" - - .align 2 -gEasyChatGroup_TrendySaying:: @ 859CC80 - .4byte gEasyChatWord_KthxBye - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_YesSirExcl - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_AvantGarde - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Couple - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_MuchObliged - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_YeehawExcl - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mega - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_1HitKOExcl - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Destiny - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cancel - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_New - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Flatten - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Kidding - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Loser - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Losing - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Happening - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_HipAnd - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shake - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shady - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Upbeat - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Modern - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_SmellYa - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Bang - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Knockout - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hassle - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Winner - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fever - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wannabe - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Baby - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Heart - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Old - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Young - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ugly - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_group_voices.s b/data/text/easy_chat/easy_chat_group_voices.s deleted file mode 100644 index 548576fd3..000000000 --- a/data/text/easy_chat/easy_chat_group_voices.s +++ /dev/null @@ -1,442 +0,0 @@ -gEasyChatWord_Excl:: @ 8599890 - .string "!$" - -gEasyChatWord_ExclExcl:: @ 8599892 - .string "!!$" - -gEasyChatWord_QuesExcl:: @ 8599895 - .string "?!$" - -gEasyChatWord_Ques:: @ 8599898 - .string "?$" - -gEasyChatWord_Ellipsis:: @ 859989A - .string "…$" - -gEasyChatWord_EllipsisExcl:: @ 859989C - .string "…!$" - -gEasyChatWord_EllipsisEllipsisEllipsis:: @ 859989F - .string "………$" - -gEasyChatWord_Dash:: @ 85998A3 - .string "-$" - -gEasyChatWord_DashDashDash:: @ 85998A5 - .string "- - -$" - -gEasyChatWord_UhOh:: @ 85998AB - .string "UH-OH$" - -gEasyChatWord_Waaah:: @ 85998B1 - .string "WAAAH$" - -gEasyChatWord_Ahaha:: @ 85998B7 - .string "AHAHA$" - -gEasyChatWord_OhQues:: @ 85998BD - .string "OH?$" - -gEasyChatWord_Nope:: @ 85998C1 - .string "NOPE$" - -gEasyChatWord_Urgh:: @ 85998C6 - .string "URGH$" - -gEasyChatWord_Hmm:: @ 85998CB - .string "HMM$" - -gEasyChatWord_Whoah:: @ 85998CF - .string "WHOAH$" - -gEasyChatWord_WroooaarExcl:: @ 85998D5 - .string "WROOOAAR!$" - -gEasyChatWord_Wow:: @ 85998DF - .string "WOW$" - -gEasyChatWord_Giggle:: @ 85998E3 - .string "GIGGLE$" - -gEasyChatWord_Sigh:: @ 85998EA - .string "SIGH$" - -gEasyChatWord_Unbelievable:: @ 85998EF - .string "UNBELIEVABLE$" - -gEasyChatWord_Cries:: @ 85998FC - .string "CRIES$" - -gEasyChatWord_Agree:: @ 8599902 - .string "AGREE$" - -gEasyChatWord_EhQues:: @ 8599908 - .string "EH?$" - -gEasyChatWord_Cry:: @ 859990C - .string "CRY$" - -gEasyChatWord_Ehehe:: @ 8599910 - .string "EHEHE$" - -gEasyChatWord_OiOiOi:: @ 8599916 - .string "OI, OI, OI$" - -gEasyChatWord_OhYeah:: @ 8599921 - .string "OH, YEAH$" - -gEasyChatWord_Oh:: @ 859992A - .string "OH$" - -gEasyChatWord_Oops:: @ 859992D - .string "OOPS$" - -gEasyChatWord_Shocked:: @ 8599932 - .string "SHOCKED$" - -gEasyChatWord_Eek:: @ 859993A - .string "EEK$" - -gEasyChatWord_Graaah:: @ 859993E - .string "GRAAAH$" - -gEasyChatWord_Gwahahaha:: @ 8599945 - .string "GWAHAHAHA$" - -gEasyChatWord_Way:: @ 859994F - .string "WAY$" - -gEasyChatWord_Tch:: @ 8599953 - .string "TCH$" - -gEasyChatWord_Hehe:: @ 8599957 - .string "HEHE$" - -gEasyChatWord_Hah:: @ 859995C - .string "HAH$" - -gEasyChatWord_Yup:: @ 8599960 - .string "YUP$" - -gEasyChatWord_Hahaha:: @ 8599964 - .string "HAHAHA$" - -gEasyChatWord_Aiyeeh:: @ 859996B - .string "AIYEEH$" - -gEasyChatWord_Hiyah:: @ 8599972 - .string "HIYAH$" - -gEasyChatWord_Fufufu:: @ 8599978 - .string "FUFUFU$" - -gEasyChatWord_Lol:: @ 859997F - .string "LOL$" - -gEasyChatWord_Snort:: @ 8599983 - .string "SNORT$" - -gEasyChatWord_Humph:: @ 8599989 - .string "HUMPH$" - -gEasyChatWord_Hehehe:: @ 859998F - .string "HEHEHE$" - -gEasyChatWord_Heh:: @ 8599996 - .string "HEH$" - -gEasyChatWord_Hohoho:: @ 859999A - .string "HOHOHO$" - -gEasyChatWord_UhHuh:: @ 85999A1 - .string "UH-HUH$" - -gEasyChatWord_OhDear:: @ 85999A8 - .string "OH, DEAR$" - -gEasyChatWord_Arrgh:: @ 85999B1 - .string "ARRGH$" - -gEasyChatWord_Mufufu:: @ 85999B7 - .string "MUFUFU$" - -gEasyChatWord_Mmm:: @ 85999BE - .string "MMM$" - -gEasyChatWord_OhKay:: @ 85999C2 - .string "OH-KAY$" - -gEasyChatWord_Okay:: @ 85999C9 - .string "OKAY$" - -gEasyChatWord_Lalala:: @ 85999CE - .string "LALALA$" - -gEasyChatWord_Yay:: @ 85999D5 - .string "YAY$" - -gEasyChatWord_Aww:: @ 85999D9 - .string "AWW$" - -gEasyChatWord_Wowee:: @ 85999DD - .string "WOWEE$" - -gEasyChatWord_Gwah:: @ 85999E3 - .string "GWAH$" - -gEasyChatWord_Wahahaha:: @ 85999E8 - .string "WAHAHAHA$" - - .align 2 -gEasyChatGroup_Voices:: @ 85999F4 - .4byte gEasyChatWord_Excl - .4byte 0 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_ExclExcl - .4byte 1 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_QuesExcl - .4byte 7 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ques - .4byte 8 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ellipsis - .4byte 4 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_EllipsisExcl - .4byte 5 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_EllipsisEllipsisEllipsis - .4byte 6 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Dash - .4byte 3 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_DashDashDash - .4byte 2 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_UhOh - .4byte 23 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Waaah - .4byte 11 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ahaha - .4byte 41 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_OhQues - .4byte 52 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Nope - .4byte 59 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Urgh - .4byte 22 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hmm - .4byte 25 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Whoah - .4byte 32 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_WroooaarExcl - .4byte 24 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wow - .4byte 26 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Giggle - .4byte 43 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Sigh - .4byte 19 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Unbelievable - .4byte 33 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cries - .4byte 61 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Agree - .4byte 34 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_EhQues - .4byte 38 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Cry - .4byte 40 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Ehehe - .4byte 48 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_OiOiOi - .4byte 37 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_OhYeah - .4byte 47 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Oh - .4byte 42 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Oops - .4byte 15 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Shocked - .4byte 49 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Eek - .4byte 46 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Graaah - .4byte 57 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gwahahaha - .4byte 44 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Way - .4byte 54 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Tch - .4byte 53 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hehe - .4byte 13 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hah - .4byte 29 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yup - .4byte 51 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hahaha - .4byte 28 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Aiyeeh - .4byte 55 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hiyah - .4byte 12 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Fufufu - .4byte 27 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lol - .4byte 56 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Snort - .4byte 30 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Humph - .4byte 31 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hehehe - .4byte 20 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Heh - .4byte 45 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Hohoho - .4byte 36 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_UhHuh - .4byte 50 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_OhDear - .4byte 9 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Arrgh - .4byte 21 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mufufu - .4byte 14 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Mmm - .4byte 10 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_OhKay - .4byte 62 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Okay - .4byte 35 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Lalala - .4byte 16 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Yay - .4byte 18 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Aww - .4byte 60 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wowee - .4byte 17 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Gwah - .4byte 58 @ alphabetical order - .4byte TRUE @ enabled - - .4byte gEasyChatWord_Wahahaha - .4byte 39 @ alphabetical order - .4byte TRUE @ enabled diff --git a/data/text/easy_chat/easy_chat_groups.inc b/data/text/easy_chat/easy_chat_groups.inc deleted file mode 100644 index 94636c7fe..000000000 --- a/data/text/easy_chat/easy_chat_groups.inc +++ /dev/null @@ -1,112 +0,0 @@ - .include "data/text/easy_chat/easy_chat_group_pokemon.s" - .include "data/text/easy_chat/easy_chat_group_trainer.s" - .include "data/text/easy_chat/easy_chat_group_status.s" - .include "data/text/easy_chat/easy_chat_group_battle.s" - .include "data/text/easy_chat/easy_chat_group_greetings.s" - .include "data/text/easy_chat/easy_chat_group_people.s" - .include "data/text/easy_chat/easy_chat_group_voices.s" - .include "data/text/easy_chat/easy_chat_group_speech.s" - .include "data/text/easy_chat/easy_chat_group_endings.s" - .include "data/text/easy_chat/easy_chat_group_feelings.s" - .include "data/text/easy_chat/easy_chat_group_conditions.s" - .include "data/text/easy_chat/easy_chat_group_actions.s" - .include "data/text/easy_chat/easy_chat_group_lifestyle.s" - .include "data/text/easy_chat/easy_chat_group_hobbies.s" - .include "data/text/easy_chat/easy_chat_group_time.s" - .include "data/text/easy_chat/easy_chat_group_misc.s" - .include "data/text/easy_chat/easy_chat_group_adjectives.s" - .include "data/text/easy_chat/easy_chat_group_events.s" - .include "data/text/easy_chat/easy_chat_group_move_1.s" - .include "data/text/easy_chat/easy_chat_group_move_2.s" - .include "data/text/easy_chat/easy_chat_group_trendy_saying.s" - .include "data/text/easy_chat/easy_chat_group_pokemon2.s" - - .align 2 -gEasyChatGroups:: @ 859D004 - .4byte gEasyChatGroup_Pokemon - .2byte 202 @ total number of entries - .2byte 202 @ number of enabled entries - - .4byte gEasyChatGroup_Trainer - .2byte 27 @ total number of entries - .2byte 21 @ number of enabled entries - - .4byte gEasyChatGroup_Status - .2byte 109 @ total number of entries - .2byte 109 @ number of enabled entries - - .4byte gEasyChatGroup_Battle - .2byte 63 @ total number of entries - .2byte 63 @ number of enabled entries - - .4byte gEasyChatGroup_Greetings - .2byte 42 @ total number of entries - .2byte 42 @ number of enabled entries - - .4byte gEasyChatGroup_People - .2byte 75 @ total number of entries - .2byte 75 @ number of enabled entries - - .4byte gEasyChatGroup_Voices - .2byte 63 @ total number of entries - .2byte 63 @ number of enabled entries - - .4byte gEasyChatGroup_Speech - .2byte 60 @ total number of entries - .2byte 60 @ number of enabled entries - - .4byte gEasyChatGroup_Endings - .2byte 69 @ total number of entries - .2byte 69 @ number of enabled entries - - .4byte gEasyChatGroup_Feelings - .2byte 69 @ total number of entries - .2byte 69 @ number of enabled entries - - .4byte gEasyChatGroup_Conditions - .2byte 69 @ total number of entries - .2byte 69 @ number of enabled entries - - .4byte gEasyChatGroup_Actions - .2byte 78 @ total number of entries - .2byte 78 @ number of enabled entries - - .4byte gEasyChatGroup_Lifestyle - .2byte 45 @ total number of entries - .2byte 45 @ number of enabled entries - - .4byte gEasyChatGroup_Hobbies - .2byte 54 @ total number of entries - .2byte 54 @ number of enabled entries - - .4byte gEasyChatGroup_Time - .2byte 45 @ total number of entries - .2byte 45 @ number of enabled entries - - .4byte gEasyChatGroup_Misc - .2byte 42 @ total number of entries - .2byte 42 @ number of enabled entries - - .4byte gEasyChatGroup_Adjectives - .2byte 36 @ total number of entries - .2byte 36 @ number of enabled entries - - .4byte gEasyChatGroup_Events - .2byte 29 @ total number of entries - .2byte 29 @ number of enabled entries - - .4byte gEasyChatGroup_Move1 - .2byte 154 @ total number of entries - .2byte 154 @ number of enabled entries - - .4byte gEasyChatGroup_Move2 - .2byte 200 @ total number of entries - .2byte 200 @ number of enabled entries - - .4byte gEasyChatGroup_TrendySaying - .2byte 33 @ total number of entries - .2byte 33 @ number of enabled entries - - .4byte gEasyChatGroup_Pokemon2 - .2byte 251 @ total number of entries - .2byte 251 @ number of enabled entries diff --git a/data/text/easy_chat/easy_chat_words_by_letter.inc b/data/text/easy_chat/easy_chat_words_by_letter.inc deleted file mode 100644 index bce4be347..000000000 --- a/data/text/easy_chat/easy_chat_words_by_letter.inc +++ /dev/null @@ -1,2656 +0,0 @@ -gEasyChatWordsByLetter_Others:: @ 859D0B4 - .2byte EC_WORD_EXCL - .2byte EC_WORD_EXCL_EXCL - .2byte EC_WORD_DASH - .2byte EC_WORD_DASH_DASH_DASH - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_ELLIPSIS_EXCL - .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte EC_WORD_1_HIT_KO_EXCL - .2byte EC_WORD_QUES - .2byte EC_WORD_QUES_EXCL - -gEasyChatWordsByLetter_A:: @ 859D0C8 - .2byte EC_WORD_A - .2byte EC_WORD_A_LITTLE - .2byte EC_WORD_A_LOT - .2byte EC_WORD_A_TINY_BIT - .2byte EC_WORD_ABOUT - .2byte EC_WORD_ABOVE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(ABRA) - .2byte EC_POKEMON2(ABRA) - .2byte EC_WORD_ABSENT - .2byte EC_POKEMON(ABSOL) - .2byte EC_WORD_ABSOLUTELY - .2byte EC_MOVE(ABSORB) - .2byte EC_WORD_ACCEPT - .2byte EC_MOVE2(ACID) - .2byte EC_MOVE2(ACID_ARMOR) - .2byte EC_WORD_ADORE - .2byte EC_WORD_ADULT - .2byte EC_WORD_ADVENTURE - .2byte EC_MOVE2(AERIAL_ACE) - .2byte EC_MOVE(AEROBLAST) - .2byte EC_POKEMON2(AERODACTYL) - .2byte EC_WORD_AFTER - .2byte EC_WORD_AGE - .2byte EC_POKEMON(AGGRON) - .2byte EC_MOVE(AGILITY) - .2byte EC_WORD_AGREE - .2byte EC_WORD_AHAHA - .2byte EC_WORD_AIM - .2byte EC_POKEMON2(AIPOM) - .2byte EC_MOVE(AIR_CUTTER) - .2byte EC_WORD_AIR_LOCK - .2byte EC_WORD_AIYEEH - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(ALAKAZAM) - .2byte EC_POKEMON2(ALAKAZAM) - .2byte EC_WORD_ALL - .2byte EC_WORD_ALL_RIGHT - .2byte EC_WORD_ALLOW - .2byte EC_WORD_ALLOWANCE - .2byte EC_WORD_ALLY - .2byte EC_WORD_ALMOST - .2byte EC_WORD_ALONE - .2byte EC_WORD_ALSO - .2byte EC_WORD_ALT_COLOR - .2byte EC_POKEMON(ALTARIA) - .2byte EC_WORD_ALTHOUGH - .2byte EC_WORD_ALWAYS - .2byte EC_WORD_AM - .2byte EC_MOVE2(AMNESIA) - .2byte EC_POKEMON2(AMPHAROS) - .2byte EC_WORD_AMUSING - .2byte EC_WORD_AN - .2byte EC_MOVE(ANCIENT_POWER) - .2byte EC_WORD_AND - .2byte EC_WORD_ANGER - .2byte EC_WORD_ANGERS - .2byte EC_WORD_ANGRY - .2byte EC_WORD_ANIME - .2byte EC_POKEMON(ANORITH) - .2byte EC_WORD_ANOTHER - .2byte EC_WORD_ANTICIPATION - .2byte EC_WORD_ANY - .2byte EC_WORD_ANYWHERE - .2byte EC_WORD_APOLOGIZE - .2byte EC_WORD_APPEAL - .2byte EC_WORD_APPEAR - .2byte EC_WORD_APPEARS - .2byte EC_WORD_APPRECIATE - .2byte EC_WORD_APPROVED - .2byte EC_POKEMON2(ARBOK) - .2byte EC_POKEMON2(ARCANINE) - .2byte EC_WORD_ARE - .2byte EC_WORD_AREN_T - .2byte EC_WORD_ARENA_TRAP - .2byte EC_POKEMON2(ARIADOS) - .2byte EC_MOVE2(ARM_THRUST) - .2byte EC_POKEMON(ARMALDO) - .2byte EC_MOVE(AROMATHERAPY) - .2byte EC_POKEMON(ARON) - .2byte EC_WORD_AROUND - .2byte EC_WORD_ARRGH - .2byte EC_POKEMON2(ARTICUNO) - .2byte EC_WORD_AS - .2byte EC_WORD_AS_IF - .2byte EC_WORD_AS_MUCH_AS - .2byte EC_MOVE2(ASSIST) - .2byte EC_MOVE(ASTONISH) - .2byte EC_WORD_AT - .2byte EC_WORD_ATTACK - .2byte EC_MOVE2(ATTRACT) - .2byte EC_WORD_AUNT - .2byte EC_MOVE(AURORA_BEAM) - .2byte EC_WORD_AVANT_GARDE - .2byte EC_WORD_AWAY - .2byte EC_WORD_AWESOME - .2byte EC_WORD_AWFUL - .2byte EC_WORD_AWFULLY - .2byte EC_WORD_AWW - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(AZUMARILL) - .2byte EC_POKEMON2(AZUMARILL) - .2byte EC_POKEMON(AZURILL) - -gEasyChatWordsByLetter_B:: @ 859D19C - .2byte EC_WORD_BABE - .2byte EC_WORD_BABY - .2byte EC_WORD_BACK - .2byte EC_WORD_BAD - .2byte EC_WORD_BADLY - .2byte EC_WORD_BAG - .2byte EC_POKEMON(BAGON) - .2byte EC_WORD_BALL - .2byte EC_POKEMON(BALTOY) - .2byte EC_POKEMON(BANETTE) - .2byte EC_WORD_BANG - .2byte EC_POKEMON(BARBOACH) - .2byte EC_MOVE2(BARRAGE) - .2byte EC_MOVE2(BARRIER) - .2byte EC_WORD_BATH - .2byte EC_MOVE2(BATON_PASS) - .2byte EC_WORD_BATTLE - .2byte EC_WORD_BATTLE_ARMOR - .2byte EC_WORD_BATTLE_ROOM - .2byte EC_WORD_BATTLE_TOWER - .2byte EC_POKEMON2(BAYLEEF) - .2byte EC_WORD_BE - .2byte EC_WORD_BEAT - .2byte EC_MOVE2(BEAT_UP) - .2byte EC_POKEMON(BEAUTIFLY) - .2byte EC_WORD_BEAUTIFUL - .2byte EC_WORD_BEAUTY - .2byte EC_WORD_BECOMES - .2byte EC_POKEMON2(BEEDRILL) - .2byte EC_WORD_BEEN - .2byte EC_WORD_BEFORE - .2byte EC_WORD_BEGINNING - .2byte EC_WORD_BEING - .2byte EC_POKEMON(BELDUM) - .2byte EC_WORD_BELIEVE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(BELLOSSOM) - .2byte EC_POKEMON2(BELLOSSOM) - .2byte EC_POKEMON2(BELLSPROUT) - .2byte EC_MOVE2(BELLY_DRUM) - .2byte EC_WORD_BELONGS_TO - .2byte EC_WORD_BELOW - .2byte EC_WORD_BERRY - .2byte EC_WORD_BESIDE - .2byte EC_WORD_BEST - .2byte EC_WORD_BETTER - .2byte EC_MOVE(BIDE) - .2byte EC_WORD_BIG - .2byte EC_WORD_BIKE - .2byte EC_MOVE(BIND) - .2byte EC_MOVE(BITE) - .2byte EC_MOVE2(BLAST_BURN) - .2byte EC_POKEMON2(BLASTOISE) - .2byte EC_WORD_BLAZE - .2byte EC_MOVE2(BLAZE_KICK) - .2byte EC_POKEMON(BLAZIKEN) - .2byte EC_WORD_BLEND - .2byte EC_POKEMON2(BLISSEY) - .2byte EC_MOVE2(BLIZZARD) - .2byte EC_MOVE2(BLOCK) - .2byte EC_WORD_BOARD - .2byte EC_MOVE2(BODY_SLAM) - .2byte EC_MOVE2(BONE_CLUB) - .2byte EC_MOVE2(BONE_RUSH) - .2byte EC_MOVE2(BONEMERANG) - .2byte EC_WORD_BOOK - .2byte EC_WORD_BORED - .2byte EC_WORD_BORING - .2byte EC_MOVE2(BOUNCE) - .2byte EC_WORD_BOY - .2byte EC_WORD_BRAG - .2byte EC_WORD_BREAK - .2byte EC_POKEMON(BRELOOM) - .2byte EC_MOVE(BRICK_BREAK) - .2byte EC_WORD_BROTHER - .2byte EC_MOVE(BUBBLE) - .2byte EC_MOVE2(BUBBLE_BEAM) - .2byte EC_WORD_BUG - .2byte EC_POKEMON2(BULBASAUR) - .2byte EC_MOVE2(BULK_UP) - .2byte EC_MOVE2(BULLET_SEED) - .2byte EC_WORD_BUSY - .2byte EC_WORD_BUT - .2byte EC_POKEMON2(BUTTERFREE) - .2byte EC_WORD_BYE_BYE - -gEasyChatWordsByLetter_C:: @ 859D248 - .2byte EC_POKEMON(CACNEA) - .2byte EC_POKEMON(CACTURNE) - .2byte EC_MOVE2(CALM_MIND) - .2byte EC_WORD_CAME - .2byte EC_WORD_CAMERA - .2byte EC_POKEMON(CAMERUPT) - .2byte EC_MOVE2(CAMOUFLAGE) - .2byte EC_WORD_CAN - .2byte EC_WORD_CAN_WIN - .2byte EC_WORD_CAN_T - .2byte EC_WORD_CAN_T_WIN - .2byte EC_WORD_CANCEL - .2byte EC_WORD_CAPABLE - .2byte EC_WORD_CARDS - .2byte EC_WORD_CARE - .2byte EC_WORD_CARES - .2byte EC_POKEMON(CARVANHA) - .2byte EC_POKEMON(CASCOON) - .2byte EC_WORD_CASE - .2byte EC_POKEMON(CASTFORM) - .2byte EC_POKEMON2(CATERPIE) - .2byte EC_WORD_CAUSE - .2byte EC_POKEMON2(CELEBI) - .2byte EC_WORD_CENTER - .2byte EC_WORD_CHALLENGE - .2byte EC_WORD_CHANGE - .2byte EC_WORD_CHANNEL - .2byte EC_POKEMON2(CHANSEY) - .2byte EC_MOVE(CHARGE) - .2byte EC_POKEMON2(CHARIZARD) - .2byte EC_MOVE(CHARM) - .2byte EC_POKEMON2(CHARMANDER) - .2byte EC_POKEMON2(CHARMELEON) - .2byte EC_WORD_CHAT - .2byte EC_POKEMON2(CHIKORITA) - .2byte EC_WORD_CHILD_S_PLAY - .2byte EC_WORD_CHILDREN - .2byte EC_POKEMON(CHIMECHO) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(CHINCHOU) - .2byte EC_POKEMON2(CHINCHOU) - .2byte EC_WORD_CHLOROPHYLL - .2byte EC_WORD_CHOICE - .2byte EC_WORD_CHOOSE - .2byte EC_WORD_CHORES - .2byte EC_MOVE(CLAMP) - .2byte EC_POKEMON(CLAMPERL) - .2byte EC_WORD_CLASS - .2byte EC_POKEMON(CLAYDOL) - .2byte EC_WORD_CLEAR_BODY - .2byte EC_POKEMON2(CLEFABLE) - .2byte EC_POKEMON2(CLEFAIRY) - .2byte EC_POKEMON2(CLEFFA) - .2byte EC_WORD_CLOSE - .2byte EC_WORD_CLOUD_NINE - .2byte EC_POKEMON2(CLOYSTER) - .2byte EC_WORD_COLD - .2byte EC_WORD_COLLECT - .2byte EC_WORD_COLLECTION - .2byte EC_WORD_COLOR - .2byte EC_WORD_COLOR_CHANGE - .2byte EC_POKEMON(COMBUSKEN) - .2byte EC_WORD_COME - .2byte EC_WORD_COME_ON - .2byte EC_WORD_COME_OVER - .2byte EC_MOVE2(COMET_PUNCH) - .2byte EC_WORD_COMICS - .2byte EC_WORD_COMMEMORATE - .2byte EC_WORD_COMPLETE - .2byte EC_WORD_COMPOUNDEYES - .2byte EC_WORD_CONCEDE - .2byte EC_MOVE(CONFUSE_RAY) - .2byte EC_WORD_CONFUSED - .2byte EC_MOVE2(CONFUSION) - .2byte EC_WORD_CONGRATS - .2byte EC_MOVE(CONSTRICT) - .2byte EC_WORD_CONTEST - .2byte EC_WORD_CONVERSATION - .2byte EC_MOVE2(CONVERSION) - .2byte EC_MOVE2(CONVERSION_2) - .2byte EC_WORD_COOL - .2byte EC_WORD_COOLNESS - .2byte EC_POKEMON(CORPHISH) - .2byte EC_WORD_CORRECT - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(CORSOLA) - .2byte EC_POKEMON2(CORSOLA) - .2byte EC_MOVE(COSMIC_POWER) - .2byte EC_MOVE2(COTTON_SPORE) - .2byte EC_WORD_COULD - .2byte EC_WORD_COULDN_T - .2byte EC_WORD_COUNT_ON - .2byte EC_MOVE(COUNTER) - .2byte EC_WORD_COUPLE - .2byte EC_MOVE2(COVET) - .2byte EC_MOVE(CRABHAMMER) - .2byte EC_POKEMON(CRADILY) - .2byte EC_POKEMON(CRAWDAUNT) - .2byte EC_WORD_CRIES - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(CROBAT) - .2byte EC_POKEMON2(CROBAT) - .2byte EC_POKEMON2(CROCONAW) - .2byte EC_MOVE(CROSS_CHOP) - .2byte EC_MOVE(CRUNCH) - .2byte EC_WORD_CRUSH - .2byte EC_MOVE2(CRUSH_CLAW) - .2byte EC_WORD_CRY - .2byte EC_POKEMON2(CUBONE) - .2byte EC_WORD_CURRENT - .2byte EC_MOVE2(CURSE) - .2byte EC_MOVE(CUT) - .2byte EC_WORD_CUTE - .2byte EC_WORD_CUTE_CHARM - .2byte EC_WORD_CUTENESS - .2byte EC_POKEMON2(CYNDAQUIL) - -gEasyChatWordsByLetter_D:: @ 859D336 - .2byte EC_WORD_DAILY - .2byte EC_WORD_DAMP - .2byte EC_WORD_DANCE - .2byte EC_WORD_DANGER - .2byte EC_WORD_DARK - .2byte EC_WORD_DARN - .2byte EC_WORD_DATE - .2byte EC_WORD_DAUGHTER - .2byte EC_WORD_DAY - .2byte EC_WORD_DAYS - .2byte EC_WORD_DAYTIME - .2byte EC_WORD_DECIDE - .2byte EC_WORD_DECIDED - .2byte EC_WORD_DEEP - .2byte EC_WORD_DEFEATED - .2byte EC_MOVE2(DEFENSE_CURL) - .2byte EC_POKEMON(DELCATTY) - .2byte EC_POKEMON2(DELIBIRD) - .2byte EC_POKEMON(DEOXYS) - .2byte EC_WORD_DEPT_STORE - .2byte EC_WORD_DESIGN - .2byte EC_WORD_DESTINY - .2byte EC_MOVE2(DESTINY_BOND) - .2byte EC_WORD_DESTROYED - .2byte EC_MOVE2(DETECT) - .2byte EC_POKEMON2(DEWGONG) - .2byte EC_WORD_DID - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_DIET - .2byte EC_WORD_DIFFERENT - .2byte EC_MOVE(DIG) - .2byte EC_WORD_DIGITAL - .2byte EC_POKEMON2(DIGLETT) - .2byte EC_WORD_DIRECT - .2byte EC_MOVE(DISABLE) - .2byte EC_WORD_DISAPPEAR - .2byte EC_WORD_DISAPPOINT - .2byte EC_WORD_DISAPPOINTED - .2byte EC_WORD_DISAPPOINTS - .2byte EC_WORD_DISASTER - .2byte EC_WORD_DISLIKE - .2byte EC_WORD_DISLIKES - .2byte EC_POKEMON2(DITTO) - .2byte EC_MOVE2(DIVE) - .2byte EC_MOVE2(DIZZY_PUNCH) - .2byte EC_WORD_DO - .2byte EC_WORD_DOCILE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(DODRIO) - .2byte EC_POKEMON2(DODRIO) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(DODUO) - .2byte EC_POKEMON2(DODUO) - .2byte EC_WORD_DOES - .2byte EC_WORD_DOESN_T - .2byte EC_WORD_DON_T - .2byte EC_WORD_DONE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(DONPHAN) - .2byte EC_POKEMON2(DONPHAN) - .2byte EC_MOVE2(DOOM_DESIRE) - .2byte EC_MOVE2(DOUBLE_KICK) - .2byte EC_MOVE(DOUBLE_TEAM) - .2byte EC_MOVE(DOUBLE_EDGE) - .2byte EC_MOVE(DOUBLE_SLAP) - .2byte EC_WORD_DOWN - .2byte EC_WORD_DOWNCAST - .2byte EC_WORD_DRAGON - .2byte EC_MOVE2(DRAGON_CLAW) - .2byte EC_MOVE2(DRAGON_DANCE) - .2byte EC_MOVE2(DRAGON_RAGE) - .2byte EC_POKEMON2(DRAGONAIR) - .2byte EC_MOVE2(DRAGON_BREATH) - .2byte EC_POKEMON2(DRAGONITE) - .2byte EC_POKEMON2(DRATINI) - .2byte EC_WORD_DREAM - .2byte EC_MOVE2(DREAM_EATER) - .2byte EC_MOVE2(DRILL_PECK) - .2byte EC_WORD_DRINK - .2byte EC_WORD_DRINKS - .2byte EC_WORD_DRIZZLE - .2byte EC_WORD_DROOLING - .2byte EC_WORD_DROUGHT - .2byte EC_POKEMON2(DROWZEE) - .2byte EC_WORD_DUDE - .2byte EC_POKEMON2(DUGTRIO) - .2byte EC_POKEMON2(DUNSPARCE) - .2byte EC_POKEMON(DUSCLOPS) - .2byte EC_POKEMON(DUSKULL) - .2byte EC_POKEMON(DUSTOX) - .2byte EC_MOVE2(DYNAMIC_PUNCH) - -gEasyChatWordsByLetter_E:: @ 859D3F2 - .2byte EC_WORD_EARLIER - .2byte EC_WORD_EARLY_BIRD - .2byte EC_MOVE(EARTHQUAKE) - .2byte EC_WORD_EASY - .2byte EC_WORD_EAT - .2byte EC_WORD_EATS - .2byte EC_WORD_EEK - .2byte EC_POKEMON2(EEVEE) - .2byte EC_WORD_EFFECT_SPORE - .2byte EC_WORD_EGG - .2byte EC_MOVE2(EGG_BOMB) - .2byte EC_WORD_EH_QUES - .2byte EC_WORD_EHEHE - .2byte EC_POKEMON2(EKANS) - .2byte EC_POKEMON2(ELECTABUZZ) - .2byte EC_WORD_ELECTRIC - .2byte EC_POKEMON(ELECTRIKE) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(ELECTRODE) - .2byte EC_POKEMON2(ELECTRODE) - .2byte EC_POKEMON2(ELEKID) - .2byte EC_WORD_ELSE - .2byte EC_MOVE2(EMBER) - .2byte EC_WORD_EMERALD - .2byte EC_MOVE(ENCORE) - .2byte EC_WORD_ENCYCLOPEDIA - .2byte EC_WORD_END - .2byte EC_MOVE(ENDEAVOR) - .2byte EC_MOVE(ENDURE) - .2byte EC_WORD_ENJOY - .2byte EC_WORD_ENJOYS - .2byte EC_WORD_ENOUGH - .2byte EC_POKEMON2(ENTEI) - .2byte EC_WORD_ENTERTAINING - .2byte EC_MOVE2(ERUPTION) - .2byte EC_WORD_ESCAPE - .2byte EC_POKEMON2(ESPEON) - .2byte EC_WORD_EVEN_SO - .2byte EC_WORD_EVENT - .2byte EC_WORD_EVENTS - .2byte EC_WORD_EVER - .2byte EC_WORD_EVERY - .2byte EC_WORD_EVOLUTION - .2byte EC_WORD_EVOLVE - .2byte EC_WORD_EXCELLENT - .2byte EC_WORD_EXCESS - .2byte EC_WORD_EXCITE - .2byte EC_WORD_EXCITING - .2byte EC_WORD_EXCUSE - .2byte EC_WORD_EXCUSE_ME - .2byte EC_POKEMON2(EXEGGCUTE) - .2byte EC_POKEMON2(EXEGGUTOR) - .2byte EC_WORD_EXISTS - .2byte EC_WORD_EXPENSIVE - .2byte EC_MOVE2(EXPLOSION) - .2byte EC_POKEMON(EXPLOUD) - .2byte EC_MOVE(EXTRASENSORY) - .2byte EC_MOVE(EXTREME_SPEED) - -gEasyChatWordsByLetter_F:: @ 859D468 - .2byte EC_WORD_FABULOUS - .2byte EC_MOVE(FACADE) - .2byte EC_WORD_FAINT - .2byte EC_MOVE2(FAINT_ATTACK) - .2byte EC_WORD_FAINTED - .2byte EC_MOVE2(FAKE_OUT) - .2byte EC_MOVE(FAKE_TEARS) - .2byte EC_WORD_FALL - .2byte EC_MOVE2(FALSE_SWIPE) - .2byte EC_WORD_FAMILY - .2byte EC_WORD_FANTASTIC - .2byte EC_WORD_FAR - .2byte EC_POKEMON2(FARFETCHD) - .2byte EC_WORD_FASHION - .2byte EC_WORD_FAST - .2byte EC_WORD_FATHER - .2byte EC_WORD_FEAR - .2byte EC_POKEMON2(FEAROW) - .2byte EC_MOVE2(FEATHER_DANCE) - .2byte EC_POKEMON(FEEBAS) - .2byte EC_WORD_FEELING - .2byte EC_POKEMON2(FERALIGATR) - .2byte EC_WORD_FESTIVAL - .2byte EC_WORD_FEVER - .2byte EC_WORD_FIERY - .2byte EC_WORD_FIGHT - .2byte EC_WORD_FIGHTING - .2byte EC_WORD_FIGHTS - .2byte EC_WORD_FINAL - .2byte EC_WORD_FINALLY - .2byte EC_WORD_FINISH - .2byte EC_WORD_FIRE - .2byte EC_MOVE2(FIRE_BLAST) - .2byte EC_MOVE2(FIRE_PUNCH) - .2byte EC_MOVE2(FIRE_SPIN) - .2byte EC_WORD_FISHING - .2byte EC_MOVE(FISSURE) - .2byte EC_POKEMON2(FLAAFFY) - .2byte EC_MOVE(FLAIL) - .2byte EC_WORD_FLAME - .2byte EC_WORD_FLAME_BODY - .2byte EC_MOVE(FLAME_WHEEL) - .2byte EC_MOVE(FLAMETHROWER) - .2byte EC_POKEMON2(FLAREON) - .2byte EC_MOVE2(FLASH) - .2byte EC_WORD_FLASH_FIRE - .2byte EC_WORD_FLATTEN - .2byte EC_MOVE(FLATTER) - .2byte EC_WORD_FLOWERS - .2byte EC_MOVE(FLY) - .2byte EC_POKEMON(FLYGON) - .2byte EC_WORD_FLYING - .2byte EC_MOVE(FOCUS_ENERGY) - .2byte EC_MOVE(FOCUS_PUNCH) - .2byte EC_WORD_FOE - .2byte EC_MOVE(FOLLOW_ME) - .2byte EC_WORD_FOR - .2byte EC_WORD_FOR_NOW - .2byte EC_WORD_FORECAST - .2byte EC_MOVE2(FORESIGHT) - .2byte EC_WORD_FOREVER - .2byte EC_WORD_FORGET - .2byte EC_WORD_FORGETS - .2byte EC_WORD_FORGIVE - .2byte EC_POKEMON2(FORRETRESS) - .2byte EC_MOVE2(FRENZY_PLANT) - .2byte EC_WORD_FRIDAY - .2byte EC_WORD_FRIEND - .2byte EC_WORD_FROM - .2byte EC_WORD_FRONT - .2byte EC_WORD_FRONTIER - .2byte EC_MOVE2(FRUSTRATION) - .2byte EC_WORD_FUFUFU - .2byte EC_WORD_FULL - .2byte EC_WORD_FUNNY - .2byte EC_POKEMON2(FURRET) - .2byte EC_MOVE2(FURY_ATTACK) - .2byte EC_MOVE2(FURY_CUTTER) - .2byte EC_MOVE2(FURY_SWIPES) - .2byte EC_MOVE2(FUTURE_SIGHT) - -gEasyChatWordsByLetter_G:: @ 859D508 - .2byte EC_WORD_GAME - .2byte EC_POKEMON(GARDEVOIR) - .2byte EC_POKEMON2(GASTLY) - .2byte EC_POKEMON2(GENGAR) - .2byte EC_WORD_GENIUS - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GEODUDE) - .2byte EC_POKEMON2(GEODUDE) - .2byte EC_WORD_GET - .2byte EC_WORD_GETS - .2byte EC_WORD_GHOST - .2byte EC_WORD_GIDDY - .2byte EC_MOVE(GIGA_DRAIN) - .2byte EC_WORD_GIGGLE - .2byte EC_WORD_GIMME - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GIRAFARIG) - .2byte EC_POKEMON2(GIRAFARIG) - .2byte EC_WORD_GIRL - .2byte EC_WORD_GIVE - .2byte EC_WORD_GIVE_ME - .2byte EC_WORD_GIVE_UP - .2byte EC_WORD_GIVES - .2byte EC_POKEMON(GLALIE) - .2byte EC_MOVE2(GLARE) - .2byte EC_POKEMON2(GLIGAR) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GLOOM) - .2byte EC_POKEMON2(GLOOM) - .2byte EC_WORD_GO - .2byte EC_WORD_GO_AHEAD - .2byte EC_WORD_GO_EASY - .2byte EC_WORD_GO_HOME - .2byte EC_WORD_GOES - .2byte EC_WORD_GOING - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GOLBAT) - .2byte EC_POKEMON2(GOLBAT) - .2byte EC_WORD_GOLD - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GOLDEEN) - .2byte EC_POKEMON2(GOLDEEN) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GOLDUCK) - .2byte EC_POKEMON2(GOLDUCK) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GOLEM) - .2byte EC_POKEMON2(GOLEM) - .2byte EC_WORD_GOOD - .2byte EC_WORD_GOOD_BYE - .2byte EC_POKEMON(GOREBYSS) - .2byte EC_WORD_GOT - .2byte EC_WORD_GOTCHA - .2byte EC_WORD_GOURMET - .2byte EC_WORD_GRAAAH - .2byte EC_POKEMON2(GRANBULL) - .2byte EC_WORD_GRANDFATHER - .2byte EC_WORD_GRANDMOTHER - .2byte EC_WORD_GRASS - .2byte EC_MOVE(GRASS_WHISTLE) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GRAVELER) - .2byte EC_POKEMON2(GRAVELER) - .2byte EC_WORD_GREAT - .2byte EC_WORD_GREEN - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GRIMER) - .2byte EC_POKEMON2(GRIMER) - .2byte EC_POKEMON(GROUDON) - .2byte EC_WORD_GROUND - .2byte EC_WORD_GROUP - .2byte EC_POKEMON(GROVYLE) - .2byte EC_MOVE2(GROWL) - .2byte EC_POKEMON2(GROWLITHE) - .2byte EC_MOVE(GROWTH) - .2byte EC_MOVE(GRUDGE) - .2byte EC_POKEMON(GRUMPIG) - .2byte EC_WORD_GUARD - .2byte EC_MOVE2(GUILLOTINE) - .2byte EC_POKEMON(GULPIN) - .2byte EC_MOVE(GUST) - .2byte EC_WORD_GUTS - .2byte EC_WORD_GUTSY - .2byte EC_WORD_GWAH - .2byte EC_WORD_GWAHAHAHA - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(GYARADOS) - .2byte EC_POKEMON2(GYARADOS) - -gEasyChatWordsByLetter_H:: @ 859D5CC - .2byte EC_WORD_HABIT - .2byte EC_WORD_HAH - .2byte EC_WORD_HAHAHA - .2byte EC_MOVE(HAIL) - .2byte EC_WORD_HALL_OF_FAME - .2byte EC_WORD_HAPPENING - .2byte EC_WORD_HAPPILY - .2byte EC_WORD_HAPPINESS - .2byte EC_WORD_HAPPY - .2byte EC_WORD_HARD - .2byte EC_MOVE(HARDEN) - .2byte EC_POKEMON(HARIYAMA) - .2byte EC_WORD_HAS - .2byte EC_WORD_HASSLE - .2byte EC_POKEMON2(HAUNTER) - .2byte EC_WORD_HAVE - .2byte EC_WORD_HAVEN_T - .2byte EC_MOVE(HAZE) - .2byte EC_WORD_HE - .2byte EC_WORD_HE_S - .2byte EC_MOVE(HEADBUTT) - .2byte EC_MOVE(HEAL_BELL) - .2byte EC_WORD_HEALTHY - .2byte EC_WORD_HEAR - .2byte EC_WORD_HEARING - .2byte EC_WORD_HEARS - .2byte EC_WORD_HEART - .2byte EC_MOVE2(HEAT_WAVE) - .2byte EC_WORD_HEH - .2byte EC_WORD_HEHE - .2byte EC_WORD_HEHEHE - .2byte EC_WORD_HELLO - .2byte EC_MOVE2(HELPING_HAND) - .2byte EC_WORD_HER - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(HERACROSS) - .2byte EC_POKEMON2(HERACROSS) - .2byte EC_WORD_HERE - .2byte EC_WORD_HERE_GOES - .2byte EC_WORD_HERE_I_COME - .2byte EC_WORD_HERE_IT_IS - .2byte EC_WORD_HERO - .2byte EC_WORD_HEROINE - .2byte EC_WORD_HERS - .2byte EC_WORD_HEY - .2byte EC_WORD_HEY_THERE - .2byte EC_WORD_HEY_QUES - .2byte EC_WORD_HI - .2byte EC_MOVE2(HI_JUMP_KICK) - .2byte EC_WORD_HIDDEN - .2byte EC_MOVE2(HIDDEN_POWER) - .2byte EC_WORD_HIGH - .2byte EC_WORD_HIGHS - .2byte EC_WORD_HIM - .2byte EC_WORD_HIP_AND - .2byte EC_WORD_HIS - .2byte EC_WORD_HIT - .2byte EC_POKEMON2(HITMONCHAN) - .2byte EC_POKEMON2(HITMONLEE) - .2byte EC_POKEMON2(HITMONTOP) - .2byte EC_WORD_HIYAH - .2byte EC_WORD_HMM - .2byte EC_POKEMON2(HO_OH) - .2byte EC_WORD_HOBBY - .2byte EC_WORD_HOHOHO - .2byte EC_WORD_HOLIDAY - .2byte EC_WORD_HOME - .2byte EC_WORD_HOO_HAH - .2byte EC_POKEMON2(HOOTHOOT) - .2byte EC_WORD_HOPELESS - .2byte EC_POKEMON2(HOPPIP) - .2byte EC_MOVE2(HORN_ATTACK) - .2byte EC_MOVE2(HORN_DRILL) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(HORSEA) - .2byte EC_POKEMON2(HORSEA) - .2byte EC_WORD_HOT - .2byte EC_POKEMON2(HOUNDOOM) - .2byte EC_POKEMON2(HOUNDOUR) - .2byte EC_WORD_HOW - .2byte EC_WORD_HOW_DO - .2byte EC_WORD_HOWEVER - .2byte EC_MOVE2(HOWL) - .2byte EC_WORD_HUGE_POWER - .2byte EC_WORD_HUH_QUES - .2byte EC_WORD_HUMPH - .2byte EC_WORD_HUNGRY - .2byte EC_POKEMON(HUNTAIL) - .2byte EC_WORD_HURRIED - .2byte EC_WORD_HUSTLE - .2byte EC_MOVE2(HYDRO_CANNON) - .2byte EC_MOVE2(HYDRO_PUMP) - .2byte EC_WORD_HYPER - .2byte EC_MOVE2(HYPER_BEAM) - .2byte EC_WORD_HYPER_CUTTER - .2byte EC_MOVE2(HYPER_FANG) - .2byte EC_MOVE2(HYPER_VOICE) - .2byte EC_POKEMON2(HYPNO) - .2byte EC_MOVE(HYPNOSIS) - -gEasyChatWordsByLetter_I:: @ 859D696 - .2byte EC_WORD_I - .2byte EC_WORD_I_AM - .2byte EC_WORD_I_CHOOSE_YOU - .2byte EC_WORD_I_WAS - .2byte EC_WORD_I_VE - .2byte EC_WORD_I_VE_ARRIVED - .2byte EC_WORD_ICE - .2byte EC_MOVE(ICE_BALL) - .2byte EC_MOVE2(ICE_BEAM) - .2byte EC_MOVE2(ICE_PUNCH) - .2byte EC_MOVE2(ICICLE_SPEAR) - .2byte EC_MOVE(ICY_WIND) - .2byte EC_WORD_IDOL - .2byte EC_WORD_IF - .2byte EC_WORD_IF_I_LOSE - .2byte EC_WORD_IF_I_WIN - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(IGGLYBUFF) - .2byte EC_POKEMON2(IGGLYBUFF) - .2byte EC_WORD_IGNORANT - .2byte EC_WORD_ILLUMINATE - .2byte EC_POKEMON(ILLUMISE) - .2byte EC_WORD_IMMUNITY - .2byte EC_WORD_IMPORTANT - .2byte EC_WORD_IMPOSSIBLE - .2byte EC_MOVE2(IMPRISON) - .2byte EC_WORD_IN - .2byte EC_WORD_INCREASING - .2byte EC_WORD_INCREDIBLE - .2byte EC_WORD_INFORMATION - .2byte EC_MOVE2(INGRAIN) - .2byte EC_WORD_INNER_FOCUS - .2byte EC_WORD_INSIDE - .2byte EC_WORD_INSOMNIA - .2byte EC_WORD_INSTEAD - .2byte EC_WORD_INTIMIDATE - .2byte EC_WORD_INVINCIBLE - .2byte EC_MOVE2(IRON_DEFENSE) - .2byte EC_MOVE(IRON_TAIL) - .2byte EC_WORD_IS - .2byte EC_WORD_IS_IT_QUES - .2byte EC_WORD_ISN_T - .2byte EC_WORD_ISN_T_IT_QUES - .2byte EC_WORD_IT - .2byte EC_WORD_IT_S - .2byte EC_WORD_ITEM - .2byte EC_POKEMON2(IVYSAUR) - -gEasyChatWordsByLetter_J:: @ 859D6F6 - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(JIGGLYPUFF) - .2byte EC_POKEMON2(JIGGLYPUFF) - .2byte EC_POKEMON(JIRACHI) - .2byte EC_WORD_JOKING - .2byte EC_POKEMON2(JOLTEON) - .2byte EC_WORD_JOY - .2byte EC_WORD_JUDGE - .2byte EC_MOVE2(JUMP_KICK) - .2byte EC_POKEMON2(JUMPLUFF) - .2byte EC_WORD_JUST - .2byte EC_POKEMON2(JYNX) - -gEasyChatWordsByLetter_K:: @ 859D710 - .2byte EC_POKEMON2(KABUTO) - .2byte EC_POKEMON2(KABUTOPS) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(KADABRA) - .2byte EC_POKEMON2(KADABRA) - .2byte EC_POKEMON2(KAKUNA) - .2byte EC_POKEMON2(KANGASKHAN) - .2byte EC_MOVE(KARATE_CHOP) - .2byte EC_POKEMON(KECLEON) - .2byte EC_WORD_KEEN_EYE - .2byte EC_WORD_KID - .2byte EC_WORD_KIDDING - .2byte EC_WORD_KIND - .2byte EC_WORD_KINDERGARTEN - .2byte EC_MOVE(KINESIS) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(KINGDRA) - .2byte EC_POKEMON2(KINGDRA) - .2byte EC_POKEMON2(KINGLER) - .2byte EC_POKEMON(KIRLIA) - .2byte EC_MOVE2(KNOCK_OFF) - .2byte EC_WORD_KNOCKOUT - .2byte EC_WORD_KNOW - .2byte EC_WORD_KNOWS - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(KOFFING) - .2byte EC_POKEMON2(KOFFING) - .2byte EC_POKEMON2(KRABBY) - .2byte EC_WORD_KTHX_BYE - .2byte EC_POKEMON(KYOGRE) - -gEasyChatWordsByLetter_L:: @ 859D752 - .2byte EC_WORD_LACKING - .2byte EC_WORD_LACKS - .2byte EC_WORD_LADY - .2byte EC_POKEMON(LAIRON) - .2byte EC_WORD_LALALA - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(LANTURN) - .2byte EC_POKEMON2(LANTURN) - .2byte EC_POKEMON2(LAPRAS) - .2byte EC_POKEMON2(LARVITAR) - .2byte EC_WORD_LAST - .2byte EC_WORD_LATE - .2byte EC_WORD_LATER - .2byte EC_POKEMON(LATIAS) - .2byte EC_POKEMON(LATIOS) - .2byte EC_WORD_LAVISH - .2byte EC_WORD_LAY - .2byte EC_WORD_LEADER - .2byte EC_WORD_LEADERS - .2byte EC_WORD_LEAF - .2byte EC_MOVE2(LEAF_BLADE) - .2byte EC_WORD_LEARN - .2byte EC_POKEMON2(LEDIAN) - .2byte EC_POKEMON2(LEDYBA) - .2byte EC_MOVE(LEECH_LIFE) - .2byte EC_MOVE2(LEECH_SEED) - .2byte EC_MOVE2(LEER) - .2byte EC_WORD_LEFT - .2byte EC_WORD_LEGEND - .2byte EC_WORD_LESS - .2byte EC_WORD_LESSONS - .2byte EC_WORD_LET_ME_WIN - .2byte EC_WORD_LET_S - .2byte EC_WORD_LETTER - .2byte EC_WORD_LEVEL - .2byte EC_WORD_LEVITATE - .2byte EC_MOVE(LICK) - .2byte EC_POKEMON2(LICKITUNG) - .2byte EC_WORD_LIE - .2byte EC_WORD_LIFE - .2byte EC_MOVE2(LIGHT_SCREEN) - .2byte EC_WORD_LIGHTNINGROD - .2byte EC_WORD_LIKE - .2byte EC_WORD_LIKELY_TO - .2byte EC_WORD_LIKES - .2byte EC_POKEMON(LILEEP) - .2byte EC_WORD_LIMBER - .2byte EC_WORD_LINK - .2byte EC_POKEMON(LINOONE) - .2byte EC_WORD_LIQUID_OOZE - .2byte EC_WORD_LISTEN - .2byte EC_WORD_LISTENING - .2byte EC_WORD_LISTENS - .2byte EC_WORD_LIVING - .2byte EC_MOVE2(LOCK_ON) - .2byte EC_WORD_LOCOMOTIVE - .2byte EC_WORD_LOL - .2byte EC_WORD_LOLLING - .2byte EC_POKEMON(LOMBRE) - .2byte EC_WORD_LONESOME - .2byte EC_WORD_LOOK - .2byte EC_WORD_LOOKS - .2byte EC_WORD_LOSE - .2byte EC_WORD_LOSER - .2byte EC_WORD_LOSING - .2byte EC_WORD_LOSS - .2byte EC_WORD_LOST - .2byte EC_POKEMON(LOTAD) - .2byte EC_POKEMON(LOUDRED) - .2byte EC_WORD_LOUSY - .2byte EC_MOVE(LOVELY_KISS) - .2byte EC_WORD_LOVEY_DOVEY - .2byte EC_WORD_LOW - .2byte EC_MOVE(LOW_KICK) - .2byte EC_WORD_LOWS - .2byte EC_POKEMON(LUDICOLO) - .2byte EC_POKEMON2(LUGIA) - .2byte EC_WORD_LUKEWARM - .2byte EC_POKEMON(LUNATONE) - .2byte EC_MOVE2(LUSTER_PURGE) - .2byte EC_POKEMON(LUVDISC) - -gEasyChatWordsByLetter_M:: @ 859D7F6 - .2byte EC_MOVE2(MACH_PUNCH) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MACHAMP) - .2byte EC_POKEMON2(MACHAMP) - .2byte EC_WORD_MACHINE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MACHOKE) - .2byte EC_POKEMON2(MACHOKE) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MACHOP) - .2byte EC_POKEMON2(MACHOP) - .2byte EC_WORD_MAGAZINE - .2byte EC_POKEMON2(MAGBY) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MAGCARGO) - .2byte EC_POKEMON2(MAGCARGO) - .2byte EC_MOVE2(MAGIC_COAT) - .2byte EC_MOVE2(MAGICAL_LEAF) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MAGIKARP) - .2byte EC_POKEMON2(MAGIKARP) - .2byte EC_WORD_MAGMA_ARMOR - .2byte EC_POKEMON2(MAGMAR) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MAGNEMITE) - .2byte EC_POKEMON2(MAGNEMITE) - .2byte EC_WORD_MAGNET_PULL - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MAGNETON) - .2byte EC_POKEMON2(MAGNETON) - .2byte EC_MOVE2(MAGNITUDE) - .2byte EC_WORD_MAIL - .2byte EC_WORD_MAKE - .2byte EC_WORD_MAKING - .2byte EC_POKEMON(MAKUHITA) - .2byte EC_WORD_MAN - .2byte EC_POKEMON(MANECTRIC) - .2byte EC_POKEMON2(MANKEY) - .2byte EC_POKEMON2(MANTINE) - .2byte EC_POKEMON2(MAREEP) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MARILL) - .2byte EC_POKEMON2(MARILL) - .2byte EC_POKEMON2(MAROWAK) - .2byte EC_POKEMON(MARSHTOMP) - .2byte EC_WORD_MARVEL_SCALE - .2byte EC_POKEMON(MASQUERAIN) - .2byte EC_WORD_MASTER - .2byte EC_WORD_MATCH - .2byte EC_WORD_MATCH_UP - .2byte EC_POKEMON(MAWILE) - .2byte EC_WORD_MAYBE - .2byte EC_WORD_MC - .2byte EC_WORD_ME - .2byte EC_WORD_MEAN - .2byte EC_MOVE(MEAN_LOOK) - .2byte EC_POKEMON(MEDICHAM) - .2byte EC_MOVE2(MEDITATE) - .2byte EC_POKEMON(MEDITITE) - .2byte EC_WORD_MEET - .2byte EC_WORD_MEET_YOU - .2byte EC_WORD_MEETS - .2byte EC_WORD_MEGA - .2byte EC_MOVE2(MEGA_DRAIN) - .2byte EC_MOVE2(MEGA_KICK) - .2byte EC_MOVE2(MEGA_PUNCH) - .2byte EC_MOVE2(MEGAHORN) - .2byte EC_POKEMON2(MEGANIUM) - .2byte EC_MOVE(MEMENTO) - .2byte EC_POKEMON2(MEOWTH) - .2byte EC_WORD_MESSAGE - .2byte EC_POKEMON(METAGROSS) - .2byte EC_MOVE2(METAL_CLAW) - .2byte EC_MOVE(METAL_SOUND) - .2byte EC_POKEMON(METANG) - .2byte EC_POKEMON2(METAPOD) - .2byte EC_MOVE(METEOR_MASH) - .2byte EC_MOVE2(METRONOME) - .2byte EC_POKEMON2(MEW) - .2byte EC_POKEMON2(MEWTWO) - .2byte EC_POKEMON(MIGHTYENA) - .2byte EC_MOVE2(MILK_DRINK) - .2byte EC_POKEMON(MILOTIC) - .2byte EC_POKEMON2(MILTANK) - .2byte EC_MOVE2(MIMIC) - .2byte EC_MOVE(MIND_READER) - .2byte EC_MOVE2(MINIMIZE) - .2byte EC_POKEMON(MINUN) - .2byte EC_WORD_MINUS - .2byte EC_MOVE2(MIRROR_COAT) - .2byte EC_MOVE(MIRROR_MOVE) - .2byte EC_POKEMON2(MISDREAVUS) - .2byte EC_WORD_MISHEARD - .2byte EC_WORD_MISS - .2byte EC_MOVE(MIST) - .2byte EC_MOVE2(MIST_BALL) - .2byte EC_WORD_MISTAKE - .2byte EC_WORD_MMM - .2byte EC_WORD_MODE - .2byte EC_WORD_MODERN - .2byte EC_POKEMON2(MOLTRES) - .2byte EC_WORD_MOMENTUM - .2byte EC_WORD_MONDAY - .2byte EC_WORD_MONEY - .2byte EC_WORD_MONTH - .2byte EC_WORD_MOOD - .2byte EC_MOVE2(MOONLIGHT) - .2byte EC_WORD_MORE - .2byte EC_WORD_MORNING - .2byte EC_MOVE(MORNING_SUN) - .2byte EC_WORD_MOTHER - .2byte EC_WORD_MOVE - .2byte EC_WORD_MOVIE - .2byte EC_WORD_MR - .2byte EC_POKEMON2(MR_MIME) - .2byte EC_WORD_MRS - .2byte EC_WORD_MUCH - .2byte EC_WORD_MUCH_OBLIGED - .2byte EC_MOVE2(MUD_SHOT) - .2byte EC_MOVE2(MUD_SPORT) - .2byte EC_MOVE2(MUD_SLAP) - .2byte EC_MOVE2(MUDDY_WATER) - .2byte EC_POKEMON(MUDKIP) - .2byte EC_WORD_MUFUFU - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(MUK) - .2byte EC_POKEMON2(MUK) - .2byte EC_POKEMON2(MURKROW) - .2byte EC_WORD_MUSIC - .2byte EC_WORD_MUST_BE - .2byte EC_WORD_MY - .2byte EC_WORD_MYSELF - .2byte EC_WORD_MYSTERY - -gEasyChatWordsByLetter_N:: @ 859D912 - .2byte EC_WORD_NAME - .2byte EC_WORD_NAP - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(NATU) - .2byte EC_POKEMON2(NATU) - .2byte EC_WORD_NATURAL - .2byte EC_WORD_NATURAL_CURE - .2byte EC_WORD_NATURALLY - .2byte EC_WORD_NATURE - .2byte EC_MOVE(NATURE_POWER) - .2byte EC_WORD_NEAR - .2byte EC_WORD_NEARLY - .2byte EC_WORD_NEED - .2byte EC_MOVE2(NEEDLE_ARM) - .2byte EC_WORD_NEGATIVE - .2byte EC_WORD_NEVER - .2byte EC_WORD_NEW - .2byte EC_WORD_NEWS - .2byte EC_WORD_NEXT - .2byte EC_WORD_NICE - .2byte EC_POKEMON2(NIDOKING) - .2byte EC_POKEMON2(NIDOQUEEN) - .2byte EC_POKEMON2(NIDORAN_F) - .2byte EC_POKEMON2(NIDORAN_M) - .2byte EC_POKEMON2(NIDORINA) - .2byte EC_POKEMON2(NIDORINO) - .2byte EC_WORD_NIGHT - .2byte EC_MOVE2(NIGHT_SHADE) - .2byte EC_MOVE(NIGHTMARE) - .2byte EC_WORD_NIGHTTIME - .2byte EC_POKEMON(NINCADA) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(NINETALES) - .2byte EC_POKEMON2(NINETALES) - .2byte EC_POKEMON(NINJASK) - .2byte EC_WORD_NITWIT - .2byte EC_WORD_NO - .2byte EC_WORD_NO_MATCH - .2byte EC_WORD_NO_1 - .2byte EC_POKEMON2(NOCTOWL) - .2byte EC_WORD_NOISY - .2byte EC_WORD_NON_STOP - .2byte EC_WORD_NONE - .2byte EC_WORD_NOPE - .2byte EC_WORD_NORMAL - .2byte EC_POKEMON(NOSEPASS) - .2byte EC_WORD_NOT - .2byte EC_WORD_NOT_VERY - .2byte EC_WORD_NOTHING - .2byte EC_WORD_NOW - .2byte EC_POKEMON(NUMEL) - .2byte EC_POKEMON(NUZLEAF) - -gEasyChatWordsByLetter_O:: @ 859D97E - .2byte EC_WORD_OBLIVIOUS - .2byte EC_MOVE(OCTAZOOKA) - .2byte EC_POKEMON2(OCTILLERY) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(ODDISH) - .2byte EC_POKEMON2(ODDISH) - .2byte EC_MOVE(ODOR_SLEUTH) - .2byte EC_WORD_OF - .2byte EC_WORD_OFF - .2byte EC_WORD_OFFENSIVE - .2byte EC_WORD_OH - .2byte EC_WORD_OH_DEAR - .2byte EC_WORD_OH_YEAH - .2byte EC_WORD_OH_KAY - .2byte EC_WORD_OH_QUES - .2byte EC_WORD_OI - .2byte EC_WORD_OI_OI_OI - .2byte EC_WORD_OK_QUES - .2byte EC_WORD_OKAY - .2byte EC_WORD_OLD - .2byte EC_WORD_OLDEN - .2byte EC_POKEMON2(OMANYTE) - .2byte EC_POKEMON2(OMASTAR) - .2byte EC_WORD_ON - .2byte EC_WORD_ONCE - .2byte EC_POKEMON2(ONIX) - .2byte EC_WORD_ONLY - .2byte EC_WORD_OOPS - .2byte EC_WORD_OPPONENT - .2byte EC_WORD_OPPOSITE - .2byte EC_WORD_OR - .2byte EC_WORD_OTHER - .2byte EC_WORD_OUR - .2byte EC_WORD_OUT - .2byte EC_MOVE(OUTRAGE) - .2byte EC_WORD_OUTSIDE - .2byte EC_WORD_OVER - .2byte EC_WORD_OVERDO - .2byte EC_WORD_OVERGROW - .2byte EC_MOVE(OVERHEAT) - .2byte EC_WORD_OVERWHELMING - .2byte EC_WORD_OWN - .2byte EC_WORD_OWN_TEMPO - -gEasyChatWordsByLetter_P:: @ 859D9D6 - .2byte EC_MOVE(PAIN_SPLIT) - .2byte EC_POKEMON2(PARAS) - .2byte EC_POKEMON2(PARASECT) - .2byte EC_WORD_PARDON - .2byte EC_WORD_PARENT - .2byte EC_WORD_PARTNER - .2byte EC_WORD_PARTY - .2byte EC_WORD_PATTERN - .2byte EC_MOVE2(PAY_DAY) - .2byte EC_WORD_PC - .2byte EC_MOVE2(PECK) - .2byte EC_POKEMON(PELIPPER) - .2byte EC_WORD_PERFECT - .2byte EC_WORD_PERFECTION - .2byte EC_MOVE2(PERISH_SONG) - .2byte EC_POKEMON2(PERSIAN) - .2byte EC_WORD_PERSON - .2byte EC_MOVE2(PETAL_DANCE) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(PHANPY) - .2byte EC_POKEMON2(PHANPY) - .2byte EC_WORD_PHONE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(PICHU) - .2byte EC_POKEMON2(PICHU) - .2byte EC_WORD_PICKUP - .2byte EC_POKEMON2(PIDGEOT) - .2byte EC_POKEMON2(PIDGEOTTO) - .2byte EC_POKEMON2(PIDGEY) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(PIKACHU) - .2byte EC_POKEMON2(PIKACHU) - .2byte EC_POKEMON2(PILOSWINE) - .2byte EC_MOVE2(PIN_MISSILE) - .2byte EC_POKEMON2(PINECO) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(PINSIR) - .2byte EC_POKEMON2(PINSIR) - .2byte EC_WORD_PKRS - .2byte EC_WORD_PLACE - .2byte EC_WORD_PLANS - .2byte EC_WORD_PLAY - .2byte EC_WORD_PLAYED - .2byte EC_WORD_PLAYS - .2byte EC_WORD_PLEASE - .2byte EC_WORD_PLUS - .2byte EC_WORD_PLUSH_DOLL - .2byte EC_POKEMON(PLUSLE) - .2byte EC_WORD_POINTS - .2byte EC_WORD_POISON - .2byte EC_MOVE2(POISON_FANG) - .2byte EC_MOVE2(POISON_GAS) - .2byte EC_WORD_POISON_POINT - .2byte EC_MOVE2(POISON_STING) - .2byte EC_MOVE2(POISON_TAIL) - .2byte EC_MOVE2(POISON_POWDER) - .2byte EC_WORD_POKEBLOCK - .2byte EC_WORD_POKEDEX - .2byte EC_WORD_POKEMON - .2byte EC_WORD_POKENAV - .2byte EC_POKEMON2(POLITOED) - .2byte EC_POKEMON2(POLIWAG) - .2byte EC_POKEMON2(POLIWHIRL) - .2byte EC_POKEMON2(POLIWRATH) - .2byte EC_POKEMON2(PONYTA) - .2byte EC_POKEMON(POOCHYENA) - .2byte EC_WORD_POPULAR - .2byte EC_POKEMON2(PORYGON) - .2byte EC_POKEMON2(PORYGON2) - .2byte EC_MOVE2(POUND) - .2byte EC_MOVE(POWDER_SNOW) - .2byte EC_WORD_POWER - .2byte EC_WORD_PRAISE - .2byte EC_WORD_PREPOSTEROUS - .2byte EC_MOVE2(PRESENT) - .2byte EC_WORD_PRESSURE - .2byte EC_WORD_PRETEND - .2byte EC_WORD_PRETTY - .2byte EC_POKEMON2(PRIMEAPE) - .2byte EC_WORD_PROBABLY - .2byte EC_WORD_PROMISE - .2byte EC_MOVE2(PROTECT) - .2byte EC_MOVE(PSYBEAM) - .2byte EC_MOVE(PSYCH_UP) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_WORD_PSYCHIC - .2byte EC_MOVE(PSYCHIC) - .2byte EC_MOVE(PSYCHO_BOOST) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(PSYDUCK) - .2byte EC_POKEMON2(PSYDUCK) - .2byte EC_MOVE(PSYWAVE) - .2byte EC_POKEMON2(PUPITAR) - .2byte EC_WORD_PURE_POWER - .2byte EC_MOVE(PURSUIT) - .2byte EC_WORD_PUSHOVER - -gEasyChatWordsByLetter_Q:: @ 859DAA2 - .2byte EC_POKEMON2(QUAGSIRE) - .2byte EC_WORD_QUESTION - .2byte EC_MOVE2(QUICK_ATTACK) - .2byte EC_POKEMON2(QUILAVA) - .2byte EC_WORD_QUITE - .2byte EC_POKEMON2(QWILFISH) - -gEasyChatWordsByLetter_R:: @ 859DAAE - .2byte EC_WORD_RADIO - .2byte EC_MOVE(RAGE) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(RAICHU) - .2byte EC_POKEMON2(RAICHU) - .2byte EC_POKEMON2(RAIKOU) - .2byte EC_MOVE(RAIN_DANCE) - .2byte EC_WORD_RAIN_DISH - .2byte EC_POKEMON(RALTS) - .2byte EC_WORD_RANK - .2byte EC_MOVE(RAPID_SPIN) - .2byte EC_POKEMON2(RAPIDASH) - .2byte EC_WORD_RARE - .2byte EC_WORD_RATHER - .2byte EC_POKEMON2(RATICATE) - .2byte EC_POKEMON2(RATTATA) - .2byte EC_POKEMON(RAYQUAZA) - .2byte EC_MOVE2(RAZOR_LEAF) - .2byte EC_MOVE(RAZOR_WIND) - .2byte EC_WORD_READY - .2byte EC_WORD_REALLY - .2byte EC_WORD_REAR - .2byte EC_WORD_RECEIVED - .2byte EC_WORD_RECOMMEND - .2byte EC_MOVE(RECOVER) - .2byte EC_MOVE2(RECYCLE) - .2byte EC_WORD_RED - .2byte EC_MOVE2(REFLECT) - .2byte EC_MOVE2(REFRESH) - .2byte EC_WORD_REFRESHING - .2byte EC_WORD_REFUSE - .2byte EC_POKEMON(REGICE) - .2byte EC_POKEMON(REGIROCK) - .2byte EC_POKEMON(REGISTEEL) - .2byte EC_WORD_REJECT - .2byte EC_WORD_RELEASE - .2byte EC_POKEMON(RELICANTH) - .2byte EC_POKEMON2(REMORAID) - .2byte EC_WORD_RENTAL - .2byte EC_MOVE2(REST) - .2byte EC_WORD_RESUSCITATE - .2byte EC_MOVE(RETURN) - .2byte EC_MOVE2(REVENGE) - .2byte EC_MOVE(REVERSAL) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(RHYDON) - .2byte EC_POKEMON2(RHYDON) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(RHYHORN) - .2byte EC_POKEMON2(RHYHORN) - .2byte EC_WORD_RIBBON - .2byte EC_WORD_RICKETY - .2byte EC_WORD_RIGHT - .2byte EC_WORD_RIPPED - .2byte EC_WORD_RIVAL - .2byte EC_MOVE2(ROAR) - .2byte EC_WORD_ROCK - .2byte EC_MOVE2(ROCK_BLAST) - .2byte EC_WORD_ROCK_HEAD - .2byte EC_MOVE(ROCK_SLIDE) - .2byte EC_MOVE(ROCK_SMASH) - .2byte EC_MOVE(ROCK_THROW) - .2byte EC_MOVE(ROCK_TOMB) - .2byte EC_WORD_ROCK_SOLID - .2byte EC_MOVE2(ROLE_PLAY) - .2byte EC_MOVE2(ROLLING_KICK) - .2byte EC_MOVE(ROLLOUT) - .2byte EC_WORD_ROMANTIC - .2byte EC_WORD_ROOM - .2byte EC_POKEMON(ROSELIA) - .2byte EC_WORD_ROUGH_SKIN - .2byte EC_WORD_RPG - .2byte EC_WORD_RUBY - .2byte EC_WORD_RULE - .2byte EC_WORD_RUN - .2byte EC_WORD_RUN_AWAY - .2byte EC_WORD_RUNS - -gEasyChatWordsByLetter_S:: @ 859DB4E - .2byte EC_POKEMON(SABLEYE) - .2byte EC_MOVE(SACRED_FIRE) - .2byte EC_WORD_SAD - .2byte EC_WORD_SADLY - .2byte EC_MOVE(SAFEGUARD) - .2byte EC_WORD_SAID - .2byte EC_POKEMON(SALAMENCE) - .2byte EC_WORD_SAND_STREAM - .2byte EC_MOVE(SAND_TOMB) - .2byte EC_WORD_SAND_VEIL - .2byte EC_MOVE(SAND_ATTACK) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(SANDSHREW) - .2byte EC_POKEMON2(SANDSHREW) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(SANDSLASH) - .2byte EC_POKEMON2(SANDSLASH) - .2byte EC_MOVE(SANDSTORM) - .2byte EC_WORD_SAPPHIRE - .2byte EC_WORD_SATISFIED - .2byte EC_WORD_SATURDAY - .2byte EC_WORD_SAYS - .2byte EC_WORD_SCARY - .2byte EC_MOVE(SCARY_FACE) - .2byte EC_WORD_SCATTER - .2byte EC_POKEMON(SCEPTILE) - .2byte EC_WORD_SCHOOL - .2byte EC_POKEMON2(SCIZOR) - .2byte EC_MOVE2(SCRATCH) - .2byte EC_MOVE(SCREECH) - .2byte EC_POKEMON2(SCYTHER) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(SEADRA) - .2byte EC_POKEMON2(SEADRA) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(SEAKING) - .2byte EC_POKEMON2(SEAKING) - .2byte EC_POKEMON(SEALEO) - .2byte EC_WORD_SEARCH - .2byte EC_WORD_SECRET - .2byte EC_WORD_SECRET_BASE - .2byte EC_MOVE2(SECRET_POWER) - .2byte EC_WORD_SEE - .2byte EC_WORD_SEE_YA - .2byte EC_POKEMON(SEEDOT) - .2byte EC_WORD_SEEK - .2byte EC_POKEMON2(SEEL) - .2byte EC_WORD_SEEMS - .2byte EC_WORD_SEES - .2byte EC_MOVE2(SEISMIC_TOSS) - .2byte EC_MOVE(SELF_DESTRUCT) - .2byte EC_WORD_SENSE - .2byte EC_POKEMON2(SENTRET) - .2byte EC_WORD_SERENE_GRACE - .2byte EC_WORD_SERIOUS - .2byte EC_WORD_SERIOUSLY - .2byte EC_WORD_SERVICE - .2byte EC_POKEMON(SEVIPER) - .2byte EC_MOVE(SHADOW_BALL) - .2byte EC_MOVE(SHADOW_PUNCH) - .2byte EC_WORD_SHADOW_TAG - .2byte EC_WORD_SHADY - .2byte EC_WORD_SHAKE - .2byte EC_WORD_SHAKY - .2byte EC_WORD_SHALLOW - .2byte EC_POKEMON(SHARPEDO) - .2byte EC_MOVE(SHARPEN) - .2byte EC_WORD_SHE - .2byte EC_WORD_SHE_IS - .2byte EC_WORD_SHE_WAS - .2byte EC_WORD_SHED_SKIN - .2byte EC_POKEMON(SHEDINJA) - .2byte EC_MOVE(SHEER_COLD) - .2byte EC_POKEMON(SHELGON) - .2byte EC_WORD_SHELL_ARMOR - .2byte EC_POKEMON2(SHELLDER) - .2byte EC_WORD_SHIELD_DUST - .2byte EC_POKEMON(SHIFTRY) - .2byte EC_WORD_SHINE - .2byte EC_MOVE2(SHOCK_WAVE) - .2byte EC_WORD_SHOCKED - .2byte EC_WORD_SHOPPING - .2byte EC_WORD_SHOULD - .2byte EC_WORD_SHOW - .2byte EC_WORD_SHREDDED - .2byte EC_POKEMON(SHROOMISH) - .2byte EC_POKEMON2(SHUCKLE) - .2byte EC_POKEMON(SHUPPET) - .2byte EC_WORD_SIBLINGS - .2byte EC_WORD_SIGH - .2byte EC_MOVE(SIGNAL_BEAM) - .2byte EC_POKEMON(SILCOON) - .2byte EC_WORD_SILKY - .2byte EC_WORD_SILVER - .2byte EC_MOVE(SILVER_WIND) - .2byte EC_WORD_SIMPLE - .2byte EC_WORD_SINCE - .2byte EC_MOVE(SING) - .2byte EC_WORD_SINK - .2byte EC_WORD_SISTER - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(SKARMORY) - .2byte EC_POKEMON2(SKARMORY) - .2byte EC_MOVE(SKETCH) - .2byte EC_WORD_SKILL - .2byte EC_MOVE(SKILL_SWAP) - .2byte EC_WORD_SKILLED - .2byte EC_POKEMON2(SKIPLOOM) - .2byte EC_POKEMON(SKITTY) - .2byte EC_MOVE2(SKULL_BASH) - .2byte EC_MOVE(SKY_ATTACK) - .2byte EC_MOVE(SKY_UPPERCUT) - .2byte EC_MOVE2(SLACK_OFF) - .2byte EC_POKEMON(SLAKING) - .2byte EC_POKEMON(SLAKOTH) - .2byte EC_MOVE2(SLAM) - .2byte EC_MOVE(SLASH) - .2byte EC_WORD_SLEEP - .2byte EC_MOVE2(SLEEP_POWDER) - .2byte EC_MOVE2(SLEEP_TALK) - .2byte EC_WORD_SLEPT - .2byte EC_WORD_SLIDE - .2byte EC_WORD_SLIMY - .2byte EC_POKEMON2(SLOWBRO) - .2byte EC_POKEMON2(SLOWKING) - .2byte EC_POKEMON2(SLOWPOKE) - .2byte EC_MOVE2(SLUDGE) - .2byte EC_MOVE2(SLUDGE_BOMB) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(SLUGMA) - .2byte EC_POKEMON2(SLUGMA) - .2byte EC_WORD_SMACK - .2byte EC_WORD_SMALL - .2byte EC_WORD_SMART - .2byte EC_WORD_SMARTNESS - .2byte EC_POKEMON2(SMEARGLE) - .2byte EC_WORD_SMELL - .2byte EC_WORD_SMELL_YA - .2byte EC_MOVE(SMELLING_SALT) - .2byte EC_WORD_SMITE - .2byte EC_MOVE(SMOG) - .2byte EC_MOVE(SMOKESCREEN) - .2byte EC_POKEMON2(SMOOCHUM) - .2byte EC_WORD_SMOOTH - .2byte EC_MOVE2(SNATCH) - .2byte EC_POKEMON2(SNEASEL) - .2byte EC_MOVE(SNORE) - .2byte EC_POKEMON2(SNORLAX) - .2byte EC_WORD_SNORT - .2byte EC_POKEMON(SNORUNT) - .2byte EC_POKEMON2(SNUBBULL) - .2byte EC_WORD_SO - .2byte EC_MOVE2(SOFT_BOILED) - .2byte EC_WORD_SOFTWARE - .2byte EC_MOVE(SOLAR_BEAM) - .2byte EC_POKEMON(SOLROCK) - .2byte EC_WORD_SOME - .2byte EC_WORD_SOMEHOW - .2byte EC_WORD_SOMEONE - .2byte EC_WORD_SOMETHING - .2byte EC_WORD_SOMETIME - .2byte EC_WORD_SON - .2byte EC_WORD_SONG - .2byte EC_WORD_SONGS - .2byte EC_MOVE(SONIC_BOOM) - .2byte EC_WORD_SOON - .2byte EC_WORD_SORRY - .2byte EC_WORD_SOUNDPROOF - .2byte EC_WORD_SP_ABILITY - .2byte EC_MOVE(SPARK) - .2byte EC_POKEMON2(SPEAROW) - .2byte EC_WORD_SPECTATOR - .2byte EC_WORD_SPEED_BOOST - .2byte EC_POKEMON(SPHEAL) - .2byte EC_MOVE(SPIDER_WEB) - .2byte EC_MOVE2(SPIKE_CANNON) - .2byte EC_MOVE2(SPIKES) - .2byte EC_POKEMON2(SPINARAK) - .2byte EC_POKEMON(SPINDA) - .2byte EC_WORD_SPIRALING - .2byte EC_WORD_SPIRIT - .2byte EC_MOVE2(SPIT_UP) - .2byte EC_MOVE(SPITE) - .2byte EC_MOVE2(SPLASH) - .2byte EC_POKEMON(SPOINK) - .2byte EC_MOVE(SPORE) - .2byte EC_WORD_SPORTS - .2byte EC_WORD_SPRING - .2byte EC_POKEMON2(SQUIRTLE) - .2byte EC_WORD_STAGE - .2byte EC_POKEMON2(STANTLER) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(STARMIE) - .2byte EC_POKEMON2(STARMIE) - .2byte EC_WORD_START - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(STARYU) - .2byte EC_POKEMON2(STARYU) - .2byte EC_WORD_STATIC - .2byte EC_WORD_STAY_AT_HOME - .2byte EC_WORD_STEEL - .2byte EC_MOVE2(STEEL_WING) - .2byte EC_POKEMON2(STEELIX) - .2byte EC_WORD_STENCH - .2byte EC_WORD_STICKY_HOLD - .2byte EC_MOVE2(STOCKPILE) - .2byte EC_MOVE2(STOMP) - .2byte EC_WORD_STOP - .2byte EC_WORD_STORE - .2byte EC_WORD_STORES - .2byte EC_WORD_STORY - .2byte EC_WORD_STRATEGY - .2byte EC_MOVE(STRENGTH) - .2byte EC_MOVE(STRING_SHOT) - .2byte EC_WORD_STRONG - .2byte EC_MOVE2(STRUGGLE) - .2byte EC_WORD_STUDY - .2byte EC_MOVE(STUN_SPORE) - .2byte EC_WORD_STURDY - .2byte EC_MOVE(SUBMISSION) - .2byte EC_MOVE2(SUBSTITUTE) - .2byte EC_WORD_SUCTION_CUPS - .2byte EC_POKEMON2(SUDOWOODO) - .2byte EC_POKEMON2(SUICUNE) - .2byte EC_WORD_SUMMER - .2byte EC_WORD_SUNDAY - .2byte EC_POKEMON2(SUNFLORA) - .2byte EC_POKEMON2(SUNKERN) - .2byte EC_MOVE2(SUNNY_DAY) - .2byte EC_WORD_SUPER - .2byte EC_MOVE(SUPER_FANG) - .2byte EC_MOVE2(SUPERPOWER) - .2byte EC_MOVE2(SUPERSONIC) - .2byte EC_MOVE2(SURF) - .2byte EC_WORD_SURPRISE - .2byte EC_WORD_SURRENDER - .2byte EC_POKEMON(SURSKIT) - .2byte EC_POKEMON(SWABLU) - .2byte EC_MOVE(SWAGGER) - .2byte EC_MOVE2(SWALLOW) - .2byte EC_POKEMON(SWALOT) - .2byte EC_POKEMON(SWAMPERT) - .2byte EC_WORD_SWARM - .2byte EC_MOVE2(SWEET_KISS) - .2byte EC_MOVE(SWEET_SCENT) - .2byte EC_WORD_SWEETS - .2byte EC_POKEMON(SWELLOW) - .2byte EC_MOVE(SWIFT) - .2byte EC_WORD_SWIFT_SWIM - .2byte EC_POKEMON2(SWINUB) - .2byte EC_MOVE2(SWORDS_DANCE) - .2byte EC_WORD_SYNCHRONIZE - .2byte EC_MOVE(SYNTHESIS) - .2byte EC_WORD_SYSTEM - -gEasyChatWordsByLetter_T:: @ 859DD5A - .2byte EC_MOVE2(TACKLE) - .2byte EC_MOVE2(TAIL_GLOW) - .2byte EC_MOVE(TAIL_WHIP) - .2byte EC_POKEMON(TAILLOW) - .2byte EC_WORD_TAKE - .2byte EC_MOVE2(TAKE_DOWN) - .2byte EC_WORD_TAKE_THAT - .2byte EC_WORD_TALENT - .2byte EC_WORD_TALK - .2byte EC_WORD_TALKING - .2byte EC_POKEMON2(TANGELA) - .2byte EC_WORD_TASTY - .2byte EC_MOVE2(TAUNT) - .2byte EC_POKEMON2(TAUROS) - .2byte EC_WORD_TCH - .2byte EC_WORD_TEACH - .2byte EC_WORD_TEACHER - .2byte EC_WORD_TEACHES - .2byte EC_POKEMON2(TEDDIURSA) - .2byte EC_MOVE2(TEETER_DANCE) - .2byte EC_MOVE2(TELEPORT) - .2byte EC_WORD_TELEVISION - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(TENTACOOL) - .2byte EC_POKEMON2(TENTACOOL) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(TENTACRUEL) - .2byte EC_POKEMON2(TENTACRUEL) - .2byte EC_WORD_TERRIBLE - .2byte EC_WORD_TEST - .2byte EC_WORD_THAN - .2byte EC_WORD_THANK_YOU - .2byte EC_WORD_THANKS - .2byte EC_WORD_THAT - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_THAT_S - .2byte EC_WORD_THAT_S_IT_EXCL - .2byte EC_WORD_THE - .2byte EC_WORD_THEIR - .2byte EC_WORD_THERE - .2byte EC_WORD_THESE - .2byte EC_WORD_THESE_WERE - .2byte EC_WORD_THEY - .2byte EC_WORD_THEY_WERE - .2byte EC_WORD_THEY_RE - .2byte EC_WORD_THEY_VE - .2byte EC_WORD_THICK - .2byte EC_WORD_THICK_FAT - .2byte EC_MOVE2(THIEF) - .2byte EC_WORD_THIN - .2byte EC_WORD_THING - .2byte EC_WORD_THINGS - .2byte EC_WORD_THINK - .2byte EC_WORD_THINKS - .2byte EC_WORD_THIRSTY - .2byte EC_WORD_THIS - .2byte EC_WORD_THIS_IS_IT_EXCL - .2byte EC_WORD_THOSE - .2byte EC_WORD_THOSE_ARE - .2byte EC_WORD_THOSE_WERE - .2byte EC_MOVE(THRASH) - .2byte EC_WORD_THROW - .2byte EC_MOVE(THUNDER) - .2byte EC_MOVE2(THUNDER_WAVE) - .2byte EC_MOVE(THUNDERBOLT) - .2byte EC_MOVE(THUNDER_PUNCH) - .2byte EC_MOVE2(THUNDER_SHOCK) - .2byte EC_WORD_THURSDAY - .2byte EC_MOVE(TICKLE) - .2byte EC_WORD_TICKLISH - .2byte EC_WORD_TIGHT - .2byte EC_WORD_TIME - .2byte EC_WORD_TIMES - .2byte EC_WORD_TIRED - .2byte EC_WORD_TO - .2byte EC_WORD_TO_HER - .2byte EC_WORD_TO_ME - .2byte EC_WORD_TO_THEM - .2byte EC_WORD_TO_US - .2byte EC_WORD_TO_WHOM - .2byte EC_WORD_TODAY - .2byte EC_POKEMON2(TOGEPI) - .2byte EC_WORD_TOGETHER - .2byte EC_POKEMON2(TOGETIC) - .2byte EC_WORD_TOMORROW - .2byte EC_WORD_TOO - .2byte EC_WORD_TOO_LATE - .2byte EC_WORD_TOO_STRONG - .2byte EC_WORD_TOO_WEAK - .2byte EC_WORD_TOP - .2byte EC_POKEMON(TORCHIC) - .2byte EC_POKEMON(TORKOAL) - .2byte EC_MOVE(TORMENT) - .2byte EC_WORD_TORRENT - .2byte EC_WORD_TOTALLY - .2byte EC_POKEMON2(TOTODILE) - .2byte EC_WORD_TOUGH - .2byte EC_WORD_TOUGHNESS - .2byte EC_WORD_TOURNAMENT - .2byte EC_WORD_TOWER - .2byte EC_MOVE2(TOXIC) - .2byte EC_WORD_TOYS - .2byte EC_WORD_TRACE - .2byte EC_WORD_TRADE - .2byte EC_WORD_TRAIN - .2byte EC_WORD_TRAINER - .2byte EC_WORD_TRAINS - .2byte EC_MOVE2(TRANSFORM) - .2byte EC_POKEMON(TRAPINCH) - .2byte EC_WORD_TRAVEL - .2byte EC_WORD_TREASURE - .2byte EC_POKEMON(TREECKO) - .2byte EC_WORD_TRENDY - .2byte EC_MOVE2(TRI_ATTACK) - .2byte EC_MOVE2(TRICK) - .2byte EC_WORD_TRIES - .2byte EC_MOVE2(TRIPLE_KICK) - .2byte EC_POKEMON(TROPIUS) - .2byte EC_WORD_TRUANT - .2byte EC_WORD_TRULY - .2byte EC_WORD_TRUMP_CARD - .2byte EC_WORD_TRUST - .2byte EC_WORD_TRY - .2byte EC_WORD_TUESDAY - .2byte EC_MOVE2(TWINEEDLE) - .2byte EC_WORD_TWIRLING - .2byte EC_MOVE2(TWISTER) - .2byte EC_WORD_TYPE - .2byte EC_POKEMON2(TYPHLOSION) - .2byte EC_POKEMON2(TYRANITAR) - .2byte EC_POKEMON2(TYROGUE) - -gEasyChatWordsByLetter_U:: @ 859DE64 - .2byte EC_WORD_UGLY - .2byte EC_WORD_UH_HUH - .2byte EC_WORD_UH_OH - .2byte EC_WORD_UM - .2byte EC_POKEMON2(UMBREON) - .2byte EC_WORD_UNAVOIDABLE - .2byte EC_WORD_UNBELIEVABLE - .2byte EC_WORD_UNCLE - .2byte EC_WORD_UNDERSTAND - .2byte EC_WORD_UNDERSTANDS - .2byte EC_WORD_UNDERSTOOD - .2byte EC_WORD_UNION - .2byte EC_POKEMON2(UNOWN) - .2byte EC_WORD_UNTIL - .2byte EC_WORD_UP - .2byte EC_WORD_UPBEAT - .2byte EC_MOVE(UPROAR) - .2byte EC_WORD_UPSIDE_DOWN - .2byte EC_WORD_URGH - .2byte EC_POKEMON2(URSARING) - .2byte EC_WORD_USE - .2byte EC_WORD_USELESS - .2byte EC_WORD_USES - .2byte EC_WORD_USING - -gEasyChatWordsByLetter_V:: @ 859DE94 - .2byte EC_WORD_VACATION - .2byte EC_POKEMON2(VAPOREON) - .2byte EC_POKEMON2(VENOMOTH) - .2byte EC_POKEMON2(VENONAT) - .2byte EC_POKEMON2(VENUSAUR) - .2byte EC_WORD_VERSION - .2byte EC_WORD_VERSUS - .2byte EC_WORD_VERY - .2byte EC_POKEMON(VIBRAVA) - .2byte EC_MOVE2(VICE_GRIP) - .2byte EC_WORD_VICTORY - .2byte EC_POKEMON2(VICTREEBEL) - .2byte EC_WORD_VIEWING - .2byte EC_POKEMON(VIGOROTH) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(VILEPLUME) - .2byte EC_POKEMON2(VILEPLUME) - .2byte EC_MOVE2(VINE_WHIP) - .2byte EC_WORD_VITAL_SPIRIT - .2byte EC_MOVE(VITAL_THROW) - .2byte EC_POKEMON(VOLBEAT) - .2byte EC_WORD_VOLT_ABSORB - .2byte EC_MOVE2(VOLT_TACKLE) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(VOLTORB) - .2byte EC_POKEMON2(VOLTORB) - .2byte EC_WORD_VORACIOUS - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(VULPIX) - .2byte EC_POKEMON2(VULPIX) - -gEasyChatWordsByLetter_W:: @ 859DED6 - .2byte EC_WORD_WAAAH - .2byte EC_WORD_WAHAHAHA - .2byte EC_POKEMON(WAILMER) - .2byte EC_POKEMON(WAILORD) - .2byte EC_WORD_WAIT - .2byte EC_WORD_WAKE_UP - .2byte EC_WORD_WAKES_UP - .2byte EC_WORD_WALK - .2byte EC_WORD_WALKING - .2byte EC_WORD_WALKS - .2byte EC_POKEMON(WALREIN) - .2byte EC_WORD_WANDERING - .2byte EC_WORD_WANNABE - .2byte EC_WORD_WANT - .2byte EC_WORD_WANTS - .2byte EC_POKEMON2(WARTORTLE) - .2byte EC_WORD_WAS - .2byte EC_WORD_WASN_T - .2byte EC_WORD_WATER - .2byte EC_WORD_WATER_ABSORB - .2byte EC_MOVE2(WATER_GUN) - .2byte EC_MOVE2(WATER_PULSE) - .2byte EC_MOVE2(WATER_SPORT) - .2byte EC_MOVE(WATER_SPOUT) - .2byte EC_WORD_WATER_VEIL - .2byte EC_MOVE2(WATERFALL) - .2byte EC_WORD_WAY - .2byte EC_WORD_WE - .2byte EC_WORD_WE_RE - .2byte EC_WORD_WE_VE - .2byte EC_WORD_WEAK - .2byte EC_WORD_WEAKENED - .2byte EC_MOVE(WEATHER_BALL) - .2byte EC_WORD_WEDNESDAY - .2byte EC_POKEMON2(WEEDLE) - .2byte EC_WORD_WEEK - .2byte EC_POKEMON2(WEEPINBELL) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(WEEZING) - .2byte EC_POKEMON2(WEEZING) - .2byte EC_WORD_WEIRD - .2byte EC_WORD_WELCOME - .2byte EC_WORD_WELL - .2byte EC_WORD_WELL_THEN - .2byte EC_WORD_WENT - .2byte EC_WORD_WERE - .2byte EC_WORD_WEREN_T - .2byte EC_WORD_WHAT - .2byte EC_WORD_WHAT_S_UP_QUES - .2byte EC_WORD_WHEN - .2byte EC_WORD_WHEN_I_WIN - .2byte EC_WORD_WHERE - .2byte EC_WORD_WHICH - .2byte EC_WORD_WHILE - .2byte EC_MOVE(WHIRLPOOL) - .2byte EC_MOVE2(WHIRLWIND) - .2byte EC_POKEMON(WHISCASH) - .2byte EC_POKEMON(WHISMUR) - .2byte EC_WORD_WHITE_SMOKE - .2byte EC_WORD_WHO - .2byte EC_WORD_WHO_IS - .2byte EC_WORD_WHO_WAS - .2byte EC_WORD_WHOAH - .2byte EC_WORD_WHOM - .2byte EC_WORD_WHOSE - .2byte EC_WORD_WHY - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(WIGGLYTUFF) - .2byte EC_POKEMON2(WIGGLYTUFF) - .2byte EC_WORD_WILD - .2byte EC_WORD_WILL - .2byte EC_WORD_WILL_BE_HERE - .2byte EC_MOVE(WILL_O_WISP) - .2byte EC_WORD_WIMPY - .2byte EC_WORD_WIN - .2byte EC_MOVE2(WING_ATTACK) - .2byte EC_POKEMON(WINGULL) - .2byte EC_WORD_WINNER - .2byte EC_WORD_WINS - .2byte EC_WORD_WINTER - .2byte EC_WORD_WIRELESS - .2byte EC_MOVE2(WISH) - .2byte EC_WORD_WITH - .2byte EC_MOVE(WITHDRAW) - .2byte EC_WORD_WITHOUT - .2byte EC_WORD_WOBBLY - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(WOBBUFFET) - .2byte EC_POKEMON2(WOBBUFFET) - .2byte EC_WORD_WOMAN - .2byte EC_WORD_WON - .2byte EC_WORD_WON_T - .2byte EC_WORD_WONDER - .2byte EC_WORD_WONDER_GUARD - .2byte EC_POKEMON2(WOOPER) - .2byte EC_WORD_WORD - .2byte EC_WORD_WORK - .2byte EC_WORD_WORKING - .2byte EC_WORD_WORKS - .2byte EC_WORD_WORLD - .2byte EC_WORD_WORRY - .2byte EC_WORD_WOULD - .2byte EC_WORD_WOW - .2byte EC_WORD_WOWEE - .2byte EC_MOVE2(WRAP) - .2byte EC_WORD_WROOOAAR_EXCL - .2byte EC_POKEMON(WURMPLE) - .2byte EC_POKEMON(WYNAUT) - -gEasyChatWordsByLetter_X:: @ 859DFB4 - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(XATU) - .2byte EC_POKEMON2(XATU) - -gEasyChatWordsByLetter_Y:: @ 859DFBC - .2byte EC_WORD_YAHOO - .2byte EC_POKEMON2(YANMA) - .2byte EC_MOVE(YAWN) - .2byte EC_WORD_YAY - .2byte EC_WORD_YEAH - .2byte EC_WORD_YEAH_YEAH - .2byte EC_WORD_YEEHAW_EXCL - .2byte EC_WORD_YES - .2byte EC_WORD_YES_SIR_EXCL - .2byte EC_WORD_YESTERDAY - .2byte EC_WORD_YET - .2byte EC_WORD_YO - .2byte EC_WORD_YOU - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_YOU_VE - .2byte EC_WORD_YOUNG - .2byte EC_WORD_YOUR - .2byte EC_WORD_YOURS - .2byte EC_WORD_YUP - -gEasyChatWordsByLetter_Z:: @ 859DFE2 - .2byte EC_POKEMON(ZANGOOSE) - .2byte EC_MOVE2(ZAP_CANNON) - .2byte EC_POKEMON2(ZAPDOS) - .2byte EC_POKEMON(ZIGZAGOON) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON(ZUBAT) - .2byte EC_POKEMON2(ZUBAT) - -gEasyChatWordsByLetter_UnusedJapaneseHi:: @ 859DFF2 - .2byte EC_POKEMON2(CLEFFA) - .2byte EC_WORD_AIYEEH - .2byte EC_POKEMON2(WEEDLE) - .2byte EC_WORD_HERO - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(PIKACHU) - .2byte EC_POKEMON(PIKACHU) - .2byte EC_MOVE2(LIGHT_SCREEN) - .2byte EC_WORD_SHINE - .2byte EC_WORD_LOW - .2byte EC_POKEMON2(CLEFABLE) - .2byte EC_WORD_FLYING - .2byte EC_POKEMON2(PIDGEOT) - .2byte EC_POKEMON2(PIDGEOTTO) - .2byte EC_WORD_LEFT - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(PICHU) - .2byte EC_POKEMON(PICHU) - .2byte EC_MOVE2(SCRATCH) - .2byte EC_WORD_SURPRISE - .2byte EC_MOVE2(HYPER_FANG) - .2byte EC_POKEMON2(CLEFAIRY) - .2byte EC_WORD_DROUGHT - .2byte EC_WORD_HIDDEN - .2byte EC_WORD_PERSON - .2byte EC_WORD_AWFUL - .2byte EC_POKEMON2(CHARMANDER) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(STARYU) - .2byte EC_POKEMON(STARYU) - .2byte EC_WORD_ALONE - .2byte EC_POKEMON2(CYNDAQUIL) - .2byte EC_MOVE2(EMBER) - .2byte EC_POKEMON(VIBRAVA) - .2byte EC_WORD_BORED - .2byte EC_POKEMON2(SUNKERN) - .2byte EC_WORD_SECRET - .2byte EC_WORD_SECRET_BASE - .2byte EC_MOVE2(SECRET_POWER) - .2byte EC_POKEMON2(TEDDIURSA) - .2byte EC_WORD_HIYAH - .2byte EC_MOVE2(DIZZY_PUNCH) - .2byte EC_WORD_LIGHTNINGROD - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(VOLTORB) - .2byte EC_POKEMON(VOLTORB) - .2byte EC_WORD_DAYTIME - .2byte EC_MOVE2(BULK_UP) - .2byte EC_WORD_NAP - .2byte EC_WORD_HEROINE - .2byte EC_POKEMON(FEEBAS) - -gEasyChatWordsByLetter_UnusedJapaneseFu:: @ 859E060 - .2byte EC_WORD_FIGHT - .2byte EC_POKEMON2(MOLTRES) - .2byte EC_WORD_FASHION - .2byte EC_WORD_FEAR - .2byte EC_WORD_FEVER - .2byte EC_MOVE2(IMPRISON) - .2byte EC_POKEMON2(FLAREON) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(ALAKAZAM) - .2byte EC_POKEMON(ALAKAZAM) - .2byte EC_POKEMON2(MAGMAR) - .2byte EC_POKEMON(GRUMPIG) - .2byte EC_MOVE2(FEATHER_DANCE) - .2byte EC_POKEMON2(FORRETRESS) - .2byte EC_MOVE2(WHIRLWIND) - .2byte EC_WORD_COMPOUNDEYES - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(WIGGLYTUFF) - .2byte EC_POKEMON(WIGGLYTUFF) - .2byte EC_MOVE2(BEAT_UP) - .2byte EC_WORD_MYSTERY - .2byte EC_POKEMON2(IVYSAUR) - .2byte EC_POKEMON2(BULBASAUR) - .2byte EC_WORD_MARVEL_SCALE - .2byte EC_WORD_WONDER_GUARD - .2byte EC_POKEMON2(VENUSAUR) - .2byte EC_WORD_LACKS - .2byte EC_WORD_RESUSCITATE - .2byte EC_WORD_SMACK - .2byte EC_WORD_FUFUFU - .2byte EC_POKEMON2(AERODACTYL) - .2byte EC_WORD_WIMPY - .2byte EC_POKEMON2(MAGBY) - .2byte EC_WORD_LOL - .2byte EC_MOVE2(BLIZZARD) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(IGGLYBUFF) - .2byte EC_POKEMON(IGGLYBUFF) - .2byte EC_WORD_SNORT - .2byte EC_MOVE2(STOMP) - .2byte EC_WORD_INSOMNIA - .2byte EC_WORD_WINTER - .2byte EC_WORD_LEVITATE - .2byte EC_POKEMON(FLYGON) - .2byte EC_WORD_PLUS - .2byte EC_MOVE2(BLAST_BURN) - .2byte EC_POKEMON(PLUSLE) - .2byte EC_POKEMON2(UMBREON) - .2byte EC_MOVE2(FLASH) - .2byte EC_WORD_WOBBLY - .2byte EC_MOVE2(TEETER_DANCE) - .2byte EC_WORD_PRETEND - .2byte EC_POKEMON2(ARTICUNO) - .2byte EC_WORD_WANNABE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(JIGGLYPUFF) - .2byte EC_POKEMON(JIGGLYPUFF) - .2byte EC_POKEMON2(SNUBBULL) - .2byte EC_WORD_SHAKY - .2byte EC_MOVE2(CRUSH_CLAW) - .2byte EC_MOVE2(BLAZE_KICK) - .2byte EC_MOVE2(PRESENT) - .2byte EC_WORD_PRESSURE - .2byte EC_WORD_BLEND - .2byte EC_WORD_FRONTIER - .2byte EC_WORD_HUMPH - .2byte EC_MOVE2(ERUPTION) - -gEasyChatWordsByLetter_UnusedJapaneseHe:: @ 859E0EE - .2byte EC_WORD_HEY - .2byte EC_POKEMON(CORPHISH) - .2byte EC_WORD_BABY - .2byte EC_POKEMON2(BAYLEEF) - .2byte EC_WORD_BEST - .2byte EC_WORD_LOUSY - .2byte EC_WORD_HEHEHE - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(GRIMER) - .2byte EC_POKEMON(GRIMER) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(MUK) - .2byte EC_POKEMON(MUK) - .2byte EC_WORD_LIQUID_OOZE - .2byte EC_MOVE2(SLUDGE) - .2byte EC_MOVE2(SLUDGE_BOMB) - .2byte EC_MOVE2(GLARE) - .2byte EC_WORD_HEH - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(HERACROSS) - .2byte EC_POKEMON(HERACROSS) - .2byte EC_POKEMON(PELIPPER) - .2byte EC_POKEMON2(HOUNDOOM) - .2byte EC_POKEMON2(PERSIAN) - .2byte EC_WORD_RIPPED - .2byte EC_POKEMON2(LICKITUNG) - .2byte EC_WORD_STUDY - .2byte EC_WORD_COLOR_CHANGE - .2byte EC_MOVE2(TRANSFORM) - -gEasyChatWordsByLetter_UnusedJapaneseHo:: @ 859E12E - .2byte EC_MOVE2(POISON_TAIL) - .2byte EC_WORD_POINTS - .2byte EC_POKEMON2(HO_OH) - .2byte EC_WORD_SOUNDPROOF - .2byte EC_WORD_ADVENTURE - .2byte EC_WORD_EFFECT_SPORE - .2byte EC_MOVE2(ROAR) - .2byte EC_POKEMON(WAILORD) - .2byte EC_POKEMON(WAILMER) - .2byte EC_WORD_DUDE - .2byte EC_WORD_BOARD - .2byte EC_POKEMON2(HOOTHOOT) - .2byte EC_POKEMON(SALAMENCE) - .2byte EC_WORD_BALL - .2byte EC_MOVE2(BONE_RUSH) - .2byte EC_WORD_THEY - .2byte EC_WORD_THEY_WERE - .2byte EC_WORD_TO_THEM - .2byte EC_WORD_THEIR - .2byte EC_WORD_THEY_RE - .2byte EC_WORD_THEY_VE - .2byte EC_WORD_POKENAV - .2byte EC_WORD_POKEMON - .2byte EC_WORD_GET - .2byte EC_WORD_POKEDEX - .2byte EC_WORD_PKRS - .2byte EC_MOVE2(CAMOUFLAGE) - .2byte EC_WORD_WANT - .2byte EC_MOVE2(COVET) - .2byte EC_POKEMON(AGGRON) - .2byte EC_MOVE2(TAIL_GLOW) - .2byte EC_POKEMON(POOCHYENA) - .2byte EC_POKEMON2(PIDGEY) - .2byte EC_WORD_AS_MUCH_AS - .2byte EC_POKEMON2(PONYTA) - .2byte EC_MOVE2(BONE_CLUB) - .2byte EC_MOVE2(BONEMERANG) - .2byte EC_WORD_FIRE - .2byte EC_MOVE2(FIRE_SPIN) - .2byte EC_WORD_FLAME_BODY - .2byte EC_MOVE2(FIRE_PUNCH) - .2byte EC_POKEMON2(SKIPLOOM) - .2byte EC_WORD_HOHOHO - .2byte EC_WORD_PRAISE - .2byte EC_WORD_UH_HUH - .2byte EC_POKEMON2(PORYGON) - .2byte EC_POKEMON2(PORYGON2) - .2byte EC_MOVE2(VOLT_TACKLE) - .2byte EC_WORD_POKEBLOCK - .2byte EC_MOVE2(PERISH_SONG) - .2byte EC_WORD_SHREDDED - .2byte EC_POKEMON(CASTFORM) - .2byte EC_WORD_BOOK - .2byte EC_WORD_SERIOUS - .2byte EC_WORD_REALLY - -gEasyChatWordsByLetter_UnusedJapaneseMa:: @ 859E19C - .2byte EC_WORD_OH_DEAR - .2byte EC_WORD_IN - .2byte EC_WORD_GIVE_UP - .2byte EC_WORD_MINUS - .2byte EC_POKEMON(MINUN) - .2byte EC_WORD_DAILY - .2byte EC_WORD_OWN_TEMPO - .2byte EC_MOVE2(WRAP) - .2byte EC_MOVE2(SPIKES) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(MAGCARGO) - .2byte EC_POKEMON(MAGCARGO) - .2byte EC_MOVE2(MAGNITUDE) - .2byte EC_POKEMON(MAKUHITA) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(SLUGMA) - .2byte EC_POKEMON(SLUGMA) - .2byte EC_WORD_MAGMA_ARMOR - .2byte EC_POKEMON2(QUILAVA) - .2byte EC_WORD_OVERDO - .2byte EC_WORD_LOSS - .2byte EC_WORD_IF_I_LOSE - .2byte EC_WORD_LOST - .2byte EC_WORD_LOSE - .2byte EC_WORD_TRULY - .2byte EC_WORD_SERIOUSLY - .2byte EC_MOVE2(MAGICAL_LEAF) - .2byte EC_MOVE2(MAGIC_COAT) - .2byte EC_WORD_MACHINE - .2byte EC_WORD_OUT - .2byte EC_WORD_MASTER - .2byte EC_WORD_INCREASING - .2byte EC_WORD_TOO - .2byte EC_WORD_LIKE - .2byte EC_POKEMON2(BELLSPROUT) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(WEEZING) - .2byte EC_POKEMON(WEEZING) - .2byte EC_WORD_SMELL - .2byte EC_WORD_YET - .2byte EC_WORD_MISTAKE - .2byte EC_POKEMON(LINOONE) - .2byte EC_WORD_TOTALLY - .2byte EC_MOVE2(MUD_SHOT) - .2byte EC_MOVE2(MACH_PUNCH) - .2byte EC_WORD_FESTIVAL - .2byte EC_WORD_UNTIL - .2byte EC_WORD_WAIT - .2byte EC_WORD_GUARD - .2byte EC_MOVE2(PROTECT) - .2byte EC_POKEMON(CASCOON) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(MARILL) - .2byte EC_POKEMON(MARILL) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(AZUMARILL) - .2byte EC_POKEMON(AZUMARILL) - .2byte EC_MOVE2(DEFENSE_CURL) - .2byte EC_WORD_AS_IF - .2byte EC_POKEMON(SWALOT) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(ELECTRODE) - .2byte EC_POKEMON(ELECTRODE) - .2byte EC_MOVE2(ROLLING_KICK) - .2byte EC_WORD_COMICS - .2byte EC_POKEMON2(MANKEY) - .2byte EC_WORD_SATISFIED - .2byte EC_POKEMON2(MANTINE) - -gEasyChatWordsByLetter_UnusedJapaneseMi:: @ 859E230 - .2byte EC_WORD_PARTNER - .2byte EC_MOVE2(SUBSTITUTE) - .2byte EC_WORD_RIGHT - .2byte EC_MOVE2(DETECT) - .2byte EC_MOVE2(PIN_MISSILE) - .2byte EC_WORD_WATER - .2byte EC_MOVE2(WATER_SPORT) - .2byte EC_POKEMON(MUDKIP) - .2byte EC_MOVE2(WATER_GUN) - .2byte EC_MOVE2(MIST_BALL) - .2byte EC_MOVE2(WATER_PULSE) - .2byte EC_WORD_WATER_VEIL - .2byte EC_WORD_SHOW - .2byte EC_WORD_SEE - .2byte EC_WORD_DID - .2byte EC_MOVE2(FURY_ATTACK) - .2byte EC_MOVE2(FURY_SWIPES) - .2byte EC_MOVE2(DESTINY_BOND) - .2byte EC_WORD_LOOKS - .2byte EC_WORD_REJECT - .2byte EC_WORD_ACCEPT - .2byte EC_POKEMON2(DRATINI) - .2byte EC_MOVE2(FALSE_SWIPE) - .2byte EC_MOVE2(FORESIGHT) - .2byte EC_POKEMON2(MEW) - .2byte EC_POKEMON2(MEWTWO) - .2byte EC_MOVE2(MIRROR_COAT) - .2byte EC_MOVE2(FUTURE_SIGHT) - .2byte EC_WORD_SEES - .2byte EC_MOVE2(MILK_DRINK) - .2byte EC_POKEMON2(MILTANK) - .2byte EC_POKEMON(MILOTIC) - .2byte EC_WORD_WE - .2byte EC_WORD_BEEN - .2byte EC_WORD_TO_US - .2byte EC_WORD_OUR - .2byte EC_WORD_WE_RE - -gEasyChatWordsByLetter_UnusedJapaneseMu:: @ 859E27A - .2byte EC_WORD_MOOD - .2byte EC_POKEMON2(MISDREAVUS) - .2byte EC_WORD_OLDEN - .2byte EC_WORD_ARRGH - .2byte EC_WORD_BUG - .2byte EC_WORD_SWARM - .2byte EC_WORD_RATHER - .2byte EC_POKEMON2(SMOOCHUM) - .2byte EC_WORD_INVINCIBLE - .2byte EC_WORD_HEART - .2byte EC_WORD_MUFUFU - .2byte EC_WORD_MMM - -gEasyChatWordsByLetter_UnusedJapaneseMe:: @ 859E292 - .2byte EC_MOVE2(CALM_MIND) - .2byte EC_WORD_MAIL - .2byte EC_MOVE2(MEGA_DRAIN) - .2byte EC_MOVE2(MEGA_KICK) - .2byte EC_MOVE2(MEGA_PUNCH) - .2byte EC_POKEMON2(MEGANIUM) - .2byte EC_MOVE2(MEGAHORN) - .2byte EC_WORD_SEEK - .2byte EC_MOVE2(HIDDEN_POWER) - .2byte EC_WORD_RARE - .2byte EC_POKEMON(METAGROSS) - .2byte EC_POKEMON2(DITTO) - .2byte EC_MOVE2(METAL_CLAW) - .2byte EC_POKEMON(METANG) - .2byte EC_WORD_DESTROYED - .2byte EC_WORD_MESSAGE - .2byte EC_WORD_AWFULLY - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(TENTACOOL) - .2byte EC_POKEMON(TENTACOOL) - .2byte EC_WORD_FIERY - .2byte EC_POKEMON2(MAREEP) - .2byte EC_MOVE2(ATTRACT) - .2byte EC_WORD_CUTE_CHARM - .2byte EC_WORD_IMMUNITY - -gEasyChatWordsByLetter_UnusedJapaneseMo:: @ 859E2C6 - .2byte EC_WORD_ALMOST - .2byte EC_WORD_BLAZE - .2byte EC_WORD_NEARLY - .2byte EC_WORD_MODE - .2byte EC_WORD_OLD - .2byte EC_WORD_THURSDAY - .2byte EC_POKEMON2(FLAAFFY) - .2byte EC_WORD_LISTENING - .2byte EC_WORD_OWN - .2byte EC_WORD_MORE - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_PICKUP - .2byte EC_MOVE2(MIMIC) - .2byte EC_WORD_TOO_LATE - .2byte EC_WORD_PATTERN - .2byte EC_WORD_FLASH_FIRE - .2byte EC_WORD_RECEIVED - .2byte EC_POKEMON2(VENOMOTH) - .2byte EC_WORD_DOESN_T - .2byte EC_POKEMON2(TANGELA) - -gEasyChatWordsByLetter_UnusedJapaneseYa:: @ 859E2EE - .2byte EC_WORD_HOO_HAH - .2byte EC_WORD_PROMISE - .2byte EC_WORD_KIND - .2byte EC_POKEMON(BALTOY) - .2byte EC_WORD_HOLIDAY - .2byte EC_WORD_NEGATIVE - .2byte EC_MOVE2(FRUSTRATION) - .2byte EC_WORD_DONE - .2byte EC_WORD_FINALLY - .2byte EC_WORD_ANY - .2byte EC_WORD_YAHOO - .2byte EC_POKEMON2(SLOWKING) - .2byte EC_POKEMON2(SLOWBRO) - .2byte EC_MOVE2(LEECH_SEED) - .2byte EC_POKEMON2(SLOWPOKE) - .2byte EC_WORD_DANGER - .2byte EC_POKEMON2(MURKROW) - .2byte EC_POKEMON(SABLEYE) - .2byte EC_WORD_DEFEATED - .2byte EC_WORD_BEAT - .2byte EC_WORD_VITAL_SPIRIT - .2byte EC_POKEMON(VIGOROTH) - .2byte EC_WORD_YOUNG - .2byte EC_POKEMON2(YANMA) - -gEasyChatWordsByLetter_UnusedJapaneseYu:: @ 859E31E - .2byte EC_POKEMON(SNORUNT) - .2byte EC_WORD_TAKE - .2byte EC_WORD_UNION - .2byte EC_MOVE2(METRONOME) - .2byte EC_WORD_DREAM - .2byte EC_MOVE2(DREAM_EATER) - .2byte EC_WORD_ALLOW - .2byte EC_WORD_FORGET - .2byte EC_POKEMON(CRADILY) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(KADABRA) - .2byte EC_POKEMON(KADABRA) - -gEasyChatWordsByLetter_UnusedJapaneseYo:: @ 859E338 - .2byte EC_WORD_WITHOUT - .2byte EC_WORD_YO - .2byte EC_MOVE2(ACID) - .2byte EC_WORD_COME_OVER - .2byte EC_WORD_KINDERGARTEN - .2byte EC_WORD_CHLOROPHYLL - .2byte EC_WORD_AFTER - .2byte EC_POKEMON2(LARVITAR) - .2byte EC_WORD_OH_KAY - .2byte EC_WORD_BEFORE - .2byte EC_WORD_GREAT - .2byte EC_MOVE2(MEDITATE) - .2byte EC_WORD_PURE_POWER - .2byte EC_WORD_WELL - .2byte EC_MOVE2(SNATCH) - .2byte EC_WORD_OKAY - .2byte EC_WORD_PLANS - .2byte EC_WORD_NIGHTTIME - .2byte EC_WORD_WHILE - .2byte EC_POKEMON(DUSKULL) - .2byte EC_WORD_EASY - .2byte EC_WORD_INSTEAD - .2byte EC_WORD_NIGHT - .2byte EC_POKEMON2(NOCTOWL) - .2byte EC_WORD_COUNT_ON - .2byte EC_WORD_WEAK - .2byte EC_WORD_TOO_WEAK - .2byte EC_WORD_WEAKENED - -gEasyChatWordsByLetter_UnusedJapaneseRa:: @ 859E370 - .2byte EC_POKEMON2(RAIKOU) - .2byte EC_WORD_WEEK - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(RAICHU) - .2byte EC_POKEMON(RAICHU) - .2byte EC_WORD_RIVAL - .2byte EC_WORD_LIFE - .2byte EC_POKEMON(MANECTRIC) - .2byte EC_WORD_SIMPLE - .2byte EC_WORD_PUSHOVER - .2byte EC_POKEMON(SWAMPERT) - .2byte EC_POKEMON(ELECTRIKE) - .2byte EC_WORD_SEEMS - .2byte EC_WORD_RADIO - .2byte EC_MOVE2(LUSTER_PURGE) - .2byte EC_POKEMON2(CHANSEY) - .2byte EC_POKEMON2(RATICATE) - .2byte EC_POKEMON(LATIAS) - .2byte EC_POKEMON(LATIOS) - .2byte EC_POKEMON(LUVDISC) - .2byte EC_POKEMON2(LAPRAS) - .2byte EC_WORD_LOVEY_DOVEY - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(VILEPLUME) - .2byte EC_POKEMON(VILEPLUME) - .2byte EC_WORD_LALALA - .2byte EC_POKEMON(RALTS) - .2byte EC_WORD_FORGETS - .2byte EC_WORD_APPEARS - .2byte EC_WORD_RANK - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(LANTURN) - .2byte EC_POKEMON(LANTURN) - -gEasyChatWordsByLetter_UnusedJapaneseRi:: @ 859E3B8 - .2byte EC_WORD_LEADER - .2byte EC_MOVE2(LEAF_BLADE) - .2byte EC_POKEMON2(CHARMELEON) - .2byte EC_POKEMON2(CHARIZARD) - .2byte EC_MOVE2(RECYCLE) - .2byte EC_MOVE2(REFLECT) - .2byte EC_MOVE2(REFRESH) - .2byte EC_MOVE2(REVENGE) - .2byte EC_WORD_RIBBON - .2byte EC_WORD_TRENDY - .2byte EC_MOVE2(DRAGON_RAGE) - .2byte EC_MOVE2(DRAGON_BREATH) - .2byte EC_MOVE2(DRAGON_DANCE) - .2byte EC_WORD_VACATION - .2byte EC_POKEMON(LILEEP) - .2byte EC_POKEMON2(URSARING) - .2byte EC_WORD_SHIELD_DUST - -gEasyChatWordsByLetter_UnusedJapaneseRu:: @ 859E3DA - .2byte EC_POKEMON2(JYNX) - .2byte EC_WORD_ROOM - .2byte EC_WORD_RULE - .2byte EC_POKEMON2(LUGIA) - .2byte EC_WORD_LOOK - .2byte EC_POKEMON(LUNATONE) - .2byte EC_WORD_RUBY - .2byte EC_WORD_THAN - .2byte EC_POKEMON(AZURILL) - .2byte EC_POKEMON(LUDICOLO) - .2byte EC_WORD_HAPPILY - -gEasyChatWordsByLetter_UnusedJapaneseRe:: @ 859E3F0 - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(MAGNETON) - .2byte EC_POKEMON(MAGNETON) - .2byte EC_MOVE2(ICE_PUNCH) - .2byte EC_MOVE2(ICE_BEAM) - .2byte EC_POKEMON(REGICE) - .2byte EC_POKEMON(REGISTEEL) - .2byte EC_POKEMON(REGIROCK) - .2byte EC_POKEMON(RAYQUAZA) - .2byte EC_WORD_UGLY - .2byte EC_POKEMON2(LEDIAN) - .2byte EC_POKEMON2(LEDYBA) - .2byte EC_WORD_FANTASTIC - .2byte EC_WORD_LEVEL - .2byte EC_MOVE2(FURY_CUTTER) - .2byte EC_MOVE2(COMET_PUNCH) - .2byte EC_WORD_RENTAL - -gEasyChatWordsByLetter_UnusedJapaneseRo:: @ 859E414 - .2byte EC_MOVE2(SKULL_BASH) - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(VULPIX) - .2byte EC_POKEMON(VULPIX) - .2byte EC_POKEMON(ROSELIA) - .2byte EC_MOVE2(LOCK_ON) - .2byte EC_MOVE2(ROCK_BLAST) - .2byte EC_WORD_ROMANTIC - .2byte EC_WORD_QUESTION - -gEasyChatWordsByLetter_UnusedJapaneseWa:: @ 859E428 - .2byte EC_WORD_YAY - .2byte EC_WORD_WORLD - .2byte EC_WORD_AWW - .2byte EC_WORD_WIRELESS - .2byte EC_WORD_WOWEE - .2byte EC_POKEMON(COMBUSKEN) - .2byte EC_WORD_UNDERSTAND - .2byte EC_WORD_UNDERSTANDS - .2byte EC_WORD_FAINT - .2byte EC_WORD_ANTICIPATION - .2byte EC_WORD_ONCE - .2byte EC_WORD_MOVE - .2byte EC_WORD_WE_VE - .2byte EC_WORD_FAINTED - .2byte EC_WORD_WOMAN - .2byte EC_WORD_SHE - .2byte EC_WORD_SHE_WAS - .2byte EC_WORD_TO_HER - .2byte EC_WORD_HERS - .2byte EC_WORD_SHE_IS - .2byte EC_WORD_SOME - .2byte EC_POKEMON2(JUMPLUFF) - .2byte EC_MOVE2(COTTON_SPORE) - .2byte EC_WORD_GWAH - .2byte EC_POKEMON2(TOTODILE) - .2byte EC_WORD_WAHAHAHA - .2byte EC_WORD_ANYWHERE - .2byte EC_MOVE2(STRUGGLE) - .2byte EC_WORD_BADLY - .2byte -1, 2 @ doubled Pokémon species names - .2byte EC_POKEMON2(MACHOP) - .2byte EC_POKEMON(MACHOP) - - .align 2 -gEasyChatWordsByLetterPointers:: @ 859E46C - .4byte gEasyChatWordsByLetter_Others - .4byte 10 @ number of entries - - .4byte gEasyChatWordsByLetter_A - .4byte 106 @ number of entries - - .4byte gEasyChatWordsByLetter_B - .4byte 86 @ number of entries - - .4byte gEasyChatWordsByLetter_C - .4byte 119 @ number of entries - - .4byte gEasyChatWordsByLetter_D - .4byte 94 @ number of entries - - .4byte gEasyChatWordsByLetter_E - .4byte 59 @ number of entries - - .4byte gEasyChatWordsByLetter_F - .4byte 80 @ number of entries - - .4byte gEasyChatWordsByLetter_G - .4byte 98 @ number of entries - - .4byte gEasyChatWordsByLetter_H - .4byte 101 @ number of entries - - .4byte gEasyChatWordsByLetter_I - .4byte 48 @ number of entries - - .4byte gEasyChatWordsByLetter_J - .4byte 13 @ number of entries - - .4byte gEasyChatWordsByLetter_K - .4byte 33 @ number of entries - - .4byte gEasyChatWordsByLetter_L - .4byte 82 @ number of entries - - .4byte gEasyChatWordsByLetter_M - .4byte 142 @ number of entries - - .4byte gEasyChatWordsByLetter_N - .4byte 54 @ number of entries - - .4byte gEasyChatWordsByLetter_O - .4byte 44 @ number of entries - - .4byte gEasyChatWordsByLetter_P - .4byte 102 @ number of entries - - .4byte gEasyChatWordsByLetter_Q - .4byte 6 @ number of entries - - .4byte gEasyChatWordsByLetter_R - .4byte 80 @ number of entries - - .4byte gEasyChatWordsByLetter_S - .4byte 262 @ number of entries - - .4byte gEasyChatWordsByLetter_T - .4byte 133 @ number of entries - - .4byte gEasyChatWordsByLetter_U - .4byte 24 @ number of entries - - .4byte gEasyChatWordsByLetter_V - .4byte 33 @ number of entries - - .4byte gEasyChatWordsByLetter_W - .4byte 111 @ number of entries - - .4byte gEasyChatWordsByLetter_X - .4byte 4 @ number of entries - - .4byte gEasyChatWordsByLetter_Y - .4byte 19 @ number of entries - - .4byte gEasyChatWordsByLetter_Z - .4byte 8 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseHi - .4byte 55 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseFu - .4byte 71 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseHe - .4byte 32 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseHo - .4byte 55 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseMa - .4byte 74 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseMi - .4byte 37 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseMu - .4byte 12 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseMe - .4byte 26 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseMo - .4byte 20 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseYa - .4byte 24 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseYu - .4byte 13 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseYo - .4byte 28 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseRa - .4byte 36 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseRi - .4byte 17 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseRu - .4byte 11 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseRe - .4byte 18 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseRo - .4byte 10 @ number of entries - - .4byte gEasyChatWordsByLetter_UnusedJapaneseWa - .4byte 33 @ number of entries |