Commit Graph

702 Commits

Author SHA1 Message Date
bryanthaboi e81362907a CLOSES #2843, CLOSES #2844, CLOSES #2845, CLOSES #2846 2026-10-10 14:06:59 -04:00
bryanthaboi daf8673954 CLOSES #2840, CLOSES #2841 2026-10-10 09:37:06 -04:00
bryanthaboi 8fae5bd472 CLOSES #2833, CLOSES #2835, CLOSES #2836, CLOSES #2838, CLOSES #2839 2026-10-10 09:16:28 -04:00
bryanthaboi 4ee2c8011f oakie doke 2026-10-10 07:34:17 -04:00
bryanthaboi 8f6360f695 CLOSES #2817, CLOSES #2818, CLOSES #2819, CLOSES #2820, CLOSES #2821, CLOSES #2822, CLOSES #2823, CLOSES #2824, CLOSES #2825, CLOSES #2826, CLOSES #2827, CLOSES #2831, CLOSES #2832 2026-10-09 23:06:42 -04:00
bryanthaboi 4db70c5764 CLOSES #2813, CLOSES #2815 2026-10-09 13:36:14 -04:00
bryanthaboi 5445ef017e CLOSES #2802, CLOSES #2803, CLOSES #2804, CLOSES #2805, CLOSES #2806, CLOSES #2807, CLOSES #2808 2026-10-09 09:13:45 -04:00
bryanthaboi ca007c5c0c CLOSES #2793, CLOSES #2794, CLOSES #2795, CLOSES #2796, CLOSES #2797, CLOSES #2798 2026-10-08 20:54:39 -04:00
bryanthaboi 2eec7c0fd5 CLOSES #2770, CLOSES #2772, CLOSES #2773, CLOSES #2775, CLOSES #2779, CLOSES #2780
CLOSES #2770, CLOSES #2772, CLOSES #2773, CLOSES #2775, CLOSES #2779, CLOSES #2780
2026-10-08 12:46:55 -04:00
bryanthaboi d98f454c89 CLOSES #2768, CLOSES #2771, CLOSES #2778 2026-10-08 12:12:15 -04:00
bryanthaboi c819846a3d CLOSES #2759, CLOSES #2761, CLOSES #2762, CLOSES #2763, CLOSES #2764, CLOSES #2765, CLOSES #2766, CLOSES #2767
CLOSES #2759, CLOSES #2761, CLOSES #2762, CLOSES #2763, CLOSES #2764, CLOSES #2765, CLOSES #2766, CLOSES #2767
2026-10-08 10:20:26 -04:00
bryanthaboi 1a2eb790bd Xbox fix ci 2026-10-08 05:46:19 -04:00
bryanthaboi f56dd2ba66 Merge pull request #2755 from Nexhas28/debug/save-editor-volcanic-ash-2752-corrected 2026-10-07 22:44:52 -04:00
bryanthaboi 91d58affdc CLOSES #2732, CLOSES #2746, CLOSES #2756 2026-10-07 22:40:12 -04:00
bryanthaboi 527957de52 editor clean up 2026-10-07 19:07:05 -04:00
Shane McGovern 73cecd03a8 fix(save-editor): add Volcanic Ash editing for RSE 2026-10-07 23:35:54 +01:00
bryanthaboi b148773169 more 2026-10-07 17:02:29 -04:00
bryanthaboi eba60c9074 Test follower draw compatibility 2026-10-07 16:48:54 -04:00
bryanthaboi fde27a91f6 Merge pull request #2504 from tomasmorello/ps4-port 2026-10-07 15:43:01 -04:00
Autoresearch f5235858e9 Android: prevent audio focus freeze and add audio mode option (fixes #2742)
- On Android, allow game audio to mix with external audio by default instead of demanding exclusive audio focus and freezing when focus changes.
- Add an 'AUDIO MODE' option across Gen 1, Gen 2, and Gen 3 options menus and Launcher Settings:
  - BOTH: Game BGM and SFX mix with external media.
  - EXT ONLY: In-game BGM is muted while SFX remains active, mixing with external media.
  - GAME ONLY: Requests exclusive audio focus (AUDIOFOCUS_GAIN), pausing background media.
- Guard Gen 3 waitse/waitfanfare audio script waits with timeouts and Audio._suspended checks so script execution never blocks indefinitely when audio is paused or interrupted.
- Expose setAudioMixWithSystem / love.audio.setMixWithSystem via JNI / C++ to dynamically toggle Android audio focus behavior based on user setting.
- Add unit test suite in tests/engine/audio_focus_mode_test.lua.
2026-10-07 20:16:18 +01:00
bryanthaboi 3f834580dd Merge branch 'dev' of https://github.com/bryanthaboi/gen1recomp into dev 2026-10-07 14:31:40 -04:00
bryanthaboi e69b408744 union for all 2026-10-07 14:31:38 -04:00
bryanthaboi 7eb96ddb4d Merge pull request #2745 from thibautbus/fix/rs-secret-base-owner-name
Name a Ruby or Sapphire secret base from the cart's own row
2026-10-07 12:11:34 -04:00
bryanthaboi de6c5f5b89 Merge pull request #2747 from thibautbus/feat/metric-pokedex-units
Print Pokédex heights and weights in metric units when a mod gives them
2026-10-07 12:11:15 -04:00
HimioneGranger 0937e3f24b Add native Black/White battle-sprite importer with complete animations (#2598)
* Add native Black and White battle sprite importer and shared provider

* Reduce Gen 5 import scheduling and duplicate atlas work

* Play long Gen 5 idle animations from independent part tracks

* Skip part tracks when a late frame cannot be composed

* Fix importer picker lifecycle, Xbox formats, and CI coverage

* Fix Linux Gen 5 test discovery and picker regression checks

* Preserve original Gen 5 sprite resolution in provider API 2

* Trim importer comments and documentation
2026-10-07 12:10:37 -04:00
thibautbus 1caddb54e4 Print the Gen 3 Pokédex heights and weights in metric units
FireRed/LeafGreen's, Ruby/Sapphire's and Emerald's Pokédex pages print a species' height in feet and inches and its weight in pounds, converted from the cart's decimetres and hectograms; the localized carts print metres and kilograms. A mod can now give a Gen 3 species its metric height and weight the way it can on Red/Blue and Gold/Silver: the Gen 3 dexEntry schema takes heightM and weightKg, and a patch carries them into the dex table Pokemon.dexEntry reads.

src/core/game3/pokedex_units.lua tells whether a species has them, without loading the dex table itself, and formats them with one decimal and a comma before Strings("m") and Strings("kg"). FireRed/LeafGreen's entry page uses them for a seen or caught species, resolved once per species and caught state rather than on every draw; Ruby/Sapphire's and Emerald's entry pages use them for a caught species, each aligning the digits as its imperial weight does (two spaces per missing digit on Ruby/Sapphire's native page, as the cart's metric printer shifts the number by a digit's width, pokeruby src/pokedex.c:4300; {UNK_SPACER} on Emerald's), and keep the cart's unknown rows for a seen one.
2026-10-07 17:29:17 +02:00
thibautbus 722c2fc45e Print Gold and Silver's Pokédex heights and weights in metric units
The #DEX page prints the US cart's height in feet and inches, with the foot and inch tiles, and its weight in pounds; the localized carts print metres and kilograms ("TAI  ???m", "PDS  ???kg"). A mod can now give a species its metric height and weight the way it can on Red/Blue: mod.content.pokemon:patch(id, { dexEntry = { heightM = ..., weightKg = ... } }). src/core/gen2/PokedexText.lua copies them onto the #DEX entry beside the cart's own values, and the page then prints them with one decimal and a comma, right-aligned before the "m" and "kg" labels, "???" until the species is caught; the printout draws the same body, and the plain page drawn without the cache's dex sheet prints the metric values as it prints the imperial ones. The Gen 2 pokemon schema declares the dexEntry fields the #DEX page reads.

The Pokédex resolves the "m" and "kg" labels when it opens (PokedexMenu.new) rather than on every frame.
2026-10-07 17:29:17 +02:00
thibautbus 20a0fc65cd Print the metric unknown height and weight on a seen Red/Blue entry
The Pokédex page prints a species' dexEntry.heightM and weightKg when it carries them ("GR. %.1fm", "GEW. %.1fkg"), the way the localized carts print metres and kilograms. An entry seen but not caught printed nothing there, where the imperial fields print their question marks (engine/menus/pokedex.asm:449-450) and the localized carts their own mask ("GR.  ???m", "GEW  ???kg"). It now prints "GR. ???m" and "GEW. ???kg", which a translation mod words like the two formats.

The entry page resolves both masks when it opens (DexEntryMenu.new) rather than on every frame; the printer's one-off render still looks them up itself.
2026-10-07 16:04:25 +02:00
thibautbus f7b9006a8c Name a Ruby or Sapphire secret base from the cart's own row
A secret base is named after its owner: the owner's name, then the row the US carts append ("'s BASE"): Emerald's gText_ApostropheSBase, which Ruby and Sapphire's text aliases point at their gOtherText_PlayersBase. SB.name fills the STR_VAR_1 of Emerald's European rows, but Ruby and Sapphire's European rows name the owner with the player placeholder ("BASIS v. {PLAYER}", "BASE DE {PLAYER}"), which the German cart fills with the owner's name (pokeruby/src/secret_base.c:642, de_sub_8073174), and the TV's map name appended the row after the owner's name. With a translation mod, a base was named "MAYBASE DE " followed by the player's own name.

SB.nameWith fills either placeholder with the owner, or appends the row where it has none; the secret base's name and the TV's map name both use it.

The registry lists draw every registered base's name on every frame, so the rendered row is kept per row text, label and catalog state, and naming another owner only fills it.
2026-10-07 15:56:34 +02:00
bryanthaboi c68ba87907 Merge pull request #2743 from thibautbus/fix/rs-starter-category-utf8
Cut Ruby and Sapphire's starter category by characters
2026-10-07 09:46:17 -04:00
thibautbus d0cbee79de Cut Ruby and Sapphire's starter category by characters
The starter selection labels a starter with its category's first 11
characters (pokeruby/src/starter_choose.c:522), but cut the string at 11
bytes. An English category fits, but a translated one can be written in
multi-byte UTF-8: a Japanese category, three bytes a character, was cut
in the middle of its fourth character, and an accented letter can be cut
the same way. The label now keeps 11 characters (FrlgFont.truncate).
2026-10-07 15:19:47 +02:00
bryanthaboi cafb6e63da followups 2026-10-07 09:14:37 -04:00
bryanthaboi fcdaecd496 CLOSES #2726, CLOSES #2727, CLOSES #2729, CLOSES #2730, CLOSES #2731, CLOSES #2733, CLOSES #2734, CLOSES #2735, CLOSES #2736, CLOSES #2737, CLOSES #2740 2026-10-07 06:04:57 -04:00
bryanthaboi 2f89018cb3 home / migration box work 2026-10-07 04:19:41 -04:00
bryanthaboi 21a64419fd PR #2725: strip comments, drop unused FilePicker.SAVE and ensureDecompressed 2026-10-06 20:13:27 -04:00
bryanthaboi 96d03d7581 Merge pull request #2725 from pokeparadox/dev 2026-10-06 20:05:59 -04:00
bryanthaboi 1c46326ab9 Merge pull request #2579 from flaviodelima/fix/battle-text-ttf-advance
# Conflicts:
#	src/battle/BattleState.lua
2026-10-06 20:05:48 -04:00
bryanthaboi c926b0f2d4 PR #2724: strip test comments 2026-10-06 20:02:32 -04:00
bryanthaboi 3cbf780369 Merge pull request #2724 from thibautbus/feat/rs-translation-runtime 2026-10-06 20:00:47 -04:00
bryanthaboi 07f9f8796c PR #2716: raw joysticks read axes 1/2 only, speed rows show 0/1, strip comments 2026-10-06 20:00:34 -04:00
bryanthaboi 74694e452a Merge pull request #2716 from Nexhas28/feat/sdl-controller-support 2026-10-06 19:56:51 -04:00
bryanthaboi 93cd84d232 follow up 2026-10-06 19:45:14 -04:00
bryanthaboi e7d5b86c93 CLOSES #2484, CLOSES #2600, CLOSES #2694, CLOSES #2708, CLOSES #2713, CLOSES #2723 2026-10-06 19:00:50 -04:00
bryanthaboi 4ecf6f371f launcher pauncher 2026-10-06 17:26:40 -04:00
Kevin Winfield-Pantoja 5b927d875f Merge branch 'bryanthaboi:dev' into dev 2026-10-06 22:17:17 +01:00
PokeParadox f8ed24ff6e Import ROM from .zip/.7z archives
RomArchive sniffs magic, probes platform mount capability (zip/7z,
cached), unwraps first accepted-size ROM (prefer known SHA-1). Wired
into startData, filedropped game-tab zip routing, chooseRom picker
exts, FileBrowser rom filter (hidden when capability probe fails).
2026-10-06 21:45:25 +01:00
thibautbus 2d404a7dc7 Resolve Ruby and Sapphire's party prompts again each time the menu opens
The prompt a mode shows (Choose a POKéMON., Move to where?...) was kept on the party menu for the rest of the session. PartyMenu.show now clears it, like the menu's other per-open state, so a prompt is resolved once per opening.
2026-10-06 22:27:57 +02:00
thibautbus 359f41ff76 Print Ruby and Sapphire's party menu prompts from the cart's text
The party menu's prompts (Do what with {STR_VAR_1}?, Choose a POKéMON., Move to where?...) printed the rse/party pack's copies, plain English strings that also dropped the POKéMON's name from Do what with {STR_VAR_1}?. They now read the script cache by their PartyMenuPromptTexts slot, with the selected POKéMON's name as STR_VAR_1, the pack's copy as the fallback; a prompt is resolved once for the menu or mode that shows it.
2026-10-06 22:27:57 +02:00
thibautbus 117af9f40c Resolve Ruby and Sapphire's party menu actions once per menu
Data.drawActions looked each action's text up in the script cache on every frame. It now draws the texts the party menu resolves once for each action list (action_texts, exposed as PartyMenu._actionTextsFor), as Emerald's and FireRed's menus already do.
2026-10-06 22:27:57 +02:00
thibautbus 6a5d69adb8 Print Ruby and Sapphire's party menu actions from the cart's text
The Ruby/Sapphire party menu printed its actions from the rse/menus
pack's cursor options, plain English strings the extractor copied from
sPokemonMenuActions, and a field move's English label, so a translation
mod's SUMMARY, SWITCH, ITEM and the others never showed. The actions now
read the script cache by the labels sPokemonMenuActions points at
(pokeruby/src/pokemon_menu.c:126), with the pack's copy as the fallback,
and a field move prints its move's name, as the cart does; Emerald's
party menu does the same since gen1recomp#2678.
2026-10-06 22:27:57 +02:00