From 03cb8c53f1507091f09a17235416904d5ed29a49 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 16 Sep 2018 13:40:47 -0400 Subject: [PATCH] Identify some Spaceworld beta content --- constants/scgb_constants.asm | 4 ++-- engine/gfx/cgb_layouts.asm | 16 ++++++++-------- engine/gfx/sgb_layouts.asm | 24 ++++++++++++------------ gfx/sgb/blk_packets.asm | 10 +++++----- gfx/sgb/pal_packets.asm | 4 ++-- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/constants/scgb_constants.asm b/constants/scgb_constants.asm index 807b5003c..e60ed9795 100644 --- a/constants/scgb_constants.asm +++ b/constants/scgb_constants.asm @@ -6,7 +6,7 @@ const SCGB_STATS_SCREEN_HP_PALS const SCGB_POKEDEX const SCGB_SLOT_MACHINE - const SCGB_06 + const SCGB_BETA_TITLE_SCREEN const SCGB_GS_INTRO const SCGB_DIPLOMA const SCGB_MAPPALS @@ -19,7 +19,7 @@ const SCGB_POKEDEX_SEARCH_OPTION const SCGB_BETA_POKER const SCGB_POKEPIC - const SCGB_13 + const SCGB_MAGNET_TRAIN const SCGB_PACKPALS const SCGB_TRAINER_CARD const SCGB_POKEDEX_UNOWN_MODE 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 diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm index 7279f9a32..a0727c939 100644 --- a/engine/gfx/sgb_layouts.asm +++ b/engine/gfx/sgb_layouts.asm @@ -28,7 +28,7 @@ LoadSGBLayout: dw .SGB_StatsScreenHPPals dw .SGB_Pokedex dw .SGB_SlotMachine - dw .SGB06 + dw .SGB_BetaTitleScreen dw .SGB_GSIntro dw .SGB_Diploma dw .SGB_MapPals @@ -40,8 +40,8 @@ LoadSGBLayout: dw .SGB_BetaPikachuMinigame dw .SGB_PokedexSearchOption dw .SGB_BetaPoker - dw .SGB12 - dw .SGB13 + dw .SGB_Pokepic + dw .SGB_MagnetTrain dw .SGB_PackPals dw .SGB_TrainerCard dw .SGB_PokedexUnownMode @@ -283,9 +283,9 @@ LoadSGBLayout: ld de, BlkPacket_SlotMachine ret -.SGB06: - ld hl, PalPacket_SCGB_06 - ld de, BlkPacket_SCGB_06 +.SGB_BetaTitleScreen: + ld hl, PalPacket_BetaTitleScreen + ld de, BlkPacket_BetaTitleScreen ret .SGB_Diploma: @@ -321,9 +321,9 @@ endr ld [wSGBPredef], a ret -.SGB13: - ld hl, PalPacket_SCGB_13 - ld de, BlkPacket_SCGB_13 +.SGB_MagnetTrain: + ld hl, PalPacket_MagnetTrain + ld de, BlkPacket_MagnetTrain ret .SGB_BetaPikachuMinigame: @@ -408,7 +408,7 @@ endr ld de, BlkPacket_9a86 ret -.SGB12: +.SGB_Pokepic: ld hl, PalPacket_9bd6 ld de, wSGBPals ld bc, PALPACKET_LENGTH @@ -535,7 +535,7 @@ endr cp DUNGEON jr z, .cave cp ENVIRONMENT_5 - jr z, .perm5 + jr z, .env5 cp GATE jr z, .gate ld a, [wMapGroup] @@ -554,7 +554,7 @@ endr ld a, PREDEFPAL_DUNGEONS ret -.perm5 +.env5 ld a, PREDEFPAL_VERMILION ret diff --git a/gfx/sgb/blk_packets.asm b/gfx/sgb/blk_packets.asm index 92c6cb437..9c4bcb6ed 100644 --- a/gfx/sgb/blk_packets.asm +++ b/gfx/sgb/blk_packets.asm @@ -77,13 +77,13 @@ BlkPacket_GSTitleScreen: attr_blk_data %011, 1,1,0, 15,01, 18,04 ds 12 -BlkPacket_SCGB_06: +BlkPacket_BetaTitleScreen: attr_blk 1 - attr_blk_data %111, 0,0,1, 00,00, 19,05 + attr_blk_data %111, 0,0,1, 00,00, 19,05 ; logo ds 8 -BlkPacket_SCGB_13: +BlkPacket_MagnetTrain: attr_blk 2 - attr_blk_data %111, 2,2,0, 00,04, 19,13 - attr_blk_data %011, 1,1,0, 00,06, 19,11 + attr_blk_data %111, 2,2,0, 00,04, 19,13 ; fence + attr_blk_data %011, 1,1,0, 00,06, 19,11 ; train ds 2 diff --git a/gfx/sgb/pal_packets.asm b/gfx/sgb/pal_packets.asm index 1d5ae7e5e..b88bea526 100644 --- a/gfx/sgb/pal_packets.asm +++ b/gfx/sgb/pal_packets.asm @@ -19,7 +19,7 @@ ENDM PalPacket_GSTitleScreen: sgb_pal_set GS_TITLE_SCREEN_0, GS_TITLE_SCREEN_1, GS_TITLE_SCREEN_2, GS_TITLE_SCREEN_3 -PalPacket_SCGB_13: +PalPacket_MagnetTrain: sgb_pal_set BETA_SHINY_GREENMON, CGB_BADGE, RB_BROWNMON, 00 PalPacket_BetaPoker: @@ -67,7 +67,7 @@ UnreferencedPalPacket_9c86: PalPacket_SlotMachine: sgb_pal_set SLOT_MACHINE_0, SLOT_MACHINE_1, SLOT_MACHINE_2, SLOT_MACHINE_3 -PalPacket_SCGB_06: +PalPacket_BetaTitleScreen: sgb_pal_set BETA_LOGO_1, BETA_LOGO_2, DIPLOMA, RB_PURPLEMON PalPacket_Diploma: