diff options
68 files changed, 1713 insertions, 1742 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index ab8c2d023..6b7b60349 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -21,6 +21,7 @@ #include "constants/fame_checker.h" #include "constants/seagallop.h" #include "constants/game_stat.h" +#include "constants/coins.h" #include "constants/menu.h" #include "constants/battle_setup.h" #include "constants/map_scripts.h" @@ -1707,419 +1708,35 @@ Text_1ACD45:: @ 81ACD45 .include "data/scripts/fame_checker.inc" .include "data/text/fame_checker.inc" -CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867 - lockall - showmoneybox 0, 0, 0 - msgbox gUnknown_81B1D7D, MSGBOX_YESNO - compare VAR_RESULT, NO - goto_if_eq EventScript_1B2926 - checkmoney 50, 0 - compare VAR_RESULT, FALSE - goto_if_eq EventScript_1B292B - playse SE_SHOP - removemoney 50, 0 - updatemoneybox 0, 0, 0 - waitse - message gUnknown_81B1E24 - waitmessage - multichoice 21, 0, MULTICHOICE_TRAINER_CARD_ICON_TINT, TRUE - switch VAR_RESULT - case 0, EventScript_1B28DB - case 1, EventScript_1B28E6 - case 2, EventScript_1B28F1 - case 3, EventScript_1B28FC - end - -EventScript_1B28DB:: @ 81B28DB - setvar VAR_0x8004, 0 - goto EventScript_1B2907 - -EventScript_1B28E5:: @ 81B28E5 - end - -EventScript_1B28E6:: @ 81B28E6 - setvar VAR_0x8004, 1 - goto EventScript_1B2907 - -EventScript_1B28F0:: @ 81B28F0 - end - -EventScript_1B28F1:: @ 81B28F1 - setvar VAR_0x8004, 2 - goto EventScript_1B2907 - -EventScript_1B28FB:: @ 81B28FB - end - -EventScript_1B28FC:: @ 81B28FC - setvar VAR_0x8004, 3 - goto EventScript_1B2907 - -EventScript_1B2906:: @ 81B2906 - end - -EventScript_1B2907:: @ 81B2907 - message gUnknown_81B1E42 - waitmessage - playse MUS_ME_PHOTO - dofieldeffect FLDEFF_UNK_45 - delay 60 - special Special_UpdateTrainerCardPhotoIcons - msgbox gUnknown_81B1E7D - hidemoneybox 0, 0 - releaseall - end - -EventScript_1B2926:: @ 81B2926 - hidemoneybox 0, 0 - releaseall - end - -EventScript_1B292B:: @ 81B292B - msgbox gUnknown_81B1E07 - hidemoneybox 0, 0 - releaseall - end - -FourIsland_House2_EventScript_1B2938:: @ 81B2938 - lock - specialvar VAR_0x8008, Special_StickerLadyGetBragFlags - goto_if_unset FLAG_MET_STICKER_LADY, EventScript_1B2951 - goto_if_set FLAG_MET_STICKER_LADY, EventScript_1B2994 - end - -EventScript_1B2951:: @ 81B2951 - setflag FLAG_MET_STICKER_LADY - msgbox gUnknown_81B1EB3 - applymovement 1, Movement_FacePlayer - waitmovement 0 - playse SE_PIN - applymovement 1, Movement_ExclamationMark - waitmovement 0 - applymovement 1, Movement_Delay48 - waitmovement 0 - compare VAR_0x8008, 0 - goto_if_eq EventScript_1B2B8E - message gUnknown_81B1EF8 - waitmessage - goto EventScript_1B29D0 - -EventScript_1B2993:: @ 81B2993 - end - -EventScript_1B2994:: @ 81B2994 - applymovement 1, Movement_FacePlayer - waitmovement 0 - goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 - compare VAR_0x8008, 0 - goto_if_eq EventScript_1B29C6 - message gUnknown_81B2025 - waitmessage - goto EventScript_1B29D0 - -EventScript_1B29C5:: @ 81B29C5 - end - -EventScript_1B29C6:: @ 81B29C6 - msgbox gUnknown_81B1FEF - release - end - -EventScript_1B29D0:: @ 81B29D0 - switch VAR_0x8008 - case 1, EventScript_1B2A23 - case 2, EventScript_1B2A4F - case 4, EventScript_1B2A7B - case 3, EventScript_1B2AA7 - case 5, EventScript_1B2ADE - case 6, EventScript_1B2B15 - case 7, EventScript_1B2B4C - end - -EventScript_1B2A23:: @ 81B2A23 - multichoice 15, 8, MULTICHOICE_HOF_QUIT, FALSE - switch VAR_RESULT - case 0, EventScript_1B2B98 - case 1, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 - end - -EventScript_1B2A4F:: @ 81B2A4F - multichoice 16, 8, MULTICHOICE_EGGS_QUIT, FALSE - switch VAR_RESULT - case 0, EventScript_1B2C62 - case 1, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 - end - -EventScript_1B2A7B:: @ 81B2A7B - multichoice 15, 8, MULTICHOICE_VICTORIES_QUIT, FALSE - switch VAR_RESULT - case 0, EventScript_1B2D2C - case 1, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 - end - -EventScript_1B2AA7:: @ 81B2AA7 - multichoice 15, 6, MULTICHOICE_HOF_EGGS_QUIT, FALSE - switch VAR_RESULT - case 0, EventScript_1B2B98 - case 1, EventScript_1B2C62 - case 2, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 - end - -EventScript_1B2ADE:: @ 81B2ADE - multichoice 15, 6, MULTICHOICE_HOF_VICTORIES_QUIT, FALSE - switch VAR_RESULT - case 0, EventScript_1B2B98 - case 1, EventScript_1B2D2C - case 2, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 - end - -EventScript_1B2B15:: @ 81B2B15 - multichoice 15, 6, MULTICHOICE_EGGS_VICTORIES_QUIT, FALSE - switch VAR_RESULT - case 0, EventScript_1B2C62 - case 1, EventScript_1B2D2C - case 2, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 - end - -EventScript_1B2B4C:: @ 81B2B4C - multichoice 15, 5, MULTICHOICE_HOF_EGGS_VICTORIES_QUIT, FALSE - switch VAR_RESULT - case 0, EventScript_1B2B98 - case 1, EventScript_1B2C62 - case 2, EventScript_1B2D2C - case 3, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 - end - -EventScript_1B2B8E:: @ 81B2B8E - msgbox gUnknown_81B1EF8 - release - end - -EventScript_1B2B98:: @ 81B2B98 - compare VAR_0x8004, 39 - goto_if_le EventScript_1B2BC5 - compare VAR_0x8004, 99 - goto_if_le EventScript_1B2BE3 - compare VAR_0x8004, 199 - goto_if_le EventScript_1B2C01 - compare VAR_0x8004, 200 - goto_if_ge EventScript_1B2C1F - end - -EventScript_1B2BC5:: @ 81B2BC5 - compare VAR_HOF_BRAG_STATE, 1 - goto_if_eq EventScript_1B2C3D - setvar VAR_HOF_BRAG_STATE, 1 - msgbox gUnknown_81B206E - goto EventScript_1B2C51 - -EventScript_1B2BE2:: @ 81B2BE2 - end - -EventScript_1B2BE3:: @ 81B2BE3 - compare VAR_HOF_BRAG_STATE, 2 - goto_if_eq EventScript_1B2C3D - setvar VAR_HOF_BRAG_STATE, 2 - msgbox gUnknown_81B20CF - goto EventScript_1B2C51 - -EventScript_1B2C00:: @ 81B2C00 - end - -EventScript_1B2C01:: @ 81B2C01 - compare VAR_HOF_BRAG_STATE, 3 - goto_if_eq EventScript_1B2C3D - setvar VAR_HOF_BRAG_STATE, 3 - msgbox gUnknown_81B2133 - goto EventScript_1B2C51 - -EventScript_1B2C1E:: @ 81B2C1E - end - -EventScript_1B2C1F:: @ 81B2C1F - compare VAR_HOF_BRAG_STATE, 4 - goto_if_eq EventScript_1B2C47 - setvar VAR_HOF_BRAG_STATE, 4 - msgbox gUnknown_81B21C4 - goto EventScript_1B2C51 - -EventScript_1B2C3C:: @ 81B2C3C - end - -EventScript_1B2C3D:: @ 81B2C3D - msgbox gUnknown_81B227C - release - end - -EventScript_1B2C47:: @ 81B2C47 - msgbox gUnknown_81B22B0 - release - end - -EventScript_1B2C51:: @ 81B2C51 - textcolor 3 - playfanfare MUS_FANFA1 - message gUnknown_81B2242 - waitmessage - waitfanfare - delay 90 - release - end - -EventScript_1B2C62:: @ 81B2C62 - compare VAR_0x8005, 99 - goto_if_le EventScript_1B2C8F - compare VAR_0x8005, 199 - goto_if_le EventScript_1B2CAD - compare VAR_0x8005, 299 - goto_if_le EventScript_1B2CCB - compare VAR_0x8005, 300 - goto_if_ge EventScript_1B2CE9 - end - -EventScript_1B2C8F:: @ 81B2C8F - compare VAR_EGG_BRAG_STATE, 1 - goto_if_eq EventScript_1B2D07 - setvar VAR_EGG_BRAG_STATE, 1 - msgbox gUnknown_81B2308 - goto EventScript_1B2D1B - -EventScript_1B2CAC:: @ 81B2CAC - end - -EventScript_1B2CAD:: @ 81B2CAD - compare VAR_EGG_BRAG_STATE, 2 - goto_if_eq EventScript_1B2D07 - setvar VAR_EGG_BRAG_STATE, 2 - msgbox gUnknown_81B2372 - goto EventScript_1B2D1B - -EventScript_1B2CCA:: @ 81B2CCA - end - -EventScript_1B2CCB:: @ 81B2CCB - compare VAR_EGG_BRAG_STATE, 3 - goto_if_eq EventScript_1B2D07 - setvar VAR_EGG_BRAG_STATE, 3 - msgbox gUnknown_81B23E0 - goto EventScript_1B2D1B - -EventScript_1B2CE8:: @ 81B2CE8 - end +gUnknown_81B1C8B:: @ 81B1C8B + .string "Hmm…\n" + .string "Is that right…$" -EventScript_1B2CE9:: @ 81B2CE9 - compare VAR_EGG_BRAG_STATE, 4 - goto_if_eq EventScript_1B2D11 - setvar VAR_EGG_BRAG_STATE, 4 - msgbox gUnknown_81B2448 - goto EventScript_1B2D1B +gUnknown_81B1C9F:: @ 81B1C9F + .string "Oh!\n" + .string "Look, look!$" -EventScript_1B2D06:: @ 81B2D06 - end - -EventScript_1B2D07:: @ 81B2D07 - msgbox gUnknown_81B251B - release - end - -EventScript_1B2D11:: @ 81B2D11 - msgbox gUnknown_81B254F - release - end - -EventScript_1B2D1B:: @ 81B2D1B - textcolor 3 - playfanfare MUS_FANFA1 - message gUnknown_81B24EA - waitmessage - waitfanfare - delay 90 - release - end - -EventScript_1B2D2C:: @ 81B2D2C - compare VAR_0x8006, 19 - goto_if_le EventScript_1B2D59 - compare VAR_0x8006, 49 - goto_if_le EventScript_1B2D77 - compare VAR_0x8006, 99 - goto_if_le EventScript_1B2D95 - compare VAR_0x8006, 100 - goto_if_ge EventScript_1B2DB3 - end - -EventScript_1B2D59:: @ 81B2D59 - compare VAR_LINK_WIN_BRAG_STATE, 1 - goto_if_eq EventScript_1B2DD1 - setvar VAR_LINK_WIN_BRAG_STATE, 1 - msgbox gUnknown_81B25A7 - goto EventScript_1B2DE5 - -EventScript_1B2D76:: @ 81B2D76 - end - -EventScript_1B2D77:: @ 81B2D77 - compare VAR_LINK_WIN_BRAG_STATE, 2 - goto_if_eq EventScript_1B2DD1 - setvar VAR_LINK_WIN_BRAG_STATE, 2 - msgbox gUnknown_81B2609 - goto EventScript_1B2DE5 +gUnknown_81B1CAF:: @ 81B1CAF + .string "Read it, read it!$" -EventScript_1B2D94:: @ 81B2D94 - end - -EventScript_1B2D95:: @ 81B2D95 - compare VAR_LINK_WIN_BRAG_STATE, 3 - goto_if_eq EventScript_1B2DD1 - setvar VAR_LINK_WIN_BRAG_STATE, 3 - msgbox gUnknown_81B267B - goto EventScript_1B2DE5 - -EventScript_1B2DB2:: @ 81B2DB2 - end - -EventScript_1B2DB3:: @ 81B2DB3 - compare VAR_LINK_WIN_BRAG_STATE, 4 - goto_if_eq EventScript_1B2DDB - setvar VAR_LINK_WIN_BRAG_STATE, 4 - msgbox gUnknown_81B26F6 - goto EventScript_1B2DE5 +gUnknown_81B1CC1:: @ 81B1CC1 + .string "TRAINER TIPS\p" + .string "Press START to open the MENU!$" -EventScript_1B2DD0:: @ 81B2DD0 - end +gUnknown_81B1CEC:: @ 81B1CEC + .string "Signs are useful, aren't they?$" -EventScript_1B2DD1:: @ 81B2DD1 - msgbox gUnknown_81B27DB - release - end +gUnknown_81B1D0B:: @ 81B1D0B + .string "Look, look!\p" + .string "I copied what it said on one of\n" + .string "those TRAINER TIPS signs!$" -EventScript_1B2DDB:: @ 81B2DDB - msgbox gUnknown_81B280F - release - end - -EventScript_1B2DE5:: @ 81B2DE5 - textcolor 3 - playfanfare MUS_FANFA1 - message gUnknown_81B27A6 - waitmessage - waitfanfare - delay 90 - release - end - -EventScript_1B2DF6:: @ 81B2DF6 - release - end +gUnknown_81B1D51:: @ 81B1D51 + .string "TRAINER TIPS!\p" + .string "Press START to open the MENU!$" + .include "data/text/trainer_card.inc" + .include "data/scripts/trainer_card.inc" .include "data/text/help_system.inc" .include "data/scripts/cable_club.inc" .include "data/scripts/field_moves.inc" diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index 5a4644854..706d9fa35 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166CFA", + "script": "CeladonCity_EventScript_RocketGrunt1", "flag": "FLAG_HIDE_CELADON_ROCKETS" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166CC5", + "script": "CeladonCity_EventScript_FatMan", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166CDC", + "script": "CeladonCity_EventScript_Poliwrath", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 4, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166C99", + "script": "CeladonCity_EventScript_LittleGirl", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 5, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166CAD", + "script": "CeladonCity_EventScript_Woman", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166CB6", + "script": "CeladonCity_EventScript_OldMan2", "flag": "0" }, { @@ -125,7 +125,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166D03", + "script": "CeladonCity_EventScript_RocketGrunt2", "flag": "FLAG_HIDE_CELADON_ROCKETS" }, { @@ -138,7 +138,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166CA2", + "script": "CeladonCity_EventScript_OldMan1", "flag": "0" }, { @@ -177,7 +177,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166D0C", + "script": "CeladonCity_EventScript_Boy", "flag": "0" }, { @@ -216,7 +216,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_166D15", + "script": "CeladonCity_EventScript_SilphCoScientist", "flag": "FLAG_HIDE_CELADON_ROCKETS" } ], @@ -320,56 +320,56 @@ "x": 45, "y": 23, "elevation": 0, - "script": "CeladonCity_EventScript_166D5A" + "script": "CeladonCity_EventScript_TrainerTips2" }, { "type": "bg_event_type_0", "x": 38, "y": 23, "elevation": 0, - "script": "CeladonCity_EventScript_166D63" + "script": "CeladonCity_EventScript_PrizeExchangeSign" }, { "type": "bg_event_type_0", "x": 33, "y": 23, "elevation": 0, - "script": "CeladonCity_EventScript_166D6C" + "script": "CeladonCity_EventScript_GameCornerSign" }, { "type": "bg_event_type_0", "x": 22, "y": 18, "elevation": 3, - "script": "CeladonCity_EventScript_166D27" + "script": "CeladonCity_EventScript_CitySign" }, { "type": "bg_event_type_0", "x": 26, "y": 11, "elevation": 0, - "script": "CeladonCity_EventScript_166D48" + "script": "CeladonCity_EventScript_MansionSign" }, { "type": "bg_event_type_0", "x": 33, "y": 16, "elevation": 0, - "script": "CeladonCity_EventScript_166D1E" + "script": "CeladonCity_EventScript_TrainerTips1" }, { "type": "bg_event_type_0", "x": 18, "y": 14, "elevation": 3, - "script": "CeladonCity_EventScript_166D51" + "script": "CeladonCity_EventScript_DeptStoreSign" }, { "type": "bg_event_type_0", "x": 16, "y": 31, "elevation": 0, - "script": "CeladonCity_EventScript_166D30" + "script": "CeladonCity_EventScript_GymSign" }, { "type": "hidden_item", diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc index b27d12178..a7d7eddc4 100644 --- a/data/maps/CeladonCity/scripts.inc +++ b/data/maps/CeladonCity/scripts.inc @@ -6,44 +6,44 @@ CeladonCity_OnTransition:: @ 8166C95 setworldmapflag FLAG_WORLD_MAP_CELADON_CITY end -CeladonCity_EventScript_166C99:: @ 8166C99 - msgbox gUnknown_817FEC3, MSGBOX_NPC +CeladonCity_EventScript_LittleGirl:: @ 8166C99 + msgbox CeladonCity_Text_GotMyKoffingInCinnabar, MSGBOX_NPC end -CeladonCity_EventScript_166CA2:: @ 8166CA2 +CeladonCity_EventScript_OldMan1:: @ 8166CA2 lock - msgbox gUnknown_817FF1C + msgbox CeladonCity_Text_GymIsGreatFullOfWomen release end -CeladonCity_EventScript_166CAD:: @ 8166CAD - msgbox gUnknown_817FF4A, MSGBOX_NPC +CeladonCity_EventScript_Woman:: @ 8166CAD + msgbox CeladonCity_Text_GameCornerIsBadForCitysImage, MSGBOX_NPC end -CeladonCity_EventScript_166CB6:: @ 8166CB6 - msgbox gUnknown_817FFC5, MSGBOX_NPC +CeladonCity_EventScript_OldMan2:: @ 8166CB6 + msgbox CeladonCity_Text_BlewItAllAtSlots, MSGBOX_NPC end CeladonCity_EventScript_SoftboiledTutor:: @ 8166CBF goto EventScript_SoftboiledTutor end -CeladonCity_EventScript_166CC5:: @ 8166CC5 +CeladonCity_EventScript_FatMan:: @ 8166CC5 lock faceplayer - msgbox gUnknown_818001B + msgbox CeladonCity_Text_MyTrustedPalPoliwrath closemessage applymovement 2, Movement_FaceOriginalDirection waitmovement 0 release end -CeladonCity_EventScript_166CDC:: @ 8166CDC +CeladonCity_EventScript_Poliwrath:: @ 8166CDC lock faceplayer waitse playmoncry SPECIES_POLIWRATH, 0 - msgbox gUnknown_8180075 + msgbox CeladonCity_Text_Poliwrath closemessage waitmoncry applymovement 3, Movement_FaceOriginalDirection @@ -51,53 +51,53 @@ CeladonCity_EventScript_166CDC:: @ 8166CDC release end -CeladonCity_EventScript_166CFA:: @ 8166CFA - msgbox gUnknown_81800C2, MSGBOX_NPC +CeladonCity_EventScript_RocketGrunt1:: @ 8166CFA + msgbox CeladonCity_Text_KeepOutOfTeamRocketsWay, MSGBOX_NPC end -CeladonCity_EventScript_166D03:: @ 8166D03 - msgbox gUnknown_818008C, MSGBOX_NPC +CeladonCity_EventScript_RocketGrunt2:: @ 8166D03 + msgbox CeladonCity_Text_GetLostOrIllPunchYou, MSGBOX_NPC end -CeladonCity_EventScript_166D0C:: @ 8166D0C - msgbox gUnknown_8180300, MSGBOX_NPC +CeladonCity_EventScript_Boy:: @ 8166D0C + msgbox CeladonCity_Text_ScaldedTongueOnTea, MSGBOX_NPC end -CeladonCity_EventScript_166D15:: @ 8166D15 - msgbox gUnknown_81804E1, MSGBOX_NPC +CeladonCity_EventScript_SilphCoScientist:: @ 8166D15 + msgbox CeladonCity_Text_SomeoneStoleSilphScope, MSGBOX_NPC end -CeladonCity_EventScript_166D1E:: @ 8166D1E - msgbox gUnknown_81800E1, MSGBOX_SIGN +CeladonCity_EventScript_TrainerTips1:: @ 8166D1E + msgbox CeladonCity_Text_ExplainXAccuracyDireHit, MSGBOX_SIGN end -CeladonCity_EventScript_166D27:: @ 8166D27 - msgbox gUnknown_818017A, MSGBOX_SIGN +CeladonCity_EventScript_CitySign:: @ 8166D27 + msgbox CeladonCity_Text_CitySign, MSGBOX_SIGN end -CeladonCity_EventScript_166D30:: @ 8166D30 +CeladonCity_EventScript_GymSign:: @ 8166D30 lockall famechecker FAMECHECKER_ERIKA, 0 - msgbox gUnknown_81801A2 + msgbox CeladonCity_Text_GymSign releaseall end -CeladonCity_EventScript_166D48:: @ 8166D48 - msgbox gUnknown_81801E5, MSGBOX_SIGN +CeladonCity_EventScript_MansionSign:: @ 8166D48 + msgbox CeladonCity_Text_MansionSign, MSGBOX_SIGN end -CeladonCity_EventScript_166D51:: @ 8166D51 - msgbox gUnknown_81801F5, MSGBOX_SIGN +CeladonCity_EventScript_DeptStoreSign:: @ 8166D51 + msgbox CeladonCity_Text_DeptStoreSign, MSGBOX_SIGN end -CeladonCity_EventScript_166D5A:: @ 8166D5A - msgbox gUnknown_8180224, MSGBOX_SIGN +CeladonCity_EventScript_TrainerTips2:: @ 8166D5A + msgbox CeladonCity_Text_GuardSpecProtectsFromStatus, MSGBOX_SIGN end -CeladonCity_EventScript_166D63:: @ 8166D63 - msgbox gUnknown_81802A4, MSGBOX_SIGN +CeladonCity_EventScript_PrizeExchangeSign:: @ 8166D63 + msgbox CeladonCity_Text_PrizeExchangeSign, MSGBOX_SIGN end -CeladonCity_EventScript_166D6C:: @ 8166D6C - msgbox gUnknown_81802CF, MSGBOX_SIGN +CeladonCity_EventScript_GameCornerSign:: @ 8166D6C + msgbox CeladonCity_Text_GameCornerSign, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity/text.inc b/data/maps/CeladonCity/text.inc index 40f489e3c..a61cdba6d 100644 --- a/data/maps/CeladonCity/text.inc +++ b/data/maps/CeladonCity/text.inc @@ -1,40 +1,40 @@ -gUnknown_817FEC3:: @ 817FEC3 +CeladonCity_Text_GotMyKoffingInCinnabar:: @ 817FEC3 .string "I got my KOFFING in CINNABAR.\p" .string "It's usually nice, but it breathes\n" .string "poison when it's angry.$" -gUnknown_817FF1C:: @ 817FF1C +CeladonCity_Text_GymIsGreatFullOfWomen:: @ 817FF1C .string "Heheh! This GYM is great!\n" .string "It's full of women!$" -gUnknown_817FF4A:: @ 817FF4A +CeladonCity_Text_GameCornerIsBadForCitysImage:: @ 817FF4A .string "CELADON takes pride in its efforts\n" .string "to keep the city beautiful.\p" .string "That's why the new GAME CORNER is\n" .string "bad for our city's image.$" -gUnknown_817FFC5:: @ 817FFC5 +CeladonCity_Text_BlewItAllAtSlots:: @ 817FFC5 .string "Moan…\n" .string "I blew it all at the slots!\p" .string "I knew I should have cashed in my\n" .string "COINS for prizes!$" -gUnknown_818001B:: @ 818001B +CeladonCity_Text_MyTrustedPalPoliwrath:: @ 818001B .string "This is my trusted pal, POLIWRATH.\p" .string "It evolved from a POLIWHIRL when\n" .string "I used a WATER STONE.$" -gUnknown_8180075:: @ 8180075 +CeladonCity_Text_Poliwrath:: @ 8180075 .string "POLIWRATH: Ribi ribit!$" -gUnknown_818008C:: @ 818008C +CeladonCity_Text_GetLostOrIllPunchYou:: @ 818008C .string "What are you staring at?\n" .string "Get lost, or I'll punch you.$" -gUnknown_81800C2:: @ 81800C2 +CeladonCity_Text_KeepOutOfTeamRocketsWay:: @ 81800C2 .string "Keep out of TEAM ROCKET's way!$" -gUnknown_81800E1:: @ 81800E1 +CeladonCity_Text_ExplainXAccuracyDireHit:: @ 81800E1 .string "TRAINER TIPS\p" .string "X ACCURACY boosts the accuracy of\n" .string "techniques.\p" @@ -43,23 +43,23 @@ gUnknown_81800E1:: @ 81800E1 .string "Get your items at the CELADON\n" .string "DEPT. STORE!$" -gUnknown_818017A:: @ 818017A +CeladonCity_Text_CitySign:: @ 818017A .string "CELADON CITY\n" .string "The City of Rainbow Dreams$" -gUnknown_81801A2:: @ 81801A2 +CeladonCity_Text_GymSign:: @ 81801A2 .string "CELADON CITY POKéMON GYM\n" .string "LEADER: ERIKA\l" .string "The Nature-Loving Princess!$" -gUnknown_81801E5:: @ 81801E5 +CeladonCity_Text_MansionSign:: @ 81801E5 .string "CELADON MANSION$" -gUnknown_81801F5:: @ 81801F5 +CeladonCity_Text_DeptStoreSign:: @ 81801F5 .string "Find what you need at the\n" .string "CELADON DEPT. STORE!$" -gUnknown_8180224:: @ 8180224 +CeladonCity_Text_GuardSpecProtectsFromStatus:: @ 8180224 .string "TRAINER TIPS\p" .string "GUARD SPEC. protects POKéMON\n" .string "from status-reduction moves during\l" @@ -67,15 +67,15 @@ gUnknown_8180224:: @ 8180224 .string "Get your items at the\n" .string "CELADON DEPT. STORE!$" -gUnknown_81802A4:: @ 81802A4 +CeladonCity_Text_PrizeExchangeSign:: @ 81802A4 .string "COINS exchanged for prizes!\n" .string "PRIZE EXCHANGE$" -gUnknown_81802CF:: @ 81802CF +CeladonCity_Text_GameCornerSign:: @ 81802CF .string "ROCKET GAME CORNER\n" .string "The playground for grown-ups!$" -gUnknown_8180300:: @ 8180300 +CeladonCity_Text_ScaldedTongueOnTea:: @ 8180300 .string "Aaaagh, ow…\n" .string "I scalded my tongue!\p" .string "This nice old lady in the MANSION\n" @@ -104,7 +104,7 @@ Text_SoftboiledWhichMon:: @ 8180484 Text_SoftboiledTaught:: @ 81804C4 .string "I wish you the best of luck!$" -gUnknown_81804E1:: @ 81804E1 +CeladonCity_Text_SomeoneStoleSilphScope:: @ 81804E1 .string "Oh, what am I to do…\p" .string "Someone stole our SILPH SCOPE.\p" .string "The thief came running this way,\n" diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index a6f29e9d7..bcb4f815c 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_1F_EventScript_16C38E", + "script": "CeladonCity_Condominiums_1F_EventScript_Meowth", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_1F_EventScript_16C3A1", + "script": "CeladonCity_Condominiums_1F_EventScript_Clefairy", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_1F_EventScript_16C3B4", + "script": "CeladonCity_Condominiums_1F_EventScript_Nidoran", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_1F_EventScript_16C321", + "script": "CeladonCity_Condominiums_1F_EventScript_TeaWoman", "flag": "0" } ], @@ -117,14 +117,14 @@ "x": 8, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_1F_EventScript_16C3C7" + "script": "CeladonCity_Condominiums_1F_EventScript_SuiteSign" }, { "type": "bg_event_type_0", "x": 7, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_1F_EventScript_16C3C7" + "script": "CeladonCity_Condominiums_1F_EventScript_SuiteSign" } ] } diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc index 41912748b..0703d8cc4 100644 --- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc @@ -1,63 +1,63 @@ CeladonCity_Condominiums_1F_MapScripts:: @ 816C320 .byte 0 -CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321 +CeladonCity_Condominiums_1F_EventScript_TeaWoman:: @ 816C321 lock faceplayer - goto_if_set FLAG_TALKED_TO_TEA_LADY_AFTER_HOF, EventScript_16C36A - goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_16C374 - goto_if_set FLAG_GOT_TEA, EventScript_16C36A - msgbox gUnknown_81960C9 + goto_if_set FLAG_TALKED_TO_TEA_LADY_AFTER_HOF, CeladonCity_Condominiums_1F_EventScript_TeaWomanAfterTea + goto_if_set FLAG_SYS_GAME_CLEAR, CeladonCity_Condominiums_1F_EventScript_TeaWomanMentionDaisy + goto_if_set FLAG_GOT_TEA, CeladonCity_Condominiums_1F_EventScript_TeaWomanAfterTea + msgbox CeladonCity_Condominiums_1F_Text_TryThisDrinkInstead setflag FLAG_GOT_TEA giveitem ITEM_TEA compare VAR_RESULT, FALSE goto_if_eq EventScript_BagIsFull - msgbox gUnknown_8196109 + msgbox CeladonCity_Condominiums_1F_Text_NothingBeatsThirstLikeTea release end -EventScript_16C36A:: @ 816C36A - msgbox gUnknown_8196148 +CeladonCity_Condominiums_1F_EventScript_TeaWomanAfterTea:: @ 816C36A + msgbox CeladonCity_Condominiums_1F_Text_MyDearMonsKeepMeCompany release end -EventScript_16C374:: @ 816C374 +CeladonCity_Condominiums_1F_EventScript_TeaWomanMentionDaisy:: @ 816C374 famechecker FAMECHECKER_DAISY, 4 setflag FLAG_TALKED_TO_TEA_LADY_AFTER_HOF - msgbox gUnknown_8196188 + msgbox CeladonCity_Condominiums_1F_Text_DaisyComesToBuyTea release end -CeladonCity_Condominiums_1F_EventScript_16C38E:: @ 816C38E +CeladonCity_Condominiums_1F_EventScript_Meowth:: @ 816C38E lock faceplayer waitse playmoncry SPECIES_MEOWTH, 0 - msgbox gUnknown_81960BB + msgbox CeladonCity_Condominiums_1F_Text_Meowth waitmoncry release end -CeladonCity_Condominiums_1F_EventScript_16C3A1:: @ 816C3A1 +CeladonCity_Condominiums_1F_EventScript_Clefairy:: @ 816C3A1 lock faceplayer waitse playmoncry SPECIES_CLEFAIRY, 0 - msgbox gUnknown_819625B + msgbox CeladonCity_Condominiums_1F_Text_Clefairy waitmoncry release end -CeladonCity_Condominiums_1F_EventScript_16C3B4:: @ 816C3B4 +CeladonCity_Condominiums_1F_EventScript_Nidoran:: @ 816C3B4 lock faceplayer waitse playmoncry SPECIES_NIDORAN_F, 0 - msgbox gUnknown_8196272 + msgbox CeladonCity_Condominiums_1F_Text_Nidoran waitmoncry release end -CeladonCity_Condominiums_1F_EventScript_16C3C7:: @ 816C3C7 - msgbox gUnknown_8196287, MSGBOX_SIGN +CeladonCity_Condominiums_1F_EventScript_SuiteSign:: @ 816C3C7 + msgbox CeladonCity_Condominiums_1F_Text_ManagersSuite, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_1F/text.inc b/data/maps/CeladonCity_Condominiums_1F/text.inc index 7cfb9c2a1..fa0512f76 100644 --- a/data/maps/CeladonCity_Condominiums_1F/text.inc +++ b/data/maps/CeladonCity_Condominiums_1F/text.inc @@ -1,21 +1,21 @@ -gUnknown_81960BB:: @ 81960BB +CeladonCity_Condominiums_1F_Text_Meowth:: @ 81960BB .string "MEOWTH: Meow!$" -gUnknown_81960C9:: @ 81960C9 +CeladonCity_Condominiums_1F_Text_TryThisDrinkInstead:: @ 81960C9 .string "You shouldn't spend all your money\n" .string "on drinks.\p" .string "Try this instead.$" -gUnknown_8196109:: @ 8196109 +CeladonCity_Condominiums_1F_Text_NothingBeatsThirstLikeTea:: @ 8196109 .string "Nothing beats thirst like some hot\n" .string "TEA.\p" .string "It really is the best.$" -gUnknown_8196148:: @ 8196148 +CeladonCity_Condominiums_1F_Text_MyDearMonsKeepMeCompany:: @ 8196148 .string "My dear POKéMON keep me company.\n" .string "MEOWTH even brings money home!$" -gUnknown_8196188:: @ 8196188 +CeladonCity_Condominiums_1F_Text_DaisyComesToBuyTea:: @ 8196188 .string "Oh, hello, dearie.\n" .string "Did you enjoy my TEA?\p" .string "By the way, dear. Are you, by any\n" @@ -25,13 +25,13 @@ gUnknown_8196188:: @ 8196188 .string "She visits the CELADON DEPT. STORE\n" .string "to buy some TEA.$" -gUnknown_819625B:: @ 819625B +CeladonCity_Condominiums_1F_Text_Clefairy:: @ 819625B .string "CLEFAIRY: Pi pippippi!$" -gUnknown_8196272:: @ 8196272 +CeladonCity_Condominiums_1F_Text_Nidoran:: @ 8196272 .string "NIDORAN♀: Kya kyaoo!$" -gUnknown_8196287:: @ 8196287 +CeladonCity_Condominiums_1F_Text_ManagersSuite:: @ 8196287 .string "CELADON MANSION\n" .string "Manager's Suite$" diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json index 33248a953..10e5eb1c6 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D", + "script": "CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika", "flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D", + "script": "CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika", "flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS" } ], @@ -77,14 +77,14 @@ "x": 8, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_2F_EventScript_16C3D1" + "script": "CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign" }, { "type": "bg_event_type_0", "x": 7, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_2F_EventScript_16C3D1" + "script": "CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign" } ] } diff --git a/data/maps/CeladonCity_Condominiums_2F/scripts.inc b/data/maps/CeladonCity_Condominiums_2F/scripts.inc index 53c0a90c0..9d952f2d7 100644 --- a/data/maps/CeladonCity_Condominiums_2F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_2F/scripts.inc @@ -1,6 +1,6 @@ CeladonCity_Condominiums_2F_MapScripts:: @ 816C3D0 .byte 0 -CeladonCity_Condominiums_2F_EventScript_16C3D1:: @ 816C3D1 - msgbox gUnknown_81962A7, MSGBOX_SIGN +CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign:: @ 816C3D1 + msgbox CeladonCity_Condominiums_2F_Text_GameFreakMeetingRoom, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_2F/text.inc b/data/maps/CeladonCity_Condominiums_2F/text.inc index 1913e1529..30ab60a1d 100644 --- a/data/maps/CeladonCity_Condominiums_2F/text.inc +++ b/data/maps/CeladonCity_Condominiums_2F/text.inc @@ -1,3 +1,3 @@ -gUnknown_81962A7:: @ 81962A7 +CeladonCity_Condominiums_2F_Text_GameFreakMeetingRoom:: @ 81962A7 .string "GAME FREAK Meeting Room$" diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index e491e8112..4a1fb023c 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C3DB", + "script": "CeladonCity_Condominiums_3F_EventScript_Programmer", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C3F6", + "script": "CeladonCity_Condominiums_3F_EventScript_Designer", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C3E4", + "script": "CeladonCity_Condominiums_3F_EventScript_GraphicArtist", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C3ED", + "script": "CeladonCity_Condominiums_3F_EventScript_Writer", "flag": "0" } ], @@ -103,56 +103,56 @@ "x": 8, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C435" + "script": "CeladonCity_Condominiums_3F_EventScript_DevelopmentRoomSign" }, { "type": "bg_event_type_1", "x": 1, "y": 9, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C43E" + "script": "CeladonCity_Condominiums_3F_EventScript_Computer1" }, { "type": "bg_event_type_1", "x": 5, "y": 9, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C447" + "script": "CeladonCity_Condominiums_3F_EventScript_Computer2" }, { "type": "bg_event_type_1", "x": 1, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C450" + "script": "CeladonCity_Condominiums_3F_EventScript_Computer3" }, { "type": "bg_event_type_0", "x": 7, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C435" + "script": "CeladonCity_Condominiums_3F_EventScript_DevelopmentRoomSign" }, { "type": "bg_event_type_1", "x": 0, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C450" + "script": "CeladonCity_Condominiums_3F_EventScript_Computer3" }, { "type": "bg_event_type_1", "x": 0, "y": 9, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C43E" + "script": "CeladonCity_Condominiums_3F_EventScript_Computer1" }, { "type": "bg_event_type_1", "x": 4, "y": 9, "elevation": 0, - "script": "CeladonCity_Condominiums_3F_EventScript_16C447" + "script": "CeladonCity_Condominiums_3F_EventScript_Computer2" } ] } diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc index d7bb14293..878ed63e8 100644 --- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc @@ -1,34 +1,34 @@ CeladonCity_Condominiums_3F_MapScripts:: @ 816C3DA .byte 0 -CeladonCity_Condominiums_3F_EventScript_16C3DB:: @ 816C3DB - msgbox gUnknown_81962BF, MSGBOX_NPC +CeladonCity_Condominiums_3F_EventScript_Programmer:: @ 816C3DB + msgbox CeladonCity_Condominiums_3F_Text_ImTheProgrammer, MSGBOX_NPC end -CeladonCity_Condominiums_3F_EventScript_16C3E4:: @ 816C3E4 - msgbox gUnknown_81962D7, MSGBOX_NPC +CeladonCity_Condominiums_3F_EventScript_GraphicArtist:: @ 816C3E4 + msgbox CeladonCity_Condominiums_3F_Text_ImTheGraphicArtist, MSGBOX_NPC end -CeladonCity_Condominiums_3F_EventScript_16C3ED:: @ 816C3ED - msgbox gUnknown_81962FB, MSGBOX_NPC +CeladonCity_Condominiums_3F_EventScript_Writer:: @ 816C3ED + msgbox CeladonCity_Condominiums_3F_Text_IWroteTheStory, MSGBOX_NPC end -CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6 +CeladonCity_Condominiums_3F_EventScript_Designer:: @ 816C3F6 lock faceplayer specialvar VAR_RESULT, HasAllKantoMons - compare VAR_RESULT, 1 - goto_if_eq EventScript_16C412 - msgbox gUnknown_8196356 + compare VAR_RESULT, TRUE + goto_if_eq CeladonCity_Condominiums_3F_EventScript_CompletedPokedex + msgbox CeladonCity_Condominiums_3F_Text_ImGameDesignerShowMeFinishedPokedex release end -EventScript_16C412:: @ 816C412 - goto EventScript_16C418 +CeladonCity_Condominiums_3F_EventScript_CompletedPokedex:: @ 816C412 + goto CeladonCity_Condominiums_3F_EventScript_ShowDiploma end -EventScript_16C418:: @ 816C418 - message Text_1963CD +CeladonCity_Condominiums_3F_EventScript_ShowDiploma:: @ 816C418 + message CeladonCity_Condominiums_3F_Text_CompletedPokedexCongratulations waitmessage delay 60 goto_if_questlog EventScript_ReleaseEnd @@ -37,18 +37,18 @@ EventScript_16C418:: @ 816C418 release end -CeladonCity_Condominiums_3F_EventScript_16C435:: @ 816C435 - msgbox gUnknown_81964A8, MSGBOX_SIGN +CeladonCity_Condominiums_3F_EventScript_DevelopmentRoomSign:: @ 816C435 + msgbox CeladonCity_Condominiums_3F_Text_GameFreakDevelopmentRoom, MSGBOX_SIGN end -CeladonCity_Condominiums_3F_EventScript_16C43E:: @ 816C43E - msgbox gUnknown_819640C, MSGBOX_SIGN +CeladonCity_Condominiums_3F_EventScript_Computer1:: @ 816C43E + msgbox CeladonCity_Condominiums_3F_Text_ItsTheGameProgram, MSGBOX_SIGN end -CeladonCity_Condominiums_3F_EventScript_16C447:: @ 816C447 - msgbox gUnknown_819644B, MSGBOX_SIGN +CeladonCity_Condominiums_3F_EventScript_Computer2:: @ 816C447 + msgbox CeladonCity_Condominiums_3F_Text_SomeonesPlayingGame, MSGBOX_SIGN end -CeladonCity_Condominiums_3F_EventScript_16C450:: @ 816C450 - msgbox gUnknown_8196478, MSGBOX_SIGN +CeladonCity_Condominiums_3F_EventScript_Computer3:: @ 816C450 + msgbox CeladonCity_Condominiums_3F_Text_ItsScriptBetterNotLookAtEnding, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_3F/text.inc b/data/maps/CeladonCity_Condominiums_3F/text.inc index 3f7179dfe..d4f91594a 100644 --- a/data/maps/CeladonCity_Condominiums_3F/text.inc +++ b/data/maps/CeladonCity_Condominiums_3F/text.inc @@ -1,42 +1,42 @@ -gUnknown_81962BF:: @ 81962BF +CeladonCity_Condominiums_3F_Text_ImTheProgrammer:: @ 81962BF .string "Me?\n" .string "I'm the programmer!$" -gUnknown_81962D7:: @ 81962D7 +CeladonCity_Condominiums_3F_Text_ImTheGraphicArtist:: @ 81962D7 .string "I'm the graphic artist!\n" .string "I drew you!$" -gUnknown_81962FB:: @ 81962FB +CeladonCity_Condominiums_3F_Text_IWroteTheStory:: @ 81962FB .string "I wrote the story!\n" .string "Isn't ERIKA cute?\p" .string "I like MISTY a lot, too!\n" .string "Oh, and SABRINA, I like her!$" -gUnknown_8196356:: @ 8196356 +CeladonCity_Condominiums_3F_Text_ImGameDesignerShowMeFinishedPokedex:: @ 8196356 .string "Is that right?\p" .string "I'm the game designer!\p" .string "Filling up your POKéDEX is tough,\n" .string "but don't quit!\p" .string "When you finish, come tell me!$" -Text_1963CD:: @ 81963CD +CeladonCity_Condominiums_3F_Text_CompletedPokedexCongratulations:: @ 81963CD .string "Wow! Excellent!\n" .string "You completed your POKéDEX!\l" .string "Congratulations!\l" .string "…$" -gUnknown_819640C:: @ 819640C +CeladonCity_Condominiums_3F_Text_ItsTheGameProgram:: @ 819640C .string "It's the game program! Messing with\n" .string "it could bug out the game!$" -gUnknown_819644B:: @ 819644B +CeladonCity_Condominiums_3F_Text_SomeonesPlayingGame:: @ 819644B .string "Someone's playing a game instead of\n" .string "working!$" -gUnknown_8196478:: @ 8196478 +CeladonCity_Condominiums_3F_Text_ItsScriptBetterNotLookAtEnding:: @ 8196478 .string "It's the script!\n" .string "Better not look at the ending!$" -gUnknown_81964A8:: @ 81964A8 +CeladonCity_Condominiums_3F_Text_GameFreakDevelopmentRoom:: @ 81964A8 .string "GAME FREAK Development Room$" diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json index 7680f5f68..c929b62fc 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/map.json +++ b/data/maps/CeladonCity_Condominiums_Roof/map.json @@ -43,14 +43,14 @@ "x": 4, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_Roof_EventScript_16C45A" + "script": "CeladonCity_Condominiums_Roof_EventScript_Sign" }, { "type": "bg_event_type_0", "x": 3, "y": 12, "elevation": 0, - "script": "CeladonCity_Condominiums_Roof_EventScript_16C45A" + "script": "CeladonCity_Condominiums_Roof_EventScript_Sign" } ] } diff --git a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc index 59631d86c..98013e38f 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc @@ -1,6 +1,6 @@ CeladonCity_Condominiums_Roof_MapScripts:: @ 816C459 .byte 0 -CeladonCity_Condominiums_Roof_EventScript_16C45A:: @ 816C45A - msgbox gUnknown_81964C4, MSGBOX_SIGN +CeladonCity_Condominiums_Roof_EventScript_Sign:: @ 816C45A + msgbox CeladonCity_Condominiums_Roof_Text_IKnowEverything, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_Roof/text.inc b/data/maps/CeladonCity_Condominiums_Roof/text.inc index 02398e70b..f3012fd31 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/text.inc +++ b/data/maps/CeladonCity_Condominiums_Roof/text.inc @@ -1,3 +1,3 @@ -gUnknown_81964C4:: @ 81964C4 +CeladonCity_Condominiums_Roof_Text_IKnowEverything:: @ 81964C4 .string "I KNOW EVERYTHING!$" diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index 717bfc4a1..d229e7fdd 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C464", + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_BlackBelt", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C46D", + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall", "flag": "FLAG_HIDE_EEVEE_BALL" } ], @@ -70,21 +70,21 @@ "x": 4, "y": 1, "elevation": 0, - "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C522" + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_Blackboard" }, { "type": "bg_event_type_0", "x": 5, "y": 1, "elevation": 0, - "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C522" + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_Blackboard" }, { "type": "bg_event_type_0", "x": 4, "y": 4, "elevation": 0, - "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C519" + "script": "CeladonCity_Condominiums_RoofRoom_EventScript_TMsPamphlet" } ] } diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 73c55afd8..3f3363674 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -1,109 +1,109 @@ CeladonCity_Condominiums_RoofRoom_MapScripts:: @ 816C463 .byte 0 -CeladonCity_Condominiums_RoofRoom_EventScript_16C464:: @ 816C464 - msgbox gUnknown_81964D7, MSGBOX_NPC +CeladonCity_Condominiums_RoofRoom_EventScript_BlackBelt:: @ 816C464 + msgbox CeladonCity_Condominiums_RoofRoom_Text_TheresNothingIDontKnow, MSGBOX_NPC end -CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D +CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall:: @ 816C46D lock faceplayer setvar VAR_TEMP_1, SPECIES_EEVEE givemon SPECIES_EEVEE, 25, ITEM_NONE compare VAR_RESULT, 0 - goto_if_eq EventScript_16C4A6 + goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty compare VAR_RESULT, 1 - goto_if_eq EventScript_16C4DA + goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveePC compare VAR_RESULT, 2 goto_if_eq EventScript_NoMoreRoomForPokemon release end -EventScript_16C4A6:: @ 816C4A6 +CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty:: @ 816C4A6 removeobject 2 playfanfare MUS_FANFA1 - message Text_196591 + message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee waitmessage waitfanfare getspeciesname 0, SPECIES_EEVEE msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16C514 + goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee call EventScript_GetGiftMonPartySlot call EventScript_ChangePokemonNickname - goto EventScript_16C514 + goto CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee end -EventScript_16C4DA:: @ 816C4DA +CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveePC:: @ 816C4DA removeobject 2 playfanfare MUS_FANFA1 - message Text_196591 + message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee waitmessage waitfanfare getspeciesname 0, SPECIES_EEVEE msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16C509 + goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC call EventScript_NameReceivedBoxMon - goto EventScript_16C509 + goto CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC end -EventScript_16C509:: @ 816C509 +CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC:: @ 816C509 call EventScript_TransferredToPC - goto EventScript_16C514 + goto CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee end -EventScript_16C514:: @ 816C514 +CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee:: @ 816C514 setflag FLAG_GOT_EEVEE release end -CeladonCity_Condominiums_RoofRoom_EventScript_16C519:: @ 816C519 - msgbox gUnknown_81967E3, MSGBOX_SIGN +CeladonCity_Condominiums_RoofRoom_EventScript_TMsPamphlet:: @ 816C519 + msgbox CeladonCity_Condominiums_RoofRoom_Text_PamphletOnTMs, MSGBOX_SIGN end -CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522 +CeladonCity_Condominiums_RoofRoom_EventScript_Blackboard:: @ 816C522 lockall - msgbox gUnknown_81965C2 - message Text_1965F4 + msgbox CeladonCity_Condominiums_RoofRoom_Text_WirelessAdapterLecture + message CeladonCity_Condominiums_RoofRoom_Text_ReadWhichHeading waitmessage setvar VAR_0x8004, 4 multichoice 0, 0, MULTICHOICE_LINKED_DIRECT_UNION, FALSE switch VAR_RESULT - case 0, EventScript_16C5C0 - case 1, EventScript_16C5CE - case 2, EventScript_16C5DC - case 3, EventScript_16C5EA - case 127, EventScript_16C5EA + case 0, CeladonCity_Condominiums_RoofRoom_EventScript_WirelessClub + case 1, CeladonCity_Condominiums_RoofRoom_EventScript_DirectCorner + case 2, CeladonCity_Condominiums_RoofRoom_EventScript_UnionRoom + case 3, CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard + case 127, CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard end -EventScript_16C578:: @ 816C578 - message Text_1965F4 +CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading:: @ 816C578 + message CeladonCity_Condominiums_RoofRoom_Text_ReadWhichHeading waitmessage multichoice 0, 0, MULTICHOICE_LINKED_DIRECT_UNION, FALSE switch VAR_RESULT - case 0, EventScript_16C5C0 - case 1, EventScript_16C5CE - case 2, EventScript_16C5DC - case 3, EventScript_16C5EA - case 127, EventScript_16C5EA + case 0, CeladonCity_Condominiums_RoofRoom_EventScript_WirelessClub + case 1, CeladonCity_Condominiums_RoofRoom_EventScript_DirectCorner + case 2, CeladonCity_Condominiums_RoofRoom_EventScript_UnionRoom + case 3, CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard + case 127, CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard end -EventScript_16C5C0:: @ 816C5C0 - msgbox gUnknown_8196617 - goto EventScript_16C578 +CeladonCity_Condominiums_RoofRoom_EventScript_WirelessClub:: @ 816C5C0 + msgbox CeladonCity_Condominiums_RoofRoom_Text_ExplainWirelessClub + goto CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading end -EventScript_16C5CE:: @ 816C5CE - msgbox gUnknown_8196695 - goto EventScript_16C578 +CeladonCity_Condominiums_RoofRoom_EventScript_DirectCorner:: @ 816C5CE + msgbox CeladonCity_Condominiums_RoofRoom_Text_ExplainDirectCorner + goto CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading end -EventScript_16C5DC:: @ 816C5DC - msgbox gUnknown_819673C - goto EventScript_16C578 +CeladonCity_Condominiums_RoofRoom_EventScript_UnionRoom:: @ 816C5DC + msgbox CeladonCity_Condominiums_RoofRoom_Text_ExplainUnionRoom + goto CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading end -EventScript_16C5EA:: @ 816C5EA +CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard:: @ 816C5EA releaseall end diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc index bb09c8ce3..9e43f06ce 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc @@ -1,4 +1,4 @@ -gUnknown_81964D7:: @ 81964D7 +CeladonCity_Condominiums_RoofRoom_Text_TheresNothingIDontKnow:: @ 81964D7 .string "There is nothing that I don't know,\n" .string "like I wrote on the blackboard.\p" .string "I know about the world of POKéMON\n" @@ -6,27 +6,27 @@ gUnknown_81964D7:: @ 81964D7 .string "Get together with your friends and\n" .string "enjoy trading POKéMON!$" -Text_196591:: @ 8196591 +CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee:: @ 8196591 .string "{PLAYER} obtained an EEVEE!$" -Text_1965A7:: @ 81965A7 +CeladonCity_Condominiums_RoofRoom_Text_BoxIsFull:: @ 81965A7 .string "ポケモンが いっぱいだ\n" .string "ボックスを かえて きなさい$" -gUnknown_81965C2:: @ 81965C2 +CeladonCity_Condominiums_RoofRoom_Text_WirelessAdapterLecture:: @ 81965C2 .string "POKéMON Lecture\p" .string "Playing with the Wireless Adapter$" -Text_1965F4:: @ 81965F4 +CeladonCity_Condominiums_RoofRoom_Text_ReadWhichHeading:: @ 81965F4 .string "Which heading do you want to read?$" -gUnknown_8196617:: @ 8196617 +CeladonCity_Condominiums_RoofRoom_Text_ExplainWirelessClub:: @ 8196617 .string "The POKéMON WIRELESS CLUB is\n" .string "upstairs at any POKéMON CENTER.\p" .string "Visit one to link up with friend(s)\n" .string "using your Wireless Adapter.$" -gUnknown_8196695:: @ 8196695 +CeladonCity_Condominiums_RoofRoom_Text_ExplainDirectCorner:: @ 8196695 .string "To link only with a friend, go to\n" .string "the DIRECT CORNER.\p" .string "It is the right counter at the\n" @@ -34,7 +34,7 @@ gUnknown_8196695:: @ 8196695 .string "Go into the TRADE CORNER or the\n" .string "COLOSSEUM with your friend.$" -gUnknown_819673C:: @ 819673C +CeladonCity_Condominiums_RoofRoom_Text_ExplainUnionRoom:: @ 819673C .string "To link and communicate with\n" .string "anyone, go to the UNION ROOM.\p" .string "It is the left counter at the\n" @@ -42,7 +42,7 @@ gUnknown_819673C:: @ 819673C .string "Go to the UNION ROOM and enjoy\n" .string "meeting other TRAINERS.$" -gUnknown_81967E3:: @ 81967E3 +CeladonCity_Condominiums_RoofRoom_Text_PamphletOnTMs:: @ 81967E3 .string "It's a pamphlet on TMs.\p" .string "… …\p" .string "There are fifty TMs in all.\p" diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index afa57c1aa..d4e20b168 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAD9", + "script": "CeladonCity_DepartmentStore_1F_EventScript_Receptionist", "flag": "0" } ], @@ -92,14 +92,14 @@ "x": 9, "y": 11, "elevation": 0, - "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAE2" + "script": "CeladonCity_DepartmentStore_1F_EventScript_LayoutSign" }, { "type": "bg_event_type_0", "x": 8, "y": 1, "elevation": 0, - "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAEB" + "script": "CeladonCity_DepartmentStore_1F_EventScript_FloorSign" } ] } diff --git a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc index 4e5bcc05e..08aa687f8 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc @@ -1,14 +1,14 @@ CeladonCity_DepartmentStore_1F_MapScripts:: @ 816BAD8 .byte 0 -CeladonCity_DepartmentStore_1F_EventScript_16BAD9:: @ 816BAD9 - msgbox gUnknown_81954DD, MSGBOX_NPC +CeladonCity_DepartmentStore_1F_EventScript_Receptionist:: @ 816BAD9 + msgbox CeladonCity_DepartmentStore_1F_Text_WelcomeToDeptStore, MSGBOX_NPC end -CeladonCity_DepartmentStore_1F_EventScript_16BAE2:: @ 816BAE2 - msgbox gUnknown_8195537, MSGBOX_SIGN +CeladonCity_DepartmentStore_1F_EventScript_LayoutSign:: @ 816BAE2 + msgbox CeladonCity_DepartmentStore_1F_Text_FloorDescriptions, MSGBOX_SIGN end -CeladonCity_DepartmentStore_1F_EventScript_16BAEB:: @ 816BAEB - msgbox gUnknown_81955B3, MSGBOX_SIGN +CeladonCity_DepartmentStore_1F_EventScript_FloorSign:: @ 816BAEB + msgbox CeladonCity_DepartmentStore_1F_Text_ServiceCounter, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_DepartmentStore_1F/text.inc b/data/maps/CeladonCity_DepartmentStore_1F/text.inc index e78a8c6d2..f1d1877e4 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_1F/text.inc @@ -1,10 +1,10 @@ -gUnknown_81954DD:: @ 81954DD +CeladonCity_DepartmentStore_1F_Text_WelcomeToDeptStore:: @ 81954DD .string "Hello!\n" .string "Welcome to CELADON DEPT. STORE.\p" .string "The board on the right describes\n" .string "the store layout.$" -gUnknown_8195537:: @ 8195537 +CeladonCity_DepartmentStore_1F_Text_FloorDescriptions:: @ 8195537 .string "1F: SERVICE COUNTER\p" .string "2F: TRAINER'S MARKET\p" .string "3F: TV GAME SHOP\p" @@ -12,6 +12,6 @@ gUnknown_8195537:: @ 8195537 .string "5F: DRUGSTORE\p" .string "ROOFTOP SQUARE: VENDING MACHINES$" -gUnknown_81955B3:: @ 81955B3 +CeladonCity_DepartmentStore_1F_Text_ServiceCounter:: @ 81955B3 .string "1F: SERVICE COUNTER$" diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index fdb27ab7e..e4e6f2f29 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_2F_EventScript_16BAFE", + "script": "CeladonCity_DepartmentStore_2F_EventScript_Lass", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB10", + "script": "CeladonCity_DepartmentStore_2F_EventScript_ClerkItems", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB4E", + "script": "CeladonCity_DepartmentStore_2F_EventScript_ClerkTMs", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_2F_EventScript_1AD053", + "script": "CeladonCity_DepartmentStore_2F_EventScript_Woman", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], @@ -96,7 +96,7 @@ "x": 4, "y": 1, "elevation": 0, - "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB07" + "script": "CeladonCity_DepartmentStore_2F_EventScript_FloorSign" } ] } diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc index 24d4771b2..f7e89886d 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc @@ -1,31 +1,31 @@ CeladonCity_DepartmentStore_2F_MapScripts:: @ 816BAF4 .byte 0 -CeladonCity_DepartmentStore_2F_EventScript_16BAF5:: @ 816BAF5 - msgbox gUnknown_81955C7, MSGBOX_NPC +CeladonCity_DepartmentStore_2F_EventScript_UnusedNPC:: @ 816BAF5 + msgbox CeladonCity_DepartmentStore_2F_Text_SuperRepelMorePowerfulRepel, MSGBOX_NPC end -CeladonCity_DepartmentStore_2F_EventScript_16BAFE:: @ 816BAFE - msgbox gUnknown_819560F, MSGBOX_NPC +CeladonCity_DepartmentStore_2F_EventScript_Lass:: @ 816BAFE + msgbox CeladonCity_DepartmentStore_2F_Text_BuyReviveForLongOutings, MSGBOX_NPC end -CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07 - msgbox gUnknown_8195638, MSGBOX_SIGN +CeladonCity_DepartmentStore_2F_EventScript_FloorSign:: @ 816BB07 + msgbox CeladonCity_DepartmentStore_2F_Text_FloorSign, MSGBOX_SIGN end -CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10 +CeladonCity_DepartmentStore_2F_EventScript_ClerkItems:: @ 816BB10 goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16BB38 + pokemart CeladonCity_DepartmentStore_2F_Items msgbox Text_PleaseComeAgain release end .align 2 -Items_16BB38:: @ 816BB38 +CeladonCity_DepartmentStore_2F_Items:: @ 816BB38 .2byte ITEM_GREAT_BALL .2byte ITEM_SUPER_POTION .2byte ITEM_REVIVE @@ -39,19 +39,19 @@ Items_16BB38:: @ 816BB38 release end -CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E +CeladonCity_DepartmentStore_2F_EventScript_ClerkTMs:: @ 816BB4E goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16BB74 + pokemart CeladonCity_DepartmentStore_2F_TMs msgbox Text_PleaseComeAgain release end .align 2 -Items_16BB74:: @ 816BB74 +CeladonCity_DepartmentStore_2F_TMs:: @ 816BB74 .2byte ITEM_TM05 .2byte ITEM_TM15 .2byte ITEM_TM28 diff --git a/data/maps/CeladonCity_DepartmentStore_2F/text.inc b/data/maps/CeladonCity_DepartmentStore_2F/text.inc index 22bf6b36c..77466521a 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/text.inc @@ -1,13 +1,19 @@ -gUnknown_81955C7:: @ 81955C7 +CeladonCity_DepartmentStore_2F_Text_SuperRepelMorePowerfulRepel:: @ 81955C7 .string "SUPER REPEL keeps weak POKéMON at\n" .string "bay…\p" .string "Hmm, it's a more powerful REPEL.$" -gUnknown_819560F:: @ 819560F +CeladonCity_DepartmentStore_2F_Text_BuyReviveForLongOutings:: @ 819560F .string "For long outings, you should buy\n" .string "REVIVE.$" -gUnknown_8195638:: @ 8195638 +CeladonCity_DepartmentStore_2F_Text_FloorSign:: @ 8195638 .string "Top-Grade Items for TRAINERS!\p" .string "2F: TRAINER'S MARKET$" +CeladonCity_DepartmentStore_2F_Text_LanceComesToBuyCapes:: @ 819566B + .string "We have a customer, LANCE, who\n" + .string "occasionally comes.\p" + .string "He always buys capes.\p" + .string "I wonder… Does he have many\n" + .string "identical capes at home?$" diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index 76bc95d25..37132845e 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB8B", + "script": "CeladonCity_DepartmentStore_3F_EventScript_GBAKid1", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB9D", + "script": "CeladonCity_DepartmentStore_3F_EventScript_GBAKid3", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB94", + "script": "CeladonCity_DepartmentStore_3F_EventScript_GBAKid2", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBA6", + "script": "CeladonCity_DepartmentStore_3F_EventScript_LittleGirl", "flag": "0" } ], @@ -109,77 +109,77 @@ "x": 8, "y": 1, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBDC" + "script": "CeladonCity_DepartmentStore_3F_EventScript_FloorSign" }, { "type": "bg_event_type_1", "x": 2, "y": 8, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBB8" + "script": "CeladonCity_DepartmentStore_3F_EventScript_TV1" }, { "type": "bg_event_type_1", "x": 5, "y": 8, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBC1" + "script": "CeladonCity_DepartmentStore_3F_EventScript_TV2" }, { "type": "bg_event_type_1", "x": 2, "y": 11, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBCA" + "script": "CeladonCity_DepartmentStore_3F_EventScript_TV3" }, { "type": "bg_event_type_1", "x": 5, "y": 11, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBD3" + "script": "CeladonCity_DepartmentStore_3F_EventScript_TV4" }, { "type": "bg_event_type_0", "x": 1, "y": 8, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF" + "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES" }, { "type": "bg_event_type_0", "x": 1, "y": 11, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF" + "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES" }, { "type": "bg_event_type_0", "x": 4, "y": 8, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF" + "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES" }, { "type": "bg_event_type_0", "x": 4, "y": 11, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF" + "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES" }, { "type": "bg_event_type_1", "x": 2, "y": 4, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBE5" + "script": "CeladonCity_DepartmentStore_3F_EventScript_Poster" }, { "type": "bg_event_type_1", "x": 0, "y": 4, "elevation": 0, - "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBE5" + "script": "CeladonCity_DepartmentStore_3F_EventScript_Poster" } ] } diff --git a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc index f4faca037..e7af53078 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc @@ -5,46 +5,46 @@ CeladonCity_DepartmentStore_3F_EventScript_CounterTutor:: @ 816BB85 goto EventScript_CounterTutor end -CeladonCity_DepartmentStore_3F_EventScript_16BB8B:: @ 816BB8B - msgbox gUnknown_81956E9, MSGBOX_NPC +CeladonCity_DepartmentStore_3F_EventScript_GBAKid1:: @ 816BB8B + msgbox CeladonCity_DepartmentStore_3F_Text_OTStandsForOriginalTrainer, MSGBOX_NPC end -CeladonCity_DepartmentStore_3F_EventScript_16BB94:: @ 816BB94 - msgbox gUnknown_8195769, MSGBOX_NPC +CeladonCity_DepartmentStore_3F_EventScript_GBAKid2:: @ 816BB94 + msgbox CeladonCity_DepartmentStore_3F_Text_BuddyTradingKangaskhanForHaunter, MSGBOX_NPC end -CeladonCity_DepartmentStore_3F_EventScript_16BB9D:: @ 816BB9D - msgbox gUnknown_81957B0, MSGBOX_NPC +CeladonCity_DepartmentStore_3F_EventScript_GBAKid3:: @ 816BB9D + msgbox CeladonCity_DepartmentStore_3F_Text_HaunterEvolvedOnTrade, MSGBOX_NPC end -CeladonCity_DepartmentStore_3F_EventScript_16BBA6:: @ 816BBA6 - msgbox gUnknown_8195823, MSGBOX_NPC +CeladonCity_DepartmentStore_3F_EventScript_LittleGirl:: @ 816BBA6 + msgbox CeladonCity_DepartmentStore_3F_Text_CanIdentifyTradeMonsByID, MSGBOX_NPC end -CeladonCity_DepartmentStore_3F_EventScript_16BBAF:: @ 816BBAF - msgbox gUnknown_8195863, MSGBOX_SIGN +CeladonCity_DepartmentStore_3F_EventScript_SuperNES:: @ 816BBAF + msgbox CeladonCity_DepartmentStore_3F_Text_ItsSuperNES, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_16BBB8:: @ 816BBB8 - msgbox gUnknown_8195875, MSGBOX_SIGN +CeladonCity_DepartmentStore_3F_EventScript_TV1:: @ 816BBB8 + msgbox CeladonCity_DepartmentStore_3F_Text_AnRPG, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_16BBC1:: @ 816BBC1 - msgbox gUnknown_8195897, MSGBOX_SIGN +CeladonCity_DepartmentStore_3F_EventScript_TV2:: @ 816BBC1 + msgbox CeladonCity_DepartmentStore_3F_Text_SportsGame, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_16BBCA:: @ 816BBCA - msgbox gUnknown_81958B8, MSGBOX_SIGN +CeladonCity_DepartmentStore_3F_EventScript_TV3:: @ 816BBCA + msgbox CeladonCity_DepartmentStore_3F_Text_PuzzleGame, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_16BBD3:: @ 816BBD3 - msgbox gUnknown_81958D8, MSGBOX_SIGN +CeladonCity_DepartmentStore_3F_EventScript_TV4:: @ 816BBD3 + msgbox CeladonCity_DepartmentStore_3F_Text_FightingGame, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_16BBDC:: @ 816BBDC - msgbox gUnknown_81958F6, MSGBOX_SIGN +CeladonCity_DepartmentStore_3F_EventScript_FloorSign:: @ 816BBDC + msgbox CeladonCity_DepartmentStore_3F_Text_TVGameShop, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_16BBE5:: @ 816BBE5 - msgbox gUnknown_8195907, MSGBOX_SIGN +CeladonCity_DepartmentStore_3F_EventScript_Poster:: @ 816BBE5 + msgbox CeladonCity_DepartmentStore_3F_Text_RedGreenBothArePokemon, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_DepartmentStore_3F/text.inc b/data/maps/CeladonCity_DepartmentStore_3F/text.inc index 7d4db12cc..3533884a5 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_3F/text.inc @@ -1,22 +1,15 @@ -Text_19566B:: @ 819566B - .string "We have a customer, LANCE, who\n" - .string "occasionally comes.\p" - .string "He always buys capes.\p" - .string "I wonder… Does he have many\n" - .string "identical capes at home?$" - -gUnknown_81956E9:: @ 81956E9 +CeladonCity_DepartmentStore_3F_Text_OTStandsForOriginalTrainer:: @ 81956E9 .string "Captured POKéMON are registered\n" .string "with an ID No. and the OT.\p" .string "OT stands for “Original TRAINER” -\n" .string "the TRAINER that caught it first.$" -gUnknown_8195769:: @ 8195769 +CeladonCity_DepartmentStore_3F_Text_BuddyTradingKangaskhanForHaunter:: @ 8195769 .string "All right!\p" .string "My buddy's going to trade me his\n" .string "KANGASKHAN for my HAUNTER!$" -gUnknown_81957B0:: @ 81957B0 +CeladonCity_DepartmentStore_3F_Text_HaunterEvolvedOnTrade:: @ 81957B0 .string "Come on, HAUNTER!\p" .string "I love HAUNTER!\n" .string "I collect them!\p" @@ -24,33 +17,54 @@ gUnknown_81957B0:: @ 81957B0 .string "HAUNTER turned into a different\n" .string "POKéMON while being traded!$" -gUnknown_8195823:: @ 8195823 +CeladonCity_DepartmentStore_3F_Text_CanIdentifyTradeMonsByID:: @ 8195823 .string "You can identify POKéMON you get\n" .string "in trades by their ID Numbers.$" -gUnknown_8195863:: @ 8195863 +CeladonCity_DepartmentStore_3F_Text_ItsSuperNES:: @ 8195863 .string "It's a Super NES.$" -gUnknown_8195875:: @ 8195875 +CeladonCity_DepartmentStore_3F_Text_AnRPG:: @ 8195875 .string "An RPG!\n" .string "There's no time for that!$" -gUnknown_8195897:: @ 8195897 +CeladonCity_DepartmentStore_3F_Text_SportsGame:: @ 8195897 .string "A sports game!\n" .string "Dad'll like that!$" -gUnknown_81958B8:: @ 81958B8 +CeladonCity_DepartmentStore_3F_Text_PuzzleGame:: @ 81958B8 .string "A puzzle game!\n" .string "Looks addictive!$" -gUnknown_81958D8:: @ 81958D8 +CeladonCity_DepartmentStore_3F_Text_FightingGame:: @ 81958D8 .string "A fighting game!\n" .string "Looks tough!$" -gUnknown_81958F6:: @ 81958F6 +CeladonCity_DepartmentStore_3F_Text_TVGameShop:: @ 81958F6 .string "3F: TV GAME SHOP$" -gUnknown_8195907:: @ 8195907 +CeladonCity_DepartmentStore_3F_Text_RedGreenBothArePokemon:: @ 8195907 .string "Red and Green!\n" .string "Both are POKéMON!$" +Text_CounterTeach:: @ 8195928 + .string "Oh, hi!\n" + .string "I finally finished POKéMON.\p" + .string "Not done yet? How about I teach\n" + .string "you a good move?\p" + .string "The move I have in mind is\n" + .string "COUNTER.\p" + .string "Not like the one I'm leaning on,\n" + .string "mind you!$" + +Text_CounterDeclined:: @ 81959CC + .string "You're not interested? Come see\n" + .string "me if you change your mind.$" + +Text_CounterWhichMon:: @ 8195A08 + .string "Which POKéMON should I teach\n" + .string "COUNTER to?$" + +Text_CounterTaught:: @ 8195A31 + .string "Are you using that COUNTER move\n" + .string "I taught your POKéMON?$" diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index 059ff30e3..d1130b058 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_4F_EventScript_16BBEF", + "script": "CeladonCity_DepartmentStore_4F_EventScript_Man", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_4F_EventScript_16BBF8", + "script": "CeladonCity_DepartmentStore_4F_EventScript_Youngster", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_4F_EventScript_16BC0A", + "script": "CeladonCity_DepartmentStore_4F_EventScript_Clerk", "flag": "0" } ], @@ -83,7 +83,7 @@ "x": 4, "y": 1, "elevation": 0, - "script": "CeladonCity_DepartmentStore_4F_EventScript_16BC01" + "script": "CeladonCity_DepartmentStore_4F_EventScript_FloorSign" } ] } diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc index f04968b1e..e9aba025a 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc @@ -1,31 +1,31 @@ CeladonCity_DepartmentStore_4F_MapScripts:: @ 816BBEE .byte 0 -CeladonCity_DepartmentStore_4F_EventScript_16BBEF:: @ 816BBEF - msgbox gUnknown_8195A68, MSGBOX_NPC +CeladonCity_DepartmentStore_4F_EventScript_Man:: @ 816BBEF + msgbox CeladonCity_DepartmentStore_4F_Text_GettingPokeDollAsPresent, MSGBOX_NPC end -CeladonCity_DepartmentStore_4F_EventScript_16BBF8:: @ 816BBF8 - msgbox gUnknown_8195AC9, MSGBOX_NPC +CeladonCity_DepartmentStore_4F_EventScript_Youngster:: @ 816BBF8 + msgbox CeladonCity_DepartmentStore_4F_Text_CanRunAwayWithPokeDoll, MSGBOX_NPC end -CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01 - msgbox gUnknown_8195B5B, MSGBOX_SIGN +CeladonCity_DepartmentStore_4F_EventScript_FloorSign:: @ 816BC01 + msgbox CeladonCity_DepartmentStore_4F_Text_FloorSign, MSGBOX_SIGN end -CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A +CeladonCity_DepartmentStore_4F_EventScript_Clerk:: @ 816BC0A goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16BC30 + pokemart CeladonCity_DepartmentStore_4F_Items msgbox Text_PleaseComeAgain release end .align 2 -Items_16BC30:: @ 816BC30 +CeladonCity_DepartmentStore_4F_Items:: @ 816BC30 .2byte ITEM_POKE_DOLL .2byte ITEM_RETRO_MAIL .2byte ITEM_FIRE_STONE diff --git a/data/maps/CeladonCity_DepartmentStore_4F/text.inc b/data/maps/CeladonCity_DepartmentStore_4F/text.inc index 426cc2c82..80121023e 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/text.inc @@ -1,41 +1,18 @@ -Text_CounterTeach:: @ 8195928 - .string "Oh, hi!\n" - .string "I finally finished POKéMON.\p" - .string "Not done yet? How about I teach\n" - .string "you a good move?\p" - .string "The move I have in mind is\n" - .string "COUNTER.\p" - .string "Not like the one I'm leaning on,\n" - .string "mind you!$" - -Text_CounterDeclined:: @ 81959CC - .string "You're not interested? Come see\n" - .string "me if you change your mind.$" - -Text_CounterWhichMon:: @ 8195A08 - .string "Which POKéMON should I teach\n" - .string "COUNTER to?$" - -Text_CounterTaught:: @ 8195A31 - .string "Are you using that COUNTER move\n" - .string "I taught your POKéMON?$" - -gUnknown_8195A68:: @ 8195A68 +CeladonCity_DepartmentStore_4F_Text_GettingPokeDollAsPresent:: @ 8195A68 .string "I'm getting a present for my\n" .string "girlfriend.\p" .string "I guess a POKé DOLL will be it.\n" .string "It's the popular thing.$" -gUnknown_8195AC9:: @ 8195AC9 +CeladonCity_DepartmentStore_4F_Text_CanRunAwayWithPokeDoll:: @ 8195AC9 .string "I heard something useful.\p" .string "If a wild POKéMON appears, you can\n" .string "distract it with a POKé DOLL.\p" .string "You can run away while the wild\n" .string "POKéMON is distracted.$" -gUnknown_8195B5B:: @ 8195B5B +CeladonCity_DepartmentStore_4F_Text_FloorSign:: @ 8195B5B .string "Express yourself with gifts!\n" .string "4F: WISE MAN GIFTS\p" .string "Evolution Special!\n" .string "Element STONES on sale now!$" - diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index 65b0fe9bc..b90f5f8e9 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC41", + "script": "CeladonCity_DepartmentStore_5F_EventScript_Gentleman", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC4A", + "script": "CeladonCity_DepartmentStore_5F_EventScript_Sailor", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC5C", + "script": "CeladonCity_DepartmentStore_5F_EventScript_ClerkXItems", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC96", + "script": "CeladonCity_DepartmentStore_5F_EventScript_ClerkVitamins", "flag": "0" } ], @@ -96,7 +96,7 @@ "x": 8, "y": 1, "elevation": 0, - "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC53" + "script": "CeladonCity_DepartmentStore_5F_EventScript_FloorSign" } ] } diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc index 9056d2b2d..e854a6a65 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc @@ -1,31 +1,31 @@ CeladonCity_DepartmentStore_5F_MapScripts:: @ 816BC40 .byte 0 -CeladonCity_DepartmentStore_5F_EventScript_16BC41:: @ 816BC41 - msgbox gUnknown_8195BBA, MSGBOX_NPC +CeladonCity_DepartmentStore_5F_EventScript_Gentleman:: @ 816BC41 + msgbox CeladonCity_DepartmentStore_5F_Text_ExplainStatEnhancers, MSGBOX_NPC end -CeladonCity_DepartmentStore_5F_EventScript_16BC4A:: @ 816BC4A - msgbox gUnknown_8195CA0, MSGBOX_NPC +CeladonCity_DepartmentStore_5F_EventScript_Sailor:: @ 816BC4A + msgbox CeladonCity_DepartmentStore_5F_Text_HereForStatEnhancers, MSGBOX_NPC end -CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53 - msgbox gUnknown_8195D14, MSGBOX_SIGN +CeladonCity_DepartmentStore_5F_EventScript_FloorSign:: @ 816BC53 + msgbox CeladonCity_DepartmentStore_5F_Text_Drugstore, MSGBOX_SIGN end -CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C +CeladonCity_DepartmentStore_5F_EventScript_ClerkXItems:: @ 816BC5C goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16BC84 + pokemart CeladonCity_DepartmentStore_5F_XItems msgbox Text_PleaseComeAgain release end .align 2 -Items_16BC84:: @ 816BC84 +CeladonCity_DepartmentStore_5F_XItems:: @ 816BC84 .2byte ITEM_X_ATTACK .2byte ITEM_X_DEFEND .2byte ITEM_X_SPEED @@ -37,19 +37,19 @@ Items_16BC84:: @ 816BC84 release end -CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96 +CeladonCity_DepartmentStore_5F_EventScript_ClerkVitamins:: @ 816BC96 goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16BCBC + pokemart CeladonCity_DepartmentStore_5F_Vitamins msgbox Text_PleaseComeAgain release end .align 2 -Items_16BCBC:: @ 816BCBC +CeladonCity_DepartmentStore_5F_Vitamins:: @ 816BCBC .2byte ITEM_HP_UP .2byte ITEM_PROTEIN .2byte ITEM_IRON diff --git a/data/maps/CeladonCity_DepartmentStore_5F/text.inc b/data/maps/CeladonCity_DepartmentStore_5F/text.inc index b8cee5afa..638f07320 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/text.inc @@ -1,4 +1,4 @@ -gUnknown_8195BBA:: @ 8195BBA +CeladonCity_DepartmentStore_5F_Text_ExplainStatEnhancers:: @ 8195BBA .string "POKéMON stat enhancers can be\n" .string "bought only here.\p" .string "HP UP increases the base HP of a\n" @@ -10,7 +10,7 @@ gUnknown_8195BBA:: @ 8195BBA .string "CARBOS enhances the base SPEED\n" .string "stat.$" -gUnknown_8195CA0:: @ 8195CA0 +CeladonCity_DepartmentStore_5F_Text_HereForStatEnhancers:: @ 8195CA0 .string "I'm here for POKéMON stat\n" .string "enhancers.\p" .string "PROTEIN increases the base ATTACK\n" @@ -18,6 +18,6 @@ gUnknown_8195CA0:: @ 8195CA0 .string "IRON increases the base DEFENSE\n" .string "stat.$" -gUnknown_8195D14:: @ 8195D14 +CeladonCity_DepartmentStore_5F_Text_Drugstore:: @ 8195D14 .string "5F: DRUGSTORE$" diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json index a2a7d1b48..5fe6f9885 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json @@ -36,14 +36,14 @@ "x": 0, "y": 2, "elevation": 0, - "script": "CeladonCity_DepartmentStore_Elevator_EventScript_16C153" + "script": "CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect" }, { "type": "bg_event_type_0", "x": 4, "y": 1, "elevation": 0, - "script": "CeladonCity_DepartmentStore_Elevator_EventScript_16C153" + "script": "CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect" } ] } diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 14198db2f..7a3737610 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152 .byte 0 -CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect:: @ 816C153 lockall setvar VAR_0x8004, 3 call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 @@ -12,107 +12,105 @@ CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 setvar VAR_0x8004, 3 specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos switch VAR_RESULT - case 0, EventScript_16C1B7 - case 1, EventScript_16C1C3 - case 2, EventScript_16C1CF - case 3, EventScript_16C1DB - case 4, EventScript_16C1E7 + case 0, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom5F + case 1, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom4F + case 2, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom3F + case 3, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom2F + case 4, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom1F end -EventScript_16C1B7:: @ 816C1B7 +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom5F:: @ 816C1B7 multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 0, FALSE - goto EventScript_16C1F3 - -EventScript_16C1C2:: @ 816C1C2 + goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor end -EventScript_16C1C3:: @ 816C1C3 +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom4F:: @ 816C1C3 multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 1, FALSE - goto EventScript_16C1F3 + goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor end -EventScript_16C1CF:: @ 816C1CF +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom3F:: @ 816C1CF multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 2, FALSE - goto EventScript_16C1F3 + goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor end -EventScript_16C1DB:: @ 816C1DB +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom2F:: @ 816C1DB multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 3, FALSE - goto EventScript_16C1F3 + goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor end -EventScript_16C1E7:: @ 816C1E7 +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom1F:: @ 816C1E7 multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 4, FALSE - goto EventScript_16C1F3 + goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor end -EventScript_16C1F3:: @ 816C1F3 +CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor:: @ 816C1F3 switch VAR_RESULT - case 0, EventScript_16C2E6 - case 1, EventScript_16C2BE - case 2, EventScript_16C296 - case 3, EventScript_16C26E - case 4, EventScript_16C246 - case 5, EventScript_16C30E - case 127, EventScript_16C30E + case 0, CeladonCity_DepartmentStore_Elevator_EventScript_To5F + case 1, CeladonCity_DepartmentStore_Elevator_EventScript_To4F + case 2, CeladonCity_DepartmentStore_Elevator_EventScript_To3F + case 3, CeladonCity_DepartmentStore_Elevator_EventScript_To2F + case 4, CeladonCity_DepartmentStore_Elevator_EventScript_To1F + case 5, CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect + case 127, CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -EventScript_16C246:: @ 816C246 +CeladonCity_DepartmentStore_Elevator_EventScript_To1F:: @ 816C246 setvar VAR_0x8006, 4 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 4 - goto_if_eq EventScript_16C30E - call EventScript_16C313 + goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect + call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 4 - goto EventScript_16C30E + goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -EventScript_16C26E:: @ 816C26E +CeladonCity_DepartmentStore_Elevator_EventScript_To2F:: @ 816C26E setvar VAR_0x8006, 5 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 5 - goto_if_eq EventScript_16C30E - call EventScript_16C313 + goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect + call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 5 - goto EventScript_16C30E + goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -EventScript_16C296:: @ 816C296 +CeladonCity_DepartmentStore_Elevator_EventScript_To3F:: @ 816C296 setvar VAR_0x8006, 6 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 6 - goto_if_eq EventScript_16C30E - call EventScript_16C313 + goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect + call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 6 - goto EventScript_16C30E + goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -EventScript_16C2BE:: @ 816C2BE +CeladonCity_DepartmentStore_Elevator_EventScript_To4F:: @ 816C2BE setvar VAR_0x8006, 7 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 7 - goto_if_eq EventScript_16C30E - call EventScript_16C313 + goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect + call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 7 - goto EventScript_16C30E + goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -EventScript_16C2E6:: @ 816C2E6 +CeladonCity_DepartmentStore_Elevator_EventScript_To5F:: @ 816C2E6 setvar VAR_0x8006, 8 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 8 - goto_if_eq EventScript_16C30E - call EventScript_16C313 + goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect + call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 8 - goto EventScript_16C30E + goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -EventScript_16C30E:: @ 816C30E +CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect:: @ 816C30E special Special_CloseElevatorCurrentFloorWindow releaseall end -EventScript_16C313:: @ 816C313 +CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator:: @ 816C313 special Special_CloseElevatorCurrentFloorWindow closemessage waitse diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index 71eea9cee..17077ebbd 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C022", + "script": "CeladonCity_DepartmentStore_Roof_EventScript_CooltrainerM", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_DepartmentStore_Roof_EventScript_16BCCD", + "script": "CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl", "flag": "0" } ], @@ -56,28 +56,28 @@ "x": 14, "y": 3, "elevation": 0, - "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C02B" + "script": "CeladonCity_DepartmentStore_Roof_EventScript_FloorSign" }, { "type": "bg_event_type_0", "x": 10, "y": 3, "elevation": 0, - "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034" + "script": "CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine" }, { "type": "bg_event_type_0", "x": 11, "y": 3, "elevation": 0, - "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034" + "script": "CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine" }, { "type": "bg_event_type_0", "x": 12, "y": 3, "elevation": 0, - "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034" + "script": "CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine" } ] } diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index 48f682567..bd05d824d 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -1,152 +1,152 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC .byte 0 -CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD +CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl:: @ 816BCCD goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer - call EventScript_16BCF6 + call CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks compare VAR_TEMP_1, 0 - goto_if_eq EventScript_16C00E - goto EventScript_16BD3E + goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_IWantDrink + goto CeladonCity_DepartmentStore_Roof_EventScript_AskGiveDrink end -EventScript_16BCF6:: @ 816BCF6 +CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks:: @ 816BCF6 setvar VAR_TEMP_1, 0 checkitem ITEM_FRESH_WATER, 1 compare VAR_RESULT, TRUE - call_if_eq EventScript_16BD2C + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasFreshWater checkitem ITEM_SODA_POP, 1 compare VAR_RESULT, TRUE - call_if_eq EventScript_16BD32 + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasSodaPop checkitem ITEM_LEMONADE, 1 compare VAR_RESULT, TRUE - call_if_eq EventScript_16BD38 + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasLemonade return -EventScript_16BD2C:: @ 816BD2C +CeladonCity_DepartmentStore_Roof_EventScript_SetHasFreshWater:: @ 816BD2C addvar VAR_TEMP_1, 1 return -EventScript_16BD32:: @ 816BD32 +CeladonCity_DepartmentStore_Roof_EventScript_SetHasSodaPop:: @ 816BD32 addvar VAR_TEMP_1, 2 return -EventScript_16BD38:: @ 816BD38 +CeladonCity_DepartmentStore_Roof_EventScript_SetHasLemonade:: @ 816BD38 addvar VAR_TEMP_1, 4 return -EventScript_16BD3E:: @ 816BD3E - msgbox gUnknown_8195D22, MSGBOX_YESNO +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveDrink:: @ 816BD3E + msgbox CeladonCity_DepartmentStore_Roof_Text_ImThirstyGiveHerDrink, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16C00C + goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink textcolor 3 - message Text_195D5F + message CeladonCity_DepartmentStore_Roof_Text_GiveWhichDrink waitmessage textcolor 1 switch VAR_TEMP_1 - case 1, EventScript_16BDAE - case 2, EventScript_16BDDA - case 3, EventScript_16BE06 - case 4, EventScript_16BE3D - case 5, EventScript_16BE69 - case 6, EventScript_16BEA0 - case 7, EventScript_16BED7 + case 1, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWater + case 2, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPop + case 3, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterSodaPop + case 4, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveLemonade + case 5, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterLemonade + case 6, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPopLemonade + case 7, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveAllDrinks end -EventScript_16BDAE:: @ 816BDAE +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWater:: @ 816BDAE multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER, FALSE switch VAR_RESULT - case 0, EventScript_16BF19 - case 1, EventScript_16C00C - case 127, EventScript_16C00C + case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater + case 1, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink + case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -EventScript_16BDDA:: @ 816BDDA +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPop:: @ 816BDDA multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_SODA_POP, FALSE switch VAR_RESULT - case 0, EventScript_16BF3A - case 1, EventScript_16C00C - case 127, EventScript_16C00C + case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop + case 1, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink + case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -EventScript_16BE06:: @ 816BE06 +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterSodaPop:: @ 816BE06 multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP, FALSE switch VAR_RESULT - case 0, EventScript_16BF19 - case 1, EventScript_16BF3A - case 2, EventScript_16C00C - case 127, EventScript_16C00C + case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater + case 1, CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop + case 2, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink + case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -EventScript_16BE3D:: @ 816BE3D +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveLemonade:: @ 816BE3D multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_LEMONADE, FALSE switch VAR_RESULT - case 0, EventScript_16BF5B - case 1, EventScript_16C00C - case 127, EventScript_16C00C + case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade + case 1, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink + case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -EventScript_16BE69:: @ 816BE69 +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterLemonade:: @ 816BE69 multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_LEMONADE, FALSE switch VAR_RESULT - case 0, EventScript_16BF19 - case 1, EventScript_16BF5B - case 2, EventScript_16C00C - case 127, EventScript_16C00C + case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater + case 1, CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade + case 2, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink + case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -EventScript_16BEA0:: @ 816BEA0 +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPopLemonade:: @ 816BEA0 multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_SODA_POP_LEMONADE, FALSE switch VAR_RESULT - case 0, EventScript_16BF3A - case 1, EventScript_16BF5B - case 2, EventScript_16C00C - case 127, EventScript_16C00C + case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop + case 1, CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade + case 2, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink + case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -EventScript_16BED7:: @ 816BED7 +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveAllDrinks:: @ 816BED7 multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP_LEMONADE, FALSE switch VAR_RESULT - case 0, EventScript_16BF19 - case 1, EventScript_16BF3A - case 2, EventScript_16BF5B - case 3, EventScript_16C00C - case 127, EventScript_16C00C + case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater + case 1, CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop + case 2, CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade + case 3, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink + case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -EventScript_16BF19:: @ 816BF19 +CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater:: @ 816BF19 setvar VAR_0x8008, ITEM_FRESH_WATER setvar VAR_0x8009, ITEM_TM16 - goto_if_set FLAG_GOT_TM16_FROM_THIRSTY_GIRL, EventScript_16C018 - msgbox gUnknown_8195D75 - goto EventScript_16BF7C + goto_if_set FLAG_GOT_TM16_FROM_THIRSTY_GIRL, CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll + msgbox CeladonCity_DepartmentStore_Roof_Text_YayFreshWaterHaveThis + goto CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink end -EventScript_16BF3A:: @ 816BF3A +CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop:: @ 816BF3A setvar VAR_0x8008, ITEM_SODA_POP setvar VAR_0x8009, ITEM_TM20 - goto_if_set FLAG_GOT_TM20_FROM_THIRSTY_GIRL, EventScript_16C018 - msgbox gUnknown_8195E33 - goto EventScript_16BF7C + goto_if_set FLAG_GOT_TM20_FROM_THIRSTY_GIRL, CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll + msgbox CeladonCity_DepartmentStore_Roof_Text_YaySodaPopHaveThis + goto CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink end -EventScript_16BF5B:: @ 816BF5B +CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade:: @ 816BF5B setvar VAR_0x8008, ITEM_LEMONADE setvar VAR_0x8009, ITEM_TM33 - goto_if_set FLAG_GOT_TM33_FROM_THIRSTY_GIRL, EventScript_16C018 - msgbox gUnknown_8195EBF - goto EventScript_16BF7C + goto_if_set FLAG_GOT_TM33_FROM_THIRSTY_GIRL, CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll + msgbox CeladonCity_DepartmentStore_Roof_Text_YayLemonadeHaveThis + goto CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink end -EventScript_16BF7C:: @ 816BF7C +CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink:: @ 816BF7C getitemname 0, VAR_0x8008 getitemname 1, VAR_0x8009 removeitem VAR_0x8008, 1 checkitemspace VAR_0x8009, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16C002 + goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForReward additem VAR_0x8009 textcolor 3 playfanfare MUS_FANFA1 @@ -156,142 +156,142 @@ EventScript_16BF7C:: @ 816BF7C putitemaway VAR_0x8009 call EventScript_1A6675 compare VAR_0x8008, ITEM_FRESH_WATER - call_if_eq EventScript_16BFDE + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM16 compare VAR_0x8008, ITEM_SODA_POP - call_if_eq EventScript_16BFEA + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM20 compare VAR_0x8008, ITEM_LEMONADE - call_if_eq EventScript_16BFF6 + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM33 release end -EventScript_16BFDE:: @ 816BFDE +CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM16:: @ 816BFDE setflag FLAG_GOT_TM16_FROM_THIRSTY_GIRL - msgbox gUnknown_8195DD4 + msgbox CeladonCity_DepartmentStore_Roof_Text_ExplainTM16 return -EventScript_16BFEA:: @ 816BFEA +CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM20:: @ 816BFEA setflag FLAG_GOT_TM20_FROM_THIRSTY_GIRL - msgbox gUnknown_8195E68 + msgbox CeladonCity_DepartmentStore_Roof_Text_ExplainTM20 return -EventScript_16BFF6:: @ 816BFF6 +CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM33:: @ 816BFF6 setflag FLAG_GOT_TM33_FROM_THIRSTY_GIRL - msgbox gUnknown_8195EF4 + msgbox CeladonCity_DepartmentStore_Roof_Text_ExplainTM33 return -EventScript_16C002:: @ 816C002 - msgbox gUnknown_8195F4F +CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForReward:: @ 816C002 + msgbox CeladonCity_DepartmentStore_Roof_Text_DontHaveSpaceForThis release end -EventScript_16C00C:: @ 816C00C +CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink:: @ 816C00C release end -EventScript_16C00E:: @ 816C00E - msgbox gUnknown_8195FEF +CeladonCity_DepartmentStore_Roof_EventScript_IWantDrink:: @ 816C00E + msgbox CeladonCity_DepartmentStore_Roof_Text_ImThirstyIWantDrink release end -EventScript_16C018:: @ 816C018 - msgbox gUnknown_8195F6E +CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll:: @ 816C018 + msgbox CeladonCity_DepartmentStore_Roof_Text_ImNotThirstyAfterAll release end -CeladonCity_DepartmentStore_Roof_EventScript_16C022:: @ 816C022 - msgbox gUnknown_8195F98, MSGBOX_NPC +CeladonCity_DepartmentStore_Roof_EventScript_CooltrainerM:: @ 816C022 + msgbox CeladonCity_DepartmentStore_Roof_Text_MySisterIsImmature, MSGBOX_NPC end -CeladonCity_DepartmentStore_Roof_EventScript_16C02B:: @ 816C02B - msgbox gUnknown_8196017, MSGBOX_SIGN +CeladonCity_DepartmentStore_Roof_EventScript_FloorSign:: @ 816C02B + msgbox CeladonCity_DepartmentStore_Roof_Text_FloorSign, MSGBOX_SIGN end -CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034 +CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine:: @ 816C034 lockall - message Text_196038 + message CeladonCity_DepartmentStore_Roof_Text_VendingMachineWhatDoesItHave waitmessage showmoneybox 0, 0, 0 - goto EventScript_16C045 + goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink end -EventScript_16C045:: @ 816C045 +CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink:: @ 816C045 multichoice 12, 0, MULTICHOICE_CELADON_VENDING_MACHINE, FALSE copyvar VAR_TEMP_1, VAR_RESULT switch VAR_TEMP_1 - case 0, EventScript_16C083 - case 1, EventScript_16C094 - case 2, EventScript_16C0A5 - msgbox gUnknown_81960AE - goto EventScript_16C14D + case 0, CeladonCity_DepartmentStore_Roof_EventScript_BuyFreshWater + case 1, CeladonCity_DepartmentStore_Roof_EventScript_BuySodaPop + case 2, CeladonCity_DepartmentStore_Roof_EventScript_BuyLemonade + msgbox CeladonCity_DepartmentStore_Roof_Text_NotThirsty + goto CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine end -EventScript_16C083:: @ 816C083 +CeladonCity_DepartmentStore_Roof_EventScript_BuyFreshWater:: @ 816C083 setvar VAR_TEMP_0, ITEM_FRESH_WATER checkmoney 200, 0 - goto EventScript_16C0CB + goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink end -EventScript_16C094:: @ 816C094 +CeladonCity_DepartmentStore_Roof_EventScript_BuySodaPop:: @ 816C094 setvar VAR_TEMP_0, ITEM_SODA_POP checkmoney 300, 0 - goto EventScript_16C0CB + goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink end -EventScript_16C0A5:: @ 816C0A5 +CeladonCity_DepartmentStore_Roof_EventScript_BuyLemonade:: @ 816C0A5 setvar VAR_TEMP_0, ITEM_LEMONADE checkmoney 350, 0 - goto EventScript_16C0CB + goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink end -EventScript_16C0B6:: @ 816C0B6 +CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyFreshWater:: @ 816C0B6 removemoney 200, 0 return -EventScript_16C0BD:: @ 816C0BD +CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneySodaPop:: @ 816C0BD removemoney 300, 0 return -EventScript_16C0C4:: @ 816C0C4 +CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade:: @ 816C0C4 removemoney 350, 0 return -EventScript_16C0CB:: @ 816C0CB +CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink:: @ 816C0CB compare VAR_RESULT, FALSE - goto_if_eq EventScript_16C131 + goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NotEnoughMoney checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16C13F + goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForDrink compare VAR_TEMP_1, 0 - call_if_eq EventScript_16C0B6 + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyFreshWater compare VAR_TEMP_1, 1 - call_if_eq EventScript_16C0BD + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneySodaPop compare VAR_TEMP_1, 2 - call_if_eq EventScript_16C0C4 + call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade updatemoneybox 0, 0, 0 getitemname 0, VAR_TEMP_0 playse SE_JIHANKI - msgbox gUnknown_8196076 + msgbox CeladonCity_DepartmentStore_Roof_Text_DrinkCanPoppedOut additem VAR_TEMP_0 - goto EventScript_16C125 + goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseNewDrink end -EventScript_16C125:: @ 816C125 - message Text_196038 +CeladonCity_DepartmentStore_Roof_EventScript_ChooseNewDrink:: @ 816C125 + message CeladonCity_DepartmentStore_Roof_Text_VendingMachineWhatDoesItHave waitmessage - goto EventScript_16C045 + goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink end -EventScript_16C131:: @ 816C131 - msgbox gUnknown_819605E - goto EventScript_16C14D +CeladonCity_DepartmentStore_Roof_EventScript_NotEnoughMoney:: @ 816C131 + msgbox CeladonCity_DepartmentStore_Roof_Text_NotEnoughMoney + goto CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine end -EventScript_16C13F:: @ 816C13F - msgbox gUnknown_819608E - goto EventScript_16C14D +CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForDrink:: @ 816C13F + msgbox CeladonCity_DepartmentStore_Roof_Text_NoMoreRoomForStuff + goto CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine end -EventScript_16C14D:: @ 816C14D +CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine:: @ 816C14D hidemoneybox 0, 0 releaseall end diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/text.inc b/data/maps/CeladonCity_DepartmentStore_Roof/text.inc index 65b9a3162..2c6944373 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/text.inc @@ -1,12 +1,12 @@ -gUnknown_8195D22:: @ 8195D22 +CeladonCity_DepartmentStore_Roof_Text_ImThirstyGiveHerDrink:: @ 8195D22 .string "I'm thirsty!\n" .string "I want something to drink!\p" .string "{SIZE}ÁGive her a drink?$" -Text_195D5F:: @ 8195D5F +CeladonCity_DepartmentStore_Roof_Text_GiveWhichDrink:: @ 8195D5F .string "Give her which drink?$" -gUnknown_8195D75:: @ 8195D75 +CeladonCity_DepartmentStore_Roof_Text_YayFreshWaterHaveThis:: @ 8195D75 .string "Yay!\p" .string "FRESH WATER!\p" .string "Thank you!\n" @@ -16,67 +16,67 @@ Text_ReceivedItemFromLittleGirl:: @ 8195DAD .string "{PLAYER} received a {STR_VAR_2}\n" .string "from the little girl.$" -gUnknown_8195DD4:: @ 8195DD4 +CeladonCity_DepartmentStore_Roof_Text_ExplainTM16:: @ 8195DD4 .string "TM16 contains LIGHT SCREEN.\p" .string "It's a move that weakens the power\n" .string "of special attacks by your foe.$" -gUnknown_8195E33:: @ 8195E33 +CeladonCity_DepartmentStore_Roof_Text_YaySodaPopHaveThis:: @ 8195E33 .string "Yay!\p" .string "SODA POP!\p" .string "Thank you!\n" .string "You can have this from me!$" -gUnknown_8195E68:: @ 8195E68 +CeladonCity_DepartmentStore_Roof_Text_ExplainTM20:: @ 8195E68 .string "TM20 contains SAFEGUARD.\p" .string "It's a move that prevents status\n" .string "problems among your POKéMON.$" -gUnknown_8195EBF:: @ 8195EBF +CeladonCity_DepartmentStore_Roof_Text_YayLemonadeHaveThis:: @ 8195EBF .string "Yay!\p" .string "LEMONADE!\p" .string "Thank you!\n" .string "You can have this from me!$" -gUnknown_8195EF4:: @ 8195EF4 +CeladonCity_DepartmentStore_Roof_Text_ExplainTM33:: @ 8195EF4 .string "TM33 contains REFLECT.\p" .string "It's a move that weakens the power\n" .string "of physical attacks by your foe.$" -gUnknown_8195F4F:: @ 8195F4F +CeladonCity_DepartmentStore_Roof_Text_DontHaveSpaceForThis:: @ 8195F4F .string "You don't have space for this!$" -gUnknown_8195F6E:: @ 8195F6E +CeladonCity_DepartmentStore_Roof_Text_ImNotThirstyAfterAll:: @ 8195F6E .string "No, thank you!\n" .string "I'm not thirsty after all!$" -gUnknown_8195F98:: @ 8195F98 +CeladonCity_DepartmentStore_Roof_Text_MySisterIsImmature:: @ 8195F98 .string "My sister is a TRAINER, believe it\n" .string "or not.\p" .string "But, she's so immature, she drives\n" .string "me nuts!$" -gUnknown_8195FEF:: @ 8195FEF +CeladonCity_DepartmentStore_Roof_Text_ImThirstyIWantDrink:: @ 8195FEF .string "I'm thirsty!\n" .string "I want something to drink!$" -gUnknown_8196017:: @ 8196017 +CeladonCity_DepartmentStore_Roof_Text_FloorSign:: @ 8196017 .string "ROOFTOP SQUARE:\n" .string "VENDING MACHINES$" -Text_196038:: @ 8196038 +CeladonCity_DepartmentStore_Roof_Text_VendingMachineWhatDoesItHave:: @ 8196038 .string "A vending machine!\n" .string "What does it have?$" -gUnknown_819605E:: @ 819605E +CeladonCity_DepartmentStore_Roof_Text_NotEnoughMoney:: @ 819605E .string "Oops, not enough money!$" -gUnknown_8196076:: @ 8196076 +CeladonCity_DepartmentStore_Roof_Text_DrinkCanPoppedOut:: @ 8196076 .string "A can of {STR_VAR_1} popped out!$" -gUnknown_819608E:: @ 819608E +CeladonCity_DepartmentStore_Roof_Text_NoMoreRoomForStuff:: @ 819608E .string "There's no more room for stuff!$" -gUnknown_81960AE:: @ 81960AE +CeladonCity_DepartmentStore_Roof_Text_NotThirsty:: @ 81960AE .string "Not thirsty!$" diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index 081d3fac9..79ba87c7f 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C684", + "script": "CeladonCity_GameCorner_EventScript_InfoClerk", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C68D", + "script": "CeladonCity_GameCorner_EventScript_CoinsClerk", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C7BA", + "script": "CeladonCity_GameCorner_EventScript_BaldingMan", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C7D7", + "script": "CeladonCity_GameCorner_EventScript_Woman1", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C7E7", + "script": "CeladonCity_GameCorner_EventScript_Fisher", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C857", + "script": "CeladonCity_GameCorner_EventScript_GymGuy", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C87E", + "script": "CeladonCity_GameCorner_EventScript_Woman2", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C88E", + "script": "CeladonCity_GameCorner_EventScript_OldMan", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C89E", + "script": "CeladonCity_GameCorner_EventScript_Scientist", "flag": "0" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16C8FE", + "script": "CeladonCity_GameCorner_EventScript_Gentleman", "flag": "0" }, { @@ -153,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_EventScript_16CAF5", + "script": "CeladonCity_GameCorner_EventScript_RocketGrunt", "flag": "FLAG_HIDE_GAME_CORNER_ROCKET" } ], @@ -314,168 +314,168 @@ "x": 0, "y": 7, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C95E" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine0" }, { "type": "bg_event_type_4", "x": 0, "y": 9, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C9A4" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine1" }, { "type": "bg_event_type_4", "x": 0, "y": 10, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C9B0" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine2" }, { "type": "bg_event_type_3", "x": 5, "y": 6, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C9BC" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine3" }, { "type": "bg_event_type_3", "x": 5, "y": 8, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CB5A" + "script": "CeladonCity_GameCorner_EventScript_UnusableSlotMachine1" }, { "type": "bg_event_type_3", "x": 5, "y": 9, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C9D4" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine5" }, { "type": "bg_event_type_3", "x": 5, "y": 10, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C9E0" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine6" }, { "type": "bg_event_type_4", "x": 6, "y": 6, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C9EC" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine7" }, { "type": "bg_event_type_4", "x": 6, "y": 7, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16C9F8" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine8" }, { "type": "bg_event_type_4", "x": 6, "y": 9, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA04" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine9" }, { "type": "bg_event_type_3", "x": 11, "y": 6, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA10" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine10" }, { "type": "bg_event_type_3", "x": 11, "y": 7, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA1C" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine11" }, { "type": "bg_event_type_3", "x": 11, "y": 8, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA28" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine12" }, { "type": "bg_event_type_3", "x": 11, "y": 10, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA34" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine13" }, { "type": "bg_event_type_4", "x": 12, "y": 6, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA40" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine14" }, { "type": "bg_event_type_4", "x": 12, "y": 8, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CB63" + "script": "CeladonCity_GameCorner_EventScript_UnusableSlotMachine2" }, { "type": "bg_event_type_4", "x": 12, "y": 9, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA58" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine16" }, { "type": "bg_event_type_4", "x": 12, "y": 10, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA64" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine17" }, { "type": "bg_event_type_3", "x": 17, "y": 6, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CB6C" + "script": "CeladonCity_GameCorner_EventScript_UnusableSlotMachine3" }, { "type": "bg_event_type_3", "x": 17, "y": 7, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA7C" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine19" }, { "type": "bg_event_type_3", "x": 17, "y": 8, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA88" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine20" }, { "type": "bg_event_type_3", "x": 17, "y": 9, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CA94" + "script": "CeladonCity_GameCorner_EventScript_SlotMachine21" }, { "type": "bg_event_type_0", "x": 11, "y": 1, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_16CAAA" + "script": "CeladonCity_GameCorner_EventScript_Poster" }, { "type": "bg_event_type_3", "x": 17, "y": 13, "elevation": 0, - "script": "CeladonCity_GameCorner_EventScript_1B2867" + "script": "CeladonCity_GameCorner_EventScript_PhotoPrinter" } ] } diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 20b2ba04c..c206f38b4 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -3,443 +3,443 @@ CeladonCity_GameCorner_MapScripts:: @ 816C646 .byte 0 CeladonCity_GameCorner_OnLoad:: @ 816C64C - call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, EventScript_16C656 + call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, CeladonCity_GameCorner_EventScript_HideRocketHideout end -EventScript_16C656:: @ 816C656 - setmetatile 15, 2, 658, 0 - setmetatile 16, 2, 658, 0 - setmetatile 17, 2, 658, 0 - setmetatile 16, 3, 719, 1 - setmetatile 17, 3, 719, 1 +CeladonCity_GameCorner_EventScript_HideRocketHideout:: @ 816C656 + setmetatile 15, 2, METATILE_GameCorner_Floor_ShadeFull, 0 + setmetatile 16, 2, METATILE_GameCorner_Floor_ShadeFull, 0 + setmetatile 17, 2, METATILE_GameCorner_Floor_ShadeFull, 0 + setmetatile 16, 3, METATILE_GameCorner_PurpleWall_Floor, 1 + setmetatile 17, 3, METATILE_GameCorner_PurpleWall_Floor, 1 return -CeladonCity_GameCorner_EventScript_16C684:: @ 816C684 - msgbox gUnknown_8196940, MSGBOX_NPC +CeladonCity_GameCorner_EventScript_InfoClerk:: @ 816C684 + msgbox CeladonCity_GameCorner_Text_CanExchangeCoinsNextDoor, MSGBOX_NPC end -CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D +CeladonCity_GameCorner_EventScript_CoinsClerk:: @ 816C68D goto_if_questlog EventScript_ReleaseEnd lock faceplayer showmoneybox 0, 0, 0 showcoinsbox 0, 5 - message Text_196984 + message CeladonCity_GameCorner_Text_WelcomeBuySomeCoins waitmessage multichoice 13, 0, MULTICHOICE_GAME_CORNER_COIN_PURCHASE_COUNTER, FALSE copyvar VAR_0x8009, VAR_RESULT switch VAR_RESULT - case 0, EventScript_16C6E6 - case 1, EventScript_16C6E6 - case 2, EventScript_16C782 - case 127, EventScript_16C782 + case 0, CeladonCity_GameCorner_EventScript_BuyCoins + case 1, CeladonCity_GameCorner_EventScript_BuyCoins + case 2, CeladonCity_GameCorner_EventScript_ClerkDeclineBuy + case 127, CeladonCity_GameCorner_EventScript_ClerkDeclineBuy end -EventScript_16C6E6:: @ 816C6E6 - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C790 +CeladonCity_GameCorner_EventScript_BuyCoins:: @ 816C6E6 + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_ClerkNoCoinCase compare VAR_0x8009, 0 - goto_if_eq EventScript_16C734 + goto_if_eq CeladonCity_GameCorner_EventScript_Buy50Coins compare VAR_0x8009, 1 - goto_if_eq EventScript_16C706 + goto_if_eq CeladonCity_GameCorner_EventScript_Buy500Coins end -EventScript_16C706:: @ 816C706 +CeladonCity_GameCorner_EventScript_Buy500Coins:: @ 816C706 checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 9500 - goto_if_ge EventScript_16C79E + compare VAR_TEMP_1, (MAX_COINS + 1) - 500 + goto_if_ge CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins checkmoney 10000, 0 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16C7AC + goto_if_eq CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney addcoins 500 removemoney 10000, 0 - goto EventScript_16C762 + goto CeladonCity_GameCorner_EventScript_BoughtCoins end -EventScript_16C734:: @ 816C734 +CeladonCity_GameCorner_EventScript_Buy50Coins:: @ 816C734 checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 9950 - goto_if_ge EventScript_16C79E + compare VAR_TEMP_1, (MAX_COINS + 1) - 50 + goto_if_ge CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins checkmoney 1000, 0 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16C7AC + goto_if_eq CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney addcoins 50 removemoney 1000, 0 - goto EventScript_16C762 + goto CeladonCity_GameCorner_EventScript_BoughtCoins end -EventScript_16C762:: @ 816C762 +CeladonCity_GameCorner_EventScript_BoughtCoins:: @ 816C762 updatemoneybox 0, 0, 0 updatecoinsbox 0, 5 playse SE_SHOP - msgbox gUnknown_8196A62 - goto EventScript_16C77A + msgbox CeladonCity_GameCorner_Text_HereAreYourCoins + goto CeladonCity_GameCorner_EventScript_ClerkEnd end -EventScript_16C77A:: @ 816C77A +CeladonCity_GameCorner_EventScript_ClerkEnd:: @ 816C77A hidemoneybox 0, 0 hidecoinsbox 0, 5 release end -EventScript_16C782:: @ 816C782 - msgbox gUnknown_81969DC - goto EventScript_16C77A +CeladonCity_GameCorner_EventScript_ClerkDeclineBuy:: @ 816C782 + msgbox CeladonCity_GameCorner_Text_ComePlaySometime + goto CeladonCity_GameCorner_EventScript_ClerkEnd end -EventScript_16C790:: @ 816C790 - msgbox gUnknown_81969FB - goto EventScript_16C77A +CeladonCity_GameCorner_EventScript_ClerkNoCoinCase:: @ 816C790 + msgbox CeladonCity_GameCorner_Text_SorryDontHaveCoinCase + goto CeladonCity_GameCorner_EventScript_ClerkEnd end -EventScript_16C79E:: @ 816C79E - msgbox gUnknown_8196A26 - goto EventScript_16C77A +CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins:: @ 816C79E + msgbox CeladonCity_GameCorner_Text_CoinCaseIsFull + goto CeladonCity_GameCorner_EventScript_ClerkEnd end -EventScript_16C7AC:: @ 816C7AC - msgbox gUnknown_8196A46 - goto EventScript_16C77A +CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney:: @ 816C7AC + msgbox CeladonCity_GameCorner_Text_CantAffordCoins + goto CeladonCity_GameCorner_EventScript_ClerkEnd end -CeladonCity_GameCorner_EventScript_16C7BA:: @ 816C7BA +CeladonCity_GameCorner_EventScript_BaldingMan:: @ 816C7BA lock faceplayer - msgbox gUnknown_8196A82 - goto EventScript_16C7CA + msgbox CeladonCity_GameCorner_Text_RumoredTeamRocketRunsThisPlace + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C7CA:: @ 816C7CA +CeladonCity_GameCorner_EventScript_FaceSlotMachine:: @ 816C7CA closemessage applymovement VAR_LAST_TALKED, Movement_FaceOriginalDirection waitmovement 0 release end -CeladonCity_GameCorner_EventScript_16C7D7:: @ 816C7D7 +CeladonCity_GameCorner_EventScript_Woman1:: @ 816C7D7 lock faceplayer - msgbox gUnknown_8196AC7 - goto EventScript_16C7CA + msgbox CeladonCity_GameCorner_Text_ThinkMachinesHaveDifferentOdds + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 +CeladonCity_GameCorner_EventScript_Fisher:: @ 816C7E7 lock faceplayer - goto_if_set FLAG_GOT_10_COINS_FROM_GAMBLER, EventScript_16C849 - msgbox gUnknown_8196AF3 - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839 + goto_if_set FLAG_GOT_10_COINS_FROM_GAMBLER, CeladonCity_GameCorner_EventScript_FisherAlreadyGotCoins + msgbox CeladonCity_GameCorner_Text_DoYouWantToPlay + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_GamblerNoCoinCase checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 9990 - goto_if_ge EventScript_16C82B + compare VAR_TEMP_1, (MAX_COINS + 1) - 10 + goto_if_ge CeladonCity_GameCorner_EventScript_FisherNoRoomForCoins addcoins 10 textcolor 3 - msgbox gUnknown_8196B0D + msgbox CeladonCity_GameCorner_Text_Received10CoinsFromMan playse SE_SHOP waitse setflag FLAG_GOT_10_COINS_FROM_GAMBLER - goto EventScript_16C7CA + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C82B:: @ 816C82B - msgbox gUnknown_8196B30 - goto EventScript_16C7CA +CeladonCity_GameCorner_EventScript_FisherNoRoomForCoins:: @ 816C82B + msgbox CeladonCity_GameCorner_Text_DontNeedMyCoins + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C839:: @ 816C839 +CeladonCity_GameCorner_EventScript_GamblerNoCoinCase:: @ 816C839 textcolor 3 - msgbox gUnknown_8196F26 - goto EventScript_16C7CA + msgbox CeladonCity_GameCorner_Text_DontHaveCoinCase + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C849:: @ 816C849 - msgbox gUnknown_8196B49 - goto EventScript_16C7CA +CeladonCity_GameCorner_EventScript_FisherAlreadyGotCoins:: @ 816C849 + msgbox CeladonCity_GameCorner_Text_WinsComeAndGo + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_16C857:: @ 816C857 +CeladonCity_GameCorner_EventScript_GymGuy:: @ 816C857 lock faceplayer - goto_if_set FLAG_DEFEATED_ERIKA, EventScript_16C870 - msgbox gUnknown_8196BAD - goto EventScript_16C7CA + goto_if_set FLAG_DEFEATED_ERIKA, CeladonCity_GameCorner_EventScript_GymGuyPostVictory + msgbox CeladonCity_GameCorner_Text_GymGuyAdvice + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C870:: @ 816C870 - msgbox gUnknown_8196CA1 - goto EventScript_16C7CA +CeladonCity_GameCorner_EventScript_GymGuyPostVictory:: @ 816C870 + msgbox CeladonCity_GameCorner_Text_RareMonsForCoins + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_16C87E:: @ 816C87E +CeladonCity_GameCorner_EventScript_Woman2:: @ 816C87E lock faceplayer - msgbox gUnknown_8196B7B - goto EventScript_16C7CA + msgbox CeladonCity_GameCorner_Text_WinOrLoseItsOnlyLuck + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_16C88E:: @ 816C88E +CeladonCity_GameCorner_EventScript_OldMan:: @ 816C88E lock faceplayer - msgbox gUnknown_8196CFE - goto EventScript_16C7CA + msgbox CeladonCity_GameCorner_Text_SoEasyToGetHooked + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E +CeladonCity_GameCorner_EventScript_Scientist:: @ 816C89E lock faceplayer - goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER, EventScript_16C8F0 - msgbox gUnknown_8196D2B - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839 + goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER, CeladonCity_GameCorner_EventScript_ScientistAlreadyGotCoins + msgbox CeladonCity_GameCorner_Text_WantSomeCoins + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_GamblerNoCoinCase checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 9980 - goto_if_ge EventScript_16C8E2 + compare VAR_TEMP_1, (MAX_COINS + 1) - 20 + goto_if_ge CeladonCity_GameCorner_EventScript_ScientistNoRoomForCoins addcoins 20 textcolor 3 - msgbox gUnknown_8196D47 + msgbox CeladonCity_GameCorner_Text_Received20CoinsFromNiceGuy playse SE_SHOP waitse setflag FLAG_GOT_20_COINS_FROM_GAMBLER - goto EventScript_16C7CA + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C8E2:: @ 816C8E2 - msgbox gUnknown_8196D6F - goto EventScript_16C7CA +CeladonCity_GameCorner_EventScript_ScientistNoRoomForCoins:: @ 816C8E2 + msgbox CeladonCity_GameCorner_Text_YouHaveLotsOfCoins + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C8F0:: @ 816C8F0 - msgbox gUnknown_8196D87 - goto EventScript_16C7CA +CeladonCity_GameCorner_EventScript_ScientistAlreadyGotCoins:: @ 816C8F0 + msgbox CeladonCity_GameCorner_Text_NeedMoreCoinsForMonIWant + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE +CeladonCity_GameCorner_EventScript_Gentleman:: @ 816C8FE lock faceplayer - goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER_2, EventScript_16C950 - msgbox gUnknown_8196DB7 - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839 + goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER_2, CeladonCity_GameCorner_EventScript_GentlemanAlreadyGotCoins + msgbox CeladonCity_GameCorner_Text_HereAreSomeCoinsShoo + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_GamblerNoCoinCase checkcoins VAR_TEMP_1 - compare VAR_TEMP_1, 9980 - goto_if_ge EventScript_16C942 + compare VAR_TEMP_1, (MAX_COINS + 1) - 20 + goto_if_ge CeladonCity_GameCorner_EventScript_GentlemanNoRoomForCoins addcoins 20 textcolor 3 - msgbox gUnknown_8196DF8 + msgbox CeladonCity_GameCorner_Text_Received20CoinsFromMan playse SE_SHOP waitse setflag FLAG_GOT_20_COINS_FROM_GAMBLER_2 - goto EventScript_16C7CA + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C942:: @ 816C942 - msgbox gUnknown_8196E1B - goto EventScript_16C7CA +CeladonCity_GameCorner_EventScript_GentlemanNoRoomForCoins:: @ 816C942 + msgbox CeladonCity_GameCorner_Text_YouveGotPlentyCoins + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -EventScript_16C950:: @ 816C950 - msgbox gUnknown_8196E40 - goto EventScript_16C7CA +CeladonCity_GameCorner_EventScript_GentlemanAlreadyGotCoins:: @ 816C950 + msgbox CeladonCity_GameCorner_Text_WatchReelsClosely + goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_16C95E:: @ 816C95E +CeladonCity_GameCorner_EventScript_SlotMachine0:: @ 816C95E lockall setvar VAR_0x8004, 0 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -EventScript_16C96A:: @ 816C96A +CeladonCity_GameCorner_EventScript_DontPlaySlotMachine:: @ 816C96A releaseall end -EventScript_16C96C:: @ 816C96C - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CAA0 - msgbox gUnknown_8196F46, MSGBOX_YESNO +CeladonCity_GameCorner_EventScript_SlotMachine:: @ 816C96C + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_SlotMachineNoCoinCase + msgbox CeladonCity_GameCorner_Text_SlotMachineWantToPlay, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16C96A + goto_if_eq CeladonCity_GameCorner_EventScript_DontPlaySlotMachine setfieldeffectarg 0, 255 setfieldeffectarg 1, 10 setfieldeffectarg 2, 14 - dofieldeffect 64 - waitfieldeffect 64 + dofieldeffect FLDEFF_UNK_40 + waitfieldeffect FLDEFF_UNK_40 @ Smile icon? specialvar VAR_RESULT, Special_GetRandomSlotMachine playslotmachine VAR_RESULT releaseall end -CeladonCity_GameCorner_EventScript_16C9A4:: @ 816C9A4 +CeladonCity_GameCorner_EventScript_SlotMachine1:: @ 816C9A4 lockall setvar VAR_0x8004, 1 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16C9B0:: @ 816C9B0 +CeladonCity_GameCorner_EventScript_SlotMachine2:: @ 816C9B0 lockall setvar VAR_0x8004, 2 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16C9BC:: @ 816C9BC +CeladonCity_GameCorner_EventScript_SlotMachine3:: @ 816C9BC lockall setvar VAR_0x8004, 3 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -EventScript_16C9C8:: @ 816C9C8 +CeladonCity_GameCorner_EventScript_SlotMachine4:: @ 816C9C8 lockall setvar VAR_0x8004, 4 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16C9D4:: @ 816C9D4 +CeladonCity_GameCorner_EventScript_SlotMachine5:: @ 816C9D4 lockall setvar VAR_0x8004, 5 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16C9E0:: @ 816C9E0 +CeladonCity_GameCorner_EventScript_SlotMachine6:: @ 816C9E0 lockall setvar VAR_0x8004, 6 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16C9EC:: @ 816C9EC +CeladonCity_GameCorner_EventScript_SlotMachine7:: @ 816C9EC lockall setvar VAR_0x8004, 7 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16C9F8:: @ 816C9F8 +CeladonCity_GameCorner_EventScript_SlotMachine8:: @ 816C9F8 lockall setvar VAR_0x8004, 8 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA04:: @ 816CA04 +CeladonCity_GameCorner_EventScript_SlotMachine9:: @ 816CA04 lockall setvar VAR_0x8004, 9 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA10:: @ 816CA10 +CeladonCity_GameCorner_EventScript_SlotMachine10:: @ 816CA10 lockall setvar VAR_0x8004, 10 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA1C:: @ 816CA1C +CeladonCity_GameCorner_EventScript_SlotMachine11:: @ 816CA1C lockall setvar VAR_0x8004, 11 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA28:: @ 816CA28 +CeladonCity_GameCorner_EventScript_SlotMachine12:: @ 816CA28 lockall setvar VAR_0x8004, 12 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA34:: @ 816CA34 +CeladonCity_GameCorner_EventScript_SlotMachine13:: @ 816CA34 lockall setvar VAR_0x8004, 13 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA40:: @ 816CA40 +CeladonCity_GameCorner_EventScript_SlotMachine14:: @ 816CA40 lockall setvar VAR_0x8004, 14 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -EventScript_16CA4C:: @ 816CA4C +CeladonCity_GameCorner_EventScript_SlotMachine15:: @ 816CA4C lockall setvar VAR_0x8004, 15 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA58:: @ 816CA58 +CeladonCity_GameCorner_EventScript_SlotMachine16:: @ 816CA58 lockall setvar VAR_0x8004, 16 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA64:: @ 816CA64 +CeladonCity_GameCorner_EventScript_SlotMachine17:: @ 816CA64 lockall setvar VAR_0x8004, 17 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -EventScript_16CA70:: @ 816CA70 +CeladonCity_GameCorner_EventScript_SlotMachine18:: @ 816CA70 lockall setvar VAR_0x8004, 18 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA7C:: @ 816CA7C +CeladonCity_GameCorner_EventScript_SlotMachine19:: @ 816CA7C lockall setvar VAR_0x8004, 19 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA88:: @ 816CA88 +CeladonCity_GameCorner_EventScript_SlotMachine20:: @ 816CA88 lockall setvar VAR_0x8004, 20 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_16CA94:: @ 816CA94 +CeladonCity_GameCorner_EventScript_SlotMachine21:: @ 816CA94 lockall setvar VAR_0x8004, 21 - goto EventScript_16C96C + goto CeladonCity_GameCorner_EventScript_SlotMachine end -EventScript_16CAA0:: @ 816CAA0 - msgbox gUnknown_8196F0D +CeladonCity_GameCorner_EventScript_SlotMachineNoCoinCase:: @ 816CAA0 + msgbox CeladonCity_GameCorner_Text_CoinCaseIsRequired releaseall end -CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA +CeladonCity_GameCorner_EventScript_Poster:: @ 816CAAA lockall - msgbox gUnknown_8196EDC - call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, EventScript_16CABE + msgbox CeladonCity_GameCorner_Text_SwitchBehindPosterPushIt + call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, CeladonCity_GameCorner_EventScript_OpenRocketHideout releaseall end -EventScript_16CABE:: @ 816CABE +CeladonCity_GameCorner_EventScript_OpenRocketHideout:: @ 816CABE playse SE_KI_GASYAN - setmetatile 15, 2, 669, 0 - setmetatile 16, 2, 670, 1 - setmetatile 17, 2, 671, 1 - setmetatile 16, 3, 678, 1 - setmetatile 17, 3, 679, 1 + setmetatile 15, 2, METATILE_GameCorner_Floor_StairsTop, 0 + setmetatile 16, 2, METATILE_GameCorner_StairsTop, 1 + setmetatile 17, 2, METATILE_GameCorner_StairsBottom, 1 + setmetatile 16, 3, METATILE_GameCorner_PurpleWall_StairsTop, 1 + setmetatile 17, 3, METATILE_GameCorner_PurpleWall_stairsBottom, 1 special DrawWholeMapView setflag FLAG_OPENED_ROCKET_HIDEOUT return -CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_7, Text_196E69, Text_196E95, EventScript_16CB10 - msgbox gUnknown_8196E9B, MSGBOX_AUTOCLOSE +CeladonCity_GameCorner_EventScript_RocketGrunt:: @ 816CAF5 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_7, CeladonCity_GameCorner_Text_GruntIntro, CeladonCity_GameCorner_Text_GruntDefeat, CeladonCity_GameCorner_Text_DefeatedGrunt + msgbox CeladonCity_GameCorner_Text_GruntPostBattle, MSGBOX_AUTOCLOSE end -EventScript_16CB10:: @ 816CB10 - msgbox gUnknown_8196E9B +CeladonCity_GameCorner_Text_DefeatedGrunt:: @ 816CB10 + msgbox CeladonCity_GameCorner_Text_GruntPostBattle closemessage compare VAR_FACING, DIR_WEST - call_if_eq EventScript_16CB34 + call_if_eq CeladonCity_GameCorner_Text_GruntExitWest compare VAR_FACING, DIR_WEST - call_if_ne EventScript_16CB3F + call_if_ne CeladonCity_GameCorner_Text_GruntExit removeobject 11 release end -EventScript_16CB34:: @ 816CB34 - applymovement 11, Movement_16CB4A +CeladonCity_GameCorner_Text_GruntExitWest:: @ 816CB34 + applymovement 11, CeladonCity_GameCorner_Movement_GruntExitWest waitmovement 0 return -EventScript_16CB3F:: @ 816CB3F - applymovement 11, Movement_16CB53 +CeladonCity_GameCorner_Text_GruntExit:: @ 816CB3F + applymovement 11, CeladonCity_GameCorner_Movement_GruntExit waitmovement 0 return -Movement_16CB4A:: @ 816CB4A +CeladonCity_GameCorner_Movement_GruntExitWest:: @ 816CB4A walk_down walk_right walk_right @@ -450,7 +450,7 @@ Movement_16CB4A:: @ 816CB4A walk_right step_end -Movement_16CB53:: @ 816CB53 +CeladonCity_GameCorner_Movement_GruntExit:: @ 816CB53 walk_right walk_right walk_right @@ -459,14 +459,14 @@ Movement_16CB53:: @ 816CB53 walk_right step_end -CeladonCity_GameCorner_EventScript_16CB5A:: @ 816CB5A - msgbox gUnknown_8196F64, MSGBOX_SIGN +CeladonCity_GameCorner_EventScript_UnusableSlotMachine1:: @ 816CB5A + msgbox CeladonCity_GameCorner_Text_OutOfOrder, MSGBOX_SIGN end -CeladonCity_GameCorner_EventScript_16CB63:: @ 816CB63 - msgbox gUnknown_8196F81, MSGBOX_SIGN +CeladonCity_GameCorner_EventScript_UnusableSlotMachine2:: @ 816CB63 + msgbox CeladonCity_GameCorner_Text_OutToLunch, MSGBOX_SIGN end -CeladonCity_GameCorner_EventScript_16CB6C:: @ 816CB6C - msgbox gUnknown_8196FA0, MSGBOX_SIGN +CeladonCity_GameCorner_EventScript_UnusableSlotMachine3:: @ 816CB6C + msgbox CeladonCity_GameCorner_Text_SomeonesKeys, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_GameCorner/text.inc b/data/maps/CeladonCity_GameCorner/text.inc index a388a736f..6813330ab 100644 --- a/data/maps/CeladonCity_GameCorner/text.inc +++ b/data/maps/CeladonCity_GameCorner/text.inc @@ -1,60 +1,60 @@ -gUnknown_8196940:: @ 8196940 +CeladonCity_GameCorner_Text_CanExchangeCoinsNextDoor:: @ 8196940 .string "Welcome!\p" .string "You can exchange your COINS for\n" .string "fabulous prizes next door.$" -Text_196984:: @ 8196984 +CeladonCity_GameCorner_Text_WelcomeBuySomeCoins:: @ 8196984 .string "Welcome to ROCKET GAME CORNER!\p" .string "Do you need some game COINS?\n" .string "Would you like to buy some?$" -gUnknown_81969DC:: @ 81969DC +CeladonCity_GameCorner_Text_ComePlaySometime:: @ 81969DC .string "No?\n" .string "Please come play sometime!$" -gUnknown_81969FB:: @ 81969FB +CeladonCity_GameCorner_Text_SorryDontHaveCoinCase:: @ 81969FB .string "Oh, I'm sorry.\n" .string "You don't have a COIN CASE.$" -gUnknown_8196A26:: @ 8196A26 +CeladonCity_GameCorner_Text_CoinCaseIsFull:: @ 8196A26 .string "Whoops!\n" .string "Your COIN CASE is full.$" -gUnknown_8196A46:: @ 8196A46 +CeladonCity_GameCorner_Text_CantAffordCoins:: @ 8196A46 .string "You can't afford the COINS.$" -gUnknown_8196A62:: @ 8196A62 +CeladonCity_GameCorner_Text_HereAreYourCoins:: @ 8196A62 .string "Thank you.\n" .string "Here are your COINS!$" -gUnknown_8196A82:: @ 8196A82 +CeladonCity_GameCorner_Text_RumoredTeamRocketRunsThisPlace:: @ 8196A82 .string "Keep this quiet.\p" .string "It's rumored that this place is run\n" .string "by TEAM ROCKET.$" -gUnknown_8196AC7:: @ 8196AC7 +CeladonCity_GameCorner_Text_ThinkMachinesHaveDifferentOdds:: @ 8196AC7 .string "I think these machines have\n" .string "different odds.$" -gUnknown_8196AF3:: @ 8196AF3 +CeladonCity_GameCorner_Text_DoYouWantToPlay:: @ 8196AF3 .string "Kid, do you want to play?$" -gUnknown_8196B0D:: @ 8196B0D +CeladonCity_GameCorner_Text_Received10CoinsFromMan:: @ 8196B0D .string "{PLAYER} received 10 COINS\n" .string "from the man.$" -gUnknown_8196B30:: @ 8196B30 +CeladonCity_GameCorner_Text_DontNeedMyCoins:: @ 8196B30 .string "You don't need my COINS!$" -gUnknown_8196B49:: @ 8196B49 +CeladonCity_GameCorner_Text_WinsComeAndGo:: @ 8196B49 .string "Wins seem to come and go.\n" .string "Nothing's a sure thing.$" -gUnknown_8196B7B:: @ 8196B7B +CeladonCity_GameCorner_Text_WinOrLoseItsOnlyLuck:: @ 8196B7B .string "These slot games…\n" .string "Win or lose, it's only by luck.$" -gUnknown_8196BAD:: @ 8196BAD +CeladonCity_GameCorner_Text_GymGuyAdvice:: @ 8196BAD .string "Hey!\p" .string "You have better things to do,\n" .string "champ in the making!\p" @@ -66,83 +66,83 @@ gUnknown_8196BAD:: @ 8196BAD .string "But she's not one to be taken\n" .string "lightly!$" -gUnknown_8196CA1:: @ 8196CA1 +CeladonCity_GameCorner_Text_RareMonsForCoins:: @ 8196CA1 .string "They offer rare POKéMON that can\n" .string "be exchanged for your COINS.\p" .string "But, I just can't seem to win!$" -gUnknown_8196CFE:: @ 8196CFE +CeladonCity_GameCorner_Text_SoEasyToGetHooked:: @ 8196CFE .string "Games are scary!\n" .string "It's so easy to get hooked!$" -gUnknown_8196D2B:: @ 8196D2B +CeladonCity_GameCorner_Text_WantSomeCoins:: @ 8196D2B .string "What's up?\n" .string "Want some COINS?$" -gUnknown_8196D47:: @ 8196D47 +CeladonCity_GameCorner_Text_Received20CoinsFromNiceGuy:: @ 8196D47 .string "{PLAYER} received 20 COINS\n" .string "from the nice guy.$" -gUnknown_8196D6F:: @ 8196D6F +CeladonCity_GameCorner_Text_YouHaveLotsOfCoins:: @ 8196D6F .string "You have lots of COINS!$" -gUnknown_8196D87:: @ 8196D87 +CeladonCity_GameCorner_Text_NeedMoreCoinsForMonIWant:: @ 8196D87 .string "Darn! I need more COINS for the\n" .string "POKéMON I want!$" -gUnknown_8196DB7:: @ 8196DB7 +CeladonCity_GameCorner_Text_HereAreSomeCoinsShoo:: @ 8196DB7 .string "Hey, what? You're throwing me off!\n" .string "Here are some COINS, so shoo!$" -gUnknown_8196DF8:: @ 8196DF8 +CeladonCity_GameCorner_Text_Received20CoinsFromMan:: @ 8196DF8 .string "{PLAYER} received 20 COINS\n" .string "from the man.$" -gUnknown_8196E1B:: @ 8196E1B +CeladonCity_GameCorner_Text_YouveGotPlentyCoins:: @ 8196E1B .string "You've got plenty of your own\n" .string "COINS!$" -gUnknown_8196E40:: @ 8196E40 +CeladonCity_GameCorner_Text_WatchReelsClosely:: @ 8196E40 .string "The trick is to watch the reels\n" .string "closely.$" -Text_196E69:: @ 8196E69 +CeladonCity_GameCorner_Text_GruntIntro:: @ 8196E69 .string "I'm guarding this poster!\n" .string "Go away, or else!$" -Text_196E95:: @ 8196E95 +CeladonCity_GameCorner_Text_GruntDefeat:: @ 8196E95 .string "Dang!$" -gUnknown_8196E9B:: @ 8196E9B +CeladonCity_GameCorner_Text_GruntPostBattle:: @ 8196E9B .string "The TEAM ROCKET HIDEOUT might\n" .string "be discovered!\p" .string "I better tell BOSS!$" -gUnknown_8196EDC:: @ 8196EDC +CeladonCity_GameCorner_Text_SwitchBehindPosterPushIt:: @ 8196EDC .string "Hey!\p" .string "A switch behind the poster!?\n" .string "Let's push it!$" -gUnknown_8196F0D:: @ 8196F0D +CeladonCity_GameCorner_Text_CoinCaseIsRequired:: @ 8196F0D .string "A COIN CASE is required…$" -gUnknown_8196F26:: @ 8196F26 +CeladonCity_GameCorner_Text_DontHaveCoinCase:: @ 8196F26 .string "Oops!\n" .string "Don't have the COIN CASE!$" -gUnknown_8196F46:: @ 8196F46 +CeladonCity_GameCorner_Text_SlotMachineWantToPlay:: @ 8196F46 .string "A slot machine!\n" .string "Want to play?$" -gUnknown_8196F64:: @ 8196F64 +CeladonCity_GameCorner_Text_OutOfOrder:: @ 8196F64 .string "OUT OF ORDER\n" .string "This is broken.$" -gUnknown_8196F81:: @ 8196F81 +CeladonCity_GameCorner_Text_OutToLunch:: @ 8196F81 .string "OUT TO LUNCH\n" .string "This is reserved.$" -gUnknown_8196FA0:: @ 8196FA0 +CeladonCity_GameCorner_Text_SomeonesKeys:: @ 8196FA0 .string "Someone's keys!\n" .string "They'll be back.$" diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json index c873cd0bb..99a1a54d4 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76", + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_BaldingMan", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F", + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_OldMan", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88", + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkMons", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D", + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkTMs", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88", + "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkItems", "flag": "0" } ], diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 329f829d3..ca8119594 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -1,44 +1,44 @@ CeladonCity_GameCorner_PrizeRoom_MapScripts:: @ 816CB75 .byte 0 -CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76:: @ 816CB76 - msgbox gUnknown_8196FC1, MSGBOX_NPC +CeladonCity_GameCorner_PrizeRoom_EventScript_BaldingMan:: @ 816CB76 + msgbox CeladonCity_GameCorner_PrizeRoom_Text_FancyThatPorygon, MSGBOX_NPC end -CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F:: @ 816CB7F - msgbox gUnknown_8196FFF, MSGBOX_NPC +CeladonCity_GameCorner_PrizeRoom_EventScript_OldMan:: @ 816CB7F + msgbox CeladonCity_GameCorner_PrizeRoom_Text_RakedItInToday, MSGBOX_NPC end -CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 +CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkMons:: @ 816CB88 lock faceplayer - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99 + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase goto_if_questlog EventScript_ReleaseEnd showcoinsbox 0, 0 - msgbox gUnknown_8197057 - goto EventScript_16CBB2 + msgbox CeladonCity_GameCorner_PrizeRoom_Text_WeExchangeCoinsForPrizes + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeMon end -EventScript_16CBB2:: @ 816CBB2 - message Text_19707A +CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeMon:: @ 816CBB2 + message CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize waitmessage multichoice 11, 0, MULTICHOICE_GAME_CORNER_POKEMON_PRIZES, FALSE switch VAR_RESULT - case 0, EventScript_16CC15 - case 1, EventScript_16CC25 - case 2, EventScript_16CC35 - case 3, EventScript_16CC45 - case 4, EventScript_16CC55 - case 5, EventScript_16CC10 - case 127, EventScript_16CC10 + case 0, CeladonCity_GameCorner_PrizeRoom_EventScript_Abra + case 1, CeladonCity_GameCorner_PrizeRoom_EventScript_Clefairy + case 2, CeladonCity_GameCorner_PrizeRoom_EventScript_DratiniPinsir + case 3, CeladonCity_GameCorner_PrizeRoom_EventScript_ScytherDratini + case 4, CeladonCity_GameCorner_PrizeRoom_EventScript_Porygon + case 5, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange + case 127, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -EventScript_16CC10:: @ 816CC10 +CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange:: @ 816CC10 hidecoinsbox 0, 0 release end -EventScript_16CC15:: @ 816CC15 +CeladonCity_GameCorner_PrizeRoom_EventScript_Abra:: @ 816CC15 .ifdef FIRERED setvar VAR_TEMP_1, SPECIES_ABRA setvar VAR_TEMP_2, 180 @@ -48,10 +48,10 @@ EventScript_16CC15:: @ 816CC15 setvar VAR_TEMP_2, 120 .endif .endif - goto EventScript_16CC65 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon end -EventScript_16CC25:: @ 816CC25 +CeladonCity_GameCorner_PrizeRoom_EventScript_Clefairy:: @ 816CC25 .ifdef FIRERED setvar VAR_TEMP_1, SPECIES_CLEFAIRY setvar VAR_TEMP_2, 500 @@ -61,10 +61,10 @@ EventScript_16CC25:: @ 816CC25 setvar VAR_TEMP_2, 750 .endif .endif - goto EventScript_16CC65 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon end -EventScript_16CC35:: @ 816CC35 +CeladonCity_GameCorner_PrizeRoom_EventScript_DratiniPinsir:: @ 816CC35 .ifdef FIRERED setvar VAR_TEMP_1, SPECIES_DRATINI setvar VAR_TEMP_2, 2800 @@ -74,10 +74,10 @@ EventScript_16CC35:: @ 816CC35 setvar VAR_TEMP_2, 2500 .endif .endif - goto EventScript_16CC65 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon end -EventScript_16CC45:: @ 816CC45 +CeladonCity_GameCorner_PrizeRoom_EventScript_ScytherDratini:: @ 816CC45 .ifdef FIRERED setvar VAR_TEMP_1, SPECIES_SCYTHER setvar VAR_TEMP_2, 5500 @@ -87,10 +87,10 @@ EventScript_16CC45:: @ 816CC45 setvar VAR_TEMP_2, 4600 .endif .endif - goto EventScript_16CC65 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon end -EventScript_16CC55:: @ 816CC55 +CeladonCity_GameCorner_PrizeRoom_EventScript_Porygon:: @ 816CC55 .ifdef FIRERED setvar VAR_TEMP_1, SPECIES_PORYGON setvar VAR_TEMP_2, 9999 @@ -100,28 +100,28 @@ EventScript_16CC55:: @ 816CC55 setvar VAR_TEMP_2, 6500 .endif .endif - goto EventScript_16CC65 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon end -EventScript_16CC65:: @ 816CC65 +CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon:: @ 816CC65 getspeciesname 0, VAR_TEMP_1 - msgbox gUnknown_819709D, MSGBOX_YESNO + msgbox CeladonCity_GameCorner_PrizeRoom_Text_YouWantPrize, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16CC10 + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange checkcoins VAR_RESULT compare VAR_RESULT, VAR_TEMP_2 - goto_if_lt EventScript_16CDA5 + goto_if_lt CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins textcolor 3 switch VAR_TEMP_1 - case SPECIES_ABRA, EventScript_16CCD4 - case SPECIES_CLEFAIRY, EventScript_16CCE9 - case SPECIES_DRATINI, EventScript_16CCFE - case SPECIES_SCYTHER, EventScript_16CD13 - case SPECIES_PORYGON, EventScript_16CD28 - case SPECIES_PINSIR, EventScript_16CD3D + case SPECIES_ABRA, CeladonCity_GameCorner_PrizeRoom_EventScript_GiveAbra + case SPECIES_CLEFAIRY, CeladonCity_GameCorner_PrizeRoom_EventScript_GiveClefairy + case SPECIES_DRATINI, CeladonCity_GameCorner_PrizeRoom_EventScript_GiveDratini + case SPECIES_SCYTHER, CeladonCity_GameCorner_PrizeRoom_EventScript_GiveScyther + case SPECIES_PORYGON, CeladonCity_GameCorner_PrizeRoom_EventScript_GivePorygon + case SPECIES_PINSIR, CeladonCity_GameCorner_PrizeRoom_EventScript_GivePinsir end -EventScript_16CCD4:: @ 816CCD4 +CeladonCity_GameCorner_PrizeRoom_EventScript_GiveAbra:: @ 816CCD4 .ifdef FIRERED givemon VAR_TEMP_1, 9, ITEM_NONE .else @@ -129,10 +129,10 @@ EventScript_16CCD4:: @ 816CCD4 givemon VAR_TEMP_1, 7, ITEM_NONE .endif .endif - goto EventScript_16CD52 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -EventScript_16CCE9:: @ 816CCE9 +CeladonCity_GameCorner_PrizeRoom_EventScript_GiveClefairy:: @ 816CCE9 .ifdef FIRERED givemon VAR_TEMP_1, 8, ITEM_NONE .else @@ -140,10 +140,10 @@ EventScript_16CCE9:: @ 816CCE9 givemon VAR_TEMP_1, 12, ITEM_NONE .endif .endif - goto EventScript_16CD52 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -EventScript_16CCFE:: @ 816CCFE +CeladonCity_GameCorner_PrizeRoom_EventScript_GiveDratini:: @ 816CCFE .ifdef FIRERED givemon VAR_TEMP_1, 18, ITEM_NONE .else @@ -151,15 +151,15 @@ EventScript_16CCFE:: @ 816CCFE givemon VAR_TEMP_1, 24, ITEM_NONE .endif .endif - goto EventScript_16CD52 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -EventScript_16CD13:: @ 816CD13 +CeladonCity_GameCorner_PrizeRoom_EventScript_GiveScyther:: @ 816CD13 givemon VAR_TEMP_1, 25, ITEM_NONE - goto EventScript_16CD52 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -EventScript_16CD28:: @ 816CD28 +CeladonCity_GameCorner_PrizeRoom_EventScript_GivePorygon:: @ 816CD28 .ifdef FIRERED givemon VAR_TEMP_1, 26, ITEM_NONE .else @@ -167,50 +167,50 @@ EventScript_16CD28:: @ 816CD28 givemon VAR_TEMP_1, 18, ITEM_NONE .endif .endif - goto EventScript_16CD52 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -EventScript_16CD3D:: @ 816CD3D +CeladonCity_GameCorner_PrizeRoom_EventScript_GivePinsir:: @ 816CD3D givemon VAR_TEMP_1, 18, ITEM_NONE - goto EventScript_16CD52 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -EventScript_16CD52:: @ 816CD52 +CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon:: @ 816CD52 compare VAR_RESULT, 0 - goto_if_eq EventScript_16CDB3 + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonParty compare VAR_RESULT, 1 - goto_if_eq EventScript_16CDE0 + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonPC compare VAR_RESULT, 2 - goto_if_eq EventScript_16CD74 + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_PartyFull end -EventScript_16CD74:: @ 816CD74 +CeladonCity_GameCorner_PrizeRoom_EventScript_PartyFull:: @ 816CD74 textcolor 3 msgbox Text_NoMoreRoomForPokemon hidecoinsbox 0, 0 release end -EventScript_16CD83:: @ 816CD83 +CeladonCity_GameCorner_PrizeRoom_EventScript_NicknamePartyMon:: @ 816CD83 getpartysize subvar VAR_RESULT, 1 copyvar VAR_0x8004, VAR_RESULT call EventScript_ChangePokemonNickname - goto EventScript_16CC10 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -EventScript_16CD99:: @ 816CD99 +CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase:: @ 816CD99 textcolor 3 - msgbox gUnknown_819703E + msgbox CeladonCity_GameCorner_PrizeRoom_Text_CoinCaseRequired release end -EventScript_16CDA5:: @ 816CDA5 - msgbox gUnknown_81970D5 - goto EventScript_16CC10 +CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins:: @ 816CDA5 + msgbox CeladonCity_GameCorner_PrizeRoom_Text_NeedMoreCoins + goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -EventScript_16CDB3:: @ 816CDB3 +CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonParty:: @ 816CDB3 removecoins VAR_TEMP_2 updatecoinsbox 0, 5 getspeciesname 0, VAR_TEMP_1 @@ -220,11 +220,11 @@ EventScript_16CDB3:: @ 816CDB3 waitfanfare msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_16CD83 - goto EventScript_16CC10 + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_NicknamePartyMon + goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -EventScript_16CDE0:: @ 816CDE0 +CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonPC:: @ 816CDE0 removecoins VAR_TEMP_2 updatecoinsbox 0, 5 getspeciesname 0, VAR_TEMP_1 @@ -234,161 +234,161 @@ EventScript_16CDE0:: @ 816CDE0 waitfanfare msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16CE12 + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_TransferredToPC call EventScript_NameReceivedBoxMon - goto EventScript_16CE12 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_TransferredToPC end -EventScript_16CE12:: @ 816CE12 +CeladonCity_GameCorner_PrizeRoom_EventScript_TransferredToPC:: @ 816CE12 call EventScript_TransferredToPC - goto EventScript_16CC10 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D +CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkTMs:: @ 816CE1D lock faceplayer - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99 + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase goto_if_questlog EventScript_ReleaseEnd showcoinsbox 0, 0 - msgbox gUnknown_8197057 - goto EventScript_16CE47 + msgbox CeladonCity_GameCorner_PrizeRoom_Text_WeExchangeCoinsForPrizes + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeTM end -EventScript_16CE47:: @ 816CE47 - message Text_19707A +CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeTM:: @ 816CE47 + message CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize waitmessage multichoice 11, 0, MULTICHOICE_GAME_CORNER_TMPRIZES, FALSE switch VAR_RESULT - case 0, EventScript_16CEA5 - case 1, EventScript_16CEB9 - case 2, EventScript_16CECD - case 3, EventScript_16CEE1 - case 4, EventScript_16CEF5 - case 5, EventScript_16CC10 - case 127, EventScript_16CC10 + case 0, CeladonCity_GameCorner_PrizeRoom_EventScript_TM13 + case 1, CeladonCity_GameCorner_PrizeRoom_EventScript_TM23 + case 2, CeladonCity_GameCorner_PrizeRoom_EventScript_TM24 + case 3, CeladonCity_GameCorner_PrizeRoom_EventScript_TM30 + case 4, CeladonCity_GameCorner_PrizeRoom_EventScript_TM35 + case 5, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange + case 127, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -EventScript_16CEA5:: @ 816CEA5 +CeladonCity_GameCorner_PrizeRoom_EventScript_TM13:: @ 816CEA5 setvar VAR_TEMP_1, ITEM_TM13 setvar VAR_TEMP_2, 4000 getmovename 1, MOVE_ICE_BEAM - goto EventScript_16CF09 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM end -EventScript_16CEB9:: @ 816CEB9 +CeladonCity_GameCorner_PrizeRoom_EventScript_TM23:: @ 816CEB9 setvar VAR_TEMP_1, ITEM_TM23 setvar VAR_TEMP_2, 3500 getmovename 1, MOVE_IRON_TAIL - goto EventScript_16CF09 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM end -EventScript_16CECD:: @ 816CECD +CeladonCity_GameCorner_PrizeRoom_EventScript_TM24:: @ 816CECD setvar VAR_TEMP_1, ITEM_TM24 setvar VAR_TEMP_2, 4000 getmovename 1, MOVE_THUNDERBOLT - goto EventScript_16CF09 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM end -EventScript_16CEE1:: @ 816CEE1 +CeladonCity_GameCorner_PrizeRoom_EventScript_TM30:: @ 816CEE1 setvar VAR_TEMP_1, ITEM_TM30 setvar VAR_TEMP_2, 4500 getmovename 1, MOVE_SHADOW_BALL - goto EventScript_16CF09 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM end -EventScript_16CEF5:: @ 816CEF5 +CeladonCity_GameCorner_PrizeRoom_EventScript_TM35:: @ 816CEF5 setvar VAR_TEMP_1, ITEM_TM35 setvar VAR_TEMP_2, 4000 getmovename 1, MOVE_FLAMETHROWER - goto EventScript_16CF09 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM end -EventScript_16CF09:: @ 816CF09 - msgbox gUnknown_81970B2, MSGBOX_YESNO +CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM:: @ 816CF09 + msgbox CeladonCity_GameCorner_PrizeRoom_Text_YouWantTM, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16CC10 - goto EventScript_16CF3F + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange + goto CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize end -EventScript_16CF22:: @ 816CF22 +CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem:: @ 816CF22 getitemname 0, VAR_TEMP_1 - msgbox gUnknown_819709D, MSGBOX_YESNO + msgbox CeladonCity_GameCorner_PrizeRoom_Text_YouWantPrize, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16CC10 - goto EventScript_16CF3F + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange + goto CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize end -EventScript_16CF3F:: @ 816CF3F +CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize:: @ 816CF3F getitemname 0, VAR_TEMP_1 checkcoins VAR_RESULT compare VAR_RESULT, VAR_TEMP_2 - goto_if_lt EventScript_16CDA5 + goto_if_lt CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins checkitemspace VAR_TEMP_1, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16CF79 + goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_BagFull removecoins VAR_TEMP_2 updatecoinsbox 0, 5 giveitem VAR_TEMP_1 - goto EventScript_16CC10 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -EventScript_16CF79:: @ 816CF79 +CeladonCity_GameCorner_PrizeRoom_EventScript_BagFull:: @ 816CF79 textcolor 3 msgbox Text_TooBadBagFull hidecoinsbox 0, 0 release end -CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 +CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkItems:: @ 816CF88 lock faceplayer - goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99 + goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase goto_if_questlog EventScript_ReleaseEnd showcoinsbox 0, 0 - msgbox gUnknown_8197057 - goto EventScript_16CFB2 + msgbox CeladonCity_GameCorner_PrizeRoom_Text_WeExchangeCoinsForPrizes + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeItem end -EventScript_16CFB2:: @ 816CFB2 - message Text_19707A +CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeItem:: @ 816CFB2 + message CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize waitmessage multichoice 10, 0, MULTICHOICE_GAME_CORNER_BATTLE_ITEM_PRIZES, FALSE switch VAR_RESULT - case 0, EventScript_16D010 - case 1, EventScript_16D020 - case 2, EventScript_16D030 - case 3, EventScript_16D040 - case 4, EventScript_16D050 - case 5, EventScript_16CC10 - case 127, EventScript_16CC10 + case 0, CeladonCity_GameCorner_PrizeRoom_EventScript_SmokeBall + case 1, CeladonCity_GameCorner_PrizeRoom_EventScript_MiracleSeed + case 2, CeladonCity_GameCorner_PrizeRoom_EventScript_Charcoal + case 3, CeladonCity_GameCorner_PrizeRoom_EventScript_MysticWater + case 4, CeladonCity_GameCorner_PrizeRoom_EventScript_YellowFlute + case 5, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange + case 127, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -EventScript_16D010:: @ 816D010 +CeladonCity_GameCorner_PrizeRoom_EventScript_SmokeBall:: @ 816D010 setvar VAR_TEMP_1, ITEM_SMOKE_BALL setvar VAR_TEMP_2, 800 - goto EventScript_16CF22 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem end -EventScript_16D020:: @ 816D020 +CeladonCity_GameCorner_PrizeRoom_EventScript_MiracleSeed:: @ 816D020 setvar VAR_TEMP_1, ITEM_MIRACLE_SEED setvar VAR_TEMP_2, 1000 - goto EventScript_16CF22 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem end -EventScript_16D030:: @ 816D030 +CeladonCity_GameCorner_PrizeRoom_EventScript_Charcoal:: @ 816D030 setvar VAR_TEMP_1, ITEM_CHARCOAL setvar VAR_TEMP_2, 1000 - goto EventScript_16CF22 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem end -EventScript_16D040:: @ 816D040 +CeladonCity_GameCorner_PrizeRoom_EventScript_MysticWater:: @ 816D040 setvar VAR_TEMP_1, ITEM_MYSTIC_WATER setvar VAR_TEMP_2, 1000 - goto EventScript_16CF22 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem end -EventScript_16D050:: @ 816D050 +CeladonCity_GameCorner_PrizeRoom_EventScript_YellowFlute:: @ 816D050 setvar VAR_TEMP_1, ITEM_YELLOW_FLUTE setvar VAR_TEMP_2, 1600 - goto EventScript_16CF22 + goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem end diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc index a5a21b9bc..140c98958 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc @@ -1,31 +1,31 @@ -gUnknown_8196FC1:: @ 8196FC1 +CeladonCity_GameCorner_PrizeRoom_Text_FancyThatPorygon:: @ 8196FC1 .string "I sure do fancy that PORYGON!\n" .string "But, it's hard to win at slots!$" -gUnknown_8196FFF:: @ 8196FFF +CeladonCity_GameCorner_PrizeRoom_Text_RakedItInToday:: @ 8196FFF .string "Gahaha! I raked it in today!\n" .string "If only every day were like this…$" -gUnknown_819703E:: @ 819703E +CeladonCity_GameCorner_PrizeRoom_Text_CoinCaseRequired:: @ 819703E .string "A COIN CASE is required…$" -gUnknown_8197057:: @ 8197057 +CeladonCity_GameCorner_PrizeRoom_Text_WeExchangeCoinsForPrizes:: @ 8197057 .string "We exchange your COINS for prizes.$" -Text_19707A:: @ 819707A +CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize:: @ 819707A .string "Which prize would you like?$" -gUnknown_8197096:: @ 8197096 +CeladonCity_GameCorner_PrizeRoom_Text_HereYouGo:: @ 8197096 .string "はい どうぞ$" -gUnknown_819709D:: @ 819709D +CeladonCity_GameCorner_PrizeRoom_Text_YouWantPrize:: @ 819709D .string "So, you want the {STR_VAR_1}?$" -gUnknown_81970B2:: @ 81970B2 +CeladonCity_GameCorner_PrizeRoom_Text_YouWantTM:: @ 81970B2 .string "Okay, a TM of {STR_VAR_2}\n" .string "is what you want?$" -gUnknown_81970D5:: @ 81970D5 +CeladonCity_GameCorner_PrizeRoom_Text_NeedMoreCoins:: @ 81970D5 .string "Sorry, you'll need more COINS\n" .string "than that.$" diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index 88187cdc9..f0a86b8e5 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "CeladonCity_Gym_EventScript_16D111", + "script": "CeladonCity_Gym_EventScript_Kay", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "CeladonCity_Gym_EventScript_16D163", + "script": "CeladonCity_Gym_EventScript_Bridget", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "CeladonCity_Gym_EventScript_16D14C", + "script": "CeladonCity_Gym_EventScript_Tina", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "CeladonCity_Gym_EventScript_16D17A", + "script": "CeladonCity_Gym_EventScript_Tamia", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "CeladonCity_Gym_EventScript_16D19E", + "script": "CeladonCity_Gym_EventScript_Lori", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "CeladonCity_Gym_EventScript_16D128", + "script": "CeladonCity_Gym_EventScript_Lisa", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Gym_EventScript_16D061", + "script": "CeladonCity_Gym_EventScript_Erika", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "CeladonCity_Gym_EventScript_16D1B5", + "script": "CeladonCity_Gym_EventScript_Mary", "flag": "0" }, { @@ -187,14 +187,14 @@ "x": 4, "y": 16, "elevation": 0, - "script": "CeladonCity_Gym_EventScript_16D1CC" + "script": "CeladonCity_Gym_EventScript_GymStatue" }, { "type": "bg_event_type_0", "x": 8, "y": 16, "elevation": 0, - "script": "CeladonCity_Gym_EventScript_16D1CC" + "script": "CeladonCity_Gym_EventScript_GymStatue" } ] } diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index 60a945e21..8291ad757 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -1,85 +1,85 @@ CeladonCity_Gym_MapScripts:: @ 816D060 .byte 0 -CeladonCity_Gym_EventScript_16D061:: @ 816D061 +CeladonCity_Gym_EventScript_Erika:: @ 816D061 famechecker FAMECHECKER_ERIKA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle_single TRAINER_LEADER_ERIKA, Text_197114, Text_197260, EventScript_16D0A0, NO_MUSIC - goto_if_unset FLAG_GOT_TM19_FROM_ERIKA, EventScript_16D0C6 + trainerbattle_single TRAINER_LEADER_ERIKA, CeladonCity_Gym_Text_ErikaIntro, CeladonCity_Gym_Text_ErikaDefeat, CeladonCity_Gym_EventScript_DefeatedErika, NO_MUSIC + goto_if_unset FLAG_GOT_TM19_FROM_ERIKA, CeladonCity_Gym_EventScript_GiveTM19 famechecker FAMECHECKER_ERIKA, 4 - msgbox gUnknown_81972B8 + msgbox CeladonCity_Gym_Text_ErikaPostBattle release end -EventScript_16D0A0:: @ 816D0A0 +CeladonCity_Gym_EventScript_DefeatedErika:: @ 816D0A0 famechecker FAMECHECKER_ERIKA, 1 clearflag FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS setflag FLAG_DEFEATED_ERIKA setflag FLAG_BADGE04_GET set_gym_trainers 4 - goto EventScript_16D0C6 + goto CeladonCity_Gym_EventScript_GiveTM19 end -EventScript_16D0C6:: @ 816D0C6 - msgbox gUnknown_8197327 +CeladonCity_Gym_EventScript_GiveTM19:: @ 816D0C6 + msgbox CeladonCity_Gym_Text_ExplainRainbowBadgeTakeThis checkitemspace ITEM_TM19, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16D107 - giveitem_msg gUnknown_81973BA, ITEM_TM19 + goto_if_eq CeladonCity_Gym_EventScript_NoRoomForTM19 + giveitem_msg CeladonCity_Gym_Text_ReceivedTM19FromErika, ITEM_TM19 setflag FLAG_GOT_TM19_FROM_ERIKA - msgbox gUnknown_81973D7 + msgbox CeladonCity_Gym_Text_ExplainTM19 release end -EventScript_16D107:: @ 816D107 - msgbox gUnknown_819745D +CeladonCity_Gym_EventScript_NoRoomForTM19:: @ 816D107 + msgbox CeladonCity_Gym_Text_ShouldMakeRoomForThis release end -CeladonCity_Gym_EventScript_16D111:: @ 816D111 - trainerbattle_single TRAINER_LASS_KAY, Text_19747C, Text_1974C4 - msgbox gUnknown_81974D6, MSGBOX_AUTOCLOSE +CeladonCity_Gym_EventScript_Kay:: @ 816D111 + trainerbattle_single TRAINER_LASS_KAY, CeladonCity_Gym_Text_KayIntro, CeladonCity_Gym_Text_KayDefeat + msgbox CeladonCity_Gym_Text_KayPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_16D128:: @ 816D128 - trainerbattle_single TRAINER_LASS_LISA, Text_1976C5, Text_1976FF +CeladonCity_Gym_EventScript_Lisa:: @ 816D128 + trainerbattle_single TRAINER_LASS_LISA, CeladonCity_Gym_Text_LisaIntro, CeladonCity_Gym_Text_LisaDefeat famechecker FAMECHECKER_ERIKA, 2 - msgbox gUnknown_8197708, MSGBOX_AUTOCLOSE + msgbox CeladonCity_Gym_Text_LisaPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_16D14C:: @ 816D14C - trainerbattle_single TRAINER_PICNICKER_TINA, Text_197595, Text_1975BB - msgbox gUnknown_81975D1, MSGBOX_AUTOCLOSE +CeladonCity_Gym_EventScript_Tina:: @ 816D14C + trainerbattle_single TRAINER_PICNICKER_TINA, CeladonCity_Gym_Text_TinaIntro, CeladonCity_Gym_Text_TinaDefeat + msgbox CeladonCity_Gym_Text_TinaPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_16D163:: @ 816D163 - trainerbattle_single TRAINER_BEAUTY_BRIDGET, Text_1974FA, Text_19751C - msgbox gUnknown_8197527, MSGBOX_AUTOCLOSE +CeladonCity_Gym_EventScript_Bridget:: @ 816D163 + trainerbattle_single TRAINER_BEAUTY_BRIDGET, CeladonCity_Gym_Text_BridgetIntro, CeladonCity_Gym_Text_BridgetDefeat + msgbox CeladonCity_Gym_Text_BridgetPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_16D17A:: @ 816D17A - trainerbattle_single TRAINER_BEAUTY_TAMIA, Text_19760B, Text_197660 +CeladonCity_Gym_EventScript_Tamia:: @ 816D17A + trainerbattle_single TRAINER_BEAUTY_TAMIA, CeladonCity_Gym_Text_TamiaIntro, CeladonCity_Gym_Text_TamiaDefeat famechecker FAMECHECKER_ERIKA, 3 - msgbox gUnknown_8197664, MSGBOX_AUTOCLOSE + msgbox CeladonCity_Gym_Text_TamiaPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_16D19E:: @ 816D19E - trainerbattle_single TRAINER_BEAUTY_LORI, Text_197747, Text_19777A - msgbox gUnknown_8197788, MSGBOX_AUTOCLOSE +CeladonCity_Gym_EventScript_Lori:: @ 816D19E + trainerbattle_single TRAINER_BEAUTY_LORI, CeladonCity_Gym_Text_LoriIntro, CeladonCity_Gym_Text_LoriDefeat + msgbox CeladonCity_Gym_Text_LoriPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5 - trainerbattle_single TRAINER_COOLTRAINER_MARY, Text_1977E5, Text_197832 - msgbox gUnknown_819783E, MSGBOX_AUTOCLOSE +CeladonCity_Gym_EventScript_Mary:: @ 816D1B5 + trainerbattle_single TRAINER_COOLTRAINER_MARY, CeladonCity_Gym_Text_MaryIntro, CeladonCity_Gym_Text_MaryDefeat + msgbox CeladonCity_Gym_Text_MaryPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC +CeladonCity_Gym_EventScript_GymStatue:: @ 816D1CC lockall - goto_if_set FLAG_BADGE04_GET, EventScript_16D1E0 - msgbox gUnknown_8197874 + goto_if_set FLAG_BADGE04_GET, CeladonCity_Gym_EventScript_GymStatuePostVictory + msgbox CeladonCity_Gym_Text_GymStatue releaseall end -EventScript_16D1E0:: @ 816D1E0 - msgbox gUnknown_81978AB +CeladonCity_Gym_EventScript_GymStatuePostVictory:: @ 816D1E0 + msgbox CeladonCity_Gym_Text_GymStatuePlayerWon releaseall end diff --git a/data/maps/CeladonCity_Gym/text.inc b/data/maps/CeladonCity_Gym/text.inc index 02c39a95c..02ded4fb0 100644 --- a/data/maps/CeladonCity_Gym/text.inc +++ b/data/maps/CeladonCity_Gym/text.inc @@ -1,168 +1,156 @@ -gUnknown_81970FE:: @ 81970FE - .string "おきゃくさん もう もてないよ$" @ I'm sorry I don't have any more +Text_SorryDontHaveAnyMore:: @ 81970FE + .string "おきゃくさん もう もてないよ$" -gUnknown_819710E:: @ 819710E - .string "あっ そう$" @ I see +Text_ISee:: @ 819710E + .string "あっ そう$" -Text_197114:: @ 8197114 +CeladonCity_Gym_Text_ErikaIntro:: @ 8197114 .string "Hello…\n" .string "Lovely weather, isn't it?\l" .string "It's so pleasant…\p" - .string "…Oh, dear…\n" .string "I must have dozed off. Welcome.\p" - .string "My name is ERIKA.\n" .string "I am the LEADER of CELADON GYM.\p" - .string "I am a student of the art of\n" .string "flower arranging.\p" - .string "My POKéMON are solely of the\n" .string "GRASS type.\p" - .string "…Oh, I'm sorry, I had no idea that\n" .string "you wished to challenge me.\p" - .string "Very well, but I shall not lose.{PLAY_BGM MUS_EXEYE}$" -Text_197260:: @ 8197260 +CeladonCity_Gym_Text_ErikaDefeat:: @ 8197260 .string "Oh!\n" .string "I concede defeat.\l" .string "You are remarkably strong.\p" - .string "I must confer on you the\n" .string "RAINBOWBADGE.$" -gUnknown_81972B8:: @ 81972B8 +CeladonCity_Gym_Text_ErikaPostBattle:: @ 81972B8 .string "You are cataloging POKéMON?\n" .string "I must say I'm impressed.\p" - .string "I would never collect POKéMON if\n" .string "they were unattractive.$" -gUnknown_8197327:: @ 8197327 +CeladonCity_Gym_Text_ExplainRainbowBadgeTakeThis:: @ 8197327 .string "The RAINBOWBADGE will make\n" .string "POKéMON up to Lv. 50 obey.\p" - .string "It also allows POKéMON to use\n" .string "STRENGTH in and out of battle.\p" - .string "Please also take this with you.$" -gUnknown_81973BA:: @ 81973BA +CeladonCity_Gym_Text_ReceivedTM19FromErika:: @ 81973BA .string "{PLAYER} received TM19\n" .string "from ERIKA.$" -gUnknown_81973D7:: @ 81973D7 +CeladonCity_Gym_Text_ExplainTM19:: @ 81973D7 .string "TM19 contains GIGA DRAIN.\p" - .string "Half the damage it inflicts is\n" .string "drained to heal your POKéMON.\p" - .string "Wouldn't you agree that it's a\n" .string "wonderful move?$" -gUnknown_819745D:: @ 819745D +CeladonCity_Gym_Text_ShouldMakeRoomForThis:: @ 819745D .string "You should make room for this.$" -Text_19747C:: @ 819747C +CeladonCity_Gym_Text_KayIntro:: @ 819747C .string "I should tell you about this GYM.\p" .string "Only real ladies are allowed in\n" .string "here!$" -Text_1974C4:: @ 81974C4 +CeladonCity_Gym_Text_KayDefeat:: @ 81974C4 .string "You're too rough!$" -gUnknown_81974D6:: @ 81974D6 +CeladonCity_Gym_Text_KayPostBattle:: @ 81974D6 .string "Bleaah!\n" .string "I hope ERIKA wipes you out!$" -Text_1974FA:: @ 81974FA +CeladonCity_Gym_Text_BridgetIntro:: @ 81974FA .string "Oh, welcome.\n" .string "I was getting bored.$" -Text_19751C:: @ 819751C +CeladonCity_Gym_Text_BridgetDefeat:: @ 819751C .string "My makeup!$" -gUnknown_8197527:: @ 8197527 +CeladonCity_Gym_Text_BridgetPostBattle:: @ 8197527 .string "GRASS-type POKéMON are tough\n" .string "against the WATER type.\p" .string "They also have an edge on ROCK-\n" .string "and GROUND-type POKéMON.$" -Text_197595:: @ 8197595 +CeladonCity_Gym_Text_TinaIntro:: @ 8197595 .string "…Weren't you peeking in here\n" .string "earlier?$" -Text_1975BB:: @ 81975BB +CeladonCity_Gym_Text_TinaDefeat:: @ 81975BB .string "You're an eye-opener!$" -gUnknown_81975D1:: @ 81975D1 +CeladonCity_Gym_Text_TinaPostBattle:: @ 81975D1 .string "Oh, you were looking at ERIKA…\n" .string "You weren't looking at me…$" -Text_19760B:: @ 819760B +CeladonCity_Gym_Text_TamiaIntro:: @ 819760B .string "Look, look!\n" .string "See my POKéMON!\p" .string "I like the GRASS type.\n" .string "I like how they're easy to raise.$" -Text_197660:: @ 8197660 +CeladonCity_Gym_Text_TamiaDefeat:: @ 8197660 .string "No!$" -gUnknown_8197664:: @ 8197664 +CeladonCity_Gym_Text_TamiaPostBattle:: @ 8197664 .string "We only use GRASS-type POKéMON at\n" .string "our GYM.\p" .string "Why? We also use them for making\n" .string "flower arrangements!$" -Text_1976C5:: @ 81976C5 +CeladonCity_Gym_Text_LisaIntro:: @ 81976C5 .string "Oh, hey!\p" .string "We don't like BUG- or FIRE-type\n" .string "POKéMON in here!$" -Text_1976FF:: @ 81976FF +CeladonCity_Gym_Text_LisaDefeat:: @ 81976FF .string "Oh!\n" .string "You!$" -gUnknown_8197708:: @ 8197708 +CeladonCity_Gym_Text_LisaPostBattle:: @ 8197708 .string "Our LEADER ERIKA might be quiet,\n" .string "but she's famous around here.$" -Text_197747:: @ 8197747 +CeladonCity_Gym_Text_LoriIntro:: @ 8197747 .string "Pleased to meet you.\n" .string "My hobby is POKéMON training.$" -Text_19777A:: @ 819777A +CeladonCity_Gym_Text_LoriDefeat:: @ 819777A .string "Oh!\n" .string "Splendid!$" -gUnknown_8197788:: @ 8197788 +CeladonCity_Gym_Text_LoriPostBattle:: @ 8197788 .string "I have a blind date coming up.\n" .string "I have to learn to be polite,\l" .string "especially if I have to battle.$" -Text_1977E5:: @ 81977E5 +CeladonCity_Gym_Text_MaryIntro:: @ 81977E5 .string "Welcome to CELADON GYM!\p" .string "You'd better not underestimate\n" .string "the nice ladies here.$" -Text_197832:: @ 8197832 +CeladonCity_Gym_Text_MaryDefeat:: @ 8197832 .string "Oh!\n" .string "Beaten!$" -gUnknown_819783E:: @ 819783E +CeladonCity_Gym_Text_MaryPostBattle:: @ 819783E .string "I didn't bring my best POKéMON.\n" .string "Wait until next time!$" -gUnknown_8197874:: @ 8197874 +CeladonCity_Gym_Text_GymStatue:: @ 8197874 .string "CELADON POKéMON GYM\n" .string "LEADER: ERIKA\p" .string "WINNING TRAINERS:\n" .string "{RIVAL}$" -gUnknown_81978AB:: @ 81978AB +CeladonCity_Gym_Text_GymStatuePlayerWon:: @ 81978AB .string "CELADON POKéMON GYM\n" .string "LEADER: ERIKA\p" .string "WINNING TRAINERS:\n" diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json index 6ab82e945..80b4df1cd 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Hotel_EventScript_16D284", + "script": "CeladonCity_Hotel_EventScript_Receptionist", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Hotel_EventScript_16D28D", + "script": "CeladonCity_Hotel_EventScript_Beauty", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Hotel_EventScript_16D296", + "script": "CeladonCity_Hotel_EventScript_BeautyBoyfriend", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Hotel_EventScript_16D29F", + "script": "CeladonCity_Hotel_EventScript_BeautyBrother", "flag": "0" } ], diff --git a/data/maps/CeladonCity_Hotel/scripts.inc b/data/maps/CeladonCity_Hotel/scripts.inc index 4f136bad3..be366a705 100644 --- a/data/maps/CeladonCity_Hotel/scripts.inc +++ b/data/maps/CeladonCity_Hotel/scripts.inc @@ -1,18 +1,18 @@ CeladonCity_Hotel_MapScripts:: @ 816D283 .byte 0 -CeladonCity_Hotel_EventScript_16D284:: @ 816D284 - msgbox gUnknown_8197B77, MSGBOX_NPC +CeladonCity_Hotel_EventScript_Receptionist:: @ 816D284 + msgbox CeladonCity_Hotel_Text_ThisHotelIsForPeople, MSGBOX_NPC end -CeladonCity_Hotel_EventScript_16D28D:: @ 816D28D - msgbox gUnknown_8197BBE, MSGBOX_NPC +CeladonCity_Hotel_EventScript_Beauty:: @ 816D28D + msgbox CeladonCity_Hotel_Text_OnVacationWithBrotherAndBoyfriend, MSGBOX_NPC end -CeladonCity_Hotel_EventScript_16D296:: @ 816D296 - msgbox gUnknown_8197C0C, MSGBOX_NPC +CeladonCity_Hotel_EventScript_BeautyBoyfriend:: @ 816D296 + msgbox CeladonCity_Hotel_Text_WhyDidSheBringBrother, MSGBOX_NPC end -CeladonCity_Hotel_EventScript_16D29F:: @ 816D29F - msgbox gUnknown_8197C30, MSGBOX_NPC +CeladonCity_Hotel_EventScript_BeautyBrother:: @ 816D29F + msgbox CeladonCity_Hotel_Text_SisBroughtMeOnVacation, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_Hotel/text.inc b/data/maps/CeladonCity_Hotel/text.inc index b1c989120..3932c4633 100644 --- a/data/maps/CeladonCity_Hotel/text.inc +++ b/data/maps/CeladonCity_Hotel/text.inc @@ -1,21 +1,22 @@ -Text_197B6F:: @ 8197B6F +@ Odd, doesnt seem to be corresponding text in RB. Unclear what this was meant for +Text_BuddhistAltar:: @ 8197B6F .string "ぶつだん だ‥$" -gUnknown_8197B77:: @ 8197B77 +CeladonCity_Hotel_Text_ThisHotelIsForPeople:: @ 8197B77 .string "POKéMON?\n" .string "No, this is a hotel for people.\p" .string "We're full up, unfortunately.$" -gUnknown_8197BBE:: @ 8197BBE +CeladonCity_Hotel_Text_OnVacationWithBrotherAndBoyfriend:: @ 8197BBE .string "I'm on vacation with my brother and\n" .string "boyfriend.\p" .string "CELADON is such a pretty city!$" -gUnknown_8197C0C:: @ 8197C0C +CeladonCity_Hotel_Text_WhyDidSheBringBrother:: @ 8197C0C .string "Why?\n" .string "Why did she bring her brother?$" -gUnknown_8197C30:: @ 8197C30 +CeladonCity_Hotel_Text_SisBroughtMeOnVacation:: @ 8197C30 .string "Yippee! I'm on vacation!\n" .string "My sis brought me along! Awesome!$" diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json index 455e9d836..0fccecd67 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_House1_EventScript_16D268", + "script": "CeladonCity_House1_EventScript_RocketChief", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 5, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_House1_EventScript_16D271", + "script": "CeladonCity_House1_EventScript_Rocket1", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 5, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_House1_EventScript_16D27A", + "script": "CeladonCity_House1_EventScript_Rocket2", "flag": "0" } ], diff --git a/data/maps/CeladonCity_House1/scripts.inc b/data/maps/CeladonCity_House1/scripts.inc index 6c8dab4ff..4a05ae97d 100644 --- a/data/maps/CeladonCity_House1/scripts.inc +++ b/data/maps/CeladonCity_House1/scripts.inc @@ -1,14 +1,14 @@ CeladonCity_House1_MapScripts:: @ 816D267 .byte 0 -CeladonCity_House1_EventScript_16D268:: @ 816D268 - msgbox gUnknown_8197A9F, MSGBOX_NPC +CeladonCity_House1_EventScript_RocketChief:: @ 816D268 + msgbox CeladonCity_House1_Text_SlotsReelInTheDough, MSGBOX_NPC end -CeladonCity_House1_EventScript_16D271:: @ 816D271 - msgbox gUnknown_8197AD3, MSGBOX_NPC +CeladonCity_House1_EventScript_Rocket1:: @ 816D271 + msgbox CeladonCity_House1_Text_ShippedMonsAsSlotPrizes, MSGBOX_NPC end -CeladonCity_House1_EventScript_16D27A:: @ 816D27A - msgbox gUnknown_8197B20, MSGBOX_NPC +CeladonCity_House1_EventScript_Rocket2:: @ 816D27A + msgbox CeladonCity_House1_Text_DontTouchGameCornerPoster, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_House1/text.inc b/data/maps/CeladonCity_House1/text.inc index df6acb986..49bf8e3fe 100644 --- a/data/maps/CeladonCity_House1/text.inc +++ b/data/maps/CeladonCity_House1/text.inc @@ -1,15 +1,15 @@ -gUnknown_8197A9F:: @ 8197A9F +CeladonCity_House1_Text_SlotsReelInTheDough:: @ 8197A9F .string "Hehehe!\p" .string "The slots just reel in the dough,\n" .string "big-time!$" -gUnknown_8197AD3:: @ 8197AD3 +CeladonCity_House1_Text_ShippedMonsAsSlotPrizes:: @ 8197AD3 .string "CHIEF!\p" .string "We just shipped two thousand\n" .string "more POKéMON as slot prizes\l" .string "again today!$" -gUnknown_8197B20:: @ 8197B20 +CeladonCity_House1_Text_DontTouchGameCornerPoster:: @ 8197B20 .string "Don't touch the poster at the GAME\n" .string "CORNER!\p" .string "There's no secret switch behind it!$" diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index 7d2af91a9..c37be2dc6 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_PokemonCenter_1F_EventScript_16C5FB", + "script": "CeladonCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_PokemonCenter_1F_EventScript_16C604", + "script": "CeladonCity_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_PokemonCenter_1F_EventScript_16C60D", + "script": "CeladonCity_PokemonCenter_1F_EventScript_CooltrainerF", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_PokemonCenter_1F_EventScript_16C616", + "script": "CeladonCity_PokemonCenter_1F_EventScript_Youngster", "flag": "0" } ], diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc index 322968550..b98b49824 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc @@ -7,21 +7,21 @@ CeladonCity_PokemonCenter_1F_OnTransition:: @ 816C5F7 setrespawn SPAWN_CELADON_CITY end -CeladonCity_PokemonCenter_1F_EventScript_16C5FB:: @ 816C5FB +CeladonCity_PokemonCenter_1F_EventScript_Nurse:: @ 816C5FB lock faceplayer call EventScript_PkmnCenterNurse release end -CeladonCity_PokemonCenter_1F_EventScript_16C604:: @ 816C604 - msgbox gUnknown_819685B, MSGBOX_NPC +CeladonCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816C604 + msgbox CeladonCity_PokemonCenter_1F_Text_PokeFluteAwakensSleepingMons, MSGBOX_NPC end -CeladonCity_PokemonCenter_1F_EventScript_16C60D:: @ 816C60D - msgbox gUnknown_81968C2, MSGBOX_NPC +CeladonCity_PokemonCenter_1F_EventScript_CooltrainerF:: @ 816C60D + msgbox CeladonCity_PokemonCenter_1F_Text_RodeHereFromFuchsia, MSGBOX_NPC end -CeladonCity_PokemonCenter_1F_EventScript_16C616:: @ 816C616 - msgbox gUnknown_8196913, MSGBOX_NPC +CeladonCity_PokemonCenter_1F_EventScript_Youngster:: @ 816C616 + msgbox CeladonCity_PokemonCenter_1F_Text_GoToCyclingRoadIfIHadBike, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_PokemonCenter_1F/text.inc b/data/maps/CeladonCity_PokemonCenter_1F/text.inc index 098582351..6aa628f39 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/text.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/text.inc @@ -1,15 +1,15 @@ -gUnknown_819685B:: @ 819685B +CeladonCity_PokemonCenter_1F_Text_PokeFluteAwakensSleepingMons:: @ 819685B .string "A POKé FLUTE awakens sleeping\n" .string "POKéMON. You know that.\p" .string "It does so with a sound that only\n" .string "they can hear.$" -gUnknown_81968C2:: @ 81968C2 +CeladonCity_PokemonCenter_1F_Text_RodeHereFromFuchsia:: @ 81968C2 .string "I rode here from FUCHSIA.\p" .string "It's an uphill ride on CYCLING\n" .string "ROAD, so I'm exhausted.$" -gUnknown_8196913:: @ 8196913 +CeladonCity_PokemonCenter_1F_Text_GoToCyclingRoadIfIHadBike:: @ 8196913 .string "If I had a BIKE, I would go to\n" .string "CYCLING ROAD!$" diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json index 9681ddfb2..dafc84778 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Restaurant_EventScript_16D1EB", + "script": "CeladonCity_Restaurant_EventScript_Chef", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 2, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Restaurant_EventScript_16D1F4", + "script": "CeladonCity_Restaurant_EventScript_Woman", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Restaurant_EventScript_16D25E", + "script": "CeladonCity_Restaurant_EventScript_FatMan", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Restaurant_EventScript_16D1FD", + "script": "CeladonCity_Restaurant_EventScript_CoinCaseMan", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Restaurant_EventScript_16D255", + "script": "CeladonCity_Restaurant_EventScript_WorkerM", "flag": "0" } ], diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index c8ab9469a..9613406e4 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -1,41 +1,41 @@ CeladonCity_Restaurant_MapScripts:: @ 816D1EA .byte 0 -CeladonCity_Restaurant_EventScript_16D1EB:: @ 816D1EB - msgbox gUnknown_81978E6, MSGBOX_NPC +CeladonCity_Restaurant_EventScript_Chef:: @ 816D1EB + msgbox CeladonCity_Restaurant_Text_TakingBreakRightNow, MSGBOX_NPC end -CeladonCity_Restaurant_EventScript_16D1F4:: @ 816D1F4 - msgbox gUnknown_8197915, MSGBOX_NPC +CeladonCity_Restaurant_EventScript_Woman:: @ 816D1F4 + msgbox CeladonCity_Restaurant_Text_OftenGoToDrugstore, MSGBOX_NPC end -CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD +CeladonCity_Restaurant_EventScript_CoinCaseMan:: @ 816D1FD lock faceplayer - goto_if_set FLAG_GOT_COIN_CASE, EventScript_16D24B - msgbox gUnknown_81979C1 + goto_if_set FLAG_GOT_COIN_CASE, CeladonCity_Restaurant_EventScript_AlreadyGotCoinCase + msgbox CeladonCity_Restaurant_Text_TakeThisImBusted checkitemspace ITEM_COIN_CASE, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16D241 - giveitem_msg gUnknown_8197A38, ITEM_COIN_CASE + goto_if_eq CeladonCity_Restaurant_EventScript_NoRoomForCoinCase + giveitem_msg CeladonCity_Restaurant_Text_ReceivedCoinCaseFromMan, ITEM_COIN_CASE setflag FLAG_GOT_COIN_CASE release end -EventScript_16D241:: @ 816D241 - msgbox gUnknown_8197A5E +CeladonCity_Restaurant_EventScript_NoRoomForCoinCase:: @ 816D241 + msgbox CeladonCity_Restaurant_Text_MakeRoomForThis release end -EventScript_16D24B:: @ 816D24B - msgbox gUnknown_8197A72 +CeladonCity_Restaurant_EventScript_AlreadyGotCoinCase:: @ 816D24B + msgbox CeladonCity_Restaurant_Text_ThoughtIdWinItBack release end -CeladonCity_Restaurant_EventScript_16D255:: @ 816D255 - msgbox gUnknown_8197952, MSGBOX_NPC +CeladonCity_Restaurant_EventScript_WorkerM:: @ 816D255 + msgbox CeladonCity_Restaurant_Text_PsstBasementUnderGameCorner, MSGBOX_NPC end -CeladonCity_Restaurant_EventScript_16D25E:: @ 816D25E - msgbox gUnknown_819798A, MSGBOX_NPC +CeladonCity_Restaurant_EventScript_FatMan:: @ 816D25E + msgbox CeladonCity_Restaurant_Text_ManLostItAllAtSlots, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_Restaurant/text.inc b/data/maps/CeladonCity_Restaurant/text.inc index 87edeb186..e6c27c2bd 100644 --- a/data/maps/CeladonCity_Restaurant/text.inc +++ b/data/maps/CeladonCity_Restaurant/text.inc @@ -1,22 +1,22 @@ -gUnknown_81978E6:: @ 81978E6 +CeladonCity_Restaurant_Text_TakingBreakRightNow:: @ 81978E6 .string "Hi!\p" .string "Sorry, but we're taking a break\n" .string "right now.$" -gUnknown_8197915:: @ 8197915 +CeladonCity_Restaurant_Text_OftenGoToDrugstore:: @ 8197915 .string "My POKéMON are weak, so I often\n" .string "have to go to the DRUGSTORE.$" -gUnknown_8197952:: @ 8197952 +CeladonCity_Restaurant_Text_PsstBasementUnderGameCorner:: @ 8197952 .string "Psst! There's a basement under the\n" .string "GAME CORNER, I hear.$" -gUnknown_819798A:: @ 819798A +CeladonCity_Restaurant_Text_ManLostItAllAtSlots:: @ 819798A .string "Munch…\p" .string "The man at that table lost it all\n" .string "at the slots.$" -gUnknown_81979C1:: @ 81979C1 +CeladonCity_Restaurant_Text_TakeThisImBusted:: @ 81979C1 .string "Go ahead! Laugh!\n" .string "I'm flat-out busted!\p" .string "No more slots for me!\n" @@ -24,14 +24,14 @@ gUnknown_81979C1:: @ 81979C1 .string "Here!\n" .string "I won't be needing this anymore!$" -gUnknown_8197A38:: @ 8197A38 +CeladonCity_Restaurant_Text_ReceivedCoinCaseFromMan:: @ 8197A38 .string "{PLAYER} received a COIN CASE\n" .string "from the man.$" -gUnknown_8197A5E:: @ 8197A5E +CeladonCity_Restaurant_Text_MakeRoomForThis:: @ 8197A5E .string "Make room for this!$" -gUnknown_8197A72:: @ 8197A72 +CeladonCity_Restaurant_Text_ThoughtIdWinItBack:: @ 8197A72 .string "I always thought I was going to\n" .string "win it back…$" diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index 6fe5607dd..1564717c0 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -92,12 +92,12 @@ VermilionCity_PokemonCenter_1F_EventScript_PokemonJournalLtSurge:: @ 81ACE83 releaseall end -CeladonCity_Condominiums_2F_EventScript_1ACE9D:: @ 81ACE9D +CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika:: @ 81ACE9D lock faceplayer famechecker FAMECHECKER_ERIKA, 5 textcolor 3 - msgbox gUnknown_81B161B + msgbox PokemonJournal_Text_SpecialFeatureErika release end @@ -227,11 +227,11 @@ SaffronCity_EventScript_1AD03A:: @ 81AD03A release end -CeladonCity_DepartmentStore_2F_EventScript_1AD053:: @ 81AD053 +CeladonCity_DepartmentStore_2F_EventScript_Woman:: @ 81AD053 lock faceplayer famechecker FAMECHECKER_LANCE, 3 - msgbox Text_19566B + msgbox CeladonCity_DepartmentStore_2F_Text_LanceComesToBuyCapes release end diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc new file mode 100644 index 000000000..906744fa8 --- /dev/null +++ b/data/scripts/trainer_card.inc @@ -0,0 +1,384 @@ +CeladonCity_GameCorner_EventScript_PhotoPrinter:: @ 81B2867 + lockall + showmoneybox 0, 0, 0 + msgbox gUnknown_81B1D7D, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq EventScript_1B2926 + checkmoney 50, 0 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_1B292B + playse SE_SHOP + removemoney 50, 0 + updatemoneybox 0, 0, 0 + waitse + message gUnknown_81B1E24 + waitmessage + multichoice 21, 0, MULTICHOICE_TRAINER_CARD_ICON_TINT, TRUE + switch VAR_RESULT + case 0, EventScript_1B28DB + case 1, EventScript_1B28E6 + case 2, EventScript_1B28F1 + case 3, EventScript_1B28FC + end + +EventScript_1B28DB:: @ 81B28DB + setvar VAR_0x8004, 0 + goto EventScript_1B2907 + end + +EventScript_1B28E6:: @ 81B28E6 + setvar VAR_0x8004, 1 + goto EventScript_1B2907 + end + +EventScript_1B28F1:: @ 81B28F1 + setvar VAR_0x8004, 2 + goto EventScript_1B2907 + end + +EventScript_1B28FC:: @ 81B28FC + setvar VAR_0x8004, 3 + goto EventScript_1B2907 + end + +EventScript_1B2907:: @ 81B2907 + message gUnknown_81B1E42 + waitmessage + playse MUS_ME_PHOTO + dofieldeffect FLDEFF_UNK_45 + delay 60 + special Special_UpdateTrainerCardPhotoIcons + msgbox gUnknown_81B1E7D + hidemoneybox 0, 0 + releaseall + end + +EventScript_1B2926:: @ 81B2926 + hidemoneybox 0, 0 + releaseall + end + +EventScript_1B292B:: @ 81B292B + msgbox gUnknown_81B1E07 + hidemoneybox 0, 0 + releaseall + end + +FourIsland_House2_EventScript_1B2938:: @ 81B2938 + lock + specialvar VAR_0x8008, Special_StickerLadyGetBragFlags + goto_if_unset FLAG_MET_STICKER_LADY, EventScript_1B2951 + goto_if_set FLAG_MET_STICKER_LADY, EventScript_1B2994 + end + +EventScript_1B2951:: @ 81B2951 + setflag FLAG_MET_STICKER_LADY + msgbox gUnknown_81B1EB3 + applymovement 1, Movement_FacePlayer + waitmovement 0 + playse SE_PIN + applymovement 1, Movement_ExclamationMark + waitmovement 0 + applymovement 1, Movement_Delay48 + waitmovement 0 + compare VAR_0x8008, 0 + goto_if_eq EventScript_1B2B8E + message gUnknown_81B1EF8 + waitmessage + goto EventScript_1B29D0 + end + +EventScript_1B2994:: @ 81B2994 + applymovement 1, Movement_FacePlayer + waitmovement 0 + goto_if_questlog EventScript_ReleaseEnd + special sub_8112364 + compare VAR_0x8008, 0 + goto_if_eq EventScript_1B29C6 + message gUnknown_81B2025 + waitmessage + goto EventScript_1B29D0 + end + +EventScript_1B29C6:: @ 81B29C6 + msgbox gUnknown_81B1FEF + release + end + +EventScript_1B29D0:: @ 81B29D0 + switch VAR_0x8008 + case 1, EventScript_1B2A23 + case 2, EventScript_1B2A4F + case 4, EventScript_1B2A7B + case 3, EventScript_1B2AA7 + case 5, EventScript_1B2ADE + case 6, EventScript_1B2B15 + case 7, EventScript_1B2B4C + end + +EventScript_1B2A23:: @ 81B2A23 + multichoice 15, 8, MULTICHOICE_HOF_QUIT, FALSE + switch VAR_RESULT + case 0, EventScript_1B2B98 + case 1, EventScript_1B2DF6 + case SCR_MENU_CANCEL, EventScript_1B2DF6 + end + +EventScript_1B2A4F:: @ 81B2A4F + multichoice 16, 8, MULTICHOICE_EGGS_QUIT, FALSE + switch VAR_RESULT + case 0, EventScript_1B2C62 + case 1, EventScript_1B2DF6 + case SCR_MENU_CANCEL, EventScript_1B2DF6 + end + +EventScript_1B2A7B:: @ 81B2A7B + multichoice 15, 8, MULTICHOICE_VICTORIES_QUIT, FALSE + switch VAR_RESULT + case 0, EventScript_1B2D2C + case 1, EventScript_1B2DF6 + case SCR_MENU_CANCEL, EventScript_1B2DF6 + end + +EventScript_1B2AA7:: @ 81B2AA7 + multichoice 15, 6, MULTICHOICE_HOF_EGGS_QUIT, FALSE + switch VAR_RESULT + case 0, EventScript_1B2B98 + case 1, EventScript_1B2C62 + case 2, EventScript_1B2DF6 + case SCR_MENU_CANCEL, EventScript_1B2DF6 + end + +EventScript_1B2ADE:: @ 81B2ADE + multichoice 15, 6, MULTICHOICE_HOF_VICTORIES_QUIT, FALSE + switch VAR_RESULT + case 0, EventScript_1B2B98 + case 1, EventScript_1B2D2C + case 2, EventScript_1B2DF6 + case SCR_MENU_CANCEL, EventScript_1B2DF6 + end + +EventScript_1B2B15:: @ 81B2B15 + multichoice 15, 6, MULTICHOICE_EGGS_VICTORIES_QUIT, FALSE + switch VAR_RESULT + case 0, EventScript_1B2C62 + case 1, EventScript_1B2D2C + case 2, EventScript_1B2DF6 + case SCR_MENU_CANCEL, EventScript_1B2DF6 + end + +EventScript_1B2B4C:: @ 81B2B4C + multichoice 15, 5, MULTICHOICE_HOF_EGGS_VICTORIES_QUIT, FALSE + switch VAR_RESULT + case 0, EventScript_1B2B98 + case 1, EventScript_1B2C62 + case 2, EventScript_1B2D2C + case 3, EventScript_1B2DF6 + case SCR_MENU_CANCEL, EventScript_1B2DF6 + end + +EventScript_1B2B8E:: @ 81B2B8E + msgbox gUnknown_81B1EF8 + release + end + +EventScript_1B2B98:: @ 81B2B98 + compare VAR_0x8004, 39 + goto_if_le EventScript_1B2BC5 + compare VAR_0x8004, 99 + goto_if_le EventScript_1B2BE3 + compare VAR_0x8004, 199 + goto_if_le EventScript_1B2C01 + compare VAR_0x8004, 200 + goto_if_ge EventScript_1B2C1F + end + +EventScript_1B2BC5:: @ 81B2BC5 + compare VAR_HOF_BRAG_STATE, 1 + goto_if_eq EventScript_1B2C3D + setvar VAR_HOF_BRAG_STATE, 1 + msgbox gUnknown_81B206E + goto EventScript_1B2C51 + +EventScript_1B2BE2:: @ 81B2BE2 + end + +EventScript_1B2BE3:: @ 81B2BE3 + compare VAR_HOF_BRAG_STATE, 2 + goto_if_eq EventScript_1B2C3D + setvar VAR_HOF_BRAG_STATE, 2 + msgbox gUnknown_81B20CF + goto EventScript_1B2C51 + +EventScript_1B2C00:: @ 81B2C00 + end + +EventScript_1B2C01:: @ 81B2C01 + compare VAR_HOF_BRAG_STATE, 3 + goto_if_eq EventScript_1B2C3D + setvar VAR_HOF_BRAG_STATE, 3 + msgbox gUnknown_81B2133 + goto EventScript_1B2C51 + +EventScript_1B2C1E:: @ 81B2C1E + end + +EventScript_1B2C1F:: @ 81B2C1F + compare VAR_HOF_BRAG_STATE, 4 + goto_if_eq EventScript_1B2C47 + setvar VAR_HOF_BRAG_STATE, 4 + msgbox gUnknown_81B21C4 + goto EventScript_1B2C51 + +EventScript_1B2C3C:: @ 81B2C3C + end + +EventScript_1B2C3D:: @ 81B2C3D + msgbox gUnknown_81B227C + release + end + +EventScript_1B2C47:: @ 81B2C47 + msgbox gUnknown_81B22B0 + release + end + +EventScript_1B2C51:: @ 81B2C51 + textcolor 3 + playfanfare MUS_FANFA1 + message gUnknown_81B2242 + waitmessage + waitfanfare + delay 90 + release + end + +EventScript_1B2C62:: @ 81B2C62 + compare VAR_0x8005, 99 + goto_if_le EventScript_1B2C8F + compare VAR_0x8005, 199 + goto_if_le EventScript_1B2CAD + compare VAR_0x8005, 299 + goto_if_le EventScript_1B2CCB + compare VAR_0x8005, 300 + goto_if_ge EventScript_1B2CE9 + end + +EventScript_1B2C8F:: @ 81B2C8F + compare VAR_EGG_BRAG_STATE, 1 + goto_if_eq EventScript_1B2D07 + setvar VAR_EGG_BRAG_STATE, 1 + msgbox gUnknown_81B2308 + goto EventScript_1B2D1B + end + +EventScript_1B2CAD:: @ 81B2CAD + compare VAR_EGG_BRAG_STATE, 2 + goto_if_eq EventScript_1B2D07 + setvar VAR_EGG_BRAG_STATE, 2 + msgbox gUnknown_81B2372 + goto EventScript_1B2D1B + end + +EventScript_1B2CCB:: @ 81B2CCB + compare VAR_EGG_BRAG_STATE, 3 + goto_if_eq EventScript_1B2D07 + setvar VAR_EGG_BRAG_STATE, 3 + msgbox gUnknown_81B23E0 + goto EventScript_1B2D1B + end + +EventScript_1B2CE9:: @ 81B2CE9 + compare VAR_EGG_BRAG_STATE, 4 + goto_if_eq EventScript_1B2D11 + setvar VAR_EGG_BRAG_STATE, 4 + msgbox gUnknown_81B2448 + goto EventScript_1B2D1B + end + +EventScript_1B2D07:: @ 81B2D07 + msgbox gUnknown_81B251B + release + end + +EventScript_1B2D11:: @ 81B2D11 + msgbox gUnknown_81B254F + release + end + +EventScript_1B2D1B:: @ 81B2D1B + textcolor 3 + playfanfare MUS_FANFA1 + message gUnknown_81B24EA + waitmessage + waitfanfare + delay 90 + release + end + +EventScript_1B2D2C:: @ 81B2D2C + compare VAR_0x8006, 19 + goto_if_le EventScript_1B2D59 + compare VAR_0x8006, 49 + goto_if_le EventScript_1B2D77 + compare VAR_0x8006, 99 + goto_if_le EventScript_1B2D95 + compare VAR_0x8006, 100 + goto_if_ge EventScript_1B2DB3 + end + +EventScript_1B2D59:: @ 81B2D59 + compare VAR_LINK_WIN_BRAG_STATE, 1 + goto_if_eq EventScript_1B2DD1 + setvar VAR_LINK_WIN_BRAG_STATE, 1 + msgbox gUnknown_81B25A7 + goto EventScript_1B2DE5 + end + +EventScript_1B2D77:: @ 81B2D77 + compare VAR_LINK_WIN_BRAG_STATE, 2 + goto_if_eq EventScript_1B2DD1 + setvar VAR_LINK_WIN_BRAG_STATE, 2 + msgbox gUnknown_81B2609 + goto EventScript_1B2DE5 + end + +EventScript_1B2D95:: @ 81B2D95 + compare VAR_LINK_WIN_BRAG_STATE, 3 + goto_if_eq EventScript_1B2DD1 + setvar VAR_LINK_WIN_BRAG_STATE, 3 + msgbox gUnknown_81B267B + goto EventScript_1B2DE5 + end + +EventScript_1B2DB3:: @ 81B2DB3 + compare VAR_LINK_WIN_BRAG_STATE, 4 + goto_if_eq EventScript_1B2DDB + setvar VAR_LINK_WIN_BRAG_STATE, 4 + msgbox gUnknown_81B26F6 + goto EventScript_1B2DE5 + end + +EventScript_1B2DD1:: @ 81B2DD1 + msgbox gUnknown_81B27DB + release + end + +EventScript_1B2DDB:: @ 81B2DDB + msgbox gUnknown_81B280F + release + end + +EventScript_1B2DE5:: @ 81B2DE5 + textcolor 3 + playfanfare MUS_FANFA1 + message gUnknown_81B27A6 + waitmessage + waitfanfare + delay 90 + release + end + +EventScript_1B2DF6:: @ 81B2DF6 + release + end diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc index 8be9aec80..252c5ce7d 100644 --- a/data/text/fame_checker.inc +++ b/data/text/fame_checker.inc @@ -1396,7 +1396,7 @@ PokemonJournal_Text_SpecialFeatureLtSurge:: @ 81B1558 .string "He used the electricity generated\n" .string "by POKéMON to power his plane.$" -gUnknown_81B161B:: @ 81B161B +PokemonJournal_Text_SpecialFeatureErika:: @ 81B161B .string "POKéMON JOURNAL\p" .string "Special Feature: CELADON GYM\n" .string "LEADER ERIKA!\p" @@ -1485,198 +1485,3 @@ PokemonJournal_Text_SpecialFeatureMrFuji:: @ 81B1BD1 .string "down our interview requests.\p" .string "He is a kindly man who is adored\n" .string "and respected in LAVENDER TOWN.$" - -gUnknown_81B1C8B:: @ 81B1C8B - .string "Hmm…\n" - .string "Is that right…$" - -gUnknown_81B1C9F:: @ 81B1C9F - .string "Oh!\n" - .string "Look, look!$" - -gUnknown_81B1CAF:: @ 81B1CAF - .string "Read it, read it!$" - -gUnknown_81B1CC1:: @ 81B1CC1 - .string "TRAINER TIPS\p" - .string "Press START to open the MENU!$" - -gUnknown_81B1CEC:: @ 81B1CEC - .string "Signs are useful, aren't they?$" - -gUnknown_81B1D0B:: @ 81B1D0B - .string "Look, look!\p" - .string "I copied what it said on one of\n" - .string "those TRAINER TIPS signs!$" - -gUnknown_81B1D51:: @ 81B1D51 - .string "TRAINER TIPS!\p" - .string "Press START to open the MENU!$" - -gUnknown_81B1D7D:: @ 81B1D7D - .string "It's a POKéMON PRINTER!\p" - .string "It can put a print of your POKéMON\n" - .string "on the back of your TRAINER CARD.\p" - .string "It costs only ¥50.\n" - .string "Would you like to try it?$" - -gUnknown_81B1E07:: @ 81B1E07 - .string "You don't have enough money.$" - -gUnknown_81B1E24:: @ 81B1E24 - .string "Please choose the print type.$" - -gUnknown_81B1E42:: @ 81B1E42 - .string "A big smile for the photo, please!\n" - .string "Three… Two… One…\p" - .string "Flash!$" - -gUnknown_81B1E7D:: @ 81B1E7D - .string "Your POKéMON print is ready!\n" - .string "Check your TRAINER CARD.$" - -gUnknown_81B1EB3:: @ 81B1EB3 - .string "Giggle…\n" - .string "I collected a ton of STICKERS.\l" - .string "I wish I could show them off…$" - -gUnknown_81B1EF8:: @ 81B1EF8 - .string "Oh, excellent!\n" - .string "You've come to the right place!\p" - .string "Look, look! See? See?\n" - .string "These are my STICKERS!\l" - .string "Look how many I got!\p" - .string "I bet you want some.\n" - .string "I bet you do!\p" - .string "I'll give a STICKER if you can tell\n" - .string "me something awesome about\l" - .string "yourself.\p" - .string "What will you brag about?$" - -gUnknown_81B1FEF:: @ 81B1FEF - .string "Brag about something for me.\n" - .string "I'll give you a STICKER.$" - -gUnknown_81B2025:: @ 81B2025 - .string "Oh, hi!\n" - .string "Here comes the braggart.\p" - .string "What are you going to brag about\n" - .string "today?$" - -gUnknown_81B206E:: @ 81B206E - .string "Oh, wow, you made it into the\n" - .string "HALL OF FAME.\p" - .string "That's pretty good, yup!\n" - .string "I'll give you one of these.$" - -gUnknown_81B20CF:: @ 81B20CF - .string "Oh, wow, you've entered the\n" - .string "HALL OF FAME often!\p" - .string "That's impressive, yup!\n" - .string "I'll give you one of these.$" - -gUnknown_81B2133:: @ 81B2133 - .string "Whoa! You've made it into the\n" - .string "HALL OF FAME that often?\l" - .string "That's seriously incredible, yup!\p" - .string "You own the POKéMON LEAGUE!\n" - .string "I'll give you one of these.$" - -gUnknown_81B21C4:: @ 81B21C4 - .string "No way! You've gone into the\n" - .string "HALL OF FAME that many times?\p" - .string "You're beyond incredible, yup!\n" - .string "That's it, I have to give you this.$" - -gUnknown_81B2242:: @ 81B2242 - .string "The HALL OF FAME STICKER was\n" - .string "applied to the TRAINER CARD.$" - -gUnknown_81B227C:: @ 81B227C - .string "Hmm…\p" - .string "Come back with a better story next\n" - .string "time, okay?$" - -gUnknown_81B22B0:: @ 81B22B0 - .string "Oh, no, no can do.\p" - .string "You're practically a living legend.\n" - .string "I have no SITCKERS left to give.$" - -gUnknown_81B2308:: @ 81B2308 - .string "Oh, wow, there are POKéMON EGGS?\n" - .string "I didn't know that!\p" - .string "That's pretty good, yup!\n" - .string "I'll give you one of these.$" - -gUnknown_81B2372:: @ 81B2372 - .string "You've hatched that many EGGS?\n" - .string "You really must like them!\p" - .string "That's impressive, yup!\n" - .string "I'll give you one of these.$" - -gUnknown_81B23E0:: @ 81B23E0 - .string "Whoa! You've hatched a whole\n" - .string "bunch of EGGS!\p" - .string "You're an EGG-hatching machine!\n" - .string "I'll give you one of these.$" - -gUnknown_81B2448:: @ 81B2448 - .string "Wh… You hatched that many EGGS?\p" - .string "What's behind your love of EGGS?\n" - .string "It's beyond incredible, yup!\p" - .string "You're too awesome, I tell you.\n" - .string "That's it, I have to give you this.$" - -gUnknown_81B24EA:: @ 81B24EA - .string "The EGG STICKER was applied\n" - .string "to the TRAINER CARD.$" - -gUnknown_81B251B:: @ 81B251B - .string "Hmm…\p" - .string "Come back with a better story next\n" - .string "time, okay?$" - -gUnknown_81B254F:: @ 81B254F - .string "Oh, no, no can do.\p" - .string "You're practically a living legend.\n" - .string "I have no SITCKERS left to give.$" - -gUnknown_81B25A7:: @ 81B25A7 - .string "Oh, wow, you've had success\n" - .string "link battling?\p" - .string "You're pretty strong, yup!\n" - .string "I'll give you one of these.$" - -gUnknown_81B2609:: @ 81B2609 - .string "You've beaten your friends a lot\n" - .string "link battling, huh?\p" - .string "You're impressively strong, yup!\n" - .string "I'll give you one of these.$" - -gUnknown_81B267B:: @ 81B267B - .string "Whoa! You've beaten your friends\n" - .string "a frightful number of times.\p" - .string "Have you lost friends over this?\n" - .string "I'll give you one of these.$" - -gUnknown_81B26F6:: @ 81B26F6 - .string "Wh… Wickedly whoa!\n" - .string "You've won mind-blowingly often!\p" - .string "It just knocks me out thinking\n" - .string "about how tough you are.\p" - .string "You're the stuff of nightmares!\n" - .string "That's it, I have to give you this.$" - -gUnknown_81B27A6:: @ 81B27A6 - .string "The VICTORY STICKER was applied\n" - .string "to the TRAINER CARD.$" - -gUnknown_81B27DB:: @ 81B27DB - .string "Hmm…\p" - .string "Come back with a better story next\n" - .string "time, okay?$" - -gUnknown_81B280F:: @ 81B280F - .string "Oh, no, no can do.\p" - .string "You're practically a living legend.\n" - .string "I have no SITCKERS left to give.$" diff --git a/data/text/trainer_card.inc b/data/text/trainer_card.inc new file mode 100644 index 000000000..3a6557cca --- /dev/null +++ b/data/text/trainer_card.inc @@ -0,0 +1,167 @@ +gUnknown_81B1D7D:: @ 81B1D7D + .string "It's a POKéMON PRINTER!\p" + .string "It can put a print of your POKéMON\n" + .string "on the back of your TRAINER CARD.\p" + .string "It costs only ¥50.\n" + .string "Would you like to try it?$" + +gUnknown_81B1E07:: @ 81B1E07 + .string "You don't have enough money.$" + +gUnknown_81B1E24:: @ 81B1E24 + .string "Please choose the print type.$" + +gUnknown_81B1E42:: @ 81B1E42 + .string "A big smile for the photo, please!\n" + .string "Three… Two… One…\p" + .string "Flash!$" + +gUnknown_81B1E7D:: @ 81B1E7D + .string "Your POKéMON print is ready!\n" + .string "Check your TRAINER CARD.$" + +gUnknown_81B1EB3:: @ 81B1EB3 + .string "Giggle…\n" + .string "I collected a ton of STICKERS.\l" + .string "I wish I could show them off…$" + +gUnknown_81B1EF8:: @ 81B1EF8 + .string "Oh, excellent!\n" + .string "You've come to the right place!\p" + .string "Look, look! See? See?\n" + .string "These are my STICKERS!\l" + .string "Look how many I got!\p" + .string "I bet you want some.\n" + .string "I bet you do!\p" + .string "I'll give a STICKER if you can tell\n" + .string "me something awesome about\l" + .string "yourself.\p" + .string "What will you brag about?$" + +gUnknown_81B1FEF:: @ 81B1FEF + .string "Brag about something for me.\n" + .string "I'll give you a STICKER.$" + +gUnknown_81B2025:: @ 81B2025 + .string "Oh, hi!\n" + .string "Here comes the braggart.\p" + .string "What are you going to brag about\n" + .string "today?$" + +gUnknown_81B206E:: @ 81B206E + .string "Oh, wow, you made it into the\n" + .string "HALL OF FAME.\p" + .string "That's pretty good, yup!\n" + .string "I'll give you one of these.$" + +gUnknown_81B20CF:: @ 81B20CF + .string "Oh, wow, you've entered the\n" + .string "HALL OF FAME often!\p" + .string "That's impressive, yup!\n" + .string "I'll give you one of these.$" + +gUnknown_81B2133:: @ 81B2133 + .string "Whoa! You've made it into the\n" + .string "HALL OF FAME that often?\l" + .string "That's seriously incredible, yup!\p" + .string "You own the POKéMON LEAGUE!\n" + .string "I'll give you one of these.$" + +gUnknown_81B21C4:: @ 81B21C4 + .string "No way! You've gone into the\n" + .string "HALL OF FAME that many times?\p" + .string "You're beyond incredible, yup!\n" + .string "That's it, I have to give you this.$" + +gUnknown_81B2242:: @ 81B2242 + .string "The HALL OF FAME STICKER was\n" + .string "applied to the TRAINER CARD.$" + +gUnknown_81B227C:: @ 81B227C + .string "Hmm…\p" + .string "Come back with a better story next\n" + .string "time, okay?$" + +gUnknown_81B22B0:: @ 81B22B0 + .string "Oh, no, no can do.\p" + .string "You're practically a living legend.\n" + .string "I have no SITCKERS left to give.$" + +gUnknown_81B2308:: @ 81B2308 + .string "Oh, wow, there are POKéMON EGGS?\n" + .string "I didn't know that!\p" + .string "That's pretty good, yup!\n" + .string "I'll give you one of these.$" + +gUnknown_81B2372:: @ 81B2372 + .string "You've hatched that many EGGS?\n" + .string "You really must like them!\p" + .string "That's impressive, yup!\n" + .string "I'll give you one of these.$" + +gUnknown_81B23E0:: @ 81B23E0 + .string "Whoa! You've hatched a whole\n" + .string "bunch of EGGS!\p" + .string "You're an EGG-hatching machine!\n" + .string "I'll give you one of these.$" + +gUnknown_81B2448:: @ 81B2448 + .string "Wh… You hatched that many EGGS?\p" + .string "What's behind your love of EGGS?\n" + .string "It's beyond incredible, yup!\p" + .string "You're too awesome, I tell you.\n" + .string "That's it, I have to give you this.$" + +gUnknown_81B24EA:: @ 81B24EA + .string "The EGG STICKER was applied\n" + .string "to the TRAINER CARD.$" + +gUnknown_81B251B:: @ 81B251B + .string "Hmm…\p" + .string "Come back with a better story next\n" + .string "time, okay?$" + +gUnknown_81B254F:: @ 81B254F + .string "Oh, no, no can do.\p" + .string "You're practically a living legend.\n" + .string "I have no SITCKERS left to give.$" + +gUnknown_81B25A7:: @ 81B25A7 + .string "Oh, wow, you've had success\n" + .string "link battling?\p" + .string "You're pretty strong, yup!\n" + .string "I'll give you one of these.$" + +gUnknown_81B2609:: @ 81B2609 + .string "You've beaten your friends a lot\n" + .string "link battling, huh?\p" + .string "You're impressively strong, yup!\n" + .string "I'll give you one of these.$" + +gUnknown_81B267B:: @ 81B267B + .string "Whoa! You've beaten your friends\n" + .string "a frightful number of times.\p" + .string "Have you lost friends over this?\n" + .string "I'll give you one of these.$" + +gUnknown_81B26F6:: @ 81B26F6 + .string "Wh… Wickedly whoa!\n" + .string "You've won mind-blowingly often!\p" + .string "It just knocks me out thinking\n" + .string "about how tough you are.\p" + .string "You're the stuff of nightmares!\n" + .string "That's it, I have to give you this.$" + +gUnknown_81B27A6:: @ 81B27A6 + .string "The VICTORY STICKER was applied\n" + .string "to the TRAINER CARD.$" + +gUnknown_81B27DB:: @ 81B27DB + .string "Hmm…\p" + .string "Come back with a better story next\n" + .string "time, okay?$" + +gUnknown_81B280F:: @ 81B280F + .string "Oh, no, no can do.\p" + .string "You're practically a living legend.\n" + .string "I have no SITCKERS left to give.$" diff --git a/include/constants/coins.h b/include/constants/coins.h new file mode 100644 index 000000000..3ae3bb23f --- /dev/null +++ b/include/constants/coins.h @@ -0,0 +1,6 @@ +#ifndef GUARD_CONSTANTS_COINS_H +#define GUARD_CONSTANTS_COINS_H + +#define MAX_COINS 9999 + +#endif // GUARD_CONSTANTS_COINS_H diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h index 3ed7d8ce2..1fd6777f0 100644 --- a/include/constants/field_effects.h +++ b/include/constants/field_effects.h @@ -65,7 +65,7 @@ #define FLDEFF_PCTURN_ON 61 #define FLDEFF_HALL_OF_FAME_RECORD 62 #define FLDEFF_USE_TELEPORT 63 -#define FLDEFF_UNK_40 64 +#define FLDEFF_UNK_40 64 // TODO: game corner smile icon? #define FLDEFF_UNK_41 65 // TODO: related to vs_seeker #define FLDEFF_UNK_42 66 // TODO: related to trainer see #define FLDEFF_UNK_43 67 // TODO: related to deoxys diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index 1bbc360df..c99e6483b 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -35,6 +35,15 @@ #define METATILE_VermilionGym_Beam_Node_BottomRight_Edge_HalfOn 0x2C6 #define METATILE_VermilionGym_Beam_Node_BottomRight_HalfOn 0x2C7 +// Celadon Game Corner +#define METATILE_GameCorner_Floor_ShadeFull 0x292 +#define METATILE_GameCorner_Floor_StairsTop 0x29D +#define METATILE_GameCorner_StairsTop 0x29E +#define METATILE_GameCorner_StairsBottom 0x29F +#define METATILE_GameCorner_PurpleWall_Floor 0x2CF +#define METATILE_GameCorner_PurpleWall_StairsTop 0x2A6 +#define METATILE_GameCorner_PurpleWall_stairsBottom 0x2A7 + // Pokemon Mansion #define METATILE_PokemonMansion_Floor 0x284 #define METATILE_PokemonMansion_Floor_ShadeFull 0x285 diff --git a/src/coins.c b/src/coins.c index 0f1828a96..fd5000fbd 100644 --- a/src/coins.c +++ b/src/coins.c @@ -4,11 +4,10 @@ #include "menu.h" #include "text_window.h" #include "strings.h" +#include "constants/coins.h" EWRAM_DATA static u8 sCoinsWindowId = 0; -#define MAX_COINS 9999 - u16 GetCoins(void) { return gSaveBlock1Ptr->coins ^ gSaveBlock2Ptr->encryptionKey; |