Commit Graph

1864 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
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
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
Robin Xyifer
15ab354b3d SootopolisCity internal maps names parity update. 2025-03-27 16:21:17 -05:00
Robin Xyifer
14e819b3f4 RustboroCity internal maps names parity update. 2025-03-23 23:15:44 -05:00
Robin Xyifer
9f8f9ba218 PetalburgCity internal maps names parity update. 2025-03-23 18:35:04 -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
Robin Xyifer
18784d3a27 Revision and cleanup before build testing. 2025-03-13 18:59:56 -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
9a26d88699 FallarborTown internal maps name parity update. 2025-03-11 18:55:05 -05:00
Robin Xyifer
6a3a6eaba4 DewfordTown 2025-03-07 14:16:57 -06:00
Robin Xyifer
0899135d30 Ancillary changes for Town and City name parity update with Emerald. 2025-02-26 13:44:06 -06:00
Xyifer
6eec908ad1
AbandonedShip name parity update with PokeEmerald. (#874)
Some checks failed
CI / build (push) Has been cancelled
2025-02-25 09:18:15 -05:00
Xyifer
c3530bdf81
Route110_TrickHouse name parity with PokeEmerald. (#873)
Some checks are pending
CI / build (push) Waiting to run
2025-02-24 18:07:07 -05:00
GriffinR
c1ab4bb7d1 Generate heal location constants automatically 2025-02-10 13:55:58 -05:00
GriffinR
cb26a6faeb Add support for local IDs in map.json 2025-02-10 13:30:29 -05:00
GriffinR
a4f0d1b400 Generate MAPSEC constants from JSON 2024-11-08 19:41:31 -05:00
GriffinR
0696597361
Move heal locations data to their associated map.json (#869) 2024-10-11 15:17:42 -04:00
GriffinR
68acbcf740 Merge branch 'master' of https://github.com/pret/pokeruby into porymap-6 2024-10-11 13:38:51 -04:00
luckytyphlosion
e1eeb8862b
Merge branch 'master' into work9 2024-09-30 19:10:37 -04:00
luckytyphlosion
e898671d0d
Merge pull request #858 from AreaZeroArven/work8
Unassembler and rename sub_8044804
2024-09-30 19:10:22 -04:00
GriffinR
841eb51af6 Merge branch 'master' of https://github.com/pret/pokeruby into porymap-6 2024-09-24 16:01:06 -04:00
GriffinR
7505574a7d Sync tools 2024-09-18 11:39:43 -04:00
GriffinR
f3adadae79 Sync map macro change with pokeemerald 2024-08-27 13:57:55 -04:00
GriffinR
4cfc9ee51c Sync labels in AbandonedShip corridor scripts 2024-01-18 15:56:42 -05:00
GriffinR
4a3310af67 Remove non-existent tilesets from label comments and alphabetize 2024-01-18 14:51:07 -05:00
SnorlaxMonster
a5503c0950 Rename HITMARKER_IGNORE_SAFEGUARD
Rename HITMARKER_IGNORE_SAFEGUARD to HITMARKER_STATUS_ABILITY_EFFECT.
This flag is used exclusively by status-inflicting Abilities,
and has 3 main functions:
- Whether the effect bypasses Shield Dust
- Whether the effect bypasses Safeguard
- Which text string to display when the status condition is inflicted
   (i.e. whether it was inflicted by a move or Ability)

I believe this new name better represents what the flag actually does.
This name was structured to parallel HITMARKER_SYNCHRONISE_EFFECT.
2023-11-18 13:56:27 +11:00
citrusbolt
c6d75c0c60 Add blockBoxRS field to struct BoxPokemon 2023-09-09 22:05:43 -06:00
WhenGryphonsFly
31b9edb97d
Correct KEY_INTR_ENABLE 2023-08-27 16:29:10 -05:00
GriffinR
28b53dc44b Sync fieldmap 2023-05-09 16:09:33 -04:00
GriffinR
af019d660f Sync mapjson/map.inc with pokeemerald 2023-05-09 16:09:26 -04:00
Arven
9ad4c9c774 Synchronize function names with pokeemerald 2023-01-07 13:54:20 -05:00
Arven
eb2d041143 Unassembler and rename sub_8044804
This function is known as CreatePartyStatusSummarySprites in pokeemerald
2023-01-07 13:51:35 -05:00
GriffinR
4084e7832b MAP_NONE -> MAP_DYNAMIC 2022-08-26 14:34:50 -04:00
Jademalo
9ed24500ac IDE support formatting and consistency 2021-10-23 10:10:08 +01:00
Jademalo
4fbae0d4c9 Improve IDE Support 2021-10-22 04:44:46 +01:00
SatoMew
f931f40b1b Replace incorrect instances of Mystery Gift with Mystery Event 2021-09-12 23:08:09 +01:00
Kurausukun
cc0720f061 port cgb documentation and fakematch fixes 2021-08-08 20:48:28 -04:00
PikalaxALT
20ddd44176 Remove braces around one-line expressions; add constants/rgb.h 2021-07-12 17:00:40 -04:00
PikalaxALT
5fe1a85bd8 Match sub_80EF624 2021-07-10 16:03:33 -04:00
PikalaxALT
b86d6d05d9 Fix style issues 2021-07-08 08:38:51 -04:00