summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2017-12-24 19:49:57 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2017-12-24 19:49:57 -0500
commit148fd299f99a55109fdedbe8bd6b976263f9f77b (patch)
tree9c3e42507e6be25b7b3a0d278514eb9979089d10 /maps
parent7d4486e6a34a5163575400f21e806471be496e3d (diff)
Add more constants for some maximum values
Diffstat (limited to 'maps')
-rw-r--r--maps/CeladonGameCorner.asm2
-rw-r--r--maps/Route43Gate.asm14
2 files changed, 9 insertions, 7 deletions
diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm
index 5bd122023..d5e17050b 100644
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -58,7 +58,7 @@ CeladonGameCornerFisherScript:
buttonsound
checkitem COIN_CASE
iffalse .NoCoinCase
- checkcoins 9998
+ checkcoins MAX_COINS - 1
if_equal $0, .FullCoinCase
stringtotext .coinname, $1
scall .GiveCoins
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index 7140528d6..04542679b 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -1,3 +1,5 @@
+ROUTE43GATE_TOLL EQU 1000
+
const_value set 2
const ROUTE43GATE_OFFICER
const ROUTE43GATE_ROCKET1
@@ -48,17 +50,17 @@ RocketScript_Southbound:
opentext
writetext RocketText_TollFee
buttonsound
- checkmoney $0, 999
+ checkmoney $0, ROUTE43GATE_TOLL - 1
if_equal $0, RocketScript_TollSouth
jump RocketScript_YoureBrokeSouth
RocketScript_TollSouth:
- takemoney $0, 1000
+ takemoney $0, ROUTE43GATE_TOLL
writetext RocketText_ThankYou
jump RocketScript_ShakeDownSouth
RocketScript_YoureBrokeSouth:
- takemoney $0, 1000
+ takemoney $0, ROUTE43GATE_TOLL
writetext RocketText_AllYouGot
jump RocketScript_ShakeDownSouth
@@ -80,17 +82,17 @@ RocketScript_Northbound:
opentext
writetext RocketText_TollFee
buttonsound
- checkmoney $0, 999
+ checkmoney $0, ROUTE43GATE_TOLL - 1
if_equal $0, RocketScript_TollNorth
jump RocketScript_YoureBrokeNorth
RocketScript_TollNorth:
- takemoney $0, 1000
+ takemoney $0, ROUTE43GATE_TOLL
writetext RocketText_ThankYou
jump RocketScript_ShakeDownNorth
RocketScript_YoureBrokeNorth:
- takemoney $0, 1000
+ takemoney $0, ROUTE43GATE_TOLL
writetext RocketText_AllYouGot
jump RocketScript_ShakeDownNorth