diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-03 23:55:30 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-03 23:55:30 -0500 |
| commit | 3c709ef2ede275d6eeaa319a603c199a3906226b (patch) | |
| tree | c0a43396ea5b35766bff47f52033f5b51eef97d6 | |
| parent | 4df728666e55b47480467fbea86f48dadcb81c97 (diff) | |
A little tidying
| -rw-r--r-- | include/global.h | 8 | ||||
| -rw-r--r-- | include/sprite.h | 4 | ||||
| -rw-r--r-- | src/field/slot_machine.c | 1 |
3 files changed, 0 insertions, 13 deletions
diff --git a/include/global.h b/include/global.h index 17dd0a88d..76300d36d 100644 --- a/include/global.h +++ b/include/global.h @@ -27,14 +27,6 @@ int strcmp (const char *, const char *); #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided\n") -#define nonmatching(fndec, x) {\ -__attribute__((naked))\ -fndec\ -{\ - asm_unified(x);\ -}\ -} - #define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0])) #define POKEMON_SLOTS_NUMBER 412 diff --git a/include/sprite.h b/include/sprite.h index 2b7960f6f..b72c09989 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -120,10 +120,6 @@ union AffineAnimCmd {.jump = {.type = AFFINEANIMCMDTYPE_JUMP, .target = _target}} #define AFFINEANIMCMD_END \ {.type = AFFINEANIMCMDTYPE_END} -#define AFFINEANIMCMD_LOOP(_count) \ - {.loop = {.type = AFFINEANIMCMDTYPE_LOOP, .count = _count}} -#define AFFINEANIMCMD_JUMP(_target) \ - {.jump = {.type = AFFINEANIMCMDTYPE_JUMP, .target = _target}} struct AffineAnimState { diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index e1687b3d1..0e907674b 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -12,7 +12,6 @@ #include "trig.h" #include "graphics.h" #include "palette.h" -#include "task.h" #include "util.h" #include "text.h" #include "menu.h" |