ref: d7a01e92e9b571b91b956cda873de89f4bf8f5f5
parent: 789ebc73042e07b5e50b3cc3c17ebd1df141f000
author: pikalaxalt <[email protected]>
date: Mon Jun 6 14:23:00 EDT 2016
Remaining layout constants
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -8916,7 +8916,7 @@
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
call WaitBGMap2
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
call SetPalettes
ld c, 8
--- a/battle/trainer_huds.asm
+++ b/battle/trainer_huds.asm
@@ -260,7 +260,7 @@
ld [hli], a
ld [hl], $6a ; "S"
callba LinkBattle_TrainerHuds ; no need to callba
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
call SetPalettes
ld a, $e4
--- a/constants/cgb_constants.asm
+++ b/constants/cgb_constants.asm
@@ -7,13 +7,13 @@
const SCGB_SLOT_MACHINE
const SCGB_06
const SCGB_07
- const SCGB_08
+ const SCGB_DIPLOMA
const SCGB_MAPPALS
- const SCGB_0A
- const SCGB_0B
+ const SCGB_PARTY_MENU
+ const SCGB_EVOLUTION
const SCGB_0C
const SCGB_0D
- const SCGB_0E
+ const SCGB_MOVE_LIST
const SCGB_0F
const SCGB_POKEDEX_SEARCH_OPTION
const SCGB_11
@@ -22,13 +22,13 @@
const SCGB_PACKPALS
const SCGB_TRAINER_CARD
const SCGB_POKEDEX_UNOWN_MODE
- const SCGB_17
- const SCGB_18
+ const SCGB_BILLS_PC
+ const SCGB_UNOWN_PUZZLE
const SCGB_GAMEFREAK_LOGO
const SCGB_PLAYER_OR_MON_FRONTPIC_PALS
const SCGB_TRADE_TUBE
const SCGB_TRAINER_OR_MON_FRONTPIC_PALS
- const SCGB_1D
+ const SCGB_MYSTERY_GIFT
const SCGB_1E
SCGB_PARTY_MENU_HP_PALS EQU -4
--- a/engine/billspc.asm
+++ b/engine/billspc.asm
@@ -64,7 +64,7 @@
call PCMonInfo
ld a, $ff
ld [CurPartySpecies], a
- ld a, SCGB_17
+ ld a, SCGB_BILLS_PC
call BillsPC_ApplyPalettes
call WaitBGMap
call BillsPC_UpdateSelectionCursor
@@ -120,7 +120,7 @@
call ClearSprites
call BillsPC_GetSelectedPokemonSpecies
ld [CurPartySpecies], a
- ld a, SCGB_17
+ ld a, SCGB_BILLS_PC
call BillsPC_ApplyPalettes
ld de, PCString_WhatsUp
call BillsPC_PlaceString
@@ -181,7 +181,7 @@
call PCMonInfo
call BillsPC_GetSelectedPokemonSpecies
ld [CurPartySpecies], a
- ld a, SCGB_17
+ ld a, SCGB_BILLS_PC
call BillsPC_ApplyPalettes
ret
@@ -333,7 +333,7 @@
call PCMonInfo
ld a, $ff
ld [CurPartySpecies], a
- ld a, SCGB_17
+ ld a, SCGB_BILLS_PC
call BillsPC_ApplyPalettes
call WaitBGMap
call BillsPC_UpdateSelectionCursor
@@ -388,7 +388,7 @@
call ClearSprites
call BillsPC_GetSelectedPokemonSpecies
ld [CurPartySpecies], a
- ld a, SCGB_17
+ ld a, SCGB_BILLS_PC
call BillsPC_ApplyPalettes
ld de, PCString_WhatsUp
call BillsPC_PlaceString
@@ -447,7 +447,7 @@
call PCMonInfo
call BillsPC_GetSelectedPokemonSpecies
ld [CurPartySpecies], a
- ld a, SCGB_17
+ ld a, SCGB_BILLS_PC
call BillsPC_ApplyPalettes
ret
@@ -584,7 +584,7 @@
call PCMonInfo
ld a, $ff
ld [CurPartySpecies], a
- ld a, SCGB_17
+ ld a, SCGB_BILLS_PC
call BillsPC_ApplyPalettes
call WaitBGMap
call BillsPC_UpdateSelectionCursor
@@ -650,7 +650,7 @@
call ClearSprites
call BillsPC_GetSelectedPokemonSpecies
ld [CurPartySpecies], a
- ld a, SCGB_17
+ ld a, SCGB_BILLS_PC
call BillsPC_ApplyPalettes
ld de, PCString_WhatsUp
call BillsPC_PlaceString
@@ -708,7 +708,7 @@
call PCMonInfo
call BillsPC_GetSelectedPokemonSpecies
ld [CurPartySpecies], a
- ld a, SCGB_17
+ ld a, SCGB_BILLS_PC
call BillsPC_ApplyPalettes
ret
; e28bd
--- a/engine/breeding/egg.asm
+++ b/engine/breeding/egg.asm
@@ -786,7 +786,7 @@
Hatch_LoadFrontpicPal: ; 17363 (5:7363)
ld [PlayerHPPal], a
- ld b, SCGB_0B
+ ld b, SCGB_EVOLUTION
ld c, $0
jp GetSGBLayout
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -2035,7 +2035,7 @@
RoofPals:
INCLUDE "tilesets/roof.pal"
-Palettes_b641:
+DiplomaPalettes:
RGB 27, 31, 27
RGB 21, 21, 21
RGB 13, 13, 13
--- a/engine/delete_save_change_clock.asm
+++ b/engine/delete_save_change_clock.asm
@@ -1,6 +1,6 @@
_ResetClock: ; 4d3b1
callba BlankScreen
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
call LoadStandardFont
call LoadFontsExtra
@@ -261,7 +261,7 @@
_DeleteSaveData: ; 4d54c
callba BlankScreen
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
call LoadStandardFont
call LoadFontsExtra
--- a/engine/diploma.asm
+++ b/engine/diploma.asm
@@ -31,7 +31,7 @@
call PlaceString
call EnableLCD
call WaitBGMap
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
call SetPalettes
call DelayFrame
--- a/engine/dummy_game.asm
+++ b/engine/dummy_game.asm
@@ -8,7 +8,7 @@
.LoadGFXAndPals:
call DisableLCD
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
callab ClearSpriteAnims
ld hl, LZ_e2221
--- a/engine/evolution_animation.asm
+++ b/engine/evolution_animation.asm
@@ -153,7 +153,7 @@
; 4e703
.GetSGBLayout: ; 4e703
- ld b, SCGB_0B
+ ld b, SCGB_EVOLUTION
jp GetSGBLayout
; 4e708
--- a/engine/intro_menu.asm
+++ b/engine/intro_menu.asm
@@ -1048,7 +1048,7 @@
ld [hWX], a
ld a, $90
ld [hWY], a
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
call UpdateTimePals
ld a, [wcf64]
--- a/engine/link.asm
+++ b/engine/link.asm
@@ -498,7 +498,7 @@
call PlaceHLTextAtBC
call RotateThreePalettesRight
call ClearScreen
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
call WaitBGMap2
ret
@@ -1597,7 +1597,7 @@
Function28b22: ; 28b22
call RotateThreePalettesRight
call ClearScreen
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
call WaitBGMap2
xor a
@@ -1902,7 +1902,7 @@
call DelayFrames
call ClearTileMap
call LoadFontsBattleExtra
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
ld a, [hLinkPlayerNumber]
cp $1
--- a/engine/link_trade.asm
+++ b/engine/link_trade.asm
@@ -25,7 +25,7 @@
call ClearSprites
callba __LoadTradeScreenBorder ; useless to farcall
callba Function16d42e ; useless to farcall
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
call SetPalettes
call WaitBGMap
--- a/engine/main_menu.asm
+++ b/engine/main_menu.asm
@@ -6,7 +6,7 @@
xor a
ld [wDisableTextAcceleration], a
call Function49ed0
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
call SetPalettes
ld hl, GameTimerPause
--- a/engine/mysterygift.asm
+++ b/engine/mysterygift.asm
@@ -27,7 +27,7 @@
call ClearTileMap
call EnableLCD
call WaitBGMap
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
call SetPalettes
pop de
@@ -1333,7 +1333,7 @@
ld [hl], $41
call EnableLCD
call WaitBGMap
- ld b, SCGB_1D
+ ld b, SCGB_MYSTERY_GIFT
call GetSGBLayout
call SetPalettes
ret
@@ -1511,7 +1511,7 @@
call ClearTileMap
call EnableLCD
call WaitBGMap
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
call SetPalettes
ret
--- a/engine/namingscreen.asm
+++ b/engine/namingscreen.asm
@@ -43,7 +43,7 @@
.SetUpNamingScreen: ; 116f8
call ClearBGPalettes
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
call DisableLCD
call LoadNamingScreenGFX
@@ -1049,7 +1049,7 @@
ld a, $e3
ld [rLCDC], a
call .initwNamingScreenMaxNameLength
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
call WaitBGMap
call WaitTop
--- a/engine/options_menu.asm
+++ b/engine/options_menu.asm
@@ -32,7 +32,7 @@
inc a
ld [hBGMapMode], a
call WaitBGMap
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
call SetPalettes
--- a/engine/party_menu.asm
+++ b/engine/party_menu.asm
@@ -20,7 +20,7 @@
call ClearBGPalettes
call InitPartyMenuLayout
call WaitBGMap
- ld b, SCGB_0A
+ ld b, SCGB_PARTY_MENU
call GetSGBLayout
call SetPalettes
call DelayFrame
@@ -160,7 +160,7 @@
inc b
dec c
jr nz, .loop
- ld b, SCGB_0A
+ ld b, SCGB_PARTY_MENU
call GetSGBLayout
ret
; 50117
--- a/engine/startmenu.asm
+++ b/engine/startmenu.asm
@@ -1797,7 +1797,7 @@
call PrintLevel
ld hl, PlayerHPPal
call SetHPPal
- ld b, SCGB_0E
+ ld b, SCGB_MOVE_LIST
call GetSGBLayout
hlcoord 16, 0
lb bc, 1, 3
--- a/engine/timeset.asm
+++ b/engine/timeset.asm
@@ -18,7 +18,7 @@
call RotateFourPalettesLeft
call ClearTileMap
call ClearSprites
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
xor a
ld [hBGMapMode], a
--- a/engine/unown_puzzle.asm
+++ b/engine/unown_puzzle.asm
@@ -47,7 +47,7 @@
ld a, $93
ld [rLCDC], a
call WaitBGMap
- ld b, SCGB_18
+ ld b, SCGB_UNOWN_PUZZLE
call GetSGBLayout
ld a, $e4
call DmgToCgbBGPals
--- a/home/map.asm
+++ b/home/map.asm
@@ -1382,7 +1382,7 @@
; unreferenced
ld hl, BGMapBuffer
- ld bc, SGBPredef - BGMapBuffer
+ ld bc, BGMapBufferEnd - BGMapBuffer
xor a
call ByteFill
ret
--- a/main.asm
+++ b/main.asm
@@ -5227,7 +5227,7 @@
ld [Options], a
call WaitBGMap
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
call SetPalettes
ret
--- a/misc/mobile_12.asm
+++ b/misc/mobile_12.asm
@@ -258,7 +258,7 @@
call Function48d30
pop bc
call ClearTileMap
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
ld hl, wd479
set 1, [hl]
--- a/misc/mobile_menu.asm
+++ b/misc/mobile_menu.asm
@@ -845,7 +845,7 @@
ld a, $2
call MenuClickSound
call ClearBGPalettes
- ld b, SCGB_08
+ ld b, SCGB_DIPLOMA
call GetSGBLayout
callba Function11c1ab
pop bc
--- a/predef/cgb.asm
+++ b/predef/cgb.asm
@@ -41,13 +41,13 @@
dw _CGB_SlotMachine
dw _CGB06
dw _CGB07
- dw _CGB08
+ dw _CGB_Diploma
dw _CGB_MapPals
- dw _CGB0a
- dw _CGB0b
+ dw _CGB_PartyMenu
+ dw _CGB_Evolution
dw _CGB0c
dw _CGB0d
- dw _CGB0e
+ dw _CGB_MoveList
dw _CGB0f
dw _CGB_PokedexSearchOption
dw _CGB11
@@ -56,13 +56,13 @@
dw _CGB_PackPals
dw _CGB_TrainerCard
dw _CGB_PokedexUnownMode
- dw _CGB17
- dw _CGB18
+ dw _CGB_BillsPC
+ dw _CGB_UnownPuzzle
dw _CGB_GamefreakLogo ; called before copyright
dw _CGB_PlayerOrMonFrontpicPals
dw _CGB_TradeTube
dw _CGB_TrainerOrMonFrontpicPals
- dw _CGB1d
+ dw _CGB_MysteryGift
dw _CGB1e
; 8db8
@@ -329,7 +329,7 @@
RGB 00, 00, 00
; 8fca
-_CGB17: ; 8fca
+_CGB_BillsPC: ; 8fca
ld de, UnknBGPals
ld a, $1d
call GetPredefPal
@@ -568,8 +568,8 @@
ret
; 91ad
-_CGB08: ; 91ad
- ld hl, Palettes_b641
+_CGB_Diploma: ; 91ad
+ ld hl, DiplomaPalettes
ld de, UnknBGPals
ld bc, 16 palettes
ld a, $5
@@ -589,7 +589,7 @@
ret
; 91d1
-_CGB0a: ; 91d1
+_CGB_PartyMenu: ; 91d1
ld hl, PalPacket_9c56 + 1
call CopyFourPalettes
call InitPartyMenuBGPal0
@@ -599,7 +599,7 @@
ret
; 91e4
-_CGB0b: ; 91e4
+_CGB_Evolution: ; 91e4
ld de, UnknBGPals
ld a, c
and a
@@ -645,7 +645,7 @@
ld bc, 2 palettes
ld a, $5
call FarCopyWRAM
- ld a, SCGB_08
+ ld a, SCGB_DIPLOMA
ld [SGBPredef], a
call ApplyPals
ld a, $1
@@ -661,7 +661,7 @@
ret
; 925e
-_CGB18: ; 925e
+_CGB_UnownPuzzle: ; 925e
ld hl, PalPacket_9bc6 + 1
call CopyFourPalettes
ld de, UnknOBPals
@@ -786,7 +786,7 @@
ret
; 9373
-_CGB0e: ; 9373
+_CGB_MoveList: ; 9373
ld de, UnknBGPals
ld a, $10
call GetPredefPal
@@ -1076,7 +1076,7 @@
ret
; 9591
-_CGB1d: ; 9591
+_CGB_MysteryGift: ; 9591
ld hl, .Palettes
ld de, UnknBGPals
ld bc, 2 palettes
--- a/predef/sgb.asm
+++ b/predef/sgb.asm
@@ -32,13 +32,13 @@
dw .SGB_SlotMachine
dw .SGB06
dw .SGB07
- dw .SGB08
+ dw .SGB_Diploma
dw .SGB_MapPals
- dw .SGB0a
- dw .SGB0b
+ dw .SGB_PartyMenu
+ dw .SGB_Evolution
dw .SGB0c
dw .SGB0d
- dw .SGB0e
+ dw .SGB_MoveList
dw .SGB0f
dw .SGB_PokedexSearchOption
dw .SGB11
@@ -47,13 +47,13 @@
dw .SGB_PackPals
dw .SGB_TrainerCard
dw .SGB_PokedexUnownMode
- dw .SGB17
- dw .SGB18
+ dw .SGB_BillsPC
+ dw .SGB_UnownPuzzle
dw .SGB19
dw .SGB_PlayerOrMonFrontpicPals
dw .SGB_TradeTube
dw .SGB_TrainerOrMonFrontpicPals
- dw .SGB1d
+ dw .SGB_MysteryGift
dw .SGB1e
; 86ad
@@ -138,7 +138,7 @@
ret
; 873c
-.SGB0e: ; 873c
+.SGB_MoveList: ; 873c
ld hl, PalPacket_9bd6
ld de, wSGBPals
ld bc, $10
@@ -199,7 +199,7 @@
ret
; 87ab
-.SGB0a: ; 87ab
+.SGB_PartyMenu: ; 87ab
ld hl, PalPacket_9c56
ld de, wSGBPals + 1
ret
@@ -233,7 +233,7 @@
ret
; 87e9
-.SGB17: ; 87e9
+.SGB_BillsPC: ; 87e9
ld hl, PalPacket_9ce6
ld de, wSGBPals
ld bc, $10
@@ -304,8 +304,8 @@
ret
; 8860
-.SGB08:
-.SGB1d: ; 8860
+.SGB_Diploma:
+.SGB_MysteryGift: ; 8860
ld hl, PalPacket_9cb6
ld de, BlkPacket_9a86
ret
@@ -336,7 +336,7 @@
.SGB0c: ; 8884
ld hl, PalPacket_9b96
ld de, BlkPacket_9b56
- ld a, SCGB_08
+ ld a, SCGB_DIPLOMA
ld [SGBPredef], a
ret
; 8890
@@ -377,7 +377,7 @@
ret
; 88cd
-.SGB0b: ; 88cd
+.SGB_Evolution: ; 88cd
push bc
ld hl, PalPacket_9ce6
ld de, wSGBPals
@@ -387,11 +387,14 @@
ld a, c
and a
jr z, .partymon
+ ; Egg
ld hl, wSGBPals + 3
+ ; RGB 7, 7, 7
ld [hl], $e7
inc hl
ld [hl], $1c
inc hl
+ ; RGB 2, 3, 3
ld [hl], $62
inc hl
ld [hl], $c
@@ -428,7 +431,7 @@
ret
; 8921
-.SGB18: ; 8921
+.SGB_UnownPuzzle: ; 8921
ld hl, PalPacket_9bc6
ld de, BlkPacket_9a86
ret
--- a/wram.asm
+++ b/wram.asm
@@ -914,6 +914,8 @@
wGameboyPrinter2bppSourceEnd::
wca80:: ds 1
wPrinterRowIndex:: ds 1
+
+; Printer data header
wca82:: ds 1
wca83:: ds 1
wca84:: ds 1
@@ -1243,6 +1245,7 @@
wcd8b:: ds 1
wcd8c:: ds 1
wcd8d:: ds 11
+BGMapBufferEnd::
SGBPredef:: ; cd98
ds 1