ref: 3d6c7a464be046d6c104c62bae35e4810a1b93ae
parent: 15648960606da9b1e64c2171c5398d6a5f734b4f
parent: 38bf21ae35504355b5c67f911c2e003c61c015b4
author: Rangi <[email protected]>
date: Sat Sep 22 08:44:57 EDT 2018
Merge pull request #565 from Rangi42/master Identify some Spaceworld beta content
--- a/constants/menu_constants.asm
+++ b/constants/menu_constants.asm
@@ -93,3 +93,15 @@
const PARTYMENUTEXT_REVIVE
const PARTYMENUTEXT_LEVEL_UP
const PARTYMENUTEXT_HEAL_CONFUSION
+
+; Naming types (see engine/menus/naming_screen.asm)
+ const_def
+ const NAME_MON
+ const NAME_PLAYER
+ const NAME_RIVAL
+ const NAME_MOM
+ const NAME_BOX
+ const NAME_FRIEND
+ const NAME_6 ; duplicate of NAME_MON
+ const NAME_7 ; duplicate of NAME_MON
+NUM_NAME_TYPES EQU const_value
--- 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
--- a/engine/events/name_rater.asm
+++ b/engine/events/name_rater.asm
@@ -32,7 +32,7 @@
ld [wNamedObjectIndexBuffer], a
ld [wCurSpecies], a
call GetBaseData
- ld b, 0
+ ld b, NAME_MON
ld de, wStringBuffer2
farcall _NamingScreen
; If the new name is empty, treat it as unchanged.
--- a/engine/events/specials.asm
+++ b/engine/events/specials.asm
@@ -84,7 +84,7 @@
ret
NameRival:
- ld b, $2 ; rival
+ ld b, NAME_RIVAL
ld de, wRivalName
farcall _NamingScreen
; default to "SILVER"
--- a/engine/gfx/cgb_layouts.asm
+++ b/engine/gfx/cgb_layouts.asm
@@ -36,7 +36,7 @@
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 @@
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 @@
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 @@
call WipeAttrMap
ret
-_CGB11:
+_CGB_BetaPoker:
ld hl, BetaPokerPals
ld de, wBGPals1
ld bc, 5 palettes
@@ -863,8 +863,8 @@
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
--- a/engine/gfx/sgb_layouts.asm
+++ b/engine/gfx/sgb_layouts.asm
@@ -28,7 +28,7 @@
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 @@
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 @@
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 @@
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 @@
ld de, BlkPacket_9a86
ret
-.SGB12:
+.SGB_Pokepic:
ld hl, PalPacket_9bd6
ld de, wSGBPals
ld bc, PALPACKET_LENGTH
@@ -535,7 +535,7 @@
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 @@
ld a, PREDEFPAL_DUNGEONS
ret
-.perm5
+.env5
ld a, PREDEFPAL_VERMILION
ret
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -584,7 +584,7 @@
push de
xor a ; PARTYMON
ld [wMonType], a
- ld b, 0
+ ld b, NAME_MON
farcall NamingScreen
call RotateThreePalettesRight
@@ -637,7 +637,7 @@
ld a, BOXMON
ld [wMonType], a
ld de, wMonOrItemNameBuffer
- ld b, $0
+ ld b, NAME_MON
farcall NamingScreen
ld a, BANK(sBoxMonNicknames)
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -747,7 +747,7 @@
ret
.NewName:
- ld b, 1
+ ld b, NAME_PLAYER
ld de, wPlayerName
farcall NamingScreen
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -61,7 +61,7 @@
.GetNamingScreenSetup:
ld a, [wNamingScreenType]
- and 7
+ maskbits NUM_NAME_TYPES
ld e, a
ld d, 0
ld hl, .Jumptable
@@ -73,6 +73,7 @@
jp hl
.Jumptable:
+; entries correspond to NAME_* constants
dw .Pokemon
dw .Player
dw .Rival
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -2454,7 +2454,7 @@
ret
.Name:
- ld b, $4 ; box
+ ld b, NAME_BOX
ld de, wd002
farcall NamingScreen
call ClearTileMap
--- a/engine/pokemon/breeding.asm
+++ b/engine/pokemon/breeding.asm
@@ -330,7 +330,7 @@
xor a
ld [wMonType], a
push de
- ld b, $0
+ ld b, NAME_MON
farcall NamingScreen
pop hl
ld de, wStringBuffer1
--- a/engine/pokemon/move_mon.asm
+++ b/engine/pokemon/move_mon.asm
@@ -1809,7 +1809,7 @@
call DisableSpriteUpdates
pop de
push de
- ld b, $0
+ ld b, NAME_MON
farcall NamingScreen
pop hl
ld de, wStringBuffer1
--- a/gfx/sgb/blk_packets.asm
+++ b/gfx/sgb/blk_packets.asm
@@ -77,13 +77,13 @@
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
--- a/gfx/sgb/pal_packets.asm
+++ b/gfx/sgb/pal_packets.asm
@@ -19,7 +19,7 @@
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 @@
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:
--- a/mobile/mobile_22.asm
+++ b/mobile/mobile_22.asm
@@ -3487,7 +3487,7 @@
Function8a78c:
call Function891fe
ld de, wd002
- ld b, $5
+ ld b, NAME_FRIEND
farcall NamingScreen
call OpenSRAMBank4
call Function8931b