diff options
| author | YamaArashi <shadow962@live.com> | 2016-01-09 19:56:37 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-01-09 19:56:37 -0800 |
| commit | 0dd5f7ab7a141698e19078653d89b704993c87ba (patch) | |
| tree | 5bc1a989e50c44996d07d568a908fb139bf855b6 | |
| parent | b609a1690d49bc7fa6016f4db8a3ee5450ad780c (diff) | |
pokedex palette numbers
| -rwxr-xr-x | constants/cgb_constants.asm | 4 | ||||
| -rw-r--r-- | engine/pokedex.asm | 6 | ||||
| -rw-r--r-- | predef/cgb.asm | 8 | ||||
| -rw-r--r-- | predef/sgb.asm | 8 |
4 files changed, 13 insertions, 13 deletions
diff --git a/constants/cgb_constants.asm b/constants/cgb_constants.asm index ac40af7a4..a0ecb5c1b 100755 --- a/constants/cgb_constants.asm +++ b/constants/cgb_constants.asm @@ -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_12 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 diff --git a/engine/pokedex.asm b/engine/pokedex.asm index bcac8491b..d297463d1 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -501,7 +501,7 @@ Pokedex_InitOptionScreen: ; 4039d (10:439d) ld [wDexArrowCursorPosIndex], a call Pokedex_DisplayModeDescription call WaitBGMap - ld a, $10 + ld a, SCGB_POKEDEX_SEARCH_OPTION call Pokedex_GetSGBLayout call Pokedex_IncrementDexPointer ret @@ -609,7 +609,7 @@ Pokedex_InitSearchScreen: ; 40443 (10:4443) ld [wDexSearchSlowpokeFrame], a callba DoDexSearchSlowpokeFrame call WaitBGMap - ld a, $10 + ld a, SCGB_POKEDEX_SEARCH_OPTION call Pokedex_GetSGBLayout call Pokedex_IncrementDexPointer ret @@ -788,7 +788,7 @@ Pokedex_InitUnownMode: ; 405bd (10:45bd) call Pokedex_UnownModePlaceCursor callba PrintUnownWord call WaitBGMap - ld a, $16 + ld a, SCGB_POKEDEX_UNOWN_MODE call Pokedex_GetSGBLayout call Pokedex_IncrementDexPointer ret diff --git a/predef/cgb.asm b/predef/cgb.asm index ef0b242d3..9554dd9c8 100644 --- a/predef/cgb.asm +++ b/predef/cgb.asm @@ -49,13 +49,13 @@ Predef_LoadSGBLayoutCGB: ; 8d59 dw _CGB0d dw _CGB0e dw _CGB0f - dw _CGB10 + dw _CGB_PokedexSearchOption dw _CGB11 dw _CGB12 dw _CGB13 dw _CGB_PackPals dw _CGB_TrainerCard - dw _CGB16 + dw _CGB_PokedexUnownMode dw _CGB17 dw _CGB18 dw _CGB19 @@ -389,7 +389,7 @@ Palette9036: ; 9036 RGB 00, 00, 00 ; 903e -_CGB16: ; 903e +_CGB_PokedexUnownMode: ; 903e ld de, UnknBGPals ld a, $1d call GetPredefPal @@ -822,7 +822,7 @@ _CGB0f: ; 93a6 ret ; 93ba -_CGB10: ; 93ba +_CGB_PokedexSearchOption: ; 93ba ld de, UnknBGPals ld a, $1d call GetPredefPal diff --git a/predef/sgb.asm b/predef/sgb.asm index 3d400bafe..c79a173ba 100644 --- a/predef/sgb.asm +++ b/predef/sgb.asm @@ -40,13 +40,13 @@ Predef_LoadSGBLayout: ; 864c dw .SGB0d dw .SGB0e dw .SGB0f - dw .SGB10 + dw .SGB_PokedexSearchOption dw .SGB11 dw .SGB12 dw .SGB13 dw .SGB_PackPals dw .SGB_TrainerCard - dw .SGB16 + dw .SGB_PokedexUnownMode dw .SGB17 dw .SGB18 dw .SGB19 @@ -266,13 +266,13 @@ endr ret ; 8823 -.SGB16: ; 8823 +.SGB_PokedexUnownMode: ; 8823 call .SGB_Pokedex ld de, BlkPacket_9af6 ret ; 882a -.SGB10: ; 882a +.SGB_PokedexSearchOption: ; 882a ld hl, PalPacket_9ce6 ld de, wSGBPals ld bc, $10 |