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

Merge branch 'master' into movement-action

Browse Source
This commit is contained in:
cbt6
2022-08-15 12:54:47 +08:00
committed by GitHub
parent 7233b2ed0a b3c2c7291f
commit 2644dd9c21
286 changed files with 8970 additions and 9432 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+10 -14
View File
@@ -37,9 +37,9 @@ TwoIsland_JoyfulGameCorner_OnFrame::
TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene::
lockall
textcolor 0
textcolor NPC_TEXT_COLOR_MALE
msgbox TwoIsland_JoyfulGameCorner_Text_YouRescuedLostelle
textcolor 1
textcolor NPC_TEXT_COLOR_FEMALE
special BufferBigGuyOrBigGirlString
msgbox TwoIsland_JoyfulGameCorner_Text_LostelleItsOkayDaddy
closemessage
@@ -51,7 +51,7 @@ TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene::
TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene::
lockall
textcolor 0
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_DADDY, Movement_171520
waitmovement 0
msgbox TwoIsland_JoyfulGameCorner_Text_WhereHasLostelleGottenTo
@@ -128,8 +128,7 @@ TwoIsland_JoyfulGameCorner_Movement_BikerLookAround::
TwoIsland_JoyfulGameCorner_EventScript_InfoMan::
lock
faceplayer
compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4
goto_if_eq JoyfulGameCorner_EventScript_InfoMan2
goto_if_eq VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4, JoyfulGameCorner_EventScript_InfoMan2
goto_if_set FLAG_RESCUED_LOSTELLE, TwoIsland_JoyfulGameCorner_EventScript_GetGamesGoingSoon
msgbox TwoIsland_JoyfulGameCorner_Text_NotRunningAnyGamesToday
release
@@ -144,11 +143,9 @@ TwoIsland_JoyfulGameCorner_EventScript_GetGamesGoingSoon::
TwoIsland_JoyfulGameCorner_EventScript_LostellesDaddy::
lock
faceplayer
compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4
goto_if_eq JoyfulGameCorner_EventScript_MinigameAttendant
goto_if_eq VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4, JoyfulGameCorner_EventScript_MinigameAttendant
goto_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, TwoIsland_JoyfulGameCorner_EventScript_GetGameCornerRunning
compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3
goto_if_eq TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite
goto_if_eq VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3, TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite
msgbox TwoIsland_JoyfulGameCorner_Text_PleaseGoToThreeIsland
release
end
@@ -157,21 +154,20 @@ TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite::
goto_if_set FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE, TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone
msgbox TwoIsland_JoyfulGameCorner_Text_ThisIsForMe
setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2
textcolor 3
textcolor NPC_TEXT_COLOR_NEUTRAL
playfanfare MUS_OBTAIN_TMHM
message TwoIsland_JoyfulGameCorner_Text_HandedMeteoriteToLostellesDaddy
waitmessage
waitfanfare
call EventScript_RestorePrevTextColor
removeitem ITEM_METEORITE, 1
removeitem ITEM_METEORITE
msgbox TwoIsland_JoyfulGameCorner_Text_OhThisIsFromBill
goto TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone
end
TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone::
checkitemspace ITEM_MOON_STONE, 1
compare VAR_RESULT, FALSE
goto_if_eq TwoIsland_JoyfulGameCorner_EventScript_NoRoomForMoonStone
checkitemspace ITEM_MOON_STONE
goto_if_eq VAR_RESULT, FALSE, TwoIsland_JoyfulGameCorner_EventScript_NoRoomForMoonStone
additem ITEM_MOON_STONE
setflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER
msgreceiveditem TwoIsland_JoyfulGameCorner_Text_ReceivedMoonStoneFromLostellesDaddy, ITEM_MOON_STONE