diff --git a/include/functions.h b/include/functions.h index c2ded725..631f5176 100644 --- a/include/functions.h +++ b/include/functions.h @@ -5,7 +5,7 @@ #include "global.h" #include "entity.h" #include "manager.h" -#include "coord.h" +#include "physics.h" #include "player.h" #include "room.h" #include "structures.h" diff --git a/include/npc.h b/include/npc.h index cfe0f9cf..1a57ccc9 100644 --- a/include/npc.h +++ b/include/npc.h @@ -9,7 +9,7 @@ #include "effects.h" #include "room.h" #include "flags.h" -#include "coord.h" +#include "physics.h" #include "message.h" #include "script.h" #include "save.h" diff --git a/include/object.h b/include/object.h index eb4582d4..c8b46a16 100644 --- a/include/object.h +++ b/include/object.h @@ -9,7 +9,7 @@ #include "flags.h" #include "effects.h" #include "room.h" -#include "coord.h" +#include "physics.h" #include "entity.h" #include "player.h" diff --git a/include/coord.h b/include/physics.h similarity index 100% rename from include/coord.h rename to include/physics.h diff --git a/linker.ld b/linker.ld index ad4af9da..e84fa0ea 100644 --- a/linker.ld +++ b/linker.ld @@ -594,7 +594,7 @@ SECTIONS { src/npc/npc58.o(.text); /* END npcs */ src/npcUtils.o(.text); - src/coord.o(.text); /* physics? */ + src/physics.o(.text); src/playerItem/playerItemPacciCaneProjectile.o(.text); src/playerItem/playerItemPacciCane.o(.text); src/player.o(.text); @@ -1304,7 +1304,7 @@ SECTIONS { data/const/npc/npc58.o(.rodata); src/npcDefinitions.o(.rodata); data/data_081146D0.o(.rodata); - src/coord.o(.rodata); + src/physics.o(.rodata); src/playerHitbox.o(.rodata); data/gfx/sprite_frames.o(.rodata); src/playerItem/playerItemPacciCaneProjectile.o(.rodata); diff --git a/src/color.c b/src/color.c index 301e5613..3211e948 100644 --- a/src/color.c +++ b/src/color.c @@ -6,7 +6,7 @@ #include "global.h" #include "fileselect.h" #include "main.h" -#include "coord.h" +#include "physics.h" extern Palette gUnk_02001A3C; diff --git a/src/enemy/cloudPiranha.c b/src/enemy/cloudPiranha.c index e1075af3..e06e6842 100644 --- a/src/enemy/cloudPiranha.c +++ b/src/enemy/cloudPiranha.c @@ -10,7 +10,7 @@ #include "collision.h" #include "enemy.h" #include "functions.h" -#include "coord.h" +#include "physics.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/ghini.c b/src/enemy/ghini.c index 5ffab6bf..edc0b8ae 100644 --- a/src/enemy/ghini.c +++ b/src/enemy/ghini.c @@ -10,7 +10,7 @@ #include "enemy.h" #include "functions.h" #include "area.h" -#include "coord.h" +#include "physics.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/vaatiTransfiguredEye.c b/src/enemy/vaatiTransfiguredEye.c index 457b294d..4bb604c9 100644 --- a/src/enemy/vaatiTransfiguredEye.c +++ b/src/enemy/vaatiTransfiguredEye.c @@ -8,7 +8,7 @@ #include "entity.h" #include "enemy.h" #include "message.h" -#include "coord.h" +#include "physics.h" #include "functions.h" void sub_08045A00(Entity*); diff --git a/src/item/itemBomb.c b/src/item/itemBomb.c index 9adeaa54..e284a9e0 100644 --- a/src/item/itemBomb.c +++ b/src/item/itemBomb.c @@ -1,5 +1,5 @@ #include "item.h" -#include "coord.h" +#include "physics.h" #include "sound.h" #include "functions.h" #include "playeritem.h" diff --git a/src/manager/manager14.c b/src/manager/manager14.c index 9f5d8154..0ca86740 100644 --- a/src/manager/manager14.c +++ b/src/manager/manager14.c @@ -3,7 +3,7 @@ #include "screen.h" #include "room.h" #include "flags.h" -#include "coord.h" +#include "physics.h" #include "main.h" typedef struct { diff --git a/src/manager/manager22.c b/src/manager/manager22.c index 3bcefffb..df516e8d 100644 --- a/src/manager/manager22.c +++ b/src/manager/manager22.c @@ -5,7 +5,7 @@ #include "screen.h" #include "player.h" #include "room.h" -#include "coord.h" +#include "physics.h" #include "functions.h" #include "common.h" #include "game.h" diff --git a/src/manager/managerC.c b/src/manager/managerC.c index c3fdaa8a..ac7203c4 100644 --- a/src/manager/managerC.c +++ b/src/manager/managerC.c @@ -5,7 +5,7 @@ #include "structures.h" #include "room.h" #include "screen.h" -#include "coord.h" +#include "physics.h" #include "functions.h" #include "save.h" #include "area.h" diff --git a/src/movement.c b/src/movement.c index 66cfb465..0c4f0368 100644 --- a/src/movement.c +++ b/src/movement.c @@ -6,7 +6,7 @@ #include "game.h" #include "asm.h" #include "item.h" -#include "coord.h" +#include "physics.h" #include "transitions.h" #include "functions.h" diff --git a/src/object/angryStatue.c b/src/object/angryStatue.c index d3fbe01d..f1feeb36 100644 --- a/src/object/angryStatue.c +++ b/src/object/angryStatue.c @@ -3,7 +3,7 @@ #include "room.h" #include "sound.h" #include "projectile.h" -#include "coord.h" +#include "physics.h" extern Hitbox gUnk_080FD178; diff --git a/src/object/macroAcorn.c b/src/object/macroAcorn.c index ca77f1b0..0f34165b 100644 --- a/src/object/macroAcorn.c +++ b/src/object/macroAcorn.c @@ -1,5 +1,5 @@ #include "entity.h" -#include "coord.h" +#include "physics.h" #include "object.h" void sub_0809E518(Entity*); diff --git a/src/object/macroPlayer.c b/src/object/macroPlayer.c index f024215f..e3f2a377 100644 --- a/src/object/macroPlayer.c +++ b/src/object/macroPlayer.c @@ -1,6 +1,6 @@ #define NENT_DEPRECATED #include "entity.h" -#include "coord.h" +#include "physics.h" #include "functions.h" #include "object.h" #include "area.h" diff --git a/src/object/object17.c b/src/object/object17.c index 419b3173..ca83a1c7 100644 --- a/src/object/object17.c +++ b/src/object/object17.c @@ -3,7 +3,7 @@ #include "player.h" #include "asm.h" #include "room.h" -#include "coord.h" +#include "physics.h" void Object17_Init(Entity*); void Object17_Action1(Entity*); diff --git a/src/object/object7E.c b/src/object/object7E.c index a23b0e5c..b73ba84f 100644 --- a/src/object/object7E.c +++ b/src/object/object7E.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "coord.h" +#include "physics.h" void Object7E(Entity* this) { diff --git a/src/object/object99.c b/src/object/object99.c index e8bf6a33..e333f535 100644 --- a/src/object/object99.c +++ b/src/object/object99.c @@ -1,5 +1,5 @@ #include "entity.h" -#include "coord.h" +#include "physics.h" void Object99(Entity* this) { Entity* parent; diff --git a/src/object/object9B.c b/src/object/object9B.c index 82b7eebf..8bb9c2cc 100644 --- a/src/object/object9B.c +++ b/src/object/object9B.c @@ -1,6 +1,6 @@ #define NENT_DEPRECATED #include "entity.h" -#include "coord.h" +#include "physics.h" void sub_0809E7C0(Entity*); void sub_0809E7E0(Entity*); diff --git a/src/object/objectAB.c b/src/object/objectAB.c index 767c5238..4a35930f 100644 --- a/src/object/objectAB.c +++ b/src/object/objectAB.c @@ -3,7 +3,7 @@ #include "flags.h" #include "asm.h" #include "player.h" -#include "coord.h" +#include "physics.h" extern void sub_0805B390(u32); diff --git a/src/object/objectAF.c b/src/object/objectAF.c index cd7ebe6a..e0771380 100644 --- a/src/object/objectAF.c +++ b/src/object/objectAF.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "coord.h" +#include "physics.h" extern void sub_080A0640(Entity*); diff --git a/src/object/objectB4.c b/src/object/objectB4.c index 90c3b287..2aeaa0f7 100644 --- a/src/object/objectB4.c +++ b/src/object/objectB4.c @@ -1,7 +1,7 @@ #define NENT_DEPRECATED #include "entity.h" #include "menu.h" -#include "coord.h" +#include "physics.h" #include "object.h" extern void sub_0806FB00(Entity*, u32, u32, u32); diff --git a/src/object/objectB5.c b/src/object/objectB5.c index e23779b2..74605a68 100644 --- a/src/object/objectB5.c +++ b/src/object/objectB5.c @@ -1,7 +1,7 @@ #include "entity.h" #include "room.h" #include "player.h" -#include "coord.h" +#include "physics.h" void ObjectB5(Entity* this) { if (this->action == 0) { diff --git a/src/object/objectB6.c b/src/object/objectB6.c index aac1f103..0e2828b6 100644 --- a/src/object/objectB6.c +++ b/src/object/objectB6.c @@ -1,6 +1,6 @@ #define NENT_DEPRECATED #include "entity.h" -#include "coord.h" +#include "physics.h" void ObjectB6(Entity* this) { if (this->parent->subAction > 3) { diff --git a/src/object/treeThorns.c b/src/object/treeThorns.c index d6516f80..ffb359a8 100644 --- a/src/object/treeThorns.c +++ b/src/object/treeThorns.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "coord.h" +#include "physics.h" #include "room.h" #include "object.h" #include "hitbox.h" diff --git a/src/objectUtils.c b/src/objectUtils.c index 247dc648..048b2559 100644 --- a/src/objectUtils.c +++ b/src/objectUtils.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "coord.h" +#include "physics.h" #include "room.h" #include "object.h" #include "functions.h" diff --git a/src/coord.c b/src/physics.c similarity index 99% rename from src/coord.c rename to src/physics.c index fae242a2..27fdb5d7 100644 --- a/src/coord.c +++ b/src/physics.c @@ -3,7 +3,7 @@ #include "area.h" #include "player.h" #include "new_player.h" -#include "coord.h" +#include "physics.h" #include "common.h" #include "sound.h" #include "room.h" diff --git a/src/playerItem/playerItemFireRodProjectile.c b/src/playerItem/playerItemFireRodProjectile.c index 800acaa1..930c9c24 100644 --- a/src/playerItem/playerItemFireRodProjectile.c +++ b/src/playerItem/playerItemFireRodProjectile.c @@ -2,7 +2,7 @@ #include "asm.h" #include "entity.h" #include "sound.h" -#include "coord.h" +#include "physics.h" #include "functions.h" #include "effects.h" diff --git a/src/playerItem/playerItemSwordBeam.c b/src/playerItem/playerItemSwordBeam.c index 6bdc04eb..cae60998 100644 --- a/src/playerItem/playerItemSwordBeam.c +++ b/src/playerItem/playerItemSwordBeam.c @@ -1,6 +1,6 @@ #include "entity.h" #include "player.h" -#include "coord.h" +#include "physics.h" #include "functions.h" #include "sound.h" #include "effects.h" diff --git a/src/projectile/darkNutSwordSlash.c b/src/projectile/darkNutSwordSlash.c index 20b968db..3f08486f 100644 --- a/src/projectile/darkNutSwordSlash.c +++ b/src/projectile/darkNutSwordSlash.c @@ -1,6 +1,6 @@ #include "entity.h" #include "player.h" -#include "coord.h" +#include "physics.h" extern const u8 DarkNutSwordSlash_hitTypes[]; extern void (*const DarkNutSwordSlash_UpdatesForType[])(Entity*); diff --git a/src/projectile/dirtBallProjectile.c b/src/projectile/dirtBallProjectile.c index 843bdafa..70fa0259 100644 --- a/src/projectile/dirtBallProjectile.c +++ b/src/projectile/dirtBallProjectile.c @@ -2,7 +2,7 @@ #include "entity.h" #include "enemy.h" #include "player.h" -#include "coord.h" +#include "physics.h" #include "functions.h" extern void (*const DirtBallProjectile_Functions[])(Entity*); diff --git a/src/projectile/guardLineOfSight.c b/src/projectile/guardLineOfSight.c index 128052fb..185b21d1 100644 --- a/src/projectile/guardLineOfSight.c +++ b/src/projectile/guardLineOfSight.c @@ -1,6 +1,6 @@ #include "entity.h" #include "asm.h" -#include "coord.h" +#include "physics.h" #include "functions.h" #include "projectile.h" #include "hitbox.h" diff --git a/src/projectile/guruguruBarProjectile.c b/src/projectile/guruguruBarProjectile.c index fc88e2cf..0d290982 100644 --- a/src/projectile/guruguruBarProjectile.c +++ b/src/projectile/guruguruBarProjectile.c @@ -1,6 +1,6 @@ #include "entity.h" -#include "coord.h" +#include "physics.h" void sub_080AABB0(Entity*); diff --git a/src/projectile/gyorgMaleEnergyProjectile.c b/src/projectile/gyorgMaleEnergyProjectile.c index 69c0aa73..670be319 100644 --- a/src/projectile/gyorgMaleEnergyProjectile.c +++ b/src/projectile/gyorgMaleEnergyProjectile.c @@ -1,6 +1,6 @@ #include "entity.h" #include "enemy.h" -#include "coord.h" +#include "physics.h" #include "player.h" #include "functions.h" diff --git a/src/projectile/gyorgTail.c b/src/projectile/gyorgTail.c index c9dc6a8b..956a66fa 100644 --- a/src/projectile/gyorgTail.c +++ b/src/projectile/gyorgTail.c @@ -1,6 +1,6 @@ #include "entity.h" #include "asm.h" -#include "coord.h" +#include "physics.h" #include "sound.h" #include "functions.h" #include "projectile.h" diff --git a/src/projectile/keatonDagger.c b/src/projectile/keatonDagger.c index 8c9bc2f1..4fba42e0 100644 --- a/src/projectile/keatonDagger.c +++ b/src/projectile/keatonDagger.c @@ -1,6 +1,6 @@ #include "entity.h" #include "player.h" -#include "coord.h" +#include "physics.h" extern void sub_0803C0AC(Entity*); diff --git a/src/projectile/mandiblesProjectile.c b/src/projectile/mandiblesProjectile.c index 1bc2c36e..f050bd09 100644 --- a/src/projectile/mandiblesProjectile.c +++ b/src/projectile/mandiblesProjectile.c @@ -1,6 +1,6 @@ #include "entity.h" #include "enemy.h" -#include "coord.h" +#include "physics.h" #include "functions.h" #include "game.h" #include "hitbox.h" diff --git a/src/projectile/mazaalEnergyBeam.c b/src/projectile/mazaalEnergyBeam.c index 095f8e45..10879e6c 100644 --- a/src/projectile/mazaalEnergyBeam.c +++ b/src/projectile/mazaalEnergyBeam.c @@ -1,6 +1,6 @@ #include "entity.h" #include "sound.h" -#include "coord.h" +#include "physics.h" extern void (*const MazaalEnergyBeam_Actions[])(Entity*); diff --git a/src/projectile/moblinSpear.c b/src/projectile/moblinSpear.c index 039eaa1d..d3c5bd1a 100644 --- a/src/projectile/moblinSpear.c +++ b/src/projectile/moblinSpear.c @@ -1,6 +1,6 @@ #include "entity.h" #include "enemy.h" -#include "coord.h" +#include "physics.h" typedef struct { s8 offsetX; diff --git a/src/projectile/projectile5.c b/src/projectile/projectile5.c index 84004de0..0c9a347d 100644 --- a/src/projectile/projectile5.c +++ b/src/projectile/projectile5.c @@ -2,7 +2,7 @@ #include "enemy.h" #include "player.h" #include "room.h" -#include "coord.h" +#include "physics.h" extern u32 sub_080B1B44(u32, u32); diff --git a/src/projectile/removableDust.c b/src/projectile/removableDust.c index 0822b00e..a405d237 100644 --- a/src/projectile/removableDust.c +++ b/src/projectile/removableDust.c @@ -1,6 +1,6 @@ #include "entity.h" #include "enemy.h" -#include "coord.h" +#include "physics.h" #include "functions.h" #include "object.h" diff --git a/src/projectile/v1DarkMagicProjectile.c b/src/projectile/v1DarkMagicProjectile.c index 188fed6e..5f034678 100644 --- a/src/projectile/v1DarkMagicProjectile.c +++ b/src/projectile/v1DarkMagicProjectile.c @@ -1,6 +1,6 @@ #include "entity.h" #include "enemy.h" -#include "coord.h" +#include "physics.h" #include "player.h" #include "functions.h" diff --git a/src/projectile/v3ElectricProjectile.c b/src/projectile/v3ElectricProjectile.c index 77308f1e..70131ffa 100644 --- a/src/projectile/v3ElectricProjectile.c +++ b/src/projectile/v3ElectricProjectile.c @@ -2,7 +2,7 @@ #include "collision.h" #include "enemy.h" #include "player.h" -#include "coord.h" +#include "physics.h" #include "functions.h" extern void (*const V3ElectricProjectile_Functions[])(Entity*);