Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-03-21 17:55:13 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Document Pokedex default main info page (#972)
Some checks are pending
build / build (push) Waiting to run
Details

Browse Source
This commit is contained in:
Flash1Lucky 2026-02-27 08:02:51 -05:00 committed by GitHub
parent 23e058a676
commit 34fd49bfd8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 1119 additions and 1126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
include/applications/pokedex/infomain.h Normal file
View File

@ -0,0 +1,44 @@
#ifndef POKEPLATINUM_POKEDEX_INFOMAIN_H
#define POKEPLATINUM_POKEDEX_INFOMAIN_H
/**
* Animation modes for Pokedex info screen transitions.
* Used by both the default language and multi-language info screens.
*/
enum AnimationMode {
ANIM_POSITION_BLEND = 0, // Animate position and blend transparency
ANIM_BLEND, // Animate blend transparency only
ANIM_POSITION, // Animate position only
};
#include "applications/pokedex/pokedex_app.h"
#include "applications/pokedex/pokedex_sort_data.h"
#include "applications/pokedex/pokedex_text_manager.h"
#include "applications/pokedex/struct_ov21_021E68F4.h"
#include "bg_window.h"
#include "heap.h"
/**
* State information for the Pokedex info main screen.
*/
typedef struct InfoMainState {
int *displayWorkData; // Work data pointer set from ov21_021D138C
PokedexSortData *sortData; // Pokemon sort/listing data
int displayPositionX; // X coordinate for display position animation
int displayPositionY; // Y coordinate for display position animation
const PokedexScreenManager *screenManager; // Screen manager reference
enum AnimationMode animationMode;
int entryOffset; // Dex entry offset (0 = current entry)
BOOL playCry; // Flag to play Pokemon cry
} InfoMainState;
void InfoMain_InitScreen(PokedexScreenManager *screenManager, PokedexApp *pokedexApp, enum HeapID heapID);
void InfoMain_FreeScreen(PokedexScreenManager *screenManager);
BOOL InfoMain_SetDisplayPosition(InfoMainState *displayState, int unused);
BOOL InfoMain_SetEntryOffset(InfoMainState *displayState, int entryOffset);
void InfoMain_RenderHeightWeightEntry(Window *window, int species, enum HeapID heapID, int entryOffset, u32 textColor);
int PokedexGraphics_GetAnimIDfromType(int monType);
Window *InfoMain_CreateCategoryWindow(PokedexTextManager *textMan, enum Species species, enum HeapID heapID);
#endif // POKEPLATINUM_POKEDEX_INFOMAIN_H

7
include/applications/pokedex/infomain_foreign.h
View File

@ -1,17 +1,12 @@
#ifndef POKEPLATINUM_POKEDEX_INFOMAIN_FOREIGN_H
#define POKEPLATINUM_POKEDEX_INFOMAIN_FOREIGN_H
#include "applications/pokedex/infomain.h"
#include "applications/pokedex/pokedex_app.h"
#include "applications/pokedex/struct_ov21_021E68F4.h"
#include "heap.h"
enum AnimationMode {
ANIM_MODE_POSITION_BLEND = 0,
ANIM_MODE_BLEND = 1,
ANIM_MODE_POSITION = 2,
};
void InfoMainForeign_InitScreen(PokedexScreenManager *screenManager, PokedexApp *pokedexApp, enum HeapID heapID);
void InfoMainForeign_FreeScreen(PokedexScreenManager *screenManager);
void InfoMainForeign_SetDisplayPosition(PokedexScreenManager *screenManager, int posX, int posY);

20
include/applications/pokedex/ov21_021DE668.h
View File

@ -1,20 +0,0 @@
#ifndef POKEPLATINUM_OV21_021DE668_H
#define POKEPLATINUM_OV21_021DE668_H
#include "applications/pokedex/pokedex_app.h"
#include "applications/pokedex/pokedex_text_manager.h"
#include "applications/pokedex/struct_ov21_021DE6D4.h"
#include "applications/pokedex/struct_ov21_021E68F4.h"
#include "bg_window.h"
#include "heap.h"
void ov21_021DE668(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
void ov21_021DE6C0(PokedexScreenManager *param0);
BOOL ov21_021DE6D4(UnkStruct_ov21_021DE6D4 *param0, int param1);
BOOL ov21_021DE6D8(UnkStruct_ov21_021DE6D4 *param0, int param1);
void ov21_021DEB8C(Window *param0, int param1, enum HeapID heapID, int param3, u32 param4);
int PokedexGraphics_GetAnimIDfromType(int monType);
Window *ov21_021DF30C(PokedexTextManager *textMan, int param1, int param2);
#endif // POKEPLATINUM_OV21_021DE668_H

18
include/applications/pokedex/struct_ov21_021DE6D4.h
View File

@ -1,18 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_OV21_021DE6D4_H
#define POKEPLATINUM_STRUCT_OV21_021DE6D4_H
#include "applications/pokedex/pokedex_sort_data.h"
#include "applications/pokedex/struct_ov21_021E68F4.h"
typedef struct {
int *unk_00;
PokedexSortData *unk_04;
int unk_08;
int unk_0C;
const PokedexScreenManager *unk_10;
int unk_14;
int unk_18;
BOOL unk_1C;
} UnkStruct_ov21_021DE6D4;
#endif // POKEPLATINUM_STRUCT_OV21_021DE6D4_H

2
platinum.us/main.lsf
View File

@ -796,7 +796,7 @@ Overlay pokedex
Object main.nef.p/src_applications_pokedex_ov21_021D94BC.c.o
Object main.nef.p/src_applications_pokedex_ov21_021DC9BC.c.o
Object main.nef.p/src_applications_pokedex_ov21_021DDD2C.c.o
Object main.nef.p/src_applications_pokedex_ov21_021DE668.c.o
Object main.nef.p/src_applications_pokedex_infomain.c.o
Object main.nef.p/src_applications_pokedex_formmain.c.o
Object main.nef.p/src_applications_pokedex_infomain_foreign.c.o
Object main.nef.p/src_applications_pokedex_ov21_021E1924.c.o

1003
src/applications/pokedex/infomain.c Normal file
View File

File diff suppressed because it is too large Load Diff

64
src/applications/pokedex/infomain_foreign.c
View File

@ -61,12 +61,12 @@ static PokedexGraphicData **AllocateGraphicsData(enum HeapID heapID, PokedexApp
static void FreeState(PokedexEntryDisplayState *displayState);
static void FreeGraphicsData(PokedexGraphicData **graphicsData);
static int GetNumScreenStates(void);
static int ProcessInitData(PokedexDataManager *dataMan, void *data);
static int ProcessUpdateData(PokedexDataManager *dataMan, void *data);
static int ProcessFinalizeData(PokedexDataManager *dataMan, void *data);
static int ProcessInitGraphics(void *graphics, PokedexGraphicsManager *graphicsMan, const void *data, const PokedexDataManager *dataMan);
static int ProcessUpdateGraphics(void *graphics, PokedexGraphicsManager *graphicsMan, const void *data, const PokedexDataManager *dataMan);
static int ProcessFinalizeGraphics(void *graphics, PokedexGraphicsManager *graphicsMan, const void *data, const PokedexDataManager *dataMan);
static int InitData(PokedexDataManager *dataMan, void *data);
static int UpdateData(PokedexDataManager *dataMan, void *data);
static int FinalizeData(PokedexDataManager *dataMan, void *data);
static int InitGraphics(void *graphics, PokedexGraphicsManager *graphicsMan, const void *data, const PokedexDataManager *dataMan);
static int UpdateGraphics(void *graphics, PokedexGraphicsManager *graphicsMan, const void *data, const PokedexDataManager *dataMan);
static int FinalizeGraphics(void *graphics, PokedexGraphicsManager *graphicsMan, const void *data, const PokedexDataManager *dataMan);
static void InitBlendMode(PokedexEntryDisplayGraphics *graphicsStruct, PokedexGraphicData **graphicsData, const PokedexEntryDisplayState *displayState, BOOL isInitializing);
static BOOL UpdateBlendMode(PokedexEntryDisplayGraphics *graphicsStruct, PokedexGraphicData **graphicsData, const PokedexEntryDisplayState *displayState, BOOL isInitializing);
static void InitPositionBlendMode(PokedexEntryDisplayGraphics *graphicsStruct, PokedexGraphicData **graphicsData, const PokedexEntryDisplayState *displayState, BOOL isInitializing);
@ -108,12 +108,12 @@ void InfoMainForeign_InitScreen(PokedexScreenManager *screenManager, PokedexApp
screenManager->pageGraphics = graphicsData;
screenManager->screenStates = NULL;
screenManager->numStates = GetNumScreenStates();
screenManager->dataFunc[0] = ProcessInitData;
screenManager->dataFunc[1] = ProcessUpdateData;
screenManager->dataFunc[2] = ProcessFinalizeData;
screenManager->graphicsFunc[0] = ProcessInitGraphics;
screenManager->graphicsFunc[1] = ProcessUpdateGraphics;
screenManager->graphicsFunc[2] = ProcessFinalizeGraphics;
screenManager->dataFunc[0] = InitData;
screenManager->dataFunc[1] = UpdateData;
screenManager->dataFunc[2] = FinalizeData;
screenManager->graphicsFunc[0] = InitGraphics;
screenManager->graphicsFunc[1] = UpdateGraphics;
screenManager->graphicsFunc[2] = FinalizeGraphics;
}
void InfoMainForeign_FreeScreen(PokedexScreenManager *screenManager)
@ -214,15 +214,13 @@ static int GetNumScreenStates(void)
return 0;
}
static int ProcessInitData(PokedexDataManager *dataMan, void *data)
static int InitData(PokedexDataManager *dataMan, void *data)
{
return TRUE;
}
static int ProcessUpdateData(PokedexDataManager *dataMan, void *data)
static int UpdateData(PokedexDataManager *dataMan, void *data)
{
PokedexEntryDisplayState *displayState = data;
if (dataMan->exit == TRUE) {
return TRUE;
}
@ -234,12 +232,12 @@ static int ProcessUpdateData(PokedexDataManager *dataMan, void *data)
return FALSE;
}
static int ProcessFinalizeData(PokedexDataManager *dataMan, void *data)
static int FinalizeData(PokedexDataManager *dataMan, void *data)
{
return TRUE;
}
static int ProcessInitGraphics(void *graphics, PokedexGraphicsManager *graphicsMan, const void *data, const PokedexDataManager *dataMan)
static int InitGraphics(void *graphics, PokedexGraphicsManager *graphicsMan, const void *data, const PokedexDataManager *dataMan)
{
const PokedexEntryDisplayState *displayState = data;
PokedexGraphicData **graphicsData = graphics;
@ -256,13 +254,13 @@ static int ProcessInitGraphics(void *graphics, PokedexGraphicsManager *graphicsM
SetupGraphics(graphicsStruct, graphicsData, displayState, graphicsMan->heapID);
switch (displayState->animationMode) {
case 0:
case ANIM_POSITION_BLEND:
InitPositionBlendMode(graphicsStruct, graphicsData, displayState, 1);
break;
case 1:
case ANIM_BLEND:
InitBlendMode(graphicsStruct, graphicsData, displayState, 1);
break;
case 2:
case ANIM_POSITION:
InitPositionMode(graphicsStruct, graphicsData, displayState, 1);
break;
}
@ -272,13 +270,13 @@ static int ProcessInitGraphics(void *graphics, PokedexGraphicsManager *graphicsM
case 2:
switch (displayState->animationMode) {
case 0:
case ANIM_POSITION_BLEND:
animationComplete = UpdatePositionBlendMode(graphicsStruct, graphicsData, displayState, 1);
break;
case 1:
case ANIM_BLEND:
animationComplete = UpdateBlendMode(graphicsStruct, graphicsData, displayState, 1);
break;
case 2:
case ANIM_POSITION:
animationComplete = UpdatePositionMode(graphicsStruct, graphicsData, displayState, 1);
break;
}
@ -297,12 +295,12 @@ static int ProcessInitGraphics(void *graphics, PokedexGraphicsManager *graphicsM
return FALSE;
}
static int ProcessUpdateGraphics(void *graphics, PokedexGraphicsManager *graphicsMan, const void *data, const PokedexDataManager *dataMan)
static int UpdateGraphics(void *graphics, PokedexGraphicsManager *graphicsMan, const void *data, const PokedexDataManager *dataMan)
{
return FALSE;
}
static int ProcessFinalizeGraphics(void *graphics, PokedexGraphicsManager *graphicsMan, const void *data, const PokedexDataManager *dataMan)
static int FinalizeGraphics(void *graphics, PokedexGraphicsManager *graphicsMan, const void *data, const PokedexDataManager *dataMan)
{
const PokedexEntryDisplayState *displayState = data;
PokedexGraphicData **graphicsData = graphics;
@ -312,13 +310,13 @@ static int ProcessFinalizeGraphics(void *graphics, PokedexGraphicsManager *graph
switch (graphicsMan->state) {
case 0:
switch (displayState->animationMode) {
case 0:
case ANIM_POSITION_BLEND:
InitPositionBlendMode(graphicsStruct, graphicsData, displayState, 0);
break;
case 1:
case ANIM_BLEND:
InitBlendMode(graphicsStruct, graphicsData, displayState, 0);
break;
case 2:
case ANIM_POSITION:
InitPositionMode(graphicsStruct, graphicsData, displayState, 0);
break;
}
@ -327,13 +325,13 @@ static int ProcessFinalizeGraphics(void *graphics, PokedexGraphicsManager *graph
break;
case 1:
switch (displayState->animationMode) {
case 0:
case ANIM_POSITION_BLEND:
animationComplete = UpdatePositionBlendMode(graphicsStruct, graphicsData, displayState, 0);
break;
case 1:
case ANIM_BLEND:
animationComplete = UpdateBlendMode(graphicsStruct, graphicsData, displayState, 0);
break;
case 2:
case ANIM_POSITION:
animationComplete = UpdatePositionMode(graphicsStruct, graphicsData, displayState, 0);
break;
}
@ -376,7 +374,7 @@ static void CleanupGraphics(PokedexEntryDisplayGraphics *graphicsStruct, Pokedex
Window_FillTilemap(&(*graphicsData)->window, 0);
UnloadTypeIconSprites(graphicsStruct, graphicsData);
Bg_ClearTilemap((*graphicsData)->bgConfig, 1);
Bg_ClearTilemap((*graphicsData)->bgConfig, BG_LAYER_MAIN_1);
}
static void LoadBackground(PokedexGraphicData **graphicsData, enum HeapID heapID)

1008
src/applications/pokedex/ov21_021DE668.c
View File

File diff suppressed because it is too large Load Diff

33
src/applications/pokedex/ov21_021E1924.c
View File

@ -3,9 +3,9 @@
#include <nitro.h>
#include <string.h>
#include "applications/pokedex/infomain.h"
#include "applications/pokedex/infomain_foreign.h"
#include "applications/pokedex/ov21_021D4340.h"
#include "applications/pokedex/ov21_021DE668.h"
#include "applications/pokedex/ov21_021E29DC.h"
#include "applications/pokedex/pokedex_app.h"
#include "applications/pokedex/pokedex_data_manager.h"
@ -17,7 +17,6 @@
#include "applications/pokedex/pokedex_text.h"
#include "applications/pokedex/pokedex_text_manager.h"
#include "applications/pokedex/struct_ov21_021D4660.h"
#include "applications/pokedex/struct_ov21_021DE6D4.h"
#include "applications/pokedex/struct_ov21_021E68F4.h"
#include "bg_window.h"
@ -42,7 +41,7 @@
typedef struct {
int *unk_00;
PokedexSortData *unk_04;
UnkStruct_ov21_021DE6D4 *unk_08;
InfoMainState *unk_08;
PokedexScreenManager *unk_0C;
PokedexScreenManager *unk_10;
const PokedexScreenManager *unk_14;
@ -511,9 +510,9 @@ static void ov21_021E1E8C(u32 param0, enum TouchScreenButtonState param1, void *
case 2:
if (v2->unk_38 & 1) {
if (v2->unk_10 == 0) {
v3 = ov21_021DE6D4(v1->unk_08, 1);
v3 = InfoMain_SetDisplayPosition(v1->unk_08, 1);
} else {
ov21_021DE6D8(v1->unk_08, 0);
InfoMain_SetEntryOffset(v1->unk_08, 0);
v3 = 1;
}
@ -961,20 +960,20 @@ static void ov21_021E275C(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A
{
int v0, v1;
param1->unk_08->unk_1C = 1;
param1->unk_08->playCry = 1;
*param1->unk_00 |= (1 << 2);
param0->unk_10 = 0;
v0 = 48;
v1 = 72;
param1->unk_08->unk_14 = 2;
param1->unk_08->animationMode = 2;
switch (param2) {
case 0:
param1->unk_08->unk_08 = v0;
param1->unk_08->unk_0C = v1;
param1->unk_08->unk_14 = 1;
param1->unk_08->displayPositionX = v0;
param1->unk_08->displayPositionY = v1;
param1->unk_08->animationMode = 1;
break;
case 1:
case 2:
@ -982,7 +981,7 @@ static void ov21_021E275C(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A
case 4:
case 5:
InfoMainForeign_SetDisplayPosition(param1->unk_10, v0, v1);
InfoMainForeign_SetAnimationMode(param1->unk_10, ANIM_MODE_BLEND);
InfoMainForeign_SetAnimationMode(param1->unk_10, ANIM_BLEND);
break;
default:
break;
@ -1000,7 +999,7 @@ static void ov21_021E27C0(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A
param0->unk_10 = 0;
v0 = 48;
v1 = 72;
param1->unk_08->unk_14 = 2;
param1->unk_08->animationMode = 2;
break;
case 1:
case 2:
@ -1012,7 +1011,7 @@ static void ov21_021E27C0(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A
v0 = 48;
v1 = 72;
InfoMainForeign_SetAnimationMode(param1->unk_10, ANIM_MODE_POSITION);
InfoMainForeign_SetAnimationMode(param1->unk_10, ANIM_POSITION);
v2 = PokedexText_ForeignLanguage(param3 - 1);
InfoMainForeign_SetLanguage(param1->unk_10, v2);
break;
@ -1022,9 +1021,9 @@ static void ov21_021E27C0(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A
switch (param2) {
case 0:
param1->unk_08->unk_08 = v0;
param1->unk_08->unk_0C = v1;
param1->unk_08->unk_14 = 2;
param1->unk_08->displayPositionX = v0;
param1->unk_08->displayPositionY = v1;
param1->unk_08->animationMode = 2;
break;
case 1:
case 2:
@ -1032,7 +1031,7 @@ static void ov21_021E27C0(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A
case 4:
case 5:
InfoMainForeign_SetDisplayPosition(param1->unk_10, v0, v1);
InfoMainForeign_SetAnimationMode(param1->unk_10, ANIM_MODE_POSITION);
InfoMainForeign_SetAnimationMode(param1->unk_10, ANIM_POSITION);
break;
default:
break;

32
src/applications/pokedex/ov21_021E29DC.c
View File

@ -3,6 +3,7 @@
#include <nitro.h>
#include <string.h>
#include "applications/pokedex/infomain.h"
#include "applications/pokedex/infomain_foreign.h"
#include "applications/pokedex/ov21_021D4340.h"
#include "applications/pokedex/ov21_021DC9BC.h"
@ -18,7 +19,6 @@
#include "applications/pokedex/pokedex_text_manager.h"
#include "applications/pokedex/struct_ov21_021D4660.h"
#include "applications/pokedex/struct_ov21_021D5B68.h"
#include "applications/pokedex/struct_ov21_021DE6D4.h"
#include "applications/pokedex/struct_ov21_021E68F4.h"
#include "bg_window.h"
@ -44,7 +44,7 @@ typedef struct {
PokedexSortData *unk_04;
int unk_08;
UnkStruct_ov21_021D5B68 *unk_0C;
UnkStruct_ov21_021DE6D4 *unk_10;
InfoMainState *unk_10;
PokedexScreenManager *unk_14;
PokedexScreenManager *unk_18;
PokedexScreenManager *unk_1C;
@ -315,7 +315,7 @@ static int ov21_021E2C24(PokedexDataManager *dataMan, void *data)
{
UnkStruct_ov21_021E2BA8 *v0 = data;
v0->unk_10->unk_1C = 1;
v0->unk_10->playCry = 1;
return 1;
}
@ -450,14 +450,14 @@ static void ov21_021E2E10(UnkStruct_ov21_021E2BA8 *param0)
{
*param0->unk_00 |= (0x1 << 1);
param0->unk_28 = 0;
param0->unk_10->unk_14 = 0;
param0->unk_10->animationMode = 0;
InfoMainForeign_SetAnimationMode(param0->unk_18, ANIM_MODE_POSITION_BLEND);
InfoMainForeign_SetAnimationMode(param0->unk_18, ANIM_POSITION_BLEND);
switch (param0->unk_08) {
case 0:
param0->unk_10->unk_08 = 56;
param0->unk_10->unk_0C = 80;
param0->unk_10->displayPositionX = 56;
param0->unk_10->displayPositionY = 80;
InfoMainForeign_SetDisplayPosition(param0->unk_18, 56, 80);
param0->unk_0C->unk_14 = 1;
param0->unk_2C = 1;
@ -502,9 +502,9 @@ static BOOL ov21_021E2EC4(UnkStruct_ov21_021E2BA8 *param0, int param1, int param
switch (param1) {
case 0:
if (ov21_021E2EC0(param2)) {
param0->unk_10->unk_14 = 2;
param0->unk_10->animationMode = 2;
} else {
param0->unk_10->unk_14 = 1;
param0->unk_10->animationMode = 1;
}
*param0->unk_00 |= (0x1 << 2);
@ -562,15 +562,15 @@ static BOOL ov21_021E2EC4(UnkStruct_ov21_021E2BA8 *param0, int param1, int param
switch (param2) {
case 0:
if (ov21_021E2EC0(param1)) {
param0->unk_10->unk_14 = 2;
InfoMainForeign_SetAnimationMode(param0->unk_18, ANIM_MODE_POSITION);
param0->unk_10->animationMode = 2;
InfoMainForeign_SetAnimationMode(param0->unk_18, ANIM_POSITION);
} else {
param0->unk_10->unk_14 = 1;
InfoMainForeign_SetAnimationMode(param0->unk_18, ANIM_MODE_BLEND);
param0->unk_10->animationMode = 1;
InfoMainForeign_SetAnimationMode(param0->unk_18, ANIM_BLEND);
}
param0->unk_10->unk_08 = v0;
param0->unk_10->unk_0C = v1;
param0->unk_10->displayPositionX = v0;
param0->unk_10->displayPositionY = v1;
InfoMainForeign_SetDisplayPosition(param0->unk_18, v0, v1);
break;
case 1:
@ -737,7 +737,7 @@ static void ov21_021E331C(UnkStruct_ov21_021E326C *param0, int param1)
static void ov21_021E3320(UnkStruct_ov21_021E2BA8 *param0)
{
param0->unk_28 = 1;
param0->unk_10->unk_14 = 1;
param0->unk_10->animationMode = 1;
}
void ov21_021E332C(PokedexScreenManager *screenMan, PokedexApp *param1, enum HeapID heapID)

6
src/applications/pokedex/ov21_021E8D48.c
View File

@ -4,7 +4,7 @@
#include <string.h>
#include "applications/pokedex/footprint.h"
#include "applications/pokedex/ov21_021DE668.h"
#include "applications/pokedex/infomain.h"
#include "applications/pokedex/pokedex_graphics.h"
#include "applications/pokedex/pokedex_main.h"
#include "applications/pokedex/pokedex_text_manager.h"
@ -536,7 +536,7 @@ static void ov21_021E9560(UnkStruct_ov21_021E95B0 *param0, PokedexTextManager *t
Window *v0;
PokedexDisplayBox displayBox;
v0 = ov21_021DF30C(textMan, param3, param2);
v0 = InfoMain_CreateCategoryWindow(textMan, param3, param2);
displayBox.textMan = textMan;
displayBox.paletteProxy = SpriteTransfer_GetPaletteProxy(param4, NULL);
@ -724,7 +724,7 @@ static BOOL ov21_021E9948(PaletteData *param0, PokemonSprite *param1)
static void ov21_021E9968(Window *param0, int param1, int param2)
{
ov21_021DEB8C(param0, param2, param1, 0, TEXT_COLOR(2, 1, 0));
InfoMain_RenderHeightWeightEntry(param0, param2, param1, 0, TEXT_COLOR(2, 1, 0));
ov21_021E998C(param0, param1);
}

6
src/applications/pokedex/pokedex_main.c
View File

@ -9,6 +9,7 @@
#include "applications/pokedex/formsub.h"
#include "applications/pokedex/funcptr_ov21_021E9B74.h"
#include "applications/pokedex/funcptr_ov21_021E9B9C.h"
#include "applications/pokedex/infomain.h"
#include "applications/pokedex/infomain_foreign.h"
#include "applications/pokedex/ov21_021D423C.h"
#include "applications/pokedex/ov21_021D4340.h"
@ -17,7 +18,6 @@
#include "applications/pokedex/ov21_021D94BC.h"
#include "applications/pokedex/ov21_021DC9BC.h"
#include "applications/pokedex/ov21_021DDD2C.h"
#include "applications/pokedex/ov21_021DE668.h"
#include "applications/pokedex/ov21_021E1924.h"
#include "applications/pokedex/ov21_021E29DC.h"
#include "applications/pokedex/ov21_021E3FFC.h"
@ -202,7 +202,7 @@ static BOOL TransitionComplete(PokedexApp **appPtr)
const static UnkFuncPtr_ov21_021E9B74 Unk_ov21_021E9B74[10] = {
ov21_021D5AEC,
PokedexSearch_TransitionFunctions,
ov21_021DE668,
InfoMain_InitScreen,
FormMain_Init,
InfoMainForeign_InitScreen,
ov21_021E29DC,
@ -226,7 +226,7 @@ const static UnkFuncPtr_ov21_021E9B74 Unk_ov21_021E9B34[8] = {
const static UnkFuncPtr_ov21_021E9B9C Unk_ov21_021E9B9C[10] = {
ov21_021D5B50,
PokedexSearch_FreeData,
ov21_021DE6C0,
InfoMain_FreeScreen,
FormMain_Free,
InfoMainForeign_FreeScreen,
ov21_021E2A3C,

2
src/meson.build
View File

@ -606,7 +606,7 @@ pokeplatinum_c = files(
'applications/pokedex/ov21_021D94BC.c',
'applications/pokedex/ov21_021DC9BC.c',
'applications/pokedex/ov21_021DDD2C.c',
'applications/pokedex/ov21_021DE668.c',
'applications/pokedex/infomain.c',
'applications/pokedex/formmain.c',
'applications/pokedex/infomain_foreign.c',
'applications/pokedex/ov21_021E1924.c',