From b5a9e83a94f54c43fedca004fbd7223d6f144fc0 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 29 Jul 2018 16:00:11 -0400 Subject: [PATCH] Fix reviewed issues. Pokedex_PrintListing has a comment noting how it depends on wCurSpecies == wNamedObjectIndexBuffer; an assert would be more convenient, but is not possible since WRAM label addresses are not defined yet here. --- engine/items/tmhm.asm | 2 +- engine/pokedex/pokedex.asm | 2 +- home/names.asm | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index d249d4688..38ffa865e 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -381,7 +381,7 @@ TMHM_DisplayPocketItems: ld [wTempTMHM], a .okay predef GetTMHMMove - ld a, [wTempTMHM] + ld a, [wNamedObjectIndexBuffer] ld [wPutativeTMHMMove], a call GetMoveName pop hl diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm index d62997c9b..10508833f 100644 --- a/engine/pokedex/pokedex.asm +++ b/engine/pokedex/pokedex.asm @@ -1492,7 +1492,7 @@ Pokedex_PrintListing: .loop push af ld a, [de] - ld [wTempSpecies], a + ld [wTempSpecies], a ; also sets wNamedObjectIndexBuffer push de push hl call .PrintEntry diff --git a/home/names.asm b/home/names.asm index da787fb2f..63043863d 100644 --- a/home/names.asm +++ b/home/names.asm @@ -2,10 +2,10 @@ NamesPointers:: ; entries correspond to GetName constants (see constants/text_constants.asm) dba PokemonNames ; MON_NAME (not used; jumps to GetPokemonName) dba MoveNames ; MOVE_NAME - dbw 0, NULL ; DUMMY_NAME + dba NULL ; DUMMY_NAME dba ItemNames ; ITEM_NAME - dbw 0, wPartyMonOT ; PARTY_OT_NAME - dbw 0, wOTPartyMonOT ; ENEMY_OT_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)