mirror of https://github.com/pret/pokecrystal.git
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.
This commit is contained in:
parent
c9cb67141b
commit
b5a9e83a94
|
@ -381,7 +381,7 @@ TMHM_DisplayPocketItems:
|
||||||
ld [wTempTMHM], a
|
ld [wTempTMHM], a
|
||||||
.okay
|
.okay
|
||||||
predef GetTMHMMove
|
predef GetTMHMMove
|
||||||
ld a, [wTempTMHM]
|
ld a, [wNamedObjectIndexBuffer]
|
||||||
ld [wPutativeTMHMMove], a
|
ld [wPutativeTMHMMove], a
|
||||||
call GetMoveName
|
call GetMoveName
|
||||||
pop hl
|
pop hl
|
||||||
|
|
|
@ -1492,7 +1492,7 @@ Pokedex_PrintListing:
|
||||||
.loop
|
.loop
|
||||||
push af
|
push af
|
||||||
ld a, [de]
|
ld a, [de]
|
||||||
ld [wTempSpecies], a
|
ld [wTempSpecies], a ; also sets wNamedObjectIndexBuffer
|
||||||
push de
|
push de
|
||||||
push hl
|
push hl
|
||||||
call .PrintEntry
|
call .PrintEntry
|
||||||
|
|
|
@ -2,10 +2,10 @@ NamesPointers::
|
||||||
; entries correspond to GetName constants (see constants/text_constants.asm)
|
; entries correspond to GetName constants (see constants/text_constants.asm)
|
||||||
dba PokemonNames ; MON_NAME (not used; jumps to GetPokemonName)
|
dba PokemonNames ; MON_NAME (not used; jumps to GetPokemonName)
|
||||||
dba MoveNames ; MOVE_NAME
|
dba MoveNames ; MOVE_NAME
|
||||||
dbw 0, NULL ; DUMMY_NAME
|
dba NULL ; DUMMY_NAME
|
||||||
dba ItemNames ; ITEM_NAME
|
dba ItemNames ; ITEM_NAME
|
||||||
dbw 0, wPartyMonOT ; PARTY_OT_NAME
|
dbw 0, wPartyMonOT ; PARTY_OT_NAME
|
||||||
dbw 0, wOTPartyMonOT ; ENEMY_OT_NAME
|
dbw 0, wOTPartyMonOT ; ENEMY_OT_NAME
|
||||||
dba TrainerClassNames ; TRAINER_NAME
|
dba TrainerClassNames ; TRAINER_NAME
|
||||||
dbw 4, MoveDescriptions ; MOVE_DESC_NAME_BROKEN (wrong bank)
|
dbw 4, MoveDescriptions ; MOVE_DESC_NAME_BROKEN (wrong bank)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue