Commit Graph

133 Commits

Author SHA1 Message Date
PikalaxALT b86d6d05d9 Fix style issues 2021-07-08 08:38:51 -04:00
PikalaxALT cb702f7ae6 Decompile SetMoveEffect 2021-07-05 18:14:03 -04:00
PikalaxALT 10f14b2a58 Sync GetItemEffectType from Emerald 2021-06-28 11:04:11 -04:00
PikalaxALT 21822dcdbd gContestOpponents to src 2021-06-23 13:53:02 -04:00
GriffinR 0ce4481a6e Name map groups 2021-04-28 16:34:06 -04:00
Deokishisu 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
LOuroboros 9f14b57f55 FLAG_SPECIAL_FLAG_0 -> FLAG_HIDE_MAP_NAME_POPUP 2020-12-02 01:53:28 -03:00
GriffinR 038abf80ba Give songs meaningful english names 2020-08-29 01:47:36 -04:00
GriffinR aeeff84462 Merge pull request #780 from GriffinRichards/sync-scripts
Sync some scripts with pokeemerald
2020-07-20 18:02:50 -04:00
GriffinR d3127e3594 Sync common scripts up to prof_birch.inc 2020-05-06 14:48:14 -04:00
GriffinR 15b66d82c6 Sync surf.inc, dynamic_npc_graphics.inc 2020-05-06 13:51:41 -04:00
GriffinR 6f0a4b2215 Use fadescreen constants, sync common scripts after pc.inc 2020-04-29 15:35:25 -04:00
GriffinR f302fcc134 More trainer type usage 2020-04-28 19:59:16 -05:00
GriffinR 4dabc1bc7b Use trainer type constants 2020-04-28 19:59:16 -05:00
GriffinR 0459f99a95 Index heal location data, use better names 2020-04-28 19:59:16 -05:00
GriffinR d1d59596f1 Sync obtain_item.inc 2020-04-28 13:04:50 -04:00
GriffinR b1c7689dcc Use OBJ_EVENT_ID_PLAYER 2020-04-27 17:05:15 -04:00
GriffinR 6f0551ae38 Sync hall_of_fame.inc 2020-04-27 15:42:05 -04:00
GriffinR 15f5cb7e73 Sync new_game.inc 2020-04-27 14:19:54 -04:00
GriffinR 7d4c9d1f9f Sync movement actions 2020-04-27 13:57:50 -04:00
GriffinR 541c069857 Sync trainer_battle.inc 2020-04-27 13:48:11 -04:00
GriffinR faf8130585 Sync shared_secret_base.inc 2020-04-24 15:23:48 -04:00
GriffinR 21b8fb4fbd Use map script constants 2020-04-23 18:28:07 -04:00
GriffinR 7109435631 Sync event macros 2020-04-23 17:59:25 -04:00
GriffinR 6c5f3e3470 Sync with pret/pokeemerald:959 2020-02-12 18:35:27 -06:00
GriffinR 667c53e25b Fix event object include guards and constant filenames 2020-02-12 18:35:27 -06:00
GriffinR 98ca62cf91 Standardize Event Object to Object Event 2020-02-12 18:35:27 -06:00
huderlem d63e99c418 Merge pull request #754 from camthesaxman/emerald_diff
resolve more emerald differences
2019-10-19 08:08:03 -05:00
GriffinR 11170ce90c Sync specialvars with pokeemerald 2019-10-16 20:22:11 -05:00
GriffinR 3773318935 Fix misnamed Mossdeep Gym metatiles 2019-10-16 20:21:29 -05:00
garak fc2926aa46 add fishing rod groups to encounter json 2019-10-16 20:09:49 -05:00
PikalaxALT e97f37077c Merge branch 'master' into emerald_diff 2019-10-02 11:48:20 -04:00
PikalaxALT 1bd678656c Merge pull request #743 from garakmon/metatile_labels
Name Metatiles
2019-09-08 12:43:57 -04:00
camthesaxman b74a0c3122 resolve more battle system differences 2019-07-31 00:13:42 -05:00
camthesaxman 0ba4eb4780 misc 2019-07-30 22:11:27 -05:00
camthesaxman cf0da4c3bb fix build 2019-07-29 21:25:10 -05:00
camthesaxman db4af549fd resolve some Emerald differences 2019-07-29 20:44:18 -05:00
camthesaxman 92dd1f106b match atk49_moveend 2019-07-28 18:28:15 -05:00
garak ad365a35c1 name metatiles 2019-07-18 15:10:32 -04:00
PikalaxALT 6e6edda078 Define LINK_BATTLE_OPPONENT; other opponent constant substitutions 2019-04-23 19:57:44 -05:00
ultima-soul 0a16dd0df0 Decompile/port rest of battle_anim plus fix 1 NONMATCHING. 2019-04-07 16:36:15 -05:00
Doesnty a6f39d191d Fix a flag name typo 2019-04-05 17:29:59 -05:00
Marcus Huderle a0ba1b7c63 Convert map data to JSON 2019-02-04 10:44:11 -06:00
garak 669e40cb15 sync region map data formats with pokeemerald 2019-01-15 23:26:17 -05:00
garak 32c7ec313d ANIM_BANK -> ANIM_BATTLER and some newlines 2018-11-13 13:49:27 -05:00
Marcus Huderle cbc414c441 Merge pull request #698 from Slawter666/synchronise
Synchronise with pokeemerald
2018-10-31 18:40:40 -05:00
garak 3367b2eb1a move sound pan constants 2018-10-26 21:13:42 -04:00
Slawter666 164e2ea8eb More synching 2018-10-18 00:40:30 +01:00
garak 2ac92e38ff sound efect panning constants 2018-10-16 14:23:52 -04:00
garak b6fa61a59a finish naming anim tags 2018-10-15 23:49:09 -04:00