mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-02 18:12:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into tilemap-docs

Browse Source
This commit is contained in:
octorock
2024-01-06 12:26:39 +01:00
parent 109b1020dc 6fb8b41a8e
commit c3b771a209
226 changed files with 2058 additions and 1984 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/manager/enemyInteractionManager.c
+2 -2
View File
@@ -66,14 +66,14 @@ void EnemyInteractionManager_Action1(EnemyInteractionManager* this) {
for (i = 0; i < n; i++) {
tmp = this->d.enemies[i];
for (j = i + 1; j < super->timer; j++) {
sub_08004484(tmp, this->d.enemies[j]);
CalcCollisionStaticEntity(tmp, this->d.enemies[j]);
}
}
} else {
for (i = 0; i < n; i++) {
tmp = this->d.enemies[i];
for (j = i + 1; j < super->timer; j++) {
sub_08004484(this->d.enemies[j], tmp);
CalcCollisionStaticEntity(this->d.enemies[j], tmp);
}
}
}
src/manager/fightManager.c
+2 -1
View File
@@ -16,6 +16,7 @@
#include "message.h"
#include "room.h"
#include "sound.h"
#include "enemy.h"
enum FightManager_State { Init, WaitForFlag, WaitForDone };
@@ -112,7 +113,7 @@ void FightManager_LoadFight(FightManager* this) {
while (prop->kind != 0xFF) {
ent = LoadRoomEntity(prop++);
if ((ent != NULL) && (ent->kind == ENEMY)) {
((GenericEntity*)ent)->field_0x6c.HALF.HI |= 0x40;
((Enemy*)ent)->enemyFlags |= EM_FLAG_MONITORED;
FightManagerHelper_Monitor(monitor, ent, counter++);
}
if (counter >= 7) {
src/manager/templeOfDropletsManager.c
+1 -1
View File
@@ -340,7 +340,7 @@ void TempleOfDropletsManager_Type6_Action2(TempleOfDropletsManager* this) {
case PL_STATE_WALK:
if (sub_0805A73C(this)) {
super->action++;
sub_08004168(&gPlayerEntity.base);
SnapToTile(&gPlayerEntity.base);
gPlayerEntity.base.animationState = 4;
RequestPriorityDuration((Entity*)this, 600);
SetPlayerControl(0xFF);