From 3f778c2de92ba3bd122101ce4a0d0bb901bd2dd2 Mon Sep 17 00:00:00 2001 From: aaaaaa123456789 Date: Sat, 28 Sep 2019 17:56:21 -0300 Subject: [PATCH] =?UTF-8?q?Remove=20dummy=20constants=20for=20dummy=20Pok?= =?UTF-8?q?=C3=A9mon=20and=20set=20EGG=20to=20-3=20instead=20of=20253=20(f?= =?UTF-8?q?or=2016-bit=20extension=20into=20$FFFD)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Also add table_width/assert_table_length to data/pokemon/pic_pointers.asm Co-Authored-By: aaaaaa123456789 --- constants/pokemon_constants.asm | 4 ++-- data/pokemon/pic_pointers.asm | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 36c4172f4..96fb8bef3 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -272,8 +272,8 @@ DEF JOHTO_POKEMON EQU const_value const HO_OH ; fa const CELEBI ; fb DEF NUM_POKEMON EQU const_value - 1 - const_skip ; fc - const EGG ; fd + +DEF EGG EQU -3 ; Unown forms ; indexes for: diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index 10db6a4ff..6a9db2237 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -1,11 +1,13 @@ ; Pics are defined in gfx/pics.asm - +: + table_width 3 * 2, :- dba EggPic ; EGG is now -3, so it must go *above* the label dbw -1, -1 ; unused dbw -1, -1 ; unused dbw -1, -1 ; unused dbw -1, -1 ; unused dbw -1, -1 ; unused + assert_table_length -EGG PokemonPicPointers:: ; entries correspond to Pokémon species, two apiece (first index is 0) table_width 3 * 2