From 90ce12613935999ec0675317e73725521925d32e Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 21 Mar 2021 18:14:31 -0400 Subject: [PATCH] Use numeric constants in text strings with "{d:interpolation}" --- constants/misc_constants.asm | 7 ------- constants/script_constants.asm | 8 ++++++++ engine/events/bug_contest/contest.asm | 2 +- maps/CeladonDeptStore6F.asm | 6 +++--- maps/CeladonGameCornerPrizeRoom.asm | 12 ++++++------ maps/GoldenrodDeptStore6F.asm | 6 +++--- maps/NationalPark.asm | 2 +- maps/RadioTower2F.asm | 10 ++++++---- maps/Route35NationalParkGate.asm | 4 ++-- maps/Route36NationalParkGate.asm | 4 ++-- maps/Route39Farmhouse.asm | 2 +- maps/Route43Gate.asm | 2 +- maps/RuinsOfAlphResearchCenter.asm | 2 +- 13 files changed, 35 insertions(+), 32 deletions(-) diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 7ed9587b4..171b16e39 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -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 diff --git a/constants/script_constants.asm b/constants/script_constants.asm index c4d9fe314..7e1de6a7c 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -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 diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm index 90d351304..4c8da2897 100644 --- a/engine/events/bug_contest/contest.asm +++ b/engine/events/bug_contest/contest.asm @@ -1,7 +1,7 @@ GiveParkBalls: xor a ld [wContestMon], a - ld a, 20 + ld a, BUG_CONTEST_BALLS ld [wParkBallsRemaining], a farcall StartBugContestTimer ret diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index c37c4e6c8..3e9866b2b 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -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: diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 542b0cf08..6d5415d9c 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -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: diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 9f87055d1..17b90e76a 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -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: diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 6da166f9e..e99777fab 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -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" diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 7940beb2d..af95b9e1e 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -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, ." diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 7d231254c..95009d5bb 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -252,7 +252,7 @@ Route35NationalParkGateOfficer1GiveParkBallsText: Route35NationalParkGatePlayerReceivedParkBallsText: text " 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" diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 1a2664e13..08469b039 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -503,7 +503,7 @@ Route36NationalParkGateOfficer1GiveParkBallsText: Route36NationalParkGatePlayerReceivedParkBallsText: text " 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" diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 8ea55dbf4..e5c5d4baa 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -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: diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 5301d952e..50b9d49c2 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -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 diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 7fc33ab52..6e5911a9d 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -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