Merge remote-tracking branch 'upstream/main' into bmg

7 files changed, 144 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
index 14723773..b510ca5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ objdiff.json
 build.ninja
 .ninja_log*
 .ninja_lock
+/wibo
diff --git a/INSTALL.md b/INSTALL.md
index 6d4acc03..91c4a96c 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -16,7 +16,6 @@ Contents:
     - Python 3.11+ and pip
     - GCC 9+
     - Ninja
-    - **On Linux**: Wine/Wibo
 3. Install the Python dependencies:
 ```shell
 python -m pip install -r tools/requirements.txt
@@ -38,7 +37,7 @@ python tools/configure.py <eur|usa>
 > Rerun `configure.py` often to ensure that all C/C++ code gets compiled.
 
 > [!NOTE]
-> For Linux users: If you plan to use Wibo instead of Wine, run `configure.py` with `-w <path/to/wibo>`.
+> For Linux users: Wibo is used by default. If you want to use Wine instead, run `configure.py` with `-w <path/to/wine>`.
 7. Put one or more base ROMs in the [`/extract/`](/extract/README.md) directory of this repository.
 
 Now you can run `ninja` to build a ROM for the chosen version.
@@ -48,10 +47,11 @@ Now you can run `ninja` to build a ROM for the chosen version.
 **This is optional!** You only need to follow these steps if you want a matching ROM.
 
 First, [extract the ARM7 BIOS from your DS device](https://wiki.ds-homebrew.com/ds-index/ds-bios-firmware-dump). Put the
-ARM7 BIOS in the root directory of this repository, and verify that your dumped BIOS matches the one below:
+ARM7 BIOS in the root directory of this repository, and verify that your dumped BIOS matches one of the following:
 
 | File name       | SHA1                                       |
 | --------------- | ------------------------------------------ |
 | `arm7_bios.bin` | `6ee830c7f552c5bf194c20a2c13d5bb44bdb5c03` |
+| `arm7_bios.bin` | `24f67bdea115a2c847c8813a262502ee1607b7df` |
 
 Now, rerun `configure.py` so it can update `build.ninja` to build a matching ROM.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..0e259d42
--- /dev/null
+++ b/LICENSE
@@ -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.
diff --git a/include/Actor/ActorSpawner.hpp b/include/Actor/ActorSpawner.hpp
index e417ddcc..94047e10 100644
--- a/include/Actor/ActorSpawner.hpp
+++ b/include/Actor/ActorSpawner.hpp
@@ -16,8 +16,8 @@ public:
     static void Destroy();
     ActorSpawner();
     ~ActorSpawner();
-    void _ZN12ActorSpawner19func_ov000_020c4014Ev();
-    void _ZN12ActorSpawner19func_ov000_020c4018Ev();
+    void func_ov000_020c4014();
+    void func_ov000_020c4018();
     Actor *CreateActor(ActorTypeId type);
     s32 Spawn(ActorTypeId type, Vec3p *pos, void *param3, ActorRef *ref);
 };
diff --git a/src/00_Core/Actor/ActorSpawner.cpp b/src/00_Core/Actor/ActorSpawner.cpp
index 514156ac..76b4ae74 100644
--- a/src/00_Core/Actor/ActorSpawner.cpp
+++ b/src/00_Core/Actor/ActorSpawner.cpp
@@ -4,7 +4,7 @@ ActorSpawner *ActorSpawner::Create() {}
 void ActorSpawner::Destroy() {}
 ActorSpawner::ActorSpawner() {}
 ActorSpawner::~ActorSpawner() {}
-void ActorSpawner::_ZN12ActorSpawner19func_ov000_020c4014Ev() {}
-void ActorSpawner::_ZN12ActorSpawner19func_ov000_020c4018Ev() {}
+void ActorSpawner::func_ov000_020c4014() {}
+void ActorSpawner::func_ov000_020c4018() {}
 Actor *ActorSpawner::CreateActor(ActorTypeId type) {}
 s32 ActorSpawner::Spawn(ActorTypeId type, Vec3p *pos, void *param3, ActorRef *ref) {}
diff --git a/tools/configure.py b/tools/configure.py
index 7f2c5b26..f3c34311 100644
--- a/tools/configure.py
+++ b/tools/configure.py
@@ -10,7 +10,7 @@ import ninja_syntax
 
 
 parser = argparse.ArgumentParser(description="Generates build.ninja")
-parser.add_argument('-w', type=str, default="wine", dest="wine", required=False, help="Path to Wine (linux only)")
+parser.add_argument('-w', type=str, default="./wibo", dest="wine", required=False, help="Path to Wine/Wibo (linux only)")
 parser.add_argument('version', help='Game version')
 args = parser.parse_args()
 
diff --git a/tools/setup.py b/tools/setup.py
index bc322e1d..f81ca25d 100644
--- a/tools/setup.py
+++ b/tools/setup.py
@@ -3,8 +3,10 @@ import zipfile
 import io
 from pathlib import Path
 import platform
+import stat
 
 DSD_VERSION = 'v0.4.0'
+WIBO_VERSION = '0.6.16'
 
 
 tools_path = Path(__file__).parent
@@ -30,8 +32,10 @@ match platform.machine().lower():
 
 print('\nInstalling dsd...')
 response = requests.get(f'https://github.com/AetiasHax/ds-decomp/releases/download/{DSD_VERSION}/dsd-{system}-{machine}{EXE}')
-with open(root_path / f'dsd{EXE}', 'wb') as f:
+dsd_path = root_path / f'dsd{EXE}'
+with open(dsd_path, 'wb') as f:
     f.write(response.content)
+dsd_path.chmod(dsd_path.stat().st_mode | stat.S_IEXEC)
 
 
 print('\nInstalling toolchain...')
@@ -39,3 +43,12 @@ response = requests.get('http://decomp.aetias.com/files/mwccarm.zip')
 zip_file = zipfile.ZipFile(io.BytesIO(response.content))
 zip_file.extractall(tools_path)
 
+
+if system == "linux":
+    print('\nInstalling wibo...')
+    response = requests.get(f'https://github.com/decompals/wibo/releases/download/{WIBO_VERSION}/wibo')
+    wibo_path = root_path / 'wibo'
+    with open(wibo_path, 'wb') as f:
+        f.write(response.content)
+    wibo_path.chmod(wibo_path.stat().st_mode | stat.S_IEXEC)
+