dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #410 from PikalaxALT/doc_pokesum

Browse Source 
Document Pokemon Summary Screen
This commit is contained in:
GriffinR
2021-04-18 18:13:32 -04:00
committed by GitHub
parent b54bd2e387 627402560c
commit 9ced234e4b
16 changed files with 1789 additions and 1761 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/link.h
+1 -1
View File
@@ -266,7 +266,7 @@ void Link_StartSend5FFFwithParam(u16 a0);
void sub_80098D8(void);
void CloseLink(void);
bool8 IsLinkTaskFinished(void);
bool32 sub_800B270(void);
bool32 LinkRecvQueueLengthMoreThan2(void);
void ResetSerial(void);
void sub_8054A28(void);
void SetWirelessCommType1(void);
include/pokemon.h
+1 -1
View File
@@ -417,7 +417,7 @@ void AdjustFriendship(struct Pokemon *mon, u8 event);
void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies);
u16 GetMonEVCount(struct Pokemon *mon);
void RandomlyGivePartyPokerus(struct Pokemon *party);
u8 CheckPartyPokerus(struct Pokemon *party, u8 selection);
u8 CheckPartyPokerus(struct Pokemon *party, u8 party_bm);
u8 CheckPartyHasHadPokerus(struct Pokemon *party, u8 selection);
void PartySpreadPokerus(struct Pokemon *party);
bool8 TryIncrementMonLevel(struct Pokemon *mon);
include/pokemon_storage_system_internal.h
+1 -1
View File
@@ -354,7 +354,7 @@ struct PokemonStorageSystemData
/* 2172 */ u16 field_2176[3];
/* 2178 */ u8 field_2186;
/* 2179 */ u8 field_2187;
/* 217a */ u8 field_2188;
/* 217a */ u8 summaryScreenMode;
/* 217c */ union
{
struct Pokemon *mon;
include/pokemon_summary_screen.h
+9 -9
View File
@@ -12,7 +12,7 @@ void SummaryScreen_SetUnknownTaskId(u8 a0);
void SummaryScreen_DestroyUnknownTask(void);
u8 GetLastViewedMonIndex(void);
void ShowPokemonSummaryScreen(struct Pokemon * party, u8 cursorPos, u8 lastIdx, void (*callback)(void), u8 a4);
void sub_8138B38(u8);
void SetPokemonSummaryScreenMode(u8);
// The Pokemon Summary Screen can operate in different modes. Certain features,
// such as move re-ordering, are available in the different modes.
@@ -22,7 +22,7 @@ enum PokemonSummaryScreenMode
PSS_MODE_UNK1,
PSS_MODE_SELECT_MOVE,
PSS_MODE_FORGET_MOVE,
PSS_MODE_UNK4,
PSS_MODE_TRADE,
PSS_MODE_BOX,
};
@@ -38,13 +38,13 @@ enum PokemonSummaryScreenPage
enum PokemonSummaryScreenState3270
{
PSS_STATE3270_0,
PSS_STATE3270_1,
PSS_STATE3270_2,
PSS_STATE3270_3,
PSS_STATE3270_4,
PSS_STATE3270_5,
PSS_STATE3270_6
PSS_STATE3270_FADEIN,
PSS_STATE3270_PLAYCRY,
PSS_STATE3270_HANDLEINPUT,
PSS_STATE3270_FLIPPAGES,
PSS_STATE3270_ATEXIT_FADEOUT,
PSS_STATE3270_ATEXIT_WAITLINKDELAY,
PSS_STATE3270_ATEXIT_WAITFADE
};
enum PokemonSummaryScreenStat
include/strings.h
+46 -46
View File
@@ -1501,51 +1501,51 @@ extern const u8 gText_NotEvenANibble[];
extern const u8 gText_ItGotAway[];
// pokemon_summary_screen
extern const u8 gUnknown_8419C39[];
extern const u8 gUnknown_8419C92[];
extern const u8 gUnknown_8419CA2[];
extern const u8 gUnknown_8419C45[];
extern const u8 gUnknown_8419C82[];
extern const u8 gUnknown_8416202[];
extern const u8 gUnknown_84161EF[];
extern const u8 gUnknown_841620E[];
extern const u8 gUnknown_8416210[];
extern const u8 gUnknown_8416238[];
extern const u8 gUnknown_8419C13[];
extern const u8 gUnknown_8419C0B[];
extern const u8 gUnknown_841996D[];
extern const u8 gUnknown_841992F[];
extern const u8 gUnknown_84198D5[];
extern const u8 gUnknown_84198B4[];
extern const u8 gUnknown_84197ED[];
extern const u8 gUnknown_84197B8[];
extern const u8 gUnknown_8419841[];
extern const u8 gUnknown_8419822[];
extern const u8 gUnknown_841979D[];
extern const u8 gUnknown_8419782[];
extern const u8 gUnknown_84199F4[];
extern const u8 gUnknown_84199AB[];
extern const u8 gUnknown_8419860[];
extern const u8 gUnknown_841988A[];
extern const u8 gUnknown_8419C4D[];
extern const u8 gUnknown_8419C59[];
extern const u8 gUnknown_8419C1D[];
extern const u8 gUnknown_8419C62[];
extern const u8 gUnknown_8419C72[];
extern const u8 gUnknown_8419C2A[];
extern const u8 gUnknown_8419C7B[];
extern const u8 gUnknown_8419CA9[];
extern const u8 gUnknown_8419CB9[];
extern const u8 gUnknown_8419B44[];
extern const u8 gUnknown_8419B7B[];
extern const u8 gUnknown_8419BAE[];
extern const u8 gUnknown_8419BDB[];
extern const u8 gUnknown_8419A3D[];
extern const u8 gUnknown_8419B18[];
extern const u8 gUnknown_8419A6E[];
extern const u8 gUnknown_8419B18[];
extern const u8 gUnknown_8419AA2[];
extern const u8 gUnknown_8419ADE[];
extern const u8 gUnknown_8419B18[];
extern const u8 gText_PokeSum_PageName_KnownMoves[];
extern const u8 gText_PokeSum_Controls_PickSwitch[];
extern const u8 gText_PokeSum_Controls_Pick[];
extern const u8 gText_PokeSum_NoData[];
extern const u8 gText_PokeSum_Controls_PageDetail[];
extern const u8 gText_PokeSum_DexNoUnknown[];
extern const u8 gText_PokeSum_Item_None[];
extern const u8 gText_PokeSum_OneHyphen[];
extern const u8 gText_PokeSum_TwoHyphens[];
extern const u8 gText_PokeSum_PP[];
extern const u8 gText_Somewhere[];
extern const u8 gText_PokeSum_ATrade[];
extern const u8 gText_PokeSum_FatefulEncounterHatched_BoldGentleGrammar[];
extern const u8 gText_PokeSum_FatefulEncounterHatched[];
extern const u8 gText_PokeSum_Hatched_BoldGentleGrammar[];
extern const u8 gText_PokeSum_Hatched[];
extern const u8 gText_PokeSum_FatefulEncounterMet_BoldGentleGrammar[];
extern const u8 gText_PokeSum_FatefulEncounterMet[];
extern const u8 gText_PokeSum_Met_BoldGentleGrammar[];
extern const u8 gText_PokeSum_Met[];
extern const u8 gText_PokeSum_MetInATrade_BoldGentleGrammar[];
extern const u8 gText_PokeSum_MetInATrade[];
extern const u8 gText_PokeSum_ApparentlyFatefulEncounterHatched_BoldGentleGrammar[];
extern const u8 gText_PokeSum_ApparentlyFatefulEncounterHatched[];
extern const u8 gText_PokeSum_ApparentlyMet[];
extern const u8 gText_PokeSum_ApparentlyMet_BoldGentleGrammar[];
extern const u8 gText_PokeSum_ExpPoints[];
extern const u8 gText_PokeSum_NextLv[];
extern const u8 gText_PokeSum_PageName_PokemonInfo[];
extern const u8 gText_PokeSum_Controls_PageCancel[];
extern const u8 gText_PokeSum_Controls_Cancel[];
extern const u8 gText_PokeSum_PageName_PokemonSkills[];
extern const u8 gText_PokeSum_Controls_Page[];
extern const u8 gText_PokeSum_Controls_PickDelete[];
extern const u8 gText_PokeSum_HmMovesCantBeForgotten[];
extern const u8 gText_PokeSum_EggHatch_LongTime[];
extern const u8 gText_PokeSum_EggHatch_SomeTime[];
extern const u8 gText_PokeSum_EggHatch_Soon[];
extern const u8 gText_PokeSum_EggHatch_AlmostReady[];
extern const u8 gText_PokeSum_EggOrigin_DayCare[];
extern const u8 gText_PokeSum_EggOrigin_Trade[];
extern const u8 gText_PokeSum_EggOrigin_TravelingMan[];
extern const u8 gText_PokeSum_EggOrigin_Trade[];
extern const u8 gText_PokeSum_EggOrigin_NicePlace[];
extern const u8 gText_PokeSum_EggOrigin_Spa[];
extern const u8 gText_PokeSum_EggOrigin_Trade[];
#endif //GUARD_STRINGS_H
src/graphics.c
+12 -12
View File
@@ -1224,26 +1224,26 @@ const u16 gUnknown_8E99F24[] = INCBIN_U16("graphics/link_rfu/unk_8E9A168.gbapal"
const u32 gEasyChatSelectGroupHelp_Tiles[] = INCBIN_U32("graphics/link_rfu/unk_8E99F44.4bpp.lz");
const u32 gEasyChatModeIcons_Tiles[] = INCBIN_U32("graphics/link_rfu/unk_8E9A168.4bpp.lz");
const u32 gUnknown_8E9A460[] = INCBIN_U32("graphics/interface/trainer_memo.4bpp.lz");
const u32 gUnknown_8E9B310[] = INCBIN_U32("graphics/interface/trainer_memo_pal1.gbapal");
const u32 gPokeSumBgTiles[] = INCBIN_U32("graphics/interface/trainer_memo.4bpp.lz");
const u32 gTrainerMemoPal1[] = INCBIN_U32("graphics/interface/trainer_memo_pal1.gbapal");
const u32 gUnknown_8E9B3B0[] = INCBIN_U32("graphics/interface/trainer_memo_pal2.gbapal");
const u32 gUnknown_8E9B3D0[] = INCBIN_U32("graphics/interface/trainer_memo_pal3.gbapal");
const u32 gUnknown_8E9B3F0[] = INCBIN_U32("graphics/interface/summary_exp_bar.4bpp.lz");
const u32 gUnknown_8E9B4B8[] = INCBIN_U32("graphics/interface/summary_hp_bar.4bpp.lz");
const u16 gUnknown_8E9B578[] = INCBIN_U16("graphics/interface/summary_exp_bar.gbapal"); // hp bar uses this too
const u32 gPokeSummary_ExpBarTiles[] = INCBIN_U32("graphics/interface/summary_exp_bar.4bpp.lz");
const u32 gPokeSummary_HpBarTiles[] = INCBIN_U32("graphics/interface/summary_hp_bar.4bpp.lz");
const u16 gPokeSummary_ExpBarPals[] = INCBIN_U16("graphics/interface/summary_exp_bar.gbapal"); // hp bar uses this too
const u32 gUnknown_8E9B598[] = INCBIN_U32("graphics/interface/trainer_memo.bin.lz");
const u32 gUnknown_8E9B750[] = INCBIN_U32("graphics/interface/trainer_memo_2.bin.lz");
const u32 gUnknown_8E9B950[] = INCBIN_U32("graphics/interface/trainer_memo_3.bin.lz");
const u32 gUnknown_8E9BA9C[] = INCBIN_U32("graphics/interface/trainer_memo_4.bin.lz");
const u32 gUnknown_8E9BBCC[] = INCBIN_U32("graphics/interface/trainer_memo_5.bin.lz");
const u32 gBgTilemap_TrainerMemo_Details[] = INCBIN_U32("graphics/interface/trainer_memo.bin.lz");
const u32 gBgTilemap_TrainerMemo_Stats[] = INCBIN_U32("graphics/interface/trainer_memo_2.bin.lz");
const u32 gBgTilemap_PokeSum_MovesListForDelete[] = INCBIN_U32("graphics/interface/trainer_memo_3.bin.lz");
const u32 gBgTilemap_PokeSum_MoveDetailsForDelete[] = INCBIN_U32("graphics/interface/trainer_memo_4.bin.lz");
const u32 gBgTilemap_TrainerMemo_Egg[] = INCBIN_U32("graphics/interface/trainer_memo_5.bin.lz");
const u16 gUnknown_8E9BD08[] = INCBIN_U16("graphics/unknown/unknown_E9BD08.gbapal"); // might be an alternate unused palette of the link_rfu gfx below.
const u32 gEasyChatRedRectangularCursor_Tiles[] = INCBIN_U32("graphics/interface/link_rfu_frame.4bpp.lz");
const u16 gUnknown_8E9BF28[] = INCBIN_U16("graphics/interface/link_rfu_frame.gbapal");
const u32 gUnknown_8E9BF48[] = INCBIN_U32("graphics/interface/link_rfu_status.4bpp.lz");
const u16 gPokeSummary_StatusAilmentIconPals[] = INCBIN_U16("graphics/interface/link_rfu_frame.gbapal");
const u32 gPokeSummary_StatusAilmentIconTiles[] = INCBIN_U32("graphics/interface/link_rfu_status.4bpp.lz");
const u16 gUnknown_8E9C14C[] = INCBIN_U16("graphics/interface/pokedex_abc.gbapal");
const u16 gUnknown_8E9C16C[] = INCBIN_U16("graphics/interface/pokedex_abc.4bpp.lz");
src/link.c
+1 -1
View File
@@ -1709,7 +1709,7 @@ u32 GetLinkRecvQueueLength(void)
return gLink.recvQueue.count;
}
bool32 sub_800B270(void)
bool32 LinkRecvQueueLengthMoreThan2(void)
{
if (GetLinkRecvQueueLength() > 2)
{
src/menu_helpers.c
+1 -1
View File
@@ -132,7 +132,7 @@ bool8 sub_80BF748(void)
{
if (MenuHelpers_CallLinkSomething() == TRUE)
return TRUE;
else if (sub_800B270() != TRUE)
else if (LinkRecvQueueLengthMoreThan2() != TRUE)
return FALSE;
else
return TRUE;
src/party_menu.c
+1 -1
View File
@@ -3125,7 +3125,7 @@ static void CB2_ShowPokemonSummaryScreen(void)
{
if (gPartyMenu.menuType == PARTY_MENU_TYPE_IN_BATTLE)
UpdatePartyToBattleOrder();
ShowPokemonSummaryScreen(gPlayerParty, gPartyMenu.slotId, gPlayerPartyCount - 1, CB2_ReturnToPartyMenuFromSummaryScreen, 0);
ShowPokemonSummaryScreen(gPlayerParty, gPartyMenu.slotId, gPlayerPartyCount - 1, CB2_ReturnToPartyMenuFromSummaryScreen, PSS_MODE_NORMAL);
}
static void CB2_ReturnToPartyMenuFromSummaryScreen(void)
src/party_menu_specials.c
+1 -1
View File
@@ -44,7 +44,7 @@ static void sub_80BF97C(u8 taskId)
void SelectMoveDeleterMove(void)
{
ShowSelectMovePokemonSummaryScreen(gPlayerParty, gSpecialVar_0x8004, gPlayerPartyCount - 1, CB2_ReturnToField, 0);
sub_8138B38(3);
SetPokemonSummaryScreenMode(PSS_MODE_FORGET_MOVE);
gFieldCallback = FieldCB_ContinueScriptHandleMusic;
}
src/pokemon.c
+10 -8
View File
@@ -5416,7 +5416,7 @@ void RandomlyGivePartyPokerus(struct Pokemon *party)
&foo;
}
u8 CheckPartyPokerus(struct Pokemon *party, u8 selection)
u8 CheckPartyPokerus(struct Pokemon *party, u8 party_bm)
{
u8 retVal;
@@ -5424,23 +5424,25 @@ u8 CheckPartyPokerus(struct Pokemon *party, u8 selection)
unsigned curBit = 1;
retVal = 0;
if (selection)
if (party_bm != 0) // Check mons in party based on bitmask, LSB = first mon
{
do
{
if ((selection & 1) && (GetMonData(&party[partyIndex], MON_DATA_POKERUS, NULL) & 0xF))
if ((party_bm & 1) && (GetMonData(&party[partyIndex], MON_DATA_POKERUS, NULL) & 0xF))
retVal |= curBit;
partyIndex++;
curBit <<= 1;
selection >>= 1;
party_bm >>= 1;
}
while (selection);
while (party_bm);
}
else if (GetMonData(&party[0], MON_DATA_POKERUS, NULL) & 0xF)
else // Single Pokemon
{
retVal = 1;
if (GetMonData(&party[0], MON_DATA_POKERUS, NULL) & 0xF)
{
retVal = 1;
}
}
return retVal;
}
src/pokemon_storage_system_3.c
+1 -1
View File
@@ -2057,7 +2057,7 @@ static void Cb_ChangeScreen(u8 taskId)
partyMon = gPSSData->field_218C.mon;
monIndex = gPSSData->field_2187;
maxMonIndex = gPSSData->field_2186;
mode = gPSSData->field_2188;
mode = gPSSData->summaryScreenMode;
FreePSSData();
ShowPokemonSummaryScreen(partyMon, monIndex, maxMonIndex, Cb2_ReturnToPSS, mode);
break;
src/pokemon_storage_system_5.c
+10 -10
View File
@@ -9,7 +9,7 @@
#include "constants/items.h"
#include "constants/moves.h"
static EWRAM_DATA struct Pokemon gUnknown_20397BC = {};
static EWRAM_DATA struct Pokemon sMonBeingCarried = {};
static EWRAM_DATA s8 sBoxCursorArea = 0;
static EWRAM_DATA s8 sBoxCursorPosition = 0;
static EWRAM_DATA bool8 sIsMonBeingMoved = FALSE;
@@ -76,7 +76,7 @@ void sub_8092340(void)
gPSSData->inBoxMovingMode = 0;
if (sIsMonBeingMoved)
{
gPSSData->movingMon = gUnknown_20397BC;
gPSSData->movingMon = sMonBeingCarried;
CreateMovingMonIcon();
}
}
@@ -837,7 +837,7 @@ s8 RunCanReleaseMon(void)
void sub_8093630(void)
{
if (sIsMonBeingMoved)
gUnknown_20397BC = gPSSData->movingMon;
sMonBeingCarried = gPSSData->movingMon;
}
void sub_8093660(void)
@@ -845,9 +845,9 @@ void sub_8093660(void)
if (sIsMonBeingMoved)
{
if (sMovingMonOrigBoxId == TOTAL_BOXES_COUNT)
gPSSData->movingMon = gUnknown_20397BC;
gPSSData->movingMon = sMonBeingCarried;
else
gPSSData->movingMon.box = gUnknown_20397BC.box;
gPSSData->movingMon.box = sMonBeingCarried.box;
}
}
@@ -856,24 +856,24 @@ void sub_80936B8(void)
if (sIsMonBeingMoved)
{
sub_8093630();
gPSSData->field_218C.mon = &gUnknown_20397BC;
gPSSData->field_218C.mon = &sMonBeingCarried;
gPSSData->field_2187 = 0;
gPSSData->field_2186 = 0;
gPSSData->field_2188 = 0;
gPSSData->summaryScreenMode = PSS_MODE_NORMAL;
}
else if (sBoxCursorArea == CURSOR_AREA_IN_PARTY)
{
gPSSData->field_218C.mon = gPlayerParty;
gPSSData->field_2187 = sBoxCursorPosition;
gPSSData->field_2186 = CountPartyMons() - 1;
gPSSData->field_2188 = 0;
gPSSData->summaryScreenMode = PSS_MODE_NORMAL;
}
else
{
gPSSData->field_218C.box = GetBoxedMonPtr(StorageGetCurrentBox(), 0);
gPSSData->field_2187 = sBoxCursorPosition;
gPSSData->field_2186 = IN_BOX_COUNT - 1;
gPSSData->field_2188 = 5;
gPSSData->summaryScreenMode = PSS_MODE_BOX;
}
}
@@ -998,7 +998,7 @@ static void sub_8093A10(void)
static void sub_8093AAC(void)
{
if (sIsMonBeingMoved)
SetCursorMonData(&gUnknown_20397BC, MODE_PARTY);
SetCursorMonData(&sMonBeingCarried, MODE_PARTY);
else
sub_8093A10();
}
src/pokemon_summary_screen.c
+1646 -1620
View File
File diff suppressed because it is too large Load Diff
src/strings.c
+46 -46
View File
@@ -134,14 +134,14 @@ const u8 gText_Mail[] = _("MAIL");
const u8 gText_Take[] = _("TAKE");
const u8 gText_Store[] = _("STORE");
const u8 gOtherText_Check[] = _("CHECK");
const u8 gUnknown_84161EF[] = _("NONE");
const u8 gText_PokeSum_Item_None[] = _("NONE");
const u8 gOtherText_Open[] = _("OPEN");
const u8 gOtherText_Deselect[] = _("DESELECT");
const u8 gUnknown_8416202[] = _("???");
const u8 gText_PokeSum_DexNoUnknown[] = _("???");
const u8 gUnknown_8416206[] = _("?????");
const u8 gText_Slash[] = _("/");
const u8 gUnknown_841620E[] = _("-");
const u8 gUnknown_8416210[] = _("--");
const u8 gText_PokeSum_OneHyphen[] = _("-");
const u8 gText_PokeSum_TwoHyphens[] = _("--");
const u8 gText_ThreeHyphens[] = _("---");
const u8 gText_SevenHyphens[] = _("-------");
const u8 gText_MaleSymbol[] = _("♂");
@@ -151,7 +151,7 @@ const u8 gOtherText_UnkF9_08_Clear_01[] = _("{NO}{CLEAR 0x01}");
const u8 gUnknown_841622C[] = _("{PLUS}");
const u8 gUnknown_841622F[] = _("{ESCAPE 0x03}");
const u8 gUnknown_8416233[] = _("{ID}{NO}");
const u8 gUnknown_8416238[] = _("{PP}");
const u8 gText_PokeSum_PP[] = _("{PP}");
const u8 gText_SelectorArrow2[] = _("▶");
const u8 gUnknown_841623D[] = _("YES\nNO");
const u8 gText_GoBackToThePreviousMenu[] = _("Go back to the\nprevious menu.");
@@ -801,47 +801,47 @@ const u8 gText_RegionMap_AreaDesc_TanobyRuins[] = _("An ancient ruin that is rum
const u8 gText_RegionMap_AreaDesc_AlteringCave[] = _("This island has been known by this\nname since the distant past.\nNo one today knows where it got\nthis name, however.");
const u8 gText_RegionMap_AreaDesc_PatternBush[] = _("A lush and bush-like area. \nIn it are patterns where no grass\ngrows. Some study it in the belief\nthat a secret is concealed.");
const u8 gText_RegionMap_AreaDesc_DottedHole[] = _("A mysterious, just-discovered\nruin from an ancient time.\nIt got its name from the six dots\non its door.");
const u8 gUnknown_8419782[] = _("{DYNAMIC 0x00} nature.\nMet in a trade.");
const u8 gUnknown_841979D[] = _("{DYNAMIC 0x00} nature.\nMet in a trade.");
const u8 gUnknown_84197B8[] = _("{DYNAMIC 0x00} nature.\nMet in a fateful encounter when\nat {LV_2} {DYNAMIC 0x01}.");
const u8 gUnknown_84197ED[] = _("{DYNAMIC 0x00} nature.\nMet in a fateful encounter when\nat {LV_2} {DYNAMIC 0x01}.");
const u8 gUnknown_8419822[] = _("{DYNAMIC 0x00} nature.\nMet in {DYNAMIC 0x02} at {LV_2} {DYNAMIC 0x01}.");
const u8 gUnknown_8419841[] = _("{DYNAMIC 0x00} nature.\nMet in {DYNAMIC 0x02} at {LV_2} {DYNAMIC 0x01}.");
const u8 gUnknown_8419860[] = _("{DYNAMIC 0x00} nature.\nApparently met in {DYNAMIC 0x02}\nat {LV_2} {DYNAMIC 0x01}.");
const u8 gUnknown_841988A[] = _("{DYNAMIC 0x00} nature.\nApparently met in {DYNAMIC 0x02}\nat {LV_2} {DYNAMIC 0x01}.");
const u8 gUnknown_84198B4[] = _("{DYNAMIC 0x00} nature.\nHatched: {DYNAMIC 0x02}\nat {LV_2} {DYNAMIC 0x01}.");
const u8 gUnknown_84198D5[] = _("{DYNAMIC 0x00} nature.\nHatched: {DYNAMIC 0x02}\nat {LV_2} {DYNAMIC 0x01}.");
const u8 gUnknown_84198F6[] = _("{DYNAMIC 0x00}なせいかく {LV_2}{DYNAMIC 0x01}のとき\n{DYNAMIC 0x02}で かえった ようだ");
const u8 gUnknown_8419913[] = _("{DYNAMIC 0x00}せいかく {LV_2}{DYNAMIC 0x01}のとき\n{DYNAMIC 0x02}で かえった ようだ");
const u8 gUnknown_841992F[] = _("{DYNAMIC 0x00} nature. Met in a fateful\nencounter (hatched: {DYNAMIC 0x02}\nat {LV_2} {DYNAMIC 0x01}).");
const u8 gUnknown_841996D[] = _("{DYNAMIC 0x00} nature. Met in a fateful\nencounter (hatched: {DYNAMIC 0x02}\nat {LV_2} {DYNAMIC 0x01}).");
const u8 gUnknown_84199AB[] = _("{DYNAMIC 0x00} nature. Apparently met in\na fateful encounter (hatched:\n{DYNAMIC 0x02} at {LV_2} {DYNAMIC 0x01}).");
const u8 gUnknown_84199F4[] = _("{DYNAMIC 0x00} nature. Apparently met in\na fateful encounter シhatched:\n{DYNAMIC 0x02} at {LV_2} {DYNAMIC 0x01}ス.");
const u8 gUnknown_8419A3D[] = _("An odd POKéMON EGG found by the\nDAY-CARE couple.");
const u8 gUnknown_8419A6E[] = _("An odd POKéMON EGG obtained from\nthe traveling man.");
const u8 gUnknown_8419AA2[] = _("A wondrously peculiar POKéMON EGG\nobtained at a nice place.");
const u8 gUnknown_8419ADE[] = _("An odd POKéMON EGG obtained from\nan old woman at the SPA.");
const u8 gUnknown_8419B18[] = _("A peculiar POKéMON EGG obtained\nin a trade.");
const u8 gUnknown_8419B44[] = _("It looks like this\nEGG will take a\nlong time to hatch.");
const u8 gUnknown_8419B7B[] = _("What will hatch\nfrom this? It will\ntake some time.");
const u8 gUnknown_8419BAE[] = _("It occasionally\nmoves. It should\nhatch soon.");
const u8 gUnknown_8419BDB[] = _("It's making sounds.\nIt's almost ready\nto hatch!");
const u8 gUnknown_8419C0B[] = _("a trade");
const u8 gUnknown_8419C13[] = _("Somewhere");
const u8 gUnknown_8419C1D[] = _("POKéMON INFO");
const u8 gUnknown_8419C2A[] = _("POKéMON SKILLS");
const u8 gUnknown_8419C39[] = _("KNOWN MOVES");
const u8 gUnknown_8419C45[] = _("No data");
const u8 gUnknown_8419C4D[] = _("EXP. POINTS");
const u8 gUnknown_8419C59[] = _("NEXT LV.");
const u8 gUnknown_8419C62[] = _("{DPAD_RIGHT}PAGE {A_BUTTON}CANCEL");
const u8 gUnknown_8419C72[] = _("{A_BUTTON}CANCEL");
const u8 gUnknown_8419C7B[] = _("{DPAD_LEFTRIGHT}PAGE");
const u8 gUnknown_8419C82[] = _("{DPAD_LEFT}PAGE {A_BUTTON}DETAIL");
const u8 gUnknown_8419C92[] = _("{DPAD_UPDOWN}PICK {A_BUTTON}SWITCH");
const u8 gUnknown_8419CA2[] = _("{DPAD_UPDOWN}PICK");
const u8 gUnknown_8419CA9[] = _("{DPAD_UPDOWN}PICK {A_BUTTON}DELETE");
const u8 gUnknown_8419CB9[] = _("HM moves can't be\nforgotten now.");
const u8 gText_PokeSum_MetInATrade[] = _("{DYNAMIC 0x00} nature.\nMet in a trade.");
const u8 gText_PokeSum_MetInATrade_BoldGentleGrammar[] = _("{DYNAMIC 0x00} nature.\nMet in a trade.");
const u8 gText_PokeSum_FatefulEncounterMet[] = _("{DYNAMIC 0x00} nature.\nMet in a fateful encounter when\nat {LV_2} {DYNAMIC 0x01}.");
const u8 gText_PokeSum_FatefulEncounterMet_BoldGentleGrammar[] = _("{DYNAMIC 0x00} nature.\nMet in a fateful encounter when\nat {LV_2} {DYNAMIC 0x01}.");
const u8 gText_PokeSum_Met[] = _("{DYNAMIC 0x00} nature.\nMet in {DYNAMIC 0x02} at {LV_2} {DYNAMIC 0x01}.");
const u8 gText_PokeSum_Met_BoldGentleGrammar[] = _("{DYNAMIC 0x00} nature.\nMet in {DYNAMIC 0x02} at {LV_2} {DYNAMIC 0x01}.");
const u8 gText_PokeSum_ApparentlyMet[] = _("{DYNAMIC 0x00} nature.\nApparently met in {DYNAMIC 0x02}\nat {LV_2} {DYNAMIC 0x01}.");
const u8 gText_PokeSum_ApparentlyMet_BoldGentleGrammar[] = _("{DYNAMIC 0x00} nature.\nApparently met in {DYNAMIC 0x02}\nat {LV_2} {DYNAMIC 0x01}.");
const u8 gText_PokeSum_Hatched[] = _("{DYNAMIC 0x00} nature.\nHatched: {DYNAMIC 0x02}\nat {LV_2} {DYNAMIC 0x01}.");
const u8 gText_PokeSum_Hatched_BoldGentleGrammar[] = _("{DYNAMIC 0x00} nature.\nHatched: {DYNAMIC 0x02}\nat {LV_2} {DYNAMIC 0x01}.");
const u8 gText_PokeSum_JP_ApparentlyHatched[] = _("{DYNAMIC 0x00}なせいかく {LV_2}{DYNAMIC 0x01}のとき\n{DYNAMIC 0x02}で かえった ようだ");
const u8 gText_PokeSum_JP_ApparentlyHatched_BoldGentleGrammar[] = _("{DYNAMIC 0x00}せいかく {LV_2}{DYNAMIC 0x01}のとき\n{DYNAMIC 0x02}で かえった ようだ");
const u8 gText_PokeSum_FatefulEncounterHatched[] = _("{DYNAMIC 0x00} nature. Met in a fateful\nencounter (hatched: {DYNAMIC 0x02}\nat {LV_2} {DYNAMIC 0x01}).");
const u8 gText_PokeSum_FatefulEncounterHatched_BoldGentleGrammar[] = _("{DYNAMIC 0x00} nature. Met in a fateful\nencounter (hatched: {DYNAMIC 0x02}\nat {LV_2} {DYNAMIC 0x01}).");
const u8 gText_PokeSum_ApparentlyFatefulEncounterHatched[] = _("{DYNAMIC 0x00} nature. Apparently met in\na fateful encounter (hatched:\n{DYNAMIC 0x02} at {LV_2} {DYNAMIC 0x01}).");
const u8 gText_PokeSum_ApparentlyFatefulEncounterHatched_BoldGentleGrammar[] = _("{DYNAMIC 0x00} nature. Apparently met in\na fateful encounter (hatched:\n{DYNAMIC 0x02} at {LV_2} {DYNAMIC 0x01}).");
const u8 gText_PokeSum_EggOrigin_DayCare[] = _("An odd POKéMON EGG found by the\nDAY-CARE couple.");
const u8 gText_PokeSum_EggOrigin_TravelingMan[] = _("An odd POKéMON EGG obtained from\nthe traveling man.");
const u8 gText_PokeSum_EggOrigin_NicePlace[] = _("A wondrously peculiar POKéMON EGG\nobtained at a nice place.");
const u8 gText_PokeSum_EggOrigin_Spa[] = _("An odd POKéMON EGG obtained from\nan old woman at the SPA.");
const u8 gText_PokeSum_EggOrigin_Trade[] = _("A peculiar POKéMON EGG obtained\nin a trade.");
const u8 gText_PokeSum_EggHatch_LongTime[] = _("It looks like this\nEGG will take a\nlong time to hatch.");
const u8 gText_PokeSum_EggHatch_SomeTime[] = _("What will hatch\nfrom this? It will\ntake some time.");
const u8 gText_PokeSum_EggHatch_Soon[] = _("It occasionally\nmoves. It should\nhatch soon.");
const u8 gText_PokeSum_EggHatch_AlmostReady[] = _("It's making sounds.\nIt's almost ready\nto hatch!");
const u8 gText_PokeSum_ATrade[] = _("a trade");
const u8 gText_Somewhere[] = _("Somewhere");
const u8 gText_PokeSum_PageName_PokemonInfo[] = _("POKéMON INFO");
const u8 gText_PokeSum_PageName_PokemonSkills[] = _("POKéMON SKILLS");
const u8 gText_PokeSum_PageName_KnownMoves[] = _("KNOWN MOVES");
const u8 gText_PokeSum_NoData[] = _("No data");
const u8 gText_PokeSum_ExpPoints[] = _("EXP. POINTS");
const u8 gText_PokeSum_NextLv[] = _("NEXT LV.");
const u8 gText_PokeSum_Controls_PageCancel[] = _("{DPAD_RIGHT}PAGE {A_BUTTON}CANCEL");
const u8 gText_PokeSum_Controls_Cancel[] = _("{A_BUTTON}CANCEL");
const u8 gText_PokeSum_Controls_Page[] = _("{DPAD_LEFTRIGHT}PAGE");
const u8 gText_PokeSum_Controls_PageDetail[] = _("{DPAD_LEFT}PAGE {A_BUTTON}DETAIL");
const u8 gText_PokeSum_Controls_PickSwitch[] = _("{DPAD_UPDOWN}PICK {A_BUTTON}SWITCH");
const u8 gText_PokeSum_Controls_Pick[] = _("{DPAD_UPDOWN}PICK");
const u8 gText_PokeSum_Controls_PickDelete[] = _("{DPAD_UPDOWN}PICK {A_BUTTON}DELETE");
const u8 gText_PokeSum_HmMovesCantBeForgotten[] = _("HM moves can't be\nforgotten now.");
const u8 gText_TrainerCardName[] = _("NAME: ");
const u8 gText_TrainerCardIDNo[] = _("IDNo.");
const u8 gText_TrainerCardMoney[] = _("MONEY");
src/trade.c
+2 -2
View File
@@ -1817,9 +1817,9 @@ static void TradeMenuCB_2(void)
if (!gPaletteFade.active)
{
if (sTradeMenuResourcesPtr->tradeMenuCursorPosition < 6)
ShowPokemonSummaryScreen(gPlayerParty, sTradeMenuResourcesPtr->tradeMenuCursorPosition, sTradeMenuResourcesPtr->partyCounts[0] - 1, CB2_ReturnToTradeMenuFromSummary, 4);
ShowPokemonSummaryScreen(gPlayerParty, sTradeMenuResourcesPtr->tradeMenuCursorPosition, sTradeMenuResourcesPtr->partyCounts[0] - 1, CB2_ReturnToTradeMenuFromSummary, PSS_MODE_TRADE);
else
ShowPokemonSummaryScreen(gEnemyParty, sTradeMenuResourcesPtr->tradeMenuCursorPosition - 6, sTradeMenuResourcesPtr->partyCounts[1] - 1, CB2_ReturnToTradeMenuFromSummary, 4);
ShowPokemonSummaryScreen(gEnemyParty, sTradeMenuResourcesPtr->tradeMenuCursorPosition - 6, sTradeMenuResourcesPtr->partyCounts[1] - 1, CB2_ReturnToTradeMenuFromSummary, PSS_MODE_TRADE);
FreeAllWindowBuffers();
}
}