2b93687ade
Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union
2022-08-10 13:48:30 -04:00
3fd7e08ae1
Merge pull request #529 from GriffinRichards/rename-viridian
...
Rename Viridian City houses
2022-08-06 12:53:54 -04:00
507b284353
Celadon water -> cycling road water
2022-08-06 02:31:19 -04:00
daf293b9ab
Rename Viridian City houses
2022-08-05 15:51:27 -04:00
1640f8b835
Document metatile behaviors
2022-08-05 15:27:08 -04:00
b1bc05ec05
Review changes
2022-08-01 15:37:00 -04:00
19a521fe33
Almost complete battle_scripts_1.s sync
2022-08-01 01:05:18 -04:00
dcb9d9de1e
Synced src/pokeball.c
2022-07-29 21:39:25 -04:00
dfe6c6885c
Synced sound.c
2022-07-29 18:15:25 -04:00
c97e88b437
Review changes
2022-07-29 16:57:13 -04:00
7f53f533bb
Synced src/battle_script_commands.c
2022-07-29 09:42:03 -04:00
0709da5867
Multiple changes 2
2022-07-28 01:20:05 -04:00
f5e9cc595b
Multiple changes
...
- BATTLESTRINGS_ID_ADDER ->BATTLESTRINGS_TABLE_START
- Defines for battle windows
- MAIL_NONE
- MON_DATA_FILLER -> MON_DATA_UNUSED_RIBBONS
- Usage of BattlePutTextOnWindow with masks
- PlayCry1 -> PlayCry_Normal
- BlendPalettes(0xFFFFFFFF -> BlendPalettes(PALETTES_ALL
- FillPalette(0 -> FillPalette(RGB_BLACK
2022-07-27 18:14:48 -04:00
4940c4da98
Document src/field_effect_helpers.c
2022-07-19 00:01:57 +08:00
56ca6d4bcc
Document src/field_effect.c
2022-07-13 04:07:52 +08:00
16aacb0648
Sync pokemon jump documentation
2022-03-02 02:05:07 -05:00
a5e6e91605
Document/sync object event anims
2022-02-28 13:17:57 -05:00
0aaae88d6e
Rename movement action 0x9F
2022-02-28 23:12:57 +08:00
23d7c00c62
Merge branch 'master' into clone-union
2022-02-22 18:42:20 -05:00
59695b8221
Sync roamer
2022-02-11 15:05:15 -05:00
0f3e26f9a4
Fix formatting and style
2022-02-10 01:53:48 +08:00
ac3de6d02c
Rename some movement actions and functions
2022-02-10 00:20:22 +08:00
38601cf09b
Reformat clone objects in JSON
2022-02-05 14:34:53 -05:00
08a18d6e32
Sync/update trainer classes
2022-01-10 13:48:08 -05:00
b2c74cae84
Sync global
2021-11-19 20:36:59 -05:00
0cc1d8a1b5
Multiple renamings; Removed some orphaned functions
2021-10-27 11:56:03 -03:00
d4695fffe7
Rename and document HITMARKER_x100000
...
This marker makes the target unable to Counter or Mirror Coat the damage back to an attacker, however the game does not have a scenario where this is applicable since all its uses are in end-turn events. It's used for all passive damage, where the damage dealt isn't coming from an attacker.
Alternate name: HITMARKER_NO_ATTACKER
2021-08-11 15:45:30 +02:00
3dce3407d5
Merge pull request #427 from GriffinRichards/name-mapgroups
...
Name map groups
2021-05-13 14:24:11 -04:00
7deccc36b7
Name unused house maps/map groups
2021-05-13 12:51:45 -04:00
c05af7f394
Rename NUM_FIELD_MAP_OBJECT_TEMPLATES --> MOVEMENT_TYPES_COUNT
2021-05-08 14:36:03 -04:00
8cb3819cc2
Merge remote-tracking branch 'origin/master' into doc_field_effect_templates
2021-05-08 11:35:23 -04:00
014dd7f0be
Sync field_effect_objects.h from Emerald
2021-05-03 15:22:13 -04:00
7f50753360
Sync field_effect_object_template_pointers.h with Emerald
2021-05-03 14:09:21 -04:00
cb90fda18d
Refactor some field effect graphics
2021-05-03 13:27:37 -04:00
9a91476b81
Improve documentation of trainer tower sets
2021-04-28 20:44:15 -04:00
a60d6675d7
Trainer tower sets to C
2021-04-28 18:44:38 -04:00
75f2be2e29
Name map groups
2021-04-28 16:37:08 -04:00
c128e68062
Replace rival labels
2021-04-17 16:32:55 +01:00
9b6469a7a3
Fix Record Corner labels
2021-04-10 18:43:10 +01:00
a704592eb7
Merge branch 'master' of github.com:pret/pokefirered into fix_mvmt_types
2021-03-31 09:42:57 -04:00
f00b44699c
Fix movement types; fix some math ops
2021-03-30 20:33:31 -04:00
8e82c291fd
Document bike.c and fix weird goto
2021-03-30 15:45:42 -04:00
f6565a15d4
Style fixes; attempt to match help_system NONMATCHING
2021-03-21 20:28:42 -04:00
cdfeb638f4
Document remaining routines in field_specials
2021-03-20 11:13:58 -04:00
45f75213c0
Some more quest log and field player avater documentation
2021-03-19 09:26:01 -04:00
815636f271
Document ShouldIgnoreDeoxysForm
2021-03-18 18:23:41 -04:00
014596dea5
Document and refactor AdjustFriendship
2021-03-18 17:50:55 -04:00
c779411957
Sync EVO_MODE consts from emerald
2021-03-18 13:14:08 -04:00
4d86834d12
Document item use functions in pokemon.c
2021-03-16 21:16:31 -04:00
57e3f5e0f8
Mirror pokeemerald PR#1329 & PR#1335 to pokefirered
...
The `giftRibbons` field in `SaveBlock1` has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and FRLG. 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. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the `obedient` bit was renamed `eventLegal`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
I still maintain that `eventLegal` is a misnomer and it should be called `fatefulEncounter` in all three repos.
2021-02-16 16:56:31 -05:00
GriffinR