From cf73d6ee0f1a9cf1e0886fc239c140ad9d761555 Mon Sep 17 00:00:00 2001 From: SatoMew Date: Wed, 9 Apr 2025 04:17:12 +0100 Subject: Further improve NPC trade labels and comments (#493) --- engine/events/evolve_trade.asm | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) (limited to 'engine') diff --git a/engine/events/evolve_trade.asm b/engine/events/evolve_trade.asm index 8daf2b05..8ec7ad5c 100644 --- a/engine/events/evolve_trade.asm +++ b/engine/events/evolve_trade.asm @@ -1,36 +1,20 @@ InGameTrade_CheckForTradeEvo: -; Verify the TradeMon's species name before -; attempting to initiate a trade evolution. - -; The names of the trade evolutions in Blue (JP) -; are checked. In that version, TradeMons that -; can evolve are Graveler and Haunter. - -; In localization, this check was translated -; before monster names were finalized. -; Then, Haunter's name was "Spectre". -; Since its name no longer starts with -; "SP", it is prevented from evolving. - -; This may have been why Red/Green's trades -; were used instead, where none can evolve. - -; This was fixed in Yellow. - +; In Japanese Blue, TradeMons include a Graveler and a Haunter, +; both of which have Japanese names that start with "ゴ", +; which is what this routine originally checked in that game. +; For English Red and Blue, this routine was adjusted for +; Graveler's English name and Haunter's early English name "Spectre". +; The final release replaced Graveler and Haunter in TradeMons. ld a, [wInGameTradeReceiveMonName] - - ; GRAVELER - cp "G" - jr z, .ok - + cp "G" ; GRAVELER + jr z, .nameMatched ; "SPECTRE" (HAUNTER) cp "S" ret nz ld a, [wInGameTradeReceiveMonName + 1] cp "P" ret nz - -.ok +.nameMatched ld a, [wPartyCount] dec a ld [wWhichPokemon], a -- cgit v1.3.1-sl0p