diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2016-01-18 00:56:33 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2016-01-18 00:56:33 -0500 |
| commit | 8a45169a9dd0c9e462d02bb772b4cd029ca04801 (patch) | |
| tree | fd7e71add4a979fec66301e3d8181f33fa11a797 /constants/cgb_constants.asm | |
| parent | 8bf255b9f84f7e4f93e85a75512a002ef240a10f (diff) | |
| parent | 70f6bc8c8421df195f8c7625ab9b8c48e515282b (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'constants/cgb_constants.asm')
| -rwxr-xr-x | constants/cgb_constants.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/constants/cgb_constants.asm b/constants/cgb_constants.asm index 0f0590f3c..9363415a3 100755 --- a/constants/cgb_constants.asm +++ b/constants/cgb_constants.asm @@ -3,7 +3,7 @@ const SCGB_BATTLE_COLORS const SCGB_POKEGEAR_PALS const SCGB_STATS_SCREEN_HP_PALS - const SCGB_04 + const SCGB_POKEDEX const SCGB_SLOT_MACHINE const SCGB_06 const SCGB_07 @@ -15,13 +15,13 @@ const SCGB_0D const SCGB_0E const SCGB_0F - const SCGB_10 + const SCGB_POKEDEX_SEARCH_OPTION const SCGB_11 const SCGB_POKEPIC const SCGB_13 const SCGB_PACKPALS const SCGB_TRAINER_CARD - const SCGB_16 + const SCGB_POKEDEX_UNOWN_MODE const SCGB_17 const SCGB_18 const SCGB_19 |