ultima-soul
be7acc919a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-04-03 21:53:29 -07:00
GriffinR
f602a9dcbf
Use bool for multichoice ignoreBPress
2021-03-31 00:35:56 -04:00
GriffinR
fd3175bde4
Note missing end in Trainer Hill
2021-03-13 16:40:29 -05:00
GriffinR
734a15135f
Clean up a few unlabeled scripts
2021-03-04 19:30:19 -06:00
Deokishisu
7b2bf8c7e2
Rename obedient/fatefulEncounter to eventLegal
...
Per discussion on pret, `obedient`/`fatefulEncounter` has been renamed to `eventLegal`, and all related functions and constants have been modified with this in mind.
Additionally, fixed some whitespace alignment issues in `script_cmd_table.h`, `pokemon.h`, and `tv.c` from the last commit.
2021-02-15 14:54:35 -05:00
Deokishisu
b89c3e901e
Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h
...
The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi.
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 `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
2021-02-15 11:40:16 -05:00
SphericalIce
56e047f949
Fix Lilcove Motel typos
2021-02-14 21:38:39 +00:00
GriffinR
20b76c6071
Fix swapped route 102 berries
2021-02-10 16:26:09 -05:00
GriffinR
0851c34bac
Add berry tree id constants
2021-02-05 15:25:12 -05:00
ultima-soul
5fdb578747
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-02-01 15:58:18 -08:00
GriffinR
9e59581220
Document object lock and some trainer approach
2021-01-26 04:42:18 -05:00
GriffinR
0064333e4a
Clean up scrcmd.c
2021-01-26 02:16:26 -05:00
GriffinR
de52df5613
Fix some mislabeled scripts
2021-01-19 04:51:34 -05:00
ExpoSeed
d649bcabbc
Merge branch 'master' of https://github.com/pret/pokeemerald into sync-item-expansion
2020-10-12 12:43:55 -05:00
GriffinR
1472111c5d
Fix PutAwayDecorationLoop UB comment
2020-10-11 19:02:10 -04:00
ExpoSeed
d2464b59a3
Merge branch 'master' of https://github.com/pret/pokeemerald into sync-item-expansion
2020-10-05 11:42:19 -05:00
ExpoSeed
c3113b43bb
Merge branch 'item_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-item-expansion
2020-10-04 02:36:07 -05:00
Eduardo Quezada
96e4b43ce5
Documenting where each of the berries are generated in new_game.inc
2020-10-03 21:52:09 -03:00
Eduardo Quezada
46ccb91155
Fixed "Ultra Rope" name.
2020-09-13 11:35:05 -03:00
GriffinR
921f389e4e
Fix Rusboro and Lavarige typos
2020-09-11 14:47:47 -04:00
DizzyEggg
271219f962
Merge with master
2020-09-08 12:00:51 +02:00
GriffinR
c830731734
Merge branch 'master' into doc-blender
2020-08-28 16:16:00 -04:00
DizzyEggg
35559d6b71
Merge with master
2020-08-27 10:58:31 +02:00
GriffinR
0ff767a9b5
Start documenting berry blender
2020-08-22 19:39:39 -04:00
GriffinR
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
GriffinR
6c34effda9
Merge pull request #1138 from GriffinRichards/doc-contest
...
Document contest
2020-08-20 16:03:47 -04:00
GriffinR
503dafd210
Fix wallys parents misnamed as uncle/aunt
2020-08-18 17:51:41 -04:00
GriffinR
65bd2faf94
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest
2020-08-16 05:59:10 -04:00
GriffinR
3779422489
Split contest funcs from script_pokemon_util
2020-08-13 17:42:12 -04:00
GriffinR
22b5b6b074
Start documenting roulette
2020-07-30 19:37:16 -04:00
DizzyEggg
11c2207839
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion
2020-07-27 14:54:32 +02:00
GriffinR
af09e73d67
Merge branch 'master' into doc-overworld
2020-07-18 20:24:09 -04:00
DizzyEggg
e03fea84d0
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion
2020-07-11 12:46:41 +02:00
GriffinR
ebb6c4ee66
Merge branch 'master' into doc-overworld
2020-07-08 15:51:58 -04:00
GriffinR
89bcf3cbd9
Merge branch 'master' into add-localids
2020-07-08 15:47:45 -04:00
GriffinR
1ce929157f
Clean up field effect doc
2020-07-02 05:05:13 -04:00
GriffinR
eb80012757
Document more misc field effects
2020-06-29 16:32:46 -04:00
GriffinR
4ea6992172
Continue documenting overworld/field effects
2020-06-29 01:26:29 -04:00
GriffinR
fac6288156
Add local object event ids for referenced objects
2020-06-22 17:18:58 -04:00
GriffinR
2859900ea9
Second pass on documenting union room
2020-06-10 17:30:59 -04:00
GriffinR
3f97763181
Document cable_club.c
2020-06-06 16:10:03 -04:00
GriffinR
fd77eb1eb9
Document wireless_communication_status_screen.c
2020-06-03 14:07:40 -04:00
DizzyEggg
09dcff81f8
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion
2020-04-15 13:28:10 +02:00
PikalaxALT
784e29352d
Merge pull request #985 from mrgriffin/decoration
...
Document decoration.c
2020-03-17 10:39:37 -04:00
PikalaxALT
7a059c75a6
Merge pull request #968 from GriffinRichards/doc-regionmap
...
Document some pokenav and region map
2020-03-17 10:38:20 -04:00
DizzyEggg
b5c54d404d
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion
2020-03-06 11:38:32 +01:00
Martin Griffin
4485d51522
Document decoration.c
2020-03-06 09:47:20 +00:00
PikalaxALT
9259b378ef
Merge pull request #991 from GriffinRichards/fix-eventticket
...
Clarify event ticket flag names
2020-03-03 16:15:27 -05:00
GriffinR
b6c9ad505d
Minor fixes in trainer_battle.inc
2020-03-03 14:47:14 -05:00
GriffinR
4637085390
Clarify event ticket flag names
2020-03-03 01:36:20 -05:00
