summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-07-19 14:01:08 -0700
committerYamaArashi <shadow962@live.com>2015-07-19 14:01:08 -0700
commite607199397cb36565f61703a58d99efdc21891c5 (patch)
treead2f4b8ddfb9a97a71d83721cf111f598394b0f2
parent02bd91b7076165653a900a8e39c12a92a9bd2976 (diff)
replace uses of minus one
-rwxr-xr-xengine/HoF_room_pc.asm2
-rwxr-xr-xengine/menu/prize_menu.asm2
-rwxr-xr-xengine/overworld/hidden_items.asm2
-rw-r--r--hram.asm3
-rwxr-xr-xscripts/celadongamecorner.asm8
-rwxr-xr-xwram.asm2
6 files changed, 12 insertions, 7 deletions
diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm
index 06c926db..5e3ff37b 100755
--- a/engine/HoF_room_pc.asm
+++ b/engine/HoF_room_pc.asm
@@ -29,7 +29,7 @@ HallOfFamePC: ; 7405c (1d:405c)
ld c, 128
call DelayFrames
xor a
- ld [wNumCreditsMonsDisplayed - 1], a ; not read
+ ld [wUnusedCD3D], a ; not read
ld [wNumCreditsMonsDisplayed], a
jp Credits
diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm
index b1b751b9..f2f2a794 100755
--- a/engine/menu/prize_menu.asm
+++ b/engine/menu/prize_menu.asm
@@ -179,7 +179,7 @@ LoadCoinsToSubtract: ; 528b1 (14:68b1)
ld hl,wd141 ; first prize's price
add hl,de ; get selected prize's price
xor a
- ld [hCoins - 1],a
+ ld [hUnusedCoinsByte],a
ld a,[hli]
ld [hCoins],a
ld a,[hl]
diff --git a/engine/overworld/hidden_items.asm b/engine/overworld/hidden_items.asm
index fee5b5bc..311b38d4 100755
--- a/engine/overworld/hidden_items.asm
+++ b/engine/overworld/hidden_items.asm
@@ -67,7 +67,7 @@ HiddenCoins: ; 76799 (1d:6799)
and a
ret nz
xor a
- ld [hCoins - 1], a
+ ld [hUnusedCoinsByte], a
ld [hCoins], a
ld [hCoins + 1], a
ld a, [wHiddenObjectFunctionArgument]
diff --git a/hram.asm b/hram.asm
index 8bbf7150..d156ca64 100644
--- a/hram.asm
+++ b/hram.asm
@@ -137,6 +137,9 @@ hNPCPlayerRelativePosPerspective EQU $FF9B
; 1 = target is to the west
hNPCPlayerRelativePosFlags EQU $FF9D
+; some code zeroes this for no reason when writing a coin amount
+hUnusedCoinsByte EQU $FF9F
+
hMoney EQU $FF9F ; 3-byte BCD number
hCoins EQU $FFA0 ; 2-byte BCD number
diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm
index 53e55872..c8d07058 100755
--- a/scripts/celadongamecorner.asm
+++ b/scripts/celadongamecorner.asm
@@ -170,7 +170,7 @@ CeladonGameCornerText2: ; 48ca9 (12:4ca9)
ld c, $3
predef SubBCDPredef
xor a
- ld [hCoins - 1], a
+ ld [hUnusedCoinsByte], a
ld [hCoins], a
ld a, $50
ld [hCoins + 1], a
@@ -238,7 +238,7 @@ CeladonGameCornerText5: ; 48d4a (12:4d4a)
call Has9990Coins
jr nc, .asm_48d8e
xor a
- ld [hCoins - 1], a
+ ld [hUnusedCoinsByte], a
ld [hCoins], a
ld a, $10
ld [hCoins + 1], a
@@ -320,7 +320,7 @@ CeladonGameCornerText9: ; 48dd9 (12:4dd9)
call Has9990Coins
jr nc, .asm_48e18
xor a
- ld [hCoins - 1], a
+ ld [hUnusedCoinsByte], a
ld [hCoins], a
ld a, $20
ld [hCoins + 1], a
@@ -373,7 +373,7 @@ CeladonGameCornerText10: ; 48e3b (12:4e3b)
call Has9990Coins
jr z, .asm_48e7a
xor a
- ld [hCoins - 1], a
+ ld [hUnusedCoinsByte], a
ld [hCoins], a
ld a, $20
ld [hCoins + 1], a
diff --git a/wram.asm b/wram.asm
index f089352b..73320e9b 100755
--- a/wram.asm
+++ b/wram.asm
@@ -733,6 +733,8 @@ wWhichTrade:: ; cd3d
; which entry from TradeMons to select
wTrainerSpriteOffset:: ; cd3d
+
+wUnusedCD3D:: ; cd3d
ds 1
wSSAnneSmokeX:: ; cd3e