mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-06-17 15:06:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

post-update cleanup: step 4 (builds properly)

Browse Source
This commit is contained in:
Yanis002
2025-02-05 12:43:34 +01:00
parent 4928bc4660
commit 1f7c5be909
10 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Item/ItemManager.hpp
+1
View File
@@ -15,6 +15,7 @@ extern "C" {
#include "Save/SaveItemManager.hpp"
#include "Sound/Sfx.hpp"
#include "System/SysNew.hpp"
#include "DTCM/UnkStruct_027e0d38.hpp"
#define MAX_HOURGLASS_SECONDS 1500 // 25 minutes
#define MAX_AMMO_UPGRADE 2
include/Message/MessageManager.hpp
+7
View File
@@ -7,6 +7,13 @@
#include "Message/BMG.hpp"
#include "Message/MsgProc.hpp"
#include "nds/math.h"
#include "Unknown/UnkStruct_0202e1a0.hpp"
#include "Unknown/UnkStruct_0203dae0.hpp"
#include "Unknown/UnkStruct_02032f0c.hpp"
#include "Unknown/UnkStruct_02038aa0.hpp"
#include "Unknown/UnkStruct_020397f8.hpp"
#include "Unknown/UnkStruct_02035064.hpp"
#include "Unknown/UnkStruct_02037750.hpp"
class UnkStruct_027E0C68 : public SysObject {
include/Message/MsgProc.hpp
-7
View File
@@ -3,13 +3,6 @@
#include "System/SysNew.hpp"
#include "Message/BMG.hpp"
#include "Unknown/func_ov000_020d0644.hpp"
#include "Unknown/UnkStruct_0202e1a0.hpp"
#include "Unknown/UnkStruct_0203dae0.hpp"
#include "Unknown/UnkStruct_02032f0c.hpp"
#include "Unknown/UnkStruct_02038aa0.hpp"
#include "Unknown/UnkStruct_020397f8.hpp"
#include "Unknown/UnkStruct_02035064.hpp"
#include "Unknown/UnkStruct_02037750.hpp"
#include "nds/math.h"
// temp
include/Unknown/UnkStruct_02038aa0.hpp
+7 -2
View File
@@ -5,6 +5,8 @@
#include "Unknown/UnkStruct_0203dae0.hpp"
#include "System/SysNew.hpp"
#include "nds/math.h"
#include "Message/MsgProc.hpp"
class UnkStruct_02038aa0;
typedef bool (*UnknownCallback)(class UnkStruct_020397f8*);
@@ -50,6 +52,9 @@ public:
void func_0203f020(s16*, unk32);
};
struct UnkStruct_0203b264;
struct func_02038f44_param4;
// astruct_6, MsgProc_Main
class UnkStruct_02038aa0 : public UnkStruct_0203dae0 {
public:
@@ -84,7 +89,7 @@ public:
/* 50 */ virtual void vfunc_50(EntryINF1* param1, u32 param2, s16* param3, UnkSubClass1_02256FF8* param4);
/* 54 */ virtual void vfunc_54();
/* 58 */ virtual void vfunc_58();
/* 5c */ virtual void vfunc_5c(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5);
/* 5c */ virtual void vfunc_5c(u16* param_2, struct UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5);
/* 60 */ virtual void vfunc_60();
/* 64 */ virtual void vfunc_64();
/* 68 */ virtual s32 vfunc_68(unk32 param1);
@@ -126,7 +131,7 @@ public:
void func_02038b28(void);
void func_02038b74(void); // is this a dtor?
void func_02038f40(void);
void func_02038f44(EntryINF1* param_2, u32 param_3, func_02038f44_param4* param_4, UnkSubClass1_02256FF8* param_5, unk32 param_6);
void func_02038f44(EntryINF1* param_2, u32 param_3, struct func_02038f44_param4* param_4, UnkSubClass1_02256FF8* param_5, unk32 param_6);
void func_02039058(void);
unk32 func_0203905c(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5);
void func_02038d20(void);
include/Unknown/UnkStruct_020397f8.hpp
+3 -16
View File
@@ -6,6 +6,7 @@
#include "Unknown/UnkStruct_02035064.hpp"
#include "Unknown/UnkStruct_02038aa0.hpp"
#include "System/SysNew.hpp"
#include "Message/MsgProc.hpp"
// does it host both choices?
struct UnknownMsgChoiceStruct {
@@ -91,7 +92,7 @@ public:
void func_02039ca8();
/* 3c */ virtual void vfunc_3c(unk32 param1);
/* 40 */ virtual void vfunc_40(s32 param1, s32 param2);
void func_0203a188(s32 param1, s32 param2);
void func_0203a188(s32 param1, s32 param2); // void func_0203a188(unk32 param_2, unk32 param_3, unk32 param_4);
bool func_0203a2c0();
unk32 func_0203a30c();
/* 48 */ virtual void vfunc_48();
@@ -111,7 +112,7 @@ public:
/* 64 */ virtual void vfunc_64(s16* param1);
void func_0203b764();
/* 20 */ virtual unk32 vfunc_20(s32 param1, s32 *param2);
void func_0203bd8c(s32 param1);
void func_0203bd8c(s32 param1); // void func_0203bd8c(u16 param_2);
/* 6c */ virtual void vfunc_6c(s32 *param1, s32 *param2);
void func_0203be08();
void func_0203be64();
@@ -127,20 +128,6 @@ public:
static void func_0203e060(UnkStruct_02038aa0* param_1, u8 param_2, u8 param_3);
void func_02039a3c(void);
unk32 func_02039250(void);
void func_02039ca8(void);
void func_0203a188(unk32 param_2, unk32 param_3, unk32 param_4);
bool func_0203a2c0(void);
unk32 func_0203a30c(void);
void func_0203a35c(void);
bool func_0203a3e0(void);
bool func_0203a6d0(unk32 param_2, unk32 param_3);
bool func_0203b0bc(void);
unk32 func_0203b0ec(unk32 param_2);
void func_0203b764(void);
void func_0203bd8c(u16 param_2);
void func_0203be08(void);
void func_0203be64(void);
bool func_0203c13c(void);
};
class MsgProc_Type3 : public UnkStruct_02038aa0 {
include/Unknown/UnkStruct_0203dae0.hpp
+2
View File
@@ -6,6 +6,8 @@
#include "Unknown/UnkStruct_02032f0c.hpp"
#include "Message/MsgProc.hpp"
class UnkStruct_0203dae0_114;
// astruct_7, MsgProc_Base2
class UnkStruct_0203dae0 : public UnkStruct_02032f0c {
public:
include/Unknown/UnkStruct_ov000_020e2f04.hpp
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
#include <nds/math.H>
#include <nds/math.h>
#include "Physics/AABB.hpp"
#include "global.h"
src/00_Core/DTCM/UnkStruct_027e103c.cpp
+2 -2
View File
@@ -36,7 +36,7 @@ void UnkStruct_027e103c::func_ov000_020cf3dc() {}
void UnkStruct_027e103c::func_ov000_020cf3f0() {}
void UnkStruct_027e103c::func_ov000_020cf404() {}
void UnkStruct_027e103c::func_ov000_020cf414() {}
void UnkStruct_027e103c::func_ov000_020cf42c() {}
bool UnkStruct_027e103c::func_ov000_020cf42c() {}
bool UnkStruct_027e103c::func_ov000_020cf444() {}
bool UnkStruct_027e103c::func_ov000_020cf488() {}
bool UnkStruct_027e103c::func_ov000_020cf4bc() {}
@@ -59,7 +59,7 @@ void UnkStruct_027e103c::func_ov000_020cfa70(s32 param1, s32 param2) {}
unk8 UnkStruct_027e103c::func_ov000_020cfab0() {}
void UnkStruct_027e103c::func_ov000_020cfabc(s32 param1, s32 param2) {}
void UnkStruct_027e103c::func_ov000_020cfae8(s32 param1, s32 param2) {}
void UnkStruct_027e103c::func_ov000_020cfb20(unk32 param1) {}
void UnkStruct_027e103c::func_ov000_020cfb20(void* param1) {}
void UnkStruct_027e103c::func_ov000_020cfb38() {}
void UnkStruct_027e103c::func_ov000_020cfb48() {}
void UnkStruct_027e103c::func_ov000_020cfb58() {}
src/Main/Actor/ActorType.cpp
+3 -3
View File
@@ -5,8 +5,8 @@ ActorTypeList sActorTypeList;
ARM ActorType::ActorType(ActorTypeId id, ActorCreateFunc create, unk32 (*unk_08)()) {
this->id = id;
this->create = create;
this->mUnk_08 = unk_08;
this->mUnk_0c = 0;
this->unk_08 = unk_08;
this->unk_0c = 0;
this->next = NULL;
this->Register();
sActorTypeList.tail = this;
@@ -17,7 +17,7 @@ ARM ActorType::~ActorType() {
}
ARM unk32 ActorType::func_0203e7c8() {
if (this->mUnk_08 == NULL) {
if (this->unk_08 == NULL) {
return 0;
}
return (*unk_08)();
src/Main/Unknown/UnkStruct_020397f8.cpp
+1 -1
View File
@@ -214,7 +214,7 @@ ARM void UnkStruct_020397f8::vfunc_40(s32 param1, s32 param2) {
bVar1 = data_027e0c68.mUnk_28[this->mUnk_50];
this->vfunc_6C(&local_8c, &local_90);
this->func_0203a188(local_8c + param1, local_90 + param2, 0);
this->func_0203a188(local_8c + param1, local_90 + param2);
this->func_0203e1b0(param1 + local_8c + (this->mUnk_158.x - (this->mUnk_14 << 3) / 2), param2 + local_90 + (this->mUnk_158.y - (this->mUnk_18 << 3) / 2), 0);
if (this->mUnk_584 != 0) {