mirror of
https://github.com/zeldaret/st
synced 2026-10-12 23:16:18 -04:00
Decompile overlay 17 (CourseExec Part 1) (#152)
* day 1 * delink overlay 17 * UnkStruct_027e0ce0_30_017 & UnkStruct_027e0ce0_40_017 * ItemManager_017 OK * UnkStruct_027e0ce0_40_Base_94_017 95% * UnkStruct_027e0ce0_017 OK * PlayerLinkActor_017 OK * PlayerLinkActor_A0_20_017 OK * code_020be2ec_017 99% * ActorManager_017 OK * Actor_017 OK * ActorEventIcon_017 OK * code_020be2ec_017 OK * MapObjectManager_017 97% * MapObject_017 OK * MapObjectSwitchStep_017 OK * fix build issues * fix other versions build issues
This commit is contained in:
@@ -175,7 +175,7 @@ void MapObjectSwitchStep::func_ov000_0209e11c(MapObjState state, unk32 param2) {
|
||||
}
|
||||
}
|
||||
|
||||
void MapObjectSwitchStep::vfunc_20(void) {
|
||||
void MapObjectSwitchStep::vfunc_20(unk32 param1) {
|
||||
switch (this->mState) {
|
||||
case MapObjSwitchStepState_1:
|
||||
case MapObjSwitchStepState_2:
|
||||
@@ -198,7 +198,7 @@ struct stack_struct {
|
||||
/* 08 */
|
||||
};
|
||||
|
||||
void MapObjectSwitchStep::vfunc_18(s8 *param1, s8 param2) {
|
||||
void MapObjectSwitchStep::vfunc_18(s8 *param1) {
|
||||
if (!GET_FLAG(this->mFlags, MapObjFlag_5)) {
|
||||
return;
|
||||
}
|
||||
@@ -206,12 +206,12 @@ void MapObjectSwitchStep::vfunc_18(s8 *param1, s8 param2) {
|
||||
if (data_027e09a4->mUnk_00.sceneIndex >= SceneIndex_battle01 && data_027e09a4->mUnk_00.sceneIndex < SceneIndex_Max) {
|
||||
Vec2s sp10;
|
||||
stack_struct sp8;
|
||||
u32 sp4;
|
||||
ActorRef sp4;
|
||||
|
||||
//! TODO: fake match?
|
||||
sp4 = *(u32 *) &this->mUnk_38;
|
||||
sp4 = *(ActorRef *) &this->mUnk_38;
|
||||
|
||||
if (data_027e0998->vfunc_00(&this->mPos, &sp10, (u16 *) &sp4)) {
|
||||
if (data_027e0998->vfunc_00(&this->mPos, &sp10, &sp4)) {
|
||||
sp8.mUnk_06 = 0x00;
|
||||
MI_CpuFill32(0, &sp8, sizeof(sp8));
|
||||
sp8.mUnk_05 = -1;
|
||||
|
||||
Reference in New Issue
Block a user