From e1d79d232721cc5da91b1f1257676cc78708731a Mon Sep 17 00:00:00 2001 From: Muhammad Nauman Raza Date: Tue, 7 Jan 2025 09:28:05 +0000 Subject: [PATCH 1/2] chore: remove now-unneeded files --- CHANGELOG.md | 61 -------------------------------------------------- build_tools.sh | 8 ------- rom.sha1 | 1 - 3 files changed, 70 deletions(-) delete mode 100644 CHANGELOG.md delete mode 100755 build_tools.sh delete mode 100644 rom.sha1 diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 963e05d7bc..0000000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,61 +0,0 @@ -# Pokeemerald-Expansion Changelogs - -## 1.10.x -- **[Version 1.10.1](docs/changelogs/1.10.x/1.10.1.md) - 🧹 Bugfix Release** -- **[Version 1.10.0](docs/changelogs/1.10.x/1.10.0.md) - ✨ Feature Release** - -## 1.9.x -- **[Version 1.9.4](docs/changelogs/1.9.x/1.9.4.md) - 🧹 Bugfix Release** -- **[Version 1.9.3](docs/changelogs/1.9.x/1.9.3.md) - 🧹 Bugfix Release** -- **[Version 1.9.2](docs/changelogs/1.9.x/1.9.2.md) - 🧹 Bugfix Release** -- **[Version 1.9.1](docs/changelogs/1.9.x/1.9.1.md) - 🧹 Bugfix Release** -- **[Version 1.9.0](docs/changelogs/1.9.x/1.9.0.md) - ✨ Feature Release** - -## 1.8.x -- **[Version 1.8.6](docs/changelogs/1.8.x/1.8.6.md) - 🧹 Bugfix Release** -- **[Version 1.8.5](docs/changelogs/1.8.x/1.8.5.md) - 🧹 Bugfix Release** -- **[Version 1.8.4](docs/changelogs/1.8.x/1.8.4.md) - 🧹 Bugfix Release** -- **[Version 1.8.3](docs/changelogs/1.8.x/1.8.3.md) - 🧹 Bugfix Release** -- **[Version 1.8.2](docs/changelogs/1.8.x/1.8.2.md) - 🧹 Bugfix Release** -- **[Version 1.8.1](docs/changelogs/1.8.x/1.8.1.md) - 🔥 HOTFIX Release** -- **[Version 1.8.0](docs/changelogs/1.8.x/1.8.0.md) - ✨ Feature Release** - -## 1.7.x -- **[Version 1.7.4](docs/changelogs/1.7.x/1.7.4.md) - 🧹 Bugfix Release** -- **[Version 1.7.3](docs/changelogs/1.7.x/1.7.3.md) - 🧹 Bugfix Release** -- **[Version 1.7.2](docs/changelogs/1.7.x/1.7.2.md) - 🧹 Bugfix Release** -- **[Version 1.7.1](docs/changelogs/1.7.x/1.7.1.md) - 🧹 Bugfix Release** -- **[Version 1.7.0](docs/changelogs/1.7.x/1.7.0.md) - ✨ Feature Release** - -## 1.6.x -- **[Version 1.6.2](docs/changelogs/1.6.x/1.6.2.md) - 🧹 Bugfix Release** -- **[Version 1.6.1](docs/changelogs/1.6.x/1.6.1.md) - 🔥 HOTFIX Release** -- **[Version 1.6.0](docs/changelogs/1.6.x/1.6.0.md) - ✨ Feature Release** - -## 1.5.x -- **[Version 1.5.3](docs/changelogs/1.5.x/1.5.3.md) - 🔥 HOTFIX Release** -- **[Version 1.5.2](docs/changelogs/1.5.x/1.5.2.md) - 🧹 Bugfix Release** -- **[Version 1.5.1](docs/changelogs/1.5.x/1.5.1.md) - 🧹 Bugfix Release** -- **[Version 1.5.0](docs/changelogs/1.5.x/1.5.0.md) - ✨ Feature Release** - -## 1.4.x -- **[Version 1.4.3](docs/changelogs/1.4.x/1.4.3.md) - 🧹 Bugfix Release** -- **[Version 1.4.2](docs/changelogs/1.4.x/1.4.2.md) - 🧹 Bugfix Release** -- **[Version 1.4.1](docs/changelogs/1.4.x/1.4.1.md) - 🔥 HOTFIX Release** -- **[Version 1.4.0](docs/changelogs/1.4.x/1.4.0.md) - ✨ Feature Release** - -## 1.3.x -- **[Version 1.3.0](docs/changelogs/1.3.x/1.3.0.md) - ✨ Feature Release** - -## 1.2.x -- **[Version 1.2.0](docs/changelogs/1.2.x/1.2.0.md) - ✨ Feature Release** - -## 1.1.x -- **[Version 1.1.1](docs/changelogs/1.1.x/1.1.1.md) - 🧹 Bugfix Release** -- **[Version 1.1.0](docs/changelogs/1.1.x/1.1.0.md) - ✨ Feature Release** - -## 1.0.x -- **[Version 1.0.0](docs/changelogs/1.0.x/1.0.0.md) - ✨ Feature Release** - -## Pre-1.0.x: -- **[Version 0.9.0](docs/changelogs/0.9.x/0.9.0.md) - 🦕 Retroactive Version** diff --git a/build_tools.sh b/build_tools.sh deleted file mode 100755 index 93f6065be4..0000000000 --- a/build_tools.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -echo "This script is deprecated. Next time, run \"make tools\" instead." -for dname in tools/*; do - if [ -f ${dname}/Makefile ]; then - make -C ${dname} CXX=${1:-g++} --no-print-directory - fi -done diff --git a/rom.sha1 b/rom.sha1 deleted file mode 100644 index 048b0a3a5a..0000000000 --- a/rom.sha1 +++ /dev/null @@ -1 +0,0 @@ -f3ae088181bf583e55daf962a92bb46f4f1d07b7 pokeemerald.gba From 7c9fd1f550c6cbfa8c56732cacdbd23e1915b04e Mon Sep 17 00:00:00 2001 From: Muhammad Nauman Raza Date: Tue, 7 Jan 2025 09:29:16 +0000 Subject: [PATCH 2/2] chore: remove `.github` --- .../ISSUE_TEMPLATE/01_battle_engine_bugs.yaml | 52 ------ .../ISSUE_TEMPLATE/02_battle_ai_issues.yaml | 52 ------ .../ISSUE_TEMPLATE/03_feature_requests.yaml | 27 --- .github/ISSUE_TEMPLATE/04_other_errors.yaml | 52 ------ .github/ISSUE_TEMPLATE/config.yml | 5 - .github/calcrom/calcrom.pl | 175 ------------------ .github/calcrom/webhook.sh | 11 -- .github/pull_request_template.md | 35 ---- .github/workflows/build.yml | 41 ---- .github/workflows/docs.yml | 48 ----- 10 files changed, 498 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml delete mode 100644 .github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml delete mode 100644 .github/ISSUE_TEMPLATE/03_feature_requests.yaml delete mode 100644 .github/ISSUE_TEMPLATE/04_other_errors.yaml delete mode 100644 .github/ISSUE_TEMPLATE/config.yml delete mode 100755 .github/calcrom/calcrom.pl delete mode 100755 .github/calcrom/webhook.sh delete mode 100644 .github/pull_request_template.md delete mode 100644 .github/workflows/build.yml delete mode 100644 .github/workflows/docs.yml diff --git a/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml b/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml deleted file mode 100644 index 88c5cabd28..0000000000 --- a/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml +++ /dev/null @@ -1,52 +0,0 @@ -name: ⚔️ Battle Engine mechanical bugs 🐛 -description: File a bug report related to battle mechanic, be it moves, abilities and/or items. -labels: ["bug", "status: unconfirmed", "category: battle-mechanic"] -body: - - type: markdown - attributes: - value: | - Please fill in all required fields with as many details as possible. - - type: textarea - id: description - attributes: - label: Description - description: | - Describe the issue you are experiencing. - Attach images/videos if possible. - placeholder: | - Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video - validations: - required: true - - type: dropdown - id: version - attributes: - label: Version - description: What version of pokeemerald-expansion are you using as a base? - options: - - 1.10.1 (Latest release) - - master (default, unreleased bugfixes) - - upcoming (Edge) - - 1.10.0 - - 1.9.4 - - 1.9.3 - - 1.9.2 - - 1.9.1 - - 1.9.0 - - pre-1.9.0 - validations: - required: true - - type: input - id: upcomingversion - attributes: - label: Upcoming/master Version - description: If you're using the upcoming or master branches directly, please specify what was the commit hash you pulled from. - validations: - required: false - - type: input - id: contact - attributes: - label: Discord contact info - description: Provide your Discord tag here so we can contact you in case we need more details. Be sure to join our server ([here](https://discord.gg/6CzjAG6GZk)). - placeholder: ex. Lunos#4026 - validations: - required: false diff --git a/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml b/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml deleted file mode 100644 index e49c54e756..0000000000 --- a/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml +++ /dev/null @@ -1,52 +0,0 @@ -name: 🧠 Battle AI bugs 🐛 -description: File a bug report related to battle AI. -labels: ["bug", "status: unconfirmed", "category: battle-ai"] -body: - - type: markdown - attributes: - value: | - Please fill in all required fields with as many details as possible. - - type: textarea - id: description - attributes: - label: Description - description: | - Describe the issue you are experiencing. - Attach images/videos if possible. - placeholder: | - Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video - validations: - required: true - - type: dropdown - id: version - attributes: - label: Version - description: What version of pokeemerald-expansion are you using as a base? - options: - - 1.10.1 (Latest release) - - master (default, unreleased bugfixes) - - upcoming (Edge) - - 1.10.0 - - 1.9.4 - - 1.9.3 - - 1.9.2 - - 1.9.1 - - 1.9.0 - - pre-1.9.0 - validations: - required: true - - type: input - id: upcomingversion - attributes: - label: Upcoming/master Version - description: If you're using the upcoming or master branches directly, please specify what was the commit hash you pulled from. - validations: - required: false - - type: input - id: contact - attributes: - label: Discord contact info - description: Provide your Discord tag here so we can contact you in case we need more details. Be sure to join our server ([here](https://discord.gg/6CzjAG6GZk)). - placeholder: ex. Lunos#4026 - validations: - required: false diff --git a/.github/ISSUE_TEMPLATE/03_feature_requests.yaml b/.github/ISSUE_TEMPLATE/03_feature_requests.yaml deleted file mode 100644 index 8d56216265..0000000000 --- a/.github/ISSUE_TEMPLATE/03_feature_requests.yaml +++ /dev/null @@ -1,27 +0,0 @@ -name: 🙏 Feature Request 🙏 -description: Do you want a feature to be added to the Expansion? Let us know! -labels: ["feature-request"] -body: - - type: markdown - attributes: - value: | - Please fill in all required fields with as many details as possible. - - type: textarea - id: description - attributes: - label: Description - description: | - Describe the issue you are experiencing. - Attach images/videos if possible. - placeholder: | - Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video - validations: - required: true - - type: input - id: contact - attributes: - label: Discord contact info - description: Provide your Discord tag here so we can contact you in case we need more details. Be sure to join our server ([here](https://discord.gg/6CzjAG6GZk)). - placeholder: ex. Lunos#4026 - validations: - required: false diff --git a/.github/ISSUE_TEMPLATE/04_other_errors.yaml b/.github/ISSUE_TEMPLATE/04_other_errors.yaml deleted file mode 100644 index 02bc0399b1..0000000000 --- a/.github/ISSUE_TEMPLATE/04_other_errors.yaml +++ /dev/null @@ -1,52 +0,0 @@ -name: 💾 Other errors 🖥️ -description: Everything else that doesn't fit in the above categories. -labels: ["bug", "status: unconfirmed"] -body: - - type: markdown - attributes: - value: | - Please fill in all required fields with as many details as possible. - - type: textarea - id: description - attributes: - label: Description - description: | - Describe the issue you are experiencing. - Attach images/videos if possible. - placeholder: | - Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video - validations: - required: true - - type: dropdown - id: version - attributes: - label: Version - description: What version of pokeemerald-expansion are you using as a base? - options: - - 1.10.1 (Latest release) - - master (default, unreleased bugfixes) - - upcoming (Edge) - - 1.10.0 - - 1.9.4 - - 1.9.3 - - 1.9.2 - - 1.9.1 - - 1.9.0 - - pre-1.9.0 - validations: - required: true - - type: input - id: upcomingversion - attributes: - label: Upcoming/master Version - description: If you're using the upcoming or master branches directly, please specify what was the commit hash you pulled from. - validations: - required: false - - type: input - id: contact - attributes: - label: Discord contact info - description: Provide your Discord tag here so we can contact you in case we need more details. Be sure to join our server ([here](https://discord.gg/6CzjAG6GZk)). - placeholder: ex. Lunos#4026 - validations: - required: false diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index 9a6dfeadd9..0000000000 --- a/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,5 +0,0 @@ -blank_issues_enabled: false -contact_links: - - name: Rom-Hacking Hideout's Discord server! - url: https://discord.gg/6CzjAG6GZk - about: You can follow the development of pokeemerald-expansion and be notified of new releases :) \ No newline at end of file diff --git a/.github/calcrom/calcrom.pl b/.github/calcrom/calcrom.pl deleted file mode 100755 index cb8c5723ee..0000000000 --- a/.github/calcrom/calcrom.pl +++ /dev/null @@ -1,175 +0,0 @@ -#!/usr/bin/perl - -# Usage: -# calcrom.pl [--data] -# -# mapfile: path to .map file output by LD -# data: set to output % breakdown of data - -use IPC::Cmd qw[ run ]; -use Getopt::Long; - -my $usage = "Usage: calcrom.pl file.map [--data]\n"; - -my $showData; -GetOptions("data" => \$showData) or die $usage; - -(@ARGV == 1) - or die $usage; -open(my $file, $ARGV[0]) - or die "ERROR: could not open file '$ARGV[0]'.\n"; - -my $src = 0; -my $asm = 0; -my $srcdata = 0; -my $data = 0; -while (my $line = <$file>) -{ - if ($line =~ /^ \.(\w+)\s+0x[0-9a-f]+\s+(0x[0-9a-f]+) (\w+)\/.+\.o/) - { - my $section = $1; - my $size = hex($2); - my $dir = $3; - - if ($section =~ /text/) - { - if ($dir eq 'src') - { - $src += $size; - } - elsif ($dir eq 'asm') - { - $asm += $size; - } - } - elsif ($section =~ /rodata/) - { - if ($dir eq 'src') - { - $srcdata += $size; - } - elsif ($dir eq 'data') - { - $data += $size; - } - } - } -} - -(my $elffname = $ARGV[0]) =~ s/\.map/.elf/; - -# Note that the grep filters out all branch labels. It also requires a minimum -# line length of 5, to filter out a ton of generated symbols (like AcCn). No -# settings to nm seem to remove these symbols. Finally, nm prints out a separate -# entry for whenever a name appears in a file, not just where it's defined. uniq -# removes all the duplicate entries. -# -# -# You'd expect this to take a while, because of uniq. It runs in under a second, -# though. Uniq is pretty fast! -my $base_cmd = "nm $elffname | awk '{print \$3}' | grep '^[^_].\\{4\\}' | uniq"; - -# This looks for Unknown_, Unknown_, or sub_, followed by an address. Note that -# it matches even if stuff precedes the unknown, like sUnknown/gUnknown. -my $undoc_regex = "'[Uu]nknown_[0-9a-fA-F]\\{5,7\\}\\|sub_[0-9a-fA-F]\\{5,7\\}'"; - -# This looks for every symbol with an address at the end of it. Some things are -# given a name based on their type / location, but still have an unknown purpose. -# For example, FooMap_EventScript_FFFFFFF. -# The above may be double counted here, and will need to be filtered out. -my $partial_doc_regex = "'_[0-28][0-9a-fA-F]\\{5,7\\}'"; - -my $count_cmd = "wc -l"; - -# It sucks that we have to run this three times, but I can't figure out how to get -# stdin working for subcommands in perl while still having a timeout. It's decently -# fast anyway. -my $total_syms_as_string; -(run ( - command => "$base_cmd | $count_cmd", - buffer => \$total_syms_as_string, - timeout => 60 -)) - or die "ERROR: Error while getting all symbols: $?"; - -my $undocumented_as_string; -(run ( - command => "$base_cmd | grep $undoc_regex | $count_cmd", - buffer => \$undocumented_as_string, - timeout => 60 -)) - or die "ERROR: Error while filtering for undocumented symbols: $?"; - -my $partial_documented_as_string; -(run ( - command => "$base_cmd | grep $partial_doc_regex | grep -v $undoc_regex | $count_cmd", - buffer => \$partial_documented_as_string, - timeout => 60 -)) - or die "ERROR: Error while filtering for partial symbols: $?"; - -# Performing addition on a string converts it to a number. Any string that fails -# to convert to a number becomes 0. So if our converted number is 0, but our string -# is nonzero, then the conversion was an error. -$undocumented_as_string =~ s/^\s+|\s+$//g; -my $undocumented = $undocumented_as_string + 0; -(($undocumented != 0) or (($undocumented == 0) and ($undocumented_as_string eq "0"))) - or die "ERROR: Cannot convert string to num: '$undocumented_as_string'"; - -$partial_documented_as_string =~ s/^\s+|\s+$//g; -my $partial_documented = $partial_documented_as_string + 0; -(($partial_documented != 0) or (($partial_documented == 0) and ($partial_documented_as_string eq "0"))) - or die "ERROR: Cannot convert string to num: '$partial_documented_as_string'"; - -$total_syms_as_string =~ s/^\s+|\s+$//g; -my $total_syms = $total_syms_as_string + 0; -(($total_syms != 0) or (($total_syms == 0) and ($total_syms_as_string eq "0"))) - or die "ERROR: Cannot convert string to num: '$total_syms_as_string'"; - -($total_syms != 0) - or die "ERROR: No symbols found."; - -my $total = $src + $asm; -my $srcPct = sprintf("%.4f", 100 * $src / $total); -my $asmPct = sprintf("%.4f", 100 * $asm / $total); - -my $documented = $total_syms - ($undocumented + $partial_documented); -my $docPct = sprintf("%.4f", 100 * $documented / $total_syms); -my $partialPct = sprintf("%.4f", 100 * $partial_documented / $total_syms); -my $undocPct = sprintf("%.4f", 100 * $undocumented / $total_syms); - -if ($asm == 0) -{ - print "Code decompilation is 100% complete\n" -} -else -{ - print "$total total bytes of code\n"; - print "$src bytes of code in src ($srcPct%)\n"; - print "$asm bytes of code in asm ($asmPct%)\n"; -} -print "\n"; - -if ($partial_documented == 0 && $undocumented == 0) -{ - print "Documentation is 100% complete\n" -} -else -{ - print "$total_syms total symbols\n"; - print "$documented symbols documented ($docPct%)\n"; - print "$partial_documented symbols partially documented ($partialPct%)\n"; - print "$undocumented symbols undocumented ($undocPct%)\n"; -} - -if ($showData) -{ - print "\n"; - my $dataTotal = $srcdata + $data; - my $srcDataPct = sprintf("%.4f", 100 * $srcdata / $dataTotal); - my $dataPct = sprintf("%.4f", 100 * $data / $dataTotal); - - print "$dataTotal total bytes of data\n"; - print "$srcdata bytes of data in src ($srcDataPct%)\n"; - print "$data bytes of data in data ($dataPct%)\n"; -} diff --git a/.github/calcrom/webhook.sh b/.github/calcrom/webhook.sh deleted file mode 100755 index fd54b660b6..0000000000 --- a/.github/calcrom/webhook.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -ex - -build_name=$1 -map_file=$build_name.map -if [ ! -f $map_file ]; then - echo "$map_file does not exist!" - exit 1 -fi - -output=$(perl $(dirname "$0")/calcrom.pl $build_name.map | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g') -curl -d "{\"username\": \"$CALCROM_DISCORD_WEBHOOK_USERNAME\", \"avatar_url\": \"$CALCROM_DISCORD_WEBHOOK_AVATAR_URL\", \"content\":\"\`\`\`\\n$build_name progress:\\n$output\\n\`\`\`\"}" -H "Content-Type: application/json" -X POST "$CALCROM_DISCORD_WEBHOOK_URL" diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md deleted file mode 100644 index f083a2a23f..0000000000 --- a/.github/pull_request_template.md +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - -## Description - - -## Images - - - -## Issue(s) that this PR fixes - - - -## **People who collaborated with me in this PR** - - - - - -## Feature(s) this PR does NOT handle: - - - -## Things to note in the release changelog: - - - - -## **Discord contact info** - - diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 449eaa8c38..0000000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: CI - -on: - push: - branches: - - master - - upcoming - pull_request: - -jobs: - build: - runs-on: ubuntu-latest - container: devkitpro/devkitarm - env: - GAME_VERSION: EMERALD - GAME_REVISION: 0 - GAME_LANGUAGE: ENGLISH - COMPARE: 0 - UNUSED_ERROR: 1 - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Install binutils - run: | - sudo apt update - sudo apt install -y build-essential libpng-dev libelf-dev - # build-essential and git are already installed - # gcc-arm-none-eabi is only needed for the modern build - # as an alternative to dkP - - - name: ROM - env: - COMPARE: 0 - run: make -j${nproc} -O all - - - name: Test - env: - TEST: 1 - run: | - make -j${nproc} check diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml deleted file mode 100644 index 874ebdd590..0000000000 --- a/.github/workflows/docs.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Docs -on: - push: - branches: - - master - -jobs: - deploy: - runs-on: ubuntu-latest - permissions: - contents: write - pages: write - id-token: write - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Install latest mdbook - run: | - tag=$(curl 'https://api.github.com/repos/rust-lang/mdbook/releases/latest' | jq -r '.tag_name') - url="https://github.com/rust-lang/mdbook/releases/download/${tag}/mdbook-${tag}-x86_64-unknown-linux-gnu.tar.gz" - mkdir mdbook - curl -sSL $url | tar -xz --directory=./mdbook - echo `pwd`/mdbook >> $GITHUB_PATH - - name: Build Book - run: | - cd docs - mdbook build - - name: Check if Pages is enabled - uses: octokit/request-action@v2.x - id: check_pages - continue-on-error: true - with: - route: GET /repos/{repo}/pages - repo: ${{ github.repository }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Setup Pages - uses: actions/configure-pages@v4 - if: steps.check_pages.outcome == 'success' - - name: Upload artifact - uses: actions/upload-pages-artifact@v3 - with: - path: 'docs/book' - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v4 - if: steps.check_pages.outcome == 'success'