From 2fdc489bc098abe6f02b6e7fc54e8150ce208dc7 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Sun, 12 May 2019 23:41:25 +0100 Subject: Further documentation of party_menu.c --- include/strings.h | 78 +++++++++++++++++++++++++++---------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index 964c46ef2..f30e82321 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2091,45 +2091,45 @@ extern const u8 gDaycareText_DontLikeOther[]; extern const u8 gDaycareText_PlayOther[]; // party menu -extern const u8 gUnknown_085E9E43[]; -extern const u8 gUnknown_085EA010[]; -extern const u8 gUnknown_085EA02A[]; -extern const u8 gUnknown_085E9E55[]; -extern const u8 gUnknown_085E9E64[]; -extern const u8 gUnknown_085E9E79[]; -extern const u8 gUnknown_085E9E8F[]; -extern const u8 gUnknown_085E9EBC[]; -extern const u8 gUnknown_085E9ED4[]; -extern const u8 gUnknown_085E9EE9[]; -extern const u8 gUnknown_085E9FDB[]; -extern const u8 gUnknown_085EA046[]; -extern const u8 gUnknown_085EA05B[]; -extern const u8 gUnknown_085E9F01[]; -extern const u8 gUnknown_085E9F58[]; -extern const u8 gUnknown_085E9F6F[]; -extern const u8 gUnknown_085E9F81[]; -extern const u8 gUnknown_085E9F90[]; -extern const u8 gUnknown_085E9FA7[]; -extern const u8 gUnknown_085E9FC2[]; -extern const u8 gUnknown_085E9EA6[]; -extern const u8 gUnknown_085E9F16[]; -extern const u8 gUnknown_085E9F2A[]; -extern const u8 gUnknown_085E9F42[]; -extern const u8 gUnknown_085E9FF9[]; -extern const u8 gUnknown_085EA073[]; -extern const u8 gUnknown_085EA091[]; -extern const u8 gUnknown_085EA099[]; -extern const u8 gUnknown_085EA09E[]; -extern const u8 gUnknown_085EA0A4[]; -extern const u8 gUnknown_085EA0AB[]; -extern const u8 gUnknown_085EA0E7[]; -extern const u8 gUnknown_085EA0B1[]; -extern const u8 gUnknown_085EA0B6[]; -extern const u8 gUnknown_085EA0BF[]; -extern const u8 gUnknown_085EA0C5[]; -extern const u8 gUnknown_085EA0CF[]; -extern const u8 gUnknown_085EA0D7[]; -extern const u8 gUnknown_085EA0DC[]; +extern const u8 gText_ChoosePokemon[]; +extern const u8 gText_ChoosePokemonCancel[]; +extern const u8 gText_ChoosePokemonConfirm[]; +extern const u8 gText_MoveToWhere[]; +extern const u8 gText_TeachWhichPokemon[]; +extern const u8 gText_UseOnWhichPokemon[]; +extern const u8 gText_GiveToWhichPokemon[]; +extern const u8 gText_NothingToCut[]; +extern const u8 gText_CantSurfHere[]; +extern const u8 gText_AlreadySurfing[]; +extern const u8 gText_CurrentIsTooFast[]; +extern const u8 gText_EnjoyCycling[]; +extern const u8 gText_InUseAlready_PM[]; +extern const u8 gText_CantUseHere[]; +extern const u8 gText_NoPokemonForBattle[]; +extern const u8 gText_ChoosePokemon2[]; +extern const u8 gText_NotEnoughHp[]; +extern const u8 gText_PokemonAreNeeded[]; +extern const u8 gText_PokemonCantBeSame[]; +extern const u8 gText_NoIdenticalHoldItems[]; +extern const u8 gText_DoWhatWithPokemon[]; +extern const u8 gText_RestoreWhichMove[]; +extern const u8 gText_BoostPp[]; +extern const u8 gText_DoWhatWithItem[]; +extern const u8 gText_DoWhatWithMail[]; +extern const u8 gText_AlreadyHoldingOne[]; +extern const u8 gText_NoUse[]; +extern const u8 gText_Able[]; +extern const u8 gText_First_PM[]; +extern const u8 gText_Second_PM[]; +extern const u8 gText_Third_PM[]; +extern const u8 gText_Fourth[]; +extern const u8 gText_Able2[]; +extern const u8 gText_NotAble[]; +extern const u8 gText_Able3[]; +extern const u8 gText_NotAble2[]; +extern const u8 gText_Learned[]; +extern const u8 gText_Have[]; +extern const u8 gText_DontHave[]; extern const u8 gText_Take[]; extern const u8 gText_Mail[]; extern const u8 gText_Take2[]; -- cgit v1.2.3 From fb06e4a3c94ae17b73df6d3aecf2d18213aa183e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 26 Jun 2019 08:13:38 -0400 Subject: Modernize code Can compile with arm-none-eabi-gcc 8.3.0 gbafix correctly handles ELF input --- include/strings.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index f30e82321..36a92281e 100644 --- a/include/strings.h +++ b/include/strings.h @@ -485,7 +485,6 @@ extern const u8 gText_CryOf[]; extern const u8 gText_SizeComparedTo[]; extern const u8 gText_PokedexRegistration[]; extern const u8 gText_UnkCtrlF908Clear01[]; -extern const u8 sText_TenDashes2[]; extern const u8 gText_5MarksPokemon[]; extern const u8 gText_UnkHeight[]; extern const u8 gText_UnkWeight[]; -- cgit v1.2.3 From 11fb13d63585cf92ab9490f75c115eed0da025ad Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 3 Jul 2019 10:35:46 +0200 Subject: Some pokemon jump work --- include/strings.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index f30e82321..e373a5660 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2708,6 +2708,14 @@ extern const u8 gText_Symbols[]; extern const u8 gText_Register2[]; extern const u8 gText_Exit2[]; +// Pokemon jump +extern const u8 gText_WantToPlayAgain2[]; +extern const u8 gText_SomeoneDroppedOut2[]; +extern const u8 gText_CommunicationStandby4[]; +extern const u8 gText_AwesomeWonF701F700[]; +extern const u8 gText_FilledStorageSpace2[]; +extern const u8 gText_CantHoldMore[]; + // Pokenav Match Call extern const u8 gText_CallCantBeMadeHere[]; extern const u8 gText_NumberRegistered[]; -- cgit v1.2.3 From b68ab6106d59902c7aef7bb2d7058a3945849ece Mon Sep 17 00:00:00 2001 From: garak Date: Fri, 19 Jul 2019 17:23:52 -0400 Subject: pokenav unk 2 data decomp --- include/strings.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index e373a5660..3dd86f60a 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2723,4 +2723,20 @@ extern const u8 gText_NumberOfBattles[]; extern const u8 gText_Unknown[]; extern const u8 gText_TrainerCloseBy[]; +// pokenav_unk_2 +extern const u8 gUnknown_085EBCC5[]; +extern const u8 gUnknown_085EBCE8[]; +extern const u8 gUnknown_085EBD01[]; +extern const u8 gUnknown_085EBD1C[]; +extern const u8 gUnknown_085EBD34[]; +extern const u8 gUnknown_085EBD83[]; +extern const u8 gUnknown_085EBDA2[]; +extern const u8 gUnknown_085EBDBF[]; +extern const u8 gUnknown_085EBDDB[]; +extern const u8 gUnknown_085EBDEE[]; +extern const u8 gUnknown_085EBE06[]; +extern const u8 gUnknown_085EBE19[]; +extern const u8 gUnknown_085EBE2D[]; +extern const u8 gUnknown_085EBE41[]; + #endif // GUARD_STRINGS_H -- cgit v1.2.3 From 690a0c4390788aede68c30328f06ab5575bf0f9d Mon Sep 17 00:00:00 2001 From: garak Date: Fri, 19 Jul 2019 19:36:17 -0400 Subject: decompile pokenav_unk_4 rodata --- 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 3dd86f60a..d8cdebec6 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2739,4 +2739,9 @@ extern const u8 gUnknown_085EBE19[]; extern const u8 gUnknown_085EBE2D[]; extern const u8 gUnknown_085EBE41[]; +// pokenav_unk_4 +extern const u8 gUnknown_085EC017[]; +extern const u8 gUnknown_085EC01C[]; +extern const u8 gUnknown_085EC022[]; + #endif // GUARD_STRINGS_H -- cgit v1.2.3 From 33c036e7ffa939cfcf324580f888359e1dc816fc Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 24 Jul 2019 17:02:52 +0200 Subject: Decompile pokemonav 7 --- 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 f30dffa7f..a959821d4 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1022,6 +1022,7 @@ extern const u8 gText_PokenavMatchCall_CheckTrainerButtons[]; extern const u8 gText_PokenavRibbons_MonListButtons[]; extern const u8 gText_PokenavRibbons_RibbonListButtons[]; extern const u8 gText_PokenavRibbons_RibbonCheckButtons[]; +extern const u8 gText_Number2[]; extern const u8 gUnknown_085EAD37[]; extern const u8 gUnknown_085EAD41[]; -- cgit v1.2.3 From 9a152f8fe600698fe7d63e6f3835d0154d60c42c Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Tue, 30 Jul 2019 17:21:17 -0700 Subject: Decompile data/use_pokeblock.s --- 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 5d8d2eb79..ffbdb4273 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2744,4 +2744,11 @@ extern const u8 gUnknown_085EC017[]; extern const u8 gUnknown_085EC01C[]; extern const u8 gUnknown_085EC022[]; +// use_pokeblock +extern const u8 gText_Coolness[]; +extern const u8 gText_Toughness[]; +extern const u8 gText_Smartness[]; +extern const u8 gText_Cuteness[]; +extern const u8 gText_Beauty3[]; + #endif // GUARD_STRINGS_H -- cgit v1.2.3 From 02cadbee60c7b1a4806f790416a21619391fef15 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 1 Aug 2019 19:01:50 +0200 Subject: MORE DODRIO BERRY PICKINGgit status! --- 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 a959821d4..dfec425d5 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2723,4 +2723,10 @@ extern const u8 gText_NumberOfBattles[]; extern const u8 gText_Unknown[]; extern const u8 gText_TrainerCloseBy[]; +// Dodrio Berry Picking +extern const u8 gText_BerryPickingRecords[]; +extern const u8 gText_BerriesPicked[]; +extern const u8 gText_BerriesInRowFivePlayers[]; +extern const u8 gText_BestScore[]; + #endif // GUARD_STRINGS_H -- cgit v1.2.3 From 4d2d8779bfb56385b5e35d3010d28a248780f134 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 2 Aug 2019 00:41:55 +0200 Subject: Dodrio berry picking decompiled --- include/strings.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index dfec425d5..7e80a2ac1 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2728,5 +2728,21 @@ extern const u8 gText_BerryPickingRecords[]; extern const u8 gText_BerriesPicked[]; extern const u8 gText_BerriesInRowFivePlayers[]; extern const u8 gText_BestScore[]; +extern const u8 gText_1Colon[]; +extern const u8 gText_2Colon[]; +extern const u8 gText_3Colon[]; +extern const u8 gText_4Colon[]; +extern const u8 gText_5Colon[]; +extern const u8 gText_SpacePoints[]; +extern const u8 gText_10P30P50P50P[]; +extern const u8 gText_AnnouncingPrizes[]; +extern const u8 gText_AnnouncingRankings[]; +extern const u8 gText_FirstPlacePrize[]; +extern const u8 gText_CantHoldAnyMore[]; +extern const u8 gText_FilledStorageSpace[]; +extern const u8 gText_BerryPickingResults[]; +extern const u8 gText_WantToPlayAgain[]; +extern const u8 gText_CommunicationStandby3[]; +extern const u8 gText_SomeoneDroppedOut[]; #endif // GUARD_STRINGS_H -- cgit v1.2.3