diff options
| -rw-r--r-- | arm9/src/unk_02088DD8.c | 12 | ||||
| -rw-r--r-- | files/graphic/poketch/narc_0010.NCGR | bin | 2112 -> 0 bytes | |||
| -rw-r--r-- | include/unk_02088DD8.h | 6 |
3 files changed, 8 insertions, 10 deletions
diff --git a/arm9/src/unk_02088DD8.c b/arm9/src/unk_02088DD8.c index 572d274f..b4633d25 100644 --- a/arm9/src/unk_02088DD8.c +++ b/arm9/src/unk_02088DD8.c @@ -3,6 +3,8 @@ #include "pokemon.h" #include "unk_02088DD8.h" +extern void LoadWotbl_HandleAlternateForme(int species, int forme, u16 * wotbl); + THUMB_FUNC struct UnkStruct_02088DD8* FUN_02088DD8(u32 heap_id) { struct UnkStruct_02088DD8 *returnPointer = AllocFromHeap(heap_id, sizeof(struct UnkStruct_02088DD8)); __builtin__clear(returnPointer, sizeof(struct UnkStruct_02088DD8)); @@ -22,7 +24,7 @@ THUMB_FUNC void FUN_02088DF0(struct UnkStruct_02037CF0 *r0) { #define WOTBL_LVL(x) (/*(u8)*/(((x) & WOTBL_LVL_MASK) >> WOTBL_LVL_SHIFT)) // i don't know why either. -THUMB_FUNC void* GetEligibleLevelUpMoves(struct Pokemon* pokemon, u32 heap_id) { +THUMB_FUNC u16* GetEligibleLevelUpMoves(struct Pokemon* pokemon, u32 heap_id) { u16 species = (u16)GetMonData(pokemon, MON_DATA_SPECIES, 0); u8 forme = (u8)GetMonData(pokemon, MON_DATA_FORME, 0); u8 level = (u8)GetMonData(pokemon, MON_DATA_LEVEL, 0); @@ -47,16 +49,14 @@ THUMB_FUNC void* GetEligibleLevelUpMoves(struct Pokemon* pokemon, u32 heap_id) { tableFromFile[i] = WOTBL_MOVE(tableFromFile[i]); - j = 0; - for (; j < 4; j++) { + for (j = 0; j < 4; j++) { if (tableFromFile[i] == moves[j]) break; } if (j != 4) continue; - j = 0; if (k >= 0) { // don't know when that would be false - for (; j < k; j++) { + for (j = 0; j < k; j++) { if (returnTable[j] == tableFromFile[i]) break; } } @@ -73,4 +73,4 @@ THUMB_FUNC void* GetEligibleLevelUpMoves(struct Pokemon* pokemon, u32 heap_id) { THUMB_FUNC BOOL FUN_02088EF8(u16 *r0) { return *r0 != 0xFFFF; -}
\ No newline at end of file +} diff --git a/files/graphic/poketch/narc_0010.NCGR b/files/graphic/poketch/narc_0010.NCGR Binary files differdeleted file mode 100644 index 9dcdc01b..00000000 --- a/files/graphic/poketch/narc_0010.NCGR +++ /dev/null diff --git a/include/unk_02088DD8.h b/include/unk_02088DD8.h index 78ff4827..7b023c56 100644 --- a/include/unk_02088DD8.h +++ b/include/unk_02088DD8.h @@ -3,8 +3,6 @@ #include "unk_020377F0.h" -extern void LoadWotbl_HandleAlternateForme(int species, int forme, u16 * wotbl); - struct Options; struct PlayerData; struct Pokemon; @@ -20,9 +18,9 @@ struct UnkStruct_02088DD8 u8 padding2[0x2]; }; -struct UnkStruct_02088DD8* FUN_02088DD8(u32 r0); +struct UnkStruct_02088DD8* FUN_02088DD8(u32 heap_id); void FUN_02088DF0(struct UnkStruct_02037CF0 *r0); -void* GetEligibleLevelUpMoves(struct Pokemon* pokemon, u32 heap_id); +u16* GetEligibleLevelUpMoves(struct Pokemon* pokemon, u32 heap_id); BOOL FUN_02088EF8(u16 *r0); #endif |