From 2ff0f3f208d01c6244c805866a1795be1dfd21ea Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Sat, 29 Aug 2015 17:27:57 -0700
Subject: added constants for item capacity

---
 constants/misc_constants.asm |  3 +++
 main.asm                     | 10 +++++-----
 wram.asm                     |  4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
index b42745cc..fd2c7388 100644
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -10,6 +10,9 @@ PARTY_LENGTH EQU 6
 MONS_PER_BOX EQU 20
 NUM_BOXES    EQU 12
 
+BAG_ITEM_CAPACITY EQU 20
+PC_ITEM_CAPACITY  EQU 50
+
 HOF_MON           EQU $10
 HOF_TEAM          EQU PARTY_LENGTH * HOF_MON
 HOF_TEAM_CAPACITY EQU 50
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
diff --git a/wram.asm b/wram.asm
index 9dd3fea3..acf75346 100755
--- a/wram.asm
+++ b/wram.asm
@@ -2282,7 +2282,7 @@ wNumBagItems:: ; d31d
 	ds 1
 wBagItems:: ; d31e
 ; item, quantity
-	ds 20 * 2
+	ds BAG_ITEM_CAPACITY * 2
 	ds 1 ; end
 
 wPlayerMoney:: ; d347
@@ -2595,7 +2595,7 @@ wNumBoxItems:: ; d53a
 	ds 1
 wBoxItems:: ; d53b
 ; item, quantity
-	ds 50 * 2
+	ds PC_ITEM_CAPACITY * 2
 	ds 1 ; end
 
 wCurrentBoxNum:: ; d5a0
-- 
cgit v1.2.3