diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-12 14:00:47 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-12 14:00:47 -0500 |
| commit | 4ac064bbaf54966082a860e6b6723c5ec654c436 (patch) | |
| tree | b419b2bb1a7fe7d17c440d58e5000c21e832386c /src/scrcmd.c | |
| parent | f81c52b56e865d8ecc753a69a31a5148548320a6 (diff) | |
| parent | a4787bc06a323071d32d3e0705e9cd39d9221452 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu
Diffstat (limited to 'src/scrcmd.c')
| -rw-r--r-- | src/scrcmd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index d2e9c13c9..deb170c68 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -31,7 +31,6 @@ #include "mystery_event_script.h" #include "palette.h" #include "party_menu.h" -#include "pokemon_3.h" #include "pokemon_storage_system.h" #include "random.h" #include "overworld.h" @@ -1529,7 +1528,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) CopyWindowToVram(gUnknown_03000F30, 3); return FALSE; }*/ -__attribute__((naked)) +ASM_DIRECT bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) { asm("push {r4-r7,lr}\n\ |