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/PewterCity_Museum_1F/scripts.inc
+23 -34
View File
@@ -7,22 +7,17 @@ PewterCity_Museum_1F_MapScripts::
PewterCity_Museum_1F_EventScript_Scientist1::
lock
faceplayer
compare VAR_FACING, DIR_WEST
goto_if_eq PewterCity_Museum_1F_EventScript_Scientist1BehindCounter
compare VAR_FACING, DIR_SOUTH
goto_if_eq PewterCity_Museum_1F_EventScript_Scientist1BehindCounter
compare VAR_FACING, DIR_NORTH
goto_if_eq PewterCity_Museum_1F_EventScript_Scientist1BehindCounter
goto_if_eq VAR_FACING, DIR_WEST, PewterCity_Museum_1F_EventScript_Scientist1BehindCounter
goto_if_eq VAR_FACING, DIR_SOUTH, PewterCity_Museum_1F_EventScript_Scientist1BehindCounter
goto_if_eq VAR_FACING, DIR_NORTH, PewterCity_Museum_1F_EventScript_Scientist1BehindCounter
msgbox PewterCity_Museum_1F_Text_PleaseEnjoyYourself
release
end
PewterCity_Museum_1F_EventScript_Scientist1BehindCounter::
msgbox PewterCity_Museum_1F_Text_DoYouKnowWhatAmberIs, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq PewterCity_Museum_1F_EventScript_AmberHasGeneticMatter
compare VAR_RESULT, NO
goto_if_eq PewterCity_Museum_1F_EventScript_ExplainAmber
goto_if_eq VAR_RESULT, YES, PewterCity_Museum_1F_EventScript_AmberHasGeneticMatter
goto_if_eq VAR_RESULT, NO, PewterCity_Museum_1F_EventScript_ExplainAmber
end
PewterCity_Museum_1F_EventScript_AmberHasGeneticMatter::
@@ -42,7 +37,7 @@ PewterCity_Museum_1F_EventScript_ExplainAmber::
PewterCity_Museum_1F_EventScript_EntranceTriggerLeft::
lockall
setvar VAR_TEMP_1, 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
goto PewterCity_Museum_1F_EventScript_EntranceTrigger
end
@@ -50,7 +45,7 @@ PewterCity_Museum_1F_EventScript_EntranceTriggerLeft::
PewterCity_Museum_1F_EventScript_EntranceTriggerMid::
lockall
setvar VAR_TEMP_1, 1
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
goto PewterCity_Museum_1F_EventScript_EntranceTrigger
end
@@ -58,43 +53,38 @@ PewterCity_Museum_1F_EventScript_EntranceTriggerMid::
PewterCity_Museum_1F_EventScript_EntranceTriggerRight::
lockall
setvar VAR_TEMP_1, 2
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
goto PewterCity_Museum_1F_EventScript_EntranceTrigger
end
PewterCity_Museum_1F_EventScript_EntranceTrigger::
textcolor 0
showmoneybox 0, 0, 0
textcolor NPC_TEXT_COLOR_MALE
showmoneybox 0, 0
msgbox PewterCity_Museum_1F_Text_Its50YForChildsTicket, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq PewterCity_Museum_1F_EventScript_TryPayForTicket
goto_if_eq VAR_RESULT, YES, PewterCity_Museum_1F_EventScript_TryPayForTicket
msgbox PewterCity_Museum_1F_Text_ComeAgain
closemessage
hidemoneybox 0, 0
hidemoneybox
applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ForcePlayerExit
waitmovement 0
releaseall
end
PewterCity_Museum_1F_EventScript_TryPayForTicket::
checkmoney 50, 0
compare VAR_RESULT, FALSE
goto_if_eq PewterCity_Museum_1F_EventScript_NotEnoughMoney
checkmoney 50
goto_if_eq VAR_RESULT, FALSE, PewterCity_Museum_1F_EventScript_NotEnoughMoney
closemessage
compare VAR_TEMP_1, 0
call_if_eq PewterCity_Museum_1F_EventScript_PlayerApproachCounterLeft
compare VAR_TEMP_1, 1
call_if_eq PewterCity_Museum_1F_EventScript_PlayerApproachCounterMid
compare VAR_TEMP_1, 2
call_if_eq PewterCity_Museum_1F_EventScript_PlayerApproachCounterRight
call_if_eq VAR_TEMP_1, 0, PewterCity_Museum_1F_EventScript_PlayerApproachCounterLeft
call_if_eq VAR_TEMP_1, 1, PewterCity_Museum_1F_EventScript_PlayerApproachCounterMid
call_if_eq VAR_TEMP_1, 2, PewterCity_Museum_1F_EventScript_PlayerApproachCounterRight
playse SE_SHOP
removemoney 50, 0
updatemoneybox 0, 0, 0
removemoney 50
updatemoneybox
waitse
msgbox PewterCity_Museum_1F_Text_Right50YThankYou
setvar VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F, 1
hidemoneybox 0, 0
hidemoneybox
releaseall
end
@@ -116,7 +106,7 @@ PewterCity_Museum_1F_EventScript_PlayerApproachCounterRight::
PewterCity_Museum_1F_EventScript_NotEnoughMoney::
msgbox PewterCity_Museum_1F_Text_DontHaveEnoughMoney
closemessage
hidemoneybox 0, 0
hidemoneybox
applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ForcePlayerExit
waitmovement 0
releaseall
@@ -157,9 +147,8 @@ PewterCity_Museum_1F_EventScript_OldAmberScientist::
faceplayer
goto_if_set FLAG_GOT_OLD_AMBER, PewterCity_Museum_1F_EventScript_AlreadyGotOldAmber
msgbox PewterCity_Museum_1F_Text_WantYouToGetAmberExamined
checkitemspace ITEM_OLD_AMBER, 1
compare VAR_RESULT, FALSE
goto_if_eq PewterCity_Museum_1F_EventScript_NoRoomForOldAmber
checkitemspace ITEM_OLD_AMBER
goto_if_eq VAR_RESULT, FALSE, PewterCity_Museum_1F_EventScript_NoRoomForOldAmber
setflag FLAG_GOT_OLD_AMBER
removeobject LOCALID_OLD_AMBER
giveitem_msg PewterCity_Museum_1F_Text_ReceivedOldAmberFromMan, ITEM_OLD_AMBER, 1, MUS_OBTAIN_KEY_ITEM