dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Document Lavender Town scripts

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