mirror of
https://github.com/zeldaret/st
synced 2026-06-19 07:37:10 -04:00
Decompile overlay 24 (Part 1) (#65)
* GameModeAdventure_001 OK * GameModeAdventure_024 17% * GameModeAdventure_024 73% * GameModeAdventure_024 99% * jp region differences * rename GameModeAdventure_024 and GameModeAdventure + UnkStruct_ov000_020d8660_024 OK * UnkActorSystem1OK * UnkActorSystem2 OK * delink more of ov024 & UnkStruct_027e0998_024 OK * improve instance stuff & UnkStruct_027e0cf8_024 OK * AdventureModeManager_160_024 OK & GameModeStartUp OK * fix regressions * fix regressions 2 * AdventureModeManager_170 OK * AdventureModeManager_174_Base OK * AdventureModeManager_174 OK * mark GameModeAdventure_024 as complete * AdventureModeManager_178 OK * AdventureModeManager_180 OK * AdventureModeManager_184_024 OK * AdventureModeManager_18C_024 OK & AdventureModeManager_190_024 OK * AdventureModeManager_15C_20_00 61% * AdventureModeManager_15C_20_00 OK * jp version differences * delink what's left in the overlay * fix regressions * AdventureModeManager_1B8_Base_024 98% * AdventureModeManager_1B8 48% and link AdventureModeManager_024 * AdventureModeManager_1B8_Base and AdventureModeManager_1B8 OK * oops * mark statics as local
This commit is contained in:
@@ -159,7 +159,7 @@ ARM void MapObjectChestBase::vfunc_04() {
|
||||
sp48.z -= FLOAT_TO_Q20(0.5f);
|
||||
}
|
||||
|
||||
if (data_027e09a4->mSceneIndex == SceneIndex_d_flame) {
|
||||
if (data_027e09a4->mUnk_00.mSceneIndex == SceneIndex_d_flame) {
|
||||
local_64.x = this->mUnk_3A.x;
|
||||
local_66.y = this->mUnk_3A.y;
|
||||
|
||||
|
||||
@@ -555,9 +555,9 @@ extern "C" void func_01ff9fbc(Mat2p *, unk32, Mat2p *);
|
||||
extern q4 data_0203f964[];
|
||||
|
||||
ARM void MapObjectDoorBase::func_ov031_020fcb78(s8 *param1, s8 param2) {
|
||||
unk32 sp10;
|
||||
Vec2s sp10;
|
||||
stack_struct sp8;
|
||||
unk32 sp4;
|
||||
u32 sp4;
|
||||
bool var_r2;
|
||||
|
||||
if (!GET_FLAG(this->mFlags, MapObjFlag_5)) {
|
||||
@@ -575,7 +575,7 @@ ARM void MapObjectDoorBase::func_ov031_020fcb78(s8 *param1, s8 param2) {
|
||||
//! TODO: fake match?
|
||||
sp4 = *(u32 *) &this->mUnk_38;
|
||||
|
||||
if (data_027e0998->vfunc_00(&this->mPos, &sp10, &sp4) && uVar4 != 0) {
|
||||
if (data_027e0998->vfunc_00(&this->mPos, &sp10, (u16 *) &sp4) && uVar4 != 0) {
|
||||
Mat2p m;
|
||||
|
||||
if (this->IsOrientedVertically()) {
|
||||
|
||||
@@ -364,7 +364,7 @@ ARM void MapObjectDoorDangerSpawn::vfunc_5C(unk32 param1, unk32 param2) {
|
||||
this->MapObjectDoorBase::vfunc_5C(param1, param2);
|
||||
|
||||
var_r6 = 1;
|
||||
temp_r8 = data_027e09a4->mSceneIndex;
|
||||
temp_r8 = data_027e09a4->mUnk_00.mSceneIndex;
|
||||
|
||||
if (param2 != 0 && (temp_r8 - SceneIndex_tekiya00) > 4) {
|
||||
var_r6 = 0;
|
||||
|
||||
Reference in New Issue
Block a user