diff options
307 files changed, 5843 insertions, 5757 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 83f9a5700..b74e60d1f 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -1330,10 +1330,10 @@ _0806D2F0: lsrs r0, 24 cmp r0, 0x1 bne _0806D308 - ldr r0, _0806D304 @ =EventScript_1C549C + ldr r0, _0806D304 @ =TrainerTower_EventScript_ShowTime b _0806D53E .align 2, 0 -_0806D304: .4byte EventScript_1C549C +_0806D304: .4byte TrainerTower_EventScript_ShowTime _0806D308: adds r0, r4, 0 adds r1, r5, 0 diff --git a/asm/macros.inc b/asm/macros.inc index ffbe3db29..0e53dc2a2 100644 --- a/asm/macros.inc +++ b/asm/macros.inc @@ -5,6 +5,7 @@ .include "asm/macros/ec.inc" .include "asm/macros/map.inc" .include "asm/macros/m4a.inc" + .include "asm/macros/trainer_tower.inc" .macro region_map_location x, y, width, height, name .byte \x diff --git a/asm/macros/trainer_tower.inc b/asm/macros/trainer_tower.inc new file mode 100644 index 000000000..8e5f606ee --- /dev/null +++ b/asm/macros/trainer_tower.inc @@ -0,0 +1,133 @@ + @ Sets NPC gfx and the floor layout depending on current challenge and floor + .macro ttower_initfloor + setvar VAR_0x8004, TRAINER_TOWER_FUNC_INIT_FLOOR + special CallTrainerTowerFunc + .endm + + @ Buffers the opponents battle speech to gStringVar4. speech is any TRAINER_TOWER_TEXT_*. + .macro ttower_getspeech speech:req, trainer=0xFF + setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_SPEECH + setvar VAR_0x8005, \speech + .if \trainer >= VARS_START && \trainer != 0xFF + copyvar VAR_0x8006, \trainer + .elseif \trainer != 0xFF + setvar VAR_0x8006, \trainer + .endif + special CallTrainerTowerFunc + .endm + + @ Starts a trainer tower battle. VAR_0x8005 is unused + .macro ttower_dobattle + setvar VAR_0x8004, TRAINER_TOWER_FUNC_DO_BATTLE + setvar VAR_0x8005, 0 + special CallTrainerTowerFunc + .endm + + @ Returns the current challenge type (CHALLENGE_TYPE_*). Mixed challenges use different types for each floor. If VAR_0x8005 is != FALSE, does nothing + .macro ttower_getchallengetype + setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_CHALLENGE_TYPE + setvar VAR_0x8005, FALSE + special CallTrainerTowerFunc + .endm + + @ Adds 1 to the number of floors cleared (all trainers on floor defeated) + .macro ttower_clearedfloor + setvar VAR_0x8004, TRAINER_TOWER_FUNC_CLEARED_FLOOR + special CallTrainerTowerFunc + .endm + + @ TRUE if the trainers on this floor were already beaten, FALSE otherwise + .macro ttower_isfloorcleared + setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_FLOOR_CLEARED + special CallTrainerTowerFunc + .endm + + @ Initializes the Trainer Tower challenge and starts the timer + .macro ttower_startchallenge + setvar VAR_0x8004, TRAINER_TOWER_FUNC_START_CHALLENGE + special CallTrainerTowerFunc + .endm + + @ 0 if not spoken to yet, 1 if spoken to but not received prize, 2 if received prize + .macro ttower_getownerstate + setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_OWNER_STATE + special CallTrainerTowerFunc + .endm + + @ Tries to give prize. 0 if given successfully, 1 if no room for prize, 2 if giving prize should be skipped + .macro ttower_giveprize + setvar VAR_0x8004, TRAINER_TOWER_FUNC_GIVE_PRIZE + special CallTrainerTowerFunc + .endm + + @ Checks the final challenge time. 0 if new record, 1 if not, 2 if time has already been checked + .macro ttower_checkfinaltime + setvar VAR_0x8004, TRAINER_TOWER_FUNC_CHECK_FINAL_TIME + special CallTrainerTowerFunc + .endm + + @ Resumes the challenge timer (or starts, if the timer is 0) + .macro ttower_resumetimer + setvar VAR_0x8004, TRAINER_TOWER_FUNC_RESUME_TIMER + special CallTrainerTowerFunc + .endm + + @ Sets that the player lost the challenge + .macro ttower_setlost + setvar VAR_0x8004, TRAINER_TOWER_FUNC_SET_LOST + special CallTrainerTowerFunc + .endm + + @ Returns the status of the current Trainer Tower challenge (CHALLENGE_STATUS_*) + .macro ttower_getchallengestatus + setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_CHALLENGE_STATUS + special CallTrainerTowerFunc + .endm + + @ Buffers the current challenge time (min in gStringVar1, sec in gStringVar2, fraction sec in gStringVar3) + .macro ttower_gettime + setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_TIME + special CallTrainerTowerFunc + .endm + + @ Unused. Displays Trainer Tower results. Handled by Special_BattleRecords instead + .macro ttower_showresults + setvar VAR_0x8004, TRAINER_TOWER_FUNC_SHOW_RESULTS + special CallTrainerTowerFunc + .endm + + @ Unused. See above + .macro ttower_closeresults + setvar VAR_0x8004, TRAINER_TOWER_FUNC_CLOSE_RESULTS + special CallTrainerTowerFunc + .endm + + @ Returns the eligibility of the players party for a double battle (using GetMonsStateToDoubles) + .macro ttower_checkdoubles + setvar VAR_0x8004, TRAINER_TOWER_FUNC_CHECK_DOUBLES + special CallTrainerTowerFunc + .endm + + @ For the unused E-Reader challenges, gets the number of floors used. Otherwise returns FALSE (all floors used) + .macro ttower_getnumfloors + setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_NUM_FLOORS + special CallTrainerTowerFunc + .endm + + @ Dummied, always returns FALSE + .macro ttower_shouldexit + setvar VAR_0x8004, TRAINER_TOWER_FUNC_SHOULD_WARP_TO_COUNTER + special CallTrainerTowerFunc + .endm + + @ Plays the encounter music for the trainer number in VAR_TEMP_1 + .macro ttower_encountermusic + setvar VAR_0x8004, TRAINER_TOWER_FUNC_ENCOUNTER_MUSIC + special CallTrainerTowerFunc + .endm + + @ TRUE if the player reached the Battle Tower owner, FALSE otherwise + .macro ttower_getbeatchallenge + setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_BEAT_CHALLENGE + special CallTrainerTowerFunc + .endm diff --git a/asm/overworld.s b/asm/overworld.s index f68782acf..5b3c01652 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -1718,7 +1718,7 @@ sub_8055864: @ 8055864 bl sav1_reset_battle_music_maybe bl mapheader_run_script_with_tag_x3 bl TryRegenerateRenewableHiddenItems - bl not_trainer_hill_battle_pyramid + bl InitMap ldr r4, _0805591C @ =gMapHeader ldr r0, [r4] bl copy_map_tileset2_to_vram_2 @@ -1798,7 +1798,7 @@ _08055974: bl UpdateLocationHistoryForRoamer bl RoamerMoveToOtherLocationSet bl sub_8110920 - bl not_trainer_hill_battle_pyramid + bl InitMap pop {r4} pop {r0} bx r0 @@ -1823,7 +1823,7 @@ sub_80559A8: @ 80559A8 bl sub_8110920 bl sub_8111708 bl set_current_map_header_from_sav1 - bl not_trainer_hill_battle_pyramid + bl InitMap pop {r0} bx r0 .align 2, 0 @@ -3843,7 +3843,7 @@ CB2_ContinueSavedGame: @ 8056938 bl sub_80550A8 bl UnfreezeObjectEvents bl sub_8054E40 - bl sub_80589E8 + bl InitMapFromSavedGame bl PlayTimeCounter_Start bl ScriptContext1_Init bl ScriptContext2_Disable @@ -5128,7 +5128,7 @@ sub_8057430: @ 8057430 bl sub_80550A8 bl UnfreezeObjectEvents bl sub_8054E40 - bl sub_80589E8 + bl InitMapFromSavedGame bl PlayTimeCounter_Start bl ScriptContext1_Init ldr r1, _08057488 @ =gUnknown_2031DE0 diff --git a/data/event_scripts.s b/data/event_scripts.s index 2681f52c9..cc5aa4fc9 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -17,10 +17,12 @@ #include "constants/spawn_points.h" #include "constants/field_effects.h" #include "constants/trainers.h" +#include "constants/trainer_tower.h" #include "constants/object_events.h" #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" @@ -209,17 +211,17 @@ gStdScriptsEnd:: .include "data/maps/SixIsland_PatternBush/scripts.inc" .include "data/maps/SixIsland_AlteringCave/scripts.inc" .include "data/maps/NavelRock_Exterior/scripts.inc" - .include "data/maps/SevenIsland_TrainerTower_1F/scripts.inc" - .include "data/maps/SevenIsland_TrainerTower_2F/scripts.inc" - .include "data/maps/SevenIsland_TrainerTower_3F/scripts.inc" - .include "data/maps/SevenIsland_TrainerTower_4F/scripts.inc" - .include "data/maps/SevenIsland_TrainerTower_5F/scripts.inc" - .include "data/maps/SevenIsland_TrainerTower_6F/scripts.inc" - .include "data/maps/SevenIsland_TrainerTower_7F/scripts.inc" - .include "data/maps/SevenIsland_TrainerTower_8F/scripts.inc" - .include "data/maps/SevenIsland_TrainerTower_Roof/scripts.inc" - .include "data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc" - .include "data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc" + .include "data/maps/TrainerTower_1F/scripts.inc" + .include "data/maps/TrainerTower_2F/scripts.inc" + .include "data/maps/TrainerTower_3F/scripts.inc" + .include "data/maps/TrainerTower_4F/scripts.inc" + .include "data/maps/TrainerTower_5F/scripts.inc" + .include "data/maps/TrainerTower_6F/scripts.inc" + .include "data/maps/TrainerTower_7F/scripts.inc" + .include "data/maps/TrainerTower_8F/scripts.inc" + .include "data/maps/TrainerTower_Roof/scripts.inc" + .include "data/maps/TrainerTower_Lobby/scripts.inc" + .include "data/maps/TrainerTower_Elevator/scripts.inc" .include "data/maps/FiveIsland_LostCave_Entrance/scripts.inc" .include "data/maps/FiveIsland_LostCave_Room1/scripts.inc" .include "data/maps/FiveIsland_LostCave_Room2/scripts.inc" @@ -416,15 +418,15 @@ gStdScriptsEnd:: .include "data/maps/CinnabarIsland_Mart/scripts.inc" .include "data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc" .include "data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc" - .include "data/maps/SaffronCity_House1_1F/scripts.inc" - .include "data/maps/SaffronCity_House1_2F/scripts.inc" + .include "data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc" + .include "data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc" .include "data/maps/SaffronCity_Dojo/scripts.inc" .include "data/maps/SaffronCity_Gym/scripts.inc" - .include "data/maps/SaffronCity_House2/scripts.inc" + .include "data/maps/SaffronCity_House/scripts.inc" .include "data/maps/SaffronCity_Mart/scripts.inc" .include "data/maps/SaffronCity_PokemonCenter_1F/scripts.inc" .include "data/maps/SaffronCity_PokemonCenter_2F/scripts.inc" - .include "data/maps/SaffronCity_House3/scripts.inc" + .include "data/maps/SaffronCity_MrPsychicsHouse/scripts.inc" .include "data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc" .include "data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc" .include "data/maps/Route2_House/scripts.inc" @@ -594,7 +596,7 @@ gStdScriptsEnd:: .include "data/maps/FiveIsland_RocketWarehouse/text.inc" .include "data/maps/SixIsland_DottedHole_SapphireRoom/text.inc" .include "data/maps/SixIsland_PatternBush/text.inc" - .include "data/maps/SevenIsland_TrainerTower_Lobby/text.inc" + .include "data/maps/TrainerTower_Lobby/text.inc" .include "data/maps/FiveIsland_LostCave_Room1/text.inc" .include "data/maps/FiveIsland_LostCave_Room4/text.inc" .include "data/maps/FiveIsland_LostCave_Room10/text.inc" @@ -731,14 +733,14 @@ gStdScriptsEnd:: .include "data/maps/CinnabarIsland_PokemonCenter_1F/text.inc" .include "data/maps/CinnabarIsland_Mart/text.inc" .include "data/maps/IndigoPlateau_PokemonCenter_1F/text.inc" - .include "data/maps/SaffronCity_House1_1F/text.inc" - .include "data/maps/SaffronCity_House1_2F/text.inc" + .include "data/maps/SaffronCity_CopycatsHouse_1F/text.inc" + .include "data/maps/SaffronCity_CopycatsHouse_2F/text.inc" .include "data/maps/SaffronCity_Dojo/text.inc" .include "data/maps/SaffronCity_Gym/text.inc" - .include "data/maps/SaffronCity_House2/text.inc" + .include "data/maps/SaffronCity_House/text.inc" .include "data/maps/SaffronCity_Mart/text.inc" .include "data/maps/SaffronCity_PokemonCenter_1F/text.inc" - .include "data/maps/SaffronCity_House3/text.inc" + .include "data/maps/SaffronCity_MrPsychicsHouse/text.inc" .include "data/maps/SaffronCity_PokemonTrainerFanClub/text.inc" .include "data/maps/Route2_ViridianForest_SouthEntrance/text.inc" .include "data/maps/Route2_House/text.inc" @@ -1407,7 +1409,7 @@ Route18_EastEntrance_1F_EventScript_1A77C1:: @ 81A77C1 .include "data/scripts/route23.inc" -EventScript_1A7AB9:: @ 81A7AB9 +EventScript_GetElevatorFloor:: @ 81A7AB9 special Special_GetElevatorFloor return @@ -1680,419 +1682,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/layouts/SaffronCity_House1_1F/border.bin b/data/layouts/SaffronCity_CopycatsHouse_1F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SaffronCity_House1_1F/border.bin +++ b/data/layouts/SaffronCity_CopycatsHouse_1F/border.bin diff --git a/data/layouts/SaffronCity_House1_1F/map.bin b/data/layouts/SaffronCity_CopycatsHouse_1F/map.bin index 6db070ab7..6db070ab7 100644 --- a/data/layouts/SaffronCity_House1_1F/map.bin +++ b/data/layouts/SaffronCity_CopycatsHouse_1F/map.bin diff --git a/data/layouts/SaffronCity_House1_2F/border.bin b/data/layouts/SaffronCity_CopycatsHouse_2F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SaffronCity_House1_2F/border.bin +++ b/data/layouts/SaffronCity_CopycatsHouse_2F/border.bin diff --git a/data/layouts/SaffronCity_House1_2F/map.bin b/data/layouts/SaffronCity_CopycatsHouse_2F/map.bin Binary files differindex c3090f485..c3090f485 100644 --- a/data/layouts/SaffronCity_House1_2F/map.bin +++ b/data/layouts/SaffronCity_CopycatsHouse_2F/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_1F/border.bin b/data/layouts/TrainerTower_1F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TrainerTower_1F/border.bin +++ b/data/layouts/TrainerTower_1F/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_1F/map.bin b/data/layouts/TrainerTower_1F/map.bin Binary files differindex 812cea451..812cea451 100644 --- a/data/layouts/SevenIsland_TrainerTower_1F/map.bin +++ b/data/layouts/TrainerTower_1F/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_2F/border.bin b/data/layouts/TrainerTower_1F_Doubles/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TrainerTower_2F/border.bin +++ b/data/layouts/TrainerTower_1F_Doubles/border.bin diff --git a/data/layouts/UnusedLayout_834BC2C/map.bin b/data/layouts/TrainerTower_1F_Doubles/map.bin Binary files differindex 891ae066e..891ae066e 100644 --- a/data/layouts/UnusedLayout_834BC2C/map.bin +++ b/data/layouts/TrainerTower_1F_Doubles/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_3F/border.bin b/data/layouts/TrainerTower_1F_Knockout/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TrainerTower_3F/border.bin +++ b/data/layouts/TrainerTower_1F_Knockout/border.bin diff --git a/data/layouts/UnusedLayout_834D06C/map.bin b/data/layouts/TrainerTower_1F_Knockout/map.bin Binary files differindex 3e3ebcc94..3e3ebcc94 100644 --- a/data/layouts/UnusedLayout_834D06C/map.bin +++ b/data/layouts/TrainerTower_1F_Knockout/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_4F/border.bin b/data/layouts/TrainerTower_2F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TrainerTower_4F/border.bin +++ b/data/layouts/TrainerTower_2F/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_2F/map.bin b/data/layouts/TrainerTower_2F/map.bin Binary files differindex 7ae889af1..7ae889af1 100644 --- a/data/layouts/SevenIsland_TrainerTower_2F/map.bin +++ b/data/layouts/TrainerTower_2F/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_5F/border.bin b/data/layouts/TrainerTower_2F_Doubles/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TrainerTower_5F/border.bin +++ b/data/layouts/TrainerTower_2F_Doubles/border.bin diff --git a/data/layouts/UnusedLayout_834BEB4/map.bin b/data/layouts/TrainerTower_2F_Doubles/map.bin Binary files differindex ab44abb18..ab44abb18 100644 --- a/data/layouts/UnusedLayout_834BEB4/map.bin +++ b/data/layouts/TrainerTower_2F_Doubles/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_6F/border.bin b/data/layouts/TrainerTower_2F_Knockout/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TrainerTower_6F/border.bin +++ b/data/layouts/TrainerTower_2F_Knockout/border.bin diff --git a/data/layouts/UnusedLayout_834D2F4/map.bin b/data/layouts/TrainerTower_2F_Knockout/map.bin Binary files differindex cfc96995c..cfc96995c 100644 --- a/data/layouts/UnusedLayout_834D2F4/map.bin +++ b/data/layouts/TrainerTower_2F_Knockout/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_7F/border.bin b/data/layouts/TrainerTower_3F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TrainerTower_7F/border.bin +++ b/data/layouts/TrainerTower_3F/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_3F/map.bin b/data/layouts/TrainerTower_3F/map.bin Binary files differindex c01e70c2f..c01e70c2f 100644 --- a/data/layouts/SevenIsland_TrainerTower_3F/map.bin +++ b/data/layouts/TrainerTower_3F/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_8F/border.bin b/data/layouts/TrainerTower_3F_Doubles/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TrainerTower_8F/border.bin +++ b/data/layouts/TrainerTower_3F_Doubles/border.bin diff --git a/data/layouts/UnusedLayout_834C13C/map.bin b/data/layouts/TrainerTower_3F_Doubles/map.bin Binary files differindex 514cb7239..514cb7239 100644 --- a/data/layouts/UnusedLayout_834C13C/map.bin +++ b/data/layouts/TrainerTower_3F_Doubles/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_Elevator/border.bin b/data/layouts/TrainerTower_3F_Knockout/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TrainerTower_Elevator/border.bin +++ b/data/layouts/TrainerTower_3F_Knockout/border.bin diff --git a/data/layouts/UnusedLayout_834D57C/map.bin b/data/layouts/TrainerTower_3F_Knockout/map.bin Binary files differindex da9cc3f75..da9cc3f75 100644 --- a/data/layouts/UnusedLayout_834D57C/map.bin +++ b/data/layouts/TrainerTower_3F_Knockout/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_Lobby/border.bin b/data/layouts/TrainerTower_4F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/SevenIsland_TrainerTower_Lobby/border.bin +++ b/data/layouts/TrainerTower_4F/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_4F/map.bin b/data/layouts/TrainerTower_4F/map.bin Binary files differindex 057d7f955..057d7f955 100644 --- a/data/layouts/SevenIsland_TrainerTower_4F/map.bin +++ b/data/layouts/TrainerTower_4F/map.bin diff --git a/data/layouts/UnusedLayout_834BC2C/border.bin b/data/layouts/TrainerTower_4F_Doubles/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834BC2C/border.bin +++ b/data/layouts/TrainerTower_4F_Doubles/border.bin diff --git a/data/layouts/UnusedLayout_834C3C4/map.bin b/data/layouts/TrainerTower_4F_Doubles/map.bin Binary files differindex d9a50b7a1..d9a50b7a1 100644 --- a/data/layouts/UnusedLayout_834C3C4/map.bin +++ b/data/layouts/TrainerTower_4F_Doubles/map.bin diff --git a/data/layouts/UnusedLayout_834BEB4/border.bin b/data/layouts/TrainerTower_4F_Knockout/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834BEB4/border.bin +++ b/data/layouts/TrainerTower_4F_Knockout/border.bin diff --git a/data/layouts/UnusedLayout_834D804/map.bin b/data/layouts/TrainerTower_4F_Knockout/map.bin Binary files differindex cf5e1e94e..cf5e1e94e 100644 --- a/data/layouts/UnusedLayout_834D804/map.bin +++ b/data/layouts/TrainerTower_4F_Knockout/map.bin diff --git a/data/layouts/UnusedLayout_834C13C/border.bin b/data/layouts/TrainerTower_5F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834C13C/border.bin +++ b/data/layouts/TrainerTower_5F/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_5F/map.bin b/data/layouts/TrainerTower_5F/map.bin Binary files differindex d580e7d2d..d580e7d2d 100644 --- a/data/layouts/SevenIsland_TrainerTower_5F/map.bin +++ b/data/layouts/TrainerTower_5F/map.bin diff --git a/data/layouts/UnusedLayout_834C3C4/border.bin b/data/layouts/TrainerTower_5F_Doubles/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834C3C4/border.bin +++ b/data/layouts/TrainerTower_5F_Doubles/border.bin diff --git a/data/layouts/UnusedLayout_834C64C/map.bin b/data/layouts/TrainerTower_5F_Doubles/map.bin Binary files differindex 37b4aba85..37b4aba85 100644 --- a/data/layouts/UnusedLayout_834C64C/map.bin +++ b/data/layouts/TrainerTower_5F_Doubles/map.bin diff --git a/data/layouts/UnusedLayout_834C64C/border.bin b/data/layouts/TrainerTower_5F_Knockout/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834C64C/border.bin +++ b/data/layouts/TrainerTower_5F_Knockout/border.bin diff --git a/data/layouts/UnusedLayout_834DA8C/map.bin b/data/layouts/TrainerTower_5F_Knockout/map.bin Binary files differindex 1f10bfff1..1f10bfff1 100644 --- a/data/layouts/UnusedLayout_834DA8C/map.bin +++ b/data/layouts/TrainerTower_5F_Knockout/map.bin diff --git a/data/layouts/UnusedLayout_834C8D4/border.bin b/data/layouts/TrainerTower_6F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834C8D4/border.bin +++ b/data/layouts/TrainerTower_6F/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_6F/map.bin b/data/layouts/TrainerTower_6F/map.bin Binary files differindex 3c2c3165c..3c2c3165c 100644 --- a/data/layouts/SevenIsland_TrainerTower_6F/map.bin +++ b/data/layouts/TrainerTower_6F/map.bin diff --git a/data/layouts/UnusedLayout_834CB5C/border.bin b/data/layouts/TrainerTower_6F_Doubles/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834CB5C/border.bin +++ b/data/layouts/TrainerTower_6F_Doubles/border.bin diff --git a/data/layouts/UnusedLayout_834C8D4/map.bin b/data/layouts/TrainerTower_6F_Doubles/map.bin Binary files differindex 2df5cd891..2df5cd891 100644 --- a/data/layouts/UnusedLayout_834C8D4/map.bin +++ b/data/layouts/TrainerTower_6F_Doubles/map.bin diff --git a/data/layouts/UnusedLayout_834CDE4/border.bin b/data/layouts/TrainerTower_6F_Knockout/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834CDE4/border.bin +++ b/data/layouts/TrainerTower_6F_Knockout/border.bin diff --git a/data/layouts/UnusedLayout_834DD14/map.bin b/data/layouts/TrainerTower_6F_Knockout/map.bin Binary files differindex fe3d6f908..fe3d6f908 100644 --- a/data/layouts/UnusedLayout_834DD14/map.bin +++ b/data/layouts/TrainerTower_6F_Knockout/map.bin diff --git a/data/layouts/UnusedLayout_834D06C/border.bin b/data/layouts/TrainerTower_7F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834D06C/border.bin +++ b/data/layouts/TrainerTower_7F/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_7F/map.bin b/data/layouts/TrainerTower_7F/map.bin Binary files differindex d9bb110cf..d9bb110cf 100644 --- a/data/layouts/SevenIsland_TrainerTower_7F/map.bin +++ b/data/layouts/TrainerTower_7F/map.bin diff --git a/data/layouts/UnusedLayout_834D2F4/border.bin b/data/layouts/TrainerTower_7F_Doubles/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834D2F4/border.bin +++ b/data/layouts/TrainerTower_7F_Doubles/border.bin diff --git a/data/layouts/UnusedLayout_834CB5C/map.bin b/data/layouts/TrainerTower_7F_Doubles/map.bin Binary files differindex e977b7e26..e977b7e26 100644 --- a/data/layouts/UnusedLayout_834CB5C/map.bin +++ b/data/layouts/TrainerTower_7F_Doubles/map.bin diff --git a/data/layouts/UnusedLayout_834D57C/border.bin b/data/layouts/TrainerTower_7F_Knockout/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834D57C/border.bin +++ b/data/layouts/TrainerTower_7F_Knockout/border.bin diff --git a/data/layouts/UnusedLayout_834DF9C/map.bin b/data/layouts/TrainerTower_7F_Knockout/map.bin Binary files differindex 241077797..241077797 100644 --- a/data/layouts/UnusedLayout_834DF9C/map.bin +++ b/data/layouts/TrainerTower_7F_Knockout/map.bin diff --git a/data/layouts/UnusedLayout_834D804/border.bin b/data/layouts/TrainerTower_8F/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834D804/border.bin +++ b/data/layouts/TrainerTower_8F/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_8F/map.bin b/data/layouts/TrainerTower_8F/map.bin Binary files differindex 6ba6588be..6ba6588be 100644 --- a/data/layouts/SevenIsland_TrainerTower_8F/map.bin +++ b/data/layouts/TrainerTower_8F/map.bin diff --git a/data/layouts/UnusedLayout_834DA8C/border.bin b/data/layouts/TrainerTower_8F_Doubles/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834DA8C/border.bin +++ b/data/layouts/TrainerTower_8F_Doubles/border.bin diff --git a/data/layouts/UnusedLayout_834CDE4/map.bin b/data/layouts/TrainerTower_8F_Doubles/map.bin Binary files differindex e358d2f3d..e358d2f3d 100644 --- a/data/layouts/UnusedLayout_834CDE4/map.bin +++ b/data/layouts/TrainerTower_8F_Doubles/map.bin diff --git a/data/layouts/UnusedLayout_834DD14/border.bin b/data/layouts/TrainerTower_8F_Knockout/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834DD14/border.bin +++ b/data/layouts/TrainerTower_8F_Knockout/border.bin diff --git a/data/layouts/UnusedLayout_834E224/map.bin b/data/layouts/TrainerTower_8F_Knockout/map.bin Binary files differindex bb5ccf05c..bb5ccf05c 100644 --- a/data/layouts/UnusedLayout_834E224/map.bin +++ b/data/layouts/TrainerTower_8F_Knockout/map.bin diff --git a/data/layouts/UnusedLayout_834DF9C/border.bin b/data/layouts/TrainerTower_Elevator/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834DF9C/border.bin +++ b/data/layouts/TrainerTower_Elevator/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_Elevator/map.bin b/data/layouts/TrainerTower_Elevator/map.bin index 42e08c38d..42e08c38d 100644 --- a/data/layouts/SevenIsland_TrainerTower_Elevator/map.bin +++ b/data/layouts/TrainerTower_Elevator/map.bin diff --git a/data/layouts/UnusedLayout_834E224/border.bin b/data/layouts/TrainerTower_Lobby/border.bin Binary files differindex a886cd764..a886cd764 100644 --- a/data/layouts/UnusedLayout_834E224/border.bin +++ b/data/layouts/TrainerTower_Lobby/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_Lobby/map.bin b/data/layouts/TrainerTower_Lobby/map.bin index b98077279..b98077279 100644 --- a/data/layouts/SevenIsland_TrainerTower_Lobby/map.bin +++ b/data/layouts/TrainerTower_Lobby/map.bin diff --git a/data/layouts/SevenIsland_TrainerTower_Roof/border.bin b/data/layouts/TrainerTower_Roof/border.bin index f94adee61..f94adee61 100644 --- a/data/layouts/SevenIsland_TrainerTower_Roof/border.bin +++ b/data/layouts/TrainerTower_Roof/border.bin diff --git a/data/layouts/SevenIsland_TrainerTower_Roof/map.bin b/data/layouts/TrainerTower_Roof/map.bin index 37d57f3fe..37d57f3fe 100644 --- a/data/layouts/SevenIsland_TrainerTower_Roof/map.bin +++ b/data/layouts/TrainerTower_Roof/map.bin diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 63fc06562..3c920c825 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -2504,28 +2504,28 @@ "blockdata_filepath": "data/layouts/RocketHideout_Elevator/map.bin" }, { - "id": "LAYOUT_SAFFRON_CITY_HOUSE1_1F", - "name": "SaffronCity_House1_1F_Layout", + "id": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_1F", + "name": "SaffronCity_CopycatsHouse_1F_Layout", "width": 13, "height": 10, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D4C74", - "border_filepath": "data/layouts/SaffronCity_House1_1F/border.bin", - "blockdata_filepath": "data/layouts/SaffronCity_House1_1F/map.bin" + "border_filepath": "data/layouts/SaffronCity_CopycatsHouse_1F/border.bin", + "blockdata_filepath": "data/layouts/SaffronCity_CopycatsHouse_1F/map.bin" }, { - "id": "LAYOUT_SAFFRON_CITY_HOUSE1_2F", - "name": "SaffronCity_House1_2F_Layout", + "id": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_2F", + "name": "SaffronCity_CopycatsHouse_2F_Layout", "width": 12, "height": 9, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D4C74", - "border_filepath": "data/layouts/SaffronCity_House1_2F/border.bin", - "blockdata_filepath": "data/layouts/SaffronCity_House1_2F/map.bin" + "border_filepath": "data/layouts/SaffronCity_CopycatsHouse_2F/border.bin", + "blockdata_filepath": "data/layouts/SaffronCity_CopycatsHouse_2F/map.bin" }, { "id": "LAYOUT_SAFFRON_CITY_DOJO", @@ -3356,136 +3356,136 @@ "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_Back/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", - "name": "SevenIsland_TrainerTower_Lobby_Layout", + "id": "LAYOUT_TRAINER_TOWER_LOBBY", + "name": "TrainerTower_Lobby_Layout", "width": 19, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/SevenIsland_TrainerTower_Lobby/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_Lobby/map.bin" + "border_filepath": "data/layouts/TrainerTower_Lobby/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_Lobby/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F", - "name": "SevenIsland_TrainerTower_1F_Layout", + "id": "LAYOUT_TRAINER_TOWER_1F", + "name": "TrainerTower_1F_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/SevenIsland_TrainerTower_1F/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_1F/map.bin" + "border_filepath": "data/layouts/TrainerTower_1F/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_1F/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F", - "name": "SevenIsland_TrainerTower_2F_Layout", + "id": "LAYOUT_TRAINER_TOWER_2F", + "name": "TrainerTower_2F_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/SevenIsland_TrainerTower_2F/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_2F/map.bin" + "border_filepath": "data/layouts/TrainerTower_2F/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_2F/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F", - "name": "SevenIsland_TrainerTower_3F_Layout", + "id": "LAYOUT_TRAINER_TOWER_3F", + "name": "TrainerTower_3F_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/SevenIsland_TrainerTower_3F/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_3F/map.bin" + "border_filepath": "data/layouts/TrainerTower_3F/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_3F/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F", - "name": "SevenIsland_TrainerTower_4F_Layout", + "id": "LAYOUT_TRAINER_TOWER_4F", + "name": "TrainerTower_4F_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/SevenIsland_TrainerTower_4F/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_4F/map.bin" + "border_filepath": "data/layouts/TrainerTower_4F/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_4F/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F", - "name": "SevenIsland_TrainerTower_5F_Layout", + "id": "LAYOUT_TRAINER_TOWER_5F", + "name": "TrainerTower_5F_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/SevenIsland_TrainerTower_5F/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_5F/map.bin" + "border_filepath": "data/layouts/TrainerTower_5F/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_5F/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F", - "name": "SevenIsland_TrainerTower_6F_Layout", + "id": "LAYOUT_TRAINER_TOWER_6F", + "name": "TrainerTower_6F_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/SevenIsland_TrainerTower_6F/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_6F/map.bin" + "border_filepath": "data/layouts/TrainerTower_6F/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_6F/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F", - "name": "SevenIsland_TrainerTower_7F_Layout", + "id": "LAYOUT_TRAINER_TOWER_7F", + "name": "TrainerTower_7F_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/SevenIsland_TrainerTower_7F/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_7F/map.bin" + "border_filepath": "data/layouts/TrainerTower_7F/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_7F/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F", - "name": "SevenIsland_TrainerTower_8F_Layout", + "id": "LAYOUT_TRAINER_TOWER_8F", + "name": "TrainerTower_8F_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/SevenIsland_TrainerTower_8F/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_8F/map.bin" + "border_filepath": "data/layouts/TrainerTower_8F/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_8F/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF", - "name": "SevenIsland_TrainerTower_Roof_Layout", + "id": "LAYOUT_TRAINER_TOWER_ROOF", + "name": "TrainerTower_Roof_Layout", "width": 18, "height": 16, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/SevenIsland_TrainerTower_Roof/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_Roof/map.bin" + "border_filepath": "data/layouts/TrainerTower_Roof/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_Roof/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "name": "SevenIsland_TrainerTower_Elevator_Layout", + "id": "LAYOUT_TRAINER_TOWER_ELEVATOR", + "name": "TrainerTower_Elevator_Layout", "width": 5, "height": 7, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D4ECC", - "border_filepath": "data/layouts/SevenIsland_TrainerTower_Elevator/border.bin", - "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_Elevator/map.bin" + "border_filepath": "data/layouts/TrainerTower_Elevator/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_Elevator/map.bin" }, { "id": "LAYOUT_CERULEAN_CITY_HOUSE5", @@ -4184,196 +4184,196 @@ "blockdata_filepath": "data/layouts/NavelRock_Fork/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834BC2C", - "name": "UnusedLayout_834BC2C_Layout", + "id": "LAYOUT_TRAINER_TOWER_1F_DOUBLES", + "name": "TrainerTower_1F_Doubles_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834BC2C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834BC2C/map.bin" + "border_filepath": "data/layouts/TrainerTower_1F_Doubles/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_1F_Doubles/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834BEB4", - "name": "UnusedLayout_834BEB4_Layout", + "id": "LAYOUT_TRAINER_TOWER_2F_DOUBLES", + "name": "TrainerTower_2F_Doubles_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834BEB4/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834BEB4/map.bin" + "border_filepath": "data/layouts/TrainerTower_2F_Doubles/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_2F_Doubles/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834C13C", - "name": "UnusedLayout_834C13C_Layout", + "id": "LAYOUT_TRAINER_TOWER_3F_DOUBLES", + "name": "TrainerTower_3F_Doubles_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834C13C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834C13C/map.bin" + "border_filepath": "data/layouts/TrainerTower_3F_Doubles/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_3F_Doubles/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834C3C4", - "name": "UnusedLayout_834C3C4_Layout", + "id": "LAYOUT_TRAINER_TOWER_4F_DOUBLES", + "name": "TrainerTower_4F_Doubles_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834C3C4/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834C3C4/map.bin" + "border_filepath": "data/layouts/TrainerTower_4F_Doubles/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_4F_Doubles/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834C64C", - "name": "UnusedLayout_834C64C_Layout", + "id": "LAYOUT_TRAINER_TOWER_5F_DOUBLES", + "name": "TrainerTower_5F_Doubles_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834C64C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834C64C/map.bin" + "border_filepath": "data/layouts/TrainerTower_5F_Doubles/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_5F_Doubles/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834C8D4", - "name": "UnusedLayout_834C8D4_Layout", + "id": "LAYOUT_TRAINER_TOWER_6F_DOUBLES", + "name": "TrainerTower_6F_Doubles_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834C8D4/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834C8D4/map.bin" + "border_filepath": "data/layouts/TrainerTower_6F_Doubles/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_6F_Doubles/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834CB5C", - "name": "UnusedLayout_834CB5C_Layout", + "id": "LAYOUT_TRAINER_TOWER_7F_DOUBLES", + "name": "TrainerTower_7F_Doubles_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834CB5C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834CB5C/map.bin" + "border_filepath": "data/layouts/TrainerTower_7F_Doubles/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_7F_Doubles/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834CDE4", - "name": "UnusedLayout_834CDE4_Layout", + "id": "LAYOUT_TRAINER_TOWER_8F_DOUBLES", + "name": "TrainerTower_8F_Doubles_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834CDE4/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834CDE4/map.bin" + "border_filepath": "data/layouts/TrainerTower_8F_Doubles/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_8F_Doubles/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834D06C", - "name": "UnusedLayout_834D06C_Layout", + "id": "LAYOUT_TRAINER_TOWER_1F_KNOCKOUT", + "name": "TrainerTower_1F_Knockout_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834D06C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834D06C/map.bin" + "border_filepath": "data/layouts/TrainerTower_1F_Knockout/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_1F_Knockout/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834D2F4", - "name": "UnusedLayout_834D2F4_Layout", + "id": "LAYOUT_TRAINER_TOWER_2F_KNOCKOUT", + "name": "TrainerTower_2F_Knockout_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834D2F4/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834D2F4/map.bin" + "border_filepath": "data/layouts/TrainerTower_2F_Knockout/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_2F_Knockout/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834D57C", - "name": "UnusedLayout_834D57C_Layout", + "id": "LAYOUT_TRAINER_TOWER_3F_KNOCKOUT", + "name": "TrainerTower_3F_Knockout_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834D57C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834D57C/map.bin" + "border_filepath": "data/layouts/TrainerTower_3F_Knockout/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_3F_Knockout/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834D804", - "name": "UnusedLayout_834D804_Layout", + "id": "LAYOUT_TRAINER_TOWER_4F_KNOCKOUT", + "name": "TrainerTower_4F_Knockout_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834D804/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834D804/map.bin" + "border_filepath": "data/layouts/TrainerTower_4F_Knockout/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_4F_Knockout/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834DA8C", - "name": "UnusedLayout_834DA8C_Layout", + "id": "LAYOUT_TRAINER_TOWER_5F_KNOCKOUT", + "name": "TrainerTower_5F_Knockout_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834DA8C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834DA8C/map.bin" + "border_filepath": "data/layouts/TrainerTower_5F_Knockout/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_5F_Knockout/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834DD14", - "name": "UnusedLayout_834DD14_Layout", + "id": "LAYOUT_TRAINER_TOWER_6F_KNOCKOUT", + "name": "TrainerTower_6F_Knockout_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834DD14/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834DD14/map.bin" + "border_filepath": "data/layouts/TrainerTower_6F_Knockout/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_6F_Knockout/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834DF9C", - "name": "UnusedLayout_834DF9C_Layout", + "id": "LAYOUT_TRAINER_TOWER_7F_KNOCKOUT", + "name": "TrainerTower_7F_Knockout_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834DF9C/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834DF9C/map.bin" + "border_filepath": "data/layouts/TrainerTower_7F_Knockout/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_7F_Knockout/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_834E224", - "name": "UnusedLayout_834E224_Layout", + "id": "LAYOUT_TRAINER_TOWER_8F_KNOCKOUT", + "name": "TrainerTower_8F_Knockout_Layout", "width": 18, "height": 17, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_82D4BB4", "secondary_tileset": "gTileset_82D5094", - "border_filepath": "data/layouts/UnusedLayout_834E224/border.bin", - "blockdata_filepath": "data/layouts/UnusedLayout_834E224/map.bin" + "border_filepath": "data/layouts/TrainerTower_8F_Knockout/border.bin", + "blockdata_filepath": "data/layouts/TrainerTower_8F_Knockout/map.bin" }, { "id": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1", 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..9469abce4 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -1,10 +1,10 @@ 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 + call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow message Text_WantWhichFloor @@ -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..5ac6ac99c 100644 --- a/data/maps/CeladonCity_Hotel/text.inc +++ b/data/maps/CeladonCity_Hotel/text.inc @@ -1,21 +1,18 @@ -Text_197B6F:: @ 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..d07d4a0e4 100644 --- a/data/maps/CeladonCity_House1/text.inc +++ b/data/maps/CeladonCity_House1/text.inc @@ -1,16 +1,20 @@ -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!$" +@ Text for the replaced altars in the rocket chiefs house / celadon mansion +@ In English RB, this is westernized as "It's a sculpture of DIGLETT.", and is removed altogether in FRLG +Text_ItsABuddhistAltar:: @ 8197B6F + .string "ぶつだん だ‥$" 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/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index def5fa6fd..58ca4c535 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "FiveIsland_RocketWarehouse_EventScript_163FE6", + "script": "FiveIsland_RocketWarehouse_EventScript_Grunt2", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "FiveIsland_RocketWarehouse_EventScript_163FFD", + "script": "FiveIsland_RocketWarehouse_EventScript_Grunt3", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "FiveIsland_RocketWarehouse_EventScript_164087", + "script": "FiveIsland_RocketWarehouse_EventScript_Admin1", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "FiveIsland_RocketWarehouse_EventScript_164014", + "script": "FiveIsland_RocketWarehouse_EventScript_Admin2", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "FiveIsland_RocketWarehouse_EventScript_164070", + "script": "FiveIsland_RocketWarehouse_EventScript_Grunt1", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F93", + "script": "FiveIsland_RocketWarehouse_EventScript_Gideon", "flag": "0" }, { @@ -161,7 +161,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE", "var_value": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F81" + "script": "FiveIsland_RocketWarehouse_EventScript_Admin2Trigger" }, { "type": "trigger", @@ -170,7 +170,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE", "var_value": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F81" + "script": "FiveIsland_RocketWarehouse_EventScript_Admin2Trigger" }, { "type": "trigger", @@ -179,7 +179,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE", "var_value": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F81" + "script": "FiveIsland_RocketWarehouse_EventScript_Admin2Trigger" } ], "bg_events": [ @@ -188,14 +188,14 @@ "x": 11, "y": 2, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_3", "x": 26, "y": 11, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F78" + "script": "FiveIsland_RocketWarehouse_EventScript_Computer" }, { "type": "hidden_item", @@ -222,147 +222,147 @@ "x": 12, "y": 2, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 10, "y": 2, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 9, "y": 2, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 8, "y": 2, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 7, "y": 2, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 11, "y": 5, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 10, "y": 5, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 11, "y": 4, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 10, "y": 4, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 8, "y": 4, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 7, "y": 4, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 8, "y": 5, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 7, "y": 5, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 5, "y": 3, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 4, "y": 3, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 5, "y": 4, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 4, "y": 4, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 3, "y": 4, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 2, "y": 4, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 2, "y": 5, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" }, { "type": "bg_event_type_0", "x": 3, "y": 5, "elevation": 0, - "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" + "script": "FiveIsland_RocketWarehouse_EventScript_Cage" } ] } diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 8382d4a72..dfcb6e43f 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -1,3 +1,12 @@ +.equ LOCALID_GRUNT1, 5 +.equ LOCALID_GRUNT2, 1 +.equ LOCALID_GRUNT3, 2 +.equ LOCALID_ADMIN1, 3 +.equ LOCALID_ADMIN2, 4 + +.equ PLAYER_X_POS, VAR_0x8004 +.equ PLAYER_Y_POS, VAR_0x8005 + FiveIsland_RocketWarehouse_MapScripts:: @ 8163F2E map_script MAP_SCRIPT_ON_LOAD, FiveIsland_RocketWarehouse_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_RocketWarehouse_OnTransition @@ -8,82 +17,82 @@ FiveIsland_RocketWarehouse_OnTransition:: @ 8163F39 end FiveIsland_RocketWarehouse_OnLoad:: @ 8163F3D - call_if_defeated TRAINER_TEAM_ROCKET_ADMIN, EventScript_163F47 + call_if_defeated TRAINER_TEAM_ROCKET_ADMIN, FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry end -EventScript_163F47:: @ 8163F47 - setmetatile 26, 20, 672, 0 - setmetatile 27, 20, 672, 0 +FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry:: @ 8163F47 + setmetatile 26, 20, METATILE_Hideout_Arrow_Up, 0 + setmetatile 27, 20, METATILE_Hideout_Arrow_Up, 0 return -FiveIsland_RocketWarehouse_EventScript_163F5A:: @ 8163F5A +FiveIsland_RocketWarehouse_EventScript_Cage:: @ 8163F5A lockall - goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, EventScript_163F6E - msgbox gUnknown_817B4E3 + goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, FiveIsland_RocketWarehouse_EventScript_CageUnlocked + msgbox FiveIsland_RocketWarehouse_Text_ManyMonsLockedInPen releaseall end -EventScript_163F6E:: @ 8163F6E - msgbox gUnknown_817B512 +FiveIsland_RocketWarehouse_EventScript_CageUnlocked:: @ 8163F6E + msgbox FiveIsland_RocketWarehouse_Text_PenUnlockedMonsFled releaseall end -FiveIsland_RocketWarehouse_EventScript_163F78:: @ 8163F78 - msgbox gUnknown_817BB15, MSGBOX_SIGN +FiveIsland_RocketWarehouse_EventScript_Computer:: @ 8163F78 + msgbox FiveIsland_RocketWarehouse_Text_ReportWithGraphsAndText, MSGBOX_SIGN end -FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81 +FiveIsland_RocketWarehouse_EventScript_Admin2Trigger:: @ 8163F81 lockall - applymovement 4, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_ADMIN2, Movement_WalkInPlaceFastestLeft waitmovement 0 setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1 releaseall end -FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93 - trainerbattle_single TRAINER_SCIENTIST_GIDEON, Text_17BBAF, Text_17BC55, EventScript_163FCD - goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_163FB7 - msgbox gUnknown_817BCA3, MSGBOX_AUTOCLOSE +FiveIsland_RocketWarehouse_EventScript_Gideon:: @ 8163F93 + trainerbattle_single TRAINER_SCIENTIST_GIDEON, FiveIsland_RocketWarehouse_Text_GideonIntro, FiveIsland_RocketWarehouse_Text_GideonDefeat, FiveIsland_RocketWarehouse_EventScript_DefeatedGideon + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, FiveIsland_RocketWarehouse_EventScript_MentionGiovannisKid + msgbox FiveIsland_RocketWarehouse_Text_GetLostLeaveMeBe, MSGBOX_AUTOCLOSE end -EventScript_163FB7:: @ 8163FB7 +FiveIsland_RocketWarehouse_EventScript_MentionGiovannisKid:: @ 8163FB7 famechecker FAMECHECKER_GIOVANNI, 5 - msgbox gUnknown_817BCD7, MSGBOX_AUTOCLOSE + msgbox FiveIsland_RocketWarehouse_Text_GiovannisKidHasRedHair, MSGBOX_AUTOCLOSE end -EventScript_163FCD:: @ 8163FCD - msgbox gUnknown_817BC6C +FiveIsland_RocketWarehouse_EventScript_DefeatedGideon:: @ 8163FCD + msgbox FiveIsland_RocketWarehouse_Text_GideonPostBattle setflag FLAG_RECOVERED_SAPPHIRE giveitem ITEM_SAPPHIRE release end -FiveIsland_RocketWarehouse_EventScript_163FE6:: @ 8163FE6 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_47, Text_17B54D, Text_17B585 - msgbox gUnknown_817B5A6, MSGBOX_AUTOCLOSE +FiveIsland_RocketWarehouse_EventScript_Grunt2:: @ 8163FE6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_47, FiveIsland_RocketWarehouse_Text_Grunt2Intro, FiveIsland_RocketWarehouse_Text_Grunt2Defeat + msgbox FiveIsland_RocketWarehouse_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_RocketWarehouse_EventScript_163FFD:: @ 8163FFD - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_48, Text_17B677, Text_17B6D9 - msgbox gUnknown_817B6EF, MSGBOX_AUTOCLOSE +FiveIsland_RocketWarehouse_EventScript_Grunt3:: @ 8163FFD + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_48, FiveIsland_RocketWarehouse_Text_Grunt3Intro, FiveIsland_RocketWarehouse_Text_Grunt3Defeat + msgbox FiveIsland_RocketWarehouse_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014 - trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN_2, Text_17B8DA, Text_17B9FB, EventScript_16402F - msgbox gUnknown_817BA64, MSGBOX_AUTOCLOSE +FiveIsland_RocketWarehouse_EventScript_Admin2:: @ 8164014 + trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN_2, FiveIsland_RocketWarehouse_Text_Admin2Intro, FiveIsland_RocketWarehouse_Text_Admin2Defeat, FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2 + msgbox FiveIsland_RocketWarehouse_Text_Admin2PostBattle, MSGBOX_AUTOCLOSE end -EventScript_16402F:: @ 816402F - getplayerxy VAR_0x8004, VAR_0x8005 - compare VAR_0x8004, 24 - call_if_le EventScript_164065 - msgbox gUnknown_817BA64 +FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2:: @ 816402F + getplayerxy PLAYER_X_POS, PLAYER_Y_POS + compare PLAYER_X_POS, 24 + call_if_le FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2 + msgbox FiveIsland_RocketWarehouse_Text_Admin2PostBattle closemessage fadescreen FADE_TO_BLACK - removeobject 1 - removeobject 2 - removeobject 4 - removeobject 3 + removeobject LOCALID_GRUNT2 + removeobject LOCALID_GRUNT3 + removeobject LOCALID_ADMIN2 + removeobject LOCALID_ADMIN1 setflag FLAG_HIDE_FIVE_ISLAND_ROCKETS fadescreen FADE_FROM_BLACK setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1 @@ -91,91 +100,91 @@ EventScript_16402F:: @ 816402F release end -EventScript_164065:: @ 8164065 +FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2:: @ 8164065 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return -FiveIsland_RocketWarehouse_EventScript_164070:: @ 8164070 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_42, Text_17B5D6, Text_17B62F - msgbox gUnknown_817B642, MSGBOX_AUTOCLOSE +FiveIsland_RocketWarehouse_EventScript_Grunt1:: @ 8164070 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_42, FiveIsland_RocketWarehouse_Text_Grunt1Intro, FiveIsland_RocketWarehouse_Text_Grunt1Defeat + msgbox FiveIsland_RocketWarehouse_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087 - trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN, Text_17B72D, Text_17B79C, EventScript_1640A2 - msgbox gUnknown_817B7FA, MSGBOX_AUTOCLOSE +FiveIsland_RocketWarehouse_EventScript_Admin1:: @ 8164087 + trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN, FiveIsland_RocketWarehouse_Text_Admin1Intro, FiveIsland_RocketWarehouse_Text_Admin1Defeat, FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1 + msgbox FiveIsland_RocketWarehouse_Text_MadeItSoYouCanComeBackThrough, MSGBOX_AUTOCLOSE end -EventScript_1640A2:: @ 81640A2 - getplayerxy VAR_0x8004, VAR_0x8005 +FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1:: @ 81640A2 + getplayerxy PLAYER_X_POS, PLAYER_Y_POS specialvar VAR_RESULT, GetPlayerFacingDirection compare VAR_RESULT, DIR_NORTH - call_if_eq EventScript_16412E - msgbox gUnknown_817B7AE + call_if_eq FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1 + msgbox FiveIsland_RocketWarehouse_Text_Admin1PostBattle closemessage - compare VAR_0x8004, 24 - call_if_le EventScript_164144 - compare VAR_0x8004, 25 - call_if_eq EventScript_16414F - compare VAR_0x8004, 26 - call_if_eq EventScript_16415A - compare VAR_0x8004, 27 - call_if_eq EventScript_16415A + compare PLAYER_X_POS, 24 + call_if_le FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitchFar + compare PLAYER_X_POS, 25 + call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch + compare PLAYER_X_POS, 26 + call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch + compare PLAYER_X_POS, 27 + call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch playse SE_PIN - call EventScript_163F47 + call FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry special DrawWholeMapView waitse - compare VAR_0x8004, 24 - call_if_le EventScript_164165 - compare VAR_0x8004, 25 - call_if_eq EventScript_164165 - compare VAR_0x8004, 26 - call_if_eq EventScript_164165 - compare VAR_0x8004, 27 - call_if_eq EventScript_164170 - msgbox gUnknown_817B7FA + compare PLAYER_X_POS, 24 + call_if_le FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft + compare PLAYER_X_POS, 25 + call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft + compare PLAYER_X_POS, 26 + call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft + compare PLAYER_X_POS, 27 + call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown + msgbox FiveIsland_RocketWarehouse_Text_MadeItSoYouCanComeBackThrough release end -EventScript_16412E:: @ 816412E - compare VAR_0x8004, 27 +FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1:: @ 816412E + compare PLAYER_X_POS, 27 goto_if_eq EventScript_Return applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return -EventScript_164144:: @ 8164144 - applymovement 3, Movement_16417B +FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitchFar:: @ 8164144 + applymovement LOCALID_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar waitmovement 0 return -EventScript_16414F:: @ 816414F - applymovement 3, Movement_16417F +FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch:: @ 816414F + applymovement LOCALID_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch waitmovement 0 return -EventScript_16415A:: @ 816415A - applymovement 3, Movement_WalkInPlaceFastestUp +FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch:: @ 816415A + applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestUp waitmovement 0 return -EventScript_164165:: @ 8164165 - applymovement 3, Movement_WalkInPlaceFastestLeft +FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft:: @ 8164165 + applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_164170:: @ 8164170 - applymovement 3, Movement_WalkInPlaceFastestDown +FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown:: @ 8164170 + applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestDown waitmovement 0 return -Movement_16417B:: @ 816417B +FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar:: @ 816417B walk_right walk_right walk_in_place_fastest_up step_end -Movement_16417F:: @ 816417F +FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch:: @ 816417F walk_right walk_in_place_fastest_up step_end diff --git a/data/maps/FiveIsland_RocketWarehouse/text.inc b/data/maps/FiveIsland_RocketWarehouse/text.inc index b77ebd7c8..de74a7e67 100644 --- a/data/maps/FiveIsland_RocketWarehouse/text.inc +++ b/data/maps/FiveIsland_RocketWarehouse/text.inc @@ -1,65 +1,65 @@ -gUnknown_817B4E3:: @ 817B4E3 +FiveIsland_RocketWarehouse_Text_ManyMonsLockedInPen:: @ 817B4E3 .string "There are many POKéMON locked\n" .string "away in the pen…$" -gUnknown_817B512:: @ 817B512 +FiveIsland_RocketWarehouse_Text_PenUnlockedMonsFled:: @ 817B512 .string "The pen door is unlocked.\n" .string "The POKéMON appear to have fled.$" -Text_17B54D:: @ 817B54D +FiveIsland_RocketWarehouse_Text_Grunt2Intro:: @ 817B54D .string "Did you come here knowing it's\n" .string "TEAM ROCKET's WAREHOUSE?$" -Text_17B585:: @ 817B585 +FiveIsland_RocketWarehouse_Text_Grunt2Defeat:: @ 817B585 .string "What do you think you're doing?!$" -gUnknown_817B5A6:: @ 817B5A6 +FiveIsland_RocketWarehouse_Text_Grunt2PostBattle:: @ 817B5A6 .string "TEAM ROCKET broke up?\n" .string "What planet are you from?$" -Text_17B5D6:: @ 817B5D6 +FiveIsland_RocketWarehouse_Text_Grunt1Intro:: @ 817B5D6 .string "Oh, now your POKéMON look strong.\n" .string "You're willing to sell them?\p" .string "Oh?\n" .string "You wanted to battle?$" -Text_17B62F:: @ 817B62F +FiveIsland_RocketWarehouse_Text_Grunt1Defeat:: @ 817B62F .string "Oh, but…\n" .string "Too much!$" -gUnknown_817B642:: @ 817B642 +FiveIsland_RocketWarehouse_Text_Grunt1PostBattle:: @ 817B642 .string "We can give you a great price.\n" .string "Sell us your POKéMON!$" -Text_17B677:: @ 817B677 +FiveIsland_RocketWarehouse_Text_Grunt3Intro:: @ 817B677 .string "I got word about you from the\n" .string "others.\p" .string "But there's no way a kid like you'd\n" .string "know our BOSS GIOVANNI!$" -Text_17B6D9:: @ 817B6D9 +FiveIsland_RocketWarehouse_Text_Grunt3Defeat:: @ 817B6D9 .string "Don't…you…dare…laugh…$" -gUnknown_817B6EF:: @ 817B6EF +FiveIsland_RocketWarehouse_Text_Grunt3PostBattle:: @ 817B6EF .string "Don't mess in the doings of adults,\n" .string "you jumped-up pip-squeak!$" -Text_17B72D:: @ 817B72D +FiveIsland_RocketWarehouse_Text_Admin1Intro:: @ 817B72D .string "I don't know or care if what I'm\n" .string "doing is right or wrong…\p" .string "I just put my faith in GIOVANNI\n" .string "and do as I am told.$" -Text_17B79C:: @ 817B79C +FiveIsland_RocketWarehouse_Text_Admin1Defeat:: @ 817B79C .string "I…\n" .string "I'm shattered…$" -gUnknown_817B7AE:: @ 817B7AE +FiveIsland_RocketWarehouse_Text_Admin1PostBattle:: @ 817B7AE .string "You're doing things according to\n" .string "your beliefs and morals.\p" .string "I understand now…$" -gUnknown_817B7FA:: @ 817B7FA +FiveIsland_RocketWarehouse_Text_MadeItSoYouCanComeBackThrough:: @ 817B7FA .string "I've made it so you can come back\n" .string "in through there.\p" .string "Why don't you go get rested and\n" @@ -69,7 +69,7 @@ gUnknown_817B7FA:: @ 817B7FA .string "You'd better steel yourself for one\n" .string "harsh challenge.$" -Text_17B8DA:: @ 817B8DA +FiveIsland_RocketWarehouse_Text_Admin2Intro:: @ 817B8DA .string "That's quite enough of you \n" .string "playing the hero, kid.\p" .string "Spreading lies about how TEAM\n" @@ -81,7 +81,7 @@ Text_17B8DA:: @ 817B8DA .string "And now, I'll show you how scary\n" .string "an angry adult can be!$" -Text_17B9FB:: @ 817B9FB +FiveIsland_RocketWarehouse_Text_Admin2Defeat:: @ 817B9FB .string "Urgh…\n" .string "You were too strong…\p" .string "…\n" @@ -89,7 +89,7 @@ Text_17B9FB:: @ 817B9FB .string "So it's true?\n" .string "TEAM ROCKET really has disbanded?$" -gUnknown_817BA64:: @ 817BA64 +FiveIsland_RocketWarehouse_Text_Admin2PostBattle:: @ 817BA64 .string "We will abandon this WAREHOUSE…\p" .string "But don't think this is over.\n" .string "I won't let this be the end.\p" @@ -98,7 +98,7 @@ gUnknown_817BA64:: @ 817BA64 .string "I will…\p" .string "Until then, farewell!$" -gUnknown_817BB15:: @ 817BB15 +FiveIsland_RocketWarehouse_Text_ReportWithGraphsAndText:: @ 817BB15 .string "A report with graphs and text is on\n" .string "the PC monitor.\p" .string "“The Influence of Magnetic Waves\n" @@ -106,7 +106,7 @@ gUnknown_817BB15:: @ 817BB15 .string "… … … … … …\p" .string "It's too difficult to understand…$" -Text_17BBAF:: @ 817BBAF +FiveIsland_RocketWarehouse_Text_GideonIntro:: @ 817BBAF .string "I almost managed to sell the\n" .string "SAPPHIRE for huge money…\p" .string "Then, you just had to come along\n" @@ -114,19 +114,19 @@ Text_17BBAF:: @ 817BBAF .string "Fufu… Fufufufu…\n" .string "There's no forgiveness for you!$" -Text_17BC55:: @ 817BC55 +FiveIsland_RocketWarehouse_Text_GideonDefeat:: @ 817BC55 .string "Gah! Darn!\n" .string "Darn! Darn!$" -gUnknown_817BC6C:: @ 817BC6C +FiveIsland_RocketWarehouse_Text_GideonPostBattle:: @ 817BC6C .string "If I can't sell it, it's worthless!\n" .string "Go ahead, take it!$" -gUnknown_817BCA3:: @ 817BCA3 +FiveIsland_RocketWarehouse_Text_GetLostLeaveMeBe:: @ 817BCA3 .string "What do you want now?\n" .string "Go on, get lost, leave me be.$" -gUnknown_817BCD7:: @ 817BCD7 +FiveIsland_RocketWarehouse_Text_GiovannisKidHasRedHair:: @ 817BCD7 .string "What, you again?\p" .string "You… You're not GIOVANNI's kid,\n" .string "are you?\p" diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc index 7a4d158b3..6535f9588 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc @@ -22,3 +22,22 @@ gUnknown_819A943:: @ 819A943 .string "As a result, the POKéMON LEAGUE is\n" .string "closed for the time being.$" +Text_19A9E7:: @ 819A9E7 + .string "AGATHA's GHOST-type POKéMON are\n" + .string "horrifically terrifying in toughness.\p" + .string "I took my FIGHTING-type POKéMON\n" + .string "and raised them to the max.\p" + .string "I went at AGATHA feeling pretty\n" + .string "confident, but she whupped us.\p" + .string "That old lady's also got a really\n" + .string "short fuse, too.\p" + .string "It doesn't take anything to get\n" + .string "that scary lady hollering.$" + +Text_19AB16:: @ 819AB16 + .string "Maybe becoming an ELITE FOUR\n" + .string "member is in the blood.\p" + .string "From what I've heard, LANCE has\n" + .string "a cousin who's a GYM LEADER\l" + .string "somewhere far away.$" + diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index e32b5f379..b12af5aae 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "MtMoon_1F_EventScript_16063C", + "script": "MtMoon_1F_EventScript_Iris", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "MtMoon_1F_EventScript_160681", + "script": "MtMoon_1F_EventScript_Robby", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "MtMoon_1F_EventScript_160653", + "script": "MtMoon_1F_EventScript_Jovan", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 3, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "MtMoon_1F_EventScript_160625", + "script": "MtMoon_1F_EventScript_Miriam", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "MtMoon_1F_EventScript_16066A", + "script": "MtMoon_1F_EventScript_Kent", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "MtMoon_1F_EventScript_16060E", + "script": "MtMoon_1F_EventScript_Josh", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "MtMoon_1F_EventScript_1605F7", + "script": "MtMoon_1F_EventScript_Macros", "flag": "0" }, { @@ -192,7 +192,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_1F_EventScript_1ACE03", + "script": "MtMoon_1F_EventScript_BaldingMan", "flag": "0" } ], @@ -233,7 +233,7 @@ "x": 19, "y": 26, "elevation": 0, - "script": "MtMoon_1F_EventScript_1605EE" + "script": "MtMoon_1F_EventScript_ZubatSign" } ] } diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc index 4c80943d1..2ddfef089 100644 --- a/data/maps/MtMoon_1F/scripts.inc +++ b/data/maps/MtMoon_1F/scripts.inc @@ -6,41 +6,41 @@ MtMoon_1F_OnTransition:: @ 81605EA setworldmapflag FLAG_WORLD_MAP_MT_MOON_1F end -MtMoon_1F_EventScript_1605EE:: @ 81605EE - msgbox gUnknown_8172AE0, MSGBOX_SIGN +MtMoon_1F_EventScript_ZubatSign:: @ 81605EE + msgbox MtMoon_1F_Text_ZubatIsABloodsucker, MSGBOX_SIGN end -MtMoon_1F_EventScript_1605F7:: @ 81605F7 - trainerbattle_single TRAINER_HIKER_MARCOS, Text_17279D, Text_1727CB - msgbox gUnknown_81727DF, MSGBOX_AUTOCLOSE +MtMoon_1F_EventScript_Macros:: @ 81605F7 + trainerbattle_single TRAINER_HIKER_MARCOS, MtMoon_1F_Text_MarcosIntro, MtMoon_1F_Text_MarcosDefeat + msgbox MtMoon_1F_Text_MarcosPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_16060E:: @ 816060E - trainerbattle_single TRAINER_YOUNGSTER_JOSH, Text_17281D, Text_172844 - msgbox gUnknown_8172863, MSGBOX_AUTOCLOSE +MtMoon_1F_EventScript_Josh:: @ 816060E + trainerbattle_single TRAINER_YOUNGSTER_JOSH, MtMoon_1F_Text_JoshIntro, MtMoon_1F_Text_JoshDefeat + msgbox MtMoon_1F_Text_JoshPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_160625:: @ 8160625 - trainerbattle_single TRAINER_LASS_MIRIAM, Text_172896, Text_1728C3 - msgbox gUnknown_81728D2, MSGBOX_AUTOCLOSE +MtMoon_1F_EventScript_Miriam:: @ 8160625 + trainerbattle_single TRAINER_LASS_MIRIAM, MtMoon_1F_Text_MiriamIntro, MtMoon_1F_Text_MiriamDefeat + msgbox MtMoon_1F_Text_MiriamPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_16063C:: @ 816063C - trainerbattle_single TRAINER_LASS_IRIS, Text_172972, Text_1729A4 - msgbox gUnknown_81729AC, MSGBOX_AUTOCLOSE +MtMoon_1F_EventScript_Iris:: @ 816063C + trainerbattle_single TRAINER_LASS_IRIS, MtMoon_1F_Text_IrisIntro, MtMoon_1F_Text_IrisDefeat + msgbox MtMoon_1F_Text_IrisPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_160653:: @ 8160653 - trainerbattle_single TRAINER_SUPER_NERD_JOVAN, Text_17290B, Text_172927 - msgbox gUnknown_817293C, MSGBOX_AUTOCLOSE +MtMoon_1F_EventScript_Jovan:: @ 8160653 + trainerbattle_single TRAINER_SUPER_NERD_JOVAN, MtMoon_1F_Text_JovanIntro, MtMoon_1F_Text_JovanDefeat + msgbox MtMoon_1F_Text_JovanPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_16066A:: @ 816066A - trainerbattle_single TRAINER_BUG_CATCHER_KENT, Text_1729EA, Text_172A1A - msgbox gUnknown_8172A26, MSGBOX_AUTOCLOSE +MtMoon_1F_EventScript_Kent:: @ 816066A + trainerbattle_single TRAINER_BUG_CATCHER_KENT, MtMoon_1F_Text_KentIntro, MtMoon_1F_Text_KentDefeat + msgbox MtMoon_1F_Text_KentPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_160681:: @ 8160681 - trainerbattle_single TRAINER_BUG_CATCHER_ROBBY, Text_172A55, Text_172A8F - msgbox gUnknown_8172A97, MSGBOX_AUTOCLOSE +MtMoon_1F_EventScript_Robby:: @ 8160681 + trainerbattle_single TRAINER_BUG_CATCHER_ROBBY, MtMoon_1F_Text_RobbyIntro, MtMoon_1F_Text_RobbyDefeat + msgbox MtMoon_1F_Text_RobbyPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtMoon_1F/text.inc b/data/maps/MtMoon_1F/text.inc index 86028da5c..249c9dd50 100644 --- a/data/maps/MtMoon_1F/text.inc +++ b/data/maps/MtMoon_1F/text.inc @@ -1,87 +1,92 @@ -Text_17279D:: @ 817279D +MtMoon_1F_Text_MarcosIntro:: @ 817279D .string "WHOA!\n" .string "You shocked me!\l" .string "…Oh, you're just a kid!$" -Text_1727CB:: @ 81727CB +MtMoon_1F_Text_MarcosDefeat:: @ 81727CB .string "Wow!\n" .string "Shocked again!$" -gUnknown_81727DF:: @ 81727DF +MtMoon_1F_Text_MarcosPostBattle:: @ 81727DF .string "Kids like you shouldn't be\n" .string "wandering around here in the dark.$" -Text_17281D:: @ 817281D +MtMoon_1F_Text_JoshIntro:: @ 817281D .string "Did you come to explore the cave,\n" .string "too?$" -Text_172844:: @ 8172844 +MtMoon_1F_Text_JoshDefeat:: @ 8172844 .string "Losing stinks!\n" .string "It's so uncool.$" -gUnknown_8172863:: @ 8172863 +MtMoon_1F_Text_JoshPostBattle:: @ 8172863 .string "I came all the way down here to\n" .string "show off to girls.$" -Text_172896:: @ 8172896 +MtMoon_1F_Text_MiriamIntro:: @ 8172896 .string "Wow! It's way bigger in here than\n" .string "I thought!$" -Text_1728C3:: @ 81728C3 +MtMoon_1F_Text_MiriamDefeat:: @ 81728C3 .string "Oh!\n" .string "I lost it!$" -gUnknown_81728D2:: @ 81728D2 +MtMoon_1F_Text_MiriamPostBattle:: @ 81728D2 .string "How do you get out of here?\n" .string "It's so big, I may get lost.$" -Text_17290B:: @ 817290B +MtMoon_1F_Text_JovanIntro:: @ 817290B .string "What!\n" .string "Don't sneak up on me!$" -Text_172927:: @ 8172927 +MtMoon_1F_Text_JovanDefeat:: @ 8172927 .string "My POKéMON won't do!$" -gUnknown_817293C:: @ 817293C +MtMoon_1F_Text_JovanPostBattle:: @ 817293C .string "I have to find stronger POKéMON.\n" .string "Where might they be?$" -Text_172972:: @ 8172972 +MtMoon_1F_Text_IrisIntro:: @ 8172972 .string "What?\n" .string "I'm waiting for my friends to find\l" .string "me here.$" -Text_1729A4:: @ 81729A4 +MtMoon_1F_Text_IrisDefeat:: @ 81729A4 .string "I lost?$" -gUnknown_81729AC:: @ 81729AC +MtMoon_1F_Text_IrisPostBattle:: @ 81729AC .string "I came because I heard there are\n" .string "some very rare fossils here.$" -Text_1729EA:: @ 81729EA +MtMoon_1F_Text_KentIntro:: @ 81729EA .string "Suspicious men are in the cave.\n" .string "What about you?$" -Text_172A1A:: @ 8172A1A +MtMoon_1F_Text_KentDefeat:: @ 8172A1A .string "You got me!$" -gUnknown_8172A26:: @ 8172A26 +MtMoon_1F_Text_KentPostBattle:: @ 8172A26 .string "I saw them!\n" .string "I'm sure they're from TEAM ROCKET!$" -Text_172A55:: @ 8172A55 +MtMoon_1F_Text_RobbyIntro:: @ 8172A55 .string "You need to go through this cave\n" .string "to get to CERULEAN CITY.$" -Text_172A8F:: @ 8172A8F +MtMoon_1F_Text_RobbyDefeat:: @ 8172A8F .string "I lost.$" -gUnknown_8172A97:: @ 8172A97 +MtMoon_1F_Text_RobbyPostBattle:: @ 8172A97 .string "ZUBAT is tough!\n" .string "But if you can catch one, you'll\l" .string "be able to count on it.$" -gUnknown_8172AE0:: @ 8172AE0 +MtMoon_1F_Text_ZubatIsABloodsucker:: @ 8172AE0 .string "Beware!\n" .string "ZUBAT is a bloodsucker!$" +MtMoon_1F_Text_BrockHelpsExcavateFossils:: @ 8172B00 + .string "Hi, I'm excavating for fossils here\n" + .string "under MT. MOON.\p" + .string "Sometimes, BROCK of PEWTER GYM\n" + .string "lends me a hand.$" diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index ac65802cb..f3c51828c 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_B2F_EventScript_16071B", + "script": "MtMoon_B2F_EventScript_DomeFossil", "flag": "FLAG_HIDE_DOME_FOSSIL" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_B2F_EventScript_16077F", + "script": "MtMoon_B2F_EventScript_HelixFossil", "flag": "FLAG_HIDE_HELIX_FOSSIL" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtMoon_B2F_EventScript_1606C2", + "script": "MtMoon_B2F_EventScript_Miguel", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "MtMoon_B2F_EventScript_160829", + "script": "MtMoon_B2F_EventScript_Grunt4", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "MtMoon_B2F_EventScript_1607E4", + "script": "MtMoon_B2F_EventScript_Grunt1", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "MtMoon_B2F_EventScript_160812", + "script": "MtMoon_B2F_EventScript_Grunt3", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "MtMoon_B2F_EventScript_1607FB", + "script": "MtMoon_B2F_EventScript_Grunt2", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -195,7 +195,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_MT_MOON_B2F", "var_value": 0, - "script": "MtMoon_B2F_EventScript_1606B0" + "script": "MtMoon_B2F_EventScript_MiguelTrigger" } ], "bg_events": [ diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 71c458c12..515242568 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -1,138 +1,142 @@ +.equ LOCALID_DOME_FOSSIL, 1 +.equ LOCALID_HELIX_FOSSIL, 2 +.equ LOCALID_MIGUEL, 3 + MtMoon_B2F_MapScripts:: @ 8160699 map_script MAP_SCRIPT_ON_TRANSITION, MtMoon_B2F_OnTransition .byte 0 MtMoon_B2F_OnTransition:: @ 816069F - call_if_unset FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_1606A9 + call_if_unset FLAG_GOT_FOSSIL_FROM_MT_MOON, MtMoon_B2F_EventScript_ShowFossils end -EventScript_1606A9:: @ 81606A9 +MtMoon_B2F_EventScript_ShowFossils:: @ 81606A9 clearflag FLAG_HIDE_DOME_FOSSIL clearflag FLAG_HIDE_HELIX_FOSSIL return -MtMoon_B2F_EventScript_1606B0:: @ 81606B0 +MtMoon_B2F_EventScript_MiguelTrigger:: @ 81606B0 lockall - applymovement 3, Movement_WalkInPlaceFastestRight + applymovement LOCALID_MIGUEL, Movement_WalkInPlaceFastestRight waitmovement 0 - call EventScript_1606DD + call MtMoon_B2F_EventScript_BattleMiguel releaseall end -MtMoon_B2F_EventScript_1606C2:: @ 81606C2 +MtMoon_B2F_EventScript_Miguel:: @ 81606C2 lock faceplayer - goto_if_set FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_160707 - goto_if_defeated TRAINER_SUPER_NERD_MIGUEL, EventScript_160711 - call EventScript_1606DD + goto_if_set FLAG_GOT_FOSSIL_FROM_MT_MOON, MtMoon_B2F_EventScript_MiguelFossilPicked + goto_if_defeated TRAINER_SUPER_NERD_MIGUEL, MtMoon_B2F_EventScript_MiguelGoPickFossil + call MtMoon_B2F_EventScript_BattleMiguel release end -EventScript_1606DD:: @ 81606DD +MtMoon_B2F_EventScript_BattleMiguel:: @ 81606DD textcolor 0 - message Text_172B64 + message MtMoon_B2F_Text_MiguelIntro waitmessage playbgm MUS_EXEYE, 0 waitbuttonpress - setvar VAR_LAST_TALKED, 3 - trainerbattle_no_intro TRAINER_SUPER_NERD_MIGUEL, Text_172B99 + setvar VAR_LAST_TALKED, LOCALID_MIGUEL + trainerbattle_no_intro TRAINER_SUPER_NERD_MIGUEL, MtMoon_B2F_Text_MiguelDefeat setvar VAR_MAP_SCENE_MT_MOON_B2F, 1 - msgbox gUnknown_8172BAB + msgbox MtMoon_B2F_Text_WellEachTakeAFossil return -EventScript_160707:: @ 8160707 - msgbox gUnknown_8172BFB +MtMoon_B2F_EventScript_MiguelFossilPicked:: @ 8160707 + msgbox MtMoon_B2F_Text_LabOnCinnabarRegeneratesFossils release end -EventScript_160711:: @ 8160711 - msgbox gUnknown_8172BAB +MtMoon_B2F_EventScript_MiguelGoPickFossil:: @ 8160711 + msgbox MtMoon_B2F_Text_WellEachTakeAFossil release end -MtMoon_B2F_EventScript_16071B:: @ 816071B +MtMoon_B2F_EventScript_DomeFossil:: @ 816071B lock faceplayer - msgbox gUnknown_8172E77, MSGBOX_YESNO + msgbox MtMoon_B2F_Text_YouWantDomeFossil, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1607DE - removeobject 1 - giveitem_msg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5 + goto_if_eq MtMoon_B2F_EventScript_DontTakeFossil + removeobject LOCALID_DOME_FOSSIL + giveitem_msg MtMoon_B2F_Text_ObtainedDomeFossil, ITEM_DOME_FOSSIL, 1, MUS_FAN5 closemessage special sub_8112364 delay 10 - applymovement 3, Movement_16077A + applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToHelixFossil waitmovement 0 - moveobjectoffscreen 3 + moveobjectoffscreen LOCALID_MIGUEL textcolor 0 playfanfare MUS_FAN5 - message Text_172BD6 + message MtMoon_B2F_Text_ThenThisFossilIsMine waitmessage waitfanfare - removeobject 2 + removeobject LOCALID_HELIX_FOSSIL setflag FLAG_GOT_DOME_FOSSIL setflag FLAG_GOT_FOSSIL_FROM_MT_MOON release end -Movement_16077A:: @ 816077A +MtMoon_B2F_Movement_MiguelToHelixFossil:: @ 816077A walk_right walk_up walk_up walk_up step_end -MtMoon_B2F_EventScript_16077F:: @ 816077F +MtMoon_B2F_EventScript_HelixFossil:: @ 816077F lock faceplayer - msgbox gUnknown_8172E94, MSGBOX_YESNO + msgbox MtMoon_B2F_Text_YouWantHelixFossil, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1607DE - removeobject 2 - giveitem_msg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 + goto_if_eq MtMoon_B2F_EventScript_DontTakeFossil + removeobject LOCALID_HELIX_FOSSIL + giveitem_msg MtMoon_B2F_Text_ObtainedHelixFossil, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 closemessage special sub_8112364 delay 10 - applymovement 3, Movement_1607E0 + applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToDomeFossil waitmovement 0 - moveobjectoffscreen 3 + moveobjectoffscreen LOCALID_MIGUEL textcolor 0 playfanfare MUS_FAN5 - message Text_172BD6 + message MtMoon_B2F_Text_ThenThisFossilIsMine waitmessage waitfanfare - removeobject 1 + removeobject LOCALID_DOME_FOSSIL setflag FLAG_GOT_HELIX_FOSSIL setflag FLAG_GOT_FOSSIL_FROM_MT_MOON release end -EventScript_1607DE:: @ 81607DE +MtMoon_B2F_EventScript_DontTakeFossil:: @ 81607DE release end -Movement_1607E0:: @ 81607E0 +MtMoon_B2F_Movement_MiguelToDomeFossil:: @ 81607E0 walk_up walk_up walk_up step_end -MtMoon_B2F_EventScript_1607E4:: @ 81607E4 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, Text_172C5A, Text_172CB8 - msgbox gUnknown_8172CCB, MSGBOX_AUTOCLOSE +MtMoon_B2F_EventScript_Grunt1:: @ 81607E4 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, MtMoon_B2F_Text_Grunt1Intro, MtMoon_B2F_Text_Grunt1Defeat + msgbox MtMoon_B2F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -MtMoon_B2F_EventScript_1607FB:: @ 81607FB - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, Text_172CFC, Text_172D46 - msgbox gUnknown_8172D51, MSGBOX_AUTOCLOSE +MtMoon_B2F_EventScript_Grunt2:: @ 81607FB + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, MtMoon_B2F_Text_Grunt2Intro, MtMoon_B2F_Text_Grunt2Defeat + msgbox MtMoon_B2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end -MtMoon_B2F_EventScript_160812:: @ 8160812 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, Text_172D82, Text_172DAF - msgbox gUnknown_8172DC1, MSGBOX_AUTOCLOSE +MtMoon_B2F_EventScript_Grunt3:: @ 8160812 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, MtMoon_B2F_Text_Grunt3Intro, MtMoon_B2F_Text_Grunt3Defeat + msgbox MtMoon_B2F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE end -MtMoon_B2F_EventScript_160829:: @ 8160829 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, Text_172DF0, Text_172E3E - msgbox gUnknown_8172E4B, MSGBOX_AUTOCLOSE +MtMoon_B2F_EventScript_Grunt4:: @ 8160829 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, MtMoon_B2F_Text_Grunt4Intro, MtMoon_B2F_Text_Grunt4Defeat + msgbox MtMoon_B2F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtMoon_B2F/text.inc b/data/maps/MtMoon_B2F/text.inc index 2f27312db..fd4b564f0 100644 --- a/data/maps/MtMoon_B2F/text.inc +++ b/data/maps/MtMoon_B2F/text.inc @@ -1,90 +1,84 @@ -Text_172B00:: @ 8172B00 - .string "Hi, I'm excavating for fossils here\n" - .string "under MT. MOON.\p" - .string "Sometimes, BROCK of PEWTER GYM\n" - .string "lends me a hand.$" - -Text_172B64:: @ 8172B64 +MtMoon_B2F_Text_MiguelIntro:: @ 8172B64 .string "Hey, stop!\p" .string "I found these fossils!\n" .string "They're both mine!$" -Text_172B99:: @ 8172B99 +MtMoon_B2F_Text_MiguelDefeat:: @ 8172B99 .string "Okay!\n" .string "I'll share!$" -gUnknown_8172BAB:: @ 8172BAB +MtMoon_B2F_Text_WellEachTakeAFossil:: @ 8172BAB .string "We'll each take a fossil!\n" .string "No being greedy!$" -Text_172BD6:: @ 8172BD6 +MtMoon_B2F_Text_ThenThisFossilIsMine:: @ 8172BD6 .string "All right.\n" .string "Then this fossil is mine!$" -gUnknown_8172BFB:: @ 8172BFB +MtMoon_B2F_Text_LabOnCinnabarRegeneratesFossils:: @ 8172BFB .string "Far away, on CINNABAR ISLAND,\n" .string "there's a POKéMON LAB.\p" .string "They do research on regenerating\n" .string "fossils.$" -Text_172C5A:: @ 8172C5A +MtMoon_B2F_Text_Grunt1Intro:: @ 8172C5A .string "We, TEAM ROCKET, shall find the\n" .string "fossils!\p" .string "Reviving POKéMON from them will\n" .string "earn us huge riches!$" -Text_172CB8:: @ 8172CB8 +MtMoon_B2F_Text_Grunt1Defeat:: @ 8172CB8 .string "Urgh!\n" .string "Now I'm mad!$" -gUnknown_8172CCB:: @ 8172CCB +MtMoon_B2F_Text_Grunt1PostBattle:: @ 8172CCB .string "You made me mad!\n" .string "TEAM ROCKET will blacklist you!$" -Text_172CFC:: @ 8172CFC +MtMoon_B2F_Text_Grunt2Intro:: @ 8172CFC .string "We, TEAM ROCKET, are POKéMON\n" .string "gangsters!\l" .string "We strike fear with our strength!$" -Text_172D46:: @ 8172D46 +MtMoon_B2F_Text_Grunt2Defeat:: @ 8172D46 .string "I blew it!$" -gUnknown_8172D51:: @ 8172D51 +MtMoon_B2F_Text_Grunt2PostBattle:: @ 8172D51 .string "Darn it all!\n" .string "My associates won't stand for this!$" -Text_172D82:: @ 8172D82 +MtMoon_B2F_Text_Grunt3Intro:: @ 8172D82 .string "We're pulling a big job here!\n" .string "Get lost, kid!$" -Text_172DAF:: @ 8172DAF +MtMoon_B2F_Text_Grunt3Defeat:: @ 8172DAF .string "So, you are good…$" -gUnknown_8172DC1:: @ 8172DC1 +MtMoon_B2F_Text_Grunt3PostBattle:: @ 8172DC1 .string "If you find a fossil, give it to me\n" .string "and scram!$" -Text_172DF0:: @ 8172DF0 +MtMoon_B2F_Text_Grunt4Intro:: @ 8172DF0 .string "Little kids shouldn't be messing\n" .string "around with grown-ups!\p" .string "It could be bad news!$" -Text_172E3E:: @ 8172E3E +MtMoon_B2F_Text_Grunt4Defeat:: @ 8172E3E .string "I'm steamed!$" -gUnknown_8172E4B:: @ 8172E4B +MtMoon_B2F_Text_Grunt4PostBattle:: @ 8172E4B .string "POKéMON lived here long before\n" .string "people came.$" -gUnknown_8172E77:: @ 8172E77 +MtMoon_B2F_Text_YouWantDomeFossil:: @ 8172E77 .string "Do you want the DOME FOSSIL?$" -gUnknown_8172E94:: @ 8172E94 +MtMoon_B2F_Text_YouWantHelixFossil:: @ 8172E94 .string "Do you want the HELIX FOSSIL?$" -gUnknown_8172EB2:: @ 8172EB2 +MtMoon_B2F_Text_ObtainedHelixFossil:: @ 8172EB2 .string "Obtained the HELIX FOSSIL!$" -gUnknown_8172ECD:: @ 8172ECD +MtMoon_B2F_Text_ObtainedDomeFossil:: @ 8172ECD .string "Obtained the DOME FOSSIL!$" diff --git a/data/maps/OneIsland/text.inc b/data/maps/OneIsland/text.inc index aeccc1e47..d9a6e376a 100644 --- a/data/maps/OneIsland/text.inc +++ b/data/maps/OneIsland/text.inc @@ -1,12 +1,3 @@ -Text_181569:: @ 8181569 - .string "This FAN CLUB…\n" - .string "No one here has a clue!\p" - .string "How could they not recognize\n" - .string "the brilliance that is LANCE?\p" - .string "He stands for justice!\n" - .string "He's cool, and yet passionate!\l" - .string "He's the greatest, LANCE!$" - gUnknown_818161B:: @ 818161B .string "BILL: Here we are!\n" .string "This is ONE ISLAND.\p" diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index 586bf0f0d..4314d758f 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "RocketHideout_B1F_EventScript_1611C5", + "script": "RocketHideout_B1F_EventScript_Grunt2", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "RocketHideout_B1F_EventScript_1611AE", + "script": "RocketHideout_B1F_EventScript_Grunt1", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "RocketHideout_B1F_EventScript_1611F3", + "script": "RocketHideout_B1F_EventScript_Grunt4", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "RocketHideout_B1F_EventScript_1611DC", + "script": "RocketHideout_B1F_EventScript_Grunt3", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "RocketHideout_B1F_EventScript_16120A", + "script": "RocketHideout_B1F_EventScript_Grunt5", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index c27dd99f3..ac95862a2 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -4,60 +4,60 @@ RocketHideout_B1F_MapScripts:: @ 8161195 .byte 0 RocketHideout_B1F_OnLoad:: @ 81611A0 - call_if_not_defeated TRAINER_TEAM_ROCKET_GRUNT_12 EventScript_161233 + call_if_not_defeated TRAINER_TEAM_ROCKET_GRUNT_12 RocketHideout_B1F_EventScript_SetBarrier end RocketHideout_B1F_OnTransition:: @ 81611AA setworldmapflag FLAG_WORLD_MAP_ROCKET_HIDEOUT_B1F end -RocketHideout_B1F_EventScript_1611AE:: @ 81611AE - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_8, Text_174ECA, Text_174EED - msgbox gUnknown_8174EFA, MSGBOX_AUTOCLOSE +RocketHideout_B1F_EventScript_Grunt1:: @ 81611AE + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_8, RocketHideout_B1F_Text_Grunt1Intro, RocketHideout_B1F_Text_Grunt1Defeat + msgbox RocketHideout_B1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -RocketHideout_B1F_EventScript_1611C5:: @ 81611C5 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_9, Text_174F2C, Text_174F60 - msgbox gUnknown_8174F66, MSGBOX_AUTOCLOSE +RocketHideout_B1F_EventScript_Grunt2:: @ 81611C5 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_9, RocketHideout_B1F_Text_Grunt2Intro, RocketHideout_B1F_Text_Grunt2Defeat + msgbox RocketHideout_B1F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end -RocketHideout_B1F_EventScript_1611DC:: @ 81611DC - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_10, Text_174F94, Text_174FA4 - msgbox gUnknown_8174FB3, MSGBOX_AUTOCLOSE +RocketHideout_B1F_EventScript_Grunt3:: @ 81611DC + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_10, RocketHideout_B1F_Text_Grunt3Intro, RocketHideout_B1F_Text_Grunt3Defeat + msgbox RocketHideout_B1F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE end -RocketHideout_B1F_EventScript_1611F3:: @ 81611F3 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_11, Text_174FE1, Text_174FF8 - msgbox gUnknown_8175007, MSGBOX_AUTOCLOSE +RocketHideout_B1F_EventScript_Grunt4:: @ 81611F3 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_11, RocketHideout_B1F_Text_Grunt4Intro, RocketHideout_B1F_Text_Grunt4Defeat + msgbox RocketHideout_B1F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE end -RocketHideout_B1F_EventScript_16120A:: @ 816120A - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_12, Text_17503A, Text_17505A, EventScript_161225 - msgbox gUnknown_8175060, MSGBOX_AUTOCLOSE +RocketHideout_B1F_EventScript_Grunt5:: @ 816120A + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_12, RocketHideout_B1F_Text_Grunt5Intro, RocketHideout_B1F_Text_Grunt5Defeat, RocketHideout_B1F_EventScript_DefeatedGrunt5 + msgbox RocketHideout_B1F_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE end -EventScript_161225:: @ 8161225 - call EventScript_16126A +RocketHideout_B1F_EventScript_DefeatedGrunt5:: @ 8161225 + call RocketHideout_B1F_EventScript_RemoveBarrier playse SE_KI_GASYAN special DrawWholeMapView waitse release end -EventScript_161233:: @ 8161233 - setmetatile 20, 19, 718, 1 - setmetatile 21, 19, 719, 1 - setmetatile 20, 20, 726, 1 - setmetatile 21, 20, 727, 1 - setmetatile 20, 21, 642, 0 - setmetatile 21, 21, 642, 0 +RocketHideout_B1F_EventScript_SetBarrier:: @ 8161233 + setmetatile 20, 19, METATILE_Hideout_Barrier_TopLeft_Floor, 1 + setmetatile 21, 19, METATILE_Hideout_Barrier_TopRight_Floor, 1 + setmetatile 20, 20, METATILE_Hideout_Barrier_BottomLeft, 1 + setmetatile 21, 20, METATILE_Hideout_Barrier_BottomRight, 1 + setmetatile 20, 21, METATILE_Hideout_Floor_ShadeFull, 0 + setmetatile 21, 21, METATILE_Hideout_Floor_ShadeFull, 0 return -EventScript_16126A:: @ 816126A - setmetatile 20, 19, 642, 0 - setmetatile 21, 19, 641, 0 - setmetatile 20, 20, 642, 0 - setmetatile 21, 20, 641, 0 - setmetatile 20, 21, 642, 0 - setmetatile 21, 21, 641, 0 +RocketHideout_B1F_EventScript_RemoveBarrier:: @ 816126A + setmetatile 20, 19, METATILE_Hideout_Floor_ShadeFull, 0 + setmetatile 21, 19, METATILE_Hideout_Floor, 0 + setmetatile 20, 20, METATILE_Hideout_Floor_ShadeFull, 0 + setmetatile 21, 20, METATILE_Hideout_Floor, 0 + setmetatile 20, 21, METATILE_Hideout_Floor_ShadeFull, 0 + setmetatile 21, 21, METATILE_Hideout_Floor, 0 return diff --git a/data/maps/RocketHideout_B1F/text.inc b/data/maps/RocketHideout_B1F/text.inc index fd7647e2b..9dea66b16 100644 --- a/data/maps/RocketHideout_B1F/text.inc +++ b/data/maps/RocketHideout_B1F/text.inc @@ -1,53 +1,53 @@ -Text_174ECA:: @ 8174ECA +RocketHideout_B1F_Text_Grunt1Intro:: @ 8174ECA .string "Who are you?\n" .string "How did you get here?$" -Text_174EED:: @ 8174EED +RocketHideout_B1F_Text_Grunt1Defeat:: @ 8174EED .string "Oww!\n" .string "Beaten!$" -gUnknown_8174EFA:: @ 8174EFA +RocketHideout_B1F_Text_Grunt1PostBattle:: @ 8174EFA .string "Blast it… You're dissing TEAM\n" .string "ROCKET, aren't you?$" -Text_174F2C:: @ 8174F2C +RocketHideout_B1F_Text_Grunt2Intro:: @ 8174F2C .string "You broke into TEAM ROCKET's\n" .string "operation? What nerve!$" -Text_174F60:: @ 8174F60 +RocketHideout_B1F_Text_Grunt2Defeat:: @ 8174F60 .string "Boom!$" -gUnknown_8174F66:: @ 8174F66 +RocketHideout_B1F_Text_Grunt2PostBattle:: @ 8174F66 .string "You're not going to get away with\n" .string "this, brat!$" -Text_174F94:: @ 8174F94 +RocketHideout_B1F_Text_Grunt3Intro:: @ 8174F94 .string "Intruder alert!$" -Text_174FA4:: @ 8174FA4 +RocketHideout_B1F_Text_Grunt3Defeat:: @ 8174FA4 .string "I can't do it!$" -gUnknown_8174FB3:: @ 8174FB3 +RocketHideout_B1F_Text_Grunt3PostBattle:: @ 8174FB3 .string "SILPH SCOPE? Humph!\n" .string "I don't know where it is.$" -Text_174FE1:: @ 8174FE1 +RocketHideout_B1F_Text_Grunt4Intro:: @ 8174FE1 .string "Why did you come here?$" -Text_174FF8:: @ 8174FF8 +RocketHideout_B1F_Text_Grunt4Defeat:: @ 8174FF8 .string "This won't do!$" -gUnknown_8175007:: @ 8175007 +RocketHideout_B1F_Text_Grunt4PostBattle:: @ 8175007 .string "Okay, I'll talk…\n" .string "Take the elevator to see my BOSS.$" -Text_17503A:: @ 817503A +RocketHideout_B1F_Text_Grunt5Intro:: @ 817503A .string "Are you lost, you little mouse?$" -Text_17505A:: @ 817505A +RocketHideout_B1F_Text_Grunt5Defeat:: @ 817505A .string "Why…?$" -gUnknown_8175060:: @ 8175060 +RocketHideout_B1F_Text_Grunt5PostBattle:: @ 8175060 .string "Uh-oh, that ruckus somehow opened\n" .string "the door!$" diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index bdc600f55..2c353b5c1 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "RocketHideout_B2F_EventScript_1612A2", + "script": "RocketHideout_B2F_EventScript_Grunt", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { diff --git a/data/maps/RocketHideout_B2F/scripts.inc b/data/maps/RocketHideout_B2F/scripts.inc index 07916ad03..55e7f6a2a 100644 --- a/data/maps/RocketHideout_B2F/scripts.inc +++ b/data/maps/RocketHideout_B2F/scripts.inc @@ -1,7 +1,7 @@ RocketHideout_B2F_MapScripts:: @ 81612A1 .byte 0 -RocketHideout_B2F_EventScript_1612A2:: @ 81612A2 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, Text_17508C, Text_1750BF - msgbox gUnknown_81750CC, MSGBOX_AUTOCLOSE +RocketHideout_B2F_EventScript_Grunt:: @ 81612A2 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, RocketHideout_B2F_Text_GruntIntro, RocketHideout_B2F_Text_GruntDefeat + msgbox RocketHideout_B2F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RocketHideout_B2F/text.inc b/data/maps/RocketHideout_B2F/text.inc index d21c21555..a27121152 100644 --- a/data/maps/RocketHideout_B2F/text.inc +++ b/data/maps/RocketHideout_B2F/text.inc @@ -1,11 +1,11 @@ -Text_17508C:: @ 817508C +RocketHideout_B2F_Text_GruntIntro:: @ 817508C .string "BOSS said you can see ghosts with\n" .string "the SILPH SCOPE.$" -Text_1750BF:: @ 81750BF +RocketHideout_B2F_Text_GruntDefeat:: @ 81750BF .string "I surrender!$" -gUnknown_81750CC:: @ 81750CC +RocketHideout_B2F_Text_GruntPostBattle:: @ 81750CC .string "The TEAM ROCKET HQ has four\n" .string "underground floors.\p" .string "Think you can reach the BOSS?$" diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index be88faebf..a4c1a7c72 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "RocketHideout_B3F_EventScript_1612D1", + "script": "RocketHideout_B3F_EventScript_Grunt2", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "RocketHideout_B3F_EventScript_1612BA", + "script": "RocketHideout_B3F_EventScript_Grunt1", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { diff --git a/data/maps/RocketHideout_B3F/scripts.inc b/data/maps/RocketHideout_B3F/scripts.inc index d6a57ab77..ab1fd6bb3 100644 --- a/data/maps/RocketHideout_B3F/scripts.inc +++ b/data/maps/RocketHideout_B3F/scripts.inc @@ -1,12 +1,12 @@ RocketHideout_B3F_MapScripts:: @ 81612B9 .byte 0 -RocketHideout_B3F_EventScript_1612BA:: @ 81612BA - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, Text_17511A, Text_17514A - msgbox gUnknown_817515B, MSGBOX_AUTOCLOSE +RocketHideout_B3F_EventScript_Grunt1:: @ 81612BA + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, RocketHideout_B3F_Text_Grunt1Intro, RocketHideout_B3F_Text_Grunt1Defeat + msgbox RocketHideout_B3F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -RocketHideout_B3F_EventScript_1612D1:: @ 81612D1 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, Text_17519E, Text_1751CE - msgbox gUnknown_81751E0, MSGBOX_AUTOCLOSE +RocketHideout_B3F_EventScript_Grunt2:: @ 81612D1 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, RocketHideout_B3F_Text_Grunt2Intro, RocketHideout_B3F_Text_Grunt2Defeat + msgbox RocketHideout_B3F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RocketHideout_B3F/text.inc b/data/maps/RocketHideout_B3F/text.inc index deedfce38..12a9c5a7e 100644 --- a/data/maps/RocketHideout_B3F/text.inc +++ b/data/maps/RocketHideout_B3F/text.inc @@ -1,25 +1,25 @@ -Text_17511A:: @ 817511A +RocketHideout_B3F_Text_Grunt1Intro:: @ 817511A .string "Stop meddling in TEAM ROCKET's\n" .string "affairs or else!$" -Text_17514A:: @ 817514A +RocketHideout_B3F_Text_Grunt1Defeat:: @ 817514A .string "Oof!\n" .string "Taken down!$" -gUnknown_817515B:: @ 817515B +RocketHideout_B3F_Text_Grunt1PostBattle:: @ 817515B .string "SILPH SCOPE?\n" .string "Oh, that machine the BOSS stole.\p" .string "It's here somewhere.$" -Text_17519E:: @ 817519E +RocketHideout_B3F_Text_Grunt2Intro:: @ 817519E .string "We got word from upstairs that you\n" .string "were coming!$" -Text_1751CE:: @ 81751CE +RocketHideout_B3F_Text_Grunt2Defeat:: @ 81751CE .string "What?\n" .string "I lost? No!$" -gUnknown_81751E0:: @ 81751E0 +RocketHideout_B3F_Text_Grunt2PostBattle:: @ 81751E0 .string "Go ahead and go!\p" .string "But you can't run the elevator\n" .string "without the LIFT KEY.$" diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index 1790720b4..da6f7f569 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B4F_EventScript_161317", + "script": "RocketHideout_B4F_EventScript_Giovanni", "flag": "FLAG_HIDE_HIDEOUT_GIOVANNI" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "RocketHideout_B4F_EventScript_161381", + "script": "RocketHideout_B4F_EventScript_Grunt1", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B4F_EventScript_161418", + "script": "RocketHideout_B4F_EventScript_Grunt3", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "RocketHideout_B4F_EventScript_1613CE", + "script": "RocketHideout_B4F_EventScript_Grunt2", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 68671a7a8..63fff7d82 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -1,33 +1,39 @@ +.equ LOCALID_GIOVANNI, 1 +.equ LOCALID_SILPH_SCOPE, 2 +.equ LOCALID_LIFT_KEY, 4 + +.equ NUM_DOOR_GRUNTS_DEFEATED, VAR_TEMP_1 + RocketHideout_B4F_MapScripts:: @ 81612E8 map_script MAP_SCRIPT_ON_LOAD, RocketHideout_B4F_OnLoad .byte 0 RocketHideout_B4F_OnLoad:: @ 81612EE - setvar VAR_TEMP_1, 0 - call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311 - call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311 - compare VAR_TEMP_1, 2 - call_if_ne EventScript_16146A + setvar NUM_DOOR_GRUNTS_DEFEATED, 0 + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated + compare NUM_DOOR_GRUNTS_DEFEATED, 2 + call_if_ne RocketHideout_B4F_EventScript_SetBarrier end -EventScript_161311:: @ 8161311 - addvar VAR_TEMP_1, 1 +RocketHideout_B4F_EventScript_CountGruntDefeated:: @ 8161311 + addvar NUM_DOOR_GRUNTS_DEFEATED, 1 return -RocketHideout_B4F_EventScript_161317:: @ 8161317 +RocketHideout_B4F_EventScript_Giovanni:: @ 8161317 lock faceplayer famechecker FAMECHECKER_GIOVANNI, 0 - message Text_175226 + message RocketHideout_B4F_Text_GiovanniIntro waitmessage playbgm MUS_ROCKET, 0 waitbuttonpress - trainerbattle_no_intro TRAINER_BOSS_GIOVANNI, Text_175318 - msgbox gUnknown_817532D + trainerbattle_no_intro TRAINER_BOSS_GIOVANNI, RocketHideout_B4F_Text_GiovanniDefeat + msgbox RocketHideout_B4F_Text_GiovanniPostBattle fadescreen FADE_TO_BLACK closemessage - removeobject 1 - addobject 2 + removeobject LOCALID_GIOVANNI + addobject LOCALID_SILPH_SCOPE clearflag FLAG_HIDE_SILPH_SCOPE setflag FLAG_HIDE_CELADON_ROCKETS famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 @@ -38,22 +44,22 @@ RocketHideout_B4F_EventScript_161317:: @ 8161317 RocketHideout_B4F_EventScript_SilphScope:: @ 8161363 lock faceplayer - removeobject 2 + removeobject LOCALID_SILPH_SCOPE giveitem ITEM_SILPH_SCOPE compare VAR_RESULT, FALSE goto_if_eq EventScript_BagIsFull release end -RocketHideout_B4F_EventScript_161381:: @ 8161381 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_18, Text_175488, Text_1754B9, EventScript_16139D - msgbox gUnknown_81754BD +RocketHideout_B4F_EventScript_Grunt1:: @ 8161381 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_18, RocketHideout_B4F_Text_Grunt1Intro, RocketHideout_B4F_Text_Grunt1Defeat, RocketHideout_B4F_EventScript_DefeatedGrunt1 + msgbox RocketHideout_B4F_Text_Grunt1PostBattle release end -EventScript_16139D:: @ 816139D - msgbox gUnknown_81754BD - addobject 4 +RocketHideout_B4F_EventScript_DefeatedGrunt1:: @ 816139D + msgbox RocketHideout_B4F_Text_Grunt1PostBattle + addobject LOCALID_LIFT_KEY clearflag FLAG_HIDE_LIFT_KEY release end @@ -62,65 +68,65 @@ RocketHideout_B4F_EventScript_LiftKey:: @ 81613AD lock faceplayer setflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT - removeobject 4 + removeobject LOCALID_LIFT_KEY giveitem ITEM_LIFT_KEY compare VAR_RESULT, FALSE goto_if_eq EventScript_BagIsFull release end -RocketHideout_B4F_EventScript_1613CE:: @ 81613CE - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_16, Text_1753D0, Text_1753FE, EventScript_1613E9 - msgbox gUnknown_817540C, MSGBOX_AUTOCLOSE +RocketHideout_B4F_EventScript_Grunt2:: @ 81613CE + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_Text_Grunt2Intro, RocketHideout_B4F_Text_Grunt2Defeat, RocketHideout_B4F_EventScript_DefeatedGrunt2 + msgbox RocketHideout_B4F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end -EventScript_1613E9:: @ 81613E9 - setvar VAR_TEMP_1, 0 - call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311 - call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311 - compare VAR_TEMP_1, 2 - call_if_eq EventScript_1614A1 - compare VAR_TEMP_1, 2 - call_if_eq EventScript_161462 +RocketHideout_B4F_EventScript_DefeatedGrunt2:: @ 81613E9 + setvar NUM_DOOR_GRUNTS_DEFEATED, 0 + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated + compare NUM_DOOR_GRUNTS_DEFEATED, 2 + call_if_eq RocketHideout_B4F_EventScript_RemoveBarrier + compare NUM_DOOR_GRUNTS_DEFEATED, 2 + call_if_eq RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval release end -RocketHideout_B4F_EventScript_161418:: @ 8161418 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_17, Text_175437, Text_175463, EventScript_161433 - msgbox gUnknown_817546A, MSGBOX_AUTOCLOSE +RocketHideout_B4F_EventScript_Grunt3:: @ 8161418 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_Text_Grunt3Intro, RocketHideout_B4F_Text_Grunt3Defeat, RocketHideout_B4F_EventScript_DefeatedGrunt3 + msgbox RocketHideout_B4F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE end -EventScript_161433:: @ 8161433 - setvar VAR_TEMP_1, 0 - call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311 - call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311 - compare VAR_TEMP_1, 2 - call_if_eq EventScript_1614A1 - compare VAR_TEMP_1, 2 - call_if_eq EventScript_161462 +RocketHideout_B4F_EventScript_DefeatedGrunt3:: @ 8161433 + setvar NUM_DOOR_GRUNTS_DEFEATED, 0 + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated + call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated + compare NUM_DOOR_GRUNTS_DEFEATED, 2 + call_if_eq RocketHideout_B4F_EventScript_RemoveBarrier + compare NUM_DOOR_GRUNTS_DEFEATED, 2 + call_if_eq RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval release end -EventScript_161462:: @ 8161462 +RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval:: @ 8161462 playse SE_KI_GASYAN special DrawWholeMapView waitse return -EventScript_16146A:: @ 816146A - setmetatile 17, 12, 718, 1 - setmetatile 18, 12, 719, 1 - setmetatile 17, 13, 726, 1 - setmetatile 18, 13, 727, 1 - setmetatile 17, 14, 642, 0 - setmetatile 18, 14, 642, 0 +RocketHideout_B4F_EventScript_SetBarrier:: @ 816146A + setmetatile 17, 12, METATILE_Hideout_Barrier_TopLeft_Floor, 1 + setmetatile 18, 12, METATILE_Hideout_Barrier_TopRight_Floor, 1 + setmetatile 17, 13, METATILE_Hideout_Barrier_BottomLeft, 1 + setmetatile 18, 13, METATILE_Hideout_Barrier_BottomRight, 1 + setmetatile 17, 14, METATILE_Hideout_Floor_ShadeFull, 0 + setmetatile 18, 14, METATILE_Hideout_Floor_ShadeFull, 0 return -EventScript_1614A1:: @ 81614A1 - setmetatile 17, 12, 642, 0 - setmetatile 18, 12, 641, 0 - setmetatile 17, 13, 642, 0 - setmetatile 18, 13, 641, 0 - setmetatile 17, 14, 642, 0 - setmetatile 18, 14, 641, 0 +RocketHideout_B4F_EventScript_RemoveBarrier:: @ 81614A1 + setmetatile 17, 12, METATILE_Hideout_Floor_ShadeFull, 0 + setmetatile 18, 12, METATILE_Hideout_Floor, 0 + setmetatile 17, 13, METATILE_Hideout_Floor_ShadeFull, 0 + setmetatile 18, 13, METATILE_Hideout_Floor, 0 + setmetatile 17, 14, METATILE_Hideout_Floor_ShadeFull, 0 + setmetatile 18, 14, METATILE_Hideout_Floor, 0 return diff --git a/data/maps/RocketHideout_B4F/text.inc b/data/maps/RocketHideout_B4F/text.inc index 4ceba8968..9d11d7502 100644 --- a/data/maps/RocketHideout_B4F/text.inc +++ b/data/maps/RocketHideout_B4F/text.inc @@ -1,4 +1,4 @@ -Text_175226:: @ 8175226 +RocketHideout_B4F_Text_GiovanniIntro:: @ 8175226 .string "So! I must say, I am impressed you\n" .string "got here.\p" .string "TEAM ROCKET captures POKéMON from\n" @@ -9,11 +9,11 @@ Text_175226:: @ 8175226 .string "For your insolence, you will feel a\n" .string "world of pain!$" -Text_175318:: @ 8175318 +RocketHideout_B4F_Text_GiovanniDefeat:: @ 8175318 .string "WHAT!\n" .string "This can't be!$" -gUnknown_817532D:: @ 817532D +RocketHideout_B4F_Text_GiovanniPostBattle:: @ 817532D .string "I see that you raise POKéMON with\n" .string "utmost care.\p" .string "A child like you would never\n" @@ -21,36 +21,36 @@ gUnknown_817532D:: @ 817532D .string "I shall step aside this time!\p" .string "I hope we meet again…$" -Text_1753D0:: @ 81753D0 +RocketHideout_B4F_Text_Grunt2Intro:: @ 81753D0 .string "I know you!\n" .string "You ruined our plans at MT. MOON!$" -Text_1753FE:: @ 81753FE +RocketHideout_B4F_Text_Grunt2Defeat:: @ 81753FE .string "Burned again!$" -gUnknown_817540C:: @ 817540C +RocketHideout_B4F_Text_Grunt2PostBattle:: @ 817540C .string "Do you have something against TEAM\n" .string "ROCKET?$" -Text_175437:: @ 8175437 +RocketHideout_B4F_Text_Grunt3Intro:: @ 8175437 .string "How can you not see the beauty of\n" .string "our evil?$" -Text_175463:: @ 8175463 +RocketHideout_B4F_Text_Grunt3Defeat:: @ 8175463 .string "Ayaya!$" -gUnknown_817546A:: @ 817546A +RocketHideout_B4F_Text_Grunt3PostBattle:: @ 817546A .string "BOSS!\n" .string "I'm sorry I failed you!$" -Text_175488:: @ 8175488 +RocketHideout_B4F_Text_Grunt1Intro:: @ 8175488 .string "The elevator doesn't work?\n" .string "Who has the LIFT KEY?$" -Text_1754B9:: @ 81754B9 +RocketHideout_B4F_Text_Grunt1Defeat:: @ 81754B9 .string "No!$" -gUnknown_81754BD:: @ 81754BD +RocketHideout_B4F_Text_Grunt1PostBattle:: @ 81754BD .string "Oh, no!\n" .string "I dropped the LIFT KEY!$" diff --git a/data/maps/RocketHideout_Elevator/map.json b/data/maps/RocketHideout_Elevator/map.json index dd2191b6d..307ef90df 100644 --- a/data/maps/RocketHideout_Elevator/map.json +++ b/data/maps/RocketHideout_Elevator/map.json @@ -36,7 +36,7 @@ "x": 0, "y": 2, "elevation": 0, - "script": "RocketHideout_Elevator_EventScript_1614D9" + "script": "RocketHideout_Elevator_EventScript_FloorSelect" } ] } diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index f649e5c40..f9f210fc0 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -1,11 +1,11 @@ RocketHideout_Elevator_MapScripts:: @ 81614D8 .byte 0 -RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 +RocketHideout_Elevator_EventScript_FloorSelect:: @ 81614D9 lockall - goto_if_unset FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT, EventScript_16161B + goto_if_unset FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT, RocketHideout_Elevator_EventScript_NeedKey setvar VAR_0x8004, 2 - call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 + call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow message Text_WantWhichFloor @@ -13,83 +13,71 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 setvar VAR_0x8004, 2 specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos switch VAR_RESULT - case 0, EventScript_161530 - case 1, EventScript_16153C - case 2, EventScript_161548 + case 0, RocketHideout_Elevator_EventScript_FloorSelectFromB1F + case 1, RocketHideout_Elevator_EventScript_FloorSelectFromB2F + case 2, RocketHideout_Elevator_EventScript_FloorSelectFromB4F end -EventScript_161530:: @ 8161530 +RocketHideout_Elevator_EventScript_FloorSelectFromB1F:: @ 8161530 multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 0, FALSE - goto EventScript_161554 - -EventScript_16153B:: @ 816153B + goto RocketHideout_Elevator_EventScript_ChooseFloor end -EventScript_16153C:: @ 816153C +RocketHideout_Elevator_EventScript_FloorSelectFromB2F:: @ 816153C multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 1, FALSE - goto EventScript_161554 - -EventScript_161547:: @ 8161547 + goto RocketHideout_Elevator_EventScript_ChooseFloor end -EventScript_161548:: @ 8161548 +RocketHideout_Elevator_EventScript_FloorSelectFromB4F:: @ 8161548 multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 2, FALSE - goto EventScript_161554 - -EventScript_161553:: @ 8161553 + goto RocketHideout_Elevator_EventScript_ChooseFloor end -EventScript_161554:: @ 8161554 +RocketHideout_Elevator_EventScript_ChooseFloor:: @ 8161554 switch VAR_RESULT - case 0, EventScript_161591 - case 1, EventScript_1615B9 - case 2, EventScript_1615E1 - case 3, EventScript_161609 - case 127, EventScript_161609 + case 0, RocketHideout_Elevator_EventScript_ToB1F + case 1, RocketHideout_Elevator_EventScript_ToB2F + case 2, RocketHideout_Elevator_EventScript_ToB4F + case 3, RocketHideout_Elevator_EventScript_ExitFloorSelect + case 127, RocketHideout_Elevator_EventScript_ExitFloorSelect end -EventScript_161591:: @ 8161591 +RocketHideout_Elevator_EventScript_ToB1F:: @ 8161591 setvar VAR_0x8006, 3 setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25 compare VAR_ELEVATOR_FLOOR, 3 - goto_if_eq EventScript_161609 - call EventScript_16160E + goto_if_eq RocketHideout_Elevator_EventScript_ExitFloorSelect + call RocketHideout_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 3 - goto EventScript_161609 - -EventScript_1615B8:: @ 81615B8 + goto RocketHideout_Elevator_EventScript_ExitFloorSelect end -EventScript_1615B9:: @ 81615B9 +RocketHideout_Elevator_EventScript_ToB2F:: @ 81615B9 setvar VAR_0x8006, 2 setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16 compare VAR_ELEVATOR_FLOOR, 2 - goto_if_eq EventScript_161609 - call EventScript_16160E + goto_if_eq RocketHideout_Elevator_EventScript_ExitFloorSelect + call RocketHideout_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 2 - goto EventScript_161609 - -EventScript_1615E0:: @ 81615E0 + goto RocketHideout_Elevator_EventScript_ExitFloorSelect end -EventScript_1615E1:: @ 81615E1 +RocketHideout_Elevator_EventScript_ToB4F:: @ 81615E1 setvar VAR_0x8006, 0 setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23 compare VAR_ELEVATOR_FLOOR, 0 - goto_if_eq EventScript_161609 - call EventScript_16160E + goto_if_eq RocketHideout_Elevator_EventScript_ExitFloorSelect + call RocketHideout_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 0 - goto EventScript_161609 - -EventScript_161608:: @ 8161608 + goto RocketHideout_Elevator_EventScript_ExitFloorSelect end -EventScript_161609:: @ 8161609 +RocketHideout_Elevator_EventScript_ExitFloorSelect:: @ 8161609 special Special_CloseElevatorCurrentFloorWindow releaseall end -EventScript_16160E:: @ 816160E +RocketHideout_Elevator_EventScript_MoveElevator:: @ 816160E special Special_CloseElevatorCurrentFloorWindow closemessage waitse @@ -98,7 +86,7 @@ EventScript_16160E:: @ 816160E setflag FLAG_TEMP_2 return -EventScript_16161B:: @ 816161B - msgbox gUnknown_81754DD +RocketHideout_Elevator_EventScript_NeedKey:: @ 816161B + msgbox RocketHideout_Elevator_Text_AppearsToNeedAKey releaseall end diff --git a/data/maps/RocketHideout_Elevator/text.inc b/data/maps/RocketHideout_Elevator/text.inc index 89de8f918..f0e5e09f8 100644 --- a/data/maps/RocketHideout_Elevator/text.inc +++ b/data/maps/RocketHideout_Elevator/text.inc @@ -1,3 +1,3 @@ -gUnknown_81754DD:: @ 81754DD +RocketHideout_Elevator_Text_AppearsToNeedAKey:: @ 81754DD .string "It appears to need a key.$" diff --git a/data/maps/Route5_PokemonDayCare/text.inc b/data/maps/Route5_PokemonDayCare/text.inc index cada12ea5..b87ca2ca2 100644 --- a/data/maps/Route5_PokemonDayCare/text.inc +++ b/data/maps/Route5_PokemonDayCare/text.inc @@ -58,3 +58,11 @@ Route5_PokemonDayCare_Text_YouveGotNoRoomForIt:: @ 819DFC2 Route5_PokemonDayCare_Text_DontHaveEnoughMoney:: @ 819E001 .string "You don't have enough money.$" + +Text_19E01E:: @ 819E01E + .string "きみの\n" + .string "みてみるかね？$" + +Text_19E02A:: @ 819E02A + .string "わるいけど ひでんのわざを もった\n" + .string "ポケモンは あずかれないなぁ$" diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index a85de2522..e75bbbf85 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route5_SouthEntrance_EventScript_16F901", + "script": "Route5_SouthEntrance_EventScript_Guard", "flag": "0" } ], @@ -65,7 +65,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route5_SouthEntrance_EventScript_16F90A" + "script": "Route5_SouthEntrance_EventScript_GuardTriggerLeft" }, { "type": "trigger", @@ -74,7 +74,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route5_SouthEntrance_EventScript_16F916" + "script": "Route5_SouthEntrance_EventScript_GuardTriggerMid" }, { "type": "trigger", @@ -83,7 +83,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route5_SouthEntrance_EventScript_16F922" + "script": "Route5_SouthEntrance_EventScript_GuardTriggerRight" } ], "bg_events": [] diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index f20da71ae..b06a2aa2c 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -1,87 +1,87 @@ Route5_SouthEntrance_MapScripts:: @ 816F900 .byte 0 -Route5_SouthEntrance_EventScript_16F901:: @ 816F901 - msgbox gUnknown_819E16D, MSGBOX_NPC +Route5_SouthEntrance_EventScript_Guard:: @ 816F901 + msgbox Route5_SouthEntrance_Text_HiHowsItGoing, MSGBOX_NPC end -Route5_SouthEntrance_EventScript_16F90A:: @ 816F90A +Route5_SouthEntrance_EventScript_GuardTriggerLeft:: @ 816F90A lockall setvar VAR_TEMP_1, 0 - goto EventScript_16F92E + goto Route5_SouthEntrance_EventScript_GuardTrigger end -Route5_SouthEntrance_EventScript_16F916:: @ 816F916 +Route5_SouthEntrance_EventScript_GuardTriggerMid:: @ 816F916 lockall setvar VAR_TEMP_1, 1 - goto EventScript_16F92E + goto Route5_SouthEntrance_EventScript_GuardTrigger end -Route5_SouthEntrance_EventScript_16F922:: @ 816F922 +Route5_SouthEntrance_EventScript_GuardTriggerRight:: @ 816F922 lockall setvar VAR_TEMP_1, 2 - goto EventScript_16F92E + goto Route5_SouthEntrance_EventScript_GuardTrigger end -EventScript_16F92E:: @ 816F92E +Route5_SouthEntrance_EventScript_GuardTrigger:: @ 816F92E textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 - goto_if_set FLAG_GOT_TEA, EventScript_16F958 - msgbox gUnknown_819E04B + goto_if_set FLAG_GOT_TEA, Route5_SouthEntrance_EventScript_GiveTea + msgbox Route5_SouthEntrance_Text_ThirstyOnGuardDuty closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9C4 + applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_BlockPlayerEntry waitmovement 0 releaseall end -EventScript_16F958:: @ 816F958 +Route5_SouthEntrance_EventScript_GiveTea:: @ 816F958 removeitem ITEM_TEA, 1 - goto EventScript_16F963 + goto Route5_SouthEntrance_EventScript_GuardDrinkTea end -EventScript_16F963:: @ 816F963 - msgbox gUnknown_819E09B +Route5_SouthEntrance_EventScript_GuardDrinkTea:: @ 816F963 + msgbox Route5_SouthEntrance_Text_ThatTeaLooksTasty closemessage compare VAR_TEMP_1, 0 - call_if_eq EventScript_16F99C + call_if_eq Route5_SouthEntrance_EventScript_WalkToGuardLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_16F9A7 + call_if_eq Route5_SouthEntrance_EventScript_WalkToGuardMid compare VAR_TEMP_1, 2 - call_if_eq EventScript_16F9B2 - msgbox gUnknown_819E0C1 + call_if_eq Route5_SouthEntrance_EventScript_WalkToGuardRight + msgbox Route5_SouthEntrance_Text_ThanksIllShareTeaWithGuards setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end -EventScript_16F99C:: @ 816F99C - applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9C2 +Route5_SouthEntrance_EventScript_WalkToGuardLeft:: @ 816F99C + applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardLeft waitmovement 0 return -EventScript_16F9A7:: @ 816F9A7 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9BD +Route5_SouthEntrance_EventScript_WalkToGuardMid:: @ 816F9A7 + applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardMid waitmovement 0 return -EventScript_16F9B2:: @ 816F9B2 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9BF +Route5_SouthEntrance_EventScript_WalkToGuardRight:: @ 816F9B2 + applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardRight waitmovement 0 return -Movement_16F9BD:: @ 816F9BD +Route5_SouthEntrance_Movement_WalkToGuardMid:: @ 816F9BD walk_left step_end -Movement_16F9BF:: @ 816F9BF +Route5_SouthEntrance_Movement_WalkToGuardRight:: @ 816F9BF walk_left walk_left step_end -Movement_16F9C2:: @ 816F9C2 +Route5_SouthEntrance_Movement_WalkToGuardLeft:: @ 816F9C2 walk_in_place_left step_end -Movement_16F9C4:: @ 816F9C4 +Route5_SouthEntrance_Movement_BlockPlayerEntry:: @ 816F9C4 walk_up step_end diff --git a/data/maps/Route5_SouthEntrance/text.inc b/data/maps/Route5_SouthEntrance/text.inc index 749bcabe5..2b740e141 100644 --- a/data/maps/Route5_SouthEntrance/text.inc +++ b/data/maps/Route5_SouthEntrance/text.inc @@ -1,21 +1,13 @@ -Text_19E01E:: @ 819E01E - .string "きみの\n" - .string "みてみるかね？$" - -Text_19E02A:: @ 819E02A - .string "わるいけど ひでんのわざを もった\n" - .string "ポケモンは あずかれないなぁ$" - -gUnknown_819E04B:: @ 819E04B +Route5_SouthEntrance_Text_ThirstyOnGuardDuty:: @ 819E04B .string "I'm on guard duty.\n" .string "Gee, I'm thirsty, though!\p" .string "Oh, wait there, the road's closed.$" -gUnknown_819E09B:: @ 819E09B +Route5_SouthEntrance_Text_ThatTeaLooksTasty:: @ 819E09B .string "Oh, that TEA…\n" .string "It looks awfully tasty…$" -gUnknown_819E0C1:: @ 819E0C1 +Route5_SouthEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E0C1 .string "Huh? I can have this drink?\n" .string "Gee, thanks!\l" .string "… …\l" @@ -29,6 +21,6 @@ gUnknown_819E0C1:: @ 819E0C1 .string "I'll share this TEA with the other\n" .string "guards!$" -gUnknown_819E16D:: @ 819E16D +Route5_SouthEntrance_Text_HiHowsItGoing:: @ 819E16D .string "Hi, how's it going?$" diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index 8b49e226d..d44503ee4 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route6_NorthEntrance_EventScript_16F9C7", + "script": "Route6_NorthEntrance_EventScript_Guard", "flag": "0" } ], @@ -65,7 +65,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route6_NorthEntrance_EventScript_16F9D0" + "script": "Route6_NorthEntrance_EventScript_GuardTriggerLeft" }, { "type": "trigger", @@ -74,7 +74,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route6_NorthEntrance_EventScript_16F9DC" + "script": "Route6_NorthEntrance_EventScript_GuardTriggerMid" }, { "type": "trigger", @@ -83,7 +83,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route6_NorthEntrance_EventScript_16F9E8" + "script": "Route6_NorthEntrance_EventScript_GuardTriggerRight" } ], "bg_events": [] diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index d1b9a4555..5c7add642 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -1,87 +1,87 @@ Route6_NorthEntrance_MapScripts:: @ 816F9C6 .byte 0 -Route6_NorthEntrance_EventScript_16F9C7:: @ 816F9C7 - msgbox gUnknown_819E2A3, MSGBOX_NPC +Route6_NorthEntrance_EventScript_Guard:: @ 816F9C7 + msgbox Route6_NorthEntrance_Text_HiHowsItGoing, MSGBOX_NPC end -Route6_NorthEntrance_EventScript_16F9D0:: @ 816F9D0 +Route6_NorthEntrance_EventScript_GuardTriggerLeft:: @ 816F9D0 lockall setvar VAR_TEMP_1, 0 - goto EventScript_16F9F4 + goto Route6_NorthEntrance_EventScript_GuardTrigger end -Route6_NorthEntrance_EventScript_16F9DC:: @ 816F9DC +Route6_NorthEntrance_EventScript_GuardTriggerMid:: @ 816F9DC lockall setvar VAR_TEMP_1, 1 - goto EventScript_16F9F4 + goto Route6_NorthEntrance_EventScript_GuardTrigger end -Route6_NorthEntrance_EventScript_16F9E8:: @ 816F9E8 +Route6_NorthEntrance_EventScript_GuardTriggerRight:: @ 816F9E8 lockall setvar VAR_TEMP_1, 2 - goto EventScript_16F9F4 + goto Route6_NorthEntrance_EventScript_GuardTrigger end -EventScript_16F9F4:: @ 816F9F4 +Route6_NorthEntrance_EventScript_GuardTrigger:: @ 816F9F4 textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - goto_if_set FLAG_GOT_TEA, EventScript_16FA1E - msgbox gUnknown_819E181 + goto_if_set FLAG_GOT_TEA, Route6_NorthEntrance_EventScript_GiveTea + msgbox Route6_NorthEntrance_Text_ThirstyOnGuardDuty closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA8A + applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_BlockPlayerEntry waitmovement 0 releaseall end -EventScript_16FA1E:: @ 816FA1E +Route6_NorthEntrance_EventScript_GiveTea:: @ 816FA1E removeitem ITEM_TEA, 1 - goto EventScript_16FA29 + goto Route6_NorthEntrance_EventScript_GuardDrinkTea end -EventScript_16FA29:: @ 816FA29 - msgbox gUnknown_819E1D1 +Route6_NorthEntrance_EventScript_GuardDrinkTea:: @ 816FA29 + msgbox Route6_NorthEntrance_Text_ThatTeaLooksTasty closemessage compare VAR_TEMP_1, 0 - call_if_eq EventScript_16FA62 + call_if_eq Route6_NorthEntrance_EventScript_WalkToGuardLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_16FA6D + call_if_eq Route6_NorthEntrance_EventScript_WalkToGuardMid compare VAR_TEMP_1, 2 - call_if_eq EventScript_16FA78 - msgbox gUnknown_819E1F7 + call_if_eq Route6_NorthEntrance_EventScript_WalkToGuardRight + msgbox Route6_NorthEntrance_Text_ThanksIllShareTeaWithGuards setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end -EventScript_16FA62:: @ 816FA62 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA83 +Route6_NorthEntrance_EventScript_WalkToGuardLeft:: @ 816FA62 + applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardLeft waitmovement 0 return -EventScript_16FA6D:: @ 816FA6D - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA86 +Route6_NorthEntrance_EventScript_WalkToGuardMid:: @ 816FA6D + applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardMid waitmovement 0 return -EventScript_16FA78:: @ 816FA78 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA88 +Route6_NorthEntrance_EventScript_WalkToGuardRight:: @ 816FA78 + applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardRight waitmovement 0 return -Movement_16FA83:: @ 816FA83 +Route6_NorthEntrance_Movement_WalkToGuardLeft:: @ 816FA83 walk_right walk_right step_end -Movement_16FA86:: @ 816FA86 +Route6_NorthEntrance_Movement_WalkToGuardMid:: @ 816FA86 walk_right step_end -Movement_16FA88:: @ 816FA88 +Route6_NorthEntrance_Movement_WalkToGuardRight:: @ 816FA88 walk_in_place_right step_end -Movement_16FA8A:: @ 816FA8A +Route6_NorthEntrance_Movement_BlockPlayerEntry:: @ 816FA8A walk_down step_end diff --git a/data/maps/Route6_NorthEntrance/text.inc b/data/maps/Route6_NorthEntrance/text.inc index 3d581e1fb..09705517c 100644 --- a/data/maps/Route6_NorthEntrance/text.inc +++ b/data/maps/Route6_NorthEntrance/text.inc @@ -1,13 +1,13 @@ -gUnknown_819E181:: @ 819E181 +Route6_NorthEntrance_Text_ThirstyOnGuardDuty:: @ 819E181 .string "I'm on guard duty.\n" .string "Gee, I'm thirsty, though!\p" .string "Oh, wait there, the road's closed.$" -gUnknown_819E1D1:: @ 819E1D1 +Route6_NorthEntrance_Text_ThatTeaLooksTasty:: @ 819E1D1 .string "Oh, that TEA…\n" .string "It looks awfully tasty…$" -gUnknown_819E1F7:: @ 819E1F7 +Route6_NorthEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E1F7 .string "Huh? I can have this drink?\n" .string "Gee, thanks!\l" .string "… …\l" @@ -21,6 +21,6 @@ gUnknown_819E1F7:: @ 819E1F7 .string "I'll share this TEA with the other\n" .string "guards!$" -gUnknown_819E2A3:: @ 819E2A3 +Route6_NorthEntrance_Text_HiHowsItGoing:: @ 819E2A3 .string "Hi, how's it going?$" diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index 8bd0e7498..fbb8a163d 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route7_EastEntrance_EventScript_16FA8E", + "script": "Route7_EastEntrance_EventScript_Guard", "flag": "0" } ], @@ -65,7 +65,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route7_EastEntrance_EventScript_16FA97" + "script": "Route7_EastEntrance_EventScript_GuardTriggerTop" }, { "type": "trigger", @@ -74,7 +74,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route7_EastEntrance_EventScript_16FAA3" + "script": "Route7_EastEntrance_EventScript_GuardTriggerMid" }, { "type": "trigger", @@ -83,7 +83,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route7_EastEntrance_EventScript_16FAAF" + "script": "Route7_EastEntrance_EventScript_GuardTriggerBottom" } ], "bg_events": [] diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index cac72463b..767601f49 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -1,87 +1,87 @@ Route7_EastEntrance_MapScripts:: @ 816FA8D .byte 0 -Route7_EastEntrance_EventScript_16FA8E:: @ 816FA8E - msgbox gUnknown_819E3D9, MSGBOX_NPC +Route7_EastEntrance_EventScript_Guard:: @ 816FA8E + msgbox Route7_EastEntrance_Text_HiHowsItGoing, MSGBOX_NPC end -Route7_EastEntrance_EventScript_16FA97:: @ 816FA97 +Route7_EastEntrance_EventScript_GuardTriggerTop:: @ 816FA97 lockall setvar VAR_TEMP_1, 0 - goto EventScript_16FABB + goto Route7_EastEntrance_EventScript_GuardTrigger end -Route7_EastEntrance_EventScript_16FAA3:: @ 816FAA3 +Route7_EastEntrance_EventScript_GuardTriggerMid:: @ 816FAA3 lockall setvar VAR_TEMP_1, 1 - goto EventScript_16FABB + goto Route7_EastEntrance_EventScript_GuardTrigger end -Route7_EastEntrance_EventScript_16FAAF:: @ 816FAAF +Route7_EastEntrance_EventScript_GuardTriggerBottom:: @ 816FAAF lockall setvar VAR_TEMP_1, 2 - goto EventScript_16FABB + goto Route7_EastEntrance_EventScript_GuardTrigger end -EventScript_16FABB:: @ 816FABB +Route7_EastEntrance_EventScript_GuardTrigger:: @ 816FABB textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 - goto_if_set FLAG_GOT_TEA, EventScript_16FAE5 - msgbox gUnknown_819E2B7 + goto_if_set FLAG_GOT_TEA, Route7_EastEntrance_EventScript_GiveTea + msgbox Route7_EastEntrance_Text_ThirstyOnGuardDuty closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB51 + applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_BlockPlayerEntry waitmovement 0 releaseall end -EventScript_16FAE5:: @ 816FAE5 +Route7_EastEntrance_EventScript_GiveTea:: @ 816FAE5 removeitem ITEM_TEA, 1 - goto EventScript_16FAF0 + goto Route7_EastEntrance_EventScript_GuardDrinkTea end -EventScript_16FAF0:: @ 816FAF0 - msgbox gUnknown_819E307 +Route7_EastEntrance_EventScript_GuardDrinkTea:: @ 816FAF0 + msgbox Route7_EastEntrance_Text_ThatTeaLooksTasty closemessage compare VAR_TEMP_1, 0 - call_if_eq EventScript_16FB29 + call_if_eq Route7_EastEntrance_WalkToGuardTop compare VAR_TEMP_1, 1 - call_if_eq EventScript_16FB34 + call_if_eq Route7_EastEntrance_WalkToGuardMid compare VAR_TEMP_1, 2 - call_if_eq EventScript_16FB3F - msgbox gUnknown_819E32D + call_if_eq Route7_EastEntrance_WalkToGuardBottom + msgbox Route7_EastEntrance_Text_ThanksIllShareTeaWithGuards setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end -EventScript_16FB29:: @ 816FB29 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4F +Route7_EastEntrance_WalkToGuardTop:: @ 816FB29 + applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardTop waitmovement 0 return -EventScript_16FB34:: @ 816FB34 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4A +Route7_EastEntrance_WalkToGuardMid:: @ 816FB34 + applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardMid waitmovement 0 return -EventScript_16FB3F:: @ 816FB3F - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4C +Route7_EastEntrance_WalkToGuardBottom:: @ 816FB3F + applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardBottom waitmovement 0 return -Movement_16FB4A:: @ 816FB4A +Route7_EastEntrance_Movement_WalkToGuardMid:: @ 816FB4A walk_up step_end -Movement_16FB4C:: @ 816FB4C +Route7_EastEntrance_Movement_WalkToGuardBottom:: @ 816FB4C walk_up walk_up step_end -Movement_16FB4F:: @ 816FB4F +Route7_EastEntrance_Movement_WalkToGuardTop:: @ 816FB4F walk_in_place_up step_end -Movement_16FB51:: @ 816FB51 +Route7_EastEntrance_Movement_BlockPlayerEntry:: @ 816FB51 walk_left step_end diff --git a/data/maps/Route7_EastEntrance/text.inc b/data/maps/Route7_EastEntrance/text.inc index 94db43e94..ec98a5867 100644 --- a/data/maps/Route7_EastEntrance/text.inc +++ b/data/maps/Route7_EastEntrance/text.inc @@ -1,13 +1,13 @@ -gUnknown_819E2B7:: @ 819E2B7 +Route7_EastEntrance_Text_ThirstyOnGuardDuty:: @ 819E2B7 .string "I'm on guard duty.\n" .string "Gee, I'm thirsty, though!\p" .string "Oh, wait there, the road's closed.$" -gUnknown_819E307:: @ 819E307 +Route7_EastEntrance_Text_ThatTeaLooksTasty:: @ 819E307 .string "Oh, that TEA…\n" .string "It looks awfully tasty…$" -gUnknown_819E32D:: @ 819E32D +Route7_EastEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E32D .string "Huh? I can have this drink?\n" .string "Gee, thanks!\l" .string "… …\l" @@ -21,6 +21,6 @@ gUnknown_819E32D:: @ 819E32D .string "I'll share this TEA with the other\n" .string "guards!$" -gUnknown_819E3D9:: @ 819E3D9 +Route7_EastEntrance_Text_HiHowsItGoing:: @ 819E3D9 .string "Hi, how's it going?$" diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index eb6b26e0f..3becdcbc2 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route8_WestEntrance_EventScript_16FB54", + "script": "Route8_WestEntrance_EventScript_Guard", "flag": "0" } ], @@ -65,7 +65,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route8_WestEntrance_EventScript_16FB5D" + "script": "Route8_WestEntrance_EventScript_GuardTriggerTop" }, { "type": "trigger", @@ -74,7 +74,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route8_WestEntrance_EventScript_16FB69" + "script": "Route8_WestEntrance_EventScript_GuardTriggerMid" }, { "type": "trigger", @@ -83,7 +83,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, - "script": "Route8_WestEntrance_EventScript_16FB75" + "script": "Route8_WestEntrance_EventScript_GuardTriggerBottom" } ], "bg_events": [] diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index df9d1035c..1b36e9a15 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -1,97 +1,99 @@ Route8_WestEntrance_MapScripts:: @ 816FB53 .byte 0 -Route8_WestEntrance_EventScript_16FB54:: @ 816FB54 - msgbox gUnknown_819E50F, MSGBOX_NPC +Route8_WestEntrance_EventScript_Guard:: @ 816FB54 + msgbox Route8_WestEntrance_Text_HiHowsItGoing, MSGBOX_NPC end -Route8_WestEntrance_EventScript_16FB5D:: @ 816FB5D +Route8_WestEntrance_EventScript_GuardTriggerTop:: @ 816FB5D lockall setvar VAR_TEMP_1, 0 - goto EventScript_16FB81 + goto Route8_WestEntrance_EventScript_GuardTrigger end -Route8_WestEntrance_EventScript_16FB69:: @ 816FB69 +Route8_WestEntrance_EventScript_GuardTriggerMid:: @ 816FB69 lockall setvar VAR_TEMP_1, 1 - goto EventScript_16FB81 + goto Route8_WestEntrance_EventScript_GuardTrigger end -Route8_WestEntrance_EventScript_16FB75:: @ 816FB75 +Route8_WestEntrance_EventScript_GuardTriggerBottom:: @ 816FB75 lockall setvar VAR_TEMP_1, 2 - goto EventScript_16FB81 + goto Route8_WestEntrance_EventScript_GuardTrigger end -EventScript_16FB81:: @ 816FB81 +Route8_WestEntrance_EventScript_GuardTrigger:: @ 816FB81 textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 - goto_if_set FLAG_GOT_TEA, EventScript_16FBAB - msgbox gUnknown_819E3ED + goto_if_set FLAG_GOT_TEA, Route8_WestEntrance_EventScript_GiveTea + msgbox Route8_WestEntrance_Text_ThirstyOnGuardDuty closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC2D + applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_BlockPlayerEntry waitmovement 0 releaseall end -EventScript_16FBAB:: @ 816FBAB +Route8_WestEntrance_EventScript_GiveTea:: @ 816FBAB removeitem ITEM_TEA, 1 - goto EventScript_16FBCC + goto Route8_WestEntrance_EventScript_GuardDrinkTea end -EventScript_16FBB6:: @ 816FBB6 +@ Unused +Route8_WestEntrance_EventScript_GiveSodaPop:: @ 816FBB6 removeitem ITEM_SODA_POP, 1 - goto EventScript_16FBCC + goto Route8_WestEntrance_EventScript_GuardDrinkTea end -EventScript_16FBC1:: @ 816FBC1 +@ Unused +Route8_WestEntrance_EventScript_GiveLemonade:: @ 816FBC1 removeitem ITEM_LEMONADE, 1 - goto EventScript_16FBCC + goto Route8_WestEntrance_EventScript_GuardDrinkTea end -EventScript_16FBCC:: @ 816FBCC - msgbox gUnknown_819E43D +Route8_WestEntrance_EventScript_GuardDrinkTea:: @ 816FBCC + msgbox Route8_WestEntrance_Text_ThatTeaLooksTasty closemessage compare VAR_TEMP_1, 0 - call_if_eq EventScript_16FC05 + call_if_eq Route8_WestEntrance_EventScript_WalkToGuardTop compare VAR_TEMP_1, 1 - call_if_eq EventScript_16FC10 + call_if_eq Route8_WestEntrance_EventScript_WalkToGuardMid compare VAR_TEMP_1, 2 - call_if_eq EventScript_16FC1B - msgbox gUnknown_819E463 + call_if_eq Route8_WestEntrance_EventScript_WalkToGuardBottom + msgbox Route8_WestEntrance_Text_ThanksIllShareTeaWithGuards setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end -EventScript_16FC05:: @ 816FC05 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC2B +Route8_WestEntrance_EventScript_WalkToGuardTop:: @ 816FC05 + applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardTop waitmovement 0 return -EventScript_16FC10:: @ 816FC10 - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC26 +Route8_WestEntrance_EventScript_WalkToGuardMid:: @ 816FC10 + applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardMid waitmovement 0 return -EventScript_16FC1B:: @ 816FC1B - applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC28 +Route8_WestEntrance_EventScript_WalkToGuardBottom:: @ 816FC1B + applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardBottom waitmovement 0 return -Movement_16FC26:: @ 816FC26 +Route8_WestEntrance_Movement_WalkToGuardMid:: @ 816FC26 walk_up step_end -Movement_16FC28:: @ 816FC28 +Route8_WestEntrance_Movement_WalkToGuardBottom:: @ 816FC28 walk_up walk_up step_end -Movement_16FC2B:: @ 816FC2B +Route8_WestEntrance_Movement_WalkToGuardTop:: @ 816FC2B walk_in_place_up step_end -Movement_16FC2D:: @ 816FC2D +Route8_WestEntrance_Movement_BlockPlayerEntry:: @ 816FC2D walk_right step_end diff --git a/data/maps/Route8_WestEntrance/text.inc b/data/maps/Route8_WestEntrance/text.inc index 58e2ee8ef..3c0be19e1 100644 --- a/data/maps/Route8_WestEntrance/text.inc +++ b/data/maps/Route8_WestEntrance/text.inc @@ -1,13 +1,13 @@ -gUnknown_819E3ED:: @ 819E3ED +Route8_WestEntrance_Text_ThirstyOnGuardDuty:: @ 819E3ED .string "I'm on guard duty.\n" .string "Gee, I'm thirsty, though!\p" .string "Oh, wait there, the road's closed.$" -gUnknown_819E43D:: @ 819E43D +Route8_WestEntrance_Text_ThatTeaLooksTasty:: @ 819E43D .string "Oh, that TEA…\n" .string "It looks awfully tasty…$" -gUnknown_819E463:: @ 819E463 +Route8_WestEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E463 .string "Huh? I can have this drink?\n" .string "Gee, thanks!\l" .string "… …\l" @@ -21,6 +21,6 @@ gUnknown_819E463:: @ 819E463 .string "I'll share this TEA with the other\n" .string "guards!$" -gUnknown_819E50F:: @ 819E50F +Route8_WestEntrance_Text_HiHowsItGoing:: @ 819E50F .string "Hi, how's it going?$" diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index 9ca5a540e..83dc3497f 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -45,7 +45,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_16737A", + "script": "SaffronCity_EventScript_RocketGrunt1", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -58,7 +58,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_167383", + "script": "SaffronCity_EventScript_RocketGrunt2", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -71,7 +71,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_16738C", + "script": "SaffronCity_EventScript_RocketGrunt3", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -84,7 +84,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_167395", + "script": "SaffronCity_EventScript_RocketGrunt4", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -97,7 +97,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_16739E", + "script": "SaffronCity_EventScript_RocketGrunt5", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -110,7 +110,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1673B9", + "script": "SaffronCity_EventScript_DoorGuardGrunt", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -123,7 +123,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1673B0", + "script": "SaffronCity_EventScript_RocketGrunt7", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -136,7 +136,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1673A7", + "script": "SaffronCity_EventScript_RocketGrunt6", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { @@ -149,7 +149,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1673EC", + "script": "SaffronCity_EventScript_Youngster", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { @@ -162,7 +162,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1673E3", + "script": "SaffronCity_EventScript_WorkerM", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { @@ -175,7 +175,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_16741A", + "script": "SaffronCity_EventScript_Man", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { @@ -188,7 +188,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1673FE", + "script": "SaffronCity_EventScript_Boy", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { @@ -201,7 +201,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_167407", + "script": "SaffronCity_EventScript_Pidgeot", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { @@ -214,7 +214,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1673F5", + "script": "SaffronCity_EventScript_Lass", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { @@ -227,7 +227,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_EventScript_1AD03A", + "script": "SaffronCity_EventScript_BattleGirl", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], @@ -243,7 +243,7 @@ "x": 22, "y": 14, "elevation": 0, - "dest_map": "MAP_SAFFRON_CITY_HOUSE1_1F", + "dest_map": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F", "dest_warp_id": 1 }, { @@ -264,7 +264,7 @@ "x": 27, "y": 21, "elevation": 0, - "dest_map": "MAP_SAFFRON_CITY_HOUSE2", + "dest_map": "MAP_SAFFRON_CITY_HOUSE", "dest_warp_id": 1 }, { @@ -285,7 +285,7 @@ "x": 43, "y": 38, "elevation": 0, - "dest_map": "MAP_SAFFRON_CITY_HOUSE3", + "dest_map": "MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE", "dest_warp_id": 1 }, { @@ -345,63 +345,63 @@ "x": 29, "y": 14, "elevation": 0, - "script": "SaffronCity_EventScript_167423" + "script": "SaffronCity_EventScript_CitySign" }, { "type": "bg_event_type_0", "x": 42, "y": 14, "elevation": 0, - "script": "SaffronCity_EventScript_16742C" + "script": "SaffronCity_EventScript_DojoSign" }, { "type": "bg_event_type_0", "x": 13, "y": 25, "elevation": 0, - "script": "SaffronCity_EventScript_167471" + "script": "SaffronCity_EventScript_SilphProductSign" }, { "type": "bg_event_type_0", "x": 18, "y": 30, "elevation": 0, - "script": "SaffronCity_EventScript_167456" + "script": "SaffronCity_EventScript_TrainerTips2" }, { "type": "bg_event_type_0", "x": 29, "y": 31, "elevation": 0, - "script": "SaffronCity_EventScript_16745F" + "script": "SaffronCity_EventScript_SilphCoSign" }, { "type": "bg_event_type_0", "x": 54, "y": 25, "elevation": 0, - "script": "SaffronCity_EventScript_16744D" + "script": "SaffronCity_EventScript_TrainerTips1" }, { "type": "bg_event_type_0", "x": 50, "y": 14, "elevation": 0, - "script": "SaffronCity_EventScript_167435" + "script": "SaffronCity_EventScript_GymSign" }, { "type": "bg_event_type_0", "x": 40, "y": 38, "elevation": 0, - "script": "SaffronCity_EventScript_167468" + "script": "SaffronCity_EventScript_MrPsychicsHouseSign" }, { "type": "bg_event_type_0", "x": 49, "y": 22, "elevation": 0, - "script": "SaffronCity_EventScript_16747A" + "script": "SaffronCity_EventScript_TrainerFanClubSign" } ] } diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc index 53d697ff0..4b74cd43d 100644 --- a/data/maps/SaffronCity/scripts.inc +++ b/data/maps/SaffronCity/scripts.inc @@ -4,121 +4,121 @@ SaffronCity_MapScripts:: @ 816735F SaffronCity_OnTransition:: @ 8167365 setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY - call_if_unset FLAG_RESCUED_MR_FUJI, EventScript_167372 + call_if_unset FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_MoveDoorGuardGrunt end -EventScript_167372:: @ 8167372 +SaffronCity_EventScript_MoveDoorGuardGrunt:: @ 8167372 setobjectxyperm 6, 33, 31 return -SaffronCity_EventScript_16737A:: @ 816737A - msgbox gUnknown_8181003, MSGBOX_NPC +SaffronCity_EventScript_RocketGrunt1:: @ 816737A + msgbox SaffronCity_Text_WhatDoYouWantGetLost, MSGBOX_NPC end -SaffronCity_EventScript_167383:: @ 8167383 - msgbox gUnknown_818101F, MSGBOX_NPC +SaffronCity_EventScript_RocketGrunt2:: @ 8167383 + msgbox SaffronCity_Text_BossTakeTownForTeamRocket, MSGBOX_NPC end -SaffronCity_EventScript_16738C:: @ 816738C - msgbox gUnknown_818105A, MSGBOX_NPC +SaffronCity_EventScript_RocketGrunt3:: @ 816738C + msgbox SaffronCity_Text_DontGetDefiantOrIllHurtYou, MSGBOX_NPC end -SaffronCity_EventScript_167395:: @ 8167395 - msgbox gUnknown_8181087, MSGBOX_NPC +SaffronCity_EventScript_RocketGrunt4:: @ 8167395 + msgbox SaffronCity_Text_SaffronBelongsToTeamRocket, MSGBOX_NPC end -SaffronCity_EventScript_16739E:: @ 816739E - msgbox gUnknown_81810A7, MSGBOX_NPC +SaffronCity_EventScript_RocketGrunt5:: @ 816739E + msgbox SaffronCity_Text_CriminalLifeMakesMeFeelAlive, MSGBOX_NPC end -SaffronCity_EventScript_1673A7:: @ 81673A7 - msgbox gUnknown_81810D5, MSGBOX_NPC +SaffronCity_EventScript_RocketGrunt6:: @ 81673A7 + msgbox SaffronCity_Text_WatchWhereYoureWalking, MSGBOX_NPC end -SaffronCity_EventScript_1673B0:: @ 81673B0 - msgbox gUnknown_81810F5, MSGBOX_NPC +SaffronCity_EventScript_RocketGrunt7:: @ 81673B0 + msgbox SaffronCity_Text_WeCanExploitMonsAroundWorld, MSGBOX_NPC end -SaffronCity_EventScript_1673B9:: @ 81673B9 +SaffronCity_EventScript_DoorGuardGrunt:: @ 81673B9 lock - goto_if_set FLAG_RESCUED_MR_FUJI, EventScript_1673D7 + goto_if_set FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_DoorGuardAsleep applymovement 6, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_81812CA + msgbox SaffronCity_Text_ImASecurityGuard release end -EventScript_1673D7:: @ 81673D7 +SaffronCity_EventScript_DoorGuardAsleep:: @ 81673D7 textcolor 3 - msgbox gUnknown_8181302 + msgbox SaffronCity_Text_HesTakingASnooze release end -SaffronCity_EventScript_1673E3:: @ 81673E3 - msgbox gUnknown_8181159, MSGBOX_NPC +SaffronCity_EventScript_WorkerM:: @ 81673E3 + msgbox SaffronCity_Text_YouBeatTeamRocket, MSGBOX_NPC end -SaffronCity_EventScript_1673EC:: @ 81673EC - msgbox gUnknown_8181189, MSGBOX_NPC +SaffronCity_EventScript_Youngster:: @ 81673EC + msgbox SaffronCity_Text_SafeToGoOutAgain, MSGBOX_NPC end -SaffronCity_EventScript_1673F5:: @ 81673F5 - msgbox gUnknown_81811BF, MSGBOX_NPC +SaffronCity_EventScript_Lass:: @ 81673F5 + msgbox SaffronCity_Text_PeopleComingBackToSaffron, MSGBOX_NPC end -SaffronCity_EventScript_1673FE:: @ 81673FE - msgbox gUnknown_8181225, MSGBOX_NPC +SaffronCity_EventScript_Boy:: @ 81673FE + msgbox SaffronCity_Text_FlewHereOnPidgeot, MSGBOX_NPC end -SaffronCity_EventScript_167407:: @ 8167407 +SaffronCity_EventScript_Pidgeot:: @ 8167407 lock faceplayer waitse playmoncry SPECIES_PIDGEOT, 0 - msgbox gUnknown_8181286 + msgbox SaffronCity_Text_Pidgeot waitmoncry release end -SaffronCity_EventScript_16741A:: @ 816741A - msgbox gUnknown_8181299, MSGBOX_NPC +SaffronCity_EventScript_Man:: @ 816741A + msgbox SaffronCity_Text_SawRocketBossEscaping, MSGBOX_NPC end -SaffronCity_EventScript_167423:: @ 8167423 - msgbox gUnknown_8181326, MSGBOX_SIGN +SaffronCity_EventScript_CitySign:: @ 8167423 + msgbox SaffronCity_Text_CitySign, MSGBOX_SIGN end -SaffronCity_EventScript_16742C:: @ 816742C - msgbox gUnknown_8181354, MSGBOX_SIGN +SaffronCity_EventScript_DojoSign:: @ 816742C + msgbox SaffronCity_Text_FightingDojo, MSGBOX_SIGN end -SaffronCity_EventScript_167435:: @ 8167435 +SaffronCity_EventScript_GymSign:: @ 8167435 lockall famechecker FAMECHECKER_SABRINA, 0 - msgbox gUnknown_8181362 + msgbox SaffronCity_Text_GymSign releaseall end -SaffronCity_EventScript_16744D:: @ 816744D - msgbox gUnknown_81813AA, MSGBOX_SIGN +SaffronCity_EventScript_TrainerTips1:: @ 816744D + msgbox SaffronCity_Text_FullHealCuresStatus, MSGBOX_SIGN end -SaffronCity_EventScript_167456:: @ 8167456 - msgbox gUnknown_8181452, MSGBOX_SIGN +SaffronCity_EventScript_TrainerTips2:: @ 8167456 + msgbox SaffronCity_Text_GreatBallImprovedCatchRate, MSGBOX_SIGN end -SaffronCity_EventScript_16745F:: @ 816745F - msgbox gUnknown_81814B9, MSGBOX_SIGN +SaffronCity_EventScript_SilphCoSign:: @ 816745F + msgbox SaffronCity_Text_SilphCoSign, MSGBOX_SIGN end -SaffronCity_EventScript_167468:: @ 8167468 - msgbox gUnknown_81814D3, MSGBOX_SIGN +SaffronCity_EventScript_MrPsychicsHouseSign:: @ 8167468 + msgbox SaffronCity_Text_MrPsychicsHouse, MSGBOX_SIGN end -SaffronCity_EventScript_167471:: @ 8167471 - msgbox gUnknown_81814E7, MSGBOX_SIGN +SaffronCity_EventScript_SilphProductSign:: @ 8167471 + msgbox SaffronCity_Text_SilphsLatestProduct, MSGBOX_SIGN end -SaffronCity_EventScript_16747A:: @ 816747A - msgbox gUnknown_8181519, MSGBOX_SIGN +SaffronCity_EventScript_TrainerFanClubSign:: @ 816747A + msgbox SaffronCity_Text_TrainerFanClubSign, MSGBOX_SIGN end diff --git a/data/maps/SaffronCity/text.inc b/data/maps/SaffronCity/text.inc index aaa009647..d3044d14b 100644 --- a/data/maps/SaffronCity/text.inc +++ b/data/maps/SaffronCity/text.inc @@ -1,80 +1,80 @@ -gUnknown_8181003:: @ 8181003 +SaffronCity_Text_WhatDoYouWantGetLost:: @ 8181003 .string "What do you want?\n" .string "Get lost!$" -gUnknown_818101F:: @ 818101F +SaffronCity_Text_BossTakeTownForTeamRocket:: @ 818101F .string "BOSS said he'll take this town\n" .string "in the name of TEAM ROCKET!$" -gUnknown_818105A:: @ 818105A +SaffronCity_Text_DontGetDefiantOrIllHurtYou:: @ 818105A .string "Don't get defiant!\n" .string "Or I'll have to hurt you!$" -gUnknown_8181087:: @ 8181087 +SaffronCity_Text_SaffronBelongsToTeamRocket:: @ 8181087 .string "SAFFRON belongs to TEAM ROCKET!$" -gUnknown_81810A7:: @ 81810A7 +SaffronCity_Text_CriminalLifeMakesMeFeelAlive:: @ 81810A7 .string "My life as a criminal makes me feel\n" .string "so alive!$" -gUnknown_81810D5:: @ 81810D5 +SaffronCity_Text_WatchWhereYoureWalking:: @ 81810D5 .string "Ow!\n" .string "Watch where you're walking!$" -gUnknown_81810F5:: @ 81810F5 +SaffronCity_Text_WeCanExploitMonsAroundWorld:: @ 81810F5 .string "With SILPH under control, we can\n" .string "exploit POKéMON around the world!\p" .string "We'll get stinking rich, yeahah!$" -gUnknown_8181159:: @ 8181159 +SaffronCity_Text_YouBeatTeamRocket:: @ 8181159 .string "You beat TEAM ROCKET all alone?\n" .string "That's amazing!$" -gUnknown_8181189:: @ 8181189 +SaffronCity_Text_SafeToGoOutAgain:: @ 8181189 .string "Yeah! TEAM ROCKET is gone!\n" .string "It's safe to go out again!$" -gUnknown_81811BF:: @ 81811BF +SaffronCity_Text_PeopleComingBackToSaffron:: @ 81811BF .string "People fled from here in droves\n" .string "when those ROCKETS came.\p" .string "They should be flocking back to\n" .string "SAFFRON now.$" -gUnknown_8181225:: @ 8181225 +SaffronCity_Text_FlewHereOnPidgeot:: @ 8181225 .string "I flew here on my PIDGEOT when\n" .string "I read about SILPH.\p" .string "It's already over?\n" .string "I missed the media action…$" -gUnknown_8181286:: @ 8181286 +SaffronCity_Text_Pidgeot:: @ 8181286 .string "PIDGEOT: Bi bibii!$" -gUnknown_8181299:: @ 8181299 +SaffronCity_Text_SawRocketBossEscaping:: @ 8181299 .string "I saw the ROCKET BOSS escaping\n" .string "SILPH's building.$" -gUnknown_81812CA:: @ 81812CA +SaffronCity_Text_ImASecurityGuard:: @ 81812CA .string "I'm a security guard.\p" .string "Suspicious kids I don't allow in!$" -gUnknown_8181302:: @ 8181302 +SaffronCity_Text_HesTakingASnooze:: @ 8181302 .string "…\n" .string "Snore…\p" .string "Hah! He's taking a snooze!$" -gUnknown_8181326:: @ 8181326 +SaffronCity_Text_CitySign:: @ 8181326 .string "SAFFRON CITY\n" .string "Shining, Golden Land of Commerce$" -gUnknown_8181354:: @ 8181354 +SaffronCity_Text_FightingDojo:: @ 8181354 .string "FIGHTING DOJO$" -gUnknown_8181362:: @ 8181362 +SaffronCity_Text_GymSign:: @ 8181362 .string "SAFFRON CITY POKéMON GYM\n" .string "LEADER: SABRINA\l" .string "The Master of PSYCHIC POKéMON!$" -gUnknown_81813AA:: @ 81813AA +SaffronCity_Text_FullHealCuresStatus:: @ 81813AA .string "TRAINER TIPS\p" .string "FULL HEAL cures all ailments like\n" .string "burns, paralysis, poisoning,\l" @@ -82,25 +82,34 @@ gUnknown_81813AA:: @ 81813AA .string "It costs a bit more, but it's more\n" .string "convenient than buying other items.$" -gUnknown_8181452:: @ 8181452 +SaffronCity_Text_GreatBallImprovedCatchRate:: @ 8181452 .string "TRAINER TIPS\p" .string "The new GREAT BALL offers improved\n" .string "catching rates.\p" .string "Try it on those hard-to-catch\n" .string "POKéMON.$" -gUnknown_81814B9:: @ 81814B9 +SaffronCity_Text_SilphCoSign:: @ 81814B9 .string "SILPH CO. OFFICE BUILDING$" -gUnknown_81814D3:: @ 81814D3 +SaffronCity_Text_MrPsychicsHouse:: @ 81814D3 .string "MR. PSYCHIC'S HOUSE$" -gUnknown_81814E7:: @ 81814E7 +SaffronCity_Text_SilphsLatestProduct:: @ 81814E7 .string "SILPH's latest product!\n" .string "Release to be determined…$" -gUnknown_8181519:: @ 8181519 +SaffronCity_Text_TrainerFanClubSign:: @ 8181519 .string "POKéMON TRAINER FAN CLUB\p" .string "Many TRAINERS have scribbled their\n" .string "names on this sign.$" +SaffronCity_Text_HowCanClubNotRecognizeLance:: @ 8181569 + .string "This FAN CLUB…\n" + .string "No one here has a clue!\p" + .string "How could they not recognize\n" + .string "the brilliance that is LANCE?\p" + .string "He stands for justice!\n" + .string "He's cool, and yet passionate!\l" + .string "He's the greatest, LANCE!$" + diff --git a/data/maps/SaffronCity_House1_1F/map.json b/data/maps/SaffronCity_CopycatsHouse_1F/map.json index 4f7e0a241..bb33e6ea3 100644 --- a/data/maps/SaffronCity_House1_1F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_1F/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_SAFFRON_CITY_HOUSE1_1F", - "name": "SaffronCity_House1_1F", - "layout": "LAYOUT_SAFFRON_CITY_HOUSE1_1F", + "id": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F", + "name": "SaffronCity_CopycatsHouse_1F", + "layout": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_1F", "music": "MUS_NIBI", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House1_1F_EventScript_16EB40", + "script": "SaffronCity_CopycatsHouse_1F_EventScript_CopycatsDad", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House1_1F_EventScript_16EB37", + "script": "SaffronCity_CopycatsHouse_1F_EventScript_CopycatsMom", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 2, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House1_1F_EventScript_16EB49", + "script": "SaffronCity_CopycatsHouse_1F_EventScript_Chansey", "flag": "0" } ], @@ -79,7 +79,7 @@ "x": 10, "y": 2, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_HOUSE1_2F", + "dest_map": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F", "dest_warp_id": 0 } ], diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc b/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc new file mode 100644 index 000000000..e6f779e15 --- /dev/null +++ b/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc @@ -0,0 +1,20 @@ +SaffronCity_CopycatsHouse_1F_MapScripts:: @ 816EB36 + .byte 0 + +SaffronCity_CopycatsHouse_1F_EventScript_CopycatsMom:: @ 816EB37 + msgbox SaffronCity_CopycatsHouse_1F_Text_DaughterIsSelfCentered, MSGBOX_NPC + end + +SaffronCity_CopycatsHouse_1F_EventScript_CopycatsDad:: @ 816EB40 + msgbox SaffronCity_CopycatsHouse_1F_Text_DaughterLikesToMimicPeople, MSGBOX_NPC + end + +SaffronCity_CopycatsHouse_1F_EventScript_Chansey:: @ 816EB49 + lock + faceplayer + waitse + playmoncry SPECIES_CHANSEY, 0 + msgbox SaffronCity_CopycatsHouse_1F_Text_Chansey + waitmoncry + release + end diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/text.inc b/data/maps/SaffronCity_CopycatsHouse_1F/text.inc new file mode 100644 index 000000000..d7efe0281 --- /dev/null +++ b/data/maps/SaffronCity_CopycatsHouse_1F/text.inc @@ -0,0 +1,13 @@ +SaffronCity_CopycatsHouse_1F_Text_DaughterIsSelfCentered:: @ 819AB9B + .string "My daughter is so self-centered.\n" + .string "She has but a few friends.$" + +SaffronCity_CopycatsHouse_1F_Text_DaughterLikesToMimicPeople:: @ 819ABD7 + .string "My daughter likes to mimic people.\n" + .string "It's rather vexing.\p" + .string "Her mimicry has earned her the\n" + .string "nickname COPYCAT around here.$" + +SaffronCity_CopycatsHouse_1F_Text_Chansey:: @ 819AC4B + .string "CHANSEY: Chaan! Sii!$" + diff --git a/data/maps/SaffronCity_House1_2F/map.json b/data/maps/SaffronCity_CopycatsHouse_2F/map.json index e7484dfae..ab920aa73 100644 --- a/data/maps/SaffronCity_House1_2F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_2F/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_SAFFRON_CITY_HOUSE1_2F", - "name": "SaffronCity_House1_2F", - "layout": "LAYOUT_SAFFRON_CITY_HOUSE1_2F", + "id": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F", + "name": "SaffronCity_CopycatsHouse_2F", + "layout": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_2F", "music": "MUS_NIBI", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House1_2F_EventScript_16EB5D", + "script": "SaffronCity_CopycatsHouse_2F_EventScript_Doduo", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House1_2F_EventScript_16EB70", + "script": "SaffronCity_CopycatsHouse_2F_EventScript_Doll", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House1_2F_EventScript_16EB70", + "script": "SaffronCity_CopycatsHouse_2F_EventScript_Doll", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House1_2F_EventScript_16EB7B", + "script": "SaffronCity_CopycatsHouse_2F_EventScript_Copycat", "flag": "0" } ], @@ -71,7 +71,7 @@ "x": 10, "y": 2, "elevation": 3, - "dest_map": "MAP_SAFFRON_CITY_HOUSE1_1F", + "dest_map": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F", "dest_warp_id": 3 } ], @@ -82,14 +82,14 @@ "x": 1, "y": 1, "elevation": 0, - "script": "SaffronCity_House1_2F_EventScript_16EBC9" + "script": "SaffronCity_CopycatsHouse_2F_EventScript_Computer" }, { "type": "bg_event_type_0", "x": 3, "y": 5, "elevation": 0, - "script": "SaffronCity_House1_2F_EventScript_16EBD2" + "script": "SaffronCity_CopycatsHouse_2F_EventScript_Game" }, { "type": "hidden_item", @@ -97,7 +97,7 @@ "y": 1, "elevation": 0, "item": "ITEM_NUGGET", - "flag": "HIDDEN_ITEM_SAFFRON_CITY_HOUSE1_2F_NUGGET", + "flag": "HIDDEN_ITEM_SAFFRON_CITY_COPYCATS_HOUSE_2F_NUGGET", "quantity": 1, "underfoot": false } diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc new file mode 100644 index 000000000..a8e74c94b --- /dev/null +++ b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc @@ -0,0 +1,50 @@ +SaffronCity_CopycatsHouse_2F_MapScripts:: @ 816EB5C + .byte 0 + +SaffronCity_CopycatsHouse_2F_EventScript_Doduo:: @ 816EB5D + lock + faceplayer + waitse + playmoncry SPECIES_DODUO, 0 + msgbox SaffronCity_CopycatsHouse_2F_Text_Doduo + waitmoncry + release + end + +SaffronCity_CopycatsHouse_2F_EventScript_Doll:: @ 816EB70 + lock + msgbox SaffronCity_CopycatsHouse_2F_Text_RareMonOnlyDoll + release + end + +SaffronCity_CopycatsHouse_2F_EventScript_Copycat:: @ 816EB7B + goto_if_questlog EventScript_ReleaseEnd + special sub_8112364 + lock + faceplayer + checkitem ITEM_POKE_DOLL, 1 + compare VAR_RESULT, TRUE + goto_if_eq EventScript_MimicTutor + checkplayergender + compare VAR_RESULT, MALE + call_if_eq SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerMale + compare VAR_RESULT, FEMALE + call_if_eq SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerFemale + release + end + +SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerMale:: @ 816EBB7 + msgbox SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMale + return + +SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerFemale:: @ 816EBC0 + msgbox SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemale + return + +SaffronCity_CopycatsHouse_2F_EventScript_Computer:: @ 816EBC9 + msgbox SaffronCity_CopycatsHouse_2F_Text_MySecrets, MSGBOX_SIGN + end + +SaffronCity_CopycatsHouse_2F_EventScript_Game:: @ 816EBD2 + msgbox SaffronCity_CopycatsHouse_2F_Text_MarioWearingABucket, MSGBOX_SIGN + end diff --git a/data/maps/SaffronCity_House1_2F/text.inc b/data/maps/SaffronCity_CopycatsHouse_2F/text.inc index 32a666e18..978b660f5 100644 --- a/data/maps/SaffronCity_House1_2F/text.inc +++ b/data/maps/SaffronCity_CopycatsHouse_2F/text.inc @@ -1,4 +1,4 @@ -gUnknown_819AC60:: @ 819AC60 +SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMale:: @ 819AC60 .string "{PLAYER}: Hi!\n" .string "Do you like POKéMON?\p" .string "{PLAYER}: Uh, no, I just asked you.\p" @@ -7,7 +7,7 @@ gUnknown_819AC60:: @ 819AC60 .string "COPYCAT: Hmm? Quit mimicking?\n" .string "But, that's my favorite hobby!$" -gUnknown_819ACF1:: @ 819ACF1 +SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemale:: @ 819ACF1 .string "{PLAYER}: Hi.\n" .string "You must like POKéMON.\p" .string "{PLAYER}: No, not me.\n" @@ -51,10 +51,10 @@ Text_MimicTaughtFemale:: @ 819AE90 .string "COPYCAT: You bet!\n" .string "It's a scream!$" -Text_19AF1A:: @ 819AF1A +SaffronCity_CopycatsHouse_2F_Text_TooMuchInBag:: @ 819AF1A .string "にもつが いっぱいね！$" -Text_19AF26:: @ 819AF26 +SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMaleJP:: @ 819AF26 .string "{PLAYER}“やあ！ こんにちは！\n" .string "きみ ポケモン すきかい？\p" .string "{PLAYER}“ぼく じゃなくって\n" @@ -66,7 +66,7 @@ Text_19AF26:: @ 819AF26 .string "だって あたし \n" .string "ものまね しゅみ なんだ もん！”$" -Text_19AFB0:: @ 819AFB0 +SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemaleJP:: @ 819AFB0 .string "{PLAYER}“こんにちは！\n" .string "ポケモン すきなのね？\p" .string "{PLAYER}“わたし じゃなくって\n" @@ -78,23 +78,25 @@ Text_19AFB0:: @ 819AFB0 .string "だって あたし\n" .string "ものまね しゅみ なんだ もん！$" -gUnknown_819B030:: @ 819B030 +SaffronCity_CopycatsHouse_2F_Text_Doduo:: @ 819B030 .string "DODUO: Giiih!\p" .string "PRETTY MIRROR LOOK AT ME,\n" .string "SEE HOW PRETTY I CAN BE?$" -gUnknown_819B071:: @ 819B071 +SaffronCity_CopycatsHouse_2F_Text_RareMonOnlyDoll:: @ 819B071 .string "This is a rare POKéMON!\n" .string "Huh? It's only a doll!$" -gUnknown_819B0A0:: @ 819B0A0 +SaffronCity_CopycatsHouse_2F_Text_MarioWearingABucket:: @ 819B0A0 .string "A game with MARIO wearing a bucket\n" .string "on his head!$" -gUnknown_819B0D0:: @ 819B0D0 +SaffronCity_CopycatsHouse_2F_Text_MySecrets:: @ 819B0D0 .string "…\p" .string "My Secrets!\p" .string "Skill: Mimicry!\n" .string "Hobby: Collecting dolls!\l" .string "Favorite POKéMON: CLEFAIRY!$" +SaffronCity_CopycatsHouse_2F_Text_HuhCantSee:: @ 819B123 + .string "？ みえないぞ‥$" diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index d6e1d9d4d..699ead653 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 7, - "script": "SaffronCity_Dojo_EventScript_16ED46", + "script": "SaffronCity_Dojo_EventScript_Hitoshi", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 7, - "script": "SaffronCity_Dojo_EventScript_16ED5D", + "script": "SaffronCity_Dojo_EventScript_Hideki", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 7, - "script": "SaffronCity_Dojo_EventScript_16ED74", + "script": "SaffronCity_Dojo_EventScript_Aaron", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 7, - "script": "SaffronCity_Dojo_EventScript_16ED8B", + "script": "SaffronCity_Dojo_EventScript_Mike", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SaffronCity_Dojo_EventScript_16EDA2", + "script": "SaffronCity_Dojo_EventScript_MasterKoichi", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Dojo_EventScript_16EC00", + "script": "SaffronCity_Dojo_EventScript_HitmonleeBall", "flag": "FLAG_HIDE_DOJO_HITMONLEE_BALL" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Dojo_EventScript_16EC46", + "script": "SaffronCity_Dojo_EventScript_HitmonchanBall", "flag": "FLAG_HIDE_DOJO_HITMONCHAN_BALL" } ], @@ -136,7 +136,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_SAFFRON_CITY_DOJO", "var_value": 0, - "script": "SaffronCity_Dojo_EventScript_16EBDC" + "script": "SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft" }, { "type": "trigger", @@ -145,7 +145,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_SAFFRON_CITY_DOJO", "var_value": 0, - "script": "SaffronCity_Dojo_EventScript_16EBEE" + "script": "SaffronCity_Dojo_EventScript_TriggerMasterBattleRight" } ], "bg_events": [ @@ -154,28 +154,28 @@ "x": 3, "y": 13, "elevation": 0, - "script": "SaffronCity_Dojo_EventScript_16ED2B" + "script": "SaffronCity_Dojo_EventScript_Statue" }, { "type": "bg_event_type_0", "x": 9, "y": 13, "elevation": 0, - "script": "SaffronCity_Dojo_EventScript_16ED2B" + "script": "SaffronCity_Dojo_EventScript_Statue" }, { "type": "bg_event_type_0", "x": 5, "y": 2, "elevation": 0, - "script": "SaffronCity_Dojo_EventScript_16ED34" + "script": "SaffronCity_Dojo_EventScript_LeftScroll" }, { "type": "bg_event_type_0", "x": 7, "y": 2, "elevation": 0, - "script": "SaffronCity_Dojo_EventScript_16ED3D" + "script": "SaffronCity_Dojo_EventScript_RightScroll" } ] } diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index d5c3e6603..88e53d64c 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -1,157 +1,159 @@ +.equ LOCALID_KARATE_MASTER, 5 + SaffronCity_Dojo_MapScripts:: @ 816EBDB .byte 0 -SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC +SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft:: @ 816EBDC lockall setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 - applymovement 5, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestLeft waitmovement 0 releaseall end -SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE +SaffronCity_Dojo_EventScript_TriggerMasterBattleRight:: @ 816EBEE lockall setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 - applymovement 5, Movement_WalkInPlaceFastestRight + applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestRight waitmovement 0 releaseall end -SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 +SaffronCity_Dojo_EventScript_HitmonleeBall:: @ 816EC00 lock faceplayer - goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EC3C + goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon drawmonpic SPECIES_HITMONLEE, 10, 3 setvar VAR_TEMP_1, SPECIES_HITMONLEE - applymovement 5, Movement_WalkInPlaceFastestUp + applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 0 - msgbox gUnknown_819B44E, MSGBOX_YESNO + msgbox SaffronCity_Dojo_Text_YouWantHitmonlee, MSGBOX_YESNO call EventScript_1A6675 compare VAR_RESULT, YES - goto_if_eq EventScript_16EC82 + goto_if_eq SaffronCity_Dojo_EventScript_GiveHitmon erasemonpic release end -EventScript_16EC3C:: @ 816EC3C - msgbox gUnknown_819B4E1 +SaffronCity_Dojo_EventScript_AlreadyGotHitmon:: @ 816EC3C + msgbox SaffronCity_Dojo_Text_BetterNotGetGreedy release end -SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 +SaffronCity_Dojo_EventScript_HitmonchanBall:: @ 816EC46 lock faceplayer - goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EC3C + goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon drawmonpic SPECIES_HITMONCHAN, 10, 3 setvar VAR_TEMP_1, SPECIES_HITMONCHAN - applymovement 5, Movement_WalkInPlaceFastestUp + applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 0 - msgbox gUnknown_819B49E, MSGBOX_YESNO + msgbox SaffronCity_Dojo_Text_YouWantHitmonchan, MSGBOX_YESNO call EventScript_1A6675 compare VAR_RESULT, YES - goto_if_eq EventScript_16EC82 + goto_if_eq SaffronCity_Dojo_EventScript_GiveHitmon erasemonpic release end -EventScript_16EC82:: @ 816EC82 +SaffronCity_Dojo_EventScript_GiveHitmon:: @ 816EC82 erasemonpic givemon VAR_TEMP_1, 25, ITEM_NONE compare VAR_RESULT, 0 - goto_if_eq EventScript_16ECB5 + goto_if_eq SaffronCity_Dojo_EventScript_ReceivedHitmonParty compare VAR_RESULT, 1 - goto_if_eq EventScript_16ECEC + goto_if_eq SaffronCity_Dojo_EventScript_ReceivedHitmonPC compare VAR_RESULT, 2 goto_if_eq EventScript_NoMoreRoomForPokemon release end -EventScript_16ECB5:: @ 816ECB5 +SaffronCity_Dojo_EventScript_ReceivedHitmonParty:: @ 816ECB5 removeobject VAR_LAST_TALKED getspeciesname 0, VAR_TEMP_1 playfanfare MUS_FANFA1 - message Text_19B473 + message SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster waitmessage waitfanfare setflag FLAG_GOT_HITMON_FROM_DOJO msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16ED29 + goto_if_eq SaffronCity_Dojo_EventScript_EndGiveMon call EventScript_GetGiftMonPartySlot call EventScript_ChangePokemonNickname - goto EventScript_16ED29 + goto SaffronCity_Dojo_EventScript_EndGiveMon end -EventScript_16ECEC:: @ 816ECEC +SaffronCity_Dojo_EventScript_ReceivedHitmonPC:: @ 816ECEC removeobject VAR_LAST_TALKED getspeciesname 0, VAR_TEMP_1 playfanfare MUS_FANFA1 - message Text_19B473 + message SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster waitmessage waitfanfare setflag FLAG_GOT_HITMON_FROM_DOJO msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16ED1E + goto_if_eq SaffronCity_Dojo_EventScript_TransferredHitmonToPC call EventScript_NameReceivedBoxMon - goto EventScript_16ED1E + goto SaffronCity_Dojo_EventScript_TransferredHitmonToPC end -EventScript_16ED1E:: @ 816ED1E +SaffronCity_Dojo_EventScript_TransferredHitmonToPC:: @ 816ED1E call EventScript_TransferredToPC - goto EventScript_16ED29 + goto SaffronCity_Dojo_EventScript_EndGiveMon end -EventScript_16ED29:: @ 816ED29 +SaffronCity_Dojo_EventScript_EndGiveMon:: @ 816ED29 release end -SaffronCity_Dojo_EventScript_16ED2B:: @ 816ED2B - msgbox gUnknown_819B52E, MSGBOX_SIGN +SaffronCity_Dojo_EventScript_Statue:: @ 816ED2B + msgbox SaffronCity_Dojo_Text_FightingDojo, MSGBOX_SIGN end -SaffronCity_Dojo_EventScript_16ED34:: @ 816ED34 - msgbox gUnknown_819B4F8, MSGBOX_SIGN +SaffronCity_Dojo_EventScript_LeftScroll:: @ 816ED34 + msgbox SaffronCity_Dojo_Text_EnemiesOnEverySide, MSGBOX_SIGN end -SaffronCity_Dojo_EventScript_16ED3D:: @ 816ED3D - msgbox gUnknown_819B50F, MSGBOX_SIGN +SaffronCity_Dojo_EventScript_RightScroll:: @ 816ED3D + msgbox SaffronCity_Dojo_Text_GoesAroundComesAround, MSGBOX_SIGN end -SaffronCity_Dojo_EventScript_16ED46:: @ 816ED46 - trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, Text_19B3DF, Text_19B40F - msgbox gUnknown_819B41F, MSGBOX_AUTOCLOSE +SaffronCity_Dojo_EventScript_Hitoshi:: @ 816ED46 + trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, SaffronCity_Dojo_Text_HitoshiIntro, SaffronCity_Dojo_Text_HitoshiDefeat + msgbox SaffronCity_Dojo_Text_HitoshiPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Dojo_EventScript_16ED5D:: @ 816ED5D - trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, Text_19B2E0, Text_19B2FD - msgbox gUnknown_819B30F, MSGBOX_AUTOCLOSE +SaffronCity_Dojo_EventScript_Hideki:: @ 816ED5D + trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, SaffronCity_Dojo_Text_HidekiIntro, SaffronCity_Dojo_Text_HidekiDefeat + msgbox SaffronCity_Dojo_Text_HidekiPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Dojo_EventScript_16ED74:: @ 816ED74 - trainerbattle_single TRAINER_BLACK_BELT_AARON, Text_19B341, Text_19B396 - msgbox gUnknown_819B3AC, MSGBOX_AUTOCLOSE +SaffronCity_Dojo_EventScript_Aaron:: @ 816ED74 + trainerbattle_single TRAINER_BLACK_BELT_AARON, SaffronCity_Dojo_Text_AaronIntro, SaffronCity_Dojo_Text_AaronDefeat + msgbox SaffronCity_Dojo_Text_AaronPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B - trainerbattle_single TRAINER_BLACK_BELT_MIKE, Text_19B275, Text_19B292 - msgbox gUnknown_819B29D, MSGBOX_AUTOCLOSE +SaffronCity_Dojo_EventScript_Mike:: @ 816ED8B + trainerbattle_single TRAINER_BLACK_BELT_MIKE, SaffronCity_Dojo_Text_MikeIntro, SaffronCity_Dojo_Text_MikeDefeat + msgbox SaffronCity_Dojo_Text_MikePostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2 - trainerbattle_single TRAINER_BLACK_BELT_KOICHI, Text_19B12C, Text_19B193, EventScript_16EDD0 - goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EDC6 - msgbox gUnknown_819B1A7, MSGBOX_AUTOCLOSE +SaffronCity_Dojo_EventScript_MasterKoichi:: @ 816EDA2 + trainerbattle_single TRAINER_BLACK_BELT_KOICHI, SaffronCity_Dojo_Text_MasterKoichiIntro, SaffronCity_Dojo_Text_MasterKoichiDefeat, SaffronCity_Dojo_EventScript_DefeatedMasterKoichi + goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_MasterKoichiAlreadyGotHitmon + msgbox SaffronCity_Dojo_Text_ChoosePrizedFightingMon, MSGBOX_AUTOCLOSE end -EventScript_16EDC6:: @ 816EDC6 - msgbox gUnknown_819B24C +SaffronCity_Dojo_EventScript_MasterKoichiAlreadyGotHitmon:: @ 816EDC6 + msgbox SaffronCity_Dojo_Text_StayAndTrainWithUs release end -EventScript_16EDD0:: @ 816EDD0 +SaffronCity_Dojo_EventScript_DefeatedMasterKoichi:: @ 816EDD0 setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 release end diff --git a/data/maps/SaffronCity_Dojo/text.inc b/data/maps/SaffronCity_Dojo/text.inc index d85b5a843..9c73ffcb9 100644 --- a/data/maps/SaffronCity_Dojo/text.inc +++ b/data/maps/SaffronCity_Dojo/text.inc @@ -1,7 +1,4 @@ -Text_19B123:: @ 819B123 - .string "？ みえないぞ‥$" - -Text_19B12C:: @ 819B12C +SaffronCity_Dojo_Text_MasterKoichiIntro:: @ 819B12C .string "Grunt!\p" .string "I am the KARATE MASTER!\n" .string "I am the LEADER here!\p" @@ -9,11 +6,11 @@ Text_19B12C:: @ 819B12C .string "Expect no mercy!\p" .string "Fwaaa!$" -Text_19B193:: @ 819B193 +SaffronCity_Dojo_Text_MasterKoichiDefeat:: @ 819B193 .string "Hwa!\n" .string "Arrgh! Beaten!$" -gUnknown_819B1A7:: @ 819B1A7 +SaffronCity_Dojo_Text_ChoosePrizedFightingMon:: @ 819B1A7 .string "Indeed, I have lost!\p" .string "But, I beseech you, do not take\n" .string "our emblem as your trophy!\p" @@ -21,85 +18,85 @@ gUnknown_819B1A7:: @ 819B1A7 .string "FIGHTING POKéMON!\p" .string "Choose whichever one you like!$" -gUnknown_819B24C:: @ 819B24C +SaffronCity_Dojo_Text_StayAndTrainWithUs:: @ 819B24C .string "Grunt!\n" .string "Stay and train at karate with us!$" -Text_19B275:: @ 819B275 +SaffronCity_Dojo_Text_MikeIntro:: @ 819B275 .string "Hoargh!\n" .string "Take your shoes off!$" -Text_19B292:: @ 819B292 +SaffronCity_Dojo_Text_MikeDefeat:: @ 819B292 .string "I give up!$" -gUnknown_819B29D:: @ 819B29D +SaffronCity_Dojo_Text_MikePostBattle:: @ 819B29D .string "You wait 'til you see our MASTER!\n" .string "I'm a small fry compared to him!$" -Text_19B2E0:: @ 819B2E0 +SaffronCity_Dojo_Text_HidekiIntro:: @ 819B2E0 .string "I hear you're good!\n" .string "Show me!$" -Text_19B2FD:: @ 819B2FD +SaffronCity_Dojo_Text_HidekiDefeat:: @ 819B2FD .string "Judge!\n" .string "One point!$" -gUnknown_819B30F:: @ 819B30F +SaffronCity_Dojo_Text_HidekiPostBattle:: @ 819B30F .string "Our MASTER is a pro fighter.\n" .string "Be prepared to lose!$" -Text_19B341:: @ 819B341 +SaffronCity_Dojo_Text_AaronIntro:: @ 819B341 .string "Hiyah!\n" .string "I have no fear for anything tough!\p" .string "I shatter boulders for training\n" .string "every day!$" -Text_19B396:: @ 819B396 +SaffronCity_Dojo_Text_AaronDefeat:: @ 819B396 .string "Yow!\n" .string "Stubbed fingers!$" -gUnknown_819B3AC:: @ 819B3AC +SaffronCity_Dojo_Text_AaronPostBattle:: @ 819B3AC .string "The only thing that frightens us is\n" .string "psychic power!$" -Text_19B3DF:: @ 819B3DF +SaffronCity_Dojo_Text_HitoshiIntro:: @ 819B3DF .string "Hwaah!\p" .string "You're trespassing in our\n" .string "FIGHTING DOJO!$" -Text_19B40F:: @ 819B40F +SaffronCity_Dojo_Text_HitoshiDefeat:: @ 819B40F .string "Oof!\n" .string "I give up!$" -gUnknown_819B41F:: @ 819B41F +SaffronCity_Dojo_Text_HitoshiPostBattle:: @ 819B41F .string "The prime fighters across the land\n" .string "train here.$" -gUnknown_819B44E:: @ 819B44E +SaffronCity_Dojo_Text_YouWantHitmonlee:: @ 819B44E .string "You want the hard-kicking\n" .string "HITMONLEE?$" -Text_19B473:: @ 819B473 +SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster:: @ 819B473 .string "{PLAYER} received the {STR_VAR_1}\n" .string "from the KARATE MASTER.$" -gUnknown_819B49E:: @ 819B49E +SaffronCity_Dojo_Text_YouWantHitmonchan:: @ 819B49E .string "You want the piston-punching\n" .string "HITMONCHAN?$" -Text_19B4C7:: @ 819B4C7 +SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster2:: @ 819B4C7 .string "{PLAYER}は カラテ だいおう から\n" .string "{STR_VAR_1}を もらった！$" -gUnknown_819B4E1:: @ 819B4E1 +SaffronCity_Dojo_Text_BetterNotGetGreedy:: @ 819B4E1 .string "Better not get greedy…$" -gUnknown_819B4F8:: @ 819B4F8 +SaffronCity_Dojo_Text_EnemiesOnEverySide:: @ 819B4F8 .string "Enemies on every side!$" -gUnknown_819B50F:: @ 819B50F +SaffronCity_Dojo_Text_GoesAroundComesAround:: @ 819B50F .string "What goes around comes around.$" -gUnknown_819B52E:: @ 819B52E +SaffronCity_Dojo_Text_FightingDojo:: @ 819B52E .string "FIGHTING DOJO$" diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json index cfbf00b36..0ebd439e5 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SaffronCity_Gym_EventScript_16EEC3", + "script": "SaffronCity_Gym_EventScript_Cameron", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SaffronCity_Gym_EventScript_16EE88", + "script": "SaffronCity_Gym_EventScript_Johan", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SaffronCity_Gym_EventScript_16EEDA", + "script": "SaffronCity_Gym_EventScript_Preston", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SaffronCity_Gym_EventScript_16EEF1", + "script": "SaffronCity_Gym_EventScript_Amanda", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SaffronCity_Gym_EventScript_16EF08", + "script": "SaffronCity_Gym_EventScript_Stacy", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SaffronCity_Gym_EventScript_16EF1F", + "script": "SaffronCity_Gym_EventScript_Tasha", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Gym_EventScript_16EDD8", + "script": "SaffronCity_Gym_EventScript_Sabrina", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SaffronCity_Gym_EventScript_16EE9F", + "script": "SaffronCity_Gym_EventScript_Tyron", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Gym_EventScript_16EF36", + "script": "SaffronCity_Gym_EventScript_GymGuy", "flag": "0" } ], @@ -371,14 +371,14 @@ "x": 12, "y": 20, "elevation": 0, - "script": "SaffronCity_Gym_EventScript_16EF55" + "script": "SaffronCity_Gym_EventScript_GymStatue" }, { "type": "bg_event_type_0", "x": 16, "y": 20, "elevation": 0, - "script": "SaffronCity_Gym_EventScript_16EF55" + "script": "SaffronCity_Gym_EventScript_GymStatue" } ] } diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index afe863e89..8b4542fab 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -1,97 +1,97 @@ SaffronCity_Gym_MapScripts:: @ 816EDD7 .byte 0 -SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8 +SaffronCity_Gym_EventScript_Sabrina:: @ 816EDD8 famechecker FAMECHECKER_SABRINA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle_single TRAINER_LEADER_SABRINA, Text_19B53C, Text_19B602, EventScript_16EE0A, NO_MUSIC - goto_if_unset FLAG_GOT_TM04_FROM_SABRINA, EventScript_16EE3D - msgbox gUnknown_819B7F2 + trainerbattle_single TRAINER_LEADER_SABRINA, SaffronCity_Gym_Text_SabrinaIntro, SaffronCity_Gym_Text_SabrinaDefeat, SaffronCity_Gym_EventScript_DefeatedSabrina, NO_MUSIC + goto_if_unset FLAG_GOT_TM04_FROM_SABRINA, SaffronCity_Gym_EventScript_GiveTM04 + msgbox SaffronCity_Gym_Text_ExplainTM04 release end -EventScript_16EE0A:: @ 816EE0A +SaffronCity_Gym_EventScript_DefeatedSabrina:: @ 816EE0A famechecker FAMECHECKER_SABRINA, 2 famechecker FAMECHECKER_SABRINA, 3 clearflag FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS setflag FLAG_DEFEATED_SABRINA setflag FLAG_BADGE06_GET set_gym_trainers 6 - goto EventScript_16EE3D + goto SaffronCity_Gym_EventScript_GiveTM04 end -EventScript_16EE3D:: @ 816EE3D - msgbox gUnknown_819B6FA +SaffronCity_Gym_EventScript_GiveTM04:: @ 816EE3D + msgbox SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis checkitemspace ITEM_TM04, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16EE7E - giveitem_msg gUnknown_819B7D3, ITEM_TM04 + goto_if_eq SaffronCity_Gym_EventScript_NoRoomForTM04 + giveitem_msg SaffronCity_Gym_Text_ReceivedTM04FromSabrina, ITEM_TM04 setflag FLAG_GOT_TM04_FROM_SABRINA - msgbox gUnknown_819B685 + msgbox SaffronCity_Gym_Text_SabrinaPostBattle release end -EventScript_16EE7E:: @ 816EE7E - msgbox gUnknown_819B849 +SaffronCity_Gym_EventScript_NoRoomForTM04:: @ 816EE7E + msgbox SaffronCity_Gym_Text_BagFullOfOtherItems release end -SaffronCity_Gym_EventScript_16EE88:: @ 816EE88 - trainerbattle_single TRAINER_PSYCHIC_JOHAN, Text_19B936, Text_19B957 - msgbox gUnknown_819B96D, MSGBOX_AUTOCLOSE +SaffronCity_Gym_EventScript_Johan:: @ 816EE88 + trainerbattle_single TRAINER_PSYCHIC_JOHAN, SaffronCity_Gym_Text_JohanIntro, SaffronCity_Gym_Text_JohanDefeat + msgbox SaffronCity_Gym_Text_JohanPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F - trainerbattle_single TRAINER_PSYCHIC_TYRON, Text_19BA45, Text_19BA9E +SaffronCity_Gym_EventScript_Tyron:: @ 816EE9F + trainerbattle_single TRAINER_PSYCHIC_TYRON, SaffronCity_Gym_Text_TyronIntro, SaffronCity_Gym_Text_TyronDefeat famechecker FAMECHECKER_SABRINA, 5 - msgbox gUnknown_819BAB4, MSGBOX_AUTOCLOSE + msgbox SaffronCity_Gym_Text_TyronPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_16EEC3:: @ 816EEC3 - trainerbattle_single TRAINER_PSYCHIC_CAMERON, Text_19BB49, Text_19BBA1 - msgbox gUnknown_819BBB3, MSGBOX_AUTOCLOSE +SaffronCity_Gym_EventScript_Cameron:: @ 816EEC3 + trainerbattle_single TRAINER_PSYCHIC_CAMERON, SaffronCity_Gym_Text_CameronIntro, SaffronCity_Gym_Text_CameronDefeat + msgbox SaffronCity_Gym_Text_CameronPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_16EEDA:: @ 816EEDA - trainerbattle_single TRAINER_PSYCHIC_PRESTON, Text_19BC57, Text_19BCBC - msgbox gUnknown_819BCC4, MSGBOX_AUTOCLOSE +SaffronCity_Gym_EventScript_Preston:: @ 816EEDA + trainerbattle_single TRAINER_PSYCHIC_PRESTON, SaffronCity_Gym_Text_PrestonIntro, SaffronCity_Gym_Text_PrestonDefeat + msgbox SaffronCity_Gym_Text_PrestonPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_16EEF1:: @ 816EEF1 - trainerbattle_single TRAINER_CHANNELER_AMANDA, Text_19B86A, Text_19B8A8 - msgbox gUnknown_819B8B9, MSGBOX_AUTOCLOSE +SaffronCity_Gym_EventScript_Amanda:: @ 816EEF1 + trainerbattle_single TRAINER_CHANNELER_AMANDA, SaffronCity_Gym_Text_AmandaIntro, SaffronCity_Gym_Text_AmandaDefeat + msgbox SaffronCity_Gym_Text_AmandaPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_16EF08:: @ 816EF08 - trainerbattle_single TRAINER_CHANNELER_STACY, Text_19B998, Text_19B9EC - msgbox gUnknown_819B9F7, MSGBOX_AUTOCLOSE +SaffronCity_Gym_EventScript_Stacy:: @ 816EF08 + trainerbattle_single TRAINER_CHANNELER_STACY, SaffronCity_Gym_Text_StacyIntro, SaffronCity_Gym_Text_StacyDefeat + msgbox SaffronCity_Gym_Text_StacyPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_16EF1F:: @ 816EF1F - trainerbattle_single TRAINER_CHANNELER_TASHA, Text_19BAE8, Text_19BB0D - msgbox gUnknown_819BB1F, MSGBOX_AUTOCLOSE +SaffronCity_Gym_EventScript_Tasha:: @ 816EF1F + trainerbattle_single TRAINER_CHANNELER_TASHA, SaffronCity_Gym_Text_TashaIntro, SaffronCity_Gym_Text_TashaDefeat + msgbox SaffronCity_Gym_Text_TashaPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_16EF36:: @ 816EF36 +SaffronCity_Gym_EventScript_GymGuy:: @ 816EF36 lock faceplayer - goto_if_set FLAG_DEFEATED_SABRINA, EventScript_16EF4B - msgbox gUnknown_819BCF6 + goto_if_set FLAG_DEFEATED_SABRINA, SaffronCity_Gym_EventScript_GymGuyPostVictory + msgbox SaffronCity_Gym_Text_GymGuyAdvice release end -EventScript_16EF4B:: @ 816EF4B - msgbox gUnknown_819BDBB +SaffronCity_Gym_EventScript_GymGuyPostVictory:: @ 816EF4B + msgbox SaffronCity_Gym_Text_GymGuyPostVictory release end -SaffronCity_Gym_EventScript_16EF55:: @ 816EF55 +SaffronCity_Gym_EventScript_GymStatue:: @ 816EF55 lockall - goto_if_set FLAG_BADGE06_GET, EventScript_16EF69 - msgbox gUnknown_819BDFE + goto_if_set FLAG_BADGE06_GET, SaffronCity_Gym_EventScript_GymStatuePostVictory + msgbox SaffronCity_Gym_Text_GymStatue releaseall end -EventScript_16EF69:: @ 816EF69 - msgbox gUnknown_819BE37 +SaffronCity_Gym_EventScript_GymStatuePostVictory:: @ 816EF69 + msgbox SaffronCity_Gym_Text_GymStatuePlayerWon releaseall end diff --git a/data/maps/SaffronCity_Gym/text.inc b/data/maps/SaffronCity_Gym/text.inc index ed48d983f..827d4bbd5 100644 --- a/data/maps/SaffronCity_Gym/text.inc +++ b/data/maps/SaffronCity_Gym/text.inc @@ -1,4 +1,4 @@ -Text_19B53C:: @ 819B53C +SaffronCity_Gym_Text_SabrinaIntro:: @ 819B53C .string "I had a vision of your arrival.\p" .string "I have had psychic powers since\n" .string "I was a child.\p" @@ -7,7 +7,7 @@ Text_19B53C:: @ 819B53C .string "I dislike battling, but if you wish,\n" .string "I will show you my powers!{PLAY_BGM}{MUS_EXEYE}$" -Text_19B602:: @ 819B602 +SaffronCity_Gym_Text_SabrinaDefeat:: @ 819B602 .string "This loss shocks me!\n" .string "But, a loss is a loss.\p" .string "I admit, I didn't work hard enough\n" @@ -15,13 +15,13 @@ Text_19B602:: @ 819B602 .string "Your victory has earned you the\n" .string "MARSHBADGE.$" -gUnknown_819B685:: @ 819B685 +SaffronCity_Gym_Text_SabrinaPostBattle:: @ 819B685 .string "Psychic power isn't something that\n" .string "only a few people have.\p" .string "Everyone has psychic power.\n" .string "People just don't realize it.$" -gUnknown_819B6FA:: @ 819B6FA +SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis:: @ 819B6FA .string "The MARSHBADGE makes POKéMON up\n" .string "to Lv. 70 obey you.\p" .string "Stronger POKéMON will become wild,\n" @@ -30,87 +30,87 @@ gUnknown_819B6FA:: @ 819B6FA .string "much to avoid that problem.\p" .string "Wait, please take this TM with you.$" -gUnknown_819B7D3:: @ 819B7D3 +SaffronCity_Gym_Text_ReceivedTM04FromSabrina:: @ 819B7D3 .string "{PLAYER} received TM04 from\n" .string "SABRINA.$" -gUnknown_819B7F2:: @ 819B7F2 +SaffronCity_Gym_Text_ExplainTM04:: @ 819B7F2 .string "TM04 is CALM MIND.\p" .string "It makes the POKéMON concentrate\n" .string "to raise both SP. ATK and SP. DEF.$" -gUnknown_819B849:: @ 819B849 +SaffronCity_Gym_Text_BagFullOfOtherItems:: @ 819B849 .string "Your BAG is full of other items.$" -Text_19B86A:: @ 819B86A +SaffronCity_Gym_Text_AmandaIntro:: @ 819B86A .string "SABRINA is far younger than I,\n" .string "but she has earned my respect.$" -Text_19B8A8:: @ 819B8A8 +SaffronCity_Gym_Text_AmandaDefeat:: @ 819B8A8 .string "Not good enough!$" -gUnknown_819B8B9:: @ 819B8B9 +SaffronCity_Gym_Text_AmandaPostBattle:: @ 819B8B9 .string "In a battle of equals, the one\n" .string "with the stronger will wins.\p" .string "If you wish to beat SABRINA, focus\n" .string "and will yourself to victory.$" -Text_19B936:: @ 819B936 +SaffronCity_Gym_Text_JohanIntro:: @ 819B936 .string "Does our unseen power scare you?$" -Text_19B957:: @ 819B957 +SaffronCity_Gym_Text_JohanDefeat:: @ 819B957 .string "I never foresaw this!$" -gUnknown_819B96D:: @ 819B96D +SaffronCity_Gym_Text_JohanPostBattle:: @ 819B96D .string "PSYCHIC POKéMON fear only ghosts\n" .string "and bugs!$" -Text_19B998:: @ 819B998 +SaffronCity_Gym_Text_StacyIntro:: @ 819B998 .string "POKéMON take on the appearance of\n" .string "their TRAINERS.\p" .string "Your POKéMON must be tough, then!$" -Text_19B9EC:: @ 819B9EC +SaffronCity_Gym_Text_StacyDefeat:: @ 819B9EC .string "I knew it!$" -gUnknown_819B9F7:: @ 819B9F7 +SaffronCity_Gym_Text_StacyPostBattle:: @ 819B9F7 .string "I have much to learn still…\p" .string "I must master PSYCHIC and teach it\n" .string "to my POKéMON…$" -Text_19BA45:: @ 819BA45 +SaffronCity_Gym_Text_TyronIntro:: @ 819BA45 .string "You understand, don't you?\p" .string "That power alone isn't enough to\n" .string "win in the world of POKéMON?$" -Text_19BA9E:: @ 819BA9E +SaffronCity_Gym_Text_TyronDefeat:: @ 819BA9E .string "I don't believe this!$" -gUnknown_819BAB4:: @ 819BAB4 +SaffronCity_Gym_Text_TyronPostBattle:: @ 819BAB4 .string "SABRINA just wiped out the KARATE\n" .string "MASTER next door.$" -Text_19BAE8:: @ 819BAE8 +SaffronCity_Gym_Text_TashaIntro:: @ 819BAE8 .string "You and I, our POKéMON shall\n" .string "battle!$" -Text_19BB0D:: @ 819BB0D +SaffronCity_Gym_Text_TashaDefeat:: @ 819BB0D .string "I lost after all!$" -gUnknown_819BB1F:: @ 819BB1F +SaffronCity_Gym_Text_TashaPostBattle:: @ 819BB1F .string "I knew that this was going to take\n" .string "place.$" -Text_19BB49:: @ 819BB49 +SaffronCity_Gym_Text_CameronIntro:: @ 819BB49 .string "SABRINA is young, but she's also\n" .string "our highly skilled LEADER.\p" .string "You won't reach her easily!$" -Text_19BBA1:: @ 819BBA1 +SaffronCity_Gym_Text_CameronDefeat:: @ 819BBA1 .string "Ow!\n" .string "Down and out!$" -gUnknown_819BBB3:: @ 819BBB3 +SaffronCity_Gym_Text_CameronPostBattle:: @ 819BBB3 .string "There used to be two POKéMON GYMS\n" .string "in SAFFRON.\p" .string "The FIGHTING DOJO next door lost\n" @@ -118,20 +118,20 @@ gUnknown_819BBB3:: @ 819BBB3 .string "We simply creamed them when we\n" .string "decided to have just one GYM.$" -Text_19BC57:: @ 819BC57 +SaffronCity_Gym_Text_PrestonIntro:: @ 819BC57 .string "SAFFRON POKéMON GYM is famous for\n" .string "training psychics.\p" .string "You want to see SABRINA, don't\n" .string "you? I can tell!$" -Text_19BCBC:: @ 819BCBC +SaffronCity_Gym_Text_PrestonDefeat:: @ 819BCBC .string "Arrrgh!$" -gUnknown_819BCC4:: @ 819BCC4 +SaffronCity_Gym_Text_PrestonPostBattle:: @ 819BCC4 .string "That's right! I used telepathy to\n" .string "read your mind!$" -gUnknown_819BCF6:: @ 819BCF6 +SaffronCity_Gym_Text_GymGuyAdvice:: @ 819BCF6 .string "Yo!\n" .string "Champ in the making!\p" .string "SABRINA's POKéMON use psychic\n" @@ -141,18 +141,18 @@ gUnknown_819BCF6:: @ 819BCF6 .string "They'll get destroyed before they\n" .string "can even aim a punch!$" -gUnknown_819BDBB:: @ 819BDBB +SaffronCity_Gym_Text_GymGuyPostVictory:: @ 819BDBB .string "Psychic power, huh?\p" .string "If I had that, I'd make a bundle\n" .string "at the slots!$" -gUnknown_819BDFE:: @ 819BDFE +SaffronCity_Gym_Text_GymStatue:: @ 819BDFE .string "SAFFRON POKéMON GYM\n" .string "LEADER: SABRINA\p" .string "WINNING TRAINERS:\n" .string "{RIVAL}$" -gUnknown_819BE37:: @ 819BE37 +SaffronCity_Gym_Text_GymStatuePlayerWon:: @ 819BE37 .string "SAFFRON POKéMON GYM\n" .string "LEADER: SABRINA\p" .string "WINNING TRAINERS:\n" diff --git a/data/maps/SaffronCity_House2/map.json b/data/maps/SaffronCity_House/map.json index 41fb0d809..48b569e5e 100644 --- a/data/maps/SaffronCity_House2/map.json +++ b/data/maps/SaffronCity_House/map.json @@ -1,6 +1,6 @@ { - "id": "MAP_SAFFRON_CITY_HOUSE2", - "name": "SaffronCity_House2", + "id": "MAP_SAFFRON_CITY_HOUSE", + "name": "SaffronCity_House", "layout": "LAYOUT_HOUSE5", "music": "MUS_NIBI", "region_map_section": "MAPSEC_SAFFRON_CITY", @@ -23,7 +23,7 @@ "movement_range_y": 4, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House2_EventScript_16EF86", + "script": "SaffronCity_House_EventScript_Pidgey", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House2_EventScript_16EF74", + "script": "SaffronCity_House_EventScript_Lass", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House2_EventScript_16EF7D", + "script": "SaffronCity_House_EventScript_Youngster", "flag": "0" }, { @@ -96,7 +96,7 @@ "x": 5, "y": 4, "elevation": 3, - "script": "SaffronCity_House2_EventScript_16EF99" + "script": "SaffronCity_House_EventScript_Letter" } ] } diff --git a/data/maps/SaffronCity_House/scripts.inc b/data/maps/SaffronCity_House/scripts.inc new file mode 100644 index 000000000..d94baa8a0 --- /dev/null +++ b/data/maps/SaffronCity_House/scripts.inc @@ -0,0 +1,24 @@ +SaffronCity_House_MapScripts:: @ 816EF73 + .byte 0 + +SaffronCity_House_EventScript_Lass:: @ 816EF74 + msgbox SaffronCity_House_Text_DontLookAtMyLetter, MSGBOX_NPC + end + +SaffronCity_House_EventScript_Youngster:: @ 816EF7D + msgbox SaffronCity_House_Text_GettingCopycatPokeDoll, MSGBOX_NPC + end + +SaffronCity_House_EventScript_Pidgey:: @ 816EF86 + lock + faceplayer + waitse + playmoncry SPECIES_PIDGEY, 0 + msgbox SaffronCity_House_Text_Pidgey + waitmoncry + release + end + +SaffronCity_House_EventScript_Letter:: @ 816EF99 + msgbox SaffronCity_House_Text_ExplainPPUp, MSGBOX_SIGN + end diff --git a/data/maps/SaffronCity_House2/text.inc b/data/maps/SaffronCity_House/text.inc index 9558880b7..7d13c13fa 100644 --- a/data/maps/SaffronCity_House2/text.inc +++ b/data/maps/SaffronCity_House/text.inc @@ -1,17 +1,17 @@ -gUnknown_819BE74:: @ 819BE74 +SaffronCity_House_Text_DontLookAtMyLetter:: @ 819BE74 .string "…Thank you for writing.\n" .string "I hope to see you soon!\p" .string "…Hey!\n" .string "Don't look at my letter!$" -gUnknown_819BEC3:: @ 819BEC3 +SaffronCity_House_Text_Pidgey:: @ 819BEC3 .string "PIDGEY: Kurukkoo!$" -gUnknown_819BED5:: @ 819BED5 +SaffronCity_House_Text_GettingCopycatPokeDoll:: @ 819BED5 .string "The COPYCAT is cute!\n" .string "I'm getting her a POKé DOLL.$" -gUnknown_819BF07:: @ 819BF07 +SaffronCity_House_Text_ExplainPPUp:: @ 819BF07 .string "I was given a PP UP as a gift.\p" .string "It's used to increase the PP of\n" .string "a POKéMON's move.\p" diff --git a/data/maps/SaffronCity_House1_1F/scripts.inc b/data/maps/SaffronCity_House1_1F/scripts.inc deleted file mode 100644 index 2f4e435fa..000000000 --- a/data/maps/SaffronCity_House1_1F/scripts.inc +++ /dev/null @@ -1,20 +0,0 @@ -SaffronCity_House1_1F_MapScripts:: @ 816EB36 - .byte 0 - -SaffronCity_House1_1F_EventScript_16EB37:: @ 816EB37 - msgbox gUnknown_819AB9B, MSGBOX_NPC - end - -SaffronCity_House1_1F_EventScript_16EB40:: @ 816EB40 - msgbox gUnknown_819ABD7, MSGBOX_NPC - end - -SaffronCity_House1_1F_EventScript_16EB49:: @ 816EB49 - lock - faceplayer - waitse - playmoncry SPECIES_CHANSEY, 0 - msgbox gUnknown_819AC4B - waitmoncry - release - end diff --git a/data/maps/SaffronCity_House1_1F/text.inc b/data/maps/SaffronCity_House1_1F/text.inc deleted file mode 100644 index 04bedb057..000000000 --- a/data/maps/SaffronCity_House1_1F/text.inc +++ /dev/null @@ -1,32 +0,0 @@ -Text_19A9E7:: @ 819A9E7 - .string "AGATHA's GHOST-type POKéMON are\n" - .string "horrifically terrifying in toughness.\p" - .string "I took my FIGHTING-type POKéMON\n" - .string "and raised them to the max.\p" - .string "I went at AGATHA feeling pretty\n" - .string "confident, but she whupped us.\p" - .string "That old lady's also got a really\n" - .string "short fuse, too.\p" - .string "It doesn't take anything to get\n" - .string "that scary lady hollering.$" - -Text_19AB16:: @ 819AB16 - .string "Maybe becoming an ELITE FOUR\n" - .string "member is in the blood.\p" - .string "From what I've heard, LANCE has\n" - .string "a cousin who's a GYM LEADER\l" - .string "somewhere far away.$" - -gUnknown_819AB9B:: @ 819AB9B - .string "My daughter is so self-centered.\n" - .string "She has but a few friends.$" - -gUnknown_819ABD7:: @ 819ABD7 - .string "My daughter likes to mimic people.\n" - .string "It's rather vexing.\p" - .string "Her mimicry has earned her the\n" - .string "nickname COPYCAT around here.$" - -gUnknown_819AC4B:: @ 819AC4B - .string "CHANSEY: Chaan! Sii!$" - diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc deleted file mode 100644 index 17714d816..000000000 --- a/data/maps/SaffronCity_House1_2F/scripts.inc +++ /dev/null @@ -1,50 +0,0 @@ -SaffronCity_House1_2F_MapScripts:: @ 816EB5C - .byte 0 - -SaffronCity_House1_2F_EventScript_16EB5D:: @ 816EB5D - lock - faceplayer - waitse - playmoncry SPECIES_DODUO, 0 - msgbox gUnknown_819B030 - waitmoncry - release - end - -SaffronCity_House1_2F_EventScript_16EB70:: @ 816EB70 - lock - msgbox gUnknown_819B071 - release - end - -SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B - goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 - lock - faceplayer - checkitem ITEM_POKE_DOLL, 1 - compare VAR_RESULT, TRUE - goto_if_eq EventScript_MimicTutor - checkplayergender - compare VAR_RESULT, MALE - call_if_eq EventScript_16EBB7 - compare VAR_RESULT, FEMALE - call_if_eq EventScript_16EBC0 - release - end - -EventScript_16EBB7:: @ 816EBB7 - msgbox gUnknown_819AC60 - return - -EventScript_16EBC0:: @ 816EBC0 - msgbox gUnknown_819ACF1 - return - -SaffronCity_House1_2F_EventScript_16EBC9:: @ 816EBC9 - msgbox gUnknown_819B0D0, MSGBOX_SIGN - end - -SaffronCity_House1_2F_EventScript_16EBD2:: @ 816EBD2 - msgbox gUnknown_819B0A0, MSGBOX_SIGN - end diff --git a/data/maps/SaffronCity_House2/scripts.inc b/data/maps/SaffronCity_House2/scripts.inc deleted file mode 100644 index 03afb1a4c..000000000 --- a/data/maps/SaffronCity_House2/scripts.inc +++ /dev/null @@ -1,24 +0,0 @@ -SaffronCity_House2_MapScripts:: @ 816EF73 - .byte 0 - -SaffronCity_House2_EventScript_16EF74:: @ 816EF74 - msgbox gUnknown_819BE74, MSGBOX_NPC - end - -SaffronCity_House2_EventScript_16EF7D:: @ 816EF7D - msgbox gUnknown_819BED5, MSGBOX_NPC - end - -SaffronCity_House2_EventScript_16EF86:: @ 816EF86 - lock - faceplayer - waitse - playmoncry SPECIES_PIDGEY, 0 - msgbox gUnknown_819BEC3 - waitmoncry - release - end - -SaffronCity_House2_EventScript_16EF99:: @ 816EF99 - msgbox gUnknown_819BF07, MSGBOX_SIGN - end diff --git a/data/maps/SaffronCity_House3/scripts.inc b/data/maps/SaffronCity_House3/scripts.inc deleted file mode 100644 index 9e177cccb..000000000 --- a/data/maps/SaffronCity_House3/scripts.inc +++ /dev/null @@ -1,26 +0,0 @@ -SaffronCity_House3_MapScripts:: @ 816F05E - .byte 0 - -SaffronCity_House3_EventScript_16F05F:: @ 816F05F - lock - faceplayer - goto_if_set FLAG_GOT_TM29_FROM_MR_PSYCHIC, EventScript_16F0B5 - msgbox gUnknown_819C142 - checkitemspace ITEM_TM29, 1 - compare VAR_RESULT, FALSE - goto_if_eq EventScript_16F0AB - giveitem_msg gUnknown_819C16C, ITEM_TM29 - msgbox gUnknown_819C18F - setflag FLAG_GOT_TM29_FROM_MR_PSYCHIC - release - end - -EventScript_16F0AB:: @ 816F0AB - msgbox gUnknown_819C1FC - release - end - -EventScript_16F0B5:: @ 816F0B5 - msgbox gUnknown_819C18F - release - end diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index 8f3bd6718..ddce0c6d9 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Mart_EventScript_16EFB5", + "script": "SaffronCity_Mart_EventScript_Clerk", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Mart_EventScript_16EFAC", + "script": "SaffronCity_Mart_EventScript_Youngster", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_Mart_EventScript_16EFA3", + "script": "SaffronCity_Mart_EventScript_Lass", "flag": "0" } ], diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc index 5361c07a8..c00a93776 100644 --- a/data/maps/SaffronCity_Mart/scripts.inc +++ b/data/maps/SaffronCity_Mart/scripts.inc @@ -1,27 +1,27 @@ SaffronCity_Mart_MapScripts:: @ 816EFA2 .byte 0 -SaffronCity_Mart_EventScript_16EFA3:: @ 816EFA3 - msgbox gUnknown_819BFF1, MSGBOX_NPC +SaffronCity_Mart_EventScript_Lass:: @ 816EFA3 + msgbox SaffronCity_Mart_Text_ReviveIsCostly, MSGBOX_NPC end -SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC - msgbox gUnknown_819BF8F, MSGBOX_NPC +SaffronCity_Mart_EventScript_Youngster:: @ 816EFAC + msgbox SaffronCity_Mart_Text_MaxRepelMoreEffectiveThanSuper, MSGBOX_NPC end -SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5 +SaffronCity_Mart_EventScript_Clerk:: @ 816EFB5 goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16EFDC + pokemart SaffronCity_Mart_Items msgbox Text_PleaseComeAgain release end .align 2 -Items_16EFDC:: @ 816EFDC +SaffronCity_Mart_Items:: @ 816EFDC .2byte ITEM_GREAT_BALL .2byte ITEM_HYPER_POTION .2byte ITEM_REVIVE diff --git a/data/maps/SaffronCity_Mart/text.inc b/data/maps/SaffronCity_Mart/text.inc index 5acbdbd9c..edf13f2fe 100644 --- a/data/maps/SaffronCity_Mart/text.inc +++ b/data/maps/SaffronCity_Mart/text.inc @@ -1,10 +1,10 @@ -gUnknown_819BF8F:: @ 819BF8F +SaffronCity_Mart_Text_MaxRepelMoreEffectiveThanSuper:: @ 819BF8F .string "MAX REPEL keeps weaker POKéMON\n" .string "from appearing.\p" .string "MAX REPEL stays effective longer\n" .string "than SUPER REPEL.$" -gUnknown_819BFF1:: @ 819BFF1 +SaffronCity_Mart_Text_ReviveIsCostly:: @ 819BFF1 .string "REVIVE is costly, but it revives\n" .string "fainted POKéMON!$" diff --git a/data/maps/SaffronCity_House3/map.json b/data/maps/SaffronCity_MrPsychicsHouse/map.json index 3d3e7410e..f1d121850 100644 --- a/data/maps/SaffronCity_House3/map.json +++ b/data/maps/SaffronCity_MrPsychicsHouse/map.json @@ -1,6 +1,6 @@ { - "id": "MAP_SAFFRON_CITY_HOUSE3", - "name": "SaffronCity_House3", + "id": "MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE", + "name": "SaffronCity_MrPsychicsHouse", "layout": "LAYOUT_HOUSE5", "music": "MUS_NIBI", "region_map_section": "MAPSEC_SAFFRON_CITY", @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_House3_EventScript_16F05F", + "script": "SaffronCity_MrPsychicsHouse_EventScript_MrPsychic", "flag": "0" } ], diff --git a/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc b/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc new file mode 100644 index 000000000..24bd51cc1 --- /dev/null +++ b/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc @@ -0,0 +1,26 @@ +SaffronCity_MrPsychicsHouse_MapScripts:: @ 816F05E + .byte 0 + +SaffronCity_MrPsychicsHouse_EventScript_MrPsychic:: @ 816F05F + lock + faceplayer + goto_if_set FLAG_GOT_TM29_FROM_MR_PSYCHIC, SaffronCity_MrPsychicsHouse_EventScript_AlreadyGotTM29 + msgbox SaffronCity_MrPsychicsHouse_Text_YouWantedThis + checkitemspace ITEM_TM29, 1 + compare VAR_RESULT, FALSE + goto_if_eq SaffronCity_MrPsychicsHouse_EventScript_NoRoomForTM29 + giveitem_msg SaffronCity_MrPsychicsHouse_Text_ReceivedTM29FromMrPsychic, ITEM_TM29 + msgbox SaffronCity_MrPsychicsHouse_Text_ExplainTM29 + setflag FLAG_GOT_TM29_FROM_MR_PSYCHIC + release + end + +SaffronCity_MrPsychicsHouse_EventScript_NoRoomForTM29:: @ 816F0AB + msgbox SaffronCity_MrPsychicsHouse_Text_YouveNoRoom + release + end + +SaffronCity_MrPsychicsHouse_EventScript_AlreadyGotTM29:: @ 816F0B5 + msgbox SaffronCity_MrPsychicsHouse_Text_ExplainTM29 + release + end diff --git a/data/maps/SaffronCity_House3/text.inc b/data/maps/SaffronCity_MrPsychicsHouse/text.inc index 42699924f..31d220c69 100644 --- a/data/maps/SaffronCity_House3/text.inc +++ b/data/maps/SaffronCity_MrPsychicsHouse/text.inc @@ -1,18 +1,18 @@ -gUnknown_819C142:: @ 819C142 +SaffronCity_MrPsychicsHouse_Text_YouWantedThis:: @ 819C142 .string "…Wait! Don't say a word!\p" .string "You wanted this!$" -gUnknown_819C16C:: @ 819C16C +SaffronCity_MrPsychicsHouse_Text_ReceivedTM29FromMrPsychic:: @ 819C16C .string "{PLAYER} received TM29\n" .string "from MR. PSYCHIC.$" -gUnknown_819C18F:: @ 819C18F +SaffronCity_MrPsychicsHouse_Text_ExplainTM29:: @ 819C18F .string "You already know, don't you?\n" .string "TM29 is PSYCHIC.\p" .string "It's an attack that may also lower\n" .string "the target's special stats.$" -gUnknown_819C1FC:: @ 819C1FC +SaffronCity_MrPsychicsHouse_Text_YouveNoRoom:: @ 819C1FC .string "Where do you plan to put this?\n" .string "You've no room.$" diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index bb78415b4..1d28ff69a 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_1F_EventScript_16EFFB", + "script": "SaffronCity_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": "SaffronCity_PokemonCenter_1F_EventScript_16F004", + "script": "SaffronCity_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": "SaffronCity_PokemonCenter_1F_EventScript_16F00D", + "script": "SaffronCity_PokemonCenter_1F_EventScript_Woman", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_1F_EventScript_16F016", + "script": "SaffronCity_PokemonCenter_1F_EventScript_Youngster", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC", + "script": "SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina", "flag": "FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC", + "script": "SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina", "flag": "FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS" } ], diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index 8639de5af..b8e2385e6 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -7,31 +7,31 @@ SaffronCity_PokemonCenter_1F_OnTransition:: @ 816EFF7 setrespawn SPAWN_SAFFRON_CITY end -SaffronCity_PokemonCenter_1F_EventScript_16EFFB:: @ 816EFFB +SaffronCity_PokemonCenter_1F_EventScript_Nurse:: @ 816EFFB lock faceplayer call EventScript_PkmnCenterNurse release end -SaffronCity_PokemonCenter_1F_EventScript_16F004:: @ 816F004 - msgbox gUnknown_819C058, MSGBOX_NPC +SaffronCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816F004 + msgbox SaffronCity_PokemonCenter_1F_Text_SilphCoVictimOfFame, MSGBOX_NPC end -SaffronCity_PokemonCenter_1F_EventScript_16F00D:: @ 816F00D - msgbox gUnknown_819C023, MSGBOX_NPC +SaffronCity_PokemonCenter_1F_EventScript_Woman:: @ 816F00D + msgbox SaffronCity_PokemonCenter_1F_Text_GrowthRatesDifferBySpecies, MSGBOX_NPC end -SaffronCity_PokemonCenter_1F_EventScript_16F016:: @ 816F016 +SaffronCity_PokemonCenter_1F_EventScript_Youngster:: @ 816F016 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_eq EventScript_16F02D - msgbox gUnknown_819C0B4 + goto_if_eq SaffronCity_PokemonCenter_1F_EventScript_YoungsterRocketsGone + msgbox SaffronCity_PokemonCenter_1F_Text_GreatIfEliteFourCameBeatRockets release end -EventScript_16F02D:: @ 816F02D - msgbox gUnknown_819C102 +SaffronCity_PokemonCenter_1F_EventScript_YoungsterRocketsGone:: @ 816F02D + msgbox SaffronCity_PokemonCenter_1F_Text_TeamRocketTookOff release end diff --git a/data/maps/SaffronCity_PokemonCenter_1F/text.inc b/data/maps/SaffronCity_PokemonCenter_1F/text.inc index 8a3e43a10..51d64d42c 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/text.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/text.inc @@ -1,19 +1,19 @@ -gUnknown_819C023:: @ 819C023 +SaffronCity_PokemonCenter_1F_Text_GrowthRatesDifferBySpecies:: @ 819C023 .string "POKéMON growth rates differ from\n" .string "species to species.$" -gUnknown_819C058:: @ 819C058 +SaffronCity_PokemonCenter_1F_Text_SilphCoVictimOfFame:: @ 819C058 .string "SILPH CO. is widely known to all.\p" .string "It's a victim of its own fame - it\n" .string "attracted TEAM ROCKET.$" -gUnknown_819C0B4:: @ 819C0B4 +SaffronCity_PokemonCenter_1F_Text_GreatIfEliteFourCameBeatRockets:: @ 819C0B4 .string "Sigh…\n" .string "Wouldn't this be great?\p" .string "If the ELITE FOUR came and\n" .string "stomped TEAM ROCKET?$" -gUnknown_819C102:: @ 819C102 +SaffronCity_PokemonCenter_1F_Text_TeamRocketTookOff:: @ 819C102 .string "TEAM ROCKET took off!\n" .string "We can go out safely again!\l" .string "That's great!$" diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index 979278cdb..f8f892dca 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F281", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F36F", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Youngster", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F45D", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Woman", "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Rocker", "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F521", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Beauty", "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F583", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt", "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index ffb4678b2..8df872d7e 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -4,10 +4,10 @@ SaffronCity_PokemonTrainerFanClub_MapScripts:: @ 816F0BF .byte 0 SaffronCity_PokemonTrainerFanClub_OnFrame:: @ 816F0CA - map_script_2 VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1, EventScript_16F0D4 + map_script_2 VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1, SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans .2byte 0 -EventScript_16F0D4:: @ 816F0D4 +SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: @ 816F0D4 lockall textcolor 1 applymovement 1, Movement_WalkInPlaceFastestDown @@ -17,18 +17,18 @@ EventScript_16F0D4:: @ 816F0D4 waitmovement 0 applymovement 1, Movement_Delay48 waitmovement 0 - msgbox gUnknown_819C22B + msgbox SaffronCity_PokemonTrainerFanClub_Text_HuhYou closemessage - applymovement 1, Movement_16F124 + applymovement 1, SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox gUnknown_819C235 + msgbox SaffronCity_PokemonTrainerFanClub_Text_YourePlayerWereYourFansNow setvar VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 releaseall end -Movement_16F124:: @ 816F124 +SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: @ 816F124 delay_16 delay_8 walk_down @@ -38,7 +38,8 @@ Movement_16F124:: @ 816F124 walk_left step_end -Movement_16F12C:: @ 816F12C +@ Unused, leftover from RS +LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: @ 816F12C delay_8 walk_in_place_fastest_down walk_down @@ -48,7 +49,8 @@ Movement_16F12C:: @ 816F12C walk_left step_end -Movement_16F134:: @ 816F134 +@ Unused, leftover from RS +LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer:: @ 816F134 walk_fast_left walk_fast_left walk_fast_down @@ -57,12 +59,14 @@ Movement_16F134:: @ 816F134 walk_fast_down step_end -Movement_16F13B:: @ 816F13B +@ Unused, leftover from RS +LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer:: @ 816F13B walk_down walk_in_place_fastest_right step_end -Movement_16F13E:: @ 816F13E +@ Unused, leftover from RS +LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer:: @ 816F13E jump_in_place_right walk_fast_up walk_fast_up @@ -72,383 +76,383 @@ Movement_16F13E:: @ 816F13E SaffronCity_PokemonTrainerFanClub_OnTransition:: @ 816F144 compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1 - goto_if_eq EventScript_16F267 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 - goto_if_eq EventScript_16F15B + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions end -EventScript_16F15B:: @ 816F15B +SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions:: @ 816F15B special Special_TryLoseFansFromPlayTime setvar VAR_0x8004, FANCLUB_MEMBER1 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F207 + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER2 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F213 + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER3 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F21F + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER4 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F22B + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER5 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F237 + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER6 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F243 + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER7 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F24F + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable setvar VAR_0x8004, FANCLUB_MEMBER8 specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, FALSE - call_if_eq EventScript_16F25B + call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable end -EventScript_16F207:: @ 816F207 +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable:: @ 816F207 setobjectxyperm 1, 5, 2 setobjectmovementtype 1, 7 return -EventScript_16F213:: @ 816F213 +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable:: @ 816F213 setobjectxyperm 3, 7, 4 setobjectmovementtype 3, 9 return -EventScript_16F21F:: @ 816F21F +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable:: @ 816F21F setobjectxyperm 4, 2, 2 setobjectmovementtype 4, 7 return -EventScript_16F22B:: @ 816F22B +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable:: @ 816F22B setobjectxyperm 2, 3, 4 setobjectmovementtype 2, 10 return -EventScript_16F237:: @ 816F237 +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable:: @ 816F237 setobjectxyperm 6, 4, 6 setobjectmovementtype 6, 7 return -EventScript_16F243:: @ 816F243 +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable:: @ 816F243 setobjectxyperm 5, 10, 3 setobjectmovementtype 5, 7 return -EventScript_16F24F:: @ 816F24F +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable:: @ 816F24F setobjectxyperm 7, 7, 5 setobjectmovementtype 7, 9 return -EventScript_16F25B:: @ 816F25B +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable:: @ 816F25B setobjectxyperm 8, 9, 6 setobjectmovementtype 8, 9 return -EventScript_16F267:: @ 816F267 - call EventScript_16F22B - call EventScript_16F237 - call EventScript_16F243 - call EventScript_16F24F - call EventScript_16F25B +SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting:: @ 816F267 + call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable + call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable + call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable + call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable + call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable end -SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 +SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl:: @ 816F281 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER1 special Special_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if_eq EventScript_16F2EE + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F2C0 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F2E4 - msgbox gUnknown_819C420 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_WasYourFanNotAnymore release end -EventScript_16F2C0:: @ 816F2C0 +SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan:: @ 816F2C0 specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F2DA - msgbox gUnknown_819C390 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou release end -EventScript_16F2DA:: @ 816F2DA - msgbox gUnknown_819C3BD +SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan:: @ 816F2DA + msgbox SaffronCity_PokemonTrainerFanClub_Text_IllAlwaysBelieveInYou release end -EventScript_16F2E4:: @ 816F2E4 - msgbox gUnknown_819C4A5 +SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan:: @ 816F2E4 + msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryonesYourFanButICantBe release end -EventScript_16F2EE:: @ 816F2EE - msgbox gUnknown_819C55C +SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion:: @ 816F2EE + msgbox SaffronCity_PokemonTrainerFanClub_Text_TrainersCoolWhenBattling release end -SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 +SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl:: @ 816F2F8 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER4 special Special_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if_eq EventScript_16F365 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F337 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F35B - msgbox gUnknown_819CBD3 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeSabrina release end -EventScript_16F337:: @ 816F337 +SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan:: @ 816F337 specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F351 - msgbox gUnknown_819CB32 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeYouOneDay release end -EventScript_16F351:: @ 816F351 - msgbox gUnknown_819CB62 +SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan:: @ 816F351 + msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryoneButMeStoppedBeingYourFan release end -EventScript_16F35B:: @ 816F35B - msgbox gUnknown_819CC2B +SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan:: @ 816F35B + msgbox SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingSabrinasFan release end -EventScript_16F365:: @ 816F365 - msgbox gUnknown_819CCC2 +SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion:: @ 816F365 + msgbox SaffronCity_PokemonTrainerFanClub_Text_CanIBecomeCoolTrainerOneDay release end -SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F +SaffronCity_PokemonTrainerFanClub_EventScript_Youngster:: @ 816F36F lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER2 special Special_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if_eq EventScript_16F3DC + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayerNotChampion specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F3AE + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F3D2 - msgbox gUnknown_819C6BA + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksMyHero release end -EventScript_16F3AE:: @ 816F3AE +SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan:: @ 816F3AE specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F3C8 - msgbox gUnknown_819C5A9 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_CanYouAutographShorts release end -EventScript_16F3C8:: @ 816F3C8 - msgbox gUnknown_819C600 +SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyFan:: @ 816F3C8 + msgbox SaffronCity_PokemonTrainerFanClub_Text_CountingOnYou release end -EventScript_16F3D2:: @ 816F3D2 - msgbox gUnknown_819C73A +SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyNonFan:: @ 816F3D2 + msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksFanToBitterEnd release end -EventScript_16F3DC:: @ 816F3DC - msgbox gUnknown_819C7C8 +SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayerNotChampion:: @ 816F3DC + msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksLastWordOnCool release end -SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 +SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman:: @ 816F3E6 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER3 special Special_BufferFanClubTrainerName compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if_eq EventScript_16F453 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayerNotChampion specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F425 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F449 - msgbox gUnknown_819C986 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_HmmAndYouAre release end -EventScript_16F425:: @ 816F425 +SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan:: @ 816F425 specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F43F - msgbox gUnknown_819C81E + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_HadPleasureOfWatchingYouBattle release end -EventScript_16F43F:: @ 816F43F - msgbox gUnknown_819C8C1 +SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyFan:: @ 816F43F + msgbox SaffronCity_PokemonTrainerFanClub_Text_NeverSeenTrainerOfYourMagnificence release end -EventScript_16F449:: @ 816F449 - msgbox gUnknown_819C9D5 +SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyNonFan:: @ 816F449 + msgbox SaffronCity_PokemonTrainerFanClub_Text_YouveStillAWaysToGo release end -EventScript_16F453:: @ 816F453 - msgbox gUnknown_819CA7C +SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayerNotChampion:: @ 816F453 + msgbox SaffronCity_PokemonTrainerFanClub_Text_YoullBeTalkedAboutIfYouKeepWinning release end -SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D +SaffronCity_PokemonTrainerFanClub_EventScript_Woman:: @ 816F45D lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER6 special Special_BufferFanClubTrainerName specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F491 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F4B5 - msgbox gUnknown_819D01F + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_TrainerHasBeenOnFire release end -EventScript_16F491:: @ 816F491 +SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan:: @ 816F491 specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F4AB - msgbox gUnknown_819CEDF + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_AdoreWayYouBattle release end -EventScript_16F4AB:: @ 816F4AB - msgbox gUnknown_819CF6D +SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan:: @ 816F4AB + msgbox SaffronCity_PokemonTrainerFanClub_Text_ImYourNumberOneFan release end -EventScript_16F4B5:: @ 816F4B5 - msgbox gUnknown_819D075 +SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan:: @ 816F4B5 + msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryoneTalksAboutYou release end -SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF +SaffronCity_PokemonTrainerFanClub_EventScript_Rocker:: @ 816F4BF lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER5 special Special_BufferFanClubTrainerName specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F4F3 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F517 - msgbox gUnknown_819CDDA + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_LoveWayTrainerTalks release end -EventScript_16F4F3:: @ 816F4F3 +SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan:: @ 816F4F3 specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F50D - msgbox gUnknown_819CCF3 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_TheWayYouBattleIsCool release end -EventScript_16F50D:: @ 816F50D - msgbox gUnknown_819CD4E +SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyFan:: @ 816F50D + msgbox SaffronCity_PokemonTrainerFanClub_Text_ImOnlyOneLeftOfYourFans release end -EventScript_16F517:: @ 816F517 - msgbox gUnknown_819CE3A +SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyNonFan:: @ 816F517 + msgbox SaffronCity_PokemonTrainerFanClub_Text_ImLoneTrainerFan release end -SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 +SaffronCity_PokemonTrainerFanClub_EventScript_Beauty:: @ 816F521 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER7 special Special_BufferFanClubTrainerName specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F555 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F579 - msgbox gUnknown_819D1AE + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_WhyCantOthersSeeMastersDignity release end -EventScript_16F555:: @ 816F555 +SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan:: @ 816F555 specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F56F - msgbox gUnknown_819D0E3 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_YouReallyAreAmazing release end -EventScript_16F56F:: @ 816F56F - msgbox gUnknown_819D148 +SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyFan:: @ 816F56F + msgbox SaffronCity_PokemonTrainerFanClub_Text_ImYourOnlyFan release end -EventScript_16F579:: @ 816F579 - msgbox gUnknown_819D211 +SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyNonFan:: @ 816F579 + msgbox SaffronCity_PokemonTrainerFanClub_Text_BelieveInMasterWithAllMyHeart release end -SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 +SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt:: @ 816F583 lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER8 special Special_BufferFanClubTrainerName specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer compare VAR_RESULT, TRUE - goto_if_eq EventScript_16F5B7 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1) - goto_if_eq EventScript_16F5DB - msgbox gUnknown_819D3D2 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyNonFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_OnlyMasterHasMyRespect release end -EventScript_16F5B7:: @ 816F5B7 +SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan:: @ 816F5B7 specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 - goto_if_eq EventScript_16F5D1 - msgbox gUnknown_819D2B4 + goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyFan + msgbox SaffronCity_PokemonTrainerFanClub_Text_YourBattleStyleIsEducational release end -EventScript_16F5D1:: @ 816F5D1 - msgbox gUnknown_819D31F +SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyFan:: @ 816F5D1 + msgbox SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingYourFan release end -EventScript_16F5DB:: @ 816F5DB - msgbox gUnknown_819D477 +SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyNonFan:: @ 816F5DB + msgbox SaffronCity_PokemonTrainerFanClub_Text_NeverBeFanOfAnyoneButMaster release end diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc index ecbf0b024..fb9358c70 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc @@ -1,8 +1,8 @@ -gUnknown_819C22B:: @ 819C22B +SaffronCity_PokemonTrainerFanClub_Text_HuhYou:: @ 819C22B .string "Huh?\n" .string "You…$" -gUnknown_819C235:: @ 819C235 +SaffronCity_PokemonTrainerFanClub_Text_YourePlayerWereYourFansNow:: @ 819C235 .string "Are you maybe…\n" .string "… …\p" .string "You are!\n" @@ -19,17 +19,17 @@ gUnknown_819C235:: @ 819C235 .string "That way, maybe other people will\n" .string "become fans just like me.$" -gUnknown_819C390:: @ 819C390 +SaffronCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou:: @ 819C390 .string "I'll always be cheering for you!\p" .string "Go, {PLAYER}, go!$" -gUnknown_819C3BD:: @ 819C3BD +SaffronCity_PokemonTrainerFanClub_Text_IllAlwaysBelieveInYou:: @ 819C3BD .string "I'll always believe in you,\n" .string "{PLAYER}.\p" .string "Please show the others what you're\n" .string "like when you battle seriously.$" -gUnknown_819C420:: @ 819C420 +SaffronCity_PokemonTrainerFanClub_Text_WasYourFanNotAnymore:: @ 819C420 .string "I'm sorry.\n" .string "I was your fan before.\p" .string "But now, you seem to have lost\n" @@ -37,7 +37,7 @@ gUnknown_819C420:: @ 819C420 .string "Lately, I think {STR_VAR_1} has been\n" .string "a lot cooler.$" -gUnknown_819C4A5:: @ 819C4A5 +SaffronCity_PokemonTrainerFanClub_Text_EveryonesYourFanButICantBe:: @ 819C4A5 .string "Oh!\n" .string "{PLAYER}!\p" .string "Everyone's been all excited about\n" @@ -48,12 +48,12 @@ gUnknown_819C4A5:: @ 819C4A5 .string "Once I became {STR_VAR_1}'s fan,\n" .string "I can't just stop being a fan.$" -gUnknown_819C55C:: @ 819C55C +SaffronCity_PokemonTrainerFanClub_Text_TrainersCoolWhenBattling:: @ 819C55C .string "I think TRAINERS are so cool when\n" .string "they're battling.\p" .string "Don't you think so, too?$" -gUnknown_819C5A9:: @ 819C5A9 +SaffronCity_PokemonTrainerFanClub_Text_CanYouAutographShorts:: @ 819C5A9 .string "Oh! It's {PLAYER}!\n" .string "Too cool!\p" .string "Oh!\n" @@ -61,7 +61,7 @@ gUnknown_819C5A9:: @ 819C5A9 .string "Can you autograph something?\n" .string "How about my shorts?$" -gUnknown_819C600:: @ 819C600 +SaffronCity_PokemonTrainerFanClub_Text_CountingOnYou:: @ 819C600 .string "However hot it's been…\p" .string "And however cold it may get…\p" .string "I've always believed in, and worn,\n" @@ -71,7 +71,7 @@ gUnknown_819C600:: @ 819C600 .string "I believe in you just as much as\n" .string "I believe in shorts!$" -gUnknown_819C6BA:: @ 819C6BA +SaffronCity_PokemonTrainerFanClub_Text_BrocksMyHero:: @ 819C6BA .string "BROCK's my hero!\n" .string "He's a man among men!\p" .string "Heheh, I got my mom to do\n" @@ -79,7 +79,7 @@ gUnknown_819C6BA:: @ 819C6BA .string "I got her to embroider “BROCK”\n" .string "on my shorts!$" -gUnknown_819C73A:: @ 819C73A +SaffronCity_PokemonTrainerFanClub_Text_BrocksFanToBitterEnd:: @ 819C73A .string "… …\p" .string "… …\n" .string "I'm BROCK's fan!\p" @@ -88,13 +88,13 @@ gUnknown_819C73A:: @ 819C73A .string "and on my shorts!\p" .string "I'll be his fan to the bitter end!$" -gUnknown_819C7C8:: @ 819C7C8 +SaffronCity_PokemonTrainerFanClub_Text_BrocksLastWordOnCool:: @ 819C7C8 .string "BROCK's the last word on cool,\n" .string "end of story!\p" .string "Now there's a guy who I want to\n" .string "be like!$" -gUnknown_819C81E:: @ 819C81E +SaffronCity_PokemonTrainerFanClub_Text_HadPleasureOfWatchingYouBattle:: @ 819C81E .string "{PLAYER}, I've had the pleasure of\n" .string "watching you battle.\p" .string "It brings back sweet memories of\n" @@ -102,7 +102,7 @@ gUnknown_819C81E:: @ 819C81E .string "May you continue to find success.\n" .string "You have a fan in me!$" -gUnknown_819C8C1:: @ 819C8C1 +SaffronCity_PokemonTrainerFanClub_Text_NeverSeenTrainerOfYourMagnificence:: @ 819C8C1 .string "I have journeyed far and wide\n" .string "across the lands.\p" .string "But never have I seen a TRAINER\n" @@ -112,13 +112,13 @@ gUnknown_819C8C1:: @ 819C8C1 .string "Make that a promise to me,\n" .string "my young idol!$" -gUnknown_819C986:: @ 819C986 +SaffronCity_PokemonTrainerFanClub_Text_HmmAndYouAre:: @ 819C986 .string "Hmm…\n" .string "And you are?\p" .string "Were you hoping to sign up for\n" .string "a membership in our FAN CLUB?$" -gUnknown_819C9D5:: @ 819C9D5 +SaffronCity_PokemonTrainerFanClub_Text_YouveStillAWaysToGo:: @ 819C9D5 .string "Ah, so you are the much-\n" .string "talked-about {PLAYER}.\p" .string "You certainly do have the look of\n" @@ -128,7 +128,7 @@ gUnknown_819C9D5:: @ 819C9D5 .string "… …\p" .string "You've still a ways to go!$" -gUnknown_819CA7C:: @ 819CA7C +SaffronCity_PokemonTrainerFanClub_Text_YoullBeTalkedAboutIfYouKeepWinning:: @ 819CA7C .string "All of us gathered here are fans\n" .string "of POKéMON TRAINERS.\p" .string "The way they look in battle…\n" @@ -136,12 +136,12 @@ gUnknown_819CA7C:: @ 819CA7C .string "Perhaps you will be talked about\n" .string "here, too, if you keep winning.$" -gUnknown_819CB32:: @ 819CB32 +SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeYouOneDay:: @ 819CB32 .string "It's {PLAYER}!\n" .string "It's {PLAYER}!\p" .string "I want to be like {PLAYER} one day!$" -gUnknown_819CB62:: @ 819CB62 +SaffronCity_PokemonTrainerFanClub_Text_EveryoneButMeStoppedBeingYourFan:: @ 819CB62 .string "Everyone stopped being {PLAYER}'s\n" .string "fan…\p" .string "But that means I can have {PLAYER}\n" @@ -149,13 +149,13 @@ gUnknown_819CB62:: @ 819CB62 .string "Yay! Go for it!\n" .string "My one and only {PLAYER}!$" -gUnknown_819CBD3:: @ 819CBD3 +SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeSabrina:: @ 819CBD3 .string "Do you know what?\n" .string "I want to be like SABRINA!\p" .string "I want to be a psychic girl just\n" .string "like her!$" -gUnknown_819CC2B:: @ 819CC2B +SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingSabrinasFan:: @ 819CC2B .string "Even if I'm the only one, I won't\n" .string "stop being SABRINA's fan.\p" .string "My dream is to be like SABRINA,\n" @@ -163,11 +163,11 @@ gUnknown_819CC2B:: @ 819CC2B .string "I want to be a psychic girl just\n" .string "like her!$" -gUnknown_819CCC2:: @ 819CCC2 +SaffronCity_PokemonTrainerFanClub_Text_CanIBecomeCoolTrainerOneDay:: @ 819CCC2 .string "I wonder if I can become a cool\n" .string "TRAINER one day?$" -gUnknown_819CCF3:: @ 819CCF3 +SaffronCity_PokemonTrainerFanClub_Text_TheWayYouBattleIsCool:: @ 819CCF3 .string "Oh, man, oh, man!\n" .string "Cool! Too cool!\p" .string "…Huh?\n" @@ -175,7 +175,7 @@ gUnknown_819CCF3:: @ 819CCF3 .string "Just the way you battle.\n" .string "That's cool.$" -gUnknown_819CD4E:: @ 819CD4E +SaffronCity_PokemonTrainerFanClub_Text_ImOnlyOneLeftOfYourFans:: @ 819CD4E .string "Yo, {PLAYER}!\p" .string "Looks like I'm the only one left\n" .string "out of your fans.\p" @@ -183,13 +183,13 @@ gUnknown_819CD4E:: @ 819CD4E .string "fan… It's less stressful.\p" .string "Keep up and at it!$" -gUnknown_819CDDA:: @ 819CDDA +SaffronCity_PokemonTrainerFanClub_Text_LoveWayTrainerTalks:: @ 819CDDA .string "{STR_VAR_1}'s cool, huh?\n" .string "I love the way he talks.\p" .string "I'd really relish a chance to meet\n" .string "him in person once.$" -gUnknown_819CE3A:: @ 819CE3A +SaffronCity_PokemonTrainerFanClub_Text_ImLoneTrainerFan:: @ 819CE3A .string "Huh, can you believe it?\n" .string "Everyone turned into your fans.\p" .string "So after all we've been through,\n" @@ -197,7 +197,7 @@ gUnknown_819CE3A:: @ 819CE3A .string "Eh, being the one and only\n" .string "{STR_VAR_1} fan's my style, anyway.$" -gUnknown_819CEDF:: @ 819CEDF +SaffronCity_PokemonTrainerFanClub_Text_AdoreWayYouBattle:: @ 819CEDF .string "Oh, my goodness!\n" .string "Is it really you, {PLAYER}?\p" .string "I have to tell you, I adore the\n" @@ -205,7 +205,7 @@ gUnknown_819CEDF:: @ 819CEDF .string "I hope you'll keep at it.\n" .string "I'll be your number one fan!$" -gUnknown_819CF6D:: @ 819CF6D +SaffronCity_PokemonTrainerFanClub_Text_ImYourNumberOneFan:: @ 819CF6D .string "Oh, my goodness!\n" .string "If it isn't {PLAYER}!\p" .string "It's so disappointing… I realized\n" @@ -214,13 +214,13 @@ gUnknown_819CF6D:: @ 819CF6D .string "Let me cheer you on, at least!\p" .string "Hurray, hurray, {PLAYER}!$" -gUnknown_819D01F:: @ 819D01F +SaffronCity_PokemonTrainerFanClub_Text_TrainerHasBeenOnFire:: @ 819D01F .string "Recently, {STR_VAR_1} has been on\n" .string "fire.\p" .string "The way he battles… It's just \n" .string "the way that I like it!$" -gUnknown_819D075:: @ 819D075 +SaffronCity_PokemonTrainerFanClub_Text_EveryoneTalksAboutYou:: @ 819D075 .string "Oh, hello!\n" .string "If it isn't {PLAYER}!\p" .string "Lately, all everyone talks about\n" @@ -228,25 +228,25 @@ gUnknown_819D075:: @ 819D075 .string "I'm feeling lonesome because I\n" .string "prefer {STR_VAR_1}.$" -gUnknown_819D0E3:: @ 819D0E3 +SaffronCity_PokemonTrainerFanClub_Text_YouReallyAreAmazing:: @ 819D0E3 .string "Amazing!\n" .string "{PLAYER}, you really are amazing!\p" .string "Instead of just watching, maybe\n" .string "I should become a TRAINER, too.$" -gUnknown_819D148:: @ 819D148 +SaffronCity_PokemonTrainerFanClub_Text_ImYourOnlyFan:: @ 819D148 .string "I'm your only fan…\n" .string "Sigh… This is lonely…\p" .string "Can't you try harder and make the\n" .string "others take notice of you?$" -gUnknown_819D1AE:: @ 819D1AE +SaffronCity_PokemonTrainerFanClub_Text_WhyCantOthersSeeMastersDignity:: @ 819D1AE .string "Master {STR_VAR_1} is so dignified…\n" .string "He is so my type.\p" .string "Why can't the others see the\n" .string "dignity he simply oozes?$" -gUnknown_819D211:: @ 819D211 +SaffronCity_PokemonTrainerFanClub_Text_BelieveInMasterWithAllMyHeart:: @ 819D211 .string "I believe in Master {STR_VAR_1}\n" .string "with all my heart.\p" .string "Even if I am the only one to\n" @@ -255,14 +255,14 @@ gUnknown_819D211:: @ 819D211 .string "Not if I keep thinking about Master\n" .string "{STR_VAR_1}.$" -gUnknown_819D2B4:: @ 819D2B4 +SaffronCity_PokemonTrainerFanClub_Text_YourBattleStyleIsEducational:: @ 819D2B4 .string "Hiyah!\p" .string "Your battling style is most\n" .string "educational.\p" .string "I hope that you will keep plugging\n" .string "away at success, hiyah!$" -gUnknown_819D31F:: @ 819D31F +SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingYourFan:: @ 819D31F .string "Instead of just watching others\n" .string "battle, battle yourself!\p" .string "…My DOJO's MASTER chewed me out\n" @@ -271,7 +271,7 @@ gUnknown_819D31F:: @ 819D31F .string "being your fan!\p" .string "I can't stop being your fan!$" -gUnknown_819D3D2:: @ 819D3D2 +SaffronCity_PokemonTrainerFanClub_Text_OnlyMasterHasMyRespect:: @ 819D3D2 .string "Hiyah! There is but one TRAINER\n" .string "who has my respect.\p" .string "And that is none other than my\n" @@ -279,7 +279,7 @@ gUnknown_819D3D2:: @ 819D3D2 .string "You should become a fan of my\n" .string "MASTER like me! Hiyah!$" -gUnknown_819D477:: @ 819D477 +SaffronCity_PokemonTrainerFanClub_Text_NeverBeFanOfAnyoneButMaster:: @ 819D477 .string "Hiyah! I respect my MASTER at the\n" .string "FIGHTING DOJO.\p" .string "I will never become a fan of\n" diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index 47fb5fa98..31a250297 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -51,7 +51,7 @@ "x": 58, "y": 7, "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", + "dest_map": "MAP_TRAINER_TOWER_LOBBY", "dest_warp_id": 1 } ], diff --git a/data/maps/SevenIsland_TrainerTower_1F/scripts.inc b/data/maps/SevenIsland_TrainerTower_1F/scripts.inc deleted file mode 100644 index 4987c1142..000000000 --- a/data/maps/SevenIsland_TrainerTower_1F/scripts.inc +++ /dev/null @@ -1,60 +0,0 @@ -SevenIsland_TrainerTower_1F_MapScripts:: @ 81646B8 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_1F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_1F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_1F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_2F_EventScript_1646C8:: @ 81646C8 -SevenIsland_TrainerTower_4F_EventScript_1646C8:: @ 81646C8 -SevenIsland_TrainerTower_6F_EventScript_1646C8:: @ 81646C8 -SevenIsland_TrainerTower_8F_EventScript_1646C8:: @ 81646C8 -SevenIsland_TrainerTower_5F_EventScript_1646C8:: @ 81646C8 -SevenIsland_TrainerTower_7F_EventScript_1646C8:: @ 81646C8 -SevenIsland_TrainerTower_3F_EventScript_1646C8:: @ 81646C8 -SevenIsland_TrainerTower_1F_EventScript_1646C8:: @ 81646C8 - call EventScript_1C52F4 - end - -SevenIsland_TrainerTower_2F_EventScript_1646CE:: @ 81646CE -SevenIsland_TrainerTower_4F_EventScript_1646CE:: @ 81646CE -SevenIsland_TrainerTower_6F_EventScript_1646CE:: @ 81646CE -SevenIsland_TrainerTower_8F_EventScript_1646CE:: @ 81646CE -SevenIsland_TrainerTower_5F_EventScript_1646CE:: @ 81646CE -SevenIsland_TrainerTower_7F_EventScript_1646CE:: @ 81646CE -SevenIsland_TrainerTower_3F_EventScript_1646CE:: @ 81646CE -SevenIsland_TrainerTower_1F_EventScript_1646CE:: @ 81646CE - call EventScript_1C533B - end - -SevenIsland_TrainerTower_2F_EventScript_1646D4:: @ 81646D4 -SevenIsland_TrainerTower_4F_EventScript_1646D4:: @ 81646D4 -SevenIsland_TrainerTower_6F_EventScript_1646D4:: @ 81646D4 -SevenIsland_TrainerTower_8F_EventScript_1646D4:: @ 81646D4 -SevenIsland_TrainerTower_5F_EventScript_1646D4:: @ 81646D4 -SevenIsland_TrainerTower_7F_EventScript_1646D4:: @ 81646D4 -SevenIsland_TrainerTower_3F_EventScript_1646D4:: @ 81646D4 -SevenIsland_TrainerTower_1F_EventScript_1646D4:: @ 81646D4 - call EventScript_1C5382 - end - -SevenIsland_TrainerTower_2F_EventScript_1646DA:: @ 81646DA -SevenIsland_TrainerTower_4F_EventScript_1646DA:: @ 81646DA -SevenIsland_TrainerTower_6F_EventScript_1646DA:: @ 81646DA -SevenIsland_TrainerTower_8F_EventScript_1646DA:: @ 81646DA -SevenIsland_TrainerTower_5F_EventScript_1646DA:: @ 81646DA -SevenIsland_TrainerTower_7F_EventScript_1646DA:: @ 81646DA -SevenIsland_TrainerTower_3F_EventScript_1646DA:: @ 81646DA -SevenIsland_TrainerTower_1F_EventScript_1646DA:: @ 81646DA - call EventScript_1C538C - end - -SevenIsland_TrainerTower_2F_EventScript_1646E0:: @ 81646E0 -SevenIsland_TrainerTower_4F_EventScript_1646E0:: @ 81646E0 -SevenIsland_TrainerTower_6F_EventScript_1646E0:: @ 81646E0 -SevenIsland_TrainerTower_8F_EventScript_1646E0:: @ 81646E0 -SevenIsland_TrainerTower_7F_EventScript_1646E0:: @ 81646E0 -SevenIsland_TrainerTower_Roof_EventScript_1646E0:: @ 81646E0 -SevenIsland_TrainerTower_5F_EventScript_1646E0:: @ 81646E0 -SevenIsland_TrainerTower_3F_EventScript_1646E0:: @ 81646E0 - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_2F/scripts.inc b/data/maps/SevenIsland_TrainerTower_2F/scripts.inc deleted file mode 100644 index 9e61d0dfd..000000000 --- a/data/maps/SevenIsland_TrainerTower_2F/scripts.inc +++ /dev/null @@ -1,25 +0,0 @@ -SevenIsland_TrainerTower_2F_MapScripts:: @ 81646E6 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_2F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_2F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_2F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_2F_EventScript_1646F6:: @ 81646F6 - call EventScript_1C52F4 - end - -EventScript_1646FC:: @ 81646FC - call EventScript_1C533B - end - -EventScript_164702:: @ 8164702 - call EventScript_1C5382 - end - -EventScript_164708:: @ 8164708 - call EventScript_1C538C - end - -EventScript_16470E:: @ 816470E - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_3F/scripts.inc b/data/maps/SevenIsland_TrainerTower_3F/scripts.inc deleted file mode 100644 index e9afcff6c..000000000 --- a/data/maps/SevenIsland_TrainerTower_3F/scripts.inc +++ /dev/null @@ -1,25 +0,0 @@ -SevenIsland_TrainerTower_3F_MapScripts:: @ 8164714 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_3F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_3F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_3F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_3F_EventScript_164724:: @ 8164724 - call EventScript_1C52F4 - end - -EventScript_16472A:: @ 816472A - call EventScript_1C533B - end - -EventScript_164730:: @ 8164730 - call EventScript_1C5382 - end - -EventScript_164736:: @ 8164736 - call EventScript_1C538C - end - -EventScript_16473C:: @ 816473C - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_4F/scripts.inc b/data/maps/SevenIsland_TrainerTower_4F/scripts.inc deleted file mode 100644 index cfa0be11b..000000000 --- a/data/maps/SevenIsland_TrainerTower_4F/scripts.inc +++ /dev/null @@ -1,25 +0,0 @@ -SevenIsland_TrainerTower_4F_MapScripts:: @ 8164742 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_4F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_4F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_4F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_4F_EventScript_164752:: @ 8164752 - call EventScript_1C52F4 - end - -EventScript_164758:: @ 8164758 - call EventScript_1C533B - end - -EventScript_16475E:: @ 816475E - call EventScript_1C5382 - end - -EventScript_164764:: @ 8164764 - call EventScript_1C538C - end - -EventScript_16476A:: @ 816476A - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_5F/scripts.inc b/data/maps/SevenIsland_TrainerTower_5F/scripts.inc deleted file mode 100644 index 35ccdf129..000000000 --- a/data/maps/SevenIsland_TrainerTower_5F/scripts.inc +++ /dev/null @@ -1,25 +0,0 @@ -SevenIsland_TrainerTower_5F_MapScripts:: @ 8164770 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_5F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_5F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_5F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_5F_EventScript_164780:: @ 8164780 - call EventScript_1C52F4 - end - -EventScript_164786:: @ 8164786 - call EventScript_1C533B - end - -EventScript_16478C:: @ 816478C - call EventScript_1C5382 - end - -EventScript_164792:: @ 8164792 - call EventScript_1C538C - end - -EventScript_164798:: @ 8164798 - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json deleted file mode 100644 index abaab80d6..000000000 --- a/data/maps/SevenIsland_TrainerTower_6F/map.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F", - "name": "SevenIsland_TrainerTower_6F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", - "x": 9, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1646E0", - "flag": "FLAG_TEMP_6" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", - "x": 10, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1646C8", - "flag": "FLAG_TEMP_2" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", - "x": 15, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1646CE", - "flag": "FLAG_TEMP_3" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", - "x": 10, - "y": 16, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1646D4", - "flag": "FLAG_TEMP_4" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", - "x": 11, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1646DA", - "flag": "FLAG_TEMP_5" - } - ], - "warp_events": [ - { - "x": 15, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F", - "dest_warp_id": 1 - }, - { - "x": 4, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F", - "dest_warp_id": 0 - }, - { - "x": 13, - "y": 5, - "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 10, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_E", - "var_value": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1C54AF" - }, - { - "type": "trigger", - "x": 9, - "y": 12, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1C54B4" - }, - { - "type": "trigger", - "x": 9, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_6F_EventScript_1C54EA" - } - ], - "bg_events": [] -} diff --git a/data/maps/SevenIsland_TrainerTower_6F/scripts.inc b/data/maps/SevenIsland_TrainerTower_6F/scripts.inc deleted file mode 100644 index 361c92749..000000000 --- a/data/maps/SevenIsland_TrainerTower_6F/scripts.inc +++ /dev/null @@ -1,25 +0,0 @@ -SevenIsland_TrainerTower_6F_MapScripts:: @ 816479E - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_6F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_6F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_6F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_6F_EventScript_1647AE:: @ 81647AE - call EventScript_1C52F4 - end - -EventScript_1647B4:: @ 81647B4 - call EventScript_1C533B - end - -EventScript_1647BA:: @ 81647BA - call EventScript_1C5382 - end - -EventScript_1647C0:: @ 81647C0 - call EventScript_1C538C - end - -EventScript_1647C6:: @ 81647C6 - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json deleted file mode 100644 index 827c6c9ca..000000000 --- a/data/maps/SevenIsland_TrainerTower_7F/map.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F", - "name": "SevenIsland_TrainerTower_7F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", - "x": 9, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1646E0", - "flag": "FLAG_TEMP_6" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", - "x": 10, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1646C8", - "flag": "FLAG_TEMP_2" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", - "x": 15, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1646CE", - "flag": "FLAG_TEMP_3" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", - "x": 10, - "y": 16, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1646D4", - "flag": "FLAG_TEMP_4" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", - "x": 11, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1646DA", - "flag": "FLAG_TEMP_5" - } - ], - "warp_events": [ - { - "x": 15, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F", - "dest_warp_id": 1 - }, - { - "x": 4, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F", - "dest_warp_id": 0 - }, - { - "x": 13, - "y": 5, - "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 10, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_E", - "var_value": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1C54AF" - }, - { - "type": "trigger", - "x": 9, - "y": 12, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1C54B4" - }, - { - "type": "trigger", - "x": 9, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_7F_EventScript_1C54EA" - } - ], - "bg_events": [] -} diff --git a/data/maps/SevenIsland_TrainerTower_7F/scripts.inc b/data/maps/SevenIsland_TrainerTower_7F/scripts.inc deleted file mode 100644 index be0036605..000000000 --- a/data/maps/SevenIsland_TrainerTower_7F/scripts.inc +++ /dev/null @@ -1,25 +0,0 @@ -SevenIsland_TrainerTower_7F_MapScripts:: @ 81647CC - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_7F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_7F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_7F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_7F_EventScript_1647DC:: @ 81647DC - call EventScript_1C52F4 - end - -EventScript_1647E2:: @ 81647E2 - call EventScript_1C533B - end - -EventScript_1647E8:: @ 81647E8 - call EventScript_1C5382 - end - -EventScript_1647EE:: @ 81647EE - call EventScript_1C538C - end - -EventScript_1647F4:: @ 81647F4 - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json deleted file mode 100644 index ed9ba908f..000000000 --- a/data/maps/SevenIsland_TrainerTower_8F/map.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F", - "name": "SevenIsland_TrainerTower_8F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F", - "music": "MUS_T_TOWER", - "region_map_section": "MAPSEC_TRAINER_TOWER_2", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", - "x": 9, - "y": 7, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1646E0", - "flag": "FLAG_TEMP_6" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", - "x": 10, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1646C8", - "flag": "FLAG_TEMP_2" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", - "x": 15, - "y": 13, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1646CE", - "flag": "FLAG_TEMP_3" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", - "x": 10, - "y": 16, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_UP", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1646D4", - "flag": "FLAG_TEMP_4" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", - "x": 11, - "y": 10, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1646DA", - "flag": "FLAG_TEMP_5" - } - ], - "warp_events": [ - { - "x": 15, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF", - "dest_warp_id": 1 - }, - { - "x": 4, - "y": 6, - "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F", - "dest_warp_id": 0 - }, - { - "x": 13, - "y": 5, - "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "dest_warp_id": 0 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 10, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_E", - "var_value": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1C54AF" - }, - { - "type": "trigger", - "x": 9, - "y": 12, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1C54B4" - }, - { - "type": "trigger", - "x": 9, - "y": 13, - "elevation": 3, - "var": "VAR_TEMP_F", - "var_value": 0, - "script": "SevenIsland_TrainerTower_8F_EventScript_1C54EA" - } - ], - "bg_events": [] -} diff --git a/data/maps/SevenIsland_TrainerTower_8F/scripts.inc b/data/maps/SevenIsland_TrainerTower_8F/scripts.inc deleted file mode 100644 index b51982f48..000000000 --- a/data/maps/SevenIsland_TrainerTower_8F/scripts.inc +++ /dev/null @@ -1,25 +0,0 @@ -SevenIsland_TrainerTower_8F_MapScripts:: @ 81647FA - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_8F_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_8F_MapScript2_1C4F62 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_8F_MapScript3_1C5046 - .byte 0 - -SevenIsland_TrainerTower_8F_EventScript_16480A:: @ 816480A - call EventScript_1C52F4 - end - -EventScript_164810:: @ 8164810 - call EventScript_1C533B - end - -EventScript_164816:: @ 8164816 - call EventScript_1C5382 - end - -EventScript_16481C:: @ 816481C - call EventScript_1C538C - end - -EventScript_164822:: @ 8164822 - call EventScript_1C53AA - end diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc deleted file mode 100644 index f84c67295..000000000 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ /dev/null @@ -1,80 +0,0 @@ -SevenIsland_TrainerTower_Elevator_MapScripts:: @ 8164AF8 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Elevator_MapScript2_1C5046 - .byte 0 - -SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03 - lockall - setvar VAR_0x8004, 6 - call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 - copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR - special Special_DrawElevatorCurrentFloorWindow - message Text_WantWhichFloor - waitmessage - setvar VAR_0x8004, 6 - specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos - switch VAR_RESULT - case 0, EventScript_164B46 - case 1, EventScript_164B52 - end - -EventScript_164B46:: @ 8164B46 - multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 0, FALSE - goto EventScript_164B5E - end - -EventScript_164B52:: @ 8164B52 - multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 1, FALSE - goto EventScript_164B5E - end - -EventScript_164B5E:: @ 8164B5E - switch VAR_RESULT - case 0, EventScript_164BCD - case 1, EventScript_164B90 - case 2, EventScript_164BD3 - case 127, EventScript_164BD3 - end - -EventScript_164B90:: @ 8164B90 - setvar VAR_0x8006, 3 - setdynamicwarp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 - compare VAR_ELEVATOR_FLOOR, 3 - goto_if_eq EventScript_164BD3 - call EventScript_164BD8 - setvar VAR_ELEVATOR_FLOOR, 3 - special Special_CloseElevatorCurrentFloorWindow - delay 25 - applymovement OBJ_EVENT_ID_PLAYER, Movement_164BE5 - waitmovement 0 - warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 - waitstate - releaseall - end - -EventScript_164BCD:: @ 8164BCD - goto EventScript_164BD3 - end - -EventScript_164BD3:: @ 8164BD3 - special Special_CloseElevatorCurrentFloorWindow - releaseall - end - -EventScript_164BD8:: @ 8164BD8 - special Special_CloseElevatorCurrentFloorWindow - closemessage - waitse - special Special_AnimateElevator - waitstate - setflag FLAG_TEMP_2 - return - -Movement_164BE5:: @ 8164BE5 - walk_in_place_fastest_down - delay_16 - walk_down - walk_right - walk_right - walk_down - step_end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc deleted file mode 100644 index 0558b5a8b..000000000 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ /dev/null @@ -1,235 +0,0 @@ -SevenIsland_TrainerTower_Lobby_MapScripts:: @ 8164839 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Lobby_OnResume - map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, SevenIsland_TrainerTower_Lobby_OnReturnToField - map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_Lobby_OnTransition - map_script MAP_SCRIPT_ON_LOAD, SevenIsland_TrainerTower_Lobby_OnLoad - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Lobby_OnFrame - .byte 0 - -SevenIsland_TrainerTower_Lobby_OnResume:: @ 8164853 - setvar VAR_TEMP_2, 0 - setvar VAR_0x8004, 10 - special sub_815D9E8 - setvar VAR_0x8004, 18 - special sub_815D9E8 - compare VAR_RESULT, 0 - goto_if_eq EventScript_164886 - setvar VAR_TEMP_0, 0 - setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7 - applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 - -EventScript_164886:: @ 8164886 - end - -SevenIsland_TrainerTower_Lobby_OnReturnToField:: @ 8164887 - addobject 1 - addobject 2 - addobject 3 - addobject 4 - addobject 5 - end - -SevenIsland_TrainerTower_Lobby_OnLoad:: @ 8164897 - compare VAR_TEMP_D, 17 - call_if_eq EventScript_1648A3 - end - -EventScript_1648A3:: @ 81648A3 - setmetatile 17, 10, 647, 0 - return - -SevenIsland_TrainerTower_Lobby_OnTransition:: @ 81648AD - setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY - getplayerxy VAR_TEMP_D, VAR_RESULT - end - -SevenIsland_TrainerTower_Lobby_OnFrame:: @ 81648B6 - map_script_2 VAR_TEMP_0, 0, EventScript_1648ED - map_script_2 VAR_TEMP_D, 0x11, EventScript_1648C8 - .2byte 0 - -EventScript_1648C8:: @ 81648C8 - lockall - applymovement OBJ_EVENT_ID_PLAYER, Movement_1648EA - waitmovement 0 - setmetatile 17, 10, 692, 1 - special DrawWholeMapView - playse SE_TK_KASYA - waitse - setvar VAR_TEMP_D, 0 - releaseall - end - -Movement_1648EA:: @ 81648EA - walk_down - walk_down - step_end - -EventScript_1648ED:: @ 81648ED - setvar VAR_TEMP_0, 1 - setvar VAR_0x8004, 12 - special sub_815D9E8 - switch VAR_RESULT - case 0, EventScript_164920 - case 1, EventScript_164938 - case 2, EventScript_16495C - -EventScript_164920:: @ 8164920 - lock - faceplayer - applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 - textcolor 1 - msgbox gUnknown_817C937 - goto EventScript_16494B - -EventScript_164938:: @ 8164938 - lock - faceplayer - applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 - textcolor 1 - msgbox gUnknown_817C9C0 - -EventScript_16494B:: @ 816494B - closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD6 - waitmovement 0 - setvar VAR_MAP_SCENE_TRAINER_TOWER, 0 - release - -EventScript_16495C:: @ 816495C - end - -SevenIsland_TrainerTower_Lobby_EventScript_16495D:: @ 816495D - lock - faceplayer - call EventScript_PkmnCenterNurse - release - end - -SevenIsland_TrainerTower_Lobby_EventScript_164966:: @ 8164966 - lock - faceplayer - setvar VAR_0x8004, 20 - special sub_815D9E8 - compare VAR_RESULT, 1 - goto_if_eq EventScript_164988 - msgbox gUnknown_817C9A2 - goto EventScript_164990 - -EventScript_164988:: @ 8164988 - msgbox gUnknown_817CE1F - -EventScript_164990:: @ 8164990 - release - end - -SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992 - goto_if_questlog EventScript_ReleaseEnd - lock - faceplayer - message Text_MayIHelpYou - waitmessage - pokemart Items_1649B8 - msgbox Text_PleaseComeAgain - release - end - - .align 2 -Items_1649B8:: @ 81649B8 - .2byte ITEM_ULTRA_BALL - .2byte ITEM_GREAT_BALL - .2byte ITEM_FULL_RESTORE - .2byte ITEM_MAX_POTION - .2byte ITEM_HYPER_POTION - .2byte ITEM_REVIVE - .2byte ITEM_FULL_HEAL - .2byte ITEM_ESCAPE_ROPE - .2byte ITEM_MAX_REPEL - .2byte ITEM_NONE - release - end - -SevenIsland_TrainerTower_Lobby_EventScript_1649CE:: @ 81649CE - lockall - applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4 - textcolor 1 - msgbox gUnknown_817C794 - setvar VAR_0x8004, 17 - special sub_815D9E8 - compare VAR_RESULT, 0 - goto_if_eq EventScript_164A00 - msgbox gUnknown_817C7D9 - goto EventScript_164A08 - -EventScript_164A00:: @ 8164A00 - msgbox gUnknown_817C850 - -EventScript_164A08:: @ 8164A08 - message Text_17C88D - waitmessage - multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE - switch VAR_RESULT - case 0, EventScript_164A53 - case 1, EventScript_164ABF - case 2, EventScript_164A45 - case 127, EventScript_164ABF - end - -EventScript_164A45:: @ 8164A45 - msgbox gUnknown_817CCC9 - goto EventScript_164A08 - end - -EventScript_164A53:: @ 8164A53 - multichoice 13, 3, MULTICHOICE_TRAINER_TOWER_MODE, FALSE - switch VAR_RESULT - case 0, EventScript_164AA0 - case 1, EventScript_164AA0 - case 2, EventScript_164AA0 - case 3, EventScript_164AA0 - case 4, EventScript_164ABF - case 127, EventScript_164ABF - end - -EventScript_164AA0:: @ 8164AA0 - copyvar VAR_0x8005, VAR_RESULT - setvar VAR_MAP_SCENE_TRAINER_TOWER, 1 - special HealPlayerParty - msgbox gUnknown_817C8BF - setvar VAR_0x8004, 6 - special sub_815D9E8 - releaseall - end - -EventScript_164ABF:: @ 8164ABF - msgbox gUnknown_817C91D - closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD6 - waitmovement 0 - releaseall - end - -Movement_164AD4:: @ 8164AD4 - face_right - step_end - -Movement_164AD6:: @ 8164AD6 - walk_down - step_end - -SevenIsland_TrainerTower_Lobby_EventScript_164AD8:: @ 8164AD8 - lockall - fadescreen FADE_TO_BLACK - setvar VAR_0x8004, 1 - special Special_BattleRecords - waitstate - releaseall - end - -SevenIsland_TrainerTower_Lobby_EventScript_164AE6:: @ 8164AE6 - msgbox gUnknown_817CE38, MSGBOX_NPC - end - -SevenIsland_TrainerTower_Lobby_EventScript_164AEF:: @ 8164AEF - msgbox gUnknown_817CE9F, MSGBOX_NPC - end diff --git a/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc b/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc deleted file mode 100644 index 6ae4ed2be..000000000 --- a/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc +++ /dev/null @@ -1,8 +0,0 @@ -SevenIsland_TrainerTower_Roof_MapScripts:: @ 8164828 - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Roof_MapScript1_1C4F54 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Roof_MapScript2_1C5046 - .byte 0 - -SevenIsland_TrainerTower_Roof_EventScript_164833:: @ 8164833 - call EventScript_1C53AA - end diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index 7d71b3b26..bebe3f71e 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SilphCo_10F_EventScript_161DC0", + "script": "SilphCo_10F_EventScript_Travis", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_10F_EventScript_161D96", + "script": "SilphCo_10F_EventScript_WorkerF", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "SilphCo_10F_EventScript_161DD7", + "script": "SilphCo_10F_EventScript_Grunt", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -181,7 +181,7 @@ "x": 7, "y": 1, "elevation": 0, - "script": "SilphCo_10F_EventScript_161DB7" + "script": "SilphCo_10F_EventScript_FloorSign" } ] } diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index a0ab7219b..20d98d291 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -6,30 +6,30 @@ SilphCo_10F_OnLoad:: @ 8161D8C call_if_unset FLAG_SILPH_10F_DOOR, EventScript_Close10FDoor end -SilphCo_10F_EventScript_161D96:: @ 8161D96 +SilphCo_10F_EventScript_WorkerF:: @ 8161D96 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_161DAD - msgbox gUnknown_8176DBA + goto_if_ge SilphCo_10F_EventScript_WorkerFRocketsGone + msgbox SilphCo_10F_Text_WaaaImScared release end -EventScript_161DAD:: @ 8161DAD - msgbox gUnknown_8176DCE +SilphCo_10F_EventScript_WorkerFRocketsGone:: @ 8161DAD + msgbox SilphCo_10F_Text_KeepMeCryingASecret release end -SilphCo_10F_EventScript_161DB7:: @ 8161DB7 - msgbox gUnknown_8176DF8, MSGBOX_SIGN +SilphCo_10F_EventScript_FloorSign:: @ 8161DB7 + msgbox SilphCo_10F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_10F_EventScript_161DC0:: @ 8161DC0 - trainerbattle_single TRAINER_SCIENTIST_TRAVIS, Text_176D57, Text_176D73 - msgbox gUnknown_8176D86, MSGBOX_AUTOCLOSE +SilphCo_10F_EventScript_Travis:: @ 8161DC0 + trainerbattle_single TRAINER_SCIENTIST_TRAVIS, SilphCo_10F_Text_TravisIntro, SilphCo_10F_Text_TravisDefeat + msgbox SilphCo_10F_Text_TravisPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_10F_EventScript_161DD7:: @ 8161DD7 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_39, Text_176CED, Text_176D18 - msgbox gUnknown_8176D25, MSGBOX_AUTOCLOSE +SilphCo_10F_EventScript_Grunt:: @ 8161DD7 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_39, SilphCo_10F_Text_GruntIntro, SilphCo_10F_Text_GruntDefeat + msgbox SilphCo_10F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_10F/text.inc b/data/maps/SilphCo_10F/text.inc index a910cd435..ac8483558 100644 --- a/data/maps/SilphCo_10F/text.inc +++ b/data/maps/SilphCo_10F/text.inc @@ -1,33 +1,33 @@ -Text_176CED:: @ 8176CED +SilphCo_10F_Text_GruntIntro:: @ 8176CED .string "Welcome to 10F!\n" .string "So good of you to join me!$" -Text_176D18:: @ 8176D18 +SilphCo_10F_Text_GruntDefeat:: @ 8176D18 .string "I'm stunned!$" -gUnknown_8176D25:: @ 8176D25 +SilphCo_10F_Text_GruntPostBattle:: @ 8176D25 .string "Nice try, but the boardroom is up\n" .string "one more floor.$" -Text_176D57:: @ 8176D57 +SilphCo_10F_Text_TravisIntro:: @ 8176D57 .string "Enough of your silly games!$" -Text_176D73:: @ 8176D73 +SilphCo_10F_Text_TravisDefeat:: @ 8176D73 .string "No continues left!$" -gUnknown_8176D86:: @ 8176D86 +SilphCo_10F_Text_TravisPostBattle:: @ 8176D86 .string "Are you satisfied with beating me?\n" .string "Then go on home!$" -gUnknown_8176DBA:: @ 8176DBA +SilphCo_10F_Text_WaaaImScared:: @ 8176DBA .string "Waaaaa!\n" .string "I'm scared!$" -gUnknown_8176DCE:: @ 8176DCE +SilphCo_10F_Text_KeepMeCryingASecret:: @ 8176DCE .string "About me crying…\n" .string "Please keep it a secret.$" -gUnknown_8176DF8:: @ 8176DF8 +SilphCo_10F_Text_FloorSign:: @ 8176DF8 .string "SILPH CO. HEAD OFFICE\n" .string "10F$" diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 89a1a8bf3..19b187c08 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_11F_EventScript_161DFE", + "script": "SilphCo_11F_EventScript_President", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_11F_EventScript_161E7F", + "script": "SilphCo_11F_EventScript_Secretary", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "SilphCo_11F_EventScript_161F40", + "script": "SilphCo_11F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "SilphCo_11F_EventScript_161F57", + "script": "SilphCo_11F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" } ], @@ -123,7 +123,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_SILPH_CO_11F", "var_value": 0, - "script": "SilphCo_11F_EventScript_161E88" + "script": "SilphCo_11F_EventScript_GiovanniTriggerLeft" }, { "type": "trigger", @@ -132,7 +132,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_SILPH_CO_11F", "var_value": 0, - "script": "SilphCo_11F_EventScript_161E94" + "script": "SilphCo_11F_EventScript_GiovanniTriggerRight" } ], "bg_events": [ @@ -179,7 +179,7 @@ "x": 8, "y": 1, "elevation": 0, - "script": "SilphCo_11F_EventScript_161F37" + "script": "SilphCo_11F_EventScript_FloorSign" } ] } diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 05f52646e..38de05842 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -6,76 +6,72 @@ SilphCo_11F_OnLoad:: @ 8161DF4 call_if_unset FLAG_SILPH_11F_DOOR, EventScript_Close11FDoor end -SilphCo_11F_EventScript_161DFE:: @ 8161DFE +SilphCo_11F_EventScript_President:: @ 8161DFE lock faceplayer - goto_if_set FLAG_GOT_MASTER_BALL_FROM_SILPH, EventScript_161E75 + goto_if_set FLAG_GOT_MASTER_BALL_FROM_SILPH, SilphCo_11F_EventScript_AlreadyGotMasterBall checkplayergender compare VAR_RESULT, MALE - call_if_eq EventScript_161E59 + call_if_eq SilphCo_11F_EventScript_PresidentThanksMale compare VAR_RESULT, FEMALE - call_if_eq EventScript_161E62 + call_if_eq SilphCo_11F_EventScript_PresidentThanksFemale checkitemspace ITEM_MASTER_BALL, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_161E6B - giveitem_msg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, MUS_FAN5 - msgbox gUnknown_8176FEB + goto_if_eq SilphCo_11F_EventScript_NoRoomForMasterBall + giveitem_msg SilphCo_11F_Text_ObtainedMasterBallFromPresident, ITEM_MASTER_BALL, 1, MUS_FAN5 + msgbox SilphCo_11F_Text_ThatsOurSecretPrototype setflag FLAG_GOT_MASTER_BALL_FROM_SILPH release end -EventScript_161E59:: @ 8161E59 - msgbox gUnknown_8176E12 +SilphCo_11F_EventScript_PresidentThanksMale:: @ 8161E59 + msgbox SilphCo_11F_Text_ThanksForSavingMeDearBoy return -EventScript_161E62:: @ 8161E62 - msgbox gUnknown_8176EE7 +SilphCo_11F_EventScript_PresidentThanksFemale:: @ 8161E62 + msgbox SilphCo_11F_Text_ThanksForSavingMeDearGirl return -EventScript_161E6B:: @ 8161E6B - msgbox gUnknown_817708E +SilphCo_11F_EventScript_NoRoomForMasterBall:: @ 8161E6B + msgbox SilphCo_11F_Text_YouHaveNoRoomForThis release end -EventScript_161E75:: @ 8161E75 - msgbox gUnknown_8176FEB +SilphCo_11F_EventScript_AlreadyGotMasterBall:: @ 8161E75 + msgbox SilphCo_11F_Text_ThatsOurSecretPrototype release end -SilphCo_11F_EventScript_161E7F:: @ 8161E7F - msgbox gUnknown_81770A9, MSGBOX_NPC +SilphCo_11F_EventScript_Secretary:: @ 8161E7F + msgbox SilphCo_11F_Text_ThanksForRescuingUs, MSGBOX_NPC end -SilphCo_11F_EventScript_161E88:: @ 8161E88 +SilphCo_11F_EventScript_GiovanniTriggerLeft:: @ 8161E88 lockall setvar VAR_TEMP_1, 0 - goto EventScript_161EA0 - -EventScript_161E93:: @ 8161E93 + goto SilphCo_11F_EventScript_BattleGiovanni end -SilphCo_11F_EventScript_161E94:: @ 8161E94 +SilphCo_11F_EventScript_GiovanniTriggerRight:: @ 8161E94 lockall setvar VAR_TEMP_1, 1 - goto EventScript_161EA0 - -EventScript_161E9F:: @ 8161E9F + goto SilphCo_11F_EventScript_BattleGiovanni end -EventScript_161EA0:: @ 8161EA0 +SilphCo_11F_EventScript_BattleGiovanni:: @ 8161EA0 textcolor 0 applymovement 3, Movement_WalkInPlaceFastestDown waitmovement 0 delay 25 - msgbox gUnknown_8177108 + msgbox SilphCo_11F_Text_GiovanniIntro closemessage compare VAR_TEMP_1, 0 - call_if_eq EventScript_161F00 + call_if_eq SilphCo_11F_EventScript_GiovanniApproachLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_161F12 + call_if_eq SilphCo_11F_EventScript_GiovanniApproachRight setvar VAR_LAST_TALKED, 3 - trainerbattle_no_intro TRAINER_BOSS_GIOVANNI_2, Text_1771AB - msgbox gUnknown_81771C2 + trainerbattle_no_intro TRAINER_BOSS_GIOVANNI_2, SilphCo_11F_Text_GiovanniDefeat + msgbox SilphCo_11F_Text_GiovanniPostBattle closemessage fadescreen FADE_TO_BLACK removeobject 3 @@ -88,18 +84,18 @@ EventScript_161EA0:: @ 8161EA0 releaseall end -EventScript_161F00:: @ 8161F00 - applymovement 3, Movement_161F1D - applymovement OBJ_EVENT_ID_PLAYER, Movement_161F27 +SilphCo_11F_EventScript_GiovanniApproachLeft:: @ 8161F00 + applymovement 3, SilphCo_11F_Movement_GiovanniApproachLeft + applymovement OBJ_EVENT_ID_PLAYER, SilphCo_11F_Movement_PlayerFaceGiovanni waitmovement 0 return -EventScript_161F12:: @ 8161F12 - applymovement 3, Movement_161F23 +SilphCo_11F_EventScript_GiovanniApproachRight:: @ 8161F12 + applymovement 3, SilphCo_11F_Movement_GiovanniApproachRight waitmovement 0 return -Movement_161F1D:: @ 8161F1D +SilphCo_11F_Movement_GiovanniApproachLeft:: @ 8161F1D walk_down walk_down walk_down @@ -107,13 +103,13 @@ Movement_161F1D:: @ 8161F1D walk_in_place_fastest_left step_end -Movement_161F23:: @ 8161F23 +SilphCo_11F_Movement_GiovanniApproachRight:: @ 8161F23 walk_down walk_down walk_down step_end -Movement_161F27:: @ 8161F27 +SilphCo_11F_Movement_PlayerFaceGiovanni:: @ 8161F27 delay_16 delay_16 delay_16 @@ -122,20 +118,21 @@ Movement_161F27:: @ 8161F27 walk_in_place_fastest_right step_end -EventScript_161F2E:: @ 8161F2E - msgbox gUnknown_817732B, MSGBOX_SIGN +@ Unused +SilphCo_11F_EventScript_Monitor:: @ 8161F2E + msgbox SilphCo_11F_Text_MonitorHasMonsOnIt, MSGBOX_SIGN end -SilphCo_11F_EventScript_161F37:: @ 8161F37 - msgbox gUnknown_817734A, MSGBOX_SIGN +SilphCo_11F_EventScript_FloorSign:: @ 8161F37 + msgbox SilphCo_11F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_11F_EventScript_161F40:: @ 8161F40 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_40, Text_1772B8, Text_1772E7 - msgbox gUnknown_81772F9, MSGBOX_AUTOCLOSE +SilphCo_11F_EventScript_Grunt1:: @ 8161F40 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_40, SilphCo_11F_Text_Grunt1Intro, SilphCo_11F_Text_Grunt1Defeat + msgbox SilphCo_11F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_11F_EventScript_161F57:: @ 8161F57 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_41, Text_17726A, Text_17728C - msgbox gUnknown_817729B, MSGBOX_AUTOCLOSE +SilphCo_11F_EventScript_Grunt2:: @ 8161F57 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_41, SilphCo_11F_Text_Grunt2Intro, SilphCo_11F_Text_Grunt2Defeat + msgbox SilphCo_11F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_11F/text.inc b/data/maps/SilphCo_11F/text.inc index dcb60219a..83b004f4a 100644 --- a/data/maps/SilphCo_11F/text.inc +++ b/data/maps/SilphCo_11F/text.inc @@ -1,4 +1,4 @@ -gUnknown_8176E12:: @ 8176E12 +SilphCo_11F_Text_ThanksForSavingMeDearBoy:: @ 8176E12 .string "PRESIDENT: Oh, dear boy!\n" .string "Thank you for saving SILPH.\p" .string "I will never forget you saved us in\n" @@ -8,7 +8,7 @@ gUnknown_8176E12:: @ 8176E12 .string "anything.\p" .string "Here, maybe this will do.$" -gUnknown_8176EE7:: @ 8176EE7 +SilphCo_11F_Text_ThanksForSavingMeDearGirl:: @ 8176EE7 .string "PRESIDENT: Oh, dear girl!\n" .string "Thank you for saving SILPH.\p" .string "I will never forget you saved us in\n" @@ -18,11 +18,11 @@ gUnknown_8176EE7:: @ 8176EE7 .string "anything.\p" .string "Here, maybe this will do.$" -gUnknown_8176FBD:: @ 8176FBD +SilphCo_11F_Text_ObtainedMasterBallFromPresident:: @ 8176FBD .string "{PLAYER} obtained a MASTER BALL\n" .string "from the PRESIDENT!$" -gUnknown_8176FEB:: @ 8176FEB +SilphCo_11F_Text_ThatsOurSecretPrototype:: @ 8176FEB .string "PRESIDENT: You can't buy that\n" .string "anywhere.\p" .string "It's our secret prototype MASTER\n" @@ -32,16 +32,16 @@ gUnknown_8176FEB:: @ 8176FEB .string "You should be quiet about using it,\n" .string "though.$" -gUnknown_817708E:: @ 817708E +SilphCo_11F_Text_YouHaveNoRoomForThis:: @ 817708E .string "You have no room for this.$" -gUnknown_81770A9:: @ 81770A9 +SilphCo_11F_Text_ThanksForRescuingUs:: @ 81770A9 .string "SECRETARY: Thank you for rescuing\n" .string "all of us.\p" .string "We, from the PRESIDENT down,\n" .string "are indebted to you.$" -gUnknown_8177108:: @ 8177108 +SilphCo_11F_Text_GiovanniIntro:: @ 8177108 .string "Ah, {PLAYER}!\n" .string "So we meet again!\p" .string "The PRESIDENT and I are discussing\n" @@ -50,11 +50,11 @@ gUnknown_8177108:: @ 8177108 .string "matters…\p" .string "Or, experience a world of pain!$" -Text_1771AB:: @ 81771AB +SilphCo_11F_Text_GiovanniDefeat:: @ 81771AB .string "Arrgh!!\n" .string "I lost again!?$" -gUnknown_81771C2:: @ 81771C2 +SilphCo_11F_Text_GiovanniPostBattle:: @ 81771C2 .string "Blast it all!\n" .string "You ruined our plans for SILPH!\p" .string "But, TEAM ROCKET will never fall!\p" @@ -62,33 +62,33 @@ gUnknown_81771C2:: @ 81771C2 .string "POKéMON exist for TEAM ROCKET!\p" .string "I must go, but I shall return!$" -Text_17726A:: @ 817726A +SilphCo_11F_Text_Grunt2Intro:: @ 817726A .string "Stop right there!\n" .string "Don't you move!$" -Text_17728C:: @ 817728C +SilphCo_11F_Text_Grunt2Defeat:: @ 817728C .string "Don't…\n" .string "Please!$" -gUnknown_817729B:: @ 817729B +SilphCo_11F_Text_Grunt2PostBattle:: @ 817729B .string "So, you want to see my BOSS?$" -Text_1772B8:: @ 81772B8 +SilphCo_11F_Text_Grunt1Intro:: @ 81772B8 .string "Halt! Do you have an appointment\n" .string "with my BOSS?$" -Text_1772E7:: @ 81772E7 +SilphCo_11F_Text_Grunt1Defeat:: @ 81772E7 .string "Gaah!\n" .string "Demolished!$" -gUnknown_81772F9:: @ 81772F9 +SilphCo_11F_Text_Grunt1PostBattle:: @ 81772F9 .string "Watch your step…\n" .string "My BOSS likes his POKéMON tough!$" -gUnknown_817732B:: @ 817732B +SilphCo_11F_Text_MonitorHasMonsOnIt:: @ 817732B .string "The monitor has POKéMON on it!$" -gUnknown_817734A:: @ 817734A +SilphCo_11F_Text_FloorSign:: @ 817734A .string "SILPH CO. HEAD OFFICE\n" .string "11F$" diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index 277329dfc..b4e329490 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_1F_EventScript_16162F", + "script": "SilphCo_1F_EventScript_Receptionist", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" } ], @@ -71,7 +71,7 @@ "x": 30, "y": 1, "elevation": 0, - "script": "SilphCo_1F_EventScript_161638" + "script": "SilphCo_1F_EventScript_FloorSign" } ] } diff --git a/data/maps/SilphCo_1F/scripts.inc b/data/maps/SilphCo_1F/scripts.inc index f10c4d8b3..004d2de0c 100644 --- a/data/maps/SilphCo_1F/scripts.inc +++ b/data/maps/SilphCo_1F/scripts.inc @@ -6,10 +6,10 @@ SilphCo_1F_OnTransition:: @ 816162B setworldmapflag FLAG_WORLD_MAP_SILPH_CO_1F end -SilphCo_1F_EventScript_16162F:: @ 816162F - msgbox gUnknown_81754F7, MSGBOX_NPC +SilphCo_1F_EventScript_Receptionist:: @ 816162F + msgbox SilphCo_1F_Text_WelcomePresidentInBoardroom, MSGBOX_NPC end -SilphCo_1F_EventScript_161638:: @ 8161638 - msgbox gUnknown_8175549, MSGBOX_SIGN +SilphCo_1F_EventScript_FloorSign:: @ 8161638 + msgbox SilphCo_1F_Text_FloorSign, MSGBOX_SIGN end diff --git a/data/maps/SilphCo_1F/text.inc b/data/maps/SilphCo_1F/text.inc index 048102660..808aec46b 100644 --- a/data/maps/SilphCo_1F/text.inc +++ b/data/maps/SilphCo_1F/text.inc @@ -1,13 +1,13 @@ -gUnknown_81754F7:: @ 81754F7 +SilphCo_1F_Text_WelcomePresidentInBoardroom:: @ 81754F7 .string "Welcome.\p" .string "The PRESIDENT is in the boardroom\n" .string "on 11F.$" -Text_17552A:: @ 817552A +SilphCo_1F_Text_17552A:: @ 817552A .string "めちゃめちゃに こわされてる\n" .string "とうぶん なおりそうに ない‥$" -gUnknown_8175549:: @ 8175549 +SilphCo_1F_Text_FloorSign:: @ 8175549 .string "SILPH CO. HEAD OFFICE\n" .string "1F$" diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index fed3b8390..89439ba8a 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "SilphCo_2F_EventScript_1616AE", + "script": "SilphCo_2F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "SilphCo_2F_EventScript_161680", + "script": "SilphCo_2F_EventScript_Jerry", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SilphCo_2F_EventScript_161697", + "script": "SilphCo_2F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_2F_EventScript_161669", + "script": "SilphCo_2F_EventScript_Connor", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -203,7 +203,7 @@ "x": 29, "y": 1, "elevation": 0, - "script": "SilphCo_2F_EventScript_161660" + "script": "SilphCo_2F_EventScript_FloorSign" } ] } diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc index 6f800bbd0..161ddefe6 100644 --- a/data/maps/SilphCo_2F/scripts.inc +++ b/data/maps/SilphCo_2F/scripts.inc @@ -9,30 +9,28 @@ SilphCo_2F_OnLoad:: @ 8161647 SilphCo_2F_EventScript_ThunderWaveTutor:: @ 816165A goto EventScript_ThunderWaveTutor - -EventScript_16165F:: @ 816165F end -SilphCo_2F_EventScript_161660:: @ 8161660 - msgbox gUnknown_8175894, MSGBOX_SIGN +SilphCo_2F_EventScript_FloorSign:: @ 8161660 + msgbox SilphCo_2F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_2F_EventScript_161669:: @ 8161669 - trainerbattle_single TRAINER_SCIENTIST_CONNOR, Text_175562, Text_17557E - msgbox gUnknown_817559F, MSGBOX_AUTOCLOSE +SilphCo_2F_EventScript_Connor:: @ 8161669 + trainerbattle_single TRAINER_SCIENTIST_CONNOR, SilphCo_2F_Text_ConnorIntro, SilphCo_2F_Text_ConnorDefeat + msgbox SilphCo_2F_Text_ConnorPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_2F_EventScript_161680:: @ 8161680 - trainerbattle_single TRAINER_SCIENTIST_JERRY, Text_1755C6, Text_1755E5 - msgbox gUnknown_81755F2, MSGBOX_AUTOCLOSE +SilphCo_2F_EventScript_Jerry:: @ 8161680 + trainerbattle_single TRAINER_SCIENTIST_JERRY, SilphCo_2F_Text_JerryIntro, SilphCo_2F_Text_JerryDefeat + msgbox SilphCo_2F_Text_JerryPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_2F_EventScript_161697:: @ 8161697 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_23, Text_17562D, Text_17564A - msgbox gUnknown_8175651, MSGBOX_AUTOCLOSE +SilphCo_2F_EventScript_Grunt1:: @ 8161697 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_23, SilphCo_2F_Text_Grunt1Intro, SilphCo_2F_Text_Grunt1Defeat + msgbox SilphCo_2F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_2F_EventScript_1616AE:: @ 81616AE - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_24, Text_1756AD, Text_1756D8 - msgbox gUnknown_81756E2, MSGBOX_AUTOCLOSE +SilphCo_2F_EventScript_Grunt2:: @ 81616AE + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_24, SilphCo_2F_Text_Grunt2Intro, SilphCo_2F_Text_Grunt2Defeat + msgbox SilphCo_2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_2F/text.inc b/data/maps/SilphCo_2F/text.inc index 3dc65664d..82c7bac99 100644 --- a/data/maps/SilphCo_2F/text.inc +++ b/data/maps/SilphCo_2F/text.inc @@ -1,46 +1,46 @@ -Text_175562:: @ 8175562 +SilphCo_2F_Text_ConnorIntro:: @ 8175562 .string "Help!\n" .string "I'm a SILPH employee.$" -Text_17557E:: @ 817557E +SilphCo_2F_Text_ConnorDefeat:: @ 817557E .string "How did you know\n" .string "I was a ROCKET?$" -gUnknown_817559F:: @ 817559F +SilphCo_2F_Text_ConnorPostBattle:: @ 817559F .string "I work for both SILPH and TEAM\n" .string "ROCKET.$" -Text_1755C6:: @ 81755C6 +SilphCo_2F_Text_JerryIntro:: @ 81755C6 .string "It's off-limits here!\n" .string "Go home!$" -Text_1755E5:: @ 81755E5 +SilphCo_2F_Text_JerryDefeat:: @ 81755E5 .string "You're good.$" -gUnknown_81755F2:: @ 81755F2 +SilphCo_2F_Text_JerryPostBattle:: @ 81755F2 .string "Can you solve the maze in here?\n" .string "It's not easy, I tell you!$" -Text_17562D:: @ 817562D +SilphCo_2F_Text_Grunt1Intro:: @ 817562D .string "No kids are allowed in here!$" -Text_17564A:: @ 817564A +SilphCo_2F_Text_Grunt1Defeat:: @ 817564A .string "Tough!$" -gUnknown_8175651:: @ 8175651 +SilphCo_2F_Text_Grunt1PostBattle:: @ 8175651 .string "Diamond-shaped tiles are teleport\n" .string "blocks.\p" .string "They're transporters for this\n" .string "high-tech building.$" -Text_1756AD:: @ 81756AD +SilphCo_2F_Text_Grunt2Intro:: @ 81756AD .string "Hey, kid!\n" .string "What are you wandering here for?$" -Text_1756D8:: @ 81756D8 +SilphCo_2F_Text_Grunt2Defeat:: @ 81756D8 .string "I goofed!$" -gUnknown_81756E2:: @ 81756E2 +SilphCo_2F_Text_Grunt2PostBattle:: @ 81756E2 .string "SILPH CO. will be associated with\n" .string "TEAM ROCKET!$" @@ -68,7 +68,7 @@ Text_ThunderWaveTaught:: @ 81757EC .string "It's an ELECTRIC-type move, so it\n" .string "won't work on some POKéMON.$" -gUnknown_8175894:: @ 8175894 +SilphCo_2F_Text_FloorSign:: @ 8175894 .string "SILPH CO. HEAD OFFICE\n" .string "2F$" diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index 8a81b5118..42a1e6b72 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SilphCo_3F_EventScript_16171F", + "script": "SilphCo_3F_EventScript_Grunt", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_3F_EventScript_1616DE", + "script": "SilphCo_3F_EventScript_WorkerM", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_3F_EventScript_161708", + "script": "SilphCo_3F_EventScript_Jose", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -211,7 +211,7 @@ "x": 29, "y": 1, "elevation": 0, - "script": "SilphCo_3F_EventScript_1616FF" + "script": "SilphCo_3F_EventScript_FloorSign" } ] } diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc index a5e62b667..2fab54a56 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -7,30 +7,30 @@ SilphCo_3F_OnLoad:: @ 81616CB call_if_unset FLAG_SILPH_3F_DOOR_2, EventScript_Close3FDoor2 end -SilphCo_3F_EventScript_1616DE:: @ 81616DE +SilphCo_3F_EventScript_WorkerM:: @ 81616DE lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_1616F5 - msgbox gUnknown_81758AD + goto_if_ge SilphCo_3F_EventScript_WorkerMRocketsGone + msgbox SilphCo_3F_Text_WhatAmIToDo release end -EventScript_1616F5:: @ 81616F5 - msgbox gUnknown_81758D3 +SilphCo_3F_EventScript_WorkerMRocketsGone:: @ 81616F5 + msgbox SilphCo_3F_Text_YouAndYourMonsSavedUs release end -SilphCo_3F_EventScript_1616FF:: @ 81616FF - msgbox gUnknown_81759DC, MSGBOX_SIGN +SilphCo_3F_EventScript_FloorSign:: @ 81616FF + msgbox SilphCo_3F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_3F_EventScript_161708:: @ 8161708 - trainerbattle_single TRAINER_SCIENTIST_JOSE, Text_175948, Text_17597D - msgbox gUnknown_8175990, MSGBOX_AUTOCLOSE +SilphCo_3F_EventScript_Jose:: @ 8161708 + trainerbattle_single TRAINER_SCIENTIST_JOSE, SilphCo_3F_Text_JoseIntro, SilphCo_3F_Text_JoseDefeat + msgbox SilphCo_3F_Text_JosePostBattle, MSGBOX_AUTOCLOSE end -SilphCo_3F_EventScript_16171F:: @ 816171F - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_25, Text_1758F6, Text_175911 - msgbox gUnknown_817591C, MSGBOX_AUTOCLOSE +SilphCo_3F_EventScript_Grunt:: @ 816171F + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_25, SilphCo_3F_Text_GruntIntro, SilphCo_3F_Text_GruntDefeat + msgbox SilphCo_3F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_3F/text.inc b/data/maps/SilphCo_3F/text.inc index 6b8a8d4d1..128865c1b 100644 --- a/data/maps/SilphCo_3F/text.inc +++ b/data/maps/SilphCo_3F/text.inc @@ -1,34 +1,34 @@ -gUnknown_81758AD:: @ 81758AD +SilphCo_3F_Text_WhatAmIToDo:: @ 81758AD .string "I work for SILPH CO.\n" .string "What am I to do?$" -gUnknown_81758D3:: @ 81758D3 +SilphCo_3F_Text_YouAndYourMonsSavedUs:: @ 81758D3 .string "{PLAYER}!\n" .string "You and your POKéMON saved us!$" -Text_1758F6:: @ 81758F6 +SilphCo_3F_Text_GruntIntro:: @ 81758F6 .string "Quit messing with us, kid!$" -Text_175911:: @ 8175911 +SilphCo_3F_Text_GruntDefeat:: @ 8175911 .string "I give up!$" -gUnknown_817591C:: @ 817591C +SilphCo_3F_Text_GruntPostBattle:: @ 817591C .string "A hint? You can open doors with\n" .string "a CARD KEY!$" -Text_175948:: @ 8175948 +SilphCo_3F_Text_JoseIntro:: @ 8175948 .string "I support TEAM ROCKET more than\n" .string "I support SILPH CO.!$" -Text_17597D:: @ 817597D +SilphCo_3F_Text_JoseDefeat:: @ 817597D .string "You really got me!$" -gUnknown_8175990:: @ 8175990 +SilphCo_3F_Text_JosePostBattle:: @ 8175990 .string "Humph…\p" .string "TEAM ROCKET said that if I helped\n" .string "them, they'd let me study POKéMON.$" -gUnknown_81759DC:: @ 81759DC +SilphCo_3F_Text_FloorSign:: @ 81759DC .string "SILPH CO. HEAD OFFICE\n" .string "3F$" diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index fc37a6102..6473f3c5d 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SilphCo_4F_EventScript_1617A7", + "script": "SilphCo_4F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "SilphCo_4F_EventScript_161790", + "script": "SilphCo_4F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SilphCo_4F_EventScript_161779", + "script": "SilphCo_4F_EventScript_Rodney", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_4F_EventScript_16174F", + "script": "SilphCo_4F_EventScript_WorkerM", "flag": "0" }, { @@ -242,7 +242,7 @@ "x": 29, "y": 1, "elevation": 0, - "script": "SilphCo_4F_EventScript_161770" + "script": "SilphCo_4F_EventScript_FloorSign" } ] } diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index 406e394f1..bd20cb533 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -7,35 +7,35 @@ SilphCo_4F_OnLoad:: @ 816173C call_if_unset FLAG_SILPH_4F_DOOR_2, EventScript_Close4FDoor2 end -SilphCo_4F_EventScript_16174F:: @ 816174F +SilphCo_4F_EventScript_WorkerM:: @ 816174F lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_161766 - msgbox gUnknown_81759F5 + goto_if_ge SilphCo_4F_EventScript_WorkerMRocketsGone + msgbox SilphCo_4F_Text_CantYouSeeImHiding release end -EventScript_161766:: @ 8161766 - msgbox gUnknown_8175A15 +SilphCo_4F_EventScript_WorkerMRocketsGone:: @ 8161766 + msgbox SilphCo_4F_Text_TeamRocketIsGone release end -SilphCo_4F_EventScript_161770:: @ 8161770 - msgbox gUnknown_8175B57, MSGBOX_SIGN +SilphCo_4F_EventScript_FloorSign:: @ 8161770 + msgbox SilphCo_4F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_4F_EventScript_161779:: @ 8161779 - trainerbattle_single TRAINER_SCIENTIST_RODNEY, Text_175A90, Text_175AB0 - msgbox gUnknown_8175AC8, MSGBOX_AUTOCLOSE +SilphCo_4F_EventScript_Rodney:: @ 8161779 + trainerbattle_single TRAINER_SCIENTIST_RODNEY, SilphCo_4F_Text_RodneyIntro, SilphCo_4F_Text_RodneyDefeat + msgbox SilphCo_4F_Text_RodneyPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_4F_EventScript_161790:: @ 8161790 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_26, Text_175A2F, Text_175A5B - msgbox gUnknown_8175A62, MSGBOX_AUTOCLOSE +SilphCo_4F_EventScript_Grunt1:: @ 8161790 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_26, SilphCo_4F_Text_Grunt1Intro, SilphCo_4F_Text_Grunt1Defeat + msgbox SilphCo_4F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_4F_EventScript_1617A7:: @ 81617A7 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_27, Text_175B19, Text_175B2B - msgbox gUnknown_8175B38, MSGBOX_AUTOCLOSE +SilphCo_4F_EventScript_Grunt2:: @ 81617A7 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_27, SilphCo_4F_Text_Grunt2Intro, SilphCo_4F_Text_Grunt2Defeat + msgbox SilphCo_4F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_4F/text.inc b/data/maps/SilphCo_4F/text.inc index d8741f9a3..dd1ed2d20 100644 --- a/data/maps/SilphCo_4F/text.inc +++ b/data/maps/SilphCo_4F/text.inc @@ -1,45 +1,45 @@ -gUnknown_81759F5:: @ 81759F5 +SilphCo_4F_Text_CantYouSeeImHiding:: @ 81759F5 .string "Sssh!\n" .string "Can't you see I'm hiding?$" -gUnknown_8175A15:: @ 8175A15 +SilphCo_4F_Text_TeamRocketIsGone:: @ 8175A15 .string "Huh?\n" .string "TEAM ROCKET is gone?$" -Text_175A2F:: @ 8175A2F +SilphCo_4F_Text_Grunt1Intro:: @ 8175A2F .string "TEAM ROCKET has taken control\n" .string "of SILPH CO.!$" -Text_175A5B:: @ 8175A5B +SilphCo_4F_Text_Grunt1Defeat:: @ 8175A5B .string "Arrgh!$" -gUnknown_8175A62:: @ 8175A62 +SilphCo_4F_Text_Grunt1PostBattle:: @ 8175A62 .string "Fwahahaha!\n" .string "My BOSS has been after this place!$" -Text_175A90:: @ 8175A90 +SilphCo_4F_Text_RodneyIntro:: @ 8175A90 .string "My POKéMON is my loyal servant.$" -Text_175AB0:: @ 8175AB0 +SilphCo_4F_Text_RodneyDefeat:: @ 8175AB0 .string "Darn!\n" .string "You weak POKéMON!$" -gUnknown_8175AC8:: @ 8175AC8 +SilphCo_4F_Text_RodneyPostBattle:: @ 8175AC8 .string "The doors are electronically\n" .string "locked.\p" .string "It takes a CARD KEY to open the\n" .string "doors here.$" -Text_175B19:: @ 8175B19 +SilphCo_4F_Text_Grunt2Intro:: @ 8175B19 .string "Intruder spotted!$" -Text_175B2B:: @ 8175B2B +SilphCo_4F_Text_Grunt2Defeat:: @ 8175B2B .string "Who are you?$" -gUnknown_8175B38:: @ 8175B38 +SilphCo_4F_Text_Grunt2PostBattle:: @ 8175B38 .string "I better tell the BOSS on 11F!$" -gUnknown_8175B57:: @ 8175B57 +SilphCo_4F_Text_FloorSign:: @ 8175B57 .string "SILPH CO. HEAD OFFICE\n" .string "4F$" diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index 9bc1989ff..834d3c9eb 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SilphCo_5F_EventScript_161853", + "script": "SilphCo_5F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "SilphCo_5F_EventScript_16186A", + "script": "SilphCo_5F_EventScript_Dalton", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_5F_EventScript_1617E0", + "script": "SilphCo_5F_EventScript_WorkerM", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SilphCo_5F_EventScript_161825", + "script": "SilphCo_5F_EventScript_Beau", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SilphCo_5F_EventScript_16183C", + "script": "SilphCo_5F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_5F_EventScript_1AD0D4", + "script": "SilphCo_5F_EventScript_Scientist", "flag": "0" } ], @@ -283,21 +283,21 @@ "x": 28, "y": 11, "elevation": 0, - "script": "SilphCo_5F_EventScript_161813" + "script": "SilphCo_5F_EventScript_PokemonReport3" }, { "type": "bg_event_type_0", "x": 30, "y": 13, "elevation": 0, - "script": "SilphCo_5F_EventScript_16180A" + "script": "SilphCo_5F_EventScript_PokemonReport2" }, { "type": "bg_event_type_0", "x": 25, "y": 15, "elevation": 0, - "script": "SilphCo_5F_EventScript_161801" + "script": "SilphCo_5F_EventScript_PokemonReport1" }, { "type": "hidden_item", @@ -314,7 +314,7 @@ "x": 29, "y": 1, "elevation": 0, - "script": "SilphCo_5F_EventScript_16181C" + "script": "SilphCo_5F_EventScript_FloorSign" } ] } diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc index 1a17e3b44..ae195ee09 100644 --- a/data/maps/SilphCo_5F/scripts.inc +++ b/data/maps/SilphCo_5F/scripts.inc @@ -8,52 +8,52 @@ SilphCo_5F_OnLoad:: @ 81617C4 call_if_unset FLAG_SILPH_5F_DOOR_3, EventScript_Close5FDoor3 end -SilphCo_5F_EventScript_1617E0:: @ 81617E0 +SilphCo_5F_EventScript_WorkerM:: @ 81617E0 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_1617F7 - msgbox gUnknown_8175B70 + goto_if_ge SilphCo_5F_EventScript_WorkerMRocketsGone + msgbox SilphCo_5F_Text_RocketsInUproarAboutIntruder release end -EventScript_1617F7:: @ 81617F7 - msgbox gUnknown_8175BB3 +SilphCo_5F_EventScript_WorkerMRocketsGone:: @ 81617F7 + msgbox SilphCo_5F_Text_YoureOurHeroThankYou release end -SilphCo_5F_EventScript_161801:: @ 8161801 - msgbox gUnknown_8175D89, MSGBOX_SIGN +SilphCo_5F_EventScript_PokemonReport1:: @ 8161801 + msgbox SilphCo_5F_Text_PorygonFirstVRMon, MSGBOX_SIGN end -SilphCo_5F_EventScript_16180A:: @ 816180A - msgbox gUnknown_8175DE0, MSGBOX_SIGN +SilphCo_5F_EventScript_PokemonReport2:: @ 816180A + msgbox SilphCo_5F_Text_Over350TechniquesConfirmed, MSGBOX_SIGN end -SilphCo_5F_EventScript_161813:: @ 8161813 - msgbox gUnknown_8175E28, MSGBOX_SIGN +SilphCo_5F_EventScript_PokemonReport3:: @ 8161813 + msgbox SilphCo_5F_Text_SomeMonsEvolveWhenTraded, MSGBOX_SIGN end -SilphCo_5F_EventScript_16181C:: @ 816181C - msgbox gUnknown_8175E80, MSGBOX_SIGN +SilphCo_5F_EventScript_FloorSign:: @ 816181C + msgbox SilphCo_5F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_5F_EventScript_161825:: @ 8161825 - trainerbattle_single TRAINER_SCIENTIST_BEAU, Text_175C40, Text_175C6D - msgbox gUnknown_8175C7D, MSGBOX_AUTOCLOSE +SilphCo_5F_EventScript_Beau:: @ 8161825 + trainerbattle_single TRAINER_SCIENTIST_BEAU, SilphCo_5F_Text_BeauIntro, SilphCo_5F_Text_BeauDefeat + msgbox SilphCo_5F_Text_BeauPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_5F_EventScript_16183C:: @ 816183C - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_28, Text_175BE5, Text_175C09 - msgbox gUnknown_8175C0F, MSGBOX_AUTOCLOSE +SilphCo_5F_EventScript_Grunt1:: @ 816183C + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_28, SilphCo_5F_Text_Grunt1Intro, SilphCo_5F_Text_Grunt1Defeat + msgbox SilphCo_5F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_5F_EventScript_161853:: @ 8161853 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_29, Text_175D28, Text_175D4B - msgbox gUnknown_8175D59, MSGBOX_AUTOCLOSE +SilphCo_5F_EventScript_Grunt2:: @ 8161853 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_29, SilphCo_5F_Text_Grunt2Intro, SilphCo_5F_Text_Grunt2Defeat + msgbox SilphCo_5F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_5F_EventScript_16186A:: @ 816186A - trainerbattle_single TRAINER_JUGGLER_DALTON, Text_175CBD, Text_175CEB - msgbox gUnknown_8175CF9, MSGBOX_AUTOCLOSE +SilphCo_5F_EventScript_Dalton:: @ 816186A + trainerbattle_single TRAINER_JUGGLER_DALTON, SilphCo_5F_Text_DaltonIntro, SilphCo_5F_Text_DaltonDefeat + msgbox SilphCo_5F_Text_DaltonPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_5F/text.inc b/data/maps/SilphCo_5F/text.inc index 5a768d5f5..3161f971c 100644 --- a/data/maps/SilphCo_5F/text.inc +++ b/data/maps/SilphCo_5F/text.inc @@ -1,74 +1,81 @@ -gUnknown_8175B70:: @ 8175B70 +SilphCo_5F_Text_RocketsInUproarAboutIntruder:: @ 8175B70 .string "TEAM ROCKET is in an uproar over\n" .string "some intruder.\p" .string "That's you, right?$" -gUnknown_8175BB3:: @ 8175BB3 +SilphCo_5F_Text_YoureOurHeroThankYou:: @ 8175BB3 .string "TEAM ROCKET took off!\n" .string "You're our hero! Thank you!$" -Text_175BE5:: @ 8175BE5 +SilphCo_5F_Text_Grunt1Intro:: @ 8175BE5 .string "I heard a kid was wandering\n" .string "around.$" -Text_175C09:: @ 8175C09 +SilphCo_5F_Text_Grunt1Defeat:: @ 8175C09 .string "Boom!$" -gUnknown_8175C0F:: @ 8175C0F +SilphCo_5F_Text_Grunt1PostBattle:: @ 8175C0F .string "It's not smart to pick a fight with\n" .string "TEAM ROCKET!$" -Text_175C40:: @ 8175C40 +SilphCo_5F_Text_BeauIntro:: @ 8175C40 .string "We study POKé BALL technology on\n" .string "this floor.$" -Text_175C6D:: @ 8175C6D +SilphCo_5F_Text_BeauDefeat:: @ 8175C6D .string "Dang!\n" .string "Blast it!$" -gUnknown_8175C7D:: @ 8175C7D +SilphCo_5F_Text_BeauPostBattle:: @ 8175C7D .string "We worked on the ultimate POKé\n" .string "BALL which would catch anything.$" -Text_175CBD:: @ 8175CBD +SilphCo_5F_Text_DaltonIntro:: @ 8175CBD .string "Whaaat?\p" .string "There shouldn't be any children\n" .string "here!$" -Text_175CEB:: @ 8175CEB +SilphCo_5F_Text_DaltonDefeat:: @ 8175CEB .string "Oh, goodness!$" -gUnknown_8175CF9:: @ 8175CF9 +SilphCo_5F_Text_DaltonPostBattle:: @ 8175CF9 .string "You're only on 5F.\n" .string "It's a long way to my BOSS!$" -Text_175D28:: @ 8175D28 +SilphCo_5F_Text_Grunt2Intro:: @ 8175D28 .string "Show TEAM ROCKET a little respect!$" -Text_175D4B:: @ 8175D4B +SilphCo_5F_Text_Grunt2Defeat:: @ 8175D4B .string "Cough…\n" .string "Cough…$" -gUnknown_8175D59:: @ 8175D59 +SilphCo_5F_Text_Grunt2PostBattle:: @ 8175D59 .string "Which reminds me.\p" .string "KOFFING evolves into WEEZING!$" -gUnknown_8175D89:: @ 8175D89 +SilphCo_5F_Text_PorygonFirstVRMon:: @ 8175D89 .string "It's a POKéMON REPORT!\p" .string "POKéMON LAB created PORYGON,\n" .string "the first virtual-reality POKéMON.$" -gUnknown_8175DE0:: @ 8175DE0 +SilphCo_5F_Text_Over350TechniquesConfirmed:: @ 8175DE0 .string "It's a POKéMON REPORT!\p" .string "Over 350 POKéMON techniques have\n" .string "been confirmed.$" -gUnknown_8175E28:: @ 8175E28 +SilphCo_5F_Text_SomeMonsEvolveWhenTraded:: @ 8175E28 .string "It's a POKéMON REPORT!\p" .string "Some POKéMON have been confirmed\n" .string "to evolve when they are traded.$" -gUnknown_8175E80:: @ 8175E80 +SilphCo_5F_Text_FloorSign:: @ 8175E80 .string "SILPH CO. HEAD OFFICE\n" .string "5F$" +SilphCo_5F_Text_RocketBossLookingForStrongMons:: @ 8175E99 + .string "Those thugs that took over our\n" + .string "building…\p" + .string "Their BOSS said he was looking for\n" + .string "strong POKéMON.\p" + .string "I hope our PRESIDENT managed to\n" + .string "avoid trouble…$" diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index a1142c5ed..f5e701cf2 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SilphCo_6F_EventScript_161956", + "script": "SilphCo_6F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_6F_EventScript_1618D3", + "script": "SilphCo_6F_EventScript_WorkerM1", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_6F_EventScript_1618F4", + "script": "SilphCo_6F_EventScript_WorkerF1", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_6F_EventScript_161891", + "script": "SilphCo_6F_EventScript_WorkerM2", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_6F_EventScript_1618B2", + "script": "SilphCo_6F_EventScript_WorkerM3", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_6F_EventScript_161915", + "script": "SilphCo_6F_EventScript_WorkerF2", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "SilphCo_6F_EventScript_16193F", + "script": "SilphCo_6F_EventScript_Taylor", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SilphCo_6F_EventScript_16196D", + "script": "SilphCo_6F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" } ], @@ -226,7 +226,7 @@ "x": 25, "y": 1, "elevation": 0, - "script": "SilphCo_6F_EventScript_161936" + "script": "SilphCo_6F_EventScript_FloorSign" } ] } diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc index 6bc5cd545..478ff3309 100644 --- a/data/maps/SilphCo_6F/scripts.inc +++ b/data/maps/SilphCo_6F/scripts.inc @@ -6,91 +6,91 @@ SilphCo_6F_OnLoad:: @ 8161887 call_if_unset FLAG_SILPH_6F_DOOR, EventScript_Close6FDoor end -SilphCo_6F_EventScript_161891:: @ 8161891 +SilphCo_6F_EventScript_WorkerM2:: @ 8161891 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_1618A8 - msgbox gUnknown_817607E + goto_if_ge SilphCo_6F_EventScript_WorkerM2RocketsGone + msgbox SilphCo_6F_Text_TargetedSilphForOurMonProducts release end -EventScript_1618A8:: @ 81618A8 - msgbox gUnknown_81760B6 +SilphCo_6F_EventScript_WorkerM2RocketsGone:: @ 81618A8 + msgbox SilphCo_6F_Text_ComeWorkForSilphWhenYoureOlder release end -SilphCo_6F_EventScript_1618B2:: @ 81618B2 +SilphCo_6F_EventScript_WorkerM3:: @ 81618B2 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_1618C9 - msgbox gUnknown_8175F24 + goto_if_ge SilphCo_6F_EventScript_WorkerM3RocketsGone + msgbox SilphCo_6F_Text_RocketsTookOverBuilding release end -EventScript_1618C9:: @ 81618C9 - msgbox gUnknown_8175F51 +SilphCo_6F_EventScript_WorkerM3RocketsGone:: @ 81618C9 + msgbox SilphCo_6F_Text_BetterGetBackToWork release end -SilphCo_6F_EventScript_1618D3:: @ 81618D3 +SilphCo_6F_EventScript_WorkerM1:: @ 81618D3 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_1618EA - msgbox gUnknown_8175F70 + goto_if_ge SilphCo_6F_EventScript_WorkerM1RocketsGone + msgbox SilphCo_6F_Text_HelpMePlease release end -EventScript_1618EA:: @ 81618EA - msgbox gUnknown_8175F93 +SilphCo_6F_EventScript_WorkerM1RocketsGone:: @ 81618EA + msgbox SilphCo_6F_Text_WeGotEngaged release end -SilphCo_6F_EventScript_1618F4:: @ 81618F4 +SilphCo_6F_EventScript_WorkerF1:: @ 81618F4 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_16190B - msgbox gUnknown_8175FAA + goto_if_ge SilphCo_6F_EventScript_WorkerF1RocketsGone + msgbox SilphCo_6F_Text_ThatManIsSuchACoward release end -EventScript_16190B:: @ 816190B - msgbox gUnknown_8175FD3 +SilphCo_6F_EventScript_WorkerF1RocketsGone:: @ 816190B + msgbox SilphCo_6F_Text_NeedsMeToLookAfterHim release end -SilphCo_6F_EventScript_161915:: @ 8161915 +SilphCo_6F_EventScript_WorkerF2:: @ 8161915 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_16192C - msgbox gUnknown_8176012 + goto_if_ge SilphCo_6F_EventScript_WorkerF2RocketsGone + msgbox SilphCo_6F_Text_RocketsTryingToConquerWorld release end -EventScript_16192C:: @ 816192C - msgbox gUnknown_817604B +SilphCo_6F_EventScript_WorkerF2RocketsGone:: @ 816192C + msgbox SilphCo_6F_Text_RocketsRanAwayBecauseOfYou release end -SilphCo_6F_EventScript_161936:: @ 8161936 - msgbox gUnknown_817624D, MSGBOX_SIGN +SilphCo_6F_EventScript_FloorSign:: @ 8161936 + msgbox SilphCo_6F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_6F_EventScript_16193F:: @ 816193F - trainerbattle_single TRAINER_SCIENTIST_TAYLOR, Text_176136, Text_1761BD - msgbox gUnknown_81761C4, MSGBOX_AUTOCLOSE +SilphCo_6F_EventScript_Taylor:: @ 816193F + trainerbattle_single TRAINER_SCIENTIST_TAYLOR, SilphCo_6F_Text_TaylorIntro, SilphCo_6F_Text_TaylorDefeat + msgbox SilphCo_6F_Text_TaylorPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_6F_EventScript_161956:: @ 8161956 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_30, Text_1760DE, Text_176104 - msgbox gUnknown_817610F, MSGBOX_AUTOCLOSE +SilphCo_6F_EventScript_Grunt1:: @ 8161956 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_30, SilphCo_6F_Text_Grunt1Intro, SilphCo_6F_Text_Grunt1Defeat + msgbox SilphCo_6F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_6F_EventScript_16196D:: @ 816196D - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_31, Text_1761F1, Text_17620E - msgbox gUnknown_817621B, MSGBOX_AUTOCLOSE +SilphCo_6F_EventScript_Grunt2:: @ 816196D + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_31, SilphCo_6F_Text_Grunt2Intro, SilphCo_6F_Text_Grunt2Defeat + msgbox SilphCo_6F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_6F/text.inc b/data/maps/SilphCo_6F/text.inc index 1de83df51..f0d1084a1 100644 --- a/data/maps/SilphCo_6F/text.inc +++ b/data/maps/SilphCo_6F/text.inc @@ -1,86 +1,78 @@ -Text_175E99:: @ 8175E99 - .string "Those thugs that took over our\n" - .string "building…\p" - .string "Their BOSS said he was looking for\n" - .string "strong POKéMON.\p" - .string "I hope our PRESIDENT managed to\n" - .string "avoid trouble…$" - -gUnknown_8175F24:: @ 8175F24 +SilphCo_6F_Text_RocketsTookOverBuilding:: @ 8175F24 .string "The ROCKETS came and took over\n" .string "the building!$" -gUnknown_8175F51:: @ 8175F51 +SilphCo_6F_Text_BetterGetBackToWork:: @ 8175F51 .string "Well, better get back to work.$" -gUnknown_8175F70:: @ 8175F70 +SilphCo_6F_Text_HelpMePlease:: @ 8175F70 .string "Oh dear, oh dear.\n" .string "Help me, please!$" -gUnknown_8175F93:: @ 8175F93 +SilphCo_6F_Text_WeGotEngaged:: @ 8175F93 .string "We got engaged.\n" .string "Heheh!$" -gUnknown_8175FAA:: @ 8175FAA +SilphCo_6F_Text_ThatManIsSuchACoward:: @ 8175FAA .string "That man next to me…\n" .string "He's such a coward!$" -gUnknown_8175FD3:: @ 8175FD3 +SilphCo_6F_Text_NeedsMeToLookAfterHim:: @ 8175FD3 .string "He's so helpless, he needed\n" .string "someone like me to look after him.$" -gUnknown_8176012:: @ 8176012 +SilphCo_6F_Text_RocketsTryingToConquerWorld:: @ 8176012 .string "TEAM ROCKET is trying to conquer\n" .string "the world with POKéMON.$" -gUnknown_817604B:: @ 817604B +SilphCo_6F_Text_RocketsRanAwayBecauseOfYou:: @ 817604B .string "TEAM ROCKET ran away, and it's all\n" .string "because of you!$" -gUnknown_817607E:: @ 817607E +SilphCo_6F_Text_TargetedSilphForOurMonProducts:: @ 817607E .string "They must have targeted SILPH for\n" .string "our POKéMON products.$" -gUnknown_81760B6:: @ 81760B6 +SilphCo_6F_Text_ComeWorkForSilphWhenYoureOlder:: @ 81760B6 .string "Come work for SILPH when you\n" .string "get older.$" -Text_1760DE:: @ 81760DE +SilphCo_6F_Text_Grunt1Intro:: @ 81760DE .string "I am one of the four ROCKET\n" .string "BROTHERS!$" -Text_176104:: @ 8176104 +SilphCo_6F_Text_Grunt1Defeat:: @ 8176104 .string "Flame out!$" -gUnknown_817610F:: @ 817610F +SilphCo_6F_Text_Grunt1PostBattle:: @ 817610F .string "No matter!\n" .string "My brothers will avenge me!$" -Text_176136:: @ 8176136 +SilphCo_6F_Text_TaylorIntro:: @ 8176136 .string "That rotten PRESIDENT!\p" .string "Serves him right for shipping me\n" .string "off to the TIKSI BRANCH!\p" .string "That's why TEAM ROCKET came after\n" .string "us, I'm sure of it!$" -Text_1761BD:: @ 81761BD +SilphCo_6F_Text_TaylorDefeat:: @ 81761BD .string "Shoot!$" -gUnknown_81761C4:: @ 81761C4 +SilphCo_6F_Text_TaylorPostBattle:: @ 81761C4 .string "TIKSI BRANCH?\n" .string "It's in Russian no-man's-land!$" -Text_1761F1:: @ 81761F1 +SilphCo_6F_Text_Grunt2Intro:: @ 81761F1 .string "You dare betray TEAM ROCKET?$" -Text_17620E:: @ 817620E +SilphCo_6F_Text_Grunt2Defeat:: @ 817620E .string "You traitor!$" -gUnknown_817621B:: @ 817621B +SilphCo_6F_Text_Grunt2PostBattle:: @ 817621B .string "If you stand for justice, you\n" .string "betray us bad guys!$" -gUnknown_817624D:: @ 817624D +SilphCo_6F_Text_FloorSign:: @ 817624D .string "SILPH CO. HEAD OFFICE\n" .string "6F$" diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index 87a1a413c..994088fb0 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_7F_EventScript_161AC8", + "script": "SilphCo_7F_EventScript_LaprasGuy", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "SilphCo_7F_EventScript_161C1A", + "script": "SilphCo_7F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SilphCo_7F_EventScript_161C31", + "script": "SilphCo_7F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SilphCo_7F_EventScript_161C48", + "script": "SilphCo_7F_EventScript_Grunt3", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_7F_EventScript_161BD9", + "script": "SilphCo_7F_EventScript_WorkerF", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_7F_EventScript_161B97", + "script": "SilphCo_7F_EventScript_WorkerM1", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_7F_EventScript_161BB8", + "script": "SilphCo_7F_EventScript_WorkerM2", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SilphCo_7F_EventScript_161C03", + "script": "SilphCo_7F_EventScript_Joshua", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -209,7 +209,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_SILPH_CO_7F", "var_value": 0, - "script": "SilphCo_7F_EventScript_1619BC" + "script": "SilphCo_7F_EventScript_RivalTriggerTop" }, { "type": "trigger", @@ -218,7 +218,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_SILPH_CO_7F", "var_value": 0, - "script": "SilphCo_7F_EventScript_1619C8" + "script": "SilphCo_7F_EventScript_RivalTriggerBottom" } ], "bg_events": [ @@ -321,7 +321,7 @@ "x": 20, "y": 1, "elevation": 0, - "script": "SilphCo_7F_EventScript_161BFA" + "script": "SilphCo_7F_EventScript_FloorSign" } ] } diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 9ca4f31ec..0bfac0151 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -11,30 +11,26 @@ SilphCo_7F_OnLoad:: @ 816198F SilphCo_7F_OnTransition:: @ 81619AB compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - call_if_ge EventScript_1619B7 + call_if_ge SilphCo_7F_EventScript_SetObjRocketsGone end -EventScript_1619B7:: @ 81619B7 - setobjectmovementtype 8, 7 +SilphCo_7F_EventScript_SetObjRocketsGone:: @ 81619B7 + setobjectmovementtype 8, MOVEMENT_TYPE_FACE_UP return -SilphCo_7F_EventScript_1619BC:: @ 81619BC +SilphCo_7F_EventScript_RivalTriggerTop:: @ 81619BC lockall setvar VAR_TEMP_1, 0 - goto EventScript_1619D4 - -EventScript_1619C7:: @ 81619C7 + goto SilphCo_7F_EventScript_RivalScene end -SilphCo_7F_EventScript_1619C8:: @ 81619C8 +SilphCo_7F_EventScript_RivalTriggerBottom:: @ 81619C8 lockall setvar VAR_TEMP_1, 1 - goto EventScript_1619D4 - -EventScript_1619D3:: @ 81619D3 + goto SilphCo_7F_EventScript_RivalScene end -EventScript_1619D4:: @ 81619D4 +SilphCo_7F_EventScript_RivalScene:: @ 81619D4 textcolor 0 playbgm MUS_RIVAL1, 0 applymovement 1, Movement_ExclamationMark @@ -42,26 +38,26 @@ EventScript_1619D4:: @ 81619D4 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown applymovement 1, Movement_Delay48 waitmovement 0 - msgbox gUnknown_8176710 + msgbox SilphCo_7F_Text_RivalWhatKeptYou compare VAR_TEMP_1, 0 - call_if_eq EventScript_161A73 + call_if_eq SilphCo_7F_EventScript_RivalApproachTop compare VAR_TEMP_1, 1 - call_if_eq EventScript_161A7F - msgbox gUnknown_8176727 + call_if_eq SilphCo_7F_EventScript_RivalApproachBottom + msgbox SilphCo_7F_Text_RivalIntro setvar VAR_LAST_TALKED, 1 compare VAR_STARTER_MON, 2 - call_if_eq EventScript_161A80 + call_if_eq SilphCo_7F_EventScript_RivalSquirtle compare VAR_STARTER_MON, 1 - call_if_eq EventScript_161A8B + call_if_eq SilphCo_7F_EventScript_RivalBulbasaur compare VAR_STARTER_MON, 0 - call_if_eq EventScript_161A96 - msgbox gUnknown_8176827 + call_if_eq SilphCo_7F_EventScript_RivalCharmander + msgbox SilphCo_7F_Text_RivalPostBattle closemessage playbgm MUS_RIVAL2, 0 compare VAR_TEMP_1, 0 - call_if_eq EventScript_161AA1 + call_if_eq SilphCo_7F_EventScript_RivalExitTop compare VAR_TEMP_1, 1 - call_if_eq EventScript_161AAC + call_if_eq SilphCo_7F_EventScript_RivalExitBottom playse SE_TK_WARPIN fadedefaultbgm removeobject 1 @@ -70,42 +66,42 @@ EventScript_1619D4:: @ 81619D4 releaseall end -EventScript_161A73:: @ 8161A73 +SilphCo_7F_EventScript_RivalApproachTop:: @ 8161A73 closemessage - applymovement 1, Movement_161AB7 + applymovement 1, SilphCo_7F_Movement_RivalApproachTop waitmovement 0 return -EventScript_161A7F:: @ 8161A7F +SilphCo_7F_EventScript_RivalApproachBottom:: @ 8161A7F return -EventScript_161A80:: @ 8161A80 - trainerbattle_no_intro TRAINER_RIVAL_SILPH_SQUIRTLE, Text_1767D0 +SilphCo_7F_EventScript_RivalSquirtle:: @ 8161A80 + trainerbattle_no_intro TRAINER_RIVAL_SILPH_SQUIRTLE, SilphCo_7F_Text_RivalDefeat return -EventScript_161A8B:: @ 8161A8B - trainerbattle_no_intro TRAINER_RIVAL_SILPH_BULBASAUR, Text_1767D0 +SilphCo_7F_EventScript_RivalBulbasaur:: @ 8161A8B + trainerbattle_no_intro TRAINER_RIVAL_SILPH_BULBASAUR, SilphCo_7F_Text_RivalDefeat return -EventScript_161A96:: @ 8161A96 - trainerbattle_no_intro TRAINER_RIVAL_SILPH_CHARMANDER, Text_1767D0 +SilphCo_7F_EventScript_RivalCharmander:: @ 8161A96 + trainerbattle_no_intro TRAINER_RIVAL_SILPH_CHARMANDER, SilphCo_7F_Text_RivalDefeat return -EventScript_161AA1:: @ 8161AA1 - applymovement 1, Movement_161AB9 +SilphCo_7F_EventScript_RivalExitTop:: @ 8161AA1 + applymovement 1, SilphCo_7F_Movement_RivalExitTop waitmovement 0 return -EventScript_161AAC:: @ 8161AAC - applymovement 1, Movement_161ABF +SilphCo_7F_EventScript_RivalExitBottom:: @ 8161AAC + applymovement 1, SilphCo_7F_Movement_RivalExitBottom waitmovement 0 return -Movement_161AB7:: @ 8161AB7 +SilphCo_7F_Movement_RivalApproachTop:: @ 8161AB7 walk_up step_end -Movement_161AB9:: @ 8161AB9 +SilphCo_7F_Movement_RivalExitTop:: @ 8161AB9 walk_right walk_right walk_right @@ -113,7 +109,7 @@ Movement_161AB9:: @ 8161AB9 delay_16 step_end -Movement_161ABF:: @ 8161ABF +SilphCo_7F_Movement_RivalExitBottom:: @ 8161ABF walk_left walk_up walk_up @@ -124,136 +120,130 @@ Movement_161ABF:: @ 8161ABF delay_16 step_end -SilphCo_7F_EventScript_161AC8:: @ 8161AC8 +SilphCo_7F_EventScript_LaprasGuy:: @ 8161AC8 lock faceplayer - goto_if_set FLAG_GOT_LAPRAS_FROM_SILPH, EventScript_161B8D - msgbox gUnknown_8176266 + goto_if_set FLAG_GOT_LAPRAS_FROM_SILPH, SilphCo_7F_EventScript_AlreadyGotLapras + msgbox SilphCo_7F_Text_HaveMonForSavingUs setvar VAR_TEMP_1, SPECIES_LAPRAS givemon SPECIES_LAPRAS, 25, ITEM_NONE compare VAR_RESULT, 0 - goto_if_eq EventScript_161B12 + goto_if_eq SilphCo_7F_EventScript_ReceiveLaprasParty compare VAR_RESULT, 1 - goto_if_eq EventScript_161B45 + goto_if_eq SilphCo_7F_EventScript_ReceiveLaprasPC compare VAR_RESULT, 2 goto_if_eq EventScript_NoMoreRoomForPokemon release end -EventScript_161B12:: @ 8161B12 +SilphCo_7F_EventScript_ReceiveLaprasParty:: @ 8161B12 textcolor 3 playfanfare MUS_FANFA1 - message Text_1762D7 + message SilphCo_7F_Text_ObtainedLaprasFromEmployee waitmessage waitfanfare getspeciesname 0, SPECIES_LAPRAS msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_161B7E + goto_if_eq SilphCo_7F_EventScript_EndReceiveLapras call EventScript_GetGiftMonPartySlot call EventScript_ChangePokemonNickname - goto EventScript_161B7E - -EventScript_161B44:: @ 8161B44 + goto SilphCo_7F_EventScript_EndReceiveLapras end -EventScript_161B45:: @ 8161B45 +SilphCo_7F_EventScript_ReceiveLaprasPC:: @ 8161B45 textcolor 3 playfanfare MUS_FANFA1 - message Text_1762D7 + message SilphCo_7F_Text_ObtainedLaprasFromEmployee waitmessage waitfanfare getspeciesname 0, SPECIES_LAPRAS msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_161B73 + goto_if_eq SilphCo_7F_EventScript_LaprasTransferredToPC call EventScript_NameReceivedBoxMon - goto EventScript_161B73 - -EventScript_161B72:: @ 8161B72 + goto SilphCo_7F_EventScript_LaprasTransferredToPC end -EventScript_161B73:: @ 8161B73 +SilphCo_7F_EventScript_LaprasTransferredToPC:: @ 8161B73 call EventScript_TransferredToPC - goto EventScript_161B7E - -EventScript_161B7D:: @ 8161B7D + goto SilphCo_7F_EventScript_EndReceiveLapras end -EventScript_161B7E:: @ 8161B7E +SilphCo_7F_EventScript_EndReceiveLapras:: @ 8161B7E textcolor 0 - msgbox gUnknown_8176305 + msgbox SilphCo_7F_Text_ExplainLapras setflag FLAG_GOT_LAPRAS_FROM_SILPH release end -EventScript_161B8D:: @ 8161B8D - msgbox gUnknown_81763DD +SilphCo_7F_EventScript_AlreadyGotLapras:: @ 8161B8D + msgbox SilphCo_7F_Text_RocketBossWentToBoardroom release end -SilphCo_7F_EventScript_161B97:: @ 8161B97 +SilphCo_7F_EventScript_WorkerM1:: @ 8161B97 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_161BAE - msgbox gUnknown_8176444 + goto_if_ge SilphCo_7F_EventScript_WorkerM1RocketsGone + msgbox SilphCo_7F_Text_RocketsAfterMasterBall release end -EventScript_161BAE:: @ 8161BAE - msgbox gUnknown_8176486 +SilphCo_7F_EventScript_WorkerM1RocketsGone:: @ 8161BAE + msgbox SilphCo_7F_Text_CanceledMasterBallProject release end -SilphCo_7F_EventScript_161BB8:: @ 8161BB8 +SilphCo_7F_EventScript_WorkerM2:: @ 8161BB8 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_161BCF - msgbox gUnknown_81764C2 + goto_if_ge SilphCo_7F_EventScript_WorkerM2RocketsGone + msgbox SilphCo_7F_Text_BadIfTeamRocketTookOver release end -EventScript_161BCF:: @ 8161BCF - msgbox gUnknown_8176501 +SilphCo_7F_EventScript_WorkerM2RocketsGone:: @ 8161BCF + msgbox SilphCo_7F_Text_WowYouChasedOffTeamRocket release end -SilphCo_7F_EventScript_161BD9:: @ 8161BD9 +SilphCo_7F_EventScript_WorkerF:: @ 8161BD9 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_161BF0 - msgbox gUnknown_8176532 + goto_if_ge SilphCo_7F_EventScript_WorkerFRocketsGone + msgbox SilphCo_7F_Text_ReallyDangerousHere release end -EventScript_161BF0:: @ 8161BF0 - msgbox gUnknown_8176573 +SilphCo_7F_EventScript_WorkerFRocketsGone:: @ 8161BF0 + msgbox SilphCo_7F_Text_ThankYouSoMuch release end -SilphCo_7F_EventScript_161BFA:: @ 8161BFA - msgbox gUnknown_8176954, MSGBOX_SIGN +SilphCo_7F_EventScript_FloorSign:: @ 8161BFA + msgbox SilphCo_7F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_7F_EventScript_161C03:: @ 8161C03 - trainerbattle_single TRAINER_SCIENTIST_JOSHUA, Text_1765E2, Text_17660C - msgbox gUnknown_8176616, MSGBOX_AUTOCLOSE +SilphCo_7F_EventScript_Joshua:: @ 8161C03 + trainerbattle_single TRAINER_SCIENTIST_JOSHUA, SilphCo_7F_Text_JoshuaIntro, SilphCo_7F_Text_JoshuaDefeat + msgbox SilphCo_7F_Text_JoshuaPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_7F_EventScript_161C1A:: @ 8161C1A - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_33, Text_176643, Text_176669 - msgbox gUnknown_8176681, MSGBOX_AUTOCLOSE +SilphCo_7F_EventScript_Grunt1:: @ 8161C1A + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_33, SilphCo_7F_Text_Grunt1Intro, SilphCo_7F_Text_Grunt1Defeat + msgbox SilphCo_7F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_7F_EventScript_161C31:: @ 8161C31 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_34, Text_1766B3, Text_1766D7 - msgbox gUnknown_81766E5, MSGBOX_AUTOCLOSE +SilphCo_7F_EventScript_Grunt2:: @ 8161C31 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_34, SilphCo_7F_Text_Grunt2Intro, SilphCo_7F_Text_Grunt2Defeat + msgbox SilphCo_7F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_7F_EventScript_161C48:: @ 8161C48 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_35, Text_176586, Text_1765A5 - msgbox gUnknown_81765B1, MSGBOX_AUTOCLOSE +SilphCo_7F_EventScript_Grunt3:: @ 8161C48 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_35, SilphCo_7F_Text_Grunt3Intro, SilphCo_7F_Text_Grunt3Defeat + msgbox SilphCo_7F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_7F/text.inc b/data/maps/SilphCo_7F/text.inc index d977d816e..27e01c4a5 100644 --- a/data/maps/SilphCo_7F/text.inc +++ b/data/maps/SilphCo_7F/text.inc @@ -1,15 +1,15 @@ -gUnknown_8176266:: @ 8176266 +SilphCo_7F_Text_HaveMonForSavingUs:: @ 8176266 .string "Oh! Hi! You're not a ROCKET!\n" .string "You came to save us?\l" .string "Why, thank you!\p" .string "I want you to have this POKéMON\n" .string "for saving us.$" -Text_1762D7:: @ 81762D7 +SilphCo_7F_Text_ObtainedLaprasFromEmployee:: @ 81762D7 .string "{PLAYER} obtained a LAPRAS from\n" .string "the SILPH employee!$" -gUnknown_8176305:: @ 8176305 +SilphCo_7F_Text_ExplainLapras:: @ 8176305 .string "It's a LAPRAS.\n" .string "It's a very intelligent POKéMON.\p" .string "We kept it in our lab, but it will\n" @@ -19,94 +19,94 @@ gUnknown_8176305:: @ 8176305 .string "It's a good swimmer.\n" .string "It'll give you a lift across water!$" -gUnknown_81763DD:: @ 81763DD +SilphCo_7F_Text_RocketBossWentToBoardroom:: @ 81763DD .string "TEAM ROCKET's BOSS went to the\n" .string "boardroom!\p" .string "Is our PRESIDENT okay?\n" .string "I'm worried.$" -Text_17642B:: @ 817642B +SilphCo_7F_Text_OhNo:: @ 817642B .string "あ‥ もう もてないぞ$" -Text_176437:: @ 8176437 +SilphCo_7F_Text_SavedAtLast:: @ 8176437 .string "たすかったよ ありがと！$" -gUnknown_8176444:: @ 8176444 +SilphCo_7F_Text_RocketsAfterMasterBall:: @ 8176444 .string "TEAM ROCKET was after the MASTER\n" .string "BALL, which catches any POKéMON.$" -gUnknown_8176486:: @ 8176486 +SilphCo_7F_Text_CanceledMasterBallProject:: @ 8176486 .string "We canceled the MASTER BALL\n" .string "project because of TEAM ROCKET.$" -gUnknown_81764C2:: @ 81764C2 +SilphCo_7F_Text_BadIfTeamRocketTookOver:: @ 81764C2 .string "It would be bad if TEAM ROCKET\n" .string "took over SILPH or our POKéMON.$" -gUnknown_8176501:: @ 8176501 +SilphCo_7F_Text_WowYouChasedOffTeamRocket:: @ 8176501 .string "Wow!\p" .string "You chased off TEAM ROCKET all by\n" .string "yourself?$" -gUnknown_8176532:: @ 8176532 +SilphCo_7F_Text_ReallyDangerousHere:: @ 8176532 .string "You!\n" .string "It's really dangerous here!\p" .string "You came to save me?\n" .string "You can't!$" -gUnknown_8176573:: @ 8176573 +SilphCo_7F_Text_ThankYouSoMuch:: @ 8176573 .string "Thank you so much!$" -Text_176586:: @ 8176586 +SilphCo_7F_Text_Grunt3Intro:: @ 8176586 .string "Uh-oh!\n" .string "I smell a little mouse!$" -Text_1765A5:: @ 81765A5 +SilphCo_7F_Text_Grunt3Defeat:: @ 81765A5 .string "Lights out!$" -gUnknown_81765B1:: @ 81765B1 +SilphCo_7F_Text_Grunt3PostBattle:: @ 81765B1 .string "You won't find my BOSS by just\n" .string "scurrying around!$" -Text_1765E2:: @ 81765E2 +SilphCo_7F_Text_JoshuaIntro:: @ 81765E2 .string "Heheh!\p" .string "You mistook me for a SILPH worker?$" -Text_17660C:: @ 817660C +SilphCo_7F_Text_JoshuaDefeat:: @ 817660C .string "I'm done!$" -gUnknown_8176616:: @ 8176616 +SilphCo_7F_Text_JoshuaPostBattle:: @ 8176616 .string "Despite your age, you are a\n" .string "skilled TRAINER!$" -Text_176643:: @ 8176643 +SilphCo_7F_Text_Grunt1Intro:: @ 8176643 .string "I am one of the four ROCKET\n" .string "BROTHERS!$" -Text_176669:: @ 8176669 +SilphCo_7F_Text_Grunt1Defeat:: @ 8176669 .string "Aack!\n" .string "Brothers, I lost!$" -gUnknown_8176681:: @ 8176681 +SilphCo_7F_Text_Grunt1PostBattle:: @ 8176681 .string "Doesn't matter.\n" .string "My brothers will repay the favor!$" -Text_1766B3:: @ 81766B3 +SilphCo_7F_Text_Grunt2Intro:: @ 81766B3 .string "A child intruder?\n" .string "That must be you!$" -Text_1766D7:: @ 81766D7 +SilphCo_7F_Text_Grunt2Defeat:: @ 81766D7 .string "Fine!\n" .string "I lost!$" -gUnknown_81766E5:: @ 81766E5 +SilphCo_7F_Text_Grunt2PostBattle:: @ 81766E5 .string "Go on home before my BOSS gets\n" .string "ticked off!$" -gUnknown_8176710:: @ 8176710 +SilphCo_7F_Text_RivalWhatKeptYou:: @ 8176710 .string "{RIVAL}: What kept you, {PLAYER}?$" -gUnknown_8176727:: @ 8176727 +SilphCo_7F_Text_RivalIntro:: @ 8176727 .string "{RIVAL}: Hahaha! I thought you'd\n" .string "turn up if I waited here!\p" .string "I guess TEAM ROCKET slowed you\n" @@ -114,18 +114,18 @@ gUnknown_8176727:: @ 8176727 .string "I saw you in SAFFRON, so I decided\n" .string "to see if you got better!$" -Text_1767D0:: @ 81767D0 +SilphCo_7F_Text_RivalDefeat:: @ 81767D0 .string "Oh, man!\n" .string "So, you are ready for BOSS\l" .string "ROCKET!$" -Text_1767FC:: @ 81767FC +SilphCo_7F_Text_RivalVictory:: @ 81767FC .string "{RIVAL}“おまえなあ‥\p" .string "こんな うでまえじゃ\n" .string "まだまだ‥\l" .string "いちにんまえ とは いえないぜ$" -gUnknown_8176827:: @ 8176827 +SilphCo_7F_Text_RivalPostBattle:: @ 8176827 .string "Well, {PLAYER}!\n" .string "I'm moving on up and ahead!\p" .string "By checking my POKéDEX, I'm\n" @@ -140,7 +140,7 @@ gUnknown_8176827:: @ 8176827 .string "Don't sweat it!\l" .string "Smell ya!$" -gUnknown_8176954:: @ 8176954 +SilphCo_7F_Text_FloorSign:: @ 8176954 .string "SILPH CO. HEAD OFFICE\n" .string "7F$" diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index ef04548df..badb0553e 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "SilphCo_8F_EventScript_161CB0", + "script": "SilphCo_8F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "SilphCo_8F_EventScript_161CC7", + "script": "SilphCo_8F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SilphCo_8F_EventScript_161C99", + "script": "SilphCo_8F_EventScript_Parker", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_8F_EventScript_161C6F", + "script": "SilphCo_8F_EventScript_WorkerM", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_8F_EventScript_1AD0ED", + "script": "SilphCo_8F_EventScript_Scientist", "flag": "0" } ], @@ -188,7 +188,7 @@ "x": 27, "y": 1, "elevation": 0, - "script": "SilphCo_8F_EventScript_161C90" + "script": "SilphCo_8F_EventScript_FloorSign" } ] } diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index f96188c3f..d888f339e 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -6,35 +6,35 @@ SilphCo_8F_OnLoad:: @ 8161C65 call_if_unset FLAG_SILPH_8F_DOOR, EventScript_Close8FDoor end -SilphCo_8F_EventScript_161C6F:: @ 8161C6F +SilphCo_8F_EventScript_WorkerM:: @ 8161C6F lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_161C86 - msgbox gUnknown_817696D + goto_if_ge SilphCo_8F_EventScript_WorkerMRocketsGone + msgbox SilphCo_8F_Text_WonderIfSilphIsFinished release end -EventScript_161C86:: @ 8161C86 - msgbox gUnknown_817698C +SilphCo_8F_EventScript_WorkerMRocketsGone:: @ 8161C86 + msgbox SilphCo_8F_Text_ThanksForSavingUs release end -SilphCo_8F_EventScript_161C90:: @ 8161C90 - msgbox gUnknown_8176AB2, MSGBOX_SIGN +SilphCo_8F_EventScript_FloorSign:: @ 8161C90 + msgbox SilphCo_8F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_8F_EventScript_161C99:: @ 8161C99 - trainerbattle_single TRAINER_SCIENTIST_PARKER, Text_1769FD, Text_176A19 - msgbox gUnknown_8176A26, MSGBOX_AUTOCLOSE +SilphCo_8F_EventScript_Parker:: @ 8161C99 + trainerbattle_single TRAINER_SCIENTIST_PARKER, SilphCo_8F_Text_ParkerIntro, SilphCo_8F_Text_ParkerDefeat + msgbox SilphCo_8F_Text_ParkerPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_8F_EventScript_161CB0:: @ 8161CB0 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_32, Text_1769A2, Text_1769BE - msgbox gUnknown_81769CF, MSGBOX_AUTOCLOSE +SilphCo_8F_EventScript_Grunt1:: @ 8161CB0 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_32, SilphCo_8F_Text_Grunt1Intro, SilphCo_8F_Text_Grunt1Defeat + msgbox SilphCo_8F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_8F_EventScript_161CC7:: @ 8161CC7 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_36, Text_176A56, Text_176A7C - msgbox gUnknown_8176A90, MSGBOX_AUTOCLOSE +SilphCo_8F_EventScript_Grunt2:: @ 8161CC7 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_36, SilphCo_8F_Text_Grunt2Intro, SilphCo_8F_Text_Grunt2Defeat + msgbox SilphCo_8F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_8F/text.inc b/data/maps/SilphCo_8F/text.inc index 858d5da17..9144cda4e 100644 --- a/data/maps/SilphCo_8F/text.inc +++ b/data/maps/SilphCo_8F/text.inc @@ -1,42 +1,49 @@ -gUnknown_817696D:: @ 817696D +SilphCo_8F_Text_WonderIfSilphIsFinished:: @ 817696D .string "I wonder if SILPH is finished…$" -gUnknown_817698C:: @ 817698C +SilphCo_8F_Text_ThanksForSavingUs:: @ 817698C .string "Thanks for saving us!$" -Text_1769A2:: @ 81769A2 +SilphCo_8F_Text_Grunt1Intro:: @ 81769A2 .string "That's as far as you'll go!$" -Text_1769BE:: @ 81769BE +SilphCo_8F_Text_Grunt1Defeat:: @ 81769BE .string "Not enough grit!$" -gUnknown_81769CF:: @ 81769CF +SilphCo_8F_Text_Grunt1PostBattle:: @ 81769CF .string "If you don't turn back…\n" .string "I'll call for backup!$" -Text_1769FD:: @ 81769FD +SilphCo_8F_Text_ParkerIntro:: @ 81769FD .string "You're causing us problems!$" -Text_176A19:: @ 8176A19 +SilphCo_8F_Text_ParkerDefeat:: @ 8176A19 .string "Huh?\n" .string "I lost?$" -gUnknown_8176A26:: @ 8176A26 +SilphCo_8F_Text_ParkerPostBattle:: @ 8176A26 .string "So, what do you think of SILPH\n" .string "BUILDING's maze?$" -Text_176A56:: @ 8176A56 +SilphCo_8F_Text_Grunt2Intro:: @ 8176A56 .string "I am one of the four ROCKET\n" .string "BROTHERS!$" -Text_176A7C:: @ 8176A7C +SilphCo_8F_Text_Grunt2Defeat:: @ 8176A7C .string "Whoo!\n" .string "Oh, Brothers!$" -gUnknown_8176A90:: @ 8176A90 +SilphCo_8F_Text_Grunt2PostBattle:: @ 8176A90 .string "I'll leave you up to my brothers.$" -gUnknown_8176AB2:: @ 8176AB2 +SilphCo_8F_Text_FloorSign:: @ 8176AB2 .string "SILPH CO. HEAD OFFICE\n" .string "8F$" +SilphCo_8F_Text_ToRocketBossMonsAreTools:: @ 8176ACB + .string "TEAM ROCKET's BOSS is terribly\n" + .string "cruel!\p" + .string "To him, POKéMON are just tools to\n" + .string "be used.\p" + .string "What will happen if that tyrant\n" + .string "takes over our company…$" diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index e8f39eba5..92a229699 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SilphCo_9F_EventScript_161D41", + "script": "SilphCo_9F_EventScript_Ed", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SilphCo_9F_EventScript_161D6F", + "script": "SilphCo_9F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SilphCo_9F_EventScript_161D09", + "script": "SilphCo_9F_EventScript_HealWoman", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "SilphCo_9F_EventScript_161D58", + "script": "SilphCo_9F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" } ], @@ -242,7 +242,7 @@ "x": 17, "y": 1, "elevation": 0, - "script": "SilphCo_9F_EventScript_161D38" + "script": "SilphCo_9F_EventScript_FloorSign" } ] } diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index 7f4258b5d..5cdfc2c82 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -9,38 +9,38 @@ SilphCo_9F_OnLoad:: @ 8161CE4 call_if_unset FLAG_SILPH_9F_DOOR_4, EventScript_Close9FDoor4 end -SilphCo_9F_EventScript_161D09:: @ 8161D09 +SilphCo_9F_EventScript_HealWoman:: @ 8161D09 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_161D2E - msgbox gUnknown_8176B54 + goto_if_ge SilphCo_9F_EventScript_HealWomanRocketsGone + msgbox SilphCo_9F_Text_YouShouldTakeQuickNap closemessage call EventScript_OutOfCenterPartyHeal - msgbox gUnknown_8176B81 + msgbox SilphCo_9F_Text_DontGiveUp release end -EventScript_161D2E:: @ 8161D2E - msgbox gUnknown_8176B90 +SilphCo_9F_EventScript_HealWomanRocketsGone:: @ 8161D2E + msgbox SilphCo_9F_Text_ThankYouSoMuch release end -SilphCo_9F_EventScript_161D38:: @ 8161D38 - msgbox gUnknown_8176CD4, MSGBOX_SIGN +SilphCo_9F_EventScript_FloorSign:: @ 8161D38 + msgbox SilphCo_9F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_9F_EventScript_161D41:: @ 8161D41 - trainerbattle_single TRAINER_SCIENTIST_ED, Text_176BFB, Text_176C2B - msgbox gUnknown_8176C3C, MSGBOX_AUTOCLOSE +SilphCo_9F_EventScript_Ed:: @ 8161D41 + trainerbattle_single TRAINER_SCIENTIST_ED, SilphCo_9F_Text_EdIntro, SilphCo_9F_Text_EdDefeat + msgbox SilphCo_9F_Text_EdPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_9F_EventScript_161D58:: @ 8161D58 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_37, Text_176BA3, Text_176BC8 - msgbox gUnknown_8176BD0, MSGBOX_AUTOCLOSE +SilphCo_9F_EventScript_Grunt1:: @ 8161D58 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_37, SilphCo_9F_Text_Grunt1Intro, SilphCo_9F_Text_Grunt1Defeat + msgbox SilphCo_9F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_9F_EventScript_161D6F:: @ 8161D6F - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_38, Text_176C7A, Text_176CA0 - msgbox gUnknown_8176CB8, MSGBOX_AUTOCLOSE +SilphCo_9F_EventScript_Grunt2:: @ 8161D6F + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_38, SilphCo_9F_Text_Grunt2Intro, SilphCo_9F_Text_Grunt2Defeat + msgbox SilphCo_9F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_9F/text.inc b/data/maps/SilphCo_9F/text.inc index bf400f768..f89262090 100644 --- a/data/maps/SilphCo_9F/text.inc +++ b/data/maps/SilphCo_9F/text.inc @@ -1,55 +1,47 @@ -Text_176ACB:: @ 8176ACB - .string "TEAM ROCKET's BOSS is terribly\n" - .string "cruel!\p" - .string "To him, POKéMON are just tools to\n" - .string "be used.\p" - .string "What will happen if that tyrant\n" - .string "takes over our company…$" - -gUnknown_8176B54:: @ 8176B54 +SilphCo_9F_Text_YouShouldTakeQuickNap:: @ 8176B54 .string "You look tired.\n" .string "You should take a quick nap.$" -gUnknown_8176B81:: @ 8176B81 +SilphCo_9F_Text_DontGiveUp:: @ 8176B81 .string "Don't give up!$" -gUnknown_8176B90:: @ 8176B90 +SilphCo_9F_Text_ThankYouSoMuch:: @ 8176B90 .string "Thank you so much.$" -Text_176BA3:: @ 8176BA3 +SilphCo_9F_Text_Grunt1Intro:: @ 8176BA3 .string "Your POKéMON seem to adore you,\n" .string "kid!$" -Text_176BC8:: @ 8176BC8 +SilphCo_9F_Text_Grunt1Defeat:: @ 8176BC8 .string "Ghaaah!$" -gUnknown_8176BD0:: @ 8176BD0 +SilphCo_9F_Text_Grunt1PostBattle:: @ 8176BD0 .string "If I had started as a TRAINER at\n" .string "your age…$" -Text_176BFB:: @ 8176BFB +SilphCo_9F_Text_EdIntro:: @ 8176BFB .string "Your POKéMON have weak points!\n" .string "I can nail them!$" -Text_176C2B:: @ 8176C2B +SilphCo_9F_Text_EdDefeat:: @ 8176C2B .string "You hammered me!$" -gUnknown_8176C3C:: @ 8176C3C +SilphCo_9F_Text_EdPostBattle:: @ 8176C3C .string "Exploiting weak spots does work.\n" .string "Think about type advantages.$" -Text_176C7A:: @ 8176C7A +SilphCo_9F_Text_Grunt2Intro:: @ 8176C7A .string "I am one of the four ROCKET\n" .string "BROTHERS!$" -Text_176CA0:: @ 8176CA0 +SilphCo_9F_Text_Grunt2Defeat:: @ 8176CA0 .string "Warg!\n" .string "Brothers, I lost!$" -gUnknown_8176CB8:: @ 8176CB8 +SilphCo_9F_Text_Grunt2PostBattle:: @ 8176CB8 .string "My brothers will avenge me!$" -gUnknown_8176CD4:: @ 8176CD4 +SilphCo_9F_Text_FloorSign:: @ 8176CD4 .string "SILPH CO. HEAD OFFICE\n" .string "9F$" diff --git a/data/maps/SilphCo_Elevator/map.json b/data/maps/SilphCo_Elevator/map.json index 815ed916e..857d5c209 100644 --- a/data/maps/SilphCo_Elevator/map.json +++ b/data/maps/SilphCo_Elevator/map.json @@ -29,7 +29,7 @@ "x": 0, "y": 2, "elevation": 3, - "script": "SilphCo_Elevator_EventScript_161F6F" + "script": "SilphCo_Elevator_EventScript_FloorSelect" } ] } diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index 87ed62c9b..790eba70a 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -1,10 +1,10 @@ SilphCo_Elevator_MapScripts:: @ 8161F6E .byte 0 -SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F +SilphCo_Elevator_EventScript_FloorSelect:: @ 8161F6F lockall setvar VAR_0x8004, 1 - call_if_unset FLAG_TEMP_2, EventScript_1A7AB9 + call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special Special_DrawElevatorCurrentFloorWindow message Text_WantWhichFloor @@ -14,159 +14,137 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F special Special_ListMenu waitstate switch VAR_RESULT - case 0, EventScript_1621BF - case 1, EventScript_162197 - case 2, EventScript_16216F - case 3, EventScript_162147 - case 4, EventScript_16211F - case 5, EventScript_1620F7 - case 6, EventScript_1620CF - case 7, EventScript_1620A7 - case 8, EventScript_16207F - case 9, EventScript_162057 - case 10, EventScript_16202F - case 11, EventScript_1621E7 - case 127, EventScript_1621E7 + case 0, SilphCo_Elevator_EventScript_To11F + case 1, SilphCo_Elevator_EventScript_To10F + case 2, SilphCo_Elevator_EventScript_To9F + case 3, SilphCo_Elevator_EventScript_To8F + case 4, SilphCo_Elevator_EventScript_To7F + case 5, SilphCo_Elevator_EventScript_To6F + case 6, SilphCo_Elevator_EventScript_To5F + case 7, SilphCo_Elevator_EventScript_To4F + case 8, SilphCo_Elevator_EventScript_To3F + case 9, SilphCo_Elevator_EventScript_To2F + case 10, SilphCo_Elevator_EventScript_To1F + case 11, SilphCo_Elevator_EventScript_ExitFloorSelect + case 127, SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_16202F:: @ 816202F +SilphCo_Elevator_EventScript_To1F:: @ 816202F setvar VAR_0x8006, 4 setdynamicwarp MAP_SILPH_CO_1F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 4 - goto_if_eq EventScript_1621E7 - call EventScript_1621EC + goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect + call SilphCo_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 4 - goto EventScript_1621E7 - -EventScript_162056:: @ 8162056 + goto SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_162057:: @ 8162057 +SilphCo_Elevator_EventScript_To2F:: @ 8162057 setvar VAR_0x8006, 5 setdynamicwarp MAP_SILPH_CO_2F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 5 - goto_if_eq EventScript_1621E7 - call EventScript_1621EC + goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect + call SilphCo_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 5 - goto EventScript_1621E7 - -EventScript_16207E:: @ 816207E + goto SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_16207F:: @ 816207F +SilphCo_Elevator_EventScript_To3F:: @ 816207F setvar VAR_0x8006, 6 setdynamicwarp MAP_SILPH_CO_3F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 6 - goto_if_eq EventScript_1621E7 - call EventScript_1621EC + goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect + call SilphCo_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 6 - goto EventScript_1621E7 - -EventScript_1620A6:: @ 81620A6 + goto SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_1620A7:: @ 81620A7 +SilphCo_Elevator_EventScript_To4F:: @ 81620A7 setvar VAR_0x8006, 7 setdynamicwarp MAP_SILPH_CO_4F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 7 - goto_if_eq EventScript_1621E7 - call EventScript_1621EC + goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect + call SilphCo_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 7 - goto EventScript_1621E7 - -EventScript_1620CE:: @ 81620CE + goto SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_1620CF:: @ 81620CF +SilphCo_Elevator_EventScript_To5F:: @ 81620CF setvar VAR_0x8006, 8 setdynamicwarp MAP_SILPH_CO_5F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 8 - goto_if_eq EventScript_1621E7 - call EventScript_1621EC + goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect + call SilphCo_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 8 - goto EventScript_1621E7 - -EventScript_1620F6:: @ 81620F6 + goto SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_1620F7:: @ 81620F7 +SilphCo_Elevator_EventScript_To6F:: @ 81620F7 setvar VAR_0x8006, 9 setdynamicwarp MAP_SILPH_CO_6F, 255, 20, 3 compare VAR_ELEVATOR_FLOOR, 9 - goto_if_eq EventScript_1621E7 - call EventScript_1621EC + goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect + call SilphCo_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 9 - goto EventScript_1621E7 - -EventScript_16211E:: @ 816211E + goto SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_16211F:: @ 816211F +SilphCo_Elevator_EventScript_To7F:: @ 816211F setvar VAR_0x8006, 10 setdynamicwarp MAP_SILPH_CO_7F, 255, 23, 3 compare VAR_ELEVATOR_FLOOR, 10 - goto_if_eq EventScript_1621E7 - call EventScript_1621EC + goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect + call SilphCo_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 10 - goto EventScript_1621E7 - -EventScript_162146:: @ 8162146 + goto SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_162147:: @ 8162147 +SilphCo_Elevator_EventScript_To8F:: @ 8162147 setvar VAR_0x8006, 11 setdynamicwarp MAP_SILPH_CO_8F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 11 - goto_if_eq EventScript_1621E7 - call EventScript_1621EC + goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect + call SilphCo_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 11 - goto EventScript_1621E7 - -EventScript_16216E:: @ 816216E + goto SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_16216F:: @ 816216F +SilphCo_Elevator_EventScript_To9F:: @ 816216F setvar VAR_0x8006, 12 setdynamicwarp MAP_SILPH_CO_9F, 255, 24, 3 compare VAR_ELEVATOR_FLOOR, 12 - goto_if_eq EventScript_1621E7 - call EventScript_1621EC + goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect + call SilphCo_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 12 - goto EventScript_1621E7 - -EventScript_162196:: @ 8162196 + goto SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_162197:: @ 8162197 +SilphCo_Elevator_EventScript_To10F:: @ 8162197 setvar VAR_0x8006, 13 setdynamicwarp MAP_SILPH_CO_10F, 255, 13, 3 compare VAR_ELEVATOR_FLOOR, 13 - goto_if_eq EventScript_1621E7 - call EventScript_1621EC + goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect + call SilphCo_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 13 - goto EventScript_1621E7 - -EventScript_1621BE:: @ 81621BE + goto SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_1621BF:: @ 81621BF +SilphCo_Elevator_EventScript_To11F:: @ 81621BF setvar VAR_0x8006, 14 setdynamicwarp MAP_SILPH_CO_11F, 255, 13, 3 compare VAR_ELEVATOR_FLOOR, 14 - goto_if_eq EventScript_1621E7 - call EventScript_1621EC + goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect + call SilphCo_Elevator_EventScript_MoveElevator setvar VAR_ELEVATOR_FLOOR, 14 - goto EventScript_1621E7 - -EventScript_1621E6:: @ 81621E6 + goto SilphCo_Elevator_EventScript_ExitFloorSelect end -EventScript_1621E7:: @ 81621E7 +SilphCo_Elevator_EventScript_ExitFloorSelect:: @ 81621E7 special Special_CloseElevatorCurrentFloorWindow releaseall end -EventScript_1621EC:: @ 81621EC +SilphCo_Elevator_EventScript_MoveElevator:: @ 81621EC special Special_CloseElevatorCurrentFloorWindow closemessage waitse diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/TrainerTower_1F/map.json index 924dbbcba..925dbdd69 100644 --- a/data/maps/SevenIsland_TrainerTower_1F/map.json +++ b/data/maps/TrainerTower_1F/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F", - "name": "SevenIsland_TrainerTower_1F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F", + "id": "MAP_TRAINER_TOWER_1F", + "name": "TrainerTower_1F", + "layout": "LAYOUT_TRAINER_TOWER_1F", "music": "MUS_T_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_1F_EventScript_1646C8", + "script": "TrainerTower_EventScript_DoublesTrainer1", "flag": "FLAG_TEMP_2" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_1F_EventScript_1646CE", + "script": "TrainerTower_EventScript_SinglesTrainer", "flag": "FLAG_TEMP_3" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_1F_EventScript_1646D4", + "script": "TrainerTower_EventScript_KnockoutTrainer", "flag": "FLAG_TEMP_4" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_1F_EventScript_1646DA", + "script": "TrainerTower_EventScript_DoublesTrainer2", "flag": "FLAG_TEMP_5" } ], @@ -84,14 +84,14 @@ "x": 15, "y": 6, "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F", + "dest_map": "MAP_TRAINER_TOWER_2F", "dest_warp_id": 1 }, { "x": 4, "y": 6, "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", + "dest_map": "MAP_TRAINER_TOWER_LOBBY", "dest_warp_id": 0 } ], @@ -103,7 +103,7 @@ "elevation": 3, "var": "VAR_TEMP_E", "var_value": 0, - "script": "SevenIsland_TrainerTower_1F_EventScript_1C54AF" + "script": "TrainerTower_EventScript_SingleBattleTrigger" }, { "type": "trigger", @@ -112,7 +112,7 @@ "elevation": 0, "var": "VAR_TEMP_F", "var_value": 0, - "script": "SevenIsland_TrainerTower_1F_EventScript_1C54B4" + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" }, { "type": "trigger", @@ -121,7 +121,7 @@ "elevation": 3, "var": "VAR_TEMP_F", "var_value": 0, - "script": "SevenIsland_TrainerTower_1F_EventScript_1C54EA" + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" } ], "bg_events": [] diff --git a/data/maps/TrainerTower_1F/scripts.inc b/data/maps/TrainerTower_1F/scripts.inc new file mode 100644 index 000000000..77917c4a4 --- /dev/null +++ b/data/maps/TrainerTower_1F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_1F_MapScripts:: @ 81646B8 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ All Trainer Tower floors/roof share these scripts for their object events + +TrainerTower_EventScript_DoublesTrainer1:: @ 81646C8 + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_EventScript_SinglesTrainer:: @ 81646CE + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_EventScript_KnockoutTrainer:: @ 81646D4 + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_EventScript_DoublesTrainer2:: @ 81646DA + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_EventScript_Owner:: @ 81646E0 + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/TrainerTower_2F/map.json index 6d0fbaa4c..e2e2f4c97 100644 --- a/data/maps/SevenIsland_TrainerTower_2F/map.json +++ b/data/maps/TrainerTower_2F/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F", - "name": "SevenIsland_TrainerTower_2F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F", + "id": "MAP_TRAINER_TOWER_2F", + "name": "TrainerTower_2F", + "layout": "LAYOUT_TRAINER_TOWER_2F", "music": "MUS_T_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1646E0", + "script": "TrainerTower_EventScript_Owner", "flag": "FLAG_TEMP_6" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1646C8", + "script": "TrainerTower_EventScript_DoublesTrainer1", "flag": "FLAG_TEMP_2" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1646CE", + "script": "TrainerTower_EventScript_SinglesTrainer", "flag": "FLAG_TEMP_3" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1646D4", + "script": "TrainerTower_EventScript_KnockoutTrainer", "flag": "FLAG_TEMP_4" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1646DA", + "script": "TrainerTower_EventScript_DoublesTrainer2", "flag": "FLAG_TEMP_5" } ], @@ -84,21 +84,21 @@ "x": 15, "y": 6, "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F", + "dest_map": "MAP_TRAINER_TOWER_3F", "dest_warp_id": 1 }, { "x": 4, "y": 6, "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F", + "dest_map": "MAP_TRAINER_TOWER_1F", "dest_warp_id": 0 }, { "x": 13, "y": 5, "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", "dest_warp_id": 0 } ], @@ -110,7 +110,7 @@ "elevation": 3, "var": "VAR_TEMP_E", "var_value": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1C54AF" + "script": "TrainerTower_EventScript_SingleBattleTrigger" }, { "type": "trigger", @@ -119,7 +119,7 @@ "elevation": 3, "var": "VAR_TEMP_F", "var_value": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1C54B4" + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" }, { "type": "trigger", @@ -128,7 +128,7 @@ "elevation": 3, "var": "VAR_TEMP_F", "var_value": 0, - "script": "SevenIsland_TrainerTower_2F_EventScript_1C54EA" + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" } ], "bg_events": [] diff --git a/data/maps/TrainerTower_2F/scripts.inc b/data/maps/TrainerTower_2F/scripts.inc new file mode 100644 index 000000000..c34f36a34 --- /dev/null +++ b/data/maps/TrainerTower_2F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_2F_MapScripts:: @ 81646E6 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below scripts are unused, the identical versions in the 1F script are used instead + +TrainerTower_2F_EventScript_DoublesTrainer1:: @ 81646F6 + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_2F_EventScript_SinglesTrainer:: @ 81646FC + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_2F_EventScript_KnockoutTrainer:: @ 8164702 + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_2F_EventScript_DoublesTrainer2:: @ 8164708 + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_2F_EventScript_Owner:: @ 816470E + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/TrainerTower_3F/map.json index d4a021ff3..8db22b61d 100644 --- a/data/maps/SevenIsland_TrainerTower_4F/map.json +++ b/data/maps/TrainerTower_3F/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F", - "name": "SevenIsland_TrainerTower_4F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F", + "id": "MAP_TRAINER_TOWER_3F", + "name": "TrainerTower_3F", + "layout": "LAYOUT_TRAINER_TOWER_3F", "music": "MUS_T_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1646E0", + "script": "TrainerTower_EventScript_Owner", "flag": "FLAG_TEMP_6" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1646C8", + "script": "TrainerTower_EventScript_DoublesTrainer1", "flag": "FLAG_TEMP_2" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1646CE", + "script": "TrainerTower_EventScript_SinglesTrainer", "flag": "FLAG_TEMP_3" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1646D4", + "script": "TrainerTower_EventScript_KnockoutTrainer", "flag": "FLAG_TEMP_4" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1646DA", + "script": "TrainerTower_EventScript_DoublesTrainer2", "flag": "FLAG_TEMP_5" } ], @@ -84,21 +84,21 @@ "x": 15, "y": 6, "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F", + "dest_map": "MAP_TRAINER_TOWER_4F", "dest_warp_id": 1 }, { "x": 4, "y": 6, "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F", + "dest_map": "MAP_TRAINER_TOWER_2F", "dest_warp_id": 0 }, { "x": 13, "y": 5, "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", "dest_warp_id": 0 } ], @@ -110,7 +110,7 @@ "elevation": 3, "var": "VAR_TEMP_E", "var_value": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1C54AF" + "script": "TrainerTower_EventScript_SingleBattleTrigger" }, { "type": "trigger", @@ -119,7 +119,7 @@ "elevation": 3, "var": "VAR_TEMP_F", "var_value": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1C54B4" + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" }, { "type": "trigger", @@ -128,7 +128,7 @@ "elevation": 3, "var": "VAR_TEMP_F", "var_value": 0, - "script": "SevenIsland_TrainerTower_4F_EventScript_1C54EA" + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" } ], "bg_events": [] diff --git a/data/maps/TrainerTower_3F/scripts.inc b/data/maps/TrainerTower_3F/scripts.inc new file mode 100644 index 000000000..0c8d434eb --- /dev/null +++ b/data/maps/TrainerTower_3F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_3F_MapScripts:: @ 8164714 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below scripts are unused, the identical versions in the 1F script are used instead + +TrainerTower_3F_EventScript_DoublesTrainer1:: @ 8164724 + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_3F_EventScript_SinglesTrainer:: @ 816472A + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_3F_EventScript_KnockoutTrainer:: @ 8164730 + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_3F_EventScript_DoublesTrainer2:: @ 8164736 + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_3F_EventScript_Owner:: @ 816473C + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/TrainerTower_4F/map.json index 780878898..32c868e91 100644 --- a/data/maps/SevenIsland_TrainerTower_3F/map.json +++ b/data/maps/TrainerTower_4F/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F", - "name": "SevenIsland_TrainerTower_3F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F", + "id": "MAP_TRAINER_TOWER_4F", + "name": "TrainerTower_4F", + "layout": "LAYOUT_TRAINER_TOWER_4F", "music": "MUS_T_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1646E0", + "script": "TrainerTower_EventScript_Owner", "flag": "FLAG_TEMP_6" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1646C8", + "script": "TrainerTower_EventScript_DoublesTrainer1", "flag": "FLAG_TEMP_2" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1646CE", + "script": "TrainerTower_EventScript_SinglesTrainer", "flag": "FLAG_TEMP_3" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1646D4", + "script": "TrainerTower_EventScript_KnockoutTrainer", "flag": "FLAG_TEMP_4" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1646DA", + "script": "TrainerTower_EventScript_DoublesTrainer2", "flag": "FLAG_TEMP_5" } ], @@ -84,21 +84,21 @@ "x": 15, "y": 6, "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F", + "dest_map": "MAP_TRAINER_TOWER_5F", "dest_warp_id": 1 }, { "x": 4, "y": 6, "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F", + "dest_map": "MAP_TRAINER_TOWER_3F", "dest_warp_id": 0 }, { "x": 13, "y": 5, "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", "dest_warp_id": 0 } ], @@ -110,7 +110,7 @@ "elevation": 3, "var": "VAR_TEMP_E", "var_value": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1C54AF" + "script": "TrainerTower_EventScript_SingleBattleTrigger" }, { "type": "trigger", @@ -119,7 +119,7 @@ "elevation": 3, "var": "VAR_TEMP_F", "var_value": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1C54B4" + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" }, { "type": "trigger", @@ -128,7 +128,7 @@ "elevation": 3, "var": "VAR_TEMP_F", "var_value": 0, - "script": "SevenIsland_TrainerTower_3F_EventScript_1C54EA" + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" } ], "bg_events": [] diff --git a/data/maps/TrainerTower_4F/scripts.inc b/data/maps/TrainerTower_4F/scripts.inc new file mode 100644 index 000000000..6e0e7e09f --- /dev/null +++ b/data/maps/TrainerTower_4F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_4F_MapScripts:: @ 8164742 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below scripts are unused, the identical versions in the 1F script are used instead + +TrainerTower_4F_EventScript_DoublesTrainer1:: @ 8164752 + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_4F_EventScript_SinglesTrainer:: @ 8164758 + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_4F_EventScript_KnockoutTrainer:: @ 816475E + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_4F_EventScript_DoublesTrainer2:: @ 8164764 + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_4F_EventScript_Owner:: @ 816476A + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/TrainerTower_5F/map.json index 1ee41e1b4..7a32b597c 100644 --- a/data/maps/SevenIsland_TrainerTower_5F/map.json +++ b/data/maps/TrainerTower_5F/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F", - "name": "SevenIsland_TrainerTower_5F", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F", + "id": "MAP_TRAINER_TOWER_5F", + "name": "TrainerTower_5F", + "layout": "LAYOUT_TRAINER_TOWER_5F", "music": "MUS_T_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1646E0", + "script": "TrainerTower_EventScript_Owner", "flag": "FLAG_TEMP_6" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1646C8", + "script": "TrainerTower_EventScript_DoublesTrainer1", "flag": "FLAG_TEMP_2" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1646CE", + "script": "TrainerTower_EventScript_SinglesTrainer", "flag": "FLAG_TEMP_3" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1646D4", + "script": "TrainerTower_EventScript_KnockoutTrainer", "flag": "FLAG_TEMP_4" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1646DA", + "script": "TrainerTower_EventScript_DoublesTrainer2", "flag": "FLAG_TEMP_5" } ], @@ -84,21 +84,21 @@ "x": 15, "y": 6, "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F", + "dest_map": "MAP_TRAINER_TOWER_6F", "dest_warp_id": 1 }, { "x": 4, "y": 6, "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F", + "dest_map": "MAP_TRAINER_TOWER_4F", "dest_warp_id": 0 }, { "x": 13, "y": 5, "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", "dest_warp_id": 0 } ], @@ -110,7 +110,7 @@ "elevation": 3, "var": "VAR_TEMP_E", "var_value": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1C54AF" + "script": "TrainerTower_EventScript_SingleBattleTrigger" }, { "type": "trigger", @@ -119,7 +119,7 @@ "elevation": 3, "var": "VAR_TEMP_F", "var_value": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1C54B4" + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" }, { "type": "trigger", @@ -128,7 +128,7 @@ "elevation": 3, "var": "VAR_TEMP_F", "var_value": 0, - "script": "SevenIsland_TrainerTower_5F_EventScript_1C54EA" + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" } ], "bg_events": [] diff --git a/data/maps/TrainerTower_5F/scripts.inc b/data/maps/TrainerTower_5F/scripts.inc new file mode 100644 index 000000000..71af237be --- /dev/null +++ b/data/maps/TrainerTower_5F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_5F_MapScripts:: @ 8164770 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below scripts are unused, the identical versions in the 1F script are used instead + +TrainerTower_5F_EventScript_DoublesTrainer1:: @ 8164780 + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_5F_EventScript_SinglesTrainer:: @ 8164786 + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_5F_EventScript_KnockoutTrainer:: @ 816478C + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_5F_EventScript_DoublesTrainer2:: @ 8164792 + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_5F_EventScript_Owner:: @ 8164798 + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/TrainerTower_6F/map.json b/data/maps/TrainerTower_6F/map.json new file mode 100644 index 000000000..05491cf05 --- /dev/null +++ b/data/maps/TrainerTower_6F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_TRAINER_TOWER_6F", + "name": "TrainerTower_6F", + "layout": "LAYOUT_TRAINER_TOWER_6F", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_Owner", + "flag": "FLAG_TEMP_6" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer1", + "flag": "FLAG_TEMP_2" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_SinglesTrainer", + "flag": "FLAG_TEMP_3" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_KnockoutTrainer", + "flag": "FLAG_TEMP_4" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer2", + "flag": "FLAG_TEMP_5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_7F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_5F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_E", + "var_value": 0, + "script": "TrainerTower_EventScript_SingleBattleTrigger" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" + } + ], + "bg_events": [] +} diff --git a/data/maps/TrainerTower_6F/scripts.inc b/data/maps/TrainerTower_6F/scripts.inc new file mode 100644 index 000000000..8b9e1dd38 --- /dev/null +++ b/data/maps/TrainerTower_6F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_6F_MapScripts:: @ 816479E + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below scripts are unused, the identical versions in the 1F script are used instead + +TrainerTower_6F_EventScript_DoublesTrainer1:: @ 81647AE + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_6F_EventScript_SinglesTrainer:: @ 81647B4 + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_6F_EventScript_KnockoutTrainer:: @ 81647BA + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_6F_EventScript_DoublesTrainer2:: @ 81647C0 + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_6F_EventScript_Owner:: @ 81647C6 + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/TrainerTower_7F/map.json b/data/maps/TrainerTower_7F/map.json new file mode 100644 index 000000000..76f2a53f4 --- /dev/null +++ b/data/maps/TrainerTower_7F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_TRAINER_TOWER_7F", + "name": "TrainerTower_7F", + "layout": "LAYOUT_TRAINER_TOWER_7F", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_Owner", + "flag": "FLAG_TEMP_6" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer1", + "flag": "FLAG_TEMP_2" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_SinglesTrainer", + "flag": "FLAG_TEMP_3" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_KnockoutTrainer", + "flag": "FLAG_TEMP_4" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer2", + "flag": "FLAG_TEMP_5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_8F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_6F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_E", + "var_value": 0, + "script": "TrainerTower_EventScript_SingleBattleTrigger" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" + } + ], + "bg_events": [] +} diff --git a/data/maps/TrainerTower_7F/scripts.inc b/data/maps/TrainerTower_7F/scripts.inc new file mode 100644 index 000000000..de47276ca --- /dev/null +++ b/data/maps/TrainerTower_7F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_7F_MapScripts:: @ 81647CC + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below scripts are unused, the identical versions in the 1F script are used instead + +TrainerTower_7F_EventScript_DoublesTrainer1:: @ 81647DC + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_7F_EventScript_SinglesTrainer:: @ 81647E2 + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_7F_EventScript_KnockoutTrainer:: @ 81647E8 + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_7F_EventScript_DoublesTrainer2:: @ 81647EE + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_7F_EventScript_Owner:: @ 81647F4 + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/TrainerTower_8F/map.json b/data/maps/TrainerTower_8F/map.json new file mode 100644 index 000000000..26cabfb06 --- /dev/null +++ b/data/maps/TrainerTower_8F/map.json @@ -0,0 +1,135 @@ +{ + "id": "MAP_TRAINER_TOWER_8F", + "name": "TrainerTower_8F", + "layout": "LAYOUT_TRAINER_TOWER_8F", + "music": "MUS_T_TOWER", + "region_map_section": "MAPSEC_TRAINER_TOWER_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 2, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_Owner", + "flag": "FLAG_TEMP_6" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer1", + "flag": "FLAG_TEMP_2" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_SinglesTrainer", + "flag": "FLAG_TEMP_3" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_KnockoutTrainer", + "flag": "FLAG_TEMP_4" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerTower_EventScript_DoublesTrainer2", + "flag": "FLAG_TEMP_5" + } + ], + "warp_events": [ + { + "x": 15, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_ROOF", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_TOWER_7F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_E", + "var_value": 0, + "script": "TrainerTower_EventScript_SingleBattleTrigger" + }, + { + "type": "trigger", + "x": 9, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" + }, + { + "type": "trigger", + "x": 9, + "y": 13, + "elevation": 3, + "var": "VAR_TEMP_F", + "var_value": 0, + "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" + } + ], + "bg_events": [] +} diff --git a/data/maps/TrainerTower_8F/scripts.inc b/data/maps/TrainerTower_8F/scripts.inc new file mode 100644 index 000000000..fc168780b --- /dev/null +++ b/data/maps/TrainerTower_8F/scripts.inc @@ -0,0 +1,27 @@ +TrainerTower_8F_MapScripts:: @ 81647FA + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below scripts are unused, the identical versions in the 1F script are used instead + +TrainerTower_8F_EventScript_DoublesTrainer1:: @ 816480A + call TrainerTower_EventScript_SpeakToDoublesTrainer1 + end + +TrainerTower_8F_EventScript_SinglesTrainer:: @ 8164810 + call TrainerTower_EventScript_SpeakToSinglesTrainer + end + +TrainerTower_8F_EventScript_KnockoutTrainer:: @ 8164816 + call TrainerTower_EventScript_SpeakToKnockoutTrainer + end + +TrainerTower_8F_EventScript_DoublesTrainer2:: @ 816481C + call TrainerTower_EventScript_SpeakToDoublesTrainer2 + end + +TrainerTower_8F_EventScript_Owner:: @ 8164822 + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/map.json b/data/maps/TrainerTower_Elevator/map.json index fef686312..7d004c2df 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/map.json +++ b/data/maps/TrainerTower_Elevator/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", - "name": "SevenIsland_TrainerTower_Elevator", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "id": "MAP_TRAINER_TOWER_ELEVATOR", + "name": "TrainerTower_Elevator", + "layout": "LAYOUT_TRAINER_TOWER_ELEVATOR", "music": "MUS_T_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, @@ -29,7 +29,7 @@ "x": 0, "y": 2, "elevation": 0, - "script": "SevenIsland_TrainerTower_Elevator_EventScript_164B03" + "script": "TrainerTower_Elevator_EventScript_FloorSelect" } ] } diff --git a/data/maps/TrainerTower_Elevator/scripts.inc b/data/maps/TrainerTower_Elevator/scripts.inc new file mode 100644 index 000000000..349667102 --- /dev/null +++ b/data/maps/TrainerTower_Elevator/scripts.inc @@ -0,0 +1,80 @@ +TrainerTower_Elevator_MapScripts:: @ 8164AF8 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +TrainerTower_Elevator_EventScript_FloorSelect:: @ 8164B03 + lockall + setvar VAR_0x8004, 6 + call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor + copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR + special Special_DrawElevatorCurrentFloorWindow + message Text_WantWhichFloor + waitmessage + setvar VAR_0x8004, 6 + specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos + switch VAR_RESULT + case 0, TrainerTower_Elevator_EventScript_FloorSelectFromRoof + case 1, TrainerTower_Elevator_EventScript_FloorSelectFromLobby + end + +TrainerTower_Elevator_EventScript_FloorSelectFromRoof:: @ 8164B46 + multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 0, FALSE + goto TrainerTower_Elevator_EventScript_ChooseFloor + end + +TrainerTower_Elevator_EventScript_FloorSelectFromLobby:: @ 8164B52 + multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 1, FALSE + goto TrainerTower_Elevator_EventScript_ChooseFloor + end + +TrainerTower_Elevator_EventScript_ChooseFloor:: @ 8164B5E + switch VAR_RESULT + case 0, TrainerTower_Elevator_EventScript_SelectRoof + case 1, TrainerTower_Elevator_EventScript_SelectLobby + case 2, TrainerTower_Elevator_EventScript_CloseFloorSelect + case SCR_MENU_CANCEL, TrainerTower_Elevator_EventScript_CloseFloorSelect + end + +TrainerTower_Elevator_EventScript_SelectLobby:: @ 8164B90 + setvar VAR_0x8006, 3 + setdynamicwarp MAP_TRAINER_TOWER_LOBBY, 255, 17, 8 + compare VAR_ELEVATOR_FLOOR, 3 + goto_if_eq TrainerTower_Elevator_EventScript_CloseFloorSelect + call TrainerTower_Elevator_EventScript_MoveElevator + setvar VAR_ELEVATOR_FLOOR, 3 + special Special_CloseElevatorCurrentFloorWindow + delay 25 + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Elevator_Movement_ExitElevator + waitmovement 0 + warp MAP_TRAINER_TOWER_LOBBY, 255, 17, 8 + waitstate + releaseall + end + +TrainerTower_Elevator_EventScript_SelectRoof:: @ 8164BCD + goto TrainerTower_Elevator_EventScript_CloseFloorSelect + end + +TrainerTower_Elevator_EventScript_CloseFloorSelect:: @ 8164BD3 + special Special_CloseElevatorCurrentFloorWindow + releaseall + end + +TrainerTower_Elevator_EventScript_MoveElevator:: @ 8164BD8 + special Special_CloseElevatorCurrentFloorWindow + closemessage + waitse + special Special_AnimateElevator + waitstate + setflag FLAG_TEMP_2 + return + +TrainerTower_Elevator_Movement_ExitElevator:: @ 8164BE5 + walk_in_place_fastest_down + delay_16 + walk_down + walk_right + walk_right + walk_down + step_end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json index 3f553ce47..23e8456c0 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/map.json +++ b/data/maps/TrainerTower_Lobby/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", - "name": "SevenIsland_TrainerTower_Lobby", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY", + "id": "MAP_TRAINER_TOWER_LOBBY", + "name": "TrainerTower_Lobby", + "layout": "LAYOUT_TRAINER_TOWER_LOBBY", "music": "MUS_T_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_Lobby_EventScript_16495D", + "script": "TrainerTower_Lobby_EventScript_Nurse", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_Lobby_EventScript_164992", + "script": "TrainerTower_Lobby_EventScript_MartClerk", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_Lobby_EventScript_164966", + "script": "TrainerTower_Lobby_EventScript_Receptionist", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AE6", + "script": "TrainerTower_Lobby_EventScript_CooltrainerF", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AEF", + "script": "TrainerTower_Lobby_EventScript_BaldingMan", "flag": "0" } ], @@ -84,7 +84,7 @@ "x": 9, "y": 2, "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F", + "dest_map": "MAP_TRAINER_TOWER_1F", "dest_warp_id": 1 }, { @@ -98,7 +98,7 @@ "x": 17, "y": 8, "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", "dest_warp_id": 0 } ], @@ -110,7 +110,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_TRAINER_TOWER", "var_value": 0, - "script": "SevenIsland_TrainerTower_Lobby_EventScript_1649CE" + "script": "TrainerTower_Lobby_EventScript_EntryTrigger" } ], "bg_events": [ @@ -119,7 +119,7 @@ "x": 8, "y": 10, "elevation": 0, - "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AD8" + "script": "TrainerTower_Lobby_EventScript_ShowRecords" } ] } diff --git a/data/maps/TrainerTower_Lobby/scripts.inc b/data/maps/TrainerTower_Lobby/scripts.inc new file mode 100644 index 000000000..0fc2422b6 --- /dev/null +++ b/data/maps/TrainerTower_Lobby/scripts.inc @@ -0,0 +1,226 @@ +TrainerTower_Lobby_MapScripts:: @ 8164839 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_Lobby_OnResume + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerTower_Lobby_OnReturnToField + map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_Lobby_OnTransition + map_script MAP_SCRIPT_ON_LOAD, TrainerTower_Lobby_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_Lobby_OnFrame + .byte 0 + +TrainerTower_Lobby_OnResume:: @ 8164853 + setvar VAR_TEMP_2, 0 + ttower_resumetimer + ttower_shouldexit + compare VAR_RESULT, FALSE + goto_if_eq TrainerTower_Lobby_OnResumeEnd + @ Never reached, above always FALSE + setvar VAR_TEMP_0, 0 + setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7 + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist +TrainerTower_Lobby_OnResumeEnd:: @ 8164886 + end + +TrainerTower_Lobby_OnReturnToField:: @ 8164887 + addobject 1 + addobject 2 + addobject 3 + addobject 4 + addobject 5 + end + +TrainerTower_Lobby_OnLoad:: @ 8164897 + compare VAR_TEMP_D, 17 + call_if_eq TrainerTower_Lobby_OpenCounterBarrier + end + +TrainerTower_Lobby_OpenCounterBarrier:: @ 81648A3 + setmetatile 17, 10, METATILE_TrainerTower_Floor_ShadeBottomLeft, 0 + return + +TrainerTower_Lobby_OnTransition:: @ 81648AD + setworldmapflag FLAG_WORLD_MAP_TRAINER_TOWER_LOBBY + getplayerxy VAR_TEMP_D, VAR_RESULT + end + +TrainerTower_Lobby_OnFrame:: @ 81648B6 + map_script_2 VAR_TEMP_0, 0, TrainerTower_Lobby_EventScript_Enter + map_script_2 VAR_TEMP_D, 17, TrainerTower_Lobby_EventScript_ExitElevator + .2byte 0 + +TrainerTower_Lobby_EventScript_ExitElevator:: @ 81648C8 + lockall + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_ExitElevator + waitmovement 0 + setmetatile 17, 10, METATILE_TrainerTower_CounterBarrier, 1 + special DrawWholeMapView + playse SE_TK_KASYA + waitse + setvar VAR_TEMP_D, 0 + releaseall + end + +TrainerTower_Lobby_Movement_ExitElevator:: @ 81648EA + walk_down + walk_down + step_end + +TrainerTower_Lobby_EventScript_Enter:: @ 81648ED + setvar VAR_TEMP_0, 1 + ttower_getchallengestatus + switch VAR_RESULT + case CHALLENGE_STATUS_LOST, TrainerTower_Lobby_EventScript_LostChallenge + case CHALLENGE_STATUS_UNK, TrainerTower_Lobby_EventScript_164938 + case CHALLENGE_STATUS_NORMAL, TrainerTower_Lobby_EventScript_EnterEnd + +TrainerTower_Lobby_EventScript_LostChallenge:: @ 8164920 + lock + faceplayer + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist + textcolor 1 + msgbox TrainerTower_Lobby_Text_TooBadComeBackTryAgain + goto TrainerTower_Lobby_EventScript_ExitChallenge + +@ Presumably E-Reader related +TrainerTower_Lobby_EventScript_164938:: @ 8164938 + lock + faceplayer + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist + textcolor 1 + msgbox TrainerTower_Lobby_Text_MoveCounterHereWhenTrainersSwitch +TrainerTower_Lobby_EventScript_ExitChallenge:: @ 816494B + closemessage + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_WalkDown + waitmovement 0 + setvar VAR_MAP_SCENE_TRAINER_TOWER, 0 + release +TrainerTower_Lobby_EventScript_EnterEnd:: @ 816495C + end + +TrainerTower_Lobby_EventScript_Nurse:: @ 816495D + lock + faceplayer + call EventScript_PkmnCenterNurse + release + end + +TrainerTower_Lobby_EventScript_Receptionist:: @ 8164966 + lock + faceplayer + ttower_getbeatchallenge + compare VAR_RESULT, TRUE + goto_if_eq TrainerTower_Lobby_EventScript_ThanksForCompeting + msgbox TrainerTower_Lobby_Text_GiveItYourBest + goto TrainerTower_Lobby_EventScript_ReceptionistEnd + +TrainerTower_Lobby_EventScript_ThanksForCompeting:: @ 8164988 + msgbox TrainerTower_Lobby_Text_ThanksForCompeting +TrainerTower_Lobby_EventScript_ReceptionistEnd:: @ 8164990 + release + end + +TrainerTower_Lobby_EventScript_MartClerk:: @ 8164992 + goto_if_questlog EventScript_ReleaseEnd + lock + faceplayer + message Text_MayIHelpYou + waitmessage + pokemart TrainerTower_Lobby_Mart_Items + msgbox Text_PleaseComeAgain + release + end + + .align 2 +TrainerTower_Lobby_Mart_Items:: @ 81649B8 + .2byte ITEM_ULTRA_BALL + .2byte ITEM_GREAT_BALL + .2byte ITEM_FULL_RESTORE + .2byte ITEM_MAX_POTION + .2byte ITEM_HYPER_POTION + .2byte ITEM_REVIVE + .2byte ITEM_FULL_HEAL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_MAX_REPEL + .2byte ITEM_NONE + release + end + +TrainerTower_Lobby_EventScript_EntryTrigger:: @ 81649CE + lockall + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist + textcolor 1 + msgbox TrainerTower_Lobby_Text_WelcomeToTrainerTower + ttower_getnumfloors + compare VAR_RESULT, FALSE + goto_if_eq TrainerTower_Lobby_EventScript_AllFloorsUsed + msgbox TrainerTower_Lobby_Text_TrainersUpToFloorNum + goto TrainerTower_Lobby_EventScript_AskEnterChallenge + +TrainerTower_Lobby_EventScript_AllFloorsUsed:: @ 8164A00 + msgbox TrainerTower_Lobby_Text_TrainersUpEighthFloor +TrainerTower_Lobby_EventScript_AskEnterChallenge:: @ 8164A08 + message TrainerTower_Lobby_Text_LikeToChallengeTrainers + waitmessage + multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE + switch VAR_RESULT + case 0, TrainerTower_Lobby_EventScript_ChooseChallenge + case 1, TrainerTower_Lobby_EventScript_DeclineChallenge + case 2, TrainerTower_Lobby_EventScript_ChallengeInfo + case SCR_MENU_CANCEL, TrainerTower_Lobby_EventScript_DeclineChallenge + end + +TrainerTower_Lobby_EventScript_ChallengeInfo:: @ 8164A45 + msgbox TrainerTower_Lobby_Text_ExplainTrainerTower + goto TrainerTower_Lobby_EventScript_AskEnterChallenge + end + +TrainerTower_Lobby_EventScript_ChooseChallenge:: @ 8164A53 + multichoice 13, 3, MULTICHOICE_TRAINER_TOWER_MODE, FALSE + switch VAR_RESULT + case 0, TrainerTower_Lobby_EventScript_BeginChallenge + case 1, TrainerTower_Lobby_EventScript_BeginChallenge + case 2, TrainerTower_Lobby_EventScript_BeginChallenge + case 3, TrainerTower_Lobby_EventScript_BeginChallenge + case 4, TrainerTower_Lobby_EventScript_DeclineChallenge + case SCR_MENU_CANCEL, TrainerTower_Lobby_EventScript_DeclineChallenge + end + +TrainerTower_Lobby_EventScript_BeginChallenge:: @ 8164AA0 + copyvar VAR_0x8005, VAR_RESULT + setvar VAR_MAP_SCENE_TRAINER_TOWER, 1 + special HealPlayerParty + msgbox TrainerTower_Lobby_Text_StartClockGetSetGo + ttower_startchallenge + releaseall + end + +TrainerTower_Lobby_EventScript_DeclineChallenge:: @ 8164ABF + msgbox TrainerTower_Lobby_Text_PleaseVisitUsAgain + closemessage + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_WalkDown + waitmovement 0 + releaseall + end + +TrainerTower_Lobby_Movement_FaceReceptionist:: @ 8164AD4 + face_right + step_end + +TrainerTower_Lobby_Movement_WalkDown:: @ 8164AD6 + walk_down + step_end + +TrainerTower_Lobby_EventScript_ShowRecords:: @ 8164AD8 + lockall + fadescreen FADE_TO_BLACK + setvar VAR_0x8004, 1 + special Special_BattleRecords + waitstate + releaseall + end + +TrainerTower_Lobby_EventScript_CooltrainerF:: @ 8164AE6 + msgbox TrainerTower_Lobby_Text_WonderWhatKindsOfTrainers, MSGBOX_NPC + end + +TrainerTower_Lobby_EventScript_BaldingMan:: @ 8164AEF + msgbox TrainerTower_Lobby_Text_StairsTougherThanAnyBattle, MSGBOX_NPC + end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/text.inc b/data/maps/TrainerTower_Lobby/text.inc index bf1e73b91..4e6bb8b07 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/text.inc +++ b/data/maps/TrainerTower_Lobby/text.inc @@ -1,50 +1,52 @@ -gUnknown_817C794:: @ 817C794 +@ All Trainer Tower text (Lobby and Roof) is interleaved here + +TrainerTower_Lobby_Text_WelcomeToTrainerTower:: @ 817C794 .string "Hello!\p" .string "Welcome to TRAINER TOWER where\n" .string "TRAINERS gather from all over!$" -gUnknown_817C7D9:: @ 817C7D9 +TrainerTower_Lobby_Text_TrainersUpToFloorNum:: @ 817C7D9 .string "TRAINERS from all over the world\n" .string "gather here to battle.\p" .string "Let me see…\p" .string "Right now, there are TRAINERS only\n" .string "up to Floor {STR_VAR_1}.$" -gUnknown_817C850:: @ 817C850 +TrainerTower_Lobby_Text_TrainersUpEighthFloor:: @ 817C850 .string "TRAINERS are awaiting your\n" .string "challenge up to the eighth floor.$" -Text_17C88D:: @ 817C88D +TrainerTower_Lobby_Text_LikeToChallengeTrainers:: @ 817C88D .string "Would you like to challenge the\n" .string "waiting TRAINERS?$" -gUnknown_817C8BF:: @ 817C8BF +TrainerTower_Lobby_Text_StartClockGetSetGo:: @ 817C8BF .string "Okay, I'll get the clock started,\n" .string "so give it everything you have.\p" .string "On your marks…\p" .string "Get set…\p" .string "Go!$" -gUnknown_817C91D:: @ 817C91D +TrainerTower_Lobby_Text_PleaseVisitUsAgain:: @ 817C91D .string "Please do visit us again!$" -gUnknown_817C937:: @ 817C937 +TrainerTower_Lobby_Text_TooBadComeBackTryAgain:: @ 817C937 .string "That was too bad.\p" .string "I think you put in a tremendous\n" .string "effort in your battling.\p" .string "Please come back and try again!$" -gUnknown_817C9A2:: @ 817C9A2 +TrainerTower_Lobby_Text_GiveItYourBest:: @ 817C9A2 .string "I hope you give it your best.$" -gUnknown_817C9C0:: @ 817C9C0 +TrainerTower_Lobby_Text_MoveCounterHereWhenTrainersSwitch:: @ 817C9C0 .string "When the TRAINERS switch places,\n" .string "the movement can be hectic.\p" .string "To avoid the stampede, we moved\n" .string "the reception counter here.\p" .string "I'm sorry for the inconvenience.$" -Text_17CA5A:: @ 817CA5A +TrainerTower_Roof_Text_ImOwnerBattledPerfectly:: @ 817CA5A .string "Hello…\p" .string "I am the owner of this TOWER…\p" .string "How the sky soars above this\n" @@ -54,10 +56,10 @@ Text_17CA5A:: @ 817CA5A .string "The way you battled…\n" .string "It, too, was perfection…$" -Text_17CB09:: @ 817CB09 +TrainerTower_Roof_Text_ThisIsForYou:: @ 817CB09 .string "This is for you…$" -Text_17CB1A:: @ 817CB1A +TrainerTower_Roof_Text_DoneItInRecordTime:: @ 817CB1A .string "Oh!\n" .string "Stupendous!\p" .string "It's marvelous how you've come up\n" @@ -67,28 +69,28 @@ Text_17CB1A:: @ 817CB1A .string "I'll have your record posted at\n" .string "the reception counter.$" -Text_17CBC0:: @ 817CBC0 +TrainerTower_Roof_Text_TookSweetTimeGettingHere:: @ 817CBC0 .string "You seem to have taken your sweet\n" .string "time getting here…$" -Text_17CBF5:: @ 817CBF5 +TrainerTower_Roof_Text_IdLikeToSeeBetterTime:: @ 817CBF5 .string "What I would like to see is a\n" .string "better time out of you…\p" .string "I'm counting on you.\p" .string "Until then, farewell…$" -Text_17CC56:: @ 817CC56 +TrainerTower_Text_XMinYZSec:: @ 817CC56 .string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$" -Text_17CC69:: @ 817CC69 +TrainerTower_Lobby_Text_HereAreTheResults:: @ 817CC69 .string "せいせきひょうです$" -Text_17CC73:: @ 817CC73 +TrainerTower_Lobby_Text_NeedTwoMonsForDouble:: @ 817CC73 .string "This is a two-on-two battle.\p" .string "You may not battle unless you have\n" .string "at least two POKéMON.$" -gUnknown_817CCC9:: @ 817CCC9 +TrainerTower_Lobby_Text_ExplainTrainerTower:: @ 817CCC9 .string "Here at TRAINER TOWER, there is an\n" .string "event called TIME ATTACK.\p" .string "You will be timed on how quickly\n" @@ -101,16 +103,16 @@ gUnknown_817CCC9:: @ 817CCC9 .string "You will not earn any EXP. Points\n" .string "or money by beating TRAINERS here.$" -gUnknown_817CE1F:: @ 817CE1F +TrainerTower_Lobby_Text_ThanksForCompeting:: @ 817CE1F .string "Thank you for competing!$" -gUnknown_817CE38:: @ 817CE38 +TrainerTower_Lobby_Text_WonderWhatKindsOfTrainers:: @ 817CE38 .string "I'm here to see how good I am.\p" .string "I wonder what kinds of TRAINERS\n" .string "are waiting for me?\p" .string "It's nerve-racking!$" -gUnknown_817CE9F:: @ 817CE9F +TrainerTower_Lobby_Text_StairsTougherThanAnyBattle:: @ 817CE9F .string "Gasp, gasp…\n" .string "Gasp…\p" .string "Never mind battling! These stairs…\n" diff --git a/data/maps/SevenIsland_TrainerTower_Roof/map.json b/data/maps/TrainerTower_Roof/map.json index ee3dbe4c0..c9a98a144 100644 --- a/data/maps/SevenIsland_TrainerTower_Roof/map.json +++ b/data/maps/TrainerTower_Roof/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF", - "name": "SevenIsland_TrainerTower_Roof", - "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF", + "id": "MAP_TRAINER_TOWER_ROOF", + "name": "TrainerTower_Roof", + "layout": "LAYOUT_TRAINER_TOWER_ROOF", "music": "MUS_T_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_TrainerTower_Roof_EventScript_1646E0", + "script": "TrainerTower_EventScript_Owner", "flag": "FLAG_TEMP_6" } ], @@ -32,14 +32,14 @@ "x": 13, "y": 5, "elevation": 0, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR", + "dest_map": "MAP_TRAINER_TOWER_ELEVATOR", "dest_warp_id": 0 }, { "x": 4, "y": 6, "elevation": 3, - "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F", + "dest_map": "MAP_TRAINER_TOWER_8F", "dest_warp_id": 0 } ], diff --git a/data/maps/TrainerTower_Roof/scripts.inc b/data/maps/TrainerTower_Roof/scripts.inc new file mode 100644 index 000000000..b338e3a62 --- /dev/null +++ b/data/maps/TrainerTower_Roof/scripts.inc @@ -0,0 +1,10 @@ +TrainerTower_Roof_MapScripts:: @ 8164828 + map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame + .byte 0 + +@ Below script is unused, the identical version in the 1F script is used instead + +TrainerTower_Roof_EventScript_Owner:: @ 8164833 + call TrainerTower_EventScript_SpeakToOwner + end diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 05f1cd544..5417adaa1 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -178,17 +178,17 @@ ], "gMapGroup2": [ "NavelRock_Exterior", - "SevenIsland_TrainerTower_1F", - "SevenIsland_TrainerTower_2F", - "SevenIsland_TrainerTower_3F", - "SevenIsland_TrainerTower_4F", - "SevenIsland_TrainerTower_5F", - "SevenIsland_TrainerTower_6F", - "SevenIsland_TrainerTower_7F", - "SevenIsland_TrainerTower_8F", - "SevenIsland_TrainerTower_Roof", - "SevenIsland_TrainerTower_Lobby", - "SevenIsland_TrainerTower_Elevator", + "TrainerTower_1F", + "TrainerTower_2F", + "TrainerTower_3F", + "TrainerTower_4F", + "TrainerTower_5F", + "TrainerTower_6F", + "TrainerTower_7F", + "TrainerTower_8F", + "TrainerTower_Roof", + "TrainerTower_Lobby", + "TrainerTower_Elevator", "FiveIsland_LostCave_Entrance", "FiveIsland_LostCave_Room1", "FiveIsland_LostCave_Room2", @@ -409,15 +409,15 @@ "IndigoPlateau_PokemonCenter_2F" ], "gMapGroup14": [ - "SaffronCity_House1_1F", - "SaffronCity_House1_2F", + "SaffronCity_CopycatsHouse_1F", + "SaffronCity_CopycatsHouse_2F", "SaffronCity_Dojo", "SaffronCity_Gym", - "SaffronCity_House2", + "SaffronCity_House", "SaffronCity_Mart", "SaffronCity_PokemonCenter_1F", "SaffronCity_PokemonCenter_2F", - "SaffronCity_House3", + "SaffronCity_MrPsychicsHouse", "SaffronCity_PokemonTrainerFanClub" ], "gMapGroup15": [ diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index 36383bfb8..81e732d12 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -43,11 +43,11 @@ Route4_EventScript_1ACDEA:: @ 81ACDEA release end -MtMoon_1F_EventScript_1ACE03:: @ 81ACE03 +MtMoon_1F_EventScript_BaldingMan:: @ 81ACE03 lock faceplayer famechecker FAMECHECKER_BROCK, 4 - msgbox Text_172B00 + msgbox MtMoon_1F_Text_BrockHelpsExcavateFossils release end @@ -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 @@ -118,12 +118,12 @@ SafariZone_North_RestHouse_EventScript_BaldingMan:: @ 81ACED3 release end -SaffronCity_PokemonCenter_1F_EventScript_1ACEEC:: @ 81ACEEC +SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina:: @ 81ACEEC lock faceplayer famechecker FAMECHECKER_SABRINA, 4 textcolor 3 - msgbox gUnknown_81B1753 + msgbox PokemonJournal_Text_SpecialFeatureSabrina release end @@ -160,12 +160,12 @@ FiveIsland_PokemonCenter_1F_EventScript_1ACF5F:: @ 81ACF5F release end -SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A:: @ 81ACF7A +SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno:: @ 81ACF7A lock faceplayer famechecker FAMECHECKER_BRUNO, 2 textcolor 3 - msgbox gUnknown_81B1913 + msgbox PokemonJournal_Text_SpecialFeatureBruno release end @@ -215,23 +215,23 @@ EventScript_1AD021:: @ 81AD021 lock faceplayer famechecker FAMECHECKER_LANCE, 1 - msgbox Text_181569 + msgbox SaffronCity_Text_HowCanClubNotRecognizeLance release end -SaffronCity_EventScript_1AD03A:: @ 81AD03A +SaffronCity_EventScript_BattleGirl:: @ 81AD03A lock faceplayer famechecker FAMECHECKER_LANCE, 2 - msgbox Text_181569 + msgbox SaffronCity_Text_HowCanClubNotRecognizeLance 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 @@ -269,18 +269,18 @@ CinnabarIsland_PokemonCenter_1F_EventScript_PokemonJournalMrFuji:: @ 81AD0B9 release end -SilphCo_5F_EventScript_1AD0D4:: @ 81AD0D4 +SilphCo_5F_EventScript_Scientist:: @ 81AD0D4 lock faceplayer famechecker FAMECHECKER_GIOVANNI, 1 - msgbox Text_175E99 + msgbox SilphCo_5F_Text_RocketBossLookingForStrongMons release end -SilphCo_8F_EventScript_1AD0ED:: @ 81AD0ED +SilphCo_8F_EventScript_Scientist:: @ 81AD0ED lock faceplayer famechecker FAMECHECKER_GIOVANNI, 2 - msgbox Text_176ACB + msgbox SilphCo_8F_Text_ToRocketBossMonsAreTools 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/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc index 2a5a84f72..45ffc285d 100644 --- a/data/scripts/trainer_tower.inc +++ b/data/scripts/trainer_tower.inc @@ -1,320 +1,297 @@ -SevenIsland_TrainerTower_1F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_2F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_3F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_4F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_5F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_6F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_7F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_8F_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54:: @ 81C4F54 -SevenIsland_TrainerTower_Roof_MapScript1_1C4F54:: @ 81C4F54 +@ Local IDs apply to all floors (not lobby or roof) +.equ LOCALID_TRAINER_DOUBLES1, 2 +.equ LOCALID_TRAINER_SINGLES, 3 +.equ LOCALID_TRAINER_KNOCKOUT, 4 +.equ LOCALID_TRAINER_DOUBLES2, 5 + +.equ HIDE_TRAINER_DOUBLES1, FLAG_TEMP_2 +.equ HIDE_TRAINER_SINGLES, FLAG_TEMP_3 +.equ HIDE_TRAINER_KNOCKOUT, FLAG_TEMP_4 +.equ HIDE_TRAINER_DOUBLES2, FLAG_TEMP_5 +.equ HIDE_OWNER, FLAG_TEMP_6 + +.equ DISABLE_SINGLES_TRIGGER, VAR_TEMP_E +.equ DISABLE_DOUBLES_TRIGGER, VAR_TEMP_F + + +@@ Map scripts + +TrainerTower_OnResume:: @ 81C4F54 setvar VAR_TEMP_2, 0 - setvar VAR_0x8004, 10 - special sub_815D9E8 + ttower_resumetimer end -SevenIsland_TrainerTower_1F_MapScript2_1C4F62:: @ 81C4F62 -SevenIsland_TrainerTower_2F_MapScript2_1C4F62:: @ 81C4F62 -SevenIsland_TrainerTower_3F_MapScript2_1C4F62:: @ 81C4F62 -SevenIsland_TrainerTower_4F_MapScript2_1C4F62:: @ 81C4F62 -SevenIsland_TrainerTower_5F_MapScript2_1C4F62:: @ 81C4F62 -SevenIsland_TrainerTower_6F_MapScript2_1C4F62:: @ 81C4F62 -SevenIsland_TrainerTower_7F_MapScript2_1C4F62:: @ 81C4F62 -SevenIsland_TrainerTower_8F_MapScript2_1C4F62:: @ 81C4F62 - setvar VAR_0x8004, 0 - special sub_815D9E8 +TrainerTower_OnTransition:: @ 81C4F62 + ttower_initfloor switch VAR_RESULT - case 0, EventScript_1C4FA7 - case 1, EventScript_1C4FC5 - case 2, EventScript_1C5019 - setflag FLAG_TEMP_2 - setflag FLAG_TEMP_3 - setflag FLAG_TEMP_4 - setflag FLAG_TEMP_5 - setvar VAR_TEMP_E, 1 - setvar VAR_TEMP_F, 1 + case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_SetObjectsSingles + case CHALLENGE_TYPE_DOUBLE, TrainerTower_EventScript_SetObjectsDoubles + case CHALLENGE_TYPE_KNOCKOUT, TrainerTower_EventScript_SetObjectsKnockout + setflag HIDE_TRAINER_DOUBLES1 + setflag HIDE_TRAINER_SINGLES + setflag HIDE_TRAINER_KNOCKOUT + setflag HIDE_TRAINER_DOUBLES2 + setvar DISABLE_SINGLES_TRIGGER, TRUE + setvar DISABLE_DOUBLES_TRIGGER, TRUE end -EventScript_1C4FA7:: @ 81C4FA7 - setflag FLAG_TEMP_2 - setflag FLAG_TEMP_4 - setflag FLAG_TEMP_5 - setvar VAR_TEMP_F, 1 - setobjectxyperm 3, 15, 13 - setobjectmovementtype 3, 9 - goto EventScript_1C5042 - -EventScript_1C4FC5:: @ 81C4FC5 - setflag FLAG_TEMP_3 - setflag FLAG_TEMP_4 - setvar VAR_TEMP_E, 1 - setvar VAR_0x8004, 5 - special sub_815D9E8 - compare VAR_RESULT, 1 - goto_if_eq EventScript_1C4FFE - setobjectxyperm 2, 10, 12 - setobjectmovementtype 2, 9 - setobjectxyperm 5, 10, 13 - setobjectmovementtype 5, 9 - goto EventScript_1C5042 - -EventScript_1C4FFE:: @ 81C4FFE - setobjectxyperm 2, 10, 12 - setobjectmovementtype 2, 8 - setobjectxyperm 5, 11, 12 - setobjectmovementtype 5, 8 - goto EventScript_1C5042 - -EventScript_1C5019:: @ 81C5019 - setflag FLAG_TEMP_5 - setvar VAR_TEMP_F, 1 - setobjectxyperm 2, 10, 10 - setobjectmovementtype 2, 8 - setobjectxyperm 3, 14, 13 - setobjectmovementtype 3, 9 - setobjectxyperm 4, 10, 16 - setobjectmovementtype 4, 7 -EventScript_1C5042: - setflag FLAG_TEMP_6 +TrainerTower_EventScript_SetObjectsSingles:: @ 81C4FA7 + setflag HIDE_TRAINER_DOUBLES1 + setflag HIDE_TRAINER_KNOCKOUT + setflag HIDE_TRAINER_DOUBLES2 + setvar DISABLE_DOUBLES_TRIGGER, TRUE + setobjectxyperm LOCALID_TRAINER_SINGLES, 15, 13 + setobjectmovementtype LOCALID_TRAINER_SINGLES, MOVEMENT_TYPE_FACE_LEFT + goto TrainerTower_EventScript_HideOwner + +TrainerTower_EventScript_SetObjectsDoubles:: @ 81C4FC5 + setflag HIDE_TRAINER_SINGLES + setflag HIDE_TRAINER_KNOCKOUT + setvar DISABLE_SINGLES_TRIGGER, TRUE + ttower_isfloorcleared + compare VAR_RESULT, TRUE + goto_if_eq TrainerTower_EventScript_SetObjectsDoublesAlreadyBeaten + setobjectxyperm LOCALID_TRAINER_DOUBLES1, 10, 12 + setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_TRAINER_DOUBLES2, 10, 13 + setobjectmovementtype LOCALID_TRAINER_DOUBLES2, MOVEMENT_TYPE_FACE_LEFT + goto TrainerTower_EventScript_HideOwner + +TrainerTower_EventScript_SetObjectsDoublesAlreadyBeaten:: @ 81C4FFE + setobjectxyperm LOCALID_TRAINER_DOUBLES1, 10, 12 + setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_DOWN + setobjectxyperm LOCALID_TRAINER_DOUBLES2, 11, 12 + setobjectmovementtype LOCALID_TRAINER_DOUBLES2, MOVEMENT_TYPE_FACE_DOWN + goto TrainerTower_EventScript_HideOwner + +@ Knockout challenge re-uses trainer objects +TrainerTower_EventScript_SetObjectsKnockout:: @ 81C5019 + setflag HIDE_TRAINER_DOUBLES2 + setvar DISABLE_DOUBLES_TRIGGER, TRUE + setobjectxyperm LOCALID_TRAINER_DOUBLES1, 10, 10 + setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_DOWN + setobjectxyperm LOCALID_TRAINER_SINGLES, 14, 13 + setobjectmovementtype LOCALID_TRAINER_SINGLES, MOVEMENT_TYPE_FACE_LEFT + setobjectxyperm LOCALID_TRAINER_KNOCKOUT, 10, 16 + setobjectmovementtype LOCALID_TRAINER_KNOCKOUT, MOVEMENT_TYPE_FACE_UP +TrainerTower_EventScript_HideOwner: + setflag HIDE_OWNER end -SevenIsland_TrainerTower_1F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_2F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_3F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_4F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_5F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_6F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_7F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_8F_MapScript3_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_Elevator_MapScript2_1C5046:: @ 81C5046 -SevenIsland_TrainerTower_Roof_MapScript2_1C5046:: @ 81C5046 - map_script_2 VAR_TEMP_2, 0, EventScript_1C5050 +TrainerTower_OnFrame:: @ 81C5046 + map_script_2 VAR_TEMP_2, 0, TrainerTower_EventScript_EnterFloor .2byte 0 -EventScript_1C5050:: @ 81C5050 +TrainerTower_EventScript_EnterFloor:: @ 81C5050 setvar VAR_TEMP_2, 1 - setvar VAR_0x8004, 5 - special sub_815D9E8 - compare VAR_RESULT, 0 - goto_if_eq EventScript_1C5072 - setvar VAR_TEMP_E, 1 - setvar VAR_TEMP_F, 1 -EventScript_1C5072: - setvar VAR_0x8004, 18 - special sub_815D9E8 - compare VAR_RESULT, 1 - goto_if_eq EventScript_1C5086 + ttower_isfloorcleared + compare VAR_RESULT, FALSE + goto_if_eq TrainerTower_EventScript_EndEnterFloor + setvar DISABLE_SINGLES_TRIGGER, TRUE + setvar DISABLE_DOUBLES_TRIGGER, TRUE +TrainerTower_EventScript_EndEnterFloor: + ttower_shouldexit + compare VAR_RESULT, TRUE + goto_if_eq TrainerTower_EventScript_WarpToLobby end -EventScript_1C5086:: @ 81C5086 - warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 9, 7 +@ Never reached +TrainerTower_EventScript_WarpToLobby:: @ 81C5086 + warp MAP_TRAINER_TOWER_LOBBY, 255, 9, 7 waitstate -EventScript_1C508F:: - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special sub_815D9E8 + + +@@ Battle scripts + +TrainerTower_EventScript_TriggerBattle:: + ttower_getchallengetype switch VAR_RESULT - case 0, EventScript_1C50C2 - case 1, EventScript_1C510D - case 2, EventScript_1C515C -EventScript_1C50C2: - setvar VAR_0x8004, 19 - special sub_815D9E8 - applymovement 3, Movement_ExclamationMark + case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_DoSingleBattle + case CHALLENGE_TYPE_DOUBLE, TrainerTower_EventScript_DoDoubleBattle + case CHALLENGE_TYPE_KNOCKOUT, TrainerTower_EventScript_DoKnockoutBattle + +TrainerTower_EventScript_DoSingleBattle: + ttower_encountermusic + applymovement LOCALID_TRAINER_SINGLES, Movement_ExclamationMark waitmovement 0 - applymovement 3, Movement_Delay48 + applymovement LOCALID_TRAINER_SINGLES, Movement_Delay48 waitmovement 0 - setvar VAR_TEMP_E, 1 - applymovement 3, Movement_1C5541 + setvar DISABLE_SINGLES_TRIGGER, TRUE + applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_SingleTrainerApproach waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 0 - special sub_815D9E8 + ttower_getspeech TRAINER_TOWER_TEXT_INTRO, 0 msgbox gStringVar4 closemessage - goto EventScript_1C5219 + goto TrainerTower_EventScript_DoBattle -EventScript_1C510D:: @ 81C510D - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_TEMP_3 - special sub_815D9E8 +TrainerTower_EventScript_DoDoubleBattle:: @ 81C510D + ttower_getspeech TRAINER_TOWER_TEXT_INTRO, VAR_TEMP_3 msgbox gStringVar4 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 + setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_SPEECH + setvar VAR_0x8005, TRAINER_TOWER_TEXT_INTRO addvar VAR_TEMP_3, 1 compare VAR_TEMP_3, 1 - goto_if_eq EventScript_1C5146 + goto_if_eq TrainerTower_EventScript_DoSecondTrainerIntro setvar VAR_TEMP_3, 0 -EventScript_1C5146: +TrainerTower_EventScript_DoSecondTrainerIntro: copyvar VAR_0x8006, VAR_TEMP_3 - special sub_815D9E8 + special CallTrainerTowerFunc msgbox gStringVar4 closemessage - goto EventScript_1C5219 + goto TrainerTower_EventScript_DoBattle -EventScript_1C515C:: @ 81C515C +TrainerTower_EventScript_DoKnockoutBattle:: @ 81C515C switch VAR_TEMP_1 - case 0, EventScript_1C5182 - case 1, EventScript_1C51AD - case 2, EventScript_1C51D8 -EventScript_1C5182: - setvar VAR_0x8004, 19 - special sub_815D9E8 - applymovement 4, Movement_ExclamationMark + case 0, TrainerTower_EventScript_DoKnockoutBattle1 + case 1, TrainerTower_EventScript_DoKnockoutBattle2 + case 2, TrainerTower_EventScript_DoKnockoutBattle3 + +TrainerTower_EventScript_DoKnockoutBattle1: + ttower_encountermusic + applymovement LOCALID_TRAINER_KNOCKOUT, Movement_ExclamationMark waitmovement 0 - applymovement 4, Movement_Delay48 + applymovement LOCALID_TRAINER_KNOCKOUT, Movement_Delay48 waitmovement 0 - applymovement 4, Movement_1C5546 + applymovement LOCALID_TRAINER_KNOCKOUT, TrainerTower_Movement_BottomKnockoutTrainerApproach waitmovement 0 - goto EventScript_1C51FE + goto TrainerTower_EventScript_DoKnockoutBattleIntro -EventScript_1C51AD:: @ 81C51AD - setvar VAR_0x8004, 19 - special sub_815D9E8 - applymovement 2, Movement_ExclamationMark +TrainerTower_EventScript_DoKnockoutBattle2:: @ 81C51AD + ttower_encountermusic + applymovement LOCALID_TRAINER_DOUBLES1, Movement_ExclamationMark waitmovement 0 - applymovement 2, Movement_Delay48 + applymovement LOCALID_TRAINER_DOUBLES1, Movement_Delay48 waitmovement 0 - applymovement 2, Movement_1C5549 + applymovement LOCALID_TRAINER_DOUBLES1, TrainerTower_Movement_TopKnockoutTrainerApproach waitmovement 0 - goto EventScript_1C51FE + goto TrainerTower_EventScript_DoKnockoutBattleIntro -EventScript_1C51D8:: @ 81C51D8 - setvar VAR_0x8004, 19 - special sub_815D9E8 - applymovement 3, Movement_ExclamationMark +TrainerTower_EventScript_DoKnockoutBattle3:: @ 81C51D8 + ttower_encountermusic + applymovement LOCALID_TRAINER_SINGLES, Movement_ExclamationMark waitmovement 0 - applymovement 3, Movement_Delay48 + applymovement LOCALID_TRAINER_SINGLES, Movement_Delay48 waitmovement 0 - applymovement 3, Movement_1C5542 + applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_RightKnockoutTrainerApproach waitmovement 0 -EventScript_1C51FE: - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_TEMP_1 - special sub_815D9E8 +TrainerTower_EventScript_DoKnockoutBattleIntro: + ttower_getspeech TRAINER_TOWER_TEXT_INTRO, VAR_TEMP_1 msgbox gStringVar4 closemessage -EventScript_1C5219: - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - special sub_815D9E8 +TrainerTower_EventScript_DoBattle: + ttower_dobattle waitstate switch VAR_RESULT - case 1, EventScript_1C524D - case 2, EventScript_1C52E0 - case 3, EventScript_1C52E0 -EventScript_1C524D: - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special sub_815D9E8 + case B_OUTCOME_WON, TrainerTower_EventScript_WonBattle + case B_OUTCOME_LOST, TrainerTower_EventScript_WarpToLobbyLost + case B_OUTCOME_DREW, TrainerTower_EventScript_WarpToLobbyLost +TrainerTower_EventScript_WonBattle: + ttower_getchallengetype switch VAR_RESULT - case 0, EventScript_1C52D7 - case 1, EventScript_1C52BA - case 2, EventScript_1C5280 -EventScript_1C5280: + case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_SetFloorCleared + case CHALLENGE_TYPE_DOUBLE, TrainerTower_EventScript_MoveDoublesTrainers + case CHALLENGE_TYPE_KNOCKOUT, TrainerTower_EventScript_CheckNextKnockoutBattle + +TrainerTower_EventScript_CheckNextKnockoutBattle: switch VAR_TEMP_1 - case 0, EventScript_1C52A6 - case 1, EventScript_1C52B0 - case 2, EventScript_1C52D0 -EventScript_1C52A6: + case 0, TrainerTower_EventScript_DoSecondKnockoutBattle + case 1, TrainerTower_EventScript_DoThirdKnockoutBattle + case 2, TrainerTower_EventScript_MoveLastKnockoutTrainer + +TrainerTower_EventScript_DoSecondKnockoutBattle: addvar VAR_TEMP_1, 1 - goto EventScript_1C515C + goto TrainerTower_EventScript_DoKnockoutBattle -EventScript_1C52B0:: @ 81C52B0 +TrainerTower_EventScript_DoThirdKnockoutBattle:: @ 81C52B0 addvar VAR_TEMP_1, 1 - goto EventScript_1C515C + goto TrainerTower_EventScript_DoKnockoutBattle -EventScript_1C52BA:: @ 81C52BA - applymovement 5, Movement_1C554C +TrainerTower_EventScript_MoveDoublesTrainers:: @ 81C52BA + applymovement LOCALID_TRAINER_DOUBLES2, TrainerTower_Movement_DoublesTrainer2OutOfWay waitmovement 0 - applymovement 2, Movement_1C5550 - goto EventScript_1C52D7 - -EventScript_1C52D0:: @ 81C52D0 - applymovement 3, Movement_1C554D -EventScript_1C52D7: - setvar VAR_0x8004, 4 - special sub_815D9E8 + applymovement LOCALID_TRAINER_DOUBLES1, TrainerTower_Movement_DoublesTrainer1FaceDown + goto TrainerTower_EventScript_SetFloorCleared + +TrainerTower_EventScript_MoveLastKnockoutTrainer:: @ 81C52D0 + applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_LastKnockoutTrainerOutOfWay +TrainerTower_EventScript_SetFloorCleared: + ttower_clearedfloor end -EventScript_1C52E0:: @ 81C52E0 +TrainerTower_EventScript_WarpToLobbyLost:: @ 81C52E0 special HealPlayerParty - setvar VAR_0x8004, 11 - special sub_815D9E8 - warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 9, 7 + ttower_setlost + warp MAP_TRAINER_TOWER_LOBBY, 255, 9, 7 waitstate -EventScript_1C52F4:: @ 81C52F4 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special sub_815D9E8 + +@@ Speaking to trainers after battle + +TrainerTower_EventScript_SpeakToDoublesTrainer1:: @ 81C52F4 + ttower_getchallengetype switch VAR_RESULT - case 0, EventScript_1C5327 - case 1, EventScript_1C5327 - case 2, EventScript_1C5331 -EventScript_1C5327: + case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_DoublesTrainer1PostBattle + case CHALLENGE_TYPE_DOUBLE, TrainerTower_EventScript_DoublesTrainer1PostBattle + case CHALLENGE_TYPE_KNOCKOUT, TrainerTower_EventScript_KnockoutTrainer2PostBattle +TrainerTower_EventScript_DoublesTrainer1PostBattle: setvar VAR_0x8006, 0 - goto EventScript_1C5391 + goto TrainerTower_EventScript_DoPostBattleText -EventScript_1C5331:: @ 81C5331 +TrainerTower_EventScript_KnockoutTrainer2PostBattle:: @ 81C5331 setvar VAR_0x8006, 1 - goto EventScript_1C5391 + goto TrainerTower_EventScript_DoPostBattleText -EventScript_1C533B:: @ 81C533B - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special sub_815D9E8 +TrainerTower_EventScript_SpeakToSinglesTrainer:: @ 81C533B + ttower_getchallengetype switch VAR_RESULT - case 0, EventScript_1C536E - case 1, EventScript_1C536E - case 2, EventScript_1C5378 -EventScript_1C536E: + case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_SinglesTrainerPostBattle + case CHALLENGE_TYPE_DOUBLE, TrainerTower_EventScript_SinglesTrainerPostBattle + case CHALLENGE_TYPE_KNOCKOUT, TrainerTower_EventScript_KnockoutTrainer3PostBattle +TrainerTower_EventScript_SinglesTrainerPostBattle: setvar VAR_0x8006, 0 - goto EventScript_1C5391 + goto TrainerTower_EventScript_DoPostBattleText -EventScript_1C5378:: @ 81C5378 +TrainerTower_EventScript_KnockoutTrainer3PostBattle:: @ 81C5378 setvar VAR_0x8006, 2 - goto EventScript_1C5391 + goto TrainerTower_EventScript_DoPostBattleText -EventScript_1C5382:: @ 81C5382 +TrainerTower_EventScript_SpeakToKnockoutTrainer:: @ 81C5382 setvar VAR_0x8006, 0 - goto EventScript_1C5391 + goto TrainerTower_EventScript_DoPostBattleText -EventScript_1C538C:: @ 81C538C +TrainerTower_EventScript_SpeakToDoublesTrainer2:: @ 81C538C setvar VAR_0x8006, 1 -EventScript_1C5391: - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 5 - special sub_815D9E8 +TrainerTower_EventScript_DoPostBattleText: + ttower_getspeech TRAINER_TOWER_TEXT_AFTER lock faceplayer msgbox gStringVar4 release return -EventScript_1C53AA:: @ 81C53AA + +@@ Speaking to owner + +TrainerTower_EventScript_SpeakToOwner:: @ 81C53AA lock faceplayer - setvar VAR_0x8004, 7 - special sub_815D9E8 + ttower_getownerstate switch VAR_RESULT - case 0, EventScript_1C53DA - case 1, EventScript_1C53E2 - case 2, EventScript_1C5492 -EventScript_1C53DA: - msgbox Text_17CA5A -EventScript_1C53E2: - setvar VAR_0x8004, 8 - special sub_815D9E8 + case 0, TrainerTower_Roof_EventScript_Arrived + case 1, TrainerTower_Roof_EventScript_GivePrize + case 2, TrainerTower_Roof_EventScript_OwnerEnd + +TrainerTower_Roof_EventScript_Arrived: + msgbox TrainerTower_Roof_Text_ImOwnerBattledPerfectly +TrainerTower_Roof_EventScript_GivePrize: + ttower_giveprize switch VAR_RESULT - case 0, EventScript_1C5410 - case 1, EventScript_1C543A - case 2, EventScript_1C544F -EventScript_1C5410: - msgbox Text_17CB09 + case 0, TrainerTower_Roof_EventScript_ReceivePrize + case 1, TrainerTower_Roof_EventScript_NoRoomForPrize + case 2, TrainerTower_Roof_EventScript_CheckFinalTime + +TrainerTower_Roof_EventScript_ReceivePrize: + msgbox TrainerTower_Roof_Text_ThisIsForYou textcolor 3 playfanfare MUS_FANFA1 message Text_ObtainedTheX @@ -323,128 +300,105 @@ EventScript_1C5410: getstdstring 2, STDSTRING_ITEMS_POCKET msgbox Text_PutItemAway call EventScript_1A6675 - goto EventScript_1C544F + goto TrainerTower_Roof_EventScript_CheckFinalTime -EventScript_1C543A:: @ 81C543A - msgbox Text_17CB09 +TrainerTower_Roof_EventScript_NoRoomForPrize:: @ 81C543A + msgbox TrainerTower_Roof_Text_ThisIsForYou msgbox Text_BagIsFull - goto EventScript_1C544F + goto TrainerTower_Roof_EventScript_CheckFinalTime -EventScript_1C544F:: @ 81C544F - setvar VAR_0x8004, 9 - special sub_815D9E8 +TrainerTower_Roof_EventScript_CheckFinalTime:: @ 81C544F + ttower_checkfinaltime switch VAR_RESULT - case 0, EventScript_1C547D - case 1, EventScript_1C548A - case 2, EventScript_1C5492 -EventScript_1C547D: - msgbox Text_17CB1A - goto EventScript_1C5492 - -EventScript_1C548A:: @ 81C548A - msgbox Text_17CBC0 -EventScript_1C5492: - msgbox Text_17CBF5 + case 0, TrainerTower_Roof_EventScript_NewRecord + case 1, TrainerTower_Roof_EventScript_NoNewRecord + case 2, TrainerTower_Roof_EventScript_OwnerEnd + +TrainerTower_Roof_EventScript_NewRecord: + msgbox TrainerTower_Roof_Text_DoneItInRecordTime + goto TrainerTower_Roof_EventScript_OwnerEnd + +TrainerTower_Roof_EventScript_NoNewRecord:: @ 81C548A + msgbox TrainerTower_Roof_Text_TookSweetTimeGettingHere +TrainerTower_Roof_EventScript_OwnerEnd: + msgbox TrainerTower_Roof_Text_IdLikeToSeeBetterTime release return -EventScript_1C549C:: @ 81C549C +TrainerTower_EventScript_ShowTime:: @ 81C549C lockall - setvar VAR_0x8004, 13 - special sub_815D9E8 - msgbox Text_17CC56 + ttower_gettime + msgbox TrainerTower_Text_XMinYZSec releaseall end -SevenIsland_TrainerTower_2F_EventScript_1C54AF:: @ 81C54AF -SevenIsland_TrainerTower_4F_EventScript_1C54AF:: @ 81C54AF -SevenIsland_TrainerTower_6F_EventScript_1C54AF:: @ 81C54AF -SevenIsland_TrainerTower_8F_EventScript_1C54AF:: @ 81C54AF -SevenIsland_TrainerTower_5F_EventScript_1C54AF:: @ 81C54AF -SevenIsland_TrainerTower_7F_EventScript_1C54AF:: @ 81C54AF -SevenIsland_TrainerTower_3F_EventScript_1C54AF:: @ 81C54AF -SevenIsland_TrainerTower_1F_EventScript_1C54AF:: @ 81C54AF - goto EventScript_1C508F - -SevenIsland_TrainerTower_2F_EventScript_1C54B4:: @ 81C54B4 -SevenIsland_TrainerTower_4F_EventScript_1C54B4:: @ 81C54B4 -SevenIsland_TrainerTower_6F_EventScript_1C54B4:: @ 81C54B4 -SevenIsland_TrainerTower_8F_EventScript_1C54B4:: @ 81C54B4 -SevenIsland_TrainerTower_5F_EventScript_1C54B4:: @ 81C54B4 -SevenIsland_TrainerTower_7F_EventScript_1C54B4:: @ 81C54B4 -SevenIsland_TrainerTower_3F_EventScript_1C54B4:: @ 81C54B4 -SevenIsland_TrainerTower_1F_EventScript_1C54B4:: @ 81C54B4 + +@@ Battle triggers + +TrainerTower_EventScript_SingleBattleTrigger:: @ 81C54AF + goto TrainerTower_EventScript_TriggerBattle + +TrainerTower_EventScript_DoubleBattleTriggerTop:: @ 81C54B4 setvar VAR_TEMP_3, 0 - setvar VAR_0x8004, 16 - special sub_815D9E8 - compare VAR_RESULT, 0 - goto_if_ne EventScript_1C5528 - setvar VAR_0x8004, 19 - special sub_815D9E8 - applymovement 2, Movement_ExclamationMark + ttower_checkdoubles + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS + goto_if_ne TrainerTower_EventScript_IneligibleForDoubleBattle + ttower_encountermusic + applymovement LOCALID_TRAINER_DOUBLES1, Movement_ExclamationMark waitmovement 0 - applymovement 2, Movement_Delay48 - goto EventScript_1C551B - -SevenIsland_TrainerTower_2F_EventScript_1C54EA:: @ 81C54EA -SevenIsland_TrainerTower_4F_EventScript_1C54EA:: @ 81C54EA -SevenIsland_TrainerTower_6F_EventScript_1C54EA:: @ 81C54EA -SevenIsland_TrainerTower_8F_EventScript_1C54EA:: @ 81C54EA -SevenIsland_TrainerTower_5F_EventScript_1C54EA:: @ 81C54EA -SevenIsland_TrainerTower_7F_EventScript_1C54EA:: @ 81C54EA -SevenIsland_TrainerTower_3F_EventScript_1C54EA:: @ 81C54EA -SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA + applymovement LOCALID_TRAINER_DOUBLES1, Movement_Delay48 + goto TrainerTower_EventScript_TriggerDoubleBattle + +TrainerTower_EventScript_DoubleBattleTriggerBottom:: @ 81C54EA setvar VAR_TEMP_3, 1 - setvar VAR_0x8004, 16 - special sub_815D9E8 - compare VAR_RESULT, 0 - goto_if_ne EventScript_1C5528 - setvar VAR_0x8004, 19 - special sub_815D9E8 - applymovement 5, Movement_ExclamationMark + ttower_checkdoubles + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS + goto_if_ne TrainerTower_EventScript_IneligibleForDoubleBattle + ttower_encountermusic + applymovement LOCALID_TRAINER_DOUBLES2, Movement_ExclamationMark waitmovement 0 - applymovement 5, Movement_Delay48 -EventScript_1C551B: + applymovement LOCALID_TRAINER_DOUBLES2, Movement_Delay48 +TrainerTower_EventScript_TriggerDoubleBattle: waitmovement 0 - setvar VAR_TEMP_F, 1 - goto EventScript_1C508F + setvar DISABLE_DOUBLES_TRIGGER, TRUE + goto TrainerTower_EventScript_TriggerBattle -EventScript_1C5528:: @ 81C5528 +TrainerTower_EventScript_IneligibleForDoubleBattle:: @ 81C5528 lockall playse SE_PINPON - msgbox Text_17CC73 + msgbox TrainerTower_Lobby_Text_NeedTwoMonsForDouble closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1C5544 + applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Movement_PushPlayerBack waitmovement 0 releaseall end -Movement_1C5541: +TrainerTower_Movement_SingleTrainerApproach: walk_left -Movement_1C5542:: @ 81C5542 +TrainerTower_Movement_RightKnockoutTrainerApproach:: @ 81C5542 walk_left walk_left -Movement_1C5544: +TrainerTower_Movement_PushPlayerBack: walk_left step_end -Movement_1C5546:: @ 81C5546 +TrainerTower_Movement_BottomKnockoutTrainerApproach:: @ 81C5546 walk_up walk_up step_end -Movement_1C5549:: @ 81C5549 +TrainerTower_Movement_TopKnockoutTrainerApproach:: @ 81C5549 walk_down walk_down step_end -Movement_1C554C:: @ 81C554C +TrainerTower_Movement_DoublesTrainer2OutOfWay:: @ 81C554C walk_right -Movement_1C554D: +TrainerTower_Movement_LastKnockoutTrainerOutOfWay: walk_up face_down step_end -Movement_1C5550:: @ 81C5550 +TrainerTower_Movement_DoublesTrainer1FaceDown:: @ 81C5550 face_down step_end diff --git a/data/specials.inc b/data/specials.inc index 96064fec3..4ed38160d 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -412,7 +412,7 @@ gSpecials:: @ 815FD60 def_special Special_SSAnneDepartureCutscene def_special IsPokemonJumpSpeciesInParty def_special IsNationalPokedexEnabled - def_special sub_815D9E8 + def_special CallTrainerTowerFunc def_special ShowPokemonJumpRecords def_special Special_ItemIsTM_GetMoveName def_special Special_DaisyMassageServices @@ -439,7 +439,7 @@ gSpecials:: @ 815FD60 def_special Special_SetDeoxysTriangleObjectPal def_special IsPlayerLeftOfVermilionSailor def_special Special_BadEggInParty - def_special sub_815D834 + def_special ReadTrainerTowerAndValidate def_special HasAllMons def_special Special_PlayerIsNotInTrainerTowerLobby def_special Special_BrailleCursorToggle diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc index 0705caffe..32417ef7f 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" @@ -1413,7 +1413,7 @@ PokemonJournal_Text_SpecialFeatureKoga:: @ 81B16A8 .string "He even concocts medicine to nurse\n" .string "his POKéMON to health.$" -gUnknown_81B1753:: @ 81B1753 +PokemonJournal_Text_SpecialFeatureSabrina:: @ 81B1753 .string "POKéMON JOURNAL\p" .string "Special Feature: SAFFRON GYM\n" .string "LEADER SABRINA!\p" @@ -1437,7 +1437,7 @@ gUnknown_81B187F:: @ 81B187F .string "and cool battling style, LORELEI\l" .string "has a surprising secret!$" -gUnknown_81B1913:: @ 81B1913 +PokemonJournal_Text_SpecialFeatureBruno:: @ 81B1913 .string "POKéMON JOURNAL\p" .string "Special Feature:\n" .string "ELITE FOUR's BRUNO!\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/battle_tower.h b/include/battle_tower.h index 87f847aa4..be07320c9 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -33,8 +33,6 @@ void ValidateEReaderTrainer(void); u8 GetBattleTowerTrainerFrontSpriteId(void); u8 GetEreaderTrainerFrontSpriteId(void); void CopyEReaderTrainerName5(u8 *dest); -void sub_815DC40(u8 *dest, u8 opponentIdx); -void sub_815DBF4(u8 *dest, u8 opponentIdx); void GetBattleTowerTrainerName(u8 *text); u8 GetEreaderTrainerClassId(void); u8 GetBattleTowerTrainerClassNameId(void); diff --git a/include/cereader_tool.h b/include/cereader_tool.h index 6275eaabf..dd1866fb3 100644 --- a/include/cereader_tool.h +++ b/include/cereader_tool.h @@ -2,6 +2,7 @@ #define GUARD_CEREADER_TOOL_H #include "global.h" +#include "constants/trainer_tower.h" struct TrainerTowerTrainer { @@ -21,30 +22,31 @@ struct TrainerTowerFloor /* 0x001 */ u8 floorIdx; /* 0x002 */ u8 challengeType; /* 0x003 */ u8 prize; - /* 0x004 */ struct TrainerTowerTrainer trainers[3]; + /* 0x004 */ struct TrainerTowerTrainer trainers[MAX_TRAINERS_PER_FLOOR]; /* 0x3DC */ u32 checksum; }; -struct EReaderTrainerHillSetSubstruct +struct EReaderTrainerTowerSetSubstruct { - u8 count; + u8 numFloors; u8 id; u16 dummy; u32 checksum; }; -struct EReaderTrainerHillSet +struct EReaderTrainerTowerSet { - u8 count; + u8 numFloors; u8 id; u16 dummy; u32 checksum; - struct TrainerTowerFloor floors[8]; + struct TrainerTowerFloor floors[MAX_TRAINER_TOWER_FLOORS]; }; -bool32 ValidateTrainerTowerData(struct EReaderTrainerHillSet * ttdata); -bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerHillSet * ttdata); -bool32 CEReaderTool_LoadTrainerTower(struct EReaderTrainerHillSet * ttdata); +bool32 ValidateTrainerTowerData(struct EReaderTrainerTowerSet * ttdata); +bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerTowerSet * ttdata); +bool32 CEReaderTool_LoadTrainerTower(struct EReaderTrainerTowerSet * ttdata); u8 sub_815D654(void); +bool32 ReadTrainerTowerAndValidate(void); #endif //GUARD_CEREADER_TOOL_H diff --git a/include/constants/battle.h b/include/constants/battle.h index 63be37936..a80038f2c 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -71,7 +71,7 @@ #define BATTLE_TYPE_x800000 0x800000 #define BATTLE_TYPE_RECORDED 0x1000000 #define BATTLE_TYPE_x2000000 0x2000000 -#define BATTLE_TYPE_TRAINER_HILL 0x4000000 +#define BATTLE_TYPE_x4000000 0x4000000 #define BATTLE_TYPE_SECRET_BASE 0x8000000 #define BATTLE_TYPE_GROUDON 0x10000000 #define BATTLE_TYPE_KYOGRE 0x20000000 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/flags.h b/include/constants/flags.h index 26ffa8a7c..7555f3c6b 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1046,7 +1046,7 @@ #define HIDDEN_ITEM_SAFARI_ZONE_WEST_REVIVE 23 #define HIDDEN_ITEM_SILPH_CO_5F_ELIXIR 24 #define HIDDEN_ITEM_SILPH_CO_9F_MAX_POTION 25 -#define HIDDEN_ITEM_SAFFRON_CITY_HOUSE1_2F_NUGGET 26 +#define HIDDEN_ITEM_SAFFRON_CITY_COPYCATS_HOUSE_2F_NUGGET 26 #define HIDDEN_ITEM_POWER_PLANT_MAX_ELIXIR 27 #define HIDDEN_ITEM_POWER_PLANT_THUNDER_STONE 28 #define HIDDEN_ITEM_SEAFOAM_ISLANDS_B3F_NUGGET 29 @@ -1415,7 +1415,7 @@ #define FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST (SYS_FLAGS + 0xB7) #define FLAG_WORLD_MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE (SYS_FLAGS + 0xB8) #define FLAG_WORLD_MAP_FIVE_ISLAND_ROCKET_WAREHOUSE (SYS_FLAGS + 0xB9) -#define FLAG_WORLD_MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY (SYS_FLAGS + 0xBA) +#define FLAG_WORLD_MAP_TRAINER_TOWER_LOBBY (SYS_FLAGS + 0xBA) #define FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F (SYS_FLAGS + 0xBB) #define FLAG_WORLD_MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE (SYS_FLAGS + 0xBC) #define FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH (SYS_FLAGS + 0xBD) diff --git a/include/constants/global.h b/include/constants/global.h index 7f3c80bb4..ae9a0da3b 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -34,6 +34,8 @@ #define QUEST_LOG_SCENE_COUNT 4 +#define NUM_TOWER_CHALLENGE_TYPES 4 + #define MALE 0 #define FEMALE 1 #define GENDER_COUNT 2 diff --git a/include/constants/layouts.h b/include/constants/layouts.h index 657d531e8..5f9ae3107 100644 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -208,8 +208,8 @@ #define LAYOUT_ROUTE16_NORTH_ENTRANCE_1F 223 #define LAYOUT_ENTRANCE_1F 224 #define LAYOUT_ROCKET_HIDEOUT_ELEVATOR 225 -#define LAYOUT_SAFFRON_CITY_HOUSE1_1F 226 -#define LAYOUT_SAFFRON_CITY_HOUSE1_2F 227 +#define LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_1F 226 +#define LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_2F 227 #define LAYOUT_SAFFRON_CITY_DOJO 228 #define LAYOUT_SILPH_CO_ELEVATOR 229 #define LAYOUT_ONE_ISLAND 230 @@ -279,17 +279,17 @@ #define LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_1F 294 #define LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_B1F 295 #define LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_BACK 296 -#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY 297 -#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F 298 -#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F 299 -#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F 300 -#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F 301 -#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F 302 -#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F 303 -#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F 304 -#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F 305 -#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF 306 -#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR 307 +#define LAYOUT_TRAINER_TOWER_LOBBY 297 +#define LAYOUT_TRAINER_TOWER_1F 298 +#define LAYOUT_TRAINER_TOWER_2F 299 +#define LAYOUT_TRAINER_TOWER_3F 300 +#define LAYOUT_TRAINER_TOWER_4F 301 +#define LAYOUT_TRAINER_TOWER_5F 302 +#define LAYOUT_TRAINER_TOWER_6F 303 +#define LAYOUT_TRAINER_TOWER_7F 304 +#define LAYOUT_TRAINER_TOWER_8F 305 +#define LAYOUT_TRAINER_TOWER_ROOF 306 +#define LAYOUT_TRAINER_TOWER_ELEVATOR 307 #define LAYOUT_CERULEAN_CITY_HOUSE5 308 #define LAYOUT_SIX_ISLAND_DOTTED_HOLE_1F 309 #define LAYOUT_SIX_ISLAND_DOTTED_HOLE_B1F 310 @@ -348,22 +348,22 @@ #define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER 363 #define LAYOUT_NAVEL_ROCK_B1F 364 #define LAYOUT_NAVEL_ROCK_FORK 365 -#define LAYOUT_UNUSED_LAYOUT_834BC2C 366 -#define LAYOUT_UNUSED_LAYOUT_834BEB4 367 -#define LAYOUT_UNUSED_LAYOUT_834C13C 368 -#define LAYOUT_UNUSED_LAYOUT_834C3C4 369 -#define LAYOUT_UNUSED_LAYOUT_834C64C 370 -#define LAYOUT_UNUSED_LAYOUT_834C8D4 371 -#define LAYOUT_UNUSED_LAYOUT_834CB5C 372 -#define LAYOUT_UNUSED_LAYOUT_834CDE4 373 -#define LAYOUT_UNUSED_LAYOUT_834D06C 374 -#define LAYOUT_UNUSED_LAYOUT_834D2F4 375 -#define LAYOUT_UNUSED_LAYOUT_834D57C 376 -#define LAYOUT_UNUSED_LAYOUT_834D804 377 -#define LAYOUT_UNUSED_LAYOUT_834DA8C 378 -#define LAYOUT_UNUSED_LAYOUT_834DD14 379 -#define LAYOUT_UNUSED_LAYOUT_834DF9C 380 -#define LAYOUT_UNUSED_LAYOUT_834E224 381 +#define LAYOUT_TRAINER_TOWER_1F_DOUBLES 366 +#define LAYOUT_TRAINER_TOWER_2F_DOUBLES 367 +#define LAYOUT_TRAINER_TOWER_3F_DOUBLES 368 +#define LAYOUT_TRAINER_TOWER_4F_DOUBLES 369 +#define LAYOUT_TRAINER_TOWER_5F_DOUBLES 370 +#define LAYOUT_TRAINER_TOWER_6F_DOUBLES 371 +#define LAYOUT_TRAINER_TOWER_7F_DOUBLES 372 +#define LAYOUT_TRAINER_TOWER_8F_DOUBLES 373 +#define LAYOUT_TRAINER_TOWER_1F_KNOCKOUT 374 +#define LAYOUT_TRAINER_TOWER_2F_KNOCKOUT 375 +#define LAYOUT_TRAINER_TOWER_3F_KNOCKOUT 376 +#define LAYOUT_TRAINER_TOWER_4F_KNOCKOUT 377 +#define LAYOUT_TRAINER_TOWER_5F_KNOCKOUT 378 +#define LAYOUT_TRAINER_TOWER_6F_KNOCKOUT 379 +#define LAYOUT_TRAINER_TOWER_7F_KNOCKOUT 380 +#define LAYOUT_TRAINER_TOWER_8F_KNOCKOUT 381 #define LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1 382 #define LAYOUT_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA 383 diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index 0cc1c27fb..fe7178dcf 100644 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -135,17 +135,17 @@ // Map Group 2 #define MAP_NAVEL_ROCK_EXTERIOR (0 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TRAINER_TOWER_1F (1 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TRAINER_TOWER_2F (2 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TRAINER_TOWER_3F (3 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TRAINER_TOWER_4F (4 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TRAINER_TOWER_5F (5 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TRAINER_TOWER_6F (6 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TRAINER_TOWER_7F (7 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TRAINER_TOWER_8F (8 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF (9 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY (10 | (2 << 8)) -#define MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR (11 | (2 << 8)) +#define MAP_TRAINER_TOWER_1F (1 | (2 << 8)) +#define MAP_TRAINER_TOWER_2F (2 | (2 << 8)) +#define MAP_TRAINER_TOWER_3F (3 | (2 << 8)) +#define MAP_TRAINER_TOWER_4F (4 | (2 << 8)) +#define MAP_TRAINER_TOWER_5F (5 | (2 << 8)) +#define MAP_TRAINER_TOWER_6F (6 | (2 << 8)) +#define MAP_TRAINER_TOWER_7F (7 | (2 << 8)) +#define MAP_TRAINER_TOWER_8F (8 | (2 << 8)) +#define MAP_TRAINER_TOWER_ROOF (9 | (2 << 8)) +#define MAP_TRAINER_TOWER_LOBBY (10 | (2 << 8)) +#define MAP_TRAINER_TOWER_ELEVATOR (11 | (2 << 8)) #define MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE (12 | (2 << 8)) #define MAP_FIVE_ISLAND_LOST_CAVE_ROOM1 (13 | (2 << 8)) #define MAP_FIVE_ISLAND_LOST_CAVE_ROOM2 (14 | (2 << 8)) @@ -366,15 +366,15 @@ #define MAP_INDIGO_PLATEAU_POKEMON_CENTER_2F (1 | (13 << 8)) // Map Group 14 -#define MAP_SAFFRON_CITY_HOUSE1_1F (0 | (14 << 8)) -#define MAP_SAFFRON_CITY_HOUSE1_2F (1 | (14 << 8)) +#define MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F (0 | (14 << 8)) +#define MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F (1 | (14 << 8)) #define MAP_SAFFRON_CITY_DOJO (2 | (14 << 8)) #define MAP_SAFFRON_CITY_GYM (3 | (14 << 8)) -#define MAP_SAFFRON_CITY_HOUSE2 (4 | (14 << 8)) +#define MAP_SAFFRON_CITY_HOUSE (4 | (14 << 8)) #define MAP_SAFFRON_CITY_MART (5 | (14 << 8)) #define MAP_SAFFRON_CITY_POKEMON_CENTER_1F (6 | (14 << 8)) #define MAP_SAFFRON_CITY_POKEMON_CENTER_2F (7 | (14 << 8)) -#define MAP_SAFFRON_CITY_HOUSE3 (8 | (14 << 8)) +#define MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE (8 | (14 << 8)) #define MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB (9 | (14 << 8)) // Map Group 15 diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index 8726113f4..0ef192b73 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -39,6 +39,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 @@ -72,6 +81,18 @@ #define METATILE_PokemonMansion_Statue_RedEyes_Shade 0x34E #define METATILE_PokemonMansion_Statue_RedEyes_Basement 0x34F +// Rocket Hideout, Rocket Warehouse, Silph Co, elevators +#define METATILE_Hideout_Arrow_Up 0x2A0 +#define METATILE_Hideout_Arrow_Left 0x2A1 +#define METATILE_Hideout_Arrow_Down 0x2A8 +#define METATILE_Hideout_Arrow_RIght 0x2A9 +#define METATILE_Hideout_Barrier_TopLeft_Floor 0x2CE +#define METATILE_Hideout_Barrier_TopRight_Floor 0x2CF +#define METATILE_Hideout_Barrier_BottomLeft 0x2D6 +#define METATILE_Hideout_Barrier_BottomRight 0x2D7 +#define METATILE_Hideout_Floor 0x281 +#define METATILE_Hideout_Floor_ShadeFull 0x282 + // Cinnabar Gym #define METATILE_CinnabarGym_Floor 0x281 #define METATILE_CinnabarGym_Floor_ShadeDiagonal 0x282 @@ -85,5 +106,8 @@ // gTileset_82D504C. Below metatile probably needs generic name #define METATILE_MtEmber_CaveEntrance 0x346 +// Trainer Tower +#define METATILE_TrainerTower_Floor_ShadeBottomLeft 0x287 +#define METATILE_TrainerTower_CounterBarrier 0x2B4 #endif // GUARD_METATILE_LABELS_H diff --git a/include/constants/party_menu.h b/include/constants/party_menu.h index 28ce39cd3..0c958ccc5 100644 --- a/include/constants/party_menu.h +++ b/include/constants/party_menu.h @@ -64,7 +64,6 @@ #define PARTY_MENU_TYPE_UNION_ROOM_TRADE 9 // trading board #define PARTY_MENU_TYPE_SPIN_TRADE 10 // Unused beta for Gen IV's Spin Trade #define PARTY_MENU_TYPE_MINIGAME 11 -#define PARTY_MENU_TYPE_STORE_PYRAMID_HELD_ITEMS 12 #define PARTY_ACTION_CHOOSE_MON 0 #define PARTY_ACTION_SEND_OUT 1 diff --git a/include/constants/trainer_tower.h b/include/constants/trainer_tower.h new file mode 100644 index 000000000..6372a30e8 --- /dev/null +++ b/include/constants/trainer_tower.h @@ -0,0 +1,46 @@ +#ifndef GUARD_CONSTANTS_TRAINER_TOWER_H +#define GUARD_CONSTANTS_TRAINER_TOWER_H + +#define CHALLENGE_TYPE_SINGLE 0 +#define CHALLENGE_TYPE_DOUBLE 1 +#define CHALLENGE_TYPE_KNOCKOUT 2 +// Mixed challenges use one of the above 3 for each floor + +#define CHALLENGE_STATUS_LOST 0 +#define CHALLENGE_STATUS_UNK 1 // Never set, possibly e-Card related +#define CHALLENGE_STATUS_NORMAL 2 // Not started or ongoing + +#define MAX_TRAINER_TOWER_FLOORS 8 + +#define MAX_TRAINERS_PER_FLOOR 3 + +#define TRAINER_TOWER_FUNC_INIT_FLOOR 0 +#define TRAINER_TOWER_FUNC_GET_SPEECH 1 +#define TRAINER_TOWER_FUNC_DO_BATTLE 2 +#define TRAINER_TOWER_FUNC_GET_CHALLENGE_TYPE 3 +#define TRAINER_TOWER_FUNC_CLEARED_FLOOR 4 +#define TRAINER_TOWER_FUNC_GET_FLOOR_CLEARED 5 +#define TRAINER_TOWER_FUNC_START_CHALLENGE 6 +#define TRAINER_TOWER_FUNC_GET_OWNER_STATE 7 +#define TRAINER_TOWER_FUNC_GIVE_PRIZE 8 +#define TRAINER_TOWER_FUNC_CHECK_FINAL_TIME 9 +#define TRAINER_TOWER_FUNC_RESUME_TIMER 10 +#define TRAINER_TOWER_FUNC_SET_LOST 11 +#define TRAINER_TOWER_FUNC_GET_CHALLENGE_STATUS 12 +#define TRAINER_TOWER_FUNC_GET_TIME 13 +#define TRAINER_TOWER_FUNC_SHOW_RESULTS 14 +#define TRAINER_TOWER_FUNC_CLOSE_RESULTS 15 +#define TRAINER_TOWER_FUNC_CHECK_DOUBLES 16 +#define TRAINER_TOWER_FUNC_GET_NUM_FLOORS 17 +#define TRAINER_TOWER_FUNC_SHOULD_WARP_TO_COUNTER 18 +#define TRAINER_TOWER_FUNC_ENCOUNTER_MUSIC 19 +#define TRAINER_TOWER_FUNC_GET_BEAT_CHALLENGE 20 + +#define TRAINER_TOWER_TEXT_INTRO 2 +#define TRAINER_TOWER_TEXT_PLAYER_LOST 3 +#define TRAINER_TOWER_TEXT_PLAYER_WON 4 +#define TRAINER_TOWER_TEXT_AFTER 5 + +#define TRAINER_TOWER_MAX_TIME 215999 // 60 * 60 * 60 - 1 + +#endif //GUARD_CONSTANTS_TRAINER_TOWER_H diff --git a/include/global.h b/include/global.h index 8644fe364..54d8fdec3 100644 --- a/include/global.h +++ b/include/global.h @@ -168,13 +168,6 @@ struct BerryPickingResults // possibly used in the game itself? Size may be wron u8 field_F; }; -struct PyramidBag -{ - u16 items_Lvl50[10]; - u16 items_OpenLvl[10]; - u8 quantity[10]; -}; - struct BerryCrush { u16 berryCrushResults[4]; @@ -719,19 +712,18 @@ struct MEventBuffers /*0x344 0x3464*/ u32 unk_344[2][5]; }; // 0x36C 0x348C -struct TrainerTowerLog +struct TrainerTower { - u32 unk0; - u32 unk4; - u8 unk8; + u32 timer; + u32 bestTime; + u8 floorsCleared; u8 unk9; - u8 unkA_0:1; - u8 unkA_1:1; - u8 unkA_2:1; - u8 unkA_3:1; - u8 unkA_4:1; - u8 unkA_5:1; - u8 unkA_6:2; + bool8 receivedPrize:1; + bool8 checkedFinalTime:1; + bool8 spokeToOwner:1; + bool8 hasLost:1; + bool8 unkA_4:1; + bool8 validated:1; }; struct TrainerRematchState @@ -807,8 +799,8 @@ struct SaveBlock1 /*0x3BA8*/ struct TrainerNameRecord trainerNameRecords[20]; /*0x3C98*/ struct DaycareMon route5DayCareMon; /*0x3D24*/ u8 filler3D24[0x10]; - /*0x3D34*/ u32 unkArrayIdx; - /*0x3D38*/ struct TrainerTowerLog unkArray[4]; + /*0x3D34*/ u32 towerChallengeId; + /*0x3D38*/ struct TrainerTower trainerTower[NUM_TOWER_CHALLENGE_TYPES]; }; struct MapPosition diff --git a/include/renewable_hidden_items.h b/include/renewable_hidden_items.h index 0de109528..3a0385c00 100644 --- a/include/renewable_hidden_items.h +++ b/include/renewable_hidden_items.h @@ -1,7 +1,6 @@ #ifndef GUARD_RENEWABLE_HIDDEN_ITEMS_H #define GUARD_RENEWABLE_HIDDEN_ITEMS_H -bool32 sub_815D834(void); void IncrementRenewableHiddenItemStepCounter(void); void TryRegenerateRenewableHiddenItems(void); void SetAllRenewableItemFlags(void); diff --git a/include/script.h b/include/script.h index ad7094a9b..2fb732396 100644 --- a/include/script.h +++ b/include/script.h @@ -48,7 +48,7 @@ void ScriptContext2_RunNewScript(const u8 *ptr); u8 *mapheader_get_tagged_pointer(u8 tag); void mapheader_run_script_by_tag(u8 tag); u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag); -void mapheader_run_script_with_tag_x1(void); +void RunOnLoadMapScript(void); void mapheader_run_script_with_tag_x3(void); void mapheader_run_script_with_tag_x5(void); void mapheader_run_script_with_tag_x7(void); diff --git a/include/trainer_tower.h b/include/trainer_tower.h index 9c1ac0631..72c0f236c 100644 --- a/include/trainer_tower.h +++ b/include/trainer_tower.h @@ -6,7 +6,9 @@ void InitTrainerTowerBattleStruct(void); void FreeTrainerTowerBattleStruct(void); u8 GetTrainerTowerTrainerFrontSpriteId(void); void ResetTrainerTowerResults(void); -void sub_815DA28(u8 *text); -u8 sub_815DA10(void); +void GetTrainerTowerOpponentWinText(u8 *dest, u8 opponentIdx); +void GetTrainerTowerOpponentLoseText(u8 *dest, u8 opponentIdx); +void GetTrainerTowerOpponentName(u8 *text); +u8 GetTrainerTowerOpponentClass(void); #endif //GUARD_TRAINER_TOWER_H diff --git a/src/battle_main.c b/src/battle_main.c index 3f20399f6..faad8bafb 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -4164,7 +4164,6 @@ bool8 TryRunFromBattle(u8 battler) { bool8 effect = FALSE; u8 holdEffect; - u8 pyramidMultiplier; u8 speedVar; if (gBattleMons[battler].item == ITEM_ENIGMA_BERRY) diff --git a/src/battle_message.c b/src/battle_message.c index 4f95ae364..d8367c75e 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -22,6 +22,7 @@ #include "constants/moves.h" #include "constants/items.h" #include "constants/trainer_classes.h" +#include "constants/trainer_tower.h" struct BattleWindowText { @@ -1294,9 +1295,9 @@ const u8 gUnknown_83FE94D[] = _("a PSYCHIC move"); const u8 gUnknown_83FE95C[] = _("an ICE move"); const u8 gUnknown_83FE968[] = _("a DRAGON move"); const u8 gUnknown_83FE976[] = _("a DARK move"); -const u8 gUnknown_83FE982[] = _("TIME BOARD"); -const u8 gUnknown_83FE98D[] = _("CLEAR TIME"); -const u8 gUnknown_83FE998[] = _("{STR_VAR_1}MIN. {STR_VAR_2}.{STR_VAR_3}SEC."); +const u8 gText_TimeBoard[] = _("TIME BOARD"); +const u8 gText_ClearTime[] = _("CLEAR TIME"); // Unused +const u8 gText_XMinYZSec[] = _("{STR_VAR_1}MIN. {STR_VAR_2}.{STR_VAR_3}SEC."); const u8 gUnknown_83FE9A9[] = _("1F"); const u8 gUnknown_83FE9AC[] = _("2F"); const u8 gUnknown_83FE9AF[] = _("3F"); @@ -1306,7 +1307,7 @@ const u8 gUnknown_83FE9B8[] = _("6F"); const u8 gUnknown_83FE9BB[] = _("7F"); const u8 gUnknown_83FE9BE[] = _("8F"); -const u8 *const gUnknown_83FE9C4[] = { +const u8 *const gTrainerTowerChallengeTypeTexts[NUM_TOWER_CHALLENGE_TYPES] = { gOtherText_Single, gOtherText_Double, gOtherText_Knockout, @@ -1990,7 +1991,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER) toCpy = gTrainerClassNames[GetBattleTowerTrainerClassNameId()]; else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_TOWER) - toCpy = gTrainerClassNames[sub_815DA10()]; + toCpy = gTrainerClassNames[GetTrainerTowerOpponentClass()]; else if (gBattleTypeFlags & BATTLE_TYPE_EREADER_TRAINER) toCpy = gTrainerClassNames[GetEreaderTrainerClassId()]; else @@ -2014,7 +2015,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) } else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_TOWER) { - sub_815DA28(text); + GetTrainerTowerOpponentName(text); toCpy = text; } else if (gBattleTypeFlags & BATTLE_TYPE_EREADER_TRAINER) @@ -2054,7 +2055,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) case B_TXT_TRAINER1_LOSE_TEXT: // trainerA lose text if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_TOWER) { - sub_815DC40(gStringVar4, 0); + GetTrainerTowerOpponentLoseText(gStringVar4, 0); toCpy = gStringVar4; } else @@ -2065,7 +2066,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) case B_TXT_TRAINER1_WIN_TEXT: // trainerA win text if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_TOWER) { - sub_815DBF4(gStringVar4, 0); + GetTrainerTowerOpponentWinText(gStringVar4, 0); toCpy = gStringVar4; } else @@ -2074,11 +2075,11 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) } break; case B_TXT_TRAINER2_LOSE_TEXT: - sub_815DC40(gStringVar4, 1); + GetTrainerTowerOpponentLoseText(gStringVar4, 1); toCpy = gStringVar4; break; case B_TXT_TRAINER2_WIN_TEXT: - sub_815DBF4(gStringVar4, 1); + GetTrainerTowerOpponentWinText(gStringVar4, 1); toCpy = gStringVar4; break; case B_TXT_26: // ? diff --git a/src/cereader_tool.c b/src/cereader_tool.c index 2c5d05018..c6e0c9a99 100644 --- a/src/cereader_tool.c +++ b/src/cereader_tool.c @@ -6,40 +6,40 @@ u8 sub_815D654(void) { - return (gSaveBlock1Ptr->unkArray[0].unk9 + 1) % 256; + return (gSaveBlock1Ptr->trainerTower[0].unk9 + 1) % 256; } static bool32 ValidateTrainerTowerTrainer(struct TrainerTowerFloor * floor) { - if (floor->floorIdx < 1 || floor->floorIdx > 8) + if (floor->floorIdx < 1 || floor->floorIdx > MAX_TRAINER_TOWER_FLOORS) return FALSE; - if (floor->challengeType > 2) + if (floor->challengeType > CHALLENGE_TYPE_KNOCKOUT) return FALSE; if (CalcByteArraySum((const u8 *)floor, offsetof(typeof(*floor), checksum)) != floor->checksum) return FALSE; return TRUE; } -bool32 ValidateTrainerTowerData(struct EReaderTrainerHillSet * ttdata) +bool32 ValidateTrainerTowerData(struct EReaderTrainerTowerSet * ttdata) { - u32 count = ttdata->count; + u32 numFloors = ttdata->numFloors; s32 i; - if (count < 1 || count > 8) + if (numFloors < 1 || numFloors > MAX_TRAINER_TOWER_FLOORS) return FALSE; - for (i = 0; i < count; i++) + for (i = 0; i < numFloors; i++) { if (!ValidateTrainerTowerTrainer(&ttdata->floors[i])) return FALSE; } - if (CalcByteArraySum((const u8 *)ttdata->floors, count * sizeof(ttdata->floors[0])) != ttdata->checksum) + if (CalcByteArraySum((const u8 *)ttdata->floors, numFloors * sizeof(ttdata->floors[0])) != ttdata->checksum) return FALSE; return TRUE; } -#define SEC30_SIZE (offsetof(struct EReaderTrainerHillSet, floors[4])) -#define SEC31_SIZE (sizeof(struct EReaderTrainerHillSet) - SEC30_SIZE) +#define SEC30_SIZE (offsetof(struct EReaderTrainerTowerSet, floors[4])) +#define SEC31_SIZE (sizeof(struct EReaderTrainerTowerSet) - SEC30_SIZE) -static bool32 CEReaderTool_SaveTrainerTower_r(struct EReaderTrainerHillSet * ttdata, u8 * buffer) +static bool32 CEReaderTool_SaveTrainerTower_r(struct EReaderTrainerTowerSet * ttdata, u8 * buffer) { AGB_ASSERT_EX(ttdata->dummy == 0, ABSPATH("cereader_tool.c"), 198); AGB_ASSERT_EX(ttdata->id == 0, ABSPATH("cereader_tool.c"), 199) @@ -56,7 +56,7 @@ static bool32 CEReaderTool_SaveTrainerTower_r(struct EReaderTrainerHillSet * ttd return TRUE; } -bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerHillSet * ttdata) +bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerTowerSet * ttdata) { u8 * buffer = AllocZeroed(0x1000); bool32 result = CEReaderTool_SaveTrainerTower_r(ttdata, buffer); @@ -64,7 +64,7 @@ bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerHillSet * ttdata) return result; } -static bool32 CEReaderTool_LoadTrainerTower_r(struct EReaderTrainerHillSet * ttdata, void * buffer) +static bool32 CEReaderTool_LoadTrainerTower_r(struct EReaderTrainerTowerSet * ttdata, void * buffer) { if (TryCopySpecialSaveSection(SECTOR_TTOWER(0), buffer) != 1) return FALSE; @@ -79,10 +79,16 @@ static bool32 CEReaderTool_LoadTrainerTower_r(struct EReaderTrainerHillSet * ttd return TRUE; } -bool32 CEReaderTool_LoadTrainerTower(struct EReaderTrainerHillSet * ttdata) +bool32 CEReaderTool_LoadTrainerTower(struct EReaderTrainerTowerSet * ttdata) { void * buffer = AllocZeroed(0x1000); bool32 success = CEReaderTool_LoadTrainerTower_r(ttdata, buffer); Free(buffer); return success; } + +bool32 ReadTrainerTowerAndValidate(void) +{ + // Stubbed out. Populated in Emerald + return FALSE; +} 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; diff --git a/src/field_specials.c b/src/field_specials.c index bd19a0477..a1de82c0f 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -876,22 +876,22 @@ void Special_GetElevatorFloor(void) break; } } - if (gSaveBlock1Ptr->warp2.mapGroup == MAP_GROUP(SEVEN_ISLAND_TRAINER_TOWER_1F)) + if (gSaveBlock1Ptr->warp2.mapGroup == MAP_GROUP(TRAINER_TOWER_1F)) { switch (gSaveBlock1Ptr->warp2.mapNum) { - case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_1F): - case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_2F): - case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_3F): - case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_4F): - case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_5F): - case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_6F): - case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_7F): - case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_8F): - case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_ROOF): + case MAP_NUM(TRAINER_TOWER_1F): + case MAP_NUM(TRAINER_TOWER_2F): + case MAP_NUM(TRAINER_TOWER_3F): + case MAP_NUM(TRAINER_TOWER_4F): + case MAP_NUM(TRAINER_TOWER_5F): + case MAP_NUM(TRAINER_TOWER_6F): + case MAP_NUM(TRAINER_TOWER_7F): + case MAP_NUM(TRAINER_TOWER_8F): + case MAP_NUM(TRAINER_TOWER_ROOF): floor = 15; break; - case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_LOBBY): + case MAP_NUM(TRAINER_TOWER_LOBBY): floor = 3; break; } @@ -992,23 +992,23 @@ u16 Special_InitElevatorFloorSelectMenuPos(void) break; } } - if (gSaveBlock1Ptr->warp2.mapGroup == MAP_GROUP(SEVEN_ISLAND_TRAINER_TOWER_1F)) + if (gSaveBlock1Ptr->warp2.mapGroup == MAP_GROUP(TRAINER_TOWER_1F)) { switch (gSaveBlock1Ptr->warp2.mapNum) { - case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_1F): - case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_2F): - case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_3F): - case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_4F): - case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_5F): - case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_6F): - case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_7F): - case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_8F): - case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_ROOF): + case MAP_NUM(TRAINER_TOWER_1F): + case MAP_NUM(TRAINER_TOWER_2F): + case MAP_NUM(TRAINER_TOWER_3F): + case MAP_NUM(TRAINER_TOWER_4F): + case MAP_NUM(TRAINER_TOWER_5F): + case MAP_NUM(TRAINER_TOWER_6F): + case MAP_NUM(TRAINER_TOWER_7F): + case MAP_NUM(TRAINER_TOWER_8F): + case MAP_NUM(TRAINER_TOWER_ROOF): sElevatorScroll = 0; sElevatorCursorPos = 0; break; - case MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_LOBBY): + case MAP_NUM(TRAINER_TOWER_LOBBY): sElevatorScroll = 0; sElevatorCursorPos = 1; break; @@ -2436,7 +2436,7 @@ bool8 Special_BadEggInParty(void) bool8 Special_PlayerIsNotInTrainerTowerLobby(void) { - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SEVEN_ISLAND_TRAINER_TOWER_LOBBY) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_LOBBY)) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRAINER_TOWER_LOBBY) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_LOBBY)) return FALSE; else return TRUE; diff --git a/src/fieldmap.c b/src/fieldmap.c index 0844087e0..90682da10 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -16,7 +16,7 @@ struct ConnectionFlags u8 east:1; }; -void sub_8058A00(struct MapHeader *mapHeader); +static void InitMapLayoutData(struct MapHeader *mapHeader); void map_copy_with_padding(u16 *map, u16 width, u16 height); void mapheader_copy_mapdata_of_adjacent_maps(struct MapHeader *mapHeader); void fillSouthConnection(struct MapHeader const *mapHeader, struct MapHeader const *connectedMapHeader, s32 offset); @@ -63,20 +63,20 @@ const struct MapHeader * mapconnection_get_mapheader(struct MapConnection * conn return Overworld_GetMapHeaderByGroupAndId(connection->mapGroup, connection->mapNum); } -void not_trainer_hill_battle_pyramid(void) +void InitMap(void) { - sub_8058A00(&gMapHeader); - mapheader_run_script_with_tag_x1(); + InitMapLayoutData(&gMapHeader); + RunOnLoadMapScript(); } -void sub_80589E8(void) +void InitMapFromSavedGame(void) { - sub_8058A00(&gMapHeader); + InitMapLayoutData(&gMapHeader); LoadSavedMapView(); - mapheader_run_script_with_tag_x1(); + RunOnLoadMapScript(); } -void sub_8058A00(struct MapHeader * mapHeader) +static void InitMapLayoutData(struct MapHeader * mapHeader) { const struct MapLayout * mapLayout = mapHeader->mapLayout; CpuFastFill(0x03FF03FF, gBackupMapLayout, sizeof(gBackupMapLayout)); diff --git a/src/heal_location.c b/src/heal_location.c index 89d9478c0..5c31e2df3 100644 --- a/src/heal_location.c +++ b/src/heal_location.c @@ -124,13 +124,13 @@ void SetBlackoutRespawnWarpAndHealerNpc(struct WarpData * warp) if (VarGet(VAR_MAP_SCENE_TRAINER_TOWER) == 1) { - if (!gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_2) + if (!gSaveBlock1Ptr->trainerTower[gSaveBlock1Ptr->towerChallengeId].spokeToOwner) VarSet(VAR_MAP_SCENE_TRAINER_TOWER, 0); gSpecialVar_LastTalked = 1; warp->x = 4; warp->y = 11; - warp->mapGroup = MAP_GROUP(SEVEN_ISLAND_TRAINER_TOWER_LOBBY); - warp->mapNum = MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_LOBBY); + warp->mapGroup = MAP_GROUP(TRAINER_TOWER_LOBBY); + warp->mapNum = MAP_NUM(TRAINER_TOWER_LOBBY); warp->warpId = 0xFF; } else @@ -155,7 +155,7 @@ void SetBlackoutRespawnWarpAndHealerNpc(struct WarpData * warp) warp->x = 5; warp->y = 4; } - else if (sBlackoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0] == MAP_GROUP(SEVEN_ISLAND_TRAINER_TOWER_LOBBY) && sBlackoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1] == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_LOBBY)) + else if (sBlackoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0] == MAP_GROUP(TRAINER_TOWER_LOBBY) && sBlackoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1] == MAP_NUM(TRAINER_TOWER_LOBBY)) { warp->x = 4; warp->y = 11; diff --git a/src/load_save.c b/src/load_save.c index 9c30494f8..7f16f74a5 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -284,8 +284,8 @@ void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey) { int i; - for(i = 0; i < 4; i++) - ApplyNewEncryptionKeyToWord(&gSaveBlock1Ptr->unkArray[i].unk4, encryptionKey); + for(i = 0; i < NUM_TOWER_CHALLENGE_TYPES; i++) + ApplyNewEncryptionKeyToWord(&gSaveBlock1Ptr->trainerTower[i].bestTime, encryptionKey); sub_8054F38(encryptionKey); ApplyNewEncryptionKeyToBagItems_(encryptionKey); diff --git a/src/mevent.c b/src/mevent.c index a246e3e44..9eabcad61 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -419,7 +419,7 @@ static void Task_EReaderComm(u8 taskId) } break; case 15: - data->initialSendResult = ValidateTrainerTowerData((struct EReaderTrainerHillSet *)gDecompressionBuffer); + data->initialSendResult = ValidateTrainerTowerData((struct EReaderTrainerTowerSet *)gDecompressionBuffer); Link_StartSend5FFFwithParam(data->initialSendResult); data->state = 16; break; @@ -433,7 +433,7 @@ static void Task_EReaderComm(u8 taskId) } break; case 17: - if (CEReaderTool_SaveTrainerTower((struct EReaderTrainerHillSet *)gDecompressionBuffer)) + if (CEReaderTool_SaveTrainerTower((struct EReaderTrainerTowerSet *)gDecompressionBuffer)) { AddTextPrinterToWindow1(gJPText_ConnectionComplete); ResetDelayTimer(&data->stateAdvanceDelay); diff --git a/src/quest_log.c b/src/quest_log.c index a02aea302..2ae5e9cfe 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -2602,18 +2602,18 @@ void SetQuestLogEvent(u16 eventId, const u16 *eventData) static bool8 InQuestLogDisabledLocation(void) { // In Trainer Tower - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SEVEN_ISLAND_TRAINER_TOWER_1F) - && (gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_1F) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_2F) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_3F) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_4F) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_5F) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_6F) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_7F) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_8F) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_ROOF) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_LOBBY) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR))) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRAINER_TOWER_1F) + && (gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_1F) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_2F) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_3F) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_4F) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_5F) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_6F) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_7F) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_8F) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_ROOF) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_LOBBY) + || gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_ELEVATOR))) return TRUE; // In pokemon trainer fan club @@ -2629,7 +2629,7 @@ static bool8 InQuestLogDisabledLocation(void) // In elevator if ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROCKET_HIDEOUT_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROCKET_HIDEOUT_ELEVATOR)) || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SILPH_CO_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SILPH_CO_ELEVATOR)) - || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR)) + || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRAINER_TOWER_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_ELEVATOR)) || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(CELADON_CITY_DEPARTMENT_STORE_ELEVATOR) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(CELADON_CITY_DEPARTMENT_STORE_ELEVATOR))) return TRUE; diff --git a/src/region_map.c b/src/region_map.c index d526f9aaa..b2f08e39a 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -3420,7 +3420,7 @@ static u8 sub_80C3878(u8 mapsec) case MAPSEC_ROCKET_WAREHOUSE: return FlagGet(FLAG_WORLD_MAP_FIVE_ISLAND_ROCKET_WAREHOUSE) ? 2 : 3; case MAPSEC_TRAINER_TOWER_2: - return FlagGet(FLAG_WORLD_MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY) ? 2 : 3; + return FlagGet(FLAG_WORLD_MAP_TRAINER_TOWER_LOBBY) ? 2 : 3; case MAPSEC_DOTTED_HOLE: return FlagGet(FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F) ? 2 : 3; case MAPSEC_LOST_CAVE: diff --git a/src/renewable_hidden_items.c b/src/renewable_hidden_items.c index cbaa780e6..c0406fe94 100644 --- a/src/renewable_hidden_items.c +++ b/src/renewable_hidden_items.c @@ -529,12 +529,6 @@ static const struct RenewableHiddenItemData sRenewableHiddenItems[] = { }, }; -bool32 sub_815D834(void) -{ - // Stubbed out? - return FALSE; -} - void SetAllRenewableItemFlags(void) { u8 i, j; diff --git a/src/script.c b/src/script.c index ee4ffb7cf..4b8565589 100644 --- a/src/script.c +++ b/src/script.c @@ -406,7 +406,7 @@ u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag) } } -void mapheader_run_script_with_tag_x1(void) +void RunOnLoadMapScript(void) { mapheader_run_script_by_tag(1); } diff --git a/src/trainer_tower.c b/src/trainer_tower.c index 60c6fd93d..0f9907e2d 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -20,7 +20,6 @@ #include "menu.h" #include "new_menu_helpers.h" #include "sound.h" -#include "renewable_hidden_items.h" #include "constants/flags.h" #include "constants/vars.h" #include "constants/items.h" @@ -31,14 +30,18 @@ #include "constants/trainers.h" #include "constants/facility_trainer_classes.h" #include "constants/object_events.h" +#include "constants/trainer_tower.h" + +#define CURR_FLOOR sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx] +#define TRAINER_TOWER gSaveBlock1Ptr->trainerTower[gSaveBlock1Ptr->towerChallengeId] struct UnkStruct_203F458 { /* 0x0000 */ u8 floorIdx; - /* 0x0004 */ struct EReaderTrainerHillSet unk_0004; + /* 0x0004 */ struct EReaderTrainerTowerSet unk_0004; }; -struct UnkStruct_203F45C +struct TrainerTowerOpponent { /* 0x00 */ u8 name[11]; /* 0x0C */ u16 speechWin[6]; @@ -52,15 +55,15 @@ struct UnkStruct_203F45C struct SinglesTrainerInfo { - u8 mapObjGfx; + u8 objGfx; u8 facilityClass; bool8 gender; }; struct DoublesTrainerInfo { - u8 mapObjGfx1; - u8 mapObjGfx2; + u8 objGfx1; + u8 objGfx2; u8 facilityClass; bool8 gender1; bool8 gender2; @@ -68,49 +71,49 @@ struct DoublesTrainerInfo struct TrainerEncounterMusicPairs { - u8 unk0; - u8 unk1; + u8 facilityClass; + u8 musicId; }; static EWRAM_DATA struct UnkStruct_203F458 * sTrainerTowerState = NULL; -static EWRAM_DATA struct UnkStruct_203F45C * sTrainerTowerOpponent = NULL; +static EWRAM_DATA struct TrainerTowerOpponent * sTrainerTowerOpponent = NULL; static EWRAM_DATA u8 sUnused_203F460 = 0; -static void sub_815DC8C(void); // setup -static void sub_815DD2C(void); // teardown -static void sub_815DD44(void); +static void SetUpTrainerTowerDataStruct(void); +static void FreeTrainerTowerDataStruct(void); +static void InitTrainerTowerFloor(void); static void SetTrainerTowerNPCGraphics(void); static void TT_ConvertEasyChatMessageToString(u16 *ecWords, u8 *dest); -static void sub_815DF54(void); +static void BufferTowerOpponentSpeech(void); static void TrainerTowerGetOpponentTextColor(u8 battleType, u8 facilityClass); -static void sub_815E160(void); -static void sub_815E1C0(void); -static void sub_815E1F0(void); -static void TTSpecial_HasReachedTheRoof(void); -static void sub_815E28C(void); -static void sub_815E394(void); -static void sub_815E408(void); -static void sub_815E4B0(void); -static void TTSpecial_StartTimer(void); -static void sub_815E5C4(void); -static void sub_815E5F0(void); -static void sub_815E658(void); -static void sub_815E720(void); -static void sub_815E88C(void); -static void sub_815E8B4(void); -static void sub_815E8CC(void); -static void sub_815E908(void); -static void sub_815E948(void); -static void sub_815E9C8(void); +static void DoTrainerTowerBattle(void); +static void TrainerTowerGetChallengeType(void); +static void TrainerTowerAddFloorCleared(void); +static void GetFloorAlreadyCleared(void); +static void StartTrainerTowerChallenge(void); +static void GetOwnerState(void); +static void GiveChallengePrize(void); +static void CheckFinalTime(void); +static void TrainerTowerResumeTimer(void); +static void TrainerTowerSetPlayerLost(void); +static void GetTrainerTowerChallengeStatus(void); +static void GetCurrentTime(void); +static void ShowResultsBoard(void); +static void CloseResultsBoard(void); +static void TrainerTowerGetDoublesEligiblity(void); +static void TrainerTowerGetNumFloors(void); +static void ShouldWarpToCounter(void); +static void PlayTrainerTowerEncounterMusic(void); +static void HasSpokenToOwner(void); static void BuildEnemyParty(void); static s32 GetPartyMaxLevel(void); static void ValidateOrResetCurTrainerTowerRecord(void); static u32 GetTrainerTowerRecordTime(u32 *); static void SetTrainerTowerRecordTime(u32 *, u32); -extern const u8 gUnknown_83FE982[]; -extern const u8 gUnknown_83FE998[]; -extern const u8 *const gUnknown_83FE9C4[]; +extern const u8 gText_TimeBoard[]; +extern const u8 gText_XMinYZSec[]; +extern const u8 *const gTrainerTowerChallengeTypeTexts[]; static const struct SinglesTrainerInfo sSingleBattleTrainerInfo[] = { {OBJECT_EVENT_GFX_WOMAN_2, FACILITY_CLASS_AROMA_LADY, FEMALE}, @@ -319,51 +322,52 @@ static const struct TrainerEncounterMusicPairs sTrainerEncounterMusicLUT[105] = {FACILITY_CLASS_ELITE_FOUR_2, TRAINER_ENCOUNTER_MUSIC_MALE} }; -static const struct WindowTemplate gUnknown_847A218[] = { +static const struct WindowTemplate sTimeBoardWindowTemplate[] = { {0, 3, 1, 27, 18, 15, 0x001}, DUMMY_WIN_TEMPLATE }; -static const u32 gUnknown_847A228 = 0x70; // unused - -static const u8 gUnknown_847A22C[3] = {0, 2, 3}; - -static void (*const gUnknown_847A230[])(void) = { - sub_815DD44, - sub_815DF54, - sub_815E160, - sub_815E1C0, - sub_815E1F0, - TTSpecial_HasReachedTheRoof, - sub_815E28C, - sub_815E394, - sub_815E408, - sub_815E4B0, - TTSpecial_StartTimer, - sub_815E5C4, - sub_815E5F0, - sub_815E658, - sub_815E720, - sub_815E88C, - sub_815E8B4, - sub_815E8CC, - sub_815E908, - sub_815E948, - sub_815E9C8 +static const u32 sUnused_847A228 = 0x70; + +static const u8 sTextColors[3] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY}; + +static void (*const sTrainerTowerFunctions[])(void) = { + [TRAINER_TOWER_FUNC_INIT_FLOOR] = InitTrainerTowerFloor, + [TRAINER_TOWER_FUNC_GET_SPEECH] = BufferTowerOpponentSpeech, + [TRAINER_TOWER_FUNC_DO_BATTLE] = DoTrainerTowerBattle, + [TRAINER_TOWER_FUNC_GET_CHALLENGE_TYPE] = TrainerTowerGetChallengeType, + [TRAINER_TOWER_FUNC_CLEARED_FLOOR] = TrainerTowerAddFloorCleared, + [TRAINER_TOWER_FUNC_GET_FLOOR_CLEARED] = GetFloorAlreadyCleared, + [TRAINER_TOWER_FUNC_START_CHALLENGE] = StartTrainerTowerChallenge, + [TRAINER_TOWER_FUNC_GET_OWNER_STATE] = GetOwnerState, + [TRAINER_TOWER_FUNC_GIVE_PRIZE] = GiveChallengePrize, + [TRAINER_TOWER_FUNC_CHECK_FINAL_TIME] = CheckFinalTime, + [TRAINER_TOWER_FUNC_RESUME_TIMER] = TrainerTowerResumeTimer, + [TRAINER_TOWER_FUNC_SET_LOST] = TrainerTowerSetPlayerLost, + [TRAINER_TOWER_FUNC_GET_CHALLENGE_STATUS] = GetTrainerTowerChallengeStatus, + [TRAINER_TOWER_FUNC_GET_TIME] = GetCurrentTime, + [TRAINER_TOWER_FUNC_SHOW_RESULTS] = ShowResultsBoard, + [TRAINER_TOWER_FUNC_CLOSE_RESULTS] = CloseResultsBoard, + [TRAINER_TOWER_FUNC_CHECK_DOUBLES] = TrainerTowerGetDoublesEligiblity, + [TRAINER_TOWER_FUNC_GET_NUM_FLOORS] = TrainerTowerGetNumFloors, + [TRAINER_TOWER_FUNC_SHOULD_WARP_TO_COUNTER] = ShouldWarpToCounter, + [TRAINER_TOWER_FUNC_ENCOUNTER_MUSIC] = PlayTrainerTowerEncounterMusic, + [TRAINER_TOWER_FUNC_GET_BEAT_CHALLENGE] = HasSpokenToOwner }; -static const u16 sFloorLayouts[8][3] = { - {LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F, LAYOUT_UNUSED_LAYOUT_834BC2C, LAYOUT_UNUSED_LAYOUT_834D06C}, - {LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F, LAYOUT_UNUSED_LAYOUT_834BEB4, LAYOUT_UNUSED_LAYOUT_834D2F4}, - {LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F, LAYOUT_UNUSED_LAYOUT_834C13C, LAYOUT_UNUSED_LAYOUT_834D57C}, - {LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F, LAYOUT_UNUSED_LAYOUT_834C3C4, LAYOUT_UNUSED_LAYOUT_834D804}, - {LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F, LAYOUT_UNUSED_LAYOUT_834C64C, LAYOUT_UNUSED_LAYOUT_834DA8C}, - {LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F, LAYOUT_UNUSED_LAYOUT_834C8D4, LAYOUT_UNUSED_LAYOUT_834DD14}, - {LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F, LAYOUT_UNUSED_LAYOUT_834CB5C, LAYOUT_UNUSED_LAYOUT_834DF9C}, - {LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F, LAYOUT_UNUSED_LAYOUT_834CDE4, LAYOUT_UNUSED_LAYOUT_834E224} +// - 1 excludes Mixed challenge, which just uses one of the 3 other types +static const u16 sFloorLayouts[MAX_TRAINER_TOWER_FLOORS][NUM_TOWER_CHALLENGE_TYPES - 1] = { + {LAYOUT_TRAINER_TOWER_1F, LAYOUT_TRAINER_TOWER_1F_DOUBLES, LAYOUT_TRAINER_TOWER_1F_KNOCKOUT}, + {LAYOUT_TRAINER_TOWER_2F, LAYOUT_TRAINER_TOWER_2F_DOUBLES, LAYOUT_TRAINER_TOWER_2F_KNOCKOUT}, + {LAYOUT_TRAINER_TOWER_3F, LAYOUT_TRAINER_TOWER_3F_DOUBLES, LAYOUT_TRAINER_TOWER_3F_KNOCKOUT}, + {LAYOUT_TRAINER_TOWER_4F, LAYOUT_TRAINER_TOWER_4F_DOUBLES, LAYOUT_TRAINER_TOWER_4F_KNOCKOUT}, + {LAYOUT_TRAINER_TOWER_5F, LAYOUT_TRAINER_TOWER_5F_DOUBLES, LAYOUT_TRAINER_TOWER_5F_KNOCKOUT}, + {LAYOUT_TRAINER_TOWER_6F, LAYOUT_TRAINER_TOWER_6F_DOUBLES, LAYOUT_TRAINER_TOWER_6F_KNOCKOUT}, + {LAYOUT_TRAINER_TOWER_7F, LAYOUT_TRAINER_TOWER_7F_DOUBLES, LAYOUT_TRAINER_TOWER_7F_KNOCKOUT}, + {LAYOUT_TRAINER_TOWER_8F, LAYOUT_TRAINER_TOWER_8F_DOUBLES, LAYOUT_TRAINER_TOWER_8F_KNOCKOUT} }; -static const u16 gUnknown_847A2B4[] = { +static const u16 sPrizeList[] = { ITEM_HP_UP, ITEM_PROTEIN, ITEM_IRON, @@ -381,21 +385,21 @@ static const u16 gUnknown_847A2B4[] = { ITEM_UP_GRADE }; -static const u16 gUnknown_847A2D2[] = { - MUS_SHOUNEN, - MUS_SHOUJO, - MUS_SHOUJO, - MUS_ROCKET, - MUS_SHOUNEN, - MUS_SHOUNEN, - MUS_ROCKET, - MUS_ROCKET, - MUS_SHOUNEN, - MUS_SHOUJO, - MUS_SHOUNEN, - MUS_SHOUNEN, - MUS_SHOUNEN, - MUS_SHOUNEN +static const u16 sTrainerTowerEncounterMusic[] = { + [TRAINER_ENCOUNTER_MUSIC_MALE] = MUS_SHOUNEN, + [TRAINER_ENCOUNTER_MUSIC_FEMALE] = MUS_SHOUJO, + [TRAINER_ENCOUNTER_MUSIC_GIRL] = MUS_SHOUJO, + [TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS] = MUS_ROCKET, + [TRAINER_ENCOUNTER_MUSIC_INTENSE] = MUS_SHOUNEN, + [TRAINER_ENCOUNTER_MUSIC_COOL] = MUS_SHOUNEN, + [TRAINER_ENCOUNTER_MUSIC_AQUA] = MUS_ROCKET, + [TRAINER_ENCOUNTER_MUSIC_MAGMA] = MUS_ROCKET, + [TRAINER_ENCOUNTER_MUSIC_SWIMMER] = MUS_SHOUNEN, + [TRAINER_ENCOUNTER_MUSIC_TWINS] = MUS_SHOUJO, + [TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR] = MUS_SHOUNEN, + [TRAINER_ENCOUNTER_MUSIC_HIKER] = MUS_SHOUNEN, + [TRAINER_ENCOUNTER_MUSIC_INTERVIEWER] = MUS_SHOUNEN, + [TRAINER_ENCOUNTER_MUSIC_RICH] = MUS_SHOUNEN }; static const u8 sSingleBattleChallengeMonIdxs[][2] = { @@ -431,22 +435,22 @@ static const u8 sKnockoutChallengeMonIdxs[][3] = { {0x01, 0x04, 0x05} }; -extern const struct EReaderTrainerHillSetSubstruct gUnknown_84827AC; -extern const struct TrainerTowerFloor *const gUnknown_84827B4[][8]; +extern const struct EReaderTrainerTowerSetSubstruct gUnknown_84827AC; +extern const struct TrainerTowerFloor *const gUnknown_84827B4[][MAX_TRAINER_TOWER_FLOORS]; -void sub_815D9E8(void) +void CallTrainerTowerFunc(void) { - sub_815DC8C(); - gUnknown_847A230[gSpecialVar_0x8004](); - sub_815DD2C(); + SetUpTrainerTowerDataStruct(); + sTrainerTowerFunctions[gSpecialVar_0x8004](); + FreeTrainerTowerDataStruct(); } -u8 sub_815DA10(void) +u8 GetTrainerTowerOpponentClass(void) { return gFacilityClassToTrainerClass[sTrainerTowerOpponent->facilityClass]; } -void sub_815DA28(u8 *dest) +void GetTrainerTowerOpponentName(u8 *dest) { StringCopyN(dest, sTrainerTowerOpponent->name, 11); } @@ -458,41 +462,39 @@ u8 GetTrainerTowerTrainerFrontSpriteId(void) void InitTrainerTowerBattleStruct(void) { - u16 r10; - s32 r9; + u16 trainerId; + int i; - sub_815DC8C(); + SetUpTrainerTowerDataStruct(); sTrainerTowerOpponent = AllocZeroed(sizeof(*sTrainerTowerOpponent)); - r10 = VarGet(VAR_TEMP_1); - StringCopyN(sTrainerTowerOpponent->name, sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].name, 11); + trainerId = VarGet(VAR_TEMP_1); + StringCopyN(sTrainerTowerOpponent->name, CURR_FLOOR.trainers[trainerId].name, 11); - for (r9 = 0; r9 < 6; r9++) + for (i = 0; i < 6; i++) { - sTrainerTowerOpponent->speechWin[r9] = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].speechWin[r9]; - sTrainerTowerOpponent->speechLose[r9] = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].speechLose[r9]; + sTrainerTowerOpponent->speechWin[i] = CURR_FLOOR.trainers[trainerId].speechWin[i]; + sTrainerTowerOpponent->speechLose[i] = CURR_FLOOR.trainers[trainerId].speechLose[i]; - if (sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].challengeType == 1) + if (CURR_FLOOR.challengeType == CHALLENGE_TYPE_DOUBLE) { - sTrainerTowerOpponent->speechWin2[r9] = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10 + 1].speechWin[r9]; - sTrainerTowerOpponent->speechLose2[r9] = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10 + 1].speechLose[r9]; + sTrainerTowerOpponent->speechWin2[i] = CURR_FLOOR.trainers[trainerId + 1].speechWin[i]; + sTrainerTowerOpponent->speechLose2[i] = CURR_FLOOR.trainers[trainerId + 1].speechLose[i]; } } - sTrainerTowerOpponent->battleType = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].challengeType; - sTrainerTowerOpponent->facilityClass = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].facilityClass; - sTrainerTowerOpponent->gender = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].gender; - SetVBlankCounter1Ptr(&gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0); - sub_815DD2C(); + sTrainerTowerOpponent->battleType = CURR_FLOOR.challengeType; + sTrainerTowerOpponent->facilityClass = CURR_FLOOR.trainers[trainerId].facilityClass; + sTrainerTowerOpponent->gender = CURR_FLOOR.trainers[trainerId].gender; + SetVBlankCounter1Ptr(&TRAINER_TOWER.timer); + FreeTrainerTowerDataStruct(); } void FreeTrainerTowerBattleStruct(void) { - Free(sTrainerTowerOpponent); - sTrainerTowerOpponent = NULL; + FREE_AND_SET_NULL(sTrainerTowerOpponent); } -void sub_815DBF4(u8 *dest, u8 opponentIdx) -// TTower_GetBeforeBattleMessage? +void GetTrainerTowerOpponentWinText(u8 *dest, u8 opponentIdx) { VarSet(VAR_TEMP_3, opponentIdx); TrainerTowerGetOpponentTextColor(sTrainerTowerOpponent->battleType, sTrainerTowerOpponent->facilityClass); @@ -502,8 +504,7 @@ void sub_815DBF4(u8 *dest, u8 opponentIdx) TT_ConvertEasyChatMessageToString(sTrainerTowerOpponent->speechWin2, dest); } -void sub_815DC40(u8 *dest, u8 opponentIdx) -// TTower_GetAfterBattleMessage? +void GetTrainerTowerOpponentLoseText(u8 *dest, u8 opponentIdx) { VarSet(VAR_TEMP_3, opponentIdx); TrainerTowerGetOpponentTextColor(sTrainerTowerOpponent->battleType, sTrainerTowerOpponent->facilityClass); @@ -513,23 +514,23 @@ void sub_815DC40(u8 *dest, u8 opponentIdx) TT_ConvertEasyChatMessageToString(sTrainerTowerOpponent->speechLose2, dest); } -static void sub_815DC8C(void) // fakematching +static void SetUpTrainerTowerDataStruct(void) // fakematching { - u32 whichTimer = gSaveBlock1Ptr->unkArrayIdx; + u32 challengeType = gSaveBlock1Ptr->towerChallengeId; s32 r4; const struct TrainerTowerFloor *const * r7; sTrainerTowerState = AllocZeroed(sizeof(*sTrainerTowerState)); sTrainerTowerState->floorIdx = gMapHeader.mapLayoutId - 42; - if (sub_815D834() == TRUE) + if (ReadTrainerTowerAndValidate() == TRUE) CEReaderTool_LoadTrainerTower(&sTrainerTowerState->unk_0004); else { struct UnkStruct_203F458 * r0_ = sTrainerTowerState; - const struct EReaderTrainerHillSetSubstruct * r1 = &gUnknown_84827AC; - memcpy(&r0_->unk_0004, r1, sizeof(struct EReaderTrainerHillSetSubstruct)); - r7 = gUnknown_84827B4[whichTimer]; - for (r4 = 0; r4 < 8; r4++) + const struct EReaderTrainerTowerSetSubstruct * r1 = &gUnknown_84827AC; + memcpy(&r0_->unk_0004, r1, sizeof(struct EReaderTrainerTowerSetSubstruct)); + r7 = gUnknown_84827B4[challengeType]; + for (r4 = 0; r4 < MAX_TRAINER_TOWER_FLOORS; r4++) { #ifndef NONMATCHING void * r5; @@ -547,22 +548,21 @@ static void sub_815DC8C(void) // fakematching } } -static void sub_815DD2C(void) +static void FreeTrainerTowerDataStruct(void) { - Free(sTrainerTowerState); - sTrainerTowerState = NULL; + FREE_AND_SET_NULL(sTrainerTowerState); } -static void sub_815DD44(void) +static void InitTrainerTowerFloor(void) { - if (gMapHeader.mapLayoutId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY > sTrainerTowerState->unk_0004.count) + if (gMapHeader.mapLayoutId - LAYOUT_TRAINER_TOWER_LOBBY > sTrainerTowerState->unk_0004.numFloors) { - gSpecialVar_Result = 3; - SetCurrentMapLayout(LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF); + gSpecialVar_Result = 3; // Skip past usable challenge types + SetCurrentMapLayout(LAYOUT_TRAINER_TOWER_ROOF); } else { - gSpecialVar_Result = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].challengeType; + gSpecialVar_Result = CURR_FLOOR.challengeType; SetCurrentMapLayout(sFloorLayouts[sTrainerTowerState->floorIdx][gSpecialVar_Result]); SetTrainerTowerNPCGraphics(); } @@ -570,66 +570,70 @@ static void sub_815DD44(void) static void SetTrainerTowerNPCGraphics(void) { - s32 r3, r4; - u8 r1, r2, r4_; - switch (sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].challengeType) + s32 i, j; + u8 trainerGfx1, trainerGfx2, facilityClass; + switch (CURR_FLOOR.challengeType) { - case 0: - r2 = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[0].facilityClass; - for (r3 = 0; r3 < NELEMS(sSingleBattleTrainerInfo); r3++) + case CHALLENGE_TYPE_SINGLE: + facilityClass = CURR_FLOOR.trainers[0].facilityClass; + for (i = 0; i < NELEMS(sSingleBattleTrainerInfo); i++) { - if (sSingleBattleTrainerInfo[r3].facilityClass == r2) + if (sSingleBattleTrainerInfo[i].facilityClass == facilityClass) break; } - if (r3 != NELEMS(sSingleBattleTrainerInfo)) - r1 = sSingleBattleTrainerInfo[r3].mapObjGfx; + + if (i != NELEMS(sSingleBattleTrainerInfo)) + trainerGfx1 = sSingleBattleTrainerInfo[i].objGfx; else - r1 = 18; - VarSet(VAR_OBJ_GFX_ID_1, r1); + trainerGfx1 = OBJECT_EVENT_GFX_YOUNGSTER; + + VarSet(VAR_OBJ_GFX_ID_1, trainerGfx1); break; - case 1: - r2 = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[0].facilityClass; - for (r3 = 0; r3 < NELEMS(sDoubleBattleTrainerInfo); r3++) + case CHALLENGE_TYPE_DOUBLE: + facilityClass = CURR_FLOOR.trainers[0].facilityClass; + for (i = 0; i < NELEMS(sDoubleBattleTrainerInfo); i++) { - if (sDoubleBattleTrainerInfo[r3].facilityClass == r2) + if (sDoubleBattleTrainerInfo[i].facilityClass == facilityClass) break; } - if (r3 != NELEMS(sDoubleBattleTrainerInfo)) + if (i != NELEMS(sDoubleBattleTrainerInfo)) { - r1 = sDoubleBattleTrainerInfo[r3].mapObjGfx1; - r4_ = sDoubleBattleTrainerInfo[r3].mapObjGfx2; + trainerGfx1 = sDoubleBattleTrainerInfo[i].objGfx1; + trainerGfx2 = sDoubleBattleTrainerInfo[i].objGfx2; } else { - r1 = OBJECT_EVENT_GFX_YOUNGSTER; - r4_ = OBJECT_EVENT_GFX_YOUNGSTER; + trainerGfx1 = OBJECT_EVENT_GFX_YOUNGSTER; + trainerGfx2 = OBJECT_EVENT_GFX_YOUNGSTER; } - VarSet(VAR_OBJ_GFX_ID_0, r1); - VarSet(VAR_OBJ_GFX_ID_3, r4_); + VarSet(VAR_OBJ_GFX_ID_0, trainerGfx1); + VarSet(VAR_OBJ_GFX_ID_3, trainerGfx2); break; - case 2: - for (r4 = 0; r4 < 3; r4++) + case CHALLENGE_TYPE_KNOCKOUT: + for (j = 0; j < MAX_TRAINERS_PER_FLOOR; j++) { - r2 = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r4].facilityClass; - for (r3 = 0; r3 < NELEMS(sSingleBattleTrainerInfo); r3++) + facilityClass = CURR_FLOOR.trainers[j].facilityClass; + for (i = 0; i < NELEMS(sSingleBattleTrainerInfo); i++) { - if (sSingleBattleTrainerInfo[r3].facilityClass == r2) + if (sSingleBattleTrainerInfo[i].facilityClass == facilityClass) break; } - if (r3 != NELEMS(sSingleBattleTrainerInfo)) - r1 = sSingleBattleTrainerInfo[r3].mapObjGfx; + + if (i != NELEMS(sSingleBattleTrainerInfo)) + trainerGfx1 = sSingleBattleTrainerInfo[i].objGfx; else - r1 = OBJECT_EVENT_GFX_YOUNGSTER; - switch (r4) + trainerGfx1 = OBJECT_EVENT_GFX_YOUNGSTER; + + switch (j) { case 0: - VarSet(VAR_OBJ_GFX_ID_2, r1); + VarSet(VAR_OBJ_GFX_ID_2, trainerGfx1); break; case 1: - VarSet(VAR_OBJ_GFX_ID_0, r1); + VarSet(VAR_OBJ_GFX_ID_0, trainerGfx1); break; case 2: - VarSet(VAR_OBJ_GFX_ID_1, r1); + VarSet(VAR_OBJ_GFX_ID_1, trainerGfx1); break; } } @@ -652,207 +656,224 @@ static void TT_ConvertEasyChatMessageToString(u16 *ecWords, u8 *dest) } } -static void sub_815DF54(void) +static void BufferTowerOpponentSpeech(void) { - u16 r4 = gSpecialVar_0x8006; - u8 r1; - u8 r5 = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].challengeType; + u16 trainerId = gSpecialVar_0x8006; + u8 facilityClass; + u8 challengeType = CURR_FLOOR.challengeType; - if (r5 != 1) - r1 = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r4].facilityClass; + if (challengeType != CHALLENGE_TYPE_DOUBLE) + facilityClass = CURR_FLOOR.trainers[trainerId].facilityClass; else - r1 = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[0].facilityClass; + facilityClass = CURR_FLOOR.trainers[0].facilityClass; + switch (gSpecialVar_0x8005) { - case 2: - TrainerTowerGetOpponentTextColor(r5, r1); - TT_ConvertEasyChatMessageToString(sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r4].speechBefore, gStringVar4); + case TRAINER_TOWER_TEXT_INTRO: + TrainerTowerGetOpponentTextColor(challengeType, facilityClass); + TT_ConvertEasyChatMessageToString(CURR_FLOOR.trainers[trainerId].speechBefore, gStringVar4); break; - case 3: - TrainerTowerGetOpponentTextColor(r5, r1); - TT_ConvertEasyChatMessageToString(sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r4].speechWin, gStringVar4); + case TRAINER_TOWER_TEXT_PLAYER_LOST: + TrainerTowerGetOpponentTextColor(challengeType, facilityClass); + TT_ConvertEasyChatMessageToString(CURR_FLOOR.trainers[trainerId].speechWin, gStringVar4); break; - case 4: - TrainerTowerGetOpponentTextColor(r5, r1); - TT_ConvertEasyChatMessageToString(sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r4].speechLose, gStringVar4); + case TRAINER_TOWER_TEXT_PLAYER_WON: + TrainerTowerGetOpponentTextColor(challengeType, facilityClass); + TT_ConvertEasyChatMessageToString(CURR_FLOOR.trainers[trainerId].speechLose, gStringVar4); break; - case 5: - TT_ConvertEasyChatMessageToString(sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r4].speechAfter, gStringVar4); + case TRAINER_TOWER_TEXT_AFTER: + TT_ConvertEasyChatMessageToString(CURR_FLOOR.trainers[trainerId].speechAfter, gStringVar4); break; } } -static void TrainerTowerGetOpponentTextColor(u8 battleType, u8 facilityClass) +static void TrainerTowerGetOpponentTextColor(u8 challengeType, u8 facilityClass) { - u16 r5 = FALSE; - s32 r4; - switch (battleType) + u16 gender = MALE; + int i; + switch (challengeType) { - case 0: - case 2: - for (r4 = 0; r4 < NELEMS(sSingleBattleTrainerInfo); r4++) + case CHALLENGE_TYPE_SINGLE: + case CHALLENGE_TYPE_KNOCKOUT: + for (i = 0; i < NELEMS(sSingleBattleTrainerInfo); i++) { - if (sSingleBattleTrainerInfo[r4].facilityClass == facilityClass) + if (sSingleBattleTrainerInfo[i].facilityClass == facilityClass) break; } - if (r4 != NELEMS(sSingleBattleTrainerInfo)) - r5 = sSingleBattleTrainerInfo[r4].gender; + if (i != NELEMS(sSingleBattleTrainerInfo)) + gender = sSingleBattleTrainerInfo[i].gender; break; - case 1: - for (r4 = 0; r4 < NELEMS(sDoubleBattleTrainerInfo); r4++) + case CHALLENGE_TYPE_DOUBLE: + for (i = 0; i < NELEMS(sDoubleBattleTrainerInfo); i++) { - if (sDoubleBattleTrainerInfo[r4].facilityClass == facilityClass) + if (sDoubleBattleTrainerInfo[i].facilityClass == facilityClass) break; } - if (r4 != NELEMS(sDoubleBattleTrainerInfo)) + if (i != NELEMS(sDoubleBattleTrainerInfo)) { if (VarGet(VAR_TEMP_3)) - r5 = sDoubleBattleTrainerInfo[r4].gender2; + gender = sDoubleBattleTrainerInfo[i].gender2; else - r5 = sDoubleBattleTrainerInfo[r4].gender1; + gender = sDoubleBattleTrainerInfo[i].gender1; } break; } gSpecialVar_PrevTextColor = gSpecialVar_TextColor; - gSpecialVar_TextColor = r5; + gSpecialVar_TextColor = gender; } -static void sub_815E114(void) +static void CB2_EndTrainerTowerBattle(void) { SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } -static void sub_815E124(u8 taskId) +static void Task_DoTrainerTowerBattle(u8 taskId) { if (BT_IsDone() == TRUE) { - gMain.savedCallback = sub_815E114; + gMain.savedCallback = CB2_EndTrainerTowerBattle; CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_InitBattle); DestroyTask(taskId); } } -static void sub_815E160(void) +static void DoTrainerTowerBattle(void) { gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_TRAINER_TOWER; - if (sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].challengeType == 1) + + if (CURR_FLOOR.challengeType == CHALLENGE_TYPE_DOUBLE) gBattleTypeFlags |= BATTLE_TYPE_DOUBLE; + gTrainerBattleOpponent_A = 0; BuildEnemyParty(); - CreateTask(sub_815E124, 1); + CreateTask(Task_DoTrainerTowerBattle, 1); PlayMapChosenOrBattleBGM(0); BT_StartOnField(BattleSetup_GetBattleTowerBattleTransition()); } -static void sub_815E1C0(void) +static void TrainerTowerGetChallengeType(void) { if (!gSpecialVar_0x8005) - gSpecialVar_Result = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].challengeType; + gSpecialVar_Result = CURR_FLOOR.challengeType; } -static void sub_815E1F0(void) +static void TrainerTowerAddFloorCleared(void) { - gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8++; + TRAINER_TOWER.floorsCleared++; } -static void TTSpecial_HasReachedTheRoof(void) +// So the player can safely go back through defeated floors to use the Poke Center (or exit challenge) +static void GetFloorAlreadyCleared(void) { u16 mapLayoutId = gMapHeader.mapLayoutId; - if (mapLayoutId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F == gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8 && mapLayoutId - LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY <= sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].floorIdx) + if (mapLayoutId - LAYOUT_TRAINER_TOWER_1F == TRAINER_TOWER.floorsCleared + && mapLayoutId - LAYOUT_TRAINER_TOWER_LOBBY <= CURR_FLOOR.floorIdx) gSpecialVar_Result = FALSE; else gSpecialVar_Result = TRUE; } -static void sub_815E28C(void) +static void StartTrainerTowerChallenge(void) { - gSaveBlock1Ptr->unkArrayIdx = gSpecialVar_0x8005; - if (gSaveBlock1Ptr->unkArrayIdx >= NELEMS(gSaveBlock1Ptr->unkArray)) - gSaveBlock1Ptr->unkArrayIdx = 0; + gSaveBlock1Ptr->towerChallengeId = gSpecialVar_0x8005; + if (gSaveBlock1Ptr->towerChallengeId >= NUM_TOWER_CHALLENGE_TYPES) + gSaveBlock1Ptr->towerChallengeId = 0; ValidateOrResetCurTrainerTowerRecord(); - if (!sub_815D834()) - gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_5 = TRUE; + if (!ReadTrainerTowerAndValidate()) + TRAINER_TOWER.validated = TRUE; else - gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_5 = FALSE; - gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8 = 0; - SetVBlankCounter1Ptr(&gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0); - gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0 = 0; - gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_2 = FALSE; - gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_1 = FALSE; + TRAINER_TOWER.validated = FALSE; + TRAINER_TOWER.floorsCleared = 0; + SetVBlankCounter1Ptr(&TRAINER_TOWER.timer); + TRAINER_TOWER.timer = 0; + TRAINER_TOWER.spokeToOwner = FALSE; + TRAINER_TOWER.checkedFinalTime = FALSE; } -static void sub_815E394(void) +static void GetOwnerState(void) { DisableVBlankCounter1(); gSpecialVar_Result = 0; - if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_2) + + if (TRAINER_TOWER.spokeToOwner) gSpecialVar_Result++; - if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_0 && gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_1) + if (TRAINER_TOWER.receivedPrize && TRAINER_TOWER.checkedFinalTime) gSpecialVar_Result++; - gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_2 = TRUE; + + TRAINER_TOWER.spokeToOwner = TRUE; } -static void sub_815E408(void) +static void GiveChallengePrize(void) { - u16 itemId = gUnknown_847A2B4[sTrainerTowerState->unk_0004.floors->prize]; - if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_0) + u16 itemId = sPrizeList[sTrainerTowerState->unk_0004.floors->prize]; + + if (TRAINER_TOWER.receivedPrize) + { gSpecialVar_Result = 2; - else if (AddBagItem(itemId, 1) == 1) + } + else if (AddBagItem(itemId, 1) == TRUE) { CopyItemName(itemId, gStringVar2); - gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_0 = TRUE; + TRAINER_TOWER.receivedPrize = TRUE; gSpecialVar_Result = 0; } else + { gSpecialVar_Result = 1; + } } -static void sub_815E4B0(void) +static void CheckFinalTime(void) { - if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_1) + if (TRAINER_TOWER.checkedFinalTime) + { gSpecialVar_Result = 2; - else if (GetTrainerTowerRecordTime(&gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk4) > gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0) + } + else if (GetTrainerTowerRecordTime(&TRAINER_TOWER.bestTime) > TRAINER_TOWER.timer) { - SetTrainerTowerRecordTime(&gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk4, gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0); + SetTrainerTowerRecordTime(&TRAINER_TOWER.bestTime, TRAINER_TOWER.timer); gSpecialVar_Result = 0; } else + { gSpecialVar_Result = 1; - gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_1 = TRUE; + } + + TRAINER_TOWER.checkedFinalTime = TRUE; } -static void TTSpecial_StartTimer(void) +static void TrainerTowerResumeTimer(void) { - if (!gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_2) + if (!TRAINER_TOWER.spokeToOwner) { - if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0 >= 215999) - gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0 = 215999; + if (TRAINER_TOWER.timer >= TRAINER_TOWER_MAX_TIME) + TRAINER_TOWER.timer = TRAINER_TOWER_MAX_TIME; else - SetVBlankCounter1Ptr(&gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0); + SetVBlankCounter1Ptr(&TRAINER_TOWER.timer); } } -static void sub_815E5C4(void) +static void TrainerTowerSetPlayerLost(void) { - gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_3 = 1; + TRAINER_TOWER.hasLost = TRUE; } -static void sub_815E5F0(void) +static void GetTrainerTowerChallengeStatus(void) { - if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_3) + if (TRAINER_TOWER.hasLost) { - gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_3 = FALSE; - gSpecialVar_Result = 0; + TRAINER_TOWER.hasLost = FALSE; + gSpecialVar_Result = CHALLENGE_STATUS_LOST; } - else if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_4) + else if (TRAINER_TOWER.unkA_4) { - gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_4 = FALSE; - gSpecialVar_Result = 1; + TRAINER_TOWER.unkA_4 = FALSE; + gSpecialVar_Result = CHALLENGE_STATUS_UNK; } else { - gSpecialVar_Result = 2; + gSpecialVar_Result = CHALLENGE_STATUS_NORMAL; } } @@ -861,8 +882,8 @@ static void sub_815E5F0(void) \ frames = (src); \ \ - minutes = frames / 3600; \ - frames %= 3600; \ + minutes = frames / (60 * 60); \ + frames %= (60 * 60); \ seconds = frames / 60; \ frames %= 60; \ centiseconds = frames * 168 / 100; \ @@ -872,34 +893,34 @@ static void sub_815E5F0(void) ConvertIntToDecimalStringN(gStringVar3, centiseconds, STR_CONV_MODE_LEADING_ZEROS, 2); \ }) -static void sub_815E658(void) +static void GetCurrentTime(void) { - if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0 >= 215999) + if (TRAINER_TOWER.timer >= TRAINER_TOWER_MAX_TIME) { DisableVBlankCounter1(); - gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0 = 215999; + TRAINER_TOWER.timer = TRAINER_TOWER_MAX_TIME; } - PRINT_TOWER_TIME(gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0); + PRINT_TOWER_TIME(TRAINER_TOWER.timer); } -static void sub_815E720(void) +static void ShowResultsBoard(void) { u8 windowId; s32 i; ValidateOrResetCurTrainerTowerRecord(); - windowId = AddWindow(gUnknown_847A218); + windowId = AddWindow(sTimeBoardWindowTemplate); LoadStdWindowFrameGfx(); DrawStdWindowFrame(windowId, FALSE); - AddTextPrinterParameterized(windowId, 2, gUnknown_83FE982, 0x4A, 0, 0xFF, NULL); + AddTextPrinterParameterized(windowId, 2, gText_TimeBoard, 0x4A, 0, 0xFF, NULL); - for (i = 0; i < 4; i++) + for (i = 0; i < NUM_TOWER_CHALLENGE_TYPES; i++) { - PRINT_TOWER_TIME(GetTrainerTowerRecordTime(&gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk4)); + PRINT_TOWER_TIME(GetTrainerTowerRecordTime(&TRAINER_TOWER.bestTime)); - StringExpandPlaceholders(gStringVar4, gUnknown_83FE998); - AddTextPrinterParameterized(windowId, 2, gUnknown_83FE9C4[i - 1], 0x18, 0x24 + 0x14 * i, 0xFF, NULL); + StringExpandPlaceholders(gStringVar4, gText_XMinYZSec); + AddTextPrinterParameterized(windowId, 2, gTrainerTowerChallengeTypeTexts[i - 1], 0x18, 0x24 + 0x14 * i, 0xFF, NULL); AddTextPrinterParameterized(windowId, 2, gStringVar4, 0x60, 0x2E + 0x14 * i, 0xFF, NULL); } @@ -908,23 +929,24 @@ static void sub_815E720(void) VarSet(VAR_TEMP_1, windowId); } -static void sub_815E88C(void) +static void CloseResultsBoard(void) { u8 windowId = VarGet(VAR_TEMP_1); ClearStdWindowAndFrameToTransparent(windowId, TRUE); RemoveWindow(windowId); } -static void sub_815E8B4(void) +static void TrainerTowerGetDoublesEligiblity(void) { gSpecialVar_Result = GetMonsStateToDoubles(); } -static void sub_815E8CC(void) + +static void TrainerTowerGetNumFloors(void) { - if (sTrainerTowerState->unk_0004.count != sTrainerTowerState->unk_0004.floors[0].floorIdx) + if (sTrainerTowerState->unk_0004.numFloors != sTrainerTowerState->unk_0004.floors[0].floorIdx) { - ConvertIntToDecimalStringN(gStringVar1, sTrainerTowerState->unk_0004.count, STR_CONV_MODE_LEFT_ALIGN, 1); + ConvertIntToDecimalStringN(gStringVar1, sTrainerTowerState->unk_0004.numFloors, STR_CONV_MODE_LEFT_ALIGN, 1); gSpecialVar_Result = TRUE; } else @@ -933,79 +955,78 @@ static void sub_815E8CC(void) } } -static void sub_815E908(void) +// Dummied? equivalent to gSpecialVar_Result = FALSE +// If it were to return TRUE the player would be warped back to the lobby +static void ShouldWarpToCounter(void) { - if (gMapHeader.mapLayoutId == LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY && VarGet(VAR_MAP_SCENE_TRAINER_TOWER) == 0) - { + if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_TOWER_LOBBY && VarGet(VAR_MAP_SCENE_TRAINER_TOWER) == 0) gSpecialVar_Result = FALSE; - } else - { gSpecialVar_Result = FALSE; - } } -static void sub_815E948(void) +static void PlayTrainerTowerEncounterMusic(void) { s32 i; - u16 var_4001 = VarGet(VAR_TEMP_1); - u8 r1 = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[var_4001].facilityClass; + u16 idx = VarGet(VAR_TEMP_1); + u8 facilityClass = CURR_FLOOR.trainers[idx].facilityClass; for (i = 0; i < NELEMS(sTrainerEncounterMusicLUT); i++) { - if (sTrainerEncounterMusicLUT[i].unk0 == gFacilityClassToTrainerClass[r1]) + if (sTrainerEncounterMusicLUT[i].facilityClass == gFacilityClassToTrainerClass[facilityClass]) break; } + if (i != NELEMS(sTrainerEncounterMusicLUT)) { - var_4001 = sTrainerEncounterMusicLUT[i].unk1; + idx = sTrainerEncounterMusicLUT[i].musicId; } else { - var_4001 = 0; + idx = 0; } - PlayNewMapMusic(gUnknown_847A2D2[var_4001]); + PlayNewMapMusic(sTrainerTowerEncounterMusic[idx]); } -static void sub_815E9C8(void) +static void HasSpokenToOwner(void) { - gSpecialVar_Result = gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_2; + gSpecialVar_Result = TRAINER_TOWER.spokeToOwner; } static void BuildEnemyParty(void) { u16 trainerIdx = VarGet(VAR_TEMP_1); s32 level = GetPartyMaxLevel(); - u8 floorIdx = gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8; + u8 floorIdx = TRAINER_TOWER.floorsCleared; s32 i; u8 monIdx; ZeroEnemyPartyMons(); - switch (sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].challengeType) + switch (CURR_FLOOR.challengeType) { - case 0: + case CHALLENGE_TYPE_SINGLE: default: for (i = 0; i < 2; i++) { monIdx = sSingleBattleChallengeMonIdxs[floorIdx][i]; - sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[trainerIdx].mons[monIdx].level = level; - CreateBattleTowerMon(&gEnemyParty[i], &sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[trainerIdx].mons[monIdx]); + CURR_FLOOR.trainers[trainerIdx].mons[monIdx].level = level; + CreateBattleTowerMon(&gEnemyParty[i], &CURR_FLOOR.trainers[trainerIdx].mons[monIdx]); } break; - case 1: + case CHALLENGE_TYPE_DOUBLE: monIdx = sDoubleBattleChallengeMonIdxs[floorIdx][0]; - sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[0].mons[monIdx].level = level; - CreateBattleTowerMon(&gEnemyParty[0], &sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[0].mons[monIdx]); + CURR_FLOOR.trainers[0].mons[monIdx].level = level; + CreateBattleTowerMon(&gEnemyParty[0], &CURR_FLOOR.trainers[0].mons[monIdx]); monIdx = sDoubleBattleChallengeMonIdxs[floorIdx][1]; - sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[1].mons[monIdx].level = level; - CreateBattleTowerMon(&gEnemyParty[1], &sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[1].mons[monIdx]); + CURR_FLOOR.trainers[1].mons[monIdx].level = level; + CreateBattleTowerMon(&gEnemyParty[1], &CURR_FLOOR.trainers[1].mons[monIdx]); break; - case 2: + case CHALLENGE_TYPE_KNOCKOUT: monIdx = sKnockoutChallengeMonIdxs[floorIdx][trainerIdx]; - sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[trainerIdx].mons[monIdx].level = level; - CreateBattleTowerMon(&gEnemyParty[0], &sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[trainerIdx].mons[monIdx]); + CURR_FLOOR.trainers[trainerIdx].mons[monIdx].level = level; + CreateBattleTowerMon(&gEnemyParty[0], &CURR_FLOOR.trainers[trainerIdx].mons[monIdx]); break; } } @@ -1030,11 +1051,11 @@ static s32 GetPartyMaxLevel(void) static void ValidateOrResetCurTrainerTowerRecord(void) { - if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk9 != sTrainerTowerState->unk_0004.id) + if (TRAINER_TOWER.unk9 != sTrainerTowerState->unk_0004.id) { - gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk9 = sTrainerTowerState->unk_0004.id; - SetTrainerTowerRecordTime(&gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk4, 215999); - gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_0 = FALSE; + TRAINER_TOWER.unk9 = sTrainerTowerState->unk_0004.id; + SetTrainerTowerRecordTime(&TRAINER_TOWER.bestTime, TRAINER_TOWER_MAX_TIME); + TRAINER_TOWER.receivedPrize = FALSE; } } @@ -1043,22 +1064,22 @@ void PrintTrainerTowerRecords(void) s32 i; u8 windowId = 0; - sub_815DC8C(); + SetUpTrainerTowerDataStruct(); FillWindowPixelRect(0, 0, 0, 0, 0xd8, 0x90); ValidateOrResetCurTrainerTowerRecord(); - AddTextPrinterParameterized3(0, 2, 0x4a, 0, gUnknown_847A22C, 0, gUnknown_83FE982); + AddTextPrinterParameterized3(0, 2, 0x4a, 0, sTextColors, 0, gText_TimeBoard); - for (i = 0; i < 4; i++) + for (i = 0; i < NUM_TOWER_CHALLENGE_TYPES; i++) { - PRINT_TOWER_TIME(GetTrainerTowerRecordTime(&gSaveBlock1Ptr->unkArray[i].unk4)); - StringExpandPlaceholders(gStringVar4, gUnknown_83FE998); - AddTextPrinterParameterized3(windowId, 2, 0x18, 0x24 + 0x14 * i, gUnknown_847A22C, 0, gUnknown_83FE9C4[i]); - AddTextPrinterParameterized3(windowId, 2, 0x60, 0x24 + 0x14 * i, gUnknown_847A22C, 0, gStringVar4); + PRINT_TOWER_TIME(GetTrainerTowerRecordTime(&gSaveBlock1Ptr->trainerTower[i].bestTime)); + StringExpandPlaceholders(gStringVar4, gText_XMinYZSec); + AddTextPrinterParameterized3(windowId, 2, 0x18, 0x24 + 0x14 * i, sTextColors, 0, gTrainerTowerChallengeTypeTexts[i]); + AddTextPrinterParameterized3(windowId, 2, 0x60, 0x24 + 0x14 * i, sTextColors, 0, gStringVar4); } PutWindowTilemap(windowId); CopyWindowToVram(windowId, 3); - sub_815DD2C(); + FreeTrainerTowerDataStruct(); } static u32 GetTrainerTowerRecordTime(u32 *counter) @@ -1075,8 +1096,8 @@ void ResetTrainerTowerResults(void) { s32 i; - for (i = 0; i < 4; i++) + for (i = 0; i < NUM_TOWER_CHALLENGE_TYPES; i++) { - SetTrainerTowerRecordTime(&gSaveBlock1Ptr->unkArray[i].unk4, 215999); + SetTrainerTowerRecordTime(&gSaveBlock1Ptr->trainerTower[i].bestTime, TRAINER_TOWER_MAX_TIME); } } |