From ba3247d5cd27070c51e28437e8880dec72d973b5 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Sat, 20 Oct 2018 20:25:28 -0400 Subject: decompiled more, stuck on sub_81B1760 --- 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 4ea33635b..31b8f399d 100644 --- a/include/strings.h +++ b/include/strings.h @@ -369,6 +369,7 @@ extern const u8 gText_ThreeDashes[]; // party menu text extern const u8 gText_PkmnHPRestoredByVar2[]; extern const u8 gText_CantBeUsedOnPkmn[]; +extern const u8 gText_CancelParticipation[]; //pokedex text extern const u8 gText_CryOf[]; -- cgit v1.2.3 From 18124740a4d75ae95948f95ca6f63c320e51501c Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Thu, 6 Dec 2018 23:14:33 -0500 Subject: pushing so I can merge --- 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 31b8f399d..d8b1f4f7c 100644 --- a/include/strings.h +++ b/include/strings.h @@ -370,6 +370,12 @@ extern const u8 gText_ThreeDashes[]; extern const u8 gText_PkmnHPRestoredByVar2[]; extern const u8 gText_CantBeUsedOnPkmn[]; extern const u8 gText_CancelParticipation[]; +extern const u8 gText_PkmnWasGivenItem[]; +extern const u8 gText_RecievedItemFromPkmn[]; +extern const u8 gText_SwitchPkmnItem[]; +extern const u8 gText_SwitchedPkmnItem[]; +extern const u8 gText_BagFullCouldNotRemoveItem[]; +extern const u8 gText_PkmnCantParticipate[]; //pokedex text extern const u8 gText_CryOf[]; -- cgit v1.2.3 From e0f3de0b7483afe2b751ea9fb8204e7da49a371b Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 9 Dec 2018 16:44:01 +0100 Subject: Start pokemon storage system --- include/strings.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index e17ea8646..744859c3e 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1403,4 +1403,36 @@ extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F47[]; extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F0E[]; extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254ED3[]; +// PC strings +extern const u8 gText_ExitFromBox[]; +extern const u8 gText_WhatDoYouWantToDo[]; +extern const u8 gText_PleasePickATheme[]; +extern const u8 gText_PickTheWallpaper[]; +extern const u8 gText_PkmnIsSelected[]; +extern const u8 gText_JumpToWhichBox[]; +extern const u8 gText_DepositInWhichBox[]; +extern const u8 gText_PkmnWasDeposited[]; +extern const u8 gText_BoxIsFull2[]; +extern const u8 gText_ReleaseThisPokemon[]; +extern const u8 gText_PkmnWasReleased[]; +extern const u8 gText_ByeByePkmn[]; +extern const u8 gText_MarkYourPkmn[]; +extern const u8 gText_ThatsYourLastPkmn[]; +extern const u8 gText_YourPartysFull[]; +extern const u8 gText_YoureHoldingAPkmn[]; +extern const u8 gText_WhichOneWillYouTake[]; +extern const u8 gText_YouCantReleaseAnEgg[]; +extern const u8 gText_ContinueBoxOperations[]; +extern const u8 gText_PkmnCameBack[]; +extern const u8 gText_WasItWorriedAboutYou[]; +extern const u8 gText_FourEllipsesExclamation[]; +extern const u8 gText_PleaseRemoveTheMail[]; +extern const u8 gText_GiveToAPkmn[]; +extern const u8 gText_PlacedItemInBag[]; +extern const u8 gText_BagIsFull2[]; +extern const u8 gText_PutItemInBag[]; +extern const u8 gText_ItemIsNowHeld[]; +extern const u8 gText_ChangedToNewItem[]; +extern const u8 gText_MailCantBeStored[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From b4312648e282909be909e084bf2302e29c538c68 Mon Sep 17 00:00:00 2001 From: garak Date: Sun, 9 Dec 2018 19:22:59 -0500 Subject: decompile fldeff_80F9BCC with data --- 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 495cb3a9b..fcb2521be 100644 --- a/include/strings.h +++ b/include/strings.h @@ -140,6 +140,8 @@ extern const u8 gText_Cancel4[]; extern const u8 gText_IsThisTheCorrectTime[]; extern const u8 gText_PkmnFainted3[]; extern const u8 gText_Coins[]; +extern const u8 gText_Silver[]; +extern const u8 gText_Gold[]; extern const u8 gText_Var1AteTheVar2[]; extern const u8 gText_Var1HappilyAteVar2[]; -- cgit v1.2.3 From a6db7b2419e0130a7f9686edd998764dc205d449 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Mon, 10 Dec 2018 02:38:23 -0500 Subject: decompiled up to brm_cancel_1 --- 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 22ff75bc5..0ec3526ea 100644 --- a/include/strings.h +++ b/include/strings.h @@ -406,6 +406,7 @@ extern const u8 gText_SwitchPkmnItem[]; extern const u8 gText_SwitchedPkmnItem[]; extern const u8 gText_BagFullCouldNotRemoveItem[]; extern const u8 gText_PkmnCantParticipate[]; +extern const u8 gText_PkmnNotHolding[]; //pokedex text extern const u8 gText_CryOf[]; -- cgit v1.2.3 From 2265d49ac2e8868e0b3362f8e7a4d22355eed202 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Wed, 12 Dec 2018 22:55:39 -0500 Subject: decompiled up to sub_81B5A8C --- 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 0ec3526ea..f46554cc5 100644 --- a/include/strings.h +++ b/include/strings.h @@ -407,6 +407,22 @@ extern const u8 gText_SwitchedPkmnItem[]; extern const u8 gText_BagFullCouldNotRemoveItem[]; extern const u8 gText_PkmnCantParticipate[]; extern const u8 gText_PkmnNotHolding[]; +extern const u8 gText_ThrowAwayItem[]; +extern const u8 gText_ItemThrownAway[]; +extern const u8 gText_SendMailToPC[]; +extern const u8 gText_MailSentToPC[]; +extern const u8 gText_PCMailboxFull[]; +extern const u8 gText_MailMessageWillBeLost[]; +extern const u8 gText_MailTakenFromPkmn[]; +extern const u8 gText_NoMoreThanVar1Pkmn[]; +extern const u8 gText_PkmnCantBeTradedNow[]; +extern const u8 gText_EggCantBeTradedNow[]; +extern const u8 gText_OnlyPkmnForBattle[]; +extern const u8 gJPText_PutVar1IntoSpinner[]; +extern const u8 gText_PauseUntilPress[]; +extern const u8 gText_CantUseUntilNewBadge[]; +extern const u8 gText_ReturnToHealingSpot[]; +extern const u8 gText_EscapeFromHere[]; //pokedex text extern const u8 gText_CryOf[]; -- cgit v1.2.3 From aae36b5653537a063560dc2c7df261cc7b950a4c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 16 Dec 2018 21:10:01 +0100 Subject: 6k left --- include/strings.h | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index 744859c3e..1557baa6b 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1434,5 +1434,44 @@ extern const u8 gText_PutItemInBag[]; extern const u8 gText_ItemIsNowHeld[]; extern const u8 gText_ChangedToNewItem[]; extern const u8 gText_MailCantBeStored[]; +extern const u8 gPCText_Cancel[]; +extern const u8 gPCText_Store[]; +extern const u8 gPCText_Withdraw[]; +extern const u8 gPCText_Move[]; +extern const u8 gPCText_Shift[]; +extern const u8 gPCText_Place[]; +extern const u8 gPCText_Summary[]; +extern const u8 gPCText_Release[]; +extern const u8 gPCText_Mark[]; +extern const u8 gPCText_Jump[]; +extern const u8 gPCText_Wallpaper[]; +extern const u8 gPCText_Name[]; +extern const u8 gPCText_Take[]; +extern const u8 gPCText_Give[]; +extern const u8 gPCText_Give[]; +extern const u8 gPCText_Switch[]; +extern const u8 gPCText_Bag[]; +extern const u8 gPCText_Info[]; +extern const u8 gPCText_Scenery1[]; +extern const u8 gPCText_Scenery2[]; +extern const u8 gPCText_Scenery3[]; +extern const u8 gPCText_Etcetera[]; +extern const u8 gPCText_Friends[]; +extern const u8 gPCText_Forest[]; +extern const u8 gPCText_City[]; +extern const u8 gPCText_Desert[]; +extern const u8 gPCText_Savanna[]; +extern const u8 gPCText_Crag[]; +extern const u8 gPCText_Volcano[]; +extern const u8 gPCText_Snow[]; +extern const u8 gPCText_Cave[]; +extern const u8 gPCText_Beach[]; +extern const u8 gPCText_Seafloor[]; +extern const u8 gPCText_River[]; +extern const u8 gPCText_Sky[]; +extern const u8 gPCText_PolkaDot[]; +extern const u8 gPCText_Pokecenter[]; +extern const u8 gPCText_Machine[]; +extern const u8 gPCText_Simple[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 71a7a8a0759373a8dafcccee82fa2d37cb285b85 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Mon, 17 Dec 2018 02:39:17 -0500 Subject: decompiled up to sub_81B8A7C --- include/strings.h | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index f1f0e74ba..37a721471 100644 --- a/include/strings.h +++ b/include/strings.h @@ -423,6 +423,45 @@ extern const u8 gText_PauseUntilPress[]; extern const u8 gText_CantUseUntilNewBadge[]; extern const u8 gText_ReturnToHealingSpot[]; extern const u8 gText_EscapeFromHere[]; +extern const u8 gText_PkmnCuredOfPoison[]; +extern const u8 gText_PkmnWokeUp2[]; +extern const u8 gText_PkmnBurnHealed[]; +extern const u8 gText_PkmnThawedOut[]; +extern const u8 gText_PkmnCuredOfParalysis[]; +extern const u8 gText_PkmnGotOverInfatuation[]; +extern const u8 gText_PkmnBecameHealthy[]; +extern const u8 gText_HP3[]; +extern const u8 gText_SpAtk3[]; +extern const u8 gText_SpDef3[]; +extern const u8 gText_PkmnBaseVar2StatIncreased[]; +extern const u8 gText_MovesPPIncreased[]; +extern const u8 gText_PPWasRestored[]; +extern const u8 gText_WontHaveEffect[]; +extern const u8 gText_PkmnSnappedOutOfConfusion[]; +extern const u8 gText_PkmnFriendlyBaseVar2Fell[]; +extern const u8 gText_PkmnFriendlyBaseVar2CantFall[]; +extern const u8 gText_PkmnAdoresBaseVar2Fell[]; +extern const u8 gText_PkmnAlreadyKnows[]; +extern const u8 gText_PkmnCantLearnMove[]; +extern const u8 gText_PkmnNeedsToReplaceMove[]; +extern const u8 gText_PkmnLearnedMove3[]; +extern const u8 gText_WhichMoveToForget[]; +extern const u8 gText_12PoofForgotMove[]; +extern const u8 gText_StopLearningMove2[]; +extern const u8 gText_MoveNotLearned[]; +extern const u8 gText_PkmnElevatedToLvVar2[]; +extern const u8 gText_RemoveMailBeforeItem[]; +extern const u8 gText_PkmnHoldingItemCantHoldMail[]; +extern const u8 gText_MailTransferredFromMailbox[]; +extern const u8 gText_CancelBattle[]; +extern const u8 gText_ReturnToWaitingRoom[]; +extern const u8 gText_CancelChallenge[]; +extern const u8 gText_CantSwitchWithAlly[]; +extern const u8 gText_PkmnHasNoEnergy[]; +extern const u8 gText_EggCantBattle[]; +extern const u8 gText_PkmnAlreadySelected[]; +extern const u8 gText_PkmnAlreadyInBattle[]; +extern const u8 gText_PkmnCantSwitchOut[]; //pokedex text extern const u8 gText_CryOf[]; -- cgit v1.2.3 From 7dcb614cca6d61c5e51960826dddc004858ed9f1 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 20 Dec 2018 22:14:36 +0100 Subject: PSS is done --- 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 1557baa6b..71392eb6a 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1473,5 +1473,8 @@ extern const u8 gPCText_PolkaDot[]; extern const u8 gPCText_Pokecenter[]; extern const u8 gPCText_Machine[]; extern const u8 gPCText_Simple[]; +extern const u8 gText_PartyFull[]; +extern const u8 gText_Box[]; +extern const u8 gText_JustOnePkmn[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 9320fe8f8533ae3f0f8ef638f7cc6a51076af21f Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 24 Dec 2018 00:02:29 +0100 Subject: Clear includes --- include/strings.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index eff40d8f2..706fd116e 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1875,4 +1875,50 @@ extern const u8 gText_PartyFull[]; extern const u8 gText_Box[]; extern const u8 gText_JustOnePkmn[]; +// battle main +extern const u8 gText_LinkStandby3[]; +extern const u8 gText_BattleRecordCouldntBeSaved[]; +extern const u8 gText_Poison[]; +extern const u8 gText_Sleep[]; +extern const u8 gText_Paralysis[]; +extern const u8 gText_Burn[]; +extern const u8 gText_Ice[]; +extern const u8 gText_Confusion[]; +extern const u8 gText_Love[]; + +// battle message +extern const u8 gText_PkmnBoxSomeonesPCFull[]; +extern const u8 gText_PkmnBoxLanettesPCFull[]; +extern const u8 gText_PkmnTransferredSomeonesPC[]; +extern const u8 gText_PkmnTransferredLanettesPC[]; + +// hall of fame +extern const u8 gText_SavingDontTurnOffPower[]; +extern const u8 gText_LeagueChamp[]; +extern const u8 gText_HOFNumber[]; +extern const u8 gText_PickNextCancel[]; +extern const u8 gText_PickCancel[]; +extern const u8 gText_UnkCtrlF800Exit[]; +extern const u8 gText_HOFCorrupted[]; +extern const u8 gText_WelcomeToHOF[]; +extern const u8 gText_Number[]; +extern const u8 gText_Level[]; +extern const u8 gText_IDNumber[]; +extern const u8 gText_Name[]; +extern const u8 gText_MainMenuTime[]; + +// daycare +extern const u8 gText_MaleSymbol4[]; +extern const u8 gText_FemaleSymbol4[]; +extern const u8 gText_GenderlessSymbol[]; +extern const u8 gText_NewLine2[]; +extern const u8 gText_Exit4[]; +extern const u8 gText_Lv[]; +extern const u8 gExpandedPlaceholder_Empty[]; +extern const u8 gText_Exit[]; +extern const u8 gDaycareText_GetAlongVeryWell[]; +extern const u8 gDaycareText_GetAlong[]; +extern const u8 gDaycareText_DontLikeOther[]; +extern const u8 gDaycareText_PlayOther[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 442b1826a276d9270092b7f3e43de1dd87150f4d Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 24 Dec 2018 21:59:05 +0100 Subject: asm party and fldeff clean-up --- include/strings.h | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index 706fd116e..64222cddb 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1921,4 +1921,67 @@ extern const u8 gDaycareText_GetAlong[]; 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_Take[]; +extern const u8 gText_Mail[]; +extern const u8 gText_Take2[]; +extern const u8 gText_Read2[]; +extern const u8 gText_Cancel2[]; +extern const u8 gText_Shift[]; +extern const u8 gText_SendOut[]; +extern const u8 gText_Enter[]; +extern const u8 gText_NoEntry[]; +extern const u8 gText_Store[]; +extern const u8 gText_Register[]; +extern const u8 gText_Trade4[]; +extern const u8 gText_Summary5[]; +extern const u8 gText_Switch2[]; +extern const u8 gText_Item[]; +extern const u8 gText_NotPkmnOtherTrainerWants[]; +extern const u8 gText_ThatIsntAnEgg[]; +extern const u8 gText_PkmnCantBeTradedNow[]; +extern const u8 gText_OtherTrainersPkmnCantBeTraded[]; +extern const u8 gText_EggCantBeTradedNow[]; +extern const u8 gText_OtherTrainerCantAcceptPkmn[]; +extern const u8 gText_CantTradeWithTrainer[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3