begin player.c and new nonmatching macro

merge

fix

include/functions.h

@@ -307,5 +307,18 @@ extern void sub_08078AA8(u32, u32);
 extern void sub_08078B48(void);
 extern void sub_0807919C();
 extern void sub_0807CAA0(u32, u32);
-extern void sub_08080964(u16, u32);
+extern void sub_080085B0(Entity*);
+extern u32 sub_08079D48();
+extern u32 sub_08008B22();
+extern void sub_080791BC9();
+extern void sub_080791BC();
+extern void sub_08056360();
+extern u32 sub_080542AC(u32);
+extern void sub_0807A108();
+extern u32 sub_08079FC4(u32);
+extern void sub_0800455E(Entity*);
+extern void sub_08008790(Entity*, u32);
+extern u32 CheckIsDungeon();
+extern void sub_0804ACF8();
+extern void sub_08073904(Entity*);
 #endif

include/global.h

@@ -49,6 +49,26 @@
 
 #define static_assert(cond) extern char assertion[(cond) ? 1 : -1]
 
+#if NON_MATCHING
+#define asmfunc(prologue, path)
+#else
+#define asmfunc(prologue, path) \
+    NAKED prologue {            \
+        asm(".include " #path); \
+    }
+#endif
+
+#if NON_MATCHING
+#define NONMATCH(prologue, path) prologue
+#define END_NONMATCH
+#else
+#define NONMATCH(path, prologue) \
+    NAKED prologue {             \
+        asm(".include " #path);  \
+        if (0)
+#define END_NONMATCH }
+#endif
+
 typedef union {
     s32 WORD;
     struct {
@@ -76,6 +96,4 @@ union SplitHWord {
     } PACKED HALF;
 } PACKED;
 
-
-
 #endif // GUARD_GLOBAL_H

include/room.h

@@ -79,5 +79,6 @@ extern RoomControls gRoomControls;
 extern RoomVars gRoomVars;
 
 extern void SetTileType(u32, u32, u32);
+extern void sub_08080964(u32 time, u32 magnitude); // shake screen
 
 #endif