Commit Graph

127 Commits

Author SHA1 Message Date
PikalaxALT
ee6b3c1acf Sync berry crush from Emerald 2021-05-05 13:03:39 -04:00
PikalaxALT
99ec579deb Name symbols in battle_anim_special.c 2021-03-14 16:29:33 -04:00
PikalaxALT
75b9fbc92f check __CLION_IDE__ predefine in global.h 2021-03-13 17:51:27 -05:00
Deokishisu
0589bd5827 Fix Typos / Use Box Constants
The Celadon City scripts that give Eevee misspelled it as Eeevee. Fixed.

The comment explaining `boxRSEggsUnlocked` in the `ExternalEventFlags` struct had an incorrect deposit requirement listed and was fixed.

Also, replaced the literals with the `TOTAL_BOXES_COUNT` and `IN_BOX_COUNT` constants in `pokemon.c`'s `IsPokemonStorageFull` function. Thanks hjk321 for pointing that out.
2021-03-10 16:22:08 -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
GriffinR
1f6dc0e86b Use trainer constants in flags, automatically update flags/vars count 2021-01-29 15:50:01 -05:00
GriffinR
03ca7d8bb4 Label GCN link flags field 2020-04-13 08:42:56 -04:00
PikalaxALT
b22d3a821d Merge branch 'master' of github.com:pret/pokefirered into modern_gcc 2020-04-10 13:10:44 -04:00
PikalaxALT
a7d74b1779 More quest log doccing 2020-04-06 20:43:53 -04:00
PikalaxALT
a622448029 More quest log documentation amid other stuff 2020-04-05 20:30:45 -04:00
PikalaxALT
cc3419eff7 Get pokefirered_modern to build 2020-04-04 12:58:08 -04:00
PikalaxALT
a03906a1a3 through SetContinueGameWarpToDynamicWarp 2020-03-27 17:21:00 -04:00
PikalaxALT
51eac4e14b field_weather_util 2020-03-16 20:37:51 -04:00
PikalaxALT
6363d39e99 port field_effect_helpers from emerald 2020-03-02 13:34:34 -05:00
PikalaxALT
5c530e1330 Finish porting pokemon_jump from Emerald 2020-02-18 16:39:44 -05:00
GriffinR
a4cd331634
Merge branch 'master' into doc-ttower 2020-02-15 20:44:57 -05:00
PikalaxALT
4770fac9eb More mevent documentation 2020-02-04 14:16:45 -05:00
GriffinR
34deceb136 Remove old references to battle pyramid 2020-02-03 12:08:27 -05:00
PikalaxALT
2b5b956936 Merge branch 'master' of github.com:pret/pokefirered into add_arm_agbcc 2020-02-03 10:08:43 -05:00
PikalaxALT
ceeed6247d Port object event flags from emerald 2020-02-02 11:23:04 -05:00
PikalaxALT
01fedfa61c Minor style consistency edit in union_room_chat 2020-02-01 10:22:28 -05:00
PikalaxALT
52fbc43d73 Address review comments 2020-01-25 21:00:51 -05:00
PikalaxALT
0ebdbcfd5b Document union room chat 2020-01-25 19:58:39 -05:00
PikalaxALT
70e7f464ca PLAYER_NAME_LENGTH to 7 2020-01-24 21:57:31 -05:00
GriffinR
9ecd065b50 Review changes 2020-01-24 12:39:40 -05:00
GriffinR
ef1f9ead0b Document Trainer Tower scripts 2020-01-24 02:57:45 -05:00
PikalaxALT
4ff5769f42 union_room_chat through sub_81287B4 2020-01-23 16:52:41 -05:00
GriffinR
153858af60 Merge master into doc-questlog 2020-01-15 16:27:36 -05:00
GriffinR
04d176334a Document some Quest Log 2020-01-15 16:00:45 -05:00
PikalaxALT
eec9e0d914 Split link_rfu_2 2020-01-13 17:03:36 -05:00
GriffinR
31d31d3260 Sync compare macros, some event_scripts.s doc, begin map_scripts constants 2020-01-08 18:09:24 -05:00
garak
8ee35bc615 *actual* final pass at unifying on object event 2019-12-17 21:35:09 -05:00
garak
7a0edab573 fix rebase conflicts 2019-12-17 15:05:23 -05:00
garak
36b2301fd2 mostly standardize to object event to prep for disassembly 2019-12-17 15:05:23 -05:00
PikalaxALT
2b2e3dc3e7 through sub_8104C2C 2019-12-13 09:37:46 -05:00
Evan
9806a60837 finish trainer card matching and data 2019-12-11 11:35:10 -05:00
jiangzhengwenjz
0ca414959b resolve change requests 2019-11-24 09:31:04 +08:00
jiangzhengwenjz
5c1bdd0eb5 party_menu third quarter 2019-11-23 08:09:23 +08:00
Evan
31d3df51f1 fix tab vs space format 2019-11-19 14:21:00 -07:00
Evan
a48e03b78c remove compile errors 2019-11-19 14:21:00 -07:00
PikalaxALT
d25196154f Sync Ruby/Sapphire Battle Tower structs 2019-11-08 16:55:44 -05:00
PikalaxALT
eff10f0e50 Battle message buffers; review comments 2019-11-04 20:32:10 -05:00
PikalaxALT
d16532c262 Some more documentation 2019-11-04 09:33:19 -05:00
PikalaxALT
36bea47ea6 Static symbols in easy_chat 2019-11-01 15:59:24 -04:00
jiangzhengwenjz
2f87855072 Merge branch 'master' into battle 2019-10-25 09:22:50 +08:00
PikalaxALT
661e5d9221 field_specials through Task_AnimateElevatorWindowView 2019-10-23 15:31:23 -04:00
jiangzhengwenjz
1dc0b25c1e Merge branch 'master' into battle 2019-10-24 01:42:52 +08:00
PikalaxALT
aabb95139d stab in the dark at documenting menews_jisan 2019-10-22 10:44:00 -04:00
PikalaxALT
4f15cb02d2 Rename map scene vars and partially document Oak's lab 2019-10-18 12:49:59 -04:00
jiangzhengwenjz
88ad62c3f3 thru HandleEndTurn_MonFled 2019-10-18 06:16:11 +08:00