diff options
| author | dannye <33dannye@gmail.com> | 2025-05-10 12:25:27 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-05-10 12:25:27 -0500 |
| commit | 2c74f137fc42cf7eaffa0a6f9046e4aa89887f91 (patch) | |
| tree | c52fc10a17597a1d04b63b79c6df78cc1b00de41 /constants | |
| parent | Fix hardcoded address in VC patch (diff) | |
| parent | Use features new to RGBDS 0.9.2 (#506) (diff) | |
| download | pokeyellow-2c74f137fc42cf7eaffa0a6f9046e4aa89887f91.tar.gz pokeyellow-2c74f137fc42cf7eaffa0a6f9046e4aa89887f91.tar.xz pokeyellow-2c74f137fc42cf7eaffa0a6f9046e4aa89887f91.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/pokemon_data_constants.asm | 4 | ||||
| -rw-r--r-- | constants/script_constants.asm | 1 | ||||
| -rw-r--r-- | constants/text_constants.asm | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 5cc2d344..e174f78d 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -98,3 +98,7 @@ DEF NUM_GROWTH_RATES EQU const_value ; wild data (see data/wild/maps/*.asm) DEF NUM_WILDMONS EQU 10 DEF WILDDATA_LENGTH EQU 1 + NUM_WILDMONS * 2 + +; PP in box_struct (see macros/ram.asm) +DEF PP_UP_MASK EQU %11000000 ; number of PP Up used +DEF PP_MASK EQU %00111111 ; currently remaining PP diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 56aee78f..fbdda05e 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -43,6 +43,7 @@ DEF NUM_NPC_TRADES EQU const_value const TRADE_DIALOGSET_CASUAL const TRADE_DIALOGSET_EVOLUTION const TRADE_DIALOGSET_HAPPY +DEF NUM_TRADE_DIALOGSETS EQU const_value ; OaksAideScript results DEF OAKS_AIDE_BAG_FULL EQU $00 diff --git a/constants/text_constants.asm b/constants/text_constants.asm index ee898803..94c07e01 100644 --- a/constants/text_constants.asm +++ b/constants/text_constants.asm @@ -2,7 +2,7 @@ DEF NAME_LENGTH EQU 11 DEF ITEM_NAME_LENGTH EQU 13 DEF NAME_BUFFER_LENGTH EQU 20 -; PrintNumber +; PrintNumber, PrintBCDNumber const_def 5 const BIT_MONEY_SIGN ; 5 const BIT_LEFT_ALIGN ; 6 |