diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_party_menu.c | 1 | ||||
| -rw-r--r-- | src/choose_party.c | 5 | ||||
| -rw-r--r-- | src/party_menu.c | 40 |
3 files changed, 41 insertions, 5 deletions
diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c index 595cdcc48..e80737210 100644 --- a/src/battle_party_menu.c +++ b/src/battle_party_menu.c @@ -28,7 +28,6 @@ extern void LoadHeldItemIconGraphics(void); extern void CreateHeldItemIcons_806DC34(); extern u8 sub_806BD58(u8, u8); extern void PartyMenuPrintMonsLevelOrStatus(void); -extern void PrintPartyMenuMonNicknames(void); extern void nullsub_13(void); extern u8 sub_806B58C(u8); extern void sub_806D5A4(void); diff --git a/src/choose_party.c b/src/choose_party.c index 223c97f69..6e2d2382a 100644 --- a/src/choose_party.c +++ b/src/choose_party.c @@ -48,7 +48,6 @@ extern void LoadHeldItemIconGraphics(void); extern void CreateHeldItemIcons_806DC34(); extern u8 sub_806BD58(u8, u8); extern void PartyMenuPrintMonsLevelOrStatus(void); -extern void PrintPartyMenuMonNicknames(void); extern void sub_806BC3C(u8, u8); extern u8 sub_806B58C(u8); extern u16 sub_806BE38(); @@ -68,11 +67,9 @@ extern void CreatePartyMenuMonIcon(); extern void CreateHeldItemIcon_806DCD4(int, u8, int); extern u8 GetMonStatusAndPokerus(); extern void PartyMenuPrintHP(); -extern void PrintPartyMenuMonNickname(); extern bool8 sub_80F9344(void); extern void sub_806D4AC(); extern void sub_806D3B4(); -extern void box_print(u8, int, const u8 *); extern void sub_806BCE8(void); static void ClearPartySelection(void); @@ -696,7 +693,7 @@ static void sub_8122B10(u8 taskId) StringCopy(gStringVar1, gUnknown_02023A00[i].nickname); StringGetEnd10(gStringVar1); SanitizeNameString(gStringVar1); - box_print(i + 3, 3, gStringVar1); + PartyMenuDoPrintMonNickname(i + 3, 3, gStringVar1); PartyMenuDoDrawHPBar(i + 3, 3, gUnknown_02023A00[i].hp, gUnknown_02023A00[i].maxhp); } } diff --git a/src/party_menu.c b/src/party_menu.c index 541c04fdc..10b2719e4 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -119,6 +119,46 @@ void sub_806AEDC(void) #endif +void PartyMenuDoPrintMonNickname(u8 monIndex, int b, const u8 *nameBuffer) +{ + u32 var1 = 0; + CpuFastSet(&var1, gTileBuffer, 0x1000100); + sub_8004E3C((struct WindowConfig *)&gWindowConfig_81E6CAC, gTileBuffer, nameBuffer); + CpuFastSet(gTileBuffer, (void *)(OBJ_VRAM1 + (monIndex * 0x400)), 128); +} + +void PrintPartyMenuMonNickname(u8 monIndex, u8 b, struct Pokemon *pokemon) +{ + u8 nameBuffer[12]; + GetMonNickname(pokemon, nameBuffer); + PartyMenuDoPrintMonNickname(monIndex, b, nameBuffer); +} + +void TryPrintPartyMenuMonNickname(u8 monIndex, struct Pokemon *pokemon) +{ + if (GetMonData(pokemon, MON_DATA_SPECIES)) + { + u8 isLinkDoubleBattle = IsLinkDoubleBattle(); + if (isLinkDoubleBattle == TRUE) + { + PrintPartyMenuMonNickname(monIndex, 2, pokemon); + } + else + { + PrintPartyMenuMonNickname(monIndex, IsDoubleBattle(), pokemon); + } + } +} + +void PrintPartyMenuMonNicknames(void) +{ + u8 i; + + for (i = 0; i < PARTY_SIZE; i++) + { + TryPrintPartyMenuMonNickname(i, &gPlayerParty[i]); + } +} u8 *GetMonNickname(struct Pokemon *pokemon, u8 *stringBuffer) { |