diff options
Diffstat (limited to 'src/enemy')
99 files changed, 544 insertions, 143 deletions
diff --git a/src/enemy/acroBandits.c b/src/enemy/acroBandits.c index 70518051..80cdc51d 100644 --- a/src/enemy/acroBandits.c +++ b/src/enemy/acroBandits.c @@ -5,7 +5,11 @@ * @brief Acro Bandits enemy */ #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "player.h" +#include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/armos.c b/src/enemy/armos.c index 51daa2a8..873f8824 100644 --- a/src/enemy/armos.c +++ b/src/enemy/armos.c @@ -4,21 +4,27 @@ * * @brief Armos enemy */ +#include "enemy/armos.h" #include "collision.h" #include "common.h" #include "enemy.h" +#include "sound.h" #include "flags.h" -#include "functions.h" +#include "physics.h" #include "global.h" #include "hitbox.h" #include "tiles.h" +#include "room.h" +#include "player.h" +#include "asm.h" +#include "map.h" typedef struct { /*0x00*/ Entity base; /*0x68*/ u8 unk_68[0x10]; /*0x78*/ u16 unk_78; /*0x7a*/ u16 unk_7a; - /*0x7c*/ ScreenTransitionData* unk_7c; + /*0x7c*/ Transition* unk_7c; /*0x80*/ u8 unk_80; /*0x81*/ u8 unk_81; /*0x82*/ u8 unk_82; @@ -66,11 +72,11 @@ void sub_080300E8(void) { } } -void sub_08030118(u32 armosId) { +void Armos_SetFlagFromTransition(u32 armosId) { if (((gRoomTransition.armos_data.field_0xac >> armosId) & 1) != 0) { - SetLocalFlagByBank(FLAG_BANK_3, armosId + 0x67); + SetLocalFlagByBank(FLAG_BANK_3, armosId + AMOS_00_00); } else { - ClearLocalFlagByBank(FLAG_BANK_3, armosId + 0x67); + ClearLocalFlagByBank(FLAG_BANK_3, armosId + AMOS_00_00); } } @@ -132,7 +138,7 @@ void sub_0803026C(ArmosEntity* this) { this->unk_84 = (0x47d >> this->unk_80) & 1; } if (super->type2 != 0) { - this->unk_7c = (ScreenTransitionData*)GetCurrentRoomProperty(super->type2); + this->unk_7c = (Transition*)GetCurrentRoomProperty(super->type2); } this->unk_81 = super->health; sub_08030580(this); diff --git a/src/enemy/ballChainSoldier.c b/src/enemy/ballChainSoldier.c index f6010778..47101a5a 100644 --- a/src/enemy/ballChainSoldier.c +++ b/src/enemy/ballChainSoldier.c @@ -5,8 +5,12 @@ * @brief Ball Chain Soldier enemy */ #include "enemy.h" +#include "sound.h" +#include "projectile.h" #include "entity.h" -#include "functions.h" +#include "room.h" +#include "physics.h" +#include "asm.h" typedef struct { Entity base; diff --git a/src/enemy/beetle.c b/src/enemy/beetle.c index 19603462..934e308a 100644 --- a/src/enemy/beetle.c +++ b/src/enemy/beetle.c @@ -5,7 +5,11 @@ * @brief Beetle enemy */ #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "player.h" +#include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/bladeTrap.c b/src/enemy/bladeTrap.c index 68d229ed..fecaeeca 100644 --- a/src/enemy/bladeTrap.c +++ b/src/enemy/bladeTrap.c @@ -4,10 +4,10 @@ * * @brief Blade Trap enemy */ -#include "entity.h" #include "object.h" -#include "room.h" #include "sound.h" +#include "room.h" +#include "physics.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/bobomb.c b/src/enemy/bobomb.c index f1ae158b..0fc89c5c 100644 --- a/src/enemy/bobomb.c +++ b/src/enemy/bobomb.c @@ -7,9 +7,11 @@ #include "asm.h" #include "collision.h" #include "enemy.h" -#include "functions.h" -#include "object.h" #include "sound.h" +#include "effects.h" +#include "object.h" +#include "physics.h" +#include "player.h" typedef struct { /*0x00*/ Entity base; @@ -177,7 +179,7 @@ void sub_0802C91C(BobombEntity* this) { sub_0802CBC4(this); } else { if ((super->timer & 0xf) == 8) { - CreateDustSmall(super); + CreateDashFx(super); } sub_0802CC18(this); } diff --git a/src/enemy/bombPeahat.c b/src/enemy/bombPeahat.c index 5993dfb2..56fb23ed 100644 --- a/src/enemy/bombPeahat.c +++ b/src/enemy/bombPeahat.c @@ -9,6 +9,8 @@ #include "entity.h" #include "functions.h" #include "object.h" +#include "room.h" +#include "physics.h" #include "player.h" typedef struct { diff --git a/src/enemy/bombarossa.c b/src/enemy/bombarossa.c index 1190d281..49a7d4a5 100644 --- a/src/enemy/bombarossa.c +++ b/src/enemy/bombarossa.c @@ -5,9 +5,12 @@ * @brief Bombarossa enemy */ #include "enemy.h" -#include "entity.h" +#include "sound.h" +#include "effects.h" #include "object.h" +#include "asm.h" #include "room.h" +#include "physics.h" typedef struct { Entity base; diff --git a/src/enemy/bowMoblin.c b/src/enemy/bowMoblin.c index b071ced4..150d89cd 100644 --- a/src/enemy/bowMoblin.c +++ b/src/enemy/bowMoblin.c @@ -5,8 +5,12 @@ * @brief Bow Moblin enemy */ #include "enemy.h" +#include "sound.h" +#include "effects.h" +#include "projectile.h" #include "entity.h" -#include "functions.h" +#include "physics.h" +#include "asm.h" typedef struct { Entity base; diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c index 3f2c5c74..c00fdd50 100644 --- a/src/enemy/businessScrub.c +++ b/src/enemy/businessScrub.c @@ -6,14 +6,18 @@ */ #include "asm.h" #include "enemy.h" -#include "functions.h" -#include "game.h" +#include "sound.h" +#include "effects.h" +#include "flags.h" +#include "projectile.h" #include "item.h" #include "kinstone.h" #include "message.h" #include "npc.h" #include "save.h" #include "tiles.h" +#include "vram.h" +#include "color.h" struct SalesOffering { u8 field_0x0; @@ -37,7 +41,7 @@ typedef struct { /*0x80*/ u8 unk_80; /*0x81*/ u8 unk_81; /*0x82*/ u8 unused2[4]; - /*0x86*/ u16 unk_86; + /*0x86*/ u16 flag; } BusinessScrubEntity; void sub_08028E9C(BusinessScrubEntity*); @@ -95,7 +99,7 @@ void BusinessScrub_Action0(BusinessScrubEntity* this) { super->animationState = 0; super->direction = DirectionSouth; sub_08028E9C(this); - if ((*(u8*)this->unk_7c & 1) || CheckFlags(this->unk_86)) { + if ((*(u8*)this->unk_7c & 1) || CheckFlags(this->flag)) { super->action = 4; super->timer = 120; super->spritePriority.b1 = 1; @@ -227,7 +231,7 @@ void BusinessScrub_Action3(BusinessScrubEntity* this) { iVar1->z.HALF.HI -= 12; SetEntityPriority(iVar1, PRIO_MESSAGE); } - SetFlag(this->unk_86); + SetFlag(this->flag); sub_0802925C(this); } break; diff --git a/src/enemy/businessScrubPrologue.c b/src/enemy/businessScrubPrologue.c index 0f84737b..56a0ca38 100644 --- a/src/enemy/businessScrubPrologue.c +++ b/src/enemy/businessScrubPrologue.c @@ -4,9 +4,17 @@ * * @brief Business Scrub Prologue enemy */ +#include "object/cutsceneMiscObject.h" #include "enemy.h" +#include "sound.h" +#include "effects.h" +#include "projectile.h" #include "entity.h" -#include "functions.h" +#include "script.h" +#include "physics.h" +#include "room.h" +#include "player.h" +#include "asm.h" typedef struct { Entity base; diff --git a/src/enemy/chaser.c b/src/enemy/chaser.c index a17f4c96..93a042b8 100644 --- a/src/enemy/chaser.c +++ b/src/enemy/chaser.c @@ -5,7 +5,11 @@ * @brief Chaser enemy */ #include "enemy.h" +#include "sound.h" +#include "effects.h" #include "functions.h" +#include "player.h" +#include "physics.h" extern void (*const Chaser_Functions[])(Entity*); extern void (*const gUnk_080CD298[])(Entity*); diff --git a/src/enemy/chuchu.c b/src/enemy/chuchu.c index a24aa6b9..ef7575f3 100644 --- a/src/enemy/chuchu.c +++ b/src/enemy/chuchu.c @@ -6,7 +6,9 @@ */ #include "asm.h" #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "physics.h" #include "tiles.h" typedef struct { @@ -71,7 +73,7 @@ void Chuchu(ChuchuEntity* this) { /* ... */ break; case 2: - CreateDrownFX(super); + CreateDrownFx(super); return; } } diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c index a558134a..e59a2b5b 100644 --- a/src/enemy/chuchuBoss.c +++ b/src/enemy/chuchuBoss.c @@ -5,9 +5,20 @@ * @brief Chuchu Boss enemy */ #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "common.h" #include "object.h" +#include "asm.h" +#include "room.h" +#include "physics.h" +#include "player.h" #include "tiles.h" +#include "pauseMenu.h" +#ifndef EU +#include "vram.h" +#include "color.h" +#endif typedef struct { u8 unk_00; @@ -1094,7 +1105,6 @@ void sub_08026E1C(ChuchuBossEntity* this) { COLLISION_ON(super); if (sub_08027C54(this)) { this->unk_84->unk_04++; - ; super->child->health = 0xff; } if (this->unk_84->unk_04 == 3) { diff --git a/src/enemy/cloudPiranha.c b/src/enemy/cloudPiranha.c index 389237c4..ba3a1f67 100644 --- a/src/enemy/cloudPiranha.c +++ b/src/enemy/cloudPiranha.c @@ -6,9 +6,13 @@ */ #include "collision.h" #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "room.h" #include "physics.h" #include "tiles.h" +#include "asm.h" +#include "color.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/crow.c b/src/enemy/crow.c index 5ed6d5ee..2323056b 100644 --- a/src/enemy/crow.c +++ b/src/enemy/crow.c @@ -5,8 +5,10 @@ * @brief Crow enemy */ #include "enemy.h" +#include "sound.h" #include "entity.h" -#include "functions.h" +#include "physics.h" +#include "asm.h" typedef struct { Entity base; diff --git a/src/enemy/cuccoAggr.c b/src/enemy/cuccoAggr.c index bf749082..67068086 100644 --- a/src/enemy/cuccoAggr.c +++ b/src/enemy/cuccoAggr.c @@ -5,8 +5,14 @@ * @brief Cucco Aggr enemy */ #include "enemy.h" +#include "sound.h" +#include "effects.h" +#include "flags.h" #include "entity.h" -#include "functions.h" +#include "room.h" +#include "player.h" +#include "physics.h" +#include "asm.h" typedef struct { Entity base; diff --git a/src/enemy/cuccoChickAggr.c b/src/enemy/cuccoChickAggr.c index 03eb697f..eecb3de1 100644 --- a/src/enemy/cuccoChickAggr.c +++ b/src/enemy/cuccoChickAggr.c @@ -5,7 +5,10 @@ * @brief Cucco Chick Aggr enemy */ #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "player.h" +#include "asm.h" void sub_08022A88(Entity*); void sub_08022AA4(Entity*); diff --git a/src/enemy/curtain.c b/src/enemy/curtain.c index e5256714..918bdd5c 100644 --- a/src/enemy/curtain.c +++ b/src/enemy/curtain.c @@ -5,6 +5,8 @@ * @brief Curtain enemy */ #include "enemy.h" +#include "sound.h" +#include "flags.h" #include "entity.h" void (*const Curtain_Functions[])(Entity*); diff --git a/src/enemy/darkNut.c b/src/enemy/darkNut.c index 3eda472a..f5d1ca48 100644 --- a/src/enemy/darkNut.c +++ b/src/enemy/darkNut.c @@ -5,7 +5,10 @@ * @brief Dark Nut enemy */ #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "projectile.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/doorMimic.c b/src/enemy/doorMimic.c index 46972dc8..bc906e07 100644 --- a/src/enemy/doorMimic.c +++ b/src/enemy/doorMimic.c @@ -5,9 +5,13 @@ * @brief Door Mimic enemy */ #include "enemy.h" -#include "functions.h" #include "sound.h" +#include "effects.h" +#include "common.h" #include "tiles.h" +#include "object.h" +#include "asm.h" +#include "room.h" typedef struct { /*0x00*/ Entity base; @@ -51,7 +55,7 @@ void DoorMimic_OnCollision(DoorMimicEntity* this) { void DoorMimic_OnDeath(DoorMimicEntity* this) { SetTile(this->unk_7c, this->unk_7e, super->collisionLayer); CreateFx(super, FX_POT_SHATTER, 0); - EnemyDisableRespawn(super); + EnemyDisableRespawn((Enemy*)super); DeleteThisEntity(); } diff --git a/src/enemy/dust.c b/src/enemy/dust.c index 7fd8c6d0..a19dd612 100644 --- a/src/enemy/dust.c +++ b/src/enemy/dust.c @@ -6,12 +6,16 @@ */ #include "asm.h" #include "enemy.h" +#include "sound.h" +#include "effects.h" +#include "flags.h" +#include "common.h" #include "entity.h" #include "hitbox.h" #include "object.h" +#include "room.h" #include "physics.h" #include "player.h" -#include "room.h" typedef struct { Entity base; diff --git a/src/enemy/enemy4D.c b/src/enemy/enemy4D.c index 479941f6..fd4de5fb 100644 --- a/src/enemy/enemy4D.c +++ b/src/enemy/enemy4D.c @@ -5,8 +5,12 @@ * @brief Enemy4D enemy */ #include "enemy.h" +#include "sound.h" +#include "projectile.h" #include "entity.h" -#include "functions.h" +#include "room.h" +#include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/enemy50.c b/src/enemy/enemy50.c index 1bb3c193..13aefd52 100644 --- a/src/enemy/enemy50.c +++ b/src/enemy/enemy50.c @@ -6,8 +6,12 @@ */ #include "area.h" #include "enemy.h" -#include "functions.h" +#include "effects.h" +#include "physics.h" #include "player.h" +#include "room.h" +#include "script.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/enemy64.c b/src/enemy/enemy64.c index c7e561cd..7dc17d67 100644 --- a/src/enemy/enemy64.c +++ b/src/enemy/enemy64.c @@ -5,9 +5,18 @@ * @brief Enemy64 enemy */ #include "enemy.h" +#include "sound.h" +#include "effects.h" +#include "flags.h" +#include "projectile.h" #include "fade.h" -#include "functions.h" +#include "scroll.h" +#include "physics.h" #include "tiles.h" +#include "room.h" +#include "player.h" +#include "asm.h" +#include "map.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/enemyE.c b/src/enemy/enemyE.c index 56a9fe04..5b59069b 100644 --- a/src/enemy/enemyE.c +++ b/src/enemy/enemyE.c @@ -5,7 +5,7 @@ * @brief EnemyE enemy */ #include "enemy.h" -#include "functions.h" +#include "effects.h" void sub_08023000(Entity*, int); diff --git a/src/enemy/eyegore.c b/src/enemy/eyegore.c index dfa96343..28f62907 100644 --- a/src/enemy/eyegore.c +++ b/src/enemy/eyegore.c @@ -5,10 +5,15 @@ * @brief Eyegore enemy */ #include "enemy.h" -#include "fade.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "flags.h" #include "hitbox.h" #include "object.h" +#include "asm.h" +#include "room.h" +#include "physics.h" +#include "player.h" #include "tiles.h" typedef struct { @@ -22,7 +27,7 @@ typedef struct { /*0x79*/ u8 unk_79; /*0x7a*/ u8 unk_7a; /*0x7b*/ u8 unk_7b; - /*0x7c*/ u16 unk_7c; + /*0x7c*/ u16 flag; /*0x7e*/ u8 unk_7e; /*0x7f*/ u8 unk_7f; /*0x80*/ u16 tileIndex1; @@ -151,7 +156,7 @@ void Eyegore_Init(EyegoreEntity* this) { this->unk_76 = super->y.HALF.HI; this->unk_7e = 0x3c; sub_08030F00(this); - if (this->unk_7c != 0) { + if (this->flag != 0) { super->flags &= ~ENT_COLLIDE; InitializeAnimation(super, 10); } else { @@ -160,7 +165,7 @@ void Eyegore_Init(EyegoreEntity* this) { } void Eyegore_Action1(EyegoreEntity* this) { - if ((this->unk_7c != 0) && CheckFlags(this->unk_7c)) { + if ((this->flag != 0) && CheckFlags(this->flag)) { sub_08031320(this); } } diff --git a/src/enemy/fallingBoulder.c b/src/enemy/fallingBoulder.c index 13421100..fa3d564c 100644 --- a/src/enemy/fallingBoulder.c +++ b/src/enemy/fallingBoulder.c @@ -5,7 +5,12 @@ * @brief Falling Boulder enemy */ #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "room.h" +#include "player.h" +#include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/fireballGuy.c b/src/enemy/fireballGuy.c index b35b8117..112194d0 100644 --- a/src/enemy/fireballGuy.c +++ b/src/enemy/fireballGuy.c @@ -5,7 +5,11 @@ * @brief Fireball Guy enemy */ #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "player.h" +#include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/flyingPot.c b/src/enemy/flyingPot.c index 9c7a8348..1116caa8 100644 --- a/src/enemy/flyingPot.c +++ b/src/enemy/flyingPot.c @@ -6,10 +6,12 @@ */ #include "collision.h" #include "enemy.h" -#include "functions.h" +#include "effects.h" +#include "physics.h" #include "player.h" #include "room.h" #include "tiles.h" +#include "asm.h" extern Hitbox gUnk_080FD34C; diff --git a/src/enemy/flyingSkull.c b/src/enemy/flyingSkull.c index 2366f56d..b9e2f8fa 100644 --- a/src/enemy/flyingSkull.c +++ b/src/enemy/flyingSkull.c @@ -4,12 +4,17 @@ * * @brief Flying Skull enemy */ +#include "object/pot.h" #include "collision.h" #include "enemy.h" +#include "effects.h" #include "entity.h" -#include "functions.h" +#include "physics.h" #include "hitbox.h" #include "tiles.h" +#include "room.h" +#include "player.h" +#include "asm.h" typedef struct { Entity base; diff --git a/src/enemy/ghini.c b/src/enemy/ghini.c index 877db7a0..9fb7dd7c 100644 --- a/src/enemy/ghini.c +++ b/src/enemy/ghini.c @@ -6,8 +6,11 @@ */ #include "area.h" #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "player.h" #include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/gibdo.c b/src/enemy/gibdo.c index 04bf487d..a7ad5224 100644 --- a/src/enemy/gibdo.c +++ b/src/enemy/gibdo.c @@ -5,8 +5,12 @@ * @brief Gibdo enemy */ #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" #include "object.h" +#include "asm.h" +#include "physics.h" +#include "player.h" typedef struct { Entity base; diff --git a/src/enemy/gleerok.c b/src/enemy/gleerok.c index e88550f1..18586946 100644 --- a/src/enemy/gleerok.c +++ b/src/enemy/gleerok.c @@ -5,11 +5,21 @@ * @brief Gleerok enemy */ #include "enemy.h" +#include "sound.h" +#include "effects.h" +#include "flags.h" +#include "common.h" +#include "projectile.h" #include "entity.h" -#include "functions.h" #include "object.h" +#include "asm.h" +#include "room.h" +#include "physics.h" #include "player.h" #include "screen.h" +#include "pauseMenu.h" +#include "color.h" +#include "fade.h" typedef struct { union SplitHWord unk0; diff --git a/src/enemy/gyorgChild.c b/src/enemy/gyorgChild.c index ea6a5db6..67beee16 100644 --- a/src/enemy/gyorgChild.c +++ b/src/enemy/gyorgChild.c @@ -6,8 +6,10 @@ */ #include "asm.h" #include "enemy/gyorg.h" -#include "functions.h" #include "room.h" +#include "player.h" +#include "physics.h" +#include "sound.h" void GyorgChild_OnTick(GyorgChildEntity*); void GyorgChild_OnCollision(GyorgChildEntity*); diff --git a/src/enemy/gyorgFemale.c b/src/enemy/gyorgFemale.c index 034e8eb4..b705005b 100644 --- a/src/enemy/gyorgFemale.c +++ b/src/enemy/gyorgFemale.c @@ -8,11 +8,15 @@ #include "beanstalkSubtask.h" #include "collision.h" #include "enemy.h" -#include "enemy/gyorg.h" -#include "entity.h" -#include "functions.h" #include "sound.h" +#include "effects.h" +#include "common.h" +#include "projectile.h" +#include "enemy/gyorg.h" #include "assets/map_offsets.h" +#include "game.h" +#include "player.h" +#include "room.h" extern u8 gEntCount; extern u8 gMapDataTopSpecial[]; @@ -20,11 +24,10 @@ extern u8 gMapDataTopSpecial[]; extern u16 gMapDataBottomSpecial[]; extern u32 sub_08000E62(u32); -extern void RegisterTransitionManager(void*, void (*)(), void (*)()); -void sub_08046498(); +void GyorgFemale_OnEnterRoom(); void sub_0804660C(GyorgFemaleEntity*, u32); -void sub_080464C0(GyorgFemaleEntity*); +void GyorgFemale_Reset(GyorgFemaleEntity*); void GyorgFemale_SpawnChildren(GyorgFemaleEntity* this, bool32 unlimit_tmp); void sub_080465C8(void); void GyorgFemale_ProcessEyeHit(GyorgFemaleEntity* this); @@ -92,13 +95,13 @@ void GyorgFemale_Setup(GyorgFemaleEntity* this) { MemClear(&gMapDataBottomSpecial, 0x8000); MemClear(&gMapDataTopSpecial, 0x8000); sub_0804660C(this, 0); - sub_080464C0(this); + GyorgFemale_Reset(this); gPlayerEntity.base.collisionLayer = 2; UpdateSpriteForCollisionLayer(&gPlayerEntity.base); #ifndef EU - RegisterTransitionManager(this, sub_08046498, 0); + RegisterTransitionHandler(this, GyorgFemale_OnEnterRoom, NULL); #else - RegisterTransitionManager(this, sub_080464C0, 0); + RegisterTransitionHandler(this, GyorgFemale_Reset, NULL); #endif } @@ -110,7 +113,7 @@ void GyorgFemale_Action1(GyorgFemaleEntity* this) { } else { if (this->unk_79 & 0x40) { this->unk_79 &= ~0x40; - sub_080464C0(this); + GyorgFemale_Reset(this); } } sub_080465C8(); @@ -217,14 +220,14 @@ void GyorgFemale_Action3(GyorgFemaleEntity* this) { } #ifndef EU -void sub_08046498(GyorgFemaleEntity* this) { +void GyorgFemale_OnEnterRoom(GyorgFemaleEntity* this) { MemClear(&gMapDataBottomSpecial, 0x8000); MemClear(&gMapDataTopSpecial, 0x8000); - sub_080464C0(this); + GyorgFemale_Reset(this); } #endif -void sub_080464C0(GyorgFemaleEntity* this) { +void GyorgFemale_Reset(GyorgFemaleEntity* this) { static const MapDataDefinition* const gyorgMappings[] = { gGyorgMapping0, gGyorgMapping1, diff --git a/src/enemy/gyorgFemaleEye.c b/src/enemy/gyorgFemaleEye.c index b9ff2671..05c03183 100644 --- a/src/enemy/gyorgFemaleEye.c +++ b/src/enemy/gyorgFemaleEye.c @@ -5,10 +5,13 @@ * @brief Gyorg Female Eye enemy */ #include "enemy.h" +#include "sound.h" +#include "effects.h" #include "enemy/gyorg.h" #include "entity.h" -#include "functions.h" #include "player.h" +#include "room.h" +#include "asm.h" void GyorgFemaleEye_OnTick(GyorgFemaleEyeEntity*); void GyorgFemaleEye_OnCollision(GyorgFemaleEyeEntity*); diff --git a/src/enemy/gyorgMale.c b/src/enemy/gyorgMale.c index d4d52e95..39d98d7c 100644 --- a/src/enemy/gyorgMale.c +++ b/src/enemy/gyorgMale.c @@ -6,10 +6,13 @@ */ #include "effects.h" #include "enemy.h" +#include "sound.h" +#include "projectile.h" #include "enemy/gyorg.h" #include "fileselect.h" -#include "functions.h" +#include "physics.h" #include "player.h" +#include "asm.h" // todo: wrong types extern void sub_080A1D70(Entity*, u32); diff --git a/src/enemy/gyorgMaleEye.c b/src/enemy/gyorgMaleEye.c index 03202469..c62b8d30 100644 --- a/src/enemy/gyorgMaleEye.c +++ b/src/enemy/gyorgMaleEye.c @@ -5,8 +5,10 @@ * @brief GyorgMaleEye enemy */ #include "enemy.h" -#include "fade.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "physics.h" +#include "room.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/hangingSeed.c b/src/enemy/hangingSeed.c index 2f52e0ab..3dabc2ca 100644 --- a/src/enemy/hangingSeed.c +++ b/src/enemy/hangingSeed.c @@ -5,8 +5,9 @@ * @brief Hanging Seed enemy */ #include "enemy.h" +#include "sound.h" +#include "effects.h" #include "entity.h" -#include "functions.h" extern void (*const HangingSeed_Functions[])(Entity*); extern void (*const gUnk_080CB588[])(Entity*); diff --git a/src/enemy/helmasaur.c b/src/enemy/helmasaur.c index 9de3ac59..cf22a53c 100644 --- a/src/enemy/helmasaur.c +++ b/src/enemy/helmasaur.c @@ -6,8 +6,13 @@ */ #include "collision.h" #include "enemy.h" -#include "functions.h" +#include "effects.h" #include "object.h" +#include "asm.h" +#include "room.h" +#include "physics.h" +#include "player.h" +#include "map.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/keaton.c b/src/enemy/keaton.c index a6f007f8..48335e94 100644 --- a/src/enemy/keaton.c +++ b/src/enemy/keaton.c @@ -5,7 +5,11 @@ * @brief keaton enemy */ #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "projectile.h" +#include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/keese.c b/src/enemy/keese.c index 922ad17d..8f1390a6 100644 --- a/src/enemy/keese.c +++ b/src/enemy/keese.c @@ -5,8 +5,11 @@ * @brief Keese enemy */ #include "enemy.h" +#include "sound.h" +#include "effects.h" #include "physics.h" #include "player.h" +#include "asm.h" typedef struct { /* 0x00 */ Entity base; diff --git a/src/enemy/lakitu.c b/src/enemy/lakitu.c index c0dba3db..bff5b976 100644 --- a/src/enemy/lakitu.c +++ b/src/enemy/lakitu.c @@ -5,8 +5,12 @@ * @brief Lakitu enemy */ #include "enemy.h" +#include "sound.h" +#include "effects.h" +#include "projectile.h" #include "physics.h" #include "player.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/lakituCloud.c b/src/enemy/lakituCloud.c index ac2549fc..85d37c90 100644 --- a/src/enemy/lakituCloud.c +++ b/src/enemy/lakituCloud.c @@ -7,6 +7,7 @@ #include "asm.h" #include "effects.h" #include "enemy.h" +#include "sound.h" #include "entity.h" #include "object.h" #include "physics.h" diff --git a/src/enemy/leever.c b/src/enemy/leever.c index ef2c051a..1030a1be 100644 --- a/src/enemy/leever.c +++ b/src/enemy/leever.c @@ -6,6 +6,7 @@ */ #include "asm.h" #include "enemy.h" +#include "effects.h" #include "physics.h" #include "tiles.h" diff --git a/src/enemy/likeLike.c b/src/enemy/likeLike.c index 0a124fe5..b69bfde1 100644 --- a/src/enemy/likeLike.c +++ b/src/enemy/likeLike.c @@ -5,9 +5,14 @@ * @brief Like Like enemy */ #include "enemy.h" +#include "sound.h" +#include "effects.h" #include "item.h" #include "message.h" #include "object.h" +#include "asm.h" +#include "physics.h" +#include "player.h" #include "save.h" typedef struct { @@ -145,7 +150,7 @@ void sub_08027F84(LikeLikeEntity* this) { super->action = 5; super->spriteSettings.draw = 1; InitializeAnimation(super, 0); - CreateDust(super); + CreateDeathFx(super); } } @@ -177,7 +182,7 @@ void sub_0802802C(LikeLikeEntity* this) { super->spriteSettings.draw = 0; super->direction = 0; super->timer = 0; - CreateDust(super); + CreateDeathFx(super); } } diff --git a/src/enemy/madderpillar.c b/src/enemy/madderpillar.c index 7df20a7d..de439c90 100644 --- a/src/enemy/madderpillar.c +++ b/src/enemy/madderpillar.c @@ -5,8 +5,13 @@ * @brief Madderpillar enemy */ #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" #include "hitbox.h" +#include "room.h" +#include "physics.h" +#include "asm.h" +#include "color.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/mazaalBracelet.c b/src/enemy/mazaalBracelet.c index a4ec8dd8..72ba305e 100644 --- a/src/enemy/mazaalBracelet.c +++ b/src/enemy/mazaalBracelet.c @@ -5,9 +5,16 @@ * @brief Mazaal Bracelet enemy */ #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" #include "hitbox.h" #include "object.h" +#include "asm.h" +#include "script.h" +#include "room.h" +#include "physics.h" +#include "player.h" +#include "color.h" typedef struct MazaalBraceletEntity_ { /*0x00*/ Entity base; diff --git a/src/enemy/mazaalHead.c b/src/enemy/mazaalHead.c index 049b32d1..ffb4d420 100644 --- a/src/enemy/mazaalHead.c +++ b/src/enemy/mazaalHead.c @@ -6,8 +6,14 @@ */ #include "area.h" #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "projectile.h" #include "object.h" +#include "asm.h" +#include "room.h" +#include "physics.h" +#include "player.h" #include "roomid.h" #include "screen.h" @@ -118,12 +124,8 @@ void (*const gUnk_080CED74[])(MazaalHeadEntity*) = { sub_08034BA0, }; const s8 gUnk_080CED84[] = { 0x0d, 0x10, -0xd, 0x10 }; -const ScreenTransitionData gUnk_080CED88 = { - 1, { 0, 0, 0, 0 }, 0x88, 0xf8, 0, AREA_INNER_MAZAAL, ROOM_INNER_MAZAAL_PHASE_1, 1, 0, 0, 0 -}; -const ScreenTransitionData gUnk_080CED9C = { - 1, { 0, 0, 0, 0 }, 0x88, 0xf8, 0, AREA_INNER_MAZAAL, ROOM_INNER_MAZAAL_MAIN, 1, 0, 0, 0 -}; +const Transition gUnk_080CED88 = { 1, 0, 0, 0x88, 0xf8, 0, AREA_INNER_MAZAAL, ROOM_INNER_MAZAAL_PHASE_1, 1, 0, 0, 0 }; +const Transition gUnk_080CED9C = { 1, 0, 0, 0x88, 0xf8, 0, AREA_INNER_MAZAAL, ROOM_INNER_MAZAAL_MAIN, 1, 0, 0, 0 }; void MazaalHead(MazaalHeadEntity* this) { MazaalHead_Functions[GetNextFunction(super)](this); diff --git a/src/enemy/mazaalMacro.c b/src/enemy/mazaalMacro.c index 2f6f330f..fd3146b6 100644 --- a/src/enemy/mazaalMacro.c +++ b/src/enemy/mazaalMacro.c @@ -5,11 +5,15 @@ * @brief Mazaal Macro enemy */ #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" #include "screenTransitions.h" +#include "room.h" #include "script.h" -#include "structures.h" #include "tiles.h" +#include "player.h" +#include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/miniFireballGuy.c b/src/enemy/miniFireballGuy.c index 97365958..f50c3bc6 100644 --- a/src/enemy/miniFireballGuy.c +++ b/src/enemy/miniFireballGuy.c @@ -5,7 +5,10 @@ * @brief Mini Fireball Guy enemy */ #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/miniSlime.c b/src/enemy/miniSlime.c index 856651e6..38a42e96 100644 --- a/src/enemy/miniSlime.c +++ b/src/enemy/miniSlime.c @@ -5,7 +5,10 @@ * @brief Mini Slime enemy */ #include "enemy.h" +#include "sound.h" +#include "effects.h" #include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/moldorm.c b/src/enemy/moldorm.c index 96d6a9cd..7c744db4 100644 --- a/src/enemy/moldorm.c +++ b/src/enemy/moldorm.c @@ -6,7 +6,8 @@ */ #include "collision.h" #include "enemy.h" -#include "functions.h" +#include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/moldworm.c b/src/enemy/moldworm.c index f5e2dc05..8e3e6db0 100644 --- a/src/enemy/moldworm.c +++ b/src/enemy/moldworm.c @@ -6,8 +6,14 @@ */ #include "collision.h" #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "physics.h" #include "tiles.h" +#include "room.h" +#include "player.h" +#include "asm.h" +#include "color.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/mulldozer.c b/src/enemy/mulldozer.c index 9f29616d..6a4a8f90 100644 --- a/src/enemy/mulldozer.c +++ b/src/enemy/mulldozer.c @@ -6,6 +6,9 @@ */ #include "collision.h" #include "enemy.h" +#include "sound.h" +#include "effects.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/octorok.c b/src/enemy/octorok.c index 35153389..2829c58a 100644 --- a/src/enemy/octorok.c +++ b/src/enemy/octorok.c @@ -5,7 +5,11 @@ * @brief Octorok enemy */ #include "enemy.h" +#include "sound.h" +#include "effects.h" +#include "projectile.h" #include "physics.h" +#include "asm.h" void Octorok_Pause(Entity*); bool32 Octorok_FacesPlayer(Entity*); diff --git a/src/enemy/octorokBoss.c b/src/enemy/octorokBoss.c index e0d377f8..0886f1bf 100644 --- a/src/enemy/octorokBoss.c +++ b/src/enemy/octorokBoss.c @@ -6,10 +6,19 @@ */ #include "enemy/octorokBoss.h" #include "collision.h" -#include "functions.h" +#include "pauseMenu.h" #include "game.h" #include "object.h" +#include "asm.h" +#include "common.h" +#include "sound.h" +#include "effects.h" +#include "room.h" +#include "physics.h" +#include "player.h" #include "projectile.h" +#include "vram.h" +#include "color.h" #define IS_FROZEN(this) ((this)->bossPhase & 1) diff --git a/src/enemy/octorokGolden.c b/src/enemy/octorokGolden.c index 23b92aa5..8753e2b5 100644 --- a/src/enemy/octorokGolden.c +++ b/src/enemy/octorokGolden.c @@ -6,9 +6,14 @@ */ #include "collision.h" #include "enemy.h" +#include "sound.h" +#include "effects.h" +#include "flags.h" +#include "projectile.h" #include "map.h" #include "player.h" #include "item.h" +#include "asm.h" void (*const OctorokGolden_Functions[])(Entity*); void (*const gUnk_080CF484[])(Entity*); diff --git a/src/enemy/peahat.c b/src/enemy/peahat.c index 8c5f6646..3ff7a436 100644 --- a/src/enemy/peahat.c +++ b/src/enemy/peahat.c @@ -5,7 +5,10 @@ * @brief Peahat enemy */ #include "enemy.h" +#include "sound.h" +#include "effects.h" #include "physics.h" +#include "asm.h" #include "room.h" typedef struct { @@ -286,7 +289,7 @@ void Peahat_Stunned(PeahatEntity* this) { super->hitType = 0x71; } break; - }; + } } void Peahat_RepairPropeller(PeahatEntity* this) { diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c index 489098cd..86078197 100644 --- a/src/enemy/pesto.c +++ b/src/enemy/pesto.c @@ -6,8 +6,15 @@ */ #include "collision.h" #include "enemy.h" +#include "sound.h" +#include "effects.h" +#include "projectile.h" #include "game.h" #include "object.h" +#include "asm.h" +#include "room.h" +#include "physics.h" +#include "player.h" #include "playeritem.h" #include "save.h" @@ -137,7 +144,7 @@ void nullsub_138(PestoEntity* this) { void sub_0802409C(PestoEntity* this) { super->health = 0; InitializeAnimation(super, super->animationState); - CreateDust(super); + CreateDeathFx(super); } void sub_080240B8(PestoEntity* this) { diff --git a/src/enemy/puffstool.c b/src/enemy/puffstool.c index cf40c24c..bb6fa93a 100644 --- a/src/enemy/puffstool.c +++ b/src/enemy/puffstool.c @@ -6,8 +6,15 @@ */ #include "collision.h" #include "enemy.h" +#include "sound.h" +#include "effects.h" #include "object.h" +#include "asm.h" +#include "room.h" +#include "physics.h" +#include "player.h" #include "tiles.h" +#include "color.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/rockChuchu.c b/src/enemy/rockChuchu.c index 72e18f8d..25acfff7 100644 --- a/src/enemy/rockChuchu.c +++ b/src/enemy/rockChuchu.c @@ -5,7 +5,10 @@ * @brief Rock Chuchu enemy */ #include "enemy.h" +#include "sound.h" +#include "effects.h" #include "player.h" +#include "asm.h" extern void (*const RockChuchu_Functions[])(Entity*); extern void (*const gUnk_080CB960[])(Entity*); diff --git a/src/enemy/rollobite.c b/src/enemy/rollobite.c index e2a372a8..428038e6 100644 --- a/src/enemy/rollobite.c +++ b/src/enemy/rollobite.c @@ -6,10 +6,12 @@ */ #include "collision.h" #include "enemy.h" +#include "sound.h" #include "physics.h" #include "player.h" #include "room.h" #include "tiles.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/rope.c b/src/enemy/rope.c index f8b171f4..e3b19968 100644 --- a/src/enemy/rope.c +++ b/src/enemy/rope.c @@ -5,8 +5,11 @@ * @brief Rope enemy */ #include "enemy.h" +#include "sound.h" +#include "effects.h" #include "physics.h" #include "tiles.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/ropeGolden.c b/src/enemy/ropeGolden.c index 0e653b80..69c43e98 100644 --- a/src/enemy/ropeGolden.c +++ b/src/enemy/ropeGolden.c @@ -5,10 +5,14 @@ * @brief Golden Rope enemy */ #include "enemy.h" +#include "sound.h" +#include "effects.h" +#include "flags.h" #include "entity.h" #include "physics.h" #include "player.h" #include "item.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/rupeeLike.c b/src/enemy/rupeeLike.c index ada5434e..7344e387 100644 --- a/src/enemy/rupeeLike.c +++ b/src/enemy/rupeeLike.c @@ -8,7 +8,12 @@ #include "entity.h" #include "hitbox.h" #include "object.h" -#include "room.h" +#include "asm.h" +#include "sound.h" +#include "effects.h" +#include "physics.h" +#include "player.h" +#include "vram.h" #include "save.h" typedef struct { @@ -275,7 +280,7 @@ void sub_08029770(RupeeLikeEntity* this) { InitializeAnimation(super, 2); super->child->spriteSettings.draw = TRUE; InitializeAnimation(super->child, 6); - CreateDust(super); + CreateDeathFx(super); } } diff --git a/src/enemy/scissorsBeetle.c b/src/enemy/scissorsBeetle.c index 72bb2f8a..dd4eba0c 100644 --- a/src/enemy/scissorsBeetle.c +++ b/src/enemy/scissorsBeetle.c @@ -6,7 +6,11 @@ */ #include "collision.h" #include "enemy.h" +#include "sound.h" +#include "effects.h" +#include "projectile.h" #include "entity.h" +#include "asm.h" typedef struct { Entity base; diff --git a/src/enemy/sensorBladeTrap.c b/src/enemy/sensorBladeTrap.c index 31d2bc10..36357f4e 100644 --- a/src/enemy/sensorBladeTrap.c +++ b/src/enemy/sensorBladeTrap.c @@ -6,6 +6,7 @@ */ #include "collision.h" #include "enemy.h" +#include "sound.h" #include "map.h" #include "physics.h" diff --git a/src/enemy/slime.c b/src/enemy/slime.c index 536eec67..5c7636c0 100644 --- a/src/enemy/slime.c +++ b/src/enemy/slime.c @@ -5,8 +5,11 @@ * @brief Slime enemy */ #include "enemy.h" +#include "sound.h" +#include "effects.h" #include "physics.h" #include "room.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/sluggula.c b/src/enemy/sluggula.c index 4217da7e..e816a1a0 100644 --- a/src/enemy/sluggula.c +++ b/src/enemy/sluggula.c @@ -5,7 +5,10 @@ * @brief Sluggula enemy */ #include "enemy.h" +#include "sound.h" +#include "effects.h" #include "physics.h" +#include "asm.h" void sub_08023E10(Entity*); void sub_08023E54(Entity*); diff --git a/src/enemy/smallPesto.c b/src/enemy/smallPesto.c index 0c287bbc..a9652e10 100644 --- a/src/enemy/smallPesto.c +++ b/src/enemy/smallPesto.c @@ -5,7 +5,10 @@ * @brief Small Pesto enemy */ #include "enemy.h" +#include "sound.h" +#include "effects.h" #include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/spark.c b/src/enemy/spark.c index 79a65afe..a5dde94a 100644 --- a/src/enemy/spark.c +++ b/src/enemy/spark.c @@ -6,7 +6,9 @@ */ #include "collision.h" #include "enemy.h" +#include "effects.h" #include "object.h" +#include "physics.h" extern void (*const Spark_Functions[])(Entity*); extern void (*const gUnk_080CD24C[])(Entity*); diff --git a/src/enemy/spearMoblin.c b/src/enemy/spearMoblin.c index 271a4c23..e8954dd2 100644 --- a/src/enemy/spearMoblin.c +++ b/src/enemy/spearMoblin.c @@ -5,7 +5,12 @@ * @brief Spear Moblin enemy */ #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "projectile.h" +#include "object.h" +#include "asm.h" +#include "physics.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/spikedBeetle.c b/src/enemy/spikedBeetle.c index 95e3566f..9994d6c3 100644 --- a/src/enemy/spikedBeetle.c +++ b/src/enemy/spikedBeetle.c @@ -5,7 +5,11 @@ * @brief Spiked Beetle enemy */ #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "player.h" +#include "physics.h" +#include "asm.h" extern u32 sub_0804A024(Entity*, u32, u32); diff --git a/src/enemy/spinyBeetle.c b/src/enemy/spinyBeetle.c index ff5df9ae..bbc0b84a 100644 --- a/src/enemy/spinyBeetle.c +++ b/src/enemy/spinyBeetle.c @@ -5,9 +5,14 @@ * @brief Spiny Beetle enemy */ #include "enemy.h" +#include "sound.h" #include "entity.h" -#include "functions.h" #include "object.h" +#include "asm.h" +#include "effects.h" +#include "room.h" +#include "physics.h" +#include "player.h" #include "tiles.h" typedef struct { diff --git a/src/enemy/spinyChuchu.c b/src/enemy/spinyChuchu.c index ee63610d..9ae50774 100644 --- a/src/enemy/spinyChuchu.c +++ b/src/enemy/spinyChuchu.c @@ -5,8 +5,11 @@ * @brief Spiny Chuchu enemy */ #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" #include "hitbox.h" +#include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/stalfos.c b/src/enemy/stalfos.c index 3d31789b..64270757 100644 --- a/src/enemy/stalfos.c +++ b/src/enemy/stalfos.c @@ -6,8 +6,14 @@ */ #include "collision.h" #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "projectile.h" +#include "physics.h" #include "tiles.h" +#include "room.h" +#include "player.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/takkuri.c b/src/enemy/takkuri.c index d0524dde..50cd83b4 100644 --- a/src/enemy/takkuri.c +++ b/src/enemy/takkuri.c @@ -5,10 +5,14 @@ * @brief Takkuri enemy */ #include "enemy.h" +#include "sound.h" #include "entity.h" -#include "functions.h" #include "item.h" #include "object.h" +#include "asm.h" +#include "room.h" +#include "physics.h" +#include "player.h" #include "save.h" typedef struct { @@ -47,7 +51,7 @@ void Takkuri_OnCollision(TakkuriEntity* this) { if (super->contactFlags & CONTACT_NOW) { if ((super->contactFlags & 0x7f) == 0) { u32 direction; - sub_0803C0AC(super); + StealRupees(super); COLLISION_OFF(super); direction = super->direction; if (!DirectionIsHorizontal(DirectionRoundUp(direction))) { @@ -305,8 +309,8 @@ void sub_0803BF70(TakkuriEntity* this) { GetNextFrame(super); } -void sub_0803C0AC(Entity* this) { - u32 index, rupeeType, rupees; +void StealRupees(Entity* this) { + u32 rupeeCount, rupeeType, rupees; Entity* entity; entity = sub_08049DF4(1); if (entity == NULL) @@ -315,22 +319,22 @@ void sub_0803C0AC(Entity* this) { rupees = gSave.stats.rupees; if (rupees >= 500) { rupeeType = ITEM_RUPEE20; - index = 5; + rupeeCount = 5; ModRupees(-100); } else if (rupees >= 100) { rupeeType = ITEM_RUPEE5; - index = 5; + rupeeCount = 5; ModRupees(-25); } else { rupeeType = ITEM_RUPEE1; - index = rupees; + rupeeCount = rupees; if (rupees >= 0x5) { - index = 5; + rupeeCount = 5; } - ModRupees(-index); + ModRupees(-rupeeCount); } - for (; index != 0; index--) { + for (; rupeeCount != 0; rupeeCount--) { Entity* obj = CreateObject(RUPEE_OBJECT, rupeeType, 0); if (obj) { diff --git a/src/enemy/tektite.c b/src/enemy/tektite.c index fbc4c756..46053390 100644 --- a/src/enemy/tektite.c +++ b/src/enemy/tektite.c @@ -6,7 +6,8 @@ */ #include "collision.h" #include "enemy.h" -#include "functions.h" +#include "effects.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/tektiteGolden.c b/src/enemy/tektiteGolden.c index 047b449f..f7875954 100644 --- a/src/enemy/tektiteGolden.c +++ b/src/enemy/tektiteGolden.c @@ -6,8 +6,10 @@ */ #include "collision.h" #include "enemy.h" -#include "functions.h" +#include "effects.h" +#include "flags.h" #include "item.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/torchTrap.c b/src/enemy/torchTrap.c index 62789aa9..12ccd594 100644 --- a/src/enemy/torchTrap.c +++ b/src/enemy/torchTrap.c @@ -5,11 +5,15 @@ * @brief Torch Trap enemy */ #include "enemy.h" +#include "sound.h" +#include "flags.h" +#include "projectile.h" #include "entity.h" #include "physics.h" #include "player.h" #include "room.h" #include "tiles.h" +#include "asm.h" typedef struct { Entity base; @@ -18,9 +22,9 @@ typedef struct { u16 filler2; u16 unk_78; u16 projectileTimer; - u16 unk_7c; + u16 flag1; u8 filler3[0x2]; - u16 unk_80; + u16 flag2; u16 unk_82; u16 unk_84; } TorchTrapEntity; @@ -75,35 +79,35 @@ void sub_0803CF38(TorchTrapEntity* this) { void sub_0803CF94(TorchTrapEntity* this) { if (GetTileTypeAtTilePos(this->tilePos, super->collisionLayer) == TILE_TYPE_118) { - this->unk_80 = 0; + this->flag2 = 0; TorchTrap_Reset(this); - } else if (this->unk_7c && sub_0803CFD8(this)) { + } else if (this->flag1 && sub_0803CFD8(this)) { TorchTrap_Reset(this); } } bool32 sub_0803CFD8(TorchTrapEntity* this) { u32 result; - if (this->unk_7c == 0) { + if (this->flag1 == 0) { result = TRUE; } else { - result = CheckFlags(this->unk_7c); + result = CheckFlags(this->flag1); } return result; } bool32 sub_0803CFF0(TorchTrapEntity* this) { u32 result; - if (this->unk_80 != 0) { - if (this->unk_80 == this->unk_7c) { - u32 val = CheckFlags(this->unk_80); + if (this->flag2 != 0) { + if (this->flag2 == this->flag1) { + u32 val = CheckFlags(this->flag2); result = FALSE; if (val == 0) { result = TRUE; } return result; } else { - return CheckFlags(this->unk_80); + return CheckFlags(this->flag2); } } diff --git a/src/enemy/treeItem.c b/src/enemy/treeItem.c index 2e1e9a34..5169946d 100644 --- a/src/enemy/treeItem.c +++ b/src/enemy/treeItem.c @@ -5,9 +5,13 @@ * @brief Tree Item enemy */ #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" #include "item.h" #include "object.h" +#include "asm.h" +#include "physics.h" +#include "player.h" typedef struct { /*0x00*/ Entity base; @@ -73,7 +77,7 @@ void TreeItem(TreeItemEntity* this) { break; } - EnemyDisableRespawn(super); + EnemyDisableRespawn((Enemy*)super); DeleteThisEntity(); } diff --git a/src/enemy/vaatiArm.c b/src/enemy/vaatiArm.c index facc5527..8ee71d2e 100644 --- a/src/enemy/vaatiArm.c +++ b/src/enemy/vaatiArm.c @@ -6,9 +6,16 @@ */ #include "area.h" #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "common.h" +#include "projectile.h" #include "hitbox.h" #include "object.h" +#include "asm.h" +#include "room.h" +#include "physics.h" +#include "player.h" #include "roomid.h" typedef struct { @@ -185,9 +192,7 @@ const Coords gUnk_080D13D8[] = { { .HALF = { -0x60, 0x80 } }, { .HALF = { 0x60, const u8 gUnk_080D13E0[] = { 0xc, 0xe, 0x10 }; const u8 gUnk_080D13E3[] = { 8, 9, 10, 4, 4, 5 }; const s8 gUnk_080D13E9[] = { -8, 8 }; -const ScreenTransitionData gUnk_080D13EC = { - 1, { 0, 0, 0, 0 }, 0x98, 0xb8, 0, AREA_VAATIS_ARMS, ROOM_VAATIS_ARMS_FIRST, 1, 0, 0, 0 -}; +const Transition gUnk_080D13EC = { 1, 0, 0, 0x98, 0xb8, 0, AREA_VAATIS_ARMS, ROOM_VAATIS_ARMS_FIRST, 1, 0, 0, 0 }; const u16 gUnk_080D1400[][5] = { { 0x8000, 0x7000, 0x6000, 0x5000, 0x4000 }, { 0x8000, -0x7000, -0x6000, -0x5000, -0x4000 }, diff --git a/src/enemy/vaatiBall.c b/src/enemy/vaatiBall.c index 94e040be..3e662393 100644 --- a/src/enemy/vaatiBall.c +++ b/src/enemy/vaatiBall.c @@ -5,9 +5,13 @@ * @brief Vaati Ball enemy */ #include "enemy.h" +#include "projectile.h" #include "entity.h" -#include "functions.h" #include "object.h" +#include "asm.h" +#include "sound.h" +#include "effects.h" +#include "physics.h" #include "player.h" typedef struct { @@ -72,7 +76,7 @@ void VaatiBall(VaatiBallEntity* this) { COLLISION_OFF(super); super->health = -1; ((VaatiBallEntity*)parent)->unk_80--; - CreateDust(super); + CreateDeathFx(super); SoundReq(SFX_1C3); } } diff --git a/src/enemy/vaatiEyesMacro.c b/src/enemy/vaatiEyesMacro.c index e1c11638..33e90175 100644 --- a/src/enemy/vaatiEyesMacro.c +++ b/src/enemy/vaatiEyesMacro.c @@ -5,7 +5,13 @@ * @brief Vaati Eyes Macro enemy */ #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "room.h" +#include "player.h" +#include "physics.h" +#include "manager.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/vaatiProjectile.c b/src/enemy/vaatiProjectile.c index bb366ef5..3c0e694f 100644 --- a/src/enemy/vaatiProjectile.c +++ b/src/enemy/vaatiProjectile.c @@ -5,9 +5,14 @@ * @brief Vaati Projectile enemy */ #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" #include "screenTransitions.h" +#include "room.h" #include "tiles.h" +#include "player.h" +#include "physics.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/vaatiRebornEnemy.c b/src/enemy/vaatiRebornEnemy.c index 5463b4f0..123442cb 100644 --- a/src/enemy/vaatiRebornEnemy.c +++ b/src/enemy/vaatiRebornEnemy.c @@ -6,7 +6,14 @@ */ #include "area.h" #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "flags.h" +#include "projectile.h" +#include "physics.h" +#include "room.h" +#include "player.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/vaatiTransfigured.c b/src/enemy/vaatiTransfigured.c index 663133fe..ca917019 100644 --- a/src/enemy/vaatiTransfigured.c +++ b/src/enemy/vaatiTransfigured.c @@ -5,8 +5,15 @@ * @brief Vaati Transfigured enemy */ #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "flags.h" +#include "projectile.h" #include "object.h" +#include "asm.h" +#include "room.h" +#include "physics.h" +#include "player.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/vaatiTransfiguredEye.c b/src/enemy/vaatiTransfiguredEye.c index c3e33442..a0190dd6 100644 --- a/src/enemy/vaatiTransfiguredEye.c +++ b/src/enemy/vaatiTransfiguredEye.c @@ -5,10 +5,11 @@ * @brief Vaati Transfigured Eye enemy */ #include "enemy.h" +#include "sound.h" #include "entity.h" -#include "functions.h" #include "message.h" #include "physics.h" +#include "color.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/vaatiWrath.c b/src/enemy/vaatiWrath.c index 21f5c506..66a40a98 100644 --- a/src/enemy/vaatiWrath.c +++ b/src/enemy/vaatiWrath.c @@ -6,11 +6,24 @@ */ #include "enemy/vaatiWrath.h" -#include "functions.h" #include "message.h" #include "object.h" +#include "asm.h" +#include "common.h" +#include "sound.h" +#include "flags.h" +#include "effects.h" +#include "room.h" +#include "physics.h" +#include "player.h" +#include "vram.h" +#include "scroll.h" +#include "color.h" +#include "fade.h" +#include "projectile.h" +#if defined USA || defined DEMO_USA || defined DEMO_JP #include "save.h" -#include "screen.h" +#endif void VaatiWrathType0PreAction(VaatiWrathEntity*); u32 sub_08041FCC(VaatiWrathEntity*); diff --git a/src/enemy/vaatiWrathEye.c b/src/enemy/vaatiWrathEye.c index f7782fd2..3fd20877 100644 --- a/src/enemy/vaatiWrathEye.c +++ b/src/enemy/vaatiWrathEye.c @@ -5,7 +5,12 @@ * @brief Vaati Wrath Eye enemy */ #include "enemy/vaatiWrath.h" -#include "functions.h" +#include "room.h" +#include "physics.h" +#include "asm.h" +#include "sound.h" +#include "effects.h" +#include "projectile.h" void sub_080485D8(Entity*); void sub_080485FC(Entity*); diff --git a/src/enemy/wallMaster.c b/src/enemy/wallMaster.c index e48becaa..f7f93fd7 100644 --- a/src/enemy/wallMaster.c +++ b/src/enemy/wallMaster.c @@ -6,8 +6,12 @@ */ #include "area.h" #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "player.h" #include "screenTransitions.h" +#include "room.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/wallMaster2.c b/src/enemy/wallMaster2.c index a4423049..a0730376 100644 --- a/src/enemy/wallMaster2.c +++ b/src/enemy/wallMaster2.c @@ -6,8 +6,12 @@ */ #include "area.h" #include "enemy.h" -#include "functions.h" +#include "effects.h" +#include "physics.h" #include "screenTransitions.h" +#include "room.h" +#include "player.h" +#include "asm.h" typedef struct { /*0x00*/ Entity base; diff --git a/src/enemy/waterDrop.c b/src/enemy/waterDrop.c index fb2d13e2..c96e2754 100644 --- a/src/enemy/waterDrop.c +++ b/src/enemy/waterDrop.c @@ -5,9 +5,15 @@ * @brief Water Drop enemy */ #include "enemy.h" +#include "effects.h" #include "object.h" +#include "asm.h" +#include "sound.h" +#include "room.h" +#include "physics.h" +#include "player.h" #include "screen.h" -#include "structures.h" +#include "vram.h" void sub_0802A39C(Entity*); void sub_0802A334(Entity*); diff --git a/src/enemy/wisp.c b/src/enemy/wisp.c index e5c4c5e5..1dc3c082 100644 --- a/src/enemy/wisp.c +++ b/src/enemy/wisp.c @@ -6,8 +6,11 @@ */ #include "collision.h" #include "enemy.h" -#include "functions.h" #include "object.h" +#include "asm.h" +#include "effects.h" +#include "physics.h" +#include "player.h" #include "save.h" typedef struct { @@ -147,7 +150,7 @@ void sub_080336DC(WispEntity* this) { super->y.HALF.HI = this->unk_82; break; case 0x18: - CreateDust(super); + CreateDeathFx(super); break; case 0xc: super->spriteSettings.draw = TRUE; diff --git a/src/enemy/wizzrobeFire.c b/src/enemy/wizzrobeFire.c index 638b16cf..dda22d54 100644 --- a/src/enemy/wizzrobeFire.c +++ b/src/enemy/wizzrobeFire.c @@ -6,7 +6,11 @@ */ #include "enemy/wizzrobe.h" #include "enemy.h" -#include "functions.h" +#include "sound.h" +#include "effects.h" +#include "projectile.h" +#include "player.h" +#include "asm.h" extern void (*const WizzrobeFire_Functions[])(WizzrobeEntity*); extern void (*const WizzrobeFire_Actions[])(WizzrobeEntity*); diff --git a/src/enemy/wizzrobeIce.c b/src/enemy/wizzrobeIce.c index d9af54c3..99ec30ce 100644 --- a/src/enemy/wizzrobeIce.c +++ b/src/enemy/wizzrobeIce.c @@ -6,8 +6,12 @@ */ #include "enemy/wizzrobe.h" #include "enemy.h" -#include "functions.h" +#include "projectile.h" #include "object.h" +#include "asm.h" +#include "sound.h" +#include "effects.h" +#include "player.h" extern void (*const WizzrobeIce_Functions[])(WizzrobeEntity*); extern void (*const WizzrobeIce_Actions[])(WizzrobeEntity*); diff --git a/src/enemy/wizzrobeWind.c b/src/enemy/wizzrobeWind.c index 91687000..b261ee15 100644 --- a/src/enemy/wizzrobeWind.c +++ b/src/enemy/wizzrobeWind.c @@ -8,8 +8,14 @@ #include "collision.h" #include "enemy.h" -#include "functions.h" +#include "projectile.h" #include "object.h" +#include "asm.h" +#include "sound.h" +#include "effects.h" +#include "room.h" +#include "physics.h" +#include "player.h" #include "tiles.h" extern void (*const WizzrobeWind_Functions[])(WizzrobeEntity*); |