summaryrefslogtreecommitdiff
path: root/gfx
diff options
context:
space:
mode:
Diffstat (limited to 'gfx')
-rw-r--r--gfx/sgb/blk_packets.asm22
-rw-r--r--gfx/sgb/pal_packets.asm83
-rw-r--r--gfx/sgb/predef.pal64
-rw-r--r--gfx/title/unused_gs_bg.pal (renamed from gfx/unknown/b6f1.pal)0
-rw-r--r--gfx/title/unused_gs_fg.pal (renamed from gfx/unknown/b719.pal)0
5 files changed, 105 insertions, 64 deletions
diff --git a/gfx/sgb/blk_packets.asm b/gfx/sgb/blk_packets.asm
index fd01ab3d0..4886a4854 100644
--- a/gfx/sgb/blk_packets.asm
+++ b/gfx/sgb/blk_packets.asm
@@ -19,12 +19,12 @@ BlkPacket_9a86:
attr_blk_data %011, 0,0,0, 00,00, 19,17
ds 8
-BlkPacket_9a96:
+BlkPacket_GSIntroJigglypuffPikachu:
attr_blk 1
attr_blk_data %111, 1,1,0, 00,10, 19,13
ds 8
-BlkPacket_9aa6:
+BlkPacket_Battle:
attr_blk 5
attr_blk_data %111, 2,2,0, 00,12, 19,17
attr_blk_data %011, 1,1,0, 01,00, 10,03
@@ -32,27 +32,27 @@ BlkPacket_9aa6:
attr_blk_data %011, 2,2,0, 00,04, 08,11
attr_blk_data %011, 3,3,0, 11,00, 19,07
-BlkPacket_9ac6:
+BlkPacket_StatsScreen:
attr_blk 1
attr_blk_data %111, 1,1,0, 00,01, 07,07
ds 8
-BlkPacket_9ad6:
+BlkPacket_MoveList:
attr_blk 1
attr_blk_data %111, 1,1,0, 11,01, 19,02
ds 8
-BlkPacket_9ae6:
+BlkPacket_Pokedex_PC:
attr_blk 1
attr_blk_data %111, 1,1,0, 01,01, 08,08
ds 8
-BlkPacket_9af6:
+BlkPacket_PokedexUnownMode:
attr_blk 1
attr_blk_data %111, 1,1,0, 07,05, 13,11
ds 8
-BlkPacket_9b06:
+BlkPacket_SlotMachine:
attr_blk 5
attr_blk_data %011, 1,1,0, 00,00, 19,11
attr_blk_data %011, 2,2,0, 00,04, 19,09
@@ -60,7 +60,7 @@ BlkPacket_9b06:
attr_blk_data %011, 0,0,0, 04,04, 15,09
attr_blk_data %011, 0,0,0, 00,12, 19,17
-BlkPacket_9b26:
+UnreferencedBlkPacket_9b26:
attr_blk 7
attr_blk_data %111, 0,0,1, 00,00, 02,12
attr_blk_data %010, 0,0,0, 12,00, 18,01
@@ -71,19 +71,19 @@ BlkPacket_9b26:
attr_blk_data %010, 0,0,0, 12,10, 18,11
ds 4
-BlkPacket_9b56:
+BlkPacket_GSTitleScreen:
attr_blk 3
attr_blk_data %111, 0,0,2, 00,00, 19,04
attr_blk_data %011, 3,3,0, 00,06, 19,17
attr_blk_data %011, 1,1,0, 15,01, 18,04
ds 12
-BlkPacket_9b76:
+BlkPacket_SCGB_06:
attr_blk 1
attr_blk_data %111, 0,0,1, 00,00, 19,05
ds 8
-BlkPacket_9b86:
+BlkPacket_SCGB_13:
attr_blk 2
attr_blk_data %111, 2,2,0, 00,04, 19,13
attr_blk_data %011, 1,1,0, 00,06, 19,11
diff --git a/gfx/sgb/pal_packets.asm b/gfx/sgb/pal_packets.asm
index c66ffed86..d9a4e5225 100644
--- a/gfx/sgb/pal_packets.asm
+++ b/gfx/sgb/pal_packets.asm
@@ -45,27 +45,68 @@ sgb_mask_en: MACRO
ENDM
-PalPacket_9b96: sgb_pal_set 48, 49, 4A, 4B
-PalPacket_9ba6: sgb_pal_set 2B, 24, 20, 00
-PalPacket_9bb6: sgb_pal_set 41, 42, 43, 44
-PalPacket_9bc6: sgb_pal_set 4C, 4C, 4C, 4C
-PalPacket_9bd6: sgb_pal_set 00, 00, 00, 00
-PalPacket_9be6: sgb_pal_set 36, 00, 00, 00
-PalPacket_9bf6: sgb_pal_set 37, 00, 00, 00
-PalPacket_9c06: sgb_pal_set 38, 39, 00, 00
-PalPacket_9c16: sgb_pal_set 3A, 00, 00, 00
-PalPacket_9c26: sgb_pal_set 3B, 00, 00, 00
-PalPacket_9c36: sgb_pal_set 3C, 00, 00, 00
-PalPacket_9c46: sgb_pal_set 39, 00, 00, 00
-PalPacket_9c56: sgb_pal_set 2E, 2F, 30, 31
-PalPacket_9c66: sgb_pal_set 1A, 1A, 1A, 1A
-PalPacket_9c76: sgb_pal_set 32, 00, 00, 00
-PalPacket_9c86: sgb_pal_set 3C, 00, 00, 00
-PalPacket_9c96: sgb_pal_set 3D, 3E, 3F, 40
-PalPacket_9ca6: sgb_pal_set 33, 34, 1B, 1F
-PalPacket_9cb6: sgb_pal_set 1B, 00, 00, 00
-PalPacket_9cc6: sgb_pal_set 1C, 00, 00, 00
-PalPacket_9cd6: sgb_pal_set 35, 00, 00, 00
+PalPacket_GSTitleScreen:
+ sgb_pal_set GS_TITLE_SCREEN_0, GS_TITLE_SCREEN_1, GS_TITLE_SCREEN_2, GS_TITLE_SCREEN_3
+
+PalPacket_SCGB_13:
+ sgb_pal_set 2B, BADGE, 20, 00
+
+PalPacket_SCGB_11:
+ sgb_pal_set 41, 42, 43, 44
+
+PalPacket_UnownPuzzle:
+ sgb_pal_set UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE
+
+PalPacket_9bd6:
+ sgb_pal_set 00, 00, 00, 00
+
+PalPacket_GSIntroShellderLapras:
+ sgb_pal_set GS_INTRO_SHELLDER_LAPRAS, 00, 00, 00
+
+UnreferencedPalPacket_9bf6:
+ sgb_pal_set 37, 00, 00, 00
+
+PalPacket_GSIntroJigglypuffPikachu:
+ sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_BG, GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00
+
+PalPacket_GSIntroCharizard:
+ sgb_pal_set GS_INTRO_CHARIZARD_OB, 00, 00, 00
+
+PalPacket_Function8b4d:
+ sgb_pal_set 3B, 00, 00, 00
+
+PalPacket_Pack:
+ sgb_pal_set GS_INTRO_CHARIZARD_BG, 00, 00, 00
+
+PalPacket_SCGB_0F:
+ sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00, 00
+
+PalPacket_PartyMenu:
+ sgb_pal_set PARTY_ICON, HP_GREEN, HP_YELLOW, HP_RED
+
+PalPacket_BattleGrayscale:
+ sgb_pal_set BLACKOUT, BLACKOUT, BLACKOUT, BLACKOUT
+
+PalPacket_Pokegear:
+ sgb_pal_set POKEGEAR, 00, 00, 00
+
+UnreferencedPalPacket_9c86:
+ sgb_pal_set GS_INTRO_CHARIZARD_BG, 00, 00, 00
+
+PalPacket_SlotMachine:
+ sgb_pal_set SLOT_MACHINE_0, SLOT_MACHINE_1, SLOT_MACHINE_2, SLOT_MACHINE_3
+
+PalPacket_SCGB_06:
+ sgb_pal_set 33, 34, DIPLOMA, 1F
+
+PalPacket_Diploma:
+ sgb_pal_set DIPLOMA, 00, 00, 00
+
+PalPacket_TradeTube:
+ sgb_pal_set TRADE_TUBE, 00, 00, 00
+
+PalPacket_GamefreakLogo:
+ sgb_pal_set GS_INTRO_GAMEFREAK_LOGO, 00, 00, 00
PalPacket_9ce6:
sgb_pal01
diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal
index e31ba24f8..79db349e7 100644
--- a/gfx/sgb/predef.pal
+++ b/gfx/sgb/predef.pal
@@ -1,4 +1,4 @@
-; PREDEFPAL_00 (_CGB_BattleGrayscale via PalPacket_9c66)
+; PREDEFPAL_00
RGB 31, 31, 31
RGB 22, 25, 19
RGB 16, 21, 30
@@ -128,22 +128,22 @@
RGB 12, 28, 22
RGB 15, 20, 20
RGB 00, 00, 00
-; PREDEFPAL_1A (_CGB_Evolution, _CGB_BattleGrayscale via PalPacket_9c66)
+; PREDEFPAL_BLACKOUT
RGB 31, 31, 31
RGB 07, 07, 07
RGB 02, 03, 03
RGB 00, 00, 00
-; PREDEFPAL_1B (_CGB_Diploma via PalPacket_9cb6, _CGB0d via PalPacket_9cb6)
+; PREDEFPAL_DIPLOMA
RGB 31, 31, 31
RGB 30, 22, 17
RGB 16, 14, 19
RGB 00, 00, 00
-; PREDEFPAL_1C (_CGB_TradeTube, Unreferenced_Function97cc)
+; PREDEFPAL_TRADE_TUBE
RGB 31, 31, 31
RGB 18, 20, 27
RGB 11, 15, 23
RGB 00, 00, 00
-; PREDEFPAL_1D (_CGB_Pokedex, _CGB_BillsPC, _CGB_PokedexUnownMode, _CGB_PokedexSearchOption)
+; PREDEFPAL_POKEDEX
RGB 31, 31, 31
RGB 31, 20, 10
RGB 26, 10, 06
@@ -163,7 +163,7 @@
RGB 28, 20, 15
RGB 21, 14, 09
RGB 00, 00, 00
-; PREDEFPAL_21 (Unreferenced_Function97cc)
+; PREDEFPAL_21
RGB 31, 31, 31
RGB 20, 26, 16
RGB 09, 20, 11
@@ -178,7 +178,7 @@
RGB 31, 28, 14
RGB 26, 20, 00
RGB 00, 00, 00
-; PREDEFPAL_24 (_CGB_TrainerCard, _CGB13 via PalPacket_9ba6)
+; PREDEFPAL_BADGE
RGB 31, 31, 31
RGB 26, 21, 22
RGB 15, 15, 18
@@ -213,7 +213,7 @@
RGB 20, 17, 18
RGB 18, 13, 11
RGB 00, 00, 00
-; PREDEFPAL_2B (_CGB13 via PalPacket_9ba6)
+; PREDEFPAL_2B
RGB 31, 31, 31
RGB 23, 21, 16
RGB 12, 12, 10
@@ -228,47 +228,47 @@
RGB 26, 23, 16
RGB 29, 14, 09
RGB 00, 00, 00
-; PREDEFPAL_2E (_CGB_PartyMenu via PalPacket_9c56)
+; PREDEFPAL_PARTY_ICON
RGB 31, 31, 31
RGB 18, 18, 18
RGB 10, 10, 10
RGB 00, 00, 00
-; PREDEFPAL_2F (_CGB_PartyMenu via PalPacket_9c56)
+; PREDEFPAL_HP_GREEN
RGB 31, 31, 31
RGB 30, 26, 15
RGB 00, 23, 00
RGB 00, 00, 00
-; PREDEFPAL_30
+; PREDEFPAL_HP_YELLOW
RGB 31, 31, 31
RGB 30, 26, 15
RGB 31, 23, 00
RGB 00, 00, 00
-; PREDEFPAL_31
+; PREDEFPAL_HP_RED
RGB 31, 31, 31
RGB 30, 26, 15
RGB 31, 00, 00
RGB 00, 00, 00
-; PREDEFPAL_32
+; PREDEFPAL_POKEGEAR
RGB 31, 31, 31
RGB 29, 26, 19
RGB 27, 20, 14
RGB 00, 00, 00
-; PREDEFPAL_33 (_CGB06 via PalPacket_9ca6)
+; PREDEFPAL_33
RGB 31, 31, 31
RGB 24, 20, 10
RGB 21, 00, 04
RGB 00, 00, 00
-; PREDEFPAL_34 (_CGB06 via PalPacket_9ca6)
+; PREDEFPAL_34
RGB 31, 31, 31
RGB 31, 20, 10
RGB 21, 00, 04
RGB 00, 00, 00
-; PREDEFPAL_35
+; PREDEFPAL_GS_INTRO_GAMEFREAK_LOGO
RGB 31, 31, 31
RGB 30, 26, 16
RGB 16, 12, 09
RGB 00, 00, 00
-; PREDEFPAL_36
+; PREDEFPAL_GS_INTRO_SHELLDER_LAPRAS
RGB 31, 31, 31
RGB 15, 28, 26
RGB 12, 22, 26
@@ -278,47 +278,47 @@
RGB 15, 28, 26
RGB 23, 24, 24
RGB 00, 00, 00
-; PREDEFPAL_38 (_CGB07.Function9166)
+; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG
RGB 31, 31, 24
RGB 07, 27, 19
RGB 26, 20, 10
RGB 19, 12, 08
-; PREDEFPAL_39 (_CGB07.Function9166, _CGB0f via PalPacket_9c46)
+; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB
RGB 31, 31, 31
RGB 31, 28, 14
RGB 31, 13, 31
RGB 00, 00, 00
-; PREDEFPAL_3A (_CGB07.Function9180)
+; PREDEFPAL_GS_INTRO_CHARIZARD_OB
RGB 31, 31, 31
RGB 16, 18, 21
RGB 10, 12, 18
RGB 00, 00, 00
-; PREDEFPAL_3B (Unreferenced_Function8b4d)
+; PREDEFPAL_3B
RGB 31, 31, 31
RGB 23, 21, 16
RGB 12, 12, 10
RGB 00, 00, 00
-; PREDEFPAL_3C (_CGB06, Unreferenced_Function8b67, _CGB07.Function9180 via PalPacket_9c36)
+; PREDEFPAL_GS_INTRO_CHARIZARD
RGB 31, 31, 31
RGB 31, 14, 00
RGB 07, 11, 15
RGB 00, 00, 00
-; PREDEFPAL_3D
+; PREDEFPAL_SLOT_MACHINE_0
RGB 31, 31, 31
RGB 26, 21, 22
RGB 26, 10, 06
RGB 00, 00, 00
-; PREDEFPAL_3E
+; PREDEFPAL_SLOT_MACHINE_1
RGB 31, 31, 31
RGB 30, 27, 04
RGB 24, 20, 11
RGB 00, 00, 00
-; PREDEFPAL_3F
+; PREDEFPAL_SLOT_MACHINE_2
RGB 31, 31, 31
RGB 31, 13, 25
RGB 24, 20, 11
RGB 00, 00, 00
-; PREDEFPAL_40
+; PREDEFPAL_SLOT_MACHINE_3
RGB 31, 31, 31
RGB 16, 19, 29
RGB 24, 20, 11
@@ -358,27 +358,27 @@
RGB 26, 20, 00
RGB 16, 19, 29
RGB 00, 00, 00
-; PREDEFPAL_48
+; PREDEFPAL_GS_TITLE_SCREEN_0
RGB 31, 31, 31
RGB 16, 02, 30
RGB 15, 20, 31
RGB 00, 00, 00
-; PREDEFPAL_49
+; PREDEFPAL_GS_TITLE_SCREEN_1
RGB 31, 31, 31
RGB 16, 13, 04
RGB 15, 20, 31
RGB 00, 00, 00
-; PREDEFPAL_4A
+; PREDEFPAL_GS_TITLE_SCREEN_2
RGB 31, 31, 31
RGB 28, 04, 02
RGB 15, 20, 31
RGB 00, 00, 00
-; PREDEFPAL_4B
+; PREDEFPAL_GS_TITLE_SCREEN_3
RGB 31, 31, 31
RGB 18, 23, 31
RGB 15, 20, 31
RGB 00, 00, 00
-; PREDEFPAL_4C (_CGB_UnownPuzzle)
+; PREDEFPAL_UNOWN_PUZZLE
RGB 31, 31, 31
RGB 24, 20, 11
RGB 18, 13, 11
@@ -388,7 +388,7 @@
RGB 31, 31, 31
RGB 25, 30, 00
RGB 25, 30, 00
-; PREDEFPAL_4E (_CGB_GamefreakLogo)
+; PREDEFPAL_GAMEFREAK_LOGO
RGB 00, 00, 00
RGB 08, 11, 11
RGB 21, 21, 21
diff --git a/gfx/unknown/b6f1.pal b/gfx/title/unused_gs_bg.pal
index 1dd56f50f..1dd56f50f 100644
--- a/gfx/unknown/b6f1.pal
+++ b/gfx/title/unused_gs_bg.pal
diff --git a/gfx/unknown/b719.pal b/gfx/title/unused_gs_fg.pal
index 09dd9a364..09dd9a364 100644
--- a/gfx/unknown/b719.pal
+++ b/gfx/title/unused_gs_fg.pal
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 18:54:08 +0000