diff options
| -rw-r--r-- | arm9/asm/unk_02029FB0.s | 10 | ||||
| -rw-r--r-- | arm9/src/pokemon.c | 11 | ||||
| -rw-r--r-- | include/pokemon.h | 2 | ||||
| -rw-r--r-- | include/proto.h | 3 |
4 files changed, 14 insertions, 12 deletions
diff --git a/arm9/asm/unk_02029FB0.s b/arm9/asm/unk_02029FB0.s index c6053422..da0a42d2 100644 --- a/arm9/asm/unk_02029FB0.s +++ b/arm9/asm/unk_02029FB0.s @@ -5,11 +5,11 @@ .global UNK_020EEA7C UNK_020EEA7C: ; 0x020EEA7C - .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x02, 0x00 - .byte 0x02, 0x00, 0x02, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x07, 0x00, 0x07, 0x00, 0x07, 0x00 - .byte 0x0A, 0x00, 0x0A, 0x00, 0x0B, 0x00, 0x0B, 0x00, 0x0B, 0x00, 0x0B, 0x00, 0x14, 0x00, 0x1E, 0x00 - .byte 0x23, 0x00, 0x28, 0x00, 0xF4, 0x01, 0x10, 0x27, 0x1E, 0x00, 0x1E, 0x00, 0x02, 0x00, 0x05, 0x00 - .byte 0x01, 0x00, 0x01, 0x00, 0x05, 0x00, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00 + .short 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 0x0002 + .short 0x0002, 0x0002, 0x0003, 0x0003, 0x0003, 0x0007, 0x0007, 0x0007 + .short 0x000A, 0x000A, 0x000B, 0x000B, 0x000B, 0x000B, 0x0014, 0x001E + .short 0x0023, 0x0028, 0x01F4, 0x2710, 0x001E, 0x001E, 0x0002, 0x0005 + .short 0x0001, 0x0001, 0x0005, 0x0003, 0x0001, 0x0001 .section .data diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c index 3db6796a..97be796b 100644 --- a/arm9/src/pokemon.c +++ b/arm9/src/pokemon.c @@ -2,6 +2,7 @@ #define IN_POKEMON_C #include "proto.h" #include "party.h" +#include "player_data.h" #include "pokemon.h" #include "filesystem.h" #include "heap.h" @@ -41,7 +42,7 @@ BOOL FUN_02069E7C(struct BoxPokemon * boxmon); BOOL FUN_02069E9C(struct BoxPokemon * boxmon); void FUN_02069ECC(struct BoxPokemon * boxmon); void LoadWotbl_HandleAlternateForme(int species, int forme, u16 * wotbl); -void FUN_0206A054(struct BoxPokemon * boxmon, u32 a1, u32 pokeball, u32 a3, u32 encounterType, u32 a5); +void FUN_0206A054(struct BoxPokemon * boxmon, struct PlayerData * a1, u32 pokeball, u32 a3, u32 encounterType, u32 heap_id); BOOL MonHasMove(struct Pokemon * pokemon, u16 move); BOOL FUN_0206A144(struct BoxPokemon * boxmon, u32 a1); BOOL FUN_0206A16C(u16 species, int forme, u32 a2); @@ -3321,10 +3322,10 @@ void FUN_02069FB0(u32 r7, u32 r5, u32 r4, u32 r6, u32 sp18, u32 sp1C, u32 sp20) } } -void FUN_0206A014(struct Pokemon * pokemon, u32 a1, u32 pokeball, u32 a3, u32 encounterType, u32 a5) +void FUN_0206A014(struct Pokemon * pokemon, struct PlayerData * a1, u32 pokeball, u32 a3, u32 encounterType, u32 heap_id) { u32 hp; - FUN_0206A054(&pokemon->box, a1, pokeball, a3, encounterType, a5); + FUN_0206A054(&pokemon->box, a1, pokeball, a3, encounterType, heap_id); if (pokeball == ITEM_HEAL_BALL) { hp = GetMonData(pokemon, MON_DATA_MAXHP, NULL); @@ -3334,9 +3335,9 @@ void FUN_0206A014(struct Pokemon * pokemon, u32 a1, u32 pokeball, u32 a3, u32 en } } -void FUN_0206A054(struct BoxPokemon * boxmon, u32 a1, u32 pokeball, u32 a3, u32 encounterType, u32 a5) +void FUN_0206A054(struct BoxPokemon * boxmon, struct PlayerData * a1, u32 pokeball, u32 a3, u32 encounterType, u32 heap_id) { - FUN_020808AC(boxmon, (int)a1, 0, (int)a3, (int)a5); + FUN_020808AC(boxmon, a1, 0, a3, heap_id); SetBoxMonData(boxmon, MON_DATA_GAME_VERSION, (void *)&gGameVersion); SetBoxMonData(boxmon, MON_DATA_POKEBALL, &pokeball); SetBoxMonData(boxmon, MON_DATA_ENCOUNTER_TYPE, &encounterType); diff --git a/include/pokemon.h b/include/pokemon.h index ed62c18e..b76bf145 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -294,7 +294,7 @@ BOOL FUN_02069E74(struct Pokemon * pokemon); BOOL FUN_02069E94(struct Pokemon * pokemon); void FUN_02069EC4(struct Pokemon * pokemon); void FUN_02069FB0(u32 r7, u32 r5, u32 r4, u32 r6, u32 sp18, u32 sp1C, u32 sp20); -void FUN_0206A014(struct Pokemon * pokemon, u32 a1, u32 pokeball, u32 a3, u32 encounterType, u32 a5); +void FUN_0206A014(struct Pokemon * pokemon, struct PlayerData * a1, u32 pokeball, u32 a3, u32 encounterType, u32 heap_id); void FUN_0206A094(struct Pokemon * pokemon, u32 a1, u32 a2); BOOL FUN_0206A13C(struct Pokemon * pokemon, u32 a1); void FUN_0206A1C4(struct Pokemon * pokemon); diff --git a/include/proto.h b/include/proto.h index fb2f8a78..67a295ac 100644 --- a/include/proto.h +++ b/include/proto.h @@ -5,6 +5,7 @@ #include "pokemon.h" // for struct definitions #include "string16.h" // for struct definitions +#include "player_data.h" // for struct definitions int FUN_0206AE00(int x); u32 GetItemAttr(u16 item, u32 a1, u32 a2); @@ -15,7 +16,7 @@ int FUN_02005F14(int); void FUN_02005E80(int); void FUN_02005E90(int, int, int, int); void FUN_020056AC(int, int, int, int, int); -void FUN_020808AC(struct BoxPokemon *, int, int, int, int); +void FUN_020808AC(struct BoxPokemon *, struct PlayerData *, int, u32, u32); void StringExpandPlaceholders(u32 *, struct String *, struct String *); #endif //POKEDIAMOND_PROTO_H |