mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-28 03:03:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #433 from octorock/objectUtils

Browse Source 
Decompile rest of objectUtils
This commit is contained in:
notyourav
2022-03-06 22:36:16 -08:00
committed by GitHub
parent 80f9adac20 abb0272963
commit 4e94e1fbc3
12 changed files with 333 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/enemy/bladeTrap.c
+2 -2
View File
@@ -14,7 +14,7 @@ void BladeTrap(Entity* this) {
if (this->action == 0) {
this->action = 1;
this->child = GetCurrentRoomProperty(this->type);
sub_080A2CC0(this, &this->child, &this->field_0x74.HWORD);
sub_080A2CC0(this, (u16**)&this->child, &this->field_0x74.HWORD);
}
if (!(this->direction & 0x80)) {
LinearMoveUpdate(this);
@@ -24,6 +24,6 @@ void BladeTrap(Entity* this) {
if (!(this->direction & 0x80)) {
EnqueueSFX(SFX_METAL_CLINK);
}
sub_080A2CC0(this, &this->child, &this->field_0x74.HWORD);
sub_080A2CC0(this, (u16**)&this->child, &this->field_0x74.HWORD);
}
}
src/enemy/bombarossa.c
+2 -2
View File
@@ -27,7 +27,7 @@ void Bombarossa_OnTick(BombarossaEntity* this) {
InitializeAnimation(super, 0);
if (super->type != 0) {
super->child = GetCurrentRoomProperty(super->type);
sub_080A2CC0(super, &super->child, &this->unk_0x76);
sub_080A2CC0(super, (u16**)&super->child, &this->unk_0x76);
}
}
@@ -68,7 +68,7 @@ void sub_0803350C(BombarossaEntity* this) {
}
if (--this->unk_0x76 == 0) {
sub_080A2CC0(super, &super->child, &this->unk_0x76);
sub_080A2CC0(super, (u16**)&super->child, &this->unk_0x76);
}
}
src/enemy/lakituCloud.c
+1 -1
View File
@@ -118,7 +118,7 @@ void sub_0803CDD8(Entity* this) {
void sub_0803CE14(Entity* this) {
u8 direction;
sub_080A2CC0(this, &this->child, &this->field_0x74.HWORD);
sub_080A2CC0(this, (u16**)&this->child, &this->field_0x74.HWORD);
direction = this->direction;
if (direction & 0x80) {