mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-06 22:02:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #9 from gamestabled/malon"

Browse Source 
This reverts commit 0c54eb2b4c, reversing
changes made to c312b101da.
This commit is contained in:
theo3
2020-06-14 00:08:44 -07:00
parent 0c54eb2b4c
commit dd8cedb4c6
6 changed files with 225 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/epona.c
+18 -3
View File
@@ -2,14 +2,28 @@
#include "entity.h"
#include "textbox.h"
#include "link.h"
#include "functions.h"
extern void sub_0806ED78(Entity*);
extern u32 sub_0801E99C(Entity*);
extern void LoadAnimation(Entity*, u32);
extern void sub_080042B8(Entity*);
extern void sub_08065AA4(Entity*);
extern u32 UpdateFuseInteraction(void);
extern void ShowNPCDialogue(Entity*, u64*);
extern void sub_08078778(Entity*);
extern void sub_080787A8(Entity*, u32);
extern void sub_0806F118(Entity*);
extern void sub_0805E3A0(Entity*, u8);
extern u32 sub_080045C4(Entity*, Entity*);
extern u32 sub_0806F5A4(void);
extern void sub_080791D0(void);
extern void PlaySFX(u32);
extern TextBox gTextBox;
extern LinkState gLinkState;
extern Entity gLinkEntity;
void sub_08065A64(Entity* this);
void sub_08065AA4(Entity*);
extern void (*gUnk_0811006C[])(Entity*);
extern u64 gUnk_08110080[];
@@ -82,7 +96,8 @@ void sub_08065AA4(Entity* this) {
sub_0805E3A0(this, 2);
sub_08065A50(this);
}
LoadAnimation(this, sub_0806F5A4(sub_080045C4(this, &gLinkEntity)));
sub_080045C4(this, &gLinkEntity);
LoadAnimation(this, sub_0806F5A4());
} else {
sub_08065A50(this);
sub_080791D0();
src/malon.c
-80
View File
@@ -1,80 +0,0 @@
#include "global.h"
#include "functions.h"
#include "entity.h"
extern Entity gLinkEntity;
extern void (*gUnk_0810FF5C[])(Entity* this);
extern void (*gUnk_0810FF64[])(Entity* this);
void sub_0806581C(Entity* this) {
if (this->flags & 0x2) {
gUnk_0810FF64[this->action](this);
} else {
gUnk_0810FF5C[this->action](this);
if (this->action != 0) {
sub_0806ED78(this);
}
}
}
void sub_08065864(Entity* this) {
this->action = 1;
this->spriteSettings.b.ss0 = 1;
LoadAnimation(this, 0xC);
}
void sub_08065880(Entity* this) {
sub_080042B8(this);
}
void sub_08065888(Entity* this) {
this->action = 1;
this->spriteSettings.b.ss0 = 1;
this->animationState = 4;
this->field_0x68 = sub_0801E99C(this);
sub_08078784(this, this->field_0x68);
sub_0807DD50(this);
}
void sub_080658BC(Entity* this) {
if (this->interactType == 2) {
this->action = 2;
this->interactType = 0;
LoadAnimation(this, sub_0806F5A4(sub_080045C4(this, &gLinkEntity)));
sub_0806F118(this);
} else {
sub_0807DD94(this, 0);
}
}
void sub_08065900(Entity* this) {
if (UpdateFuseInteraction() != 0) {
this->action = 1;
}
}
void sub_08065914(Entity* this) {
Entity* target;
target = sub_0805EB00(7, 0x1F, 7);
if (target != NULL) {
PositionRelative(this, target, 0x180000, -0x10000);
target->parent = this;
}
target = sub_0805EB00(7, 0x20, 7);
if (target != NULL) {
PositionRelative(this, target, 0x280000, 0);
target->parent = this;
}
}
void sub_08065960(Entity* this) {
if (this->action == 0) {
this->action++;
this->spriteSettings.b.ss0 = 1;
LoadAnimation(this, 0xC);
} else {
sub_080042B8(this);
}
}