atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16547 commits 2 branches 40 tags 600 MiB
Commit graph

563 commits

Author SHA1 Message Date
Evan
4912bc1d25 Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion 2021-01-11 17:15:41 -07:00
GriffinR
e0c0143f41 Fix substitute back sprite 2021-01-04 10:14:01 -05:00
ExpoSeed
7dadcb94b8 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-03 17:14:43 -06:00
ExpoSeed
10f4b48215 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-01 14:14:51 -08:00
ExpoSeed
208e0abe04 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2020-12-31 18:44:43 -06:00
GriffinR
ec85c01e7c
Merge branch 'master' into doc-factscreen 2020-12-31 00:40:45 -05:00
GriffinR
0bf49198f6 Resume factory screen doc 2020-12-30 13:28:15 -05:00
ultima-soul
c675c92a1d Add Gen 8 Pokemon data. 2020-12-16 12:57:36 -08:00
Evan
a0ae0ece53 add ultranecrozium-z and update z crystal data 2020-12-08 09:55:50 -07:00
Evan
539a88207e add z crystal and z ring 2020-11-29 10:00:03 -05:00
GriffinR
9d056e8656 Move object event pal declarations to graphics 2020-11-23 14:45:16 -05:00
Eduardo Quezada D'Ottone
29c33b908b
Apply suggestions from code review 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2020-11-13 21:34:37 -03:00
Eduardo Quezada D'Ottone
b2f078410f Review changes 2 2020-11-13 16:13:13 -03:00
Eduardo Quezada D'Ottone
26db02e95a Review changes 1 2020-11-13 15:36:36 -03:00
Eduardo Quezada D'Ottone
caf6253ba3 Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms 
# Conflicts:
#	src/pokemon_icon.c
 2020-11-10 19:37:02 -03:00
TheXaman
abf5d238c2 PokedexPlus with HGSS styled UI by TheXaman 
more ui, BROKEN atm

type icons in info screen

working topbar

dpad for switching and white mon name

initial working stats screen

additional stats, proper move list array

Working stats screen, all infos in, all icons in, buggy when switching

Fixed sprite bug, proper sprite destruction, works with old compiler

new navigation: info>area>stats

power+accuracy text, change of positions

layout for stats screen, other screen visually broken

new stats layout properly working plus toggle infos

show lvl of LevelUpMove and TM/HM of TMHM_Move

3 dashes for EggMoves and CORRECT icon for TM/HMs pog

improved layout and contest move data!

TutorMoves now available

hold dpad to scroll, pure relieve

search by move code working

6evs, 16 character move names, tripple digit moves, new eduardo layout

working tileset, info screen no correct xy layout for elements yet

new list menu start

new layout working, only missing stats bars

new list, new search

fixed area screen change and fixed "new caught" bug (type icons)
 2020-11-08 00:49:14 +01:00
Eduardo Quezada D'Ottone
3849f7dd5d Female Eevee backsprite. 2020-11-06 16:45:25 -03:00
Eduardo Quezada D'Ottone
4d4b111327 Front pic gender differences for Eevee 2020-11-06 16:21:45 -03:00
Eduardo Quezada D'Ottone
0c6dc6abab Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms 
# Conflicts:
#	graphics/pokemon/burmy/footprint.png
#	graphics/pokemon/gastrodon/footprint.png
#	graphics/pokemon/rotom/footprint.png
#	graphics/pokemon/shellos/footprint.png
#	graphics/pokemon/wormadam/footprint.png
#	include/constants/species.h
#	src/data/pokemon/base_stats.h
 2020-11-03 00:13:51 -03:00
LOuroboros
7cf3c256cd Added footprints for the Gen. 5 species, thanks to Blackforest 2020-11-01 09:44:05 -03:00
LOuroboros
6435158742 Added footprints for the Gen. 4 species 2020-10-27 09:38:04 -03:00
Eduardo Quezada
92728a1875 Added Ultimasoul's Forms from his FromID system. 2020-10-23 11:44:47 -03:00
Eduardo Quezada D'Ottone
38573ab402
Merge pull request #16 from LOuroboros/deoxys 
Added the data of Deoxys' forms
 2020-10-22 00:52:40 -03:00
Evan
d64b926469 Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion 2020-10-19 11:22:41 -06:00
DizzyEggg
97d0643110 Merge with master 2020-09-08 12:48:28 +02:00
DizzyEggg
448599f53c Merge with master 2020-09-08 12:01:20 +02:00
DizzyEggg
271219f962 Merge with master 2020-09-08 12:00:51 +02:00
PikalaxALT
c3f6c56e19
Merge pull request #1161 from GriffinRichards/doc-wallclock 
Document wall clock data
 2020-09-04 19:48:04 -04:00
GriffinR
1264c4615a
Merge pull request #1158 from GriffinRichards/doc-cablecar 
Document cable car
 2020-09-03 16:24:27 -04:00
GriffinR
4ad147f75d
Merge pull request #1156 from GriffinRichards/doc-rayscene 
Document Rayquaza cutscene
 2020-09-01 14:46:14 -04:00
GriffinR
778bdb4d30 Document wallclock data 2020-08-29 15:55:28 -04:00
GriffinR
71a066f945 Document cable car 2020-08-28 03:54:04 -04:00
GriffinR
38d4fc9c17 Clean up rayquaza scene documentation 2020-08-27 16:04:11 -04:00
GriffinR
ba13e9ec95 Document first rayquaza scene 2020-08-27 15:43:18 -04:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
DizzyEggg
c2733236be Merge with master 2020-08-27 11:36:35 +02:00
DizzyEggg
35559d6b71 Merge with master 2020-08-27 10:58:31 +02:00
GriffinR
95ea0e92e7 Start documenting rayquaza_scene 2020-08-25 17:49:42 -04:00
GriffinR
0ff767a9b5 Start documenting berry blender 2020-08-22 19:39:39 -04:00
GriffinR
65bd2faf94 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest 2020-08-16 05:59:10 -04:00
GriffinR
25f45ffa84
Merge pull request #1125 from GriffinRichards/doc-namingscr 
Document naming screen
 2020-08-15 00:06:57 -04:00
GriffinR
8b95e1964b
Merge pull request #1121 from GriffinRichards/doc-roulette 
Document roulette
 2020-08-10 17:18:09 -04: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
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
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
d119307f02 Defined the sprites for Deoxys' forms 2020-07-23 12:55:44 -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
Evan
f923f5198e add oval charm 2020-07-16 09:48:25 -06:00
DizzyEggg
ff5fc97859 Merge with master 2020-07-11 14:07:10 +02:00
DizzyEggg
4c3f40a361 Merge with master 2020-07-11 12:59:23 +02:00
DizzyEggg
e03fea84d0 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-07-11 12:46:41 +02:00
GriffinR
431c60c92c Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti 2020-07-08 15:45:31 -04:00
GriffinR
24569583e4 Document contest results 2020-06-18 17:50:13 -04:00
GriffinR
76f6d05173 Document confetti 2020-06-17 03:39:03 -04:00
GriffinR
7632404ba5 Document union_room_chat.c 2020-06-02 18:35:00 -04:00
DizzyEggg
cca1dcc04a merge with master 2020-05-29 13:07:53 +02:00
DizzyEggg
013f9b6a17 merge wiith masteer and summary screen change 2020-05-29 12:50:54 +02:00
ghoulslash
13cf2cb217
Animation Particles, BGs, and gen 4 anims (#384) 
* undo some revert(?)

* cfru particles and bgs

* remove commented out particles
 2020-05-24 18:13:40 +02:00
DizzyEggg
bdebab834c Document pokemon summary screen 2020-05-18 14:03:01 +02:00
LOuroboros
32bb717bf1
Implemented missing TMs/HMs type palettes (#327) 
* Implemented palettes for Bug type and Fairy type TMs/HMs thanks to Ghoulslash

* Actually added the Bug and Fairy type TM/HM sprite palettes now
 2020-04-16 09:27:13 +02:00
DizzyEggg
88bdeed1a6 Merge with master 2020-04-15 14:40:16 +02:00
DizzyEggg
09dcff81f8 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-04-15 13:28:10 +02:00
DizzyEggg
060b795d8e Merge with master 2020-04-11 19:48:24 +02:00
GriffinR
31b0cbe9b4 Document pokedex.c 2020-03-09 16:24:01 -04:00
DizzyEggg
6968124529 Merge battle anim documentation 2020-02-29 13:59:41 +01:00
DizzyEggg
f95a335c0d Merge with master 2020-02-29 10:35:01 +01:00
DizzyEggg
f2760e3083 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-02-29 09:47:14 +01: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
DizzyEggg
13c0c64d70 Merge with master 2020-02-23 12:41:36 +01:00
DizzyEggg
108f6b711f Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-02-23 10:58:26 +01:00
Eduardo Alvaro Quezada D'Ottone
0c0af89024
Ordered unordered item graphics and palettes. (#269) 2020-02-22 23:44:30 +01:00
Eduardo Alvaro Quezada D'Ottone
70ebc6b55b
Lycanroc forms (#268) 
* Midnight Lycanroc

* Dusk Lycanroc
 2020-02-22 23:42:16 +01:00
GriffinR
3456578c0f Move berry crush data to src 2020-02-17 13:10:23 -06:00
Eduardo Alvaro Quezada D'Ottone
2c172a3636
Shiny charm (#276) 
* Shiny Charm Item

* Shiny Charm Rerolls
 2020-02-17 11:08:06 +01:00
GriffinR
ac1738e11d Move smokescreen data to src 2020-02-13 14:48:19 -06:00
GriffinR
689acd3613 Move slot machine data to src 2020-02-09 14:11:50 -06:00
GriffinR
084bd66924 Document Trainer Card 2020-02-08 14:31:17 -06:00
GriffinR
6640c509c0 Remove unnecessary declaration 2020-02-08 14:22:53 -06:00
GriffinR
d1035f027e Move contest_link_80F57C4 data to src 2020-02-08 14:22:53 -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
DizzyEggg
d8aab3d112 Merge with master 2020-01-18 18:17:25 +01:00
DizzyEggg
26e109d788 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-01-18 15:06:43 +01:00
DizzyEggg
044f070020 Merge with master 2020-01-18 15:04:56 +01:00
GriffinR
fb5bea98ce More battle_dome.c doc 2020-01-07 22:30:37 -05: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
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
DizzyEggg
1a5c610b5c
Merge pull request #206 from LOuroboros/alolan_forms 
Alolan Forms
 2019-11-30 15:35:12 +01:00
DizzyEggg
dcb5d16cb3 Merge with master 2019-11-29 21:47:31 +01:00
DizzyEggg
7ff3f32a95 Merge 2019-11-29 21:05:44 +01:00
DizzyEggg
6e06b08c94 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2019-11-29 20:55:23 +01: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
LOuroboros
fcedeeeba7 Defined the sprites for the Alolan Forms. 2019-11-12 11:33:59 -03:00
DizzyEggg
c65900b67a merge 2019-11-10 14:13:23 +01:00
DizzyEggg
791ed999d9 Merge 2019-11-10 12:40:11 +01:00
DizzyEggg
b4ac979600 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-11-10 12:09:43 +01:00
Marcus Huderle
01e6fb6dd0 Document some battle_bg-related things 2019-11-07 18:24:04 -06:00
DizzyEggg
1d8cc9b741 Fix merge conflicts 2019-11-03 19:55:19 +01:00
GriffinR
6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
DizzyEggg
e736c369d6 Merge with master 2019-10-19 17:47:55 +02:00
DizzyEggg
4bbbbdc50a Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-10-19 15:30:14 +02:00
DizzyEggg
1d10d44a4d Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2019-10-19 15:17:45 +02:00
DizzyEggg
bae5d2038f Update with master 2019-10-10 16:18:48 +02:00
GriffinR
2c062dc764 More trade documentation 2019-10-09 05:56:44 -04:00
DizzyEggg
4c462a726e Merge with master and learnsets 2019-10-06 15:57:33 +02:00
DizzyEggg
cb6bafcb7f Merge with master 2019-10-06 14:40:12 +02:00
GriffinR
c3c8fb40cf Move trade data, some trade.c clean up documentation 2019-10-03 01:16:22 -04:00
GriffinR
6c9997a906 Document decor icons 2019-09-16 19:23:21 -05:00
DizzyEggg
fabbc9ae31 Merge with master 2019-08-14 11:48:08 +02:00
DizzyEggg
0252270515 Merge with master 2019-08-12 11:25:05 +02:00
DizzyEggg
17be6766c7 Merge 2019-08-08 14:07:17 +02:00
DizzyEggg
4881e48994 Merge with master 2019-08-04 23:57:53 +02:00
DizzyEggg
df1b804af8 Merge with master 2019-08-04 23:18:49 +02:00
DizzyEggg
c219776034 Merge with master 2019-08-04 23:09:28 +02:00
PikalaxALT
cd876292d1 Merge branch 'master' into pokenav_unk_2 2019-08-04 15:35:35 -04:00
PikalaxALT
fa5bfc1627
Merge pull request #766 from DizzyEggg/pokenav_10 
Decompile pokenav 10
 2019-08-04 11:07:10 -04:00
DizzyEggg
252df94bc1 Decompile pokenav 10 2019-08-04 13:53:00 +02:00
DizzyEggg
1641579297 Merge branch 'master' into pok_jump 2019-08-04 00:02:13 +02:00
ultima-soul
9a152f8fe6 Decompile data/use_pokeblock.s 2019-07-30 17:21:17 -07:00
DizzyEggg
ff2dcf5413 Two fakematches out 2019-07-29 21:09:05 +02:00
DizzyEggg
33c036e7ff Decompile pokemonav 7 2019-07-24 17:02:52 +02:00
Xhyzi
d66b9022a6 Added 46 move animations 
- Magnet Bomb.
- Mirror Shot.
- Aqua Ring.
- Aqua Tail.
- Aqua Jet.
- Attack Order.
- Defend Order.
- Heal Order.
- Dragon Rush.
- Dragon Pulse.
- Discharge.
- Magnet Rise.
- Charge Beam.
- Shadow Claw.
- Shadow Force.
- Ominous Wind.
- Lava Plume.
- Magma Storm.
- Avalanche.
- Vacuum Wave.
- Force Palm.
- Lucky Chant.
- Double Hit.
- Giga Impact.
- Captivate.
- Rock Climb.
- Last Resort.
- Grass Knot.
- Wood Hammer.
- Zen Headbutt.
- Lunar Dance.
- Trick Room.
- Psycho Cut.
- Power Gem.
- Stone Edge.
- Rock Wrecker.
- Head Smash.
- Sealth Rock.
- Punishment.
- Sucker Punch.
- Nasty Plot.
- Switcheroo.
- Earth Power.
- Gunk Shot.
- Defog.

Fix Pyscho Shift

Hollow Orb graphics were not being loaded before creating the sprite

Fix Gastro Acid anim

Fix gastro acid palette asignation.

.
 2019-07-13 01:02:09 +02:00
Karathan
d9b54c3c1c add power swap, guard swap, worry seed 2019-07-06 05:22:18 +02:00
Karathan
e9884154a9 added acupressure and wring out 2019-07-03 03:45:11 +02:00
Karathan
501ae27390 add trump card, fix a few issues with pluck 2019-07-02 18:26:59 +02:00
Karathan
5f7b5ba453 add feint and pluck animation sprites and implementations 2019-07-02 06:22:05 +02:00
PikalaxALT
fb06e4a3c9 Modernize code 
Can compile with arm-none-eabi-gcc 8.3.0
gbafix correctly handles ELF input
 2019-06-26 12:12:10 -04:00
DizzyEggg
54150e3794 Revert "Cherrim sun form gfx" 
This reverts commit cd09047c4f.
 2019-06-15 14:16:11 +02:00
DizzyEggg
9e175c9f1b Merge branch 'master' into battle_engine_v2 2019-06-10 11:21:16 +02:00
DizzyEggg
cd09047c4f Cherrim sun form gfx 2019-06-10 11:16:52 +02:00
DizzyEggg
1c60387968 Merge with master, placeholder back anims 2019-06-03 11:24:10 +02:00
DizzyEggg
0eaddd251c Merge branch 'master' into item_expansion 2019-06-03 11:06:09 +02:00
Papa Cancer
e53ba4773d Documenting bags, berries and graphics 
Bag graphics and berry graphics mostly documented
item_menu.c significantly documented
Bag structs documented and functions renamed to match formatting
 2019-05-22 21:10:16 -05:00
LOuroboros
2592d38303 Added the data, sprites and sprites data of the Wings. 2019-05-17 07:52:41 -03:00
DizzyEggg
900c15c20c Mega evo animation 2019-05-03 17:27:49 +02:00
PikalaxALT
f13e1c78b2 through sub_81CA0EC 2019-05-02 17:53:00 -04:00
PikalaxALT
518865d8d9 sub_81C9A10 2019-05-02 16:19:25 -04:00
LOuroboros
36d8371950 Added the sprites and the data for the missing items. 2019-05-02 15:11:06 -03:00
DizzyEggg
bbe3a28b78 Merge with master 2019-05-01 11:10:41 +02:00
DizzyEggg
fdb328fbd3 Gfx for megas 2019-04-29 14:27:36 +02:00
DizzyEggg
2d670fa803 Rotom forms and meowstic female 2019-04-23 13:00:40 +02:00
DizzyEggg
17cf13beef Merge with master 2019-04-16 11:14:50 +02:00
DizzyEggg
f97125fc63 Fill most of what new berries data 2019-04-15 11:50:31 +02:00
DizzyEggg
42e7930987 Almost done with the balls 2019-04-14 21:49:31 +02:00
DizzyEggg
59797e4801 Use constants in battle_anim_special.c 2019-04-14 10:19:50 -05:00
DizzyEggg
9ca2af0ce9 More pokeballs expansion 2019-04-14 12:13:44 +02:00
DizzyEggg
4e5c543327 Remove new items data from battle engine 2019-04-13 14:02:04 +02:00
DizzyEggg
2646f3b26a Merge with master 2019-04-13 13:42:44 +02:00
DizzyEggg
0996404139 Get all availabe items data 2019-04-13 13:30:38 +02:00
DizzyEggg
8cd03654b0 Icons for gen6 mons 2019-04-13 11:30:00 +02:00
DizzyEggg
b0317adb8c Merge branch 'master' into pokemon_expansion 2019-04-11 13:10:35 +02:00
DizzyEggg
c17dbbc47c Merge branch 'master' into pokemon_expansion 2019-04-08 10:56:37 +02:00
DizzyEggg
0e02c28927 Merge with master 2019-04-08 09:37:41 +02:00
Phlosioneer
50350cc2e1 Merge branch 'master' into contest-ai-cleanup 2019-04-07 20:20:22 -04:00
DizzyEggg
51bb713aef Add Burmy Wormadam form gfx and data 2019-04-07 14:39:11 +02:00
Phlosioneer
d84d94e29a Merge branch 'master' into pokenav-decomp-again 2019-04-07 01:56:36 -04:00
DizzyEggg
8213222337 Merge with master 2019-04-06 23:20:16 +02:00
DizzyEggg
f8713f9c15 Merge with master 2019-04-06 20:43:13 +02:00
DizzyEggg
b85a74afc5 Give names to battle anim backgrounds 2019-04-06 12:44:27 -05:00
DizzyEggg
19f151417e Rename sprite sheet to sprite gfx 2019-04-06 10:14:48 -05:00
DizzyEggg
b93581b519 Rename battle anim sprites 2019-04-06 10:14:48 -05:00
DizzyEggg
7c8f69e6e3
Merge pull request #109 from Fontbane/patch-4 
Field Effects for Gen IV Abilities
 2019-04-05 23:40:30 +02:00
DizzyEggg
183b714ff1 Merge with master and fix web moves 2019-04-05 12:43:44 +02:00
PikalaxALT
a47abb3949 union_room_chat data, 1 2019-04-04 19:26:45 -05:00
DizzyEggg
9c6d3d33c7 Remove still pics 2019-04-04 16:12:55 +02:00
DizzyEggg
e00d40848b Gen1-4 correct coordinates 2019-04-04 15:29:27 +02:00
DizzyEggg
240e9bda17 All data for gen 6.7 mons, placeholder sprites 2019-04-04 13:36:47 +02:00
DizzyEggg
b407967cea Gen5 sprites and icon placeholder data 2019-04-04 12:57:01 +02:00
DizzyEggg
de4722708b Add Gen4 mon sprites 2019-04-03 17:39:08 +02:00
DizzyEggg
adfd151f47 Add Gen4 icons 2019-04-03 13:08:41 +02:00
Phlosioneer
f82bdb332a Document applause meter code 2019-04-03 03:00:06 -04:00
DizzyEggg
5c44f44ad2 Organize new battle anim gfx 2019-04-02 12:26:24 +02:00
DizzyEggg
cd3de7821e Merge branch 'master' into battle_engine_v2 2019-04-02 08:37:54 +02:00
DizzyEggg
944dc4f6bf Merge with master 2019-04-01 13:40:42 +02:00
Phlosioneer
37c7441a15 Merge branch 'master' into contest-data 2019-03-31 20:22:47 -04:00
Marcus Huderle
500d009b5c Start decompiling berry_crush.c 2019-03-31 09:13:19 -05:00
DizzyEggg
17e74756cb Merge with master, add defines to atk49 and statbuffchange commands 2019-03-31 15:19:25 +02:00
DizzyEggg
aa7f69f067 Begin use pokeblock and menu specialised 2019-03-31 12:59:01 +02:00
Marcus Huderle
a978a6a624 Finish decompiling union_room_chat.c 2019-03-29 21:26:08 -05:00
Fontbane
2cfa5ea326 Fixed Honey 
And updated gitignore
 2019-03-25 19:00:46 -04:00
Marcus Huderle
4fd2b0b484 Decompile remaining functions in use_pokeblock.s 2019-03-23 17:23:14 -05:00
Marcus Huderle
65391a1eb2 Merge remote-tracking branch 'upstream/master' into use_pokeblock 
# Conflicts:
#	src/use_pokeblock.c
 2019-03-23 09:39:46 -05:00
Phlosioneer
8cea949e6d Move constant and EWRAM data into C. 2019-03-15 19:33:30 -04:00
Phlosioneer
b7cfa9d365 Move more contest constants into C 2019-03-08 21:39:51 -05:00
LOuroboros
7d7e54c59a Added the item sprite of the Safety Goggles. 2019-03-07 13:54:54 -03:00
LOuroboros
75d78f4941 Added the item sprites of the Gen. 7 hold items. 2019-03-07 07:19:40 -03:00
LOuroboros
ee8b72e68c Implemented the sprites for the Gen. 5 gems. 2019-03-06 15:33:02 -03:00
LOuroboros
5c1cf3063f Implemented the sprites for the Gen. 6 items. 2019-03-02 12:42:53 -03:00
LOuroboros
9564de6edb Implemented the sprites for the Gen. 4 and 5 items. 2019-03-01 00:06:31 -03:00
DizzyEggg
cebada80d0 Merge with master 2019-02-28 20:56:52 +01:00
Marcus Huderle
231355f84d Decompile easy_chat data 2019-02-26 14:50:02 -06:00
Ariel Antonitis
74a3c06270 Documented/polished pokemon_summary_screen.c 
Mostly variables mislabeled as global and some formerly unknown stuff.
 2019-02-23 21:12:35 -05:00
Diegoisawesome
7995cf5b61
Merge pull request #578 from DizzyEggg/pokenav 
pokenav
 2019-02-23 16:04:59 -06:00
DizzyEggg
842e379a7b Merge branch 'master' into battle_engine_v2 2019-02-23 22:50:46 +01:00
Marcus Huderle
f34903bc45 Decompile more easy_chat.c 2019-02-23 13:05:34 -06:00
ultima-soul
eb48cc2f7e Decompile through sub_8167930. 2019-02-23 09:08:07 -08:00
DizzyEggg
788caa4fe2 pokenav 2019-02-23 13:34:01 +01:00
Marcus Huderle
d3f66a98ff Decompile more easy_chat 2019-02-22 11:46:05 -06:00
Phlosioneer
be08a662a8 More data moved into C code 2019-02-17 23:14:14 -05:00
Phlosioneer
3bb4057bad Decompiled sub_81C7764 2019-02-17 23:14:14 -05:00
DizzyEggg
b5d0253890 Merge with master 2019-02-10 18:17:33 +01:00
Marcus Huderle
40dc6833c5 Fully document tileset animations 2019-02-08 15:07:42 -06:00
Marcus Huderle
4570e3b6a5 Document battle arena 2019-02-08 09:41:36 -06:00
DizzyEggg
aa33a61e58 Merge branch 'master' into battle_engine_v2 2019-02-07 21:17:30 +01:00
Marcus Huderle
1253cbf5f6 Document some battle anim things 2019-02-06 21:14:28 -06:00
DizzyEggg
94d2a30d44 Merge with master 2019-01-28 20:41:46 +01:00
Diegoisawesome
183b6857ff
Merge pull request #458 from ultima-soul/contest 
Decompile more of contest
 2019-01-27 23:08:24 -06:00
DizzyEggg
897592a8d4 Merge branch 'master' into battle_engine_v2 2019-01-27 10:58:57 +01:00
DizzyEggg
01c3f3fc05 Document all of frontier pass 2019-01-26 20:56:06 +01:00
DizzyEggg
0688725afb Document and decompile more of frontier pass. 2019-01-26 14:50:24 +01:00
DizzyEggg
08a3533682 Start frontier pass 2019-01-25 23:32:45 +01:00
DizzyEggg
4e396207d3 document more of trainer card 2019-01-20 18:24:35 +01:00
Karathan
832c0d6333 add toxic spike animation 2019-01-12 17:02:24 +01:00
ultima-soul
284751e761 Decompile through ClearContestWinnerPicsInContestHall, 10 NONMATCHINGs present. 2019-01-06 13:41:18 -08:00
DizzyEggg
4827776a3c Merge with master 2019-01-05 10:14:20 +01:00
Marcus Huderle
95db853a78 Decompile more of contest_link_80F57C4.c 2019-01-04 20:03:29 -06:00
Marcus Huderle
fd201f8395 Start decompiling contest_link_80F57C4.c 2019-01-03 20:35:20 -06:00
Diegoisawesome
0053e61535
Merge pull request #504 from Diegoisawesome/roulette 
Port/decompile roulette
 2019-01-02 17:00:33 -06:00
Diegoisawesome
a0188aac33 Cleanup and EWRAM 2019-01-02 16:55:50 -06:00
Marcus Huderle
fb2d1591c1 Document more battle anim effects 2018-12-31 16:53:38 -06:00
Diegoisawesome
c5c6e437ec Document, cleanup, extract data from trade 2018-12-31 01:23:27 -06:00
DizzyEggg
6411d1d693
Merge pull request #55 from huderlem/anims 
Some battle anims
 2018-12-26 17:48:03 +01:00
Diegoisawesome
d8948a5cda Merge remote-tracking branch 'pret/master' into trade 2018-12-25 15:03:13 -06:00
DizzyEggg
e230afd543 Merge branch 'master' into learn 2018-12-24 22:01:52 +01:00
DizzyEggg
442b1826a2 asm party and fldeff clean-up 2018-12-24 21:59:05 +01:00
Marcus Huderle
f1213ebb4b Decompile dark.c 2018-12-24 09:55:00 -06:00
Marcus Huderle
c17f7d73fa Merge remote-tracking branch 'origin/battle_engine_v2' into features 
# Conflicts:
#	ld_script.txt
#	src/effects_1.c
 2018-12-23 17:24:14 -06:00
Diegoisawesome
a5c09bfec6 S'more trade 2018-12-23 01:26:38 -06:00
Diegoisawesome
ebbe826133
Merge pull request #437 from DizzyEggg/storage 
Pokemon Storage System
 2018-12-22 16:12:27 -06:00
DizzyEggg
ecee02816d Merge with master 2018-12-20 22:53:08 +01:00
golem galvanize
64832ff67e start ice 2018-12-20 16:20:34 -05:00
Marcus Huderle
ecda59a406 Add Poison Jab animation 2018-12-20 11:58:21 -06:00
Marcus Huderle
0369780db9 Add Rock Polish animation 2018-12-20 10:18:17 -06:00
Diegoisawesome
48d7c0a7a3
Merge pull request #454 from golemgalvanize/decompile_party_menu 
Decompile party menu
 2018-12-19 19:57:31 -06:00
golem galvanize
cd785011fe decompiled water 2018-12-19 10:31:37 -05:00
Diegoisawesome
bd7c251859 Fix compressed palette alignment 2018-12-18 20:15:59 -06:00
Diegoisawesome
2592803460 Merge branch 'master' of github.com:pret/pokeemerald into trade 2018-12-18 19:54:27 -06:00
Diegoisawesome
cd994f4935 Begin trade.c 2018-12-18 19:29:41 -06:00
Marcus Huderle
b2ac3b6d6f Decompile most of battle_anim_effects_3.c 2018-12-18 19:15:59 -06:00
golem galvanize
c259ee46d3 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-12-18 05:31:39 -05:00
Marcus Huderle
c04ce0ee64 Decompile battle_anim_effects_2.c 2018-12-17 22:16:17 -06:00
golem galvanize
076d07f6fe Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-12-17 02:40:30 -05:00
DizzyEggg
f1421d94c3 Up to sub 0x80ce580 2018-12-15 23:58:47 +01:00
Marcus Huderle
2c6849bee8
Decompile battle_anim_8170478.c (#445) 2018-12-13 21:33:54 -06:00
golem galvanize
6748ef72fb Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-12-13 00:31:06 -05:00
DizzyEggg
59a69eb627 Storage up to icon palettes 2018-12-12 23:19:50 +01:00
DizzyEggg
c5b5f4bd77 More storage 2018-12-10 23:42:44 +01:00
Marcus Huderle
a7722a0b93
Decompile cable_car.c (#438) 2018-12-09 13:41:52 -06:00
golem galvanize
53fac4417b fixing merge conflicts 2018-12-07 14:47:20 -05:00
nullableVoidPtr
f24584cd31 Tabs -> spaces & align in include/ 2018-12-07 21:01:59 +08:00
Slawter666
715fbb379e Document some of pokedex.c 2018-12-03 14:58:25 +00:00
Melody
b9cf4f27b5 renames the winstrate graphics names to pokefan 2018-12-02 00:47:04 -05:00
Marcus Huderle
9dd7f8f214
Decompile pokedex_area_screen.c (#412) 2018-11-30 10:41:03 -06:00
Slawter666
deb7adbad5 Convert pokédex data to C 2018-11-27 04:00:38 +00:00
Marcus Huderle
5947e0d229 Decompile rock 2018-11-25 17:00:18 -06:00
Marcus Huderle
72f0a079a9 Decompile all of battle_anim_utility_funcs 2018-11-19 09:37:25 -06:00
Diegoisawesome
9f50ba1ce3 Fix incorrect compressed types, part 2 2018-11-07 12:35:31 -06:00
garak
2b9fd18dd4 battle_anims.s data to C 2018-10-21 22:30:20 -04:00
Diegoisawesome
8e7202ec3d Fix LZ compressed data alignment 2018-10-21 12:05:34 -05:00
Diegoisawesome
6206acd2d2 Finish shop and fldeff_escalator 2018-10-18 12:05:02 -05:00
golem galvanize
d3d725cc83 decompiled up to sub_81B0948 2018-10-11 21:23:39 -04:00
Slawter666
e30c2251ce Convert more of data2b 2018-08-27 00:26:54 +01:00
Slawter666
ed24233274 Convert more of data2b.s to C 2018-08-22 23:03:44 +01:00
Slawter666
ef6a3c2278 Move some data from data2b.s to C 2018-08-22 14:34:36 +01:00
Diegoisawesome
a07d69d7c2 Finish pokemon_summary_screen 2018-08-14 22:00:35 -07:00
golem galvanize
13efa1ef62 fixing conflicts 2018-05-10 03:34:36 -04:00
golem galvanize
d31600e70e finish decompiling pokedex 2018-05-10 03:30:42 -04:00
Slawter666
7f2329253f requested changes 2018-05-06 17:31:50 +01:00
golem galvanize
f9331f15ef decompiled up to sub_80BFCF4 2018-04-30 20:41:17 -04:00
golem galvanize
6a401b5386 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex 2018-04-25 00:28:57 -04:00
KDSKardabox
f5cbefc295 Decompile mon markings 2018-04-17 14:24:39 +05:30
golem galvanize
069a7e71fc Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex 2018-03-30 16:49:08 -04:00
golem galvanize
3006ff177b pushing so I can pull from master 2018-03-30 16:48:30 -04:00
DizzyEggg
62e849a5df item menu is done 2018-03-04 20:03:11 +01:00
DizzyEggg
4c3f8ac6c6 start item menu icons decomp 2018-03-04 18:41:07 +01:00
Diegoisawesome
1605f62535 Decompile credits 2018-02-17 04:00:22 -06:00
Diegoisawesome
0a206ee52c Finish decompiling intro 2018-02-15 22:30:39 -06:00
Diegoisawesome
34716558b1 Almost finish decompiling intro 2018-02-15 16:54:34 -06:00
golem galvanize
f81c52b56e more fixes 2018-02-12 13:59:42 -05:00
golem galvanize
56e1a52823 Fixes 2018-02-08 21:00:28 -05:00
Diegoisawesome
772fd47564 Merge branch 'master' of https://github.com/pret/pokeemerald into menu 2018-02-07 18:06:59 -06:00
Diegoisawesome
1ae5adbb19
Merge pull request #196 from DizzyEggg/decompile_ray_scene 
Decompile rayquaza scene
 2018-02-07 12:59:13 -06:00
Diegoisawesome
d396a8f89c Merge new_menu_helpers and menu 2018-02-07 00:07:42 -06:00
DizzyEggg
14d2caaf8d start decompiling berry tag screen 2018-02-02 12:32:12 +01:00
DizzyEggg
b697497835 ray scene is decompiled 2018-02-01 14:47:41 +01:00
DizzyEggg
68146af07c more ray scene work 2018-02-01 11:17:07 +01:00
DizzyEggg
db6185275e start decompiling rayquaza scene 2018-01-31 13:05:36 +01:00
DizzyEggg
e0fbd5daad text window cleanup 2018-01-21 13:32:11 +01:00
ProjectRevoTPP
48378f791c last wave of graphics.s dumps 2017-12-30 01:09:06 -05:00
ProjectRevoTPP
06aa07306e sixteenth wave of graphics.s dumps 2017-12-29 20:25:32 -05:00
ProjectRevoTPP
03a2a3b81b fourteenth wave of graphics.s dumps 2017-12-28 17:15:37 -05:00
ProjectRevoTPP
8a338f44db thirteenth wave of graphics.s dumps 2017-12-26 22:37:36 -05:00
DizzyEggg
4f6ca126b5 dump all rayquaza scene data to C 2017-12-23 13:23:23 +01:00
DizzyEggg
e7111984a9 start rayquaza dumping 2017-12-23 00:22:07 +01:00
DizzyEggg
9c45ca0c5f dump pokemon icon 2017-12-22 19:16:15 +01:00
DizzyEggg
08ebf59e44 get rid of pointers in pokedex 2017-12-22 18:43:41 +01:00