Merge branch 'master' into ply

2026-08-21 06:29:00 -04:00 · 2021-03-17 20:23:01 -07:00
parent a39686c24c 2d1b0da52e
commit 8b81269271
250 changed files with 580 additions and 1024 deletions
@@ -1,9 +1,10 @@
 #include "global.h"
 #include "entity.h"
+#include "position.h"
 #include "player.h"
 #include "flags.h"
+#include "functions.h"

-extern u32 sub_080041A0(Entity*, Entity*, u32, u32);
 void sub_08099ECC(Entity*);
 extern void sub_0805E4E0(Entity*, u32);
 extern void sub_0805B390(u32);