Label slot machine ids, fix GetPriceReduction

This commit is contained in:
GriffinR
2021-11-16 13:55:02 -05:00
parent 63c5905914
commit 5d9c31a610
12 changed files with 151 additions and 61 deletions
@@ -17,7 +17,7 @@ LilycoveCity_ContestLobby_OnTransition:
end
LilycoveCity_ContestLobby_EventScript_TryShowBlendMaster::
getpricereduction POKENEWS_BLENDMASTER
getpokenewsactive POKENEWS_BLENDMASTER
compare VAR_RESULT, TRUE
goto_if_eq LilycoveCity_ContestLobby_EventScript_ShowBlendMaster
clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT
@@ -3,7 +3,7 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts::
.byte 0
LilycoveCity_DepartmentStoreRooftop_OnTransition:
getpricereduction POKENEWS_LILYCOVE
getpokenewsactive POKENEWS_LILYCOVE
compare VAR_RESULT, TRUE
call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_ShowSaleWoman
compare VAR_RESULT, FALSE
@@ -51,7 +51,7 @@ LilycoveCity_DepartmentStoreRooftop_PokemartDecor_ClearOutSale:
LilycoveCity_DepartmentStoreRooftop_EventScript_Man::
lock
faceplayer
getpricereduction POKENEWS_LILYCOVE
getpokenewsactive POKENEWS_LILYCOVE
compare VAR_RESULT, TRUE
call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_ManClearOutSale
msgbox LilycoveCity_DepartmentStoreRooftop_Text_SetDatesForClearOutSales, MSGBOX_DEFAULT
+1 -1
View File
@@ -150,7 +150,7 @@ gScriptCmdTable::
.4byte ScrCmd_showmoneybox @ 0x93
.4byte ScrCmd_hidemoneybox @ 0x94
.4byte ScrCmd_updatemoneybox @ 0x95
.4byte ScrCmd_getpricereduction @ 0x96
.4byte ScrCmd_getpokenewsactive @ 0x96
.4byte ScrCmd_fadescreen @ 0x97
.4byte ScrCmd_fadescreenspeed @ 0x98
.4byte ScrCmd_setflashradius @ 0x99
+2 -2
View File
@@ -3,7 +3,7 @@ Roulette_EventScript_Table1::
compare VAR_RESULT, FALSE
goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 0
getpricereduction POKENEWS_GAME_CORNER
getpokenewsactive POKENEWS_GAME_CORNER
compare VAR_RESULT, FALSE
goto_if_eq Roulette_EventScript_Play
addvar VAR_0x8004, ROULETTE_SPECIAL_RATE
@@ -15,7 +15,7 @@ Roulette_EventScript_Table2::
compare VAR_RESULT, FALSE
goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 1
getpricereduction POKENEWS_GAME_CORNER
getpokenewsactive POKENEWS_GAME_CORNER
compare VAR_RESULT, FALSE
goto_if_eq Roulette_EventScript_Play
addvar VAR_0x8004, ROULETTE_SPECIAL_RATE