diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-04-27 03:33:13 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-04-27 03:35:35 -0400 |
| commit | 70d3a3fdbc508eeb4557ddc43d78ba12ed41963e (patch) | |
| tree | 202f65e4131709331ae62cbe5eace4d6f8b6aa58 /constants | |
| parent | 75cf425d30db6a036743cf85c483c1b537063605 (diff) | |
Sync with the recent updates to pokecrystal.
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/deco_constants.asm | 2 | ||||
| -rw-r--r-- | constants/event_flags.asm | 6 | ||||
| -rw-r--r-- | constants/item_constants.asm | 2 | ||||
| -rw-r--r-- | constants/move_constants.asm | 2 | ||||
| -rw-r--r-- | constants/pokemon_constants.asm | 4 | ||||
| -rw-r--r-- | constants/pokemon_data_constants.asm | 2 | ||||
| -rw-r--r-- | constants/script_constants.asm | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm index 22cf1e67..0d9e6e43 100644 --- a/constants/deco_constants.asm +++ b/constants/deco_constants.asm @@ -11,7 +11,7 @@ const_value = 1 const MAGNAPLANT const TROPICPLANT const JUMBOPLANT - const TOWN_MAP_D + const TOWN_MAP_POSTER const FAMICOM const SUPER_NES const NINTENDO_64 diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 77f3773f..a73f1e9b 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -699,10 +699,10 @@ const EVENT_DECO_PLANT_1 const EVENT_DECO_PLANT_2 const EVENT_DECO_PLANT_3 - const EVENT_DECO_PLANT_4 - const EVENT_DECO_POSTER_1 ; 2b0 - const EVENT_DECO_POSTER_2 + const EVENT_DECO_POSTER_1 + const EVENT_DECO_POSTER_2 ; 2b0 const EVENT_DECO_POSTER_3 + const EVENT_DECO_POSTER_4 const EVENT_DECO_FAMICOM const EVENT_DECO_SNES const EVENT_DECO_N64 diff --git a/constants/item_constants.asm b/constants/item_constants.asm index 5bdbc959..a12977d5 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -103,7 +103,7 @@ const MYSTIC_WATER ; 5f const TWISTEDSPOON ; 60 const WHT_APRICORN ; 61 - const BLACKBELT ; 62 + const BLACKBELT_I ; 62 const BLK_APRICORN ; 63 const ITEM_64 ; 64 const PNK_APRICORN ; 65 diff --git a/constants/move_constants.asm b/constants/move_constants.asm index 7fbac6bc..2f39eefc 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -253,7 +253,7 @@ const WHIRLPOOL ; $fa const BEAT_UP ; $fb -const_value SET const_value + -1 +const_value SET const_value - 1 const NUM_ATTACKS ; $fb diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index cbc12702..33494bcc 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -252,7 +252,7 @@ const_value set 1 const LUGIA const HO_OH const CELEBI -NUM_POKEMON EQU const_value + -1 +NUM_POKEMON EQU const_value - 1 const MON_FC const EGG const MON_FE @@ -292,7 +292,7 @@ NUM_POKEMON EQU const_value + -1 const UNOWN_X ; 24 const UNOWN_Y ; 25 const UNOWN_Z ; 26 -NUM_UNOWN EQU const_value + -1 ; 26 +NUM_UNOWN EQU const_value - 1 ; 26 ; pokemon structure in RAM MON_SPECIES EQUS "(wPartyMon1Species - wPartyMon1)" diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 838c8036..bff6e366 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -70,7 +70,7 @@ MONS_PER_BOX EQU 20 NUM_BOXES EQU 14 ; hall of fame -HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (MON_NAME_LENGTH + -1) ; species, id, dvs, level, nick +HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (MON_NAME_LENGTH - 1) ; species, id, dvs, level, nick HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator NUM_HOF_TEAMS = 30 diff --git a/constants/script_constants.asm b/constants/script_constants.asm index ec9e5dac..1d1e962a 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -218,7 +218,7 @@ EMOTE_FROM_MEM EQU -1 const FRUITTREE_PEWTER_CITY_1 ; 1c const FRUITTREE_PEWTER_CITY_2 ; 1d const FRUITTREE_FUCHSIA_CITY ; 1e -NUM_FRUIT_TREES EQU const_value + -1 +NUM_FRUIT_TREES EQU const_value - 1 ; describedecoration arguments ; DescribeDecoration.JumpTable indexes (see engine/overworld/decorations.asm) |