Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clean up GetName/NamesPointers

This commit is contained in:
Remy Oukaour 2018-01-19 00:29:05 -05:00
parent 25048bd12d
commit 9576740b70
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
constants/text_constants.asm
View File

@ -9,14 +9,15 @@ TRAINER_CLASS_NAME_LENGTH EQU 13
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

2
engine/pack.asm
View File

@ -1705,7 +1705,7 @@ TextJump_YouCantUseItInABattle: ; 0x10b11
db "@"
; 0x10b16
PackMenuGFX::
PackMenuGFX:
INCBIN "gfx/pack/pack_menu.2bpp"
PackGFX:
INCBIN "gfx/pack/pack.2bpp"

18
home/names.asm
View File

@ -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