diff options
Diffstat (limited to 'arm9')
| -rw-r--r-- | arm9/Makefile | 1 | ||||
| -rw-r--r-- | arm9/lib/syscall/_svc_mw.s | 76 | ||||
| -rw-r--r-- | arm9/src/pokemon.c | 2 | ||||
| -rw-r--r-- | arm9/src/waza.c | 46 |
4 files changed, 63 insertions, 62 deletions
diff --git a/arm9/Makefile b/arm9/Makefile index 9c1d4f9a..cb8eba06 100644 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -305,7 +305,6 @@ DUMMY != mkdir -p $(ALL_DIRS) %.pal: ; # Included files -baserom.%: ; %.h: ; %.inc: ; diff --git a/arm9/lib/syscall/_svc_mw.s b/arm9/lib/syscall/_svc_mw.s index c1e36b4b..d449ee58 100644 --- a/arm9/lib/syscall/_svc_mw.s +++ b/arm9/lib/syscall/_svc_mw.s @@ -7,115 +7,115 @@ ; Secure area .space 0x800 - non_word_aligned_thumb_func_start SVC_SoftReset + .global SVC_SoftReset + .thumb SVC_SoftReset: swi 0 bx lr - thumb_func_end SVC_SoftReset - non_word_aligned_thumb_func_start SVC_WaitByLoop + .global SVC_WaitByLoop + .thumb SVC_WaitByLoop: swi 3 bx lr - thumb_func_end SVC_WaitByLoop - non_word_aligned_thumb_func_start SVC_WaitIntr + .global SVC_WaitIntr + .thumb SVC_WaitIntr: mov r2, #0 swi 4 bx lr - thumb_func_end SVC_WaitIntr - non_word_aligned_thumb_func_start SVC_WaitVBlankIntr + .global SVC_WaitVBlankIntr + .thumb SVC_WaitVBlankIntr: mov r2, #0 swi 5 bx lr - thumb_func_end SVC_WaitVBlankIntr - non_word_aligned_thumb_func_start SVC_Halt + .global SVC_Halt + .thumb SVC_Halt: swi 6 bx lr - thumb_func_end SVC_Halt - non_word_aligned_thumb_func_start SVC_Div + .global SVC_Div + .thumb SVC_Div: swi 9 bx lr - thumb_func_end SVC_Div - non_word_aligned_thumb_func_start SVC_DimRem + .global SVC_DivRem + .thumb SVC_DivRem: swi 9 add r0, r1, #0 bx lr - thumb_func_end SVC_DivRem - non_word_aligned_thumb_func_start SVC_CpuSet + .global SVC_CpuSet + .thumb SVC_CpuSet: swi 11 bx lr - thumb_func_end SVC_CpuSet - non_word_aligned_thumb_func_start SVC_CpuFastSet -SVC_CpuFastSet: + .global SVC_CpuSetFast + .thumb +SVC_CpuSetFast: swi 12 bx lr - thumb_func_end SVC_CpuFastSet - non_word_aligned_thumb_func_start SVC_Sqrt + .global SVC_Sqrt + .thumb SVC_Sqrt: swi 13 bx lr - thumb_func_end SVC_Sqrt - non_word_aligned_thumb_func_start SVC_GetCRC16 + .global SVC_GetCRC16 + .thumb SVC_GetCRC16: swi 14 bx lr - thumb_func_end SVC_GetCRC16 - non_word_aligned_thumb_func_start IsMemExpanded -IsMemExpanded: + .global IsMmemExpanded + .thumb +IsMmemExpanded: swi 15 bx lr - thumb_func_end IsMemExpanded - non_word_aligned_thumb_func_start SVC_UnpackBits + .global SVC_UnpackBits + .thumb SVC_UnpackBits: swi 16 bx lr - thumb_func_end SVC_UnpackBits - non_word_aligned_thumb_func_start SVC_UncompressLZ8 + .global SVC_UncompressLZ8 + .thumb SVC_UncompressLZ8: swi 17 bx lr - thumb_func_end SVC_UncompressLZ8 - non_word_aligned_thumb_func_start SVC_UncompressLZ16FromDevice + .global SVC_UncompressLZ16FromDevice + .thumb SVC_UncompressLZ16FromDevice: swi 18 bx lr - thumb_func_end SVC_UncompressLZ16FromDevice - non_word_aligned_thumb_func_start SVC_UncompressHuffmanFromDevice + .global SVC_UncompressHuffmanFromDevice + .thumb SVC_UncompressHuffmanFromDevice: swi 19 bx lr - thumb_func_end SVC_UncompressHuffmanFromDevice - non_word_aligned_thumb_func_start SVC_UncompressRL8 + .global SVC_UncompressRL8 + .thumb SVC_UncompressRL8: swi 20 bx lr - thumb_func_end SVC_UncompressRL8 - non_word_aligned_thumb_func_start SVC_UncompressRL16FromDevice + .global SVC_UncompressRL16FromDevice + .thumb SVC_UncompressRL16FromDevice: swi 21 bx lr - thumb_func_end SVC_UncompressRL16FromDevice .balign 4, 0 ; Don't pad with nop diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c index 9bd9764d..8df597a6 100644 --- a/arm9/src/pokemon.c +++ b/arm9/src/pokemon.c @@ -2859,7 +2859,7 @@ void FUN_02069718(struct BoxPokemon * boxmon, u16 move) } moves[3] = move; - pp[3] = (u8)GetWazaAttr(move, 5); + pp[3] = (u8)GetWazaAttr(move, MOVEATTR_PP); ppUp[3] = 0; for (i = 0; i < 4; i++) diff --git a/arm9/src/waza.c b/arm9/src/waza.c index 4b505482..f394fedd 100644 --- a/arm9/src/waza.c +++ b/arm9/src/waza.c @@ -15,7 +15,7 @@ void LoadAllWazaTbl(struct WazaTbl * dest) ReadFromNarcMemberByIdPair(dest, NARC_POKETOOL_WAZA_WAZA_TBL, 0, 0, (NUM_MOVES + 1) * sizeof(struct WazaTbl)); } -u32 GetWazaAttr(u16 waza, u32 attr) +u32 GetWazaAttr(u16 waza, MoveAttr attr) { struct WazaTbl wazaTbl; LoadWazaEntry(waza, &wazaTbl); @@ -27,38 +27,40 @@ u8 WazaGetMaxPp(u16 waza, u8 ppUp) u8 pp; if (ppUp > 3) ppUp = 3; - pp = (u8)GetWazaAttr(waza, 5); + pp = (u8)GetWazaAttr(waza, MOVEATTR_PP); return (u8)(pp + (pp * 20 * ppUp) / 100); } -u32 GetAttrFromWazaTbl(struct WazaTbl * wazaTbl, u32 attr) +u32 GetAttrFromWazaTbl(struct WazaTbl * wazaTbl, MoveAttr attr) { switch (attr) { - case 0: - return wazaTbl->unk0; - case 1: + case MOVEATTR_EFFECT: + return wazaTbl->effect; + case MOVEATTR_UNK1: return wazaTbl->unk2; - case 2: - return wazaTbl->unk3; - case 3: - return wazaTbl->unk4; - case 4: - return wazaTbl->unk5; - case 5: + case MOVEATTR_POWER: + return wazaTbl->power; + case MOVEATTR_TYPE: + return wazaTbl->type; + case MOVEATTR_ACCURACY: + return wazaTbl->accuracy; + case MOVEATTR_PP: return wazaTbl->pp; - case 6: - return wazaTbl->unk7; - case 7: + case MOVEATTR_EFFECT_CHANCE: + return wazaTbl->effectChance; + case MOVEATTR_UNK7: return wazaTbl->unk8; - case 8: - return wazaTbl->unkA; - case 9: + case MOVEATTR_PRIORTY: + return wazaTbl->priority; + case MOVEATTR_UNK9: return wazaTbl->unkB; - case 10: + case MOVEATTR_UNK10: return wazaTbl->unkC; - case 11: - return wazaTbl->unkD; + case MOVEATTR_CONTEST_TYPE: + return wazaTbl->contestType; + default: + return (u32)wazaTbl; } } |