falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#define map-namespaced functions with M

This commit is contained in:
Alex Bates 2020-10-22 03:14:13 +01:00
parent 7cfd053fb7
commit 14b509830f
No known key found for this signature in database
GPG Key ID: 5E11C2DB78877706
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/world/area_kmr/kmr_12/events.c
View File

@ -69,7 +69,7 @@ Script M(ReadWestSign) = {
SI_RESUME_GROUP(1),
SI_SET(SI_FLAG(0), FALSE),
SI_CALL(M(GetGoomba)),
SI_CALL(GetGoomba),
SI_IF_NE(SI_VAR(0), FALSE),
SI_CALL(GetNpcVar, NpcId_GOOMBA, 0, SI_VAR(0)),
SI_IF_EQ(SI_VAR(0), FALSE),

2
src/world/area_kmr/kmr_12/header.c
View File

@ -19,7 +19,7 @@ Script M(PlayMusic) = {
SI_END(),
};
ApiStatus M(GetGoomba)(ScriptInstance* script, s32 isInitialCall) {
ApiStatus GetGoomba(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = get_enemy_safe(NpcId_GOOMBA);
return ApiStatus_DONE2;
}

3
src/world/area_kmr/kmr_12/kmr_12.h
View File

@ -5,7 +5,8 @@
#define NpcId_GOOMBA 0
ApiStatus M(GetGoomba)(ScriptInstance* script, s32 isInitialCall);
#define GetGoomba M(GetGoomba)
ApiStatus GetGoomba(ScriptInstance* script, s32 isInitialCall);
Script M(Main);
Script M(PlayMusic);