diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/events/name_rater.asm | 2 | ||||
| -rw-r--r-- | engine/events/specials.asm | 2 | ||||
| -rw-r--r-- | engine/gfx/cgb_layouts.asm | 16 | ||||
| -rw-r--r-- | engine/gfx/sgb_layouts.asm | 24 | ||||
| -rw-r--r-- | engine/items/item_effects.asm | 4 | ||||
| -rw-r--r-- | engine/menus/intro_menu.asm | 2 | ||||
| -rw-r--r-- | engine/menus/naming_screen.asm | 3 | ||||
| -rw-r--r-- | engine/pokemon/bills_pc.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/breeding.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/move_mon.asm | 2 |
10 files changed, 30 insertions, 29 deletions
diff --git a/engine/events/name_rater.asm b/engine/events/name_rater.asm index 2cdff4bdd..1ec75db17 100644 --- a/engine/events/name_rater.asm +++ b/engine/events/name_rater.asm @@ -32,7 +32,7 @@ _NameRater: 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. diff --git a/engine/events/specials.asm b/engine/events/specials.asm index 07577232a..c030eaf11 100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -84,7 +84,7 @@ FoundNone: ret NameRival: - ld b, $2 ; rival + ld b, NAME_RIVAL ld de, wRivalName farcall _NamingScreen ; default to "SILVER" 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/engine/items/item_effects.asm b/engine/items/item_effects.asm index caa7d42a9..cdc22a019 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -584,7 +584,7 @@ PokeBallEffect: push de xor a ; PARTYMON ld [wMonType], a - ld b, 0 + ld b, NAME_MON farcall NamingScreen call RotateThreePalettesRight @@ -637,7 +637,7 @@ PokeBallEffect: ld a, BOXMON ld [wMonType], a ld de, wMonOrItemNameBuffer - ld b, $0 + ld b, NAME_MON farcall NamingScreen ld a, BANK(sBoxMonNicknames) diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index df0cc4edc..8cc9cb5ad 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -747,7 +747,7 @@ NamePlayer: ret .NewName: - ld b, 1 + ld b, NAME_PLAYER ld de, wPlayerName farcall NamingScreen diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index addaed5a3..87e28263f 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -61,7 +61,7 @@ NamingScreen: .GetNamingScreenSetup: ld a, [wNamingScreenType] - and 7 + maskbits NUM_NAME_TYPES ld e, a ld d, 0 ld hl, .Jumptable @@ -73,6 +73,7 @@ NamingScreen: jp hl .Jumptable: +; entries correspond to NAME_* constants dw .Pokemon dw .Player dw .Rival diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 012d0e5d2..8127c8ff5 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -2454,7 +2454,7 @@ BillsPC_ChangeBoxSubmenu: ret .Name: - ld b, $4 ; box + ld b, NAME_BOX ld de, wd002 farcall NamingScreen call ClearTileMap diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index 022310de2..d24c1c608 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -330,7 +330,7 @@ HatchEggs: xor a ld [wMonType], a push de - ld b, $0 + ld b, NAME_MON farcall NamingScreen pop hl ld de, wStringBuffer1 diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index c67d210b9..fc268280b 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -1809,7 +1809,7 @@ InitNickname: call DisableSpriteUpdates pop de push de - ld b, $0 + ld b, NAME_MON farcall NamingScreen pop hl ld de, wStringBuffer1 |