From 351146024bdd386c328af0f2abdb04e728e4c133 Mon Sep 17 00:00:00 2001 From: dannye Date: Mon, 14 Dec 2015 22:09:30 -0600 Subject: Fewer underscores in constants --- scripts/billshouse.asm | 2 +- scripts/route15gateupstairs.asm | 2 +- scripts/vermilioncity.asm | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm index d594f907..04d3ee60 100755 --- a/scripts/billshouse.asm +++ b/scripts/billshouse.asm @@ -163,7 +163,7 @@ BillsHouseText2: ; 1e874 (7:6874) jr nz, .asm_1e8a9 ld hl, BillThankYouText call PrintText - lb bc, S_S__TICKET, 1 + lb bc, S_S_TICKET, 1 call GiveItem jr nc, .BagFull ld hl, SSTicketReceivedText diff --git a/scripts/route15gateupstairs.asm b/scripts/route15gateupstairs.asm index 332df6b6..14e3bc5d 100755 --- a/scripts/route15gateupstairs.asm +++ b/scripts/route15gateupstairs.asm @@ -11,7 +11,7 @@ Route15GateUpstairsText1: ; 49651 (12:5651) jr nz, .asm_49683 ld a, 50 ; pokemon needed ld [hOaksAideRequirement], a - ld a, EXP__ALL ; oak's aide reward + ld a, EXP_ALL ; oak's aide reward ld [hOaksAideRewardItem], a ld [wd11e], a call GetItemName diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm index b60d4111..66df8021 100755 --- a/scripts/vermilioncity.asm +++ b/scripts/vermilioncity.asm @@ -52,7 +52,7 @@ VermilionCityScript0: ; 197e6 (6:57e6) call DisplayTextID CheckEvent EVENT_SS_ANNE_LEFT jr nz, .asm_19810 - ld b, S_S__TICKET + ld b, S_S_TICKET predef GetQuantityOfItemInBag ld a, b and a @@ -170,7 +170,7 @@ VermilionCityText3: ; 198b1 (6:58b1) .asm_198d0 ld hl, SSAnneWelcomeText9 call PrintText - ld b, S_S__TICKET + ld b, S_S_TICKET predef GetQuantityOfItemInBag ld a, b and a -- cgit v1.2.3