diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-26 05:41:22 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-26 05:41:22 -0500 |
| commit | f637ade6b3ad2434a3bb3b39b23c77ab3651b02d (patch) | |
| tree | 539f8de9498e4b79babcfd1ccd129587e001204a | |
| parent | bf7bab92e2e144920de20867205c43475406c18c (diff) | |
Document Silph Co scripts
36 files changed, 585 insertions, 624 deletions
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..5daf1e5b8 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -1,7 +1,7 @@ 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 @@ -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/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index a7726f3e6..a740b15ed 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -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 |