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

Merge branch 'master' into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-17 15:41:50 -04:00
committed by GitHub
parent 2b93687ade 56f8b1a47c
commit ab56ac41a1
322 changed files with 12564 additions and 12748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
+8 -13
View File
@@ -11,13 +11,10 @@ CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall::
lock
faceplayer
setvar VAR_TEMP_1, SPECIES_EEVEE
givemon SPECIES_EEVEE, 25, ITEM_NONE
compare VAR_RESULT, 0
goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveeParty
compare VAR_RESULT, 1
goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveePC
compare VAR_RESULT, 2
goto_if_eq EventScript_NoMoreRoomForPokemon
givemon SPECIES_EEVEE, 25
goto_if_eq VAR_RESULT, 0, CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveeParty
goto_if_eq VAR_RESULT, 1, CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveePC
goto_if_eq VAR_RESULT, 2, EventScript_NoMoreRoomForPokemon
release
end
@@ -27,10 +24,9 @@ CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveeParty::
message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee
waitmessage
waitfanfare
getspeciesname 0, SPECIES_EEVEE
bufferspeciesname STR_VAR_1, SPECIES_EEVEE
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee
goto_if_eq VAR_RESULT, NO, CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee
call EventScript_GetGiftMonPartySlot
call EventScript_ChangePokemonNickname
goto CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee
@@ -42,10 +38,9 @@ CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveePC::
message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee
waitmessage
waitfanfare
getspeciesname 0, SPECIES_EEVEE
bufferspeciesname STR_VAR_1, SPECIES_EEVEE
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC
goto_if_eq VAR_RESULT, NO, CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC
call EventScript_NameReceivedBoxMon
goto CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC
end