Commit Graph

799 Commits

Author SHA1 Message Date
GriffinR
65bd2faf94 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest 2020-08-16 05:59:10 -04:00
GriffinR
c42c1ab8c1 Document contest appeal 2020-08-15 14:32:30 -04:00
GriffinR
25f45ffa84
Merge pull request #1125 from GriffinRichards/doc-namingscr
Document naming screen
2020-08-15 00:06:57 -04:00
GriffinR
ade49de329
Merge branch 'master' into doc-pblock 2020-08-12 19:49:55 -04:00
GriffinR
4f615b65e6 Continue documenting use_pokeblock 2020-08-11 13:56:17 -04:00
GriffinR
8b95e1964b
Merge pull request #1121 from GriffinRichards/doc-roulette
Document roulette
2020-08-10 17:18:09 -04:00
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
DizzyEggg
11c2207839 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-07-27 14:54:32 +02:00
DizzyEggg
0066640a1e Merge with master 2020-07-27 14:51:39 +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
Evan
f923f5198e add oval charm 2020-07-16 09:48:25 -06: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
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
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
19699bee23
Merge pull request #390 from ghoulslash/battle_engine
add animations for all moves
2020-05-29 12:53:17 +02:00
DizzyEggg
013f9b6a17 merge wiith masteer and summary screen change 2020-05-29 12:50:54 +02:00
Evan
638d585fc0 update apple sprites 2020-05-26 10:16:24 -06: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
Evan
181bfbf5fd cfru particles and bgs 2020-05-22 10:10:10 -06:00
DizzyEggg
bdebab834c Document pokemon summary screen 2020-05-18 14:03:01 +02:00
Evan
c18b5966bf undo some revert(?) 2020-05-03 22:09:03 -06: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
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
e00b76b8da Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-04-15 13:31:52 +02:00
DizzyEggg
09dcff81f8 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-04-15 13:28:10 +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
DizzyEggg
060b795d8e Merge with master 2020-04-11 19:48:24 +02: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
cf4d5f6e59 Merge with master 2020-03-13 23:02:17 +01:00
DizzyEggg
887fb1b45c Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-03-13 22:45:51 +01:00
DizzyEggg
fd34afac1e Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-03-13 22:44:35 +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
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
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
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
70ebc6b55b
Lycanroc forms (#268)
* Midnight Lycanroc

* Dusk Lycanroc
2020-02-22 23:42:16 +01:00
Eduardo Alvaro Quezada D'Ottone
2c172a3636
Shiny charm (#276)
* Shiny Charm Item

* Shiny Charm Rerolls
2020-02-17 11:08:06 +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
bf6aa6a176 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-01-31 22:02:10 +01:00
DizzyEggg
e1a428a25d Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-01-31 21:17:19 +01:00
DizzyEggg
8889039a57 Merge with master 2020-01-31 21:15:08 +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
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
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
DizzyEggg
1141e733eb Merge with master 2020-01-12 14:29:43 +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
9a2888fdbf Merge into master 2019-12-23 16:46:03 +01:00
DizzyEggg
a4a4132d26 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-12-23 16:41:44 +01:00
DizzyEggg
9e3d5672e6 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-12-23 16:40:21 +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
DizzyEggg
871e093b65 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2019-12-09 08:20:29 +01:00
DizzyEggg
ac499bc896 Merge with master 2019-12-09 08:16:18 +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
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
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
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
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
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
GriffinR
2c062dc764 More trade documentation 2019-10-09 05:56:44 -04:00
GriffinR
66a68159b1 Continue trade doc 2019-10-05 10:41:37 -04:00
LOuroboros
b6f6beb6a8 Fixed Leavanny's icon. 2019-08-23 15:59:00 -03:00
Gamer2020
56c5bcccaf Fixing error at the bottom of the image. 2019-08-16 19:14:14 -04: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
garak
f6d55db535 decompile pokenav_unk_5 data 2019-07-19 21:05:55 -04: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
bcffc2655e fix style issues 2019-07-06 05:25:56 +02:00
Karathan
d9b54c3c1c add power swap, guard swap, worry seed 2019-07-06 05:22:18 +02:00
LOuroboros
befec51858 Fixed the filename of the Kangaskhanite's palette. 2019-07-03 13:50:52 +03:00
Karathan
e9884154a9 added acupressure and wring out 2019-07-03 03:45:11 +02:00
Karathan
f1c82abc7e fix change requests 2019-07-02 18:34:53 +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
DizzyEggg
eba97fb3e1 Add Cherrim form in a better way 2019-06-15 14:31:43 +02: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
LOuroboros
bf15bb097a Added the Safety Goggles' palette because I'm a very dumb person. 2019-05-12 11:31:34 -03:00
DizzyEggg
900c15c20c Mega evo animation 2019-05-03 17:27:49 +02:00
DizzyEggg
d0f91a996d Tweak up mega evo 2019-05-02 23:10:01 +02:00
LOuroboros
4e3516e2d8 Removed the copy of the Safety Goggle's sprite that I somehow left in by accident. 2019-05-02 15:12:00 -03: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
b06090fe02 Icons for gen7 mons 2019-04-16 12:31:35 +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
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
ece5b2c256
Merge pull request #129 from thechurchofcage/zeta
Gen 7 animations
2019-04-13 09:36:34 +02:00
Papa Cancer
7d20d8082f Gen 7 animations
Includes 2-frame images for Tapus and Marshadow
Custom animations made for Yveltal, Shiinotic, and Toxapex/Poipole
2019-04-12 20:07:54 +01:00
ultima-soul
cc18cdb977 Fix some icons. 2019-04-11 10:16:55 -07:00
DizzyEggg
7c6077ef8b Add icons for gen1-gen6 mons 2019-04-11 18:20:03 +02:00
Papa Cancer
dfeb2ebcea Gen 6 mon animations
Includes 2-frame Chespin sprite
2019-04-09 19:46:45 +01:00
DizzyEggg
431690d1c2 Add Gen6 and Gen7 mon sprites 2019-04-07 16:22:37 +02:00
DizzyEggg
51bb713aef Add Burmy Wormadam form gfx and data 2019-04-07 14:39:11 +02:00
DizzyEggg
8213222337 Merge with master 2019-04-06 23:20:16 +02:00
Marcus Huderle
c3cfd60658 Generate zoom_tiles palette from correct image 2019-04-06 15:16:05 -05:00
Marcus Huderle
146da2df96 Generate palette from zoom_tiles.png 2019-04-06 14:48:46 -05:00
DizzyEggg
f8713f9c15 Merge with master 2019-04-06 20:43:13 +02:00
Marcus Huderle
fe12f2f4b3 Document and cleanup some decoration code 2019-04-06 12:49:09 -05:00
DizzyEggg
b85a74afc5 Give names to battle anim backgrounds 2019-04-06 12:44:27 -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
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
0d6b13759a Change gen1-gen3 sprites to sugimori palettes 2019-04-03 21:04:23 +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
Marcus Huderle
1241700b20 Finish documenting the other weather effects 2019-04-02 18:28:56 -05:00
DizzyEggg
5c44f44ad2 Organize new battle anim gfx 2019-04-02 12:26:24 +02:00
Fontbane
fc69631a10 Field effects for Gen IV Abilities
Also added Honey (acts like White Flute for now) and made it so the Griseous Orb can't be removed from Giratina in battle.
2019-03-25 17:49:29 -04:00
DizzyEggg
54ab6b43dc Merge with master 2019-03-22 10:40:31 +01:00
Marcus Huderle
e9a3cc6d51 Merge remote-tracking branch 'upstream/master' into move-tutor
# Conflicts:
#	include/pokenav.h
#	src/battle_script_commands.c
2019-03-17 17:20:40 -05:00
garak
d0115db565 move pokemon graphics to mon-specific directories 2019-03-16 12:21:47 -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
Phlosioneer
aa7657a82a Move constants into C
Also figured out what one of the graphics files is for.
2019-03-06 22:58:05 -05: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
ae3ed962d1 Fixed the file extensions of the new item sprites. 2019-03-02 01:20:16 -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
4b9e93850c Document easy chat screen types 2019-02-27 12:55:29 -06:00
DizzyEggg
b5d0253890 Merge with master 2019-02-10 18:17:33 +01:00
Marcus Huderle
4570e3b6a5 Document battle arena 2019-02-08 09:41:36 -06:00
DizzyEggg
7bc4a3b3f7 Merge with master 2019-01-29 22:12:53 +01:00
Marcus Huderle
8f832434e5 Change drought colors table files to .bin 2019-01-29 14:36:02 -06:00
Marcus Huderle
e81838dba3 Misc. documentation and move some data into .c files 2019-01-29 14:36:02 -06:00
Karathan
832c0d6333 add toxic spike animation 2019-01-12 17:02:24 +01:00
DizzyEggg
4827776a3c Merge with master 2019-01-05 10:14:20 +01:00
Marcus Huderle
fb2d1591c1 Document more battle anim effects 2018-12-31 16:53:38 -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
DizzyEggg
e54dd6a02b Merge with master 2018-12-22 13:53:07 +01: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
Marcus Huderle
d2b5a0e83f Convert battle_anim_815A0D4 data to .c 2018-12-18 19:15:59 -06:00
DizzyEggg
8f8e6fb88b Merge branch 'master' into battle_engine_v2 2018-12-02 16:59:38 +01:00
Melody
b9cf4f27b5 renames the winstrate graphics names to pokefan 2018-12-02 00:47:04 -05:00
DizzyEggg
7fa55704b2 merge with master 2018-11-30 20:46:09 +01:00
Marcus Huderle
0148e38973
Decompile pokedex_cry_screen.c (#406) 2018-11-28 10:14:32 -06:00
Slawter666
3b501cb470 Document battle ui 2018-11-22 01:10:50 +00:00
DizzyEggg
e9965dd341 merge with master 2018-11-02 22:55:32 +01:00
Deokishisu
d7ba8a306c Rename OW Sprites
Rename OW Sprites to be more descriptive where possible. If an OW sprite was used by only one Trainer class, it was renamed. Additionally, some non-Trainer sprites were renamed.

Renamed:
LittleBoy1 -> NinjaBoy
LittleGirl1 -> Twin
Woman2 -> PokefanF
OldMan1 -> ExpertM
OldWoman1 -> ExpertF
Man3 -> PokefanM
Woman6 -> LinkReceptionist
Man7 -> DevonEmployee
Boy4 -> RichBoy
Boy5 -> GameboyKid (Consistent with pokecrystal)
ContestOldMan -> ContestJudge

Renamed Because of Numbering Changes:
LittleBoy2 -> LittleBoy
LittleGirl2 -> LittleGirl
OldWoman2 -> OldWoman
OldMan2 -> OldMan
Man4 -> Man3
Man5 -> Man4
Man6 -> Man5
Woman3 -> Woman2
Woman4 -> Woman3
Woman5 -> Woman4
Woman7 -> Woman5
2018-10-14 15:49:55 -04:00
Deokishisu
2bd86dad2f Rename Boy4 to RichBoy 2018-10-14 12:26:48 -04:00
DizzyEggg
731ff38067 Ability pop-up functionality is done 2018-09-29 12:47:35 +02:00
DizzyEggg
6b7a171dbe Ability pop-up fail, maybe will do something about it later 2018-09-23 14:24:06 +02:00
DizzyEggg
a69af8f2f5 Merge with master 2018-09-22 00:22:13 +02:00
DizzyEggg
bf64333299 Give labels to healthbox gfx 2018-09-20 21:42:38 +02:00
DizzyEggg
d05875dd04 New mega trigger sprite 2018-09-20 20:59:00 +02:00
DizzyEggg
add1f4910c Add mega trigger png 2018-09-17 22:40:49 +02:00
DizzyEggg
cd0934a399 Add Fairy Type icon 2018-09-16 10:45:22 +02:00
DizzyEggg
0800a44f7a Merge branch 'master' into battle_engine_v2 2018-09-16 09:22:05 +02:00
Marcus Huderle
ba125b23fd Remove transparency from event object spritesheets 2018-09-11 17:18:10 -05:00
DizzyEggg
c6c8b7b0fd Merge branch 'master' into battle_engine_v2 2018-09-10 14:49:24 +02:00
Slawter666
9dec2bdef8 Merge branch 'master' of https://github.com/pret/pokeemerald into spritesheet 2018-09-07 11:50:23 +01:00
DizzyEggg
490a4f993b Merge with master 2018-09-01 12:38:38 +02:00
DizzyEggg
cc145a45f7 merge with master 2018-08-12 22:37:28 +02:00
Diegoisawesome
a000eb4f36 Merge branch 'learn_move' of git://github.com/Edwearth/pokeemerald into Edwearth-learn_move 2018-08-11 19:03:38 -07:00
Diegoisawesome
12ff59f9c1 Continue decompiling field_specials 2018-08-10 00:42:06 -07:00
Slawter666
bc42c5054c Merge remaining overworld frames 2018-08-10 00:20:19 +01:00
Slawter666
877a80d3bc Merge berry tree frames 2018-08-09 23:19:45 +01:00
Slawter666
dea0bba64e Merge "pokemon" frames 2018-08-09 00:55:32 +01:00
Slawter666
ab2cc59629 Merge remaining "people" overworld frames 2018-08-07 22:16:03 +01:00
Slawter666
5917f7d108 Merge frontier brains, team magma and team aqua frames 2018-08-02 00:34:28 +01:00
DizzyEggg
0663c142b7 Add split icons 2018-07-29 19:54:23 +02:00
Slawter666
52aa9cedcf Merge May frames into sprite sheets
Plus fix Brendan's surfing and watering frame order.
2018-07-29 17:29:36 +01:00
Slawter666
d5825230e5 Merge "brendan" frames into sprite sheets 2018-07-28 18:11:28 +01:00
DizzyEggg
3bcd30969a cut field effect is decompiled and documented 2018-06-16 14:04:29 +02:00
Marcus Huderle
aa9a45c16f Rebrand 'map object' and 'field object' to 'event object' 2018-06-11 19:11:48 -05:00
Diegoisawesome
416d67c832 Finish porting/decompiling field_effect.c 2018-05-10 18:36:57 -05:00
Edouard Veyrier
75b07292c9 Translate first functions of learn move 2018-03-28 19:20:20 +02:00
Diegoisawesome
387dbf48d0
Merge pull request #202 from DizzyEggg/move_mon_data
Move data from asm to pokemon_1.c
2018-02-08 14:06:57 -06:00
Diegoisawesome
772fd47564 Merge branch 'master' of https://github.com/pret/pokeemerald into menu 2018-02-07 18:06:59 -06:00
DizzyEggg
4b7d778a5c move mon data fix conflicts 2018-02-07 20:17:55 +01:00
camthesaxman
3ec68d5f79 reorganize berry graphics files 2018-02-06 11:51:43 -06:00
camthesaxman
89e6170748 remove some redundant .pal files 2018-02-06 11:46:34 -06:00
DizzyEggg
ae8e89a10d move some pokemon data to c 2018-02-05 17:39:26 +01:00
Diegoisawesome
3793152bc3 More work on menu 2018-01-29 17:26:36 -06:00
Diegoisawesome
5a57485ece Decompile naming_screen.c 2018-01-23 21:30:13 -06:00
Devin
8f1bfcbf3a Fix more of them sneaky executables 2018-01-21 15:25:18 -05:00
Devin
35cc20c9aa Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms 2018-01-21 15:22:05 -05:00
DizzyEggg
ad2ef517bd option menu fix conflicts 2018-01-21 12:46:19 +01:00
golem galvanize
bce63b3694 REMOVE BASEROM 2018-01-20 22:41:02 -05:00
golem galvanize
f22d295cfc Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms 2018-01-20 21:37:47 -05:00
Diegoisawesome
28c9f40b3e Extract data from fossil_special_fldeff_groundshake 2018-01-20 19:18:03 -06:00
golem galvanize
33ebcabc3a Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms 2018-01-20 19:45:38 -05:00
golem galvanize
bdc8cf6ac4 fixing conflicts 2018-01-20 19:44:34 -05:00
Diegoisawesome
8d7a830151 Extract data from field_effect_misc 2018-01-20 18:30:33 -06:00
Diegoisawesome
ed8269889b Extract data from pokedex.s 2018-01-20 17:17:51 -06:00
golem galvanize
59e1aacd26 DIEGO SEND HELP 2018-01-20 17:26:30 -05:00
Diegoisawesome
b47b9e5758 Extract data from starter_choose 2018-01-20 16:22:16 -06:00
Diegoisawesome
d10c91f1b0 Extract data from item_menu_icons.s 2018-01-20 15:37:37 -06:00
Diegoisawesome
971b47755d Extract data from naming screen 2018-01-20 14:16:01 -06:00
Diegoisawesome
2ef7467951 Extract data from pokemon_summary_screen 2018-01-20 02:37:28 -06:00
Diegoisawesome
098671750b Extract data from text window 2018-01-20 00:49:21 -06:00
Diegoisawesome
7abfc6a989 Extract data from trainer card 2018-01-19 23:42:30 -06:00
Diegoisawesome
fbb51bc24b Extract baseroms from party_menu.s 2018-01-19 21:38:57 -06:00
Diegoisawesome
b22a800581 Extract data from trade.s
Also rename window_template_terminator to null_window_template, in keeping with naming conventions
2018-01-19 19:52:46 -06:00
Devin
c408110319 Fix file permissions. 2018-01-19 15:06:49 -05:00
Diegoisawesome
fd544ba438 Start extracting data from trade.s 2018-01-19 12:38:09 -06:00
Diegoisawesome
4c6511c8f9 Extract data from field_screen.s
Also move files incorrectly placed in interface dir
2018-01-18 22:36:24 -06:00
Diegoisawesome
6445394929 Extract rotating_gate.s 2018-01-18 15:38:31 -06:00
Diegoisawesome
b7ee548897 Merge remote-tracking branch 'Bird/dump_pokenav.s' 2018-01-18 14:38:45 -06:00
Diegoisawesome
7086bf0048 Merge remote-tracking branch 'Bird/dump_slot_machine.s' 2018-01-18 14:19:13 -06:00
Diegoisawesome
dcdf91c111 Merge remote-tracking branch 'Bird/dump_learn_move.s' 2018-01-18 13:46:34 -06:00
Diegoisawesome
b806ee8bed Finish extracting pokemon storage system data 2018-01-18 12:52:37 -06:00
Diegoisawesome
ec8594fd10 Extract Wanda PC box wallpapers 2018-01-18 04:06:43 -06:00
golem galvanize
c9a3ef7a6e dump pokenav.s 2018-01-17 23:01:33 -05:00
Diegoisawesome
184fedc870 Extract PC box background images 2018-01-17 20:57:19 -06:00
golem galvanize
173c5923cb clean up reel_time_gfx 2018-01-17 19:19:47 -05:00
golem galvanize
442398261e fix tabs and add forgotten image 2018-01-17 14:48:50 -05:00
golem galvanize
84c6a97429 dump slot_machine.s 2018-01-17 14:44:38 -05:00
golem galvanize
820c11358d dump learn_move.s 2018-01-16 15:31:43 -05:00
DizzyEggg
4dd06dbcd3 optiom menu move data to C 2018-01-16 19:39:35 +01:00
golem galvanize
5a5eb4ff59 dumped most of pokenav.s 2018-01-15 23:38:10 -05:00
Diegoisawesome
90c175b73f Extract baseroms from field_effect.s 2018-01-15 02:49:52 -06:00
Diegoisawesome
79451b5bb4 Extract data around Deoxys icon 2018-01-14 23:40:55 -06:00
Diegoisawesome
75f9c16504 Merge branch 'master' of https://github.com/pret/pokeemerald 2018-01-07 18:47:05 -06:00
Diegoisawesome
efe19e95c8 Extract door animations 2018-01-07 01:29:26 -06: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
Diegoisawesome
f0df833f37 Extract easy chat and pokemon animation 2017-12-29 13:34:24 -06:00
ProjectRevoTPP
cfe17cc552 fifteenth wave of graphics.s dumps 2017-12-28 22:05:30 -05:00
ProjectRevoTPP
77b7462dbb merge 2017-12-28 17:26:58 -05:00
ProjectRevoTPP
03a2a3b81b fourteenth wave of graphics.s dumps 2017-12-28 17:15:37 -05:00
Diegoisawesome
1496ea3a24 Merge branch 'master' of github.com:pret/pokeemerald 2017-12-28 03:00:15 -06:00
Diegoisawesome
2d04eb22ab Split rom_81370FC and port function names 2017-12-28 02:09:11 -06:00
Diegoisawesome
ca49f8438d Extract battle_transition data 2017-12-27 15:25:15 -06:00
ProjectRevoTPP
8a338f44db thirteenth wave of graphics.s dumps 2017-12-26 22:37:36 -05:00
Diegoisawesome
eff0caf759 Split and extract roulette data 2017-12-26 01:42:08 -06:00
ProjectRevoTPP
0af942e0b8 twelfth wave of graphics.s dumps 2017-12-26 01:39:01 -05:00
ProjectRevoTPP
770714dcee eleventh wave of graphics.s dumps 2017-12-25 22:00:56 -05:00
ProjectRevoTPP
d6bac7f9f8 tenth wave of graphics.s dumps (battle_frontier) 2017-12-25 15:51:01 -05:00
Diegoisawesome
15c92318d3 Extract data from misc files
Also split data4d.s
2017-12-25 00:32:01 -06:00
ProjectRevoTPP
2c7112ce8f ninth wave of graphics.s dumps 2017-12-24 22:39:43 -05:00
ProjectRevoTPP
addfdfbcba eighth wave of graphics.s dumps 2017-12-24 02:54:08 -05:00
Diegoisawesome
e8153598ef Extract contest painting 2017-12-24 01:09:18 -06:00
ProjectRevoTPP
d0659a3ec6 seventh wave of graphics.s dumps 2017-12-24 01:00:53 -05:00
ProjectRevoTPP
e56f04ae2e sixth wave of graphics.s dumps 2017-12-24 00:08:28 -05:00
ProjectRevoTPP
ac74d6f100 fifth wave of graphics.s dumps 2017-12-23 22:06:01 -05:00
ProjectRevoTPP
4ad2c5c941 fourth wave of graphics.s dumps 2017-12-23 18:30:48 -05:00
ProjectRevoTPP
d137b7f0a8 third wave of graphics.s dumps (battle_anim part 2) 2017-12-23 15:50:58 -05:00
Diegoisawesome
a64b5cd31f Extract start of battle_frontier_2 2017-12-23 01:16:45 -06:00
ProjectRevoTPP
3499ff51b5 second wave of graphics.s dumps (battle_anim part 1) 2017-12-23 01:45:04 -05:00
ProjectRevoTPP
d10c645353 first wave of graphics.s dump 2017-12-22 19:18:09 -05:00
Diegoisawesome
04b64dda0b Extract baseroms from battle frontier and tent files 2017-12-22 15:04:05 -06:00
DizzyEggg
cb229f56e8 fix pokeblock conflicts 2017-12-18 16:58:14 +01:00
PikalaxALT
da2e0dfe50 Merge branch 'master' into clock 2017-12-15 21:04:25 -05:00
DizzyEggg
37ae6a7758 move more pokeblock data to C and label 2017-12-10 16:38:27 +01:00
DizzyEggg
ddcf52bcae get rid of ball pal files 2017-12-04 23:22:48 +01:00
DizzyEggg
2fe25da65a move pokeball data to rom 2017-12-02 21:27:00 +01:00
PikalaxALT
2280614a14 Start decompiling data 2017-11-24 19:06:01 -05:00
PikalaxALT
89b695278d Merge branch 'master' into heal_location 2017-11-15 09:01:56 -05:00
DizzyEggg
5c44c64050 add hof graphics 2017-11-13 21:55:38 +01:00
DizzyEggg
4d615350c8 added berry blender start gfx 2017-11-13 19:36:23 +01:00
DizzyEggg
ac68187895 review changes adding a pal file 2017-11-13 18:18:12 +01:00
PikalaxALT
1ca032c6ff Address review items, 1 2017-11-12 21:13:18 -05:00
PikalaxALT
567b2af081 Drop tracking on gbapal files 2017-11-11 14:38:53 -05:00
DizzyEggg
4d4d642285 dump berry blender and script menu 2017-11-04 22:40:36 +01:00
PikalaxALT
9cfdc8b7e8 Merge branch 'master' into heal_location 2017-11-01 23:37:41 -04:00
PikalaxALT
7eacb24cf7 Start ripping graphics/data for region_map 2017-11-01 21:10:47 -04:00
PikalaxALT
6fcde15bb6 Decompile heal location data 2017-10-28 20:43:33 -04:00
DizzyEggg
f4e134569f evo graphics file is done 2017-10-27 15:49:14 +02:00
PikalaxALT
9fc2c99d18 Move these palettes to INCBINs 2017-10-22 19:05:32 -04:00
PikalaxALT
c042e5148b Decoration + decoration_inventory (#89)
* SetDecorationInventoriesPointers

* ClearDecorationInventories

* CheckHasDecoration

* DecorationAdd

* DecorationCheckSpace

* DecorationRemove

* sub_8161A38

* CountDecorations; Funcion renaming

* Disassemble decoration data structs, tilemaps, and descriptions

* sub_8126968

* sub_81269D4

* through sub_8126A88

* through sub_8126B2C

* sub_8126B80

* sub_8126C08

* sub_8126C48

* sub_8126CA4

* sub_8126D10

* sub_8126E44

* sub_8126E8C

* sub_8126F68

* sub_8127058

* sub_8127088

* sub_81270E8

* through sub_8127208

* through sub_8127268

* sub_8127284

* through sub_81272F8

* sub_8127330

* through sub_8127480

* sub_81274A0

* sub_8127500; makefile now tells scaninc to scan headers

* Actual real fix to mapfile being in build/emerald instead of wd

* through sub_812759C

* through sub_812764C

* through sub_8127744

* through sub_81277BC

* sub_81277E8

* sub_8127814

* through sub_81279C4

* through sub_8127ACC

* sub_8127B04

* sub_8127B54

* sub_8127B90

* sub_8127D38

* sub_8127E18

* sub_8127F68

* sub_8128060

* ConfigureCameraObjectForPlacingDecoration

* SetUpPlacingDecorationPlayerAvatar

* sub_812826C

* through sub_8128414

* through sub_81284F4

* sub_812853C

* sub_8128950

* through sub_8128AAC

* through sub_8128BBC

* c1_overworld_prev_quest

* sub_8128C64

* sub_8128CD4

* sub_8128D10

* sub_8128DB4

* through sub_8128E18

* through sub_8129068

* sub_8129088

* through sub_81291E8

* sub_812925C

* sub_81292D0

* sub_81292E8

* gpu_pal_decompress_alloc_tag_and_upload

* AddDecorationIconObjectFromIconTable

* GetDecorationIconPicOrPalette

* AddDecorationIconObjectFromFieldObject

* AddDecorationIconObject

* through sub_8129708

* sub_81297F8

* sub_81298EC

* SetUpPuttingAwayDecorationPlayerAvatar

* sub_8129ABC

* sub_8129B34

* sub_8129BCC

* through sub_8129C74

* through sub_8129D8C

* sub_8129E0C

* sub_8129E74

* sub_8129F20

* sub_8129FC8

* sub_812A040

* nonmatching sub_812A0E8

* through sub_812A22C

* sub_812A25C

* sub_812A2C4

* through sub_812A39C

* Remaining fns in decoration.s

* Decompile decoration headers

* Decompile all remaining decoration data that had already been disassembled

* Disassemble two data objects

* Suggest structure of list menu template

* decompile through decoration list menu template

* Disassemble decoration icon graphics table

* Rip icon gfx

* Decompile deco icon table

* Decompile more data related to drawing decorations

* Decompile gUnknown_085A7250 structs

* Decompile two sprite templates

* Decompile remaining data in decoration.s

* Decompile decoration ewram

* deco -> decor
2017-10-22 17:55:07 -05:00
DizzyEggg
ccd7e8b3b1 battle interface review changes 2017-10-20 19:24:46 +02:00
Diegoisawesome
41db025975 Merge remote-tracking branch 'pret/master' into baserom_extraction 2017-10-09 13:32:26 -05:00
ProjectRevoTPP
f0775000a1 decompile diploma.c 2017-10-07 22:54:32 -04:00
ProjectRevoTPP
e38fd8347d use rodata for save_failed_screen 2017-10-06 21:59:47 -04:00
Diegoisawesome
cfc70c9806 Extract baseroms from miscellaneous files
Had to leave some unfinished due to complexity at the moment
2017-10-04 02:38:25 -05:00
Diegoisawesome
ba758afc14 Extract baseroms from and combine fldeff_emotion and trainer_see
Also extract from bike
2017-10-01 14:48:29 -05:00
Diegoisawesome
8982501b78 Extract baseroms from reset_rtc_screen 2017-10-01 13:03:51 -05:00
Diegoisawesome
c9cad220de Extract baseroms from intro_credits_graphics.s 2017-10-01 03:08:19 -05:00
Diegoisawesome
1a55966f1b Extract baseroms from battle_interface 2017-09-30 16:37:53 -05:00
Diegoisawesome
6f22bf385d Extract baseroms from battle_anim_80FE840 2017-09-29 17:34:39 -05:00
Diegoisawesome
ee777d7b17 Extract baseroms from title_screen 2017-09-27 00:51:09 -05:00
Diegoisawesome
6cc1ec7bb1 Extract intro gfx from graphics.s 2017-09-26 23:06:25 -05:00
Diegoisawesome
d18eaa3502 Extract baserom calls from intro.s 2017-09-26 18:13:58 -05:00
Diegoisawesome
d1efbcd282 Extract scattered baseroms and cleanup 2017-09-25 16:27:02 -05:00
DizzyEggg
9ee9a20152 fix merge conflicts 2017-09-21 10:50:15 +02:00
DizzyEggg
67a8ac72ec add egg graphics 2017-09-19 21:02:35 +02:00
Diegoisawesome
9f87103ea0 Extract baserom calls from files
Extract calls from crt0.s, bard_music.s, battle_4.s
2017-09-17 20:33:32 -05:00
Diegoisawesome
3c63063831 Add missing file and rename data2.s to link.s 2017-09-16 14:08:47 -05:00
Diegoisawesome
582a3795ac Remove unneeded files 2017-09-16 03:24:19 -05:00
Diegoisawesome
6ba1dc8169 Merge remote-tracking branch 'pret/master' 2017-09-16 03:21:42 -05:00
Diegoisawesome
448497dfbb Finish extracting data2.s 2017-09-16 03:21:09 -05:00
DizzyEggg
4c16bb5ee6 decompile util.s 2017-09-13 12:58:57 +02:00
Diegoisawesome
3e1c6024a7 Continue extracting from data2.s 2017-09-13 01:10:12 -05:00
Diegoisawesome
04598f0749 Rename data2 external file symbols 2017-09-12 00:00:05 -05:00
Diegoisawesome
54e18f3f2e Add missing files for building 2017-09-11 01:50:55 -05:00
Diegoisawesome
ab189ecec5 Begin extracting baserom calls from data2.s 2017-09-11 00:40:47 -05:00
Diegoisawesome
4df1937738 Ported task.c and others from pokeruby 2016-10-31 09:43:17 -05:00
YamaArashi
a43a1cd76f move trainer graphics 2016-09-03 14:04:23 -07:00
YamaArashi
a824690dbd move title screen graphics 2016-09-03 14:01:37 -07:00
YamaArashi
8e8d5dcba5 move pokemon graphics 2016-09-03 13:57:41 -07:00
YamaArashi
92d2c4ea10 move birch speech graphics 2016-09-03 11:13:17 -07:00
YamaArashi
4c543a3e5c move item graphics 2016-09-03 11:10:34 -07:00
YamaArashi
1af50a809c move map object graphics 2016-09-03 11:02:35 -07:00
YamaArashi
0a89eb1e66 move berry graphics 2016-09-03 10:38:37 -07:00