From 84cc9c2e3821c3309e7e4dc93f7317c39f6d3dc2 Mon Sep 17 00:00:00 2001 From: Zumi Daxuya Date: Mon, 17 May 2021 17:43:37 +0700 Subject: Identify some more SGB stuff, rework SGB layout constants --- constants/sgb_constants.asm | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) (limited to 'constants') diff --git a/constants/sgb_constants.asm b/constants/sgb_constants.asm index 31cdeb6..f18ba2c 100644 --- a/constants/sgb_constants.asm +++ b/constants/sgb_constants.asm @@ -2,35 +2,26 @@ const_def const SGB_BATTLE_GRAYSCALE const SGB_BATTLE_COLORS - const SGB_TRAINER_GEAR_PALS + const SGB_TOWN_MAP const SGB_STATS_SCREEN_HP_PALS const SGB_POKEDEX const SGB_SLOT_MACHINE - const SGB_06 + const SGB_TITLE_SCREEN const SGB_GS_INTRO const SGB_DIPLOMA - const SGB_MAPPALS + const SGB_MAP_PALS const SGB_PARTY_MENU const SGB_EVOLUTION - const SGB_GS_TITLE_SCREEN - const SGB_0D - const SGB_MOVE_LIST - const SGB_BETA_PIKACHU_MINIGAME - const SGB_POKEDEX_SEARCH_OPTION - const SGB_BETA_POKER - const SGB_POKEPIC - const SGB_TRAINER_GEAR - const SGB_PACKPALS + const SGB_GF_INTRO const SGB_TRAINER_CARD - const SGB_POKEDEX_UNOWN_MODE - const SGB_BILLS_PC - const SGB_UNOWN_PUZZLE - const SGB_GAMEFREAK_LOGO - const SGB_PLAYER_OR_MON_FRONTPIC_PALS - const SGB_TRADE_TUBE - const SGB_TRAINER_OR_MON_FRONTPIC_PALS - const SGB_MYSTERY_GIFT - const SGB_1E + const SGB_0E + const SGB_PIKACHU_MINIGAME + const SGB_POKEDEX_SELECTION + const SGB_POKER + const SGB_12 + const SGB_TRAINERGEAR + const SGB_TRAINERGEAR_MAP + const SGB_TRAINERGEAR_RADIO SGB_PARTY_MENU_HP_PALS EQU -4 SGB_RAM EQU -1 -- cgit v1.2.3 From 88b53cce31314345068ba89226ca68a22e74db4c Mon Sep 17 00:00:00 2001 From: Zumi Daxuya Date: Tue, 18 May 2021 15:01:10 +0700 Subject: label SGB layout $0E --- constants/sgb_constants.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'constants') diff --git a/constants/sgb_constants.asm b/constants/sgb_constants.asm index f18ba2c..5f4f209 100644 --- a/constants/sgb_constants.asm +++ b/constants/sgb_constants.asm @@ -14,7 +14,7 @@ const SGB_EVOLUTION const SGB_GF_INTRO const SGB_TRAINER_CARD - const SGB_0E + const SGB_MOVE_LIST const SGB_PIKACHU_MINIGAME const SGB_POKEDEX_SELECTION const SGB_POKER -- cgit v1.2.3 From eb8baca9afb7a0981b22400a067c57dd46d84a0a Mon Sep 17 00:00:00 2001 From: Zumi Daxuya Date: Tue, 18 May 2021 15:30:43 +0700 Subject: PredefPals defined as SuperPalettes --- constants/palette_constants.asm | 1 + constants/sgb_constants.asm | 83 ----------------------------------------- 2 files changed, 1 insertion(+), 83 deletions(-) (limited to 'constants') diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm index 4453f18..4d3f7d6 100755 --- a/constants/palette_constants.asm +++ b/constants/palette_constants.asm @@ -1,3 +1,4 @@ +; SuperPalettes indexes (see data/super_palettes.inc) const_def const PAL_ROUTE ; 00 const PAL_TOWN_01 ; 01 diff --git a/constants/sgb_constants.asm b/constants/sgb_constants.asm index 5f4f209..037a9f6 100644 --- a/constants/sgb_constants.asm +++ b/constants/sgb_constants.asm @@ -26,89 +26,6 @@ SGB_PARTY_MENU_HP_PALS EQU -4 SGB_RAM EQU -1 -; PredefPals indexes (see gfx/sgb/predef.pal) -; GetPredefPal arguments (see engine/gfx/color.asm) - const_def - const PREDEFPAL_00 - const PREDEFPAL_PALLET - const PREDEFPAL_VIRIDIAN - const PREDEFPAL_PEWTER - const PREDEFPAL_CERULEAN - const PREDEFPAL_LAVENDER - const PREDEFPAL_VERMILION - const PREDEFPAL_CELADON - const PREDEFPAL_FUCHSIA - const PREDEFPAL_CINNABAR - const PREDEFPAL_SAFFRON - const PREDEFPAL_INDIGO - const PREDEFPAL_NEW_BARK - const PREDEFPAL_CHERRYGROVE - const PREDEFPAL_VIOLET - const PREDEFPAL_AZALEA - const PREDEFPAL_GOLDENROD - const PREDEFPAL_ECRUTEAK - const PREDEFPAL_OLIVINE - const PREDEFPAL_CIANWOOD - const PREDEFPAL_MAHOGANY - const PREDEFPAL_BLACKTHORN - const PREDEFPAL_LAKE_OF_RAGE - const PREDEFPAL_SILVER_CAVE - const PREDEFPAL_DUNGEONS - const PREDEFPAL_NITE - const PREDEFPAL_BLACKOUT - const PREDEFPAL_DIPLOMA ; RB_MEWMON - const PREDEFPAL_TRADE_TUBE ; RB_BLUEMON - const PREDEFPAL_POKEDEX ; RB_REDMON - const PREDEFPAL_RB_CYANMON - const PREDEFPAL_RB_PURPLEMON - const PREDEFPAL_RB_BROWNMON - const PREDEFPAL_RB_GREENMON - const PREDEFPAL_RB_PINKMON - const PREDEFPAL_RB_YELLOWMON - const PREDEFPAL_CGB_BADGE ; RB_GRAYMON - const PREDEFPAL_BETA_SHINY_MEWMON - const PREDEFPAL_BETA_SHINY_BLUEMON - const PREDEFPAL_BETA_SHINY_REDMON - const PREDEFPAL_BETA_SHINY_CYANMON - const PREDEFPAL_BETA_SHINY_PURPLEMON - const PREDEFPAL_BETA_SHINY_BROWNMON - const PREDEFPAL_BETA_SHINY_GREENMON - const PREDEFPAL_BETA_SHINY_PINKMON - const PREDEFPAL_BETA_SHINY_YELLOWMON - const PREDEFPAL_PARTY_ICON ; BETA_SHINY_GRAYMON - const PREDEFPAL_HP_GREEN - const PREDEFPAL_HP_YELLOW - const PREDEFPAL_HP_RED - const PREDEFPAL_TRAINER_GEAR - const PREDEFPAL_BETA_LOGO_1 - const PREDEFPAL_BETA_LOGO_2 - const PREDEFPAL_GS_INTRO_GAMEFREAK_LOGO - const PREDEFPAL_GS_INTRO_SHELLDER_LAPRAS - const PREDEFPAL_BETA_INTRO_LAPRAS - const PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG - const PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB - const PREDEFPAL_GS_INTRO_STARTERS_TRANSITION - const PREDEFPAL_BETA_INTRO_VENUSAUR - const PREDEFPAL_PACK ; GS_INTRO_CHARIZARD - const PREDEFPAL_SLOT_MACHINE_0 - const PREDEFPAL_SLOT_MACHINE_1 - const PREDEFPAL_SLOT_MACHINE_2 - const PREDEFPAL_SLOT_MACHINE_3 - const PREDEFPAL_BETA_POKER_0 - const PREDEFPAL_BETA_POKER_1 - const PREDEFPAL_BETA_POKER_2 - const PREDEFPAL_BETA_POKER_3 - const PREDEFPAL_BETA_RADIO - const PREDEFPAL_BETA_TRAINER_GEAR - const PREDEFPAL_47 - const PREDEFPAL_GS_TITLE_SCREEN_0 - const PREDEFPAL_GS_TITLE_SCREEN_1 - const PREDEFPAL_GS_TITLE_SCREEN_2 - const PREDEFPAL_GS_TITLE_SCREEN_3 - const PREDEFPAL_UNOWN_PUZZLE - const PREDEFPAL_4D - const PREDEFPAL_GAMEFREAK_LOGO - ; SGB system command codes ; http://gbdev.gg8.se/wiki/articles/SGB_Functions#SGB_System_Command_Table const_def -- cgit v1.2.3 From 2734e4411c9f1fec63abe662ac5b1b0eef8d8ccd Mon Sep 17 00:00:00 2001 From: Zumi Daxuya Date: Tue, 18 May 2021 15:41:08 +0700 Subject: Minor documentation change --- constants/palette_constants.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'constants') diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm index 4d3f7d6..248a40c 100755 --- a/constants/palette_constants.asm +++ b/constants/palette_constants.asm @@ -1,4 +1,4 @@ -; SuperPalettes indexes (see data/super_palettes.inc) +; SuperPalettes indexes (see data/sgb/super_palettes.inc) const_def const PAL_ROUTE ; 00 const PAL_TOWN_01 ; 01 -- cgit v1.2.3 From b42d1ca1adc5c299ae7833df2ae0f15d4c68b50b Mon Sep 17 00:00:00 2001 From: Rangi <35663410+Rangi42@users.noreply.github.com> Date: Sun, 20 Jun 2021 12:31:18 -0400 Subject: Identify SGB_POKEPIC constant --- constants/sgb_constants.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'constants') diff --git a/constants/sgb_constants.asm b/constants/sgb_constants.asm index 037a9f6..dfe0d51 100644 --- a/constants/sgb_constants.asm +++ b/constants/sgb_constants.asm @@ -18,7 +18,7 @@ const SGB_PIKACHU_MINIGAME const SGB_POKEDEX_SELECTION const SGB_POKER - const SGB_12 + const SGB_POKEPIC const SGB_TRAINERGEAR const SGB_TRAINERGEAR_MAP const SGB_TRAINERGEAR_RADIO -- cgit v1.2.3