diff options
30 files changed, 193 insertions, 190 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 05468c8ca..f1d28077f 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1294,7 +1294,7 @@ EventScript_1A74D1:: @ 81A74D1 setvar VAR_TEMP_5, 1 return -EventScript_1A74EB:: @ 81A74EB +EventScript_ChangePokemonNickname:: @ 81A74EB fadescreen FADE_TO_BLACK special ChangePokemonNickname waitstate diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 4e9d2b7ae..e717a7cc4 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -30,7 +30,7 @@ EventScript_16C4A6:: @ 816C4A6 compare VAR_RESULT, NO goto_if_eq EventScript_16C514 call EventScript_1A8C27 - call EventScript_1A74EB + call EventScript_ChangePokemonNickname goto EventScript_16C514 end diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index c9eb1eec6..5a479aa3f 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -195,7 +195,7 @@ EventScript_16CD83:: @ 816CD83 getpartysize subvar VAR_RESULT, 1 copyvar VAR_0x8004, VAR_RESULT - call EventScript_1A74EB + call EventScript_ChangePokemonNickname goto EventScript_16CC10 end diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index aa0ad600b..dc1bd697a 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -260,7 +260,7 @@ EventScript_16E827:: @ 816E827 compare VAR_RESULT, NO goto_if_eq EventScript_16E895 call EventScript_1A8C27 - call EventScript_1A74EB + call EventScript_ChangePokemonNickname goto EventScript_16E895 end diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index 1f1558026..f689e96d5 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -39,7 +39,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_EventScript_16687D", + "script": "LavenderTown_EventScript_LittleGirl", "flag": "0" }, { @@ -52,7 +52,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_EventScript_1668A6", + "script": "LavenderTown_EventScript_WorkerM", "flag": "0" }, { @@ -65,7 +65,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_EventScript_1668AF", + "script": "LavenderTown_EventScript_Boy", "flag": "0" } ], @@ -120,28 +120,28 @@ "x": 12, "y": 4, "elevation": 0, - "script": "LavenderTown_EventScript_1668C1" + "script": "LavenderTown_EventScript_SilphScopeNotice" }, { "type": "bg_event_type_0", "x": 15, "y": 11, "elevation": 0, - "script": "LavenderTown_EventScript_1668B8" + "script": "LavenderTown_EventScript_TownSign" }, { "type": "bg_event_type_0", "x": 21, "y": 7, "elevation": 0, - "script": "LavenderTown_EventScript_1668D3" + "script": "LavenderTown_EventScript_PokemonTowerSign" }, { "type": "bg_event_type_0", "x": 7, "y": 11, "elevation": 0, - "script": "LavenderTown_EventScript_1668CA" + "script": "LavenderTown_EventScript_VolunteerHouseSign" } ] } diff --git a/data/maps/LavenderTown/scripts.inc b/data/maps/LavenderTown/scripts.inc index 3996e80dd..8eae06b49 100644 --- a/data/maps/LavenderTown/scripts.inc +++ b/data/maps/LavenderTown/scripts.inc @@ -8,41 +8,41 @@ LavenderTown_OnTransition:: @ 8166871 setflag FLAG_HIDE_SS_ANNE_RIVAL end -LavenderTown_EventScript_16687D:: @ 816687D +LavenderTown_EventScript_LittleGirl:: @ 816687D lock faceplayer - msgbox gUnknown_817F52E, MSGBOX_YESNO + msgbox LavenderTown_Text_DoYouBelieveInGhosts, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_16689C - msgbox gUnknown_817F568 + goto_if_eq LavenderTown_EventScript_LittleGirlBelieve + msgbox LavenderTown_Text_JustImaginingWhiteHand release end -EventScript_16689C:: @ 816689C - msgbox gUnknown_817F548 +LavenderTown_EventScript_LittleGirlBelieve:: @ 816689C + msgbox LavenderTown_Text_SoThereAreBelievers release end -LavenderTown_EventScript_1668A6:: @ 81668A6 - msgbox gUnknown_817F5B6, MSGBOX_NPC +LavenderTown_EventScript_WorkerM:: @ 81668A6 + msgbox LavenderTown_Text_TownKnownAsMonGraveSite, MSGBOX_NPC end -LavenderTown_EventScript_1668AF:: @ 81668AF - msgbox gUnknown_817F614, MSGBOX_NPC +LavenderTown_EventScript_Boy:: @ 81668AF + msgbox LavenderTown_Text_GhostsAppearedInTower, MSGBOX_NPC end -LavenderTown_EventScript_1668B8:: @ 81668B8 - msgbox gUnknown_817F676, MSGBOX_SIGN +LavenderTown_EventScript_TownSign:: @ 81668B8 + msgbox LavenderTown_Text_TownSign, MSGBOX_SIGN end -LavenderTown_EventScript_1668C1:: @ 81668C1 - msgbox gUnknown_817F69A, MSGBOX_SIGN +LavenderTown_EventScript_SilphScopeNotice:: @ 81668C1 + msgbox LavenderTown_Text_SilphScopeNotice, MSGBOX_SIGN end -LavenderTown_EventScript_1668CA:: @ 81668CA - msgbox gUnknown_817F6D6, MSGBOX_SIGN +LavenderTown_EventScript_VolunteerHouseSign:: @ 81668CA + msgbox LavenderTown_Text_VolunteerPokemonHouse, MSGBOX_SIGN end -LavenderTown_EventScript_1668D3:: @ 81668D3 - msgbox gUnknown_817F6F7, MSGBOX_SIGN +LavenderTown_EventScript_PokemonTowerSign:: @ 81668D3 + msgbox LavenderTown_Text_PokemonTowerSign, MSGBOX_SIGN end diff --git a/data/maps/LavenderTown/text.inc b/data/maps/LavenderTown/text.inc index d3d76a189..decb32a4a 100644 --- a/data/maps/LavenderTown/text.inc +++ b/data/maps/LavenderTown/text.inc @@ -1,40 +1,40 @@ -gUnknown_817F52E:: @ 817F52E +LavenderTown_Text_DoYouBelieveInGhosts:: @ 817F52E .string "Do you believe in ghosts?$" -gUnknown_817F548:: @ 817F548 +LavenderTown_Text_SoThereAreBelievers:: @ 817F548 .string "Really?\n" .string "So there are believers…$" -gUnknown_817F568:: @ 817F568 +LavenderTown_Text_JustImaginingWhiteHand:: @ 817F568 .string "Hahaha, I guess not.\p" .string "That white hand on your shoulder…\n" .string "I'm just imagining it.$" -gUnknown_817F5B6:: @ 817F5B6 +LavenderTown_Text_TownKnownAsMonGraveSite:: @ 817F5B6 .string "This town is known as the grave\n" .string "site of POKéMON.\p" .string "Memorial services are held in\n" .string "POKéMON TOWER.$" -gUnknown_817F614:: @ 817F614 +LavenderTown_Text_GhostsAppearedInTower:: @ 817F614 .string "Ghosts appeared in POKéMON TOWER.\p" .string "I think they're the spirits of\n" .string "POKéMON that the ROCKETS killed.$" -gUnknown_817F676:: @ 817F676 +LavenderTown_Text_TownSign:: @ 817F676 .string "LAVENDER TOWN\n" .string "The Noble Purple Town$" -gUnknown_817F69A:: @ 817F69A +LavenderTown_Text_SilphScopeNotice:: @ 817F69A .string "New SILPH SCOPE!\n" .string "Make the Invisible Plain to See!\p" .string "SILPH CO.$" -gUnknown_817F6D6:: @ 817F6D6 +LavenderTown_Text_VolunteerPokemonHouse:: @ 817F6D6 .string "LAVENDER VOLUNTEER\n" .string "POKéMON HOUSE$" -gUnknown_817F6F7:: @ 817F6F7 +LavenderTown_Text_PokemonTowerSign:: @ 817F6F7 .string "POKéMON TOWER\n" .string "Becalm the Spirits of POKéMON$" diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json index a8c213f2e..d065e65d6 100644 --- a/data/maps/LavenderTown_House1/map.json +++ b/data/maps/LavenderTown_House1/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_House1_EventScript_16B233", + "script": "LavenderTown_House1_EventScript_CooltrainerF", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_House1_EventScript_16B252", + "script": "LavenderTown_House1_EventScript_Cubone", "flag": "0" } ], diff --git a/data/maps/LavenderTown_House1/scripts.inc b/data/maps/LavenderTown_House1/scripts.inc index d57871971..dd331a208 100644 --- a/data/maps/LavenderTown_House1/scripts.inc +++ b/data/maps/LavenderTown_House1/scripts.inc @@ -1,25 +1,25 @@ LavenderTown_House1_MapScripts:: @ 816B232 .byte 0 -LavenderTown_House1_EventScript_16B233:: @ 816B233 +LavenderTown_House1_EventScript_CooltrainerF:: @ 816B233 lock faceplayer - goto_if_set FLAG_RESCUED_MR_FUJI, EventScript_16B248 - msgbox gUnknown_819397D + goto_if_set FLAG_RESCUED_MR_FUJI, LavenderTown_House1_EventScript_CooltrainerFGhostGone + msgbox LavenderTown_House1_Text_RocketsKilledCubonesMother release end -EventScript_16B248:: @ 816B248 - msgbox gUnknown_81939F8 +LavenderTown_House1_EventScript_CooltrainerFGhostGone:: @ 816B248 + msgbox LavenderTown_House1_Text_GhostOfPokemonTowerIsGone release end -LavenderTown_House1_EventScript_16B252:: @ 816B252 +LavenderTown_House1_EventScript_Cubone:: @ 816B252 lock faceplayer waitse playmoncry SPECIES_CUBONE, 0 - msgbox gUnknown_819396B + msgbox LavenderTown_House1_Text_Cubone waitmoncry release end diff --git a/data/maps/LavenderTown_House1/text.inc b/data/maps/LavenderTown_House1/text.inc index 0b61cb72d..ab6d722e0 100644 --- a/data/maps/LavenderTown_House1/text.inc +++ b/data/maps/LavenderTown_House1/text.inc @@ -1,14 +1,14 @@ -gUnknown_819396B:: @ 819396B +LavenderTown_House1_Text_Cubone:: @ 819396B .string "CUBONE: Kyarugoo!$" -gUnknown_819397D:: @ 819397D +LavenderTown_House1_Text_RocketsKilledCubonesMother:: @ 819397D .string "Those horrible ROCKETS!\n" .string "They deserve no mercy!\p" .string "That poor CUBONE's mother…\p" .string "It was killed trying to escape from\n" .string "TEAM ROCKET.$" -gUnknown_81939F8:: @ 81939F8 +LavenderTown_House1_Text_GhostOfPokemonTowerIsGone:: @ 81939F8 .string "The ghost of POKéMON TOWER is\n" .string "gone!\p" .string "Someone must have soothed its\n" diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json index 8ab54cc35..3c08f68a8 100644 --- a/data/maps/LavenderTown_House2/map.json +++ b/data/maps/LavenderTown_House2/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_House2_EventScript_16B266", + "script": "LavenderTown_House2_EventScript_NameRater", "flag": "0" } ], diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index b6d5ae142..762f89401 100644 --- a/data/maps/LavenderTown_House2/scripts.inc +++ b/data/maps/LavenderTown_House2/scripts.inc @@ -1,72 +1,72 @@ LavenderTown_House2_MapScripts:: @ 816B265 .byte 0 -LavenderTown_House2_EventScript_16B266:: @ 816B266 +LavenderTown_House2_EventScript_NameRater:: @ 816B266 lock faceplayer - msgbox gUnknown_8193A4B, MSGBOX_YESNO + msgbox LavenderTown_House2_Text_WantMeToRateNicknames, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_16B287 + goto_if_eq LavenderTown_House2_EventScript_ChooseMon compare VAR_RESULT, NO - goto_if_eq EventScript_16B2AA + goto_if_eq LavenderTown_House2_EventScript_DontRateNickname end -EventScript_16B287:: @ 816B287 - msgbox gUnknown_8193AA6 +LavenderTown_House2_EventScript_ChooseMon:: @ 816B287 + msgbox LavenderTown_House2_Text_CritiqueWhichMonsNickname special Special_ChooseMonFromParty waitstate compare VAR_0x8004, PARTY_SIZE - goto_if_lt EventScript_16B2B4 + goto_if_lt LavenderTown_House2_EventScript_CheckCanRateMon compare VAR_0x8004, PARTY_SIZE - goto_if_ge EventScript_16B2AA + goto_if_ge LavenderTown_House2_EventScript_DontRateNickname end -EventScript_16B2AA:: @ 816B2AA - msgbox gUnknown_8193BD4 +LavenderTown_House2_EventScript_DontRateNickname:: @ 816B2AA + msgbox LavenderTown_House2_Text_ISeeComeVisitAgain release end -EventScript_16B2B4:: @ 816B2B4 +LavenderTown_House2_EventScript_CheckCanRateMon:: @ 816B2B4 specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004 compare VAR_RESULT, SPECIES_EGG - goto_if_eq EventScript_16B307 - special TV_CopyNicknameToStringVar1AndEnsureTerminated - special TV_CheckMonOTIDEqualsPlayerID - compare VAR_RESULT, 1 - goto_if_eq EventScript_16B311 - specialvar VAR_RESULT, Special_BufferMonOTNameAndCompareToPlayerName - special TV_CopyNicknameToStringVar1AndEnsureTerminated - compare VAR_RESULT, 1 - goto_if_eq EventScript_16B311 - msgbox gUnknown_8193AD2, MSGBOX_YESNO + goto_if_eq LavenderTown_House2_EventScript_CantNicknameEgg + special Special_GetMonNickname + special Special_IsMonOTIDNotPlayers + compare VAR_RESULT, TRUE + goto_if_eq LavenderTown_House2_EventScript_CantNicknameTradeMon + specialvar VAR_RESULT, Special_IsMonOTNameNotPlayers + special Special_GetMonNickname + compare VAR_RESULT, TRUE + goto_if_eq LavenderTown_House2_EventScript_CantNicknameTradeMon + msgbox LavenderTown_House2_Text_GiveItANicerName, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_16B31B + goto_if_eq LavenderTown_House2_EventScript_ChooseNewNickname compare VAR_RESULT, NO - goto_if_eq EventScript_16B2AA + goto_if_eq LavenderTown_House2_EventScript_DontRateNickname end -EventScript_16B307:: @ 816B307 - msgbox gUnknown_8193CC4 +LavenderTown_House2_EventScript_CantNicknameEgg:: @ 816B307 + msgbox LavenderTown_House2_Text_ThatIsMerelyAnEgg release end -EventScript_16B311:: @ 816B311 - msgbox gUnknown_8193C82 +LavenderTown_House2_EventScript_CantNicknameTradeMon:: @ 816B311 + msgbox LavenderTown_House2_Text_TrulyImpeccableName release end -EventScript_16B31B:: @ 816B31B - msgbox gUnknown_8193B36 - call EventScript_1A74EB +LavenderTown_House2_EventScript_ChooseNewNickname:: @ 816B31B + msgbox LavenderTown_House2_Text_WhatShallNewNicknameBe + call EventScript_ChangePokemonNickname specialvar VAR_RESULT, NameRaterWasNicknameChanged - special TV_CopyNicknameToStringVar1AndEnsureTerminated - compare VAR_RESULT, 1 - goto_if_eq EventScript_16B345 - msgbox gUnknown_8193BF0 + special Special_GetMonNickname + compare VAR_RESULT, TRUE + goto_if_eq LavenderTown_House2_EventScript_ChoseNewNickname + msgbox LavenderTown_House2_Text_FromNowOnShallBeKnownAsSameName release end -EventScript_16B345:: @ 816B345 - msgbox gUnknown_8193B66 +LavenderTown_House2_EventScript_ChoseNewNickname:: @ 816B345 + msgbox LavenderTown_House2_Text_FromNowOnShallBeKnownAsName release end diff --git a/data/maps/LavenderTown_House2/text.inc b/data/maps/LavenderTown_House2/text.inc index 50fa577ff..f43bb7e5f 100644 --- a/data/maps/LavenderTown_House2/text.inc +++ b/data/maps/LavenderTown_House2/text.inc @@ -1,47 +1,47 @@ -gUnknown_8193A4B:: @ 8193A4B +LavenderTown_House2_Text_WantMeToRateNicknames:: @ 8193A4B .string "Hello, hello!\n" .string "I am the official NAME RATER!\p" .string "Want me to rate the nicknames of\n" .string "your POKéMON?$" -gUnknown_8193AA6:: @ 8193AA6 +LavenderTown_House2_Text_CritiqueWhichMonsNickname:: @ 8193AA6 .string "Which POKéMON's nickname should\n" .string "I critique?$" -gUnknown_8193AD2:: @ 8193AD2 +LavenderTown_House2_Text_GiveItANicerName:: @ 8193AD2 .string "{STR_VAR_1}, is it?\n" .string "That is a decent nickname!\p" .string "But, would you like me to give it\n" .string "a nicer name?\p" .string "How about it?$" -gUnknown_8193B36:: @ 8193B36 +LavenderTown_House2_Text_WhatShallNewNicknameBe:: @ 8193B36 .string "Ah, good. Then, what shall the new\n" .string "nickname be?$" -gUnknown_8193B66:: @ 8193B66 +LavenderTown_House2_Text_FromNowOnShallBeKnownAsName:: @ 8193B66 .string "Done! From now on, this POKéMON\n" .string "shall be known as {STR_VAR_1}!\p" .string "It is a better name than before!\n" .string "How fortunate for you!$" -gUnknown_8193BD4:: @ 8193BD4 +LavenderTown_House2_Text_ISeeComeVisitAgain:: @ 8193BD4 .string "I see.\n" .string "Do come visit again.$" -gUnknown_8193BF0:: @ 8193BF0 +LavenderTown_House2_Text_FromNowOnShallBeKnownAsSameName:: @ 8193BF0 .string "Done! From now on, this POKéMON\n" .string "shall be known as {STR_VAR_1}!\p" .string "It looks no different from before,\n" .string "and yet, this is vastly superior!\p" .string "How fortunate for you!$" -gUnknown_8193C82:: @ 8193C82 +LavenderTown_House2_Text_TrulyImpeccableName:: @ 8193C82 .string "{STR_VAR_1}, is it?\n" .string "That is a truly impeccable name!\p" .string "Take good care of {STR_VAR_1}!$" -gUnknown_8193CC4:: @ 8193CC4 +LavenderTown_House2_Text_ThatIsMerelyAnEgg:: @ 8193CC4 .string "Now, now.\n" .string "That is merely an EGG!$" diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json index 559373234..f2603b3ad 100644 --- a/data/maps/LavenderTown_Mart/map.json +++ b/data/maps/LavenderTown_Mart/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_Mart_EventScript_16B36B", + "script": "LavenderTown_Mart_EventScript_Clerk", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_Mart_EventScript_16B350", + "script": "LavenderTown_Mart_EventScript_BaldingMan", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_Mart_EventScript_16B359", + "script": "LavenderTown_Mart_EventScript_Rocker", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_Mart_EventScript_16B362", + "script": "LavenderTown_Mart_EventScript_Youngster", "flag": "0" } ], diff --git a/data/maps/LavenderTown_Mart/scripts.inc b/data/maps/LavenderTown_Mart/scripts.inc index bd81b99a8..4e3d8fa62 100644 --- a/data/maps/LavenderTown_Mart/scripts.inc +++ b/data/maps/LavenderTown_Mart/scripts.inc @@ -1,31 +1,31 @@ LavenderTown_Mart_MapScripts:: @ 816B34F .byte 0 -LavenderTown_Mart_EventScript_16B350:: @ 816B350 - msgbox gUnknown_8193CE5, MSGBOX_NPC +LavenderTown_Mart_EventScript_BaldingMan:: @ 816B350 + msgbox LavenderTown_Mart_Text_SearchingForStatRaiseItems, MSGBOX_NPC end -LavenderTown_Mart_EventScript_16B359:: @ 816B359 - msgbox gUnknown_8193DB6, MSGBOX_NPC +LavenderTown_Mart_EventScript_Rocker:: @ 816B359 + msgbox LavenderTown_Mart_Text_DidYouBuyRevives, MSGBOX_NPC end -LavenderTown_Mart_EventScript_16B362:: @ 816B362 - msgbox gUnknown_8193DF1, MSGBOX_NPC +LavenderTown_Mart_EventScript_Youngster:: @ 816B362 + msgbox LavenderTown_Mart_Text_TrainerDuosCanChallengeYou, MSGBOX_NPC end -LavenderTown_Mart_EventScript_16B36B:: @ 816B36B +LavenderTown_Mart_EventScript_Clerk:: @ 816B36B goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_16B390 + pokemart LavenderTown_Mart_Items msgbox Text_PleaseComeAgain release end .align 2 -Items_16B390:: @ 816B390 +LavenderTown_Mart_Items:: @ 816B390 .2byte ITEM_GREAT_BALL .2byte ITEM_SUPER_POTION .2byte ITEM_REVIVE diff --git a/data/maps/LavenderTown_Mart/text.inc b/data/maps/LavenderTown_Mart/text.inc index 024f526ed..a5b0a4968 100644 --- a/data/maps/LavenderTown_Mart/text.inc +++ b/data/maps/LavenderTown_Mart/text.inc @@ -1,4 +1,4 @@ -gUnknown_8193CE5:: @ 8193CE5 +LavenderTown_Mart_Text_SearchingForStatRaiseItems:: @ 8193CE5 .string "I'm searching for items that raise\n" .string "the stats of POKéMON.\p" .string "They're effective over the course\n" @@ -7,11 +7,11 @@ gUnknown_8193CE5:: @ 8193CE5 .string "and X SPECIAL are what I'm after.\p" .string "Do you know where I can get them?$" -gUnknown_8193DB6:: @ 8193DB6 +LavenderTown_Mart_Text_DidYouBuyRevives:: @ 8193DB6 .string "Did you buy some REVIVES?\n" .string "They revive any fainted POKéMON!$" -gUnknown_8193DF1:: @ 8193DF1 +LavenderTown_Mart_Text_TrainerDuosCanChallengeYou:: @ 8193DF1 .string "Sometimes, a TRAINER duo will\n" .string "challenge you with two POKéMON\l" .string "at the same time.\p" diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index 8a8f6794b..1889732e1 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_PokemonCenter_1F_EventScript_16B0FE", + "script": "LavenderTown_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": "LavenderTown_PokemonCenter_1F_EventScript_16B107", + "script": "LavenderTown_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 2, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_PokemonCenter_1F_EventScript_16B110", + "script": "LavenderTown_PokemonCenter_1F_EventScript_Lass", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_PokemonCenter_1F_EventScript_16B119", + "script": "LavenderTown_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": "LavenderTown_PokemonCenter_1F_EventScript_1AD0A0", + "script": "LavenderTown_PokemonCenter_1F_EventScript_BaldingMan", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], diff --git a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc index 2109df4d0..2337bdc7a 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc @@ -7,21 +7,21 @@ LavenderTown_PokemonCenter_1F_OnTransition:: @ 816B0FA setrespawn SPAWN_LAVENDER_TOWN end -LavenderTown_PokemonCenter_1F_EventScript_16B0FE:: @ 816B0FE +LavenderTown_PokemonCenter_1F_EventScript_Nurse:: @ 816B0FE lock faceplayer call EventScript_PkmnCenterNurse release end -LavenderTown_PokemonCenter_1F_EventScript_16B107:: @ 816B107 - msgbox gUnknown_8193465, MSGBOX_NPC +LavenderTown_PokemonCenter_1F_EventScript_Gentleman:: @ 816B107 + msgbox LavenderTown_PokemonCenter_1F_Text_RocketsDoAnythingForMoney, MSGBOX_NPC end -LavenderTown_PokemonCenter_1F_EventScript_16B110:: @ 816B110 - msgbox gUnknown_81934DE, MSGBOX_NPC +LavenderTown_PokemonCenter_1F_EventScript_Lass:: @ 816B110 + msgbox LavenderTown_PokemonCenter_1F_Text_CubonesMotherKilledByRockets, MSGBOX_NPC end -LavenderTown_PokemonCenter_1F_EventScript_16B119:: @ 816B119 - msgbox gUnknown_819353A, MSGBOX_NPC +LavenderTown_PokemonCenter_1F_EventScript_Youngster:: @ 816B119 + msgbox LavenderTown_PokemonCenter_1F_Text_PeoplePayForCuboneSkulls, MSGBOX_NPC end diff --git a/data/maps/LavenderTown_PokemonCenter_1F/text.inc b/data/maps/LavenderTown_PokemonCenter_1F/text.inc index f86c82e6e..66b8e5d83 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/text.inc +++ b/data/maps/LavenderTown_PokemonCenter_1F/text.inc @@ -1,15 +1,15 @@ -gUnknown_8193465:: @ 8193465 +LavenderTown_PokemonCenter_1F_Text_RocketsDoAnythingForMoney:: @ 8193465 .string "TEAM ROCKET will do anything for\n" .string "the sake of money!\p" .string "There is no job too dirty, no deed\n" .string "too heinous, no crime too wicked!$" -gUnknown_81934DE:: @ 81934DE +LavenderTown_PokemonCenter_1F_Text_CubonesMotherKilledByRockets:: @ 81934DE .string "I saw CUBONE's mother trying to\n" .string "escape from TEAM ROCKET.\p" .string "She was killed trying to get away…$" -gUnknown_819353A:: @ 819353A +LavenderTown_PokemonCenter_1F_Text_PeoplePayForCuboneSkulls:: @ 819353A .string "You know how the CUBONE species\n" .string "wears skulls, right?\p" .string "People will pay a lot for one.$" diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index 2d5c7bb6d..0a210a361 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B14A", + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_MrFuji", "flag": "FLAG_HIDE_POKEHOUSE_FUJI" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B1EB", + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_Nidorino", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B1FE", + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_Psyduck", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B1C3", + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_LittleBoy", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC", + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_Youngster", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B1AA", + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_LittleGirl", "flag": "0" } ], @@ -122,21 +122,21 @@ "x": 5, "y": 4, "elevation": 0, - "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B211" + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_PokemonFanMagazine" }, { "type": "bg_event_type_0", "x": 3, "y": 1, "elevation": 0, - "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B229" + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_Bookshelf" }, { "type": "bg_event_type_0", "x": 4, "y": 1, "elevation": 0, - "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B229" + "script": "LavenderTown_VolunteerPokemonHouse_EventScript_Bookshelf" } ] } diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index feda220fd..703a71296 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -1,82 +1,82 @@ LavenderTown_VolunteerPokemonHouse_MapScripts:: @ 816B149 .byte 0 -LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A +LavenderTown_VolunteerPokemonHouse_EventScript_MrFuji:: @ 816B14A lock faceplayer - goto_if_set FLAG_GOT_POKE_FLUTE, EventScript_16B196 - msgbox gUnknown_81936FF + goto_if_set FLAG_GOT_POKE_FLUTE, LavenderTown_VolunteerPokemonHouse_EventScript_AlreadyHavePokeFlute + msgbox LavenderTown_VolunteerPokemonHouse_Text_IdLikeYouToHaveThis checkitemspace ITEM_POKE_FLUTE, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16B1A0 + goto_if_eq LavenderTown_VolunteerPokemonHouse_EventScript_NoRoomForPokeFlute setflag FLAG_GOT_POKE_FLUTE - giveitem_msg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, MUS_FAN5 - msgbox gUnknown_81937E5 + giveitem_msg LavenderTown_VolunteerPokemonHouse_Text_ReceivedPokeFluteFromMrFuji, ITEM_POKE_FLUTE, 1, MUS_FAN5 + msgbox LavenderTown_VolunteerPokemonHouse_Text_ExplainPokeFlute release end -EventScript_16B196:: @ 816B196 - msgbox gUnknown_8193878 +LavenderTown_VolunteerPokemonHouse_EventScript_AlreadyHavePokeFlute:: @ 816B196 + msgbox LavenderTown_VolunteerPokemonHouse_Text_HasPokeFluteHelpedYou release end -EventScript_16B1A0:: @ 816B1A0 - msgbox gUnknown_819385B +LavenderTown_VolunteerPokemonHouse_EventScript_NoRoomForPokeFlute:: @ 816B1A0 + msgbox LavenderTown_VolunteerPokemonHouse_Text_MustMakeRoomForThis release end -LavenderTown_VolunteerPokemonHouse_EventScript_16B1AA:: @ 816B1AA +LavenderTown_VolunteerPokemonHouse_EventScript_LittleGirl:: @ 816B1AA lock faceplayer famechecker FAMECHECKER_MRFUJI, 0 - msgbox gUnknown_8193652 + msgbox LavenderTown_VolunteerPokemonHouse_Text_MrFujiLooksAfterOrphanedMons release end -LavenderTown_VolunteerPokemonHouse_EventScript_16B1C3:: @ 816B1C3 - msgbox gUnknown_81936B4, MSGBOX_NPC +LavenderTown_VolunteerPokemonHouse_EventScript_LittleBoy:: @ 816B1C3 + msgbox LavenderTown_VolunteerPokemonHouse_Text_MonsNiceToHug, MSGBOX_NPC end -LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC:: @ 816B1CC +LavenderTown_VolunteerPokemonHouse_EventScript_Youngster:: @ 816B1CC lock faceplayer - goto_if_set FLAG_RESCUED_MR_FUJI, EventScript_16B1E1 - msgbox gUnknown_81935ED + goto_if_set FLAG_RESCUED_MR_FUJI, LavenderTown_VolunteerPokemonHouse_EventScript_YoungsterFujiBack + msgbox LavenderTown_VolunteerPokemonHouse_Text_WhereDidMrFujiGo release end -EventScript_16B1E1:: @ 816B1E1 - msgbox gUnknown_819361D +LavenderTown_VolunteerPokemonHouse_EventScript_YoungsterFujiBack:: @ 816B1E1 + msgbox LavenderTown_VolunteerPokemonHouse_Text_MrFujiWasPrayingForCubonesMother release end -LavenderTown_VolunteerPokemonHouse_EventScript_16B1EB:: @ 816B1EB +LavenderTown_VolunteerPokemonHouse_EventScript_Nidorino:: @ 816B1EB lock faceplayer waitse playmoncry SPECIES_NIDORINO, 0 - msgbox gUnknown_81936DE + msgbox LavenderTown_VolunteerPokemonHouse_Text_Nidorino waitmoncry release end -LavenderTown_VolunteerPokemonHouse_EventScript_16B1FE:: @ 816B1FE +LavenderTown_VolunteerPokemonHouse_EventScript_Psyduck:: @ 816B1FE lock faceplayer waitse playmoncry SPECIES_PSYDUCK, 0 - msgbox gUnknown_81936EE + msgbox LavenderTown_VolunteerPokemonHouse_Text_Psyduck waitmoncry release end -LavenderTown_VolunteerPokemonHouse_EventScript_16B211:: @ 816B211 +LavenderTown_VolunteerPokemonHouse_EventScript_PokemonFanMagazine:: @ 816B211 lockall famechecker FAMECHECKER_MRFUJI, 2 - msgbox gUnknown_81938A0 + msgbox LavenderTown_VolunteerPokemonHouse_Text_GrandPrizeDrawingClipped releaseall end -LavenderTown_VolunteerPokemonHouse_EventScript_16B229:: @ 816B229 - msgbox gUnknown_819392B, MSGBOX_SIGN +LavenderTown_VolunteerPokemonHouse_EventScript_Bookshelf:: @ 816B229 + msgbox LavenderTown_VolunteerPokemonHouse_Text_PokemonMagazinesLineShelf, MSGBOX_SIGN end diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/text.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/text.inc index c7245da55..864a213bd 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/text.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/text.inc @@ -1,33 +1,33 @@ -Text_19358E:: @ 819358E +LavenderTown_PokemonCenter_1F_Text_HearMrFujiNotFromAroundHere:: @ 819358E .string "I recently moved to this town.\p" .string "I hear that MR. FUJI's not from\n" .string "these parts originally, either.$" -gUnknown_81935ED:: @ 81935ED +LavenderTown_VolunteerPokemonHouse_Text_WhereDidMrFujiGo:: @ 81935ED .string "That's odd, MR. FUJI isn't here.\n" .string "Where'd he go?$" -gUnknown_819361D:: @ 819361D +LavenderTown_VolunteerPokemonHouse_Text_MrFujiWasPrayingForCubonesMother:: @ 819361D .string "MR. FUJI had been praying alone\n" .string "for CUBONE's mother.$" -gUnknown_8193652:: @ 8193652 +LavenderTown_VolunteerPokemonHouse_Text_MrFujiLooksAfterOrphanedMons:: @ 8193652 .string "This is really MR. FUJI's house.\p" .string "He's really kind.\p" .string "He looks after abandoned and\n" .string "orphaned POKéMON.$" -gUnknown_81936B4:: @ 81936B4 +LavenderTown_VolunteerPokemonHouse_Text_MonsNiceToHug:: @ 81936B4 .string "It's so warm!\n" .string "POKéMON are so nice to hug.$" -gUnknown_81936DE:: @ 81936DE +LavenderTown_VolunteerPokemonHouse_Text_Nidorino:: @ 81936DE .string "NIDORINO: Gaoo!$" -gUnknown_81936EE:: @ 81936EE +LavenderTown_VolunteerPokemonHouse_Text_Psyduck:: @ 81936EE .string "PSYDUCK: Gwappa!$" -gUnknown_81936FF:: @ 81936FF +LavenderTown_VolunteerPokemonHouse_Text_IdLikeYouToHaveThis:: @ 81936FF .string "MR. FUJI: {PLAYER}…\p" .string "Your POKéDEX quest is one that\n" .string "requires strong dedication.\p" @@ -36,31 +36,31 @@ gUnknown_81936FF:: @ 81936FF .string "I'm not sure if this will help you,\n" .string "but I'd like you to have it.$" -gUnknown_81937BD:: @ 81937BD +LavenderTown_VolunteerPokemonHouse_Text_ReceivedPokeFluteFromMrFuji:: @ 81937BD .string "{PLAYER} received a POKé FLUTE\n" .string "from MR. FUJI.$" -gUnknown_81937E5:: @ 81937E5 +LavenderTown_VolunteerPokemonHouse_Text_ExplainPokeFlute:: @ 81937E5 .string "Upon hearing the POKé FLUTE,\n" .string "sleeping POKéMON will spring awake.\p" .string "Try using it on POKéMON that are\n" .string "sleeping obstacles.$" -gUnknown_819385B:: @ 819385B +LavenderTown_VolunteerPokemonHouse_Text_MustMakeRoomForThis:: @ 819385B .string "You must make room for this!$" -gUnknown_8193878:: @ 8193878 +LavenderTown_VolunteerPokemonHouse_Text_HasPokeFluteHelpedYou:: @ 8193878 .string "MR. FUJI: Has my POKé FLUTE\n" .string "helped you?$" -gUnknown_81938A0:: @ 81938A0 +LavenderTown_VolunteerPokemonHouse_Text_GrandPrizeDrawingClipped:: @ 81938A0 .string "POKéMON FAN MAGAZINE\n" .string "Monthly Grand Prize Drawing!\p" .string "The application form is…\p" .string "Gone! It's been clipped out.\n" .string "Someone must have applied already.$" -gUnknown_819392B:: @ 819392B +LavenderTown_VolunteerPokemonHouse_Text_PokemonMagazinesLineShelf:: @ 819392B .string "POKéMON magazines line the shelf.\p" .string "POKéMON INSIDER…\p" .string "POKéMON FAN…$" diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index c6222ad7b..2059a2f58 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -68,7 +68,7 @@ EventScript_168DB9:: @ 8168DB9 waitfanfare special Special_DaisyMassageServices fadescreen FADE_FROM_BLACK - special TV_CopyNicknameToStringVar1AndEnsureTerminated + special Special_GetMonNickname msgbox gUnknown_818D8FE release end diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index c8f00bfbe..5694157cc 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -1215,7 +1215,7 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74 EventScript_GiveNicknameToStarter:: @ 8169CCC setvar VAR_0x8004, 0 - call EventScript_1A74EB + call EventScript_ChangePokemonNickname goto EventScript_SkipGiveNicknameToStarter end diff --git a/data/maps/PokemonTower_2F/text.inc b/data/maps/PokemonTower_2F/text.inc index d75695980..804f58110 100644 --- a/data/maps/PokemonTower_2F/text.inc +++ b/data/maps/PokemonTower_2F/text.inc @@ -11,7 +11,9 @@ PokemonTower_2F_Text_RivalDefeat:: @ 8179D73 .string "You stinker!\p" .string "I took it easy on you, too!$" -PokemonTower_2F_Text_179DA2:: @ 8179DA2 +@ Unused. Translated below +@ Aw, man! They really kicked the bucket! Weak! Do them a favor and raise them more properly. +PokemonTower_2F_Text_RivalVictory:: @ 8179DA2 .string "{RIVAL}“あーあ‥！\n" .string "ほんとに くたばっちまったぞ！\l" .string "よわいなー！\l" diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 2994fabdd..7a061860a 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -80,7 +80,7 @@ EventScript_16ECB5:: @ 816ECB5 compare VAR_RESULT, NO goto_if_eq EventScript_16ED29 call EventScript_1A8C27 - call EventScript_1A74EB + call EventScript_ChangePokemonNickname goto EventScript_16ED29 end diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 5e7a0ea89..19012f0e4 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -151,7 +151,7 @@ EventScript_161B12:: @ 8161B12 compare VAR_RESULT, NO goto_if_eq EventScript_161B7E call EventScript_1A8C27 - call EventScript_1A74EB + call EventScript_ChangePokemonNickname goto EventScript_161B7E EventScript_161B44:: @ 8161B44 diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index f870602a3..0d058b2d5 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -252,11 +252,11 @@ IndigoPlateau_PokemonCenter_1F_EventScript_1AD087:: @ 81AD087 release end -LavenderTown_PokemonCenter_1F_EventScript_1AD0A0:: @ 81AD0A0 +LavenderTown_PokemonCenter_1F_EventScript_BaldingMan:: @ 81AD0A0 lock faceplayer famechecker FAMECHECKER_MRFUJI, 3 - msgbox Text_19358E + msgbox LavenderTown_PokemonCenter_1F_Text_HearMrFujiNotFromAroundHere release end diff --git a/data/specials.inc b/data/specials.inc index 0841bc885..e76326401 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -132,8 +132,8 @@ gSpecials:: @ 815FD60 def_special GetMagikarpSizeRecordInfo def_special CompareMagikarpSize def_special NameRaterWasNicknameChanged - def_special TV_CopyNicknameToStringVar1AndEnsureTerminated - def_special TV_CheckMonOTIDEqualsPlayerID + def_special Special_GetMonNickname + def_special Special_IsMonOTIDNotPlayers def_special nullsub_75 def_special nullsub_75 def_special BufferRandomHobbyOrLifestyleString @@ -344,7 +344,7 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special nullsub_75 def_special HasAllKantoMons - def_special Special_BufferMonOTNameAndCompareToPlayerName + def_special Special_IsMonOTNameNotPlayers def_special nullsub_75 def_special Dummy_TryEnableBravoTrainerBattleTower def_special GetNameOfEnigmaBerryInPlayerParty diff --git a/src/field_specials.c b/src/field_specials.c index 5f44a090d..8d6014fba 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -523,9 +523,10 @@ u16 Special_GetSpeciesOfPartySlot_x8004(void) return GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_SPECIES2, NULL); } -bool8 Special_BufferMonOTNameAndCompareToPlayerName(void) +bool8 Special_IsMonOTNameNotPlayers(void) { GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_OT_NAME, gStringVar1); + if (!StringCompare(gSaveBlock2Ptr->playerName, gStringVar1)) return FALSE; else @@ -1632,13 +1633,13 @@ static void ChangePokemonNickname_CB(void) CB2_ReturnToFieldContinueScriptPlayMapMusic(); } -void TV_CopyNicknameToStringVar1AndEnsureTerminated(void) +void Special_GetMonNickname(void) { GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar1); StringGetEnd10(gStringVar1); } -void TV_CheckMonOTIDEqualsPlayerID(void) +void Special_IsMonOTIDNotPlayers(void) { if (GetPlayerTrainerId() == GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_OT_ID, NULL)) gSpecialVar_Result = FALSE; |