From ec549c8f6f368bdd55121bc863b691145750e396 Mon Sep 17 00:00:00 2001 From: Rachel Date: Tue, 23 Jan 2024 16:15:35 -0800 Subject: [PATCH] Wire up OK build for battle-script NARCs --- .github/workflows/build.yml | 2 +- INSTALL.md | 7 +- meson.build | 8 +- platinum.us/rom.rsf | 12 +- res/battle/meson.build | 3 +- res/battle/scripts/effects/meson.build | 279 ++++++++++++ res/battle/scripts/meson.build | 72 ++++ res/battle/scripts/moves/meson.build | 503 ++++++++++++++++++++++ res/battle/scripts/subscripts/meson.build | 299 +++++++++++++ res/meson.build | 3 +- res/prebuilt/battle/meson.build | 1 - res/prebuilt/battle/skill/be_seq.narc | Bin 16940 -> 0 bytes res/prebuilt/battle/skill/meson.build | 10 - res/prebuilt/battle/skill/sub_seq.narc | Bin 53196 -> 0 bytes res/prebuilt/battle/skill/waza_seq.narc | Bin 6416 -> 0 bytes tools/meson.build | 4 + tools/scripts/make_script_bin.sh | 76 ++++ tools/scripts/meson.build | 1 + 18 files changed, 1256 insertions(+), 24 deletions(-) create mode 100644 res/battle/scripts/effects/meson.build create mode 100644 res/battle/scripts/meson.build create mode 100644 res/battle/scripts/moves/meson.build create mode 100644 res/battle/scripts/subscripts/meson.build delete mode 100644 res/prebuilt/battle/skill/be_seq.narc delete mode 100644 res/prebuilt/battle/skill/meson.build delete mode 100644 res/prebuilt/battle/skill/sub_seq.narc delete mode 100644 res/prebuilt/battle/skill/waza_seq.narc create mode 100644 tools/scripts/make_script_bin.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dbc8f7cf59..a1ba94978c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/$(lsb_release -cs)/winehq-$(lsb_release -cs).sources sudo dpkg --add-architecture i386 sudo apt-get update -y - sudo apt-get install -y --install-recommends python3-pip ninja-build winehq-stable + sudo apt-get install -y --install-recommends python3-pip ninja-build winehq-stable binutils-arm-none-eabi pip install --user meson pyelftools - name: Checkout Repo diff --git a/INSTALL.md b/INSTALL.md index 2bf4594a39..415498d18d 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -31,7 +31,7 @@ You now have the choice between two different environments to use to build the p 3. Reopen an MSYS terminal (pink icon) and enter the following command to install the necessary packages: ``` - pacman -S git meson gcc + pacman -S git meson gcc arm-none-eabi-binutils ``` Press 'Y' when prompted to confirm the installation. @@ -74,7 +74,7 @@ You now have the choice between two different environments to use to build the p 7. Certain packages are required to build the repository. Install these packages by running the following command: ```bash - sudo apt install git build-essential + sudo apt install git build-essential binutils-arm-none-eabi ``` We are not done yet, the 'meson' package is also necessary, but the version provided by apt is too outdated. To get the most recent meson version, run: @@ -108,7 +108,7 @@ These can be installed using Homebrew; if you do not have Homebrew installed, re ``` brew update -brew install meson +brew install meson arm-none-eabi-binutils brew install --cask wine-stable ``` @@ -119,6 +119,7 @@ Building the ROM requires the following packages. If you cannot find one or more * git * meson (>= 1.2.0) * build-essentials (build-essential on Ubuntu) +* binutils-arm-none-eabi (arm-none-eabi-binutils on Arch Linux) * wine (to run the mwcc executables) * pkg-config diff --git a/meson.build b/meson.build index e85e4e2e06..261d1c2a2c 100644 --- a/meson.build +++ b/meson.build @@ -122,15 +122,15 @@ subdir('lib') ############################################################ -### FILE SYSTEM ### +### CONSTS ### ############################################################ -subdir('res') +subdir('consts') ############################################################ -### CONSTS ### +### FILE SYSTEM ### ############################################################ -subdir('consts') +subdir('res') ############################################################ diff --git a/platinum.us/rom.rsf b/platinum.us/rom.rsf index 4bde268144..1490b83ea6 100644 --- a/platinum.us/rom.rsf +++ b/platinum.us/rom.rsf @@ -242,9 +242,15 @@ RomSpec File battle/graphic/vs_demo_gra.narc File wazaeffect/we.arc File wazaeffect/we_sub.narc - File battle/skill/be_seq.narc - File battle/skill/sub_seq.narc - File battle/skill/waza_seq.narc + + Root /battle/skill + HostRoot res/battle/scripts + File be_seq.narc + File sub_seq.narc + File waza_seq.narc + + Root / + HostRoot res/prebuilt File wazaeffect/effectclact/wecell.narc File wazaeffect/effectclact/wecellanm.narc File wazaeffect/effectclact/wechar.narc diff --git a/res/battle/meson.build b/res/battle/meson.build index e2069e776a..0ca6e6ca42 100644 --- a/res/battle/meson.build +++ b/res/battle/meson.build @@ -1 +1,2 @@ -subdir('moves') \ No newline at end of file +subdir('moves') +subdir('scripts') diff --git a/res/battle/scripts/effects/meson.build b/res/battle/scripts/effects/meson.build new file mode 100644 index 0000000000..6e30727f48 --- /dev/null +++ b/res/battle/scripts/effects/meson.build @@ -0,0 +1,279 @@ +effect_script_files = files( + 'effect_script_0000.s', + 'effect_script_0001.s', + 'effect_script_0002.s', + 'effect_script_0003.s', + 'effect_script_0004.s', + 'effect_script_0005.s', + 'effect_script_0006.s', + 'effect_script_0007.s', + 'effect_script_0008.s', + 'effect_script_0009.s', + 'effect_script_0010.s', + 'effect_script_0011.s', + 'effect_script_0012.s', + 'effect_script_0013.s', + 'effect_script_0014.s', + 'effect_script_0015.s', + 'effect_script_0016.s', + 'effect_script_0017.s', + 'effect_script_0018.s', + 'effect_script_0019.s', + 'effect_script_0020.s', + 'effect_script_0021.s', + 'effect_script_0022.s', + 'effect_script_0023.s', + 'effect_script_0024.s', + 'effect_script_0025.s', + 'effect_script_0026.s', + 'effect_script_0027.s', + 'effect_script_0028.s', + 'effect_script_0029.s', + 'effect_script_0030.s', + 'effect_script_0031.s', + 'effect_script_0032.s', + 'effect_script_0033.s', + 'effect_script_0034.s', + 'effect_script_0035.s', + 'effect_script_0036.s', + 'effect_script_0037.s', + 'effect_script_0038.s', + 'effect_script_0039.s', + 'effect_script_0040.s', + 'effect_script_0041.s', + 'effect_script_0042.s', + 'effect_script_0043.s', + 'effect_script_0044.s', + 'effect_script_0045.s', + 'effect_script_0046.s', + 'effect_script_0047.s', + 'effect_script_0048.s', + 'effect_script_0049.s', + 'effect_script_0050.s', + 'effect_script_0051.s', + 'effect_script_0052.s', + 'effect_script_0053.s', + 'effect_script_0054.s', + 'effect_script_0055.s', + 'effect_script_0056.s', + 'effect_script_0057.s', + 'effect_script_0058.s', + 'effect_script_0059.s', + 'effect_script_0060.s', + 'effect_script_0061.s', + 'effect_script_0062.s', + 'effect_script_0063.s', + 'effect_script_0064.s', + 'effect_script_0065.s', + 'effect_script_0066.s', + 'effect_script_0067.s', + 'effect_script_0068.s', + 'effect_script_0069.s', + 'effect_script_0070.s', + 'effect_script_0071.s', + 'effect_script_0072.s', + 'effect_script_0073.s', + 'effect_script_0074.s', + 'effect_script_0075.s', + 'effect_script_0076.s', + 'effect_script_0077.s', + 'effect_script_0078.s', + 'effect_script_0079.s', + 'effect_script_0080.s', + 'effect_script_0081.s', + 'effect_script_0082.s', + 'effect_script_0083.s', + 'effect_script_0084.s', + 'effect_script_0085.s', + 'effect_script_0086.s', + 'effect_script_0087.s', + 'effect_script_0088.s', + 'effect_script_0089.s', + 'effect_script_0090.s', + 'effect_script_0091.s', + 'effect_script_0092.s', + 'effect_script_0093.s', + 'effect_script_0094.s', + 'effect_script_0095.s', + 'effect_script_0096.s', + 'effect_script_0097.s', + 'effect_script_0098.s', + 'effect_script_0099.s', + 'effect_script_0100.s', + 'effect_script_0101.s', + 'effect_script_0102.s', + 'effect_script_0103.s', + 'effect_script_0104.s', + 'effect_script_0105.s', + 'effect_script_0106.s', + 'effect_script_0107.s', + 'effect_script_0108.s', + 'effect_script_0109.s', + 'effect_script_0110.s', + 'effect_script_0111.s', + 'effect_script_0112.s', + 'effect_script_0113.s', + 'effect_script_0114.s', + 'effect_script_0115.s', + 'effect_script_0116.s', + 'effect_script_0117.s', + 'effect_script_0118.s', + 'effect_script_0119.s', + 'effect_script_0120.s', + 'effect_script_0121.s', + 'effect_script_0122.s', + 'effect_script_0123.s', + 'effect_script_0124.s', + 'effect_script_0125.s', + 'effect_script_0126.s', + 'effect_script_0127.s', + 'effect_script_0128.s', + 'effect_script_0129.s', + 'effect_script_0130.s', + 'effect_script_0131.s', + 'effect_script_0132.s', + 'effect_script_0133.s', + 'effect_script_0134.s', + 'effect_script_0135.s', + 'effect_script_0136.s', + 'effect_script_0137.s', + 'effect_script_0138.s', + 'effect_script_0139.s', + 'effect_script_0140.s', + 'effect_script_0141.s', + 'effect_script_0142.s', + 'effect_script_0143.s', + 'effect_script_0144.s', + 'effect_script_0145.s', + 'effect_script_0146.s', + 'effect_script_0147.s', + 'effect_script_0148.s', + 'effect_script_0149.s', + 'effect_script_0150.s', + 'effect_script_0151.s', + 'effect_script_0152.s', + 'effect_script_0153.s', + 'effect_script_0154.s', + 'effect_script_0155.s', + 'effect_script_0156.s', + 'effect_script_0157.s', + 'effect_script_0158.s', + 'effect_script_0159.s', + 'effect_script_0160.s', + 'effect_script_0161.s', + 'effect_script_0162.s', + 'effect_script_0163.s', + 'effect_script_0164.s', + 'effect_script_0165.s', + 'effect_script_0166.s', + 'effect_script_0167.s', + 'effect_script_0168.s', + 'effect_script_0169.s', + 'effect_script_0170.s', + 'effect_script_0171.s', + 'effect_script_0172.s', + 'effect_script_0173.s', + 'effect_script_0174.s', + 'effect_script_0175.s', + 'effect_script_0176.s', + 'effect_script_0177.s', + 'effect_script_0178.s', + 'effect_script_0179.s', + 'effect_script_0180.s', + 'effect_script_0181.s', + 'effect_script_0182.s', + 'effect_script_0183.s', + 'effect_script_0184.s', + 'effect_script_0185.s', + 'effect_script_0186.s', + 'effect_script_0187.s', + 'effect_script_0188.s', + 'effect_script_0189.s', + 'effect_script_0190.s', + 'effect_script_0191.s', + 'effect_script_0192.s', + 'effect_script_0193.s', + 'effect_script_0194.s', + 'effect_script_0195.s', + 'effect_script_0196.s', + 'effect_script_0197.s', + 'effect_script_0198.s', + 'effect_script_0199.s', + 'effect_script_0200.s', + 'effect_script_0201.s', + 'effect_script_0202.s', + 'effect_script_0203.s', + 'effect_script_0204.s', + 'effect_script_0205.s', + 'effect_script_0206.s', + 'effect_script_0207.s', + 'effect_script_0208.s', + 'effect_script_0209.s', + 'effect_script_0210.s', + 'effect_script_0211.s', + 'effect_script_0212.s', + 'effect_script_0213.s', + 'effect_script_0214.s', + 'effect_script_0215.s', + 'effect_script_0216.s', + 'effect_script_0217.s', + 'effect_script_0218.s', + 'effect_script_0219.s', + 'effect_script_0220.s', + 'effect_script_0221.s', + 'effect_script_0222.s', + 'effect_script_0223.s', + 'effect_script_0224.s', + 'effect_script_0225.s', + 'effect_script_0226.s', + 'effect_script_0227.s', + 'effect_script_0228.s', + 'effect_script_0229.s', + 'effect_script_0230.s', + 'effect_script_0231.s', + 'effect_script_0232.s', + 'effect_script_0233.s', + 'effect_script_0234.s', + 'effect_script_0235.s', + 'effect_script_0236.s', + 'effect_script_0237.s', + 'effect_script_0238.s', + 'effect_script_0239.s', + 'effect_script_0240.s', + 'effect_script_0241.s', + 'effect_script_0242.s', + 'effect_script_0243.s', + 'effect_script_0244.s', + 'effect_script_0245.s', + 'effect_script_0246.s', + 'effect_script_0247.s', + 'effect_script_0248.s', + 'effect_script_0249.s', + 'effect_script_0250.s', + 'effect_script_0251.s', + 'effect_script_0252.s', + 'effect_script_0253.s', + 'effect_script_0254.s', + 'effect_script_0255.s', + 'effect_script_0256.s', + 'effect_script_0257.s', + 'effect_script_0258.s', + 'effect_script_0259.s', + 'effect_script_0260.s', + 'effect_script_0261.s', + 'effect_script_0262.s', + 'effect_script_0263.s', + 'effect_script_0264.s', + 'effect_script_0265.s', + 'effect_script_0266.s', + 'effect_script_0267.s', + 'effect_script_0268.s', + 'effect_script_0269.s', + 'effect_script_0270.s', + 'effect_script_0271.s', + 'effect_script_0272.s', + 'effect_script_0273.s', + 'effect_script_0274.s', + 'effect_script_0275.s', + 'effect_script_0276.s' +) diff --git a/res/battle/scripts/meson.build b/res/battle/scripts/meson.build new file mode 100644 index 0000000000..f1150cf9b6 --- /dev/null +++ b/res/battle/scripts/meson.build @@ -0,0 +1,72 @@ +subdir('effects') +subdir('moves') +subdir('subscripts') + +s_to_bin_gen = generator(make_script_bin_sh, + arguments: [ + '--mwrap', + '-i', meson.project_source_root() / 'include', + '-i', meson.project_source_root() / 'asm', + '-i', meson.project_build_root() / 'res' / 'text', + '-i', meson.project_build_root(), + '--assembler', mwrap_exe.full_path(), + '--objcopy', arm_none_eabi_objcopy_exe.full_path(), + '@EXTRA_ARGS@', + '@INPUT@', + ], + depends: [ + pl_msg_narc # for GMM headers + ], + output: '@BASENAME@' + '.bin' +) + +be_seq_target_name = 'be_seq.narc' +sub_seq_target_name = 'sub_seq.narc' +waza_seq_target_name = 'waza_seq.narc' + +be_seq_private_dir = meson.current_build_dir() / be_seq_target_name + '.p' +sub_seq_private_dir = meson.current_build_dir() / sub_seq_target_name + '.p' +waza_seq_private_dir = meson.current_build_dir() / waza_seq_target_name + '.p' + +be_seq_narc = custom_target(be_seq_target_name, + output: be_seq_target_name, + input: s_to_bin_gen.process( + effect_script_files, + extra_args: ['--out-dir', be_seq_private_dir] + ), + command: [ + knarc_exe, + '-d', '@PRIVATE_DIR@', + '-p', '@OUTPUT@' + ] +) + +sub_seq_narc = custom_target(sub_seq_target_name, + output: sub_seq_target_name, + input: s_to_bin_gen.process( + subscript_files, + extra_args: ['--out-dir', sub_seq_private_dir] + ), + command: [ + knarc_exe, + '-d', '@PRIVATE_DIR@', + '-p', '@OUTPUT@' + ] +) + +waza_seq_narc = custom_target(waza_seq_target_name, + output: waza_seq_target_name, + input: s_to_bin_gen.process( + move_script_files, + extra_args: ['--out-dir', waza_seq_private_dir] + ), + command: [ + knarc_exe, + '-d', '@PRIVATE_DIR@', + '-p', '@OUTPUT@' + ] +) + +nitrofs_files += be_seq_narc +nitrofs_files += sub_seq_narc +nitrofs_files += waza_seq_narc diff --git a/res/battle/scripts/moves/meson.build b/res/battle/scripts/moves/meson.build new file mode 100644 index 0000000000..6e0076bac8 --- /dev/null +++ b/res/battle/scripts/moves/meson.build @@ -0,0 +1,503 @@ +move_script_files = files( + 'move_script_0000.s', + 'move_script_0001.s', + 'move_script_0002.s', + 'move_script_0003.s', + 'move_script_0004.s', + 'move_script_0005.s', + 'move_script_0006.s', + 'move_script_0007.s', + 'move_script_0008.s', + 'move_script_0009.s', + 'move_script_0010.s', + 'move_script_0011.s', + 'move_script_0012.s', + 'move_script_0013.s', + 'move_script_0014.s', + 'move_script_0015.s', + 'move_script_0016.s', + 'move_script_0017.s', + 'move_script_0018.s', + 'move_script_0019.s', + 'move_script_0020.s', + 'move_script_0021.s', + 'move_script_0022.s', + 'move_script_0023.s', + 'move_script_0024.s', + 'move_script_0025.s', + 'move_script_0026.s', + 'move_script_0027.s', + 'move_script_0028.s', + 'move_script_0029.s', + 'move_script_0030.s', + 'move_script_0031.s', + 'move_script_0032.s', + 'move_script_0033.s', + 'move_script_0034.s', + 'move_script_0035.s', + 'move_script_0036.s', + 'move_script_0037.s', + 'move_script_0038.s', + 'move_script_0039.s', + 'move_script_0040.s', + 'move_script_0041.s', + 'move_script_0042.s', + 'move_script_0043.s', + 'move_script_0044.s', + 'move_script_0045.s', + 'move_script_0046.s', + 'move_script_0047.s', + 'move_script_0048.s', + 'move_script_0049.s', + 'move_script_0050.s', + 'move_script_0051.s', + 'move_script_0052.s', + 'move_script_0053.s', + 'move_script_0054.s', + 'move_script_0055.s', + 'move_script_0056.s', + 'move_script_0057.s', + 'move_script_0058.s', + 'move_script_0059.s', + 'move_script_0060.s', + 'move_script_0061.s', + 'move_script_0062.s', + 'move_script_0063.s', + 'move_script_0064.s', + 'move_script_0065.s', + 'move_script_0066.s', + 'move_script_0067.s', + 'move_script_0068.s', + 'move_script_0069.s', + 'move_script_0070.s', + 'move_script_0071.s', + 'move_script_0072.s', + 'move_script_0073.s', + 'move_script_0074.s', + 'move_script_0075.s', + 'move_script_0076.s', + 'move_script_0077.s', + 'move_script_0078.s', + 'move_script_0079.s', + 'move_script_0080.s', + 'move_script_0081.s', + 'move_script_0082.s', + 'move_script_0083.s', + 'move_script_0084.s', + 'move_script_0085.s', + 'move_script_0086.s', + 'move_script_0087.s', + 'move_script_0088.s', + 'move_script_0089.s', + 'move_script_0090.s', + 'move_script_0091.s', + 'move_script_0092.s', + 'move_script_0093.s', + 'move_script_0094.s', + 'move_script_0095.s', + 'move_script_0096.s', + 'move_script_0097.s', + 'move_script_0098.s', + 'move_script_0099.s', + 'move_script_0100.s', + 'move_script_0101.s', + 'move_script_0102.s', + 'move_script_0103.s', + 'move_script_0104.s', + 'move_script_0105.s', + 'move_script_0106.s', + 'move_script_0107.s', + 'move_script_0108.s', + 'move_script_0109.s', + 'move_script_0110.s', + 'move_script_0111.s', + 'move_script_0112.s', + 'move_script_0113.s', + 'move_script_0114.s', + 'move_script_0115.s', + 'move_script_0116.s', + 'move_script_0117.s', + 'move_script_0118.s', + 'move_script_0119.s', + 'move_script_0120.s', + 'move_script_0121.s', + 'move_script_0122.s', + 'move_script_0123.s', + 'move_script_0124.s', + 'move_script_0125.s', + 'move_script_0126.s', + 'move_script_0127.s', + 'move_script_0128.s', + 'move_script_0129.s', + 'move_script_0130.s', + 'move_script_0131.s', + 'move_script_0132.s', + 'move_script_0133.s', + 'move_script_0134.s', + 'move_script_0135.s', + 'move_script_0136.s', + 'move_script_0137.s', + 'move_script_0138.s', + 'move_script_0139.s', + 'move_script_0140.s', + 'move_script_0141.s', + 'move_script_0142.s', + 'move_script_0143.s', + 'move_script_0144.s', + 'move_script_0145.s', + 'move_script_0146.s', + 'move_script_0147.s', + 'move_script_0148.s', + 'move_script_0149.s', + 'move_script_0150.s', + 'move_script_0151.s', + 'move_script_0152.s', + 'move_script_0153.s', + 'move_script_0154.s', + 'move_script_0155.s', + 'move_script_0156.s', + 'move_script_0157.s', + 'move_script_0158.s', + 'move_script_0159.s', + 'move_script_0160.s', + 'move_script_0161.s', + 'move_script_0162.s', + 'move_script_0163.s', + 'move_script_0164.s', + 'move_script_0165.s', + 'move_script_0166.s', + 'move_script_0167.s', + 'move_script_0168.s', + 'move_script_0169.s', + 'move_script_0170.s', + 'move_script_0171.s', + 'move_script_0172.s', + 'move_script_0173.s', + 'move_script_0174.s', + 'move_script_0175.s', + 'move_script_0176.s', + 'move_script_0177.s', + 'move_script_0178.s', + 'move_script_0179.s', + 'move_script_0180.s', + 'move_script_0181.s', + 'move_script_0182.s', + 'move_script_0183.s', + 'move_script_0184.s', + 'move_script_0185.s', + 'move_script_0186.s', + 'move_script_0187.s', + 'move_script_0188.s', + 'move_script_0189.s', + 'move_script_0190.s', + 'move_script_0191.s', + 'move_script_0192.s', + 'move_script_0193.s', + 'move_script_0194.s', + 'move_script_0195.s', + 'move_script_0196.s', + 'move_script_0197.s', + 'move_script_0198.s', + 'move_script_0199.s', + 'move_script_0200.s', + 'move_script_0201.s', + 'move_script_0202.s', + 'move_script_0203.s', + 'move_script_0204.s', + 'move_script_0205.s', + 'move_script_0206.s', + 'move_script_0207.s', + 'move_script_0208.s', + 'move_script_0209.s', + 'move_script_0210.s', + 'move_script_0211.s', + 'move_script_0212.s', + 'move_script_0213.s', + 'move_script_0214.s', + 'move_script_0215.s', + 'move_script_0216.s', + 'move_script_0217.s', + 'move_script_0218.s', + 'move_script_0219.s', + 'move_script_0220.s', + 'move_script_0221.s', + 'move_script_0222.s', + 'move_script_0223.s', + 'move_script_0224.s', + 'move_script_0225.s', + 'move_script_0226.s', + 'move_script_0227.s', + 'move_script_0228.s', + 'move_script_0229.s', + 'move_script_0230.s', + 'move_script_0231.s', + 'move_script_0232.s', + 'move_script_0233.s', + 'move_script_0234.s', + 'move_script_0235.s', + 'move_script_0236.s', + 'move_script_0237.s', + 'move_script_0238.s', + 'move_script_0239.s', + 'move_script_0240.s', + 'move_script_0241.s', + 'move_script_0242.s', + 'move_script_0243.s', + 'move_script_0244.s', + 'move_script_0245.s', + 'move_script_0246.s', + 'move_script_0247.s', + 'move_script_0248.s', + 'move_script_0249.s', + 'move_script_0250.s', + 'move_script_0251.s', + 'move_script_0252.s', + 'move_script_0253.s', + 'move_script_0254.s', + 'move_script_0255.s', + 'move_script_0256.s', + 'move_script_0257.s', + 'move_script_0258.s', + 'move_script_0259.s', + 'move_script_0260.s', + 'move_script_0261.s', + 'move_script_0262.s', + 'move_script_0263.s', + 'move_script_0264.s', + 'move_script_0265.s', + 'move_script_0266.s', + 'move_script_0267.s', + 'move_script_0268.s', + 'move_script_0269.s', + 'move_script_0270.s', + 'move_script_0271.s', + 'move_script_0272.s', + 'move_script_0273.s', + 'move_script_0274.s', + 'move_script_0275.s', + 'move_script_0276.s', + 'move_script_0277.s', + 'move_script_0278.s', + 'move_script_0279.s', + 'move_script_0280.s', + 'move_script_0281.s', + 'move_script_0282.s', + 'move_script_0283.s', + 'move_script_0284.s', + 'move_script_0285.s', + 'move_script_0286.s', + 'move_script_0287.s', + 'move_script_0288.s', + 'move_script_0289.s', + 'move_script_0290.s', + 'move_script_0291.s', + 'move_script_0292.s', + 'move_script_0293.s', + 'move_script_0294.s', + 'move_script_0295.s', + 'move_script_0296.s', + 'move_script_0297.s', + 'move_script_0298.s', + 'move_script_0299.s', + 'move_script_0300.s', + 'move_script_0301.s', + 'move_script_0302.s', + 'move_script_0303.s', + 'move_script_0304.s', + 'move_script_0305.s', + 'move_script_0306.s', + 'move_script_0307.s', + 'move_script_0308.s', + 'move_script_0309.s', + 'move_script_0310.s', + 'move_script_0311.s', + 'move_script_0312.s', + 'move_script_0313.s', + 'move_script_0314.s', + 'move_script_0315.s', + 'move_script_0316.s', + 'move_script_0317.s', + 'move_script_0318.s', + 'move_script_0319.s', + 'move_script_0320.s', + 'move_script_0321.s', + 'move_script_0322.s', + 'move_script_0323.s', + 'move_script_0324.s', + 'move_script_0325.s', + 'move_script_0326.s', + 'move_script_0327.s', + 'move_script_0328.s', + 'move_script_0329.s', + 'move_script_0330.s', + 'move_script_0331.s', + 'move_script_0332.s', + 'move_script_0333.s', + 'move_script_0334.s', + 'move_script_0335.s', + 'move_script_0336.s', + 'move_script_0337.s', + 'move_script_0338.s', + 'move_script_0339.s', + 'move_script_0340.s', + 'move_script_0341.s', + 'move_script_0342.s', + 'move_script_0343.s', + 'move_script_0344.s', + 'move_script_0345.s', + 'move_script_0346.s', + 'move_script_0347.s', + 'move_script_0348.s', + 'move_script_0349.s', + 'move_script_0350.s', + 'move_script_0351.s', + 'move_script_0352.s', + 'move_script_0353.s', + 'move_script_0354.s', + 'move_script_0355.s', + 'move_script_0356.s', + 'move_script_0357.s', + 'move_script_0358.s', + 'move_script_0359.s', + 'move_script_0360.s', + 'move_script_0361.s', + 'move_script_0362.s', + 'move_script_0363.s', + 'move_script_0364.s', + 'move_script_0365.s', + 'move_script_0366.s', + 'move_script_0367.s', + 'move_script_0368.s', + 'move_script_0369.s', + 'move_script_0370.s', + 'move_script_0371.s', + 'move_script_0372.s', + 'move_script_0373.s', + 'move_script_0374.s', + 'move_script_0375.s', + 'move_script_0376.s', + 'move_script_0377.s', + 'move_script_0378.s', + 'move_script_0379.s', + 'move_script_0380.s', + 'move_script_0381.s', + 'move_script_0382.s', + 'move_script_0383.s', + 'move_script_0384.s', + 'move_script_0385.s', + 'move_script_0386.s', + 'move_script_0387.s', + 'move_script_0388.s', + 'move_script_0389.s', + 'move_script_0390.s', + 'move_script_0391.s', + 'move_script_0392.s', + 'move_script_0393.s', + 'move_script_0394.s', + 'move_script_0395.s', + 'move_script_0396.s', + 'move_script_0397.s', + 'move_script_0398.s', + 'move_script_0399.s', + 'move_script_0400.s', + 'move_script_0401.s', + 'move_script_0402.s', + 'move_script_0403.s', + 'move_script_0404.s', + 'move_script_0405.s', + 'move_script_0406.s', + 'move_script_0407.s', + 'move_script_0408.s', + 'move_script_0409.s', + 'move_script_0410.s', + 'move_script_0411.s', + 'move_script_0412.s', + 'move_script_0413.s', + 'move_script_0414.s', + 'move_script_0415.s', + 'move_script_0416.s', + 'move_script_0417.s', + 'move_script_0418.s', + 'move_script_0419.s', + 'move_script_0420.s', + 'move_script_0421.s', + 'move_script_0422.s', + 'move_script_0423.s', + 'move_script_0424.s', + 'move_script_0425.s', + 'move_script_0426.s', + 'move_script_0427.s', + 'move_script_0428.s', + 'move_script_0429.s', + 'move_script_0430.s', + 'move_script_0431.s', + 'move_script_0432.s', + 'move_script_0433.s', + 'move_script_0434.s', + 'move_script_0435.s', + 'move_script_0436.s', + 'move_script_0437.s', + 'move_script_0438.s', + 'move_script_0439.s', + 'move_script_0440.s', + 'move_script_0441.s', + 'move_script_0442.s', + 'move_script_0443.s', + 'move_script_0444.s', + 'move_script_0445.s', + 'move_script_0446.s', + 'move_script_0447.s', + 'move_script_0448.s', + 'move_script_0449.s', + 'move_script_0450.s', + 'move_script_0451.s', + 'move_script_0452.s', + 'move_script_0453.s', + 'move_script_0454.s', + 'move_script_0455.s', + 'move_script_0456.s', + 'move_script_0457.s', + 'move_script_0458.s', + 'move_script_0459.s', + 'move_script_0460.s', + 'move_script_0461.s', + 'move_script_0462.s', + 'move_script_0463.s', + 'move_script_0464.s', + 'move_script_0465.s', + 'move_script_0466.s', + 'move_script_0467.s', + 'move_script_0468.s', + 'move_script_0469.s', + 'move_script_0470.s', + 'move_script_0471.s', + 'move_script_0472.s', + 'move_script_0473.s', + 'move_script_0474.s', + 'move_script_0475.s', + 'move_script_0476.s', + 'move_script_0477.s', + 'move_script_0478.s', + 'move_script_0479.s', + 'move_script_0480.s', + 'move_script_0481.s', + 'move_script_0482.s', + 'move_script_0483.s', + 'move_script_0484.s', + 'move_script_0485.s', + 'move_script_0486.s', + 'move_script_0487.s', + 'move_script_0488.s', + 'move_script_0489.s', + 'move_script_0490.s', + 'move_script_0491.s', + 'move_script_0492.s', + 'move_script_0493.s', + 'move_script_0494.s', + 'move_script_0495.s', + 'move_script_0496.s', + 'move_script_0497.s', + 'move_script_0498.s', + 'move_script_0499.s', + 'move_script_0500.s' +) diff --git a/res/battle/scripts/subscripts/meson.build b/res/battle/scripts/subscripts/meson.build new file mode 100644 index 0000000000..e1e65d6484 --- /dev/null +++ b/res/battle/scripts/subscripts/meson.build @@ -0,0 +1,299 @@ +subscript_files = files( + 'subscript_0000.s', + 'subscript_0001.s', + 'subscript_0002.s', + 'subscript_0003.s', + 'subscript_0004.s', + 'subscript_0005.s', + 'subscript_0006.s', + 'subscript_0007.s', + 'subscript_0008.s', + 'subscript_0009.s', + 'subscript_0010.s', + 'subscript_0011.s', + 'subscript_0012.s', + 'subscript_0013.s', + 'subscript_0014.s', + 'subscript_0015.s', + 'subscript_0016.s', + 'subscript_0017.s', + 'subscript_0018.s', + 'subscript_0019.s', + 'subscript_0020.s', + 'subscript_0021.s', + 'subscript_0022.s', + 'subscript_0023.s', + 'subscript_0024.s', + 'subscript_0025.s', + 'subscript_0026.s', + 'subscript_0027.s', + 'subscript_0028.s', + 'subscript_0029.s', + 'subscript_0030.s', + 'subscript_0031.s', + 'subscript_0032.s', + 'subscript_0033.s', + 'subscript_0034.s', + 'subscript_0035.s', + 'subscript_0036.s', + 'subscript_0037.s', + 'subscript_0038.s', + 'subscript_0039.s', + 'subscript_0040.s', + 'subscript_0041.s', + 'subscript_0042.s', + 'subscript_0043.s', + 'subscript_0044.s', + 'subscript_0045.s', + 'subscript_0046.s', + 'subscript_0047.s', + 'subscript_0048.s', + 'subscript_0049.s', + 'subscript_0050.s', + 'subscript_0051.s', + 'subscript_0052.s', + 'subscript_0053.s', + 'subscript_0054.s', + 'subscript_0055.s', + 'subscript_0056.s', + 'subscript_0057.s', + 'subscript_0058.s', + 'subscript_0059.s', + 'subscript_0060.s', + 'subscript_0061.s', + 'subscript_0062.s', + 'subscript_0063.s', + 'subscript_0064.s', + 'subscript_0065.s', + 'subscript_0066.s', + 'subscript_0067.s', + 'subscript_0068.s', + 'subscript_0069.s', + 'subscript_0070.s', + 'subscript_0071.s', + 'subscript_0072.s', + 'subscript_0073.s', + 'subscript_0074.s', + 'subscript_0075.s', + 'subscript_0076.s', + 'subscript_0077.s', + 'subscript_0078.s', + 'subscript_0079.s', + 'subscript_0080.s', + 'subscript_0081.s', + 'subscript_0082.s', + 'subscript_0083.s', + 'subscript_0084.s', + 'subscript_0085.s', + 'subscript_0086.s', + 'subscript_0087.s', + 'subscript_0088.s', + 'subscript_0089.s', + 'subscript_0090.s', + 'subscript_0091.s', + 'subscript_0092.s', + 'subscript_0093.s', + 'subscript_0094.s', + 'subscript_0095.s', + 'subscript_0096.s', + 'subscript_0097.s', + 'subscript_0098.s', + 'subscript_0099.s', + 'subscript_0100.s', + 'subscript_0101.s', + 'subscript_0102.s', + 'subscript_0103.s', + 'subscript_0104.s', + 'subscript_0105.s', + 'subscript_0106.s', + 'subscript_0107.s', + 'subscript_0108.s', + 'subscript_0109.s', + 'subscript_0110.s', + 'subscript_0111.s', + 'subscript_0112.s', + 'subscript_0113.s', + 'subscript_0114.s', + 'subscript_0115.s', + 'subscript_0116.s', + 'subscript_0117.s', + 'subscript_0118.s', + 'subscript_0119.s', + 'subscript_0120.s', + 'subscript_0121.s', + 'subscript_0122.s', + 'subscript_0123.s', + 'subscript_0124.s', + 'subscript_0125.s', + 'subscript_0126.s', + 'subscript_0127.s', + 'subscript_0128.s', + 'subscript_0129.s', + 'subscript_0130.s', + 'subscript_0131.s', + 'subscript_0132.s', + 'subscript_0133.s', + 'subscript_0134.s', + 'subscript_0135.s', + 'subscript_0136.s', + 'subscript_0137.s', + 'subscript_0138.s', + 'subscript_0139.s', + 'subscript_0140.s', + 'subscript_0141.s', + 'subscript_0142.s', + 'subscript_0143.s', + 'subscript_0144.s', + 'subscript_0145.s', + 'subscript_0146.s', + 'subscript_0147.s', + 'subscript_0148.s', + 'subscript_0149.s', + 'subscript_0150.s', + 'subscript_0151.s', + 'subscript_0152.s', + 'subscript_0153.s', + 'subscript_0154.s', + 'subscript_0155.s', + 'subscript_0156.s', + 'subscript_0157.s', + 'subscript_0158.s', + 'subscript_0159.s', + 'subscript_0160.s', + 'subscript_0161.s', + 'subscript_0162.s', + 'subscript_0163.s', + 'subscript_0164.s', + 'subscript_0165.s', + 'subscript_0166.s', + 'subscript_0167.s', + 'subscript_0168.s', + 'subscript_0169.s', + 'subscript_0170.s', + 'subscript_0171.s', + 'subscript_0172.s', + 'subscript_0173.s', + 'subscript_0174.s', + 'subscript_0175.s', + 'subscript_0176.s', + 'subscript_0177.s', + 'subscript_0178.s', + 'subscript_0179.s', + 'subscript_0180.s', + 'subscript_0181.s', + 'subscript_0182.s', + 'subscript_0183.s', + 'subscript_0184.s', + 'subscript_0185.s', + 'subscript_0186.s', + 'subscript_0187.s', + 'subscript_0188.s', + 'subscript_0189.s', + 'subscript_0190.s', + 'subscript_0191.s', + 'subscript_0192.s', + 'subscript_0193.s', + 'subscript_0194.s', + 'subscript_0195.s', + 'subscript_0196.s', + 'subscript_0197.s', + 'subscript_0198.s', + 'subscript_0199.s', + 'subscript_0200.s', + 'subscript_0201.s', + 'subscript_0202.s', + 'subscript_0203.s', + 'subscript_0204.s', + 'subscript_0205.s', + 'subscript_0206.s', + 'subscript_0207.s', + 'subscript_0208.s', + 'subscript_0209.s', + 'subscript_0210.s', + 'subscript_0211.s', + 'subscript_0212.s', + 'subscript_0213.s', + 'subscript_0214.s', + 'subscript_0215.s', + 'subscript_0216.s', + 'subscript_0217.s', + 'subscript_0218.s', + 'subscript_0219.s', + 'subscript_0220.s', + 'subscript_0221.s', + 'subscript_0222.s', + 'subscript_0223.s', + 'subscript_0224.s', + 'subscript_0225.s', + 'subscript_0226.s', + 'subscript_0227.s', + 'subscript_0228.s', + 'subscript_0229.s', + 'subscript_0230.s', + 'subscript_0231.s', + 'subscript_0232.s', + 'subscript_0233.s', + 'subscript_0234.s', + 'subscript_0235.s', + 'subscript_0236.s', + 'subscript_0237.s', + 'subscript_0238.s', + 'subscript_0239.s', + 'subscript_0240.s', + 'subscript_0241.s', + 'subscript_0242.s', + 'subscript_0243.s', + 'subscript_0244.s', + 'subscript_0245.s', + 'subscript_0246.s', + 'subscript_0247.s', + 'subscript_0248.s', + 'subscript_0249.s', + 'subscript_0250.s', + 'subscript_0251.s', + 'subscript_0252.s', + 'subscript_0253.s', + 'subscript_0254.s', + 'subscript_0255.s', + 'subscript_0256.s', + 'subscript_0257.s', + 'subscript_0258.s', + 'subscript_0259.s', + 'subscript_0260.s', + 'subscript_0261.s', + 'subscript_0262.s', + 'subscript_0263.s', + 'subscript_0264.s', + 'subscript_0265.s', + 'subscript_0266.s', + 'subscript_0267.s', + 'subscript_0268.s', + 'subscript_0269.s', + 'subscript_0270.s', + 'subscript_0271.s', + 'subscript_0272.s', + 'subscript_0273.s', + 'subscript_0274.s', + 'subscript_0275.s', + 'subscript_0276.s', + 'subscript_0277.s', + 'subscript_0278.s', + 'subscript_0279.s', + 'subscript_0280.s', + 'subscript_0281.s', + 'subscript_0282.s', + 'subscript_0283.s', + 'subscript_0284.s', + 'subscript_0285.s', + 'subscript_0286.s', + 'subscript_0287.s', + 'subscript_0288.s', + 'subscript_0289.s', + 'subscript_0290.s', + 'subscript_0291.s', + 'subscript_0292.s', + 'subscript_0293.s', + 'subscript_0294.s', + 'subscript_0295.s', + 'subscript_0296.s', +) diff --git a/res/meson.build b/res/meson.build index 1fc183859d..1ebb229dc3 100644 --- a/res/meson.build +++ b/res/meson.build @@ -4,9 +4,10 @@ nitrofs_files = [] subdir('prebuilt') # Decompiled data directories +subdir('text') # must be listed first for GMM header targets + subdir('battle') subdir('field') subdir('items') subdir('pokemon') -subdir('text') subdir('trainers') diff --git a/res/prebuilt/battle/meson.build b/res/prebuilt/battle/meson.build index 916dad36fc..8f917f1da0 100644 --- a/res/prebuilt/battle/meson.build +++ b/res/prebuilt/battle/meson.build @@ -2,5 +2,4 @@ subdir('b_pl_stage') subdir('b_pl_tower') subdir('b_tower') subdir('graphic') -subdir('skill') subdir('tr_ai') \ No newline at end of file diff --git a/res/prebuilt/battle/skill/be_seq.narc b/res/prebuilt/battle/skill/be_seq.narc deleted file mode 100644 index d521c458a04a71ff556e66de6b014f86838a5edb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16940 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 diff --git a/res/prebuilt/battle/skill/meson.build b/res/prebuilt/battle/skill/meson.build deleted file mode 100644 index f05ff3b453..0000000000 --- a/res/prebuilt/battle/skill/meson.build +++ /dev/null @@ -1,10 +0,0 @@ -prebuilt_files = [ - 'be_seq.narc', - 'sub_seq.narc', - 'waza_seq.narc' -] - -foreach f : prebuilt_files - nitrofs_files += fs.copyfile(f) -endforeach - diff --git a/res/prebuilt/battle/skill/sub_seq.narc b/res/prebuilt/battle/skill/sub_seq.narc deleted file mode 100644 index d892462fe4f5883b127a1f7a46b53b712689d81c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53196 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 diff --git a/res/prebuilt/battle/skill/waza_seq.narc b/res/prebuilt/battle/skill/waza_seq.narc deleted file mode 100644 index c584298cc2b51334f4e8e01045cb68b4f44a11a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6416 zcmeI$Axxy{0f+I~cG^yxNjhSh%q1g6j2JOu1cEdO?v8A^WV)R+BM=A#0)apv5C{YU zfj}S-2m}IwKp+qZk|GcYk|P%`A$O#q$s|RPhD#8WUY}?8-(Vw9-LQK70vjjA3Es%EsP+R>pJiBYPt7^j+uNvdx2sQNKQ zH61flvoS|C9}85Au|%~V8&sRIMYSC}RJ(CRbsQ&Dr*TGg9v4)XF`&AOd#Zc zMW1Rarm1FPmTE5MsTN|9YAKefR$`TEE!L?vVv}kswyAbvmufHesSe_h>L`w>PU4j6 zEY7Je;*#nruBmR~mTC}pRQK^f^%z5{*S|c9BuZ4}s8Cg-MpcgnRWn*t?dVXA#3GJLp2hkRAVttH4&3k z-RM#EV~T1zW~gRkj%q#@s1{?1YB^S@R%4B7J9emcV~=V-4yX>}i0U{_s7~XI>O3x} zF5`;oI&P?LV?cEm_f!w@NHvVYFWFxdqeNAX3RN{~RP|_3HKRqfax@iY4|Rr6^NXqDobZI#nZ@RIO-Jbz+2SG{&gLV}fcjx>UXB zQ%%J*)lAG%&BZ*`LM&1(#WK}KY*KB-Hq}8KQXR!H)k&OEoy9rTMO;!{#WmGU+)@qV zj_N)hs2*cTRrvKAMXFMisVY&Wszsfu5lyOAw5d8VLOqVR`5e)e*V z=bQZPxqinvpTmE8^U>$Op6|G?-x=p~e+QR-^8EK%m-G2K`Nx{?eXjXqjB(vxyyrb| z>_0Nrd;Zk*9sk#i|GxcsYM%e)_+Plb*Y@!WPtE0;zr}a$qsP9)Q?Ix0yM}Z4e=zSe z$J=Y~a?acHzJ2UZ?;Lx3+)sc0&-?Zv?uUDN#f$9SJ@xtL{JeaKwLN!E*ZeoU`@KAO zo)0{<~gJ N9{+ug|3B^XzX01wOTqvE diff --git a/tools/meson.build b/tools/meson.build index 5444fa698a..55f88ea798 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -8,10 +8,14 @@ subdir('postconf') subdir('scripts') # Prebuilt tools +mwrap_exe = find_program('cw/mwrap', native: true) makebanner_exe = find_program('makebanner', native: true) makelcf_exe = find_program('makelcf', native: true) makerom_exe = find_program('makerom', native: true) +# ARM binutils +arm_none_eabi_objcopy_exe = find_program('arm-none-eabi-objcopy', native: true) + # External tools nitrogfx_exe = find_program('nitrogfx', native: true, required: false) if not nitrogfx_exe.found() diff --git a/tools/scripts/make_script_bin.sh b/tools/scripts/make_script_bin.sh new file mode 100644 index 0000000000..f854ec1ea1 --- /dev/null +++ b/tools/scripts/make_script_bin.sh @@ -0,0 +1,76 @@ +#!/usr/bin/env bash + +help() { + echo "Syntax: ./make_script_bin.sh [OPTIONS] FILE..." + echo "options:" + echo " -h | --help print this help message and exit" + echo " -i | --include append an include directory for the assembler" + echo " -a | --assembler path to the assembler executable" + echo " -o | --objcopy path to the objcopy executable for data extraction" + echo " -d | --out-dir directory for output files (default: current directory)" + echo " -m | --mwrap if set, will treat the assembler as mwrap" +} + +INCLUDE_ARGS=() +SCRIPT_FILES=() +AS="" +OBJCOPY="arm-none-eabi-objcopy" +MWRAP=false +OUTDIR="." + +while [[ $# -gt 0 ]] ; do + case $1 in + -h|--help) + help + exit 0 + ;; + -i|--include) + INCLUDE_ARGS+=("-i" "$2") + shift + shift + ;; + -a|--assembler) + AS="$2" + shift + shift + ;; + -o|--objcopy) + OBJCOPY="$2" + shift + shift + ;; + -d|--out-dir) + OUTDIR="$2" + shift + shift + ;; + -m|--mwrap) + MWRAP=true + shift + ;; + *) + SCRIPT_FILES+=("$1") + shift + ;; + esac +done + +MWRAP_ARG="" +if $MWRAP ; then + MWRAP_ARG=" mwasmarm" +fi + +for script_file in "${SCRIPT_FILES[@]}" ; do + script_dir=${script_file%/*} + script_fname=${script_file##*/} + script_noext=${script_fname%.*} + + # Target output files + script_obj="$OUTDIR/$script_noext.o" + script_bin="$OUTDIR/$script_noext.bin" + + # Convert + clean-up + $AS$MWRAP_ARG ${INCLUDE_ARGS[@]} -gccinc -o $script_obj $script_file + $OBJCOPY -O binary --file-alignment 4 $script_obj $script_bin + rm $script_obj +done diff --git a/tools/scripts/meson.build b/tools/scripts/meson.build index 82f1068a05..f9a7df73a1 100644 --- a/tools/scripts/meson.build +++ b/tools/scripts/meson.build @@ -2,3 +2,4 @@ make_pl_poke_icon_py = find_program('make_pl_poke_icon.py', native: true) make_pl_pokegra_py = find_program('make_pl_pokegra.py', native: true) make_pl_otherpoke_py = find_program('make_pl_otherpoke.py', native: true) make_height_py = find_program('make_height.py', native: true) +make_script_bin_sh = find_program('make_script_bin.sh', native: true)