Pokeemerald self trade v1

diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc
index 3f43386cb..f515540ba 100644
--- a/data/maps/OldaleTown/scripts.inc
+++ b/data/maps/OldaleTown/scripts.inc
@@ -93,6 +93,42 @@ OldaleTown_EventScript_BagIsFull::
    fadedefaultbgm
    release
    end
+
+SCRIPT_SelfTrade_V1::
+   lock
+   faceplayer
+   msgbox SCRIPT_SelfTrade_Text_IllTradeIfYouWant, MSGBOX_YESNO
+   compare VAR_RESULT, NO
+   goto_if_eq SCRIPT_SelfTrade_DeclineTrade
+   special ChoosePartyMon
+   waitstate
+   compare VAR_0x8004, 255
+   goto_if_eq SCRIPT_SelfTrade_DeclineTrade
+   copyvar VAR_0x8005, VAR_0x8004
+   setvar VAR_0x8004, 6
+   special CreateInGameTradePokemon
+   special DoInGameTradeScene
+   waitstate
+   msgbox SCRIPT_SelfTrade_Text_ComeBack, MSGBOX_DEFAULT
+   release
+   end
+
+SCRIPT_SelfTrade_DeclineTrade::
+   msgbox SCRIPT_SelfTrade_Text_YouDontWantToThatsOkay, MSGBOX_DEFAULT
+   release
+   end
+
+SCRIPT_SelfTrade_Text_IllTradeIfYouWant:
+   .string "I will help you to\n"
+   .string "trade a pokemon\p"
+   .string "with yourself!$"
+
+SCRIPT_SelfTrade_Text_ComeBack:
+   .string "Come back anytime.$"
+
+SCRIPT_SelfTrade_Text_YouDontWantToThatsOkay:
+   .string "You dont want to?\n"
+   .string "Okay come back anytime$"

 OldaleTown_Movement_EmployeeEast:
    walk_up
diff --git a/src/trade.c b/src/trade.c
index b48d1abf5..aed0c37c5 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -3271,9 +3271,9 @@ static void BufferTradeSceneStrings(void)
     }
     else
     {
-        ingameTrade = &sIngameTrades[gSpecialVar_0x8004];
-        StringCopy(gStringVar1, ingameTrade->otName);
-        StringCopy_Nickname(gStringVar3, ingameTrade->nickname);
+        GetMonData(&gEnemyParty[0], MON_DATA_OT_NAME, gStringVar1);
+        GetMonData(&gEnemyParty[0], MON_DATA_NICKNAME, name);
+        StringCopy_Nickname(gStringVar3, name);
         GetMonData(&gPlayerParty[gSpecialVar_0x8005], MON_DATA_NICKNAME, name);
         StringCopy_Nickname(gStringVar2, name);
     }
@@ -4559,7 +4559,10 @@ u16 GetTradeSpecies(void)

 void CreateInGameTradePokemon(void)
 {
-    _CreateInGameTradePokemon(gSpecialVar_0x8005, gSpecialVar_0x8004);
+    if (gSpecialVar_0x8004 == 6)  // Version 1 (a value greater than return value range of 0-5 and not 255)
+        gEnemyParty[0] = gPlayerParty[gSpecialVar_0x8005];
+    else
+        _CreateInGameTradePokemon(gSpecialVar_0x8005, gSpecialVar_0x8004);
 }

 static void CB2_UpdateLinkTrade(void)