Commit Graph

6089 Commits

Author SHA1 Message Date
GriffinR
117b90a261 Document pokemon jump 2021-02-26 17:26:39 -05:00
GriffinR
06ae5a37e2
Merge pull request #1336 from GriffinRichards/giftribbons
Document some ribbon usage
2021-02-24 10:07:59 -05:00
GriffinR
fc3d6eb178
Merge pull request #1328 from GriffinRichards/doc-pokeuseitem
Document PokemonUseItemEffects
2021-02-22 12:15:19 -05:00
GriffinR
65433c790e
Merge pull request #1342 from sphericalice/heart-icon-palette-tag-constant
Use the field effects palette tag constant for the heart icon
2021-02-22 10:43:55 -05:00
GriffinR
9f9c85a6ef
Merge pull request #1341 from sphericalice/cracked-floor-metatile-labels
Add labels for cracked floor metatiles
2021-02-22 10:38:01 -05:00
SphericalIce
2d7b25428a Use the field effects palette tag constant for the heart icon 2021-02-22 15:35:09 +00:00
SphericalIce
381116b3c4 Add labels for cracked floor metatiles 2021-02-22 15:29:14 +00:00
GriffinR
d313f5e58c
Merge pull request #1340 from snallapa/sahith/small-fix
changing gDifferentSaveFile to use true false constants
2021-02-21 19:44:58 -05:00
Sahith Nallapareddy
dafca0ba22 changing to use constants 2021-02-21 19:27:59 -05:00
luckytyphlosion
6872d6f196
Merge pull request #1338 from HornedCrusader/patch-1
Fix bike flag
2021-02-20 19:14:26 -05:00
HornedCrusader
84cb04fa38
Fix bike flag 2021-02-20 11:52:41 -05:00
GriffinR
da67b6ebd9 More window cleanup 2021-02-18 15:01:18 -05:00
GriffinR
64fc585cc3 Document pokenav ribbons summary screen 2021-02-18 11:33:55 -05:00
GriffinR
d62f89b20c Minor window/bg cleanup 2021-02-18 10:00:07 -05:00
GriffinR
02c1fbd733 Document ribbon TV show, add new ribbon IDs/size 2021-02-18 09:59:24 -05:00
GriffinR
642ae8295e Some constant use in pokemon_icon.c 2021-02-17 14:11:59 -05:00
GriffinR
e059c4fdfa Use new gift ribbons size, label unused ribbons 2021-02-17 14:11:45 -05:00
GriffinR
549ddb8c95
Merge pull request #1335 from Deokishisu/ExternalEvents-doc
Document More External Events
2021-02-16 16:25:02 -05:00
Deokishisu
1dda9939ab Fix Swapped Comments on PokeCoupon Tiers 2021-02-16 16:08:58 -05:00
Deokishisu
7f55bf875c Move BoxRS Data Down to ExternalEventFlags
As suggested, moved the BoxRS data fields into ExternalEventFlags and packed that struct.
2021-02-16 16:01:18 -05:00
Deokishisu
fb60e036ce Document Box: Ruby & Sapphire Fields
Labeled another field in the ExternalEventData struct used by Pokémon Box: Ruby & Sapphire.

Special thanks to Citrus Bolt#4642.
2021-02-16 15:37:58 -05:00
Deokishisu
cd89d17b12 Document More External Events
Did research to determine how the Japanese Colosseum Bonus Disc modifies the ExternalEventData fields. The Ageto Celebi flag, as well as the flag for the three PokeCoupon title rewards, have been documented and included into the struct.

The PokeCoupon fields are actually 3-byte fields, so they have been turned into bitfields, since u24 isn't possible.

Also discovered that Channel and US Colosseum Bonus Disc Jirachi use the same flag, so renamed that flag and commented to explain.

Also made general comments explaining how the ExternalEventData and ExternalEventFlags are applicable to Emerald specifically.
2021-02-16 09:41:07 -05:00
GriffinR
2e355ac848
Merge pull request #1329 from Kurausukun/fakematches
[LEAK-INFORMED] Resolve Fakematches
2021-02-15 23:59:55 -05:00
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