summaryrefslogtreecommitdiff
path: root/scripts/MtMoonPokecenter2.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-11-04 00:06:44 -0600
committerdannye <33dannye@gmail.com>2020-11-04 00:06:44 -0600
commit5647ca687b92954dcf37a6ea6bfbc9a341c32de4 (patch)
treedde1937a1bfdb3a835f4155e1c2eb8f1aaf86f63 /scripts/MtMoonPokecenter2.asm
parent53fcd05aa24693093d8af1dc8ec4fedd3957decc (diff)
Sync with pokered
Diffstat (limited to 'scripts/MtMoonPokecenter2.asm')
-rwxr-xr-xscripts/MtMoonPokecenter2.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/scripts/MtMoonPokecenter2.asm b/scripts/MtMoonPokecenter2.asm
index 6097342b..9abc0286 100755
--- a/scripts/MtMoonPokecenter2.asm
+++ b/scripts/MtMoonPokecenter2.asm
@@ -1,4 +1,4 @@
-MagikarpSalesman:
+MagikarpSalesman::
CheckEvent EVENT_BOUGHT_MAGIKARP, 1
jp c, .alreadyBoughtMagikarp
ld hl, .Text1
@@ -12,10 +12,10 @@ MagikarpSalesman:
jp nz, .choseNo
; $000500
xor a
- ld [hMoney], a
- ld [hMoney + 2], a
+ ldh [hMoney], a
+ ldh [hMoney + 2], a
ld a, $5
- ld [hMoney + 1], a
+ ldh [hMoney + 1], a
call HasEnoughMoney
jr nc, .enoughMoney
ld hl, .NoMoneyText
@@ -50,17 +50,17 @@ MagikarpSalesman:
ret
.Text1
- TX_FAR _MagikarpSalesmanText1
- db "@"
+ text_far _MagikarpSalesmanText1
+ text_end
.RefuseText
- TX_FAR _MagikarpSalesmanNoText
- db "@"
+ text_far _MagikarpSalesmanNoText
+ text_end
.NoMoneyText
- TX_FAR _MagikarpSalesmanNoMoneyText
- db "@"
+ text_far _MagikarpSalesmanNoMoneyText
+ text_end
.Text2
- TX_FAR _MagikarpSalesmanText2
- db "@"
+ text_far _MagikarpSalesmanText2
+ text_end