diff --git a/pokeblue.map b/pokeblue.map index c3fe682db..efe3a23c0 100644 --- a/pokeblue.map +++ b/pokeblue.map @@ -3849,7 +3849,7 @@ ROMX bank #5: $7cfd = QuestionEmote $7d3d = HappyEmote $7d7d = InGameTrade_CheckForTradeEvo - $7d8d = InGameTrade_CheckForTradeEvo.ok + $7d8d = InGameTrade_CheckForTradeEvo.nameMatched $7dad = SubstituteEffect_ $7dc9 = SubstituteEffect_.notEnemy $7dea = SubstituteEffect_.userHasZeroOrMoreHP diff --git a/pokeblue.sym b/pokeblue.sym index 4a733d210..b7ff5919f 100644 --- a/pokeblue.sym +++ b/pokeblue.sym @@ -3792,7 +3792,7 @@ 05:7cfd QuestionEmote 05:7d3d HappyEmote 05:7d7d InGameTrade_CheckForTradeEvo -05:7d8d InGameTrade_CheckForTradeEvo.ok +05:7d8d InGameTrade_CheckForTradeEvo.nameMatched 05:7dad SubstituteEffect_ 05:7dc9 SubstituteEffect_.notEnemy 05:7dea SubstituteEffect_.userHasZeroOrMoreHP diff --git a/pokeblue_debug.map b/pokeblue_debug.map index b333a7b19..a13bf08e4 100644 --- a/pokeblue_debug.map +++ b/pokeblue_debug.map @@ -3859,7 +3859,7 @@ ROMX bank #5: $7cfd = QuestionEmote $7d3d = HappyEmote $7d7d = InGameTrade_CheckForTradeEvo - $7d8d = InGameTrade_CheckForTradeEvo.ok + $7d8d = InGameTrade_CheckForTradeEvo.nameMatched $7dad = SubstituteEffect_ $7dc9 = SubstituteEffect_.notEnemy $7dea = SubstituteEffect_.userHasZeroOrMoreHP diff --git a/pokeblue_debug.sym b/pokeblue_debug.sym index e36f8d6fb..d74ec2e7b 100644 --- a/pokeblue_debug.sym +++ b/pokeblue_debug.sym @@ -3802,7 +3802,7 @@ 05:7cfd QuestionEmote 05:7d3d HappyEmote 05:7d7d InGameTrade_CheckForTradeEvo -05:7d8d InGameTrade_CheckForTradeEvo.ok +05:7d8d InGameTrade_CheckForTradeEvo.nameMatched 05:7dad SubstituteEffect_ 05:7dc9 SubstituteEffect_.notEnemy 05:7dea SubstituteEffect_.userHasZeroOrMoreHP diff --git a/pokeblue_vc.map b/pokeblue_vc.map index e9b028640..54b6d227c 100644 --- a/pokeblue_vc.map +++ b/pokeblue_vc.map @@ -3865,7 +3865,7 @@ ROMX bank #5: $7cfd = QuestionEmote $7d3d = HappyEmote $7d7d = InGameTrade_CheckForTradeEvo - $7d8d = InGameTrade_CheckForTradeEvo.ok + $7d8d = InGameTrade_CheckForTradeEvo.nameMatched $7dad = SubstituteEffect_ $7dc9 = SubstituteEffect_.notEnemy $7dea = SubstituteEffect_.userHasZeroOrMoreHP diff --git a/pokeblue_vc.sym b/pokeblue_vc.sym index 45029f69d..06b1d027d 100644 --- a/pokeblue_vc.sym +++ b/pokeblue_vc.sym @@ -3808,7 +3808,7 @@ 05:7cfd QuestionEmote 05:7d3d HappyEmote 05:7d7d InGameTrade_CheckForTradeEvo -05:7d8d InGameTrade_CheckForTradeEvo.ok +05:7d8d InGameTrade_CheckForTradeEvo.nameMatched 05:7dad SubstituteEffect_ 05:7dc9 SubstituteEffect_.notEnemy 05:7dea SubstituteEffect_.userHasZeroOrMoreHP diff --git a/pokered.map b/pokered.map index 24f972abd..be1135a62 100644 --- a/pokered.map +++ b/pokered.map @@ -3849,7 +3849,7 @@ ROMX bank #5: $7cfd = QuestionEmote $7d3d = HappyEmote $7d7d = InGameTrade_CheckForTradeEvo - $7d8d = InGameTrade_CheckForTradeEvo.ok + $7d8d = InGameTrade_CheckForTradeEvo.nameMatched $7dad = SubstituteEffect_ $7dc9 = SubstituteEffect_.notEnemy $7dea = SubstituteEffect_.userHasZeroOrMoreHP diff --git a/pokered.sym b/pokered.sym index a371da7aa..4250ea899 100644 --- a/pokered.sym +++ b/pokered.sym @@ -3792,7 +3792,7 @@ 05:7cfd QuestionEmote 05:7d3d HappyEmote 05:7d7d InGameTrade_CheckForTradeEvo -05:7d8d InGameTrade_CheckForTradeEvo.ok +05:7d8d InGameTrade_CheckForTradeEvo.nameMatched 05:7dad SubstituteEffect_ 05:7dc9 SubstituteEffect_.notEnemy 05:7dea SubstituteEffect_.userHasZeroOrMoreHP diff --git a/pokered_vc.map b/pokered_vc.map index e256f47c9..ce1d6921f 100644 --- a/pokered_vc.map +++ b/pokered_vc.map @@ -3865,7 +3865,7 @@ ROMX bank #5: $7cfd = QuestionEmote $7d3d = HappyEmote $7d7d = InGameTrade_CheckForTradeEvo - $7d8d = InGameTrade_CheckForTradeEvo.ok + $7d8d = InGameTrade_CheckForTradeEvo.nameMatched $7dad = SubstituteEffect_ $7dc9 = SubstituteEffect_.notEnemy $7dea = SubstituteEffect_.userHasZeroOrMoreHP diff --git a/pokered_vc.sym b/pokered_vc.sym index 9e00e229c..0a1829b2e 100644 --- a/pokered_vc.sym +++ b/pokered_vc.sym @@ -3808,7 +3808,7 @@ 05:7cfd QuestionEmote 05:7d3d HappyEmote 05:7d7d InGameTrade_CheckForTradeEvo -05:7d8d InGameTrade_CheckForTradeEvo.ok +05:7d8d InGameTrade_CheckForTradeEvo.nameMatched 05:7dad SubstituteEffect_ 05:7dc9 SubstituteEffect_.notEnemy 05:7dea SubstituteEffect_.userHasZeroOrMoreHP