diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-16 13:55:02 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2021-11-16 15:43:52 -0500 |
| commit | 5d9c31a610d8a6680a44b772fc1b88135d3884c3 (patch) | |
| tree | d776a819221dec62b96314d2b172a50bb743007d /data | |
| parent | 63c5905914b40d33e45a6a3101ab5a7da4375918 (diff) | |
Label slot machine ids, fix GetPriceReduction
Diffstat (limited to 'data')
| -rw-r--r-- | data/maps/LilycoveCity_ContestLobby/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc | 4 | ||||
| -rw-r--r-- | data/script_cmd_table.inc | 2 | ||||
| -rw-r--r-- | data/scripts/roulette.inc | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 94ccc21bd..6dbd1eb84 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -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 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index 65f7adc67..b0fda2731 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -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 diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 566ac3b36..322ac0bac 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -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 diff --git a/data/scripts/roulette.inc b/data/scripts/roulette.inc index 241b0d31c..96f5809d7 100644 --- a/data/scripts/roulette.inc +++ b/data/scripts/roulette.inc @@ -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 |