diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-12 10:12:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 10:12:37 -0400 |
| commit | 6001e107993d1da69decdf479abf8a661ad57dda (patch) | |
| tree | 9a430f0b70e0a24965378724f1bd28cd1a193dc1 /src/multiboot.c | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
| parent | 7a562d6bae78fd7c62ed2f804fd8dcc555d85d18 (diff) | |
Merge pull request #321 from PikalaxALT/modern_gcc
Get pokefirered_modern to build
Diffstat (limited to 'src/multiboot.c')
| -rw-r--r-- | src/multiboot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multiboot.c b/src/multiboot.c index cfc9821d2..b44c421dc 100644 --- a/src/multiboot.c +++ b/src/multiboot.c @@ -1,7 +1,7 @@ #include "global.h" #include "multiboot.h" -static IWRAM_DATA u16 MultiBoot_required_data[MULTIBOOT_NCHILD]; +static u16 MultiBoot_required_data[MULTIBOOT_NCHILD]; static int MultiBootSend(struct MultiBootParam *mp, u16 data); static int MultiBootHandShake(struct MultiBootParam *mp); @@ -390,7 +390,7 @@ static int MultiBootHandShake(struct MultiBootParam *mp) #undef must_data } -static void MultiBootWaitCycles(u32 cycles) +static NOINLINE void MultiBootWaitCycles(u32 cycles) { asm("mov r2, pc"); asm("lsr r2, #24"); |