Commit Graph

1758 Commits

Author SHA1 Message Date
PikalaxALT acb87f3f2f Sync BattleStruct.multiBuffer from Em/FR 2021-06-16 15:55:20 -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
GriffinR c7bbd485c3 Merge pull request #818 from GriffinRichards/deadname
Remove deadnaming, sync BgEvent and 2 function names
2020-12-31 14:49:50 -05:00
GriffinR ed3bb5b080 Remove deadnaming, sync BgEvent and 2 function names 2020-12-31 14:33:45 -05:00
LOuroboros 9f14b57f55 FLAG_SPECIAL_FLAG_0 -> FLAG_HIDE_MAP_NAME_POPUP 2020-12-02 01:53:28 -03:00
Kurausukun 59ce666d32 update audio macros 2020-09-27 22:17:05 -04:00
PokeCodec 403b854668 Remove mentions of functions not used. 2020-09-01 13:43:18 -04:00
PokeCodec ae4e56b93b Fix mistakes 2020-09-01 13:37:22 -04:00
PokeCodec bfd7a6d66a Make invisible a boolean 2020-09-01 12:07:39 -04:00
PokeCodec 463daa89a0 Match more naked functions 2020-09-01 11:30:16 -04:00
GriffinR 038abf80ba Give songs meaningful english names 2020-08-29 01:47:36 -04:00
PikalaxALT d7ec1d234b Merge pull request #781 from GriffinRichards/constants-mapdatasize
Sync fieldmap data
2020-08-21 15:19:42 -04:00
GriffinR 5d6e7a31da Merge pull request #788 from kazblox/master
Fix NONMATCHINGs and actual English Debug support
2020-08-19 01:04:35 -04:00
PikalaxALT 30793ff41b Fix COMMON sym references under modern gcc 2020-07-22 13:12:23 -04:00
GriffinR 4dc2ba23f6 Merge branch 'master' into constants-mapdatasize 2020-07-20 18:03:49 -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 f0bf1e641c Sync cave_hole.inc 2020-07-20 17:53:45 -04:00
Kaz 7f94272bfa Actually fix everything. 2020-06-08 21:40:08 -04:00
Kaz 2ec8ae4bec Preliminary support for English rev0 debug. Matching but still needs
cleaning up.
Rename DEBUG_TRANSLATE to DEBUG_FIX now that we have actual English
Debug ROMs.
Add Sapphire German "first edition" debug support, now that we have a
hash for it.
Fix an obvious nonmatching.
2020-06-08 04:12:23 -04:00
Kaz 8d0b9655ba pokemon_system_storage_4.c: CopyWallpaperTilemap and
ClearLowestWallpaperTiles. File is now fully matching.
Fix NONMATCHING target.
2020-05-31 05:52:38 -04:00
Kaz 164d55e3e6 money.c: Draw10000Sprite WIP 2020-05-30 19:14:20 -04:00
Kaz 447dc3bd5d s32 damage consistency in ProtectStruct.
Most of these structs should be revisited and cleaned up.
2020-05-26 23:09:27 -04:00
Kaz 754634f966 battle_script_commands.c: atk24 OK 2020-05-26 20:00:42 -04:00
Kaz 08c053f013 decoration.c, field_player_avatar.c, field_tasks.c: fix NONMATCHINGs 2020-05-25 22:07:36 -04:00
Kaz bdd3fa89da battle/anim/flying.c, psychic.c: minor NONMATCHING fixes
battle/anim/water.c: revisit AnimTask_CreateSurfWave (still NONMATCHING)
2020-05-25 08:17:50 -04:00
GriffinR c6b4319b68 Sync fieldmap data 2020-05-17 16:43:44 -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 788dc307d4 Sync pc.inc 2020-04-29 14:56:39 -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 9604fa3936 Sync record_mix.inc 2020-04-28 14:24:46 -04: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 2e74b9c2eb Sync std_msgbox.inc 2020-04-27 13:17:45 -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
PikalaxALT 3b2eaeedbc Merge branch 'master' into modern_gcc 2020-02-13 15:13:30 -05:00
GriffinR 6c5f3e3470 Sync with pret/pokeemerald:959 2020-02-12 18:35:27 -06:00
GriffinR 68fecc9f72 Rename event_obj_lock to event_object_lock 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