diff options
| -rw-r--r-- | battle/core.asm | 2 | ||||
| -rwxr-xr-x | battle/trainer_huds.asm | 2 | ||||
| -rwxr-xr-x | constants/cgb_constants.asm | 14 | ||||
| -rwxr-xr-x | engine/billspc.asm | 18 | ||||
| -rwxr-xr-x | engine/breeding/egg.asm | 2 | ||||
| -rw-r--r-- | engine/color.asm | 2 | ||||
| -rwxr-xr-x | engine/delete_save_change_clock.asm | 4 | ||||
| -rw-r--r-- | engine/diploma.asm | 2 | ||||
| -rwxr-xr-x | engine/dummy_game.asm | 2 | ||||
| -rwxr-xr-x | engine/evolution_animation.asm | 2 | ||||
| -rwxr-xr-x | engine/intro_menu.asm | 2 | ||||
| -rwxr-xr-x | engine/link.asm | 6 | ||||
| -rwxr-xr-x | engine/link_trade.asm | 2 | ||||
| -rwxr-xr-x | engine/main_menu.asm | 2 | ||||
| -rwxr-xr-x | engine/mysterygift.asm | 6 | ||||
| -rwxr-xr-x | engine/namingscreen.asm | 4 | ||||
| -rwxr-xr-x | engine/options_menu.asm | 2 | ||||
| -rw-r--r-- | engine/party_menu.asm | 4 | ||||
| -rwxr-xr-x | engine/startmenu.asm | 2 | ||||
| -rwxr-xr-x | engine/timeset.asm | 2 | ||||
| -rwxr-xr-x | engine/unown_puzzle.asm | 2 | ||||
| -rw-r--r-- | home/map.asm | 2 | ||||
| -rw-r--r-- | main.asm | 2 | ||||
| -rwxr-xr-x | misc/mobile_12.asm | 2 | ||||
| -rwxr-xr-x | misc/mobile_menu.asm | 2 | ||||
| -rw-r--r-- | predef/cgb.asm | 32 | ||||
| -rw-r--r-- | predef/sgb.asm | 33 | ||||
| -rw-r--r-- | wram.asm | 3 |
28 files changed, 83 insertions, 77 deletions
diff --git a/battle/core.asm b/battle/core.asm index 888b32497..1abecba4c 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -8916,7 +8916,7 @@ DisplayLinkRecord: ; 3f836 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 diff --git a/battle/trainer_huds.asm b/battle/trainer_huds.asm index 9a72700cc..03a85b9f4 100755 --- a/battle/trainer_huds.asm +++ b/battle/trainer_huds.asm @@ -260,7 +260,7 @@ _ShowLinkBattleParticipants: ; 2c1b2 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 diff --git a/constants/cgb_constants.asm b/constants/cgb_constants.asm index b5f61ff2b..36cf369c2 100755 --- 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 diff --git a/engine/billspc.asm b/engine/billspc.asm index 322e84301..b9b51f850 100755 --- a/engine/billspc.asm +++ b/engine/billspc.asm @@ -64,7 +64,7 @@ _DepositPKMN: ; e2391 (38:6391) 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 @@ _DepositPKMN: ; e2391 (38:6391) 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 @@ BillsPCDepositFuncStats: ; e24c8 (38:64c8) 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 @@ _WithdrawPKMN: ; e2583 (38:6583) 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 @@ _WithdrawPKMN: ; e2583 (38:6583) 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 @@ BillsPC_Withdraw: ; e2675 (38:6675) 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 @@ _MovePKMNWithoutMail: ; e2759 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 @@ _MovePKMNWithoutMail: ; e2759 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 @@ _MovePKMNWithoutMail: ; e2759 call PCMonInfo call BillsPC_GetSelectedPokemonSpecies ld [CurPartySpecies], a - ld a, SCGB_17 + ld a, SCGB_BILLS_PC call BillsPC_ApplyPalettes ret ; e28bd diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm index 367fa1562..050fa69af 100755 --- a/engine/breeding/egg.asm +++ b/engine/breeding/egg.asm @@ -786,7 +786,7 @@ EggHatch_AnimationSequence: ; 1728f (5:728f) Hatch_LoadFrontpicPal: ; 17363 (5:7363) ld [PlayerHPPal], a - ld b, SCGB_0B + ld b, SCGB_EVOLUTION ld c, $0 jp GetSGBLayout diff --git a/engine/color.asm b/engine/color.asm index 1f0f30ef0..3bc431d22 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -2035,7 +2035,7 @@ INCLUDE "tilesets/ob.pal" RoofPals: INCLUDE "tilesets/roof.pal" -Palettes_b641: +DiplomaPalettes: RGB 27, 31, 27 RGB 21, 21, 21 RGB 13, 13, 13 diff --git a/engine/delete_save_change_clock.asm b/engine/delete_save_change_clock.asm index b92698b49..7a806ad01 100755 --- 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 @@ ClockResetPassword: ; 4d41e _DeleteSaveData: ; 4d54c callba BlankScreen - ld b, SCGB_08 + ld b, SCGB_DIPLOMA call GetSGBLayout call LoadStandardFont call LoadFontsExtra diff --git a/engine/diploma.asm b/engine/diploma.asm index 077fb7a8a..c446ff86b 100644 --- a/engine/diploma.asm +++ b/engine/diploma.asm @@ -31,7 +31,7 @@ PlaceDiplomaOnScreen: ; 1dd709 call PlaceString call EnableLCD call WaitBGMap - ld b, SCGB_08 + ld b, SCGB_DIPLOMA call GetSGBLayout call SetPalettes call DelayFrame diff --git a/engine/dummy_game.asm b/engine/dummy_game.asm index bb5377d8f..e5ef9b4cf 100755 --- a/engine/dummy_game.asm +++ b/engine/dummy_game.asm @@ -8,7 +8,7 @@ _DummyGame: ; e1e5b (38:5e5b) .LoadGFXAndPals: call DisableLCD - ld b, SCGB_08 + ld b, SCGB_DIPLOMA call GetSGBLayout callab ClearSpriteAnims ld hl, LZ_e2221 diff --git a/engine/evolution_animation.asm b/engine/evolution_animation.asm index d330e47c3..2f1c4c522 100755 --- a/engine/evolution_animation.asm +++ b/engine/evolution_animation.asm @@ -153,7 +153,7 @@ EvolutionAnimation: ; 4e5e1 ; 4e703 .GetSGBLayout: ; 4e703 - ld b, SCGB_0B + ld b, SCGB_EVOLUTION jp GetSGBLayout ; 4e708 diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 46d09721c..34eb67eeb 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -1048,7 +1048,7 @@ StartTitleScreen: ; 6219 ld [hWX], a ld a, $90 ld [hWY], a - ld b, SCGB_08 + ld b, SCGB_DIPLOMA call GetSGBLayout call UpdateTimePals ld a, [wcf64] diff --git a/engine/link.asm b/engine/link.asm index fc7af6680..4f20c8481 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -498,7 +498,7 @@ LinkTimeout: ; 283b2 call PlaceHLTextAtBC call RotateThreePalettesRight call ClearScreen - ld b, SCGB_08 + ld b, SCGB_DIPLOMA call GetSGBLayout call WaitBGMap2 ret @@ -1597,7 +1597,7 @@ Function28ade: ; 28ade Function28b22: ; 28b22 call RotateThreePalettesRight call ClearScreen - ld b, SCGB_08 + ld b, SCGB_DIPLOMA call GetSGBLayout call WaitBGMap2 xor a @@ -1902,7 +1902,7 @@ LinkTrade: ; 28b87 call DelayFrames call ClearTileMap call LoadFontsBattleExtra - ld b, SCGB_08 + ld b, SCGB_DIPLOMA call GetSGBLayout ld a, [hLinkPlayerNumber] cp $1 diff --git a/engine/link_trade.asm b/engine/link_trade.asm index 9ff1b0a53..96401f188 100755 --- a/engine/link_trade.asm +++ b/engine/link_trade.asm @@ -25,7 +25,7 @@ Function16d43b: ; 16d43b 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 diff --git a/engine/main_menu.asm b/engine/main_menu.asm index b00f1a875..c3b30d2d0 100755 --- a/engine/main_menu.asm +++ b/engine/main_menu.asm @@ -6,7 +6,7 @@ MainMenu: ; 49cdc xor a ld [wDisableTextAcceleration], a call Function49ed0 - ld b, SCGB_08 + ld b, SCGB_DIPLOMA call GetSGBLayout call SetPalettes ld hl, GameTimerPause diff --git a/engine/mysterygift.asm b/engine/mysterygift.asm index 5e6d317ba..a7b182624 100755 --- a/engine/mysterygift.asm +++ b/engine/mysterygift.asm @@ -27,7 +27,7 @@ DoMysteryGift: ; 1048ba (41:48ba) call ClearTileMap call EnableLCD call WaitBGMap - ld b, SCGB_08 + ld b, SCGB_DIPLOMA call GetSGBLayout call SetPalettes pop de @@ -1333,7 +1333,7 @@ Function105153: ; 105153 (41:5153) 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 @@ Function105777: ; 105777 (41:5777) call ClearTileMap call EnableLCD call WaitBGMap - ld b, SCGB_08 + ld b, SCGB_DIPLOMA call GetSGBLayout call SetPalettes ret diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm index 16a87b0c8..6da123a90 100755 --- a/engine/namingscreen.asm +++ b/engine/namingscreen.asm @@ -43,7 +43,7 @@ NamingScreen: ; 116c1 .SetUpNamingScreen: ; 116f8 call ClearBGPalettes - ld b, SCGB_08 + ld b, SCGB_DIPLOMA call GetSGBLayout call DisableLCD call LoadNamingScreenGFX @@ -1049,7 +1049,7 @@ _ComposeMailMessage: ; 11e75 (mail?) ld a, $e3 ld [rLCDC], a call .initwNamingScreenMaxNameLength - ld b, SCGB_08 + ld b, SCGB_DIPLOMA call GetSGBLayout call WaitBGMap call WaitTop diff --git a/engine/options_menu.asm b/engine/options_menu.asm index 2986cc75b..68c1883ee 100755 --- a/engine/options_menu.asm +++ b/engine/options_menu.asm @@ -32,7 +32,7 @@ _OptionsMenu: ; e41d0 inc a ld [hBGMapMode], a call WaitBGMap - ld b, SCGB_08 + ld b, SCGB_DIPLOMA call GetSGBLayout call SetPalettes diff --git a/engine/party_menu.asm b/engine/party_menu.asm index 985645a8c..266451c37 100644 --- a/engine/party_menu.asm +++ b/engine/party_menu.asm @@ -20,7 +20,7 @@ SelectTradeOrDaycareMon: ; 5001d 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 @@ PlacePartyHPBar: ; 500cf inc b dec c jr nz, .loop - ld b, SCGB_0A + ld b, SCGB_PARTY_MENU call GetSGBLayout ret ; 50117 diff --git a/engine/startmenu.asm b/engine/startmenu.asm index c0ca882bc..f03d661dd 100755 --- a/engine/startmenu.asm +++ b/engine/startmenu.asm @@ -1797,7 +1797,7 @@ SetUpMoveScreenBG: ; 13172 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 diff --git a/engine/timeset.asm b/engine/timeset.asm index 0abb7e88c..f828b0ff8 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -18,7 +18,7 @@ InitClock: ; 90672 (24:4672) call RotateFourPalettesLeft call ClearTileMap call ClearSprites - ld b, SCGB_08 + ld b, SCGB_DIPLOMA call GetSGBLayout xor a ld [hBGMapMode], a diff --git a/engine/unown_puzzle.asm b/engine/unown_puzzle.asm index 5e9ec66c0..8d46a02a6 100755 --- a/engine/unown_puzzle.asm +++ b/engine/unown_puzzle.asm @@ -47,7 +47,7 @@ UnownPuzzle: ; e1190 ld a, $93 ld [rLCDC], a call WaitBGMap - ld b, SCGB_18 + ld b, SCGB_UNOWN_PUZZLE call GetSGBLayout ld a, $e4 call DmgToCgbBGPals diff --git a/home/map.asm b/home/map.asm index 7f15afc96..967d13af5 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1382,7 +1382,7 @@ UpdateBGMapColumn:: ; 27f8 ; unreferenced ld hl, BGMapBuffer - ld bc, SGBPredef - BGMapBuffer + ld bc, BGMapBufferEnd - BGMapBuffer xor a call ByteFill ret @@ -5227,7 +5227,7 @@ DisplayCaughtContestMonStats: ; cc000 ld [Options], a call WaitBGMap - ld b, SCGB_08 + ld b, SCGB_DIPLOMA call GetSGBLayout call SetPalettes ret diff --git a/misc/mobile_12.asm b/misc/mobile_12.asm index 7aaf7fb97..69a5551a7 100755 --- a/misc/mobile_12.asm +++ b/misc/mobile_12.asm @@ -258,7 +258,7 @@ Function4820d: ; 4820d (12:420d) call Function48d30 pop bc call ClearTileMap - ld b, SCGB_08 + ld b, SCGB_DIPLOMA call GetSGBLayout ld hl, wd479 set 1, [hl] diff --git a/misc/mobile_menu.asm b/misc/mobile_menu.asm index fcea61728..84e592fcc 100755 --- a/misc/mobile_menu.asm +++ b/misc/mobile_menu.asm @@ -845,7 +845,7 @@ Function4a6ab: ; 4a6ab (12:66ab) ld a, $2 call MenuClickSound call ClearBGPalettes - ld b, SCGB_08 + ld b, SCGB_DIPLOMA call GetSGBLayout callba Function11c1ab pop bc diff --git a/predef/cgb.asm b/predef/cgb.asm index cb0547714..b0c3fdb46 100644 --- a/predef/cgb.asm +++ b/predef/cgb.asm @@ -41,13 +41,13 @@ Predef_LoadSGBLayoutCGB: ; 8d59 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 @@ Predef_LoadSGBLayoutCGB: ; 8d59 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 @@ Palette8fc2: ; 8fc2 RGB 00, 00, 00 ; 8fca -_CGB17: ; 8fca +_CGB_BillsPC: ; 8fca ld de, UnknBGPals ld a, $1d call GetPredefPal @@ -568,8 +568,8 @@ _CGB11: ; 9195 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 @@ _CGB_MapPals: ; 91c8 ret ; 91d1 -_CGB0a: ; 91d1 +_CGB_PartyMenu: ; 91d1 ld hl, PalPacket_9c56 + 1 call CopyFourPalettes call InitPartyMenuBGPal0 @@ -599,7 +599,7 @@ _CGB0a: ; 91d1 ret ; 91e4 -_CGB0b: ; 91e4 +_CGB_Evolution: ; 91e4 ld de, UnknBGPals ld a, c and a @@ -645,7 +645,7 @@ _CGB0c: ; 9228 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 @@ _CGB0d: ; 9251 ret ; 925e -_CGB18: ; 925e +_CGB_UnownPuzzle: ; 925e ld hl, PalPacket_9bc6 + 1 call CopyFourPalettes ld de, UnknOBPals @@ -786,7 +786,7 @@ _CGB_TrainerCard: ; 9289 ret ; 9373 -_CGB0e: ; 9373 +_CGB_MoveList: ; 9373 ld de, UnknBGPals ld a, $10 call GetPredefPal @@ -1076,7 +1076,7 @@ _CGB_TrainerOrMonFrontpicPals: ; 9578 ret ; 9591 -_CGB1d: ; 9591 +_CGB_MysteryGift: ; 9591 ld hl, .Palettes ld de, UnknBGPals ld bc, 2 palettes diff --git a/predef/sgb.asm b/predef/sgb.asm index ca2fe24f3..65a09756d 100644 --- a/predef/sgb.asm +++ b/predef/sgb.asm @@ -32,13 +32,13 @@ Predef_LoadSGBLayout: ; 864c 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 @@ Predef_LoadSGBLayout: ; 864c 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 @@ Predef_LoadSGBLayout: ; 864c ret ; 873c -.SGB0e: ; 873c +.SGB_MoveList: ; 873c ld hl, PalPacket_9bd6 ld de, wSGBPals ld bc, $10 @@ -199,7 +199,7 @@ Predef_LoadSGBLayout: ; 864c ret ; 87ab -.SGB0a: ; 87ab +.SGB_PartyMenu: ; 87ab ld hl, PalPacket_9c56 ld de, wSGBPals + 1 ret @@ -233,7 +233,7 @@ Predef_LoadSGBLayout: ; 864c ret ; 87e9 -.SGB17: ; 87e9 +.SGB_BillsPC: ; 87e9 ld hl, PalPacket_9ce6 ld de, wSGBPals ld bc, $10 @@ -304,8 +304,8 @@ Predef_LoadSGBLayout: ; 864c ret ; 8860 -.SGB08: -.SGB1d: ; 8860 +.SGB_Diploma: +.SGB_MysteryGift: ; 8860 ld hl, PalPacket_9cb6 ld de, BlkPacket_9a86 ret @@ -336,7 +336,7 @@ endr .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 @@ endr ret ; 88cd -.SGB0b: ; 88cd +.SGB_Evolution: ; 88cd push bc ld hl, PalPacket_9ce6 ld de, wSGBPals @@ -387,11 +387,14 @@ endr 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 @@ endr ret ; 8921 -.SGB18: ; 8921 +.SGB_UnownPuzzle: ; 8921 ld hl, PalPacket_9bc6 ld de, BlkPacket_9a86 ret @@ -914,6 +914,8 @@ wGameboyPrinter2bppSource:: wGameboyPrinter2bppSourceEnd:: wca80:: ds 1 wPrinterRowIndex:: ds 1 + +; Printer data header wca82:: ds 1 wca83:: ds 1 wca84:: ds 1 @@ -1243,6 +1245,7 @@ wcd8a:: ds 1 wcd8b:: ds 1 wcd8c:: ds 1 wcd8d:: ds 11 +BGMapBufferEnd:: SGBPredef:: ; cd98 ds 1 |