Commit Graph

8079 Commits

Author SHA1 Message Date
Martin Griffin
8baea56025
Support for French, Italian and Spanish (#2165)
* Setting up french makefile

* Added missing makefile changes

* First pair

* Finished the rest of the Abandoned Ship text

* 37/654

* 50/654

* 54/654, going to bed

* (55/654) src/battle_message.c and adjustments to Makefile

* (56/654) Berry fix gba file + finalizing format for inc files

* (56/654)

* (68/654)

* (90/654)

* (102/654)

* (125/654)

* (148/654)

* Abilities and Ribbon descriptions + fix in strings.c

* Bard sounds

* (185/654)

* Berry Blender graphics + Moved Easy Chat

* (197/654)

* (200!/654)

* Moved french types to their own folder

* (202/654) Title screen

* Incorporated Italian changes, enough to compile (still needs to sync a couple of them)

* (205/665) Italian up to date with French

* (234/665)

* (241/665)

* Corrected CopyFrontierBrainTrainerName

* (256/665)

* (260/665)

* 264/665

* 270/665

* 279/665

* 294/665

* 306/665

* 315/665

* 328/665

* 333/665

* 366/665

* 382/665

* 385/665

* Fixed include/constants/global.h being remade on each build

* Seperated Text from script Battle Frontier 1/2

* Revert "Seperated Text from script Battle Frontier 1/2"

This reverts commit f29441cf21.

* Seperated Text from script Battle Frontier 1/2

Hoffentlich jetzt in den richtigen ordner

* Seperated Text from script Battle Frontier 2/2

* Updated CI to not do compare for now

* CI fix attempt

* Fixed end of file newlines

* Seperated Text from script CaveOfOrigin_B1F - FallarborTown_BattleTentCorridor

effected locations
CaveOfOrigin_B1F
DewfordTown
EverGrandeCity
FallarborTown - FallarborTown_BattleTentCorridor

* Verdanturf, Rusturf, Victory Road (437/665)

* Fonts (461/665)

* Trainer names (462/665)

* Decorations + general language string macro

* Seperated Text from script FallarborTown-JaggedPass

Seperated Text from script FallarborTown, FarawayIsland, FortreeCity, GraniteCave, InsideOfTruck & JaggedPass

* Seperated Text from script LavaridgeTown-LilycoveCity_House1

Seperated Text from script LavaridgeTown, LilycoveCity_ContestHall - LilycoveCity_House1

* Summary screen (499/665)

* Seperated Text from script LilycoveCity-MauvilleCity_PokemonCenter_1F

Seperated Text from script LilycoveCity, MagmaHideout, MauvilleCity - MauvilleCity_PokemonCenter_1F

* Seperated Text from script MauvilleCity_PokemonCenter_2F-MtChimney

Seperated Text from script MauvilleCity_PokemonCenter_2F, MeteorFalls, MirageTower, MossdeepCity, MtChimney

* Pokemon Storage

* Seperated Text from script MtPyre-PetalburgCity_House1

Seperated Text from script MtPyre, NewMauville, OldaleTown, PacifidlogTown, PetalburgCity - PetalburgCity_House1

* Seperated Text from script PetalburgCity_House2-RustboroCity_House3

Seperated Text from script PetalburgCity_House2 - PetalburgCity_WallysHouse, PetalburgWoods, Route120 - 128, RustboroCity_CuttersHouse - RustboroCity_House3

* Pokémon Jump and Pokédex (603/665)

* Pokéblock gfx (608/665)

* Naming Screen (615/670)

* Item names (616/670)

* Seperated Text from script RustboroCity-SkyPillar

Seperated Text from script RustboroCity_Mart - RustboroCity, SeafloorCavern, ShoalCave, SkyPillar

* Seperated Text from script SlateportCity-SootopolisCity_House6

Seperated Text from script SlateportCity, SootopolisCity_Gym_1F - SootopolisCity_House6

* Final non-script changes (659/670)

* Duplicated english script text files to use as a base for spanish integration

* Removed accidental script inclusion

* Seperated Text from script SootopolisCity_House7-Underwater_SeafloorCavern

Seperated Text from script SootopolisCity_House7 - SootopolisCity, SSTidal, TrainerHill, Underwater_SeafloorCavern

* Multiple matching fixes

* Fixed LoopedTask_OpenRibbonsMonList for Italian (ty Egg!)

* Moving to folders

* More french-matching fixes

* Final french gfx matching diffs

* French: OK

* Started to standarize graphics folders (#34)

* Italian: OK

* Italian Compare in CI

* Added make compare_all

* Full name for language directories

* Initial Spanish (can't compile yet)

* Added Spanish Textfile AbandonedShip-BattleFrontier_BattleTowerMultiBattleRoom

Added Spanish Textfile AbandonedShip, AquaHideout, BattleFrontier_BattleArenaBattleRoom - BattleFrontier_BattleTowerMultiBattleRoom

* Disabled non-working spanish compile for now

* English as proper default

* SPA: Title Screen

* Map section names default to english when they aren't present in the JSON

* Restored English Matching

* Fixed matching French and Italian

* Fixed CI

* Add Spanish text to data maps

* add spanish data/text

* Spanish data/text/general.inc

* Move types

* Charmap and Battle tower

* Some updates

* SPANISH: Finished Pokénav files

* Fix compiling Spanish (still doesn't match)

* Summary screen and pkmn jump

* Fixed make clean not removing build directories for languages

* More

* Fix matching

* Moreee

* Fix spanish compile again

* src files that start with f

* moooooore

* Battle files

* easy chat files

* Berries

* Files with C

* Battle Frontier Data

* Almost all non-graphics data done

* Restore some makefile configs

* Final non-graphic changes

* Gfx

* More gfx

* More more gfx

* More more more gfx

* Pokenav left headers gfx

* Pokenav options gfx

* almooost

* Last GFX

* ALMOST THERE

* ALMOST ALMOST

* POKÉMON EDICIÓN ESMERALDA

* Compare on CI

---------

Co-authored-by: dennisw100 <100dennisw@gmail.com>
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2026-06-09 13:22:40 +01:00
Eduardo Quezada
6546971313 Merge branch '_pret/master' into pret_europe 2025-07-27 11:15:48 -04:00
GriffinR
f85baa5358
Merge pull request #2164 from cawtds/shop-menu-palette
Some checks failed
CI / build (push) Has been cancelled
Document shop menu palette
2025-07-26 14:36:03 -04:00
cawtds
5da5cb4c8c document shop menu palette 2025-07-26 20:19:45 +02:00
GriffinR
6f8a1bbdb8
Add pack/unpack for data masks (#2163)
Some checks failed
CI / build (push) Has been cancelled
2025-07-23 09:28:34 +01:00
GriffinR
20012cba6e
Merge pull request #2130 from Catnip-Consumer/preproc-windows-fixes
Some checks failed
CI / build (push) Has been cancelled
Apply fixes to preproc for Windows compatibility
2025-07-21 18:56:37 -04:00
Philipp AUER
e63e89e270
Fix potential stack memory leak in gbagfx due to out of bounds read (#2162)
Some checks are pending
CI / build (push) Waiting to run
* fix(tools): gbagfx potential oob read

---------

Co-authored-by: sbird <sbird@no.tld>
2025-07-21 18:33:44 +01:00
GriffinR
e22b799d7f
Merge pull request #2160 from rayrobdod/align_rl
Some checks failed
CI / build (push) Has been cancelled
Fix RL compressed data alignment
2025-07-17 13:22:41 -04:00
Raymond Dodge
80b9c23d0a
Fix RL compressed data alignment
`RLUnComp`, like `LZ77UnComp`, expects the source data to be word-aligned.
So, to mirror how lz-compressed data is defined as `u32[]` to enforce
word-alignment, this changes rl-compressed data to be defined as `u32[]`
to enforce word-alignment.
2025-07-06 13:49:47 -04:00
GriffinR
aac44d0f91
Merge pull request #2073 from AsparagusEduardo/_pret/pr/pyramidLocation
Some checks failed
CI / build (push) Has been cancelled
Improve Pyramid location documentaion
2025-06-30 13:30:14 -04:00
GriffinR
6ead1e50df
Merge pull request #2159 from GriffinRichards/mapsec-default
Add explicit defaults for MAPSEC data
2025-06-30 13:25:48 -04:00
GriffinR
0c7c81e02f
Merge branch 'master' into _pret/pr/pyramidLocation 2025-06-30 11:51:45 -04:00
GriffinR
44c3069895 Add explicit defaults for MAPSEC data 2025-06-26 16:26:59 -04:00
GriffinR
670d3a6c9f
Merge pull request #2152 from GriffinRichards/mapsec-data
Some checks failed
CI / build (push) Has been cancelled
Relax MAPSEC region map data requirements
2025-06-25 22:05:35 -04:00
GriffinR
2a7a4f1e76
Merge pull request #2127 from AsparagusEduardo/_pret/maxLinkPlayers
Fix other missing instances of MAX_LINK_PLAYERS
2025-06-25 22:05:13 -04:00
DizzyEggg
9df5ab16e8
Ensure sMonMarkings_Gfx alignment (#2158)
Some checks are pending
CI / build (push) Waiting to run
2025-06-25 19:41:23 +01:00
DizzyEggg
64a6e8817c
Fix sGpuRegBuffer potential alignment issues (#2157)
Some checks are pending
CI / build (push) Waiting to run
2025-06-25 17:54:13 +01:00
DizzyEggg
e1b83d6056
Match graphics declarations with externs (#2089)
Some checks failed
CI / build (push) Has been cancelled
2025-06-23 20:31:18 +01:00
GriffinR
4ce83c7d96
Merge pull request #2104 from GriffinRichards/fix-collision-comparison
Some checks are pending
CI / build (push) Waiting to run
Fix collision comparison in PlayerNotOnBikeMoving
2025-06-22 20:05:30 -04:00
GriffinR
f029fc5eac
Merge pull request #2156 from DizzyEggg/temps
Fix wrong keep temps files directory in makefile
2025-06-22 19:54:58 -04:00
DizzyEggg
53f8ae11ff
Move gTradePlatform_Tilemap to header (#2088) 2025-06-22 19:48:37 -04:00
DizzyEggg
01fc7e76ef Fix wrong keep temps files directory in makefile 2025-06-22 11:26:31 +02:00
GriffinR
e2e3438674 Add missing uses of LOCALID_NONE for trainerbattle
Some checks failed
CI / build (push) Has been cancelled
2025-06-20 15:33:12 -04:00
psf
75fe3e7da6
Fixed typo in sMoveRelearnerMenuState (#2155) 2025-06-17 15:38:33 +01:00
GriffinR
bfa3e4a07b
Merge pull request #2145 from abaresk/remove-berryfix
Some checks failed
CI / build (push) Has been cancelled
Remove berry yield bug fix
2025-06-15 00:41:33 -04:00
GriffinR
5a3fc2a61b
Merge pull request #2154 from DizzyEggg/patch-1
Fix AnimItemSteal_Step3 and AnimKnockOffOpponentsItem matches
2025-06-13 11:28:26 -04:00
DizzyEggg
1cc4321a42
Fix AnimItemSteal_Step3 and AnimKnockOffOpponentsItem matches 2025-06-13 16:45:24 +02:00
Eduardo Quezada
acef8d208e Merge branch '_pret/master' into pret_europe 2025-06-11 09:45:39 -04:00
GriffinR
50d81616cd Relax MAPSEC region map data requirements 2025-06-10 13:05:03 -04:00
GriffinR
ec6e85d4b4
Merge pull request #2151 from ghoulslash/pret/repeatparticlefix
Fix Repeat Ball Particle Animation Sprite Count
2025-06-09 16:43:57 -04:00
ghoulslash
96844bd3bb fix sprite count in RepeatBallOpenParticleAnimation 2025-06-09 16:19:25 -04:00
GriffinR
2101c73266
Merge pull request #2150 from cawtds/list-menu-documentation
Document list menu functions
2025-06-02 21:24:06 -04:00
cawtds
b36a78ed47 replace magic numbers with enums 2025-06-02 22:55:41 +02:00
cawtds
0fc900514b sync list menu functions with firered 2025-06-02 22:51:26 +02:00
GriffinR
0c32d840fa
Merge pull request #2141 from pret/porymap-6
Update for Porymap 6
2025-05-27 10:53:17 -04:00
GriffinR
fba096a500 Remove map_group_count.h 2025-05-22 13:59:23 -04:00
GriffinR
d6962aacd7
Merge pull request #2146 from AlexOn1ine/removeFiles
Remove files that were wrongly commited
2025-05-22 13:58:18 -04:00
AlexOn1ine
e245f1ec22 Remove files that were wrongly commited 2025-05-22 14:33:31 +02:00
Alex
b31a73f990
Rename ItemId_GetX to GetItemX (#2116) 2025-05-22 13:27:52 +01:00
Abaresk
bef343cefa Remove berry yield bug fix 2025-05-21 16:11:18 -04:00
Kurausukun
bd0a02c456
Correct C23 Checks (#2144)
Some checks failed
CI / build (push) Has been cancelled
2025-05-19 15:43:06 +01:00
Bassoonian
59d315734d
Update header files to match source files (#2143) 2025-05-19 09:18:04 +01:00
Kurausukun
e1e7d1cf35
Fixes for C23 Support (#2138)
Some checks are pending
CI / build (push) Waiting to run
* fixes for c23 support
* include global.h in m4a.c & remove <string.h> include
2025-05-19 09:11:59 +01:00
Bassoonian
16357c7e29
Streamline pointer notation (#2139)
Some checks failed
CI / build (push) Has been cancelled
2025-05-16 12:04:44 +01:00
GriffinR
74bf498aaa
Merge pull request #2137 from mrgriffin/pret-suspicious-setvar
Some checks are pending
CI / build (push) Waiting to run
Warn on suspicious setvar usages
2025-05-15 17:21:00 -04:00
Martin Griffin
54e9505d2b Warn on suspicious setvar usages 2025-05-15 09:42:59 +01:00
GriffinR
929bc8b990 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2025-05-14 11:50:11 -04:00
GriffinR
0aae36984f
Merge pull request #2136 from mrgriffin/pret-remove-files
Some checks failed
CI / build (push) Has been cancelled
Remove files that should not have been committed in #2126
2025-05-13 12:15:58 -04:00
Martin Griffin
484c41c49d Remove files that should not have been committed 2025-05-13 14:56:31 +01:00
Alex
51b000860b
Add BattlerId enum and document (#2135)
Some checks failed
CI / build (push) Has been cancelled
2025-05-11 07:36:39 +01:00