From 401d6e7f36e86aa246a2c0591195e1f0f01e879f Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 11 Jun 2016 17:10:37 -0500 Subject: More syncing with pokered from April 8, 2016 to present --- scripts/mtmoonpokecenter2.asm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'scripts/mtmoonpokecenter2.asm') diff --git a/scripts/mtmoonpokecenter2.asm b/scripts/mtmoonpokecenter2.asm index f01b7218..6097342b 100755 --- a/scripts/mtmoonpokecenter2.asm +++ b/scripts/mtmoonpokecenter2.asm @@ -1,7 +1,7 @@ -Func_f218c: +MagikarpSalesman: CheckEvent EVENT_BOUGHT_MAGIKARP, 1 jp c, .alreadyBoughtMagikarp - ld hl, MtMoonPokecenterText_4935c + ld hl, .Text1 call PrintText ld a, MONEY_BOX ld [wTextBoxID], a @@ -18,7 +18,7 @@ Func_f218c: ld [hMoney + 1], a call HasEnoughMoney jr nc, .enoughMoney - ld hl, MtMoonPokecenterText_49366 + ld hl, .NoMoneyText jr .printText .enoughMoney lb bc, MAGIKARP, 5 @@ -40,27 +40,27 @@ Func_f218c: SetEvent EVENT_BOUGHT_MAGIKARP jr .done .choseNo - ld hl, MtMoonPokecenterText_49361 + ld hl, .RefuseText jr .printText .alreadyBoughtMagikarp - ld hl, MtMoonPokecenterText_4936b + ld hl, .Text2 .printText call PrintText .done ret -MtMoonPokecenterText_4935c: - TX_FAR _MtMoonPokecenterText_4935c +.Text1 + TX_FAR _MagikarpSalesmanText1 db "@" -MtMoonPokecenterText_49361: - TX_FAR _MtMoonPokecenterText_49361 +.RefuseText + TX_FAR _MagikarpSalesmanNoText db "@" -MtMoonPokecenterText_49366: - TX_FAR _MtMoonPokecenterText_49366 +.NoMoneyText + TX_FAR _MagikarpSalesmanNoMoneyText db "@" -MtMoonPokecenterText_4936b: - TX_FAR _MtMoonPokecenterText_4936b +.Text2 + TX_FAR _MagikarpSalesmanText2 db "@" -- cgit v1.3.1-sl0p