ref: 9576740b7023d67da0da0cbe9bd2a66a0ea74eea
parent: 25048bd12dfb1f7182be32f1dba24616c6175377
author: Remy Oukaour <remy.oukaour@gmail.com>
date: Thu Jan 18 19:29:05 EST 2018
clean up GetName/NamesPointers
--- a/constants/text_constants.asm
+++ b/constants/text_constants.asm
@@ -9,14 +9,15 @@
NAME_LENGTH_JAPANESE EQU 6
; GetName types (see home/names.asm)
-PKMN_NAME EQU 1
-MOVE_NAME EQU 2
-; dummied out EQU 3
-ITEM_NAME EQU 4
-PARTY_OT_NAME EQU 5
-ENEMY_OT_NAME EQU 6
-TRAINER_NAME EQU 7
-; broken ptr EQU 8
+const_value set 1
+ const PKMN_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 BROKEN_NAME ; 8
; see home/text.asm
BORDER_WIDTH EQU 2
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -1705,7 +1705,7 @@
db "@"
; 0x10b16
-PackMenuGFX::
+PackMenuGFX:
INCBIN "gfx/pack/pack_menu.2bpp"
PackGFX:
INCBIN "gfx/pack/pack.2bpp"
--- a/home/names.asm
+++ b/home/names.asm
@@ -1,13 +1,13 @@
NamesPointers:: ; 33ab
-; entries correspond to GetName constants (see constants/misc_constants.asm)
- dba PokemonNames
- dba MoveNames
- dbw 0, 0
- dba ItemNames
- dbw 0, PartyMonOT
- dbw 0, OTPartyMonOT
- dba TrainerClassNames
- dbw BANK(PackMenuGFX), PackMenuGFX + 60
+; entries correspond to GetName constants (see constants/text_constants.asm)
+ dba PokemonNames ; PKMN_NAME (not used; jumps to GetPokemonName)
+ dba MoveNames ; MOVE_NAME
+ dbw 0, NULL ; DUMMY_NAME
+ dba ItemNames ; ITEM_NAME
+ dbw 0, PartyMonOT ; PARTY_OT_NAME
+ dbw 0, OTPartyMonOT ; ENEMY_OT_NAME
+ dba TrainerClassNames ; TRAINER_NAME
+ dbw $4, $4b52 ; BROKEN_NAME (within PackMenuGFX)
; 33c3
GetName:: ; 33c3