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/FiveIsland_WaterLabyrinth/scripts.inc
+7 -11
View File
@@ -10,8 +10,7 @@ FiveIsland_WaterLabyrinth_EventScript_EggGentleman::
goto_if_set FLAG_NO_ROOM_FOR_TOGEPI_EGG, FiveIsland_WaterLabyrinth_EventScript_ReturnForEgg
msgbox FiveIsland_WaterLabyrinth_Text_LetMeTakeLookAtMons
specialvar VAR_RESULT, GetLeadMonFriendship
compare VAR_RESULT, 6 @ Max friendship
goto_if_eq FiveIsland_WaterLabyrinth_EventScript_LeadMonMaxFriendship
goto_if_eq VAR_RESULT, 6, FiveIsland_WaterLabyrinth_EventScript_LeadMonMaxFriendship
msgbox FiveIsland_WaterLabyrinth_Text_HmmISeeIsee
release
end
@@ -29,11 +28,10 @@ FiveIsland_WaterLabyrinth_EventScript_LeadMonMaxFriendship::
FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg::
getpartysize
compare VAR_RESULT, PARTY_SIZE
goto_if_eq FiveIsland_WaterLabyrinth_EventScript_NoRoomForEgg
goto_if_eq VAR_RESULT, PARTY_SIZE, FiveIsland_WaterLabyrinth_EventScript_NoRoomForEgg
setflag FLAG_GOT_TOGEPI_EGG
giveegg SPECIES_TOGEPI
textcolor 3
textcolor NPC_TEXT_COLOR_NEUTRAL
playfanfare MUS_LEVEL_UP
message FiveIsland_WaterLabyrinth_Text_ReceivedEggFromMan
waitfanfare
@@ -45,16 +43,14 @@ FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg::
@ If the player has a Togepi/Togetic from this game (assumed to be the one the man gave you) then comment on it
@ Otherwise make normal comment
FiveIsland_WaterLabyrinth_EventScript_PostEggComment::
getspeciesname 1, SPECIES_TOGEPI
bufferspeciesname STR_VAR_2, SPECIES_TOGEPI
setvar VAR_0x8004, SPECIES_TOGEPI
specialvar VAR_RESULT, PlayerPartyContainsSpeciesWithPlayerID
compare VAR_RESULT, TRUE
goto_if_eq FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment
getspeciesname 1, SPECIES_TOGETIC
goto_if_eq VAR_RESULT, TRUE, FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment
bufferspeciesname STR_VAR_2, SPECIES_TOGETIC
setvar VAR_0x8004, SPECIES_TOGETIC
specialvar VAR_RESULT, PlayerPartyContainsSpeciesWithPlayerID
compare VAR_RESULT, TRUE
goto_if_eq FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment
goto_if_eq VAR_RESULT, TRUE, FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment
msgbox FiveIsland_WaterLabyrinth_Text_GladIMetSomeoneLikeYou
release
end