Remaining layout constants

This commit is contained in:
pikalaxalt 2016-06-06 18:23:00 -04:00
parent 789ebc7304
commit d7a01e92e9
28 changed files with 83 additions and 77 deletions

View File

@ -8916,7 +8916,7 @@ DisplayLinkRecord: ; 3f836
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill call ByteFill
call WaitBGMap2 call WaitBGMap2
ld b, SCGB_08 ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
call SetPalettes call SetPalettes
ld c, 8 ld c, 8

View File

@ -260,7 +260,7 @@ _ShowLinkBattleParticipants: ; 2c1b2
ld [hli], a ld [hli], a
ld [hl], $6a ; "S" ld [hl], $6a ; "S"
callba LinkBattle_TrainerHuds ; no need to callba callba LinkBattle_TrainerHuds ; no need to callba
ld b, SCGB_08 ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
call SetPalettes call SetPalettes
ld a, $e4 ld a, $e4

View File

@ -7,13 +7,13 @@
const SCGB_SLOT_MACHINE const SCGB_SLOT_MACHINE
const SCGB_06 const SCGB_06
const SCGB_07 const SCGB_07
const SCGB_08 const SCGB_DIPLOMA
const SCGB_MAPPALS const SCGB_MAPPALS
const SCGB_0A const SCGB_PARTY_MENU
const SCGB_0B const SCGB_EVOLUTION
const SCGB_0C const SCGB_0C
const SCGB_0D const SCGB_0D
const SCGB_0E const SCGB_MOVE_LIST
const SCGB_0F const SCGB_0F
const SCGB_POKEDEX_SEARCH_OPTION const SCGB_POKEDEX_SEARCH_OPTION
const SCGB_11 const SCGB_11
@ -22,13 +22,13 @@
const SCGB_PACKPALS const SCGB_PACKPALS
const SCGB_TRAINER_CARD const SCGB_TRAINER_CARD
const SCGB_POKEDEX_UNOWN_MODE const SCGB_POKEDEX_UNOWN_MODE
const SCGB_17 const SCGB_BILLS_PC
const SCGB_18 const SCGB_UNOWN_PUZZLE
const SCGB_GAMEFREAK_LOGO const SCGB_GAMEFREAK_LOGO
const SCGB_PLAYER_OR_MON_FRONTPIC_PALS const SCGB_PLAYER_OR_MON_FRONTPIC_PALS
const SCGB_TRADE_TUBE const SCGB_TRADE_TUBE
const SCGB_TRAINER_OR_MON_FRONTPIC_PALS const SCGB_TRAINER_OR_MON_FRONTPIC_PALS
const SCGB_1D const SCGB_MYSTERY_GIFT
const SCGB_1E const SCGB_1E
SCGB_PARTY_MENU_HP_PALS EQU -4 SCGB_PARTY_MENU_HP_PALS EQU -4

View File

@ -64,7 +64,7 @@ _DepositPKMN: ; e2391 (38:6391)
call PCMonInfo call PCMonInfo
ld a, $ff ld a, $ff
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld a, SCGB_17 ld a, SCGB_BILLS_PC
call BillsPC_ApplyPalettes call BillsPC_ApplyPalettes
call WaitBGMap call WaitBGMap
call BillsPC_UpdateSelectionCursor call BillsPC_UpdateSelectionCursor
@ -120,7 +120,7 @@ _DepositPKMN: ; e2391 (38:6391)
call ClearSprites call ClearSprites
call BillsPC_GetSelectedPokemonSpecies call BillsPC_GetSelectedPokemonSpecies
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld a, SCGB_17 ld a, SCGB_BILLS_PC
call BillsPC_ApplyPalettes call BillsPC_ApplyPalettes
ld de, PCString_WhatsUp ld de, PCString_WhatsUp
call BillsPC_PlaceString call BillsPC_PlaceString
@ -181,7 +181,7 @@ BillsPCDepositFuncStats: ; e24c8 (38:64c8)
call PCMonInfo call PCMonInfo
call BillsPC_GetSelectedPokemonSpecies call BillsPC_GetSelectedPokemonSpecies
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld a, SCGB_17 ld a, SCGB_BILLS_PC
call BillsPC_ApplyPalettes call BillsPC_ApplyPalettes
ret ret
@ -333,7 +333,7 @@ _WithdrawPKMN: ; e2583 (38:6583)
call PCMonInfo call PCMonInfo
ld a, $ff ld a, $ff
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld a, SCGB_17 ld a, SCGB_BILLS_PC
call BillsPC_ApplyPalettes call BillsPC_ApplyPalettes
call WaitBGMap call WaitBGMap
call BillsPC_UpdateSelectionCursor call BillsPC_UpdateSelectionCursor
@ -388,7 +388,7 @@ _WithdrawPKMN: ; e2583 (38:6583)
call ClearSprites call ClearSprites
call BillsPC_GetSelectedPokemonSpecies call BillsPC_GetSelectedPokemonSpecies
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld a, SCGB_17 ld a, SCGB_BILLS_PC
call BillsPC_ApplyPalettes call BillsPC_ApplyPalettes
ld de, PCString_WhatsUp ld de, PCString_WhatsUp
call BillsPC_PlaceString call BillsPC_PlaceString
@ -447,7 +447,7 @@ BillsPC_Withdraw: ; e2675 (38:6675)
call PCMonInfo call PCMonInfo
call BillsPC_GetSelectedPokemonSpecies call BillsPC_GetSelectedPokemonSpecies
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld a, SCGB_17 ld a, SCGB_BILLS_PC
call BillsPC_ApplyPalettes call BillsPC_ApplyPalettes
ret ret
@ -584,7 +584,7 @@ _MovePKMNWithoutMail: ; e2759
call PCMonInfo call PCMonInfo
ld a, $ff ld a, $ff
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld a, SCGB_17 ld a, SCGB_BILLS_PC
call BillsPC_ApplyPalettes call BillsPC_ApplyPalettes
call WaitBGMap call WaitBGMap
call BillsPC_UpdateSelectionCursor call BillsPC_UpdateSelectionCursor
@ -650,7 +650,7 @@ _MovePKMNWithoutMail: ; e2759
call ClearSprites call ClearSprites
call BillsPC_GetSelectedPokemonSpecies call BillsPC_GetSelectedPokemonSpecies
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld a, SCGB_17 ld a, SCGB_BILLS_PC
call BillsPC_ApplyPalettes call BillsPC_ApplyPalettes
ld de, PCString_WhatsUp ld de, PCString_WhatsUp
call BillsPC_PlaceString call BillsPC_PlaceString
@ -708,7 +708,7 @@ _MovePKMNWithoutMail: ; e2759
call PCMonInfo call PCMonInfo
call BillsPC_GetSelectedPokemonSpecies call BillsPC_GetSelectedPokemonSpecies
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld a, SCGB_17 ld a, SCGB_BILLS_PC
call BillsPC_ApplyPalettes call BillsPC_ApplyPalettes
ret ret
; e28bd ; e28bd

View File

@ -786,7 +786,7 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)
Hatch_LoadFrontpicPal: ; 17363 (5:7363) Hatch_LoadFrontpicPal: ; 17363 (5:7363)
ld [PlayerHPPal], a ld [PlayerHPPal], a
ld b, SCGB_0B ld b, SCGB_EVOLUTION
ld c, $0 ld c, $0
jp GetSGBLayout jp GetSGBLayout

View File

@ -2035,7 +2035,7 @@ INCLUDE "tilesets/ob.pal"
RoofPals: RoofPals:
INCLUDE "tilesets/roof.pal" INCLUDE "tilesets/roof.pal"
Palettes_b641: DiplomaPalettes:
RGB 27, 31, 27 RGB 27, 31, 27
RGB 21, 21, 21 RGB 21, 21, 21
RGB 13, 13, 13 RGB 13, 13, 13

View File

@ -1,6 +1,6 @@
_ResetClock: ; 4d3b1 _ResetClock: ; 4d3b1
callba BlankScreen callba BlankScreen
ld b, SCGB_08 ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
call LoadStandardFont call LoadStandardFont
call LoadFontsExtra call LoadFontsExtra
@ -261,7 +261,7 @@ ClockResetPassword: ; 4d41e
_DeleteSaveData: ; 4d54c _DeleteSaveData: ; 4d54c
callba BlankScreen callba BlankScreen
ld b, SCGB_08 ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
call LoadStandardFont call LoadStandardFont
call LoadFontsExtra call LoadFontsExtra

View File

@ -31,7 +31,7 @@ PlaceDiplomaOnScreen: ; 1dd709
call PlaceString call PlaceString
call EnableLCD call EnableLCD
call WaitBGMap call WaitBGMap
ld b, SCGB_08 ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
call SetPalettes call SetPalettes
call DelayFrame call DelayFrame

View File

@ -8,7 +8,7 @@ _DummyGame: ; e1e5b (38:5e5b)
.LoadGFXAndPals: .LoadGFXAndPals:
call DisableLCD call DisableLCD
ld b, SCGB_08 ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
callab ClearSpriteAnims callab ClearSpriteAnims
ld hl, LZ_e2221 ld hl, LZ_e2221

View File

@ -153,7 +153,7 @@ EvolutionAnimation: ; 4e5e1
; 4e703 ; 4e703
.GetSGBLayout: ; 4e703 .GetSGBLayout: ; 4e703
ld b, SCGB_0B ld b, SCGB_EVOLUTION
jp GetSGBLayout jp GetSGBLayout
; 4e708 ; 4e708

View File

@ -1048,7 +1048,7 @@ StartTitleScreen: ; 6219
ld [hWX], a ld [hWX], a
ld a, $90 ld a, $90
ld [hWY], a ld [hWY], a
ld b, SCGB_08 ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
call UpdateTimePals call UpdateTimePals
ld a, [wcf64] ld a, [wcf64]

View File

@ -498,7 +498,7 @@ LinkTimeout: ; 283b2
call PlaceHLTextAtBC call PlaceHLTextAtBC
call RotateThreePalettesRight call RotateThreePalettesRight
call ClearScreen call ClearScreen
ld b, SCGB_08 ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
call WaitBGMap2 call WaitBGMap2
ret ret
@ -1597,7 +1597,7 @@ Function28ade: ; 28ade
Function28b22: ; 28b22 Function28b22: ; 28b22
call RotateThreePalettesRight call RotateThreePalettesRight
call ClearScreen call ClearScreen
ld b, SCGB_08 ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
call WaitBGMap2 call WaitBGMap2
xor a xor a
@ -1902,7 +1902,7 @@ LinkTrade: ; 28b87
call DelayFrames call DelayFrames
call ClearTileMap call ClearTileMap
call LoadFontsBattleExtra call LoadFontsBattleExtra
ld b, SCGB_08 ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
ld a, [hLinkPlayerNumber] ld a, [hLinkPlayerNumber]
cp $1 cp $1

View File

@ -25,7 +25,7 @@ Function16d43b: ; 16d43b
call ClearSprites call ClearSprites
callba __LoadTradeScreenBorder ; useless to farcall callba __LoadTradeScreenBorder ; useless to farcall
callba Function16d42e ; useless to farcall callba Function16d42e ; useless to farcall
ld b, SCGB_08 ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
call SetPalettes call SetPalettes
call WaitBGMap call WaitBGMap

View File

@ -6,7 +6,7 @@ MainMenu: ; 49cdc
xor a xor a
ld [wDisableTextAcceleration], a ld [wDisableTextAcceleration], a
call Function49ed0 call Function49ed0
ld b, SCGB_08 ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
call SetPalettes call SetPalettes
ld hl, GameTimerPause ld hl, GameTimerPause

View File

@ -27,7 +27,7 @@ DoMysteryGift: ; 1048ba (41:48ba)
call ClearTileMap call ClearTileMap
call EnableLCD call EnableLCD
call WaitBGMap call WaitBGMap
ld b, SCGB_08 ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
call SetPalettes call SetPalettes
pop de pop de
@ -1333,7 +1333,7 @@ Function105153: ; 105153 (41:5153)
ld [hl], $41 ld [hl], $41
call EnableLCD call EnableLCD
call WaitBGMap call WaitBGMap
ld b, SCGB_1D ld b, SCGB_MYSTERY_GIFT
call GetSGBLayout call GetSGBLayout
call SetPalettes call SetPalettes
ret ret
@ -1511,7 +1511,7 @@ Function105777: ; 105777 (41:5777)
call ClearTileMap call ClearTileMap
call EnableLCD call EnableLCD
call WaitBGMap call WaitBGMap
ld b, SCGB_08 ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
call SetPalettes call SetPalettes
ret ret

View File

@ -43,7 +43,7 @@ NamingScreen: ; 116c1
.SetUpNamingScreen: ; 116f8 .SetUpNamingScreen: ; 116f8
call ClearBGPalettes call ClearBGPalettes
ld b, SCGB_08 ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
call DisableLCD call DisableLCD
call LoadNamingScreenGFX call LoadNamingScreenGFX
@ -1049,7 +1049,7 @@ _ComposeMailMessage: ; 11e75 (mail?)
ld a, $e3 ld a, $e3
ld [rLCDC], a ld [rLCDC], a
call .initwNamingScreenMaxNameLength call .initwNamingScreenMaxNameLength
ld b, SCGB_08 ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
call WaitBGMap call WaitBGMap
call WaitTop call WaitTop

View File

@ -32,7 +32,7 @@ _OptionsMenu: ; e41d0
inc a inc a
ld [hBGMapMode], a ld [hBGMapMode], a
call WaitBGMap call WaitBGMap
ld b, SCGB_08 ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
call SetPalettes call SetPalettes

View File

@ -20,7 +20,7 @@ SelectTradeOrDaycareMon: ; 5001d
call ClearBGPalettes call ClearBGPalettes
call InitPartyMenuLayout call InitPartyMenuLayout
call WaitBGMap call WaitBGMap
ld b, SCGB_0A ld b, SCGB_PARTY_MENU
call GetSGBLayout call GetSGBLayout
call SetPalettes call SetPalettes
call DelayFrame call DelayFrame
@ -160,7 +160,7 @@ PlacePartyHPBar: ; 500cf
inc b inc b
dec c dec c
jr nz, .loop jr nz, .loop
ld b, SCGB_0A ld b, SCGB_PARTY_MENU
call GetSGBLayout call GetSGBLayout
ret ret
; 50117 ; 50117

View File

@ -1797,7 +1797,7 @@ SetUpMoveScreenBG: ; 13172
call PrintLevel call PrintLevel
ld hl, PlayerHPPal ld hl, PlayerHPPal
call SetHPPal call SetHPPal
ld b, SCGB_0E ld b, SCGB_MOVE_LIST
call GetSGBLayout call GetSGBLayout
hlcoord 16, 0 hlcoord 16, 0
lb bc, 1, 3 lb bc, 1, 3

View File

@ -18,7 +18,7 @@ InitClock: ; 90672 (24:4672)
call RotateFourPalettesLeft call RotateFourPalettesLeft
call ClearTileMap call ClearTileMap
call ClearSprites call ClearSprites
ld b, SCGB_08 ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a

View File

@ -47,7 +47,7 @@ UnownPuzzle: ; e1190
ld a, $93 ld a, $93
ld [rLCDC], a ld [rLCDC], a
call WaitBGMap call WaitBGMap
ld b, SCGB_18 ld b, SCGB_UNOWN_PUZZLE
call GetSGBLayout call GetSGBLayout
ld a, $e4 ld a, $e4
call DmgToCgbBGPals call DmgToCgbBGPals

View File

@ -1382,7 +1382,7 @@ UpdateBGMapColumn:: ; 27f8
; unreferenced ; unreferenced
ld hl, BGMapBuffer ld hl, BGMapBuffer
ld bc, SGBPredef - BGMapBuffer ld bc, BGMapBufferEnd - BGMapBuffer
xor a xor a
call ByteFill call ByteFill
ret ret

View File

@ -5227,7 +5227,7 @@ DisplayCaughtContestMonStats: ; cc000
ld [Options], a ld [Options], a
call WaitBGMap call WaitBGMap
ld b, SCGB_08 ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
call SetPalettes call SetPalettes
ret ret

View File

@ -258,7 +258,7 @@ Function4820d: ; 4820d (12:420d)
call Function48d30 call Function48d30
pop bc pop bc
call ClearTileMap call ClearTileMap
ld b, SCGB_08 ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
ld hl, wd479 ld hl, wd479
set 1, [hl] set 1, [hl]

View File

@ -845,7 +845,7 @@ Function4a6ab: ; 4a6ab (12:66ab)
ld a, $2 ld a, $2
call MenuClickSound call MenuClickSound
call ClearBGPalettes call ClearBGPalettes
ld b, SCGB_08 ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
callba Function11c1ab callba Function11c1ab
pop bc pop bc

View File

@ -41,13 +41,13 @@ Predef_LoadSGBLayoutCGB: ; 8d59
dw _CGB_SlotMachine dw _CGB_SlotMachine
dw _CGB06 dw _CGB06
dw _CGB07 dw _CGB07
dw _CGB08 dw _CGB_Diploma
dw _CGB_MapPals dw _CGB_MapPals
dw _CGB0a dw _CGB_PartyMenu
dw _CGB0b dw _CGB_Evolution
dw _CGB0c dw _CGB0c
dw _CGB0d dw _CGB0d
dw _CGB0e dw _CGB_MoveList
dw _CGB0f dw _CGB0f
dw _CGB_PokedexSearchOption dw _CGB_PokedexSearchOption
dw _CGB11 dw _CGB11
@ -56,13 +56,13 @@ Predef_LoadSGBLayoutCGB: ; 8d59
dw _CGB_PackPals dw _CGB_PackPals
dw _CGB_TrainerCard dw _CGB_TrainerCard
dw _CGB_PokedexUnownMode dw _CGB_PokedexUnownMode
dw _CGB17 dw _CGB_BillsPC
dw _CGB18 dw _CGB_UnownPuzzle
dw _CGB_GamefreakLogo ; called before copyright dw _CGB_GamefreakLogo ; called before copyright
dw _CGB_PlayerOrMonFrontpicPals dw _CGB_PlayerOrMonFrontpicPals
dw _CGB_TradeTube dw _CGB_TradeTube
dw _CGB_TrainerOrMonFrontpicPals dw _CGB_TrainerOrMonFrontpicPals
dw _CGB1d dw _CGB_MysteryGift
dw _CGB1e dw _CGB1e
; 8db8 ; 8db8
@ -329,7 +329,7 @@ Palette8fc2: ; 8fc2
RGB 00, 00, 00 RGB 00, 00, 00
; 8fca ; 8fca
_CGB17: ; 8fca _CGB_BillsPC: ; 8fca
ld de, UnknBGPals ld de, UnknBGPals
ld a, $1d ld a, $1d
call GetPredefPal call GetPredefPal
@ -568,8 +568,8 @@ _CGB11: ; 9195
ret ret
; 91ad ; 91ad
_CGB08: ; 91ad _CGB_Diploma: ; 91ad
ld hl, Palettes_b641 ld hl, DiplomaPalettes
ld de, UnknBGPals ld de, UnknBGPals
ld bc, 16 palettes ld bc, 16 palettes
ld a, $5 ld a, $5
@ -589,7 +589,7 @@ _CGB_MapPals: ; 91c8
ret ret
; 91d1 ; 91d1
_CGB0a: ; 91d1 _CGB_PartyMenu: ; 91d1
ld hl, PalPacket_9c56 + 1 ld hl, PalPacket_9c56 + 1
call CopyFourPalettes call CopyFourPalettes
call InitPartyMenuBGPal0 call InitPartyMenuBGPal0
@ -599,7 +599,7 @@ _CGB0a: ; 91d1
ret ret
; 91e4 ; 91e4
_CGB0b: ; 91e4 _CGB_Evolution: ; 91e4
ld de, UnknBGPals ld de, UnknBGPals
ld a, c ld a, c
and a and a
@ -645,7 +645,7 @@ _CGB0c: ; 9228
ld bc, 2 palettes ld bc, 2 palettes
ld a, $5 ld a, $5
call FarCopyWRAM call FarCopyWRAM
ld a, SCGB_08 ld a, SCGB_DIPLOMA
ld [SGBPredef], a ld [SGBPredef], a
call ApplyPals call ApplyPals
ld a, $1 ld a, $1
@ -661,7 +661,7 @@ _CGB0d: ; 9251
ret ret
; 925e ; 925e
_CGB18: ; 925e _CGB_UnownPuzzle: ; 925e
ld hl, PalPacket_9bc6 + 1 ld hl, PalPacket_9bc6 + 1
call CopyFourPalettes call CopyFourPalettes
ld de, UnknOBPals ld de, UnknOBPals
@ -786,7 +786,7 @@ _CGB_TrainerCard: ; 9289
ret ret
; 9373 ; 9373
_CGB0e: ; 9373 _CGB_MoveList: ; 9373
ld de, UnknBGPals ld de, UnknBGPals
ld a, $10 ld a, $10
call GetPredefPal call GetPredefPal
@ -1076,7 +1076,7 @@ _CGB_TrainerOrMonFrontpicPals: ; 9578
ret ret
; 9591 ; 9591
_CGB1d: ; 9591 _CGB_MysteryGift: ; 9591
ld hl, .Palettes ld hl, .Palettes
ld de, UnknBGPals ld de, UnknBGPals
ld bc, 2 palettes ld bc, 2 palettes

View File

@ -32,13 +32,13 @@ Predef_LoadSGBLayout: ; 864c
dw .SGB_SlotMachine dw .SGB_SlotMachine
dw .SGB06 dw .SGB06
dw .SGB07 dw .SGB07
dw .SGB08 dw .SGB_Diploma
dw .SGB_MapPals dw .SGB_MapPals
dw .SGB0a dw .SGB_PartyMenu
dw .SGB0b dw .SGB_Evolution
dw .SGB0c dw .SGB0c
dw .SGB0d dw .SGB0d
dw .SGB0e dw .SGB_MoveList
dw .SGB0f dw .SGB0f
dw .SGB_PokedexSearchOption dw .SGB_PokedexSearchOption
dw .SGB11 dw .SGB11
@ -47,13 +47,13 @@ Predef_LoadSGBLayout: ; 864c
dw .SGB_PackPals dw .SGB_PackPals
dw .SGB_TrainerCard dw .SGB_TrainerCard
dw .SGB_PokedexUnownMode dw .SGB_PokedexUnownMode
dw .SGB17 dw .SGB_BillsPC
dw .SGB18 dw .SGB_UnownPuzzle
dw .SGB19 dw .SGB19
dw .SGB_PlayerOrMonFrontpicPals dw .SGB_PlayerOrMonFrontpicPals
dw .SGB_TradeTube dw .SGB_TradeTube
dw .SGB_TrainerOrMonFrontpicPals dw .SGB_TrainerOrMonFrontpicPals
dw .SGB1d dw .SGB_MysteryGift
dw .SGB1e dw .SGB1e
; 86ad ; 86ad
@ -138,7 +138,7 @@ Predef_LoadSGBLayout: ; 864c
ret ret
; 873c ; 873c
.SGB0e: ; 873c .SGB_MoveList: ; 873c
ld hl, PalPacket_9bd6 ld hl, PalPacket_9bd6
ld de, wSGBPals ld de, wSGBPals
ld bc, $10 ld bc, $10
@ -199,7 +199,7 @@ Predef_LoadSGBLayout: ; 864c
ret ret
; 87ab ; 87ab
.SGB0a: ; 87ab .SGB_PartyMenu: ; 87ab
ld hl, PalPacket_9c56 ld hl, PalPacket_9c56
ld de, wSGBPals + 1 ld de, wSGBPals + 1
ret ret
@ -233,7 +233,7 @@ Predef_LoadSGBLayout: ; 864c
ret ret
; 87e9 ; 87e9
.SGB17: ; 87e9 .SGB_BillsPC: ; 87e9
ld hl, PalPacket_9ce6 ld hl, PalPacket_9ce6
ld de, wSGBPals ld de, wSGBPals
ld bc, $10 ld bc, $10
@ -304,8 +304,8 @@ Predef_LoadSGBLayout: ; 864c
ret ret
; 8860 ; 8860
.SGB08: .SGB_Diploma:
.SGB1d: ; 8860 .SGB_MysteryGift: ; 8860
ld hl, PalPacket_9cb6 ld hl, PalPacket_9cb6
ld de, BlkPacket_9a86 ld de, BlkPacket_9a86
ret ret
@ -336,7 +336,7 @@ endr
.SGB0c: ; 8884 .SGB0c: ; 8884
ld hl, PalPacket_9b96 ld hl, PalPacket_9b96
ld de, BlkPacket_9b56 ld de, BlkPacket_9b56
ld a, SCGB_08 ld a, SCGB_DIPLOMA
ld [SGBPredef], a ld [SGBPredef], a
ret ret
; 8890 ; 8890
@ -377,7 +377,7 @@ endr
ret ret
; 88cd ; 88cd
.SGB0b: ; 88cd .SGB_Evolution: ; 88cd
push bc push bc
ld hl, PalPacket_9ce6 ld hl, PalPacket_9ce6
ld de, wSGBPals ld de, wSGBPals
@ -387,11 +387,14 @@ endr
ld a, c ld a, c
and a and a
jr z, .partymon jr z, .partymon
; Egg
ld hl, wSGBPals + 3 ld hl, wSGBPals + 3
; RGB 7, 7, 7
ld [hl], $e7 ld [hl], $e7
inc hl inc hl
ld [hl], $1c ld [hl], $1c
inc hl inc hl
; RGB 2, 3, 3
ld [hl], $62 ld [hl], $62
inc hl inc hl
ld [hl], $c ld [hl], $c
@ -428,7 +431,7 @@ endr
ret ret
; 8921 ; 8921
.SGB18: ; 8921 .SGB_UnownPuzzle: ; 8921
ld hl, PalPacket_9bc6 ld hl, PalPacket_9bc6
ld de, BlkPacket_9a86 ld de, BlkPacket_9a86
ret ret

View File

@ -914,6 +914,8 @@ wGameboyPrinter2bppSource::
wGameboyPrinter2bppSourceEnd:: wGameboyPrinter2bppSourceEnd::
wca80:: ds 1 wca80:: ds 1
wPrinterRowIndex:: ds 1 wPrinterRowIndex:: ds 1
; Printer data header
wca82:: ds 1 wca82:: ds 1
wca83:: ds 1 wca83:: ds 1
wca84:: ds 1 wca84:: ds 1
@ -1243,6 +1245,7 @@ wcd8a:: ds 1
wcd8b:: ds 1 wcd8b:: ds 1
wcd8c:: ds 1 wcd8c:: ds 1
wcd8d:: ds 11 wcd8d:: ds 11
BGMapBufferEnd::
SGBPredef:: ; cd98 SGBPredef:: ; cd98
ds 1 ds 1