Commit Graph

5309 Commits

Author SHA1 Message Date
Eduardo Quezada
71203c45b1
Sync Script and Mystery Event files with pokeemerald (#890)
Some checks failed
CI / build (push) Has been cancelled
2026-02-21 19:09:13 -05:00
Eduardo Quezada
f6e2a5901e
Port Wally Controller documentation from pokeemerald (#891)
Some checks failed
CI / build (push) Has been cancelled
2026-02-19 21:49:14 -05:00
GriffinR
7e4a1a3923
Merge pull request #887 from AsparagusEduardo/pret/pr/environment
Some checks failed
CI / build (push) Has been cancelled
2026-02-15 11:07:15 -05:00
GriffinR
df66e5a144
Merge pull request #880 from xyifer12/master
Some checks are pending
CI / build (push) Waiting to run
Town and City internal maps naming parity with PokeEmerald. Part 3 of 3.
2026-02-14 17:16:00 -05:00
GriffinR
1f33c6fd8f
Merge branch 'master' into master 2026-02-14 12:08:49 -05:00
Eduardo Quezada
3a385ea005
Sync some battle constants with pokeemerald (#888) 2026-02-14 12:07:13 -05:00
Eduardo Quezada
596bfbe4b5
Port pokeemerald braille documentation (#889) 2026-02-14 11:51:20 -05:00
Eduardo Quezada
afcbea1f17
Use JOY_NEW, JOY_HELD and JOY_REPT across the repo (#885)
Some checks are pending
CI / build (push) Waiting to run
2026-02-14 02:33:00 -05:00
Eduardo Quezada
43f5be2c82 Rename Terrain to Environment 2026-02-13 22:43:39 -03:00
GriffinR
0f2bde0f22
Merge pull request #886 from AsparagusEduardo/patch-1
Some checks failed
CI / build (push) Has been cancelled
Fix CI
2026-02-12 17:25:31 -05:00
Eduardo Quezada
3ba1cc111f
Fix CI 2026-02-12 07:02:10 -03:00
Marcus Huderle
4784b4c3f2
Update .wav samples to use 'agbl' chunk to accomodate for vanilla's off-by-one loop end behavior (#884)
Some checks failed
CI / build (push) Has been cancelled
2025-12-28 09:16:07 -06:00
Marcus Huderle
7b00217ff8
Convert .aif files to .wav (#883)
Some checks failed
CI / build (push) Has been cancelled
2025-12-01 09:01:56 -06:00
GriffinR
16ae9a9f8a
Merge pull request #881 from Kurausukun/fix_makefile
Some checks failed
CI / build (push) Has been cancelled
Fix GBAFIX Usage in Makefile
2025-06-23 19:06:46 -04:00
Kurausukun
f8e681cd6d fix include for mapjson 2025-06-23 16:26:09 -04:00
Kurausukun
11899b4e83 fix gbafix usage 2025-06-23 16:25:43 -04:00
GriffinR
5eb76d89ce
Merge pull request #879 from pret/porymap-6
Some checks failed
CI / build (push) Has been cancelled
Update for Porymap 6
2025-05-27 10:53:34 -04:00
Robin Xyifer
91b4d8ff9f Partial naming of Contest data, mostly focused on Lilycove. EN tested, DE not tested. 2025-05-16 13:10:06 -05:00
GriffinR
1439b0e84f Merge branch 'master' of https://github.com/pret/pokeruby into porymap-6 2025-05-14 12:04:46 -04:00
GriffinR
9ed27e20f9
Merge pull request #878 from xyifer12/TownAndCityInternalMapsNamesUpdatePart2
Some checks failed
CI / build (push) Has been cancelled
Town and City internal maps naming parity with PokeEmerald. Part 2 of 3.
2025-04-07 12:35:29 -04:00
Robin Xyifer
0f071632f7 Fixed RockSmashHMMan not being changed in german version. 2025-04-03 20:48:54 -05:00
Robin Xyifer
bff884654b Renamed RockSmashDude as this name was based on Emerald-exclusive dialogue. Now uses a generic RockSmashHMMan name. 2025-04-03 18:28:44 -05:00
Robin Xyifer
f8aaf27f88 Corrected naming of EvilTeam, now uses proper generic terminology in all known applicable cases. 2025-04-03 18:27:55 -05:00
Robin Xyifer
d5e5866a79 Corrected Delcatty being called Skitty in Sootopolis House3. Now correctly matches Ruby. 2025-04-03 18:27:04 -05:00
Robin Xyifer
0d1a4b3b3c Corrected some scripting being named after Juan when it should have been named after Wallace. 2025-04-03 18:26:17 -05:00
Robin Xyifer
b5b636198f Changed Lotad+Seedot / Shroomish+Barboach size comparison house' scripting. _LotadAndSeedotHouse_ becomes _MonSizeRecordHouse_ instead. 2025-04-03 18:24:07 -05:00
Robin Xyifer
ce54e7ab38 Replaced HusbandHasGiftForYou with HusbandHasSomethingForYou. 2025-03-27 18:35:26 -05:00
Robin Xyifer
253e0d3ce0 Final cleanup before final build tests. 2025-03-27 17:34:06 -05:00
Robin Xyifer
a41192c43c VerdanturfTown internal maps names parity update. 2025-03-27 17:19:34 -05:00
Robin Xyifer
15ab354b3d SootopolisCity internal maps names parity update. 2025-03-27 16:21:17 -05:00
Robin Xyifer
78ffcc3100 SlateportCity internal maps names parity update. 2025-03-27 01:00:26 -05:00
Robin Xyifer
81bf8e05db Merge branch 'TownAndCityInternalMapsNamesUpdatePart2' of https://github.com/xyifer12/pokeruby into TownAndCityInternalMapsNamesUpdatePart2 2025-03-23 23:16:41 -05:00
Robin Xyifer
14e819b3f4 RustboroCity internal maps names parity update. 2025-03-23 23:15:44 -05:00
Robin Xyifer
4f5b250efa PetalburgCity internal maps names parity update. 2025-03-23 23:14:52 -05:00
Robin Xyifer
9f8f9ba218 PetalburgCity internal maps names parity update. 2025-03-23 18:35:04 -05:00
Robin Xyifer
867a2c8ba1 PacifidlogTown internal maps names parity update. 2025-03-20 21:58:22 -05:00
Robin Xyifer
fd89017d1e OldaleTown internal maps names parity update. 2025-03-20 15:29:09 -05:00
Robin Xyifer
3336e43549 MossdeepCity internal maps names parity update. 2025-03-20 15:22:29 -05:00
Robin Xyifer
52e3f2c768 MauvilleCity internal maps names parity update. 2025-03-16 05:37:01 -05:00
GriffinR
fac7e44cb1
Merge pull request #877 from xyifer12/TownAndCityInternalMapsNamesUpdate
Some checks failed
CI / build (push) Has been cancelled
Town and City internal maps naming parity with PokeEmerald. Part 1 of 3.
2025-03-14 11:57:27 -04:00
Robin Xyifer
fc476fa8a8 Corrected DE dialogue name for SEEGRASULB CITY elevator operator. 2025-03-13 19:54:45 -05:00
Robin Xyifer
18784d3a27 Revision and cleanup before build testing. 2025-03-13 18:59:56 -05:00
Robin Xyifer
cfdeb74236 LittlerootTown internal maps name parity update. 2025-03-13 18:42:40 -05:00
Robin Xyifer
ecd31b9fa2 LilycoveCity internal maps name parity update. 2025-03-13 15:45:50 -05:00
Robin Xyifer
9374e6261a LavaridgeTown internal maps name parity update. 2025-03-11 21:21:07 -05:00
Robin Xyifer
b431e9f8fc FortreeCity internal maps name parity update. 2025-03-11 20:45:24 -05:00
Robin Xyifer
9a26d88699 FallarborTown internal maps name parity update. 2025-03-11 18:55:05 -05:00
Robin Xyifer
9773041803 EverGrandeCity internal maps name parity update. 2025-03-10 15:40:26 -05:00
Robin Xyifer
6a3a6eaba4 DewfordTown 2025-03-07 14:16:57 -06:00
GriffinR
eb894d6020
Merge pull request #876 from xyifer12/VictoryRoadNameParityUpdate
Some checks failed
CI / build (push) Has been cancelled
VictoryRoad script+dialogue naming update.
2025-03-06 00:36:22 -05:00