Commit Graph

7735 Commits

Author SHA1 Message Date
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
Evan
d65d5cb8fd add AI_FLAG_SMART_SWITCHING, some burn checks 2021-02-14 09:37:04 -07:00
Evan
167aaef8f6 add faint check to AI_SetupFirstTurn (thx Syreldar) 2021-02-14 09:20:42 -07:00
Evan
49e41a2d3b fix ShouldSetScreen (thx Syreldar) 2021-02-14 09:11:29 -07: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
Evan
0664daf384 fix some post-merge errors 2021-02-12 11:02:10 -07: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
Evan
f3d975e239 merge with be 2021-02-12 08:59:55 -07:00
Evan
4782f713f2 update semi invulnerable state check 2021-02-12 08:57:57 -07:00
LOuroboros
21ee6cb9fb Added constant labels for EV manipulating item effects 2021-02-12 07:26:11 -03:00
Evan
6f9b310a23 fix mega trigger sprite data corruption 2021-02-11 16:00:49 -07:00
amiosi
e5ff25ccbf partial update to nature/secret power and camouflage 2021-02-11 17:38:18 -05:00
amiosi
62c3a8ce2a spacing 2021-02-11 17:19:45 -05:00
amiosi
1df295a582 battle config and zippy zap
plus fix mirror move mistakes
2021-02-11 17:11:07 -05:00
amiosi
c0ba7436af water shuriken and howl 2021-02-11 16:20:13 -05:00
amiosi
172fe3a257 mirror move + nightmare fix 2021-02-11 09:49:45 -05:00
amiosi
eaf88687b9 do gen 4 king's rock
fix some other mistakes as well
2021-02-10 19:14:05 -05:00
amiosi
648f7343a8 old gen fixes + lock-on & psych up
fix beat up config option as well
2021-02-10 18:41:49 -05:00
GriffinR
20b76c6071 Fix swapped route 102 berries 2021-02-10 16:26:09 -05:00
amiosi
541f7eb7b6 targetting fixes 2021-02-10 13:57:23 -05:00
GriffinR
987fdf6fcd
Merge pull request #1321 from GriffinRichards/doc-evoscene
Document evolution scene
2021-02-08 18:21:30 -05:00
amiosi
160b08afb0 fix the rest of the flinching moves 2021-02-08 17:29:35 -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
amiosi
038bf42b51 kings rock Gen_X configs 2021-02-08 17:04:33 -05:00
LOuroboros
43d6340b92 Corrected the order of actions in BattleScript_FirstChargingTurn 2021-02-08 17:51:46 -03:00
GriffinR
2237d0748f Label unused layouts 2021-02-08 14:45:56 -05:00
Evan
1405f04e1e ai understands constant-damage effects 2021-02-07 12:39:23 -07:00
Evan
5e8c8a6aaf fix ghost types unable to escape from mean look/trap 2021-02-07 12:05:55 -07:00
GriffinR
6899acfb6f
Merge pull request #1317 from opakedragon/master
Fix Spelling of BagMenu_RemoveBagItemMessageindow
2021-02-07 13:43:05 -05:00
amiosi
eb56488b81 fix build errors 2021-02-06 20:08:25 -05:00
amiosi
8416f65dac king's rock changes 2021-02-06 19:47:06 -05:00
amiosi
30434b92de update even more moves to Gen 8 standard 2021-02-06 19:41:38 -05:00
amiosi
d8e592bf46 update many moves to Gen 8 standard 2021-02-06 19:08:46 -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