QoL #16: improve name handling

Author: aaaaaa123456789

constants/text_constants.asm

@@ -12,12 +12,10 @@ NAME_LENGTH_JAPANESE EQU 6
 	const_def 1
 	const MON_NAME              ; 1
 	const MOVE_NAME             ; 2
-	const DUMMY_NAME            ; 3
-	const ITEM_NAME             ; 4
-	const PARTY_OT_NAME         ; 5
-	const ENEMY_OT_NAME         ; 6
-	const TRAINER_NAME          ; 7
-	const MOVE_DESC_NAME_BROKEN ; 8
+	const ITEM_NAME             ; 3
+	const PARTY_OT_NAME         ; 4
+	const ENEMY_OT_NAME         ; 5
+	const TRAINER_NAME          ; 6
 
 ; see home/text.asm
 BORDER_WIDTH   EQU 2

home/names.asm

@@ -1,13 +1,10 @@
 NamesPointers::
-; entries correspond to GetName constants (see constants/text_constants.asm)
-	dba PokemonNames        ; MON_NAME (not used; jumps to GetPokemonName)
+; entries correspond to GetName constants (see constants/text_constants.asm); MON_NAME is not handled by this table
 	dba MoveNames           ; MOVE_NAME
-	dba NULL                ; DUMMY_NAME
 	dba ItemNames           ; ITEM_NAME
 	dbw 0, wPartyMonOT      ; PARTY_OT_NAME
 	dbw 0, wOTPartyMonOT    ; ENEMY_OT_NAME
 	dba TrainerClassNames   ; TRAINER_NAME
-	dbw 4, MoveDescriptions ; MOVE_DESC_NAME_BROKEN (wrong bank)
 
 GetName::
 ; Return name wCurSpecies from name list wNamedObjectTypeBuffer in wStringBuffer1.
@@ -19,27 +16,24 @@ GetName::
 	push de
 
 	ld a, [wNamedObjectTypeBuffer]
-	cp MON_NAME
-	jr nz, .NotPokeName
+	dec a
+	jr nz, .not_mon_name
 
 	ld a, [wCurSpecies]
 	ld [wNamedObjectIndexBuffer], a
 	call GetPokemonName
-	ld hl, MON_NAME_LENGTH
-	add hl, de
-	ld e, l
-	ld d, h
 	jr .done
 
-.NotPokeName:
-	ld a, [wNamedObjectTypeBuffer]
+.not_mon_name
 	dec a
-	ld e, a
-	ld d, 0
-	ld hl, NamesPointers
-	add hl, de
-	add hl, de
-	add hl, de
+	ld l, a
+	add a, a
+	add a, l
+	add a, LOW(NamesPointers)
+	ld l, a
+	ld a, HIGH(NamesPointers)
+	adc 0
+	ld h, a
 	ld a, [hli]
 	rst Bankswitch
 	ld a, [hli]
@@ -55,11 +49,6 @@ GetName::
 	call CopyBytes
 
 .done
-	ld a, e
-	ld [wUnusedD102], a
-	ld a, d
-	ld [wUnusedD102 + 1], a
-
 	pop de
 	pop bc
 	pop hl