thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-21 06:38:40 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Revert "Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack""

Browse source 
This reverts commit e772de43d5.
This commit is contained in:
Llinos Evans 2023-04-09 14:03:02 +01:00
parent e772de43d5
commit 4389e86fd1
18 changed files with 107 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

14
scripts/NameRatersHouse.asm
View file

@ -8,7 +8,7 @@ NameRaterScript_1da15:
and a
ret
NameRaterScript_1da20:
NameRaterScript_1da20: ; This shouldn't be necessary now that it's removed, but better safe than sorry.
ld hl, wPartyMonOT
ld bc, NAME_LENGTH
ld a, [wWhichPokemon]
@ -60,9 +60,9 @@ NameRaterText1:
pop af
jr c, .asm_1daae
call GetPartyMonName2
call NameRaterScript_1da20
ld hl, NameRaterText_1dad1
jr c, .asm_1daa8
;call NameRaterScript_1da20 - Removing the OT check, traded Pokemon can be nicknamed.
;ld hl, NameRaterText_1dad1
;jr c, .asm_1daa8
ld hl, NameRaterText_1dabd
call NameRaterScript_1da15
jr nz, .asm_1daae
@ -102,6 +102,6 @@ NameRaterText_1dacc:
text_far _NameRaterText_1dacc
text_end
NameRaterText_1dad1:
text_far _NameRaterText_1dad1
text_end
;NameRaterText_1dad1:
; text_far _NameRaterText_1dad1
; text_end