From efe914a5bab5062834f35cbae7824d1703f45618 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 28 Oct 2019 15:55:57 -0400 Subject: trade through sub_804E944 --- include/strings.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index 9304b225d..43043b537 100644 --- a/include/strings.h +++ b/include/strings.h @@ -660,4 +660,7 @@ extern const u8 gText_FiveIsland[]; extern const u8 gText_SixIsland[]; extern const u8 gText_SevenIsland[]; +// trade +extern const u8 gUnknown_841E0A5[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From e7a66b294169572a70c65b7223ae16810e9a49a3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 29 Oct 2019 21:29:10 -0400 Subject: port sub_8050F3C --- include/strings.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index 43043b537..2c1e93b38 100644 --- a/include/strings.h +++ b/include/strings.h @@ -662,5 +662,9 @@ extern const u8 gText_SevenIsland[]; // trade extern const u8 gUnknown_841E0A5[]; +extern const u8 gText_XWillBeSentToY[]; +extern const u8 gText_ByeByeVar1[]; +extern const u8 gText_XSentOverY[]; +extern const u8 gText_TakeGoodCareOfX[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 2c2c179eb9b92d0998922cc96a115d3d1671a64b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 30 Oct 2019 12:49:16 -0400 Subject: Finish trade code --- include/strings.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index 2c1e93b38..ce5744a04 100644 --- a/include/strings.h +++ b/include/strings.h @@ -666,5 +666,6 @@ extern const u8 gText_XWillBeSentToY[]; extern const u8 gText_ByeByeVar1[]; extern const u8 gText_XSentOverY[]; extern const u8 gText_TakeGoodCareOfX[]; +extern const u8 gUnknown_841E325[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From f6d768d5ed9899f5814349cb232da861f85cbc60 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 30 Oct 2019 14:20:32 -0400 Subject: Trade data; split off trade_scene --- include/strings.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index ce5744a04..301bfb9c6 100644 --- a/include/strings.h +++ b/include/strings.h @@ -667,5 +667,23 @@ extern const u8 gText_ByeByeVar1[]; extern const u8 gText_XSentOverY[]; extern const u8 gText_TakeGoodCareOfX[]; extern const u8 gUnknown_841E325[]; +extern const u8 gUnknown_841E0B9[]; +extern const u8 gUnknown_841E0C0[]; +extern const u8 gUnknown_841E0D2[]; +extern const u8 gUnknown_841E0DA[]; +extern const u8 gUnknown_841E0E0[]; +extern const u8 gUnknown_841E0EE[]; +extern const u8 gUnknown_841E10A[]; +extern const u8 gUnknown_841E112[]; +extern const u8 gUnknown_841E118[]; +extern const u8 gUnknown_841E145[]; +extern const u8 gUnknown_841E16B[]; +extern const u8 gUnknown_8417094[]; +extern const u8 gUnknown_841E199[]; +extern const u8 gUnknown_841E1C5[]; +extern const u8 gUnknown_84170BC[]; +extern const u8 gUnknown_84170E0[]; +extern const u8 gUnknown_84170FC[]; +extern const u8 gUnknown_841E09F[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 1ba6cb22450b729cc2ac1b7fd72b2b27e5ec38c7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 30 Oct 2019 16:51:43 -0400 Subject: Some renaming; resolve trade bss --- include/strings.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index 301bfb9c6..7231755c5 100644 --- a/include/strings.h +++ b/include/strings.h @@ -667,12 +667,12 @@ extern const u8 gText_ByeByeVar1[]; extern const u8 gText_XSentOverY[]; extern const u8 gText_TakeGoodCareOfX[]; extern const u8 gUnknown_841E325[]; -extern const u8 gUnknown_841E0B9[]; -extern const u8 gUnknown_841E0C0[]; -extern const u8 gUnknown_841E0D2[]; -extern const u8 gUnknown_841E0DA[]; -extern const u8 gUnknown_841E0E0[]; -extern const u8 gUnknown_841E0EE[]; +extern const u8 gTradeText_Cancel[]; +extern const u8 gTradeText_ChooseAPokemon[]; +extern const u8 gTradeText_Summary[]; +extern const u8 gTradeText_Trade[]; +extern const u8 gTradeText_CancelTrade[]; +extern const u8 gTradeText_PressBButtonToExit[]; extern const u8 gUnknown_841E10A[]; extern const u8 gUnknown_841E112[]; extern const u8 gUnknown_841E118[]; -- cgit v1.2.3