mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-05 07:24:34 +00:00
Code Issues Projects Releases Wiki Activity

Fix non matchings in En_Item00 and En_A_Obj (the 2 "code" actors) (#112)

Browse source
This commit is contained in:
Roman971 2020-05-03 23:04:11 +02:00 • committed by GitHub
parent e36015837b
commit e4846409f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 62 additions and 1435 deletions
Download patch file Download diff file Expand all files Collapse all files

62
src/code/z_en_a_keep.c
View file

@ -68,24 +68,19 @@ void EnAObj_SetupAction(EnAObj* this, ActorFunc actionFunc) {
this->actionFunc = actionFunc;
}
#ifdef NON_MATCHING
// minor ordering and regalloc differences
void EnAObj_Init(EnAObj* this, GlobalContext* globalCtx) {
u32 sp34;
s16 type;
s16 initialParams;
s32 params;
s32 pad;
EnAObj* this2 = this;
f32 sp28;
sp34 = 0;
sp28 = 6.0f;
initialParams = this->dyna.actor.params;
type = initialParams & 0xFF;
this->textId = (initialParams >> 8) & 0xFF;
this->dyna.actor.params = type;
this->textId = (this->dyna.actor.params >> 8) & 0xFF;
this->dyna.actor.params &= 0xFF;
switch (type & 0xFFFF) {
switch (this->dyna.actor.params) {
case A_OBJ_BLOCK_SMALL:
Actor_SetScale(&this->dyna.actor, 0.025f);
break;
@ -112,58 +107,58 @@ void EnAObj_Init(EnAObj* this, GlobalContext* globalCtx) {
ActorShape_Init(&this->dyna.actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, sp28);
this->dyna.actor.posRot2.pos = this->dyna.actor.posRot.pos;
this->dyna.dynaPolyId = -1;
this->dyna.unk_160 = 0;
this->dyna.unk_15C = 0;
this->dyna.actor.unk_FC = 1200.0f;
this->dyna.actor.unk_F8 = 200.0f;
params = this->dyna.actor.params;
this->dyna.actor.posRot2.pos = this->dyna.actor.posRot.pos;
switch (params) {
switch (this->dyna.actor.params) {
case A_OBJ_BLOCK_LARGE:
case A_OBJ_BLOCK_HUGE:
this->dyna.dynaPolyId = 1;
this2->dyna.dynaPolyId = 1;
Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &this->dyna.actor, ACTORTYPE_BG);
func_8001D5C8(this, this->dyna.actor.params);
func_8001D5C8(this2, this->dyna.actor.params);
break;
case A_OBJ_BLOCK_SMALL_ROT:
case A_OBJ_BLOCK_LARGE_ROT:
this->dyna.dynaPolyId = 3;
this2->dyna.dynaPolyId = 3;
Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &this->dyna.actor, ACTORTYPE_BG);
func_8001D310(this, this->dyna.actor.params);
func_8001D310(this2, this->dyna.actor.params);
break;
case A_OBJ_UNKNOWN_6:
this->dyna.actor.flags |= 0x1;
this->dyna.dynaPolyId = 5;
this->unk_178 = 10.0f;
// clang-format off
this->dyna.actor.flags |= 0x1; this2->dyna.dynaPolyId = 5; this2->unk_178 = 10.0f;
// clang-format on
this->dyna.actor.gravity = -2.0f;
func_8001D234(this, this->dyna.actor.params);
func_8001D234(this2, this->dyna.actor.params);
break;
case A_OBJ_GRASS_CLUMP:
case A_OBJ_TREE_STUMP:
this->dyna.dynaPolyId = 0;
func_8001D234(this, this->dyna.actor.params);
this2->dyna.dynaPolyId = 0;
func_8001D234(this2, this->dyna.actor.params);
break;
case A_OBJ_SIGNPOST_OBLONG:
case A_OBJ_SIGNPOST_ARROW:
this->dyna.actor.textId = (this->textId & 0xFF) | 0x300;
this->dyna.actor.flags |= 0x8 | 0x1;
this->dyna.actor.unk_4C = 500.0f;
this->unk_178 = 45.0f;
func_8001D234(this, this->dyna.actor.params);
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->dyna.actor, &D_80115440);
this->dyna.actor.textId = (this2->textId & 0xFF) | 0x300;
// clang-format off
this->dyna.actor.flags |= 0x1 | 0x8; this->dyna.actor.unk_4C = 500.0f;
// clang-format on
this2->unk_178 = 45.0f;
func_8001D234(this2, this->dyna.actor.params);
Collider_InitCylinder(globalCtx, &this2->collider);
Collider_SetCylinder(globalCtx, &this2->collider, &this->dyna.actor, &D_80115440);
this->dyna.actor.colChkInfo.mass = 0xFF;
this->dyna.actor.unk_1F = 0;
break;
case A_OBJ_KNOB:
this->dyna.actor.gravity = -1.5f;
func_8001D480(this, params);
func_8001D480(this2, this->dyna.actor.params);
break;
default:
this->dyna.actor.gravity = -2.0f;
func_8001D234(this, params);
func_8001D234(this2, this->dyna.actor.params);
break;
}
@ -176,9 +171,6 @@ void EnAObj_Init(EnAObj* this, GlobalContext* globalCtx) {
this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, sp34);
}
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s")
#endif
void EnAObj_Destroy(EnAObj* this, GlobalContext* globalCtx) {
ColliderCylinder* collider = &this->collider;

81
src/code/z_en_item00.c
View file

@ -85,25 +85,23 @@ void EnItem00_SetupAction(EnItem00* this, ActorFunc actionFunc) {
this->actionFunc = actionFunc;
}
#ifdef NON_MATCHING
// Very close to matching, just a single ordering issue
void EnItem00_Init(EnItem00* this, GlobalContext* globalCtx) {
s32 pad1;
s32 pad2;
f32 sp34;
f32 sp30;
s32 sp2C;
s32 getItemId;
s16 spawnParam8000;
s32 pad3;
sp34 = 980.0f;
sp30 = 6.0f;
sp2C = 0;
getItemId = 0;
spawnParam8000 = this->actor.params & 0x8000;
this->collectibleFlag = (this->actor.params & 0x3F00) >> 8;
this->actor.params = this->actor.params & 0x00FF;
this->actor.params &= 0xFF;
if (Flags_GetCollectible(globalCtx, this->collectibleFlag)) {
Actor_Kill(&this->actor);
@ -227,7 +225,6 @@ void EnItem00_Init(EnItem00* this, GlobalContext* globalCtx) {
this->actor.posRot2.pos = this->actor.posRot.pos;
this->unk_152 = 0;
// MISMATCH: minor ordering issues here
if (!spawnParam8000) {
EnItem00_SetupAction(this, (ActorFunc)func_8001DFC8);
this->unk_15A = -1;
@ -279,23 +276,23 @@ void EnItem00_Init(EnItem00* this, GlobalContext* globalCtx) {
case ITEM00_ARROWS_LARGE:
Item_Give(globalCtx, ITEM_ARROWS_LARGE);
break;
case ITEM00_MAGIC_SMALL:
sp2C = GI_MAGIC_SMALL;
break;
case ITEM00_MAGIC_LARGE:
sp2C = GI_MAGIC_LARGE;
getItemId = GI_MAGIC_SMALL;
break;
case ITEM00_MAGIC_SMALL:
getItemId = GI_MAGIC_LARGE;
break;
case ITEM00_SMALL_KEY:
Item_Give(globalCtx, ITEM_KEY_SMALL);
break;
case ITEM00_SEEDS:
sp2C = GI_SEEDS_5;
getItemId = GI_SEEDS_5;
break;
case ITEM00_NUTS:
sp2C = GI_NUTS_5;
getItemId = GI_NUTS_5;
break;
case ITEM00_STICK:
sp2C = GI_STICKS_1;
getItemId = GI_STICKS_1;
break;
case ITEM00_HEART_PIECE:
case ITEM00_HEART_CONTAINER:
@ -307,16 +304,13 @@ void EnItem00_Init(EnItem00* this, GlobalContext* globalCtx) {
break;
}
if ((sp2C != 0) && !func_8002F410(&this->actor, globalCtx)) {
func_8002F554(&this->actor, globalCtx, sp2C);
if ((getItemId != 0) && !func_8002F410(&this->actor, globalCtx)) {
func_8002F554(&this->actor, globalCtx, getItemId);
}
EnItem00_SetupAction(this, (ActorFunc)func_8001E5C8);
this->actionFunc(this, globalCtx);
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/z_en_item00/EnItem00_Init.s")
#endif
void EnItem00_Destroy(EnItem00* this, GlobalContext* globalCtx) {
ColliderCylinder* collider = &this->collider;
@ -486,17 +480,15 @@ extern s32 D_80157D90;
extern u32 D_80157D90_; // these must be defined separately for EnItem00_Update to match
extern s16 D_80157D94;
#ifdef NON_MATCHING
// Almost matching, just a few minor ordering issues
void EnItem00_Update(EnItem00* this, GlobalContext* globalCtx) {
s32 pad1;
s32 pad2;
s32 sp3C;
s32 pad;
s16* params;
s32 getItemId;
s16 sp3A;
Actor* dynaActor;
s16 i;
sp3C = 0;
getItemId = 0;
sp3A = 0;
if (this->unk_15A > 0) {
@ -565,7 +557,6 @@ void EnItem00_Update(EnItem00* this, GlobalContext* globalCtx) {
return;
}
// MISMATCH: The first function argument is loaded too early here
if (!((this->actor.xzDistanceFromLink <= 30.0f) && (this->actor.yDistanceFromLink >= -50.0f) &&
(this->actor.yDistanceFromLink <= 50.0f))) {
if (!func_8002F410(&this->actor, globalCtx)) {
@ -594,10 +585,10 @@ void EnItem00_Update(EnItem00* this, GlobalContext* globalCtx) {
Item_Give(globalCtx, ITEM_RUPEE_GOLD);
break;
case ITEM00_STICK:
sp3C = GI_STICKS_1;
getItemId = GI_STICKS_1;
break;
case ITEM00_NUTS:
sp3C = GI_NUTS_5;
getItemId = GI_NUTS_5;
break;
case ITEM00_HEART:
Item_Give(globalCtx, ITEM_HEART);
@ -622,45 +613,46 @@ void EnItem00_Update(EnItem00* this, GlobalContext* globalCtx) {
Item_Give(globalCtx, ITEM_ARROWS_LARGE);
break;
case ITEM00_SEEDS:
sp3C = GI_SEEDS_5;
getItemId = GI_SEEDS_5;
break;
case ITEM00_SMALL_KEY:
sp3C = GI_KEY_SMALL;
getItemId = GI_KEY_SMALL;
break;
case ITEM00_HEART_PIECE:
sp3C = GI_HEART_PIECE;
getItemId = GI_HEART_PIECE;
break;
case ITEM00_HEART_CONTAINER:
sp3C = GI_HEART_CONTAINER;
getItemId = GI_HEART_CONTAINER;
break;
case ITEM00_MAGIC_LARGE:
sp3C = GI_MAGIC_LARGE;
getItemId = GI_MAGIC_LARGE;
break;
case ITEM00_MAGIC_SMALL:
sp3C = GI_MAGIC_SMALL;
getItemId = GI_MAGIC_SMALL;
break;
case ITEM00_SHIELD_DEKU:
sp3C = GI_SHIELD_DEKU;
getItemId = GI_SHIELD_DEKU;
break;
case ITEM00_SHIELD_HYLIAN:
sp3C = GI_SHIELD_HYLIAN;
getItemId = GI_SHIELD_HYLIAN;
break;
case ITEM00_TUNIC_ZORA:
sp3C = GI_TUNIC_ZORA;
getItemId = GI_TUNIC_ZORA;
break;
case ITEM00_TUNIC_GORON:
sp3C = GI_TUNIC_GORON;
getItemId = GI_TUNIC_GORON;
break;
case ITEM00_BOMBS_SPECIAL:
break;
}
// MISMATCH: The first function argument is also loaded too early here
if ((sp3C != 0) && !func_8002F410(&this->actor, globalCtx)) {
func_8002F554(&this->actor, globalCtx, sp3C);
params = &this->actor.params;
if ((getItemId != 0) && !func_8002F410(&this->actor, globalCtx)) {
func_8002F554(&this->actor, globalCtx, getItemId);
}
switch (this->actor.params) {
switch (*params) {
case ITEM00_HEART_PIECE:
case ITEM00_HEART_CONTAINER:
case ITEM00_SMALL_KEY:
@ -675,9 +667,9 @@ void EnItem00_Update(EnItem00* this, GlobalContext* globalCtx) {
return;
}
if ((this->actor.params <= ITEM00_RUPEE_RED) || (this->actor.params == ITEM00_RUPEE_ORANGE)) {
if ((*params <= ITEM00_RUPEE_RED) || (*params == ITEM00_RUPEE_ORANGE)) {
Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
} else if (sp3C != 0) {
} else if (getItemId != 0) {
if (func_8002F410(&this->actor, globalCtx)) {
Flags_SetCollectible(globalCtx, this->collectibleFlag);
Actor_Kill(&this->actor);
@ -701,9 +693,6 @@ void EnItem00_Update(EnItem00* this, GlobalContext* globalCtx) {
this->unk_152 = 0;
EnItem00_SetupAction(this, (ActorFunc)func_8001E5C8);
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/z_en_item00/EnItem00_Update.s")
#endif
// Draw Function prototypes (used in EnItem00_Draw)
void func_8001EF30(EnItem00* this, GlobalContext* globalCtx);