diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-05-11 17:36:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-11 17:36:11 -0500 |
| commit | d1df98361f2144b286472e239b2f4bd1ada7dedd (patch) | |
| tree | df5a7f6a47f1e9400fe2eac6fa2ab02f9c6904ee /src/pokemon_summary_screen.c | |
| parent | 3e93615e38842643b8dd115c1fd2e0b4a0dbcd01 (diff) | |
| parent | ce5fc0277a2155e12475de2f3dfcb5e72adc1a6e (diff) | |
Merge pull request #252 from Diegoisawesome/master
Fix sym_common end, rename ASM_DIRECT to NAKED
Diffstat (limited to 'src/pokemon_summary_screen.c')
| -rw-r--r-- | src/pokemon_summary_screen.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 4ce4cca5b..74dc11973 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -1417,7 +1417,7 @@ void sub_81C14BC(struct Pokemon *mon, u8 swappingFromId, u8 swappingToId) *ppBonusesPtr = localPpBonuses; } #else -ASM_DIRECT +NAKED void sub_81C14BC(struct Pokemon *mon, u8 swappingFromId, u8 swappingToId) { asm(".syntax unified\n\ @@ -1628,7 +1628,7 @@ void sub_81C15EC(struct BoxPokemon *mon, u8 swappingFromId, u8 swappingToId) *ppBonusesPtr = localPpBonuses; } #else -ASM_DIRECT +NAKED void sub_81C15EC(struct BoxPokemon *mon, u8 swappingFromId, u8 swappingToId) { asm(".syntax unified\n\ @@ -2039,7 +2039,7 @@ void sub_81C1CB0(struct UnkStruct_61CC04 *a, u16 *b, u8 c, u8 d) Free(alloced); } #else -ASM_DIRECT +NAKED void sub_81C1CB0(struct UnkStruct_61CC04 *a, u16 *b, u8 c, u8 d) { asm(".syntax unified\n\ @@ -2341,7 +2341,7 @@ void sub_81C2194(u16 *a, u16 b, u8 c) } } #else -ASM_DIRECT +NAKED void sub_81C2194(u16 *a, u16 b, u8 c) { asm(".syntax unified\n\ @@ -3026,7 +3026,7 @@ void sub_81C335C() sub_81C25A4(r4, gText_FiveMarks, r5, 1, 0, 1); } #else -ASM_DIRECT +NAKED void sub_81C335C() { asm(".syntax unified\n\ @@ -3369,7 +3369,7 @@ void sub_81C3B08(u8 a) sub_81C25A4(sp, text, offset, (a<<4), 0, r5); } #else -ASM_DIRECT +NAKED void sub_81C3B08(u8 a) { asm(".syntax unified\n\ |