GriffinR
ee4af94a36
Merge pull request #1324 from GriffinRichards/doc-sb
...
Document remainder of secret_base.c
2021-02-15 17:41:55 -05:00
GriffinR
f8a70fdf24
Merge pull request #1334 from Deokishisu/giftRibbons-doc
...
[LEAK-INFORMED] Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h
2021-02-15 17:33:29 -05:00
Deokishisu
d418321627
Update crt0.s
2021-02-15 17:25:36 -05: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
GriffinR
5f58ea02c6
Merge pull request #1330 from sphericalice/hidden-to-buried
...
Rename 'hidden' Trainers/obj events to 'buried'
2021-02-14 21:48:21 -05:00
GriffinR
b797730234
Merge pull request #1331 from sphericalice/lilcove-typo-fix
...
Fix Lilcove Motel typos
2021-02-14 17:46:14 -05:00
GriffinR
17cfa9dc80
Merge pull request #1332 from sphericalice/use-rgb
...
Use RGB macros
2021-02-14 17:45:14 -05:00
SphericalIce
27dc32de26
Use RGB macros
2021-02-14 22:08:19 +00:00
SphericalIce
56e047f949
Fix Lilcove Motel typos
2021-02-14 21:38:39 +00:00
SphericalIce
70ff6c3b84
Rename 'hidden' Trainers/obj events to 'buried'
2021-02-14 19:25:23 +00:00
GriffinR
be0699bd64
Merge pull request #1326 from GriffinRichards/doc-layouts
...
Label unused layouts
2021-02-14 14:22:28 -05:00
GriffinR
a85ac11b28
Merge pull request #1325 from GriffinRichards/constants-berrytree
...
Add berry tree id constants
2021-02-14 14:15:51 -05:00
Kurausukun
10e430ae15
oops
2021-02-14 04:03:53 -05:00
Kurausukun
7c4116b32a
fix indentation
2021-02-14 04:01:20 -05:00
Kurausukun
6b5db889dd
[LEAK-INFORMED] remove fakematching comment
...
it is in fact not a fakematch
2021-02-14 03:57:50 -05:00
Kurausukun
bf062f5547
[LEAK-INFORMED] fix battle dome fakematching
...
yes they actually fucking did this
2021-02-14 03:51:38 -05:00
GriffinR
8634710996
Document PokemonUseItemEffects
2021-02-12 16:02:04 -05:00
GriffinR
78925916f3
Merge pull request #1327 from LOuroboros/vitamins
...
Added constant labels for EV manipulating item effects
2021-02-12 11:57:36 -05:00
LOuroboros
21ee6cb9fb
Added constant labels for EV manipulating item effects
2021-02-12 07:26:11 -03:00
GriffinR
20b76c6071
Fix swapped route 102 berries
2021-02-10 16:26:09 -05:00
GriffinR
987fdf6fcd
Merge pull request #1321 from GriffinRichards/doc-evoscene
...
Document evolution scene
2021-02-08 18:21:30 -05:00
GriffinR
487e04d269
Merge pull request #1319 from GriffinRichards/crt0comm
...
Add comments for some data in crt0.s
2021-02-08 17:15:52 -05:00
GriffinR
2237d0748f
Label unused layouts
2021-02-08 14:45:56 -05:00
GriffinR
6899acfb6f
Merge pull request #1317 from opakedragon/master
...
Fix Spelling of BagMenu_RemoveBagItemMessageindow
2021-02-07 13:43:05 -05:00
GriffinR
0851c34bac
Add berry tree id constants
2021-02-05 15:25:12 -05:00
GriffinR
2e57a00d17
Use GAME_LANGUAGE instead of LANGUAGE_ENGLISH
2021-02-05 12:08:49 -05:00
GriffinR
a240481d5f
Document secret_base.c
2021-02-05 12:08:25 -05:00
GriffinR
2b5f7fe151
Merge pull request #1323 from LOuroboros/newCursorArea
...
newCurosrArea -> newCursorArea
2021-02-05 07:16:38 -05:00
GriffinR
3b33c950b2
Merge pull request #1322 from Deokishisu/patch-2
...
Fix "Compatibility" Misspelling
2021-02-05 07:15:51 -05:00
LOuroboros
2e51a69400
newCurosrArea -> newCursorArea
2021-02-05 04:59:26 -03:00
Deokishisu
ac43365d58
Fix "Compatibility" Misspelling
...
Someone misspelled "compatibility" as "compatability" in the daycare-related files. This commit spells them correctly.
2021-02-05 01:27:11 -05:00
GriffinR
15906ca143
Document evolution scene
2021-02-03 17:55:37 -05:00
MandL27
b2a541a33b
Merge pull request #1390 from amiosi/mime_jr
...
Edited Constants to match one another in regards to CamelCase and underscores
2021-02-03 17:16:26 -05:00
amiosi
11e6298a05
tmhm and tutor spacing
2021-02-03 15:08:53 -05:00
amiosi
7714650fef
fix build error
2021-02-03 14:55:55 -05:00
amiosi
762dcb8a7c
cry fixes, type null
2021-02-03 14:10:39 -05:00
amiosi
b84f952f32
mistaken MrRime change
2021-02-03 13:09:09 -05:00
amiosi
663cc5b15c
oricorio...
2021-02-03 13:02:13 -05:00
amiosi
418da6158b
last of the cries
2021-02-03 12:57:56 -05:00
amiosi
2cba017699
cry renames
2021-02-03 12:50:54 -05:00
amiosi
86da6d04ff
Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr
2021-02-03 12:45:19 -05:00
ExpoSeed
4a8e18cea2
Merge pull request #1336 from LOuroboros/cries_PE_redux
...
Various tweaks related to Pokémon cries
2021-02-03 11:26:44 -06:00
amiosi
e62f53b13e
fix spacing i missed on tutors and expand to all species
...
plus reorder kyurem forms to match the rest of the repo
2021-02-02 15:18:45 -05:00
amiosi
0798ba22a6
fix tmhm spacing i missed, extend to all species
2021-02-02 15:10:45 -05:00
amiosi
a021204389
oricorio pau constants
2021-02-02 14:49:01 -05:00
amiosi
032f8ac834
tapus pls
2021-02-02 14:43:12 -05:00
amiosi
f46f21bb38
tapus again
2021-02-02 14:40:04 -05:00
amiosi
248e0b50d7
Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr
2021-02-02 14:24:36 -05:00
amiosi
9c2c337e6f
tapu case
2021-02-02 14:24:15 -05:00
