mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-04 21:35:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Create new entity structs for NPCs

Browse Source
This commit is contained in:
octorock
2023-07-05 21:34:08 +02:00
parent 0d6b9052ba
commit 488196754e
116 changed files with 4001 additions and 3461 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/cameraTarget.c
+4 -4
View File
@@ -49,10 +49,10 @@ void CameraTarget(Entity* this) {
u32 uVar2 = gPlayerState.field_0x27[0] > 0;
switch (gFuseInfo._0) {
case 0:
case 1:
case 2:
switch (gFuseInfo.fusionState) {
case FUSION_STATE_0:
case FUSION_STATE_1:
case FUSION_STATE_2:
if ((gMessage.doTextBox & 0x7f) == 0) {
break;
}
src/object/cuccoMinigame.c
+1 -1
View File
@@ -108,7 +108,7 @@ void CuccoMinigame(CuccoMinigameEntity* this) {
sub_0807DD64(super);
sub_0806EC20(super);
}
sub_0807DD94(super, 0);
ExecuteScriptAndHandleAnimation(super, NULL);
}
NONMATCH("asm/non_matching/objectB9/sub_080A1270.inc", void sub_080A1270(CuccoMinigameEntity* this)) {
src/object/cutsceneOrchestrator.c
+2 -2
View File
@@ -13,9 +13,9 @@ void CutsceneOrchestrator(Entity* this) {
if (this->action == 0) {
this->action = 1;
this->hitbox = (Hitbox*)&gHitbox_2;
sub_0807DD50(this);
InitScriptForNPC(this);
} else {
sub_0807DD94(this, NULL);
ExecuteScriptAndHandleAnimation(this, NULL);
}
} else {
this->action = 1;
src/object/keyStealingTakkuri.c
+1 -1
View File
@@ -478,7 +478,7 @@ void sub_0809E1F0(KeyStealingTakkuriEntity* this) {
}
void sub_0809E210(KeyStealingTakkuriEntity* this) {
gPlayerEntity.animationState = sub_0806F5B0(GetFacingDirection(&gPlayerEntity, super)) & 0xfe;
gPlayerEntity.animationState = GetAnimationStateForDirection8(GetFacingDirection(&gPlayerEntity, super)) & 0xfe;
gPlayerState.animation = 0x100;
}
src/object/pullableMushroom.c
+1 -1
View File
@@ -198,7 +198,7 @@ void sub_0808ACEC(PullableMushroomEntity* this) {
case 0x14:
case 0x16:
COLLISION_OFF(super);
super->animationState = sub_0806F5A4(super->knockbackDirection);
super->animationState = GetAnimationStateForDirection4(super->knockbackDirection);
super->subAction = 2;
super->timer = 2;
break;