diff options
40 files changed, 697 insertions, 642 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 4cb25db68..63d54de48 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -689,6 +689,7 @@ gStdScriptsEnd:: .include "data/maps/VermilionCity_House1/text.inc" .include "data/maps/VermilionCity_PokemonCenter_1F/text.inc" .include "data/maps/VermilionCity_PokemonFanClub/text.inc" + .include "data/maps/VermilionCity_House2/text.inc" .include "data/maps/VermilionCity_Mart/text.inc" .include "data/maps/VermilionCity_Gym/text.inc" .include "data/maps/VermilionCity_House3/text.inc" @@ -1112,13 +1113,7 @@ Text_FoundTMHMContainsMove:: @ 81A63E8 .string "{PLAYER} found a {STR_VAR_2}!\n" .string "It contains {STR_VAR_1}.$" -Text_1A6407:: @ 81A6407 - .string "おつかれさん！\n" - .string "どこに いきたいんだ？$" - -Text_1A641B:: @ 81A641B - .string "All right!\n" - .string "All aboard SEAGALLOP HI-SPEED {STR_VAR_1}!$" + .include "data/text/seagallop.inc" @ Call for legendary bird trio Text_Gyaoo:: @ 81A6448 @@ -1607,21 +1602,21 @@ Common_EventScript_DirectCornerAttendant:: @ 81A8D02 call CableClub_EventScript_DirectCornerAttendant end -VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08 +VermilionCity_PokemonCenter_1F_EventScript_VSSeekerWoman:: @ 81A8D08 lock faceplayer - goto_if_set FLAG_GOT_VS_SEEKER, EventScript_1A8D3F - msgbox Text_194234 + goto_if_set FLAG_GOT_VS_SEEKER, VermilionCity_PokemonCenter_1F_EventScript_ExplainVSSeeker + msgbox VermilionCity_PokemonCenter_1F_Text_UrgeToBattleSomeoneAgain setflag FLAG_GOT_VS_SEEKER giveitem ITEM_VS_SEEKER compare VAR_RESULT, FALSE goto_if_eq EventScript_BagIsFull - msgbox Text_19430F + msgbox VermilionCity_PokemonCenter_1F_Text_UseDeviceForRematches release end -EventScript_1A8D3F:: @ 81A8D3F - msgbox Text_194381 +VermilionCity_PokemonCenter_1F_EventScript_ExplainVSSeeker:: @ 81A8D3F + msgbox VermilionCity_PokemonCenter_1F_Text_ExplainVSSeeker release end diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index b3cd646b4..57b039997 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -209,7 +209,7 @@ EventScript_1670E6:: @ 81670E6 setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1 setvar VAR_0x8004, SEAGALLOP_CINNABAR_ISLAND setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND - goto EventScript_1A90DA + goto EventScript_SetSail end EventScript_167142:: @ 8167142 diff --git a/data/maps/FiveIsland_Harbor/scripts.inc b/data/maps/FiveIsland_Harbor/scripts.inc index 71f305d0b..47ee3487f 100644 --- a/data/maps/FiveIsland_Harbor/scripts.inc +++ b/data/maps/FiveIsland_Harbor/scripts.inc @@ -7,5 +7,5 @@ FiveIsland_Harbor_EventScript_171D43:: @ 8171D43 message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_FIVE_ISLAND - goto EventScript_1A900F + goto EventScript_ChooseDestFromIsland end diff --git a/data/maps/FourIsland_Harbor/scripts.inc b/data/maps/FourIsland_Harbor/scripts.inc index 39d98de68..d8933d783 100644 --- a/data/maps/FourIsland_Harbor/scripts.inc +++ b/data/maps/FourIsland_Harbor/scripts.inc @@ -7,5 +7,5 @@ FourIsland_Harbor_EventScript_171C99:: @ 8171C99 message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_FOUR_ISLAND - goto EventScript_1A900F + goto EventScript_ChooseDestFromIsland end diff --git a/data/maps/LavenderTown_Mart/text.inc b/data/maps/LavenderTown_Mart/text.inc index a5b0a4968..cdf25450e 100644 --- a/data/maps/LavenderTown_Mart/text.inc +++ b/data/maps/LavenderTown_Mart/text.inc @@ -18,3 +18,8 @@ LavenderTown_Mart_Text_TrainerDuosCanChallengeYou:: @ 8193DF1 .string "If that happens, you have to send\n" .string "out two POKéMON to battle, too.$" +LavenderTown_Mart_Text_SoldNuggetFromMountainsFor5000:: @ 8193E82 + .string "この あいだ やまおくで\n" + .string "きんのたまを ひろい ましてね！\p" + .string "つかえない しなもの ですが\n" + .string "うったら なんと 5000¥でした$" diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc index 754c6f7c6..bbbe36fb9 100644 --- a/data/maps/OneIsland_Harbor/scripts.inc +++ b/data/maps/OneIsland_Harbor/scripts.inc @@ -38,5 +38,5 @@ OneIsland_Harbor_EventScript_1713BD:: @ 81713BD message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_ONE_ISLAND - goto EventScript_1A8EC5 + goto EventScript_ChooseDestFromOneIsland end diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 4f1a059ad..05f00c76b 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -503,7 +503,7 @@ EventScript_1711DA:: @ 81711DA setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 3 setvar VAR_0x8004, SEAGALLOP_ONE_ISLAND setvar VAR_0x8006, SEAGALLOP_CINNABAR_ISLAND - goto EventScript_1A90DA + goto EventScript_SetSail end EventScript_1712E4:: @ 81712E4 diff --git a/data/maps/SevenIsland_Harbor/scripts.inc b/data/maps/SevenIsland_Harbor/scripts.inc index dfa2da755..f042ca668 100644 --- a/data/maps/SevenIsland_Harbor/scripts.inc +++ b/data/maps/SevenIsland_Harbor/scripts.inc @@ -7,5 +7,5 @@ SevenIsland_Harbor_EventScript_170BE5:: @ 8170BE5 message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_SEVEN_ISLAND - goto EventScript_1A900F + goto EventScript_ChooseDestFromIsland end diff --git a/data/maps/SixIsland_Harbor/scripts.inc b/data/maps/SixIsland_Harbor/scripts.inc index 8db4500ca..11ed9c7b8 100644 --- a/data/maps/SixIsland_Harbor/scripts.inc +++ b/data/maps/SixIsland_Harbor/scripts.inc @@ -7,5 +7,5 @@ SixIsland_Harbor_EventScript_171E48:: @ 8171E48 message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_SIX_ISLAND - goto EventScript_1A900F + goto EventScript_ChooseDestFromIsland end diff --git a/data/maps/ThreeIsland_Harbor/scripts.inc b/data/maps/ThreeIsland_Harbor/scripts.inc index 0edd8cac9..6705741cb 100644 --- a/data/maps/ThreeIsland_Harbor/scripts.inc +++ b/data/maps/ThreeIsland_Harbor/scripts.inc @@ -7,5 +7,5 @@ ThreeIsland_Harbor_EventScript_171EAA:: @ 8171EAA message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_THREE_ISLAND - goto EventScript_1A900F + goto EventScript_ChooseDestFromIsland end diff --git a/data/maps/TwoIsland_Harbor/scripts.inc b/data/maps/TwoIsland_Harbor/scripts.inc index ff1bb82bf..8c2eab36d 100644 --- a/data/maps/TwoIsland_Harbor/scripts.inc +++ b/data/maps/TwoIsland_Harbor/scripts.inc @@ -7,5 +7,5 @@ TwoIsland_Harbor_EventScript_171806:: @ 8171806 message Text_WhereDoYouWantToSail waitmessage setvar VAR_0x8004, SEAGALLOP_TWO_ISLAND - goto EventScript_1A8F54 + goto EventScript_ChooseDestFromTwoIsland end diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index e4286aa87..0a5fe287a 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_EventScript_166917", + "script": "VermilionCity_EventScript_Woman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_EventScript_166920", + "script": "VermilionCity_EventScript_OldMan1", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_EventScript_166C2F", + "script": "VermilionCity_EventScript_OldMan2", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 2, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_EventScript_166C38", + "script": "VermilionCity_EventScript_Machop", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_EventScript_166C17", + "script": "VermilionCity_EventScript_Sailor", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_EventScript_166941", + "script": "VermilionCity_EventScript_FerrySailor", "flag": "0" }, { @@ -125,7 +125,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_EventScript_166C20", + "script": "VermilionCity_EventScript_OaksAide", "flag": "FLAG_HIDE_VERMILION_CITY_OAKS_AIDE" } ], @@ -209,7 +209,7 @@ "elevation": 0, "var": "VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER", "var_value": 0, - "script": "VermilionCity_EventScript_166B8A" + "script": "VermilionCity_EventScript_CheckTicketLeft" }, { "type": "trigger", @@ -218,7 +218,7 @@ "elevation": 0, "var": "VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER", "var_value": 0, - "script": "VermilionCity_EventScript_166B91" + "script": "VermilionCity_EventScript_CheckTicketRight" }, { "type": "trigger", @@ -227,7 +227,7 @@ "elevation": 0, "var": "VAR_TEMP_1", "var_value": 0, - "script": "VermilionCity_EventScript_166B98" + "script": "VermilionCity_EventScript_ExitedTicketCheck" }, { "type": "trigger", @@ -236,7 +236,7 @@ "elevation": 0, "var": "VAR_TEMP_1", "var_value": 0, - "script": "VermilionCity_EventScript_166B98" + "script": "VermilionCity_EventScript_ExitedTicketCheck" } ], "bg_events": [ @@ -245,35 +245,35 @@ "x": 33, "y": 6, "elevation": 0, - "script": "VermilionCity_EventScript_166C53" + "script": "VermilionCity_EventScript_CitySign" }, { "type": "bg_event_type_0", "x": 10, "y": 17, "elevation": 3, - "script": "VermilionCity_EventScript_166C65" + "script": "VermilionCity_EventScript_PokemonFanClubSign" }, { "type": "bg_event_type_0", "x": 10, "y": 24, "elevation": 0, - "script": "VermilionCity_EventScript_166C6E" + "script": "VermilionCity_EventScript_GymSign" }, { "type": "bg_event_type_0", "x": 34, "y": 18, "elevation": 0, - "script": "VermilionCity_EventScript_166C86" + "script": "VermilionCity_EventScript_HarborSign" }, { "type": "bg_event_type_0", "x": 45, "y": 17, "elevation": 3, - "script": "VermilionCity_EventScript_166C5C" + "script": "VermilionCity_EventScript_SnorlaxNotice" }, { "type": "hidden_item", diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index ad6a36007..0442f3d02 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -1,62 +1,64 @@ +.equ LOCALID_FERRY_SAILOR, 6 + VermilionCity_MapScripts:: @ 81668DC map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, VermilionCity_OnFrame .byte 0 VermilionCity_OnFrame:: @ 81668E7 - map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 2, EventScript_1668F1 + map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 2, VermilionCity_EventScript_ExitSSAnne .2byte 0 -EventScript_1668F1:: @ 81668F1 +VermilionCity_EventScript_ExitSSAnne:: @ 81668F1 lockall - applymovement OBJ_EVENT_ID_PLAYER, Movement_166903 + applymovement OBJ_EVENT_ID_PLAYER, VermilionCity_Movement_ExitSSAnne waitmovement 0 setvar VAR_MAP_SCENE_VERMILION_CITY, 3 releaseall end -Movement_166903:: @ 8166903 +VermilionCity_Movement_ExitSSAnne:: @ 8166903 walk_up walk_up step_end VermilionCity_OnTransition:: @ 8166906 setworldmapflag FLAG_WORLD_MAP_VERMILION_CITY - call_if_set FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION, EventScript_166913 + call_if_set FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION, VermilionCity_EventScript_HideOaksAide end -EventScript_166913:: @ 8166913 +VermilionCity_EventScript_HideOaksAide:: @ 8166913 setflag FLAG_HIDE_VERMILION_CITY_OAKS_AIDE return -VermilionCity_EventScript_166917:: @ 8166917 - msgbox gUnknown_817F723, MSGBOX_NPC +VermilionCity_EventScript_Woman:: @ 8166917 + msgbox VermilionCity_Text_GrimerMultipliesInSludge, MSGBOX_NPC end -VermilionCity_EventScript_166920:: @ 8166920 +VermilionCity_EventScript_OldMan1:: @ 8166920 lock faceplayer compare VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if_eq EventScript_166937 - msgbox gUnknown_817F776 + goto_if_eq VermilionCity_EventScript_OldMan1SSAnneLeft + msgbox VermilionCity_Text_DidYouSeeSSAnneInHarbor release end -EventScript_166937:: @ 8166937 - msgbox gUnknown_817F7A6 +VermilionCity_EventScript_OldMan1SSAnneLeft:: @ 8166937 + msgbox VermilionCity_Text_SSAnneHasDepartedForYear release end -VermilionCity_EventScript_166941:: @ 8166941 +VermilionCity_EventScript_FerrySailor:: @ 8166941 lock faceplayer compare VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if_eq EventScript_166996 - msgbox gUnknown_817FA22 + goto_if_eq VermilionCity_EventScript_CheckSeagallopPresent + msgbox VermilionCity_Text_WelcomeToTheSSAnne release end -EventScript_166958:: @ 8166958 +VermilionCity_EventScript_CheckHasMysticTicket:: @ 8166958 goto_if_unset FLAG_SYS_GOT_MYSTIC_TICKET, EventScript_SetResultFalse checkitem ITEM_MYSTIC_TICKET, 1 compare VAR_RESULT, FALSE @@ -64,7 +66,7 @@ EventScript_166958:: @ 8166958 goto EventScript_SetResultTrue end -EventScript_166977:: @ 8166977 +VermilionCity_EventScript_CheckHasAuroraTicket:: @ 8166977 goto_if_unset FLAG_SYS_GOT_AURORA_TICKET, EventScript_SetResultFalse checkitem ITEM_AURORA_TICKET, 1 compare VAR_RESULT, FALSE @@ -72,206 +74,207 @@ EventScript_166977:: @ 8166977 goto EventScript_SetResultTrue end -EventScript_166996:: @ 8166996 +VermilionCity_EventScript_CheckSeagallopPresent:: @ 8166996 setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if_ge EventScript_1669BB + goto_if_ge VermilionCity_EventScript_ChooseSeagallopDestRainbowPass compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 - goto_if_ge EventScript_166B3B - msgbox gUnknown_817FB10 + goto_if_ge VermilionCity_EventScript_ChooseSeagallopDestTriPass + msgbox VermilionCity_Text_TheShipSetSail release end -EventScript_1669BB:: @ 81669BB +VermilionCity_EventScript_ChooseSeagallopDestRainbowPass:: @ 81669BB goto_if_questlog EventScript_ReleaseEnd special sub_8112364 - call EventScript_166958 - compare VAR_RESULT, 1 - goto_if_eq EventScript_1669FD - call EventScript_166977 - compare VAR_RESULT, 1 - goto_if_eq EventScript_166A5F + call VermilionCity_EventScript_CheckHasMysticTicket + compare VAR_RESULT, TRUE + goto_if_eq VermilionCity_EventScript_HasMysticTicket + call VermilionCity_EventScript_CheckHasAuroraTicket + compare VAR_RESULT, TRUE + goto_if_eq VermilionCity_EventScript_HasAuroraTicket setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY - message Text_17FBB8 + message VermilionCity_Text_BoardSeagallopRainbowPass waitmessage - goto EventScript_1A911E + goto EventScript_SeviiDestinationsPage1 end -EventScript_1669FD:: @ 81669FD - call EventScript_166977 - compare VAR_RESULT, 1 - goto_if_eq EventScript_166AB1 - call_if_unset FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN, EventScript_166A53 - message Text_17FCC1 +VermilionCity_EventScript_HasMysticTicket:: @ 81669FD + call VermilionCity_EventScript_CheckHasAuroraTicket + compare VAR_RESULT, TRUE + goto_if_eq VermilionCity_EventScript_HasMysticAndAuroraTickets + call_if_unset FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN, VermilionCity_EventScript_ShowMysticTicket + message VermilionCity_Text_BoardSeagallopFerry waitmessage multichoice 17, 6, MULTICHOICE_SEVII_NAVEL, FALSE switch VAR_RESULT - case 0, EventScript_1A911E - case 1, EventScript_166B0B + case 0, EventScript_SeviiDestinationsPage1 + case 1, EventScript_SailToNavelRock case 2, EventScript_CancelSail case 127, EventScript_CancelSail end -EventScript_166A53:: @ 8166A53 +VermilionCity_EventScript_ShowMysticTicket:: @ 8166A53 setflag FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN - msgbox gUnknown_817FC00 + msgbox VermilionCity_Text_OhMysticTicketTakeYouToNavelRock return -EventScript_166A5F:: @ 8166A5F - call_if_unset FLAG_SHOWED_AURORATICKET_TO_CAPTAIN, EventScript_166AA5 - message Text_17FCC1 +VermilionCity_EventScript_HasAuroraTicket:: @ 8166A5F + call_if_unset FLAG_SHOWED_AURORATICKET_TO_CAPTAIN, VermilionCity_EventScript_ShowAuroraTicket + message VermilionCity_Text_BoardSeagallopFerry waitmessage multichoice 13, 6, MULTICHOICE_SEVII_BIRTH, FALSE switch VAR_RESULT - case 0, EventScript_1A911E - case 1, EventScript_166B23 + case 0, EventScript_SeviiDestinationsPage1 + case 1, EventScript_SailToBirthIsland case 2, EventScript_CancelSail case 127, EventScript_CancelSail end -EventScript_166AA5:: @ 8166AA5 +VermilionCity_EventScript_ShowAuroraTicket:: @ 8166AA5 setflag FLAG_SHOWED_AURORATICKET_TO_CAPTAIN - msgbox gUnknown_817FC5F + msgbox VermilionCity_Text_OhAuroraTicketTakeYouToBirthIsland return -EventScript_166AB1:: @ 8166AB1 - call_if_unset FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN, EventScript_166A53 - call_if_unset FLAG_SHOWED_AURORATICKET_TO_CAPTAIN, EventScript_166AA5 - message Text_17FCC1 +VermilionCity_EventScript_HasMysticAndAuroraTickets:: @ 8166AB1 + call_if_unset FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN, VermilionCity_EventScript_ShowMysticTicket + call_if_unset FLAG_SHOWED_AURORATICKET_TO_CAPTAIN, VermilionCity_EventScript_ShowAuroraTicket + message VermilionCity_Text_BoardSeagallopFerry waitmessage multichoice 13, 5, MULTICHOICE_SEVII_NAVEL_BIRTH, FALSE switch VAR_RESULT - case 0, EventScript_1A911E - case 1, EventScript_166B0B - case 2, EventScript_166B23 + case 0, EventScript_SeviiDestinationsPage1 + case 1, EventScript_SailToNavelRock + case 2, EventScript_SailToBirthIsland case 3, EventScript_CancelSail case 127, EventScript_CancelSail end -EventScript_166B0B:: @ 8166B0B - msgbox gUnknown_817FCEC +EventScript_SailToNavelRock:: @ 8166B0B + msgbox VermilionCity_Text_Seagallop10Departing setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY setvar VAR_0x8006, SEAGALLOP_NAVEL_ROCK - goto EventScript_1A90DA + goto EventScript_SetSail end -EventScript_166B23:: @ 8166B23 - msgbox gUnknown_817FD5F +EventScript_SailToBirthIsland:: @ 8166B23 + msgbox VermilionCity_Text_Seagallop12Departing setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY setvar VAR_0x8006, SEAGALLOP_BIRTH_ISLAND - goto EventScript_1A90DA + goto EventScript_SetSail end -EventScript_166B3B:: @ 8166B3B - message Text_17FB23 +VermilionCity_EventScript_ChooseSeagallopDestTriPass:: @ 8166B3B + message VermilionCity_Text_BoardSeagallopTriPass waitmessage setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY multichoice 19, 5, MULTICHOICE_SEAGALLOP_123, FALSE switch VAR_RESULT - case 0, EventScript_1A8FEE - case 1, EventScript_1A8FF9 - case 2, EventScript_1A9004 + case 0, EventScript_SailToOneIsland2 + case 1, EventScript_SailToTwoIsland2 + case 2, EventScript_SailToThreeIsland2 case 3, EventScript_CancelSail case 127, EventScript_CancelSail end -EventScript_166B88:: @ 8166B88 +@ Unreachable +Vermilion_EventScript_Unused:: @ 8166B88 release end -VermilionCity_EventScript_166B8A:: @ 8166B8A +VermilionCity_EventScript_CheckTicketLeft:: @ 8166B8A lockall - goto EventScript_166BA0 + goto VermilionCity_EventScript_CheckTicket end -VermilionCity_EventScript_166B91:: @ 8166B91 +VermilionCity_EventScript_CheckTicketRight:: @ 8166B91 lockall - goto EventScript_166BA0 + goto VermilionCity_EventScript_CheckTicket end -VermilionCity_EventScript_166B98:: @ 8166B98 +VermilionCity_EventScript_ExitedTicketCheck:: @ 8166B98 lockall setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0 releaseall end -EventScript_166BA0:: @ 8166BA0 +VermilionCity_EventScript_CheckTicket:: @ 8166BA0 textcolor 0 - applymovement 6, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_FERRY_SAILOR, Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 compare VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if_eq EventScript_166BED - msgbox gUnknown_817FA3C - goto_if_unset FLAG_GOT_SS_TICKET, EventScript_166BDE - msgbox gUnknown_817FA77 + goto_if_eq VermilionCity_EventScript_CheckSeagallopPresentTrigger + msgbox VermilionCity_Text_DoYouHaveATicket + goto_if_unset FLAG_GOT_SS_TICKET, VermilionCity_EventScript_DontHaveSSTicket + msgbox VermilionCity_Text_FlashedSSTicket setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 1 releaseall end -EventScript_166BDE:: @ 8166BDE - msgbox gUnknown_817FABA +VermilionCity_EventScript_DontHaveSSTicket:: @ 8166BDE + msgbox VermilionCity_Text_DontHaveNeededSSTicket closemessage - goto EventScript_1A9108 + goto VermilionCity_EventScript_WalkUpPier end -EventScript_166BED:: @ 8166BED +VermilionCity_EventScript_CheckSeagallopPresentTrigger:: @ 8166BED setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if_ge EventScript_1669BB + goto_if_ge VermilionCity_EventScript_ChooseSeagallopDestRainbowPass compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 - goto_if_ge EventScript_166B3B - msgbox gUnknown_817FB10 + goto_if_ge VermilionCity_EventScript_ChooseSeagallopDestTriPass + msgbox VermilionCity_Text_TheShipSetSail closemessage - goto EventScript_1A9108 + goto VermilionCity_EventScript_WalkUpPier end -VermilionCity_EventScript_166C17:: @ 8166C17 - msgbox gUnknown_817F8AC, MSGBOX_NPC +VermilionCity_EventScript_Sailor:: @ 8166C17 + msgbox VermilionCity_Text_SSAnneVisitsOnceAYear, MSGBOX_NPC end -VermilionCity_EventScript_166C20:: @ 8166C20 +VermilionCity_EventScript_OaksAide:: @ 8166C20 lock faceplayer setflag FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION - msgbox gUnknown_817FDD2 + msgbox VermilionCity_Text_Route2AideHasPackageForYou release end -VermilionCity_EventScript_166C2F:: @ 8166C2F - msgbox gUnknown_817F7FD, MSGBOX_NPC +VermilionCity_EventScript_OldMan2:: @ 8166C2F + msgbox VermilionCity_Text_BuildingOnThisLand, MSGBOX_NPC end -VermilionCity_EventScript_166C38:: @ 8166C38 +VermilionCity_EventScript_Machop:: @ 8166C38 lock faceplayer waitse playmoncry SPECIES_MACHOP, 0 - msgbox gUnknown_817F871 + msgbox VermilionCity_Text_Machop waitmoncry - msgbox gUnknown_817F888 + msgbox VermilionCity_Text_MachopStompingLandFlat release end -VermilionCity_EventScript_166C53:: @ 8166C53 - msgbox gUnknown_817F8FB, MSGBOX_SIGN +VermilionCity_EventScript_CitySign:: @ 8166C53 + msgbox VermilionCity_Text_CitySign, MSGBOX_SIGN end -VermilionCity_EventScript_166C5C:: @ 8166C5C - msgbox gUnknown_817F928, MSGBOX_SIGN +VermilionCity_EventScript_SnorlaxNotice:: @ 8166C5C + msgbox VermilionCity_Text_SnorlaxBlockingRoute12, MSGBOX_SIGN end -VermilionCity_EventScript_166C65:: @ 8166C65 - msgbox gUnknown_817F9A1, MSGBOX_SIGN +VermilionCity_EventScript_PokemonFanClubSign:: @ 8166C65 + msgbox VermilionCity_Text_PokemonFanClubSign, MSGBOX_SIGN end -VermilionCity_EventScript_166C6E:: @ 8166C6E +VermilionCity_EventScript_GymSign:: @ 8166C6E lockall famechecker FAMECHECKER_LTSURGE, 0 - msgbox gUnknown_817F9CC + msgbox VermilionCity_Text_GymSign releaseall end -VermilionCity_EventScript_166C86:: @ 8166C86 - msgbox gUnknown_817FA11, MSGBOX_SIGN +VermilionCity_EventScript_HarborSign:: @ 8166C86 + msgbox VermilionCity_Text_VermilionHarbor, MSGBOX_SIGN end diff --git a/data/maps/VermilionCity/text.inc b/data/maps/VermilionCity/text.inc index bce18d9fb..bb784b83a 100644 --- a/data/maps/VermilionCity/text.inc +++ b/data/maps/VermilionCity/text.inc @@ -1,39 +1,39 @@ -gUnknown_817F723:: @ 817F723 +VermilionCity_Text_GrimerMultipliesInSludge:: @ 817F723 .string "We're careful about pollution here.\p" .string "We've heard GRIMER multiplies in\n" .string "toxic sludge.$" -gUnknown_817F776:: @ 817F776 +VermilionCity_Text_DidYouSeeSSAnneInHarbor:: @ 817F776 .string "Did you see the S.S. ANNE moored\n" .string "in the harbor?$" -gUnknown_817F7A6:: @ 817F7A6 +VermilionCity_Text_SSAnneHasDepartedForYear:: @ 817F7A6 .string "So, the S.S. ANNE has departed?\p" .string "She'll be back in VERMILION about\n" .string "this time next year.$" -gUnknown_817F7FD:: @ 817F7FD +VermilionCity_Text_BuildingOnThisLand:: @ 817F7FD .string "I'm putting up a building on this\n" .string "plot of land. I own it all.\p" .string "My POKéMON is tamping the land\n" .string "to lay the foundation.$" -gUnknown_817F871:: @ 817F871 +VermilionCity_Text_Machop:: @ 817F871 .string "MACHOP: Guoh! Gogogoh!$" -gUnknown_817F888:: @ 817F888 +VermilionCity_Text_MachopStompingLandFlat:: @ 817F888 .string "A MACHOP is stomping the land flat.$" -gUnknown_817F8AC:: @ 817F8AC +VermilionCity_Text_SSAnneVisitsOnceAYear:: @ 817F8AC .string "The S.S. ANNE is a famous luxury\n" .string "cruise ship.\p" .string "It visits VERMILION once a year.$" -gUnknown_817F8FB:: @ 817F8FB +VermilionCity_Text_CitySign:: @ 817F8FB .string "VERMILION CITY\n" .string "The Port of Exquisite Sunsets$" -gUnknown_817F928:: @ 817F928 +VermilionCity_Text_SnorlaxBlockingRoute12:: @ 817F928 .string "NOTICE!\p" .string "ROUTE 12 may be blocked off by a\n" .string "sleeping POKéMON.\p" @@ -41,83 +41,83 @@ gUnknown_817F928:: @ 817F928 .string "LAVENDER TOWN.\p" .string "VERMILION POLICE$" -gUnknown_817F9A1:: @ 817F9A1 +VermilionCity_Text_PokemonFanClubSign:: @ 817F9A1 .string "POKéMON FAN CLUB\n" .string "All POKéMON fans welcome!$" -gUnknown_817F9CC:: @ 817F9CC +VermilionCity_Text_GymSign:: @ 817F9CC .string "VERMILION CITY POKéMON GYM\n" .string "LEADER: LT. SURGE\l" .string "The Lightning American!$" -gUnknown_817FA11:: @ 817FA11 +VermilionCity_Text_VermilionHarbor:: @ 817FA11 .string "VERMILION HARBOR$" -gUnknown_817FA22:: @ 817FA22 +VermilionCity_Text_WelcomeToTheSSAnne:: @ 817FA22 .string "Welcome to the S.S. ANNE!$" -gUnknown_817FA3C:: @ 817FA3C +VermilionCity_Text_DoYouHaveATicket:: @ 817FA3C .string "Welcome to the S.S. ANNE!\p" .string "Excuse me, do you have a ticket?$" -gUnknown_817FA77:: @ 817FA77 +VermilionCity_Text_FlashedSSTicket:: @ 817FA77 .string "{SIZE}Á{PLAYER} flashed the S.S. TICKET!\p" .string "{SIZE}ÇGreat!\n" .string "Welcome to the S.S. ANNE!$" -gUnknown_817FABA:: @ 817FABA +VermilionCity_Text_DontHaveNeededSSTicket:: @ 817FABA .string "{SIZE}Á{PLAYER} doesn't have the needed\n" .string "S.S. TICKET.\p" .string "{SIZE}ÇSorry!\p" .string "You need a ticket to get aboard.$" -gUnknown_817FB10:: @ 817FB10 +VermilionCity_Text_TheShipSetSail:: @ 817FB10 .string "The ship set sail.$" -Text_17FB23:: @ 817FB23 +VermilionCity_Text_BoardSeagallopTriPass:: @ 817FB23 .string "Ah, you have a TRI-PASS.\p" .string "Would you like to board\n" .string "a SEAGALLOP ferry?$" -Text_17FB67:: @ 817FB67 +VermilionCity_Text_Seagallop7Departing:: @ 817FB67 .string "Okay, everything's in order.\p" .string "SEAGALLOP HI-SPEED 7 will be\n" .string "departing immediately.$" -Text_17FBB8:: @ 817FBB8 +VermilionCity_Text_BoardSeagallopRainbowPass:: @ 817FBB8 .string "Ah, you have a RAINBOW PASS.\p" .string "Would you like to board\n" .string "a SEAGALLOP ferry?$" -gUnknown_817FC00:: @ 817FC00 +VermilionCity_Text_OhMysticTicketTakeYouToNavelRock:: @ 817FC00 .string "Oh! That's a MYSTICTICKET!\n" .string "Now that is rare.\p" .string "We'll be happy to take you to\n" .string "NAVEL ROCK anytime.$" -gUnknown_817FC5F:: @ 817FC5F +VermilionCity_Text_OhAuroraTicketTakeYouToBirthIsland:: @ 817FC5F .string "Oh! That's an AURORATICKET!\n" .string "Now that is rare.\p" .string "We'll be happy to take you to\n" .string "BIRTH ISLAND anytime.$" -Text_17FCC1:: @ 817FCC1 +VermilionCity_Text_BoardSeagallopFerry:: @ 817FCC1 .string "Would you like to board\n" .string "a SEAGALLOP ferry?$" -gUnknown_817FCEC:: @ 817FCEC +VermilionCity_Text_Seagallop10Departing:: @ 817FCEC .string "Okay, everything's in order for you\n" .string "to board a special ferry.\p" .string "SEAGALLOP HI-SPEED 10 will be\n" .string "departing immediately.$" -gUnknown_817FD5F:: @ 817FD5F +VermilionCity_Text_Seagallop12Departing:: @ 817FD5F .string "Okay, everything's in order for you\n" .string "to board a special ferry.\p" .string "SEAGALLOP HI-SPEED 12 will be\n" .string "departing immediately.$" -gUnknown_817FDD2:: @ 817FDD2 +VermilionCity_Text_Route2AideHasPackageForYou:: @ 817FDD2 .string "Oh, hello, {PLAYER}!\n" .string "How are you doing?\p" .string "It's me, one of PROF. OAK's AIDES.\p" diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json index 8ed2603da..628d88070 100644 --- a/data/maps/VermilionCity_Gym/map.json +++ b/data/maps/VermilionCity_Gym/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_Gym_EventScript_16B94A", + "script": "VermilionCity_Gym_EventScript_LtSurge", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "VermilionCity_Gym_EventScript_16BA1E", + "script": "VermilionCity_Gym_EventScript_Baily", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "VermilionCity_Gym_EventScript_16B9FA", + "script": "VermilionCity_Gym_EventScript_Dwayne", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_Gym_EventScript_16BA6C", + "script": "VermilionCity_Gym_EventScript_GymGuy", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "VermilionCity_Gym_EventScript_16BA35", + "script": "VermilionCity_Gym_EventScript_Tucker", "flag": "0" } ], @@ -109,119 +109,119 @@ "x": 3, "y": 17, "elevation": 0, - "script": "VermilionCity_Gym_EventScript_16BA8B" + "script": "VermilionCity_Gym_EventScript_GymStatue" }, { "type": "bg_event_type_0", "x": 7, "y": 17, "elevation": 0, - "script": "VermilionCity_Gym_EventScript_16BA8B" + "script": "VermilionCity_Gym_EventScript_GymStatue" }, { "type": "bg_event_type_0", "x": 1, "y": 10, "elevation": 0, - "script": "VermilionCity_Gym_EventScript_16B78F" + "script": "VermilionCity_Gym_EventScript_TrashCan1" }, { "type": "bg_event_type_0", "x": 3, "y": 10, "elevation": 0, - "script": "VermilionCity_Gym_EventScript_16B79B" + "script": "VermilionCity_Gym_EventScript_TrashCan2" }, { "type": "bg_event_type_0", "x": 5, "y": 10, "elevation": 0, - "script": "VermilionCity_Gym_EventScript_16B7A7" + "script": "VermilionCity_Gym_EventScript_TrashCan3" }, { "type": "bg_event_type_0", "x": 7, "y": 10, "elevation": 0, - "script": "VermilionCity_Gym_EventScript_16B7B3" + "script": "VermilionCity_Gym_EventScript_TrashCan4" }, { "type": "bg_event_type_0", "x": 9, "y": 10, "elevation": 0, - "script": "VermilionCity_Gym_EventScript_16B7BF" + "script": "VermilionCity_Gym_EventScript_TrashCan5" }, { "type": "bg_event_type_0", "x": 1, "y": 12, "elevation": 0, - "script": "VermilionCity_Gym_EventScript_16B7CB" + "script": "VermilionCity_Gym_EventScript_TrashCan6" }, { "type": "bg_event_type_0", "x": 3, "y": 12, "elevation": 0, - "script": "VermilionCity_Gym_EventScript_16B7D7" + "script": "VermilionCity_Gym_EventScript_TrashCan7" }, { "type": "bg_event_type_0", "x": 5, "y": 12, "elevation": 0, - "script": "VermilionCity_Gym_EventScript_16B7E3" + "script": "VermilionCity_Gym_EventScript_TrashCan8" }, { "type": "bg_event_type_0", "x": 7, "y": 12, "elevation": 0, - "script": "VermilionCity_Gym_EventScript_16B7EF" + "script": "VermilionCity_Gym_EventScript_TrashCan9" }, { "type": "bg_event_type_0", "x": 9, "y": 12, "elevation": 0, - "script": "VermilionCity_Gym_EventScript_16B7FB" + "script": "VermilionCity_Gym_EventScript_TrashCan10" }, { "type": "bg_event_type_0", "x": 1, "y": 14, "elevation": 0, - "script": "VermilionCity_Gym_EventScript_16B807" + "script": "VermilionCity_Gym_EventScript_TrashCan11" }, { "type": "bg_event_type_0", "x": 3, "y": 14, "elevation": 0, - "script": "VermilionCity_Gym_EventScript_16B813" + "script": "VermilionCity_Gym_EventScript_TrashCan12" }, { "type": "bg_event_type_0", "x": 5, "y": 14, "elevation": 0, - "script": "VermilionCity_Gym_EventScript_16B81F" + "script": "VermilionCity_Gym_EventScript_TrashCan13" }, { "type": "bg_event_type_0", "x": 7, "y": 14, "elevation": 0, - "script": "VermilionCity_Gym_EventScript_16B82B" + "script": "VermilionCity_Gym_EventScript_TrashCan14" }, { "type": "bg_event_type_0", "x": 9, "y": 14, "elevation": 0, - "script": "VermilionCity_Gym_EventScript_16B837" + "script": "VermilionCity_Gym_EventScript_TrashCan15" } ] } diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 0d95d76f8..4b55b4254 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -1,180 +1,185 @@ +.equ FOUND_FIRST_SWITCH, FLAG_TEMP_1 +.equ SWITCH1_ID, VAR_0x8004 +.equ SWITCH2_ID, VAR_0x8005 +.equ TRASH_CAN_ID, VAR_0x8008 + VermilionCity_Gym_MapScripts:: @ 816B69E map_script MAP_SCRIPT_ON_LOAD, VermilionCity_Gym_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_Gym_OnTransition .byte 0 VermilionCity_Gym_OnLoad:: @ 816B6A9 - call_if_set FLAG_TEMP_1, EventScript_16B6BC - call_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_16B717 - end - -EventScript_16B6BC:: @ 816B6BC - setmetatile 3, 6, 699, 1 - setmetatile 4, 6, 700, 1 - setmetatile 5, 6, 701, 1 - setmetatile 6, 6, 702, 1 - setmetatile 7, 6, 703, 1 - setmetatile 3, 7, 707, 1 - setmetatile 4, 7, 708, 1 - setmetatile 5, 7, 709, 1 - setmetatile 6, 7, 710, 1 - setmetatile 7, 7, 711, 1 + call_if_set FOUND_FIRST_SWITCH, VermilionCity_Gym_EventScript_SetOneBeamOff + call_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, VermilionCity_Gym_EventScript_SetBeamsOff + end + +VermilionCity_Gym_EventScript_SetOneBeamOff:: @ 816B6BC + setmetatile 3, 6, METATILE_VermilionGym_Beam_Node_TopLeft_HalfOn, 1 + setmetatile 4, 6, METATILE_VermilionGym_Beam_Node_TopLeft_Edge_HalfOn, 1 + setmetatile 5, 6, METATILE_VermilionGym_Beam_MidTop_HalfOn, 1 + setmetatile 6, 6, METATILE_VermilionGym_Beam_Node_TopRight_Edge_HalfOn, 1 + setmetatile 7, 6, METATILE_VermilionGym_Beam_Node_TopRight_HalfOn, 1 + setmetatile 3, 7, METATILE_VermilionGym_Beam_Node_BottomLeft_HalfOn, 1 + setmetatile 4, 7, METATILE_VermilionGym_Beam_Node_BottomLeft_Edge_HalfOn, 1 + setmetatile 5, 7, METATILE_VermilionGym_Beam_MidBottom_HalfOn, 1 + setmetatile 6, 7, METATILE_VermilionGym_Beam_Node_BottomRight_Edge_HalfOn, 1 + setmetatile 7, 7, METATILE_VermilionGym_Beam_Node_BottomRight_HalfOn, 1 return -EventScript_16B717:: @ 816B717 - setmetatile 3, 6, 659, 1 - setmetatile 4, 6, 660, 0 - setmetatile 5, 6, 641, 0 - setmetatile 6, 6, 661, 0 - setmetatile 7, 6, 662, 1 - setmetatile 3, 7, 667, 1 - setmetatile 4, 7, 668, 0 - setmetatile 5, 7, 641, 0 - setmetatile 6, 7, 669, 0 - setmetatile 7, 7, 670, 1 +VermilionCity_Gym_EventScript_SetBeamsOff:: @ 816B717 + setmetatile 3, 6, METATILE_VermilionGym_Beam_Node_TopLeft_Off, 1 + setmetatile 4, 6, METATILE_VermilionGym_Beam_Node_TopLeft_Edge_Off, 0 + setmetatile 5, 6, METATILE_VermilionGym_Floor, 0 + setmetatile 6, 6, METATILE_VermilionGym_Beam_Node_TopRight_Edge_Off, 0 + setmetatile 7, 6, METATILE_VermilionGym_Beam_Node_TopRight_Off, 1 + setmetatile 3, 7, METATILE_VermilionGym_Beam_Node_BottomLeft_Off, 1 + setmetatile 4, 7, METATILE_VermilionGym_Beam_Node_BottomLeft_Edge_Off, 0 + setmetatile 5, 7, METATILE_VermilionGym_Floor, 0 + setmetatile 6, 7, METATILE_VermilionGym_Beam_Node_BottomRight_Edge_Off, 0 + setmetatile 7, 7, METATILE_VermilionGym_Beam_Node_BottomRight_Off, 1 return VermilionCity_Gym_OnTransition:: @ 816B772 - call EventScript_16B778 + call VermilionCity_Gym_EventScript_InitTrashCans end -EventScript_16B778:: @ 816B778 +VermilionCity_Gym_EventScript_InitTrashCans:: @ 816B778 goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_Return special Special_SetVermilionTrashCans - copyvar VAR_TEMP_0, VAR_0x8004 - copyvar VAR_TEMP_1, VAR_0x8005 + copyvar VAR_TEMP_0, SWITCH1_ID + copyvar VAR_TEMP_1, SWITCH2_ID return -VermilionCity_Gym_EventScript_16B78F:: @ 816B78F +VermilionCity_Gym_EventScript_TrashCan1:: @ 816B78F lockall - setvar VAR_0x8008, 1 - goto EventScript_16B843 + setvar TRASH_CAN_ID, 1 + goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_16B79B:: @ 816B79B +VermilionCity_Gym_EventScript_TrashCan2:: @ 816B79B lockall - setvar VAR_0x8008, 2 - goto EventScript_16B843 + setvar TRASH_CAN_ID, 2 + goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_16B7A7:: @ 816B7A7 +VermilionCity_Gym_EventScript_TrashCan3:: @ 816B7A7 lockall - setvar VAR_0x8008, 3 - goto EventScript_16B843 + setvar TRASH_CAN_ID, 3 + goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_16B7B3:: @ 816B7B3 +VermilionCity_Gym_EventScript_TrashCan4:: @ 816B7B3 lockall - setvar VAR_0x8008, 4 - goto EventScript_16B843 + setvar TRASH_CAN_ID, 4 + goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_16B7BF:: @ 816B7BF +VermilionCity_Gym_EventScript_TrashCan5:: @ 816B7BF lockall - setvar VAR_0x8008, 5 - goto EventScript_16B843 + setvar TRASH_CAN_ID, 5 + goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_16B7CB:: @ 816B7CB +VermilionCity_Gym_EventScript_TrashCan6:: @ 816B7CB lockall - setvar VAR_0x8008, 6 - goto EventScript_16B843 + setvar TRASH_CAN_ID, 6 + goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_16B7D7:: @ 816B7D7 +VermilionCity_Gym_EventScript_TrashCan7:: @ 816B7D7 lockall - setvar VAR_0x8008, 7 - goto EventScript_16B843 + setvar TRASH_CAN_ID, 7 + goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_16B7E3:: @ 816B7E3 +VermilionCity_Gym_EventScript_TrashCan8:: @ 816B7E3 lockall - setvar VAR_0x8008, 8 - goto EventScript_16B843 + setvar TRASH_CAN_ID, 8 + goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_16B7EF:: @ 816B7EF +VermilionCity_Gym_EventScript_TrashCan9:: @ 816B7EF lockall - setvar VAR_0x8008, 9 - goto EventScript_16B843 + setvar TRASH_CAN_ID, 9 + goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_16B7FB:: @ 816B7FB +VermilionCity_Gym_EventScript_TrashCan10:: @ 816B7FB lockall - setvar VAR_0x8008, 10 - goto EventScript_16B843 + setvar TRASH_CAN_ID, 10 + goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_16B807:: @ 816B807 +VermilionCity_Gym_EventScript_TrashCan11:: @ 816B807 lockall - setvar VAR_0x8008, 11 - goto EventScript_16B843 + setvar TRASH_CAN_ID, 11 + goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_16B813:: @ 816B813 +VermilionCity_Gym_EventScript_TrashCan12:: @ 816B813 lockall - setvar VAR_0x8008, 12 - goto EventScript_16B843 + setvar TRASH_CAN_ID, 12 + goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_16B81F:: @ 816B81F +VermilionCity_Gym_EventScript_TrashCan13:: @ 816B81F lockall - setvar VAR_0x8008, 13 - goto EventScript_16B843 + setvar TRASH_CAN_ID, 13 + goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_16B82B:: @ 816B82B +VermilionCity_Gym_EventScript_TrashCan14:: @ 816B82B lockall - setvar VAR_0x8008, 14 - goto EventScript_16B843 + setvar TRASH_CAN_ID, 14 + goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_16B837:: @ 816B837 +VermilionCity_Gym_EventScript_TrashCan15:: @ 816B837 lockall - setvar VAR_0x8008, 15 - goto EventScript_16B843 + setvar TRASH_CAN_ID, 15 + goto VermilionCity_Gym_EventScript_TrashCan end -EventScript_16B843:: @ 816B843 +VermilionCity_Gym_EventScript_TrashCan:: @ 816B843 goto_if_questlog EventScript_ReleaseEnd special sub_8112364 - copyvar VAR_0x8004, VAR_TEMP_0 - copyvar VAR_0x8005, VAR_TEMP_1 - goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_16B8E5 - goto_if_set FLAG_TEMP_1, EventScript_16B89E - compare VAR_0x8004, VAR_0x8008 - goto_if_eq EventScript_16B885 - msgbox gUnknown_8195289 + copyvar SWITCH1_ID, VAR_TEMP_0 + copyvar SWITCH2_ID, VAR_TEMP_1 + goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, VermilionCity_Gym_EventScript_LocksAlreadyOpen + goto_if_set FOUND_FIRST_SWITCH, VermilionCity_Gym_EventScript_TrySwitchTwo + compare SWITCH1_ID, TRASH_CAN_ID + goto_if_eq VermilionCity_Gym_EventScript_FoundSwitchOne + msgbox VermilionCity_Gym_Text_NopeOnlyTrashHere releaseall end -EventScript_16B885:: @ 816B885 - msgbox gUnknown_81952A8 +VermilionCity_Gym_EventScript_FoundSwitchOne:: @ 816B885 + msgbox VermilionCity_Gym_Text_SwitchUnderTrashFirstLockOpened playse SE_PIN waitse - call EventScript_16B6BC + call VermilionCity_Gym_EventScript_SetOneBeamOff special DrawWholeMapView - setflag FLAG_TEMP_1 + setflag FOUND_FIRST_SWITCH releaseall end -EventScript_16B89E:: @ 816B89E - compare VAR_0x8005, VAR_0x8008 - goto_if_eq EventScript_16B8CB - msgbox gUnknown_819536C - clearflag FLAG_TEMP_1 +VermilionCity_Gym_EventScript_TrySwitchTwo:: @ 816B89E + compare SWITCH2_ID, TRASH_CAN_ID + goto_if_eq VermilionCity_Gym_EventScript_FoundSwitchTwo + msgbox VermilionCity_Gym_Text_OnlyTrashLocksWereReset + clearflag FOUND_FIRST_SWITCH special Special_SetVermilionTrashCans - copyvar VAR_TEMP_0, VAR_0x8004 - copyvar VAR_TEMP_1, VAR_0x8005 - call EventScript_16B8EF + copyvar VAR_TEMP_0, SWITCH1_ID + copyvar VAR_TEMP_1, SWITCH2_ID + call VermilionCity_Gym_EventScript_SetBeamsOn special DrawWholeMapView releaseall end -EventScript_16B8CB:: @ 816B8CB - msgbox gUnknown_8195330 +VermilionCity_Gym_EventScript_FoundSwitchTwo:: @ 816B8CB + msgbox VermilionCity_Gym_Text_SecondLockOpened closemessage - call EventScript_16B717 + call VermilionCity_Gym_EventScript_SetBeamsOff special DrawWholeMapView playse SE_KI_GASYAN waitse @@ -182,105 +187,105 @@ EventScript_16B8CB:: @ 816B8CB releaseall end -EventScript_16B8E5:: @ 816B8E5 - msgbox gUnknown_8195289 +VermilionCity_Gym_EventScript_LocksAlreadyOpen:: @ 816B8E5 + msgbox VermilionCity_Gym_Text_NopeOnlyTrashHere releaseall end -EventScript_16B8EF:: @ 816B8EF - setmetatile 3, 6, 681, 1 - setmetatile 4, 6, 682, 1 - setmetatile 5, 6, 645, 1 - setmetatile 6, 6, 683, 1 - setmetatile 7, 6, 684, 1 - setmetatile 3, 7, 689, 1 - setmetatile 4, 7, 690, 1 - setmetatile 5, 7, 653, 1 - setmetatile 6, 7, 691, 1 - setmetatile 7, 7, 692, 1 +VermilionCity_Gym_EventScript_SetBeamsOn:: @ 816B8EF + setmetatile 3, 6, METATILE_VermilionGym_Beam_Node_TopLeft_On, 1 + setmetatile 4, 6, METATILE_VermilionGym_Beam_Node_TopLeft_Edge_On, 1 + setmetatile 5, 6, METATILE_VermilionGym_Beam_MidTop, 1 + setmetatile 6, 6, METATILE_VermilionGym_Beam_Node_TopRight_Edge_On, 1 + setmetatile 7, 6, METATILE_VermilionGym_Beam_Node_TopRight_On, 1 + setmetatile 3, 7, METATILE_VermilionGym_Beam_Node_BottomLeft_On, 1 + setmetatile 4, 7, METATILE_VermilionGym_Beam_Node_BottomLeft_Edge_On, 1 + setmetatile 5, 7, METATILE_VermilionGym_Beam_MidBottom, 1 + setmetatile 6, 7, METATILE_VermilionGym_Beam_Node_BottomRight_Edge_On, 1 + setmetatile 7, 7, METATILE_VermilionGym_Beam_Node_BottomRight_On, 1 return -VermilionCity_Gym_EventScript_16B94A:: @ 816B94A +VermilionCity_Gym_EventScript_LtSurge:: @ 816B94A famechecker FAMECHECKER_LTSURGE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - trainerbattle_single TRAINER_LEADER_LT_SURGE, Text_194BA4, Text_194E03, EventScript_16B97C, NO_MUSIC - goto_if_unset FLAG_GOT_TM34_FROM_SURGE, EventScript_16B9AF - msgbox gUnknown_8194C8E + trainerbattle_single TRAINER_LEADER_LT_SURGE, VermilionCity_Gym_Text_LtSurgeIntro, VermilionCity_Gym_Text_LtSurgeDefeat, VermilionCity_Gym_EventScript_DefeatedLtSurge, NO_MUSIC + goto_if_unset FLAG_GOT_TM34_FROM_SURGE, VermilionCity_Gym_EventScript_GiveTM43 + msgbox VermilionCity_Gym_Text_LtSurgePostBattle release end -EventScript_16B97C:: @ 816B97C +VermilionCity_Gym_EventScript_DefeatedLtSurge:: @ 816B97C famechecker FAMECHECKER_LTSURGE, 1 - call_if_unset FLAG_GOT_HM05, EventScript_16B9AB + call_if_unset FLAG_GOT_HM05, VermilionCity_Gym_EventScript_ShowOaksAide clearflag FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL setflag FLAG_DEFEATED_LT_SURGE setflag FLAG_BADGE03_GET set_gym_trainers 3 - goto EventScript_16B9AF + goto VermilionCity_Gym_EventScript_GiveTM43 end -EventScript_16B9AB:: @ 816B9AB +VermilionCity_Gym_EventScript_ShowOaksAide:: @ 816B9AB clearflag FLAG_HIDE_VERMILION_CITY_OAKS_AIDE return -EventScript_16B9AF:: @ 816B9AF - msgbox gUnknown_8194CFA +VermilionCity_Gym_EventScript_GiveTM43:: @ 816B9AF + msgbox VermilionCity_Gym_Text_ExplainThunderBadgeTakeThis checkitemspace ITEM_TM34, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16B9F0 - giveitem_msg gUnknown_8194D87, ITEM_TM34 + goto_if_eq VermilionCity_Gym_EventScript_NoRoomForTM43 + giveitem_msg VermilionCity_Gym_Text_ReceivedTM43FromLtSurge, ITEM_TM34 setflag FLAG_GOT_TM34_FROM_SURGE - msgbox gUnknown_8194DA8 + msgbox VermilionCity_Gym_Text_ExplainTM34 release end -EventScript_16B9F0:: @ 816B9F0 - msgbox gUnknown_8194DE3 +VermilionCity_Gym_EventScript_NoRoomForTM43:: @ 816B9F0 + msgbox VermilionCity_Gym_Text_MakeRoomInYourBag release end -VermilionCity_Gym_EventScript_16B9FA:: @ 816B9FA - trainerbattle_single TRAINER_SAILOR_DWAYNE, Text_194FBD, Text_194FF1 +VermilionCity_Gym_EventScript_Dwayne:: @ 816B9FA + trainerbattle_single TRAINER_SAILOR_DWAYNE, VermilionCity_Gym_Text_DwayneIntro, VermilionCity_Gym_Text_DwayneDefeat famechecker FAMECHECKER_LTSURGE, 4 - msgbox gUnknown_8195004, MSGBOX_AUTOCLOSE + msgbox VermilionCity_Gym_Text_DwaynePostBattle, MSGBOX_AUTOCLOSE end -VermilionCity_Gym_EventScript_16BA1E:: @ 816BA1E - trainerbattle_single TRAINER_ENGINEER_BAILY, Text_194F1F, Text_194F6F - msgbox gUnknown_8194F76, MSGBOX_AUTOCLOSE +VermilionCity_Gym_EventScript_Baily:: @ 816BA1E + trainerbattle_single TRAINER_ENGINEER_BAILY, VermilionCity_Gym_Text_BailyIntro, VermilionCity_Gym_Text_BailyDefeat + msgbox VermilionCity_Gym_Text_BailyPostBattle, MSGBOX_AUTOCLOSE end -VermilionCity_Gym_EventScript_16BA35:: @ 816BA35 - trainerbattle_single TRAINER_GENTLEMAN_TUCKER, Text_194E57, Text_194EA5, EventScript_16BA5D +VermilionCity_Gym_EventScript_Tucker:: @ 816BA35 + trainerbattle_single TRAINER_GENTLEMAN_TUCKER, VermilionCity_Gym_Text_TuckerIntro, VermilionCity_Gym_Text_TuckerDefeat, VermilionCity_Gym_EventScript_DefeatedTucker famechecker FAMECHECKER_LTSURGE, 3 - msgbox gUnknown_8194EBD, MSGBOX_AUTOCLOSE + msgbox VermilionCity_Gym_Text_TuckerPostBattle, MSGBOX_AUTOCLOSE end -EventScript_16BA5D:: @ 816BA5D +VermilionCity_Gym_EventScript_DefeatedTucker:: @ 816BA5D famechecker FAMECHECKER_LTSURGE, 2 release end -VermilionCity_Gym_EventScript_16BA6C:: @ 816BA6C +VermilionCity_Gym_EventScript_GymGuy:: @ 816BA6C lock faceplayer - goto_if_set FLAG_DEFEATED_LT_SURGE, EventScript_16BA81 - msgbox gUnknown_81950B4 + goto_if_set FLAG_DEFEATED_LT_SURGE, VermilionCity_Gym_EventScript_GymGuyPostVictory + msgbox VermilionCity_Gym_Text_GymGuyAdvice release end -EventScript_16BA81:: @ 816BA81 - msgbox gUnknown_81951EC +VermilionCity_Gym_EventScript_GymGuyPostVictory:: @ 816BA81 + msgbox VermilionCity_Gym_Text_GymGuyPostVictory release end -VermilionCity_Gym_EventScript_16BA8B:: @ 816BA8B +VermilionCity_Gym_EventScript_GymStatue:: @ 816BA8B lockall - goto_if_set FLAG_BADGE03_GET, EventScript_16BA9F - msgbox gUnknown_819520B + goto_if_set FLAG_BADGE03_GET, VermilionCity_Gym_EventScript_GymStatuePostVictory + msgbox VermilionCity_Gym_Text_GymStatue releaseall end -EventScript_16BA9F:: @ 816BA9F - msgbox gUnknown_8195248 +VermilionCity_Gym_EventScript_GymStatuePostVictory:: @ 816BA9F + msgbox VermilionCity_Gym_Text_GymStatuePlayerWon releaseall end diff --git a/data/maps/VermilionCity_Gym/text.inc b/data/maps/VermilionCity_Gym/text.inc index b0cff583a..e364f8d10 100644 --- a/data/maps/VermilionCity_Gym/text.inc +++ b/data/maps/VermilionCity_Gym/text.inc @@ -1,4 +1,4 @@ -Text_194BA4:: @ 8194BA4 +VermilionCity_Gym_Text_LtSurgeIntro:: @ 8194BA4 .string "Hey, kid! What do you think you're\n" .string "doing here?\p" .string "You won't live long in combat!\n" @@ -9,13 +9,13 @@ Text_194BA4:: @ 8194BA4 .string "paralysis!\p" .string "The same as I'll do to you!{PLAY_BGM}{MUS_EXEYE}$" -gUnknown_8194C8E:: @ 8194C8E +VermilionCity_Gym_Text_LtSurgePostBattle:: @ 8194C8E .string "A little word of advice, kid!\p" .string "Electricity is sure powerful!\p" .string "But, it's useless against GROUND-\n" .string "type POKéMON!$" -gUnknown_8194CFA:: @ 8194CFA +VermilionCity_Gym_Text_ExplainThunderBadgeTakeThis:: @ 8194CFA .string "The THUNDERBADGE cranks up your\n" .string "POKéMON's SPEED!\p" .string "It also lets your POKéMON FLY\n" @@ -23,58 +23,58 @@ gUnknown_8194CFA:: @ 8194CFA .string "You're special, kid!\n" .string "Take this!$" -gUnknown_8194D87:: @ 8194D87 +VermilionCity_Gym_Text_ReceivedTM43FromLtSurge:: @ 8194D87 .string "{PLAYER} received TM34\n" .string "from LT. SURGE.$" -gUnknown_8194DA8:: @ 8194DA8 +VermilionCity_Gym_Text_ExplainTM34:: @ 8194DA8 .string "TM34 contains SHOCK WAVE!\p" .string "Teach it to an ELECTRIC POKéMON!$" -gUnknown_8194DE3:: @ 8194DE3 +VermilionCity_Gym_Text_MakeRoomInYourBag:: @ 8194DE3 .string "Yo, kid, make room in your BAG!$" -Text_194E03:: @ 8194E03 +VermilionCity_Gym_Text_LtSurgeDefeat:: @ 8194E03 .string "Now that's a shocker!\p" .string "You're the real deal, kid!\p" .string "Fine, then, take the THUNDERBADGE!$" -Text_194E57:: @ 8194E57 +VermilionCity_Gym_Text_TuckerIntro:: @ 8194E57 .string "When I was in the Army, LT. SURGE\n" .string "was my strict CO.\p" .string "He was a hard taskmaster.$" -Text_194EA5:: @ 8194EA5 +VermilionCity_Gym_Text_TuckerDefeat:: @ 8194EA5 .string "Stop!\n" .string "You're very good!$" -gUnknown_8194EBD:: @ 8194EBD +VermilionCity_Gym_Text_TuckerPostBattle:: @ 8194EBD .string "It's not easy opening that door.\p" .string "LT. SURGE was always famous for\n" .string "his cautious nature in the Army.$" -Text_194F1F:: @ 8194F1F +VermilionCity_Gym_Text_BailyIntro:: @ 8194F1F .string "I'm a lightweight, but I'm good\n" .string "with electricity!\p" .string "That's why I joined this GYM.$" -Text_194F6F:: @ 8194F6F +VermilionCity_Gym_Text_BailyDefeat:: @ 8194F6F .string "Fried!$" -gUnknown_8194F76:: @ 8194F76 +VermilionCity_Gym_Text_BailyPostBattle:: @ 8194F76 .string "Okay, I'll talk!\p" .string "LT. SURGE said he hid door\n" .string "switches inside something.$" -Text_194FBD:: @ 8194FBD +VermilionCity_Gym_Text_DwayneIntro:: @ 8194FBD .string "This is no place for kids!\n" .string "Not even if you're good!$" -Text_194FF1:: @ 8194FF1 +VermilionCity_Gym_Text_DwayneDefeat:: @ 8194FF1 .string "Wow!\n" .string "Surprised me!$" -gUnknown_8195004:: @ 8195004 +VermilionCity_Gym_Text_DwaynePostBattle:: @ 8195004 .string "LT. SURGE installed the traps in\n" .string "the GYM himself.\p" .string "He set up double locks everywhere.\n" @@ -82,7 +82,7 @@ gUnknown_8195004:: @ 8195004 .string "When you open the first lock, the\n" .string "second lock is right next to it.$" -gUnknown_81950B4:: @ 81950B4 +VermilionCity_Gym_Text_GymGuyAdvice:: @ 81950B4 .string "Yo!\n" .string "Champ in the making!\p" .string "LT. SURGE has a nickname.\p" @@ -97,42 +97,42 @@ gUnknown_81950B4:: @ 81950B4 .string "He's locked himself in, so it won't\n" .string "be easy getting to him.$" -gUnknown_81951EC:: @ 81951EC +VermilionCity_Gym_Text_GymGuyPostVictory:: @ 81951EC .string "Whew!\n" .string "That match was electric!$" -gUnknown_819520B:: @ 819520B +VermilionCity_Gym_Text_GymStatue:: @ 819520B .string "VERMILION POKéMON GYM\n" .string "LEADER: LT. SURGE\p" .string "WINNING TRAINERS:\n" .string "{RIVAL}$" -gUnknown_8195248:: @ 8195248 +VermilionCity_Gym_Text_GymStatuePlayerWon:: @ 8195248 .string "VERMILION POKéMON GYM\n" .string "LEADER: LT. SURGE\p" .string "WINNING TRAINERS:\n" .string "{RIVAL}, {PLAYER}$" -gUnknown_8195289:: @ 8195289 +VermilionCity_Gym_Text_NopeOnlyTrashHere:: @ 8195289 .string "Nope!\n" .string "There's only trash here.$" -gUnknown_81952A8:: @ 81952A8 +VermilionCity_Gym_Text_SwitchUnderTrashFirstLockOpened:: @ 81952A8 .string "Hey! There's a switch under the\n" .string "trash! Turn it on!\p" .string "The first electric lock opened!$" -Text_1952FB:: @ 81952FB +VermilionCity_Gym_Text_AnotherSwitchInTrash:: @ 81952FB .string "ガサゴソ‥！\n" .string "おっと！ ゴミばこの そこに\l" .string "また スイッチが あった！\l" .string "おして みよう！ ‥ ポチッとな$" -gUnknown_8195330:: @ 8195330 +VermilionCity_Gym_Text_SecondLockOpened:: @ 8195330 .string "The second electric lock opened!\n" .string "The motorized door opened!$" -gUnknown_819536C:: @ 819536C +VermilionCity_Gym_Text_OnlyTrashLocksWereReset:: @ 819536C .string "Nope!\n" .string "There's only trash here.\p" .string "Hey!\n" diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json index 7eec8c8e8..008e98610 100644 --- a/data/maps/VermilionCity_House1/map.json +++ b/data/maps/VermilionCity_House1/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_House1_EventScript_16B3A7", + "script": "VermilionCity_House1_EventScript_FishingGuru", "flag": "0" } ], diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc index 3fb54afee..8ab0b17f2 100644 --- a/data/maps/VermilionCity_House1/scripts.inc +++ b/data/maps/VermilionCity_House1/scripts.inc @@ -1,35 +1,35 @@ VermilionCity_House1_MapScripts:: @ 816B3A6 .byte 0 -VermilionCity_House1_EventScript_16B3A7:: @ 816B3A7 +VermilionCity_House1_EventScript_FishingGuru:: @ 816B3A7 lock faceplayer - goto_if_set FLAG_GOT_OLD_ROD, EventScript_16B3CF - msgbox gUnknown_8193EC1, MSGBOX_YESNO + goto_if_set FLAG_GOT_OLD_ROD, VermilionCity_House1_EventScript_AlreadyGotOldRod + msgbox VermilionCity_House1_Text_ImFishingGuruDoYouLikeToFish, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_16B3D9 - msgbox gUnknown_8194028 + goto_if_eq VermilionCity_House1_EventScript_GiveOldRod + msgbox VermilionCity_House1_Text_OhThatsSoDisappointing release end -EventScript_16B3CF:: @ 816B3CF - msgbox gUnknown_8194045 +VermilionCity_House1_EventScript_AlreadyGotOldRod:: @ 816B3CF + msgbox VermilionCity_House1_Text_HowAreTheFishBiting release end -EventScript_16B3D9:: @ 816B3D9 +VermilionCity_House1_EventScript_GiveOldRod:: @ 816B3D9 checkitemspace ITEM_OLD_ROD, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16B41A + goto_if_eq VermilionCity_House1_EventScript_NoRoomForOldRod additem ITEM_OLD_ROD - msgbox gUnknown_8193F2A - msgreceiveditem gUnknown_8193F81, ITEM_OLD_ROD + msgbox VermilionCity_House1_Text_TakeThisAndFish + msgreceiveditem VermilionCity_House1_Text_ReceivedOldRodFromFishingGuru, ITEM_OLD_ROD setflag FLAG_GOT_OLD_ROD - msgbox gUnknown_8193FAF + msgbox VermilionCity_House1_Text_FishingIsAWayOfLife release end -EventScript_16B41A:: @ 816B41A - msgbox gUnknown_819406F +VermilionCity_House1_EventScript_NoRoomForOldRod:: @ 816B41A + msgbox VermilionCity_House1_Text_NoRoomForNiceGift release end diff --git a/data/maps/VermilionCity_House1/text.inc b/data/maps/VermilionCity_House1/text.inc index 66ea21646..55c2c700c 100644 --- a/data/maps/VermilionCity_House1/text.inc +++ b/data/maps/VermilionCity_House1/text.inc @@ -1,39 +1,33 @@ -Text_193E82:: @ 8193E82 - .string "この あいだ やまおくで\n" - .string "きんのたまを ひろい ましてね！\p" - .string "つかえない しなもの ですが\n" - .string "うったら なんと 5000¥でした$" - -gUnknown_8193EC1:: @ 8193EC1 +VermilionCity_House1_Text_ImFishingGuruDoYouLikeToFish:: @ 8193EC1 .string "I'm the FISHING GURU!\p" .string "I simply looove fishing!\n" .string "I can't bear to go without.\p" .string "Tell me, do you like to fish?$" -gUnknown_8193F2A:: @ 8193F2A +VermilionCity_House1_Text_TakeThisAndFish:: @ 8193F2A .string "Grand! I like your style.\n" .string "I think we can be friends.\p" .string "Take this and fish, young friend!$" -gUnknown_8193F81:: @ 8193F81 +VermilionCity_House1_Text_ReceivedOldRodFromFishingGuru:: @ 8193F81 .string "{PLAYER} received an OLD ROD from\n" .string "the FISHING GURU.$" -gUnknown_8193FAF:: @ 8193FAF +VermilionCity_House1_Text_FishingIsAWayOfLife:: @ 8193FAF .string "Fishing is a way of life!\n" .string "It is like the finest poetry.\p" .string "From the seas to rivers, go out\n" .string "and land the big one, my friend.$" -gUnknown_8194028:: @ 8194028 +VermilionCity_House1_Text_OhThatsSoDisappointing:: @ 8194028 .string "Oh…\n" .string "That's so disappointing…$" -gUnknown_8194045:: @ 8194045 +VermilionCity_House1_Text_HowAreTheFishBiting:: @ 8194045 .string "Hello there, {PLAYER}!\p" .string "How are the fish biting?$" -gUnknown_819406F:: @ 819406F +VermilionCity_House1_Text_NoRoomForNiceGift:: @ 819406F .string "Oh, no!\p" .string "I had a nice gift for you, but you\n" .string "have no room for it!$" diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json index a503a2aa6..3c40bf806 100644 --- a/data/maps/VermilionCity_House2/map.json +++ b/data/maps/VermilionCity_House2/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_House2_EventScript_16B5D7", + "script": "VermilionCity_House2_EventScript_Elyssa", "flag": "0" } ], diff --git a/data/maps/VermilionCity_House2/scripts.inc b/data/maps/VermilionCity_House2/scripts.inc index 82cc901ba..8dbdd4888 100644 --- a/data/maps/VermilionCity_House2/scripts.inc +++ b/data/maps/VermilionCity_House2/scripts.inc @@ -1,39 +1,39 @@ VermilionCity_House2_MapScripts:: @ 816B5D6 .byte 0 -VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7 +VermilionCity_House2_EventScript_Elyssa:: @ 816B5D7 lock faceplayer setvar VAR_0x8008, INGAME_TRADE_FARFETCHD call EventScript_GetInGameTradeSpeciesInfo - goto_if_set FLAG_DID_CH_DING_TRADE, EventScript_16B649 - msgbox gUnknown_81949CB, MSGBOX_YESNO + goto_if_set FLAG_DID_CH_DING_TRADE, VermilionCity_House2_EventScript_AlreadyTraded + msgbox VermilionCity_House2_Text_DoYouHaveMonWantToTradeForMyMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16B631 + goto_if_eq VermilionCity_House2_EventScript_DeclineTrade call EventScript_ChooseMonForInGameTrade compare VAR_0x8004, PARTY_SIZE - goto_if_ge EventScript_16B631 + goto_if_ge VermilionCity_House2_EventScript_DeclineTrade call EventScript_GetInGameTradeSpecies compare VAR_RESULT, VAR_0x8009 - goto_if_ne EventScript_16B63B + goto_if_ne VermilionCity_House2_EventScript_NotRequestedMon call EventScript_DoInGameTrade - msgbox gUnknown_8194A44 + msgbox VermilionCity_House2_Text_ThankYou setflag FLAG_DID_CH_DING_TRADE release end -EventScript_16B631:: @ 816B631 - msgbox gUnknown_81949FD +VermilionCity_House2_EventScript_DeclineTrade:: @ 816B631 + msgbox VermilionCity_House2_Text_ThatsTooBad release end -EventScript_16B63B:: @ 816B63B +VermilionCity_House2_EventScript_NotRequestedMon:: @ 816B63B getspeciesname 0, VAR_0x8009 - msgbox gUnknown_8194A0D + msgbox VermilionCity_House2_Text_ThisIsNoMon release end -EventScript_16B649:: @ 816B649 - msgbox gUnknown_8194A4F +VermilionCity_House2_EventScript_AlreadyTraded:: @ 816B649 + msgbox VermilionCity_House2_Text_HowIsMyOldMon release end diff --git a/data/maps/VermilionCity_House2/text.inc b/data/maps/VermilionCity_House2/text.inc new file mode 100644 index 000000000..2908cb450 --- /dev/null +++ b/data/maps/VermilionCity_House2/text.inc @@ -0,0 +1,20 @@ +VermilionCity_House2_Text_DoYouHaveMonWantToTradeForMyMon:: @ 81949CB + .string "Hi!\n" + .string "Do you have a {STR_VAR_1}?\p" + .string "Want to trade it for my\n" + .string "{STR_VAR_2}?$" + +VermilionCity_House2_Text_ThatsTooBad:: @ 81949FD + .string "That's too bad.$" + +VermilionCity_House2_Text_ThisIsNoMon:: @ 8194A0D + .string "…This is no {STR_VAR_1}.\p" + .string "If you get one, please trade it\n" + .string "to me!$" + +VermilionCity_House2_Text_ThankYou:: @ 8194A44 + .string "Thank you!$" + +VermilionCity_House2_Text_HowIsMyOldMon:: @ 8194A4F + .string "How is my old {STR_VAR_2}?\p" + .string "My {STR_VAR_1} is doing great!$" diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json index e2aaee125..3ef4658f1 100644 --- a/data/maps/VermilionCity_Mart/map.json +++ b/data/maps/VermilionCity_Mart/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_Mart_EventScript_16B666", + "script": "VermilionCity_Mart_EventScript_Clerk", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_Mart_EventScript_16B654", + "script": "VermilionCity_Mart_EventScript_CooltrainerF", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 2, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_Mart_EventScript_16B65D", + "script": "VermilionCity_Mart_EventScript_BaldingMan", "flag": "0" } ], diff --git a/data/maps/VermilionCity_Mart/scripts.inc b/data/maps/VermilionCity_Mart/scripts.inc index 3af796ada..3ce0d842a 100644 --- a/data/maps/VermilionCity_Mart/scripts.inc +++ b/data/maps/VermilionCity_Mart/scripts.inc @@ -1,27 +1,27 @@ VermilionCity_Mart_MapScripts:: @ 816B653 .byte 0 -VermilionCity_Mart_EventScript_16B654:: @ 816B654 - msgbox gUnknown_8194B65, MSGBOX_NPC +VermilionCity_Mart_EventScript_CooltrainerF:: @ 816B654 + msgbox VermilionCity_Mart_Text_MonsGoodOrBadDependingOnTrainer, MSGBOX_NPC end -VermilionCity_Mart_EventScript_16B65D:: @ 816B65D - msgbox gUnknown_8194A77, MSGBOX_NPC +VermilionCity_Mart_EventScript_BaldingMan:: @ 816B65D + msgbox VermilionCity_Mart_Text_TeamRocketAreWickedPeople, MSGBOX_NPC end -VermilionCity_Mart_EventScript_16B666:: @ 816B666 +VermilionCity_Mart_EventScript_Clerk:: @ 816B666 goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16B68C + pokemart VermilionCity_Mart_Items msgbox Text_PleaseComeAgain release end .align 2 -Items_16B68C:: @ 816B68C +VermilionCity_Mart_Items:: @ 816B68C .2byte ITEM_POKE_BALL .2byte ITEM_SUPER_POTION .2byte ITEM_ANTIDOTE diff --git a/data/maps/VermilionCity_Mart/text.inc b/data/maps/VermilionCity_Mart/text.inc index 2d85d941f..b8685b62a 100644 --- a/data/maps/VermilionCity_Mart/text.inc +++ b/data/maps/VermilionCity_Mart/text.inc @@ -1,4 +1,4 @@ -gUnknown_8194A77:: @ 8194A77 +VermilionCity_Mart_Text_TeamRocketAreWickedPeople:: @ 8194A77 .string "There are wicked people who will\n" .string "use POKéMON for criminal acts.\p" .string "TEAM ROCKET traffics in rare\n" @@ -8,7 +8,7 @@ gUnknown_8194A77:: @ 8194A77 .string "That's the sort of horrid people\n" .string "they are, TEAM ROCKET.$" -gUnknown_8194B65:: @ 8194B65 +VermilionCity_Mart_Text_MonsGoodOrBadDependingOnTrainer:: @ 8194B65 .string "I think POKéMON can be good or\n" .string "bad. It depends on the TRAINER.$" diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index 70b50d7fe..b9837fca2 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_PokemonCenter_1F_EventScript_16B433", + "script": "VermilionCity_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": "VermilionCity_PokemonCenter_1F_EventScript_16B43C", + "script": "VermilionCity_PokemonCenter_1F_EventScript_Man", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_PokemonCenter_1F_EventScript_16B445", + "script": "VermilionCity_PokemonCenter_1F_EventScript_Hiker", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_PokemonCenter_1F_EventScript_16B44E", + "script": "VermilionCity_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": "VermilionCity_PokemonCenter_1F_EventScript_1A8D08", + "script": "VermilionCity_PokemonCenter_1F_EventScript_VSSeekerWoman", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_PokemonCenter_1F_EventScript_1ACE83", + "script": "VermilionCity_PokemonCenter_1F_EventScript_PokemonJournalLtSurge", "flag": "FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_PokemonCenter_1F_EventScript_1ACE83", + "script": "VermilionCity_PokemonCenter_1F_EventScript_PokemonJournalLtSurge", "flag": "FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL" } ], diff --git a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc index ad7e02455..5f4338101 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc @@ -7,21 +7,21 @@ VermilionCity_PokemonCenter_1F_OnTransition:: @ 816B42F setrespawn SPAWN_VERMILION_CITY end -VermilionCity_PokemonCenter_1F_EventScript_16B433:: @ 816B433 +VermilionCity_PokemonCenter_1F_EventScript_Nurse:: @ 816B433 lock faceplayer call EventScript_PkmnCenterNurse release end -VermilionCity_PokemonCenter_1F_EventScript_16B43C:: @ 816B43C - msgbox gUnknown_8194145, MSGBOX_NPC +VermilionCity_PokemonCenter_1F_EventScript_Man:: @ 816B43C + msgbox VermilionCity_PokemonCenter_1F_Text_PoisonedMonFaintedWhileWalking, MSGBOX_NPC end -VermilionCity_PokemonCenter_1F_EventScript_16B445:: @ 816B445 - msgbox gUnknown_81940AF, MSGBOX_NPC +VermilionCity_PokemonCenter_1F_EventScript_Hiker:: @ 816B445 + msgbox VermilionCity_PokemonCenter_1F_Text_TrainerMonsStrongerThanWild, MSGBOX_NPC end -VermilionCity_PokemonCenter_1F_EventScript_16B44E:: @ 816B44E - msgbox gUnknown_8194180, MSGBOX_NPC +VermilionCity_PokemonCenter_1F_EventScript_Youngster:: @ 816B44E + msgbox VermilionCity_PokemonCenter_1F_Text_AllMonWeakToSpecificTypes, MSGBOX_NPC end diff --git a/data/maps/VermilionCity_PokemonCenter_1F/text.inc b/data/maps/VermilionCity_PokemonCenter_1F/text.inc index 811f01edf..cd3780286 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/text.inc +++ b/data/maps/VermilionCity_PokemonCenter_1F/text.inc @@ -1,15 +1,15 @@ -gUnknown_81940AF:: @ 81940AF +VermilionCity_PokemonCenter_1F_Text_TrainerMonsStrongerThanWild:: @ 81940AF .string "Even if they are the same level,\n" .string "POKéMON can have very different\l" .string "stats and abilities.\p" .string "A POKéMON raised by a TRAINER is\n" .string "stronger than one in the wild.$" -gUnknown_8194145:: @ 8194145 +VermilionCity_PokemonCenter_1F_Text_PoisonedMonFaintedWhileWalking:: @ 8194145 .string "My POKéMON was poisoned!\n" .string "It fainted while we were walking!$" -gUnknown_8194180:: @ 8194180 +VermilionCity_PokemonCenter_1F_Text_AllMonWeakToSpecificTypes:: @ 8194180 .string "It is true that a higher-level\n" .string "POKéMON will be more powerful…\p" .string "But, all POKéMON will have weak\n" @@ -17,3 +17,28 @@ gUnknown_8194180:: @ 8194180 .string "So, there appears to be no\n" .string "universally strong POKéMON.$" +VermilionCity_PokemonCenter_1F_Text_UrgeToBattleSomeoneAgain:: @ 8194234 + .string "The urge to battle with someone\n" + .string "you've tangled with before…\p" + .string "Have you ever had that urge?\n" + .string "I'm sure you have.\p" + .string "I wanted to battle certain people\n" + .string "again over and over, too.\p" + .string "So, I've been giving these away.\n" + .string "Please, take one!$" + +VermilionCity_PokemonCenter_1F_Text_UseDeviceForRematches:: @ 819430F + .string "Use that device and you'll find\n" + .string "TRAINERS looking for a rematch.\p" + .string "You have to charge its battery to\n" + .string "use it, though.$" + +VermilionCity_PokemonCenter_1F_Text_ExplainVSSeeker:: @ 8194381 + .string "How do you use the VS SEEKER?\n" + .string "There's nothing to it.\p" + .string "Use it like beep-beep-beep, and\n" + .string "TRAINERS around you will notice.\p" + .string "If any TRAINER wants a rematch,\n" + .string "it will let you know immediately.\p" + .string "Charge its battery and use it\n" + .string "while you're on a road.$" diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index c9f0c45ed..c669797e7 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_PokemonFanClub_EventScript_16B47F", + "script": "VermilionCity_PokemonFanClub_EventScript_Chairman", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_PokemonFanClub_EventScript_16B4FC", + "script": "VermilionCity_PokemonFanClub_EventScript_WorkerF", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_PokemonFanClub_EventScript_16B59E", + "script": "VermilionCity_PokemonFanClub_EventScript_Pikachu", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_PokemonFanClub_EventScript_16B5B1", + "script": "VermilionCity_PokemonFanClub_EventScript_Seel", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_PokemonFanClub_EventScript_16B528", + "script": "VermilionCity_PokemonFanClub_EventScript_Woman", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_PokemonFanClub_EventScript_16B563", + "script": "VermilionCity_PokemonFanClub_EventScript_FatMan", "flag": "0" } ], @@ -122,14 +122,14 @@ "x": 2, "y": 1, "elevation": 0, - "script": "VermilionCity_PokemonFanClub_EventScript_16B5C4" + "script": "VermilionCity_PokemonFanClub_EventScript_RulesSign1" }, { "type": "bg_event_type_0", "x": 9, "y": 1, "elevation": 0, - "script": "VermilionCity_PokemonFanClub_EventScript_16B5CD" + "script": "VermilionCity_PokemonFanClub_EventScript_RulesSign2" } ] } diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index 23b24b9a2..09f8d1d8b 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -1,118 +1,121 @@ +.equ SPOKE_TO_WOMAN_LAST, FLAG_TEMP_2 +.equ SPOKE_TO_FAT_MAN_LAST, FLAG_TEMP_3 + VermilionCity_PokemonFanClub_MapScripts:: @ 816B47E .byte 0 -VermilionCity_PokemonFanClub_EventScript_16B47F:: @ 816B47F +VermilionCity_PokemonFanClub_EventScript_Chairman:: @ 816B47F lock faceplayer - goto_if_set FLAG_GOT_BIKE_VOUCHER, EventScript_16B4A7 - msgbox gUnknown_819457E, MSGBOX_YESNO + goto_if_set FLAG_GOT_BIKE_VOUCHER, VermilionCity_PokemonFanClub_EventScript_AlreadyHeardStory + msgbox VermilionCity_PokemonFanClub_Text_DidYouComeToHearAboutMyMons, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_16B4B1 - msgbox gUnknown_8194860 + goto_if_eq VermilionCity_PokemonFanClub_EventScript_ChairmanStory + msgbox VermilionCity_PokemonFanClub_Text_ComeBackToHearStory release end -EventScript_16B4A7:: @ 816B4A7 - msgbox gUnknown_819488E +VermilionCity_PokemonFanClub_EventScript_AlreadyHeardStory:: @ 816B4A7 + msgbox VermilionCity_PokemonFanClub_Text_DidntComeToSeeAboutMonsAgain release end -EventScript_16B4B1:: @ 816B4B1 - msgbox gUnknown_8194628 +VermilionCity_PokemonFanClub_EventScript_ChairmanStory:: @ 816B4B1 + msgbox VermilionCity_PokemonFanClub_Text_ChairmansStory checkitemspace ITEM_BIKE_VOUCHER, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16B4F2 + goto_if_eq VermilionCity_PokemonFanClub_EventScript_NoRoomForBikeVoucher setflag FLAG_GOT_BIKE_VOUCHER - giveitem_msg gUnknown_819474E, ITEM_BIKE_VOUCHER, 1, MUS_FAN5 - msgbox gUnknown_819477C + giveitem_msg VermilionCity_PokemonFanClub_Text_ReceivedBikeVoucherFromChairman, ITEM_BIKE_VOUCHER, 1, MUS_FAN5 + msgbox VermilionCity_PokemonFanClub_Text_ExplainBikeVoucher release end -EventScript_16B4F2:: @ 816B4F2 - msgbox gUnknown_81948D2 +VermilionCity_PokemonFanClub_EventScript_NoRoomForBikeVoucher:: @ 816B4F2 + msgbox VermilionCity_PokemonFanClub_Text_MakeRoomForThis release end -VermilionCity_PokemonFanClub_EventScript_16B4FC:: @ 816B4FC +VermilionCity_PokemonFanClub_EventScript_WorkerF:: @ 816B4FC lock faceplayer - goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_16B511 - msgbox gUnknown_81948E6 + goto_if_set FLAG_SYS_GAME_CLEAR, VermilionCity_PokemonFanClub_EventScript_WorkerFGameClear + msgbox VermilionCity_PokemonFanClub_Text_ChairmanVeryVocalAboutPokemon release end -EventScript_16B511:: @ 816B511 +VermilionCity_PokemonFanClub_EventScript_WorkerFGameClear:: @ 816B511 famechecker FAMECHECKER_DAISY, 1 - msgbox gUnknown_8194960 + msgbox VermilionCity_PokemonFanClub_Text_ChairmanReallyAdoresHisMons release end -VermilionCity_PokemonFanClub_EventScript_16B528:: @ 816B528 +VermilionCity_PokemonFanClub_EventScript_Woman:: @ 816B528 lock faceplayer - goto_if_set FLAG_TEMP_3, EventScript_16B54B - msgbox gUnknown_81944CC + goto_if_set SPOKE_TO_FAT_MAN_LAST, VermilionCity_PokemonFanClub_EventScript_WomanSpokeToFatMan + msgbox VermilionCity_PokemonFanClub_Text_AdoreMySeel closemessage applymovement 5, Movement_FaceOriginalDirection waitmovement 0 - setflag FLAG_TEMP_2 + setflag SPOKE_TO_WOMAN_LAST release end -EventScript_16B54B:: @ 816B54B - msgbox gUnknown_8194518 +VermilionCity_PokemonFanClub_EventScript_WomanSpokeToFatMan:: @ 816B54B + msgbox VermilionCity_PokemonFanClub_Text_SeelFarMoreAttractive closemessage applymovement 5, Movement_FaceOriginalDirection waitmovement 0 - clearflag FLAG_TEMP_3 + clearflag SPOKE_TO_FAT_MAN_LAST release end -VermilionCity_PokemonFanClub_EventScript_16B563:: @ 816B563 +VermilionCity_PokemonFanClub_EventScript_FatMan:: @ 816B563 lock faceplayer - goto_if_set FLAG_TEMP_2, EventScript_16B586 - msgbox gUnknown_819446F + goto_if_set SPOKE_TO_WOMAN_LAST, VermilionCity_PokemonFanClub_EventScript_FatManSpokeToWoman + msgbox VermilionCity_PokemonFanClub_Text_AdmirePikachusTail closemessage applymovement 6, Movement_FaceOriginalDirection waitmovement 0 - setflag FLAG_TEMP_3 + setflag SPOKE_TO_FAT_MAN_LAST release end -EventScript_16B586:: @ 816B586 - msgbox gUnknown_819449C +VermilionCity_PokemonFanClub_EventScript_FatManSpokeToWoman:: @ 816B586 + msgbox VermilionCity_PokemonFanClub_Text_PikachuTwiceAsCute closemessage applymovement 6, Movement_FaceOriginalDirection waitmovement 0 - clearflag FLAG_TEMP_2 + clearflag SPOKE_TO_WOMAN_LAST release end -VermilionCity_PokemonFanClub_EventScript_16B59E:: @ 816B59E +VermilionCity_PokemonFanClub_EventScript_Pikachu:: @ 816B59E lock faceplayer waitse playmoncry SPECIES_PIKACHU, 0 - msgbox gUnknown_819455A + msgbox VermilionCity_PokemonFanClub_Text_Pikachu waitmoncry release end -VermilionCity_PokemonFanClub_EventScript_16B5B1:: @ 816B5B1 +VermilionCity_PokemonFanClub_EventScript_Seel:: @ 816B5B1 lock faceplayer waitse playmoncry SPECIES_SEEL, 0 - msgbox gUnknown_8194571 + msgbox VermilionCity_PokemonFanClub_Text_Seel waitmoncry release end -VermilionCity_PokemonFanClub_EventScript_16B5C4:: @ 816B5C4 - msgbox gUnknown_8194910, MSGBOX_SIGN +VermilionCity_PokemonFanClub_EventScript_RulesSign1:: @ 816B5C4 + msgbox VermilionCity_PokemonFanClub_Text_ListenPolitelyToOtherTrainers, MSGBOX_SIGN end -VermilionCity_PokemonFanClub_EventScript_16B5CD:: @ 816B5CD - msgbox gUnknown_819493D, MSGBOX_SIGN +VermilionCity_PokemonFanClub_EventScript_RulesSign2:: @ 816B5CD + msgbox VermilionCity_PokemonFanClub_Text_SomeoneBragsBragBack, MSGBOX_SIGN end diff --git a/data/maps/VermilionCity_PokemonFanClub/text.inc b/data/maps/VermilionCity_PokemonFanClub/text.inc index 1264be24d..7e28fd548 100644 --- a/data/maps/VermilionCity_PokemonFanClub/text.inc +++ b/data/maps/VermilionCity_PokemonFanClub/text.inc @@ -1,56 +1,30 @@ -Text_194234:: @ 8194234 - .string "The urge to battle with someone\n" - .string "you've tangled with before…\p" - .string "Have you ever had that urge?\n" - .string "I'm sure you have.\p" - .string "I wanted to battle certain people\n" - .string "again over and over, too.\p" - .string "So, I've been giving these away.\n" - .string "Please, take one!$" - -Text_19430F:: @ 819430F - .string "Use that device and you'll find\n" - .string "TRAINERS looking for a rematch.\p" - .string "You have to charge its battery to\n" - .string "use it, though.$" - -Text_194381:: @ 8194381 - .string "How do you use the VS SEEKER?\n" - .string "There's nothing to it.\p" - .string "Use it like beep-beep-beep, and\n" - .string "TRAINERS around you will notice.\p" - .string "If any TRAINER wants a rematch,\n" - .string "it will let you know immediately.\p" - .string "Charge its battery and use it\n" - .string "while you're on a road.$" - -gUnknown_819446F:: @ 819446F +VermilionCity_PokemonFanClub_Text_AdmirePikachusTail:: @ 819446F .string "Won't you admire my PIKACHU's\n" .string "adorable tail?$" -gUnknown_819449C:: @ 819449C +VermilionCity_PokemonFanClub_Text_PikachuTwiceAsCute:: @ 819449C .string "Humph!\p" .string "My PIKACHU is twice as cute as\n" .string "that one!$" -gUnknown_81944CC:: @ 81944CC +VermilionCity_PokemonFanClub_Text_AdoreMySeel:: @ 81944CC .string "I just adore my SEEL!\n" .string "It's so lovable!\p" .string "It squeals, “Kyuuuh,” when I\n" .string "hug it!$" -gUnknown_8194518:: @ 8194518 +VermilionCity_PokemonFanClub_Text_SeelFarMoreAttractive:: @ 8194518 .string "Oh, dear!\p" .string "My SEEL is far more attractive.\n" .string "By double, I would say.$" -gUnknown_819455A:: @ 819455A +VermilionCity_PokemonFanClub_Text_Pikachu:: @ 819455A .string "PIKACHU: Chu! Pikachu!$" -gUnknown_8194571:: @ 8194571 +VermilionCity_PokemonFanClub_Text_Seel:: @ 8194571 .string "SEEL: Kyuoo!$" -gUnknown_819457E:: @ 819457E +VermilionCity_PokemonFanClub_Text_DidYouComeToHearAboutMyMons:: @ 819457E .string "I chair the POKéMON Fan Club!\p" .string "I raise more than a hundred\n" .string "POKéMON!\p" @@ -60,7 +34,7 @@ gUnknown_819457E:: @ 819457E .string "Did you come visit to hear about\n" .string "my POKéMON?$" -gUnknown_8194628:: @ 8194628 +VermilionCity_PokemonFanClub_Text_ChairmansStory:: @ 8194628 .string "Good!\n" .string "Then listen up!\p" .string "My favorite RAPIDASH…\p" @@ -76,11 +50,11 @@ gUnknown_8194628:: @ 8194628 .string "Thanks for hearing me out!\n" .string "I want you to have this!$" -gUnknown_819474E:: @ 819474E +VermilionCity_PokemonFanClub_Text_ReceivedBikeVoucherFromChairman:: @ 819474E .string "{PLAYER} received a BIKE VOUCHER\n" .string "from the CHAIRMAN.$" -gUnknown_819477C:: @ 819477C +VermilionCity_PokemonFanClub_Text_ExplainBikeVoucher:: @ 819477C .string "Take that BIKE VOUCHER to the\n" .string "BIKE SHOP in CERULEAN CITY.\p" .string "Exchange that for a BICYCLE\n" @@ -90,55 +64,33 @@ gUnknown_819477C:: @ 819477C .string "So, I have no need for a BICYCLE.\p" .string "I hope you like cycling!$" -gUnknown_8194860:: @ 8194860 +VermilionCity_PokemonFanClub_Text_ComeBackToHearStory:: @ 8194860 .string "Oh. Come back when you want to\n" .string "hear my story!$" -gUnknown_819488E:: @ 819488E +VermilionCity_PokemonFanClub_Text_DidntComeToSeeAboutMonsAgain:: @ 819488E .string "Hello, {PLAYER}!\p" .string "Did you come see me about my\n" .string "POKéMON again?\p" .string "No?\n" .string "Too bad!$" -gUnknown_81948D2:: @ 81948D2 +VermilionCity_PokemonFanClub_Text_MakeRoomForThis:: @ 81948D2 .string "Make room for this!$" -gUnknown_81948E6:: @ 81948E6 +VermilionCity_PokemonFanClub_Text_ChairmanVeryVocalAboutPokemon:: @ 81948E6 .string "Our CHAIRMAN is very vocal about\n" .string "POKéMON.$" -gUnknown_8194910:: @ 8194910 +VermilionCity_PokemonFanClub_Text_ListenPolitelyToOtherTrainers:: @ 8194910 .string "Let's all listen politely to other\n" .string "TRAINERS!$" -gUnknown_819493D:: @ 819493D +VermilionCity_PokemonFanClub_Text_SomeoneBragsBragBack:: @ 819493D .string "If someone brags, brag right back!$" -gUnknown_8194960:: @ 8194960 +VermilionCity_PokemonFanClub_Text_ChairmanReallyAdoresHisMons:: @ 8194960 .string "Our CHAIRMAN really does adore his\n" .string "POKéMON.\p" .string "But the person who is most liked by\n" .string "POKéMON is DAISY, I think.$" - -gUnknown_81949CB:: @ 81949CB - .string "Hi!\n" - .string "Do you have a {STR_VAR_1}?\p" - .string "Want to trade it for my\n" - .string "{STR_VAR_2}?$" - -gUnknown_81949FD:: @ 81949FD - .string "That's too bad.$" - -gUnknown_8194A0D:: @ 8194A0D - .string "…This is no {STR_VAR_1}.\p" - .string "If you get one, please trade it\n" - .string "to me!$" - -gUnknown_8194A44:: @ 8194A44 - .string "Thank you!$" - -gUnknown_8194A4F:: @ 8194A4F - .string "How is my old {STR_VAR_2}?\p" - .string "My {STR_VAR_1} is doing great!$" - diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index e141634eb..b9cbcac8c 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -84,11 +84,11 @@ CeruleanCity_PokemonCenter_1F_EventScript_PokemonJournalMisty:: @ 81ACE68 release end -VermilionCity_PokemonCenter_1F_EventScript_1ACE83:: @ 81ACE83 +VermilionCity_PokemonCenter_1F_EventScript_PokemonJournalLtSurge:: @ 81ACE83 lockall famechecker FAMECHECKER_LTSURGE, 5 textcolor 3 - msgbox gUnknown_81B1558 + msgbox PokemonJournal_Text_SpecialFeatureLtSurge releaseall end diff --git a/data/scripts/seagallop.inc b/data/scripts/seagallop.inc index 77ed21b7a..c5489d7ee 100644 --- a/data/scripts/seagallop.inc +++ b/data/scripts/seagallop.inc @@ -1,205 +1,206 @@ -EventScript_1A8EC5:: @ 81A8EC5 +@ Separate selection menus for before the Rainbow Pass is obtained +EventScript_ChooseDestFromOneIsland:: @ 81A8EC5 compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if_ge EventScript_1A911E + goto_if_ge EventScript_SeviiDestinationsPage1 compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4 - goto_if_ge EventScript_1A8F12 + goto_if_ge EventScript_ChooseDestFromOneIslandVermilionAllowed multichoice 19, 6, MULTICHOICE_ISLAND_23, FALSE switch VAR_RESULT - case 0, EventScript_1A8FF9 - case 1, EventScript_1A9004 + case 0, EventScript_SailToTwoIsland2 + case 1, EventScript_SailToThreeIsland2 case 2, EventScript_CancelSail case SCR_MENU_CANCEL, EventScript_CancelSail end -EventScript_1A8F12:: @ 81A8F12 +EventScript_ChooseDestFromOneIslandVermilionAllowed:: @ 81A8F12 multichoice 19, 5, MULTICHOICE_SEAGALLOP_V23, FALSE switch VAR_RESULT - case 0, EventScript_1A8FE3 - case 1, EventScript_1A8FF9 - case 2, EventScript_1A9004 + case 0, EventScript_SailToVermilion2 + case 1, EventScript_SailToTwoIsland2 + case 2, EventScript_SailToThreeIsland2 case 3, EventScript_CancelSail case SCR_MENU_CANCEL, EventScript_CancelSail end -EventScript_1A8F54:: @ 81A8F54 +EventScript_ChooseDestFromTwoIsland:: @ 81A8F54 compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if_ge EventScript_1A911E + goto_if_ge EventScript_SeviiDestinationsPage1 compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4 - goto_if_ge EventScript_1A8FA1 + goto_if_ge EventScript_ChooseDestFromTwoIslandVermilionAllowed multichoice 19, 6, MULTICHOICE_ISLAND_13, FALSE switch VAR_RESULT - case 0, EventScript_1A8FEE - case 1, EventScript_1A9004 + case 0, EventScript_SailToOneIsland2 + case 1, EventScript_SailToThreeIsland2 case 2, EventScript_CancelSail case SCR_MENU_CANCEL, EventScript_CancelSail end -EventScript_1A8FA1:: @ 81A8FA1 +EventScript_ChooseDestFromTwoIslandVermilionAllowed:: @ 81A8FA1 multichoice 19, 5, MULTICHOICE_SEAGALLOP_V13, FALSE switch VAR_RESULT - case 0, EventScript_1A8FE3 - case 1, EventScript_1A8FEE - case 2, EventScript_1A9004 + case 0, EventScript_SailToVermilion2 + case 1, EventScript_SailToOneIsland2 + case 2, EventScript_SailToThreeIsland2 case 3, EventScript_CancelSail case SCR_MENU_CANCEL, EventScript_CancelSail end -EventScript_1A8FE3:: @ 81A8FE3 +EventScript_SailToVermilion2:: @ 81A8FE3 setvar VAR_0x8006, SEAGALLOP_VERMILION_CITY - goto EventScript_1A909E + goto EventScript_SailToDest end -EventScript_1A8FEE:: @ 81A8FEE +EventScript_SailToOneIsland2:: @ 81A8FEE setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND - goto EventScript_1A909E + goto EventScript_SailToDest end -EventScript_1A8FF9:: @ 81A8FF9 +EventScript_SailToTwoIsland2:: @ 81A8FF9 setvar VAR_0x8006, SEAGALLOP_TWO_ISLAND - goto EventScript_1A909E + goto EventScript_SailToDest end -EventScript_1A9004:: @ 81A9004 +EventScript_SailToThreeIsland2:: @ 81A9004 setvar VAR_0x8006, SEAGALLOP_THREE_ISLAND - goto EventScript_1A909E + goto EventScript_SailToDest end -EventScript_1A900F:: @ 81A900F +EventScript_ChooseDestFromIsland:: @ 81A900F compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if_ge EventScript_1A911E + goto_if_ge EventScript_SeviiDestinationsPage1 compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4 - goto_if_ge EventScript_1A905C + goto_if_ge EventScript_ChooseDestFromIslandVermilionAllowed multichoice 19, 6, MULTICHOICE_ISLAND_12, FALSE switch VAR_RESULT - case 0, EventScript_1A8FEE - case 1, EventScript_1A8FF9 + case 0, EventScript_SailToOneIsland2 + case 1, EventScript_SailToTwoIsland2 case 2, EventScript_CancelSail case SCR_MENU_CANCEL, EventScript_CancelSail end -EventScript_1A905C:: @ 81A905C +EventScript_ChooseDestFromIslandVermilionAllowed:: @ 81A905C multichoice 19, 5, MULTICHOICE_SEAGALLOP_V12, FALSE switch VAR_RESULT - case 0, EventScript_1A8FE3 - case 1, EventScript_1A8FEE - case 2, EventScript_1A8FF9 + case 0, EventScript_SailToVermilion2 + case 1, EventScript_SailToOneIsland2 + case 2, EventScript_SailToTwoIsland2 case 3, EventScript_CancelSail case SCR_MENU_CANCEL, EventScript_CancelSail end -EventScript_1A909E:: @ 81A909E - specialvar VAR_RESULT, sub_8147500 +EventScript_SailToDest:: @ 81A909E + specialvar VAR_RESULT, GetSeagallopNumber getnumberstring 0, VAR_RESULT compare VAR_0x8004, SEAGALLOP_VERMILION_CITY - goto_if_eq EventScript_1A90BE + goto_if_eq EventScript_DepartingVermilion compare VAR_0x8004, SEAGALLOP_VERMILION_CITY - goto_if_ne EventScript_1A90CC + goto_if_ne EventScript_DepartingNotVermilion end -EventScript_1A90BE:: @ 81A90BE - msgbox Text_17FB67 - goto EventScript_1A90DA +EventScript_DepartingVermilion:: @ 81A90BE + msgbox VermilionCity_Text_Seagallop7Departing + goto EventScript_SetSail end -EventScript_1A90CC:: @ 81A90CC - msgbox Text_1A641B - goto EventScript_1A90DA +EventScript_DepartingNotVermilion:: @ 81A90CC + msgbox Text_AllAboardSeagallopNum + goto EventScript_SetSail end -EventScript_1A90DA:: @ 81A90DA +EventScript_SetSail:: @ 81A90DA closemessage delay 20 goto_if_questlog EventScript_ReleaseEnd special sub_8112364 fadescreen FADE_TO_BLACK - special ScrSpecial_SeagallopFerry + special DoSeagallopFerryScene waitstate end EventScript_CancelSail:: @ 81A90F6 - specialvar VAR_RESULT, sub_8147594 - compare VAR_RESULT, 1 - goto_if_eq EventScript_1A9108 + specialvar VAR_RESULT, IsPlayerLeftOfVermilionSailor + compare VAR_RESULT, TRUE + goto_if_eq VermilionCity_EventScript_WalkUpPier release end -EventScript_1A9108:: @ 81A9108 +VermilionCity_EventScript_WalkUpPier:: @ 81A9108 closemessage - applymovement 6, Movement_FaceOriginalDirection - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A911C + applymovement LOCALID_FERRY_SAILOR, Movement_FaceOriginalDirection + applymovement OBJ_EVENT_ID_PLAYER, VermilionCity_Movement_WalkUp waitmovement 0 releaseall end -Movement_1A911C:: @ 81A911C +VermilionCity_Movement_WalkUp:: @ 81A911C walk_up step_end -EventScript_1A911E:: @ 81A911E +EventScript_SeviiDestinationsPage1:: @ 81A911E setvar VAR_0x8005, 0 special Special_DrawSeagallopDestinationMenu waitstate specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination switch VAR_0x8006 case SEAGALLOP_VERMILION_CITY, EventScript_SailToVermilionCity - case SEAGALLOP_ONE_ISLAND, EventScript_1A91E0 - case SEAGALLOP_TWO_ISLAND, EventScript_1A91EB - case SEAGALLOP_THREE_ISLAND, EventScript_1A91F6 - case SEAGALLOP_FOUR_ISLAND, EventScript_1A9201 - case SEAGALLOP_MORE, EventScript_1A917F + case SEAGALLOP_ONE_ISLAND, EventScript_SailToOneIsland + case SEAGALLOP_TWO_ISLAND, EventScript_SailToTwoIsland + case SEAGALLOP_THREE_ISLAND, EventScript_SailToThreeIsland + case SEAGALLOP_FOUR_ISLAND, EventScript_SailToFourIsland + case SEAGALLOP_MORE, EventScript_SeviiDestinationsPage2 case SCR_MENU_CANCEL, EventScript_CancelSail end -EventScript_1A917F:: @ 81A917F +EventScript_SeviiDestinationsPage2:: @ 81A917F setvar VAR_0x8005, 1 special Special_DrawSeagallopDestinationMenu waitstate specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination switch VAR_0x8006 - case SEAGALLOP_FOUR_ISLAND, EventScript_1A9201 - case SEAGALLOP_FIVE_ISLAND, EventScript_1A920C - case SEAGALLOP_SIX_ISLAND, EventScript_1A9217 - case SEAGALLOP_SEVEN_ISLAND, EventScript_1A9222 - case SEAGALLOP_MORE, EventScript_1A911E + case SEAGALLOP_FOUR_ISLAND, EventScript_SailToFourIsland + case SEAGALLOP_FIVE_ISLAND, EventScript_SailToFiveIsland + case SEAGALLOP_SIX_ISLAND, EventScript_SailToSixIsland + case SEAGALLOP_SEVEN_ISLAND, EventScript_SailToSevenIsland + case SEAGALLOP_MORE, EventScript_SeviiDestinationsPage1 case SCR_MENU_CANCEL, EventScript_CancelSail end EventScript_SailToVermilionCity:: @ 81A91D5 setvar VAR_0x8006, SEAGALLOP_VERMILION_CITY - goto EventScript_1A909E + goto EventScript_SailToDest end -EventScript_1A91E0:: @ 81A91E0 +EventScript_SailToOneIsland:: @ 81A91E0 setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND - goto EventScript_1A909E + goto EventScript_SailToDest end -EventScript_1A91EB:: @ 81A91EB +EventScript_SailToTwoIsland:: @ 81A91EB setvar VAR_0x8006, SEAGALLOP_TWO_ISLAND - goto EventScript_1A909E + goto EventScript_SailToDest end -EventScript_1A91F6:: @ 81A91F6 +EventScript_SailToThreeIsland:: @ 81A91F6 setvar VAR_0x8006, SEAGALLOP_THREE_ISLAND - goto EventScript_1A909E + goto EventScript_SailToDest end -EventScript_1A9201:: @ 81A9201 +EventScript_SailToFourIsland:: @ 81A9201 setvar VAR_0x8006, SEAGALLOP_FOUR_ISLAND - goto EventScript_1A909E + goto EventScript_SailToDest end -EventScript_1A920C:: @ 81A920C +EventScript_SailToFiveIsland:: @ 81A920C setvar VAR_0x8006, SEAGALLOP_FIVE_ISLAND - goto EventScript_1A909E + goto EventScript_SailToDest end -EventScript_1A9217:: @ 81A9217 +EventScript_SailToSixIsland:: @ 81A9217 setvar VAR_0x8006, SEAGALLOP_SIX_ISLAND - goto EventScript_1A909E + goto EventScript_SailToDest end -EventScript_1A9222:: @ 81A9222 +EventScript_SailToSevenIsland:: @ 81A9222 setvar VAR_0x8006, SEAGALLOP_SEVEN_ISLAND - goto EventScript_1A909E + goto EventScript_SailToDest end diff --git a/data/specials.inc b/data/specials.inc index 92256dfab..39ce252a4 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -387,7 +387,7 @@ gSpecials:: @ 815FD60 def_special IsThereMonInRoute5Daycare def_special GetNumLevelsGainedForRoute5DaycareMon def_special TakePokemonFromRoute5Daycare - def_special ScrSpecial_SeagallopFerry + def_special DoSeagallopFerryScene def_special Special_PlayerPartyContainsSpecies def_special Special_SetSomeVariable def_special HelpSystem_BackupSomeVariable @@ -433,11 +433,11 @@ gSpecials:: @ 815FD60 def_special ShowDodrioBerryPickingRecords def_special Special_DrawSeagallopDestinationMenu def_special Special_GetSelectedSeagallopDestination - def_special sub_8147500 + def_special GetSeagallopNumber def_special GetPlayerFacingDirection def_special DoDeoxysRockInteraction def_special Special_SetDeoxysTriangleObjectPal - def_special sub_8147594 + def_special IsPlayerLeftOfVermilionSailor def_special Special_BadEggInParty def_special sub_815D834 def_special HasAllMons diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc index a65dc1f48..3c2cd5ece 100644 --- a/data/text/fame_checker.inc +++ b/data/text/fame_checker.inc @@ -1387,7 +1387,7 @@ PokemonJournal_Text_SpecialFeatureMisty:: @ 81B14E8 .string "MISTY is said to worship LORELEI\n" .string "of the ELITE FOUR.$" -gUnknown_81B1558:: @ 81B1558 +PokemonJournal_Text_SpecialFeatureLtSurge:: @ 81B1558 .string "POKéMON JOURNAL\p" .string "Special Feature: VERMILION GYM\n" .string "LEADER LT. SURGE!\p" diff --git a/data/text/seagallop.inc b/data/text/seagallop.inc new file mode 100644 index 000000000..3d4d0d958 --- /dev/null +++ b/data/text/seagallop.inc @@ -0,0 +1,7 @@ +Text_WhereDoYouWantToGo:: @ 81A6407 + .string "おつかれさん！\n" + .string "どこに いきたいんだ？$" + +Text_AllAboardSeagallopNum:: @ 81A641B + .string "All right!\n" + .string "All aboard SEAGALLOP HI-SPEED {STR_VAR_1}!$" diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index f2bf4b865..fc8418b44 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -4,6 +4,37 @@ // General #define METATILE_General_CalmWater 0x12B +// Vermilion Gym +#define METATILE_VermilionGym_Floor 0x281 +#define METATILE_VermilionGym_Beam_MidTop 0x285 +#define METATILE_VermilionGym_Beam_MidBottom 0x28D +#define METATILE_VermilionGym_Beam_Node_TopLeft_Off 0x293 +#define METATILE_VermilionGym_Beam_Node_TopLeft_Edge_Off 0x294 +#define METATILE_VermilionGym_Beam_Node_TopRight_Edge_Off 0x295 +#define METATILE_VermilionGym_Beam_Node_TopRight_Off 0x296 +#define METATILE_VermilionGym_Beam_Node_BottomLeft_Off 0x29B +#define METATILE_VermilionGym_Beam_Node_BottomLeft_Edge_Off 0x29C +#define METATILE_VermilionGym_Beam_Node_BottomRight_Edge_Off 0x29D +#define METATILE_VermilionGym_Beam_Node_BottomRight_Off 0x29E +#define METATILE_VermilionGym_Beam_Node_TopLeft_On 0x2A9 +#define METATILE_VermilionGym_Beam_Node_TopLeft_Edge_On 0x2AA +#define METATILE_VermilionGym_Beam_Node_TopRight_Edge_On 0x2AB +#define METATILE_VermilionGym_Beam_Node_TopRight_On 0x2AC +#define METATILE_VermilionGym_Beam_Node_BottomLeft_On 0x2B1 +#define METATILE_VermilionGym_Beam_Node_BottomLeft_Edge_On 0x2B2 +#define METATILE_VermilionGym_Beam_Node_BottomRight_Edge_On 0x2B3 +#define METATILE_VermilionGym_Beam_Node_BottomRight_On 0x2B4 +#define METATILE_VermilionGym_Beam_Node_TopLeft_HalfOn 0x2BB +#define METATILE_VermilionGym_Beam_Node_TopLeft_Edge_HalfOn 0x2BC +#define METATILE_VermilionGym_Beam_MidTop_HalfOn 0x2BD +#define METATILE_VermilionGym_Beam_Node_TopRight_Edge_HalfOn 0x2BE +#define METATILE_VermilionGym_Beam_Node_TopRight_HalfOn 0x2BF +#define METATILE_VermilionGym_Beam_Node_BottomLeft_HalfOn 0x2C3 +#define METATILE_VermilionGym_Beam_Node_BottomLeft_Edge_HalfOn 0x2C4 +#define METATILE_VermilionGym_Beam_MidBottom_HalfOn 0x2C5 +#define METATILE_VermilionGym_Beam_Node_BottomRight_Edge_HalfOn 0x2C6 +#define METATILE_VermilionGym_Beam_Node_BottomRight_HalfOn 0x2C7 + // Pokemon Mansion #define METATILE_PokemonMansion_Floor 0x284 #define METATILE_PokemonMansion_Floor_ShadeFull 0x285 diff --git a/src/fame_checker.c b/src/fame_checker.c index b8f2c0055..6f60b4a44 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -33,7 +33,7 @@ #define SPRITETAG_QUESTION_MARK 1001 #define SPRITETAG_SPINNING_POKEBALL 1002 #define SPRITETAG_SCROLL_INDICATORS 1004 -#define SPRITETAG_DAISY 1006 +#define SPRITETAG_DAISY 1006 // TODO: Investigate, seems to be used for other NPCs (e.g. Fan Club Chairman) #define SPRITETAG_FUJI 1007 #define SPRITETAG_OAK 1008 #define SPRITETAG_BILL 1009 diff --git a/src/seagallop.c b/src/seagallop.c index 10ea97fec..aa0c48da1 100644 --- a/src/seagallop.c +++ b/src/seagallop.c @@ -176,7 +176,7 @@ static const struct SpriteTemplate sWakeSpriteTemplate = { SpriteCB_Wake }; -void ScrSpecial_SeagallopFerry(void) +void DoSeagallopFerryScene(void) { SetVBlankCallback(NULL); HelpSystem_Disable(); @@ -459,7 +459,8 @@ static bool8 GetDirectionOfTravel(void) return (sTravelDirectionMatrix[gSpecialVar_0x8004] >> gSpecialVar_0x8006) & 1; } -u8 sub_8147500(void) +// For "All aboard SEAGALLOP HI-SPEED ##" text +u8 GetSeagallopNumber(void) { u16 originId, destId; @@ -478,21 +479,34 @@ u8 sub_8147500(void) if (originId == SEAGALLOP_BIRTH_ISLAND || destId == SEAGALLOP_BIRTH_ISLAND) return 12; - if ((originId == SEAGALLOP_ONE_ISLAND || originId == SEAGALLOP_TWO_ISLAND || originId == SEAGALLOP_THREE_ISLAND) && (destId == SEAGALLOP_ONE_ISLAND || destId == SEAGALLOP_TWO_ISLAND || destId == SEAGALLOP_THREE_ISLAND)) + if ((originId == SEAGALLOP_ONE_ISLAND + || originId == SEAGALLOP_TWO_ISLAND + || originId == SEAGALLOP_THREE_ISLAND) + && (destId == SEAGALLOP_ONE_ISLAND + || destId == SEAGALLOP_TWO_ISLAND + || destId == SEAGALLOP_THREE_ISLAND)) return 2; - if ((originId == SEAGALLOP_FOUR_ISLAND || originId == SEAGALLOP_FIVE_ISLAND) && (destId == SEAGALLOP_FOUR_ISLAND || destId == SEAGALLOP_FIVE_ISLAND)) + if ((originId == SEAGALLOP_FOUR_ISLAND + || originId == SEAGALLOP_FIVE_ISLAND) + && (destId == SEAGALLOP_FOUR_ISLAND + || destId == SEAGALLOP_FIVE_ISLAND)) return 3; - if ((originId == SEAGALLOP_SIX_ISLAND || originId == SEAGALLOP_SEVEN_ISLAND) && (destId == SEAGALLOP_SIX_ISLAND || destId == SEAGALLOP_SEVEN_ISLAND)) + if ((originId == SEAGALLOP_SIX_ISLAND + || originId == SEAGALLOP_SEVEN_ISLAND) + && (destId == SEAGALLOP_SIX_ISLAND + || destId == SEAGALLOP_SEVEN_ISLAND)) return 5; return 6; } -bool8 sub_8147594(void) +bool8 IsPlayerLeftOfVermilionSailor(void) { - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(VERMILION_CITY) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(VERMILION_CITY) && gSaveBlock1Ptr->pos.x < 24) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(VERMILION_CITY) + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(VERMILION_CITY) + && gSaveBlock1Ptr->pos.x < 24) return TRUE; return FALSE; |