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/FiveIsland_MemorialPillar/scripts.inc
+7 -11
View File
@@ -27,8 +27,7 @@ FiveIsland_MemorialPillar_EventScript_AlreadyGotTM42::
FiveIsland_MemorialPillar_EventScript_ReturnedForTM42::
msgbox FiveIsland_MemorialPillar_Text_StillHaveThingAsMyThanks
giveitem ITEM_TM42
compare VAR_RESULT, FALSE
goto_if_eq FiveIsland_MemorialPillar_EventScript_NoRoomForTM42
goto_if_eq VAR_RESULT, FALSE, FiveIsland_MemorialPillar_EventScript_NoRoomForTM42
call FiveIsland_MemorialPillar_EventScript_ReceivedTM42
release
end
@@ -40,21 +39,19 @@ FiveIsland_MemorialPillar_EventScript_Memorial::
goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced
goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced
msgbox FiveIsland_MemorialPillar_Text_HereLiesTectonixLemonadeOffering
checkitem ITEM_LEMONADE, 1
compare VAR_RESULT, TRUE
goto_if_eq FiveIsland_MemorialPillar_EventScript_AskPlaceLemonade
checkitem ITEM_LEMONADE
goto_if_eq VAR_RESULT, TRUE, FiveIsland_MemorialPillar_EventScript_AskPlaceLemonade
releaseall
end
FiveIsland_MemorialPillar_EventScript_AskPlaceLemonade::
msgbox FiveIsland_MemorialPillar_Text_LeaveAnotherLemonadeOffering, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq FiveIsland_MemorialPillar_EventScript_PlaceLemonade
goto_if_eq VAR_RESULT, YES, FiveIsland_MemorialPillar_EventScript_PlaceLemonade
releaseall
end
FiveIsland_MemorialPillar_EventScript_PlaceLemonade::
removeitem ITEM_LEMONADE, 1
removeitem ITEM_LEMONADE
msgbox FiveIsland_MemorialPillar_Text_PlacedCanOfLemonade
closemessage
applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFasterRight
@@ -62,11 +59,10 @@ FiveIsland_MemorialPillar_EventScript_PlaceLemonade::
delay 45
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
waitmovement 0
textcolor 0
textcolor NPC_TEXT_COLOR_MALE
msgbox FiveIsland_MemorialPillar_Text_ThankYouPleaseTakeThis
giveitem ITEM_TM42
compare VAR_RESULT, FALSE
goto_if_eq FiveIsland_MemorialPillar_EventScript_NoRoomForTM42
goto_if_eq VAR_RESULT, FALSE, FiveIsland_MemorialPillar_EventScript_NoRoomForTM42
call FiveIsland_MemorialPillar_EventScript_ReceivedTM42
releaseall
end