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
5,498 Commits 1 Branch 0 Tags 235 MiB
383872ca92
Commit Graph

5498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LOuroboros
383872ca92
Added the data of Zygarde's forms (#477) 
* Defined species for Zygarde's 10% and Complete forms

* Defined the sprites for Zygarde's 10% and Complete forms

* Added coordinates and entries for the forms of Zygarde in the sprite data tables

* Set the InGame names of Zygarde's forms

* Added the base stats of Zygarde's forms

* Set the level up learnsets for the forms of Zygarde

* Defined the paths for the sprites of Zygarde's forms

* Linked the icons to the species of Zygarde's forms

* Added the icons of Zygarde's forms

* Fixed fuckups and inserted the icons of Zygarde's forms

* Added the cries of Zygarde's forms

* Tweaked the Y coordinate of Zygarde's 10% form's backsprite
 2020-07-22 23:37:47 +02:00
DizzyEggg
ff5fc97859 Merge with master 2020-07-11 14:07:10 +02:00
PikalaxALT
038d247e14
Merge pull request #1091 from Flametix/target 
Replace magic number with MOVE_TARGET_BOTH
 2020-07-09 15:45:36 -04:00
PikalaxALT
5a326a11f4
Merge pull request #1090 from Ryuhouji/patch-3 
Made documentation more readable
 2020-07-09 15:45:11 -04:00
Ryuhouji
8e2128f22c
Fix indentation 2020-07-09 15:36:22 -04:00
Ryuhouji
d261374044
Made documentation more readable 
This change will make the script command documentation more user-friendly to read.
Additionally, provided the information on the 'delay' macro. I have confirmed that this
is indeed Frames and not Milliseconds. Updated the macro respectively.
 2020-07-09 15:16:37 -04:00
Flametix
4ba2799849 Update pokemon.c 2020-07-09 14:52:19 -04:00
PikalaxALT
ebade7affb
Merge pull request #1079 from GriffinRichards/doc-confetti 
Document Contest Util and confetti effects
 2020-07-08 16:01:27 -04:00
PikalaxALT
9ff261ac2a
Merge pull request #1078 from GriffinRichards/move-cries 
Move Pokemon cries to own directory
 2020-07-08 15:45:32 -04:00
GriffinR
431c60c92c Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti 2020-07-08 15:45:31 -04:00
PikalaxALT
8b80b417e2
Merge pull request #1069 from GriffinRichards/doc-link 
Document linking
 2020-07-08 15:43:45 -04:00
PikalaxALT
550875757b
Merge pull request #1087 from ipatix/fix_aggressive_loop_optimizations 
fix aggressive loop optimizations
 2020-07-08 15:42:08 -04:00
PikalaxALT
b7532903d7
Merge pull request #1089 from PokeCodec/patch-1 
Match CreatePokeDexList
 2020-07-07 21:15:49 -04:00
PokeCodec
938aec45d3 Match CreatePokeDexList 
Cherry-picked from the pret Ruby repo
 2020-07-07 20:57:20 -04:00
Michael Panzlaff
3264cf697f fix aggressive loop optimizations 
Previously, aggressive loop optimizations with a new compiler were not
possible due to undefined behaviour at end of arrays.

A macro "UBFIX" is added to allow ifdefs for fixes which resolve
undefined behavior. For example newer GCC versions will detect various
bugs in the original game code and will otherwise not compile with -Werror.
 2020-07-05 18:09:59 +02:00
DizzyEggg
0dc4db67ec
Merge pull request #446 from AsparagusEduardo/USUM-Moves 
USUM level up moves.
 2020-06-25 17:28:47 +02:00
Eduardo Quezada
9a2bac5ecd USUM level up movesets. 
Commented out Gen4+ moves.
 2020-06-24 19:19:09 -04:00
DizzyEggg
11122a6851
Merge pull request #441 from AsparagusEduardo/Fix-Mimikyu-Dex-Catch 
Fixed Busted Mimikyu's dex when caught.
 2020-06-22 09:59:17 +02:00
Eduardo Quezada
8ca246332b Fixed Busted Mimikyu's dex when caught. 2020-06-21 01:02:09 -04:00
GriffinR
8b462f3f6c Specify confetti util name 2020-06-18 18:14:30 -04:00
GriffinR
d2a760afdb Rename contest_link_80FC4F4, 80F57C4, and 81D9DE4 2020-06-18 18:01:32 -04:00
GriffinR
24569583e4 Document contest results 2020-06-18 17:50:13 -04:00
GriffinR
f600aff711 Rename rom_81520A8 2020-06-17 03:42:10 -04:00
GriffinR
76f6d05173 Document confetti 2020-06-17 03:39:03 -04:00
GriffinR
e507770425 Remove some unneeded link filler 2020-06-15 13:17:53 -04:00
GriffinR
4c8fd5af7c Move Pokemon cries to own directory 2020-06-15 13:00:24 -04:00
DizzyEggg
c689fb3f31
Merge pull request #400 from LOuroboros/patch-2 
Teatime and Eternabeam should be one word each
 2020-06-15 09:09:14 +02:00
DizzyEggg
038ea79bd4
Merge pull request #406 from AsparagusEduardo/RestoreOriginalEvoMethods 
Set evolution methods closer to the actual games.
 2020-06-15 09:07:21 +02:00
GriffinR
c2a07276ae
Merge branch 'master' into doc-link 2020-06-13 16:15:11 -04:00
Eduardo Quezada
fb73f7333a Set evolution methods closer to the actual games. 2020-06-13 02:37:29 -04:00
Sierra A
46f4a4bbf7
Merge pull request #1074 from Sierraffinity/item-menu-cleanup 
Begin item_menu.c cleanup
 2020-06-10 17:17:35 -07:00
Sierra A
a05eea9312
Merge pull request #1075 from Sierraffinity/master 
Fix out of bounds array access in intro Groudon segment
 2020-06-10 17:16:04 -07:00
GriffinR
a9a427c6f2
Merge branch 'master' into doc-link 2020-06-10 17:36:43 -04:00
GriffinR
2859900ea9 Second pass on documenting union room 2020-06-10 17:30:59 -04:00
Sierraffinity
452f1e0047 Fix out of bounds array access in intro Groudon segment 2020-06-10 13:27:46 -07:00
Sierra A
a7815857ad
Merge pull request #1071 from PokeCF/patch-3 
Unnest if statements
 2020-06-10 13:23:57 -07:00
Sierraffinity
74edaed426 Begin item_menu.c cleanup 2020-06-10 13:07:42 -07:00
PikalaxALT
70c5f923ad
Merge pull request #1072 from nullableVoidPtr/master 
Match sub_80F0708
 2020-06-10 09:23:38 -04:00
nullableVoidPtr
8381828571 Match sub_80F0708 
Special thanks to @kazblox
 2020-06-10 21:13:58 +08:00
PokeCF
760baec098
Unnest if statements 
Overall, it is generally considered bad style to continually nest loops. However, if this is what the decompiler outputted, then why bother touching it?

However, this can be rewritten as returning early if the playtime is less than 60.

The reason for this is not because of the original code, but because it looks better, has the same output, and is easier to understand.
 2020-06-08 17:09:54 -04:00
GriffinR
35867f531b Some link rfu cleanup / link.c documentation 2020-06-08 15:24:25 -04:00
DizzyEggg
dd30ae3481
Merge pull request #401 from Fontbane/cries 
Fix Alola Form back coordinates
 2020-06-08 10:05:36 +02:00
GriffinR
c98342c973 Document link_rfu_3.c 2020-06-08 00:28:21 -04:00
GriffinR
e6f5c4f264 Sync link_rfu_2.c 2020-06-07 12:54:50 -04:00
GriffinR
3f97763181 Document cable_club.c 2020-06-06 16:10:03 -04:00
huderlem
675f5ac03e Remove unnecessary comment 2020-06-03 19:55:15 -05:00
SBird
5d752bbe49 shop: document some constants s.t. object events don't break 2020-06-03 19:55:15 -05:00
GriffinR
aaf5d91c18 Document field_message_box.c 2020-06-03 19:47:45 -05:00
huderlem
83336585e2
Merge pull request #1067 from DizzyEggg/transitions 
Transitions
 2020-06-03 19:45:04 -05:00
GriffinR
9190af73b7 Label union room battle trainer 2020-06-03 15:28:29 -04:00