shithub: pokered

Download patch

ref: 571cbba9a4aa1a9b462d3f66f7d57e96d01193ca
parent: 484eed1044a234132353af9c766096236353008c
author: Bryan Bishop <kanzure@gmail.com>
date: Thu Jan 19 09:10:49 EST 2012

constants for bag items and bag item counts

hg-commit-id: ca595212ee40


--- a/common.asm
+++ b/common.asm
@@ -29814,7 +29814,7 @@
 	dbw $1C,$4F60
 	dbw $09,$7D6B
 	dbw $05,$7C47; 4C player exclamation
-	dbw $01,$5AAF
+	dbw $01,$5AAF; return immediately
 	dbw $01,$64EB
 	dbw $0D,$7CA1
 	dbw $1C,$780F
--- a/constants.asm
+++ b/constants.asm
@@ -88,6 +88,7 @@
 	ENDM
 
 ; wram locations
+
 W_AICOUNT EQU $CCDF ; number of times remaining that AI action can occur
 
 W_WHICHTRADE EQU $CD3D ; which entry from TradeMons to select
@@ -157,8 +158,50 @@
 
 W_NUMINPARTY EQU $D163
 
-W_NUMBAGITEMS EQU $D31D
-W_BAGITEM01 EQU $D31E
+;number of items in bag
+W_NUMBAGITEMS     EQU $D31D
+; BAGITEM01  is an item id
+; BAGCOUNT01 is how many of this item
+W_BAGITEM01       EQU $D31E
+W_BAGCOUNT01      EQU $D31F
+W_BAGITEM02       EQU $D320
+W_BAGCOUNT02      EQU $D321
+W_BAGITEM03       EQU $D322
+W_BAGCOUNT03      EQU $D323
+W_BAGITEM04       EQU $D324
+W_BAGCOUNT04      EQU $D325
+W_BAGITEM05       EQU $D326
+W_BAGCOUNT05      EQU $D327
+W_BAGITEM06       EQU $D328
+W_BAGCOUNT06      EQU $D329
+W_BAGITEM07       EQU $D32A
+W_BAGCOUNT07      EQU $D32B
+W_BAGITEM08       EQU $D32C
+W_BAGCOUNT08      EQU $D32D
+W_BAGITEM09       EQU $D32E
+W_BAGCOUNT09      EQU $D32F
+W_BAGITEM10       EQU $D330
+W_BAGCOUNT10      EQU $D331
+W_BAGITEM11       EQU $D332
+W_BAGCOUNT11      EQU $D333
+W_BAGITEM12       EQU $D334
+W_BAGCOUNT12      EQU $D335
+W_BAGITEM13       EQU $D336
+W_BAGCOUNT13      EQU $D337
+W_BAGITEM14       EQU $D338
+W_BAGCOUNT14      EQU $D339
+W_BAGITEM15       EQU $D33A
+W_BAGCOUNT15      EQU $D33B
+W_BAGITEM16       EQU $D33C
+W_BAGCOUNT16      EQU $D33D
+W_BAGITEM17       EQU $D33E
+W_BAGCOUNT17      EQU $D33F
+W_BAGITEM18       EQU $D340
+W_BAGCOUNT18      EQU $D341
+W_BAGITEM19       EQU $D342
+W_BAGCOUNT19      EQU $D343
+W_BAGITEM20       EQU $D344
+W_BAGCOUNT20      EQU $D345
 
 W_RIVALNAME  EQU $D34A ; 11 characters, including null