Merge branch 'master' into clone-union

data/maps/CeladonCity_GameCorner/scripts.inc

@@ -24,7 +24,7 @@ CeladonCity_GameCorner_EventScript_CoinsClerk::
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
-	showmoneybox 0, 0, 0
+	showmoneybox 0, 0
 	showcoinsbox 0, 5
 	message CeladonCity_GameCorner_Text_WelcomeBuySomeCoins
 	waitmessage
@@ -39,38 +39,32 @@ CeladonCity_GameCorner_EventScript_CoinsClerk::
 
 CeladonCity_GameCorner_EventScript_BuyCoins::
 	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_ClerkNoCoinCase
-	compare VAR_0x8009, 0
-	goto_if_eq CeladonCity_GameCorner_EventScript_Buy50Coins
-	compare VAR_0x8009, 1
-	goto_if_eq CeladonCity_GameCorner_EventScript_Buy500Coins
+	goto_if_eq VAR_0x8009, 0, CeladonCity_GameCorner_EventScript_Buy50Coins
+	goto_if_eq VAR_0x8009, 1, CeladonCity_GameCorner_EventScript_Buy500Coins
 	end
 
 CeladonCity_GameCorner_EventScript_Buy500Coins::
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, (MAX_COINS + 1) - 500
-	goto_if_ge CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins
-	checkmoney 10000, 0
-	compare VAR_RESULT, FALSE
-	goto_if_eq CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney
+	goto_if_ge VAR_TEMP_1, (MAX_COINS + 1) - 500, CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins
+	checkmoney 10000
+	goto_if_eq VAR_RESULT, FALSE, CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney
 	addcoins 500
-	removemoney 10000, 0
+	removemoney 10000
 	goto CeladonCity_GameCorner_EventScript_BoughtCoins
 	end
 
 CeladonCity_GameCorner_EventScript_Buy50Coins::
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, (MAX_COINS + 1) - 50
-	goto_if_ge CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins
-	checkmoney 1000, 0
-	compare VAR_RESULT, FALSE
-	goto_if_eq CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney
+	goto_if_ge VAR_TEMP_1, (MAX_COINS + 1) - 50, CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins
+	checkmoney 1000
+	goto_if_eq VAR_RESULT, FALSE, CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney
 	addcoins 50
-	removemoney 1000, 0
+	removemoney 1000
 	goto CeladonCity_GameCorner_EventScript_BoughtCoins
 	end
 
 CeladonCity_GameCorner_EventScript_BoughtCoins::
-	updatemoneybox 0, 0, 0
+	updatemoneybox
 	updatecoinsbox 0, 5
 	playse SE_SHOP
 	msgbox CeladonCity_GameCorner_Text_HereAreYourCoins
@@ -78,7 +72,7 @@ CeladonCity_GameCorner_EventScript_BoughtCoins::
 	end
 
 CeladonCity_GameCorner_EventScript_ClerkEnd::
-	hidemoneybox 0, 0
+	hidemoneybox
 	hidecoinsbox 0, 5
 	release
 	end
@@ -131,10 +125,9 @@ CeladonCity_GameCorner_EventScript_Fisher::
 	msgbox CeladonCity_GameCorner_Text_DoYouWantToPlay
 	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_GamblerNoCoinCase
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, (MAX_COINS + 1) - 10
-	goto_if_ge CeladonCity_GameCorner_EventScript_FisherNoRoomForCoins
+	goto_if_ge VAR_TEMP_1, (MAX_COINS + 1) - 10, CeladonCity_GameCorner_EventScript_FisherNoRoomForCoins
 	addcoins 10
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox CeladonCity_GameCorner_Text_Received10CoinsFromMan
 	playse SE_SHOP
 	waitse
@@ -148,7 +141,7 @@ CeladonCity_GameCorner_EventScript_FisherNoRoomForCoins::
 	end
 
 CeladonCity_GameCorner_EventScript_GamblerNoCoinCase::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox CeladonCity_GameCorner_Text_DontHaveCoinCase
 	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
@@ -192,10 +185,9 @@ CeladonCity_GameCorner_EventScript_Scientist::
 	msgbox CeladonCity_GameCorner_Text_WantSomeCoins
 	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_GamblerNoCoinCase
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, (MAX_COINS + 1) - 20
-	goto_if_ge CeladonCity_GameCorner_EventScript_ScientistNoRoomForCoins
+	goto_if_ge VAR_TEMP_1, (MAX_COINS + 1) - 20, CeladonCity_GameCorner_EventScript_ScientistNoRoomForCoins
 	addcoins 20
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox CeladonCity_GameCorner_Text_Received20CoinsFromNiceGuy
 	playse SE_SHOP
 	waitse
@@ -220,10 +212,9 @@ CeladonCity_GameCorner_EventScript_Gentleman::
 	msgbox CeladonCity_GameCorner_Text_HereAreSomeCoinsShoo
 	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_GamblerNoCoinCase
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, (MAX_COINS + 1) - 20
-	goto_if_ge CeladonCity_GameCorner_EventScript_GentlemanNoRoomForCoins
+	goto_if_ge VAR_TEMP_1, (MAX_COINS + 1) - 20, CeladonCity_GameCorner_EventScript_GentlemanNoRoomForCoins
 	addcoins 20
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox CeladonCity_GameCorner_Text_Received20CoinsFromMan
 	playse SE_SHOP
 	waitse
@@ -254,11 +245,16 @@ CeladonCity_GameCorner_EventScript_DontPlaySlotMachine::
 CeladonCity_GameCorner_EventScript_SlotMachine::
 	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_SlotMachineNoCoinCase
 	msgbox CeladonCity_GameCorner_Text_SlotMachineWantToPlay, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq CeladonCity_GameCorner_EventScript_DontPlaySlotMachine
-	setfieldeffectarg 0, 255
-	setfieldeffectarg 1, 10
-	setfieldeffectarg 2, 14
+	goto_if_eq VAR_RESULT, NO, CeladonCity_GameCorner_EventScript_DontPlaySlotMachine
+	setfieldeffectargument 0, OBJ_EVENT_ID_PLAYER
+.ifdef BUGFIX
+	setfieldeffectargument 1, MAP_NUM(CELADON_CITY_GAME_CORNER)
+	setfieldeffectargument 2, MAP_GROUP(CELADON_CITY_GAME_CORNER)
+.else
+	@ Map num/group were provided in the wrong order
+	setfieldeffectargument 1, MAP_GROUP(CELADON_CITY_GAME_CORNER)
+	setfieldeffectargument 2, MAP_NUM(CELADON_CITY_GAME_CORNER)
+.endif
 	dofieldeffect FLDEFF_SMILEY_FACE_ICON
 	waitfieldeffect FLDEFF_SMILEY_FACE_ICON
 	specialvar VAR_RESULT, GetRandomSlotMachineId
@@ -423,10 +419,8 @@ CeladonCity_GameCorner_EventScript_RocketGrunt::
 CeladonCity_GameCorner_Text_DefeatedGrunt::
 	msgbox CeladonCity_GameCorner_Text_GruntPostBattle
 	closemessage
-	compare VAR_FACING, DIR_WEST
-	call_if_eq CeladonCity_GameCorner_Text_GruntExitWest
-	compare VAR_FACING, DIR_WEST
-	call_if_ne CeladonCity_GameCorner_Text_GruntExit
+	call_if_eq VAR_FACING, DIR_WEST, CeladonCity_GameCorner_Text_GruntExitWest
+	call_if_ne VAR_FACING, DIR_WEST, CeladonCity_GameCorner_Text_GruntExit
 	removeobject LOCALID_GRUNT
 	release
 	end