Merge remote-tracking branch 'FexCollects/master'

This commit is contained in:
Artrios 2025-06-23 22:03:53 +08:00
commit 399049a8d7
329 changed files with 5148 additions and 4810 deletions

67
.github/workflows/test.yml vendored Normal file
View File

@ -0,0 +1,67 @@
name: Test Python Scripts
on:
pull_request:
push:
branches:
- master
jobs:
BuildGift:
runs-on: ubuntu-24.04
steps:
- name: Check out repository code
uses: actions/checkout@v4
- name: Verify gift
run: |
cd giftpokemon && make
BuildRibbons:
runs-on: ubuntu-24.04
steps:
- name: Check out repository code
uses: actions/checkout@v4
- name: Verify ribbons
run: |
cd ribbons && make
BuildDecoration:
runs-on: ubuntu-24.04
steps:
- name: Check out repository code
uses: actions/checkout@v4
- name: Verify decoration
run: |
cd decoration && make
BuildEonTicket:
runs-on: ubuntu-24.04
steps:
- name: Check out repository code
uses: actions/checkout@v4
- name: Verify eonticket
run: |
cd eonticket && make
BuildBattleE:
runs-on: ubuntu-24.04
steps:
- name: Check out repository code
uses: actions/checkout@v4
- name: Verify battle-e
run: |
cd battle-e && make -j4
Test:
runs-on: ubuntu-24.04
steps:
- name: Check out repository code
uses: actions/checkout@v4
- name: Test stripgbc
run: |
cd tests/scripts/stripgbc/ && ./pass.sh

13
.gitignore vendored
View File

@ -1,9 +1,6 @@
*.bin
*.gbc
*.o
*.tx
*.z80
*.mev
*.pyc
/.vs/pokecarde/v16
/.vs
battle-e/build
decoration/build
eonticket/build
giftpokemon/build
ribbons/build

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "cooltrainer_m"
TRAINER EQUS "devin"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "ninja_boy"
TRAINER EQUS "goro"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "tuber_f"
TRAINER EQUS "sonya"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "gentleman"
TRAINER EQUS "antonio"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "pokefan_f"
TRAINER EQUS "alana"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "picnicker"
TRAINER EQUS "renee"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "lady"
TRAINER EQUS "sophie"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "beauty"
TRAINER EQUS "fay"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "psychic_f"
TRAINER EQUS "natasha"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "camper"
TRAINER EQUS "patrick"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "sailor"
TRAINER EQUS "oscar"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "pokemaniac"
TRAINER EQUS "tyler"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "youngster"
TRAINER EQUS "rudy"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "beauty"
TRAINER EQUS "ellie"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "pkmn_breeder_f"
TRAINER EQUS "candice"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "cooltrainer_m"
TRAINER EQUS "belford"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "pkmn_ranger_m"
TRAINER EQUS "clayton"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "triathlete_m_swim"
TRAINER EQUS "dustin"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "hiker"
TRAINER EQUS "hugo"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "youngster"
TRAINER EQUS "jeffrey"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "ruin_maniac"
TRAINER EQUS "logan"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "pokefan_f"
TRAINER EQUS "maggie"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "pkmn_breeder_m"
TRAINER EQUS "wilson"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "ruin_maniac"
TRAINER EQUS "zuril"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "school_kid_f"
TRAINER EQUS "mandy"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "parasol_lady"
TRAINER EQUS "sofia"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "lady"
TRAINER EQUS "hillary"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "guitarist"
TRAINER EQUS "dominic"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "fisherman"
TRAINER EQUS "bryce"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "bug_maniac"
TRAINER EQUS "irvin"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "battle_girl"
TRAINER EQUS "natalie"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "expert_f"
TRAINER EQUS "sandia"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "expert_m"
TRAINER EQUS "marcus"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "cooltrainer_f"
TRAINER EQUS "raquel"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "black_belt"
TRAINER EQUS "tsutomu"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "pokefan_f"
TRAINER EQUS "justine"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "pkmn_ranger_f"
TRAINER EQUS "heather"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "psychic_f"
TRAINER EQUS "judith"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "collector"
TRAINER EQUS "stuart"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "pkmn_ranger_m"
TRAINER EQUS "irazu"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "picnicker"
TRAINER EQUS "sandy"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "swimmer_f"
TRAINER EQUS "annie"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "hex_maniac"
TRAINER EQUS "celina"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "aroma_lady"
TRAINER EQUS "april"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "guitarist"
TRAINER EQUS "hayden"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "psychic_m"
TRAINER EQUS "griffin"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "pokefan_m"
TRAINER EQUS "kendall"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "cooltrainer_m"
TRAINER EQUS "fuego"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "pkmn_breeder_f"
TRAINER EQUS "mami"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "ruin_maniac"
TRAINER EQUS "toshitsugu"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "expert_f"
TRAINER EQUS "koto"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "black_belt"
TRAINER EQUS "masaru"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "tuber_f"
TRAINER EQUS "harue"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "ninja_boy"
TRAINER EQUS "yu"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "rich_boy"
TRAINER EQUS "matsuo"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "dragon_tamer"
TRAINER EQUS "kuen"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "cooltrainer_f"
TRAINER EQUS "shizu"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "rich_boy"
TRAINER EQUS "junpei"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "kindler"
TRAINER EQUS "jo"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "gentleman"
TRAINER EQUS "fiennes"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "black_belt"
TRAINER EQUS "danpei"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "beauty"
TRAINER EQUS "yuka"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "lass"
TRAINER EQUS "yoko"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "hex_maniac"
TRAINER EQUS "fukune"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "psychic_m"
TRAINER EQUS "kiyoshi"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "ninja_boy"
TRAINER EQUS "toshinao"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "bird_keeper"
TRAINER EQUS "otoya"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "swimmer_f"
TRAINER EQUS "natsuko"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "hex_maniac"
TRAINER EQUS "sadayo"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "collector"
TRAINER EQUS "junji"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "pkmn_breeder_m"
TRAINER EQUS "shinji"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "expert_m"
TRAINER EQUS "fugen"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "hex_maniac"
TRAINER EQUS "rina"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "ninja_boy"
TRAINER EQUS "ruizo"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "triathlete_m_bike"
TRAINER EQUS "nozomu"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "guitarist"
TRAINER EQUS "kyohei"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "bug_catcher"
TRAINER EQUS "yukio"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "pokefan_m"
TRAINER EQUS "makio"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "battle_girl"
TRAINER EQUS "noriko"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "pkmn_ranger_f"
TRAINER EQUS "hoyoshi"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "school_kid_m"
TRAINER EQUS "tomoyasu"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "gentleman"
TRAINER EQUS "anthony"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "triathlete_m_swim"
TRAINER EQUS "ryo"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "guitarist"
TRAINER EQUS "daikichi"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "pkmn_breeder_m"
TRAINER EQUS "shigenobu"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "pkmn_ranger_f"
TRAINER EQUS "reina"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "pkmn_breeder_f"
TRAINER EQUS "momoko"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "cooltrainer_m"
TRAINER EQUS "ihara"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "psychic_f"
TRAINER EQUS "satoe"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "bird_keeper"
TRAINER EQUS "suekichi"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "aroma_lady"
TRAINER EQUS "miyoko"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "lady"
TRAINER EQUS "moet"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "school_kid_f"
TRAINER EQUS "chisa"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "hex_maniac"
TRAINER EQUS "sueno"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "pokefan_f"
TRAINER EQUS "shigeko"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,4 +0,0 @@
INCLUDE "../macros.asm"
CLASS EQUS "cooltrainer_f"
TRAINER EQUS "umami"
INCLUDE "battletrainer-{REGION_NAME}.tx"

View File

@ -1,3 +0,0 @@
INCLUDE "../macros.asm"
BERRY EQUS "pumkin"
INCLUDE "enigmaberry-{REGION_NAME}.tx"

View File

@ -1,3 +0,0 @@
INCLUDE "../macros.asm"
BERRY EQUS "drash"
INCLUDE "enigmaberry-{REGION_NAME}.tx"

Some files were not shown because too many files have changed in this diff Show More