diff options
| author | dannye <33dannye@gmail.com> | 2024-05-05 11:06:40 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2024-05-05 11:06:40 -0500 |
| commit | b135272f9510ed78e8c062efe552d6dbdcc1523f (patch) | |
| tree | 5dc1941a3b42651f268dbb90f6e3170ccd977408 /constants | |
| parent | Remove pcm.py since pcm.c handles it (diff) | |
| parent | Use constant in wram for hidden item flags (#445) (diff) | |
| download | pokeyellow-b135272f9510ed78e8c062efe552d6dbdcc1523f.tar.gz pokeyellow-b135272f9510ed78e8c062efe552d6dbdcc1523f.tar.xz pokeyellow-b135272f9510ed78e8c062efe552d6dbdcc1523f.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/hardware_constants.asm | 13 | ||||
| -rw-r--r-- | constants/item_constants.asm | 7 |
2 files changed, 5 insertions, 15 deletions
diff --git a/constants/hardware_constants.asm b/constants/hardware_constants.asm index fba15087..6f6d2df8 100644 --- a/constants/hardware_constants.asm +++ b/constants/hardware_constants.asm @@ -2,19 +2,6 @@ DEF GBC EQU $11 -; memory map -DEF VRAM_Begin EQU $8000 -DEF VRAM_End EQU $a000 -DEF SRAM_Begin EQU $a000 -DEF SRAM_End EQU $c000 -DEF WRAM0_Begin EQU $c000 -DEF WRAM0_End EQU $d000 -DEF WRAM1_Begin EQU $d000 -DEF WRAM1_End EQU $e000 -; hardware registers $ff00-$ff80 (see below) -DEF HRAM_Begin EQU $ff80 -DEF HRAM_End EQU $ffff - ; MBC1 DEF MBC1SRamEnable EQU $0000 DEF MBC1RomBank EQU $2000 diff --git a/constants/item_constants.asm b/constants/item_constants.asm index e55ee89c..e99aa2a0 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -52,13 +52,13 @@ DEF SAFARI_ROCK EQU CASCADEBADGE ; overload const DOME_FOSSIL ; $29 const HELIX_FOSSIL ; $2A const SECRET_KEY ; $2B - const ITEM_2C ; $2C + const ITEM_2C ; $2C ; unused const BIKE_VOUCHER ; $2D const X_ACCURACY ; $2E const LEAF_STONE ; $2F const CARD_KEY ; $30 const NUGGET ; $31 - const ITEM_32 ; $32 + const ITEM_32 ; $32 ; unused const POKE_DOLL ; $33 const FULL_HEAL ; $34 const REVIVE ; $35 @@ -216,6 +216,9 @@ DEF NUM_TM_HM EQU NUM_TMS + NUM_HMS DEF __tmhm_value__ = NUM_TM_HM + 1 DEF UNUSED_TMNUM EQU __tmhm_value__ +DEF MAX_HIDDEN_ITEMS EQU 112 +DEF MAX_HIDDEN_COINS EQU 16 + ; used for Time Capsule held item compatibility DEF TWISTEDSPOON_GSC EQU $60 DEF LIGHT_BALL_GSC EQU $a3 |