diff options
| -rw-r--r-- | arm9/asm/MSL_Common_arith.s | 11 | ||||
| -rw-r--r-- | arm9/lib/include/MSL.h | 8 | ||||
| -rw-r--r-- | arm9/lib/include/MSL_Common_arith.h | 8 | ||||
| -rw-r--r-- | arm9/lib/src/MSL_Common_arith.c | 7 | ||||
| -rw-r--r-- | arm9/src/palette.c | 6 | ||||
| -rw-r--r-- | files/graphic/poketch/.gitignore | 1 |
6 files changed, 29 insertions, 12 deletions
diff --git a/arm9/asm/MSL_Common_arith.s b/arm9/asm/MSL_Common_arith.s deleted file mode 100644 index 5d93a4de..00000000 --- a/arm9/asm/MSL_Common_arith.s +++ /dev/null @@ -1,11 +0,0 @@ - .include "asm/macros.inc"
- .include "global.inc"
-
- .text
-
- arm_func_start abs
-abs: ; 0x020DE3F0
- cmp r0, #0x0
- rsblt r0, r0, #0x0
- bx lr
- arm_func_end abs
diff --git a/arm9/lib/include/MSL.h b/arm9/lib/include/MSL.h new file mode 100644 index 00000000..a1709bc4 --- /dev/null +++ b/arm9/lib/include/MSL.h @@ -0,0 +1,8 @@ +#ifndef MSL_H +#define MSL_H + +//include all msl files here + +#include "MSL_Common_arith.h" + +#endif //MSL_H diff --git a/arm9/lib/include/MSL_Common_arith.h b/arm9/lib/include/MSL_Common_arith.h new file mode 100644 index 00000000..3ec6bdbc --- /dev/null +++ b/arm9/lib/include/MSL_Common_arith.h @@ -0,0 +1,8 @@ +#ifndef MSL_COMMON_ARITH_H +#define MSL_COMMON_ARITH_H + +#include "nitro/types.h" + +s32 abs(s32 val); + +#endif //MSL_COMMON_ARITH_H diff --git a/arm9/lib/src/MSL_Common_arith.c b/arm9/lib/src/MSL_Common_arith.c new file mode 100644 index 00000000..d4a2e834 --- /dev/null +++ b/arm9/lib/src/MSL_Common_arith.c @@ -0,0 +1,7 @@ +#include "MSL_Common_arith.h" +#include "function_target.h" + +ARM_FUNC s32 abs(s32 val) +{ + return val < 0 ? -val : val; +} diff --git a/arm9/src/palette.c b/arm9/src/palette.c index e4c42cc4..ff95a2d6 100644 --- a/arm9/src/palette.c +++ b/arm9/src/palette.c @@ -1,11 +1,15 @@ #include "global.h" +#include "MSL.h" #include "palette.h" #include "MI_memory.h" #include "gf_gfx_loader.h" #include "unk_0200CA44.h" #include "unk_020222E8.h" -extern int abs(int); +extern void *FUN_020222E8(); +extern void *FUN_020222F8(); +extern void *FUN_02022308(); +extern void *FUN_02022310(); THUMB_FUNC struct PaletteData *FUN_02002FD0(u32 heap_id) { diff --git a/files/graphic/poketch/.gitignore b/files/graphic/poketch/.gitignore new file mode 100644 index 00000000..a57ebae4 --- /dev/null +++ b/files/graphic/poketch/.gitignore @@ -0,0 +1 @@ +narc_0010.NCGR |