ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-03 16:20:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,111 Commits 1 Branch 0 Tags 235 MiB
3adf316574
Commit Graph

346 Commits

Author SHA1 Message Date
GriffinR
e947729d65 Start documenting use_pokeblock 2020-08-10 13:48:16 -04:00
LOuroboros
d37896d51b Merge branch 'pokemon_expansion' of https://github.com/dizzyeggg/pokeemerald into deoxys 2020-08-09 20:55:28 -03:00
GriffinR
82e322bb96 Finish documenting naming screen 2020-08-07 20:18:09 -04:00
GriffinR
463d79c7c1 Start documenting naming screen 2020-08-07 02:00:41 -04:00
GriffinR
b40cee540e Continue documenting roulette 2020-08-02 14:52:05 -04:00
PikalaxALT
03eba6a62c
Merge pull request #1116 from GriffinRichards/doc-slotmachine 
Document slot machine
 2020-08-01 09:56:44 -04:00
GriffinR
22b5b6b074 Start documenting roulette 2020-07-30 19:37:16 -04:00
GriffinR
b22709ee3d More slot machine data documentation 2020-07-28 14:29:44 -04:00
DizzyEggg
43359f39c3 Merge with master 2020-07-27 15:28:03 +02:00
GriffinR
36a4764a78 Document some slot machine data 2020-07-26 02:15:59 -04:00
GriffinR
52a4428ba6 Begin new contest documentation 2020-07-23 17:55:40 -04: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
179741446f Added the icons of Deoxys' forms, coming straight from Pokefirered and vanilla Pokeemerald 2020-07-23 13:30:36 -03: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
af09e73d67
Merge branch 'master' into doc-overworld 2020-07-18 20:24:09 -04:00
GriffinR
8e6dd3bafe
Merge pull request #1086 from GriffinRichards/doc-unktrans 
Document unk_transition
 2020-07-18 20:22:58 -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
e129d04b93
Merge branch 'master' into doc-overworld 2020-07-15 00:40:47 -04:00
DizzyEggg
ff5fc97859 Merge with master 2020-07-11 14:07:10 +02:00
GriffinR
ebb6c4ee66
Merge branch 'master' into doc-overworld 2020-07-08 15:51:58 -04:00
GriffinR
431c60c92c Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti 2020-07-08 15:45:31 -04:00
GriffinR
43c48d95c2 Document starter_choose.c 2020-07-06 17:26:25 -04:00
GriffinR
72edc46ab6 Document unk_transition 2020-07-02 15:45:37 -04:00
GriffinR
1ce929157f Clean up field effect doc 2020-07-02 05:05:13 -04:00
GriffinR
eb80012757 Document more misc field effects 2020-06-29 16:32:46 -04:00
GriffinR
4ea6992172 Continue documenting overworld/field effects 2020-06-29 01:26:29 -04:00
GriffinR
18d57a3802 Document some overworld and field effects 2020-06-23 15:48:53 -04:00
GriffinR
24569583e4 Document contest results 2020-06-18 17:50:13 -04:00
GriffinR
a9a427c6f2
Merge branch 'master' into doc-link 2020-06-10 17:36:43 -04:00
GriffinR
7632404ba5 Document union_room_chat.c 2020-06-02 18:35:00 -04:00
DizzyEggg
ab3eb6065b More transitions documentation 2020-06-01 16:17:25 +02:00
DizzyEggg
cca1dcc04a merge with master 2020-05-29 13:07:53 +02:00
DizzyEggg
bdebab834c Document pokemon summary screen 2020-05-18 14:03:01 +02:00
SBird
67e9309415 gfx: fix hpbar_anim.png visual palette 2020-05-01 20:51:29 +02:00
LOuroboros
d476d46087
Added the front and back sprites of Mega Medicham, Mega Diancie, Mega Rayquaza, Primal Kyogre and Primal Groudon (#354) 2020-04-23 09:07:58 +02:00
DizzyEggg
88bdeed1a6 Merge with master 2020-04-15 14:40:16 +02:00
GriffinR
96958ba5e9 Drop unnecessary decor prefix 2020-04-13 13:04:22 -04:00
GriffinR
0ffe63a23b Fix decor png dimensions 2020-04-13 12:58:48 -04:00
GriffinR
e485857df3 Sync minigame_countdown 2020-04-08 17:23:32 -04:00
GriffinR
ab87c90998 Revert city_zoom_tiles.png name 2020-03-17 12:08:05 -04:00
PikalaxALT
39da49495d
Merge pull request #1000 from GriffinRichards/doc-dex 
Document pokedex.c
 2020-03-17 10:43:57 -04:00
PikalaxALT
784e29352d
Merge pull request #985 from mrgriffin/decoration 
Document decoration.c
 2020-03-17 10:39:37 -04:00
PikalaxALT
7a059c75a6
Merge pull request #968 from GriffinRichards/doc-regionmap 
Document some pokenav and region map
 2020-03-17 10:38:20 -04:00
DizzyEggg
887fb1b45c Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-03-13 22:45:51 +01:00
garakmon
b1dd945cbf move fonts from data/graphics/ to graphics/ 2020-03-12 13:40:00 -04:00
GriffinR
a495379ff0 Document pokedex cry screen 2020-03-10 14:02:03 -04:00
GriffinR
31b0cbe9b4 Document pokedex.c 2020-03-09 16:24:01 -04:00
Martin Griffin
4485d51522 Document decoration.c 2020-03-06 09:47:20 +00:00
DizzyEggg
f95a335c0d Merge with master 2020-02-29 10:35:01 +01:00
GriffinR
172cb7bae9 Sync Unown and qmark mon folders with pokefirered 2020-02-25 14:18:28 -06:00
GriffinR
68dc68907b Label move anim data 2020-02-25 12:54:08 -06:00
DizzyEggg
3c938d1809 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-02-23 12:42:21 +01:00
Eduardo Alvaro Quezada D'Ottone
70ebc6b55b
Lycanroc forms (#268) 
* Midnight Lycanroc

* Dusk Lycanroc
 2020-02-22 23:42:16 +01:00
Marcus Huderle
49421a41b2 Move field effects data and graphics into own directory, and cleanup naming for object events 2020-02-12 17:32:51 -06:00
GriffinR
956090b05f Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj 2020-02-12 13:05:57 -05:00
GriffinR
084bd66924 Document Trainer Card 2020-02-08 14:31:17 -06:00
Eduardo Alvaro Quezada D'Ottone
bb10a69f81
Busted Mimikyu (#254) 
* Busted Mimikyu

* Fixed back sprite coords.
 2020-02-08 19:32:01 +01:00
Eduardo Alvaro Quezada D'Ottone
c6c2dc31fd
Farfetch'd is back (#263) 2020-02-08 15:57:09 +01:00
GriffinR
86354f1d50 Document some pokenav and region map 2020-02-05 21:04:43 -05:00
DizzyEggg
e1a428a25d Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-01-31 21:17:19 +01:00
GriffinR
9c934c9664 Merge master into fix-eventobj, add explicit size to gObjectEventGraphicsInfoPointers 2020-01-26 12:23:08 -05:00
GriffinR
a152900211 Combine animated door frames 2020-01-26 09:40:35 -06:00
GriffinR
25d7577d9d Label animated doors 2020-01-26 09:40:35 -06:00
DizzyEggg
26e109d788 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-01-18 15:06:43 +01:00
GriffinR
655910a16f
Merge branch 'master' into fix-eventobj 2020-01-12 22:42:43 -05:00
DizzyEggg
f1d1557a39 Merge with master 2020-01-12 15:06:52 +01:00
GriffinR
635267ce32
Merge branch 'master' into fix-eventobj 2020-01-08 05:51:49 -05:00
GriffinR
ef67f2d33b Merge master into ObjEvent rename and prune accidental inclusions 2020-01-08 05:43:06 -05:00
GriffinR
e5df61e362
Merge branch 'master' into doc-dome 2020-01-08 01:15:36 -05:00
GriffinR
fb5bea98ce More battle_dome.c doc 2020-01-07 22:30:37 -05:00
GriffinR
c85ca4b860 Standardize farfetchd spelling 2020-01-06 15:17:11 -06:00
DizzyEggg
f9cfc29f8f
Merge pull request #227 from SBird1337/pokemon_expansion 
update gMonBackPicCoords, fix Xerneas PNG checksum
 2020-01-01 15:15:18 +01:00
LOuroboros
d1d3ca5312 Various Forms Data (#226) 
* Defined species for Shaymin's Sky Form and Giratina's Origin Form

* Defined the sprites for Shaymin's and Giratina's forms

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

* Set the InGame names for Shaymin's and Giratina's forms

* Added the base stats of Shaymin's and Giratina's forms

* Set the level up learnsets for the forms of Shaymin and Giratina

* Defined the paths of the sprites for the forms of Shaymin and Giratina

* Linked the icons to the species of Shaymin's and Giratina's forms

* Added the sprites of Shaymin's Sky Form and Giratina's Origin Form

* Added the icons of Shaymin's and Giratina's forms

* Fixed silly mistakes.

* Alright, fixed silly mistakes. For good now.

* Added the data for a lot of Pokémon's forms.
-Darmanitan Zen Mode
-Tornadus, Thundurus and Landorus Therian Forms
-Meloetta Pirouette Form
-Aegislash Blade Form
-Hoopa Unbound Form
-Minior Core Form
-Wishiwashi School Form

* Added the sprites of the Pokémon forms that were just inserted

* Added the sprites for the Black and White Forms of Kyurem
 2020-01-01 15:07:56 +01:00
karathan
eea587f5c5 update gMonBackPicCoords, fix Xerneas PNG checksum 2020-01-01 03:18:15 +01:00
Exory
055460449e Fixed Pokemon animations. (#223) 
* Fixed Breloom's animation and color.

* 1 pixel improvement on Breloom, Fixed Delcatty's animation.

* Fixed Turtwig

* Fixed Whirlipede.

* Fixed Ditto.

* Fixed Mewtwo.

* Fixed Surskit.
 2019-12-30 18:56:26 +01:00
DizzyEggg
5fc298c4eb Add graphical fairy type 2019-12-30 18:34:30 +01:00
DizzyEggg
dee8f916bf EOL 2019-12-30 18:07:00 +01:00
DizzyEggg
52ae3547dd
Merge pull request #219 from ExoryxHana/pull_requests_pokemon_expansion 
Fixed Jirachi, Omanyte and Shroomish's anim_front, Reworked Xerneas.
 2019-12-30 17:29:16 +01:00
Pokestia
e4731b1289 Pokemon expansion (#211) 
* Define species Meltan and Melmetal

Also shifted a few other species numbers

* Define Meltan and Melmetal Sprites

* Add Meltan and Melmetal coordinates and table entries

* Set Meltan and Melmetal ingame names

* Add Meltan and Melmetal base stats

* Add Meltan and Melmetal level up learnsets

* Set Meltan and Melmetal TM learnset

It is still blank because LGPE TMs don't match USUM TMs

* Define Meltan and Melmetal sprite paths

* Add Meltan and Melmetal sprite, icon and front animation

* Fix typo in bas stats

* Add Meltan and Melmetal pokedex entries

* Tab to space learnsets

* Tab to space pokedex text

This includes all mons with tabs in their dex entries.
 2019-12-30 13:48:50 +01:00
ExoryxHana
aac9a9e3ea Fixed Jirachi, Omanyte and Shroomish's anim_front files, Reworked Xerneas. 2019-12-24 04:53:56 +01:00
DizzyEggg
a4a4132d26 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-12-23 16:41:44 +01:00
GriffinR
68cdd7b1cb Merge master into ObjEvent rename 2019-12-21 05:19:27 -05:00
GriffinR
63c8cf97d1 Document Battle Dome scripts and some battle_dome.c 2019-12-20 16:53:33 -05:00
GriffinR
d1cf9006fb Document some warp/field screen effect 2019-12-17 05:23:07 -05:00
DizzyEggg
2a6e4e0a2a Merge with master 2019-12-09 08:29:10 +01:00
GriffinR
b93101bbeb Merge master into ObjEvent rename 2019-12-06 21:37:33 -05:00
GriffinR
7f22fc9879 Update old weather names in field_weather_effect 2019-12-06 19:05:28 -06:00
DizzyEggg
1a5c610b5c
Merge pull request #206 from LOuroboros/alolan_forms 
Alolan Forms
 2019-11-30 15:35:12 +01:00
DizzyEggg
7ff3f32a95 Merge 2019-11-29 21:05:44 +01:00
GriffinR
f559fa3fe2 Merge master into ObjEvent rename 2019-11-25 20:00:04 -05:00
huderlem
9a81661075
Merge pull request #851 from Sewef/patch-3 
battle_anim_effects_3
 2019-11-24 12:02:54 -06:00
Sewef
1dfe34dee3 TriForce → TriAttack 2019-11-23 15:51:08 +01:00
GriffinR
570881b119 Rename event_object directories 2019-11-21 00:44:55 -05:00
GriffinR
98b81722e7 Rename field_objet_palettes 2019-11-20 23:54:22 -05:00
LOuroboros
762d33f52e Added the icons of the Alolan Forms. 2019-11-15 19:14:58 -03:00
LOuroboros
224a556daa Added the sprites of the Alolan Forms. 2019-11-13 12:52:52 -03:00
DizzyEggg
c65900b67a merge 2019-11-10 14:13:23 +01:00
Marcus Huderle
01e6fb6dd0 Document some battle_bg-related things 2019-11-07 18:24:04 -06:00
GriffinR
e01ec84837 Document party_menu second pass 2019-10-31 03:25:56 -04:00
GriffinR
6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00