ecd31b9fa2
LilycoveCity internal maps name parity update.
2025-03-13 15:45:50 -05:00
9374e6261a
LavaridgeTown internal maps name parity update.
2025-03-11 21:21:07 -05:00
9a26d88699
FallarborTown internal maps name parity update.
2025-03-11 18:55:05 -05:00
6a3a6eaba4
DewfordTown
2025-03-07 14:16:57 -06:00
0899135d30
Ancillary changes for Town and City name parity update with Emerald.
2025-02-26 13:44:06 -06:00
6eec908ad1
AbandonedShip name parity update with PokeEmerald. ( #874 )
2025-02-25 09:18:15 -05:00
c3530bdf81
Route110_TrickHouse name parity with PokeEmerald. ( #873 )
2025-02-24 18:07:07 -05:00
7505574a7d
Sync tools
2024-09-18 11:39:43 -04:00
4cfc9ee51c
Sync labels in AbandonedShip corridor scripts
2024-01-18 15:56:42 -05:00
4a3310af67
Remove non-existent tilesets from label comments and alphabetize
2024-01-18 14:51:07 -05:00
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
28b53dc44b
Sync fieldmap
2023-05-09 16:09:33 -04:00
af019d660f
Sync mapjson/map.inc with pokeemerald
2023-05-09 16:09:26 -04:00
4084e7832b
MAP_NONE -> MAP_DYNAMIC
2022-08-26 14:34:50 -04:00
20ddd44176
Remove braces around one-line expressions; add constants/rgb.h
2021-07-12 17:00:40 -04:00
b86d6d05d9
Fix style issues
2021-07-08 08:38:51 -04:00
cb702f7ae6
Decompile SetMoveEffect
2021-07-05 18:14:03 -04:00
10f14b2a58
Sync GetItemEffectType from Emerald
2021-06-28 11:04:11 -04:00
21822dcdbd
gContestOpponents to src
2021-06-23 13:53:02 -04:00
0ce4481a6e
Name map groups
2021-04-28 16:34:06 -04:00
a1138223e9
Mirror pokeemerald PR#1329 & PR#1335 to pokeruby
...
The `externalReservedData` field has been split up into `externalEventData` and `externalEventFlags`, which have their own structs. The new structs deal with interconnectivity between external games/peripherals and RS. US & JP Colosseum Bonus Discs', Colosseum and XD's, Pokémon Channel's, and PokémonBox: Ruby & Sapphire's interactions with these fields has been documented.
The `giftRibbon#` fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
2021-02-16 16:43:31 -05:00
9f14b57f55
FLAG_SPECIAL_FLAG_0 -> FLAG_HIDE_MAP_NAME_POPUP
2020-12-02 01:53:28 -03:00
038abf80ba
Give songs meaningful english names
2020-08-29 01:47:36 -04:00
aeeff84462
Merge pull request #780 from GriffinRichards/sync-scripts
...
Sync some scripts with pokeemerald
2020-07-20 18:02:50 -04:00
d3127e3594
Sync common scripts up to prof_birch.inc
2020-05-06 14:48:14 -04:00
15b66d82c6
Sync surf.inc, dynamic_npc_graphics.inc
2020-05-06 13:51:41 -04:00
6f0a4b2215
Use fadescreen constants, sync common scripts after pc.inc
2020-04-29 15:35:25 -04:00
f302fcc134
More trainer type usage
2020-04-28 19:59:16 -05:00
4dabc1bc7b
Use trainer type constants
2020-04-28 19:59:16 -05:00
0459f99a95
Index heal location data, use better names
2020-04-28 19:59:16 -05:00
d1d59596f1
Sync obtain_item.inc
2020-04-28 13:04:50 -04:00
b1c7689dcc
Use OBJ_EVENT_ID_PLAYER
2020-04-27 17:05:15 -04:00
6f0551ae38
Sync hall_of_fame.inc
2020-04-27 15:42:05 -04:00
15f5cb7e73
Sync new_game.inc
2020-04-27 14:19:54 -04:00
7d4c9d1f9f
Sync movement actions
2020-04-27 13:57:50 -04:00
541c069857
Sync trainer_battle.inc
2020-04-27 13:48:11 -04:00
faf8130585
Sync shared_secret_base.inc
2020-04-24 15:23:48 -04:00
21b8fb4fbd
Use map script constants
2020-04-23 18:28:07 -04:00
7109435631
Sync event macros
2020-04-23 17:59:25 -04:00
6c5f3e3470
Sync with pret/pokeemerald:959
2020-02-12 18:35:27 -06:00
667c53e25b
Fix event object include guards and constant filenames
2020-02-12 18:35:27 -06:00
98ca62cf91
Standardize Event Object to Object Event
2020-02-12 18:35:27 -06:00
d63e99c418
Merge pull request #754 from camthesaxman/emerald_diff
...
resolve more emerald differences
2019-10-19 08:08:03 -05:00
11170ce90c
Sync specialvars with pokeemerald
2019-10-16 20:22:11 -05:00
3773318935
Fix misnamed Mossdeep Gym metatiles
2019-10-16 20:21:29 -05:00
fc2926aa46
add fishing rod groups to encounter json
2019-10-16 20:09:49 -05:00
e97f37077c
Merge branch 'master' into emerald_diff
2019-10-02 11:48:20 -04:00
1bd678656c
Merge pull request #743 from garakmon/metatile_labels
...
Name Metatiles
2019-09-08 12:43:57 -04:00
b74a0c3122
resolve more battle system differences
2019-07-31 00:13:42 -05:00
0ba4eb4780
misc
2019-07-30 22:11:27 -05:00
Robin Xyifer