Merge remote-tracking branch 'zeldaret/main' into decomp-PlayerControl

This commit is contained in:
Aetias
2025-02-08 12:49:16 +01:00
8 changed files with 183 additions and 63 deletions
+121
View File
@@ -0,0 +1,121 @@
Creative Commons Legal Code
CC0 1.0 Universal
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
HEREUNDER.
Statement of Purpose
The laws of most jurisdictions throughout the world automatically confer
exclusive Copyright and Related Rights (defined below) upon the creator
and subsequent owner(s) (each and all, an "owner") of an original work of
authorship and/or a database (each, a "Work").
Certain owners wish to permanently relinquish those rights to a Work for
the purpose of contributing to a commons of creative, cultural and
scientific works ("Commons") that the public can reliably and without fear
of later claims of infringement build upon, modify, incorporate in other
works, reuse and redistribute as freely as possible in any form whatsoever
and for any purposes, including without limitation commercial purposes.
These owners may contribute to the Commons to promote the ideal of a free
culture and the further production of creative, cultural and scientific
works, or to gain reputation or greater distribution for their Work in
part through the use and efforts of others.
For these and/or other purposes and motivations, and without any
expectation of additional consideration or compensation, the person
associating CC0 with a Work (the "Affirmer"), to the extent that he or she
is an owner of Copyright and Related Rights in the Work, voluntarily
elects to apply CC0 to the Work and publicly distribute the Work under its
terms, with knowledge of his or her Copyright and Related Rights in the
Work and the meaning and intended legal effect of CC0 on those rights.
1. Copyright and Related Rights. A Work made available under CC0 may be
protected by copyright and related or neighboring rights ("Copyright and
Related Rights"). Copyright and Related Rights include, but are not
limited to, the following:
i. the right to reproduce, adapt, distribute, perform, display,
communicate, and translate a Work;
ii. moral rights retained by the original author(s) and/or performer(s);
iii. publicity and privacy rights pertaining to a person's image or
likeness depicted in a Work;
iv. rights protecting against unfair competition in regards to a Work,
subject to the limitations in paragraph 4(a), below;
v. rights protecting the extraction, dissemination, use and reuse of data
in a Work;
vi. database rights (such as those arising under Directive 96/9/EC of the
European Parliament and of the Council of 11 March 1996 on the legal
protection of databases, and under any national implementation
thereof, including any amended or successor version of such
directive); and
vii. other similar, equivalent or corresponding rights throughout the
world based on applicable law or treaty, and any national
implementations thereof.
2. Waiver. To the greatest extent permitted by, but not in contravention
of, applicable law, Affirmer hereby overtly, fully, permanently,
irrevocably and unconditionally waives, abandons, and surrenders all of
Affirmer's Copyright and Related Rights and associated claims and causes
of action, whether now known or unknown (including existing as well as
future claims and causes of action), in the Work (i) in all territories
worldwide, (ii) for the maximum duration provided by applicable law or
treaty (including future time extensions), (iii) in any current or future
medium and for any number of copies, and (iv) for any purpose whatsoever,
including without limitation commercial, advertising or promotional
purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
member of the public at large and to the detriment of Affirmer's heirs and
successors, fully intending that such Waiver shall not be subject to
revocation, rescission, cancellation, termination, or any other legal or
equitable action to disrupt the quiet enjoyment of the Work by the public
as contemplated by Affirmer's express Statement of Purpose.
3. Public License Fallback. Should any part of the Waiver for any reason
be judged legally invalid or ineffective under applicable law, then the
Waiver shall be preserved to the maximum extent permitted taking into
account Affirmer's express Statement of Purpose. In addition, to the
extent the Waiver is so judged Affirmer hereby grants to each affected
person a royalty-free, non transferable, non sublicensable, non exclusive,
irrevocable and unconditional license to exercise Affirmer's Copyright and
Related Rights in the Work (i) in all territories worldwide, (ii) for the
maximum duration provided by applicable law or treaty (including future
time extensions), (iii) in any current or future medium and for any number
of copies, and (iv) for any purpose whatsoever, including without
limitation commercial, advertising or promotional purposes (the
"License"). The License shall be deemed effective as of the date CC0 was
applied by Affirmer to the Work. Should any part of the License for any
reason be judged legally invalid or ineffective under applicable law, such
partial invalidity or ineffectiveness shall not invalidate the remainder
of the License, and in such case Affirmer hereby affirms that he or she
will not (i) exercise any of his or her remaining Copyright and Related
Rights in the Work or (ii) assert any associated claims and causes of
action with respect to the Work, in either case contrary to Affirmer's
express Statement of Purpose.
4. Limitations and Disclaimers.
a. No trademark or patent rights held by Affirmer are waived, abandoned,
surrendered, licensed or otherwise affected by this document.
b. Affirmer offers the Work as-is and makes no representations or
warranties of any kind concerning the Work, express, implied,
statutory or otherwise, including without limitation warranties of
title, merchantability, fitness for a particular purpose, non
infringement, or the absence of latent or other defects, accuracy, or
the present or absence of errors, whether or not discoverable, all to
the greatest extent permissible under applicable law.
c. Affirmer disclaims responsibility for clearing rights of other persons
that may apply to the Work or any use thereof, including without
limitation any person's Copyright and Related Rights in the Work.
Further, Affirmer disclaims responsibility for obtaining any necessary
consents, permissions or other rights required for any use of the
Work.
d. Affirmer understands and acknowledges that Creative Commons is not a
party to this document and has no duty or obligation with respect to
this CC0 or use of the Work.
+30 -30
View File
@@ -1876,36 +1876,36 @@ _ZN18UnkStruct_02038aa0C2Ehh kind:function(thumb,size=0x5c) addr:0x2038aa0
_ZN18UnkStruct_02038aa0D1Ev kind:function(thumb,size=0xc) addr:0x2038afc
_ZN18UnkStruct_02038aa0D0Ev kind:function(thumb,size=0x14) addr:0x2038b08
_ZN18UnkStruct_02038aa0D2Ev kind:function(thumb,size=0xc) addr:0x2038b1c
_ZN18UnkStruct_02038aa013func_02038b34Eji kind:function(thumb,size=0xc) addr:0x2038b28
_ZN18UnkStruct_02038aa08vfunc_4cEv kind:function(arm,size=0xc) addr:0x2038b34
_ZN18UnkStruct_02038aa08vfunc_10Ei kind:function(arm,size=0x34) addr:0x2038b40
_ZN18UnkStruct_02038aa013func_02038b40Ev kind:function(arm,size=0x4) addr:0x2038b74
_ZN18UnkStruct_02038aa08vfunc_48Ev kind:function(arm,size=0xbc) addr:0x2038b78
_ZN18UnkStruct_02038aa013func_02038b78Ev kind:function(arm,size=0x84) addr:0x2038c34
_ZN18UnkStruct_02038aa08vfunc_34Ei kind:function(arm,size=0x3c) addr:0x2038cb8
_ZN18UnkStruct_02038aa013func_02038cb8Ei kind:function(arm,size=0x1c) addr:0x2038cf4
_ZN18UnkStruct_02038aa013func_02038cf4Ev kind:function(arm,size=0x10) addr:0x2038d10
_ZN18UnkStruct_02038aa013func_02038d10Ev kind:function(arm,size=0x1b0) addr:0x2038d20
_ZN18UnkStruct_02038aa08vfunc_2cEv kind:function(arm,size=0x24) addr:0x2038ed0
_ZN18UnkStruct_02038aa08vfunc_30Ev kind:function(arm,size=0x4c) addr:0x2038ef4
_ZN18UnkStruct_02038aa013func_02038ef4Eii kind:function(arm,size=0x4) addr:0x2038f40
_ZN18UnkStruct_02038aa08vfunc_44Ev kind:function(arm,size=0x114) addr:0x2038f44
_ZN18UnkStruct_02038aa08vfunc_50Eiiii kind:function(arm,size=0x4) addr:0x2039058
_ZN18UnkStruct_02038aa08vfunc_5cEv kind:function(arm,size=0x48) addr:0x203905c
_ZN18UnkStruct_02038aa08vfunc_1cEiPiii kind:function(arm,size=0x164) addr:0x20390a4
_ZN18UnkStruct_02038aa08vfunc_20EiPi kind:function(arm,size=0x20) addr:0x2039208
_ZN18UnkStruct_02038aa013func_02039208Es kind:function(arm,size=0x28) addr:0x2039228
_ZN18UnkStruct_02038aa08vfunc_08EiiPsi kind:function(arm,size=0x64) addr:0x2039250
_ZN18UnkStruct_02038aa013func_02039250Ev kind:function(arm,size=0xe4) addr:0x20392b4
_ZN18UnkStruct_02038aa08vfunc_54Ev kind:function(arm,size=0xc) addr:0x2039398
_ZN18UnkStruct_02038aa08vfunc_58Ev kind:function(arm,size=0x4) addr:0x20393a4
_ZN18UnkStruct_02038aa08vfunc_60Ev kind:function(arm,size=0x28) addr:0x20393a8
_ZN18UnkStruct_02038aa08vfunc_64Ev kind:function(arm,size=0x70) addr:0x20393d0
_ZN18UnkStruct_02038aa08vfunc_68Ei kind:function(arm,size=0x3c) addr:0x2039440
_ZN18UnkStruct_02038aa013func_02039440Eii kind:function(arm,size=0x5c) addr:0x203947c
_ZN18UnkStruct_02038aa08vfunc_6cEPiS0_ kind:function(arm,size=0x44) addr:0x20394d8
_ZN18UnkStruct_02038aa08vfunc_70EPiS0_ kind:function(arm,size=0x40) addr:0x203951c
_ZN18UnkStruct_02038aa013func_0203951cEv kind:function(arm,size=0x14) addr:0x203955c
_ZN18UnkStruct_02038aa08vfunc_4cEv kind:function(thumb,size=0xc) addr:0x2038b28
_ZN18UnkStruct_02038aa08vfunc_10Ei kind:function(arm,size=0xc) addr:0x2038b34
_ZN18UnkStruct_02038aa013func_02038b40Ev kind:function(arm,size=0x34) addr:0x2038b40
_ZN18UnkStruct_02038aa08vfunc_48Ev kind:function(arm,size=0x4) addr:0x2038b74
_ZN18UnkStruct_02038aa013func_02038b78Ev kind:function(arm,size=0xbc) addr:0x2038b78
_ZN18UnkStruct_02038aa08vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038c34
_ZN18UnkStruct_02038aa013func_02038cb8Ei kind:function(arm,size=0x3c) addr:0x2038cb8
_ZN18UnkStruct_02038aa013func_02038cf4Ev kind:function(arm,size=0x1c) addr:0x2038cf4
_ZN18UnkStruct_02038aa013func_02038d10Ev kind:function(arm,size=0x10) addr:0x2038d10
_ZN18UnkStruct_02038aa08vfunc_2cEv kind:function(arm,size=0x1b0) addr:0x2038d20
_ZN18UnkStruct_02038aa08vfunc_30Ev kind:function(arm,size=0x24) addr:0x2038ed0
_ZN18UnkStruct_02038aa013func_02038ef4Eii kind:function(arm,size=0x4c) addr:0x2038ef4
_ZN18UnkStruct_02038aa08vfunc_44Ev kind:function(arm,size=0x4) addr:0x2038f40
_ZN18UnkStruct_02038aa08vfunc_50Eiiii kind:function(arm,size=0x114) addr:0x2038f44
_ZN18UnkStruct_02038aa08vfunc_5cEv kind:function(arm,size=0x4) addr:0x2039058
_ZN18UnkStruct_02038aa08vfunc_1cEiPiii kind:function(arm,size=0x48) addr:0x203905c
_ZN18UnkStruct_02038aa08vfunc_20EiPi kind:function(arm,size=0x164) addr:0x20390a4
_ZN18UnkStruct_02038aa013func_02039208Es kind:function(arm,size=0x20) addr:0x2039208
_ZN18UnkStruct_02038aa08vfunc_08EiiPsi kind:function(arm,size=0x28) addr:0x2039228
_ZN18UnkStruct_02038aa013func_02039250Ev kind:function(arm,size=0x64) addr:0x2039250
_ZN18UnkStruct_02038aa08vfunc_54Ev kind:function(arm,size=0xe4) addr:0x20392b4
_ZN18UnkStruct_02038aa08vfunc_58Ev kind:function(arm,size=0xc) addr:0x2039398
_ZN18UnkStruct_02038aa08vfunc_60Ev kind:function(arm,size=0x4) addr:0x20393a4
_ZN18UnkStruct_02038aa08vfunc_64Ev kind:function(arm,size=0x28) addr:0x20393a8
_ZN18UnkStruct_02038aa08vfunc_68Ei kind:function(arm,size=0x70) addr:0x20393d0
_ZN18UnkStruct_02038aa013func_02039440Eii kind:function(arm,size=0x3c) addr:0x2039440
_ZN18UnkStruct_02038aa08vfunc_6cEPiS0_ kind:function(arm,size=0x5c) addr:0x203947c
_ZN18UnkStruct_02038aa08vfunc_70EPiS0_ kind:function(arm,size=0x44) addr:0x20394d8
_ZN18UnkStruct_02038aa013func_0203951cEv kind:function(arm,size=0x40) addr:0x203951c
_ZN18UnkStruct_0203881cD0Ev kind:function(arm,size=0x14) addr:0x203955c
_ZN18UnkStruct_02038aa08vfunc_38Ev kind:function(arm,size=0x8) addr:0x2039570
func_02039578 kind:function(arm,size=0x3c) addr:0x2039578
_ZN18UnkStruct_020397f8C2Ev kind:function(thumb,size=0x244) addr:0x20395b4
+30 -30
View File
@@ -1876,36 +1876,36 @@ _ZN18UnkStruct_02038aa0C2Ehh kind:function(thumb,size=0x5c) addr:0x2038a5c
_ZN18UnkStruct_02038aa0D1Ev kind:function(thumb,size=0xc) addr:0x2038ab8
_ZN18UnkStruct_02038aa0D0Ev kind:function(thumb,size=0x14) addr:0x2038ac4
_ZN18UnkStruct_02038aa0D2Ev kind:function(thumb,size=0xc) addr:0x2038ad8
_ZN18UnkStruct_02038aa013func_02038b34Eji kind:function(thumb,size=0xc) addr:0x2038ae4
_ZN18UnkStruct_02038aa08vfunc_4cEv kind:function(arm,size=0xc) addr:0x2038af0
_ZN18UnkStruct_02038aa08vfunc_10Ei kind:function(arm,size=0x34) addr:0x2038afc
_ZN18UnkStruct_02038aa013func_02038b40Ev kind:function(arm,size=0x4) addr:0x2038b30
_ZN18UnkStruct_02038aa08vfunc_48Ev kind:function(arm,size=0xbc) addr:0x2038b34
_ZN18UnkStruct_02038aa013func_02038b78Ev kind:function(arm,size=0x84) addr:0x2038bf0
_ZN18UnkStruct_02038aa08vfunc_34Ei kind:function(arm,size=0x3c) addr:0x2038c74
_ZN18UnkStruct_02038aa013func_02038cb8Ei kind:function(arm,size=0x1c) addr:0x2038cb0
_ZN18UnkStruct_02038aa013func_02038cf4Ev kind:function(arm,size=0x10) addr:0x2038ccc
_ZN18UnkStruct_02038aa013func_02038d10Ev kind:function(arm,size=0x1b0) addr:0x2038cdc
_ZN18UnkStruct_02038aa08vfunc_2cEv kind:function(arm,size=0x24) addr:0x2038e8c
_ZN18UnkStruct_02038aa08vfunc_30Ev kind:function(arm,size=0x4c) addr:0x2038eb0
_ZN18UnkStruct_02038aa013func_02038ef4Eii kind:function(arm,size=0x4) addr:0x2038efc
_ZN18UnkStruct_02038aa08vfunc_44Ev kind:function(arm,size=0x114) addr:0x2038f00
_ZN18UnkStruct_02038aa08vfunc_50Eiiii kind:function(arm,size=0x4) addr:0x2039014
_ZN18UnkStruct_02038aa08vfunc_5cEv kind:function(arm,size=0x48) addr:0x2039018
_ZN18UnkStruct_02038aa08vfunc_1cEiPiii kind:function(arm,size=0x164) addr:0x2039060
_ZN18UnkStruct_02038aa08vfunc_20EiPi kind:function(arm,size=0x20) addr:0x20391c4
_ZN18UnkStruct_02038aa013func_02039208Es kind:function(arm,size=0x28) addr:0x20391e4
_ZN18UnkStruct_02038aa08vfunc_08EiiPsi kind:function(arm,size=0x64) addr:0x203920c
_ZN18UnkStruct_02038aa013func_02039250Ev kind:function(arm,size=0xe4) addr:0x2039270
_ZN18UnkStruct_02038aa08vfunc_54Ev kind:function(arm,size=0xc) addr:0x2039354
_ZN18UnkStruct_02038aa08vfunc_58Ev kind:function(arm,size=0x4) addr:0x2039360
_ZN18UnkStruct_02038aa08vfunc_60Ev kind:function(arm,size=0x28) addr:0x2039364
_ZN18UnkStruct_02038aa08vfunc_64Ev kind:function(arm,size=0x70) addr:0x203938c
_ZN18UnkStruct_02038aa08vfunc_68Ei kind:function(arm,size=0x3c) addr:0x20393fc
_ZN18UnkStruct_02038aa013func_02039440Eii kind:function(arm,size=0x5c) addr:0x2039438
_ZN18UnkStruct_02038aa08vfunc_6cEPiS0_ kind:function(arm,size=0x44) addr:0x2039494
_ZN18UnkStruct_02038aa08vfunc_70EPiS0_ kind:function(arm,size=0x40) addr:0x20394d8
_ZN18UnkStruct_02038aa013func_0203951cEv kind:function(arm,size=0x14) addr:0x2039518
_ZN18UnkStruct_02038aa08vfunc_4cEv kind:function(thumb,size=0xc) addr:0x2038ae4
_ZN18UnkStruct_02038aa08vfunc_10Ei kind:function(arm,size=0xc) addr:0x2038af0
_ZN18UnkStruct_02038aa013func_02038b40Ev kind:function(arm,size=0x34) addr:0x2038afc
_ZN18UnkStruct_02038aa08vfunc_48Ev kind:function(arm,size=0x4) addr:0x2038b30
_ZN18UnkStruct_02038aa013func_02038b78Ev kind:function(arm,size=0xbc) addr:0x2038b34
_ZN18UnkStruct_02038aa08vfunc_34Ei kind:function(arm,size=0x84) addr:0x2038bf0
_ZN18UnkStruct_02038aa013func_02038cb8Ei kind:function(arm,size=0x3c) addr:0x2038c74
_ZN18UnkStruct_02038aa013func_02038cf4Ev kind:function(arm,size=0x1c) addr:0x2038cb0
_ZN18UnkStruct_02038aa013func_02038d10Ev kind:function(arm,size=0x10) addr:0x2038ccc
_ZN18UnkStruct_02038aa08vfunc_2cEv kind:function(arm,size=0x1b0) addr:0x2038cdc
_ZN18UnkStruct_02038aa08vfunc_30Ev kind:function(arm,size=0x24) addr:0x2038e8c
_ZN18UnkStruct_02038aa013func_02038ef4Eii kind:function(arm,size=0x4c) addr:0x2038eb0
_ZN18UnkStruct_02038aa08vfunc_44Ev kind:function(arm,size=0x4) addr:0x2038efc
_ZN18UnkStruct_02038aa08vfunc_50Eiiii kind:function(arm,size=0x114) addr:0x2038f00
_ZN18UnkStruct_02038aa08vfunc_5cEv kind:function(arm,size=0x4) addr:0x2039014
_ZN18UnkStruct_02038aa08vfunc_1cEiPiii kind:function(arm,size=0x48) addr:0x2039018
_ZN18UnkStruct_02038aa08vfunc_20EiPi kind:function(arm,size=0x164) addr:0x2039060
_ZN18UnkStruct_02038aa013func_02039208Es kind:function(arm,size=0x20) addr:0x20391c4
_ZN18UnkStruct_02038aa08vfunc_08EiiPsi kind:function(arm,size=0x28) addr:0x20391e4
_ZN18UnkStruct_02038aa013func_02039250Ev kind:function(arm,size=0x64) addr:0x203920c
_ZN18UnkStruct_02038aa08vfunc_54Ev kind:function(arm,size=0xe4) addr:0x2039270
_ZN18UnkStruct_02038aa08vfunc_58Ev kind:function(arm,size=0xc) addr:0x2039354
_ZN18UnkStruct_02038aa08vfunc_60Ev kind:function(arm,size=0x4) addr:0x2039360
_ZN18UnkStruct_02038aa08vfunc_64Ev kind:function(arm,size=0x28) addr:0x2039364
_ZN18UnkStruct_02038aa08vfunc_68Ei kind:function(arm,size=0x70) addr:0x203938c
_ZN18UnkStruct_02038aa013func_02039440Eii kind:function(arm,size=0x3c) addr:0x20393fc
_ZN18UnkStruct_02038aa08vfunc_6cEPiS0_ kind:function(arm,size=0x5c) addr:0x2039438
_ZN18UnkStruct_02038aa08vfunc_70EPiS0_ kind:function(arm,size=0x44) addr:0x2039494
_ZN18UnkStruct_02038aa013func_0203951cEv kind:function(arm,size=0x40) addr:0x20394d8
_ZN18UnkStruct_0203881cD0Ev kind:function(arm,size=0x14) addr:0x2039518
_ZN18UnkStruct_02038aa08vfunc_38Ev kind:function(arm,size=0x8) addr:0x203952c
func_02039578 kind:function(arm,size=0x3c) addr:0x2039534
_ZN18UnkStruct_020397f8C2Ev kind:function(thumb,size=0x244) addr:0x2039570
-1
View File
@@ -74,7 +74,6 @@ public:
/* 74 */
UnkStruct_02038aa0(u8 param1, u8 param2);
void func_02038b34(u32 param1, unk32 param2);
void func_02038b40();
bool func_02038b78();
s32 func_02038cb8(s32 param1);
+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"
-1
View File
@@ -10,7 +10,6 @@ UnkStruct_0203881c::~UnkStruct_0203881c() {}
UnkStruct_02038aa0::UnkStruct_02038aa0(u8 param1, u8 param2) :
UnkStruct_0203dae0(param1) {}
UnkStruct_02038aa0::~UnkStruct_02038aa0() {}
void UnkStruct_02038aa0::func_02038b34(u32 param1, unk32 param2) {}
void UnkStruct_02038aa0::vfunc_4c() {}
void UnkStruct_02038aa0::vfunc_10(unk32 param1) {}
void UnkStruct_02038aa0::func_02038b40() {}
+1
View File
@@ -32,6 +32,7 @@ CC_FLAGS = " ".join([
"-Cpp_exceptions off", # Disable C++ exceptions
"-RTTI off", # Disable runtime type information
"-interworking", # Enable ARM/Thumb interworking
"-w off", # Disable warnings
"-sym on", # Debug info, including line numbers
"-gccinc", # Interpret #include "..." and #include <...> equally
"-nolink", # Do not link
Regular → Executable
View File