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

Extract entity definitions

Browse Source
This commit is contained in:
octorock
2021-11-11 18:12:33 +01:00
parent e44d0e3fc9
commit b1e2175ffb
72 changed files with 3337 additions and 8518 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/lightableSwitch.c
+3 -3
View File
@@ -13,7 +13,7 @@ extern void (*const gUnk_081243B4[])(Entity*);
extern void (*const gUnk_081243BC[])(Entity*);
extern void (*const gUnk_081243C4[])(Entity*);
extern Hitbox gUnk_080FD150;
extern Hitbox gHitbox_0;
void LightableSwitch(Entity* this) {
gUnk_081243B4[this->type](this);
@@ -32,7 +32,7 @@ void sub_0809EA34(Entity* this) {
this->field_0x40 = 0x48;
this->damageType = 0x28;
this->flags2 = 10;
this->hitbox = &gUnk_080FD150;
this->hitbox = &gHitbox_0;
sub_0809EAD8(this);
UpdateSpriteForCollisionLayer(this);
sub_0809EABC(this);
@@ -104,7 +104,7 @@ void sub_0809EB80(Entity* this) {
this->field_0x40 = 0x48;
this->damageType = 0x28;
this->flags2 = 10;
this->hitbox = &gUnk_080FD150;
this->hitbox = &gHitbox_0;
sub_0809EAD8(this);
UpdateSpriteForCollisionLayer(this);
if (CheckFlags(this->cutsceneBeh.HWORD) != 0) {
src/object/lockedDoor.c
+2 -2
View File
@@ -33,7 +33,7 @@ void LockedDoor(Entity* this) {
gUnk_0811F65C[this->action](this);
}
extern Hitbox gUnk_080FD170;
extern Hitbox gHitbox_2;
extern u32 sub_080001DA(u32, u32);
extern void sub_08078850(Entity*, u32, u32, u32);
@@ -97,7 +97,7 @@ void sub_08083338(Entity* this) {
this->field_0x70.HALF.LO = this->x.HALF.HI;
this->field_0x70.HALF.HI = this->y.HALF.HI;
this->field_0x7c.BYTES.byte2 = this->type & 3;
this->hitbox = &gUnk_080FD170;
this->hitbox = &gHitbox_2;
this->spritePriority.b0 = 5;
this->frames.all = this->type & 0xF;
this->field_0x76.HWORD = TILE(this->x.HALF.HI, this->y.HALF.HI);
src/object/metalDoor.c
+2 -2
View File
@@ -13,7 +13,7 @@ extern u32 sub_080001DA(u32, u32);
extern void (*const gUnk_0812493C[])(Entity*);
extern Hitbox gUnk_080FD180;
extern Hitbox gHitbox_3;
void MetalDoor(Entity* this) {
gUnk_0812493C[this->action](this);
@@ -28,7 +28,7 @@ void sub_080A0684(Entity* this) {
this->spriteSettings.b.draw = 0;
this->frameIndex = 0;
this->spriteSettings.b.flipY = 1;
this->hitbox = &gUnk_080FD180;
this->hitbox = &gHitbox_3;
this->spritePriority.b0 = 5;
this->field_0x70.HALF.LO = this->x.HALF.HI;
this->field_0x70.HALF.HI = this->y.HALF.HI;
src/object/object9E.c
+2 -2
View File
@@ -5,7 +5,7 @@
#include "object.h"
#include "functions.h"
extern Hitbox gUnk_080FD168;
extern Hitbox gHitbox_1;
void Object9E(Entity* this) {
Entity* ent;
@@ -24,7 +24,7 @@ void Object9E(Entity* this) {
this->field_0x40 = 0x48;
this->damageType = 0x7a;
this->flags2 = 1;
this->hitbox = &gUnk_080FD168;
this->hitbox = &gHitbox_1;
tilePos = COORD_TO_TILE(this);
SetTile(0x4066, tilePos - 1, *layer);
SetTile(0x4065, tilePos, *layer);
src/object/objectA.c
+2 -2
View File
@@ -5,7 +5,7 @@
#include "createObject.h"
#include "functions.h"
extern Hitbox gUnk_080FD170;
extern Hitbox gHitbox_2;
extern u8 gUnk_02000070;
@@ -14,7 +14,7 @@ void ObjectA(Entity* this) {
if (this->action == 0) {
this->action = 1;
this->hitbox = &gUnk_080FD170;
this->hitbox = &gHitbox_2;
if (this->collisionLayer == 1) {
uVar2 = 0x26;
} else {
src/object/pot.c
+2 -2
View File
@@ -15,7 +15,7 @@ extern void (*const gUnk_0811F090[])(Entity*);
extern void (*const gUnk_0811F0A8[])(Entity*);
extern void (*const gUnk_0811F0C4[])(Entity*);
extern Hitbox gUnk_080FD338; // TODO: should be const
extern Hitbox gHitbox_18; // TODO: should be const
extern Hitbox gUnk_080FD340; // TODO: should be const
extern u32 sub_080001DA(u32, u32);
@@ -33,7 +33,7 @@ void sub_0808222C(Entity* this) {
}
this->action = 1;
this->hitbox = &gUnk_080FD338;
this->hitbox = &gHitbox_18;
this->speed = 0x80;
this->y.HALF.HI += 3;
this->field_0x16 = 0;
src/object/warpPoint.c
+2 -2
View File
@@ -6,7 +6,7 @@
#include "audio.h"
#include "functions.h"
extern Hitbox gUnk_080FD168;
extern Hitbox gHitbox_1;
void WarpPoint(Entity*);
void sub_0808B474(Entity*);
@@ -40,7 +40,7 @@ void sub_0808B474(Entity* this) {
tmp = gUnk_08121380[this->type];
this->palette.b.b0 = tmp;
this->spritePriority.b0 = 6;
this->hitbox = &gUnk_080FD168;
this->hitbox = &gHitbox_1;
this->scriptedScene = 3;
InitializeAnimation(this, 0);
if (CheckFlags(this->field_0x86.HWORD)) {