summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-08-29 17:27:57 -0700
committerYamaArashi <shadow962@live.com>2015-08-29 17:29:16 -0700
commit2ff0f3f208d01c6244c805866a1795be1dfd21ea (patch)
treefcacb6f4926b4ae9bbea9ddb8077d1e1bcc7e14f /main.asm
parentb6a7e5e9cf20e7924f6cf427c66e9aeb42fa77f3 (diff)
added constants for item capacity
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/main.asm b/main.asm
index 73f6de47..300afffd 100755
--- a/main.asm
+++ b/main.asm
@@ -2752,14 +2752,14 @@ CanMoveBouldersText: ; cdbb (3:4dbb)
db "@"
IsSurfingAllowed: ; cdc0 (3:4dc0)
-; Returns whether surfing is allowed in bit of d728.
+; Returns whether surfing is allowed in bit 1 of wd728.
; Surfing isn't allowed on the Cycling Road or in the lowest level of the
; Seafoam Islands before the current has been slowed with boulders.
ld hl, wd728
set 1, [hl]
ld a, [wd732]
bit 5, a
- jr nz, .asm_cdec
+ jr nz, .forcedToRideBike
ld a, [W_CURMAP]
cp SEAFOAM_ISLANDS_5
ret nz
@@ -2772,7 +2772,7 @@ IsSurfingAllowed: ; cdc0 (3:4dc0)
res 1, [hl]
ld hl, CurrentTooFastText
jp PrintText
-.asm_cdec
+.forcedToRideBike
ld hl, wd728
res 1, [hl]
ld hl, CyclingIsFunText
@@ -2802,7 +2802,7 @@ AddItemToInventory_: ; ce04 (3:4e04)
push de
push hl
push hl
- ld d,50 ; PC box can hold 50 items
+ ld d,PC_ITEM_CAPACITY ; how many items the PC can hold
ld a,wNumBagItems & $FF
cp l
jr nz,.checkIfInventoryFull
@@ -2810,7 +2810,7 @@ AddItemToInventory_: ; ce04 (3:4e04)
cp h
jr nz,.checkIfInventoryFull
; if the destination is the bag
- ld d,20 ; bag can hold 20 items
+ ld d,BAG_ITEM_CAPACITY ; how many items the bag can hold
.checkIfInventoryFull
ld a,[hl]
sub d