From ca7b62fec33cc2f37def74d504ebc1588f81ac01 Mon Sep 17 00:00:00 2001 From: Narishma-gb <194818981+Narishma-gb@users.noreply.github.com> Date: Sat, 8 Mar 2025 17:19:17 +0100 Subject: Correct `vc_patch` length (#499) --- data/text/text_4.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/text/text_4.asm b/data/text/text_4.asm index f1c73a88..28373f13 100644 --- a/data/text/text_4.asm +++ b/data/text/text_4.asm @@ -216,7 +216,7 @@ IF DEF(_RED_VC) || DEF(_BLUE_VC) text "Please come again!" done text_start - text "sed because of" + db "osed because of" cont "inactivity." ELSE text "The link has been" -- cgit v1.3.1-sl0p 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) --- data/events/trades.asm | 7 +++++-- engine/events/evolve_trade.asm | 34 +++++++++------------------------- 2 files changed, 14 insertions(+), 27 deletions(-) (limited to 'data') diff --git a/data/events/trades.asm b/data/events/trades.asm index f4963bde..e02177d5 100644 --- a/data/events/trades.asm +++ b/data/events/trades.asm @@ -4,8 +4,11 @@ TradeMons: ; give mon, get mon, dialog id, nickname ; The two instances of TRADE_DIALOGSET_EVOLUTION are a leftover ; from the Japanese Blue trades, which used species that evolve. - ; Japanese Red and Green used TRADE_DIALOGSET_CASUAL, and had - ; the same species as English Red and Blue. + ; TRADE_DIALOGSET_EVOLUTION did not refer to evolution in Japanese + ; Red/Green. Japanese Blue changed _AfterTrade2Text to say your Pokémon + ; "went and evolved" and also changed the trades to match. English + ; Red/Blue uses the original JP Red/Green trades but with the JP Blue + ; post-trade text. db NIDORINO, NIDORINA, TRADE_DIALOGSET_CASUAL, "TERRY@@@@@@" db ABRA, MR_MIME, TRADE_DIALOGSET_CASUAL, "MARCEL@@@@@" db BUTTERFREE, BEEDRILL, TRADE_DIALOGSET_HAPPY, "CHIKUCHIKU@" ; unused 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 From d47f74ee1fed608f902dbc0fd51634dd7bafc6e4 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Sun, 20 Apr 2025 10:39:32 -0400 Subject: Rename `Green1/2/3` to `Rival1/2/3` for consistency --- data/trainers/parties.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data') diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index cf5eb151..fd5d6a3d 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -24,7 +24,7 @@ TrainerDataPointers: dw TamerData dw BirdKeeperData dw BlackbeltData - dw Green1Data + dw Rival1Data dw ProfOakData dw ChiefData dw ScientistData @@ -41,8 +41,8 @@ TrainerDataPointers: dw BlaineData dw SabrinaData dw GentlemanData - dw Green2Data - dw Green3Data + dw Rival2Data + dw Rival3Data dw LoreleiData dw ChannelerData dw AgathaData @@ -484,7 +484,7 @@ BlackbeltData: ; Victory Road 2F db 43, MACHOKE, MACHOP, MACHOKE, 0 -Green1Data: +Rival1Data: db 5, SQUIRTLE, 0 db 5, BULBASAUR, 0 db 5, CHARMANDER, 0 @@ -672,7 +672,7 @@ GentlemanData: ; SS Anne 2F Rooms db 17, GROWLITHE, PONYTA, 0 -Green2Data: +Rival2Data: ; SS Anne 2F db $FF, 19, PIDGEOTTO, 16, RATICATE, 18, KADABRA, 20, WARTORTLE, 0 db $FF, 19, PIDGEOTTO, 16, RATICATE, 18, KADABRA, 20, IVYSAUR, 0 @@ -690,7 +690,7 @@ Green2Data: db $FF, 47, PIDGEOT, 45, RHYHORN, 45, GYARADOS, 47, GROWLITHE, 50, ALAKAZAM, 53, VENUSAUR, 0 db $FF, 47, PIDGEOT, 45, RHYHORN, 45, EXEGGCUTE, 47, GYARADOS, 50, ALAKAZAM, 53, CHARIZARD, 0 -Green3Data: +Rival3Data: db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, ARCANINE, 63, EXEGGUTOR, 65, BLASTOISE, 0 db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, GYARADOS, 63, ARCANINE, 65, VENUSAUR, 0 db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, EXEGGUTOR, 63, GYARADOS, 65, CHARIZARD, 0 -- cgit v1.3.1-sl0p