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

Merge pull request #226 from GriffinRichards/doc-lavender

Browse Source 
Document Lavender Town scripts
This commit is contained in:
PikalaxALT
2020-01-16 15:51:18 -05:00
committed by GitHub
parent 7cddc40bbf 8b2bf805ea
commit 2af6124863
54 changed files with 471 additions and 467 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
return
EventScript_1A74EB:: @ 81A74EB
EventScript_ChangePokemonNickname:: @ 81A74EB
fadescreen FADE_TO_BLACK
special ChangePokemonNickname
waitstate
data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
+1 -1
View File
@@ -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
data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
+1 -1
View File
@@ -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
data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
+1 -1
View File
@@ -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
data/maps/LavenderTown/map.json
+7 -7
View File
@@ -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"
}
]
}
data/maps/LavenderTown/scripts.inc
+18 -18
View File
@@ -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
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?$"
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$"
data/maps/LavenderTown_House1/map.json
+2 -2
View File
@@ -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"
}
],
data/maps/LavenderTown_House1/scripts.inc
+7 -7
View File
@@ -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
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!$"
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"
data/maps/LavenderTown_House2/map.json
+1 -1
View File
@@ -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"
}
],
data/maps/LavenderTown_House2/scripts.inc
+36 -36
View File
@@ -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
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 "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!$"
data/maps/LavenderTown_Mart/map.json
+4 -4
View File
@@ -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"
}
],
data/maps/LavenderTown_Mart/scripts.inc
+9 -9
View File
@@ -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
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 "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"
data/maps/LavenderTown_PokemonCenter_1F/map.json
+5 -5
View File
@@ -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"
}
],
data/maps/LavenderTown_PokemonCenter_1F/scripts.inc
+7 -7
View File
@@ -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
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 "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.$"
data/maps/LavenderTown_VolunteerPokemonHouse/map.json
+9 -9
View File
@@ -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"
}
]
}
data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc
+27 -27
View File
@@ -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
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 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…$"
data/maps/PalletTown_GarysHouse/scripts.inc
+1 -1
View File
@@ -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
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+1 -1
View File
@@ -1215,7 +1215,7 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74
EventScript_GiveNicknameToStarter:: @ 8169CCC
setvar VAR_0x8004, 0
call EventScript_1A74EB
call EventScript_ChangePokemonNickname
goto EventScript_SkipGiveNicknameToStarter
end
data/maps/PokemonTower_1F/map.json
+5 -5
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonTower_1F_EventScript_16327C",
"script": "PokemonTower_1F_EventScript_WorkerF",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonTower_1F_EventScript_16323F",
"script": "PokemonTower_1F_EventScript_Channeler",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonTower_1F_EventScript_163248",
"script": "PokemonTower_1F_EventScript_Woman1",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonTower_1F_EventScript_16325A",
"script": "PokemonTower_1F_EventScript_Woman2",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 2,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonTower_1F_EventScript_163251",
"script": "PokemonTower_1F_EventScript_BaldingMan",
"flag": "0"
}
],
data/maps/PokemonTower_1F/scripts.inc
+13 -13
View File
@@ -6,33 +6,33 @@ PokemonTower_1F_OnTransition:: @ 816323B
setworldmapflag FLAG_WORLD_MAP_POKEMON_TOWER_1F
end
PokemonTower_1F_EventScript_16323F:: @ 816323F
msgbox gUnknown_8179CAB, MSGBOX_NPC
PokemonTower_1F_EventScript_Channeler:: @ 816323F
msgbox PokemonTower_1F_Text_SenseSpiritsUpToMischief, MSGBOX_NPC
end
PokemonTower_1F_EventScript_163248:: @ 8163248
msgbox gUnknown_8179C8C, MSGBOX_NPC
PokemonTower_1F_EventScript_Woman1:: @ 8163248
msgbox PokemonTower_1F_Text_GrowlitheWhyDidYouDie, MSGBOX_NPC
end
PokemonTower_1F_EventScript_163251:: @ 8163251
msgbox gUnknown_8179C41, MSGBOX_NPC
PokemonTower_1F_EventScript_BaldingMan:: @ 8163251
msgbox PokemonTower_1F_Text_CameToPrayForDepartedClefairy, MSGBOX_NPC
end
PokemonTower_1F_EventScript_16325A:: @ 816325A
PokemonTower_1F_EventScript_Woman2:: @ 816325A
lock
faceplayer
checkplayergender
compare VAR_RESULT, MALE
goto_if_eq EventScript_163272
msgbox gUnknown_8179BFC
goto_if_eq PokemonTower_1F_EventScript_Woman2MalePlayer
msgbox PokemonTower_1F_Text_ComeToPayRespectsGirl
release
end
EventScript_163272:: @ 8163272
msgbox gUnknown_8179BB8
PokemonTower_1F_EventScript_Woman2MalePlayer:: @ 8163272
msgbox PokemonTower_1F_Text_ComeToPayRespectsSon
release
end
PokemonTower_1F_EventScript_16327C:: @ 816327C
msgbox gUnknown_8179B7A, MSGBOX_NPC
PokemonTower_1F_EventScript_WorkerF:: @ 816327C
msgbox PokemonTower_1F_Text_ErectedInMemoryOfDeadMons, MSGBOX_NPC
end
data/maps/PokemonTower_1F/text.inc
+6 -6
View File
@@ -1,28 +1,28 @@
gUnknown_8179B7A:: @ 8179B7A
PokemonTower_1F_Text_ErectedInMemoryOfDeadMons:: @ 8179B7A
.string "POKéMON TOWER was erected in the\n"
.string "memory of POKéMON that died.$"
gUnknown_8179BB8:: @ 8179BB8
PokemonTower_1F_Text_ComeToPayRespectsSon:: @ 8179BB8
.string "Did you come to pay respects?\p"
.string "Bless your POKéMON-loving heart,\n"
.string "son.$"
gUnknown_8179BFC:: @ 8179BFC
PokemonTower_1F_Text_ComeToPayRespectsGirl:: @ 8179BFC
.string "Did you come to pay respects?\p"
.string "Bless your POKéMON-loving heart,\n"
.string "girl.$"
gUnknown_8179C41:: @ 8179C41
PokemonTower_1F_Text_CameToPrayForDepartedClefairy:: @ 8179C41
.string "I came to pray for my dearly\n"
.string "departed CLEFAIRY.\p"
.string "Sniff!\n"
.string "I'm awash in tears…$"
gUnknown_8179C8C:: @ 8179C8C
PokemonTower_1F_Text_GrowlitheWhyDidYouDie:: @ 8179C8C
.string "My GROWLITHE…\n"
.string "Why did you die?$"
gUnknown_8179CAB:: @ 8179CAB
PokemonTower_1F_Text_SenseSpiritsUpToMischief:: @ 8179CAB
.string "I am a CHANNELER.\p"
.string "There are spirits up to mischief.\n"
.string "I sense them high in the TOWER.$"
data/maps/PokemonTower_2F/map.json
+3 -3
View File
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonTower_2F_EventScript_163286",
"script": "PokemonTower_2F_EventScript_Channeler",
"flag": "0"
}
],
@@ -64,7 +64,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_POKEMON_TOWER_2F",
"var_value": 0,
"script": "PokemonTower_2F_EventScript_16328F"
"script": "PokemonTower_2F_EventScript_RivalTriggerRight"
},
{
"type": "trigger",
@@ -73,7 +73,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_POKEMON_TOWER_2F",
"var_value": 0,
"script": "PokemonTower_2F_EventScript_16329B"
"script": "PokemonTower_2F_EventScript_RivalTriggerDown"
}
],
"bg_events": []
data/maps/PokemonTower_2F/scripts.inc
+30 -30
View File
@@ -1,48 +1,48 @@
PokemonTower_2F_MapScripts:: @ 8163285
.byte 0
PokemonTower_2F_EventScript_163286:: @ 8163286
msgbox gUnknown_8179EAE, MSGBOX_NPC
PokemonTower_2F_EventScript_Channeler:: @ 8163286
msgbox PokemonTower_2F_Text_SilphScopeCouldUnmaskGhosts, MSGBOX_NPC
end
PokemonTower_2F_EventScript_16328F:: @ 816328F
PokemonTower_2F_EventScript_RivalTriggerRight:: @ 816328F
lockall
setvar VAR_TEMP_1, 0
goto EventScript_1632A7
goto PokemonTower_2F_EventScript_Rival
end
PokemonTower_2F_EventScript_16329B:: @ 816329B
PokemonTower_2F_EventScript_RivalTriggerDown:: @ 816329B
lockall
setvar VAR_TEMP_1, 1
goto EventScript_1632A7
goto PokemonTower_2F_EventScript_Rival
end
EventScript_1632A7:: @ 81632A7
PokemonTower_2F_EventScript_Rival:: @ 81632A7
textcolor 0
playbgm MUS_RIVAL1, 0
compare VAR_TEMP_1, 0
call_if_eq EventScript_163339
call_if_eq PokemonTower_2F_EventScript_RivalFacePlayerRight
compare VAR_TEMP_1, 1
call_if_eq EventScript_16334B
call_if_eq PokemonTower_2F_EventScript_RivalFacePlayerDown
applymovement 1, Movement_ExclamationMark
waitmovement 0
applymovement 1, Movement_Delay48
waitmovement 0
msgbox gUnknown_8179CFF
msgbox PokemonTower_2F_Text_RivalIntro
setvar VAR_LAST_TALKED, 1
compare VAR_STARTER_MON, 2
call_if_eq EventScript_16335D
call_if_eq PokemonTower_2F_EventScript_RivalSquirtle
compare VAR_STARTER_MON, 1
call_if_eq EventScript_163368
call_if_eq PokemonTower_2F_EventScript_RivalBulbasaur
compare VAR_STARTER_MON, 0
call_if_eq EventScript_163373
msgbox gUnknown_8179DD4
call_if_eq PokemonTower_2F_EventScript_RivalCharmander
msgbox PokemonTower_2F_Text_RivalPostBattle
closemessage
playbgm MUS_RIVAL2, 0
compare VAR_TEMP_1, 0
call_if_eq EventScript_16337E
call_if_eq PokemonTower_2F_EventScript_RivalExitRight
compare VAR_TEMP_1, 1
call_if_eq EventScript_163389
call_if_eq PokemonTower_2F_EventScript_RivalExitDown
playse SE_KAIDAN
delay 25
fadedefaultbgm
@@ -51,41 +51,41 @@ EventScript_1632A7:: @ 81632A7
releaseall
end
EventScript_163339:: @ 8163339
PokemonTower_2F_EventScript_RivalFacePlayerRight:: @ 8163339
applymovement 1, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
waitmovement 0
return
EventScript_16334B:: @ 816334B
PokemonTower_2F_EventScript_RivalFacePlayerDown:: @ 816334B
applymovement 1, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
return
EventScript_16335D:: @ 816335D
trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, Text_179D73
PokemonTower_2F_EventScript_RivalSquirtle:: @ 816335D
trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, PokemonTower_2F_Text_RivalDefeat
return
EventScript_163368:: @ 8163368
trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, Text_179D73
PokemonTower_2F_EventScript_RivalBulbasaur:: @ 8163368
trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, PokemonTower_2F_Text_RivalDefeat
return
EventScript_163373:: @ 8163373
trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, Text_179D73
PokemonTower_2F_EventScript_RivalCharmander:: @ 8163373
trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, PokemonTower_2F_Text_RivalDefeat
return
EventScript_16337E:: @ 816337E
applymovement 1, Movement_163394
PokemonTower_2F_EventScript_RivalExitRight:: @ 816337E
applymovement 1, PokemonTower_2F_Movement_RivalExitRight
waitmovement 0
return
EventScript_163389:: @ 8163389
applymovement 1, Movement_16339D
PokemonTower_2F_EventScript_RivalExitDown:: @ 8163389
applymovement 1, PokemonTower_2F_Movement_RivalExitDown
waitmovement 0
return
Movement_163394:: @ 8163394
PokemonTower_2F_Movement_RivalExitRight:: @ 8163394
walk_down
walk_right
walk_right
@@ -96,7 +96,7 @@ Movement_163394:: @ 8163394
walk_in_place_fastest_right
step_end
Movement_16339D:: @ 816339D
PokemonTower_2F_Movement_RivalExitDown:: @ 816339D
walk_right
walk_right
walk_down
data/maps/PokemonTower_2F/text.inc
+7 -5
View File
@@ -1,4 +1,4 @@
gUnknown_8179CFF:: @ 8179CFF
PokemonTower_2F_Text_RivalIntro:: @ 8179CFF
.string "{RIVAL}: Hey, {PLAYER}!\n"
.string "What brings you here?\l"
.string "Is your POKéMON dead?\p"
@@ -6,18 +6,20 @@ gUnknown_8179CFF:: @ 8179CFF
.string "I can at least make them faint!\n"
.string "Let's go!$"
Text_179D73:: @ 8179D73
PokemonTower_2F_Text_RivalDefeat:: @ 8179D73
.string "What?\n"
.string "You stinker!\p"
.string "I took it easy on you, too!$"
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"
.string "もっと　ちゃんと　そだてて　やれよ$"
gUnknown_8179DD4:: @ 8179DD4
PokemonTower_2F_Text_RivalPostBattle:: @ 8179DD4
.string "How's your POKéDEX coming?\n"
.string "I just caught a CUBONE!\p"
.string "I can't find the bigger MAROWAK.\n"
@@ -28,7 +30,7 @@ gUnknown_8179DD4:: @ 8179DD4
.string "unlike you.\p"
.string "Smell ya later!$"
gUnknown_8179EAE:: @ 8179EAE
PokemonTower_2F_Text_SilphScopeCouldUnmaskGhosts:: @ 8179EAE
.string "Even we could not identify the\n"
.string "wayward ghosts.\p"
.string "A SILPH SCOPE might be able to\n"
data/maps/PokemonTower_3F/map.json
+3 -3
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "PokemonTower_3F_EventScript_1633A7",
"script": "PokemonTower_3F_EventScript_Patricia",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "PokemonTower_3F_EventScript_1633BE",
"script": "PokemonTower_3F_EventScript_Carly",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
"script": "PokemonTower_3F_EventScript_1633D5",
"script": "PokemonTower_3F_EventScript_Hope",
"flag": "0"
},
{
data/maps/PokemonTower_3F/scripts.inc
+9 -9
View File
@@ -1,17 +1,17 @@
PokemonTower_3F_MapScripts:: @ 81633A6
.byte 0
PokemonTower_3F_EventScript_1633A7:: @ 81633A7
trainerbattle_single TRAINER_CHANNELER_PATRICIA, Text_179FA0, Text_179FBC
msgbox gUnknown_8179FD3, MSGBOX_AUTOCLOSE
PokemonTower_3F_EventScript_Patricia:: @ 81633A7
trainerbattle_single TRAINER_CHANNELER_PATRICIA, PokemonTower_3F_Text_PatriciaIntro, PokemonTower_3F_Text_PatriciaDefeat
msgbox PokemonTower_3F_Text_PatriciaPostBattle, MSGBOX_AUTOCLOSE
end
PokemonTower_3F_EventScript_1633BE:: @ 81633BE
trainerbattle_single TRAINER_CHANNELER_CARLY, Text_179F62, Text_179F72
msgbox gUnknown_8179F88, MSGBOX_AUTOCLOSE
PokemonTower_3F_EventScript_Carly:: @ 81633BE
trainerbattle_single TRAINER_CHANNELER_CARLY, PokemonTower_3F_Text_CarlyIntro, PokemonTower_3F_Text_CarlyDefeat
msgbox PokemonTower_3F_Text_CarlyPostBattle, MSGBOX_AUTOCLOSE
end
PokemonTower_3F_EventScript_1633D5:: @ 81633D5
trainerbattle_single TRAINER_CHANNELER_HOPE, Text_179F09, Text_179F21
msgbox gUnknown_8179F31, MSGBOX_AUTOCLOSE
PokemonTower_3F_EventScript_Hope:: @ 81633D5
trainerbattle_single TRAINER_CHANNELER_HOPE, PokemonTower_3F_Text_HopeIntro, PokemonTower_3F_Text_HopeDefeat
msgbox PokemonTower_3F_Text_HopePostBattle, MSGBOX_AUTOCLOSE
end
data/maps/PokemonTower_3F/text.inc
+9 -9
View File
@@ -1,36 +1,36 @@
Text_179F09:: @ 8179F09
PokemonTower_3F_Text_HopeIntro:: @ 8179F09
.string "Urrg… Awaa…\n"
.string "Huhu… Graa…$"
Text_179F21:: @ 8179F21
PokemonTower_3F_Text_HopeDefeat:: @ 8179F21
.string "Hwa!\n"
.string "I'm saved!$"
gUnknown_8179F31:: @ 8179F31
PokemonTower_3F_Text_HopePostBattle:: @ 8179F31
.string "The ghosts can be identified by\n"
.string "the SILPH SCOPE.$"
Text_179F62:: @ 8179F62
PokemonTower_3F_Text_CarlyIntro:: @ 8179F62
.string "Kekeke…\n"
.string "Kwaaah!$"
Text_179F72:: @ 8179F72
PokemonTower_3F_Text_CarlyDefeat:: @ 8179F72
.string "Hmm?\n"
.string "What am I doing?$"
gUnknown_8179F88:: @ 8179F88
PokemonTower_3F_Text_CarlyPostBattle:: @ 8179F88
.string "Sorry!\n"
.string "I was possessed!$"
Text_179FA0:: @ 8179FA0
PokemonTower_3F_Text_PatriciaIntro:: @ 8179FA0
.string "Be gone!\n"
.string "Malevolent spirit!$"
Text_179FBC:: @ 8179FBC
PokemonTower_3F_Text_PatriciaDefeat:: @ 8179FBC
.string "Whew!\n"
.string "The spirit left!$"
gUnknown_8179FD3:: @ 8179FD3
PokemonTower_3F_Text_PatriciaPostBattle:: @ 8179FD3
.string "The others above…\n"
.string "They must have been possessed.$"
data/maps/PokemonTower_4F/map.json
+3 -3
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "PokemonTower_4F_EventScript_163404",
"script": "PokemonTower_4F_EventScript_Laurel",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
"script": "PokemonTower_4F_EventScript_16341B",
"script": "PokemonTower_4F_EventScript_Jody",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
"script": "PokemonTower_4F_EventScript_1633ED",
"script": "PokemonTower_4F_EventScript_Paula",
"flag": "0"
},
{
data/maps/PokemonTower_4F/scripts.inc
+9 -9
View File
@@ -1,17 +1,17 @@
PokemonTower_4F_MapScripts:: @ 81633EC
.byte 0
PokemonTower_4F_EventScript_1633ED:: @ 81633ED
trainerbattle_single TRAINER_CHANNELER_PAULA, Text_17A004, Text_17A017
msgbox gUnknown_817A02B, MSGBOX_AUTOCLOSE
PokemonTower_4F_EventScript_Paula:: @ 81633ED
trainerbattle_single TRAINER_CHANNELER_PAULA, PokemonTower_4F_Text_PaulaIntro, PokemonTower_4F_Text_PaulaDefeat
msgbox PokemonTower_4F_Text_PaulaPostBattle, MSGBOX_AUTOCLOSE
end
PokemonTower_4F_EventScript_163404:: @ 8163404
trainerbattle_single TRAINER_CHANNELER_LAUREL, Text_17A046, Text_17A061
msgbox gUnknown_817A067, MSGBOX_AUTOCLOSE
PokemonTower_4F_EventScript_Laurel:: @ 8163404
trainerbattle_single TRAINER_CHANNELER_LAUREL, PokemonTower_4F_Text_LaurelIntro, PokemonTower_4F_Text_LaurelDefeat
msgbox PokemonTower_4F_Text_LaurelPostBattle, MSGBOX_AUTOCLOSE
end
PokemonTower_4F_EventScript_16341B:: @ 816341B
trainerbattle_single TRAINER_CHANNELER_JODY, Text_17A096, Text_17A0AB
msgbox gUnknown_817A0BB, MSGBOX_AUTOCLOSE
PokemonTower_4F_EventScript_Jody:: @ 816341B
trainerbattle_single TRAINER_CHANNELER_JODY, PokemonTower_4F_Text_JodyIntro, PokemonTower_4F_Text_JodyDefeat
msgbox PokemonTower_4F_Text_JodyPostBattle, MSGBOX_AUTOCLOSE
end
data/maps/PokemonTower_4F/text.inc
+9 -9
View File
@@ -1,33 +1,33 @@
Text_17A004:: @ 817A004
PokemonTower_4F_Text_PaulaIntro:: @ 817A004
.string "Ghost! No!\n"
.string "Kwaaah!$"
Text_17A017:: @ 817A017
PokemonTower_4F_Text_PaulaDefeat:: @ 817A017
.string "Where is the ghost?$"
gUnknown_817A02B:: @ 817A02B
PokemonTower_4F_Text_PaulaPostBattle:: @ 817A02B
.string "I must have been dreaming…$"
Text_17A046:: @ 817A046
PokemonTower_4F_Text_LaurelIntro:: @ 817A046
.string "Be cursed with me!\n"
.string "Kwaaah!$"
Text_17A061:: @ 817A061
PokemonTower_4F_Text_LaurelDefeat:: @ 817A061
.string "What!$"
gUnknown_817A067:: @ 817A067
PokemonTower_4F_Text_LaurelPostBattle:: @ 817A067
.string "We can't determine the identity of\n"
.string "the ghosts…$"
Text_17A096:: @ 817A096
PokemonTower_4F_Text_JodyIntro:: @ 817A096
.string "Huhuhu…\n"
.string "Beat me not!$"
Text_17A0AB:: @ 817A0AB
PokemonTower_4F_Text_JodyDefeat:: @ 817A0AB
.string "Huh?\n"
.string "Who? What?$"
gUnknown_817A0BB:: @ 817A0BB
PokemonTower_4F_Text_JodyPostBattle:: @ 817A0BB
.string "May the departed POKéMON rest in\n"
.string "peace…$"
data/maps/PokemonTower_5F/map.json
+22 -22
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
"script": "PokemonTower_5F_EventScript_163472",
"script": "PokemonTower_5F_EventScript_Ruth",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "PokemonTower_5F_EventScript_16345B",
"script": "PokemonTower_5F_EventScript_Tammy",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
"script": "PokemonTower_5F_EventScript_163489",
"script": "PokemonTower_5F_EventScript_Karina",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
"script": "PokemonTower_5F_EventScript_1634A0",
"script": "PokemonTower_5F_EventScript_Janae",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonTower_5F_EventScript_163433",
"script": "PokemonTower_5F_EventScript_Channeler",
"flag": "0"
},
{
@@ -129,7 +129,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 0,
"script": "PokemonTower_5F_EventScript_16343C"
"script": "PokemonTower_5F_EventScript_PurifiedZone"
},
{
"type": "trigger",
@@ -138,7 +138,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 0,
"script": "PokemonTower_5F_EventScript_16343C"
"script": "PokemonTower_5F_EventScript_PurifiedZone"
},
{
"type": "trigger",
@@ -147,7 +147,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 0,
"script": "PokemonTower_5F_EventScript_16343C"
"script": "PokemonTower_5F_EventScript_PurifiedZone"
},
{
"type": "trigger",
@@ -156,7 +156,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 0,
"script": "PokemonTower_5F_EventScript_16343C"
"script": "PokemonTower_5F_EventScript_PurifiedZone"
},
{
"type": "trigger",
@@ -165,7 +165,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 1,
"script": "PokemonTower_5F_EventScript_163453"
"script": "PokemonTower_5F_EventScript_ExitPurifiedZone"
},
{
"type": "trigger",
@@ -174,7 +174,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 0,
"script": "PokemonTower_5F_EventScript_16343C"
"script": "PokemonTower_5F_EventScript_PurifiedZone"
},
{
"type": "trigger",
@@ -183,7 +183,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 0,
"script": "PokemonTower_5F_EventScript_16343C"
"script": "PokemonTower_5F_EventScript_PurifiedZone"
},
{
"type": "trigger",
@@ -192,7 +192,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 0,
"script": "PokemonTower_5F_EventScript_16343C"
"script": "PokemonTower_5F_EventScript_PurifiedZone"
},
{
"type": "trigger",
@@ -201,7 +201,7 @@
"elevation": 0,
"var": "VAR_TEMP_1",
"var_value": 0,
"script": "PokemonTower_5F_EventScript_16343C"
"script": "PokemonTower_5F_EventScript_PurifiedZone"
},
{
"type": "trigger",
@@ -210,7 +210,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 1,
"script": "PokemonTower_5F_EventScript_163453"
"script": "PokemonTower_5F_EventScript_ExitPurifiedZone"
},
{
"type": "trigger",
@@ -219,7 +219,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 1,
"script": "PokemonTower_5F_EventScript_163453"
"script": "PokemonTower_5F_EventScript_ExitPurifiedZone"
},
{
"type": "trigger",
@@ -228,7 +228,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 1,
"script": "PokemonTower_5F_EventScript_163453"
"script": "PokemonTower_5F_EventScript_ExitPurifiedZone"
},
{
"type": "trigger",
@@ -237,7 +237,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 1,
"script": "PokemonTower_5F_EventScript_163453"
"script": "PokemonTower_5F_EventScript_ExitPurifiedZone"
},
{
"type": "trigger",
@@ -246,7 +246,7 @@
"elevation": 0,
"var": "VAR_TEMP_1",
"var_value": 1,
"script": "PokemonTower_5F_EventScript_163453"
"script": "PokemonTower_5F_EventScript_ExitPurifiedZone"
},
{
"type": "trigger",
@@ -255,7 +255,7 @@
"elevation": 0,
"var": "VAR_TEMP_1",
"var_value": 1,
"script": "PokemonTower_5F_EventScript_163453"
"script": "PokemonTower_5F_EventScript_ExitPurifiedZone"
},
{
"type": "trigger",
@@ -264,7 +264,7 @@
"elevation": 0,
"var": "VAR_TEMP_1",
"var_value": 1,
"script": "PokemonTower_5F_EventScript_163453"
"script": "PokemonTower_5F_EventScript_ExitPurifiedZone"
},
{
"type": "trigger",
@@ -273,7 +273,7 @@
"elevation": 0,
"var": "VAR_TEMP_1",
"var_value": 1,
"script": "PokemonTower_5F_EventScript_163453"
"script": "PokemonTower_5F_EventScript_ExitPurifiedZone"
}
],
"bg_events": [
data/maps/PokemonTower_5F/scripts.inc
+17 -17
View File
@@ -1,42 +1,42 @@
PokemonTower_5F_MapScripts:: @ 8163432
.byte 0
PokemonTower_5F_EventScript_163433:: @ 8163433
msgbox gUnknown_817A0E3, MSGBOX_NPC
PokemonTower_5F_EventScript_Channeler:: @ 8163433
msgbox PokemonTower_5F_Text_RestHereInPurifiedSpace, MSGBOX_NPC
end
PokemonTower_5F_EventScript_16343C:: @ 816343C
PokemonTower_5F_EventScript_PurifiedZone:: @ 816343C
lockall
fadescreen FADE_TO_WHITE
special HealPlayerParty
fadescreen FADE_FROM_WHITE
msgbox gUnknown_817A1FA
msgbox PokemonTower_5F_Text_PurifiedZoneMonsFullyHealed
setvar VAR_TEMP_1, 1
releaseall
end
PokemonTower_5F_EventScript_163453:: @ 8163453
PokemonTower_5F_EventScript_ExitPurifiedZone:: @ 8163453
lockall
setvar VAR_TEMP_1, 0
releaseall
end
PokemonTower_5F_EventScript_16345B:: @ 816345B
trainerbattle_single TRAINER_CHANNELER_TAMMY, Text_17A11F, Text_17A132
msgbox gUnknown_817A138, MSGBOX_AUTOCLOSE
PokemonTower_5F_EventScript_Tammy:: @ 816345B
trainerbattle_single TRAINER_CHANNELER_TAMMY, PokemonTower_5F_Text_TammyIntro, PokemonTower_5F_Text_TammyDefeat
msgbox PokemonTower_5F_Text_TammyPostBattle, MSGBOX_AUTOCLOSE
end
PokemonTower_5F_EventScript_163472:: @ 8163472
trainerbattle_single TRAINER_CHANNELER_RUTH, Text_17A150, Text_17A164
msgbox gUnknown_817A176, MSGBOX_AUTOCLOSE
PokemonTower_5F_EventScript_Ruth:: @ 8163472
trainerbattle_single TRAINER_CHANNELER_RUTH, PokemonTower_5F_Text_RuthIntro, PokemonTower_5F_Text_RuthDefeat
msgbox PokemonTower_5F_Text_RuthPostBattle, MSGBOX_AUTOCLOSE
end
PokemonTower_5F_EventScript_163489:: @ 8163489
trainerbattle_single TRAINER_CHANNELER_KARINA, Text_17A187, Text_17A190
msgbox gUnknown_817A194, MSGBOX_AUTOCLOSE
PokemonTower_5F_EventScript_Karina:: @ 8163489
trainerbattle_single TRAINER_CHANNELER_KARINA, PokemonTower_5F_Text_KarinaIntro, PokemonTower_5F_Text_KarinaDefeat
msgbox PokemonTower_5F_Text_KarinaPostBattle, MSGBOX_AUTOCLOSE
end
PokemonTower_5F_EventScript_1634A0:: @ 81634A0
trainerbattle_single TRAINER_CHANNELER_JANAE, Text_17A1AA, Text_17A1B7
msgbox gUnknown_817A1BD, MSGBOX_AUTOCLOSE
PokemonTower_5F_EventScript_Janae:: @ 81634A0
trainerbattle_single TRAINER_CHANNELER_JANAE, PokemonTower_5F_Text_JanaeIntro, PokemonTower_5F_Text_JanaeDefeat
msgbox PokemonTower_5F_Text_JanaePostBattle, MSGBOX_AUTOCLOSE
end
data/maps/PokemonTower_5F/text.inc
+14 -14
View File
@@ -1,49 +1,49 @@
gUnknown_817A0E3:: @ 817A0E3
PokemonTower_5F_Text_RestHereInPurifiedSpace:: @ 817A0E3
.string "Come, child!\n"
.string "I have purified this space.\l"
.string "You can rest here.$"
Text_17A11F:: @ 817A11F
PokemonTower_5F_Text_TammyIntro:: @ 817A11F
.string "Give…me…\n"
.string "your…all…$"
Text_17A132:: @ 817A132
PokemonTower_5F_Text_TammyDefeat:: @ 817A132
.string "Gasp!$"
gUnknown_817A138:: @ 817A138
PokemonTower_5F_Text_TammyPostBattle:: @ 817A138
.string "I was under possession.$"
Text_17A150:: @ 817A150
PokemonTower_5F_Text_RuthIntro:: @ 817A150
.string "You…shall…\n"
.string "join…us…$"
Text_17A164:: @ 817A164
PokemonTower_5F_Text_RuthDefeat:: @ 817A164
.string "What a nightmare!$"
gUnknown_817A176:: @ 817A176
PokemonTower_5F_Text_RuthPostBattle:: @ 817A176
.string "I was possessed.$"
Text_17A187:: @ 817A187
PokemonTower_5F_Text_KarinaIntro:: @ 817A187
.string "Zombies!$"
Text_17A190:: @ 817A190
PokemonTower_5F_Text_KarinaDefeat:: @ 817A190
.string "Ha?$"
gUnknown_817A194:: @ 817A194
PokemonTower_5F_Text_KarinaPostBattle:: @ 817A194
.string "I regained my senses.$"
Text_17A1AA:: @ 817A1AA
PokemonTower_5F_Text_JanaeIntro:: @ 817A1AA
.string "Urgah…\n"
.string "Urff…$"
Text_17A1B7:: @ 817A1B7
PokemonTower_5F_Text_JanaeDefeat:: @ 817A1B7
.string "Whoo!$"
gUnknown_817A1BD:: @ 817A1BD
PokemonTower_5F_Text_JanaePostBattle:: @ 817A1BD
.string "I fell to evil spirits despite my\n"
.string "training in the mountains…$"
gUnknown_817A1FA:: @ 817A1FA
PokemonTower_5F_Text_PurifiedZoneMonsFullyHealed:: @ 817A1FA
.string "Entered the purified and protected\n"
.string "zone.\p"
.string "{PLAYER}'s POKéMON were fully\n"
data/maps/PokemonTower_6F/map.json
+5 -5
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "PokemonTower_6F_EventScript_163514",
"script": "PokemonTower_6F_EventScript_Angelica",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "PokemonTower_6F_EventScript_163542",
"script": "PokemonTower_6F_EventScript_Jennifer",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "PokemonTower_6F_EventScript_16352B",
"script": "PokemonTower_6F_EventScript_Emilia",
"flag": "0"
},
{
@@ -103,7 +103,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_POKEMON_TOWER_6F",
"var_value": 0,
"script": "PokemonTower_6F_EventScript_1634B8"
"script": "PokemonTower_6F_EventScript_MarowakGhost"
},
{
"type": "trigger",
@@ -112,7 +112,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_POKEMON_TOWER_6F",
"var_value": 0,
"script": "PokemonTower_6F_EventScript_1634B8"
"script": "PokemonTower_6F_EventScript_MarowakGhost"
}
],
"bg_events": []
data/maps/PokemonTower_6F/scripts.inc
+18 -18
View File
@@ -1,49 +1,49 @@
PokemonTower_6F_MapScripts:: @ 81634B7
.byte 0
PokemonTower_6F_EventScript_1634B8:: @ 81634B8
PokemonTower_6F_EventScript_MarowakGhost:: @ 81634B8
lockall
textcolor 2
msgbox gUnknown_817A2F8
msgbox PokemonTower_6F_Text_BeGoneIntruders
goto_if_questlog EventScript_ReleaseEnd
setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE
special ScrSpecial_StartMarowakBattle
waitstate
special sub_8112364
compare VAR_RESULT, 0
goto_if_eq EventScript_1634F5
applymovement OBJ_EVENT_ID_PLAYER, Movement_163512
compare VAR_RESULT, FALSE @ Set by CB2_EndMarowakBattle
goto_if_eq PokemonTower_6F_EventScript_DefeatedMarowakGhost
applymovement OBJ_EVENT_ID_PLAYER, PokemonTower_6F_Movement_ForcePlayerUp
waitmovement 0
releaseall
end
EventScript_1634F5:: @ 81634F5
message Text_17A30C
PokemonTower_6F_EventScript_DefeatedMarowakGhost:: @ 81634F5
message PokemonTower_6F_Text_GhostWasCubonesMother
waitmessage
waitse
playmoncry SPECIES_MAROWAK, 0
waitbuttonpress
waitmoncry
msgbox gUnknown_817A342
msgbox PokemonTower_6F_Text_MothersSpiritWasCalmed
setvar VAR_MAP_SCENE_POKEMON_TOWER_6F, 1
releaseall
end
Movement_163512:: @ 8163512
PokemonTower_6F_Movement_ForcePlayerUp:: @ 8163512
walk_up
step_end
PokemonTower_6F_EventScript_163514:: @ 8163514
trainerbattle_single TRAINER_CHANNELER_ANGELICA, Text_17A243, Text_17A253
msgbox gUnknown_817A25A, MSGBOX_AUTOCLOSE
PokemonTower_6F_EventScript_Angelica:: @ 8163514
trainerbattle_single TRAINER_CHANNELER_ANGELICA, PokemonTower_6F_Text_AngelicaIntro, PokemonTower_6F_Text_AngelicaDefeat
msgbox PokemonTower_6F_Text_AngelicaPostBattle, MSGBOX_AUTOCLOSE
end
PokemonTower_6F_EventScript_16352B:: @ 816352B
trainerbattle_single TRAINER_CHANNELER_EMILIA, Text_17A272, Text_17A27F
msgbox gUnknown_817A293, MSGBOX_AUTOCLOSE
PokemonTower_6F_EventScript_Emilia:: @ 816352B
trainerbattle_single TRAINER_CHANNELER_EMILIA, PokemonTower_6F_Text_EmiliaIntro, PokemonTower_6F_Text_EmiliaDefeat
msgbox PokemonTower_6F_Text_EmiliaPostBattle, MSGBOX_AUTOCLOSE
end
PokemonTower_6F_EventScript_163542:: @ 8163542
trainerbattle_single TRAINER_CHANNELER_JENNIFER, Text_17A2C8, Text_17A2DC
msgbox gUnknown_817A2E2, MSGBOX_AUTOCLOSE
PokemonTower_6F_EventScript_Jennifer:: @ 8163542
trainerbattle_single TRAINER_CHANNELER_JENNIFER, PokemonTower_6F_Text_JenniferIntro, PokemonTower_6F_Text_JenniferDefeat
msgbox PokemonTower_6F_Text_JenniferPostBattle, MSGBOX_AUTOCLOSE
end
data/maps/PokemonTower_6F/text.inc
+12 -12
View File
@@ -1,43 +1,43 @@
Text_17A243:: @ 817A243
PokemonTower_6F_Text_AngelicaIntro:: @ 817A243
.string "Give…me…\n"
.string "blood…$"
Text_17A253:: @ 817A253
PokemonTower_6F_Text_AngelicaDefeat:: @ 817A253
.string "Groan!$"
gUnknown_817A25A:: @ 817A25A
PokemonTower_6F_Text_AngelicaPostBattle:: @ 817A25A
.string "I feel anemic and weak…$"
Text_17A272:: @ 817A272
PokemonTower_6F_Text_EmiliaIntro:: @ 817A272
.string "Urff…\n"
.string "Kwaah!$"
Text_17A27F:: @ 817A27F
PokemonTower_6F_Text_EmiliaDefeat:: @ 817A27F
.string "Something fell out!$"
gUnknown_817A293:: @ 817A293
PokemonTower_6F_Text_EmiliaPostBattle:: @ 817A293
.string "My hair didn't fall out!\n"
.string "It was a malevolent spirit!$"
Text_17A2C8:: @ 817A2C8
PokemonTower_6F_Text_JenniferIntro:: @ 817A2C8
.string "Ke…ke…ke…\n"
.string "ke…ke…ke!$"
Text_17A2DC:: @ 817A2DC
PokemonTower_6F_Text_JenniferDefeat:: @ 817A2DC
.string "Keee!$"
gUnknown_817A2E2:: @ 817A2E2
PokemonTower_6F_Text_JenniferPostBattle:: @ 817A2E2
.string "What's going on here?$"
gUnknown_817A2F8:: @ 817A2F8
PokemonTower_6F_Text_BeGoneIntruders:: @ 817A2F8
.string "Be gone…\n"
.string "Intruders…$"
Text_17A30C:: @ 817A30C
PokemonTower_6F_Text_GhostWasCubonesMother:: @ 817A30C
.string "The ghost was the restless spirit\n"
.string "of CUBONE's mother!$"
gUnknown_817A342:: @ 817A342
PokemonTower_6F_Text_MothersSpiritWasCalmed:: @ 817A342
.string "The mother's spirit was calmed.\p"
.string "It departed to the afterlife…$"
data/maps/PokemonTower_7F/map.json
+4 -4
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonTower_7F_EventScript_16355A",
"script": "PokemonTower_7F_EventScript_MrFuji",
"flag": "FLAG_HIDE_TOWER_FUJI"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
"script": "PokemonTower_7F_EventScript_163586",
"script": "PokemonTower_7F_EventScript_Grunt1",
"flag": "FLAG_HIDE_TOWER_ROCKET_1"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
"script": "PokemonTower_7F_EventScript_16363D",
"script": "PokemonTower_7F_EventScript_Grunt2",
"flag": "FLAG_HIDE_TOWER_ROCKET_2"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
"script": "PokemonTower_7F_EventScript_1636D6",
"script": "PokemonTower_7F_EventScript_Grunt3",
"flag": "FLAG_HIDE_TOWER_ROCKET_3"
}
],
data/maps/PokemonTower_7F/scripts.inc
+65 -65
View File
@@ -1,66 +1,66 @@
PokemonTower_7F_MapScripts:: @ 8163559
.byte 0
PokemonTower_7F_EventScript_16355A:: @ 816355A
PokemonTower_7F_EventScript_MrFuji:: @ 816355A
lock
faceplayer
famechecker FAMECHECKER_MRFUJI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
setflag FLAG_HIDE_TOWER_FUJI
clearflag FLAG_HIDE_POKEHOUSE_FUJI
setflag FLAG_RESCUED_MR_FUJI
msgbox gUnknown_817A529
msgbox PokemonTower_7F_Text_MrFujiThankYouFollowMe
closemessage
warp MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE, 255, 4, 7
waitstate
release
end
PokemonTower_7F_EventScript_163586:: @ 8163586
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_19, Text_17A380, Text_17A3A4, EventScript_1635A1
msgbox gUnknown_817A3AF, MSGBOX_AUTOCLOSE
PokemonTower_7F_EventScript_Grunt1:: @ 8163586
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_19, PokemonTower_7F_Text_Grunt1Intro, PokemonTower_7F_Text_Grunt1Defeat, PokemonTower_7F_EventScript_DefeatedGrunt1
msgbox PokemonTower_7F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
end
EventScript_1635A1:: @ 81635A1
msgbox gUnknown_817A3AF
PokemonTower_7F_EventScript_DefeatedGrunt1:: @ 81635A1
msgbox PokemonTower_7F_Text_Grunt1PostBattle
closemessage
getplayerxy VAR_0x8004, VAR_0x8005
compare VAR_0x8004, 10
goto_if_eq EventScript_1635E0
goto_if_eq PokemonTower_7F_EventScript_Grunt1ExitMid
compare VAR_0x8004, 11
goto_if_eq EventScript_1635F0
goto_if_eq PokemonTower_7F_EventScript_Grunt1ExitRight
compare VAR_0x8004, 9
goto_if_eq EventScript_163600
applymovement 2, Movement_16362C
goto_if_eq PokemonTower_7F_EventScript_Grunt1ExitLeft
applymovement 2, PokemonTower_7F_Movement_Grunt1Exit
waitmovement 0
goto EventScript_163616
goto PokemonTower_7F_EventScript_RemoveGrunt1
end
EventScript_1635E0:: @ 81635E0
applymovement 2, Movement_16361B
PokemonTower_7F_EventScript_Grunt1ExitMid:: @ 81635E0
applymovement 2, PokemonTower_7F_Movement_Grunt1ExitMid
waitmovement 0
goto EventScript_163616
goto PokemonTower_7F_EventScript_RemoveGrunt1
end
EventScript_1635F0:: @ 81635F0
applymovement 2, Movement_163624
PokemonTower_7F_EventScript_Grunt1ExitRight:: @ 81635F0
applymovement 2, PokemonTower_7F_Movement_Grunt1ExitRight
waitmovement 0
goto EventScript_163616
goto PokemonTower_7F_EventScript_RemoveGrunt1
end
EventScript_163600:: @ 8163600
applymovement 2, Movement_163633
PokemonTower_7F_EventScript_Grunt1ExitLeft:: @ 8163600
applymovement 2, PokemonTower_7F_Movement_Grunt1ExitLeft
waitmovement 0
playse SE_KAIDAN
delay 25
goto EventScript_163616
goto PokemonTower_7F_EventScript_RemoveGrunt1
end
EventScript_163616:: @ 8163616
PokemonTower_7F_EventScript_RemoveGrunt1:: @ 8163616
removeobject 2
release
end
Movement_16361B:: @ 816361B
PokemonTower_7F_Movement_Grunt1ExitMid:: @ 816361B
walk_down
walk_right
walk_down
@@ -71,7 +71,7 @@ Movement_16361B:: @ 816361B
walk_down
step_end
Movement_163624:: @ 8163624
PokemonTower_7F_Movement_Grunt1ExitRight:: @ 8163624
walk_down
walk_down
walk_down
@@ -81,7 +81,7 @@ Movement_163624:: @ 8163624
walk_down
step_end
Movement_16362C:: @ 816362C
PokemonTower_7F_Movement_Grunt1Exit:: @ 816362C
walk_down
walk_down
walk_down
@@ -90,7 +90,7 @@ Movement_16362C:: @ 816362C
walk_down
step_end
Movement_163633:: @ 8163633
PokemonTower_7F_Movement_Grunt1ExitLeft:: @ 8163633
walk_right
walk_down
walk_down
@@ -102,43 +102,43 @@ Movement_163633:: @ 8163633
walk_in_place_fastest_left
step_end
PokemonTower_7F_EventScript_16363D:: @ 816363D
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_20, Text_17A3CD, Text_17A466, EventScript_163658
msgbox gUnknown_817A477, MSGBOX_AUTOCLOSE
PokemonTower_7F_EventScript_Grunt2:: @ 816363D
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_20, PokemonTower_7F_Text_Grunt2Intro, PokemonTower_7F_Text_Grunt2Defeat, PokemonTower_7F_EventScript_DefeatedGrunt2
msgbox PokemonTower_7F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
EventScript_163658:: @ 8163658
PokemonTower_7F_EventScript_DefeatedGrunt2:: @ 8163658
famechecker FAMECHECKER_MRFUJI, 1
msgbox gUnknown_817A477
msgbox PokemonTower_7F_Text_Grunt2PostBattle
closemessage
getplayerxy VAR_0x8004, VAR_0x8005
compare VAR_0x8004, 12
goto_if_eq EventScript_163699
goto_if_eq PokemonTower_7F_EventScript_Grunt2ExitLeft
compare VAR_0x8004, 13
goto_if_eq EventScript_1636A9
applymovement 3, Movement_1636C6
goto_if_eq PokemonTower_7F_EventScript_Grunt2ExitRight
applymovement 3, PokemonTower_7F_Movement_Grunt2Exit
waitmovement 0
goto EventScript_1636B9
goto PokemonTower_7F_EventScript_RemoveGrunt2
end
EventScript_163699:: @ 8163699
applymovement 3, Movement_1636BE
PokemonTower_7F_EventScript_Grunt2ExitLeft:: @ 8163699
applymovement 3, PokemonTower_7F_Movement_Grunt2ExitLeft
waitmovement 0
goto EventScript_1636B9
goto PokemonTower_7F_EventScript_RemoveGrunt2
end
EventScript_1636A9:: @ 81636A9
applymovement 3, Movement_1636CD
PokemonTower_7F_EventScript_Grunt2ExitRight:: @ 81636A9
applymovement 3, PokemonTower_7F_Movement_Grunt2ExitRight
waitmovement 0
goto EventScript_1636B9
goto PokemonTower_7F_EventScript_RemoveGrunt2
end
EventScript_1636B9:: @ 81636B9
PokemonTower_7F_EventScript_RemoveGrunt2:: @ 81636B9
removeobject 3
release
end
Movement_1636BE:: @ 81636BE
PokemonTower_7F_Movement_Grunt2ExitLeft:: @ 81636BE
walk_down
walk_down
walk_down
@@ -148,7 +148,7 @@ Movement_1636BE:: @ 81636BE
walk_down
step_end
Movement_1636C6:: @ 81636C6
PokemonTower_7F_Movement_Grunt2Exit:: @ 81636C6
walk_down
walk_down
walk_down
@@ -157,7 +157,7 @@ Movement_1636C6:: @ 81636C6
walk_down
step_end
Movement_1636CD:: @ 81636CD
PokemonTower_7F_Movement_Grunt2ExitRight:: @ 81636CD
walk_left
walk_down
walk_down
@@ -168,46 +168,46 @@ Movement_1636CD:: @ 81636CD
walk_down
step_end
PokemonTower_7F_EventScript_1636D6:: @ 81636D6
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_21, Text_17A4CF, Text_17A4EE, EventScript_1636F1
msgbox gUnknown_817A506, MSGBOX_AUTOCLOSE
PokemonTower_7F_EventScript_Grunt3:: @ 81636D6
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_21, PokemonTower_7F_Text_Grunt3Intro, PokemonTower_7F_Text_Grunt3Defeat, PokemonTower_7F_EventScript_DefeatedGrunt3
msgbox PokemonTower_7F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
end
EventScript_1636F1:: @ 81636F1
msgbox gUnknown_817A506
PokemonTower_7F_EventScript_DefeatedGrunt3:: @ 81636F1
msgbox PokemonTower_7F_Text_Grunt3PostBattle
closemessage
getplayerxy VAR_0x8004, VAR_0x8005
compare VAR_0x8004, 10
goto_if_eq EventScript_163725
goto_if_eq PokemonTower_7F_EventScript_Grunt3ExitRight
compare VAR_0x8004, 9
goto_if_eq EventScript_163735
applymovement 4, Movement_163754
goto_if_eq PokemonTower_7F_EventScript_Grunt3ExitLeft
applymovement 4, PokemonTower_7F_Movement_Grunt3Exit
waitmovement 0
goto EventScript_163745
goto PokemonTower_7F_EventScript_RemoveGrunt3
end
EventScript_163725:: @ 8163725
applymovement 4, Movement_16374C
PokemonTower_7F_EventScript_Grunt3ExitRight:: @ 8163725
applymovement 4, PokemonTower_7F_Movement_Grunt3ExitRight
waitmovement 0
goto EventScript_163745
goto PokemonTower_7F_EventScript_RemoveGrunt3
end
EventScript_163735:: @ 8163735
applymovement 4, Movement_16375B
PokemonTower_7F_EventScript_Grunt3ExitLeft:: @ 8163735
applymovement 4, PokemonTower_7F_Movement_Grunt3ExitLeft
waitmovement 0
goto EventScript_163745
goto PokemonTower_7F_EventScript_RemoveGrunt3
end
EventScript_163745:: @ 8163745
PokemonTower_7F_EventScript_RemoveGrunt3:: @ 8163745
removeobject 4
release
end
EventScript_16374A:: @ 816374A
PokemonTower_7F_EventScript_Unused:: @ 816374A
release
end
Movement_16374C:: @ 816374C
PokemonTower_7F_Movement_Grunt3ExitRight:: @ 816374C
walk_down
walk_down
walk_down
@@ -217,7 +217,7 @@ Movement_16374C:: @ 816374C
walk_down
step_end
Movement_163754:: @ 8163754
PokemonTower_7F_Movement_Grunt3Exit:: @ 8163754
walk_down
walk_down
walk_down
@@ -226,7 +226,7 @@ Movement_163754:: @ 8163754
walk_down
step_end
Movement_16375B:: @ 816375B
PokemonTower_7F_Movement_Grunt3ExitLeft:: @ 816375B
walk_right
walk_down
walk_down
data/maps/PokemonTower_7F/text.inc
+10 -10
View File
@@ -1,14 +1,14 @@
Text_17A380:: @ 817A380
PokemonTower_7F_Text_Grunt1Intro:: @ 817A380
.string "What do you want?\n"
.string "Why are you here?$"
Text_17A3A4:: @ 817A3A4
PokemonTower_7F_Text_Grunt1Defeat:: @ 817A3A4
.string "I give up!$"
gUnknown_817A3AF:: @ 817A3AF
PokemonTower_7F_Text_Grunt1PostBattle:: @ 817A3AF
.string "I'm not going to forget this!$"
Text_17A3CD:: @ 817A3CD
PokemonTower_7F_Text_Grunt2Intro:: @ 817A3CD
.string "This old guy marched right up to\n"
.string "our HIDEOUT.\p"
.string "Then, he starts ranting about how\n"
@@ -16,25 +16,25 @@ Text_17A3CD:: @ 817A3CD
.string "So, we're just talking it over as\n"
.string "adults.$"
Text_17A466:: @ 817A466
PokemonTower_7F_Text_Grunt2Defeat:: @ 817A466
.string "Please!\n"
.string "No more!$"
gUnknown_817A477:: @ 817A477
PokemonTower_7F_Text_Grunt2PostBattle:: @ 817A477
.string "POKéMON are only good for making\n"
.string "money. Why not use them?\p"
.string "You stay out of our business!$"
Text_17A4CF:: @ 817A4CF
PokemonTower_7F_Text_Grunt3Intro:: @ 817A4CF
.string "You're not saving anyone, kid!$"
Text_17A4EE:: @ 817A4EE
PokemonTower_7F_Text_Grunt3Defeat:: @ 817A4EE
.string "Don't fight us ROCKETS!$"
gUnknown_817A506:: @ 817A506
PokemonTower_7F_Text_Grunt3PostBattle:: @ 817A506
.string "You're not getting away with this!$"
gUnknown_817A529:: @ 817A529
PokemonTower_7F_Text_MrFujiThankYouFollowMe:: @ 817A529
.string "MR. FUJI: Heh?\n"
.string "You came to save me?\p"
.string "Thank you. But, I came here of my\n"
data/maps/SaffronCity_Dojo/scripts.inc
+1 -1
View File
@@ -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
data/maps/SilphCo_7F/scripts.inc
+1 -1
View File
@@ -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
data/scripts/fame_checker.inc
+2 -2
View File
@@ -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
data/specials.inc
+3 -3
View File
@@ -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
data/strings.s
+1 -1
View File
@@ -3535,7 +3535,7 @@ gUnknown_841D13C:: @ 841D13C
.string "{STR_VAR_1} PLAYERS$"
.align 2
gUnknown_841D148:: @ 841D148
gText_Ghost:: @ 841D148
.string "GHOST$"
gUnknown_841D14E:: @ 841D14E
include/strings.h
+1 -1
View File
@@ -185,7 +185,7 @@ extern const u8 gUnknown_84166A7[];
extern const u8 gText_WontHaveEffect[];
extern const u8 gUnknown_841623D[];
extern const u8 gUnknown_84162BD[];
extern const u8 gUnknown_841D148[];
extern const u8 gText_Ghost[];
// pokemon
extern const u8 gBattleText_Rose[];
src/battle_setup.c
+5 -4
View File
@@ -276,7 +276,7 @@ static void DoGhostBattle(void)
gMain.savedCallback = CB2_EndWildBattle;
gBattleTypeFlags = BATTLE_TYPE_GHOST;
CreateBattleStartTask(GetWildBattleTransition(), 0);
SetMonData(&gEnemyParty[0], MON_DATA_NICKNAME, gUnknown_841D148);
SetMonData(&gEnemyParty[0], MON_DATA_NICKNAME, gText_Ghost);
IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
IncrementGameStat(GAME_STAT_WILD_BATTLES);
}
@@ -321,7 +321,7 @@ void ScrSpecial_StartMarowakBattle(void)
gBattleTypeFlags = BATTLE_TYPE_GHOST;
}
CreateBattleStartTask(GetWildBattleTransition(), 0);
SetMonData(&gEnemyParty[0], MON_DATA_NICKNAME, gUnknown_841D148);
SetMonData(&gEnemyParty[0], MON_DATA_NICKNAME, gText_Ghost);
IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
IncrementGameStat(GAME_STAT_WILD_BATTLES);
}
@@ -444,10 +444,11 @@ static void CB2_EndMarowakBattle(void)
}
else
{
// If result is TRUE player didnt defeat Marowak, force player back from stairs
if (gBattleOutcome == B_OUTCOME_WON)
gSpecialVar_Result = 0;
gSpecialVar_Result = FALSE;
else
gSpecialVar_Result = 1;
gSpecialVar_Result = TRUE;
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
}
}
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);
}
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;
src/pokemon.c
+1 -1
View File
@@ -6059,7 +6059,7 @@ bool8 CheckBattleTypeGhost(struct Pokemon *mon, u8 battlerId)
{
GetMonData(mon, MON_DATA_NICKNAME, buffer);
StringGetEnd10(buffer);
if (!StringCompare(buffer, gUnknown_841D148))
if (!StringCompare(buffer, gText_Ghost))
return TRUE;
}
return FALSE;