pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use numeric constants in text strings with "{d:interpolation}"

Browse Source
This commit is contained in:
Rangi 2021-03-21 18:14:31 -04:00
parent 0506e5b1b9
commit 90ce126139
13 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
constants/misc_constants.asm
View File

@ -47,10 +47,3 @@ MAX_DAY_CARE_EXP EQU $500000
; hall of fame
HOF_MASTER_COUNT EQU 200
; bug-catching contest
BUG_CONTEST_MINUTES EQU 20
BUG_CONTEST_SECONDS EQU 0
BUG_CONTEST_PLAYER EQU 1
NUM_BUG_CONTESTANTS EQU 10 ; not counting the player
BUG_CONTESTANT_SIZE EQU 4

8
constants/script_constants.asm
View File

@ -283,6 +283,14 @@ NUM_DECODESCS EQU const_value
const BUGCONTEST_BOXED_MON ; 1
const BUGCONTEST_NO_CATCH ; 2
; Bug-Catching Contest values
BUG_CONTEST_BALLS EQU 20
BUG_CONTEST_MINUTES EQU 20
BUG_CONTEST_SECONDS EQU 0
BUG_CONTEST_PLAYER EQU 1
NUM_BUG_CONTESTANTS EQU 10 ; not counting the player
BUG_CONTESTANT_SIZE EQU 4
; HealMachineAnim setval arguments
; HealMachineAnim.Pointers indexes (see engine/events/heal_machine_anim.asm)
const_def

2
engine/events/bug_contest/contest.asm
View File

@ -1,7 +1,7 @@
GiveParkBalls:
xor a
ld [wContestMon], a
ld a, 20
ld a, BUG_CONTEST_BALLS
ld [wParkBallsRemaining], a
farcall StartBugContestTimer
ret

6
maps/CeladonDeptStore6F.asm
View File

@ -90,9 +90,9 @@ CeladonDeptStore6FVendingMachine:
.MenuData:
db STATICMENU_CURSOR ; flags
db 4 ; items
db "FRESH WATER ¥200@"
db "SODA POP ¥300@"
db "LEMONADE ¥350@"
db "FRESH WATER ¥{d:CELADONDEPTSTORE6F_FRESH_WATER_PRICE}@"
db "SODA POP ¥{d:CELADONDEPTSTORE6F_SODA_POP_PRICE}@"
db "LEMONADE ¥{d:CELADONDEPTSTORE6F_LEMONADE_PRICE}@"
db "CANCEL@"
CeladonDeptStore6FDirectory:

12
maps/CeladonGameCornerPrizeRoom.asm
View File

@ -116,9 +116,9 @@ CeladonPrizeRoom_TMMenuHeader:
.MenuData:
db STATICMENU_CURSOR ; flags
db 4 ; items
db "TM32 1500@"
db "TM29 3500@"
db "TM15 7500@"
db "TM32 {d:CELADONGAMECORNERPRIZEROOM_TM32_COINS}@"
db "TM29 {d:CELADONGAMECORNERPRIZEROOM_TM29_COINS}@"
db "TM15 {d:CELADONGAMECORNERPRIZEROOM_TM15_COINS}@"
db "CANCEL@"
CeladonGameCornerPrizeRoomPokemonVendor:
@ -202,9 +202,9 @@ CeladonGameCornerPrizeRoomPokemonVendor:
.MenuData:
db STATICMENU_CURSOR ; flags
db 4 ; items
db "PIKACHU 2222@"
db "PORYGON 5555@"
db "LARVITAR 8888@"
db "PIKACHU {d:CELADONGAMECORNERPRIZEROOM_PIKACHU_COINS}@"
db "PORYGON {d:CELADONGAMECORNERPRIZEROOM_PORYGON_COINS}@"
db "LARVITAR {d:CELADONGAMECORNERPRIZEROOM_LARVITAR_COINS}@"
db "CANCEL@"
CeladonGameCornerPrizeRoomGentlemanText:

6
maps/GoldenrodDeptStore6F.asm
View File

@ -79,9 +79,9 @@ GoldenrodVendingMachine:
.MenuData:
db STATICMENU_CURSOR ; flags
db 4 ; items
db "FRESH WATER ¥200@"
db "SODA POP ¥300@"
db "LEMONADE ¥350@"
db "FRESH WATER ¥{d:GOLDENRODDEPTSTORE6F_FRESH_WATER_PRICE}@"
db "SODA POP ¥{d:GOLDENRODDEPTSTORE6F_SODA_POP_PRICE}@"
db "LEMONADE ¥{d:GOLDENRODDEPTSTORE6F_LEMONADE_PRICE}@"
db "CANCEL@"
GoldenrodDeptStore6FLassScript:

2
maps/NationalPark.asm
View File

@ -411,7 +411,7 @@ SchoolboyJackTradeMonText:
para "For example…"
para "There are 50 kinds"
para "There are {d:NUM_TMS} kinds"
line "of TMs."
para "Traded #MON"

10
maps/RadioTower2F.asm
View File

@ -1,3 +1,5 @@
BLUE_CARD_POINT_CAP EQU 30
object_const_def
const RADIOTOWER2F_SUPER_NERD
const RADIOTOWER2F_TEACHER
@ -112,7 +114,7 @@ Buena:
checkitem BLUE_CARD
iffalse .NoBlueCard
readvar VAR_BLUECARDBALANCE
ifequal 30, .BlueCardCapped0
ifequal BLUE_CARD_POINT_CAP, .BlueCardCapped0
playmusic MUSIC_BUENAS_PASSWORD
writetext RadioTower2FBuenaDoYouKnowPasswordText
special AskRememberPassword
@ -155,7 +157,7 @@ Buena:
pause 20
special RestartMapMusic
readvar VAR_BLUECARDBALANCE
ifequal 30, .BlueCardCapped1
ifequal BLUE_CARD_POINT_CAP, .BlueCardCapped1
end
.Introduction:
@ -625,12 +627,12 @@ RadioTower2FBuenaOfferPhoneNumberText:
text "BUENA: Oh! Your"
line "BLUE CARD reached"
para "30 points today!"
para "{d:BLUE_CARD_POINT_CAP} points today!"
line "That's so wild!"
para "Hmm… There isn't a"
line "prize for hitting"
cont "30 points, but…"
cont "{d:BLUE_CARD_POINT_CAP} points, but…"
para "You came by so"
line "often, <PLAY_G>."

4
maps/Route35NationalParkGate.asm
View File

@ -252,7 +252,7 @@ Route35NationalParkGateOfficer1GiveParkBallsText:
Route35NationalParkGatePlayerReceivedParkBallsText:
text "<PLAYER> received"
line "20 PARK BALLS."
line "{d:BUG_CONTEST_BALLS} PARK BALLS."
done
Route35NationalParkGateOfficer1ExplainsRulesText:
@ -261,7 +261,7 @@ Route35NationalParkGateOfficer1ExplainsRulesText:
cont "est bug #MON"
cont "is the winner."
para "You have 20"
para "You have {d:BUG_CONTEST_MINUTES}"
line "minutes."
para "If you run out of"

4
maps/Route36NationalParkGate.asm
View File

@ -503,7 +503,7 @@ Route36NationalParkGateOfficer1GiveParkBallsText:
Route36NationalParkGatePlayerReceivedParkBallsText:
text "<PLAYER> received"
line "20 PARK BALLS."
line "{d:BUG_CONTEST_BALLS} PARK BALLS."
done
Route36NationalParkGateOfficer1ExplainsRulesText:
@ -512,7 +512,7 @@ Route36NationalParkGateOfficer1ExplainsRulesText:
cont "est bug #MON"
cont "is the winner."
para "You have 20"
para "You have {d:BUG_CONTEST_MINUTES}"
line "minutes."
para "If you run out of"

2
maps/Route39Farmhouse.asm
View File

@ -122,7 +122,7 @@ FarmerMText_BuyMilk:
line "to restore HP!"
para "I'll give it to ya"
line "fer just ¥500."
line "fer just ¥{d:ROUTE39FARMHOUSE_MILK_PRICE}."
done
FarmerMText_GotMilk:

2
maps/Route43Gate.asm
View File

@ -196,7 +196,7 @@ RocketText_TollFee:
text "Hold it there,"
line "kiddo!"
para "The toll is ¥1000"
para "The toll is ¥{d:ROUTE43GATE_TOLL}"
line "to go through."
done

2
maps/RuinsOfAlphResearchCenter.asm
View File

@ -356,7 +356,7 @@ RuinsOfAlphResearchCenterComputerText_GotAllUnown:
text "Mystery #MON"
line "Name: UNOWN"
para "A total of 26"
para "A total of {d:NUM_UNOWN}"
line "kinds found."
done