bryanthaboi
fdffb12571
Merge pull request #1399 from AverageConsumer/codex/mod-battle-special-intents
2026-08-16 12:09:03 -04:00
bryanthaboi
a910b65434
CLOSES #1231 , CLOSES #1269 , CLOSES #1301
2026-08-16 10:04:54 -04:00
bryanthaboi
1151c188a7
CLOSES #1211 , CLOSES #1228 , CLOSES #1229 , CLOSES #1232 , CLOSES #1251 , CLOSES #1265 , CLOSES #1267 , CLOSES #1276 , CLOSES #1279 , CLOSES #1282 , CLOSES #1293 , CLOSES #1296 , CLOSES #1303 , CLOSES #1329 , CLOSES #1338 , CLOSES #1341 , CLOSES #1343 , CLOSES #1344 , CLOSES #1368 , CLOSES #1385 , CLOSES #1388 , CLOSES #1389 , CLOSES #1391
2026-08-16 08:55:40 -04:00
AverageConsumer
b39e11b7cd
feat(mods): add special battle intents
2026-08-16 14:43:08 +02:00
bryanthaboi
fc841f7525
Merge branch 'dev' of https://github.com/bryanthaboi/gen1recomp into dev
2026-08-16 06:41:58 -04:00
bryanthaboi
12fdfa1e88
CLOSES #1181 , CLOSES #1212 , CLOSES #1214 , CLOSES #1224 , CLOSES #1230 , CLOSES #1249 , CLOSES #1271 , CLOSES #1272 , CLOSES #1273 , CLOSES #1298 , CLOSES #1305 , CLOSES #1307 , CLOSES #1318 , CLOSES #1328 , CLOSES #1330 , CLOSES #1331 , CLOSES #1333 , CLOSES #1334 , CLOSES #1335 , CLOSES #1340 , CLOSES #1345 , CLOSES #1346 , CLOSES #1360 , CLOSES #1362
2026-08-16 06:41:56 -04:00
AverageConsumer
c22888a7fd
feat(mods): add validated battle menu intents
2026-08-16 02:56:03 +02:00
AverageConsumer
fcb5d1d348
feat(mods): expose read-only battle snapshots
2026-08-16 01:32:23 +02:00
1jamie
df0be1cba6
Add Gold save-editor support, rearrange the launcher, and ship a patch-notes modal.
...
The save editor now routes Gold vs RBY through a generation adapter so boxes, items, events, and maps write the right fields. The launcher layout is shuffled a bit, and patch notes can come from the updater, a packed file, or the iOS sidecar.
2026-08-14 18:48:06 -05:00
bryanthaboi
052dd26b3e
Merge branch 'dev' of https://github.com/bryanthaboi/gen1recomp into dev
2026-08-14 17:07:08 -04:00
bryanthaboi
c8f6c7241b
i did it for greg
2026-08-14 17:07:06 -04:00
MaxTomahawk
407f649e9d
fix(mod-api): harden deferred trainer preparation
2026-08-14 17:57:59 +02:00
MaxTomahawk
a77210799f
feat(mod-api): add trainer battle party scope
2026-08-14 17:33:17 +02:00
bryanthaboi
a94fecfec8
Closes #919 , closes #982 , closes #1003 , closes #1012 , closes #1022 , closes #1028 , closes #1033
2026-08-14 10:05:51 -04:00
bryanthaboi
9ceb1a8940
Merge branch 'dev' of https://github.com/bryanthaboi/gen1recomp into dev
2026-08-13 13:07:22 -04:00
bryanthaboi
37051a26b5
CLOSES #1206 , CLOSES #1189 , CLOSES #1175 , CLOSES #1129 , CLOSES #1119 , CLOSES #1089 , CLOSES #1073 , CLOSES #1069 , CLOSES #1065 , CLOSES #1010 , CLOSES #990 , CLOSES #989 , CLOSES #988 , CLOSES #978 , CLOSES #944 , CLOSES #936 , CLOSES #1221 , CLOSES #1220 , CLOSES #1193 , CLOSES #1101 , CLOSES #1066 , CLOSES #1056 , CLOSES #1041 , CLOSES #984 , CLOSES #1225 , CLOSES #1214 , CLOSES #1011 , CLOSES #1035 , CLOSES #1219 , CLOSES #1048 , CLOSES #1047 , CLOSES #964 , CLOSES #949 , CLOSES #1149 , CLOSES #1007 , CLOSES #914 , CLOSES #1115 , CLOSES #1146 , CLOSES #999 , CLOSES #1207 , CLOSES #1029 , CLOSES #1120 , CLOSES #987 , CLOSES #983
2026-08-13 13:07:20 -04:00
1jamie
a722d24759
fix merge conflicts with dev
2026-08-13 07:39:11 -05:00
bryanthaboi
6864173f35
Merge branch 'dev' of https://github.com/bryanthaboi/gen1recomp into dev
2026-08-13 05:30:35 -04:00
bryanthaboi
e9d431b3ff
CLOSES #1091 , CLOSES #1097 , CLOSES #1100 , CLOSES #1104 , CLOSES #1135 , CLOSES #1155 , CLOSES #1157 , CLOSES #1158 , CLOSES #1159 , CLOSES #1160 , CLOSES #1167 , CLOSES #1208
2026-08-13 05:30:33 -04:00
1jamie
6ff7dd0c38
refactor(battle): enhance RNG handling and fixed damage mechanics
...
- Always supply Gen 2 battle random (BattleRandom) and Gen 1 / love-style rng.
- Add EFFECT_STATIC_DAMAGE for Sonic Boom and Dragon Rage (move power; Ghost
immunity via resettypematchup for static damage only).
- Keep Magnitude rolling via BattleRandom instead of collapsing to Magnitude 4.
- Cover RNG, static damage, and Magnitude in gen2 battle tests.
2026-08-12 17:52:02 -05:00
bryanthaboi
517170f1c8
Merge pull request #1068 from anxiousintrovert/agent/fix-disabled-battle-ui-background
...
Fix hidden battle UI overlay backgrounds
2026-08-12 16:56:46 -04:00
bryanthaboi
e5bebea437
Merge pull request #1077 from MaxTomahawk/feat/battle-menu-auxiliary
...
feat(mods): add battle menu auxiliary action
2026-08-12 16:56:04 -04:00
bryanthaboi
6731937841
Pulled every open Gold bug (bodies, comments, screenshots/videos), matched them against the port and ../pokegold, then split them so each fixer owns a disjoint file set. Duplicates collapsed: #1164 and #1188 are the same Radio Tower stair softlock. #1150 and #1190 are the same Gold rebind freeze. Enhancements ( #1161 , #1130 , #1112 , #1100 ) were left out. Battle 1 src/battle/gen2/*, src/ui/gen2/BattleState.lua #1168 multi-hit always 2 #1180 DV / stats #1185 learn-move text order after a trainer fight #1152 no "Use next POKéMON?" / run after a wild faint Overworld 2 src/world/gen2/*, trade anim, hidden items #1184 Kurt blocking Slowpoke Well #1164 / #1188 Radio Tower gentleman on the stairs #1173 Rock Smash rocks walk left each visit #1172 last item name used Rock Smash #1167 Ilex Forest hidden items #1165 trade movie + ledge hop still missing ( #1121 / #1126 ) UI 3 naming, party, mart, pokegear #1166 grey nickname screen #1162 TM/HM missing ABLE / NOT ABLE #1169 underground herb lady whites out the map #1151 Pokegear black player icon + extra A/B on the phone card Platform 4 Gold options, save slots, pack, mod tab #1150 / #1190 controls freeze #1178 no vibration row #1177 cannot move Gold touch controls #1107 SAVE with no launcher slot #1145 Gold mod tab still lists Gen 1-only mods #1192 RGXX missing tools/rom_manifest_gold.json Drivers only for the progress / data-loss ones (faint-run, multi-hit, Kurt, Radio Tower, Rock Smash shift, herb shop, save slot). No new unit tests. New comments are pokegold file.asm:line only. A verifier agent will get this same list once the four finish and check that the diffs actually fix the reports. Verifier checked the batch against pokegold. Almost everything landed. I closed the two leftovers that were still real bugs: #1185 : the active mon no longer reprints GrewToLevel (engine/battle/core.asm:7044). Bench mons still print it, then the stats box, then the learn-move line. #1180 : the party list recalcs stats on open, same as Summary. Gold boot now applies options.touchControls / haptics from the Gold options block, not the shared Red pad. # Verdict 1168 multi-hit FIXED 1180 DVs / stats FIXED 1185 learn-move order FIXED (was partial) 1152 run after faint FIXED 1184 Kurt FIXED 1164 / 1188 Radio Tower FIXED 1173 rocks slide FIXED 1172 Rock Smash name FIXED 1167 Ilex hidden items SKIP-OK (already in the Gold cache) 1165 trade + ledge FIXED 1166 nickname color FIXED 1162 TM ABLE / NOT ABLE FIXED 1169 herb shop white-out FIXED 1151 Pokegear FIXED 1150 / 1190 rebind freeze FIXED 1178 vibration FIXED 1177 touch layout FIXED 1107 save slot FIXED 1145 mod tab filter FIXED 1192 RGXX Gold manifest FIXED Nothing is committed. Drivers, from the repo root: POKEPORT_GAME=gold POKEPORT_TOUCH=0 POKEPORT_DRIVER=tests/drivers/multihit_bug1168_test.lua love . Fury Attack should hit 2-5 times. Always twice is still broken. POKEPORT_GAME=gold POKEPORT_TOUCH=0 POKEPORT_DRIVER=tests/drivers/use_next_mon_bug1152_test.lua love . After the lead faints: "Use next POKéMON?" YES opens the party. NO/B tries to run. POKEPORT_GAME=gold POKEPORT_TOUCH=0 POKEPORT_DRIVER=tests/drivers/kurt_well_bug1184_test.lua love . Kurt at the well entrance (16, 14), not on the inner path. POKEPORT_GAME=gold POKEPORT_TOUCH=0 POKEPORT_DRIVER=tests/drivers/radiotower_softlock_bug1164_test.lua love . Gentleman in the 5F office (3, 6). Stairs at (12, 0) clear. POKEPORT_GAME=gold POKEPORT_TOUCH=0 POKEPORT_DRIVER=tests/drivers/rocksmash_shift_bug1173_test.lua love . Route 40 rocks stay put. A slide one cell left is the old bug. POKEPORT_GAME=gold POKEPORT_TOUCH=0 POKEPORT_DRIVER=tests/drivers/herbshop_bug1169_test.lua love . Herb shop intro over the Underground map, not a white screen. POKEPORT_GAME=gold POKEPORT_IDENTITY=gold-bug1107 POKEPORT_DRIVER=tests/drivers/gold_save_slot_bug1107_test.lua love . Look for PASS and a saves/gold/slot*.lua path. CONTINUE should see it. Worth a hand check with no driver: nickname color, a TM for ABLE/NOT ABLE, Pokegear phone B-to-close, OPTION > CONTROLS, a ledge hop, a trade movie, and on a phone OPTION > TOUCH LAYOUT / VIBRATION. give me CLOSES #93939 , in a comma separated list each saying CLOSES before each issue number that is fixed CLOSES #1107 , CLOSES #1145 , CLOSES #1150 , CLOSES #1151 , CLOSES #1152 , CLOSES #1162 , CLOSES #1164 , CLOSES #1165 , CLOSES #1166 , CLOSES #1168 , CLOSES #1169 , CLOSES #1172 , CLOSES #1173 , CLOSES #1177 , CLOSES #1178 , CLOSES #1180 , CLOSES #1184 , CLOSES #1185 , CLOSES #1188 , CLOSES #1190 , CLOSES #1192
2026-08-12 16:51:27 -04:00
MaxTomahawk
238af263d6
Merge remote-tracking branch 'origin/dev' into feat/battle-menu-auxiliary
...
# Conflicts:
# src/core/Checkpoint.lua
2026-08-12 09:46:00 +02:00
bryanthaboi
127e3da909
Merge pull request #1062 from AverageConsumer/codex/mod-caught-marker-visibility
...
Mod API: allow opt-in caught markers in wild battle HUDs
2026-08-11 21:23:31 -04:00
bryanthaboi
241c3345bd
Merge pull request #1086 from thibautbus/fix/yellow-pallet-oak-music
...
Bring Oak's Pallet Town cutscene in line with the original Yellow game
2026-08-11 21:21:36 -04:00
bryanthaboi
20e0692486
Merge pull request #1087 from MaxTomahawk/fix/battle-decision-settling
...
fix: settle real battle checkpoint decisions
2026-08-11 21:21:14 -04:00
bryanthaboi
0136429d3e
CLOSES #1090 , CLOSES #1093 , CLOSES #1094 , CLOSES #1095 , CLOSES #1098 , CLOSES #1102 , CLOSES #1105 , CLOSES #1106 , CLOSES #1108 , CLOSES #1109 , CLOSES #1110 , CLOSES #1111 , CLOSES #1113 , CLOSES #1114 , CLOSES #1117 , CLOSES #1118 , CLOSES #1121 , CLOSES #1122 , CLOSES #1123 , CLOSES #1124 , CLOSES #1126 , CLOSES #1127 , CLOSES #1128 , CLOSES #1131 , CLOSES #1132 , CLOSES #1134 , CLOSES #1137 , CLOSES #1141
2026-08-11 21:19:36 -04:00
bryanthaboi
ae6cac89e1
G2 support
2026-08-11 11:53:30 -04:00
MaxTomahawk
41f02ecfbc
fix: settle real battle checkpoint decisions
2026-08-11 17:13:29 +02:00
thibautbus
ab94b96a79
Simplify comments
2026-08-11 15:23:32 +02:00
thibautbus
d4dc72d0f4
Fix the old-man demo bag to show 1 Poke Ball in Yellow, 50 in Red/Blue
...
Confirmed against pokeyellow's engine/battle/core.asm: the Viridian
old man's demo and Oak's Pikachu catch share the same canned
one-item bag (SimulatedInputBattleItemList), quantity 1 -- pokered's
equivalent (OldManItemList, old man only, no Pikachu battle type) is
quantity 50. The port hardcoded x50 for both versions.
2026-08-11 14:01:06 +02:00
anxiousintrovert
d21a0edffc
Fix hidden battle UI overlay backgrounds
2026-08-10 20:03:33 -05:00
AverageConsumer
e59175fc89
feat(mods): allow caught markers in wild battle HUDs
2026-08-10 23:36:38 +02:00
MaxTomahawk
59725c0ead
feat(mods): add battle menu auxiliary action
2026-08-10 23:32:38 +02:00
AverageConsumer
6a990bf79f
feat(mods): allow alternate battle grids to own navigation
2026-08-10 21:22:09 +02:00
bryanthaboi
9234f12ed0
Merge remote-tracking branch 'origin/dev' into fix1038
...
# Conflicts:
# docs/modding.md
2026-08-10 14:14:39 -04:00
bryanthaboi
9302bbcbf3
Merge branch 'fix1037' into fix1038
...
# Conflicts:
# docs/modding.md
2026-08-10 14:12:21 -04:00
bryanthaboi
11af06a752
Merge remote-tracking branch 'origin/dev' into fix1023
...
# Conflicts:
# docs/modding.md
2026-08-10 14:10:52 -04:00
bryanthaboi
d8736fe33e
Merge pull request #1015 from ShaneMcGovernIE/shanemcgovernie-fix-substitute-fainting
...
Fix Substitute exact-quarter-HP trainer softlock
2026-08-10 14:08:53 -04:00
bryanthaboi
12c2677dc2
title screen issues, audio issues, and replacing gf c
2026-08-10 14:00:26 -04:00
david
3c71afb9fa
Per-category GAME SPEED: overworld/battle/menu + core.logic_speed hook (RFC 0007)
...
GameSpeed is a single fast-forward multiplier applied uniformly to the
whole logic clock -- overworld walking, menu navigation and battle turns
all scale together. A player who wants 4X battles but 1X overworld (so a
cutscene or NPC dialogue doesn't blur past) has no way to get both.
Splits save.options.speed into speedOverworld/speedBattle/speedMenu, each
cycling independently, with an automatic migration so an existing save's
speed choice carries over. Game.speedCategoryInStack resolves which
category is active by walking the state stack (the same idiom
wideBattleInStack/fillScaleInStack already use), so a menu opened mid-
battle inherits battle speed rather than resetting to whatever "menu"
defaults to. Adds a new core.logic_speed hook so a mod can read or
override the resolved multiplier for the current frame regardless of
which category produced it, sitting after the link-play and run-argument
overrides so neither is a seam a mod can defeat.
RFC 0007 status: Proposed.
2026-08-09 20:13:21 -07:00
AverageConsumer
b9e3c4a689
feat(mods): expose battle UI visibility hooks
2026-08-09 15:46:33 +02:00
Shane McGovern
ff91481018
Fix Substitute zero-HP boundary
...
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com >
2026-08-09 00:17:51 +01:00
MaxTomahawk
44a7910c69
feat: reconstruct standard battle continuations
2026-08-08 09:53:41 +02:00
bryanthaboi
1992fdf398
Merge pull request #955 from ShaneMcGovernIE/shanemcgovernie-issue-945-cannot-edit-trainer-class-s-battle-theme-ad701b
...
Honor trainer battleTheme override (fixes #945 )
2026-08-07 12:40:55 -04:00
Juan Heredia
5bc7d203a5
Route the last hardcoded UI labels through the Strings catalog
...
Wrap the battle stat box, the PC quantity footer and the dex metric
labels in Strings() (SummaryMenu -- and MoveEffects since #811 --
already do this); give the battle menu a 'battle' lookup context so a
translation can shorten FIGHT/ITEM/RUN independently of the pause menu;
align the metric dex rows with the imperial ones and make the No.
prefix translatable; make the title menu's recolor zone follow Menu's
auto-grown width; honor the declared-but-unread boot.title seam,
drawing an explicit versionRibbon as one centered piece. With an empty
catalog every path is pixel-identical to vanilla.
2026-08-07 13:59:01 +02:00
Shane McGovern
ed8a89c5ce
Honor trainer battleTheme override ( fixes #945 )
...
trainers.battleTheme validated and merged onto the trainer record but was
never read: battle music came solely from data.audio.battle[kind] where
kind is computeMusicKind()'s final/gym/trainer/wild. Route both battle-
theme start sites through a single choke point:
- BattleState:playBattleTheme() cues Music.playBattle with the override
(self.trainer.battleTheme via battleTheme()), defaulting to the kind
when unset, so vanilla fights and #782 's non-gym Giovanni are unchanged.
- BattleState:enter() and OverworldController:pushBattle() both call it.
- Music.playBattle gains an optional 4th song arg that overrides the kind
default, and real call sites now populate the music.select trainerId.
- Victory jingles stay kind-based: a custom battle theme has no derivable
win-variant.
New ROM-free T2 suite tests/engine/trainer_battle_theme_bug945.lua covers
mod load, override resolution, the choke point, and the nil-override
parity gate.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com >
2026-08-07 10:53:42 +01:00
bryanthaboi
863f371e68
CLOSES #806 , CLOSES #809 , CLOSES #853 , CLOSES #854 , CLOSES #860 , CLOSES #862 , CLOSES #865 , CLOSES #866
2026-08-05 14:38:10 -04:00
bryanthaboi
f6392e8932
CLOSES #788 , CLOSES #795 , CLOSES #796 , CLOSES #797 , CLOSES #805 , CLOSES #826 , CLOSES #833 , CLOSES #835 , CLOSES #837 , CLOSES #844 , CLOSES #845 , CLOSES #846 , CLOSES #847
2026-08-05 11:09:05 -04:00