money / coins hram constants

This commit is contained in:
YamaArashi 2015-07-17 01:21:40 -07:00
parent aa3da5f3b0
commit 6931ce9625
13 changed files with 95 additions and 89 deletions

View file

@ -151,31 +151,31 @@ CeladonGameCornerText2: ; 48ca9 (12:4ca9)
call Has9990Coins
jr nc, .asm_48d14
xor a
ld [$ff9f], a
ld [$ffa1], a
ld [hMoney], a
ld [hMoney + 2], a
ld a, $10
ld [$ffa0], a
ld [hMoney + 1], a
call HasEnoughMoney
jr nc, .asm_48cdb
ld hl, CeladonGameCornerText_48d31
jr .asm_48d1c
.asm_48cdb
xor a
ld [$ff9f], a
ld [$ffa1], a
ld [hMoney], a
ld [hMoney + 2], a
ld a, $10
ld [$ffa0], a
ld hl, $ffa1
ld [hMoney + 1], a
ld hl, hMoney + 2
ld de, wPlayerMoney + 2
ld c, $3
predef SubBCDPredef
xor a
ld [$ff9f], a
ld [$ffa0], a
ld [hCoins - 1], a
ld [hCoins], a
ld a, $50
ld [$ffa1], a
ld [hCoins + 1], a
ld de, wPlayerCoins + 1
ld hl, $ffa1
ld hl, hCoins + 1
ld c, $2
predef AddBCDPredef
call CeladonGameCornerScript_48f1e
@ -238,12 +238,12 @@ CeladonGameCornerText5: ; 48d4a (12:4d4a)
call Has9990Coins
jr nc, .asm_48d8e
xor a
ld [$ff9f], a
ld [$ffa0], a
ld [hCoins - 1], a
ld [hCoins], a
ld a, $10
ld [$ffa1], a
ld [hCoins + 1], a
ld de, wPlayerCoins + 1
ld hl, $ffa1
ld hl, hCoins + 1
ld c, $2
predef AddBCDPredef
ld hl, wd77e
@ -320,12 +320,12 @@ CeladonGameCornerText9: ; 48dd9 (12:4dd9)
call Has9990Coins
jr nc, .asm_48e18
xor a
ld [$ff9f], a
ld [$ffa0], a
ld [hCoins - 1], a
ld [hCoins], a
ld a, $20
ld [$ffa1], a
ld [hCoins + 1], a
ld de, wPlayerCoins + 1
ld hl, $ffa1
ld hl, hCoins + 1
ld c, $2
predef AddBCDPredef
ld hl, wd77e
@ -373,12 +373,12 @@ CeladonGameCornerText10: ; 48e3b (12:4e3b)
call Has9990Coins
jr z, .asm_48e7a
xor a
ld [$ff9f], a
ld [$ffa0], a
ld [hCoins - 1], a
ld [hCoins], a
ld a, $20
ld [$ffa1], a
ld [hCoins + 1], a
ld de, wPlayerCoins + 1
ld hl, $ffa1
ld hl, hCoins + 1
ld c, $2
predef AddBCDPredef
ld hl, wd77e
@ -527,7 +527,7 @@ GameCornerBlankText2: ; 48f8d (12:4f8d)
Has9990Coins: ; 48f95 (12:4f95)
ld a, $99
ld [$ffa0], a
ld [hCoins], a
ld a, $90
ld [$ffa1], a
ld [hCoins + 1], a
jp HasEnoughCoins

View file

@ -137,11 +137,11 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
and a
jp nz, .asm_56403
ld hl, wTrainerFacingDirection
ld [$ff9f], a
ld [hMoney], a
ld a, [hli]
ld [$ffa0], a
ld [hMoney + 1], a
ld a, [hl]
ld [$ffa1], a
ld [hMoney + 2], a
call HasEnoughMoney
jr nc, .asm_56396
ld hl, DayCareMText_56454

View file

@ -35,10 +35,10 @@ MtMoonPokecenterText4: ; 492ec (12:52ec)
ld a, [wCurrentMenuItem]
and a
jp nz, .asm_4934e
ld [$ff9f], a
ld [$ffa1], a
ld [hMoney], a
ld [hMoney + 2], a
ld a, $5
ld [$ffa0], a
ld [hMoney + 1], a
call HasEnoughMoney
jr nc, .asm_faa09
ld hl, MtMoonPokecenterText_49366

View file

@ -81,10 +81,10 @@ Museum1FText1: ; 5c135 (17:4135)
and a
jr nz, .asm_de133
xor a
ld [$ff9f], a
ld [$ffa0], a
ld [hMoney], a
ld [hMoney + 1], a
ld a, $50
ld [$ffa1], a
ld [hMoney + 2], a
call HasEnoughMoney
jr nc, .asm_0f3e3
ld hl, Museum1FText_5c229

View file

@ -155,11 +155,11 @@ SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9)
and a
jp nz,.PleaseComeAgain
xor a
ld [$ff9f],a
ld [hMoney],a
ld a,$05
ld [$ffa0],a
ld [hMoney + 1],a
ld a,$00
ld [$ffa1],a
ld [hMoney + 2],a
call HasEnoughMoney
jr nc,.success
ld hl,.NotEnoughMoneyText