SGB palette roles discovered from Spaceworld beta G/S

This commit is contained in:
Rangi 2018-06-01 02:11:44 -04:00
parent a71b7a92b7
commit 4df72a8474
7 changed files with 64 additions and 64 deletions

View File

@ -15,9 +15,9 @@
const SCGB_GS_TITLE_SCREEN const SCGB_GS_TITLE_SCREEN
const SCGB_0D const SCGB_0D
const SCGB_MOVE_LIST const SCGB_MOVE_LIST
const SCGB_0F const SCGB_BETA_PIKACHU_MINIGAME
const SCGB_POKEDEX_SEARCH_OPTION const SCGB_POKEDEX_SEARCH_OPTION
const SCGB_11 const SCGB_BETA_POKER
const SCGB_POKEPIC const SCGB_POKEPIC
const SCGB_13 const SCGB_13
const SCGB_PACKPALS const SCGB_PACKPALS
@ -75,40 +75,40 @@ SCGB_RAM EQU -1
const PREDEFPAL_RB_PINKMON const PREDEFPAL_RB_PINKMON
const PREDEFPAL_RB_YELLOWMON const PREDEFPAL_RB_YELLOWMON
const PREDEFPAL_CGB_BADGE ; RB_GREYMON const PREDEFPAL_CGB_BADGE ; RB_GREYMON
const PREDEFPAL_MEWMON_NITE const PREDEFPAL_BETA_SHINY_MEWMON
const PREDEFPAL_BLUEMON_NITE const PREDEFPAL_BETA_SHINY_BLUEMON
const PREDEFPAL_REDMON_NITE const PREDEFPAL_BETA_SHINY_REDMON
const PREDEFPAL_CYANMON_NITE const PREDEFPAL_BETA_SHINY_CYANMON
const PREDEFPAL_PURPLEMON_NITE const PREDEFPAL_BETA_SHINY_PURPLEMON
const PREDEFPAL_BROWNMON_NITE const PREDEFPAL_BETA_SHINY_BROWNMON
const PREDEFPAL_GREENMON_NITE const PREDEFPAL_BETA_SHINY_GREENMON
const PREDEFPAL_PINKMON_NITE const PREDEFPAL_BETA_SHINY_PINKMON
const PREDEFPAL_YELLOWMON_NITE const PREDEFPAL_BETA_SHINY_YELLOWMON
const PREDEFPAL_PARTY_ICON ; GREYMON_NITE const PREDEFPAL_PARTY_ICON ; BETA_SHINY_GREYMON
const PREDEFPAL_HP_GREEN const PREDEFPAL_HP_GREEN
const PREDEFPAL_HP_YELLOW const PREDEFPAL_HP_YELLOW
const PREDEFPAL_HP_RED const PREDEFPAL_HP_RED
const PREDEFPAL_POKEGEAR const PREDEFPAL_POKEGEAR
const PREDEFPAL_33 const PREDEFPAL_BETA_LOGO_1
const PREDEFPAL_34 const PREDEFPAL_BETA_LOGO_2
const PREDEFPAL_GS_INTRO_GAMEFREAK_LOGO const PREDEFPAL_GS_INTRO_GAMEFREAK_LOGO
const PREDEFPAL_GS_INTRO_SHELLDER_LAPRAS const PREDEFPAL_GS_INTRO_SHELLDER_LAPRAS
const PREDEFPAL_37 const PREDEFPAL_BETA_INTRO_LAPRAS
const PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG const PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG
const PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB const PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB
const PREDEFPAL_GS_INTRO_STARTERS_TRANSITION const PREDEFPAL_GS_INTRO_STARTERS_TRANSITION
const PREDEFPAL_3B const PREDEFPAL_BETA_INTRO_VENUSAUR
const PREDEFPAL_PACK ; GS_INTRO_CHARIZARD const PREDEFPAL_PACK ; GS_INTRO_CHARIZARD
const PREDEFPAL_SLOT_MACHINE_0 const PREDEFPAL_SLOT_MACHINE_0
const PREDEFPAL_SLOT_MACHINE_1 const PREDEFPAL_SLOT_MACHINE_1
const PREDEFPAL_SLOT_MACHINE_2 const PREDEFPAL_SLOT_MACHINE_2
const PREDEFPAL_SLOT_MACHINE_3 const PREDEFPAL_SLOT_MACHINE_3
const PREDEFPAL_SCGB_11_0 const PREDEFPAL_BETA_POKER_0
const PREDEFPAL_SCGB_11_1 const PREDEFPAL_BETA_POKER_1
const PREDEFPAL_SCGB_11_2 const PREDEFPAL_BETA_POKER_2
const PREDEFPAL_SCGB_11_3 const PREDEFPAL_BETA_POKER_3
const PREDEFPAL_45 const PREDEFPAL_BETA_RADIO
const PREDEFPAL_46 const PREDEFPAL_BETA_POKEGEAR
const PREDEFPAL_47 const PREDEFPAL_47
const PREDEFPAL_GS_TITLE_SCREEN_0 const PREDEFPAL_GS_TITLE_SCREEN_0
const PREDEFPAL_GS_TITLE_SCREEN_1 const PREDEFPAL_GS_TITLE_SCREEN_1

View File

@ -48,7 +48,7 @@ LoadSGBLayoutCGB: ; 8d59
dw _CGB_GSTitleScreen dw _CGB_GSTitleScreen
dw _CGB0d dw _CGB0d
dw _CGB_MoveList dw _CGB_MoveList
dw _CGB0f dw _CGB_BetaPikachuMinigame
dw _CGB_PokedexSearchOption dw _CGB_PokedexSearchOption
dw _CGB11 dw _CGB11
dw _CGB_Pokepic dw _CGB_Pokepic
@ -532,7 +532,7 @@ _CGB_GSIntro: ; 9122
; 9195 ; 9195
_CGB11: ; 9195 _CGB11: ; 9195
ld hl, Palettes_SCGB_11 ld hl, BetaPokerPals
ld de, wBGPals1 ld de, wBGPals1
ld bc, 5 palettes ld bc, 5 palettes
ld a, BANK(wBGPals1) ld a, BANK(wBGPals1)
@ -790,8 +790,8 @@ _CGB_MoveList: ; 9373
ret ret
; 93a6 ; 93a6
_CGB0f: ; 93a6 _CGB_BetaPikachuMinigame: ; 93a6
ld hl, PalPacket_SCGB_0F + 1 ld hl, PalPacket_BetaPikachuMinigame + 1
call CopyFourPalettes call CopyFourPalettes
call WipeAttrMap call WipeAttrMap
call ApplyAttrMap call ApplyAttrMap

View File

@ -182,12 +182,12 @@ Unreferenced_Function8b4d:
ld a, [hSGB] ld a, [hSGB]
and a and a
ret z ret z
ld hl, PalPacket_Function8b4d ld hl, PalPacket_BetaIntroVenusaur
jp PushSGBPals_ jp PushSGBPals_
.cgb .cgb
ld de, wOBPals1 ld de, wOBPals1
ld a, PREDEFPAL_3B ld a, PREDEFPAL_BETA_INTRO_VENUSAUR
call GetPredefPal call GetPredefPal
jp LoadHLPaletteIntoDE jp LoadHLPaletteIntoDE
@ -1349,8 +1349,8 @@ INCLUDE "gfx/pokegear/pokegear.pal"
FemalePokegearPals: FemalePokegearPals:
INCLUDE "gfx/pokegear/pokegear_f.pal" INCLUDE "gfx/pokegear/pokegear_f.pal"
Palettes_SCGB_11: BetaPokerPals:
INCLUDE "gfx/unknown/b789.pal" INCLUDE "gfx/beta_poker/beta_poker.pal"
SlotMachinePals: SlotMachinePals:
INCLUDE "gfx/slots/slots.pal" INCLUDE "gfx/slots/slots.pal"

View File

@ -38,9 +38,9 @@ LoadSGBLayout: ; 864c
dw .SGB_GSTitleScreen dw .SGB_GSTitleScreen
dw .SGB0d dw .SGB0d
dw .SGB_MoveList dw .SGB_MoveList
dw .SGB0f dw .SGB_BetaPikachuMinigame
dw .SGB_PokedexSearchOption dw .SGB_PokedexSearchOption
dw .SGB11 dw .SGB_BetaPoker
dw .SGB12 dw .SGB12
dw .SGB13 dw .SGB13
dw .SGB_PackPals dw .SGB_PackPals
@ -346,18 +346,18 @@ endr
ret ret
; 8897 ; 8897
.SGB0f: ; 8897 .SGB_BetaPikachuMinigame: ; 8897
ld hl, PalPacket_SCGB_0F ld hl, PalPacket_BetaPikachuMinigame
ld de, BlkPacket_9a86 ld de, BlkPacket_9a86
ret ret
; 889e ; 889e
.SGB11: ; 889e .SGB_BetaPoker: ; 889e
ld hl, BlkPacket_9a86 ld hl, BlkPacket_9a86
ld de, wPlayerLightScreenCount ; ??? ld de, wPlayerLightScreenCount ; ???
ld bc, PALPACKET_LENGTH ld bc, PALPACKET_LENGTH
call CopyBytes call CopyBytes
ld hl, PalPacket_SCGB_11 ld hl, PalPacket_BetaPoker
ld de, BlkPacket_9a86 ld de, BlkPacket_9a86
ret ret
; 88b1 ; 88b1

View File

@ -21,10 +21,10 @@ PalPacket_GSTitleScreen:
sgb_pal_set GS_TITLE_SCREEN_0, GS_TITLE_SCREEN_1, GS_TITLE_SCREEN_2, GS_TITLE_SCREEN_3 sgb_pal_set GS_TITLE_SCREEN_0, GS_TITLE_SCREEN_1, GS_TITLE_SCREEN_2, GS_TITLE_SCREEN_3
PalPacket_SCGB_13: PalPacket_SCGB_13:
sgb_pal_set GREENMON_NITE, CGB_BADGE, RB_BROWNMON, 00 sgb_pal_set BETA_SHINY_GREENMON, CGB_BADGE, RB_BROWNMON, 00
PalPacket_SCGB_11: PalPacket_BetaPoker:
sgb_pal_set SCGB_11_0, SCGB_11_1, SCGB_11_2, SCGB_11_3 sgb_pal_set BETA_POKER_0, BETA_POKER_1, BETA_POKER_2, BETA_POKER_3
PalPacket_UnownPuzzle: PalPacket_UnownPuzzle:
sgb_pal_set UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE sgb_pal_set UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE
@ -35,8 +35,8 @@ PalPacket_9bd6:
PalPacket_GSIntroShellderLapras: PalPacket_GSIntroShellderLapras:
sgb_pal_set GS_INTRO_SHELLDER_LAPRAS, 00, 00, 00 sgb_pal_set GS_INTRO_SHELLDER_LAPRAS, 00, 00, 00
UnreferencedPalPacket_9bf6: UnreferencedPalPacket_BetaIntroLapras:
sgb_pal_set 37, 00, 00, 00 sgb_pal_set BETA_INTRO_LAPRAS, 00, 00, 00
PalPacket_GSIntroJigglypuffPikachu: PalPacket_GSIntroJigglypuffPikachu:
sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_BG, GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00 sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_BG, GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00
@ -44,13 +44,13 @@ PalPacket_GSIntroJigglypuffPikachu:
PalPacket_GSIntroStartersTransition: PalPacket_GSIntroStartersTransition:
sgb_pal_set GS_INTRO_STARTERS_TRANSITION, 00, 00, 00 sgb_pal_set GS_INTRO_STARTERS_TRANSITION, 00, 00, 00
PalPacket_Function8b4d: PalPacket_BetaIntroVenusaur:
sgb_pal_set 3B, 00, 00, 00 sgb_pal_set BETA_INTRO_VENUSAUR, 00, 00, 00
PalPacket_Pack: PalPacket_Pack:
sgb_pal_set PACK, 00, 00, 00 sgb_pal_set PACK, 00, 00, 00
PalPacket_SCGB_0F: PalPacket_BetaPikachuMinigame:
sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00, 00 sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00, 00
PalPacket_PartyMenu: PalPacket_PartyMenu:
@ -69,7 +69,7 @@ PalPacket_SlotMachine:
sgb_pal_set SLOT_MACHINE_0, SLOT_MACHINE_1, SLOT_MACHINE_2, SLOT_MACHINE_3 sgb_pal_set SLOT_MACHINE_0, SLOT_MACHINE_1, SLOT_MACHINE_2, SLOT_MACHINE_3
PalPacket_SCGB_06: PalPacket_SCGB_06:
sgb_pal_set 33, 34, DIPLOMA, RB_PURPLEMON sgb_pal_set BETA_LOGO_1, BETA_LOGO_2, DIPLOMA, RB_PURPLEMON
PalPacket_Diploma: PalPacket_Diploma:
sgb_pal_set DIPLOMA, 00, 00, 00 sgb_pal_set DIPLOMA, 00, 00, 00

View File

@ -35,40 +35,40 @@
RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_RB_PINKMON RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_RB_PINKMON
RGB 31,31,31, 31,28,14, 26,20,00, 00,00,00 ; PREDEFPAL_RB_YELLOWMON RGB 31,31,31, 31,28,14, 26,20,00, 00,00,00 ; PREDEFPAL_RB_YELLOWMON
RGB 31,31,31, 26,21,22, 15,15,18, 00,00,00 ; PREDEFPAL_CGB_BADGE RGB 31,31,31, 26,21,22, 15,15,18, 00,00,00 ; PREDEFPAL_CGB_BADGE
RGB 31,31,31, 23,19,13, 14,12,17, 00,00,00 ; PREDEFPAL_MEWMON_NITE RGB 31,31,31, 23,19,13, 14,12,17, 00,00,00 ; PREDEFPAL_SHINY_MEWMON
RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_BLUEMON_NITE RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_SHINY_BLUEMON
RGB 31,31,31, 22,15,16, 17,02,05, 00,00,00 ; PREDEFPAL_REDMON_NITE RGB 31,31,31, 22,15,16, 17,02,05, 00,00,00 ; PREDEFPAL_SHINY_REDMON
RGB 31,31,31, 15,20,20, 05,16,16, 00,00,00 ; PREDEFPAL_CYANMON_NITE RGB 31,31,31, 15,20,20, 05,16,16, 00,00,00 ; PREDEFPAL_SHINY_CYANMON
RGB 31,31,31, 23,15,19, 14,04,12, 00,00,00 ; PREDEFPAL_PURPLEMON_NITE RGB 31,31,31, 23,15,19, 14,04,12, 00,00,00 ; PREDEFPAL_SHINY_PURPLEMON
RGB 31,31,31, 20,17,18, 18,13,11, 00,00,00 ; PREDEFPAL_BROWNMON_NITE RGB 31,31,31, 20,17,18, 18,13,11, 00,00,00 ; PREDEFPAL_SHINY_BROWNMON
RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_GREENMON_NITE RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_SHINY_GREENMON
RGB 31,31,31, 21,25,29, 30,22,24, 00,00,00 ; PREDEFPAL_PINKMON_NITE RGB 31,31,31, 21,25,29, 30,22,24, 00,00,00 ; PREDEFPAL_SHINY_PINKMON
RGB 31,31,31, 26,23,16, 29,14,09, 00,00,00 ; PREDEFPAL_YELLOWMON_NITE RGB 31,31,31, 26,23,16, 29,14,09, 00,00,00 ; PREDEFPAL_SHINY_YELLOWMON
RGB 31,31,31, 18,18,18, 10,10,10, 00,00,00 ; PREDEFPAL_PARTY_ICON RGB 31,31,31, 18,18,18, 10,10,10, 00,00,00 ; PREDEFPAL_PARTY_ICON
RGB 31,31,31, 30,26,15, 00,23,00, 00,00,00 ; PREDEFPAL_HP_GREEN RGB 31,31,31, 30,26,15, 00,23,00, 00,00,00 ; PREDEFPAL_HP_GREEN
RGB 31,31,31, 30,26,15, 31,23,00, 00,00,00 ; PREDEFPAL_HP_YELLOW RGB 31,31,31, 30,26,15, 31,23,00, 00,00,00 ; PREDEFPAL_HP_YELLOW
RGB 31,31,31, 30,26,15, 31,00,00, 00,00,00 ; PREDEFPAL_HP_RED RGB 31,31,31, 30,26,15, 31,00,00, 00,00,00 ; PREDEFPAL_HP_RED
RGB 31,31,31, 29,26,19, 27,20,14, 00,00,00 ; PREDEFPAL_POKEGEAR RGB 31,31,31, 29,26,19, 27,20,14, 00,00,00 ; PREDEFPAL_POKEGEAR
RGB 31,31,31, 24,20,10, 21,00,04, 00,00,00 ; PREDEFPAL_33 RGB 31,31,31, 24,20,10, 21,00,04, 00,00,00 ; PREDEFPAL_BETA_LOGO_1
RGB 31,31,31, 31,20,10, 21,00,04, 00,00,00 ; PREDEFPAL_34 RGB 31,31,31, 31,20,10, 21,00,04, 00,00,00 ; PREDEFPAL_BETA_LOGO_2
RGB 31,31,31, 30,26,16, 16,12,09, 00,00,00 ; PREDEFPAL_GS_INTRO_GAMEFREAK_LOGO RGB 31,31,31, 30,26,16, 16,12,09, 00,00,00 ; PREDEFPAL_GS_INTRO_GAMEFREAK_LOGO
RGB 31,31,31, 15,28,26, 12,22,26, 03,16,14 ; PREDEFPAL_GS_INTRO_SHELLDER_LAPRAS RGB 31,31,31, 15,28,26, 12,22,26, 03,16,14 ; PREDEFPAL_GS_INTRO_SHELLDER_LAPRAS
RGB 31,31,31, 15,28,26, 23,24,24, 00,00,00 ; PREDEFPAL_37 RGB 31,31,31, 15,28,26, 23,24,24, 00,00,00 ; PREDEFPAL_BETA_INTRO_LAPRAS
RGB 31,31,24, 07,27,19, 26,20,10, 19,12,08 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG RGB 31,31,24, 07,27,19, 26,20,10, 19,12,08 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG
RGB 31,31,31, 31,28,14, 31,13,31, 00,00,00 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB RGB 31,31,31, 31,28,14, 31,13,31, 00,00,00 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB
RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_GS_INTRO_STARTERS_TRANSITION RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_GS_INTRO_STARTERS_TRANSITION
RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_3B RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_BETA_INTRO_VENUSAUR
RGB 31,31,31, 31,14,00, 07,11,15, 00,00,00 ; PREDEFPAL_PACK RGB 31,31,31, 31,14,00, 07,11,15, 00,00,00 ; PREDEFPAL_PACK
RGB 31,31,31, 26,21,22, 26,10,06, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_0 RGB 31,31,31, 26,21,22, 26,10,06, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_0
RGB 31,31,31, 30,27,04, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_1 RGB 31,31,31, 30,27,04, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_1
RGB 31,31,31, 31,13,25, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_2 RGB 31,31,31, 31,13,25, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_2
RGB 31,31,31, 16,19,29, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_3 RGB 31,31,31, 16,19,29, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_3
RGB 31,31,31, 30,22,24, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_0 RGB 31,31,31, 30,22,24, 18,18,18, 16,10,07 ; PREDEFPAL_BETA_POKER_0
RGB 31,31,31, 21,25,29, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_1 RGB 31,31,31, 21,25,29, 18,18,18, 16,10,07 ; PREDEFPAL_BETA_POKER_1
RGB 31,31,31, 20,26,16, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_2 RGB 31,31,31, 20,26,16, 18,18,18, 16,10,07 ; PREDEFPAL_BETA_POKER_2
RGB 31,31,31, 31,28,14, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_3 RGB 31,31,31, 31,28,14, 18,18,18, 16,10,07 ; PREDEFPAL_BETA_POKER_3
RGB 31,31,31, 18,18,18, 26,10,06, 00,00,00 ; PREDEFPAL_45 RGB 31,31,31, 18,18,18, 26,10,06, 00,00,00 ; PREDEFPAL_BETA_RADIO
RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_46 RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_BETA_POKEGEAR
RGB 31,31,31, 26,20,00, 16,19,29, 00,00,00 ; PREDEFPAL_47 RGB 31,31,31, 26,20,00, 16,19,29, 00,00,00 ; PREDEFPAL_47
RGB 31,31,31, 16,02,30, 15,20,31, 00,00,00 ; PREDEFPAL_GS_TITLE_SCREEN_0 RGB 31,31,31, 16,02,30, 15,20,31, 00,00,00 ; PREDEFPAL_GS_TITLE_SCREEN_0
RGB 31,31,31, 16,13,04, 15,20,31, 00,00,00 ; PREDEFPAL_GS_TITLE_SCREEN_1 RGB 31,31,31, 16,13,04, 15,20,31, 00,00,00 ; PREDEFPAL_GS_TITLE_SCREEN_1