ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 22:03:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Propagate ASM_DIRECT --> NAKED renaming

Browse Source
This commit is contained in:
PikalaxALT 2018-05-11 09:41:32 -04:00
parent 4488bbe9e6
commit 8d0da7d8e0
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/global.h
View File

@ -12,6 +12,11 @@
#define asm_comment(x) asm volatile("@ -- " x " -- ") #define asm_comment(x) asm volatile("@ -- " x " -- ")
#define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided") #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided")
#define NAKED __attribute__((naked)) #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 // IDE support
#if defined (__APPLE__) || defined (__CYGWIN__) #if defined (__APPLE__) || defined (__CYGWIN__)

10
src/field_effect.c
View File

@ -566,7 +566,7 @@ u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y)
return spriteId; return spriteId;
} }
#else #else
ASM_DIRECT NAKED
u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y) u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y)
{ {
asm_unified("push {r4,r5,lr}\n\ 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); gPlttBufferFaded[i] = RGB(curRed, curGreen, curBlue);
} }
#else #else
ASM_DIRECT NAKED
void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b) void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
{ {
asm(".syntax unified\n" asm(".syntax unified\n"
@ -744,7 +744,7 @@ void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
".syntax divided"); ".syntax divided");
} }
ASM_DIRECT NAKED
void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b) void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
{ {
asm(".syntax unified\n" asm(".syntax unified\n"
@ -2684,7 +2684,7 @@ bool8 sub_80B8B38(struct Task *task)
return FALSE; return FALSE;
} }
#else #else
ASM_DIRECT NAKED
bool8 sub_80B8B38(struct Task *task) bool8 sub_80B8B38(struct Task *task)
{ {
asm_unified("\tpush {r4-r7,lr}\n" asm_unified("\tpush {r4-r7,lr}\n"
@ -2997,7 +2997,7 @@ u8 sub_80B8F98(void)
return spriteId; return spriteId;
} }
#else #else
ASM_DIRECT NAKED
u8 sub_80B8F98(void) u8 sub_80B8F98(void)
{ {
asm_unified("push {r4-r7,lr}\n\ asm_unified("push {r4-r7,lr}\n\