pokemon/gen1recomp
1
0
Fork 0
mirror of https://github.com/bryanthaboi/gen1recomp.git synced 2026-08-21 05:00:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'my-uncles-neighbor' into dev

Browse Source 
# Conflicts:
#	src/import/RomImporter.lua
This commit is contained in:
bryanthaboi
2026-08-20 08:28:19 -04:00
parent 0dd889b35b ec9dc29646
commit 51c4766ead
68 changed files with 18617 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/modkit.py
+3 -2
View File
@@ -741,7 +741,7 @@ def imported_data_dir(repo):
return path if _generated_data_dir_ok(path) else None
version = (os.environ.get("POKEPORT_VERSION") or "red").lower()
if version not in ("red", "blue", "yellow"):
if version not in ("red", "blue", "yellow", "gold", "silver"):
version = "red"
candidates = [
@@ -2404,7 +2404,8 @@ UPVALUE_CALL = re.compile(
UPVALUE_ARGS = re.compile(
r"""^\s*([A-Za-z_]\w*)\s*\.\s*(\w+)\s*,\s*["'](\w+)["']""")
VERSION_MATCH = re.compile(
r"""[=~]=\s*["'](red|blue|yellow)["']|["'](red|blue|yellow)["']\s*[=~]=""")
r"""[=~]=\s*["'](red|blue|yellow|gold|silver)["']"""
r"""|["'](red|blue|yellow|gold|silver)["']\s*[=~]=""")
def _line_of(body, offset):