MaxTomahawk
29a2b9a123
Merge remote-tracking branch 'origin/dev' into feat/mod-pokemon-icon
...
# Conflicts:
# docs/modding.md
2026-08-12 09:46:44 +02:00
bryanthaboi
cd7985e4ac
Merge pull request #1072 from dlloa/gen1recomp-issue-28
...
Export versioned mod option schemas for native launchers
2026-08-11 21:24:57 -04:00
bryanthaboi
cd02cd6f33
Merge pull request #1061 from AverageConsumer/codex/mod-world-party-reorder
...
Mod API: expose safe overworld party reordering
2026-08-11 21:23:43 -04: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
3aaaf9936e
Merge pull request #1076 from MaxTomahawk/feat/mod-title-checkpoint-resume
...
feat(mods): resume selected checkpoints from title
2026-08-11 21:23:08 -04:00
bryanthaboi
af33c6e810
Merge pull request #1078 from MaxTomahawk/feat/scripted-battle-checkpoints
...
feat(mods): checkpoint scripted battle decisions
2026-08-11 21:22:40 -04:00
bryanthaboi
e8eccfd4df
Merge pull request #1080 from MaxTomahawk/feat/device-date-time
...
feat(mods): add shared local date and time formatting
2026-08-11 21:21:51 -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
Dorian Burton
3d2d53362d
Add trueColor to Gen 2's BattleState.lua
...
Without the trueColor option from Gen 1's BattleState, custom sprites are rendered with the orignial sprites color pallete.
2026-08-11 17:51:23 -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
cc43bd77d2
Give Oak's Pikachu catch the battle-start flash/wipe transition
...
story2.lua pushed the demo battle straight onto the stack, skipping
the flash + wipe that every other wild battle gets.
InitWildBattle calls DoBattleTransitionAndInitBattleVariables
unconditionally (core.asm:6699) -- there is no BATTLE_TYPE_OLD_MAN or
BATTLE_TYPE_PIKACHU special case -- so the old-man tutorial and Oak's
Pikachu catch get the wipe like any other wild battle, same as every
scripted trainer. Commands.old_man_demo already routed the Viridian
old man's tutorial catch through OverworldState:pushBattle for
exactly this reason; the fallback it used for a pushBattle-less
overworld (ctx.overworld and ctx.overworld.pushBattle then ... else
game.stack:push(battle)) was duplicated verbatim in Commands
.start_battle and would have been a third copy in story2.lua, so it's
pulled into one Commands.pushBattle(ctx, battle) helper instead, used
by all three call sites; the fallback branch now logs a warning
rather than silently dropping the transition and battle-theme start.
2026-08-11 14:01:19 +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
thibautbus
8e48bb4e32
Play the museum-guy cue during Oak's lab walk in Yellow
...
Yellow's Pallet Town intro (professor catches the wild Pikachu, then
walks the player to the lab) played the map's default Pallet Town
theme the whole time instead of the dedicated escort cue. Per
pokeyellow's actual scripts: PlayDefaultMusicFadeOutCurrent (run on
every battle exit) legitimately restores Pallet Town's theme after
the Pikachu demo battle for the Whew.../Come with me lines; the
escort cue (MUSIC_MUSEUM_GUY, the same "led by an NPC" theme Pewter's
museum guide uses) only starts in PalletMovementScript_OakMoveLeft,
the first function of the escort script -- but only in pokeyellow's
copy. pokered's copy of that same shared Red/Yellow function only
sets BIT_NO_MAP_MUSIC and leaves whatever was already playing
(MUSIC_MEET_PROF_OAK) running uninterrupted into the lab.
Start Music_MuseumGuy at the top of escortToLab, gated on Yellow so
Red/Blue keeps its unchanged behavior, and fix the Oak-escort warp's
keepMusic comment to say which song rides the warp in each version.
2026-08-11 14:00:40 +02:00
MaxTomahawk
2c8c800584
feat: add shared date and time formatting
2026-08-11 11:17:32 +02:00
MaxTomahawk
ccb5358aad
feat: expose public Pokemon icon presentation
2026-08-11 11:16:58 +02:00
MaxTomahawk
4db97164bb
feat: anchor first checkpoint for cold restart
2026-08-11 08:59:47 +02:00
MaxTomahawk
882763cfe1
feat: checkpoint scripted battle decisions
2026-08-11 08:58:33 +02:00
david
798f3c25c0
Export legacy mod option schemas
2026-08-10 20:23:01 -07:00
david
02024fef58
Export versioned mod option schemas
2026-08-10 17:34:08 -07:00
AverageConsumer
e59175fc89
feat(mods): allow caught markers in wild battle HUDs
2026-08-10 23:36:38 +02:00
MaxTomahawk
4e20f4585f
fix(mods): emit restore lifecycle after title resume
2026-08-10 23:32:35 +02:00
MaxTomahawk
1c37867e52
fix(mods): keep title resume independent
2026-08-10 23:32:35 +02:00
MaxTomahawk
67491e2dac
feat(mods): expose selected save chronology
2026-08-10 23:32:35 +02:00
MaxTomahawk
b8138ef850
feat(mods): resume selected checkpoints from title
2026-08-10 23:32:35 +02:00
AverageConsumer
e3fc8380cf
feat(mods): expose safe overworld party reordering
2026-08-10 23:25:54 +02:00
bryanthaboi
79ed37699e
Merge pull request #1055 from AverageConsumer/codex/mod-grid-navigation-hooks
...
Mod API: allow alternate battle grids to own navigation
2026-08-10 17:08:24 -04:00
bryanthaboi
abf0f9e98a
Merge pull request #1057 from ShaneMcGovernIE/shanemcgovernie-fix-index-unexpected-character
...
Handle non-JSON update responses
2026-08-10 17:07:43 -04:00
bryanthaboi
c3855cebec
more buggies CLOSES #960 , CLOSES #961 , CLOSES #968 , CLOSES #995 , CLOSES #1006 , CLOSES #1009 , CLOSES #1013 , CLOSES #1021 , CLOSES #1031 , CLOSES #1044 , CLOSES #1049 , CLOSES #1050 , CLOSES #1045,,
2026-08-10 17:06:24 -04:00
Shane McGovern
f606840216
Handle non-JSON update responses
...
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com >
2026-08-10 20:51:57 +01:00
AverageConsumer
6a990bf79f
feat(mods): allow alternate battle grids to own navigation
2026-08-10 21:22:09 +02:00
bryanthaboi
7fa758602a
Merge branch 'dev' of https://github.com/bryanthaboi/gen1recomp into dev
2026-08-10 14:59:06 -04:00
bryanthaboi
ee891fb8fa
Merge pull request #993 from MaxTomahawk/feat/checkpoint-restore-event
...
feat(mods): signal verified checkpoint restores
2026-08-10 14:31:45 -04:00
bryanthaboi
9d73ff4110
yellow copyright diff
2026-08-10 14:27:00 -04:00
bryanthaboi
9234f12ed0
Merge remote-tracking branch 'origin/dev' into fix1038
...
# Conflicts:
# docs/modding.md
2026-08-10 14:14:39 -04:00
bryanthaboi
26e0bd227e
Merge pull request #1037 from dlloa/upstream-pr/platform-lifecycle-hooks
...
Add core.update / core.quit_to_launcher platform lifecycle hooks
2026-08-10 14:14:17 -04:00
bryanthaboi
9302bbcbf3
Merge branch 'fix1037' into fix1038
...
# Conflicts:
# docs/modding.md
2026-08-10 14:12:21 -04:00
bryanthaboi
1855f838ef
Merge remote-tracking branch 'origin/dev' into fix1037
...
# Conflicts:
# docs/modding.md
2026-08-10 14:11:45 -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
05668591ef
Merge pull request #965 from crusty/feat/worldapi-start-wild-battle
...
Add mod.world:startWildBattle
2026-08-10 14:09:28 -04:00
bryanthaboi
e74beec32d
Merge pull request #970 from swuff-star/modded-evo-item
...
add modding support for custom item effects
2026-08-10 14:09:23 -04:00
bryanthaboi
d3af63e013
Merge pull request #1020 from ArmstrongThomas/agent/variable-size-overworld-sprites
...
Support variable-size anchored overworld sprites
2026-08-10 14:09:13 -04:00
bryanthaboi
ca6bee64b9
Merge pull request #1042 from thibautbus/fix/android-ttf-dpi
...
Fix custom TTF rendering on Android
2026-08-10 14:09:07 -04:00
bryanthaboi
b52d183dba
Merge pull request #1024 from AverageConsumer/feature/semantic-pc-list-kinds
...
Mod API: expose semantic PC list kinds
2026-08-10 14:09:01 -04:00
bryanthaboi
23e1877a62
Merge pull request #1025 from AverageConsumer/feature/map-overview-detail-markers
...
Mod API: add detailed map overview data and POIs
2026-08-10 14:08:58 -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
1c2163bb5f
Merge pull request #1046 from ShaneMcGovernIE/shanemcgovernie-fix-encounter-rate-grace-period
...
Fix wild encounter grace period
2026-08-10 14:08:46 -04:00