ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 12:07:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,571 Commits 1 Branch 0 Tags 235 MiB
d37896d51b
Commit Graph

5571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LOuroboros
d37896d51b Merge branch 'pokemon_expansion' of https://github.com/dizzyeggg/pokeemerald into deoxys 2020-08-09 20:55:28 -03:00
Eduardo Alvaro Quezada D'Ottone
a0a200af5a
Changed pic coordinates from hex to decimal to make it easier to edit. (#479) 2020-07-27 15:33:00 +02:00
DizzyEggg
43359f39c3 Merge with master 2020-07-27 15:28:03 +02:00
PikalaxALT
79cc659d7e
Merge pull request #1113 from DizzyEggg/patch-4 
Fix undefined behaviour in protect animation
 2020-07-27 06:37:37 -04:00
DizzyEggg
f007165c53
Fix undefined behaviour in protect animation 
gPlttBufferFaded[sprite->data[2] + ++i] = gPlttBufferFaded[sprite->data[2] + i + 1] 

The above does NOT make it certain that i gets incremented before reading from the right side. Changed it, so the function always increments i first, then reads from pal buffer.
 2020-07-27 12:27:35 +02:00
LOuroboros
dc67bd3749 A few things: 
-Inserted the sprites of Deoxys' form
-Fixed mistakes that I made while adding their cries and sprites
-Tweaked the Y coord of Deoxys' Defense Form's back sprite
 2020-07-23 14:34:01 -03:00
LOuroboros
97a0bb7a96 Added the cries of Deoxys' forms 2020-07-23 13:37:47 -03:00
LOuroboros
179741446f Added the icons of Deoxys' forms, coming straight from Pokefirered and vanilla Pokeemerald 2020-07-23 13:30:36 -03:00
LOuroboros
d18bb31983 Linked the icons to the species of Deoxys' forms 2020-07-23 13:13:36 -03:00
LOuroboros
e6f22f2993 Defined the paths for the sprites of Deoxys' forms 2020-07-23 13:12:26 -03:00
LOuroboros
30cd540888 Implemented the level up learnsets of Deoxys' forms, thanks to UltimaSoul 2020-07-23 13:05:38 -03:00
LOuroboros
a3cc1a2edc Added the base stats of Deoxys' forms, thanks to UltimaSoul 2020-07-23 13:04:01 -03:00
LOuroboros
63a8ba2b05 Set the InGame names for Deoxys' forms 2020-07-23 13:01:34 -03:00
LOuroboros
8ce522d6c9 Added coordinates and entries for the forms of Deoxys in the sprite data tables 2020-07-23 13:00:42 -03:00
LOuroboros
d119307f02 Defined the sprites for Deoxys' forms 2020-07-23 12:55:44 -03:00
LOuroboros
1f1eebb104 Defined the species for Deoxys' forms 2020-07-23 12:53:45 -03:00
PikalaxALT
2e077f09e4
Merge pull request #1111 from GriffinRichards/sync-flags 
Sync unused flags with pokeruby
 2020-07-23 09:12:33 -04:00
PikalaxALT
5348674bc4
Merge pull request #1102 from GriffinRichards/doc-faraway 
Document faraway island
 2020-07-23 09:12:19 -04:00
GriffinR
813f0c724f Sync flags with pokeruby 2020-07-22 18:00:41 -04:00
Eduardo Alvaro Quezada D'Ottone
db94e3c065
Removed empty evYields for SpAttack. (#471) 2020-07-22 23:39:08 +02:00
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
GriffinR
69a04f88f4
Merge pull request #1109 from DizzyEggg/patch-3 
Update agb_flash.c
 2020-07-22 15:47:06 -04:00
DizzyEggg
af5090c892
Update agb_flash.c 2020-07-22 19:25:09 +02:00
GriffinR
bfa7dfcd58
Merge pull request #1105 from AsparagusEduardo/Coordinates 
Changed mon front and back coordinates from hex to decimal so they're easier to edit.
 2020-07-21 19:43:14 -04:00
Eduardo Quezada
6eccf019db Fixed missing changes. 2020-07-21 19:32:33 -04:00
GriffinR
07cd31caac
Merge pull request #1108 from PokeCodec/FixPort 
Match RotateAuroraRingColors_Step
 2020-07-21 17:18:03 -04:00
PokeCodec
97ceca6527 Match AnimTask_RotateAuroraRingColors_Step 2020-07-21 16:11:11 -04:00
PokeCodec
27ac010922
Merge pull request #1 from pret/master 
Upstream
 2020-07-20 17:09:02 -04:00
GriffinR
28759f8569
Merge pull request #1106 from GriffinRichards/add-aiscriptcomm 
Comment gBattleAI_ScriptsTable with constants
 2020-07-20 14:29:28 -04:00
GriffinR
33523d1b06 Comment gBattleAI_ScriptsTable with constants 2020-07-20 14:20:25 -04:00
Eduardo Quezada
f825ba875e Reverted size. 2020-07-19 21:17:32 -04:00
Eduardo Quezada
49ee0fd953 Front pic coordinates. 2020-07-19 20:54:12 -04:00
Eduardo Quezada
10c4debe31 Back pic coordinates 2020-07-19 20:37:11 -04:00
GriffinR
d91f02d984
Merge pull request #1103 from GriffinRichards/doc-optionpal 
Label option menu pal
 2020-07-19 15:53:17 -04:00
GriffinR
2273458d50 Label option menu pal 2020-07-19 15:44:58 -04:00
GriffinR
a1cc7d2bd6 Document faraway island 2020-07-19 14:12:38 -04:00
GriffinR
5e1fb23aad
Merge pull request #1101 from AsparagusEduardo/doc-pss 
Some PSS documentation.
 2020-07-19 10:11:00 -04:00
Eduardo Quezada
551334b20b Fixed missing lowercase field name. 2020-07-18 23:10:37 -04:00
Eduardo Quezada
3bec840419 Fixed field names lowercase. 2020-07-18 23:08:44 -04:00
Eduardo Quezada
9b32cafd57 Some PSS documentation. 2020-07-18 21:58:01 -04:00
GriffinR
8e6dd3bafe
Merge pull request #1086 from GriffinRichards/doc-unktrans 
Document unk_transition
 2020-07-18 20:22:58 -04:00
GriffinR
1a27af8855
Merge pull request #1100 from GriffinRichards/clean-battlescrdata 
Misc battle and battle palace documentation
 2020-07-18 20:22:44 -04:00
GriffinR
fb402725c6 Convert more battle constants to bit shifts 2020-07-18 18:39:38 -04:00
GriffinR
aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
GriffinR
1cf2470aac
Merge pull request #1097 from PokeCodec/asm 
Allow assembly on Clang
 2020-07-17 18:19:06 -04:00
GriffinR
96fd719a19
Merge pull request #1081 from GriffinRichards/add-localids 
Add local object event ids for referenced objects
 2020-07-17 18:18:47 -04:00
GriffinR
50e48898d2
Merge pull request #1088 from GriffinRichards/doc-starterchoose 
Document starter_choose.c
 2020-07-17 16:02:10 -04:00
GriffinR
300f36654d
Merge pull request #1099 from PokeCodec/quickie 
ifndef GUARD typo fix
 2020-07-17 15:56:52 -04:00
PokeCodec
597a238229 Typo Fix 2020-07-17 15:49:46 -04:00
PokeCodec
98441b1199 Sort out asm 2020-07-16 18:28:38 -04:00