diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-09-22 12:44:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-22 12:44:57 -0400 |
| commit | 3d6c7a464be046d6c104c62bae35e4810a1b93ae (patch) | |
| tree | 8297d60536ec4c38c3e431697af09427a2efb7ef /engine/gfx/cgb_layouts.asm | |
| parent | 15648960606da9b1e64c2171c5398d6a5f734b4f (diff) | |
| parent | 38bf21ae35504355b5c67f911c2e003c61c015b4 (diff) | |
Merge pull request #565 from Rangi42/master
Identify some Spaceworld beta content
Diffstat (limited to 'engine/gfx/cgb_layouts.asm')
| -rw-r--r-- | engine/gfx/cgb_layouts.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index 71311f2f7..851486d49 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -36,7 +36,7 @@ LoadSGBLayoutCGB: dw _CGB_StatsScreenHPPals dw _CGB_Pokedex dw _CGB_SlotMachine - dw _CGB06 + dw _CGB_BetaTitleScreen dw _CGB_GSIntro dw _CGB_Diploma dw _CGB_MapPals @@ -47,9 +47,9 @@ LoadSGBLayoutCGB: dw _CGB_MoveList dw _CGB_BetaPikachuMinigame dw _CGB_PokedexSearchOption - dw _CGB11 + dw _CGB_BetaPoker dw _CGB_Pokepic - dw _CGB13 + dw _CGB_MagnetTrain dw _CGB_PackPals dw _CGB_TrainerCard dw _CGB_PokedexUnownMode @@ -419,8 +419,8 @@ _CGB_SlotMachine: ldh [hCGBPalUpdate], a ret -_CGB06: - ld hl, PalPacket_SCGB_06 + 1 +_CGB_BetaTitleScreen: + ld hl, PalPacket_BetaTitleScreen + 1 call CopyFourPalettes call WipeAttrMap ld de, wOBPals1 @@ -504,7 +504,7 @@ _CGB_GSIntro: call WipeAttrMap ret -_CGB11: +_CGB_BetaPoker: ld hl, BetaPokerPals ld de, wBGPals1 ld bc, 5 palettes @@ -863,8 +863,8 @@ _CGB_Pokepic: call ApplyAttrMap ret -_CGB13: - ld hl, PalPacket_SCGB_13 + 1 +_CGB_MagnetTrain: + ld hl, PalPacket_MagnetTrain + 1 call CopyFourPalettes call WipeAttrMap hlcoord 0, 4, wAttrMap |