mirror/st
1
0
Fork 0
mirror of https://github.com/zeldaret/st synced 2026-06-11 05:08:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix build issues for real

Browse Source
This commit is contained in:
Yanis002
2025-07-22 22:55:27 +02:00
parent d99cabdfb5
commit 7fa74389e5
5 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/eur/arm9/overlays/ov110/relocs.txt
+5 -5
View File
@@ -19,7 +19,7 @@ from:0x02184d88 kind:load to:0x020afc43 module:overlay(0)
from:0x02184d8c kind:load to:0x020afc40 module:overlay(0)
from:0x02184d90 kind:load to:0x020d8698 module:overlay(24)
from:0x02184d94 kind:load to:0x02185dc8 module:overlay(110)
from:0x02184d98 kind:load to:0x02185dc8 add:0x1 module:overlay(110)
from:0x02184d98 kind:load to:0x02185dca module:overlay(110)
from:0x02184d9c kind:load to:0x027e09b8 module:dtcm
from:0x02184da0 kind:load to:0x020b6510 module:overlay(0)
from:0x02184da4 kind:load to:0x020d86b0 module:overlay(24)
@@ -30,8 +30,8 @@ from:0x02184e10 kind:arm_call to:0x0208a0f0 module:overlay(0)
from:0x02184e2c kind:arm_call to:0x020590e4 module:overlay(0)
from:0x02184e44 kind:arm_call_thumb to:0x02057b70 module:overlay(0)
from:0x02184e60 kind:arm_call to:0x0203d160 module:main
from:0x02184e6c kind:load to:0x02186204 add:0x8 module:overlay(110)
from:0x02184e70 kind:load to:0x021861f8 add:0x8 module:overlay(110)
from:0x02184e6c kind:load to:0x0218620c module:overlay(110)
from:0x02184e70 kind:load to:0x02186200 module:overlay(110)
from:0x02184e74 kind:load to:0x020a02d4 module:overlay(0)
from:0x02184e78 kind:load to:0x02185d30 module:overlay(110)
from:0x02184e90 kind:arm_call to:0x0205ca74 module:overlay(0)
@@ -41,7 +41,7 @@ from:0x02184f0c kind:arm_call to:0x0203d210 module:main
from:0x02184f14 kind:arm_call_thumb to:0x02057b8c module:overlay(0)
from:0x02184f1c kind:arm_call to:0x0208a164 module:overlay(0)
from:0x02184f24 kind:arm_call to:0x0208f8c4 module:overlay(0)
from:0x02184f30 kind:load to:0x02186204 add:0x8 module:overlay(110)
from:0x02184f30 kind:load to:0x0218620c module:overlay(110)
from:0x02184f34 kind:load to:0x027e0cec module:dtcm
from:0x02184f3c kind:load to:0x020a02d4 module:overlay(0)
from:0x02184f54 kind:arm_call to:0x0205ca74 module:overlay(0)
@@ -52,7 +52,7 @@ from:0x02184fd8 kind:arm_call_thumb to:0x02057b8c module:overlay(0)
from:0x02184fe0 kind:arm_call to:0x0208a164 module:overlay(0)
from:0x02184fe8 kind:arm_call to:0x0208f8c4 module:overlay(0)
from:0x02184ff0 kind:arm_call to:0x02011ff4 module:main
from:0x02184ffc kind:load to:0x02186204 add:0x8 module:overlay(110)
from:0x02184ffc kind:load to:0x0218620c module:overlay(110)
from:0x02185000 kind:load to:0x027e0cec module:dtcm
from:0x02185008 kind:load to:0x020a02d4 module:overlay(0)
from:0x0218511c kind:arm_call to:0x020aa02c module:overlay(0)
config/eur/arm9/overlays/ov110/symbols.txt
+17 -17
View File
@@ -1,26 +1,26 @@
_ZN9PlayerGet19func_ov110_02184a40Ev kind:function(arm,size=0x36c) addr:0x02184a40
_ZN9PlayerGet19func_ov110_02184dacEiii kind:function(arm,size=0x30) addr:0x02184dac
_ZN9PlayerGetC2Ev kind:function(arm,size=0xa0) addr:0x02184ddc
_ZN9PlayerGetD1Ev kind:function(arm,size=0xc4) addr:0x02184e7c
_ZN9PlayerGetD0Ev kind:function(arm,size=0xcc) addr:0x02184f40
_ZN9PlayerGet8vfunc_0cEv kind:function(arm,size=0x5d8) addr:0x0218500c
_ZN9PlayerGet8vfunc_10Ev kind:function(arm,size=0x6d0) addr:0x021855e4
_ZN9PlayerGet8vfunc_18Eiii kind:function(arm,size=0x7c) addr:0x02185cb4
_ZN22UnkStruct_PlayerGet_ecC1Ev kind:function(arm,size=0xc) addr:0x02185d30
_ZN18UnkStruct_027e0ce019func_ov110_02185d3cEi kind:function(thumb,size=0x66) addr:0x02185d3c
_ZN9PlayerGet19func_ov110_02185da4Ei kind:function(arm,size=0x10) addr:0x02185da4
_ZN9PlayerGet19func_ov110_02185db4Ei kind:function(arm,size=0x10) addr:0x02185db4
data_ov110_02185dc4 kind:data(any) addr:0x02185dc4
func_ov110_02184a40 kind:function(arm,size=0x36c) addr:0x02184a40
func_ov110_02184dac kind:function(arm,size=0x30) addr:0x02184dac
func_ov110_02184ddc kind:function(arm,size=0xa0) addr:0x02184ddc
func_ov110_02184e7c kind:function(arm,size=0xc4) addr:0x02184e7c
func_ov110_02184f40 kind:function(arm,size=0xcc) addr:0x02184f40
func_ov110_0218500c kind:function(arm,size=0x5d8) addr:0x0218500c
func_ov110_021855e4 kind:function(arm,size=0x6d0) addr:0x021855e4
func_ov110_02185cb4 kind:function(arm,size=0x7c) addr:0x02185cb4
func_ov110_02185d30 kind:function(arm,size=0xc) addr:0x02185d30
func_ov110_02185d3c kind:function(thumb,size=0x66) addr:0x02185d3c
func_ov110_02185da4 kind:function(arm,size=0x10) addr:0x02185da4
func_ov110_02185db4 kind:function(arm,size=0x10) addr:0x02185db4
data_ov110_02185dc8 kind:data(any) addr:0x02185dc8
data_ov110_02185dca kind:data(any) addr:0x02185dca
data_ov110_02185de8 kind:data(any) addr:0x02185de8
data_ov110_02185fbc kind:data(any) addr:0x02185fbc
data_ov110_021860c4 kind:data(any) addr:0x021860c4 ambiguous
__sinit_PlayerGet.cpp kind:function(arm,size=0x2c) addr:0x02186190
.p__sinit_PlayerGet.cpp kind:data(word) addr:0x021861bc
__sinit_ov110_02186190 kind:function(arm,size=0x2c) addr:0x02186190
.p__sinit_ov110_02186190 kind:data(word) addr:0x021861bc
data_ov110_021861e0 kind:data(any) addr:0x021861e0
data_ov110_021861ec kind:data(any) addr:0x021861ec
_ZTV22UnkStruct_PlayerGet_74 kind:data(any) addr:0x021861f8
_ZTV9PlayerGet kind:data(any) addr:0x02186204
data_ov110_02186200 kind:data(any) addr:0x02186200
data_ov110_0218620c kind:data(any) addr:0x0218620c
data_ov110_02186240 kind:bss addr:0x02186240
data_ov110_02188e48 kind:bss addr:0x02188e48 ambiguous
data_ov110_02188f08 kind:bss addr:0x02188f08 ambiguous
include/Actor/Actor.hpp
+2 -2
View File
@@ -1,8 +1,8 @@
#pragma once
#include "System/SysNew.hpp"
#include "nitro/math.h"
#include "global.h"
#include "nitro/math.h"
#include "types.h"
class Actor_5c {
@@ -90,7 +90,7 @@ public:
/* 30 */ virtual void vfunc_30();
/* 34 */ virtual unk32 vfunc_34();
/* 38 */ virtual unk32 vfunc_38(unk32 param1);
/* 3c */ virtual bool vfunc_3c(unk32 param2, Vec3p* param3);
/* 3c */ virtual bool vfunc_3c(unk32 param2, Vec3p *param3);
/* 40 */ virtual void vfunc_40();
/* 44 */ virtual void vfunc_44();
/* 48 */ virtual void vfunc_48();
include/Unknown/UnkStruct_027e0cd8.hpp
+1 -1
View File
@@ -7,4 +7,4 @@ public:
void func_ov000_02081ecc(unk16 param1, unk32 param2);
};
extern UnkStruct_027e0cd8* data_027e0cd8;
extern UnkStruct_027e0cd8 *data_027e0cd8;
src/00_Second/Actor/Actor.cpp
+8 -8
View File
@@ -3,9 +3,9 @@
#include "Unknown/UnkStruct_027e0ce0.hpp"
ARM Actor::Actor() {
this->mVel.x = 0;
this->mVel.y = 0;
this->mVel.z = 0;
this->mVel.x = 0;
this->mVel.y = 0;
this->mVel.z = 0;
this->mUnk_2c = 0xCD;
this->mUnk_38 = 0;
this->mUnk_3c = 0;
@@ -22,10 +22,10 @@ ARM Actor::Actor() {
this->mUnk_90 = 0;
data_ov000_020b539c.func_02028cdc(&this->mUnk_5c, 0x30);
this->mPrevPos = this->mPos = this->mUnk_5c.mUnk_00;
this->mAngle = this->mUnk_5c.mUnk_0c;
this->mUnk_58 = 0x400B;
this->mUnk_44 = 0xFF;
this->mUnk_46 = 0;
this->mAngle = this->mUnk_5c.mUnk_0c;
this->mUnk_58 = 0x400B;
this->mUnk_44 = 0xFF;
this->mUnk_46 = 0;
this->func_ov000_0209862c(0);
this->func_ov000_0209848c(data_ov000_020b539c.mUnk_30);
}
@@ -140,7 +140,7 @@ ARM unk32 Actor::vfunc_38(unk32 param1) {
}
// non-matching
ARM bool Actor::vfunc_3c(unk32 param2, Vec3p* param3) {
ARM bool Actor::vfunc_3c(unk32 param2, Vec3p *param3) {
if (!(this->mUnk_58 & 0x100)) {
return false;
}