mirror of
https://github.com/pret/pokeplatinum.git
synced 2026-04-26 00:32:20 -05:00
Identify unk_02013A04 -> string_list, struct members, extern functions
This commit is contained in:
parent
c0dce46e45
commit
5599a4b21a
|
|
@ -4,7 +4,6 @@
|
|||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_0200C440_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
|
||||
#include "overlay005/struct_ov5_021D30A8.h"
|
||||
|
||||
|
|
@ -17,6 +16,7 @@
|
|||
#include "message.h"
|
||||
#include "savedata.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "trainer_info.h"
|
||||
#include "vars_flags.h"
|
||||
|
|
@ -27,9 +27,9 @@ typedef struct {
|
|||
Window unk_08[6];
|
||||
Window unk_68;
|
||||
BmpList *unk_78;
|
||||
ResourceMetadata *unk_7C;
|
||||
StringList *unk_7C;
|
||||
UIControlData *unk_80;
|
||||
ResourceMetadata *unk_84;
|
||||
StringList *unk_84;
|
||||
MessageLoader *unk_88;
|
||||
StringTemplate *unk_8C;
|
||||
Camera *camera;
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
#define POKEPLATINUM_STRUCT_OV23_02248D20_H
|
||||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_020298B0_decl.h"
|
||||
|
||||
#include "overlay023/funcptr_ov23_02248D20.h"
|
||||
|
||||
#include "colored_arrow.h"
|
||||
#include "string_list.h"
|
||||
|
||||
typedef struct {
|
||||
UnkFuncPtr_ov23_02248D20 unk_00;
|
||||
UndergroundData *unk_04;
|
||||
ResourceMetadata *unk_08;
|
||||
StringList *unk_08;
|
||||
BmpList *unk_0C;
|
||||
ColoredArrow *unk_10;
|
||||
u16 unk_14;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
#include "struct_decls/cell_actor_data.h"
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_defs/struct_0206A844.h"
|
||||
|
||||
#include "field/field_system_decl.h"
|
||||
|
|
@ -18,6 +17,7 @@
|
|||
|
||||
#include "bg_window.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "sys_task_manager.h"
|
||||
|
||||
|
|
@ -29,13 +29,13 @@ typedef struct {
|
|||
Window unk_10;
|
||||
Window unk_20;
|
||||
Window unk_30;
|
||||
ResourceMetadata *unk_40;
|
||||
ResourceMetadata *unk_44;
|
||||
StringList *unk_40;
|
||||
StringList *unk_44;
|
||||
BmpList *unk_48;
|
||||
UnkStruct_ov23_02248D20 *unk_4C;
|
||||
BmpList *unk_50;
|
||||
UIControlData *unk_54;
|
||||
ResourceMetadata *unk_58;
|
||||
StringList *unk_58;
|
||||
UIControlData *unk_5C;
|
||||
UnkFuncPtr_ov23_022515D8 unk_60;
|
||||
UnkFuncPtr_ov23_022515D8 unk_64;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_02012744_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_0202B370_decl.h"
|
||||
#include "struct_defs/struct_0200C738.h"
|
||||
#include "struct_defs/struct_0207DFAC.h"
|
||||
|
|
@ -22,6 +21,7 @@
|
|||
#include "savedata.h"
|
||||
#include "sprite_resource.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "trainer_info.h"
|
||||
|
||||
struct UnkStruct_ov65_0222EBE0_t {
|
||||
|
|
@ -32,9 +32,9 @@ struct UnkStruct_ov65_0222EBE0_t {
|
|||
u8 unk_2C[32];
|
||||
int unk_4C[32];
|
||||
int unk_CC[32];
|
||||
ResourceMetadata *unk_14C;
|
||||
StringList *unk_14C;
|
||||
BmpList *unk_150;
|
||||
ResourceMetadata *unk_154;
|
||||
StringList *unk_154;
|
||||
BmpList *unk_158;
|
||||
BgConfig *unk_15C;
|
||||
SaveData *unk_160;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
#ifndef POKEPLATINUM_OV70_0225D9A4_H
|
||||
#define POKEPLATINUM_OV70_0225D9A4_H
|
||||
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
|
||||
#include "overlay066/struct_ov66_0222DFF8_decl.h"
|
||||
#include "overlay070/struct_ov70_0225C894_decl.h"
|
||||
#include "overlay070/struct_ov70_0225CA20_decl.h"
|
||||
|
|
@ -16,6 +14,7 @@
|
|||
#include "enums.h"
|
||||
#include "overlay_manager.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
|
||||
int ov70_0225D9A4(OverlayManager *param0, int *param1);
|
||||
int ov70_0225DB90(OverlayManager *param0, int *param1);
|
||||
|
|
@ -51,7 +50,7 @@ void ov70_0225E00C(UnkStruct_ov70_0225DEE8 *param0, u32 param1);
|
|||
void ov70_0225E020(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2);
|
||||
void ov70_0225E034(UnkStruct_ov70_0225DEE8 *param0);
|
||||
void ov70_0225E044(UnkStruct_ov70_0225DEE8 *param0, const Strbuf *param1, u32 param2);
|
||||
const ResourceMetadata *ov70_0225E054(const UnkStruct_ov70_0225DEE8 *param0);
|
||||
const StringList *ov70_0225E054(const UnkStruct_ov70_0225DEE8 *param0);
|
||||
BOOL ov70_0225E064(const UnkStruct_ov70_0225DEE8 *param0, u32 param1);
|
||||
void ov70_0225E074(UnkStruct_ov70_0225DEE8 *param0, const UnkStruct_ov84_02240FA8 *param1, u16 param2, u16 param3);
|
||||
void ov70_0225E0A4(UnkStruct_ov70_0225DEE8 *param0, const UnkStruct_ov84_02240FA8 *param1, u16 param2, u16 param3, u8 param4, u8 param5, u8 param6);
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
#include "struct_decls/struct_0200C6E4_decl.h"
|
||||
#include "struct_decls/struct_0200C704_decl.h"
|
||||
#include "struct_decls/struct_02012744_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_02015920_decl.h"
|
||||
#include "struct_decls/struct_02023FCC_decl.h"
|
||||
#include "struct_defs/sprite_manager_allocation.h"
|
||||
|
|
@ -21,6 +20,7 @@
|
|||
|
||||
#include "bg_window.h"
|
||||
#include "palette.h"
|
||||
#include "string_list.h"
|
||||
#include "touch_screen.h"
|
||||
|
||||
typedef struct {
|
||||
|
|
@ -31,7 +31,7 @@ typedef struct {
|
|||
BgConfig *unk_10;
|
||||
PaletteData *unk_14;
|
||||
Window unk_18[11];
|
||||
ResourceMetadata *unk_C8;
|
||||
StringList *unk_C8;
|
||||
UIControlData *unk_CC;
|
||||
UnkStruct_02007768 *unk_D0;
|
||||
Sprite *unk_D4;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_0200C6E4_decl.h"
|
||||
#include "struct_decls/struct_0200C704_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_defs/struct_020158A8.h"
|
||||
#include "struct_defs/struct_0203D9B8.h"
|
||||
#include "struct_defs/struct_0209903C.h"
|
||||
|
|
@ -19,6 +18,7 @@
|
|||
#include "bg_window.h"
|
||||
#include "cell_actor.h"
|
||||
#include "message.h"
|
||||
#include "string_list.h"
|
||||
|
||||
typedef struct UnkStruct_ov79_021D0E1C_t {
|
||||
int unk_00;
|
||||
|
|
@ -46,8 +46,8 @@ typedef struct UnkStruct_ov79_021D0E1C_t {
|
|||
UnkStruct_ov84_02240FA8 unk_A4;
|
||||
BmpList *unk_C4;
|
||||
BmpList *unk_C8;
|
||||
ResourceMetadata *unk_CC;
|
||||
ResourceMetadata *unk_D0;
|
||||
StringList *unk_CC;
|
||||
StringList *unk_D0;
|
||||
UIControlData *unk_D4;
|
||||
void *unk_D8;
|
||||
void *unk_DC;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
#include "struct_decls/struct_0200C440_decl.h"
|
||||
#include "struct_decls/struct_0200C6E4_decl.h"
|
||||
#include "struct_decls/struct_0200C704_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_0207CB08_decl.h"
|
||||
|
||||
#include "overlay084/struct_ov84_0223B5A0_sub1.h"
|
||||
|
|
@ -19,6 +18,7 @@
|
|||
#include "message.h"
|
||||
#include "narc.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "trainer_info.h"
|
||||
|
||||
|
|
@ -40,10 +40,10 @@ typedef struct {
|
|||
MessageLoader *unk_11C;
|
||||
MessageLoader *unk_120;
|
||||
Strbuf *unk_124[12];
|
||||
ResourceMetadata *unk_154;
|
||||
StringList *unk_154;
|
||||
UIControlData *unk_158;
|
||||
BmpList *unk_15C;
|
||||
ResourceMetadata *unk_160;
|
||||
StringList *unk_160;
|
||||
Strbuf *unk_164[165];
|
||||
Strbuf *unk_3F8;
|
||||
Strbuf *unk_3FC;
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
#define POKEPLATINUM_STRUCT_OV84_02240FA8_H
|
||||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
|
||||
#include "bg_window.h"
|
||||
#include "string_list.h"
|
||||
|
||||
typedef struct {
|
||||
const ResourceMetadata *unk_00;
|
||||
const StringList *unk_00;
|
||||
void (*unk_04)(BmpList *, u32, u8);
|
||||
void (*unk_08)(BmpList *, u32, u8);
|
||||
Window *unk_0C;
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
|
||||
#include "bg_window.h"
|
||||
#include "game_options.h"
|
||||
#include "message.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
|
||||
void ov88_0223E9C4(BgConfig *param0, Window *param1, Options *param2);
|
||||
|
|
@ -17,6 +17,6 @@ void ov88_0223EC78(Window *param0, Strbuf *param1, int param2, u32 param3, int p
|
|||
int ov88_0223ECBC(Window *param0, int param1, int param2, MessageLoader *param3, StringTemplate *param4);
|
||||
u32 ov88_0223ED2C(BgConfig *param0, UIControlData **param1, int *param2);
|
||||
void ov88_0223ED80(Window *param0);
|
||||
BmpList *ov88_0223ED94(ResourceMetadata *param0, int param1, Window *param2, BgConfig *param3);
|
||||
BmpList *ov88_0223ED94(StringList *param0, int param1, Window *param2, BgConfig *param3);
|
||||
|
||||
#endif // POKEPLATINUM_OV88_0223E9C4_H
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
#include "struct_decls/pokedexdata_decl.h"
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
|
||||
#include "overlay094/struct_ov94_0223BA88.h"
|
||||
#include "overlay094/struct_ov94_0223BA88_sub3.h"
|
||||
|
|
@ -13,6 +12,7 @@
|
|||
|
||||
#include "bg_window.h"
|
||||
#include "message.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
|
||||
|
|
@ -30,13 +30,13 @@ void ov94_02242368(MessageLoader *param0, MessageLoader *param1, StringTemplate
|
|||
u16 *ov94_Pokedex_Alphabetical(int heapID, int unused, int *pokedexLength);
|
||||
u8 *ov94_02242548(int param0);
|
||||
void ov94_022425A8(UnkStruct_ov94_0223BA88 *param0, UnkStruct_ov94_0223FD4C *param1);
|
||||
BmpList *ov94_022426A8(UnkStruct_ov94_0223FD4C *param0, ResourceMetadata **param1, Window *param2, MessageLoader *param3);
|
||||
BmpList *ov94_022427C0(UnkStruct_ov94_0223FD4C *param0, ResourceMetadata **param1, Window *param2, MessageLoader *param3, MessageLoader *param4, UnkStruct_ov94_0223FD4C_sub3 *param5, PokedexData *param6);
|
||||
BmpList *ov94_02242840(ResourceMetadata **param0, Window *param1, MessageLoader *param2);
|
||||
BmpList *ov94_022428B0(ResourceMetadata **param0, Window *param1, MessageLoader *param2, int param3);
|
||||
BmpList *ov94_022426A8(UnkStruct_ov94_0223FD4C *param0, StringList **param1, Window *param2, MessageLoader *param3);
|
||||
BmpList *ov94_022427C0(UnkStruct_ov94_0223FD4C *param0, StringList **param1, Window *param2, MessageLoader *param3, MessageLoader *param4, UnkStruct_ov94_0223FD4C_sub3 *param5, PokedexData *param6);
|
||||
BmpList *ov94_02242840(StringList **param0, Window *param1, MessageLoader *param2);
|
||||
BmpList *ov94_022428B0(StringList **param0, Window *param1, MessageLoader *param2, int param3);
|
||||
void ov94_02242934(UnkStruct_ov94_0223BA88_sub3 *param0, int param1, int param2);
|
||||
int ov94_02242970(int param0, int param1, int param2);
|
||||
BmpList *ov94_022429B4(ResourceMetadata **param0, Window *param1, MessageLoader *param2, MessageLoader *param3);
|
||||
BmpList *ov94_022429B4(StringList **param0, Window *param1, MessageLoader *param2, MessageLoader *param3);
|
||||
void ov94_02242A44(UnkStruct_ov94_0223FD4C *param0, int param1);
|
||||
u32 ov94_02242A6C(BmpList *param0, u16 *param1);
|
||||
void ov94_02242AAC(UnkStruct_ov94_02242AAC *param0);
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_0202B370_decl.h"
|
||||
#include "struct_decls/struct_0207AE68_decl.h"
|
||||
#include "struct_defs/pokemon_summary.h"
|
||||
|
|
@ -32,6 +31,7 @@
|
|||
#include "pokemon.h"
|
||||
#include "sprite_resource.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "sys_task_manager.h"
|
||||
#include "trainer_info.h"
|
||||
|
|
@ -121,7 +121,7 @@ typedef struct UnkStruct_ov94_0223FD4C_t {
|
|||
Window unk_FCC[13];
|
||||
Window unk_109C;
|
||||
Window unk_10AC[2];
|
||||
ResourceMetadata *unk_10CC;
|
||||
StringList *unk_10CC;
|
||||
UIControlData *unk_10D0;
|
||||
UIControlData *unk_10D4;
|
||||
BmpList *unk_10D8;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
#include <dwc.h>
|
||||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_defs/struct_0200C738.h"
|
||||
|
||||
#include "overlay097/struct_ov97_0223829C.h"
|
||||
|
|
@ -17,6 +16,7 @@
|
|||
#include "savedata.h"
|
||||
#include "sprite_resource.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
|
||||
typedef struct {
|
||||
|
|
@ -34,7 +34,7 @@ typedef struct {
|
|||
int unk_70;
|
||||
int unk_74;
|
||||
BmpList *unk_78;
|
||||
ResourceMetadata *unk_7C;
|
||||
StringList *unk_7C;
|
||||
int unk_80;
|
||||
int unk_84;
|
||||
int unk_88;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
#include "struct_decls/struct_02007768_decl.h"
|
||||
#include "struct_decls/struct_0200C6E4_decl.h"
|
||||
#include "struct_decls/struct_0200C704_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_defs/struct_0207C690.h"
|
||||
|
||||
#include "overlay119/struct_ov119_021D14DC.h"
|
||||
|
|
@ -14,6 +13,7 @@
|
|||
#include "bg_window.h"
|
||||
#include "narc.h"
|
||||
#include "palette.h"
|
||||
#include "string_list.h"
|
||||
|
||||
typedef struct {
|
||||
BgConfig *unk_00;
|
||||
|
|
@ -26,7 +26,7 @@ typedef struct {
|
|||
UnkStruct_02007768 *unk_38;
|
||||
NARC *unk_3C;
|
||||
UnkStruct_ov119_021D14DC *unk_40;
|
||||
ResourceMetadata *unk_44;
|
||||
StringList *unk_44;
|
||||
UIControlData *unk_48;
|
||||
SpriteGfxHandler *unk_4C;
|
||||
SpriteRenderer *unk_50;
|
||||
|
|
|
|||
18
include/string_list.h
Normal file
18
include/string_list.h
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
#ifndef POKEPLATINUM_STRING_LIST_H
|
||||
#define POKEPLATINUM_STRING_LIST_H
|
||||
|
||||
#include "message.h"
|
||||
#include "strbuf.h"
|
||||
|
||||
typedef struct StringList {
|
||||
const void *entry;
|
||||
u32 index;
|
||||
} StringList;
|
||||
|
||||
StringList *StringList_New(u32 param0, u32 param1);
|
||||
void StringList_Free(StringList *param0);
|
||||
void StringList_AddFromMessageBank(StringList *param0, const MessageLoader *param1, u32 param2, u32 param3);
|
||||
void StringList_AddFromStrbuf(StringList *param0, const Strbuf *param1, u32 param2);
|
||||
void StringList_AddFromEntry(StringList *param0, const StringList *param1);
|
||||
|
||||
#endif // POKEPLATINUM_STRING_LIST_H
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
#ifndef POKEPLATINUM_STRUCT_02013A04_DECL_H
|
||||
#define POKEPLATINUM_STRUCT_02013A04_DECL_H
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
|
||||
typedef struct ResourceMetadata_t ResourceMetadata;
|
||||
|
||||
#endif // POKEPLATINUM_STRUCT_02013A04_DECL_H
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
#ifndef POKEPLATINUM_STRUCT_02013A04_T_H
|
||||
#define POKEPLATINUM_STRUCT_02013A04_T_H
|
||||
|
||||
struct ResourceMetadata_t {
|
||||
const void *unk_00;
|
||||
u32 unk_04;
|
||||
};
|
||||
|
||||
#endif // POKEPLATINUM_STRUCT_02013A04_T_H
|
||||
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
#include "struct_decls/cell_actor_data.h"
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_defs/struct_020684D0.h"
|
||||
#include "struct_defs/struct_02070950.h"
|
||||
|
||||
|
|
@ -11,12 +10,13 @@
|
|||
#include "overlay005/struct_ov5_021D30A8.h"
|
||||
|
||||
#include "bg_window.h"
|
||||
#include "string_list.h"
|
||||
|
||||
typedef struct {
|
||||
Window unk_00;
|
||||
Window unk_10;
|
||||
UIControlData *unk_20;
|
||||
ResourceMetadata *unk_24;
|
||||
StringList *unk_24;
|
||||
u16 unk_28;
|
||||
u16 state;
|
||||
u32 unk_2C;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
#include "struct_decls/struct_0200C440_decl.h"
|
||||
#include "struct_decls/struct_0200C6E4_decl.h"
|
||||
#include "struct_decls/struct_0200C704_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_02098700_decl.h"
|
||||
#include "struct_defs/funcptr_0207F248_sub1.h"
|
||||
#include "struct_defs/struct_0207C690.h"
|
||||
|
|
@ -22,6 +21,7 @@
|
|||
#include "cell_actor.h"
|
||||
#include "message.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
|
||||
typedef struct {
|
||||
|
|
@ -43,7 +43,7 @@ typedef struct {
|
|||
Strbuf *unk_6A4;
|
||||
Strbuf *unk_6A8;
|
||||
Strbuf *unk_6AC[20];
|
||||
ResourceMetadata *unk_6FC;
|
||||
StringList *unk_6FC;
|
||||
UIControlData *unk_700;
|
||||
StrBufWrapper unk_704[6];
|
||||
const ByteFlagSet *unk_7F4;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
#ifndef POKEPLATINUM_STRUCT_02081CF4_H
|
||||
#define POKEPLATINUM_STRUCT_02081CF4_H
|
||||
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
|
||||
#include "bg_window.h"
|
||||
#include "string_list.h"
|
||||
|
||||
typedef struct {
|
||||
const ResourceMetadata *unk_00;
|
||||
const StringList *unk_00;
|
||||
Window *unk_04;
|
||||
u8 unk_08;
|
||||
u8 unk_09;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_02027F8C_decl.h"
|
||||
#include "struct_decls/struct_0202B370_decl.h"
|
||||
#include "struct_decls/struct_02095E80_decl.h"
|
||||
|
|
@ -29,6 +28,7 @@
|
|||
#include "savedata.h"
|
||||
#include "sprite_resource.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "sys_task_manager.h"
|
||||
|
||||
|
|
@ -84,7 +84,7 @@ struct UnkStruct_02095E80_t {
|
|||
SysTask *unk_480[7];
|
||||
Window unk_49C[34];
|
||||
UIControlData *unk_6BC;
|
||||
ResourceMetadata *unk_6C0;
|
||||
StringList *unk_6C0;
|
||||
UIControlData *unk_6C4;
|
||||
int unk_6C8;
|
||||
int unk_6CC;
|
||||
|
|
@ -125,7 +125,7 @@ struct UnkStruct_02095E80_t {
|
|||
int unk_36C8;
|
||||
StringTemplate *unk_36CC;
|
||||
MessageLoader *unk_36D0;
|
||||
ResourceMetadata *unk_36D4;
|
||||
StringList *unk_36D4;
|
||||
BmpList *unk_36D8;
|
||||
Window unk_36DC;
|
||||
UnkStruct_0202B370 *unk_36EC;
|
||||
|
|
|
|||
|
|
@ -2,10 +2,11 @@
|
|||
#define POKEPLATINUM_UNK_0200112C_H
|
||||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
|
||||
#include "overlay084/struct_ov84_02240FA8.h"
|
||||
|
||||
#include "string_list.h"
|
||||
|
||||
BmpList *sub_0200112C(const UnkStruct_ov84_02240FA8 *param0, u16 param1, u16 param2, u8 param3);
|
||||
u32 sub_02001288(BmpList *param0);
|
||||
void sub_02001384(BmpList *param0, u16 *param1, u16 *param2);
|
||||
|
|
@ -18,6 +19,6 @@ void sub_020014DC(BmpList *param0, u16 *param1, u16 *param2);
|
|||
u8 sub_020014F0(BmpList *param0);
|
||||
u32 sub_020014F8(BmpList *param0, u16 param1);
|
||||
u32 sub_02001504(BmpList *param0, u8 param1);
|
||||
void sub_020015CC(BmpList *param0, ResourceMetadata *param1);
|
||||
void sub_020015CC(BmpList *param0, StringList *param1);
|
||||
|
||||
#endif // POKEPLATINUM_UNK_0200112C_H
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
#ifndef POKEPLATINUM_UNK_02013A04_H
|
||||
#define POKEPLATINUM_UNK_02013A04_H
|
||||
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
|
||||
#include "message.h"
|
||||
#include "strbuf.h"
|
||||
|
||||
ResourceMetadata *sub_02013A04(u32 param0, u32 param1);
|
||||
void sub_02013A3C(ResourceMetadata *param0);
|
||||
void sub_02013A4C(ResourceMetadata *param0, const MessageLoader *param1, u32 param2, u32 param3);
|
||||
void sub_02013A6C(ResourceMetadata *param0, const Strbuf *param1, u32 param2);
|
||||
void sub_02013A90(ResourceMetadata *param0, const ResourceMetadata *param1);
|
||||
void sub_02013AE8(ResourceMetadata *param0);
|
||||
|
||||
#endif // POKEPLATINUM_UNK_02013A04_H
|
||||
|
|
@ -51,7 +51,7 @@ Static main
|
|||
Object main.nef.p/src_unk_02012744.c.o
|
||||
Object main.nef.p/src_unk_020131EC.c.o
|
||||
Object main.nef.p/src_rtc.c.o
|
||||
Object main.nef.p/src_unk_02013A04.c.o
|
||||
Object main.nef.p/src_string_list.c.o
|
||||
Object main.nef.p/src_screen_scroll_manager.c.o
|
||||
Object main.nef.p/src_unk_02014000.c.o
|
||||
Object main.nef.p/src_colored_arrow.c.o
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@
|
|||
#include "savedata.h"
|
||||
#include "script_manager.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "trainer_info.h"
|
||||
|
|
@ -67,7 +68,6 @@
|
|||
#include "unk_0200C6E4.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_02014A84.h"
|
||||
#include "unk_0202631C.h"
|
||||
#include "unk_02028124.h"
|
||||
|
|
@ -533,7 +533,7 @@ static void sub_0203ADFC(TaskManager *taskMan)
|
|||
|
||||
v2 = MessageLoader_Init(0, 26, 367, 11);
|
||||
|
||||
menu->unk_24 = sub_02013A04(v5, 11);
|
||||
menu->unk_24 = StringList_New(v5, 11);
|
||||
menu->unk_28 = 0;
|
||||
|
||||
for (v4 = 0; v4 < v5; v4++) {
|
||||
|
|
@ -548,13 +548,13 @@ static void sub_0203ADFC(TaskManager *taskMan)
|
|||
|
||||
StringTemplate_SetPlayerName(v6, 0, SaveData_GetTrainerInfo(fieldSystem->saveData));
|
||||
StringTemplate_Format(v6, v7, v8);
|
||||
sub_02013A6C(menu->unk_24, v7, menu->unk_30[v4]);
|
||||
StringList_AddFromStrbuf(menu->unk_24, v7, menu->unk_30[v4]);
|
||||
|
||||
Strbuf_Free(v8);
|
||||
Strbuf_Free(v7);
|
||||
StringTemplate_Free(v6);
|
||||
} else {
|
||||
sub_02013A4C(
|
||||
StringList_AddFromMessageBank(
|
||||
menu->unk_24, v2, Unk_020EA05C[menu->unk_30[v4]][0], menu->unk_30[v4]);
|
||||
}
|
||||
|
||||
|
|
@ -642,7 +642,7 @@ static void FieldMenu_Close(FieldMenu *menu)
|
|||
{
|
||||
sub_0203B4E8(menu);
|
||||
sub_02001BC4(menu->unk_20, NULL);
|
||||
sub_02013A3C(menu->unk_24);
|
||||
StringList_Free(menu->unk_24);
|
||||
|
||||
menu->unk_20 = NULL;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ pokeplatinum_c = files(
|
|||
'unk_02012744.c',
|
||||
'unk_020131EC.c',
|
||||
'rtc.c',
|
||||
'unk_02013A04.c',
|
||||
'string_list.c',
|
||||
'screen_scroll_manager.c',
|
||||
'unk_02014000.c',
|
||||
'colored_arrow.c',
|
||||
|
|
|
|||
|
|
@ -5,8 +5,6 @@
|
|||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
#include "struct_defs/struct_02081CF4.h"
|
||||
|
||||
#include "field/field_system.h"
|
||||
|
|
@ -21,6 +19,7 @@
|
|||
#include "message.h"
|
||||
#include "save_player.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "sys_task.h"
|
||||
#include "sys_task_manager.h"
|
||||
|
|
@ -59,12 +58,12 @@ struct UnkStruct_ov5_021DC1A4_t {
|
|||
u16 *unk_A8;
|
||||
UnkStruct_02081CF4 unk_AC;
|
||||
UIControlData *unk_B8;
|
||||
ResourceMetadata unk_BC[28];
|
||||
StringList unk_BC[28];
|
||||
UnkStruct_ov84_02240FA8 unk_19C;
|
||||
BmpList *unk_1BC;
|
||||
u16 unk_1C0;
|
||||
u16 unk_1C2;
|
||||
ResourceMetadata unk_1C4[28];
|
||||
StringList unk_1C4[28];
|
||||
u16 unk_2A4[28];
|
||||
u16 unk_2DC;
|
||||
};
|
||||
|
|
@ -132,13 +131,13 @@ static void ov5_021DC018(FieldSystem *fieldSystem, UnkStruct_ov5_021DC1A4 *param
|
|||
param1->unk_2DC = param4;
|
||||
|
||||
for (v0 = 0; v0 < 28; v0++) {
|
||||
param1->unk_BC[v0].unk_00 = NULL;
|
||||
param1->unk_BC[v0].unk_04 = 0;
|
||||
param1->unk_BC[v0].entry = NULL;
|
||||
param1->unk_BC[v0].index = 0;
|
||||
}
|
||||
|
||||
for (v0 = 0; v0 < 28; v0++) {
|
||||
param1->unk_1C4[v0].unk_00 = NULL;
|
||||
param1->unk_1C4[v0].unk_04 = 0;
|
||||
param1->unk_1C4[v0].entry = NULL;
|
||||
param1->unk_1C4[v0].index = 0;
|
||||
param1->unk_2A4[v0] = 0xff;
|
||||
}
|
||||
|
||||
|
|
@ -216,11 +215,11 @@ static void ov5_021DC290(UnkStruct_ov5_021DC1A4 *param0, u32 param1, u32 param2)
|
|||
|
||||
MessageLoader_GetStrbuf(param0->unk_8C, param1, v2);
|
||||
StringTemplate_Format(param0->unk_90, param0->unk_1C[param0->unk_9B], v2);
|
||||
param0->unk_BC[param0->unk_9B].unk_00 = (const void *)param0->unk_1C[param0->unk_9B];
|
||||
param0->unk_BC[param0->unk_9B].entry = (const void *)param0->unk_1C[param0->unk_9B];
|
||||
Strbuf_Free(v2);
|
||||
}
|
||||
|
||||
param0->unk_BC[param0->unk_9B].unk_04 = param2;
|
||||
param0->unk_BC[param0->unk_9B].index = param2;
|
||||
param0->unk_9B++;
|
||||
|
||||
return;
|
||||
|
|
@ -235,11 +234,11 @@ static u32 ov5_021DC300(UnkStruct_ov5_021DC1A4 *param0)
|
|||
v2 = 0;
|
||||
|
||||
for (v0 = 0; v0 < param0->unk_9B; v0++) {
|
||||
if (param0->unk_BC[v0].unk_00 == NULL) {
|
||||
if (param0->unk_BC[v0].entry == NULL) {
|
||||
break;
|
||||
}
|
||||
|
||||
v1 = Font_CalcStringWidthWithCursorControl(FONT_SYSTEM, (Strbuf *)param0->unk_BC[v0].unk_00);
|
||||
v1 = Font_CalcStringWidthWithCursorControl(FONT_SYSTEM, (Strbuf *)param0->unk_BC[v0].entry);
|
||||
|
||||
if (v2 < v1) {
|
||||
v2 = v1;
|
||||
|
|
@ -440,14 +439,14 @@ static void ov5_021DC708(UnkStruct_ov5_021DC1A4 *param0, u32 param1, u32 param2,
|
|||
|
||||
MessageLoader_GetStrbuf(param0->unk_8C, param1, v2);
|
||||
StringTemplate_Format(param0->unk_90, param0->unk_1C[param0->unk_9B], v2);
|
||||
param0->unk_1C4[param0->unk_9B].unk_00 = (const void *)param0->unk_1C[param0->unk_9B];
|
||||
param0->unk_1C4[param0->unk_9B].entry = (const void *)param0->unk_1C[param0->unk_9B];
|
||||
Strbuf_Free(v2);
|
||||
}
|
||||
|
||||
if (param3 == 0xfa) {
|
||||
param0->unk_1C4[param0->unk_9B].unk_04 = 0xfffffffd;
|
||||
param0->unk_1C4[param0->unk_9B].index = 0xfffffffd;
|
||||
} else {
|
||||
param0->unk_1C4[param0->unk_9B].unk_04 = param3;
|
||||
param0->unk_1C4[param0->unk_9B].index = param3;
|
||||
}
|
||||
|
||||
param0->unk_2A4[param0->unk_9B] = param2;
|
||||
|
|
@ -465,11 +464,11 @@ static u32 ov5_021DC7A8(UnkStruct_ov5_021DC1A4 *param0)
|
|||
v2 = 0;
|
||||
|
||||
for (v0 = 0; v0 < param0->unk_9B; v0++) {
|
||||
if (param0->unk_1C4[v0].unk_00 == NULL) {
|
||||
if (param0->unk_1C4[v0].entry == NULL) {
|
||||
break;
|
||||
}
|
||||
|
||||
v1 = Font_CalcStringWidthWithCursorControl(FONT_SYSTEM, (Strbuf *)param0->unk_1C4[v0].unk_00);
|
||||
v1 = Font_CalcStringWidthWithCursorControl(FONT_SYSTEM, (Strbuf *)param0->unk_1C4[v0].entry);
|
||||
|
||||
if (v2 < v1) {
|
||||
v2 = v1;
|
||||
|
|
|
|||
|
|
@ -5,10 +5,8 @@
|
|||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_0202B370_decl.h"
|
||||
#include "struct_decls/struct_020508D4_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
|
||||
#include "field/field_system.h"
|
||||
#include "overlay084/struct_ov84_02240FA8.h"
|
||||
|
|
@ -24,6 +22,7 @@
|
|||
#include "save_player.h"
|
||||
#include "savedata.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "trainer_info.h"
|
||||
|
|
@ -31,7 +30,6 @@
|
|||
#include "unk_02001AF4.h"
|
||||
#include "unk_02005474.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_0202ACE0.h"
|
||||
#include "unk_0203061C.h"
|
||||
#include "unk_0203909C.h"
|
||||
|
|
@ -39,7 +37,7 @@
|
|||
#include "unk_0205D8CC.h"
|
||||
|
||||
typedef struct {
|
||||
ResourceMetadata *unk_00;
|
||||
StringList *unk_00;
|
||||
BmpList *unk_04;
|
||||
Strbuf *unk_08;
|
||||
Strbuf *unk_0C;
|
||||
|
|
@ -263,7 +261,7 @@ static BOOL ov5_021EAB58(UnkStruct_ov5_021EAE78 *param0)
|
|||
int v2 = sub_0202AF94(v0);
|
||||
int v3 = 5;
|
||||
|
||||
param0->unk_00 = sub_02013A04(v2 + 1, 4);
|
||||
param0->unk_00 = StringList_New(v2 + 1, 4);
|
||||
|
||||
Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_20, 3, 19, 1, 12, v3 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (10 * (v3 + 2) * 2));
|
||||
Window_Show(¶m0->unk_20, 1, 1024 - (18 + 12) - 9, 11);
|
||||
|
|
@ -275,11 +273,11 @@ static BOOL ov5_021EAB58(UnkStruct_ov5_021EAE78 *param0)
|
|||
for (v5 = 0; v5 < 32; v5++) {
|
||||
if (sub_0202AF78(v0, v5)) {
|
||||
Strbuf_CopyChars(param0->unk_08, sub_0202AEF0(v0, v5));
|
||||
sub_02013A6C(param0->unk_00, param0->unk_08, v5);
|
||||
StringList_AddFromStrbuf(param0->unk_00, param0->unk_08, v5);
|
||||
}
|
||||
}
|
||||
|
||||
sub_02013A4C(param0->unk_00, param0->unk_3C, 11, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(param0->unk_00, param0->unk_3C, 11, 0xfffffffe);
|
||||
}
|
||||
|
||||
v1 = Unk_ov5_021FAF08;
|
||||
|
|
@ -336,7 +334,7 @@ static BOOL ov5_021EAC44(UnkStruct_ov5_021EAE78 *param0)
|
|||
Window_Clear(¶m0->unk_20, 0);
|
||||
Window_Remove(¶m0->unk_20);
|
||||
sub_02001384(param0->unk_04, NULL, NULL);
|
||||
sub_02013A3C(param0->unk_00);
|
||||
StringList_Free(param0->unk_00);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,14 +6,12 @@
|
|||
#include "consts/game_records.h"
|
||||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_020216E0_decl.h"
|
||||
#include "struct_decls/struct_0202C878_decl.h"
|
||||
#include "struct_decls/struct_020308A0_decl.h"
|
||||
#include "struct_decls/struct_02061830_decl.h"
|
||||
#include "struct_decls/struct_02061AB4_decl.h"
|
||||
#include "struct_decls/struct_party_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
|
||||
#include "field/field_system.h"
|
||||
#include "overlay005/ov5_021EB1A0.h"
|
||||
|
|
@ -37,6 +35,7 @@
|
|||
#include "savedata_misc.h"
|
||||
#include "script_manager.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "sys_task.h"
|
||||
#include "sys_task_manager.h"
|
||||
|
|
@ -87,7 +86,7 @@ struct UnkStruct_ov5_021F6704_t {
|
|||
BmpList *unk_23C;
|
||||
u16 unk_240;
|
||||
u16 unk_242;
|
||||
ResourceMetadata unk_244[120];
|
||||
StringList unk_244[120];
|
||||
u16 unk_604[120];
|
||||
u16 unk_6F4;
|
||||
};
|
||||
|
|
@ -236,8 +235,8 @@ static void ov5_021F6624(FieldSystem *fieldSystem, UnkStruct_ov5_021F6704 *param
|
|||
param1->unk_6F4 = param4;
|
||||
|
||||
for (v0 = 0; v0 < 120; v0++) {
|
||||
param1->unk_244[v0].unk_00 = NULL;
|
||||
param1->unk_244[v0].unk_04 = 0;
|
||||
param1->unk_244[v0].entry = NULL;
|
||||
param1->unk_244[v0].index = 0;
|
||||
param1->unk_604[v0] = 0xff;
|
||||
}
|
||||
|
||||
|
|
@ -300,14 +299,14 @@ static void ov5_021F6830(UnkStruct_ov5_021F6704 *param0, u32 param1, u32 param2,
|
|||
|
||||
MessageLoader_GetStrbuf(param0->unk_1FC, param1, v2);
|
||||
StringTemplate_Format(param0->unk_200, param0->unk_1C[param0->unk_20B], v2);
|
||||
param0->unk_244[param0->unk_20B].unk_00 = (const void *)param0->unk_1C[param0->unk_20B];
|
||||
param0->unk_244[param0->unk_20B].entry = (const void *)param0->unk_1C[param0->unk_20B];
|
||||
Strbuf_Free(v2);
|
||||
}
|
||||
|
||||
if (param3 == 0xfa) {
|
||||
param0->unk_244[param0->unk_20B].unk_04 = 0xfffffffd;
|
||||
param0->unk_244[param0->unk_20B].index = 0xfffffffd;
|
||||
} else {
|
||||
param0->unk_244[param0->unk_20B].unk_04 = param3;
|
||||
param0->unk_244[param0->unk_20B].index = param3;
|
||||
}
|
||||
|
||||
param0->unk_604[param0->unk_20B] = param2;
|
||||
|
|
|
|||
|
|
@ -7,8 +7,6 @@
|
|||
#include "constants/species.h"
|
||||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
|
||||
#include "field/field_system.h"
|
||||
#include "overlay005/ov5_021DC018.h"
|
||||
|
|
@ -26,6 +24,7 @@
|
|||
#include "pokemon.h"
|
||||
#include "script_manager.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "sys_task.h"
|
||||
#include "sys_task_manager.h"
|
||||
|
|
@ -63,7 +62,7 @@ struct UnkStruct_ov5_021F7ED8_t {
|
|||
BmpList *unk_F0;
|
||||
u16 unk_F4;
|
||||
u16 unk_F6;
|
||||
ResourceMetadata unk_F8[39];
|
||||
StringList unk_F8[39];
|
||||
u16 unk_230[39];
|
||||
u16 unk_27E;
|
||||
};
|
||||
|
|
@ -434,8 +433,8 @@ static void ov5_021F7E18(FieldSystem *fieldSystem, UnkStruct_ov5_021F7ED8 *param
|
|||
param1->unk_27E = param4;
|
||||
|
||||
for (v0 = 0; v0 < ((NELEMS(sTeachableMoves)) + 1); v0++) {
|
||||
param1->unk_F8[v0].unk_00 = NULL;
|
||||
param1->unk_F8[v0].unk_04 = 0;
|
||||
param1->unk_F8[v0].entry = NULL;
|
||||
param1->unk_F8[v0].index = 0;
|
||||
param1->unk_230[v0] = 0xff;
|
||||
}
|
||||
|
||||
|
|
@ -499,14 +498,14 @@ static void ov5_021F7FF8(UnkStruct_ov5_021F7ED8 *param0, u32 param1, u32 param2,
|
|||
|
||||
MessageLoader_GetStrbuf(param0->unk_B8, param1, v2);
|
||||
StringTemplate_Format(param0->unk_BC, param0->unk_1C[param0->unk_C7], v2);
|
||||
param0->unk_F8[param0->unk_C7].unk_00 = (const void *)param0->unk_1C[param0->unk_C7];
|
||||
param0->unk_F8[param0->unk_C7].entry = (const void *)param0->unk_1C[param0->unk_C7];
|
||||
Strbuf_Free(v2);
|
||||
}
|
||||
|
||||
if (param3 == 0xfa) {
|
||||
param0->unk_F8[param0->unk_C7].unk_04 = 0xfffffffd;
|
||||
param0->unk_F8[param0->unk_C7].index = 0xfffffffd;
|
||||
} else {
|
||||
param0->unk_F8[param0->unk_C7].unk_04 = param3;
|
||||
param0->unk_F8[param0->unk_C7].index = param3;
|
||||
}
|
||||
|
||||
param0->unk_230[param0->unk_C7] = param2;
|
||||
|
|
|
|||
|
|
@ -8,8 +8,6 @@
|
|||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
|
||||
#include "field/field_system.h"
|
||||
#include "gmm/message_bank_unk_0353.h"
|
||||
|
|
@ -26,6 +24,7 @@
|
|||
#include "render_text.h"
|
||||
#include "save_player.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "sys_task.h"
|
||||
#include "sys_task_manager.h"
|
||||
|
|
@ -35,7 +34,6 @@
|
|||
#include "unk_02001AF4.h"
|
||||
#include "unk_02005474.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_02033200.h"
|
||||
#include "unk_020363E8.h"
|
||||
#include "unk_020366A0.h"
|
||||
|
|
@ -55,7 +53,7 @@ typedef struct CommClubManager {
|
|||
StringTemplate *strTempMsg;
|
||||
BmpList *unk_5C;
|
||||
UIControlData *unk_60;
|
||||
ResourceMetadata *unk_64;
|
||||
StringList *unk_64;
|
||||
FieldSystem *fieldSystem;
|
||||
CommClubManTaskFunc commClubTask;
|
||||
UnkFuncPtr_ov7_02249C2C_1 unk_70;
|
||||
|
|
@ -436,13 +434,13 @@ static void ov7_02249F54(SysTask *task, void *data)
|
|||
if (FieldMessage_FinishedPrinting(sCommClubMan->printMsgIndex)) {
|
||||
int v2;
|
||||
|
||||
sCommClubMan->unk_64 = sub_02013A04(16, 4);
|
||||
sCommClubMan->unk_64 = StringList_New(16, 4);
|
||||
|
||||
for (v2 = 0; v2 < 16; v2++) {
|
||||
StringTemplate_SetNumber(sCommClubMan->unk_50, 0, v2 + 1, 2, 2, 1);
|
||||
MessageLoader_GetStrbuf(sCommClubMan->msgLoader, pl_msg_00000353_00064, sCommClubMan->strBuff[1]);
|
||||
StringTemplate_Format(sCommClubMan->unk_50, sCommClubMan->strBuff[0], sCommClubMan->strBuff[1]);
|
||||
sub_02013A6C(sCommClubMan->unk_64, sCommClubMan->strBuff[0], 0);
|
||||
StringList_AddFromStrbuf(sCommClubMan->unk_64, sCommClubMan->strBuff[0], 0);
|
||||
}
|
||||
|
||||
CommClubMan_CreateList(Unk_ov7_0224ED34, 1, 2, 20, 5 * 2, 1);
|
||||
|
|
@ -848,10 +846,10 @@ static void ov7_0224A72C(SysTask *task, void *param1)
|
|||
if (FieldMessage_FinishedPrinting(sCommClubMan->printMsgIndex)) {
|
||||
int netId;
|
||||
|
||||
sCommClubMan->unk_64 = sub_02013A04(5, 4);
|
||||
sCommClubMan->unk_64 = StringList_New(5, 4);
|
||||
|
||||
for (netId = 0; netId < 5; netId++) {
|
||||
sub_02013A4C(sCommClubMan->unk_64, sCommClubMan->msgLoader, pl_msg_00000353_00069, 0);
|
||||
StringList_AddFromMessageBank(sCommClubMan->unk_64, sCommClubMan->msgLoader, pl_msg_00000353_00069, 0);
|
||||
}
|
||||
|
||||
sCommClubMan->unk_98 = 1;
|
||||
|
|
@ -1376,7 +1374,7 @@ static void CommClubMan_DestroyList(SysTask *task, CommClubManager *param1)
|
|||
{
|
||||
Window_FillTilemap(&sCommClubMan->msgWindow, 15);
|
||||
Window_Clear(¶m1->unk_20, 0);
|
||||
sub_02013A3C(param1->unk_64);
|
||||
StringList_Free(param1->unk_64);
|
||||
sub_02001384(param1->unk_5C, NULL, NULL);
|
||||
Window_ClearAndCopyToVRAM(¶m1->unk_20);
|
||||
Window_Remove(¶m1->unk_20);
|
||||
|
|
|
|||
|
|
@ -4,11 +4,9 @@
|
|||
#include <string.h>
|
||||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_020508D4_decl.h"
|
||||
#include "struct_decls/struct_02098700_decl.h"
|
||||
#include "struct_decls/struct_party_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
#include "struct_defs/struct_0202610C.h"
|
||||
|
||||
#include "field/field_system.h"
|
||||
|
|
@ -22,12 +20,12 @@
|
|||
#include "party.h"
|
||||
#include "save_player.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "unk_0200112C.h"
|
||||
#include "unk_02005474.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_0202602C.h"
|
||||
#include "unk_02026150.h"
|
||||
#include "unk_020508D4.h"
|
||||
|
|
@ -37,8 +35,8 @@
|
|||
typedef struct {
|
||||
BmpList *unk_00;
|
||||
BmpList *unk_04;
|
||||
ResourceMetadata *unk_08;
|
||||
ResourceMetadata *unk_0C;
|
||||
StringList *unk_08;
|
||||
StringList *unk_0C;
|
||||
FieldSystem *fieldSystem;
|
||||
Strbuf *unk_14;
|
||||
Strbuf *unk_18;
|
||||
|
|
@ -133,21 +131,21 @@ static void ov7_0224B5A8(UnkStruct_ov7_0224B4E8 *param0)
|
|||
if (Window_IsInUse(v1) == 0) {
|
||||
int v4;
|
||||
|
||||
param0->unk_08 = sub_02013A04(v3 + 2, 4);
|
||||
param0->unk_08 = StringList_New(v3 + 2, 4);
|
||||
|
||||
Window_Add(param0->fieldSystem->unk_08, v1, 3, 1, 1, 16, (v3 + 2) * 2, 13, 1);
|
||||
Window_Show(¶m0->unk_34, 1, 1024 - (18 + 12) - 9, 11);
|
||||
sub_02013A4C(param0->unk_08, param0->unk_68, 123, 12);
|
||||
StringList_AddFromMessageBank(param0->unk_08, param0->unk_68, 123, 12);
|
||||
|
||||
for (v4 = 0; v4 < v3; v4++) {
|
||||
ov7_0224B57C(param0, v4);
|
||||
|
||||
MessageLoader_GetStrbuf(param0->unk_68, 113, param0->unk_1C);
|
||||
StringTemplate_Format(param0->unk_64, param0->unk_20, param0->unk_1C);
|
||||
sub_02013A6C(param0->unk_08, param0->unk_20, v4);
|
||||
StringList_AddFromStrbuf(param0->unk_08, param0->unk_20, v4);
|
||||
}
|
||||
|
||||
sub_02013A4C(param0->unk_08, param0->unk_68, 114, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(param0->unk_08, param0->unk_68, 114, 0xfffffffe);
|
||||
}
|
||||
|
||||
v0 = Unk_ov7_0224F188;
|
||||
|
|
@ -168,7 +166,7 @@ static void ov7_0224B6AC(UnkStruct_ov7_0224B4E8 *param0)
|
|||
Window_Clear(¶m0->unk_34, 1);
|
||||
Bg_ScheduleTilemapTransfer(param0->unk_34.bgConfig, param0->unk_34.bgLayer);
|
||||
Window_Remove(¶m0->unk_34);
|
||||
sub_02013A3C(param0->unk_08);
|
||||
StringList_Free(param0->unk_08);
|
||||
|
||||
param0->unk_00 = NULL;
|
||||
}
|
||||
|
|
@ -226,7 +224,7 @@ static void ov7_0224B788(UnkStruct_ov7_0224B4E8 *param0)
|
|||
int v5 = 22;
|
||||
UnkStruct_ov7_0224F4D8 *v6 = Unk_ov7_0224F4D8;
|
||||
|
||||
param0->unk_0C = sub_02013A04(v1, 4);
|
||||
param0->unk_0C = StringList_New(v1, 4);
|
||||
|
||||
Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_44, 3, v5, v3, v4, v1 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - v4 * v1 * 2);
|
||||
Window_Show(¶m0->unk_44, 1, 1024 - (18 + 12) - 9, 11);
|
||||
|
|
@ -235,7 +233,7 @@ static void ov7_0224B788(UnkStruct_ov7_0224B4E8 *param0)
|
|||
int v7;
|
||||
|
||||
for (v7 = 0; v7 < v1; v7++) {
|
||||
sub_02013A4C(param0->unk_0C, param0->unk_68, v6->unk_00, v6->unk_04);
|
||||
StringList_AddFromMessageBank(param0->unk_0C, param0->unk_68, v6->unk_00, v6->unk_04);
|
||||
v6++;
|
||||
}
|
||||
}
|
||||
|
|
@ -284,7 +282,7 @@ static int ov7_0224B83C(UnkStruct_ov7_0224B4E8 *param0)
|
|||
Window_Clear(¶m0->unk_44, 1);
|
||||
Bg_ScheduleTilemapTransfer(param0->unk_44.bgConfig, param0->unk_44.bgLayer);
|
||||
Window_Remove(¶m0->unk_44);
|
||||
sub_02013A3C(param0->unk_0C);
|
||||
StringList_Free(param0->unk_0C);
|
||||
|
||||
param0->unk_04 = NULL;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,10 +5,8 @@
|
|||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_02029D04_decl.h"
|
||||
#include "struct_defs/struct_0200C738.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
|
||||
#include "overlay007/struct_ov7_0224BEFC_decl.h"
|
||||
#include "overlay084/struct_ov84_02240FA8.h"
|
||||
|
|
@ -26,6 +24,7 @@
|
|||
#include "savedata.h"
|
||||
#include "sprite_resource.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "unk_0200112C.h"
|
||||
|
|
@ -88,7 +87,7 @@ typedef struct {
|
|||
u32 unk_00;
|
||||
Window *unk_04;
|
||||
BmpList *unk_08;
|
||||
ResourceMetadata unk_0C[23];
|
||||
StringList unk_0C[23];
|
||||
Strbuf *unk_C4[23];
|
||||
s32 unk_120;
|
||||
StringTemplate *unk_124;
|
||||
|
|
@ -608,13 +607,13 @@ static void ov7_0224C768(UnkStruct_ov7_0224C768 *param0, BgConfig *param1, u32 p
|
|||
StringTemplate_Format(param0->unk_124, param0->unk_128, v1);
|
||||
|
||||
param0->unk_C4[v0] = Strbuf_Clone(param0->unk_128, param2);
|
||||
param0->unk_0C[v0].unk_00 = param0->unk_C4[v0];
|
||||
param0->unk_0C[v0].unk_04 = v0;
|
||||
param0->unk_0C[v0].entry = param0->unk_C4[v0];
|
||||
param0->unk_0C[v0].index = v0;
|
||||
}
|
||||
|
||||
param0->unk_C4[param4] = MessageLoader_GetNewStrbuf(param5, 19);
|
||||
param0->unk_0C[param4].unk_00 = param0->unk_C4[param4];
|
||||
param0->unk_0C[param4].unk_04 = param4;
|
||||
param0->unk_0C[param4].entry = param0->unk_C4[param4];
|
||||
param0->unk_0C[param4].index = param4;
|
||||
|
||||
StringTemplate_Free(param0->unk_124);
|
||||
Strbuf_Free(param0->unk_128);
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@
|
|||
#include "save_player.h"
|
||||
#include "sprite_resource.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "trainer_info.h"
|
||||
|
|
@ -48,7 +49,6 @@
|
|||
#include "unk_0200C6E4.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_0202854C.h"
|
||||
#include "unk_0202C9F4.h"
|
||||
#include "unk_0202D05C.h"
|
||||
|
|
@ -328,25 +328,25 @@ static void ov7_0224D040(UnkStruct_ov7_0224D008 *param0)
|
|||
|
||||
if (param0->unk_2A9 == 0) {
|
||||
v1 = 3;
|
||||
param0->unk_84 = sub_02013A04(v1, 11);
|
||||
param0->unk_84 = StringList_New(v1, 11);
|
||||
|
||||
sub_02013A4C(param0->unk_84, param0->unk_88, 15, 2);
|
||||
sub_02013A4C(param0->unk_84, param0->unk_88, 16, 14);
|
||||
sub_02013A4C(param0->unk_84, param0->unk_88, 17, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(param0->unk_84, param0->unk_88, 15, 2);
|
||||
StringList_AddFromMessageBank(param0->unk_84, param0->unk_88, 16, 14);
|
||||
StringList_AddFromMessageBank(param0->unk_84, param0->unk_88, 17, 0xfffffffe);
|
||||
Window_Add(param0->unk_00, ¶m0->unk_08[0], 3, 1, 1, 13, 6, 13, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (13 * 6)));
|
||||
} else if (param0->unk_2A9 == 3) {
|
||||
v1 = 2;
|
||||
param0->unk_84 = sub_02013A04(v1, 11);
|
||||
param0->unk_84 = StringList_New(v1, 11);
|
||||
|
||||
sub_02013A4C(param0->unk_84, param0->unk_88, 29, 2);
|
||||
sub_02013A4C(param0->unk_84, param0->unk_88, 30, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(param0->unk_84, param0->unk_88, 29, 2);
|
||||
StringList_AddFromMessageBank(param0->unk_84, param0->unk_88, 30, 0xfffffffe);
|
||||
Window_Add(param0->unk_00, ¶m0->unk_08[0], 3, 23, 13, 7, 4, 13, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (13 * 6)));
|
||||
} else {
|
||||
v1 = 2;
|
||||
param0->unk_84 = sub_02013A04(v1, 11);
|
||||
param0->unk_84 = StringList_New(v1, 11);
|
||||
|
||||
sub_02013A4C(param0->unk_84, param0->unk_88, 15, 2);
|
||||
sub_02013A4C(param0->unk_84, param0->unk_88, 17, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(param0->unk_84, param0->unk_88, 15, 2);
|
||||
StringList_AddFromMessageBank(param0->unk_84, param0->unk_88, 17, 0xfffffffe);
|
||||
Window_Add(param0->unk_00, ¶m0->unk_08[0], 3, 1, 1, 13, 4, 13, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (13 * 6)));
|
||||
}
|
||||
|
||||
|
|
@ -387,7 +387,7 @@ static void ov7_0224D21C(UnkStruct_ov7_0224D008 *param0)
|
|||
Window_Clear(¶m0->unk_08[0], 1);
|
||||
Window_ClearAndCopyToVRAM(¶m0->unk_08[0]);
|
||||
sub_02001BC4(param0->unk_80, NULL);
|
||||
sub_02013A3C(param0->unk_84);
|
||||
StringList_Free(param0->unk_84);
|
||||
Window_Remove(¶m0->unk_08[0]);
|
||||
}
|
||||
|
||||
|
|
@ -606,28 +606,28 @@ static void ov7_0224D6BC(UnkStruct_ov7_0224D008 *param0)
|
|||
v0 = MessageLoader_Init(0, 26, 12, 11);
|
||||
}
|
||||
|
||||
param0->unk_7C = sub_02013A04(param0->unk_294 + 1, 11);
|
||||
param0->unk_7C = StringList_New(param0->unk_294 + 1, 11);
|
||||
|
||||
for (v3 = 0; v3 < param0->unk_294; v3++) {
|
||||
v4 = ov7_0224D698(param0, param0->unk_290[v3]);
|
||||
|
||||
if ((v4 <= 420) && (v4 >= 328)) {
|
||||
v1 = MessageLoader_GetNewStrbuf(v5, Item_MoveForTMHM(v4));
|
||||
sub_02013A6C(param0->unk_7C, v1, param0->unk_290[v3]);
|
||||
StringList_AddFromStrbuf(param0->unk_7C, v1, param0->unk_290[v3]);
|
||||
Strbuf_Free(v1);
|
||||
|
||||
v6 = 1;
|
||||
} else {
|
||||
v1 = MessageLoader_GetNewStrbuf(v0, v4);
|
||||
sub_02013A6C(param0->unk_7C, v1, param0->unk_290[v3]);
|
||||
StringList_AddFromStrbuf(param0->unk_7C, v1, param0->unk_290[v3]);
|
||||
Strbuf_Free(v1);
|
||||
}
|
||||
}
|
||||
|
||||
if (v6) {
|
||||
sub_02013A4C(param0->unk_7C, param0->unk_88, 26, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(param0->unk_7C, param0->unk_88, 26, 0xfffffffe);
|
||||
} else {
|
||||
sub_02013A4C(param0->unk_7C, param0->unk_88, 8, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(param0->unk_7C, param0->unk_88, 8, 0xfffffffe);
|
||||
}
|
||||
|
||||
MessageLoader_Free(v0);
|
||||
|
|
@ -836,7 +836,7 @@ static u8 ov7_0224DC84(UnkStruct_ov7_0224D008 *param0)
|
|||
break;
|
||||
case 0xfffffffe:
|
||||
sub_02001384(param0->unk_78, NULL, NULL);
|
||||
sub_02013A3C(param0->unk_7C);
|
||||
StringList_Free(param0->unk_7C);
|
||||
ov7_0224D44C(param0);
|
||||
ov7_0224D5D8(param0);
|
||||
Bg_ClearTilemap(param0->unk_00, 1);
|
||||
|
|
|
|||
|
|
@ -4,9 +4,7 @@
|
|||
#include <string.h>
|
||||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_020298B0_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
|
||||
#include "overlay023/funcptr_ov23_02248D20.h"
|
||||
#include "overlay023/struct_ov23_02248D20.h"
|
||||
|
|
@ -16,9 +14,9 @@
|
|||
#include "colored_arrow.h"
|
||||
#include "core_sys.h"
|
||||
#include "heap.h"
|
||||
#include "string_list.h"
|
||||
#include "unk_0200112C.h"
|
||||
#include "unk_02005474.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_0202854C.h"
|
||||
|
||||
UnkStruct_ov23_02248D20 *ov23_02248C08(UnkStruct_ov84_02240FA8 *param0, u16 param1, u16 param2, u8 param3, UnkFuncPtr_ov23_02248D20 param4, UndergroundData *param5, BOOL param6)
|
||||
|
|
@ -39,11 +37,11 @@ UnkStruct_ov23_02248D20 *ov23_02248C08(UnkStruct_ov84_02240FA8 *param0, u16 para
|
|||
v0->unk_1D = param3;
|
||||
|
||||
{
|
||||
ResourceMetadata *v1 = sub_02013A04(param0->unk_10, v0->unk_1D);
|
||||
StringList *v1 = StringList_New(param0->unk_10, v0->unk_1D);
|
||||
int v2;
|
||||
|
||||
for (v2 = 0; v2 < param0->unk_10; v2++) {
|
||||
sub_02013A90(v1, ¶m0->unk_00[v2]);
|
||||
StringList_AddFromEntry(v1, ¶m0->unk_00[v2]);
|
||||
}
|
||||
|
||||
param0->unk_00 = v1;
|
||||
|
|
@ -89,7 +87,7 @@ u32 ov23_02248D20(UnkStruct_ov23_02248D20 *param0)
|
|||
u16 v1, v2, v3;
|
||||
int v4, v5;
|
||||
u32 v6;
|
||||
ResourceMetadata *v7;
|
||||
StringList *v7;
|
||||
|
||||
if (param0->unk_00) {
|
||||
int v8 = sub_02001504(v0, 2);
|
||||
|
|
@ -112,19 +110,19 @@ u32 ov23_02248D20(UnkStruct_ov23_02248D20 *param0)
|
|||
|
||||
param0->unk_00(param0->unk_04, param0->unk_14 + param0->unk_16, v1 + v2);
|
||||
|
||||
v7 = sub_02013A04(v8, param0->unk_1D);
|
||||
v7 = StringList_New(v8, param0->unk_1D);
|
||||
v5 = 0;
|
||||
|
||||
for (v4 = 0; v4 < v8; v4++) {
|
||||
if (v4 == (param0->unk_14 + param0->unk_16)) {
|
||||
v5++;
|
||||
} else {
|
||||
sub_02013A90(v7, ¶m0->unk_08[v5]);
|
||||
StringList_AddFromEntry(v7, ¶m0->unk_08[v5]);
|
||||
v5++;
|
||||
}
|
||||
|
||||
if ((v4) == (v1 + v2)) {
|
||||
sub_02013A90(v7, ¶m0->unk_08[param0->unk_14 + param0->unk_16]);
|
||||
StringList_AddFromEntry(v7, ¶m0->unk_08[param0->unk_14 + param0->unk_16]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -142,14 +140,14 @@ u32 ov23_02248D20(UnkStruct_ov23_02248D20 *param0)
|
|||
}
|
||||
|
||||
v9 = (v4 << 1) + v10;
|
||||
v7[v4].unk_04 = v9;
|
||||
v7[v4].index = v9;
|
||||
}
|
||||
|
||||
v9 = (v4 << 1) + 1;
|
||||
v7[v4].unk_04 = v9;
|
||||
v7[v4].index = v9;
|
||||
} else {
|
||||
for (v4 = 0; v4 < v8 - 1; v4++) {
|
||||
v7[v4].unk_04 = v4;
|
||||
v7[v4].index = v4;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,12 +6,10 @@
|
|||
#include "consts/game_records.h"
|
||||
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_0202855C_decl.h"
|
||||
#include "struct_decls/struct_02029894_decl.h"
|
||||
#include "struct_decls/struct_020298B0_decl.h"
|
||||
#include "struct_decls/struct_020508D4_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
#include "struct_defs/struct_02049FA8.h"
|
||||
#include "struct_defs/struct_02081CF4.h"
|
||||
|
||||
|
|
@ -48,6 +46,7 @@
|
|||
#include "player_avatar.h"
|
||||
#include "savedata.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "sys_task.h"
|
||||
#include "sys_task_manager.h"
|
||||
#include "trainer_info.h"
|
||||
|
|
@ -55,7 +54,6 @@
|
|||
#include "unk_02005474.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_0202854C.h"
|
||||
#include "unk_02030EE0.h"
|
||||
#include "unk_02033200.h"
|
||||
|
|
@ -1017,12 +1015,12 @@ static UIControlData *ov23_0224BD90(BgConfig *param0, const WindowTemplate *para
|
|||
{
|
||||
UnkStruct_02081CF4 v0;
|
||||
MessageLoader *v1 = ov23_02253E3C(ov23_0224219C());
|
||||
ResourceMetadata *v2;
|
||||
StringList *v2;
|
||||
|
||||
v2 = sub_02013A04(2, param4);
|
||||
v2 = StringList_New(2, param4);
|
||||
|
||||
sub_02013A4C(v2, v1, 38, 0);
|
||||
sub_02013A4C(v2, v1, 39, 1);
|
||||
StringList_AddFromMessageBank(v2, v1, 38, 0);
|
||||
StringList_AddFromMessageBank(v2, v1, 39, 1);
|
||||
|
||||
v0.unk_00 = v2;
|
||||
v0.unk_04 = Window_New(param4, 1);
|
||||
|
|
|
|||
|
|
@ -7,8 +7,6 @@
|
|||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
|
||||
#include "field/field_system.h"
|
||||
#include "overlay023/funcptr_ov23_0224DCB8.h"
|
||||
|
|
@ -28,6 +26,7 @@
|
|||
#include "game_records.h"
|
||||
#include "heap.h"
|
||||
#include "message.h"
|
||||
#include "string_list.h"
|
||||
#include "sys_task.h"
|
||||
#include "sys_task_manager.h"
|
||||
#include "trainer_info.h"
|
||||
|
|
@ -35,7 +34,6 @@
|
|||
#include "unk_02001AF4.h"
|
||||
#include "unk_02005474.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_0201D15C.h"
|
||||
#include "unk_0202854C.h"
|
||||
#include "unk_020573FC.h"
|
||||
|
|
@ -64,7 +62,7 @@ typedef struct {
|
|||
UnkStruct_ov23_02250CD4 *unk_04;
|
||||
FieldSystem *fieldSystem;
|
||||
Window unk_0C;
|
||||
ResourceMetadata *unk_1C;
|
||||
StringList *unk_1C;
|
||||
BmpList *unk_20;
|
||||
UIControlData *unk_24;
|
||||
UnkStruct_ov23_0224F184 unk_28;
|
||||
|
|
@ -86,7 +84,7 @@ typedef struct {
|
|||
SysTask *unk_00;
|
||||
FieldSystem *fieldSystem;
|
||||
Window unk_08;
|
||||
ResourceMetadata *unk_18;
|
||||
StringList *unk_18;
|
||||
BmpList *unk_1C;
|
||||
UIControlData *unk_20;
|
||||
UnkStruct_ov23_0224F184 unk_24;
|
||||
|
|
@ -237,7 +235,7 @@ static void ov23_0224DD2C(UnkStruct_ov23_0224E280 *param0)
|
|||
{
|
||||
UnkStruct_ov84_02240FA8 v0;
|
||||
|
||||
param0->unk_1C = sub_02013A04(NELEMS(Unk_ov23_022568B4), 4);
|
||||
param0->unk_1C = StringList_New(NELEMS(Unk_ov23_022568B4), 4);
|
||||
|
||||
Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_0C, 3, 1, 1, 10, NELEMS(Unk_ov23_022568B4) * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (10 * NELEMS(Unk_ov23_022568B4) * 2));
|
||||
Window_Show(¶m0->unk_0C, 1, 1024 - (18 + 12) - 9, 11);
|
||||
|
|
@ -249,7 +247,7 @@ static void ov23_0224DD2C(UnkStruct_ov23_0224E280 *param0)
|
|||
v1 = MessageLoader_Init(0, 26, 634, 4);
|
||||
|
||||
for (v2 = 0; v2 < NELEMS(Unk_ov23_022568B4); v2++) {
|
||||
sub_02013A4C(param0->unk_1C, v1, Unk_ov23_022568B4[v2].unk_00, Unk_ov23_022568B4[v2].unk_04);
|
||||
StringList_AddFromMessageBank(param0->unk_1C, v1, Unk_ov23_022568B4[v2].unk_00, Unk_ov23_022568B4[v2].unk_04);
|
||||
}
|
||||
|
||||
MessageLoader_Free(v1);
|
||||
|
|
@ -298,7 +296,7 @@ static void ov23_0224DE3C(UnkStruct_ov23_0224E280 *param0)
|
|||
{
|
||||
UnkStruct_ov84_02240FA8 v0;
|
||||
|
||||
param0->unk_1C = sub_02013A04(4, 4);
|
||||
param0->unk_1C = StringList_New(4, 4);
|
||||
|
||||
Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_0C, 3, 1, 1, 16, 4 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (16 * 4 * 2));
|
||||
Window_Show(¶m0->unk_0C, 1, 1024 - (18 + 12) - 9, 11);
|
||||
|
|
@ -321,7 +319,7 @@ static void ov23_0224DE3C(UnkStruct_ov23_0224E280 *param0)
|
|||
|
||||
if (v3 == v2) {
|
||||
v4[v2] = v5;
|
||||
sub_02013A4C(param0->unk_1C, v1, 0 + v5, v5);
|
||||
StringList_AddFromMessageBank(param0->unk_1C, v1, 0 + v5, v5);
|
||||
} else {
|
||||
v2--;
|
||||
}
|
||||
|
|
@ -386,7 +384,7 @@ static void ov23_0224DFA0(UnkStruct_ov23_0224E280 *param0)
|
|||
{
|
||||
UnkStruct_ov84_02240FA8 v0;
|
||||
|
||||
param0->unk_1C = sub_02013A04(4, 4);
|
||||
param0->unk_1C = StringList_New(4, 4);
|
||||
|
||||
Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_0C, 3, 1, 1, 16, 4 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (16 * 4 * 2));
|
||||
Window_Show(¶m0->unk_0C, 1, 1024 - (18 + 12) - 9, 11);
|
||||
|
|
@ -400,7 +398,7 @@ static void ov23_0224DFA0(UnkStruct_ov23_0224E280 *param0)
|
|||
for (v2 = 0; v2 < 4; v2++) {
|
||||
u32 v3 = 4 * param0->unk_32 + v2;
|
||||
|
||||
sub_02013A4C(param0->unk_1C, v1, 0 + v3, v2);
|
||||
StringList_AddFromMessageBank(param0->unk_1C, v1, 0 + v3, v2);
|
||||
}
|
||||
|
||||
MessageLoader_Free(v1);
|
||||
|
|
@ -539,7 +537,7 @@ static void ov23_0224E244(SysTask *param0, UnkStruct_ov23_0224E280 *param1)
|
|||
sub_02001384(param1->unk_20, NULL, NULL);
|
||||
Window_ClearAndCopyToVRAM(¶m1->unk_0C);
|
||||
Window_Remove(¶m1->unk_0C);
|
||||
sub_02013A3C(param1->unk_1C);
|
||||
StringList_Free(param1->unk_1C);
|
||||
param1->unk_1C = NULL;
|
||||
}
|
||||
}
|
||||
|
|
@ -956,7 +954,7 @@ static void ov23_0224EA08(SysTask *param0, UnkStruct_ov23_022577B0 *param1)
|
|||
sub_02001384(param1->unk_1C, NULL, NULL);
|
||||
Window_ClearAndCopyToVRAM(¶m1->unk_08);
|
||||
Window_Remove(¶m1->unk_08);
|
||||
sub_02013A3C(param1->unk_18);
|
||||
StringList_Free(param1->unk_18);
|
||||
|
||||
param1->unk_18 = NULL;
|
||||
}
|
||||
|
|
@ -980,7 +978,7 @@ static void ov23_0224EAA4(UnkStruct_ov23_022577B0 *param0)
|
|||
UnkStruct_ov84_02240FA8 v0;
|
||||
const int v1 = 4 + 1;
|
||||
|
||||
param0->unk_18 = sub_02013A04(v1, 4);
|
||||
param0->unk_18 = StringList_New(v1, 4);
|
||||
|
||||
Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, 1, 1, 16, v1 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (16 * v1 * 2));
|
||||
Window_Show(¶m0->unk_08, 1, 1024 - (18 + 12) - 9, 11);
|
||||
|
|
@ -993,10 +991,10 @@ static void ov23_0224EAA4(UnkStruct_ov23_022577B0 *param0)
|
|||
for (v3 = 0; v3 < 4; v3++) {
|
||||
u32 v4 = 4 * param0->unk_2E + v3;
|
||||
|
||||
sub_02013A4C(param0->unk_18, v2, 0 + v4, v3);
|
||||
StringList_AddFromMessageBank(param0->unk_18, v2, 0 + v4, v3);
|
||||
}
|
||||
|
||||
sub_02013A4C(param0->unk_18, v2, 48, 51);
|
||||
StringList_AddFromMessageBank(param0->unk_18, v2, 48, 51);
|
||||
MessageLoader_Free(v2);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@
|
|||
#include "player_avatar.h"
|
||||
#include "save_player.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "sys_task.h"
|
||||
#include "sys_task_manager.h"
|
||||
|
|
@ -56,7 +57,6 @@
|
|||
#include "unk_0200A9DC.h"
|
||||
#include "unk_0200C6E4.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_0202854C.h"
|
||||
#include "unk_0206A780.h"
|
||||
|
||||
|
|
@ -478,7 +478,7 @@ static void ov23_0224F7F4(UnkStruct_ov23_02250CD4 *param0)
|
|||
int v3;
|
||||
|
||||
v3 = ov23_0224F7D4(v2);
|
||||
param0->unk_40 = sub_02013A04(NELEMS(Unk_ov23_02256924), 4);
|
||||
param0->unk_40 = StringList_New(NELEMS(Unk_ov23_02256924), 4);
|
||||
|
||||
Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 20, 1, 11, NELEMS(Unk_ov23_02256924) * 3, 13, (1024 - (18 + 12) - 9 - 11 * 22));
|
||||
Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11);
|
||||
|
|
@ -494,10 +494,10 @@ static void ov23_0224F7F4(UnkStruct_ov23_02250CD4 *param0)
|
|||
const TrainerInfo *v5 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem));
|
||||
Strbuf *v6 = TrainerInfo_NameNewStrbuf(v5, 4);
|
||||
|
||||
sub_02013A6C(param0->unk_40, v6, Unk_ov23_02256924[v4].unk_04);
|
||||
StringList_AddFromStrbuf(param0->unk_40, v6, Unk_ov23_02256924[v4].unk_04);
|
||||
Strbuf_Free(v6);
|
||||
} else {
|
||||
sub_02013A4C(param0->unk_40, v3, Unk_ov23_02256924[v4].unk_00, Unk_ov23_02256924[v4].unk_04);
|
||||
StringList_AddFromMessageBank(param0->unk_40, v3, Unk_ov23_02256924[v4].unk_00, Unk_ov23_02256924[v4].unk_04);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -686,7 +686,7 @@ void ov23_0224FB7C(UnkStruct_ov23_02250CD4 *param0)
|
|||
Window_Clear(¶m0->unk_10, 1);
|
||||
Bg_ScheduleTilemapTransfer(param0->unk_10.bgConfig, param0->unk_10.bgLayer);
|
||||
Window_Remove(¶m0->unk_10);
|
||||
sub_02013A3C(param0->unk_40);
|
||||
StringList_Free(param0->unk_40);
|
||||
ov23_02252DF4(param0);
|
||||
}
|
||||
}
|
||||
|
|
@ -735,7 +735,7 @@ static void ov23_0224FBFC(UnkStruct_ov23_02250CD4 *param0, int param1)
|
|||
break;
|
||||
}
|
||||
|
||||
param0->unk_44 = sub_02013A04(v1, 4);
|
||||
param0->unk_44 = StringList_New(v1, 4);
|
||||
|
||||
Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_20, 3, v5, v3, v4, v1 * 2, 13, (1024 - (18 + 12) - 9 - 11 * 22));
|
||||
Window_Show(¶m0->unk_20, 1, 1024 - (18 + 12) - 9, 11);
|
||||
|
|
@ -747,7 +747,7 @@ static void ov23_0224FBFC(UnkStruct_ov23_02250CD4 *param0, int param1)
|
|||
v7 = ov23_02253E3C(ov23_0224219C());
|
||||
|
||||
for (v8 = 0; v8 < v1; v8++) {
|
||||
sub_02013A4C(param0->unk_44, v7, v6->unk_00, v6->unk_04);
|
||||
StringList_AddFromMessageBank(param0->unk_44, v7, v6->unk_00, v6->unk_04);
|
||||
v6++;
|
||||
}
|
||||
}
|
||||
|
|
@ -767,7 +767,7 @@ static void ov23_0224FCF4(UnkStruct_ov23_02250CD4 *param0)
|
|||
if (param0->unk_50) {
|
||||
sub_02001384(param0->unk_50, NULL, NULL);
|
||||
Bg_ScheduleTilemapTransfer(param0->unk_20.bgConfig, param0->unk_20.bgLayer);
|
||||
sub_02013A3C(param0->unk_44);
|
||||
StringList_Free(param0->unk_44);
|
||||
|
||||
param0->unk_50 = NULL;
|
||||
}
|
||||
|
|
@ -847,7 +847,7 @@ static void ov23_0224FE38(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248
|
|||
ov23_0224FB7C(param0);
|
||||
ov23_02253DFC(ov23_022421DC(), 630, 0);
|
||||
|
||||
param0->unk_40 = sub_02013A04(v3 + 1, 4);
|
||||
param0->unk_40 = StringList_New(v3 + 1, 4);
|
||||
|
||||
Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 19, 3, 12, (6 * 2), 13, ((1024 - (18 + 12) - 9 - 11 * 22) - 12 * (6 * 2)));
|
||||
Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11);
|
||||
|
|
@ -859,10 +859,10 @@ static void ov23_0224FE38(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248
|
|||
v5 = ov23_02253E3C(ov23_022421DC());
|
||||
|
||||
for (v6 = 0; v6 < v3; v6++) {
|
||||
sub_02013A4C(param0->unk_40, v5, v1(v6, param0), v6);
|
||||
StringList_AddFromMessageBank(param0->unk_40, v5, v1(v6, param0), v6);
|
||||
}
|
||||
|
||||
sub_02013A4C(param0->unk_40, v5, 34, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(param0->unk_40, v5, 34, 0xfffffffe);
|
||||
}
|
||||
|
||||
v2 = Unk_ov23_02256904;
|
||||
|
|
@ -1038,7 +1038,7 @@ static void ov23_0225021C(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248
|
|||
ov23_0224FB7C(param0);
|
||||
ov23_02253DFC(ov23_022421DC(), 628, 0);
|
||||
|
||||
param0->unk_40 = sub_02013A04(v4 + 1, 4);
|
||||
param0->unk_40 = StringList_New(v4 + 1, 4);
|
||||
|
||||
Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 19, 3, 12, (6 * 2), 13, ((1024 - (18 + 12) - 9 - 11 * 22) - 12 * (6 * 2)));
|
||||
Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11);
|
||||
|
|
@ -1054,10 +1054,10 @@ static void ov23_0225021C(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248
|
|||
StringTemplate_SetNumber(param0->unk_70, 6, v2(v7, param0), 2, 2, 1);
|
||||
MessageLoader_GetStrbuf(ov23_02253E3C(ov23_0224219C()), 128, param0->unk_6C);
|
||||
StringTemplate_Format(param0->unk_70, param0->unk_68, param0->unk_6C);
|
||||
sub_02013A6C(param0->unk_40, param0->unk_68, v7);
|
||||
StringList_AddFromStrbuf(param0->unk_40, param0->unk_68, v7);
|
||||
}
|
||||
|
||||
sub_02013A4C(param0->unk_40, v6, 60, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(param0->unk_40, v6, 60, 0xfffffffe);
|
||||
}
|
||||
|
||||
v3 = Unk_ov23_02256904;
|
||||
|
|
@ -1214,7 +1214,7 @@ static void ov23_022505EC(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248
|
|||
ov23_0224FB7C(param0);
|
||||
ov23_02253DFC(ov23_022421DC(), 628, 0);
|
||||
|
||||
param0->unk_40 = sub_02013A04(v3 + 1, 4);
|
||||
param0->unk_40 = StringList_New(v3 + 1, 4);
|
||||
|
||||
Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 19, 3, 12, (6 * 2), 13, ((1024 - (18 + 12) - 9 - 11 * 22) - 12 * (6 * 2)));
|
||||
Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11);
|
||||
|
|
@ -1226,10 +1226,10 @@ static void ov23_022505EC(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248
|
|||
v5 = ov23_02253E3C(ov23_022421DC());
|
||||
|
||||
for (v6 = 0; v6 < v3; v6++) {
|
||||
sub_02013A4C(param0->unk_40, v5, v1(v6, param0), v6);
|
||||
StringList_AddFromMessageBank(param0->unk_40, v5, v1(v6, param0), v6);
|
||||
}
|
||||
|
||||
sub_02013A4C(param0->unk_40, v5, 60, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(param0->unk_40, v5, 60, 0xfffffffe);
|
||||
}
|
||||
|
||||
v2 = Unk_ov23_02256904;
|
||||
|
|
@ -1615,7 +1615,7 @@ static void ov23_02250D90(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248
|
|||
ov23_0224FB7C(param0);
|
||||
ov23_02253DFC(ov23_022421DC(), 626, 0);
|
||||
|
||||
param0->unk_40 = sub_02013A04(v3 + 1, 4);
|
||||
param0->unk_40 = StringList_New(v3 + 1, 4);
|
||||
|
||||
Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 19, 3, 12, (6 * 2), 13, ((1024 - (18 + 12) - 9 - 11 * 22) - 12 * (6 * 2)));
|
||||
Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11);
|
||||
|
|
@ -1627,10 +1627,10 @@ static void ov23_02250D90(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248
|
|||
v5 = ov23_02253E3C(ov23_022421DC());
|
||||
|
||||
for (v6 = 0; v6 < v3; v6++) {
|
||||
sub_02013A4C(param0->unk_40, v5, v1(v6, param0), v6);
|
||||
StringList_AddFromMessageBank(param0->unk_40, v5, v1(v6, param0), v6);
|
||||
}
|
||||
|
||||
sub_02013A4C(param0->unk_40, v5, 0, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(param0->unk_40, v5, 0, 0xfffffffe);
|
||||
}
|
||||
|
||||
v2 = Unk_ov23_02256904;
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@
|
|||
#include "player_avatar.h"
|
||||
#include "save_player.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "sys_task.h"
|
||||
#include "sys_task_manager.h"
|
||||
|
|
@ -48,7 +49,6 @@
|
|||
#include "unk_0200A9DC.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_0202854C.h"
|
||||
#include "unk_02033200.h"
|
||||
#include "unk_020508D4.h"
|
||||
|
|
@ -356,7 +356,7 @@ static void ov23_022515D8(UnkStruct_ov23_02250CD4 *param0, int param1, int param
|
|||
|
||||
ov23_0224FB7C(param0);
|
||||
|
||||
param0->unk_40 = sub_02013A04(v1, 4);
|
||||
param0->unk_40 = StringList_New(v1, 4);
|
||||
|
||||
Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 17, 3, 14, v1 * 2, 13, 2);
|
||||
Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11);
|
||||
|
|
@ -369,9 +369,9 @@ static void ov23_022515D8(UnkStruct_ov23_02250CD4 *param0, int param1, int param
|
|||
|
||||
for (v4 = 0; v4 < v1; v4++) {
|
||||
if (v4 == (v1 - 1)) {
|
||||
sub_02013A4C(param0->unk_40, v3, param1 + 5, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(param0->unk_40, v3, param1 + 5, 0xfffffffe);
|
||||
} else {
|
||||
sub_02013A4C(param0->unk_40, v3, param1 + v4, v4);
|
||||
StringList_AddFromMessageBank(param0->unk_40, v3, param1 + v4, v4);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -402,7 +402,7 @@ static void ov23_022516E8(UnkStruct_ov23_02250CD4 *param0, int param1, int param
|
|||
|
||||
ov23_0224FB7C(param0);
|
||||
|
||||
param0->unk_40 = sub_02013A04(v1, 4);
|
||||
param0->unk_40 = StringList_New(v1, 4);
|
||||
|
||||
Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 17, 3, 14, v1 * 2, 13, (2 + 14 * 16));
|
||||
Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11);
|
||||
|
|
@ -415,9 +415,9 @@ static void ov23_022516E8(UnkStruct_ov23_02250CD4 *param0, int param1, int param
|
|||
|
||||
for (v4 = 0; v4 < v1; v4++) {
|
||||
if (v4 == param2) {
|
||||
sub_02013A4C(param0->unk_40, v3, param1 + v4, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(param0->unk_40, v3, param1 + v4, 0xfffffffe);
|
||||
} else {
|
||||
sub_02013A4C(param0->unk_40, v3, param1 + v4, v4);
|
||||
StringList_AddFromMessageBank(param0->unk_40, v3, param1 + v4, v4);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
#include "message.h"
|
||||
#include "savedata.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "sys_task.h"
|
||||
#include "sys_task_manager.h"
|
||||
|
|
@ -37,7 +38,6 @@
|
|||
#include "unk_02001AF4.h"
|
||||
#include "unk_02005474.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_0202631C.h"
|
||||
#include "unk_0202854C.h"
|
||||
#include "unk_020573FC.h"
|
||||
|
|
@ -216,7 +216,7 @@ static void *ov23_022524B8(UnkStruct_ov23_02250CD4 *param0)
|
|||
|
||||
ov23_0224FB7C(param0);
|
||||
|
||||
param0->unk_40 = sub_02013A04(v1, 4);
|
||||
param0->unk_40 = StringList_New(v1, 4);
|
||||
|
||||
Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 19, 3, 12, v1 * 2, 13, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - 12 * 6));
|
||||
Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11);
|
||||
|
|
@ -227,19 +227,19 @@ static void *ov23_022524B8(UnkStruct_ov23_02250CD4 *param0)
|
|||
if (param0->unk_2AC == 1) {
|
||||
v3 = 13;
|
||||
ov23_022521F0(param0, param0->unk_288);
|
||||
sub_02013A4C(param0->unk_40, ov23_02253E3C(ov23_022421BC()), v3, 0);
|
||||
sub_02013A4C(param0->unk_40, ov23_02253E3C(ov23_022421BC()), v3 + 1, 1);
|
||||
sub_02013A4C(param0->unk_40, ov23_02253E3C(ov23_022421BC()), v3 + 2, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(param0->unk_40, ov23_02253E3C(ov23_022421BC()), v3, 0);
|
||||
StringList_AddFromMessageBank(param0->unk_40, ov23_02253E3C(ov23_022421BC()), v3 + 1, 1);
|
||||
StringList_AddFromMessageBank(param0->unk_40, ov23_02253E3C(ov23_022421BC()), v3 + 2, 0xfffffffe);
|
||||
} else if (param0->unk_2AC == 0) {
|
||||
v3 = 16;
|
||||
ov23_022522F0(param0, param0->unk_288);
|
||||
sub_02013A4C(param0->unk_40, ov23_02253E3C(ov23_022421BC()), v3, 0);
|
||||
sub_02013A4C(param0->unk_40, ov23_02253E3C(ov23_022421BC()), v3 + 1, 1);
|
||||
sub_02013A4C(param0->unk_40, ov23_02253E3C(ov23_022421BC()), v3 + 2, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(param0->unk_40, ov23_02253E3C(ov23_022421BC()), v3, 0);
|
||||
StringList_AddFromMessageBank(param0->unk_40, ov23_02253E3C(ov23_022421BC()), v3 + 1, 1);
|
||||
StringList_AddFromMessageBank(param0->unk_40, ov23_02253E3C(ov23_022421BC()), v3 + 2, 0xfffffffe);
|
||||
} else {
|
||||
v3 = 28;
|
||||
sub_02013A4C(param0->unk_40, ov23_02253E3C(ov23_022421BC()), 28, 0);
|
||||
sub_02013A4C(param0->unk_40, ov23_02253E3C(ov23_022421BC()), 22, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(param0->unk_40, ov23_02253E3C(ov23_022421BC()), 28, 0);
|
||||
StringList_AddFromMessageBank(param0->unk_40, ov23_02253E3C(ov23_022421BC()), 22, 0xfffffffe);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -398,7 +398,7 @@ static void ov23_02252A18(UnkStruct_ov23_02250CD4 *param0)
|
|||
const int v1 = 5 + 1;
|
||||
|
||||
ov23_0224FB7C(param0);
|
||||
param0->unk_40 = sub_02013A04(v1, 4);
|
||||
param0->unk_40 = StringList_New(v1, 4);
|
||||
|
||||
Window_Add(param0->fieldSystem->unk_08, ¶m0->unk_10, 3, 19, 3, 12, v1 * 2, 13, (((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - 12 * 6) - 12 * 12));
|
||||
Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11);
|
||||
|
|
@ -419,10 +419,10 @@ static void ov23_02252A18(UnkStruct_ov23_02250CD4 *param0)
|
|||
}
|
||||
|
||||
for (v3 = 0; v3 < v1 - 1; v3++) {
|
||||
sub_02013A4C(param0->unk_40, v2, param0->unk_274[v3], v3);
|
||||
StringList_AddFromMessageBank(param0->unk_40, v2, param0->unk_274[v3], v3);
|
||||
}
|
||||
|
||||
sub_02013A4C(param0->unk_40, v2, 0, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(param0->unk_40, v2, 0, 0xfffffffe);
|
||||
MessageLoader_Free(v2);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,10 +6,8 @@
|
|||
#include "constants/heap.h"
|
||||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_0202855C_decl.h"
|
||||
#include "struct_decls/struct_020298B0_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
|
||||
#include "overlay023/funcptr_ov23_0224DCB8.h"
|
||||
#include "overlay023/funcptr_ov23_02253834.h"
|
||||
|
|
@ -27,6 +25,7 @@
|
|||
#include "message.h"
|
||||
#include "savedata.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "sys_task.h"
|
||||
#include "sys_task_manager.h"
|
||||
|
|
@ -42,7 +41,7 @@ typedef struct {
|
|||
UnkFuncPtr_ov23_02253834 unk_00;
|
||||
void *unk_04;
|
||||
Window unk_08;
|
||||
ResourceMetadata *unk_18;
|
||||
StringList *unk_18;
|
||||
BmpList *unk_1C;
|
||||
UnkFuncPtr_ov23_0224DCB8 unk_20;
|
||||
u16 unk_24;
|
||||
|
|
|
|||
|
|
@ -4,9 +4,7 @@
|
|||
#include <string.h>
|
||||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_020298B0_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
#include "struct_defs/struct_0206A844.h"
|
||||
|
||||
#include "field/field_system.h"
|
||||
|
|
@ -22,12 +20,12 @@
|
|||
#include "heap.h"
|
||||
#include "message.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "unk_0200112C.h"
|
||||
#include "unk_02005474.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_0202854C.h"
|
||||
#include "unk_0206A780.h"
|
||||
|
||||
|
|
@ -35,7 +33,7 @@ typedef struct UnkStruct_ov23_022542D8_t {
|
|||
FieldSystem *fieldSystem;
|
||||
Window unk_04;
|
||||
Window unk_14;
|
||||
ResourceMetadata *unk_24;
|
||||
StringList *unk_24;
|
||||
BmpList *unk_28;
|
||||
Strbuf *unk_2C;
|
||||
u16 *unk_30;
|
||||
|
|
@ -50,7 +48,7 @@ typedef struct UnkStruct_ov23_02254594_t {
|
|||
UnkStruct_0206A844 *unk_04;
|
||||
Window unk_08;
|
||||
Window unk_18;
|
||||
ResourceMetadata *unk_28;
|
||||
StringList *unk_28;
|
||||
UnkStruct_ov23_02248D20 *unk_2C;
|
||||
BmpList *unk_30;
|
||||
Strbuf *unk_34;
|
||||
|
|
@ -161,7 +159,7 @@ static void ov23_0225437C(UnkStruct_ov23_022542D8 *param0)
|
|||
int v3 = 3;
|
||||
int v4 = 4;
|
||||
|
||||
param0->unk_24 = sub_02013A04(v3 + 1, 4);
|
||||
param0->unk_24 = StringList_New(v3 + 1, 4);
|
||||
|
||||
v1 = 12 * v4 * 2;
|
||||
v2 = 7 * (1 * 2);
|
||||
|
|
@ -194,7 +192,7 @@ static void ov23_0225437C(UnkStruct_ov23_022542D8 *param0)
|
|||
}
|
||||
|
||||
for (v6 = 0; v6 < v3 + 1; v6++) {
|
||||
sub_02013A4C(param0->unk_24, v5, v7[v6], v6);
|
||||
StringList_AddFromMessageBank(param0->unk_24, v5, v7[v6], v6);
|
||||
}
|
||||
|
||||
MessageLoader_Free(v5);
|
||||
|
|
@ -255,7 +253,7 @@ static void ov23_0225451C(UnkStruct_ov23_022542D8 *param0)
|
|||
Bg_ScheduleTilemapTransfer(param0->unk_04.bgConfig, param0->unk_04.bgLayer);
|
||||
Window_Remove(¶m0->unk_04);
|
||||
Window_Remove(¶m0->unk_14);
|
||||
sub_02013A3C(param0->unk_24);
|
||||
StringList_Free(param0->unk_24);
|
||||
}
|
||||
|
||||
static void ov23_02254564(BmpList *param0, u32 param1, u8 param2)
|
||||
|
|
@ -402,7 +400,7 @@ static void ov23_022546E0(UnkStruct_ov23_02254594 *param0)
|
|||
v5 = 7;
|
||||
}
|
||||
|
||||
param0->unk_28 = sub_02013A04(v4 + 1, 4);
|
||||
param0->unk_28 = StringList_New(v4 + 1, 4);
|
||||
|
||||
v2 = 12 * 7 * 2;
|
||||
v3 = 8 * (2 * 2);
|
||||
|
|
@ -464,12 +462,12 @@ static void ov23_022546E0(UnkStruct_ov23_02254594 *param0)
|
|||
}
|
||||
|
||||
v10 = (v7 << 1) + v11;
|
||||
sub_02013A4C(param0->unk_28, v6, v8, v10);
|
||||
StringList_AddFromMessageBank(param0->unk_28, v6, v8, v10);
|
||||
}
|
||||
|
||||
v10 = (v7 << 1) + 1;
|
||||
|
||||
sub_02013A4C(param0->unk_28, v6, 277, v10);
|
||||
StringList_AddFromMessageBank(param0->unk_28, v6, 277, v10);
|
||||
MessageLoader_Free(v6);
|
||||
}
|
||||
|
||||
|
|
@ -508,7 +506,7 @@ static void ov23_02254958(UnkStruct_ov23_02254594 *param0)
|
|||
Bg_ScheduleTilemapTransfer(param0->unk_08.bgConfig, param0->unk_08.bgLayer);
|
||||
Window_Remove(¶m0->unk_08);
|
||||
Window_Remove(¶m0->unk_18);
|
||||
sub_02013A3C(param0->unk_28);
|
||||
StringList_Free(param0->unk_28);
|
||||
sub_0206A844(param0->unk_04);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,10 +6,8 @@
|
|||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_02025CCC_decl.h"
|
||||
#include "struct_decls/struct_0202B370_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
#include "struct_defs/struct_02017498.h"
|
||||
#include "struct_defs/struct_02099F80.h"
|
||||
|
||||
|
|
@ -30,6 +28,7 @@
|
|||
#include "render_text.h"
|
||||
#include "save_player.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "unk_02001AF4.h"
|
||||
|
|
@ -73,7 +72,7 @@ typedef struct {
|
|||
int unk_90;
|
||||
int unk_94;
|
||||
int unk_98;
|
||||
ResourceMetadata *unk_9C;
|
||||
StringList *unk_9C;
|
||||
BmpList *unk_A0;
|
||||
UnkStruct_ov61_0222C3B0 unk_A4;
|
||||
} UnkStruct_ov61_0222C664;
|
||||
|
|
|
|||
|
|
@ -6,11 +6,9 @@
|
|||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_0202B370_decl.h"
|
||||
#include "struct_decls/struct_0203068C_decl.h"
|
||||
#include "struct_defs/struct_0200C738.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
#include "struct_defs/struct_0208737C.h"
|
||||
#include "struct_defs/struct_02089438.h"
|
||||
#include "struct_defs/struct_02099F80.h"
|
||||
|
|
@ -45,6 +43,7 @@
|
|||
#include "savedata.h"
|
||||
#include "sprite_resource.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "trainer_info.h"
|
||||
|
|
@ -57,7 +56,6 @@
|
|||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_020131EC.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_02017728.h"
|
||||
#include "unk_0201DBEC.h"
|
||||
#include "unk_0201E86C.h"
|
||||
|
|
@ -177,7 +175,7 @@ typedef struct {
|
|||
u32 unk_D8;
|
||||
u32 unk_DC;
|
||||
Window unk_E0;
|
||||
ResourceMetadata * unk_F0[2];
|
||||
StringList *unk_F0[2];
|
||||
BmpList * unk_F8;
|
||||
UIControlData * unk_FC;
|
||||
s32 unk_100;
|
||||
|
|
@ -2081,7 +2079,7 @@ asm static void ov64_0222F414 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_
|
|||
_0222F530:
|
||||
ldr r1, [sp, #0x18]
|
||||
mov r0, #4
|
||||
bl sub_02013A04
|
||||
bl StringList_New
|
||||
add r1, r6, #0
|
||||
add r1, #0xf4
|
||||
ldr r5, [sp, #0x20]
|
||||
|
|
@ -2096,7 +2094,7 @@ asm static void ov64_0222F414 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_
|
|||
ldr r1, [r7, r1]
|
||||
ldr r2, [r5, #0]
|
||||
ldr r3, [r5, #4]
|
||||
bl sub_02013A4C
|
||||
bl StringList_AddFromMessageBank
|
||||
add r4, r4, #1
|
||||
add r5, #8
|
||||
cmp r4, #4
|
||||
|
|
@ -2172,7 +2170,7 @@ static void ov64_0222F5F4 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222
|
|||
Strbuf_Free(param0->unk_D4);
|
||||
|
||||
for (v0 = 0; v0 < 2; v0++) {
|
||||
sub_02013A3C(param0->unk_F0[v0]);
|
||||
StringList_Free(param0->unk_F0[v0]);
|
||||
}
|
||||
|
||||
Window_Remove(¶m0->unk_E0);
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@
|
|||
#include "savedata.h"
|
||||
#include "sprite_resource.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "touch_screen.h"
|
||||
|
|
@ -72,7 +73,6 @@
|
|||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_02012744.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_02017728.h"
|
||||
#include "unk_0201DBEC.h"
|
||||
#include "unk_0201E3D8.h"
|
||||
|
|
@ -1566,7 +1566,7 @@ static void ov65_0222EF4C (UnkStruct_ov65_0222EBE0 * param0)
|
|||
}
|
||||
|
||||
if (param0->unk_14C) {
|
||||
sub_02013A3C(param0->unk_14C);
|
||||
StringList_Free(param0->unk_14C);
|
||||
param0->unk_14C = NULL;
|
||||
}
|
||||
|
||||
|
|
@ -2076,7 +2076,7 @@ static int ov65_0222F90C (UnkStruct_ov65_0222EBE0 * param0, int param1)
|
|||
Window_Remove(¶m0->unk_370);
|
||||
sub_02001384(param0->unk_150, NULL, NULL);
|
||||
param0->unk_150 = NULL;
|
||||
sub_02013A3C(param0->unk_14C);
|
||||
StringList_Free(param0->unk_14C);
|
||||
param0->unk_14C = NULL;
|
||||
}
|
||||
|
||||
|
|
@ -2411,7 +2411,7 @@ static int ov65_0222FFAC (UnkStruct_ov65_0222EBE0 * param0, int param1)
|
|||
Window_Remove(¶m0->unk_370);
|
||||
sub_02001384(param0->unk_150, NULL, NULL);
|
||||
param0->unk_150 = NULL;
|
||||
sub_02013A3C(param0->unk_14C);
|
||||
StringList_Free(param0->unk_14C);
|
||||
param0->unk_14C = NULL;
|
||||
}
|
||||
|
||||
|
|
@ -3275,10 +3275,10 @@ static int ov65_02230E04 (UnkStruct_ov65_0222EBE0 * param0, int param1)
|
|||
v3[v1 - 1] = Unk_ov65_02239C20;
|
||||
}
|
||||
|
||||
param0->unk_154 = sub_02013A04(v1, 54);
|
||||
param0->unk_154 = StringList_New(v1, 54);
|
||||
|
||||
for (v0 = 0; v0 < v1; v0++) {
|
||||
sub_02013A4C(param0->unk_154, param0->unk_168, v3[v0].unk_00, v3[v0].unk_04);
|
||||
StringList_AddFromMessageBank(param0->unk_154, param0->unk_168, v3[v0].unk_00, v3[v0].unk_04);
|
||||
}
|
||||
|
||||
if (Window_IsInUse(¶m0->unk_380)) {
|
||||
|
|
@ -3316,7 +3316,7 @@ static int ov65_02230FBC (UnkStruct_ov65_0222EBE0 * param0, int param1)
|
|||
Window_Clear(¶m0->unk_380, 0);
|
||||
Window_Remove(¶m0->unk_380);
|
||||
sub_02001384(param0->unk_158, NULL, ¶m0->unk_3D4);
|
||||
sub_02013A3C(param0->unk_154);
|
||||
StringList_Free(param0->unk_154);
|
||||
ov65_02232DFC(param0);
|
||||
}
|
||||
|
||||
|
|
@ -3360,7 +3360,7 @@ static int ov65_02230FBC (UnkStruct_ov65_0222EBE0 * param0, int param1)
|
|||
Window_Clear(¶m0->unk_380, 0);
|
||||
Window_Remove(¶m0->unk_380);
|
||||
sub_02001384(param0->unk_158, NULL, ¶m0->unk_3D4);
|
||||
sub_02013A3C(param0->unk_154);
|
||||
StringList_Free(param0->unk_154);
|
||||
ov65_0223128C(param0, v0);
|
||||
param0->unk_3A8 = 38;
|
||||
return param1;
|
||||
|
|
@ -3395,7 +3395,7 @@ static int ov65_02230FBC (UnkStruct_ov65_0222EBE0 * param0, int param1)
|
|||
Window_Clear(¶m0->unk_380, 0);
|
||||
Window_Remove(¶m0->unk_380);
|
||||
sub_02001384(param0->unk_158, NULL, ¶m0->unk_3D4);
|
||||
sub_02013A3C(param0->unk_154);
|
||||
StringList_Free(param0->unk_154);
|
||||
|
||||
return param1;
|
||||
}
|
||||
|
|
@ -3461,16 +3461,16 @@ static int ov65_0223128C (UnkStruct_ov65_0222EBE0 * param0, int param1)
|
|||
break;
|
||||
}
|
||||
|
||||
param0->unk_154 = sub_02013A04(v1, 54);
|
||||
param0->unk_154 = StringList_New(v1, 54);
|
||||
|
||||
for (v0 = 0; v0 < v1; v0++) {
|
||||
if (v3[v0].unk_00 != 71) {
|
||||
sub_02013A4C(param0->unk_154, param0->unk_168, v3[v0].unk_00, v3[v0].unk_04);
|
||||
StringList_AddFromMessageBank(param0->unk_154, param0->unk_168, v3[v0].unk_00, v3[v0].unk_04);
|
||||
} else {
|
||||
StringTemplate_SetPlazaMinigameName(param0->unk_164, 0, v0);
|
||||
MessageLoader_GetStrbuf(param0->unk_168, v3[v0].unk_00, param0->unk_170);
|
||||
StringTemplate_Format(param0->unk_164, param0->unk_178, param0->unk_170);
|
||||
sub_02013A6C(param0->unk_154, param0->unk_178, v3[v0].unk_04);
|
||||
StringList_AddFromStrbuf(param0->unk_154, param0->unk_178, v3[v0].unk_04);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -3503,7 +3503,7 @@ static int ov65_02231440 (UnkStruct_ov65_0222EBE0 * param0, int param1)
|
|||
Window_Clear(¶m0->unk_380, 0);
|
||||
Window_Remove(¶m0->unk_380);
|
||||
sub_02001384(param0->unk_158, NULL, ¶m0->unk_3D6[param0->unk_3DC]);
|
||||
sub_02013A3C(param0->unk_154);
|
||||
StringList_Free(param0->unk_154);
|
||||
ov65_02232DFC(param0);
|
||||
return param1;
|
||||
}
|
||||
|
|
@ -3550,7 +3550,7 @@ static int ov65_02231440 (UnkStruct_ov65_0222EBE0 * param0, int param1)
|
|||
Window_Clear(¶m0->unk_380, 0);
|
||||
Window_Remove(¶m0->unk_380);
|
||||
sub_02001384(param0->unk_158, NULL, ¶m0->unk_3D6[param0->unk_3DC]);
|
||||
sub_02013A3C(param0->unk_154);
|
||||
StringList_Free(param0->unk_154);
|
||||
|
||||
return param1;
|
||||
}
|
||||
|
|
@ -3725,7 +3725,7 @@ static int ov65_022316F0 (UnkStruct_ov65_0222EBE0 * param0, int param1)
|
|||
param0->unk_3E0 = v10;
|
||||
|
||||
v10 += param0->unk_04->unk_00.unk_21;
|
||||
param0->unk_154 = sub_02013A04(v6, 54);
|
||||
param0->unk_154 = StringList_New(v6, 54);
|
||||
v5 = 0;
|
||||
|
||||
for (v5 = 0; v5 < NELEMS(Unk_ov65_02238968); v5++) {
|
||||
|
|
@ -3736,17 +3736,17 @@ static int ov65_022316F0 (UnkStruct_ov65_0222EBE0 * param0, int param1)
|
|||
v6 -= 1;
|
||||
} else if (v9 == 16) {
|
||||
if (v10 == 2) {
|
||||
sub_02013A4C(param0->unk_154, param0->unk_168, 36, Unk_ov65_02238968[v5].unk_04);
|
||||
StringList_AddFromMessageBank(param0->unk_154, param0->unk_168, 36, Unk_ov65_02238968[v5].unk_04);
|
||||
} else {
|
||||
v7.unk_12 -= 1;
|
||||
v7.unk_10 -= 1;
|
||||
v6 -= 1;
|
||||
}
|
||||
} else {
|
||||
sub_02013A4C(param0->unk_154, param0->unk_168, Unk_ov65_02238968[v5].unk_00, Unk_ov65_02238968[v5].unk_04);
|
||||
StringList_AddFromMessageBank(param0->unk_154, param0->unk_168, Unk_ov65_02238968[v5].unk_00, Unk_ov65_02238968[v5].unk_04);
|
||||
}
|
||||
} else {
|
||||
sub_02013A4C(param0->unk_154, param0->unk_168, Unk_ov65_02238968[v5].unk_00, Unk_ov65_02238968[v5].unk_04);
|
||||
StringList_AddFromMessageBank(param0->unk_154, param0->unk_168, Unk_ov65_02238968[v5].unk_00, Unk_ov65_02238968[v5].unk_04);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -3870,7 +3870,7 @@ static int ov65_02231A98 (UnkStruct_ov65_0222EBE0 * param0, int param1)
|
|||
Window_Clear(¶m0->unk_380, 0);
|
||||
Window_Remove(¶m0->unk_380);
|
||||
sub_02001384(param0->unk_158, NULL, NULL);
|
||||
sub_02013A3C(param0->unk_154);
|
||||
StringList_Free(param0->unk_154);
|
||||
|
||||
if (v7 != NULL) {
|
||||
ov65_0223556C(¶m0->unk_3EC, v7);
|
||||
|
|
@ -4034,7 +4034,7 @@ static int ov65_02231A98 (UnkStruct_ov65_0222EBE0 * param0, int param1)
|
|||
Window_Clear(¶m0->unk_380, 0);
|
||||
Window_Remove(¶m0->unk_380);
|
||||
sub_02001384(param0->unk_158, NULL, NULL);
|
||||
sub_02013A3C(param0->unk_154);
|
||||
StringList_Free(param0->unk_154);
|
||||
|
||||
if (v7 != NULL) {
|
||||
ov65_0223556C(¶m0->unk_3EC, v7);
|
||||
|
|
|
|||
|
|
@ -5,10 +5,8 @@
|
|||
#include <string.h>
|
||||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_02023FCC_decl.h"
|
||||
#include "struct_defs/struct_0200C738.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
#include "struct_defs/struct_0207C690.h"
|
||||
#include "struct_defs/struct_02099F80.h"
|
||||
|
||||
|
|
@ -59,6 +57,7 @@
|
|||
#include "savedata.h"
|
||||
#include "sprite_resource.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "sys_task.h"
|
||||
#include "sys_task_manager.h"
|
||||
|
|
@ -72,7 +71,6 @@
|
|||
#include "unk_0200A784.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_02017728.h"
|
||||
#include "unk_0201DBEC.h"
|
||||
#include "unk_0201E86C.h"
|
||||
|
|
@ -120,7 +118,7 @@ typedef struct {
|
|||
UnkStruct_ov84_02240FA8 unk_00;
|
||||
Window unk_20;
|
||||
BmpList *unk_30;
|
||||
ResourceMetadata *unk_34;
|
||||
StringList *unk_34;
|
||||
u16 unk_38;
|
||||
u16 unk_3A;
|
||||
BOOL unk_3C;
|
||||
|
|
@ -129,7 +127,7 @@ typedef struct {
|
|||
} UnkStruct_ov70_0225EC20;
|
||||
|
||||
typedef struct {
|
||||
ResourceMetadata *unk_00;
|
||||
StringList *unk_00;
|
||||
UnkStruct_ov84_02240FA8 unk_04;
|
||||
} UnkStruct_ov70_0225F098;
|
||||
|
||||
|
|
@ -259,7 +257,7 @@ static void ov70_0225ED4C(UnkStruct_ov70_0225EC20 *param0, UnkStruct_ov70_0225E4
|
|||
static void ov70_0225EDA8(UnkStruct_ov70_0225EC20 *param0, u32 param1, u32 param2, u32 param3);
|
||||
static void ov70_0225EDE0(UnkStruct_ov70_0225EC20 *param0);
|
||||
static void ov70_0225EDF8(UnkStruct_ov70_0225EC20 *param0, const Strbuf *param1, u32 param2);
|
||||
static const ResourceMetadata *ov70_0225EE04(const UnkStruct_ov70_0225EC20 *param0);
|
||||
static const StringList *ov70_0225EE04(const UnkStruct_ov70_0225EC20 *param0);
|
||||
static BOOL ov70_0225EE08(const UnkStruct_ov70_0225EC20 *param0, u32 param1);
|
||||
static void ov70_0225EE30(UnkStruct_ov70_0225EC20 *param0, const UnkStruct_ov84_02240FA8 *param1, UnkStruct_ov70_0225E4EC *param2, u16 param3, u16 param4, u32 param5, u8 param6, u8 param7, u8 param8);
|
||||
static u32 ov70_0225EED8(UnkStruct_ov70_0225EC20 *param0);
|
||||
|
|
@ -976,7 +974,7 @@ void ov70_0225E044(UnkStruct_ov70_0225DEE8 *param0, const Strbuf *param1, u32 pa
|
|||
ov70_0225EDF8(¶m0->unk_39C, param1, param2);
|
||||
}
|
||||
|
||||
const ResourceMetadata *ov70_0225E054(const UnkStruct_ov70_0225DEE8 *param0)
|
||||
const StringList *ov70_0225E054(const UnkStruct_ov70_0225DEE8 *param0)
|
||||
{
|
||||
return ov70_0225EE04(¶m0->unk_39C);
|
||||
}
|
||||
|
|
@ -1712,18 +1710,18 @@ static void ov70_0225EDA8(UnkStruct_ov70_0225EC20 *param0, u32 param1, u32 param
|
|||
{
|
||||
int v0;
|
||||
GF_ASSERT(param0->unk_34 == NULL);
|
||||
param0->unk_34 = sub_02013A04(param1, param2);
|
||||
param0->unk_34 = StringList_New(param1, param2);
|
||||
param0->unk_38 = param1;
|
||||
|
||||
for (v0 = 0; v0 < param1; v0++) {
|
||||
param0->unk_34[v0].unk_04 = param3;
|
||||
param0->unk_34[v0].index = param3;
|
||||
}
|
||||
}
|
||||
|
||||
static void ov70_0225EDE0(UnkStruct_ov70_0225EC20 *param0)
|
||||
{
|
||||
if (param0->unk_34 != NULL) {
|
||||
sub_02013A3C(param0->unk_34);
|
||||
StringList_Free(param0->unk_34);
|
||||
param0->unk_34 = NULL;
|
||||
param0->unk_38 = 0;
|
||||
}
|
||||
|
|
@ -1731,10 +1729,10 @@ static void ov70_0225EDE0(UnkStruct_ov70_0225EC20 *param0)
|
|||
|
||||
static void ov70_0225EDF8(UnkStruct_ov70_0225EC20 *param0, const Strbuf *param1, u32 param2)
|
||||
{
|
||||
sub_02013A6C(param0->unk_34, param1, param2);
|
||||
StringList_AddFromStrbuf(param0->unk_34, param1, param2);
|
||||
}
|
||||
|
||||
static const ResourceMetadata *ov70_0225EE04(const UnkStruct_ov70_0225EC20 *param0)
|
||||
static const StringList *ov70_0225EE04(const UnkStruct_ov70_0225EC20 *param0)
|
||||
{
|
||||
return param0->unk_34;
|
||||
}
|
||||
|
|
@ -1744,7 +1742,7 @@ static BOOL ov70_0225EE08(const UnkStruct_ov70_0225EC20 *param0, u32 param1)
|
|||
int v0;
|
||||
|
||||
for (v0 = 0; v0 < param0->unk_38; v0++) {
|
||||
if (param0->unk_34[v0].unk_04 == param1) {
|
||||
if (param0->unk_34[v0].index == param1) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
|
@ -1897,12 +1895,12 @@ static void ov70_0225F098(UnkStruct_ov70_0225F098 *param0, UnkStruct_ov70_0225F2
|
|||
Strbuf *v0;
|
||||
|
||||
GF_ASSERT(param0->unk_00 == NULL);
|
||||
param0->unk_00 = sub_02013A04(2, param2);
|
||||
param0->unk_00 = StringList_New(2, param2);
|
||||
|
||||
v0 = ov70_0225F288(param1, 1, 67);
|
||||
sub_02013A6C(param0->unk_00, v0, 0);
|
||||
StringList_AddFromStrbuf(param0->unk_00, v0, 0);
|
||||
v0 = ov70_0225F288(param1, 1, 66);
|
||||
sub_02013A6C(param0->unk_00, v0, 1);
|
||||
StringList_AddFromStrbuf(param0->unk_00, v0, 1);
|
||||
|
||||
param0->unk_04 = Unk_ov70_0226D644;
|
||||
param0->unk_04.unk_10 = 2;
|
||||
|
|
@ -1912,7 +1910,7 @@ static void ov70_0225F098(UnkStruct_ov70_0225F098 *param0, UnkStruct_ov70_0225F2
|
|||
static void ov70_0225F100(UnkStruct_ov70_0225F098 *param0)
|
||||
{
|
||||
if (param0->unk_00 != NULL) {
|
||||
sub_02013A3C(param0->unk_00);
|
||||
StringList_Free(param0->unk_00);
|
||||
param0->unk_00 = NULL;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,10 +2,8 @@
|
|||
#include <string.h>
|
||||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_02015920_decl.h"
|
||||
#include "struct_defs/archived_sprite.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
#include "struct_defs/struct_02015958.h"
|
||||
#include "struct_defs/struct_0203CC84.h"
|
||||
#include "struct_defs/struct_0208737C.h"
|
||||
|
|
@ -30,6 +28,7 @@
|
|||
#include "savedata.h"
|
||||
#include "savedata_misc.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "sys_task_manager.h"
|
||||
#include "text.h"
|
||||
|
|
@ -42,7 +41,6 @@
|
|||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_020131EC.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_0201567C.h"
|
||||
#include "unk_02015920.h"
|
||||
#include "unk_02017728.h"
|
||||
|
|
@ -64,7 +62,7 @@ typedef struct {
|
|||
int unk_2C;
|
||||
Window unk_30;
|
||||
BmpList *unk_40;
|
||||
ResourceMetadata *unk_44;
|
||||
StringList *unk_44;
|
||||
int unk_48;
|
||||
MessageLoader *unk_4C;
|
||||
int unk_50;
|
||||
|
|
@ -782,10 +780,10 @@ static BOOL ov73_021D1648(UnkStruct_ov73_021D1058 *param0, int param1, int param
|
|||
|
||||
Window_AddFromTemplate(param0->unk_18, ¶m0->unk_30, v2);
|
||||
|
||||
param0->unk_44 = sub_02013A04(v5, param0->unk_00);
|
||||
param0->unk_44 = StringList_New(v5, param0->unk_00);
|
||||
|
||||
for (v4 = 0; v4 < v5; v4++) {
|
||||
sub_02013A4C(param0->unk_44, param0->unk_4C, v3[v4].unk_00, v3[v4].unk_04);
|
||||
StringList_AddFromMessageBank(param0->unk_44, param0->unk_4C, v3[v4].unk_00, v3[v4].unk_04);
|
||||
}
|
||||
|
||||
v1 = Unk_ov72_021D390C;
|
||||
|
|
@ -816,7 +814,7 @@ static BOOL ov73_021D1648(UnkStruct_ov73_021D1058 *param0, int param1, int param
|
|||
Window_Clear(¶m0->unk_30, 0);
|
||||
Window_Remove(¶m0->unk_30);
|
||||
sub_02001384(param0->unk_40, NULL, NULL);
|
||||
sub_02013A3C(param0->unk_44);
|
||||
StringList_Free(param0->unk_44);
|
||||
Sound_PlayEffect(1500);
|
||||
|
||||
param0->unk_2C = 0;
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@
|
|||
#include "pokemon.h"
|
||||
#include "pokemon_icon.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "sys_task.h"
|
||||
#include "sys_task_manager.h"
|
||||
#include "text.h"
|
||||
|
|
@ -44,7 +45,6 @@
|
|||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_02012744.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_02014000.h"
|
||||
#include "unk_0201E86C.h"
|
||||
#include "unk_0202419C.h"
|
||||
|
|
@ -493,7 +493,7 @@ void ov76_0223BF74(BgConfig *param0, Window *param1, int param2, UnkStruct_ov76_
|
|||
Window_Init(param1);
|
||||
Window_Add(param0, param1, param2, v2, v3, v4, v5, 14, v6);
|
||||
|
||||
param3->unk_D4.unk_C8 = sub_02013A04(v7, 53);
|
||||
param3->unk_D4.unk_C8 = StringList_New(v7, 53);
|
||||
|
||||
{
|
||||
int v9;
|
||||
|
|
@ -503,7 +503,7 @@ void ov76_0223BF74(BgConfig *param0, Window *param1, int param2, UnkStruct_ov76_
|
|||
for (v9 = 0; v9 < v7; v9++) {
|
||||
v10 = MessageLoader_GetNewStrbuf(v11, Unk_ov76_0223EF3C[v8[v9]].unk_00);
|
||||
|
||||
sub_02013A6C(param3->unk_D4.unk_C8, v10, Unk_ov76_0223EF3C[v8[v9]].unk_04);
|
||||
StringList_AddFromStrbuf(param3->unk_D4.unk_C8, v10, Unk_ov76_0223EF3C[v8[v9]].unk_04);
|
||||
Strbuf_Free(v10);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@
|
|||
#include "narc.h"
|
||||
#include "palette.h"
|
||||
#include "pokemon.h"
|
||||
#include "string_list.h"
|
||||
#include "sys_task.h"
|
||||
#include "sys_task_manager.h"
|
||||
#include "touch_screen.h"
|
||||
|
|
@ -42,7 +43,6 @@
|
|||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_02012744.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_02015920.h"
|
||||
#include "unk_02015F84.h"
|
||||
#include "unk_02017728.h"
|
||||
|
|
@ -188,7 +188,7 @@ static int ov76_0223D4C4(UnkStruct_ov76_0223DE00 *param0)
|
|||
Window_Clear(¶m0->unk_D4.unk_18[1], 1);
|
||||
Window_ClearAndCopyToVRAM(¶m0->unk_D4.unk_18[1]);
|
||||
sub_02001BC4(param0->unk_D4.unk_CC, NULL);
|
||||
sub_02013A3C(param0->unk_D4.unk_C8);
|
||||
StringList_Free(param0->unk_D4.unk_C8);
|
||||
Window_Remove(¶m0->unk_D4.unk_18[1]);
|
||||
|
||||
return 1;
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
#include "font.h"
|
||||
#include "render_text.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "unk_0200112C.h"
|
||||
|
|
@ -22,7 +23,6 @@
|
|||
#include "unk_02005474.h"
|
||||
#include "unk_0200C6E4.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_020158A8.h"
|
||||
#include "unk_02098FFC.h"
|
||||
|
||||
|
|
@ -151,7 +151,7 @@ void ov79_021D196C(UnkStruct_ov79_021D0E1C *param0)
|
|||
UnkStruct_020989DC *v2;
|
||||
|
||||
param0->unk_1C = ov79_021D18B4(param0->unk_20, param0);
|
||||
param0->unk_CC = sub_02013A04(param0->unk_1C, param0->unk_00);
|
||||
param0->unk_CC = StringList_New(param0->unk_1C, param0->unk_00);
|
||||
|
||||
for (v0 = param0->unk_1E; v0 != 0xFF; v0 = v1) {
|
||||
v2 = &(param0->unk_20->unk_1C[v0]);
|
||||
|
|
@ -160,10 +160,10 @@ void ov79_021D196C(UnkStruct_ov79_021D0E1C *param0)
|
|||
StringTemplate_SetStrbuf(param0->unk_30.unk_00, 0, sub_02015918(param0->unk_28, v2->unk_02), 0, 0, GAME_LANGUAGE);
|
||||
StringTemplate_SetNumber(param0->unk_30.unk_00, 1, v2->unk_01, 2, 2, 1);
|
||||
StringTemplate_Format(param0->unk_30.unk_00, param0->unk_30.unk_04, param0->unk_30.unk_0C);
|
||||
sub_02013A6C(param0->unk_CC, param0->unk_30.unk_04, v2->unk_05);
|
||||
StringList_AddFromStrbuf(param0->unk_CC, param0->unk_30.unk_04, v2->unk_05);
|
||||
}
|
||||
|
||||
sub_02013A6C(param0->unk_CC, param0->unk_30.unk_08, 0xFF);
|
||||
StringList_AddFromStrbuf(param0->unk_CC, param0->unk_30.unk_08, 0xFF);
|
||||
MI_CpuCopy8(&Unk_ov79_021D3BB0, ¶m0->unk_84, sizeof(UnkStruct_ov84_02240FA8));
|
||||
|
||||
param0->unk_82 = param0->unk_20->unk_06;
|
||||
|
|
@ -201,7 +201,7 @@ void ov79_021D1AB8(UnkStruct_ov79_021D0E1C *param0, BOOL param1)
|
|||
}
|
||||
|
||||
sub_02001384(param0->unk_C4, &(param0->unk_80), &(param0->unk_82));
|
||||
sub_02013A3C(param0->unk_CC);
|
||||
StringList_Free(param0->unk_CC);
|
||||
|
||||
param0->unk_20->unk_04 = param0->unk_80;
|
||||
param0->unk_20->unk_06 = param0->unk_82;
|
||||
|
|
@ -369,10 +369,10 @@ void ov79_021D1ED8(UnkStruct_ov79_021D0E1C *param0)
|
|||
{
|
||||
u8 v0 = 0;
|
||||
|
||||
param0->unk_D0 = sub_02013A04(3, param0->unk_00);
|
||||
param0->unk_D0 = StringList_New(3, param0->unk_00);
|
||||
|
||||
for (v0 = 0; v0 < 3; v0++) {
|
||||
sub_02013A4C(param0->unk_D0, param0->unk_2C, 1 + v0, v0);
|
||||
StringList_AddFromMessageBank(param0->unk_D0, param0->unk_2C, 1 + v0, v0);
|
||||
}
|
||||
|
||||
MI_CpuCopy8(&Unk_ov79_021D3B90, ¶m0->unk_A4, sizeof(UnkStruct_ov84_02240FA8));
|
||||
|
|
@ -395,7 +395,7 @@ void ov79_021D1F60(UnkStruct_ov79_021D0E1C *param0)
|
|||
Window_ClearAndCopyToVRAM(¶m0->unk_E8[3]);
|
||||
|
||||
sub_02001384(param0->unk_C8, &v1, &v0);
|
||||
sub_02013A3C(param0->unk_D0);
|
||||
StringList_Free(param0->unk_D0);
|
||||
|
||||
param0->unk_C8 = NULL;
|
||||
param0->unk_D0 = NULL;
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@
|
|||
#include "render_text.h"
|
||||
#include "save_player.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "touch_screen.h"
|
||||
|
|
@ -47,7 +48,6 @@
|
|||
#include "unk_0200C6E4.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_02017728.h"
|
||||
#include "unk_0201D15C.h"
|
||||
#include "unk_0201DBEC.h"
|
||||
|
|
@ -956,9 +956,9 @@ static void ov84_0223BFBC(UnkStruct_ov84_0223B5A0 *param0)
|
|||
u32 v1;
|
||||
|
||||
v0 = ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64];
|
||||
param0->unk_160 = sub_02013A04(Unk_ov84_02241118[v0->unk_08] + 3, 6);
|
||||
param0->unk_160 = StringList_New(Unk_ov84_02241118[v0->unk_08] + 3, 6);
|
||||
|
||||
sub_02013A4C(param0->unk_160, param0->unk_114, 32, 0xfffffffd);
|
||||
StringList_AddFromMessageBank(param0->unk_160, param0->unk_114, 32, 0xfffffffd);
|
||||
|
||||
if (v0->unk_08 == 3) {
|
||||
for (v1 = 0; v1 < Unk_ov84_02241118[v0->unk_08]; v1++) {
|
||||
|
|
@ -967,11 +967,11 @@ static void ov84_0223BFBC(UnkStruct_ov84_0223B5A0 *param0)
|
|||
}
|
||||
|
||||
ov84_0223BE94(param0->unk_120, param0->unk_164[v1], v0->unk_00[v1].item, 6);
|
||||
sub_02013A6C(param0->unk_160, param0->unk_164[v1], v1);
|
||||
StringList_AddFromStrbuf(param0->unk_160, param0->unk_164[v1], v1);
|
||||
}
|
||||
|
||||
sub_02013A4C(param0->unk_160, param0->unk_114, 32, 0xfffffffe);
|
||||
sub_02013A4C(param0->unk_160, param0->unk_114, 32, 0xfffffffd);
|
||||
StringList_AddFromMessageBank(param0->unk_160, param0->unk_114, 32, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(param0->unk_160, param0->unk_114, 32, 0xfffffffd);
|
||||
|
||||
v0->unk_09 = v1 + 3;
|
||||
} else {
|
||||
|
|
@ -981,20 +981,20 @@ static void ov84_0223BFBC(UnkStruct_ov84_0223B5A0 *param0)
|
|||
}
|
||||
|
||||
ov84_0223BE84(param0->unk_11C, param0->unk_164[v1], v0->unk_00[v1].item, 6);
|
||||
sub_02013A6C(param0->unk_160, param0->unk_164[v1], v1);
|
||||
StringList_AddFromStrbuf(param0->unk_160, param0->unk_164[v1], v1);
|
||||
}
|
||||
|
||||
if (param0->unk_C4->unk_65 != 5) {
|
||||
if (v0->unk_08 == 4) {
|
||||
sub_02013A4C(param0->unk_160, param0->unk_114, 32, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(param0->unk_160, param0->unk_114, 32, 0xfffffffe);
|
||||
} else {
|
||||
sub_02013A4C(param0->unk_160, param0->unk_114, 41, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(param0->unk_160, param0->unk_114, 41, 0xfffffffe);
|
||||
}
|
||||
|
||||
sub_02013A4C(param0->unk_160, param0->unk_114, 32, 0xfffffffd);
|
||||
StringList_AddFromMessageBank(param0->unk_160, param0->unk_114, 32, 0xfffffffd);
|
||||
v0->unk_09 = v1 + 3;
|
||||
} else {
|
||||
sub_02013A4C(param0->unk_160, param0->unk_114, 32, 0xfffffffd);
|
||||
StringList_AddFromMessageBank(param0->unk_160, param0->unk_114, 32, 0xfffffffd);
|
||||
v0->unk_09 = v1 + 2;
|
||||
}
|
||||
}
|
||||
|
|
@ -1177,7 +1177,7 @@ static void ov84_0223C3B8(BmpList *param0, u32 param1, u8 param2)
|
|||
static void ov84_0223C4E0(UnkStruct_ov84_0223B5A0 *param0)
|
||||
{
|
||||
sub_02001384(param0->unk_15C, ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_06, ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_04);
|
||||
sub_02013A3C(param0->unk_160);
|
||||
StringList_Free(param0->unk_160);
|
||||
param0->unk_15C = NULL;
|
||||
}
|
||||
|
||||
|
|
@ -1537,7 +1537,7 @@ static u8 ov84_0223CBD8(UnkStruct_ov84_0223B5A0 *param0)
|
|||
} else {
|
||||
if (param0->unk_15C != NULL) {
|
||||
sub_02001384(param0->unk_15C, ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_06, ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_04);
|
||||
sub_02013A3C(param0->unk_160);
|
||||
StringList_Free(param0->unk_160);
|
||||
}
|
||||
|
||||
param0->unk_C4->unk_64 = v0->unk_00;
|
||||
|
|
@ -1912,7 +1912,7 @@ static void ov84_0223D42C(UnkStruct_ov84_0223B5A0 *param0)
|
|||
|
||||
if (!((param0->unk_47B == v1) || (param0->unk_47B == (v1 - 1)))) {
|
||||
Item_MoveInPocket(v0->unk_00, param0->unk_47B - 1, v1 - 1);
|
||||
sub_02013A3C(param0->unk_160);
|
||||
StringList_Free(param0->unk_160);
|
||||
ov84_0223BFBC(param0);
|
||||
}
|
||||
|
||||
|
|
@ -2310,7 +2310,7 @@ static void ov84_0223DCF8(UnkStruct_ov84_0223B5A0 *param0)
|
|||
{
|
||||
Pocket_TryRemoveItem(param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_00, param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_09 - 3, param0->unk_C4->unk_66, param0->unk_488, 6);
|
||||
sub_02001384(param0->unk_15C, ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_06, ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_04);
|
||||
sub_02013A3C(param0->unk_160);
|
||||
StringList_Free(param0->unk_160);
|
||||
|
||||
ov84_0223BFBC(param0);
|
||||
ov84_0223C194(¶m0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_06, ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_04, param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_09);
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
#include "poffin.h"
|
||||
#include "render_text.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "trainer_info.h"
|
||||
|
|
@ -31,7 +32,6 @@
|
|||
#include "unk_02005474.h"
|
||||
#include "unk_0200C440.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_02013A04.h"
|
||||
|
||||
static void ov84_0223F9B0(UnkStruct_ov84_0223B5A0 *param0, u32 param1);
|
||||
static BOOL ov84_022400E0(TextPrinterTemplate *param0, u16 param1);
|
||||
|
|
@ -415,10 +415,10 @@ void ov84_0223FB70(UnkStruct_ov84_0223B5A0 *param0, u8 *param1, u8 param2)
|
|||
v5 = 3;
|
||||
}
|
||||
|
||||
param0->unk_154 = sub_02013A04(param2, 6);
|
||||
param0->unk_154 = StringList_New(param2, 6);
|
||||
|
||||
for (v4 = 0; v4 < param2; v4++) {
|
||||
sub_02013A6C(param0->unk_154, param0->unk_124[param1[v4]], ov84_0223D84C(param1[v4]));
|
||||
StringList_AddFromStrbuf(param0->unk_154, param0->unk_124[param1[v4]], ov84_0223D84C(param1[v4]));
|
||||
}
|
||||
|
||||
v0.unk_00 = param0->unk_154;
|
||||
|
|
@ -480,7 +480,7 @@ void ov84_0223FD84(UnkStruct_ov84_0223B5A0 *param0)
|
|||
Window_Clear(¶m0->unk_B4[0], 1);
|
||||
Window_ClearAndScheduleCopyToVRAM(¶m0->unk_B4[0]);
|
||||
sub_02001BC4(param0->unk_158, NULL);
|
||||
sub_02013A3C(param0->unk_154);
|
||||
StringList_Free(param0->unk_154);
|
||||
Window_Remove(¶m0->unk_B4[0]);
|
||||
Window_FillTilemap(¶m0->unk_04[1], 0);
|
||||
ov84_0223F528(param0, param0->unk_C4->unk_66);
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@
|
|||
#include "savedata.h"
|
||||
#include "sprite_resource.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "touch_screen.h"
|
||||
|
|
@ -66,7 +67,6 @@
|
|||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_020131EC.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_02017728.h"
|
||||
#include "unk_0201D15C.h"
|
||||
#include "unk_0201DBEC.h"
|
||||
|
|
@ -1896,7 +1896,7 @@ static int ov88_0223D5B8(UnkStruct_02095E80 *param0)
|
|||
Window_Clear(¶m0->unk_36DC, 0);
|
||||
Window_Remove(¶m0->unk_36DC);
|
||||
sub_02001384(param0->unk_36D8, NULL, NULL);
|
||||
sub_02013A3C(param0->unk_36D4);
|
||||
StringList_Free(param0->unk_36D4);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1907,7 +1907,7 @@ static int ov88_0223D69C(UnkStruct_02095E80 *param0)
|
|||
int v1 = sub_0202AF94(param0->unk_36EC);
|
||||
int v2 = 5;
|
||||
|
||||
param0->unk_36D4 = sub_02013A04(v1 + 1, 26);
|
||||
param0->unk_36D4 = StringList_New(v1 + 1, 26);
|
||||
|
||||
{
|
||||
MessageLoader *v3;
|
||||
|
|
@ -1917,11 +1917,11 @@ static int ov88_0223D69C(UnkStruct_02095E80 *param0)
|
|||
for (v5 = 0; v5 < 32; v5++) {
|
||||
if (sub_0202AF78(param0->unk_36EC, v5)) {
|
||||
Strbuf_CopyChars(v4, sub_0202AEF0(param0->unk_36EC, v5));
|
||||
sub_02013A6C(param0->unk_36D4, v4, v5);
|
||||
StringList_AddFromStrbuf(param0->unk_36D4, v4, v5);
|
||||
}
|
||||
}
|
||||
|
||||
sub_02013A4C(param0->unk_36D4, param0->unk_36D0, 11, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(param0->unk_36D4, param0->unk_36D0, 11, 0xfffffffe);
|
||||
Strbuf_Free(v4);
|
||||
}
|
||||
|
||||
|
|
@ -2090,11 +2090,11 @@ static int ov88_0223DA3C(UnkStruct_02095E80 *param0)
|
|||
Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0);
|
||||
ov88_0223ECBC(¶m0->unk_49C[22], 16, FONT_MESSAGE, param0->unk_184, param0->unk_17C);
|
||||
|
||||
param0->unk_6C0 = sub_02013A04(3, 26);
|
||||
param0->unk_6C0 = StringList_New(3, 26);
|
||||
|
||||
sub_02013A4C(param0->unk_6C0, param0->unk_184, 17, 0);
|
||||
sub_02013A4C(param0->unk_6C0, param0->unk_184, 18, 1);
|
||||
sub_02013A4C(param0->unk_6C0, param0->unk_184, 19, 2);
|
||||
StringList_AddFromMessageBank(param0->unk_6C0, param0->unk_184, 17, 0);
|
||||
StringList_AddFromMessageBank(param0->unk_6C0, param0->unk_184, 18, 1);
|
||||
StringList_AddFromMessageBank(param0->unk_6C0, param0->unk_184, 19, 2);
|
||||
|
||||
v0.unk_00 = param0->unk_6C0;
|
||||
v0.unk_04 = ¶m0->unk_49C[24];
|
||||
|
|
@ -2114,7 +2114,7 @@ static int ov88_0223DB48(UnkStruct_02095E80 *param0)
|
|||
Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0);
|
||||
ov88_0223ECBC(¶m0->unk_49C[21], 15, FONT_MESSAGE, param0->unk_184, param0->unk_178);
|
||||
sub_02001BC4(param0->unk_6C4, NULL);
|
||||
sub_02013A3C(param0->unk_6C0);
|
||||
StringList_Free(param0->unk_6C0);
|
||||
param0->unk_226C = ov88_0223D150;
|
||||
return 3;
|
||||
break;
|
||||
|
|
@ -2122,7 +2122,7 @@ static int ov88_0223DB48(UnkStruct_02095E80 *param0)
|
|||
Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0);
|
||||
ov88_0223ECBC(¶m0->unk_49C[23], 20, FONT_MESSAGE, param0->unk_184, param0->unk_178);
|
||||
sub_02001BC4(param0->unk_6C4, NULL);
|
||||
sub_02013A3C(param0->unk_6C0);
|
||||
StringList_Free(param0->unk_6C0);
|
||||
param0->unk_226C = ov88_0223DC84;
|
||||
break;
|
||||
case 2:
|
||||
|
|
@ -2130,7 +2130,7 @@ static int ov88_0223DB48(UnkStruct_02095E80 *param0)
|
|||
Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0);
|
||||
ov88_0223ECBC(¶m0->unk_49C[21], 15, FONT_MESSAGE, param0->unk_184, param0->unk_178);
|
||||
sub_02001BC4(param0->unk_6C4, NULL);
|
||||
sub_02013A3C(param0->unk_6C0);
|
||||
StringList_Free(param0->unk_6C0);
|
||||
param0->unk_226C = ov88_0223D150;
|
||||
break;
|
||||
}
|
||||
|
|
@ -2439,10 +2439,10 @@ static int ov88_0223E4BC(UnkStruct_02095E80 *param0)
|
|||
Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0);
|
||||
ov88_0223ECBC(¶m0->unk_49C[22], 16, FONT_MESSAGE, param0->unk_184, param0->unk_17C);
|
||||
|
||||
param0->unk_6C0 = sub_02013A04(2, 26);
|
||||
param0->unk_6C0 = StringList_New(2, 26);
|
||||
|
||||
sub_02013A4C(param0->unk_6C0, param0->unk_184, 17, 0);
|
||||
sub_02013A4C(param0->unk_6C0, param0->unk_184, 19, 1);
|
||||
StringList_AddFromMessageBank(param0->unk_6C0, param0->unk_184, 17, 0);
|
||||
StringList_AddFromMessageBank(param0->unk_6C0, param0->unk_184, 19, 1);
|
||||
|
||||
v0.unk_00 = param0->unk_6C0;
|
||||
v0.unk_04 = ¶m0->unk_49C[25];
|
||||
|
|
@ -2463,7 +2463,7 @@ static int ov88_0223E5B8(UnkStruct_02095E80 *param0)
|
|||
ov88_0223ECBC(¶m0->unk_49C[21], 15, FONT_MESSAGE, param0->unk_184, param0->unk_178);
|
||||
param0->unk_226C = ov88_0223D150;
|
||||
sub_02001BC4(param0->unk_6C4, NULL);
|
||||
sub_02013A3C(param0->unk_6C0);
|
||||
StringList_Free(param0->unk_6C0);
|
||||
return 3;
|
||||
break;
|
||||
|
||||
|
|
@ -2472,7 +2472,7 @@ static int ov88_0223E5B8(UnkStruct_02095E80 *param0)
|
|||
Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0);
|
||||
ov88_0223ECBC(¶m0->unk_49C[21], 15, FONT_MESSAGE, param0->unk_184, param0->unk_178);
|
||||
sub_02001BC4(param0->unk_6C4, NULL);
|
||||
sub_02013A3C(param0->unk_6C0);
|
||||
StringList_Free(param0->unk_6C0);
|
||||
param0->unk_226C = ov88_0223D150;
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,8 +5,6 @@
|
|||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
|
||||
#include "overlay084/struct_ov84_02240FA8.h"
|
||||
|
||||
|
|
@ -16,6 +14,7 @@
|
|||
#include "message.h"
|
||||
#include "message_util.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "text.h"
|
||||
#include "unk_0200112C.h"
|
||||
#include "unk_02001AF4.h"
|
||||
|
|
@ -207,7 +206,7 @@ static const UnkStruct_ov84_02240FA8 Unk_ov88_0223F150 = {
|
|||
NULL
|
||||
};
|
||||
|
||||
BmpList *ov88_0223ED94(ResourceMetadata *param0, int param1, Window *param2, BgConfig *param3)
|
||||
BmpList *ov88_0223ED94(StringList *param0, int param1, Window *param2, BgConfig *param3)
|
||||
{
|
||||
BmpList *v0;
|
||||
UnkStruct_ov84_02240FA8 v1;
|
||||
|
|
|
|||
|
|
@ -7,11 +7,9 @@
|
|||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_0200C6E4_decl.h"
|
||||
#include "struct_decls/struct_0200C704_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_defs/pokemon_summary.h"
|
||||
#include "struct_defs/sprite_template.h"
|
||||
#include "struct_defs/struct_0200D0F4.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
#include "struct_defs/struct_020997B8.h"
|
||||
#include "struct_defs/struct_02099F80.h"
|
||||
|
||||
|
|
@ -36,6 +34,7 @@
|
|||
#include "pokemon_summary_app.h"
|
||||
#include "render_text.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "unk_0200112C.h"
|
||||
|
|
@ -44,7 +43,6 @@
|
|||
#include "unk_0200C6E4.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_02017728.h"
|
||||
#include "unk_0201DBEC.h"
|
||||
#include "unk_0207C908.h"
|
||||
|
|
@ -61,7 +59,7 @@ typedef struct {
|
|||
StringTemplate *unk_FC;
|
||||
Strbuf *unk_100;
|
||||
BmpList *unk_104;
|
||||
ResourceMetadata *unk_108;
|
||||
StringList *unk_108;
|
||||
UIControlData *unk_10C;
|
||||
SpriteRenderer *unk_110;
|
||||
SpriteGfxHandler *unk_114;
|
||||
|
|
@ -911,17 +909,17 @@ static void ov91_021D1784(UnkStruct_ov91_021D0ED8 *param0)
|
|||
u32 v2;
|
||||
|
||||
param0->unk_184 = (u8)ov91_021D175C(param0) + 1;
|
||||
param0->unk_108 = sub_02013A04(param0->unk_184, 67);
|
||||
param0->unk_108 = StringList_New(param0->unk_184, 67);
|
||||
|
||||
v0 = MessageLoader_Init(
|
||||
0, 26, 647, 67);
|
||||
|
||||
for (v2 = 0; v2 < param0->unk_184; v2++) {
|
||||
if (param0->unk_00->unk_0C[v2] != 0xffff) {
|
||||
sub_02013A4C(
|
||||
StringList_AddFromMessageBank(
|
||||
param0->unk_108, v0, param0->unk_00->unk_0C[v2], param0->unk_00->unk_0C[v2]);
|
||||
} else {
|
||||
sub_02013A4C(
|
||||
StringList_AddFromMessageBank(
|
||||
param0->unk_108, param0->unk_F8, 32, 0xfffffffe);
|
||||
break;
|
||||
}
|
||||
|
|
@ -943,7 +941,7 @@ static void ov91_021D1784(UnkStruct_ov91_021D0ED8 *param0)
|
|||
static void ov91_021D1868(UnkStruct_ov91_021D0ED8 *param0)
|
||||
{
|
||||
sub_02001384(param0->unk_104, ¶m0->unk_00->unk_12, ¶m0->unk_00->unk_10);
|
||||
sub_02013A3C(param0->unk_108);
|
||||
StringList_Free(param0->unk_108);
|
||||
}
|
||||
|
||||
static void ov91_021D188C(BmpList *param0, u32 param1, u8 param2)
|
||||
|
|
|
|||
|
|
@ -5,9 +5,7 @@
|
|||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_0202C878_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
#include "struct_defs/struct_02099F80.h"
|
||||
|
||||
#include "overlay084/struct_ov84_02240FA8.h"
|
||||
|
|
@ -30,6 +28,7 @@
|
|||
#include "save_player.h"
|
||||
#include "savedata.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "unk_0200112C.h"
|
||||
|
|
@ -37,7 +36,6 @@
|
|||
#include "unk_02005474.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_02017728.h"
|
||||
#include "unk_0201D15C.h"
|
||||
#include "unk_0202419C.h"
|
||||
|
|
@ -80,7 +78,7 @@ typedef struct {
|
|||
Window unk_B834;
|
||||
Window unk_B844;
|
||||
BmpList *unk_B854;
|
||||
ResourceMetadata *unk_B858;
|
||||
StringList *unk_B858;
|
||||
UIControlData *unk_B85C;
|
||||
MessageLoader *unk_B860;
|
||||
int unk_B864;
|
||||
|
|
@ -1027,10 +1025,10 @@ static void ov92_021D1C4C(UnkStruct_ov92_021D1B24 *param0, Window *param1, const
|
|||
int v1;
|
||||
|
||||
Window_AddFromTemplate(param0->unk_B810, param1, param2);
|
||||
param0->unk_B858 = sub_02013A04(param3->unk_10, param0->unk_00);
|
||||
param0->unk_B858 = StringList_New(param3->unk_10, param0->unk_00);
|
||||
|
||||
for (v1 = 0; v1 < param3->unk_10; v1++) {
|
||||
sub_02013A4C(param0->unk_B858, param0->unk_B860, param4[v1].unk_00, param4[v1].unk_04);
|
||||
StringList_AddFromMessageBank(param0->unk_B858, param0->unk_B860, param4[v1].unk_00, param4[v1].unk_04);
|
||||
}
|
||||
|
||||
v0 = *param3;
|
||||
|
|
@ -1051,10 +1049,10 @@ static void ov92_021D1CF4(UnkStruct_ov92_021D1B24 *param0, Window *param1, const
|
|||
|
||||
Window_AddFromTemplate(param0->unk_B810, param1, param2);
|
||||
v1 = MessageLoader_Init(0, 26, param4, param0->unk_00);
|
||||
param0->unk_B858 = sub_02013A04(param6, param0->unk_00);
|
||||
param0->unk_B858 = StringList_New(param6, param0->unk_00);
|
||||
|
||||
for (v2 = 0; v2 < param6; v2++) {
|
||||
sub_02013A4C(param0->unk_B858, v1, param5[v2], v2);
|
||||
StringList_AddFromMessageBank(param0->unk_B858, v1, param5[v2], v2);
|
||||
}
|
||||
|
||||
MessageLoader_Free(v1);
|
||||
|
|
@ -1076,7 +1074,7 @@ static void ov92_021D1DB4(UnkStruct_ov92_021D1B24 *param0)
|
|||
Window_Clear(¶m0->unk_B824, 0);
|
||||
Window_Remove(¶m0->unk_B824);
|
||||
sub_02001384(param0->unk_B854, NULL, NULL);
|
||||
sub_02013A3C(param0->unk_B858);
|
||||
StringList_Free(param0->unk_B858);
|
||||
}
|
||||
|
||||
static void ov92_021D1DEC(UnkStruct_ov92_021D1B24 *param0)
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
#include "party.h"
|
||||
#include "pokemon.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "unk_02001AF4.h"
|
||||
|
|
@ -36,7 +37,6 @@
|
|||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_020131EC.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_020393C8.h"
|
||||
|
||||
static void ov94_0223D1D4(BgConfig *param0);
|
||||
|
|
@ -411,10 +411,10 @@ static int ov94_0223D6B8(UnkStruct_ov94_0223FD4C *param0)
|
|||
v0.unk_0B_4 = 0;
|
||||
v0.unk_0B_6 = 0;
|
||||
|
||||
param0->unk_10CC = sub_02013A04(2, 62);
|
||||
param0->unk_10CC = StringList_New(2, 62);
|
||||
|
||||
sub_02013A4C(param0->unk_10CC, param0->unk_B90, 54, 1);
|
||||
sub_02013A4C(param0->unk_10CC, param0->unk_B90, 55, 2);
|
||||
StringList_AddFromMessageBank(param0->unk_10CC, param0->unk_B90, 54, 1);
|
||||
StringList_AddFromMessageBank(param0->unk_10CC, param0->unk_B90, 55, 2);
|
||||
|
||||
v0.unk_00 = param0->unk_10CC;
|
||||
v0.unk_04 = ¶m0->unk_F9C[0];
|
||||
|
|
@ -432,7 +432,7 @@ static int ov94_0223D754(UnkStruct_ov94_0223FD4C *param0)
|
|||
switch (sub_02001BE0(param0->unk_10D4)) {
|
||||
case 1:
|
||||
sub_02001BC4(param0->unk_10D4, NULL);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[0], 0);
|
||||
|
||||
{
|
||||
|
|
@ -455,7 +455,7 @@ static int ov94_0223D754(UnkStruct_ov94_0223FD4C *param0)
|
|||
case 2:
|
||||
case 0xfffffffe:
|
||||
sub_02001BC4(param0->unk_10D4, NULL);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[0], 0);
|
||||
|
||||
param0->unk_2C = 2;
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@
|
|||
#include "narc.h"
|
||||
#include "pokemon.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "text.h"
|
||||
#include "unk_0200112C.h"
|
||||
#include "unk_02001AF4.h"
|
||||
#include "unk_02005474.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_0202DA40.h"
|
||||
#include "unk_020366A0.h"
|
||||
#include "unk_020393C8.h"
|
||||
|
|
@ -776,13 +776,13 @@ static int ov94_0223F190(UnkStruct_ov94_0223FD4C *param0)
|
|||
case 8:
|
||||
case 9:
|
||||
sub_02001384(param0->unk_10D8, ¶m0->unk_10E4->unk_06, ¶m0->unk_10E4->unk_04);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Sound_PlayEffect(1500);
|
||||
param0->unk_2C = 6;
|
||||
break;
|
||||
case 0xfffffffe:
|
||||
sub_02001384(param0->unk_10D8, ¶m0->unk_10E4->unk_06, ¶m0->unk_10E4->unk_04);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[0], 0);
|
||||
sub_0200E084(¶m0->unk_F5C, 0);
|
||||
Window_Remove(¶m0->unk_F9C[0]);
|
||||
|
|
@ -813,7 +813,7 @@ static int ov94_0223F2B0(UnkStruct_ov94_0223FD4C *param0)
|
|||
break;
|
||||
case 0xfffffffe:
|
||||
sub_02001384(param0->unk_10D8, ¶m0->unk_10E4->unk_0A, ¶m0->unk_10E4->unk_08);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[1], 0);
|
||||
Sound_PlayEffect(1500);
|
||||
param0->unk_2C = 4;
|
||||
|
|
@ -821,7 +821,7 @@ static int ov94_0223F2B0(UnkStruct_ov94_0223FD4C *param0)
|
|||
break;
|
||||
default:
|
||||
sub_02001384(param0->unk_10D8, ¶m0->unk_10E4->unk_0A, ¶m0->unk_10E4->unk_08);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[0], 0);
|
||||
Window_Clear(¶m0->unk_F9C[1], 0);
|
||||
Window_Remove(¶m0->unk_F9C[0]);
|
||||
|
|
@ -874,7 +874,7 @@ static int ov94_0223F4B0(UnkStruct_ov94_0223FD4C *param0)
|
|||
switch (v0 = ov94_02242A6C(param0->unk_10D8, ¶m0->unk_108)) {
|
||||
case 0xfffffffe:
|
||||
sub_02001384(param0->unk_10D8, NULL, NULL);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[0], 0);
|
||||
sub_0200E084(¶m0->unk_F5C, 0);
|
||||
Window_Remove(¶m0->unk_F9C[0]);
|
||||
|
|
@ -885,7 +885,7 @@ static int ov94_0223F4B0(UnkStruct_ov94_0223FD4C *param0)
|
|||
case 1:
|
||||
case 2:
|
||||
sub_02001384(param0->unk_10D8, NULL, NULL);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[0], 0);
|
||||
Window_Remove(¶m0->unk_F9C[0]);
|
||||
Sound_PlayEffect(1500);
|
||||
|
|
@ -931,7 +931,7 @@ static int ov94_0223F638(UnkStruct_ov94_0223FD4C *param0)
|
|||
case 0xfffffffe:
|
||||
case 11:
|
||||
sub_02001384(param0->unk_10D8, NULL, NULL);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[0], 0);
|
||||
sub_0200E084(¶m0->unk_F5C, 0);
|
||||
Window_Remove(¶m0->unk_F9C[0]);
|
||||
|
|
@ -940,7 +940,7 @@ static int ov94_0223F638(UnkStruct_ov94_0223FD4C *param0)
|
|||
break;
|
||||
default:
|
||||
sub_02001384(param0->unk_10D8, NULL, NULL);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[0], 0);
|
||||
Window_Remove(¶m0->unk_F9C[0]);
|
||||
Sound_PlayEffect(1500);
|
||||
|
|
@ -986,7 +986,7 @@ static int ov94_0223F7C0(UnkStruct_ov94_0223FD4C *param0)
|
|||
(void)0;
|
||||
} else if ((v0 == 0xfffffffe) || (v0 == (Unk_ov94_02245FD4 + 1))) {
|
||||
sub_02001384(param0->unk_10D8, NULL, NULL);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[0], 0);
|
||||
sub_0200E084(¶m0->unk_F5C, 0);
|
||||
Window_Remove(¶m0->unk_F9C[0]);
|
||||
|
|
@ -994,7 +994,7 @@ static int ov94_0223F7C0(UnkStruct_ov94_0223FD4C *param0)
|
|||
param0->unk_2C = 0;
|
||||
} else {
|
||||
sub_02001384(param0->unk_10D8, NULL, NULL);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[0], 0);
|
||||
Window_Remove(¶m0->unk_F9C[0]);
|
||||
Sound_PlayEffect(1500);
|
||||
|
|
|
|||
|
|
@ -32,13 +32,13 @@
|
|||
#include "pokemon.h"
|
||||
#include "pokemon_icon.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "unk_02001AF4.h"
|
||||
#include "unk_02005474.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_020393C8.h"
|
||||
#include "unk_020797C8.h"
|
||||
|
||||
|
|
@ -684,11 +684,11 @@ static int ov94_022405DC(UnkStruct_ov94_0223FD4C *param0)
|
|||
v0.unk_0B_4 = 0;
|
||||
v0.unk_0B_6 = 0;
|
||||
|
||||
param0->unk_10CC = sub_02013A04(3, 62);
|
||||
param0->unk_10CC = StringList_New(3, 62);
|
||||
|
||||
sub_02013A4C(param0->unk_10CC, param0->unk_B90, 94, 1);
|
||||
sub_02013A4C(param0->unk_10CC, param0->unk_B90, 95, 2);
|
||||
sub_02013A4C(param0->unk_10CC, param0->unk_B90, 96, 3);
|
||||
StringList_AddFromMessageBank(param0->unk_10CC, param0->unk_B90, 94, 1);
|
||||
StringList_AddFromMessageBank(param0->unk_10CC, param0->unk_B90, 95, 2);
|
||||
StringList_AddFromMessageBank(param0->unk_10CC, param0->unk_B90, 96, 3);
|
||||
|
||||
v0.unk_00 = param0->unk_10CC;
|
||||
v0.unk_04 = ¶m0->unk_F9C[0];
|
||||
|
|
@ -708,14 +708,14 @@ static int ov94_02240688(UnkStruct_ov94_0223FD4C *param0)
|
|||
switch (sub_02001BE0(param0->unk_10D4)) {
|
||||
case 1:
|
||||
sub_02001BC4(param0->unk_10D4, NULL);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[0], 0);
|
||||
param0->unk_2C = 2;
|
||||
ov94_0223C4C0(param0, 8, 5);
|
||||
break;
|
||||
case 2:
|
||||
sub_02001BC4(param0->unk_10D4, NULL);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[0], 0);
|
||||
|
||||
v0 = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112);
|
||||
|
|
@ -754,7 +754,7 @@ static int ov94_02240688(UnkStruct_ov94_0223FD4C *param0)
|
|||
case 3:
|
||||
case 0xfffffffe:
|
||||
sub_02001BC4(param0->unk_10D4, NULL);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[0], 0);
|
||||
sub_0200E084(¶m0->unk_F5C, 0);
|
||||
param0->unk_2C = 1;
|
||||
|
|
@ -775,11 +775,11 @@ static int ov94_02240830(UnkStruct_ov94_0223FD4C *param0)
|
|||
v0.unk_0B_4 = 0;
|
||||
v0.unk_0B_6 = 0;
|
||||
|
||||
param0->unk_10CC = sub_02013A04(3, 62);
|
||||
param0->unk_10CC = StringList_New(3, 62);
|
||||
|
||||
sub_02013A4C(param0->unk_10CC, param0->unk_B90, 84, 1);
|
||||
sub_02013A4C(param0->unk_10CC, param0->unk_B90, 85, 2);
|
||||
sub_02013A4C(param0->unk_10CC, param0->unk_B90, 86, 3);
|
||||
StringList_AddFromMessageBank(param0->unk_10CC, param0->unk_B90, 84, 1);
|
||||
StringList_AddFromMessageBank(param0->unk_10CC, param0->unk_B90, 85, 2);
|
||||
StringList_AddFromMessageBank(param0->unk_10CC, param0->unk_B90, 86, 3);
|
||||
|
||||
v0.unk_00 = param0->unk_10CC;
|
||||
v0.unk_04 = ¶m0->unk_F9C[0];
|
||||
|
|
@ -800,14 +800,14 @@ static int ov94_022408E8(UnkStruct_ov94_0223FD4C *param0)
|
|||
switch (sub_02001BE0(param0->unk_10D4)) {
|
||||
case 1:
|
||||
sub_02001BC4(param0->unk_10D4, NULL);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[0], 0);
|
||||
param0->unk_2C = 2;
|
||||
ov94_0223C4C0(param0, 8, 6);
|
||||
break;
|
||||
case 2:
|
||||
sub_02001BC4(param0->unk_10D4, NULL);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[0], 0);
|
||||
|
||||
v0 = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112);
|
||||
|
|
@ -843,7 +843,7 @@ static int ov94_022408E8(UnkStruct_ov94_0223FD4C *param0)
|
|||
case 3:
|
||||
case 0xfffffffe:
|
||||
sub_02001BC4(param0->unk_10D4, NULL);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[0], 0);
|
||||
sub_0200E084(¶m0->unk_F5C, 0);
|
||||
param0->unk_2C = 1;
|
||||
|
|
|
|||
|
|
@ -8,8 +8,6 @@
|
|||
|
||||
#include "struct_decls/pokedexdata_decl.h"
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
|
||||
#include "overlay084/struct_ov84_02240FA8.h"
|
||||
#include "overlay094/const_ov94_02245FD4.h"
|
||||
|
|
@ -36,6 +34,7 @@
|
|||
#include "narc.h"
|
||||
#include "pokemon.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "trainer_info.h"
|
||||
|
|
@ -44,7 +43,6 @@
|
|||
#include "unk_02005474.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_0202631C.h"
|
||||
#include "unk_0202C858.h"
|
||||
#include "unk_020393C8.h"
|
||||
|
|
@ -82,7 +80,7 @@ static int ov94_02242040(UnkStruct_ov94_0223FD4C *param0);
|
|||
static int ov94_02242068(UnkStruct_ov94_0223FD4C *param0);
|
||||
static int ov94_0224208C(UnkStruct_ov94_0223FD4C *param0);
|
||||
static void ov94_02242668(UnkStruct_ov94_0223BA88 *param0, UnkStruct_ov94_0223FD4C *param1);
|
||||
static int ov94_02242718(ResourceMetadata **param0, MessageLoader *param1, MessageLoader *param2, u16 *param3, u8 *param4, int param5, int param6, PokedexData *param7);
|
||||
static int ov94_02242718(StringList **param0, MessageLoader *param1, MessageLoader *param2, u16 *param3, u8 *param4, int param5, int param6, PokedexData *param7);
|
||||
static TextColor ov94_022421E8(int param0, u32 param1);
|
||||
|
||||
static int (*Unk_ov94_0224695C[])(UnkStruct_ov94_0223FD4C *) = {
|
||||
|
|
@ -568,13 +566,13 @@ static int ov94_02241A58(UnkStruct_ov94_0223FD4C *param0)
|
|||
case 8:
|
||||
case 9:
|
||||
sub_02001384(param0->unk_10D8, ¶m0->unk_10E4->unk_06, ¶m0->unk_10E4->unk_04);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
param0->unk_2C = 5;
|
||||
Sound_PlayEffect(1500);
|
||||
break;
|
||||
case 0xfffffffe:
|
||||
sub_02001384(param0->unk_10D8, ¶m0->unk_10E4->unk_06, ¶m0->unk_10E4->unk_04);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[0], 0);
|
||||
sub_0200E084(¶m0->unk_F5C, 0);
|
||||
Window_Remove(¶m0->unk_F9C[0]);
|
||||
|
|
@ -627,7 +625,7 @@ static int ov94_02241BAC(UnkStruct_ov94_0223FD4C *param0)
|
|||
break;
|
||||
case 0xfffffffe:
|
||||
sub_02001384(param0->unk_10D8, ¶m0->unk_10E4->unk_0A, ¶m0->unk_10E4->unk_08);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[1], 0);
|
||||
Window_Remove(¶m0->unk_F9C[0]);
|
||||
Window_Remove(¶m0->unk_F9C[1]);
|
||||
|
|
@ -637,7 +635,7 @@ static int ov94_02241BAC(UnkStruct_ov94_0223FD4C *param0)
|
|||
break;
|
||||
default:
|
||||
sub_02001384(param0->unk_10D8, ¶m0->unk_10E4->unk_0A, ¶m0->unk_10E4->unk_08);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[0], 0);
|
||||
Window_Clear(¶m0->unk_F9C[1], 0);
|
||||
Window_Remove(¶m0->unk_F9C[0]);
|
||||
|
|
@ -689,7 +687,7 @@ static int ov94_02241DA0(UnkStruct_ov94_0223FD4C *param0)
|
|||
switch (v0 = ov94_02242A6C(param0->unk_10D8, ¶m0->unk_108)) {
|
||||
case 0xfffffffe:
|
||||
sub_02001384(param0->unk_10D8, NULL, NULL);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[0], 0);
|
||||
sub_0200E084(¶m0->unk_F5C, 0);
|
||||
Window_Remove(¶m0->unk_F9C[0]);
|
||||
|
|
@ -701,7 +699,7 @@ static int ov94_02241DA0(UnkStruct_ov94_0223FD4C *param0)
|
|||
case 1:
|
||||
case 2:
|
||||
sub_02001384(param0->unk_10D8, NULL, NULL);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[0], 0);
|
||||
Window_Remove(¶m0->unk_F9C[0]);
|
||||
Sound_PlayEffect(1500);
|
||||
|
|
@ -744,7 +742,7 @@ static int ov94_02241F28(UnkStruct_ov94_0223FD4C *param0)
|
|||
case 0xfffffffe:
|
||||
case 12:
|
||||
sub_02001384(param0->unk_10D8, NULL, NULL);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[0], 0);
|
||||
sub_0200E084(¶m0->unk_F5C, 0);
|
||||
Window_Remove(¶m0->unk_F9C[0]);
|
||||
|
|
@ -759,7 +757,7 @@ static int ov94_02241F28(UnkStruct_ov94_0223FD4C *param0)
|
|||
default:
|
||||
Sound_PlayEffect(1500);
|
||||
sub_02001384(param0->unk_10D8, NULL, NULL);
|
||||
sub_02013A3C(param0->unk_10CC);
|
||||
StringList_Free(param0->unk_10CC);
|
||||
Window_Clear(¶m0->unk_F9C[0], 0);
|
||||
Window_Remove(¶m0->unk_F9C[0]);
|
||||
ov94_02242934(¶m0->unk_B74, v0, 0);
|
||||
|
|
@ -1095,15 +1093,15 @@ static const UnkStruct_ov84_02240FA8 Unk_ov94_0224608C = {
|
|||
NULL
|
||||
};
|
||||
|
||||
BmpList *ov94_022426A8(UnkStruct_ov94_0223FD4C *param0, ResourceMetadata **param1, Window *param2, MessageLoader *param3)
|
||||
BmpList *ov94_022426A8(UnkStruct_ov94_0223FD4C *param0, StringList **param1, Window *param2, MessageLoader *param3)
|
||||
{
|
||||
UnkStruct_ov84_02240FA8 v0;
|
||||
int v1;
|
||||
|
||||
*param1 = sub_02013A04(9, 62);
|
||||
*param1 = StringList_New(9, 62);
|
||||
|
||||
for (v1 = 0; v1 < 9; v1++) {
|
||||
sub_02013A4C(*param1, param3, 104 + v1, v1 + 1);
|
||||
StringList_AddFromMessageBank(*param1, param3, 104 + v1, v1 + 1);
|
||||
}
|
||||
|
||||
v0 = Unk_ov94_0224608C;
|
||||
|
|
@ -1128,7 +1126,7 @@ static u16 Unk_ov94_02246928[] = {
|
|||
0x1ED
|
||||
};
|
||||
|
||||
static int ov94_02242718(ResourceMetadata **param0, MessageLoader *param1, MessageLoader *param2, u16 *param3, u8 *param4, int param5, int param6, PokedexData *param7)
|
||||
static int ov94_02242718(StringList **param0, MessageLoader *param1, MessageLoader *param2, u16 *param3, u8 *param4, int param5, int param6, PokedexData *param7)
|
||||
{
|
||||
int v0, v1, v2 = 0;
|
||||
int v3 = Unk_ov94_02246928[param6 + 1] - Unk_ov94_02246928[param6];
|
||||
|
|
@ -1150,28 +1148,28 @@ static int ov94_02242718(ResourceMetadata **param0, MessageLoader *param1, Messa
|
|||
}
|
||||
}
|
||||
|
||||
*param0 = sub_02013A04(v2 + 1, 62);
|
||||
*param0 = StringList_New(v2 + 1, 62);
|
||||
|
||||
for (v0 = 0; v0 < v3; v0++) {
|
||||
if (v4) {
|
||||
if (sub_02026FE8(param7, param3[v1 + v0])) {
|
||||
sub_02013A4C(*param0, param1, param3[v1 + v0], param3[v1 + v0]);
|
||||
StringList_AddFromMessageBank(*param0, param1, param3[v1 + v0], param3[v1 + v0]);
|
||||
}
|
||||
} else {
|
||||
if (param4[param3[v1 + v0]]) {
|
||||
if (sub_02026FE8(param7, param3[v1 + v0])) {
|
||||
sub_02013A4C(*param0, param1, param3[v1 + v0], param3[v1 + v0]);
|
||||
StringList_AddFromMessageBank(*param0, param1, param3[v1 + v0], param3[v1 + v0]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sub_02013A4C(*param0, param2, 121, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(*param0, param2, 121, 0xfffffffe);
|
||||
|
||||
return v2 + 1;
|
||||
}
|
||||
|
||||
BmpList *ov94_022427C0(UnkStruct_ov94_0223FD4C *param0, ResourceMetadata **param1, Window *param2, MessageLoader *param3, MessageLoader *param4, UnkStruct_ov94_0223FD4C_sub3 *param5, PokedexData *param6)
|
||||
BmpList *ov94_022427C0(UnkStruct_ov94_0223FD4C *param0, StringList **param1, Window *param2, MessageLoader *param3, MessageLoader *param4, UnkStruct_ov94_0223FD4C_sub3 *param5, PokedexData *param6)
|
||||
{
|
||||
UnkStruct_ov84_02240FA8 v0;
|
||||
int v1, v2, v3;
|
||||
|
|
@ -1198,15 +1196,15 @@ static Unk_ov94_0224693C[][2] = {
|
|||
{ 0x79, 0xFFFFFFFE }
|
||||
};
|
||||
|
||||
BmpList *ov94_02242840(ResourceMetadata **param0, Window *param1, MessageLoader *param2)
|
||||
BmpList *ov94_02242840(StringList **param0, Window *param1, MessageLoader *param2)
|
||||
{
|
||||
UnkStruct_ov84_02240FA8 v0;
|
||||
int v1;
|
||||
|
||||
*param0 = sub_02013A04(4, 62);
|
||||
*param0 = StringList_New(4, 62);
|
||||
|
||||
for (v1 = 0; v1 < 4; v1++) {
|
||||
sub_02013A4C(*param0, param2, Unk_ov94_0224693C[v1][0], Unk_ov94_0224693C[v1][1]);
|
||||
StringList_AddFromMessageBank(*param0, param2, Unk_ov94_0224693C[v1][0], Unk_ov94_0224693C[v1][1]);
|
||||
}
|
||||
|
||||
v0 = Unk_ov94_0224608C;
|
||||
|
|
@ -1219,7 +1217,7 @@ BmpList *ov94_02242840(ResourceMetadata **param0, Window *param1, MessageLoader
|
|||
return sub_0200112C(&v0, 0, 0, 62);
|
||||
}
|
||||
|
||||
BmpList *ov94_022428B0(ResourceMetadata **param0, Window *param1, MessageLoader *param2, int param3)
|
||||
BmpList *ov94_022428B0(StringList **param0, Window *param1, MessageLoader *param2, int param3)
|
||||
{
|
||||
UnkStruct_ov84_02240FA8 v0;
|
||||
int v1;
|
||||
|
|
@ -1234,10 +1232,10 @@ BmpList *ov94_022428B0(ResourceMetadata **param0, Window *param1, MessageLoader
|
|||
v3 = (NELEMS(Unk_ov94_022460AC));
|
||||
}
|
||||
|
||||
*param0 = sub_02013A04(v3, 62);
|
||||
*param0 = StringList_New(v3, 62);
|
||||
|
||||
for (v1 = 0; v1 < v3; v1++) {
|
||||
sub_02013A4C(*param0, param2, v2[v1].unk_00, v1);
|
||||
StringList_AddFromMessageBank(*param0, param2, v2[v1].unk_00, v1);
|
||||
}
|
||||
|
||||
v0 = Unk_ov94_0224608C;
|
||||
|
|
@ -1289,21 +1287,21 @@ int ov94_02242970(int param0, int param1, int param2)
|
|||
return 0;
|
||||
}
|
||||
|
||||
BmpList *ov94_022429B4(ResourceMetadata **param0, Window *param1, MessageLoader *param2, MessageLoader *param3)
|
||||
BmpList *ov94_022429B4(StringList **param0, Window *param1, MessageLoader *param2, MessageLoader *param3)
|
||||
{
|
||||
UnkStruct_ov84_02240FA8 v0;
|
||||
int v1;
|
||||
int v2 = NELEMS(Unk_ov94_02246174) + 2;
|
||||
|
||||
*param0 = sub_02013A04(v2, 62);
|
||||
*param0 = StringList_New(v2, 62);
|
||||
|
||||
sub_02013A4C(*param0, param3, 167, 0);
|
||||
StringList_AddFromMessageBank(*param0, param3, 167, 0);
|
||||
|
||||
for (v1 = 1; v1 < v2 - 1; v1++) {
|
||||
sub_02013A4C(*param0, param2, Unk_ov94_02246174[v1 - 1], v1);
|
||||
StringList_AddFromMessageBank(*param0, param2, Unk_ov94_02246174[v1 - 1], v1);
|
||||
}
|
||||
|
||||
sub_02013A4C(*param0, param3, 168, v2 - 1);
|
||||
StringList_AddFromMessageBank(*param0, param3, 168, v2 - 1);
|
||||
|
||||
v0 = Unk_ov94_0224608C;
|
||||
v0.unk_10 = v2;
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@
|
|||
#include "savedata.h"
|
||||
#include "sprite_resource.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "sys_task.h"
|
||||
#include "sys_task_manager.h"
|
||||
|
|
@ -53,7 +54,6 @@
|
|||
#include "unk_0200A328.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_02017728.h"
|
||||
#include "unk_0201D15C.h"
|
||||
#include "unk_0202DAB4.h"
|
||||
|
|
@ -236,7 +236,7 @@ static void ov97_0222D34C(OverlayManager *param0)
|
|||
ov97_02237DA0();
|
||||
|
||||
if (v1->unk_7C) {
|
||||
sub_02013A3C(v1->unk_7C);
|
||||
StringList_Free(v1->unk_7C);
|
||||
}
|
||||
|
||||
if (v1->unk_78) {
|
||||
|
|
@ -783,14 +783,14 @@ static void ov97_0222DD1C(OverlayManager *param0, UnkStruct_ov97_0223E5B8 *param
|
|||
UnkStruct_ov97_0222D04C *v2 = OverlayManager_Data(param0);
|
||||
|
||||
if (v2->unk_7C) {
|
||||
sub_02013A3C(v2->unk_7C);
|
||||
StringList_Free(v2->unk_7C);
|
||||
}
|
||||
|
||||
v2->unk_7C = sub_02013A04(param2, 86);
|
||||
v2->unk_7C = StringList_New(param2, 86);
|
||||
v2->unk_10 = MessageLoader_Init(0, 26, 421, 86);
|
||||
|
||||
for (v0 = 0; v0 < param2; v0++) {
|
||||
sub_02013A4C(v2->unk_7C, v2->unk_10, param1[v0].unk_00, param1[v0].unk_04);
|
||||
StringList_AddFromMessageBank(v2->unk_7C, v2->unk_10, param1[v0].unk_00, param1[v0].unk_04);
|
||||
}
|
||||
|
||||
MessageLoader_Free(v2->unk_10);
|
||||
|
|
|
|||
|
|
@ -2,10 +2,8 @@
|
|||
#include <string.h>
|
||||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_0202442C_decl.h"
|
||||
#include "struct_defs/struct_0200C738.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
#include "struct_defs/struct_0202DBAC.h"
|
||||
#include "struct_defs/struct_0203CC84.h"
|
||||
|
||||
|
|
@ -37,6 +35,7 @@
|
|||
#include "savedata.h"
|
||||
#include "sprite_resource.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "sys_task.h"
|
||||
#include "sys_task_manager.h"
|
||||
|
|
@ -47,7 +46,6 @@
|
|||
#include "unk_02005474.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_0202DAB4.h"
|
||||
#include "unk_02033200.h"
|
||||
#include "unk_020363E8.h"
|
||||
|
|
@ -85,7 +83,7 @@ typedef struct {
|
|||
int unk_2C20;
|
||||
int unk_2C24;
|
||||
BmpList *unk_2C28;
|
||||
ResourceMetadata *unk_2C2C;
|
||||
StringList *unk_2C2C;
|
||||
Window unk_2C30;
|
||||
Window unk_2C40;
|
||||
int unk_2C50;
|
||||
|
|
@ -297,18 +295,18 @@ static void ov97_02230530(UnkStruct_ov97_02230868 *param0, UnkStruct_ov97_0223E6
|
|||
UnkStruct_ov84_02240FA8 v1;
|
||||
|
||||
if (param0->unk_2C2C) {
|
||||
sub_02013A3C(param0->unk_2C2C);
|
||||
StringList_Free(param0->unk_2C2C);
|
||||
}
|
||||
|
||||
if (param0->unk_2C28) {
|
||||
sub_02001384(param0->unk_2C28, NULL, NULL);
|
||||
}
|
||||
|
||||
param0->unk_2C2C = sub_02013A04(param2, 87);
|
||||
param0->unk_2C2C = StringList_New(param2, 87);
|
||||
param0->unk_2A64 = MessageLoader_Init(0, 26, 421, 87);
|
||||
|
||||
for (v0 = 0; v0 < param2; v0++) {
|
||||
sub_02013A4C(param0->unk_2C2C, param0->unk_2A64, param1[v0].unk_00, param1[v0].unk_04);
|
||||
StringList_AddFromMessageBank(param0->unk_2C2C, param0->unk_2A64, param1[v0].unk_00, param1[v0].unk_04);
|
||||
}
|
||||
|
||||
MessageLoader_Free(param0->unk_2A64);
|
||||
|
|
@ -420,7 +418,7 @@ static int ov97_02230834(OverlayManager *param0)
|
|||
|
||||
static void ov97_02230868(UnkStruct_ov97_02230868 *param0)
|
||||
{
|
||||
sub_02013A3C(param0->unk_2C2C);
|
||||
StringList_Free(param0->unk_2C2C);
|
||||
param0->unk_2C2C = NULL;
|
||||
sub_02001384(param0->unk_2C28, NULL, NULL);
|
||||
param0->unk_2C28 = NULL;
|
||||
|
|
|
|||
|
|
@ -6,10 +6,8 @@
|
|||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_02025CCC_decl.h"
|
||||
#include "struct_decls/struct_0202B370_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
#include "struct_defs/struct_02099F80.h"
|
||||
|
||||
#include "overlay004/ov4_021D0D80.h"
|
||||
|
|
@ -36,6 +34,7 @@
|
|||
#include "save_player.h"
|
||||
#include "savedata.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "unk_0200112C.h"
|
||||
|
|
@ -44,7 +43,6 @@
|
|||
#include "unk_0200A784.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_02017728.h"
|
||||
#include "unk_0201DBEC.h"
|
||||
#include "unk_0201E3D8.h"
|
||||
|
|
@ -84,7 +82,7 @@ typedef struct {
|
|||
int unk_94;
|
||||
int unk_98;
|
||||
int unk_9C;
|
||||
ResourceMetadata * unk_A0;
|
||||
StringList *unk_A0;
|
||||
BmpList * unk_A4;
|
||||
int unk_A8;
|
||||
int unk_AC;
|
||||
|
|
@ -748,10 +746,10 @@ static int ov98_02247B98 (UnkStruct_ov98_02247704 * param0)
|
|||
|
||||
Window_Add(param0->unk_04, ¶m0->unk_78, 0, v3[0], v3[1], v3[2], v3[3], 13, (((1 + (18 + 12)) + 9) + 27 * 4));
|
||||
|
||||
param0->unk_A0 = sub_02013A04(v5, 109);
|
||||
param0->unk_A0 = StringList_New(v5, 109);
|
||||
|
||||
for (v1 = 0; v1 < v5; v1++) {
|
||||
sub_02013A4C(param0->unk_A0, param0->unk_34, v4[v1].unk_00, v4[v1].unk_04);
|
||||
StringList_AddFromMessageBank(param0->unk_A0, param0->unk_34, v4[v1].unk_00, v4[v1].unk_04);
|
||||
}
|
||||
|
||||
v2.unk_0C = ¶m0->unk_78;
|
||||
|
|
@ -785,7 +783,7 @@ static int ov98_02247B98 (UnkStruct_ov98_02247704 * param0)
|
|||
}
|
||||
break;
|
||||
default:
|
||||
sub_02013A3C(param0->unk_A0);
|
||||
StringList_Free(param0->unk_A0);
|
||||
sub_02001384(param0->unk_A4, NULL, NULL);
|
||||
Window_Clear(¶m0->unk_78, 1);
|
||||
Window_ClearAndCopyToVRAM(¶m0->unk_78);
|
||||
|
|
|
|||
|
|
@ -7,12 +7,10 @@
|
|||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_0200C6E4_decl.h"
|
||||
#include "struct_decls/struct_0200C704_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_defs/archived_sprite.h"
|
||||
#include "struct_defs/sentence.h"
|
||||
#include "struct_defs/sprite_template.h"
|
||||
#include "struct_defs/struct_0200D0F4.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
#include "struct_defs/struct_02081CF4.h"
|
||||
|
||||
#include "overlay063/ov63_0222BE18.h"
|
||||
|
|
@ -48,6 +46,7 @@
|
|||
#include "render_text.h"
|
||||
#include "save_player.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "sys_task.h"
|
||||
#include "sys_task_manager.h"
|
||||
|
|
@ -88,12 +87,12 @@ typedef struct UnkStruct_ov104_02232B5C_t {
|
|||
u16 *unk_A0;
|
||||
UnkStruct_02081CF4 unk_A4;
|
||||
UIControlData *unk_B0;
|
||||
ResourceMetadata unk_B4[28];
|
||||
StringList unk_B4[28];
|
||||
UnkStruct_ov84_02240FA8 unk_194;
|
||||
BmpList *unk_1B4;
|
||||
u16 unk_1B8;
|
||||
u16 unk_1BA;
|
||||
ResourceMetadata unk_1BC[28];
|
||||
StringList unk_1BC[28];
|
||||
u16 unk_29C[28];
|
||||
u16 unk_2D4;
|
||||
} UnkStruct_ov104_02232B5C;
|
||||
|
|
@ -263,13 +262,13 @@ static void ov104_0223214C(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_022
|
|||
param1->unk_2D4 = param4;
|
||||
|
||||
for (v0 = 0; v0 < 28; v0++) {
|
||||
param1->unk_B4[v0].unk_00 = NULL;
|
||||
param1->unk_B4[v0].unk_04 = 0;
|
||||
param1->unk_B4[v0].entry = NULL;
|
||||
param1->unk_B4[v0].index = 0;
|
||||
}
|
||||
|
||||
for (v0 = 0; v0 < 28; v0++) {
|
||||
param1->unk_1BC[v0].unk_00 = NULL;
|
||||
param1->unk_1BC[v0].unk_04 = 0;
|
||||
param1->unk_1BC[v0].entry = NULL;
|
||||
param1->unk_1BC[v0].index = 0;
|
||||
param1->unk_29C[v0] = 0xff;
|
||||
}
|
||||
|
||||
|
|
@ -343,12 +342,12 @@ static void ov104_02232390(UnkStruct_ov104_02232B5C *param0, u32 param1, u32 par
|
|||
|
||||
MessageLoader_GetStrbuf(param0->unk_8C, param1, v2);
|
||||
StringTemplate_Format(param0->unk_90, param0->unk_1C[param0->unk_9B], v2);
|
||||
param0->unk_B4[param0->unk_9B].unk_00 = (const void *)param0->unk_1C[param0->unk_9B];
|
||||
param0->unk_B4[param0->unk_9B].entry = (const void *)param0->unk_1C[param0->unk_9B];
|
||||
Strbuf_Free(v2);
|
||||
}
|
||||
|
||||
param0->unk_29C[param0->unk_9B] = param2;
|
||||
param0->unk_B4[param0->unk_9B].unk_04 = param3;
|
||||
param0->unk_B4[param0->unk_9B].index = param3;
|
||||
param0->unk_9B++;
|
||||
|
||||
return;
|
||||
|
|
@ -363,11 +362,11 @@ static u32 ov104_02232414(UnkStruct_ov104_02232B5C *param0)
|
|||
v2 = 0;
|
||||
|
||||
for (v0 = 0; v0 < param0->unk_9B; v0++) {
|
||||
if (param0->unk_B4[v0].unk_00 == NULL) {
|
||||
if (param0->unk_B4[v0].entry == NULL) {
|
||||
break;
|
||||
}
|
||||
|
||||
v1 = Font_CalcStrbufWidth(FONT_SYSTEM, (Strbuf *)param0->unk_B4[v0].unk_00, 0);
|
||||
v1 = Font_CalcStrbufWidth(FONT_SYSTEM, (Strbuf *)param0->unk_B4[v0].entry, 0);
|
||||
|
||||
if (v2 < v1) {
|
||||
v2 = v1;
|
||||
|
|
@ -529,15 +528,15 @@ static void ov104_02232750(UnkStruct_ov104_02232B5C *param0, u32 param1, u32 par
|
|||
|
||||
MessageLoader_GetStrbuf(param0->unk_8C, param1, v2);
|
||||
StringTemplate_Format(param0->unk_90, param0->unk_1C[param0->unk_9B], v2);
|
||||
param0->unk_1BC[param0->unk_9B].unk_00 = (const void *)param0->unk_1C[param0->unk_9B];
|
||||
param0->unk_1BC[param0->unk_9B].entry = (const void *)param0->unk_1C[param0->unk_9B];
|
||||
|
||||
Strbuf_Free(v2);
|
||||
}
|
||||
|
||||
if (param3 == 0xfa) {
|
||||
param0->unk_1BC[param0->unk_9B].unk_04 = 0xfffffffd;
|
||||
param0->unk_1BC[param0->unk_9B].index = 0xfffffffd;
|
||||
} else {
|
||||
param0->unk_1BC[param0->unk_9B].unk_04 = param3;
|
||||
param0->unk_1BC[param0->unk_9B].index = param3;
|
||||
}
|
||||
|
||||
param0->unk_29C[param0->unk_9B] = param2;
|
||||
|
|
@ -555,11 +554,11 @@ static u32 ov104_022327F0(UnkStruct_ov104_02232B5C *param0)
|
|||
v2 = 0;
|
||||
|
||||
for (v0 = 0; v0 < param0->unk_9B; v0++) {
|
||||
if (param0->unk_1BC[v0].unk_00 == NULL) {
|
||||
if (param0->unk_1BC[v0].entry == NULL) {
|
||||
break;
|
||||
}
|
||||
|
||||
v1 = Font_CalcStrbufWidth(FONT_SYSTEM, (Strbuf *)param0->unk_1BC[v0].unk_00, 0);
|
||||
v1 = Font_CalcStrbufWidth(FONT_SYSTEM, (Strbuf *)param0->unk_1BC[v0].entry, 0);
|
||||
|
||||
if (v2 < v1) {
|
||||
v2 = v1;
|
||||
|
|
|
|||
|
|
@ -6,10 +6,8 @@
|
|||
#include "struct_decls/sprite_decl.h"
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_02007768_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_party_decl.h"
|
||||
#include "struct_defs/pokemon_summary.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
#include "struct_defs/struct_0207C690.h"
|
||||
#include "struct_defs/struct_02081CF4.h"
|
||||
#include "struct_defs/struct_02099F80.h"
|
||||
|
|
@ -50,6 +48,7 @@
|
|||
#include "save_player.h"
|
||||
#include "savedata.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "trainer_info.h"
|
||||
|
|
@ -106,7 +105,7 @@ struct UnkStruct_ov105_02241FF4_t {
|
|||
Window unk_50[10];
|
||||
UnkStruct_02081CF4 unk_F0;
|
||||
UIControlData *unk_FC;
|
||||
ResourceMetadata unk_100[4];
|
||||
StringList unk_100[4];
|
||||
PaletteData *unk_120;
|
||||
GenericPointerData *unk_124;
|
||||
UnkStruct_02007768 *unk_128;
|
||||
|
|
@ -2564,8 +2563,8 @@ static void ov105_02244D48(UnkStruct_ov105_02241FF4 *param0, Window *param1, u8
|
|||
int v0;
|
||||
|
||||
for (v0 = 0; v0 < 4; v0++) {
|
||||
param0->unk_100[v0].unk_00 = NULL;
|
||||
param0->unk_100[v0].unk_04 = 0;
|
||||
param0->unk_100[v0].entry = NULL;
|
||||
param0->unk_100[v0].index = 0;
|
||||
}
|
||||
|
||||
param0->unk_F0.unk_00 = param0->unk_100;
|
||||
|
|
@ -2587,8 +2586,8 @@ static void ov105_02244DC4(UnkStruct_ov105_02241FF4 *param0, u8 param1, u8 param
|
|||
|
||||
MessageLoader_GetStrbuf(param0->unk_1C, param3, param0->unk_2C[param1]);
|
||||
|
||||
param0->unk_100[param1].unk_00 = (const void *)param0->unk_2C[param1];
|
||||
param0->unk_100[param1].unk_04 = param2;
|
||||
param0->unk_100[param1].entry = (const void *)param0->unk_2C[param1];
|
||||
param0->unk_100[param1].index = param2;
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,10 +5,8 @@
|
|||
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_0200C440_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_party_decl.h"
|
||||
#include "struct_defs/pokemon_summary.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
#include "struct_defs/struct_02081CF4.h"
|
||||
#include "struct_defs/struct_02099F80.h"
|
||||
|
||||
|
|
@ -42,6 +40,7 @@
|
|||
#include "save_player.h"
|
||||
#include "savedata.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "trainer_info.h"
|
||||
|
|
@ -97,7 +96,7 @@ struct UnkStruct_ov106_02243118_t {
|
|||
Window unk_4C[4];
|
||||
UnkStruct_02081CF4 unk_8C;
|
||||
UIControlData *unk_98;
|
||||
ResourceMetadata unk_9C[2];
|
||||
StringList unk_9C[2];
|
||||
PaletteData *unk_AC;
|
||||
UnkStruct_0200C440 *unk_B0;
|
||||
Options *unk_B4;
|
||||
|
|
@ -1079,8 +1078,8 @@ static void ov106_022429B0(UnkStruct_ov106_02243118 *param0, Window *param1, u8
|
|||
int v0;
|
||||
|
||||
for (v0 = 0; v0 < 2; v0++) {
|
||||
param0->unk_9C[v0].unk_00 = NULL;
|
||||
param0->unk_9C[v0].unk_04 = 0;
|
||||
param0->unk_9C[v0].entry = NULL;
|
||||
param0->unk_9C[v0].index = 0;
|
||||
}
|
||||
|
||||
param0->unk_8C.unk_00 = param0->unk_9C;
|
||||
|
|
@ -1102,8 +1101,8 @@ static void ov106_02242A28(UnkStruct_ov106_02243118 *param0, u8 param1, u8 param
|
|||
|
||||
MessageLoader_GetStrbuf(param0->unk_20, param3, param0->unk_30[param1]);
|
||||
|
||||
param0->unk_9C[param1].unk_00 = (const void *)param0->unk_30[param1];
|
||||
param0->unk_9C[param1].unk_04 = param2;
|
||||
param0->unk_9C[param1].entry = (const void *)param0->unk_30[param1];
|
||||
param0->unk_9C[param1].index = param2;
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,12 +6,10 @@
|
|||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_0200C440_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_020302DC_decl.h"
|
||||
#include "struct_decls/struct_0203041C_decl.h"
|
||||
#include "struct_decls/struct_0203068C_decl.h"
|
||||
#include "struct_decls/struct_party_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
#include "struct_defs/struct_02081CF4.h"
|
||||
#include "struct_defs/struct_02099F80.h"
|
||||
|
||||
|
|
@ -47,6 +45,7 @@
|
|||
#include "save_player.h"
|
||||
#include "savedata.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "trainer_info.h"
|
||||
|
|
@ -58,7 +57,6 @@
|
|||
#include "unk_0200C440.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_02017728.h"
|
||||
#include "unk_0201DBEC.h"
|
||||
#include "unk_020302D0.h"
|
||||
|
|
@ -251,9 +249,9 @@ struct UnkStruct_ov107_02241D6C_t {
|
|||
Window unk_50[18];
|
||||
UnkStruct_02081CF4 unk_170;
|
||||
UIControlData * unk_17C;
|
||||
ResourceMetadata unk_180[3];
|
||||
StringList unk_180[3];
|
||||
BmpList * unk_198;
|
||||
ResourceMetadata * unk_19C;
|
||||
StringList *unk_19C;
|
||||
UnkStruct_ov84_02240FA8 unk_1A0;
|
||||
PaletteData *unk_1C0;
|
||||
UnkStruct_0200C440 * unk_1C4;
|
||||
|
|
@ -2397,8 +2395,8 @@ static void ov107_0224414C (UnkStruct_ov107_02241D6C * param0, Window * param1,
|
|||
int v0;
|
||||
|
||||
for (v0 = 0; v0 < 3; v0++) {
|
||||
param0->unk_180[v0].unk_00 = NULL;
|
||||
param0->unk_180[v0].unk_04 = 0;
|
||||
param0->unk_180[v0].entry = NULL;
|
||||
param0->unk_180[v0].index = 0;
|
||||
}
|
||||
|
||||
param0->unk_170.unk_00 = param0->unk_180;
|
||||
|
|
@ -2420,8 +2418,8 @@ static void ov107_022441B0 (UnkStruct_ov107_02241D6C * param0, u8 param1, u8 par
|
|||
|
||||
MessageLoader_GetStrbuf(param0->unk_20, param3, param0->unk_30[param1]);
|
||||
|
||||
param0->unk_180[param1].unk_00 = (const void *)param0->unk_30[param1];
|
||||
param0->unk_180[param1].unk_04 = param2;
|
||||
param0->unk_180[param1].entry = (const void *)param0->unk_30[param1];
|
||||
param0->unk_180[param1].index = param2;
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
@ -2468,7 +2466,7 @@ static void ov107_02244240 (UnkStruct_ov107_02241D6C * param0, u8 param1)
|
|||
v1 = Unk_ov107_02249E06[v0 - 1];
|
||||
}
|
||||
|
||||
param0->unk_19C = sub_02013A04((v1 + 1), 100);
|
||||
param0->unk_19C = StringList_New((v1 + 1), 100);
|
||||
|
||||
for (v4 = 0; v4 < v1; v4++) {
|
||||
if (param1 == 6) {
|
||||
|
|
@ -2477,10 +2475,10 @@ static void ov107_02244240 (UnkStruct_ov107_02241D6C * param0, u8 param1)
|
|||
v3 = Unk_ov107_02249F84[v4];
|
||||
}
|
||||
|
||||
sub_02013A4C(param0->unk_19C, v5, v3, v4);
|
||||
StringList_AddFromMessageBank(param0->unk_19C, v5, v3, v4);
|
||||
}
|
||||
|
||||
sub_02013A4C(param0->unk_19C, param0->unk_20, 13, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(param0->unk_19C, param0->unk_20, 13, 0xfffffffe);
|
||||
|
||||
param0->unk_1A0 = Unk_ov107_02249EE4;
|
||||
param0->unk_1A0.unk_00 = param0->unk_19C;
|
||||
|
|
@ -2570,10 +2568,10 @@ static void ov107_022445C4 (UnkStruct_ov107_02241D6C * param0)
|
|||
ov107_02249D84(param0->unk_4C, ¶m0->unk_50[10]);
|
||||
Window_FillTilemap(¶m0->unk_50[10], 15);
|
||||
|
||||
param0->unk_19C = sub_02013A04((NELEMS(Unk_ov107_02249FF0)), 100);
|
||||
param0->unk_19C = StringList_New((NELEMS(Unk_ov107_02249FF0)), 100);
|
||||
|
||||
for (v3 = 0; v3 < (NELEMS(Unk_ov107_02249FF0)); v3++) {
|
||||
sub_02013A4C(param0->unk_19C, param0->unk_20, Unk_ov107_02249FF0[v3][1], Unk_ov107_02249FF0[v3][2]);
|
||||
StringList_AddFromMessageBank(param0->unk_19C, param0->unk_20, Unk_ov107_02249FF0[v3][1], Unk_ov107_02249FF0[v3][2]);
|
||||
}
|
||||
|
||||
param0->unk_1A0 = Unk_ov107_02249EE4;
|
||||
|
|
@ -2678,10 +2676,10 @@ static void ov107_02244780 (UnkStruct_ov107_02241D6C * param0)
|
|||
ov107_02249D84(param0->unk_4C, ¶m0->unk_50[11]);
|
||||
Window_FillTilemap(¶m0->unk_50[11], 15);
|
||||
|
||||
param0->unk_19C = sub_02013A04((NELEMS(Unk_ov107_02249F54)), 100);
|
||||
param0->unk_19C = StringList_New((NELEMS(Unk_ov107_02249F54)), 100);
|
||||
|
||||
for (v3 = 0; v3 < (NELEMS(Unk_ov107_02249F54)); v3++) {
|
||||
sub_02013A4C(param0->unk_19C, param0->unk_20, Unk_ov107_02249F54[v3][1], Unk_ov107_02249F54[v3][2]);
|
||||
StringList_AddFromMessageBank(param0->unk_19C, param0->unk_20, Unk_ov107_02249F54[v3][1], Unk_ov107_02249F54[v3][2]);
|
||||
}
|
||||
|
||||
param0->unk_1A0 = Unk_ov107_02249EE4;
|
||||
|
|
@ -2794,10 +2792,10 @@ static void ov107_02244944 (UnkStruct_ov107_02241D6C * param0)
|
|||
ov107_02249D84(param0->unk_4C, ¶m0->unk_50[9]);
|
||||
Window_FillTilemap(¶m0->unk_50[9], 15);
|
||||
|
||||
param0->unk_19C = sub_02013A04(5, 100);
|
||||
param0->unk_19C = StringList_New(5, 100);
|
||||
|
||||
for (v0 = 0; v0 < 5; v0++) {
|
||||
sub_02013A4C(param0->unk_19C, param0->unk_20, Unk_ov107_02249F2C[v0][0], Unk_ov107_02249F2C[v0][1]);
|
||||
StringList_AddFromMessageBank(param0->unk_19C, param0->unk_20, Unk_ov107_02249F2C[v0][0], Unk_ov107_02249F2C[v0][1]);
|
||||
}
|
||||
|
||||
param0->unk_1A0 = Unk_ov107_02249EE4;
|
||||
|
|
@ -3711,7 +3709,7 @@ static void ov107_02245730 (UnkStruct_ov107_02241D6C * param0)
|
|||
Window_FillTilemap(v0, 0);
|
||||
Window_ClearAndScheduleCopyToVRAM(v0);
|
||||
|
||||
sub_02013A3C(param0->unk_19C);
|
||||
StringList_Free(param0->unk_19C);
|
||||
sub_02001384(param0->unk_198, NULL, NULL);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,12 +6,10 @@
|
|||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_0200C440_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_020302DC_decl.h"
|
||||
#include "struct_decls/struct_0203041C_decl.h"
|
||||
#include "struct_decls/struct_0203068C_decl.h"
|
||||
#include "struct_decls/struct_party_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
#include "struct_defs/struct_02081CF4.h"
|
||||
#include "struct_defs/struct_02099F80.h"
|
||||
|
||||
|
|
@ -47,6 +45,7 @@
|
|||
#include "save_player.h"
|
||||
#include "savedata.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "trainer_info.h"
|
||||
|
|
@ -58,7 +57,6 @@
|
|||
#include "unk_0200C440.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_02017728.h"
|
||||
#include "unk_0201DBEC.h"
|
||||
#include "unk_020302D0.h"
|
||||
|
|
@ -106,9 +104,9 @@ struct UnkStruct_ov107_02246170_t {
|
|||
Window unk_50[12];
|
||||
UnkStruct_02081CF4 unk_110;
|
||||
UIControlData * unk_11C;
|
||||
ResourceMetadata unk_120[3];
|
||||
StringList unk_120[3];
|
||||
BmpList * unk_138;
|
||||
ResourceMetadata * unk_13C;
|
||||
StringList *unk_13C;
|
||||
PaletteData *unk_140;
|
||||
UnkStruct_0200C440 * unk_144;
|
||||
Options * unk_148;
|
||||
|
|
@ -1871,8 +1869,8 @@ static void ov107_02247D04 (UnkStruct_ov107_02246170 * param0, Window * param1,
|
|||
int v0;
|
||||
|
||||
for (v0 = 0; v0 < 3; v0++) {
|
||||
param0->unk_120[v0].unk_00 = NULL;
|
||||
param0->unk_120[v0].unk_04 = 0;
|
||||
param0->unk_120[v0].entry = NULL;
|
||||
param0->unk_120[v0].index = 0;
|
||||
}
|
||||
|
||||
param0->unk_110.unk_00 = param0->unk_120;
|
||||
|
|
@ -1894,8 +1892,8 @@ static void ov107_02247D68 (UnkStruct_ov107_02246170 * param0, u8 param1, u8 par
|
|||
|
||||
MessageLoader_GetStrbuf(param0->unk_20, param3, param0->unk_30[param1]);
|
||||
|
||||
param0->unk_120[param1].unk_00 = (const void *)param0->unk_30[param1];
|
||||
param0->unk_120[param1].unk_04 = param2;
|
||||
param0->unk_120[param1].entry = (const void *)param0->unk_30[param1];
|
||||
param0->unk_120[param1].index = param2;
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
@ -1971,10 +1969,10 @@ static void ov107_02247E5C (UnkStruct_ov107_02246170 * param0)
|
|||
ov107_02249D84(param0->unk_4C, ¶m0->unk_50[5]);
|
||||
Window_FillTilemap(¶m0->unk_50[5], 15);
|
||||
|
||||
param0->unk_13C = sub_02013A04((NELEMS(Unk_ov107_0224A1BC)), 100);
|
||||
param0->unk_13C = StringList_New((NELEMS(Unk_ov107_0224A1BC)), 100);
|
||||
|
||||
for (v0 = 0; v0 < (NELEMS(Unk_ov107_0224A1BC)); v0++) {
|
||||
sub_02013A4C(param0->unk_13C, param0->unk_20, Unk_ov107_0224A1BC[v0][0], Unk_ov107_0224A1BC[v0][1]);
|
||||
StringList_AddFromMessageBank(param0->unk_13C, param0->unk_20, Unk_ov107_0224A1BC[v0][0], Unk_ov107_0224A1BC[v0][1]);
|
||||
}
|
||||
|
||||
v1 = Unk_ov107_0224A17C;
|
||||
|
|
@ -2033,10 +2031,10 @@ static void ov107_02247F6C (UnkStruct_ov107_02246170 * param0)
|
|||
ov107_02249D84(param0->unk_4C, ¶m0->unk_50[6]);
|
||||
Window_FillTilemap(¶m0->unk_50[6], 15);
|
||||
|
||||
param0->unk_13C = sub_02013A04((NELEMS(Unk_ov107_0224A19C)), 100);
|
||||
param0->unk_13C = StringList_New((NELEMS(Unk_ov107_0224A19C)), 100);
|
||||
|
||||
for (v0 = 0; v0 < (NELEMS(Unk_ov107_0224A19C)); v0++) {
|
||||
sub_02013A4C(param0->unk_13C, param0->unk_20, Unk_ov107_0224A19C[v0][0], Unk_ov107_0224A19C[v0][1]);
|
||||
StringList_AddFromMessageBank(param0->unk_13C, param0->unk_20, Unk_ov107_0224A19C[v0][0], Unk_ov107_0224A19C[v0][1]);
|
||||
}
|
||||
|
||||
v1 = Unk_ov107_0224A17C;
|
||||
|
|
@ -3377,7 +3375,7 @@ static void ov107_02249258 (UnkStruct_ov107_02246170 * param0)
|
|||
Window_Clear(v0, 1);
|
||||
Window_FillTilemap(v0, 0);
|
||||
Window_ClearAndScheduleCopyToVRAM(v0);
|
||||
sub_02013A3C(param0->unk_13C);
|
||||
StringList_Free(param0->unk_13C);
|
||||
sub_02001384(param0->unk_138, NULL, NULL);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,12 +4,10 @@
|
|||
#include <string.h>
|
||||
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_020304A0_decl.h"
|
||||
#include "struct_decls/struct_020305B8_decl.h"
|
||||
#include "struct_decls/struct_0203068C_decl.h"
|
||||
#include "struct_decls/struct_party_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
#include "struct_defs/struct_02081CF4.h"
|
||||
#include "struct_defs/struct_02099F80.h"
|
||||
|
||||
|
|
@ -41,6 +39,7 @@
|
|||
#include "save_player.h"
|
||||
#include "savedata.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "touch_screen.h"
|
||||
#include "trainer_info.h"
|
||||
|
|
@ -196,7 +195,7 @@ struct UnkStruct_ov108_02241DB0_t {
|
|||
Window unk_94[2];
|
||||
UnkStruct_02081CF4 unk_B4;
|
||||
UIControlData *unk_C0;
|
||||
ResourceMetadata unk_C4[2];
|
||||
StringList unk_C4[2];
|
||||
PaletteData *unk_D4;
|
||||
Options *unk_D8;
|
||||
SaveData *unk_DC;
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@
|
|||
#include "pokemon.h"
|
||||
#include "spl.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "unk_02001AF4.h"
|
||||
|
|
@ -39,7 +40,6 @@
|
|||
#include "unk_0200C6E4.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_02014000.h"
|
||||
#include "unk_0201DBEC.h"
|
||||
#include "unk_0202419C.h"
|
||||
|
|
@ -334,7 +334,7 @@ void ov119_021D11E4(UnkStruct_ov119_021D0FD0 *param0, BgConfig *param1, Window *
|
|||
Window_Init(param2);
|
||||
Window_Add(param1, param2, param3, param4, param5, param6, param7, param9, param8);
|
||||
|
||||
param0->unk_04.unk_44 = sub_02013A04(2, 71);
|
||||
param0->unk_04.unk_44 = StringList_New(2, 71);
|
||||
|
||||
{
|
||||
int v1;
|
||||
|
|
@ -343,7 +343,7 @@ void ov119_021D11E4(UnkStruct_ov119_021D0FD0 *param0, BgConfig *param1, Window *
|
|||
|
||||
for (v1 = 0; v1 < 2; v1++) {
|
||||
v2 = MessageLoader_GetNewStrbuf(v3, 2 + v1);
|
||||
sub_02013A6C(param0->unk_04.unk_44, v2, v1);
|
||||
StringList_AddFromStrbuf(param0->unk_04.unk_44, v2, v1);
|
||||
Strbuf_Free(v2);
|
||||
}
|
||||
|
||||
|
|
@ -369,7 +369,7 @@ void ov119_021D12CC(UnkStruct_ov119_021D0FD0 *param0)
|
|||
Window_ClearAndCopyToVRAM(¶m0->unk_04.unk_14[1]);
|
||||
Window_Remove(¶m0->unk_04.unk_14[1]);
|
||||
sub_02001BC4(param0->unk_04.unk_48, NULL);
|
||||
sub_02013A3C(param0->unk_04.unk_44);
|
||||
StringList_Free(param0->unk_04.unk_44);
|
||||
}
|
||||
|
||||
void ov119_021D12F8(Window *param0)
|
||||
|
|
|
|||
112
src/string_list.c
Normal file
112
src/string_list.c
Normal file
|
|
@ -0,0 +1,112 @@
|
|||
#include "string_list.h"
|
||||
|
||||
#include <nitro.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "heap.h"
|
||||
#include "message.h"
|
||||
#include "strbuf.h"
|
||||
|
||||
static StringList *FindFirstEmptyEntry(StringList *param0, u32 *param1);
|
||||
static void FreeEntries(StringList *param0);
|
||||
|
||||
StringList *StringList_New(u32 param0, u32 param1)
|
||||
{
|
||||
StringList *v0 = Heap_AllocFromHeap(param1, sizeof(StringList) * (param0 + 1));
|
||||
|
||||
if (v0) {
|
||||
u32 v1;
|
||||
|
||||
for (v1 = 0; v1 < param0; v1++) {
|
||||
v0[v1].entry = NULL;
|
||||
v0[v1].index = 0;
|
||||
}
|
||||
|
||||
v0[v1].entry = ((const void *)0xffffffff);
|
||||
v0[v1].index = param1;
|
||||
}
|
||||
|
||||
return v0;
|
||||
}
|
||||
|
||||
void StringList_Free(StringList *param0)
|
||||
{
|
||||
FreeEntries(param0);
|
||||
Heap_FreeToHeap(param0);
|
||||
}
|
||||
|
||||
void StringList_AddFromMessageBank(StringList *param0, const MessageLoader *param1, u32 param2, u32 param3)
|
||||
{
|
||||
u32 v0;
|
||||
|
||||
param0 = FindFirstEmptyEntry(param0, &v0);
|
||||
|
||||
if (param0) {
|
||||
param0->entry = MessageLoader_GetNewStrbuf(param1, param2);
|
||||
param0->index = param3;
|
||||
}
|
||||
}
|
||||
|
||||
void StringList_AddFromStrbuf(StringList *param0, const Strbuf *param1, u32 param2)
|
||||
{
|
||||
u32 v0;
|
||||
|
||||
param0 = FindFirstEmptyEntry(param0, &v0);
|
||||
|
||||
if (param0) {
|
||||
param0->entry = Strbuf_Clone(param1, v0);
|
||||
param0->index = param2;
|
||||
}
|
||||
}
|
||||
|
||||
void StringList_AddFromEntry(StringList *param0, const StringList *param1)
|
||||
{
|
||||
u32 v0;
|
||||
|
||||
param0 = FindFirstEmptyEntry(param0, &v0);
|
||||
|
||||
if (param0) {
|
||||
param0->entry = param1->entry;
|
||||
param0->index = param1->index;
|
||||
}
|
||||
}
|
||||
|
||||
static StringList *FindFirstEmptyEntry(StringList *param0, u32 *param1)
|
||||
{
|
||||
StringList *v0;
|
||||
|
||||
while (param0->entry != NULL) {
|
||||
if (param0->entry == ((const void *)0xffffffff)) {
|
||||
GF_ASSERT(0);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
param0++;
|
||||
}
|
||||
|
||||
v0 = param0;
|
||||
|
||||
while (param0->entry != ((const void *)0xffffffff)) {
|
||||
param0++;
|
||||
}
|
||||
|
||||
*param1 = param0->index;
|
||||
|
||||
return v0;
|
||||
}
|
||||
|
||||
static void FreeEntries(StringList *param0)
|
||||
{
|
||||
StringList *v0 = param0;
|
||||
|
||||
while (v0->entry != ((const void *)0xffffffff)) {
|
||||
if (v0->entry == NULL) {
|
||||
break;
|
||||
}
|
||||
|
||||
Strbuf_Free((Strbuf *)(v0->entry));
|
||||
|
||||
v0->entry = NULL;
|
||||
v0++;
|
||||
}
|
||||
}
|
||||
|
|
@ -4,9 +4,6 @@
|
|||
#include <nnsys.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
|
||||
#include "overlay084/struct_ov84_02240FA8.h"
|
||||
|
||||
#include "bg_window.h"
|
||||
|
|
@ -14,6 +11,7 @@
|
|||
#include "core_sys.h"
|
||||
#include "font.h"
|
||||
#include "heap.h"
|
||||
#include "string_list.h"
|
||||
#include "text.h"
|
||||
|
||||
typedef struct {
|
||||
|
|
@ -90,7 +88,7 @@ u32 sub_02001288(BmpList *param0)
|
|||
param0->unk_2F = 0;
|
||||
|
||||
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
|
||||
return param0->unk_00.unk_00[param0->unk_28 + param0->unk_2A].unk_04;
|
||||
return param0->unk_00.unk_00[param0->unk_28 + param0->unk_2A].index;
|
||||
}
|
||||
|
||||
if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
|
||||
|
|
@ -236,7 +234,7 @@ u8 sub_020014F0(BmpList *param0)
|
|||
|
||||
u32 sub_020014F8(BmpList *param0, u16 param1)
|
||||
{
|
||||
return param0->unk_00.unk_00[param1].unk_04;
|
||||
return param0->unk_00.unk_00[param1].index;
|
||||
}
|
||||
|
||||
u32 sub_02001504(BmpList *param0, u8 param1)
|
||||
|
|
@ -308,7 +306,7 @@ u32 sub_02001504(BmpList *param0, u8 param1)
|
|||
return v0;
|
||||
}
|
||||
|
||||
void sub_020015CC(BmpList *param0, ResourceMetadata *param1)
|
||||
void sub_020015CC(BmpList *param0, StringList *param1)
|
||||
{
|
||||
param0->unk_00.unk_00 = param1;
|
||||
}
|
||||
|
|
@ -334,7 +332,7 @@ static void sub_02001688(BmpList *param0, u16 param1, u16 param2, u16 param3)
|
|||
v3 = Font_GetAttribute(param0->unk_00.unk_1A_9, 1) + param0->unk_00.unk_1A_3;
|
||||
|
||||
for (v0 = 0; v0 < param3; v0++) {
|
||||
if (param0->unk_00.unk_00[param1].unk_04 != 0xfffffffd) {
|
||||
if (param0->unk_00.unk_00[param1].index != 0xfffffffd) {
|
||||
v1 = param0->unk_00.unk_15;
|
||||
} else {
|
||||
v1 = param0->unk_00.unk_14;
|
||||
|
|
@ -343,10 +341,10 @@ static void sub_02001688(BmpList *param0, u16 param1, u16 param2, u16 param3)
|
|||
v2 = (u8)(((v0 + param2) * v3) + param0->unk_00.unk_17_0);
|
||||
|
||||
if (param0->unk_00.unk_08 != NULL) {
|
||||
param0->unk_00.unk_08(param0, param0->unk_00.unk_00[param1].unk_04, v2);
|
||||
param0->unk_00.unk_08(param0, param0->unk_00.unk_00[param1].index, v2);
|
||||
}
|
||||
|
||||
sub_020015D0(param0, (void *)param0->unk_00.unk_00[param1].unk_00, v1, v2);
|
||||
sub_020015D0(param0, (void *)param0->unk_00.unk_00[param1].entry, v1, v2);
|
||||
param1++;
|
||||
}
|
||||
}
|
||||
|
|
@ -406,7 +404,7 @@ static u8 sub_020017E0(BmpList *param0, u8 param1)
|
|||
while (v1 > 0) {
|
||||
v1--;
|
||||
|
||||
if (param0->unk_00.unk_00[v0 + v1].unk_04 != 0xfffffffd) {
|
||||
if (param0->unk_00.unk_00[v0 + v1].index != 0xfffffffd) {
|
||||
param0->unk_2A = v1;
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -418,7 +416,7 @@ static u8 sub_020017E0(BmpList *param0, u8 param1)
|
|||
while (v1 > v2) {
|
||||
v1--;
|
||||
|
||||
if (param0->unk_00.unk_00[v0 + v1].unk_04 != 0xfffffffd) {
|
||||
if (param0->unk_00.unk_00[v0 + v1].index != 0xfffffffd) {
|
||||
param0->unk_2A = v1;
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -439,7 +437,7 @@ static u8 sub_020017E0(BmpList *param0, u8 param1)
|
|||
while (v1 < (param0->unk_00.unk_12 - 1)) {
|
||||
v1++;
|
||||
|
||||
if (param0->unk_00.unk_00[v0 + v1].unk_04 != 0xfffffffd) {
|
||||
if (param0->unk_00.unk_00[v0 + v1].index != 0xfffffffd) {
|
||||
param0->unk_2A = v1;
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -451,7 +449,7 @@ static u8 sub_020017E0(BmpList *param0, u8 param1)
|
|||
while (v1 < v2) {
|
||||
v1++;
|
||||
|
||||
if (param0->unk_00.unk_00[v0 + v1].unk_04 != 0xfffffffd) {
|
||||
if (param0->unk_00.unk_00[v0 + v1].index != 0xfffffffd) {
|
||||
param0->unk_2A = v1;
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -513,7 +511,7 @@ static u8 sub_02001A18(BmpList *param0, u8 param1, u8 param2, u8 param3)
|
|||
}
|
||||
|
||||
v4++;
|
||||
} while (param0->unk_00.unk_00[param0->unk_28 + param0->unk_2A].unk_04 == 0xfffffffd);
|
||||
} while (param0->unk_00.unk_00[param0->unk_28 + param0->unk_2A].index == 0xfffffffd);
|
||||
}
|
||||
|
||||
if (param1) {
|
||||
|
|
@ -545,6 +543,6 @@ static u8 sub_02001A18(BmpList *param0, u8 param1, u8 param2, u8 param3)
|
|||
static void sub_02001AD8(BmpList *param0, u8 param1)
|
||||
{
|
||||
if (param0->unk_00.unk_04 != NULL) {
|
||||
param0->unk_00.unk_04(param0, param0->unk_00.unk_00[param0->unk_28 + param0->unk_2A].unk_04, param1);
|
||||
param0->unk_00.unk_04(param0, param0->unk_00.unk_00[param0->unk_28 + param0->unk_2A].index, param1);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@
|
|||
#include <nitro.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
#include "struct_defs/struct_02081CF4.h"
|
||||
|
||||
#include "bg_window.h"
|
||||
|
|
@ -13,10 +11,10 @@
|
|||
#include "font.h"
|
||||
#include "heap.h"
|
||||
#include "message.h"
|
||||
#include "string_list.h"
|
||||
#include "text.h"
|
||||
#include "unk_02005474.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_02013A04.h"
|
||||
|
||||
typedef struct UIControlData_t {
|
||||
UnkStruct_02081CF4 unk_00;
|
||||
|
|
@ -92,7 +90,7 @@ u32 sub_02001BE0(UIControlData *param0)
|
|||
|
||||
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
|
||||
Sound_PlayEffect(1500);
|
||||
return param0->unk_00.unk_00[param0->unk_15].unk_04;
|
||||
return param0->unk_00.unk_00[param0->unk_15].index;
|
||||
}
|
||||
|
||||
if (gCoreSys.pressedKeys & param0->unk_10) {
|
||||
|
|
@ -141,7 +139,7 @@ u32 sub_02001C94(UIControlData *param0, u16 param1)
|
|||
|
||||
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
|
||||
Sound_PlayEffect(1500);
|
||||
return param0->unk_00.unk_00[param0->unk_15].unk_04;
|
||||
return param0->unk_00.unk_00[param0->unk_15].index;
|
||||
}
|
||||
|
||||
if (gCoreSys.pressedKeys & param0->unk_10) {
|
||||
|
|
@ -189,7 +187,7 @@ u32 sub_02001D44(UIControlData *param0, u8 param1)
|
|||
switch (param1) {
|
||||
case 0:
|
||||
Sound_PlayEffect(1500);
|
||||
return param0->unk_00.unk_00[param0->unk_15].unk_04;
|
||||
return param0->unk_00.unk_00[param0->unk_15].index;
|
||||
case 1:
|
||||
Sound_PlayEffect(1500);
|
||||
return 0xfffffffe;
|
||||
|
|
@ -306,7 +304,7 @@ static u8 sub_02001E24(UIControlData *param0, u8 param1)
|
|||
}
|
||||
}
|
||||
|
||||
if (param0->unk_00.unk_00[v0].unk_04 == 0xfffffffd) {
|
||||
if (param0->unk_00.unk_00[v0].index == 0xfffffffd) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -320,7 +318,7 @@ static u8 sub_02001F1C(UIControlData *param0)
|
|||
u8 v1, v2;
|
||||
|
||||
for (v1 = 0; v1 < param0->unk_00.unk_09 * param0->unk_00.unk_0A; v1++) {
|
||||
v2 = Font_CalcStrbufWidth(param0->unk_00.unk_08, param0->unk_00.unk_00[v1].unk_00, 0);
|
||||
v2 = Font_CalcStrbufWidth(param0->unk_00.unk_08, param0->unk_00.unk_00[v1].entry, 0);
|
||||
|
||||
if (v0 < v2) {
|
||||
v0 = v2;
|
||||
|
|
@ -343,7 +341,7 @@ static void sub_02001F5C(UIControlData *param0)
|
|||
|
||||
for (v4 = 0; v4 < param0->unk_00.unk_09; v4++) {
|
||||
for (v5 = 0; v5 < param0->unk_00.unk_0A; v5++) {
|
||||
v0 = param0->unk_00.unk_00[v4 * param0->unk_00.unk_0A + v5].unk_00;
|
||||
v0 = param0->unk_00.unk_00[v4 * param0->unk_00.unk_0A + v5].entry;
|
||||
v2 = (param0->unk_1A + param0->unk_00.unk_0B_0) * v5 + param0->unk_18;
|
||||
|
||||
Text_AddPrinterWithParams(param0->unk_00.unk_04, param0->unk_00.unk_08, v0, v1, v2, TEXT_SPEED_NO_TRANSFER, NULL);
|
||||
|
|
@ -375,13 +373,13 @@ UIControlData *sub_02002054(BgConfig *param0, const WindowTemplate *param1, u16
|
|||
{
|
||||
UnkStruct_02081CF4 v0;
|
||||
MessageLoader *v1;
|
||||
ResourceMetadata *v2;
|
||||
StringList *v2;
|
||||
|
||||
v1 = MessageLoader_Init(1, 26, 361, param5);
|
||||
v2 = sub_02013A04(2, param5);
|
||||
v2 = StringList_New(2, param5);
|
||||
|
||||
sub_02013A4C(v2, v1, 41, 0);
|
||||
sub_02013A4C(v2, v1, 42, 0xfffffffe);
|
||||
StringList_AddFromMessageBank(v2, v1, 41, 0);
|
||||
StringList_AddFromMessageBank(v2, v1, 42, 0xfffffffe);
|
||||
MessageLoader_Free(v1);
|
||||
|
||||
v0.unk_00 = v2;
|
||||
|
|
@ -431,7 +429,7 @@ void sub_02002154(UIControlData *param0, u32 param1)
|
|||
Window_Clear(param0->unk_00.unk_04, 0);
|
||||
Window_Remove(param0->unk_00.unk_04);
|
||||
Heap_FreeToHeapExplicit(param1, param0->unk_00.unk_04);
|
||||
sub_02013A3C((ResourceMetadata *)param0->unk_00.unk_00);
|
||||
StringList_Free((StringList *)param0->unk_00.unk_00);
|
||||
sub_02001BC4(param0, NULL);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,114 +0,0 @@
|
|||
#include "unk_02013A04.h"
|
||||
|
||||
#include <nitro.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
|
||||
#include "heap.h"
|
||||
#include "message.h"
|
||||
#include "strbuf.h"
|
||||
|
||||
static ResourceMetadata *sub_02013AAC(ResourceMetadata *param0, u32 *param1);
|
||||
|
||||
ResourceMetadata *sub_02013A04(u32 param0, u32 param1)
|
||||
{
|
||||
ResourceMetadata *v0 = Heap_AllocFromHeap(param1, sizeof(ResourceMetadata) * (param0 + 1));
|
||||
|
||||
if (v0) {
|
||||
u32 v1;
|
||||
|
||||
for (v1 = 0; v1 < param0; v1++) {
|
||||
v0[v1].unk_00 = NULL;
|
||||
v0[v1].unk_04 = 0;
|
||||
}
|
||||
|
||||
v0[v1].unk_00 = ((const void *)0xffffffff);
|
||||
v0[v1].unk_04 = param1;
|
||||
}
|
||||
|
||||
return v0;
|
||||
}
|
||||
|
||||
void sub_02013A3C(ResourceMetadata *param0)
|
||||
{
|
||||
sub_02013AE8(param0);
|
||||
Heap_FreeToHeap(param0);
|
||||
}
|
||||
|
||||
void sub_02013A4C(ResourceMetadata *param0, const MessageLoader *param1, u32 param2, u32 param3)
|
||||
{
|
||||
u32 v0;
|
||||
|
||||
param0 = sub_02013AAC(param0, &v0);
|
||||
|
||||
if (param0) {
|
||||
param0->unk_00 = MessageLoader_GetNewStrbuf(param1, param2);
|
||||
param0->unk_04 = param3;
|
||||
}
|
||||
}
|
||||
|
||||
void sub_02013A6C(ResourceMetadata *param0, const Strbuf *param1, u32 param2)
|
||||
{
|
||||
u32 v0;
|
||||
|
||||
param0 = sub_02013AAC(param0, &v0);
|
||||
|
||||
if (param0) {
|
||||
param0->unk_00 = Strbuf_Clone(param1, v0);
|
||||
param0->unk_04 = param2;
|
||||
}
|
||||
}
|
||||
|
||||
void sub_02013A90(ResourceMetadata *param0, const ResourceMetadata *param1)
|
||||
{
|
||||
u32 v0;
|
||||
|
||||
param0 = sub_02013AAC(param0, &v0);
|
||||
|
||||
if (param0) {
|
||||
param0->unk_00 = param1->unk_00;
|
||||
param0->unk_04 = param1->unk_04;
|
||||
}
|
||||
}
|
||||
|
||||
static ResourceMetadata *sub_02013AAC(ResourceMetadata *param0, u32 *param1)
|
||||
{
|
||||
ResourceMetadata *v0;
|
||||
|
||||
while (param0->unk_00 != NULL) {
|
||||
if (param0->unk_00 == ((const void *)0xffffffff)) {
|
||||
GF_ASSERT(0);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
param0++;
|
||||
}
|
||||
|
||||
v0 = param0;
|
||||
|
||||
while (param0->unk_00 != ((const void *)0xffffffff)) {
|
||||
param0++;
|
||||
}
|
||||
|
||||
*param1 = param0->unk_04;
|
||||
|
||||
return v0;
|
||||
}
|
||||
|
||||
void sub_02013AE8(ResourceMetadata *param0)
|
||||
{
|
||||
ResourceMetadata *v0 = param0;
|
||||
|
||||
while (v0->unk_00 != ((const void *)0xffffffff)) {
|
||||
if (v0->unk_00 == NULL) {
|
||||
break;
|
||||
}
|
||||
|
||||
Strbuf_Free((Strbuf *)(v0->unk_00));
|
||||
|
||||
v0->unk_00 = NULL;
|
||||
v0++;
|
||||
}
|
||||
}
|
||||
|
|
@ -5,12 +5,10 @@
|
|||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_0202E8C0_decl.h"
|
||||
#include "struct_decls/struct_020508D4_decl.h"
|
||||
#include "struct_defs/sprite_template.h"
|
||||
#include "struct_defs/struct_0200D0F4.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
#include "struct_defs/struct_0202EE10.h"
|
||||
#include "struct_defs/struct_0202EE10_sub1.h"
|
||||
|
||||
|
|
@ -31,6 +29,7 @@
|
|||
#include "save_player.h"
|
||||
#include "savedata.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "unk_0200112C.h"
|
||||
|
|
@ -38,7 +37,6 @@
|
|||
#include "unk_02005474.h"
|
||||
#include "unk_0200C6E4.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_0202E840.h"
|
||||
#include "unk_020508D4.h"
|
||||
|
||||
|
|
@ -98,7 +96,7 @@ typedef struct {
|
|||
UnkStruct_0206F7F8_sub1 unk_2C;
|
||||
UnkStruct_ov84_02240FA8 unk_A0;
|
||||
BmpList *unk_C0;
|
||||
ResourceMetadata *unk_C4;
|
||||
StringList *unk_C4;
|
||||
UIControlData *unk_C8;
|
||||
FieldSystem *fieldSystem;
|
||||
BgConfig *unk_D0;
|
||||
|
|
@ -685,16 +683,16 @@ static void sub_0206FDC0(UnkStruct_0206F7F8 *param0, u16 param1, u16 param2)
|
|||
int v0, v1;
|
||||
|
||||
v1 = param0->unk_18 + 1;
|
||||
param0->unk_C4 = sub_02013A04(v1, param0->unk_00);
|
||||
param0->unk_C4 = StringList_New(v1, param0->unk_00);
|
||||
|
||||
Window_Add(param0->unk_D0, ¶m0->unk_D4, 1, 4, 1, 24, v1 * 2, 13, 1);
|
||||
Window_FillTilemap(¶m0->unk_D4, ((15 << 4) | 15));
|
||||
|
||||
for (v0 = 0; v0 < param0->unk_18; v0++) {
|
||||
sub_02013A6C(param0->unk_C4, param0->unk_2C.unk_38[v0], v0);
|
||||
StringList_AddFromStrbuf(param0->unk_C4, param0->unk_2C.unk_38[v0], v0);
|
||||
}
|
||||
|
||||
sub_02013A6C(param0->unk_C4, param0->unk_2C.unk_0C, 0xFFFF);
|
||||
StringList_AddFromStrbuf(param0->unk_C4, param0->unk_2C.unk_0C, 0xFFFF);
|
||||
|
||||
MI_CpuCopy8((void *)&Unk_020F02B0, (void *)&(param0->unk_A0), sizeof(UnkStruct_ov84_02240FA8));
|
||||
|
||||
|
|
@ -718,7 +716,7 @@ static void sub_0206FDC0(UnkStruct_0206F7F8 *param0, u16 param1, u16 param2)
|
|||
static void sub_0206FF10(UnkStruct_0206F7F8 *param0)
|
||||
{
|
||||
sub_02001384(param0->unk_C0, &(param0->unk_22), &(param0->unk_24));
|
||||
sub_02013A3C(param0->unk_C4);
|
||||
StringList_Free(param0->unk_C4);
|
||||
Window_ClearAndCopyToVRAM(&(param0->unk_D4));
|
||||
Window_Clear(&(param0->unk_D4), 0);
|
||||
Window_Remove(&(param0->unk_D4));
|
||||
|
|
|
|||
|
|
@ -3,11 +3,9 @@
|
|||
|
||||
#include "struct_decls/struct_0200112C_decl.h"
|
||||
#include "struct_decls/struct_02001AF4_decl.h"
|
||||
#include "struct_decls/struct_02013A04_decl.h"
|
||||
#include "struct_decls/struct_02028430_decl.h"
|
||||
#include "struct_decls/struct_020508D4_decl.h"
|
||||
#include "struct_decls/struct_party_decl.h"
|
||||
#include "struct_defs/struct_02013A04_t.h"
|
||||
#include "struct_defs/struct_0202818C.h"
|
||||
#include "struct_defs/struct_0206A844.h"
|
||||
#include "struct_defs/struct_02097728.h"
|
||||
|
|
@ -34,6 +32,7 @@
|
|||
#include "save_player.h"
|
||||
#include "savedata.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "sys_task.h"
|
||||
#include "sys_task_manager.h"
|
||||
|
|
@ -43,7 +42,6 @@
|
|||
#include "unk_02005474.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_02028124.h"
|
||||
#include "unk_0203D1B8.h"
|
||||
#include "unk_020508D4.h"
|
||||
|
|
@ -103,7 +101,7 @@ typedef struct {
|
|||
u16 unk_13E;
|
||||
UnkStruct_ov84_02240FA8 unk_140;
|
||||
BmpList *unk_160;
|
||||
ResourceMetadata *unk_164;
|
||||
StringList *unk_164;
|
||||
UIControlData *unk_168;
|
||||
FieldSystem *fieldSystem;
|
||||
BgConfig *unk_170;
|
||||
|
|
@ -689,7 +687,7 @@ static void sub_020729B4(UnkStruct_02072334 *param0)
|
|||
Window_FillTilemap(¶m0->unk_174, ((15 << 4) | 15));
|
||||
Window_FillTilemap(¶m0->unk_194, ((15 << 4) | 15));
|
||||
|
||||
param0->unk_164 = sub_02013A04(param0->unk_1B + 1, param0->unk_00);
|
||||
param0->unk_164 = StringList_New(param0->unk_1B + 1, param0->unk_00);
|
||||
|
||||
for (v0 = 0; v0 < 20; v0++) {
|
||||
v2 = &(param0->unk_1C[v0]);
|
||||
|
|
@ -698,11 +696,11 @@ static void sub_020729B4(UnkStruct_02072334 *param0)
|
|||
continue;
|
||||
}
|
||||
|
||||
sub_02013A6C(param0->unk_164, v2->unk_08, v2->unk_00);
|
||||
StringList_AddFromStrbuf(param0->unk_164, v2->unk_08, v2->unk_00);
|
||||
v1++;
|
||||
}
|
||||
|
||||
sub_02013A6C(param0->unk_164, param0->unk_110.unk_08, 0xFFFF);
|
||||
StringList_AddFromStrbuf(param0->unk_164, param0->unk_110.unk_08, 0xFFFF);
|
||||
v1++;
|
||||
|
||||
MI_CpuCopy8((void *)&Unk_020F0504, (void *)&(param0->unk_140), sizeof(UnkStruct_ov84_02240FA8));
|
||||
|
|
@ -793,13 +791,13 @@ static void sub_02072C98(UnkStruct_02072334 *param0, u8 param1, u8 param2)
|
|||
};
|
||||
|
||||
v1 = NELEMS(Unk_020F0524);
|
||||
param0->unk_164 = sub_02013A04(v1, param0->unk_00);
|
||||
param0->unk_164 = StringList_New(v1, param0->unk_00);
|
||||
|
||||
Window_AddFromTemplate(param0->unk_170, &(param0->unk_174), &v2);
|
||||
Window_FillTilemap(¶m0->unk_174, ((15 << 4) | 15));
|
||||
|
||||
for (v0 = 0; v0 < v1; v0++) {
|
||||
sub_02013A4C(param0->unk_164, param0->unk_10C, Unk_020F0524[v0].unk_00, Unk_020F0524[v0].unk_04);
|
||||
StringList_AddFromMessageBank(param0->unk_164, param0->unk_10C, Unk_020F0524[v0].unk_00, Unk_020F0524[v0].unk_04);
|
||||
}
|
||||
|
||||
MI_CpuCopy8((void *)&Unk_020F0504, (void *)&(param0->unk_140), sizeof(UnkStruct_ov84_02240FA8));
|
||||
|
|
@ -831,7 +829,7 @@ static void sub_02072DB8(UnkStruct_02072334 *param0)
|
|||
u16 v0, v1;
|
||||
|
||||
sub_02001384(param0->unk_160, &v0, &v1);
|
||||
sub_02013A3C(param0->unk_164);
|
||||
StringList_Free(param0->unk_164);
|
||||
|
||||
Window_ClearAndCopyToVRAM(&(param0->unk_194));
|
||||
Window_Clear(&(param0->unk_194), 0);
|
||||
|
|
@ -859,7 +857,7 @@ static void sub_02072E4C(UnkStruct_02072334 *param0)
|
|||
Window_ClearAndCopyToVRAM(&(param0->unk_174));
|
||||
Window_Clear(&(param0->unk_174), 0);
|
||||
sub_02001384(param0->unk_160, &v0, &v1);
|
||||
sub_02013A3C(param0->unk_164);
|
||||
StringList_Free(param0->unk_164);
|
||||
Window_Remove(&(param0->unk_174));
|
||||
sub_02073398(param0);
|
||||
Bg_ScheduleTilemapTransfer(param0->unk_170, 3);
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
#include "pokemon.h"
|
||||
#include "pokemon_summary_app.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "touch_screen.h"
|
||||
|
|
@ -41,7 +42,6 @@
|
|||
#include "unk_0200C6E4.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_0200F174.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_02017728.h"
|
||||
#include "unk_0201DBEC.h"
|
||||
#include "unk_0201E010.h"
|
||||
|
|
@ -558,7 +558,7 @@ static int sub_0207E634(GameWindowLayout *param0)
|
|||
Window_Clear(¶m0->unk_04[35], 1);
|
||||
Window_ClearAndScheduleCopyToVRAM(¶m0->unk_04[35]);
|
||||
sub_02001BC4(param0->unk_700, NULL);
|
||||
sub_02013A3C(param0->unk_6FC);
|
||||
StringList_Free(param0->unk_6FC);
|
||||
sub_020826E0(param0, 29, 1);
|
||||
sub_0200D414(param0->unk_5B0[6], 0);
|
||||
return 1;
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
#include "pokemon.h"
|
||||
#include "render_text.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "unk_02001AF4.h"
|
||||
#include "unk_02005474.h"
|
||||
#include "unk_0200C440.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_0207E0B8.h"
|
||||
#include "unk_02083370.h"
|
||||
#include "unk_02084B70.h"
|
||||
|
|
@ -200,15 +200,15 @@ void sub_02081CF4(GameWindowLayout *param0, const u8 *param1, u8 param2)
|
|||
|
||||
Window_Add(param0->unk_00, ¶m0->unk_254[0], 0, 19, 23 - param2 * 2, 12, param2 * 2, 0, (((((((((((((((((((((((((((((((1 + 9) + (18 + 12)) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 5 * 2) + 7 * 2) + 20 * 2) + 13 * 4) + 27 * 4));
|
||||
|
||||
param0->unk_6FC = sub_02013A04(param2, 12);
|
||||
param0->unk_6FC = StringList_New(param2, 12);
|
||||
v2 = 0;
|
||||
|
||||
for (v1 = 0; v1 < param2; v1++) {
|
||||
if (param1[v1] >= 16) {
|
||||
sub_02013A6C(param0->unk_6FC, param0->unk_6AC[16 + v2], sub_02083370((u8)param1[v1]));
|
||||
StringList_AddFromStrbuf(param0->unk_6FC, param0->unk_6AC[16 + v2], sub_02083370((u8)param1[v1]));
|
||||
v2++;
|
||||
} else {
|
||||
sub_02013A6C(param0->unk_6FC, param0->unk_6AC[param1[v1]], sub_02083370((u8)param1[v1]));
|
||||
StringList_AddFromStrbuf(param0->unk_6FC, param0->unk_6AC[param1[v1]], sub_02083370((u8)param1[v1]));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
#include "message.h"
|
||||
#include "party.h"
|
||||
#include "pokemon.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "unk_02001AF4.h"
|
||||
#include "unk_02005474.h"
|
||||
#include "unk_0200C6E4.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_0207070C.h"
|
||||
#include "unk_0207E0B8.h"
|
||||
#include "unk_020819DC.h"
|
||||
|
|
@ -119,7 +119,7 @@ void sub_0208337C(GameWindowLayout *param0)
|
|||
Window_Clear(¶m0->unk_254[0], 1);
|
||||
Window_ClearAndScheduleCopyToVRAM(¶m0->unk_254[0]);
|
||||
sub_02001BC4(param0->unk_700, NULL);
|
||||
sub_02013A3C(param0->unk_6FC);
|
||||
StringList_Free(param0->unk_6FC);
|
||||
Window_Remove(¶m0->unk_254[0]);
|
||||
}
|
||||
|
||||
|
|
@ -130,11 +130,11 @@ static void sub_020833BC(GameWindowLayout *param0, int *param1)
|
|||
sub_0208337C(param0);
|
||||
sub_020826F4(param0, 38, 0);
|
||||
|
||||
param0->unk_6FC = sub_02013A04(3, 12);
|
||||
param0->unk_6FC = StringList_New(3, 12);
|
||||
|
||||
sub_02013A6C(param0->unk_6FC, param0->unk_6AC[3], sub_02083370(3));
|
||||
sub_02013A6C(param0->unk_6FC, param0->unk_6AC[4], sub_02083370(4));
|
||||
sub_02013A6C(param0->unk_6FC, param0->unk_6AC[9], sub_02083370(9));
|
||||
StringList_AddFromStrbuf(param0->unk_6FC, param0->unk_6AC[3], sub_02083370(3));
|
||||
StringList_AddFromStrbuf(param0->unk_6FC, param0->unk_6AC[4], sub_02083370(4));
|
||||
StringList_AddFromStrbuf(param0->unk_6FC, param0->unk_6AC[9], sub_02083370(9));
|
||||
|
||||
v0.unk_00 = param0->unk_6FC;
|
||||
v0.unk_04 = ¶m0->unk_04[35];
|
||||
|
|
@ -154,7 +154,7 @@ static void sub_020833BC(GameWindowLayout *param0, int *param1)
|
|||
static void sub_0208347C(GameWindowLayout *param0, int *param1)
|
||||
{
|
||||
sub_02001BC4(param0->unk_700, NULL);
|
||||
sub_02013A3C(param0->unk_6FC);
|
||||
StringList_Free(param0->unk_6FC);
|
||||
|
||||
param0->unk_5A4->unk_23 = 3;
|
||||
*param1 = 32;
|
||||
|
|
@ -169,7 +169,7 @@ static void sub_020834B0(GameWindowLayout *param0, int *param1)
|
|||
|
||||
Window_Clear(¶m0->unk_04[35], 1);
|
||||
sub_02001BC4(param0->unk_700, NULL);
|
||||
sub_02013A3C(param0->unk_6FC);
|
||||
StringList_Free(param0->unk_6FC);
|
||||
|
||||
fieldSystem = param0->unk_5A4->unk_1C;
|
||||
|
||||
|
|
@ -258,11 +258,11 @@ static void sub_02083700(GameWindowLayout *param0, int *param1)
|
|||
sub_0208337C(param0);
|
||||
sub_020826F4(param0, 39, 0);
|
||||
|
||||
param0->unk_6FC = sub_02013A04(3, 12);
|
||||
param0->unk_6FC = StringList_New(3, 12);
|
||||
|
||||
sub_02013A6C(param0->unk_6FC, param0->unk_6AC[6], sub_02083370(6));
|
||||
sub_02013A6C(param0->unk_6FC, param0->unk_6AC[7], sub_02083370(7));
|
||||
sub_02013A6C(param0->unk_6FC, param0->unk_6AC[9], sub_02083370(9));
|
||||
StringList_AddFromStrbuf(param0->unk_6FC, param0->unk_6AC[6], sub_02083370(6));
|
||||
StringList_AddFromStrbuf(param0->unk_6FC, param0->unk_6AC[7], sub_02083370(7));
|
||||
StringList_AddFromStrbuf(param0->unk_6FC, param0->unk_6AC[9], sub_02083370(9));
|
||||
|
||||
v0.unk_00 = param0->unk_6FC;
|
||||
v0.unk_04 = ¶m0->unk_04[35];
|
||||
|
|
@ -282,7 +282,7 @@ static void sub_02083700(GameWindowLayout *param0, int *param1)
|
|||
static void sub_020837C0(GameWindowLayout *param0, int *param1)
|
||||
{
|
||||
sub_02001BC4(param0->unk_700, NULL);
|
||||
sub_02013A3C(param0->unk_6FC);
|
||||
StringList_Free(param0->unk_6FC);
|
||||
|
||||
param0->unk_5A4->unk_23 = 7;
|
||||
*param1 = 32;
|
||||
|
|
@ -292,7 +292,7 @@ static void sub_020837F4(GameWindowLayout *param0, int *param1)
|
|||
{
|
||||
Window_Clear(¶m0->unk_04[35], 1);
|
||||
sub_02001BC4(param0->unk_700, NULL);
|
||||
sub_02013A3C(param0->unk_6FC);
|
||||
StringList_Free(param0->unk_6FC);
|
||||
sub_02082708(param0, 43, 1);
|
||||
|
||||
param0->unk_B04.unk_00 = sub_0208384C;
|
||||
|
|
@ -390,7 +390,7 @@ static void sub_020839FC(GameWindowLayout *param0, int *param1)
|
|||
{
|
||||
if (param0->unk_704[param0->unk_B11].unk_12 == 0) {
|
||||
sub_02001BC4(param0->unk_700, NULL);
|
||||
sub_02013A3C(param0->unk_6FC);
|
||||
StringList_Free(param0->unk_6FC);
|
||||
param0->unk_5A4->unk_23 = 0;
|
||||
*param1 = 32;
|
||||
return;
|
||||
|
|
@ -807,7 +807,7 @@ static void sub_020846CC(GameWindowLayout *param0, int *param1)
|
|||
param0->unk_5A4->unk_23 = 0;
|
||||
|
||||
sub_02001BC4(param0->unk_700, NULL);
|
||||
sub_02013A3C(param0->unk_6FC);
|
||||
StringList_Free(param0->unk_6FC);
|
||||
|
||||
*param1 = 32;
|
||||
}
|
||||
|
|
@ -817,7 +817,7 @@ static void sub_020846FC(GameWindowLayout *param0, int *param1)
|
|||
param0->unk_5A4->unk_23 = 0;
|
||||
|
||||
sub_02001BC4(param0->unk_700, NULL);
|
||||
sub_02013A3C(param0->unk_6FC);
|
||||
StringList_Free(param0->unk_6FC);
|
||||
|
||||
*param1 = 32;
|
||||
}
|
||||
|
|
@ -827,7 +827,7 @@ static void sub_0208472C(GameWindowLayout *param0, int *param1)
|
|||
param0->unk_5A4->unk_23 = 1;
|
||||
|
||||
sub_02001BC4(param0->unk_700, NULL);
|
||||
sub_02013A3C(param0->unk_6FC);
|
||||
StringList_Free(param0->unk_6FC);
|
||||
|
||||
*param1 = 32;
|
||||
}
|
||||
|
|
@ -878,7 +878,7 @@ static void sub_02084808(GameWindowLayout *param0, int *param1)
|
|||
switch (v1) {
|
||||
case 0:
|
||||
sub_02001BC4(param0->unk_700, NULL);
|
||||
sub_02013A3C(param0->unk_6FC);
|
||||
StringList_Free(param0->unk_6FC);
|
||||
*param1 = 32;
|
||||
return;
|
||||
case 1:
|
||||
|
|
|
|||
|
|
@ -20,12 +20,12 @@
|
|||
#include "pokemon.h"
|
||||
#include "pokemon_summary_app.h"
|
||||
#include "strbuf.h"
|
||||
#include "string_list.h"
|
||||
#include "string_template.h"
|
||||
#include "text.h"
|
||||
#include "unk_02001AF4.h"
|
||||
#include "unk_02005474.h"
|
||||
#include "unk_0200DA60.h"
|
||||
#include "unk_02013A04.h"
|
||||
#include "unk_0207E0B8.h"
|
||||
#include "unk_020819DC.h"
|
||||
#include "unk_02082C2C.h"
|
||||
|
|
@ -1166,11 +1166,11 @@ static u8 sub_02086614(GameWindowLayout *param0, u8 param1)
|
|||
Strbuf_Free(v1);
|
||||
|
||||
if (v2 == 0) {
|
||||
sub_02013A6C(param0->unk_6FC, param0->unk_6A8, 0xfffffffd);
|
||||
StringList_AddFromStrbuf(param0->unk_6FC, param0->unk_6A8, 0xfffffffd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
sub_02013A6C(param0->unk_6FC, param0->unk_6A8, param1);
|
||||
StringList_AddFromStrbuf(param0->unk_6FC, param0->unk_6A8, param1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -1185,7 +1185,7 @@ void sub_020866A0(GameWindowLayout *param0, u8 param1)
|
|||
sub_020826F4(param0, 40, 1);
|
||||
}
|
||||
|
||||
param0->unk_6FC = sub_02013A04(4, 12);
|
||||
param0->unk_6FC = StringList_New(4, 12);
|
||||
|
||||
v1 = sub_02086614(param0, 0);
|
||||
v1 += sub_02086614(param0, 1);
|
||||
|
|
@ -1221,14 +1221,14 @@ int sub_02086774(GameWindowLayout *param0)
|
|||
sub_0200E084(¶m0->unk_04[33], 1);
|
||||
Window_Clear(¶m0->unk_04[36], 1);
|
||||
sub_02001BC4(param0->unk_700, NULL);
|
||||
sub_02013A3C(param0->unk_6FC);
|
||||
StringList_Free(param0->unk_6FC);
|
||||
sub_020826E0(param0, 32, 1);
|
||||
return 4;
|
||||
default:
|
||||
sub_0200E084(¶m0->unk_04[33], 1);
|
||||
Window_Clear(¶m0->unk_04[36], 1);
|
||||
sub_02001BC4(param0->unk_700, NULL);
|
||||
sub_02013A3C(param0->unk_6FC);
|
||||
StringList_Free(param0->unk_6FC);
|
||||
|
||||
if (sub_02096F14(param0->unk_5A4->unk_00, param0->unk_5A4->unk_24, param0->unk_B11, (u8)v0, sub_02086930(param0), 12) == 1) {
|
||||
Pokemon *v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user