Merge branch 'master' into clone-union
This commit is contained in:
GriffinR
@@ -7,22 +7,18 @@ CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl::
|
||||
lock
|
||||
faceplayer
|
||||
call CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks
|
||||
compare VAR_TEMP_1, 0
|
||||
goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_IWantDrink
|
||||
goto_if_eq VAR_TEMP_1, 0, CeladonCity_DepartmentStore_Roof_EventScript_IWantDrink
|
||||
goto CeladonCity_DepartmentStore_Roof_EventScript_AskGiveDrink
|
||||
end
|
||||
|
||||
CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks::
|
||||
setvar VAR_TEMP_1, 0
|
||||
checkitem ITEM_FRESH_WATER, 1
|
||||
compare VAR_RESULT, TRUE
|
||||
call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasFreshWater
|
||||
checkitem ITEM_SODA_POP, 1
|
||||
compare VAR_RESULT, TRUE
|
||||
call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasSodaPop
|
||||
checkitem ITEM_LEMONADE, 1
|
||||
compare VAR_RESULT, TRUE
|
||||
call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasLemonade
|
||||
checkitem ITEM_FRESH_WATER
|
||||
call_if_eq VAR_RESULT, TRUE, CeladonCity_DepartmentStore_Roof_EventScript_SetHasFreshWater
|
||||
checkitem ITEM_SODA_POP
|
||||
call_if_eq VAR_RESULT, TRUE, CeladonCity_DepartmentStore_Roof_EventScript_SetHasSodaPop
|
||||
checkitem ITEM_LEMONADE
|
||||
call_if_eq VAR_RESULT, TRUE, CeladonCity_DepartmentStore_Roof_EventScript_SetHasLemonade
|
||||
return
|
||||
|
||||
CeladonCity_DepartmentStore_Roof_EventScript_SetHasFreshWater::
|
||||
@@ -39,12 +35,11 @@ CeladonCity_DepartmentStore_Roof_EventScript_SetHasLemonade::
|
||||
|
||||
CeladonCity_DepartmentStore_Roof_EventScript_AskGiveDrink::
|
||||
msgbox CeladonCity_DepartmentStore_Roof_Text_ImThirstyGiveHerDrink, MSGBOX_YESNO
|
||||
compare VAR_RESULT, NO
|
||||
goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
|
||||
textcolor 3
|
||||
goto_if_eq VAR_RESULT, NO, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
|
||||
textcolor NPC_TEXT_COLOR_NEUTRAL
|
||||
message CeladonCity_DepartmentStore_Roof_Text_GiveWhichDrink
|
||||
waitmessage
|
||||
textcolor 1
|
||||
textcolor NPC_TEXT_COLOR_FEMALE
|
||||
switch VAR_TEMP_1
|
||||
case 1, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWater
|
||||
case 2, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPop
|
||||
@@ -141,26 +136,22 @@ CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade::
|
||||
end
|
||||
|
||||
CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink::
|
||||
getitemname 0, VAR_0x8008
|
||||
getitemname 1, VAR_0x8009
|
||||
removeitem VAR_0x8008, 1
|
||||
checkitemspace VAR_0x8009, 1
|
||||
compare VAR_RESULT, FALSE
|
||||
goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForReward
|
||||
bufferitemname STR_VAR_1, VAR_0x8008
|
||||
bufferitemname STR_VAR_2, VAR_0x8009
|
||||
removeitem VAR_0x8008
|
||||
checkitemspace VAR_0x8009
|
||||
goto_if_eq VAR_RESULT, FALSE, CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForReward
|
||||
additem VAR_0x8009
|
||||
textcolor 3
|
||||
textcolor NPC_TEXT_COLOR_NEUTRAL
|
||||
playfanfare MUS_LEVEL_UP
|
||||
message Text_ReceivedItemFromLittleGirl
|
||||
waitmessage
|
||||
waitfanfare
|
||||
putitemaway VAR_0x8009
|
||||
call EventScript_RestorePrevTextColor
|
||||
compare VAR_0x8008, ITEM_FRESH_WATER
|
||||
call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM16
|
||||
compare VAR_0x8008, ITEM_SODA_POP
|
||||
call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM20
|
||||
compare VAR_0x8008, ITEM_LEMONADE
|
||||
call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM33
|
||||
call_if_eq VAR_0x8008, ITEM_FRESH_WATER, CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM16
|
||||
call_if_eq VAR_0x8008, ITEM_SODA_POP, CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM20
|
||||
call_if_eq VAR_0x8008, ITEM_LEMONADE, CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM33
|
||||
release
|
||||
end
|
||||
|
||||
@@ -210,7 +201,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine::
|
||||
lockall
|
||||
message CeladonCity_DepartmentStore_Roof_Text_VendingMachineWhatDoesItHave
|
||||
waitmessage
|
||||
showmoneybox 0, 0, 0
|
||||
showmoneybox 0, 0
|
||||
goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink
|
||||
end
|
||||
|
||||
@@ -227,48 +218,43 @@ CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink::
|
||||
|
||||
CeladonCity_DepartmentStore_Roof_EventScript_BuyFreshWater::
|
||||
setvar VAR_TEMP_0, ITEM_FRESH_WATER
|
||||
checkmoney 200, 0
|
||||
checkmoney 200
|
||||
goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink
|
||||
end
|
||||
|
||||
CeladonCity_DepartmentStore_Roof_EventScript_BuySodaPop::
|
||||
setvar VAR_TEMP_0, ITEM_SODA_POP
|
||||
checkmoney 300, 0
|
||||
checkmoney 300
|
||||
goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink
|
||||
end
|
||||
|
||||
CeladonCity_DepartmentStore_Roof_EventScript_BuyLemonade::
|
||||
setvar VAR_TEMP_0, ITEM_LEMONADE
|
||||
checkmoney 350, 0
|
||||
checkmoney 350
|
||||
goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink
|
||||
end
|
||||
|
||||
CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyFreshWater::
|
||||
removemoney 200, 0
|
||||
removemoney 200
|
||||
return
|
||||
|
||||
CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneySodaPop::
|
||||
removemoney 300, 0
|
||||
removemoney 300
|
||||
return
|
||||
|
||||
CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade::
|
||||
removemoney 350, 0
|
||||
removemoney 350
|
||||
return
|
||||
|
||||
CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink::
|
||||
compare VAR_RESULT, FALSE
|
||||
goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NotEnoughMoney
|
||||
checkitemspace VAR_TEMP_0, 1
|
||||
compare VAR_RESULT, FALSE
|
||||
goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForDrink
|
||||
compare VAR_TEMP_1, 0
|
||||
call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyFreshWater
|
||||
compare VAR_TEMP_1, 1
|
||||
call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneySodaPop
|
||||
compare VAR_TEMP_1, 2
|
||||
call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade
|
||||
updatemoneybox 0, 0, 0
|
||||
getitemname 0, VAR_TEMP_0
|
||||
goto_if_eq VAR_RESULT, FALSE, CeladonCity_DepartmentStore_Roof_EventScript_NotEnoughMoney
|
||||
checkitemspace VAR_TEMP_0
|
||||
goto_if_eq VAR_RESULT, FALSE, CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForDrink
|
||||
call_if_eq VAR_TEMP_1, 0, CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyFreshWater
|
||||
call_if_eq VAR_TEMP_1, 1, CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneySodaPop
|
||||
call_if_eq VAR_TEMP_1, 2, CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade
|
||||
updatemoneybox
|
||||
bufferitemname STR_VAR_1, VAR_TEMP_0
|
||||
playse SE_VEND
|
||||
msgbox CeladonCity_DepartmentStore_Roof_Text_DrinkCanPoppedOut
|
||||
additem VAR_TEMP_0
|
||||
@@ -292,6 +278,6 @@ CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForDrink::
|
||||
end
|
||||
|
||||
CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine::
|
||||
hidemoneybox 0, 0
|
||||
hidemoneybox
|
||||
releaseall
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user