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

Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
parent 23d7c00c62 d6d5290099
commit 2b93687ade
1146 changed files with 40526 additions and 38156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
+10 -10
View File
@@ -1,23 +1,23 @@
.set LOCALID_DOOR_GUARD, 4
IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A
IndigoPlateau_PokemonCenter_1F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
IndigoPlateau_PokemonCenter_1F_OnTransition:: @ 816EA65
IndigoPlateau_PokemonCenter_1F_OnTransition::
setrespawn SPAWN_INDIGO_PLATEAU
specialvar VAR_RESULT, IsNationalPokedexEnabled
compare VAR_RESULT, TRUE
call_if_eq IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor
end
IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor:: @ 816EA79
IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor::
goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_Return
setobjectxyperm LOCALID_DOOR_GUARD, 4, 2
return
IndigoPlateau_PokemonCenter_1F_EventScript_DoorGuard:: @ 816EA8A
IndigoPlateau_PokemonCenter_1F_EventScript_DoorGuard::
lock
faceplayer
specialvar VAR_RESULT, IsNationalPokedexEnabled
@@ -27,22 +27,22 @@ IndigoPlateau_PokemonCenter_1F_EventScript_DoorGuard:: @ 816EA8A
release
end
IndigoPlateau_PokemonCenter_1F_EventScript_CheckSeviiIslandComplete:: @ 816EAA6
IndigoPlateau_PokemonCenter_1F_EventScript_CheckSeviiIslandComplete::
goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, IndigoPlateau_PokemonCenter_1F_EventScript_SeviiIslandComplete
msgbox IndigoPlateau_PokemonCenter_1F_Text_LoreleiIsAbsentClosedForTimeBeing
release
end
IndigoPlateau_PokemonCenter_1F_EventScript_SeviiIslandComplete:: @ 816EAB9
IndigoPlateau_PokemonCenter_1F_EventScript_SeviiIslandComplete::
msgbox IndigoPlateau_PokemonCenter_1F_Text_FaceEliteFourGoodLuck
release
end
IndigoPlateau_PokemonCenter_1F_EventScript_GymGuy:: @ 816EAC3
IndigoPlateau_PokemonCenter_1F_EventScript_GymGuy::
msgbox IndigoPlateau_PokemonCenter_1F_Text_GymGuyAdvice, MSGBOX_NPC
end
IndigoPlateau_PokemonCenter_1F_EventScript_Clerk:: @ 816EACC
IndigoPlateau_PokemonCenter_1F_EventScript_Clerk::
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
@@ -54,7 +54,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_Clerk:: @ 816EACC
end
.align 2
IndigoPlateau_PokemonCenter_1F_Items:: @ 816EAF4
IndigoPlateau_PokemonCenter_1F_Items::
.2byte ITEM_ULTRA_BALL
.2byte ITEM_GREAT_BALL
.2byte ITEM_FULL_RESTORE
@@ -66,7 +66,7 @@ IndigoPlateau_PokemonCenter_1F_Items:: @ 816EAF4
release
end
IndigoPlateau_PokemonCenter_1F_EventScript_Nurse:: @ 816EB06
IndigoPlateau_PokemonCenter_1F_EventScript_Nurse::
lock
faceplayer
call EventScript_PkmnCenterNurse
data/maps/IndigoPlateau_PokemonCenter_1F/text.inc
+5 -5
View File
@@ -1,4 +1,4 @@
IndigoPlateau_PokemonCenter_1F_Text_GymGuyAdvice:: @ 819A837
IndigoPlateau_PokemonCenter_1F_Text_GymGuyAdvice::
.string "Yo!\n"
.string "Champ in the making!\p"
.string "At the POKéMON LEAGUE, you will\n"
@@ -8,13 +8,13 @@ IndigoPlateau_PokemonCenter_1F_Text_GymGuyAdvice:: @ 819A837
.string "This is it!\n"
.string "Go for it!$"
IndigoPlateau_PokemonCenter_1F_Text_FaceEliteFourGoodLuck:: @ 819A8D8
IndigoPlateau_PokemonCenter_1F_Text_FaceEliteFourGoodLuck::
.string "From here on, you face the\n"
.string "ELITE FOUR one by one.\p"
.string "If you win, a door opens to the\n"
.string "next TRAINER. Good luck!$"
IndigoPlateau_PokemonCenter_1F_Text_LoreleiIsAbsentClosedForTimeBeing:: @ 819A943
IndigoPlateau_PokemonCenter_1F_Text_LoreleiIsAbsentClosedForTimeBeing::
.string "I am so sorry, but you've wasted\n"
.string "your time coming here.\p"
.string "LORELEI of the ELITE FOUR is\n"
@@ -22,7 +22,7 @@ IndigoPlateau_PokemonCenter_1F_Text_LoreleiIsAbsentClosedForTimeBeing:: @ 819A94
.string "As a result, the POKéMON LEAGUE is\n"
.string "closed for the time being.$"
IndigoPlateau_PokemonCenter_1F_Text_AgathaWhuppedUs:: @ 819A9E7
IndigoPlateau_PokemonCenter_1F_Text_AgathaWhuppedUs::
.string "AGATHA's GHOST-type POKéMON are\n"
.string "horrifically terrifying in toughness.\p"
.string "I took my FIGHTING-type POKéMON\n"
@@ -34,7 +34,7 @@ IndigoPlateau_PokemonCenter_1F_Text_AgathaWhuppedUs:: @ 819A9E7
.string "It doesn't take anything to get\n"
.string "that scary lady hollering.$"
IndigoPlateau_PokemonCenter_1F_Text_LancesCousinGymLeaderFarAway:: @ 819AB16
IndigoPlateau_PokemonCenter_1F_Text_LancesCousinGymLeaderFarAway::
.string "Maybe becoming an ELITE FOUR\n"
.string "member is in the blood.\p"
.string "From what I've heard, LANCE has\n"