From c861ff5af3ad996b9ac3b02769e21a18b4c259f9 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 19 Jan 2018 00:42:31 -0500 Subject: [PATCH] This table entry has the address of MoveDescriptions in GSC ($4000 in G/S, $4b52 in Crystal) --- constants/text_constants.asm | 16 ++++++++-------- home/names.asm | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/constants/text_constants.asm b/constants/text_constants.asm index e14a0b551..27c42ed92 100644 --- a/constants/text_constants.asm +++ b/constants/text_constants.asm @@ -10,14 +10,14 @@ NAME_LENGTH_JAPANESE EQU 6 ; GetName types (see home/names.asm) 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 + 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 MOVE_DESC_NAME_BROKEN ; 8 ; see home/text.asm BORDER_WIDTH EQU 2 diff --git a/home/names.asm b/home/names.asm index 2ba5e65cc..9c39c0e72 100644 --- a/home/names.asm +++ b/home/names.asm @@ -1,13 +1,13 @@ NamesPointers:: ; 33ab ; 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) + 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, MoveDescriptions ; MOVE_DESC_NAME_BROKEN (wrong bank) ; 33c3 GetName:: ; 33c3