diff options
| -rw-r--r-- | constants/menu_constants.asm | 12 | ||||
| -rw-r--r-- | engine/events/name_rater.asm | 2 | ||||
| -rw-r--r-- | engine/events/specials.asm | 2 | ||||
| -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 | ||||
| -rw-r--r-- | mobile/mobile_22.asm | 2 |
10 files changed, 23 insertions, 10 deletions
diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm index bf6945bf4..4aaf10802 100644 --- a/constants/menu_constants.asm +++ b/constants/menu_constants.asm @@ -93,3 +93,15 @@ HMENURETURN_ASM EQU %11111111 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 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/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 diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index e09a504a1..4c972e737 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -3487,7 +3487,7 @@ Function8a765: Function8a78c: call Function891fe ld de, wd002 - ld b, $5 + ld b, NAME_FRIEND farcall NamingScreen call OpenSRAMBank4 call Function8931b |