From 20a09555eac362113abe831dd6b3973b480f56e9 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 11 Jun 2019 05:20:42 +0800 Subject: fixed lots of stuff --- include/strings.h | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index 6af1b0d69..51aeb376a 100644 --- a/include/strings.h +++ b/include/strings.h @@ -113,6 +113,27 @@ extern const u8 gText_ICanPayThisMuch_WouldThatBeOkay[]; extern const u8 gText_TurnedOverItemsWorthYen[]; extern const u8 gPokeDudeText_TMTypes[]; extern const u8 gPokeDudeText_ReadTMDescription[]; -extern const u16 gTMCaseMainWindowPalette[]; + +// teachy_tv +extern const u8 gUnknown_841B7A4[]; +extern const u8 gUnknown_841B7BC[]; +extern const u8 gUnknown_841B7D6[]; +extern const u8 gUnknown_841B7EE[]; +extern const u8 gUnknown_841B807[]; +extern const u8 gUnknown_841B81B[]; +extern const u8 gUnknown_841B836[]; +extern const u8 gUnknown_841B83D[]; +extern const u8 gUnknown_841B8BF[]; +extern const u8 gUnknown_841BB40[]; +extern const u8 gUnknown_841BE76[]; +extern const u8 gUnknown_841C23B[]; +extern const u8 gUnknown_841C459[]; +extern const u8 gUnknown_841C82A[]; +extern const u8 gUnknown_841BA41[]; +extern const u8 gUnknown_841BD10[]; +extern const u8 gUnknown_841C0AF[]; +extern const u8 gUnknown_841C384[]; +extern const u8 gUnknown_841C7B4[]; +extern const u8 gUnknown_841C994[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 75a89830a95a47cea2cc6a0732ca0da454c74ab7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 11 Jun 2019 10:11:23 -0400 Subject: Cleanup and documentation of teachy_tv --- include/strings.h | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index 51aeb376a..edc5136f8 100644 --- a/include/strings.h +++ b/include/strings.h @@ -115,25 +115,25 @@ extern const u8 gPokeDudeText_TMTypes[]; extern const u8 gPokeDudeText_ReadTMDescription[]; // teachy_tv -extern const u8 gUnknown_841B7A4[]; -extern const u8 gUnknown_841B7BC[]; -extern const u8 gUnknown_841B7D6[]; -extern const u8 gUnknown_841B7EE[]; -extern const u8 gUnknown_841B807[]; -extern const u8 gUnknown_841B81B[]; -extern const u8 gUnknown_841B836[]; -extern const u8 gUnknown_841B83D[]; -extern const u8 gUnknown_841B8BF[]; -extern const u8 gUnknown_841BB40[]; -extern const u8 gUnknown_841BE76[]; -extern const u8 gUnknown_841C23B[]; -extern const u8 gUnknown_841C459[]; -extern const u8 gUnknown_841C82A[]; -extern const u8 gUnknown_841BA41[]; -extern const u8 gUnknown_841BD10[]; -extern const u8 gUnknown_841C0AF[]; -extern const u8 gUnknown_841C384[]; -extern const u8 gUnknown_841C7B4[]; -extern const u8 gUnknown_841C994[]; +extern const u8 gTeachyTvString_TeachBattle[]; +extern const u8 gTeachyTvString_StatusProblems[]; +extern const u8 gTeachyTvString_TypeMatchups[]; +extern const u8 gTeachyTvString_CatchPkmn[]; +extern const u8 gTeachyTvString_AboutTMs[]; +extern const u8 gTeachyTvString_RegisterItem[]; +extern const u8 gTeachyTvString_Cancel[]; +extern const u8 gTeachyTvText_PokeDudeSaysHello[]; +extern const u8 gTeachyTvText_BattleScript1[]; +extern const u8 gTeachyTvText_StatusScript1[]; +extern const u8 gTeachyTvText_MatchupsScript1[]; +extern const u8 gTeachyTvText_CatchingScript1[]; +extern const u8 gTeachyTvText_TMsScript1[]; +extern const u8 gTeachyTvText_RegisterScript1[]; +extern const u8 gTeachyTvText_BattleScript2[]; +extern const u8 gTeachyTvText_StatusScript2[]; +extern const u8 gTeachyTvText_MatchupsScript2[]; +extern const u8 gTeachyTvText_CatchingScript2[]; +extern const u8 gTeachyTvText_TMsScript2[]; +extern const u8 gTeachyTvText_RegisterScript2[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 12c62c656b71cf385dce6f70c5b308f86ad02242 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 12 Jun 2019 14:46:42 -0400 Subject: Decompile help system rodata --- 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 edc5136f8..1e3d4c39b 100644 --- a/include/strings.h +++ b/include/strings.h @@ -136,4 +136,8 @@ extern const u8 gTeachyTvText_CatchingScript2[]; extern const u8 gTeachyTvText_TMsScript2[]; extern const u8 gTeachyTvText_RegisterScript2[]; +// help_system_812B1E0 +extern const u8 gUnknown_841DFAC[]; +extern const u8 gUnknown_841DFC9[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 85aeb8d476459da4615949e287294658c8e9e3c5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 12 Jun 2019 16:43:34 -0400 Subject: help_system_812B1E0: through sub_812BDEC --- include/strings.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index 1e3d4c39b..6cc6b93c1 100644 --- a/include/strings.h +++ b/include/strings.h @@ -137,7 +137,9 @@ extern const u8 gTeachyTvText_TMsScript2[]; extern const u8 gTeachyTvText_RegisterScript2[]; // help_system_812B1E0 +extern const u8 gUnknown_841DFA5[]; extern const u8 gUnknown_841DFAC[]; +extern const u8 gUnknown_841DFBE[]; extern const u8 gUnknown_841DFC9[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 63b2153402e68856e56fbacdc0d74daf53cfa9fc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 13 Jun 2019 09:56:44 -0400 Subject: help_system: sub_813B870 --- 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 6cc6b93c1..bc2aab3f8 100644 --- a/include/strings.h +++ b/include/strings.h @@ -142,4 +142,8 @@ extern const u8 gUnknown_841DFAC[]; extern const u8 gUnknown_841DFBE[]; extern const u8 gUnknown_841DFC9[]; +// help_system +extern const u8 gUnknown_841CB49[]; +extern const u8 gUnknown_841CB4E[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From e30052e271c649ae2ca08cbbbdf2dc2052e6ae38 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 13 Jun 2019 13:45:46 -0400 Subject: help_system: through sub_813C3AC --- include/strings.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index bc2aab3f8..d85402de8 100644 --- a/include/strings.h +++ b/include/strings.h @@ -143,6 +143,8 @@ extern const u8 gUnknown_841DFBE[]; extern const u8 gUnknown_841DFC9[]; // help_system +extern const u8 gUnknown_841CB3C[]; +extern const u8 gUnknown_841CB41[]; extern const u8 gUnknown_841CB49[]; extern const u8 gUnknown_841CB4E[]; -- cgit v1.2.3 From 9aac6112a2205a84cc89022a9dcb7140ad060c66 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 13 Jun 2019 16:34:18 -0400 Subject: Some symbol renaming --- include/strings.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index d85402de8..8a10f02d5 100644 --- a/include/strings.h +++ b/include/strings.h @@ -143,9 +143,9 @@ extern const u8 gUnknown_841DFBE[]; extern const u8 gUnknown_841DFC9[]; // help_system -extern const u8 gUnknown_841CB3C[]; -extern const u8 gUnknown_841CB41[]; -extern const u8 gUnknown_841CB49[]; -extern const u8 gUnknown_841CB4E[]; +extern const u8 gString_Bill[]; +extern const u8 gString_Someone[]; +extern const u8 gString_Help[]; +extern const u8 gString_HelpSystem_ClearTo8[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From decd15a45876549a117df8e8594865cb42aa7b1a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 15 Jun 2019 12:56:14 -0400 Subject: unk_815EDDC --- include/strings.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index 8a10f02d5..0a8af28d1 100644 --- a/include/strings.h +++ b/include/strings.h @@ -148,4 +148,6 @@ extern const u8 gString_Someone[]; extern const u8 gString_Help[]; extern const u8 gString_HelpSystem_ClearTo8[]; +extern const u8 gUnknown_8416655[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 4f4b03af6077787ceef226d9085242966c69b6bd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 16 Jun 2019 12:36:34 -0400 Subject: item_pc: sub_810D878 --- 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 0a8af28d1..e624fe407 100644 --- a/include/strings.h +++ b/include/strings.h @@ -113,6 +113,7 @@ extern const u8 gText_ICanPayThisMuch_WouldThatBeOkay[]; extern const u8 gText_TurnedOverItemsWorthYen[]; extern const u8 gPokeDudeText_TMTypes[]; extern const u8 gPokeDudeText_ReadTMDescription[]; +extern const u8 gFameCheckerText_Cancel[]; // teachy_tv extern const u8 gTeachyTvString_TeachBattle[]; -- cgit v1.2.3 From d0633593e8446d6985967d4859c5100067c7d779 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 16 Jun 2019 15:14:57 -0400 Subject: item_pc: through sub_810DBD0 --- include/strings.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index e624fe407..3c374270d 100644 --- a/include/strings.h +++ b/include/strings.h @@ -150,5 +150,7 @@ extern const u8 gString_Help[]; extern const u8 gString_HelpSystem_ClearTo8[]; extern const u8 gUnknown_8416655[]; +extern const u8 gUnknown_84178A7[]; +extern const u8 gUnknown_84178BE[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From d681d7f727e01f1e5b167f5042e9edd1542ae6c6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 16 Jun 2019 18:12:11 -0400 Subject: item_pc: through sub_810E200 --- 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 3c374270d..822bd4783 100644 --- a/include/strings.h +++ b/include/strings.h @@ -149,6 +149,7 @@ extern const u8 gString_Someone[]; extern const u8 gString_Help[]; extern const u8 gString_HelpSystem_ClearTo8[]; +extern const u8 gUnknown_841633F[]; extern const u8 gUnknown_8416655[]; extern const u8 gUnknown_84178A7[]; extern const u8 gUnknown_84178BE[]; -- cgit v1.2.3 From 105716d701e54270179c20425dfcc1e396211519 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 16 Jun 2019 19:37:28 -0400 Subject: item_pc: through sub_810E548 --- include/strings.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index 822bd4783..e9a6be2bd 100644 --- a/include/strings.h +++ b/include/strings.h @@ -149,9 +149,15 @@ extern const u8 gString_Someone[]; extern const u8 gString_Help[]; extern const u8 gString_HelpSystem_ClearTo8[]; +extern const u8 gOtherText_Give[]; +extern const u8 gFameCheckerText_Cancel[]; +extern const u8 gUnknown_84162FF[]; extern const u8 gUnknown_841633F[]; extern const u8 gUnknown_8416655[]; +extern const u8 gUnknown_841778A[]; +extern const u8 gUnknown_84177C5[]; extern const u8 gUnknown_84178A7[]; +extern const u8 gUnknown_84178B5[]; extern const u8 gUnknown_84178BE[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 632a7e8c08158470cbe5120fc8c8ec0141fe7303 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 16 Jun 2019 21:14:16 -0400 Subject: finish item_pc --- 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 e9a6be2bd..fbdfeec2d 100644 --- a/include/strings.h +++ b/include/strings.h @@ -155,6 +155,7 @@ extern const u8 gUnknown_84162FF[]; extern const u8 gUnknown_841633F[]; extern const u8 gUnknown_8416655[]; extern const u8 gUnknown_841778A[]; +extern const u8 gUnknown_84177AC[]; extern const u8 gUnknown_84177C5[]; extern const u8 gUnknown_84178A7[]; extern const u8 gUnknown_84178B5[]; -- cgit v1.2.3 From 2b750cf44491aee3b2fe8265afb4ac6620500afa Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 17 Jun 2019 10:21:32 -0400 Subject: Rename Item PC symbols --- include/strings.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index fbdfeec2d..08dd25174 100644 --- a/include/strings.h +++ b/include/strings.h @@ -151,14 +151,14 @@ extern const u8 gString_HelpSystem_ClearTo8[]; extern const u8 gOtherText_Give[]; extern const u8 gFameCheckerText_Cancel[]; -extern const u8 gUnknown_84162FF[]; -extern const u8 gUnknown_841633F[]; -extern const u8 gUnknown_8416655[]; -extern const u8 gUnknown_841778A[]; -extern const u8 gUnknown_84177AC[]; -extern const u8 gUnknown_84177C5[]; -extern const u8 gUnknown_84178A7[]; -extern const u8 gUnknown_84178B5[]; -extern const u8 gUnknown_84178BE[]; +extern const u8 gOtherText_StrVar1[]; +extern const u8 gOtherText_WhereShouldTheStrVar1BePlaced[]; +extern const u8 gOtherText_Powder[]; +extern const u8 gText_NoMoreRoomInBag[]; +extern const u8 gText_WithdrawHowMany[]; +extern const u8 gText_WithdrewQuantItem[]; +extern const u8 gText_WithdrawItem[]; +extern const u8 gText_Withdraw[]; +extern const u8 gText_ReturnToPC[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 7eeba327bd6dc235a33f06a7779e3b3c52f04475 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 19 Jun 2019 18:03:24 -0400 Subject: Dump items and start decomp item_use --- 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 08dd25174..805516cec 100644 --- a/include/strings.h +++ b/include/strings.h @@ -161,4 +161,7 @@ extern const u8 gText_WithdrawItem[]; extern const u8 gText_Withdraw[]; extern const u8 gText_ReturnToPC[]; +extern const u8 gUnknown_8416425[]; +extern const u8 gUnknown_8416451[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 649a351c4c11bf054ad67885e6f24e80fa690305 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 19 Jun 2019 21:41:43 -0400 Subject: item: through sub_809A584 --- include/strings.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index 805516cec..8b98abb20 100644 --- a/include/strings.h +++ b/include/strings.h @@ -164,4 +164,6 @@ extern const u8 gText_ReturnToPC[]; extern const u8 gUnknown_8416425[]; extern const u8 gUnknown_8416451[]; +extern const u8 gUnknown_84162BD[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 12f3ceb0f7fb0ed580fa75bbba634307ca463d52 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 20 Jun 2019 11:02:09 -0400 Subject: item_use: through sub_80A16D0 --- include/strings.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index 8b98abb20..23562d4b9 100644 --- a/include/strings.h +++ b/include/strings.h @@ -163,6 +163,11 @@ extern const u8 gText_ReturnToPC[]; extern const u8 gUnknown_8416425[]; extern const u8 gUnknown_8416451[]; +extern const u8 gUnknown_8416537[]; +extern const u8 gUnknown_8416644[]; +extern const u8 gUnknown_841665C[]; +extern const u8 gUnknown_8416690[]; +extern const u8 gUnknown_84166A7[]; extern const u8 gUnknown_84162BD[]; -- cgit v1.2.3 From 7abbe42763835f43dc2b08f8292a4ef83c50c5e1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 20 Jun 2019 20:00:13 -0400 Subject: Finish item_use --- include/strings.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index 23562d4b9..1aa858e82 100644 --- a/include/strings.h +++ b/include/strings.h @@ -164,10 +164,16 @@ extern const u8 gText_ReturnToPC[]; extern const u8 gUnknown_8416425[]; extern const u8 gUnknown_8416451[]; extern const u8 gUnknown_8416537[]; +extern const u8 gUnknown_841658C[]; +extern const u8 gUnknown_841659E[]; +extern const u8 gUnknown_84165D2[]; +extern const u8 gUnknown_8416600[]; +extern const u8 gUnknown_8416631[]; extern const u8 gUnknown_8416644[]; extern const u8 gUnknown_841665C[]; extern const u8 gUnknown_8416690[]; extern const u8 gUnknown_84166A7[]; +extern const u8 gUnknown_84169DC[]; extern const u8 gUnknown_84162BD[]; -- cgit v1.2.3 From d97925df0edcac9212ba827b31ff75c7968703f3 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Wed, 3 Jul 2019 01:34:39 +0800 Subject: finished field_poison --- 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 1aa858e82..55c178b0d 100644 --- a/include/strings.h +++ b/include/strings.h @@ -91,6 +91,7 @@ extern const u8 gText_PkmnFainted3[]; extern const u8 gText_Coins[]; extern const u8 gText_EggNickname[]; extern const u8 gText_Pokemon[]; +extern const u8 gText_PkmnFainted3[]; extern const u8 gOtherText_Use[]; extern const u8 gOtherText_Give[]; -- cgit v1.2.3 From 559ddb05e7cc1dd958686c3e2b77472fd43cb167 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 12 Jul 2019 13:39:33 +0800 Subject: thru CheckBattleTypeGhost() --- 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 55c178b0d..a16792aa5 100644 --- a/include/strings.h +++ b/include/strings.h @@ -177,5 +177,6 @@ extern const u8 gUnknown_84166A7[]; extern const u8 gUnknown_84169DC[]; extern const u8 gUnknown_84162BD[]; +extern const u8 gUnknown_841D148[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From e0e81c5fbe6a0c0bdcbb5a1de5e16dfb1ffdc091 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 9 Jul 2019 14:07:19 +0800 Subject: finished menu (1 failed attempt) --- include/strings.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index 55c178b0d..0ccf9c071 100644 --- a/include/strings.h +++ b/include/strings.h @@ -178,4 +178,6 @@ extern const u8 gUnknown_84169DC[]; extern const u8 gUnknown_84162BD[]; +extern const u8 gUnknown_841623D[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 7ec965bd24e363381d19139bd15f44093112815b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Jul 2019 22:21:10 -0400 Subject: Port diploma data to C --- include/strings.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index 55c178b0d..cbe5286f2 100644 --- a/include/strings.h +++ b/include/strings.h @@ -178,4 +178,11 @@ extern const u8 gUnknown_84169DC[]; extern const u8 gUnknown_84162BD[]; +// diploma +extern const u8 gUnknown_841B60E[]; +extern const u8 gUnknown_841B619[]; +extern const u8 gUnknown_841B684[]; +extern const u8 gUnknown_841B68F[]; +extern const u8 gUnknown_841B698[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 0985206a2998d69c984c6bb4494dec442209c4ca Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sun, 14 Jul 2019 04:49:21 +0800 Subject: marked all static functions in pokemon.c --- include/strings.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index a16792aa5..3d62928d1 100644 --- a/include/strings.h +++ b/include/strings.h @@ -179,4 +179,13 @@ extern const u8 gUnknown_84169DC[]; extern const u8 gUnknown_84162BD[]; extern const u8 gUnknown_841D148[]; +extern const u8 BattleText_Rose[]; +extern const u8 BattleText_UnknownString3[]; +extern const u8 BattleText_GetPumped[]; +extern const u8 BattleText_MistShroud[]; +extern const u8 gText_EggNickname[]; +extern const u8 gText_BadEgg[]; +extern const u8 gText_PkmnsXPreventsSwitching[]; +extern u8 *gUnknown_83FD5D0[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 1caed4e6320570e9815ef43a4f0ebd14cc52c066 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sun, 14 Jul 2019 05:31:17 +0800 Subject: updated headers --- 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 3d62928d1..0bb7223be 100644 --- a/include/strings.h +++ b/include/strings.h @@ -179,6 +179,7 @@ extern const u8 gUnknown_84169DC[]; extern const u8 gUnknown_84162BD[]; extern const u8 gUnknown_841D148[]; +// pokemon.c extern const u8 BattleText_Rose[]; extern const u8 BattleText_UnknownString3[]; extern const u8 BattleText_GetPumped[]; -- cgit v1.2.3 From 40c3cf3da7d431bec3cf1bb87356c1c634fdc172 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 13 Jul 2019 19:31:19 -0400 Subject: Finish battle_records.s and assoc. data --- include/strings.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index cbe5286f2..d7ba606f9 100644 --- a/include/strings.h +++ b/include/strings.h @@ -185,4 +185,11 @@ extern const u8 gUnknown_841B684[]; extern const u8 gUnknown_841B68F[]; extern const u8 gUnknown_841B698[]; +// battle_records +extern const u8 gUnknown_8418174[]; +extern const u8 gUnknown_8418188[]; +extern const u8 gUnknown_84181A4[]; +extern const u8 gUnknown_84181B6[]; +extern const u8 gUnknown_84181BE[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 97b4bb41b7c3b719df97bc8ff60ba9c267d1dd6e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 13 Jul 2019 19:51:30 -0400 Subject: Name functions in battle_records.c --- include/strings.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index d7ba606f9..1bd53d4a5 100644 --- a/include/strings.h +++ b/include/strings.h @@ -186,10 +186,10 @@ extern const u8 gUnknown_841B68F[]; extern const u8 gUnknown_841B698[]; // battle_records -extern const u8 gUnknown_8418174[]; -extern const u8 gUnknown_8418188[]; -extern const u8 gUnknown_84181A4[]; -extern const u8 gUnknown_84181B6[]; -extern const u8 gUnknown_84181BE[]; +extern const u8 gString_BattleRecords_PlayersBattleResults[]; +extern const u8 gString_BattleRecords_TotalRecord[]; +extern const u8 gString_BattleRecords_ColumnHeaders[]; +extern const u8 gString_BattleRecords_7Dashes[]; +extern const u8 gString_BattleRecords_4Dashes[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3