summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/event_scripts.s1
-rw-r--r--data/maps/LilycoveCity_ContestLobby/scripts.inc2
-rw-r--r--data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc4
-rw-r--r--data/maps/MauvilleCity_GameCorner/map.json24
-rw-r--r--data/maps/MauvilleCity_GameCorner/scripts.inc30
-rw-r--r--data/scripts/roulette.inc49
6 files changed, 56 insertions, 54 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 670450b54..a6a5fe651 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -29,6 +29,7 @@
#include "constants/species.h"
#include "constants/trainer_hill.h"
#include "constants/trainers.h"
+#include "constants/tv.h"
#include "constants/vars.h"
#include "constants/weather.h"
.include "asm/macros.inc"
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index a5ab9601c..0ae65496e 100644
--- a/data/maps/LilycoveCity_ContestLobby/scripts.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -9,7 +9,7 @@ LilycoveCity_ContestLobby_OnTransition: @ 821A21C
end
LilycoveCity_ContestLobby_EventScript_21A227:: @ 821A227
- getpricereduction 4
+ getpricereduction POKENEWS_BLENDMASTER
compare VAR_RESULT, 1
goto_if_eq LilycoveCity_ContestLobby_EventScript_21A23C
clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
index 654395dde..44b9b2d24 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
@@ -3,7 +3,7 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207
.byte 0
LilycoveCity_DepartmentStoreRooftop_OnTransition: @ 822020D
- getpricereduction 3
+ getpricereduction POKENEWS_LILYCOVE
compare VAR_RESULT, 1
call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220227
compare VAR_RESULT, 0
@@ -51,7 +51,7 @@ LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248: @ 8220248
LilycoveCity_DepartmentStoreRooftop_EventScript_220268:: @ 8220268
lock
faceplayer
- getpricereduction 3
+ getpricereduction POKENEWS_LILYCOVE
compare VAR_RESULT, 1
call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220282
msgbox LilycoveCity_DepartmentStoreRooftop_Text_220463, MSGBOX_DEFAULT
diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json
index 07bfd3bb2..c811cd7fd 100644
--- a/data/maps/MauvilleCity_GameCorner/map.json
+++ b/data/maps/MauvilleCity_GameCorner/map.json
@@ -291,7 +291,7 @@
"y": 6,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+ "script": "Roulette_EventScript_Table1"
},
{
"type": "sign",
@@ -299,7 +299,7 @@
"y": 6,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+ "script": "Roulette_EventScript_Table1"
},
{
"type": "sign",
@@ -307,7 +307,7 @@
"y": 7,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+ "script": "Roulette_EventScript_Table1"
},
{
"type": "sign",
@@ -315,7 +315,7 @@
"y": 7,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+ "script": "Roulette_EventScript_Table1"
},
{
"type": "sign",
@@ -323,7 +323,7 @@
"y": 8,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+ "script": "Roulette_EventScript_Table1"
},
{
"type": "sign",
@@ -331,7 +331,7 @@
"y": 8,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "MauvilleCity_GameCorner_EventScript_2A5AB1"
+ "script": "Roulette_EventScript_Table1"
},
{
"type": "sign",
@@ -339,7 +339,7 @@
"y": 6,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+ "script": "Roulette_EventScript_Table2"
},
{
"type": "sign",
@@ -347,7 +347,7 @@
"y": 6,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+ "script": "Roulette_EventScript_Table2"
},
{
"type": "sign",
@@ -355,7 +355,7 @@
"y": 7,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+ "script": "Roulette_EventScript_Table2"
},
{
"type": "sign",
@@ -363,7 +363,7 @@
"y": 7,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+ "script": "Roulette_EventScript_Table2"
},
{
"type": "sign",
@@ -371,7 +371,7 @@
"y": 8,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+ "script": "Roulette_EventScript_Table2"
},
{
"type": "sign",
@@ -379,7 +379,7 @@
"y": 8,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "MauvilleCity_GameCorner_EventScript_2A5ADF"
+ "script": "Roulette_EventScript_Table2"
}
]
} \ No newline at end of file
diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc
index a6ee8ec85..6f6366c59 100644
--- a/data/maps/MauvilleCity_GameCorner/scripts.inc
+++ b/data/maps/MauvilleCity_GameCorner/scripts.inc
@@ -534,7 +534,7 @@ MauvilleCity_GameCorner_EventScript_2102D6:: @ 82102D6
lockall
checkitem ITEM_COIN_CASE, 1
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+ goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 0
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
@@ -545,7 +545,7 @@ MauvilleCity_GameCorner_EventScript_2102F6:: @ 82102F6
lockall
checkitem ITEM_COIN_CASE, 1
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+ goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 1
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
@@ -556,7 +556,7 @@ MauvilleCity_GameCorner_EventScript_210316:: @ 8210316
lockall
checkitem ITEM_COIN_CASE, 1
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+ goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 2
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
@@ -567,7 +567,7 @@ MauvilleCity_GameCorner_EventScript_210336:: @ 8210336
lockall
checkitem ITEM_COIN_CASE, 1
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+ goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 3
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
@@ -578,7 +578,7 @@ MauvilleCity_GameCorner_EventScript_210356:: @ 8210356
lockall
checkitem ITEM_COIN_CASE, 1
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+ goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 4
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
@@ -589,7 +589,7 @@ MauvilleCity_GameCorner_EventScript_210376:: @ 8210376
lockall
checkitem ITEM_COIN_CASE, 1
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+ goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 5
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
@@ -600,7 +600,7 @@ MauvilleCity_GameCorner_EventScript_210396:: @ 8210396
lockall
checkitem ITEM_COIN_CASE, 1
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+ goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 6
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
@@ -611,7 +611,7 @@ MauvilleCity_GameCorner_EventScript_2103B6:: @ 82103B6
lockall
checkitem ITEM_COIN_CASE, 1
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+ goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 7
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
@@ -622,7 +622,7 @@ MauvilleCity_GameCorner_EventScript_2103D6:: @ 82103D6
lockall
checkitem ITEM_COIN_CASE, 1
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+ goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 8
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
@@ -633,7 +633,7 @@ MauvilleCity_GameCorner_EventScript_2103F6:: @ 82103F6
lockall
checkitem ITEM_COIN_CASE, 1
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+ goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 9
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
@@ -644,7 +644,7 @@ MauvilleCity_GameCorner_EventScript_210416:: @ 8210416
lockall
checkitem ITEM_COIN_CASE, 1
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+ goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 10
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
@@ -655,15 +655,15 @@ MauvilleCity_GameCorner_EventScript_210436:: @ 8210436
lockall
checkitem ITEM_COIN_CASE, 1
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+ goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 11
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
releaseall
end
-MauvilleCity_GameCorner_EventScript_210456:: @ 8210456
- msgbox MauvilleCity_GameCorner_Text_210C2E, MSGBOX_DEFAULT
+MauvilleCity_GameCorner_EventScript_NoCoinCase:: @ 8210456
+ msgbox MauvilleCity_GameCorner_Text_CantPlayWithNoCoinCase, MSGBOX_DEFAULT
releaseall
end
@@ -811,7 +811,7 @@ MauvilleCity_GameCorner_Text_210B04: @ 8210B04
.string "That would total 660 COINS, but it's\n"
.string "very difficult to get.$"
-MauvilleCity_GameCorner_Text_210C2E: @ 8210C2E
+MauvilleCity_GameCorner_Text_CantPlayWithNoCoinCase: @ 8210C2E
.string "You can't play if you don't have\n"
.string "a COIN CASE.$"
diff --git a/data/scripts/roulette.inc b/data/scripts/roulette.inc
index 1dda5e17b..791069088 100644
--- a/data/scripts/roulette.inc
+++ b/data/scripts/roulette.inc
@@ -1,70 +1,71 @@
-MauvilleCity_GameCorner_EventScript_2A5AB1:: @ 82A5AB1
+Roulette_EventScript_Table1:: @ 82A5AB1
checkitem ITEM_COIN_CASE, 1
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+ goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 0
- getpricereduction 2
+ getpricereduction POKENEWS_GAME_CORNER
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_GameCorner_EventScript_2A5B0D
+ goto_if_eq Roulette_EventScript_Play
addvar VAR_0x8004, 128
- goto MauvilleCity_GameCorner_EventScript_2A5B0D
+ goto Roulette_EventScript_Play
end
-MauvilleCity_GameCorner_EventScript_2A5ADF:: @ 82A5ADF
+Roulette_EventScript_Table2:: @ 82A5ADF
checkitem ITEM_COIN_CASE, 1
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_GameCorner_EventScript_210456
+ goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 1
- getpricereduction 2
+ getpricereduction POKENEWS_GAME_CORNER
compare VAR_RESULT, 0
- goto_if_eq MauvilleCity_GameCorner_EventScript_2A5B0D
+ goto_if_eq Roulette_EventScript_Play
addvar VAR_0x8004, 128
- goto MauvilleCity_GameCorner_EventScript_2A5B0D
+ goto Roulette_EventScript_Play
end
-MauvilleCity_GameCorner_EventScript_2A5B0D:: @ 82A5B0D
+Roulette_EventScript_Play:: @ 82A5B0D
special PlayRoulette
waitstate
end
-gUnknown_082A5B12:: @ 82A5B12
+Roulette_Text_PlayMinimumWagerIsX:: @ 82A5B12
.string "The minimum wager at this table\n"
.string "is {STR_VAR_1}. Do you want to play?$"
-gUnknown_082A5B4E:: @ 82A5B4E
+Roulette_Text_NotEnoughCoins:: @ 82A5B4E
.string "You don't have enough COINS.$"
-gUnknown_082A5B6B:: @ 82A5B6B
+Roulette_Text_SpecialRateTable:: @ 82A5B6B
.string "Special rate table right now!$"
-gUnknown_082A5B89:: @ 82A5B89
+Roulette_Text_ControlsInstruction:: @ 82A5B89
.string "Place your wager with the + Control\n"
.string "Pad, then press the A Button.$"
-gUnknown_082A5BCB:: @ 82A5BCB
+Roulette_Text_ItsAHit:: @ 82A5BCB
.string "It's a hit!$"
-gUnknown_082A5BD7:: @ 82A5BD7
+Roulette_Text_Jackpot:: @ 82A5BD7
.string "Jackpot!$"
-gUnknown_082A5BE0:: @ 82A5BE0
+Roulette_Text_NothingDoing:: @ 82A5BE0
.string "Nothing doing!$"
-gUnknown_082A5BEF:: @ 82A5BEF
+Roulette_Text_YouveWonXCoins:: @ 82A5BEF
.string "You've won {STR_VAR_1} COINS!$"
-gUnknown_082A5C04:: @ 82A5C04
+Roulette_Text_NoCoinsLeft:: @ 82A5C04
.string "No COINS left…$"
-gUnknown_082A5C13:: @ 82A5C13
+Roulette_Text_KeepPlaying:: @ 82A5C13
.string "Keep playing?$"
-gUnknown_082A5C21:: @ 82A5C21
+Roulette_Text_BoardWillBeCleared:: @ 82A5C21
.string "The ROULETTE board will be cleared.$"
-gUnknown_082A5C45:: @ 82A5C45
+@ Unused
+Roulette_Text_YouDontHaveACoinCase:: @ 82A5C45
.string "You don't have a COIN CASE.$"
-gUnknown_082A5C61:: @ 82A5C61
+Roulette_Text_CoinCaseIsFull:: @ 82A5C61
.string "Your COIN CASE is full!\n"
.string "Coins can be exchanged for prizes.$"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-22 16:12:50 +0000