mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-03 02:30:01 -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/object/lavaPlatform.c
+2 -4
View File
@@ -32,8 +32,6 @@ typedef struct {
/*0x0e*/ u8 unk_e[2];
} LavaPlatformEntry;
extern void sub_080A2CC0(Entity*, Entity**, u16*);
void sub_08092278(LavaPlatformEntity*);
void sub_08092344(LavaPlatformEntity*);
void LavaPlatform_SpawnPlatforms(LavaPlatformEntity*);
@@ -248,7 +246,7 @@ void LavaPlatform_SpawnPlatforms(LavaPlatformEntity* this) {
platform->respawnTime = entry->respawnTime;
platform->unk_78 = entry->unk_78;
UpdateSpriteForCollisionLayer((Entity*)platform);
sub_080A2CC0(&platform->base, &platform->unk_78, &platform->unk_76);
sub_080A2CC0(&platform->base, (u16**)&platform->unk_78, &platform->unk_76);
}
entry++;
}
@@ -302,6 +300,6 @@ void sub_080926E4(LavaPlatformEntity* this) {
(super->parent)->y.HALF.HI = super->y.HALF.HI;
}
if (--this->unk_76 == 0) {
sub_080A2CC0(super, &this->unk_78, &this->unk_76);
sub_080A2CC0(super, (u16**)&this->unk_78, &this->unk_76);
}
}
src/object/lightableSwitch.c
+2 -2
View File
@@ -65,7 +65,7 @@ void sub_0809EAD8(Entity* this) {
if (this->type2 != 0) {
this->child = GetCurrentRoomProperty(this->type2);
sub_080A2CC0(this, &this->child, &this->field_0x74.HWORD);
sub_080A2CC0(this, (u16**)&this->child, &this->field_0x74.HWORD);
} else {
SetTile(0x4050, COORD_TO_TILE(this), this->collisionLayer);
@@ -82,7 +82,7 @@ void sub_0809EB30(Entity* this) {
}
puVar2 = &this->field_0x74.HWORD;
if (!--*puVar2) {
sub_080A2CC0(this, &this->child, puVar2);
sub_080A2CC0(this, (u16**)&this->child, puVar2);
}
}
}
src/object/lilypadSmall.c
+2 -4
View File
@@ -1,8 +1,6 @@
#include "object.h"
#include "functions.h"
extern void sub_080A2CC0(Entity*, Entity**, u16*);
extern u16 gUnk_08123318[];
static void sub_08097B24(Entity* this);
@@ -21,13 +19,13 @@ void LilypadSmall(Entity* this) {
this->spriteSettings.draw = TRUE;
this->spritePriority.b0 = 7;
this->child = GetCurrentRoomProperty(this->type2);
sub_080A2CC0(this, &this->child, &this->field_0x70.HALF.LO);
sub_080A2CC0(this, (u16**)&this->child, &this->field_0x70.HALF.LO);
}
sub_080A2BE4(this, sub_08097ADC(this));
sub_08097B24(this);
psVar4 = (u16*)&this->field_0x70;
if (--*psVar4 == 0) {
sub_080A2CC0(this, &this->child, psVar4);
sub_080A2CC0(this, (u16**)&this->child, psVar4);
}
}