diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-11 09:41:32 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-11 09:41:32 -0400 |
| commit | 8d0da7d8e006beda6c72c437545bca9f20086b28 (patch) | |
| tree | e0e48b3fb4a42b45058956a71d82bbb4bdb6af47 | |
| parent | 4488bbe9e69a8551cb5bb34e70b8ffb9d8e554db (diff) | |
Propagate ASM_DIRECT --> NAKED renaming
| -rw-r--r-- | include/global.h | 5 | ||||
| -rw-r--r-- | src/field_effect.c | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/include/global.h b/include/global.h index b73baf2ce..5e742d732 100644 --- a/include/global.h +++ b/include/global.h @@ -12,6 +12,11 @@ #define asm_comment(x) asm volatile("@ -- " x " -- ") #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided") #define NAKED __attribute__((naked)) +// While this nomenclature change is being rolled out, the following +// redundant define will be used to prevent build errors when merging +// from master. +// TODO: Remove this before merging the pull request. +#define ASM_DIRECT NAKED // IDE support #if defined (__APPLE__) || defined (__CYGWIN__) diff --git a/src/field_effect.c b/src/field_effect.c index 6783473eb..692090779 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -566,7 +566,7 @@ u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y) return spriteId; } #else -ASM_DIRECT +NAKED u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y) { asm_unified("push {r4,r5,lr}\n\ @@ -669,7 +669,7 @@ void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b) gPlttBufferFaded[i] = RGB(curRed, curGreen, curBlue); } #else -ASM_DIRECT +NAKED void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b) { asm(".syntax unified\n" @@ -744,7 +744,7 @@ void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b) ".syntax divided"); } -ASM_DIRECT +NAKED void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b) { asm(".syntax unified\n" @@ -2684,7 +2684,7 @@ bool8 sub_80B8B38(struct Task *task) return FALSE; } #else -ASM_DIRECT +NAKED bool8 sub_80B8B38(struct Task *task) { asm_unified("\tpush {r4-r7,lr}\n" @@ -2997,7 +2997,7 @@ u8 sub_80B8F98(void) return spriteId; } #else -ASM_DIRECT +NAKED u8 sub_80B8F98(void) { asm_unified("push {r4-r7,lr}\n\ |