ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,106 Commits 1 Branch 0 Tags 235 MiB
10c77f1bc2
Commit Graph

6106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
huderlem
10c77f1bc2
Merge pull request #1345 from GriffinRichards/doc-rtcscreen 
Document/clean up some minor screens
 2021-02-28 10:03:22 -06:00
Marcus Huderle
c900de35e7 Fix build and cleanup mistakes 2021-02-28 09:54:55 -06:00
Marcus Huderle
a85fada314 Document more battle anim effects 2021-02-28 09:54:55 -06:00
GriffinR
1912b0cf0a
Merge branch 'master' into doc-rtcscreen 2021-02-28 10:28:43 -05:00
GriffinR
ea748ff7f5
Merge pull request #1344 from GriffinRichards/doc-ec 
Document easy chat and mail, script.c cleanup, add/use some general constants
 2021-02-28 10:26:49 -05:00
GriffinR
70c560cc84
Merge pull request #1347 from huderlem/battle_anim_doc 
Document some battle anim funcs and data
 2021-02-27 13:50:01 -05:00
Marcus Huderle
c323e7f061 Document some battle anim funcs and data 2021-02-27 11:04:45 -06:00
GriffinR
2dfa84c10f Clean up berry_fix_program 2021-02-24 16:46:57 -05:00
GriffinR
f172ff84c9 Clean up save_failed_screen 2021-02-24 14:53:32 -05:00
GriffinR
f09278393e Document reset_rtc_screen 2021-02-24 14:29:33 -05:00
GriffinR
293df1887f Fix comment typo 2021-02-24 11:26:26 -05:00
GriffinR
b71b10623b Add palette selection constants 2021-02-24 11:03:51 -05:00
GriffinR
c6141fea83 Document easy chat 2021-02-24 11:03:45 -05:00
GriffinR
1cac608dbe Document mail 2021-02-24 11:03:39 -05:00
GriffinR
b04f0aaa2b Use SPRITE_NONE constant 2021-02-24 11:03:32 -05:00
GriffinR
a5852d57d1 Use TASK_NONE constant 2021-02-24 11:03:25 -05:00
GriffinR
e52b46ab43 Clean up script.c 2021-02-24 11:03:17 -05:00
GriffinR
81a7f491b7 Use WINDOW_NONE constant 2021-02-24 11:03:08 -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