Commit Graph

85 Commits

Author SHA1 Message Date
GriffinR
2b2bf84502 Use actual flag values for hidden items 2022-10-25 14:51:01 -04:00
GriffinR
c77adaf6bf Sync map data macros 2022-10-25 14:31:01 -04:00
GriffinR
bfd1fb2419 MAP_NONE -> MAP_DYNAMIC, treat warp ids as strings to allow constants 2022-09-03 14:59:18 -04:00
GriffinR
0400ee2124
Merge branch 'master' into clone-union 2022-09-03 14:31:04 -04:00
GriffinR
7c0b46f6da
Merge pull request #541 from GriffinRichards/sync-script
Sync script.c
2022-08-26 23:55:31 -04:00
GriffinR
a5853a71bd Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim 2022-08-23 10:47:07 -04:00
GriffinR
feb3d9cbab
Merge pull request #537 from GriffinRichards/doc-bmsg
Sync/document battle_message.c
2022-08-23 10:45:48 -04:00
GriffinR
72f76b19b3 Sync script.c 2022-08-22 20:27:23 -04:00
GriffinR
b3590324b8 Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim 2022-08-19 11:30:00 -04:00
GriffinR
17b2faa182 Sync battle anim - scripts 2022-08-19 01:07:53 -04:00
GriffinR
ab56ac41a1
Merge branch 'master' into clone-union 2022-08-17 15:41:50 -04:00
cbt6
73f8a54aa9 Document remaining movement types and actions 2022-08-16 12:24:18 +08:00
cbt6
2644dd9c21
Merge branch 'master' into movement-action 2022-08-15 12:54:47 +08:00
GriffinR
a064849864 Sync/document battle_message.c 2022-08-12 13:58:24 -04:00
cbt6
7233b2ed0a Rename WalkFastest functions to WalkFaster 2022-08-11 12:21:28 +08:00
cbt6
2a8124ea00 Use movement action constant values over enum 2022-08-11 12:19:09 +08:00
GriffinR
2b93687ade Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union 2022-08-10 13:48:30 -04:00
GriffinR
60fc8c5e22 Add remaining event.inc comments 2022-08-09 20:27:42 -04:00
GriffinR
fbdbc5851c Add npc text color constants 2022-08-09 16:06:51 -04:00
GriffinR
acb480f1c1 Sync event.inc and scrcmd.c 2022-08-09 15:10:38 -04:00
Eduardo Quezada
19a521fe33 Almost complete battle_scripts_1.s sync 2022-08-01 01:05:18 -04:00
Eduardo Quezada
dfe6c6885c Synced sound.c 2022-07-29 18:15:25 -04:00
Eduardo Quezada
7f53f533bb Synced src/battle_script_commands.c 2022-07-29 09:42:03 -04:00
Eduardo Quezada
0709da5867 Multiple changes 2 2022-07-28 01:20:05 -04:00
cbt6
0aaae88d6e Rename movement action 0x9F 2022-02-28 23:12:57 +08:00
GriffinR
23d7c00c62
Merge branch 'master' into clone-union 2022-02-22 18:42:20 -05:00
cbt6
7de67831e9 Add macros for renamed movement actions 2022-02-10 01:48:28 +08:00
cbt6
ac3de6d02c Rename some movement actions and functions 2022-02-10 00:20:22 +08:00
GriffinR
38601cf09b Reformat clone objects in JSON 2022-02-05 14:34:53 -05:00
Deokishisu
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
Kurausukun
86445c2131 update audio macros 2020-09-27 22:38:52 -04:00
GriffinR
bb56d4a3f4 Give songs meaningful english names 2020-08-29 03:11:03 -04:00
GriffinR
7af1b35d17 Sync some specials/drop unnecessary prefixes 2020-03-03 17:45:25 -05:00
GriffinR
1aa1f18972 Sync trainer_battle.inc 2020-03-03 14:52:32 -05:00
GriffinR
2a2db28e57 Split connection field from graphics id in object events 2020-02-18 18:13:31 -05:00
GriffinR
e94f9c1483 Name allow_escaping, allow_running, show_map_name header properties 2020-02-18 15:11:44 -05:00
GriffinR
a4cd331634
Merge branch 'master' into doc-ttower 2020-02-15 20:44:57 -05:00
GriffinR
c0be66fc2e Document Viridian City scripts and adjacent routes 2020-01-24 20:46:09 -05:00
GriffinR
ce5bc554e5 Merge branch 'doc-ttower' of https://github.com/GriffinRichards/pokefirered into doc-ttower 2020-01-24 05:11:37 -05:00
GriffinR
c63a889bf4 Floor beaten --> floor cleared 2020-01-24 05:09:50 -05:00
GriffinR
39556605cd
Merge branch 'master' into doc-ttower 2020-01-24 03:03:45 -05:00
GriffinR
ef1f9ead0b Document Trainer Tower scripts 2020-01-24 02:57:45 -05:00
GriffinR
a01d83a434
Merge branch 'master' into sync-ai 2020-01-23 10:24:11 -05:00
GriffinR
d084a5ca84 Sync AI scripts 2020-01-22 19:21:40 -05:00
GriffinR
a4f5f41e24 Document static mon scripts 2020-01-17 10:51:41 -05:00
GriffinR
04d176334a Document some Quest Log 2020-01-15 16:00:45 -05:00
PikalaxALT
cdc04dfe9f
Merge pull request #221 from GriffinRichards/doc-cerulean
Document Cerulean City scripts
2020-01-14 20:29:03 -05:00
GriffinR
f544f6e356 Document Cerulean City scripts 2020-01-14 16:41:38 -05:00
GriffinR
a5d8b98fde Sync macros to have Give/Take Add/Remove unity 2020-01-13 22:35:09 -05:00
GriffinR
6bcb508c3f Update some movement cmds 2020-01-11 01:00:50 -05:00