diff --git a/include/constants/gba/pokemon.h b/include/constants/gba/pokemon.h new file mode 100644 index 0000000000..5096bb13d7 --- /dev/null +++ b/include/constants/gba/pokemon.h @@ -0,0 +1,96 @@ +#ifndef POKEPLATINUM_CONSTANTS_GBA_POKEMON_H +#define POKEPLATINUM_CONSTANTS_GBA_POKEMON_H + +enum { + GBA_MON_DATA_PERSONALITY, + GBA_MON_DATA_OT_ID, + GBA_MON_DATA_NICKNAME, + GBA_MON_DATA_LANGUAGE, + GBA_MON_DATA_SANITY_IS_BAD_EGG, + GBA_MON_DATA_SANITY_HAS_SPECIES, + GBA_MON_DATA_SANITY_IS_EGG, + GBA_MON_DATA_OT_NAME, + GBA_MON_DATA_MARKINGS, + GBA_MON_DATA_CHECKSUM, + GBA_MON_DATA_ENCRYPT_SEPARATOR, + GBA_MON_DATA_SPECIES, + GBA_MON_DATA_HELD_ITEM, + GBA_MON_DATA_MOVE1, + GBA_MON_DATA_MOVE2, + GBA_MON_DATA_MOVE3, + GBA_MON_DATA_MOVE4, + GBA_MON_DATA_PP1, + GBA_MON_DATA_PP2, + GBA_MON_DATA_PP3, + GBA_MON_DATA_PP4, + GBA_MON_DATA_PP_BONUSES, + GBA_MON_DATA_COOL, + GBA_MON_DATA_BEAUTY, + GBA_MON_DATA_CUTE, + GBA_MON_DATA_EXP, + GBA_MON_DATA_HP_EV, + GBA_MON_DATA_ATK_EV, + GBA_MON_DATA_DEF_EV, + GBA_MON_DATA_SPEED_EV, + GBA_MON_DATA_SPATK_EV, + GBA_MON_DATA_SPDEF_EV, + GBA_MON_DATA_FRIENDSHIP, + GBA_MON_DATA_SMART, + GBA_MON_DATA_POKERUS, + GBA_MON_DATA_MET_LOCATION, + GBA_MON_DATA_MET_LEVEL, + GBA_MON_DATA_MET_GAME, + GBA_MON_DATA_POKEBALL, + GBA_MON_DATA_HP_IV, + GBA_MON_DATA_ATK_IV, + GBA_MON_DATA_DEF_IV, + GBA_MON_DATA_SPEED_IV, + GBA_MON_DATA_SPATK_IV, + GBA_MON_DATA_SPDEF_IV, + GBA_MON_DATA_IS_EGG, + GBA_MON_DATA_ABILITY_NUM, + GBA_MON_DATA_TOUGH, + GBA_MON_DATA_SHEEN, + GBA_MON_DATA_OT_GENDER, + GBA_MON_DATA_COOL_RIBBON, + GBA_MON_DATA_BEAUTY_RIBBON, + GBA_MON_DATA_CUTE_RIBBON, + GBA_MON_DATA_SMART_RIBBON, + GBA_MON_DATA_TOUGH_RIBBON, + GBA_MON_DATA_STATUS, + GBA_MON_DATA_LEVEL, + GBA_MON_DATA_HP, + GBA_MON_DATA_MAX_HP, + GBA_MON_DATA_ATK, + GBA_MON_DATA_DEF, + GBA_MON_DATA_SPEED, + GBA_MON_DATA_SPATK, + GBA_MON_DATA_SPDEF, + GBA_MON_DATA_MAIL, + GBA_MON_DATA_SPECIES_OR_EGG, + GBA_MON_DATA_IVS, + GBA_MON_DATA_CHAMPION_RIBBON, + GBA_MON_DATA_WINNING_RIBBON, + GBA_MON_DATA_VICTORY_RIBBON, + GBA_MON_DATA_ARTIST_RIBBON, + GBA_MON_DATA_EFFORT_RIBBON, + GBA_MON_DATA_MARINE_RIBBON, + GBA_MON_DATA_LAND_RIBBON, + GBA_MON_DATA_SKY_RIBBON, + GBA_MON_DATA_COUNTRY_RIBBON, + GBA_MON_DATA_NATIONAL_RIBBON, + GBA_MON_DATA_EARTH_RIBBON, + GBA_MON_DATA_WORLD_RIBBON, + GBA_MON_DATA_UNUSED_RIBBONS, + GBA_MON_DATA_MODERN_FATEFUL_ENCOUNTER, + GBA_MON_DATA_KNOWN_MOVES, + GBA_MON_DATA_RIBBON_COUNT, + GBA_MON_DATA_RIBBONS, + GBA_MON_DATA_ATK2, + GBA_MON_DATA_DEF2, + GBA_MON_DATA_SPEED2, + GBA_MON_DATA_SPATK2, + GBA_MON_DATA_SPDEF2, +}; + +#endif // POKEPLATINUM_CONSTANTS_GBA_POKEMON_H diff --git a/include/constants/gba/species.h b/include/constants/gba/species.h new file mode 100644 index 0000000000..fb4fad0339 --- /dev/null +++ b/include/constants/gba/species.h @@ -0,0 +1,144 @@ +#ifndef POKEPLATINUM_CONSTANTS_GBA_SPECIES_H +#define POKEPLATINUM_CONSTANTS_GBA_SPECIES_H + +// IDs up to 251 (Celebi) are the same as Gen 4's species. +// IDs between 252 and 276 correspond to Gen 3's SPECIES_OLD_UNOWN B to Z. + +#define GBA_SPECIES_TREECKO 277 +#define GBA_SPECIES_GROVYLE 278 +#define GBA_SPECIES_SCEPTILE 279 +#define GBA_SPECIES_TORCHIC 280 +#define GBA_SPECIES_COMBUSKEN 281 +#define GBA_SPECIES_BLAZIKEN 282 +#define GBA_SPECIES_MUDKIP 283 +#define GBA_SPECIES_MARSHTOMP 284 +#define GBA_SPECIES_SWAMPERT 285 +#define GBA_SPECIES_POOCHYENA 286 +#define GBA_SPECIES_MIGHTYENA 287 +#define GBA_SPECIES_ZIGZAGOON 288 +#define GBA_SPECIES_LINOONE 289 +#define GBA_SPECIES_WURMPLE 290 +#define GBA_SPECIES_SILCOON 291 +#define GBA_SPECIES_BEAUTIFLY 292 +#define GBA_SPECIES_CASCOON 293 +#define GBA_SPECIES_DUSTOX 294 +#define GBA_SPECIES_LOTAD 295 +#define GBA_SPECIES_LOMBRE 296 +#define GBA_SPECIES_LUDICOLO 297 +#define GBA_SPECIES_SEEDOT 298 +#define GBA_SPECIES_NUZLEAF 299 +#define GBA_SPECIES_SHIFTRY 300 +#define GBA_SPECIES_NINCADA 301 +#define GBA_SPECIES_NINJASK 302 +#define GBA_SPECIES_SHEDINJA 303 +#define GBA_SPECIES_TAILLOW 304 +#define GBA_SPECIES_SWELLOW 305 +#define GBA_SPECIES_SHROOMISH 306 +#define GBA_SPECIES_BRELOOM 307 +#define GBA_SPECIES_SPINDA 308 +#define GBA_SPECIES_WINGULL 309 +#define GBA_SPECIES_PELIPPER 310 +#define GBA_SPECIES_SURSKIT 311 +#define GBA_SPECIES_MASQUERAIN 312 +#define GBA_SPECIES_WAILMER 313 +#define GBA_SPECIES_WAILORD 314 +#define GBA_SPECIES_SKITTY 315 +#define GBA_SPECIES_DELCATTY 316 +#define GBA_SPECIES_KECLEON 317 +#define GBA_SPECIES_BALTOY 318 +#define GBA_SPECIES_CLAYDOL 319 +#define GBA_SPECIES_NOSEPASS 320 +#define GBA_SPECIES_TORKOAL 321 +#define GBA_SPECIES_SABLEYE 322 +#define GBA_SPECIES_BARBOACH 323 +#define GBA_SPECIES_WHISCASH 324 +#define GBA_SPECIES_LUVDISC 325 +#define GBA_SPECIES_CORPHISH 326 +#define GBA_SPECIES_CRAWDAUNT 327 +#define GBA_SPECIES_FEEBAS 328 +#define GBA_SPECIES_MILOTIC 329 +#define GBA_SPECIES_CARVANHA 330 +#define GBA_SPECIES_SHARPEDO 331 +#define GBA_SPECIES_TRAPINCH 332 +#define GBA_SPECIES_VIBRAVA 333 +#define GBA_SPECIES_FLYGON 334 +#define GBA_SPECIES_MAKUHITA 335 +#define GBA_SPECIES_HARIYAMA 336 +#define GBA_SPECIES_ELECTRIKE 337 +#define GBA_SPECIES_MANECTRIC 338 +#define GBA_SPECIES_NUMEL 339 +#define GBA_SPECIES_CAMERUPT 340 +#define GBA_SPECIES_SPHEAL 341 +#define GBA_SPECIES_SEALEO 342 +#define GBA_SPECIES_WALREIN 343 +#define GBA_SPECIES_CACNEA 344 +#define GBA_SPECIES_CACTURNE 345 +#define GBA_SPECIES_SNORUNT 346 +#define GBA_SPECIES_GLALIE 347 +#define GBA_SPECIES_LUNATONE 348 +#define GBA_SPECIES_SOLROCK 349 +#define GBA_SPECIES_AZURILL 350 +#define GBA_SPECIES_SPOINK 351 +#define GBA_SPECIES_GRUMPIG 352 +#define GBA_SPECIES_PLUSLE 353 +#define GBA_SPECIES_MINUN 354 +#define GBA_SPECIES_MAWILE 355 +#define GBA_SPECIES_MEDITITE 356 +#define GBA_SPECIES_MEDICHAM 357 +#define GBA_SPECIES_SWABLU 358 +#define GBA_SPECIES_ALTARIA 359 +#define GBA_SPECIES_WYNAUT 360 +#define GBA_SPECIES_DUSKULL 361 +#define GBA_SPECIES_DUSCLOPS 362 +#define GBA_SPECIES_ROSELIA 363 +#define GBA_SPECIES_SLAKOTH 364 +#define GBA_SPECIES_VIGOROTH 365 +#define GBA_SPECIES_SLAKING 366 +#define GBA_SPECIES_GULPIN 367 +#define GBA_SPECIES_SWALOT 368 +#define GBA_SPECIES_TROPIUS 369 +#define GBA_SPECIES_WHISMUR 370 +#define GBA_SPECIES_LOUDRED 371 +#define GBA_SPECIES_EXPLOUD 372 +#define GBA_SPECIES_CLAMPERL 373 +#define GBA_SPECIES_HUNTAIL 374 +#define GBA_SPECIES_GOREBYSS 375 +#define GBA_SPECIES_ABSOL 376 +#define GBA_SPECIES_SHUPPET 377 +#define GBA_SPECIES_BANETTE 378 +#define GBA_SPECIES_SEVIPER 379 +#define GBA_SPECIES_ZANGOOSE 380 +#define GBA_SPECIES_RELICANTH 381 +#define GBA_SPECIES_ARON 382 +#define GBA_SPECIES_LAIRON 383 +#define GBA_SPECIES_AGGRON 384 +#define GBA_SPECIES_CASTFORM 385 +#define GBA_SPECIES_VOLBEAT 386 +#define GBA_SPECIES_ILLUMISE 387 +#define GBA_SPECIES_LILEEP 388 +#define GBA_SPECIES_CRADILY 389 +#define GBA_SPECIES_ANORITH 390 +#define GBA_SPECIES_ARMALDO 391 +#define GBA_SPECIES_RALTS 392 +#define GBA_SPECIES_KIRLIA 393 +#define GBA_SPECIES_GARDEVOIR 394 +#define GBA_SPECIES_BAGON 395 +#define GBA_SPECIES_SHELGON 396 +#define GBA_SPECIES_SALAMENCE 397 +#define GBA_SPECIES_BELDUM 398 +#define GBA_SPECIES_METANG 399 +#define GBA_SPECIES_METAGROSS 400 +#define GBA_SPECIES_REGIROCK 401 +#define GBA_SPECIES_REGICE 402 +#define GBA_SPECIES_REGISTEEL 403 +#define GBA_SPECIES_KYOGRE 404 +#define GBA_SPECIES_GROUDON 405 +#define GBA_SPECIES_RAYQUAZA 406 +#define GBA_SPECIES_LATIAS 407 +#define GBA_SPECIES_LATIOS 408 +#define GBA_SPECIES_JIRACHI 409 +#define GBA_SPECIES_DEOXYS 410 +#define GBA_SPECIES_CHIMECHO 411 +#define GBA_SPECIES_EGG 412 + +#endif // POKEPLATINUM_CONSTANTS_GBA_SPECIES_H diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h new file mode 100644 index 0000000000..e2b1e36268 --- /dev/null +++ b/include/constants/pokemon.h @@ -0,0 +1,187 @@ +#ifndef POKEPLATINUM_CONSTANTS_POKEMON_H +#define POKEPLATINUM_CONSTANTS_POKEMON_H + +enum { + MON_DATA_PERSONALITY, + MON_DATA_1, + MON_DATA_2, + MON_DATA_3, + MON_DATA_4, + MON_DATA_SPECIES, + MON_DATA_HELD_ITEM, + MON_DATA_OT_ID, + MON_DATA_EXP, + MON_DATA_FRIENDSHIP, + MON_DATA_10, + MON_DATA_11, + MON_DATA_LANGUAGE, + MON_DATA_HP_EV, + MON_DATA_ATK_EV, + MON_DATA_DEF_EV, + MON_DATA_SPEED_EV, + MON_DATA_SPATK_EV, + MON_DATA_SPDEF_EV, + MON_DATA_COOL, + MON_DATA_BEAUTY, + MON_DATA_CUTE, + MON_DATA_SMART, + MON_DATA_TOUGH, + MON_DATA_SHEEN, + MON_DATA_25, + MON_DATA_26, + MON_DATA_27, + MON_DATA_28, + MON_DATA_29, + MON_DATA_30, + MON_DATA_31, + MON_DATA_32, + MON_DATA_33, + MON_DATA_34, + MON_DATA_35, + MON_DATA_36, + MON_DATA_37, + MON_DATA_38, + MON_DATA_39, + MON_DATA_40, + MON_DATA_41, + MON_DATA_42, + MON_DATA_43, + MON_DATA_44, + MON_DATA_45, + MON_DATA_46, + MON_DATA_47, + MON_DATA_48, + MON_DATA_49, + MON_DATA_50, + MON_DATA_51, + MON_DATA_52, + MON_DATA_53, + MON_DATA_MOVE1, + MON_DATA_MOVE2, + MON_DATA_MOVE3, + MON_DATA_MOVE4, + MON_DATA_58, + MON_DATA_59, + MON_DATA_60, + MON_DATA_61, + MON_DATA_62, + MON_DATA_63, + MON_DATA_64, + MON_DATA_65, + MON_DATA_66, + MON_DATA_67, + MON_DATA_68, + MON_DATA_69, + MON_DATA_HP_IV, + MON_DATA_ATK_IV, + MON_DATA_DEF_IV, + MON_DATA_SPEED_IV, + MON_DATA_SPATK_IV, + MON_DATA_SPDEF_IV, + MON_DATA_IS_EGG, + MON_DATA_77, + MON_DATA_78, + MON_DATA_79, + MON_DATA_80, + MON_DATA_81, + MON_DATA_82, + MON_DATA_83, + MON_DATA_84, + MON_DATA_85, + MON_DATA_86, + MON_DATA_87, + MON_DATA_88, + MON_DATA_89, + MON_DATA_90, + MON_DATA_91, + MON_DATA_92, + MON_DATA_93, + MON_DATA_94, + MON_DATA_95, + MON_DATA_96, + MON_DATA_97, + MON_DATA_CHAMPION_RIBBON, + MON_DATA_WINNING_RIBBON, + MON_DATA_VICTORY_RIBBON, + MON_DATA_ARTIST_RIBBON, + MON_DATA_EFFORT_RIBBON, + MON_DATA_MARINE_RIBBON, + MON_DATA_LAND_RIBBON, + MON_DATA_SKY_RIBBON, + MON_DATA_COUNTRY_RIBBON, + MON_DATA_NATIONAL_RIBBON, + MON_DATA_EARTH_RIBBON, + MON_DATA_WORLD_RIBBON, + MON_DATA_FATEFUL_ENCOUNTER, + MON_DATA_111, + MON_DATA_FORM, + MON_DATA_113, + MON_DATA_114, + MON_DATA_115, + MON_DATA_116, + MON_DATA_117, + MON_DATA_118, + MON_DATA_119, + MON_DATA_120, + MON_DATA_121, + MON_DATA_MET_GAME, + MON_DATA_123, + MON_DATA_124, + MON_DATA_125, + MON_DATA_126, + MON_DATA_127, + MON_DATA_128, + MON_DATA_129, + MON_DATA_130, + MON_DATA_131, + MON_DATA_132, + MON_DATA_133, + MON_DATA_134, + MON_DATA_135, + MON_DATA_136, + MON_DATA_137, + MON_DATA_138, + MON_DATA_139, + MON_DATA_140, + MON_DATA_141, + MON_DATA_142, + MON_DATA_143, + MON_DATA_144, + MON_DATA_145, + MON_DATA_146, + MON_DATA_147, + MON_DATA_148, + MON_DATA_149, + MON_DATA_150, + MON_DATA_151, + MON_DATA_152, + MON_DATA_153, + MON_DATA_POKERUS, + MON_DATA_POKEBALL, + MON_DATA_MET_LEVEL, + MON_DATA_OT_GENDER, + MON_DATA_158, + MON_DATA_159, + MON_DATA_160, + MON_DATA_161, + MON_DATA_162, + MON_DATA_163, + MON_DATA_164, + MON_DATA_165, + MON_DATA_166, + MON_DATA_167, + MON_DATA_168, + MON_DATA_169, + MON_DATA_170, + MON_DATA_171, + MON_DATA_172, + MON_DATA_173, + MON_DATA_SPECIES_EGG, + MON_DATA_175, + MON_DATA_176, + MON_DATA_177, + MON_DATA_178, + MON_DATA_179, +}; + +#endif // POKEPLATINUM_CONSTANTS_POKEMON_H diff --git a/include/global/global.pch b/include/global/global.pch index 37f1fecf9d..48bf1207f2 100644 --- a/include/global/global.pch +++ b/include/global/global.pch @@ -12,6 +12,7 @@ //#include "constants/global.h" #include "global/pm_version.h" #include "global/assert.h" +#include "constants/pokemon.h" #define NELEMS(a) (sizeof(a) / sizeof(*(a))) #define XtOffset(pointer_type, field) ((unsigned int)&(((pointer_type)NULL)->field)) diff --git a/include/overlay005/ov5_021E622C.h b/include/overlay005/ov5_021E622C.h index 58031029eb..a8dfc82d16 100644 --- a/include/overlay005/ov5_021E622C.h +++ b/include/overlay005/ov5_021E622C.h @@ -6,8 +6,8 @@ #include "struct_decls/struct_02026218_decl.h" #include "struct_decls/struct_02026310_decl.h" #include "struct_decls/struct_0203CDB0_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" @@ -15,7 +15,7 @@ u8 ov5_021E6238(UnkStruct_02026310 * param0); int ov5_021E6270(UnkStruct_02026310 * param0); void ov5_021E6358(Party * param0, int param1, UnkStruct_02026310 * param2, UnkStruct_021C0794 * param3); u16 ov5_021E64F8(Party * param0, UnkStruct_0200B358 * param1, UnkStruct_02026310 * param2, u8 param3); -int ov5_021E6520(UnkStruct_02073C74_sub1 * param0, u32 param1); +int ov5_021E6520(BoxPokemon * param0, u32 param1); int ov5_021E6568(UnkStruct_02026218 * param0); int ov5_021E6590(UnkStruct_02026218 * param0); u8 ov5_021E65B0(UnkStruct_02026218 * param0, UnkStruct_0200B358 * param1); @@ -24,18 +24,18 @@ int ov5_021E6630(UnkStruct_02026310 * param0, u8 param1, UnkStruct_0200B358 * pa u8 ov5_021E6640(UnkStruct_02026310 * param0, int param1, UnkStruct_0200B358 * param2); void ov5_021E6720(UnkStruct_02026310 * param0); void ov5_021E6B40(UnkStruct_02026310 * param0); -void ov5_021E6CF0(UnkStruct_02073C74 * param0, u16 param1, u8 param2, UnkStruct_02025E6C * param3, int param4, int param5); -void ov5_021E6DE8(UnkStruct_02073C74 * param0, u16 param1, UnkStruct_02026310 * param2, u32 param3, u8 param4); +void ov5_021E6CF0(Pokemon * param0, u16 param1, u8 param2, UnkStruct_02025E6C * param3, int param4, int param5); +void ov5_021E6DE8(Pokemon * param0, u16 param1, UnkStruct_02026310 * param2, u32 param3, u8 param4); void ov5_021E6EA8(UnkStruct_02026310 * param0, Party * param1, UnkStruct_02025E6C * param2); BOOL ov5_021E7154(UnkStruct_02026310 * param0, Party * param1, UnkStruct_0203CDB0 * param2); -UnkStruct_02073C74 * ov5_021E7278(Party * param0); +Pokemon * ov5_021E7278(Party * param0); void ov5_021E72BC(UnkStruct_02026310 * param0, UnkStruct_0200B358 * param1); void ov5_021E7308(UnkStruct_02026310 * param0, u32 param1, u32 param2, u32 param3, u8 param4, UnkStruct_0200B358 * param5); u16 ov5_021E73A0(Party * param0, int param1, UnkStruct_0200B358 * param2); u8 ov5_021E73C8(UnkStruct_02026310 * param0); u8 ov5_021E73F0(u32 param0); u32 ov5_021E7420(UnkStruct_02026310 * param0); -void ov5_021E771C(UnkStruct_02073C74 * param0, int param1); -u32 ov5_021E7790(UnkStruct_02073C74_sub1 ** param0); +void ov5_021E771C(Pokemon * param0, int param1); +u32 ov5_021E7790(BoxPokemon ** param0); #endif // POKEPLATINUM_OV5_021E622C_H diff --git a/include/overlay006/ov6_02243258.h b/include/overlay006/ov6_02243258.h index 15aa9305be..9f997e6f03 100644 --- a/include/overlay006/ov6_02243258.h +++ b/include/overlay006/ov6_02243258.h @@ -3,9 +3,9 @@ #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_0203CDB0_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" -UnkStruct_0201CD38 * ov6_02243F88(UnkStruct_0203CDB0 * param0, u32 param1, UnkStruct_02073C74 * param2, int param3); +UnkStruct_0201CD38 * ov6_02243F88(UnkStruct_0203CDB0 * param0, u32 param1, Pokemon * param2, int param3); int ov6_02243FBC(UnkStruct_0201CD38 * param0); void ov6_02243FC8(UnkStruct_0201CD38 * param0); UnkStruct_0201CD38 * ov6_02245CCC(UnkStruct_0203CDB0 * param0, int param1); diff --git a/include/overlay006/ov6_02246184.h b/include/overlay006/ov6_02246184.h index d5ed6be071..9a5e704a3f 100644 --- a/include/overlay006/ov6_02246184.h +++ b/include/overlay006/ov6_02246184.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_OV6_02246184_H #include "struct_decls/struct_0203CDB0_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay006/struct_ov6_02246204_decl.h" #include "overlay006/struct_ov6_02246254.h" @@ -11,6 +11,6 @@ void ov6_02246204(UnkStruct_ov6_02246204 * param0); u32 ov6_02246224(const UnkStruct_ov6_02246204 * param0); u32 ov6_0224622C(const UnkStruct_ov6_02246204 * param0); void ov6_02246234(UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02246204 * param1, int param2); -void ov6_02246254(UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02246204 * param1, int param2, UnkStruct_ov6_02246254 * param3, UnkStruct_02073C74 * param4, UnkStruct_02073C74 * param5); +void ov6_02246254(UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02246204 * param1, int param2, UnkStruct_ov6_02246254 * param3, Pokemon * param4, Pokemon * param5); #endif // POKEPLATINUM_OV6_02246184_H diff --git a/include/overlay006/ov6_02247100.h b/include/overlay006/ov6_02247100.h index 7154e6094d..632b5e211f 100644 --- a/include/overlay006/ov6_02247100.h +++ b/include/overlay006/ov6_02247100.h @@ -3,15 +3,15 @@ #include "struct_decls/struct_0203CDB0_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" void * ov6_02247100(UnkStruct_0203CDB0 * param0, u32 param1); BOOL ov6_02247120(UnkStruct_020508D4 * param0); void * ov6_022472C8(UnkStruct_0203CDB0 * param0, u32 param1, int param2); BOOL ov6_022472E8(UnkStruct_020508D4 * param0); -void * ov6_02247488(UnkStruct_0203CDB0 *, UnkStruct_02073C74 *, u32 param0); +void * ov6_02247488(UnkStruct_0203CDB0 *, Pokemon *, u32 param0); BOOL ov6_022474AC(UnkStruct_020508D4 * param0); -void * ov6_02247530(UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1, u32 param2); +void * ov6_02247530(UnkStruct_0203CDB0 * param0, Pokemon * param1, u32 param2); BOOL ov6_02247554(UnkStruct_020508D4 * param0); #endif // POKEPLATINUM_OV6_02247100_H diff --git a/include/overlay006/ov6_022489E4.h b/include/overlay006/ov6_022489E4.h index b688185c52..f875e30cf7 100644 --- a/include/overlay006/ov6_022489E4.h +++ b/include/overlay006/ov6_022489E4.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_OV6_022489E4_H #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_020954F0.h" #include "struct_defs/struct_02095C48.h" #include "overlay006/struct_ov6_02248BE8.h" @@ -11,9 +11,9 @@ void ov6_022489E4(int param0, int param1, void * param2, void * param3); BOOL ov6_02248A64(UnkStruct_02095C48 * param0); void ov6_02248AC8(int param0, int param1, void * param2, void * param3); -BOOL ov6_02248AF0(UnkStruct_02095C48 * param0, int param1, const UnkStruct_02073C74 * param2); +BOOL ov6_02248AF0(UnkStruct_02095C48 * param0, int param1, const Pokemon * param2); void ov6_02248B30(int param0, int param1, void * param2, void * param3); -BOOL ov6_02248B70(UnkStruct_02095C48 * param0, UnkStruct_02073C74 ** param1); +BOOL ov6_02248B70(UnkStruct_02095C48 * param0, Pokemon ** param1); void ov6_02248BC0(int param0, int param1, void * param2, void * param3); BOOL ov6_02248BE8(UnkStruct_02095C48 * param0, int param1, const UnkStruct_ov6_02248BE8 * param2); void ov6_02248C28(int param0, int param1, void * param2, void * param3); diff --git a/include/overlay006/struct_ov6_02246254.h b/include/overlay006/struct_ov6_02246254.h index 6e81e49056..a2e0b235f1 100644 --- a/include/overlay006/struct_ov6_02246254.h +++ b/include/overlay006/struct_ov6_02246254.h @@ -3,11 +3,11 @@ #include "struct_decls/struct_02025E6C_decl.h" #include "struct_defs/struct_020279FC.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/box_pokemon.h" typedef struct { - const UnkStruct_02073C74_sub1 * unk_00; - const UnkStruct_02073C74_sub1 * unk_04; + const BoxPokemon * unk_00; + const BoxPokemon * unk_04; const UnkStruct_02025E6C * unk_08; int unk_0C; int unk_10; diff --git a/include/overlay012/is_form_symmetrical.h b/include/overlay012/is_form_symmetrical.h new file mode 100644 index 0000000000..ada3fa38f8 --- /dev/null +++ b/include/overlay012/is_form_symmetrical.h @@ -0,0 +1,6 @@ +#ifndef POKEPLATINUM_OV12_IS_FORM_SYMMETRICAL_H +#define POKEPLATINUM_OV12_IS_FORM_SYMMETRICAL_H + +BOOL IsFormSymmetrical(u32 species, u32 formId); + +#endif // POKEPLATINUM_OV12_IS_FORM_SYMMETRICAL_H diff --git a/include/overlay012/ov12_022384F0.h b/include/overlay012/ov12_022384F0.h deleted file mode 100644 index ae7f97c1f8..0000000000 --- a/include/overlay012/ov12_022384F0.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_OV12_022384F0_H -#define POKEPLATINUM_OV12_022384F0_H - -BOOL ov12_022384F0(u32 param0, u32 param1); - -#endif // POKEPLATINUM_OV12_022384F0_H diff --git a/include/overlay012/struct_ov12_02236030.h b/include/overlay012/struct_ov12_02236030.h index d00486f760..d72258f720 100644 --- a/include/overlay012/struct_ov12_02236030.h +++ b/include/overlay012/struct_ov12_02236030.h @@ -1,12 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_OV12_02236030_H #define POKEPLATINUM_STRUCT_OV12_02236030_H -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" typedef struct { int unk_00; int unk_04; - UnkStruct_02073C74 * unk_08; + Pokemon * unk_08; } UnkStruct_ov12_02236030; #endif // POKEPLATINUM_STRUCT_OV12_02236030_H diff --git a/include/overlay013/struct_ov13_02221ED0.h b/include/overlay013/struct_ov13_02221ED0.h index b710a6242a..d4ba54c6d1 100644 --- a/include/overlay013/struct_ov13_02221ED0.h +++ b/include/overlay013/struct_ov13_02221ED0.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_STRUCT_OV13_02221ED0_H #define POKEPLATINUM_STRUCT_OV13_02221ED0_H -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay013/struct_ov13_022236B8.h" typedef struct { - UnkStruct_02073C74 * unk_00; + Pokemon * unk_00; u16 unk_04; u16 unk_06; u16 unk_08; diff --git a/include/overlay016/ov16_0223DF00.h b/include/overlay016/ov16_0223DF00.h index 7be5b66dda..6379b0eead 100644 --- a/include/overlay016/ov16_0223DF00.h +++ b/include/overlay016/ov16_0223DF00.h @@ -17,7 +17,7 @@ #include "struct_defs/struct_020279FC.h" #include "struct_decls/struct_0202CC84_decl.h" #include "struct_defs/struct_0205AA50.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_0207A9CC.h" @@ -44,7 +44,7 @@ UnkStruct_ov16_0225BFFC * ov16_0223DF14(UnkStruct_0207ADB4 * param0, int param1) int ov16_0223DF1C(UnkStruct_0207ADB4 * param0); Party * ov16_0223DF20(UnkStruct_0207ADB4 * param0, int param1); int ov16_0223DF60(UnkStruct_0207ADB4 * param0, int param1); -UnkStruct_02073C74 * ov16_0223DFAC(UnkStruct_0207ADB4 * param0, int param1, int param2); +Pokemon * ov16_0223DFAC(UnkStruct_0207ADB4 * param0, int param1, int param2); UnkStruct_02007768 * ov16_0223E000(UnkStruct_0207ADB4 * param0); UnkStruct_ov12_0221FCDC * ov16_0223E008(UnkStruct_0207ADB4 * param0); UnkStruct_0200C6E4 * ov16_0223E010(UnkStruct_0207ADB4 * param0); @@ -105,8 +105,8 @@ UnkStruct_02015F84 * ov16_0223EE28(UnkStruct_0207ADB4 * param0); UnkStruct_0202CC84 * ov16_0223EE30(UnkStruct_0207ADB4 * param0, int param1); void ov16_0223EE70(UnkStruct_0207ADB4 * param0); void ov16_0223EF2C(UnkStruct_0207ADB4 * param0, int param1, int param2); -void ov16_0223EF48(UnkStruct_0207ADB4 * param0, UnkStruct_02073C74 * param1); -void ov16_0223EF68(UnkStruct_0207ADB4 * param0, UnkStruct_02073C74 * param1); +void ov16_0223EF48(UnkStruct_0207ADB4 * param0, Pokemon * param1); +void ov16_0223EF68(UnkStruct_0207ADB4 * param0, Pokemon * param1); void ov16_0223EF8C(UnkStruct_0207ADB4 * param0); u8 * ov16_0223F1E8(UnkStruct_0207ADB4 * param0); u16 * ov16_0223F1F0(UnkStruct_0207ADB4 * param0); diff --git a/include/overlay016/ov16_0225177C.h b/include/overlay016/ov16_0225177C.h index 028145769e..4a8ca10ceb 100644 --- a/include/overlay016/ov16_0225177C.h +++ b/include/overlay016/ov16_0225177C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV16_0225177C_H #define POKEPLATINUM_OV16_0225177C_H -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_0207ADB4_decl.h" #include "overlay016/struct_ov16_0224B9DC_decl.h" #include "overlay016/struct_ov16_02252060_decl.h" @@ -101,11 +101,11 @@ void ov16_02259868(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1 void ov16_0225991C(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1); int ov16_022599D0(UnkStruct_ov16_0224B9DC * param0, int param1, int param2, int param3); BOOL ov16_02259A28(UnkStruct_ov16_0224B9DC * param0, int param1); -void ov16_02259A5C(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, UnkStruct_02073C74 * param2); +void ov16_02259A5C(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, Pokemon * param2); u8 ov16_02259AB4(UnkStruct_ov16_0224B9DC * param0, int param1); BOOL ov16_02259AC0(UnkStruct_ov16_0224B9DC * param0, int param1); BOOL ov16_02259ADC(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1); -BOOL ov16_02259B38(UnkStruct_0207ADB4 * param0, UnkStruct_02073C74 * param1); +BOOL ov16_02259B38(UnkStruct_0207ADB4 * param0, Pokemon * param1); BOOL ov16_02259B9C(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, int * param2); void ov16_0225A1B0(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1); void ov16_0225A200(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, int param2, int param3); @@ -127,6 +127,6 @@ int ov16_0225B45C(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, void ov16_0225B540(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, int param2, int param3, int param4); int ov16_0225BA88(UnkStruct_0207ADB4 * param0, int param1); int ov16_0225BE28(UnkStruct_0207ADB4 * param0, int param1); -int ov16_0225BE3C(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, UnkStruct_02073C74 * param2, int param3); +int ov16_0225BE3C(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, Pokemon * param2, int param3); #endif // POKEPLATINUM_OV16_0225177C_H diff --git a/include/overlay017/struct_ov17_022489C8.h b/include/overlay017/struct_ov17_022489C8.h index a97531df4b..7a5ae1353a 100644 --- a/include/overlay017/struct_ov17_022489C8.h +++ b/include/overlay017/struct_ov17_022489C8.h @@ -1,14 +1,14 @@ #ifndef POKEPLATINUM_STRUCT_OV17_022489C8_H #define POKEPLATINUM_STRUCT_OV17_022489C8_H -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay012/struct_ov12_02235FE0_decl.h" #include "overlay012/struct_ov12_02236030.h" typedef struct { UnkStruct_ov12_02236030 unk_00; UnkStruct_ov12_02235FE0 * unk_0C; - UnkStruct_02073C74 * unk_10; + Pokemon * unk_10; u8 unk_14; u8 unk_15; } UnkStruct_ov17_022489C8; diff --git a/include/overlay017/struct_ov17_0224E1F4.h b/include/overlay017/struct_ov17_0224E1F4.h index 9c196d038f..99ed41d0d5 100644 --- a/include/overlay017/struct_ov17_0224E1F4.h +++ b/include/overlay017/struct_ov17_0224E1F4.h @@ -2,11 +2,11 @@ #define POKEPLATINUM_STRUCT_OV17_0224E1F4_H #include "struct_decls/struct_02007C7C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay017/struct_ov17_0224B09C.h" typedef struct { - UnkStruct_02073C74 * unk_00; + Pokemon * unk_00; UnkStruct_02007C7C * unk_04; UnkStruct_ov17_0224B09C * unk_08; u8 unk_0C; diff --git a/include/overlay019/ov19_021D0D80.h b/include/overlay019/ov19_021D0D80.h index 161a87d294..c91a55b158 100644 --- a/include/overlay019/ov19_021D0D80.h +++ b/include/overlay019/ov19_021D0D80.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_0200B144_decl.h" #include "struct_decls/struct_0200B358_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D4F5C.h" @@ -36,7 +36,7 @@ u32 ov19_021D5E74(const UnkStruct_ov19_021D4DF0 * param0); const UnkStruct_ov19_021D4F5C * ov19_021D5E8C(const UnkStruct_ov19_021D4DF0 * param0); const UnkStruct_020797DC * ov19_021D5E90(const UnkStruct_ov19_021D4DF0 * param0); u32 ov19_021D5E94(const UnkStruct_ov19_021D4DF0 * param0); -UnkStruct_02073C74_sub1 * ov19_021D5E9C(const UnkStruct_ov19_021D4DF0 * param0); +BoxPokemon * ov19_021D5E9C(const UnkStruct_ov19_021D4DF0 * param0); u32 ov19_021D5EA0(const UnkStruct_ov19_021D4DF0 * param0); u32 ov19_021D5EA8(const UnkStruct_ov19_021D4DF0 * param0); s32 ov19_021D5EB0(const UnkStruct_ov19_021D4DF0 * param0); diff --git a/include/overlay019/ov19_021DA270.h b/include/overlay019/ov19_021DA270.h index 6bea373928..3b13d65c31 100644 --- a/include/overlay019/ov19_021DA270.h +++ b/include/overlay019/ov19_021DA270.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_020218BC_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/box_pokemon.h" #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DA384.h" @@ -16,8 +16,8 @@ void ov19_021DA384(UnkStruct_ov19_021DA384 * param0); void ov19_021DA3CC(UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2); void ov19_021DA3F0(UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2); void ov19_021DA418(const UnkStruct_ov19_021DCD18 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2); -void ov19_021DA428(UnkStruct_ov19_021DA384 * param0, UnkStruct_02073C74_sub1 * param1, s32 param2, s32 param3, u32 param4, u32 param5, u32 param6, UnkStruct_ov19_021DCD18 * param7); -void ov19_021DA548(UnkStruct_ov19_021DA384 * param0, UnkStruct_02073C74_sub1 * param1, u32 param2, u32 param3, u8 * param4, s32 param5, s32 param6, u32 param7, u32 param8, u32 param9, UnkStruct_ov19_021DCD18 * param10); +void ov19_021DA428(UnkStruct_ov19_021DA384 * param0, BoxPokemon * param1, s32 param2, s32 param3, u32 param4, u32 param5, u32 param6, UnkStruct_ov19_021DCD18 * param7); +void ov19_021DA548(UnkStruct_ov19_021DA384 * param0, BoxPokemon * param1, u32 param2, u32 param3, u8 * param4, s32 param5, s32 param6, u32 param7, u32 param8, u32 param9, UnkStruct_ov19_021DCD18 * param10); void ov19_021DA63C(UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2); void ov19_021DA68C(UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2); void ov19_021DA690(UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2); diff --git a/include/overlay019/struct_ov19_021D5594.h b/include/overlay019/struct_ov19_021D5594.h index d201f9fa48..502ca92e9d 100644 --- a/include/overlay019/struct_ov19_021D5594.h +++ b/include/overlay019/struct_ov19_021D5594.h @@ -1,10 +1,10 @@ #ifndef POKEPLATINUM_STRUCT_OV19_021D5594_H #define POKEPLATINUM_STRUCT_OV19_021D5594_H -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/box_pokemon.h" typedef struct { - UnkStruct_02073C74_sub1 * unk_00; + BoxPokemon * unk_00; u8 unk_04; u8 unk_05; u8 unk_06; diff --git a/include/overlay021/struct_ov21_021E8E0C.h b/include/overlay021/struct_ov21_021E8E0C.h index 34f945ed69..c6c3d3e91a 100644 --- a/include/overlay021/struct_ov21_021E8E0C.h +++ b/include/overlay021/struct_ov21_021E8E0C.h @@ -4,14 +4,14 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" typedef struct { UnkStruct_02018340 * unk_00; UnkStruct_02002F38 * unk_04; UnkStruct_02007768 * unk_08; int unk_0C; - UnkStruct_02073C74 * unk_10; + Pokemon * unk_10; int unk_14; } UnkStruct_ov21_021E8E0C; diff --git a/include/overlay022/ov22_022578F4.h b/include/overlay022/ov22_022578F4.h index 3fb1c22227..7badcd2260 100644 --- a/include/overlay022/ov22_022578F4.h +++ b/include/overlay022/ov22_022578F4.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_OV22_022578F4_H #include "struct_defs/struct_02008A90.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay022/struct_ov22_02257964.h" #include "overlay022/struct_ov22_02259560.h" #include "overlay022/struct_ov22_0225B388.h" @@ -12,9 +12,9 @@ void ov22_022578F4(UnkStruct_ov22_02257964 * param0, UnkStruct_ov22_0225B388 * param1); void ov22_02257948(UnkStruct_ov22_02257964 * param0); -void ov22_02257964(UnkStruct_ov22_02257964 * param0, UnkStruct_02073C74 * param1, UnkStruct_02008A90 * param2, int param3, int param4, int param5, int param6); -void ov22_02257998(UnkStruct_ov22_02257964 * param0, UnkStruct_02073C74 * param1, UnkStruct_02008A90 * param2, int param3); -void ov22_022579B4(UnkStruct_ov22_02257964 * param0, UnkStruct_02073C74 * param1, UnkStruct_02008A90 * param2, int param3); +void ov22_02257964(UnkStruct_ov22_02257964 * param0, Pokemon * param1, UnkStruct_02008A90 * param2, int param3, int param4, int param5, int param6); +void ov22_02257998(UnkStruct_ov22_02257964 * param0, Pokemon * param1, UnkStruct_02008A90 * param2, int param3); +void ov22_022579B4(UnkStruct_ov22_02257964 * param0, Pokemon * param1, UnkStruct_02008A90 * param2, int param3); void ov22_022579D8(UnkStruct_ov22_02257964 * param0, UnkStruct_ov22_02259560 * param1); void ov22_022579E8(UnkStruct_ov22_02259560 * param0); void ov22_022579F0(UnkStruct_ov22_02257964 * param0); diff --git a/include/overlay022/ov22_02259098.h b/include/overlay022/ov22_02259098.h index f3d5f1e226..8ff74b4b22 100644 --- a/include/overlay022/ov22_02259098.h +++ b/include/overlay022/ov22_02259098.h @@ -4,15 +4,15 @@ #include "struct_decls/struct_02007768_decl.h" #include "struct_defs/struct_02008A90.h" #include "struct_defs/struct_020298D8.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay022/struct_ov22_022596B0.h" #include "overlay022/struct_ov22_0225A0E4.h" #include void ov22_02259098(UnkStruct_ov22_0225A0E4 * param0, UnkStruct_02008A90 * param1); -void ov22_022590C0(UnkStruct_020298D8 * param0, UnkStruct_02007768 * param1, UnkStruct_02073C74 * param2, UnkStruct_02008A90 * param3, int param4); -void ov22_022590D4(UnkStruct_020298D8 * param0, UnkStruct_02007768 * param1, UnkStruct_02073C74 * param2, UnkStruct_02008A90 * param3, int param4, BOOL param5); +void ov22_022590C0(UnkStruct_020298D8 * param0, UnkStruct_02007768 * param1, Pokemon * param2, UnkStruct_02008A90 * param3, int param4); +void ov22_022590D4(UnkStruct_020298D8 * param0, UnkStruct_02007768 * param1, Pokemon * param2, UnkStruct_02008A90 * param3, int param4, BOOL param5); void ov22_022591B8(UnkStruct_020298D8 * param0); void ov22_022591D0(UnkStruct_020298D8 * param0, int param1); int ov22_022591E0(UnkStruct_020298D8 * param0); diff --git a/include/overlay076/struct_ov76_0223DE00.h b/include/overlay076/struct_ov76_0223DE00.h index 280506189c..69c6e520a1 100644 --- a/include/overlay076/struct_ov76_0223DE00.h +++ b/include/overlay076/struct_ov76_0223DE00.h @@ -5,7 +5,7 @@ #include "struct_decls/struct_0200D0F4_decl.h" #include "struct_defs/struct_0202CA28.h" #include "struct_decls/struct_0202CA88_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_02097F18.h" #include "overlay076/struct_ov76_0223B52C.h" #include "overlay076/struct_ov76_0223BBAC.h" @@ -37,7 +37,7 @@ typedef struct { int unk_3E0; UnkStruct_ov76_0223BBAC unk_3E4; UnkStruct_ov76_0223DD88_sub3 unk_418; - UnkStruct_02073C74 * unk_428; + Pokemon * unk_428; NARC * unk_42C; } UnkStruct_ov76_0223DE00; diff --git a/include/overlay079/struct_ov79_021D38D0.h b/include/overlay079/struct_ov79_021D38D0.h index bb2c5b9a0f..0258a826bd 100644 --- a/include/overlay079/struct_ov79_021D38D0.h +++ b/include/overlay079/struct_ov79_021D38D0.h @@ -2,10 +2,10 @@ #define POKEPLATINUM_STRUCT_OV79_021D38D0_H #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" typedef struct { - UnkStruct_02073C74 * unk_00; + Pokemon * unk_00; u16 unk_04; u8 unk_06; u8 unk_07; diff --git a/include/overlay088/struct_ov88_0223C370.h b/include/overlay088/struct_ov88_0223C370.h index 6a21110e90..6824883cce 100644 --- a/include/overlay088/struct_ov88_0223C370.h +++ b/include/overlay088/struct_ov88_0223C370.h @@ -9,7 +9,7 @@ #include "struct_decls/struct_0202C878_decl.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_0203CDB0_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" @@ -29,8 +29,8 @@ typedef struct { int unk_30; int unk_34; UnkStruct_02025E6C * unk_38; - UnkStruct_02073C74 * unk_3C; - UnkStruct_02073C74 * unk_40; + Pokemon * unk_3C; + Pokemon * unk_40; } UnkStruct_ov88_0223C370; #endif // POKEPLATINUM_STRUCT_OV88_0223C370_H diff --git a/include/overlay094/ov94_0223D0C4.h b/include/overlay094/ov94_0223D0C4.h index 1d50f5f864..a224fcf8bd 100644 --- a/include/overlay094/ov94_0223D0C4.h +++ b/include/overlay094/ov94_0223D0C4.h @@ -4,16 +4,16 @@ #include "struct_decls/struct_0200B144_decl.h" #include "struct_decls/struct_0200B358_decl.h" #include "struct_defs/struct_0205AA50.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "overlay094/struct_ov94_0223BA88_sub2.h" #include "overlay094/struct_ov94_0223FD4C_decl.h" int ov94_0223D0C4(UnkStruct_ov94_0223FD4C * param0, int param1); int ov94_0223D19C(UnkStruct_ov94_0223FD4C * param0, int param1); int ov94_0223D1B0(UnkStruct_ov94_0223FD4C * param0, int param1); -void ov94_0223D910(UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], UnkStruct_02073C74_sub1 * param4, UnkStruct_ov94_0223BA88_sub2 * param5); -void ov94_0223DA78(UnkStruct_0200B144 * param0, UnkStruct_0205AA50 param1[], u16 * param2, UnkStruct_02073C74 * param3, UnkStruct_0205AA50 param4[]); -void ov94_0223DB2C(UnkStruct_02073C74 * param0); +void ov94_0223D910(UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], BoxPokemon * param4, UnkStruct_ov94_0223BA88_sub2 * param5); +void ov94_0223DA78(UnkStruct_0200B144 * param0, UnkStruct_0205AA50 param1[], u16 * param2, Pokemon * param3, UnkStruct_0205AA50 param4[]); +void ov94_0223DB2C(Pokemon * param0); #endif // POKEPLATINUM_OV94_0223D0C4_H diff --git a/include/overlay094/ov94_0223FB48.h b/include/overlay094/ov94_0223FB48.h index ce1cbdc2a0..c0a8a2cc3e 100644 --- a/include/overlay094/ov94_0223FB48.h +++ b/include/overlay094/ov94_0223FB48.h @@ -1,8 +1,8 @@ #ifndef POKEPLATINUM_OV94_0223FB48_H #define POKEPLATINUM_OV94_0223FB48_H -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" #include "overlay094/struct_ov94_0223FD4C_decl.h" @@ -11,7 +11,7 @@ int ov94_0223FB48(UnkStruct_ov94_0223FD4C * param0, int param1); int ov94_0223FBBC(UnkStruct_ov94_0223FD4C * param0, int param1); int ov94_0223FBDC(UnkStruct_ov94_0223FD4C * param0, int param1); int ov94_022411D0(int param0); -UnkStruct_02073C74_sub1 * ov94_022411DC(Party * param0, UnkStruct_020797DC * param1, int param2, int param3); -BOOL ov94_02241498(UnkStruct_02073C74 * param0); +BoxPokemon * ov94_022411DC(Party * param0, UnkStruct_020797DC * param1, int param2, int param3); +BOOL ov94_02241498(Pokemon * param0); #endif // POKEPLATINUM_OV94_0223FB48_H diff --git a/include/overlay094/struct_ov94_0223FD4C.h b/include/overlay094/struct_ov94_0223FD4C.h index 0b1d5f328f..a5dab829ff 100644 --- a/include/overlay094/struct_ov94_0223FD4C.h +++ b/include/overlay094/struct_ov94_0223FD4C.h @@ -19,8 +19,8 @@ #include "struct_decls/struct_0202B370_decl.h" #include "struct_defs/struct_0203E0FC.h" #include "struct_defs/struct_0205AA50.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_0207AE68_decl.h" #include "struct_defs/struct_02098D38.h" #include "overlay006/struct_ov6_02246254.h" @@ -75,7 +75,7 @@ typedef struct UnkStruct_ov94_0223FD4C_t { u16 unk_10E; u16 unk_110; u16 unk_112; - UnkStruct_02073C74_sub1 * unk_114; + BoxPokemon * unk_114; int unk_118; int unk_11C; UnkStruct_02025E6C * unk_120; @@ -140,7 +140,7 @@ typedef struct UnkStruct_ov94_0223FD4C_t { NNSG2dCharacterData * unk_10F8; void * unk_10FC; NNSG2dPaletteData * unk_1100; - UnkStruct_02073C74 * unk_1104; + Pokemon * unk_1104; UnkStruct_ov94_0223FD4C_sub2 * unk_1108; u16 unk_110C; u16 unk_110E; diff --git a/include/overlay095/ov95_02246C20.h b/include/overlay095/ov95_02246C20.h index b2e48340ca..b579dbd9d9 100644 --- a/include/overlay095/ov95_02246C20.h +++ b/include/overlay095/ov95_02246C20.h @@ -6,7 +6,7 @@ #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/box_pokemon.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay095/struct_ov95_02247004_decl.h" #include "overlay095/struct_ov95_022472C4_decl.h" @@ -31,8 +31,8 @@ UnkStruct_02022550 * ov95_022475E4(UnkStruct_ov95_02247628 * param0, UnkStruct_o UnkStruct_02018340 * ov95_02247628(UnkStruct_ov95_02247628 * param0); UnkStruct_0200B358 * ov95_0224762C(UnkStruct_ov95_02247628 * param0); UnkStruct_0200B144 * ov95_02247630(UnkStruct_ov95_02247628 * param0); -const UnkStruct_02073C74_sub1 * ov95_02247634(UnkStruct_ov95_02247628 * param0); -const UnkStruct_02073C74_sub1 * ov95_0224763C(UnkStruct_ov95_02247628 * param0); +const BoxPokemon * ov95_02247634(UnkStruct_ov95_02247628 * param0); +const BoxPokemon * ov95_0224763C(UnkStruct_ov95_02247628 * param0); u32 ov95_02247644(UnkStruct_ov95_02247628 * param0); u16 ov95_0224764C(UnkStruct_ov95_02247628 * param0); u16 ov95_02247654(UnkStruct_ov95_02247628 * param0); diff --git a/include/overlay096/struct_ov96_0223BF40_t.h b/include/overlay096/struct_ov96_0223BF40_t.h index ea9664da76..de63a041b2 100644 --- a/include/overlay096/struct_ov96_0223BF40_t.h +++ b/include/overlay096/struct_ov96_0223BF40_t.h @@ -13,7 +13,7 @@ #include "struct_decls/struct_02023790_decl.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0206BC70.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/box_pokemon.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay061/struct_ov61_0222C3B0.h" #include "overlay096/struct_ov96_0223B450.h" @@ -47,7 +47,7 @@ struct UnkStruct_ov96_0223BF40_t { u16 unk_BBA; u16 unk_BBC; u16 unk_BBE; - UnkStruct_02073C74_sub1 * unk_BC0; + BoxPokemon * unk_BC0; int unk_BC4; int unk_BC8; UnkStruct_0200B358 * unk_BCC; diff --git a/include/overlay097/box_pokemon_gba.h b/include/overlay097/box_pokemon_gba.h new file mode 100644 index 0000000000..cf9962f2dd --- /dev/null +++ b/include/overlay097/box_pokemon_gba.h @@ -0,0 +1,95 @@ +#ifndef POKEPLATINUM_BOX_POKEMON_GBA_H +#define POKEPLATINUM_BOX_POKEMON_GBA_H + +typedef struct { + u16 species; + u16 heldItem; + u32 experience; + u8 ppBonuses; + u8 friendship; + u16 padding; +} PokemonGBASubstruct0; + +typedef struct { + u16 moves[4]; + u8 pp[4]; +} PokemonGBASubstruct1; + +typedef struct { + u8 hpEV; + u8 attackEV; + u8 defenseEV; + u8 speedEV; + u8 spAttackEV; + u8 spDefenseEV; + u8 cool; + u8 beauty; + u8 cute; + u8 smart; + u8 tough; + u8 sheen; +} PokemonGBASubstruct2; + +typedef struct { + u32 pokerus:8; + u32 metLocation:8; + u32 metLevel:7; + u32 metGame:4; + u32 pokeball:4; + u32 otGender:1; + u32 hpIV:5; + u32 attackIV:5; + u32 defenseIV:5; + u32 speedIV:5; + u32 spAttackIV:5; + u32 spDefenseIV:5; + u32 isEgg:1; + u32 abilityNum:1; + u32 coolRibbon:3; // Stores the highest contest rank achieved in the Cool category. + u32 beautyRibbon:3; // Stores the highest contest rank achieved in the Beauty category. + u32 cuteRibbon:3; // Stores the highest contest rank achieved in the Cute category. + u32 smartRibbon:3; // Stores the highest contest rank achieved in the Smart category. + u32 toughRibbon:3; // Stores the highest contest rank achieved in the Tough category. + u32 championRibbon:1; // Given when defeating the Champion in both RSE and FRLG. + u32 winningRibbon:1; // Given at the Battle Tower's Level 50 challenge by winning a set of seven battles that extends the current streak to 56 or more. + u32 victoryRibbon:1; // Given at the Battle Tower's Level 100 challenge by winning a set of seven battles that extends the current streak to 56 or more. + u32 artistRibbon:1; // Given at the Contest Hall by winning a Master Rank contest with at least 800 points, and agreeing to have the Pokémon's portrait placed in the museum after being offered. + u32 effortRibbon:1; // Given at Slateport's market to Pokémon with maximum EVs. + u32 marineRibbon:1; // Never distributed. + u32 landRibbon:1; // Never distributed. + u32 skyRibbon:1; // Never distributed. + u32 countryRibbon:1; // Distributed during Pokémon Festa '04 and '05 to tournament winners. + u32 nationalRibbon:1; // Given to purified Shadow Pokémon in Colosseum/XD. + u32 earthRibbon:1; // Given to teams that have beaten Mt. Battle's 100-battle challenge in Colosseum/XD. + u32 worldRibbon:1; // Distributed during Pokémon Festa '04 and '05 to tournament winners. + u32 unusedRibbons:4; // Discarded in Gen 4. + + // The functionality of this bit changed in FRLG: + // In RS, this bit does nothing, is never set, & is accidentally unset when hatching Eggs. + // In FRLG & Emerald, this controls Mew & Deoxys obedience and whether they can be traded. + // If set, a Pokémon is a fateful encounter in FRLG's summary screen if hatched & for all Pokémon in Gen 4+ summary screens. + // Set for in-game event island legendaries, events distributed after a certain date, & Pokémon from XD: Gale of Darkness. + // Not to be confused with METLOC_FATEFUL_ENCOUNTER. + u32 modernFatefulEncounter:1; +} PokemonGBASubstruct3; + +typedef struct BoxPokemonGBA { + u32 personality; + u32 otId; + u8 nickname[10]; + u8 language; + u8 isBadEgg:1; + u8 hasSpecies:1; + u8 isEgg:1; + u8 unused:5; + u8 otName[7]; + u8 markings; + u16 checksum; + u16 unknown; + u8 secure[sizeof(PokemonGBASubstruct0) + + sizeof(PokemonGBASubstruct1) + + sizeof(PokemonGBASubstruct2) + + sizeof(PokemonGBASubstruct3)]; +} BoxPokemonGBA; + +#endif // POKEPLATINUM_BOX_POKEMON_GBA_H diff --git a/include/overlay097/ov97_02235D18.h b/include/overlay097/ov97_02235D18.h index d4d1b75fc9..94e12540e2 100644 --- a/include/overlay097/ov97_02235D18.h +++ b/include/overlay097/ov97_02235D18.h @@ -11,7 +11,7 @@ int ov97_022360D8(void); BOOL ov97_02236280(void); int ov97_022362C8(void); int ov97_02236308(void); -UnkStruct_ov97_02236340 * ov97_02236340(void); +PokemonStorageGBA * ov97_02236340(void); void * ov97_02236350(void); #endif // POKEPLATINUM_OV97_02235D18_H diff --git a/include/overlay097/ov97_02236380.h b/include/overlay097/ov97_02236380.h index d1be9041ca..d612e46e70 100644 --- a/include/overlay097/ov97_02236380.h +++ b/include/overlay097/ov97_02236380.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV97_02236380_H #define POKEPLATINUM_OV97_02236380_H -#include "overlay097/struct_ov97_0223685C.h" +#include "overlay097/box_pokemon_gba.h" -u32 ov97_02236924(UnkStruct_ov97_0223685C * param0, int param1, u8 * param2); -void ov97_02236CA4(UnkStruct_ov97_0223685C * param0, int param1, const u8 * param2); +u32 GetGBABoxMonData(BoxPokemonGBA * boxMon, int field, u8 * data); +void SetGBABoxMonData(BoxPokemonGBA * boxMon, int field, const u8 * dataArg); int ov97_02236DD0(int param0); -u32 ov97_02236E00(UnkStruct_ov97_0223685C * param0); +u32 ov97_02236E00(BoxPokemonGBA * param0); #endif // POKEPLATINUM_OV97_02236380_H diff --git a/include/overlay097/struct_ov97_02236340.h b/include/overlay097/struct_ov97_02236340.h index 2e242ca4a6..87e1c425b2 100644 --- a/include/overlay097/struct_ov97_02236340.h +++ b/include/overlay097/struct_ov97_02236340.h @@ -1,13 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_OV97_02236340_H #define POKEPLATINUM_STRUCT_OV97_02236340_H -#include "overlay097/struct_ov97_0223685C.h" +#include "overlay097/box_pokemon_gba.h" + +#define GBA_TOTAL_BOXES_COUNT 14 typedef struct { - u8 unk_00; - UnkStruct_ov97_0223685C unk_04[14][30]; - u8 unk_8344[14][9]; - u8 unk_83C2[14]; -} UnkStruct_ov97_02236340; + u8 currentBox; + BoxPokemonGBA boxes[GBA_TOTAL_BOXES_COUNT][30]; + u8 boxNames[GBA_TOTAL_BOXES_COUNT][9]; + u8 boxWallpapers[GBA_TOTAL_BOXES_COUNT]; +} PokemonStorageGBA; #endif // POKEPLATINUM_STRUCT_OV97_02236340_H diff --git a/include/overlay097/struct_ov97_02236380_sub1.h b/include/overlay097/struct_ov97_02236380_sub1.h deleted file mode 100644 index 9dda58e476..0000000000 --- a/include/overlay097/struct_ov97_02236380_sub1.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_OV97_02236380_SUB1_H -#define POKEPLATINUM_STRUCT_OV97_02236380_SUB1_H - -typedef struct { - u16 unk_00; - u16 unk_02; - u32 unk_04; - u8 unk_08; - u8 unk_09; - u16 unk_0A; -} UnkStruct_ov97_02236380_sub1; - -#endif // POKEPLATINUM_STRUCT_OV97_02236380_SUB1_H diff --git a/include/overlay097/struct_ov97_02236380_sub2.h b/include/overlay097/struct_ov97_02236380_sub2.h deleted file mode 100644 index 4581b9bdc0..0000000000 --- a/include/overlay097/struct_ov97_02236380_sub2.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_OV97_02236380_SUB2_H -#define POKEPLATINUM_STRUCT_OV97_02236380_SUB2_H - -typedef struct { - u16 unk_00[4]; - u8 unk_08[4]; -} UnkStruct_ov97_02236380_sub2; - -#endif // POKEPLATINUM_STRUCT_OV97_02236380_SUB2_H diff --git a/include/overlay097/struct_ov97_02236380_sub3.h b/include/overlay097/struct_ov97_02236380_sub3.h deleted file mode 100644 index c40a9a2efe..0000000000 --- a/include/overlay097/struct_ov97_02236380_sub3.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_OV97_02236380_SUB3_H -#define POKEPLATINUM_STRUCT_OV97_02236380_SUB3_H - -typedef struct { - u8 unk_00; - u8 unk_01; - u8 unk_02; - u8 unk_03; - u8 unk_04; - u8 unk_05; - u8 unk_06; - u8 unk_07; - u8 unk_08; - u8 unk_09; - u8 unk_0A; - u8 unk_0B; -} UnkStruct_ov97_02236380_sub3; - -#endif // POKEPLATINUM_STRUCT_OV97_02236380_SUB3_H diff --git a/include/overlay097/struct_ov97_02236380_sub4.h b/include/overlay097/struct_ov97_02236380_sub4.h deleted file mode 100644 index f93461ae7a..0000000000 --- a/include/overlay097/struct_ov97_02236380_sub4.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_OV97_02236380_SUB4_H -#define POKEPLATINUM_STRUCT_OV97_02236380_SUB4_H - -typedef struct { - u32 unk_00_0 : 8; - u32 unk_00_8 : 8; - u32 unk_00_16 : 7; - u32 unk_00_23 : 4; - u32 unk_00_27 : 4; - u32 unk_00_31 : 1; - u32 unk_04_0 : 5; - u32 unk_04_5 : 5; - u32 unk_04_10 : 5; - u32 unk_04_15 : 5; - u32 unk_04_20 : 5; - u32 unk_04_25 : 5; - u32 unk_04_30 : 1; - u32 unk_04_31 : 1; - u32 unk_08_0 : 3; - u32 unk_08_3 : 3; - u32 unk_08_6 : 3; - u32 unk_08_9 : 3; - u32 unk_08_12 : 3; - u32 unk_08_15 : 1; - u32 unk_08_16 : 1; - u32 unk_08_17 : 1; - u32 unk_08_18 : 1; - u32 unk_08_19 : 1; - u32 unk_08_20 : 1; - u32 unk_08_21 : 1; - u32 unk_08_22 : 1; - u32 unk_08_23 : 1; - u32 unk_08_24 : 1; - u32 unk_08_25 : 1; - u32 unk_08_26 : 1; - u32 unk_08_27 : 4; - u32 unk_08_31 : 1; -} UnkStruct_ov97_02236380_sub4; - -#endif // POKEPLATINUM_STRUCT_OV97_02236380_SUB4_H diff --git a/include/overlay097/struct_ov97_0223685C.h b/include/overlay097/struct_ov97_0223685C.h deleted file mode 100644 index 6dbed971f4..0000000000 --- a/include/overlay097/struct_ov97_0223685C.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_OV97_0223685C_H -#define POKEPLATINUM_STRUCT_OV97_0223685C_H - -#include "overlay097/struct_ov97_02236380_sub1.h" -#include "overlay097/struct_ov97_02236380_sub2.h" -#include "overlay097/struct_ov97_02236380_sub3.h" -#include "overlay097/struct_ov97_02236380_sub4.h" - -typedef struct { - u32 unk_00; - u32 unk_04; - u8 unk_08[10]; - u8 unk_12; - u8 unk_13_0 : 1; - u8 unk_13_1 : 1; - u8 unk_13_2 : 1; - u8 unk_13_3 : 1; - u8 unk_13_4 : 4; - u8 unk_14[7]; - u8 unk_1B; - u16 unk_1C; - u16 unk_1E; - u8 unk_20[sizeof(UnkStruct_ov97_02236380_sub1) - + sizeof(UnkStruct_ov97_02236380_sub2) - + sizeof(UnkStruct_ov97_02236380_sub3) - + sizeof(UnkStruct_ov97_02236380_sub4)]; -} UnkStruct_ov97_0223685C; - -#endif // POKEPLATINUM_STRUCT_OV97_0223685C_H diff --git a/include/overlay097/struct_ov97_0223F440.h b/include/overlay097/struct_ov97_0223F440.h index e1f016b1c4..b7e0f84531 100644 --- a/include/overlay097/struct_ov97_0223F440.h +++ b/include/overlay097/struct_ov97_0223F440.h @@ -7,7 +7,7 @@ typedef struct { u32 unk_00[1024]; u8 unk_1000[4096]; u8 unk_2000[16384]; - UnkStruct_ov97_02236340 unk_6000; + PokemonStorageGBA unk_6000; } UnkStruct_ov97_0223F440; #endif // POKEPLATINUM_STRUCT_OV97_0223F440_H diff --git a/include/overlay104/ov104_0222DCE0.h b/include/overlay104/ov104_0222DCE0.h index 73b08c4fc5..4cd287ac8b 100644 --- a/include/overlay104/ov104_0222DCE0.h +++ b/include/overlay104/ov104_0222DCE0.h @@ -6,7 +6,7 @@ #include "struct_decls/struct_02025E6C_decl.h" #include "struct_defs/struct_0204B184.h" #include "struct_defs/struct_0204B1E8.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" #include "overlay006/struct_ov6_02240D5C.h" @@ -18,10 +18,10 @@ UnkStruct_0204B184 * ov104_0222DCE0(u16 param0, int param1, int param2); void ov104_0222DCF4(UnkStruct_0204B1E8 * param0, int param1, int param2); UnkStruct_0204B184 * ov104_0222DD04(UnkStruct_ov104_0223A348_sub1 * param0, int param1, int param2, int param3); u32 ov104_0222DD6C(UnkStruct_ov104_0223A348_sub2 * param0, u16 param1, u32 param2, u32 param3, u8 param4, u8 param5, BOOL param6, int param7, int param8); -void ov104_0222DF40(const UnkStruct_ov104_0223A348_sub2 * param0, UnkStruct_02073C74 * param1, u8 param2); +void ov104_0222DF40(const UnkStruct_ov104_0223A348_sub2 * param0, Pokemon * param1, u8 param2); u16 ov104_0222E10C(u8 param0); -void ov104_0222E134(UnkStruct_021C0794 * param0, UnkStruct_02073C74 * param1); -void ov104_0222E1C0(UnkStruct_021C0794 * param0, Party * param1, UnkStruct_02073C74 * param2); +void ov104_0222E134(UnkStruct_021C0794 * param0, Pokemon * param1); +void ov104_0222E1C0(UnkStruct_021C0794 * param0, Party * param1, Pokemon * param2); void ov104_0222E1D8(UnkStruct_02022550 * param0, u8 param1); void ov104_0222E204(UnkStruct_02022550 * param0, s16 param1, s16 param2, u8 param3); u8 ov104_0222E240(u16 param0, u16 param1); diff --git a/include/overlay104/ov104_02231F74.h b/include/overlay104/ov104_02231F74.h index 5aff868ced..897a8b4c17 100644 --- a/include/overlay104/ov104_02231F74.h +++ b/include/overlay104/ov104_02231F74.h @@ -5,7 +5,7 @@ #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_0200D0F4_decl.h" #include "struct_decls/struct_0201CD38_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay063/struct_ov63_0222BEC0_decl.h" #include "overlay063/struct_ov63_0222CCB8.h" #include "overlay104/struct_ov104_0222E930_decl.h" @@ -26,11 +26,11 @@ void ov104_02232624(UnkStruct_ov104_02232B5C * param0); void ov104_02232B5C(UnkStruct_ov104_02232B5C * param0); void ov104_02232B78(UnkStruct_0201CD38 * param0, void * param1); void ov104_02232C80(UnkStruct_ov63_0222CCB8 * param0, UnkStruct_ov63_0222BEC0 * param1, int param2, int param3); -void ov104_02232CE0(UnkStruct_ov104_0223C4CC * param0, UnkStruct_02073C74 * param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, u16 param9); +void ov104_02232CE0(UnkStruct_ov104_0223C4CC * param0, Pokemon * param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, u16 param9); void ov104_02232E80(UnkStruct_ov104_0223C4CC * param0, int param1); void ov104_02232EC0(UnkStruct_ov104_0223C4CC * param0); void ov104_02232F28(UnkStruct_ov104_0223C4CC * param0); -UnkStruct_0200D0F4 * ov104_02232F4C(UnkStruct_ov104_0223C4CC * param0, UnkStruct_02073C74 * param1, int param2, int param3, int param4); +UnkStruct_0200D0F4 * ov104_02232F4C(UnkStruct_ov104_0223C4CC * param0, Pokemon * param1, int param2, int param3, int param4); void ov104_02232FD4(UnkStruct_ov104_0223C4CC * param0, UnkStruct_0200D0F4 * param1, int param2); void ov104_02232FEC(UnkStruct_ov104_0223C4CC * param0); void ov104_0223307C(UnkStruct_ov104_0223C4CC * param0); diff --git a/include/overlay104/ov104_0223B6F4.h b/include/overlay104/ov104_0223B6F4.h index be1b83768c..1a2878482c 100644 --- a/include/overlay104/ov104_0223B6F4.h +++ b/include/overlay104/ov104_0223B6F4.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0203068C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "overlay006/struct_ov6_02240D5C.h" #include "overlay104/struct_ov104_02230BE4.h" @@ -16,8 +16,8 @@ UnkStruct_ov6_02240D5C * ov104_0223B810(UnkStruct_ov104_0223BA10 * param0, UnkSt u8 ov104_0223BA10(UnkStruct_ov104_0223BA10 * param0); BOOL ov104_0223BA14(u8 param0); void ov104_0223BA24(Party * param0); -void ov104_0223BA7C(UnkStruct_ov104_0223BA10 * param0, UnkStruct_02073C74 * param1); -void ov104_0223BAA0(UnkStruct_ov104_0223BA10 * param0, Party * param1, UnkStruct_02073C74 * param2); +void ov104_0223BA7C(UnkStruct_ov104_0223BA10 * param0, Pokemon * param1); +void ov104_0223BAA0(UnkStruct_ov104_0223BA10 * param0, Party * param1, Pokemon * param2); void ov104_0223BAB8(UnkStruct_ov104_0223BA10 * param0); u16 ov104_0223BB60(UnkStruct_ov104_0223BA10 * param0); void ov104_0223BB84(UnkStruct_02018340 * param0, UnkStruct_ov104_0223BA10 * param1, u32 param2); diff --git a/include/overlay104/ov104_0223BCBC.h b/include/overlay104/ov104_0223BCBC.h index 269b038613..9a39a6f5cd 100644 --- a/include/overlay104/ov104_0223BCBC.h +++ b/include/overlay104/ov104_0223BCBC.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV104_0223BCBC_H #define POKEPLATINUM_OV104_0223BCBC_H -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "overlay006/struct_ov6_02240D5C.h" #include "overlay104/struct_ov104_02230BE4.h" @@ -13,8 +13,8 @@ u8 ov104_0223BDA4(u8 param0, BOOL param1); UnkStruct_ov6_02240D5C * ov104_0223BDD8(UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_02230BE4 * param1); u8 ov104_0223BFFC(UnkStruct_ov104_0223BFFC * param0); BOOL ov104_0223C000(u8 param0); -void ov104_0223C010(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02073C74 * param1); -void ov104_0223C034(UnkStruct_ov104_0223BFFC * param0, Party * param1, UnkStruct_02073C74 * param2); +void ov104_0223C010(UnkStruct_ov104_0223BFFC * param0, Pokemon * param1); +void ov104_0223C034(UnkStruct_ov104_0223BFFC * param0, Party * param1, Pokemon * param2); void ov104_0223C04C(UnkStruct_ov104_0223BFFC * param0); u16 ov104_0223C0BC(UnkStruct_ov104_0223BFFC * param0, u8 param1); u16 ov104_0223C124(UnkStruct_ov104_0223BFFC * param0); diff --git a/include/overlay104/struct_ov104_0223B5C0.h b/include/overlay104/struct_ov104_0223B5C0.h index c620ca0cf7..aacc35676d 100644 --- a/include/overlay104/struct_ov104_0223B5C0.h +++ b/include/overlay104/struct_ov104_0223B5C0.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_OV104_0223B5C0_H #include "struct_decls/struct_02030114_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" #include "overlay104/struct_ov104_0223A348.h" @@ -39,7 +39,7 @@ typedef struct { u8 unk_984[2][512]; u16 unk_D84[2]; u8 unk_D88; - UnkStruct_02073C74 * unk_D8C; + Pokemon * unk_D8C; u8 unk_D90; u32 unk_D94; } UnkStruct_ov104_0223B5C0; diff --git a/include/overlay105/ov105_02245CD0.h b/include/overlay105/ov105_02245CD0.h index 507e5415d9..bd40c01ee7 100644 --- a/include/overlay105/ov105_02245CD0.h +++ b/include/overlay105/ov105_02245CD0.h @@ -3,11 +3,11 @@ #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02007C7C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" void ov105_02245CD0(void); void ov105_02245D50(UnkStruct_02007768 * param0); -UnkStruct_02007C7C * ov105_02245D88(UnkStruct_02007768 * param0, int param1, UnkStruct_02073C74 * param2, int param3, int param4, int param5); +UnkStruct_02007C7C * ov105_02245D88(UnkStruct_02007768 * param0, int param1, Pokemon * param2, int param3, int param4, int param5); void ov105_02245DB8(UnkStruct_02007C7C * param0, int param1); #endif // POKEPLATINUM_OV105_02245CD0_H diff --git a/include/overlay106/ov106_02243310.h b/include/overlay106/ov106_02243310.h index 64ab5d0f96..1ced5bd9b2 100644 --- a/include/overlay106/ov106_02243310.h +++ b/include/overlay106/ov106_02243310.h @@ -2,10 +2,10 @@ #define POKEPLATINUM_OV106_02243310_H #include "struct_decls/struct_02022550_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay106/struct_ov106_02243310.h" -void ov106_02243310(UnkStruct_ov106_02243310 * param0, UnkStruct_02073C74 * param1); +void ov106_02243310(UnkStruct_ov106_02243310 * param0, Pokemon * param1); UnkStruct_02022550 * ov106_022434BC(UnkStruct_ov106_02243310 * param0, u32 param1, u32 param2, u32 param3, u8 param4); void ov106_02243570(UnkStruct_ov106_02243310 * param0); diff --git a/include/overlay106/ov106_022435FC.h b/include/overlay106/ov106_022435FC.h index f27c5ec90e..0b078dc681 100644 --- a/include/overlay106/ov106_022435FC.h +++ b/include/overlay106/ov106_022435FC.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV106_022435FC_H #define POKEPLATINUM_OV106_022435FC_H -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay106/struct_ov106_02243310.h" #include "overlay106/struct_ov106_02243650_decl.h" @@ -10,6 +10,6 @@ void * ov106_02243650(UnkStruct_ov106_02243650 * param0); void ov106_02243664(UnkStruct_ov106_02243650 * param0, int param1); void ov106_02243670(UnkStruct_ov106_02243650 * param0, u16 param1, u16 param2); void ov106_022436B0(UnkStruct_ov106_02243650 * param0, u32 param1); -void ov106_022436CC(UnkStruct_ov106_02243650 * param0, UnkStruct_02073C74 * param1); +void ov106_022436CC(UnkStruct_ov106_02243650 * param0, Pokemon * param1); #endif // POKEPLATINUM_OV106_022435FC_H diff --git a/include/overlay107/ov107_02249B1C.h b/include/overlay107/ov107_02249B1C.h index 1aa7f11281..0f716f9ea4 100644 --- a/include/overlay107/ov107_02249B1C.h +++ b/include/overlay107/ov107_02249B1C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV107_02249B1C_H #define POKEPLATINUM_OV107_02249B1C_H -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay107/struct_ov107_02249954.h" #include "overlay107/struct_ov107_02249B8C_decl.h" @@ -10,7 +10,7 @@ void * ov107_02249B8C(UnkStruct_ov107_02249B8C * param0); void ov107_02249BAC(UnkStruct_ov107_02249B8C * param0, int param1); void ov107_02249BB8(UnkStruct_ov107_02249B8C * param0, u16 param1, u16 param2); void ov107_02249BEC(UnkStruct_ov107_02249B8C * param0, u32 param1); -void ov107_02249C08(UnkStruct_ov107_02249B8C * param0, UnkStruct_02073C74 * param1); +void ov107_02249C08(UnkStruct_ov107_02249B8C * param0, Pokemon * param1); void ov107_02249C1C(UnkStruct_ov107_02249B8C * param0, u8 param1); void ov107_02249C28(UnkStruct_ov107_02249B8C * param0, u8 param1); BOOL ov107_02249C40(UnkStruct_ov107_02249B8C * param0); diff --git a/include/overlay108/ov108_0224351C.h b/include/overlay108/ov108_0224351C.h index fbec62a2cb..c93452bd4a 100644 --- a/include/overlay108/ov108_0224351C.h +++ b/include/overlay108/ov108_0224351C.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV108_0224351C_H #define POKEPLATINUM_OV108_0224351C_H -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay108/struct_ov108_02243030.h" #include "overlay108/struct_ov108_02243594_decl.h" @@ -10,7 +10,7 @@ void * ov108_02243594(UnkStruct_ov108_02243594 * param0); void ov108_022435A8(UnkStruct_ov108_02243594 * param0, int param1); void ov108_022435B4(UnkStruct_ov108_02243594 * param0, u16 param1, u16 param2); void ov108_022435F4(UnkStruct_ov108_02243594 * param0, u32 param1); -void ov108_02243610(UnkStruct_ov108_02243594 * param0, UnkStruct_02073C74 * param1); +void ov108_02243610(UnkStruct_ov108_02243594 * param0, Pokemon * param1); void ov108_02243624(UnkStruct_ov108_02243594 * param0, u8 param1); #endif // POKEPLATINUM_OV108_0224351C_H diff --git a/include/overlay119/ov119_021D0D80.h b/include/overlay119/ov119_021D0D80.h index 7e1874bc82..3be5b69783 100644 --- a/include/overlay119/ov119_021D0D80.h +++ b/include/overlay119/ov119_021D0D80.h @@ -5,7 +5,7 @@ #include "struct_decls/struct_02014014_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0205AA50.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_0207C690.h" #include "overlay119/struct_ov119_021D0FD0.h" #include "overlay119/struct_ov119_021D14DC.h" @@ -24,7 +24,7 @@ void ov119_021D1028(void); void ov119_021D1048(void); void ov119_021D1068(UnkStruct_02018340 * param0, UnkStruct_02002F38 * param1, int param2); void ov119_021D10F0(UnkStruct_02018340 * param0, UnkStruct_0205AA50 * param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8); -int ov119_021D1158(UnkStruct_0205AA50 * param0, int param1, UnkStruct_02073C74 * param2, int param3); +int ov119_021D1158(UnkStruct_0205AA50 * param0, int param1, Pokemon * param2, int param3); void ov119_021D11E4(UnkStruct_ov119_021D0FD0 * param0, UnkStruct_02018340 * param1, UnkStruct_0205AA50 * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9); void ov119_021D12CC(UnkStruct_ov119_021D0FD0 * param0); void ov119_021D12F8(UnkStruct_0205AA50 * param0); diff --git a/include/party.h b/include/party.h index f29fdb53f3..0c8ce86b67 100644 --- a/include/party.h +++ b/include/party.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_02079FEC_H #define POKEPLATINUM_UNK_02079FEC_H -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" @@ -9,12 +9,12 @@ int Party_sizeof(void); Party * sub_02079FF4(u32 param0); void sub_0207A008(Party * param0); void Party_InitWithCapacity(Party * party, int capacity); -BOOL Party_AddPokemon(Party * party, UnkStruct_02073C74 * pokemon); +BOOL Party_AddPokemon(Party * party, Pokemon * pokemon); BOOL Party_RemovePokemonBySlotIndex(Party * party, int slot); int Party_GetCapacity(const Party * party); int Party_GetCurrentCount(const Party * party); -UnkStruct_02073C74 * Party_GetPokemonBySlotIndex(const Party * party, int slot); -void sub_0207A128(Party * party, int slot, UnkStruct_02073C74 * param2); +Pokemon * Party_GetPokemonBySlotIndex(const Party * party, int slot); +void sub_0207A128(Party * party, int slot, Pokemon * param2); BOOL Party_SwapSlots(Party * party, int slotA, int slotB); void Party_cpy(const Party * src, Party * dest); BOOL Party_HasSpecies(const Party * party, int species); diff --git a/include/struct_decls/party_pokemon.h b/include/struct_decls/party_pokemon.h new file mode 100644 index 0000000000..22a6e3a479 --- /dev/null +++ b/include/struct_decls/party_pokemon.h @@ -0,0 +1,6 @@ +#ifndef POKEPLATINUM_PARTY_POKEMON_DECL_H +#define POKEPLATINUM_PARTY_POKEMON_DECL_H + +typedef struct PartyPokemon_t PartyPokemon; + +#endif // POKEPLATINUM_PARTY_POKEMON_DECL_H diff --git a/include/struct_decls/struct_02073C74_decl.h b/include/struct_decls/struct_02073C74_decl.h deleted file mode 100644 index 1afc68f4ef..0000000000 --- a/include/struct_decls/struct_02073C74_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_02073C74_DECL_H -#define POKEPLATINUM_STRUCT_02073C74_DECL_H - -typedef struct UnkStruct_02073C74_t UnkStruct_02073C74; - -#endif // POKEPLATINUM_STRUCT_02073C74_DECL_H diff --git a/include/struct_decls/struct_02073C74_sub1_decl.h b/include/struct_decls/struct_02073C74_sub1_decl.h deleted file mode 100644 index d1806f08ef..0000000000 --- a/include/struct_decls/struct_02073C74_sub1_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_02073C74_SUB1_DECL_H -#define POKEPLATINUM_STRUCT_02073C74_SUB1_DECL_H - -typedef struct UnkStruct_02073C74_sub1_t UnkStruct_02073C74_sub1; - -#endif // POKEPLATINUM_STRUCT_02073C74_SUB1_DECL_H diff --git a/include/struct_decls/struct_02073C74_sub2_decl.h b/include/struct_decls/struct_02073C74_sub2_decl.h deleted file mode 100644 index ad2da31750..0000000000 --- a/include/struct_decls/struct_02073C74_sub2_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_02073C74_SUB2_DECL_H -#define POKEPLATINUM_STRUCT_02073C74_SUB2_DECL_H - -typedef struct UnkStruct_02073C74_sub2_t UnkStruct_02073C74_sub2; - -#endif // POKEPLATINUM_STRUCT_02073C74_SUB2_DECL_H diff --git a/include/struct_decls/struct_02075454_1_decl.h b/include/struct_decls/struct_02075454_1_decl.h deleted file mode 100644 index 92ae0cd033..0000000000 --- a/include/struct_decls/struct_02075454_1_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_02075454_1_DECL_H -#define POKEPLATINUM_STRUCT_02075454_1_DECL_H - -typedef struct UnkStruct_02075454_1_t UnkStruct_02075454_1; - -#endif // POKEPLATINUM_STRUCT_02075454_1_DECL_H diff --git a/include/struct_decls/struct_02075454_2_decl.h b/include/struct_decls/struct_02075454_2_decl.h deleted file mode 100644 index a796c9d475..0000000000 --- a/include/struct_decls/struct_02075454_2_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_02075454_2_DECL_H -#define POKEPLATINUM_STRUCT_02075454_2_DECL_H - -typedef struct UnkStruct_02075454_2_t UnkStruct_02075454_2; - -#endif // POKEPLATINUM_STRUCT_02075454_2_DECL_H diff --git a/include/struct_decls/struct_02075454_3_decl.h b/include/struct_decls/struct_02075454_3_decl.h deleted file mode 100644 index a210ee8378..0000000000 --- a/include/struct_decls/struct_02075454_3_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_02075454_3_DECL_H -#define POKEPLATINUM_STRUCT_02075454_3_DECL_H - -typedef struct UnkStruct_02075454_3_t UnkStruct_02075454_3; - -#endif // POKEPLATINUM_STRUCT_02075454_3_DECL_H diff --git a/include/struct_decls/struct_02075454_decl.h b/include/struct_decls/struct_02075454_decl.h deleted file mode 100644 index c8596d87e9..0000000000 --- a/include/struct_decls/struct_02075454_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_02075454_DECL_H -#define POKEPLATINUM_STRUCT_02075454_DECL_H - -typedef struct UnkStruct_02075454_t UnkStruct_02075454; - -#endif // POKEPLATINUM_STRUCT_02075454_DECL_H diff --git a/include/struct_defs/box_pokemon.h b/include/struct_defs/box_pokemon.h new file mode 100644 index 0000000000..8eb698a3bb --- /dev/null +++ b/include/struct_defs/box_pokemon.h @@ -0,0 +1,22 @@ +#ifndef POKEPLATINUM_BOX_POKEMON_H +#define POKEPLATINUM_BOX_POKEMON_H + +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" +#include "struct_defs/pokemon_substruct_0.h" + +typedef struct { + u32 unk_00; + u16 unk_04_0 : 1; + u16 unk_04_1 : 1; + u16 unk_04_2 : 1; + u16 unk_04_3 : 13; + u16 unk_06; + u8 unk_08[sizeof(PokemonSubstruct0) + + sizeof(PokemonSubstruct1) + + sizeof(PokemonSubstruct2) + + sizeof(PokemonSubstruct3)]; +} BoxPokemon; + +#endif // POKEPLATINUM_BOX_POKEMON_H diff --git a/include/struct_defs/struct_02073C74_sub2_t.h b/include/struct_defs/party_pokemon.h similarity index 63% rename from include/struct_defs/struct_02073C74_sub2_t.h rename to include/struct_defs/party_pokemon.h index 32c07e2e91..3bfe7ce770 100644 --- a/include/struct_defs/struct_02073C74_sub2_t.h +++ b/include/struct_defs/party_pokemon.h @@ -1,10 +1,10 @@ -#ifndef POKEPLATINUM_STRUCT_02073C74_SUB2_T_H -#define POKEPLATINUM_STRUCT_02073C74_SUB2_T_H +#ifndef POKEPLATINUM_PARTY_POKEMON_DATA_T_H +#define POKEPLATINUM_PARTY_POKEMON_DATA_T_H #include "struct_defs/struct_0202818C.h" #include "struct_defs/struct_0202CA28.h" -struct UnkStruct_02073C74_sub2_t { +struct PartyPokemon_t { u32 unk_00; u8 unk_04; u8 unk_05; @@ -19,4 +19,4 @@ struct UnkStruct_02073C74_sub2_t { UnkStruct_0202CA28 unk_4C; }; -#endif // POKEPLATINUM_STRUCT_02073C74_SUB2_T_H +#endif // POKEPLATINUM_PARTY_POKEMON_DATA_T_H diff --git a/include/struct_defs/pokemon.h b/include/struct_defs/pokemon.h new file mode 100644 index 0000000000..87342992d3 --- /dev/null +++ b/include/struct_defs/pokemon.h @@ -0,0 +1,13 @@ +#ifndef POKEPLATINUM_STRUCT_POKEMON_H +#define POKEPLATINUM_STRUCT_POKEMON_H + +#include "struct_defs/box_pokemon.h" +#include "struct_decls/party_pokemon.h" +#include "struct_defs/party_pokemon.h" + +typedef struct { + BoxPokemon box; + PartyPokemon party; +} Pokemon; + +#endif // POKEPLATINUM_STRUCT_POKEMON_H diff --git a/include/struct_defs/struct_02075454.h b/include/struct_defs/pokemon_substruct_0.h similarity index 53% rename from include/struct_defs/struct_02075454.h rename to include/struct_defs/pokemon_substruct_0.h index 96312184a4..ec2cf75f23 100644 --- a/include/struct_defs/struct_02075454.h +++ b/include/struct_defs/pokemon_substruct_0.h @@ -1,12 +1,12 @@ -#ifndef POKEPLATINUM_STRUCT_02075454_H -#define POKEPLATINUM_STRUCT_02075454_H +#ifndef POKEPLATINUM_POKEMON_SUBSTRUCT_0_H +#define POKEPLATINUM_POKEMON_SUBSTRUCT_0_H -typedef struct UnkStruct_02075454_t { - u16 unk_00; - u16 unk_02; +typedef struct PokemonSubstruct0_t { + u16 species; + u16 item; u32 unk_04; u32 unk_08; - u8 unk_0C; + u8 friendship; u8 unk_0D; u8 unk_0E; u8 unk_0F; @@ -23,6 +23,6 @@ typedef struct UnkStruct_02075454_t { u8 unk_1A; u8 unk_1B; u32 unk_1C; -} UnkStruct_02075454; +} PokemonSubstruct0; -#endif // POKEPLATINUM_STRUCT_02075454_H +#endif // POKEPLATINUM_POKEMON_SUBSTRUCT_0_H diff --git a/include/struct_defs/struct_02075454_1.h b/include/struct_defs/pokemon_substruct_1.h similarity index 59% rename from include/struct_defs/struct_02075454_1.h rename to include/struct_defs/pokemon_substruct_1.h index 555d285da2..fc44f07dbe 100644 --- a/include/struct_defs/struct_02075454_1.h +++ b/include/struct_defs/pokemon_substruct_1.h @@ -1,7 +1,7 @@ -#ifndef POKEPLATINUM_STRUCT_02075454_1_H -#define POKEPLATINUM_STRUCT_02075454_1_H +#ifndef POKEPLATINUM_POKEMON_SUBSTRUCT_1_H +#define POKEPLATINUM_POKEMON_SUBSTRUCT_1_H -typedef struct UnkStruct_02075454_1_t { +typedef struct PokemonSubstruct1_t { u16 unk_00[4]; u8 unk_08[4]; u8 unk_0C[4]; @@ -14,13 +14,13 @@ typedef struct UnkStruct_02075454_1_t { u32 unk_10_30 : 1; u32 unk_10_31 : 1; u32 unk_14; - u8 unk_18_0 : 1; + u8 fatefulEncounter:1; u8 unk_18_1 : 2; - u8 unk_18_3 : 5; + u8 form:5; u8 unk_19; u16 unk_1A; u16 unk_1C; u16 unk_1E; -} UnkStruct_02075454_1; +} PokemonSubstruct1; -#endif // POKEPLATINUM_STRUCT_02075454_1_H +#endif // POKEPLATINUM_POKEMON_SUBSTRUCT_1_H diff --git a/include/struct_defs/pokemon_substruct_2.h b/include/struct_defs/pokemon_substruct_2.h new file mode 100644 index 0000000000..e4d18d0398 --- /dev/null +++ b/include/struct_defs/pokemon_substruct_2.h @@ -0,0 +1,11 @@ +#ifndef POKEPLATINUM_POKEMON_SUBSTRUCT_2_H +#define POKEPLATINUM_POKEMON_SUBSTRUCT_2_H + +typedef struct PokemonSubstruct2_t { + u16 unk_00[11]; + u8 unk_16; + u8 unk_17; + u64 unk_18; +} PokemonSubstruct2; + +#endif // POKEPLATINUM_POKEMON_SUBSTRUCT_2_H diff --git a/include/struct_defs/struct_02075454_3.h b/include/struct_defs/pokemon_substruct_3.h similarity index 56% rename from include/struct_defs/struct_02075454_3.h rename to include/struct_defs/pokemon_substruct_3.h index 99f13bf3b8..726c0cba09 100644 --- a/include/struct_defs/struct_02075454_3.h +++ b/include/struct_defs/pokemon_substruct_3.h @@ -1,7 +1,7 @@ -#ifndef POKEPLATINUM_STRUCT_02075454_3_H -#define POKEPLATINUM_STRUCT_02075454_3_H +#ifndef POKEPLATINUM_POKEMON_SUBSTRUCT_3_H +#define POKEPLATINUM_POKEMON_SUBSTRUCT_3_H -typedef struct UnkStruct_02075454_3_t { +typedef struct PokemonSubstruct3_t { u16 unk_00[8]; u8 unk_10; u8 unk_11; @@ -17,6 +17,6 @@ typedef struct UnkStruct_02075454_3_t { u8 unk_1C_7 : 1; u8 unk_1D; u16 unk_1E; -} UnkStruct_02075454_3; +} PokemonSubstruct3; -#endif // POKEPLATINUM_STRUCT_02075454_3_H +#endif // POKEPLATINUM_POKEMON_SUBSTRUCT_3_H diff --git a/include/struct_defs/struct_020298D8.h b/include/struct_defs/struct_020298D8.h index 4182820353..470a8d1bf4 100644 --- a/include/struct_defs/struct_020298D8.h +++ b/include/struct_defs/struct_020298D8.h @@ -3,14 +3,14 @@ #include "struct_decls/struct_02007C7C_decl.h" #include "struct_defs/union_02022594_020225E0.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay022/struct_ov22_022596B0.h" typedef struct { UnkStruct_02007C7C * unk_00; UnkUnion_020225E0 unk_04; UnkStruct_ov22_022596B0 unk_08; - UnkStruct_02073C74 * unk_0C; + Pokemon * unk_0C; } UnkStruct_020298D8; #endif // POKEPLATINUM_STRUCT_020298D8_H diff --git a/include/struct_defs/struct_0203DA00.h b/include/struct_defs/struct_0203DA00.h index 1fe7f9f455..0c29abe7cd 100644 --- a/include/struct_defs/struct_0203DA00.h +++ b/include/struct_defs/struct_0203DA00.h @@ -6,10 +6,10 @@ #include "struct_decls/struct_02029C68_decl.h" #include "struct_decls/struct_02029D04_decl.h" #include "struct_decls/struct_0202CD88_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" typedef struct { - UnkStruct_02073C74 * unk_00; + Pokemon * unk_00; UnkStruct_02029C68 * unk_04; const UnkStruct_02029D04 * unk_08; const UnkStruct_020279FC * unk_0C; diff --git a/include/struct_defs/struct_0203E2FC.h b/include/struct_defs/struct_0203E2FC.h index 45035753b1..085556b266 100644 --- a/include/struct_defs/struct_0203E2FC.h +++ b/include/struct_defs/struct_0203E2FC.h @@ -3,10 +3,10 @@ #include "struct_decls/struct_02025E6C_decl.h" #include "struct_defs/struct_020279FC.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" typedef struct { - UnkStruct_02073C74 * unk_00; + Pokemon * unk_00; UnkStruct_020279FC * unk_04; UnkStruct_02025E6C * unk_08; u16 unk_0C; diff --git a/include/struct_defs/struct_020711C8.h b/include/struct_defs/struct_020711C8.h index 1986599f73..c81175b72f 100644 --- a/include/struct_defs/struct_020711C8.h +++ b/include/struct_defs/struct_020711C8.h @@ -1,10 +1,10 @@ #ifndef POKEPLATINUM_STRUCT_020711C8_H #define POKEPLATINUM_STRUCT_020711C8_H -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" typedef struct { - UnkStruct_02073C74 * unk_00; + Pokemon * unk_00; void * unk_04; } UnkStruct_020711C8; diff --git a/include/struct_defs/struct_02073C74.h b/include/struct_defs/struct_02073C74.h deleted file mode 100644 index efb26e46e7..0000000000 --- a/include/struct_defs/struct_02073C74.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_02073C74_H -#define POKEPLATINUM_STRUCT_02073C74_H - -#include "struct_defs/struct_02073C74_sub1.h" -#include "struct_decls/struct_02073C74_sub2_decl.h" -#include "struct_defs/struct_02073C74_sub2_t.h" - -typedef struct UnkStruct_02073C74_t { - UnkStruct_02073C74_sub1 unk_00; - UnkStruct_02073C74_sub2 unk_08; -} UnkStruct_02073C74; - -#endif // POKEPLATINUM_STRUCT_02073C74_H diff --git a/include/struct_defs/struct_02073C74_sub1.h b/include/struct_defs/struct_02073C74_sub1.h deleted file mode 100644 index 9708a92b4d..0000000000 --- a/include/struct_defs/struct_02073C74_sub1.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_02073C74_SUB1_H -#define POKEPLATINUM_STRUCT_02073C74_SUB1_H - -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" -#include "struct_defs/struct_02075454.h" - -typedef struct UnkStruct_02073C74_sub1_t { - u32 unk_00; - u16 unk_04_0 : 1; - u16 unk_04_1 : 1; - u16 unk_04_2 : 1; - u16 unk_04_3 : 13; - u16 unk_06; - u8 unk_08[sizeof(UnkStruct_02075454) - + sizeof(UnkStruct_02075454_1) - + sizeof(UnkStruct_02075454_2) - + sizeof(UnkStruct_02075454_3)]; -} UnkStruct_02073C74_sub1; - -#endif // POKEPLATINUM_STRUCT_02073C74_SUB1_H diff --git a/include/struct_defs/struct_02075454_2.h b/include/struct_defs/struct_02075454_2.h deleted file mode 100644 index f42f06bbce..0000000000 --- a/include/struct_defs/struct_02075454_2.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_02075454_2_H -#define POKEPLATINUM_STRUCT_02075454_2_H - -typedef struct UnkStruct_02075454_2_t { - u16 unk_00[11]; - u8 unk_16; - u8 unk_17; - u64 unk_18; -} UnkStruct_02075454_2; - -#endif // POKEPLATINUM_STRUCT_02075454_2_H diff --git a/include/struct_defs/struct_0207825C.h b/include/struct_defs/struct_0207825C.h index 5ecbf9a69e..0706391a7c 100644 --- a/include/struct_defs/struct_0207825C.h +++ b/include/struct_defs/struct_0207825C.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_H #define POKEPLATINUM_STRUCT_0207825C_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_t { - UnkStruct_02075454 unk_00; - UnkStruct_02075454_1 unk_20; - UnkStruct_02075454_2 unk_40; - UnkStruct_02075454_3 unk_60; + PokemonSubstruct0 unk_00; + PokemonSubstruct1 unk_20; + PokemonSubstruct2 unk_40; + PokemonSubstruct3 unk_60; } UnkStruct_0207825C; #endif // POKEPLATINUM_STRUCT_0207825C_H diff --git a/include/struct_defs/struct_0207825C_1.h b/include/struct_defs/struct_0207825C_1.h index 64dbbc802d..4652ed3da2 100644 --- a/include/struct_defs/struct_0207825C_1.h +++ b/include/struct_defs/struct_0207825C_1.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_1_H #define POKEPLATINUM_STRUCT_0207825C_1_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_1_t { - UnkStruct_02075454 unk_00; - UnkStruct_02075454_1 unk_20; - UnkStruct_02075454_3 unk_40; - UnkStruct_02075454_2 unk_60; + PokemonSubstruct0 unk_00; + PokemonSubstruct1 unk_20; + PokemonSubstruct3 unk_40; + PokemonSubstruct2 unk_60; } UnkStruct_0207825C_1; #endif // POKEPLATINUM_STRUCT_0207825C_1_H diff --git a/include/struct_defs/struct_0207825C_10.h b/include/struct_defs/struct_0207825C_10.h index af67431aa1..923b95d896 100644 --- a/include/struct_defs/struct_0207825C_10.h +++ b/include/struct_defs/struct_0207825C_10.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_10_H #define POKEPLATINUM_STRUCT_0207825C_10_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_10_t { - UnkStruct_02075454_1 unk_00; - UnkStruct_02075454_3 unk_20; - UnkStruct_02075454 unk_40; - UnkStruct_02075454_2 unk_60; + PokemonSubstruct1 unk_00; + PokemonSubstruct3 unk_20; + PokemonSubstruct0 unk_40; + PokemonSubstruct2 unk_60; } UnkStruct_0207825C_10; #endif // POKEPLATINUM_STRUCT_0207825C_10_H diff --git a/include/struct_defs/struct_0207825C_11.h b/include/struct_defs/struct_0207825C_11.h index 351ab1c50b..98e1c25bdb 100644 --- a/include/struct_defs/struct_0207825C_11.h +++ b/include/struct_defs/struct_0207825C_11.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_11_H #define POKEPLATINUM_STRUCT_0207825C_11_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_11_t { - UnkStruct_02075454_1 unk_00; - UnkStruct_02075454_3 unk_20; - UnkStruct_02075454_2 unk_40; - UnkStruct_02075454 unk_60; + PokemonSubstruct1 unk_00; + PokemonSubstruct3 unk_20; + PokemonSubstruct2 unk_40; + PokemonSubstruct0 unk_60; } UnkStruct_0207825C_11; #endif // POKEPLATINUM_STRUCT_0207825C_11_H diff --git a/include/struct_defs/struct_0207825C_12.h b/include/struct_defs/struct_0207825C_12.h index 7ee9a361f3..623c3881b4 100644 --- a/include/struct_defs/struct_0207825C_12.h +++ b/include/struct_defs/struct_0207825C_12.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_12_H #define POKEPLATINUM_STRUCT_0207825C_12_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_12_t { - UnkStruct_02075454_2 unk_00; - UnkStruct_02075454 unk_20; - UnkStruct_02075454_1 unk_40; - UnkStruct_02075454_3 unk_60; + PokemonSubstruct2 unk_00; + PokemonSubstruct0 unk_20; + PokemonSubstruct1 unk_40; + PokemonSubstruct3 unk_60; } UnkStruct_0207825C_12; #endif // POKEPLATINUM_STRUCT_0207825C_12_H diff --git a/include/struct_defs/struct_0207825C_13.h b/include/struct_defs/struct_0207825C_13.h index 0abd4ba207..6409bb316b 100644 --- a/include/struct_defs/struct_0207825C_13.h +++ b/include/struct_defs/struct_0207825C_13.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_13_H #define POKEPLATINUM_STRUCT_0207825C_13_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_13_t { - UnkStruct_02075454_2 unk_00; - UnkStruct_02075454 unk_20; - UnkStruct_02075454_3 unk_40; - UnkStruct_02075454_1 unk_60; + PokemonSubstruct2 unk_00; + PokemonSubstruct0 unk_20; + PokemonSubstruct3 unk_40; + PokemonSubstruct1 unk_60; } UnkStruct_0207825C_13; #endif // POKEPLATINUM_STRUCT_0207825C_13_H diff --git a/include/struct_defs/struct_0207825C_14.h b/include/struct_defs/struct_0207825C_14.h index 81c283a631..d869f5348b 100644 --- a/include/struct_defs/struct_0207825C_14.h +++ b/include/struct_defs/struct_0207825C_14.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_14_H #define POKEPLATINUM_STRUCT_0207825C_14_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_14_t { - UnkStruct_02075454_2 unk_00; - UnkStruct_02075454_1 unk_20; - UnkStruct_02075454 unk_40; - UnkStruct_02075454_3 unk_60; + PokemonSubstruct2 unk_00; + PokemonSubstruct1 unk_20; + PokemonSubstruct0 unk_40; + PokemonSubstruct3 unk_60; } UnkStruct_0207825C_14; #endif // POKEPLATINUM_STRUCT_0207825C_14_H diff --git a/include/struct_defs/struct_0207825C_15.h b/include/struct_defs/struct_0207825C_15.h index 47a3a9ff9f..019984e9e9 100644 --- a/include/struct_defs/struct_0207825C_15.h +++ b/include/struct_defs/struct_0207825C_15.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_15_H #define POKEPLATINUM_STRUCT_0207825C_15_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_15_t { - UnkStruct_02075454_2 unk_00; - UnkStruct_02075454_1 unk_20; - UnkStruct_02075454_3 unk_40; - UnkStruct_02075454 unk_60; + PokemonSubstruct2 unk_00; + PokemonSubstruct1 unk_20; + PokemonSubstruct3 unk_40; + PokemonSubstruct0 unk_60; } UnkStruct_0207825C_15; #endif // POKEPLATINUM_STRUCT_0207825C_15_H diff --git a/include/struct_defs/struct_0207825C_16.h b/include/struct_defs/struct_0207825C_16.h index 374466d985..7909704194 100644 --- a/include/struct_defs/struct_0207825C_16.h +++ b/include/struct_defs/struct_0207825C_16.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_16_H #define POKEPLATINUM_STRUCT_0207825C_16_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_16_t { - UnkStruct_02075454_2 unk_00; - UnkStruct_02075454_3 unk_20; - UnkStruct_02075454 unk_40; - UnkStruct_02075454_1 unk_60; + PokemonSubstruct2 unk_00; + PokemonSubstruct3 unk_20; + PokemonSubstruct0 unk_40; + PokemonSubstruct1 unk_60; } UnkStruct_0207825C_16; #endif // POKEPLATINUM_STRUCT_0207825C_16_H diff --git a/include/struct_defs/struct_0207825C_17.h b/include/struct_defs/struct_0207825C_17.h index 77b7c11d2b..56aa5df332 100644 --- a/include/struct_defs/struct_0207825C_17.h +++ b/include/struct_defs/struct_0207825C_17.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_17_H #define POKEPLATINUM_STRUCT_0207825C_17_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_17_t { - UnkStruct_02075454_2 unk_00; - UnkStruct_02075454_3 unk_20; - UnkStruct_02075454_1 unk_40; - UnkStruct_02075454 unk_60; + PokemonSubstruct2 unk_00; + PokemonSubstruct3 unk_20; + PokemonSubstruct1 unk_40; + PokemonSubstruct0 unk_60; } UnkStruct_0207825C_17; #endif // POKEPLATINUM_STRUCT_0207825C_17_H diff --git a/include/struct_defs/struct_0207825C_18.h b/include/struct_defs/struct_0207825C_18.h index 4b31549648..0f25713c27 100644 --- a/include/struct_defs/struct_0207825C_18.h +++ b/include/struct_defs/struct_0207825C_18.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_18_H #define POKEPLATINUM_STRUCT_0207825C_18_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_18_t { - UnkStruct_02075454_3 unk_00; - UnkStruct_02075454 unk_20; - UnkStruct_02075454_1 unk_40; - UnkStruct_02075454_2 unk_60; + PokemonSubstruct3 unk_00; + PokemonSubstruct0 unk_20; + PokemonSubstruct1 unk_40; + PokemonSubstruct2 unk_60; } UnkStruct_0207825C_18; #endif // POKEPLATINUM_STRUCT_0207825C_18_H diff --git a/include/struct_defs/struct_0207825C_19.h b/include/struct_defs/struct_0207825C_19.h index daff692631..934782fcbc 100644 --- a/include/struct_defs/struct_0207825C_19.h +++ b/include/struct_defs/struct_0207825C_19.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_19_H #define POKEPLATINUM_STRUCT_0207825C_19_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_19_t { - UnkStruct_02075454_3 unk_00; - UnkStruct_02075454 unk_20; - UnkStruct_02075454_2 unk_40; - UnkStruct_02075454_1 unk_60; + PokemonSubstruct3 unk_00; + PokemonSubstruct0 unk_20; + PokemonSubstruct2 unk_40; + PokemonSubstruct1 unk_60; } UnkStruct_0207825C_19; #endif // POKEPLATINUM_STRUCT_0207825C_19_H diff --git a/include/struct_defs/struct_0207825C_2.h b/include/struct_defs/struct_0207825C_2.h index 4e78f71fe8..838613f005 100644 --- a/include/struct_defs/struct_0207825C_2.h +++ b/include/struct_defs/struct_0207825C_2.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_2_H #define POKEPLATINUM_STRUCT_0207825C_2_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_2_t { - UnkStruct_02075454 unk_00; - UnkStruct_02075454_2 unk_20; - UnkStruct_02075454_1 unk_40; - UnkStruct_02075454_3 unk_60; + PokemonSubstruct0 unk_00; + PokemonSubstruct2 unk_20; + PokemonSubstruct1 unk_40; + PokemonSubstruct3 unk_60; } UnkStruct_0207825C_2; #endif // POKEPLATINUM_STRUCT_0207825C_2_H diff --git a/include/struct_defs/struct_0207825C_20.h b/include/struct_defs/struct_0207825C_20.h index fa9335e00d..2af3a3223e 100644 --- a/include/struct_defs/struct_0207825C_20.h +++ b/include/struct_defs/struct_0207825C_20.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_20_H #define POKEPLATINUM_STRUCT_0207825C_20_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_20_t { - UnkStruct_02075454_3 unk_00; - UnkStruct_02075454_1 unk_20; - UnkStruct_02075454 unk_40; - UnkStruct_02075454_2 unk_60; + PokemonSubstruct3 unk_00; + PokemonSubstruct1 unk_20; + PokemonSubstruct0 unk_40; + PokemonSubstruct2 unk_60; } UnkStruct_0207825C_20; #endif // POKEPLATINUM_STRUCT_0207825C_20_H diff --git a/include/struct_defs/struct_0207825C_21.h b/include/struct_defs/struct_0207825C_21.h index 231bd4a8ce..51de00b106 100644 --- a/include/struct_defs/struct_0207825C_21.h +++ b/include/struct_defs/struct_0207825C_21.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_21_H #define POKEPLATINUM_STRUCT_0207825C_21_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_21_t { - UnkStruct_02075454_3 unk_00; - UnkStruct_02075454_1 unk_20; - UnkStruct_02075454_2 unk_40; - UnkStruct_02075454 unk_60; + PokemonSubstruct3 unk_00; + PokemonSubstruct1 unk_20; + PokemonSubstruct2 unk_40; + PokemonSubstruct0 unk_60; } UnkStruct_0207825C_21; #endif // POKEPLATINUM_STRUCT_0207825C_21_H diff --git a/include/struct_defs/struct_0207825C_22.h b/include/struct_defs/struct_0207825C_22.h index f5c051272b..2a5816fbd0 100644 --- a/include/struct_defs/struct_0207825C_22.h +++ b/include/struct_defs/struct_0207825C_22.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_22_H #define POKEPLATINUM_STRUCT_0207825C_22_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_22_t { - UnkStruct_02075454_3 unk_00; - UnkStruct_02075454_2 unk_20; - UnkStruct_02075454 unk_40; - UnkStruct_02075454_1 unk_60; + PokemonSubstruct3 unk_00; + PokemonSubstruct2 unk_20; + PokemonSubstruct0 unk_40; + PokemonSubstruct1 unk_60; } UnkStruct_0207825C_22; #endif // POKEPLATINUM_STRUCT_0207825C_22_H diff --git a/include/struct_defs/struct_0207825C_23.h b/include/struct_defs/struct_0207825C_23.h index 9273ebd7d9..f6bba521dd 100644 --- a/include/struct_defs/struct_0207825C_23.h +++ b/include/struct_defs/struct_0207825C_23.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_23_H #define POKEPLATINUM_STRUCT_0207825C_23_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_23_t { - UnkStruct_02075454_3 unk_00; - UnkStruct_02075454_2 unk_20; - UnkStruct_02075454_1 unk_40; - UnkStruct_02075454 unk_60; + PokemonSubstruct3 unk_00; + PokemonSubstruct2 unk_20; + PokemonSubstruct1 unk_40; + PokemonSubstruct0 unk_60; } UnkStruct_0207825C_23; #endif // POKEPLATINUM_STRUCT_0207825C_23_H diff --git a/include/struct_defs/struct_0207825C_3.h b/include/struct_defs/struct_0207825C_3.h index 610c572491..f5dca58b52 100644 --- a/include/struct_defs/struct_0207825C_3.h +++ b/include/struct_defs/struct_0207825C_3.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_3_H #define POKEPLATINUM_STRUCT_0207825C_3_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_3_t { - UnkStruct_02075454 unk_00; - UnkStruct_02075454_2 unk_20; - UnkStruct_02075454_3 unk_40; - UnkStruct_02075454_1 unk_60; + PokemonSubstruct0 unk_00; + PokemonSubstruct2 unk_20; + PokemonSubstruct3 unk_40; + PokemonSubstruct1 unk_60; } UnkStruct_0207825C_3; #endif // POKEPLATINUM_STRUCT_0207825C_3_H diff --git a/include/struct_defs/struct_0207825C_4.h b/include/struct_defs/struct_0207825C_4.h index bf417b8c26..038516c437 100644 --- a/include/struct_defs/struct_0207825C_4.h +++ b/include/struct_defs/struct_0207825C_4.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_4_H #define POKEPLATINUM_STRUCT_0207825C_4_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_4_t { - UnkStruct_02075454 unk_00; - UnkStruct_02075454_3 unk_20; - UnkStruct_02075454_1 unk_40; - UnkStruct_02075454_2 unk_60; + PokemonSubstruct0 unk_00; + PokemonSubstruct3 unk_20; + PokemonSubstruct1 unk_40; + PokemonSubstruct2 unk_60; } UnkStruct_0207825C_4; #endif // POKEPLATINUM_STRUCT_0207825C_4_H diff --git a/include/struct_defs/struct_0207825C_5.h b/include/struct_defs/struct_0207825C_5.h index e6dcde8415..505d4ce7ac 100644 --- a/include/struct_defs/struct_0207825C_5.h +++ b/include/struct_defs/struct_0207825C_5.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_5_H #define POKEPLATINUM_STRUCT_0207825C_5_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_5_t { - UnkStruct_02075454 unk_00; - UnkStruct_02075454_3 unk_20; - UnkStruct_02075454_2 unk_40; - UnkStruct_02075454_1 unk_60; + PokemonSubstruct0 unk_00; + PokemonSubstruct3 unk_20; + PokemonSubstruct2 unk_40; + PokemonSubstruct1 unk_60; } UnkStruct_0207825C_5; #endif // POKEPLATINUM_STRUCT_0207825C_5_H diff --git a/include/struct_defs/struct_0207825C_6.h b/include/struct_defs/struct_0207825C_6.h index ff4e48bca9..8ee784725c 100644 --- a/include/struct_defs/struct_0207825C_6.h +++ b/include/struct_defs/struct_0207825C_6.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_6_H #define POKEPLATINUM_STRUCT_0207825C_6_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_6_t { - UnkStruct_02075454_1 unk_00; - UnkStruct_02075454 unk_20; - UnkStruct_02075454_2 unk_40; - UnkStruct_02075454_3 unk_60; + PokemonSubstruct1 unk_00; + PokemonSubstruct0 unk_20; + PokemonSubstruct2 unk_40; + PokemonSubstruct3 unk_60; } UnkStruct_0207825C_6; #endif // POKEPLATINUM_STRUCT_0207825C_6_H diff --git a/include/struct_defs/struct_0207825C_7.h b/include/struct_defs/struct_0207825C_7.h index c5db771587..5367910557 100644 --- a/include/struct_defs/struct_0207825C_7.h +++ b/include/struct_defs/struct_0207825C_7.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_7_H #define POKEPLATINUM_STRUCT_0207825C_7_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_7_t { - UnkStruct_02075454_1 unk_00; - UnkStruct_02075454 unk_20; - UnkStruct_02075454_3 unk_40; - UnkStruct_02075454_2 unk_60; + PokemonSubstruct1 unk_00; + PokemonSubstruct0 unk_20; + PokemonSubstruct3 unk_40; + PokemonSubstruct2 unk_60; } UnkStruct_0207825C_7; #endif // POKEPLATINUM_STRUCT_0207825C_7_H diff --git a/include/struct_defs/struct_0207825C_8.h b/include/struct_defs/struct_0207825C_8.h index 450db577ac..5c50dbeef7 100644 --- a/include/struct_defs/struct_0207825C_8.h +++ b/include/struct_defs/struct_0207825C_8.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_8_H #define POKEPLATINUM_STRUCT_0207825C_8_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_8_t { - UnkStruct_02075454_1 unk_00; - UnkStruct_02075454_2 unk_20; - UnkStruct_02075454 unk_40; - UnkStruct_02075454_3 unk_60; + PokemonSubstruct1 unk_00; + PokemonSubstruct2 unk_20; + PokemonSubstruct0 unk_40; + PokemonSubstruct3 unk_60; } UnkStruct_0207825C_8; #endif // POKEPLATINUM_STRUCT_0207825C_8_H diff --git a/include/struct_defs/struct_0207825C_9.h b/include/struct_defs/struct_0207825C_9.h index b0b6c549b7..f178803410 100644 --- a/include/struct_defs/struct_0207825C_9.h +++ b/include/struct_defs/struct_0207825C_9.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0207825C_9_H #define POKEPLATINUM_STRUCT_0207825C_9_H -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" typedef struct UnkStruct_0207825C_9_t { - UnkStruct_02075454_1 unk_00; - UnkStruct_02075454_2 unk_20; - UnkStruct_02075454_3 unk_40; - UnkStruct_02075454 unk_60; + PokemonSubstruct1 unk_00; + PokemonSubstruct2 unk_20; + PokemonSubstruct3 unk_40; + PokemonSubstruct0 unk_60; } UnkStruct_0207825C_9; #endif // POKEPLATINUM_STRUCT_0207825C_9_H diff --git a/include/struct_defs/struct_0207AE68_t.h b/include/struct_defs/struct_0207AE68_t.h index d7392d1f1f..f342a637c9 100644 --- a/include/struct_defs/struct_0207AE68_t.h +++ b/include/struct_defs/struct_0207AE68_t.h @@ -16,7 +16,7 @@ #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_02056B24_decl.h" #include "struct_defs/struct_0205AA50.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_0207C8C4.h" @@ -33,7 +33,7 @@ struct UnkStruct_0207AE68_t { UnkStruct_02007768 * unk_18; UnkStruct_02007C7C * unk_1C[2]; Party * unk_24; - UnkStruct_02073C74 * unk_28; + Pokemon * unk_28; UnkStruct_020279FC * unk_2C; UnkStruct_0207C8C4 * unk_30; UnkStruct_0207C690 * unk_34; diff --git a/include/struct_defs/struct_02090800.h b/include/struct_defs/struct_02090800.h index 9a7a04ecf8..2fdb425b50 100644 --- a/include/struct_defs/struct_02090800.h +++ b/include/struct_defs/struct_02090800.h @@ -3,14 +3,14 @@ #include "struct_decls/struct_0200B144_decl.h" #include "struct_decls/struct_0200B358_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_02090800_sub1.h" typedef struct { int unk_00; UnkStruct_0200B144 * unk_04; UnkStruct_0200B358 * unk_08; - UnkStruct_02073C74 * unk_0C; + Pokemon * unk_0C; BOOL unk_10; UnkStruct_02090800_sub1 unk_14; UnkStruct_02090800_sub1 unk_1C; diff --git a/include/struct_defs/struct_02093800.h b/include/struct_defs/struct_02093800.h index ea2ed15dda..a007534492 100644 --- a/include/struct_defs/struct_02093800.h +++ b/include/struct_defs/struct_02093800.h @@ -5,7 +5,7 @@ #include "struct_decls/struct_02025E6C_decl.h" #include "struct_defs/struct_020279FC.h" #include "struct_decls/struct_0202A750_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_021C0794_decl.h" typedef struct { @@ -16,7 +16,7 @@ typedef struct { u8 unk_04; u8 unk_05; u8 padding_06[2]; - UnkStruct_02073C74 * unk_08; + Pokemon * unk_08; const UnkStruct_02023790 * unk_0C; const UnkStruct_02025E6C * unk_10; UnkStruct_0202A750 * unk_14; diff --git a/include/struct_defs/struct_02093BBC.h b/include/struct_defs/struct_02093BBC.h index 1e46f8729d..5f74591078 100644 --- a/include/struct_defs/struct_02093BBC.h +++ b/include/struct_defs/struct_02093BBC.h @@ -5,11 +5,11 @@ #include "struct_defs/struct_020279FC.h" #include "struct_decls/struct_02029C88_decl.h" #include "struct_decls/struct_02029D04_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_02095C60.h" typedef struct { - UnkStruct_02073C74 * unk_00; + Pokemon * unk_00; UnkStruct_02029C88 * unk_04; int unk_08; int unk_0C; diff --git a/include/struct_defs/struct_02095C48.h b/include/struct_defs/struct_02095C48.h index b769178ef6..e9bc446193 100644 --- a/include/struct_defs/struct_02095C48.h +++ b/include/struct_defs/struct_02095C48.h @@ -5,7 +5,7 @@ #include "struct_decls/struct_02025E6C_decl.h" #include "struct_defs/struct_020279FC.h" #include "struct_decls/struct_0202A750_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_02094A58.h" #include "struct_defs/struct_02095C48_sub1.h" @@ -32,7 +32,7 @@ typedef struct { u8 padding_1969[3]; const UnkStruct_020279FC * unk_196C; UnkStruct_021C0794 * unk_1970; - UnkStruct_02073C74 * unk_1974; + Pokemon * unk_1974; const UnkStruct_02025E6C * unk_1978; u8 unk_197C; u8 unk_197D; diff --git a/include/struct_defs/struct_02095C48_sub1.h b/include/struct_defs/struct_02095C48_sub1.h index 04b16e9ecd..1495c8b4d6 100644 --- a/include/struct_defs/struct_02095C48_sub1.h +++ b/include/struct_defs/struct_02095C48_sub1.h @@ -3,13 +3,13 @@ #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02029C88_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_020954F0.h" #include "struct_defs/struct_02095C48_sub1_sub1.h" #include "overlay006/struct_ov6_02248BE8.h" typedef struct { - UnkStruct_02073C74 * unk_00[4]; + Pokemon * unk_00[4]; UnkStruct_ov6_02248BE8 unk_10[4]; UnkStruct_020954F0 unk_C0[3]; UnkStruct_02023790 * unk_D8[4]; diff --git a/include/struct_defs/struct_02097F18.h b/include/struct_defs/struct_02097F18.h index c131ebc4de..a4e21caf26 100644 --- a/include/struct_defs/struct_02097F18.h +++ b/include/struct_defs/struct_02097F18.h @@ -3,13 +3,13 @@ #include "struct_defs/struct_020279FC.h" #include "struct_decls/struct_0202CA1C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" typedef struct { int unk_00; - UnkStruct_02073C74 * unk_04[6]; + Pokemon * unk_04[6]; Party * unk_1C; UnkStruct_0202CA1C * unk_20; UnkStruct_020279FC * unk_24; diff --git a/include/struct_defs/struct_02098DE8.h b/include/struct_defs/struct_02098DE8.h index a5cb7f8f0f..66667a6f78 100644 --- a/include/struct_defs/struct_02098DE8.h +++ b/include/struct_defs/struct_02098DE8.h @@ -2,10 +2,10 @@ #define POKEPLATINUM_STRUCT_02098DE8_H #include "struct_defs/struct_0202A93C.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" typedef struct { - UnkStruct_02073C74 * unk_00; + Pokemon * unk_00; Poffin * unk_04; u16 unk_08; u8 unk_0A; diff --git a/include/struct_defs/struct_020997B8.h b/include/struct_defs/struct_020997B8.h index f94551fb26..877324ca63 100644 --- a/include/struct_defs/struct_020997B8.h +++ b/include/struct_defs/struct_020997B8.h @@ -3,10 +3,10 @@ #include "struct_decls/struct_02025E6C_decl.h" #include "struct_defs/struct_020279FC.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" typedef struct { - UnkStruct_02073C74 * unk_00; + Pokemon * unk_00; UnkStruct_02025E6C * unk_04; UnkStruct_020279FC * unk_08; u16 * unk_0C; diff --git a/include/struct_defs/struct_party.h b/include/struct_defs/struct_party.h index cb0d37da2c..b4093e81b2 100644 --- a/include/struct_defs/struct_party.h +++ b/include/struct_defs/struct_party.h @@ -1,12 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_PARTY_H #define POKEPLATINUM_STRUCT_PARTY_H -#include "struct_defs/struct_02073C74.h" +#include "struct_defs/pokemon.h" typedef struct Party { int capacity; int currentCount; - UnkStruct_02073C74 pokemon[6]; + Pokemon pokemon[6]; } Party; #endif // POKEPLATINUM_STRUCT_PARTY_H diff --git a/include/unk_0200B358.h b/include/unk_0200B358.h index 619976b6bb..2ba663bff0 100644 --- a/include/unk_0200B358.h +++ b/include/unk_0200B358.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02025E6C_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_defs/struct_0207A9CC.h" #include "struct_decls/struct_021C0794_decl.h" @@ -18,11 +18,11 @@ void sub_0200B48C(UnkStruct_0200B358 * param0, u32 param1, const UnkStruct_02023 void sub_0200B498(UnkStruct_0200B358 * param0, u32 param1, const UnkStruct_02025E6C * param2); void sub_0200B4BC(UnkStruct_0200B358 * param0, u32 param1, const UnkStruct_021C0794 * param2); void sub_0200B4E4(UnkStruct_0200B358 * param0, u32 param1, const UnkStruct_021C0794 * param2); -void sub_0200B538(UnkStruct_0200B358 * param0, u32 param1, UnkStruct_02073C74_sub1 * param2); -void sub_0200B578(UnkStruct_0200B358 * param0, u32 param1, UnkStruct_02073C74_sub1 * param2); +void sub_0200B538(UnkStruct_0200B358 * param0, u32 param1, BoxPokemon * param2); +void sub_0200B578(UnkStruct_0200B358 * param0, u32 param1, BoxPokemon * param2); void sub_0200B594(UnkStruct_0200B358 * param0, u32 param1, u32 param2); -void sub_0200B5CC(UnkStruct_0200B358 * param0, u32 param1, UnkStruct_02073C74_sub1 * param2); -void sub_0200B5EC(UnkStruct_0200B358 * param0, u32 param1, UnkStruct_02073C74_sub1 * param2); +void sub_0200B5CC(UnkStruct_0200B358 * param0, u32 param1, BoxPokemon * param2); +void sub_0200B5EC(UnkStruct_0200B358 * param0, u32 param1, BoxPokemon * param2); void sub_0200B60C(UnkStruct_0200B358 * param0, u32 param1, s32 param2, u32 param3, int param4, int param5); void sub_0200B630(UnkStruct_0200B358 * param0, u32 param1, u32 param2); void sub_0200B668(UnkStruct_0200B358 * param0, u32 param1, u32 param2); diff --git a/include/unk_0200DA60.h b/include/unk_0200DA60.h index 0c501ae919..15a64875f7 100644 --- a/include/unk_0200DA60.h +++ b/include/unk_0200DA60.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0205AA50.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" void sub_0200DA60(UnkStruct_02018340 * param0, u8 param1, u16 param2, u8 param3, u32 param4); u32 sub_0200DAA0(void); @@ -24,6 +24,6 @@ void * sub_0200E7FC(UnkStruct_0205AA50 * param0, u32 param1); void sub_0200EBA0(void * param0); void sub_0200EBC8(void * param0); u8 * sub_0200EBF0(UnkStruct_02018340 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, u16 param6, u8 param7, int param8); -u8 * sub_0200EC48(UnkStruct_02018340 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, UnkStruct_02073C74 * param6, int param7); +u8 * sub_0200EC48(UnkStruct_02018340 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, Pokemon * param6, int param7); #endif // POKEPLATINUM_UNK_0200DA60_H diff --git a/include/unk_020261E4.h b/include/unk_020261E4.h index 57ef91c712..6d66d04c1e 100644 --- a/include/unk_020261E4.h +++ b/include/unk_020261E4.h @@ -5,13 +5,13 @@ #include "struct_decls/struct_02026224_decl.h" #include "struct_decls/struct_02026310_decl.h" #include "struct_defs/struct_0202818C.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_021C0794_decl.h" int sub_020261E4(void); void sub_020261EC(UnkStruct_02026310 * param0); UnkStruct_02026218 * sub_02026218(UnkStruct_02026310 * param0, int param1); -UnkStruct_02073C74_sub1 * sub_02026220(UnkStruct_02026218 * param0); +BoxPokemon * sub_02026220(UnkStruct_02026218 * param0); UnkStruct_02026224 * sub_02026224(UnkStruct_02026218 * param0); u32 sub_02026228(const UnkStruct_02026218 * param0); UnkStruct_0202818C * sub_02026230(UnkStruct_02026224 * param0); diff --git a/include/unk_0202631C.h b/include/unk_0202631C.h index b1832ae4b1..10bb710a97 100644 --- a/include/unk_0202631C.h +++ b/include/unk_0202631C.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_UNK_0202631C_H #include "struct_decls/struct_02026324_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_021C0794_decl.h" int sub_0202631C(void); @@ -34,8 +34,8 @@ u32 sub_02027208(const UnkStruct_02026324 * param0, int param1); u32 sub_02027240(const UnkStruct_02026324 * param0); u32 sub_02027264(const UnkStruct_02026324 * param0, int param1); u32 sub_02027288(const UnkStruct_02026324 * param0); -void sub_020272A4(UnkStruct_02026324 * param0, UnkStruct_02073C74 * param1); -void sub_0202736C(UnkStruct_02026324 * param0, UnkStruct_02073C74 * param1); +void sub_020272A4(UnkStruct_02026324 * param0, Pokemon * param1); +void sub_0202736C(UnkStruct_02026324 * param0, Pokemon * param1); void sub_02027454(UnkStruct_02026324 * param0); BOOL sub_02027474(const UnkStruct_02026324 * param0); BOOL sub_02027494(const UnkStruct_02026324 * param0); diff --git a/include/unk_020298BC.h b/include/unk_020298BC.h index 492e9b91aa..51c298b147 100644 --- a/include/unk_020298BC.h +++ b/include/unk_020298BC.h @@ -9,7 +9,7 @@ #include "struct_decls/struct_0202A138_decl.h" #include "struct_decls/struct_0202A150_decl.h" #include "struct_decls/struct_0202A750_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_021C0794_decl.h" #include "overlay022/struct_ov22_02255040.h" #include "overlay061/struct_ov61_0222AE80.h" @@ -37,7 +37,7 @@ void sub_02029EFC(UnkStruct_02029D04 * param0, u32 param1); BOOL sub_02029F34(const UnkStruct_02029C68 * param0); void sub_02029F5C(UnkStruct_02029C68 * param0); void sub_02029F84(UnkStruct_02029C68 * param0); -void sub_02029FAC(UnkStruct_02029C68 * param0, UnkStruct_02073C74 * param1, UnkStruct_020298D8 * param2); +void sub_02029FAC(UnkStruct_02029C68 * param0, Pokemon * param1, UnkStruct_020298D8 * param2); void sub_02029FD0(UnkStruct_02029C68 * param0, const UnkStruct_ov22_02255040 * param1, int param2); void sub_0202A084(UnkStruct_02029C68 * param0, u8 param1); void sub_0202A0A0(UnkStruct_02029C68 * param0, u16 param1); @@ -55,12 +55,12 @@ u8 sub_0202A200(const UnkStruct_02029C68 * param0); BOOL sub_0202A218(const UnkStruct_02029C88 * param0); void sub_0202A240(UnkStruct_02029C88 * param0); void sub_0202A25C(UnkStruct_02029C88 * param0); -void sub_0202A284(UnkStruct_02029C88 * param0, UnkStruct_02073C74 * param1, UnkStruct_020298D8 * param2); +void sub_0202A284(UnkStruct_02029C88 * param0, Pokemon * param1, UnkStruct_020298D8 * param2); void sub_0202A2A8(UnkStruct_02029C88 * param0, const UnkStruct_ov22_02255040 * param1, int param2); void sub_0202A35C(UnkStruct_02029C88 * param0, u8 param1); void sub_0202A378(UnkStruct_02029C88 * param0, u32 param1); void sub_0202A390(UnkStruct_02029C88 * param0, const UnkStruct_02029C88 * param1); -void sub_0202A3B0(UnkStruct_02029C88 * param0, UnkStruct_02073C74 * param1, s8 param2); +void sub_0202A3B0(UnkStruct_02029C88 * param0, Pokemon * param1, s8 param2); void sub_0202A3EC(UnkStruct_02029C88 * param0, u32 param1, u8 param2, u8 param3, u8 param4, s8 param5); BOOL sub_0202A488(const UnkStruct_02029C88 * param0, int param1); void sub_0202A4B4(UnkStruct_02029C88 * param0, const UnkStruct_02023790 * param1, int param2); @@ -68,7 +68,7 @@ const UnkStruct_0202A138 * sub_0202A4D8(const UnkStruct_02029C88 * param0); const UnkStruct_0202A150 * sub_0202A4F0(const UnkStruct_02029C88 * param0, int param1); void sub_0202A524(const UnkStruct_02029C88 * param0, UnkStruct_02023790 * param1); u32 sub_0202A544(const UnkStruct_02029C88 * param0); -void sub_0202A560(const UnkStruct_02029C88 * param0, UnkStruct_02073C74 * param1); +void sub_0202A560(const UnkStruct_02029C88 * param0, Pokemon * param1); u8 sub_0202A580(const UnkStruct_02029C88 * param0, int param1); u8 sub_0202A5B8(const UnkStruct_02029C88 * param0); u32 sub_0202A5D0(const UnkStruct_02029C88 * param0); @@ -78,7 +78,7 @@ u32 sub_0202A5FC(const UnkStruct_0202A138 * param0); s8 sub_0202A604(const UnkStruct_0202A138 * param0); u8 sub_0202A60C(const UnkStruct_0202A138 * param0); u8 sub_0202A614(const UnkStruct_0202A138 * param0); -void sub_0202A61C(const UnkStruct_0202A138 * param0, UnkStruct_02073C74 * param1); +void sub_0202A61C(const UnkStruct_0202A138 * param0, Pokemon * param1); u8 sub_0202A624(const UnkStruct_0202A150 * param0); u8 sub_0202A628(const UnkStruct_0202A150 * param0); u8 sub_0202A62C(const UnkStruct_0202A150 * param0); diff --git a/include/unk_0202DA40.h b/include/unk_0202DA40.h index 50bd86c58c..365c7f4ff7 100644 --- a/include/unk_0202DA40.h +++ b/include/unk_0202DA40.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_UNK_0202DA40_H #include "struct_decls/struct_0202DA40_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_021C0794_decl.h" UnkStruct_0202DA40 * sub_0202DA40(UnkStruct_021C0794 * param0); @@ -10,8 +10,8 @@ int sub_0202DA4C(void); void sub_0202DA50(UnkStruct_0202DA40 * param0); int sub_0202DA60(UnkStruct_0202DA40 * param0); void sub_0202DA68(UnkStruct_0202DA40 * param0, int param1); -void sub_0202DA70(UnkStruct_0202DA40 * param0, UnkStruct_02073C74 * param1); -void sub_0202DA7C(UnkStruct_0202DA40 * param0, UnkStruct_02073C74 * param1, int param2); +void sub_0202DA70(UnkStruct_0202DA40 * param0, Pokemon * param1); +void sub_0202DA7C(UnkStruct_0202DA40 * param0, Pokemon * param1, int param2); u32 sub_0202DA8C(UnkStruct_0202DA40 * param0); void sub_0202DA94(UnkStruct_0202DA40 * param0, u32 param1); u32 sub_0202DA9C(UnkStruct_0202DA40 * param0); diff --git a/include/unk_0202EEC0.h b/include/unk_0202EEC0.h index 6fb5accb76..a263fe76a9 100644 --- a/include/unk_0202EEC0.h +++ b/include/unk_0202EEC0.h @@ -2,15 +2,15 @@ #define POKEPLATINUM_UNK_0202EEC0_H #include "struct_decls/struct_02024440_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" int sub_0202EEC0(void); void sub_0202EEC8(UnkStruct_02024440 * param0); void sub_0202EF04(UnkStruct_02024440 * param0); -void sub_0202EFA4(UnkStruct_02024440 * param0, UnkStruct_02073C74_sub1 * param1, int param2); +void sub_0202EFA4(UnkStruct_02024440 * param0, BoxPokemon * param1, int param2); void sub_0202EFB8(UnkStruct_02024440 * param0, u32 param1); -void sub_0202F000(const UnkStruct_02024440 * param0, int param1, UnkStruct_02073C74 * param2); +void sub_0202F000(const UnkStruct_02024440 * param0, int param1, Pokemon * param2); int sub_0202F028(const UnkStruct_02024440 * param0); int sub_0202F050(const UnkStruct_02024440 * param0, u32 param1); BOOL sub_0202F088(const UnkStruct_02024440 * param0); diff --git a/include/unk_0202F180.h b/include/unk_0202F180.h index 2e6e2be327..283b1db0ac 100644 --- a/include/unk_0202F180.h +++ b/include/unk_0202F180.h @@ -1,9 +1,9 @@ #ifndef POKEPLATINUM_UNK_0202F180_H #define POKEPLATINUM_UNK_0202F180_H -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_021C0794_decl.h" -void sub_0202F180(UnkStruct_021C0794 * param0, const UnkStruct_02073C74 * param1); +void sub_0202F180(UnkStruct_021C0794 * param0, const Pokemon * param1); #endif // POKEPLATINUM_UNK_0202F180_H diff --git a/include/unk_0203D1B8.h b/include/unk_0203D1B8.h index 10d255469e..768ac0e2f8 100644 --- a/include/unk_0203D1B8.h +++ b/include/unk_0203D1B8.h @@ -13,7 +13,7 @@ #include "struct_defs/struct_020684D0.h" #include "struct_decls/struct_02070950_decl.h" #include "struct_defs/struct_02072014.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_0209747C_decl.h" #include "struct_defs/struct_02097728.h" #include "struct_defs/struct_02098C44.h" @@ -53,7 +53,7 @@ void * sub_0203D8AC(UnkStruct_0203CDB0 * param0); void * sub_0203D8EC(UnkStruct_0203CDB0 * param0); UnkStruct_02097728 * sub_0203D920(UnkStruct_0203CDB0 * param0, int param1, u8 param2, u8 param3, int param4); UnkStruct_02097728 * sub_0203D94C(UnkStruct_0203CDB0 * param0, int param1, u8 param2, int param3); -UnkStruct_02097728 * sub_0203D984(UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1, int param2); +UnkStruct_02097728 * sub_0203D984(UnkStruct_0203CDB0 * param0, Pokemon * param1, int param2); UnkStruct_0203D9B8 * sub_0203D9B8(UnkStruct_0203CDB0 * param0, int param1); void sub_0203D9D8(UnkStruct_0203CDB0 * param0, UnkStruct_ov90_021D0D80 * param1); void sub_0203DAC0(UnkStruct_020508D4 * param0, u16 * param1, UnkStruct_021C0794 * param2, u16 param3, u16 param4); diff --git a/include/unk_02051D8C.h b/include/unk_02051D8C.h index 5dfb76dba5..4b12de654f 100644 --- a/include/unk_02051D8C.h +++ b/include/unk_02051D8C.h @@ -5,7 +5,7 @@ #include "struct_decls/struct_0202B628_decl.h" #include "struct_decls/struct_0202CC84_decl.h" #include "struct_decls/struct_0203CDB0_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_0207D99C_decl.h" #include "struct_defs/struct_0209C370.h" @@ -17,7 +17,7 @@ UnkStruct_ov6_02240D5C * sub_02051F24(int param0, int param1); UnkStruct_ov6_02240D5C * sub_02051F38(int param0, int param1); UnkStruct_ov6_02240D5C * sub_02051F4C(int param0, const UnkStruct_0203CDB0 * param1); void sub_020520A4(UnkStruct_ov6_02240D5C * param0); -void sub_0205213C(UnkStruct_ov6_02240D5C * param0, UnkStruct_02073C74 * param1, int param2); +void sub_0205213C(UnkStruct_ov6_02240D5C * param0, Pokemon * param1, int param2); void sub_02052164(UnkStruct_ov6_02240D5C * param0, const Party * param1, int param2); void sub_02052184(UnkStruct_ov6_02240D5C * param0, const UnkStruct_02025E6C * param1, int param2); void sub_020521A4(UnkStruct_ov6_02240D5C * param0, const UnkStruct_0202CC84 * param1, int param2); diff --git a/include/unk_02054884.h b/include/unk_02054884.h index 8b9ad1d0fc..ede27500c4 100644 --- a/include/unk_02054884.h +++ b/include/unk_02054884.h @@ -1,21 +1,21 @@ #ifndef POKEPLATINUM_UNK_02054884_H #define POKEPLATINUM_UNK_02054884_H -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" -BOOL sub_02054884(UnkStruct_02073C74 * param0); +BOOL sub_02054884(Pokemon * param0); BOOL sub_020548B0(int param0, UnkStruct_021C0794 * param1, u16 param2, u8 param3, u16 param4, int param5, int param6); BOOL sub_02054930(int param0, UnkStruct_021C0794 * param1, u16 param2, u8 param3, int param4, int param5); void sub_02054988(Party * param0, int param1, int param2, u16 param3); int sub_020549A0(Party * param0, u16 param1); int sub_02054A10(const Party * param0); -UnkStruct_02073C74 * sub_02054A40(const Party * param0); -UnkStruct_02073C74 * sub_02054A74(const Party * param0); +Pokemon * sub_02054A40(const Party * param0); +Pokemon * sub_02054A74(const Party * param0); BOOL sub_02054AB0(const Party * param0); void sub_02054AC4(Party * param0); int sub_02054B04(Party * param0, u16 param1); -BOOL sub_02054B94(UnkStruct_02073C74 * param0); +BOOL sub_02054B94(Pokemon * param0); #endif // POKEPLATINUM_UNK_02054884_H diff --git a/include/unk_02056720.h b/include/unk_02056720.h index 4af819074f..b87489e168 100644 --- a/include/unk_02056720.h +++ b/include/unk_02056720.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_UNK_02056720_H #include "struct_decls/struct_02056B24_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_021C0794_decl.h" int sub_02056720(void); @@ -29,7 +29,7 @@ void sub_020569E8(const UnkStruct_02056B24 * param0, int param1, u8 * param2, u8 BOOL sub_02056A10(const UnkStruct_02056B24 * param0); void sub_02056A18(const UnkStruct_02056B24 * param0, u8 * param1); void sub_02056A2C(UnkStruct_02056B24 * param0, const u8 * param1); -void sub_02056A48(UnkStruct_02056B24 * param0, const UnkStruct_02073C74_sub1 * param1); +void sub_02056A48(UnkStruct_02056B24 * param0, const BoxPokemon * param1); int sub_02056AAC(const UnkStruct_02056B24 * param0); void sub_02056AC8(const UnkStruct_02056B24 * param0, int param1, int * param2, int * param3); u32 sub_02056AFC(const UnkStruct_02056B24 * param0, int param1); diff --git a/include/unk_0205DFC4.h b/include/unk_0205DFC4.h index d9488019fd..aa62e575d0 100644 --- a/include/unk_0205DFC4.h +++ b/include/unk_0205DFC4.h @@ -10,7 +10,7 @@ u16 sub_0205E060(u16 param0); u16 sub_0205E078(u16 param0, u16 param1); u16 sub_0205E0E4(u16 param0, u16 param1); u16 sub_0205E1B4(UnkStruct_021C0794 * param0); -BOOL sub_0205E1F8(UnkStruct_021C0794 * param0); +BOOL HasAllLegendaryTitansInParty(UnkStruct_021C0794 * param0); void sub_0205E318(UnkStruct_020508D4 * param0, UnkStruct_02061AB4 * param1, u16 param2, u16 param3, u16 param4, u16 param5); void sub_0205E3F4(UnkStruct_020508D4 * param0, UnkStruct_02061AB4 * param1, u16 param2, u16 param3); int sub_0205E430(u8 param0, u8 param1); diff --git a/include/unk_0206CCB0.h b/include/unk_0206CCB0.h index 31b99b7297..e4b7a5b776 100644 --- a/include/unk_0206CCB0.h +++ b/include/unk_0206CCB0.h @@ -6,21 +6,21 @@ #include "struct_decls/struct_02025E6C_decl.h" #include "struct_decls/struct_0203CDB0_decl.h" #include "struct_decls/struct_0206D140_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_021C0794_decl.h" #include "overlay006/struct_ov6_022465F4_decl.h" int sub_0206CD00(int param0, UnkStruct_0203CDB0 * param1, UnkStruct_0200B358 * param2, UnkStruct_ov6_022465F4 * param3, u16 * param4); BOOL sub_0206CD2C(int param0, UnkStruct_0203CDB0 * param1, UnkStruct_ov6_022465F4 * param2); -void sub_0206CF14(UnkStruct_0202440C * param0, UnkStruct_02073C74 * param1, int param2, int param3, int param4); -void sub_0206CF48(UnkStruct_0202440C * param0, UnkStruct_02073C74 * param1, int param2); +void sub_0206CF14(UnkStruct_0202440C * param0, Pokemon * param1, int param2, int param3, int param4); +void sub_0206CF48(UnkStruct_0202440C * param0, Pokemon * param1, int param2); void sub_0206CF9C(UnkStruct_0202440C * param0, int param1); void sub_0206CFB4(UnkStruct_0202440C * param0, int param1); void sub_0206CFCC(UnkStruct_0202440C * param0, int param1); void sub_0206CFE4(UnkStruct_0202440C * param0, BOOL param1, u16 param2); void sub_0206D000(UnkStruct_0202440C * param0); -void sub_0206D018(UnkStruct_0202440C * param0, UnkStruct_02073C74 * param1); -void sub_0206D048(UnkStruct_0202440C * param0, UnkStruct_02073C74 * param1); +void sub_0206D018(UnkStruct_0202440C * param0, Pokemon * param1); +void sub_0206D048(UnkStruct_0202440C * param0, Pokemon * param1); void sub_0206D088(UnkStruct_0202440C * param0, u8 param1, const UnkStruct_02025E6C * param2); void sub_0206D0C8(UnkStruct_0202440C * param0, u16 param1); void sub_0206D0F0(UnkStruct_0202440C * param0); @@ -28,29 +28,29 @@ void sub_0206D104(UnkStruct_0202440C * param0); void sub_0206D12C(UnkStruct_0202440C * param0); UnkStruct_0206D140 * sub_0206D140(int param0); void sub_0206D158(UnkStruct_0206D140 * param0); -void sub_0206D160(UnkStruct_0206D140 * param0, UnkStruct_02073C74 * param1, int param2, int param3, u32 param4); +void sub_0206D160(UnkStruct_0206D140 * param0, Pokemon * param1, int param2, int param3, u32 param4); void sub_0206D1B8(UnkStruct_0203CDB0 * param0, const UnkStruct_0206D140 * param1, int param2); -void sub_0206D340(UnkStruct_0203CDB0 * param0, BOOL param1, u16 param2, UnkStruct_02073C74 * param3); +void sub_0206D340(UnkStruct_0203CDB0 * param0, BOOL param1, u16 param2, Pokemon * param3); void sub_0206D424(UnkStruct_0203CDB0 * param0); void sub_0206D430(UnkStruct_0203CDB0 * param0); void sub_0206D4AC(UnkStruct_0203CDB0 * param0, u16 param1); void sub_0206D504(UnkStruct_021C0794 * param0, u16 param1, u8 param2); -void sub_0206D578(UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1); -void sub_0206D60C(UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1); +void sub_0206D578(UnkStruct_0203CDB0 * param0, Pokemon * param1); +void sub_0206D60C(UnkStruct_0203CDB0 * param0, Pokemon * param1); void sub_0206D6C8(UnkStruct_0203CDB0 * param0, int param1, int param2); void sub_0206D720(UnkStruct_0203CDB0 * param0); void sub_0206D7C4(UnkStruct_0203CDB0 * param0); -void sub_0206D90C(UnkStruct_0202440C * param0, UnkStruct_02073C74 * param1, u16 param2); +void sub_0206D90C(UnkStruct_0202440C * param0, Pokemon * param1, u16 param2); void sub_0206D914(UnkStruct_0203CDB0 * param0, u16 param1, u8 param2, u16 param3); -void sub_0206D9B4(UnkStruct_0202440C * param0, UnkStruct_02073C74 * param1, u8 param2); +void sub_0206D9B4(UnkStruct_0202440C * param0, Pokemon * param1, u8 param2); void sub_0206DAB8(UnkStruct_0203CDB0 * param0, const UnkStruct_02025E6C * param1); void sub_0206DAD4(UnkStruct_0203CDB0 * param0, const UnkStruct_02025E6C * param1); void sub_0206DB20(UnkStruct_0203CDB0 * param0); void sub_0206DB5C(UnkStruct_0203CDB0 * param0, u8 param1); -void sub_0206DBB0(UnkStruct_021C0794 * param0, u32 param1, UnkStruct_02073C74 * param2, BOOL param3); -void sub_0206DC6C(UnkStruct_0203CDB0 * param0, u32 param1, UnkStruct_02073C74 * param2); +void sub_0206DBB0(UnkStruct_021C0794 * param0, u32 param1, Pokemon * param2, BOOL param3); +void sub_0206DC6C(UnkStruct_0203CDB0 * param0, u32 param1, Pokemon * param2); void sub_0206DD38(UnkStruct_0203CDB0 * param0, u32 param1, u32 param2, u32 param3); -void sub_0206DDB8(UnkStruct_021C0794 * param0, UnkStruct_02073C74 * param1, u32 param2); +void sub_0206DDB8(UnkStruct_021C0794 * param0, Pokemon * param1, u32 param2); void sub_0206DEEC(UnkStruct_0203CDB0 * param0, u16 param1, u16 param2); void sub_0206DF60(UnkStruct_0203CDB0 * param0, u16 param1); void sub_0206DFE0(UnkStruct_021C0794 * param0); diff --git a/include/unk_0207064C.h b/include/unk_0207064C.h index 1de5254337..0ade37cfbb 100644 --- a/include/unk_0207064C.h +++ b/include/unk_0207064C.h @@ -3,9 +3,9 @@ #include "struct_decls/struct_0203CDB0_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" -void * sub_0207064C(u32 param0, UnkStruct_0203CDB0 * param1, UnkStruct_02073C74 * param2, u16 param3, s16 param4, s16 param5); +void * sub_0207064C(u32 param0, UnkStruct_0203CDB0 * param1, Pokemon * param2, u16 param3, s16 param4, s16 param5); BOOL sub_02070680(UnkStruct_020508D4 * param0); #endif // POKEPLATINUM_UNK_0207064C_H diff --git a/include/unk_02073C2C.h b/include/unk_02073C2C.h index fcaf2cf6d2..b0b4cefc9a 100644 --- a/include/unk_02073C2C.h +++ b/include/unk_02073C2C.h @@ -12,8 +12,8 @@ #include "struct_decls/struct_02015F84_decl.h" #include "struct_decls/struct_02025E6C_decl.h" #include "struct_decls/struct_0202CC84_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_02075874_decl.h" #include "struct_decls/struct_02078B40_decl.h" #include "struct_decls/struct_party_decl.h" @@ -21,153 +21,153 @@ #include -void sub_02073C2C(UnkStruct_02073C74 * param0); -void sub_02073C54(UnkStruct_02073C74_sub1 * param0); -int sub_02073C70(void); -UnkStruct_02073C74 * sub_02073C74(u32 param0); -BOOL sub_02073C88(UnkStruct_02073C74 * param0); -BOOL sub_02073CD4(UnkStruct_02073C74 * param0, BOOL param1); -BOOL sub_02073D20(UnkStruct_02073C74_sub1 * param0); -BOOL sub_02073D48(UnkStruct_02073C74_sub1 * param0, BOOL param1); -void sub_02073D80(UnkStruct_02073C74 * param0, int param1, int param2, int param3, int param4, u32 param5, int param6, u32 param7); -void sub_02073E18(UnkStruct_02073C74_sub1 * param0, int param1, int param2, int param3, int param4, u32 param5, int param6, u32 param7); -void sub_02074044(UnkStruct_02073C74 * param0, u16 param1, u8 param2, u8 param3, u8 param4); -void sub_02074088(UnkStruct_02073C74 * param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6); +void ZeroMonData(Pokemon * param0); +void ZeroBoxMonData(BoxPokemon * param0); +int PokemonStructSize(void); +Pokemon * AllocMonZeroed(u32 heapID); +BOOL sub_02073C88(Pokemon * param0); +BOOL sub_02073CD4(Pokemon * param0, BOOL param1); +BOOL sub_02073D20(BoxPokemon * param0); +BOOL sub_02073D48(BoxPokemon * param0, BOOL param1); +void sub_02073D80(Pokemon * param0, int param1, int param2, int param3, int param4, u32 param5, int param6, u32 param7); +void sub_02073E18(BoxPokemon * param0, int param1, int param2, int param3, int param4, u32 param5, int param6, u32 param7); +void sub_02074044(Pokemon * param0, u16 param1, u8 param2, u8 param3, u8 param4); +void sub_02074088(Pokemon * param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6); u32 sub_02074128(u16 param0, u8 param1, u8 param2); -void sub_02074158(UnkStruct_02073C74 * param0, u16 param1, u8 param2, u32 param3, u32 param4); -void sub_0207418C(UnkStruct_02073C74 * param0); -void sub_020741B8(UnkStruct_02073C74 * param0); -u32 sub_02074470(UnkStruct_02073C74 * param0, int param1, void * param2); -u32 sub_02074570(UnkStruct_02073C74_sub1 * param0, int param1, void * param2); -void sub_02074B30(UnkStruct_02073C74 * param0, int param1, const void * param2); -void sub_02074C60(UnkStruct_02073C74_sub1 * param0, int param1, const void * param2); -void sub_0207536C(UnkStruct_02073C74 * param0, int param1, int param2); +void sub_02074158(Pokemon * param0, u16 param1, u8 param2, u32 param3, u32 param4); +void sub_0207418C(Pokemon * param0); +void sub_020741B8(Pokemon * param0); +u32 GetMonData(Pokemon * param0, int param1, void * param2); +u32 sub_02074570(BoxPokemon * param0, int param1, void * param2); +void sub_02074B30(Pokemon * param0, int param1, const void * param2); +void SetBoxMonData(BoxPokemon * param0, int param1, const void * param2); +void sub_0207536C(Pokemon * param0, int param1, int param2); UnkStruct_02075874 * sub_02075874(int param0, int param1, int param2); UnkStruct_02075874 * sub_02075894(int param0, int param1); u32 sub_020758B0(UnkStruct_02075874 * param0, int param1); void sub_020759B8(UnkStruct_02075874 * param0); u32 sub_020759CC(int param0, int param1, int param2); u32 sub_020759F0(int param0, int param1); -u8 sub_02075A10(UnkStruct_02073C74 * param0); -u32 sub_02075A70(UnkStruct_02073C74 * param0); -u32 sub_02075A78(UnkStruct_02073C74_sub1 * param0); -u32 sub_02075AAC(UnkStruct_02073C74 * param0); +u8 sub_02075A10(Pokemon * param0); +u32 sub_02075A70(Pokemon * param0); +u32 sub_02075A78(BoxPokemon * param0); +u32 sub_02075AAC(Pokemon * param0); u32 sub_02075AD0(int param0, int param1); -u32 sub_02075B38(UnkStruct_02073C74 * param0); -u32 sub_02075B40(UnkStruct_02073C74_sub1 * param0); +u32 sub_02075B38(Pokemon * param0); +u32 sub_02075B40(BoxPokemon * param0); u32 sub_02075B78(u16 param0, u32 param1); u32 sub_02075B9C(UnkStruct_02075874 * param0, u16 param1, u32 param2); -u8 sub_02075BCC(UnkStruct_02073C74 * param0); -u8 sub_02075BD4(UnkStruct_02073C74_sub1 * param0); -u8 sub_02075BFC(u32 param0); +u8 sub_02075BCC(Pokemon * param0); +u8 sub_02075BD4(BoxPokemon * param0); +u8 GetNatureFromPersonality(u32 param0); s8 sub_02075C60(u8 param0, u8 param1); -void sub_02075C74(UnkStruct_02073C74 * param0, u8 param1, u16 param2); -u8 sub_02075D6C(UnkStruct_02073C74 * param0); -u8 sub_02075D74(UnkStruct_02073C74_sub1 * param0); +void sub_02075C74(Pokemon * param0, u8 param1, u16 param2); +u8 sub_02075D6C(Pokemon * param0); +u8 sub_02075D74(BoxPokemon * param0); u8 sub_02075DAC(u16 param0, u32 param1); u8 sub_02075DD0(UnkStruct_02075874 * param0, u16 param1, u32 param2); -u8 sub_02075E0C(UnkStruct_02073C74 * param0); -u8 sub_02075E14(UnkStruct_02073C74_sub1 * param0); +u8 sub_02075E0C(Pokemon * param0); +u8 sub_02075E14(BoxPokemon * param0); u8 sub_02075E38(u32 param0, u32 param1); u32 sub_02075E64(u32 param0); -void sub_02075EF4(UnkStruct_02008A90 * param0, UnkStruct_02073C74 * param1, u8 param2); -void sub_02075F00(UnkStruct_02008A90 * param0, UnkStruct_02073C74 * param1, u8 param2); -void sub_02075F0C(UnkStruct_02008A90 * param0, UnkStruct_02073C74_sub1 * param1, u8 param2, int param3); +void sub_02075EF4(UnkStruct_02008A90 * param0, Pokemon * param1, u8 param2); +void sub_02075F00(UnkStruct_02008A90 * param0, Pokemon * param1, u8 param2); +void sub_02075F0C(UnkStruct_02008A90 * param0, BoxPokemon * param1, u8 param2, int param3); void sub_02075FB4(UnkStruct_02008A90 * param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u32 param6); -u8 sub_020761E8(u16 param0, u8 param1); -u8 sub_020765AC(UnkStruct_02073C74 * param0, u8 param1); -u8 sub_020765B8(UnkStruct_02073C74 * param0, u8 param1); -u8 sub_020765C4(UnkStruct_02073C74_sub1 * param0, u8 param1, int param2); +u8 SanitizeFormId(u16 param0, u8 param1); +u8 sub_020765AC(Pokemon * param0, u8 param1); +u8 sub_020765B8(Pokemon * param0, u8 param1); +u8 sub_020765C4(BoxPokemon * param0, u8 param1, int param2); u8 sub_02076648(u16 param0, u8 param1, u8 param2, u8 param3, u32 param4); void sub_0207697C(UnkStruct_02008A90 * param0, u16 param1); UnkStruct_0200D0F4 * sub_02076994(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, UnkStruct_02002F38 * param2, int param3, int param4, int param5, int param6, int param7, int param8); void sub_02076AAC(int param0, int param1, UnkStruct_ov5_021DE5D0 * param2); u32 sub_02076AF0(void); u32 sub_02076AF4(void); -u8 sub_02076AF8(UnkStruct_02073C74 * param0); -u8 sub_02076B00(UnkStruct_02073C74_sub1 * param0); -UnkStruct_02073C74_sub1 * sub_02076B10(UnkStruct_02073C74 * param0); -u8 sub_02076B14(UnkStruct_02073C74 * param0); -u16 sub_02076B94(Party * param0, UnkStruct_02073C74 * param1, u8 param2, u16 param3, int * param4); +u8 sub_02076AF8(Pokemon * param0); +u8 sub_02076B00(BoxPokemon * param0); +BoxPokemon * sub_02076B10(Pokemon * param0); +u8 sub_02076B14(Pokemon * param0); +u16 sub_02076B94(Party * param0, Pokemon * param1, u8 param2, u16 param3, int * param4); u16 sub_02076F84(const u16 param0); u16 sub_02076FD4(const u16 param0); -void sub_02077020(UnkStruct_02073C74_sub1 * param0); -u16 sub_020770C4(UnkStruct_02073C74 * param0, u16 param1); -u16 sub_020770D4(UnkStruct_02073C74_sub1 * param0, u16 param1); -void sub_02077134(UnkStruct_02073C74 * param0, u16 param1); -void sub_02077144(UnkStruct_02073C74_sub1 * param0, u16 param1); -void sub_020771F8(UnkStruct_02073C74 * param0, u16 param1, u8 param2); -void sub_02077230(UnkStruct_02073C74 * param0, u16 param1, u8 param2); -void sub_02077238(UnkStruct_02073C74_sub1 * param0, u16 param1, u8 param2); -u16 sub_0207727C(UnkStruct_02073C74 * param0, int * param1, u16 * param2); -void sub_02077344(UnkStruct_02073C74 * param0, int param1, int param2); -void sub_0207734C(UnkStruct_02073C74_sub1 * param0, int param1, int param2); -void sub_02077408(UnkStruct_02073C74 * param0, u32 param1); -BOOL sub_0207749C(UnkStruct_02073C74 * param0, u16 param1); -void sub_020774C8(UnkStruct_02073C74_sub1 * param0, UnkStruct_02073C74 * param1); +void sub_02077020(BoxPokemon * param0); +u16 sub_020770C4(Pokemon * param0, u16 param1); +u16 sub_020770D4(BoxPokemon * param0, u16 param1); +void sub_02077134(Pokemon * param0, u16 param1); +void sub_02077144(BoxPokemon * param0, u16 param1); +void sub_020771F8(Pokemon * param0, u16 param1, u8 param2); +void sub_02077230(Pokemon * param0, u16 param1, u8 param2); +void sub_02077238(BoxPokemon * param0, u16 param1, u8 param2); +u16 sub_0207727C(Pokemon * param0, int * param1, u16 * param2); +void sub_02077344(Pokemon * param0, int param1, int param2); +void sub_0207734C(BoxPokemon * param0, int param1, int param2); +void sub_02077408(Pokemon * param0, u32 param1); +BOOL sub_0207749C(Pokemon * param0, u16 param1); +void sub_020774C8(BoxPokemon * param0, Pokemon * param1); u8 sub_02077550(Party * param0); u16 sub_020775A4(u16 param0); u16 sub_020775C4(u16 param0); -void sub_020775EC(UnkStruct_02073C74 * param0, UnkStruct_02073C74 * param1); -void sub_02077604(UnkStruct_02073C74_sub1 * param0, UnkStruct_02073C74_sub1 * param1); -void sub_02077618(UnkStruct_02073C74 * param0, UnkStruct_02073C74_sub1 * param1); -s8 sub_0207762C(UnkStruct_02073C74 * param0, int param1); -s8 sub_02077634(UnkStruct_02073C74_sub1 * param0, int param1); +void sub_020775EC(Pokemon * param0, Pokemon * param1); +void sub_02077604(BoxPokemon * param0, BoxPokemon * param1); +void sub_02077618(Pokemon * param0, BoxPokemon * param1); +s8 sub_0207762C(Pokemon * param0, int param1); +s8 sub_02077634(BoxPokemon * param0, int param1); s8 sub_02077648(u32 param0, int param1); int sub_02077660(int param0, int param1, u16 * param2); void sub_020776B0(Party * param0); u8 sub_02077758(Party * param0, u8 param1); void sub_020777B4(Party * param0, s32 param1); void sub_0207782C(Party * param0); -BOOL sub_020778D8(UnkStruct_02073C74 * param0); -BOOL sub_020778E0(UnkStruct_02073C74_sub1 * param0); -BOOL sub_020778F8(UnkStruct_02073C74 * param0); -BOOL sub_02077900(UnkStruct_02073C74_sub1 * param0); -void sub_02077928(UnkStruct_02073C74 * param0); -void sub_02077930(UnkStruct_02073C74_sub1 * param0); +BOOL sub_020778D8(Pokemon * param0); +BOOL sub_020778E0(BoxPokemon * param0); +BOOL sub_020778F8(Pokemon * param0); +BOOL sub_02077900(BoxPokemon * param0); +void sub_02077928(Pokemon * param0); +void sub_02077930(BoxPokemon * param0); u8 sub_02077988(u16 param0); -int sub_02077A00(UnkStruct_02073C74 * param0); -int sub_02077A1C(UnkStruct_02073C74_sub1 * param0); -void sub_02077A64(UnkStruct_02073C74 * param0); +int sub_02077A00(Pokemon * param0); +int sub_02077A1C(BoxPokemon * param0); +void sub_02077A64(Pokemon * param0); void sub_02077A9C(Party * param0, int param1); -void sub_02077ACC(UnkStruct_02073C74 * param0, int param1); -void sub_02077ADC(UnkStruct_02073C74_sub1 * param0, int param1); -BOOL sub_02077B14(UnkStruct_02073C74 * param0); +void SetShayminForm(Pokemon * param0, int param1); +void SetBoxShayminForm(BoxPokemon * param0, int param1); +BOOL sub_02077B14(Pokemon * param0); void sub_02077B8C(Party * param0); BOOL sub_02077BD8(Party * param0, int param1, const RTCTime * param2); -BOOL sub_02077C20(UnkStruct_02073C74 * param0, int param1, int param2); +BOOL SetRotomForm(Pokemon * param0, int param1, int param2); void sub_02077D28(int param0, int param1, u16 * param2); void sub_02077D3C(UnkStruct_0202CC84 * param0, int param1, u16 param2, int param3, int param4, int param5, int param6, int param7); void sub_02077DB4(UnkStruct_0202CC84 * param0, int param1, u16 param2, int param3, int param4, int param5, int param6, int param7, u8 param8); -BOOL sub_02077E3C(UnkStruct_02073C74 * param0); -void sub_02077E64(UnkStruct_02073C74 * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5); -void sub_02077EA4(UnkStruct_02073C74_sub1 * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5); -void sub_02077EE4(UnkStruct_02073C74 * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5); -void sub_02077EF8(UnkStruct_02073C74_sub1 * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5); -void sub_02077F0C(UnkStruct_02073C74 * param0, u32 param1, int param2); -BOOL sub_02077FB4(UnkStruct_02073C74 * param0, u8 param1); -BOOL sub_02077FBC(UnkStruct_02073C74_sub1 * param0, u8 param1); +BOOL sub_02077E3C(Pokemon * param0); +void sub_02077E64(Pokemon * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5); +void sub_02077EA4(BoxPokemon * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5); +void sub_02077EE4(Pokemon * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5); +void sub_02077EF8(BoxPokemon * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5); +void sub_02077F0C(Pokemon * param0, u32 param1, int param2); +BOOL sub_02077FB4(Pokemon * param0, u8 param1); +BOOL sub_02077FBC(BoxPokemon * param0, u8 param1); BOOL sub_02077FE4(u16 param0, int param1, u8 param2); -void sub_0207803C(UnkStruct_02073C74 * param0); -void sub_02078044(UnkStruct_02073C74_sub1 * param0); -void sub_020780C4(UnkStruct_02073C74 * param0, u32 param1); +void sub_0207803C(Pokemon * param0); +void sub_02078044(BoxPokemon * param0); +void sub_020780C4(Pokemon * param0, u32 param1); u32 sub_020787CC(int param0); int sub_020787EC(u32 param0); BOOL sub_02078804(u16 param0); u16 sub_02078824(u8 param0); -BOOL sub_02078838(UnkStruct_02073C74 * param0); -BOOL sub_0207884C(UnkStruct_02073C74_sub1 * param0, UnkStruct_02025E6C * param1, int param2); +BOOL sub_02078838(Pokemon * param0); +BOOL sub_0207884C(BoxPokemon * param0, UnkStruct_02025E6C * param1, int param2); int sub_020788D0(int param0); -void sub_0207893C(UnkStruct_02073C74 * param0); -void sub_0207896C(UnkStruct_02073C74_sub1 * param0); +void sub_0207893C(Pokemon * param0); +void sub_0207896C(BoxPokemon * param0); void sub_020789BC(NARC * param0, UnkStruct_02007C10 * param1, u16 param2, u16 param3); void sub_020789F4(NARC * param0, UnkStruct_02015F84 * param1, UnkStruct_02007C7C * param2, u16 param3, int param4, int param5, int param6); void sub_02078A4C(NARC * param0, u8 * param1, u16 param2, u16 param3); void sub_02078A80(NARC * param0, s8 * param1, u16 param2); void sub_02078AA4(NARC * param0, s8 * param1, u16 param2); void sub_02078AC8(NARC * param0, u8 * param1, u16 param2); -BOOL sub_02078AEC(int param0, UnkStruct_02073C74 * param1, int param2); -void sub_02078B40(UnkStruct_02073C74 * param0, UnkStruct_02078B40 * param1); -void sub_02078E0C(UnkStruct_02078B40 * param0, UnkStruct_02073C74 * param1); +BOOL sub_02078AEC(int param0, Pokemon * param1, int param2); +void sub_02078B40(Pokemon * param0, UnkStruct_02078B40 * param1); +void sub_02078E0C(UnkStruct_02078B40 * param0, Pokemon * param1); #endif // POKEPLATINUM_UNK_02073C2C_H diff --git a/include/unk_020797C8.h b/include/unk_020797C8.h index 213d6fa660..c240aa5493 100644 --- a/include/unk_020797C8.h +++ b/include/unk_020797C8.h @@ -2,14 +2,14 @@ #define POKEPLATINUM_UNK_020797C8_H #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_020797DC_decl.h" void sub_020797C8(UnkStruct_020797DC * param0); u32 sub_020797D4(void); -BOOL sub_02079868(UnkStruct_020797DC * param0, UnkStruct_02073C74_sub1 * param1); -BOOL sub_020798A0(UnkStruct_020797DC * param0, u32 param1, UnkStruct_02073C74_sub1 * param2); -BOOL sub_02079914(UnkStruct_020797DC * param0, u32 param1, u32 param2, UnkStruct_02073C74_sub1 * param3); +BOOL sub_02079868(UnkStruct_020797DC * param0, BoxPokemon * param1); +BOOL sub_020798A0(UnkStruct_020797DC * param0, u32 param1, BoxPokemon * param2); +BOOL sub_02079914(UnkStruct_020797DC * param0, u32 param1, u32 param2, BoxPokemon * param3); void sub_02079968(UnkStruct_020797DC * param0, u32 param1, u32 param2); u32 sub_0207999C(const UnkStruct_020797DC * param0); u32 sub_020799A0(const UnkStruct_020797DC * param0); @@ -25,7 +25,7 @@ u32 sub_02079B98(const UnkStruct_020797DC * param0, u32 param1); u32 sub_02079BEC(const UnkStruct_020797DC * param0); u32 sub_02079C08(const UnkStruct_020797DC * param0, u32 param1, u32 param2, int param3, void * param4); void sub_02079C50(UnkStruct_020797DC * param0, u32 param1, u32 param2, int param3, void * param4); -UnkStruct_02073C74_sub1 * sub_02079C9C(const UnkStruct_020797DC * param0, u32 param1, u32 param2); +BoxPokemon * sub_02079C9C(const UnkStruct_020797DC * param0, u32 param1, u32 param2); void sub_02079CD8(UnkStruct_020797DC * param0, u32 param1); BOOL sub_02079CFC(const UnkStruct_020797DC * param0, u32 param1); u32 sub_02079D20(const UnkStruct_020797DC * param0); diff --git a/include/unk_02079D40.h b/include/unk_02079D40.h index 227446190e..5d4122e5e5 100644 --- a/include/unk_02079D40.h +++ b/include/unk_02079D40.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_UNK_02079D40_H #define POKEPLATINUM_UNK_02079D40_H -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" -u32 sub_02079D40(const UnkStruct_02073C74_sub1 * param0); -u32 sub_02079D80(UnkStruct_02073C74 * param0); +u32 sub_02079D40(const BoxPokemon * param0); +u32 sub_02079D80(Pokemon * param0); u32 sub_02079D8C(u32 param0, u32 param1, u32 param2); -u16 sub_02079E44(const UnkStruct_02073C74_sub1 * param0); +u16 sub_02079E44(const BoxPokemon * param0); const u8 sub_02079EDC(u32 param0, u32 param1, u32 param2); -const u8 sub_02079F84(const UnkStruct_02073C74_sub1 * param0); -const u8 sub_02079FC4(UnkStruct_02073C74 * param0); +const u8 sub_02079F84(const BoxPokemon * param0); +const u8 sub_02079FC4(Pokemon * param0); u32 sub_02079FD0(void); u32 sub_02079FD4(void); u32 sub_02079FD8(void); diff --git a/include/unk_0207A2A8.h b/include/unk_0207A2A8.h index 3293538ebb..798fd42b8b 100644 --- a/include/unk_0207A2A8.h +++ b/include/unk_0207A2A8.h @@ -2,13 +2,13 @@ #define POKEPLATINUM_UNK_0207A2A8_H #include "struct_defs/struct_0202610C.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_02098700_decl.h" UnkStruct_02098700 * sub_0207A2A8(int param0); void sub_0207A2C0(UnkStruct_02098700 * param0); -BOOL sub_0207A2D0(const UnkStruct_0202610C * param0, UnkStruct_02073C74 * param1, const UnkStruct_02098700 * param2); +BOOL sub_0207A2D0(const UnkStruct_0202610C * param0, Pokemon * param1, const UnkStruct_02098700 * param2); int sub_0207A3AC(const UnkStruct_0202610C * param0, Party * param1, const UnkStruct_02098700 * param2, u8 * param3); int sub_0207A594(const UnkStruct_0202610C * param0, Party * param1, const UnkStruct_02098700 * param2); diff --git a/include/unk_0207AE68.h b/include/unk_0207AE68.h index 350506ec20..2cadaea0b8 100644 --- a/include/unk_0207AE68.h +++ b/include/unk_0207AE68.h @@ -5,12 +5,12 @@ #include "struct_defs/struct_020279FC.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_02056B24_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_0207AE68_decl.h" #include "struct_decls/struct_0207D3C0_decl.h" -UnkStruct_0207AE68 * sub_0207AE68(Party * param0, UnkStruct_02073C74 * param1, int param2, UnkStruct_020279FC * param3, int param4, UnkStruct_02026324 * param5, UnkStruct_0207D3C0 * param6, UnkStruct_0202CD88 * param7, UnkStruct_02056B24 * param8, int param9, int param10, int param11); +UnkStruct_0207AE68 * sub_0207AE68(Party * param0, Pokemon * param1, int param2, UnkStruct_020279FC * param3, int param4, UnkStruct_02026324 * param5, UnkStruct_0207D3C0 * param6, UnkStruct_0202CD88 * param7, UnkStruct_02056B24 * param8, int param9, int param10, int param11); BOOL sub_0207B0D0(UnkStruct_0207AE68 * param0); void sub_0207B0E0(UnkStruct_0207AE68 * param0); diff --git a/include/unk_020819DC.h b/include/unk_020819DC.h index ee5af36aa3..585039f55f 100644 --- a/include/unk_020819DC.h +++ b/include/unk_020819DC.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_020819DC_H #define POKEPLATINUM_UNK_020819DC_H -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_0207F248.h" void sub_02081A24(UnkStruct_0207F248 * param0); @@ -10,7 +10,7 @@ void sub_02081BC0(UnkStruct_0207F248 * param0); void sub_02081CAC(UnkStruct_0207F248 * param0, u16 param1, u8 param2); void sub_02081CF4(UnkStruct_0207F248 * param0, const u8 * param1, u8 param2); void sub_02081E08(UnkStruct_0207F248 * param0); -void sub_02081ED8(UnkStruct_0207F248 * param0, UnkStruct_02073C74 * param1, u32 param2); +void sub_02081ED8(UnkStruct_0207F248 * param0, Pokemon * param1, u32 param2); void sub_02081F2C(UnkStruct_0207F248 * param0, u8 param1); void sub_02081FFC(UnkStruct_0207F248 * param0, u8 param1); void sub_02082058(UnkStruct_0207F248 * param0, u8 param1); diff --git a/include/unk_02084B70.h b/include/unk_02084B70.h index b476d66718..8ba68caa6b 100644 --- a/include/unk_02084B70.h +++ b/include/unk_02084B70.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_02084B70_H #define POKEPLATINUM_UNK_02084B70_H -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_0207F248.h" void sub_020852B8(UnkStruct_0207F248 * param0); @@ -9,7 +9,7 @@ int sub_02085348(void * param0); BOOL sub_020857A8(u16 param0); int sub_02085804(UnkStruct_0207F248 * param0); int sub_02085EF4(UnkStruct_0207F248 * param0); -u8 sub_02086104(UnkStruct_0207F248 * param0, UnkStruct_02073C74 * param1); +u8 sub_02086104(UnkStruct_0207F248 * param0, Pokemon * param1); int sub_0208615C(UnkStruct_0207F248 * param0); int sub_020862F8(UnkStruct_0207F248 * param0); int sub_020863A0(UnkStruct_0207F248 * param0); diff --git a/include/unk_0208C324.h b/include/unk_0208C324.h index fdd69b7b37..8456ef9ab2 100644 --- a/include/unk_0208C324.h +++ b/include/unk_0208C324.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_UNK_0208C324_H #include "struct_decls/struct_02025E6C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_0208D7BC.h" #include "struct_defs/struct_02098D38.h" #include "struct_decls/struct_021C0794_decl.h" @@ -18,6 +18,6 @@ u32 sub_0208E9E0(void); u32 sub_0208E9E4(void); u32 sub_0208E9E8(void); u32 sub_0208E9EC(void); -u32 sub_0208E9F0(UnkStruct_02073C74 * param0); +u32 sub_0208E9F0(Pokemon * param0); #endif // POKEPLATINUM_UNK_0208C324_H diff --git a/include/unk_02092494.h b/include/unk_02092494.h index 78320fcac7..bd379fd93d 100644 --- a/include/unk_02092494.h +++ b/include/unk_02092494.h @@ -2,13 +2,13 @@ #define POKEPLATINUM_UNK_02092494_H #include "struct_decls/struct_02025E6C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_defs/struct_02090800.h" -UnkStruct_02090800 * sub_02092494(UnkStruct_02073C74 * param0, BOOL param1, int param2); +UnkStruct_02090800 * sub_02092494(Pokemon * param0, BOOL param1, int param2); void sub_0209282C(UnkStruct_02090800 * param0); -void sub_0209304C(UnkStruct_02073C74 * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4); -void sub_0209305C(UnkStruct_02073C74_sub1 * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4); +void sub_0209304C(Pokemon * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4); +void sub_0209305C(BoxPokemon * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4); #endif // POKEPLATINUM_UNK_02092494_H diff --git a/include/unk_02094EDC.h b/include/unk_02094EDC.h index bb047479c7..953934fde4 100644 --- a/include/unk_02094EDC.h +++ b/include/unk_02094EDC.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02007C7C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_02095C48.h" #include "overlay006/struct_ov6_02248BE8.h" #include "overlay016/struct_ov16_0223E0C8.h" @@ -12,8 +12,8 @@ int sub_02094EDC(UnkStruct_02095C48 * param0); void sub_02094F04(UnkStruct_02095C48 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7); void sub_020951B0(UnkStruct_02095C48 * param0, int param1); void sub_02095338(UnkStruct_02095C48 * param0); -void sub_02095380(const UnkStruct_ov6_02248BE8 * param0, UnkStruct_02073C74 * param1, int param2); -UnkStruct_02007C7C * sub_02095484(UnkStruct_02007768 * param0, int param1, UnkStruct_02073C74 * param2, int param3, UnkStruct_ov16_0223E0C8 * param4, int param5, int param6, int param7, int param8); +void sub_02095380(const UnkStruct_ov6_02248BE8 * param0, Pokemon * param1, int param2); +UnkStruct_02007C7C * sub_02095484(UnkStruct_02007768 * param0, int param1, Pokemon * param2, int param3, UnkStruct_ov16_0223E0C8 * param4, int param5, int param6, int param7, int param8); void sub_020954F0(UnkStruct_02095C48 * param0, int param1, int param2, int param3, int param4); s8 sub_02095734(int param0); void sub_02095750(int param0, u32 * param1, u32 * param2); diff --git a/include/unk_02096420.h b/include/unk_02096420.h index 51a4d12b70..7c5a9abbc5 100644 --- a/include/unk_02096420.h +++ b/include/unk_02096420.h @@ -1,12 +1,12 @@ #ifndef POKEPLATINUM_UNK_02096420_H #define POKEPLATINUM_UNK_02096420_H -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" -u8 sub_02096420(UnkStruct_02073C74 * param0, u16 param1, u16 param2, u32 param3); +u8 sub_02096420(Pokemon * param0, u16 param1, u16 param2, u32 param3); u8 sub_0209693C(Party * param0, u16 param1, u8 param2, u8 param3, u32 param4); -u8 sub_02096954(UnkStruct_02073C74 * param0, u16 param1, u16 param2, u16 param3, u32 param4); +u8 sub_02096954(Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param4); u8 sub_02096F14(Party * param0, u16 param1, u8 param2, u8 param3, u16 param4, u32 param5); void sub_02097284(Party * param0); diff --git a/include/unk_02097624.h b/include/unk_02097624.h index 4ecf28c999..e4c94eaa1e 100644 --- a/include/unk_02097624.h +++ b/include/unk_02097624.h @@ -2,19 +2,19 @@ #define POKEPLATINUM_UNK_02097624_H #include "struct_decls/struct_02028430_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_02097728.h" #include "struct_decls/struct_021C0794_decl.h" UnkStruct_02097728 * sub_02097624(UnkStruct_021C0794 * param0, int param1, u8 param2, u8 param3, int param4); UnkStruct_02097728 * sub_0209767C(UnkStruct_021C0794 * param0, int param1, u16 param2, int param3); -UnkStruct_02097728 * sub_020976BC(UnkStruct_021C0794 * param0, UnkStruct_02073C74 * param1, int param2); +UnkStruct_02097728 * sub_020976BC(UnkStruct_021C0794 * param0, Pokemon * param1, int param2); UnkStruct_02097728 * sub_020976F4(UnkStruct_021C0794 * param0, u8 param1, int param2); BOOL sub_02097728(UnkStruct_02097728 * param0); int sub_0209772C(UnkStruct_02097728 * param0, int param1, u8 param2); -int sub_02097750(UnkStruct_02097728 * param0, UnkStruct_02073C74 * param1); +int sub_02097750(UnkStruct_02097728 * param0, Pokemon * param1); void sub_02097770(UnkStruct_02097728 * param0); -int sub_02097788(UnkStruct_02028430 * param0, UnkStruct_02073C74 * param1, int param2); -int sub_020977E4(UnkStruct_02028430 * param0, u16 param1, UnkStruct_02073C74 * param2, int param3); +int sub_02097788(UnkStruct_02028430 * param0, Pokemon * param1, int param2); +int sub_020977E4(UnkStruct_02028430 * param0, u16 param1, Pokemon * param2, int param3); #endif // POKEPLATINUM_UNK_02097624_H diff --git a/include/unk_02097B18.h b/include/unk_02097B18.h index a8809faafb..23be22f88e 100644 --- a/include/unk_02097B18.h +++ b/include/unk_02097B18.h @@ -2,11 +2,11 @@ #define POKEPLATINUM_UNK_02097B18_H #include "struct_decls/struct_020508D4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_02097F18.h" #include "struct_decls/struct_021C0794_decl.h" -UnkStruct_02073C74 * sub_02097F00(UnkStruct_02097F18 * param0, int param1); +Pokemon * sub_02097F00(UnkStruct_02097F18 * param0, int param1); u8 sub_02097F18(UnkStruct_02097F18 * param0); void sub_02097F20(UnkStruct_02097F18 * param0, u8 param1); u8 sub_02097F28(UnkStruct_02097F18 * param0); diff --git a/include/unk_020989DC.h b/include/unk_020989DC.h index 1b84bdd983..4d7eb0890d 100644 --- a/include/unk_020989DC.h +++ b/include/unk_020989DC.h @@ -3,7 +3,7 @@ #include "struct_defs/struct_0202A93C.h" #include "struct_defs/struct_0203D9B8.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_021C0794_decl.h" #include "enums.h" @@ -11,6 +11,6 @@ UnkStruct_0203D9B8 * sub_020989DC(UnkStruct_021C0794 * param0, int param1); void sub_02098AF0(UnkStruct_0203D9B8 * param0); UnkEnum_02098EAC sub_02098EAC(Poffin * param0, u8 param1); -void sub_02098EF8(Poffin * param0, UnkStruct_02073C74 * param1); +void sub_02098EF8(Poffin * param0, Pokemon * param1); #endif // POKEPLATINUM_UNK_020989DC_H diff --git a/include/unk_020997B8.h b/include/unk_020997B8.h index 897c5424a8..d1c73cbea5 100644 --- a/include/unk_020997B8.h +++ b/include/unk_020997B8.h @@ -1,12 +1,12 @@ #ifndef POKEPLATINUM_UNK_020997B8_H #define POKEPLATINUM_UNK_020997B8_H -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_020997B8.h" UnkStruct_020997B8 * sub_020997B8(u32 param0); void sub_020997D0(UnkStruct_020997B8 * param0); -u16 * sub_020997D8(UnkStruct_02073C74 * param0, u32 param1); +u16 * sub_020997D8(Pokemon * param0, u32 param1); BOOL sub_020998D8(u16 * param0); #endif // POKEPLATINUM_UNK_020997B8_H diff --git a/main.lsf b/main.lsf index fc583a7de4..bdba5d6ffe 100644 --- a/main.lsf +++ b/main.lsf @@ -1009,7 +1009,7 @@ Overlay overlay12 Object src/overlay012/ov12_02237E54.o Object src/overlay012/ov12_02237EFC.o Object src/overlay012/ov12_022380BC.o - Object src/overlay012/ov12_022384F0.o + Object src/overlay012/is_form_symmetrical.o } Overlay overlay13 diff --git a/src/overlay005/ov5_021D1C30.c b/src/overlay005/ov5_021D1C30.c index 142c34fa03..7dde76e012 100644 --- a/src/overlay005/ov5_021D1C30.c +++ b/src/overlay005/ov5_021D1C30.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_0203A790_decl.h" #include "struct_decls/struct_020507E4_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_0203A55C.h" @@ -953,7 +953,7 @@ static BOOL ov5_021D2B2C (UnkStruct_0203CDB0 * param0) static void ov5_021D2B54 (UnkStruct_0203CDB0 * param0) { int v0, v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; Party * v3 = Party_GetFromSavedata(param0->unk_0C); u16 v4 = sub_0203A138(param0->unk_1C->unk_00); diff --git a/src/overlay005/ov5_021DDBE8.c b/src/overlay005/ov5_021DDBE8.c index f425645c14..04cee39b3d 100644 --- a/src/overlay005/ov5_021DDBE8.c +++ b/src/overlay005/ov5_021DDBE8.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_020203AC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay005/struct_ov5_021DE6BC_decl.h" #include "overlay005/struct_ov5_021DE79C_decl.h" #include "overlay005/struct_ov5_021DE928_decl.h" @@ -1402,8 +1402,8 @@ u32 ov5_021DEEC8 (const UnkStruct_ov6_02240D5C * param0) int v0; int v1; int v2; - UnkStruct_02073C74 * v3; - UnkStruct_02073C74 * v4; + Pokemon * v3; + Pokemon * v4; int v5, v6; if (param0->unk_00 & 0x1) { @@ -1417,8 +1417,8 @@ u32 ov5_021DEEC8 (const UnkStruct_ov6_02240D5C * param0) v3 = sub_02054A40(param0->unk_04[0]); v4 = sub_02054A40(param0->unk_04[1]); - v5 = sub_02074470(v3, 161, NULL); - v6 = sub_02074470(v4, 161, NULL); + v5 = GetMonData(v3, MON_DATA_161, NULL); + v6 = GetMonData(v4, MON_DATA_161, NULL); v0 = v6 - v5; switch (param0->unk_12C) { diff --git a/src/overlay005/ov5_021DFB54.c b/src/overlay005/ov5_021DFB54.c index b5a460c1d0..e91e88c9a6 100644 --- a/src/overlay005/ov5_021DFB54.c +++ b/src/overlay005/ov5_021DFB54.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay005/struct_ov5_021D1BEC_decl.h" #include "overlay009/struct_ov9_0224F6EC_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" @@ -49,7 +49,7 @@ typedef struct { u32 unk_00; int unk_04; - UnkStruct_02073C74 * unk_08; + Pokemon * unk_08; UnkStruct_0201CD38 * unk_0C; } UnkStruct_ov5_021E1050; @@ -157,7 +157,7 @@ static BOOL ov5_021E09D4(UnkStruct_020508D4 * param0); static UnkStruct_0201CD38 * ov5_021E0F54(UnkStruct_0203CDB0 * param0, u32 param1); static void ov5_021E0FC0(UnkStruct_0201CD38 * param0); static void ov5_021E0FF0(UnkStruct_0201CD38 * param0, void * param1); -static void ov5_021E1028(UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1, UnkStruct_ov5_021E1050 * param2); +static void ov5_021E1028(UnkStruct_0203CDB0 * param0, Pokemon * param1, UnkStruct_ov5_021E1050 * param2); static void ov5_021E103C(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021E1050 * param1); static int ov5_021E1050(UnkStruct_ov5_021E1050 * param0); static void ov5_021E106C(UnkStruct_0205E884 * param0, int param1); @@ -165,7 +165,7 @@ static void ov5_021E10C0(void * param0, const UnkStruct_020216E0 * param1); static UnkStruct_02061AB4 * ov5_021E10D4(UnkStruct_0205E884 * param0, int param1); static void * ov5_021E1110(int param0); static void ov5_021E1134(void * param0); -static UnkStruct_02073C74 * ov5_021E1140(UnkStruct_0203CDB0 * param0, int param1); +static Pokemon * ov5_021E1140(UnkStruct_0203CDB0 * param0, int param1); static void ov5_021E0DE0(UnkStruct_0203CDB0 * param0); static BOOL ov5_021E0E10(UnkStruct_020508D4 * param0); @@ -596,7 +596,7 @@ void ov5_021E00EC (UnkStruct_020508D4 * param0, int param1, int param2) { UnkStruct_ov5_021E1050 v0; UnkStruct_0203CDB0 * v1 = sub_02050A60(param0); - UnkStruct_02073C74 * v2 = ov5_021E1140(v1, param2); + Pokemon * v2 = ov5_021E1140(v1, param2); ov5_021E1028(v1, v2, &v0); ov5_021E00B0(v1, param1, &v0); @@ -982,7 +982,7 @@ void ov5_021E0734 (UnkStruct_020508D4 * param0, int param1, int param2) { UnkStruct_ov5_021E1050 v0; UnkStruct_0203CDB0 * v1 = sub_02050A60(param0); - UnkStruct_02073C74 * v2 = ov5_021E1140(v1, param2); + Pokemon * v2 = ov5_021E1140(v1, param2); ov5_021E1028(v1, v2, &v0); ov5_021E06F8(v1, param1, &v0); @@ -1168,7 +1168,7 @@ void ov5_021E0998 (UnkStruct_020508D4 * param0, int param1, int param2) { UnkStruct_ov5_021E1050 v0; UnkStruct_0203CDB0 * v1 = sub_02050A60(param0); - UnkStruct_02073C74 * v2 = ov5_021E1140(v1, param2); + Pokemon * v2 = ov5_021E1140(v1, param2); ov5_021E1028(v1, v2, &v0); @@ -1703,7 +1703,7 @@ void ov5_021E1020 (UnkStruct_0201CD38 * param0) ov5_021E0FC0(param0); } -static void ov5_021E1028 (UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1, UnkStruct_ov5_021E1050 * param2) +static void ov5_021E1028 (UnkStruct_0203CDB0 * param0, Pokemon * param1, UnkStruct_ov5_021E1050 * param2) { param2->unk_00 = 1; param2->unk_08 = param1; @@ -1780,8 +1780,8 @@ static void ov5_021E1134 (void * param0) Heap_FreeToHeapExplicit(4, param0); } -static UnkStruct_02073C74 * ov5_021E1140 (UnkStruct_0203CDB0 * param0, int param1) +static Pokemon * ov5_021E1140 (UnkStruct_0203CDB0 * param0, int param1) { - UnkStruct_02073C74 * v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_0C), param1); + Pokemon * v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_0C), param1); return v0; } diff --git a/src/overlay005/ov5_021E622C.c b/src/overlay005/ov5_021E622C.c index ea286d463a..93f3e4a441 100644 --- a/src/overlay005/ov5_021E622C.c +++ b/src/overlay005/ov5_021E622C.c @@ -9,8 +9,8 @@ #include "struct_decls/struct_02026310_decl.h" #include "struct_decls/struct_0202CC84_decl.h" #include "struct_decls/struct_0202CD88_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" @@ -1956,11 +1956,11 @@ typedef struct { u16 unk_94[16]; } UnkStruct_ov5_021E6948; -void ov5_021E6DE8(UnkStruct_02073C74 * param0, u16 param1, UnkStruct_02026310 * param2, u32 param3, u8 param4); +void ov5_021E6DE8(Pokemon * param0, u16 param1, UnkStruct_02026310 * param2, u32 param3, u8 param4); void sub_020262C0(UnkStruct_02026224 * param0); static u8 ov5_021E70FC(UnkStruct_02026310 * param0); static int ov5_021E6F6C(Party * param0); -static u8 ov5_021E6FF0(UnkStruct_02073C74_sub1 ** param0); +static u8 ov5_021E6FF0(BoxPokemon ** param0); void ov5_021E6B40(UnkStruct_02026310 * param0); int ov5_021E6630(UnkStruct_02026310 * param0, u8 param1, UnkStruct_0200B358 * param2); u8 ov5_021E6640(UnkStruct_02026310 * param0, int param1, UnkStruct_0200B358 * param2); @@ -1970,7 +1970,7 @@ void ov5_021E72BC(UnkStruct_02026310 * param0, UnkStruct_0200B358 * param1); static void ov5_021E62C4(Party * param0, int param1, UnkStruct_02026218 * param2, UnkStruct_021C0794 * param3); static int ov5_021E7110(UnkStruct_0203CDB0 * param0); -static UnkStruct_02073C74_sub1 * ov5_021E622C (UnkStruct_02026310 * param0, int param1) +static BoxPokemon * ov5_021E622C (UnkStruct_02026310 * param0, int param1) { return sub_02026220(sub_02026218(param0, param1)); } @@ -1980,14 +1980,14 @@ static UnkStruct_02026310 * Unk_ov5_02202124; u8 ov5_021E6238 (UnkStruct_02026310 * param0) { u8 v0, v1; - UnkStruct_02073C74_sub1 * v2; + BoxPokemon * v2; v0 = 0; for (v1 = 0; v1 < 2; v1++) { v2 = sub_02026220(sub_02026218(param0, v1)); - if (sub_02074570(v2, 5, NULL) != 0) { + if (sub_02074570(v2, MON_DATA_SPECIES, NULL) != 0) { v0++; } } @@ -1998,14 +1998,14 @@ u8 ov5_021E6238 (UnkStruct_02026310 * param0) int ov5_021E6270 (UnkStruct_02026310 * param0) { u8 v0; - UnkStruct_02073C74_sub1 * v1; + BoxPokemon * v1; Unk_ov5_02202124 = param0; for (v0 = 0; v0 < 2; v0++) { v1 = sub_02026220(sub_02026218(param0, v0)); - if (sub_02074570(v1, 5, NULL) == 0) { + if (sub_02074570(v1, MON_DATA_SPECIES, NULL) == 0) { return v0; } } @@ -2013,31 +2013,31 @@ int ov5_021E6270 (UnkStruct_02026310 * param0) return -1; } -static int ov5_021E62B0 (UnkStruct_02073C74_sub1 * param0) +static int ov5_021E62B0 (BoxPokemon * param0) { - int v0 = sub_02074570(param0, 6, NULL); + int v0 = sub_02074570(param0, MON_DATA_HELD_ITEM, NULL); return Item_IsMail(v0); } static void ov5_021E62C4 (Party * param0, int param1, UnkStruct_02026218 * param2, UnkStruct_021C0794 * param3) { int v0; - UnkStruct_02073C74 * v1 = Party_GetPokemonBySlotIndex(param0, param1); + Pokemon * v1 = Party_GetPokemonBySlotIndex(param0, param1); const u16 * v2; u16 v3[10 + 1]; UnkStruct_02026224 * v4 = sub_02026224(param2); - UnkStruct_02073C74_sub1 * v5 = sub_02026220(param2); + BoxPokemon * v5 = sub_02026220(param2); UnkStruct_02025E6C * v6 = sub_02025E38(param3); v2 = sub_02025EF0(v6); - sub_02074470(v1, 117, v3); + GetMonData(v1, MON_DATA_117, v3); if (ov5_021E62B0(sub_02076B10(v1))) { - sub_02074470(v1, 170, sub_02026230(v4)); + GetMonData(v1, MON_DATA_170, sub_02026230(v4)); } sub_02077618(v1, v5); - sub_02077ADC(v5, 0); + SetBoxShayminForm(v5, 0); sub_02026258(param2, 0); Party_RemovePokemonBySlotIndex(param0, param1); @@ -2060,22 +2060,22 @@ void ov5_021E6358 (Party * param0, int param1, UnkStruct_02026310 * param2, UnkS static void ov5_021E638C (UnkStruct_02026310 * param0) { UnkStruct_02026218 * v0, * v1; - UnkStruct_02073C74_sub1 * v2, * v3; + BoxPokemon * v2, * v3; v0 = sub_02026218(param0, 0); v1 = sub_02026218(param0, 1); v2 = sub_02026220(v0); v3 = sub_02026220(v1); - if (sub_02074570(v2, 5, NULL) == 0) { - if (sub_02074570(v3, 5, NULL) != 0) { + if (sub_02074570(v2, MON_DATA_SPECIES, NULL) == 0) { + if (sub_02074570(v3, MON_DATA_SPECIES, NULL) != 0) { sub_020262A8(v0, v1); sub_020262F4(v1); } } } -static void ov5_021E63E0 (UnkStruct_02073C74 * param0) +static void ov5_021E63E0 (Pokemon * param0) { int v0, v1 = 0, v2; u16 v3; @@ -2100,18 +2100,18 @@ static void ov5_021E63E0 (UnkStruct_02073C74 * param0) static int ov5_021E6444 (Party * param0, UnkStruct_02026218 * param1, UnkStruct_0200B358 * param2) { - UnkStruct_02073C74 * v0 = sub_02073C74(4); - UnkStruct_02073C74_sub1 * v1 = sub_02026220(param1); + Pokemon * v0 = AllocMonZeroed(4); + BoxPokemon * v1 = sub_02026220(param1); UnkStruct_02026224 * v2 = sub_02026224(param1); u32 v3; u16 v4; sub_0200B5CC(param2, 0, v1); - v4 = sub_02074570(v1, 5, NULL); + v4 = sub_02074570(v1, MON_DATA_SPECIES, NULL); sub_020774C8(v1, v0); - if (sub_02074470(v0, 161, NULL) != 100) { - v3 = sub_02074470(v0, 8, NULL); + if (GetMonData(v0, MON_DATA_161, NULL) != 100) { + v3 = GetMonData(v0, MON_DATA_EXP, NULL); v3 += sub_02026228(param1); sub_02074B30(v0, 8, (u8 *)&v3); ov5_021E63E0(v0); @@ -2122,7 +2122,7 @@ static int ov5_021E6444 (Party * param0, UnkStruct_02026218 * param1, UnkStruct_ } Party_AddPokemon(param0, v0); - sub_02073C54(v1); + ZeroBoxMonData(v1); sub_02026258(param1, 0); Heap_FreeToHeap(v0); @@ -2140,19 +2140,19 @@ u16 ov5_021E64F8 (Party * param0, UnkStruct_0200B358 * param1, UnkStruct_0202631 return v0; } -int ov5_021E6520 (UnkStruct_02073C74_sub1 * param0, u32 param1) +int ov5_021E6520 (BoxPokemon * param0, u32 param1) { - UnkStruct_02073C74 * v0 = sub_02073C74(4); - UnkStruct_02073C74_sub1 * v1 = sub_02076B10(v0); + Pokemon * v0 = AllocMonZeroed(4); + BoxPokemon * v1 = sub_02076B10(v0); int v2; u32 v3; sub_02077604(param0, v1); - v3 = sub_02074570(v1, 8, NULL); + v3 = sub_02074570(v1, MON_DATA_EXP, NULL); v3 += param1; - sub_02074C60(v1, 8, (u8 *)&v3); + SetBoxMonData(v1, 8, (u8 *)&v3); v2 = sub_02075B40(v1); Heap_FreeToHeap(v0); @@ -2162,7 +2162,7 @@ int ov5_021E6520 (UnkStruct_02073C74_sub1 * param0, u32 param1) int ov5_021E6568 (UnkStruct_02026218 * param0) { u8 v0, v1; - UnkStruct_02073C74_sub1 * v2; + BoxPokemon * v2; v2 = sub_02026220(param0); v0 = sub_02075B40(v2); @@ -2174,7 +2174,7 @@ int ov5_021E6568 (UnkStruct_02026218 * param0) int ov5_021E6590 (UnkStruct_02026218 * param0) { u8 v0; - UnkStruct_02073C74_sub1 * v1; + BoxPokemon * v1; v1 = sub_02026220(param0); v0 = ov5_021E6520(v1, sub_02026228(param0)); @@ -2187,7 +2187,7 @@ u8 ov5_021E65B0 (UnkStruct_02026218 * param0, UnkStruct_0200B358 * param1) int v0; UnkStruct_02023790 * v1; u16 v2[10 + 1]; - UnkStruct_02073C74_sub1 * v3 = sub_02026220(param0); + BoxPokemon * v3 = sub_02026220(param0); v0 = ov5_021E6568(param0); @@ -2200,7 +2200,7 @@ u8 ov5_021E65B0 (UnkStruct_02026218 * param0, UnkStruct_0200B358 * param1) int ov5_021E65EC (UnkStruct_02026218 * param0, UnkStruct_0200B358 * param1) { u16 v0; - UnkStruct_02073C74_sub1 * v1 = sub_02026220(param0); + BoxPokemon * v1 = sub_02026220(param0); v0 = ov5_021E6568(param0); sub_0200B5CC(param1, 0, v1); @@ -2222,16 +2222,16 @@ int ov5_021E6630 (UnkStruct_02026310 * param0, u8 param1, UnkStruct_0200B358 * p u8 ov5_021E6640 (UnkStruct_02026310 * param0, int param1, UnkStruct_0200B358 * param2) { UnkStruct_02026218 * v0 = sub_02026218(param0, param1); - UnkStruct_02073C74_sub1 * v1 = sub_02026220(v0); + BoxPokemon * v1 = sub_02026220(v0); - if (sub_02074570(v1, 5, NULL)) { + if (sub_02074570(v1, MON_DATA_SPECIES, NULL)) { return ov5_021E65B0(v0, param2); } return 0; } -static void ov5_021E6668 (UnkStruct_02026310 * param0, UnkStruct_02073C74_sub1 * param1[]) +static void ov5_021E6668 (UnkStruct_02026310 * param0, BoxPokemon * param1[]) { param1[0] = ov5_021E622C(param0, 0); param1[1] = ov5_021E622C(param0, 1); @@ -2241,7 +2241,7 @@ static int ov5_021E6684 (UnkStruct_02026310 * param0) { int v0; int v1[2], v2 = -1, v3; - UnkStruct_02073C74_sub1 * v4[2]; + BoxPokemon * v4[2]; ov5_021E6668(param0, v4); @@ -2252,7 +2252,7 @@ static int ov5_021E6684 (UnkStruct_02026310 * param0) } for (v3 = 0, v0 = 0; v0 < 2; v0++) { - if ((v1[v0] = sub_02074570(v4[v0], 5, NULL)) == 132) { + if ((v1[v0] = sub_02074570(v4[v0], MON_DATA_SPECIES, NULL)) == 132) { v3++; v2 = v0; } @@ -2266,7 +2266,7 @@ static int ov5_021E6684 (UnkStruct_02026310 * param0) } } - if (sub_02074570(v4[v2], 6, NULL) == 229) { + if (sub_02074570(v4[v2], MON_DATA_HELD_ITEM, NULL) == 229) { if (sub_0201D2E8() >= (0xffff / 2)) { return -1; } @@ -2286,15 +2286,15 @@ void ov5_021E6720 (UnkStruct_02026310 * param0) if ((v2 = ov5_021E6684(param0)) < 0) { sub_02026270(param0, sub_0201D35C()); } else { - UnkStruct_02073C74_sub1 * v5 = ov5_021E622C(param0, v2); + BoxPokemon * v5 = ov5_021E622C(param0, v2); - v0 = sub_02074570(v5, 0, NULL); - v3 = sub_02075BFC(v0); + v0 = sub_02074570(v5, MON_DATA_PERSONALITY, NULL); + v3 = GetNatureFromPersonality(v0); while (TRUE) { v1 = sub_0201D35C(); - if ((v3 == sub_02075BFC(v1)) && (v1 != 0)) { + if ((v3 == GetNatureFromPersonality(v1)) && (v1 != 0)) { break; } @@ -2327,7 +2327,7 @@ static void ov5_021E6778 (u8 * param0, u8 param1) } } -static void ov5_021E67B0 (UnkStruct_02073C74 * param0, UnkStruct_02026310 * param1) +static void ov5_021E67B0 (Pokemon * param0, UnkStruct_02026310 * param1) { u8 v0[3], v1, v2[6], v3[3], v4; @@ -2345,44 +2345,44 @@ static void ov5_021E67B0 (UnkStruct_02073C74 * param0, UnkStruct_02026310 * para } for (v1 = 0; v1 < 3; v1++) { - UnkStruct_02073C74_sub1 * v5 = ov5_021E622C(param1, v3[v1]); + BoxPokemon * v5 = ov5_021E622C(param1, v3[v1]); switch (v0[v1]) { case 0: - v4 = sub_02074570(v5, 70, NULL); + v4 = sub_02074570(v5, MON_DATA_HP_IV, NULL); sub_02074B30(param0, 70, (u8 *)&v4); break; case 1: - v4 = sub_02074570(v5, 71, NULL); + v4 = sub_02074570(v5, MON_DATA_ATK_IV, NULL); sub_02074B30(param0, 71, (u8 *)&v4); break; case 2: - v4 = sub_02074570(v5, 72, NULL); + v4 = sub_02074570(v5, MON_DATA_DEF_IV, NULL); sub_02074B30(param0, 72, (u8 *)&v4); break; case 3: - v4 = sub_02074570(v5, 73, NULL); + v4 = sub_02074570(v5, MON_DATA_SPEED_IV, NULL); sub_02074B30(param0, 73, (u8 *)&v4); break; case 4: - v4 = sub_02074570(v5, 74, NULL); + v4 = sub_02074570(v5, MON_DATA_SPATK_IV, NULL); sub_02074B30(param0, 74, (u8 *)&v4); break; case 5: - v4 = sub_02074570(v5, 75, NULL); + v4 = sub_02074570(v5, MON_DATA_SPDEF_IV, NULL); sub_02074B30(param0, 75, (u8 *)&v4); break; } } } -static u8 ov5_021E68D8 (UnkStruct_02073C74 * param0, u16 * param1) +static u8 ov5_021E68D8 (Pokemon * param0, u16 * param1) { u16 v0, v1, v2, v3; v2 = 0; v1 = 0; - v0 = sub_02074470(param0, 5, NULL); + v0 = GetMonData(param0, MON_DATA_SPECIES, NULL); for (v3 = 0; v3 < 1909; v3++) { if (Unk_ov5_021F9FA2[v3] == (20000 + v0)) { @@ -2403,7 +2403,7 @@ static u8 ov5_021E68D8 (UnkStruct_02073C74 * param0, u16 * param1) return v2; } -static void ov5_021E6948 (UnkStruct_02073C74 * param0, UnkStruct_02073C74_sub1 * param1, UnkStruct_02073C74_sub1 * param2) +static void ov5_021E6948 (Pokemon * param0, BoxPokemon * param1, BoxPokemon * param2) { u16 v0, v1, v2, v3, v4, v5, v6; UnkStruct_ov5_021E6948 * v7 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E6948)); @@ -2412,8 +2412,8 @@ static void ov5_021E6948 (UnkStruct_02073C74 * param0, UnkStruct_02073C74_sub1 * MI_CpuClearFast(v7, sizeof(UnkStruct_ov5_021E6948)); - v3 = sub_02074470(param0, 5, NULL); - v6 = sub_02074470(param0, 112, NULL); + v3 = GetMonData(param0, MON_DATA_SPECIES, NULL); + v6 = GetMonData(param0, MON_DATA_FORM, NULL); v4 = sub_02077660(v3, v6, v7->unk_30); for (v0 = 0; v0 < 4; v0++) { @@ -2505,7 +2505,7 @@ static const u16 Unk_ov5_021F9F6C[9][3] = { static u16 ov5_021E6B54 (u16 param0, UnkStruct_02026310 * param1) { u16 v0, v1, v2, v3; - UnkStruct_02073C74_sub1 * v4[2]; + BoxPokemon * v4[2]; ov5_021E6668(param1, v4); @@ -2520,8 +2520,8 @@ static u16 ov5_021E6B54 (u16 param0, UnkStruct_02026310 * param1) return param0; } - v0 = sub_02074570(v4[0], 6, NULL); - v1 = sub_02074570(v4[1], 6, NULL); + v0 = sub_02074570(v4[0], MON_DATA_HELD_ITEM, NULL); + v1 = sub_02074570(v4[1], MON_DATA_HELD_ITEM, NULL); if ((v0 != Unk_ov5_021F9F6C[v2][1]) && (v1 != Unk_ov5_021F9F6C[v2][1])) { param0 = Unk_ov5_021F9F6C[v2][2]; @@ -2530,15 +2530,15 @@ static u16 ov5_021E6B54 (u16 param0, UnkStruct_02026310 * param1) return param0; } -static void ov5_021E6BD0 (UnkStruct_02073C74 * param0, UnkStruct_02026310 * param1) +static void ov5_021E6BD0 (Pokemon * param0, UnkStruct_02026310 * param1) { int v0, v1; - UnkStruct_02073C74_sub1 * v2[2]; + BoxPokemon * v2[2]; ov5_021E6668(param1, v2); - v0 = sub_02074570(v2[0], 6, NULL); - v1 = sub_02074570(v2[1], 6, NULL); + v0 = sub_02074570(v2[0], MON_DATA_HELD_ITEM, NULL); + v1 = sub_02074570(v2[1], MON_DATA_HELD_ITEM, NULL); if ((v0 == 236) || (v1 == 236)) { if (sub_020770C4(param0, 344) == 0xffff) { @@ -2550,14 +2550,14 @@ static void ov5_021E6BD0 (UnkStruct_02073C74 * param0, UnkStruct_02026310 * para static u16 ov5_021E6C20 (UnkStruct_02026310 * param0, u8 param1[]) { u16 v0[2], v1, v2, v3, v4, v5; - UnkStruct_02073C74_sub1 * v6[2]; + BoxPokemon * v6[2]; ov5_021E6668(param0, v6); v2 = 0; for (v1 = 0; v1 < 2; v1++) { - if ((v0[v1] = sub_02074570(v6[v1], 5, NULL)) == 132) { + if ((v0[v1] = sub_02074570(v6[v1], MON_DATA_SPECIES, NULL)) == 132) { param1[0] = v1 ^ 1; param1[1] = v1; } else if (sub_02075D74(v6[v1]) == 1) { @@ -2598,7 +2598,7 @@ static u16 ov5_021E6C20 (UnkStruct_02026310 * param0, u8 param1[]) return v4; } -void ov5_021E6CF0 (UnkStruct_02073C74 * param0, u16 param1, u8 param2, UnkStruct_02025E6C * param3, int param4, int param5) +void ov5_021E6CF0 (Pokemon * param0, u16 param1, u8 param2, UnkStruct_02025E6C * param3, int param4, int param5) { u8 v0, v1, v2; u16 v3; @@ -2639,7 +2639,7 @@ void ov5_021E6CF0 (UnkStruct_02073C74 * param0, u16 param1, u8 param2, UnkStruct sub_0209304C(param0, param3, param4, param5, 0); } -void ov5_021E6DE8 (UnkStruct_02073C74 * param0, u16 param1, UnkStruct_02026310 * param2, u32 param3, u8 param4) +void ov5_021E6DE8 (Pokemon * param0, u16 param1, UnkStruct_02026310 * param2, u32 param3, u8 param4) { u8 v0; u16 v1; @@ -2685,15 +2685,15 @@ void ov5_021E6EA8 (UnkStruct_02026310 * param0, Party * param1, UnkStruct_02025E { u16 v0; u8 v1[2], v2; - UnkStruct_02073C74 * v3 = sub_02073C74(4); + Pokemon * v3 = AllocMonZeroed(4); v0 = ov5_021E6C20(param0, v1); v0 = ov5_021E6B54(v0, param0); { u32 v4 = sub_02025F20(param2); - UnkStruct_02073C74_sub1 * v5 = ov5_021E622C(param0, v1[0]); - u8 v6 = sub_02074570(v5, 112, NULL); + BoxPokemon * v5 = ov5_021E622C(param0, v1[0]); + u8 v6 = sub_02074570(v5, MON_DATA_FORM, NULL); ov5_021E6DE8(v3, v0, param0, v4, v6); } @@ -2724,8 +2724,8 @@ static int ov5_021E6F6C (Party * param0) v2 = Party_GetCurrentCount(param0); for (v0 = 0; v0 < v2; v0++) { - if (sub_02074470(Party_GetPokemonBySlotIndex(param0, v0), 173, NULL) == 0) { - v1 = sub_02074470(Party_GetPokemonBySlotIndex(param0, v0), 10, NULL); + if (GetMonData(Party_GetPokemonBySlotIndex(param0, v0), MON_DATA_173, NULL) == 0) { + v1 = GetMonData(Party_GetPokemonBySlotIndex(param0, v0), MON_DATA_10, NULL); if ((v1 == 40) || (v1 == 49)) { return 2; @@ -2751,15 +2751,15 @@ static u8 ov5_021E6FC0 (u16 * param0, u16 * param1) return 0; } -static u8 ov5_021E6FF0 (UnkStruct_02073C74_sub1 ** param0) +static u8 ov5_021E6FF0 (BoxPokemon ** param0) { u16 v0[2][2], v1[2]; u32 v2[2], v3[2], v4, v5; for (v5 = 0; v5 < 2; v5++) { - v1[v5] = sub_02074570(param0[v5], 5, NULL); - v2[v5] = sub_02074570(param0[v5], 7, NULL); - v4 = sub_02074570(param0[v5], 0, NULL); + v1[v5] = sub_02074570(param0[v5], MON_DATA_SPECIES, NULL); + v2[v5] = sub_02074570(param0[v5], MON_DATA_OT_ID, NULL); + v4 = sub_02074570(param0[v5], MON_DATA_PERSONALITY, NULL); v3[v5] = sub_02075DAC(v1[v5], v4); v0[v5][0] = sub_020759F0(v1[v5], 22); v0[v5][1] = sub_020759F0(v1[v5], 23); @@ -2812,7 +2812,7 @@ static u8 ov5_021E6FF0 (UnkStruct_02073C74_sub1 ** param0) static u8 ov5_021E70FC (UnkStruct_02026310 * param0) { - UnkStruct_02073C74_sub1 * v0[2]; + BoxPokemon * v0[2]; ov5_021E6668(param0, v0); return ov5_021E6FF0(v0); @@ -2856,14 +2856,14 @@ BOOL ov5_021E7154 (UnkStruct_02026310 * param0, Party * param1, UnkStruct_0203CD u32 v0, v1, v2, v3, v4; u32 v5 = 0, v6; int v7; - UnkStruct_02073C74_sub1 * v8[2]; + BoxPokemon * v8[2]; ov5_021E6668(param0, v8); v2 = 0; for (v0 = 0; v0 < 2; v0++) { - if (sub_02074570(v8[v0], 172, NULL) != 0) { + if (sub_02074570(v8[v0], MON_DATA_172, NULL) != 0) { sub_02026260(sub_02026218(param0, v0), 1); v2++; } @@ -2889,14 +2889,14 @@ BOOL ov5_021E7154 (UnkStruct_02026310 * param0, Party * param1, UnkStruct_0203CD v7 = ov5_021E6F6C(param1); for (v0 = 0; v0 < Party_GetCurrentCount(param1); v0++) { - UnkStruct_02073C74 * v9 = Party_GetPokemonBySlotIndex(param1, v0); + Pokemon * v9 = Party_GetPokemonBySlotIndex(param1, v0); - if (sub_02074470(v9, 76, NULL)) { - if (sub_02074470(v9, 3, NULL)) { + if (GetMonData(v9, MON_DATA_IS_EGG, NULL)) { + if (GetMonData(v9, MON_DATA_3, NULL)) { continue; } - v1 = sub_02074470(v9, 9, NULL); + v1 = GetMonData(v9, MON_DATA_FRIENDSHIP, NULL); if (v1 != 0) { if (v1 >= v7) { @@ -2916,17 +2916,17 @@ BOOL ov5_021E7154 (UnkStruct_02026310 * param0, Party * param1, UnkStruct_0203CD return 0; } -UnkStruct_02073C74 * ov5_021E7278 (Party * param0) +Pokemon * ov5_021E7278 (Party * param0) { int v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; int v2 = Party_GetCurrentCount(param0); for (v0 = 0; v0 < v2; v0++) { v1 = Party_GetPokemonBySlotIndex(param0, v0); - if (sub_02074470(v1, 76, NULL) - && (sub_02074470(v1, 9, NULL) == 0)) { + if (GetMonData(v1, MON_DATA_IS_EGG, NULL) + && (GetMonData(v1, MON_DATA_FRIENDSHIP, NULL) == 0)) { return v1; } } @@ -2936,17 +2936,17 @@ UnkStruct_02073C74 * ov5_021E7278 (Party * param0) void ov5_021E72BC (UnkStruct_02026310 * param0, UnkStruct_0200B358 * param1) { - UnkStruct_02073C74_sub1 * v0[2]; + BoxPokemon * v0[2]; u16 v1[10 + 1]; ov5_021E6668(param0, v0); - if (sub_02074570(v0[0], 5, NULL) != 0) { + if (sub_02074570(v0[0], MON_DATA_SPECIES, NULL) != 0) { sub_0200B5CC(param1, 0, v0[0]); sub_0200B5EC(param1, 2, v0[0]); } - if (sub_02074570(v0[1], 5, NULL) != 0) { + if (sub_02074570(v0[1], MON_DATA_SPECIES, NULL) != 0) { sub_0200B5CC(param1, 1, v0[1]); } } @@ -2954,7 +2954,7 @@ void ov5_021E72BC (UnkStruct_02026310 * param0, UnkStruct_0200B358 * param1) void ov5_021E7308 (UnkStruct_02026310 * param0, u32 param1, u32 param2, u32 param3, u8 param4, UnkStruct_0200B358 * param5) { UnkStruct_02026218 * v0; - UnkStruct_02073C74_sub1 * v1; + BoxPokemon * v1; u8 v2, v3; u16 v4; @@ -2965,12 +2965,12 @@ void ov5_021E7308 (UnkStruct_02026310 * param0, u32 param1, u32 param2, u32 para v2 = ov5_021E6520(v1, sub_02026228(v0)); sub_0200B60C(param5, param2, v2, 3, 0, 1); - v3 = sub_02074570(v1, 111, NULL); + v3 = sub_02074570(v1, MON_DATA_111, NULL); if (v3 != 2) { - v4 = sub_02074570(v1, 5, NULL); + v4 = sub_02074570(v1, MON_DATA_SPECIES, NULL); - if (((v4 == 29) || (v4 == 32)) && (sub_02074570(v1, 77, NULL) == 0)) { + if (((v4 == 29) || (v4 == 32)) && (sub_02074570(v1, MON_DATA_77, NULL) == 0)) { v3 = 2; } } @@ -2980,10 +2980,10 @@ void ov5_021E7308 (UnkStruct_02026310 * param0, u32 param1, u32 param2, u32 para u16 ov5_021E73A0 (Party * param0, int param1, UnkStruct_0200B358 * param2) { - UnkStruct_02073C74 * v0 = Party_GetPokemonBySlotIndex(param0, param1); + Pokemon * v0 = Party_GetPokemonBySlotIndex(param0, param1); sub_0200B5CC(param2, 0, sub_02076B10(v0)); - return sub_02074470(v0, 5, NULL); + return GetMonData(v0, MON_DATA_SPECIES, NULL); } u8 ov5_021E73C8 (UnkStruct_02026310 * param0) @@ -3027,7 +3027,7 @@ extern u32 ov5_021E7420 (UnkStruct_02026310 * param0) return v1; } -static void ov5_021E742C (UnkStruct_02073C74 * param0, int param1) +static void ov5_021E742C (Pokemon * param0, int param1) { u16 v0; u16 v1[4]; @@ -3036,35 +3036,35 @@ static void ov5_021E742C (UnkStruct_02073C74 * param0, int param1) u8 v5[6], v6; u8 v7, v8, v9, v10, v11, v12, v13, v14; UnkStruct_02023790 * v15 = sub_02023790(7 + 1, param1); - UnkStruct_02073C74 * v16 = sub_02073C74(param1); + Pokemon * v16 = AllocMonZeroed(param1); - v0 = sub_02074470(param0, 5, NULL); + v0 = GetMonData(param0, MON_DATA_SPECIES, NULL); for (v7 = 0; v7 < 4; v7++) { - v1[v7] = sub_02074470(param0, 54 + v7, NULL); - v2[v7] = sub_02074470(param0, 58 + v7, NULL); + v1[v7] = GetMonData(param0, MON_DATA_MOVE1 + v7, NULL); + v2[v7] = GetMonData(param0, MON_DATA_58 + v7, NULL); } - v3 = sub_02074470(param0, 0, NULL); + v3 = GetMonData(param0, MON_DATA_PERSONALITY, NULL); for (v7 = 0; v7 < 6; v7++) { - v5[v7] = sub_02074470(param0, 70 + v7, NULL); + v5[v7] = GetMonData(param0, MON_DATA_HP_IV + v7, NULL); } - v8 = sub_02074470(param0, 12, NULL); - v9 = sub_02074470(param0, 122, NULL); - v10 = sub_02074470(param0, 11, NULL); - v6 = sub_02074470(param0, 154, NULL); - v12 = sub_02074470(param0, 110, NULL); + v8 = GetMonData(param0, MON_DATA_LANGUAGE, NULL); + v9 = GetMonData(param0, MON_DATA_MET_GAME, NULL); + v10 = GetMonData(param0, MON_DATA_11, NULL); + v6 = GetMonData(param0, MON_DATA_POKERUS, NULL); + v12 = GetMonData(param0, MON_DATA_FATEFUL_ENCOUNTER, NULL); - sub_02074470(param0, 145, v15); + GetMonData(param0, MON_DATA_145, v15); - v14 = sub_02074470(param0, 157, NULL); - v4 = sub_02074470(param0, 7, NULL); - v13 = sub_02074470(param0, 112, NULL); + v14 = GetMonData(param0, MON_DATA_OT_GENDER, NULL); + v4 = GetMonData(param0, MON_DATA_OT_ID, NULL); + v13 = GetMonData(param0, MON_DATA_FORM, NULL); if (v0 == 490) { - int v17 = sub_02074470(param0, 152, NULL); + int v17 = GetMonData(param0, MON_DATA_152, NULL); if (v17 == sub_02017070(2, 1)) { while (sub_02075E38(v4, v3)) { @@ -3102,20 +3102,20 @@ static void ov5_021E742C (UnkStruct_02073C74 * param0, int param1) u16 v18; u8 v19, v20, v21; - v18 = sub_02074470(param0, 152, NULL); - v19 = sub_02074470(param0, 146, NULL); - v20 = sub_02074470(param0, 147, NULL); - v21 = sub_02074470(param0, 148, NULL); + v18 = GetMonData(param0, MON_DATA_152, NULL); + v19 = GetMonData(param0, MON_DATA_146, NULL); + v20 = GetMonData(param0, MON_DATA_147, NULL); + v21 = GetMonData(param0, MON_DATA_148, NULL); sub_02074B30(v16, 152, &v18); sub_02074B30(v16, 146, &v19); sub_02074B30(v16, 147, &v20); sub_02074B30(v16, 148, &v21); - v18 = sub_02074470(param0, 153, NULL); - v19 = sub_02074470(param0, 149, NULL); - v20 = sub_02074470(param0, 150, NULL); - v21 = sub_02074470(param0, 151, NULL); + v18 = GetMonData(param0, MON_DATA_153, NULL); + v19 = GetMonData(param0, MON_DATA_149, NULL); + v20 = GetMonData(param0, MON_DATA_150, NULL); + v21 = GetMonData(param0, MON_DATA_151, NULL); sub_02074B30(v16, 153, &v18); sub_02074B30(v16, 149, &v19); @@ -3128,7 +3128,7 @@ static void ov5_021E742C (UnkStruct_02073C74 * param0, int param1) Heap_FreeToHeap(v16); } -void ov5_021E771C (UnkStruct_02073C74 * param0, int param1) +void ov5_021E771C (Pokemon * param0, int param1) { u8 v0, v1; u8 v2, v3; @@ -3143,7 +3143,7 @@ void ov5_021E771C (UnkStruct_02073C74 * param0, int param1) ov5_021E742C(param0, param1); sub_02074B30(param0, 76, &v0); - v4 = sub_02074470(param0, 5, NULL); + v4 = GetMonData(param0, MON_DATA_SPECIES, NULL); sub_0200B274(v4, 0, v5); sub_02074B30(param0, 117, v5); @@ -3153,7 +3153,7 @@ void ov5_021E771C (UnkStruct_02073C74 * param0, int param1) sub_0207418C(param0); } -u32 ov5_021E7790 (UnkStruct_02073C74_sub1 ** param0) +u32 ov5_021E7790 (BoxPokemon ** param0) { return ov5_021E73F0(ov5_021E6FF0(param0)); } diff --git a/src/overlay005/ov5_021EE7D4.c b/src/overlay005/ov5_021EE7D4.c index b52ea763db..f15cda2ec7 100644 --- a/src/overlay005/ov5_021EE7D4.c +++ b/src/overlay005/ov5_021EE7D4.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_0200B358_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_02098700_decl.h" #include "struct_defs/struct_0203CDB0.h" @@ -43,20 +43,20 @@ static const UnkStruct_ov5_021FF508 Unk_ov5_021FF508[] = { {0x6A4, 0x1, 0xFFE6, 0x0} }; -static int ov5_021EE7D4 (UnkStruct_02073C74 * param0) +static int ov5_021EE7D4 (Pokemon * param0) { u16 v0; u16 v1, v2, v3; u16 v4, v5, v6; u16 v7, v8; - v0 = sub_02074470(param0, 0, NULL) & 0xffff; - v1 = sub_02074470(param0, 70, NULL) & 0xf; - v2 = sub_02074470(param0, 71, NULL) & 0xf; - v3 = sub_02074470(param0, 72, NULL) & 0xf; - v4 = sub_02074470(param0, 73, NULL) & 0xf; - v5 = sub_02074470(param0, 74, NULL) & 0xf; - v6 = sub_02074470(param0, 75, NULL) & 0xf; + v0 = GetMonData(param0, MON_DATA_PERSONALITY, NULL) & 0xffff; + v1 = GetMonData(param0, MON_DATA_HP_IV, NULL) & 0xf; + v2 = GetMonData(param0, MON_DATA_ATK_IV, NULL) & 0xf; + v3 = GetMonData(param0, MON_DATA_DEF_IV, NULL) & 0xf; + v4 = GetMonData(param0, MON_DATA_SPEED_IV, NULL) & 0xf; + v5 = GetMonData(param0, MON_DATA_SPATK_IV, NULL) & 0xf; + v6 = GetMonData(param0, MON_DATA_SPDEF_IV, NULL) & 0xf; v7 = ((v2 ^ v3) * v1) ^ (v0 & 0xff); v8 = ((v5 ^ v6) * v4) ^ (v0 >> 8); @@ -102,14 +102,14 @@ static u32 ov5_021EE8A8 (u16 param0, u16 param1) u8 ov5_021EE920 (UnkStruct_0203CDB0 * param0, u16 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; vu16 v1, v2; u16 v3; u32 v4; u32 v5; v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_0C), param1); - v3 = sub_02074470(v0, 5, NULL); + v3 = GetMonData(v0, MON_DATA_SPECIES, NULL); v1 = ov5_021EE7D4(v0); v4 = ov5_021EE8A8(v3, v1); v2 = sub_0206B0B4(sub_020507E4(param0->unk_0C)); @@ -134,7 +134,7 @@ u8 ov5_021EE920 (UnkStruct_0203CDB0 * param0, u16 param1) void ov5_021EE9BC (UnkStruct_0203CDB0 * param0, u16 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; vu16 v1; v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_0C), param1); @@ -169,12 +169,12 @@ void ov5_021EEA54 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 param3 void ov5_021EEA84 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 param3) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u16 v1; vu16 v2; v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_0C), param3); - v1 = sub_02074470(v0, 5, NULL); + v1 = GetMonData(v0, MON_DATA_SPECIES, NULL); v2 = ov5_021EE7D4(v0); ov5_021EE9E8(param0, param1, param2, v1, v2); diff --git a/src/overlay005/ov5_021F08CC.c b/src/overlay005/ov5_021F08CC.c index 2f87c88b2a..e5505a9eb8 100644 --- a/src/overlay005/ov5_021F08CC.c +++ b/src/overlay005/ov5_021F08CC.c @@ -11,7 +11,7 @@ #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay101/struct_ov101_021D5D90_decl.h" #include "struct_defs/struct_0203CDB0.h" @@ -120,7 +120,7 @@ BOOL ov5_021F08F8 (UnkStruct_020508D4 * param0) if (v2 == 1) { { - UnkStruct_02073C74 * v3 = Party_GetPokemonBySlotIndex(v1->unk_10->unk_04[1], 0); + Pokemon * v3 = Party_GetPokemonBySlotIndex(v1->unk_10->unk_04[1], 0); sub_0206D340(v0, 1, v1->unk_04, v3); } diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index 19b33f97d4..4a1e4bdb4b 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -18,7 +18,7 @@ #include "struct_decls/struct_020507E4_decl.h" #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "overlay005/struct_ov5_021F6704_decl.h" @@ -102,7 +102,7 @@ struct UnkStruct_ov5_021F6704_t { static u16 * ov5_021F65FC(int param0, int param1, int * param2); BOOL ov5_021F6454(UnkStruct_0203E724 * param0); static BOOL ov5_021F65D4(UnkStruct_0203E724 * param0); -static void ov5_021F70CC(UnkStruct_02073C74 * param0, int * param1, int * param2); +static void ov5_021F70CC(Pokemon * param0, int * param1, int * param2); BOOL ov5_021F71B8(UnkStruct_0203E724 * param0); BOOL ov5_021F7208(UnkStruct_0203E724 * param0); BOOL ov5_021F72B8(UnkStruct_0203E724 * param0); @@ -456,7 +456,7 @@ BOOL ov5_021F6B3C (UnkStruct_0203E724 * param0) { u8 v0; u32 v1[6]; - UnkStruct_02073C74 * v2; + Pokemon * v2; UnkStruct_0203CDB0 * v3 = param0->unk_34; u16 v4 = inline_02049538(param0); u16 * v5 = inline_0204FCAC(param0); @@ -465,12 +465,12 @@ BOOL ov5_021F6B3C (UnkStruct_0203E724 * param0) v2 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v3->unk_0C), v4); - v1[0] = sub_02074470(v2, 70, NULL); - v1[1] = sub_02074470(v2, 71, NULL); - v1[2] = sub_02074470(v2, 72, NULL); - v1[3] = sub_02074470(v2, 73, NULL); - v1[4] = sub_02074470(v2, 74, NULL); - v1[5] = sub_02074470(v2, 75, NULL); + v1[0] = GetMonData(v2, MON_DATA_HP_IV, NULL); + v1[1] = GetMonData(v2, MON_DATA_ATK_IV, NULL); + v1[2] = GetMonData(v2, MON_DATA_DEF_IV, NULL); + v1[3] = GetMonData(v2, MON_DATA_SPEED_IV, NULL); + v1[4] = GetMonData(v2, MON_DATA_SPATK_IV, NULL); + v1[5] = GetMonData(v2, MON_DATA_SPDEF_IV, NULL); *v5 = 0; @@ -499,7 +499,7 @@ BOOL ov5_021F6B3C (UnkStruct_0203E724 * param0) BOOL ov5_021F6C60 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; Party * v1; int v2, v3, v4; int v5, v6; @@ -515,7 +515,7 @@ BOOL ov5_021F6C60 (UnkStruct_0203E724 * param0) for (v3 = 0; v3 < v2; v3++) { v0 = Party_GetPokemonBySlotIndex(v1, v3); - v8[v3] = sub_02074470(v0, 6, NULL); + v8[v3] = GetMonData(v0, MON_DATA_HELD_ITEM, NULL); if (v8[v3] == 112) { v9++; @@ -542,20 +542,20 @@ BOOL ov5_021F6C60 (UnkStruct_0203E724 * param0) for (v3 = 0; v3 < v2; v3++) { v0 = Party_GetPokemonBySlotIndex(v1, v3); - v6 = sub_02074470(v0, 112, NULL); + v6 = GetMonData(v0, MON_DATA_FORM, NULL); if (v6 > 0) { - v5 = sub_02074470(v0, 5, NULL); + v5 = GetMonData(v0, MON_DATA_SPECIES, NULL); switch (v5) { case 487: sub_02077A00(v0); break; case 479: - sub_02077C20(v0, 0, 0); + SetRotomForm(v0, 0, 0); break; case 492: - sub_02077ACC(v0, 0); + SetShayminForm(v0, 0); break; } } @@ -566,7 +566,7 @@ BOOL ov5_021F6C60 (UnkStruct_0203E724 * param0) BOOL ov5_021F6D80 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; Party * v1; int v2, v3; u32 v4; @@ -585,7 +585,7 @@ BOOL ov5_021F6D80 (UnkStruct_0203E724 * param0) return 0; } - v5 = sub_02074470(v0, 6, NULL); + v5 = GetMonData(v0, MON_DATA_HELD_ITEM, NULL); if (v5 == 112) { v6 = sub_0207D570(sub_0207D990(v7->unk_0C), 112, 1, 4); @@ -599,20 +599,20 @@ BOOL ov5_021F6D80 (UnkStruct_0203E724 * param0) sub_02074B30(v0, 6, &v4); } - v3 = sub_02074470(v0, 112, NULL); + v3 = GetMonData(v0, MON_DATA_FORM, NULL); if (v3 > 0) { - v2 = sub_02074470(v0, 5, NULL); + v2 = GetMonData(v0, MON_DATA_SPECIES, NULL); switch (v2) { case 487: sub_02077A00(v0); break; case 479: - sub_02077C20(v0, 0, 0); + SetRotomForm(v0, 0, 0); break; case 492: - sub_02077ACC(v0, 0); + SetShayminForm(v0, 0); break; } } @@ -622,7 +622,7 @@ BOOL ov5_021F6D80 (UnkStruct_0203E724 * param0) BOOL ov5_021F6E50 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_0203CDB0 * v1 = param0->unk_34; u16 v2 = inline_02049538(param0); u16 v3 = inline_02049538(param0); @@ -637,7 +637,7 @@ BOOL ov5_021F6E9C (UnkStruct_0203E724 * param0) { u32 v0, v1, v2; int v3, v4, v5; - UnkStruct_02073C74 * v6; + Pokemon * v6; Party * v7; UnkStruct_0203CDB0 * v8 = param0->unk_34; u16 * v9 = inline_0204FCAC(param0); @@ -650,9 +650,9 @@ BOOL ov5_021F6E9C (UnkStruct_0203E724 * param0) for (v4 = 0; v4 < v3; v4++) { v6 = Party_GetPokemonBySlotIndex(v7, v4); - v0 = sub_02074470(v6, 5, NULL); - v1 = sub_02074470(v6, 112, NULL); - v2 = sub_02074470(v6, 76, NULL); + v0 = GetMonData(v6, MON_DATA_SPECIES, NULL); + v1 = GetMonData(v6, MON_DATA_FORM, NULL); + v2 = GetMonData(v6, MON_DATA_IS_EGG, NULL); if ((v0 == 479) && (v1 != 0) && (v2 == 0)) { if (*v10 == 0xff) { @@ -671,7 +671,7 @@ BOOL ov5_021F6F44 (UnkStruct_0203E724 * param0) { u32 v0, v1; u16 v2, v3; - UnkStruct_02073C74 * v4; + Pokemon * v4; Party * v5; UnkStruct_0203CDB0 * v6 = param0->unk_34; u16 v7 = inline_02049538(param0); @@ -682,7 +682,7 @@ BOOL ov5_021F6F44 (UnkStruct_0203E724 * param0) v5 = Party_GetFromSavedata(v6->unk_0C); v4 = Party_GetPokemonBySlotIndex(v5, v7); - sub_02077C20(v4, v10, v8); + SetRotomForm(v4, v10, v8); sub_0202736C(sub_02027560(v6->unk_0C), v4); return 0; @@ -692,15 +692,15 @@ BOOL ov5_021F6FC0 (UnkStruct_0203E724 * param0) { u16 v0; int v1, v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; UnkStruct_0203CDB0 * v4 = param0->unk_34; u16 v5 = inline_02049538(param0); u16 * v6 = inline_0204FCAC(param0); v3 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v4->unk_0C), v5); - v0 = sub_02074470(v3, 5, NULL); + v0 = GetMonData(v3, MON_DATA_SPECIES, NULL); - if (sub_02074470(v3, 76, NULL) == 0) { + if (GetMonData(v3, MON_DATA_IS_EGG, NULL) == 0) { switch (v0) { case 10: case 11: @@ -729,7 +729,7 @@ BOOL ov5_021F6FC0 (UnkStruct_0203E724 * param0) return 0; } -static void ov5_021F70CC (UnkStruct_02073C74 * param0, int * param1, int * param2) +static void ov5_021F70CC (Pokemon * param0, int * param1, int * param2) { int v0; int v1; @@ -738,12 +738,12 @@ static void ov5_021F70CC (UnkStruct_02073C74 * param0, int * param1, int * param int v4; int v5; - v0 = sub_02074470(param0, 70, NULL); - v1 = sub_02074470(param0, 71, NULL); - v2 = sub_02074470(param0, 72, NULL); - v3 = sub_02074470(param0, 73, NULL); - v4 = sub_02074470(param0, 74, NULL); - v5 = sub_02074470(param0, 75, NULL); + v0 = GetMonData(param0, MON_DATA_HP_IV, NULL); + v1 = GetMonData(param0, MON_DATA_ATK_IV, NULL); + v2 = GetMonData(param0, MON_DATA_DEF_IV, NULL); + v3 = GetMonData(param0, MON_DATA_SPEED_IV, NULL); + v4 = GetMonData(param0, MON_DATA_SPATK_IV, NULL); + v5 = GetMonData(param0, MON_DATA_SPDEF_IV, NULL); if (param1 != NULL) { *param1 = ((v0 & 2) >> 1) | ((v1 & 2) >> 0) | ((v2 & 2) << 1) | ((v3 & 2) << 2) | ((v4 & 2) << 3) | ((v5 & 2) << 4); @@ -763,13 +763,13 @@ static void ov5_021F70CC (UnkStruct_02073C74 * param0, int * param1, int * param BOOL ov5_021F71B8 (UnkStruct_0203E724 * param0) { UnkStruct_0202783C * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; UnkStruct_0203CDB0 * v2 = param0->unk_34; v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v2->unk_0C), 0); v0 = sub_0202783C(v2->unk_0C); - sub_020278DC(v0, sub_02074470(v1, 5, NULL), sub_02074470(v1, 112, NULL), sub_02074470(v1, 76, NULL)); + sub_020278DC(v0, GetMonData(v1, MON_DATA_SPECIES, NULL), GetMonData(v1, MON_DATA_FORM, NULL), GetMonData(v1, MON_DATA_IS_EGG, NULL)); return 0; } @@ -777,7 +777,7 @@ BOOL ov5_021F7208 (UnkStruct_0203E724 * param0) { int v0, v1, v2; UnkStruct_0202783C * v3; - UnkStruct_02073C74 * v4; + Pokemon * v4; UnkStruct_0203CDB0 * v5 = param0->unk_34; u16 * v6 = inline_0204FCAC(param0); u16 * v7 = inline_0204FCAC(param0); @@ -795,7 +795,7 @@ BOOL ov5_021F7208 (UnkStruct_0203E724 * param0) BOOL ov5_021F7270 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; Party * v1; UnkStruct_0203CDB0 * v2 = param0->unk_34; u16 v3 = inline_02049538(param0); @@ -803,7 +803,7 @@ BOOL ov5_021F7270 (UnkStruct_0203E724 * param0) v1 = Party_GetFromSavedata(v2->unk_0C); v0 = Party_GetPokemonBySlotIndex(v1, v3); - *v4 = sub_02074470(v0, 112, NULL); + *v4 = GetMonData(v0, MON_DATA_FORM, NULL); return 0; } diff --git a/src/overlay005/ov5_021F77A8.c b/src/overlay005/ov5_021F77A8.c index 756ea4d71d..2df34d14d5 100644 --- a/src/overlay005/ov5_021F77A8.c +++ b/src/overlay005/ov5_021F77A8.c @@ -10,7 +10,7 @@ #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_0203E724_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_0207D3C0_decl.h" #include "overlay005/struct_ov5_021DC1A4_decl.h" #include "overlay005/struct_ov5_021F7ED8_decl.h" @@ -599,8 +599,8 @@ BOOL ov5_021F7C04(UnkStruct_0203E724 * param0); static BOOL ov5_021F7DE8(UnkStruct_0203E724 * param0); static u16 ov5_021F7A3C(u16 param0); static u16 ov5_021F7A4C(u16 param0); -static u8 ov5_021F7A74(UnkStruct_02073C74 * param0, u8 param1); -static u16 ov5_021F7B60(UnkStruct_02073C74 * param0, u16 param1); +static u8 ov5_021F7A74(Pokemon * param0, u8 param1); +static u16 ov5_021F7B60(Pokemon * param0, u16 param1); static void ov5_021F7E10(UnkStruct_ov5_021F7ED8 * param0, UnkStruct_0200B144 * param1); static void ov5_021F7E18(UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021F7ED8 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, UnkStruct_0200B358 * param7, UnkStruct_0205AA50 * param8, UnkStruct_0200B144 * param9); UnkStruct_ov5_021F7ED8 * ov5_021F7ED8(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, UnkStruct_0200B358 * param6, UnkStruct_0205AA50 * param7, UnkStruct_0200B144 * param8); @@ -685,7 +685,7 @@ asm BOOL ov5_021F77A8 (UnkStruct_0203E724 * param0) BOOL ov5_021F77E8 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u16 v1 = inline_02049538(param0); u16 v2 = inline_02049538(param0); u16 * v3 = inline_0204FCAC(param0); @@ -811,13 +811,13 @@ static u16 ov5_021F7A4C (u16 param0) return 0; } -static u8 ov5_021F7A74 (UnkStruct_02073C74 * param0, u8 param1) +static u8 ov5_021F7A74 (Pokemon * param0, u8 param1) { u16 v0; u32 v1, v2; - v2 = sub_02074470(param0, 5, NULL); - v1 = sub_02074470(param0, 112, NULL); + v2 = GetMonData(param0, MON_DATA_SPECIES, NULL); + v1 = GetMonData(param0, MON_DATA_FORM, NULL); v0 = v2; switch (v2) { @@ -865,17 +865,17 @@ static u8 ov5_021F7A74 (UnkStruct_02073C74 * param0, u8 param1) return Unk_ov5_02200EAC[v0 - 1].unk_00[param1]; } -static u16 ov5_021F7B60 (UnkStruct_02073C74 * param0, u16 param1) +static u16 ov5_021F7B60 (Pokemon * param0, u16 param1) { int v0, v1, v2; u8 v3, v4; u32 v5; u16 v6[4]; - v5 = sub_02074470(param0, 5, NULL); + v5 = GetMonData(param0, MON_DATA_SPECIES, NULL); for (v2 = 0; v2 < 4; v2++) { - v6[v2] = sub_02074470(param0, (54 + v2), NULL); + v6[v2] = GetMonData(param0, MON_DATA_MOVE1 + v2, NULL); } for (v0 = 0; v0 < 5; v0++) { @@ -905,7 +905,7 @@ BOOL ov5_021F7C04 (UnkStruct_0203E724 * param0) { u8 v0, v1; int v2, v3, v4, v5; - UnkStruct_02073C74 * v6; + Pokemon * v6; UnkStruct_0200B144 * v7; UnkStruct_0200B144 * v8; UnkStruct_0203CDB0 * v9 = param0->unk_34; @@ -934,7 +934,7 @@ BOOL ov5_021F7C04 (UnkStruct_0203E724 * param0) if (v14 != 0xff) { for (v5 = 0; v5 < 4; v5++) { - v11[v5] = sub_02074470(v6, (54 + v5), NULL); + v11[v5] = GetMonData(v6, (54 + v5), NULL); } for (v2 = 0; v2 < 5; v2++) { diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c index 1d365419a9..a661d483e5 100644 --- a/src/overlay006/ov6_02240C9C.c +++ b/src/overlay006/ov6_02240C9C.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02025E6C_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_0202D7B0.h" @@ -84,28 +84,28 @@ static BOOL ov6_022417C8(UnkStruct_0203CDB0 * param0, const u32 param1, const u8 static u8 ov6_02241874(UnkStruct_0203CDB0 * param0, u8 param1, u8 * param2); static BOOL ov6_022418B4(UnkStruct_0203CDB0 * param0, u32 param1); static BOOL ov6_022418DC(UnkStruct_0203CDB0 * param0, u32 param1); -static BOOL ov6_0224222C(UnkStruct_02073C74 * param0, const UnkStruct_ov6_022422D0 * param1, const UnkStruct_ov6_0224222C * param2, const u8 param3, const u8 param4, const u8 param5, u8 * param6); -static BOOL ov6_022422D0(const UnkStruct_ov6_022422D0 * param0, UnkStruct_02073C74 * param1, const u8 param2); +static BOOL ov6_0224222C(Pokemon * param0, const UnkStruct_ov6_022422D0 * param1, const UnkStruct_ov6_0224222C * param2, const u8 param3, const u8 param4, const u8 param5, u8 * param6); +static BOOL ov6_022422D0(const UnkStruct_ov6_022422D0 * param0, Pokemon * param1, const u8 param2); static int ov6_0224214C(UnkStruct_0203CDB0 * param0); static int ov6_02242158(UnkStruct_0203CDB0 * param0); static int ov6_02242164(UnkStruct_0203CDB0 * param0, const int param1); -static BOOL ov6_02241674(UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1, UnkStruct_ov6_02240D5C * param2, UnkStruct_ov6_02242634 * param3, UnkStruct_ov6_0224222C * param4, const UnkStruct_ov6_022422D0 * param5, const UnkStruct_ov6_02241674 * param6); -static BOOL ov6_0224174C(UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1, UnkStruct_ov6_02240D5C * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4); -static BOOL ov6_02241790(UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1, UnkStruct_ov6_02240D5C * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4); -static BOOL ov6_022417AC(UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1, UnkStruct_ov6_02240D5C * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4, const int param5); -static BOOL ov6_02241DC4(UnkStruct_02073C74 * param0, const int param1, const UnkStruct_ov6_022422D0 * param2, const UnkStruct_ov6_0224222C * param3, const u8 param4, const int param5, UnkStruct_ov6_02240D5C * param6); -static BOOL ov6_02241F7C(UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1, const UnkStruct_ov6_022422D0 * param2, const UnkStruct_ov6_0224222C * param3, const int param4, UnkStruct_ov6_02240D5C * param5, const int param6, const int param7); -static BOOL ov6_02241F2C(const int param0, const int param1, const int param2, const BOOL param3, const u32 param4, const UnkStruct_ov6_022422D0 * param5, UnkStruct_02073C74 * param6, UnkStruct_ov6_02240D5C * param7); -static u8 ov6_0224226C(const BOOL param0, const u8 param1, const UnkStruct_ov6_022422D0 * param2, const u32 param3, UnkStruct_02073C74 * param4); +static BOOL ov6_02241674(UnkStruct_0203CDB0 * param0, Pokemon * param1, UnkStruct_ov6_02240D5C * param2, UnkStruct_ov6_02242634 * param3, UnkStruct_ov6_0224222C * param4, const UnkStruct_ov6_022422D0 * param5, const UnkStruct_ov6_02241674 * param6); +static BOOL ov6_0224174C(UnkStruct_0203CDB0 * param0, Pokemon * param1, UnkStruct_ov6_02240D5C * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4); +static BOOL ov6_02241790(UnkStruct_0203CDB0 * param0, Pokemon * param1, UnkStruct_ov6_02240D5C * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4); +static BOOL ov6_022417AC(UnkStruct_0203CDB0 * param0, Pokemon * param1, UnkStruct_ov6_02240D5C * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4, const int param5); +static BOOL ov6_02241DC4(Pokemon * param0, const int param1, const UnkStruct_ov6_022422D0 * param2, const UnkStruct_ov6_0224222C * param3, const u8 param4, const int param5, UnkStruct_ov6_02240D5C * param6); +static BOOL ov6_02241F7C(UnkStruct_0203CDB0 * param0, Pokemon * param1, const UnkStruct_ov6_022422D0 * param2, const UnkStruct_ov6_0224222C * param3, const int param4, UnkStruct_ov6_02240D5C * param5, const int param6, const int param7); +static BOOL ov6_02241F2C(const int param0, const int param1, const int param2, const BOOL param3, const u32 param4, const UnkStruct_ov6_022422D0 * param5, Pokemon * param6, UnkStruct_ov6_02240D5C * param7); +static u8 ov6_0224226C(const BOOL param0, const u8 param1, const UnkStruct_ov6_022422D0 * param2, const u32 param3, Pokemon * param4); static void ov6_02242328(UnkStruct_0203CDB0 * param0, const BOOL param1, UnkStruct_ov6_02240D5C ** param2); static void ov6_02242354(UnkStruct_0203CDB0 * param0, const BOOL param1, const BOOL param2, UnkStruct_ov6_0224222C * param3); static BOOL ov6_02242388(const u8 param0, const UnkStruct_ov6_022422D0 * param1); static void ov6_0224239C(const u32 param0, UnkStruct_0206C638 * param1, UnkStruct_ov6_02240D5C * param2); static BOOL ov6_02242440(UnkStruct_0203CDB0 * param0, UnkStruct_0206C638 ** param1); -static BOOL ov6_02242514(const int param0, const UnkStruct_ov6_022422D0 * param1, UnkStruct_02073C74 * param2, UnkStruct_ov6_02240D5C * param3); +static BOOL ov6_02242514(const int param0, const UnkStruct_ov6_022422D0 * param1, Pokemon * param2, UnkStruct_ov6_02240D5C * param3); static u8 ov6_022425D4(const UnkStruct_ov6_0224222C * param0, const UnkStruct_ov6_022422D0 * param1, const u8 param2); -static void ov6_02242634(UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1, UnkStruct_ov6_02242634 * param2, UnkStruct_ov6_022422D0 * param3); -static void ov6_02241A90(UnkStruct_02073C74 * param0, u8 * param1); +static void ov6_02242634(UnkStruct_0203CDB0 * param0, Pokemon * param1, UnkStruct_ov6_02242634 * param2, UnkStruct_ov6_022422D0 * param3); +static void ov6_02241A90(Pokemon * param0, u8 * param1); static void ov6_02241ABC(UnkStruct_0203CDB0 * param0, u8 * param1); static const u8 Unk_ov6_02248FDC[] = { @@ -230,7 +230,7 @@ static void ov6_02240D00 (UnkStruct_0203CDB0 * param0, const BOOL param1, int * BOOL ov6_02240D5C (UnkStruct_0203CDB0 * param0) { UnkStruct_ov6_02240D5C * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; int v2, v3; u8 v4; u8 v5; @@ -265,12 +265,12 @@ BOOL ov6_02240D5C (UnkStruct_0203CDB0 * param0) { if (!sub_0202D9D8(sub_0202D834(param0->unk_0C))) { - UnkStruct_02073C74 * v16; + Pokemon * v16; v16 = sub_02054A40(v11); v14.unk_04 = 1; - v14.unk_0C = sub_02074470(v16, 161, NULL); + v14.unk_0C = GetMonData(v16, MON_DATA_161, NULL); } } @@ -396,7 +396,7 @@ BOOL ov6_02240D5C (UnkStruct_0203CDB0 * param0) BOOL ov6_0224106C (UnkStruct_0203CDB0 * param0, const int param1, UnkStruct_ov6_02240D5C ** param2) { - UnkStruct_02073C74 * v0; + Pokemon * v0; Party * v1; BOOL v2; UnkStruct_ov6_0224222C v3[12]; @@ -485,7 +485,7 @@ BOOL ov6_0224106C (UnkStruct_0203CDB0 * param0, const int param1, UnkStruct_ov6_ BOOL ov6_022411C8 (UnkStruct_0203CDB0 * param0, UnkStruct_020508D4 * param1) { UnkStruct_ov6_02240D5C * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; int v2, v3; u8 v4; u8 v5; @@ -607,7 +607,7 @@ BOOL ov6_022411C8 (UnkStruct_0203CDB0 * param0, UnkStruct_020508D4 * param1) BOOL ov6_022413E4 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02240D5C ** param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; int v1, v2; u8 v3; u8 v4; @@ -644,12 +644,12 @@ BOOL ov6_022413E4 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02240D5C ** param1 { if (!sub_0202D9D8(sub_0202D834(param0->unk_0C))) { - UnkStruct_02073C74 * v15; + Pokemon * v15; v15 = sub_02054A40(v10); v13.unk_04 = 1; - v13.unk_0C = sub_02074470(v15, 161, NULL); + v13.unk_0C = GetMonData(v15, MON_DATA_161, NULL); } } @@ -750,7 +750,7 @@ BOOL ov6_022413E4 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02240D5C ** param1 return v5; } -static BOOL ov6_02241674 (UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1, UnkStruct_ov6_02240D5C * param2, UnkStruct_ov6_02242634 * param3, UnkStruct_ov6_0224222C * param4, const UnkStruct_ov6_022422D0 * param5, const UnkStruct_ov6_02241674 * param6) +static BOOL ov6_02241674 (UnkStruct_0203CDB0 * param0, Pokemon * param1, UnkStruct_ov6_02240D5C * param2, UnkStruct_ov6_02242634 * param3, UnkStruct_ov6_0224222C * param4, const UnkStruct_ov6_022422D0 * param5, const UnkStruct_ov6_02241674 * param6) { BOOL v0; @@ -796,7 +796,7 @@ static BOOL ov6_02241674 (UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * para return v0; } -static BOOL ov6_0224174C (UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1, UnkStruct_ov6_02240D5C * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4) +static BOOL ov6_0224174C (UnkStruct_0203CDB0 * param0, Pokemon * param1, UnkStruct_ov6_02240D5C * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4) { BOOL v0; { @@ -814,7 +814,7 @@ static BOOL ov6_0224174C (UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * para return v0; } -static BOOL ov6_02241790 (UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1, UnkStruct_ov6_02240D5C * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4) +static BOOL ov6_02241790 (UnkStruct_0203CDB0 * param0, Pokemon * param1, UnkStruct_ov6_02240D5C * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4) { BOOL v0; @@ -825,7 +825,7 @@ static BOOL ov6_02241790 (UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * para return v0; } -static BOOL ov6_022417AC (UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1, UnkStruct_ov6_02240D5C * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4, const int param5) +static BOOL ov6_022417AC (UnkStruct_0203CDB0 * param0, Pokemon * param1, UnkStruct_ov6_02240D5C * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4, const int param5) { BOOL v0; @@ -1050,11 +1050,11 @@ static u8 ov6_022419EC (const int param0) return v1; } -static void ov6_02241A90 (UnkStruct_02073C74 * param0, u8 * param1) +static void ov6_02241A90 (Pokemon * param0, u8 * param1) { u16 v0; - v0 = sub_02074470(param0, 6, NULL); + v0 = GetMonData(param0, MON_DATA_HELD_ITEM, NULL); if ((v0 == 224) || (v0 == 320)) { (*param1) = ((*param1) * 2) / 3; @@ -1074,14 +1074,14 @@ static void ov6_02241ABC (UnkStruct_0203CDB0 * param0, u8 * param1) } } -static u8 ov6_02241AE4 (UnkStruct_02073C74 * param0, const UnkStruct_ov6_022422D0 * param1) +static u8 ov6_02241AE4 (Pokemon * param0, const UnkStruct_ov6_022422D0 * param1) { u32 v0; if (param1->unk_0D == 0) { if (param1->unk_0E == 28) { if (inline_020564D0(2) == 0) { - v0 = (u32)sub_02074470(param0, 0, NULL); + v0 = (u32)GetMonData(param0, MON_DATA_PERSONALITY, NULL); v0 = v0 % 25; return (u8)v0; } @@ -1122,17 +1122,17 @@ static u8 ov6_02241B40 (const UnkStruct_ov6_0224222C * param0, const UnkStruct_o return v2 + v1; } -static void ov6_02241BAC (const u16 param0, const u8 param1, const int param2, const u32 param3, const UnkStruct_ov6_022422D0 * param4, UnkStruct_02073C74 * param5, UnkStruct_ov6_02240D5C * param6) +static void ov6_02241BAC (const u16 param0, const u8 param1, const int param2, const u32 param3, const UnkStruct_ov6_022422D0 * param4, Pokemon * param5, UnkStruct_ov6_02240D5C * param6) { BOOL v0; u32 v1; BOOL v2; u8 v3; u8 v4; - UnkStruct_02073C74 * v5; + Pokemon * v5; - v5 = sub_02073C74(11); - sub_02073C2C(v5); + v5 = AllocMonZeroed(11); + ZeroMonData(v5); v2 = 0; @@ -1149,7 +1149,7 @@ static void ov6_02241BAC (const u16 param0, const u8 param1, const int param2, c break; default: if (inline_020564D0(3) > 0) { - v3 = sub_02074470(param5, 111, NULL); + v3 = GetMonData(param5, MON_DATA_111, NULL); v2 = 1; } } @@ -1177,7 +1177,7 @@ static void ov6_02241BAC (const u16 param0, const u8 param1, const int param2, c v1 = sub_02075E64(param3); } } else if (param4->unk_0E == 28) { - v8 = sub_02075BFC(v1); + v8 = GetNatureFromPersonality(v1); if (v8 == v4) { break; @@ -1195,15 +1195,15 @@ static void ov6_02241BAC (const u16 param0, const u8 param1, const int param2, c Heap_FreeToHeap(v5); } -static void ov6_02241CC0 (u16 param0, u8 param1, const int param2, const UnkStruct_ov6_022422D0 * param3, UnkStruct_02073C74 * param4, UnkStruct_ov6_02240D5C * param5) +static void ov6_02241CC0 (u16 param0, u8 param1, const int param2, const UnkStruct_ov6_022422D0 * param3, Pokemon * param4, UnkStruct_ov6_02240D5C * param5) { u8 v0; u8 v1; BOOL v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; - v3 = sub_02073C74(11); - sub_02073C2C(v3); + v3 = AllocMonZeroed(11); + ZeroMonData(v3); v0 = 1; { @@ -1223,7 +1223,7 @@ static void ov6_02241CC0 (u16 param0, u8 param1, const int param2, const UnkStru if (param3->unk_0D == 0) { if (param3->unk_0E == 56) { if (inline_020564D0(3) > 0) { - v1 = sub_02074470(param4, 111, NULL); + v1 = GetMonData(param4, MON_DATA_111, NULL); if (v1 == 1) { v1 = 0; @@ -1253,7 +1253,7 @@ static void ov6_02241CC0 (u16 param0, u8 param1, const int param2, const UnkStru Heap_FreeToHeap(v3); } -static BOOL ov6_02241DC4 (UnkStruct_02073C74 * param0, const int param1, const UnkStruct_ov6_022422D0 * param2, const UnkStruct_ov6_0224222C * param3, const u8 param4, const int param5, UnkStruct_ov6_02240D5C * param6) +static BOOL ov6_02241DC4 (Pokemon * param0, const int param1, const UnkStruct_ov6_022422D0 * param2, const UnkStruct_ov6_0224222C * param3, const u8 param4, const int param5, UnkStruct_ov6_02240D5C * param6) { BOOL v0; u8 v1 = 0; @@ -1310,7 +1310,7 @@ static BOOL ov6_02241DC4 (UnkStruct_02073C74 * param0, const int param1, const U return 1; } -static BOOL ov6_02241F2C (const int param0, const int param1, const int param2, const BOOL param3, const u32 param4, const UnkStruct_ov6_022422D0 * param5, UnkStruct_02073C74 * param6, UnkStruct_ov6_02240D5C * param7) +static BOOL ov6_02241F2C (const int param0, const int param1, const int param2, const BOOL param3, const u32 param4, const UnkStruct_ov6_022422D0 * param5, Pokemon * param6, UnkStruct_ov6_02240D5C * param7) { u8 v0 = 0; @@ -1326,7 +1326,7 @@ static BOOL ov6_02241F2C (const int param0, const int param1, const int param2, return 1; } -static BOOL ov6_02241F7C (UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1, const UnkStruct_ov6_022422D0 * param2, const UnkStruct_ov6_0224222C * param3, const int param4, UnkStruct_ov6_02240D5C * param5, const int param6, const int param7) +static BOOL ov6_02241F7C (UnkStruct_0203CDB0 * param0, Pokemon * param1, const UnkStruct_ov6_022422D0 * param2, const UnkStruct_ov6_0224222C * param3, const int param4, UnkStruct_ov6_02240D5C * param5, const int param6, const int param7) { u8 v0; u8 v1 = 0; @@ -1365,7 +1365,7 @@ static BOOL ov6_02241F7C (UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * para void ov6_02242034 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02240D5C * param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; int v1; UnkStruct_ov6_022422D0 v2; u8 v3; @@ -1406,7 +1406,7 @@ void ov6_02242034 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02240D5C * param1) void ov6_022420D4 (UnkStruct_0203CDB0 * param0, u16 param1, u8 param2, UnkStruct_ov6_02240D5C * param3) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_ov6_022422D0 v1; { @@ -1506,7 +1506,7 @@ static BOOL ov6_0224219C (const UnkStruct_ov6_0224222C * param0, const u8 param1 return 1; } -static BOOL ov6_0224222C (UnkStruct_02073C74 * param0, const UnkStruct_ov6_022422D0 * param1, const UnkStruct_ov6_0224222C * param2, const u8 param3, const u8 param4, const u8 param5, u8 * param6) +static BOOL ov6_0224222C (Pokemon * param0, const UnkStruct_ov6_022422D0 * param1, const UnkStruct_ov6_0224222C * param2, const u8 param3, const u8 param4, const u8 param5, u8 * param6) { if (param1->unk_0D == 0) { if (param1->unk_0E == param5) { @@ -1519,7 +1519,7 @@ static BOOL ov6_0224222C (UnkStruct_02073C74 * param0, const UnkStruct_ov6_02242 return 0; } -static u8 ov6_0224226C (const BOOL param0, const u8 param1, const UnkStruct_ov6_022422D0 * param2, const u32 param3, UnkStruct_02073C74 * param4) +static u8 ov6_0224226C (const BOOL param0, const u8 param1, const UnkStruct_ov6_022422D0 * param2, const u32 param3, Pokemon * param4) { int v0; @@ -1554,7 +1554,7 @@ static u8 ov6_0224226C (const BOOL param0, const u8 param1, const UnkStruct_ov6_ return v0; } -static BOOL ov6_022422D0 (const UnkStruct_ov6_022422D0 * param0, UnkStruct_02073C74 * param1, const u8 param2) +static BOOL ov6_022422D0 (const UnkStruct_ov6_022422D0 * param0, Pokemon * param1, const u8 param2) { u8 v0; @@ -1564,7 +1564,7 @@ static BOOL ov6_022422D0 (const UnkStruct_ov6_022422D0 * param0, UnkStruct_02073 if (param0->unk_0D == 0) { if ((param0->unk_0E == 51) || (param0->unk_0E == 22)) { - v0 = sub_02074470(param1, 161, NULL); + v0 = GetMonData(param1, MON_DATA_161, NULL); if (v0 <= 5) { return 0; @@ -1618,9 +1618,9 @@ static void ov6_0224239C (const u32 param0, UnkStruct_0206C638 * param1, UnkStru u32 v4; u16 v5; BOOL v6; - UnkStruct_02073C74 * v7; + Pokemon * v7; - v7 = sub_02073C74(4); + v7 = AllocMonZeroed(4); v0 = sub_0202D93C(param1, 4); v1 = sub_0202D93C(param1, 6); v2 = sub_0202D93C(param1, 2); @@ -1676,7 +1676,7 @@ static BOOL ov6_02242440 (UnkStruct_0203CDB0 * param0, UnkStruct_0206C638 ** par return 1; } -static BOOL ov6_02242514 (const int param0, const UnkStruct_ov6_022422D0 * param1, UnkStruct_02073C74 * param2, UnkStruct_ov6_02240D5C * param3) +static BOOL ov6_02242514 (const int param0, const UnkStruct_ov6_022422D0 * param1, Pokemon * param2, UnkStruct_ov6_02240D5C * param3) { int v0 = 0; @@ -1694,7 +1694,7 @@ static BOOL ov6_02242514 (const int param0, const UnkStruct_ov6_022422D0 * param int v3; v1 = 0; - v3 = sub_02074470(param2, 5, NULL); + v3 = GetMonData(param2, MON_DATA_SPECIES, NULL); if (v3 == 422) { v1 = 1; @@ -1756,11 +1756,11 @@ static u8 ov6_022425D4 (const UnkStruct_ov6_0224222C * param0, const UnkStruct_o return param2; } -static void ov6_02242634 (UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1, UnkStruct_ov6_02242634 * param2, UnkStruct_ov6_022422D0 * param3) +static void ov6_02242634 (UnkStruct_0203CDB0 * param0, Pokemon * param1, UnkStruct_ov6_02242634 * param2, UnkStruct_ov6_022422D0 * param3) { - if (sub_02074470(param1, 76, NULL) == 0) { + if (GetMonData(param1, MON_DATA_IS_EGG, NULL) == 0) { param3->unk_0D = 0; - param3->unk_0E = sub_02074470(param1, 10, NULL); + param3->unk_0E = GetMonData(param1, MON_DATA_10, NULL); } else { param3->unk_0D = 1; param3->unk_0E = 123; diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c index 7888d14416..e39f08e5ab 100644 --- a/src/overlay006/ov6_02243258.c +++ b/src/overlay006/ov6_02243258.c @@ -10,7 +10,7 @@ #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_02061AB4_decl.h" #include "struct_decls/struct_020711EC_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay101/struct_ov101_021D5D90_decl.h" #include "struct_defs/struct_02008A90.h" @@ -67,7 +67,7 @@ typedef struct { fx32 unk_50; fx32 unk_54; fx32 unk_58; - UnkStruct_02073C74 * unk_5C; + Pokemon * unk_5C; UnkStruct_0203CDB0 * unk_60; NNSG2dScreenData * unk_64; NNSG2dCharacterData * unk_68; @@ -292,7 +292,7 @@ static void ov6_02244F8C(UnkStruct_ov6_02243FFC * param0); static void ov6_02244FB4(UnkStruct_ov6_02243FFC * param0); static void ov6_02244FE4(UnkStruct_0201CD38 * param0, void * param1); static void ov6_0224508C(UnkStruct_ov6_02243FFC * param0, UnkStruct_02008A90 * param1); -static void * ov6_0224509C(UnkStruct_02073C74 * param0, UnkStruct_02008A90 * param1, u32 param2); +static void * ov6_0224509C(Pokemon * param0, UnkStruct_02008A90 * param1, u32 param2); static void * ov6_022450E4(UnkStruct_02008A90 * param0, u32 param1); static UnkStruct_02009DC8 * ov6_022450F4(UnkStruct_ov6_02243FFC * param0, NARC * param1); static void ov6_02245118(UnkStruct_ov6_02243FFC * param0, void * param1); @@ -1030,7 +1030,7 @@ static void ov6_02243F74 (UnkStruct_0203CDB0 * param0, int param1) sub_02062D64(v0, param1); } -UnkStruct_0201CD38 * ov6_02243F88 (UnkStruct_0203CDB0 * param0, u32 param1, UnkStruct_02073C74 * param2, int param3) +UnkStruct_0201CD38 * ov6_02243F88 (UnkStruct_0203CDB0 * param0, u32 param1, Pokemon * param2, int param3) { UnkStruct_0201CD38 * v0; UnkStruct_ov6_02243FFC * v1 = ov6_02243FDC(param0); @@ -2062,14 +2062,14 @@ static void ov6_0224508C (UnkStruct_ov6_02243FFC * param0, UnkStruct_02008A90 * sub_02075EF4(param1, param0->unk_5C, 2); } -static void * ov6_0224509C (UnkStruct_02073C74 * param0, UnkStruct_02008A90 * param1, u32 param2) +static void * ov6_0224509C (Pokemon * param0, UnkStruct_02008A90 * param1, u32 param2) { void * v0 = Heap_AllocFromHeap(4, (32 * 10) * 10); GF_ASSERT(v0 != NULL); { - int v1 = sub_02074470(param0, 0, NULL); + int v1 = GetMonData(param0, MON_DATA_PERSONALITY, NULL); sub_02013750(param1->unk_00, param1->unk_02, param2, v0, v1, 0, 2, param1->unk_06); } diff --git a/src/overlay006/ov6_02246034.c b/src/overlay006/ov6_02246034.c index c298cf5779..b48a0c67e3 100644 --- a/src/overlay006/ov6_02246034.c +++ b/src/overlay006/ov6_02246034.c @@ -3,7 +3,7 @@ #include "inlines.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_0202D7B0.h" @@ -30,17 +30,17 @@ void ov6_02246034 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02240D5C * param1) UnkStruct_0202D7B0 * v3; UnkStruct_0206C638 * v4; Party * v5; - UnkStruct_02073C74 * v6; + Pokemon * v6; v5 = param1->unk_04[1]; v6 = Party_GetPokemonBySlotIndex(v5, 0); v3 = sub_0202D834(param0->unk_0C); - v2 = sub_02074470(v6, 5, NULL); + v2 = GetMonData(v6, MON_DATA_SPECIES, NULL); v4 = ov6_02246148(v3, v2); if (v4 != NULL) { - v0 = (u16)(sub_02074470(v6, 163, NULL)); - v1 = (u8)(sub_02074470(v6, 160, NULL)); + v0 = (u16)(GetMonData(v6, MON_DATA_163, NULL)); + v1 = (u8)(GetMonData(v6, MON_DATA_160, NULL)); if (((param1->unk_14 == 0x1) && (v0 == 0))) { sub_0202D914(&v4); diff --git a/src/overlay006/ov6_02246184.c b/src/overlay006/ov6_02246184.c index d51201016b..047bf49447 100644 --- a/src/overlay006/ov6_02246184.c +++ b/src/overlay006/ov6_02246184.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_0200B144_decl.h" #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02025E6C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "overlay006/struct_ov6_02246204_decl.h" @@ -50,14 +50,14 @@ typedef struct { typedef struct UnkStruct_ov6_02246204_t { UnkStruct_ov6_0224630C * unk_00; - UnkStruct_02073C74 * unk_04; + Pokemon * unk_04; UnkStruct_02025E6C * unk_08; u32 unk_0C; u32 unk_10; }; static UnkStruct_02023790 * ov6_022462E4(u32 param0, u32 param1); -static void ov6_0224630C(UnkStruct_02073C74 * param0, UnkStruct_ov6_0224630C * param1, u32 param2, u32 param3, u32 param4, u32 param5); +static void ov6_0224630C(Pokemon * param0, UnkStruct_ov6_0224630C * param1, u32 param2, u32 param3, u32 param4, u32 param5); UnkStruct_ov6_02246204 * ov6_02246184 (u32 param0, u32 param1) { @@ -73,7 +73,7 @@ UnkStruct_ov6_02246204 * ov6_02246184 (u32 param0, u32 param1) v0->unk_00 = sub_02006FE8(115, param1, 0, param0, 0); v0->unk_10 = param0; v0->unk_0C = param1; - v0->unk_04 = sub_02073C74(param0); + v0->unk_04 = AllocMonZeroed(param0); v0->unk_08 = sub_02025E6C(param0); sub_02025E8C(v0->unk_08); @@ -113,16 +113,16 @@ void ov6_02246234 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02246204 * param1, sub_0202F180(param0->unk_0C, param1->unk_04); } -void ov6_02246254 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02246204 * param1, int param2, UnkStruct_ov6_02246254 * param3, UnkStruct_02073C74 * param4, UnkStruct_02073C74 * param5) +void ov6_02246254 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02246204 * param1, int param2, UnkStruct_ov6_02246254 * param3, Pokemon * param4, Pokemon * param5) { Party * v0 = Party_GetFromSavedata(param0->unk_0C); - UnkStruct_02073C74 * v1; + Pokemon * v1; UnkStruct_02023790 * v2; u32 v3; int v4; v1 = Party_GetPokemonBySlotIndex(v0, param2); - v3 = sub_02074470(v1, 161, NULL); + v3 = GetMonData(v1, MON_DATA_161, NULL); ov6_0224630C(param1->unk_04, param1->unk_00, v3, param1->unk_0C, param1->unk_10, param0->unk_1C->unk_00); @@ -156,7 +156,7 @@ static UnkStruct_02023790 * ov6_022462E4 (u32 param0, u32 param1) return v0; } -static void ov6_0224630C (UnkStruct_02073C74 * param0, UnkStruct_ov6_0224630C * param1, u32 param2, u32 param3, u32 param4, u32 param5) +static void ov6_0224630C (Pokemon * param0, UnkStruct_ov6_0224630C * param1, u32 param2, u32 param3, u32 param4, u32 param5) { UnkStruct_02023790 * v0; u8 v1; diff --git a/src/overlay006/ov6_02247100.c b/src/overlay006/ov6_02247100.c index 0b254a84d0..f22a85a519 100644 --- a/src/overlay006/ov6_02247100.c +++ b/src/overlay006/ov6_02247100.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_0203A790_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_0203CDB0.h" #include "struct_defs/struct_02049FA8.h" @@ -34,7 +34,7 @@ typedef struct { UnkStruct_0201CD38 * unk_14; UnkStruct_02061AB4 * unk_18; UnkStruct_0203CDB0 * unk_1C; - UnkStruct_02073C74 * unk_20; + Pokemon * unk_20; } UnkStruct_ov6_02247100; static void * ov6_02247590(u32 param0, u32 param1); @@ -287,7 +287,7 @@ static int(*const Unk_ov6_022495BC[])(UnkStruct_020508D4 *, UnkStruct_0203CDB0 * ov6_02247458 }; -void * ov6_02247488 (UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1, u32 param2) +void * ov6_02247488 (UnkStruct_0203CDB0 * param0, Pokemon * param1, u32 param2) { UnkStruct_ov6_02247100 * v0 = ov6_02247590(param2, sizeof(UnkStruct_ov6_02247100)); @@ -346,7 +346,7 @@ static int(*const Unk_ov6_022495F0[])(UnkStruct_020508D4 *, UnkStruct_0203CDB0 * ov6_02247288 }; -void * ov6_02247530 (UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1, u32 param2) +void * ov6_02247530 (UnkStruct_0203CDB0 * param0, Pokemon * param1, u32 param2) { UnkStruct_ov6_02247100 * v0 = ov6_02247590(param2, sizeof(UnkStruct_ov6_02247100)); diff --git a/src/overlay006/ov6_022489E4.c b/src/overlay006/ov6_022489E4.c index edbff19845..82e2fd5802 100644 --- a/src/overlay006/ov6_022489E4.c +++ b/src/overlay006/ov6_022489E4.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_020954F0.h" #include "struct_defs/struct_02095C48.h" @@ -85,7 +85,7 @@ void ov6_02248AC8 (int param0, int param1, void * param2, void * param3) int v2; u8 * v3; - v1 = sub_02073C70(); + v1 = PokemonStructSize(); v3 = param2; v2 = v3[v1]; @@ -94,13 +94,13 @@ void ov6_02248AC8 (int param0, int param1, void * param2, void * param3) v0->unk_568++; } -BOOL ov6_02248AF0 (UnkStruct_02095C48 * param0, int param1, const UnkStruct_02073C74 * param2) +BOOL ov6_02248AF0 (UnkStruct_02095C48 * param0, int param1, const Pokemon * param2) { u8 * v0; int v1; int v2; - v1 = sub_02073C70(); + v1 = PokemonStructSize(); v0 = Heap_AllocFromHeap(20, v1 + 1); MI_CpuCopy8(param2, v0, v1); v0[v1] = param1; @@ -122,7 +122,7 @@ void ov6_02248B30 (int param0, int param1, void * param2, void * param3) u8 * v3; int v4; - v1 = sub_02073C70(); + v1 = PokemonStructSize(); v2 = v1 * 4; v3 = param2; @@ -133,14 +133,14 @@ void ov6_02248B30 (int param0, int param1, void * param2, void * param3) v0->unk_568++; } -BOOL ov6_02248B70 (UnkStruct_02095C48 * param0, UnkStruct_02073C74 ** param1) +BOOL ov6_02248B70 (UnkStruct_02095C48 * param0, Pokemon ** param1) { u8 * v0; int v1, v2; int v3; int v4; - v1 = sub_02073C70(); + v1 = PokemonStructSize(); v2 = v1 * 4; v0 = param0->unk_569; diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index 94e83660c7..2ca9b05f8b 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -19,7 +19,7 @@ #include "struct_decls/struct_020203AC_decl.h" #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02025E6C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_0200D0F4.h" @@ -1528,7 +1528,7 @@ static void ov10_02221188 (UnkStruct_ov10_0221FB28 * param0, u8 param1, s16 para static void ov10_022211F0 (UnkStruct_ov10_0221FB28 * param0, Party * param1, u16 param2, u16 param3) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u8 v1; u8 v2, v3, v4; @@ -1541,7 +1541,7 @@ static void ov10_022211F0 (UnkStruct_ov10_0221FB28 * param0, Party * param1, u16 if (v3 > v1) { v0 = Party_GetPokemonBySlotIndex(param1, v1); - if ((sub_02074470(v0, 5, NULL) == 0) || (sub_02074470(v0, 76, NULL) != 0)) { + if ((GetMonData(v0, MON_DATA_SPECIES, NULL) == 0) || (GetMonData(v0, MON_DATA_IS_EGG, NULL) != 0)) { continue; } @@ -2029,7 +2029,7 @@ static void ov10_02221C48 (UnkStruct_ov10_0221FB28 * param0, u8 param1) static void ov10_02221D14 (UnkStruct_ov10_0221FB28 * param0, Party * param1, u8 param2) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u16 v1; u16 v2; @@ -2044,21 +2044,21 @@ static void ov10_02221D14 (UnkStruct_ov10_0221FB28 * param0, Party * param1, u8 v0 = Party_GetPokemonBySlotIndex(param1, v1); param0->unk_214[v1 + param2].unk_00 = sub_02079D80(v0); - param0->unk_214[v1 + param2].unk_04 = (u16)sub_02074470(v0, 5, NULL); + param0->unk_214[v1 + param2].unk_04 = (u16)GetMonData(v0, MON_DATA_SPECIES, NULL); if (param0->unk_214[v1 + param2].unk_04 == 0) { continue; } - param0->unk_214[v1 + param2].unk_0F = (u16)sub_02074470(v0, 76, NULL); - param0->unk_214[v1 + param2].unk_06 = (u16)sub_02074470(v0, 163, NULL); - param0->unk_214[v1 + param2].unk_08 = (u16)sub_02074470(v0, 164, NULL); - param0->unk_214[v1 + param2].unk_0C = (u16)sub_02074470(v0, 161, NULL); - param0->unk_214[v1 + param2].unk_0A = (u16)sub_02074470(v0, 6, NULL); - param0->unk_214[v1 + param2].unk_10 = (u8)sub_02074470(v0, 162, NULL); - param0->unk_214[v1 + param2].unk_11 = (u8)sub_02074470(v0, 112, NULL); + param0->unk_214[v1 + param2].unk_0F = (u16)GetMonData(v0, MON_DATA_IS_EGG, NULL); + param0->unk_214[v1 + param2].unk_06 = (u16)GetMonData(v0, MON_DATA_163, NULL); + param0->unk_214[v1 + param2].unk_08 = (u16)GetMonData(v0, MON_DATA_164, NULL); + param0->unk_214[v1 + param2].unk_0C = (u16)GetMonData(v0, MON_DATA_161, NULL); + param0->unk_214[v1 + param2].unk_0A = (u16)GetMonData(v0, MON_DATA_HELD_ITEM, NULL); + param0->unk_214[v1 + param2].unk_10 = (u8)GetMonData(v0, MON_DATA_162, NULL); + param0->unk_214[v1 + param2].unk_11 = (u8)GetMonData(v0, MON_DATA_FORM, NULL); - if (sub_02074470(v0, 176, NULL) == 1) { + if (GetMonData(v0, MON_DATA_176, NULL) == 1) { param0->unk_214[v1 + param2].unk_0E = 0; } else { param0->unk_214[v1 + param2].unk_0E = 1; @@ -2259,7 +2259,7 @@ static void ov10_022223E8 (UnkStruct_ov10_0221FB28 * param0) static void ov10_02222400 (UnkStruct_ov10_0221FB28 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200C440 * param2, UnkStruct_0200B358 * param3, UnkStruct_02023790 * param4, u32 param5) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_0205AA50 * v1; UnkStruct_02023790 * v2; @@ -2350,7 +2350,7 @@ static void ov10_02222594 (UnkStruct_ov10_0221FB28 * param0, u32 param1) static void ov10_02222684 (UnkStruct_ov10_0221FB28 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200C440 * param2, UnkStruct_0200B358 * param3, UnkStruct_02023790 * param4, u32 param5) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_0205AA50 * v1; UnkStruct_02023790 * v2; u32 v3; diff --git a/src/overlay012/is_form_symmetrical.c b/src/overlay012/is_form_symmetrical.c new file mode 100644 index 0000000000..bdbd4242fa --- /dev/null +++ b/src/overlay012/is_form_symmetrical.c @@ -0,0 +1,34 @@ +#include +#include + +#include "overlay012/is_form_symmetrical.h" + +#include "constants/species.h" + +BOOL IsFormSymmetrical (u32 species, u32 formId) +{ + switch (species) { + case SPECIES_STARYU: + case SPECIES_ELECTABUZZ: + case SPECIES_CROCONAW: + case SPECIES_UNOWN: + case SPECIES_SNEASEL: + case SPECIES_ROSELIA: + case SPECIES_ZANGOOSE: + case SPECIES_ABSOL: + case SPECIES_BUDEW: + case SPECIES_ROSERADE: + case SPECIES_MAGMORTAR: + case SPECIES_TORTERRA: + case SPECIES_TOGEKISS: + case SPECIES_KINGLER: + return FALSE; + case SPECIES_SHAYMIN: + if (formId == 1) { + return FALSE; + } + break; + } + + return TRUE; +} diff --git a/src/overlay012/ov12_0221FC20.c b/src/overlay012/ov12_0221FC20.c index e417777fa7..8fb036de3a 100644 --- a/src/overlay012/ov12_0221FC20.c +++ b/src/overlay012/ov12_0221FC20.c @@ -55,7 +55,7 @@ #include "overlay012/ov12_02226998.h" #include "overlay012/ov12_02235254.h" #include "overlay012/ov12_022380BC.h" -#include "overlay012/ov12_022384F0.h" +#include "overlay012/is_form_symmetrical.h" #include "overlay016/ov16_0223DF00.h" #include "overlay017/ov17_022413D8.h" @@ -2044,7 +2044,7 @@ static void ov12_0222128C (UnkStruct_ov12_0221FCDC * param0) v0 = param0->unk_BC->unk_B0[v3]->unk_00; v7 = param0->unk_BC->unk_E8[v3]; - if ((ov12_0221FDD4(param0) == 1) && (ov12_022384F0(ov12_022232D0(param0, v3), v7) == 1)) { + if ((ov12_0221FDD4(param0) == 1) && (IsFormSymmetrical(ov12_022232D0(param0, v3), v7) == 1)) { v6 = 265; } else { v6 = 264; @@ -2225,7 +2225,7 @@ static void ov12_02221580 (UnkStruct_ov12_0221FCDC * param0) } } - if ((ov12_0221FDD4(param0) == 1) && (ov12_022384F0(ov12_022232D0(param0, v7), v10) == 1)) { + if ((ov12_0221FDD4(param0) == 1) && (IsFormSymmetrical(ov12_022232D0(param0, v7), v10) == 1)) { sub_0200D7D4(v1, 1); } } @@ -4122,7 +4122,7 @@ BOOL ov12_022234A8 (UnkStruct_ov12_0221FCDC * param0, int param1) v0 = ov12_022210A8(param0, param1); v1 = param0->unk_BC->unk_E8[v0]; - if ((ov12_0221FDD4(param0) == 1) && (ov12_022384F0(ov12_022232D0(param0, v0), v1) == 1)) { + if ((ov12_0221FDD4(param0) == 1) && (IsFormSymmetrical(ov12_022232D0(param0, v0), v1) == 1)) { return 1; } diff --git a/src/overlay012/ov12_02235E94.c b/src/overlay012/ov12_02235E94.c index 98e85615bb..2124bab3a4 100644 --- a/src/overlay012/ov12_02235E94.c +++ b/src/overlay012/ov12_02235E94.c @@ -369,7 +369,7 @@ UnkStruct_ov12_02235FE0 * ov12_02236004 (int param0, const UnkStruct_ov12_022360 void ov12_02236030 (UnkStruct_ov12_02235FE0 * param0, const UnkStruct_ov12_02236030 * param1) { param0->unk_04 = *param1; - param0->unk_9C = sub_02074470(param0->unk_04.unk_08, 162, NULL); + param0->unk_9C = GetMonData(param0->unk_04.unk_08, MON_DATA_162, NULL); GF_ASSERT(param0->unk_9C < 12 + 1); @@ -379,11 +379,11 @@ void ov12_02236030 (UnkStruct_ov12_02235FE0 * param0, const UnkStruct_ov12_02236 if (param0->unk_04.unk_04 != 0) { param0->unk_98 = param0->unk_04.unk_04; } else { - param0->unk_98 = sub_02074470(param0->unk_04.unk_08, 155, NULL); + param0->unk_98 = GetMonData(param0->unk_04.unk_08, MON_DATA_POKEBALL, NULL); } } else { param0->unk_94 = 1; - sub_02074470(param0->unk_04.unk_08, 171, ¶m0->unk_A0); + GetMonData(param0->unk_04.unk_08, MON_DATA_171, ¶m0->unk_A0); } } diff --git a/src/overlay012/ov12_022384F0.c b/src/overlay012/ov12_022384F0.c deleted file mode 100644 index 5ab446abf0..0000000000 --- a/src/overlay012/ov12_022384F0.c +++ /dev/null @@ -1,33 +0,0 @@ -#include -#include - -#include "overlay012/ov12_022384F0.h" - -BOOL ov12_022384F0 (u32 param0, u32 param1) -{ - switch (param0) { - case 120: - case 125: - case 159: - case 201: - case 215: - case 315: - case 335: - case 359: - case 406: - case 407: - case 467: - case 389: - case 468: - case 99: - return 0; - case 492: - if (param1 == 1) { - return 0; - } - - break; - } - - return 1; -} diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c index f7c908c3d2..fb303c27b2 100644 --- a/src/overlay013/ov13_0221FC20.c +++ b/src/overlay013/ov13_0221FC20.c @@ -395,7 +395,7 @@ static u8 ov13_0221FFDC (UnkStruct_ov13_022213F0 * param0) if ((ov13_022213F0(param0, v0->unk_11) == 1) && (Item_GetAttribute(v0->unk_22, 23, v0->unk_0C) == 0)) { ov13_02221A54(v0->unk_08, v0->unk_22, v0->unk_33, v0->unk_0C); param0->unk_04[v0->unk_11].unk_00 = ov16_0223DFAC(v0->unk_08, v0->unk_28, v0->unk_2C[v0->unk_11]); - v0->unk_20 = sub_02074470(param0->unk_04[v0->unk_11].unk_00, 163, NULL); + v0->unk_20 = GetMonData(param0->unk_04[v0->unk_11].unk_00, MON_DATA_163, NULL); v0->unk_20 -= param0->unk_04[v0->unk_11].unk_10; param0->unk_2075 = 25; } else { @@ -888,7 +888,7 @@ static u8 ov13_022208A4 (UnkStruct_ov13_022213F0 * param0) ov13_02224144(param0); if (param0->unk_2076 == 5) { - param0->unk_207C[0] = (u16)sub_02074470(param0->unk_04[v0->unk_11].unk_00, 58 + v0->unk_34, NULL); + param0->unk_207C[0] = (u16)GetMonData(param0->unk_04[v0->unk_11].unk_00, 58 + v0->unk_34, NULL); param0->unk_2078 = 2; } else { param0->unk_04[v0->unk_11].unk_17_3 = sub_0208E9F0(param0->unk_04[v0->unk_11].unk_00); @@ -898,7 +898,7 @@ static u8 ov13_022208A4 (UnkStruct_ov13_022213F0 * param0) ov13_022234A8(param0, v0->unk_11); } - param0->unk_207A = sub_02074470(param0->unk_04[v0->unk_11].unk_00, 163, NULL); + param0->unk_207A = GetMonData(param0->unk_04[v0->unk_11].unk_00, MON_DATA_163, NULL); param0->unk_2078 = 4; } @@ -955,7 +955,7 @@ static u8 ov13_02220A4C (UnkStruct_ov13_022213F0 * param0) continue; } - param0->unk_207C[v1] = (u16)sub_02074470(param0->unk_04[v0->unk_11].unk_00, 58 + v1, NULL); + param0->unk_207C[v1] = (u16)GetMonData(param0->unk_04[v0->unk_11].unk_00, MON_DATA_58 + v1, NULL); } ov13_02224144(param0); @@ -1207,24 +1207,24 @@ static void ov13_02220F98 (UnkStruct_ov13_022213F0 * param0) for (v0 = 0; v0 < Party_GetCurrentCount(param0->unk_00->unk_00); v0++) { param0->unk_04[v0].unk_00 = Party_GetPokemonBySlotIndex(param0->unk_00->unk_00, v0); - param0->unk_04[v0].unk_04 = sub_02074470(param0->unk_04[v0].unk_00, 5, NULL); + param0->unk_04[v0].unk_04 = GetMonData(param0->unk_04[v0].unk_00, MON_DATA_SPECIES, NULL); if (param0->unk_04[v0].unk_04 == 0) { continue; } - param0->unk_04[v0].unk_06 = sub_02074470(param0->unk_04[v0].unk_00, 165, NULL); - param0->unk_04[v0].unk_08 = sub_02074470(param0->unk_04[v0].unk_00, 166, NULL); - param0->unk_04[v0].unk_0A = sub_02074470(param0->unk_04[v0].unk_00, 167, NULL); - param0->unk_04[v0].unk_0C = sub_02074470(param0->unk_04[v0].unk_00, 168, NULL); - param0->unk_04[v0].unk_0E = sub_02074470(param0->unk_04[v0].unk_00, 169, NULL); - param0->unk_04[v0].unk_10 = sub_02074470(param0->unk_04[v0].unk_00, 163, NULL); - param0->unk_04[v0].unk_12 = sub_02074470(param0->unk_04[v0].unk_00, 164, NULL); - param0->unk_04[v0].unk_14 = (u8)sub_02074470(param0->unk_04[v0].unk_00, 177, NULL); - param0->unk_04[v0].unk_15 = (u8)sub_02074470(param0->unk_04[v0].unk_00, 178, NULL); - param0->unk_04[v0].unk_16_0 = (u8)sub_02074470(param0->unk_04[v0].unk_00, 161, NULL); + param0->unk_04[v0].unk_06 = GetMonData(param0->unk_04[v0].unk_00, MON_DATA_165, NULL); + param0->unk_04[v0].unk_08 = GetMonData(param0->unk_04[v0].unk_00, MON_DATA_166, NULL); + param0->unk_04[v0].unk_0A = GetMonData(param0->unk_04[v0].unk_00, MON_DATA_167, NULL); + param0->unk_04[v0].unk_0C = GetMonData(param0->unk_04[v0].unk_00, MON_DATA_168, NULL); + param0->unk_04[v0].unk_0E = GetMonData(param0->unk_04[v0].unk_00, MON_DATA_169, NULL); + param0->unk_04[v0].unk_10 = GetMonData(param0->unk_04[v0].unk_00, MON_DATA_163, NULL); + param0->unk_04[v0].unk_12 = GetMonData(param0->unk_04[v0].unk_00, MON_DATA_164, NULL); + param0->unk_04[v0].unk_14 = (u8)GetMonData(param0->unk_04[v0].unk_00, MON_DATA_177, NULL); + param0->unk_04[v0].unk_15 = (u8)GetMonData(param0->unk_04[v0].unk_00, MON_DATA_178, NULL); + param0->unk_04[v0].unk_16_0 = (u8)GetMonData(param0->unk_04[v0].unk_00, MON_DATA_161, NULL); - if (sub_02074470(param0->unk_04[v0].unk_00, 176, NULL) == 1) { + if (GetMonData(param0->unk_04[v0].unk_00, MON_DATA_176, NULL) == 1) { param0->unk_04[v0].unk_16_7 = 0; } else { param0->unk_04[v0].unk_16_7 = 1; @@ -1232,10 +1232,10 @@ static void ov13_02220F98 (UnkStruct_ov13_022213F0 * param0) param0->unk_04[v0].unk_17_0 = sub_02075D6C(param0->unk_04[v0].unk_00); param0->unk_04[v0].unk_17_3 = sub_0208E9F0(param0->unk_04[v0].unk_00); - param0->unk_04[v0].unk_17_7 = (u8)sub_02074470(param0->unk_04[v0].unk_00, 76, NULL); - param0->unk_04[v0].unk_18 = (u16)sub_02074470(param0->unk_04[v0].unk_00, 10, NULL); - param0->unk_04[v0].unk_1A = (u16)sub_02074470(param0->unk_04[v0].unk_00, 6, NULL); - param0->unk_04[v0].unk_1C = sub_02074470(param0->unk_04[v0].unk_00, 8, NULL); + param0->unk_04[v0].unk_17_7 = (u8)GetMonData(param0->unk_04[v0].unk_00, MON_DATA_IS_EGG, NULL); + param0->unk_04[v0].unk_18 = (u16)GetMonData(param0->unk_04[v0].unk_00, MON_DATA_10, NULL); + param0->unk_04[v0].unk_1A = (u16)GetMonData(param0->unk_04[v0].unk_00, MON_DATA_HELD_ITEM, NULL); + param0->unk_04[v0].unk_1C = GetMonData(param0->unk_04[v0].unk_00, MON_DATA_EXP, NULL); param0->unk_04[v0].unk_20 = sub_02075AD0(param0->unk_04[v0].unk_04, param0->unk_04[v0].unk_16_0); if (param0->unk_04[v0].unk_16_0 == 100) { @@ -1244,25 +1244,25 @@ static void ov13_02220F98 (UnkStruct_ov13_022213F0 * param0) param0->unk_04[v0].unk_24 = sub_02075AD0(param0->unk_04[v0].unk_04, param0->unk_04[v0].unk_16_0 + 1); } - param0->unk_04[v0].unk_28 = (u8)sub_02074470(param0->unk_04[v0].unk_00, 19, NULL); - param0->unk_04[v0].unk_29 = (u8)sub_02074470(param0->unk_04[v0].unk_00, 20, NULL); - param0->unk_04[v0].unk_2A = (u8)sub_02074470(param0->unk_04[v0].unk_00, 21, NULL); - param0->unk_04[v0].unk_2B = (u8)sub_02074470(param0->unk_04[v0].unk_00, 22, NULL); - param0->unk_04[v0].unk_2C = (u8)sub_02074470(param0->unk_04[v0].unk_00, 23, NULL); - param0->unk_04[v0].unk_2D = (u16)sub_02074470(param0->unk_04[v0].unk_00, 162, NULL); - param0->unk_04[v0].unk_2E = (u8)sub_02074470(param0->unk_04[v0].unk_00, 112, NULL); + param0->unk_04[v0].unk_28 = (u8)GetMonData(param0->unk_04[v0].unk_00, MON_DATA_COOL, NULL); + param0->unk_04[v0].unk_29 = (u8)GetMonData(param0->unk_04[v0].unk_00, MON_DATA_BEAUTY, NULL); + param0->unk_04[v0].unk_2A = (u8)GetMonData(param0->unk_04[v0].unk_00, MON_DATA_CUTE, NULL); + param0->unk_04[v0].unk_2B = (u8)GetMonData(param0->unk_04[v0].unk_00, MON_DATA_SMART, NULL); + param0->unk_04[v0].unk_2C = (u8)GetMonData(param0->unk_04[v0].unk_00, MON_DATA_TOUGH, NULL); + param0->unk_04[v0].unk_2D = (u16)GetMonData(param0->unk_04[v0].unk_00, MON_DATA_162, NULL); + param0->unk_04[v0].unk_2E = (u8)GetMonData(param0->unk_04[v0].unk_00, MON_DATA_FORM, NULL); for (v1 = 0; v1 < 4; v1++) { UnkStruct_ov13_022236B8 * v2 = ¶m0->unk_04[v0].unk_30[v1]; - v2->unk_00 = sub_02074470(param0->unk_04[v0].unk_00, 54 + v1, NULL); + v2->unk_00 = GetMonData(param0->unk_04[v0].unk_00, MON_DATA_MOVE1 + v1, NULL); if (v2->unk_00 == 0) { continue; } - v2->unk_02 = sub_02074470(param0->unk_04[v0].unk_00, 58 + v1, NULL); - v2->unk_03 = sub_02074470(param0->unk_04[v0].unk_00, 62 + v1, NULL); + v2->unk_02 = GetMonData(param0->unk_04[v0].unk_00, MON_DATA_58 + v1, NULL); + v2->unk_03 = GetMonData(param0->unk_04[v0].unk_00, MON_DATA_62 + v1, NULL); v2->unk_03 = MoveTable_GetMoveMaxPP(v2->unk_00, v2->unk_03); v2->unk_04 = MoveTable_GetMoveAttribute(v2->unk_00, 3); v2->unk_05 = MoveTable_GetMoveAttribute(v2->unk_00, 1); diff --git a/src/overlay013/ov13_02221A88.c b/src/overlay013/ov13_02221A88.c index 02751a8690..01781da548 100644 --- a/src/overlay013/ov13_02221A88.c +++ b/src/overlay013/ov13_02221A88.c @@ -3,7 +3,7 @@ #include "struct_decls/struct_0200B144_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_0205AA50.h" #include "overlay013/struct_ov13_0221FC20.h" @@ -1556,7 +1556,7 @@ void ov13_02224108 (UnkStruct_ov13_022213F0 * param0) void ov13_02224144 (UnkStruct_ov13_022213F0 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_ov13_0221FC20 * v1; void * v2; UnkStruct_02023790 * v3; @@ -1567,7 +1567,7 @@ void ov13_02224144 (UnkStruct_ov13_022213F0 * param0) v1 = param0->unk_00; v2 = Item_LoadDataOrGFX(v1->unk_22, 0, v1->unk_0C); v0 = ov16_0223DFAC(v1->unk_08, v1->unk_28, v1->unk_2C[v1->unk_11]); - v4 = sub_02074470(v0, 163, NULL); + v4 = GetMonData(v0, MON_DATA_163, NULL); v5 = 0; if (Item_GetAttributeFromStruct(v2, 15) != 0) { @@ -1658,7 +1658,7 @@ void ov13_02224144 (UnkStruct_ov13_022213F0 * param0) void ov13_0222449C (UnkStruct_ov13_022213F0 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_ov13_0221FC20 * v1; UnkStruct_02023790 * v2; diff --git a/src/overlay013/ov13_022264F4.c b/src/overlay013/ov13_022264F4.c index c438e23f50..e2cb74484c 100644 --- a/src/overlay013/ov13_022264F4.c +++ b/src/overlay013/ov13_022264F4.c @@ -8,7 +8,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_0207ADB4_decl.h" @@ -409,7 +409,7 @@ static u8 ov13_02226A5C (UnkStruct_ov13_02227244 * param0) u32 v2 = Item_GetAttribute(v0->unk_1C, 7, v0->unk_0C); if ((v0->unk_18 != 0) && (v0->unk_1C != 55) && (v2 != 3)) { - UnkStruct_02073C74 * v3; + Pokemon * v3; UnkStruct_02023790 * v4; v3 = ov16_0223DFAC(v0->unk_00, v0->unk_10, v1); diff --git a/src/overlay014/ov14_0221FC20.c b/src/overlay014/ov14_0221FC20.c index 13cf8f41e7..c4c53540d3 100644 --- a/src/overlay014/ov14_0221FC20.c +++ b/src/overlay014/ov14_0221FC20.c @@ -8,7 +8,7 @@ #include "overlay014/struct_ov14_0221FC20_decl.h" #include "overlay016/struct_ov16_0224B9DC_decl.h" -#include "struct_defs/struct_02073C74.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_0207ADB4_t.h" #include "overlay014/struct_ov14_0221FC20_t.h" #include "overlay016/struct_ov16_0224B9DC_t.h" @@ -1312,7 +1312,7 @@ static void ov14_02220D48 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC static void ov14_02220D8C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1) { Party * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; int v2; u8 v3; u8 v4, v5; @@ -1337,7 +1337,7 @@ static void ov14_02220D8C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC for (v2 = 0; v2 < ov16_0223DF60(param0, v3); v2++) { v1 = Party_GetPokemonBySlotIndex(v0, v2); - if ((v2 != v4) && (v2 != v5) && (sub_02074470(v1, 163, NULL) != 0) && (sub_02074470(v1, 174, NULL) != 0) && (sub_02074470(v1, 174, NULL) != 494)) { + if ((v2 != v4) && (v2 != v5) && (GetMonData(v1, MON_DATA_163, NULL) != 0) && (GetMonData(v1, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v1, MON_DATA_SPECIES_EGG, NULL) != 494)) { param1->unk_354.unk_08++; } } @@ -1528,7 +1528,7 @@ static void ov14_02221114 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC static void ov14_022211AC (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1) { Party * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; int v2; u8 v3; u8 v4, v5; @@ -1555,7 +1555,7 @@ static void ov14_022211AC (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC for (v2 = 0; v2 < ov16_0223DF60(param0, v3); v2++) { v1 = Party_GetPokemonBySlotIndex(v0, v2); - if ((v2 != v4) && (v2 != v5) && (sub_02074470(v1, 163, NULL) != 0) && (sub_02074470(v1, 174, NULL) != 0) && (sub_02074470(v1, 174, NULL) != 494) && (sub_02074470(v1, 160, NULL) & v7)) { + if ((v2 != v4) && (v2 != v5) && (GetMonData(v1, MON_DATA_163, NULL) != 0) && (GetMonData(v1, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v1, MON_DATA_SPECIES_EGG, NULL) != 494) && (GetMonData(v1, MON_DATA_160, NULL) & v7)) { ov14_02222D24(param1, v8); return; } @@ -1565,7 +1565,7 @@ static void ov14_022211AC (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC static void ov14_022212A0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1) { Party * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; int v2; u8 v3; u8 v4, v5; @@ -1592,7 +1592,7 @@ static void ov14_022212A0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC for (v2 = 0; v2 < ov16_0223DF60(param0, v3); v2++) { v1 = Party_GetPokemonBySlotIndex(v0, v2); - if ((v2 != v4) && (v2 != v5) && (sub_02074470(v1, 163, NULL) != 0) && (sub_02074470(v1, 174, NULL) != 0) && (sub_02074470(v1, 174, NULL) != 494) && ((sub_02074470(v1, 160, NULL) & v7) == 0)) { + if ((v2 != v4) && (v2 != v5) && (GetMonData(v1, MON_DATA_163, NULL) != 0) && (GetMonData(v1, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v1, MON_DATA_SPECIES_EGG, NULL) != 494) && ((GetMonData(v1, MON_DATA_160, NULL) & v7) == 0)) { ov14_02222D24(param1, v8); return; } @@ -2223,7 +2223,7 @@ static void ov14_02221D88 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC int v1; int v2; int v3; - UnkStruct_02073C74 * v4; + Pokemon * v4; ov14_02222D24(param1, 1); @@ -2235,7 +2235,7 @@ static void ov14_02221D88 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC v4 = ov16_0223DFAC(param0, v0, v3); if (v3 != param1->unk_219C[v0]) { - if (sub_02074470(v4, 163, NULL) != sub_02074470(v4, 164, NULL)) { + if (GetMonData(v4, MON_DATA_163, NULL) != GetMonData(v4, MON_DATA_164, NULL)) { ov14_02222D24(param1, v2); break; } @@ -2249,7 +2249,7 @@ static void ov14_02221E18 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC int v1; int v2; int v3, v4; - UnkStruct_02073C74 * v5; + Pokemon * v5; ov14_02222D24(param1, 1); @@ -2262,7 +2262,7 @@ static void ov14_02221E18 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC if (v3 != param1->unk_219C[v0]) { for (v4 = 0; v4 < 4; v4++) { - if (sub_02074470(v5, 58 + v4, NULL) != sub_02074470(v5, 66 + v4, NULL)) { + if (GetMonData(v5, MON_DATA_58 + v4, NULL) != GetMonData(v5, MON_DATA_66 + v4, NULL)) { ov14_02222D24(param1, v2); break; } @@ -2388,7 +2388,7 @@ static void ov14_022220CC (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC s32 v7[4]; u16 v8[4]; u8 v9[6]; - UnkStruct_02073C74 * v10; + Pokemon * v10; ov14_02222D24(param1, 1); @@ -2406,16 +2406,16 @@ static void ov14_022220CC (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC if (v0 != param1->unk_219C[v4]) { v10 = ov16_0223DFAC(param0, v4, v0); - if ((sub_02074470(v10, 163, NULL) != 0) && (sub_02074470(v10, 174, NULL) != 0) && (sub_02074470(v10, 174, NULL) != 494)) { + if ((GetMonData(v10, MON_DATA_163, NULL) != 0) && (GetMonData(v10, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v10, MON_DATA_SPECIES_EGG, NULL) != 494)) { for (v1 = 0; v1 < 4; v1++) { - v8[v1] = sub_02074470(v10, 54 + v1, NULL); + v8[v1] = GetMonData(v10, MON_DATA_MOVE1 + v1, NULL); } for (v1 = 0; v1 < 6; v1++) { - v9[v1] = sub_02074470(v10, 70 + v1, NULL); + v9[v1] = GetMonData(v10, MON_DATA_HP_IV + v1, NULL); } - v6 = ov14_02222D7C(param0, param1, param1->unk_354.unk_7B, &v8[0], &v7[0], sub_02074470(v10, 6, NULL), &v9[0], sub_02074470(v10, 10, NULL), 0, v2); + v6 = ov14_02222D7C(param0, param1, param1->unk_354.unk_7B, &v8[0], &v7[0], GetMonData(v10, MON_DATA_HELD_ITEM, NULL), &v9[0], GetMonData(v10, MON_DATA_10, NULL), MON_DATA_PERSONALITY, v2); if (v6 > v5) { ov14_02222D24(param1, v3); @@ -3399,7 +3399,7 @@ static BOOL ov14_0222342C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC u16 v2; int v3; u32 v4; - UnkStruct_02073C74 * v5; + Pokemon * v5; if (ov16_0223DF0C(param0) & 0x2) { return 0; @@ -3423,14 +3423,14 @@ static BOOL ov14_0222342C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC for (v0 = 0; v0 < ov16_0223DF60(param0, param2); v0++) { v5 = ov16_0223DFAC(param0, param2, v0); - if ((sub_02074470(v5, 163, NULL) != 0) && (sub_02074470(v5, 174, NULL) != 0) && (sub_02074470(v5, 174, NULL) != 494) && (v0 != param1->unk_219C[param2])) { + if ((GetMonData(v5, MON_DATA_163, NULL) != 0) && (GetMonData(v5, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v5, MON_DATA_SPECIES_EGG, NULL) != 494) && (v0 != param1->unk_219C[param2])) { for (v1 = 0; v1 < 4; v1++) { - v2 = sub_02074470(v5, 54 + v1, NULL); + v2 = GetMonData(v5, MON_DATA_MOVE1 + v1, NULL); v3 = ov16_0225BE3C(param0, param1, v5, v2); if (v2) { v4 = 0; - ov16_022552D4(param1, v2, v3, sub_02074470(v5, 10, NULL), ov16_02255A4C(param1, param2 ^ 1), ov16_02258AB8(param1, param2 ^ 1), ov16_02252060(param1, param2 ^ 1, 27, NULL), ov16_02252060(param1, param2 ^ 1, 28, NULL), &v4); + ov16_022552D4(param1, v2, v3, GetMonData(v5, MON_DATA_10, NULL), ov16_02255A4C(param1, param2 ^ 1), ov16_02258AB8(param1, param2 ^ 1), ov16_02252060(param1, param2 ^ 1, 27, NULL), ov16_02252060(param1, param2 ^ 1, 28, NULL), &v4); if (v4 & 0x2) { if ((ov16_0223F4BC(param0) % 3) < 2) { @@ -3457,7 +3457,7 @@ static BOOL ov14_022235F0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC u32 v8; int v9, v10; int v11; - UnkStruct_02073C74 * v12; + Pokemon * v12; if (ov16_0223DF0C(param0) & 0x2) { v2 = 0; @@ -3515,16 +3515,16 @@ static BOOL ov14_022235F0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC for (v0 = v9; v0 < v10; v0++) { v12 = ov16_0223DFAC(param0, param2, v0); - if ((sub_02074470(v12, 163, NULL) != 0) && (sub_02074470(v12, 174, NULL) != 0) && (sub_02074470(v12, 174, NULL) != 494) && (v0 != param1->unk_219C[v4]) && (v0 != param1->unk_219C[v5]) && (v0 != param1->unk_21A4[v4]) && (v0 != param1->unk_21A4[v5])) { + if ((GetMonData(v12, MON_DATA_163, NULL) != 0) && (GetMonData(v12, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v12, MON_DATA_SPECIES_EGG, NULL) != 494) && (v0 != param1->unk_219C[v4]) && (v0 != param1->unk_219C[v5]) && (v0 != param1->unk_21A4[v4]) && (v0 != param1->unk_21A4[v5])) { for (v1 = 0; v1 < 4; v1++) { - v6 = sub_02074470(v12, 54 + v1, NULL); + v6 = GetMonData(v12, MON_DATA_MOVE1 + v1, NULL); v7 = ov16_0225BE3C(param0, param1, v12, v6); if ((v6) && (param1->unk_354.unk_8A[v6].unk_03)) { v8 = 0; if (param1->unk_2D40[v2].unk_4C) { - ov16_022552D4(param1, v6, v7, sub_02074470(v12, 10, NULL), ov16_02255A4C(param1, v2), ov16_02258AB8(param1, v2), ov16_02252060(param1, v2, 27, NULL), ov16_02252060(param1, v2, 28, NULL), &v8); + ov16_022552D4(param1, v6, v7, GetMonData(v12, MON_DATA_10, NULL), ov16_02255A4C(param1, v2), ov16_02258AB8(param1, v2), ov16_02252060(param1, v2, 27, NULL), ov16_02252060(param1, v2, 28, NULL), &v8); } if (v8 & 0x2) { @@ -3537,7 +3537,7 @@ static BOOL ov14_022235F0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC v8 = 0; if (param1->unk_2D40[v3].unk_4C) { - ov16_022552D4(param1, v6, v7, sub_02074470(v12, 10, NULL), ov16_02255A4C(param1, v3), ov16_02258AB8(param1, v3), ov16_02252060(param1, v3, 27, NULL), ov16_02252060(param1, v3, 28, NULL), &v8); + ov16_022552D4(param1, v6, v7, GetMonData(v12, MON_DATA_10, NULL), ov16_02255A4C(param1, v3), ov16_02258AB8(param1, v3), ov16_02252060(param1, v3, 27, NULL), ov16_02252060(param1, v3, 28, NULL), &v8); } if (v8 & 0x2) { @@ -3554,16 +3554,16 @@ static BOOL ov14_022235F0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC for (v0 = v9; v0 < v10; v0++) { v12 = ov16_0223DFAC(param0, param2, v0); - if ((sub_02074470(v12, 163, NULL) != 0) && (sub_02074470(v12, 174, NULL) != 0) && (sub_02074470(v12, 174, NULL) != 494) && (v0 != param1->unk_219C[v4]) && (v0 != param1->unk_219C[v5]) && (v0 != param1->unk_21A4[v4]) && (v0 != param1->unk_21A4[v5])) { + if ((GetMonData(v12, MON_DATA_163, NULL) != 0) && (GetMonData(v12, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v12, MON_DATA_SPECIES_EGG, NULL) != 494) && (v0 != param1->unk_219C[v4]) && (v0 != param1->unk_219C[v5]) && (v0 != param1->unk_21A4[v4]) && (v0 != param1->unk_21A4[v5])) { for (v1 = 0; v1 < 4; v1++) { - v6 = sub_02074470(v12, 54 + v1, NULL); + v6 = GetMonData(v12, MON_DATA_MOVE1 + v1, NULL); v7 = ov16_0225BE3C(param0, param1, v12, v6); if ((v6) && (param1->unk_354.unk_8A[v6].unk_03)) { v8 = 0; if (param1->unk_2D40[v2].unk_4C) { - ov16_022552D4(param1, v6, v7, sub_02074470(v12, 10, NULL), ov16_02255A4C(param1, v2), ov16_02258AB8(param1, v2), ov16_02252060(param1, v2, 27, NULL), ov16_02252060(param1, v2, 28, NULL), &v8); + ov16_022552D4(param1, v6, v7, GetMonData(v12, MON_DATA_10, NULL), ov16_02255A4C(param1, v2), ov16_02258AB8(param1, v2), ov16_02252060(param1, v2, 27, NULL), ov16_02252060(param1, v2, 28, NULL), &v8); } if (v8 == 0) { @@ -3576,7 +3576,7 @@ static BOOL ov14_022235F0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC v8 = 0; if (param1->unk_2D40[v3].unk_4C) { - ov16_022552D4(param1, v6, v7, sub_02074470(v12, 10, NULL), ov16_02255A4C(param1, v3), ov16_02258AB8(param1, v3), ov16_02252060(param1, v3, 27, NULL), ov16_02252060(param1, v3, 28, NULL), &v8); + ov16_022552D4(param1, v6, v7, GetMonData(v12, MON_DATA_10, NULL), ov16_02255A4C(param1, v3), ov16_02258AB8(param1, v3), ov16_02252060(param1, v3, 27, NULL), ov16_02252060(param1, v3, 28, NULL), &v8); } if (v8 == 0) { @@ -3666,7 +3666,7 @@ static BOOL ov14_02223C8C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC u8 v4; u8 v5; int v6, v7; - UnkStruct_02073C74 * v8; + Pokemon * v8; if ((ov14_02223B34(param0, param1, param2, 1)) && (ov16_0223F4BC(param0) % 3 != 0)) { return 0; @@ -3710,8 +3710,8 @@ static BOOL ov14_02223C8C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC for (v0 = v6; v0 < v7; v0++) { v8 = ov16_0223DFAC(param0, param2, v0); - if ((sub_02074470(v8, 163, NULL) != 0) && (sub_02074470(v8, 174, NULL) != 0) && (sub_02074470(v8, 174, NULL) != 494) && (v0 != param1->unk_219C[v1]) && (v0 != param1->unk_219C[v2]) && (v0 != param1->unk_21A4[v1]) && (v0 != param1->unk_21A4[v2])) { - v4 = sub_02074470(v8, 10, NULL); + if ((GetMonData(v8, MON_DATA_163, NULL) != 0) && (GetMonData(v8, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v8, MON_DATA_SPECIES_EGG, NULL) != 494) && (v0 != param1->unk_219C[v1]) && (v0 != param1->unk_219C[v2]) && (v0 != param1->unk_21A4[v1]) && (v0 != param1->unk_21A4[v2])) { + v4 = GetMonData(v8, MON_DATA_10, NULL); if ((v5 == v4) && (ov16_0223F4BC(param0) & 1)) { param1->unk_21A4[param2] = v0; @@ -3731,7 +3731,7 @@ static BOOL ov14_02223E10 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC int v5; u32 v6; int v7, v8; - UnkStruct_02073C74 * v9; + Pokemon * v9; if ((param1->unk_3064[param2] == 0) || (param1->unk_306C[param2] == 0xff)) { return 0; @@ -3755,20 +3755,20 @@ static BOOL ov14_02223E10 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC for (v0 = v7; v0 < v8; v0++) { v9 = ov16_0223DFAC(param0, param2, v0); - if ((sub_02074470(v9, 163, NULL) != 0) && (sub_02074470(v9, 174, NULL) != 0) && (sub_02074470(v9, 174, NULL) != 494) && (v0 != param1->unk_219C[v2]) && (v0 != param1->unk_219C[v3]) && (v0 != param1->unk_21A4[v2]) && (v0 != param1->unk_21A4[v3])) { + if ((GetMonData(v9, MON_DATA_163, NULL) != 0) && (GetMonData(v9, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v9, MON_DATA_SPECIES_EGG, NULL) != 494) && (v0 != param1->unk_219C[v2]) && (v0 != param1->unk_219C[v3]) && (v0 != param1->unk_21A4[v2]) && (v0 != param1->unk_21A4[v3])) { v6 = 0; v5 = ov14_0222327C(param0, param1, param1->unk_306C[param2], param1->unk_3064[param2]); - ov16_022552D4(param1, param1->unk_3064[param2], v5, ov16_02255A4C(param1, param1->unk_306C[param2]), sub_02074470(v9, 10, NULL), ov16_0225B0FC(param1, sub_02074470(v9, 6, NULL), 1), sub_02074470(v9, 177, NULL), sub_02074470(v9, 178, NULL), &v6); + ov16_022552D4(param1, param1->unk_3064[param2], v5, ov16_02255A4C(param1, param1->unk_306C[param2]), GetMonData(v9, MON_DATA_10, NULL), ov16_0225B0FC(param1, GetMonData(v9, MON_DATA_HELD_ITEM, NULL), 1), GetMonData(v9, MON_DATA_177, NULL), GetMonData(v9, MON_DATA_178, NULL), &v6); if (v6 & param3) { for (v1 = 0; v1 < 4; v1++) { - v4 = sub_02074470(v9, 54 + v1, NULL); + v4 = GetMonData(v9, MON_DATA_MOVE1 + v1, NULL); v5 = ov16_0225BE3C(param0, param1, v9, v4); if (v4) { v6 = 0; - ov16_022552D4(param1, v4, v5, sub_02074470(v9, 10, NULL), ov16_02255A4C(param1, param1->unk_306C[param2]), ov16_02258AB8(param1, param1->unk_306C[param2]), ov16_02252060(param1, param1->unk_306C[param2], 27, NULL), ov16_02252060(param1, param1->unk_306C[param2], 28, NULL), &v6); + ov16_022552D4(param1, v4, v5, GetMonData(v9, MON_DATA_10, NULL), ov16_02255A4C(param1, param1->unk_306C[param2]), ov16_02258AB8(param1, param1->unk_306C[param2]), ov16_02252060(param1, param1->unk_306C[param2], 27, NULL), ov16_02252060(param1, param1->unk_306C[param2], 28, NULL), &v6); if (v6 & 0x2) { if ((ov16_0223F4BC(param0) % param4) == 0) { @@ -3843,7 +3843,7 @@ static BOOL ov14_022241A4 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC int v1; u8 v2, v3, v4; int v5, v6; - UnkStruct_02073C74 * v7; + Pokemon * v7; if ((param1->unk_2D40[param2].unk_70 & (0xe000 | 0x4000000)) || (param1->unk_2D40[param2].unk_80 & 0x400) || (ov16_022555A4(param0, param1, 2, param2, 23)) || (ov16_022555A4(param0, param1, 2, param2, 71)) || ((ov16_022555A4(param0, param1, 6, param2, 42) && ((ov16_02252060(param1, param2, 27, NULL) == 8) || ((ov16_02252060(param1, param2, 28, NULL) == 8)))))) { return 0; @@ -3864,7 +3864,7 @@ static BOOL ov14_022241A4 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC for (v0 = v5; v0 < v6; v0++) { v7 = ov16_0223DFAC(param0, param2, v0); - if ((sub_02074470(v7, 163, NULL) != 0) && (sub_02074470(v7, 174, NULL) != 0) && (sub_02074470(v7, 174, NULL) != 494) && (v0 != param1->unk_219C[v2]) && (v0 != param1->unk_219C[v3]) && (v0 != param1->unk_21A4[v2]) && (v0 != param1->unk_21A4[v3])) { + if ((GetMonData(v7, MON_DATA_163, NULL) != 0) && (GetMonData(v7, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v7, MON_DATA_SPECIES_EGG, NULL) != 494) && (v0 != param1->unk_219C[v2]) && (v0 != param1->unk_219C[v3]) && (v0 != param1->unk_21A4[v2]) && (v0 != param1->unk_21A4[v3])) { v1++; } } @@ -3916,7 +3916,7 @@ int ov14_022243BC (UnkStruct_0207ADB4 * param0, int param1) u8 v1, v2; u32 v3; int v4, v5; - UnkStruct_02073C74 * v6; + Pokemon * v6; UnkStruct_ov16_0224B9DC * v7; v7 = param0->unk_30; @@ -3940,7 +3940,7 @@ int ov14_022243BC (UnkStruct_0207ADB4 * param0, int param1) for (v0 = v4; v0 < v5; v0++) { v6 = ov16_0223DFAC(param0, param1, v0); - if ((sub_02074470(v6, 163, NULL) != 0) && (v0 != v7->unk_219C[v1]) && (v0 != v7->unk_219C[v2]) && (v0 != v7->unk_21A4[v1]) && (v0 != v7->unk_21A4[v2])) { + if ((GetMonData(v6, MON_DATA_163, NULL) != 0) && (v0 != v7->unk_219C[v1]) && (v0 != v7->unk_219C[v2]) && (v0 != v7->unk_21A4[v1]) && (v0 != v7->unk_21A4[v2])) { break; } } @@ -3969,7 +3969,7 @@ BOOL ov14_022244B0 (UnkStruct_0207ADB4 * param0, int param1) BOOL v4; u8 * v5; Party * v6; - UnkStruct_02073C74 * v7; + Pokemon * v7; UnkStruct_ov16_0224B9DC * v8; v8 = param0->unk_30; @@ -3990,7 +3990,7 @@ BOOL ov14_022244B0 (UnkStruct_0207ADB4 * param0, int param1) for (v0 = 0; v0 < Party_GetCurrentCount(v6); v0++) { v7 = Party_GetPokemonBySlotIndex(v6, v0); - if ((sub_02074470(v7, 163, NULL) != 0) && (sub_02074470(v7, 174, NULL) != 0) && (sub_02074470(v7, 174, NULL) != 494)) { + if ((GetMonData(v7, MON_DATA_163, NULL) != 0) && (GetMonData(v7, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v7, MON_DATA_SPECIES_EGG, NULL) != 494)) { v1++; } } diff --git a/src/overlay016/ov16_0223B140.c b/src/overlay016/ov16_0223B140.c index f74ad865f5..e2139d656a 100644 --- a/src/overlay016/ov16_0223B140.c +++ b/src/overlay016/ov16_0223B140.c @@ -15,7 +15,7 @@ #include "overlay016/struct_ov16_0225BFFC_decl.h" #include "struct_defs/struct_02008A90.h" -#include "struct_defs/struct_02073C74.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_0207A778.h" #include "struct_defs/struct_0207ADB4_t.h" #include "struct_defs/struct_0207C690.h" @@ -266,7 +266,7 @@ BOOL ov16_0223B140 (UnkStruct_020067E8 * param0, int * param1) int v1; int v2; int v3; - UnkStruct_02073C74 * v4; + Pokemon * v4; v2 = ov16_0223ECC4(v0, &v1, &v3); @@ -965,7 +965,7 @@ static void ov16_0223C210 (UnkStruct_0207ADB4 * param0) int v1; int v2; UnkStruct_ov16_0224B9DC * v3; - UnkStruct_02073C74 * v4; + Pokemon * v4; v0 = ov16_0223E22C(param0); @@ -977,7 +977,7 @@ static void ov16_0223C210 (UnkStruct_0207ADB4 * param0) for (v1 = 0; v1 < param0->unk_44; v1++) { v2 = ov16_0225B45C(param0, v3, 2, v1); v4 = ov16_0223DFAC(param0, v1, v2); - ov16_0225C038(param0, param0->unk_34[v1], sub_02074470(v4, 155, NULL), v2); + ov16_0225C038(param0, param0->unk_34[v1], GetMonData(v4, MON_DATA_POKEBALL, NULL), v2); } ov16_0223DECC(); @@ -1068,8 +1068,8 @@ static void ov16_0223C2C0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov6_02240D5C * { int v0, v1; UnkStruct_ov16_0223C2C0 v2; - UnkStruct_02073C74 * v3; - UnkStruct_02073C74 * v4; + Pokemon * v3; + Pokemon * v4; param0->unk_2C = param1->unk_00; @@ -1165,7 +1165,7 @@ static void ov16_0223C2C0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov6_02240D5C * for (v1 = 0; v1 < Party_GetCurrentCount(param0->unk_68[v0]); v1++) { v3 = Party_GetPokemonBySlotIndex(param0->unk_68[v0], v1); - if ((sub_02074470(v3, 5, NULL)) && (sub_02074470(v3, 76, NULL) == 0) && (sub_02074470(v3, 163, NULL))) { + if ((GetMonData(v3, MON_DATA_SPECIES, NULL)) && (GetMonData(v3, MON_DATA_IS_EGG, NULL) == 0) && (GetMonData(v3, MON_DATA_163, NULL))) { break; } } @@ -1192,7 +1192,7 @@ static void ov16_0223C2C0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov6_02240D5C * for (v1 = 0; v1 < Party_GetCurrentCount(param0->unk_68[v0]); v1++) { v3 = Party_GetPokemonBySlotIndex(param0->unk_68[v0], v1); - if ((sub_02074470(v3, 5, NULL)) && (sub_02074470(v3, 76, NULL) == 0) && (sub_02074470(v3, 163, NULL))) { + if ((GetMonData(v3, MON_DATA_SPECIES, NULL)) && (GetMonData(v3, MON_DATA_IS_EGG, NULL) == 0) && (GetMonData(v3, MON_DATA_163, NULL))) { break; } } @@ -1220,11 +1220,11 @@ static void ov16_0223C2C0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov6_02240D5C * v3 = Party_GetPokemonBySlotIndex(param0->unk_68[v0 & 1], v1); if (v0 > 1) { - if ((ov16_0225B45C(param0, param0->unk_30, 2, v0 & 1) != v1) && (sub_02074470(v3, 5, NULL)) && (sub_02074470(v3, 76, NULL) == 0) && (sub_02074470(v3, 163, NULL))) { + if ((ov16_0225B45C(param0, param0->unk_30, 2, v0 & 1) != v1) && (GetMonData(v3, MON_DATA_SPECIES, NULL)) && (GetMonData(v3, MON_DATA_IS_EGG, NULL) == 0) && (GetMonData(v3, MON_DATA_163, NULL))) { break; } } else { - if ((sub_02074470(v3, 5, NULL)) && (sub_02074470(v3, 76, NULL) == 0) && (sub_02074470(v3, 163, NULL))) { + if ((GetMonData(v3, MON_DATA_SPECIES, NULL)) && (GetMonData(v3, MON_DATA_IS_EGG, NULL) == 0) && (GetMonData(v3, MON_DATA_163, NULL))) { break; } } @@ -1248,7 +1248,7 @@ static void ov16_0223C2C0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov6_02240D5C * for (v1 = 0; v1 < Party_GetCurrentCount(param0->unk_68[v0]); v1++) { v3 = Party_GetPokemonBySlotIndex(param0->unk_68[v0], v1); - if ((sub_02074470(v3, 5, NULL)) && (sub_02074470(v3, 76, NULL) == 0) && (sub_02074470(v3, 163, NULL))) { + if ((GetMonData(v3, MON_DATA_SPECIES, NULL)) && (GetMonData(v3, MON_DATA_IS_EGG, NULL) == 0) && (GetMonData(v3, MON_DATA_163, NULL))) { break; } } @@ -1280,11 +1280,11 @@ static void ov16_0223C2C0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov6_02240D5C * v3 = ov16_0223DFAC(param0, v0, v1); if (v0 == 2) { - if ((sub_02074470(v3, 5, NULL)) && (sub_02074470(v3, 76, NULL) == 0) && (sub_02074470(v3, 163, NULL)) && (v8 != v1)) { + if ((GetMonData(v3, MON_DATA_SPECIES, NULL)) && (GetMonData(v3, MON_DATA_IS_EGG, NULL) == 0) && (GetMonData(v3, MON_DATA_163, NULL)) && (v8 != v1)) { break; } } else { - if ((sub_02074470(v3, 5, NULL)) && (sub_02074470(v3, 76, NULL) == 0) && (sub_02074470(v3, 163, NULL))) { + if ((GetMonData(v3, MON_DATA_SPECIES, NULL)) && (GetMonData(v3, MON_DATA_IS_EGG, NULL) == 0) && (GetMonData(v3, MON_DATA_163, NULL))) { break; } } @@ -1317,7 +1317,7 @@ static void ov16_0223C2C0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov6_02240D5C * for (v1 = 0; v1 < Party_GetCurrentCount(param0->unk_68[v0]); v1++) { v3 = Party_GetPokemonBySlotIndex(param0->unk_68[v0], v1); - if ((sub_02074470(v3, 5, NULL)) && (sub_02074470(v3, 76, NULL) == 0) && (sub_02074470(v3, 163, NULL))) { + if ((GetMonData(v3, MON_DATA_SPECIES, NULL)) && (GetMonData(v3, MON_DATA_IS_EGG, NULL) == 0) && (GetMonData(v3, MON_DATA_163, NULL))) { break; } } @@ -1346,11 +1346,11 @@ static void ov16_0223C2C0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov6_02240D5C * v3 = Party_GetPokemonBySlotIndex(param0->unk_68[v0 & 1], v1); if (v0 > 1) { - if ((ov16_0225B45C(param0, param0->unk_30, 2, v0 & 1) != v1) && (sub_02074470(v3, 5, NULL)) && (sub_02074470(v3, 76, NULL) == 0) && (sub_02074470(v3, 163, NULL))) { + if ((ov16_0225B45C(param0, param0->unk_30, 2, v0 & 1) != v1) && (GetMonData(v3, MON_DATA_SPECIES, NULL)) && (GetMonData(v3, MON_DATA_IS_EGG, NULL) == 0) && (GetMonData(v3, MON_DATA_163, NULL))) { break; } } else { - if ((sub_02074470(v3, 5, NULL)) && (sub_02074470(v3, 76, NULL) == 0) && (sub_02074470(v3, 163, NULL))) { + if ((GetMonData(v3, MON_DATA_SPECIES, NULL)) && (GetMonData(v3, MON_DATA_IS_EGG, NULL) == 0) && (GetMonData(v3, MON_DATA_163, NULL))) { break; } } @@ -1377,7 +1377,7 @@ static void ov16_0223C2C0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov6_02240D5C * for (v1 = 0; v1 < Party_GetCurrentCount(param0->unk_68[v0]); v1++) { v3 = Party_GetPokemonBySlotIndex(param0->unk_68[v0], v1); - if ((sub_02074470(v3, 5, NULL)) && (sub_02074470(v3, 76, NULL) == 0) && (sub_02074470(v3, 163, NULL))) { + if ((GetMonData(v3, MON_DATA_SPECIES, NULL)) && (GetMonData(v3, MON_DATA_IS_EGG, NULL) == 0) && (GetMonData(v3, MON_DATA_163, NULL))) { break; } } @@ -1391,7 +1391,7 @@ static void ov16_0223C2C0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov6_02240D5C * if (param0->unk_2C & 0x200) { v3 = Party_GetPokemonBySlotIndex(param0->unk_68[1], 0); - sub_02074470(v3, 144, (u8 *)¶m0->unk_AC[1].unk_14); + GetMonData(v3, MON_DATA_144, (u8 *)¶m0->unk_AC[1].unk_14); } if (param0->unk_2C & 0x1) { diff --git a/src/overlay016/ov16_0223DF00.c b/src/overlay016/ov16_0223DF00.c index b70c10f781..47ce65bc18 100644 --- a/src/overlay016/ov16_0223DF00.c +++ b/src/overlay016/ov16_0223DF00.c @@ -32,7 +32,7 @@ #include "struct_defs/struct_0201D738.h" #include "struct_defs/struct_020279FC.h" #include "struct_defs/struct_0205AA50.h" -#include "struct_defs/struct_02073C74.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_0207A9CC.h" #include "struct_defs/struct_0207ADB4_t.h" #include "overlay006/struct_ov6_02240D5C.h" @@ -81,7 +81,7 @@ UnkStruct_ov16_0225BFFC * ov16_0223DF14(UnkStruct_0207ADB4 * param0, int param1) int ov16_0223DF1C(UnkStruct_0207ADB4 * param0); Party * ov16_0223DF20(UnkStruct_0207ADB4 * param0, int param1); int ov16_0223DF60(UnkStruct_0207ADB4 * param0, int param1); -UnkStruct_02073C74 * ov16_0223DFAC(UnkStruct_0207ADB4 * param0, int param1, int param2); +Pokemon * ov16_0223DFAC(UnkStruct_0207ADB4 * param0, int param1, int param2); UnkStruct_02007768 * ov16_0223E000(UnkStruct_0207ADB4 * param0); UnkStruct_ov12_0221FCDC * ov16_0223E008(UnkStruct_0207ADB4 * param0); UnkStruct_0200C6E4 * ov16_0223E010(UnkStruct_0207ADB4 * param0); @@ -140,8 +140,8 @@ UnkStruct_02015F84 * ov16_0223EE28(UnkStruct_0207ADB4 * param0); UnkStruct_0202CC84 * ov16_0223EE30(UnkStruct_0207ADB4 * param0, int param1); void ov16_0223EE70(UnkStruct_0207ADB4 * param0); void ov16_0223EF2C(UnkStruct_0207ADB4 * param0, int param1, int param2); -void ov16_0223EF48(UnkStruct_0207ADB4 * param0, UnkStruct_02073C74 * param1); -void ov16_0223EF68(UnkStruct_0207ADB4 * param0, UnkStruct_02073C74 * param1); +void ov16_0223EF48(UnkStruct_0207ADB4 * param0, Pokemon * param1); +void ov16_0223EF68(UnkStruct_0207ADB4 * param0, Pokemon * param1); void ov16_0223EF8C(UnkStruct_0207ADB4 * param0); u8 * ov16_0223F1E8(UnkStruct_0207ADB4 * param0); u16 * ov16_0223F1F0(UnkStruct_0207ADB4 * param0); @@ -279,7 +279,7 @@ int ov16_0223DF60 (UnkStruct_0207ADB4 * param0, int param1) } } -UnkStruct_02073C74 * ov16_0223DFAC (UnkStruct_0207ADB4 * param0, int param1, int param2) +Pokemon * ov16_0223DFAC (UnkStruct_0207ADB4 * param0, int param1, int param2) { if ((param0->unk_2C & 0x8) || ((param0->unk_2C & 0x10) && (ov16_0223E1F8(param0, param1) & 0x1))) { return Party_GetPokemonBySlotIndex(param0->unk_68[param1], param2); @@ -564,7 +564,7 @@ int ov16_0223E2A4 (UnkStruct_0207ADB4 * param0, int param1, int param2) BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int param3, int param4) { UnkStruct_ov16_0224B9DC * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; BOOL v2; int v3; int v4; @@ -589,7 +589,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par v6 = 0; if (Item_GetAttribute(param4, 15, 5)) { - v3 = sub_02074470(v1, 160, NULL); + v3 = GetMonData(v1, MON_DATA_160, NULL); if (v3 & 0x7) { v3 &= (0x7 ^ 0xffffffff); @@ -609,7 +609,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par } if (Item_GetAttribute(param4, 16, 5)) { - v3 = sub_02074470(v1, 160, NULL); + v3 = GetMonData(v1, MON_DATA_160, NULL); if (v3 & 0xf88) { v3 &= ((0x8 | 0x80 | 0xf00) ^ 0xffffffff); @@ -626,7 +626,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par } if (Item_GetAttribute(param4, 17, 5)) { - v3 = sub_02074470(v1, 160, NULL); + v3 = GetMonData(v1, MON_DATA_160, NULL); if (v3 & 0x10) { v3 &= (0x10 ^ 0xffffffff); @@ -643,7 +643,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par } if (Item_GetAttribute(param4, 18, 5)) { - v3 = sub_02074470(v1, 160, NULL); + v3 = GetMonData(v1, MON_DATA_160, NULL); if (v3 & 0x20) { v3 &= (0x20 ^ 0xffffffff); @@ -660,7 +660,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par } if (Item_GetAttribute(param4, 19, 5)) { - v3 = sub_02074470(v1, 160, NULL); + v3 = GetMonData(v1, MON_DATA_160, NULL); if (v3 & 0x40) { v3 &= (0x40 ^ 0xffffffff); @@ -781,8 +781,8 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par if (Item_GetAttribute(param4, 36, 5)) { v3 = Item_GetAttribute(param4, 55, 5); - if (sub_02074470(v1, 58 + param3, NULL) != sub_02074470(v1, 66 + param3, NULL)) { - sub_0207536C(v1, 58 + param3, v3); + if (GetMonData(v1, MON_DATA_58 + param3, NULL) != GetMonData(v1, MON_DATA_66 + param3, NULL)) { + sub_0207536C(v1, MON_DATA_58 + param3, v3); if ((v4 == param2) || (v5 == param2)) { if (((ov16_02252060(v0, param1, 53, NULL) & 0x200000) == 0) && ((ov16_02252060(v0, param1, 75, NULL) & sub_020787CC(param3)) == 0)) { @@ -798,8 +798,8 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par v3 = Item_GetAttribute(param4, 55, 5); for (param3 = 0; param3 < 4; param3++) { - if (sub_02074470(v1, 58 + param3, NULL) != sub_02074470(v1, 66 + param3, NULL)) { - sub_0207536C(v1, 58 + param3, v3); + if (GetMonData(v1, MON_DATA_58 + param3, NULL) != GetMonData(v1, MON_DATA_66 + param3, NULL)) { + sub_0207536C(v1, MON_DATA_58 + param3, v3); if ((v4 == param2) || (v5 == param2)) { if (((ov16_02252060(v0, param1, 53, NULL) & 0x200000) == 0) && ((ov16_02252060(v0, param1, 75, NULL) & sub_020787CC(param3)) == 0)) { @@ -816,29 +816,29 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par v3 = 0; if (Item_GetAttribute(param4, 23, 5)) { - if (sub_02074470(v1, 163, NULL) == 0) { + if (GetMonData(v1, MON_DATA_163, NULL) == 0) { v3 = 1; } } else { - v3 = sub_02074470(v1, 163, NULL); + v3 = GetMonData(v1, MON_DATA_163, NULL); } - if ((v3) && (sub_02074470(v1, 163, NULL) != sub_02074470(v1, 164, NULL))) { + if ((v3) && (GetMonData(v1, MON_DATA_163, NULL) != GetMonData(v1, MON_DATA_164, NULL))) { v3 = Item_GetAttribute(param4, 54, 5); switch (v3) { case 255: - v3 = sub_02074470(v1, 164, NULL); + v3 = GetMonData(v1, MON_DATA_164, NULL); break; case 254: - v3 = sub_02074470(v1, 164, NULL) / 2; + v3 = GetMonData(v1, MON_DATA_164, NULL) / 2; if (v3 == 0) { v3 = 1; } break; case 253: - v3 = sub_02074470(v1, 164, NULL) * 25 / 100; + v3 = GetMonData(v1, MON_DATA_164, NULL) * 25 / 100; if (v3 == 0) { v3 = 1; @@ -848,7 +848,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par break; } - sub_0207536C(v1, 163, v3); + sub_0207536C(v1, MON_DATA_163, v3); if (!Item_GetAttribute(param4, 23, 5)) { if (ov16_0223E208(param0, param1)) { @@ -865,41 +865,41 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par } if (Item_GetAttribute(param4, 45, 5)) { - if ((sub_02074470(v1, 9, NULL) < 100) && (v2 == 1)) { + if ((GetMonData(v1, MON_DATA_FRIENDSHIP, NULL) < 100) && (v2 == 1)) { v6 = Item_GetAttribute(param4, 56, 5); } } if (Item_GetAttribute(param4, 46, 5)) { - if ((sub_02074470(v1, 9, NULL) >= 100) && (sub_02074470(v1, 9, NULL) < 200) && (v2 == 1)) { + if ((GetMonData(v1, MON_DATA_FRIENDSHIP, NULL) >= 100) && (GetMonData(v1, MON_DATA_FRIENDSHIP, NULL) < 200) && (v2 == 1)) { v6 = Item_GetAttribute(param4, 57, 5); } } if (Item_GetAttribute(param4, 47, 5)) { - if ((sub_02074470(v1, 9, NULL) >= 200) && (v2 == 1)) { + if ((GetMonData(v1, MON_DATA_FRIENDSHIP, NULL) >= 200) && (v2 == 1)) { v6 = Item_GetAttribute(param4, 58, 5); } } if (v6) { if (v6 > 0) { - if (sub_02074470(v1, 155, NULL) == 11) { + if (GetMonData(v1, MON_DATA_POKEBALL, NULL) == 11) { v6++; } - if (sub_02074470(v1, 152, NULL) == ov16_0223E24C(param0)) { + if (GetMonData(v1, MON_DATA_152, NULL) == ov16_0223E24C(param0)) { v6++; } - v3 = sub_02074470(v1, 6, NULL); + v3 = GetMonData(v1, MON_DATA_HELD_ITEM, NULL); if (Item_GetAttribute(param4, 1, 5) == 53) { v6 = v6 * 150 / 100; } } - sub_0207536C(v1, 9, v6); + sub_0207536C(v1, MON_DATA_FRIENDSHIP, v6); if ((v4 == param2) || (v5 == param2)) { ov16_02252A14(v0, param1, 44, v6); @@ -977,7 +977,7 @@ u8 ov16_0223EC58 (UnkStruct_0207ADB4 * param0, int param1, u8 param2) u16 ov16_0223ECC4 (UnkStruct_ov6_02240D5C * param0, int * param1, int * param2) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u16 v1; v1 = 0; @@ -1079,7 +1079,7 @@ UnkStruct_0202CC84 * ov16_0223EE30 (UnkStruct_0207ADB4 * param0, int param1) void ov16_0223EE70 (UnkStruct_0207ADB4 * param0) { int v0, v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; u16 v3; if (param0->unk_2C & (0x4 | 0x80 | 0x20 | 0x200)) { @@ -1088,7 +1088,7 @@ void ov16_0223EE70 (UnkStruct_0207ADB4 * param0) for (v0 = 0; v0 < ov16_0223DF60(param0, 0); v0++) { v2 = ov16_0223DFAC(param0, 0, v0); - v3 = sub_02074470(v2, 174, NULL); + v3 = GetMonData(v2, MON_DATA_SPECIES_EGG, NULL); if ((v3 == 412) && (param0->unk_2414[0] & sub_020787CC(v0))) { switch (ov16_0223E22C(param0)) { @@ -1130,14 +1130,14 @@ void ov16_0223EF2C (UnkStruct_0207ADB4 * param0, int param1, int param2) param0->unk_2414[param1] |= sub_020787CC(param2); } -void ov16_0223EF48 (UnkStruct_0207ADB4 * param0, UnkStruct_02073C74 * param1) +void ov16_0223EF48 (UnkStruct_0207ADB4 * param0, Pokemon * param1) { if (param0->unk_98) { sub_02056A48(param0->unk_98, sub_02076B10(param1)); } } -void ov16_0223EF68 (UnkStruct_0207ADB4 * param0, UnkStruct_02073C74 * param1) +void ov16_0223EF68 (UnkStruct_0207ADB4 * param0, Pokemon * param1) { sub_0206D160(param0->unk_9C, param1, param0->unk_241C, param0->unk_241E, 5); } @@ -1691,7 +1691,7 @@ u32 ov16_0223F904 (Party * param0, UnkStruct_02025E6C * param1) void ov16_0223F938 (UnkStruct_0207ADB4 * param0, int param1) { int v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; int v2; v0 = ov16_02263AE4(param0->unk_34[param1]); @@ -1704,7 +1704,7 @@ void ov16_0223F938 (UnkStruct_0207ADB4 * param0, int param1) } } - if (((v0 & 0x1) == 0) && (sub_02074470(v1, 174, NULL) == 412)) { + if (((v0 & 0x1) == 0) && (GetMonData(v1, MON_DATA_SPECIES_EGG, NULL) == 412)) { sub_0202736C(param0->unk_60, v1); } } @@ -1718,7 +1718,7 @@ void ov16_0223F9A0 (UnkStruct_0207ADB4 * param0, int param1) if ((param0->unk_2C & (0x4 | 0x80)) == 0) { if (v0 & 0x1) { { - UnkStruct_02073C74 * v1; + Pokemon * v1; int v2; v2 = ov16_0225B45C(param0, param0->unk_30, 2, param1); @@ -2271,10 +2271,10 @@ static void ov16_0223FDE4 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225C300 static void ov16_02240460 (UnkStruct_0207ADB4 * param0, u32 param1, int param2) { - UnkStruct_02073C74 * v0; + Pokemon * v0; v0 = ov16_0223DFAC(param0, param2 & 0xff, (param2 & 0xff00) >> 8); - sub_0200B5CC(param0->unk_14, param1, &v0->unk_00); + sub_0200B5CC(param0->unk_14, param1, &v0->box); } static void ov16_02240484 (UnkStruct_0207ADB4 * param0, u32 param1, int param2) @@ -2323,10 +2323,10 @@ static void ov16_02240504 (UnkStruct_0207ADB4 * param0, u32 param1, int param2) static void ov16_02240510 (UnkStruct_0207ADB4 * param0, u32 param1, int param2) { - UnkStruct_02073C74 * v0; + Pokemon * v0; v0 = ov16_0223DFAC(param0, param2 & 0xff, (param2 & 0xff00) >> 8); - sub_0200B538(param0->unk_14, param1, &v0->unk_00); + sub_0200B538(param0->unk_14, param1, &v0->box); } static void ov16_02240534 (UnkStruct_0207ADB4 * param0, u32 param1, int param2) diff --git a/src/overlay016/ov16_022405FC.c b/src/overlay016/ov16_022405FC.c index 6f55c23c0e..21400df7f1 100644 --- a/src/overlay016/ov16_022405FC.c +++ b/src/overlay016/ov16_022405FC.c @@ -29,7 +29,7 @@ #include "struct_defs/struct_020127E8.h" #include "struct_defs/struct_0201EE28.h" #include "struct_defs/struct_0205AA50.h" -#include "struct_defs/struct_02073C74.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_02075874.h" #include "struct_defs/struct_0207A9CC.h" #include "struct_defs/struct_0207ADB4_t.h" @@ -340,7 +340,7 @@ static int ov16_0224B518(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * static u32 ov16_022431BC(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, int param2); static void ov16_022499C0(Party * param0, int param1, int param2, int param3); static int ov16_0224A724(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1); -static void ov16_0224B520(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B7CC * param1, UnkStruct_02073C74 * param2); +static void ov16_0224B520(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B7CC * param1, Pokemon * param2); static void ov16_0224B7CC(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B7CC * param1); static void ov16_0224B850(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, int param2); static void ov16_0224B928(UnkStruct_ov16_0224B9DC * param0, u8 param1, u8 param2); @@ -1912,17 +1912,17 @@ static BOOL ov16_02241D34 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC u16 v7; u16 v8; int v9; - UnkStruct_02073C74 * v10; + Pokemon * v10; for (v3 = 0; v3 < Party_GetCurrentCount(ov16_0223DF20(param0, 0)); v3++) { v10 = ov16_0223DFAC(param0, 0, v3); - if ((sub_02074470(v10, 5, NULL)) && (sub_02074470(v10, 163, NULL))) { + if ((GetMonData(v10, MON_DATA_SPECIES, NULL)) && (GetMonData(v10, MON_DATA_163, NULL))) { if (param1->unk_A4[(param1->unk_74 >> 1) & 1] & sub_020787CC(v3)) { v5++; } - v7 = sub_02074470(v10, 6, NULL); + v7 = GetMonData(v10, MON_DATA_HELD_ITEM, NULL); v9 = ov16_0225B0FC(param1, v7, 1); if (v9 == 51) { @@ -4302,7 +4302,7 @@ static BOOL ov16_02244BC4 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC if (v1 & 0x1) { { Party * v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; int v4; int v5 = 0, v6, v7, v8, v9, v10; int v11, v12; @@ -4336,7 +4336,7 @@ static BOOL ov16_02244BC4 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC for (v7 = v8; v7 < v9; v7++) { v3 = Party_GetPokemonBySlotIndex(v2, v7); - if ((sub_02074470(v3, 5, NULL)) && (sub_02074470(v3, 76, NULL) == 0) && (sub_02074470(v3, 163, NULL))) { + if ((GetMonData(v3, MON_DATA_SPECIES, NULL)) && (GetMonData(v3, MON_DATA_IS_EGG, NULL) == 0) && (GetMonData(v3, MON_DATA_163, NULL))) { v5++; } } @@ -4352,7 +4352,7 @@ static BOOL ov16_02244BC4 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC } while ((v7 == v11) || (v7 == v12)); v3 = Party_GetPokemonBySlotIndex(v2, v7); - } while ((sub_02074470(v3, 5, NULL) == 0) || (sub_02074470(v3, 76, NULL) == 1) || (sub_02074470(v3, 163, NULL) == 0)); + } while ((GetMonData(v3, MON_DATA_SPECIES, NULL) == 0) || (GetMonData(v3, MON_DATA_IS_EGG, NULL) == 1) || (GetMonData(v3, MON_DATA_163, NULL) == 0)); param1->unk_21A0[param1->unk_6C] = v7; } else { @@ -4965,7 +4965,7 @@ static BOOL ov16_02245D68 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC int v2; int v3; int v4; - UnkStruct_02073C74 * v5; + Pokemon * v5; ov16_02248AF0(param1, 1); @@ -4979,7 +4979,7 @@ static BOOL ov16_02245D68 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC while (TRUE) { v5 = ov16_0223DFAC(param0, param1->unk_64, param1->unk_217F); - if ((param1->unk_217F == param1->unk_219C[param1->unk_64]) || ((sub_02074470(v5, 163, NULL) != 0) && (sub_02074470(v5, 174, NULL) != 0) && (sub_02074470(v5, 174, NULL) != 494) && (sub_02074470(v5, 160, NULL) == 0))) { + if ((param1->unk_217F == param1->unk_219C[param1->unk_64]) || ((GetMonData(v5, MON_DATA_163, NULL) != 0) && (GetMonData(v5, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v5, MON_DATA_SPECIES_EGG, NULL) != 494) && (GetMonData(v5, MON_DATA_160, NULL) == 0))) { break; } @@ -4988,9 +4988,9 @@ static BOOL ov16_02245D68 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC } v5 = ov16_0223DFAC(param0, param1->unk_64, param1->unk_217F); - v2 = sub_02074470(v5, 5, NULL); - v3 = sub_02074470(v5, 112, NULL); - v4 = sub_02074470(v5, 161, NULL); + v2 = GetMonData(v5, MON_DATA_SPECIES, NULL); + v3 = GetMonData(v5, MON_DATA_FORM, NULL); + v4 = GetMonData(v5, MON_DATA_161, NULL); param1->unk_2144 = sub_020759CC(v2, v3, 1); param1->unk_2144 *= param1->unk_354.unk_8A[param1->unk_3044].unk_03; @@ -5016,7 +5016,7 @@ static BOOL ov16_02245D68 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC while (TRUE) { v5 = ov16_0223DFAC(param0, param1->unk_64, param1->unk_217F); - if ((param1->unk_217F == param1->unk_219C[param1->unk_64]) || ((sub_02074470(v5, 163, NULL) != 0) && (sub_02074470(v5, 174, NULL) != 0) && (sub_02074470(v5, 174, NULL) != 494) && (sub_02074470(v5, 160, NULL) == 0))) { + if ((param1->unk_217F == param1->unk_219C[param1->unk_64]) || ((GetMonData(v5, MON_DATA_163, NULL) != 0) && (GetMonData(v5, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v5, MON_DATA_SPECIES_EGG, NULL) != 494) && (GetMonData(v5, MON_DATA_160, NULL) == 0))) { break; } @@ -5133,7 +5133,7 @@ static BOOL ov16_022461F4 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC int v3, v4; int v5; int v6; - UnkStruct_02073C74 * v7; + Pokemon * v7; ov16_02248AF0(param1, 1); @@ -5145,9 +5145,9 @@ static BOOL ov16_022461F4 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC if (v3 != param1->unk_219C[param1->unk_64]) { v7 = ov16_0223DFAC(param0, param1->unk_64, v3); - if ((sub_02074470(v7, 174, NULL) != 0) && (sub_02074470(v7, 174, NULL) != 494)) { + if ((GetMonData(v7, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v7, MON_DATA_SPECIES_EGG, NULL) != 494)) { for (v4 = 0; v4 < 4; v4++) { - v2 = sub_02074470(v7, 54 + v4, NULL); + v2 = GetMonData(v7, MON_DATA_MOVE1 + v4, NULL); if ((ov16_02255918(v2) == 0) && (ov16_0225B02C(param0, param1, param1->unk_64, v2) == 1)) { v1[v6] = v2; @@ -6196,19 +6196,19 @@ static BOOL ov16_022476F8 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC u16 v5; u8 v6; u8 v7; - UnkStruct_02073C74 * v8; + Pokemon * v8; ov16_02248AF0(param1, 1); for (v1 = 0; v1 < ov16_0223DF60(param0, 0); v1++) { v8 = ov16_0223DFAC(param0, 0, v1); - v4 = sub_02074470(v8, 174, NULL); - v5 = sub_02074470(v8, 6, NULL); - v6 = sub_02074470(v8, 10, NULL); + v4 = GetMonData(v8, MON_DATA_SPECIES_EGG, NULL); + v5 = GetMonData(v8, MON_DATA_HELD_ITEM, NULL); + v6 = GetMonData(v8, MON_DATA_10, NULL); if ((v6 == 53) && (v4 != 0) && (v4 != 494) && (v5 == 0) && ((ov16_0223F4BC(param0) % 10) == 0)) { v0 = ov16_0223F4BC(param0) % 100; - v7 = (sub_02074470(v8, 161, NULL) - 1) / 10; + v7 = (GetMonData(v8, MON_DATA_161, NULL) - 1) / 10; if (v7 >= 10) { v7 = 9; @@ -6228,7 +6228,7 @@ static BOOL ov16_022476F8 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC if ((v6 == 118) && (v4 != 0) && (v4 != 494) && (v5 == 0)) { v2 = 0; v3 = 10; - v7 = sub_02074470(v8, 161, NULL); + v7 = GetMonData(v8, MON_DATA_161, NULL); while (v7 > v3) { v2++; @@ -7021,7 +7021,7 @@ static BOOL ov16_02248324 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC int v3; int v4 = 0; u32 v5; - UnkStruct_02073C74 * v6; + Pokemon * v6; UnkStruct_ov16_0225BFFC * v7; ov16_02248AF0(param1, 1); @@ -7043,8 +7043,8 @@ static BOOL ov16_02248324 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC for (v3 = 0; v3 < Party_GetCurrentCount(v8); v3++) { v6 = Party_GetPokemonBySlotIndex(v8, v3); - if ((sub_02074470(v6, 174, NULL) != 0) && (sub_02074470(v6, 174, NULL) != 494)) { - v4 += sub_02074470(v6, 163, NULL); + if ((GetMonData(v6, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v6, MON_DATA_SPECIES_EGG, NULL) != 494)) { + v4 += GetMonData(v6, MON_DATA_163, NULL); } } @@ -7054,8 +7054,8 @@ static BOOL ov16_02248324 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC for (v3 = 0; v3 < Party_GetCurrentCount(v9); v3++) { v6 = Party_GetPokemonBySlotIndex(v9, v3); - if ((sub_02074470(v6, 174, NULL) != 0) && (sub_02074470(v6, 174, NULL) != 494)) { - v4 += sub_02074470(v6, 163, NULL); + if ((GetMonData(v6, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v6, MON_DATA_SPECIES_EGG, NULL) != 494)) { + v4 += GetMonData(v6, MON_DATA_163, NULL); } } } @@ -7074,8 +7074,8 @@ static BOOL ov16_02248324 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC for (v3 = 0; v3 < Party_GetCurrentCount(v10); v3++) { v6 = Party_GetPokemonBySlotIndex(v10, v3); - if ((sub_02074470(v6, 174, NULL) != 0) && (sub_02074470(v6, 174, NULL) != 494)) { - v4 += sub_02074470(v6, 163, NULL); + if ((GetMonData(v6, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v6, MON_DATA_SPECIES_EGG, NULL) != 494)) { + v4 += GetMonData(v6, MON_DATA_163, NULL); } } @@ -7228,7 +7228,7 @@ static BOOL ov16_02248708 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC int v0; int v1; int v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; int v4; int v5; @@ -7240,8 +7240,8 @@ static BOOL ov16_02248708 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC if ((param1->unk_2D40[v1].unk_4C) && (param1->unk_219C[v1] != 6)) { v3 = ov16_0223DFAC(param0, v1, param1->unk_219C[v1]); - v4 = sub_02074470(v3, 10, NULL); - v5 = sub_02074470(v3, 160, NULL); + v4 = GetMonData(v3, MON_DATA_10, NULL); + v5 = GetMonData(v3, MON_DATA_160, NULL); if ((param1->unk_2D40[v1].unk_27 != 30) && (ov16_022577A4(param1, v4, v5) == 0)) { ov16_02248AF0(param1, v2); @@ -7647,7 +7647,7 @@ static void ov16_02248E74 (UnkStruct_0201CD38 * param0, void * param1) int v0; int v1; UnkStruct_ov16_0224B7CC * v2 = param1; - UnkStruct_02073C74 * v3; + Pokemon * v3; UnkStruct_ov16_0225C300 v4; int v5; int v6; @@ -7663,7 +7663,7 @@ static void ov16_02248E74 (UnkStruct_0201CD38 * param0, void * param1) for (v1 = v2->unk_30[6]; v1 < ov16_0223DF60(v2->unk_00, v6); v1++) { v3 = ov16_0223DFAC(v2->unk_00, v6, v1); - v9 = sub_02074470(v3, 6, NULL); + v9 = GetMonData(v3, MON_DATA_HELD_ITEM, NULL); v10 = Item_GetAttribute(v9, 1, 5); if ((v10 == 51) || (v2->unk_04->unk_A4[v5] & sub_020787CC(v1))) { @@ -7685,10 +7685,10 @@ static void ov16_02248E74 (UnkStruct_0201CD38 * param0, void * param1) u32 v11; u32 v12; - v9 = sub_02074470(v3, 6, NULL); + v9 = GetMonData(v3, MON_DATA_HELD_ITEM, NULL); v10 = Item_GetAttribute(v9, 1, 5); - if (((v8 & 0x1) == 0) && ((v2->unk_04->unk_2D40[1].unk_4C + v2->unk_04->unk_2D40[3].unk_4C) == 0) && (sub_02074470(v3, 163, NULL)) && (v2->unk_04->unk_3144 == 0)) { + if (((v8 & 0x1) == 0) && ((v2->unk_04->unk_2D40[1].unk_4C + v2->unk_04->unk_2D40[3].unk_4C) == 0) && (GetMonData(v3, MON_DATA_163, NULL)) && (v2->unk_04->unk_3144 == 0)) { sub_0200549C(1127); v2->unk_04->unk_3144 = 1; ov16_0223F460(v2->unk_00, 2); @@ -7697,7 +7697,7 @@ static void ov16_02248E74 (UnkStruct_0201CD38 * param0, void * param1) v11 = 0; v4.unk_02 = 1; - if ((sub_02074470(v3, 163, NULL)) && (sub_02074470(v3, 161, NULL) != 100)) { + if ((GetMonData(v3, MON_DATA_163, NULL)) && (GetMonData(v3, MON_DATA_161, NULL) != 100)) { if (v2->unk_04->unk_A4[v5] & sub_020787CC(v1)) { v11 = v2->unk_04->unk_9C; } @@ -7715,7 +7715,7 @@ static void ov16_02248E74 (UnkStruct_0201CD38 * param0, void * param1) } if (ov16_02259B38(v2->unk_00, v3) == 0) { - if (sub_02074470(v3, 12, NULL) != Unk_020E4C44) { + if (GetMonData(v3, MON_DATA_LANGUAGE, NULL) != Unk_020E4C44) { v11 = v11 * 170 / 100; } else { v11 = v11 * 150 / 100; @@ -7724,7 +7724,7 @@ static void ov16_02248E74 (UnkStruct_0201CD38 * param0, void * param1) v4.unk_02 = 2; } - v12 = sub_02074470(v3, 8, NULL); + v12 = GetMonData(v3, MON_DATA_EXP, NULL); v2->unk_30[3] = v12 - sub_02075AAC(v3); v12 += v11; @@ -7791,12 +7791,12 @@ static void ov16_02248E74 (UnkStruct_0201CD38 * param0, void * param1) int v14[6] = {164, 165, 166, 168, 169, 167}; UnkStruct_ov16_02248E74 * v15; - v13 = sub_02074470(v3, 161, NULL); + v13 = GetMonData(v3, MON_DATA_161, NULL); v2->unk_04->unk_17C = Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_02248E74)); v15 = (UnkStruct_ov16_02248E74 *)v2->unk_04->unk_17C; for (v0 = 0; v0 < 6; v0++) { - v15->unk_00[v0] = sub_02074470(v3, v14[v0], NULL); + v15->unk_00[v0] = GetMonData(v3, v14[v0], NULL); } sub_02075C74(v3, 0, ov16_0223E24C(v2->unk_00)); @@ -7876,7 +7876,7 @@ static void ov16_02248E74 (UnkStruct_0201CD38 * param0, void * param1) v4.unk_02 = 948; v4.unk_01 = 7; - v4.unk_04[0] = sub_02074470(v3, v20[v0], NULL) - v22->unk_00[v0]; + v4.unk_04[0] = GetMonData(v3, v20[v0], NULL) - v22->unk_00[v0]; v4.unk_1C = 2; ov16_0223FB78(v2->unk_00, v21, v7, &v4, 80, 16 * v0, 0x2, 28, 0); @@ -7900,7 +7900,7 @@ static void ov16_02248E74 (UnkStruct_0201CD38 * param0, void * param1) for (v0 = 0; v0 < 6; v0++) { v4.unk_02 = 949; v4.unk_01 = 7; - v4.unk_04[0] = sub_02074470(v3, v24[v0], NULL); + v4.unk_04[0] = GetMonData(v3, v24[v0], NULL); v4.unk_1C = 3; ov16_0223FB78(v2->unk_00, v25, v7, &v4, 72, 16 * v0, 0x2, 36, 0); @@ -8065,7 +8065,7 @@ static void ov16_02248E74 (UnkStruct_0201CD38 * param0, void * param1) v4.unk_02 = 1190; v4.unk_01 = 10; v4.unk_04[0] = v6 | (v1 << 8); - v4.unk_04[1] = sub_02074470(v3, 54 + v2->unk_30[5], NULL); + v4.unk_04[1] = GetMonData(v3, 54 + v2->unk_30[5], NULL); v2->unk_30[0] = ov16_0223FB24(v2->unk_00, v7, &v4, ov16_0223EDF0(v2->unk_00)); v2->unk_28++; break; @@ -8119,18 +8119,18 @@ static void ov16_022499C0 (Party * param0, int param1, int param2, int param3) u16 v4; int v5; int v6; - UnkStruct_02073C74 * v7; + Pokemon * v7; UnkStruct_02075874 * v8; v8 = sub_02075874(param2, param3, 5); v7 = Party_GetPokemonBySlotIndex(param0, param1); - v4 = sub_02074470(v7, 6, NULL); + v4 = GetMonData(v7, MON_DATA_HELD_ITEM, NULL); v5 = Item_GetAttribute(v4, 1, 5); v6 = Item_GetAttribute(v4, 2, 5); v3 = 0; for (v0 = 0; v0 < 6; v0++) { - v2[v0] = sub_02074470(v7, 13 + v0, NULL); + v2[v0] = GetMonData(v7, MON_DATA_HP_EV + v0, NULL); v3 += v2[v0]; } @@ -8213,7 +8213,7 @@ static void ov16_02249B80 (UnkStruct_0201CD38 * param0, void * param1) int v0; int v1; UnkStruct_ov16_0224B7CC * v2 = param1; - UnkStruct_02073C74 * v3; + Pokemon * v3; UnkStruct_02002F38 * v4; UnkStruct_02007768 * v5; UnkStruct_0200B144 * v6; @@ -8389,7 +8389,7 @@ static void ov16_02249B80 (UnkStruct_0201CD38 * param0, void * param1) sub_02003178(v4, (0x1 | 0x2 | 0x4 | 0x8), 0xffff, 1, 0, 16, 0x0); sub_0200872C(v5, 0, 16, 0, 0x0); v2->unk_28 = 32; - } else if (ov16_0223F9E0(v2->unk_00, sub_02074470(v3, 5, NULL))) { + } else if (ov16_0223F9E0(v2->unk_00, GetMonData(v3, MON_DATA_SPECIES, NULL))) { sub_02015738(ov16_0223E220(v2->unk_00), 1); sub_02003178(v4, (0x1 | 0x4), 0xffff, 1, 0, 16, 0x0); sub_0200872C(v5, 0, 16, 0, 0x0); @@ -8541,7 +8541,7 @@ static void ov16_02249B80 (UnkStruct_0201CD38 * param0, void * param1) sub_0200F344(1, 0x0); v3 = ov16_0223DFAC(v2->unk_00, v1, v2->unk_04->unk_219C[v1]); - v16 = sub_0208712C(5, 1, sub_02074470(v3, 5, NULL), 10, ov16_0223EDA4(v2->unk_00)); + v16 = sub_0208712C(5, 1, GetMonData(v3, MON_DATA_SPECIES, NULL), 10, ov16_0223EDA4(v2->unk_00)); v2->unk_50[1] = v16; if (ov16_0223DF60(v2->unk_00, 0) < 6) { @@ -8550,9 +8550,9 @@ static void ov16_02249B80 (UnkStruct_0201CD38 * param0, void * param1) v16->unk_44 = 1174 + ov16_0223F240(v2->unk_00); } - v16->unk_08 = sub_02074470(v3, 112, NULL); + v16->unk_08 = GetMonData(v3, MON_DATA_FORM, NULL); v16->unk_48 = ov16_0223E228(v2->unk_00); - v16->unk_10 = sub_02074470(v3, 111, NULL); + v16->unk_10 = GetMonData(v3, MON_DATA_111, NULL); v2->unk_50[0] = sub_020067E8(&Unk_020F2DAC, v16, 5); v2->unk_28 = 21; @@ -8640,7 +8640,7 @@ static void ov16_02249B80 (UnkStruct_0201CD38 * param0, void * param1) sub_02079A94(v24, v26); for (v27 = 0; v27 < 4; v27++) { - v28 = sub_02074470(v3, 66 + v27, NULL); + v28 = GetMonData(v3, MON_DATA_66 + v27, NULL); sub_02074B30(v3, 58 + v27, &v28); } @@ -9727,7 +9727,7 @@ static const UnkStruct_ov104_0223F9E0 Unk_ov16_0226E6F8 = { 0x0 }; -static void ov16_0224B520 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B7CC * param1, UnkStruct_02073C74 * param2) +static void ov16_0224B520 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B7CC * param1, Pokemon * param2) { UnkStruct_ov104_0223F9E0 v0; UnkStruct_0200C6E4 * v1; @@ -9771,10 +9771,10 @@ static void ov16_0224B520 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B7CC param1->unk_50[0] = sub_02012744(1, 5); - if (sub_02074470(param2, 176, NULL) == 0) { + if (GetMonData(param2, MON_DATA_176, NULL) == 0) { v13 = 2; } else { - v13 = sub_02074470(param2, 111, NULL); + v13 = GetMonData(param2, MON_DATA_111, NULL); } if (v13 == 0) { @@ -9786,7 +9786,7 @@ static void ov16_0224B520 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B7CC } sub_0200B5CC(v5, 0, sub_02076B10(param2)); - sub_0200B60C(v5, 1, sub_02074470(param2, 161, NULL), 3, 0, 1); + sub_0200B60C(v5, 1, GetMonData(param2, MON_DATA_161, NULL), 3, 0, 1); sub_0200C388(v5, v7, v6); sub_020237BC(v6); sub_0201A7A0(&v9); @@ -9839,7 +9839,7 @@ static void ov16_0224B7CC (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B7CC static void ov16_0224B850 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, int param2) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u8 v1, v2; if (ov16_0223E208(param0, param2)) { diff --git a/src/overlay016/ov16_0224B940.c b/src/overlay016/ov16_0224B940.c index 7a9d2bddc2..be28745939 100644 --- a/src/overlay016/ov16_0224B940.c +++ b/src/overlay016/ov16_0224B940.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_02025E6C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_0207ADB4_decl.h" #include "overlay014/struct_ov14_0221FC20_decl.h" @@ -3785,7 +3785,7 @@ static BOOL ov16_0225079C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC int v7 = 0; int v8 = 0; Party * v9; - UnkStruct_02073C74 * v10; + Pokemon * v10; UnkStruct_ov16_0225BFFC * v11; v9 = ov16_0223DF20(param0, v1); @@ -3794,8 +3794,8 @@ static BOOL ov16_0225079C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC for (v5 = 0; v5 < Party_GetCurrentCount(v9); v5++) { v10 = Party_GetPokemonBySlotIndex(v9, v5); - if ((sub_02074470(v10, 174, NULL) != 0) && (sub_02074470(v10, 174, NULL) != 494)) { - if (v6 = sub_02074470(v10, 163, NULL)) { + if ((GetMonData(v10, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v10, MON_DATA_SPECIES_EGG, NULL) != 494)) { + if (v6 = GetMonData(v10, MON_DATA_163, NULL)) { v8++; if (param1->unk_219C[v1 ^ 2] != v5) { @@ -3821,7 +3821,7 @@ static BOOL ov16_0225079C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC int v12; int v13 = 0; Party * v14; - UnkStruct_02073C74 * v15; + Pokemon * v15; UnkStruct_ov16_0225BFFC * v16; v14 = ov16_0223DF20(param0, v1); @@ -3830,8 +3830,8 @@ static BOOL ov16_0225079C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC for (v12 = 0; v12 < Party_GetCurrentCount(v14); v12++) { v15 = Party_GetPokemonBySlotIndex(v14, v12); - if ((sub_02074470(v15, 174, NULL) != 0) && (sub_02074470(v15, 174, NULL) != 494)) { - v13 += sub_02074470(v15, 163, NULL); + if ((GetMonData(v15, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v15, MON_DATA_SPECIES_EGG, NULL) != 494)) { + v13 += GetMonData(v15, MON_DATA_163, NULL); } } @@ -3886,7 +3886,7 @@ static BOOL ov16_02250A48 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC int v4; int v5 = 0; Party * v6; - UnkStruct_02073C74 * v7; + Pokemon * v7; UnkStruct_ov16_0225BFFC * v8; v6 = ov16_0223DF20(param0, v0); @@ -3895,8 +3895,8 @@ static BOOL ov16_02250A48 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC for (v4 = 0; v4 < Party_GetCurrentCount(v6); v4++) { v7 = Party_GetPokemonBySlotIndex(v6, v4); - if ((sub_02074470(v7, 174, NULL) != 0) && (sub_02074470(v7, 174, NULL) != 494)) { - v5 += sub_02074470(v7, 163, NULL); + if ((GetMonData(v7, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v7, MON_DATA_SPECIES_EGG, NULL) != 494)) { + v5 += GetMonData(v7, MON_DATA_163, NULL); } } @@ -3913,7 +3913,7 @@ static BOOL ov16_02250A48 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC int v10 = 0; Party * v11; Party * v12; - UnkStruct_02073C74 * v13; + Pokemon * v13; UnkStruct_ov16_0225BFFC * v14; v11 = ov16_0223DF20(param0, v0); @@ -3923,16 +3923,16 @@ static BOOL ov16_02250A48 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC for (v9 = 0; v9 < Party_GetCurrentCount(v11); v9++) { v13 = Party_GetPokemonBySlotIndex(v11, v9); - if ((sub_02074470(v13, 174, NULL) != 0) && (sub_02074470(v13, 174, NULL) != 494)) { - v10 += sub_02074470(v13, 163, NULL); + if ((GetMonData(v13, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v13, MON_DATA_SPECIES_EGG, NULL) != 494)) { + v10 += GetMonData(v13, MON_DATA_163, NULL); } } for (v9 = 0; v9 < Party_GetCurrentCount(v12); v9++) { v13 = Party_GetPokemonBySlotIndex(v12, v9); - if ((sub_02074470(v13, 174, NULL) != 0) && (sub_02074470(v13, 174, NULL) != 494)) { - v10 += sub_02074470(v13, 163, NULL); + if ((GetMonData(v13, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v13, MON_DATA_SPECIES_EGG, NULL) != 494)) { + v10 += GetMonData(v13, MON_DATA_163, NULL); } } @@ -3951,7 +3951,7 @@ static BOOL ov16_02250A48 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC int v15; int v16 = 0; Party * v17; - UnkStruct_02073C74 * v18; + Pokemon * v18; UnkStruct_ov16_0225BFFC * v19; v17 = ov16_0223DF20(param0, v0); @@ -3960,8 +3960,8 @@ static BOOL ov16_02250A48 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC for (v15 = 0; v15 < Party_GetCurrentCount(v17); v15++) { v18 = Party_GetPokemonBySlotIndex(v17, v15); - if ((sub_02074470(v18, 174, NULL) != 0) && (sub_02074470(v18, 174, NULL) != 494)) { - v16 += sub_02074470(v18, 163, NULL); + if ((GetMonData(v18, MON_DATA_SPECIES_EGG, NULL) != 0) && (GetMonData(v18, MON_DATA_SPECIES_EGG, NULL) != 494)) { + v16 += GetMonData(v18, MON_DATA_163, NULL); } } diff --git a/src/overlay016/ov16_0225177C.c b/src/overlay016/ov16_0225177C.c index 5f69f2beef..2aef5061f8 100644 --- a/src/overlay016/ov16_0225177C.c +++ b/src/overlay016/ov16_0225177C.c @@ -3,7 +3,7 @@ #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02025E6C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_0207ADB4_decl.h" #include "struct_decls/struct_0207D3B0_decl.h" @@ -153,11 +153,11 @@ void ov16_02259868(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1 void ov16_0225991C(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1); int ov16_022599D0(UnkStruct_ov16_0224B9DC * param0, int param1, int param2, int param3); BOOL ov16_02259A28(UnkStruct_ov16_0224B9DC * param0, int param1); -void ov16_02259A5C(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, UnkStruct_02073C74 * param2); +void ov16_02259A5C(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, Pokemon * param2); u8 ov16_02259AB4(UnkStruct_ov16_0224B9DC * param0, int param1); BOOL ov16_02259AC0(UnkStruct_ov16_0224B9DC * param0, int param1); BOOL ov16_02259ADC(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1); -BOOL ov16_02259B38(UnkStruct_0207ADB4 * param0, UnkStruct_02073C74 * param1); +BOOL ov16_02259B38(UnkStruct_0207ADB4 * param0, Pokemon * param1); BOOL ov16_02259B9C(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, int * param2); void ov16_0225A1B0(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1); void ov16_0225A200(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, int param2, int param3); @@ -192,36 +192,36 @@ static BOOL ov16_0225B8E4(UnkStruct_ov16_0224B9DC * param0, int param1); static int ov16_0225B910(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, int param2, int param3); int ov16_0225BA88(UnkStruct_0207ADB4 * param0, int param1); int ov16_0225BE28(UnkStruct_0207ADB4 * param0, int param1); -int ov16_0225BE3C(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, UnkStruct_02073C74 * param2, int param3); +int ov16_0225BE3C(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, Pokemon * param2, int param3); void ov16_0225177C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, int param2, int param3) { - UnkStruct_02073C74 * v0 = ov16_0223DFAC(param0, param2, param3); + Pokemon * v0 = ov16_0223DFAC(param0, param2, param3); int v1; int v2; UnkStruct_02098700 * v3; - param1->unk_2D40[param2].unk_00 = sub_02074470(v0, 5, 0); - param1->unk_2D40[param2].unk_02 = sub_02074470(v0, 165, 0); - param1->unk_2D40[param2].unk_04 = sub_02074470(v0, 166, 0); - param1->unk_2D40[param2].unk_06 = sub_02074470(v0, 167, 0); - param1->unk_2D40[param2].unk_08 = sub_02074470(v0, 168, 0); - param1->unk_2D40[param2].unk_0A = sub_02074470(v0, 169, 0); + param1->unk_2D40[param2].unk_00 = GetMonData(v0, MON_DATA_SPECIES, 0); + param1->unk_2D40[param2].unk_02 = GetMonData(v0, MON_DATA_165, 0); + param1->unk_2D40[param2].unk_04 = GetMonData(v0, MON_DATA_166, 0); + param1->unk_2D40[param2].unk_06 = GetMonData(v0, MON_DATA_167, 0); + param1->unk_2D40[param2].unk_08 = GetMonData(v0, MON_DATA_168, 0); + param1->unk_2D40[param2].unk_0A = GetMonData(v0, MON_DATA_169, 0); for (v1 = 0; v1 < 4; v1++) { - param1->unk_2D40[param2].unk_0C[v1] = sub_02074470(v0, 54 + v1, 0); - param1->unk_2D40[param2].unk_2C[v1] = sub_02074470(v0, 58 + v1, 0); - param1->unk_2D40[param2].unk_30[v1] = sub_02074470(v0, 62 + v1, 0); + param1->unk_2D40[param2].unk_0C[v1] = GetMonData(v0, MON_DATA_MOVE1 + v1, 0); + param1->unk_2D40[param2].unk_2C[v1] = GetMonData(v0, MON_DATA_58 + v1, 0); + param1->unk_2D40[param2].unk_30[v1] = GetMonData(v0, MON_DATA_62 + v1, 0); } - param1->unk_2D40[param2].unk_14_0 = sub_02074470(v0, 70, 0); - param1->unk_2D40[param2].unk_14_5 = sub_02074470(v0, 71, 0); - param1->unk_2D40[param2].unk_14_10 = sub_02074470(v0, 72, 0); - param1->unk_2D40[param2].unk_14_15 = sub_02074470(v0, 73, 0); - param1->unk_2D40[param2].unk_14_20 = sub_02074470(v0, 74, 0); - param1->unk_2D40[param2].unk_14_25 = sub_02074470(v0, 75, 0); - param1->unk_2D40[param2].unk_14_30 = sub_02074470(v0, 76, 0); - param1->unk_2D40[param2].unk_14_31 = sub_02074470(v0, 77, 0); + param1->unk_2D40[param2].unk_14_0 = GetMonData(v0, MON_DATA_HP_IV, 0); + param1->unk_2D40[param2].unk_14_5 = GetMonData(v0, MON_DATA_ATK_IV, 0); + param1->unk_2D40[param2].unk_14_10 = GetMonData(v0, MON_DATA_DEF_IV, 0); + param1->unk_2D40[param2].unk_14_15 = GetMonData(v0, MON_DATA_SPEED_IV, 0); + param1->unk_2D40[param2].unk_14_20 = GetMonData(v0, MON_DATA_SPATK_IV, 0); + param1->unk_2D40[param2].unk_14_25 = GetMonData(v0, MON_DATA_SPDEF_IV, 0); + param1->unk_2D40[param2].unk_14_30 = GetMonData(v0, MON_DATA_IS_EGG, 0); + param1->unk_2D40[param2].unk_14_31 = GetMonData(v0, MON_DATA_77, 0); if ((param1->unk_213C & 0x100) == 0) { for (v1 = 0; v1 < 0x8; v1++) { @@ -240,8 +240,8 @@ void ov16_0225177C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param param1->unk_2D40[param2].unk_28_8 = 0; param1->unk_2D40[param2].unk_28_9 = 0; param1->unk_2D40[param2].unk_28_10 = 0; - param1->unk_2D40[param2].unk_24 = sub_02074470(v0, 177, 0); - param1->unk_2D40[param2].unk_25 = sub_02074470(v0, 178, 0); + param1->unk_2D40[param2].unk_24 = GetMonData(v0, MON_DATA_177, 0); + param1->unk_2D40[param2].unk_25 = GetMonData(v0, MON_DATA_178, 0); param1->unk_2D40[param2].unk_7E_0 = sub_02075D6C(v0); param1->unk_2D40[param2].unk_26_5 = sub_02075E0C(v0); @@ -250,26 +250,26 @@ void ov16_0225177C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param param1->unk_2D40[param2].unk_6C = 0; param1->unk_2D40[param2].unk_78 = 0; } else { - param1->unk_2D40[param2].unk_27 = sub_02074470(v0, 10, 0); - param1->unk_2D40[param2].unk_6C = sub_02074470(v0, 160, 0); - param1->unk_2D40[param2].unk_78 = sub_02074470(v0, 6, 0); + param1->unk_2D40[param2].unk_27 = GetMonData(v0, MON_DATA_10, 0); + param1->unk_2D40[param2].unk_6C = GetMonData(v0, MON_DATA_160, 0); + param1->unk_2D40[param2].unk_78 = GetMonData(v0, MON_DATA_HELD_ITEM, 0); } if ((ov16_0223DF0C(param0) & (0x20 | 0x200)) && (ov16_0223E208(param0, param2) == 0)) { param1->unk_2D40[param2].unk_26_0 = 0; } else { - param1->unk_2D40[param2].unk_26_0 = sub_02074470(v0, 112, 0); + param1->unk_2D40[param2].unk_26_0 = GetMonData(v0, MON_DATA_FORM, 0); } - param1->unk_2D40[param2].unk_34 = sub_02074470(v0, 161, 0); - param1->unk_2D40[param2].unk_35 = sub_02074470(v0, 9, 0); - param1->unk_2D40[param2].unk_4C = sub_02074470(v0, 163, 0); - param1->unk_2D40[param2].unk_50 = sub_02074470(v0, 164, 0); - param1->unk_2D40[param2].unk_64 = sub_02074470(v0, 8, 0); - param1->unk_2D40[param2].unk_68 = sub_02074470(v0, 0, 0); - param1->unk_2D40[param2].unk_74 = sub_02074470(v0, 7, 0); - param1->unk_2D40[param2].unk_7E_4 = sub_02074470(v0, 157, 0); - param1->unk_2D40[param2].unk_7F = sub_02074470(v0, 155, 0); + param1->unk_2D40[param2].unk_34 = GetMonData(v0, MON_DATA_161, 0); + param1->unk_2D40[param2].unk_35 = GetMonData(v0, MON_DATA_FRIENDSHIP, 0); + param1->unk_2D40[param2].unk_4C = GetMonData(v0, MON_DATA_163, 0); + param1->unk_2D40[param2].unk_50 = GetMonData(v0, MON_DATA_164, 0); + param1->unk_2D40[param2].unk_64 = GetMonData(v0, MON_DATA_EXP, 0); + param1->unk_2D40[param2].unk_68 = GetMonData(v0, MON_DATA_PERSONALITY, 0); + param1->unk_2D40[param2].unk_74 = GetMonData(v0, MON_DATA_OT_ID, 0); + param1->unk_2D40[param2].unk_7E_4 = GetMonData(v0, MON_DATA_OT_GENDER, 0); + param1->unk_2D40[param2].unk_7F = GetMonData(v0, MON_DATA_POKEBALL, 0); sub_02098988(param1->unk_2D40[param2].unk_26_0); v3 = sub_02098700(5); @@ -279,8 +279,8 @@ void ov16_0225177C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param sub_020987BC(v3); sub_02098718(v3); - sub_02074470(v0, 117, ¶m1->unk_2D40[param2].unk_36[0]); - sub_02074470(v0, 144, ¶m1->unk_2D40[param2].unk_54[0]); + GetMonData(v0, MON_DATA_117, ¶m1->unk_2D40[param2].unk_36[0]); + GetMonData(v0, MON_DATA_144, ¶m1->unk_2D40[param2].unk_54[0]); param1->unk_2D40[param2].unk_7C = 0; param1->unk_2D40[param2].unk_7D = 0; @@ -299,30 +299,30 @@ void ov16_0225177C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param void ov16_02251C94 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, int param2, int param3) { - UnkStruct_02073C74 * v0 = ov16_0223DFAC(param0, param2, param3); + Pokemon * v0 = ov16_0223DFAC(param0, param2, param3); int v1; int v2; - param1->unk_2D40[param2].unk_02 = sub_02074470(v0, 165, 0); - param1->unk_2D40[param2].unk_04 = sub_02074470(v0, 166, 0); - param1->unk_2D40[param2].unk_06 = sub_02074470(v0, 167, 0); - param1->unk_2D40[param2].unk_08 = sub_02074470(v0, 168, 0); - param1->unk_2D40[param2].unk_0A = sub_02074470(v0, 169, 0); - param1->unk_2D40[param2].unk_34 = sub_02074470(v0, 161, 0); - param1->unk_2D40[param2].unk_35 = sub_02074470(v0, 9, 0); - param1->unk_2D40[param2].unk_4C = sub_02074470(v0, 163, 0); - param1->unk_2D40[param2].unk_50 = sub_02074470(v0, 164, 0); + param1->unk_2D40[param2].unk_02 = GetMonData(v0, MON_DATA_165, 0); + param1->unk_2D40[param2].unk_04 = GetMonData(v0, MON_DATA_166, 0); + param1->unk_2D40[param2].unk_06 = GetMonData(v0, MON_DATA_167, 0); + param1->unk_2D40[param2].unk_08 = GetMonData(v0, MON_DATA_168, 0); + param1->unk_2D40[param2].unk_0A = GetMonData(v0, MON_DATA_169, 0); + param1->unk_2D40[param2].unk_34 = GetMonData(v0, MON_DATA_161, 0); + param1->unk_2D40[param2].unk_35 = GetMonData(v0, MON_DATA_FRIENDSHIP, 0); + param1->unk_2D40[param2].unk_4C = GetMonData(v0, MON_DATA_163, 0); + param1->unk_2D40[param2].unk_50 = GetMonData(v0, MON_DATA_164, 0); if ((param1->unk_2D40[param2].unk_70 & 0x200000) == 0) { for (v1 = 0; v1 < 4; v1++) { if ((param1->unk_2D40[param2].unk_88.unk_04_2 & sub_020787CC(v1)) == 0) { - param1->unk_2D40[param2].unk_0C[v1] = sub_02074470(v0, 54 + v1, 0); - param1->unk_2D40[param2].unk_2C[v1] = sub_02074470(v0, 58 + v1, 0); - param1->unk_2D40[param2].unk_30[v1] = sub_02074470(v0, 62 + v1, 0); + param1->unk_2D40[param2].unk_0C[v1] = GetMonData(v0, MON_DATA_MOVE1 + v1, 0); + param1->unk_2D40[param2].unk_2C[v1] = GetMonData(v0, MON_DATA_58 + v1, 0); + param1->unk_2D40[param2].unk_30[v1] = GetMonData(v0, MON_DATA_62 + v1, 0); } } - param1->unk_2D40[param2].unk_64 = sub_02074470(v0, 8, 0); + param1->unk_2D40[param2].unk_64 = GetMonData(v0, MON_DATA_EXP, 0); } } @@ -1976,7 +1976,7 @@ BOOL ov16_02253FCC (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param int v3; int v4; Party * v5; - UnkStruct_02073C74 * v6; + Pokemon * v6; v5 = ov16_0223DF20(param0, 1); v4 = 0; @@ -1984,7 +1984,7 @@ BOOL ov16_02253FCC (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param for (v3 = 0; v3 < Party_GetCurrentCount(v5); v3++) { v6 = Party_GetPokemonBySlotIndex(v5, v3); - if (sub_02074470(v6, 163, NULL)) { + if (GetMonData(v6, MON_DATA_163, NULL)) { v4++; } } @@ -2007,7 +2007,7 @@ BOOL ov16_02253FCC (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param int v7; int v8; Party * v9; - UnkStruct_02073C74 * v10; + Pokemon * v10; v9 = ov16_0223DF20(param0, 1); v8 = 0; @@ -2015,7 +2015,7 @@ BOOL ov16_02253FCC (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param for (v7 = 0; v7 < Party_GetCurrentCount(v9); v7++) { v10 = Party_GetPokemonBySlotIndex(v9, v7); - if (sub_02074470(v10, 163, NULL)) { + if (GetMonData(v10, MON_DATA_163, NULL)) { v8++; } } @@ -3114,7 +3114,7 @@ BOOL ov16_02255B10 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param { BOOL v0; Party * v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; int v3; int v4 = 0, v5, v6, v7, v8, v9; int v10, v11; @@ -3151,7 +3151,7 @@ BOOL ov16_02255B10 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param for (v6 = v7; v6 < v8; v6++) { v2 = Party_GetPokemonBySlotIndex(v1, v6); - if ((sub_02074470(v2, 5, NULL)) && (sub_02074470(v2, 76, NULL) == 0) && (sub_02074470(v2, 163, NULL)) && (v10 != v6) && (v11 != v6)) { + if ((GetMonData(v2, MON_DATA_SPECIES, NULL)) && (GetMonData(v2, MON_DATA_IS_EGG, NULL) == 0) && (GetMonData(v2, MON_DATA_163, NULL)) && (v10 != v6) && (v11 != v6)) { v4++; } } @@ -6006,7 +6006,7 @@ BOOL ov16_02259A28 (UnkStruct_ov16_0224B9DC * param0, int param1) return v0; } -void ov16_02259A5C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, UnkStruct_02073C74 * param2) +void ov16_02259A5C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, Pokemon * param2) { UnkStruct_02025E6C * v0; int v1; @@ -6018,7 +6018,7 @@ void ov16_02259A5C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param v2 = ov16_0223E22C(param0); if (ov16_0223DF0C(param0) & 0x200) { - v3 = sub_02074470(param2, 155, NULL); + v3 = GetMonData(param2, MON_DATA_POKEBALL, NULL); } else { v3 = param1->unk_128; } @@ -6061,7 +6061,7 @@ BOOL ov16_02259ADC (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param return 0; } -BOOL ov16_02259B38 (UnkStruct_0207ADB4 * param0, UnkStruct_02073C74 * param1) +BOOL ov16_02259B38 (UnkStruct_0207ADB4 * param0, Pokemon * param1) { UnkStruct_02025E6C * v0; u32 v1; @@ -6074,9 +6074,9 @@ BOOL ov16_02259B38 (UnkStruct_0207ADB4 * param0, UnkStruct_02073C74 * param1) v2 = sub_02025F30(v0); v3 = sub_02025EF0(v0); - sub_02074470(param1, 144, &v4[0]); + GetMonData(param1, MON_DATA_144, &v4[0]); - if ((v1 == sub_02074470(param1, 7, NULL)) && (v2 == sub_02074470(param1, 157, NULL)) && (sub_02002238(v3, &v4[0], 7) == 0)) { + if ((v1 == GetMonData(param1, MON_DATA_OT_ID, NULL)) && (v2 == GetMonData(param1, MON_DATA_OT_GENDER, NULL)) && (sub_02002238(v3, &v4[0], 7) == 0)) { return 1; } @@ -6182,11 +6182,11 @@ BOOL ov16_02259B9C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param if ((param1->unk_2D40[param1->unk_118].unk_00 == 487) && (param1->unk_2D40[param1->unk_118].unk_4C) && (param1->unk_2D40[param1->unk_118].unk_26_0 == 1)) { if ((param1->unk_2D40[param1->unk_118].unk_70 & 0x200000) || (((ov16_0223EBEC(param0) & 0x80) == 0) && (param1->unk_2D40[param1->unk_118].unk_78 != 112))) { if (param1->unk_2D40[param1->unk_118].unk_70 & 0x200000) { - UnkStruct_02073C74 * v3; + Pokemon * v3; int v4; int v5; - v3 = sub_02073C74(5); + v3 = AllocMonZeroed(5); if (ov16_0223DF0C(param0) & 0x2) { v4 = param1->unk_21A8[param1->unk_118][1]; @@ -6203,12 +6203,12 @@ BOOL ov16_02259B9C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param sub_02074B30(v3, 112, &v5); sub_02077A00(v3); - param1->unk_2D40[param1->unk_118].unk_02 = sub_02074470(v3, 165, 0); - param1->unk_2D40[param1->unk_118].unk_04 = sub_02074470(v3, 166, 0); - param1->unk_2D40[param1->unk_118].unk_06 = sub_02074470(v3, 167, 0); - param1->unk_2D40[param1->unk_118].unk_08 = sub_02074470(v3, 168, 0); - param1->unk_2D40[param1->unk_118].unk_0A = sub_02074470(v3, 169, 0); - param1->unk_2D40[param1->unk_118].unk_27 = sub_02074470(v3, 10, 0); + param1->unk_2D40[param1->unk_118].unk_02 = GetMonData(v3, MON_DATA_165, 0); + param1->unk_2D40[param1->unk_118].unk_04 = GetMonData(v3, MON_DATA_166, 0); + param1->unk_2D40[param1->unk_118].unk_06 = GetMonData(v3, MON_DATA_167, 0); + param1->unk_2D40[param1->unk_118].unk_08 = GetMonData(v3, MON_DATA_168, 0); + param1->unk_2D40[param1->unk_118].unk_0A = GetMonData(v3, MON_DATA_169, 0); + param1->unk_2D40[param1->unk_118].unk_27 = GetMonData(v3, MON_DATA_10, 0); param1->unk_2D40[param1->unk_118].unk_26_0 = 0; param1->unk_2140 |= 0x4000000; @@ -7680,7 +7680,7 @@ int ov16_0225BA88 (UnkStruct_0207ADB4 * param0, int param1) u8 v14, v15; u32 v16; int v17, v18; - UnkStruct_02073C74 * v19; + Pokemon * v19; UnkStruct_ov16_0224B9DC * v20; v20 = ov16_0223DF10(param0); @@ -7703,13 +7703,13 @@ int ov16_0225BA88 (UnkStruct_0207ADB4 * param0, int param1) for (v0 = v17; v0 < v18; v0++) { v19 = ov16_0223DFAC(param0, param1, v0); - v7 = sub_02074470(v19, 174, NULL); + v7 = GetMonData(v19, MON_DATA_SPECIES_EGG, NULL); - if ((v7 != 0) && (v7 != 494) && (sub_02074470(v19, 163, NULL)) && ((v10 & sub_020787CC(v0)) == 0) && (v20->unk_219C[v14] != v0) && (v20->unk_219C[v15] != v0) && (v0 != v20->unk_21A4[v14]) && (v0 != v20->unk_21A4[v15])) { + if ((v7 != 0) && (v7 != 494) && (GetMonData(v19, MON_DATA_163, NULL)) && ((v10 & sub_020787CC(v0)) == 0) && (v20->unk_219C[v14] != v0) && (v20->unk_219C[v15] != v0) && (v0 != v20->unk_21A4[v14]) && (v0 != v20->unk_21A4[v15])) { v3 = ov16_02252060(v20, v2, 27, NULL); v4 = ov16_02252060(v20, v2, 28, NULL); - v5 = sub_02074470(v19, 177, NULL); - v6 = sub_02074470(v19, 178, NULL); + v5 = GetMonData(v19, MON_DATA_177, NULL); + v6 = GetMonData(v19, MON_DATA_178, NULL); v11 = ov16_022558CC(v5, v3, v4); v11 += ov16_022558CC(v6, v3, v4); @@ -7726,12 +7726,12 @@ int ov16_0225BA88 (UnkStruct_0207ADB4 * param0, int param1) v19 = ov16_0223DFAC(param0, param1, v13); for (v0 = 0; v0 < 4; v0++) { - v8 = sub_02074470(v19, 54 + v0, NULL); + v8 = GetMonData(v19, MON_DATA_MOVE1 + v0, NULL); v9 = ov16_0225BE3C(param0, v20, v19, v8); if (v8) { v16 = 0; - ov16_022552D4(v20, v8, v9, sub_02074470(v19, 10, NULL), ov16_02255A4C(v20, v2), ov16_02258AB8(v20, v2), ov16_02252060(v20, v2, 27, NULL), ov16_02252060(v20, v2, 28, NULL), &v16); + ov16_022552D4(v20, v8, v9, GetMonData(v19, MON_DATA_10, NULL), ov16_02255A4C(v20, v2), ov16_02258AB8(v20, v2), ov16_02252060(v20, v2, 27, NULL), ov16_02252060(v20, v2, 28, NULL), &v16); if (v16 & 0x2) { break; @@ -7754,11 +7754,11 @@ int ov16_0225BA88 (UnkStruct_0207ADB4 * param0, int param1) for (v0 = v17; v0 < v18; v0++) { v19 = ov16_0223DFAC(param0, param1, v0); - v7 = sub_02074470(v19, 174, NULL); + v7 = GetMonData(v19, MON_DATA_SPECIES_EGG, NULL); - if ((v7 != 0) && (v7 != 494) && (sub_02074470(v19, 163, NULL)) && (v20->unk_219C[v14] != v0) && (v20->unk_219C[v15] != v0) && (v0 != v20->unk_21A4[v14]) && (v0 != v20->unk_21A4[v15])) { + if ((v7 != 0) && (v7 != 494) && (GetMonData(v19, MON_DATA_163, NULL)) && (v20->unk_219C[v14] != v0) && (v20->unk_219C[v15] != v0) && (v0 != v20->unk_21A4[v14]) && (v0 != v20->unk_21A4[v15])) { for (v1 = 0; v1 < 4; v1++) { - v8 = sub_02074470(v19, 54 + v1, NULL); + v8 = GetMonData(v19, MON_DATA_MOVE1 + v1, NULL); v9 = ov16_0225BE3C(param0, v20, v19, v8); if ((v8) && (v20->unk_354.unk_8A[v8].unk_03 != 1)) { @@ -7790,16 +7790,16 @@ int ov16_0225BE28 (UnkStruct_0207ADB4 * param0, int param1) return v0->unk_21A4[param1]; } -int ov16_0225BE3C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, UnkStruct_02073C74 * param2, int param3) +int ov16_0225BE3C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, Pokemon * param2, int param3) { int v0; switch (param3) { case 363: - v0 = ov16_0225B0FC(param1, sub_02074470(param2, 6, NULL), 12); + v0 = ov16_0225B0FC(param1, GetMonData(param2, MON_DATA_HELD_ITEM, NULL), 12); break; case 449: - switch (ov16_0225B0FC(param1, sub_02074470(param2, 6, NULL), 1)) { + switch (ov16_0225B0FC(param1, GetMonData(param2, MON_DATA_HELD_ITEM, NULL), 1)) { case 131: v0 = 1; break; @@ -7854,7 +7854,7 @@ int ov16_0225BE3C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1 } break; case 237: - v0 = ((sub_02074470(param2, 70, NULL) & 1) >> 0) | ((sub_02074470(param2, 71, NULL) & 1) << 1) | ((sub_02074470(param2, 72, NULL) & 1) << 2) | ((sub_02074470(param2, 73, NULL) & 1) << 3) | ((sub_02074470(param2, 74, NULL) & 1) << 4) | ((sub_02074470(param2, 75, NULL) & 1) << 5); + v0 = ((GetMonData(param2, MON_DATA_HP_IV, NULL) & 1) >> 0) | ((GetMonData(param2, MON_DATA_ATK_IV, NULL) & 1) << 1) | ((GetMonData(param2, MON_DATA_DEF_IV, NULL) & 1) << 2) | ((GetMonData(param2, MON_DATA_SPEED_IV, NULL) & 1) << 3) | ((GetMonData(param2, MON_DATA_SPATK_IV, NULL) & 1) << 4) | ((GetMonData(param2, MON_DATA_SPDEF_IV, NULL) & 1) << 5); v0 = (v0 * 15 / 63) + 1; if (v0 >= 9) { diff --git a/src/overlay016/ov16_0225BFFC.c b/src/overlay016/ov16_0225BFFC.c index a928f046dc..5855325ab0 100644 --- a/src/overlay016/ov16_0225BFFC.c +++ b/src/overlay016/ov16_0225BFFC.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_0207ADB4_decl.h" #include "overlay016/struct_ov16_0225BFFC_decl.h" @@ -605,7 +605,7 @@ static void ov16_0225C47C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC { UnkStruct_ov16_022662FC * v0 = (UnkStruct_ov16_022662FC *)¶m1->unk_90[0]; int v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; v2 = ov16_0223DFAC(param0, param1->unk_190, v0->unk_01_0); @@ -667,7 +667,7 @@ static void ov16_0225C5B0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC static void ov16_0225C5E0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param1) { UnkStruct_ov16_02266498 * v0 = (UnkStruct_ov16_02266498 *)¶m1->unk_90[0]; - UnkStruct_02073C74 * v1; + Pokemon * v1; int v2, v3, v4; u32 v5; @@ -680,7 +680,7 @@ static void ov16_0225C5E0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC if (v0->unk_01 == 104) { v4 = 0; } else { - v4 = sub_02074470(v1, 10, NULL); + v4 = GetMonData(v1, MON_DATA_10, NULL); } if ((v0->unk_02 != 215) || ((v0->unk_02 == 215) && (v4 != 43))) { @@ -954,7 +954,7 @@ static void ov16_0225CA74 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC { UnkStruct_ov16_02266A38 * v0 = (UnkStruct_ov16_02266A38 *)¶m1->unk_90[0]; Party * v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; int v3; int v4; int v5 = 0; @@ -972,11 +972,11 @@ static void ov16_0225CA74 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC for (v3 = 0; v3 < Party_GetCurrentCount(v1); v3++) { v2 = Party_GetPokemonBySlotIndex(v1, v3); - if ((sub_02074470(v2, 5, NULL)) && (sub_02074470(v2, 76, NULL) == 0)) { + if ((GetMonData(v2, MON_DATA_SPECIES, NULL)) && (GetMonData(v2, MON_DATA_IS_EGG, NULL) == 0)) { if (ov16_0223E208(param0, v4)) { - v6 += sub_02074470(v2, 163, NULL); + v6 += GetMonData(v2, MON_DATA_163, NULL); } else { - v5 += sub_02074470(v2, 163, NULL); + v5 += GetMonData(v2, MON_DATA_163, NULL); } } } diff --git a/src/overlay016/ov16_0225CBB8.c b/src/overlay016/ov16_0225CBB8.c index 75596992a8..a511f120c2 100644 --- a/src/overlay016/ov16_0225CBB8.c +++ b/src/overlay016/ov16_0225CBB8.c @@ -15,7 +15,7 @@ #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_0207ADB4_decl.h" #include "overlay012/struct_ov12_0221FCDC_decl.h" @@ -393,7 +393,7 @@ void ov16_0225CBDC (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param v4->unk_2C = param2->unk_01_3; v4->unk_18 = param2->unk_08; v4->unk_1C = param1->unk_191; - v4->unk_24 = sub_02075BFC(param2->unk_04); + v4->unk_24 = GetNatureFromPersonality(param2->unk_04); v4->unk_28 = param2->unk_01_2; if ((v4->unk_13 == 2) && (ov16_0223EBEC(param0) & 0x40)) { @@ -446,7 +446,7 @@ void ov16_0225CE1C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param v1->unk_82 = param1->unk_191; v1->unk_88 = param2->unk_08; v1->unk_8C = param2->unk_0C; - v1->unk_8D = sub_02075BFC(param2->unk_04); + v1->unk_8D = GetNatureFromPersonality(param2->unk_04); v1->unk_8E = param2->unk_10; v1->unk_92 = param2->unk_01_2; v1->unk_94 = 0; @@ -496,7 +496,7 @@ void ov16_0225CF70 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param v2->unk_82 = param1->unk_191; v2->unk_88 = param2->unk_08; v2->unk_8C = param2->unk_0C; - v2->unk_8D = sub_02075BFC(param2->unk_04); + v2->unk_8D = GetNatureFromPersonality(param2->unk_04); v2->unk_8E = param2->unk_10; v2->unk_92 = param2->unk_01_2; v2->unk_94 = param2->unk_14; @@ -3708,7 +3708,7 @@ static void ov16_022611DC (UnkStruct_0201CD38 * param0, void * param1) int v3 = 0; int v4; Party * v5 = ov16_0223DF20(v0->unk_00, v0->unk_0D); - UnkStruct_02073C74 * v6; + Pokemon * v6; if ((ov16_0223DF0C(v0->unk_00) & 0x2) && ((ov16_0223DF0C(v0->unk_00) & 0x8) == 0)) { v4 = v0->unk_0D & 1; @@ -3992,7 +3992,7 @@ static void ov16_022611DC (UnkStruct_0201CD38 * param0, void * param1) case 21: { UnkStruct_ov16_022674C4 * v18; - UnkStruct_02073C74 * v19; + Pokemon * v19; int v20; int v21; @@ -4004,11 +4004,11 @@ static void ov16_022611DC (UnkStruct_0201CD38 * param0, void * param1) v18->unk_25 = ov16_0226825C(ov16_0223E1F8(v0->unk_00, v20), ov16_0223DF0C(v0->unk_00)); v19 = ov16_0223DFAC(v0->unk_00, v20, v21); - v18->unk_28 = sub_02074470(v19, 163, NULL) - v0->unk_08->unk_04->unk_20; - v18->unk_2C = sub_02074470(v19, 164, NULL); + v18->unk_28 = GetMonData(v19, MON_DATA_163, NULL) - v0->unk_08->unk_04->unk_20; + v18->unk_2C = GetMonData(v19, MON_DATA_164, NULL); v18->unk_30 = v0->unk_08->unk_04->unk_20; - if (sub_02074470(v19, 160, NULL) == 0) { + if (GetMonData(v19, MON_DATA_160, NULL) == 0) { v18->unk_4A = 0; } @@ -4064,7 +4064,7 @@ static void ov16_022611DC (UnkStruct_0201CD38 * param0, void * param1) UnkStruct_ov16_0225C300 v30; int v31; int v32 = 0; - UnkStruct_02073C74 * v33; + Pokemon * v33; int v34; v28 = v0->unk_08->unk_04->unk_11 * 2; @@ -4072,7 +4072,7 @@ static void ov16_022611DC (UnkStruct_0201CD38 * param0, void * param1) v34 = v0->unk_08->unk_04->unk_2C[v0->unk_08->unk_04->unk_11]; v33 = ov16_0223DFAC(v0->unk_00, v28, v34); - if (sub_02074470(v33, 160, NULL) == 0) { + if (GetMonData(v33, MON_DATA_160, NULL) == 0) { v27->unk_4A = 0; } @@ -4273,7 +4273,7 @@ static void ov16_02261E8C (UnkStruct_0201CD38 * param0, void * param1) int v5; int v6, v7; Party * v8; - UnkStruct_02073C74 * v9, * v10; + Pokemon * v9, * v10; ov16_0223B384(v0->unk_00); @@ -4289,7 +4289,7 @@ static void ov16_02261E8C (UnkStruct_0201CD38 * param0, void * param1) v7 = v0->unk_09; } - v9 = sub_02073C74(5); + v9 = AllocMonZeroed(5); for (v3 = 0; v3 < 6; v3++) { Party_AddPokemon(v0->unk_04->unk_00, v9); @@ -4401,7 +4401,7 @@ static void ov16_02262258 (UnkStruct_0201CD38 * param0, void * param1) UnkStruct_ov16_0225D840 * v0 = (UnkStruct_ov16_0225D840 *)param1; int v1; Party * v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; int v4, v5; u32 v6; @@ -4425,7 +4425,7 @@ static void ov16_02262258 (UnkStruct_0201CD38 * param0, void * param1) for (v1 = 0; v1 < Party_GetCurrentCount(v2); v1++) { v3 = ov16_0223DFAC(v0->unk_00, v0->unk_09, v1); - if ((sub_02074470(v3, 163, NULL)) && (v0->unk_0C[v4] != v1) && (v0->unk_0C[v5] != v1)) { + if ((GetMonData(v3, MON_DATA_163, NULL)) && (v0->unk_0C[v4] != v1) && (v0->unk_0C[v5] != v1)) { break; } } @@ -4463,7 +4463,7 @@ static void ov16_0226232C (UnkStruct_0201CD38 * param0, void * param1) } else { { Party * v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; int v4 = v1 - 1; v2 = ov16_0223DF20(v0->unk_00, v0->unk_09); @@ -4475,11 +4475,11 @@ static void ov16_0226232C (UnkStruct_0201CD38 * param0, void * param1) } else { v3 = ov16_0223DFAC(v0->unk_00, v0->unk_09, v1 - 1); - if (sub_02074470(v3, 163, NULL) == 0) { + if (GetMonData(v3, MON_DATA_163, NULL) == 0) { ov16_02264730(v0->unk_00); } - if (sub_02074470(v3, 174, NULL) == 494) { + if (GetMonData(v3, MON_DATA_SPECIES_EGG, NULL) == 494) { ov16_02264730(v0->unk_00); } } diff --git a/src/overlay016/ov16_0226485C.c b/src/overlay016/ov16_0226485C.c index cdd7071e63..f14cb0349d 100644 --- a/src/overlay016/ov16_0226485C.c +++ b/src/overlay016/ov16_0226485C.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_0207ADB4_decl.h" #include "overlay016/struct_ov16_0224B9DC_decl.h" -#include "struct_defs/struct_02073C74.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_0207A81C.h" #include "struct_defs/struct_0207ADB4_t.h" #include "overlay016/struct_ov16_0224B9DC_t.h" @@ -538,13 +538,13 @@ void ov16_022651A8 (UnkStruct_0207ADB4 * param0, int param1, int param2) void ov16_022651DC (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, int param2, int param3) { UnkStruct_ov16_0225C23C v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; int v2; int v3; v1 = ov16_0223DFAC(param0, param2, param1->unk_219C[param2]); - v2 = sub_02074470(v1, 5, NULL); - v3 = sub_02074470(v1, 161, NULL); + v2 = GetMonData(v1, MON_DATA_SPECIES, NULL); + v3 = GetMonData(v1, MON_DATA_161, NULL); v0.unk_00 = 12; v0.unk_01 = param1->unk_2D40[param2].unk_34; @@ -583,7 +583,7 @@ void ov16_02265330 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param int v5; int v6; Party * v7; - UnkStruct_02073C74 * v8; + Pokemon * v8; u32 v9; int v10; @@ -615,11 +615,11 @@ void ov16_02265330 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param for (v1 = 0; v1 < Party_GetCurrentCount(v7); v1++) { v8 = Party_GetPokemonBySlotIndex(v7, param1->unk_312C[v2][v1]); - v5 = sub_02074470(v8, 174, NULL); + v5 = GetMonData(v8, MON_DATA_SPECIES_EGG, NULL); if ((v5) && (v5 != 494)) { - if (sub_02074470(v8, 163, NULL)) { - if (sub_02074470(v8, 160, NULL)) { + if (GetMonData(v8, MON_DATA_163, NULL)) { + if (GetMonData(v8, MON_DATA_160, NULL)) { v0.unk_08[0][v6] = 3; } else { v0.unk_08[0][v6] = 1; @@ -650,11 +650,11 @@ void ov16_02265330 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param for (v1 = 0; v1 < Party_GetCurrentCount(v7); v1++) { v8 = Party_GetPokemonBySlotIndex(v7, param1->unk_312C[v2][v1]); - v5 = sub_02074470(v8, 174, NULL); + v5 = GetMonData(v8, MON_DATA_SPECIES_EGG, NULL); if ((v5) && (v5 != 494)) { - if (sub_02074470(v8, 163, NULL)) { - if (sub_02074470(v8, 160, NULL)) { + if (GetMonData(v8, MON_DATA_163, NULL)) { + if (GetMonData(v8, MON_DATA_160, NULL)) { v0.unk_08[1][v6] = 3; } else { v0.unk_08[1][v6] = 1; @@ -678,11 +678,11 @@ void ov16_02265330 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param for (v1 = 0; v1 < Party_GetCurrentCount(v7); v1++) { v8 = Party_GetPokemonBySlotIndex(v7, param1->unk_312C[v2][v1]); - v5 = sub_02074470(v8, 174, NULL); + v5 = GetMonData(v8, MON_DATA_SPECIES_EGG, NULL); if ((v5) && (v5 != 494)) { - if (sub_02074470(v8, 163, NULL)) { - if (sub_02074470(v8, 160, NULL)) { + if (GetMonData(v8, MON_DATA_163, NULL)) { + if (GetMonData(v8, MON_DATA_160, NULL)) { v0.unk_08[1][v6] = 3; } else { v0.unk_08[1][v6] = 1; @@ -701,11 +701,11 @@ void ov16_02265330 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param for (v1 = 0; v1 < Party_GetCurrentCount(v7); v1++) { v8 = Party_GetPokemonBySlotIndex(v7, param1->unk_312C[v2][v1]); - v5 = sub_02074470(v8, 174, NULL); + v5 = GetMonData(v8, MON_DATA_SPECIES_EGG, NULL); if ((v5) && (v5 != 494)) { - if (sub_02074470(v8, 163, NULL)) { - if (sub_02074470(v8, 160, NULL)) { + if (GetMonData(v8, MON_DATA_163, NULL)) { + if (GetMonData(v8, MON_DATA_160, NULL)) { v0.unk_08[1][v6] = 3; } else { v0.unk_08[1][v6] = 1; @@ -989,13 +989,13 @@ void ov16_02265C1C (UnkStruct_0207ADB4 * param0, int param1, u32 param2) void ov16_02265C38 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, int param2) { UnkStruct_ov16_0225C35C v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; int v2; int v3; v1 = ov16_0223DFAC(param0, param2, param1->unk_219C[param2]); - v2 = sub_02074470(v1, 5, NULL); - v3 = sub_02074470(v1, 161, NULL); + v2 = GetMonData(v1, MON_DATA_SPECIES, NULL); + v3 = GetMonData(v1, MON_DATA_161, NULL); v0.unk_00 = 24; v0.unk_01 = param1->unk_2D40[param2].unk_34; @@ -1018,13 +1018,13 @@ void ov16_02265C38 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param void ov16_02265D14 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, int param2, int param3) { UnkStruct_ov16_0225C370 v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; int v2; int v3; v1 = ov16_0223DFAC(param0, param2, param1->unk_219C[param2]); - v2 = sub_02074470(v1, 5, NULL); - v3 = sub_02074470(v1, 161, NULL); + v2 = GetMonData(v1, MON_DATA_SPECIES, NULL); + v3 = GetMonData(v1, MON_DATA_161, NULL); v0.unk_00 = 25; v0.unk_04 = param3; @@ -1227,13 +1227,13 @@ void ov16_022661B0 (UnkStruct_0207ADB4 * param0, int param1) void ov16_022661CC (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, int param2) { UnkStruct_ov16_0225C468 v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; int v2; int v3; v1 = ov16_0223DFAC(param0, param2, param1->unk_219C[param2]); - v2 = sub_02074470(v1, 5, NULL); - v3 = sub_02074470(v1, 161, NULL); + v2 = GetMonData(v1, MON_DATA_SPECIES, NULL); + v3 = GetMonData(v1, MON_DATA_161, NULL); v0.unk_00 = 38; v0.unk_01 = param1->unk_2D40[param2].unk_34; @@ -1723,7 +1723,7 @@ static void ov16_02266CF0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC int v4; u32 v5; Party * v6; - UnkStruct_02073C74 * v7; + Pokemon * v7; MI_CpuClearFast(param2, sizeof(UnkStruct_ov16_0225C840)); @@ -1744,11 +1744,11 @@ static void ov16_02266CF0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC for (v0 = 0; v0 < Party_GetCurrentCount(v6); v0++) { v7 = Party_GetPokemonBySlotIndex(v6, param1->unk_312C[v1][v0]); - v3 = sub_02074470(v7, 174, NULL); + v3 = GetMonData(v7, MON_DATA_SPECIES_EGG, NULL); if ((v3) && (v3 != 494)) { - if (sub_02074470(v7, 163, NULL)) { - if (sub_02074470(v7, 160, NULL)) { + if (GetMonData(v7, MON_DATA_163, NULL)) { + if (GetMonData(v7, MON_DATA_160, NULL)) { param2->unk_02[v4] = 3; } else { param2->unk_02[v4] = 1; @@ -1766,11 +1766,11 @@ static void ov16_02266CF0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC for (v0 = 0; v0 < Party_GetCurrentCount(v6); v0++) { v7 = Party_GetPokemonBySlotIndex(v6, param1->unk_312C[v2][v0]); - v3 = sub_02074470(v7, 174, NULL); + v3 = GetMonData(v7, MON_DATA_SPECIES_EGG, NULL); if ((v3) && (v3 != 494)) { - if (sub_02074470(v7, 163, NULL)) { - if (sub_02074470(v7, 160, NULL)) { + if (GetMonData(v7, MON_DATA_163, NULL)) { + if (GetMonData(v7, MON_DATA_160, NULL)) { param2->unk_02[v4] = 3; } else { param2->unk_02[v4] = 1; @@ -1794,11 +1794,11 @@ static void ov16_02266CF0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC for (v0 = 0; v0 < Party_GetCurrentCount(v6); v0++) { v7 = Party_GetPokemonBySlotIndex(v6, param1->unk_312C[param4][v0]); - v3 = sub_02074470(v7, 174, NULL); + v3 = GetMonData(v7, MON_DATA_SPECIES_EGG, NULL); if ((v3) && (v3 != 494)) { - if (sub_02074470(v7, 163, NULL)) { - if (sub_02074470(v7, 160, NULL)) { + if (GetMonData(v7, MON_DATA_163, NULL)) { + if (GetMonData(v7, MON_DATA_160, NULL)) { param2->unk_02[v4] = 3; } else { param2->unk_02[v4] = 1; diff --git a/src/overlay016/ov16_02266F1C.c b/src/overlay016/ov16_02266F1C.c index 41c5a03aaf..dd82621c89 100644 --- a/src/overlay016/ov16_02266F1C.c +++ b/src/overlay016/ov16_02266F1C.c @@ -14,8 +14,8 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_0205AA50.h" @@ -951,8 +951,8 @@ static void ov16_02267864 (UnkStruct_ov16_022674C4 * param0) UnkStruct_0205AA50 v3; UnkStruct_0200B144 * v4; UnkStruct_02023790 * v5, * v6; - UnkStruct_02073C74 * v7; - UnkStruct_02073C74_sub1 * v8; + Pokemon * v7; + BoxPokemon * v8; UnkStruct_0200B358 * v9; v0 = ov16_0223DF00(param0->unk_0C); diff --git a/src/overlay016/ov16_0226871C.c b/src/overlay016/ov16_0226871C.c index 7b4edd008c..f5d2dc9654 100644 --- a/src/overlay016/ov16_0226871C.c +++ b/src/overlay016/ov16_0226871C.c @@ -18,8 +18,8 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_0207ADB4_decl.h" #include "overlay016/struct_ov16_0226DC24_decl.h" #include "overlay016/struct_ov16_0226DEEC_decl.h" @@ -343,7 +343,7 @@ static void ov16_0226AAC0(UnkStruct_ov16_02268A14 * param0); static void ov16_0226A698(UnkStruct_ov16_02268A14 * param0); static void ov16_0226A718(UnkStruct_ov16_02268A14 * param0); static void ov16_0226A768(UnkStruct_ov16_02268A14 * param0); -static UnkStruct_0200D0F4 * ov16_0226A7A4(UnkStruct_ov16_02268A14 * param0, UnkStruct_02073C74 * param1, int param2, int param3, int param4, int param5); +static UnkStruct_0200D0F4 * ov16_0226A7A4(UnkStruct_ov16_02268A14 * param0, Pokemon * param1, int param2, int param3, int param4, int param5); static void ov16_0226A928(UnkStruct_0201CD38 * param0, void * param1); static void ov16_0226B988(UnkStruct_0201CD38 * param0, void * param1); static void ov16_0226BA88(UnkStruct_0201CD38 * param0, void * param1); @@ -1800,7 +1800,7 @@ static void ov16_02269668 (UnkStruct_ov16_02268A14 * param0, int param1, int par sub_020237BC(v3); if ((ov16_0223DF0C(param0->unk_00) & (0x20 | 0x200)) == 0) { - UnkStruct_02073C74 * v7; + Pokemon * v7; UnkStruct_0200D0F4 * v8; int v9, v10; @@ -2129,8 +2129,8 @@ static void ov16_0226A12C (UnkStruct_ov16_02268A14 * param0, int param1, int par UnkStruct_0200B144 * v2; u8 v3[4]; UnkStruct_02023790 * v4, * v5; - UnkStruct_02073C74 * v6; - UnkStruct_02073C74_sub1 * v7; + Pokemon * v6; + BoxPokemon * v7; UnkStruct_0200B358 * v8; u32 v9; u8 v10[6]; @@ -2485,7 +2485,7 @@ static void ov16_0226A768 (UnkStruct_ov16_02268A14 * param0) } } -static UnkStruct_0200D0F4 * ov16_0226A7A4 (UnkStruct_ov16_02268A14 * param0, UnkStruct_02073C74 * param1, int param2, int param3, int param4, int param5) +static UnkStruct_0200D0F4 * ov16_0226A7A4 (UnkStruct_ov16_02268A14 * param0, Pokemon * param1, int param2, int param3, int param4, int param5) { UnkStruct_0200C6E4 * v0; UnkStruct_0200C704 * v1; diff --git a/src/overlay017/ov17_0223B140.c b/src/overlay017/ov17_0223B140.c index 877a11afd4..183c246ff3 100644 --- a/src/overlay017/ov17_0223B140.c +++ b/src/overlay017/ov17_0223B140.c @@ -242,7 +242,7 @@ int ov17_0223B140 (UnkStruct_020067E8 * param0, int * param1) int v4; for (v4 = 0; v4 < 4; v4++) { - v3[v4] = sub_02074470(v0->unk_00->unk_00.unk_00[v0->unk_00->unk_00.unk_113], 54 + v4, NULL); + v3[v4] = GetMonData(v0->unk_00->unk_00.unk_00[v0->unk_00->unk_00.unk_113], MON_DATA_MOVE1 + v4, NULL); } ov17_02240A80(v0->unk_7E4, v3); @@ -609,7 +609,7 @@ static void ov17_0223BA10 (UnkStruct_ov17_02246F24 * param0, NARC * param1) int v0, v1, v2; for (v0 = 0; v0 < 4; v0++) { - v2 = sub_02074470(param0->unk_00->unk_00.unk_00[param0->unk_00->unk_00.unk_113], 54 + v0, NULL); + v2 = GetMonData(param0->unk_00->unk_00.unk_00[param0->unk_00->unk_00.unk_113], MON_DATA_MOVE1 + v0, NULL); if (v2 != 0) { v1 = MoveTable_GetMoveAttribute(v2, 11); diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c index 44a8ebb458..fde2e0bb9f 100644 --- a/src/overlay017/ov17_0223DAD0.c +++ b/src/overlay017/ov17_0223DAD0.c @@ -723,7 +723,7 @@ static void ov17_0223E458 (UnkStruct_ov17_0224DF54 * param0) ov17_0224CFB8(param0); for (v0 = 0; v0 < 4; v0++) { - param0->unk_14.unk_A14[v0] = ov17_0224CFA8(sub_02074470(param0->unk_00->unk_00.unk_00[v0], 5, NULL)); + param0->unk_14.unk_A14[v0] = ov17_0224CFA8(GetMonData(param0->unk_00->unk_00.unk_00[v0], MON_DATA_SPECIES, NULL)); } } diff --git a/src/overlay017/ov17_0223F118.c b/src/overlay017/ov17_0223F118.c index a94fd316e8..863927512c 100644 --- a/src/overlay017/ov17_0223F118.c +++ b/src/overlay017/ov17_0223F118.c @@ -221,14 +221,14 @@ void ov17_0223F374 (UnkStruct_02095C48 * param0) s32 v6, v7; for (v0 = 0; v0 < 4; v0++) { - v5 = sub_02074470(param0->unk_00.unk_00[v0], 6, NULL); + v5 = GetMonData(param0->unk_00.unk_00[v0], MON_DATA_HELD_ITEM, NULL); v6 = 100; switch (param0->unk_00.unk_10F) { case 0: - v1 = sub_02074470(param0->unk_00.unk_00[v0], 19, NULL); - v2 = sub_02074470(param0->unk_00.unk_00[v0], 23, NULL); - v3 = sub_02074470(param0->unk_00.unk_00[v0], 20, NULL); + v1 = GetMonData(param0->unk_00.unk_00[v0], MON_DATA_COOL, NULL); + v2 = GetMonData(param0->unk_00.unk_00[v0], MON_DATA_TOUGH, NULL); + v3 = GetMonData(param0->unk_00.unk_00[v0], MON_DATA_BEAUTY, NULL); switch (v5) { case 260: @@ -241,9 +241,9 @@ void ov17_0223F374 (UnkStruct_02095C48 * param0) } break; case 1: - v1 = sub_02074470(param0->unk_00.unk_00[v0], 20, NULL); - v2 = sub_02074470(param0->unk_00.unk_00[v0], 19, NULL); - v3 = sub_02074470(param0->unk_00.unk_00[v0], 21, NULL); + v1 = GetMonData(param0->unk_00.unk_00[v0], MON_DATA_BEAUTY, NULL); + v2 = GetMonData(param0->unk_00.unk_00[v0], MON_DATA_COOL, NULL); + v3 = GetMonData(param0->unk_00.unk_00[v0], MON_DATA_CUTE, NULL); switch (v5) { case 261: @@ -256,9 +256,9 @@ void ov17_0223F374 (UnkStruct_02095C48 * param0) } break; case 2: - v1 = sub_02074470(param0->unk_00.unk_00[v0], 21, NULL); - v2 = sub_02074470(param0->unk_00.unk_00[v0], 20, NULL); - v3 = sub_02074470(param0->unk_00.unk_00[v0], 22, NULL); + v1 = GetMonData(param0->unk_00.unk_00[v0], MON_DATA_CUTE, NULL); + v2 = GetMonData(param0->unk_00.unk_00[v0], MON_DATA_BEAUTY, NULL); + v3 = GetMonData(param0->unk_00.unk_00[v0], MON_DATA_SMART, NULL); switch (v5) { case 262: @@ -271,9 +271,9 @@ void ov17_0223F374 (UnkStruct_02095C48 * param0) } break; case 3: - v1 = sub_02074470(param0->unk_00.unk_00[v0], 22, NULL); - v2 = sub_02074470(param0->unk_00.unk_00[v0], 21, NULL); - v3 = sub_02074470(param0->unk_00.unk_00[v0], 23, NULL); + v1 = GetMonData(param0->unk_00.unk_00[v0], MON_DATA_SMART, NULL); + v2 = GetMonData(param0->unk_00.unk_00[v0], MON_DATA_CUTE, NULL); + v3 = GetMonData(param0->unk_00.unk_00[v0], MON_DATA_TOUGH, NULL); switch (v5) { case 263: @@ -286,9 +286,9 @@ void ov17_0223F374 (UnkStruct_02095C48 * param0) } break; case 4: - v1 = sub_02074470(param0->unk_00.unk_00[v0], 23, NULL); - v2 = sub_02074470(param0->unk_00.unk_00[v0], 22, NULL); - v3 = sub_02074470(param0->unk_00.unk_00[v0], 19, NULL); + v1 = GetMonData(param0->unk_00.unk_00[v0], MON_DATA_TOUGH, NULL); + v2 = GetMonData(param0->unk_00.unk_00[v0], MON_DATA_SMART, NULL); + v3 = GetMonData(param0->unk_00.unk_00[v0], MON_DATA_COOL, NULL); switch (v5) { case 264: @@ -306,7 +306,7 @@ void ov17_0223F374 (UnkStruct_02095C48 * param0) return; } - v4 = sub_02074470(param0->unk_00.unk_00[v0], 24, NULL); + v4 = GetMonData(param0->unk_00.unk_00[v0], MON_DATA_SHEEN, NULL); v7 = v1 + ((v2 + v3 + v4) / 2); v7 = v7 * v6 / 100; diff --git a/src/overlay017/ov17_0223F7E4.c b/src/overlay017/ov17_0223F7E4.c index e03fc28abd..f122f60983 100644 --- a/src/overlay017/ov17_0223F7E4.c +++ b/src/overlay017/ov17_0223F7E4.c @@ -785,7 +785,7 @@ static void ov17_0223FCAC (UnkStruct_ov17_0223F7E4 * param0, int param1, int par param0->unk_2C9 = 0xff; for (v2 = 0; v2 < 4; v2++) { - v0[v2] = sub_02074470(param0->unk_04->unk_00->unk_00[param0->unk_04->unk_00->unk_113], 54 + v2, NULL); + v0[v2] = GetMonData(param0->unk_04->unk_00->unk_00[param0->unk_04->unk_00->unk_113], MON_DATA_MOVE1 + v2, NULL); if (v0[v2] != 0) { v1[v2] = v8->unk_12C[v2]; @@ -889,7 +889,7 @@ static int ov17_0223FFF4 (UnkStruct_ov17_0223F7E4 * param0, int param1, int para case 1: case 2: case 3: - v1 = sub_02074470(param0->unk_04->unk_00->unk_00[param0->unk_04->unk_00->unk_113], 54 + param1, NULL); + v1 = GetMonData(param0->unk_04->unk_00->unk_00[param0->unk_04->unk_00->unk_113], MON_DATA_MOVE1 + param1, NULL); if ((v1 == 0) || (param0->unk_2C9 == (param1 - 0))) { return 0xffffffff; @@ -1239,7 +1239,7 @@ static void ov17_02240658 (UnkStruct_0201CD38 * param0, void * param1) v1 = v0->unk_04->unk_24; for (v10 = 0; v10 < 4; v10++) { - v9[v10] = sub_02074470(v0->unk_04->unk_00->unk_00[v0->unk_04->unk_00->unk_113], 54 + v10, NULL); + v9[v10] = GetMonData(v0->unk_04->unk_00->unk_00[v0->unk_04->unk_00->unk_113], MON_DATA_MOVE1 + v10, NULL); } switch (v0->unk_2CC.unk_04_val1.unk_14) { @@ -1572,7 +1572,7 @@ static int ov17_02240D04 (UnkStruct_ov17_0223F7E4 * param0, int param1) v2 = &Unk_ov17_02253558[param0->unk_2C8]; for (v4 = 0; v4 < 4; v4++) { - v7[v4] = sub_02074470(param0->unk_04->unk_00->unk_00[param0->unk_04->unk_00->unk_113], 54 + v4, NULL); + v7[v4] = GetMonData(param0->unk_04->unk_00->unk_00[param0->unk_04->unk_00->unk_113], MON_DATA_MOVE1 + v4, NULL); } if (param1 == 1) { diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c index 31bbd1d686..bfd10629bb 100644 --- a/src/overlay017/ov17_022413D8.c +++ b/src/overlay017/ov17_022413D8.c @@ -47,7 +47,7 @@ #include "unk_02073C2C.h" #include "unk_0208C098.h" #include "unk_02094EDC.h" -#include "overlay012/ov12_022384F0.h" +#include "overlay012/is_form_symmetrical.h" #include "overlay017/ov17_0223B140.h" #include "overlay017/ov17_0223F118.h" #include "overlay017/ov17_022413D8.h" @@ -490,10 +490,10 @@ void ov17_02241524 (UnkStruct_ov17_0223F88C * param0, int param1) { u32 v0, v1; - v0 = sub_02074470(param0->unk_00->unk_00[param1], 5, NULL); - v1 = sub_02074470(param0->unk_00->unk_00[param1], 112, NULL); + v0 = GetMonData(param0->unk_00->unk_00[param1], MON_DATA_SPECIES, NULL); + v1 = GetMonData(param0->unk_00->unk_00[param1], MON_DATA_FORM, NULL); - if (ov12_022384F0(v0, v1) == 1) { + if (IsFormSymmetrical(v0, v1) == 1) { sub_02007DEC(param0->unk_08[param1], 35, 1); } } @@ -515,10 +515,10 @@ void ov17_022415E4 (UnkStruct_ov17_0223F88C * param0) { u32 v1, v2; - v1 = sub_02074470(param0->unk_00->unk_00[v0], 5, NULL); - v2 = sub_02074470(param0->unk_00->unk_00[v0], 112, NULL); + v1 = GetMonData(param0->unk_00->unk_00[v0], MON_DATA_SPECIES, NULL); + v2 = GetMonData(param0->unk_00->unk_00[v0], MON_DATA_FORM, NULL); - if (ov12_022384F0(v1, v2) == 1) { + if (IsFormSymmetrical(v1, v2) == 1) { sub_02007DEC(param0->unk_08[v0], 35, 1); } } @@ -1583,7 +1583,7 @@ void ov17_02242EE4 (UnkStruct_ov17_02246F24 * param0, int param1) v0 = sub_02023790(12, 21); - sub_02074470(param0->unk_0C.unk_00->unk_00[param1], 119, v0); + GetMonData(param0->unk_0C.unk_00->unk_00[param1], MON_DATA_119, v0); if (param1 == param0->unk_00->unk_00.unk_113) { v1 = ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))); @@ -2127,8 +2127,8 @@ void ov17_022439C8 (UnkStruct_02095C48 * param0, int param1, int param2, UnkStru { int v0, v1; - v0 = sub_02074470(param0->unk_00.unk_00[param1], 177, NULL); - v1 = sub_02074470(param0->unk_00.unk_00[param1], 178, NULL); + v0 = GetMonData(param0->unk_00.unk_00[param1], MON_DATA_177, NULL); + v1 = GetMonData(param0->unk_00.unk_00[param1], MON_DATA_178, NULL); if ((v0 == 7) || (v1 == 7)) { param3->unk_07 = 1; diff --git a/src/overlay017/ov17_02243C28.c b/src/overlay017/ov17_02243C28.c index e2fb0b802f..5e12452d29 100644 --- a/src/overlay017/ov17_02243C28.c +++ b/src/overlay017/ov17_02243C28.c @@ -680,17 +680,17 @@ static void ov17_022444BC (UnkStruct_0201CD38 * param0, void * param1) MI_CpuClear8(&v3, sizeof(UnkStruct_ov16_02265BBC)); MI_CpuClear8(&v4, sizeof(UnkStruct_ov16_02264408)); - v6 = sub_02074470(v0->unk_00->unk_0C.unk_00->unk_00[v0->unk_0D], 5, NULL); - v7 = sub_02074470(v0->unk_00->unk_0C.unk_00->unk_00[v0->unk_0D], 111, NULL); + v6 = GetMonData(v0->unk_00->unk_0C.unk_00->unk_00[v0->unk_0D], MON_DATA_SPECIES, NULL); + v7 = GetMonData(v0->unk_00->unk_0C.unk_00->unk_00[v0->unk_0D], MON_DATA_111, NULL); v8 = sub_02075E0C(v0->unk_00->unk_0C.unk_00->unk_00[v0->unk_0D]); - v9 = sub_02074470(v0->unk_00->unk_0C.unk_00->unk_00[v0->unk_0D], 112, NULL); - v14 = sub_02074470(v0->unk_00->unk_0C.unk_00->unk_00[v0->unk_0D], 0, NULL); + v9 = GetMonData(v0->unk_00->unk_0C.unk_00->unk_00[v0->unk_0D], MON_DATA_FORM, NULL); + v14 = GetMonData(v0->unk_00->unk_0C.unk_00->unk_00[v0->unk_0D], MON_DATA_PERSONALITY, NULL); - v10 = sub_02074470(v0->unk_00->unk_0C.unk_00->unk_00[v16], 5, NULL); - v11 = sub_02074470(v0->unk_00->unk_0C.unk_00->unk_00[v16], 111, NULL); + v10 = GetMonData(v0->unk_00->unk_0C.unk_00->unk_00[v16], MON_DATA_SPECIES, NULL); + v11 = GetMonData(v0->unk_00->unk_0C.unk_00->unk_00[v16], MON_DATA_111, NULL); v12 = sub_02075E0C(v0->unk_00->unk_0C.unk_00->unk_00[v16]); - v13 = sub_02074470(v0->unk_00->unk_0C.unk_00->unk_00[v16], 112, NULL); - v15 = sub_02074470(v0->unk_00->unk_0C.unk_00->unk_00[v16], 0, NULL); + v13 = GetMonData(v0->unk_00->unk_0C.unk_00->unk_00[v16], MON_DATA_FORM, NULL); + v15 = GetMonData(v0->unk_00->unk_0C.unk_00->unk_00[v16], MON_DATA_PERSONALITY, NULL); v3.unk_00 = 0; v3.unk_01 = 0; @@ -889,7 +889,7 @@ static void ov17_022449B8 (UnkStruct_0201CD38 * param0, void * param1) v1 = ov17_0223FAF8(v0->unk_00->unk_7E4); if (v1 != 0xffffffff) { - v0->unk_10.unk_00 = sub_02074470(v0->unk_00->unk_0C.unk_00->unk_00[v0->unk_0D], 54 + v1, NULL); + v0->unk_10.unk_00 = GetMonData(v0->unk_00->unk_0C.unk_00->unk_00[v0->unk_0D], MON_DATA_MOVE1 + v1, NULL); sub_02005748(1501); v0->unk_0C++; } diff --git a/src/overlay017/ov17_02246ECC.c b/src/overlay017/ov17_02246ECC.c index 4981a93d54..5cc4e2fac8 100644 --- a/src/overlay017/ov17_02246ECC.c +++ b/src/overlay017/ov17_02246ECC.c @@ -1281,7 +1281,7 @@ static void ov17_02246F24 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0224 MI_CpuClear8(param1, sizeof(UnkStruct_ov17_02246F9C)); for (v0 = 0; v0 < 4; v0++) { - param1->unk_00[v0].unk_00 = sub_02074470(param0->unk_00->unk_00.unk_00[param2], 54 + v0, NULL); + param1->unk_00[v0].unk_00 = GetMonData(param0->unk_00->unk_00.unk_00[param2], MON_DATA_MOVE1 + v0, NULL); if (ov17_02243A98(¶m0->unk_220, param2, param1->unk_00[v0].unk_00) == 1) { param1->unk_00[v0].unk_0A = MoveTable_GetMoveAttribute(param1->unk_00[v0].unk_00, 10); diff --git a/src/overlay017/ov17_02247A48.c b/src/overlay017/ov17_02247A48.c index 3ca0c81fe8..020771fb3f 100644 --- a/src/overlay017/ov17_02247A48.c +++ b/src/overlay017/ov17_02247A48.c @@ -1086,8 +1086,8 @@ static void ov17_02248AA4 (UnkStruct_0201CD38 * param0, void * param1) ov22_0225B158(v0->unk_00->unk_F18[v0->unk_0E].unk_00, v0->unk_00->unk_F18[v0->unk_0E].unk_04, v0->unk_00->unk_F18[v0->unk_0E].unk_08, v1); if (v0->unk_04 >= FX32_ONE) { - v2 = sub_02074470(v0->unk_00->unk_0C.unk_00->unk_00[v0->unk_0E], 5, NULL); - v3 = sub_02074470(v0->unk_00->unk_0C.unk_00->unk_00[v0->unk_0E], 112, NULL); + v2 = GetMonData(v0->unk_00->unk_0C.unk_00->unk_00[v0->unk_0E], MON_DATA_SPECIES, NULL); + v3 = GetMonData(v0->unk_00->unk_0C.unk_00->unk_00[v0->unk_0E], MON_DATA_FORM, NULL); sub_02077D3C(v0->unk_00->unk_00->unk_14C[v0->unk_0E], 0, v2, v3, 0, 127, NULL, 22); v0->unk_0C++; } diff --git a/src/overlay017/ov17_02250744.c b/src/overlay017/ov17_02250744.c index 83c247976d..e2d8779b9d 100644 --- a/src/overlay017/ov17_02250744.c +++ b/src/overlay017/ov17_02250744.c @@ -343,7 +343,7 @@ void ov17_02250B00 (UnkStruct_ov17_0224FCA0 * param0) for (v3 = 0; v3 < 4; v3++) { v4 = param0->unk_39A.unk_30[v3]; - sub_02074470(param0->unk_10.unk_00->unk_00[v4], 119, v2); + GetMonData(param0->unk_10.unk_00->unk_00[v4], MON_DATA_119, v2); sub_0201ADA4(¶m0->unk_10.unk_24[1 + v3], 0x0); sub_0201ADA4(¶m0->unk_10.unk_24[5 + v3], 0x0); sub_0201D78C(¶m0->unk_10.unk_24[1 + v3], 0, v2, 0, 3, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); diff --git a/src/overlay017/ov17_02251D6C.c b/src/overlay017/ov17_02251D6C.c index b4cdd94050..146bc83c73 100644 --- a/src/overlay017/ov17_02251D6C.c +++ b/src/overlay017/ov17_02251D6C.c @@ -677,8 +677,8 @@ static void ov17_0225266C (UnkStruct_0201CD38 * param0, void * param1) { int v1, v2; - v1 = sub_02074470(v0->unk_00->unk_10.unk_00->unk_00[v0->unk_11], 5, NULL); - v2 = sub_02074470(v0->unk_00->unk_10.unk_00->unk_00[v0->unk_11], 112, NULL); + v1 = GetMonData(v0->unk_00->unk_10.unk_00->unk_00[v0->unk_11], MON_DATA_SPECIES, NULL); + v2 = GetMonData(v0->unk_00->unk_10.unk_00->unk_00[v0->unk_11], MON_DATA_FORM, NULL); sub_02077D3C(v0->unk_00->unk_00->unk_14C[v0->unk_11], 0, v1, v2, 0, 127, NULL, 24); } v0->unk_10++; diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c index 33cbd2dc62..edb7a98e6a 100644 --- a/src/overlay019/ov19_021D0D80.c +++ b/src/overlay019/ov19_021D0D80.c @@ -12,8 +12,8 @@ #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_02023FCC_decl.h" #include "struct_decls/struct_0202CC84_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_02075874_decl.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" @@ -117,7 +117,7 @@ typedef struct { u8 unk_03; u8 unk_04[NELEMS(Unk_ov19_021DFDF0)]; u16 unk_08[NELEMS(Unk_ov19_021DFDF0)]; - UnkStruct_02073C74_sub1 * unk_10; + BoxPokemon * unk_10; UnkStruct_020797DC * unk_14; Party * unk_18; BOOL unk_1C; @@ -142,7 +142,7 @@ typedef struct UnkStruct_ov19_021D5DF8_t { UnkStruct_0200B144 * unk_194; UnkStruct_0200B144 * unk_198; UnkStruct_0200B358 * unk_19C; - UnkStruct_02073C74 * unk_1A0; + Pokemon * unk_1A0; UnkStruct_020279FC * unk_1A4; int (* unk_1A8)(struct UnkStruct_ov19_021D5DF8_t * param0); void (* unk_1AC)(struct UnkStruct_ov19_021D5DF8_t * param0, u32 * param1); @@ -201,7 +201,7 @@ static BOOL ov19_021D357C(UnkStruct_ov19_021D5DF8 * param0, int * param1); static void ov19_021D35F8(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); static void ov19_021D38E0(UnkStruct_ov19_021D5DF8 * param0); static void ov19_021D3978(UnkStruct_0201CD38 * param0, void * param1); -static BOOL ov19_021D3AC8(UnkStruct_02073C74_sub1 * param0, u16 param1); +static BOOL ov19_021D3AC8(BoxPokemon * param0, u16 param1); static void ov19_021D3B34(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); static void ov19_021D3C28(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); static void ov19_021D3CFC(UnkStruct_ov19_021D4DF0 * param0, UnkStruct_ov19_021D5DF8 * param1); @@ -254,13 +254,13 @@ static BOOL ov19_021D57D8(UnkStruct_ov19_021D5DF8 * param0, u32 param1); static BOOL ov19_021D5800(UnkStruct_ov19_021D5DF8 * param0, u32 param1); static void ov19_021D5834(UnkStruct_ov19_021D5DF8 * param0); static void ov19_021D584C(UnkStruct_ov19_021D5DF8 * param0); -static void ov19_021D5888(UnkStruct_ov19_021D4DF0 * param0, UnkStruct_02073C74_sub1 * param1, UnkStruct_ov19_021D5DF8 * param2); -static void ov19_021D58AC(UnkStruct_ov19_021D4DF0 * param0, UnkStruct_02073C74_sub1 * param1, UnkStruct_ov19_021D5DF8 * param2); -static void ov19_021D59F4(UnkStruct_ov19_021D4DF0 * param0, UnkStruct_02073C74_sub1 * param1, UnkStruct_ov19_021D5DF8 * param2); +static void ov19_021D5888(UnkStruct_ov19_021D4DF0 * param0, BoxPokemon * param1, UnkStruct_ov19_021D5DF8 * param2); +static void ov19_021D58AC(UnkStruct_ov19_021D4DF0 * param0, BoxPokemon * param1, UnkStruct_ov19_021D5DF8 * param2); +static void ov19_021D59F4(UnkStruct_ov19_021D4DF0 * param0, BoxPokemon * param1, UnkStruct_ov19_021D5DF8 * param2); static void ov19_021D5B70(UnkStruct_ov19_021D4DF0 * param0); static void ov19_021D5B80(UnkStruct_ov19_021D4DF0 * param0); static void ov19_021D5BA0(UnkStruct_ov19_021D4DF0 * param0, BOOL param1); -static void ov19_021D5BA8(UnkStruct_ov19_021D4DF0 * param0, UnkStruct_02073C74_sub1 * param1); +static void ov19_021D5BA8(UnkStruct_ov19_021D4DF0 * param0, BoxPokemon * param1); static void ov19_021D5BAC(UnkStruct_ov19_021D4DF0 * param0); static void ov19_021D5BE8(UnkStruct_ov19_021D4DF0 * param0, u16 param1, UnkStruct_ov19_021D5DF8 * param2); static void ov19_021D5CBC(UnkStruct_ov19_021D4DF0 * param0); @@ -1208,7 +1208,7 @@ static void ov19_021D2308 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) case 3: switch (param0->unk_1B8) { case UnkEnum_021DFB94_46: - if ((ov19_021D5F7C(¶m0->unk_00) == 112) && (sub_02074570(param0->unk_00.unk_4C.unk_00, 5, NULL) != 487)) { + if ((ov19_021D5F7C(¶m0->unk_00) == 112) && (sub_02074570(param0->unk_00.unk_4C.unk_00, MON_DATA_SPECIES, NULL) != 487)) { sub_0200B70C(param0->unk_19C, 0, 112); ov19_021D5408(¶m0->unk_00, 45); ov19_021D6594(param0->unk_114, 24); @@ -1248,7 +1248,7 @@ static void ov19_021D2308 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) ov19_021D5408(¶m0->unk_00, 24); ov19_021D6594(param0->unk_114, 24); (*param1) = 7; - } else if ((param0->unk_00.unk_112 == 112) && (sub_02074570(param0->unk_00.unk_4C.unk_00, 5, NULL) != 487)) { + } else if ((param0->unk_00.unk_112 == 112) && (sub_02074570(param0->unk_00.unk_4C.unk_00, MON_DATA_SPECIES, NULL) != 487)) { sub_0200B70C(param0->unk_19C, 0, 112); ov19_021D5408(¶m0->unk_00, 45); ov19_021D6594(param0->unk_114, 24); @@ -1823,7 +1823,7 @@ asm static void ov19_021D2B54 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) static BOOL ov19_021D2DD0 (const UnkStruct_ov19_021D4DF0 * param0) { - UnkStruct_02073C74_sub1 * v0; + BoxPokemon * v0; int v1, v2, v3, v4; const UnkStruct_ov19_021D3CFC * v5 = ¶m0->unk_08; const UnkStruct_ov19_021D5594 * v6 = ¶m0->unk_14; @@ -1835,7 +1835,7 @@ static BOOL ov19_021D2DD0 (const UnkStruct_ov19_021D4DF0 * param0) v4 = v3 + (v6->unk_0C[v1] - v2); v0 = sub_02079C9C(param0->unk_00, 0xffffffff, v4); - if (sub_02074570(v0, 172, NULL)) { + if (sub_02074570(v0, MON_DATA_172, NULL)) { return 0; } } @@ -2169,7 +2169,7 @@ static void ov19_021D3294 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) static BOOL ov19_021D34E4 (UnkStruct_ov19_021D5DF8 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; int v1, v2, v3; BOOL v4; @@ -2179,7 +2179,7 @@ static BOOL ov19_021D34E4 (UnkStruct_ov19_021D5DF8 * param0) v0 = Party_GetPokemonBySlotIndex(param0->unk_124, v1); v4 = sub_02073C88(v0); - if ((sub_02074470(v0, 173, NULL) == 0) && (sub_02074470(v0, 163, NULL) != 0)) { + if ((GetMonData(v0, MON_DATA_173, NULL) == 0) && (GetMonData(v0, MON_DATA_163, NULL) != 0)) { v2++; } @@ -2418,7 +2418,7 @@ static void ov19_021D38E0 (UnkStruct_ov19_021D5DF8 * param0) static void ov19_021D3978 (UnkStruct_0201CD38 * param0, void * param1) { UnkStruct_ov19_021D38E0 * v0 = param1; - UnkStruct_02073C74_sub1 * v1; + BoxPokemon * v1; int v2, v3; if (v0->unk_02 < 18) { @@ -2431,7 +2431,7 @@ static void ov19_021D3978 (UnkStruct_0201CD38 * param0, void * param1) for (v2 = v0->unk_03; v2 < v4; v2++) { v1 = sub_02079C9C(v0->unk_14, v0->unk_02, v2); - if (sub_02074570(v1, 172, NULL)) { + if (sub_02074570(v1, MON_DATA_172, NULL)) { for (v3 = 0; v3 < (NELEMS(Unk_ov19_021DFDF0)); v3++) { if (ov19_021D3AC8(v1, Unk_ov19_021DFDF0[v3])) { v0->unk_08[v3]++; @@ -2450,7 +2450,7 @@ static void ov19_021D3978 (UnkStruct_0201CD38 * param0, void * param1) int v5 = Party_GetCurrentCount(v0->unk_18); for (v2 = 0; v2 < v5; v2++) { - v1 = (UnkStruct_02073C74_sub1 *)Party_GetPokemonBySlotIndex(v0->unk_18, v2); + v1 = (BoxPokemon *)Party_GetPokemonBySlotIndex(v0->unk_18, v2); for (v3 = 0; v3 < (NELEMS(Unk_ov19_021DFDF0)); v3++) { if (ov19_021D3AC8(v1, Unk_ov19_021DFDF0[v3])) { @@ -2481,18 +2481,18 @@ static void ov19_021D3978 (UnkStruct_0201CD38 * param0, void * param1) } } -static BOOL ov19_021D3AC8 (UnkStruct_02073C74_sub1 * param0, u16 param1) +static BOOL ov19_021D3AC8 (BoxPokemon * param0, u16 param1) { BOOL v0, v1; v0 = 0; v1 = sub_02073D20(param0); - if (sub_02074570(param0, 173, NULL) == 0) { + if (sub_02074570(param0, MON_DATA_173, NULL) == 0) { int v2; for (v2 = 0; v2 < 4; v2++) { - if (sub_02074570(param0, 54 + v2, NULL) == param1) { + if (sub_02074570(param0, MON_DATA_MOVE1 + v2, NULL) == param1) { v0 = 1; break; } @@ -2643,7 +2643,7 @@ static void ov19_021D3D44 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) Heap_FreeToHeap(param0->unk_214); Overlay_UnloadByID(FS_OVERLAY_ID(overlay84)); - if ((v1 == 112) && (sub_02074570(param0->unk_00.unk_4C.unk_00, 5, NULL) != 487)) { + if ((v1 == 112) && (sub_02074570(param0->unk_00.unk_4C.unk_00, MON_DATA_SPECIES, NULL) != 487)) { (void)0; } else if (v1 != 0) { sub_0207D60C(sub_0207D990(param0->unk_11C), v1, 1, 9); @@ -2667,7 +2667,7 @@ static void ov19_021D3D44 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) if (ov19_021D6600(param0->unk_114, 2)) { if (v1 == 0) { ov19_021D0EC0(param0); - } else if ((v1 == 112) && (sub_02074570(param0->unk_00.unk_4C.unk_00, 5, NULL) != 487)) { + } else if ((v1 == 112) && (sub_02074570(param0->unk_00.unk_4C.unk_00, MON_DATA_SPECIES, NULL) != 487)) { sub_0200B70C(param0->unk_19C, 0, v1); ov19_021D5408(¶m0->unk_00, 45); ov19_021D6594(param0->unk_114, 24); @@ -3322,7 +3322,7 @@ static void ov19_021D4BE0 (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_02042434 param0->unk_194 = sub_0200B144(0, 26, 202, 9); param0->unk_198 = sub_0200B144(0, 26, 610, 9); param0->unk_19C = sub_0200B358(9); - param0->unk_1A0 = Heap_AllocFromHeap(9, sub_02073C70()); + param0->unk_1A0 = Heap_AllocFromHeap(9, PokemonStructSize()); GF_ASSERT(param0->unk_19C); param0->unk_128 = sub_0208712C(9, 2, 0, 8, param0->unk_1A4); @@ -3826,7 +3826,7 @@ static BOOL ov19_021D52F4 (UnkStruct_ov19_021D5DF8 * param0) } if (v2->unk_00) { - if (sub_02074570(v2->unk_00, 172, NULL)) { + if (sub_02074570(v2->unk_00, MON_DATA_172, NULL)) { v2->unk_0A = 1; if (!(ov19_021D5E38(v0) & 6)) { @@ -3911,7 +3911,7 @@ static void ov19_021D5420 (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D static void ov19_021D54A4 (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D4DF0 * param1) { u32 v0, v1, v2, v3, v4, v5, v6, v7, v8, v9; - UnkStruct_02073C74_sub1 * v10; + BoxPokemon * v10; UnkStruct_ov19_021D5594 * v11; void * v12; @@ -3931,7 +3931,7 @@ static void ov19_021D54A4 (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D for (v0 = v2; v0 <= v3; v0++) { v10 = sub_02079C9C(param0->unk_120, 0xffffffff, v6); - if (sub_02074570(v10, 172, NULL)) { + if (sub_02074570(v10, MON_DATA_172, NULL)) { MI_CpuCopy32(v10, v12, v9); sub_02079968(param0->unk_120, 0xffffffff, v6); (u8 *)v12 += v9; @@ -3975,27 +3975,27 @@ static void ov19_021D55C4 (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D { UnkStruct_ov19_021D5594 * v0 = ¶m1->unk_14; UnkStruct_ov19_021D3CFC * v1 = ¶m1->unk_08; - UnkStruct_02073C74_sub1 * v2; + BoxPokemon * v2; int v3 = 0, v4; BOOL v5; if (ov19_021D5E10(param1) == 0) { - v4 = sub_02074570(v0->unk_00, 112, NULL); + v4 = sub_02074570(v0->unk_00, MON_DATA_FORM, NULL); sub_02079914(param0->unk_120, 0xffffffff, v1->unk_07, v0->unk_00); v2 = sub_02079C9C(param0->unk_120, 0xffffffff, v1->unk_07); - if ((sub_02074570(v2, 5, NULL) == 492) && (v4 == 1)) { + if ((sub_02074570(v2, MON_DATA_SPECIES, NULL) == 492) && (v4 == 1)) { v3 = 1; } } else { if (v0->unk_0B) { - Party_AddPokemon(param0->unk_124, (UnkStruct_02073C74 *)(v0->unk_00)); + Party_AddPokemon(param0->unk_124, (Pokemon *)(v0->unk_00)); } else { sub_020774C8(v0->unk_00, param0->unk_1A0); Party_AddPokemon(param0->unk_124, param0->unk_1A0); } - v2 = (UnkStruct_02073C74_sub1 *)Party_GetPokemonBySlotIndex(param0->unk_124, Party_GetCurrentCount(param0->unk_124) - 1); + v2 = (BoxPokemon *)Party_GetPokemonBySlotIndex(param0->unk_124, Party_GetCurrentCount(param0->unk_124) - 1); } ov19_021D5BA8(param1, v2); @@ -4012,7 +4012,7 @@ static void ov19_021D55C4 (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D static void ov19_021D56AC (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D4DF0 * param1) { - UnkStruct_02073C74_sub1 * v0; + BoxPokemon * v0; int v1, v2, v3, v4, v5; UnkStruct_ov19_021D3CFC * v6 = ¶m1->unk_08; UnkStruct_ov19_021D5594 * v7 = ¶m1->unk_14; @@ -4113,7 +4113,7 @@ static void ov19_021D5834 (UnkStruct_ov19_021D5DF8 * param0) v1 = &v0->unk_08; v2 = &v0->unk_14; - sub_02073C54(v2->unk_00); + ZeroBoxMonData(v2->unk_00); v1->unk_0B = 1; ov19_021D52F4(param0); } @@ -4132,7 +4132,7 @@ static void ov19_021D584C (UnkStruct_ov19_021D5DF8 * param0) ov19_021D52F4(param0); } -static void ov19_021D5888 (UnkStruct_ov19_021D4DF0 * param0, UnkStruct_02073C74_sub1 * param1, UnkStruct_ov19_021D5DF8 * param2) +static void ov19_021D5888 (UnkStruct_ov19_021D4DF0 * param0, BoxPokemon * param1, UnkStruct_ov19_021D5DF8 * param2) { ov19_021D58AC(param0, param1, param2); @@ -4141,30 +4141,30 @@ static void ov19_021D5888 (UnkStruct_ov19_021D4DF0 * param0, UnkStruct_02073C74_ } } -static void ov19_021D58AC (UnkStruct_ov19_021D4DF0 * param0, UnkStruct_02073C74_sub1 * param1, UnkStruct_ov19_021D5DF8 * param2) +static void ov19_021D58AC (UnkStruct_ov19_021D4DF0 * param0, BoxPokemon * param1, UnkStruct_ov19_021D5DF8 * param2) { UnkStruct_ov19_021D5BAC * v0 = &(param0->unk_4C); BOOL v1 = sub_02073D20(param1); UnkStruct_02075874 * v2; v0->unk_00 = param1; - v0->unk_04 = sub_02074570(param1, 5, NULL); - v0->unk_06 = sub_02074570(param1, 6, NULL); + v0->unk_04 = sub_02074570(param1, MON_DATA_SPECIES, NULL); + v0->unk_06 = sub_02074570(param1, MON_DATA_HELD_ITEM, NULL); v0->unk_08 = sub_0207A294(sub_0207A274(param2->unk_11C), v0->unk_04); - v0->unk_0F = sub_02074570(param1, 173, NULL); + v0->unk_0F = sub_02074570(param1, MON_DATA_173, NULL); v2 = sub_02075894(v0->unk_04, 9); - v0->unk_0A = sub_02075B9C(v2, v0->unk_04, sub_02074570(param1, 8, NULL)); - v0->unk_0B = sub_02074570(param1, 11, NULL); - v0->unk_0C = sub_02074570(param1, 177, NULL); - v0->unk_0D = sub_02074570(param1, 178, NULL); + v0->unk_0A = sub_02075B9C(v2, v0->unk_04, sub_02074570(param1, MON_DATA_EXP, NULL)); + v0->unk_0B = sub_02074570(param1, MON_DATA_11, NULL); + v0->unk_0C = sub_02074570(param1, MON_DATA_177, NULL); + v0->unk_0D = sub_02074570(param1, MON_DATA_178, NULL); - if ((v0->unk_0F == 0) && sub_02074570(param1, 176, NULL)) { - v0->unk_0E = sub_02075DD0(v2, v0->unk_04, sub_02074570(param1, 0, NULL)); + if ((v0->unk_0F == 0) && sub_02074570(param1, MON_DATA_176, NULL)) { + v0->unk_0E = sub_02075DD0(v2, v0->unk_04, sub_02074570(param1, MON_DATA_PERSONALITY, NULL)); } else { v0->unk_0E = 255; } - sub_02074570(param1, 119, v0->unk_14); + sub_02074570(param1, MON_DATA_119, v0->unk_14); if (v0->unk_0F == 0) { sub_0200B1B8(param2->unk_190, v0->unk_04, v0->unk_18); @@ -4183,7 +4183,7 @@ static void ov19_021D58AC (UnkStruct_ov19_021D4DF0 * param0, UnkStruct_02073C74_ u32 v3 = sub_02075BD4(param1); sub_0200B1B8(param2->unk_194, v3, v0->unk_20); - v3 = sub_02074570(param1, 10, NULL); + v3 = sub_02074570(param1, MON_DATA_10, NULL); sub_0200B1B8(param2->unk_198, v3, v0->unk_24); } @@ -4191,7 +4191,7 @@ static void ov19_021D58AC (UnkStruct_ov19_021D4DF0 * param0, UnkStruct_02073C74_ sub_02073D48(param1, v1); } -static void ov19_021D59F4 (UnkStruct_ov19_021D4DF0 * param0, UnkStruct_02073C74_sub1 * param1, UnkStruct_ov19_021D5DF8 * param2) +static void ov19_021D59F4 (UnkStruct_ov19_021D4DF0 * param0, BoxPokemon * param1, UnkStruct_ov19_021D5DF8 * param2) { UnkStruct_ov19_021D5BAC * v0 = &(param0->unk_4C); UnkStruct_ov19_021D5FAC * v1 = &(param0->unk_A4.unk_08[param0->unk_A4.unk_00]); @@ -4213,22 +4213,22 @@ static void ov19_021D59F4 (UnkStruct_ov19_021D4DF0 * param0, UnkStruct_02073C74_ v2 = sub_02073C88(param2->unk_1A0); - v1->unk_0A = sub_02074470(param2->unk_1A0, 164, NULL); - v1->unk_0C = sub_02074470(param2->unk_1A0, 165, NULL); - v1->unk_0E = sub_02074470(param2->unk_1A0, 166, NULL); - v1->unk_10 = sub_02074470(param2->unk_1A0, 168, NULL); - v1->unk_12 = sub_02074470(param2->unk_1A0, 169, NULL); - v1->unk_14 = sub_02074470(param2->unk_1A0, 167, NULL); - v1->unk_16 = sub_02074470(param2->unk_1A0, 19, NULL); - v1->unk_18 = sub_02074470(param2->unk_1A0, 20, NULL); - v1->unk_1A = sub_02074470(param2->unk_1A0, 21, NULL); - v1->unk_1C = sub_02074470(param2->unk_1A0, 22, NULL); - v1->unk_1E = sub_02074470(param2->unk_1A0, 23, NULL); - v1->unk_20[0] = sub_02074470(param2->unk_1A0, 54, NULL); - v1->unk_20[1] = sub_02074470(param2->unk_1A0, 55, NULL); - v1->unk_20[2] = sub_02074470(param2->unk_1A0, 56, NULL); - v1->unk_20[3] = sub_02074470(param2->unk_1A0, 57, NULL); - v1->unk_07 = sub_02074470(param2->unk_1A0, 112, NULL); + v1->unk_0A = GetMonData(param2->unk_1A0, MON_DATA_164, NULL); + v1->unk_0C = GetMonData(param2->unk_1A0, MON_DATA_165, NULL); + v1->unk_0E = GetMonData(param2->unk_1A0, MON_DATA_166, NULL); + v1->unk_10 = GetMonData(param2->unk_1A0, MON_DATA_168, NULL); + v1->unk_12 = GetMonData(param2->unk_1A0, MON_DATA_169, NULL); + v1->unk_14 = GetMonData(param2->unk_1A0, MON_DATA_167, NULL); + v1->unk_16 = GetMonData(param2->unk_1A0, MON_DATA_COOL, NULL); + v1->unk_18 = GetMonData(param2->unk_1A0, MON_DATA_BEAUTY, NULL); + v1->unk_1A = GetMonData(param2->unk_1A0, MON_DATA_CUTE, NULL); + v1->unk_1C = GetMonData(param2->unk_1A0, MON_DATA_SMART, NULL); + v1->unk_1E = GetMonData(param2->unk_1A0, MON_DATA_TOUGH, NULL); + v1->unk_20[0] = GetMonData(param2->unk_1A0, MON_DATA_MOVE1, NULL); + v1->unk_20[1] = GetMonData(param2->unk_1A0, MON_DATA_MOVE2, NULL); + v1->unk_20[2] = GetMonData(param2->unk_1A0, MON_DATA_MOVE3, NULL); + v1->unk_20[3] = GetMonData(param2->unk_1A0, MON_DATA_MOVE4, NULL); + v1->unk_07 = GetMonData(param2->unk_1A0, MON_DATA_FORM, NULL); sub_02073CD4(param2->unk_1A0, v2); @@ -4252,7 +4252,7 @@ static void ov19_021D5BA0 (UnkStruct_ov19_021D4DF0 * param0, BOOL param1) param0->unk_A4.unk_04 = param1; } -static void ov19_021D5BA8 (UnkStruct_ov19_021D4DF0 * param0, UnkStruct_02073C74_sub1 * param1) +static void ov19_021D5BA8 (UnkStruct_ov19_021D4DF0 * param0, BoxPokemon * param1) { param0->unk_4C.unk_00 = param1; } @@ -4266,7 +4266,7 @@ static void ov19_021D5BAC (UnkStruct_ov19_021D4DF0 * param0) v1 = param0->unk_74.unk_22; v0->unk_0B = v1; - sub_02074C60(v0->unk_00, 11, &(v1)); + SetBoxMonData(v0->unk_00, 11, &(v1)); if ((ov19_021D5E10(param0) == 0) && (ov19_021D5E38(param0) == 1)) { sub_02024804(); @@ -4291,20 +4291,20 @@ static void ov19_021D5BE8 (UnkStruct_ov19_021D4DF0 * param0, u16 param1, UnkStru sub_02079C50(param2->unk_120, 0xffffffff, v1, 6, ¶m1); } - sub_02074C60(v0->unk_00, 6, ¶m1); + SetBoxMonData(v0->unk_00, 6, ¶m1); { - int v2 = sub_02074570(v0->unk_00, 5, NULL); + int v2 = sub_02074570(v0->unk_00, MON_DATA_SPECIES, NULL); if (v2 == 493) { sub_02077930(v0->unk_00); - v0->unk_0C = sub_02074570(v0->unk_00, 177, NULL); - v0->unk_0D = sub_02074570(v0->unk_00, 178, NULL); + v0->unk_0C = sub_02074570(v0->unk_00, MON_DATA_177, NULL); + v0->unk_0D = sub_02074570(v0->unk_00, MON_DATA_178, NULL); } else if (v2 == 487) { int v3; sub_02077A1C(v0->unk_00); - v3 = sub_02074570(v0->unk_00, 10, NULL); + v3 = sub_02074570(v0->unk_00, MON_DATA_10, NULL); sub_0200B1B8(param2->unk_198, v3, v0->unk_24); } } @@ -4537,7 +4537,7 @@ u32 ov19_021D5E94 (const UnkStruct_ov19_021D4DF0 * param0) return param0->unk_10C; } -UnkStruct_02073C74_sub1 * ov19_021D5E9C (const UnkStruct_ov19_021D4DF0 * param0) +BoxPokemon * ov19_021D5E9C (const UnkStruct_ov19_021D4DF0 * param0) { return param0->unk_4C.unk_00; } @@ -4703,7 +4703,7 @@ static u32 ov19_021D5FD0 (UnkStruct_ov19_021D4DF0 * param0, int param1, void * p } } - return sub_02074470(param0->unk_4C.unk_00, param1, param2); + return GetMonData(param0->unk_4C.unk_00, param1, param2); } static u32 ov19_021D6014 (UnkStruct_ov19_021D4DF0 * param0, int param1, void * param2) @@ -4711,6 +4711,6 @@ static u32 ov19_021D6014 (UnkStruct_ov19_021D4DF0 * param0, int param1, void * p if (ov19_021D5E10(param0) == 0) { return sub_02074570(param0->unk_4C.unk_00, param1, param2); } else { - return sub_02074470(param0->unk_08.unk_00, param1, param2); + return GetMonData(param0->unk_08.unk_00, param1, param2); } } diff --git a/src/overlay019/ov19_021D79F8.c b/src/overlay019/ov19_021D79F8.c index 9fd1df4127..1d23f4a632 100644 --- a/src/overlay019/ov19_021D79F8.c +++ b/src/overlay019/ov19_021D79F8.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_020218BC_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "overlay019/struct_ov19_021D5DF8_decl.h" #include "overlay019/struct_ov19_021D61B0_decl.h" @@ -383,7 +383,7 @@ static void ov19_021D7F9C (UnkStruct_ov19_021D8318 * param0, fx32 param1) static void ov19_021D803C (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021DCD18 * param1, int param2, int param3) { const UnkStruct_020797DC * v0; - UnkStruct_02073C74_sub1 * v1; + BoxPokemon * v1; int v2, v3; u32 v4; @@ -396,7 +396,7 @@ static void ov19_021D803C (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D if (param1->unk_00 == NULL) { v1 = sub_02079C9C(v0, param0->unk_30, v3); - if (sub_02074570(v1, 172, NULL)) { + if (sub_02074570(v1, MON_DATA_172, NULL)) { ov19_021DA548(param0->unk_58F0, v1, param0->unk_5814[v3], param0->unk_57D8[v3], param0->unk_CD8[v3], param2, 40 + 24 * v2, 2, ov19_021D85B4(v3), v4, param1); } } @@ -426,14 +426,14 @@ static void ov19_021D8114 (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D static void ov19_021D813C (UnkStruct_ov19_021D8318 * param0, u32 param1) { const UnkStruct_020797DC * v0; - UnkStruct_02073C74_sub1 * v1; + BoxPokemon * v1; u32 v2, v3; v0 = ov19_021D5E90(param0->unk_58F8); for (v2 = 0; v2 < (5 * 6); v2++) { v1 = sub_02079C9C(v0, param1, v2); - v3 = sub_02074570(v1, 5, NULL); + v3 = sub_02074570(v1, MON_DATA_SPECIES, NULL); if (v3) { param0->unk_5814[v2] = v3; @@ -594,14 +594,14 @@ UnkStruct_ov19_021DCD18 * ov19_021D84C8 (UnkStruct_ov19_021D8318 * param0, u32 p void ov19_021D84E0 (UnkStruct_ov19_021D8318 * param0) { int v0, v1; - UnkStruct_02073C74_sub1 * v2; + BoxPokemon * v2; v1 = sub_0207999C(param0->unk_58F8->unk_00); for (v0 = 0; v0 < (5 * 6); v0++) { v2 = sub_02079C9C(param0->unk_58F8->unk_00, v1, v0); - if (sub_02074570(v2, 172, NULL)) { + if (sub_02074570(v2, MON_DATA_172, NULL)) { if (param0->unk_A8[param0->unk_02][v0].unk_00 == NULL) { int v3, v4, v5; @@ -655,7 +655,7 @@ static u32 ov19_021D85B4 (u32 param0) static void ov19_021D85C4 (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021DA384 * param1, u32 param2, u32 param3, s32 param4, UnkStruct_ov19_021DCD18 * param5) { - UnkStruct_02073C74_sub1 * v0; + BoxPokemon * v0; u32 v1, v2, v3, v4, v5; u64 v6, v7; @@ -665,7 +665,7 @@ static void ov19_021D85C4 (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D for (v3 = 0; v3 < 5; v3++) { for (v2 = 0; v2 < 6; v2++) { v0 = sub_02079C9C(param1->unk_40->unk_00, param2, v4); - v1 = sub_02074570((UnkStruct_02073C74_sub1 *)v0, 5, NULL); + v1 = sub_02074570((BoxPokemon *)v0, MON_DATA_SPECIES, NULL); if (v1 != 0) { ov19_021DA428(param1, v0, 112 + param0->unk_585C + 24 * v2 + param4, 40 + 24 * v3, 2, ov19_021D85B4(v4), v5, param5); diff --git a/src/overlay019/ov19_021DA270.c b/src/overlay019/ov19_021DA270.c index 6e6ef730b6..9983a14d1c 100644 --- a/src/overlay019/ov19_021DA270.c +++ b/src/overlay019/ov19_021DA270.c @@ -3,7 +3,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_020218BC_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/box_pokemon.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021D4DF0.h" @@ -120,7 +120,7 @@ void ov19_021DA418 (const UnkStruct_ov19_021DCD18 * param0, UnkStruct_ov19_021DC MI_CpuCopy32(param0, param1, sizeof(UnkStruct_ov19_021DCD18) * param2); } -void ov19_021DA428 (UnkStruct_ov19_021DA384 * param0, UnkStruct_02073C74_sub1 * param1, s32 param2, s32 param3, u32 param4, u32 param5, u32 param6, UnkStruct_ov19_021DCD18 * param7) +void ov19_021DA428 (UnkStruct_ov19_021DA384 * param0, BoxPokemon * param1, s32 param2, s32 param3, u32 param4, u32 param5, u32 param6, UnkStruct_ov19_021DCD18 * param7) { NNSG2dCharacterData * v0; UnkStruct_ov19_021DA864 v1; @@ -132,13 +132,13 @@ void ov19_021DA428 (UnkStruct_ov19_021DA384 * param0, UnkStruct_02073C74_sub1 * v5 = sub_02073D20(param1); ov19_021D783C(&v1, NULL, ov19_021D77D0(param0->unk_44), param0->unk_10, param0->unk_04, param4); - v2 = sub_02074570(param1, 5, NULL); - v3 = sub_02074570(param1, 76, NULL); - v4 = sub_02074570(param1, 112, NULL); - param7->unk_28 = sub_02079D40((UnkStruct_02073C74_sub1 *)param1); + v2 = sub_02074570(param1, MON_DATA_SPECIES, NULL); + v3 = sub_02074570(param1, MON_DATA_IS_EGG, NULL); + v4 = sub_02074570(param1, MON_DATA_FORM, NULL); + param7->unk_28 = sub_02079D40((BoxPokemon *)param1); param7->unk_2C = sub_02079EDC(v2, v4, v3); - param7->unk_30 = sub_02074570(param1, 6, NULL); - param7->unk_2E = sub_02074570(param1, 11, NULL); + param7->unk_30 = sub_02074570(param1, MON_DATA_HELD_ITEM, NULL); + param7->unk_2E = sub_02074570(param1, MON_DATA_11, NULL); NNS_G2dInitImageProxy(&(param7->unk_04)); NARC_ReadFromMember(param0->unk_48, param7->unk_28, 0, ((4 * 4) * 0x20 + 0x80), param0->unk_4C); @@ -159,7 +159,7 @@ void ov19_021DA428 (UnkStruct_ov19_021DA384 * param0, UnkStruct_02073C74_sub1 * sub_02073D48(param1, v5); } -void ov19_021DA548 (UnkStruct_ov19_021DA384 * param0, UnkStruct_02073C74_sub1 * param1, u32 param2, u32 param3, u8 * param4, s32 param5, s32 param6, u32 param7, u32 param8, u32 param9, UnkStruct_ov19_021DCD18 * param10) +void ov19_021DA548 (UnkStruct_ov19_021DA384 * param0, BoxPokemon * param1, u32 param2, u32 param3, u8 * param4, s32 param5, s32 param6, u32 param7, u32 param8, u32 param9, UnkStruct_ov19_021DCD18 * param10) { NNSG2dCharacterData * v0; UnkStruct_ov19_021DA864 v1; @@ -167,15 +167,15 @@ void ov19_021DA548 (UnkStruct_ov19_021DA384 * param0, UnkStruct_02073C74_sub1 * u8 v3, v4; v2 = sub_02073D20(param1); - v3 = sub_02074570(param1, 76, NULL); - v4 = sub_02074570(param1, 112, NULL); + v3 = sub_02074570(param1, MON_DATA_IS_EGG, NULL); + v4 = sub_02074570(param1, MON_DATA_FORM, NULL); ov19_021D783C(&v1, NULL, ov19_021D77D0(param0->unk_44), param0->unk_10, param0->unk_04, param7); param10->unk_28 = param3; param10->unk_2C = sub_02079EDC(param2, v4, v3); - param10->unk_30 = sub_02074570(param1, 6, NULL); - param10->unk_2E = sub_02074570(param1, 11, NULL); + param10->unk_30 = sub_02074570(param1, MON_DATA_HELD_ITEM, NULL); + param10->unk_2E = sub_02074570(param1, MON_DATA_11, NULL); NNS_G2dInitImageProxy(&(param10->unk_04)); NNS_G2dGetUnpackedCharacterData(param4, &v0); diff --git a/src/overlay019/ov19_021DB8E4.c b/src/overlay019/ov19_021DB8E4.c index 1c8a5f202e..7619017ed0 100644 --- a/src/overlay019/ov19_021DB8E4.c +++ b/src/overlay019/ov19_021DB8E4.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_020218BC_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "overlay019/struct_ov19_021D61B0_decl.h" @@ -232,7 +232,7 @@ BOOL ov19_021DBBA0 (UnkStruct_ov19_021DBA9C * param0) void ov19_021DBBA8 (UnkStruct_ov19_021DBA9C * param0, u32 param1, u32 param2, NNS_G2D_VRAM_TYPE param3, NNSG2dImageProxy * param4) { const UnkStruct_020797DC * v0; - UnkStruct_02073C74_sub1 * v1; + BoxPokemon * v1; u32 v2, v3, v4, v5; u8 v6, v7; int v8; @@ -251,11 +251,11 @@ void ov19_021DBBA8 (UnkStruct_ov19_021DBA9C * param0, u32 param1, u32 param2, NN for (v2 = 0; v2 < 6; v2++) { v1 = sub_02079C9C(v0, param1, v4++); v7 = sub_02073D20(v1); - v5 = sub_02074570(v1, 5, NULL); + v5 = sub_02074570(v1, MON_DATA_SPECIES, NULL); if (v5) { - if (sub_02074570(v1, 76, NULL) == 0) { - u16 v9 = sub_02074570(v1, 112, NULL); + if (sub_02074570(v1, MON_DATA_IS_EGG, NULL) == 0) { + u16 v9 = sub_02074570(v1, MON_DATA_FORM, NULL); v6 = sub_020759CC(v5, v9, 27); } else { diff --git a/src/overlay019/ov19_021DC5F0.c b/src/overlay019/ov19_021DC5F0.c index 09f5c87fa2..ebc2443ae7 100644 --- a/src/overlay019/ov19_021DC5F0.c +++ b/src/overlay019/ov19_021DC5F0.c @@ -5,8 +5,8 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_020218BC_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "overlay019/struct_ov19_021D5DF8_decl.h" #include "overlay019/struct_ov19_021D61B0_decl.h" @@ -515,7 +515,7 @@ static void ov19_021DCE50 (UnkStruct_ov19_021DC680 * param0, fx32 param1) static void ov19_021DCEB8 (UnkStruct_ov19_021DC680 * param0, BOOL param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; int v1, v2, v3; v3 = (param1) ? 0 : 208; @@ -523,7 +523,7 @@ static void ov19_021DCEB8 (UnkStruct_ov19_021DC680 * param0, BOOL param1) for (v1 = 0; v1 < v2; v1++) { v0 = Party_GetPokemonBySlotIndex(param0->unk_0C->unk_04, v1); - ov19_021DA428(param0->unk_38, (UnkStruct_02073C74_sub1 *)v0, Unk_ov19_021E0234[v1].unk_00 + param0->unk_34, Unk_ov19_021E0234[v1].unk_02 + v3, 1, 4 + v1, 1048 + 32 * v1, ¶m0->unk_3C[v1]); + ov19_021DA428(param0->unk_38, (BoxPokemon *)v0, Unk_ov19_021E0234[v1].unk_00 + param0->unk_34, Unk_ov19_021E0234[v1].unk_02 + v3, 1, 4 + v1, 1048 + 32 * v1, ¶m0->unk_3C[v1]); sub_02021CAC(param0->unk_3C[v1].unk_00, param1); } } diff --git a/src/overlay019/ov19_021DEC04.c b/src/overlay019/ov19_021DEC04.c index 7c3a146f75..77e580dfcf 100644 --- a/src/overlay019/ov19_021DEC04.c +++ b/src/overlay019/ov19_021DEC04.c @@ -10,7 +10,7 @@ #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/box_pokemon.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DEC04_decl.h" @@ -678,7 +678,7 @@ static void ov19_021DF834 (UnkStruct_ov19_021DEC04 * param0) int v0 = ov19_021D5F9C(param0->unk_08); const UnkStruct_ov19_021D5FAC * v1 = ov19_021D5FAC(param0->unk_08, v0); UnkStruct_02022550 * v2 = param0->unk_20[v0]; - UnkStruct_02073C74_sub1 * v3 = (UnkStruct_02073C74_sub1 *)(v1->unk_00); + BoxPokemon * v3 = (BoxPokemon *)(v1->unk_00); NNSG2dCharacterData * v4; if (ov19_021D5E34(param0->unk_08)) { diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c index 063cbbc916..103025e89f 100644 --- a/src/overlay021/ov21_021E8D48.c +++ b/src/overlay021/ov21_021E8D48.c @@ -13,7 +13,7 @@ #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay021/struct_ov21_021D4C0C_decl.h" #include "struct_defs/struct_02008A90.h" @@ -114,7 +114,7 @@ static void ov21_021E9208(UnkStruct_02009714 ** param0, int param1); static void ov21_021E9228(UnkStruct_02009714 ** param0); static void ov21_021E9240(UnkStruct_ov21_021D22F8 * param0, UnkStruct_ov21_021D4C0C * param1, int param2, int param3, int param4); static void ov21_021E92B0(UnkStruct_ov21_021D22F8 * param0); -static UnkStruct_02007C7C * ov21_021E99E0(UnkStruct_02007768 * param0, UnkStruct_02073C74 * param1, int param2, int param3, int param4); +static UnkStruct_02007C7C * ov21_021E99E0(UnkStruct_02007768 * param0, Pokemon * param1, int param2, int param3, int param4); static void ov21_021E92C4(UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9); static void ov21_021E9344(UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, int param2, NARC * param3, int param4, int param5, int param6, int param7, int param8, int param9); static void ov21_021E93C4(UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1); @@ -153,8 +153,8 @@ UnkStruct_ov21_021E8D48 * ov21_021E8D48 (const UnkStruct_ov21_021E8E0C * param0) u32 v1; u32 v2; - v1 = sub_02074470(param0->unk_10, 5, NULL); - v2 = sub_02074470(param0->unk_10, 112, NULL); + v1 = GetMonData(param0->unk_10, MON_DATA_SPECIES, NULL); + v2 = GetMonData(param0->unk_10, MON_DATA_FORM, NULL); if (v1 == 487) { sub_02098988(v2); @@ -205,8 +205,8 @@ static void ov21_021E8E0C (UnkStruct_ov21_021E8D48 * param0, const UnkStruct_ov2 NARC * v1 = NARC_ctor(69, param1->unk_0C); int v2; - param0->unk_220 = sub_02074470(param1->unk_10, 5, NULL); - v2 = sub_02074470(param1->unk_10, 112, NULL); + param0->unk_220 = GetMonData(param1->unk_10, MON_DATA_SPECIES, NULL); + v2 = GetMonData(param1->unk_10, MON_DATA_FORM, NULL); param0->unk_00 = param1->unk_00; param0->unk_19C = sub_020095C4(32, ¶m0->unk_10, param1->unk_0C); @@ -770,7 +770,7 @@ static void ov21_021E998C (UnkStruct_0205AA50 * param0, int param1) sub_0200B190(v1); } -static UnkStruct_02007C7C * ov21_021E99E0 (UnkStruct_02007768 * param0, UnkStruct_02073C74 * param1, int param2, int param3, int param4) +static UnkStruct_02007C7C * ov21_021E99E0 (UnkStruct_02007768 * param0, Pokemon * param1, int param2, int param3, int param4) { UnkStruct_02008A90 v0; diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c index fe6065d0be..e7ef7c29b1 100644 --- a/src/overlay022/ov22_02255D44.c +++ b/src/overlay022/ov22_02255D44.c @@ -12,7 +12,7 @@ #include "struct_decls/struct_02025E6C_decl.h" #include "struct_decls/struct_02029C68_decl.h" #include "struct_decls/struct_02029C88_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_02008A90.h" #include "struct_defs/struct_02015958.h" @@ -137,8 +137,8 @@ static void ov22_02256940(void * param0); static void ov22_022566C0(UnkStruct_ov22_02255D44 * param0); static void ov22_022566EC(UnkStruct_ov22_02255D44 * param0); static void ov22_022566F4(UnkStruct_ov22_02255D44 * param0); -static void ov22_02256708(UnkStruct_ov22_02255D44 * param0, UnkStruct_02073C74 * param1, int param2, BOOL param3); -static void ov22_02256790(UnkStruct_ov22_02255D44 * param0, UnkStruct_02073C74 * param1, int param2); +static void ov22_02256708(UnkStruct_ov22_02255D44 * param0, Pokemon * param1, int param2, BOOL param3); +static void ov22_02256790(UnkStruct_ov22_02255D44 * param0, Pokemon * param1, int param2); static void ov22_022567D8(UnkStruct_ov22_02255D44 * param0); static void ov22_022567FC(UnkStruct_ov22_02255D44 * param0); static void ov22_022568B8(UnkStruct_ov22_02255D44 * param0); @@ -699,7 +699,7 @@ static void ov22_022566F4 (UnkStruct_ov22_02255D44 * param0) ov22_022550B4(); } -static void ov22_02256708 (UnkStruct_ov22_02255D44 * param0, UnkStruct_02073C74 * param1, int param2, BOOL param3) +static void ov22_02256708 (UnkStruct_ov22_02255D44 * param0, Pokemon * param1, int param2, BOOL param3) { UnkStruct_ov22_0225B388 v0; @@ -731,7 +731,7 @@ static void ov22_02256708 (UnkStruct_ov22_02255D44 * param0, UnkStruct_02073C74 ov22_02257C88(¶m0->unk_458, 0, 14); } -static void ov22_02256790 (UnkStruct_ov22_02255D44 * param0, UnkStruct_02073C74 * param1, int param2) +static void ov22_02256790 (UnkStruct_ov22_02255D44 * param0, Pokemon * param1, int param2) { int v0, v1; UnkStruct_ov22_022596B0 v2; diff --git a/src/overlay022/ov22_022578F4.c b/src/overlay022/ov22_022578F4.c index 8dcd8b293a..7b06445ea4 100644 --- a/src/overlay022/ov22_022578F4.c +++ b/src/overlay022/ov22_022578F4.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_02008A90.h" #include "struct_defs/union_02022594_020225E0.h" @@ -60,19 +60,19 @@ void ov22_02257948 (UnkStruct_ov22_02257964 * param0) memset(param0, 0, sizeof(UnkStruct_ov22_02257964)); } -void ov22_02257964 (UnkStruct_ov22_02257964 * param0, UnkStruct_02073C74 * param1, UnkStruct_02008A90 * param2, int param3, int param4, int param5, int param6) +void ov22_02257964 (UnkStruct_ov22_02257964 * param0, Pokemon * param1, UnkStruct_02008A90 * param2, int param3, int param4, int param5, int param6) { ov22_022590C0(¶m0->unk_2C.unk_4C, param0->unk_2C.unk_10, param1, param2, param6); ov22_022591D0(¶m0->unk_2C.unk_4C, param5); ov22_022591EC(¶m0->unk_2C.unk_4C, param3, param4); } -void ov22_02257998 (UnkStruct_ov22_02257964 * param0, UnkStruct_02073C74 * param1, UnkStruct_02008A90 * param2, int param3) +void ov22_02257998 (UnkStruct_ov22_02257964 * param0, Pokemon * param1, UnkStruct_02008A90 * param2, int param3) { ov22_022590C0(¶m0->unk_2C.unk_4C, param0->unk_2C.unk_10, param1, param2, param3); } -void ov22_022579B4 (UnkStruct_ov22_02257964 * param0, UnkStruct_02073C74 * param1, UnkStruct_02008A90 * param2, int param3) +void ov22_022579B4 (UnkStruct_ov22_02257964 * param0, Pokemon * param1, UnkStruct_02008A90 * param2, int param3) { ov22_022590D4(¶m0->unk_2C.unk_4C, param0->unk_2C.unk_10, param1, param2, param3, 1); } diff --git a/src/overlay022/ov22_02259098.c b/src/overlay022/ov22_02259098.c index 791c6b8394..f3b52e3658 100644 --- a/src/overlay022/ov22_02259098.c +++ b/src/overlay022/ov22_02259098.c @@ -4,7 +4,7 @@ #include "data_021BF67C.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_02008A90.h" #include "struct_defs/union_02022594_020225E0.h" @@ -35,14 +35,14 @@ void ov22_02259098 (UnkStruct_ov22_0225A0E4 * param0, UnkStruct_02008A90 * param sub_020093A0((u8 *)v1->pRawData, param1->unk_00); } -void ov22_022590C0 (UnkStruct_020298D8 * param0, UnkStruct_02007768 * param1, UnkStruct_02073C74 * param2, UnkStruct_02008A90 * param3, int param4) +void ov22_022590C0 (UnkStruct_020298D8 * param0, UnkStruct_02007768 * param1, Pokemon * param2, UnkStruct_02008A90 * param3, int param4) { ov22_022590D4(param0, param1, param2, param3, param4, 0); } -void ov22_022590D4 (UnkStruct_020298D8 * param0, UnkStruct_02007768 * param1, UnkStruct_02073C74 * param2, UnkStruct_02008A90 * param3, int param4, BOOL param5) +void ov22_022590D4 (UnkStruct_020298D8 * param0, UnkStruct_02007768 * param1, Pokemon * param2, UnkStruct_02008A90 * param3, int param4, BOOL param5) { - int v0 = sub_02074470(param2, 5, NULL); + int v0 = GetMonData(param2, MON_DATA_SPECIES, NULL); sub_02075F00(param3, param2, 2); param0->unk_00 = sub_02007C34(param1, param3, 192, 56, 0, 0, NULL, NULL); diff --git a/src/overlay022/ov22_0225AF8C.c b/src/overlay022/ov22_0225AF8C.c index f6599db691..98c345bb1c 100644 --- a/src/overlay022/ov22_0225AF8C.c +++ b/src/overlay022/ov22_0225AF8C.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_02029C88_decl.h" #include "struct_decls/struct_0202A138_decl.h" #include "struct_decls/struct_0202A150_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_02008A90.h" #include "overlay022/struct_ov22_02254DE0.h" @@ -40,7 +40,7 @@ typedef struct UnkStruct_ov22_0225B1BC_t { UnkStruct_ov22_02254DE0 * unk_1F0; UnkStruct_ov22_02257964 unk_1F4; UnkStruct_ov22_0225AF68 unk_27C; - UnkStruct_02073C74 * unk_298; + Pokemon * unk_298; int unk_29C; int unk_2A0; int unk_2A4; @@ -243,7 +243,7 @@ static UnkStruct_ov22_0225B1BC * ov22_0225B1BC (const UnkStruct_ov22_0225B4E4 * memset(v0, 0, sizeof(UnkStruct_ov22_0225B1BC)); v0->unk_29C = param0->unk_68; - v0->unk_298 = sub_02073C74(param0->unk_68); + v0->unk_298 = AllocMonZeroed(param0->unk_68); sub_0202A61C(param0->unk_00, v0->unk_298); ov22_0225B2D4(v0, param0); @@ -273,7 +273,7 @@ static UnkStruct_ov22_0225B1BC * ov22_0225B258 (const UnkStruct_ov22_0225B4E4 * memset(v0, 0, sizeof(UnkStruct_ov22_0225B1BC)); v0->unk_29C = param0->unk_68; - v0->unk_298 = sub_02073C74(param0->unk_68); + v0->unk_298 = AllocMonZeroed(param0->unk_68); sub_0202A61C(param0->unk_00, v0->unk_298); diff --git a/src/overlay022/ov22_0225B660.c b/src/overlay022/ov22_0225B660.c index 64c2f17c9c..89352fc7c0 100644 --- a/src/overlay022/ov22_0225B660.c +++ b/src/overlay022/ov22_0225B660.c @@ -10,8 +10,8 @@ #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02029C68_decl.h" #include "struct_decls/struct_02029C88_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "overlay022/struct_ov22_0225B1BC_decl.h" #include "struct_defs/struct_02041DC8.h" @@ -331,8 +331,8 @@ static void ov22_0225BC18 (UnkStruct_ov22_0225B85C * param0) UnkStruct_02023790 * v2; UnkStruct_02023790 * v3; int v4; - UnkStruct_02073C74 * v5; - UnkStruct_02073C74_sub1 * v6; + Pokemon * v5; + BoxPokemon * v6; UnkStruct_0200B144 * v7; int v8, v9; int v10; @@ -350,7 +350,7 @@ static void ov22_0225BC18 (UnkStruct_ov22_0225B85C * param0) sub_0202A524(param0->unk_04, v2); sub_0200B48C(v1, 3, v2, v4, 1, GAME_LANGUAGE); - v5 = sub_02073C74(13); + v5 = AllocMonZeroed(13); sub_0202A560(param0->unk_04, v5); v6 = sub_02076B10(v5); sub_0200B5CC(v1, 4, v6); diff --git a/src/overlay032/ov32_022561C0.c b/src/overlay032/ov32_022561C0.c index f334505bb5..b9aa5c0867 100644 --- a/src/overlay032/ov32_022561C0.c +++ b/src/overlay032/ov32_022561C0.c @@ -4,8 +4,8 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_party_decl.h" #include "overlay025/struct_ov25_0225424C_decl.h" #include "overlay032/struct_ov32_02256470_decl.h" @@ -199,7 +199,7 @@ static BOOL ov32_02256394 (UnkStruct_ov32_0225621C * param0) static void ov32_022563C8 (UnkStruct_ov32_02256470_1 * param0, Party * param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; int v1; BOOL v2; @@ -209,14 +209,14 @@ static void ov32_022563C8 (UnkStruct_ov32_02256470_1 * param0, Party * param1) v0 = Party_GetPokemonBySlotIndex(param1, v1); v2 = sub_02073C88(v0); - param0->unk_04[v1].unk_00 = sub_02079D40((const UnkStruct_02073C74_sub1 *)v0); - param0->unk_04[v1].unk_04 = sub_02074470(v0, 5, NULL); - param0->unk_04[v1].unk_06 = sub_02074470(v0, 163, NULL); - param0->unk_04[v1].unk_08 = sub_02074470(v0, 164, NULL); - param0->unk_04[v1].unk_0A = sub_02074470(v0, 6, NULL); - param0->unk_04[v1].unk_0C = (sub_02074470(v0, 160, NULL) != 0); - param0->unk_04[v1].unk_0E = sub_02074470(v0, 76, NULL); - param0->unk_04[v1].unk_0F = sub_02074470(v0, 112, NULL); + param0->unk_04[v1].unk_00 = sub_02079D40((const BoxPokemon *)v0); + param0->unk_04[v1].unk_04 = GetMonData(v0, MON_DATA_SPECIES, NULL); + param0->unk_04[v1].unk_06 = GetMonData(v0, MON_DATA_163, NULL); + param0->unk_04[v1].unk_08 = GetMonData(v0, MON_DATA_164, NULL); + param0->unk_04[v1].unk_0A = GetMonData(v0, MON_DATA_HELD_ITEM, NULL); + param0->unk_04[v1].unk_0C = (GetMonData(v0, MON_DATA_160, NULL) != 0); + param0->unk_04[v1].unk_0E = GetMonData(v0, MON_DATA_IS_EGG, NULL); + param0->unk_04[v1].unk_0F = GetMonData(v0, MON_DATA_FORM, NULL); sub_02073CD4(v0, v2); } diff --git a/src/overlay033/ov33_022561C0.c b/src/overlay033/ov33_022561C0.c index 5f1c1b7f44..9fcecf4613 100644 --- a/src/overlay033/ov33_022561C0.c +++ b/src/overlay033/ov33_022561C0.c @@ -4,8 +4,8 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_party_decl.h" #include "overlay025/struct_ov25_0225424C_decl.h" #include "overlay033/struct_ov33_02256474_decl.h" @@ -77,7 +77,7 @@ static BOOL ov33_0225621C (UnkStruct_ov33_0225621C * param0, UnkStruct_ov25_0225 { Party * v0 = Party_GetFromSavedata(sub_020245A4()); - UnkStruct_02073C74 * v1; + Pokemon * v1; int v2; int v3; int v4; @@ -88,11 +88,11 @@ static BOOL ov33_0225621C (UnkStruct_ov33_0225621C * param0, UnkStruct_ov25_0225 for (v2 = 0; v2 < param0->unk_04.unk_00; v2++) { v1 = Party_GetPokemonBySlotIndex(v0, v2); - if (sub_02074470(v1, 76, NULL) == 0) { - param0->unk_04.unk_04[v4].unk_04 = sub_02074470(v1, 5, NULL); - param0->unk_04.unk_04[v4].unk_08 = sub_02074470(v1, 112, NULL); - param0->unk_04.unk_04[v4].unk_00 = sub_02079D40((const UnkStruct_02073C74_sub1 *)v1); - v3 = ov33_0225630C(sub_02074470(v1, 9, NULL)); + if (GetMonData(v1, MON_DATA_IS_EGG, NULL) == 0) { + param0->unk_04.unk_04[v4].unk_04 = GetMonData(v1, MON_DATA_SPECIES, NULL); + param0->unk_04.unk_04[v4].unk_08 = GetMonData(v1, MON_DATA_FORM, NULL); + param0->unk_04.unk_04[v4].unk_00 = sub_02079D40((const BoxPokemon *)v1); + v3 = ov33_0225630C(GetMonData(v1, MON_DATA_FRIENDSHIP, NULL)); switch (v3) { case 0: diff --git a/src/overlay040/ov40_022561C0.c b/src/overlay040/ov40_022561C0.c index 59c6628739..07eedc8005 100644 --- a/src/overlay040/ov40_022561C0.c +++ b/src/overlay040/ov40_022561C0.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_02026218_decl.h" #include "struct_decls/struct_02026310_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/box_pokemon.h" #include "overlay025/struct_ov25_0225424C_decl.h" #include "overlay040/struct_ov40_0225645C_decl.h" @@ -207,7 +207,7 @@ static BOOL ov40_02256388 (UnkStruct_ov40_0225621C * param0) static void ov40_022563D0 (UnkStruct_ov40_0225645C_1 * param0, UnkStruct_02026310 * param1) { UnkStruct_02026218 * v0; - UnkStruct_02073C74_sub1 * v1; + BoxPokemon * v1; int v2; BOOL v3; @@ -220,8 +220,8 @@ static void ov40_022563D0 (UnkStruct_ov40_0225645C_1 * param0, UnkStruct_0202631 v3 = sub_02073D20(v1); param0->unk_04[v2] = sub_02079D40(v1); - param0->unk_1C[v2] = sub_02074570(v1, 5, NULL); - param0->unk_20[v2] = sub_02074570(v1, 112, NULL); + param0->unk_1C[v2] = sub_02074570(v1, MON_DATA_SPECIES, NULL); + param0->unk_20[v2] = sub_02074570(v1, MON_DATA_FORM, NULL); param0->unk_0C[v2] = ov5_021E6590(v0); param0->unk_14[v2] = sub_02075D74(v1); diff --git a/src/overlay044/ov44_022561C0.c b/src/overlay044/ov44_022561C0.c index b6aa2089f3..679adf6198 100644 --- a/src/overlay044/ov44_022561C0.c +++ b/src/overlay044/ov44_022561C0.c @@ -4,8 +4,8 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_party_decl.h" #include "overlay025/struct_ov25_0225424C_decl.h" #include "overlay025/struct_ov25_02255B34_decl.h" @@ -34,8 +34,8 @@ typedef struct { UnkStruct_ov25_02255B34 * unk_40; u16 unk_44; u16 unk_46; - UnkStruct_02073C74_sub1 * unk_48[6]; - UnkStruct_02073C74_sub1 * unk_60[2]; + BoxPokemon * unk_48[6]; + BoxPokemon * unk_60[2]; } UnkStruct_ov44_0225621C; static void NitroStaticInit(void); @@ -79,7 +79,7 @@ static BOOL ov44_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, Unk static BOOL ov44_0225621C (UnkStruct_ov44_0225621C * param0, UnkStruct_ov25_0225424C * param1, UnkStruct_02018340 * param2, u32 param3) { Party * v0 = Party_GetFromSavedata(ov25_02254544(param1)); - UnkStruct_02073C74 * v1; + Pokemon * v1; int v2; int v3 = 0; @@ -88,14 +88,14 @@ static BOOL ov44_0225621C (UnkStruct_ov44_0225621C * param0, UnkStruct_ov25_0225 for (v2 = 0; v2 < param0->unk_04.unk_30; v2++) { v1 = Party_GetPokemonBySlotIndex(v0, v2); - if (sub_02074470(v1, 76, NULL)) { + if (GetMonData(v1, MON_DATA_IS_EGG, NULL)) { continue; } - param0->unk_04.unk_00[v3] = sub_02079D40((const UnkStruct_02073C74_sub1 *)v1); - param0->unk_04.unk_18[v3] = sub_02074470(v1, 5, NULL); - param0->unk_04.unk_24[v3] = sub_02074470(v1, 112, NULL); - param0->unk_48[v3] = (UnkStruct_02073C74_sub1 *)v1; + param0->unk_04.unk_00[v3] = sub_02079D40((const BoxPokemon *)v1); + param0->unk_04.unk_18[v3] = GetMonData(v1, MON_DATA_SPECIES, NULL); + param0->unk_04.unk_24[v3] = GetMonData(v1, MON_DATA_FORM, NULL); + param0->unk_48[v3] = (BoxPokemon *)v1; v3++; } diff --git a/src/overlay062/ov62_02248408.c b/src/overlay062/ov62_02248408.c index bddc65b2c5..47d9d8ec68 100644 --- a/src/overlay062/ov62_02248408.c +++ b/src/overlay062/ov62_02248408.c @@ -9,7 +9,7 @@ #include "struct_defs/struct_0202F298.h" #include "struct_defs/struct_0202F298_sub1.h" #include "struct_defs/struct_0202F41C.h" -#include "struct_defs/struct_02073C74.h" +#include "struct_defs/pokemon.h" #include "overlay006/struct_ov6_02240D5C.h" #include "unk_02002B7C.h" @@ -37,7 +37,7 @@ void ov62_02248408 (UnkStruct_0202F264 * param0, UnkStruct_ov6_02240D5C * param1 u16 * v8; int v9 = 64; int v10, v11, v12; - UnkStruct_02073C74 * v13; + Pokemon * v13; sub_0202F4C0(v1->unk_26, &v2, &v3); v6 = sub_02023790(v9, param2); @@ -73,13 +73,13 @@ void ov62_02248408 (UnkStruct_0202F264 * param0, UnkStruct_ov6_02240D5C * param1 for (v11 = 0; v11 < v12; v11++) { v13 = Party_GetPokemonBySlotIndex(param1->unk_04[v4], v11); - if (sub_02074470(v13, 172, NULL) == 0) { + if (GetMonData(v13, MON_DATA_172, NULL) == 0) { break; } MI_CpuClear16(v8, sizeof(u16) * v9); - sub_02074470(v13, 117, v8); + GetMonData(v13, MON_DATA_117, v8); sub_020237E8(v6); sub_02023D28(v6, v8); diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index 90e9f0cd3c..ce7849356e 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -20,7 +20,7 @@ #include "struct_decls/struct_0202B628_decl.h" #include "struct_decls/struct_0202C878_decl.h" #include "struct_decls/struct_0203068C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "overlay065/struct_ov65_0222EBE0_decl.h" @@ -661,18 +661,18 @@ static int ov65_0222DED4 (int param0) static int ov65_0222DF88 (UnkStruct_ov65_0222EBE0 * param0) { Party * v0 = Party_GetFromSavedata(param0->unk_160); - UnkStruct_02073C74 * v1; + Pokemon * v1; int v2 = Party_GetCurrentCount(v0); int v3, v4 = 0; for (v3 = 0; v3 < v2; v3++) { v1 = Party_GetPokemonBySlotIndex(v0, v3); - if (sub_02074470(v1, 163, NULL) == 0) { + if (GetMonData(v1, MON_DATA_163, NULL) == 0) { continue; } - if (sub_02074470(v1, 76, NULL)) { + if (GetMonData(v1, MON_DATA_IS_EGG, NULL)) { continue; } @@ -1818,10 +1818,10 @@ static void ov65_0222F4C4 (UnkStruct_ov65_0222EBE0 * param0, int param1) v4 = Party_GetCurrentCount(v2); for (v5 = 0; v5 < v4; v5++) { - UnkStruct_02073C74 * v6 = Party_GetPokemonBySlotIndex(v2, v5); + Pokemon * v6 = Party_GetPokemonBySlotIndex(v2, v5); - param0->unk_04->unk_00.unk_00[v5] = sub_02074470(v6, 5, NULL); - param0->unk_04->unk_00.unk_0C[v5] = sub_02074470(v6, 6, NULL); + param0->unk_04->unk_00.unk_00[v5] = GetMonData(v6, MON_DATA_SPECIES, NULL); + param0->unk_04->unk_00.unk_0C[v5] = GetMonData(v6, MON_DATA_HELD_ITEM, NULL); } param0->unk_04->unk_00.unk_18 = sub_02025FCC(v0); diff --git a/src/overlay066/ov66_0222DDF0.c b/src/overlay066/ov66_0222DDF0.c index 9144f3b403..234ef561bf 100644 --- a/src/overlay066/ov66_0222DDF0.c +++ b/src/overlay066/ov66_0222DDF0.c @@ -16,7 +16,7 @@ #include "struct_decls/struct_0202C878_decl.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_02030EC4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_0207E060_decl.h" #include "struct_decls/struct_021C0794_decl.h" @@ -2341,7 +2341,7 @@ static void ov66_0222F7C8 (UnkStruct_ov66_0222F6C4 * param0, UnkStruct_021C0794 param0->unk_20.unk_04 = sub_02025F20(v0); { - UnkStruct_02073C74 * v6; + Pokemon * v6; int v7; int v8; @@ -2350,9 +2350,9 @@ static void ov66_0222F7C8 (UnkStruct_ov66_0222F6C4 * param0, UnkStruct_021C0794 for (v8 = 0; v8 < 6; v8++) { if (v8 < v7) { v6 = Party_GetPokemonBySlotIndex(v1, v8); - param0->unk_20.unk_20[v8] = sub_02074470(v6, 5, NULL); - param0->unk_20.unk_2C[v8] = sub_02074470(v6, 112, NULL); - param0->unk_20.unk_32[v8] = sub_02074470(v6, 76, NULL); + param0->unk_20.unk_20[v8] = GetMonData(v6, MON_DATA_SPECIES, NULL); + param0->unk_20.unk_2C[v8] = GetMonData(v6, MON_DATA_FORM, NULL); + param0->unk_20.unk_32[v8] = GetMonData(v6, MON_DATA_IS_EGG, NULL); } else { param0->unk_20.unk_20[v8] = 495; } diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c index d239568b9a..d7cb15eb62 100644 --- a/src/overlay076/ov76_0223B870.c +++ b/src/overlay076/ov76_0223B870.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay076/const_ov76_0223EF3C.h" @@ -569,7 +569,7 @@ void ov76_0223C188 (UnkStruct_ov76_0223DE00 * param0) int v2; int v3; int v4; - UnkStruct_02073C74 * v5; + Pokemon * v5; UnkStruct_ov104_0223F9E0 v6; for (v0 = 0; v0 < param0->unk_00->unk_00; v0++) { @@ -595,9 +595,9 @@ void ov76_0223C188 (UnkStruct_ov76_0223DE00 * param0) param0->unk_2FC[v0] = sub_0200CE6C(param0->unk_D4.unk_08, param0->unk_D4.unk_0C, &v6); - v2 = sub_02074470(v5, 5, NULL); - v1 = sub_02074470(v5, 76, NULL); - v4 = sub_02074470(v5, 112, NULL); + v2 = GetMonData(v5, MON_DATA_SPECIES, NULL); + v1 = GetMonData(v5, MON_DATA_IS_EGG, NULL); + v4 = GetMonData(v5, MON_DATA_FORM, NULL); v3 = sub_02079EDC(v2, v4, v1); sub_02021F24(param0->unk_2FC[v0]->unk_00, v3); diff --git a/src/overlay076/ov76_0223D338.c b/src/overlay076/ov76_0223D338.c index af33a13438..2bfca520b2 100644 --- a/src/overlay076/ov76_0223D338.c +++ b/src/overlay076/ov76_0223D338.c @@ -8,7 +8,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_0202CD88_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay076/const_ov76_0223EF3C.h" @@ -108,7 +108,7 @@ void ov76_0223D3CC (UnkStruct_ov76_0223DE00 * param0) { int v0; int v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; if (param0->unk_04[param0->unk_3C4[0]].unk_00 != 0xff) { v2 = param0->unk_00->unk_04[param0->unk_04[param0->unk_3C4[0]].unk_00]; @@ -119,7 +119,7 @@ void ov76_0223D3CC (UnkStruct_ov76_0223DE00 * param0) for (v0 = 0; v0 < param0->unk_00->unk_00; v0++) { v2 = param0->unk_00->unk_04[v0]; - v1 = sub_02074470(v2, 76, NULL); + v1 = GetMonData(v2, MON_DATA_IS_EGG, NULL); if (v1 != 0) { continue; @@ -718,7 +718,7 @@ void ov76_0223DD88 (UnkStruct_ov76_0223DE00 * param0) sub_02075EF4(&v0, param0->unk_428, 2); - v2 = sub_02074470(param0->unk_428, 5, NULL); + v2 = GetMonData(param0->unk_428, MON_DATA_SPECIES, NULL); v3 = sub_020765AC(param0->unk_428, 2); param0->unk_D4.unk_D8 = v3; @@ -731,7 +731,7 @@ static void ov76_0223DE00 (UnkStruct_ov76_0223DE00 * param0) int v0; int v1; - v0 = sub_02074470(param0->unk_428, 5, NULL); + v0 = GetMonData(param0->unk_428, MON_DATA_SPECIES, NULL); v1 = sub_02075BCC(param0->unk_428); sub_02007B98(param0->unk_D4.unk_D4, 1); @@ -865,7 +865,7 @@ static BOOL ov76_0223DF94 (UnkStruct_ov76_0223DE00 * param0) v0.unk_18 = 1; v0.unk_1C = param0->unk_D4.unk_08; v0.unk_20 = param0->unk_D4.unk_14; - v0.unk_10 = sub_02074470(param0->unk_428, 155, NULL); + v0.unk_10 = GetMonData(param0->unk_428, MON_DATA_POKEBALL, NULL); param0->unk_D4.unk_158 = ov12_02237728(&v0); param0->unk_3DC++; @@ -955,7 +955,7 @@ static BOOL ov76_0223DF94 (UnkStruct_ov76_0223DE00 * param0) v5.unk_18 = 1; v5.unk_1C = param0->unk_D4.unk_08; v5.unk_20 = param0->unk_D4.unk_14; - v5.unk_10 = sub_02074470(param0->unk_428, 155, NULL); + v5.unk_10 = GetMonData(param0->unk_428, MON_DATA_POKEBALL, NULL); param0->unk_D4.unk_158 = ov12_02237728(&v5); @@ -1010,7 +1010,7 @@ static BOOL ov76_0223DF94 (UnkStruct_ov76_0223DE00 * param0) } { - UnkStruct_02073C74 * v8; + Pokemon * v8; if (param0->unk_264[param0->unk_3C4[0]].unk_00 != 0xff) { v8 = param0->unk_00->unk_04[param0->unk_264[param0->unk_3C4[0]].unk_00]; diff --git a/src/overlay079/ov79_021D2268.c b/src/overlay079/ov79_021D2268.c index 8692387616..44c474e923 100644 --- a/src/overlay079/ov79_021D2268.c +++ b/src/overlay079/ov79_021D2268.c @@ -527,13 +527,13 @@ static void ov79_021D27AC (UnkStruct_ov79_021D2928 * param0) static void ov79_021D27D8 (UnkStruct_ov79_021D2928 * param0) { param0->unk_30.unk_00 = param0->unk_10->unk_00; - param0->unk_30.unk_04 = sub_02074470(param0->unk_10->unk_00, 5, NULL); + param0->unk_30.unk_04 = GetMonData(param0->unk_10->unk_00, MON_DATA_SPECIES, NULL); param0->unk_30.unk_07 = sub_02075D6C(param0->unk_10->unk_00); param0->unk_30.unk_06 = sub_02075BCC(param0->unk_10->unk_00); - param0->unk_30.unk_08 = sub_020759CC(param0->unk_30.unk_04, sub_02074470(param0->unk_10->unk_00, 112, NULL), 28) ^ 1; + param0->unk_30.unk_08 = sub_020759CC(param0->unk_30.unk_04, GetMonData(param0->unk_10->unk_00, MON_DATA_FORM, NULL), 28) ^ 1; param0->unk_30.unk_0C = sub_02023790(12, param0->unk_00); - sub_02074470(param0->unk_10->unk_00, 119, param0->unk_30.unk_0C); + GetMonData(param0->unk_10->unk_00, MON_DATA_119, param0->unk_30.unk_0C); param0->unk_30.unk_09 = sub_02098EAC(param0->unk_10->unk_04, param0->unk_30.unk_06); } @@ -690,7 +690,7 @@ static int ov79_021D2AF0 (UnkStruct_ov79_021D2928 * param0, UnkStruct_ov79_021D2 { u32 v0; - v0 = sub_02074470(param0->unk_30.unk_00, 112, NULL); + v0 = GetMonData(param0->unk_30.unk_00, MON_DATA_FORM, NULL); switch (param0->unk_30.unk_09) { case 1: diff --git a/src/overlay081/ov81_021D1610.c b/src/overlay081/ov81_021D1610.c index cbf13a38d3..6beff753be 100644 --- a/src/overlay081/ov81_021D1610.c +++ b/src/overlay081/ov81_021D1610.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_0202BC58.h" #include "struct_defs/struct_0202BCC8.h" @@ -822,7 +822,7 @@ static void ov81_021D285C (UnkStruct_ov81_021D1610 * param0, UnkStruct_0205AA50 static void ov81_021D28C8 (UnkStruct_ov81_021D1610 * param0, u16 param1, u8 param2, u8 param3) { - UnkStruct_02073C74 * v0 = sub_02073C74(42); + Pokemon * v0 = AllocMonZeroed(42); sub_02074088(v0, param1, 1, 32, param2, 0, 0); sub_0200B538(param0->unk_54, param3, sub_02076B10(v0)); diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c index 17550c5ea5..77bbdc75e4 100644 --- a/src/overlay086/ov86_0223B140.c +++ b/src/overlay086/ov86_0223B140.c @@ -16,7 +16,7 @@ #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02025E6C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_02007C10.h" #include "struct_defs/struct_02008900.h" @@ -193,7 +193,7 @@ typedef struct { UnkStruct_02023790 * unk_18; UnkStruct_02023790 * unk_1C; UnkStruct_0200B144 * unk_20; - UnkStruct_02073C74 * unk_24; + Pokemon * unk_24; const UnkStruct_02025E6C * unk_28; int unk_2C; int unk_30; @@ -302,7 +302,7 @@ static void ov86_0223D220(UnkStruct_0201CD38 * param0); static void ov86_0223D264(UnkStruct_ov86_0223D264 * param0, fx32 param1, fx32 param2, int param3); static fx32 ov86_0223D284(UnkStruct_ov86_0223D264 * param0); static BOOL ov86_0223D2A4(UnkStruct_ov86_0223D264 * param0); -static int ov86_0223D2A8(UnkStruct_ov86_0223B3C8 * param0, UnkStruct_02073C74 * param1, const UnkStruct_02025E6C * param2); +static int ov86_0223D2A8(UnkStruct_ov86_0223B3C8 * param0, Pokemon * param1, const UnkStruct_02025E6C * param2); static UnkStruct_0201CD38 * ov86_0223CAE4(UnkStruct_ov86_0223C9B0 * param0, fx16 param1, fx32 param2, int param3); int ov86_0223B140 (UnkStruct_020067E8 * param0, int * param1) @@ -328,7 +328,7 @@ int ov86_0223B140 (UnkStruct_020067E8 * param0, int * param1) v2 = Party_GetCurrentCount(v0->unk_0C->unk_04); for (v1 = 0; v1 < v2; v1++) { - if (sub_02074470(Party_GetPokemonBySlotIndex(v0->unk_0C->unk_04, v1), 76, NULL) == 0) { + if (GetMonData(Party_GetPokemonBySlotIndex(v0->unk_0C->unk_04, v1), MON_DATA_IS_EGG, NULL) == 0) { v0->unk_2C8[v0->unk_04] = v1; v0->unk_04++; } @@ -824,7 +824,7 @@ static void ov86_0223BAC8 (UnkStruct_ov86_0223B3C8 * param0, NNSG2dCellDataBank NNSG2dPaletteData * v8; void * v9; void * v10; - const UnkStruct_02073C74 * v11; + const Pokemon * v11; int v12, v13; v2.unk_04 = NULL; @@ -859,17 +859,17 @@ static void ov86_0223BAC8 (UnkStruct_ov86_0223B3C8 * param0, NNSG2dCellDataBank sub_02021CAC(param0->unk_1B4[v12], 0); v11 = Party_GetPokemonBySlotIndex(param0->unk_0C->unk_04, param0->unk_2C8[v12]); - sub_02075EF4(&v1, (UnkStruct_02073C74 *)v11, 2); + sub_02075EF4(&v1, (Pokemon *)v11, 2); - param0->unk_2E0[v12] = sub_02074470((UnkStruct_02073C74 *)v11, 5, NULL); - param0->unk_2F8[v12] = sub_02074470((UnkStruct_02073C74 *)v11, 112, NULL); + param0->unk_2E0[v12] = GetMonData((Pokemon *)v11, MON_DATA_SPECIES, NULL); + param0->unk_2F8[v12] = GetMonData((Pokemon *)v11, MON_DATA_FORM, NULL); - sub_02013720(v1.unk_00, v1.unk_02, 63, &v0[0], param0->unk_310, sub_02074470((UnkStruct_02073C74 *)v11, 0, NULL), 1, 2, param0->unk_2E0[v12]); + sub_02013720(v1.unk_00, v1.unk_02, 63, &v0[0], param0->unk_310, GetMonData((Pokemon *)v11, MON_DATA_PERSONALITY, NULL), 1, 2, param0->unk_2E0[v12]); DC_FlushRange(param0->unk_310, 3200); GX_LoadOBJ(param0->unk_310, v12 * 2 * 3200, 3200); - sub_02013720(v1.unk_00, v1.unk_02, 63, &v0[1], param0->unk_310, sub_02074470((UnkStruct_02073C74 *)v11, 0, NULL), 1, 2, param0->unk_2E0[v12]); + sub_02013720(v1.unk_00, v1.unk_02, 63, &v0[1], param0->unk_310, GetMonData((Pokemon *)v11, MON_DATA_PERSONALITY, NULL), 1, 2, param0->unk_2E0[v12]); DC_FlushRange(param0->unk_310, 3200); GX_LoadOBJ(param0->unk_310, v12 * 2 * 3200 + 3200, 3200); @@ -1329,7 +1329,7 @@ static void ov86_0223C54C (UnkStruct_ov86_0223C3E4 * param0) switch (v0) { case 0: case 1: - sub_0200B8C8(param0->unk_14, 0, sub_02074470(param0->unk_24, 153, NULL)); + sub_0200B8C8(param0->unk_14, 0, GetMonData(param0->unk_24, MON_DATA_153, NULL)); break; } @@ -1355,7 +1355,7 @@ static void ov86_0223C58C (UnkStruct_0201CD38 * param0, void * param1) v0->unk_34++; break; case 1: - sub_02074470(v0->unk_24, 119, v0->unk_1C); + GetMonData(v0->unk_24, MON_DATA_119, v0->unk_1C); ov86_0223C47C(v0, 48); ov86_0223C4DC(v0); ov86_0223C47C(v0, 64); @@ -1916,7 +1916,7 @@ static BOOL ov86_0223D2A4 (UnkStruct_ov86_0223D264 * param0) return param0->unk_10; } -static int ov86_0223D2A8 (UnkStruct_ov86_0223B3C8 * param0, UnkStruct_02073C74 * param1, const UnkStruct_02025E6C * param2) +static int ov86_0223D2A8 (UnkStruct_ov86_0223B3C8 * param0, Pokemon * param1, const UnkStruct_02025E6C * param2) { BOOL v0; int v1 = 6; @@ -1925,7 +1925,7 @@ static int ov86_0223D2A8 (UnkStruct_ov86_0223B3C8 * param0, UnkStruct_02073C74 * do { { - int v2 = sub_02074470(param1, 122, NULL); + int v2 = GetMonData(param1, MON_DATA_MET_GAME, NULL); if ((v2 == 1) || (v2 == 2) || (v2 == 3)) { v1 = 4; @@ -1943,7 +1943,7 @@ static int ov86_0223D2A8 (UnkStruct_ov86_0223B3C8 * param0, UnkStruct_02073C74 * } } - if (sub_02074470(param1, 110, NULL)) { + if (GetMonData(param1, MON_DATA_FATEFUL_ENCOUNTER, NULL)) { v1 = 6; break; } @@ -1952,7 +1952,7 @@ static int ov86_0223D2A8 (UnkStruct_ov86_0223B3C8 * param0, UnkStruct_02073C74 * u32 v3, v4; v3 = sub_02025F20(param2); - v4 = sub_02074470(param1, 7, NULL); + v4 = GetMonData(param1, MON_DATA_OT_ID, NULL); if (v3 != v4) { v1 = 2; @@ -1960,7 +1960,7 @@ static int ov86_0223D2A8 (UnkStruct_ov86_0223B3C8 * param0, UnkStruct_02073C74 * } sub_02025EF4(param2, param0->unk_1C48); - sub_02074470(param1, 145, param0->unk_1C4C); + GetMonData(param1, MON_DATA_145, param0->unk_1C4C); if (sub_02023BE0(param0->unk_1C48, param0->unk_1C4C)) { v1 = 2; @@ -1968,10 +1968,10 @@ static int ov86_0223D2A8 (UnkStruct_ov86_0223B3C8 * param0, UnkStruct_02073C74 * } } - if (sub_02074470(param1, 153, NULL) >= 2000) { + if (GetMonData(param1, MON_DATA_153, NULL) >= 2000) { v1 = 6; } else { - if (sub_02074470(param1, 147, NULL) == 0) { + if (GetMonData(param1, MON_DATA_147, NULL) == 0) { v1 = 0; } else { v1 = 1; diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c index 2d1052accd..5b3bb5d495 100644 --- a/src/overlay087/ov87_021D106C.c +++ b/src/overlay087/ov87_021D106C.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay087/struct_ov87_021D0D80_decl.h" #include "struct_defs/struct_02008A90.h" @@ -63,7 +63,7 @@ typedef struct UnkStruct_ov87_021D106C_t { UnkStruct_0200B358 * unk_1F0; UnkStruct_02023790 * unk_1F4; UnkStruct_02023790 * unk_1F8; - UnkStruct_02073C74 * unk_1FC; + Pokemon * unk_1FC; u8 unk_200[3200]; } UnkStruct_ov87_021D106C; @@ -114,7 +114,7 @@ UnkStruct_ov87_021D106C * ov87_021D106C (UnkStruct_ov87_021D0D80 * param0, const v0->unk_1F0 = sub_0200B358(61); v0->unk_1F4 = sub_02023790(256, 61); v0->unk_1F8 = sub_02023790(256, 61); - v0->unk_1FC = sub_02073C74(61); + v0->unk_1FC = AllocMonZeroed(61); sub_02017798(ov87_021D11AC, v0); } diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index 055af63ae4..847475de5d 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -16,7 +16,7 @@ #include "struct_decls/struct_0202B628_decl.h" #include "struct_decls/struct_0202CC84_decl.h" #include "struct_decls/struct_020507E4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_02095E80_decl.h" #include "struct_decls/struct_021C0794_decl.h" @@ -120,8 +120,8 @@ static void ov88_0223CEF0(u16 * param0); static int ov88_0223CF30(int param0, int param1, UnkStruct_ov88_0223C8AC * param2); static void ov88_0223CF68(int param0, UnkStruct_02022550 * param1, int param2); static int ov88_0223CFF4(u32 * param0, int * param1, UnkStruct_02022550 * param2, UnkStruct_ov88_0223C8AC * param3, int param4); -static int ov88_0223C800(int param0, UnkStruct_02073C74 * param1, u8 * param2, UnkStruct_02008A90 * param3); -static void ov88_0223E7F0(UnkStruct_0202B628 * param0, UnkStruct_02073C74 * param1); +static int ov88_0223C800(int param0, Pokemon * param1, u8 * param2, UnkStruct_02008A90 * param3); +static void ov88_0223E7F0(UnkStruct_0202B628 * param0, Pokemon * param1); static void ov88_0223D140(UnkStruct_0202CC84 * param0); static void ov88_0223E894(UnkStruct_02095E80 * param0); static void ov88_0223E8B4(UnkStruct_02095E80 * param0); @@ -138,7 +138,7 @@ static void ov88_0223B4F0(UnkStruct_02095E80 * param0); static void ov88_0223BFD8(UnkStruct_02095E80 * param0); static void ov88_0223BE28(UnkStruct_02095E80 * param0); static void ov88_0223CB34(UnkStruct_0205AA50 * param0, int param1, UnkStruct_02095E80 * param2); -static void ov88_0223BD18(UnkStruct_02073C74 * param0, UnkStruct_ov88_0223C8AC * param1); +static void ov88_0223BD18(Pokemon * param0, UnkStruct_ov88_0223C8AC * param1); static void ov88_0223E87C(UnkStruct_02022550 * param0, int param1, int param2); static int ov88_0223C8AC(UnkStruct_ov88_0223C8AC * param0, Party * param1, int param2, int param3); static void ov88_0223D0C0(UnkStruct_021C0794 * param0); @@ -581,18 +581,18 @@ static int ov88_0223B914 (UnkStruct_02095E80 * param0) { int v0, v1, v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; for (v0 = 0; v0 < Party_GetCurrentCount(param0->unk_08->unk_08); v0++) { - UnkStruct_02073C74 * v4 = Party_GetPokemonBySlotIndex(param0->unk_08->unk_08, v0); + Pokemon * v4 = Party_GetPokemonBySlotIndex(param0->unk_08->unk_08, v0); - v2 = sub_02074470(v4, 174, NULL); + v2 = GetMonData(v4, MON_DATA_SPECIES_EGG, NULL); if (v2 == 492) { - v1 = sub_02074470(v4, 112, NULL); + v1 = GetMonData(v4, MON_DATA_FORM, NULL); if (v1 != 0) { - sub_02077ACC(v4, 0); + SetShayminForm(v4, 0); } } } @@ -677,12 +677,12 @@ static int ov88_0223B914 (UnkStruct_02095E80 * param0) } for (v5 = 0; v5 < Party_GetCurrentCount(param0->unk_2270); v5++) { - UnkStruct_02073C74 * v7 = Party_GetPokemonBySlotIndex(param0->unk_2270, v5); + Pokemon * v7 = Party_GetPokemonBySlotIndex(param0->unk_2270, v5); ov88_0223BD18(v7, ¶m0->unk_6F4[v5]); } for (v5 = 0; v5 < Party_GetCurrentCount(param0->unk_2274); v5++) { - UnkStruct_02073C74 * v8 = Party_GetPokemonBySlotIndex(param0->unk_2274, v5); + Pokemon * v8 = Party_GetPokemonBySlotIndex(param0->unk_2274, v5); ov88_0223BD18(v8, ¶m0->unk_6F4[v5 + 6]); } @@ -731,7 +731,7 @@ static int ov88_0223B914 (UnkStruct_02095E80 * param0) break; case 17: if (sub_0200AC1C(1)) { - UnkStruct_02073C74 * v10 = Party_GetPokemonBySlotIndex(param0->unk_2270, 0); + Pokemon * v10 = Party_GetPokemonBySlotIndex(param0->unk_2270, 0); param0->unk_2168 = ov88_0223C800(0, v10, param0->unk_848[0], ¶m0->unk_2148[0]); ov88_0223C8D8(param0->unk_49C, 0, param0->unk_2270, 0, param0); @@ -764,20 +764,20 @@ static int ov88_0223B914 (UnkStruct_02095E80 * param0) return 0; } -static void ov88_0223BD18 (UnkStruct_02073C74 * param0, UnkStruct_ov88_0223C8AC * param1) +static void ov88_0223BD18 (Pokemon * param0, UnkStruct_ov88_0223C8AC * param1) { int v0, v1; v0 = sub_02073C88(param0); - param1->unk_04 = sub_02074470(param0, 155, NULL); - param1->unk_00 = sub_02074470(param0, 5, NULL); - param1->unk_06 = sub_02074470(param0, 112, NULL); - param1->unk_05 = sub_02074470(param0, 76, NULL); - param1->unk_08 = sub_02074470(param0, 111, NULL); - param1->unk_0C = sub_02074470(param0, 162, NULL); + param1->unk_04 = GetMonData(param0, MON_DATA_POKEBALL, NULL); + param1->unk_00 = GetMonData(param0, MON_DATA_SPECIES, NULL); + param1->unk_06 = GetMonData(param0, MON_DATA_FORM, NULL); + param1->unk_05 = GetMonData(param0, MON_DATA_IS_EGG, NULL); + param1->unk_08 = GetMonData(param0, MON_DATA_111, NULL); + param1->unk_0C = GetMonData(param0, MON_DATA_162, NULL); - v1 = sub_02074470(param0, 6, NULL); + v1 = GetMonData(param0, MON_DATA_HELD_ITEM, NULL); sub_02073CD4(param0, v0); @@ -792,7 +792,7 @@ static void ov88_0223BD18 (UnkStruct_02073C74 * param0, UnkStruct_ov88_0223C8AC static void ov88_0223BDA4 (UnkStruct_02095E80 * param0, int param1) { - UnkStruct_02073C74 * v0 = Party_GetPokemonBySlotIndex(param0->unk_2274, param1 % 6); + Pokemon * v0 = Party_GetPokemonBySlotIndex(param0->unk_2274, param1 % 6); param0->unk_2168 = ov88_0223C800(1, v0, param0->unk_848[param1 / 6], ¶m0->unk_2148[param1 / 6]); @@ -804,7 +804,7 @@ static void ov88_0223BE28 (UnkStruct_02095E80 * param0) { if (param0->unk_88[0] != 12) { if (param0->unk_88[0] < 6) { - UnkStruct_02073C74 * v0 = Party_GetPokemonBySlotIndex(param0->unk_2270, param0->unk_88[0]); + Pokemon * v0 = Party_GetPokemonBySlotIndex(param0->unk_2270, param0->unk_88[0]); param0->unk_2168 = ov88_0223C800(0, v0, param0->unk_848[param0->unk_88[0] / 6], ¶m0->unk_2148[param0->unk_88[0] / 6]); @@ -1280,13 +1280,13 @@ static void ov88_0223C66C (UnkStruct_02095E80 * param0, NARC * param1) sub_02006E84(19, sub_02079FD0(), 1, 10 * 0x20, 0x20 * 4, 26); } -static int ov88_0223C800 (int param0, UnkStruct_02073C74 * param1, u8 * param2, UnkStruct_02008A90 * param3) +static int ov88_0223C800 (int param0, Pokemon * param1, u8 * param2, UnkStruct_02008A90 * param3) { sub_02075EF4(param3, param1, 2); { - int v0 = sub_02074470(param1, 0, NULL); - int v1 = sub_02074470(param1, 5, NULL); + int v0 = GetMonData(param1, MON_DATA_PERSONALITY, NULL); + int v1 = GetMonData(param1, MON_DATA_SPECIES, NULL); sub_020136A4(param3->unk_00, param3->unk_02, 26, 0, 0, 10, 10, param2, v0, 0, 2, v1); } @@ -1302,7 +1302,7 @@ static void ov88_0223C860 (UnkStruct_0205AA50 * param0, Party * param1, int para v0 = sub_02023790(20, 26); - sub_02074470(Party_GetPokemonBySlotIndex(param1, param2), 119, v0); + GetMonData(Party_GetPokemonBySlotIndex(param1, param2), MON_DATA_119, v0); sub_0201ADA4(param0, 0); ov88_0223EC78(param0, v0, param3, 0, param4, 1); sub_020237BC(v0); @@ -1311,8 +1311,8 @@ static void ov88_0223C860 (UnkStruct_0205AA50 * param0, Party * param1, int para static int ov88_0223C8AC (UnkStruct_ov88_0223C8AC * param0, Party * param1, int param2, int param3) { if ((param0->unk_00 == 29) || (param0->unk_00 == 32)) { - UnkStruct_02073C74 * v0 = Party_GetPokemonBySlotIndex(param1, param2); - int v1 = sub_02074470(v0, 77, NULL); + Pokemon * v0 = Party_GetPokemonBySlotIndex(param1, param2); + int v1 = GetMonData(v0, MON_DATA_77, NULL); if (v1 == 0) { return 2; @@ -1327,7 +1327,7 @@ static void ov88_0223C8D8 (UnkStruct_0205AA50 * param0, int param1, Party * para UnkStruct_02023790 * v0, * v1; u16 v2, v3; int v4; - UnkStruct_02073C74 * v5; + Pokemon * v5; v5 = Party_GetPokemonBySlotIndex(param2, param3); v4 = sub_020765AC(v5, 2); @@ -1373,7 +1373,7 @@ static void ov88_0223C8D8 (UnkStruct_0205AA50 * param0, int param1, Party * para sub_0200B1B8(param4->unk_184, 41, v0); ov88_0223EC78(¶m0[28 + param1], v0, 9, 0xff, 6, 0); - v3 = sub_02074470(Party_GetPokemonBySlotIndex(param2, param3), 161, NULL); + v3 = GetMonData(Party_GetPokemonBySlotIndex(param2, param3), MON_DATA_161, NULL); sub_020238A0(v0, v3, 3, 0, 1); ov88_0223EC78(¶m0[28 + param1], v0, 9, 0, 24 + 6, 0); sub_020237BC(v0); @@ -1383,7 +1383,7 @@ static void ov88_0223C8D8 (UnkStruct_0205AA50 * param0, int param1, Party * para ov88_0223EC78(¶m0[30 + param1], param4->unk_190, 7, 0, 3, 0); - v2 = sub_02074470(Party_GetPokemonBySlotIndex(param2, param3), 6, NULL); + v2 = GetMonData(Party_GetPokemonBySlotIndex(param2, param3), MON_DATA_HELD_ITEM, NULL); sub_0201ADA4(¶m0[32 + param1], 0); v1 = sub_02023790(20, 26); @@ -2494,16 +2494,16 @@ static int ov88_0223E5B8 (UnkStruct_02095E80 * param0) static void ov88_0223E694 (Party * param0, Party * param1, int param2, int param3, UnkStruct_ov88_0223C370 * param4) { - UnkStruct_02073C74 * v0, * v1; + Pokemon * v0, * v1; - v0 = sub_02073C74(26); - v1 = sub_02073C74(26); + v0 = AllocMonZeroed(26); + v1 = AllocMonZeroed(26); sub_020775EC(Party_GetPokemonBySlotIndex(param0, param2), v0); sub_020775EC(Party_GetPokemonBySlotIndex(param1, param3), v1); - if (sub_02074470(v1, 5, NULL) == 493) { - if (sub_02074470(v1, 110, NULL) || ((sub_02074470(v1, 153, NULL) == 86) && (sub_02074470(v1, 110, NULL) == 0))) { + if (GetMonData(v1, MON_DATA_SPECIES, NULL) == 493) { + if (GetMonData(v1, MON_DATA_FATEFUL_ENCOUNTER, NULL) || ((GetMonData(v1, MON_DATA_153, NULL) == 86) && (GetMonData(v1, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 0))) { UnkStruct_020507E4 * v2 = sub_020507E4(param4->unk_10); if (sub_0206B5F8(v2) == 0) { @@ -2514,7 +2514,7 @@ static void ov88_0223E694 (Party * param0, Party * param1, int param2, int param sub_02074B30(v1, 111, NULL); - if (sub_02074470(v1, 76, NULL) == 0) { + if (GetMonData(v1, MON_DATA_IS_EGG, NULL) == 0) { u8 v3 = 70; sub_02074B30(v1, 9, &v3); } @@ -2541,13 +2541,13 @@ static void ov88_0223E694 (Party * param0, Party * param1, int param2, int param Heap_FreeToHeap(v1); } -static void ov88_0223E7F0 (UnkStruct_0202B628 * param0, UnkStruct_02073C74 * param1) +static void ov88_0223E7F0 (UnkStruct_0202B628 * param0, Pokemon * param1) { void * v0; UnkStruct_02025E6C * v1 = sub_02032EE8(sub_0203608C() ^ 1); u16 v2[10 + 1]; - sub_02074470(param1, 117, v2); + GetMonData(param1, MON_DATA_117, v2); v0 = sub_0202C11C((u16 *)sub_02025EF0(v1), sub_02025F30(v1), v2, sub_02075D6C(param1), 26); sub_0202B758(param0, v0, 4); } @@ -2604,14 +2604,14 @@ static int ov88_0223E8D0 (UnkStruct_02095E80 * param0) static int ov88_0223E914 (UnkStruct_02095E80 * param0) { int v0, v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; v1 = Party_GetCurrentCount(param0->unk_2270); for (v0 = 0; v0 < v1; v0++) { v2 = Party_GetPokemonBySlotIndex(param0->unk_2270, v0); - if (sub_02074470(v2, 3, NULL)) { + if (GetMonData(v2, MON_DATA_3, NULL)) { return 1; } } @@ -2621,7 +2621,7 @@ static int ov88_0223E914 (UnkStruct_02095E80 * param0) for (v0 = 0; v0 < v1; v0++) { v2 = Party_GetPokemonBySlotIndex(param0->unk_2274, v0); - if (sub_02074470(v2, 3, NULL)) { + if (GetMonData(v2, MON_DATA_3, NULL)) { return 2; } } diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index 7d4fd41257..07c129ca41 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -1158,7 +1158,7 @@ static u16 ov91_021D1DD0 (UnkStruct_ov91_021D0ED8 * param0) static u16 ov91_021D1DE0 (UnkStruct_ov91_021D0ED8 * param0) { - return (u16)sub_02074470(param0->unk_00->unk_00, 54 + param0->unk_00->unk_17, NULL); + return (u16)GetMonData(param0->unk_00->unk_00, 54 + param0->unk_00->unk_17, NULL); } static void ov91_021D1DF8 (UnkStruct_ov91_021D0ED8 * param0, u32 param1) @@ -1196,7 +1196,7 @@ static u8 ov91_021D1EA0 (UnkStruct_ov91_021D0ED8 * param0) u8 v0; for (v0 = 0; v0 < 4; v0++) { - if (sub_02074470(param0->unk_00->unk_00, 54 + v0, NULL) == 0) { + if (GetMonData(param0->unk_00->unk_00, MON_DATA_MOVE1 + v0, NULL) == 0) { break; } } diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c index 2f7ead3bff..1837284f65 100644 --- a/src/overlay094/ov94_0223D0C4.c +++ b/src/overlay094/ov94_0223D0C4.c @@ -9,8 +9,8 @@ #include "struct_decls/struct_0200B358_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "overlay094/const_ov94_02245FD8.h" @@ -69,7 +69,7 @@ static int ov94_0223D640(UnkStruct_ov94_0223FD4C * param0); static int ov94_0223D664(UnkStruct_ov94_0223FD4C * param0); static int ov94_0223D6B8(UnkStruct_ov94_0223FD4C * param0); static int ov94_0223D754(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223D88C(UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4, UnkStruct_02073C74 * param5); +static void ov94_0223D88C(UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4, Pokemon * param5); static int (* Unk_ov94_02246808[])(UnkStruct_ov94_0223FD4C *) = { ov94_0223D5B0, @@ -85,20 +85,20 @@ static int (* Unk_ov94_02246808[])(UnkStruct_ov94_0223FD4C *) = { int ov94_0223D0C4 (UnkStruct_ov94_0223FD4C * param0, int param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; ov94_0223D53C(param0); ov94_0223D1D4(param0->unk_04); ov94_0223D2E8(param0); ov94_0223D438(param0); ov94_0223D3DC(param0); - ov94_0223D910(param0->unk_B90, param0->unk_B94, param0->unk_B8C, ¶m0->unk_FCC[0], sub_02076B10((UnkStruct_02073C74 *)param0->unk_12C.unk_00.unk_00), ¶m0->unk_12C.unk_EC); + ov94_0223D910(param0->unk_B90, param0->unk_B94, param0->unk_B8C, ¶m0->unk_FCC[0], sub_02076B10((Pokemon *)param0->unk_12C.unk_00.unk_00), ¶m0->unk_12C.unk_EC); - v0 = (UnkStruct_02073C74 *)param0->unk_12C.unk_00.unk_00; + v0 = (Pokemon *)param0->unk_12C.unk_00.unk_00; ov94_0223DA78(param0->unk_B90, ¶m0->unk_FCC[5], param0->unk_12C.unk_10C, v0, ¶m0->unk_FCC[10]); ov94_02242368(param0->unk_B90, param0->unk_B94, param0->unk_B8C, ¶m0->unk_FCC[7], param0->unk_12C.unk_F0.unk_00, param0->unk_12C.unk_F0.unk_02, ov94_02242970(param0->unk_12C.unk_F0.unk_03, param0->unk_12C.unk_F0.unk_04, 0)); - ov94_0223DB2C((UnkStruct_02073C74 *)param0->unk_12C.unk_00.unk_00); + ov94_0223DB2C((Pokemon *)param0->unk_12C.unk_00.unk_00); sub_0200F174(3, 1, 1, 0x0, 6, 1, 62); @@ -363,7 +363,7 @@ static int ov94_0223D5B0 (UnkStruct_ov94_0223FD4C * param0) static int ov94_0223D5B8 (UnkStruct_ov94_0223FD4C * param0) { if (Unk_021BF67C.unk_48 & PAD_BUTTON_A) { - ov94_0223D88C(param0, 5, 1, 0, 0xf0f, (UnkStruct_02073C74 *)param0->unk_12C.unk_00.unk_00); + ov94_0223D88C(param0, 5, 1, 0, 0xf0f, (Pokemon *)param0->unk_12C.unk_00.unk_00); ov94_0223C3F4(param0, 3, 7); sub_02005748(1500); } else if (Unk_021BF67C.unk_48 & PAD_BUTTON_B) { @@ -447,7 +447,7 @@ static int ov94_0223D754 (UnkStruct_ov94_0223FD4C * param0) sub_0200DC9C(¶m0->unk_F9C[0], 0); { - UnkStruct_02073C74 * v0 = (UnkStruct_02073C74 *)param0->unk_12C.unk_00.unk_00; + Pokemon * v0 = (Pokemon *)param0->unk_12C.unk_00.unk_00; if (ov94_02241498(v0)) { if (Party_GetCurrentCount(param0->unk_00->unk_08) == 6) { @@ -502,7 +502,7 @@ static int ov94_0223D858 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static void ov94_0223D88C (UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4, UnkStruct_02073C74 * param5) +static void ov94_0223D88C (UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4, Pokemon * param5) { UnkStruct_02023790 * v0; @@ -523,19 +523,19 @@ static u32 Unk_ov94_022467FC[] = { (u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0)) }; -void ov94_0223D910 (UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], UnkStruct_02073C74_sub1 * param4, UnkStruct_ov94_0223BA88_sub2 * param5) +void ov94_0223D910 (UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, UnkStruct_0200B358 * param2, UnkStruct_0205AA50 param3[], BoxPokemon * param4, UnkStruct_ov94_0223BA88_sub2 * param5) { UnkStruct_02023790 * v0, * v1, * v2, * v3; UnkStruct_02023790 * v4 = sub_02023790((10 + 1) * 2, 62); UnkStruct_02023790 * v5 = sub_02023790((8 + 1) * 2, 62); int v6, v7, v8, v9, v10; - sub_02074570(param4, 119, v4); + sub_02074570(param4, MON_DATA_119, v4); v10 = param5->unk_00; v6 = param5->unk_02; v7 = param5->unk_03; - v8 = sub_02074570(param4, 6, NULL); + v8 = sub_02074570(param4, MON_DATA_HELD_ITEM, NULL); v3 = sub_0200B1EC(param0, 70); v1 = sub_0200B1EC(param0, Unk_ov94_02245FD8[v6]); @@ -569,7 +569,7 @@ void ov94_0223D910 (UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, Un sub_020237BC(v0); } -void ov94_0223DA78 (UnkStruct_0200B144 * param0, UnkStruct_0205AA50 param1[], u16 * param2, UnkStruct_02073C74 * param3, UnkStruct_0205AA50 param4[]) +void ov94_0223DA78 (UnkStruct_0200B144 * param0, UnkStruct_0205AA50 param1[], u16 * param2, Pokemon * param3, UnkStruct_0205AA50 param4[]) { UnkStruct_02023790 * v0, * v1; UnkStruct_02023790 * v2, * v3; @@ -581,7 +581,7 @@ void ov94_0223DA78 (UnkStruct_0200B144 * param0, UnkStruct_0205AA50 param1[], u1 sub_02023D28(v0, param2); v2 = sub_0200B1EC(param0, 172); - sub_02074470(param3, 145, v3); + GetMonData(param3, MON_DATA_145, v3); ov94_02245900(¶m1[0], v1, 0, 0, 0, (u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))); ov94_02245900(¶m1[1], v0, 0, 0, 0, (u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))); @@ -594,7 +594,7 @@ void ov94_0223DA78 (UnkStruct_0200B144 * param0, UnkStruct_0205AA50 param1[], u1 sub_020237BC(v3); } -void ov94_0223DB2C (UnkStruct_02073C74 * param0) +void ov94_0223DB2C (Pokemon * param0) { UnkStruct_02008A90 v0; u8 * v1 = Heap_AllocFromHeap(62, (0x20 * 10 * 10)); @@ -602,8 +602,8 @@ void ov94_0223DB2C (UnkStruct_02073C74 * param0) sub_02075EF4(&v0, param0, 2); { - int v2 = sub_02074470(param0, 0, NULL); - int v3 = sub_02074470(param0, 5, NULL); + int v2 = GetMonData(param0, MON_DATA_PERSONALITY, NULL); + int v3 = GetMonData(param0, MON_DATA_SPECIES, NULL); sub_020136A4(v0.unk_00, v0.unk_02, 62, 0, 0, 10, 10, v1, v2, 0, 2, v3); } diff --git a/src/overlay094/ov94_0223DC04.c b/src/overlay094/ov94_0223DC04.c index 1b9b8479c3..bf20dda521 100644 --- a/src/overlay094/ov94_0223DC04.c +++ b/src/overlay094/ov94_0223DC04.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_0200B144_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_0205AA50.h" #include "overlay094/struct_ov94_0223BA88.h" @@ -73,19 +73,19 @@ static int (* Unk_ov94_0224682C[])(UnkStruct_ov94_0223FD4C * wk) = { int ov94_0223DC04 (UnkStruct_ov94_0223FD4C * param0, int param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; ov94_0223DFDC(param0); ov94_0223DD1C(param0->unk_04); ov94_0223DE04(param0); ov94_0223DED8(param0); ov94_0223DE7C(param0); - ov94_0223D910(param0->unk_B90, param0->unk_B94, param0->unk_B8C, ¶m0->unk_FCC[0], sub_02076B10((UnkStruct_02073C74 *)param0->unk_250[param0->unk_11C].unk_00.unk_00), ¶m0->unk_250[param0->unk_11C].unk_EC); + ov94_0223D910(param0->unk_B90, param0->unk_B94, param0->unk_B8C, ¶m0->unk_FCC[0], sub_02076B10((Pokemon *)param0->unk_250[param0->unk_11C].unk_00.unk_00), ¶m0->unk_250[param0->unk_11C].unk_EC); - v0 = (UnkStruct_02073C74 *)param0->unk_250[param0->unk_11C].unk_00.unk_00; + v0 = (Pokemon *)param0->unk_250[param0->unk_11C].unk_00.unk_00; ov94_0223DA78(param0->unk_B90, ¶m0->unk_FCC[5], param0->unk_250[param0->unk_11C].unk_10C, v0, ¶m0->unk_FCC[10]); - ov94_0223DB2C((UnkStruct_02073C74 *)param0->unk_250[param0->unk_11C].unk_00.unk_00); + ov94_0223DB2C((Pokemon *)param0->unk_250[param0->unk_11C].unk_00.unk_00); ov94_0223E358(param0->unk_B90, ¶m0->unk_FCC[7]); ov94_0223E240(param0); diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c index 2f2cfd5499..88e5eedd5e 100644 --- a/src/overlay094/ov94_0223FB48.c +++ b/src/overlay094/ov94_0223FB48.c @@ -8,8 +8,8 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" @@ -90,18 +90,18 @@ static int ov94_02240B20(UnkStruct_ov94_0223FD4C * param0); static int ov94_02240C58(UnkStruct_ov94_0223FD4C * param0); static int ov94_02240C84(UnkStruct_ov94_0223FD4C * param0); static int ov94_02240CA8(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02241384(UnkStruct_02073C74_sub1 * param0, UnkStruct_ov94_0223BA88_sub3 * param1); +static int ov94_02241384(BoxPokemon * param0, UnkStruct_ov94_0223BA88_sub3 * param1); static void ov94_022413BC(UnkStruct_ov94_0223BA88 * param0, UnkStruct_ov94_0223FD4C * param1); -static void ov94_02240EAC(UnkStruct_02073C74_sub1 * param0, UnkStruct_02022550 * param1, UnkStruct_02022550 * param2, u16 * param3, int param4, NARC * param5, UnkStruct_ov94_0223BA88_sub2 * param6, UnkStruct_ov94_02240FA0 * param7); +static void ov94_02240EAC(BoxPokemon * param0, UnkStruct_02022550 * param1, UnkStruct_02022550 * param2, u16 * param3, int param4, NARC * param5, UnkStruct_ov94_0223BA88_sub2 * param6, UnkStruct_ov94_02240FA0 * param7); void * ov94_02240DD0(NARC * param0, u32 param1, NNSG2dCharacterData ** param2, u32 param3); static int ov94_02241328(UnkStruct_ov94_0223BA88_sub2 * param0, UnkStruct_ov94_0223BA88_sub3 * param1); static void ov94_02241464(UnkStruct_ov94_0223BA88_sub2 * param0, UnkStruct_02022550 ** param1, UnkStruct_ov94_0223BA88_sub3 * param2, UnkStruct_ov94_02240FA0 * param3); static int ov94_0224121C(Party * param0, UnkStruct_020797DC * param1, int param2, int param3); static int ov94_022412F4(Party * param0, UnkStruct_020797DC * param1, int param2, int param3); static int ov94_02240BB0(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0224123C(UnkStruct_02073C74_sub1 * param0); -static int ov94_02241278(UnkStruct_02073C74_sub1 * param0); -static int ov94_022412C8(UnkStruct_02073C74_sub1 * param0); +static int ov94_0224123C(BoxPokemon * param0); +static int ov94_02241278(BoxPokemon * param0); +static int ov94_022412C8(BoxPokemon * param0); static int (* Unk_ov94_022468DC[])(UnkStruct_ov94_0223FD4C *) = { ov94_022402A8, @@ -599,7 +599,7 @@ static int ov94_022402BC (UnkStruct_ov94_0223FD4C * param0) switch (ov94_022412F4(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112)) { case 1: { - UnkStruct_02073C74_sub1 * v0 = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112); + BoxPokemon * v0 = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112); if (ov94_02241384(v0, ¶m0->unk_250[param0->unk_11C].unk_F0)) { if (ov94_0224121C(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112)) { @@ -715,7 +715,7 @@ static int ov94_022405DC (UnkStruct_ov94_0223FD4C * param0) static int ov94_02240688 (UnkStruct_ov94_0223FD4C * param0) { - UnkStruct_02073C74_sub1 * v0; + BoxPokemon * v0; switch (sub_02001BE0(param0->unk_10D4)) { case 1: @@ -745,11 +745,11 @@ static int ov94_02240688 (UnkStruct_ov94_0223FD4C * param0) int v1 = 0; if (ov94_022411D0(param0->unk_110)) { - UnkStruct_02073C74 * v2; + Pokemon * v2; v2 = Party_GetPokemonBySlotIndex(param0->unk_00->unk_08, param0->unk_112); - if (sub_02074470(v2, 162, NULL)) { + if (GetMonData(v2, MON_DATA_162, NULL)) { v1 = 1; param0->unk_2C = 14; } @@ -807,7 +807,7 @@ static int ov94_02240830 (UnkStruct_ov94_0223FD4C * param0) static int ov94_022408E8 (UnkStruct_ov94_0223FD4C * param0) { - UnkStruct_02073C74_sub1 * v0; + BoxPokemon * v0; switch (sub_02001BE0(param0->unk_10D4)) { case 1: @@ -837,11 +837,11 @@ static int ov94_022408E8 (UnkStruct_ov94_0223FD4C * param0) int v1 = 0; if (ov94_022411D0(param0->unk_110)) { - UnkStruct_02073C74 * v2; + Pokemon * v2; v2 = Party_GetPokemonBySlotIndex(param0->unk_00->unk_08, param0->unk_112); - if (sub_02074470(v2, 162, NULL)) { + if (GetMonData(v2, MON_DATA_162, NULL)) { v1 = 1; param0->unk_2C = 11; } @@ -937,9 +937,9 @@ static int ov94_02240B70 (UnkStruct_ov94_0223FD4C * param0) static int ov94_02240BB0 (UnkStruct_ov94_0223FD4C * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; - v0 = (UnkStruct_02073C74 *)param0->unk_250[param0->unk_11C].unk_00.unk_00; + v0 = (Pokemon *)param0->unk_250[param0->unk_11C].unk_00.unk_00; if (ov94_02241498(v0) && (param0->unk_110 != 18)) { if (Party_GetCurrentCount(param0->unk_00->unk_08) == 6) { @@ -1067,7 +1067,7 @@ static void ov94_02240DF8 (int param0, int param1, int param2, int param3, UnkSt Heap_FreeToHeap(v1); } -static void ov94_02240E50 (UnkStruct_02073C74_sub1 * param0, UnkStruct_ov94_0223BA88_sub2 * param1) +static void ov94_02240E50 (BoxPokemon * param0, UnkStruct_ov94_0223BA88_sub2 * param1) { param1->unk_03 = sub_02075B40(param0); } @@ -1090,21 +1090,21 @@ static void ov94_02240E5C (void * param0) Heap_FreeToHeap(v0->unk_1114); } -static void ov94_02240EAC (UnkStruct_02073C74_sub1 * param0, UnkStruct_02022550 * param1, UnkStruct_02022550 * param2, u16 * param3, int param4, NARC * param5, UnkStruct_ov94_0223BA88_sub2 * param6, UnkStruct_ov94_02240FA0 * param7) +static void ov94_02240EAC (BoxPokemon * param0, UnkStruct_02022550 * param1, UnkStruct_02022550 * param2, u16 * param3, int param4, NARC * param5, UnkStruct_ov94_0223BA88_sub2 * param6, UnkStruct_ov94_02240FA0 * param7) { int v0, v1, v2, v3; sub_02073D20(param0); - v0 = sub_02074570(param0, 172, NULL); - *param3 = sub_02074570(param0, 5, NULL); + v0 = sub_02074570(param0, MON_DATA_172, NULL); + *param3 = sub_02074570(param0, MON_DATA_SPECIES, NULL); - v3 = sub_02074570(param0, 112, NULL); - v2 = sub_02074570(param0, 76, NULL); - v1 = sub_02074570(param0, 6, NULL); + v3 = sub_02074570(param0, MON_DATA_FORM, NULL); + v2 = sub_02074570(param0, MON_DATA_IS_EGG, NULL); + v1 = sub_02074570(param0, MON_DATA_HELD_ITEM, NULL); param6->unk_00 = *param3; - param6->unk_02 = sub_02074570(param0, 111, NULL) + 1; + param6->unk_02 = sub_02074570(param0, MON_DATA_111, NULL) + 1; if (v2) { param6->unk_03 = 0; @@ -1138,8 +1138,8 @@ static void ov94_02240EAC (UnkStruct_02073C74_sub1 * param0, UnkStruct_02022550 static void ov94_02240FA0 (UnkStruct_ov94_0223FD4C * param0, int param1) { u16 v0[30], v1, v2; - UnkStruct_02073C74 * v3; - UnkStruct_02073C74_sub1 * v4; + Pokemon * v3; + BoxPokemon * v4; UnkStruct_020797DC * v5 = param0->unk_00->unk_0C; NARC * v6; UnkStruct_ov94_02240FA0 * v7; @@ -1172,7 +1172,7 @@ static void ov94_02240FA0 (UnkStruct_ov94_0223FD4C * param0, int param1) ov94_02240E50(v4, ¶m0->unk_1108->unk_00[v1]); ov94_02240EAC(v4, param0->unk_E28[v1], param0->unk_EA0[v1], &v0[v1], v1, v6, ¶m0->unk_1108->unk_00[v1], &v7[v1]); - if (sub_02074470(v3, 162, NULL)) { + if (GetMonData(v3, MON_DATA_162, NULL)) { sub_02021CAC(param0->unk_F18[v1], 1); } else { sub_02021CAC(param0->unk_F18[v1], 0); @@ -1214,7 +1214,7 @@ int ov94_022411D0 (int param0) } } -UnkStruct_02073C74_sub1 * ov94_022411DC (Party * param0, UnkStruct_020797DC * param1, int param2, int param3) +BoxPokemon * ov94_022411DC (Party * param0, UnkStruct_020797DC * param1, int param2, int param3) { if (ov94_022411D0(param2)) { if (param3 > (Party_GetCurrentCount(param0) - 1)) { @@ -1251,7 +1251,7 @@ static const u16 Unk_ov94_02245E34[] = { 0x34 }; -static int ov94_0224123C (UnkStruct_02073C74_sub1 * param0) +static int ov94_0224123C (BoxPokemon * param0) { int v0, v1 = 0, v2; @@ -1270,7 +1270,7 @@ static int ov94_0224123C (UnkStruct_02073C74_sub1 * param0) return 0; } -static int ov94_02241278 (UnkStruct_02073C74_sub1 * param0) +static int ov94_02241278 (BoxPokemon * param0) { int v0; int v1, v2; @@ -1278,8 +1278,8 @@ static int ov94_02241278 (UnkStruct_02073C74_sub1 * param0) v0 = sub_02073D20(param0); { - v1 = sub_02074570(param0, 5, NULL); - v2 = sub_02074570(param0, 112, NULL); + v1 = sub_02074570(param0, MON_DATA_SPECIES, NULL); + v2 = sub_02074570(param0, MON_DATA_FORM, NULL); } sub_02073D48(param0, v0); @@ -1296,7 +1296,7 @@ static int ov94_02241278 (UnkStruct_02073C74_sub1 * param0) return 0; } -static int ov94_022412C8 (UnkStruct_02073C74_sub1 * param0) +static int ov94_022412C8 (BoxPokemon * param0) { int v0; int v1; @@ -1304,7 +1304,7 @@ static int ov94_022412C8 (UnkStruct_02073C74_sub1 * param0) v0 = sub_02073D20(param0); { - v1 = sub_02074570(param0, 6, NULL); + v1 = sub_02074570(param0, MON_DATA_HELD_ITEM, NULL); } sub_02073D48(param0, v0); @@ -1319,17 +1319,17 @@ static int ov94_022412C8 (UnkStruct_02073C74_sub1 * param0) static int ov94_022412F4 (Party * param0, UnkStruct_020797DC * param1, int param2, int param3) { - UnkStruct_02073C74_sub1 * v0 = ov94_022411DC(param0, param1, param2, param3); + BoxPokemon * v0 = ov94_022411DC(param0, param1, param2, param3); if (v0 == NULL) { return 0; } - if (!sub_02074570(v0, 172, NULL)) { + if (!sub_02074570(v0, MON_DATA_172, NULL)) { return 0; } - if (sub_02074570(v0, 173, NULL)) { + if (sub_02074570(v0, MON_DATA_173, NULL)) { return 2; } @@ -1367,12 +1367,12 @@ static int ov94_02241328 (UnkStruct_ov94_0223BA88_sub2 * param0, UnkStruct_ov94_ return 1; } -static int ov94_02241384 (UnkStruct_02073C74_sub1 * param0, UnkStruct_ov94_0223BA88_sub3 * param1) +static int ov94_02241384 (BoxPokemon * param0, UnkStruct_ov94_0223BA88_sub3 * param1) { UnkStruct_ov94_0223BA88_sub2 v0; - v0.unk_00 = sub_02074570(param0, 5, NULL); - v0.unk_02 = sub_02074570(param0, 111, NULL) + 1; + v0.unk_00 = sub_02074570(param0, MON_DATA_SPECIES, NULL); + v0.unk_02 = sub_02074570(param0, MON_DATA_111, NULL) + 1; v0.unk_03 = sub_02075B40(param0); return ov94_02241328(&v0, param1); @@ -1382,20 +1382,20 @@ static void ov94_022413BC (UnkStruct_ov94_0223BA88 * param0, UnkStruct_ov94_0223 { UnkStruct_ov94_0223BA88_sub2 v0; UnkStruct_ov94_0223BA88_sub3 v1; - UnkStruct_02073C74_sub1 * v2; + BoxPokemon * v2; - v0.unk_00 = sub_02074570(param1->unk_114, 5, NULL); - v0.unk_02 = sub_02074570(param1->unk_114, 111, NULL) + 1; + v0.unk_00 = sub_02074570(param1->unk_114, MON_DATA_SPECIES, NULL); + v0.unk_02 = sub_02074570(param1->unk_114, MON_DATA_111, NULL) + 1; v0.unk_03 = sub_02075B40(param1->unk_114); param0->unk_EC = v0; ov94_022425A8(param0, param1); - v2 = sub_02076B10((UnkStruct_02073C74 *)param1->unk_250[param1->unk_11C].unk_00.unk_00); + v2 = sub_02076B10((Pokemon *)param1->unk_250[param1->unk_11C].unk_00.unk_00); - v1.unk_00 = sub_02074570(v2, 5, NULL); - v1.unk_02 = sub_02074570(v2, 111, NULL) + 1; + v1.unk_00 = sub_02074570(v2, MON_DATA_SPECIES, NULL); + v1.unk_02 = sub_02074570(v2, MON_DATA_111, NULL) + 1; v1.unk_03 = 0; v1.unk_04 = 0; @@ -1415,9 +1415,9 @@ static void ov94_02241464 (UnkStruct_ov94_0223BA88_sub2 * param0, UnkStruct_0202 } } -BOOL ov94_02241498 (UnkStruct_02073C74 * param0) +BOOL ov94_02241498 (Pokemon * param0) { - int v0 = sub_02074470(param0, 6, NULL); + int v0 = GetMonData(param0, MON_DATA_HELD_ITEM, NULL); if (Item_IsMail(v0)) { return 1; diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c index 6fd88c83c5..95cc849482 100644 --- a/src/overlay094/ov94_022414B8.c +++ b/src/overlay094/ov94_022414B8.c @@ -11,8 +11,8 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02026324_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "overlay094/const_ov94_02245FD8.h" #include "overlay094/const_ov94_02245FD4.h" @@ -77,7 +77,7 @@ static int ov94_02241B2C(UnkStruct_ov94_0223FD4C * param0); static int ov94_02241BAC(UnkStruct_ov94_0223FD4C * param0); static int ov94_022420E4(UnkStruct_ov94_0223FD4C * param0); static int ov94_02242138(UnkStruct_ov94_0223FD4C * param0); -static void ov94_022423FC(UnkStruct_0200B144 * param0, UnkStruct_0200B358 * param1, UnkStruct_0205AA50 param2[], UnkStruct_02073C74_sub1 * param3, UnkStruct_ov94_0223BA88_sub2 * param4); +static void ov94_022423FC(UnkStruct_0200B144 * param0, UnkStruct_0200B358 * param1, UnkStruct_0205AA50 param2[], BoxPokemon * param3, UnkStruct_ov94_0223BA88_sub2 * param4); static int ov94_02241DA0(UnkStruct_ov94_0223FD4C * param0); static int ov94_02241D64(UnkStruct_ov94_0223FD4C * param0); static int ov94_02241D08(UnkStruct_ov94_0223FD4C * param0); @@ -1006,16 +1006,16 @@ void ov94_02242368 (UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, Un sub_020237BC(v0); } -static void ov94_022423FC (UnkStruct_0200B144 * param0, UnkStruct_0200B358 * param1, UnkStruct_0205AA50 param2[], UnkStruct_02073C74_sub1 * param3, UnkStruct_ov94_0223BA88_sub2 * param4) +static void ov94_022423FC (UnkStruct_0200B144 * param0, UnkStruct_0200B358 * param1, UnkStruct_0205AA50 param2[], BoxPokemon * param3, UnkStruct_ov94_0223BA88_sub2 * param4) { UnkStruct_02023790 * v0, * v1; UnkStruct_02023790 * v2 = sub_02023790(10 + 1, 62); UnkStruct_02023790 * v3 = sub_02023790(10 + 1, 62); int v4, v5, v6; - sub_02074570(param3, 119, v2); + sub_02074570(param3, MON_DATA_119, v2); - v4 = sub_02074570(param3, 111, NULL) + 1; + v4 = sub_02074570(param3, MON_DATA_111, NULL) + 1; v5 = sub_02075B40(param3); v0 = sub_0200B1EC(param0, 100); @@ -1038,7 +1038,7 @@ static void ov94_022423FC (UnkStruct_0200B144 * param0, UnkStruct_0200B358 * par ov94_02245900(¶m2[1], v3, 70, 0, 0, Unk_ov94_02246920[v4 - 1]); } - param4->unk_00 = sub_02074570(param3, 5, NULL); + param4->unk_00 = sub_02074570(param3, MON_DATA_SPECIES, NULL); param4->unk_02 = v4; param4->unk_03 = v5; @@ -1086,12 +1086,12 @@ void ov94_022425A8 (UnkStruct_ov94_0223BA88 * param0, UnkStruct_ov94_0223FD4C * u16 * v0; if (ov94_022411D0(param1->unk_110)) { - sub_02077ACC((UnkStruct_02073C74 *)(param1->unk_114), 0); + SetShayminForm((Pokemon *)(param1->unk_114), 0); - MI_CpuCopyFast(param1->unk_114, param0->unk_00.unk_00, sub_02073C70()); + MI_CpuCopyFast(param1->unk_114, param0->unk_00.unk_00, PokemonStructSize()); } else { - sub_02077ADC(param1->unk_114, 0); - sub_020774C8(param1->unk_114, (UnkStruct_02073C74 *)param0->unk_00.unk_00); + SetBoxShayminForm(param1->unk_114, 0); + sub_020774C8(param1->unk_114, (Pokemon *)param0->unk_00.unk_00); } sub_020021D0(param0->unk_10C, sub_02025EF0(param1->unk_00->unk_1C), 8); diff --git a/src/overlay094/ov94_02242AD0.c b/src/overlay094/ov94_02242AD0.c index 1d07ff428b..9bc5f85888 100644 --- a/src/overlay094/ov94_02242AD0.c +++ b/src/overlay094/ov94_02242AD0.c @@ -11,7 +11,7 @@ #include "struct_decls/struct_0202CC84_decl.h" #include "struct_decls/struct_0202DA40_decl.h" #include "struct_decls/struct_020507E4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay094/struct_ov94_0223BA88.h" @@ -64,7 +64,7 @@ static void ov94_02242D98(UnkStruct_ov94_0223FD4C * param0); static void ov94_02243E48(UnkStruct_0202B628 * param0, UnkStruct_ov94_0223BA88 * param1); static void ov94_0224362C(UnkStruct_ov94_0223FD4C * param0); static void ov94_02243E2C(UnkStruct_0202C878 * param0, UnkStruct_ov94_0223BA88 * param1); -static void ov94_02243CE4(UnkStruct_ov94_0223FD4C * param0, UnkStruct_02073C74 * param1, int param2); +static void ov94_02243CE4(UnkStruct_ov94_0223FD4C * param0, Pokemon * param1, int param2); static void ov94_02243DE8(UnkStruct_0202DA40 * param0, int param1); static int ov94_02243E84(UnkStruct_ov94_0223FD4C * param0, UnkStruct_ov94_0223BA88 * param1); static void ov94_022438C8(UnkStruct_ov94_0223FD4C * param0); @@ -92,7 +92,7 @@ static int ov94_022432F4(UnkStruct_ov94_0223FD4C * param0); static int ov94_022437AC(UnkStruct_ov94_0223FD4C * param0); static int ov94_02243884(UnkStruct_ov94_0223FD4C * param0); static void ov94_02243B08(UnkStruct_ov94_0223FD4C * param0, int param1); -static void ov94_02243BC4(UnkStruct_ov94_0223FD4C * param0, UnkStruct_02073C74 * param1, int param2, int param3); +static void ov94_02243BC4(UnkStruct_ov94_0223FD4C * param0, Pokemon * param1, int param2, int param3); static int ov94_02243990(UnkStruct_ov94_0223FD4C * param0); static int ov94_02243974(UnkStruct_ov94_0223FD4C * param0); static int ov94_02243A04(UnkStruct_ov94_0223FD4C * param0); @@ -406,7 +406,7 @@ static int ov94_02242DA8 (UnkStruct_ov94_0223FD4C * param0) static int ov94_02242E9C (UnkStruct_ov94_0223FD4C * param0) { - sub_0207893C((UnkStruct_02073C74 *)param0->unk_12C.unk_00.unk_00); + sub_0207893C((Pokemon *)param0->unk_12C.unk_00.unk_00); ov94_0223B7E4(¶m0->unk_12C); param0->unk_2C = 3; @@ -545,7 +545,7 @@ static int ov94_02243048 (UnkStruct_ov94_0223FD4C * param0) if (param0->unk_12C.unk_121) { param0->unk_2C = 24; } else { - ov94_02243BC4(param0, (UnkStruct_02073C74 *)param0->unk_12C.unk_00.unk_00, sub_0202DAAC(param0->unk_00->unk_00), param0->unk_12C.unk_121); + ov94_02243BC4(param0, (Pokemon *)param0->unk_12C.unk_00.unk_00, sub_0202DAAC(param0->unk_00->unk_00), param0->unk_12C.unk_121); param0->unk_2C = 30; } break; @@ -629,7 +629,7 @@ static int ov94_02243120 (UnkStruct_ov94_0223FD4C * param0) static int ov94_022431A4 (UnkStruct_ov94_0223FD4C * param0) { - sub_0207893C((UnkStruct_02073C74 *)param0->unk_12C.unk_00.unk_00); + sub_0207893C((Pokemon *)param0->unk_12C.unk_00.unk_00); ov94_0223BA88(param0->unk_250[param0->unk_11C].unk_108, ¶m0->unk_12C, ¶m0->unk_A4C); ov94_02243EC8(param0, 14, 16); @@ -654,7 +654,7 @@ static int ov94_022431F0 (UnkStruct_ov94_0223FD4C * param0) param0->unk_2C = 30; ov94_02243B08(param0, 0); - ov94_02243CE4(param0, (UnkStruct_02073C74 *)param0->unk_A4C.unk_00.unk_00, param0->unk_110); + ov94_02243CE4(param0, (Pokemon *)param0->unk_A4C.unk_00.unk_00, param0->unk_110); ov94_02243E2C(param0->unk_00->unk_18, ¶m0->unk_A4C); sub_0202CFEC(param0->unk_00->unk_28, 25); ov94_02243E48(param0->unk_00->unk_2C, ¶m0->unk_A4C); @@ -794,7 +794,7 @@ static int ov94_02243398 (UnkStruct_ov94_0223FD4C * param0) param0->unk_36 = 0; if (sub_0202DA60(param0->unk_00->unk_00)) { - UnkStruct_02073C74 * v1 = sub_02073C74(62); + Pokemon * v1 = AllocMonZeroed(62); sub_0202DA70(param0->unk_00->unk_00, v1); sub_0200B5CC(param0->unk_B8C, 0, sub_02076B10(v1)); @@ -814,7 +814,7 @@ static int ov94_02243398 (UnkStruct_ov94_0223FD4C * param0) param0->unk_36 = 0; if (sub_0202DA60(param0->unk_00->unk_00)) { - UnkStruct_02073C74 * v2 = sub_02073C74(62); + Pokemon * v2 = AllocMonZeroed(62); sub_0202DA70(param0->unk_00->unk_00, v2); sub_0200B5CC(param0->unk_B8C, 0, sub_02076B10(v2)); @@ -932,7 +932,7 @@ static void ov94_0224362C (UnkStruct_ov94_0223FD4C * param0) static int ov94_02243658 (UnkStruct_ov94_0223FD4C * param0) { - ov94_02243BC4(param0, (UnkStruct_02073C74 *)param0->unk_12C.unk_00.unk_00, sub_0202DAAC(param0->unk_00->unk_00), param0->unk_12C.unk_121); + ov94_02243BC4(param0, (Pokemon *)param0->unk_12C.unk_00.unk_00, sub_0202DAAC(param0->unk_00->unk_00), param0->unk_12C.unk_121); ov94_02243E2C(param0->unk_00->unk_18, ¶m0->unk_12C); sub_0202CFEC(param0->unk_00->unk_28, 25); @@ -1250,14 +1250,14 @@ static int ov94_02243AE8 (UnkStruct_ov94_0223FD4C * param0) static void ov94_02243B08 (UnkStruct_ov94_0223FD4C * param0, int param1) { if (param0->unk_110 != 18) { - UnkStruct_02073C74 * v0 = sub_02073C74(62); + Pokemon * v0 = AllocMonZeroed(62); sub_020774C8(sub_02079C9C(param0->unk_00->unk_0C, param0->unk_110, param0->unk_112), v0); sub_0202DA7C(param0->unk_00->unk_00, v0, param0->unk_110); sub_02079968(param0->unk_00->unk_0C, param0->unk_110, param0->unk_112); Heap_FreeToHeap(v0); } else { - UnkStruct_02073C74 * v1 = Party_GetPokemonBySlotIndex(param0->unk_00->unk_08, param0->unk_112); + Pokemon * v1 = Party_GetPokemonBySlotIndex(param0->unk_00->unk_08, param0->unk_112); sub_0207893C(v1); sub_0202DA7C(param0->unk_00->unk_00, v1, param0->unk_110); @@ -1274,9 +1274,9 @@ static void ov94_02243B08 (UnkStruct_ov94_0223FD4C * param0, int param1) } } -static void ov94_02243BC4 (UnkStruct_ov94_0223FD4C * param0, UnkStruct_02073C74 * param1, int param2, int param3) +static void ov94_02243BC4 (UnkStruct_ov94_0223FD4C * param0, Pokemon * param1, int param2, int param3) { - int v0 = sub_02074470(param1, 6, NULL); + int v0 = GetMonData(param1, MON_DATA_HELD_ITEM, NULL); sub_0202F180(param0->unk_00->unk_20, param1); param2 = 18; @@ -1288,8 +1288,8 @@ static void ov94_02243BC4 (UnkStruct_ov94_0223FD4C * param0, UnkStruct_02073C74 if (param3) { u8 v1 = 70; - if (sub_02074470(param1, 5, NULL) == 493) { - if (sub_02074470(param1, 110, NULL) || ((sub_02074470(param1, 153, NULL) == 86) && (sub_02074470(param1, 110, NULL) == 0))) { + if (GetMonData(param1, MON_DATA_SPECIES, NULL) == 493) { + if (GetMonData(param1, MON_DATA_FATEFUL_ENCOUNTER, NULL) || ((GetMonData(param1, MON_DATA_153, NULL) == 86) && (GetMonData(param1, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 0))) { UnkStruct_020507E4 * v2 = sub_020507E4(param0->unk_00->unk_20); if (sub_0206B5F8(v2) == 0) { @@ -1325,7 +1325,7 @@ static void ov94_02243BC4 (UnkStruct_ov94_0223FD4C * param0, UnkStruct_02073C74 sub_0202DA68(param0->unk_00->unk_00, 0); } -static void ov94_02243CE4 (UnkStruct_ov94_0223FD4C * param0, UnkStruct_02073C74 * param1, int param2) +static void ov94_02243CE4 (UnkStruct_ov94_0223FD4C * param0, Pokemon * param1, int param2) { sub_0202F180(param0->unk_00->unk_20, param1); @@ -1335,8 +1335,8 @@ static void ov94_02243CE4 (UnkStruct_ov94_0223FD4C * param0, UnkStruct_02073C74 param2 = 0; } - if (sub_02074470(param1, 5, NULL) == 493) { - if (sub_02074470(param1, 110, NULL) || ((sub_02074470(param1, 153, NULL) == 86) && (sub_02074470(param1, 110, NULL) == 0))) { + if (GetMonData(param1, MON_DATA_SPECIES, NULL) == 493) { + if (GetMonData(param1, MON_DATA_FATEFUL_ENCOUNTER, NULL) || ((GetMonData(param1, MON_DATA_153, NULL) == 86) && (GetMonData(param1, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 0))) { UnkStruct_020507E4 * v0 = sub_020507E4(param0->unk_00->unk_20); if (sub_0206B5F8(v0) == 0) { @@ -1399,16 +1399,16 @@ static void ov94_02243E48 (UnkStruct_0202B628 * param0, UnkStruct_ov94_0223BA88 { void * v0; u16 v1[10 + 1]; - UnkStruct_02073C74 * v2 = (UnkStruct_02073C74 *)param1->unk_00.unk_00; + Pokemon * v2 = (Pokemon *)param1->unk_00.unk_00; - sub_02074470(v2, 117, v1); + GetMonData(v2, MON_DATA_117, v1); v0 = sub_0202C1EC(param1->unk_10C, param1->unk_F6, v1, sub_02075D6C(v2), 62); sub_0202B758(param0, v0, 4); } static int ov94_02243E84 (UnkStruct_ov94_0223FD4C * param0, UnkStruct_ov94_0223BA88 * param1) { - if (ov94_02241498((UnkStruct_02073C74 *)param1->unk_00.unk_00) + if (ov94_02241498((Pokemon *)param1->unk_00.unk_00) && (Party_GetCurrentCount(param0->unk_00->unk_08) == 6)) { return 2; } @@ -1428,7 +1428,7 @@ static void ov94_02243EC8 (UnkStruct_ov94_0223FD4C * param0, int param1, int par static int ov94_02243ED8 (UnkStruct_ov94_0223FD4C * param0) { - UnkStruct_02073C74 * v0 = (UnkStruct_02073C74 *)param0->unk_12C.unk_00.unk_00; + Pokemon * v0 = (Pokemon *)param0->unk_12C.unk_00.unk_00; if (sub_0202DA60(param0->unk_00->unk_00) == 0) { if (param0->unk_36) { diff --git a/src/overlay094/ov94_022444C8.c b/src/overlay094/ov94_022444C8.c index ab37c1907c..89d39ffa9c 100644 --- a/src/overlay094/ov94_022444C8.c +++ b/src/overlay094/ov94_022444C8.c @@ -3,8 +3,8 @@ #include #include "struct_decls/struct_02025E6C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_defs/struct_0208BE5C.h" #include "overlay094/struct_ov94_0223BA88.h" @@ -26,7 +26,7 @@ FS_EXTERN_OVERLAY(overlay95); static UnkStruct_02025E6C * ov94_02244870(UnkStruct_ov94_0223BA88 * param0); -static UnkStruct_02073C74 * ov94_022448AC(UnkStruct_ov94_0223FD4C * param0, int param1); +static Pokemon * ov94_022448AC(UnkStruct_ov94_0223FD4C * param0, int param1); static void ov94_022448E8(UnkStruct_ov94_0223FD4C * param0); static const UnkStruct_0208BE5C Unk_ov94_0224636C = { @@ -38,11 +38,11 @@ static const UnkStruct_0208BE5C Unk_ov94_0224636C = { int ov94_022444C8 (UnkStruct_ov94_0223FD4C * param0, int param1) { - param0->unk_1104 = sub_02073C74(62); + param0->unk_1104 = AllocMonZeroed(62); switch (param0->unk_24) { case 7: - param0->unk_E8.unk_00 = (UnkStruct_02073C74_sub1 *)sub_02076B10((UnkStruct_02073C74 *)param0->unk_12C.unk_00.unk_00); + param0->unk_E8.unk_00 = (BoxPokemon *)sub_02076B10((Pokemon *)param0->unk_12C.unk_00.unk_00); param0->unk_E8.unk_04 = param0->unk_E8.unk_00; param0->unk_120 = ov94_02244870(¶m0->unk_12C); param0->unk_E8.unk_08 = param0->unk_120; @@ -50,7 +50,7 @@ int ov94_022444C8 (UnkStruct_ov94_0223FD4C * param0, int param1) param0->unk_E8.unk_10 = 2; break; case 8: - param0->unk_E8.unk_04 = (UnkStruct_02073C74_sub1 *)sub_02076B10((UnkStruct_02073C74 *)param0->unk_12C.unk_00.unk_00); + param0->unk_E8.unk_04 = (BoxPokemon *)sub_02076B10((Pokemon *)param0->unk_12C.unk_00.unk_00); param0->unk_E8.unk_00 = param0->unk_E8.unk_04; param0->unk_120 = ov94_02244870(¶m0->unk_12C); param0->unk_E8.unk_08 = param0->unk_120; @@ -58,7 +58,7 @@ int ov94_022444C8 (UnkStruct_ov94_0223FD4C * param0, int param1) param0->unk_E8.unk_10 = 4; break; case 10: - param0->unk_E8.unk_04 = sub_02076B10((UnkStruct_02073C74 *)param0->unk_12C.unk_00.unk_00); + param0->unk_E8.unk_04 = sub_02076B10((Pokemon *)param0->unk_12C.unk_00.unk_00); sub_0202DA70(param0->unk_00->unk_00, param0->unk_1104); param0->unk_E8.unk_00 = sub_02076B10(param0->unk_1104); param0->unk_120 = ov94_02244870(¶m0->unk_12C); @@ -69,7 +69,7 @@ int ov94_022444C8 (UnkStruct_ov94_0223FD4C * param0, int param1) case 9: sub_0202DA70(param0->unk_00->unk_00, param0->unk_1104); param0->unk_E8.unk_00 = sub_02076B10(param0->unk_1104); - param0->unk_E8.unk_04 = (UnkStruct_02073C74_sub1 *)sub_02076B10((UnkStruct_02073C74 *)param0->unk_250[param0->unk_11C].unk_00.unk_00); + param0->unk_E8.unk_04 = (BoxPokemon *)sub_02076B10((Pokemon *)param0->unk_250[param0->unk_11C].unk_00.unk_00); param0->unk_120 = ov94_02244870(¶m0->unk_250[param0->unk_11C]); param0->unk_E8.unk_08 = param0->unk_120; param0->unk_E8.unk_0C = 3; @@ -94,8 +94,8 @@ int ov94_02244678 (UnkStruct_ov94_0223FD4C * param0, int param1) sub_02006814(param0->unk_B4); if (param0->unk_24 == 9) { - UnkStruct_02073C74 * v1 = ov94_022448AC(param0, param0->unk_24); - int v2 = sub_02074470(v1, 6, NULL); + Pokemon * v1 = ov94_022448AC(param0, param0->unk_24); + int v2 = GetMonData(v1, MON_DATA_HELD_ITEM, NULL); int v3; int v4; @@ -109,13 +109,13 @@ int ov94_02244678 (UnkStruct_ov94_0223FD4C * param0, int param1) v0 = 4; } } else if ((param0->unk_24 == 8) || (param0->unk_24 == 10)) { - UnkStruct_02073C74 * v1 = ov94_022448AC(param0, param0->unk_24); - UnkStruct_02073C74 * v5 = sub_02073C74(62); + Pokemon * v1 = ov94_022448AC(param0, param0->unk_24); + Pokemon * v5 = AllocMonZeroed(62); sub_0202DA70(param0->unk_00->unk_00, v5); - if ((sub_02074470(v1, 5, NULL) != sub_02074470(v5, 5, NULL)) || (sub_02074470(v1, 0, NULL) != sub_02074470(v5, 0, NULL))) { - int v6 = sub_02074470(v1, 6, NULL); + if ((GetMonData(v1, MON_DATA_SPECIES, NULL) != GetMonData(v5, MON_DATA_SPECIES, NULL)) || (GetMonData(v1, MON_DATA_PERSONALITY, NULL) != GetMonData(v5, MON_DATA_PERSONALITY, NULL))) { + int v6 = GetMonData(v1, MON_DATA_HELD_ITEM, NULL); int v7; int v8; @@ -175,14 +175,14 @@ static UnkStruct_02025E6C * ov94_02244870 (UnkStruct_ov94_0223BA88 * param0) return v0; } -static UnkStruct_02073C74 * ov94_022448AC (UnkStruct_ov94_0223FD4C * param0, int param1) +static Pokemon * ov94_022448AC (UnkStruct_ov94_0223FD4C * param0, int param1) { if (param1 == 9) { - return (UnkStruct_02073C74 *)param0->unk_250[param0->unk_11C].unk_00.unk_00; + return (Pokemon *)param0->unk_250[param0->unk_11C].unk_00.unk_00; } else if (param1 == 10) { - return (UnkStruct_02073C74 *)param0->unk_12C.unk_00.unk_00; + return (Pokemon *)param0->unk_12C.unk_00.unk_00; } else if (param1 == 8) { - return (UnkStruct_02073C74 *)param0->unk_12C.unk_00.unk_00; + return (Pokemon *)param0->unk_12C.unk_00.unk_00; } GF_ASSERT(0); @@ -191,7 +191,7 @@ static UnkStruct_02073C74 * ov94_022448AC (UnkStruct_ov94_0223FD4C * param0, int static void ov94_022448E8 (UnkStruct_ov94_0223FD4C * param0) { - UnkStruct_02073C74 * v0 = ov94_022448AC(param0, param0->unk_24); + Pokemon * v0 = ov94_022448AC(param0, param0->unk_24); if (param0->unk_124.unk_00 == 18) { sub_020775EC(v0, Party_GetPokemonBySlotIndex(param0->unk_00->unk_08, param0->unk_124.unk_04)); diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c index 5e98bdfcb2..9249f4cdf5 100644 --- a/src/overlay095/ov95_02246C20.c +++ b/src/overlay095/ov95_02246C20.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/box_pokemon.h" #include "overlay095/struct_ov95_02247004_decl.h" #include "overlay095/struct_ov95_022472C4_decl.h" #include "overlay095/struct_ov95_02247628_decl.h" @@ -108,7 +108,7 @@ typedef void *(* UnkFuncPtr_ov95_0224BE8C)(UnkStruct_ov95_02247628 *); typedef BOOL (* UnkFuncPtr_ov95_0224BE8C_1)(void *, int *); typedef void (* UnkFuncPtr_ov95_0224BE8C_2)(void *); -static BOOL ov95_02246DEC(UnkStruct_02073C74_sub1 * param0); +static BOOL ov95_02246DEC(BoxPokemon * param0); static void ov95_02246F0C(UnkStruct_0201CD38 * param0, void * param1); static void ov95_02247060(UnkStruct_0201CD38 * param0, void * param1); static void ov95_02247148(UnkStruct_ov95_02247004 * param0, int param1, int param2, int param3); @@ -157,17 +157,17 @@ int ov95_02246C20 (UnkStruct_020067E8 * param0, int * param1) switch (v0->unk_00->unk_10) { case 1: - sub_0200B5CC(v0->unk_0C, 0, (UnkStruct_02073C74_sub1 *)(v0->unk_00->unk_00)); - sub_0200B5CC(v0->unk_0C, 1, (UnkStruct_02073C74_sub1 *)(v0->unk_00->unk_04)); + sub_0200B5CC(v0->unk_0C, 0, (BoxPokemon *)(v0->unk_00->unk_00)); + sub_0200B5CC(v0->unk_0C, 1, (BoxPokemon *)(v0->unk_00->unk_04)); sub_0200B498(v0->unk_0C, 2, v0->unk_00->unk_08); - v0->unk_1AC = ov95_02246DEC((UnkStruct_02073C74_sub1 *)(v0->unk_00->unk_04)); + v0->unk_1AC = ov95_02246DEC((BoxPokemon *)(v0->unk_00->unk_04)); break; case 2: - sub_0200B5CC(v0->unk_0C, 0, (UnkStruct_02073C74_sub1 *)(v0->unk_00->unk_00)); + sub_0200B5CC(v0->unk_0C, 0, (BoxPokemon *)(v0->unk_00->unk_00)); break; case 4: - sub_0200B5CC(v0->unk_0C, 1, (UnkStruct_02073C74_sub1 *)(v0->unk_00->unk_04)); - v0->unk_1AC = ov95_02246DEC((UnkStruct_02073C74_sub1 *)(v0->unk_00->unk_04)); + sub_0200B5CC(v0->unk_0C, 1, (BoxPokemon *)(v0->unk_00->unk_04)); + v0->unk_1AC = ov95_02246DEC((BoxPokemon *)(v0->unk_00->unk_04)); break; } @@ -177,10 +177,10 @@ int ov95_02246C20 (UnkStruct_020067E8 * param0, int * param1) v0->unk_18 = sub_020095C4(64, &v0->unk_1C, 57); sub_0200964C(&(v0->unk_1C), 0, (192 + 40 << FX32_SHIFT)); - v0->unk_1B0 = sub_02074570((UnkStruct_02073C74_sub1 *)(v0->unk_00->unk_00), 5, NULL); - v0->unk_1B2 = sub_02074570((UnkStruct_02073C74_sub1 *)(v0->unk_00->unk_00), 112, NULL); - v0->unk_1B4 = sub_02074570((UnkStruct_02073C74_sub1 *)(v0->unk_00->unk_04), 5, NULL); - v0->unk_1B6 = sub_02074570((UnkStruct_02073C74_sub1 *)(v0->unk_00->unk_04), 112, NULL); + v0->unk_1B0 = sub_02074570((BoxPokemon *)(v0->unk_00->unk_00), MON_DATA_SPECIES, NULL); + v0->unk_1B2 = sub_02074570((BoxPokemon *)(v0->unk_00->unk_00), MON_DATA_FORM, NULL); + v0->unk_1B4 = sub_02074570((BoxPokemon *)(v0->unk_00->unk_04), MON_DATA_SPECIES, NULL); + v0->unk_1B6 = sub_02074570((BoxPokemon *)(v0->unk_00->unk_04), MON_DATA_FORM, NULL); v0->unk_1B8 = NULL; sub_02017798(NULL, NULL); @@ -201,10 +201,10 @@ int ov95_02246C20 (UnkStruct_020067E8 * param0, int * param1) return 0; } -static BOOL ov95_02246DEC (UnkStruct_02073C74_sub1 * param0) +static BOOL ov95_02246DEC (BoxPokemon * param0) { - int v0 = sub_02074570(param0, 5, NULL); - int v1 = sub_02074570(param0, 112, NULL); + int v0 = sub_02074570(param0, MON_DATA_SPECIES, NULL); + int v1 = sub_02074570(param0, MON_DATA_FORM, NULL); return sub_020759CC(v0, v1, 28) == 0; } @@ -568,18 +568,18 @@ void ov95_022473E8 (UnkStruct_ov95_02247628 * param0, int param1, u32 param2, u3 UnkStruct_02013610 v4 = { 0, 0, 10, 10, }; - UnkStruct_02073C74_sub1 * v5; + BoxPokemon * v5; BOOL v6; u32 v7; u16 v8; - v5 = (UnkStruct_02073C74_sub1 *)((param1 == 0) ? param0->unk_00->unk_00 : param0->unk_00->unk_04); + v5 = (BoxPokemon *)((param1 == 0) ? param0->unk_00->unk_00 : param0->unk_00->unk_04); v6 = sub_02073D20(v5); sub_02075F0C(&v0, v5, 2, 0); - v7 = sub_02074570(v5, 0, NULL); - v8 = sub_02074570(v5, 5, NULL); + v7 = sub_02074570(v5, MON_DATA_PERSONALITY, NULL); + v8 = sub_02074570(v5, MON_DATA_SPECIES, NULL); if (param4) { v4.unk_08 *= 2; @@ -689,12 +689,12 @@ UnkStruct_0200B144 * ov95_02247630 (UnkStruct_ov95_02247628 * param0) return param0->unk_10; } -const UnkStruct_02073C74_sub1 * ov95_02247634 (UnkStruct_ov95_02247628 * param0) +const BoxPokemon * ov95_02247634 (UnkStruct_ov95_02247628 * param0) { return param0->unk_00->unk_00; } -const UnkStruct_02073C74_sub1 * ov95_0224763C (UnkStruct_ov95_02247628 * param0) +const BoxPokemon * ov95_0224763C (UnkStruct_ov95_02247628 * param0) { return param0->unk_00->unk_04; } diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c index 9717e195ac..f4a939b8a5 100644 --- a/src/overlay095/ov95_02247B6C.c +++ b/src/overlay095/ov95_02247B6C.c @@ -10,7 +10,7 @@ #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/box_pokemon.h" #include "overlay095/struct_ov95_02247628_decl.h" #include "overlay095/struct_ov95_0224773C_decl.h" #include "overlay095/struct_ov95_02247958_decl.h" @@ -358,9 +358,9 @@ static int ov95_02247F04 (UnkStruct_ov95_02247C6C * param0, int * param1) sub_0200C388(v5, param0->unk_6C, param0->unk_68); { - const UnkStruct_02073C74_sub1 * v6 = ov95_02247634(param0->unk_00); + const BoxPokemon * v6 = ov95_02247634(param0->unk_00); - if (sub_02074570((UnkStruct_02073C74_sub1 *)v6, 76, NULL) == 0) { + if (sub_02074570((BoxPokemon *)v6, MON_DATA_IS_EGG, NULL) == 0) { u8 v7; sub_02007B98(param0->unk_10, 1); @@ -465,10 +465,10 @@ static void ov95_02248174 (UnkStruct_ov95_02247C6C * param0) static UnkStruct_02007C7C * ov95_02248240 (UnkStruct_ov95_02247C6C * param0) { UnkStruct_02008A90 v0; - UnkStruct_02073C74_sub1 * v1; + BoxPokemon * v1; int v2; - v1 = (UnkStruct_02073C74_sub1 *)ov95_02247634(param0->unk_00); + v1 = (BoxPokemon *)ov95_02247634(param0->unk_00); sub_02075F0C(&v0, v1, 2, 0); sub_020789BC(param0->unk_80, param0->unk_14, ov95_0224764C(param0->unk_00), 1); diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c index aaab03bf65..5589f4a654 100644 --- a/src/overlay095/ov95_0224B3D8.c +++ b/src/overlay095/ov95_0224B3D8.c @@ -12,7 +12,7 @@ #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/box_pokemon.h" #include "overlay095/struct_ov95_02247628_decl.h" #include "overlay095/struct_ov95_0224773C_decl.h" #include "overlay095/struct_ov95_02247958_decl.h" @@ -371,9 +371,9 @@ static int ov95_0224B71C (UnkStruct_ov95_0224B4D4 * param0, int * param1) break; case 3: if (ov95_0224BC00(param0)) { - const UnkStruct_02073C74_sub1 * v0 = ov95_0224763C(param0->unk_00); + const BoxPokemon * v0 = ov95_0224763C(param0->unk_00); - if (sub_02074570((UnkStruct_02073C74_sub1 *)v0, 76, NULL) == 0) { + if (sub_02074570((BoxPokemon *)v0, MON_DATA_IS_EGG, NULL) == 0) { u8 v1; sub_02078A4C(param0->unk_84, &v1, ov95_02247660(param0->unk_00), 1); @@ -509,10 +509,10 @@ static void ov95_0224B9C0 (UnkStruct_ov95_0224B4D4 * param0) static UnkStruct_02007C7C * ov95_0224BA8C (UnkStruct_ov95_0224B4D4 * param0) { UnkStruct_02008A90 v0; - UnkStruct_02073C74_sub1 * v1; + BoxPokemon * v1; int v2; - v1 = (UnkStruct_02073C74_sub1 *)ov95_0224763C(param0->unk_00); + v1 = (BoxPokemon *)ov95_0224763C(param0->unk_00); sub_02075F0C(&v0, v1, 2, 0); sub_020789BC(param0->unk_84, param0->unk_18, ov95_02247660(param0->unk_00), 1); diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c index e03fc9f179..65bd09beff 100644 --- a/src/overlay097/ov97_0222D30C.c +++ b/src/overlay097/ov97_0222D30C.c @@ -13,7 +13,7 @@ #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_0202442C_decl.h" #include "struct_decls/struct_02025CCC_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_021C0794_decl.h" #include "overlay077/const_ov77_021D742C.h" @@ -401,11 +401,11 @@ static BOOL ov97_0222D5C8 (UnkStruct_0202DF40 * param0) case 1: case 2: { - UnkStruct_02073C74 * v0; + Pokemon * v0; int v1; - v0 = (UnkStruct_02073C74 *)¶m0->unk_04.val1.unk_04; - v1 = sub_02074470(v0, 152, NULL); + v0 = (Pokemon *)¶m0->unk_04.val1.unk_04; + v1 = GetMonData(v0, MON_DATA_152, NULL); if (((v1 >= 3) && (v1 <= 14)) || ((v1 >= 64) && (v1 <= 71))) { return 1; diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c index 2d59e4b86e..f6f7be1793 100644 --- a/src/overlay097/ov97_02233B18.c +++ b/src/overlay097/ov97_02233B18.c @@ -26,8 +26,8 @@ #include "struct_defs/struct_020279FC.h" #include "struct_defs/struct_0203CC84.h" #include "struct_defs/struct_0205AA50.h" -#include "struct_defs/struct_02073C74.h" -#include "struct_defs/struct_02073C74_sub1.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_defs/struct_0208BE5C.h" #include "struct_defs/struct_02099F80.h" #include "overlay019/struct_ov19_021DA864.h" @@ -35,7 +35,7 @@ #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay097/struct_ov97_02236340.h" -#include "overlay097/struct_ov97_0223685C.h" +#include "overlay097/box_pokemon_gba.h" #include "overlay115/struct_ov115_02261520.h" #include "unk_02000C88.h" @@ -81,6 +81,9 @@ #include "overlay097/ov97_02237694.h" #include "overlay097/ov97_022392E4.h" +#include "constants/species.h" +#include "constants/gba/species.h" + FS_EXTERN_OVERLAY(overlay77); typedef struct { @@ -161,7 +164,7 @@ typedef struct { int unk_50C; int unk_510; u32 unk_514[14580]; - UnkStruct_ov97_02236340 * unk_E8E0; + PokemonStorageGBA * unk_E8E0; int unk_E8E4; int unk_E8E8; UnkStruct_02015920 * unk_E8EC; @@ -179,7 +182,7 @@ static void ov97_02235310(UnkStruct_ov97_02234A2C * param0); static void ov97_02233D10(UnkStruct_ov97_02234A2C * param0); void sub_02023D8C(UnkStruct_02023790 * param0, const u16 * param1, u32 param2); void sub_02023D28(UnkStruct_02023790 * param0, const u16 * param1); -void ov97_02236E90(UnkStruct_ov97_0223685C * param0, UnkStruct_02073C74_sub1 * param1); +void BoxMonGBAToBoxMon(BoxPokemonGBA * param0, BoxPokemon * param1); UnkStruct_ov97_0223F434 * Unk_ov97_0223F434; @@ -232,25 +235,19 @@ static int Unk_ov97_0223EAB8[] = { 0x21 }; -static BOOL ov97_02233B18 (int param0) +static BOOL IsGBASpeciesInvalid (int speciesGBA) { - if (param0 <= 0) { - return 1; + if (speciesGBA <= SPECIES_NONE) { + return TRUE; + } else if (speciesGBA <= SPECIES_CELEBI) { + return FALSE; + } else if (speciesGBA < GBA_SPECIES_TREECKO) { + return TRUE; + } else if (speciesGBA <= GBA_SPECIES_CHIMECHO) { + return FALSE; } - if (param0 <= 251) { - return 0; - } - - if (param0 < 277) { - return 1; - } - - if (param0 <= 411) { - return 0; - } - - return 1; + return TRUE; } static void ov97_02233B44 (UnkStruct_ov97_02234A2C * param0) @@ -395,9 +392,9 @@ static void ov97_02233D10 (UnkStruct_ov97_02234A2C * param0) { int v0, v1, v2; u16 v3; - UnkStruct_02073C74_sub1 * v4; - UnkStruct_ov97_0223685C * v5; - UnkStruct_02073C74 v6; + BoxPokemon * v4; + BoxPokemonGBA * v5; + Pokemon v6; UnkStruct_02024440 * v7; v7 = sub_02024440(param0->unk_10); @@ -406,9 +403,9 @@ static void ov97_02233D10 (UnkStruct_ov97_02234A2C * param0) for (v0 = 0; v0 < 6; v0++) { v2 = param0->unk_42C[v0].unk_04; v1 = param0->unk_42C[v0].unk_08; - v5 = ¶m0->unk_E8E0->unk_04[v1][v2]; + v5 = ¶m0->unk_E8E0->boxes[v1][v2]; - ov97_02236E90(v5, v4); + BoxMonGBAToBoxMon(v5, v4); sub_0202EFA4(v7, v4, v0); } @@ -419,7 +416,7 @@ static void ov97_02233D10 (UnkStruct_ov97_02234A2C * param0) v1 = param0->unk_42C[v0].unk_08; if ((v2 != -1) && (v1 != 14)) { - ov97_02236CA4(&(param0->unk_E8E0->unk_04[v1][v2]), 11, (u8 *)&v3); + SetGBABoxMonData(&(param0->unk_E8E0->boxes[v1][v2]), 11, (u8 *)&v3); } } } @@ -576,17 +573,17 @@ static void ov97_022340FC (UnkStruct_ov115_02261520 * param0, UnkStruct_ov97_022 static int ov97_02234124 (UnkStruct_ov97_02234A2C * param0, int param1, int param2) { - return ov97_02236924(&(param0->unk_E8E0->unk_04[param1][param2]), 11, NULL); + return GetGBABoxMonData(&(param0->unk_E8E0->boxes[param1][param2]), 11, NULL); } static int ov97_02234148 (UnkStruct_ov97_02234A2C * param0, int param1, int param2) { - return ov97_02236924(&(param0->unk_E8E0->unk_04[param1][param2]), 45, NULL); + return GetGBABoxMonData(&(param0->unk_E8E0->boxes[param1][param2]), 45, NULL); } static int ov97_0223416C (UnkStruct_ov97_02234A2C * param0, int param1, int param2) { - return ov97_02236924(&(param0->unk_E8E0->unk_04[param1][param2]), 0, NULL); + return GetGBABoxMonData(&(param0->unk_E8E0->boxes[param1][param2]), 0, NULL); } static void ov97_02234190 (UnkUnion_02022594 * param0, int param1, int param2, int param3, int param4) @@ -621,7 +618,7 @@ static void ov97_022341EC (u32 param0, NNSG2dCharacterData ** param1, void * par NNS_G2dGetUnpackedBGCharacterData(param2, param1); } -static u8 ov97_02234208 (int param0, u32 param1, int param2) +static u8 GBASpeciesToDSFormId (int param0, u32 param1, int param2) { u8 v0; @@ -663,7 +660,7 @@ static void ov97_02234278 (int param0, int param1, u32 param2, int param3, int p param0 = ov97_02236DD0(param0); - v1 = ov97_02234208(param0, param2, param3); + v1 = GBASpeciesToDSFormId(param0, param2, param3); v0 = ov97_022341B4(19, sub_02079D8C(param0, param1, v1), &v2, 78); DC_FlushRange(v2->pRawData, ((4 * 4) * 0x20)); @@ -680,7 +677,7 @@ static void ov97_022342E4 (int param0, int param1, int param2, int param3, UnkSt UnkStruct_ov97_0223F434 * v2 = Unk_ov97_0223F434 + param3; if (param4) { - if (ov97_02233B18(param0) == 0) { + if (IsGBASpeciesInvalid(param0) == 0) { param0 = ov97_02236DD0(param0); } else { param0 = 0; @@ -724,17 +721,17 @@ static void ov97_022343A8 (UnkStruct_ov97_02234A2C * param0) v6 = Heap_AllocFromHeapAtEnd(78, 4096); for (v0 = 0; v0 < 30; v0++) { - if (ov97_02236924(&(param0->unk_E8E0->unk_04[param0->unk_E8E4][v0]), 5, NULL)) { + if (GetGBABoxMonData(&(param0->unk_E8E0->boxes[param0->unk_E8E4][v0]), 5, NULL)) { v1 = ov97_02234124(param0, param0->unk_E8E4, v0); v2 = ov97_02234148(param0, param0->unk_E8E4, v0); v5 = ov97_0223416C(param0, param0->unk_E8E4, v0); v3 = Unk_021BF67C.unk_66; - v4 = ov97_02234208(ov97_02236DD0(v1), v5, v3); + v4 = GBASpeciesToDSFormId(ov97_02236DD0(v1), v5, v3); ov97_022342E4(v1, v2, v4, v0, param0->unk_20C[v0].unk_00, v6, v7); sub_02021CAC(param0->unk_20C[v0].unk_00, 1); - if (ov97_02236924(&(param0->unk_E8E0->unk_04[param0->unk_E8E4][v0]), 12, NULL)) { + if (GetGBABoxMonData(&(param0->unk_E8E0->boxes[param0->unk_E8E4][v0]), 12, NULL)) { sub_02021CAC(param0->unk_20C[v0].unk_04, 1); } else { sub_02021CAC(param0->unk_20C[v0].unk_04, 0); @@ -850,9 +847,9 @@ static void ov97_0223468C (UnkStruct_ov97_02234A2C * param0) static BOOL ov97_0223474C (UnkStruct_ov97_02234A2C * param0, int param1) { int v0; - UnkStruct_ov97_0223685C * v1 = ¶m0->unk_E8E0->unk_04[param0->unk_E8E4][param1]; + BoxPokemonGBA * v1 = ¶m0->unk_E8E0->boxes[param0->unk_E8E4][param1]; - if (ov97_02236924(v1, 65, NULL) == 412) { + if (GetGBABoxMonData(v1, 65, NULL) == 412) { return 1; } @@ -862,10 +859,10 @@ static BOOL ov97_0223474C (UnkStruct_ov97_02234A2C * param0, int param1) static BOOL ov97_02234784 (UnkStruct_ov97_02234A2C * param0, int param1) { int v0, v1, v2; - UnkStruct_ov97_0223685C * v3 = ¶m0->unk_E8E0->unk_04[param0->unk_E8E4][param1]; + BoxPokemonGBA * v3 = ¶m0->unk_E8E0->boxes[param0->unk_E8E4][param1]; for (v0 = 0; v0 < 4; v0++) { - v2 = ov97_02236924(v3, 13 + v0, NULL); + v2 = GetGBABoxMonData(v3, 13 + v0, NULL); for (v1 = 0; v1 < sizeof(Unk_ov97_0223EA98) / sizeof(int); v1++) { if (Unk_ov97_0223EA98[v1] == v2) { @@ -1029,8 +1026,8 @@ u16 Unk_ov97_0223EAD8[] = { static BOOL ov97_022347D8 (UnkStruct_ov97_02234A2C * param0, int param1) { - UnkStruct_ov97_0223685C * v0 = ¶m0->unk_E8E0->unk_04[param0->unk_E8E4][param1]; - int v1 = ov97_02236924(v0, 12, NULL); + BoxPokemonGBA * v0 = ¶m0->unk_E8E0->boxes[param0->unk_E8E4][param1]; + int v1 = GetGBABoxMonData(v0, 12, NULL); int v2; for (v2 = 0; Unk_ov97_0223EAD8[v2]; v2++) { @@ -1044,10 +1041,10 @@ static BOOL ov97_022347D8 (UnkStruct_ov97_02234A2C * param0, int param1) static BOOL ov97_02234828 (UnkStruct_ov97_02234A2C * param0, int param1) { - UnkStruct_ov97_0223685C * v0 = ¶m0->unk_E8E0->unk_04[param0->unk_E8E4][param1]; - int v1 = ov97_02236924(v0, 11, NULL); + BoxPokemonGBA * v0 = ¶m0->unk_E8E0->boxes[param0->unk_E8E4][param1]; + int v1 = GetGBABoxMonData(v0, 11, NULL); - return ov97_02233B18(v1); + return IsGBASpeciesInvalid(v1); } static int ov97_02234854 (UnkStruct_ov97_02234A2C * param0, int param1) @@ -1153,19 +1150,19 @@ static void ov97_02234A2C (UnkStruct_ov97_02234A2C * param0, int param1) v0.unk_2C = ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))); v0.unk_20 = 0xA0; - ov97_0223936C(param0->unk_E8E0->unk_8344[param1], v1, 8 + 1, ov97_02235DBC()); + ov97_0223936C(param0->unk_E8E0->boxNames[param1], v1, 8 + 1, ov97_02235DBC()); v0.unk_38 = v1; ov97_02233DD0(param0, &v0, 0x1); } -static void ov97_02234AB4 (UnkStruct_ov97_02234A2C * param0, UnkStruct_ov97_0223685C * param1) +static void ov97_02234AB4 (UnkStruct_ov97_02234A2C * param0, BoxPokemonGBA * param1) { u16 * v0 = sub_02019FE4(param0->unk_20, 2); u8 v1; int v2; if (param1) { - v1 = ov97_02236924(param1, 8, NULL); + v1 = GetGBABoxMonData(param1, 8, NULL); } else { v1 = 0; } @@ -1183,7 +1180,7 @@ static void ov97_02234AB4 (UnkStruct_ov97_02234A2C * param0, UnkStruct_ov97_0223 sub_02019448(param0->unk_20, 2); } -static void ov97_02234B0C (UnkStruct_ov97_02234A2C * param0, UnkStruct_ov97_0223685C * param1) +static void ov97_02234B0C (UnkStruct_ov97_02234A2C * param0, BoxPokemonGBA * param1) { int v0, v1; int v2, v3; @@ -1224,8 +1221,8 @@ static void ov97_02234B0C (UnkStruct_ov97_02234A2C * param0, UnkStruct_ov97_0223 return; } - ov97_02236924(param1, 2, v6); - ov97_0223936C(v6, v7, 10 + 1, ov97_02236924(param1, 3, NULL)); + GetGBABoxMonData(param1, 2, v6); + ov97_0223936C(v6, v7, 10 + 1, GetGBABoxMonData(param1, 3, NULL)); v4.unk_38 = v7; v4.unk_34 = -1; @@ -1236,7 +1233,7 @@ static void ov97_02234B0C (UnkStruct_ov97_02234A2C * param0, UnkStruct_ov97_0223 v8 = sub_02023790(64, 78); v5 = sub_0200B144(1, 26, 412, 78); - v0 = ov97_02236DD0(ov97_02236924(param1, 11, NULL)); + v0 = ov97_02236DD0(GetGBABoxMonData(param1, 11, NULL)); sub_0200B1B8(v5, v0, v8); @@ -1250,7 +1247,7 @@ static void ov97_02234B0C (UnkStruct_ov97_02234A2C * param0, UnkStruct_ov97_0223 sub_0200B190(v5); sub_020237BC(v8); - v2 = ov97_02236924(param1, 12, NULL); + v2 = GetGBABoxMonData(param1, 12, NULL); if (v2) { v3 = sub_0207CF10(v2); @@ -1697,14 +1694,14 @@ static int ov97_02235408 (UnkStruct_ov97_02234A2C * param0) } { - UnkStruct_ov97_0223685C * v3; + BoxPokemonGBA * v3; int v4, v5, v6 = 0; - for (v5 = 0; v5 < 14; v5++) { + for (v5 = 0; v5 < GBA_TOTAL_BOXES_COUNT; v5++) { for (v4 = 0; v4 < 30; v4++) { - v3 = ¶m0->unk_E8E0->unk_04[v5][v4]; + v3 = ¶m0->unk_E8E0->boxes[v5][v4]; - if (ov97_02236924(v3, 5, NULL)) { + if (GetGBABoxMonData(v3, 5, NULL)) { v6++; } } @@ -1854,7 +1851,7 @@ static int ov97_022356E8 (UnkStruct_020067E8 * param0, int * param1) if (v3->unk_510 == 0) { v3->unk_E8E0 = ov97_02236340(); - v3->unk_E8E4 = v3->unk_E8E0->unk_00; + v3->unk_E8E4 = v3->unk_E8E0->currentBox; } else { v3->unk_04 = 1; } @@ -1998,7 +1995,7 @@ static int ov97_022356E8 (UnkStruct_020067E8 * param0, int * param1) v1 = ov97_02234854(v3, v0); if (v1 == 1) { - ov97_02234B0C(v3, &(v3->unk_E8E0->unk_04[v3->unk_E8E4][v0])); + ov97_02234B0C(v3, &(v3->unk_E8E0->boxes[v3->unk_E8E4][v0])); if (v3->unk_474 == 6) { v3->unk_E8E8 = 45; diff --git a/src/overlay097/ov97_02235D18.c b/src/overlay097/ov97_02235D18.c index bc53b7e6eb..817bfae11e 100644 --- a/src/overlay097/ov97_02235D18.c +++ b/src/overlay097/ov97_02235D18.c @@ -189,7 +189,7 @@ static u16 ov97_02235EC0 (int param0) } if (param0 == 13) { - return sizeof(UnkStruct_ov97_02236340) - 0xf80 * 8; + return sizeof(PokemonStorageGBA) - 0xf80 * 8; } return 0xf80; @@ -472,7 +472,7 @@ int ov97_02236308 (void) } } -UnkStruct_ov97_02236340 * ov97_02236340 (void) +PokemonStorageGBA * ov97_02236340 (void) { return &(Unk_ov97_0223F440->unk_6000); } diff --git a/src/overlay097/ov97_02236380.c b/src/overlay097/ov97_02236380.c index c47d0a03d7..36775ea535 100644 --- a/src/overlay097/ov97_02236380.c +++ b/src/overlay097/ov97_02236380.c @@ -2,19 +2,18 @@ #include #include "data_021BF67C.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/box_pokemon.h" -#include "overlay097/struct_ov97_02236380_sub1.h" -#include "overlay097/struct_ov97_02236380_sub2.h" -#include "overlay097/struct_ov97_02236380_sub3.h" -#include "overlay097/struct_ov97_02236380_sub4.h" -#include "overlay097/struct_ov97_0223685C.h" +#include "overlay097/box_pokemon_gba.h" #include "unk_02073C2C.h" #include "item.h" #include "overlay097/ov97_02236380.h" #include "overlay097/ov97_022392E4.h" +#include "constants/species.h" +#include "constants/gba/pokemon.h" +#include "constants/gba/species.h" typedef struct { u16 unk_00; @@ -169,174 +168,174 @@ UnkStruct_ov97_0223ED5C Unk_ov97_0223ED5C[] = { }; typedef struct { - UnkStruct_ov97_02236380_sub1 unk_00; - UnkStruct_ov97_02236380_sub2 unk_0C; - UnkStruct_ov97_02236380_sub3 unk_18; - UnkStruct_ov97_02236380_sub4 unk_24; + PokemonGBASubstruct0 unk_00; + PokemonGBASubstruct1 unk_0C; + PokemonGBASubstruct2 unk_18; + PokemonGBASubstruct3 unk_24; } UnkStruct_ov97_02236380; typedef struct { - UnkStruct_ov97_02236380_sub1 unk_00; - UnkStruct_ov97_02236380_sub2 unk_0C; - UnkStruct_ov97_02236380_sub4 unk_18; - UnkStruct_ov97_02236380_sub3 unk_24; + PokemonGBASubstruct0 unk_00; + PokemonGBASubstruct1 unk_0C; + PokemonGBASubstruct3 unk_18; + PokemonGBASubstruct2 unk_24; } UnkStruct_ov97_02236380_1; typedef struct { - UnkStruct_ov97_02236380_sub1 unk_00; - UnkStruct_ov97_02236380_sub3 unk_0C; - UnkStruct_ov97_02236380_sub2 unk_18; - UnkStruct_ov97_02236380_sub4 unk_24; + PokemonGBASubstruct0 unk_00; + PokemonGBASubstruct2 unk_0C; + PokemonGBASubstruct1 unk_18; + PokemonGBASubstruct3 unk_24; } UnkStruct_ov97_02236380_2; typedef struct { - UnkStruct_ov97_02236380_sub1 unk_00; - UnkStruct_ov97_02236380_sub3 unk_0C; - UnkStruct_ov97_02236380_sub4 unk_18; - UnkStruct_ov97_02236380_sub2 unk_24; + PokemonGBASubstruct0 unk_00; + PokemonGBASubstruct2 unk_0C; + PokemonGBASubstruct3 unk_18; + PokemonGBASubstruct1 unk_24; } UnkStruct_ov97_02236380_3; typedef struct { - UnkStruct_ov97_02236380_sub1 unk_00; - UnkStruct_ov97_02236380_sub4 unk_0C; - UnkStruct_ov97_02236380_sub2 unk_18; - UnkStruct_ov97_02236380_sub3 unk_24; + PokemonGBASubstruct0 unk_00; + PokemonGBASubstruct3 unk_0C; + PokemonGBASubstruct1 unk_18; + PokemonGBASubstruct2 unk_24; } UnkStruct_ov97_02236380_4; typedef struct { - UnkStruct_ov97_02236380_sub1 unk_00; - UnkStruct_ov97_02236380_sub4 unk_0C; - UnkStruct_ov97_02236380_sub3 unk_18; - UnkStruct_ov97_02236380_sub2 unk_24; + PokemonGBASubstruct0 unk_00; + PokemonGBASubstruct3 unk_0C; + PokemonGBASubstruct2 unk_18; + PokemonGBASubstruct1 unk_24; } UnkStruct_ov97_02236380_5; typedef struct { - UnkStruct_ov97_02236380_sub2 unk_00; - UnkStruct_ov97_02236380_sub1 unk_0C; - UnkStruct_ov97_02236380_sub3 unk_18; - UnkStruct_ov97_02236380_sub4 unk_24; + PokemonGBASubstruct1 unk_00; + PokemonGBASubstruct0 unk_0C; + PokemonGBASubstruct2 unk_18; + PokemonGBASubstruct3 unk_24; } UnkStruct_ov97_02236380_6; typedef struct { - UnkStruct_ov97_02236380_sub2 unk_00; - UnkStruct_ov97_02236380_sub1 unk_0C; - UnkStruct_ov97_02236380_sub4 unk_18; - UnkStruct_ov97_02236380_sub3 unk_24; + PokemonGBASubstruct1 unk_00; + PokemonGBASubstruct0 unk_0C; + PokemonGBASubstruct3 unk_18; + PokemonGBASubstruct2 unk_24; } UnkStruct_ov97_02236380_7; typedef struct { - UnkStruct_ov97_02236380_sub2 unk_00; - UnkStruct_ov97_02236380_sub3 unk_0C; - UnkStruct_ov97_02236380_sub1 unk_18; - UnkStruct_ov97_02236380_sub4 unk_24; + PokemonGBASubstruct1 unk_00; + PokemonGBASubstruct2 unk_0C; + PokemonGBASubstruct0 unk_18; + PokemonGBASubstruct3 unk_24; } UnkStruct_ov97_02236380_8; typedef struct { - UnkStruct_ov97_02236380_sub2 unk_00; - UnkStruct_ov97_02236380_sub3 unk_0C; - UnkStruct_ov97_02236380_sub4 unk_18; - UnkStruct_ov97_02236380_sub1 unk_24; + PokemonGBASubstruct1 unk_00; + PokemonGBASubstruct2 unk_0C; + PokemonGBASubstruct3 unk_18; + PokemonGBASubstruct0 unk_24; } UnkStruct_ov97_02236380_9; typedef struct { - UnkStruct_ov97_02236380_sub2 unk_00; - UnkStruct_ov97_02236380_sub4 unk_0C; - UnkStruct_ov97_02236380_sub1 unk_18; - UnkStruct_ov97_02236380_sub3 unk_24; + PokemonGBASubstruct1 unk_00; + PokemonGBASubstruct3 unk_0C; + PokemonGBASubstruct0 unk_18; + PokemonGBASubstruct2 unk_24; } UnkStruct_ov97_02236380_10; typedef struct { - UnkStruct_ov97_02236380_sub2 unk_00; - UnkStruct_ov97_02236380_sub4 unk_0C; - UnkStruct_ov97_02236380_sub3 unk_18; - UnkStruct_ov97_02236380_sub1 unk_24; + PokemonGBASubstruct1 unk_00; + PokemonGBASubstruct3 unk_0C; + PokemonGBASubstruct2 unk_18; + PokemonGBASubstruct0 unk_24; } UnkStruct_ov97_02236380_11; typedef struct { - UnkStruct_ov97_02236380_sub3 unk_00; - UnkStruct_ov97_02236380_sub1 unk_0C; - UnkStruct_ov97_02236380_sub2 unk_18; - UnkStruct_ov97_02236380_sub4 unk_24; + PokemonGBASubstruct2 unk_00; + PokemonGBASubstruct0 unk_0C; + PokemonGBASubstruct1 unk_18; + PokemonGBASubstruct3 unk_24; } UnkStruct_ov97_02236380_12; typedef struct { - UnkStruct_ov97_02236380_sub3 unk_00; - UnkStruct_ov97_02236380_sub1 unk_0C; - UnkStruct_ov97_02236380_sub4 unk_18; - UnkStruct_ov97_02236380_sub2 unk_24; + PokemonGBASubstruct2 unk_00; + PokemonGBASubstruct0 unk_0C; + PokemonGBASubstruct3 unk_18; + PokemonGBASubstruct1 unk_24; } UnkStruct_ov97_02236380_13; typedef struct { - UnkStruct_ov97_02236380_sub3 unk_00; - UnkStruct_ov97_02236380_sub2 unk_0C; - UnkStruct_ov97_02236380_sub1 unk_18; - UnkStruct_ov97_02236380_sub4 unk_24; + PokemonGBASubstruct2 unk_00; + PokemonGBASubstruct1 unk_0C; + PokemonGBASubstruct0 unk_18; + PokemonGBASubstruct3 unk_24; } UnkStruct_ov97_02236380_14; typedef struct { - UnkStruct_ov97_02236380_sub3 unk_00; - UnkStruct_ov97_02236380_sub2 unk_0C; - UnkStruct_ov97_02236380_sub4 unk_18; - UnkStruct_ov97_02236380_sub1 unk_24; + PokemonGBASubstruct2 unk_00; + PokemonGBASubstruct1 unk_0C; + PokemonGBASubstruct3 unk_18; + PokemonGBASubstruct0 unk_24; } UnkStruct_ov97_02236380_15; typedef struct { - UnkStruct_ov97_02236380_sub3 unk_00; - UnkStruct_ov97_02236380_sub4 unk_0C; - UnkStruct_ov97_02236380_sub1 unk_18; - UnkStruct_ov97_02236380_sub2 unk_24; + PokemonGBASubstruct2 unk_00; + PokemonGBASubstruct3 unk_0C; + PokemonGBASubstruct0 unk_18; + PokemonGBASubstruct1 unk_24; } UnkStruct_ov97_02236380_16; typedef struct { - UnkStruct_ov97_02236380_sub3 unk_00; - UnkStruct_ov97_02236380_sub4 unk_0C; - UnkStruct_ov97_02236380_sub2 unk_18; - UnkStruct_ov97_02236380_sub1 unk_24; + PokemonGBASubstruct2 unk_00; + PokemonGBASubstruct3 unk_0C; + PokemonGBASubstruct1 unk_18; + PokemonGBASubstruct0 unk_24; } UnkStruct_ov97_02236380_17; typedef struct { - UnkStruct_ov97_02236380_sub4 unk_00; - UnkStruct_ov97_02236380_sub1 unk_0C; - UnkStruct_ov97_02236380_sub2 unk_18; - UnkStruct_ov97_02236380_sub3 unk_24; + PokemonGBASubstruct3 unk_00; + PokemonGBASubstruct0 unk_0C; + PokemonGBASubstruct1 unk_18; + PokemonGBASubstruct2 unk_24; } UnkStruct_ov97_02236380_18; typedef struct { - UnkStruct_ov97_02236380_sub4 unk_00; - UnkStruct_ov97_02236380_sub1 unk_0C; - UnkStruct_ov97_02236380_sub3 unk_18; - UnkStruct_ov97_02236380_sub2 unk_24; + PokemonGBASubstruct3 unk_00; + PokemonGBASubstruct0 unk_0C; + PokemonGBASubstruct2 unk_18; + PokemonGBASubstruct1 unk_24; } UnkStruct_ov97_02236380_19; typedef struct { - UnkStruct_ov97_02236380_sub4 unk_00; - UnkStruct_ov97_02236380_sub2 unk_0C; - UnkStruct_ov97_02236380_sub1 unk_18; - UnkStruct_ov97_02236380_sub3 unk_24; + PokemonGBASubstruct3 unk_00; + PokemonGBASubstruct1 unk_0C; + PokemonGBASubstruct0 unk_18; + PokemonGBASubstruct2 unk_24; } UnkStruct_ov97_02236380_20; typedef struct { - UnkStruct_ov97_02236380_sub4 unk_00; - UnkStruct_ov97_02236380_sub2 unk_0C; - UnkStruct_ov97_02236380_sub3 unk_18; - UnkStruct_ov97_02236380_sub1 unk_24; + PokemonGBASubstruct3 unk_00; + PokemonGBASubstruct1 unk_0C; + PokemonGBASubstruct2 unk_18; + PokemonGBASubstruct0 unk_24; } UnkStruct_ov97_02236380_21; typedef struct { - UnkStruct_ov97_02236380_sub4 unk_00; - UnkStruct_ov97_02236380_sub3 unk_0C; - UnkStruct_ov97_02236380_sub1 unk_18; - UnkStruct_ov97_02236380_sub2 unk_24; + PokemonGBASubstruct3 unk_00; + PokemonGBASubstruct2 unk_0C; + PokemonGBASubstruct0 unk_18; + PokemonGBASubstruct1 unk_24; } UnkStruct_ov97_02236380_22; typedef struct { - UnkStruct_ov97_02236380_sub4 unk_00; - UnkStruct_ov97_02236380_sub3 unk_0C; - UnkStruct_ov97_02236380_sub2 unk_18; - UnkStruct_ov97_02236380_sub1 unk_24; + PokemonGBASubstruct3 unk_00; + PokemonGBASubstruct2 unk_0C; + PokemonGBASubstruct1 unk_18; + PokemonGBASubstruct0 unk_24; } UnkStruct_ov97_02236380_23; -void ov97_02236E90(UnkStruct_ov97_0223685C * param0, UnkStruct_02073C74_sub1 * param1); +void BoxMonGBAToBoxMon(BoxPokemonGBA * param0, BoxPokemon * param1); static u16 Unk_ov97_0223ECA0[] = { 0x10, @@ -435,7 +434,7 @@ static u16 Unk_ov97_0223ECA0[] = { 0x16D }; -static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param2) +static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) { u32 v0 = 0; UnkStruct_ov97_02236380 * v1; @@ -465,7 +464,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param switch (param1 % 24) { case 0: - v1 = (UnkStruct_ov97_02236380 *)param0->unk_20; + v1 = (UnkStruct_ov97_02236380 *)param0->secure; switch (param2) { case 0: @@ -483,7 +482,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 1: - v2 = (UnkStruct_ov97_02236380_1 *)param0->unk_20; + v2 = (UnkStruct_ov97_02236380_1 *)param0->secure; switch (param2) { case 0: @@ -501,7 +500,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 2: - v3 = (UnkStruct_ov97_02236380_2 *)param0->unk_20; + v3 = (UnkStruct_ov97_02236380_2 *)param0->secure; switch (param2) { case 0: @@ -519,7 +518,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 3: - v4 = (UnkStruct_ov97_02236380_3 *)param0->unk_20; + v4 = (UnkStruct_ov97_02236380_3 *)param0->secure; switch (param2) { case 0: @@ -537,7 +536,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 4: - v5 = (UnkStruct_ov97_02236380_4 *)param0->unk_20; + v5 = (UnkStruct_ov97_02236380_4 *)param0->secure; switch (param2) { case 0: @@ -555,7 +554,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 5: - v6 = (UnkStruct_ov97_02236380_5 *)param0->unk_20; + v6 = (UnkStruct_ov97_02236380_5 *)param0->secure; switch (param2) { case 0: @@ -573,7 +572,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 6: - v7 = (UnkStruct_ov97_02236380_6 *)param0->unk_20; + v7 = (UnkStruct_ov97_02236380_6 *)param0->secure; switch (param2) { case 0: @@ -591,7 +590,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 7: - v8 = (UnkStruct_ov97_02236380_7 *)param0->unk_20; + v8 = (UnkStruct_ov97_02236380_7 *)param0->secure; switch (param2) { case 0: @@ -609,7 +608,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 8: - v9 = (UnkStruct_ov97_02236380_8 *)param0->unk_20; + v9 = (UnkStruct_ov97_02236380_8 *)param0->secure; switch (param2) { case 0: @@ -627,7 +626,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 9: - v10 = (UnkStruct_ov97_02236380_9 *)param0->unk_20; + v10 = (UnkStruct_ov97_02236380_9 *)param0->secure; switch (param2) { case 0: @@ -645,7 +644,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 10: - v11 = (UnkStruct_ov97_02236380_10 *)param0->unk_20; + v11 = (UnkStruct_ov97_02236380_10 *)param0->secure; switch (param2) { case 0: @@ -663,7 +662,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 11: - v12 = (UnkStruct_ov97_02236380_11 *)param0->unk_20; + v12 = (UnkStruct_ov97_02236380_11 *)param0->secure; switch (param2) { case 0: @@ -681,7 +680,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 12: - v13 = (UnkStruct_ov97_02236380_12 *)param0->unk_20; + v13 = (UnkStruct_ov97_02236380_12 *)param0->secure; switch (param2) { case 0: @@ -699,7 +698,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 13: - v14 = (UnkStruct_ov97_02236380_13 *)param0->unk_20; + v14 = (UnkStruct_ov97_02236380_13 *)param0->secure; switch (param2) { case 0: @@ -717,7 +716,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 14: - v15 = (UnkStruct_ov97_02236380_14 *)param0->unk_20; + v15 = (UnkStruct_ov97_02236380_14 *)param0->secure; switch (param2) { case 0: @@ -735,7 +734,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 15: - v16 = (UnkStruct_ov97_02236380_15 *)param0->unk_20; + v16 = (UnkStruct_ov97_02236380_15 *)param0->secure; switch (param2) { case 0: @@ -753,7 +752,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 16: - v17 = (UnkStruct_ov97_02236380_16 *)param0->unk_20; + v17 = (UnkStruct_ov97_02236380_16 *)param0->secure; switch (param2) { case 0: @@ -771,7 +770,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 17: - v18 = (UnkStruct_ov97_02236380_17 *)param0->unk_20; + v18 = (UnkStruct_ov97_02236380_17 *)param0->secure; switch (param2) { case 0: @@ -789,7 +788,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 18: - v19 = (UnkStruct_ov97_02236380_18 *)param0->unk_20; + v19 = (UnkStruct_ov97_02236380_18 *)param0->secure; switch (param2) { case 0: @@ -807,7 +806,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 19: - v20 = (UnkStruct_ov97_02236380_19 *)param0->unk_20; + v20 = (UnkStruct_ov97_02236380_19 *)param0->secure; switch (param2) { case 0: @@ -825,7 +824,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 20: - v21 = (UnkStruct_ov97_02236380_20 *)param0->unk_20; + v21 = (UnkStruct_ov97_02236380_20 *)param0->secure; switch (param2) { case 0: @@ -843,7 +842,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 21: - v22 = (UnkStruct_ov97_02236380_21 *)param0->unk_20; + v22 = (UnkStruct_ov97_02236380_21 *)param0->secure; switch (param2) { case 0: @@ -861,7 +860,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 22: - v23 = (UnkStruct_ov97_02236380_22 *)param0->unk_20; + v23 = (UnkStruct_ov97_02236380_22 *)param0->secure; switch (param2) { case 0: @@ -879,7 +878,7 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param } break; case 23: - v24 = (UnkStruct_ov97_02236380_23 *)param0->unk_20; + v24 = (UnkStruct_ov97_02236380_23 *)param0->secure; switch (param2) { case 0: @@ -901,33 +900,33 @@ static u32 ov97_02236380 (UnkStruct_ov97_0223685C * param0, u32 param1, u8 param return v0; } -static void ov97_0223685C (UnkStruct_ov97_0223685C * param0) +static void GBADecryptBoxMon (BoxPokemonGBA * param0) { int v0; u32 * v1; - v1 = (u32 *)¶m0->unk_20; + v1 = (u32 *)¶m0->secure; - for (v0 = 0; v0 < (sizeof(UnkStruct_ov97_02236380_sub1) + sizeof(UnkStruct_ov97_02236380_sub2) + sizeof(UnkStruct_ov97_02236380_sub3) + sizeof(UnkStruct_ov97_02236380_sub4)) / 4; v0++) { - v1[v0] ^= param0->unk_04; - v1[v0] ^= param0->unk_00; + for (v0 = 0; v0 < (sizeof(PokemonGBASubstruct0) + sizeof(PokemonGBASubstruct1) + sizeof(PokemonGBASubstruct2) + sizeof(PokemonGBASubstruct3)) / 4; v0++) { + v1[v0] ^= param0->otId; + v1[v0] ^= param0->personality; } } -static void ov97_0223687C (UnkStruct_ov97_0223685C * param0) +static void GBAEncryptBoxMon (BoxPokemonGBA * param0) { int v0; u32 * v1; - v1 = (u32 *)¶m0->unk_20; + v1 = (u32 *)¶m0->secure; - for (v0 = 0; v0 < (sizeof(UnkStruct_ov97_02236380_sub1) + sizeof(UnkStruct_ov97_02236380_sub2) + sizeof(UnkStruct_ov97_02236380_sub3) + sizeof(UnkStruct_ov97_02236380_sub4)) / 4; v0++) { - v1[v0] ^= param0->unk_00; - v1[v0] ^= param0->unk_04; + for (v0 = 0; v0 < (sizeof(PokemonGBASubstruct0) + sizeof(PokemonGBASubstruct1) + sizeof(PokemonGBASubstruct2) + sizeof(PokemonGBASubstruct3)) / 4; v0++) { + v1[v0] ^= param0->personality; + v1[v0] ^= param0->otId; } } -static u16 ov97_0223689C (UnkStruct_ov97_0223685C * param0) +static u16 ov97_0223689C (BoxPokemonGBA * param0) { int v0; u16 * v1; @@ -936,10 +935,10 @@ static u16 ov97_0223689C (UnkStruct_ov97_0223685C * param0) u16 * v4; u16 v5 = 0; - v1 = (u16 *)ov97_02236380(param0, param0->unk_00, 0); - v2 = (u16 *)ov97_02236380(param0, param0->unk_00, 1); - v3 = (u16 *)ov97_02236380(param0, param0->unk_00, 2); - v4 = (u16 *)ov97_02236380(param0, param0->unk_00, 3); + v1 = (u16 *)ov97_02236380(param0, param0->personality, 0); + v2 = (u16 *)ov97_02236380(param0, param0->personality, 1); + v3 = (u16 *)ov97_02236380(param0, param0->personality, 2); + v4 = (u16 *)ov97_02236380(param0, param0->personality, 3); for (v0 = 0; v0 < 12 / 2; v0++) { v5 += v1[v0]; @@ -960,333 +959,333 @@ static u16 ov97_0223689C (UnkStruct_ov97_0223685C * param0) return v5; } -u32 ov97_02236924 (UnkStruct_ov97_0223685C * param0, int param1, u8 * param2) +u32 GetGBABoxMonData (BoxPokemonGBA *boxMonGBA, int field, u8 * param2) { - int v0; - u32 v1 = 0; - UnkStruct_ov97_02236380_sub1 * v2 = 0; - UnkStruct_ov97_02236380_sub2 * v3 = 0; - UnkStruct_ov97_02236380_sub3 * v4 = 0; - UnkStruct_ov97_02236380_sub4 * v5 = 0; - u16 v6; - u16 * v7; + u32 retVal = 0; + PokemonGBASubstruct0 * substruct0 = 0; + PokemonGBASubstruct1 * substruct1 = 0; + PokemonGBASubstruct2 * substruct2 = 0; + PokemonGBASubstruct3 * substruct3 = 0; + u16 checksum; - if (param1 > 10) { - v2 = (UnkStruct_ov97_02236380_sub1 *)ov97_02236380(param0, param0->unk_00, 0); - v3 = (UnkStruct_ov97_02236380_sub2 *)ov97_02236380(param0, param0->unk_00, 1); - v4 = (UnkStruct_ov97_02236380_sub3 *)ov97_02236380(param0, param0->unk_00, 2); - v5 = (UnkStruct_ov97_02236380_sub4 *)ov97_02236380(param0, param0->unk_00, 3); + if (field > GBA_MON_DATA_ENCRYPT_SEPARATOR) { + substruct0 = (PokemonGBASubstruct0 *)ov97_02236380(boxMonGBA, boxMonGBA->personality, 0); + substruct1 = (PokemonGBASubstruct1 *)ov97_02236380(boxMonGBA, boxMonGBA->personality, 1); + substruct2 = (PokemonGBASubstruct2 *)ov97_02236380(boxMonGBA, boxMonGBA->personality, 2); + substruct3 = (PokemonGBASubstruct3 *)ov97_02236380(boxMonGBA, boxMonGBA->personality, 3); - ov97_0223685C(param0); - v6 = ov97_0223689C(param0); + GBADecryptBoxMon(boxMonGBA); + checksum = ov97_0223689C(boxMonGBA); - if (v6 != param0->unk_1C) { - param0->unk_13_0 = 1; - param0->unk_13_2 = 1; - v5->unk_04_30 = 1; + if (checksum != boxMonGBA->checksum) { + boxMonGBA->isBadEgg = TRUE; + boxMonGBA->isEgg = TRUE; + substruct3->isEgg = TRUE; } } - switch (param1) { - case 0: - v1 = param0->unk_00; + switch (field) { + case GBA_MON_DATA_PERSONALITY: + retVal = boxMonGBA->personality; break; - case 1: - v1 = param0->unk_04; + case GBA_MON_DATA_OT_ID: + retVal = boxMonGBA->otId; break; - case 2: - if (param0->unk_13_0) { - v1 = 0; - } else { - for (v1 = 0; v1 < 10; v1++) { - param2[v1] = param0->unk_08[v1]; + case GBA_MON_DATA_NICKNAME: + if (boxMonGBA->isBadEgg) + retVal = 0; + else { + for (retVal = 0; retVal < 10; retVal++) { + param2[retVal] = boxMonGBA->nickname[retVal]; } } - param2[v1] = 0xff; + param2[retVal] = 0xff; break; - case 3: - v1 = param0->unk_12; + case GBA_MON_DATA_LANGUAGE: + retVal = boxMonGBA->language; break; - case 4: - v1 = param0->unk_13_0; + case GBA_MON_DATA_SANITY_IS_BAD_EGG: + retVal = boxMonGBA->isBadEgg; break; - case 5: - v1 = param0->unk_13_1; + case GBA_MON_DATA_SANITY_HAS_SPECIES: + retVal = boxMonGBA->hasSpecies; break; - case 6: - v1 = param0->unk_13_2; + case GBA_MON_DATA_SANITY_IS_EGG: + retVal = boxMonGBA->isEgg; break; - case 7: - for (v1 = 0; v1 < 7; v1++) { - param2[v1] = param0->unk_14[v1]; - } + case GBA_MON_DATA_OT_NAME: + for (retVal = 0; retVal < 7; retVal++) + param2[retVal] = boxMonGBA->otName[retVal]; - param2[v1] = 0xffff; + param2[retVal] = 0xffff; break; - case 8: - v1 = param0->unk_1B; + case GBA_MON_DATA_MARKINGS: + retVal = boxMonGBA->markings; break; - case 9: - v1 = param0->unk_1C; + case GBA_MON_DATA_CHECKSUM: + retVal = boxMonGBA->checksum; break; - case 10: - v1 = param0->unk_1E; + case GBA_MON_DATA_ENCRYPT_SEPARATOR: + retVal = boxMonGBA->unknown; break; - case 11: - if (param0->unk_13_0) { - v1 = 412; - } else { - v1 = v2->unk_00; - } + case GBA_MON_DATA_SPECIES: + if (boxMonGBA->isBadEgg) + retVal = GBA_SPECIES_EGG; + else + retVal = substruct0->species; break; - case 12: - v1 = v2->unk_02; + case GBA_MON_DATA_HELD_ITEM: + retVal = substruct0->heldItem; break; - case 25: - v1 = v2->unk_04; + case GBA_MON_DATA_EXP: + retVal = substruct0->experience; break; - case 21: - v1 = v2->unk_08; + case GBA_MON_DATA_PP_BONUSES: + retVal = substruct0->ppBonuses; break; - case 32: - v1 = v2->unk_09; + case GBA_MON_DATA_FRIENDSHIP: + retVal = substruct0->friendship; break; - case 13: - case 14: - case 15: - case 16: - v1 = v3->unk_00[param1 - 13]; + case GBA_MON_DATA_MOVE1: + case GBA_MON_DATA_MOVE2: + case GBA_MON_DATA_MOVE3: + case GBA_MON_DATA_MOVE4: + retVal = substruct1->moves[field - GBA_MON_DATA_MOVE1]; break; - case 17: - case 18: - case 19: - case 20: - v1 = v3->unk_08[param1 - 17]; + case GBA_MON_DATA_PP1: + case GBA_MON_DATA_PP2: + case GBA_MON_DATA_PP3: + case GBA_MON_DATA_PP4: + retVal = substruct1->pp[field - GBA_MON_DATA_PP1]; break; - case 26: - v1 = v4->unk_00; + case GBA_MON_DATA_HP_EV: + retVal = substruct2->hpEV; break; - case 27: - v1 = v4->unk_01; + case GBA_MON_DATA_ATK_EV: + retVal = substruct2->attackEV; break; - case 28: - v1 = v4->unk_02; + case GBA_MON_DATA_DEF_EV: + retVal = substruct2->defenseEV; break; - case 29: - v1 = v4->unk_03; + case GBA_MON_DATA_SPEED_EV: + retVal = substruct2->speedEV; break; - case 30: - v1 = v4->unk_04; + case GBA_MON_DATA_SPATK_EV: + retVal = substruct2->spAttackEV; break; - case 31: - v1 = v4->unk_05; + case GBA_MON_DATA_SPDEF_EV: + retVal = substruct2->spDefenseEV; break; - case 22: - v1 = v4->unk_06; + case GBA_MON_DATA_COOL: + retVal = substruct2->cool; break; - case 23: - v1 = v4->unk_07; + case GBA_MON_DATA_BEAUTY: + retVal = substruct2->beauty; break; - case 24: - v1 = v4->unk_08; + case GBA_MON_DATA_CUTE: + retVal = substruct2->cute; break; - case 33: - v1 = v4->unk_09; + case GBA_MON_DATA_SMART: + retVal = substruct2->smart; break; - case 47: - v1 = v4->unk_0A; + case GBA_MON_DATA_TOUGH: + retVal = substruct2->tough; break; - case 48: - v1 = v4->unk_0B; + case GBA_MON_DATA_SHEEN: + retVal = substruct2->sheen; break; - case 34: - v1 = v5->unk_00_0; + case GBA_MON_DATA_POKERUS: + retVal = substruct3->pokerus; break; - case 35: - v1 = v5->unk_00_8; + case GBA_MON_DATA_MET_LOCATION: + retVal = substruct3->metLocation; break; - case 36: - v1 = v5->unk_00_16; + case GBA_MON_DATA_MET_LEVEL: + retVal = substruct3->metLevel; break; - case 37: - v1 = v5->unk_00_23; + case GBA_MON_DATA_MET_GAME: + retVal = substruct3->metGame; break; - case 38: - v1 = v5->unk_00_27; + case GBA_MON_DATA_POKEBALL: + retVal = substruct3->pokeball; break; - case 49: - v1 = v5->unk_00_31; + case GBA_MON_DATA_OT_GENDER: + retVal = substruct3->otGender; break; - case 39: - v1 = v5->unk_04_0; + case GBA_MON_DATA_HP_IV: + retVal = substruct3->hpIV; break; - case 40: - v1 = v5->unk_04_5; + case GBA_MON_DATA_ATK_IV: + retVal = substruct3->attackIV; break; - case 41: - v1 = v5->unk_04_10; + case GBA_MON_DATA_DEF_IV: + retVal = substruct3->defenseIV; break; - case 42: - v1 = v5->unk_04_15; + case GBA_MON_DATA_SPEED_IV: + retVal = substruct3->speedIV; break; - case 43: - v1 = v5->unk_04_20; + case GBA_MON_DATA_SPATK_IV: + retVal = substruct3->spAttackIV; break; - case 44: - v1 = v5->unk_04_25; + case GBA_MON_DATA_SPDEF_IV: + retVal = substruct3->spDefenseIV; break; - case 45: - v1 = v5->unk_04_30; + case GBA_MON_DATA_IS_EGG: + retVal = substruct3->isEgg; break; - case 46: - v1 = v5->unk_04_31; + case GBA_MON_DATA_ABILITY_NUM: + retVal = substruct3->abilityNum; break; - case 50: - v1 = v5->unk_08_0; + case GBA_MON_DATA_COOL_RIBBON: + retVal = substruct3->coolRibbon; break; - case 51: - v1 = v5->unk_08_3; + case GBA_MON_DATA_BEAUTY_RIBBON: + retVal = substruct3->beautyRibbon; break; - case 52: - v1 = v5->unk_08_6; + case GBA_MON_DATA_CUTE_RIBBON: + retVal = substruct3->cuteRibbon; break; - case 53: - v1 = v5->unk_08_9; + case GBA_MON_DATA_SMART_RIBBON: + retVal = substruct3->smartRibbon; break; - case 54: - v1 = v5->unk_08_12; + case GBA_MON_DATA_TOUGH_RIBBON: + retVal = substruct3->toughRibbon; break; - case 67: - v1 = v5->unk_08_15; + case GBA_MON_DATA_CHAMPION_RIBBON: + retVal = substruct3->championRibbon; break; - case 68: - v1 = v5->unk_08_16; + case GBA_MON_DATA_WINNING_RIBBON: + retVal = substruct3->winningRibbon; break; - case 69: - v1 = v5->unk_08_17; + case GBA_MON_DATA_VICTORY_RIBBON: + retVal = substruct3->victoryRibbon; break; - case 70: - v1 = v5->unk_08_18; + case GBA_MON_DATA_ARTIST_RIBBON: + retVal = substruct3->artistRibbon; break; - case 71: - v1 = v5->unk_08_19; + case GBA_MON_DATA_EFFORT_RIBBON: + retVal = substruct3->effortRibbon; break; - case 72: - v1 = v5->unk_08_20; + case GBA_MON_DATA_MARINE_RIBBON: + retVal = substruct3->marineRibbon; break; - case 73: - v1 = v5->unk_08_21; + case GBA_MON_DATA_LAND_RIBBON: + retVal = substruct3->landRibbon; break; - case 74: - v1 = v5->unk_08_22; + case GBA_MON_DATA_SKY_RIBBON: + retVal = substruct3->skyRibbon; break; - case 75: - v1 = v5->unk_08_23; + case GBA_MON_DATA_COUNTRY_RIBBON: + retVal = substruct3->countryRibbon; break; - case 76: - v1 = v5->unk_08_24; + case GBA_MON_DATA_NATIONAL_RIBBON: + retVal = substruct3->nationalRibbon; break; - case 77: - v1 = v5->unk_08_25; + case GBA_MON_DATA_EARTH_RIBBON: + retVal = substruct3->earthRibbon; break; - case 78: - v1 = v5->unk_08_26; + case GBA_MON_DATA_WORLD_RIBBON: + retVal = substruct3->worldRibbon; break; - case 79: - v1 = v5->unk_08_27; + case GBA_MON_DATA_UNUSED_RIBBONS: + retVal = substruct3->unusedRibbons; break; - case 80: - v1 = v5->unk_08_31; + case GBA_MON_DATA_MODERN_FATEFUL_ENCOUNTER: + retVal = substruct3->modernFatefulEncounter; break; - case 65: - v1 = v2->unk_00; + case GBA_MON_DATA_SPECIES_OR_EGG: + retVal = substruct0->species; - if (v1 == 0) { + if (retVal == SPECIES_NONE) break; - } - if ((v5->unk_04_30) || (param0->unk_13_0)) { - v1 = 412; - } + if (substruct3->isEgg || boxMonGBA->isBadEgg) + retVal = GBA_SPECIES_EGG; + break; - case 66: - v1 = (v5->unk_04_0 << 0) | (v5->unk_04_5 << 5) | (v5->unk_04_10 << 10) | (v5->unk_04_15 << 15) | (v5->unk_04_20 << 20) | (v5->unk_04_25 << 25); + case GBA_MON_DATA_IVS: + retVal = substruct3->hpIV + | (substruct3->attackIV << 5) + | (substruct3->defenseIV << 10) + | (substruct3->speedIV << 15) + | (substruct3->spAttackIV << 20) + | (substruct3->spDefenseIV << 25); break; } - if (param1 > 10) { - ov97_0223687C(param0); + if (field > GBA_MON_DATA_ENCRYPT_SEPARATOR) { + GBAEncryptBoxMon(boxMonGBA); } - return v1; + return retVal; } -void ov97_02236CA4 (UnkStruct_ov97_0223685C * param0, int param1, const u8 * param2) +void SetGBABoxMonData (BoxPokemonGBA * boxMon, int field, const u8 * dataArg) { int v0; u32 v1; - UnkStruct_ov97_02236380_sub1 * v2 = 0; - UnkStruct_ov97_02236380_sub2 * v3 = 0; - UnkStruct_ov97_02236380_sub3 * v4 = 0; - UnkStruct_ov97_02236380_sub4 * v5 = 0; + PokemonGBASubstruct0 * v2 = 0; + PokemonGBASubstruct1 * v3 = 0; + PokemonGBASubstruct2 * v4 = 0; + PokemonGBASubstruct3 * v5 = 0; u16 v6; - if (param1 > 10) { - v2 = (UnkStruct_ov97_02236380_sub1 *)ov97_02236380(param0, param0->unk_00, 0); - v3 = (UnkStruct_ov97_02236380_sub2 *)ov97_02236380(param0, param0->unk_00, 1); - v4 = (UnkStruct_ov97_02236380_sub3 *)ov97_02236380(param0, param0->unk_00, 2); - v5 = (UnkStruct_ov97_02236380_sub4 *)ov97_02236380(param0, param0->unk_00, 3); + if (field > GBA_MON_DATA_ENCRYPT_SEPARATOR) { + v2 = (PokemonGBASubstruct0 *)ov97_02236380(boxMon, boxMon->personality, 0); + v3 = (PokemonGBASubstruct1 *)ov97_02236380(boxMon, boxMon->personality, 1); + v4 = (PokemonGBASubstruct2 *)ov97_02236380(boxMon, boxMon->personality, 2); + v5 = (PokemonGBASubstruct3 *)ov97_02236380(boxMon, boxMon->personality, 3); - ov97_0223685C(param0); - v6 = ov97_0223689C(param0); + GBADecryptBoxMon(boxMon); + v6 = ov97_0223689C(boxMon); - if (v6 != param0->unk_1C) { - param0->unk_13_0 = 1; - param0->unk_13_2 = 1; - v5->unk_04_30 = 1; - ov97_0223687C(param0); + if (v6 != boxMon->checksum) { + boxMon->isBadEgg = 1; + boxMon->isEgg = 1; + v5->isEgg = 1; + GBAEncryptBoxMon(boxMon); return; } } - switch (param1) { - case 2: + switch (field) { + case GBA_MON_DATA_NICKNAME: for (v0 = 0; v0 < 10; v0++) { - param0->unk_08[v0] = param2[v0]; + boxMon->nickname[v0] = dataArg[v0]; } break; - case 3: - param0->unk_12 = param2[0]; + case GBA_MON_DATA_LANGUAGE: + boxMon->language = dataArg[0]; break; - case 4: - param0->unk_13_0 = param2[0]; + case GBA_MON_DATA_SANITY_IS_BAD_EGG: + boxMon->isBadEgg = dataArg[0]; break; - case 5: - param0->unk_13_1 = param2[0]; + case GBA_MON_DATA_SANITY_HAS_SPECIES: + boxMon->hasSpecies = dataArg[0]; break; - case 6: - param0->unk_13_2 = param2[0]; + case GBA_MON_DATA_SANITY_IS_EGG: + boxMon->isEgg = dataArg[0]; break; - case 7: + case GBA_MON_DATA_OT_NAME: for (v0 = 0; v0 < 7; v0++) { - param0->unk_14[v0] = param2[v0]; + boxMon->otName[v0] = dataArg[v0]; } break; - case 11: - v2->unk_00 = param2[0] + (param2[1] << 8); + case GBA_MON_DATA_SPECIES: + v2->species = dataArg[0] + (dataArg[1] << 8); - if (v2->unk_00) { - param0->unk_13_1 = 1; + if (v2->species) { + boxMon->hasSpecies = 1; } else { - param0->unk_13_1 = 0; + boxMon->hasSpecies = 0; } break; } - if (param1 > 10) { - param0->unk_1C = ov97_0223689C(param0); - ov97_0223687C(param0); + if (field > GBA_MON_DATA_ENCRYPT_SEPARATOR) { + boxMon->checksum = ov97_0223689C(boxMon); + GBAEncryptBoxMon(boxMon); } } @@ -1307,26 +1306,26 @@ int ov97_02236DD0 (int param0) return param0; } -u32 ov97_02236E00 (UnkStruct_ov97_0223685C * param0) +u32 ov97_02236E00 (BoxPokemonGBA * param0) { int v0; u32 v1; - v0 = ov97_02236DD0(ov97_02236924(param0, 11, 0)); - v1 = ov97_02236924(param0, 25, 0); + v0 = ov97_02236DD0(GetGBABoxMonData(param0, 11, 0)); + v1 = GetGBABoxMonData(param0, 25, 0); return sub_02075B78(v0, v1); } -static int ov97_02236E28 (UnkStruct_ov97_0223685C * param0, UnkStruct_02073C74_sub1 * param1) +static int ov97_02236E28 (BoxPokemonGBA * param0, BoxPokemon * param1) { int v0; int v1; u16 v2; int v3; - v2 = sub_02074570(param1, 5, NULL); - v3 = ov97_02236924(param0, 46, NULL); + v2 = sub_02074570(param1, MON_DATA_SPECIES, NULL); + v3 = GetGBABoxMonData(param0, 46, NULL); v1 = sub_020759F0(v2, 25); if (v1) { @@ -1347,7 +1346,7 @@ static int ov97_02236E28 (UnkStruct_ov97_0223685C * param0, UnkStruct_02073C74_s return v1; } -void ov97_02236E90 (UnkStruct_ov97_0223685C * param0, UnkStruct_02073C74_sub1 * param1) +void BoxMonGBAToBoxMon (BoxPokemonGBA * param0, BoxPokemon * param1) { BOOL v0; u32 v1; @@ -1356,214 +1355,214 @@ void ov97_02236E90 (UnkStruct_ov97_0223685C * param0, UnkStruct_02073C74_sub1 * u8 v5[10 + 1]; u16 v6[12]; - sub_02073C54(param1); + ZeroBoxMonData(param1); v0 = sub_02073D20(param1); - v1 = ov97_02236924(param0, 0, NULL); + v1 = GetGBABoxMonData(param0, 0, NULL); - sub_02074C60(param1, 0, (u8 *)&v1); + SetBoxMonData(param1, 0, (u8 *)&v1); - v1 = ov97_02236924(param0, 11, NULL); + v1 = GetGBABoxMonData(param0, 11, NULL); v1 = ov97_02236DD0(v1); - sub_02074C60(param1, 5, (u8 *)&v1); + SetBoxMonData(param1, 5, (u8 *)&v1); - v1 = ov97_02236924(param0, 12, NULL); + v1 = GetGBABoxMonData(param0, 12, NULL); if (v1) { v1 = sub_0207CF10(v1); } - sub_02074C60(param1, 6, (u8 *)&v1); + SetBoxMonData(param1, 6, (u8 *)&v1); - v1 = ov97_02236924(param0, 1, NULL); - sub_02074C60(param1, 7, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 1, NULL); + SetBoxMonData(param1, 7, (u8 *)&v1); - v1 = ov97_02236924(param0, 25, NULL); - sub_02074C60(param1, 8, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 25, NULL); + SetBoxMonData(param1, 8, (u8 *)&v1); v1 = 70; - sub_02074C60(param1, 9, (u8 *)&v1); + SetBoxMonData(param1, 9, (u8 *)&v1); v1 = ov97_02236E28(param0, param1); - sub_02074C60(param1, 10, (u8 *)&v1); + SetBoxMonData(param1, 10, (u8 *)&v1); - v1 = ov97_02236924(param0, 8, NULL); - sub_02074C60(param1, 11, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 8, NULL); + SetBoxMonData(param1, 11, (u8 *)&v1); - v4 = ov97_02236924(param0, 3, NULL); - sub_02074C60(param1, 12, (u8 *)&v4); + v4 = GetGBABoxMonData(param0, 3, NULL); + SetBoxMonData(param1, 12, (u8 *)&v4); - v1 = ov97_02236924(param0, 26, NULL); - sub_02074C60(param1, 13, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 26, NULL); + SetBoxMonData(param1, 13, (u8 *)&v1); - v1 = ov97_02236924(param0, 27, NULL); - sub_02074C60(param1, 14, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 27, NULL); + SetBoxMonData(param1, 14, (u8 *)&v1); - v1 = ov97_02236924(param0, 28, NULL); - sub_02074C60(param1, 15, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 28, NULL); + SetBoxMonData(param1, 15, (u8 *)&v1); - v1 = ov97_02236924(param0, 29, NULL); - sub_02074C60(param1, 16, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 29, NULL); + SetBoxMonData(param1, 16, (u8 *)&v1); - v1 = ov97_02236924(param0, 30, NULL); - sub_02074C60(param1, 17, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 30, NULL); + SetBoxMonData(param1, 17, (u8 *)&v1); - v1 = ov97_02236924(param0, 31, NULL); - sub_02074C60(param1, 18, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 31, NULL); + SetBoxMonData(param1, 18, (u8 *)&v1); - v1 = ov97_02236924(param0, 22, NULL); - sub_02074C60(param1, 19, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 22, NULL); + SetBoxMonData(param1, 19, (u8 *)&v1); - v1 = ov97_02236924(param0, 23, NULL); - sub_02074C60(param1, 20, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 23, NULL); + SetBoxMonData(param1, 20, (u8 *)&v1); - v1 = ov97_02236924(param0, 24, NULL); - sub_02074C60(param1, 21, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 24, NULL); + SetBoxMonData(param1, 21, (u8 *)&v1); - v1 = ov97_02236924(param0, 33, NULL); - sub_02074C60(param1, 22, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 33, NULL); + SetBoxMonData(param1, 22, (u8 *)&v1); - v1 = ov97_02236924(param0, 47, NULL); - sub_02074C60(param1, 23, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 47, NULL); + SetBoxMonData(param1, 23, (u8 *)&v1); - v1 = ov97_02236924(param0, 48, NULL); - sub_02074C60(param1, 24, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 48, NULL); + SetBoxMonData(param1, 24, (u8 *)&v1); for (v2 = 0; v2 < 4; v2++) { - v1 = ov97_02236924(param0, 13 + v2, NULL); + v1 = GetGBABoxMonData(param0, 13 + v2, NULL); if (v1 > 354) { (void)0; } - sub_02074C60(param1, 54 + v2, (u8 *)&v1); + SetBoxMonData(param1, 54 + v2, (u8 *)&v1); - v1 = ov97_02236924(param0, 21, NULL); + v1 = GetGBABoxMonData(param0, 21, NULL); v1 = (v1 & (0x3 << (v2 * 2))) >> (v2 * 2); - sub_02074C60(param1, 62 + v2, (u8 *)&v1); + SetBoxMonData(param1, 62 + v2, (u8 *)&v1); v1 = sub_02074570(param1, 66 + v2, NULL); - sub_02074C60(param1, 58 + v2, (u8 *)&v1); + SetBoxMonData(param1, 58 + v2, (u8 *)&v1); } - v1 = ov97_02236924(param0, 39, NULL); - sub_02074C60(param1, 70, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 39, NULL); + SetBoxMonData(param1, 70, (u8 *)&v1); - v1 = ov97_02236924(param0, 40, NULL); - sub_02074C60(param1, 71, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 40, NULL); + SetBoxMonData(param1, 71, (u8 *)&v1); - v1 = ov97_02236924(param0, 41, NULL); - sub_02074C60(param1, 72, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 41, NULL); + SetBoxMonData(param1, 72, (u8 *)&v1); - v1 = ov97_02236924(param0, 42, NULL); - sub_02074C60(param1, 73, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 42, NULL); + SetBoxMonData(param1, 73, (u8 *)&v1); - v1 = ov97_02236924(param0, 43, NULL); - sub_02074C60(param1, 74, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 43, NULL); + SetBoxMonData(param1, 74, (u8 *)&v1); - v1 = ov97_02236924(param0, 44, NULL); - sub_02074C60(param1, 75, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 44, NULL); + SetBoxMonData(param1, 75, (u8 *)&v1); - v1 = ov97_02236924(param0, 45, NULL); - sub_02074C60(param1, 76, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 45, NULL); + SetBoxMonData(param1, 76, (u8 *)&v1); - v3 = ov97_02236924(param0, 50, NULL); + v3 = GetGBABoxMonData(param0, 50, NULL); if (v3 <= 4) { for (v2 = 0; v2 < v3; v2++) { v1 = 1; - sub_02074C60(param1, 78 + v2, (u8 *)&v1); + SetBoxMonData(param1, 78 + v2, (u8 *)&v1); } } - v3 = ov97_02236924(param0, 51, NULL); + v3 = GetGBABoxMonData(param0, 51, NULL); if (v3 <= 4) { for (v2 = 0; v2 < v3; v2++) { v1 = 1; - sub_02074C60(param1, 82 + v2, (u8 *)&v1); + SetBoxMonData(param1, 82 + v2, (u8 *)&v1); } } - v3 = ov97_02236924(param0, 52, NULL); + v3 = GetGBABoxMonData(param0, 52, NULL); if (v3 <= 4) { for (v2 = 0; v2 < v3; v2++) { v1 = 1; - sub_02074C60(param1, 86 + v2, (u8 *)&v1); + SetBoxMonData(param1, 86 + v2, (u8 *)&v1); } } - v3 = ov97_02236924(param0, 53, NULL); + v3 = GetGBABoxMonData(param0, 53, NULL); if (v3 <= 4) { for (v2 = 0; v2 < v3; v2++) { v1 = 1; - sub_02074C60(param1, 90 + v2, (u8 *)&v1); + SetBoxMonData(param1, 90 + v2, (u8 *)&v1); } } - v3 = ov97_02236924(param0, 54, NULL); + v3 = GetGBABoxMonData(param0, 54, NULL); if (v3 <= 4) { for (v2 = 0; v2 < v3; v2++) { v1 = 1; - sub_02074C60(param1, 94 + v2, (u8 *)&v1); + SetBoxMonData(param1, 94 + v2, (u8 *)&v1); } } - v1 = ov97_02236924(param0, 67, NULL); - sub_02074C60(param1, 98, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 67, NULL); + SetBoxMonData(param1, 98, (u8 *)&v1); - v1 = ov97_02236924(param0, 68, NULL); - sub_02074C60(param1, 99, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 68, NULL); + SetBoxMonData(param1, 99, (u8 *)&v1); - v1 = ov97_02236924(param0, 69, NULL); - sub_02074C60(param1, 100, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 69, NULL); + SetBoxMonData(param1, 100, (u8 *)&v1); - v1 = ov97_02236924(param0, 70, NULL); - sub_02074C60(param1, 101, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 70, NULL); + SetBoxMonData(param1, 101, (u8 *)&v1); - v1 = ov97_02236924(param0, 71, NULL); - sub_02074C60(param1, 102, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 71, NULL); + SetBoxMonData(param1, 102, (u8 *)&v1); - v1 = ov97_02236924(param0, 72, NULL); - sub_02074C60(param1, 103, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 72, NULL); + SetBoxMonData(param1, 103, (u8 *)&v1); - v1 = ov97_02236924(param0, 73, NULL); - sub_02074C60(param1, 104, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 73, NULL); + SetBoxMonData(param1, 104, (u8 *)&v1); - v1 = ov97_02236924(param0, 74, NULL); - sub_02074C60(param1, 105, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 74, NULL); + SetBoxMonData(param1, 105, (u8 *)&v1); - v1 = ov97_02236924(param0, 75, NULL); - sub_02074C60(param1, 106, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 75, NULL); + SetBoxMonData(param1, 106, (u8 *)&v1); - v1 = ov97_02236924(param0, 76, NULL); - sub_02074C60(param1, 107, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 76, NULL); + SetBoxMonData(param1, 107, (u8 *)&v1); - v1 = ov97_02236924(param0, 77, NULL); - sub_02074C60(param1, 108, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 77, NULL); + SetBoxMonData(param1, 108, (u8 *)&v1); - v1 = ov97_02236924(param0, 78, NULL); - sub_02074C60(param1, 109, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 78, NULL); + SetBoxMonData(param1, 109, (u8 *)&v1); - v1 = ov97_02236924(param0, 80, NULL); - sub_02074C60(param1, 110, (u8 *)&v1); + v1 = GetGBABoxMonData(param0, 80, NULL); + SetBoxMonData(param1, 110, (u8 *)&v1); v1 = sub_02075D74(param1); - sub_02074C60(param1, 111, (u8 *)&v1); + SetBoxMonData(param1, 111, (u8 *)&v1); - if (sub_02074570(param1, 5, NULL) == 201) { - v1 = ov97_02236924(param0, 0, NULL); + if (sub_02074570(param1, MON_DATA_SPECIES, NULL) == 201) { + v1 = GetGBABoxMonData(param0, 0, NULL); v1 = (((v1 & 0x3000000) >> 18) | ((v1 & 0x30000) >> 12) | ((v1 & 0x300) >> 6) | (v1 & 0x3)) % 28; - sub_02074C60(param1, 112, (u8 *)&v1); + SetBoxMonData(param1, 112, (u8 *)&v1); } - if (sub_02074570(param1, 5, NULL) == 386) { + if (sub_02074570(param1, MON_DATA_SPECIES, NULL) == 386) { switch (Unk_021BF67C.unk_66) { default: case 2: @@ -1581,40 +1580,40 @@ void ov97_02236E90 (UnkStruct_ov97_0223685C * param0, UnkStruct_02073C74_sub1 * break; } - sub_02074C60(param1, 112, (u8 *)&v1); + SetBoxMonData(param1, 112, (u8 *)&v1); } - ov97_02236924(param0, 2, &v5[0]); + GetGBABoxMonData(param0, 2, &v5[0]); ov97_0223936C(&v5[0], &v6[0], 12, v4); - sub_02074C60(param1, 118, &v6[0]); + SetBoxMonData(param1, 118, &v6[0]); - if (ov97_02236924(param0, 3, NULL) != Unk_020E4C44) { + if (GetGBABoxMonData(param0, 3, NULL) != Unk_020E4C44) { v1 = 1; - sub_02074C60(param1, 77, &v1); + SetBoxMonData(param1, 77, &v1); } - v1 = ov97_02236924(param0, 37, NULL); - sub_02074C60(param1, 122, &v1); + v1 = GetGBABoxMonData(param0, 37, NULL); + SetBoxMonData(param1, 122, &v1); - ov97_02236924(param0, 7, &v5[0]); + GetGBABoxMonData(param0, 7, &v5[0]); ov97_0223936C(&v5[0], &v6[0], 8, v4); - sub_02074C60(param1, 144, &v6[0]); + SetBoxMonData(param1, 144, &v6[0]); - v1 = ov97_02236924(param0, 35, NULL); - sub_02074C60(param1, 153, &v1); + v1 = GetGBABoxMonData(param0, 35, NULL); + SetBoxMonData(param1, 153, &v1); - v1 = ov97_02236924(param0, 34, NULL); - sub_02074C60(param1, 154, &v1); + v1 = GetGBABoxMonData(param0, 34, NULL); + SetBoxMonData(param1, 154, &v1); - v1 = ov97_02236924(param0, 38, NULL); - sub_02074C60(param1, 155, &v1); + v1 = GetGBABoxMonData(param0, 38, NULL); + SetBoxMonData(param1, 155, &v1); - v1 = ov97_02236924(param0, 36, NULL); - sub_02074C60(param1, 156, &v1); + v1 = GetGBABoxMonData(param0, 36, NULL); + SetBoxMonData(param1, 156, &v1); - v1 = ov97_02236924(param0, 49, NULL); - sub_02074C60(param1, 157, &v1); + v1 = GetGBABoxMonData(param0, 49, NULL); + SetBoxMonData(param1, 157, &v1); sub_02073D48(param1, v0); } diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c index 328427c371..665155deec 100644 --- a/src/overlay097/ov97_02237694.c +++ b/src/overlay097/ov97_02237694.c @@ -11,7 +11,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_021C0794_decl.h" #include "struct_defs/struct_02008A90.h" @@ -573,7 +573,7 @@ static int ov97_02237EA8 (int param0) return 0; } -static void ov97_02237EF8 (UnkStruct_02022550 * param0, UnkStruct_02073C74 * param1, int param2, int param3, u8 * param4, UnkStruct_02008A90 * param5) +static void ov97_02237EF8 (UnkStruct_02022550 * param0, Pokemon * param1, int param2, int param3, u8 * param4, UnkStruct_02008A90 * param5) { int v0, v1; u32 v2; @@ -584,7 +584,7 @@ static void ov97_02237EF8 (UnkStruct_02022550 * param0, UnkStruct_02073C74 * par sub_02075FB4(param5, param2, v0, 2, v1, param3, 0); - v2 = sub_02074470(param1, 0, NULL); + v2 = GetMonData(param1, MON_DATA_PERSONALITY, NULL); sub_020136A4(param5->unk_00, param5->unk_02, v3->unk_08, 0, 0, 10, 10, param4, v2, 0, 2, param2); DC_FlushRange(param4, 0x20 * 10 * 10); @@ -614,18 +614,18 @@ static void ov97_02237FB4 (UnkStruct_ov97_0223F550 * param0, int param1, UnkStru static void ov97_02237FF4 (UnkStruct_ov97_0223F550 * param0, int param1, UnkStruct_0202DF40 * param2) { - UnkStruct_02073C74 * v0; + Pokemon * v0; ov97_02237B0C(54, 10, 0, 11, 12, 1); ov97_02237C80((0 * FX32_ONE), (256 * FX32_ONE)); param0->unk_26C = ov97_02237D14(1, param0->unk_26C, HW_LCD_WIDTH / 2, 0, 1); - v0 = (UnkStruct_02073C74 *)¶m2->unk_04.val1.unk_04; + v0 = (Pokemon *)¶m2->unk_04.val1.unk_04; switch (param1) { case 1: case 13: - ov97_02237EF8(param0->unk_26C, v0, sub_02074470(v0, 5, 0), sub_02074470(v0, 112, 0), param0->unk_278, ¶m0->unk_EF8); + ov97_02237EF8(param0->unk_26C, v0, GetMonData(v0, MON_DATA_SPECIES, 0), GetMonData(v0, MON_DATA_FORM, 0), param0->unk_278, ¶m0->unk_EF8); break; case 2: ov97_02237EF8(param0->unk_26C, v0, 494, 0, param0->unk_278, ¶m0->unk_EF8); diff --git a/src/overlay102/ov102_021D0D80.c b/src/overlay102/ov102_021D0D80.c index 7f8b4a66cf..990a051d06 100644 --- a/src/overlay102/ov102_021D0D80.c +++ b/src/overlay102/ov102_021D0D80.c @@ -184,7 +184,7 @@ static void ov102_021D0F80 (void * param0) sub_0201C2B8(v0->unk_10); } -#define BGCONTSET(frame, scr, cgx, scrsiz, bufsiz){ \ +#define BGCONTSET(frame, scr, cgx, scrsiz, bufsiz) { \ v2.unk_12 = scr; \ v2.unk_13 = cgx; \ v2.unk_08 = bufsiz; \ diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c index 6a27d99924..ddc07f0ebe 100644 --- a/src/overlay104/ov104_0222DCE0.c +++ b/src/overlay104/ov104_0222DCE0.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02025E6C_decl.h" #include "struct_decls/struct_0202C878_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" @@ -40,7 +40,7 @@ #include "unk_02092494.h" #include "overlay104/ov104_0222DCE0.h" -void ov104_0222E1C0(UnkStruct_021C0794 * param0, Party * param1, UnkStruct_02073C74 * param2); +void ov104_0222E1C0(UnkStruct_021C0794 * param0, Party * param1, Pokemon * param2); void ov104_0222E1D8(UnkStruct_02022550 * param0, u8 param1); void ov104_0222E204(UnkStruct_02022550 * param0, s16 param1, s16 param2, u8 param3); u8 ov104_0222E240(u16 param0, u16 param1); @@ -197,7 +197,7 @@ u32 ov104_0222DD6C (UnkStruct_ov104_0223A348_sub2 * param0, u16 param1, u32 para if (param3 == 0) { do { v2 = (sub_0201D2E8() | sub_0201D2E8() << 16); - } while ((v4.unk_0B != sub_02075BFC(v2)) || (sub_02075E38(param2, v2) == 1)); + } while ((v4.unk_0B != GetNatureFromPersonality(v2)) || (sub_02075E38(param2, v2) == 1)); param0->unk_10 = v2; } else { @@ -253,7 +253,7 @@ u32 ov104_0222DD6C (UnkStruct_ov104_0223A348_sub2 * param0, u16 param1, u32 para return v2; } -void ov104_0222DF40 (const UnkStruct_ov104_0223A348_sub2 * param0, UnkStruct_02073C74 * param1, u8 param2) +void ov104_0222DF40 (const UnkStruct_ov104_0223A348_sub2 * param0, Pokemon * param1, u8 param2) { int v0; u32 v1; @@ -261,7 +261,7 @@ void ov104_0222DF40 (const UnkStruct_ov104_0223A348_sub2 * param0, UnkStruct_020 u16 v5; u32 v6; - sub_02073C2C(param1); + ZeroMonData(param1); if (param2 == 120) { v4 = 50; @@ -289,7 +289,7 @@ void ov104_0222DF40 (const UnkStruct_ov104_0223A348_sub2 * param0, UnkStruct_020 v2 = (param0->unk_1E_val2 >> (v0 * 2)) & 0x3; sub_02074B30(param1, 62 + v0, &v2); - v3 = (u8)sub_02074470(param1, 66 + v0, NULL); + v3 = (u8)GetMonData(param1, MON_DATA_66 + v0, NULL); sub_02074B30(param1, 58 + v0, &v3); } @@ -348,9 +348,9 @@ u16 ov104_0222E10C (u8 param0) return 0x3; } -void ov104_0222E134(UnkStruct_021C0794 * param0, UnkStruct_02073C74 * param1); +void ov104_0222E134(UnkStruct_021C0794 * param0, Pokemon * param1); -void ov104_0222E134 (UnkStruct_021C0794 * param0, UnkStruct_02073C74 * param1) +void ov104_0222E134 (UnkStruct_021C0794 * param0, Pokemon * param1) { u32 v0; UnkStruct_02023790 * v1; @@ -359,7 +359,7 @@ void ov104_0222E134 (UnkStruct_021C0794 * param0, UnkStruct_02073C74 * param1) int v4 = 0; UnkStruct_02025E6C * v5 = sub_02025E38(param0); - v0 = sub_02074470(param1, 7, NULL); + v0 = GetMonData(param1, MON_DATA_OT_ID, NULL); sub_02077EE4(param1, sub_02025E38(param0), 4, 0, 0, 11); v3 = sub_0203A138(562); @@ -377,7 +377,7 @@ void ov104_0222E134 (UnkStruct_021C0794 * param0, UnkStruct_02073C74 * param1) return; } -void ov104_0222E1C0 (UnkStruct_021C0794 * param0, Party * param1, UnkStruct_02073C74 * param2) +void ov104_0222E1C0 (UnkStruct_021C0794 * param0, Party * param1, Pokemon * param2) { ov104_0222E134(param0, param2); Party_AddPokemon(param1, param2); @@ -445,7 +445,7 @@ void ov104_0222E278 (UnkStruct_ov104_0223A348 * param0, u16 param1, int param2, void ov104_0222E284 (UnkStruct_ov6_02240D5C * param0, UnkStruct_ov104_0223A348_sub1 * param1, int param2, int param3, int param4) { UnkStruct_02014A84 * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; param0->unk_18[param3] = param1->unk_00; param0->unk_28[param3].unk_01 = param1->unk_04; diff --git a/src/overlay104/ov104_0222ECE8.c b/src/overlay104/ov104_0222ECE8.c index 3449f0d1a3..00bfdb50de 100644 --- a/src/overlay104/ov104_0222ECE8.c +++ b/src/overlay104/ov104_0222ECE8.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02025E6C_decl.h" #include "struct_decls/struct_0203041C_decl.h" #include "struct_decls/struct_020305B8_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "overlay104/struct_ov104_0223ADA0.h" @@ -141,7 +141,7 @@ void ov104_0222ED2C (int param0, int param1, void * param2, void * param3) BOOL ov104_0222ED44 (UnkStruct_ov104_0223B5C0 * param0) { Party * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; int v2, v3; u16 * v4; int v5, v6; @@ -280,12 +280,12 @@ void ov104_0222EE38 (int param0, int param1, void * param2, void * param3) BOOL ov104_0222EE60 (UnkStruct_ov104_0223B5C0 * param0) { int v0, v1, v2, v3, v4; - UnkStruct_02073C74 * v5; + Pokemon * v5; Party * v6; v1 = 0; v3 = 512; - v4 = sub_02073C70(); + v4 = PokemonStructSize(); v6 = Party_GetFromSavedata(param0->unk_6FC); v5 = Party_GetPokemonBySlotIndex(v6, param0->unk_260[0]); @@ -313,7 +313,7 @@ void ov104_0222EEA8 (int param0, int param1, void * param2, void * param3) return; } - v2 = sub_02073C70(); + v2 = PokemonStructSize(); MI_CpuCopy8(&v4[0], v3->unk_D8C, v2); return; @@ -470,7 +470,7 @@ BOOL ov104_0222EFCC (UnkStruct_ov104_0223ADA0 * param0) void ov104_0222F03C (int param0, int param1, void * param2, void * param3) { int v0, v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; UnkStruct_ov104_0223ADA0 * v3 = param3; const u16 * v4 = param2; @@ -661,7 +661,7 @@ BOOL ov104_0222F238 (UnkStruct_ov104_0223ADA0 * param0) int v4, v5; u32 v6[2]; u8 v7[2]; - UnkStruct_02073C74 * v8; + Pokemon * v8; v5 = 60; v3 = param0->unk_504; @@ -670,8 +670,8 @@ BOOL ov104_0222F238 (UnkStruct_ov104_0223ADA0 * param0) for (v1 = 0; v1 < v0; v1++) { v8 = Party_GetPokemonBySlotIndex(param0->unk_4D4, v1); - v7[v1] = sub_02074470(v8, 71, NULL); - v6[v1] = sub_02074470(v8, 0, NULL); + v7[v1] = GetMonData(v8, MON_DATA_ATK_IV, NULL); + v6[v1] = GetMonData(v8, MON_DATA_PERSONALITY, NULL); } for (v1 = 0; v1 < v0; v1++) { @@ -708,7 +708,7 @@ void ov104_0222F31C (int param0, int param1, void * param2, void * param3) u8 v2; u32 v3[2]; u8 v4[2]; - UnkStruct_02073C74 * v5; + Pokemon * v5; UnkStruct_ov104_0223ADA0 * v6 = param3; const u16 * v7 = param2; @@ -884,7 +884,7 @@ BOOL ov104_0222F4B8 (UnkStruct_ov104_0223BA10 * param0) void ov104_0222F530 (int param0, int param1, void * param2, void * param3) { - UnkStruct_02073C74 * v0; + Pokemon * v0; int v1, v2; UnkStruct_ov104_0223BA10 * v3 = param3; const u16 * v4 = param2; @@ -1076,12 +1076,12 @@ BOOL ov104_0222F758 (UnkStruct_ov104_0223BA10 * param0) { int v0, v1, v2, v3, v4; u8 v5; - UnkStruct_02073C74 * v6; + Pokemon * v6; v1 = 0; v3 = 512; v5 = ov104_0223B7A8(param0->unk_10, 0); - v4 = sub_02073C70(); + v4 = PokemonStructSize(); for (v0 = 0; v0 < v5; v0++) { v6 = Party_GetPokemonBySlotIndex(param0->unk_28, v0); @@ -1101,7 +1101,7 @@ void ov104_0222F7BC (int param0, int param1, void * param2, void * param3) { u8 v0; int v1, v2, v3; - UnkStruct_02073C74 * v4; + Pokemon * v4; UnkStruct_ov104_0223BA10 * v5 = param3; const u8 * v6 = param2; @@ -1113,8 +1113,8 @@ void ov104_0222F7BC (int param0, int param1, void * param2, void * param3) } v0 = ov104_0223B7A8(v5->unk_10, 0); - v3 = sub_02073C70(); - v4 = sub_02073C74(11); + v3 = PokemonStructSize(); + v4 = AllocMonZeroed(11); for (v1 = 0; v1 < v0; v1++) { MI_CpuCopy8(&v6[v3 * v1], v4, v3); @@ -1375,12 +1375,12 @@ BOOL ov104_0222FAD0 (UnkStruct_ov104_0223BFFC * param0) { int v0, v1, v2, v3, v4; u8 v5; - UnkStruct_02073C74 * v6; + Pokemon * v6; v1 = 0; v3 = 512; v5 = ov104_0223BD70(param0->unk_10, 0); - v4 = sub_02073C70(); + v4 = PokemonStructSize(); for (v0 = 0; v0 < v5; v0++) { v6 = Party_GetPokemonBySlotIndex(param0->unk_70, v0); @@ -1400,7 +1400,7 @@ void ov104_0222FB34 (int param0, int param1, void * param2, void * param3) { u8 v0; int v1, v2, v3; - UnkStruct_02073C74 * v4; + Pokemon * v4; UnkStruct_ov104_0223BFFC * v5 = param3; const u8 * v6 = param2; @@ -1412,8 +1412,8 @@ void ov104_0222FB34 (int param0, int param1, void * param2, void * param3) } v0 = ov104_0223BD70(v5->unk_10, 0); - v3 = sub_02073C70(); - v4 = sub_02073C74(11); + v3 = PokemonStructSize(); + v4 = AllocMonZeroed(11); for (v1 = 0; v1 < v0; v1++) { MI_CpuCopy8(&v6[v3 * v1], v4, v3); diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c index 656a23e0d7..0bdf356bb2 100644 --- a/src/overlay104/ov104_0222FBE4.c +++ b/src/overlay104/ov104_0222FBE4.c @@ -17,7 +17,7 @@ #include "struct_decls/struct_0202440C_decl.h" #include "struct_decls/struct_02025E6C_decl.h" #include "struct_decls/struct_0202B370_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "overlay063/struct_ov63_0222BEC0_decl.h" #include "overlay063/struct_ov63_0222D77C_decl.h" @@ -2743,7 +2743,7 @@ static BOOL ov104_02231D10 (UnkStruct_ov104_0222E930 * param0) static BOOL ov104_02231D1C (UnkStruct_ov104_0222E930 * param0) { Party * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; UnkStruct_ov104_02230BE4 * v2; UnkStruct_ov104_0223C4CC * v3 = ov104_0222E924(param0->unk_00); u16 v4 = ov104_0222FC00(param0); diff --git a/src/overlay104/ov104_02231F74.c b/src/overlay104/ov104_02231F74.c index 6c46563ae1..abac87af19 100644 --- a/src/overlay104/ov104_02231F74.c +++ b/src/overlay104/ov104_02231F74.c @@ -14,7 +14,7 @@ #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay063/struct_ov63_0222BEC0_decl.h" #include "overlay104/struct_ov104_0222E930_decl.h" #include "overlay104/struct_ov104_022320B4_decl.h" @@ -1071,7 +1071,7 @@ void ov104_02232C80 (UnkStruct_ov63_0222CCB8 * param0, UnkStruct_ov63_0222BEC0 * } } -void ov104_02232CE0 (UnkStruct_ov104_0223C4CC * param0, UnkStruct_02073C74 * param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, u16 param9) +void ov104_02232CE0 (UnkStruct_ov104_0223C4CC * param0, Pokemon * param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, u16 param9) { UnkStruct_0200C6E4 * v0 = param0->unk_34.unk_00; UnkStruct_0200C704 * v1 = param0->unk_34.unk_04; @@ -1120,8 +1120,8 @@ void ov104_02232CE0 (UnkStruct_ov104_0223C4CC * param0, UnkStruct_02073C74 * par u32 v9, v10; v4 = Heap_AllocFromHeap(param2, (10 * 10 * ((8 / 2) * 8))); - v9 = sub_02074470(param1, 0, NULL); - v10 = sub_02074470(param1, 5, NULL); + v9 = GetMonData(param1, MON_DATA_PERSONALITY, NULL); + v10 = GetMonData(param1, MON_DATA_SPECIES, NULL); sub_02075EF4(&v3, param1, 2); sub_020136A4(v3.unk_00, v3.unk_02, param2, 0, 0, 10, 10, v4, v9, 0, 2, v10); @@ -1204,7 +1204,7 @@ void ov104_02232F28 (UnkStruct_ov104_0223C4CC * param0) sub_0200D080(param0->unk_34.unk_04, 2000); } -UnkStruct_0200D0F4 * ov104_02232F4C (UnkStruct_ov104_0223C4CC * param0, UnkStruct_02073C74 * param1, int param2, int param3, int param4) +UnkStruct_0200D0F4 * ov104_02232F4C (UnkStruct_ov104_0223C4CC * param0, Pokemon * param1, int param2, int param3, int param4) { UnkStruct_0200D0F4 * v0; UnkStruct_ov104_0223F9E0 v1; diff --git a/src/overlay104/ov104_022332B4.c b/src/overlay104/ov104_022332B4.c index 56dff70917..7b3e78486b 100644 --- a/src/overlay104/ov104_022332B4.c +++ b/src/overlay104/ov104_022332B4.c @@ -3,7 +3,7 @@ #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay104/struct_ov104_0222E930_decl.h" #include "constdata/const_020EA358.h" @@ -252,7 +252,7 @@ BOOL ov104_022334DC (UnkStruct_ov104_0222E930 * param0) int v0[18]; UnkStruct_ov104_0223C4CC * v1; UnkStruct_02023790 * v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; UnkStruct_ov104_0223ADA0 * v4; u8 v5, v6; u32 v7, v8, v9; @@ -305,9 +305,9 @@ BOOL ov104_022334DC (UnkStruct_ov104_0222E930 * param0) *v15 = v4->unk_3F0[v13].unk_04[v14]; break; case 17: - v3 = sub_02073C74(11); + v3 = AllocMonZeroed(11); ov104_0222DF40(&v4->unk_3F0[v13], v3, ov104_0223ADA0(v4)); - *v15 = sub_02074470(v3, 177, NULL); + *v15 = GetMonData(v3, MON_DATA_177, NULL); Heap_FreeToHeap(v3); break; case 18: @@ -317,13 +317,13 @@ BOOL ov104_022334DC (UnkStruct_ov104_0222E930 * param0) v0[v10] = 0; } - v3 = sub_02073C74(11); + v3 = AllocMonZeroed(11); for (v10 = 0; v10 < v5; v10++) { ov104_0222DF40(&v4->unk_3F0[v10], v3, ov104_0223ADA0(v4)); - v7 = sub_02074470(v3, 177, NULL); - v8 = sub_02074470(v3, 178, NULL); + v7 = GetMonData(v3, MON_DATA_177, NULL); + v8 = GetMonData(v3, MON_DATA_178, NULL); if (v7 == v8) { v8 = 0xff; diff --git a/src/overlay104/ov104_022339B4.c b/src/overlay104/ov104_022339B4.c index 084f973c55..db92a636ff 100644 --- a/src/overlay104/ov104_022339B4.c +++ b/src/overlay104/ov104_022339B4.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_0203068C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_021C0794_decl.h" #include "struct_defs/struct_0202FF58.h" @@ -134,7 +134,7 @@ static void ov104_02233BAC (UnkStruct_ov104_0223ADA0 * param0) int v0, v1; UnkStruct_ov104_0223A348_sub2 v2[6 * 2]; UnkStruct_ov104_0223A348_sub2 v3; - UnkStruct_02073C74 * v4; + Pokemon * v4; u16 v5[6]; u16 v6[6]; @@ -188,7 +188,7 @@ static void ov104_02233BAC (UnkStruct_ov104_0223ADA0 * param0) } for (v0 = 0; v0 < 6; v0++) { - v4 = sub_02073C74(11); + v4 = AllocMonZeroed(11); ov104_0222DF40(¶m0->unk_280[v0], v4, ov104_0223ADA0(param0)); ov104_0222E1C0(param0->unk_4F8, param0->unk_4D4, v4); Heap_FreeToHeap(v4); @@ -249,7 +249,7 @@ static void ov104_02233D80 (UnkStruct_ov104_0223ADA0 * param0, u8 param1, u8 par static void ov104_02233F1C (UnkStruct_ov104_0223ADA0 * param0) { int v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; u8 v2, v3; UnkStruct_ov104_0223A348_sub2 v4[6]; u8 v5[6]; @@ -272,7 +272,7 @@ static void ov104_02233F1C (UnkStruct_ov104_0223ADA0 * param0) ov104_0222E330(v4, v6, v5, v7, NULL, 4, 11, 179); - v1 = sub_02073C74(11); + v1 = AllocMonZeroed(11); for (v0 = 0; v0 < 4; v0++) { ov104_0222DF40(&v4[v0], v1, ov104_0223ADA0(param0)); @@ -291,7 +291,7 @@ static void ov104_02233F1C (UnkStruct_ov104_0223ADA0 * param0) ov104_0222E330(v4, v6, v5, v7, NULL, 4, 11, 179); - v1 = sub_02073C74(11); + v1 = AllocMonZeroed(11); for (v0 = 0; v0 < 4; v0++) { ov104_0222DF40(&v4[v0], v1, ov104_0223ADA0(param0)); @@ -359,7 +359,7 @@ void ov104_02234148 (UnkStruct_ov104_0223ADA0 * param0, u8 param1) u32 v7[4]; u32 v8, v9, v10; UnkStruct_0203068C * v11; - UnkStruct_02073C74 * v12; + Pokemon * v12; UnkStruct_0202FF58 * v13 = param0->unk_4F4; UnkStruct_020300F4 * v14 = sub_020300F4(param0->unk_4F8); @@ -417,10 +417,10 @@ void ov104_02234148 (UnkStruct_ov104_0223ADA0 * param0, u8 param1) v6[0] = param0->unk_4E8[v0]; sub_0202FF84(param0->unk_4F4, 4, v0, v6); - v5[0] = sub_02074470(v12, 71, NULL); + v5[0] = GetMonData(v12, MON_DATA_ATK_IV, NULL); sub_0202FF84(param0->unk_4F4, 5, v0, v5); - v7[0] = sub_02074470(v12, 0, NULL); + v7[0] = GetMonData(v12, MON_DATA_PERSONALITY, NULL); sub_0202FF84(param0->unk_4F4, 6, v0, v7); } @@ -432,10 +432,10 @@ void ov104_02234148 (UnkStruct_ov104_0223ADA0 * param0, u8 param1) v6[0] = param0->unk_3D2[v0]; sub_0202FF84(param0->unk_4F4, 7, v0, v6); - v5[0] = sub_02074470(v12, 71, NULL); + v5[0] = GetMonData(v12, MON_DATA_ATK_IV, NULL); sub_0202FF84(param0->unk_4F4, 8, v0, v5); - v7[0] = sub_02074470(v12, 0, NULL); + v7[0] = GetMonData(v12, MON_DATA_PERSONALITY, NULL); sub_0202FF84(param0->unk_4F4, 9, v0, v7); } @@ -491,7 +491,7 @@ void ov104_0223449C (UnkStruct_ov104_0223ADA0 * param0) { int v0; u8 v1, v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; const UnkStruct_ov104_0224028C * v4; v1 = ov104_0223AA50(param0->unk_04); @@ -499,7 +499,7 @@ void ov104_0223449C (UnkStruct_ov104_0223ADA0 * param0) sub_0207A008(param0->unk_4D4); - v3 = sub_02073C74(11); + v3 = AllocMonZeroed(11); for (v0 = 0; v0 < v1; v0++) { ov104_0222DF40(¶m0->unk_280[param0->unk_4DC[v0]], v3, ov104_0223ADA0(param0)); @@ -523,7 +523,7 @@ void ov104_02234570 (UnkStruct_ov104_0223ADA0 * param0) u8 v3; u16 v4[8]; u16 v5[8]; - UnkStruct_02073C74 * v6; + Pokemon * v6; const UnkStruct_ov104_0224028C * v7; for (v0 = 0; v0 < (4 + 4); v0++) { @@ -536,8 +536,8 @@ void ov104_02234570 (UnkStruct_ov104_0223ADA0 * param0) for (v0 = 0; v0 < v1; v0++) { v6 = Party_GetPokemonBySlotIndex(param0->unk_4D4, v0); - v4[v0] = sub_02074470(v6, 5, NULL); - v5[v0] = sub_02074470(v6, 6, NULL); + v4[v0] = GetMonData(v6, MON_DATA_SPECIES, NULL); + v5[v0] = GetMonData(v6, MON_DATA_HELD_ITEM, NULL); } v2 = v1; @@ -545,8 +545,8 @@ void ov104_02234570 (UnkStruct_ov104_0223ADA0 * param0) for (v0 = 0; v0 < v1; v0++) { v6 = Party_GetPokemonBySlotIndex(param0->unk_4D8, v0); - v4[v0 + v2] = sub_02074470(v6, 5, NULL); - v5[v0 + v2] = sub_02074470(v6, 6, NULL); + v4[v0 + v2] = GetMonData(v6, MON_DATA_SPECIES, NULL); + v5[v0 + v2] = GetMonData(v6, MON_DATA_HELD_ITEM, NULL); param0->unk_254[v0] = param0->unk_3D2[v0]; } @@ -561,7 +561,7 @@ void ov104_02234570 (UnkStruct_ov104_0223ADA0 * param0) void ov104_022346A4 (UnkStruct_ov104_0223ADA0 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; if (param0->unk_4DC[0] == 0xff) { (void)0; @@ -582,7 +582,7 @@ void ov104_0223470C (UnkStruct_ov104_0223ADA0 * param0) { int v0; u8 v1, v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; int v4; v1 = ov104_0223AA50(param0->unk_04); @@ -590,7 +590,7 @@ void ov104_0223470C (UnkStruct_ov104_0223ADA0 * param0) sub_0207A008(param0->unk_4D8); - v3 = sub_02073C74(11); + v3 = AllocMonZeroed(11); for (v0 = 0; v0 < v2; v0++) { ov104_0222DF40(¶m0->unk_3F0[v0], v3, ov104_0223ADA0(param0)); diff --git a/src/overlay104/ov104_02234838.c b/src/overlay104/ov104_02234838.c index 8599b2191f..49c48e91ac 100644 --- a/src/overlay104/ov104_02234838.c +++ b/src/overlay104/ov104_02234838.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_0202440C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "overlay104/struct_ov104_0222E930_decl.h" @@ -97,7 +97,7 @@ BOOL ov104_022348BC (UnkStruct_ov104_0222E930 * param0) { int v0; Party * v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; UnkStruct_ov104_0223B5C0 * v3; UnkStruct_ov104_02235208 * v4; UnkStruct_ov104_02230BE4 * v5 = sub_0209B970(param0->unk_00->unk_00); @@ -177,7 +177,7 @@ BOOL ov104_022349B8 (UnkStruct_ov104_0222E930 * param0) static void ov104_02234A08 (void * param0) { int v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; UnkStruct_ov104_02235208 * v2 = param0; ov104_022351CC(v2->unk_10, param0); @@ -189,7 +189,7 @@ static void ov104_02234A08 (void * param0) BOOL ov104_02234A1C (UnkStruct_ov104_0222E930 * param0) { UnkStruct_ov104_02230BE4 * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; Party * v2; UnkStruct_ov104_0223B5C0 * v3; u8 v4, v5; @@ -297,7 +297,7 @@ BOOL ov104_02234A1C (UnkStruct_ov104_0222E930 * param0) case 15: v2 = Party_GetFromSavedata(v0->unk_08); v1 = Party_GetPokemonBySlotIndex(v2, v3->unk_260[0]); - *v11 = sub_02074470(v1, 5, NULL); + *v11 = GetMonData(v1, MON_DATA_SPECIES, NULL); break; case 35: ov104_022356A0(v3); @@ -407,14 +407,14 @@ BOOL ov104_02234D6C (UnkStruct_ov104_0222E930 * param0) UnkStruct_0202440C * v0; u16 v1; Party * v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; UnkStruct_ov104_0223B5C0 * v4; UnkStruct_ov104_02230BE4 * v5 = sub_0209B970(param0->unk_00->unk_00); v4 = sub_0209B978(param0->unk_00->unk_00); v2 = Party_GetFromSavedata(v5->unk_08); v3 = Party_GetPokemonBySlotIndex(v2, v4->unk_260[0]); - v1 = sub_02074470(v3, 5, NULL); + v1 = GetMonData(v3, MON_DATA_SPECIES, NULL); if (v4->unk_04 == 0) { v0 = sub_0202440C(v5->unk_08); diff --git a/src/overlay104/ov104_02234DB4.c b/src/overlay104/ov104_02234DB4.c index 7e79958e4f..9aa1f55fe8 100644 --- a/src/overlay104/ov104_02234DB4.c +++ b/src/overlay104/ov104_02234DB4.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02030114_decl.h" #include "struct_decls/struct_0203026C_decl.h" #include "struct_decls/struct_0203068C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_021C0794_decl.h" #include "struct_defs/struct_0204B184.h" @@ -53,7 +53,7 @@ UnkStruct_ov104_0223B5C0 * ov104_02234DB4 (UnkStruct_021C0794 * param0, u16 para UnkStruct_0203026C * v1; u8 v2, v3, v4; u16 v5, v6, v7, v8; - UnkStruct_02073C74 * v9; + Pokemon * v9; static UnkStruct_ov104_0223B5C0 * v10; v10 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov104_0223B5C0)); @@ -63,7 +63,7 @@ UnkStruct_ov104_0223B5C0 * ov104_02234DB4 (UnkStruct_021C0794 * param0, u16 para v10->unk_6FC = param0; v10->unk_00 = 11; v10->unk_264 = sub_02079FF4(11); - v10->unk_D8C = sub_02073C74(11); + v10->unk_D8C = AllocMonZeroed(11); v0 = v10->unk_6F8; v1 = sub_0203026C(param0); @@ -114,7 +114,7 @@ UnkStruct_ov104_0223B5C0 * ov104_02234DB4 (UnkStruct_021C0794 * param0, u16 para for (v5 = 0; v5 < v4; v5++) { v9 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v10->unk_6FC), v10->unk_260[v5]); - v10->unk_728[v5] = sub_02074470(v9, 6, NULL); + v10->unk_728[v5] = GetMonData(v9, MON_DATA_HELD_ITEM, NULL); } v10->unk_10 = 0; @@ -154,7 +154,7 @@ static void ov104_022350B8 (UnkStruct_ov104_0223B5C0 * param0) { u8 v0, v1, v2, v3; int v4, v5; - UnkStruct_02073C74 * v6; + Pokemon * v6; UnkStruct_ov104_0223A348_sub2 v7; v3 = 0; @@ -186,7 +186,7 @@ static void ov104_022350B8 (UnkStruct_ov104_0223B5C0 * param0) } v6 = Party_GetPokemonBySlotIndex(param0->unk_264, 0); - ov104_0223B0C8(1, param0->unk_6F4, v0, param0->unk_05, sub_02074470(v6, 5, NULL), param0->unk_268, v3); + ov104_0223B0C8(1, param0->unk_6F4, v0, param0->unk_05, GetMonData(v6, MON_DATA_SPECIES, NULL), param0->unk_268, v3); return; } @@ -256,7 +256,7 @@ void ov104_0223526C (UnkStruct_ov104_0223B5C0 * param0, u8 param1) u32 v3[4]; UnkStruct_0203068C * v4; u16 v5, v6, v7, v8, v9; - UnkStruct_02073C74 * v10; + Pokemon * v10; UnkStruct_02030114 * v11 = param0->unk_6F8; UnkStruct_0203026C * v12 = sub_0203026C(param0->unk_6FC); @@ -267,7 +267,7 @@ void ov104_0223526C (UnkStruct_ov104_0223B5C0 * param0, u8 param1) sub_0203012C(param0->unk_6F8, 1); v10 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_6FC), param0->unk_260[0]); - v9 = sub_02074470(v10, 5, NULL); + v9 = GetMonData(v10, MON_DATA_SPECIES, NULL); v8 = sub_02030698(v4, sub_0205E55C(param0->unk_04), sub_0205E6A8(sub_0205E55C(param0->unk_04))); v1[0] = param0->unk_05; @@ -313,7 +313,7 @@ void ov104_0223526C (UnkStruct_ov104_0223B5C0 * param0, u8 param1) sub_02030140(param0->unk_6F8, 4, v0, 0, v2); } - sub_020306E4(v4, sub_0205E55C(param0->unk_04), sub_0205E6A8(sub_0205E55C(param0->unk_04)), sub_02074470(v10, 5, NULL)); + sub_020306E4(v4, sub_0205E55C(param0->unk_04), sub_0205E6A8(sub_0205E55C(param0->unk_04)), GetMonData(v10, MON_DATA_SPECIES, NULL)); return; } @@ -354,7 +354,7 @@ void ov104_022354F4 (UnkStruct_ov104_0223B5C0 * param0) void ov104_02235518 (UnkStruct_ov104_0223B5C0 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; param0->unk_06 = 1; diff --git a/src/overlay104/ov104_022358E8.c b/src/overlay104/ov104_022358E8.c index 4c0e4faa9d..c794bc09a1 100644 --- a/src/overlay104/ov104_022358E8.c +++ b/src/overlay104/ov104_022358E8.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "overlay104/struct_ov104_0222E930_decl.h" @@ -169,7 +169,7 @@ BOOL ov104_02235A24 (UnkStruct_ov104_0222E930 * param0) int v0; UnkStruct_ov104_0223BA10 * v1; UnkStruct_ov6_02240D5C * v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; v1 = sub_0209B978(param0->unk_00->unk_00); v2 = v1->unk_0C; @@ -294,7 +294,7 @@ BOOL ov104_02235BAC (UnkStruct_ov104_0222E930 * param0) BOOL ov104_02235BC0 (UnkStruct_ov104_0222E930 * param0) { UnkStruct_02023790 * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; Party * v2; UnkStruct_ov104_0223BA10 * v3; u8 v4; diff --git a/src/overlay104/ov104_022361B4.c b/src/overlay104/ov104_022361B4.c index 5bed49edf1..c70708cd24 100644 --- a/src/overlay104/ov104_022361B4.c +++ b/src/overlay104/ov104_022361B4.c @@ -8,7 +8,7 @@ #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_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" #include "overlay104/struct_ov104_022320B4_decl.h" @@ -70,7 +70,7 @@ UnkStruct_ov104_0223BA10 * ov104_022361B4 (UnkStruct_021C0794 * param0, u16 para { u32 v0, v1; Party * v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; UnkStruct_020302DC * v4; u8 v5, v6; u16 v7, v8; @@ -136,7 +136,7 @@ UnkStruct_ov104_0223BA10 * ov104_022361B4 (UnkStruct_021C0794 * param0, u16 para for (v7 = 0; v7 < 3; v7++) { v3 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v9->unk_04), v9->unk_24[v7]); - v9->unk_36A[v7] = sub_02074470(v3, 6, NULL); + v9->unk_36A[v7] = GetMonData(v3, MON_DATA_HELD_ITEM, NULL); } v2 = Party_GetFromSavedata(v9->unk_04); @@ -150,8 +150,8 @@ UnkStruct_ov104_0223BA10 * ov104_022361B4 (UnkStruct_021C0794 * param0, u16 para sub_02074B30(v3, 6, &v0); - if (sub_02074470(v3, 161, NULL) > 50) { - v1 = sub_02075AD0(sub_02074470(v3, 5, NULL), 50); + if (GetMonData(v3, MON_DATA_161, NULL) > 50) { + v1 = sub_02075AD0(GetMonData(v3, MON_DATA_SPECIES, NULL), 50); sub_02074B30(v3, 8, &v1); sub_0207418C(v3); } @@ -180,7 +180,7 @@ static void ov104_02236528 (UnkStruct_ov104_0223BA10 * param0) u8 v0; int v1; UnkStruct_ov104_0223A348_sub2 v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; Party * v4; u16 v5[6]; u16 v6[6]; @@ -190,10 +190,10 @@ static void ov104_02236528 (UnkStruct_ov104_0223BA10 * param0) for (v1 = 0; v1 < v0; v1++) { v3 = Party_GetPokemonBySlotIndex(param0->unk_28, v1); - param0->unk_394[v1][0] = sub_02074470(v3, 58, NULL); - param0->unk_394[v1][1] = sub_02074470(v3, 59, NULL); - param0->unk_394[v1][2] = sub_02074470(v3, 60, NULL); - param0->unk_394[v1][3] = sub_02074470(v3, 61, NULL); + param0->unk_394[v1][0] = GetMonData(v3, MON_DATA_58, NULL); + param0->unk_394[v1][1] = GetMonData(v3, MON_DATA_59, NULL); + param0->unk_394[v1][2] = GetMonData(v3, MON_DATA_60, NULL); + param0->unk_394[v1][3] = GetMonData(v3, MON_DATA_61, NULL); } ov104_0223B760(param0->unk_10, ov104_0223BB60(param0), param0->unk_30, (7 * 2)); @@ -215,7 +215,7 @@ static void ov104_022365F8 (UnkStruct_ov104_0223BA10 * param0) { u16 v0; int v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; u8 v3; UnkStruct_ov104_0223A348_sub2 v4[6]; u8 v5[6]; @@ -235,7 +235,7 @@ static void ov104_022365F8 (UnkStruct_ov104_0223BA10 * param0) ov104_0222E330(v4, v6, v5, NULL, v7, 4, 11, 179); - v2 = sub_02073C74(11); + v2 = AllocMonZeroed(11); for (v1 = 0; v1 < 4; v1++) { ov104_0222DF40(&v4[v1], v2, ov104_0223BA10(param0)); @@ -254,7 +254,7 @@ static void ov104_022366A4 (UnkStruct_ov104_0223BA10 * param0) u16 v2; u8 v3; int v4; - UnkStruct_02073C74 * v5; + Pokemon * v5; v0 = Party_GetCurrentCount(param0->unk_28); @@ -358,7 +358,7 @@ void ov104_02236848 (UnkStruct_ov104_0223BA10 * param0, u8 param1) u32 v6[4]; u32 v7, v8, v9; UnkStruct_0203068C * v10; - UnkStruct_02073C74 * v11; + Pokemon * v11; UnkStruct_020302DC * v12 = param0->unk_08; UnkStruct_0203041C * v13 = sub_0203041C(param0->unk_04); @@ -409,25 +409,25 @@ void ov104_02236848 (UnkStruct_ov104_0223BA10 * param0, u8 param1) for (v0 = 0; v0 < v8; v0++) { v11 = Party_GetPokemonBySlotIndex(param0->unk_28, v0); - v5[0] = sub_02074470(v11, 163, NULL); + v5[0] = GetMonData(v11, MON_DATA_163, NULL); sub_02030308(param0->unk_08, 2, v0, 0, v5); - v4[0] = sub_02074470(v11, 58, NULL); + v4[0] = GetMonData(v11, MON_DATA_58, NULL); sub_02030308(param0->unk_08, 3, v0, 0, v4); - v4[0] = sub_02074470(v11, 59, NULL); + v4[0] = GetMonData(v11, MON_DATA_59, NULL); sub_02030308(param0->unk_08, 3, v0, 1, v4); - v4[0] = sub_02074470(v11, 60, NULL); + v4[0] = GetMonData(v11, MON_DATA_60, NULL); sub_02030308(param0->unk_08, 3, v0, 2, v4); - v4[0] = sub_02074470(v11, 61, NULL); + v4[0] = GetMonData(v11, MON_DATA_61, NULL); sub_02030308(param0->unk_08, 3, v0, 3, v4); - v6[0] = sub_02074470(v11, 160, NULL); + v6[0] = GetMonData(v11, MON_DATA_160, NULL); sub_02030308(param0->unk_08, 4, v0, 0, v6); - v5[0] = sub_02074470(v11, 6, NULL); + v5[0] = GetMonData(v11, MON_DATA_HELD_ITEM, NULL); sub_02030308(param0->unk_08, 5, v0, 0, v5); } @@ -522,7 +522,7 @@ void ov104_02236C50 (UnkStruct_ov104_0223BA10 * param0) { u8 v0, v1; int v2, v3; - UnkStruct_02073C74 * v4; + Pokemon * v4; if (sub_0203608C() == 0) { v0 = 0; @@ -536,10 +536,10 @@ void ov104_02236C50 (UnkStruct_ov104_0223BA10 * param0) for (v2 = v0; v2 < (v1 + v0); v2++) { v4 = Party_GetPokemonBySlotIndex(param0->unk_28, v2); - param0->unk_394[v2 - v0][0] = sub_02074470(v4, 58, NULL); - param0->unk_394[v2 - v0][1] = sub_02074470(v4, 59, NULL); - param0->unk_394[v2 - v0][2] = sub_02074470(v4, 60, NULL); - param0->unk_394[v2 - v0][3] = sub_02074470(v4, 61, NULL); + param0->unk_394[v2 - v0][0] = GetMonData(v4, MON_DATA_58, NULL); + param0->unk_394[v2 - v0][1] = GetMonData(v4, MON_DATA_59, NULL); + param0->unk_394[v2 - v0][2] = GetMonData(v4, MON_DATA_60, NULL); + param0->unk_394[v2 - v0][3] = GetMonData(v4, MON_DATA_61, NULL); } ov104_0223BA24(param0->unk_28); @@ -559,7 +559,7 @@ int ov104_02236D10 (UnkStruct_ov104_0223BA10 * param0) u8 v0, v1, v2; u32 v3, v4; int v5, v6, v7, v8; - UnkStruct_02073C74 * v9; + Pokemon * v9; u8 v10[20]; int v11 = 0; @@ -582,12 +582,12 @@ int ov104_02236D10 (UnkStruct_ov104_0223BA10 * param0) for (v5 = v2; v5 < (v0 + v2); v5++) { v9 = Party_GetPokemonBySlotIndex(param0->unk_28, v5); - if (sub_02074470(v9, 172, NULL) == 0) { + if (GetMonData(v9, MON_DATA_172, NULL) == 0) { continue; } - v3 = sub_02074470(v9, 163, NULL); - v4 = sub_02074470(v9, 164, NULL); + v3 = GetMonData(v9, MON_DATA_163, NULL); + v4 = GetMonData(v9, MON_DATA_164, NULL); if (v3 > 0) { v10[0]++; @@ -602,17 +602,17 @@ int ov104_02236D10 (UnkStruct_ov104_0223BA10 * param0) } } - if (sub_02074470(v9, 160, NULL) == 0) { + if (GetMonData(v9, MON_DATA_160, NULL) == 0) { v10[4]++; } } else { param0->unk_12 = 1; } - v8 += sub_02074470(v9, 58, NULL); - v8 += sub_02074470(v9, 59, NULL); - v8 += sub_02074470(v9, 60, NULL); - v8 += sub_02074470(v9, 61, NULL); + v8 += GetMonData(v9, MON_DATA_58, NULL); + v8 += GetMonData(v9, MON_DATA_59, NULL); + v8 += GetMonData(v9, MON_DATA_60, NULL); + v8 += GetMonData(v9, MON_DATA_61, NULL); } for (v5 = 0; v5 < v1; v5++) { diff --git a/src/overlay104/ov104_02237378.c b/src/overlay104/ov104_02237378.c index cc2f051437..029cdebdd3 100644 --- a/src/overlay104/ov104_02237378.c +++ b/src/overlay104/ov104_02237378.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02025E6C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "overlay104/struct_ov104_0222E930_decl.h" #include "overlay104/struct_ov104_022320B4_decl.h" @@ -154,8 +154,8 @@ BOOL ov104_02237460 (UnkStruct_ov104_0222E930 * param0) u32 v6, v7, v8; UnkStruct_ov104_0223BFFC * v9; UnkStruct_ov6_02240D5C * v10; - UnkStruct_02073C74 * v11; - UnkStruct_02073C74 * v12; + Pokemon * v11; + Pokemon * v12; v9 = sub_0209B978(param0->unk_00->unk_00); v10 = v9->unk_0C; @@ -186,9 +186,9 @@ BOOL ov104_02237460 (UnkStruct_ov104_0222E930 * param0) for (v1 = 0; v1 < v0; v1++) { v11 = Party_GetPokemonBySlotIndex(v9->unk_70, v1); - v7 = sub_02074470(v11, 161, NULL); + v7 = GetMonData(v11, MON_DATA_161, NULL); v7 -= 3; - v6 = sub_02075AD0(sub_02074470(v11, 5, NULL), v7); + v6 = sub_02075AD0(GetMonData(v11, MON_DATA_SPECIES, NULL), v7); sub_02074B30(v11, 8, &v6); sub_0207418C(v11); @@ -242,7 +242,7 @@ BOOL ov104_022375F8 (UnkStruct_ov104_0222E930 * param0) static void ov104_02237634 (UnkStruct_ov104_02238240 * param0, UnkStruct_ov104_0223BFFC * param1) { int v0, v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; param0->unk_04 = param1->unk_10; param0->unk_1E = ov104_0223C124(param1); @@ -266,12 +266,12 @@ static void ov104_02237634 (UnkStruct_ov104_02238240 * param0, UnkStruct_ov104_0 for (v0 = 0; v0 < v1; v0++) { v2 = Party_GetPokemonBySlotIndex(param1->unk_70, v0); - param1->unk_94[v0] = sub_02074470(v2, 164, NULL); - param1->unk_A4[v0] = sub_02074470(v2, 165, NULL); - param1->unk_B4[v0] = sub_02074470(v2, 166, NULL); - param1->unk_C4[v0] = sub_02074470(v2, 167, NULL); - param1->unk_D4[v0] = sub_02074470(v2, 168, NULL); - param1->unk_E4[v0] = sub_02074470(v2, 169, NULL); + param1->unk_94[v0] = GetMonData(v2, MON_DATA_164, NULL); + param1->unk_A4[v0] = GetMonData(v2, MON_DATA_165, NULL); + param1->unk_B4[v0] = GetMonData(v2, MON_DATA_166, NULL); + param1->unk_C4[v0] = GetMonData(v2, MON_DATA_167, NULL); + param1->unk_D4[v0] = GetMonData(v2, MON_DATA_168, NULL); + param1->unk_E4[v0] = GetMonData(v2, MON_DATA_169, NULL); } return; @@ -311,7 +311,7 @@ BOOL ov104_02237734 (UnkStruct_ov104_0222E930 * param0) BOOL ov104_02237748 (UnkStruct_ov104_0222E930 * param0) { UnkStruct_02023790 * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; Party * v2; UnkStruct_ov104_0223BFFC * v3; u8 v4, v5, v6; @@ -368,7 +368,7 @@ BOOL ov104_02237748 (UnkStruct_ov104_0222E930 * param0) v1 = Party_GetPokemonBySlotIndex(v3->unk_74, 0); } - *v20 = sub_02074470(v1, 6, NULL); + *v20 = GetMonData(v1, MON_DATA_HELD_ITEM, NULL); break; case 16: *v20 = v3->unk_13; diff --git a/src/overlay104/ov104_02237DD8.c b/src/overlay104/ov104_02237DD8.c index a46711db1c..9f152a4edc 100644 --- a/src/overlay104/ov104_02237DD8.c +++ b/src/overlay104/ov104_02237DD8.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_020304A0_decl.h" #include "struct_decls/struct_020305B8_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" @@ -144,7 +144,7 @@ UnkStruct_ov104_0223BFFC * ov104_02237DD8 (UnkStruct_021C0794 * param0, u16 para { u32 v0, v1; Party * v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; UnkStruct_020304A0 * v4; u8 v5, v6; u16 v7, v8; @@ -206,7 +206,7 @@ UnkStruct_ov104_0223BFFC * ov104_02237DD8 (UnkStruct_021C0794 * param0, u16 para for (v7 = 0; v7 < 3; v7++) { v3 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v9->unk_04), v9->unk_2C[v7]); - v9->unk_412[v7] = sub_02074470(v3, 6, NULL); + v9->unk_412[v7] = GetMonData(v3, MON_DATA_HELD_ITEM, NULL); } v2 = Party_GetFromSavedata(v9->unk_04); @@ -220,8 +220,8 @@ UnkStruct_ov104_0223BFFC * ov104_02237DD8 (UnkStruct_021C0794 * param0, u16 para sub_02074B30(v3, 6, &v0); - if (sub_02074470(v3, 161, NULL) > 50) { - v1 = sub_02075AD0(sub_02074470(v3, 5, NULL), 50); + if (GetMonData(v3, MON_DATA_161, NULL) > 50) { + v1 = sub_02075AD0(GetMonData(v3, MON_DATA_SPECIES, NULL), 50); sub_02074B30(v3, 8, &v1); sub_0207418C(v3); } @@ -250,7 +250,7 @@ static void ov104_02238080 (UnkStruct_ov104_0223BFFC * param0) u16 v0; int v1; UnkStruct_ov104_0223A348_sub2 v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; Party * v4; u16 v5[6]; u16 v6[6]; @@ -283,7 +283,7 @@ static void ov104_02238114 (UnkStruct_ov104_0223BFFC * param0) { u16 v0; int v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; u8 v3; UnkStruct_ov104_0223A348_sub2 v4[6]; u8 v5[6]; @@ -303,7 +303,7 @@ static void ov104_02238114 (UnkStruct_ov104_0223BFFC * param0) ov104_0222E330(v4, v6, v5, NULL, v7, 4, 11, 179); - v2 = sub_02073C74(11); + v2 = AllocMonZeroed(11); for (v1 = 0; v1 < 4; v1++) { ov104_0222DF40(&v4[v1], v2, ov104_0223BFFC(param0)); @@ -320,7 +320,7 @@ static void ov104_022381C4 (UnkStruct_ov104_0223BFFC * param0) u8 v0; u16 v1; int v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; v0 = Party_GetCurrentCount(param0->unk_70); @@ -390,7 +390,7 @@ void ov104_02238278 (UnkStruct_ov104_0223BFFC * param0, u8 param1) u16 v3[4]; u32 v4[4]; u32 v5, v6; - UnkStruct_02073C74 * v7; + Pokemon * v7; UnkStruct_020304A0 * v8 = param0->unk_08; UnkStruct_020305B8 * v9 = sub_020305B8(param0->unk_04); @@ -435,7 +435,7 @@ void ov104_02238278 (UnkStruct_ov104_0223BFFC * param0, u8 param1) for (v0 = 0; v0 < v6; v0++) { v7 = Party_GetPokemonBySlotIndex(param0->unk_70, v0); - v3[0] = sub_02074470(v7, 6, NULL); + v3[0] = GetMonData(v7, MON_DATA_HELD_ITEM, NULL); sub_020304CC(param0->unk_08, 4, v0, 0, v3); } @@ -553,7 +553,7 @@ int ov104_02238538 (UnkStruct_ov104_0223BFFC * param0, Party * param1, Party * p { u8 v0; int v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; int v3; v3 = 0; @@ -577,7 +577,7 @@ static int ov104_02238584 (UnkStruct_ov104_0223BFFC * param0, Party * param1, Pa u8 v1; u8 v2; int v3, v4; - UnkStruct_02073C74 * v5; + Pokemon * v5; v4 = 0; v1 = 0; @@ -586,17 +586,17 @@ static int ov104_02238584 (UnkStruct_ov104_0223BFFC * param0, Party * param1, Pa for (v3 = 0; v3 < param3; v3++) { v5 = Party_GetPokemonBySlotIndex(param1, v3); - if (sub_02074470(v5, 172, NULL) == 0) { + if (GetMonData(v5, MON_DATA_172, NULL) == 0) { continue; } - v0 = sub_02074470(v5, 163, NULL); + v0 = GetMonData(v5, MON_DATA_163, NULL); if (v0 == 0) { v1++; } - if (sub_02074470(v5, 160, NULL) != 0) { + if (GetMonData(v5, MON_DATA_160, NULL) != 0) { v2++; } } @@ -605,17 +605,17 @@ static int ov104_02238584 (UnkStruct_ov104_0223BFFC * param0, Party * param1, Pa for (v3 = 0; v3 < param3; v3++) { v5 = Party_GetPokemonBySlotIndex(param2, v3); - if (sub_02074470(v5, 172, NULL) == 0) { + if (GetMonData(v5, MON_DATA_172, NULL) == 0) { continue; } - v0 = sub_02074470(v5, 163, NULL); + v0 = GetMonData(v5, MON_DATA_163, NULL); if (v0 == 0) { v1++; } - if (sub_02074470(v5, 160, NULL) != 0) { + if (GetMonData(v5, MON_DATA_160, NULL) != 0) { v2++; } } @@ -697,7 +697,7 @@ void ov104_02238764 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC { u8 v0, v1; int v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; v0 = ov104_0223BD70(param0->unk_10, 1); v1 = ov104_0223BDA4(param0->unk_10, 1); @@ -782,7 +782,7 @@ void ov104_022388DC (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC { u8 v0, v1; int v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; v0 = ov104_0223BD70(param0->unk_10, 1); v1 = ov104_0223BDA4(param0->unk_10, 1); @@ -793,7 +793,7 @@ void ov104_022388DC (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC v3 = Party_GetPokemonBySlotIndex(param0->unk_70, v2); - if (sub_02074470(v3, 6, NULL) == 0) { + if (GetMonData(v3, MON_DATA_HELD_ITEM, NULL) == 0) { sub_02021CAC(param0->unk_50[v2]->unk_00, 0); } } @@ -803,7 +803,7 @@ void ov104_022388DC (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC v3 = Party_GetPokemonBySlotIndex(param0->unk_74, v2); - if (sub_02074470(v3, 6, NULL) == 0) { + if (GetMonData(v3, MON_DATA_HELD_ITEM, NULL) == 0) { sub_02021CAC(param0->unk_60[v2]->unk_00, 0); } } @@ -837,7 +837,7 @@ void ov104_022389F4 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC { u32 v0; u8 v1, v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; v1 = ov104_0223BD70(param0->unk_10, 1); v2 = ov104_0223BDA4(param0->unk_10, 1); @@ -848,7 +848,7 @@ void ov104_022389F4 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC } v3 = Party_GetPokemonBySlotIndex(param0->unk_70, param3); - v0 = sub_02074470(v3, 6, NULL); + v0 = GetMonData(v3, MON_DATA_HELD_ITEM, NULL); if (param4 == 1) { if (v0 == 0) { @@ -865,7 +865,7 @@ void ov104_022389F4 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC } v3 = Party_GetPokemonBySlotIndex(param0->unk_74, param3); - v0 = sub_02074470(v3, 6, NULL); + v0 = GetMonData(v3, MON_DATA_HELD_ITEM, NULL); if (param4 == 1) { if (v0 == 0) { @@ -1107,11 +1107,11 @@ static void ov104_02238BBC (UnkStruct_ov104_0223BFFC * param0, Party * param1, u { int v0; u32 v1, v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; for (v0 = 0; v0 < param2; v0++) { v3 = Party_GetPokemonBySlotIndex(param1, v0); - v1 = sub_02074470(v3, 164, NULL); + v1 = GetMonData(v3, MON_DATA_164, NULL); v2 = (v1 * 1.2); v2 -= v1; v2 = (v1 - v2); @@ -1126,15 +1126,15 @@ static void ov104_02238C18 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u { int v0, v1; u32 v2, v3, v4, v5; - UnkStruct_02073C74 * v6; + Pokemon * v6; v1 = 0; for (v0 = 0; v0 < param2; v0++) { v6 = Party_GetPokemonBySlotIndex(param1, v0); - v3 = sub_02074470(v6, 177, NULL); - v4 = sub_02074470(v6, 178, NULL); - v5 = sub_02074470(v6, 10, NULL); + v3 = GetMonData(v6, MON_DATA_177, NULL); + v4 = GetMonData(v6, MON_DATA_178, NULL); + v5 = GetMonData(v6, MON_DATA_10, NULL); if ((v3 == 3) || (v4 == 3) || (v3 == 8) || (v4 == 8) || (v5 == 17)) { v1++; @@ -1155,15 +1155,15 @@ static void ov104_02238C9C (UnkStruct_ov104_0223BFFC * param0, Party * param1, u { int v0, v1; u32 v2, v3, v4, v5; - UnkStruct_02073C74 * v6; + Pokemon * v6; v1 = 0; for (v0 = 0; v0 < param2; v0++) { v6 = Party_GetPokemonBySlotIndex(param1, v0); - v3 = sub_02074470(v6, 177, NULL); - v4 = sub_02074470(v6, 178, NULL); - v5 = sub_02074470(v6, 10, NULL); + v3 = GetMonData(v6, MON_DATA_177, NULL); + v4 = GetMonData(v6, MON_DATA_178, NULL); + v5 = GetMonData(v6, MON_DATA_10, NULL); if ((v3 == 4) || (v4 == 4) || (v5 == 7)) { v1++; @@ -1184,15 +1184,15 @@ static void ov104_02238D14 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u { int v0, v1; u32 v2, v3, v4, v5; - UnkStruct_02073C74 * v6; + Pokemon * v6; v1 = 0; for (v0 = 0; v0 < param2; v0++) { v6 = Party_GetPokemonBySlotIndex(param1, v0); - v3 = sub_02074470(v6, 177, NULL); - v4 = sub_02074470(v6, 178, NULL); - v5 = sub_02074470(v6, 10, NULL); + v3 = GetMonData(v6, MON_DATA_177, NULL); + v4 = GetMonData(v6, MON_DATA_178, NULL); + v5 = GetMonData(v6, MON_DATA_10, NULL); if ((v3 == 10) || (v4 == 10) || (v5 == 41)) { v1++; @@ -1214,14 +1214,14 @@ static void ov104_02238D8C (UnkStruct_ov104_0223BFFC * param0, Party * param1, u u8 v0; int v1, v2; u32 v3, v4; - UnkStruct_02073C74 * v5; + Pokemon * v5; v2 = 0; v0 = (param0->unk_20 % param2); for (v1 = 0; v1 < param2; v1++) { v5 = Party_GetPokemonBySlotIndex(param1, v0); - v4 = sub_02074470(v5, 10, NULL); + v4 = GetMonData(v5, MON_DATA_10, NULL); if ((v4 == 15) || (v4 == 72)) { v2++; @@ -1249,16 +1249,16 @@ static void ov104_02238E08 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u u8 v0; int v1, v2; u32 v3, v4, v5, v6; - UnkStruct_02073C74 * v7; + Pokemon * v7; v2 = 0; v0 = (param0->unk_20 % param2); for (v1 = 0; v1 < param2; v1++) { v7 = Party_GetPokemonBySlotIndex(param1, v0); - v4 = sub_02074470(v7, 177, NULL); - v5 = sub_02074470(v7, 178, NULL); - v6 = sub_02074470(v7, 10, NULL); + v4 = GetMonData(v7, MON_DATA_177, NULL); + v5 = GetMonData(v7, MON_DATA_178, NULL); + v6 = GetMonData(v7, MON_DATA_10, NULL); if ((v4 == 15) || (v5 == 15) || (v6 == 40)) { v2++; @@ -1287,7 +1287,7 @@ static void ov104_02238E9C (UnkStruct_ov104_0223BFFC * param0, Party * param1, u int v0, v1; const u16 * v2; u16 v3, v4; - UnkStruct_02073C74 * v5; + Pokemon * v5; v4 = ov104_0223C124(param0); @@ -1317,7 +1317,7 @@ static void ov104_02238EF8 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u int v0, v1; const u16 * v2; u16 v3, v4; - UnkStruct_02073C74 * v5; + Pokemon * v5; v4 = ov104_0223C124(param0); @@ -1346,11 +1346,11 @@ static void ov104_02238F54 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u { int v0; u32 v1, v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; for (v0 = 0; v0 < param2; v0++) { v3 = Party_GetPokemonBySlotIndex(param1, v0); - v2 = sub_02074470(v3, 161, NULL); + v2 = GetMonData(v3, MON_DATA_161, NULL); v2 += 3; if (v2 > 100) { @@ -1358,7 +1358,7 @@ static void ov104_02238F54 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u v2 = 100; } - v1 = sub_02075AD0(sub_02074470(v3, 5, NULL), v2); + v1 = sub_02075AD0(GetMonData(v3, MON_DATA_SPECIES, NULL), v2); sub_02074B30(v3, 8, &v1); sub_0207418C(v3); @@ -1369,7 +1369,7 @@ static void ov104_02238F54 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u static void ov104_02238FAC (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) { - UnkStruct_02073C74 * v0; + Pokemon * v0; param0->unk_14 = 1001; return; @@ -1377,7 +1377,7 @@ static void ov104_02238FAC (UnkStruct_ov104_0223BFFC * param0, Party * param1, u static void ov104_02238FB8 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) { - UnkStruct_02073C74 * v0; + Pokemon * v0; param0->unk_14 = 2; return; @@ -1385,7 +1385,7 @@ static void ov104_02238FB8 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u static void ov104_02238FC0 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) { - UnkStruct_02073C74 * v0; + Pokemon * v0; param0->unk_14 = 10; return; @@ -1393,7 +1393,7 @@ static void ov104_02238FC0 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u static void ov104_02238FC8 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) { - UnkStruct_02073C74 * v0; + Pokemon * v0; param0->unk_14 = 5; return; @@ -1401,7 +1401,7 @@ static void ov104_02238FC8 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u static void ov104_02238FD0 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) { - UnkStruct_02073C74 * v0; + Pokemon * v0; param0->unk_14 = 14; return; @@ -1409,7 +1409,7 @@ static void ov104_02238FD0 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u static void ov104_02238FD8 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) { - UnkStruct_02073C74 * v0; + Pokemon * v0; param0->unk_14 = 1002; return; @@ -1417,7 +1417,7 @@ static void ov104_02238FD8 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u static void ov104_02238FE4 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) { - UnkStruct_02073C74 * v0; + Pokemon * v0; if (param0->unk_1C < (8 - 1)) { param0->unk_1C++; @@ -1428,7 +1428,7 @@ static void ov104_02238FE4 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u static void ov104_02238FF0 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) { - UnkStruct_02073C74 * v0; + Pokemon * v0; if (param0->unk_1C > 0) { param0->unk_1C--; @@ -1439,7 +1439,7 @@ static void ov104_02238FF0 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u static void ov104_02238FFC (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) { - UnkStruct_02073C74 * v0; + Pokemon * v0; param0->unk_12 = 1; return; @@ -1447,27 +1447,27 @@ static void ov104_02238FFC (UnkStruct_ov104_0223BFFC * param0, Party * param1, u static void ov104_02239004 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) { - UnkStruct_02073C74 * v0; + Pokemon * v0; return; } static void ov104_02239008 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) { u16 v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; return; } static void ov104_0223900C (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) { - UnkStruct_02073C74 * v0; + Pokemon * v0; return; } static void ov104_02239010 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) { - UnkStruct_02073C74 * v0; + Pokemon * v0; return; } @@ -1506,11 +1506,11 @@ u16 ov104_02239014 (UnkStruct_ov104_0223BFFC * param0) void ov104_02239054 (Party * param0, Party * param1, int param2, int param3) { u16 v0; - UnkStruct_02073C74 * v1; - UnkStruct_02073C74 * v2; + Pokemon * v1; + Pokemon * v2; v2 = Party_GetPokemonBySlotIndex(param0, param2); - v0 = sub_02074470(v2, 6, NULL); + v0 = GetMonData(v2, MON_DATA_HELD_ITEM, NULL); v1 = Party_GetPokemonBySlotIndex(param1, param3); sub_02074B30(v1, 6, &v0); diff --git a/src/overlay104/ov104_02239130.c b/src/overlay104/ov104_02239130.c index 14d5db5aa1..14a0f32d81 100644 --- a/src/overlay104/ov104_02239130.c +++ b/src/overlay104/ov104_02239130.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_0202440C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_021C0794_decl.h" #include "overlay104/struct_ov104_0222E930_decl.h" @@ -45,7 +45,7 @@ static BOOL ov104_02239464(UnkStruct_ov104_0222E930 * param0, UnkStruct_0204AFC4 BOOL ov104_02239130 (UnkStruct_ov104_0222E930 * param0) { UnkStruct_0202440C * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; UnkStruct_0204AFC4 * v2; int v3, v4; u16 v5, v6; diff --git a/src/overlay104/ov104_0223A0C4.c b/src/overlay104/ov104_0223A0C4.c index 2fccc36781..1c2da51f1f 100644 --- a/src/overlay104/ov104_0223A0C4.c +++ b/src/overlay104/ov104_0223A0C4.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_02025E6C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" @@ -844,7 +844,7 @@ static u32 ov104_0223A3A8 (UnkStruct_0204AFC4 * param0, UnkStruct_ov104_0223A348 if (param4 == 0) { do { v2 = (sub_0204AEC0(param0) | sub_0204AEC0(param0) << 16); - } while ((v4.unk_0B != sub_02075BFC(v2)) || (sub_02075E38(param3, v2) == 1)); + } while ((v4.unk_0B != GetNatureFromPersonality(v2)) || (sub_02075E38(param3, v2) == 1)); param1->unk_10 = v2; } else { @@ -908,7 +908,7 @@ UnkStruct_ov6_02240D5C * ov104_0223A580 (UnkStruct_0204AFC4 * param0, UnkStruct_ UnkStruct_ov6_02240D5C * v3; UnkStruct_021C0794 * v4; Party * v5; - UnkStruct_02073C74 * v6; + Pokemon * v6; v3 = sub_02051D8C(param0->unk_04, ov104_0223A700(param0->unk_0F)); v4 = param1->unk_08; @@ -919,7 +919,7 @@ UnkStruct_ov6_02240D5C * ov104_0223A580 (UnkStruct_0204AFC4 * param0, UnkStruct_ v3->unk_128 = 18; v3->unk_12C = 18; - v6 = sub_02073C74(param0->unk_04); + v6 = AllocMonZeroed(param0->unk_04); v1 = 50; Party_InitWithCapacity(v3->unk_04[0], param0->unk_0E); @@ -927,8 +927,8 @@ UnkStruct_ov6_02240D5C * ov104_0223A580 (UnkStruct_0204AFC4 * param0, UnkStruct_ for (v0 = 0; v0 < param0->unk_0E; v0++) { sub_020775EC(Party_GetPokemonBySlotIndex(v5, param0->unk_2A[v0]), v6); - if (sub_02074470(v6, 161, NULL) > v1) { - v2 = sub_02075AD0(sub_02074470(v6, 5, NULL), v1); + if (GetMonData(v6, MON_DATA_161, NULL) > v1) { + v2 = sub_02075AD0(GetMonData(v6, MON_DATA_SPECIES, NULL), v1); sub_02074B30(v6, 8, &v2); sub_0207418C(v6); @@ -963,10 +963,10 @@ UnkStruct_ov6_02240D5C * ov104_0223A580 (UnkStruct_0204AFC4 * param0, UnkStruct_ static void ov104_0223A6AC (UnkStruct_ov6_02240D5C * param0, UnkStruct_ov104_0223A348 * param1, int param2, int param3, int param4) { int v0, v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; ov104_0222E284(param0, ¶m1->unk_00, param2, param3, param4); - v2 = sub_02073C74(param4); + v2 = AllocMonZeroed(param4); for (v0 = 0; v0 < param2; v0++) { ov104_0222DF40(¶m1->unk_30[v0], v2, 120); diff --git a/src/overlay104/ov104_0223A7F4.c b/src/overlay104/ov104_0223A7F4.c index df9c53b292..6b9758b42b 100644 --- a/src/overlay104/ov104_0223A7F4.c +++ b/src/overlay104/ov104_0223A7F4.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_0200B144_decl.h" #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02025E6C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_0204B184.h" #include "struct_defs/struct_0204B1E8.h" @@ -346,7 +346,7 @@ UnkStruct_ov6_02240D5C * ov104_0223ABA0 (UnkStruct_ov104_0223ADA0 * param0, UnkS u32 v1; u8 v2, v3; UnkStruct_ov6_02240D5C * v4; - UnkStruct_02073C74 * v5; + Pokemon * v5; UnkStruct_ov104_0223A348_sub1 v6; UnkStruct_0204B184 * v7; UnkStruct_0200B144 * v8; @@ -366,7 +366,7 @@ UnkStruct_ov6_02240D5C * ov104_0223ABA0 (UnkStruct_ov104_0223ADA0 * param0, UnkS v4->unk_12C = 19; Party_InitWithCapacity(v4->unk_04[0], v2); - v5 = sub_02073C74(11); + v5 = AllocMonZeroed(11); for (v0 = 0; v0 < v2; v0++) { sub_020775EC(Party_GetPokemonBySlotIndex(param0->unk_4D4, v0), v5); @@ -386,7 +386,7 @@ UnkStruct_ov6_02240D5C * ov104_0223ABA0 (UnkStruct_ov104_0223ADA0 * param0, UnkS v4->unk_28[v0].unk_0C = ov104_0223AEE4(param0); } - v5 = sub_02073C74(11); + v5 = AllocMonZeroed(11); for (v0 = 0; v0 < v3; v0++) { sub_020775EC(Party_GetPokemonBySlotIndex(param0->unk_4D8, v0), v5); @@ -409,7 +409,7 @@ UnkStruct_ov6_02240D5C * ov104_0223ABA0 (UnkStruct_ov104_0223ADA0 * param0, UnkS ov104_0222E284(v4, &v6, v3, 3, 11); Party_InitWithCapacity(v4->unk_04[3], ov104_0223AA74(param0->unk_04, 0)); - v5 = sub_02073C74(11); + v5 = AllocMonZeroed(11); for (v0 = 0; v0 < v3; v0++) { sub_020775EC(Party_GetPokemonBySlotIndex(param0->unk_4D8, (v3 + v0)), v5); @@ -451,12 +451,12 @@ u8 ov104_0223ADA0 (UnkStruct_ov104_0223ADA0 * param0) void ov104_0223ADB0 (UnkStruct_ov104_0223ADA0 * param0) { int v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; ov104_0222E330(param0->unk_280, param0->unk_254, param0->unk_260, param0->unk_268, NULL, 6, 11, 179); sub_0207A008(param0->unk_4D4); - v1 = sub_02073C74(11); + v1 = AllocMonZeroed(11); for (v0 = 0; v0 < 6; v0++) { ov104_0222DF40(¶m0->unk_280[v0], v1, ov104_0223ADA0(param0)); @@ -471,7 +471,7 @@ void ov104_0223ADB0 (UnkStruct_ov104_0223ADA0 * param0) void ov104_0223AE30 (UnkStruct_ov104_0223ADA0 * param0) { int v0, v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; UnkStruct_ov104_0223A348_sub2 v3[2]; v1 = Party_GetCurrentCount(param0->unk_4D4); @@ -482,7 +482,7 @@ void ov104_0223AE30 (UnkStruct_ov104_0223ADA0 * param0) ov104_0222E330(v3, param0->unk_584, param0->unk_590, param0->unk_598, NULL, 2, 11, 179); - v2 = sub_02073C74(11); + v2 = AllocMonZeroed(11); for (v0 = 0; v0 < 2; v0++) { ov104_0222DF40(&v3[v0], v2, ov104_0223ADA0(param0)); diff --git a/src/overlay104/ov104_0223AF58.c b/src/overlay104/ov104_0223AF58.c index f59c496d00..1a35d2f879 100644 --- a/src/overlay104/ov104_0223AF58.c +++ b/src/overlay104/ov104_0223AF58.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_02025E6C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_0204B184.h" @@ -1577,7 +1577,7 @@ UnkStruct_ov6_02240D5C * ov104_0223B250 (UnkStruct_ov104_0223B5C0 * param0, UnkS u32 v3; u8 v4, v5, v6, v7; UnkStruct_ov6_02240D5C * v8; - UnkStruct_02073C74 * v9; + Pokemon * v9; UnkStruct_ov104_0223A348_sub1 v10; UnkStruct_0204B184 * v11; UnkStruct_02025E6C * v12; @@ -1597,7 +1597,7 @@ UnkStruct_ov6_02240D5C * ov104_0223B250 (UnkStruct_ov104_0223B5C0 * param0, UnkS v8->unk_12C = 22; Party_InitWithCapacity(v8->unk_04[0], v4); - v9 = sub_02073C74(11); + v9 = AllocMonZeroed(11); for (v1 = 0; v1 < v4; v1++) { sub_020775EC(Party_GetPokemonBySlotIndex(v13, param0->unk_260[v1]), v9); @@ -1627,7 +1627,7 @@ UnkStruct_ov6_02240D5C * ov104_0223B250 (UnkStruct_ov104_0223B5C0 * param0, UnkS ov104_0223B518(¶m0->unk_290[v6], v7, param0->unk_18[v6], ¶m0->unk_268[v6], v5, 11, 180); - v9 = sub_02073C74(11); + v9 = AllocMonZeroed(11); for (v1 = 0; v1 < v5; v1++) { while (TRUE) { @@ -1658,7 +1658,7 @@ UnkStruct_ov6_02240D5C * ov104_0223B250 (UnkStruct_ov104_0223B5C0 * param0, UnkS ov104_0222E284(v8, &v10, v5, 3, 11); Party_InitWithCapacity(v8->unk_04[3], v5); - v9 = sub_02073C74(11); + v9 = AllocMonZeroed(11); while (TRUE) { if (ov104_0223B4A4(param0, v6) == 0) { @@ -1806,11 +1806,11 @@ u8 ov104_0223B5C0 (UnkStruct_ov104_0223B5C0 * param0) u32 v0; int v1; Party * v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; v2 = Party_GetFromSavedata(param0->unk_6FC); v3 = Party_GetPokemonBySlotIndex(v2, param0->unk_260[0]); - v1 = sub_02074470(v3, 161, NULL); + v1 = GetMonData(v3, MON_DATA_161, NULL); return v1 / 10; } @@ -1864,16 +1864,16 @@ static u16 ov104_0223B644 (u8 param0) u16 ov104_0223B64C (UnkStruct_ov104_0223B5C0 * param0) { Party * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; u16 v2, v3; v0 = Party_GetFromSavedata(param0->unk_6FC); v1 = Party_GetPokemonBySlotIndex(v0, param0->unk_260[0]); - v2 = sub_02074470(v1, 161, NULL); + v2 = GetMonData(v1, MON_DATA_161, NULL); if (ov104_0223B500(param0->unk_04) == 2) { v1 = Party_GetPokemonBySlotIndex(v0, param0->unk_260[1]); - v3 = sub_02074470(v1, 161, NULL); + v3 = GetMonData(v1, MON_DATA_161, NULL); if (v2 > v3) { return v2; diff --git a/src/overlay104/ov104_0223B6F4.c b/src/overlay104/ov104_0223B6F4.c index 8150a0a255..a0de6c096f 100644 --- a/src/overlay104/ov104_0223B6F4.c +++ b/src/overlay104/ov104_0223B6F4.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02025E6C_decl.h" #include "struct_decls/struct_0203068C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_0204B184.h" @@ -41,8 +41,8 @@ u8 ov104_0223BA10(UnkStruct_ov104_0223BA10 * param0); BOOL ov104_0223BA14(u8 param0); void ov104_0223BA24(Party * param0); void ov104_0223BAB8(UnkStruct_ov104_0223BA10 * param0); -void ov104_0223BA7C(UnkStruct_ov104_0223BA10 * param0, UnkStruct_02073C74 * param1); -void ov104_0223BAA0(UnkStruct_ov104_0223BA10 * param0, Party * param1, UnkStruct_02073C74 * param2); +void ov104_0223BA7C(UnkStruct_ov104_0223BA10 * param0, Pokemon * param1); +void ov104_0223BAA0(UnkStruct_ov104_0223BA10 * param0, Party * param1, Pokemon * param2); static u16 ov104_0223BB10(UnkStruct_ov104_0223BA10 * param0); u16 ov104_0223BB60(UnkStruct_ov104_0223BA10 * param0); u16 ov104_0223BC24(u16 param0); @@ -164,7 +164,7 @@ UnkStruct_ov6_02240D5C * ov104_0223B810 (UnkStruct_ov104_0223BA10 * param0, UnkS u32 v1; u8 v2, v3, v4; UnkStruct_ov6_02240D5C * v5; - UnkStruct_02073C74 * v6; + Pokemon * v6; UnkStruct_ov104_0223A348_sub1 v7; UnkStruct_0204B184 * v8; UnkStruct_0200B144 * v9; @@ -189,7 +189,7 @@ UnkStruct_ov6_02240D5C * ov104_0223B810 (UnkStruct_ov104_0223BA10 * param0, UnkS v4 = 2; } - v6 = sub_02073C74(11); + v6 = AllocMonZeroed(11); for (v0 = 0; v0 < v2; v0++) { sub_020775EC(Party_GetPokemonBySlotIndex(param0->unk_28, (v4 + v0)), v6); @@ -210,7 +210,7 @@ UnkStruct_ov6_02240D5C * ov104_0223B810 (UnkStruct_ov104_0223BA10 * param0, UnkS v5->unk_28[v0].unk_0C = ov104_0223BB10(param0); } - v6 = sub_02073C74(11); + v6 = AllocMonZeroed(11); for (v0 = 0; v0 < v3; v0++) { sub_020775EC(Party_GetPokemonBySlotIndex(param0->unk_2C, v0), v6); @@ -233,7 +233,7 @@ UnkStruct_ov6_02240D5C * ov104_0223B810 (UnkStruct_ov104_0223BA10 * param0, UnkS ov104_0222E284(v5, &v7, v3, 3, 11); Party_InitWithCapacity(v5->unk_04[3], ov104_0223B7DC(param0->unk_10, 0)); - v6 = sub_02073C74(11); + v6 = AllocMonZeroed(11); for (v0 = 0; v0 < v3; v0++) { sub_020775EC(Party_GetPokemonBySlotIndex(param0->unk_2C, (v3 + v0)), v6); @@ -283,18 +283,18 @@ void ov104_0223BA24 (Party * param0) { int v0, v1, v2; u32 v3; - UnkStruct_02073C74 * v4; + Pokemon * v4; v2 = Party_GetCurrentCount(param0); for (v0 = 0; v0 < v2; v0++) { v4 = Party_GetPokemonBySlotIndex(param0, v0); - if (sub_02074470(v4, 172, NULL) == 0) { + if (GetMonData(v4, MON_DATA_172, NULL) == 0) { continue; } - if (sub_02074470(v4, 163, NULL) == 0) { + if (GetMonData(v4, MON_DATA_163, NULL) == 0) { v3 = 1; sub_02074B30(v4, 163, &v3); } @@ -306,13 +306,13 @@ void ov104_0223BA24 (Party * param0) return; } -void ov104_0223BA7C (UnkStruct_ov104_0223BA10 * param0, UnkStruct_02073C74 * param1) +void ov104_0223BA7C (UnkStruct_ov104_0223BA10 * param0, Pokemon * param1) { sub_02077EE4(param1, sub_02025E38(param0->unk_04), 4, 0, 0, 11); return; } -void ov104_0223BAA0 (UnkStruct_ov104_0223BA10 * param0, Party * param1, UnkStruct_02073C74 * param2) +void ov104_0223BAA0 (UnkStruct_ov104_0223BA10 * param0, Party * param1, Pokemon * param2) { ov104_0223BA7C(param0, param2); Party_AddPokemon(param1, param2); @@ -323,12 +323,12 @@ void ov104_0223BAB8 (UnkStruct_ov104_0223BA10 * param0) { int v0, v1; u8 v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; sub_0207A008(param0->unk_2C); v2 = ov104_0223B7DC(param0->unk_10, 1); - v3 = sub_02073C74(11); + v3 = AllocMonZeroed(11); for (v0 = 0; v0 < v2; v0++) { ov104_0222DF40(¶m0->unk_288[v0], v3, ov104_0223BA10(param0)); diff --git a/src/overlay104/ov104_0223BCBC.c b/src/overlay104/ov104_0223BCBC.c index 64206daadf..46c54412ac 100644 --- a/src/overlay104/ov104_0223BCBC.c +++ b/src/overlay104/ov104_0223BCBC.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_0200B144_decl.h" #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02025E6C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_0204B184.h" @@ -33,8 +33,8 @@ static u32 ov104_0223BFD0(u8 param0); u8 ov104_0223BFFC(UnkStruct_ov104_0223BFFC * param0); BOOL ov104_0223C000(u8 param0); void ov104_0223C04C(UnkStruct_ov104_0223BFFC * param0); -void ov104_0223C010(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02073C74 * param1); -void ov104_0223C034(UnkStruct_ov104_0223BFFC * param0, Party * param1, UnkStruct_02073C74 * param2); +void ov104_0223C010(UnkStruct_ov104_0223BFFC * param0, Pokemon * param1); +void ov104_0223C034(UnkStruct_ov104_0223BFFC * param0, Party * param1, Pokemon * param2); u16 ov104_0223C0BC(UnkStruct_ov104_0223BFFC * param0, u8 param1); static u16 ov104_0223C0D0(UnkStruct_ov104_0223BFFC * param0); u16 ov104_0223C124(UnkStruct_ov104_0223BFFC * param0); @@ -167,7 +167,7 @@ UnkStruct_ov6_02240D5C * ov104_0223BDD8 (UnkStruct_ov104_0223BFFC * param0, UnkS u32 v1; u8 v2, v3, v4; UnkStruct_ov6_02240D5C * v5; - UnkStruct_02073C74 * v6; + Pokemon * v6; UnkStruct_ov104_0223A348_sub1 v7; UnkStruct_0204B184 * v8; UnkStruct_0200B144 * v9; @@ -202,7 +202,7 @@ UnkStruct_ov6_02240D5C * ov104_0223BDD8 (UnkStruct_ov104_0223BFFC * param0, UnkS v4 = 2; } - v6 = sub_02073C74(11); + v6 = AllocMonZeroed(11); for (v0 = 0; v0 < v2; v0++) { sub_020775EC(Party_GetPokemonBySlotIndex(v12, (v4 + v0)), v6); @@ -222,7 +222,7 @@ UnkStruct_ov6_02240D5C * ov104_0223BDD8 (UnkStruct_ov104_0223BFFC * param0, UnkS v5->unk_28[v0].unk_0C = ov104_0223C0D0(param0); } - v6 = sub_02073C74(11); + v6 = AllocMonZeroed(11); for (v0 = 0; v0 < v3; v0++) { sub_020775EC(Party_GetPokemonBySlotIndex(v13, v0), v6); @@ -245,7 +245,7 @@ UnkStruct_ov6_02240D5C * ov104_0223BDD8 (UnkStruct_ov104_0223BFFC * param0, UnkS ov104_0222E284(v5, &v7, v3, 3, 11); Party_InitWithCapacity(v5->unk_04[3], ov104_0223BDA4(param0->unk_10, 0)); - v6 = sub_02073C74(11); + v6 = AllocMonZeroed(11); for (v0 = 0; v0 < v3; v0++) { sub_020775EC(Party_GetPokemonBySlotIndex(v13, (v3 + v0)), v6); @@ -294,13 +294,13 @@ BOOL ov104_0223C000 (u8 param0) return 0; } -void ov104_0223C010 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02073C74 * param1) +void ov104_0223C010 (UnkStruct_ov104_0223BFFC * param0, Pokemon * param1) { sub_02077EE4(param1, sub_02025E38(param0->unk_04), 4, 0, 0, 11); return; } -void ov104_0223C034 (UnkStruct_ov104_0223BFFC * param0, Party * param1, UnkStruct_02073C74 * param2) +void ov104_0223C034 (UnkStruct_ov104_0223BFFC * param0, Party * param1, Pokemon * param2) { ov104_0223C010(param0, param2); Party_AddPokemon(param1, param2); @@ -313,13 +313,13 @@ void ov104_0223C04C (UnkStruct_ov104_0223BFFC * param0) int v1, v2; u8 v3; Party * v4; - UnkStruct_02073C74 * v5; - UnkStruct_02073C74 * v6; + Pokemon * v5; + Pokemon * v6; sub_0207A008(param0->unk_74); v3 = ov104_0223BDA4(param0->unk_10, 1); - v5 = sub_02073C74(11); + v5 = AllocMonZeroed(11); for (v1 = 0; v1 < v3; v1++) { ov104_0222DF40(¶m0->unk_330[v1], v5, ov104_0223BFFC(param0)); diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index 83b85167f6..637878a5d0 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -15,8 +15,8 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02025E6C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" #include "overlay105/struct_ov105_02241FF4_decl.h" @@ -216,7 +216,7 @@ static void ov105_02244DC4(UnkStruct_ov105_02241FF4 * param0, u8 param1, u8 para static void ov105_02244DF0(UnkStruct_ov105_02241FF4 * param0); static void ov105_02244E94(UnkStruct_ov105_02241FF4 * param0); static void ov105_02244EE8(UnkStruct_ov105_02241FF4 * param0, u32 param1, s32 param2); -static void ov105_02244F00(UnkStruct_ov105_02241FF4 * param0, u32 param1, UnkStruct_02073C74_sub1 * param2); +static void ov105_02244F00(UnkStruct_ov105_02241FF4 * param0, u32 param1, BoxPokemon * param2); static void ov105_02244F0C(UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA50 * param1, u32 param2, u32 param3, u8 param4); static void ov105_02244F84(UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA50 * param1, u32 param2, u32 param3, u8 param4); static void ov105_02244FF8(UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA50 * param1, u8 param2, u32 param3, u32 param4, u8 param5, u8 param6, u8 param7, u8 param8, const Party * param9); @@ -228,7 +228,7 @@ static BOOL ov105_02245518(UnkStruct_ov105_02241FF4 * param0); static void ov105_02245528(UnkStruct_ov105_02241FF4 * param0, u8 param1); static u8 ov105_02245538(UnkStruct_ov105_02241FF4 * param0, u8 param1, u8 param2); static u32 ov105_02245584(UnkStruct_ov105_02241FF4 * param0, u32 param1); -static void ov105_022455C4(UnkStruct_ov105_02241FF4 * param0, u8 param1, UnkStruct_02073C74 * param2, int param3, int param4, int param5); +static void ov105_022455C4(UnkStruct_ov105_02241FF4 * param0, u8 param1, Pokemon * param2, int param3, int param4, int param5); BOOL ov105_02245620(UnkStruct_ov105_02241FF4 * param0, u16 param1, u16 param2); void ov105_02245684(UnkStruct_ov105_02241FF4 * param0, u16 param1); void ov105_0224569C(int param0, int param1, void * param2, void * param3); @@ -2150,8 +2150,8 @@ static BOOL ov105_022443DC (UnkStruct_ov105_02241FF4 * param0) static BOOL ov105_02244424 (UnkStruct_ov105_02241FF4 * param0) { int v0; - UnkStruct_02073C74 * v1; - UnkStruct_02073C74_sub1 * v2; + Pokemon * v1; + BoxPokemon * v2; switch (param0->unk_08) { case 0: @@ -2706,7 +2706,7 @@ static void ov105_02244EE8 (UnkStruct_ov105_02241FF4 * param0, u32 param1, s32 p return; } -static void ov105_02244F00 (UnkStruct_ov105_02241FF4 * param0, u32 param1, UnkStruct_02073C74_sub1 * param2) +static void ov105_02244F00 (UnkStruct_ov105_02241FF4 * param0, u32 param1, BoxPokemon * param2) { sub_0200B538(param0->unk_20, param1, param2); return; @@ -2767,11 +2767,11 @@ static void ov105_02244FF8 (UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA5 u8 v0; u32 v1, v2, v3; UnkStruct_02023790 * v4; - UnkStruct_02073C74 * v5; + Pokemon * v5; u16 v6[(10 + 1)]; v5 = Party_GetPokemonBySlotIndex(param9, param2); - sub_02074470(v5, 179, v6); + GetMonData(v5, MON_DATA_179, v6); sub_0201ADA4(param1, param7); v4 = sub_02023790((10 + 1), 93); @@ -2779,7 +2779,7 @@ static void ov105_02244FF8 (UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA5 sub_0201D78C(param1, param8, v4, param3, param4, 0xff, (u32)((((param5) & 0xff) << 16) | (((param6) & 0xff) << 8) | (((param7) & 0xff) << 0)), NULL); v0 = sub_0201C294(param1) - 1; - v1 = sub_02074470(v5, 111, NULL); + v1 = GetMonData(v5, MON_DATA_111, NULL); v2 = (v1 == 0) ? 25 : 26; v3 = (v1 == 0) ? ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | (((0 & 0xff) << 0)))) : ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | (((0 & 0xff) << 0)))); @@ -2802,7 +2802,7 @@ static void ov105_022450DC (UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA5 u32 v1, v2; UnkStruct_0200B144 * v3; UnkStruct_02023790 * v4; - UnkStruct_02073C74 * v5; + Pokemon * v5; u16 v6[(10 + 1)]; sub_0201ADA4(param1, param6); @@ -3081,7 +3081,7 @@ static u32 ov105_02245584 (UnkStruct_ov105_02241FF4 * param0, u32 param1) return param1; } -static void ov105_022455C4 (UnkStruct_ov105_02241FF4 * param0, u8 param1, UnkStruct_02073C74 * param2, int param3, int param4, int param5) +static void ov105_022455C4 (UnkStruct_ov105_02241FF4 * param0, u8 param1, Pokemon * param2, int param3, int param4, int param5) { u32 v0, v1; @@ -3089,8 +3089,8 @@ static void ov105_022455C4 (UnkStruct_ov105_02241FF4 * param0, u8 param1, UnkStr sub_02007DEC(param0->unk_12C[param1], 6, 0); - v0 = sub_02074470(param2, 5, NULL); - v1 = sub_02074470(param2, 112, NULL); + v0 = GetMonData(param2, MON_DATA_SPECIES, NULL); + v1 = GetMonData(param2, MON_DATA_FORM, NULL); if (sub_020759CC(v0, v1, 28) == 0) { ov105_02245DB8(param0->unk_12C[param1], param5); @@ -3159,7 +3159,7 @@ void ov105_0224569C (int param0, int param1, void * param2, void * param3) void ov105_022456A8 (UnkStruct_ov105_02241FF4 * param0, u16 param1, u16 param2) { int v0, v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; v1 = 0; @@ -3172,14 +3172,14 @@ void ov105_022456A8 (UnkStruct_ov105_02241FF4 * param0, u16 param1, u16 param2) for (v0 = 0; v0 < param0->unk_11; v0++) { v2 = Party_GetPokemonBySlotIndex(param0->unk_31C, param0->unk_324[v0]); - param0->unk_33C[v0 + v1] = sub_02074470(v2, 5, NULL); + param0->unk_33C[v0 + v1] = GetMonData(v2, MON_DATA_SPECIES, NULL); } v1 += param0->unk_11; for (v0 = 0; v0 < param0->unk_11; v0++) { v2 = Party_GetPokemonBySlotIndex(param0->unk_31C, param0->unk_324[v0]); - param0->unk_33C[v0 + v1] = sub_02074470(v2, 111, NULL); + param0->unk_33C[v0 + v1] = GetMonData(v2, MON_DATA_111, NULL); } v1 += param0->unk_11; diff --git a/src/overlay105/ov105_02245CD0.c b/src/overlay105/ov105_02245CD0.c index 2693343276..9bee59eee9 100644 --- a/src/overlay105/ov105_02245CD0.c +++ b/src/overlay105/ov105_02245CD0.c @@ -3,7 +3,7 @@ #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02007C7C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_02008A90.h" @@ -14,7 +14,7 @@ void ov105_02245CD0(void); void ov105_02245D50(UnkStruct_02007768 * param0); -UnkStruct_02007C7C * ov105_02245D88(UnkStruct_02007768 * param0, int param1, UnkStruct_02073C74 * param2, int param3, int param4, int param5); +UnkStruct_02007C7C * ov105_02245D88(UnkStruct_02007768 * param0, int param1, Pokemon * param2, int param3, int param4, int param5); void ov105_02245DB8(UnkStruct_02007C7C * param0, int param1); void ov105_02245CD0 (void) @@ -52,7 +52,7 @@ void ov105_02245D50 (UnkStruct_02007768 * param0) return; } -UnkStruct_02007C7C * ov105_02245D88 (UnkStruct_02007768 * param0, int param1, UnkStruct_02073C74 * param2, int param3, int param4, int param5) +UnkStruct_02007C7C * ov105_02245D88 (UnkStruct_02007768 * param0, int param1, Pokemon * param2, int param3, int param4, int param5) { UnkStruct_02008A90 v0; UnkStruct_02007C7C * v1; diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c index c01452732e..d91de9c9d6 100644 --- a/src/overlay106/ov106_02241AE0.c +++ b/src/overlay106/ov106_02241AE0.c @@ -14,7 +14,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02025E6C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" #include "overlay106/struct_ov106_02243118_decl.h" @@ -1144,11 +1144,11 @@ static void ov106_02242AC4 (UnkStruct_ov106_02243118 * param0, UnkStruct_0205AA5 u8 v0; u32 v1, v2, v3; UnkStruct_02023790 * v4; - UnkStruct_02073C74 * v5; + Pokemon * v5; u16 v6[(10 + 1)]; v5 = Party_GetPokemonBySlotIndex(param0->unk_290, 0); - sub_02074470(v5, 179, v6); + GetMonData(v5, MON_DATA_179, v6); sub_0201ADA4(param1, param6); v4 = sub_02023790((10 + 1), 98); @@ -1549,7 +1549,7 @@ void ov106_02243130 (int param0, int param1, void * param2, void * param3) void ov106_0224313C (UnkStruct_ov106_02243118 * param0, u16 param1, u16 param2) { int v0, v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; Party * v3; v1 = 0; @@ -1565,7 +1565,7 @@ void ov106_0224313C (UnkStruct_ov106_02243118 * param0, u16 param1, u16 param2) param0->unk_2A0[2] = param0->unk_18; v2 = Party_GetPokemonBySlotIndex(param0->unk_290, 0); - param0->unk_2A0[3] = sub_02074470(v2, 161, NULL); + param0->unk_2A0[3] = GetMonData(v2, MON_DATA_161, NULL); return; } diff --git a/src/overlay106/ov106_02243310.c b/src/overlay106/ov106_02243310.c index ca4b6e9cd3..957da976a1 100644 --- a/src/overlay106/ov106_02243310.c +++ b/src/overlay106/ov106_02243310.c @@ -3,7 +3,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay022/struct_ov22_022559F8.h" @@ -22,7 +22,7 @@ #include "unk_02079D40.h" #include "overlay106/ov106_02243310.h" -void ov106_02243310(UnkStruct_ov106_02243310 * param0, UnkStruct_02073C74 * param1); +void ov106_02243310(UnkStruct_ov106_02243310 * param0, Pokemon * param1); UnkStruct_02022550 * ov106_022434BC(UnkStruct_ov106_02243310 * param0, u32 param1, u32 param2, u32 param3, u8 param4); void ov106_02243570(UnkStruct_ov106_02243310 * param0); static void ov106_022435C8(void); @@ -34,7 +34,7 @@ static const u8 Unk_ov106_0224384C[4] = { 0x2 }; -void ov106_02243310 (UnkStruct_ov106_02243310 * param0, UnkStruct_02073C74 * param1) +void ov106_02243310 (UnkStruct_ov106_02243310 * param0, Pokemon * param1) { int v0; NARC * v1; diff --git a/src/overlay106/ov106_022435FC.c b/src/overlay106/ov106_022435FC.c index 81b719c55f..c9ff1db132 100644 --- a/src/overlay106/ov106_022435FC.c +++ b/src/overlay106/ov106_022435FC.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_02022550_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay106/struct_ov106_02243650_decl.h" #include "overlay106/struct_ov106_02243310.h" @@ -26,7 +26,7 @@ void * ov106_02243650(UnkStruct_ov106_02243650 * param0); void ov106_02243664(UnkStruct_ov106_02243650 * param0, int param1); void ov106_02243670(UnkStruct_ov106_02243650 * param0, u16 param1, u16 param2); void ov106_022436B0(UnkStruct_ov106_02243650 * param0, u32 param1); -void ov106_022436CC(UnkStruct_ov106_02243650 * param0, UnkStruct_02073C74 * param1); +void ov106_022436CC(UnkStruct_ov106_02243650 * param0, Pokemon * param1); UnkStruct_ov106_02243650 * ov106_022435FC (UnkStruct_ov106_02243310 * param0, u32 param1, u32 param2, u16 param3, u16 param4, const u8 * param5) { @@ -91,7 +91,7 @@ void ov106_022436B0 (UnkStruct_ov106_02243650 * param0, u32 param1) return; } -void ov106_022436CC (UnkStruct_ov106_02243650 * param0, UnkStruct_02073C74 * param1) +void ov106_022436CC (UnkStruct_ov106_02243650 * param0, Pokemon * param1) { sub_02021F24(param0->unk_10, sub_02079FC4(param1)); return; diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c index 919f3fb164..61e9c9d16d 100644 --- a/src/overlay107/ov107_02241AE0.c +++ b/src/overlay107/ov107_02241AE0.c @@ -18,8 +18,8 @@ #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_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" #include "overlay107/struct_ov107_02241D6C_decl.h" @@ -329,10 +329,10 @@ static u8 ov107_022437CC(UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * static u8 ov107_02243860(UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9); static u8 ov107_02243890(UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9, u32 param10); static u8 ov107_02243918(UnkStruct_ov107_02241D6C * param0, int param1, u8 param2); -static void ov107_02243950(UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * param1, UnkStruct_02073C74 * param2); +static void ov107_02243950(UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * param1, Pokemon * param2); static void ov107_02243B5C(UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * param1, int param2, u16 param3, u16 param4); -static void ov107_02243B84(UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * param1, UnkStruct_02073C74 * param2); -static void ov107_02243C18(UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * param1, u8 param2, u32 param3, u32 param4, UnkStruct_02073C74 * param5, u32 param6, u32 param7, u32 param8); +static void ov107_02243B84(UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * param1, Pokemon * param2); +static void ov107_02243C18(UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * param1, u8 param2, u32 param3, u32 param4, Pokemon * param5, u32 param6, u32 param7, u32 param8); static void ov107_02243CC0(UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * param1); static void ov107_02243CFC(UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * param1, u8 param2, u8 param3); static void ov107_02243DB0(UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * param1); @@ -364,7 +364,7 @@ static void ov107_022448E8(UnkStruct_0200112C * param0, u32 param1, u8 param2); static void ov107_02244944(UnkStruct_ov107_02241D6C * param0); static void ov107_02244A1C(UnkStruct_0200112C * param0, u32 param1, u8 param2); static void ov107_02244A74(UnkStruct_ov107_02241D6C * param0, u32 param1, s32 param2, u32 param3, int param4); -static void ov107_02244A8C(UnkStruct_ov107_02241D6C * param0, u32 param1, UnkStruct_02073C74_sub1 * param2); +static void ov107_02244A8C(UnkStruct_ov107_02241D6C * param0, u32 param1, BoxPokemon * param2); static void ov107_02244A98(UnkStruct_ov107_02241D6C * param0, u32 param1); static void ov107_02244AB4(UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * param1, u32 param2, u32 param3, u8 param4); static void ov107_02244B24(UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * param1, u32 param2, u32 param3, u8 param4); @@ -386,7 +386,7 @@ static u32 ov107_02245114(UnkStruct_ov107_02241D6C * param0, u8 param1); static void ov107_02245140(UnkStruct_ov107_02241D6C * param0, s8 param1); static void ov107_0224518C(UnkStruct_ov107_02241D6C * param0, s8 param1); static void ov107_022451D8(UnkStruct_ov107_02241D6C * param0); -static BOOL ov107_02245210(UnkStruct_02073C74 * param0); +static BOOL ov107_02245210(Pokemon * param0); static void ov107_02245288(UnkStruct_0205AA50 * param0); BOOL ov107_0224529C(UnkStruct_ov107_02241D6C * param0, u16 param1, u16 param2); void ov107_022452F4(UnkStruct_ov107_02241D6C * param0, u16 param1); @@ -396,7 +396,7 @@ void ov107_022453F8(UnkStruct_ov107_02241D6C * param0, u16 param1); void ov107_02245408(int param0, int param1, void * param2, void * param3); void ov107_0224542C(UnkStruct_ov107_02241D6C * param0); void ov107_02245438(int param0, int param1, void * param2, void * param3); -static void ov107_02245454(UnkStruct_02073C74 * param0, u16 param1); +static void ov107_02245454(Pokemon * param0, u16 param1); static void ov107_02245464(UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * param1); static void ov107_022454F8(UnkStruct_ov107_02241D6C * param0, u8 param1, u8 param2); static void ov107_022455A0(UnkStruct_ov107_02241D6C * param0, u8 param1, u16 param2); @@ -694,7 +694,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) u16 v3; int v4; u32 v5, v6; - UnkStruct_02073C74 * v7; + Pokemon * v7; switch (param0->unk_08) { case 0: @@ -873,7 +873,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) } if (param0->unk_16 == 0) { - if (sub_02074470(v7, 163, NULL) == sub_02074470(v7, 164, NULL)) { + if (GetMonData(v7, MON_DATA_163, NULL) == GetMonData(v7, MON_DATA_164, NULL)) { param0->unk_0A = ov107_02243918(param0, 37, 1); param0->unk_08 = 7; break; @@ -885,7 +885,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) break; } } else { - if ((sub_02074470(v7, 163, NULL) == sub_02074470(v7, 164, NULL)) && (ov107_02245210(v7) == 0)) { + if ((GetMonData(v7, MON_DATA_163, NULL) == GetMonData(v7, MON_DATA_164, NULL)) && (ov107_02245210(v7) == 0)) { param0->unk_0A = ov107_02243918(param0, 37, 1); param0->unk_08 = 7; break; @@ -1078,7 +1078,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) break; } - if (sub_02074470(v7, 6, NULL) == 0) { + if (GetMonData(v7, MON_DATA_HELD_ITEM, NULL) == 0) { if (ov104_0223BA14(param0->unk_09) == 0) { ov107_02244120(param0); ov107_02249DBC(¶m0->unk_50[6], sub_02027B50(param0->unk_1C8)); @@ -1095,7 +1095,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) } } else { ov107_02244A8C(param0, 0, sub_02076B10(v7)); - sub_0200B744(param0->unk_24, 1, sub_02074470(v7, 6, NULL)); + sub_0200B744(param0->unk_24, 1, GetMonData(v7, MON_DATA_HELD_ITEM, NULL)); param0->unk_0A = ov107_02243918(param0, 60, 1); param0->unk_08 = 16; } @@ -1262,7 +1262,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) static BOOL ov107_02242C64 (UnkStruct_ov107_02241D6C * param0) { u8 v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; switch (param0->unk_08) { case 0: @@ -1453,7 +1453,7 @@ static void ov107_02242F5C (UnkStruct_ov107_02241D6C * param0) u16 v7, v8, v9, v10, v11, v12, v13, v14; int v15, v16, v17; UnkStruct_0205AA50 * v18; - UnkStruct_02073C74 * v19; + Pokemon * v19; param0->unk_440 = NARC_ctor(150, 100); @@ -1499,12 +1499,12 @@ static void ov107_02242F5C (UnkStruct_ov107_02241D6C * param0) v19 = Party_GetPokemonBySlotIndex(param0->unk_43C, v15); - if (sub_02074470(v19, 6, NULL) == 0) { + if (GetMonData(v19, MON_DATA_HELD_ITEM, NULL) == 0) { ov107_02249BAC(param0->unk_404[v15], 0); } - v2 = sub_02074470(v19, 163, NULL); - v3 = sub_02074470(v19, 164, NULL); + v2 = GetMonData(v19, MON_DATA_163, NULL); + v3 = GetMonData(v19, MON_DATA_164, NULL); v4 = ov107_022450E8(param0, sub_0208C104(v2, v3, 48)); v5 = ov107_02245114(param0, sub_0208C104(v2, v3, 48)); @@ -2027,7 +2027,7 @@ static u8 ov107_02243918 (UnkStruct_ov107_02241D6C * param0, int param1, u8 para return v0; } -asm static void ov107_02243950 (UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * param1, UnkStruct_02073C74 * param2) +asm static void ov107_02243950 (UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * param1, Pokemon * param2) { push {r4, r5, r6, lr} sub sp, #8 @@ -2040,7 +2040,7 @@ asm static void ov107_02243950 (UnkStruct_ov107_02241D6C * param0, UnkStruct_020 add r0, r6, #0 mov r1, #6 mov r2, #0 - bl sub_02074470 + bl GetMonData add r2, r0, #0 ldr r0, [r5, #0x24] mov r1, #0 @@ -2088,7 +2088,7 @@ asm static void ov107_02243950 (UnkStruct_ov107_02241D6C * param0, UnkStruct_020 add r0, r6, #0 mov r1, #0xa mov r2, #0 - bl sub_02074470 + bl GetMonData add r2, r0, #0 ldr r0, [r5, #0x24] mov r1, #0 @@ -2113,7 +2113,7 @@ asm static void ov107_02243950 (UnkStruct_ov107_02241D6C * param0, UnkStruct_020 add r0, r6, #0 mov r1, #0xa5 mov r2, #0 - bl sub_02074470 + bl GetMonData add r2, r0, #0 mov r0, #1 str r0, [sp] @@ -2141,7 +2141,7 @@ asm static void ov107_02243950 (UnkStruct_ov107_02241D6C * param0, UnkStruct_020 add r0, r6, #0 mov r1, #0xa6 mov r2, #0 - bl sub_02074470 + bl GetMonData add r2, r0, #0 mov r0, #1 str r0, [sp] @@ -2170,7 +2170,7 @@ asm static void ov107_02243950 (UnkStruct_ov107_02241D6C * param0, UnkStruct_020 add r0, r6, #0 mov r1, #0xa8 mov r2, #0 - bl sub_02074470 + bl GetMonData add r2, r0, #0 mov r0, #1 str r0, [sp] @@ -2198,7 +2198,7 @@ asm static void ov107_02243950 (UnkStruct_ov107_02241D6C * param0, UnkStruct_020 add r0, r6, #0 mov r1, #0xa9 mov r2, #0 - bl sub_02074470 + bl GetMonData add r2, r0, #0 mov r0, #1 str r0, [sp] @@ -2227,7 +2227,7 @@ asm static void ov107_02243950 (UnkStruct_ov107_02241D6C * param0, UnkStruct_020 add r0, r6, #0 mov r1, #0xa7 mov r2, #0 - bl sub_02074470 + bl GetMonData add r2, r0, #0 mov r0, #1 str r0, [sp] @@ -2281,7 +2281,7 @@ asm static void ov107_02243B5C (UnkStruct_ov107_02241D6C * param0, UnkStruct_020 pop {r3, r4, pc} } -static void ov107_02243B84 (UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * param1, UnkStruct_02073C74 * param2) +static void ov107_02243B84 (UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * param1, Pokemon * param2) { sub_0201ADA4(param1, 0); @@ -2294,7 +2294,7 @@ static void ov107_02243B84 (UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA5 return; } -static void ov107_02243C18 (UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * param1, u8 param2, u32 param3, u32 param4, UnkStruct_02073C74 * param5, u32 param6, u32 param7, u32 param8) +static void ov107_02243C18 (UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * param1, u8 param2, u32 param3, u32 param4, Pokemon * param5, u32 param6, u32 param7, u32 param8) { u16 v0, v1, v2, v3; @@ -2303,11 +2303,11 @@ static void ov107_02243C18 (UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA5 v2 = 137; v3 = 12 + (param2 * 24); - sub_0200B630(param0->unk_24, param2, sub_02074470(param5, param6, NULL)); + sub_0200B630(param0->unk_24, param2, GetMonData(param5, param6, NULL)); param0->unk_0A = ov107_02243860(param0, param1, param3, v0, v1, 0xff, 1, 2, 0, 0); - ov107_02244A74(param0, 4, sub_02074470(param5, param7, NULL), 3, 0); - ov107_02244A74(param0, 5, sub_02074470(param5, param8, NULL), 3, 0); + ov107_02244A74(param0, 4, GetMonData(param5, param7, NULL), MON_DATA_3, 0); + ov107_02244A74(param0, 5, GetMonData(param5, param8, NULL), MON_DATA_3, 0); param0->unk_0A = ov107_02243890(param0, param1, param4, v2, v3, 0xff, 1, 2, 0, 0, 1); return; @@ -2333,7 +2333,7 @@ static void ov107_02243CC0 (UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA5 static void ov107_02243CFC (UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA50 * param1, u8 param2, u8 param3) { u16 v0, v1, v2, v3, v4, v5, v6; - UnkStruct_02073C74 * v7; + Pokemon * v7; v7 = Party_GetPokemonBySlotIndex(param0->unk_43C, param2); @@ -2359,9 +2359,9 @@ static void ov107_02243CFC (UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA5 v4 = 0; } - sub_0200C5BC(param0->unk_1C4, sub_02074470(v7, 163, NULL), 3, 1, param1, v1, v2); + sub_0200C5BC(param0->unk_1C4, GetMonData(v7, MON_DATA_163, NULL), 3, 1, param1, v1, v2); sub_0200C578(param0->unk_1C4, 0, param1, v5, v6); - sub_0200C5BC(param0->unk_1C4, sub_02074470(v7, 164, NULL), 3, 0, param1, v3, v4); + sub_0200C5BC(param0->unk_1C4, GetMonData(v7, MON_DATA_164, NULL), 3, 0, param1, v3, v4); return; } @@ -2385,7 +2385,7 @@ static void ov107_02243DE4 (UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA5 { u32 v0, v1, v2, v3, v4; u16 v5, v6; - UnkStruct_02073C74 * v7; + Pokemon * v7; if (ov104_0223BA14(param0->unk_09) == 0) { v5 = 40; @@ -2409,8 +2409,8 @@ static void ov107_02243DE4 (UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA5 v4 = 0; } - sub_0200C648(param0->unk_1C4, 1, sub_02074470(v7, 161, NULL), 3, 0, param1, v1, v2); - v0 = sub_02074470(v7, 111, NULL); + sub_0200C648(param0->unk_1C4, 1, GetMonData(v7, MON_DATA_161, NULL), 3, 0, param1, v1, v2); + v0 = GetMonData(v7, MON_DATA_111, NULL); ov107_02244B8C(param0, param1, v3, v4, 0, v0); return; @@ -3056,7 +3056,7 @@ static void ov107_02244A74 (UnkStruct_ov107_02241D6C * param0, u32 param1, s32 p return; } -static void ov107_02244A8C (UnkStruct_ov107_02241D6C * param0, u32 param1, UnkStruct_02073C74_sub1 * param2) +static void ov107_02244A8C (UnkStruct_ov107_02241D6C * param0, u32 param1, BoxPokemon * param2) { sub_0200B538(param0->unk_24, param1, param2); return; @@ -3342,12 +3342,12 @@ static BOOL ov107_02244E44 (UnkStruct_ov107_02241D6C * param0, u8 param1, u8 par u32 v0, v1, v2, v3; u16 v4; u8 v5; - UnkStruct_02073C74 * v6; + Pokemon * v6; v5 = ov107_02249C98(param0->unk_14, param1); v6 = Party_GetPokemonBySlotIndex(param0->unk_43C, v5); - v0 = sub_02074470(v6, 163, NULL); - v1 = sub_02074470(v6, 164, NULL); + v0 = GetMonData(v6, MON_DATA_163, NULL); + v1 = GetMonData(v6, MON_DATA_164, NULL); v2 = ov107_022450E8(param0, sub_0208C104(v0, v1, 48)); v3 = ov107_02245114(param0, sub_0208C104(v0, v1, 48)); @@ -3380,7 +3380,7 @@ static BOOL ov107_02244E44 (UnkStruct_ov107_02241D6C * param0, u8 param1, u8 par } if (param0->unk_414 == NULL) { - ov107_02243F4C(param0, ¶m0->unk_50[3], v5, sub_02074470(v6, 163, NULL)); + ov107_02243F4C(param0, ¶m0->unk_50[3], v5, GetMonData(v6, MON_DATA_163, NULL)); ov107_02249BEC(param0->unk_420[v5], v3); ov107_02249C1C(param0->unk_3F4[v5], v2); param0->unk_0E_2 = 0; @@ -3504,7 +3504,7 @@ static u32 ov107_02245114 (UnkStruct_ov107_02241D6C * param0, u8 param1) static void ov107_02245140 (UnkStruct_ov107_02241D6C * param0, s8 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; s8 v1; v1 = param0->unk_0D; @@ -3527,7 +3527,7 @@ static void ov107_02245140 (UnkStruct_ov107_02241D6C * param0, s8 param1) static void ov107_0224518C (UnkStruct_ov107_02241D6C * param0, s8 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; s8 v1; v1 = param0->unk_0D; @@ -3562,25 +3562,25 @@ static void ov107_022451D8 (UnkStruct_ov107_02241D6C * param0) return; } -static BOOL ov107_02245210 (UnkStruct_02073C74 * param0) +static BOOL ov107_02245210 (Pokemon * param0) { u8 v0; v0 = 0; - if (sub_02074470(param0, 58, NULL) != sub_02074470(param0, 66, NULL)) { + if (GetMonData(param0, MON_DATA_58, NULL) != GetMonData(param0, MON_DATA_66, NULL)) { v0 = 1; } - if (sub_02074470(param0, 59, NULL) != sub_02074470(param0, 67, NULL)) { + if (GetMonData(param0, MON_DATA_59, NULL) != GetMonData(param0, MON_DATA_67, NULL)) { v0 = 1; } - if (sub_02074470(param0, 60, NULL) != sub_02074470(param0, 68, NULL)) { + if (GetMonData(param0, MON_DATA_60, NULL) != GetMonData(param0, MON_DATA_68, NULL)) { v0 = 1; } - if (sub_02074470(param0, 61, NULL) != sub_02074470(param0, 69, NULL)) { + if (GetMonData(param0, MON_DATA_61, NULL) != GetMonData(param0, MON_DATA_69, NULL)) { v0 = 1; } @@ -3766,7 +3766,7 @@ void ov107_02245438 (int param0, int param1, void * param2, void * param3) return; } -static void ov107_02245454 (UnkStruct_02073C74 * param0, u16 param1) +static void ov107_02245454 (Pokemon * param0, u16 param1) { sub_02096954(param0, param1, 0, 0, 100); return; @@ -3813,7 +3813,7 @@ static void ov107_02245464 (UnkStruct_ov107_02241D6C * param0, UnkStruct_0205AA5 static void ov107_022454F8 (UnkStruct_ov107_02241D6C * param0, u8 param1, u8 param2) { u32 v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; v1 = Party_GetPokemonBySlotIndex(param0->unk_43C, ov107_02249C98(param0->unk_14, param1)); v0 = ov107_02249CAC(param0->unk_1CC, param0->unk_09, 0); @@ -3846,7 +3846,7 @@ static void ov107_022454F8 (UnkStruct_ov107_02241D6C * param0, u8 param1, u8 par static void ov107_022455A0 (UnkStruct_ov107_02241D6C * param0, u8 param1, u16 param2) { - UnkStruct_02073C74 * v0; + Pokemon * v0; v0 = Party_GetPokemonBySlotIndex(param0->unk_43C, ov107_02249C98(param0->unk_14, param1)); @@ -4282,7 +4282,7 @@ static void ov107_022459D0 (UnkStruct_ov107_02241D6C * param0, u8 param1, u8 par static void ov107_02245B40 (UnkStruct_ov107_02241D6C * param0, u8 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; ov107_02243630(param0, 2); @@ -4299,7 +4299,7 @@ static void ov107_02245B40 (UnkStruct_ov107_02241D6C * param0, u8 param1) static void ov107_02245B90 (UnkStruct_ov107_02241D6C * param0, u8 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; ov107_022436AC(param0, 2); @@ -4328,13 +4328,13 @@ static void ov107_02245C00 (UnkStruct_ov107_02241D6C * param0) { int v0; u8 v1, v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; v1 = ov104_0223B7A8(param0->unk_09, 1); for (v0 = 0; v0 < v1; v0++) { v3 = Party_GetPokemonBySlotIndex(param0->unk_43C, v0); - v2 = ov104_0222E240(sub_02074470(v3, 163, NULL), sub_02074470(v3, 164, NULL)); + v2 = ov104_0222E240(GetMonData(v3, MON_DATA_163, NULL), GetMonData(v3, MON_DATA_164, NULL)); if (param0->unk_3F4[v0] != NULL) { ov107_02249C1C(param0->unk_3F4[v0], v2); diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c index c8c30ae34e..165a0c6f7e 100644 --- a/src/overlay107/ov107_02245EB0.c +++ b/src/overlay107/ov107_02245EB0.c @@ -18,8 +18,8 @@ #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_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" #include "overlay107/struct_ov107_02246170_decl.h" @@ -183,10 +183,10 @@ static u8 ov107_02247680(UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA50 * static u8 ov107_02247714(UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA50 * param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9); static u8 ov107_02247744(UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA50 * param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9, u32 param10); static u8 ov107_022477CC(UnkStruct_ov107_02246170 * param0, int param1, u8 param2); -static void ov107_02247804(UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA50 * param1, UnkStruct_02073C74 * param2); +static void ov107_02247804(UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA50 * param1, Pokemon * param2); static void ov107_02247A14(UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA50 * param1, int param2, u16 param3, u16 param4, u32 param5); -static void ov107_02247A3C(UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA50 * param1, UnkStruct_02073C74 * param2); -static void ov107_02247AD0(UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA50 * param1, u8 param2, u32 param3, u32 param4, UnkStruct_02073C74 * param5, u32 param6, u32 param7, u32 param8); +static void ov107_02247A3C(UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA50 * param1, Pokemon * param2); +static void ov107_02247AD0(UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA50 * param1, u8 param2, u32 param3, u32 param4, Pokemon * param5, u32 param6, u32 param7, u32 param8); static void ov107_02247B78(UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA50 * param1); static void ov107_02247C64(UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA50 * param1); static void ov107_02247D04(UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA50 * param1, u8 param2); @@ -199,7 +199,7 @@ static void ov107_02247F6C(UnkStruct_ov107_02246170 * param0); static void ov107_02248028(UnkStruct_0200112C * param0, u32 param1, u8 param2); static void ov107_022480A0(UnkStruct_0200112C * param0, u32 param1, u8 param2); static void ov107_022480EC(UnkStruct_ov107_02246170 * param0, u32 param1, s32 param2, u32 param3, int param4); -static void ov107_02248104(UnkStruct_ov107_02246170 * param0, u32 param1, UnkStruct_02073C74_sub1 * param2); +static void ov107_02248104(UnkStruct_ov107_02246170 * param0, u32 param1, BoxPokemon * param2); static void ov107_02248110(UnkStruct_ov107_02246170 * param0, u32 param1); static void ov107_0224812C(UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA50 * param1, u32 param2, u32 param3, u8 param4); static void ov107_02248194(UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA50 * param1, u32 param2, u32 param3, u8 param4); @@ -489,7 +489,7 @@ static BOOL ov107_022462CC (UnkStruct_ov107_02246170 * param0) u16 v1, v2; int v3, v4; u32 v5, v6, v7; - UnkStruct_02073C74 * v8; + Pokemon * v8; switch (param0->unk_08) { case 0: @@ -1686,7 +1686,7 @@ static u8 ov107_022477CC (UnkStruct_ov107_02246170 * param0, int param1, u8 para return v0; } -asm static void ov107_02247804 (UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA50 * param1, UnkStruct_02073C74 * param2) +asm static void ov107_02247804 (UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA50 * param1, Pokemon * param2) { push {r4, r5, r6, lr} sub sp, #8 @@ -1699,7 +1699,7 @@ asm static void ov107_02247804 (UnkStruct_ov107_02246170 * param0, UnkStruct_020 add r0, r6, #0 mov r1, #6 mov r2, #0 - bl sub_02074470 + bl GetMonData add r2, r0, #0 ldr r0, [r5, #0x24] mov r1, #0 @@ -1748,7 +1748,7 @@ asm static void ov107_02247804 (UnkStruct_ov107_02246170 * param0, UnkStruct_020 add r0, r6, #0 mov r1, #0xa mov r2, #0 - bl sub_02074470 + bl GetMonData add r2, r0, #0 ldr r0, [r5, #0x24] mov r1, #0 @@ -1774,7 +1774,7 @@ asm static void ov107_02247804 (UnkStruct_ov107_02246170 * param0, UnkStruct_020 add r0, r6, #0 mov r1, #0xa5 mov r2, #0 - bl sub_02074470 + bl GetMonData add r2, r0, #0 mov r0, #1 str r0, [sp] @@ -1803,7 +1803,7 @@ asm static void ov107_02247804 (UnkStruct_ov107_02246170 * param0, UnkStruct_020 add r0, r6, #0 mov r1, #0xa6 mov r2, #0 - bl sub_02074470 + bl GetMonData add r2, r0, #0 mov r0, #1 str r0, [sp] @@ -1831,7 +1831,7 @@ asm static void ov107_02247804 (UnkStruct_ov107_02246170 * param0, UnkStruct_020 add r0, r6, #0 mov r1, #0xa8 mov r2, #0 - bl sub_02074470 + bl GetMonData add r2, r0, #0 mov r0, #1 str r0, [sp] @@ -1860,7 +1860,7 @@ asm static void ov107_02247804 (UnkStruct_ov107_02246170 * param0, UnkStruct_020 add r0, r6, #0 mov r1, #0xa9 mov r2, #0 - bl sub_02074470 + bl GetMonData add r2, r0, #0 mov r0, #1 str r0, [sp] @@ -1889,7 +1889,7 @@ asm static void ov107_02247804 (UnkStruct_ov107_02246170 * param0, UnkStruct_020 add r0, r6, #0 mov r1, #0xa7 mov r2, #0 - bl sub_02074470 + bl GetMonData add r2, r0, #0 mov r0, #1 str r0, [sp] @@ -1926,7 +1926,7 @@ static void ov107_02247A14 (UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA5 return; } -static void ov107_02247A3C (UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA50 * param1, UnkStruct_02073C74 * param2) +static void ov107_02247A3C (UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA50 * param1, Pokemon * param2) { sub_0201ADA4(param1, 0); @@ -1939,7 +1939,7 @@ static void ov107_02247A3C (UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA5 return; } -asm static void ov107_02247AD0 (UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA50 * param1, u8 param2, u32 param3, u32 param4, UnkStruct_02073C74 * param5, u32 param6, u32 param7, u32 param8) +asm static void ov107_02247AD0 (UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA50 * param1, u8 param2, u32 param3, u32 param4, Pokemon * param5, u32 param6, u32 param7, u32 param8) { push {r4, r5, r6, r7, lr} sub sp, #0x1c @@ -1950,7 +1950,7 @@ asm static void ov107_02247AD0 (UnkStruct_ov107_02246170 * param0, UnkStruct_020 ldr r1, [sp, #0x38] mov r2, #0 add r7, r3, #0 - bl sub_02074470 + bl GetMonData add r2, r0, #0 ldr r0, [r4, #0x24] add r1, r5, #0 @@ -1979,7 +1979,7 @@ asm static void ov107_02247AD0 (UnkStruct_ov107_02246170 * param0, UnkStruct_020 ldr r0, [sp, #0x34] ldr r1, [sp, #0x3c] mov r2, #0 - bl sub_02074470 + bl GetMonData add r2, r0, #0 mov r0, #0 str r0, [sp] @@ -1990,7 +1990,7 @@ asm static void ov107_02247AD0 (UnkStruct_ov107_02246170 * param0, UnkStruct_020 ldr r0, [sp, #0x34] ldr r1, [sp, #0x40] mov r2, #0 - bl sub_02074470 + bl GetMonData add r2, r0, #0 mov r0, #0 str r0, [sp] @@ -2024,7 +2024,7 @@ static void ov107_02247B78 (UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA5 u16 v0; u8 v1; int v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; sub_0201ADA4(param1, 0); @@ -2045,9 +2045,9 @@ static void ov107_02247B78 (UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA5 v3 = Party_GetPokemonBySlotIndex(param0->unk_3DC, v2); - sub_0200C5BC(param0->unk_144, sub_02074470(v3, 163, NULL), 3, 1, param1, v0 + (64 * v2), 1); + sub_0200C5BC(param0->unk_144, GetMonData(v3, MON_DATA_163, NULL), 3, 1, param1, v0 + (64 * v2), 1); sub_0200C578(param0->unk_144, 0, param1, 24 + v0 + (64 * v2), 1); - sub_0200C5BC(param0->unk_144, sub_02074470(v3, 164, NULL), 3, 0, param1, 32 + v0 + (64 * v2), 1); + sub_0200C5BC(param0->unk_144, GetMonData(v3, MON_DATA_164, NULL), 3, 0, param1, 32 + v0 + (64 * v2), 1); } sub_0201A9A4(param1); @@ -2060,7 +2060,7 @@ static void ov107_02247C64 (UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA5 u16 v1, v2; u8 v3; int v4; - UnkStruct_02073C74 * v5; + Pokemon * v5; sub_0201ADA4(param1, 0); @@ -2076,9 +2076,9 @@ static void ov107_02247C64 (UnkStruct_ov107_02246170 * param0, UnkStruct_0205AA5 for (v4 = 0; v4 < v3; v4++) { v5 = Party_GetPokemonBySlotIndex(param0->unk_3DC, v4); - sub_0200C648(param0->unk_144, 1, sub_02074470(v5, 161, NULL), 3, 0, param1, v1 + (64 * v4), 1); + sub_0200C648(param0->unk_144, 1, GetMonData(v5, MON_DATA_161, NULL), 3, 0, param1, v1 + (64 * v4), 1); - v0 = sub_02074470(v5, 111, NULL); + v0 = GetMonData(v5, MON_DATA_111, NULL); ov107_022481FC(param0, param1, v2 + (64 * v4), 1, 0, v0); } @@ -2340,7 +2340,7 @@ static void ov107_022480EC (UnkStruct_ov107_02246170 * param0, u32 param1, s32 p return; } -static void ov107_02248104 (UnkStruct_ov107_02246170 * param0, u32 param1, UnkStruct_02073C74_sub1 * param2) +static void ov107_02248104 (UnkStruct_ov107_02246170 * param0, u32 param1, BoxPokemon * param2) { sub_0200B538(param0->unk_24, param1, param2); return; @@ -2667,7 +2667,7 @@ static BOOL ov107_0224850C (UnkStruct_ov107_02246170 * param0, u8 param1, u8 par u16 v0; u32 v1; u8 v2, v3; - UnkStruct_02073C74 * v4; + Pokemon * v4; v3 = param0->unk_15; v2 = ov107_02249C98(param0->unk_14, param1); @@ -2743,7 +2743,7 @@ static BOOL ov107_02248674 (UnkStruct_ov107_02246170 * param0, u8 param1, u8 par { u32 v0; u8 v1, v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; v2 = param0->unk_15; v1 = ov107_02249C98(param0->unk_14, param1); @@ -2816,7 +2816,7 @@ static u16 ov107_02248770 (u8 param0) static void ov107_0224877C (UnkStruct_ov107_02246170 * param0, s8 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; s8 v1; v1 = param0->unk_0D; @@ -2848,7 +2848,7 @@ static void ov107_0224877C (UnkStruct_ov107_02246170 * param0, s8 param1) static void ov107_022487DC (UnkStruct_ov107_02246170 * param0, s8 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; s8 v1; v1 = param0->unk_0D; @@ -3071,7 +3071,7 @@ void ov107_02248A10 (int param0, int param1, void * param2, void * param3) static void ov107_02248A2C (UnkStruct_ov107_02246170 * param0, u8 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; ov107_0224752C(param0, 2); ov107_02248860(¶m0->unk_50[7]); @@ -3093,7 +3093,7 @@ static void ov107_02248A74 (UnkStruct_ov107_02246170 * param0, u8 param1) static void ov107_02248A8C (UnkStruct_ov107_02246170 * param0, u8 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; ov107_02249DBC(¶m0->unk_50[7], sub_02027B50(param0->unk_148)); @@ -3111,7 +3111,7 @@ static void ov107_02248A8C (UnkStruct_ov107_02246170 * param0, u8 param1) static void ov107_02248AF0 (UnkStruct_ov107_02246170 * param0, u8 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; ov107_022475A8(param0, 2); ov107_02248860(¶m0->unk_50[7]); @@ -3133,7 +3133,7 @@ static void ov107_02248B38 (UnkStruct_ov107_02246170 * param0, u8 param1) static void ov107_02248B50 (UnkStruct_ov107_02246170 * param0, u8 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; ov107_02249DBC(¶m0->unk_50[7], sub_02027B50(param0->unk_148)); @@ -3552,7 +3552,7 @@ static void ov107_02248F18 (UnkStruct_ov107_02246170 * param0, u8 param1, u8 par static void ov107_02249024 (UnkStruct_ov107_02246170 * param0, u8 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; v0 = Party_GetPokemonBySlotIndex(param0->unk_3DC, ov107_02249C98(param0->unk_14, param1)); @@ -3577,7 +3577,7 @@ static void ov107_02249024 (UnkStruct_ov107_02246170 * param0, u8 param1) static void ov107_022490E8 (UnkStruct_ov107_02246170 * param0, u8 param1, u8 param2) { u32 v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; ov107_02249DBC(¶m0->unk_50[7], sub_02027B50(param0->unk_148)); v1 = Party_GetPokemonBySlotIndex(param0->unk_3DC, ov107_02249C98(param0->unk_14, param1)); @@ -3598,15 +3598,15 @@ static void ov107_022490E8 (UnkStruct_ov107_02246170 * param0, u8 param1, u8 par } if (param0->unk_3D0[ov107_02249C98(param0->unk_14, param1)] == 0) { - v0 = sub_02075AD0(sub_02074470(v1, 5, NULL), 50); + v0 = sub_02075AD0(GetMonData(v1, MON_DATA_SPECIES, NULL), 50); sub_02074B30(v1, 8, &v0); sub_0207418C(v1); } else if (param0->unk_3D0[ov107_02249C98(param0->unk_14, param1)] == 1) { - v0 = sub_02075AD0(sub_02074470(v1, 5, NULL), 55); + v0 = sub_02075AD0(GetMonData(v1, MON_DATA_SPECIES, NULL), 55); sub_02074B30(v1, 8, &v0); sub_0207418C(v1); } else { - v0 = sub_02075AD0(sub_02074470(v1, 5, NULL), 45); + v0 = sub_02075AD0(GetMonData(v1, MON_DATA_SPECIES, NULL), 45); sub_02074B30(v1, 8, &v0); sub_0207418C(v1); } @@ -3649,13 +3649,13 @@ static void ov107_022492A8 (UnkStruct_ov107_02246170 * param0) { int v0; u8 v1, v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; v1 = ov104_0223B7A8(param0->unk_09, 1); for (v0 = 0; v0 < v1; v0++) { v3 = Party_GetPokemonBySlotIndex(param0->unk_3DC, v0); - v2 = ov104_0222E240(sub_02074470(v3, 163, NULL), sub_02074470(v3, 164, NULL)); + v2 = ov104_0222E240(GetMonData(v3, MON_DATA_163, NULL), GetMonData(v3, MON_DATA_164, NULL)); if (param0->unk_368[v0] != NULL) { ov107_02249C1C(param0->unk_368[v0], v2); diff --git a/src/overlay107/ov107_02249604.c b/src/overlay107/ov107_02249604.c index 4091b6d4f9..35e503c26d 100644 --- a/src/overlay107/ov107_02249604.c +++ b/src/overlay107/ov107_02249604.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "overlay019/struct_ov19_021DA864.h" @@ -47,7 +47,7 @@ void ov107_02249604 (UnkStruct_ov107_02249954 * param0, Party * param1, u8 param { int v0; NARC * v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; sub_0201DBEC(32, 100); ov107_02249A3C(); diff --git a/src/overlay107/ov107_02249B1C.c b/src/overlay107/ov107_02249B1C.c index d92adaa2c7..ab4d8856f9 100644 --- a/src/overlay107/ov107_02249B1C.c +++ b/src/overlay107/ov107_02249B1C.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_02022550_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay107/struct_ov107_02249B8C_decl.h" #include "overlay107/struct_ov107_02249954.h" @@ -26,7 +26,7 @@ void * ov107_02249B8C(UnkStruct_ov107_02249B8C * param0); void ov107_02249BAC(UnkStruct_ov107_02249B8C * param0, int param1); void ov107_02249BB8(UnkStruct_ov107_02249B8C * param0, u16 param1, u16 param2); void ov107_02249BEC(UnkStruct_ov107_02249B8C * param0, u32 param1); -void ov107_02249C08(UnkStruct_ov107_02249B8C * param0, UnkStruct_02073C74 * param1); +void ov107_02249C08(UnkStruct_ov107_02249B8C * param0, Pokemon * param1); void ov107_02249C1C(UnkStruct_ov107_02249B8C * param0, u8 param1); void ov107_02249C28(UnkStruct_ov107_02249B8C * param0, u8 param1); BOOL ov107_02249C40(UnkStruct_ov107_02249B8C * param0); @@ -92,7 +92,7 @@ void ov107_02249BEC (UnkStruct_ov107_02249B8C * param0, u32 param1) return; } -void ov107_02249C08 (UnkStruct_ov107_02249B8C * param0, UnkStruct_02073C74 * param1) +void ov107_02249C08 (UnkStruct_ov107_02249B8C * param0, Pokemon * param1) { sub_02021F24(param0->unk_04, sub_02079FC4(param1)); return; diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c index 308f7eba67..a431ab22fa 100644 --- a/src/overlay108/ov108_02241AE0.c +++ b/src/overlay108/ov108_02241AE0.c @@ -16,7 +16,7 @@ #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_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" #include "overlay108/struct_ov108_02241DB0_decl.h" @@ -820,7 +820,7 @@ static void ov108_0224237C (UnkStruct_ov108_02241DB0 * param0) u16 v1, v2, v3, v4; int v5, v6; UnkStruct_0205AA50 * v7; - UnkStruct_02073C74 * v8; + Pokemon * v8; param0->unk_3D0 = NARC_ctor(150, 103); @@ -1582,7 +1582,7 @@ static u8 ov108_02242EF4 (UnkStruct_ov108_02241DB0 * param0, u8 param1) static void ov108_02242F38 (UnkStruct_ov108_02241DB0 * param0) { u8 v0, v1, v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; v0 = ov104_0223BD70(param0->unk_09, 1); v1 = ov104_0223BDA4(param0->unk_09, 1); @@ -1590,7 +1590,7 @@ static void ov108_02242F38 (UnkStruct_ov108_02241DB0 * param0) for (v2 = 0; v2 < v0; v2++) { v3 = Party_GetPokemonBySlotIndex(param0->unk_3C8, v2); - if (sub_02074470(v3, 6, NULL) == 0) { + if (GetMonData(v3, MON_DATA_HELD_ITEM, NULL) == 0) { ov108_022435A8(param0->unk_39C[v2], 0); } else { ov108_022435A8(param0->unk_39C[v2], 1); @@ -1600,7 +1600,7 @@ static void ov108_02242F38 (UnkStruct_ov108_02241DB0 * param0) for (v2 = 0; v2 < v1; v2++) { v3 = Party_GetPokemonBySlotIndex(param0->unk_3CC, v2); - if (sub_02074470(v3, 6, NULL) == 0) { + if (GetMonData(v3, MON_DATA_HELD_ITEM, NULL) == 0) { ov108_022435A8(param0->unk_3AC[v2], 0); } else { ov108_022435A8(param0->unk_3AC[v2], 1); diff --git a/src/overlay108/ov108_02243030.c b/src/overlay108/ov108_02243030.c index 2b922be331..67e79ffb90 100644 --- a/src/overlay108/ov108_02243030.c +++ b/src/overlay108/ov108_02243030.c @@ -3,7 +3,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "overlay019/struct_ov19_021DA864.h" @@ -183,8 +183,8 @@ static void ov108_022432B4 (UnkStruct_ov108_02243030 * param0) static void ov108_02243360 (UnkStruct_ov108_02243030 * param0, Party * param1, Party * param2, u8 param3) { - UnkStruct_02073C74 * v0; - UnkStruct_02073C74 * v1; + Pokemon * v0; + Pokemon * v1; NARC * v2; u32 v3; diff --git a/src/overlay108/ov108_0224351C.c b/src/overlay108/ov108_0224351C.c index 0a48921fbd..28d86d9948 100644 --- a/src/overlay108/ov108_0224351C.c +++ b/src/overlay108/ov108_0224351C.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_02022550_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay108/struct_ov108_02243594_decl.h" #include "overlay108/struct_ov108_02243030.h" @@ -29,7 +29,7 @@ void * ov108_02243594(UnkStruct_ov108_02243594 * param0); void ov108_022435A8(UnkStruct_ov108_02243594 * param0, int param1); void ov108_022435B4(UnkStruct_ov108_02243594 * param0, u16 param1, u16 param2); void ov108_022435F4(UnkStruct_ov108_02243594 * param0, u32 param1); -void ov108_02243610(UnkStruct_ov108_02243594 * param0, UnkStruct_02073C74 * param1); +void ov108_02243610(UnkStruct_ov108_02243594 * param0, Pokemon * param1); void ov108_02243624(UnkStruct_ov108_02243594 * param0, u8 param1); UnkStruct_ov108_02243594 * ov108_0224351C (UnkStruct_ov108_02243030 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u16 param5, u16 param6, u32 param7, int param8, u8 param9) @@ -96,7 +96,7 @@ void ov108_022435F4 (UnkStruct_ov108_02243594 * param0, u32 param1) return; } -void ov108_02243610 (UnkStruct_ov108_02243594 * param0, UnkStruct_02073C74 * param1) +void ov108_02243610 (UnkStruct_ov108_02243594 * param0, Pokemon * param1) { sub_02021F24(param0->unk_10, sub_02079FC4(param1)); return; diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c index d0beedd878..e6e1802939 100644 --- a/src/overlay109/ov109_021D0D80.c +++ b/src/overlay109/ov109_021D0D80.c @@ -15,7 +15,7 @@ #include "struct_decls/struct_020203AC_decl.h" #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02025E6C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_0200D0F4.h" @@ -3524,7 +3524,7 @@ static void ov109_021D3B70 (UnkStruct_ov109_021D0F70 * param0, int param1) { int v0, v1; Party * v2, * v3; - UnkStruct_02073C74 * v4, * v5; + Pokemon * v4, * v5; v2 = param0->unk_24; v3 = (Party *)sub_0209C188(param0->unk_D0, param1); @@ -3600,15 +3600,15 @@ static BOOL ov109_021D3C08 (UnkStruct_ov109_021D0F70 * param0, fx32 param1, int static BOOL ov109_021D3C94 (Party * param0) { int v0, v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; v1 = Party_GetCurrentCount(param0); for (v0 = 0; v0 < v1; v0++) { v2 = Party_GetPokemonBySlotIndex(param0, v0); - if (sub_02074470(v2, 76, NULL)) { - if (sub_02074470(v2, 3, NULL)) { + if (GetMonData(v2, MON_DATA_IS_EGG, NULL)) { + if (GetMonData(v2, MON_DATA_3, NULL)) { return 1; } } diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c index 0d0ed92068..3e0ba33b90 100644 --- a/src/overlay113/ov113_0225C700.c +++ b/src/overlay113/ov113_0225C700.c @@ -18,7 +18,7 @@ #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_020203AC_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" @@ -1341,7 +1341,7 @@ static void ov113_0225DD4C (int param0, UnkStruct_021C0794 * param1, UnkStruct_o { Party * v0; int v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; int v3; MI_CpuClear8(param2, sizeof(UnkStruct_ov113_02260818) * 6); @@ -1351,10 +1351,10 @@ static void ov113_0225DD4C (int param0, UnkStruct_021C0794 * param1, UnkStruct_o for (v3 = 0; v3 < v1; v3++) { v2 = Party_GetPokemonBySlotIndex(v0, v3); - param2[v3].unk_02 = sub_02074470(v2, 174, NULL); - param2[v3].unk_04 = sub_02074470(v2, 0, NULL); - param2[v3].unk_08 = sub_02074470(v2, 112, NULL); - param2[v3].unk_00 = ov113_0226072C(param0, sub_02074470(v2, 7, NULL)); + param2[v3].unk_02 = GetMonData(v2, MON_DATA_SPECIES_EGG, NULL); + param2[v3].unk_04 = GetMonData(v2, MON_DATA_PERSONALITY, NULL); + param2[v3].unk_08 = GetMonData(v2, MON_DATA_FORM, NULL); + param2[v3].unk_00 = ov113_0226072C(param0, GetMonData(v2, MON_DATA_OT_ID, NULL)); } } diff --git a/src/overlay113/ov113_0225E368.c b/src/overlay113/ov113_0225E368.c index e1d6c80eb4..d8fed3e62b 100644 --- a/src/overlay113/ov113_0225E368.c +++ b/src/overlay113/ov113_0225E368.c @@ -1036,7 +1036,7 @@ static u8 ov113_0225EEF8 (const UnkStruct_ov113_02260818 * param0) { u8 v0; - v0 = sub_02075BFC(param0->unk_04); + v0 = GetNatureFromPersonality(param0->unk_04); return Unk_ov113_02260D30[v0]; } diff --git a/src/overlay118/ov118_021D0D80.c b/src/overlay118/ov118_021D0D80.c index 98dec421aa..41b734b48e 100644 --- a/src/overlay118/ov118_021D0D80.c +++ b/src/overlay118/ov118_021D0D80.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_02014014_decl.h" #include "struct_decls/struct_020203AC_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_0207F248.h" @@ -73,12 +73,12 @@ void ov118_021D0D80 (UnkStruct_0207F248 * param0) int ov118_021D0DBC (UnkStruct_0207F248 * param0) { UnkStruct_ov118_021D0FDC * v0 = param0->unk_B24; - UnkStruct_02073C74 * v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); + Pokemon * v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); switch (v0->unk_00) { case 0: { - v0->unk_0C = sub_02074470(v1, 5, NULL); + v0->unk_0C = GetMonData(v1, MON_DATA_SPECIES, NULL); switch (v0->unk_0C) { case 487: @@ -87,7 +87,7 @@ int ov118_021D0DBC (UnkStruct_0207F248 * param0) v0->unk_10 = 0; break; case 492: - sub_02077ACC(v1, 1); + SetShayminForm(v1, 1); v0->unk_08 = 35; v0->unk_10 = 1; break; diff --git a/src/overlay119/ov119_021D0D80.c b/src/overlay119/ov119_021D0D80.c index 7cfff6910d..ea2914ea2c 100644 --- a/src/overlay119/ov119_021D0D80.c +++ b/src/overlay119/ov119_021D0D80.c @@ -10,8 +10,8 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020203AC_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_defs/struct_02007C10.h" #include "struct_defs/struct_02008A90.h" @@ -308,13 +308,13 @@ void ov119_021D10F0 (UnkStruct_02018340 * param0, UnkStruct_0205AA50 * param1, i sub_0201A954(param1); } -int ov119_021D1158 (UnkStruct_0205AA50 * param0, int param1, UnkStruct_02073C74 * param2, int param3) +int ov119_021D1158 (UnkStruct_0205AA50 * param0, int param1, Pokemon * param2, int param3) { int v0; UnkStruct_02023790 * v1; UnkStruct_02023790 * v2; UnkStruct_0200B358 * v3; - UnkStruct_02073C74_sub1 * v4; + BoxPokemon * v4; UnkStruct_0200B144 * v5; sub_0201ADA4(param0, 15); @@ -754,12 +754,12 @@ void ov119_021D1858 (UnkStruct_ov119_021D0FD0 * param0) { UnkStruct_02008A90 v0; UnkStruct_02007C10 v1[10]; - UnkStruct_02073C74 * v2; + Pokemon * v2; int v3; int v4; v2 = param0->unk_00->unk_0C.unk_00; - v3 = sub_02074470(v2, 5, NULL); + v3 = GetMonData(v2, MON_DATA_SPECIES, NULL); v4 = sub_020765AC(v2, 2); { @@ -779,7 +779,7 @@ void ov119_021D18C0 (UnkStruct_ov119_021D0FD0 * param0) int v0; int v1; - v0 = sub_02074470(param0->unk_00->unk_0C.unk_00, 5, NULL); + v0 = GetMonData(param0->unk_00->unk_0C.unk_00, MON_DATA_SPECIES, NULL); v1 = sub_02075BCC(param0->unk_00->unk_0C.unk_00); sub_02007B98(param0->unk_70, 1); diff --git a/src/overlay119/ov119_021D191C.c b/src/overlay119/ov119_021D191C.c index f784d517c8..89e1a561e1 100644 --- a/src/overlay119/ov119_021D191C.c +++ b/src/overlay119/ov119_021D191C.c @@ -137,8 +137,8 @@ static BOOL ov119_021D1930 (UnkStruct_ov119_021D0FD0 * param0) int v7; int v8; - v7 = sub_02074470(param0->unk_00->unk_0C.unk_00, 5, NULL); - v8 = sub_02074470(param0->unk_00->unk_0C.unk_00, 112, NULL); + v7 = GetMonData(param0->unk_00->unk_0C.unk_00, MON_DATA_SPECIES, NULL); + v8 = GetMonData(param0->unk_00->unk_0C.unk_00, MON_DATA_FORM, NULL); sub_02005844(v7, v8); param0->unk_04.unk_08 = ov119_021D1158(¶m0->unk_04.unk_14[0], 0, param0->unk_00->unk_0C.unk_00, param0->unk_04.unk_0C); } @@ -287,8 +287,8 @@ static BOOL ov119_021D1BD0 (UnkStruct_ov119_021D0FD0 * param0) int v3; int v4; - v3 = sub_02074470(param0->unk_00->unk_0C.unk_00, 5, NULL); - v4 = sub_02074470(param0->unk_00->unk_0C.unk_00, 112, NULL); + v3 = GetMonData(param0->unk_00->unk_0C.unk_00, MON_DATA_SPECIES, NULL); + v4 = GetMonData(param0->unk_00->unk_0C.unk_00, MON_DATA_FORM, NULL); sub_02005844(v3, v4); param0->unk_04.unk_08 = ov119_021D1158(¶m0->unk_04.unk_14[0], 0, param0->unk_00->unk_0C.unk_00, param0->unk_04.unk_0C); } diff --git a/src/party.c b/src/party.c index c0abfdae1e..2506f0987a 100644 --- a/src/party.c +++ b/src/party.c @@ -3,7 +3,7 @@ #include "struct_decls/struct_021C0794_decl.h" -#include "struct_defs/struct_02073C74.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_party.h" #include "heap.h" @@ -48,11 +48,11 @@ void Party_InitWithCapacity (Party * party, int capacity) party->capacity = capacity; for (i = 0; i < 6; i++) { - sub_02073C2C(&party->pokemon[i]); + ZeroMonData(&party->pokemon[i]); } } -BOOL Party_AddPokemon (Party * party, UnkStruct_02073C74 * pokemon) +BOOL Party_AddPokemon (Party * party, Pokemon * pokemon) { if (party->currentCount >= party->capacity) { return FALSE; @@ -75,7 +75,7 @@ BOOL Party_RemovePokemonBySlotIndex (Party * party, int slot) party->pokemon[i] = party->pokemon[i + 1]; } - sub_02073C2C(&party->pokemon[i]); + ZeroMonData(&party->pokemon[i]); party->currentCount--; return TRUE; @@ -91,31 +91,31 @@ int Party_GetCurrentCount (const Party * party) return party->currentCount; } -UnkStruct_02073C74 * Party_GetPokemonBySlotIndex (const Party * party, int slot) +Pokemon * Party_GetPokemonBySlotIndex (const Party * party, int slot) { PARTY_ASSERT_SLOT(party, slot); - return (UnkStruct_02073C74 *)&party->pokemon[slot]; + return (Pokemon *)&party->pokemon[slot]; } -void sub_0207A128 (Party * party, int slot, UnkStruct_02073C74 * param2) +void sub_0207A128 (Party * party, int slot, Pokemon * param2) { int v0; PARTY_ASSERT_SLOT(party, slot); - v0 = sub_02074470(&(party->pokemon[slot]), 172, NULL) - sub_02074470(param2, 172, NULL); + v0 = GetMonData(&(party->pokemon[slot]), MON_DATA_172, NULL) - GetMonData(param2, MON_DATA_172, NULL); party->pokemon[slot] = *param2; party->currentCount += v0; } BOOL Party_SwapSlots (Party * party, int slotA, int slotB) { - struct UnkStruct_02073C74_t * tempPokemon; + Pokemon * tempPokemon; PARTY_ASSERT_SLOT(party, slotA); PARTY_ASSERT_SLOT(party, slotB); - tempPokemon = Heap_AllocFromHeap(0, sizeof(struct UnkStruct_02073C74_t)); + tempPokemon = Heap_AllocFromHeap(0, sizeof(Pokemon)); *tempPokemon = party->pokemon[slotA]; party->pokemon[slotA] = party->pokemon[slotB]; @@ -136,7 +136,7 @@ BOOL Party_HasSpecies (const Party * party, int species) int i; for (i = 0; i < party->currentCount; i++) { - if (sub_02074470((UnkStruct_02073C74 *)&party->pokemon[i], 5, NULL) == species) { + if (GetMonData((Pokemon *)&party->pokemon[i], MON_DATA_SPECIES, NULL) == species) { break; } } diff --git a/src/unk_0200B358.c b/src/unk_0200B358.c index 422b04a9e3..a3ad57ddc2 100644 --- a/src/unk_0200B358.c +++ b/src/unk_0200B358.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02025E6C_decl.h" #include "struct_decls/struct_0202B4A0_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_021C0794_decl.h" @@ -50,7 +50,7 @@ typedef struct UnkStruct_0200B358_t { static void sub_0200B448(UnkStruct_0200B358 * param0, u32 param1, const UnkStruct_02023790 * param2, const UnkStruct_0200B444 * param3); static void sub_0200B444(UnkStruct_0200B444 * param0); -void sub_0200B578(UnkStruct_0200B358 * param0, u32 param1, UnkStruct_02073C74_sub1 * param2); +void sub_0200B578(UnkStruct_0200B358 * param0, u32 param1, BoxPokemon * param2); void sub_0200B594(UnkStruct_0200B358 * param0, u32 param1, u32 param2); void sub_0200B744(UnkStruct_0200B358 * param0, u32 param1, u32 param2); void sub_0200B77C(UnkStruct_0200B358 * param0, u32 param1, u32 param2); @@ -203,24 +203,24 @@ void sub_0200B4E4 (UnkStruct_0200B358 * param0, u32 param1, const UnkStruct_021C sub_0200B190(v1); } -void sub_0200B538 (UnkStruct_0200B358 * param0, u32 param1, UnkStruct_02073C74_sub1 * param2) +void sub_0200B538 (UnkStruct_0200B358 * param0, u32 param1, BoxPokemon * param2) { UnkStruct_0200B144 * v0; u32 v1; v0 = sub_0200B144(1, 26, 412, param0->unk_04); - v1 = sub_02074570(param2, 5, NULL); + v1 = sub_02074570(param2, MON_DATA_SPECIES, NULL); sub_0200B1B8(v0, v1, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); sub_0200B190(v0); } -void sub_0200B578 (UnkStruct_0200B358 * param0, u32 param1, UnkStruct_02073C74_sub1 * param2) +void sub_0200B578 (UnkStruct_0200B358 * param0, u32 param1, BoxPokemon * param2) { u32 v0; - v0 = sub_02074570(param2, 5, NULL); + v0 = sub_02074570(param2, MON_DATA_SPECIES, NULL); sub_0200B594(param0, param1, v0); } @@ -235,15 +235,15 @@ void sub_0200B594 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) sub_0200B190(v0); } -void sub_0200B5CC (UnkStruct_0200B358 * param0, u32 param1, UnkStruct_02073C74_sub1 * param2) +void sub_0200B5CC (UnkStruct_0200B358 * param0, u32 param1, BoxPokemon * param2) { - sub_02074570(param2, 119, param0->unk_0C); + sub_02074570(param2, MON_DATA_119, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); } -void sub_0200B5EC (UnkStruct_0200B358 * param0, u32 param1, UnkStruct_02073C74_sub1 * param2) +void sub_0200B5EC (UnkStruct_0200B358 * param0, u32 param1, BoxPokemon * param2) { - sub_02074570(param2, 145, param0->unk_0C); + sub_02074570(param2, MON_DATA_145, param0->unk_0C); sub_0200B448(param0, param1, param0->unk_0C, NULL); } diff --git a/src/unk_0200DA60.c b/src/unk_0200DA60.c index 389a3276b8..a8bdc6e67a 100644 --- a/src/unk_0200DA60.c +++ b/src/unk_0200DA60.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0201CD38_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_02008A90.h" #include "struct_defs/struct_0200D0F4.h" @@ -67,7 +67,7 @@ static void sub_0200ED7C(UnkStruct_0200ED50 * param0); static void sub_0200EDD4(UnkStruct_0200ED50 * param0, u8 param1, u8 param2); static void sub_0200EE98(UnkStruct_ov5_021D30A8 * param0, UnkStruct_02008A90 * param1); static void sub_0200EE24(UnkStruct_ov5_021D30A8 * param0, u16 param1, u8 param2); -static void sub_0200EE64(UnkStruct_ov5_021D30A8 * param0, UnkStruct_02073C74 * param1); +static void sub_0200EE64(UnkStruct_ov5_021D30A8 * param0, Pokemon * param1); static void sub_0200EC9C(UnkStruct_0201CD38 * param0, void * param1); static void sub_0200EF7C(UnkStruct_0200ED50 * param0, u8 param1, u16 param2); static void sub_0200F12C(UnkStruct_0200ED50 * param0); @@ -563,7 +563,7 @@ u8 * sub_0200EBF0 (UnkStruct_02018340 * param0, u8 param1, u8 param2, u8 param3, return &v0->unk_1D3; } -u8 * sub_0200EC48 (UnkStruct_02018340 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, UnkStruct_02073C74 * param6, int param7) +u8 * sub_0200EC48 (UnkStruct_02018340 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, Pokemon * param6, int param7) { UnkStruct_0200ED50 * v0 = sub_0200ED14(param0, param1, param2, param3, param7); @@ -654,7 +654,7 @@ static void sub_0200EE24 (UnkStruct_ov5_021D30A8 * param0, u16 param1, u8 param2 sub_02007B6C(v0); } -static void sub_0200EE64 (UnkStruct_ov5_021D30A8 * param0, UnkStruct_02073C74 * param1) +static void sub_0200EE64 (UnkStruct_ov5_021D30A8 * param0, Pokemon * param1) { void * v0; UnkStruct_02008A90 v1; diff --git a/src/unk_020261E4.c b/src/unk_020261E4.c index f0f8e18524..f755549fba 100644 --- a/src/unk_020261E4.c +++ b/src/unk_020261E4.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_021C0794_decl.h" #include "struct_defs/struct_0202818C.h" -#include "struct_defs/struct_02073C74_sub1.h" +#include "struct_defs/box_pokemon.h" #include "unk_020244AC.h" #include "unk_020261E4.h" @@ -19,7 +19,7 @@ typedef struct UnkStruct_02026224_t { } UnkStruct_02026224; typedef struct UnkStruct_02026218_t { - UnkStruct_02073C74_sub1 unk_00; + BoxPokemon unk_00; UnkStruct_02026224 unk_08; u32 unk_68; } UnkStruct_02026218; @@ -39,8 +39,8 @@ void sub_020261EC (UnkStruct_02026310 * param0) { memset(param0, 0, sizeof(UnkStruct_02026310)); - sub_02073C54(¶m0->unk_00[0].unk_00); - sub_02073C54(¶m0->unk_00[1].unk_00); + ZeroBoxMonData(¶m0->unk_00[0].unk_00); + ZeroBoxMonData(¶m0->unk_00[1].unk_00); param0->unk_D8 = 0; param0->unk_DC = 0; @@ -51,7 +51,7 @@ UnkStruct_02026218 * sub_02026218 (UnkStruct_02026310 * param0, int param1) return &(param0->unk_00[param1]); } -UnkStruct_02073C74_sub1 * sub_02026220 (UnkStruct_02026218 * param0) +BoxPokemon * sub_02026220 (UnkStruct_02026218 * param0) { return &(param0->unk_00); } @@ -114,8 +114,8 @@ BOOL sub_02026280 (UnkStruct_02026310 * param0) { int v0, v1; - v0 = sub_02074570(¶m0->unk_00[0].unk_00, 12, NULL); - v1 = sub_02074570(¶m0->unk_00[1].unk_00, 12, NULL); + v0 = sub_02074570(¶m0->unk_00[0].unk_00, MON_DATA_LANGUAGE, NULL); + v1 = sub_02074570(¶m0->unk_00[1].unk_00, MON_DATA_LANGUAGE, NULL); if (v0 != v1) { return 1; @@ -147,7 +147,7 @@ void sub_020262C0 (UnkStruct_02026224 * param0) void sub_020262F4 (UnkStruct_02026218 * param0) { - sub_02073C54(¶m0->unk_00); + ZeroBoxMonData(¶m0->unk_00); param0->unk_68 = 0; sub_020262C0(¶m0->unk_08); } diff --git a/src/unk_0202631C.c b/src/unk_0202631C.c index 7811e74d6c..2f0950731d 100644 --- a/src/unk_0202631C.c +++ b/src/unk_0202631C.c @@ -3,7 +3,7 @@ #include "inlines.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_021C0794_decl.h" #include "heap.h" @@ -462,9 +462,9 @@ static BOOL sub_020268D8 (const UnkStruct_02026324 * param0, u32 param1) return 0; } -static void sub_020268FC (UnkStruct_02026324 * param0, u16 param1, UnkStruct_02073C74 * param2) +static void sub_020268FC (UnkStruct_02026324 * param0, u16 param1, Pokemon * param2) { - u8 v0 = sub_02074470(param2, 112, NULL); + u8 v0 = GetMonData(param2, MON_DATA_FORM, NULL); u32 v1; if (param1 == 386) { @@ -565,7 +565,7 @@ static void sub_02026A00 (UnkStruct_02026324 * param0, u32 param1, int param2) } } -static void sub_02026A60 (UnkStruct_02026324 * param0, u16 param1, UnkStruct_02073C74 * param2) +static void sub_02026A60 (UnkStruct_02026324 * param0, u16 param1, Pokemon * param2) { int v0; @@ -575,34 +575,34 @@ static void sub_02026A60 (UnkStruct_02026324 * param0, u16 param1, UnkStruct_020 sub_0202643C(param0, v0); break; case 412: - v0 = sub_02074470(param2, 112, NULL); + v0 = GetMonData(param2, MON_DATA_FORM, NULL); sub_020267B8(param0, param1, v0); break; case 413: - v0 = sub_02074470(param2, 112, NULL); + v0 = GetMonData(param2, MON_DATA_FORM, NULL); sub_020267B8(param0, param1, v0); break; case 422: - v0 = sub_02074470(param2, 112, NULL); + v0 = GetMonData(param2, MON_DATA_FORM, NULL); sub_020265E8(param0, param1, v0); break; case 423: - v0 = sub_02074470(param2, 112, NULL); + v0 = GetMonData(param2, MON_DATA_FORM, NULL); sub_020265E8(param0, param1, v0); break; case 386: sub_020268FC(param0, param1, param2); break; case 492: - v0 = sub_02074470(param2, 112, NULL); + v0 = GetMonData(param2, MON_DATA_FORM, NULL); sub_020265E8(param0, param1, v0); break; case 487: - v0 = sub_02074470(param2, 112, NULL); + v0 = GetMonData(param2, MON_DATA_FORM, NULL); sub_020265E8(param0, param1, v0); break; case 479: - v0 = sub_02074470(param2, 112, NULL); + v0 = GetMonData(param2, MON_DATA_FORM, NULL); sub_02026A00(param0, param1, v0); break; default: @@ -1067,10 +1067,10 @@ u32 sub_02027288 (const UnkStruct_02026324 * param0) return sub_020268B8(param0); } -void sub_020272A4 (UnkStruct_02026324 * param0, UnkStruct_02073C74 * param1) +void sub_020272A4 (UnkStruct_02026324 * param0, Pokemon * param1) { - u16 v0 = sub_02074470(param1, 5, NULL); - u32 v1 = sub_02074470(param1, 0, NULL); + u16 v0 = GetMonData(param1, MON_DATA_SPECIES, NULL); + u32 v1 = GetMonData(param1, MON_DATA_PERSONALITY, NULL); u32 v2 = sub_02075D6C(param1); u32 v3; @@ -1095,11 +1095,11 @@ void sub_020272A4 (UnkStruct_02026324 * param0, UnkStruct_02073C74 * param1) inline_0202736C(param0, v0); } -void sub_0202736C (UnkStruct_02026324 * param0, UnkStruct_02073C74 * param1) +void sub_0202736C (UnkStruct_02026324 * param0, Pokemon * param1) { - u16 v0 = sub_02074470(param1, 5, NULL); - u32 v1 = sub_02074470(param1, 12, NULL); - u32 v2 = sub_02074470(param1, 0, NULL); + u16 v0 = GetMonData(param1, MON_DATA_SPECIES, NULL); + u32 v1 = GetMonData(param1, MON_DATA_LANGUAGE, NULL); + u32 v2 = GetMonData(param1, MON_DATA_PERSONALITY, NULL); u32 v3 = sub_02075D6C(param1); u32 v4; diff --git a/src/unk_02028124.c b/src/unk_02028124.c index f01297ae38..b1a332e314 100644 --- a/src/unk_02028124.c +++ b/src/unk_02028124.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_02025E6C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" @@ -96,7 +96,7 @@ void sub_020281AC (UnkStruct_0202818C * param0, u8 param1, u8 param2, UnkStruct_ u32 v5, v6, v7; UnkStruct_02025E6C * v8; Party * v9; - UnkStruct_02073C74 * v10; + Pokemon * v10; sub_02028124(param0); @@ -112,9 +112,9 @@ void sub_020281AC (UnkStruct_0202818C * param0, u8 param1, u8 param2, UnkStruct_ for (v0 = param2, v1 = 0; v0 < Party_GetCurrentCount(v9); v0++) { v10 = Party_GetPokemonBySlotIndex(v9, v0); - v4 = sub_02074470(v10, 5, NULL); - v6 = sub_02074470(v10, 76, NULL); - v7 = sub_02074470(v10, 112, NULL); + v4 = GetMonData(v10, MON_DATA_SPECIES, NULL); + v6 = GetMonData(v10, MON_DATA_IS_EGG, NULL); + v7 = GetMonData(v10, MON_DATA_FORM, NULL); v5 = sub_02079D80(v10); v2 = sub_02079EDC(v4, v7, v6); diff --git a/src/unk_020298BC.c b/src/unk_020298BC.c index 436302b6aa..ede4aae9a0 100644 --- a/src/unk_020298BC.c +++ b/src/unk_020298BC.c @@ -4,7 +4,7 @@ #include "inlines.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_021C0794_decl.h" #include "struct_defs/struct_02014A84.h" @@ -122,21 +122,21 @@ static void sub_020298D8 (UnkStruct_020298D8 * param0, u8 * param1, u8 * param2, *param3 = v2; } -static void sub_0202992C (UnkStruct_0202A138 * param0, UnkStruct_02073C74 * param1, u8 param2, u8 param3, s8 param4) +static void sub_0202992C (UnkStruct_0202A138 * param0, Pokemon * param1, u8 param2, u8 param3, s8 param4) { - param0->unk_08 = sub_02074470(param1, 5, NULL); - sub_02074470(param1, 117, param0->unk_0A); + param0->unk_08 = GetMonData(param1, MON_DATA_SPECIES, NULL); + GetMonData(param1, MON_DATA_117, param0->unk_0A); - param0->unk_00 = sub_02074470(param1, 0, NULL); - param0->unk_04 = sub_02074470(param1, 7, NULL); - param0->unk_33 = sub_02074470(param1, 112, NULL); + param0->unk_00 = GetMonData(param1, MON_DATA_PERSONALITY, NULL); + param0->unk_04 = GetMonData(param1, MON_DATA_OT_ID, NULL); + param0->unk_33 = GetMonData(param1, MON_DATA_FORM, NULL); param0->unk_31 = param2; param0->unk_32 = param3; param0->unk_30 = param4; } -static void sub_02029990 (UnkStruct_0202A138 * param0, UnkStruct_02073C74 * param1, UnkStruct_020298D8 * param2) +static void sub_02029990 (UnkStruct_0202A138 * param0, Pokemon * param1, UnkStruct_020298D8 * param2) { u8 v0, v1; s8 v2; @@ -151,7 +151,7 @@ static void sub_020299C0 (UnkStruct_0202A138 * param0, const UnkStruct_02023790 param0->unk_34 = param2; } -static void sub_020299D8 (const UnkStruct_0202A138 * param0, UnkStruct_02073C74 * param1) +static void sub_020299D8 (const UnkStruct_0202A138 * param0, Pokemon * param1) { sub_02073D80(param1, param0->unk_08, 0, 0, 1, param0->unk_00, 1, param0->unk_04); sub_02074B30(param1, 117, param0->unk_0A); @@ -302,7 +302,7 @@ static void sub_02029BB0 (UnkStruct_02029D04 * param0) } } -static void sub_02029BD8 (UnkStruct_02073C74 * param0, u8 * param1, u8 * param2) +static void sub_02029BD8 (Pokemon * param0, u8 * param1, u8 * param2) { u8 v0 = sub_020765B8(param0, 2); @@ -575,7 +575,7 @@ void sub_02029F84 (UnkStruct_02029C68 * param0) inline_02029BFC(param0); } -void sub_02029FAC (UnkStruct_02029C68 * param0, UnkStruct_02073C74 * param1, UnkStruct_020298D8 * param2) +void sub_02029FAC (UnkStruct_02029C68 * param0, Pokemon * param1, UnkStruct_020298D8 * param2) { GF_ASSERT(inline_02029CA8(param0)); sub_02029990(¶m0->unk_04, param1, param2); @@ -706,7 +706,7 @@ void sub_0202A25C (UnkStruct_02029C88 * param0) inline_02029BFC_1(param0); } -void sub_0202A284 (UnkStruct_02029C88 * param0, UnkStruct_02073C74 * param1, UnkStruct_020298D8 * param2) +void sub_0202A284 (UnkStruct_02029C88 * param0, Pokemon * param1, UnkStruct_020298D8 * param2) { GF_ASSERT(inline_02029CD0(param0)); sub_02029990(¶m0->unk_08, param1, param2); @@ -747,7 +747,7 @@ void sub_0202A390 (UnkStruct_02029C88 * param0, const UnkStruct_02029C88 * param memcpy(param0, param1, sizeof(UnkStruct_02029C88)); } -void sub_0202A3B0 (UnkStruct_02029C88 * param0, UnkStruct_02073C74 * param1, s8 param2) +void sub_0202A3B0 (UnkStruct_02029C88 * param0, Pokemon * param1, s8 param2) { u8 v0; u8 v1; @@ -821,7 +821,7 @@ u32 sub_0202A544 (const UnkStruct_02029C88 * param0) return sub_0202A5FC(¶m0->unk_08); } -void sub_0202A560 (const UnkStruct_02029C88 * param0, UnkStruct_02073C74 * param1) +void sub_0202A560 (const UnkStruct_02029C88 * param0, Pokemon * param1) { GF_ASSERT(inline_02029CD0(param0)); sub_020299D8(¶m0->unk_08, param1); @@ -878,7 +878,7 @@ u8 sub_0202A614 (const UnkStruct_0202A138 * param0) return param0->unk_32; } -void sub_0202A61C (const UnkStruct_0202A138 * param0, UnkStruct_02073C74 * param1) +void sub_0202A61C (const UnkStruct_0202A138 * param0, Pokemon * param1) { sub_020299D8(param0, param1); } diff --git a/src/unk_0202DA40.c b/src/unk_0202DA40.c index de836eef94..0d50ec7f53 100644 --- a/src/unk_0202DA40.c +++ b/src/unk_0202DA40.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_021C0794_decl.h" #include "unk_020244AC.h" @@ -40,12 +40,12 @@ void sub_0202DA68 (UnkStruct_0202DA40 * param0, int param1) param0->unk_EC = param1; } -void sub_0202DA70 (UnkStruct_0202DA40 * param0, UnkStruct_02073C74 * param1) +void sub_0202DA70 (UnkStruct_0202DA40 * param0, Pokemon * param1) { MI_CpuCopyFast(param0->unk_00, (void *)param1, 236); } -void sub_0202DA7C (UnkStruct_0202DA40 * param0, UnkStruct_02073C74 * param1, int param2) +void sub_0202DA7C (UnkStruct_0202DA40 * param0, Pokemon * param1, int param2) { MI_CpuCopyFast((void *)param1, param0->unk_00, 236); } diff --git a/src/unk_0202DF8C.c b/src/unk_0202DF8C.c index 2ae47817c9..1dfc63fb54 100644 --- a/src/unk_0202DF8C.c +++ b/src/unk_0202DF8C.c @@ -4,7 +4,7 @@ #include "inlines.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_0202DF8C.h" @@ -32,7 +32,7 @@ void sub_0202DF94 (UnkStruct_0202DF8C * param0) void sub_0202DFA8 (UnkStruct_0202DF8C * param0, const Party * param1, const RTCDate * param2) { UnkStruct_0202DFA8 * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; UnkStruct_02023790 * v2; int v3, v4, v5; BOOL v6; @@ -54,22 +54,22 @@ void sub_0202DFA8 (UnkStruct_0202DF8C * param0, const Party * param1, const RTCD v1 = Party_GetPokemonBySlotIndex(param1, v4); v6 = sub_02073C88(v1); - if (sub_02074470(v1, 76, NULL) == 0) { - v0->unk_00[v5].unk_00 = sub_02074470(v1, 5, NULL); - v0->unk_00[v5].unk_02 = sub_02074470(v1, 161, NULL); - v0->unk_00[v5].unk_03 = sub_02074470(v1, 112, NULL); - v0->unk_00[v5].unk_04 = sub_02074470(v1, 0, NULL); - v0->unk_00[v5].unk_08 = sub_02074470(v1, 7, NULL); - v0->unk_00[v5].unk_32[0] = sub_02074470(v1, 54, NULL); - v0->unk_00[v5].unk_32[1] = sub_02074470(v1, 55, NULL); - v0->unk_00[v5].unk_32[2] = sub_02074470(v1, 56, NULL); - v0->unk_00[v5].unk_32[3] = sub_02074470(v1, 57, NULL); + if (GetMonData(v1, MON_DATA_IS_EGG, NULL) == 0) { + v0->unk_00[v5].unk_00 = GetMonData(v1, MON_DATA_SPECIES, NULL); + v0->unk_00[v5].unk_02 = GetMonData(v1, MON_DATA_161, NULL); + v0->unk_00[v5].unk_03 = GetMonData(v1, MON_DATA_FORM, NULL); + v0->unk_00[v5].unk_04 = GetMonData(v1, MON_DATA_PERSONALITY, NULL); + v0->unk_00[v5].unk_08 = GetMonData(v1, MON_DATA_OT_ID, NULL); + v0->unk_00[v5].unk_32[0] = GetMonData(v1, MON_DATA_MOVE1, NULL); + v0->unk_00[v5].unk_32[1] = GetMonData(v1, MON_DATA_MOVE2, NULL); + v0->unk_00[v5].unk_32[2] = GetMonData(v1, MON_DATA_MOVE3, NULL); + v0->unk_00[v5].unk_32[3] = GetMonData(v1, MON_DATA_MOVE4, NULL); if (v2) { - sub_02074470(v1, 119, v2); + GetMonData(v1, MON_DATA_119, v2); sub_02023DF0(v2, v0->unk_00[v5].unk_0C, 11); - sub_02074470(v1, 145, v2); + GetMonData(v1, MON_DATA_145, v2); sub_02023DF0(v2, v0->unk_00[v5].unk_22, 8); } else { v0->unk_00[v5].unk_0C[0] = 0xffff; diff --git a/src/unk_0202EEC0.c b/src/unk_0202EEC0.c index 94226889a7..5ec35e3b67 100644 --- a/src/unk_0202EEC0.c +++ b/src/unk_0202EEC0.c @@ -1,15 +1,15 @@ #include #include -#include "struct_defs/struct_02073C74.h" -#include "struct_defs/struct_02073C74_sub1.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "unk_0201378C.h" #include "unk_0202EEC0.h" #include "unk_02073C2C.h" typedef struct UnkStruct_02024440_t { - UnkStruct_02073C74 unk_00[6]; + Pokemon unk_00[6]; u32 unk_288[20]; s64 unk_2D8[20]; s64 unk_378; @@ -28,8 +28,8 @@ void sub_0202EEC8 (UnkStruct_02024440 * param0) MI_CpuClearFast(param0, sizeof(UnkStruct_02024440)); for (v0 = 0; v0 < 6; v0++) { - sub_02073C2C(¶m0->unk_00[v0]); - GF_ASSERT(sub_02074470(¶m0->unk_00[v0], 172, NULL) == 0); + ZeroMonData(¶m0->unk_00[v0]); + GF_ASSERT(GetMonData(¶m0->unk_00[v0], MON_DATA_172, NULL) == 0); } } @@ -37,11 +37,11 @@ void sub_0202EF04 (UnkStruct_02024440 * param0) { int v0; - MI_CpuClearFast(param0->unk_00, sizeof(UnkStruct_02073C74) * 6); + MI_CpuClearFast(param0->unk_00, sizeof(Pokemon) * 6); for (v0 = 0; v0 < 6; v0++) { - sub_02073C2C(¶m0->unk_00[v0]); - GF_ASSERT(sub_02074470(¶m0->unk_00[v0], 172, NULL) == 0); + ZeroMonData(¶m0->unk_00[v0]); + GF_ASSERT(GetMonData(¶m0->unk_00[v0], MON_DATA_172, NULL) == 0); } } @@ -74,7 +74,7 @@ static int sub_0202EF40 (UnkStruct_02024440 * param0, u32 param1) return v1; } -void sub_0202EFA4 (UnkStruct_02024440 * param0, UnkStruct_02073C74_sub1 * param1, int param2) +void sub_0202EFA4 (UnkStruct_02024440 * param0, BoxPokemon * param1, int param2) { sub_020774C8(param1, ¶m0->unk_00[param2]); } @@ -90,7 +90,7 @@ void sub_0202EFB8 (UnkStruct_02024440 * param0, u32 param1) OS_GetMacAddress(param0->unk_380); } -void sub_0202F000 (const UnkStruct_02024440 * param0, int param1, UnkStruct_02073C74 * param2) +void sub_0202F000 (const UnkStruct_02024440 * param0, int param1, Pokemon * param2) { GF_ASSERT(param1 < 6); *param2 = param0->unk_00[param1]; @@ -101,7 +101,7 @@ int sub_0202F028 (const UnkStruct_02024440 * param0) int v0, v1; for (v1 = 0, v0 = 0; v0 < 6; v0++) { - if (sub_02074470((UnkStruct_02073C74 *)¶m0->unk_00[v0], 172, NULL)) { + if (GetMonData((Pokemon *)¶m0->unk_00[v0], MON_DATA_172, NULL)) { v1++; } } diff --git a/src/unk_0202F180.c b/src/unk_0202F180.c index dfefac49de..2d35e19d94 100644 --- a/src/unk_0202F180.c +++ b/src/unk_0202F180.c @@ -2,8 +2,8 @@ #include #include "struct_decls/struct_02026324_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_021C0794_decl.h" #include "unk_0202631C.h" @@ -12,13 +12,13 @@ #include "unk_02056720.h" #include "unk_02073C2C.h" -void sub_0202F180 (UnkStruct_021C0794 * param0, const UnkStruct_02073C74 * param1) +void sub_0202F180 (UnkStruct_021C0794 * param0, const Pokemon * param1) { - if (sub_02074470((UnkStruct_02073C74 *)param1, 76, NULL) == 0) { + if (GetMonData((Pokemon *)param1, MON_DATA_IS_EGG, NULL) == 0) { UnkStruct_02026324 * v0 = sub_02027560(param0); - sub_0202D040(sub_0202CD88(param0), v0, sub_02074470((UnkStruct_02073C74 *)param1, 5, NULL)); - sub_0202736C(v0, (UnkStruct_02073C74 *)param1); - sub_02056A48(sub_02056B24(param0), (const UnkStruct_02073C74_sub1 *)param1); + sub_0202D040(sub_0202CD88(param0), v0, GetMonData((Pokemon *)param1, MON_DATA_SPECIES, NULL)); + sub_0202736C(v0, (Pokemon *)param1); + sub_02056A48(sub_02056B24(param0), (const BoxPokemon *)param1); } } diff --git a/src/unk_0202F1D4.c b/src/unk_0202F1D4.c index 098b6e6b6d..2a45b71c3d 100644 --- a/src/unk_0202F1D4.c +++ b/src/unk_0202F1D4.c @@ -12,7 +12,7 @@ #include "struct_defs/struct_0202FAA8.h" #include "struct_defs/struct_0202FD30.h" #include "struct_defs/struct_02030A80.h" -#include "struct_defs/struct_02073C74.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_02078B40.h" #include "struct_defs/struct_party.h" #include "overlay006/struct_ov6_02240D5C.h" @@ -582,7 +582,7 @@ void sub_0202FAFC (UnkStruct_ov6_02240D5C * param0, UnkStruct_021C0794 * param1) static void sub_0202FCE8 (const Party * param0, UnkStruct_0202FD30 * param1) { int v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; MI_CpuClear8(param1, sizeof(UnkStruct_0202FD30)); @@ -598,10 +598,10 @@ static void sub_0202FCE8 (const Party * param0, UnkStruct_0202FD30 * param1) static void sub_0202FD30 (UnkStruct_0202FD30 * param0, Party * param1) { int v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; u8 v2 = 0; - v1 = sub_02073C74(11); + v1 = AllocMonZeroed(11); Party_InitWithCapacity(param1, param0->unk_00); diff --git a/src/unk_02030A80.c b/src/unk_02030A80.c index 63fb68c35e..f864824633 100644 --- a/src/unk_02030A80.c +++ b/src/unk_02030A80.c @@ -112,7 +112,7 @@ int sub_02030BCC (const UnkStruct_02030A80 * param0) return 0; } - return sub_020761E8(param0->unk_1C, param0->unk_1B_1); + return SanitizeFormId(param0->unk_1C, param0->unk_1B_1); } int sub_02030BEC (const UnkStruct_02030A80 * param0) diff --git a/src/unk_0203A9C8.c b/src/unk_0203A9C8.c index a2f568a804..b0e6458e53 100644 --- a/src/unk_0203A9C8.c +++ b/src/unk_0203A9C8.c @@ -10,7 +10,7 @@ #include "struct_decls/struct_02026324_decl.h" #include "struct_decls/struct_020507E4_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_0207AE68_decl.h" #include "struct_decls/struct_0207CB08_decl.h" @@ -1131,7 +1131,7 @@ BOOL sub_0203B7C0 (UnkStruct_020508D4 * param0) case 7: { UnkStruct_02097728 * v9; - UnkStruct_02073C74 * v10; + Pokemon * v10; v10 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->unk_0C), v2->unk_22); v9 = sub_0203D984(v0, v10, 11); @@ -1330,7 +1330,7 @@ static BOOL sub_0203BC5C (UnkStruct_020508D4 * param0) case 4: { Party * v7; - UnkStruct_02073C74 * v8; + Pokemon * v8; u32 v9; u16 v10; @@ -1341,7 +1341,7 @@ static BOOL sub_0203BC5C (UnkStruct_020508D4 * param0) Heap_FreeToHeap(v1->unk_260); - if ((Item_IsMail(v10) == 1) && (sub_02074470(v8, 6, NULL) == 0)) { + if ((Item_IsMail(v10) == 1) && (GetMonData(v8, MON_DATA_HELD_ITEM, NULL) == 0)) { UnkStruct_02097728 * v11; UnkStruct_0203C540 * v12; @@ -1767,7 +1767,7 @@ BOOL sub_0203C434 (UnkStruct_020508D4 * param0) v1->unk_25C = sub_0203D390(v0, &v1->unk_24C, v3); sub_0203B674(v1, sub_0203B7C0); } else { - UnkStruct_02073C74 * v4; + Pokemon * v4; void * v5; void * v6; @@ -1937,7 +1937,7 @@ static void sub_0203C7B8 (UnkStruct_020508D4 * param0) UnkStruct_020708E0 * v1; UnkStruct_0203C7B8 * v2; Party * v3; - UnkStruct_02073C74 * v4; + Pokemon * v4; UnkStruct_0207AE68 * v5; v0 = sub_02050A60(param0); diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c index 3598144eab..47a2f1c254 100644 --- a/src/unk_0203D1B8.c +++ b/src/unk_0203D1B8.c @@ -13,7 +13,7 @@ #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_020507E4_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_0207AE68_decl.h" #include "struct_decls/struct_0207D3C0_decl.h" @@ -832,7 +832,7 @@ UnkStruct_02097728 * sub_0203D94C (UnkStruct_0203CDB0 * param0, int param1, u8 p return v0; } -UnkStruct_02097728 * sub_0203D984 (UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1, int param2) +UnkStruct_02097728 * sub_0203D984 (UnkStruct_0203CDB0 * param0, Pokemon * param1, int param2) { UnkStruct_02097728 * v0; @@ -874,7 +874,7 @@ void sub_0203D9D8 (UnkStruct_0203CDB0 * param0, UnkStruct_ov90_021D0D80 * param1 static UnkStruct_0203DA00 * sub_0203DA00 (int param0, UnkStruct_021C0794 * param1, int param2, BOOL * param3, BOOL param4) { UnkStruct_0203DA00 * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; int v2; UnkStruct_0202A750 * v3; UnkStruct_02029C68 * v4; @@ -1089,7 +1089,7 @@ BOOL sub_0203DBF0 (UnkStruct_020508D4 * param0) break; case 5: { - int v3 = sub_02074470(v2->unk_04.unk_40, 6, NULL); + int v3 = GetMonData(v2->unk_04.unk_40, MON_DATA_HELD_ITEM, NULL); int v4; int v5; @@ -1261,7 +1261,7 @@ static void sub_0203DF68 (UnkStruct_020508D4 * param0) break; case 1: { - UnkStruct_02073C74 * v3; + Pokemon * v3; int v4; v3 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->unk_0C), v1->unk_04); @@ -1287,7 +1287,7 @@ static void sub_0203DF68 (UnkStruct_020508D4 * param0) void sub_0203DFE8 (UnkStruct_020508D4 * param0, int param1, int param2, int param3, int param4, const u16 * param5, u16 * param6) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_0203CDB0 * v1 = sub_02050A60(param0); UnkStruct_0203DE98 * v2 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0203DE98)); @@ -1300,8 +1300,8 @@ void sub_0203DFE8 (UnkStruct_020508D4 * param0, int param1, int param2, int para switch (param1) { case 1: v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v1->unk_0C), v2->unk_04); - v2->unk_0C->unk_10 = sub_02074470(v0, 111, NULL); - v2->unk_0C->unk_08 = sub_02074470(v0, 112, NULL); + v2->unk_0C->unk_10 = GetMonData(v0, MON_DATA_111, NULL); + v2->unk_0C->unk_08 = GetMonData(v0, MON_DATA_FORM, NULL); if (param5 != NULL) { sub_02023D28(v2->unk_10, param5); @@ -1550,7 +1550,7 @@ void sub_0203E2FC (UnkStruct_0203CDB0 * param0) { UnkStruct_0203E2FC v0; Party * v1 = Party_GetFromSavedata(param0->unk_0C); - UnkStruct_02073C74 * v2 = ov5_021E7278(v1); + Pokemon * v2 = ov5_021E7278(v1); GF_ASSERT(v2 != NULL); sub_0206D578(param0, v2); diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c index 04b1d9076f..89fd015409 100644 --- a/src/unk_0203F6C4.c +++ b/src/unk_0203F6C4.c @@ -33,8 +33,8 @@ #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" @@ -3627,7 +3627,7 @@ static BOOL sub_02041708 (UnkStruct_0203E724 * param0) static BOOL sub_0204174C (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u16 v1 = inline_02049538(param0); u16 * v2 = inline_0204FCAC(param0); @@ -4127,7 +4127,7 @@ static BOOL sub_02041E84 (UnkStruct_0203E724 * param0) static BOOL sub_02041F14 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; void ** v1 = sub_0203F098(param0->unk_34, 20); u16 v2 = inline_02049538(param0); @@ -4135,7 +4135,7 @@ static BOOL sub_02041F14 (UnkStruct_0203E724 * param0) sub_0200DAA4(param0->unk_34->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); *v1 = sub_0200EC48(param0->unk_34->unk_08, 3, 10, 5, 11, 1024 - (18 + 12) - 9, v0, 4); - sub_020451B4(param0->unk_34, sub_02074470(v0, 5, NULL)); + sub_020451B4(param0->unk_34, GetMonData(v0, MON_DATA_SPECIES, NULL)); return 0; } @@ -4593,14 +4593,14 @@ static BOOL sub_020426E8 (UnkStruct_0203E724 * param0) static BOOL sub_02042718 (UnkStruct_0203E724 * param0) { u16 v0[10 * 2]; - UnkStruct_02073C74 * v1; + Pokemon * v1; UnkStruct_0203CDB0 * v2 = param0->unk_34; u16 v3 = inline_02049538(param0); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v2->unk_0C), v3); - sub_02074470(v1, 117, v0); - sub_0203DFE8(param0->unk_28, 1, sub_02074470(v1, 5, NULL), 10, v3, v0, inline_0204FCAC(param0)); + GetMonData(v1, MON_DATA_117, v0); + sub_0203DFE8(param0->unk_28, 1, GetMonData(v1, MON_DATA_SPECIES, NULL), 10, v3, v0, inline_0204FCAC(param0)); return 1; } @@ -4827,7 +4827,7 @@ static BOOL sub_02042BE8 (UnkStruct_0203E724 * param0) static BOOL sub_02042C18 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; void ** v1 = sub_0203F098(param0->unk_34, 20); u16 v2 = inline_02049538(param0); @@ -6187,7 +6187,7 @@ static BOOL sub_02044408 (UnkStruct_0203E724 * param0) static BOOL sub_02044444 (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; + Pokemon * v1; u16 v2 = inline_02049538(param0); ov5_021EE9BC(v0, v2); @@ -6728,19 +6728,19 @@ static BOOL sub_02044DDC (UnkStruct_0203E724 * param0) static BOOL sub_02044E40 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u16 * v1 = inline_0204FCAC(param0); u16 v2 = inline_02049538(param0); u32 v3[7]; v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->unk_0C), v2); - v3[0] = sub_02074470(v0, 13, NULL); - v3[1] = sub_02074470(v0, 14, NULL); - v3[2] = sub_02074470(v0, 15, NULL); - v3[3] = sub_02074470(v0, 16, NULL); - v3[4] = sub_02074470(v0, 17, NULL); - v3[5] = sub_02074470(v0, 18, NULL); + v3[0] = GetMonData(v0, MON_DATA_HP_EV, NULL); + v3[1] = GetMonData(v0, MON_DATA_ATK_EV, NULL); + v3[2] = GetMonData(v0, MON_DATA_DEF_EV, NULL); + v3[3] = GetMonData(v0, MON_DATA_SPEED_EV, NULL); + v3[4] = GetMonData(v0, MON_DATA_SPATK_EV, NULL); + v3[5] = GetMonData(v0, MON_DATA_SPDEF_EV, NULL); *v1 = (v3[0] + v3[1] + v3[2] + v3[3] + v3[4] + v3[5]); return 0; @@ -6767,15 +6767,15 @@ static BOOL sub_02044F04 (UnkStruct_0203E724 * param0) static BOOL sub_02044F24 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u16 * v1 = inline_0204FCAC(param0); u16 * v2 = inline_0204FCAC(param0); u16 v3 = inline_02049538(param0); u16 v4, v5; v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->unk_0C), v3); - v4 = sub_02074470(v0, 5, NULL); - v5 = sub_02074470(v0, 112, NULL); + v4 = GetMonData(v0, MON_DATA_SPECIES, NULL); + v5 = GetMonData(v0, MON_DATA_FORM, NULL); *v1 = ov5_021F0E90(v4, v5); *v2 = ov5_021F0E84(v4); @@ -6901,9 +6901,9 @@ static BOOL sub_02045198 (UnkStruct_0203E724 * param0) static void sub_020451B4 (UnkStruct_0203CDB0 * param0, u16 param1) { UnkStruct_02026324 * v0 = sub_02027560(param0->unk_0C); - UnkStruct_02073C74 * v1 = sub_02073C74(32); + Pokemon * v1 = AllocMonZeroed(32); - sub_02073C2C(v1); + ZeroMonData(v1); sub_02073D80(v1, param1, 50, 32, 0, 0, 0, 0); sub_020272A4(v0, v1); Heap_FreeToHeap(v1); @@ -7018,12 +7018,12 @@ static BOOL sub_02045384 (UnkStruct_0203E724 * param0) int v2; int v3; int v4 = Party_GetCurrentCount(v1); - UnkStruct_02073C74 * v5; + Pokemon * v5; UnkStruct_02026324 * v6 = sub_02027560(param0->unk_34->unk_0C); for (v2 = 0; v2 < v4; v2++) { v5 = Party_GetPokemonBySlotIndex(v1, v2); - v3 = sub_02074470(v5, 5, NULL); + v3 = GetMonData(v5, MON_DATA_SPECIES, NULL); if (v3 == 386) { sub_02074B30(v5, 112, &v0); @@ -7037,7 +7037,7 @@ static BOOL sub_02045384 (UnkStruct_0203E724 * param0) static BOOL sub_02045404 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; int v1, v2, v3, v4, v5, v6; u16 * v7 = inline_0204FCAC(param0); Party * v8 = Party_GetFromSavedata(param0->unk_34->unk_0C); @@ -7048,9 +7048,9 @@ static BOOL sub_02045404 (UnkStruct_0203E724 * param0) for (v1 = 0; v1 < v9; v1++) { v0 = Party_GetPokemonBySlotIndex(v8, v1); - v2 = sub_02074470(v0, 5, NULL); - v6 = sub_02074470(v0, 111, NULL); - v5 = sub_02074470(v0, 76, NULL); + v2 = GetMonData(v0, MON_DATA_SPECIES, NULL); + v6 = GetMonData(v0, MON_DATA_111, NULL); + v5 = GetMonData(v0, MON_DATA_IS_EGG, NULL); if ((v2 == 415) && (v5 == 0)) { if (v6 == 0) { @@ -7146,7 +7146,7 @@ static BOOL sub_02045628 (UnkStruct_0203E724 * param0) { u16 * v0 = sub_0203F118(param0->unk_34, sub_0203E838(param0)); - *v0 = sub_0205E1F8(param0->unk_34->unk_0C); + *v0 = HasAllLegendaryTitansInParty(param0->unk_34->unk_0C); return 0; } @@ -8281,8 +8281,8 @@ static BOOL sub_020466A4 (UnkStruct_0203E724 * param0) static u32 sub_0204676C (UnkStruct_021C0794 * param0) { int v0; - UnkStruct_02073C74 * v1; - UnkStruct_02073C74_sub1 * v2; + Pokemon * v1; + BoxPokemon * v2; u32 v3; v3 = 0; @@ -8297,8 +8297,8 @@ static u32 sub_0204676C (UnkStruct_021C0794 * param0) for (v0 = 0; v0 < v5; v0++) { v1 = Party_GetPokemonBySlotIndex(v4, v0); - if ((sub_02074470(v1, 5, NULL) == 479) && (sub_02074470(v1, 76, NULL) == 0)) { - v3 |= 1 << sub_02074470(v1, 112, NULL); + if ((GetMonData(v1, MON_DATA_SPECIES, NULL) == 479) && (GetMonData(v1, MON_DATA_IS_EGG, NULL) == 0)) { + v3 |= 1 << GetMonData(v1, MON_DATA_FORM, NULL); } } } @@ -8313,8 +8313,8 @@ static u32 sub_0204676C (UnkStruct_021C0794 * param0) v7 = sub_02026218(v6, v0); v2 = sub_02026220(v7); - if ((sub_02074570(v2, 5, NULL) == 479) && (sub_02074570(v2, 76, NULL) == 0)) { - v3 |= 1 << sub_02074570(v2, 112, NULL); + if ((sub_02074570(v2, 5, NULL) == 479) && (sub_02074570(v2, MON_DATA_IS_EGG, NULL) == 0)) { + v3 |= 1 << sub_02074570(v2, MON_DATA_FORM, NULL); } } } @@ -8329,8 +8329,8 @@ static u32 sub_0204676C (UnkStruct_021C0794 * param0) for (v0 = 0; v0 < (5 * 6); v0++) { v2 = sub_02079C9C(v8, v9, v0); - if ((sub_02074570(v2, 5, NULL) == 479) && (sub_02074570(v2, 76, NULL) == 0)) { - v3 |= 1 << sub_02074570(v2, 112, NULL); + if ((sub_02074570(v2, 5, NULL) == 479) && (sub_02074570(v2, MON_DATA_IS_EGG, NULL) == 0)) { + v3 |= 1 << sub_02074570(v2, MON_DATA_FORM, NULL); } } } @@ -8458,14 +8458,14 @@ static BOOL sub_020469D0 (UnkStruct_0203E724 * param0) sub_02077A9C(v1, v2); { int v3, v4; - UnkStruct_02073C74 * v5; + Pokemon * v5; v4 = Party_GetCurrentCount(v1); for (v3 = 0; v3 < v4; v3++) { v5 = Party_GetPokemonBySlotIndex(v1, v3); - if ((sub_02074470(v5, 76, NULL) == 0) && (sub_02074470(v5, 5, NULL) == 487)) { + if ((GetMonData(v5, MON_DATA_IS_EGG, NULL) == 0) && (GetMonData(v5, MON_DATA_SPECIES, NULL) == 487)) { sub_0202736C(sub_02027560(v0->unk_0C), v5); } } @@ -8477,7 +8477,7 @@ static BOOL sub_02046A4C (UnkStruct_0203E724 * param0) { u32 v0, v1; int v2, v3; - UnkStruct_02073C74 * v4; + Pokemon * v4; u16 * v5 = inline_0204FCAC(param0); *v5 = 0; @@ -8486,11 +8486,11 @@ static BOOL sub_02046A4C (UnkStruct_0203E724 * param0) for (v3 = 0; v3 < v2; v3++) { v4 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->unk_0C), v3); - if (sub_02074470(v4, 76, NULL) == 0) { - v0 = sub_02074470(v4, 5, NULL); + if (GetMonData(v4, MON_DATA_IS_EGG, NULL) == 0) { + v0 = GetMonData(v4, MON_DATA_SPECIES, NULL); if (v0 == 486) { - v1 = sub_02074470(v4, 110, NULL); + v1 = GetMonData(v4, MON_DATA_FATEFUL_ENCOUNTER, NULL); if (v1 == 1) { *v5 = 1; diff --git a/src/unk_02046C7C.c b/src/unk_02046C7C.c index 21edeba939..6a2cdcd595 100644 --- a/src/unk_02046C7C.c +++ b/src/unk_02046C7C.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02025E6C_decl.h" #include "struct_decls/struct_0203E724_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_0203CDB0_sub2_t.h" #include "struct_defs/struct_0203E724_t.h" @@ -97,7 +97,7 @@ static BOOL sub_02046CE0 (UnkStruct_0203E724 * param0) BOOL sub_02046CFC (UnkStruct_0203E724 * param0) { UnkStruct_02023790 * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; void ** v2 = sub_0203F098(param0->unk_34, 20); UnkStruct_02025E6C * v3 = sub_02025E38(sub_0203D174(param0->unk_34)); u16 v4 = inline_02049538(param0); @@ -132,7 +132,7 @@ BOOL sub_02046CFC (UnkStruct_0203E724 * param0) BOOL sub_02046E14 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; void ** v1 = sub_0203F098(param0->unk_34, 20); u16 v2 = inline_02049538(param0); u32 v3 = sub_0203A138(param0->unk_34->unk_1C->unk_00); diff --git a/src/unk_020474B8.c b/src/unk_020474B8.c index ec69b7a7f6..e314f6a415 100644 --- a/src/unk_020474B8.c +++ b/src/unk_020474B8.c @@ -8,8 +8,8 @@ #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02025E6C_decl.h" #include "struct_decls/struct_0203E724_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_defs/struct_0203CDB0.h" @@ -85,14 +85,14 @@ BOOL sub_0204754C (UnkStruct_0203E724 * param0) BOOL sub_02047570 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_0203CDB0 * v1 = param0->unk_34; UnkStruct_0200B358 ** v2 = sub_0203F098(v1, 15); u8 v3 = (*((param0)->unk_08++)); u16 v4 = inline_02049538(param0); v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v1->unk_0C), v4); - sub_0200B538(*v2, v3, (UnkStruct_02073C74_sub1 *)v0); + sub_0200B538(*v2, v3, (BoxPokemon *)v0); return 0; } @@ -203,21 +203,21 @@ BOOL sub_0204777C (UnkStruct_0203E724 * param0) BOOL sub_020477D0 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_0203CDB0 * v1 = param0->unk_34; UnkStruct_0200B358 ** v2 = sub_0203F098(v1, 15); u8 v3 = (*((param0)->unk_08++)); u16 v4 = inline_02049538(param0); v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v1->unk_0C), v4); - sub_0200B5CC(*v2, v3, (UnkStruct_02073C74_sub1 *)v0); + sub_0200B5CC(*v2, v3, (BoxPokemon *)v0); return 0; } BOOL sub_02047818 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74_sub1 * v0; + BoxPokemon * v0; UnkStruct_0203CDB0 * v1 = param0->unk_34; UnkStruct_020797DC * v2 = sub_02024420(v1->unk_0C); UnkStruct_0200B358 ** v3 = sub_0203F098(v1, 15); @@ -235,7 +235,7 @@ BOOL sub_02047818 (UnkStruct_0203E724 * param0) BOOL sub_02047874 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_0203CDB0 * v1 = param0->unk_34; UnkStruct_0200B358 ** v2 = sub_0203F098(v1, 15); u8 v3 = (*((param0)->unk_08++)); @@ -438,7 +438,7 @@ BOOL sub_02047CA0 (UnkStruct_0203E724 * param0) BOOL sub_02047D00 (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; + Pokemon * v1; UnkStruct_0200B358 ** v2 = sub_0203F098(v0, 15); u8 v3 = (*((param0)->unk_08++)); u16 v4 = inline_02049538(param0); @@ -446,7 +446,7 @@ BOOL sub_02047D00 (UnkStruct_0203E724 * param0) u16 v6; v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->unk_0C), v4); - v6 = sub_02074470(v1, 54 + v5, NULL); + v6 = GetMonData(v1, MON_DATA_MOVE1 + v5, NULL); sub_0200B630(*v2, v3, v6); return 0; diff --git a/src/unk_020480A8.c b/src/unk_020480A8.c index 5ea6d4cb84..5dfc4c6d03 100644 --- a/src/unk_020480A8.c +++ b/src/unk_020480A8.c @@ -5,8 +5,8 @@ #include "struct_decls/struct_0203E724_decl.h" #include "struct_decls/struct_020507E4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_defs/struct_0203CDB0.h" @@ -37,8 +37,8 @@ BOOL sub_020480A8 (UnkStruct_0203E724 * param0) BOOL sub_020480D8 (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; - UnkStruct_02073C74_sub1 * v2; + Pokemon * v1; + BoxPokemon * v2; UnkStruct_020797DC * v3 = sub_02024420(v0->unk_0C); u16 * v4 = inline_0204FCAC(param0); u16 * v5 = inline_0204FCAC(param0); @@ -56,8 +56,8 @@ BOOL sub_020480D8 (UnkStruct_0203E724 * param0) for (v11 = 0, v12 = 0, v9 = 0; v9 < v8; v9++) { v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->unk_0C), v9); - if (sub_02074470(v1, 76, NULL) == 0) { - v15 = (sub_02074470(v1, 7, NULL) & 0xffff); + if (GetMonData(v1, MON_DATA_IS_EGG, NULL) == 0) { + v15 = (GetMonData(v1, MON_DATA_OT_ID, NULL) & 0xffff); v16 = sub_02048268(v7, v15); @@ -71,11 +71,11 @@ BOOL sub_020480D8 (UnkStruct_0203E724 * param0) for (v13 = 0, v14 = 0, v18 = 0; v18 < 18; v18++) { for (v17 = 0; v17 < (5 * 6); v17++) { v2 = sub_02079C9C(v3, v18, v17); - v19 = sub_02074570(v2, 5, NULL); + v19 = sub_02074570(v2, MON_DATA_SPECIES, NULL); if (v19) { - if (sub_02074570(v2, 76, NULL) == 0) { - v15 = (sub_02074570(v2, 7, NULL) & 0xffff); + if (sub_02074570(v2, MON_DATA_IS_EGG, NULL) == 0) { + v15 = (sub_02074570(v2, MON_DATA_OT_ID, NULL) & 0xffff); v16 = sub_02048268(v7, v15); diff --git a/src/unk_02048DD8.c b/src/unk_02048DD8.c index 299f392e7c..a8949c6374 100644 --- a/src/unk_02048DD8.c +++ b/src/unk_02048DD8.c @@ -10,7 +10,7 @@ #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_0203E724_decl.h" #include "struct_decls/struct_02056B24_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_0202E7D8.h" @@ -131,7 +131,7 @@ BOOL sub_02048F74 (UnkStruct_0203E724 * param0) BOOL sub_02048F98 (UnkStruct_0203E724 * param0) { Party * v0 = Party_GetFromSavedata(param0->unk_34->unk_0C); - UnkStruct_02073C74 * v1 = Party_GetPokemonBySlotIndex(v0, inline_02049538(param0)); + Pokemon * v1 = Party_GetPokemonBySlotIndex(v0, inline_02049538(param0)); sub_0206D60C(param0->unk_34, v1); return 0; @@ -218,7 +218,7 @@ BOOL sub_0204912C (UnkStruct_0203E724 * param0) case 0: { Party * v1 = Party_GetFromSavedata(param0->unk_34->unk_0C); - UnkStruct_02073C74 * v2 = Party_GetPokemonBySlotIndex(v1, inline_02049538(param0)); + Pokemon * v2 = Party_GetPokemonBySlotIndex(v1, inline_02049538(param0)); sub_0206CF48(v0, v2, 4); } @@ -288,7 +288,7 @@ static void sub_0204922C (UnkStruct_0200B358 * param0, int param1, const u16 * p static void sub_02049268 (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * param1) { Party * v0 = Party_GetFromSavedata(param0->unk_0C); - UnkStruct_02073C74 * v1 = sub_02054A74(v0); + Pokemon * v1 = sub_02054A74(v0); sub_0200B538(param1, 0, sub_02076B10(v1)); } diff --git a/src/unk_02049D08.c b/src/unk_02049D08.c index da7d664578..4e003fad39 100644 --- a/src/unk_02049D08.c +++ b/src/unk_02049D08.c @@ -12,7 +12,7 @@ #include "struct_decls/struct_0202D764_decl.h" #include "struct_decls/struct_0203068C_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" @@ -164,7 +164,7 @@ BOOL sub_02049EC4 (u16 param0, UnkStruct_021C0794 * param1, u8 param2) u8 v0, v1, v2, v3; u16 v4, v5; Party * v6; - UnkStruct_02073C74 * v7; + Pokemon * v7; UnkStruct_02049D38 v8[6]; v6 = Party_GetFromSavedata(param1); @@ -176,14 +176,14 @@ BOOL sub_02049EC4 (u16 param0, UnkStruct_021C0794 * param1, u8 param2) for (v0 = 0, v2 = 0; v0 < v3; v0++) { v7 = Party_GetPokemonBySlotIndex(v6, v0); - v4 = sub_02074470(v7, 5, NULL); - v5 = sub_02074470(v7, 6, NULL); + v4 = GetMonData(v7, MON_DATA_SPECIES, NULL); + v5 = GetMonData(v7, MON_DATA_HELD_ITEM, NULL); if (param2 == 0) { v5 = 0; } - if (sub_02074470(v7, 76, NULL) != 0) { + if (GetMonData(v7, MON_DATA_IS_EGG, NULL) != 0) { continue; } @@ -434,7 +434,7 @@ BOOL sub_0204A378 (UnkStruct_0204AFC4 * param0, void ** param1, UnkStruct_021C07 u16 v0 = 0; UnkStruct_02098C44 * v1 = *param1; Party * v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; if ((v1->unk_23 != 0) || (v1->unk_22 == 7)) { Heap_FreeToHeap(*param1); @@ -447,8 +447,8 @@ BOOL sub_0204A378 (UnkStruct_0204AFC4 * param0, void ** param1, UnkStruct_021C07 for (v0 = 0; v0 < param0->unk_0E; v0++) { param0->unk_2A[v0] = v1->unk_2C[v0] - 1; v3 = Party_GetPokemonBySlotIndex(v2, param0->unk_2A[v0]); - param0->unk_2E[v0] = sub_02074470(v3, 5, NULL); - param0->unk_36[v0] = sub_02074470(v3, 6, NULL); + param0->unk_2E[v0] = GetMonData(v3, MON_DATA_SPECIES, NULL); + param0->unk_36[v0] = GetMonData(v3, MON_DATA_HELD_ITEM, NULL); } Heap_FreeToHeap(*param1); @@ -461,14 +461,14 @@ int sub_0204A410 (UnkStruct_0204AFC4 * param0, UnkStruct_021C0794 * param1) u16 v0 = 0, v1 = 0; u16 v2[4], v3[4]; Party * v4; - UnkStruct_02073C74 * v5; + Pokemon * v5; v4 = Party_GetFromSavedata(param1); for (v0 = 0; v0 < param0->unk_0E; v0++) { v5 = Party_GetPokemonBySlotIndex(v4, param0->unk_2A[v0]); - v2[v0] = sub_02074470(v5, 5, NULL); - v3[v0] = sub_02074470(v5, 6, NULL); + v2[v0] = GetMonData(v5, MON_DATA_SPECIES, NULL); + v3[v0] = GetMonData(v5, MON_DATA_HELD_ITEM, NULL); if (v0 == 0) { continue; @@ -952,7 +952,7 @@ static u16 sub_0204AC54 (UnkStruct_021C0794 * param0, u8 param1, UnkStruct_0204A u8 v1; int v2; Party * v3; - UnkStruct_02073C74 * v4; + Pokemon * v4; v3 = Party_GetFromSavedata(param0); v1 = 0; @@ -960,7 +960,7 @@ static u16 sub_0204AC54 (UnkStruct_021C0794 * param0, u8 param1, UnkStruct_0204A for (v2 = 0; v2 < param2->unk_0E; v2++) { v4 = Party_GetPokemonBySlotIndex(v3, param2->unk_2A[v2]); - if (sub_02074470(v4, param1, NULL)) { + if (GetMonData(v4, param1, NULL)) { continue; } @@ -994,32 +994,32 @@ static u16 sub_0204ACC8 (UnkStruct_0204AFC4 * param0) return 1; } -static void sub_0204ACFC (UnkStruct_ov104_0223A348_sub2 * param0, UnkStruct_02073C74 * param1) +static void sub_0204ACFC (UnkStruct_ov104_0223A348_sub2 * param0, Pokemon * param1) { int v0; - param0->unk_00_val1_0 = sub_02074470(param1, 5, NULL); - param0->unk_00_val1_11 = sub_02074470(param1, 112, NULL); - param0->unk_02 = sub_02074470(param1, 6, NULL); + param0->unk_00_val1_0 = GetMonData(param1, MON_DATA_SPECIES, NULL); + param0->unk_00_val1_11 = GetMonData(param1, MON_DATA_FORM, NULL); + param0->unk_02 = GetMonData(param1, MON_DATA_HELD_ITEM, NULL); for (v0 = 0; v0 < 4; v0++) { - param0->unk_04[v0] = sub_02074470(param1, 54 + v0, NULL); - param0->unk_1E_val2 |= ((sub_02074470(param1, 62 + v0, NULL)) << (v0 * 2)); + param0->unk_04[v0] = GetMonData(param1, MON_DATA_MOVE1 + v0, NULL); + param0->unk_1E_val2 |= ((GetMonData(param1, MON_DATA_62 + v0, NULL))<< (v0 * 2)); } - param0->unk_1F = sub_02074470(param1, 12, NULL); - param0->unk_0C = sub_02074470(param1, 7, NULL); - param0->unk_10 = sub_02074470(param1, 0, NULL); - param0->unk_14_val2 = sub_02074470(param1, 175, NULL); + param0->unk_1F = GetMonData(param1, MON_DATA_LANGUAGE, NULL); + param0->unk_0C = GetMonData(param1, MON_DATA_OT_ID, NULL); + param0->unk_10 = GetMonData(param1, MON_DATA_PERSONALITY, NULL); + param0->unk_14_val2 = GetMonData(param1, MON_DATA_175, NULL); for (v0 = 0; v0 < 6; v0++) { - param0->unk_18_val2[v0] = sub_02074470(param1, 13 + v0, NULL); + param0->unk_18_val2[v0] = GetMonData(param1, MON_DATA_HP_EV + v0, NULL); } - param0->unk_20 = sub_02074470(param1, 10, NULL); - param0->unk_21 = sub_02074470(param1, 9, NULL); + param0->unk_20 = GetMonData(param1, MON_DATA_10, NULL); + param0->unk_21 = GetMonData(param1, MON_DATA_FRIENDSHIP, NULL); - sub_02074470(param1, 117, param0->unk_22); + GetMonData(param1, MON_DATA_117, param0->unk_22); } static void sub_0204AE20 (UnkStruct_0204AFC4 * param0, UnkStruct_021C0794 * param1, int param2) @@ -1027,7 +1027,7 @@ static void sub_0204AE20 (UnkStruct_0204AFC4 * param0, UnkStruct_021C0794 * para int v0 = 0; UnkStruct_ov104_0223A348_sub2 * v1; Party * v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; v1 = Heap_AllocFromHeapAtEnd(param0->unk_04, sizeof(UnkStruct_ov104_0223A348_sub2) * 3); MI_CpuClear8(v1, sizeof(UnkStruct_ov104_0223A348_sub2) * 3); diff --git a/src/unk_0204AEE8.c b/src/unk_0204AEE8.c index f361f5bd36..02c46ab642 100644 --- a/src/unk_0204AEE8.c +++ b/src/unk_0204AEE8.c @@ -8,7 +8,7 @@ #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02025E6C_decl.h" #include "struct_decls/struct_02026324_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" @@ -203,14 +203,14 @@ void sub_0204B060 (UnkStruct_0204AFC4 * param0, UnkStruct_021C0794 * param1) { int v0; Party * v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; UnkStruct_02025E6C * v3 = sub_02025E38(param1); param0->unk_83E[0] = sub_02025F30(v3); v1 = Party_GetFromSavedata(param1); for (v0 = 0; v0 < 2; v0++) { - param0->unk_83E[1 + v0] = sub_02074470(Party_GetPokemonBySlotIndex(v1, param0->unk_2A[v0]), 5, NULL); + param0->unk_83E[1 + v0] = GetMonData(Party_GetPokemonBySlotIndex(v1, param0->unk_2A[v0]), MON_DATA_SPECIES, NULL); } param0->unk_83E[3] = sub_0202D3B4(param0->unk_74, 3, 0); @@ -345,7 +345,7 @@ static u32 sub_0204B1E8 (UnkStruct_0204AFC4 * param0, UnkStruct_ov104_0223A348_s if (param4 == 0) { do { v2 = (sub_0204AEC0(param0) | sub_0204AEC0(param0) << 16); - } while ((v4.unk_0B != sub_02075BFC(v2)) || (sub_02075E38(param3, v2) == 1)); + } while ((v4.unk_0B != GetNatureFromPersonality(v2)) || (sub_02075E38(param3, v2) == 1)); param1->unk_10 = v2; } else { diff --git a/src/unk_0204B830.c b/src/unk_0204B830.c index c26b9ef9f8..c3e2fe16e2 100644 --- a/src/unk_0204B830.c +++ b/src/unk_0204B830.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_0203E724_decl.h" #include "struct_decls/struct_020507E4_decl.h" #include "struct_decls/struct_02056B24_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_0207D3C0_decl.h" @@ -191,20 +191,20 @@ static void sub_0204BAAC (UnkStruct_0203CDB0 * param0, void * param1) UnkStruct_02025E6C * v1 = sub_02025E38(param0->unk_0C); UnkStruct_020507E4 * v2 = sub_020507E4(param0->unk_0C); Party * v3; - UnkStruct_02073C74 * v4; + Pokemon * v4; BOOL v5; - UnkStruct_02073C74 * v6 = NULL; + Pokemon * v6 = NULL; u32 v7, v8, v9, v10; u32 v11; int v12; u8 * v13; u8 * v14; - v4 = (UnkStruct_02073C74 *)&v0->val1.unk_04; + v4 = (Pokemon *)&v0->val1.unk_04; v14 = (u8 *)&v0->val1.unk_F0; - v12 = sub_02074470(v4, 152, NULL); - v8 = sub_02074470(v4, 0, NULL); - v7 = sub_02074470(v4, 7, NULL); + v12 = GetMonData(v4, MON_DATA_152, NULL); + v8 = GetMonData(v4, MON_DATA_PERSONALITY, NULL); + v7 = GetMonData(v4, MON_DATA_OT_ID, NULL); v9 = sub_0201D30C((u32)OS_GetTick()); if (v8 == 0x0) { @@ -221,7 +221,7 @@ static void sub_0204BAAC (UnkStruct_0203CDB0 * param0, void * param1) v10 = sub_02075D6C(v4); sub_02074B30(v4, 111, (u8 *)&v10); - v10 = sub_02074470(v4, 70, 0) + sub_02074470(v4, 71, 0) + sub_02074470(v4, 72, 0) + sub_02074470(v4, 73, 0) + sub_02074470(v4, 74, 0) + sub_02074470(v4, 75, 0); + v10 = GetMonData(v4, MON_DATA_HP_IV, 0) + GetMonData(v4, MON_DATA_ATK_IV, 0) + GetMonData(v4, MON_DATA_DEF_IV, 0) + GetMonData(v4, MON_DATA_SPEED_IV, 0) + GetMonData(v4, MON_DATA_SPATK_IV, 0) + GetMonData(v4, MON_DATA_SPDEF_IV, 0); if (v10 == 0) { v8 = sub_0201D2E8(); @@ -248,43 +248,43 @@ static void sub_0204BAAC (UnkStruct_0203CDB0 * param0, void * param1) v13 = sub_0202D79C(param0->unk_0C); - if (sub_02074470(v4, 46, 0)) { + if (GetMonData(v4, MON_DATA_46, 0)) { v13[sub_02092444(73)] = v14[0]; } - if (sub_02074470(v4, 47, 0)) { + if (GetMonData(v4, MON_DATA_47, 0)) { v13[sub_02092444(74)] = v14[1]; } - if (sub_02074470(v4, 48, 0)) { + if (GetMonData(v4, MON_DATA_48, 0)) { v13[sub_02092444(75)] = v14[2]; } - if (sub_02074470(v4, 49, 0)) { + if (GetMonData(v4, MON_DATA_49, 0)) { v13[sub_02092444(76)] = v14[3]; } - if (sub_02074470(v4, 50, 0)) { + if (GetMonData(v4, MON_DATA_50, 0)) { v13[sub_02092444(77)] = v14[4]; } - if (sub_02074470(v4, 51, 0)) { + if (GetMonData(v4, MON_DATA_51, 0)) { v13[sub_02092444(78)] = v14[5]; } - if (sub_02074470(v4, 52, 0)) { + if (GetMonData(v4, MON_DATA_52, 0)) { v13[sub_02092444(79)] = v14[6]; } - if (sub_02074470(v4, 103, 0)) { + if (GetMonData(v4, MON_DATA_MARINE_RIBBON, 0)) { v13[sub_02092444(25)] = v14[7]; } - if (sub_02074470(v4, 104, 0)) { + if (GetMonData(v4, MON_DATA_LAND_RIBBON, 0)) { v13[sub_02092444(26)] = v14[8]; } - if (sub_02074470(v4, 105, 0)) { + if (GetMonData(v4, MON_DATA_SKY_RIBBON, 0)) { v13[sub_02092444(27)] = v14[9]; } @@ -293,7 +293,7 @@ static void sub_0204BAAC (UnkStruct_0203CDB0 * param0, void * param1) u32 v16 = sub_02025F20(v1); u32 v17 = sub_02025F30(v1); - v6 = sub_02073C74(32); + v6 = AllocMonZeroed(32); sub_020775EC(v4, v6); sub_02074B30(v6, 145, v15); @@ -306,8 +306,8 @@ static void sub_0204BAAC (UnkStruct_0203CDB0 * param0, void * param1) sub_0209304C(v4, v1, 4, sub_02017070(2, v12), 32); - if (sub_02074470(v4, 5, NULL) == 493) { - if (sub_02074470(v4, 110, NULL) == 1) { + if (GetMonData(v4, MON_DATA_SPECIES, NULL) == 493) { + if (GetMonData(v4, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 1) { if (sub_0206B5F8(v2) == 0) { sub_0206B608(v2, 1); } @@ -331,12 +331,12 @@ static void sub_0204BAAC (UnkStruct_0203CDB0 * param0, void * param1) static void sub_0204BDEC (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) { UnkUnion_0204C4D0 * v0 = sub_0204B844(param0->unk_00); - UnkStruct_02073C74 * v1; + Pokemon * v1; *param1 = 379; *param2 = 7; - v1 = (UnkStruct_02073C74 *)&v0->val1.unk_04; + v1 = (Pokemon *)&v0->val1.unk_04; sub_0200B498(param0->unk_04, 0, sub_02025E38(param0->unk_00->unk_0C)); sub_0200B578(param0->unk_04, 1, sub_02076B10(v1)); @@ -356,12 +356,12 @@ static void sub_0204BE3C (UnkStruct_0203CDB0 * param0, void * param1) static void sub_0204BE44 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) { UnkUnion_0204C4D0 * v0 = sub_0204B844(param0->unk_00); - UnkStruct_02073C74 * v1; + Pokemon * v1; *param1 = 379; *param2 = 8; - v1 = (UnkStruct_02073C74 *)v0->val2.unk_04; + v1 = (Pokemon *)v0->val2.unk_04; sub_0200B498(param0->unk_04, 0, sub_02025E38(param0->unk_00->unk_0C)); sub_0200B538(param0->unk_04, 1, sub_02076B10(v1)); diff --git a/src/unk_0204C500.c b/src/unk_0204C500.c index c45019b544..5bddf58b13 100644 --- a/src/unk_0204C500.c +++ b/src/unk_0204C500.c @@ -8,7 +8,7 @@ #include "struct_decls/struct_02026324_decl.h" #include "struct_decls/struct_0203E724_decl.h" #include "struct_decls/struct_020507E4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_defs/struct_0203E724_t.h" @@ -48,7 +48,7 @@ BOOL sub_0204C500 (UnkStruct_0203E724 * param0) BOOL sub_0204C554 (UnkStruct_0203E724 * param0) { UnkStruct_02024440 * v0 = sub_02024440(param0->unk_34->unk_0C); - UnkStruct_02073C74 * v1 = sub_02073C74(32); + Pokemon * v1 = AllocMonZeroed(32); u16 * v2 = inline_0204FCAC(param0); if (sub_0202F028(v0) == 6) { @@ -65,7 +65,7 @@ BOOL sub_0204C59C (UnkStruct_0203E724 * param0) { UnkStruct_02024440 * v0 = sub_02024440(param0->unk_34->unk_0C); UnkStruct_020797DC * v1 = sub_02024420(param0->unk_34->unk_0C); - UnkStruct_02073C74 * v2 = sub_02073C74(32); + Pokemon * v2 = AllocMonZeroed(32); UnkStruct_02025E6C * v3 = sub_02025E38(param0->unk_34->unk_0C); UnkStruct_02026324 * v4 = sub_02027560(param0->unk_34->unk_0C); BOOL v5; diff --git a/src/unk_0204CFFC.c b/src/unk_0204CFFC.c index 14ebd1fb27..882c5787ab 100644 --- a/src/unk_0204CFFC.c +++ b/src/unk_0204CFFC.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02025E6C_decl.h" #include "struct_decls/struct_0203E724_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" @@ -50,14 +50,14 @@ BOOL sub_0204CFFC (UnkStruct_0203E724 * param0) BOOL sub_0204D08C (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; + Pokemon * v1; u16 * v2 = inline_0204FCAC(param0); u16 * v3 = inline_0204FCAC(param0); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->unk_0C), *v2); - if (sub_02074470(v1, 76, NULL) == 0) { - *v3 = sub_02074470(v1, 5, NULL); + if (GetMonData(v1, MON_DATA_IS_EGG, NULL) == 0) { + *v3 = GetMonData(v1, MON_DATA_SPECIES, NULL); } else { *v3 = 0; } @@ -68,14 +68,14 @@ BOOL sub_0204D08C (UnkStruct_0203E724 * param0) BOOL sub_0204D0E8 (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; + Pokemon * v1; UnkStruct_02025E6C * v2 = sub_02025E38(sub_0203D174(param0->unk_34)); u16 * v3 = inline_0204FCAC(param0); u16 * v4 = inline_0204FCAC(param0); u16 v5, v6; v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->unk_0C), *v3); - v5 = sub_02074470(v1, 7, NULL); + v5 = GetMonData(v1, MON_DATA_OT_ID, NULL); v6 = sub_02025F20(v2); if (v5 == v6) { @@ -93,7 +93,7 @@ BOOL sub_0204D154 (UnkStruct_0203E724 * param0) u8 v1; BOOL v2; Party * v3; - UnkStruct_02073C74 * v4; + Pokemon * v4; UnkStruct_0203CDB0 * v5 = param0->unk_34; UnkStruct_02025E6C * v6 = sub_02025E38(v5->unk_0C); u16 v7 = inline_02049538(param0); @@ -103,8 +103,8 @@ BOOL sub_0204D154 (UnkStruct_0203E724 * param0) v1 = Party_GetCurrentCount(v3); if (v1 < 6) { - v4 = sub_02073C74(11); - sub_02073C2C(v4); + v4 = AllocMonZeroed(11); + ZeroMonData(v4); v0 = sub_02017070(1, v8); ov5_021E6CF0(v4, v7, 1, v6, 3, v0); @@ -131,7 +131,7 @@ BOOL sub_0204D1DC (UnkStruct_0203E724 * param0) BOOL sub_0204D234 (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; + Pokemon * v1; u16 * v2 = inline_0204FCAC(param0); u16 v3 = inline_02049538(param0); u16 v4 = inline_02049538(param0); @@ -140,11 +140,11 @@ BOOL sub_0204D234 (UnkStruct_0203E724 * param0) v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->unk_0C), v4); *v2 = 0; - if (sub_02074470(v1, 76, NULL) != 0) { + if (GetMonData(v1, MON_DATA_IS_EGG, NULL) != 0) { return 0; } - if ((sub_02074470(v1, 54, NULL) == v3) || (sub_02074470(v1, 55, NULL) == v3) || (sub_02074470(v1, 56, NULL) == v3) || (sub_02074470(v1, 57, NULL) == v3)) { + if ((GetMonData(v1, MON_DATA_MOVE1, NULL) == v3) || (GetMonData(v1, MON_DATA_MOVE2, NULL) == v3) || (GetMonData(v1, MON_DATA_MOVE3, NULL) == v3) || (GetMonData(v1, MON_DATA_MOVE4, NULL) == v3)) { *v2 = 1; } @@ -154,7 +154,7 @@ BOOL sub_0204D234 (UnkStruct_0203E724 * param0) BOOL sub_0204D2D8 (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; + Pokemon * v1; u16 * v2 = inline_0204FCAC(param0); u16 v3 = inline_02049538(param0); u16 v4; @@ -165,11 +165,11 @@ BOOL sub_0204D2D8 (UnkStruct_0203E724 * param0) for (v5 = 0, *v2 = 6; v5 < v6; v5++) { v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->unk_0C), v5); - if (sub_02074470(v1, 76, NULL) != 0) { + if (GetMonData(v1, MON_DATA_IS_EGG, NULL) != 0) { continue; } - if ((sub_02074470(v1, 54, NULL) == v3) || (sub_02074470(v1, 55, NULL) == v3) || (sub_02074470(v1, 56, NULL) == v3) || (sub_02074470(v1, 57, NULL) == v3)) { + if ((GetMonData(v1, MON_DATA_MOVE1, NULL) == v3) || (GetMonData(v1, MON_DATA_MOVE2, NULL) == v3) || (GetMonData(v1, MON_DATA_MOVE3, NULL) == v3) || (GetMonData(v1, MON_DATA_MOVE4, NULL) == v3)) { *v2 = v5; break; } @@ -180,7 +180,7 @@ BOOL sub_0204D2D8 (UnkStruct_0203E724 * param0) BOOL sub_0204D398 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u16 v1; u16 * v2; @@ -195,7 +195,7 @@ BOOL sub_0204D398 (UnkStruct_0203E724 * param0) BOOL sub_0204D3DC (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; + Pokemon * v1; u16 * v2 = inline_0204FCAC(param0); u16 v3 = inline_02049538(param0); u8 v4, v5, v6; @@ -206,8 +206,8 @@ BOOL sub_0204D3DC (UnkStruct_0203E724 * param0) for (v4 = 0, v6 = 0; v4 < v5; v4++) { v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->unk_0C), v4); - if (sub_02074470(v1, 76, NULL) == 0) { - if (sub_02074470(v1, 161, NULL) <= v3) { + if (GetMonData(v1, MON_DATA_IS_EGG, NULL) == 0) { + if (GetMonData(v1, MON_DATA_161, NULL) <= v3) { v6++; } } @@ -221,15 +221,15 @@ BOOL sub_0204D3DC (UnkStruct_0203E724 * param0) BOOL sub_0204D470 (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; + Pokemon * v1; u16 * v2 = inline_0204FCAC(param0); u16 v3 = inline_02049538(param0); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->unk_0C), v3); *v2 = 0; - if (sub_02074470(v1, 76, NULL) == 0) { - *v2 = sub_02074470(v1, 161, NULL); + if (GetMonData(v1, MON_DATA_IS_EGG, NULL) == 0) { + *v2 = GetMonData(v1, MON_DATA_161, NULL); } return 0; @@ -238,7 +238,7 @@ BOOL sub_0204D470 (UnkStruct_0203E724 * param0) BOOL sub_0204D4CC (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; + Pokemon * v1; u16 * v2 = inline_0204FCAC(param0); u16 v3 = inline_02049538(param0); u8 v4; @@ -252,7 +252,7 @@ BOOL sub_0204D4CC (UnkStruct_0203E724 * param0) v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->unk_0C), v3); - if (sub_02074470(v1, 76, NULL) != 0) { + if (GetMonData(v1, MON_DATA_IS_EGG, NULL) != 0) { *v2 = 0; return 0; } @@ -265,7 +265,7 @@ BOOL sub_0204D4CC (UnkStruct_0203E724 * param0) BOOL sub_0204D540 (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; + Pokemon * v1; u16 * v2 = inline_0204FCAC(param0); u16 v3 = inline_02049538(param0); u8 v4, v5; @@ -276,7 +276,7 @@ BOOL sub_0204D540 (UnkStruct_0203E724 * param0) for (v5 = 0; v5 < v4; v5++) { v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->unk_0C), v5); - if (sub_02074470(v1, 76, NULL) == 0) { + if (GetMonData(v1, MON_DATA_IS_EGG, NULL) == 0) { if (sub_02075BCC(v1) == v3) { *v2 = v5; break; @@ -290,12 +290,12 @@ BOOL sub_0204D540 (UnkStruct_0203E724 * param0) BOOL sub_0204D5CC (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; + Pokemon * v1; u16 * v2 = inline_0204FCAC(param0); u16 v3 = inline_02049538(param0); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->unk_0C), v3); - *v2 = sub_02074470(v1, 9, NULL); + *v2 = GetMonData(v1, MON_DATA_FRIENDSHIP, NULL); return 0; } @@ -303,25 +303,25 @@ BOOL sub_0204D5CC (UnkStruct_0203E724 * param0) BOOL sub_0204D614 (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; + Pokemon * v1; u16 v2 = inline_02049538(param0); u16 v3 = inline_02049538(param0); u16 v4; u32 v5 = sub_0203A138(param0->unk_34->unk_1C->unk_00); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->unk_0C), v3); - v4 = sub_02074470(v1, 9, NULL); + v4 = GetMonData(v1, MON_DATA_FRIENDSHIP, NULL); if (v2 > 0) { - if (Item_GetAttribute(sub_02074470(v1, 6, NULL), 1, 11) == 53) { + if (Item_GetAttribute(GetMonData(v1, MON_DATA_HELD_ITEM, NULL), 1, 11) == 53) { v2 = v2 * 150 / 100; } - if (sub_02074470(v1, 155, NULL) == 11) { + if (GetMonData(v1, MON_DATA_POKEBALL, NULL) == 11) { v2++; } - if (sub_02074470(v1, 152, NULL) == v5) { + if (GetMonData(v1, MON_DATA_152, NULL) == v5) { v2++; } } @@ -339,13 +339,13 @@ BOOL sub_0204D614 (UnkStruct_0203E724 * param0) BOOL sub_0204D6E4 (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; + Pokemon * v1; u16 v2 = inline_02049538(param0); u16 v3 = inline_02049538(param0); u16 v4; v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->unk_0C), v3); - v4 = sub_02074470(v1, 9, NULL); + v4 = GetMonData(v1, MON_DATA_FRIENDSHIP, NULL); if (v2 > v4) { v4 = 0; @@ -359,13 +359,13 @@ BOOL sub_0204D6E4 (UnkStruct_0203E724 * param0) BOOL sub_0204D74C (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u16 v1 = inline_02049538(param0); u16 v2 = inline_02049538(param0); u16 * v3 = inline_0204FCAC(param0); v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->unk_0C), v1); - *v3 = sub_02074470(v0, 19 + v2, NULL); + *v3 = GetMonData(v0, MON_DATA_COOL + v2, NULL); return 0; } @@ -381,14 +381,14 @@ BOOL sub_0204D7AC (UnkStruct_0203E724 * param0) BOOL sub_0204D7D4 (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; + Pokemon * v1; u16 * v2 = inline_0204FCAC(param0); u16 * v3 = inline_0204FCAC(param0); u16 v4 = inline_02049538(param0); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->unk_0C), v4); - *v2 = sub_02074470(v1, 177, NULL); - *v3 = sub_02074470(v1, 178, NULL); + *v2 = GetMonData(v1, MON_DATA_177, NULL); + *v3 = GetMonData(v1, MON_DATA_178, NULL); return 0; } @@ -396,7 +396,7 @@ BOOL sub_0204D7D4 (UnkStruct_0203E724 * param0) BOOL sub_0204D840 (UnkStruct_0203E724 * param0) { int v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; UnkStruct_0203CDB0 * v2 = param0->unk_34; u16 * v3 = inline_0204FCAC(param0); @@ -409,7 +409,7 @@ BOOL sub_0204D840 (UnkStruct_0203E724 * param0) BOOL sub_0204D86C (UnkStruct_0203E724 * param0) { int v0, v1, v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; UnkStruct_0203CDB0 * v4 = param0->unk_34; u16 * v5 = inline_0204FCAC(param0); @@ -418,7 +418,7 @@ BOOL sub_0204D86C (UnkStruct_0203E724 * param0) for (v2 = 0, v1 = 0; v2 < v0; v2++) { v3 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v4->unk_0C), v2); - if (sub_02074470(v3, 76, NULL) == 0) { + if (GetMonData(v3, MON_DATA_IS_EGG, NULL) == 0) { v1++; } } @@ -431,7 +431,7 @@ BOOL sub_0204D86C (UnkStruct_0203E724 * param0) BOOL sub_0204D8C4 (UnkStruct_0203E724 * param0) { int v0, v1, v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; UnkStruct_0203CDB0 * v4 = param0->unk_34; u16 * v5 = inline_0204FCAC(param0); u16 v6 = inline_02049538(param0); @@ -445,8 +445,8 @@ BOOL sub_0204D8C4 (UnkStruct_0203E724 * param0) v3 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v4->unk_0C), v2); - if (sub_02074470(v3, 76, NULL) == 0) { - if (sub_02074470(v3, 163, NULL) != 0) { + if (GetMonData(v3, MON_DATA_IS_EGG, NULL) == 0) { + if (GetMonData(v3, MON_DATA_163, NULL) != 0) { v1++; } } @@ -460,7 +460,7 @@ BOOL sub_0204D8C4 (UnkStruct_0203E724 * param0) BOOL sub_0204D94C (UnkStruct_0203E724 * param0) { int v0, v1, v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; UnkStruct_0203CDB0 * v4 = param0->unk_34; u16 * v5 = inline_0204FCAC(param0); UnkStruct_020797DC * v6 = sub_02024420(v4->unk_0C); @@ -470,8 +470,8 @@ BOOL sub_0204D94C (UnkStruct_0203E724 * param0) for (v2 = 0, v1 = 0; v2 < v0; v2++) { v3 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v4->unk_0C), v2); - if (sub_02074470(v3, 76, NULL) == 0) { - if (sub_02074470(v3, 163, NULL) != 0) { + if (GetMonData(v3, MON_DATA_IS_EGG, NULL) == 0) { + if (GetMonData(v3, MON_DATA_163, NULL) != 0) { v1++; } } @@ -486,7 +486,7 @@ BOOL sub_0204D94C (UnkStruct_0203E724 * param0) BOOL sub_0204D9C8 (UnkStruct_0203E724 * param0) { int v0, v1, v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; UnkStruct_0203CDB0 * v4 = param0->unk_34; u16 * v5 = inline_0204FCAC(param0); @@ -495,7 +495,7 @@ BOOL sub_0204D9C8 (UnkStruct_0203E724 * param0) for (v2 = 0, v1 = 0; v2 < v0; v2++) { v3 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v4->unk_0C), v2); - if (sub_02074470(v3, 76, NULL)) { + if (GetMonData(v3, MON_DATA_IS_EGG, NULL)) { v1++; } } @@ -510,7 +510,7 @@ BOOL sub_0204DA20 (UnkStruct_0203E724 * param0) u16 v0, v1; u16 * v2; u32 v3; - UnkStruct_02073C74 * v4; + Pokemon * v4; UnkStruct_0203CDB0 * v5 = param0->unk_34; v2 = inline_0204FCAC(param0); @@ -520,7 +520,7 @@ BOOL sub_0204DA20 (UnkStruct_0203E724 * param0) for (v0 = 0; v0 < v1; v0++) { v4 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v5->unk_0C), v0); - v3 = sub_02074470(v4, 154, NULL); + v3 = GetMonData(v4, MON_DATA_POKERUS, NULL); if (v3 != 0) { *v2 = 1; @@ -533,12 +533,12 @@ BOOL sub_0204DA20 (UnkStruct_0203E724 * param0) BOOL sub_0204DA84 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u16 v1 = inline_02049538(param0); u16 * v2 = inline_0204FCAC(param0); v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->unk_0C), v1); - *v2 = sub_02074470(v0, 111, NULL); + *v2 = GetMonData(v0, MON_DATA_111, NULL); return 0; } @@ -546,33 +546,33 @@ BOOL sub_0204DA84 (UnkStruct_0203E724 * param0) BOOL sub_0204DACC (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; + Pokemon * v1; u16 * v2 = inline_0204FCAC(param0); u16 v3 = inline_02049538(param0); u8 v4; v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->unk_0C), v3); - if (sub_02074470(v1, 76, NULL) != 0) { + if (GetMonData(v1, MON_DATA_IS_EGG, NULL) != 0) { *v2 = 0; return 0; } v4 = 0; - if ((sub_02074470(v1, 54, NULL) != 0)) { + if ((GetMonData(v1, MON_DATA_MOVE1, NULL) != 0)) { v4++; } - if ((sub_02074470(v1, 55, NULL) != 0)) { + if ((GetMonData(v1, MON_DATA_MOVE2, NULL) != 0)) { v4++; } - if ((sub_02074470(v1, 56, NULL) != 0)) { + if ((GetMonData(v1, MON_DATA_MOVE3, NULL) != 0)) { v4++; } - if ((sub_02074470(v1, 57, NULL) != 0)) { + if ((GetMonData(v1, MON_DATA_MOVE4, NULL) != 0)) { v4++; } @@ -583,7 +583,7 @@ BOOL sub_0204DACC (UnkStruct_0203E724 * param0) BOOL sub_0204DB74 (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; + Pokemon * v1; u32 v2; u8 v3; u16 v4 = inline_02049538(param0); @@ -598,13 +598,13 @@ BOOL sub_0204DB74 (UnkStruct_0203E724 * param0) BOOL sub_0204DBB8 (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; + Pokemon * v1; u16 * v2 = inline_0204FCAC(param0); u16 v3 = inline_02049538(param0); u16 v4 = inline_02049538(param0); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->unk_0C), v3); - *v2 = sub_02074470(v1, 54 + v4, NULL); + *v2 = GetMonData(v1, MON_DATA_MOVE1 + v4, NULL); return 0; } @@ -612,12 +612,12 @@ BOOL sub_0204DBB8 (UnkStruct_0203E724 * param0) BOOL sub_0204DC18 (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; + Pokemon * v1; u16 * v2 = inline_0204FCAC(param0); u16 v3 = inline_02049538(param0); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->unk_0C), v3); - *v2 = sub_02074470(v1, 6, NULL); + *v2 = GetMonData(v1, MON_DATA_HELD_ITEM, NULL); return 0; } @@ -625,7 +625,7 @@ BOOL sub_0204DC18 (UnkStruct_0203E724 * param0) BOOL sub_0204DC60 (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; + Pokemon * v1; u16 v2 = inline_02049538(param0); u16 v3; @@ -640,7 +640,7 @@ BOOL sub_0204DC60 (UnkStruct_0203E724 * param0) BOOL sub_0204DC98 (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; + Pokemon * v1; Party * v2; u16 * v3 = inline_0204FCAC(param0); u16 v4 = inline_02049538(param0); @@ -654,8 +654,8 @@ BOOL sub_0204DC98 (UnkStruct_0203E724 * param0) for (v5 = 0; v5 < v6; v5++) { v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->unk_0C), v5); - if (sub_02074470(v1, 76, NULL) == 0) { - v7 = sub_02074470(v1, 5, NULL); + if (GetMonData(v1, MON_DATA_IS_EGG, NULL) == 0) { + v7 = GetMonData(v1, MON_DATA_SPECIES, NULL); if (v4 == v7) { *v3 = 1; @@ -670,7 +670,7 @@ BOOL sub_0204DC98 (UnkStruct_0203E724 * param0) BOOL sub_0204DD28 (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; + Pokemon * v1; Party * v2; u16 * v3 = inline_0204FCAC(param0); u16 v4 = inline_02049538(param0); @@ -689,8 +689,8 @@ BOOL sub_0204DD28 (UnkStruct_0203E724 * param0) for (v5 = 0; v5 < v7; v5++) { v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->unk_0C), v5); - if (sub_02074470(v1, 76, NULL) == 0) { - v8 = sub_02074470(v1, 5, NULL); + if (GetMonData(v1, MON_DATA_IS_EGG, NULL) == 0) { + v8 = GetMonData(v1, MON_DATA_SPECIES, NULL); if (v4 == 0) { v9[v5] = v8; @@ -715,7 +715,7 @@ BOOL sub_0204DD28 (UnkStruct_0203E724 * param0) BOOL sub_0204DE00 (UnkStruct_0203E724 * param0) { UnkStruct_0203CDB0 * v0 = param0->unk_34; - UnkStruct_02073C74 * v1; + Pokemon * v1; Party * v2; u16 * v3 = inline_0204FCAC(param0); u16 v4 = inline_02049538(param0); @@ -729,8 +729,8 @@ BOOL sub_0204DE00 (UnkStruct_0203E724 * param0) for (v5 = 0; v5 < v6; v5++) { v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v0->unk_0C), v5); - if (sub_02074470(v1, 76, NULL) == 0) { - v7 = sub_02074470(v1, 5, NULL); + if (GetMonData(v1, MON_DATA_IS_EGG, NULL) == 0) { + v7 = GetMonData(v1, MON_DATA_SPECIES, NULL); if (v4 == v7) { *v3 = v5; @@ -744,7 +744,7 @@ BOOL sub_0204DE00 (UnkStruct_0203E724 * param0) BOOL sub_0204DE94 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u16 * v1 = inline_0204FCAC(param0); u16 v2 = inline_02049538(param0); u16 v3, v4; @@ -752,7 +752,7 @@ BOOL sub_0204DE94 (UnkStruct_0203E724 * param0) v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->unk_0C), v2); for (v3 = 0, v4 = 0; v3 < 80; v3++) { - if (sub_02074470(v0, sub_020923C0(v3, 0), NULL) != 0) { + if (GetMonData(v0, sub_020923C0(v3, 0), NULL) != 0) { v4++; } } @@ -764,7 +764,7 @@ BOOL sub_0204DE94 (UnkStruct_0203E724 * param0) BOOL sub_0204DF08 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; Party * v1; u16 * v2 = inline_0204FCAC(param0); u16 v3, v4, v5, v6; @@ -776,8 +776,8 @@ BOOL sub_0204DF08 (UnkStruct_0203E724 * param0) for (v4 = 0; v4 < v6; v4++) { v0 = Party_GetPokemonBySlotIndex(v1, v4); - if (sub_02074470(v0, 76, NULL) == 0) { - if (sub_02074470(v0, sub_020923C0(v3, 0), NULL) != 0) { + if (GetMonData(v0, MON_DATA_IS_EGG, NULL) == 0) { + if (GetMonData(v0, sub_020923C0(v3, 0), NULL) != 0) { v5++; break; } @@ -792,21 +792,21 @@ BOOL sub_0204DF08 (UnkStruct_0203E724 * param0) BOOL sub_0204DFB0 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u16 * v1 = inline_0204FCAC(param0); u16 v2 = inline_02049538(param0); u16 v3 = inline_02049538(param0); u8 v4 = 1; v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->unk_0C), v2); - *v1 = sub_02074470(v0, sub_020923C0(v3, 0), NULL); + *v1 = GetMonData(v0, sub_020923C0(v3, 0), NULL); return 0; } BOOL sub_0204E01C (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u16 v1 = inline_02049538(param0); u16 v2 = inline_02049538(param0); u8 v3 = 1; @@ -821,7 +821,7 @@ BOOL sub_0204E01C (UnkStruct_0203E724 * param0) BOOL sub_0204E094 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; Party * v1; u16 * v2 = inline_0204FCAC(param0); u16 v3, v4, v5; @@ -833,8 +833,8 @@ BOOL sub_0204E094 (UnkStruct_0203E724 * param0) for (v4 = 0; v4 < v5; v4++) { v0 = Party_GetPokemonBySlotIndex(v1, v4); - if (sub_02074470(v0, 76, NULL) != 0) { - if (sub_02074470(v0, 3, NULL) != 0) { + if (GetMonData(v0, MON_DATA_IS_EGG, NULL) != 0) { + if (GetMonData(v0, MON_DATA_3, NULL) != 0) { *v2 = 1; return 0; } @@ -856,7 +856,7 @@ BOOL sub_0204E12C (UnkStruct_0203E724 * param0) { u8 v0, v1; u16 v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; Party * v4; UnkStruct_0203CDB0 * v5 = param0->unk_34; u16 * v6 = inline_0204FCAC(param0); @@ -869,11 +869,11 @@ BOOL sub_0204E12C (UnkStruct_0203E724 * param0) for (v0 = 0; v0 < v1; v0++) { v3 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v5->unk_0C), v0); - if (sub_02074470(v3, 76, NULL) == 0) { - v2 = sub_02074470(v3, 5, NULL); + if (GetMonData(v3, MON_DATA_IS_EGG, NULL) == 0) { + v2 = GetMonData(v3, MON_DATA_SPECIES, NULL); if (v7 == v2) { - if (sub_02074470(v3, 110, NULL) == 1) { + if (GetMonData(v3, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 1) { *v6 = v0; break; } @@ -888,7 +888,7 @@ BOOL sub_0204E1D0 (UnkStruct_0203E724 * param0) { int v0, v1; Party * v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; UnkStruct_0203CDB0 * v4 = param0->unk_34; u16 v5 = inline_02049538(param0); u16 * v6 = inline_0204FCAC(param0); @@ -900,7 +900,7 @@ BOOL sub_0204E1D0 (UnkStruct_0203E724 * param0) for (v0 = 0; v0 < v1; v0++) { v3 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v4->unk_0C), v0); - if (sub_02074470(v3, 6, NULL) == v5) { + if (GetMonData(v3, MON_DATA_HELD_ITEM, NULL) == v5) { *v6 = 1; break; } diff --git a/src/unk_0204EDA4.c b/src/unk_0204EDA4.c index 14429d64bb..751b6efd6e 100644 --- a/src/unk_0204EDA4.c +++ b/src/unk_0204EDA4.c @@ -4,7 +4,7 @@ #include "inlines.h" #include "struct_decls/struct_0203E724_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_0203E724_t.h" #include "struct_defs/struct_020997B8.h" @@ -20,7 +20,7 @@ #include "party.h" #include "unk_020997B8.h" -static void sub_0204EE90(UnkStruct_0203E724 * param0, u16 param1, UnkStruct_02073C74 * param2, u16 * param3); +static void sub_0204EE90(UnkStruct_0203E724 * param0, u16 param1, Pokemon * param2, u16 * param3); BOOL sub_0204EDA4 (UnkStruct_0203E724 * param0) { @@ -61,7 +61,7 @@ BOOL sub_0204EE38 (UnkStruct_0203E724 * param0) BOOL sub_0204EE3C (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u16 * v1; u16 * v2 = inline_0204FCAC(param0); u16 v3 = inline_02049538(param0); @@ -74,7 +74,7 @@ BOOL sub_0204EE3C (UnkStruct_0203E724 * param0) return 0; } -static void sub_0204EE90 (UnkStruct_0203E724 * param0, u16 param1, UnkStruct_02073C74 * param2, u16 * param3) +static void sub_0204EE90 (UnkStruct_0203E724 * param0, u16 param1, Pokemon * param2, u16 * param3) { void ** v0 = sub_0203F098(param0->unk_34, 19); UnkStruct_020997B8 * v1; @@ -100,7 +100,7 @@ BOOL sub_0204EEFC (UnkStruct_0203E724 * param0) BOOL sub_0204EF00 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u16 v1 = inline_02049538(param0); u16 * v2; @@ -114,7 +114,7 @@ BOOL sub_0204EF00 (UnkStruct_0203E724 * param0) BOOL sub_0204EF40 (UnkStruct_0203E724 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u16 v1 = inline_02049538(param0); u16 v2 = inline_02049538(param0); u16 * v3; diff --git a/src/unk_0204F13C.c b/src/unk_0204F13C.c index b9299bf646..c1be8d26b7 100644 --- a/src/unk_0204F13C.c +++ b/src/unk_0204F13C.c @@ -10,7 +10,7 @@ #include "struct_decls/struct_020308A0_decl.h" #include "struct_decls/struct_0203E724_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" @@ -160,7 +160,7 @@ static BOOL sub_0204F268 (u16 param0, UnkStruct_021C0794 * param1) u8 v0, v1, v2, v3; u16 v4, v5; Party * v6; - UnkStruct_02073C74 * v7; + Pokemon * v7; u16 v8[6]; v6 = Party_GetFromSavedata(param1); @@ -176,10 +176,10 @@ static BOOL sub_0204F268 (u16 param0, UnkStruct_021C0794 * param1) for (v0 = 0, v2 = 0; v0 < v3; v0++) { v7 = Party_GetPokemonBySlotIndex(v6, v0); - v4 = sub_02074470(v7, 5, NULL); - v5 = sub_02074470(v7, 161, NULL); + v4 = GetMonData(v7, MON_DATA_SPECIES, NULL); + v5 = GetMonData(v7, MON_DATA_161, NULL); - if (sub_02074470(v7, 76, NULL) != 0) { + if (GetMonData(v7, MON_DATA_IS_EGG, NULL) != 0) { continue; } diff --git a/src/unk_02050A74.c b/src/unk_02050A74.c index b19c6dbcbc..26ddf53351 100644 --- a/src/unk_02050A74.c +++ b/src/unk_02050A74.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_0202440C_decl.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" @@ -477,7 +477,7 @@ static BOOL sub_02051074 (UnkStruct_020508D4 * param0) if (v1->unk_10->unk_14 == 0x4) { UnkStruct_0202440C * v4 = sub_0202440C(v0->unk_0C); - UnkStruct_02073C74 * v5 = Party_GetPokemonBySlotIndex(v1->unk_10->unk_04[1], 0); + Pokemon * v5 = Party_GetPokemonBySlotIndex(v1->unk_10->unk_04[1], 0); sub_0206D018(v4, v5); } @@ -578,7 +578,7 @@ void sub_020512E4 (UnkStruct_020508D4 * param0, u16 param1, u8 param2, int * par UnkStruct_02050ACC * v0; UnkStruct_ov6_02240D5C * v1; UnkStruct_0203CDB0 * v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; int v4; v2 = sub_02050A60(param0); @@ -909,7 +909,7 @@ void sub_0205184C (UnkStruct_0203CDB0 * param0, const Party * param1, int param2 static void sub_020518B0 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02240D5C * param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u32 v1 = param1->unk_00; int v2 = param1->unk_14; @@ -928,7 +928,7 @@ static void sub_020518B0 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02240D5C * v0 = Party_GetPokemonBySlotIndex( param1->unk_04[1], 0); - if (sub_0207A294(0, sub_02074470(v0, 5, 0))) { + if (sub_0207A294(0, GetMonData(v0, MON_DATA_SPECIES, 0))) { sub_0202CFEC(sub_0202CD88(param0->unk_0C), 9); } else { sub_0202CFEC(sub_0202CD88(param0->unk_0C), 10); @@ -943,7 +943,7 @@ static void sub_020518B0 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02240D5C * v0 = Party_GetPokemonBySlotIndex( param1->unk_04[1], 0); - if (sub_0207A294(0, sub_02074470(v0, 5, 0))) { + if (sub_0207A294(0, GetMonData(v0, MON_DATA_SPECIES, 0))) { sub_0202CFEC(sub_0202CD88(param0->unk_0C), 9); } else { sub_0202CFEC(sub_0202CD88(param0->unk_0C), 10); @@ -954,7 +954,7 @@ static void sub_020518B0 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02240D5C * static void sub_02051988 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02240D5C * param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u32 v1 = param1->unk_00; int v2 = param1->unk_14; @@ -978,7 +978,7 @@ static void sub_02051988 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02240D5C * if (param0->unk_78.unk_02 >= 5) { v0 = Party_GetPokemonBySlotIndex(param1->unk_04[1], 0); - v3 = sub_0202BECC(sub_02025E5C(param0->unk_0C), sub_02074470(v0, 5, 0), sub_02074470(v0, 111, 0), param1->unk_138, 11); + v3 = sub_0202BECC(sub_02025E5C(param0->unk_0C), GetMonData(v0, MON_DATA_SPECIES, 0), GetMonData(v0, MON_DATA_111, 0), param1->unk_138, 11); sub_0202B758(param0->unk_9C, v3, 2); } } else if (v2 == 0x4) { @@ -986,7 +986,7 @@ static void sub_02051988 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02240D5C * v4 = param1->unk_148; v0 = Party_GetPokemonBySlotIndex(param1->unk_04[v4], 0); - v3 = sub_0202BE4C(sub_02025E5C(param0->unk_0C), sub_02074470(v0, 5, 0), sub_02074470(v0, 111, 0), param1->unk_138, 11); + v3 = sub_0202BE4C(sub_02025E5C(param0->unk_0C), GetMonData(v0, MON_DATA_SPECIES, 0), GetMonData(v0, MON_DATA_111, 0), param1->unk_138, 11); sub_0202B758(param0->unk_9C, v3, 2); } @@ -1012,7 +1012,7 @@ void sub_02051ABC (UnkStruct_020508D4 * param0, u16 param1, u8 param2, int * par ov6_022420D4(v2, param1, param2, v1); { - UnkStruct_02073C74 * v3; + Pokemon * v3; v3 = Party_GetPokemonBySlotIndex(v1->unk_04[1], 0); sub_02077A64(v3); diff --git a/src/unk_02051B50.c b/src/unk_02051B50.c index c8d40c5d4d..22eb845f74 100644 --- a/src/unk_02051B50.c +++ b/src/unk_02051B50.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "overlay006/struct_ov6_02240D5C.h" @@ -221,12 +221,12 @@ static u32 sub_02051C20 (u32 param0) static u32 sub_02051CD0 (Party * param0, int param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u32 v1; u32 v2 = 34; v0 = sub_02054A40(param0); - v1 = sub_02074470(v0, 5, NULL); + v1 = GetMonData(v0, MON_DATA_SPECIES, NULL); switch (v1) { case 492: diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c index ab2edea67f..09e9af5891 100644 --- a/src/unk_02051D8C.c +++ b/src/unk_02051D8C.c @@ -10,7 +10,7 @@ #include "struct_decls/struct_0202B628_decl.h" #include "struct_decls/struct_0202CC84_decl.h" #include "struct_decls/struct_0203A790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_0207D3C0_decl.h" #include "struct_decls/struct_0207D99C_decl.h" @@ -162,7 +162,7 @@ UnkStruct_ov6_02240D5C * sub_02051F4C (int param0, const UnkStruct_0203CDB0 * pa UnkStruct_0200B144 * v2; UnkStruct_02023790 * v3; UnkStruct_ov6_02240D5C * v4; - UnkStruct_02073C74 * v5; + Pokemon * v5; v4 = sub_02051D8C(param0, 0x400); v2 = sub_0200B144(1, 26, 553, param0); @@ -178,7 +178,7 @@ UnkStruct_ov6_02240D5C * sub_02051F4C (int param0, const UnkStruct_0203CDB0 * pa v4->unk_138 = sub_02055BA8(param1); sub_0207D570(v4->unk_E0, 4, 20, param0); - v5 = sub_02073C74(param0); + v5 = AllocMonZeroed(param0); sub_02073D80(v5, sub_0206B08C(sub_020507E4(param1->unk_0C)), 5, 32, 0, 0, 2, 0); Party_AddPokemon(v4->unk_04[0], v5); @@ -224,7 +224,7 @@ void sub_020520A4 (UnkStruct_ov6_02240D5C * param0) Heap_FreeToHeap(param0); } -void sub_0205213C (UnkStruct_ov6_02240D5C * param0, UnkStruct_02073C74 * param1, int param2) +void sub_0205213C (UnkStruct_ov6_02240D5C * param0, Pokemon * param1, int param2) { int v0; @@ -313,20 +313,20 @@ void sub_02052348 (UnkStruct_ov6_02240D5C * param0, const UnkStruct_0203CDB0 * p UnkStruct_02026324 * v5 = sub_02027560(param1->unk_0C); UnkStruct_0202CC84 * v6 = sub_0202CC98(param1->unk_0C); UnkStruct_020279FC * v7 = sub_02025E44(param1->unk_0C); - UnkStruct_02073C74 * v8; + Pokemon * v8; param0->unk_128 = 6; param0->unk_12C = 9; sub_02052184(param0, v2, 0); - v8 = sub_02073C74(11); + v8 = AllocMonZeroed(11); Party_InitWithCapacity(param0->unk_04[0], Party_GetCurrentCount(v3)); for (v0 = 0; v0 < Party_GetCurrentCount(v3); v0++) { sub_020775EC(Party_GetPokemonBySlotIndex(v3, v0), v8); - if ((sub_02074470(v8, 161, NULL) != param2) && (param2 != 0)) { - v1 = sub_02075AD0(sub_02074470(v8, 5, NULL), param2); + if ((GetMonData(v8, MON_DATA_161, NULL) != param2) && (param2 != 0)) { + v1 = sub_02075AD0(GetMonData(v8, MON_DATA_SPECIES, NULL), param2); sub_02074B30(v8, 8, &v1); sub_0207418C(v8); @@ -365,7 +365,7 @@ void sub_020524E4 (UnkStruct_ov6_02240D5C * param0, const UnkStruct_0203CDB0 * p UnkStruct_020279FC * v4 = sub_02025E44(param1->unk_0C); const UnkStruct_0202610C * v5 = param1->unk_B0; int v6, v7, v8; - UnkStruct_02073C74 * v9; + Pokemon * v9; param0->unk_128 = 6; param0->unk_12C = 9; @@ -388,7 +388,7 @@ void sub_020524E4 (UnkStruct_ov6_02240D5C * param0, const UnkStruct_0203CDB0 * p if (v10 == 0) { sub_02052164(param0, param2, 0); } else { - v9 = sub_02073C74(11); + v9 = AllocMonZeroed(11); Party_InitWithCapacity(param0->unk_04[0], v10); for (v8 = 0; v8 < v10; v8++) { diff --git a/src/unk_02054884.c b/src/unk_02054884.c index 05cd670d3e..3a380feaad 100644 --- a/src/unk_02054884.c +++ b/src/unk_02054884.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_02025E6C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" @@ -15,13 +15,13 @@ #include "party.h" #include "overlay005/ov5_021E622C.h" -BOOL sub_02054884 (UnkStruct_02073C74 * param0) +BOOL sub_02054884 (Pokemon * param0) { - if (sub_02074470(param0, 163, NULL) == 0) { + if (GetMonData(param0, MON_DATA_163, NULL) == 0) { return 0; } - if (sub_02074470(param0, 76, NULL)) { + if (GetMonData(param0, MON_DATA_IS_EGG, NULL)) { return 0; } @@ -31,16 +31,16 @@ BOOL sub_02054884 (UnkStruct_02073C74 * param0) BOOL sub_020548B0 (int param0, UnkStruct_021C0794 * param1, u16 param2, u8 param3, u16 param4, int param5, int param6) { BOOL v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; u32 v2; Party * v3; UnkStruct_02025E6C * v4; v4 = sub_02025E38(param1); v3 = Party_GetFromSavedata(param1); - v1 = sub_02073C74(param0); + v1 = AllocMonZeroed(param0); - sub_02073C2C(v1); + ZeroMonData(v1); sub_02073D80(v1, param2, param3, 32, 0, 0, 0, 0); sub_02077E64(v1, v4, 4, param5, param6, param0); @@ -63,9 +63,9 @@ BOOL sub_02054930 (int param0, UnkStruct_021C0794 * param1, u16 param2, u8 param BOOL v1; UnkStruct_02025E6C * v2 = sub_02025E38(param1); Party * v3 = Party_GetFromSavedata(param1); - UnkStruct_02073C74 * v4 = sub_02073C74(32); + Pokemon * v4 = AllocMonZeroed(32); - sub_02073C2C(v4); + ZeroMonData(v4); v0 = sub_02017070(param4, param5); ov5_021E6CF0(v4, param2, param3, v2, 4, v0); @@ -84,18 +84,18 @@ void sub_02054988 (Party * param0, int param1, int param2, u16 param3) int sub_020549A0 (Party * param0, u16 param1) { int v0, v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; v1 = Party_GetCurrentCount(param0); for (v0 = 0; v0 < v1; v0++) { v2 = Party_GetPokemonBySlotIndex(param0, v0); - if (sub_02074470(v2, 76, NULL) != 0) { + if (GetMonData(v2, MON_DATA_IS_EGG, NULL) != 0) { continue; } - if ((sub_02074470(v2, 54, NULL) == param1) || (sub_02074470(v2, 55, NULL) == param1) || (sub_02074470(v2, 56, NULL) == param1) || (sub_02074470(v2, 57, NULL) == param1)) { + if ((GetMonData(v2, MON_DATA_MOVE1, NULL) == param1) || (GetMonData(v2, MON_DATA_MOVE2, NULL) == param1) || (GetMonData(v2, MON_DATA_MOVE3, NULL) == param1) || (GetMonData(v2, MON_DATA_MOVE4, NULL) == param1)) { return v0; break; } @@ -107,7 +107,7 @@ int sub_020549A0 (Party * param0, u16 param1) int sub_02054A10 (const Party * param0) { int v0, v1, v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; v1 = Party_GetCurrentCount(param0); v2 = 0; @@ -123,10 +123,10 @@ int sub_02054A10 (const Party * param0) return v2; } -UnkStruct_02073C74 * sub_02054A40 (const Party * param0) +Pokemon * sub_02054A40 (const Party * param0) { int v0, v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; v1 = Party_GetCurrentCount(param0); @@ -142,17 +142,17 @@ UnkStruct_02073C74 * sub_02054A40 (const Party * param0) return NULL; } -UnkStruct_02073C74 * sub_02054A74 (const Party * param0) +Pokemon * sub_02054A74 (const Party * param0) { u16 v0, v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; v1 = Party_GetCurrentCount(param0); for (v0 = 0; v0 < v1; v0++) { v2 = Party_GetPokemonBySlotIndex(param0, v0); - if (sub_02074470(v2, 76, NULL) == 0) { + if (GetMonData(v2, MON_DATA_IS_EGG, NULL) == 0) { return v2; } } @@ -173,14 +173,14 @@ void sub_02054AC4 (Party * param0) { int v0, v1; u8 v2 = 1; - UnkStruct_02073C74 * v3; + Pokemon * v3; v1 = Party_GetCurrentCount(param0); for (v0 = 0; v0 < v1; v0++) { v3 = Party_GetPokemonBySlotIndex(param0, v0); - if (sub_02074470(v3, 76, NULL) == 0) { + if (GetMonData(v3, MON_DATA_IS_EGG, NULL) == 0) { sub_02074B30(v3, 25, &v2); } } @@ -191,7 +191,7 @@ int sub_02054B04 (Party * param0, u16 param1) int v0 = 0; int v1 = 0; int v2, v3; - UnkStruct_02073C74 * v4; + Pokemon * v4; v3 = Party_GetCurrentCount(param0); @@ -199,8 +199,8 @@ int sub_02054B04 (Party * param0, u16 param1) v4 = Party_GetPokemonBySlotIndex(param0, v2); if (sub_02054884(v4)) { - if (sub_02074470(v4, 160, NULL) & (0x80 | 0x8)) { - u32 v5 = sub_02074470(v4, 163, NULL); + if (GetMonData(v4, MON_DATA_160, NULL) & (0x80 | 0x8)) { + u32 v5 = GetMonData(v4, MON_DATA_163, NULL); if (v5 > 1) { v5--; @@ -227,9 +227,9 @@ int sub_02054B04 (Party * param0, u16 param1) } } -BOOL sub_02054B94 (UnkStruct_02073C74 * param0) +BOOL sub_02054B94 (Pokemon * param0) { - if ((sub_02074470(param0, 160, NULL) & (0x80 | 0x8)) && (sub_02074470(param0, 163, NULL) == 1)) { + if ((GetMonData(param0, MON_DATA_160, NULL) & (0x80 | 0x8)) && (GetMonData(param0, MON_DATA_163, NULL) == 1)) { u32 v0 = 0; sub_02074B30(param0, 160, &v0); diff --git a/src/unk_020562F8.c b/src/unk_020562F8.c index 8cb3227f52..2fa02a7bfb 100644 --- a/src/unk_020562F8.c +++ b/src/unk_020562F8.c @@ -6,7 +6,7 @@ #include "struct_decls/struct_02024440_decl.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_020564B4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_0203CDB0.h" #include "overlay006/struct_ov6_02240D5C.h" @@ -137,17 +137,17 @@ static void sub_0205642C (UnkStruct_0203CDB0 * param0, UnkStruct_020564B4 * para int v0; u8 v1[8]; u16 v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; UnkStruct_02024440 * v4; v4 = sub_02024440(param0->unk_0C); - v3 = sub_02073C74(4); + v3 = AllocMonZeroed(4); for (v0 = 0; v0 < 6; v0++) { param1->unk_30[v0] = 0; sub_0202F000(v4, v0, v3); - v2 = sub_02074470(v3, 5, NULL); + v2 = GetMonData(v3, MON_DATA_SPECIES, NULL); param1->unk_00[v0].unk_00 = v2; sub_02056400(v2, v1); @@ -160,8 +160,8 @@ static void sub_0205642C (UnkStruct_0203CDB0 * param0, UnkStruct_020564B4 * para param1->unk_00[v0].unk_03 = v1[3]; param1->unk_00[v0].unk_04 = v1[2]; - param1->unk_00[v0].unk_06 = sub_02074470(v3, 177, NULL); - param1->unk_00[v0].unk_07 = sub_02074470(v3, 178, NULL); + param1->unk_00[v0].unk_06 = GetMonData(v3, MON_DATA_177, NULL); + param1->unk_00[v0].unk_07 = GetMonData(v3, MON_DATA_178, NULL); } Heap_FreeToHeap(v3); @@ -274,7 +274,7 @@ static void sub_02056624 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02240D5C * static UnkStruct_ov6_02240D5C * sub_0205664C (UnkStruct_0203CDB0 * param0, UnkStruct_020564B4 * param1) { UnkStruct_ov6_02240D5C * v0; - UnkStruct_02073C74 * v1 = sub_02073C74(32); + Pokemon * v1 = AllocMonZeroed(32); UnkStruct_02024440 * v2 = sub_02024440(param0->unk_0C); int v3 = sub_020563BC(param0); diff --git a/src/unk_02056720.c b/src/unk_02056720.c index 4d1b40e8b9..03d5c63829 100644 --- a/src/unk_02056720.c +++ b/src/unk_02056720.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_021C0794_decl.h" #include "unk_020244AC.h" @@ -286,7 +286,7 @@ void sub_02056A2C (UnkStruct_02056B24 * param0, const u8 * param1) param0->unk_00_2 = 1; } -void sub_02056A48 (UnkStruct_02056B24 * param0, const UnkStruct_02073C74_sub1 * param1) +void sub_02056A48 (UnkStruct_02056B24 * param0, const BoxPokemon * param1) { int v0; @@ -302,9 +302,9 @@ void sub_02056A48 (UnkStruct_02056B24 * param0, const UnkStruct_02073C74_sub1 * v0 = 12 - 1; } - param0->unk_B8[v0].unk_00 = sub_02074570((UnkStruct_02073C74_sub1 *)param1, 5, NULL); + param0->unk_B8[v0].unk_00 = sub_02074570((BoxPokemon *)param1, MON_DATA_SPECIES, NULL); param0->unk_B8[v0].unk_02 = sub_02079E44(param1); - param0->unk_B8[v0].unk_04 = sub_02074570((UnkStruct_02073C74_sub1 *)param1, 112, NULL); + param0->unk_B8[v0].unk_04 = sub_02074570((BoxPokemon *)param1, MON_DATA_FORM, NULL); } int sub_02056AAC (const UnkStruct_02056B24 * param0) diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c index c0aea2db04..d5c7a0141b 100644 --- a/src/unk_0205A0D8.c +++ b/src/unk_0205A0D8.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02025E6C_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" @@ -848,7 +848,7 @@ static void sub_0205AD80 (UnkStruct_0205A0D8 * param0) Party_InitWithCapacity(param0->unk_50, 3); for (v1 = 0; v1 < 3; v1++) { - Party_AddPokemon(param0->unk_50, (UnkStruct_02073C74 *)(¶m0->unk_48[v1 * v0])); + Party_AddPokemon(param0->unk_50, (Pokemon *)(¶m0->unk_48[v1 * v0])); } } @@ -867,7 +867,7 @@ static void sub_0205ADAC (UnkStruct_0205A0D8 * param0) Party_InitWithCapacity(param0->unk_50, 3); for (v3 = 0; v3 < 3; v3++) { - Party_AddPokemon(param0->unk_50, (UnkStruct_02073C74 *)(¶m0->unk_4C[v3 * v0])); + Party_AddPokemon(param0->unk_50, (Pokemon *)(¶m0->unk_4C[v3 * v0])); } } @@ -887,7 +887,7 @@ static void sub_0205ADF8 (UnkStruct_0205A0D8 * param0, int param1) sub_0201ADA4(v0, 15); for (v1 = 0; v1 < 3; v1++) { - v2 = sub_02074470((UnkStruct_02073C74 *)(¶m0->unk_48[v1 * v3]), 5, NULL); + v2 = GetMonData((Pokemon *)(¶m0->unk_48[v1 * v3]), MON_DATA_SPECIES, NULL); sub_0200B1B8(v4, v2, param0->unk_0C); sub_0201D738(v0, 0, param0->unk_0C, 16, v1 * 16, 0xff, NULL); diff --git a/src/unk_0205DFC4.c b/src/unk_0205DFC4.c index 9c1729a09a..9536bdc8b6 100644 --- a/src/unk_0205DFC4.c +++ b/src/unk_0205DFC4.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02025E6C_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" @@ -243,7 +243,7 @@ u16 sub_0205E0E4 (u16 param0, u16 param1) u16 sub_0205E1B4 (UnkStruct_021C0794 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u16 v1, v2; v2 = Party_GetCurrentCount(Party_GetFromSavedata(param0)); @@ -251,7 +251,7 @@ u16 sub_0205E1B4 (UnkStruct_021C0794 * param0) for (v1 = 0; v1 < v2; v1++) { v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0), v1); - if (sub_02074470(v0, 76, NULL) == 0) { + if (GetMonData(v0, MON_DATA_IS_EGG, NULL) == 0) { return v1; } } @@ -259,7 +259,7 @@ u16 sub_0205E1B4 (UnkStruct_021C0794 * param0) return 0; } -BOOL sub_0205E1F8 (UnkStruct_021C0794 * param0) +BOOL HasAllLegendaryTitansInParty (UnkStruct_021C0794 * param0) { int v0, v1, v2, v3 = 0; Party * v4; @@ -270,7 +270,7 @@ BOOL sub_0205E1F8 (UnkStruct_021C0794 * param0) v2 = Party_GetCurrentCount(v4); for (v0 = 0; v0 < v2; v0++) { - v6[v0] = sub_02074470(Party_GetPokemonBySlotIndex(v4, v0), 5, NULL); + v6[v0] = GetMonData(Party_GetPokemonBySlotIndex(v4, v0), MON_DATA_SPECIES, NULL); } for (v0 = 0; v0 < 3; v0++) { diff --git a/src/unk_0206C33C.c b/src/unk_0206C33C.c index ae4501e499..bdbb9d33f7 100644 --- a/src/unk_0206C33C.c +++ b/src/unk_0206C33C.c @@ -4,7 +4,7 @@ #include "inlines.h" #include "struct_decls/struct_02025E6C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_021C0794_decl.h" #include "struct_defs/struct_0202D7B0.h" @@ -244,7 +244,7 @@ void sub_0206C404 (UnkStruct_0202D7B0 * param0, const int param1) void sub_0206C41C (UnkStruct_021C0794 * param0, const u8 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_0206C638 * v1; UnkStruct_0202D7B0 * v2; int v3; @@ -289,15 +289,15 @@ void sub_0206C41C (UnkStruct_021C0794 * param0, const u8 param1) sub_0202D980(v1, 6, v6); v4 = sub_02025E38(param0); - v0 = sub_02073C74(4); + v0 = AllocMonZeroed(4); - sub_02073C2C(v0); + ZeroMonData(v0); sub_02073D80(v0, v5, v6, 32, 0, 0, 1, sub_02025F24(v4)); sub_0202D980(v1, 7, 0); sub_0202D980(v1, 8, 1); - sub_0202D980(v1, 2, sub_02074470(v0, 175, NULL)); - sub_0202D980(v1, 3, sub_02074470(v0, 0, NULL)); - sub_0202D980(v1, 5, sub_02074470(v0, 164, NULL)); + sub_0202D980(v1, 2, GetMonData(v0, MON_DATA_175, NULL)); + sub_0202D980(v1, 3, GetMonData(v0, MON_DATA_PERSONALITY, NULL)); + sub_0202D980(v1, 5, GetMonData(v0, MON_DATA_164, NULL)); Heap_FreeToHeap(v0); v3 = sub_0202D8BC(v2); diff --git a/src/unk_0206C660.c b/src/unk_0206C660.c index b06de13dc0..c163ec6320 100644 --- a/src/unk_0206C660.c +++ b/src/unk_0206C660.c @@ -2,7 +2,7 @@ #include #include "struct_decls/struct_020508D4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "overlay006/struct_ov6_02246204_decl.h" #include "struct_defs/struct_0203CDB0.h" @@ -24,8 +24,8 @@ typedef struct { u32 unk_04; int unk_08; UnkStruct_ov6_02246254 unk_0C; - UnkStruct_02073C74 * unk_24; - UnkStruct_02073C74 * unk_28; + Pokemon * unk_24; + Pokemon * unk_28; } UnkStruct_0206C660; static BOOL sub_0206C680(UnkStruct_020508D4 * param0); @@ -97,8 +97,8 @@ void sub_0206C740 (UnkStruct_020508D4 * param0, UnkStruct_ov6_02246204 * param1, v0->unk_04 = 0; v0->unk_00 = param1; v0->unk_08 = param2; - v0->unk_24 = sub_02073C74(param3); - v0->unk_28 = sub_02073C74(param3); + v0->unk_24 = AllocMonZeroed(param3); + v0->unk_28 = AllocMonZeroed(param3); sub_02050944(param0, sub_0206C680, v0); } diff --git a/src/unk_0206CCB0.c b/src/unk_0206CCB0.c index 363533236a..82a243ca69 100644 --- a/src/unk_0206CCB0.c +++ b/src/unk_0206CCB0.c @@ -14,8 +14,8 @@ #include "struct_decls/struct_0202A750_decl.h" #include "struct_decls/struct_0202B4A0_decl.h" #include "struct_decls/struct_020507E4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_021C0794_decl.h" #include "overlay006/struct_ov6_022465F4_decl.h" @@ -72,7 +72,7 @@ static void sub_0206CD70(UnkStruct_0203CDB0 * param0, int param1, int param2, const void * param3); static void sub_0206CD7C(UnkStruct_021C0794 * param0, int param1, int param2, const void * param3); -static u8 sub_0206DE4C(UnkStruct_02073C74 * param0); +static u8 sub_0206DE4C(Pokemon * param0); static UnkStruct_02023790 * sub_0206F0D8(u16 param0, u32 param1); typedef struct { @@ -471,21 +471,21 @@ static void sub_0206CDD0 (UnkStruct_0200B358 * param0, int param1, const UnkStru sub_0206CD94(param0, param1, ov6_02246494(param2), ov6_0224648C(param2), ov6_02246490(param2), 1); } -static void sub_0206CE08 (int param0, u16 * param1, UnkStruct_02073C74 * param2) +static void sub_0206CE08 (int param0, u16 * param1, Pokemon * param2) { UnkStruct_02023790 * v0 = sub_02023790(64, param0); - sub_02074470(param2, 119, v0); + GetMonData(param2, MON_DATA_119, v0); sub_02023DF0(v0, param1, 10 + 1); sub_020237BC(v0); } -static void sub_0206CE38 (UnkStruct_02073C74 * param0, u16 * param1, u8 * param2, u8 * param3, u8 * param4) +static void sub_0206CE38 (Pokemon * param0, u16 * param1, u8 * param2, u8 * param3, u8 * param4) { - *param1 = sub_02074470(param0, 5, NULL); - *param2 = sub_02074470(param0, 111, NULL); - *param3 = sub_02074470(param0, 12, NULL); - *param4 = sub_02074470(param0, 122, NULL); + *param1 = GetMonData(param0, MON_DATA_SPECIES, NULL); + *param2 = GetMonData(param0, MON_DATA_111, NULL); + *param3 = GetMonData(param0, MON_DATA_LANGUAGE, NULL); + *param4 = GetMonData(param0, MON_DATA_MET_GAME, NULL); } static void sub_0206CE74 (UnkStruct_0200B358 * param0, int param1, u16 param2, u8 param3, u8 param4, u8 param5) @@ -504,20 +504,20 @@ static void sub_0206CEA4 (UnkStruct_0200B358 * param0, int param1, u16 param2) sub_0206CD94(param0, param1, v0, 0, GAME_LANGUAGE, 1); } -static void sub_0206CED0 (int param0, UnkStruct_02073C74 * param1, u8 * param2, u16 * param3) +static void sub_0206CED0 (int param0, Pokemon * param1, u8 * param2, u16 * param3) { - *param2 = sub_02074470(param1, 77, NULL); + *param2 = GetMonData(param1, MON_DATA_77, NULL); if (*param2) { UnkStruct_02023790 * v0 = sub_02023790(64, param0); - sub_02074470(param1, 119, v0); + GetMonData(param1, MON_DATA_119, v0); sub_02023DF0(v0, param3, 10 + 1); sub_020237BC(v0); } } -void sub_0206CF14 (UnkStruct_0202440C * param0, UnkStruct_02073C74 * param1, int param2, int param3, int param4) +void sub_0206CF14 (UnkStruct_0202440C * param0, Pokemon * param1, int param2, int param3, int param4) { UnkStruct_0202E7D8 * v0 = sub_0202E7D8(param0); @@ -530,7 +530,7 @@ void sub_0206CF14 (UnkStruct_0202440C * param0, UnkStruct_02073C74 * param1, int sub_02025C84(27); } -void sub_0206CF48 (UnkStruct_0202440C * param0, UnkStruct_02073C74 * param1, int param2) +void sub_0206CF48 (UnkStruct_0202440C * param0, Pokemon * param1, int param2) { UnkStruct_0202E7E4 * v0 = sub_0202E7E4(param0); @@ -539,7 +539,7 @@ void sub_0206CF48 (UnkStruct_0202440C * param0, UnkStruct_02073C74 * param1, int v0->unk_1E = sub_02075BCC(param1); sub_0206CE38(param1, &v0->unk_02, &v0->unk_04, &v0->unk_05, &v0->unk_06); - v0->unk_07 = sub_02074470(param1, 77, NULL); + v0->unk_07 = GetMonData(param1, MON_DATA_77, NULL); sub_0206CED0(param2, param1, &v0->unk_07, v0->unk_08); sub_02025C84(27); @@ -596,7 +596,7 @@ void sub_0206D000 (UnkStruct_0202440C * param0) sub_02025C84(27); } -void sub_0206D018 (UnkStruct_0202440C * param0, UnkStruct_02073C74 * param1) +void sub_0206D018 (UnkStruct_0202440C * param0, Pokemon * param1) { UnkStruct_0202E808 * v0 = sub_0202E808(param0); @@ -608,13 +608,13 @@ void sub_0206D018 (UnkStruct_0202440C * param0, UnkStruct_02073C74 * param1) sub_02025C84(27); } -void sub_0206D048 (UnkStruct_0202440C * param0, UnkStruct_02073C74 * param1) +void sub_0206D048 (UnkStruct_0202440C * param0, Pokemon * param1) { UnkStruct_0202E810 * v0 = sub_0202E810(param0); v0->unk_00 = 1; sub_0206CE38(param1, &v0->unk_02, &v0->unk_04, &v0->unk_05, &v0->unk_06); - v0->unk_07 = sub_02074470(param1, 77, NULL); + v0->unk_07 = GetMonData(param1, MON_DATA_77, NULL); sub_0206CED0(11, param1, &v0->unk_07, v0->unk_08); sub_02025C84(27); @@ -695,7 +695,7 @@ void sub_0206D158 (UnkStruct_0206D140 * param0) Heap_FreeToHeap(param0); } -void sub_0206D160 (UnkStruct_0206D140 * param0, UnkStruct_02073C74 * param1, int param2, int param3, u32 param4) +void sub_0206D160 (UnkStruct_0206D140 * param0, Pokemon * param1, int param2, int param3, u32 param4) { MI_CpuClear32(param0, sizeof(UnkStruct_0206D140)); @@ -704,7 +704,7 @@ void sub_0206D160 (UnkStruct_0206D140 * param0, UnkStruct_02073C74 * param1, int sub_0206CE38(param1, ¶m0->unk_06, ¶m0->unk_08, ¶m0->unk_09, ¶m0->unk_0A); - param0->unk_22 = sub_02074470(param1, 155, NULL); + param0->unk_22 = GetMonData(param1, MON_DATA_POKEBALL, NULL); GF_ASSERT(param0->unk_22); sub_0206CED0(param4, param1, ¶m0->unk_0B, param0->unk_0C); @@ -782,7 +782,7 @@ static BOOL sub_0206D320 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * return sub_02026FE8(v0, v1->unk_06); } -void sub_0206D340 (UnkStruct_0203CDB0 * param0, BOOL param1, u16 param2, UnkStruct_02073C74 * param3) +void sub_0206D340 (UnkStruct_0203CDB0 * param0, BOOL param1, u16 param2, Pokemon * param3) { UnkUnion_0206D1B8 v0; UnkStruct_0206D374 * v1 = &v0.val3; @@ -917,7 +917,7 @@ static int sub_0206D530 (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * param return 11; } -void sub_0206D578 (UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1) +void sub_0206D578 (UnkStruct_0203CDB0 * param0, Pokemon * param1) { UnkUnion_0206D1B8 v0; UnkStruct_0206D5B0 * v1 = &v0.val7; @@ -944,7 +944,7 @@ static BOOL sub_0206D5F0 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * return sub_02026FE8(sub_02027560(param0->unk_0C), v0->unk_00); } -void sub_0206D60C (UnkStruct_0203CDB0 * param0, UnkStruct_02073C74 * param1) +void sub_0206D60C (UnkStruct_0203CDB0 * param0, Pokemon * param1) { UnkUnion_0206D1B8 v0; UnkStruct_0206D644 * v1 = &v0.val8; @@ -1038,7 +1038,7 @@ void sub_0206D7C4 (UnkStruct_0203CDB0 * param0) { u32 v0, v1, v2, v3; u8 v4, v5; - UnkStruct_02073C74 * v6; + Pokemon * v6; UnkUnion_0206D1B8 v7; Party * v8; UnkStruct_0206D8B0 * v9 = &v7.val11; @@ -1052,8 +1052,8 @@ void sub_0206D7C4 (UnkStruct_0203CDB0 * param0) for (v5 = 0; v5 < v4; v5++) { v6 = Party_GetPokemonBySlotIndex(v8, v5); - if (sub_02074470(v6, 76, NULL) == 0) { - v3 = sub_02074470(v6, 111, NULL); + if (GetMonData(v6, MON_DATA_IS_EGG, NULL) == 0) { + v3 = GetMonData(v6, MON_DATA_111, NULL); if (v3 == 0) { v0 = 1; @@ -1101,7 +1101,7 @@ static BOOL sub_0206D8F0 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * return sub_02026FE8(sub_02027560(param0->unk_0C), v0->unk_00); } -void sub_0206D90C (UnkStruct_0202440C * param0, UnkStruct_02073C74 * param1, u16 param2) +void sub_0206D90C (UnkStruct_0202440C * param0, Pokemon * param1, u16 param2) { return; } @@ -1150,7 +1150,7 @@ static int sub_0206D98C (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * param return 31; } -void sub_0206D9B4 (UnkStruct_0202440C * param0, UnkStruct_02073C74 * param1, u8 param2) +void sub_0206D9B4 (UnkStruct_0202440C * param0, Pokemon * param1, u8 param2) { UnkUnion_0206D1B8 v0; UnkStruct_0206D9F4 * v1 = &v0.val14; @@ -1278,7 +1278,7 @@ static BOOL sub_0206DB9C (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * return inline_0208BE68(sub_020507E4(param0->unk_0C), 6); } -void sub_0206DBB0 (UnkStruct_021C0794 * param0, u32 param1, UnkStruct_02073C74 * param2, BOOL param3) +void sub_0206DBB0 (UnkStruct_021C0794 * param0, u32 param1, Pokemon * param2, BOOL param3) { UnkUnion_0206D1B8 v0; UnkStruct_0206DBE8 * v1 = &v0.val18; @@ -1317,7 +1317,7 @@ static BOOL sub_0206DC3C (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_022465F4 * return inline_0208BE68(sub_020507E4(param0->unk_0C), 17); } -void sub_0206DC6C (UnkStruct_0203CDB0 * param0, u32 param1, UnkStruct_02073C74 * param2) +void sub_0206DC6C (UnkStruct_0203CDB0 * param0, u32 param1, Pokemon * param2) { UnkUnion_0206D1B8 v0; UnkStruct_0206DC9C * v1 = &v0.val19; @@ -1378,7 +1378,7 @@ static int sub_0206DD5C (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * param return 3; } -void sub_0206DDB8 (UnkStruct_021C0794 * param0, UnkStruct_02073C74 * param1, u32 param2) +void sub_0206DDB8 (UnkStruct_021C0794 * param0, Pokemon * param1, u32 param2) { u8 v0, v1; UnkUnion_0206D1B8 v2; @@ -1451,14 +1451,14 @@ static const u16 Unk_020EFDDC[] = { 0x2A }; -static u8 sub_0206DE4C (UnkStruct_02073C74 * param0) +static u8 sub_0206DE4C (Pokemon * param0) { u8 v0, v1; v0 = 0; for (v1 = 0; v1 < (NELEMS(Unk_020EFDDC)); v1++) { - if (sub_02074470(param0, Unk_020EFDDC[v1], NULL) == 1) { + if (GetMonData(param0, Unk_020EFDDC[v1], NULL) == 1) { v0++; } } @@ -1654,7 +1654,7 @@ void sub_0206E174 (UnkStruct_0203CDB0 * param0, u16 param1) { UnkUnion_0206D1B8 v0; UnkStruct_0206E1C0 * v1 = &v0.val27; - UnkStruct_02073C74 * v2; + Pokemon * v2; v2 = sub_02054A74(Party_GetFromSavedata(param0->unk_0C)); @@ -2697,14 +2697,14 @@ static int sub_0206ED14 (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * param { u32 v0, v1; u8 v2; - UnkStruct_02073C74 * v3; - UnkStruct_02073C74_sub1 * v4; + Pokemon * v3; + BoxPokemon * v4; int v5, v6; v5 = 0xff; v6 = 0xff; v0 = (sub_0201D2E8() % 0xffff); - v2 = sub_02075BFC(v0); + v2 = GetNatureFromPersonality(v0); sub_0200B6D8(param1, 0, v2); @@ -2965,7 +2965,7 @@ static int sub_0206F160 (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * param { UnkStruct_02023790 * v0; u16 v1, v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; Party * v4; UnkStruct_02025E6C * v5 = sub_02025E38(param0->unk_0C); UnkStruct_02026324 * v6 = sub_02027560(param0->unk_0C); @@ -2973,7 +2973,7 @@ static int sub_0206F160 (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * param v4 = Party_GetFromSavedata(param0->unk_0C); v3 = Party_GetPokemonBySlotIndex(v4, sub_0205E1B4(param0->unk_0C)); - sub_0206CE74(param1, 0, sub_02074470(v3, 5, NULL), sub_02074470(v3, 111, NULL), sub_02025FD8(v5), sub_02025FCC(v5)); + sub_0206CE74(param1, 0, GetMonData(v3, MON_DATA_SPECIES, NULL), GetMonData(v3, MON_DATA_111, NULL), sub_02025FD8(v5), sub_02025FCC(v5)); sub_0200BFAC(param1, 1, (sub_0201D2E8() % 100)); v1 = (sub_0201D2E8() % (493 - 2) + 1); diff --git a/src/unk_0207064C.c b/src/unk_0207064C.c index eb806f4889..d6344ec0b1 100644 --- a/src/unk_0207064C.c +++ b/src/unk_0207064C.c @@ -3,7 +3,7 @@ #include "struct_decls/struct_0201CD38_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_0203CDB0.h" #include "struct_defs/struct_02049FA8.h" @@ -22,11 +22,11 @@ typedef struct { u16 unk_08; s16 unk_0A; s16 unk_0C; - UnkStruct_02073C74 * unk_10; + Pokemon * unk_10; UnkStruct_0201CD38 * unk_14; } UnkStruct_0207064C; -void * sub_0207064C (u32 param0, UnkStruct_0203CDB0 * param1, UnkStruct_02073C74 * param2, u16 param3, s16 param4, s16 param5) +void * sub_0207064C (u32 param0, UnkStruct_0203CDB0 * param1, Pokemon * param2, u16 param3, s16 param4, s16 param5) { UnkStruct_0207064C * v0 = Heap_AllocFromHeapAtEnd(param0, (sizeof(UnkStruct_0207064C))); diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c index c82d5e8068..0f27aa74ae 100644 --- a/src/unk_020722AC.c +++ b/src/unk_020722AC.c @@ -13,7 +13,7 @@ #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02028430_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_0207D3C0_decl.h" #include "struct_decls/struct_021C0794_decl.h" @@ -1004,7 +1004,7 @@ static void sub_020730B8 (UnkStruct_02072334 * param0, u8 param1, BOOL param2) { UnkStruct_02072EB8 * v0; Party * v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; v0 = &(param0->unk_1C[param0->unk_18]); diff --git a/src/unk_02073C2C.c b/src/unk_02073C2C.c index c25ee04fce..b7cdf94155 100644 --- a/src/unk_02073C2C.c +++ b/src/unk_02073C2C.c @@ -12,7 +12,7 @@ #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02025E6C_decl.h" #include "struct_decls/struct_0202CC84_decl.h" -#include "struct_decls/struct_02073C74_sub2_decl.h" +#include "struct_decls/party_pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_02007C10.h" @@ -20,13 +20,13 @@ #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_0202818C.h" #include "struct_defs/struct_0202CA28.h" -#include "struct_defs/struct_02073C74.h" -#include "struct_defs/struct_02073C74_sub1.h" -#include "struct_defs/struct_02073C74_sub2_t.h" -#include "struct_defs/struct_02075454.h" -#include "struct_defs/struct_02075454_1.h" -#include "struct_defs/struct_02075454_2.h" -#include "struct_defs/struct_02075454_3.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" +#include "struct_defs/party_pokemon.h" +#include "struct_defs/pokemon_substruct_0.h" +#include "struct_defs/pokemon_substruct_1.h" +#include "struct_defs/pokemon_substruct_2.h" +#include "struct_defs/pokemon_substruct_3.h" #include "struct_defs/struct_02075874.h" #include "struct_defs/struct_0207821C.h" #include "struct_defs/struct_0207825C.h" @@ -83,6 +83,8 @@ #include "item.h" #include "unk_02092494.h" +#include "constants/species.h" + static const s8 Unk_020F0695[][5] = { { 0x0, 0x0, 0x0, 0x0, 0x0 }, { 0x1, 0x0, 0x0, 0x0, -0x1 }, @@ -111,211 +113,207 @@ static const s8 Unk_020F0695[][5] = { { 0x0, 0x0, 0x0, 0x0, 0x0 }, }; -void sub_02073C2C(UnkStruct_02073C74 * param0); -void sub_02073C54(UnkStruct_02073C74_sub1 * param0); -int sub_02073C70(void); -UnkStruct_02073C74 * sub_02073C74(u32 param0); -BOOL sub_02073C88(UnkStruct_02073C74 * param0); -BOOL sub_02073CD4(UnkStruct_02073C74 * param0, BOOL param1); -BOOL sub_02073D20(UnkStruct_02073C74_sub1 * param0); -BOOL sub_02073D48(UnkStruct_02073C74_sub1 * param0, BOOL param1); -void sub_02073D80(UnkStruct_02073C74 * param0, int param1, int param2, int param3, int param4, u32 param5, int param6, u32 param7); -void sub_02073E18(UnkStruct_02073C74_sub1 * param0, int param1, int param2, int param3, int param4, u32 param5, int param6, u32 param7); -void sub_02074044(UnkStruct_02073C74 *, u16 param0, u8 param1, u8 param2, u8 param3); -void sub_02074088(UnkStruct_02073C74 *, u16 param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5); +void ZeroMonData(Pokemon * param0); +void ZeroBoxMonData(BoxPokemon * param0); +int PokemonStructSize(void); +Pokemon * AllocMonZeroed(u32 heapID); +BOOL sub_02073C88(Pokemon * param0); +BOOL sub_02073CD4(Pokemon * param0, BOOL param1); +BOOL sub_02073D20(BoxPokemon * param0); +BOOL sub_02073D48(BoxPokemon * param0, BOOL param1); +void sub_02073D80(Pokemon * param0, int param1, int param2, int param3, int param4, u32 param5, int param6, u32 param7); +void sub_02073E18(BoxPokemon * param0, int param1, int param2, int param3, int param4, u32 param5, int param6, u32 param7); +void sub_02074044(Pokemon *, u16 param0, u8 param1, u8 param2, u8 param3); +void sub_02074088(Pokemon *, u16 param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5); u32 sub_02074128(u16 param0, u8 param1, u8 param2); -void sub_02074158(UnkStruct_02073C74 *, u16 param0, u8 param1, u32 param2, u32 param3); -void sub_0207418C(UnkStruct_02073C74 * param0); -void sub_020741B8(UnkStruct_02073C74 * param0); -u32 sub_02074470(UnkStruct_02073C74 * param0, int param1, void * param2); -static u32 sub_020744E8(UnkStruct_02073C74 * param0, int param1, void * param2); -u32 sub_02074570(UnkStruct_02073C74_sub1 * param0, int param1, void * param2); -static u32 sub_020745D0(UnkStruct_02073C74_sub1 * param0, int param1, void * param2); -void sub_02074B30(UnkStruct_02073C74 * param0, int param1, const void * param2); -static void sub_02074BC0(UnkStruct_02073C74 * param0, int param1, const void * param2); -void sub_02074C60(UnkStruct_02073C74_sub1 * param0, int param1, const void * param2); -static void sub_02074CD8(UnkStruct_02073C74_sub1 * param0, int param1, const void * param2); -void sub_0207536C(UnkStruct_02073C74 * param0, int param1, int param2); -static void sub_020753F4(UnkStruct_02073C74 * param0, int param1, int param2); -static void sub_02075454(UnkStruct_02073C74_sub1 * param0, int param1, int param2); +void sub_02074158(Pokemon *, u16 param0, u8 param1, u32 param2, u32 param3); +void sub_0207418C(Pokemon * param0); +void sub_020741B8(Pokemon * param0); +u32 GetMonData(Pokemon * param0, int param1, void * param2); +static u32 sub_020744E8(Pokemon * param0, int param1, void * param2); +u32 sub_02074570(BoxPokemon * param0, int param1, void * param2); +static u32 sub_020745D0(BoxPokemon * param0, int param1, void * param2); +void sub_02074B30(Pokemon * param0, int param1, const void * param2); +static void sub_02074BC0(Pokemon * param0, int param1, const void * param2); +void SetBoxMonData(BoxPokemon * param0, int param1, const void * param2); +static void sub_02074CD8(BoxPokemon * param0, int param1, const void * param2); +void sub_0207536C(Pokemon * param0, int param1, int param2); +static void sub_020753F4(Pokemon * param0, int param1, int param2); +static void sub_02075454(BoxPokemon * param0, int param1, int param2); u32 sub_020759CC(int param0, int param1, int param2); u32 sub_020759F0(int param0, int param1); -u8 sub_02075A10(UnkStruct_02073C74 * param0); -u32 sub_02075A70(UnkStruct_02073C74 * param0); -u32 sub_02075A78(UnkStruct_02073C74_sub1 * param0); -u32 sub_02075AAC(UnkStruct_02073C74 * param0); +u8 sub_02075A10(Pokemon * param0); +u32 sub_02075A70(Pokemon * param0); +u32 sub_02075A78(BoxPokemon * param0); +u32 sub_02075AAC(Pokemon * param0); u32 sub_02075AD0(int param0, int param1); void sub_02075AE4(int param0, u32 * param1); u32 sub_02075B00(int param0, int param1); -u32 sub_02075B38(UnkStruct_02073C74 * param0); -u32 sub_02075B40(UnkStruct_02073C74_sub1 * param0); +u32 sub_02075B38(Pokemon * param0); +u32 sub_02075B40(BoxPokemon * param0); u32 sub_02075B78(u16 param0, u32 param1); -u8 sub_02075BCC(UnkStruct_02073C74 * param0); -u8 sub_02075BD4(UnkStruct_02073C74_sub1 * param0); -u8 sub_02075BFC(u32 param0); +u8 sub_02075BCC(Pokemon * param0); +u8 sub_02075BD4(BoxPokemon * param0); +u8 GetNatureFromPersonality(u32 param0); u16 sub_02075C0C(u8 param0, u16 param1, u8 param2); s8 sub_02075C60(u8 param0, u8 param1); -void sub_02075C74(UnkStruct_02073C74 * param0, u8 param1, u16 param2); -u8 sub_02075D6C(UnkStruct_02073C74 * param0); -u8 sub_02075D74(UnkStruct_02073C74_sub1 * param0); +void sub_02075C74(Pokemon * param0, u8 param1, u16 param2); +u8 sub_02075D6C(Pokemon * param0); +u8 sub_02075D74(BoxPokemon * param0); u8 sub_02075DAC(u16 param0, u32 param1); -u8 sub_02075E0C(UnkStruct_02073C74 * param0); -u8 sub_02075E14(UnkStruct_02073C74_sub1 * param0); +u8 sub_02075E0C(Pokemon * param0); +u8 sub_02075E14(BoxPokemon * param0); u8 sub_02075E38(u32 param0, u32 param1); u32 sub_02075E64(u32 param0); -void sub_02075EF4(UnkStruct_02008A90 * param0, UnkStruct_02073C74 * param1, u8 param2); -void sub_02075F0C(UnkStruct_02008A90 * param0, UnkStruct_02073C74_sub1 * param1, u8 param2, int param3); +void sub_02075EF4(UnkStruct_02008A90 * param0, Pokemon * param1, u8 param2); +void sub_02075F0C(UnkStruct_02008A90 * param0, BoxPokemon * param1, u8 param2, int param3); void sub_02075FB4(UnkStruct_02008A90 * param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u32 param6); -u8 sub_020761E8(u16 param0, u8 param1); -u8 sub_020765AC(UnkStruct_02073C74 * param0, u8 param1); -u8 sub_020765C4(UnkStruct_02073C74_sub1 * param0, u8 param1, int param2); +u8 SanitizeFormId(u16 param0, u8 param1); +u8 sub_020765AC(Pokemon * param0, u8 param1); +u8 sub_020765C4(BoxPokemon * param0, u8 param1, int param2); u8 sub_02076648(u16 param0, u8 param1, u8 param2, u8 param3, u32 param4); void sub_0207697C(UnkStruct_02008A90 * param0, u16 param1); UnkStruct_0200D0F4 * sub_02076994(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, UnkStruct_02002F38 * param2, int param3, int param4, int param5, int param6, int param7, int param8); void sub_02076AAC(int param0, int param1, UnkStruct_ov5_021DE5D0 * param2); u32 sub_02076AF0(void); u32 sub_02076AF4(void); -u8 sub_02076AF8(UnkStruct_02073C74 * param0); -u8 sub_02076B00(UnkStruct_02073C74_sub1 * param0); -UnkStruct_02073C74_sub1 * sub_02076B10(UnkStruct_02073C74 * param0); -u8 sub_02076B14(UnkStruct_02073C74 * param0); -u16 sub_02076B94(Party * param0, UnkStruct_02073C74 * param1, u8 param2, u16 param3, int * param4); -void sub_02077020(UnkStruct_02073C74_sub1 * param0); -u16 sub_020770C4(UnkStruct_02073C74 * param0, u16 param1); -u16 sub_020770D4(UnkStruct_02073C74_sub1 * param0, u16 param1); -void sub_02077134(UnkStruct_02073C74 * param0, u16 param1); -void sub_02077144(UnkStruct_02073C74_sub1 * param0, u16 param1); -void sub_020771F8(UnkStruct_02073C74 * param0, u16 param1, u8 param2); -void sub_02077230(UnkStruct_02073C74 * param0, u16 param1, u8 param2); -void sub_02077238(UnkStruct_02073C74_sub1 * param0, u16 param1, u8 param2); -u16 sub_0207727C(UnkStruct_02073C74 * param0, int * param1, u16 * param2); -void sub_02077344(UnkStruct_02073C74 * param0, int param1, int param2); -void sub_0207734C(UnkStruct_02073C74_sub1 * param0, int param1, int param2); -void sub_02077408(UnkStruct_02073C74 * param0, u32 param1); -BOOL sub_0207749C(UnkStruct_02073C74 * param0, u16 param1); -void sub_020774C8(UnkStruct_02073C74_sub1 * param0, UnkStruct_02073C74 * param1); +u8 sub_02076AF8(Pokemon * param0); +u8 sub_02076B00(BoxPokemon * param0); +BoxPokemon * sub_02076B10(Pokemon * param0); +u8 sub_02076B14(Pokemon * param0); +u16 sub_02076B94(Party * param0, Pokemon * param1, u8 param2, u16 param3, int * param4); +void sub_02077020(BoxPokemon * param0); +u16 sub_020770C4(Pokemon * param0, u16 param1); +u16 sub_020770D4(BoxPokemon * param0, u16 param1); +void sub_02077134(Pokemon * param0, u16 param1); +void sub_02077144(BoxPokemon * param0, u16 param1); +void sub_020771F8(Pokemon * param0, u16 param1, u8 param2); +void sub_02077230(Pokemon * param0, u16 param1, u8 param2); +void sub_02077238(BoxPokemon * param0, u16 param1, u8 param2); +u16 sub_0207727C(Pokemon * param0, int * param1, u16 * param2); +void sub_02077344(Pokemon * param0, int param1, int param2); +void sub_0207734C(BoxPokemon * param0, int param1, int param2); +void sub_02077408(Pokemon * param0, u32 param1); +BOOL sub_0207749C(Pokemon * param0, u16 param1); +void sub_020774C8(BoxPokemon * param0, Pokemon * param1); u8 sub_02077550(Party * param0); u16 sub_020775A4(u16 param0); u16 sub_020775C4(u16 param0); -void sub_020775EC(UnkStruct_02073C74 * param0, UnkStruct_02073C74 * param1); -void sub_02077604(UnkStruct_02073C74_sub1 * param0, UnkStruct_02073C74_sub1 * param1); -void sub_02077618(UnkStruct_02073C74 * param0, UnkStruct_02073C74_sub1 * param1); -s8 sub_0207762C(UnkStruct_02073C74 * param0, int param1); -s8 sub_02077634(UnkStruct_02073C74_sub1 * param0, int param1); +void sub_020775EC(Pokemon * param0, Pokemon * param1); +void sub_02077604(BoxPokemon * param0, BoxPokemon * param1); +void sub_02077618(Pokemon * param0, BoxPokemon * param1); +s8 sub_0207762C(Pokemon * param0, int param1); +s8 sub_02077634(BoxPokemon * param0, int param1); s8 sub_02077648(u32 param0, int param1); void sub_020776B0(Party * param0); u8 sub_02077758(Party * param0, u8 param1); void sub_020777B4(Party * param0, s32 param1); void sub_0207782C(Party * param0); -BOOL sub_020778D8(UnkStruct_02073C74 * param0); -BOOL sub_020778E0(UnkStruct_02073C74_sub1 * param0); -BOOL sub_020778F8(UnkStruct_02073C74 * param0); -BOOL sub_02077900(UnkStruct_02073C74_sub1 * param0); -void sub_02077928(UnkStruct_02073C74 * param0); -void sub_02077930(UnkStruct_02073C74_sub1 * param0); +BOOL sub_020778D8(Pokemon * param0); +BOOL sub_020778E0(BoxPokemon * param0); +BOOL sub_020778F8(Pokemon * param0); +BOOL sub_02077900(BoxPokemon * param0); +void sub_02077928(Pokemon * param0); +void sub_02077930(BoxPokemon * param0); u8 sub_02077988(u16 param0); -int sub_02077A00(UnkStruct_02073C74 * param0); -int sub_02077A1C(UnkStruct_02073C74_sub1 * param0); -void sub_02077ACC(UnkStruct_02073C74 * param0, int param1); -void sub_02077ADC(UnkStruct_02073C74_sub1 * param0, int param1); +int sub_02077A00(Pokemon * param0); +int sub_02077A1C(BoxPokemon * param0); +void SetShayminForm(Pokemon * param0, int param1); +void SetBoxShayminForm(BoxPokemon * param0, int param1); void sub_02077D28(int param0, int param1, u16 * param2); void sub_02077D3C(UnkStruct_0202CC84 * param0, int param1, u16 param2, int param3, int param4, int param5, int param6, int param7); -void sub_02077E64(UnkStruct_02073C74 * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5); -void sub_02077EA4(UnkStruct_02073C74_sub1 * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5); -void sub_02077EE4(UnkStruct_02073C74 * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5); -void sub_02077EF8(UnkStruct_02073C74_sub1 * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5); -void sub_02077F0C(UnkStruct_02073C74 * param0, u32 param1, int param2); -BOOL sub_02077FB4(UnkStruct_02073C74 * param0, u8 param1); -BOOL sub_02077FBC(UnkStruct_02073C74_sub1 * param0, u8 param1); +void sub_02077E64(Pokemon * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5); +void sub_02077EA4(BoxPokemon * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5); +void sub_02077EE4(Pokemon * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5); +void sub_02077EF8(BoxPokemon * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5); +void sub_02077F0C(Pokemon * param0, u32 param1, int param2); +BOOL sub_02077FB4(Pokemon * param0, u8 param1); +BOOL sub_02077FBC(BoxPokemon * param0, u8 param1); BOOL sub_02077FE4(u16 param0, int param1, u8 param2); -void sub_0207803C(UnkStruct_02073C74 * param0); -void sub_02078044(UnkStruct_02073C74_sub1 * param0); -void sub_020780C4(UnkStruct_02073C74 * param0, u32 param1); +void sub_0207803C(Pokemon * param0); +void sub_02078044(BoxPokemon * param0); +void sub_020780C4(Pokemon * param0, u32 param1); static void sub_020781F8(int param0, UnkStruct_02075874 * param1); static void sub_02078208(int param0, int param1, UnkStruct_02075874 * param2); static void sub_0207821C(int param0, UnkStruct_0207821C * param1); static void sub_0207822C(void * param0, u32 param1, u32 param2); static void sub_02078234(void * param0, u32 param1, u32 param2); static u16 sub_0207823C(void * param0, u32 param1); -static void * sub_0207825C(UnkStruct_02073C74_sub1 * param0, u32 param1, u8 param2); +static void * sub_0207825C(BoxPokemon * param0, u32 param1, u8 param2); static int sub_02078740(int param0, int param1); u32 sub_020787CC(int param0); int sub_020787EC(u32 param0); BOOL sub_02078804(u16 param0); -BOOL sub_02078838(UnkStruct_02073C74 * param0); +BOOL sub_02078838(Pokemon * param0); int sub_020788D0(int param0); static void sub_02076300(UnkStruct_02008A90 * param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u32 param6); static u8 sub_020767BC(u16 param0, u8 param1, u8 param2, u8 param3, u32 param4); -void sub_02073C2C (UnkStruct_02073C74 * param0) +void ZeroMonData (Pokemon * mon) { - MI_CpuClearFast(param0, sizeof(UnkStruct_02073C74)); - - sub_0207822C(¶m0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_00.unk_06); - sub_0207822C(¶m0->unk_08, sizeof(UnkStruct_02073C74_sub2), param0->unk_00.unk_00); + MI_CpuClearFast(mon, sizeof(Pokemon)); + sub_0207822C(&mon->box.unk_08, sizeof(PokemonSubstruct0) * 4, mon->box.unk_06); + sub_0207822C(&mon->party, sizeof(PartyPokemon), mon->box.unk_00); } -void sub_02073C54 (UnkStruct_02073C74_sub1 * param0) +void ZeroBoxMonData (BoxPokemon * boxMon) { - MI_CpuClearFast(param0, sizeof(UnkStruct_02073C74_sub1)); - sub_0207822C(param0->unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_06); + MI_CpuClearFast(boxMon, sizeof(BoxPokemon)); + sub_0207822C(boxMon->unk_08, sizeof(PokemonSubstruct0) * 4, boxMon->unk_06); } -int sub_02073C70 (void) +int PokemonStructSize (void) { - return sizeof(UnkStruct_02073C74); + return sizeof(Pokemon); } -UnkStruct_02073C74 * sub_02073C74 (u32 param0) +Pokemon * AllocMonZeroed (u32 heapID) { - UnkStruct_02073C74 * v0; - - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02073C74)); - sub_02073C2C(v0); - - return v0; + Pokemon * mon = Heap_AllocFromHeap(heapID, sizeof(Pokemon)); + ZeroMonData(mon); + return mon; } -BOOL sub_02073C88 (UnkStruct_02073C74 * param0) +BOOL sub_02073C88 (Pokemon * param0) { BOOL v0; v0 = 0; - if (param0->unk_00.unk_04_0 == 0) { + if (param0->box.unk_04_0 == 0) { v0 = 1; - GF_ASSERT(param0->unk_00.unk_04_1 == 0); + GF_ASSERT(param0->box.unk_04_1 == 0); - param0->unk_00.unk_04_0 = 1; - param0->unk_00.unk_04_1 = 1; + param0->box.unk_04_0 = 1; + param0->box.unk_04_1 = 1; - sub_02078234(¶m0->unk_08, sizeof(UnkStruct_02073C74_sub2), param0->unk_00.unk_00); - sub_02078234(¶m0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_00.unk_06); + sub_02078234(¶m0->party, sizeof(PartyPokemon), param0->box.unk_00); + sub_02078234(¶m0->box.unk_08, sizeof(PokemonSubstruct0) * 4, param0->box.unk_06); } return v0; } -BOOL sub_02073CD4 (UnkStruct_02073C74 * param0, BOOL param1) +BOOL sub_02073CD4 (Pokemon * param0, BOOL param1) { BOOL v0; v0 = 0; - if ((param0->unk_00.unk_04_0 == 1) && (param1 == 1)) { + if ((param0->box.unk_04_0 == 1) && (param1 == 1)) { v0 = 1; - param0->unk_00.unk_04_0 = 0; - param0->unk_00.unk_04_1 = 0; + param0->box.unk_04_0 = 0; + param0->box.unk_04_1 = 0; - sub_0207822C(¶m0->unk_08, sizeof(UnkStruct_02073C74_sub2), param0->unk_00.unk_00); - param0->unk_00.unk_06 = sub_0207823C(¶m0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4); - sub_0207822C(¶m0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_00.unk_06); + sub_0207822C(¶m0->party, sizeof(PartyPokemon), param0->box.unk_00); + param0->box.unk_06 = sub_0207823C(¶m0->box.unk_08, sizeof(PokemonSubstruct0) * 4); + sub_0207822C(¶m0->box.unk_08, sizeof(PokemonSubstruct0) * 4, param0->box.unk_06); } return v0; } -BOOL sub_02073D20 (UnkStruct_02073C74_sub1 * param0) +BOOL sub_02073D20 (BoxPokemon * param0) { BOOL v0; @@ -324,13 +322,13 @@ BOOL sub_02073D20 (UnkStruct_02073C74_sub1 * param0) if (param0->unk_04_1 == 0) { v0 = 1; param0->unk_04_1 = 1; - sub_02078234(param0->unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_06); + sub_02078234(param0->unk_08, sizeof(PokemonSubstruct0) * 4, param0->unk_06); } return v0; } -BOOL sub_02073D48 (UnkStruct_02073C74_sub1 * param0, BOOL param1) +BOOL sub_02073D48 (BoxPokemon * param0, BOOL param1) { BOOL v0; @@ -340,25 +338,25 @@ BOOL sub_02073D48 (UnkStruct_02073C74_sub1 * param0, BOOL param1) v0 = 1; param0->unk_04_1 = 0; - param0->unk_06 = sub_0207823C(param0->unk_08, sizeof(UnkStruct_02075454) * 4); + param0->unk_06 = sub_0207823C(param0->unk_08, sizeof(PokemonSubstruct0) * 4); - sub_0207822C(param0->unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_06); + sub_0207822C(param0->unk_08, sizeof(PokemonSubstruct0) * 4, param0->unk_06); } return v0; } -void sub_02073D80 (UnkStruct_02073C74 * param0, int param1, int param2, int param3, int param4, u32 param5, int param6, u32 param7) +void sub_02073D80 (Pokemon * param0, int param1, int param2, int param3, int param4, u32 param5, int param6, u32 param7) { u32 v0; UnkStruct_0202818C * v1; UnkStruct_0202CA28 v2; - sub_02073C2C(param0); + ZeroMonData(param0); - sub_02073E18((UnkStruct_02073C74_sub1 *)¶m0->unk_00, param1, param2, param3, param4, param5, param6, param7); - sub_0207822C(¶m0->unk_08, sizeof(UnkStruct_02073C74_sub2), 0); - sub_0207822C(¶m0->unk_08, sizeof(UnkStruct_02073C74_sub2), param0->unk_00.unk_00); + sub_02073E18((BoxPokemon *)¶m0->box, param1, param2, param3, param4, param5, param6, param7); + sub_0207822C(¶m0->party, sizeof(PartyPokemon), 0); + sub_0207822C(¶m0->party, sizeof(PartyPokemon), param0->box.unk_00); sub_02074B30(param0, 161, (u8 *)¶m2); v1 = sub_0202818C(0); @@ -375,13 +373,13 @@ void sub_02073D80 (UnkStruct_02073C74 * param0, int param1, int param2, int para sub_0207418C(param0); } -void sub_02073E18 (UnkStruct_02073C74_sub1 * param0, int param1, int param2, int param3, int param4, u32 param5, int param6, u32 param7) +void sub_02073E18 (BoxPokemon * param0, int param1, int param2, int param3, int param4, u32 param5, int param6, u32 param7) { u16 v0; u32 v1, v2; BOOL v3; - sub_02073C54(param0); + ZeroBoxMonData(param0); v3 = sub_02073D20(param0); @@ -389,7 +387,7 @@ void sub_02073E18 (UnkStruct_02073C74_sub1 * param0, int param1, int param2, int param5 = (sub_0201D2E8() | (sub_0201D2E8() << 16)); } - sub_02074C60(param0, 0, (u8 *)¶m5); + SetBoxMonData(param0, 0, (u8 *)¶m5); if (param6 == 2) { do { @@ -399,50 +397,50 @@ void sub_02073E18 (UnkStruct_02073C74_sub1 * param0, int param1, int param2, int param7 = 0; } - sub_02074C60(param0, 7, (u8 *)¶m7); - sub_02074C60(param0, 12, (u8 *)&Unk_020E4C44); - sub_02074C60(param0, 5, (u8 *)¶m1); - sub_02074C60(param0, 179, NULL); + SetBoxMonData(param0, 7, (u8 *)¶m7); + SetBoxMonData(param0, 12, (u8 *)&Unk_020E4C44); + SetBoxMonData(param0, 5, (u8 *)¶m1); + SetBoxMonData(param0, 179, NULL); v1 = sub_02075AD0(param1, param2); - sub_02074C60(param0, 8, (u8 *)&v1); + SetBoxMonData(param0, 8, (u8 *)&v1); v1 = sub_020759F0(param1, 20); - sub_02074C60(param0, 9, (u8 *)&v1); + SetBoxMonData(param0, 9, (u8 *)&v1); - sub_02074C60(param0, 156, (u8 *)¶m2); - sub_02074C60(param0, 122, (u8 *)&Unk_020E4C40); + SetBoxMonData(param0, 156, (u8 *)¶m2); + SetBoxMonData(param0, 122, (u8 *)&Unk_020E4C40); v1 = 4; - sub_02074C60(param0, 155, (u8 *)&v1); + SetBoxMonData(param0, 155, (u8 *)&v1); if (param3 < 32) { - sub_02074C60(param0, 70, (u8 *)¶m3); - sub_02074C60(param0, 71, (u8 *)¶m3); - sub_02074C60(param0, 72, (u8 *)¶m3); - sub_02074C60(param0, 73, (u8 *)¶m3); - sub_02074C60(param0, 74, (u8 *)¶m3); - sub_02074C60(param0, 75, (u8 *)¶m3); + SetBoxMonData(param0, 70, (u8 *)¶m3); + SetBoxMonData(param0, 71, (u8 *)¶m3); + SetBoxMonData(param0, 72, (u8 *)¶m3); + SetBoxMonData(param0, 73, (u8 *)¶m3); + SetBoxMonData(param0, 74, (u8 *)¶m3); + SetBoxMonData(param0, 75, (u8 *)¶m3); } else { v1 = sub_0201D2E8(); v2 = (v1 & (0x1f << 0)) >> 0; - sub_02074C60(param0, 70, (u8 *)&v2); + SetBoxMonData(param0, 70, (u8 *)&v2); v2 = (v1 & (0x1f << 5)) >> 5; - sub_02074C60(param0, 71, (u8 *)&v2); + SetBoxMonData(param0, 71, (u8 *)&v2); v2 = (v1 & (0x1f << 10)) >> 10; - sub_02074C60(param0, 72, (u8 *)&v2); + SetBoxMonData(param0, 72, (u8 *)&v2); v1 = sub_0201D2E8(); v2 = (v1 & (0x1f << 0)) >> 0; - sub_02074C60(param0, 73, (u8 *)&v2); + SetBoxMonData(param0, 73, (u8 *)&v2); v2 = (v1 & (0x1f << 5)) >> 5; - sub_02074C60(param0, 74, (u8 *)&v2); + SetBoxMonData(param0, 74, (u8 *)&v2); v2 = (v1 & (0x1f << 10)) >> 10; - sub_02074C60(param0, 75, (u8 *)&v2); + SetBoxMonData(param0, 75, (u8 *)&v2); } v1 = sub_020759F0(param1, 24); @@ -450,33 +448,33 @@ void sub_02073E18 (UnkStruct_02073C74_sub1 * param0, int param1, int param2, int if (v2 != 0) { if (param5 & 1) { - sub_02074C60(param0, 10, (u8 *)&v2); + SetBoxMonData(param0, 10, (u8 *)&v2); } else { - sub_02074C60(param0, 10, (u8 *)&v1); + SetBoxMonData(param0, 10, (u8 *)&v1); } } else { - sub_02074C60(param0, 10, (u8 *)&v1); + SetBoxMonData(param0, 10, (u8 *)&v1); } v1 = sub_02075D74(param0); - sub_02074C60(param0, 111, (u8 *)&v1); + SetBoxMonData(param0, 111, (u8 *)&v1); sub_02077020(param0); sub_02073D48(param0, v3); } -void sub_02074044 (UnkStruct_02073C74 * param0, u16 param1, u8 param2, u8 param3, u8 param4) +void sub_02074044 (Pokemon * param0, u16 param1, u8 param2, u8 param3, u8 param4) { u32 v0; do { v0 = (sub_0201D2E8() | (sub_0201D2E8() << 16)); - } while (param4 != sub_02075BFC(v0)); + } while (param4 != GetNatureFromPersonality(v0)); sub_02073D80(param0, param1, param2, param3, 1, v0, 0, 0); } -void sub_02074088 (UnkStruct_02073C74 * param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6) +void sub_02074088 (Pokemon * param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6) { u32 v0; u32 v1; @@ -486,7 +484,7 @@ void sub_02074088 (UnkStruct_02073C74 * param0, u16 param1, u8 param2, u8 param3 do { v0 = (sub_0201D2E8() | (sub_0201D2E8() << 16)); v2 = (((v0 & 0x3000000) >> 18) | ((v0 & 0x30000) >> 12) | ((v0 & 0x300) >> 6) | (v0 & 0x3)) % 28; - } while ((param5 != sub_02075BFC(v0)) || (param4 != sub_02075DAC(param1, v0)) || (v2 != (param6 - 1))); + } while ((param5 != GetNatureFromPersonality(v0)) || (param4 != sub_02075DAC(param1, v0)) || (v2 != (param6 - 1))); } else { v0 = sub_02074128(param1, param4, param5); } @@ -520,14 +518,14 @@ u32 sub_02074128 (u16 param0, u8 param1, u8 param2) return v1; } -void sub_02074158 (UnkStruct_02073C74 * param0, u16 param1, u8 param2, u32 param3, u32 param4) +void sub_02074158 (Pokemon * param0, u16 param1, u8 param2, u32 param3, u32 param4) { sub_02073D80(param0, param1, param2, 0, 1, param4, 0, 0); sub_02074B30(param0, 175, (u8 *)¶m3); sub_0207418C(param0); } -void sub_0207418C (UnkStruct_02073C74 * param0) +void sub_0207418C (Pokemon * param0) { int v0; BOOL v1; @@ -540,7 +538,7 @@ void sub_0207418C (UnkStruct_02073C74 * param0) sub_02073CD4(param0, v1); } -void sub_020741B8 (UnkStruct_02073C74 * param0) +void sub_020741B8 (Pokemon * param0) { int v0, v1, v2; int v3, v4, v5, v6, v7; @@ -555,23 +553,23 @@ void sub_020741B8 (UnkStruct_02073C74 * param0) v27 = sub_02073C88(param0); - v21 = sub_02074470(param0, 161, 0); - v0 = sub_02074470(param0, 164, 0); - v1 = sub_02074470(param0, 163, 0); - v8 = sub_02074470(param0, 70, 0); - v14 = sub_02074470(param0, 13, 0); - v9 = sub_02074470(param0, 71, 0); - v15 = sub_02074470(param0, 14, 0); - v10 = sub_02074470(param0, 72, 0); - v16 = sub_02074470(param0, 15, 0); - v11 = sub_02074470(param0, 73, 0); - v17 = sub_02074470(param0, 16, 0); - v12 = sub_02074470(param0, 74, 0); - v18 = sub_02074470(param0, 17, 0); - v13 = sub_02074470(param0, 75, 0); - v19 = sub_02074470(param0, 18, 0); - v22 = sub_02074470(param0, 112, 0); - v20 = sub_02074470(param0, 5, 0); + v21 = GetMonData(param0, MON_DATA_161, 0); + v0 = GetMonData(param0, MON_DATA_164, 0); + v1 = GetMonData(param0, MON_DATA_163, 0); + v8 = GetMonData(param0, MON_DATA_HP_IV, 0); + v14 = GetMonData(param0, MON_DATA_HP_EV, 0); + v9 = GetMonData(param0, MON_DATA_ATK_IV, 0); + v15 = GetMonData(param0, MON_DATA_ATK_EV, 0); + v10 = GetMonData(param0, MON_DATA_DEF_IV, 0); + v16 = GetMonData(param0, MON_DATA_DEF_EV, 0); + v11 = GetMonData(param0, MON_DATA_SPEED_IV, 0); + v17 = GetMonData(param0, MON_DATA_SPEED_EV, 0); + v12 = GetMonData(param0, MON_DATA_SPATK_IV, 0); + v18 = GetMonData(param0, MON_DATA_SPATK_EV, 0); + v13 = GetMonData(param0, MON_DATA_SPDEF_IV, 0); + v19 = GetMonData(param0, MON_DATA_SPDEF_EV, 0); + v22 = GetMonData(param0, MON_DATA_FORM, 0); + v20 = GetMonData(param0, MON_DATA_SPECIES, 0); v26 = Heap_AllocFromHeap(0, sizeof(UnkStruct_02075874)); sub_02078208(v20, v22, v26); @@ -629,92 +627,92 @@ void sub_020741B8 (UnkStruct_02073C74 * param0) sub_02073CD4(param0, v27); } -u32 sub_02074470 (UnkStruct_02073C74 * param0, int param1, void * param2) +u32 GetMonData (Pokemon * param0, int param1, void * param2) { u32 v0; u16 v1; - if (param0->unk_00.unk_04_0 == 0) { - sub_02078234(¶m0->unk_08, sizeof(UnkStruct_02073C74_sub2), param0->unk_00.unk_00); - sub_02078234(¶m0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_00.unk_06); + if (param0->box.unk_04_0 == 0) { + sub_02078234(¶m0->party, sizeof(PartyPokemon), param0->box.unk_00); + sub_02078234(¶m0->box.unk_08, sizeof(PokemonSubstruct0) * 4, param0->box.unk_06); - v1 = sub_0207823C(¶m0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4); + v1 = sub_0207823C(¶m0->box.unk_08, sizeof(PokemonSubstruct0) * 4); - if (v1 != param0->unk_00.unk_06) { - GF_ASSERT((v1 == param0->unk_00.unk_06)); - param0->unk_00.unk_04_2 = 1; + if (v1 != param0->box.unk_06) { + GF_ASSERT((v1 == param0->box.unk_06)); + param0->box.unk_04_2 = 1; } } v0 = sub_020744E8(param0, param1, param2); - if (param0->unk_00.unk_04_0 == 0) { - sub_0207822C(¶m0->unk_08, sizeof(UnkStruct_02073C74_sub2), param0->unk_00.unk_00); - sub_0207822C(¶m0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_00.unk_06); + if (param0->box.unk_04_0 == 0) { + sub_0207822C(¶m0->party, sizeof(PartyPokemon), param0->box.unk_00); + sub_0207822C(¶m0->box.unk_08, sizeof(PokemonSubstruct0) * 4, param0->box.unk_06); } return v0; } -static u32 sub_020744E8 (UnkStruct_02073C74 * param0, int param1, void * param2) +static u32 sub_020744E8 (Pokemon * param0, int param1, void * param2) { u32 v0 = 0; switch (param1) { case 160: - v0 = param0->unk_08.unk_00; + v0 = param0->party.unk_00; break; case 161: - v0 = param0->unk_08.unk_04; + v0 = param0->party.unk_04; break; case 162: - v0 = param0->unk_08.unk_05; + v0 = param0->party.unk_05; break; case 163: - v0 = param0->unk_08.unk_06; + v0 = param0->party.unk_06; break; case 164: - v0 = param0->unk_08.unk_08; + v0 = param0->party.unk_08; break; case 165: - v0 = param0->unk_08.unk_0A; + v0 = param0->party.unk_0A; break; case 166: - v0 = param0->unk_08.unk_0C; + v0 = param0->party.unk_0C; break; case 167: - v0 = param0->unk_08.unk_0E; + v0 = param0->party.unk_0E; break; case 168: - v0 = param0->unk_08.unk_10; + v0 = param0->party.unk_10; break; case 169: - v0 = param0->unk_08.unk_12; + v0 = param0->party.unk_12; break; case 170: - sub_020281A0(¶m0->unk_08.unk_14, (UnkStruct_0202818C *)param2); + sub_020281A0(¶m0->party.unk_14, (UnkStruct_0202818C *)param2); v0 = 1; break; case 171: - sub_0202CA10(¶m0->unk_08.unk_4C, (UnkStruct_0202CA28 *)param2); + sub_0202CA10(¶m0->party.unk_4C, (UnkStruct_0202CA28 *)param2); v0 = 1; break; default: - v0 = sub_020745D0((UnkStruct_02073C74_sub1 *)¶m0->unk_00, param1, param2); + v0 = sub_020745D0((BoxPokemon *)¶m0->box, param1, param2); break; } return v0; } -u32 sub_02074570 (UnkStruct_02073C74_sub1 * param0, int param1, void * param2) +u32 sub_02074570 (BoxPokemon * param0, int param1, void * param2) { u16 v0; u32 v1; if (param0->unk_04_1 == 0) { - sub_02078234(param0->unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_06); - v0 = sub_0207823C(param0->unk_08, sizeof(UnkStruct_02075454) * 4); + sub_02078234(param0->unk_08, sizeof(PokemonSubstruct0) * 4, param0->unk_06); + v0 = sub_0207823C(param0->unk_08, sizeof(PokemonSubstruct0) * 4); if (v0 != param0->unk_06) { GF_ASSERT((v0 == param0->unk_06)); @@ -725,57 +723,57 @@ u32 sub_02074570 (UnkStruct_02073C74_sub1 * param0, int param1, void * param2) v1 = sub_020745D0(param0, param1, param2); if (param0->unk_04_1 == 0) { - sub_0207822C(param0->unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_06); + sub_0207822C(param0->unk_08, sizeof(PokemonSubstruct0) * 4, param0->unk_06); } return v1; } -static u32 sub_020745D0 (UnkStruct_02073C74_sub1 * param0, int param1, void * param2) +static u32 sub_020745D0 (BoxPokemon * param0, int param1, void * param2) { u32 v0 = 0; u64 v1; - UnkStruct_02075454 * v2; - UnkStruct_02075454_1 * v3; - UnkStruct_02075454_2 * v4; - UnkStruct_02075454_3 * v5; + PokemonSubstruct0 * v2; + PokemonSubstruct1 * v3; + PokemonSubstruct2 * v4; + PokemonSubstruct3 * v5; - v2 = (UnkStruct_02075454 *)sub_0207825C(param0, param0->unk_00, 0); - v3 = (UnkStruct_02075454_1 *)sub_0207825C(param0, param0->unk_00, 1); - v4 = (UnkStruct_02075454_2 *)sub_0207825C(param0, param0->unk_00, 2); - v5 = (UnkStruct_02075454_3 *)sub_0207825C(param0, param0->unk_00, 3); + v2 = (PokemonSubstruct0 *)sub_0207825C(param0, param0->unk_00, 0); + v3 = (PokemonSubstruct1 *)sub_0207825C(param0, param0->unk_00, 1); + v4 = (PokemonSubstruct2 *)sub_0207825C(param0, param0->unk_00, 2); + v5 = (PokemonSubstruct3 *)sub_0207825C(param0, param0->unk_00, 3); switch (param1) { default: v0 = 0; break; - case 0: + case MON_DATA_PERSONALITY: v0 = param0->unk_00; break; - case 1: + case MON_DATA_1: v0 = param0->unk_04_0; break; - case 2: + case MON_DATA_2: v0 = param0->unk_04_1; break; - case 3: + case MON_DATA_3: v0 = param0->unk_04_2; break; - case 4: + case MON_DATA_4: v0 = param0->unk_06; break; - case 172: - v0 = (v2->unk_00 != 0); + case MON_DATA_172: + v0 = (v2->species != SPECIES_NONE); break; - case 173: + case MON_DATA_173: if (param0->unk_04_2) { v0 = param0->unk_04_2; } else { v0 = v3->unk_10_30; } break; - case 174: - v0 = v2->unk_00; + case MON_DATA_SPECIES_EGG: + v0 = v2->species; if (v0 == 0) { break; @@ -783,210 +781,210 @@ static u32 sub_020745D0 (UnkStruct_02073C74_sub1 * param0, int param1, void * pa v0 = 494; } break; - case 161: - v0 = sub_02075B78(v2->unk_00, v2->unk_08); + case MON_DATA_161: + v0 = sub_02075B78(v2->species, v2->unk_08); break; - case 5: + case MON_DATA_SPECIES: if (param0->unk_04_2) { v0 = 494; } else { - v0 = v2->unk_00; + v0 = v2->species; } break; - case 6: - v0 = v2->unk_02; + case MON_DATA_HELD_ITEM: + v0 = v2->item; break; - case 7: + case MON_DATA_OT_ID: v0 = v2->unk_04; break; - case 8: + case MON_DATA_EXP: v0 = v2->unk_08; break; - case 9: - v0 = v2->unk_0C; + case MON_DATA_FRIENDSHIP: + v0 = v2->friendship; break; - case 10: + case MON_DATA_10: v0 = v2->unk_0D; break; - case 11: + case MON_DATA_11: v0 = v2->unk_0E; break; - case 12: + case MON_DATA_LANGUAGE: v0 = v2->unk_0F; break; - case 13: + case MON_DATA_HP_EV: v0 = v2->unk_10; break; - case 14: + case MON_DATA_ATK_EV: v0 = v2->unk_11; break; - case 15: + case MON_DATA_DEF_EV: v0 = v2->unk_12; break; - case 16: + case MON_DATA_SPEED_EV: v0 = v2->unk_13; break; - case 17: + case MON_DATA_SPATK_EV: v0 = v2->unk_14; break; - case 18: + case MON_DATA_SPDEF_EV: v0 = v2->unk_15; break; - case 19: + case MON_DATA_COOL: v0 = v2->unk_16; break; - case 20: + case MON_DATA_BEAUTY: v0 = v2->unk_17; break; - case 21: + case MON_DATA_CUTE: v0 = v2->unk_18; break; - case 22: + case MON_DATA_SMART: v0 = v2->unk_19; break; - case 23: + case MON_DATA_TOUGH: v0 = v2->unk_1A; break; - case 24: + case MON_DATA_SHEEN: v0 = v2->unk_1B; break; - case 25: - case 26: - case 27: - case 28: - case 29: - case 30: - case 31: - case 32: - case 33: - case 34: - case 35: - case 36: - case 37: - case 38: - case 39: - case 40: - case 41: - case 42: - case 43: - case 44: - case 45: - case 46: - case 47: - case 48: - case 49: - case 50: - case 51: - case 52: - case 53: + case MON_DATA_25: + case MON_DATA_26: + case MON_DATA_27: + case MON_DATA_28: + case MON_DATA_29: + case MON_DATA_30: + case MON_DATA_31: + case MON_DATA_32: + case MON_DATA_33: + case MON_DATA_34: + case MON_DATA_35: + case MON_DATA_36: + case MON_DATA_37: + case MON_DATA_38: + case MON_DATA_39: + case MON_DATA_40: + case MON_DATA_41: + case MON_DATA_42: + case MON_DATA_43: + case MON_DATA_44: + case MON_DATA_45: + case MON_DATA_46: + case MON_DATA_47: + case MON_DATA_48: + case MON_DATA_49: + case MON_DATA_50: + case MON_DATA_51: + case MON_DATA_52: + case MON_DATA_53: v1 = 1; v0 = ((v2->unk_1C & (v1 << param1 - 25)) != 0); break; - case 54: - case 55: - case 56: - case 57: + case MON_DATA_MOVE1: + case MON_DATA_MOVE2: + case MON_DATA_MOVE3: + case MON_DATA_MOVE4: v0 = v3->unk_00[param1 - 54]; break; - case 58: - case 59: - case 60: - case 61: + case MON_DATA_58: + case MON_DATA_59: + case MON_DATA_60: + case MON_DATA_61: v0 = v3->unk_08[param1 - 58]; break; - case 62: - case 63: - case 64: - case 65: + case MON_DATA_62: + case MON_DATA_63: + case MON_DATA_64: + case MON_DATA_65: v0 = v3->unk_0C[param1 - 62]; break; - case 66: - case 67: - case 68: - case 69: + case MON_DATA_66: + case MON_DATA_67: + case MON_DATA_68: + case MON_DATA_69: v0 = MoveTable_GetMoveMaxPP(v3->unk_00[param1 - 66], v3->unk_0C[param1 - 66]); break; - case 70: + case MON_DATA_HP_IV: v0 = v3->unk_10_0; break; - case 71: + case MON_DATA_ATK_IV: v0 = v3->unk_10_5; break; - case 72: + case MON_DATA_DEF_IV: v0 = v3->unk_10_10; break; - case 73: + case MON_DATA_SPEED_IV: v0 = v3->unk_10_15; break; - case 74: + case MON_DATA_SPATK_IV: v0 = v3->unk_10_20; break; - case 75: + case MON_DATA_SPDEF_IV: v0 = v3->unk_10_25; break; - case 76: + case MON_DATA_IS_EGG: if (param0->unk_04_2) { v0 = param0->unk_04_2; } else { v0 = v3->unk_10_30; } break; - case 77: + case MON_DATA_77: v0 = v3->unk_10_31; break; - case 78: - case 79: - case 80: - case 81: - case 82: - case 83: - case 84: - case 85: - case 86: - case 87: - case 88: - case 89: - case 90: - case 91: - case 92: - case 93: - case 94: - case 95: - case 96: - case 97: - case 98: - case 99: - case 100: - case 101: - case 102: - case 103: - case 104: - case 105: - case 106: - case 107: - case 108: - case 109: + case MON_DATA_78: + case MON_DATA_79: + case MON_DATA_80: + case MON_DATA_81: + case MON_DATA_82: + case MON_DATA_83: + case MON_DATA_84: + case MON_DATA_85: + case MON_DATA_86: + case MON_DATA_87: + case MON_DATA_88: + case MON_DATA_89: + case MON_DATA_90: + case MON_DATA_91: + case MON_DATA_92: + case MON_DATA_93: + case MON_DATA_94: + case MON_DATA_95: + case MON_DATA_96: + case MON_DATA_97: + case MON_DATA_CHAMPION_RIBBON: + case MON_DATA_WINNING_RIBBON: + case MON_DATA_VICTORY_RIBBON: + case MON_DATA_ARTIST_RIBBON: + case MON_DATA_EFFORT_RIBBON: + case MON_DATA_MARINE_RIBBON: + case MON_DATA_LAND_RIBBON: + case MON_DATA_SKY_RIBBON: + case MON_DATA_COUNTRY_RIBBON: + case MON_DATA_NATIONAL_RIBBON: + case MON_DATA_EARTH_RIBBON: + case MON_DATA_WORLD_RIBBON: v1 = 1; v0 = ((v3->unk_14 & (v1 << param1 - 78)) != 0); break; - case 110: - v0 = v3->unk_18_0; + case MON_DATA_FATEFUL_ENCOUNTER: + v0 = v3->fatefulEncounter; break; - case 111: - v0 = sub_02075DAC(v2->unk_00, param0->unk_00); + case MON_DATA_111: + v0 = sub_02075DAC(v2->species, param0->unk_00); v3->unk_18_1 = v0; - param0->unk_06 = sub_0207823C(¶m0->unk_08, sizeof(UnkStruct_02075454) * 4); + param0->unk_06 = sub_0207823C(¶m0->unk_08, sizeof(PokemonSubstruct0) * 4); break; - case 112: - v0 = v3->unk_18_3; + case MON_DATA_FORM: + v0 = v3->form; break; - case 113: + case MON_DATA_113: v0 = v3->unk_19; break; - case 114: + case MON_DATA_114: v0 = v3->unk_1A; break; - case 117: + case MON_DATA_117: if (param0->unk_04_2) { sub_0200B274(495, 0, param2); } else { @@ -1001,9 +999,9 @@ static u32 sub_020745D0 (UnkStruct_02073C74_sub1 * param0, int param1, void * pa } } break; - case 120: + case MON_DATA_120: v0 = v3->unk_10_31; - case 119: + case MON_DATA_119: if (param0->unk_04_2) { UnkStruct_02023790 * v7 = sub_0200B32C(495, 0); @@ -1013,37 +1011,37 @@ static u32 sub_020745D0 (UnkStruct_02073C74_sub1 * param0, int param1, void * pa sub_02023D28((UnkStruct_02023790 *)param2, v4->unk_00); } break; - case 121: + case MON_DATA_121: v0 = v4->unk_16; break; - case 122: + case MON_DATA_MET_GAME: v0 = v4->unk_17; break; - case 123: - case 124: - case 125: - case 126: - case 127: - case 128: - case 129: - case 130: - case 131: - case 132: - case 133: - case 134: - case 135: - case 136: - case 137: - case 138: - case 139: - case 140: - case 141: - case 142: - case 143: + case MON_DATA_123: + case MON_DATA_124: + case MON_DATA_125: + case MON_DATA_126: + case MON_DATA_127: + case MON_DATA_128: + case MON_DATA_129: + case MON_DATA_130: + case MON_DATA_131: + case MON_DATA_132: + case MON_DATA_133: + case MON_DATA_134: + case MON_DATA_135: + case MON_DATA_136: + case MON_DATA_137: + case MON_DATA_138: + case MON_DATA_139: + case MON_DATA_140: + case MON_DATA_141: + case MON_DATA_142: + case MON_DATA_143: v1 = 1; v0 = ((v4->unk_18 & (v1 << param1 - 123)) != 0); break; - case 144: + case MON_DATA_144: { u16 * v8 = param2; @@ -1054,114 +1052,114 @@ static u32 sub_020745D0 (UnkStruct_02073C74_sub1 * param0, int param1, void * pa v8[v0] = 0xffff; break; } - case 145: + case MON_DATA_145: sub_02023D28((UnkStruct_02023790 *)param2, v5->unk_00); break; - case 146: + case MON_DATA_146: v0 = v5->unk_10; break; - case 147: + case MON_DATA_147: v0 = v5->unk_11; break; - case 148: + case MON_DATA_148: v0 = v5->unk_12; break; - case 149: + case MON_DATA_149: v0 = v5->unk_13; break; - case 150: + case MON_DATA_150: v0 = v5->unk_14; break; - case 151: + case MON_DATA_151: v0 = v5->unk_15; break; - case 152: - case 115: + case MON_DATA_152: + case MON_DATA_115: if ((v5->unk_16 == 3002) && (v3->unk_1C)) { v0 = v3->unk_1C; } else { v0 = v5->unk_16; } break; - case 153: - case 116: + case MON_DATA_153: + case MON_DATA_116: if ((v5->unk_18 == 3002) && (v3->unk_1E)) { v0 = v3->unk_1E; } else { v0 = v5->unk_18; } break; - case 154: + case MON_DATA_POKERUS: v0 = v5->unk_1A; break; - case 155: + case MON_DATA_POKEBALL: v0 = v5->unk_1B; break; - case 156: + case MON_DATA_MET_LEVEL: v0 = v5->unk_1C_0; break; - case 157: + case MON_DATA_OT_GENDER: v0 = v5->unk_1C_7; break; - case 158: + case MON_DATA_158: v0 = v5->unk_1D; break; - case 159: + case MON_DATA_159: v0 = v5->unk_1E; break; - case 175: + case MON_DATA_175: v0 = (v3->unk_10_0 << 0) | (v3->unk_10_5 << 5) | (v3->unk_10_10 << 10) | (v3->unk_10_15 << 15) | (v3->unk_10_20 << 20) | (v3->unk_10_25 << 25); break; - case 176: - if (((v2->unk_00 == 29) || (v2->unk_00 == 32)) && (v3->unk_10_31 == 0)) { + case MON_DATA_176: + if (((v2->species == SPECIES_NIDORAN_F) || (v2->species == SPECIES_NIDORAN_M)) && (v3->unk_10_31 == 0)) { v0 = 0; } else { v0 = 1; } break; - case 177: - case 178: - if ((v2->unk_00 == 493) && (v2->unk_0D == 121)) { - v0 = sub_02077988(Item_GetAttribute(v2->unk_02, 1, 0)); + case MON_DATA_177: + case MON_DATA_178: + if ((v2->species == SPECIES_ARCEUS) && (v2->unk_0D == 121)) { + v0 = sub_02077988(Item_GetAttribute(v2->item, 1, 0)); } else { - v0 = sub_020759CC(v2->unk_00, v3->unk_18_3, 6 + (param1 - 177)); + v0 = sub_020759CC(v2->species, v3->form, 6 + (param1 - 177)); } break; - case 179: - sub_0200B274(v2->unk_00, 0, param2); + case MON_DATA_179: + sub_0200B274(v2->species, 0, param2); break; } return v0; } -void sub_02074B30 (UnkStruct_02073C74 * param0, int param1, const void * param2) +void sub_02074B30 (Pokemon * param0, int param1, const void * param2) { u16 v0; - if (param0->unk_00.unk_04_0 == 0) { - sub_02078234(¶m0->unk_08, sizeof(UnkStruct_02073C74_sub2), param0->unk_00.unk_00); - sub_02078234(¶m0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_00.unk_06); - v0 = sub_0207823C(¶m0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4); + if (param0->box.unk_04_0 == 0) { + sub_02078234(¶m0->party, sizeof(PartyPokemon), param0->box.unk_00); + sub_02078234(¶m0->box.unk_08, sizeof(PokemonSubstruct0) * 4, param0->box.unk_06); + v0 = sub_0207823C(¶m0->box.unk_08, sizeof(PokemonSubstruct0) * 4); - if (v0 != param0->unk_00.unk_06) { - GF_ASSERT((v0 == param0->unk_00.unk_06)); - param0->unk_00.unk_04_2 = 1; - sub_0207822C(param0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_00.unk_06); + if (v0 != param0->box.unk_06) { + GF_ASSERT((v0 == param0->box.unk_06)); + param0->box.unk_04_2 = 1; + sub_0207822C(param0->box.unk_08, sizeof(PokemonSubstruct0) * 4, param0->box.unk_06); return; } } sub_02074BC0(param0, param1, param2); - if (param0->unk_00.unk_04_0 == 0) { - sub_0207822C(¶m0->unk_08, sizeof(UnkStruct_02073C74_sub2), param0->unk_00.unk_00); - param0->unk_00.unk_06 = sub_0207823C(¶m0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4); - sub_0207822C(¶m0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_00.unk_06); + if (param0->box.unk_04_0 == 0) { + sub_0207822C(¶m0->party, sizeof(PartyPokemon), param0->box.unk_00); + param0->box.unk_06 = sub_0207823C(¶m0->box.unk_08, sizeof(PokemonSubstruct0) * 4); + sub_0207822C(¶m0->box.unk_08, sizeof(PokemonSubstruct0) * 4, param0->box.unk_06); } } -static void sub_02074BC0 (UnkStruct_02073C74 * param0, int param1, const void * param2) +static void sub_02074BC0 (Pokemon * param0, int param1, const void * param2) { u32 * v0 = (u32 *)param2; u16 * v1 = (u16 *)param2; @@ -1169,59 +1167,59 @@ static void sub_02074BC0 (UnkStruct_02073C74 * param0, int param1, const void * switch (param1) { case 160: - param0->unk_08.unk_00 = v0[0]; + param0->party.unk_00 = v0[0]; break; case 161: - param0->unk_08.unk_04 = v2[0]; + param0->party.unk_04 = v2[0]; break; case 162: - param0->unk_08.unk_05 = v2[0]; + param0->party.unk_05 = v2[0]; break; case 163: - param0->unk_08.unk_06 = v1[0]; + param0->party.unk_06 = v1[0]; break; case 164: - param0->unk_08.unk_08 = v1[0]; + param0->party.unk_08 = v1[0]; break; case 165: - param0->unk_08.unk_0A = v1[0]; + param0->party.unk_0A = v1[0]; break; case 166: - param0->unk_08.unk_0C = v1[0]; + param0->party.unk_0C = v1[0]; break; case 167: - param0->unk_08.unk_0E = v1[0]; + param0->party.unk_0E = v1[0]; break; case 168: - param0->unk_08.unk_10 = v1[0]; + param0->party.unk_10 = v1[0]; break; case 169: - param0->unk_08.unk_12 = v1[0]; + param0->party.unk_12 = v1[0]; break; case 170: - sub_020281A0((UnkStruct_0202818C *)param2, ¶m0->unk_08.unk_14); + sub_020281A0((UnkStruct_0202818C *)param2, ¶m0->party.unk_14); break; case 171: - sub_0202CA10((UnkStruct_0202CA28 *)param2, ¶m0->unk_08.unk_4C); + sub_0202CA10((UnkStruct_0202CA28 *)param2, ¶m0->party.unk_4C); break; default: - sub_02074CD8((UnkStruct_02073C74_sub1 *)¶m0->unk_00, param1, param2); + sub_02074CD8((BoxPokemon *)¶m0->box, param1, param2); break; } } -void sub_02074C60 (UnkStruct_02073C74_sub1 * param0, int param1, const void * param2) +void SetBoxMonData (BoxPokemon * param0, int param1, const void * param2) { u16 v0; if (param0->unk_04_1 == 0) { - sub_02078234(param0->unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_06); - v0 = sub_0207823C(param0->unk_08, sizeof(UnkStruct_02075454) * 4); + sub_02078234(param0->unk_08, sizeof(PokemonSubstruct0) * 4, param0->unk_06); + v0 = sub_0207823C(param0->unk_08, sizeof(PokemonSubstruct0) * 4); if (v0 != param0->unk_06) { GF_ASSERT((v0 == param0->unk_06)); param0->unk_04_2 = 1; - sub_0207822C(param0->unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_06); + sub_0207822C(param0->unk_08, sizeof(PokemonSubstruct0) * 4, param0->unk_06); return; } } @@ -1229,12 +1227,12 @@ void sub_02074C60 (UnkStruct_02073C74_sub1 * param0, int param1, const void * pa sub_02074CD8(param0, param1, param2); if (param0->unk_04_1 == 0) { - param0->unk_06 = sub_0207823C(param0->unk_08, sizeof(UnkStruct_02075454) * 4); - sub_0207822C(param0->unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_06); + param0->unk_06 = sub_0207823C(param0->unk_08, sizeof(PokemonSubstruct0) * 4); + sub_0207822C(param0->unk_08, sizeof(PokemonSubstruct0) * 4, param0->unk_06); } } -static void sub_02074CD8 (UnkStruct_02073C74_sub1 * param0, int param1, const void * param2) +static void sub_02074CD8 (BoxPokemon * param0, int param1, const void * param2) { int v0; u64 v1; @@ -1242,123 +1240,123 @@ static void sub_02074CD8 (UnkStruct_02073C74_sub1 * param0, int param1, const vo u32 * v3 = (u32 *)param2; u16 * v4 = (u16 *)param2; u8 * v5 = (u8 *)param2; - UnkStruct_02075454 * v6; - UnkStruct_02075454_1 * v7; - UnkStruct_02075454_2 * v8; - UnkStruct_02075454_3 * v9; + PokemonSubstruct0 * v6; + PokemonSubstruct1 * v7; + PokemonSubstruct2 * v8; + PokemonSubstruct3 * v9; - v6 = (UnkStruct_02075454 *)sub_0207825C(param0, param0->unk_00, 0); - v7 = (UnkStruct_02075454_1 *)sub_0207825C(param0, param0->unk_00, 1); - v8 = (UnkStruct_02075454_2 *)sub_0207825C(param0, param0->unk_00, 2); - v9 = (UnkStruct_02075454_3 *)sub_0207825C(param0, param0->unk_00, 3); + v6 = (PokemonSubstruct0 *)sub_0207825C(param0, param0->unk_00, 0); + v7 = (PokemonSubstruct1 *)sub_0207825C(param0, param0->unk_00, 1); + v8 = (PokemonSubstruct2 *)sub_0207825C(param0, param0->unk_00, 2); + v9 = (PokemonSubstruct3 *)sub_0207825C(param0, param0->unk_00, 3); switch (param1) { - case 0: + case MON_DATA_PERSONALITY: param0->unk_00 = v3[0]; break; - case 1: + case MON_DATA_1: GF_ASSERT(0); param0->unk_04_0 = v5[0]; break; - case 2: + case MON_DATA_2: GF_ASSERT(0); param0->unk_04_1 = v5[0]; break; - case 3: + case MON_DATA_3: param0->unk_04_2 = v5[0]; break; - case 4: + case MON_DATA_4: param0->unk_06 = v4[0]; break; - case 5: - v6->unk_00 = v4[0]; + case MON_DATA_SPECIES: + v6->species = v4[0]; break; - case 6: - v6->unk_02 = v4[0]; + case MON_DATA_HELD_ITEM: + v6->item = v4[0]; break; - case 7: + case MON_DATA_OT_ID: v6->unk_04 = v3[0]; break; - case 8: + case MON_DATA_EXP: v6->unk_08 = v3[0]; break; - case 9: - v6->unk_0C = v5[0]; + case MON_DATA_FRIENDSHIP: + v6->friendship = v5[0]; break; - case 10: + case MON_DATA_10: v6->unk_0D = v5[0]; break; - case 11: + case MON_DATA_11: v6->unk_0E = v5[0]; break; - case 12: + case MON_DATA_LANGUAGE: v6->unk_0F = v5[0]; break; - case 13: + case MON_DATA_HP_EV: v6->unk_10 = v5[0]; break; - case 14: + case MON_DATA_ATK_EV: v6->unk_11 = v5[0]; break; - case 15: + case MON_DATA_DEF_EV: v6->unk_12 = v5[0]; break; - case 16: + case MON_DATA_SPEED_EV: v6->unk_13 = v5[0]; break; - case 17: + case MON_DATA_SPATK_EV: v6->unk_14 = v5[0]; break; - case 18: + case MON_DATA_SPDEF_EV: v6->unk_15 = v5[0]; break; - case 19: + case MON_DATA_COOL: v6->unk_16 = v5[0]; break; - case 20: + case MON_DATA_BEAUTY: v6->unk_17 = v5[0]; break; - case 21: + case MON_DATA_CUTE: v6->unk_18 = v5[0]; break; - case 22: + case MON_DATA_SMART: v6->unk_19 = v5[0]; break; - case 23: + case MON_DATA_TOUGH: v6->unk_1A = v5[0]; break; - case 24: + case MON_DATA_SHEEN: v6->unk_1B = v5[0]; break; - case 25: - case 26: - case 27: - case 28: - case 29: - case 30: - case 31: - case 32: - case 33: - case 34: - case 35: - case 36: - case 37: - case 38: - case 39: - case 40: - case 41: - case 42: - case 43: - case 44: - case 45: - case 46: - case 47: - case 48: - case 49: - case 50: - case 51: - case 52: - case 53: + case MON_DATA_25: + case MON_DATA_26: + case MON_DATA_27: + case MON_DATA_28: + case MON_DATA_29: + case MON_DATA_30: + case MON_DATA_31: + case MON_DATA_32: + case MON_DATA_33: + case MON_DATA_34: + case MON_DATA_35: + case MON_DATA_36: + case MON_DATA_37: + case MON_DATA_38: + case MON_DATA_39: + case MON_DATA_40: + case MON_DATA_41: + case MON_DATA_42: + case MON_DATA_43: + case MON_DATA_44: + case MON_DATA_45: + case MON_DATA_46: + case MON_DATA_47: + case MON_DATA_48: + case MON_DATA_49: + case MON_DATA_50: + case MON_DATA_51: + case MON_DATA_52: + case MON_DATA_53: v1 = 1 << (param1 - 25); if (v5[0]) { @@ -1367,85 +1365,85 @@ static void sub_02074CD8 (UnkStruct_02073C74_sub1 * param0, int param1, const vo v6->unk_1C &= (v1 ^ 0xffffffff); } break; - case 54: - case 55: - case 56: - case 57: + case MON_DATA_MOVE1: + case MON_DATA_MOVE2: + case MON_DATA_MOVE3: + case MON_DATA_MOVE4: v7->unk_00[param1 - 54] = v4[0]; break; - case 58: - case 59: - case 60: - case 61: + case MON_DATA_58: + case MON_DATA_59: + case MON_DATA_60: + case MON_DATA_61: v7->unk_08[param1 - 58] = v5[0]; break; - case 62: - case 63: - case 64: - case 65: + case MON_DATA_62: + case MON_DATA_63: + case MON_DATA_64: + case MON_DATA_65: v7->unk_0C[param1 - 62] = v5[0]; break; - case 66: - case 67: - case 68: - case 69: + case MON_DATA_66: + case MON_DATA_67: + case MON_DATA_68: + case MON_DATA_69: break; - case 70: + case MON_DATA_HP_IV: v7->unk_10_0 = v5[0]; break; - case 71: + case MON_DATA_ATK_IV: v7->unk_10_5 = v5[0]; break; - case 72: + case MON_DATA_DEF_IV: v7->unk_10_10 = v5[0]; break; - case 73: + case MON_DATA_SPEED_IV: v7->unk_10_15 = v5[0]; break; - case 74: + case MON_DATA_SPATK_IV: v7->unk_10_20 = v5[0]; break; - case 75: + case MON_DATA_SPDEF_IV: v7->unk_10_25 = v5[0]; break; - case 76: + case MON_DATA_IS_EGG: v7->unk_10_30 = v5[0]; break; - case 77: + case MON_DATA_77: v7->unk_10_31 = v5[0]; break; - case 78: - case 79: - case 80: - case 81: - case 82: - case 83: - case 84: - case 85: - case 86: - case 87: - case 88: - case 89: - case 90: - case 91: - case 92: - case 93: - case 94: - case 95: - case 96: - case 97: - case 98: - case 99: - case 100: - case 101: - case 102: - case 103: - case 104: - case 105: - case 106: - case 107: - case 108: - case 109: + case MON_DATA_78: + case MON_DATA_79: + case MON_DATA_80: + case MON_DATA_81: + case MON_DATA_82: + case MON_DATA_83: + case MON_DATA_84: + case MON_DATA_85: + case MON_DATA_86: + case MON_DATA_87: + case MON_DATA_88: + case MON_DATA_89: + case MON_DATA_90: + case MON_DATA_91: + case MON_DATA_92: + case MON_DATA_93: + case MON_DATA_94: + case MON_DATA_95: + case MON_DATA_96: + case MON_DATA_97: + case MON_DATA_CHAMPION_RIBBON: + case MON_DATA_WINNING_RIBBON: + case MON_DATA_VICTORY_RIBBON: + case MON_DATA_ARTIST_RIBBON: + case MON_DATA_EFFORT_RIBBON: + case MON_DATA_MARINE_RIBBON: + case MON_DATA_LAND_RIBBON: + case MON_DATA_SKY_RIBBON: + case MON_DATA_COUNTRY_RIBBON: + case MON_DATA_NATIONAL_RIBBON: + case MON_DATA_EARTH_RIBBON: + case MON_DATA_WORLD_RIBBON: v1 = 1 << (param1 - 78); if (v5[0]) { @@ -1454,73 +1452,73 @@ static void sub_02074CD8 (UnkStruct_02073C74_sub1 * param0, int param1, const vo v7->unk_14 &= (v1 ^ 0xffffffff); } break; - case 110: - v7->unk_18_0 = v5[0]; + case MON_DATA_FATEFUL_ENCOUNTER: + v7->fatefulEncounter = v5[0]; break; - case 111: - v7->unk_18_1 = sub_02075DAC(v6->unk_00, param0->unk_00); + case MON_DATA_111: + v7->unk_18_1 = sub_02075DAC(v6->species, param0->unk_00); break; - case 112: - v7->unk_18_3 = v5[0]; + case MON_DATA_FORM: + v7->form = v5[0]; break; - case 113: + case MON_DATA_113: v7->unk_19 = v5[0]; break; - case 114: + case MON_DATA_114: v7->unk_1A = v4[0]; break; - case 118: + case MON_DATA_118: { u16 v10[10 + 1]; - sub_0200B274(v6->unk_00, 0, &v10[0]); + sub_0200B274(v6->species, 0, &v10[0]); v7->unk_10_31 = sub_0200220C(v10, &v4[0]); } - case 117: + case MON_DATA_117: for (v0 = 0; v0 < NELEMS(v8->unk_00); v0++) { v8->unk_00[v0] = v4[v0]; } break; - case 120: + case MON_DATA_120: { u16 v11[10 + 1]; u16 v12[10 + 1]; - sub_0200B274(v6->unk_00, 0, &v11[0]); + sub_0200B274(v6->species, 0, &v11[0]); sub_02023DF0((UnkStruct_02023790 *)param2, &v12[0], NELEMS(v12)); v7->unk_10_31 = sub_0200220C(v11, v12); } - case 119: + case MON_DATA_119: sub_02023DF0((UnkStruct_02023790 *)param2, v8->unk_00, NELEMS(v8->unk_00)); break; - case 121: + case MON_DATA_121: v8->unk_16 = v5[0]; break; - case 122: + case MON_DATA_MET_GAME: v8->unk_17 = v5[0]; break; - case 123: - case 124: - case 125: - case 126: - case 127: - case 128: - case 129: - case 130: - case 131: - case 132: - case 133: - case 134: - case 135: - case 136: - case 137: - case 138: - case 139: - case 140: - case 141: - case 142: - case 143: + case MON_DATA_123: + case MON_DATA_124: + case MON_DATA_125: + case MON_DATA_126: + case MON_DATA_127: + case MON_DATA_128: + case MON_DATA_129: + case MON_DATA_130: + case MON_DATA_131: + case MON_DATA_132: + case MON_DATA_133: + case MON_DATA_134: + case MON_DATA_135: + case MON_DATA_136: + case MON_DATA_137: + case MON_DATA_138: + case MON_DATA_139: + case MON_DATA_140: + case MON_DATA_141: + case MON_DATA_142: + case MON_DATA_143: v1 = 1 << (param1 - 123); if (v5[0]) { @@ -1529,34 +1527,34 @@ static void sub_02074CD8 (UnkStruct_02073C74_sub1 * param0, int param1, const vo v8->unk_18 &= (v1 ^ 0xffffffffffffffff); } break; - case 144: + case MON_DATA_144: for (v0 = 0; v0 < NELEMS(v9->unk_00); v0++) { v9->unk_00[v0] = v4[v0]; } break; - case 145: + case MON_DATA_145: sub_02023DF0((UnkStruct_02023790 *)param2, v9->unk_00, NELEMS(v9->unk_00)); break; - case 146: + case MON_DATA_146: v9->unk_10 = v5[0]; break; - case 147: + case MON_DATA_147: v9->unk_11 = v5[0]; break; - case 148: + case MON_DATA_148: v9->unk_12 = v5[0]; break; - case 149: + case MON_DATA_149: v9->unk_13 = v5[0]; break; - case 150: + case MON_DATA_150: v9->unk_14 = v5[0]; break; - case 151: + case MON_DATA_151: v9->unk_15 = v5[0]; break; - case 152: - case 115: + case MON_DATA_152: + case MON_DATA_115: if ((v4[0] == 0) || (sub_0201708C(v4[0]) == 1)) { v9->unk_16 = v4[0]; v7->unk_1C = v4[0]; @@ -1565,8 +1563,8 @@ static void sub_02074CD8 (UnkStruct_02073C74_sub1 * param0, int param1, const vo v7->unk_1C = v4[0]; } break; - case 153: - case 116: + case MON_DATA_153: + case MON_DATA_116: if ((v4[0] == 0) || (sub_0201708C(v4[0]) == 1)) { v9->unk_18 = v4[0]; v7->unk_1E = v4[0]; @@ -1575,25 +1573,25 @@ static void sub_02074CD8 (UnkStruct_02073C74_sub1 * param0, int param1, const vo v7->unk_1E = v4[0]; } break; - case 154: + case MON_DATA_POKERUS: v9->unk_1A = v5[0]; break; - case 155: + case MON_DATA_POKEBALL: v9->unk_1B = v5[0]; break; - case 156: + case MON_DATA_MET_LEVEL: v9->unk_1C_0 = v5[0]; break; - case 157: + case MON_DATA_OT_GENDER: v9->unk_1C_7 = v5[0]; break; - case 158: + case MON_DATA_158: v9->unk_1D = v5[0]; break; - case 159: + case MON_DATA_159: v9->unk_1E = v4[0]; break; - case 175: + case MON_DATA_175: v7->unk_10_0 = (v3[0] >> 0) & 0x1f; v7->unk_10_5 = (v3[0] >> 5) & 0x1f; v7->unk_10_10 = (v3[0] >> 10) & 0x1f; @@ -1601,15 +1599,15 @@ static void sub_02074CD8 (UnkStruct_02073C74_sub1 * param0, int param1, const vo v7->unk_10_20 = (v3[0] >> 20) & 0x1f; v7->unk_10_25 = (v3[0] >> 25) & 0x1f; break; - case 176: - case 177: - case 178: + case MON_DATA_176: + case MON_DATA_177: + case MON_DATA_178: break; - case 179: + case MON_DATA_179: { UnkStruct_02023790 * v13; - v13 = sub_0200B32C(v6->unk_00, 0); + v13 = sub_0200B32C(v6->species, 0); sub_02023DF0(v13, v8->unk_00, NELEMS(v8->unk_00)); sub_020237BC(v13); @@ -1618,40 +1616,40 @@ static void sub_02074CD8 (UnkStruct_02073C74_sub1 * param0, int param1, const vo } } -void sub_0207536C (UnkStruct_02073C74 * param0, int param1, int param2) +void sub_0207536C (Pokemon * param0, int param1, int param2) { u16 v0; - if (param0->unk_00.unk_04_0 == 0) { - sub_02078234(¶m0->unk_08, sizeof(UnkStruct_02073C74_sub2), param0->unk_00.unk_00); - sub_02078234(¶m0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_00.unk_06); + if (param0->box.unk_04_0 == 0) { + sub_02078234(¶m0->party, sizeof(PartyPokemon), param0->box.unk_00); + sub_02078234(¶m0->box.unk_08, sizeof(PokemonSubstruct0) * 4, param0->box.unk_06); - v0 = sub_0207823C(¶m0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4); + v0 = sub_0207823C(¶m0->box.unk_08, sizeof(PokemonSubstruct0) * 4); - if (v0 != param0->unk_00.unk_06) { - GF_ASSERT((v0 == param0->unk_00.unk_06)); - sub_0207822C(param0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_00.unk_06); + if (v0 != param0->box.unk_06) { + GF_ASSERT((v0 == param0->box.unk_06)); + sub_0207822C(param0->box.unk_08, sizeof(PokemonSubstruct0) * 4, param0->box.unk_06); return; } } sub_020753F4(param0, param1, param2); - if (param0->unk_00.unk_04_0 == 0) { - sub_0207822C(¶m0->unk_08, sizeof(UnkStruct_02073C74_sub2), param0->unk_00.unk_00); - param0->unk_00.unk_06 = sub_0207823C(¶m0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4); - sub_0207822C(¶m0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_00.unk_06); + if (param0->box.unk_04_0 == 0) { + sub_0207822C(¶m0->party, sizeof(PartyPokemon), param0->box.unk_00); + param0->box.unk_06 = sub_0207823C(¶m0->box.unk_08, sizeof(PokemonSubstruct0) * 4); + sub_0207822C(¶m0->box.unk_08, sizeof(PokemonSubstruct0) * 4, param0->box.unk_06); } } -static void sub_020753F4 (UnkStruct_02073C74 * param0, int param1, int param2) +static void sub_020753F4 (Pokemon * param0, int param1, int param2) { switch (param1) { case 163: - if ((param0->unk_08.unk_06 + param2) > param0->unk_08.unk_08) { - param0->unk_08.unk_06 = param0->unk_08.unk_08; + if ((param0->party.unk_06 + param2) > param0->party.unk_08) { + param0->party.unk_06 = param0->party.unk_08; } else { - param0->unk_08.unk_06 += param2; + param0->party.unk_06 += param2; } break; case 160: @@ -1667,38 +1665,38 @@ static void sub_020753F4 (UnkStruct_02073C74 * param0, int param1, int param2) GF_ASSERT(0); break; default: - sub_02075454((UnkStruct_02073C74_sub1 *)¶m0->unk_00, param1, param2); + sub_02075454((BoxPokemon *)¶m0->box, param1, param2); break; } } -static void sub_02075454 (UnkStruct_02073C74_sub1 * param0, int param1, int param2) +static void sub_02075454 (BoxPokemon * param0, int param1, int param2) { int v0; u16 v1; - UnkStruct_02075454 * v2; - UnkStruct_02075454_1 * v3; - UnkStruct_02075454_2 * v4; - UnkStruct_02075454_3 * v5; + PokemonSubstruct0 * v2; + PokemonSubstruct1 * v3; + PokemonSubstruct2 * v4; + PokemonSubstruct3 * v5; - v2 = (UnkStruct_02075454 *)sub_0207825C(param0, param0->unk_00, 0); - v3 = (UnkStruct_02075454_1 *)sub_0207825C(param0, param0->unk_00, 1); - v4 = (UnkStruct_02075454_2 *)sub_0207825C(param0, param0->unk_00, 2); - v5 = (UnkStruct_02075454_3 *)sub_0207825C(param0, param0->unk_00, 3); + v2 = (PokemonSubstruct0 *)sub_0207825C(param0, param0->unk_00, 0); + v3 = (PokemonSubstruct1 *)sub_0207825C(param0, param0->unk_00, 1); + v4 = (PokemonSubstruct2 *)sub_0207825C(param0, param0->unk_00, 2); + v5 = (PokemonSubstruct3 *)sub_0207825C(param0, param0->unk_00, 3); switch (param1) { - case 8: - if ((v2->unk_08 + param2) > sub_02075AD0(v2->unk_00, 100)) { - v2->unk_08 = sub_02075AD0(v2->unk_00, 100); + case MON_DATA_EXP: + if ((v2->unk_08 + param2) > sub_02075AD0(v2->species, 100)) { + v2->unk_08 = sub_02075AD0(v2->species, 100); } else { v2->unk_08 += param2; } break; - case 9: + case MON_DATA_FRIENDSHIP: { int v6; - v6 = v2->unk_0C; + v6 = v2->friendship; if ((v6 + param2) > 255) { v6 = 255; @@ -1710,265 +1708,265 @@ static void sub_02075454 (UnkStruct_02073C74_sub1 * param0, int param1, int para v6 += param2; } - v2->unk_0C = v6; + v2->friendship = v6; } break; - case 13: + case MON_DATA_HP_EV: v2->unk_10 += param2; break; - case 14: + case MON_DATA_ATK_EV: v2->unk_11 += param2; break; - case 15: + case MON_DATA_DEF_EV: v2->unk_12 += param2; break; - case 16: + case MON_DATA_SPEED_EV: v2->unk_13 += param2; break; - case 17: + case MON_DATA_SPATK_EV: v2->unk_14 += param2; break; - case 18: + case MON_DATA_SPDEF_EV: v2->unk_15 += param2; break; - case 19: + case MON_DATA_COOL: if ((v2->unk_16 + param2) > 255) { v2->unk_16 = 255; } else { v2->unk_16 += param2; } break; - case 20: + case MON_DATA_BEAUTY: if ((v2->unk_17 + param2) > 255) { v2->unk_17 = 255; } else { v2->unk_17 += param2; } break; - case 21: + case MON_DATA_CUTE: if ((v2->unk_18 + param2) > 255) { v2->unk_18 = 255; } else { v2->unk_18 += param2; } break; - case 22: + case MON_DATA_SMART: if ((v2->unk_19 + param2) > 255) { v2->unk_19 = 255; } else { v2->unk_19 += param2; } break; - case 23: + case MON_DATA_TOUGH: if ((v2->unk_1A + param2) > 255) { v2->unk_1A = 255; } else { v2->unk_1A += param2; } break; - case 24: + case MON_DATA_SHEEN: if ((v2->unk_1B + param2) > 255) { v2->unk_1B = 255; } else { v2->unk_1B += param2; } break; - case 58: - case 59: - case 60: - case 61: + case MON_DATA_58: + case MON_DATA_59: + case MON_DATA_60: + case MON_DATA_61: if ((v3->unk_08[param1 - 58] + param2) > MoveTable_GetMoveMaxPP(v3->unk_00[param1 - 58], v3->unk_0C[param1 - 58])) { v3->unk_08[param1 - 58] = MoveTable_GetMoveMaxPP(v3->unk_00[param1 - 58], v3->unk_0C[param1 - 58]); } else { v3->unk_08[param1 - 58] += param2; } break; - case 62: - case 63: - case 64: - case 65: + case MON_DATA_62: + case MON_DATA_63: + case MON_DATA_64: + case MON_DATA_65: if ((v3->unk_0C[param1 - 62] + param2) > 3) { v3->unk_0C[param1 - 62] = 3; } else { v3->unk_0C[param1 - 62] += param2; } break; - case 66: - case 67: - case 68: - case 69: + case MON_DATA_66: + case MON_DATA_67: + case MON_DATA_68: + case MON_DATA_69: break; - case 70: + case MON_DATA_HP_IV: if ((v3->unk_10_0 + param2) > 31) { v3->unk_10_0 = 31; } else { v3->unk_10_0 += param2; } break; - case 71: + case MON_DATA_ATK_IV: if ((v3->unk_10_5 + param2) > 31) { v3->unk_10_5 = 31; } else { v3->unk_10_5 += param2; } break; - case 72: + case MON_DATA_DEF_IV: if ((v3->unk_10_10 + param2) > 31) { v3->unk_10_10 = 31; } else { v3->unk_10_10 += param2; } break; - case 73: + case MON_DATA_SPEED_IV: if ((v3->unk_10_15 + param2) > 31) { v3->unk_10_15 = 31; } else { v3->unk_10_15 += param2; } break; - case 74: + case MON_DATA_SPATK_IV: if ((v3->unk_10_20 + param2) > 31) { v3->unk_10_20 = 31; } else { v3->unk_10_20 += param2; } break; - case 75: + case MON_DATA_SPDEF_IV: if ((v3->unk_10_25 + param2) > 31) { v3->unk_10_25 = 31; } else { v3->unk_10_25 += param2; } break; - case 0: - case 1: - case 2: - case 4: - case 5: - case 6: - case 7: - case 10: - case 11: - case 12: - case 25: - case 26: - case 27: - case 28: - case 29: - case 30: - case 31: - case 32: - case 33: - case 34: - case 35: - case 36: - case 37: - case 38: - case 39: - case 40: - case 41: - case 42: - case 43: - case 44: - case 45: - case 46: - case 47: - case 48: - case 49: - case 50: - case 51: - case 52: - case 53: - case 54: - case 55: - case 56: - case 57: - case 76: - case 77: - case 78: - case 79: - case 80: - case 81: - case 82: - case 83: - case 84: - case 85: - case 86: - case 87: - case 88: - case 89: - case 90: - case 91: - case 92: - case 93: - case 94: - case 95: - case 96: - case 97: - case 98: - case 99: - case 100: - case 101: - case 102: - case 103: - case 104: - case 105: - case 106: - case 107: - case 108: - case 109: - case 110: - case 111: - case 112: - case 113: - case 114: - case 117: - case 119: - case 120: - case 121: - case 122: - case 123: - case 124: - case 125: - case 126: - case 127: - case 128: - case 129: - case 130: - case 131: - case 132: - case 133: - case 134: - case 135: - case 136: - case 137: - case 138: - case 139: - case 140: - case 141: - case 142: - case 143: - case 144: - case 145: - case 146: - case 147: - case 148: - case 149: - case 150: - case 151: - case 152: - case 153: - case 154: - case 155: - case 156: - case 157: - case 158: - case 159: - case 175: - case 176: - case 177: - case 178: - case 179: + case MON_DATA_PERSONALITY: + case MON_DATA_1: + case MON_DATA_2: + case MON_DATA_4: + case MON_DATA_SPECIES: + case MON_DATA_HELD_ITEM: + case MON_DATA_OT_ID: + case MON_DATA_10: + case MON_DATA_11: + case MON_DATA_LANGUAGE: + case MON_DATA_25: + case MON_DATA_26: + case MON_DATA_27: + case MON_DATA_28: + case MON_DATA_29: + case MON_DATA_30: + case MON_DATA_31: + case MON_DATA_32: + case MON_DATA_33: + case MON_DATA_34: + case MON_DATA_35: + case MON_DATA_36: + case MON_DATA_37: + case MON_DATA_38: + case MON_DATA_39: + case MON_DATA_40: + case MON_DATA_41: + case MON_DATA_42: + case MON_DATA_43: + case MON_DATA_44: + case MON_DATA_45: + case MON_DATA_46: + case MON_DATA_47: + case MON_DATA_48: + case MON_DATA_49: + case MON_DATA_50: + case MON_DATA_51: + case MON_DATA_52: + case MON_DATA_53: + case MON_DATA_MOVE1: + case MON_DATA_MOVE2: + case MON_DATA_MOVE3: + case MON_DATA_MOVE4: + case MON_DATA_IS_EGG: + case MON_DATA_77: + case MON_DATA_78: + case MON_DATA_79: + case MON_DATA_80: + case MON_DATA_81: + case MON_DATA_82: + case MON_DATA_83: + case MON_DATA_84: + case MON_DATA_85: + case MON_DATA_86: + case MON_DATA_87: + case MON_DATA_88: + case MON_DATA_89: + case MON_DATA_90: + case MON_DATA_91: + case MON_DATA_92: + case MON_DATA_93: + case MON_DATA_94: + case MON_DATA_95: + case MON_DATA_96: + case MON_DATA_97: + case MON_DATA_CHAMPION_RIBBON: + case MON_DATA_WINNING_RIBBON: + case MON_DATA_VICTORY_RIBBON: + case MON_DATA_ARTIST_RIBBON: + case MON_DATA_EFFORT_RIBBON: + case MON_DATA_MARINE_RIBBON: + case MON_DATA_LAND_RIBBON: + case MON_DATA_SKY_RIBBON: + case MON_DATA_COUNTRY_RIBBON: + case MON_DATA_NATIONAL_RIBBON: + case MON_DATA_EARTH_RIBBON: + case MON_DATA_WORLD_RIBBON: + case MON_DATA_FATEFUL_ENCOUNTER: + case MON_DATA_111: + case MON_DATA_FORM: + case MON_DATA_113: + case MON_DATA_114: + case MON_DATA_117: + case MON_DATA_119: + case MON_DATA_120: + case MON_DATA_121: + case MON_DATA_MET_GAME: + case MON_DATA_123: + case MON_DATA_124: + case MON_DATA_125: + case MON_DATA_126: + case MON_DATA_127: + case MON_DATA_128: + case MON_DATA_129: + case MON_DATA_130: + case MON_DATA_131: + case MON_DATA_132: + case MON_DATA_133: + case MON_DATA_134: + case MON_DATA_135: + case MON_DATA_136: + case MON_DATA_137: + case MON_DATA_138: + case MON_DATA_139: + case MON_DATA_140: + case MON_DATA_141: + case MON_DATA_142: + case MON_DATA_143: + case MON_DATA_144: + case MON_DATA_145: + case MON_DATA_146: + case MON_DATA_147: + case MON_DATA_148: + case MON_DATA_149: + case MON_DATA_150: + case MON_DATA_151: + case MON_DATA_152: + case MON_DATA_153: + case MON_DATA_POKERUS: + case MON_DATA_POKEBALL: + case MON_DATA_MET_LEVEL: + case MON_DATA_OT_GENDER: + case MON_DATA_158: + case MON_DATA_159: + case MON_DATA_175: + case MON_DATA_176: + case MON_DATA_177: + case MON_DATA_178: + case MON_DATA_179: default: GF_ASSERT(0); break; @@ -2140,7 +2138,7 @@ u32 sub_020759F0 (int param0, int param1) return v0; } -u8 sub_02075A10 (UnkStruct_02073C74 * param0) +u8 sub_02075A10 (Pokemon * param0) { u16 v0; u8 v1; @@ -2151,11 +2149,11 @@ u8 sub_02075A10 (UnkStruct_02073C74 * param0) BOOL v6; v6 = sub_02073C88(param0); - v0 = sub_02074470(param0, 5, NULL); - v1 = sub_02074470(param0, 161, NULL); + v0 = GetMonData(param0, MON_DATA_SPECIES, NULL); + v1 = GetMonData(param0, MON_DATA_161, NULL); v2 = sub_02075AD0(v0, v1); v4 = sub_02075AD0(v0, v1 + 1); - v3 = sub_02074470(param0, 8, NULL); + v3 = GetMonData(param0, MON_DATA_EXP, NULL); sub_02073CD4(param0, v6); v5 = ((v3 - v2) * 100) / (v4 - v2); @@ -2163,23 +2161,23 @@ u8 sub_02075A10 (UnkStruct_02073C74 * param0) return v5; } -u32 sub_02075A70 (UnkStruct_02073C74 * param0) +u32 sub_02075A70 (Pokemon * param0) { - return sub_02075A78(¶m0->unk_00); + return sub_02075A78(¶m0->box); } -u32 sub_02075A78 (UnkStruct_02073C74_sub1 * param0) +u32 sub_02075A78 (BoxPokemon * param0) { - u16 v0 = sub_02074570(param0, 5, NULL); + u16 v0 = sub_02074570(param0, MON_DATA_SPECIES, NULL); u16 v1 = sub_02075B40(param0) + 1; - u32 v2 = sub_02074570(param0, 8, NULL); + u32 v2 = sub_02074570(param0, MON_DATA_EXP, NULL); return sub_02075AD0(v0, v1) - v2; } -u32 sub_02075AAC (UnkStruct_02073C74 * param0) +u32 sub_02075AAC (Pokemon * param0) { - return sub_02075AD0(sub_02074470(param0, 5, NULL), sub_02074470(param0, 161, NULL)); + return sub_02075AD0(GetMonData(param0, MON_DATA_SPECIES, NULL), GetMonData(param0, MON_DATA_161, NULL)); } u32 sub_02075AD0 (int param0, int param1) @@ -2210,20 +2208,20 @@ u32 sub_02075B00 (int param0, int param1) return v0; } -u32 sub_02075B38 (UnkStruct_02073C74 * param0) +u32 sub_02075B38 (Pokemon * param0) { - return sub_02075B40(¶m0->unk_00); + return sub_02075B40(¶m0->box); } -u32 sub_02075B40 (UnkStruct_02073C74_sub1 * param0) +u32 sub_02075B40 (BoxPokemon * param0) { int v0; u32 v1; BOOL v2; v2 = sub_02073D20(param0); - v0 = sub_02074570(param0, 5, 0); - v1 = sub_02074570(param0, 8, 0); + v0 = sub_02074570(param0, MON_DATA_SPECIES, 0); + v1 = sub_02074570(param0, MON_DATA_EXP, 0); sub_02073D48(param0, v2); @@ -2260,25 +2258,25 @@ u32 sub_02075B9C (UnkStruct_02075874 * param0, u16 param1, u32 param2) return v2 - 1; } -u8 sub_02075BCC (UnkStruct_02073C74 * param0) +u8 sub_02075BCC (Pokemon * param0) { - return sub_02075BD4(¶m0->unk_00); + return sub_02075BD4(¶m0->box); } -u8 sub_02075BD4 (UnkStruct_02073C74_sub1 * param0) +u8 sub_02075BD4 (BoxPokemon * param0) { BOOL v0; u32 v1; v0 = sub_02073D20(param0); - v1 = sub_02074570(param0, 0, 0); + v1 = sub_02074570(param0, MON_DATA_PERSONALITY, 0); sub_02073D48(param0, v0); - return sub_02075BFC(v1); + return GetNatureFromPersonality(v1); } -u8 sub_02075BFC (u32 param0) +u8 GetNatureFromPersonality (u32 param0) { return (u8)(param0 % 25); } @@ -2354,7 +2352,7 @@ static const s8 Unk_020F05A0[][3] = { {0x3, 0x2, 0x1} }; -void sub_02075C74 (UnkStruct_02073C74 * param0, u8 param1, u16 param2) +void sub_02075C74 (Pokemon * param0, u8 param1, u16 param2) { u16 v0; u16 v1; @@ -2369,16 +2367,16 @@ void sub_02075C74 (UnkStruct_02073C74 * param0, u8 param1, u16 param2) } } - v0 = sub_02074470(param0, 174, NULL); + v0 = GetMonData(param0, MON_DATA_SPECIES_EGG, NULL); if ((v0 == 0) || (v0 == 494)) { return; } - v1 = sub_02074470(param0, 6, NULL); + v1 = GetMonData(param0, MON_DATA_HELD_ITEM, NULL); v5 = Item_GetAttribute(v1, 1, 0); v4 = 0; - v2 = sub_02074470(param0, 9, NULL); + v2 = GetMonData(param0, MON_DATA_FRIENDSHIP, NULL); if (v2 >= 100) { v4++; @@ -2390,11 +2388,11 @@ void sub_02075C74 (UnkStruct_02073C74 * param0, u8 param1, u16 param2) v3 = Unk_020F05A0[param1][v4]; - if ((v3 > 0) && (sub_02074470(param0, 155, NULL) == 11)) { + if ((v3 > 0) && (GetMonData(param0, MON_DATA_POKEBALL, NULL) == 11)) { v3++; } - if ((v3 > 0) && (sub_02074470(param0, 152, NULL) == param2)) { + if ((v3 > 0) && (GetMonData(param0, MON_DATA_152, NULL) == param2)) { v3++; } @@ -2417,20 +2415,20 @@ void sub_02075C74 (UnkStruct_02073C74 * param0, u8 param1, u16 param2) sub_02074B30(param0, 9, (u8 *)&v2); } -u8 sub_02075D6C (UnkStruct_02073C74 * param0) +u8 sub_02075D6C (Pokemon * param0) { - return sub_02075D74((UnkStruct_02073C74_sub1 *)¶m0->unk_00); + return sub_02075D74((BoxPokemon *)¶m0->box); } -u8 sub_02075D74 (UnkStruct_02073C74_sub1 * param0) +u8 sub_02075D74 (BoxPokemon * param0) { u16 v0; u32 v1; int v2; v2 = sub_02073D20(param0); - v0 = sub_02074570(param0, 5, 0); - v1 = sub_02074570(param0, 0, 0); + v0 = sub_02074570(param0, MON_DATA_SPECIES, 0); + v1 = sub_02074570(param0, MON_DATA_PERSONALITY, 0); sub_02073D48(param0, v2); @@ -2470,18 +2468,18 @@ u8 sub_02075DD0 (UnkStruct_02075874 * param0, u16 param1, u32 param2) } } -u8 sub_02075E0C (UnkStruct_02073C74 * param0) +u8 sub_02075E0C (Pokemon * param0) { - return sub_02075E14(¶m0->unk_00); + return sub_02075E14(¶m0->box); } -u8 sub_02075E14 (UnkStruct_02073C74_sub1 * param0) +u8 sub_02075E14 (BoxPokemon * param0) { u32 v0; u32 v1; - v0 = sub_02074570(param0, 7, 0); - v1 = sub_02074570(param0, 0, 0); + v0 = sub_02074570(param0, MON_DATA_OT_ID, 0); + v1 = sub_02074570(param0, MON_DATA_PERSONALITY, 0); return sub_02075E38(v0, v1); } @@ -2523,17 +2521,17 @@ u32 sub_02075E64 (u32 param0) return v1; } -void sub_02075EF4 (UnkStruct_02008A90 * param0, UnkStruct_02073C74 * param1, u8 param2) +void sub_02075EF4 (UnkStruct_02008A90 * param0, Pokemon * param1, u8 param2) { - sub_02075F0C(param0, ¶m1->unk_00, param2, 0); + sub_02075F0C(param0, ¶m1->box, param2, 0); } -void sub_02075F00 (UnkStruct_02008A90 * param0, UnkStruct_02073C74 * param1, u8 param2) +void sub_02075F00 (UnkStruct_02008A90 * param0, Pokemon * param1, u8 param2) { - sub_02075F0C(param0, ¶m1->unk_00, param2, 1); + sub_02075F0C(param0, ¶m1->box, param2, 1); } -void sub_02075F0C (UnkStruct_02008A90 * param0, UnkStruct_02073C74_sub1 * param1, u8 param2, int param3) +void sub_02075F0C (UnkStruct_02008A90 * param0, BoxPokemon * param1, u8 param2, int param3) { BOOL v0; u16 v1; @@ -2541,19 +2539,19 @@ void sub_02075F0C (UnkStruct_02008A90 * param0, UnkStruct_02073C74_sub1 * param1 u32 v5; v0 = sub_02073D20(param1); - v1 = sub_02074570(param1, 174, NULL); + v1 = sub_02074570(param1, MON_DATA_SPECIES_EGG, NULL); v2 = sub_02075D74(param1); v3 = sub_02075E14(param1); - v5 = sub_02074570(param1, 0, NULL); + v5 = sub_02074570(param1, MON_DATA_PERSONALITY, NULL); if (v1 == 494) { - if (sub_02074570(param1, 5, NULL) == 490) { + if (sub_02074570(param1, MON_DATA_SPECIES, NULL) == 490) { v4 = 1; } else { v4 = 0; } } else { - v4 = sub_02074570(param1, 112, NULL); + v4 = sub_02074570(param1, MON_DATA_FORM, NULL); } if (param3 == 1) { @@ -2570,7 +2568,7 @@ void sub_02075FB4 (UnkStruct_02008A90 * param0, u16 param1, u8 param2, u8 param3 param0->unk_06 = 0; param0->unk_08 = 0; param0->unk_0C = 0; - param5 = sub_020761E8(param1, param5); + param5 = SanitizeFormId(param1, param5); switch (param1) { case 412: @@ -2658,7 +2656,7 @@ void sub_02075FB4 (UnkStruct_02008A90 * param0, u16 param1, u8 param2, u8 param3 } } -u8 sub_020761E8 (u16 param0, u8 param1) +u8 SanitizeFormId (u16 param0, u8 param1) { switch (param0) { case 412: @@ -2738,7 +2736,7 @@ static void sub_02076300 (UnkStruct_02008A90 * param0, u16 param1, u8 param2, u8 param0->unk_08 = 0; param0->unk_0C = 0; - param5 = sub_020761E8(param1, param5); + param5 = SanitizeFormId(param1, param5); switch (param1) { case 412: @@ -2844,35 +2842,35 @@ static void sub_02076300 (UnkStruct_02008A90 * param0, u16 param1, u8 param2, u8 } } -u8 sub_020765AC (UnkStruct_02073C74 * param0, u8 param1) +u8 sub_020765AC (Pokemon * param0, u8 param1) { - return sub_020765C4(¶m0->unk_00, param1, 0); + return sub_020765C4(¶m0->box, param1, 0); } -u8 sub_020765B8 (UnkStruct_02073C74 * param0, u8 param1) +u8 sub_020765B8 (Pokemon * param0, u8 param1) { - return sub_020765C4(¶m0->unk_00, param1, 1); + return sub_020765C4(¶m0->box, param1, 1); } -u8 sub_020765C4 (UnkStruct_02073C74_sub1 * param0, u8 param1, int param2) +u8 sub_020765C4 (BoxPokemon * param0, u8 param1, int param2) { u16 v0; u8 v1; u8 v2; u32 v3; - v0 = sub_02074570(param0, 174, NULL); + v0 = sub_02074570(param0, MON_DATA_SPECIES_EGG, NULL); v1 = sub_02075D74(param0); - v3 = sub_02074570(param0, 0, NULL); + v3 = sub_02074570(param0, MON_DATA_PERSONALITY, NULL); if (v0 == 494) { - if (sub_02074570(param0, 5, NULL) == 490) { + if (sub_02074570(param0, MON_DATA_SPECIES, NULL) == 490) { v2 = 1; } else { v2 = 0; } } else { - v2 = sub_02074570(param0, 112, NULL); + v2 = sub_02074570(param0, MON_DATA_FORM, NULL); } if (param2 == 1) { @@ -2888,7 +2886,7 @@ u8 sub_02076648 (u16 param0, u8 param1, u8 param2, u8 param3, u32 param4) int v1; u8 v2; - param3 = sub_020761E8(param0, param3); + param3 = SanitizeFormId(param0, param3); switch (param0) { case 412: @@ -2964,7 +2962,7 @@ static u8 sub_020767BC (u16 param0, u8 param1, u8 param2, u8 param3, u32 param4) int v1; u8 v2; - param3 = sub_020761E8(param0, param3); + param3 = SanitizeFormId(param0, param3); switch (param0) { case 412: @@ -3143,30 +3141,30 @@ void sub_02076AAC (int param0, int param1, UnkStruct_ov5_021DE5D0 * param2) u32 sub_02076AF0 (void) { - return (u32)sizeof(UnkStruct_02073C74); + return (u32)sizeof(Pokemon); } u32 sub_02076AF4 (void) { - return (u32)sizeof(UnkStruct_02073C74_sub1); + return (u32)sizeof(BoxPokemon); } -u8 sub_02076AF8 (UnkStruct_02073C74 * param0) +u8 sub_02076AF8 (Pokemon * param0) { - return sub_02076B00((UnkStruct_02073C74_sub1 *)¶m0->unk_00); + return sub_02076B00((BoxPokemon *)¶m0->box); } -u8 sub_02076B00 (UnkStruct_02073C74_sub1 * param0) +u8 sub_02076B00 (BoxPokemon * param0) { - return sub_02074570(param0, 112, NULL); + return sub_02074570(param0, MON_DATA_FORM, NULL); } -UnkStruct_02073C74_sub1 * sub_02076B10 (UnkStruct_02073C74 * param0) +BoxPokemon * sub_02076B10 (Pokemon * param0) { - return ¶m0->unk_00; + return ¶m0->box; } -u8 sub_02076B14 (UnkStruct_02073C74 * param0) +u8 sub_02076B14 (Pokemon * param0) { u16 v0; u8 v1; @@ -3174,9 +3172,9 @@ u8 sub_02076B14 (UnkStruct_02073C74 * param0) u32 v3; int v4; - v0 = sub_02074470(param0, 5, NULL); - v1 = sub_02074470(param0, 161, NULL) + 1; - v2 = sub_02074470(param0, 8, NULL); + v0 = GetMonData(param0, MON_DATA_SPECIES, NULL); + v1 = GetMonData(param0, MON_DATA_161, NULL) + 1; + v2 = GetMonData(param0, MON_DATA_EXP, NULL); v4 = sub_020759F0(v0, 21); v3 = sub_02075B00(v4, 100); @@ -3199,7 +3197,7 @@ u8 sub_02076B14 (UnkStruct_02073C74 * param0) return 0; } -u16 sub_02076B94 (Party * param0, UnkStruct_02073C74 * param1, u8 param2, u16 param3, int * param4) +u16 sub_02076B94 (Party * param0, Pokemon * param1, u8 param2, u16 param3, int * param4) { u16 v0; u16 v1; @@ -3214,10 +3212,10 @@ u16 sub_02076B94 (Party * param0, UnkStruct_02073C74 * param1, u8 param2, u16 pa UnkStruct_0207821C * v10; int v11; - v0 = sub_02074470(param1, 5, NULL); - v1 = sub_02074470(param1, 6, NULL); - v6 = sub_02074470(param1, 0, NULL); - v8 = sub_02074470(param1, 20, NULL); + v0 = GetMonData(param1, MON_DATA_SPECIES, NULL); + v1 = GetMonData(param1, MON_DATA_HELD_ITEM, NULL); + v6 = GetMonData(param1, MON_DATA_PERSONALITY, NULL); + v8 = GetMonData(param1, MON_DATA_BEAUTY, NULL); v9 = (v6 & 0xffff0000) >> 16; v7 = Item_GetAttribute(v1, 1, 0); @@ -3236,8 +3234,8 @@ u16 sub_02076B94 (Party * param0, UnkStruct_02073C74 * param1, u8 param2, u16 pa switch (param2) { case 0: - v2 = sub_02074470(param1, 161, NULL); - v5 = sub_02074470(param1, 9, NULL); + v2 = GetMonData(param1, MON_DATA_161, NULL); + v5 = GetMonData(param1, MON_DATA_FRIENDSHIP, NULL); for (v3 = 0; v3 < 7; v3++) { switch (v10->unk_00[v3].unk_00) { @@ -3267,7 +3265,7 @@ u16 sub_02076B94 (Party * param0, UnkStruct_02073C74 * param1, u8 param2, u16 pa break; case 8: if (v10->unk_00[v3].unk_02 <= v2) { - if ((sub_02074470(param1, 165, NULL)) > (sub_02074470(param1, 166, NULL))) { + if ((GetMonData(param1, MON_DATA_165, NULL)) > (GetMonData(param1, MON_DATA_166, NULL))) { v4 = v10->unk_00[v3].unk_04; param4[0] = 8; } @@ -3275,7 +3273,7 @@ u16 sub_02076B94 (Party * param0, UnkStruct_02073C74 * param1, u8 param2, u16 pa break; case 9: if (v10->unk_00[v3].unk_02 <= v2) { - if ((sub_02074470(param1, 165, NULL)) == (sub_02074470(param1, 166, NULL))) { + if ((GetMonData(param1, MON_DATA_165, NULL)) == (GetMonData(param1, MON_DATA_166, NULL))) { v4 = v10->unk_00[v3].unk_04; param4[0] = 9; } @@ -3283,7 +3281,7 @@ u16 sub_02076B94 (Party * param0, UnkStruct_02073C74 * param1, u8 param2, u16 pa break; case 10: if (v10->unk_00[v3].unk_02 <= v2) { - if ((sub_02074470(param1, 165, NULL)) < (sub_02074470(param1, 166, NULL))) { + if ((GetMonData(param1, MON_DATA_165, NULL)) < (GetMonData(param1, MON_DATA_166, NULL))) { v4 = v10->unk_00[v3].unk_04; param4[0] = 10; } @@ -3347,13 +3345,13 @@ u16 sub_02076B94 (Party * param0, UnkStruct_02073C74 * param1, u8 param2, u16 pa } break; case 22: - if ((sub_02074470(param1, 111, NULL) == 0) && (v10->unk_00[v3].unk_02 <= v2)) { + if ((GetMonData(param1, MON_DATA_111, NULL) == 0) && (v10->unk_00[v3].unk_02 <= v2)) { v4 = v10->unk_00[v3].unk_04; param4[0] = 22; } break; case 23: - if ((sub_02074470(param1, 111, NULL) == 1) && (v10->unk_00[v3].unk_02 <= v2)) { + if ((GetMonData(param1, MON_DATA_111, NULL) == 1) && (v10->unk_00[v3].unk_02 <= v2)) { v4 = v10->unk_00[v3].unk_04; param4[0] = 23; } @@ -3412,13 +3410,13 @@ u16 sub_02076B94 (Party * param0, UnkStruct_02073C74 * param1, u8 param2, u16 pa break; } - if ((v10->unk_00[v3].unk_00 == 16) && (sub_02074470(param1, 111, NULL) == 0) && (v10->unk_00[v3].unk_02 == param3)) { + if ((v10->unk_00[v3].unk_00 == 16) && (GetMonData(param1, MON_DATA_111, NULL) == 0) && (v10->unk_00[v3].unk_02 == param3)) { v4 = v10->unk_00[v3].unk_04; param4[0] = 0; break; } - if ((v10->unk_00[v3].unk_00 == 17) && (sub_02074470(param1, 111, NULL) == 1) && (v10->unk_00[v3].unk_02 == param3)) { + if ((v10->unk_00[v3].unk_00 == 17) && (GetMonData(param1, MON_DATA_111, NULL) == 1) && (v10->unk_00[v3].unk_02 == param3)) { v4 = v10->unk_00[v3].unk_04; param4[0] = 0; break; @@ -3470,7 +3468,7 @@ u16 sub_02076FD4 (const u16 param0) return sub_02076F84(param0); } -void sub_02077020 (UnkStruct_02073C74_sub1 * param0) +void sub_02077020 (BoxPokemon * param0) { BOOL v0; int v1; @@ -3482,8 +3480,8 @@ void sub_02077020 (UnkStruct_02073C74_sub1 * param0) u16 * v7 = Heap_AllocFromHeap(0, 44); v0 = sub_02073D20(param0); - v2 = sub_02074570(param0, 5, 0); - v4 = sub_02074570(param0, 112, 0); + v2 = sub_02074570(param0, MON_DATA_SPECIES, 0); + v4 = sub_02074570(param0, MON_DATA_FORM, 0); v6 = sub_02075B40(param0); sub_02077D28(v2, v4, v7); @@ -3509,13 +3507,13 @@ void sub_02077020 (UnkStruct_02073C74_sub1 * param0) sub_02073D48(param0, v0); } -u16 sub_020770C4 (UnkStruct_02073C74 * param0, u16 param1) +u16 sub_020770C4 (Pokemon * param0, u16 param1) { - UnkStruct_02073C74_sub1 * v0 = sub_02076B10(param0); + BoxPokemon * v0 = sub_02076B10(param0); return sub_020770D4(v0, param1); } -u16 sub_020770D4 (UnkStruct_02073C74_sub1 * param0, u16 param1) +u16 sub_020770D4 (BoxPokemon * param0, u16 param1) { int v0; u8 v1; @@ -3528,7 +3526,7 @@ u16 sub_020770D4 (UnkStruct_02073C74_sub1 * param0, u16 param1) v4 = sub_02073D20(param0); for (v0 = 0; v0 < 4; v0++) { - if ((v2 = sub_02074570(param0, 54 + v0, NULL)) == 0) { + if ((v2 = sub_02074570(param0, MON_DATA_MOVE1 + v0, NULL)) == 0) { sub_02077238(param0, param1, v0); v3 = param1; break; @@ -3545,13 +3543,13 @@ u16 sub_020770D4 (UnkStruct_02073C74_sub1 * param0, u16 param1) return v3; } -void sub_02077134 (UnkStruct_02073C74 * param0, u16 param1) +void sub_02077134 (Pokemon * param0, u16 param1) { - UnkStruct_02073C74_sub1 * v0 = sub_02076B10(param0); + BoxPokemon * v0 = sub_02076B10(param0); sub_02077144(v0, param1); } -void sub_02077144 (UnkStruct_02073C74_sub1 * param0, u16 param1) +void sub_02077144 (BoxPokemon * param0, u16 param1) { int v0; u16 v1[4]; @@ -3572,15 +3570,15 @@ void sub_02077144 (UnkStruct_02073C74_sub1 * param0, u16 param1) v3[3] = 0; for (v0 = 0; v0 < 4; v0++) { - sub_02074C60(param0, 54 + v0, (u8 *)&v1[v0]); - sub_02074C60(param0, 58 + v0, (u8 *)&v2[v0]); - sub_02074C60(param0, 62 + v0, (u8 *)&v3[v0]); + SetBoxMonData(param0, 54 + v0, (u8 *)&v1[v0]); + SetBoxMonData(param0, 58 + v0, (u8 *)&v2[v0]); + SetBoxMonData(param0, 62 + v0, (u8 *)&v3[v0]); } sub_02073D48(param0, v4); } -void sub_020771F8 (UnkStruct_02073C74 * param0, u16 param1, u8 param2) +void sub_020771F8 (Pokemon * param0, u16 param1, u8 param2) { u32 v0, v1; @@ -3595,25 +3593,25 @@ void sub_020771F8 (UnkStruct_02073C74 * param0, u16 param1, u8 param2) return; } -void sub_02077230 (UnkStruct_02073C74 * param0, u16 param1, u8 param2) +void sub_02077230 (Pokemon * param0, u16 param1, u8 param2) { - sub_02077238(¶m0->unk_00, param1, param2); + sub_02077238(¶m0->box, param1, param2); } -void sub_02077238 (UnkStruct_02073C74_sub1 * param0, u16 param1, u8 param2) +void sub_02077238 (BoxPokemon * param0, u16 param1, u8 param2) { u8 v0; u8 v1; - sub_02074C60(param0, 54 + param2, (u8 *)¶m1); + SetBoxMonData(param0, 54 + param2, (u8 *)¶m1); v1 = sub_02074570(param0, 62 + param2, NULL); v0 = MoveTable_GetMoveMaxPP(param1, v1); - sub_02074C60(param0, 58 + param2, (u8 *)&v0); + SetBoxMonData(param0, 58 + param2, (u8 *)&v0); } -u16 sub_0207727C (UnkStruct_02073C74 * param0, int * param1, u16 * param2) +u16 sub_0207727C (Pokemon * param0, int * param1, u16 * param2) { u16 v0 = 0x0; u16 v1; @@ -3621,9 +3619,9 @@ u16 sub_0207727C (UnkStruct_02073C74 * param0, int * param1, u16 * param2) u8 v3; u16 * v4 = Heap_AllocFromHeap(0, 44); - v1 = sub_02074470(param0, 5, NULL); - v2 = sub_02074470(param0, 112, NULL); - v3 = sub_02074470(param0, 161, NULL); + v1 = GetMonData(param0, MON_DATA_SPECIES, NULL); + v2 = GetMonData(param0, MON_DATA_FORM, NULL); + v3 = GetMonData(param0, MON_DATA_161, NULL); sub_02077D28(v1, v2, v4); @@ -3653,12 +3651,12 @@ u16 sub_0207727C (UnkStruct_02073C74 * param0, int * param1, u16 * param2) return v0; } -void sub_02077344 (UnkStruct_02073C74 * param0, int param1, int param2) +void sub_02077344 (Pokemon * param0, int param1, int param2) { - sub_0207734C(¶m0->unk_00, param1, param2); + sub_0207734C(¶m0->box, param1, param2); } -void sub_0207734C (UnkStruct_02073C74_sub1 * param0, int param1, int param2) +void sub_0207734C (BoxPokemon * param0, int param1, int param2) { u16 v0[2]; u8 v1[2]; @@ -3671,15 +3669,15 @@ void sub_0207734C (UnkStruct_02073C74_sub1 * param0, int param1, int param2) v1[1] = sub_02074570(param0, 58 + param2, NULL); v2[1] = sub_02074570(param0, 62 + param2, NULL); - sub_02074C60(param0, 54 + param1, (u8 *)&v0[1]); - sub_02074C60(param0, 58 + param1, (u8 *)&v1[1]); - sub_02074C60(param0, 62 + param1, (u8 *)&v2[1]); - sub_02074C60(param0, 54 + param2, (u8 *)&v0[0]); - sub_02074C60(param0, 58 + param2, (u8 *)&v1[0]); - sub_02074C60(param0, 62 + param2, (u8 *)&v2[0]); + SetBoxMonData(param0, 54 + param1, (u8 *)&v0[1]); + SetBoxMonData(param0, 58 + param1, (u8 *)&v1[1]); + SetBoxMonData(param0, 62 + param1, (u8 *)&v2[1]); + SetBoxMonData(param0, 54 + param2, (u8 *)&v0[0]); + SetBoxMonData(param0, 58 + param2, (u8 *)&v1[0]); + SetBoxMonData(param0, 62 + param2, (u8 *)&v2[0]); } -void sub_02077408 (UnkStruct_02073C74 * param0, u32 param1) +void sub_02077408 (Pokemon * param0, u32 param1) { u32 v0; u16 v1; @@ -3687,9 +3685,9 @@ void sub_02077408 (UnkStruct_02073C74 * param0, u32 param1) u8 v3; for (v0 = param1; v0 < 3; v0++) { - v1 = sub_02074470(param0, 54 + v0 + 1, NULL); - v2 = sub_02074470(param0, 58 + v0 + 1, NULL); - v3 = sub_02074470(param0, 62 + v0 + 1, NULL); + v1 = GetMonData(param0, 54 + v0 + 1, NULL); + v2 = GetMonData(param0, 58 + v0 + 1, NULL); + v3 = GetMonData(param0, 62 + v0 + 1, NULL); sub_02074B30(param0, 54 + v0, (u8 *)&v1); sub_02074B30(param0, 58 + v0, (u8 *)&v2); @@ -3705,12 +3703,12 @@ void sub_02077408 (UnkStruct_02073C74 * param0, u32 param1) sub_02074B30(param0, 65, (u8 *)&v3); } -BOOL sub_0207749C (UnkStruct_02073C74 * param0, u16 param1) +BOOL sub_0207749C (Pokemon * param0, u16 param1) { int v0; for (v0 = 0; v0 < 4; v0++) { - if (sub_02074470(param0, 54 + v0, NULL) == param1) { + if (GetMonData(param0, MON_DATA_MOVE1 + v0, NULL) == param1) { break; } } @@ -3718,16 +3716,16 @@ BOOL sub_0207749C (UnkStruct_02073C74 * param0, u16 param1) return v0 != 4; } -void sub_020774C8 (UnkStruct_02073C74_sub1 * param0, UnkStruct_02073C74 * param1) +void sub_020774C8 (BoxPokemon * param0, Pokemon * param1) { u32 v0 = 0; UnkStruct_0202818C * v1; UnkStruct_0202CA28 v2; - param1->unk_00 = *param0; + param1->box = *param0; - if (param1->unk_00.unk_04_1) { - param1->unk_00.unk_04_0 = 1; + if (param1->box.unk_04_1) { + param1->box.unk_04_0 = 1; } sub_02074B30(param1, 160, (u8 *)&v0); @@ -3750,7 +3748,7 @@ u8 sub_02077550 (Party * param0) { u8 v0, v1; int v2, v3; - UnkStruct_02073C74 * v4; + Pokemon * v4; v3 = Party_GetCurrentCount(param0); v0 = 1; @@ -3758,8 +3756,8 @@ u8 sub_02077550 (Party * param0) for (v2 = 0; v2 < v3; v2++) { v4 = Party_GetPokemonBySlotIndex(param0, v2); - if ((sub_02074470(v4, 5, NULL)) && (sub_02074470(v4, 76, NULL) == 0)) { - v1 = sub_02074470(v4, 161, NULL); + if ((GetMonData(v4, MON_DATA_SPECIES, NULL)) && (GetMonData(v4, MON_DATA_IS_EGG, NULL) == 0)) { + v1 = GetMonData(v4, MON_DATA_161, NULL); if (v1 > v0) { v0 = v1; @@ -3790,39 +3788,39 @@ u16 sub_020775C4 (u16 param0) return v0; } -void sub_020775EC (UnkStruct_02073C74 * param0, UnkStruct_02073C74 * param1) +void sub_020775EC (Pokemon * param0, Pokemon * param1) { *param1 = *param0; return; } -void sub_02077604 (UnkStruct_02073C74_sub1 * param0, UnkStruct_02073C74_sub1 * param1) +void sub_02077604 (BoxPokemon * param0, BoxPokemon * param1) { *param1 = *param0; return; } -void sub_02077618 (UnkStruct_02073C74 * param0, UnkStruct_02073C74_sub1 * param1) +void sub_02077618 (Pokemon * param0, BoxPokemon * param1) { - *param1 = param0->unk_00; + *param1 = param0->box; return; } -s8 sub_0207762C (UnkStruct_02073C74 * param0, int param1) +s8 sub_0207762C (Pokemon * param0, int param1) { - return sub_02077634(¶m0->unk_00, param1); + return sub_02077634(¶m0->box, param1); } -s8 sub_02077634 (UnkStruct_02073C74_sub1 * param0, int param1) +s8 sub_02077634 (BoxPokemon * param0, int param1) { - return sub_02077648(sub_02074570(param0, 0, NULL), param1); + return sub_02077648(sub_02074570(param0, MON_DATA_PERSONALITY, NULL), param1); } s8 sub_02077648 (u32 param0, int param1) { u8 v0; - v0 = sub_02075BFC(param0); + v0 = GetNatureFromPersonality(param0); return Unk_020F0695[v0][param1]; } @@ -3848,7 +3846,7 @@ void sub_020776B0 (Party * param0) { u16 v0; u8 v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; int v3; int v4; @@ -3860,7 +3858,7 @@ void sub_020776B0 (Party * param0) v4 = sub_0201D2E8() % v3; v2 = Party_GetPokemonBySlotIndex(param0, v4); - if ((sub_02074470(v2, 5, NULL)) && (sub_02074470(v2, 76, NULL) == 0)) { + if ((GetMonData(v2, MON_DATA_SPECIES, NULL)) && (GetMonData(v2, MON_DATA_IS_EGG, NULL) == 0)) { break; } else { v4 = v3; @@ -3890,14 +3888,14 @@ u8 sub_02077758 (Party * param0, u8 param1) int v0 = 0; int v1 = 1; u8 v2 = 0; - UnkStruct_02073C74 * v3; + Pokemon * v3; if (param1) { do { if (param1 & 1) { v3 = Party_GetPokemonBySlotIndex(param0, v0); - if (sub_02074470(v3, 154, NULL)) { + if (GetMonData(v3, MON_DATA_POKERUS, NULL)) { v2 |= v1; } } @@ -3909,7 +3907,7 @@ u8 sub_02077758 (Party * param0, u8 param1) } else { v3 = Party_GetPokemonBySlotIndex(param0, v0); - if (sub_02074470(v3, 154, NULL)) { + if (GetMonData(v3, MON_DATA_POKERUS, NULL)) { v2++; } } @@ -3922,15 +3920,15 @@ void sub_020777B4 (Party * param0, s32 param1) int v0; int v1; u8 v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; v1 = Party_GetCurrentCount(param0); for (v0 = 0; v0 < v1; v0++) { v3 = Party_GetPokemonBySlotIndex(param0, v0); - if (sub_02074470(v3, 5, NULL)) { - v2 = sub_02074470(v3, 154, NULL); + if (GetMonData(v3, MON_DATA_SPECIES, NULL)) { + v2 = GetMonData(v3, MON_DATA_POKERUS, NULL); if (v2 & 0xf) { if (((v2 & 0xf) < param1) || (param1 > 4)) { @@ -3954,7 +3952,7 @@ void sub_0207782C (Party * param0) int v0; int v1; u8 v2; - UnkStruct_02073C74 * v3; + Pokemon * v3; v1 = Party_GetCurrentCount(param0); @@ -3962,14 +3960,14 @@ void sub_0207782C (Party * param0) for (v0 = 0; v0 < v1; v0++) { v3 = Party_GetPokemonBySlotIndex(param0, v0); - if (sub_02074470(v3, 5, NULL)) { - v2 = sub_02074470(v3, 154, NULL); + if (GetMonData(v3, MON_DATA_SPECIES, NULL)) { + v2 = GetMonData(v3, MON_DATA_POKERUS, NULL); if (v2 & 0xf) { if (v0 != 0) { v3 = Party_GetPokemonBySlotIndex(param0, v0 - 1); - if ((sub_02074470(v3, 154, NULL) & 0xf0) == 0) { + if ((GetMonData(v3, MON_DATA_POKERUS, NULL) & 0xf0) == 0) { sub_02074B30(v3, 154, (u8 *)&v2); } } @@ -3977,7 +3975,7 @@ void sub_0207782C (Party * param0) if (v0 < v1 - 1) { v3 = Party_GetPokemonBySlotIndex(param0, v0 + 1); - if ((sub_02074470(v3, 154, NULL) & 0xf0) == 0) { + if ((GetMonData(v3, MON_DATA_POKERUS, NULL) & 0xf0) == 0) { sub_02074B30(v3, 154, (u8 *)&v2); v0++; } @@ -3988,26 +3986,26 @@ void sub_0207782C (Party * param0) } } -BOOL sub_020778D8 (UnkStruct_02073C74 * param0) +BOOL sub_020778D8 (Pokemon * param0) { - return sub_020778E0(¶m0->unk_00); + return sub_020778E0(¶m0->box); } -BOOL sub_020778E0 (UnkStruct_02073C74_sub1 * param0) +BOOL sub_020778E0 (BoxPokemon * param0) { - return (sub_02074570(param0, 154, NULL) & 0xf) != 0; + return (sub_02074570(param0, MON_DATA_POKERUS, NULL) & 0xf) != 0; } -BOOL sub_020778F8 (UnkStruct_02073C74 * param0) +BOOL sub_020778F8 (Pokemon * param0) { - return sub_02077900(¶m0->unk_00); + return sub_02077900(¶m0->box); } -BOOL sub_02077900 (UnkStruct_02073C74_sub1 * param0) +BOOL sub_02077900 (BoxPokemon * param0) { u8 v0; - v0 = sub_02074570(param0, 154, NULL); + v0 = sub_02074570(param0, MON_DATA_POKERUS, NULL); if (v0 & 0xf) { return 0; @@ -4016,25 +4014,25 @@ BOOL sub_02077900 (UnkStruct_02073C74_sub1 * param0) return (v0 & 0xf0) != 0; } -void sub_02077928 (UnkStruct_02073C74 * param0) +void sub_02077928 (Pokemon * param0) { - sub_02077930(¶m0->unk_00); + sub_02077930(¶m0->box); } -void sub_02077930 (UnkStruct_02073C74_sub1 * param0) +void sub_02077930 (BoxPokemon * param0) { int v0; int v1; int v2; int v3; - v0 = sub_02074570(param0, 5, NULL); - v1 = sub_02074570(param0, 10, NULL); - v2 = sub_02074570(param0, 6, NULL); + v0 = sub_02074570(param0, MON_DATA_SPECIES, NULL); + v1 = sub_02074570(param0, MON_DATA_10, NULL); + v2 = sub_02074570(param0, MON_DATA_HELD_ITEM, NULL); if ((v0 == 493) && (v1 == 121)) { v3 = sub_02077988(Item_GetAttribute(v2, 1, 0)); - sub_02074C60(param0, 112, &v3); + SetBoxMonData(param0, 112, &v3); } } @@ -4099,11 +4097,11 @@ u8 sub_02077988 (u16 param0) return v0; } -int sub_02077A00 (UnkStruct_02073C74 * param0) +int sub_02077A00 (Pokemon * param0) { int v0; - v0 = sub_02077A1C(¶m0->unk_00); + v0 = sub_02077A1C(¶m0->box); if (v0 != -1) { sub_0207418C(param0); @@ -4112,19 +4110,19 @@ int sub_02077A00 (UnkStruct_02073C74 * param0) return v0; } -int sub_02077A1C (UnkStruct_02073C74_sub1 * param0) +int sub_02077A1C (BoxPokemon * param0) { int v0; int v1; int v2; - v0 = sub_02074570(param0, 5, NULL); - v1 = sub_02074570(param0, 6, NULL); + v0 = sub_02074570(param0, MON_DATA_SPECIES, NULL); + v1 = sub_02074570(param0, MON_DATA_HELD_ITEM, NULL); if (v0 == 487) { v2 = (v1 == 112) ? 1 : 0; - sub_02074C60(param0, 112, &v2); + SetBoxMonData(param0, 112, &v2); sub_02078044(param0); return v2; @@ -4133,13 +4131,13 @@ int sub_02077A1C (UnkStruct_02073C74_sub1 * param0) return -1; } -void sub_02077A64 (UnkStruct_02073C74 * param0) +void sub_02077A64 (Pokemon * param0) { int v0 = 1; - if (sub_02074470(param0, 5, NULL) == 487) { - sub_02074C60(¶m0->unk_00, 112, &v0); - sub_02078044(¶m0->unk_00); + if (GetMonData(param0, MON_DATA_SPECIES, NULL) == 487) { + SetBoxMonData(¶m0->box, 112, &v0); + sub_02078044(¶m0->box); sub_0207418C(param0); } } @@ -4147,7 +4145,7 @@ void sub_02077A64 (UnkStruct_02073C74 * param0) void sub_02077A9C (Party * param0, int param1) { int v0, v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; v1 = Party_GetCurrentCount(param0); @@ -4162,36 +4160,36 @@ void sub_02077A9C (Party * param0, int param1) } } -void sub_02077ACC (UnkStruct_02073C74 * param0, int param1) +void SetShayminForm (Pokemon * param0, int param1) { - sub_02077ADC(¶m0->unk_00, param1); + SetBoxShayminForm(¶m0->box, param1); sub_0207418C(param0); } -void sub_02077ADC (UnkStruct_02073C74_sub1 * param0, int param1) +void SetBoxShayminForm (BoxPokemon * param0, int param1) { int v0; - v0 = sub_02074570(param0, 5, NULL); + v0 = sub_02074570(param0, MON_DATA_SPECIES, NULL); if (v0 == 492) { GF_ASSERT(param1 <= 1); - sub_02074C60(param0, 112, ¶m1); + SetBoxMonData(param0, 112, ¶m1); sub_02078044(param0); } } -BOOL sub_02077B14 (UnkStruct_02073C74 * param0) +BOOL sub_02077B14 (Pokemon * param0) { u32 v0, v1, v2, v3, v4; RTCTime v5; - v0 = sub_02074470(param0, 5, NULL); - v1 = sub_02074470(param0, 112, NULL); - v2 = sub_02074470(param0, 160, NULL); - v3 = sub_02074470(param0, 163, NULL); - v4 = sub_02074470(param0, 110, NULL); + v0 = GetMonData(param0, MON_DATA_SPECIES, NULL); + v1 = GetMonData(param0, MON_DATA_FORM, NULL); + v2 = GetMonData(param0, MON_DATA_160, NULL); + v3 = GetMonData(param0, MON_DATA_163, NULL); + v4 = GetMonData(param0, MON_DATA_FATEFUL_ENCOUNTER, NULL); sub_02013880(&v5); @@ -4205,18 +4203,18 @@ BOOL sub_02077B14 (UnkStruct_02073C74 * param0) void sub_02077B8C (Party * param0) { int v0, v1, v2, v3; - UnkStruct_02073C74 * v4; + Pokemon * v4; int v5 = 0; v1 = Party_GetCurrentCount(param0); for (v0 = 0; v0 < v1; v0++) { v4 = Party_GetPokemonBySlotIndex(param0, v0); - v2 = sub_02074470(v4, 5, NULL); - v3 = sub_02074470(v4, 112, NULL); + v2 = GetMonData(v4, MON_DATA_SPECIES, NULL); + v3 = GetMonData(v4, MON_DATA_FORM, NULL); if ((v2 == 492) && (v3 == 1)) { - sub_02077ACC(v4, v5); + SetShayminForm(v4, v5); } } } @@ -4255,17 +4253,17 @@ BOOL sub_02077BD8 (Party * param0, int param1, const RTCTime * param2) } } -BOOL sub_02077C20 (UnkStruct_02073C74 * param0, int param1, int param2) +BOOL SetRotomForm (Pokemon * param0, int param1, int param2) { int v0, v1; - v0 = sub_02074470(param0, 5, NULL); + v0 = GetMonData(param0, MON_DATA_SPECIES, NULL); if (v0 != 479) { return 0; } - v1 = sub_02074470(param0, 112, NULL); + v1 = GetMonData(param0, MON_DATA_FORM, NULL); { int v2, v3, v4, v5; @@ -4281,7 +4279,7 @@ BOOL sub_02077C20 (UnkStruct_02073C74 * param0, int param1, int param2) v4 = v6[param1]; for (v2 = 0; v2 < 4; v2++) { - v5 = sub_02074470(param0, 54 + v2, NULL); + v5 = GetMonData(param0, MON_DATA_MOVE1 + v2, NULL); for (v3 = 1; v3 < NELEMS(v6); v3++) { if ((v5 != 0) && (v5 == v6[v3])) { @@ -4300,7 +4298,7 @@ BOOL sub_02077C20 (UnkStruct_02073C74 * param0, int param1, int param2) if (v4 != 0) { for (v2 = 0; v2 < 4; v2++) { - if (sub_02074470(param0, 54 + v2, NULL) == 0) { + if (GetMonData(param0, MON_DATA_MOVE1 + v2, NULL) == 0) { sub_020771F8(param0, v4, v2); break; } @@ -4311,7 +4309,7 @@ BOOL sub_02077C20 (UnkStruct_02073C74 * param0, int param1, int param2) } } - if (sub_02074470(param0, 54, NULL) == 0) { + if (GetMonData(param0, MON_DATA_MOVE1, NULL) == 0) { sub_020771F8(param0, 84, 0); } } @@ -4365,24 +4363,24 @@ void sub_02077DB4 (UnkStruct_0202CC84 * param0, int param1, u16 param2, int para } } -BOOL sub_02077E3C (UnkStruct_02073C74 * param0) +BOOL sub_02077E3C (Pokemon * param0) { int v0, v1; - v0 = sub_02074470(param0, 5, NULL); - v1 = sub_02074470(param0, 112, NULL); + v0 = GetMonData(param0, MON_DATA_SPECIES, NULL); + v1 = GetMonData(param0, MON_DATA_FORM, NULL); return sub_02005844(v0, v1); } -void sub_02077E64 (UnkStruct_02073C74 * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5) +void sub_02077E64 (Pokemon * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5) { int v0; - sub_02077EA4(¶m0->unk_00, param1, param2, param3, param4, param5); + sub_02077EA4(¶m0->box, param1, param2, param3, param4, param5); if (param2 == 14) { - v0 = sub_02074470(param0, 164, NULL); + v0 = GetMonData(param0, MON_DATA_164, NULL); sub_02074B30(param0, 163, &v0); v0 = 0; @@ -4390,20 +4388,20 @@ void sub_02077E64 (UnkStruct_02073C74 * param0, UnkStruct_02025E6C * param1, int } } -void sub_02077EA4 (UnkStruct_02073C74_sub1 * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5) +void sub_02077EA4 (BoxPokemon * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5) { sub_0209305C(param0, param1, 0, param3, param5); - sub_02074C60(param0, 122, &Unk_020E4C40); - sub_02074C60(param0, 155, ¶m2); - sub_02074C60(param0, 158, ¶m4); + SetBoxMonData(param0, 122, &Unk_020E4C40); + SetBoxMonData(param0, 155, ¶m2); + SetBoxMonData(param0, 158, ¶m4); } -void sub_02077EE4 (UnkStruct_02073C74 * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5) +void sub_02077EE4 (Pokemon * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5) { - sub_02077EF8(¶m0->unk_00, param1, param2, param3, param4, param5); + sub_02077EF8(¶m0->box, param1, param2, param3, param4, param5); } -void sub_02077EF8 (UnkStruct_02073C74_sub1 * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5) +void sub_02077EF8 (BoxPokemon * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5) { int v0; sub_02077EA4(param0, param1, param2, param3, param4, param5); @@ -4414,7 +4412,7 @@ static const u16 Unk_020F0574[][2] = { {0x14, 0x50} }; -void sub_02077F0C (UnkStruct_02073C74 * param0, u32 param1, int param2) +void sub_02077F0C (Pokemon * param0, u32 param1, int param2) { int v0; u32 v1; @@ -4428,8 +4426,8 @@ void sub_02077F0C (UnkStruct_02073C74 * param0, u32 param1, int param2) } v1 = sub_0201D2E8() % 100; - v2 = sub_02074470(param0, 5, NULL); - v3 = sub_02074470(param0, 112, NULL); + v2 = GetMonData(param0, MON_DATA_SPECIES, NULL); + v3 = GetMonData(param0, MON_DATA_FORM, NULL); v5 = sub_020759CC(v2, v3, 16); v6 = sub_020759CC(v2, v3, 17); @@ -4447,18 +4445,18 @@ void sub_02077F0C (UnkStruct_02073C74 * param0, u32 param1, int param2) } } -BOOL sub_02077FB4 (UnkStruct_02073C74 * param0, u8 param1) +BOOL sub_02077FB4 (Pokemon * param0, u8 param1) { - return sub_02077FBC(¶m0->unk_00, param1); + return sub_02077FBC(¶m0->box, param1); } -BOOL sub_02077FBC (UnkStruct_02073C74_sub1 * param0, u8 param1) +BOOL sub_02077FBC (BoxPokemon * param0, u8 param1) { u16 v0; int v1; - v0 = sub_02074570(param0, 174, NULL); - v1 = sub_02074570(param0, 112, NULL); + v0 = sub_02074570(param0, MON_DATA_SPECIES_EGG, NULL); + v1 = sub_02074570(param0, MON_DATA_FORM, NULL); return sub_02077FE4(v0, v1, param1); } @@ -4489,12 +4487,12 @@ BOOL sub_02077FE4 (u16 param0, int param1, u8 param2) return (sub_020759CC(param0, param1, v1) & v0) != 0; } -void sub_0207803C (UnkStruct_02073C74 * param0) +void sub_0207803C (Pokemon * param0) { - sub_02078044(¶m0->unk_00); + sub_02078044(¶m0->box); } -void sub_02078044 (UnkStruct_02073C74_sub1 * param0) +void sub_02078044 (BoxPokemon * param0) { BOOL v0; int v1, v2; @@ -4502,65 +4500,65 @@ void sub_02078044 (UnkStruct_02073C74_sub1 * param0) u32 v5; v0 = sub_02073D20(param0); - v1 = sub_02074570(param0, 5, NULL); - v5 = sub_02074570(param0, 0, NULL); - v2 = sub_02074570(param0, 112, NULL); + v1 = sub_02074570(param0, MON_DATA_SPECIES, NULL); + v5 = sub_02074570(param0, MON_DATA_PERSONALITY, NULL); + v2 = sub_02074570(param0, MON_DATA_FORM, NULL); v3 = sub_020759CC(v1, v2, 24); v4 = sub_020759CC(v1, v2, 25); if (v4 != 0) { if (v5 & 1) { - sub_02074C60(param0, 10, (u8 *)&v4); + SetBoxMonData(param0, 10, (u8 *)&v4); } else { - sub_02074C60(param0, 10, (u8 *)&v3); + SetBoxMonData(param0, 10, (u8 *)&v3); } } else { - sub_02074C60(param0, 10, (u8 *)&v3); + SetBoxMonData(param0, 10, (u8 *)&v3); } sub_02073D48(param0, v0); } -void sub_020780C4 (UnkStruct_02073C74 * param0, u32 param1) +void sub_020780C4 (Pokemon * param0, u32 param1) { - UnkStruct_02073C74 * v0; - UnkStruct_02075454 * v1; - UnkStruct_02075454_1 * v2; - UnkStruct_02075454_2 * v3; - UnkStruct_02075454_3 * v4; - UnkStruct_02075454 * v5; - UnkStruct_02075454_1 * v6; - UnkStruct_02075454_2 * v7; - UnkStruct_02075454_3 * v8; + Pokemon * v0; + PokemonSubstruct0 * v1; + PokemonSubstruct1 * v2; + PokemonSubstruct2 * v3; + PokemonSubstruct3 * v4; + PokemonSubstruct0 * v5; + PokemonSubstruct1 * v6; + PokemonSubstruct2 * v7; + PokemonSubstruct3 * v8; - v0 = sub_02073C74(0); + v0 = AllocMonZeroed(0); sub_020775EC(param0, v0); - v1 = (UnkStruct_02075454 *)sub_0207825C(&v0->unk_00, param0->unk_00.unk_00, 0); - v2 = (UnkStruct_02075454_1 *)sub_0207825C(&v0->unk_00, param0->unk_00.unk_00, 1); - v3 = (UnkStruct_02075454_2 *)sub_0207825C(&v0->unk_00, param0->unk_00.unk_00, 2); - v4 = (UnkStruct_02075454_3 *)sub_0207825C(&v0->unk_00, param0->unk_00.unk_00, 3); - v5 = (UnkStruct_02075454 *)sub_0207825C(¶m0->unk_00, param1, 0); - v6 = (UnkStruct_02075454_1 *)sub_0207825C(¶m0->unk_00, param1, 1); - v7 = (UnkStruct_02075454_2 *)sub_0207825C(¶m0->unk_00, param1, 2); - v8 = (UnkStruct_02075454_3 *)sub_0207825C(¶m0->unk_00, param1, 3); + v1 = (PokemonSubstruct0 *)sub_0207825C(&v0->box, param0->box.unk_00, 0); + v2 = (PokemonSubstruct1 *)sub_0207825C(&v0->box, param0->box.unk_00, 1); + v3 = (PokemonSubstruct2 *)sub_0207825C(&v0->box, param0->box.unk_00, 2); + v4 = (PokemonSubstruct3 *)sub_0207825C(&v0->box, param0->box.unk_00, 3); + v5 = (PokemonSubstruct0 *)sub_0207825C(¶m0->box, param1, 0); + v6 = (PokemonSubstruct1 *)sub_0207825C(¶m0->box, param1, 1); + v7 = (PokemonSubstruct2 *)sub_0207825C(¶m0->box, param1, 2); + v8 = (PokemonSubstruct3 *)sub_0207825C(¶m0->box, param1, 3); - sub_02078234(&v0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4, v0->unk_00.unk_06); - sub_02078234(¶m0->unk_08, sizeof(UnkStruct_02073C74_sub2), param0->unk_00.unk_00); - sub_02078234(¶m0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_00.unk_06); + sub_02078234(&v0->box.unk_08, sizeof(PokemonSubstruct0) * 4, v0->box.unk_06); + sub_02078234(¶m0->party, sizeof(PartyPokemon), param0->box.unk_00); + sub_02078234(¶m0->box.unk_08, sizeof(PokemonSubstruct0) * 4, param0->box.unk_06); - param0->unk_00.unk_00 = param1; + param0->box.unk_00 = param1; *v5 = *v1; *v6 = *v2; *v7 = *v3; *v8 = *v4; - param0->unk_00.unk_06 = sub_0207823C(¶m0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4); + param0->box.unk_06 = sub_0207823C(¶m0->box.unk_08, sizeof(PokemonSubstruct0) * 4); - sub_0207822C(¶m0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_00.unk_06); - sub_0207822C(¶m0->unk_08, sizeof(UnkStruct_02073C74_sub2), param0->unk_00.unk_00); + sub_0207822C(¶m0->box.unk_08, sizeof(PokemonSubstruct0) * 4, param0->box.unk_06); + sub_0207822C(¶m0->party, sizeof(PartyPokemon), param0->box.unk_00); Heap_FreeToHeap(v0); } @@ -4603,7 +4601,7 @@ static u16 sub_0207823C (void * param0, u32 param1) return v2; } -static void * sub_0207825C (UnkStruct_02073C74_sub1 * param0, u32 param1, u8 param2) +static void * sub_0207825C (BoxPokemon * param0, u32 param1, u8 param2) { void * v0; @@ -5213,23 +5211,23 @@ u16 sub_02078824 (u8 param0) return Unk_020F05BE[param0]; } -BOOL sub_02078838 (UnkStruct_02073C74 * param0) +BOOL sub_02078838 (Pokemon * param0) { - u16 v0 = (u16)sub_02074470(param0, 5, NULL); + u16 v0 = (u16)GetMonData(param0, MON_DATA_SPECIES, NULL); return sub_02078804(v0); } -BOOL sub_0207884C (UnkStruct_02073C74_sub1 * param0, UnkStruct_02025E6C * param1, int param2) +BOOL sub_0207884C (BoxPokemon * param0, UnkStruct_02025E6C * param1, int param2) { u32 v0 = sub_02025F20(param1); - u32 v1 = sub_02074570(param0, 7, NULL); + u32 v1 = sub_02074570(param0, MON_DATA_OT_ID, NULL); u32 v2 = sub_02025F30(param1); - u32 v3 = sub_02074570(param0, 157, NULL); + u32 v3 = sub_02074570(param0, MON_DATA_OT_GENDER, NULL); UnkStruct_02023790 * v4 = sub_02025F04(param1, param2); UnkStruct_02023790 * v5 = sub_02023790(8, param2); BOOL v6 = 0; - sub_02074570(param0, 145, v5); + sub_02074570(param0, MON_DATA_145, v5); if ((v0 == v1) && (v2 == v3) && (sub_02023BE0(v4, v5) == 0)) { v6 = 1; @@ -5273,7 +5271,7 @@ int sub_020788D0 (int param0) return param0; } -void sub_0207893C (UnkStruct_02073C74 * param0) +void sub_0207893C (Pokemon * param0) { u8 v0; UnkStruct_0202CA28 v1; @@ -5286,7 +5284,7 @@ void sub_0207893C (UnkStruct_02073C74 * param0) sub_02074B30(param0, 171, (UnkStruct_0202CA28 *)&v1); } -void sub_0207896C (UnkStruct_02073C74_sub1 * param0) +void sub_0207896C (BoxPokemon * param0) { BOOL v0; int v1; @@ -5294,10 +5292,10 @@ void sub_0207896C (UnkStruct_02073C74_sub1 * param0) v0 = sub_02073D20(param0); for (v1 = 0; v1 < 4; v1++) { - if (sub_02074570(param0, 54 + v1, NULL)) { + if (sub_02074570(param0, MON_DATA_MOVE1 + v1, NULL)) { u8 v2 = sub_02074570(param0, 66 + v1, NULL); - sub_02074C60(param0, 58 + v1, &v2); + SetBoxMonData(param0, 58 + v1, &v2); } } @@ -5376,7 +5374,7 @@ void sub_02078AC8 (NARC * param0, u8 * param1, u16 param2) *param1 = v0.unk_58; } -BOOL sub_02078AEC (int param0, UnkStruct_02073C74 * param1, int param2) +BOOL sub_02078AEC (int param0, Pokemon * param1, int param2) { int v0; int v1; @@ -5401,36 +5399,36 @@ BOOL sub_02078AEC (int param0, UnkStruct_02073C74 * param1, int param2) return 1; } -void sub_02078B40 (UnkStruct_02073C74 * param0, UnkStruct_02078B40 * param1) +void sub_02078B40 (Pokemon * param0, UnkStruct_02078B40 * param1) { - UnkStruct_02073C74_sub1 * v0; - UnkStruct_02075454 * v1; - UnkStruct_02075454_1 * v2; - UnkStruct_02075454_2 * v3; - UnkStruct_02075454_3 * v4; + BoxPokemon * v0; + PokemonSubstruct0 * v1; + PokemonSubstruct1 * v2; + PokemonSubstruct2 * v3; + PokemonSubstruct3 * v4; int v5; u16 v6; - if (param0->unk_00.unk_04_0 == 0) { - sub_02078234(¶m0->unk_08, sizeof(UnkStruct_02073C74_sub2), param0->unk_00.unk_00); - sub_02078234(¶m0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_00.unk_06); + if (param0->box.unk_04_0 == 0) { + sub_02078234(¶m0->party, sizeof(PartyPokemon), param0->box.unk_00); + sub_02078234(¶m0->box.unk_08, sizeof(PokemonSubstruct0) * 4, param0->box.unk_06); } v0 = sub_02076B10(param0); - v1 = (UnkStruct_02075454 *)sub_0207825C(v0, v0->unk_00, 0); - v2 = (UnkStruct_02075454_1 *)sub_0207825C(v0, v0->unk_00, 1); - v3 = (UnkStruct_02075454_2 *)sub_0207825C(v0, v0->unk_00, 2); - v4 = (UnkStruct_02075454_3 *)sub_0207825C(v0, v0->unk_00, 3); + v1 = (PokemonSubstruct0 *)sub_0207825C(v0, v0->unk_00, 0); + v2 = (PokemonSubstruct1 *)sub_0207825C(v0, v0->unk_00, 1); + v3 = (PokemonSubstruct2 *)sub_0207825C(v0, v0->unk_00, 2); + v4 = (PokemonSubstruct3 *)sub_0207825C(v0, v0->unk_00, 3); param1->unk_00 = v0->unk_00; param1->unk_04_0 = 0; param1->unk_04_1 = 0; param1->unk_04_2 = v0->unk_04_2; - param1->unk_06 = v1->unk_00; - param1->unk_08 = v1->unk_02; + param1->unk_06 = v1->species; + param1->unk_08 = v1->item; param1->unk_0C = v1->unk_04; param1->unk_10 = v1->unk_08; - param1->unk_14 = v1->unk_0C; + param1->unk_14 = v1->friendship; param1->unk_15 = v1->unk_0D; param1->unk_16 = v1->unk_10; param1->unk_17 = v1->unk_11; @@ -5454,9 +5452,9 @@ void sub_02078B40 (UnkStruct_02073C74 * param0, UnkStruct_02078B40 * param1) param1->unk_2C_25 = v2->unk_10_25; param1->unk_2C_30 = v2->unk_10_30; param1->unk_2C_31 = v2->unk_10_31; - param1->unk_30_0 = v2->unk_18_0; + param1->unk_30_0 = v2->fatefulEncounter; param1->unk_30_1 = v2->unk_18_1; - param1->unk_30_3 = v2->unk_18_3; + param1->unk_30_3 = v2->form; for (v5 = 0; v5 < 10 + 1; v5++) { param1->unk_32[v5] = v3->unk_00[v5]; @@ -5468,50 +5466,50 @@ void sub_02078B40 (UnkStruct_02073C74 * param0, UnkStruct_02078B40 * param1) param1->unk_58 = v4->unk_1B; - param1->unk_5C = param0->unk_08.unk_00; - param1->unk_60 = param0->unk_08.unk_04; - param1->unk_61 = param0->unk_08.unk_05; - param1->unk_62 = param0->unk_08.unk_06; - param1->unk_64 = param0->unk_08.unk_08; - param1->unk_66 = param0->unk_08.unk_0A; - param1->unk_68 = param0->unk_08.unk_0C; - param1->unk_6A = param0->unk_08.unk_0E; - param1->unk_6C = param0->unk_08.unk_10; - param1->unk_6E = param0->unk_08.unk_12; + param1->unk_5C = param0->party.unk_00; + param1->unk_60 = param0->party.unk_04; + param1->unk_61 = param0->party.unk_05; + param1->unk_62 = param0->party.unk_06; + param1->unk_64 = param0->party.unk_08; + param1->unk_66 = param0->party.unk_0A; + param1->unk_68 = param0->party.unk_0C; + param1->unk_6A = param0->party.unk_0E; + param1->unk_6C = param0->party.unk_10; + param1->unk_6E = param0->party.unk_12; - if (param0->unk_00.unk_04_0 == 0) { - sub_0207822C(¶m0->unk_08, sizeof(UnkStruct_02073C74_sub2), param0->unk_00.unk_00); - sub_0207822C(¶m0->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4, param0->unk_00.unk_06); + if (param0->box.unk_04_0 == 0) { + sub_0207822C(¶m0->party, sizeof(PartyPokemon), param0->box.unk_00); + sub_0207822C(¶m0->box.unk_08, sizeof(PokemonSubstruct0) * 4, param0->box.unk_06); } } -void sub_02078E0C (UnkStruct_02078B40 * param0, UnkStruct_02073C74 * param1) +void sub_02078E0C (UnkStruct_02078B40 * param0, Pokemon * param1) { - UnkStruct_02073C74_sub1 * v0; - UnkStruct_02075454 * v1; - UnkStruct_02075454_1 * v2; - UnkStruct_02075454_2 * v3; - UnkStruct_02075454_3 * v4; + BoxPokemon * v0; + PokemonSubstruct0 * v1; + PokemonSubstruct1 * v2; + PokemonSubstruct2 * v3; + PokemonSubstruct3 * v4; int v5; - MI_CpuClearFast(param1, sizeof(UnkStruct_02073C74)); + MI_CpuClearFast(param1, sizeof(Pokemon)); v0 = sub_02076B10(param1); - v1 = (UnkStruct_02075454 *)sub_0207825C(v0, param0->unk_00, 0); - v2 = (UnkStruct_02075454_1 *)sub_0207825C(v0, param0->unk_00, 1); - v3 = (UnkStruct_02075454_2 *)sub_0207825C(v0, param0->unk_00, 2); - v4 = (UnkStruct_02075454_3 *)sub_0207825C(v0, param0->unk_00, 3); + v1 = (PokemonSubstruct0 *)sub_0207825C(v0, param0->unk_00, 0); + v2 = (PokemonSubstruct1 *)sub_0207825C(v0, param0->unk_00, 1); + v3 = (PokemonSubstruct2 *)sub_0207825C(v0, param0->unk_00, 2); + v4 = (PokemonSubstruct3 *)sub_0207825C(v0, param0->unk_00, 3); v0->unk_00 = param0->unk_00; v0->unk_04_0 = 0; v0->unk_04_1 = 0; v0->unk_04_2 = param0->unk_04_2; - v1->unk_00 = param0->unk_06; - v1->unk_02 = param0->unk_08; + v1->species = param0->unk_06; + v1->item = param0->unk_08; v1->unk_04 = param0->unk_0C; v1->unk_08 = param0->unk_10; - v1->unk_0C = param0->unk_14; + v1->friendship = param0->unk_14; v1->unk_0D = param0->unk_15; v1->unk_10 = param0->unk_16; v1->unk_11 = param0->unk_17; @@ -5535,9 +5533,9 @@ void sub_02078E0C (UnkStruct_02078B40 * param0, UnkStruct_02073C74 * param1) v2->unk_10_25 = param0->unk_2C_25; v2->unk_10_30 = param0->unk_2C_30; v2->unk_10_31 = param0->unk_2C_31; - v2->unk_18_0 = param0->unk_30_0; + v2->fatefulEncounter = param0->unk_30_0; v2->unk_18_1 = param0->unk_30_1; - v2->unk_18_3 = param0->unk_30_3; + v2->form = param0->unk_30_3; for (v5 = 0; v5 < 10 + 1; v5++) { v3->unk_00[v5] = param0->unk_32[v5]; @@ -5549,18 +5547,18 @@ void sub_02078E0C (UnkStruct_02078B40 * param0, UnkStruct_02073C74 * param1) v4->unk_1B = param0->unk_58; - param1->unk_08.unk_00 = param0->unk_5C; - param1->unk_08.unk_04 = param0->unk_60; - param1->unk_08.unk_05 = param0->unk_61; - param1->unk_08.unk_06 = param0->unk_62; - param1->unk_08.unk_08 = param0->unk_64; - param1->unk_08.unk_0A = param0->unk_66; - param1->unk_08.unk_0C = param0->unk_68; - param1->unk_08.unk_0E = param0->unk_6A; - param1->unk_08.unk_10 = param0->unk_6C; - param1->unk_08.unk_12 = param0->unk_6E; + param1->party.unk_00 = param0->unk_5C; + param1->party.unk_04 = param0->unk_60; + param1->party.unk_05 = param0->unk_61; + param1->party.unk_06 = param0->unk_62; + param1->party.unk_08 = param0->unk_64; + param1->party.unk_0A = param0->unk_66; + param1->party.unk_0C = param0->unk_68; + param1->party.unk_0E = param0->unk_6A; + param1->party.unk_10 = param0->unk_6C; + param1->party.unk_12 = param0->unk_6E; - sub_0207822C(¶m1->unk_08, sizeof(UnkStruct_02073C74_sub2), param1->unk_00.unk_00); - param1->unk_00.unk_06 = sub_0207823C(¶m1->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4); - sub_0207822C(¶m1->unk_00.unk_08, sizeof(UnkStruct_02075454) * 4, param1->unk_00.unk_06); + sub_0207822C(¶m1->party, sizeof(PartyPokemon), param1->box.unk_00); + param1->box.unk_06 = sub_0207823C(¶m1->box.unk_08, sizeof(PokemonSubstruct0) * 4); + sub_0207822C(¶m1->box.unk_08, sizeof(PokemonSubstruct0) * 4, param1->box.unk_06); } diff --git a/src/unk_02079170.c b/src/unk_02079170.c index b8adeb218f..3659e526a1 100644 --- a/src/unk_02079170.c +++ b/src/unk_02079170.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200B144_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_021C0794_decl.h" #include "struct_defs/struct_0207A9CC.h" @@ -295,14 +295,14 @@ static void sub_020793B8 (UnkStruct_ov6_02240D5C * param0, int param1, int param u32 v3, v4; u32 v5; u8 v6; - UnkStruct_02073C74 * v7; + Pokemon * v7; v5 = sub_0201D2D0(); Party_InitWithCapacity(param0->unk_04[param1], 6); v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov16_022431BC_3) * 6); - v7 = sub_02073C74(param2); + v7 = AllocMonZeroed(param2); sub_0207939C(param0->unk_18[param1], v0); diff --git a/src/unk_020797C8.c b/src/unk_020797C8.c index 86f1011414..fb2ac1d7ed 100644 --- a/src/unk_020797C8.c +++ b/src/unk_020797C8.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_0200B144_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_defs/struct_02073C74_sub1.h" +#include "struct_defs/box_pokemon.h" #include "unk_0200AC5C.h" #include "unk_02023790.h" @@ -14,7 +14,7 @@ typedef struct UnkStruct_020797DC_t { u32 unk_00; - UnkStruct_02073C74_sub1 unk_04[18][30]; + BoxPokemon unk_04[18][30]; u16 unk_10E4[18][20]; u8 unk_13B4[18]; u8 unk_13C6; @@ -40,7 +40,7 @@ static void sub_020797DC (UnkStruct_020797DC * param0) for (v0 = 0; v0 < 18; v0++) { for (v1 = 0; v1 < (5 * 6); v1++) { - sub_02073C54(&(param0->unk_04[v0][v1])); + ZeroBoxMonData(&(param0->unk_04[v0][v1])); } } @@ -66,7 +66,7 @@ static void sub_020797DC (UnkStruct_020797DC * param0) param0->unk_00 = 0; } -BOOL sub_02079868 (UnkStruct_020797DC * param0, UnkStruct_02073C74_sub1 * param1) +BOOL sub_02079868 (UnkStruct_020797DC * param0, BoxPokemon * param1) { u32 v0; @@ -88,19 +88,19 @@ BOOL sub_02079868 (UnkStruct_020797DC * param0, UnkStruct_02073C74_sub1 * param1 return 0; } -BOOL sub_020798A0 (UnkStruct_020797DC * param0, u32 param1, UnkStruct_02073C74_sub1 * param2) +BOOL sub_020798A0 (UnkStruct_020797DC * param0, u32 param1, BoxPokemon * param2) { u32 v0; sub_0207896C(param2); - sub_02077ADC(param2, 0); + SetBoxShayminForm(param2, 0); if (param1 == 0xffffffff) { param1 = param0->unk_00; } for (v0 = 0; v0 < (5 * 6); v0++) { - if (sub_02074570(&(param0->unk_04[param1][v0]), 5, NULL) == 0) { + if (sub_02074570(&(param0->unk_04[param1][v0]), MON_DATA_SPECIES, NULL) == 0) { param0->unk_04[param1][v0] = *param2; sub_02024804(); return 1; @@ -110,10 +110,10 @@ BOOL sub_020798A0 (UnkStruct_020797DC * param0, u32 param1, UnkStruct_02073C74_s return 0; } -BOOL sub_02079914 (UnkStruct_020797DC * param0, u32 param1, u32 param2, UnkStruct_02073C74_sub1 * param3) +BOOL sub_02079914 (UnkStruct_020797DC * param0, u32 param1, u32 param2, BoxPokemon * param3) { sub_0207896C(param3); - sub_02077ADC(param3, 0); + SetBoxShayminForm(param3, 0); if (param1 == 0xffffffff) { param1 = param0->unk_00; @@ -137,7 +137,7 @@ void sub_02079968 (UnkStruct_020797DC * param0, u32 param1, u32 param2) } if ((param2 < (5 * 6)) && (param1 < 18)) { - sub_02073C54(&(param0->unk_04[param1][param2])); + ZeroBoxMonData(&(param0->unk_04[param1][param2])); sub_02024804(); } else { GF_ASSERT(0); @@ -157,7 +157,7 @@ u32 sub_020799A0 (const UnkStruct_020797DC * param0) while (TRUE) { for (v1 = 0; v1 < (5 * 6); v1++) { - if (sub_02074570((UnkStruct_02073C74_sub1 *)(&(param0->unk_04[v0][v1])), 172, NULL) == 0) { + if (sub_02074570((BoxPokemon *)(&(param0->unk_04[v0][v1])), MON_DATA_172, NULL) == 0) { return v0; } } @@ -187,7 +187,7 @@ BOOL sub_020799F0 (const UnkStruct_020797DC * param0, int * param1, int * param2 while (TRUE) { for ( ; v1 < (5 * 6); v1++) { - if (sub_02074570((UnkStruct_02073C74_sub1 *)(&(param0->unk_04[v0][v1])), 172, NULL) == 0) { + if (sub_02074570((BoxPokemon *)(&(param0->unk_04[v0][v1])), MON_DATA_172, NULL) == 0) { *param1 = v0; *param2 = v1; return 1; @@ -217,7 +217,7 @@ u32 sub_02079A50 (const UnkStruct_020797DC * param0) for (v0 = 0; v0 < 18; v0++) { for (v1 = 0; v1 < (5 * 6); v1++) { - if (sub_02074570((UnkStruct_02073C74_sub1 *)(&(param0->unk_04[v0][v1])), 172, NULL) != 0) { + if (sub_02074570((BoxPokemon *)(&(param0->unk_04[v0][v1])), MON_DATA_172, NULL) != 0) { v2++; } } @@ -300,7 +300,7 @@ u32 sub_02079B54 (const UnkStruct_020797DC * param0, u32 param1) u32 v1 = 0; for (v0 = 0; v0 < (5 * 6); v0++) { - if (sub_02074570((UnkStruct_02073C74_sub1 *)(&(param0->unk_04[param1][v0])), 172, NULL)) { + if (sub_02074570((BoxPokemon *)(&(param0->unk_04[param1][v0])), MON_DATA_172, NULL)) { v1++; } } @@ -324,8 +324,8 @@ u32 sub_02079B98 (const UnkStruct_020797DC * param0, u32 param1) u32 v1 = 0; for (v0 = 0; v0 < (5 * 6); v0++) { - if (sub_02074570((UnkStruct_02073C74_sub1 *)(&(param0->unk_04[param1][v0])), 172, NULL)) { - if (sub_02074570((UnkStruct_02073C74_sub1 *)(&(param0->unk_04[param1][v0])), 76, NULL) == 0) { + if (sub_02074570((BoxPokemon *)(&(param0->unk_04[param1][v0])), MON_DATA_172, NULL)) { + if (sub_02074570((BoxPokemon *)(&(param0->unk_04[param1][v0])), MON_DATA_IS_EGG, NULL) == 0) { v1++; } } @@ -359,7 +359,7 @@ u32 sub_02079C08 (const UnkStruct_020797DC * param0, u32 param1, u32 param2, int param1 = param0->unk_00; } - return sub_02074570((UnkStruct_02073C74_sub1 *)(¶m0->unk_04[param1][param2]), param3, param4); + return sub_02074570((BoxPokemon *)(¶m0->unk_04[param1][param2]), param3, param4); } void sub_02079C50 (UnkStruct_020797DC * param0, u32 param1, u32 param2, int param3, void * param4) @@ -371,11 +371,11 @@ void sub_02079C50 (UnkStruct_020797DC * param0, u32 param1, u32 param2, int para param1 = param0->unk_00; } - sub_02074C60((UnkStruct_02073C74_sub1 *)(¶m0->unk_04[param1][param2]), param3, param4); + SetBoxMonData((BoxPokemon *)(¶m0->unk_04[param1][param2]), param3, param4); sub_02024804(); } -UnkStruct_02073C74_sub1 * sub_02079C9C (const UnkStruct_020797DC * param0, u32 param1, u32 param2) +BoxPokemon * sub_02079C9C (const UnkStruct_020797DC * param0, u32 param1, u32 param2) { GF_ASSERT(((param1 < 18) || (param1 == 0xffffffff))); GF_ASSERT((param2 < (5 * 6))); @@ -384,7 +384,7 @@ UnkStruct_02073C74_sub1 * sub_02079C9C (const UnkStruct_020797DC * param0, u32 p param1 = param0->unk_00; } - return (UnkStruct_02073C74_sub1 *)&(param0->unk_04[param1][param2]); + return (BoxPokemon *)&(param0->unk_04[param1][param2]); } void sub_02079CD8 (UnkStruct_020797DC * param0, u32 param1) diff --git a/src/unk_02079D40.c b/src/unk_02079D40.c index 251cb07e89..f8efeea900 100644 --- a/src/unk_02079D40.c +++ b/src/unk_02079D40.c @@ -1,8 +1,8 @@ #include #include -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "unk_02073C2C.h" #include "unk_02079D40.h" @@ -551,7 +551,7 @@ const u8 Unk_020F0780[] = { }; -u32 sub_02079D40 (const UnkStruct_02073C74_sub1 * param0) +u32 sub_02079D40 (const BoxPokemon * param0) { u32 v0; u32 v1; @@ -559,19 +559,19 @@ u32 sub_02079D40 (const UnkStruct_02073C74_sub1 * param0) u32 v3; u32 v4; - v2 = sub_02073D20((UnkStruct_02073C74_sub1 *)param0); - v0 = sub_02074570((UnkStruct_02073C74_sub1 *)param0, 5, NULL); - v4 = sub_02074570((UnkStruct_02073C74_sub1 *)param0, 76, NULL); - v3 = sub_02079E44((UnkStruct_02073C74_sub1 *)param0); + v2 = sub_02073D20((BoxPokemon *)param0); + v0 = sub_02074570((BoxPokemon *)param0, MON_DATA_SPECIES, NULL); + v4 = sub_02074570((BoxPokemon *)param0, MON_DATA_IS_EGG, NULL); + v3 = sub_02079E44((BoxPokemon *)param0); v1 = sub_02079D8C(v0, v4, v3); - sub_02073D48((UnkStruct_02073C74_sub1 *)param0, v2); + sub_02073D48((BoxPokemon *)param0, v2); return v1; } -u32 sub_02079D80 (UnkStruct_02073C74 * param0) +u32 sub_02079D80 (Pokemon * param0) { - return sub_02079D40((const UnkStruct_02073C74_sub1 *)sub_02076B10(param0)); + return sub_02079D40((const BoxPokemon *)sub_02076B10(param0)); } u32 sub_02079D8C (u32 param0, u32 param1, u32 param2) @@ -584,7 +584,7 @@ u32 sub_02079D8C (u32 param0, u32 param1, u32 param2) } } - param2 = sub_020761E8(param0, param2); + param2 = SanitizeFormId(param0, param2); if (param2 != 0) { if (param0 == 386) { @@ -631,15 +631,15 @@ u32 sub_02079D8C (u32 param0, u32 param1, u32 param2) return 7 + param0; } -u16 sub_02079E44 (const UnkStruct_02073C74_sub1 * param0) +u16 sub_02079E44 (const BoxPokemon * param0) { u32 v0; - v0 = sub_02074570((UnkStruct_02073C74_sub1 *)param0, 174, NULL); + v0 = sub_02074570((BoxPokemon *)param0, MON_DATA_SPECIES_EGG, NULL); switch (v0) { case 201: - return sub_02076B00((UnkStruct_02073C74_sub1 *)param0); + return sub_02076B00((BoxPokemon *)param0); case 386: case 412: case 413: @@ -648,7 +648,7 @@ u16 sub_02079E44 (const UnkStruct_02073C74_sub1 * param0) case 487: case 492: case 479: - return sub_02074570((UnkStruct_02073C74_sub1 *)param0, 112, NULL); + return sub_02074570((BoxPokemon *)param0, MON_DATA_FORM, NULL); default: return 0; } @@ -691,26 +691,26 @@ const u8 sub_02079EDC (u32 param0, u32 param1, u32 param2) return Unk_020F0780[param0]; } -const u8 sub_02079F84 (const UnkStruct_02073C74_sub1 * param0) +const u8 sub_02079F84 (const BoxPokemon * param0) { BOOL v0; u32 v1; u32 v2; u32 v3; - v0 = sub_02073D20((UnkStruct_02073C74_sub1 *)param0); + v0 = sub_02073D20((BoxPokemon *)param0); v2 = sub_02079E44(param0); - v1 = sub_02074570((UnkStruct_02073C74_sub1 *)param0, 5, NULL); - v3 = sub_02074570((UnkStruct_02073C74_sub1 *)param0, 76, NULL); + v1 = sub_02074570((BoxPokemon *)param0, MON_DATA_SPECIES, NULL); + v3 = sub_02074570((BoxPokemon *)param0, MON_DATA_IS_EGG, NULL); - sub_02073D48((UnkStruct_02073C74_sub1 *)param0, v0); + sub_02073D48((BoxPokemon *)param0, v0); return sub_02079EDC(v1, v2, v3); } -const u8 sub_02079FC4 (UnkStruct_02073C74 * param0) +const u8 sub_02079FC4 (Pokemon * param0) { - return sub_02079F84((const UnkStruct_02073C74_sub1 *)sub_02076B10(param0)); + return sub_02079F84((const BoxPokemon *)sub_02076B10(param0)); } u32 sub_02079FD0 (void) diff --git a/src/unk_0207A2A8.c b/src/unk_0207A2A8.c index 54cd06429d..88e372bb77 100644 --- a/src/unk_0207A2A8.c +++ b/src/unk_0207A2A8.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_02098700_decl.h" @@ -27,9 +27,9 @@ void sub_0207A2C0 (UnkStruct_02098700 * param0) sub_02098718(param0); } -BOOL sub_0207A2D0 (const UnkStruct_0202610C * param0, UnkStruct_02073C74 * param1, const UnkStruct_02098700 * param2) +BOOL sub_0207A2D0 (const UnkStruct_0202610C * param0, Pokemon * param1, const UnkStruct_02098700 * param2) { - u16 v0 = (u16)sub_02074470(param1, 5, NULL); + u16 v0 = (u16)GetMonData(param1, MON_DATA_SPECIES, NULL); int v1, v2, v3; if (param0 == NULL) { @@ -38,11 +38,11 @@ BOOL sub_0207A2D0 (const UnkStruct_0202610C * param0, UnkStruct_02073C74 * param v1 = sub_02026074(param0, 2); - if (sub_02074470(param1, 161, NULL) > v1) { + if (GetMonData(param1, MON_DATA_161, NULL) > v1) { return 0; } - if (sub_02074470(param1, 76, NULL) != 0) { + if (GetMonData(param1, MON_DATA_IS_EGG, NULL) != 0) { return 0; } @@ -99,7 +99,7 @@ BOOL sub_0207A2D0 (const UnkStruct_0202610C * param0, UnkStruct_02073C74 * param int sub_0207A3AC (const UnkStruct_0202610C * param0, Party * param1, const UnkStruct_02098700 * param2, u8 * param3) { - UnkStruct_02073C74 * v0; + Pokemon * v0; int v1, v2 = 0, v3, v4, v5 = 0; u16 v6[6], v7[6]; @@ -132,10 +132,10 @@ int sub_0207A3AC (const UnkStruct_0202610C * param0, Party * param1, const UnkSt return 5; } - v6[v4] = (u16)sub_02074470(v0, 5, NULL); - v7[v4] = (u16)sub_02074470(v0, 6, NULL); + v6[v4] = (u16)GetMonData(v0, MON_DATA_SPECIES, NULL); + v7[v4] = (u16)GetMonData(v0, MON_DATA_HELD_ITEM, NULL); - v5 += sub_02074470(v0, 161, NULL); + v5 += GetMonData(v0, MON_DATA_161, NULL); } } @@ -206,7 +206,7 @@ static BOOL sub_0207A514 (u16 * param0, u16 * param1, u16 * param2, int param3, int sub_0207A594 (const UnkStruct_0202610C * param0, Party * param1, const UnkStruct_02098700 * param2) { - UnkStruct_02073C74 * v0; + Pokemon * v0; int v1, v2, v3, v4, v5 = 0; u16 v6[6], v7[6], v8[6]; int v9; @@ -218,8 +218,8 @@ int sub_0207A594 (const UnkStruct_0202610C * param0, Party * param1, const UnkSt for (v4 = 0; v4 < v2; v4++) { v0 = Party_GetPokemonBySlotIndex(param1, v4); - v6[v4] = (u16)sub_02074470(v0, 5, NULL); - v7[v4] = sub_02074470(v0, 161, NULL); + v6[v4] = (u16)GetMonData(v0, MON_DATA_SPECIES, NULL); + v7[v4] = GetMonData(v0, MON_DATA_161, NULL); if (sub_0207A2D0(param0, v0, param2) == 0) { v6[v4] = 0; diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index 63e13488e9..dd428bd1f2 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -9,7 +9,7 @@ #include "struct_decls/struct_02026324_decl.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_02056B24_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_0207AE68_decl.h" #include "struct_decls/struct_0207D3C0_decl.h" @@ -68,7 +68,7 @@ #include "unk_0207D3B8.h" #include "unk_0208C324.h" -UnkStruct_0207AE68 * sub_0207AE68(Party * param0, UnkStruct_02073C74 * param1, int param2, UnkStruct_020279FC * param3, int param4, UnkStruct_02026324 * param5, UnkStruct_0207D3C0 * param6, UnkStruct_0202CD88 * param7, UnkStruct_02056B24 * param8, int param9, int param10, int param11); +UnkStruct_0207AE68 * sub_0207AE68(Party * param0, Pokemon * param1, int param2, UnkStruct_020279FC * param3, int param4, UnkStruct_02026324 * param5, UnkStruct_0207D3C0 * param6, UnkStruct_0202CD88 * param7, UnkStruct_02056B24 * param8, int param9, int param10, int param11); static void sub_0207B0A0(UnkStruct_0201CD38 * param0, void * param1); BOOL sub_0207B0D0(UnkStruct_0207AE68 * param0); void sub_0207B0E0(UnkStruct_0207AE68 * param0); @@ -98,7 +98,7 @@ static const u8 Unk_020F0A2C[] = { 0x8 }; -UnkStruct_0207AE68 * sub_0207AE68 (Party * param0, UnkStruct_02073C74 * param1, int param2, UnkStruct_020279FC * param3, int param4, UnkStruct_02026324 * param5, UnkStruct_0207D3C0 * param6, UnkStruct_0202CD88 * param7, UnkStruct_02056B24 * param8, int param9, int param10, int param11) +UnkStruct_0207AE68 * sub_0207AE68 (Party * param0, Pokemon * param1, int param2, UnkStruct_020279FC * param3, int param4, UnkStruct_02026324 * param5, UnkStruct_0207D3C0 * param6, UnkStruct_0202CD88 * param7, UnkStruct_02056B24 * param8, int param9, int param10, int param11) { UnkStruct_0207AE68 * v0; UnkStruct_02008A90 v1; @@ -112,8 +112,8 @@ UnkStruct_0207AE68 * sub_0207AE68 (Party * param0, UnkStruct_02073C74 * param1, v0->unk_24 = param0; v0->unk_28 = param1; - v0->unk_60 = sub_02074470(param1, 5, NULL); - v0->unk_86 = sub_02074470(param1, 112, NULL); + v0->unk_60 = GetMonData(param1, MON_DATA_SPECIES, NULL); + v0->unk_86 = GetMonData(param1, MON_DATA_FORM, NULL); v0->unk_62 = param2; v0->unk_5C = param11; v0->unk_80 = NARC_ctor(147, param11); @@ -422,7 +422,7 @@ static void sub_0207B180 (UnkStruct_0207AE68 * param0) sub_0202CFEC(param0->unk_50, 22); sub_02056A48(param0->unk_54, sub_02076B10(param0->unk_28)); - if (sub_02074470(param0->unk_28, 77, NULL) == 0) { + if (GetMonData(param0->unk_28, MON_DATA_77, NULL) == 0) { sub_02074B30(param0->unk_28, 179, NULL); } @@ -588,7 +588,7 @@ static void sub_0207B180 (UnkStruct_0207AE68 * param0) break; case 27: sub_0200B5CC(param0->unk_0C, 0, sub_02076B10(param0->unk_28)); - sub_0200B630(param0->unk_0C, 1, sub_02074470(param0->unk_28, 54 + param0->unk_6E, NULL)); + sub_0200B630(param0->unk_0C, 1, GetMonData(param0->unk_28, 54 + param0->unk_6E, NULL)); param0->unk_65 = sub_0207C584(param0, 1200); param0->unk_66 = 30; param0->unk_64++; @@ -700,12 +700,12 @@ static void sub_0207C028 (UnkStruct_0207AE68 * param0) case 14: if (sub_0207D730(param0->unk_4C, 4, param0->unk_5C) && (Party_GetCurrentCount(param0->unk_24) < 6)) { { - UnkStruct_02073C74 * v1; + Pokemon * v1; int v2; UnkStruct_0202818C * v3; UnkStruct_0202CA28 v4; - v1 = sub_02073C74(param0->unk_5C); + v1 = AllocMonZeroed(param0->unk_5C); sub_020775EC(param0->unk_28, v1); v2 = 292; @@ -947,12 +947,12 @@ static void sub_0207C460 (UnkStruct_02018340 * param0) static void sub_0207C498 (UnkStruct_0207AE68 * param0) { UnkStruct_02008A90 v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; sub_02075EF4(&v0, param0->unk_28, 2); param0->unk_1C[0] = sub_02007C34(param0->unk_18, &v0, 128, 80, 0, 0, NULL, NULL); - v1 = sub_02073C74(param0->unk_5C); + v1 = AllocMonZeroed(param0->unk_5C); sub_020775EC(param0->unk_28, v1); sub_02074B30(v1, 5, (u8 *)¶m0->unk_62); diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c index e726cec6b7..b8615b74ee 100644 --- a/src/unk_0207E0B8.c +++ b/src/unk_0207E0B8.c @@ -7,7 +7,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_0207D3B0_decl.h" #include "constdata/const_020F1E88.h" @@ -118,15 +118,15 @@ static u8 sub_02080FD0(UnkStruct_0207F248 * param0); static int sub_0208107C(UnkStruct_0207F248 * param0); static u8 sub_020811F4(UnkStruct_0207F248 * param0); static int sub_02081224(UnkStruct_0207F248 * param0); -static int sub_02081408(UnkStruct_0207F248 * param0, UnkStruct_02073C74 * param1, int * param2); +static int sub_02081408(UnkStruct_0207F248 * param0, Pokemon * param1, int * param2); static int sub_0208150C(UnkStruct_0207F248 * param0); static int sub_02081594(UnkStruct_0207F248 * param0); static int sub_020815B8(UnkStruct_0207F248 * param0); static int sub_0207E634(UnkStruct_0207F248 * param0); static int sub_0208170C(UnkStruct_0207F248 * param0); static int sub_02081760(UnkStruct_0207F248 * param0); -static void sub_0207F094(UnkStruct_0207F248 * param0, UnkStruct_02073C74 * param1, u8 param2); -static u32 sub_0207F134(UnkStruct_02073C74 * param0, u8 param1); +static void sub_0207F094(UnkStruct_0207F248 * param0, Pokemon * param1, u8 param2); +static u32 sub_0207F134(Pokemon * param0, u8 param1); static void sub_0207FE1C(UnkStruct_0207F248 * param0); static void sub_02080AB8(u8 param0, s16 * param1, s16 * param2); static int sub_0208188C(UnkStruct_0207F248 * param0); @@ -1045,7 +1045,7 @@ u8 sub_0207EF04 (UnkStruct_0207F248 * param0, u8 param1) u8 sub_0207EF14 (UnkStruct_0207F248 * param0, u8 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u32 v1; u16 v2; @@ -1056,7 +1056,7 @@ u8 sub_0207EF14 (UnkStruct_0207F248 * param0, u8 param1) } v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param1); - v2 = (u16)sub_02074470(v0, 5, NULL); + v2 = (u16)GetMonData(v0, MON_DATA_SPECIES, NULL); if (v2 == 0) { return 0; @@ -1065,15 +1065,15 @@ u8 sub_0207EF14 (UnkStruct_0207F248 * param0, u8 param1) sub_02081ED8(param0, v0, param1); param0->unk_704[param1].unk_04 = v2; - param0->unk_704[param1].unk_06 = (u16)sub_02074470(v0, 163, NULL); - param0->unk_704[param1].unk_08 = (u16)sub_02074470(v0, 164, NULL); - param0->unk_704[param1].unk_0A = (u16)sub_02074470(v0, 161, NULL); - param0->unk_704[param1].unk_0C = (u16)sub_02074470(v0, 6, NULL); - param0->unk_704[param1].unk_12 = (u16)sub_02074470(v0, 162, NULL); - param0->unk_704[param1].unk_10 = (u8)sub_02074470(v0, 76, NULL); - param0->unk_704[param1].unk_11 = (u8)sub_02074470(v0, 112, NULL); + param0->unk_704[param1].unk_06 = (u16)GetMonData(v0, MON_DATA_163, NULL); + param0->unk_704[param1].unk_08 = (u16)GetMonData(v0, MON_DATA_164, NULL); + param0->unk_704[param1].unk_0A = (u16)GetMonData(v0, MON_DATA_161, NULL); + param0->unk_704[param1].unk_0C = (u16)GetMonData(v0, MON_DATA_HELD_ITEM, NULL); + param0->unk_704[param1].unk_12 = (u16)GetMonData(v0, MON_DATA_162, NULL); + param0->unk_704[param1].unk_10 = (u8)GetMonData(v0, MON_DATA_IS_EGG, NULL); + param0->unk_704[param1].unk_11 = (u8)GetMonData(v0, MON_DATA_FORM, NULL); - if (sub_02074470(v0, 176, NULL) == 1) { + if (GetMonData(v0, MON_DATA_176, NULL) == 1) { param0->unk_704[param1].unk_0E_12 = 0; } else { param0->unk_704[param1].unk_0E_12 = 1; @@ -1088,7 +1088,7 @@ u8 sub_0207EF14 (UnkStruct_0207F248 * param0, u8 param1) return 1; } -static void sub_0207F094 (UnkStruct_0207F248 * param0, UnkStruct_02073C74 * param1, u8 param2) +static void sub_0207F094 (UnkStruct_0207F248 * param0, Pokemon * param1, u8 param2) { u32 v0; u32 v1; @@ -1105,7 +1105,7 @@ static void sub_0207F094 (UnkStruct_0207F248 * param0, UnkStruct_02073C74 * para v0 = sub_0207F134(param1, param0->unk_5A4->unk_2A); for (v1 = 0; v1 < 4; v1++) { - if (sub_02074470(param1, 54 + v1, NULL) == 0) { + if (GetMonData(param1, MON_DATA_MOVE1 + v1, NULL) == 0) { break; } } @@ -1117,40 +1117,40 @@ static void sub_0207F094 (UnkStruct_0207F248 * param0, UnkStruct_02073C74 * para } } -static u32 sub_0207F134 (UnkStruct_02073C74 * param0, u8 param1) +static u32 sub_0207F134 (Pokemon * param0, u8 param1) { u32 v0; switch (param1) { case 0: - v0 = sub_02074470(param0, 123, NULL); - v0 += sub_02074470(param0, 124, NULL); - v0 += sub_02074470(param0, 125, NULL); - v0 += sub_02074470(param0, 126, NULL); + v0 = GetMonData(param0, MON_DATA_123, NULL); + v0 += GetMonData(param0, MON_DATA_124, NULL); + v0 += GetMonData(param0, MON_DATA_125, NULL); + v0 += GetMonData(param0, MON_DATA_126, NULL); break; case 1: - v0 = sub_02074470(param0, 127, NULL); - v0 += sub_02074470(param0, 128, NULL); - v0 += sub_02074470(param0, 129, NULL); - v0 += sub_02074470(param0, 130, NULL); + v0 = GetMonData(param0, MON_DATA_127, NULL); + v0 += GetMonData(param0, MON_DATA_128, NULL); + v0 += GetMonData(param0, MON_DATA_129, NULL); + v0 += GetMonData(param0, MON_DATA_130, NULL); break; case 2: - v0 = sub_02074470(param0, 131, NULL); - v0 += sub_02074470(param0, 132, NULL); - v0 += sub_02074470(param0, 133, NULL); - v0 += sub_02074470(param0, 134, NULL); + v0 = GetMonData(param0, MON_DATA_131, NULL); + v0 += GetMonData(param0, MON_DATA_132, NULL); + v0 += GetMonData(param0, MON_DATA_133, NULL); + v0 += GetMonData(param0, MON_DATA_134, NULL); break; case 3: - v0 = sub_02074470(param0, 135, NULL); - v0 += sub_02074470(param0, 136, NULL); - v0 += sub_02074470(param0, 137, NULL); - v0 += sub_02074470(param0, 138, NULL); + v0 = GetMonData(param0, MON_DATA_135, NULL); + v0 += GetMonData(param0, MON_DATA_136, NULL); + v0 += GetMonData(param0, MON_DATA_137, NULL); + v0 += GetMonData(param0, MON_DATA_138, NULL); break; case 4: - v0 = sub_02074470(param0, 139, NULL); - v0 += sub_02074470(param0, 140, NULL); - v0 += sub_02074470(param0, 141, NULL); - v0 += sub_02074470(param0, 142, NULL); + v0 = GetMonData(param0, MON_DATA_139, NULL); + v0 += GetMonData(param0, MON_DATA_140, NULL); + v0 += GetMonData(param0, MON_DATA_141, NULL); + v0 += GetMonData(param0, MON_DATA_142, NULL); } return v0; @@ -1363,7 +1363,7 @@ static void sub_0207F884 (UnkStruct_0207F248 * param0, u8 param1, s16 param2, s1 void sub_0207F8F8 (UnkStruct_0207F248 * param0, u8 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u8 v1; v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param1); @@ -1377,7 +1377,7 @@ void sub_0207F8F8 (UnkStruct_0207F248 * param0, u8 param1) v1 = 0; } - if (sub_02074470(v0, 163, 0) == 0) { + if (GetMonData(v0, MON_DATA_163, 0) == 0) { v1 += 2; } else if (sub_0207F984(param0, param1) == 1) { v1 += 1; @@ -1743,7 +1743,7 @@ static void sub_0207FFC8 (UnkStruct_0207F248 * param0) static u8 sub_020800B4 (UnkStruct_0207F248 * param0, u8 * param1) { - UnkStruct_02073C74 * v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); + Pokemon * v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); u16 v1; u8 v2 = 0, v3, v4 = 0, v5; @@ -1753,7 +1753,7 @@ static u8 sub_020800B4 (UnkStruct_0207F248 * param0, u8 * param1) if (sub_0206C0D0(param0->unk_5A4->unk_1C) == 0) { if (param0->unk_704[param0->unk_B11].unk_10 == 0) { for (v3 = 0; v3 < 4; v3++) { - v1 = (u16)sub_02074470(v0, 54 + v3, NULL); + v1 = (u16)GetMonData(v0, MON_DATA_MOVE1 + v3, NULL); if (v1 == 0) { break; @@ -1917,7 +1917,7 @@ u8 sub_02080354 (UnkStruct_0207F248 * param0, u8 param1) u8 v0; if (param0->unk_5A4->unk_14 != NULL) { - UnkStruct_02073C74 * v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param1); + Pokemon * v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param1); if (sub_0207A2D0(param0->unk_5A4->unk_14, v1, param0->unk_B20) == 0) { return 0; @@ -2457,7 +2457,7 @@ static int sub_02080BF4 (UnkStruct_0207F248 * param0) break; case 3: if (sub_02080F3C(param0, param0->unk_B11, 1) == 1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_02023790 * v1; void * v2; UnkStruct_0203CDB0 * v3; @@ -2523,7 +2523,7 @@ static BOOL sub_02080F3C (UnkStruct_0207F248 * param0, u8 param1, s8 param2) sub_02082104(param0, param1); if ((param0->unk_B14[0] == param0->unk_B14[2]) || (param0->unk_704[param1].unk_06 == param0->unk_704[param1].unk_08)) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u32 v1; v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param1); @@ -2608,7 +2608,7 @@ static int sub_0208107C (UnkStruct_0207F248 * param0) sub_0207D60C(param0->unk_5A4->unk_04, param0->unk_5A4->unk_24, 1, 12); if (Item_GetAttributeFromStruct(v0, 26) != 0) { - UnkStruct_02073C74 * v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); + Pokemon * v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); param0->unk_5A4->unk_38 = sub_02076B94(NULL, v1, 3, param0->unk_5A4->unk_24, ¶m0->unk_5A4->unk_3C); param0->unk_5A4->unk_23 = 8; @@ -2617,7 +2617,7 @@ static int sub_0208107C (UnkStruct_0207F248 * param0) } if ((Item_IsHerbalMedicine(param0->unk_5A4->unk_24) == 1) && (param0->unk_5A4->unk_10 != NULL)) { - UnkStruct_02073C74 * v2 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); + Pokemon * v2 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); sub_0206D90C(param0->unk_5A4->unk_10, v2, param0->unk_5A4->unk_24); } @@ -2645,7 +2645,7 @@ static u8 sub_020811F4 (UnkStruct_0207F248 * param0) static int sub_02081224 (UnkStruct_0207F248 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_0205AA50 * v1; int v2 = -1, v3; UnkStruct_0203CDB0 * v4; @@ -2655,7 +2655,7 @@ static int sub_02081224 (UnkStruct_0207F248 * param0) v4 = param0->unk_5A4->unk_1C; if (param0->unk_5A4->unk_24 == 112) { - if (sub_02074470(v0, 5, NULL) != 487) { + if (GetMonData(v0, MON_DATA_SPECIES, NULL) != 487) { sub_0200B1B8(param0->unk_69C, 203, param0->unk_6A8); sub_0200B5CC(param0->unk_6A0, 0, sub_02076B10(v0)); sub_0200B744(param0->unk_6A0, 1, param0->unk_5A4->unk_24); @@ -2707,7 +2707,7 @@ static int sub_02081224 (UnkStruct_0207F248 * param0) return v2; } -static int sub_02081408 (UnkStruct_0207F248 * param0, UnkStruct_02073C74 * param1, int * param2) +static int sub_02081408 (UnkStruct_0207F248 * param0, Pokemon * param1, int * param2) { u32 v0 = param0->unk_5A4->unk_24; UnkStruct_0203CDB0 * v1; @@ -2734,7 +2734,7 @@ static int sub_02081408 (UnkStruct_0207F248 * param0, UnkStruct_02073C74 * param return 11; } -static void sub_020814A8 (UnkStruct_0207F248 * param0, UnkStruct_02073C74 * param1, u32 param2, u32 param3) +static void sub_020814A8 (UnkStruct_0207F248 * param0, Pokemon * param1, u32 param2, u32 param3) { sub_0207D570(param0->unk_5A4->unk_04, (u16)param2, 1, 12); sub_02074B30(param1, 6, ¶m3); @@ -2796,7 +2796,7 @@ static int sub_020815B8 (UnkStruct_0207F248 * param0) switch (sub_02002114(param0->unk_700, 12)) { case 0: { - UnkStruct_02073C74 * v2; + Pokemon * v2; UnkStruct_0205AA50 * v3; u32 v4; u32 v5; @@ -2858,7 +2858,7 @@ static int sub_0208170C (UnkStruct_0207F248 * param0) static int sub_02081760 (UnkStruct_0207F248 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_0205AA50 * v1; u32 v2; u32 v3; diff --git a/src/unk_020819DC.c b/src/unk_020819DC.c index f7ec9d35c0..fa99e50507 100644 --- a/src/unk_020819DC.c +++ b/src/unk_020819DC.c @@ -3,7 +3,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_0201D738.h" #include "struct_defs/struct_0205AA50.h" @@ -238,7 +238,7 @@ void sub_02081CF4 (UnkStruct_0207F248 * param0, const u8 * param1, u8 param2) void sub_02081E08 (UnkStruct_0207F248 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_02023790 * v1; if (param0->unk_5A4->unk_20 == 15) { @@ -269,7 +269,7 @@ static void sub_02081EAC (UnkStruct_0207F248 * param0, u8 param1) sub_0200C578(param0->unk_698, 0, ¶m0->unk_04[2 + param1 * 5], 28, 2); } -void sub_02081ED8 (UnkStruct_0207F248 * param0, UnkStruct_02073C74 * param1, u32 param2) +void sub_02081ED8 (UnkStruct_0207F248 * param0, Pokemon * param1, u32 param2) { UnkStruct_02023790 * v0; @@ -283,7 +283,7 @@ void sub_02081ED8 (UnkStruct_0207F248 * param0, UnkStruct_02073C74 * param1, u32 void sub_02081F2C (UnkStruct_0207F248 * param0, u8 param1) { UnkStruct_0205AA50 * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; v0 = ¶m0->unk_04[0 + param1 * 5]; @@ -432,7 +432,7 @@ void sub_020822F4 (UnkStruct_0207F248 * param0, u8 param1) void sub_0208232C (UnkStruct_0207F248 * param0, u8 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; sub_0201ADA4(¶m0->unk_04[0 + param1 * 5], 0); sub_0201ADA4(¶m0->unk_04[1 + param1 * 5], 0); @@ -456,7 +456,7 @@ void sub_0208232C (UnkStruct_0207F248 * param0, u8 param1) void sub_020823C4 (UnkStruct_0207F248 * param0, u8 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u8 v1; sub_0201ADA4(¶m0->unk_04[0 + param1 * 5], 0); @@ -484,7 +484,7 @@ void sub_020823C4 (UnkStruct_0207F248 * param0, u8 param1) void sub_0208245C (UnkStruct_0207F248 * param0, u8 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u8 v1; sub_0201ADA4(¶m0->unk_04[0 + param1 * 5], 0); @@ -500,7 +500,7 @@ void sub_0208245C (UnkStruct_0207F248 * param0, u8 param1) void sub_020824C0 (UnkStruct_0207F248 * param0, u8 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; u8 v1; sub_0201ADA4(¶m0->unk_04[0 + param1 * 5], 0); @@ -742,19 +742,19 @@ static void sub_02082964 (UnkStruct_0207F248 * param0, u8 param1, u8 param2) void sub_020829DC (UnkStruct_0207F248 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_02023790 * v1; u32 v2; u16 v3[6]; v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); - v3[0] = (u16)sub_02074470(v0, 164, NULL); - v3[1] = (u16)sub_02074470(v0, 165, NULL); - v3[2] = (u16)sub_02074470(v0, 166, NULL); - v3[3] = (u16)sub_02074470(v0, 168, NULL); - v3[4] = (u16)sub_02074470(v0, 169, NULL); - v3[5] = (u16)sub_02074470(v0, 167, NULL); + v3[0] = (u16)GetMonData(v0, MON_DATA_164, NULL); + v3[1] = (u16)GetMonData(v0, MON_DATA_165, NULL); + v3[2] = (u16)GetMonData(v0, MON_DATA_166, NULL); + v3[3] = (u16)GetMonData(v0, MON_DATA_168, NULL); + v3[4] = (u16)GetMonData(v0, MON_DATA_169, NULL); + v3[5] = (u16)GetMonData(v0, MON_DATA_167, NULL); sub_0201A7E8(param0->unk_00, ¶m0->unk_254[0], 0, 1, 1, 14, 12, 0, 576); sub_0200DC48(¶m0->unk_254[0], 1, 1, 14); diff --git a/src/unk_02082C2C.c b/src/unk_02082C2C.c index 66b87b85d3..f770b4a6d9 100644 --- a/src/unk_02082C2C.c +++ b/src/unk_02082C2C.c @@ -3,7 +3,7 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_0207F248.h" @@ -73,7 +73,7 @@ void sub_02082C2C (UnkStruct_0207F248 * param0) void sub_02082CEC (UnkStruct_0207F248 * param0, u8 param1, u16 param2, u16 param3, NARC * param4) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_ov7_0224F358 v1; u32 v2; @@ -84,7 +84,7 @@ void sub_02082CEC (UnkStruct_0207F248 * param0, u8 param1, u16 param2, u16 param sub_0200D9B4(param0->unk_5A8, param0->unk_5AC, param4, sub_02079D80(v0), 0, 4 + param1); - v2 = sub_02074470(v0, 76, NULL); + v2 = GetMonData(v0, MON_DATA_IS_EGG, NULL); v1.unk_00 = 4 + param1; v1.unk_04 = param2; @@ -104,7 +104,7 @@ void sub_02082CEC (UnkStruct_0207F248 * param0, u8 param1, u16 param2, u16 param void sub_02082DA8 (UnkStruct_0207F248 * param0, u8 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; NARC * v1; int v2, v3; u32 v4; @@ -113,8 +113,8 @@ void sub_02082DA8 (UnkStruct_0207F248 * param0, u8 param1) BOOL v7; v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param1); - v2 = sub_02074470(v0, 5, NULL); - v3 = sub_02074470(v0, 112, NULL); + v2 = GetMonData(v0, MON_DATA_SPECIES, NULL); + v3 = GetMonData(v0, MON_DATA_FORM, NULL); v1 = NARC_ctor(19, 12); v4 = NNS_G2dGetImageLocation(sub_02021F98(param0->unk_704[param1].unk_24), NNS_G2D_VRAM_TYPE_2DMAIN); v5 = sub_0200723C(v1, sub_02079D80(v0), 0, 12, 1); diff --git a/src/unk_02083370.c b/src/unk_02083370.c index 70ba844149..09dd24da07 100644 --- a/src/unk_02083370.c +++ b/src/unk_02083370.c @@ -3,7 +3,7 @@ #include "data_021BF67C.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_0203CDB0.h" @@ -163,7 +163,7 @@ static void sub_0208347C (UnkStruct_0207F248 * param0, int * param1) static void sub_020834B0 (UnkStruct_0207F248 * param0, int * param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; int v1; int v2 = 17; UnkStruct_0203CDB0 * v3; @@ -305,7 +305,7 @@ static void sub_020837F4 (UnkStruct_0207F248 * param0, int * param1) static int sub_0208384C (void * param0) { UnkStruct_0207F248 * v0 = param0; - UnkStruct_02073C74 * v1; + Pokemon * v1; v0 = param0; v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11); @@ -341,7 +341,7 @@ static int sub_020838F4 (void * param0) UnkStruct_0207F248 * v0 = param0; if (sub_0207D570(v0->unk_5A4->unk_04, v0->unk_704[v0->unk_B11].unk_0C, 1, 12) == 1) { - UnkStruct_02073C74 * v1; + Pokemon * v1; u32 v2; v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11); @@ -409,7 +409,7 @@ static void sub_020839FC (UnkStruct_0207F248 * param0, int * param1) int sub_02083A78 (void * param0) { UnkStruct_0207F248 * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; v0 = param0; v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11); @@ -843,9 +843,9 @@ static void sub_02084760 (UnkStruct_0207F248 * param0, int * param1) int sub_02084780 (UnkStruct_0207F248 * param0) { - UnkStruct_02073C74 * v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); + Pokemon * v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); - if (sub_02074470(v0, 162, NULL) == 0) { + if (GetMonData(v0, MON_DATA_162, NULL) == 0) { sub_0200B1B8(param0->unk_69C, 129, param0->unk_6A4); sub_02021CAC(param0->unk_5B0[22 + param0->unk_B11], 1); } else { diff --git a/src/unk_02084B70.c b/src/unk_02084B70.c index 57e4618537..9ce55cfc12 100644 --- a/src/unk_02084B70.c +++ b/src/unk_02084B70.c @@ -4,7 +4,7 @@ #include "data_021BF67C.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_0207D3B0_decl.h" #include "struct_defs/struct_0203CDB0.h" @@ -40,7 +40,7 @@ static int sub_020855C4(void * param0); static int sub_02085704(void * param0); static int sub_02085A70(void * param0); static int sub_02085C50(void * param0); -static void sub_02086590(UnkStruct_0207F248 * param0, UnkStruct_02073C74 * param1, u32 param2); +static void sub_02086590(UnkStruct_0207F248 * param0, Pokemon * param1, u32 param2); static int sub_02086438(void * param0); static int sub_0208648C(void * param0); static int sub_020864E4(void * param0); @@ -222,7 +222,7 @@ static u8 sub_02084B70 (u16 param0) static void sub_02084E58 (UnkStruct_0207F248 * param0, u16 param1, u32 param2) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_02023790 * v1; v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); @@ -437,19 +437,19 @@ static int sub_02085384 (void * param0) static int sub_02085424 (void * param0) { UnkStruct_0207F248 * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; u8 v2[7]; v0 = (UnkStruct_0207F248 *)param0; v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11); - v2[0] = sub_02074470(v1, 13, NULL); - v2[1] = sub_02074470(v1, 14, NULL); - v2[2] = sub_02074470(v1, 15, NULL); - v2[3] = sub_02074470(v1, 16, NULL); - v2[4] = sub_02074470(v1, 17, NULL); - v2[5] = sub_02074470(v1, 18, NULL); - v2[6] = sub_02074470(v1, 9, NULL); + v2[0] = GetMonData(v1, MON_DATA_HP_EV, NULL); + v2[1] = GetMonData(v1, MON_DATA_ATK_EV, NULL); + v2[2] = GetMonData(v1, MON_DATA_DEF_EV, NULL); + v2[3] = GetMonData(v1, MON_DATA_SPEED_EV, NULL); + v2[4] = GetMonData(v1, MON_DATA_SPATK_EV, NULL); + v2[5] = GetMonData(v1, MON_DATA_SPDEF_EV, NULL); + v2[6] = GetMonData(v1, MON_DATA_FRIENDSHIP, NULL); sub_02096F14(v0->unk_5A4->unk_00, v0->unk_5A4->unk_24, v0->unk_B11, 0, sub_02086930(v0), 12); sub_0207EF14(v0, v0->unk_B11); @@ -457,8 +457,8 @@ static int sub_02085424 (void * param0) sub_020822BC(v0, v0->unk_B11); sub_02083014(v0, v0->unk_B11, v0->unk_704[v0->unk_B11].unk_0E_0); - if ((v2[0] != sub_02074470(v1, 13, NULL)) || (v2[1] != sub_02074470(v1, 14, NULL)) || (v2[2] != sub_02074470(v1, 15, NULL)) || (v2[3] != sub_02074470(v1, 16, NULL)) || (v2[4] != sub_02074470(v1, 17, NULL)) || (v2[5] != sub_02074470(v1, 18, NULL))) { - if (v2[6] != sub_02074470(v1, 9, NULL)) { + if ((v2[0] != GetMonData(v1, MON_DATA_HP_EV, NULL)) || (v2[1] != GetMonData(v1, MON_DATA_ATK_EV, NULL)) || (v2[2] != GetMonData(v1, MON_DATA_DEF_EV, NULL)) || (v2[3] != GetMonData(v1, MON_DATA_SPEED_EV, NULL)) || (v2[4] != GetMonData(v1, MON_DATA_SPATK_EV, NULL)) || (v2[5] != GetMonData(v1, MON_DATA_SPDEF_EV, NULL))) { + if (v2[6] != GetMonData(v1, MON_DATA_FRIENDSHIP, NULL)) { sub_02084E58(v0, v0->unk_5A4->unk_24, 0); } else { sub_02084E58(v0, v0->unk_5A4->unk_24, 1); @@ -476,7 +476,7 @@ static int sub_02085424 (void * param0) static int sub_020855C4 (void * param0) { UnkStruct_0207F248 * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; UnkStruct_02023790 * v2; u32 v3; u32 v4; @@ -486,7 +486,7 @@ static int sub_020855C4 (void * param0) sub_02096F14(v0->unk_5A4->unk_00, v0->unk_5A4->unk_24, v0->unk_B11, 0, sub_02086930(v0), 12); v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11); - v3 = sub_02074470(v1, 163, NULL); + v3 = GetMonData(v1, MON_DATA_163, NULL); if (v0->unk_704[v0->unk_B11].unk_06 == 0) { v2 = sub_0200B1EC(v0->unk_69C, 70); @@ -519,11 +519,11 @@ static int sub_020855C4 (void * param0) static int sub_02085704 (void * param0) { UnkStruct_0207F248 * v0 = (UnkStruct_0207F248 *)param0; - UnkStruct_02073C74 * v1; + Pokemon * v1; u32 v2; v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11); - v2 = sub_02074470(v1, 163, NULL); + v2 = GetMonData(v1, MON_DATA_163, NULL); if (v0->unk_704[v0->unk_B11].unk_06 != v2) { v0->unk_704[v0->unk_B11].unk_06++; @@ -570,7 +570,7 @@ static u8 sub_020857C0 (UnkStruct_0207F248 * param0, u8 param1) int sub_02085804 (UnkStruct_0207F248 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_02023790 * v1; u32 v2; u8 v3; @@ -597,7 +597,7 @@ int sub_02085804 (UnkStruct_0207F248 * param0) v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); sub_02096954(v0, param0->unk_5A4->unk_24, 0, sub_02086930(param0), 12); - v2 = sub_02074470(v0, 163, NULL); + v2 = GetMonData(v0, MON_DATA_163, NULL); v1 = sub_0200B1EC(param0->unk_69C, 70); sub_0200B5CC(param0->unk_6A0, 0, sub_02076B10(v0)); @@ -616,7 +616,7 @@ int sub_02085804 (UnkStruct_0207F248 * param0) break; case 2: v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); - v2 = sub_02074470(v0, 163, NULL); + v2 = GetMonData(v0, MON_DATA_163, NULL); param0->unk_704[param0->unk_B11].unk_06++; @@ -660,7 +660,7 @@ int sub_02085804 (UnkStruct_0207F248 * param0) static int sub_02085A70 (void * param0) { UnkStruct_0207F248 * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; UnkStruct_02023790 * v2; u32 v3; u32 v4; @@ -668,18 +668,18 @@ static int sub_02085A70 (void * param0) v0 = (UnkStruct_0207F248 *)param0; v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11); - v0->unk_B14[0] = (u16)sub_02074470(v1, 164, NULL); - v0->unk_B14[1] = (u16)sub_02074470(v1, 165, NULL); - v0->unk_B14[2] = (u16)sub_02074470(v1, 166, NULL); - v0->unk_B14[3] = (u16)sub_02074470(v1, 168, NULL); - v0->unk_B14[4] = (u16)sub_02074470(v1, 169, NULL); - v0->unk_B14[5] = (u16)sub_02074470(v1, 167, NULL); + v0->unk_B14[0] = (u16)GetMonData(v1, MON_DATA_164, NULL); + v0->unk_B14[1] = (u16)GetMonData(v1, MON_DATA_165, NULL); + v0->unk_B14[2] = (u16)GetMonData(v1, MON_DATA_166, NULL); + v0->unk_B14[3] = (u16)GetMonData(v1, MON_DATA_168, NULL); + v0->unk_B14[4] = (u16)GetMonData(v1, MON_DATA_169, NULL); + v0->unk_B14[5] = (u16)GetMonData(v1, MON_DATA_167, NULL); sub_02096F14(v0->unk_5A4->unk_00, v0->unk_5A4->unk_24, v0->unk_B11, 0, sub_02086930(v0), 12); - v0->unk_704[v0->unk_B11].unk_0A = sub_02074470(v1, 161, NULL); - v0->unk_704[v0->unk_B11].unk_06 = sub_02074470(v1, 163, NULL); - v0->unk_704[v0->unk_B11].unk_08 = sub_02074470(v1, 164, NULL); + v0->unk_704[v0->unk_B11].unk_0A = GetMonData(v1, MON_DATA_161, NULL); + v0->unk_704[v0->unk_B11].unk_06 = GetMonData(v1, MON_DATA_163, NULL); + v0->unk_704[v0->unk_B11].unk_08 = GetMonData(v1, MON_DATA_164, NULL); v2 = sub_0200B1EC(v0->unk_69C, 193); @@ -713,7 +713,7 @@ static int sub_02085A70 (void * param0) static int sub_02085C50 (void * param0) { UnkStruct_0207F248 * v0; - UnkStruct_02073C74 * v1; + Pokemon * v1; UnkStruct_02023790 * v2; v0 = param0; @@ -804,7 +804,7 @@ static int sub_02085C50 (void * param0) break; case 6: { - UnkStruct_02073C74 * v3; + Pokemon * v3; UnkStruct_0203CDB0 * v4; int v5; @@ -827,7 +827,7 @@ static int sub_02085C50 (void * param0) int sub_02085EF4 (UnkStruct_0207F248 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_02023790 * v1; param0->unk_B00 = sub_02085C50; @@ -841,7 +841,7 @@ int sub_02085EF4 (UnkStruct_0207F248 * param0) return sub_02086008(param0); } - sub_0200B630(param0->unk_6A0, 1, sub_02074470(v0, 54 + param0->unk_5A4->unk_28, NULL)); + sub_0200B630(param0->unk_6A0, 1, GetMonData(v0, 54 + param0->unk_5A4->unk_28, NULL)); v1 = sub_0200B1EC(param0->unk_69C, 60); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); sub_020237BC(v1); @@ -927,13 +927,13 @@ static int sub_020860AC (void * param0) return 24; } -u8 sub_02086104 (UnkStruct_0207F248 * param0, UnkStruct_02073C74 * param1) +u8 sub_02086104 (UnkStruct_0207F248 * param0, Pokemon * param1) { u16 v0; u8 v1; for (v1 = 0; v1 < 4; v1++) { - v0 = (u16)sub_02074470(param1, 54 + v1, NULL); + v0 = (u16)GetMonData(param1, MON_DATA_MOVE1 + v1, NULL); if (v0 == param0->unk_5A4->unk_26) { return 0xfd; @@ -957,7 +957,7 @@ u8 sub_02086104 (UnkStruct_0207F248 * param0, UnkStruct_02073C74 * param1) int sub_0208615C (UnkStruct_0207F248 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_02023790 * v1; u32 v2; @@ -1014,7 +1014,7 @@ int sub_0208615C (UnkStruct_0207F248 * param0) int sub_020862F8 (UnkStruct_0207F248 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_02023790 * v1; v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); @@ -1025,7 +1025,7 @@ int sub_020862F8 (UnkStruct_0207F248 * param0) return sub_0208648C(param0); } - sub_0200B630(param0->unk_6A0, 1, sub_02074470(v0, 54 + param0->unk_5A4->unk_28, NULL)); + sub_0200B630(param0->unk_6A0, 1, GetMonData(v0, 54 + param0->unk_5A4->unk_28, NULL)); v1 = sub_0200B1EC(param0->unk_69C, 60); sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); sub_020237BC(v1); @@ -1037,7 +1037,7 @@ int sub_020862F8 (UnkStruct_0207F248 * param0) int sub_020863A0 (UnkStruct_0207F248 * param0) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_02023790 * v1; if (Unk_021BF67C.unk_48 & (PAD_BUTTON_A | PAD_BUTTON_B)) { @@ -1133,7 +1133,7 @@ static int sub_02086538 (void * param0) return 24; } -static void sub_02086590 (UnkStruct_0207F248 * param0, UnkStruct_02073C74 * param1, u32 param2) +static void sub_02086590 (UnkStruct_0207F248 * param0, Pokemon * param1, u32 param2) { u32 v0; @@ -1157,12 +1157,12 @@ static void sub_02086590 (UnkStruct_0207F248 * param0, UnkStruct_02073C74 * para static u8 sub_02086614 (UnkStruct_0207F248 * param0, u8 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; UnkStruct_02023790 * v1; u16 v2; v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); - v2 = (u16)sub_02074470(v0, 54 + param1, NULL); + v2 = (u16)GetMonData(v0, MON_DATA_MOVE1 + param1, NULL); v1 = sub_0200B1EC(param0->unk_69C, 162 + param1); sub_0200B630(param0->unk_6A0, 0, v2); @@ -1235,8 +1235,8 @@ int sub_02086774 (UnkStruct_0207F248 * param0) sub_02013A3C(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) { - UnkStruct_02073C74 * v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); - sub_02084E58(param0, param0->unk_5A4->unk_24, sub_02074470(v1, 54 + v0, NULL)); + Pokemon * v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); + sub_02084E58(param0, param0->unk_5A4->unk_24, GetMonData(v1, MON_DATA_MOVE1 + v0, NULL)); sub_0207D60C(param0->unk_5A4->unk_04, param0->unk_5A4->unk_24, 1, 12); sub_02005748(1516); } else { diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c index 2c0e4ba0ba..dc015f490e 100644 --- a/src/unk_0208694C.c +++ b/src/unk_0208694C.c @@ -14,7 +14,7 @@ #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_02087A10_decl.h" #include "constdata/const_020F2DAC.h" @@ -1139,9 +1139,9 @@ static int sub_02086F3C (UnkStruct_020067E8 * param0, int * param1) if (v0->unk_00 == 1) { u16 v3[10 + 1]; - UnkStruct_02073C74 * v4; + Pokemon * v4; - v4 = sub_02073C74(18); + v4 = AllocMonZeroed(18); sub_02073D80(v4, v0->unk_04, 5, 10, 10, 10, 10, 10); Heap_FreeToHeap(v4); } @@ -1417,9 +1417,9 @@ static void sub_0208737C (UnkStruct_02087A10 * param0, UnkStruct_020067E8 * para MI_CpuFill16(param0->unk_D8, 0x1, 32 * 2); if (param0->unk_00 == 1) { - UnkStruct_02073C74 * v1; + Pokemon * v1; - v1 = sub_02073C74(18); + v1 = AllocMonZeroed(18); sub_02073D80(v1, param0->unk_04, 5, 10, 10, 10, 10, 10); sub_0200B538(param0->unk_168, 0, sub_02076B10(v1)); Heap_FreeToHeap(v1); @@ -1485,7 +1485,7 @@ static void sub_02087544 (UnkStruct_02087A10 * param0, UnkStruct_020067E8 * para } if ((param0->unk_158 == 0) || sub_02086F14(param0->unk_D8)) { - UnkStruct_02073C74 * v4 = sub_02073C74(18); + Pokemon * v4 = AllocMonZeroed(18); sub_02073D80(v4, param0->unk_04, 1, 0, 0, 0, 0, 0); sub_0200B538(param0->unk_168, 0, sub_02076B10(v4)); diff --git a/src/unk_0208C324.c b/src/unk_0208C324.c index 3513e03248..cc9696f764 100644 --- a/src/unk_0208C324.c +++ b/src/unk_0208C324.c @@ -7,8 +7,8 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02025E6C_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_021C0794_decl.h" #include "constdata/const_020F410C.h" @@ -94,8 +94,8 @@ static void sub_0208C604(void * param0); static void sub_0208C884(UnkStruct_0208D7BC * param0); static void sub_0208C950(UnkStruct_0208D7BC * param0); static void sub_0208D1A4(UnkStruct_0208D7BC * param0); -static void sub_0208D1D4(UnkStruct_0208D7BC * param0, UnkStruct_02073C74_sub1 * param1, UnkStruct_0208D1D4 * param2); -static void sub_0208D200(UnkStruct_0208D7BC * param0, UnkStruct_02073C74 * param1, UnkStruct_0208D1D4 * param2); +static void sub_0208D1D4(UnkStruct_0208D7BC * param0, BoxPokemon * param1, UnkStruct_0208D1D4 * param2); +static void sub_0208D200(UnkStruct_0208D7BC * param0, Pokemon * param1, UnkStruct_0208D1D4 * param2); static void sub_0208D678(UnkStruct_0208D7BC * param0); static void sub_0208D618(UnkStruct_0208D7BC * param0); static void sub_0208D7EC(UnkStruct_0208D7BC * param0, u8 param1); @@ -881,13 +881,13 @@ static int sub_0208CF0C (UnkStruct_0208D7BC * param0) static int sub_0208CF78 (UnkStruct_0208D7BC * param0) { if (Unk_021BF67C.unk_48 & (PAD_BUTTON_A | PAD_BUTTON_B)) { - UnkStruct_02073C74_sub1 * v0; - UnkStruct_02073C74 * v1; + BoxPokemon * v0; + Pokemon * v1; u8 v2; if (param0->unk_24C->unk_11 == 2) { v0 = sub_0208DD48(param0); - v1 = sub_02073C74(19); + v1 = AllocMonZeroed(19); sub_020774C8(v0, v1); } else { v1 = sub_0208DD48(param0); @@ -897,41 +897,41 @@ static int sub_0208CF78 (UnkStruct_0208D7BC * param0) param0->unk_6A6 = 0; v2 = param0->unk_250.unk_45; - param0->unk_250.unk_45 = (u8)sub_02074470(v1, 19, NULL); + param0->unk_250.unk_45 = (u8)GetMonData(v1, MON_DATA_COOL, NULL); if (v2 != param0->unk_250.unk_45) { param0->unk_6A6 |= 1; } v2 = param0->unk_250.unk_46; - param0->unk_250.unk_46 = (u8)sub_02074470(v1, 20, NULL); + param0->unk_250.unk_46 = (u8)GetMonData(v1, MON_DATA_BEAUTY, NULL); if (v2 != param0->unk_250.unk_46) { param0->unk_6A6 |= 2; } v2 = param0->unk_250.unk_47; - param0->unk_250.unk_47 = (u8)sub_02074470(v1, 21, NULL); + param0->unk_250.unk_47 = (u8)GetMonData(v1, MON_DATA_CUTE, NULL); if (v2 != param0->unk_250.unk_47) { param0->unk_6A6 |= 4; } v2 = param0->unk_250.unk_48; - param0->unk_250.unk_48 = (u8)sub_02074470(v1, 22, NULL); + param0->unk_250.unk_48 = (u8)GetMonData(v1, MON_DATA_SMART, NULL); if (v2 != param0->unk_250.unk_48) { param0->unk_6A6 |= 8; } v2 = param0->unk_250.unk_49; - param0->unk_250.unk_49 = (u8)sub_02074470(v1, 23, NULL); + param0->unk_250.unk_49 = (u8)GetMonData(v1, MON_DATA_TOUGH, NULL); if (v2 != param0->unk_250.unk_49) { param0->unk_6A6 |= 16; } - param0->unk_250.unk_4A = (u8)sub_02074470(v1, 24, NULL); + param0->unk_250.unk_4A = (u8)GetMonData(v1, MON_DATA_SHEEN, NULL); if (param0->unk_24C->unk_11 == 2) { Heap_FreeToHeap(v1); @@ -1010,25 +1010,25 @@ static void sub_0208D1A4 (UnkStruct_0208D7BC * param0) } } -static void sub_0208D1D4 (UnkStruct_0208D7BC * param0, UnkStruct_02073C74_sub1 * param1, UnkStruct_0208D1D4 * param2) +static void sub_0208D1D4 (UnkStruct_0208D7BC * param0, BoxPokemon * param1, UnkStruct_0208D1D4 * param2) { - UnkStruct_02073C74 * v0 = sub_02073C74(19); + Pokemon * v0 = AllocMonZeroed(19); sub_020774C8(param1, v0); sub_0208D200(param0, v0, param2); Heap_FreeToHeap(v0); } -static void sub_0208D200 (UnkStruct_0208D7BC * param0, UnkStruct_02073C74 * param1, UnkStruct_0208D1D4 * param2) +static void sub_0208D200 (UnkStruct_0208D7BC * param0, Pokemon * param1, UnkStruct_0208D1D4 * param2) { - UnkStruct_02073C74_sub1 * v0; + BoxPokemon * v0; u16 v1; u8 v2; BOOL v3; v3 = sub_02073C88(param1); - param2->unk_0C = (u16)sub_02074470(param1, 5, NULL); + param2->unk_0C = (u16)GetMonData(param1, MON_DATA_SPECIES, NULL); v0 = sub_02076B10(param1); @@ -1044,23 +1044,23 @@ static void sub_0208D200 (UnkStruct_0208D7BC * param0, UnkStruct_02073C74 * para sub_0200B5EC(param0->unk_690, 0, v0); sub_0200C388(param0->unk_690, param0->unk_250.unk_08, param0->unk_694); - param2->unk_0E = (u16)sub_02074470(param1, 6, NULL); - param2->unk_12_0 = (u8)sub_02074470(param1, 161, NULL); - param2->unk_50_28 = sub_02074470(param1, 76, NULL); + param2->unk_0E = (u16)GetMonData(param1, MON_DATA_HELD_ITEM, NULL); + param2->unk_12_0 = (u8)GetMonData(param1, MON_DATA_161, NULL); + param2->unk_50_28 = GetMonData(param1, MON_DATA_IS_EGG, NULL); - if ((sub_02074470(param1, 176, NULL) == 1) && (param2->unk_50_28 == 0)) { + if ((GetMonData(param1, MON_DATA_176, NULL) == 1) && (param2->unk_50_28 == 0)) { param2->unk_12_7 = 0; } else { param2->unk_12_7 = 1; } param2->unk_13_0 = sub_02075D6C(param1); - param2->unk_13_2 = (u8)sub_02074470(param1, 155, NULL); - param2->unk_10 = (u8)sub_02074470(param1, 177, NULL); - param2->unk_11 = (u8)sub_02074470(param1, 178, NULL); - param2->unk_14 = sub_02074470(param1, 7, NULL); - param2->unk_18 = sub_02074470(param1, 8, NULL); - param2->unk_44 = (u8)sub_02074470(param1, 157, NULL); + param2->unk_13_2 = (u8)GetMonData(param1, MON_DATA_POKEBALL, NULL); + param2->unk_10 = (u8)GetMonData(param1, MON_DATA_177, NULL); + param2->unk_11 = (u8)GetMonData(param1, MON_DATA_178, NULL); + param2->unk_14 = GetMonData(param1, MON_DATA_OT_ID, NULL); + param2->unk_18 = GetMonData(param1, MON_DATA_EXP, NULL); + param2->unk_44 = (u8)GetMonData(param1, MON_DATA_OT_GENDER, NULL); param2->unk_1C = sub_02075AD0(param2->unk_0C, param2->unk_12_0); if (param2->unk_12_0 == 100) { @@ -1069,29 +1069,29 @@ static void sub_0208D200 (UnkStruct_0208D7BC * param0, UnkStruct_02073C74 * para param2->unk_20 = sub_02075AD0(param2->unk_0C, param2->unk_12_0 + 1); } - param2->unk_24 = (u16)sub_02074470(param1, 163, NULL); - param2->unk_26 = (u16)sub_02074470(param1, 164, NULL); - param2->unk_28 = (u16)sub_02074470(param1, 165, NULL); - param2->unk_2A = (u16)sub_02074470(param1, 166, NULL); - param2->unk_2C = (u16)sub_02074470(param1, 168, NULL); - param2->unk_2E = (u16)sub_02074470(param1, 169, NULL); - param2->unk_30 = (u16)sub_02074470(param1, 167, NULL); - param2->unk_32 = (u8)sub_02074470(param1, 10, NULL); + param2->unk_24 = (u16)GetMonData(param1, MON_DATA_163, NULL); + param2->unk_26 = (u16)GetMonData(param1, MON_DATA_164, NULL); + param2->unk_28 = (u16)GetMonData(param1, MON_DATA_165, NULL); + param2->unk_2A = (u16)GetMonData(param1, MON_DATA_166, NULL); + param2->unk_2C = (u16)GetMonData(param1, MON_DATA_168, NULL); + param2->unk_2E = (u16)GetMonData(param1, MON_DATA_169, NULL); + param2->unk_30 = (u16)GetMonData(param1, MON_DATA_167, NULL); + param2->unk_32 = (u8)GetMonData(param1, MON_DATA_10, NULL); param2->unk_33 = sub_02075BCC(param1); for (v1 = 0; v1 < 4; v1++) { - param2->unk_34[v1] = (u16)sub_02074470(param1, 54 + v1, NULL); - param2->unk_3C[v1] = (u8)sub_02074470(param1, 58 + v1, NULL); - v2 = (u8)sub_02074470(param1, 62 + v1, NULL); + param2->unk_34[v1] = (u16)GetMonData(param1, MON_DATA_MOVE1 + v1, NULL); + param2->unk_3C[v1] = (u8)GetMonData(param1, MON_DATA_58 + v1, NULL); + v2 = (u8)GetMonData(param1, MON_DATA_62 + v1, NULL); param2->unk_40[v1] = MoveTable_GetMoveMaxPP(param2->unk_34[v1], v2); } - param2->unk_45 = (u8)sub_02074470(param1, 19, NULL); - param2->unk_46 = (u8)sub_02074470(param1, 20, NULL); - param2->unk_47 = (u8)sub_02074470(param1, 21, NULL); - param2->unk_48 = (u8)sub_02074470(param1, 22, NULL); - param2->unk_49 = (u8)sub_02074470(param1, 23, NULL); - param2->unk_4A = (u8)sub_02074470(param1, 24, NULL); + param2->unk_45 = (u8)GetMonData(param1, MON_DATA_COOL, NULL); + param2->unk_46 = (u8)GetMonData(param1, MON_DATA_BEAUTY, NULL); + param2->unk_47 = (u8)GetMonData(param1, MON_DATA_CUTE, NULL); + param2->unk_48 = (u8)GetMonData(param1, MON_DATA_SMART, NULL); + param2->unk_49 = (u8)GetMonData(param1, MON_DATA_TOUGH, NULL); + param2->unk_4A = (u8)GetMonData(param1, MON_DATA_SHEEN, NULL); param2->unk_4B = 5; for (v1 = 0; v1 < 5; v1++) { @@ -1101,8 +1101,8 @@ static void sub_0208D200 (UnkStruct_0208D7BC * param0, UnkStruct_02073C74 * para } } - param2->unk_4C = sub_02074470(param1, 11, NULL); - param2->unk_4E = sub_02074470(param1, 112, NULL); + param2->unk_4C = GetMonData(param1, MON_DATA_11, NULL); + param2->unk_4E = GetMonData(param1, MON_DATA_FORM, NULL); param2->unk_50_0 = sub_0208E9F0(param1); if (sub_020778F8(param1) == 1) { @@ -1130,7 +1130,7 @@ static void sub_0208D200 (UnkStruct_0208D7BC * param0, UnkStruct_02073C74 * para param0->unk_6B1 = 0; for (v1 = 0; v1 < 80; v1++) { - if (sub_02074470(param1, sub_020923C0(v1, 0), NULL) != 0) { + if (GetMonData(param1, sub_020923C0(v1, 0), NULL) != 0) { param2->unk_54[v1 / 32] |= (1 << (v1 & 0x1f)); param0->unk_6B1++; } @@ -1512,11 +1512,11 @@ static BOOL sub_0208DBF4 (UnkStruct_0208D7BC * param0) static s8 sub_0208DC1C (UnkStruct_0208D7BC * param0, s8 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; s8 v1; v1 = (s8)param0->unk_24C->unk_14; - v0 = (UnkStruct_02073C74 *)param0->unk_24C->unk_00; + v0 = (Pokemon *)param0->unk_24C->unk_00; while (TRUE) { v1 += param1; @@ -1525,10 +1525,10 @@ static s8 sub_0208DC1C (UnkStruct_0208D7BC * param0, s8 param1) return -1; } - v0 = (UnkStruct_02073C74 *)((u32)param0->unk_24C->unk_00 + sub_02076AF0() * v1); + v0 = (Pokemon *)((u32)param0->unk_24C->unk_00 + sub_02076AF0() * v1); - if (sub_02074470(v0, 5, NULL) != 0) { - if (sub_02074470(v0, 76, NULL) != 0) { + if (GetMonData(v0, MON_DATA_SPECIES, NULL) != 0) { + if (GetMonData(v0, MON_DATA_IS_EGG, NULL) != 0) { if (sub_0208DBF4(param0) == 1) { break; } @@ -1543,7 +1543,7 @@ static s8 sub_0208DC1C (UnkStruct_0208D7BC * param0, s8 param1) static s8 sub_0208DC84 (UnkStruct_0208D7BC * param0, s8 param1) { - UnkStruct_02073C74 * v0; + Pokemon * v0; s8 v1; v1 = (s8)param0->unk_24C->unk_14; @@ -1557,8 +1557,8 @@ static s8 sub_0208DC84 (UnkStruct_0208D7BC * param0, s8 param1) v0 = Party_GetPokemonBySlotIndex(param0->unk_24C->unk_00, v1); - if (sub_02074470(v0, 5, NULL) != 0) { - if (sub_02074470(v0, 76, NULL) != 0) { + if (GetMonData(v0, MON_DATA_SPECIES, NULL) != 0) { + if (GetMonData(v0, MON_DATA_IS_EGG, NULL) != 0) { if (sub_0208DBF4(param0) == 1) { break; } @@ -1573,11 +1573,11 @@ static s8 sub_0208DC84 (UnkStruct_0208D7BC * param0, s8 param1) static s8 sub_0208DCE0 (UnkStruct_0208D7BC * param0, s8 param1) { - UnkStruct_02073C74_sub1 * v0; + BoxPokemon * v0; s8 v1; v1 = (s8)param0->unk_24C->unk_14; - v0 = (UnkStruct_02073C74_sub1 *)param0->unk_24C->unk_00; + v0 = (BoxPokemon *)param0->unk_24C->unk_00; while (TRUE) { v1 += param1; @@ -1586,10 +1586,10 @@ static s8 sub_0208DCE0 (UnkStruct_0208D7BC * param0, s8 param1) return -1; } - v0 = (UnkStruct_02073C74_sub1 *)((u32)param0->unk_24C->unk_00 + sub_02076AF4() * v1); + v0 = (BoxPokemon *)((u32)param0->unk_24C->unk_00 + sub_02076AF4() * v1); - if (sub_02074570(v0, 5, NULL) != 0) { - if (sub_02074570(v0, 76, NULL) != 0) { + if (sub_02074570(v0, MON_DATA_SPECIES, NULL) != 0) { + if (sub_02074570(v0, MON_DATA_IS_EGG, NULL) != 0) { if (sub_0208DBF4(param0) == 1) { break; } @@ -2216,11 +2216,11 @@ u32 sub_0208E9EC (void) return 62; } -u32 sub_0208E9F0 (UnkStruct_02073C74 * param0) +u32 sub_0208E9F0 (Pokemon * param0) { - u32 v0 = sub_02074470(param0, 160, NULL); + u32 v0 = GetMonData(param0, MON_DATA_160, NULL); - if (sub_02074470(param0, 163, NULL) == 0) { + if (GetMonData(param0, MON_DATA_163, NULL) == 0) { return 6; } else if ((v0 & (0x8 | 0x80)) != 0) { return 4; diff --git a/src/unk_0208FCF8.c b/src/unk_0208FCF8.c index cdc7721192..6313302f96 100644 --- a/src/unk_0208FCF8.c +++ b/src/unk_0208FCF8.c @@ -3,7 +3,7 @@ #include "struct_decls/struct_0200B144_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208D7BC.h" @@ -535,7 +535,7 @@ static void sub_02090578 (UnkStruct_0208D7BC * param0) sub_0201A9A4(¶m0->unk_244[5]); } -static void sub_02090800 (UnkStruct_0205AA50 * param0, UnkStruct_02073C74 * param1, BOOL param2) +static void sub_02090800 (UnkStruct_0205AA50 * param0, Pokemon * param1, BOOL param2) { UnkStruct_02090800 * v0 = sub_02092494(param1, param2, 19); @@ -575,7 +575,7 @@ static void sub_020908CC (UnkStruct_0208D7BC * param0) if (param0->unk_24C->unk_11 == 2) { { - UnkStruct_02073C74 * v3 = sub_02073C74(19); + Pokemon * v3 = AllocMonZeroed(19); sub_020774C8(v1, v3); sub_02090800(¶m0->unk_244[0], v3, v2); diff --git a/src/unk_02092494.c b/src/unk_02092494.c index bc485e499f..22ba9cd3c6 100644 --- a/src/unk_02092494.c +++ b/src/unk_02092494.c @@ -4,8 +4,8 @@ #include "struct_decls/struct_02023790_decl.h" #include "struct_decls/struct_02025E6C_decl.h" -#include "struct_defs/struct_02073C74.h" -#include "struct_defs/struct_02073C74_sub1.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_defs/struct_02090800.h" #include "unk_0200AC5C.h" @@ -18,7 +18,7 @@ #include "unk_02073C2C.h" #include "unk_02092494.h" -static int sub_02092E8C(UnkStruct_02073C74 * param0, BOOL param1, int param2); +static int sub_02092E8C(Pokemon * param0, BOOL param1, int param2); static void sub_02092878(UnkStruct_02090800 * param0); static void sub_020928A0(UnkStruct_02090800 * param0, int param1); static void sub_020929C0(UnkStruct_02090800 * param0, int param1); @@ -26,13 +26,13 @@ static void sub_02092B1C(UnkStruct_02090800 * param0, int param1, int param2); static void sub_02092C24(UnkStruct_02090800 * param0); static void sub_02092E10(UnkStruct_02090800 * param0); static void sub_02092E4C(UnkStruct_02090800 * param0); -static void sub_020932A4(UnkStruct_02073C74_sub1 * param0, UnkStruct_02025E6C * param1, int param2); -static void sub_020932F0(UnkStruct_02073C74_sub1 * param0, int param1, int param2); -static void sub_02093368(UnkStruct_02073C74_sub1 * param0, int param1); -static void sub_020933C8(UnkStruct_02073C74_sub1 * param0); -static void sub_020933E8(UnkStruct_02073C74_sub1 * param0); +static void sub_020932A4(BoxPokemon * param0, UnkStruct_02025E6C * param1, int param2); +static void sub_020932F0(BoxPokemon * param0, int param1, int param2); +static void sub_02093368(BoxPokemon * param0, int param1); +static void sub_020933C8(BoxPokemon * param0); +static void sub_020933E8(BoxPokemon * param0); -UnkStruct_02090800 * sub_02092494 (UnkStruct_02073C74 * param0, BOOL param1, int param2) +UnkStruct_02090800 * sub_02092494 (Pokemon * param0, BOOL param1, int param2) { UnkStruct_02090800 * v0; @@ -337,15 +337,15 @@ static void sub_020928A0 (UnkStruct_02090800 * param0, int param1) param0->unk_1C.unk_04 = sub_02023790((((2 * 18) * 2) * 8), param0->unk_00); sub_0200B1B8(param0->unk_04, param1, v0); - sub_0200B60C(param0->unk_08, 0, sub_02074470(param0->unk_0C, 149, NULL), 2, 2, 1); - sub_0200C2E0(param0->unk_08, 1, sub_02074470(param0->unk_0C, 150, NULL)); - sub_0200B60C(param0->unk_08, 2, sub_02074470(param0->unk_0C, 151, NULL), 2, 0, 1); - sub_0200B60C(param0->unk_08, 3, sub_02074470(param0->unk_0C, 156, NULL), 3, 0, 1); - sub_0200BECC(param0->unk_08, 4, sub_02074470(param0->unk_0C, 153, NULL)); - sub_0200B60C(param0->unk_08, 5, sub_02074470(param0->unk_0C, 146, NULL), 2, 2, 1); - sub_0200C2E0(param0->unk_08, 6, sub_02074470(param0->unk_0C, 147, NULL)); - sub_0200B60C(param0->unk_08, 7, sub_02074470(param0->unk_0C, 148, NULL), 2, 0, 1); - sub_0200BECC(param0->unk_08, 8, sub_02074470(param0->unk_0C, 152, NULL)); + sub_0200B60C(param0->unk_08, 0, GetMonData(param0->unk_0C, MON_DATA_149, NULL), 2, 2, 1); + sub_0200C2E0(param0->unk_08, 1, GetMonData(param0->unk_0C, MON_DATA_150, NULL)); + sub_0200B60C(param0->unk_08, 2, GetMonData(param0->unk_0C, MON_DATA_151, NULL), 2, 0, 1); + sub_0200B60C(param0->unk_08, 3, GetMonData(param0->unk_0C, MON_DATA_MET_LEVEL, NULL), 3, 0, 1); + sub_0200BECC(param0->unk_08, 4, GetMonData(param0->unk_0C, MON_DATA_153, NULL)); + sub_0200B60C(param0->unk_08, 5, GetMonData(param0->unk_0C, MON_DATA_146, NULL), 2, 2, 1); + sub_0200C2E0(param0->unk_08, 6, GetMonData(param0->unk_0C, MON_DATA_147, NULL)); + sub_0200B60C(param0->unk_08, 7, GetMonData(param0->unk_0C, MON_DATA_148, NULL), 2, 0, 1); + sub_0200BECC(param0->unk_08, 8, GetMonData(param0->unk_0C, MON_DATA_152, NULL)); sub_0200C388(param0->unk_08, param0->unk_1C.unk_04, v0); sub_020237BC(v0); } @@ -357,10 +357,12 @@ static void sub_020929C0 (UnkStruct_02090800 * param0, int param1) param0->unk_1C.unk_04 = sub_02023790((((2 * 18) * 2) * 4), param0->unk_00); sub_0200B1B8(param0->unk_04, param1, v0); - sub_0200B60C(param0->unk_08, 0, sub_02074470(param0->unk_0C, 149, NULL), 2, 2, 1); sub_0200C2E0(param0->unk_08, 1, sub_02074470(param0->unk_0C, 150, NULL)); sub_0200B60C(param0->unk_08, 2, sub_02074470(param0->unk_0C, 151, NULL), 2, 0, 1); - sub_0200B60C(param0->unk_08, 3, sub_02074470(param0->unk_0C, 156, NULL), 3, 0, 1); + sub_0200B60C(param0->unk_08, 0, GetMonData(param0->unk_0C, MON_DATA_149, NULL), 2, 2, 1); + sub_0200C2E0(param0->unk_08, 1, GetMonData(param0->unk_0C, MON_DATA_150, NULL)); + sub_0200B60C(param0->unk_08, 2, GetMonData(param0->unk_0C, MON_DATA_151, NULL), 2, 0, 1); + sub_0200B60C(param0->unk_08, 3, GetMonData(param0->unk_0C, MON_DATA_MET_LEVEL, NULL), 3, 0, 1); - switch (sub_02074470(param0->unk_0C, 122, NULL)) { + switch (GetMonData(param0->unk_0C, MON_DATA_MET_GAME, NULL)) { default: sub_0200BECC(param0->unk_08, 4, (sub_02017070(1, 7))); break; @@ -400,11 +402,15 @@ static void sub_02092B1C (UnkStruct_02090800 * param0, int param1, int param2) sub_0200B1B8(param0->unk_04, param1, v0); if (param2 == 0) { - sub_0200B60C(param0->unk_08, 5, sub_02074470(param0->unk_0C, 146, NULL), 2, 2, 1); sub_0200C2E0(param0->unk_08, 6, sub_02074470(param0->unk_0C, 147, NULL)); sub_0200B60C(param0->unk_08, 7, sub_02074470(param0->unk_0C, 148, NULL), 2, 0, 1); - sub_0200BECC(param0->unk_08, 8, sub_02074470(param0->unk_0C, 152, NULL)); + sub_0200B60C(param0->unk_08, 5, GetMonData(param0->unk_0C, MON_DATA_146, NULL), 2, 2, 1); + sub_0200C2E0(param0->unk_08, 6, GetMonData(param0->unk_0C, MON_DATA_147, NULL)); + sub_0200B60C(param0->unk_08, 7, GetMonData(param0->unk_0C, MON_DATA_148, NULL), 2, 0, 1); + sub_0200BECC(param0->unk_08, 8, GetMonData(param0->unk_0C, MON_DATA_152, NULL)); } else { - sub_0200B60C(param0->unk_08, 5, sub_02074470(param0->unk_0C, 149, NULL), 2, 2, 1); sub_0200C2E0(param0->unk_08, 6, sub_02074470(param0->unk_0C, 150, NULL)); sub_0200B60C(param0->unk_08, 7, sub_02074470(param0->unk_0C, 151, NULL), 2, 0, 1); - sub_0200BECC(param0->unk_08, 8, sub_02074470(param0->unk_0C, 153, NULL)); + sub_0200B60C(param0->unk_08, 5, GetMonData(param0->unk_0C, MON_DATA_149, NULL), 2, 2, 1); + sub_0200C2E0(param0->unk_08, 6, GetMonData(param0->unk_0C, MON_DATA_150, NULL)); + sub_0200B60C(param0->unk_08, 7, GetMonData(param0->unk_0C, MON_DATA_151, NULL), 2, 0, 1); + sub_0200BECC(param0->unk_08, 8, GetMonData(param0->unk_0C, MON_DATA_153, NULL)); } sub_0200C388(param0->unk_08, param0->unk_1C.unk_04, v0); @@ -427,14 +433,14 @@ static void sub_02092C24 (UnkStruct_02090800 * param0) param0->unk_24.unk_04 = sub_02023790(((2 * 18) * 2), param0->unk_00); - v0[0] = (sub_02074470(param0->unk_0C, 70, NULL)); - v0[1] = (sub_02074470(param0->unk_0C, 71, NULL)); - v0[2] = (sub_02074470(param0->unk_0C, 72, NULL)); - v0[3] = (sub_02074470(param0->unk_0C, 73, NULL)); - v0[4] = (sub_02074470(param0->unk_0C, 74, NULL)); - v0[5] = (sub_02074470(param0->unk_0C, 75, NULL)); + v0[0] = (GetMonData(param0->unk_0C, MON_DATA_HP_IV, NULL)); + v0[1] = (GetMonData(param0->unk_0C, MON_DATA_ATK_IV, NULL)); + v0[2] = (GetMonData(param0->unk_0C, MON_DATA_DEF_IV, NULL)); + v0[3] = (GetMonData(param0->unk_0C, MON_DATA_SPEED_IV, NULL)); + v0[4] = (GetMonData(param0->unk_0C, MON_DATA_SPATK_IV, NULL)); + v0[5] = (GetMonData(param0->unk_0C, MON_DATA_SPDEF_IV, NULL)); - switch ((sub_02074470(param0->unk_0C, 0, NULL) % 6)) { + switch ((GetMonData(param0->unk_0C, MON_DATA_PERSONALITY, NULL) % 6)) { default: case 0: v1 = 0; @@ -614,7 +620,7 @@ static void sub_02092E10 (UnkStruct_02090800 * param0) static void sub_02092E4C (UnkStruct_02090800 * param0) { - int v0 = sub_02074470(param0->unk_0C, 9, NULL); + int v0 = GetMonData(param0->unk_0C, MON_DATA_FRIENDSHIP, NULL); int v1; param0->unk_34.unk_04 = sub_02023790((((2 * 18) * 2) * 4), param0->unk_00); @@ -632,21 +638,21 @@ static void sub_02092E4C (UnkStruct_02090800 * param0) sub_0200B1B8(param0->unk_04, v1, param0->unk_34.unk_04); } -static int sub_02092E8C (UnkStruct_02073C74 * param0, BOOL param1, int param2) +static int sub_02092E8C (Pokemon * param0, BOOL param1, int param2) { int v0 = 0; - if (sub_02074470(param0, 76, NULL) == 0) { - if ((sub_02074470(param0, 152, NULL) == 0)) { - if (sub_02074470(param0, 153, NULL) == (sub_02017070(0, 55))) { + if (GetMonData(param0, MON_DATA_IS_EGG, NULL) == 0) { + if ((GetMonData(param0, MON_DATA_152, NULL) == 0)) { + if (GetMonData(param0, MON_DATA_153, NULL) == (sub_02017070(0, 55))) { v0 = 15; - } else if ((sub_02074470(param0, 110, NULL) == 1)) { + } else if ((GetMonData(param0, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 1)) { if (param1 == 1) { v0 = 7; } else { v0 = 8; } - } else if (sub_02074470(param0, 153, NULL) == (sub_02017070(1, 1))) { + } else if (GetMonData(param0, MON_DATA_153, NULL) == (sub_02017070(1, 1))) { v0 = 2; } else { if (param1 == 1) { @@ -656,14 +662,14 @@ static int sub_02092E8C (UnkStruct_02073C74 * param0, BOOL param1, int param2) } } } else { - if ((sub_02074470(param0, 110, NULL) == 1)) { - if (sub_02074470(param0, 152, NULL) == sub_02017070(1, 2)) { + if ((GetMonData(param0, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 1)) { + if (GetMonData(param0, MON_DATA_152, NULL) == sub_02017070(1, 2)) { if (param1 == 1) { v0 = 13; } else { v0 = 14; } - } else if (sub_02074470(param0, 152, NULL) == sub_02017070(2, 1)) { + } else if (GetMonData(param0, MON_DATA_152, NULL) == sub_02017070(2, 1)) { if (param1 == 1) { v0 = 11; } else { @@ -677,7 +683,7 @@ static int sub_02092E8C (UnkStruct_02073C74 * param0, BOOL param1, int param2) } } } else { - if ((sub_02074470(param0, 152, NULL) == sub_02017070(1, 1)) || (sub_02074470(param0, 152, NULL) == sub_02017070(1, 0)) || (sub_02074470(param0, 152, NULL) == sub_02017070(1, 9)) || (sub_02074470(param0, 152, NULL) == sub_02017070(1, 10)) || (sub_02074470(param0, 152, NULL) == sub_02017070(1, 11))) { + if ((GetMonData(param0, MON_DATA_152, NULL) == sub_02017070(1, 1)) || (GetMonData(param0, MON_DATA_152, NULL) == sub_02017070(1, 0)) || (GetMonData(param0, MON_DATA_152, NULL) == sub_02017070(1, 9)) || (GetMonData(param0, MON_DATA_152, NULL) == sub_02017070(1, 10)) || (GetMonData(param0, MON_DATA_152, NULL) == sub_02017070(1, 11))) { if (param1 == 1) { v0 = 5; } else { @@ -694,8 +700,8 @@ static int sub_02092E8C (UnkStruct_02073C74 * param0, BOOL param1, int param2) } } else { if (param1 == 1) { - if ((sub_02074470(param0, 110, NULL) == 1)) { - if (sub_02074470(param0, 152, NULL) == (sub_02017070(2, 1))) { + if ((GetMonData(param0, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 1)) { + if (GetMonData(param0, MON_DATA_152, NULL) == (sub_02017070(2, 1))) { v0 = 20; } else { v0 = 18; @@ -704,7 +710,7 @@ static int sub_02092E8C (UnkStruct_02073C74 * param0, BOOL param1, int param2) v0 = 16; } } else { - if ((sub_02074470(param0, 110, NULL) == 1)) { + if ((GetMonData(param0, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 1)) { v0 = 19; } else { v0 = 17; @@ -715,12 +721,12 @@ static int sub_02092E8C (UnkStruct_02073C74 * param0, BOOL param1, int param2) return v0; } -void sub_0209304C (UnkStruct_02073C74 * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4) +void sub_0209304C (Pokemon * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4) { - sub_0209305C(¶m0->unk_00, param1, param2, param3, param4); + sub_0209305C(¶m0->box, param1, param2, param3, param4); } -void sub_0209305C (UnkStruct_02073C74_sub1 * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4) +void sub_0209305C (BoxPokemon * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4) { switch (param2) { case 0: @@ -728,7 +734,7 @@ void sub_0209305C (UnkStruct_02073C74_sub1 * param0, UnkStruct_02025E6C * param1 param3 = (sub_02017070(2, 2)); } - if (sub_02074570(param0, 76, NULL) == 0) { + if (sub_02074570(param0, MON_DATA_IS_EGG, NULL) == 0) { sub_02093368(param0, 0); sub_020932F0(param0, param3, 1); sub_020933C8(param0); @@ -740,7 +746,7 @@ void sub_0209305C (UnkStruct_02073C74_sub1 * param0, UnkStruct_02025E6C * param1 sub_020932A4(param0, param1, param4); break; case 1: - if (sub_02074570(param0, 76, NULL) == 0) { + if (sub_02074570(param0, MON_DATA_IS_EGG, NULL) == 0) { sub_02093368(param0, 0); sub_020932F0(param0, (sub_02017070(1, 1)), 1); sub_020933C8(param0); @@ -761,7 +767,7 @@ void sub_0209305C (UnkStruct_02073C74_sub1 * param0, UnkStruct_02025E6C * param1 break; case 4: if (sub_0207884C(param0, param1, param4) == 1) { - if (sub_02074570(param0, 76, NULL) == 0) { + if (sub_02074570(param0, MON_DATA_IS_EGG, NULL) == 0) { sub_02093368(param0, 0); sub_020932F0(param0, param3, 1); sub_020933C8(param0); @@ -770,7 +776,7 @@ void sub_0209305C (UnkStruct_02073C74_sub1 * param0, UnkStruct_02025E6C * param1 sub_02093368(param0, 1); } } else { - if (sub_02074570(param0, 76, NULL) == 0) { + if (sub_02074570(param0, MON_DATA_IS_EGG, NULL) == 0) { sub_02093368(param0, 0); sub_020932F0(param0, param3, 1); sub_020933C8(param0); @@ -783,7 +789,7 @@ void sub_0209305C (UnkStruct_02073C74_sub1 * param0, UnkStruct_02025E6C * param1 sub_020933E8(param0); break; case 5: - if (sub_02074570(param0, 76, NULL) == 0) { + if (sub_02074570(param0, MON_DATA_IS_EGG, NULL) == 0) { (void)0; } else { sub_020932F0(param0, (sub_02017070(1, 2)), 1); @@ -798,17 +804,17 @@ void sub_0209305C (UnkStruct_02073C74_sub1 * param0, UnkStruct_02025E6C * param1 { int v0; - v0 = sub_02074570(param0, 153, NULL); - sub_02074C60(param0, 152, &v0); + v0 = sub_02074570(param0, MON_DATA_153, NULL); + SetBoxMonData(param0, 152, &v0); - v0 = sub_02074570(param0, 149, NULL); - sub_02074C60(param0, 146, &v0); + v0 = sub_02074570(param0, MON_DATA_149, NULL); + SetBoxMonData(param0, 146, &v0); - v0 = sub_02074570(param0, 150, NULL); - sub_02074C60(param0, 147, &v0); + v0 = sub_02074570(param0, MON_DATA_150, NULL); + SetBoxMonData(param0, 147, &v0); - v0 = sub_02074570(param0, 151, NULL); - sub_02074C60(param0, 148, &v0); + v0 = sub_02074570(param0, MON_DATA_151, NULL); + SetBoxMonData(param0, 148, &v0); } } @@ -818,62 +824,62 @@ void sub_0209305C (UnkStruct_02073C74_sub1 * param0, UnkStruct_02025E6C * param1 } } -static void sub_020932A4 (UnkStruct_02073C74_sub1 * param0, UnkStruct_02025E6C * param1, int param2) +static void sub_020932A4 (BoxPokemon * param0, UnkStruct_02025E6C * param1, int param2) { int v0 = sub_02025F20(param1); int v1 = sub_02025F30(param1); UnkStruct_02023790 * v2 = sub_02025F04(param1, param2); - sub_02074C60(param0, 7, &v0); - sub_02074C60(param0, 157, &v1); - sub_02074C60(param0, 145, v2); + SetBoxMonData(param0, 7, &v0); + SetBoxMonData(param0, 157, &v1); + SetBoxMonData(param0, 145, v2); sub_020237BC(v2); } -static void sub_020932F0 (UnkStruct_02073C74_sub1 * param0, int param1, int param2) +static void sub_020932F0 (BoxPokemon * param0, int param1, int param2) { RTCDate v0; sub_020138A4(&v0); if (param2 == 0) { - sub_02074C60(param0, 152, ¶m1); - sub_02074C60(param0, 146, &v0.year); - sub_02074C60(param0, 147, &v0.month); - sub_02074C60(param0, 148, &v0.day); + SetBoxMonData(param0, 152, ¶m1); + SetBoxMonData(param0, 146, &v0.year); + SetBoxMonData(param0, 147, &v0.month); + SetBoxMonData(param0, 148, &v0.day); } else { - sub_02074C60(param0, 153, ¶m1); - sub_02074C60(param0, 149, &v0.year); - sub_02074C60(param0, 150, &v0.month); - sub_02074C60(param0, 151, &v0.day); + SetBoxMonData(param0, 153, ¶m1); + SetBoxMonData(param0, 149, &v0.year); + SetBoxMonData(param0, 150, &v0.month); + SetBoxMonData(param0, 151, &v0.day); } } -static void sub_02093368 (UnkStruct_02073C74_sub1 * param0, int param1) +static void sub_02093368 (BoxPokemon * param0, int param1) { int v0 = 0; if (param1 == 0) { - sub_02074C60(param0, 152, &v0); - sub_02074C60(param0, 146, &v0); - sub_02074C60(param0, 147, &v0); - sub_02074C60(param0, 148, &v0); + SetBoxMonData(param0, 152, &v0); + SetBoxMonData(param0, 146, &v0); + SetBoxMonData(param0, 147, &v0); + SetBoxMonData(param0, 148, &v0); } else { - sub_02074C60(param0, 153, &v0); - sub_02074C60(param0, 149, &v0); - sub_02074C60(param0, 150, &v0); - sub_02074C60(param0, 151, &v0); + SetBoxMonData(param0, 153, &v0); + SetBoxMonData(param0, 149, &v0); + SetBoxMonData(param0, 150, &v0); + SetBoxMonData(param0, 151, &v0); } } -static void sub_020933C8 (UnkStruct_02073C74_sub1 * param0) +static void sub_020933C8 (BoxPokemon * param0) { - int v0 = sub_02074570(param0, 161, NULL); - sub_02074C60(param0, 156, &v0); + int v0 = sub_02074570(param0, MON_DATA_161, NULL); + SetBoxMonData(param0, 156, &v0); } -static void sub_020933E8 (UnkStruct_02073C74_sub1 * param0) +static void sub_020933E8 (BoxPokemon * param0) { int v0 = 1; - sub_02074C60(param0, 110, &v0); + SetBoxMonData(param0, 110, &v0); } diff --git a/src/unk_020933F8.c b/src/unk_020933F8.c index 6807138f4d..8be5fab499 100644 --- a/src/unk_020933F8.c +++ b/src/unk_020933F8.c @@ -15,8 +15,8 @@ #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_020507E4_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" -#include "struct_decls/struct_02073C74_sub1_decl.h" +#include "struct_defs/pokemon.h" +#include "struct_defs/box_pokemon.h" #include "struct_decls/struct_021C0794_decl.h" #include "constdata/const_020F55EC.h" @@ -98,7 +98,7 @@ static void sub_020944E8(UnkStruct_02095C48 * param0); static void sub_0209451C(UnkStruct_0201CD38 * param0, void * param1); static void sub_02094EB4(UnkStruct_02095C48 * param0, int param1, UnkStruct_ov6_02248DD8 * param2); static void sub_02094B30(UnkStruct_0201CD38 * param0, void * param1); -static int sub_02093B2C(UnkStruct_02073C74 * param0, int param1); +static int sub_02093B2C(Pokemon * param0, int param1); static void sub_020939E0(UnkStruct_02095C48 * param0, int param1, int param2); @@ -442,7 +442,7 @@ UnkStruct_02095C48 * sub_02093800 (const UnkStruct_02093800 * param0) v0->unk_148 = sub_02079FF4(20); for (v2 = 0; v2 < 4; v2++) { - v0->unk_00.unk_00[v2] = sub_02073C74(20); + v0->unk_00.unk_00[v2] = AllocMonZeroed(20); } for (v2 = 0; v2 < 4; v2++) { @@ -506,7 +506,7 @@ static void sub_020939E0 (UnkStruct_02095C48 * param0, int param1, int param2) param0->unk_00.unk_D8[v1] = sub_02023790(8, 20); } - sub_02074470(param0->unk_00.unk_00[v1], 145, param0->unk_00.unk_D8[v1]); + GetMonData(param0->unk_00.unk_00[v1], MON_DATA_145, param0->unk_00.unk_D8[v1]); } for (v1 = 1; v1 < 4; v1++) { @@ -546,7 +546,7 @@ void sub_02093AD4 (UnkStruct_02095C48 * param0) Heap_Destroy(20); } -static int sub_02093B2C (UnkStruct_02073C74 * param0, int param1) +static int sub_02093B2C (Pokemon * param0, int param1) { int v0, v1, v2; @@ -555,19 +555,19 @@ static int sub_02093B2C (UnkStruct_02073C74 * param0, int param1) for (v1 = 0; v1 <= 3; v1++) { switch (param1) { case 0: - v2 = sub_02074470(param0, 123 + v1, NULL); + v2 = GetMonData(param0, MON_DATA_123 + v1, NULL); break; case 1: - v2 = sub_02074470(param0, 127 + v1, NULL); + v2 = GetMonData(param0, MON_DATA_127 + v1, NULL); break; case 2: - v2 = sub_02074470(param0, 131 + v1, NULL); + v2 = GetMonData(param0, MON_DATA_131 + v1, NULL); break; case 3: - v2 = sub_02074470(param0, 135 + v1, NULL); + v2 = GetMonData(param0, MON_DATA_135 + v1, NULL); break; case 4: - v2 = sub_02074470(param0, 139 + v1, NULL); + v2 = GetMonData(param0, MON_DATA_139 + v1, NULL); break; default: GF_ASSERT(0); @@ -1145,7 +1145,7 @@ void sub_02094648 (UnkStruct_02095C48 * param0, int param1, UnkStruct_0200B358 * void sub_02094680 (UnkStruct_02095C48 * param0, int param1, UnkStruct_0200B358 * param2, u32 param3) { - UnkStruct_02073C74_sub1 * v0; + BoxPokemon * v0; int v1; v1 = sub_02095904(param1); @@ -1319,7 +1319,7 @@ BOOL sub_02094868 (UnkStruct_02095C48 * param0) v0 = sub_02095A3C(param0->unk_00.unk_110, param0->unk_00.unk_10F); - if (sub_02074470(param0->unk_1974, v0, NULL) == 0) { + if (GetMonData(param0->unk_1974, v0, NULL) == 0) { return 0; } @@ -1618,7 +1618,7 @@ void sub_02094C44 (UnkStruct_02095C48 * param0, UnkStruct_021C0794 * param1, u32 v2 = sub_02095A3C(param0->unk_00.unk_110, param0->unk_00.unk_10F); - if (sub_02074470(param0->unk_1974, v2, NULL) == 0) { + if (GetMonData(param0->unk_1974, v2, NULL) == 0) { v0 = 1; } diff --git a/src/unk_02094EDC.c b/src/unk_02094EDC.c index bd8a77b4bc..c6d7ad728a 100644 --- a/src/unk_02094EDC.c +++ b/src/unk_02094EDC.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02007C7C_decl.h" #include "struct_decls/struct_0200B144_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_02008A90.h" #include "struct_defs/struct_020951B0.h" @@ -617,7 +617,7 @@ void sub_02095338 (UnkStruct_02095C48 * param0) } } -void sub_02095380 (const UnkStruct_ov6_02248BE8 * param0, UnkStruct_02073C74 * param1, int param2) +void sub_02095380 (const UnkStruct_ov6_02248BE8 * param0, Pokemon * param1, int param2) { int v0; u16 v1; @@ -666,7 +666,7 @@ void sub_02095380 (const UnkStruct_ov6_02248BE8 * param0, UnkStruct_02073C74 * p } } -UnkStruct_02007C7C * sub_02095484 (UnkStruct_02007768 * param0, int param1, UnkStruct_02073C74 * param2, int param3, UnkStruct_ov16_0223E0C8 * param4, int param5, int param6, int param7, int param8) +UnkStruct_02007C7C * sub_02095484 (UnkStruct_02007768 * param0, int param1, Pokemon * param2, int param3, UnkStruct_ov16_0223E0C8 * param4, int param5, int param6, int param7, int param8) { UnkStruct_02008A90 v0; UnkStruct_02007C7C * v1; diff --git a/src/unk_02096420.c b/src/unk_02096420.c index 7091961e95..c03a3eb72e 100644 --- a/src/unk_02096420.c +++ b/src/unk_02096420.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_0207D3B0_decl.h" @@ -12,15 +12,15 @@ #include "item.h" #include "unk_02096420.h" -static u8 sub_02096F34(UnkStruct_02073C74 * param0, u32 param1); -static u8 sub_02096F84(UnkStruct_02073C74 * param0, u32 param1, u32 param2); -static u8 sub_02097004(UnkStruct_02073C74 * param0, u32 param1, u32 param2); -static void sub_020970AC(UnkStruct_02073C74 * param0, u32 param1, u32 param2, u32 param3); +static u8 sub_02096F34(Pokemon * param0, u32 param1); +static u8 sub_02096F84(Pokemon * param0, u32 param1, u32 param2); +static u8 sub_02097004(Pokemon * param0, u32 param1, u32 param2); +static void sub_020970AC(Pokemon * param0, u32 param1, u32 param2, u32 param3); static s32 sub_020970EC(s32 param0, s32 param1, s32 param2); -static u8 sub_020971D0(UnkStruct_02073C74 * param0, s32 param1, s32 param2, u16 param3, u32 param4); -static u8 sub_02097144(UnkStruct_02073C74 * param0, UnkStruct_0207D3B0 * param1); +static u8 sub_020971D0(Pokemon * param0, s32 param1, s32 param2, u16 param3, u32 param4); +static u8 sub_02097144(Pokemon * param0, UnkStruct_0207D3B0 * param1); -u8 sub_02096420 (UnkStruct_02073C74 * param0, u16 param1, u16 param2, u32 param3) +u8 sub_02096420 (Pokemon * param0, u16 param1, u16 param2, u32 param3) { UnkStruct_0207D3B0 * v0; s32 v1[8]; @@ -32,7 +32,7 @@ u8 sub_02096420 (UnkStruct_02073C74 * param0, u16 param1, u16 param2, u32 param3 return 0; } - v1[0] = sub_02074470(param0, 160, NULL); + v1[0] = GetMonData(param0, MON_DATA_160, NULL); if (Item_GetAttributeFromStruct(v0, 15) != 0) { if ((v1[0] & 0x7) != 0) { @@ -69,7 +69,7 @@ u8 sub_02096420 (UnkStruct_02073C74 * param0, u16 param1, u16 param2, u32 param3 } } - v1[0] = sub_02074470(param0, 163, NULL); + v1[0] = GetMonData(param0, MON_DATA_163, NULL); if (((Item_GetAttributeFromStruct(v0, 23) != 0) || (Item_GetAttributeFromStruct(v0, 24) != 0)) && (Item_GetAttributeFromStruct(v0, 25) == 0)) { if (v1[0] == 0) { @@ -77,14 +77,14 @@ u8 sub_02096420 (UnkStruct_02073C74 * param0, u16 param1, u16 param2, u32 param3 return 1; } } else if (Item_GetAttributeFromStruct(v0, 38) != 0) { - if ((v1[0] != 0) && (v1[0] < sub_02074470(param0, 164, NULL))) { + if ((v1[0] != 0) && (v1[0] < GetMonData(param0, MON_DATA_164, NULL))) { Heap_FreeToHeap(v0); return 1; } } if (Item_GetAttributeFromStruct(v0, 25) != 0) { - if (sub_02074470(param0, 161, NULL) < 100) { + if (GetMonData(param0, MON_DATA_161, NULL) < 100) { Heap_FreeToHeap(v0); return 1; } @@ -98,7 +98,7 @@ u8 sub_02096420 (UnkStruct_02073C74 * param0, u16 param1, u16 param2, u32 param3 } if ((Item_GetAttributeFromStruct(v0, 34) != 0) || (Item_GetAttributeFromStruct(v0, 35) != 0)) { - if ((sub_02074470(param0, 62 + param2, NULL) < 3) && (MoveTable_GetMoveMaxPP(sub_02074470(param0, 54 + param2, NULL), 0) >= 5)) { + if ((GetMonData(param0, MON_DATA_62 + param2, NULL) < 3) && (MoveTable_GetMoveMaxPP(GetMonData(param0, MON_DATA_MOVE1 + param2, NULL), 0) >= 5)) { Heap_FreeToHeap(v0); return 1; } @@ -120,14 +120,14 @@ u8 sub_02096420 (UnkStruct_02073C74 * param0, u16 param1, u16 param2, u32 param3 } } - v1[0] = sub_02074470(param0, 13, NULL); - v1[1] = sub_02074470(param0, 14, NULL); - v1[2] = sub_02074470(param0, 15, NULL); - v1[3] = sub_02074470(param0, 16, NULL); - v1[4] = sub_02074470(param0, 17, NULL); - v1[5] = sub_02074470(param0, 18, NULL); + v1[0] = GetMonData(param0, MON_DATA_HP_EV, NULL); + v1[1] = GetMonData(param0, MON_DATA_ATK_EV, NULL); + v1[2] = GetMonData(param0, MON_DATA_DEF_EV, NULL); + v1[3] = GetMonData(param0, MON_DATA_SPEED_EV, NULL); + v1[4] = GetMonData(param0, MON_DATA_SPATK_EV, NULL); + v1[5] = GetMonData(param0, MON_DATA_SPDEF_EV, NULL); - if (sub_02074470(param0, 5, NULL) != 292) { + if (GetMonData(param0, MON_DATA_SPECIES, NULL) != 292) { if (Item_GetAttributeFromStruct(v0, 39) != 0) { v1[6] = Item_GetAttributeFromStruct(v0, 48); @@ -262,11 +262,11 @@ u8 sub_02096420 (UnkStruct_02073C74 * param0, u16 param1, u16 param2, u32 param3 u8 sub_0209693C (Party * param0, u16 param1, u8 param2, u8 param3, u32 param4) { - UnkStruct_02073C74 * v0 = Party_GetPokemonBySlotIndex(param0, param2); + Pokemon * v0 = Party_GetPokemonBySlotIndex(param0, param2); return sub_02096420(v0, param1, param3, param4); } -u8 sub_02096954 (UnkStruct_02073C74 * param0, u16 param1, u16 param2, u16 param3, u32 param4) +u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param4) { UnkStruct_0207D3B0 * v0; s32 v1[8]; @@ -283,7 +283,7 @@ u8 sub_02096954 (UnkStruct_02073C74 * param0, u16 param1, u16 param2, u16 param3 v2 = 0; v3 = 0; - v1[0] = sub_02074470(param0, 160, NULL); + v1[0] = GetMonData(param0, MON_DATA_160, NULL); v1[1] = v1[0]; if (Item_GetAttributeFromStruct(v0, 15) != 0) { @@ -316,8 +316,8 @@ u8 sub_02096954 (UnkStruct_02073C74 * param0, u16 param1, u16 param2, u16 param3 v2 = 1; } - v1[0] = sub_02074470(param0, 163, NULL); - v1[1] = sub_02074470(param0, 164, NULL); + v1[0] = GetMonData(param0, MON_DATA_163, NULL); + v1[1] = GetMonData(param0, MON_DATA_164, NULL); if (((Item_GetAttributeFromStruct(v0, 23) != 0) || (Item_GetAttributeFromStruct(v0, 24) != 0)) && (Item_GetAttributeFromStruct(v0, 25) != 0)) { if (v1[0] == 0) { @@ -335,15 +335,15 @@ u8 sub_02096954 (UnkStruct_02073C74 * param0, u16 param1, u16 param2, u16 param3 v3 = 1; } - v1[2] = sub_02074470(param0, 161, NULL); + v1[2] = GetMonData(param0, MON_DATA_161, NULL); if (Item_GetAttributeFromStruct(v0, 25) != 0) { if (v1[2] < 100) { - sub_0207536C(param0, 8, sub_02075A70(param0)); + sub_0207536C(param0, MON_DATA_EXP, sub_02075A70(param0)); sub_0207418C(param0); if (v1[0] == 0) { - v1[3] = sub_02074470(param0, 164, NULL); + v1[3] = GetMonData(param0, MON_DATA_164, NULL); sub_020970AC(param0, v1[0], v1[3], v1[3] - v1[1]); } @@ -387,14 +387,14 @@ u8 sub_02096954 (UnkStruct_02073C74 * param0, u16 param1, u16 param2, u16 param3 v3 = 1; } - v1[0] = sub_02074470(param0, 13, NULL); - v1[1] = sub_02074470(param0, 14, NULL); - v1[2] = sub_02074470(param0, 15, NULL); - v1[3] = sub_02074470(param0, 16, NULL); - v1[4] = sub_02074470(param0, 17, NULL); - v1[5] = sub_02074470(param0, 18, NULL); + v1[0] = GetMonData(param0, MON_DATA_HP_EV, NULL); + v1[1] = GetMonData(param0, MON_DATA_ATK_EV, NULL); + v1[2] = GetMonData(param0, MON_DATA_DEF_EV, NULL); + v1[3] = GetMonData(param0, MON_DATA_SPEED_EV, NULL); + v1[4] = GetMonData(param0, MON_DATA_SPATK_EV, NULL); + v1[5] = GetMonData(param0, MON_DATA_SPDEF_EV, NULL); - if (sub_02074470(param0, 5, NULL) != 292) { + if (GetMonData(param0, MON_DATA_SPECIES, NULL) != 292) { if (Item_GetAttributeFromStruct(v0, 39) != 0) { v1[7] = Item_GetAttributeFromStruct(v0, 48); v1[6] = sub_020970EC(v1[0], (v1[1] + v1[2] + v1[3] + v1[4] + v1[5]), v1[7]); @@ -497,7 +497,7 @@ u8 sub_02096954 (UnkStruct_02073C74 * param0, u16 param1, u16 param2, u16 param3 return 0; } - v1[0] = sub_02074470(param0, 9, NULL); + v1[0] = GetMonData(param0, MON_DATA_FRIENDSHIP, NULL); if (v1[0] < 100) { if (Item_GetAttributeFromStruct(v0, 45) != 0) { @@ -528,25 +528,25 @@ u8 sub_02096954 (UnkStruct_02073C74 * param0, u16 param1, u16 param2, u16 param3 u8 sub_02096F14 (Party * param0, u16 param1, u8 param2, u8 param3, u16 param4, u32 param5) { - UnkStruct_02073C74 * v0 = Party_GetPokemonBySlotIndex(param0, param2); + Pokemon * v0 = Party_GetPokemonBySlotIndex(param0, param2); return sub_02096954(v0, param1, param3, param4, param5); } -static u8 sub_02096F34 (UnkStruct_02073C74 * param0, u32 param1) +static u8 sub_02096F34 (Pokemon * param0, u32 param1) { u16 v0; u8 v1; u8 v2; - v0 = (u16)sub_02074470(param0, 54 + param1, NULL); + v0 = (u16)GetMonData(param0, MON_DATA_MOVE1 + param1, NULL); if (v0 == 0) { return 0; } - v1 = (u8)sub_02074470(param0, 58 + param1, NULL); - v2 = (u8)sub_02074470(param0, 62 + param1, NULL); + v1 = (u8)GetMonData(param0, MON_DATA_58 + param1, NULL); + v2 = (u8)GetMonData(param0, MON_DATA_62 + param1, NULL); if (v1 < MoveTable_GetMoveMaxPP(v0, v2)) { return 1; @@ -555,20 +555,20 @@ static u8 sub_02096F34 (UnkStruct_02073C74 * param0, u32 param1) return 0; } -static u8 sub_02096F84 (UnkStruct_02073C74 * param0, u32 param1, u32 param2) +static u8 sub_02096F84 (Pokemon * param0, u32 param1, u32 param2) { u16 v0; u8 v1; u8 v2; - v0 = (u16)sub_02074470(param0, 54 + param1, NULL); + v0 = (u16)GetMonData(param0, MON_DATA_MOVE1 + param1, NULL); if (v0 == 0) { return 0; } - v1 = (u8)sub_02074470(param0, 58 + param1, NULL); - v2 = (u8)MoveTable_GetMoveMaxPP(v0, sub_02074470(param0, 62 + param1, NULL)); + v1 = (u8)GetMonData(param0, MON_DATA_58 + param1, NULL); + v2 = (u8)MoveTable_GetMoveMaxPP(v0, GetMonData(param0, MON_DATA_62 + param1, NULL)); if (v1 < v2) { if (param2 == 127) { @@ -588,26 +588,26 @@ static u8 sub_02096F84 (UnkStruct_02073C74 * param0, u32 param1, u32 param2) return 0; } -static u8 sub_02097004 (UnkStruct_02073C74 * param0, u32 param1, u32 param2) +static u8 sub_02097004 (Pokemon * param0, u32 param1, u32 param2) { u16 v0; u8 v1; u8 v2; u8 v3; - v2 = sub_02074470(param0, 62 + param1, NULL); + v2 = GetMonData(param0, MON_DATA_62 + param1, NULL); if (v2 == 3) { return 0; } - v0 = (u16)sub_02074470(param0, 54 + param1, NULL); + v0 = (u16)GetMonData(param0, MON_DATA_MOVE1 + param1, NULL); if (MoveTable_GetMoveMaxPP(v0, 0) < 5) { return 0; } - v1 = (u8)sub_02074470(param0, 58 + param1, NULL); + v1 = (u8)GetMonData(param0, MON_DATA_58 + param1, NULL); v3 = (u8)MoveTable_GetMoveMaxPP(v0, v2); if (v2 + param2 > 3) { @@ -624,7 +624,7 @@ static u8 sub_02097004 (UnkStruct_02073C74 * param0, u32 param1, u32 param2) return 1; } -static void sub_020970AC (UnkStruct_02073C74 * param0, u32 param1, u32 param2, u32 param3) +static void sub_020970AC (Pokemon * param0, u32 param1, u32 param2, u32 param3) { if (param2 == 1) { param3 = 1; @@ -674,12 +674,12 @@ static s32 sub_020970EC (s32 param0, s32 param1, s32 param2) return param0; } -static u8 sub_02097144 (UnkStruct_02073C74 * param0, UnkStruct_0207D3B0 * param1) +static u8 sub_02097144 (Pokemon * param0, UnkStruct_0207D3B0 * param1) { s32 v0; s32 v1; - v0 = sub_02074470(param0, 9, NULL); + v0 = GetMonData(param0, MON_DATA_FRIENDSHIP, NULL); if (v0 >= 255) { return 0; @@ -714,7 +714,7 @@ static u8 sub_02097144 (UnkStruct_02073C74 * param0, UnkStruct_0207D3B0 * param1 return 0; } -static u8 sub_020971D0 (UnkStruct_02073C74 * param0, s32 param1, s32 param2, u16 param3, u32 param4) +static u8 sub_020971D0 (Pokemon * param0, s32 param1, s32 param2, u16 param3, u32 param4) { if ((param1 == 255) && (param2 > 0)) { return 0; @@ -725,15 +725,15 @@ static u8 sub_020971D0 (UnkStruct_02073C74 * param0, s32 param1, s32 param2, u16 } if (param2 > 0) { - if (Item_GetAttribute(sub_02074470(param0, 6, NULL), 1, param4) == 53) { + if (Item_GetAttribute(GetMonData(param0, MON_DATA_HELD_ITEM, NULL), 1, param4) == 53) { param2 = param2 * 150 / 100; } - if (sub_02074470(param0, 155, NULL) == 11) { + if (GetMonData(param0, MON_DATA_POKEBALL, NULL) == 11) { param2++; } - if (sub_02074470(param0, 152, NULL) == param3) { + if (GetMonData(param0, MON_DATA_152, NULL) == param3) { param2++; } } @@ -756,18 +756,18 @@ void sub_02097284 (Party * param0) { int v0, v1, v2; u32 v3; - UnkStruct_02073C74 * v4; + Pokemon * v4; v2 = Party_GetCurrentCount(param0); for (v0 = 0; v0 < v2; v0++) { v4 = Party_GetPokemonBySlotIndex(param0, v0); - if (sub_02074470(v4, 172, NULL) == 0) { + if (GetMonData(v4, MON_DATA_172, NULL) == 0) { continue; } - v3 = sub_02074470(v4, 164, NULL); + v3 = GetMonData(v4, MON_DATA_164, NULL); sub_02074B30(v4, 163, &v3); v3 = 0; diff --git a/src/unk_02097624.c b/src/unk_02097624.c index 8550eb0ca3..0e549a3e39 100644 --- a/src/unk_02097624.c +++ b/src/unk_02097624.c @@ -3,7 +3,7 @@ #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_02028430_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_021C0794_decl.h" #include "struct_defs/struct_02014A84.h" @@ -43,14 +43,14 @@ static int sub_020979A8(UnkStruct_020067E8 * param0, int * param1); static int sub_02097AF8(UnkStruct_020067E8 * param0, int * param1); UnkStruct_02097728 * sub_02097624(UnkStruct_021C0794 * param0, int param1, u8 param2, u8 param3, int param4); UnkStruct_02097728 * sub_0209767C(UnkStruct_021C0794 * param0, int param1, u16 param2, int param3); -UnkStruct_02097728 * sub_020976BC(UnkStruct_021C0794 * param0, UnkStruct_02073C74 * param1, int param2); +UnkStruct_02097728 * sub_020976BC(UnkStruct_021C0794 * param0, Pokemon * param1, int param2); UnkStruct_02097728 * sub_020976F4(UnkStruct_021C0794 * param0, u8 param1, int param2); BOOL sub_02097728(UnkStruct_02097728 * param0); int sub_0209772C(UnkStruct_02097728 * param0, int param1, u8 param2); -int sub_02097750(UnkStruct_02097728 * param0, UnkStruct_02073C74 * param1); +int sub_02097750(UnkStruct_02097728 * param0, Pokemon * param1); void sub_02097770(UnkStruct_02097728 * param0); -int sub_02097788(UnkStruct_02028430 * param0, UnkStruct_02073C74 * param1, int param2); -int sub_020977E4(UnkStruct_02028430 * param0, u16 param1, UnkStruct_02073C74 * param2, int param3); +int sub_02097788(UnkStruct_02028430 * param0, Pokemon * param1, int param2); +int sub_020977E4(UnkStruct_02028430 * param0, u16 param1, Pokemon * param2, int param3); UnkStruct_020978D8 * sub_02097834(const UnkStruct_0202818C * param0, int param1); void sub_020978D8(UnkStruct_020978D8 * param0); void sub_020978F0(UnkStruct_0202818C * param0, UnkStruct_020978D8 * param1); @@ -109,7 +109,7 @@ UnkStruct_02097728 * sub_0209767C (UnkStruct_021C0794 * param0, int param1, u16 return v0; } -UnkStruct_02097728 * sub_020976BC (UnkStruct_021C0794 * param0, UnkStruct_02073C74 * param1, int param2) +UnkStruct_02097728 * sub_020976BC (UnkStruct_021C0794 * param0, Pokemon * param1, int param2) { UnkStruct_02097728 * v0; @@ -120,7 +120,7 @@ UnkStruct_02097728 * sub_020976BC (UnkStruct_021C0794 * param0, UnkStruct_02073C v0->unk_10 = param0; v0->unk_14 = sub_0202818C(param2); - sub_02074470(param1, 170, v0->unk_14); + GetMonData(param1, MON_DATA_170, v0->unk_14); return v0; } @@ -154,7 +154,7 @@ int sub_0209772C (UnkStruct_02097728 * param0, int param1, u8 param2) return 1; } -int sub_02097750 (UnkStruct_02097728 * param0, UnkStruct_02073C74 * param1) +int sub_02097750 (UnkStruct_02097728 * param0, Pokemon * param1) { if (!sub_02097728(param0)) { return 0; @@ -173,7 +173,7 @@ void sub_02097770 (UnkStruct_02097728 * param0) Heap_FreeToHeap(param0); } -int sub_02097788 (UnkStruct_02028430 * param0, UnkStruct_02073C74 * param1, int param2) +int sub_02097788 (UnkStruct_02028430 * param0, Pokemon * param1, int param2) { int v0; int v1 = 0; @@ -187,7 +187,7 @@ int sub_02097788 (UnkStruct_02028430 * param0, UnkStruct_02073C74 * param1, int v2 = sub_0202818C(param2); - sub_02074470(param1, 170, v2); + GetMonData(param1, MON_DATA_170, v2); sub_02028480(param0, 0, v0, v2); sub_02028124(v2); sub_02074B30(param1, 170, v2); @@ -197,7 +197,7 @@ int sub_02097788 (UnkStruct_02028430 * param0, UnkStruct_02073C74 * param1, int return v0; } -int sub_020977E4 (UnkStruct_02028430 * param0, u16 param1, UnkStruct_02073C74 * param2, int param3) +int sub_020977E4 (UnkStruct_02028430 * param0, u16 param1, Pokemon * param2, int param3) { int v0 = 0; UnkStruct_0202818C * v1 = NULL; diff --git a/src/unk_02097B18.c b/src/unk_02097B18.c index 1e05c64ee5..3a6287516f 100644 --- a/src/unk_02097B18.c +++ b/src/unk_02097B18.c @@ -4,7 +4,7 @@ #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_0202440C_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_021C0794_decl.h" #include "constdata/const_020F1E88.h" @@ -94,7 +94,7 @@ static int sub_02097B18 (UnkStruct_020067E8 * param0, int * param1) v1 = sub_02006840(param0); v0->unk_00 = v1; v0->unk_42C = NARC_ctor(147, 53); - v0->unk_428 = sub_02073C74(53); + v0->unk_428 = AllocMonZeroed(53); v0->unk_D4.unk_00 = 0xFF; v0->unk_418.unk_00 = 0; @@ -136,7 +136,7 @@ static int sub_02097B18 (UnkStruct_020067E8 * param0, int * param1) continue; } - v5 = sub_02074470(v0->unk_00->unk_04[v4], 162, 0); + v5 = GetMonData(v0->unk_00->unk_04[v4], MON_DATA_162, 0); if (v5 != 0) { v0->unk_04[v5 - 1].unk_00 = v4; @@ -281,7 +281,7 @@ static int sub_02097D88 (UnkStruct_020067E8 * param0, int * param1) return 1; } -UnkStruct_02073C74 * sub_02097F00 (UnkStruct_02097F18 * param0, int param1) +Pokemon * sub_02097F00 (UnkStruct_02097F18 * param0, int param1) { int v0 = param1; @@ -386,7 +386,7 @@ static BOOL sub_02097F38 (UnkStruct_020508D4 * param0) case 4: { UnkStruct_02098C44 * v7 = v0->unk_0C; - UnkStruct_02073C74 * v8; + Pokemon * v8; UnkStruct_0202CA28 * v9; UnkStruct_0202CA64 * v10; UnkStruct_0202440C * v11; diff --git a/src/unk_02098218.c b/src/unk_02098218.c index 8f1fd6f3a6..256fe097ed 100644 --- a/src/unk_02098218.c +++ b/src/unk_02098218.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_02025E6C_decl.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "constdata/const_020F2DAC.h" #include "constdata/const_020F67FC.h" @@ -120,7 +120,7 @@ static int sub_02098304 (UnkStruct_020067E8 * param0, int * param1) { int v1; - v1 = sub_02074470(v0->unk_00->unk_0C.unk_00, 5, NULL); + v1 = GetMonData(v0->unk_00->unk_0C.unk_00, MON_DATA_SPECIES, NULL); sub_02078A4C(v0->unk_04.unk_3C, &v0->unk_6C, v1, 1); @@ -217,7 +217,7 @@ static BOOL sub_0209843C (UnkStruct_020508D4 * param0) UnkStruct_0203CDB0 * v1 = sub_02050A60(param0); { - UnkStruct_02073C74 * v2 = v0->unk_0C.unk_00; + Pokemon * v2 = v0->unk_0C.unk_00; UnkStruct_02025E6C * v3 = sub_02025E38(sub_0203D174(v1)); int v4 = 6; int v5 = sub_0203A138(v1->unk_1C->unk_00); @@ -245,11 +245,11 @@ static BOOL sub_0209843C (UnkStruct_020508D4 * param0) UnkStruct_0203CDB0 * v8 = sub_02050A60(param0); int v9; - v9 = sub_02074470(v0->unk_0C.unk_00, 5, 0); + v9 = GetMonData(v0->unk_0C.unk_00, MON_DATA_SPECIES, 0); v0->unk_08 = sub_0208712C(11, 1, v9, 10, sub_02025E44(sub_0203D174(v8))); - v0->unk_08->unk_10 = sub_02074470(v0->unk_0C.unk_00, 111, NULL); - v0->unk_08->unk_08 = sub_02074470(v0->unk_0C.unk_00, 112, NULL); + v0->unk_08->unk_10 = GetMonData(v0->unk_0C.unk_00, MON_DATA_111, NULL); + v0->unk_08->unk_08 = GetMonData(v0->unk_0C.unk_00, MON_DATA_FORM, NULL); sub_02050A38(param0, &Unk_020F2DAC, v0->unk_08); v0->unk_00++; } diff --git a/src/unk_020989DC.c b/src/unk_020989DC.c index b3999ff989..adf61f523e 100644 --- a/src/unk_020989DC.c +++ b/src/unk_020989DC.c @@ -5,7 +5,7 @@ #include "struct_decls/struct_020067E8_decl.h" #include "struct_decls/struct_0200B358_decl.h" -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_021C0794_decl.h" #include "constdata/const_020F1E88.h" @@ -494,7 +494,7 @@ UnkEnum_02098EAC sub_02098EAC (Poffin * param0, u8 param1) } } -void sub_02098EF8 (Poffin * param0, UnkStruct_02073C74 * param1) +void sub_02098EF8 (Poffin * param0, Pokemon * param1) { u8 v0, v1; u8 v2, v3; @@ -511,7 +511,7 @@ void sub_02098EF8 (Poffin * param0, UnkStruct_02073C74 * param1) Poffin_StoreAttributesToArray(param0, v8); for (v0 = 0; v0 < 6; v0++) { - v7[v0] = sub_02074470(param1, 19 + v0, NULL); + v7[v0] = GetMonData(param1, MON_DATA_COOL + v0, NULL); } v1 = 0; @@ -537,7 +537,7 @@ void sub_02098EF8 (Poffin * param0, UnkStruct_02073C74 * param1) sub_02074B30(param1, 19 + v0, &v7[v0]); } - v3 = sub_02074470(param1, 9, NULL); + v3 = GetMonData(param1, MON_DATA_FRIENDSHIP, NULL); if (v3 < 255) { ++v3; diff --git a/src/unk_020997B8.c b/src/unk_020997B8.c index bb9038c6c3..5c420f9197 100644 --- a/src/unk_020997B8.c +++ b/src/unk_020997B8.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_defs/struct_020997B8.h" @@ -22,7 +22,7 @@ void sub_020997D0 (UnkStruct_020997B8 * param0) Heap_FreeToHeap(param0); } -u16 * sub_020997D8 (UnkStruct_02073C74 * param0, u32 param1) +u16 * sub_020997D8 (Pokemon * param0, u32 param1) { u16 * v0; u16 * v1; @@ -32,12 +32,12 @@ u16 * sub_020997D8 (UnkStruct_02073C74 * param0, u32 param1) u8 v5; u8 v6, v7, v8; - v3 = (u16)sub_02074470(param0, 5, NULL); - v5 = (u8)sub_02074470(param0, 112, NULL); - v4 = (u8)sub_02074470(param0, 161, NULL); + v3 = (u16)GetMonData(param0, MON_DATA_SPECIES, NULL); + v5 = (u8)GetMonData(param0, MON_DATA_FORM, NULL); + v4 = (u8)GetMonData(param0, MON_DATA_161, NULL); for (v7 = 0; v7 < 4; v7++) { - v2[v7] = (u16)sub_02074470(param0, 54 + v7, NULL); + v2[v7] = (u16)GetMonData(param0, MON_DATA_MOVE1 + v7, NULL); } v0 = Heap_AllocFromHeap(param1, (44 / 2) * 2); diff --git a/src/unk_0209BA80.c b/src/unk_0209BA80.c index 5f4f7d5605..7ad8a8b447 100644 --- a/src/unk_0209BA80.c +++ b/src/unk_0209BA80.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_02073C74_decl.h" +#include "struct_defs/pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_02039A58.h" @@ -265,7 +265,7 @@ void sub_0209BC3C (int param0, int param1, void * param2, void * param3) BOOL sub_0209BC64 (UnkStruct_0209BBA4 * param0, u16 param1, u16 param2) { int v0, v1; - UnkStruct_02073C74 * v2; + Pokemon * v2; Party * v3; v1 = 40; @@ -282,13 +282,13 @@ BOOL sub_0209BC64 (UnkStruct_0209BBA4 * param0, u16 param1, u16 param2) } else { v2 = Party_GetPokemonBySlotIndex(v3, param1); - param0->unk_76[0] = sub_02074470(v2, 5, NULL); - param0->unk_7E[0] = sub_02074470(v2, 6, NULL); + param0->unk_76[0] = GetMonData(v2, MON_DATA_SPECIES, NULL); + param0->unk_7E[0] = GetMonData(v2, MON_DATA_HELD_ITEM, NULL); v2 = Party_GetPokemonBySlotIndex(v3, param2); - param0->unk_76[1] = sub_02074470(v2, 5, NULL); - param0->unk_7E[1] = sub_02074470(v2, 6, NULL); + param0->unk_76[1] = GetMonData(v2, MON_DATA_SPECIES, NULL); + param0->unk_7E[1] = GetMonData(v2, MON_DATA_HELD_ITEM, NULL); } param0->unk_08[0] = param0->unk_76[0];