Commit graph

1382 commits

Author SHA1 Message Date
Deokishisu
bf2063cc1a Update All EVENT_OBJ_GFX References
Didn't realize that this needed to be done as well for renaming OW sprites. The event_objects.h file has had its corresponding defines renamed and all references in all files to those defines have been relabeled.
2018-10-14 19:09:18 -04:00
Slawter666
137f6549ff label field_effect_helpers 2018-10-14 23:43:40 +01:00
DizzyEggg
ef11706dc7 Begin wild double battles 2018-10-14 22:37:07 +02:00
DizzyEggg
b3ad32bbe6 Merge with master 2018-10-14 20:51:34 +02:00
Diegoisawesome
02049d52ee
Merge pull request #351 from DizzyEggg/apprentice
Decompile apprentice
2018-10-14 13:20:38 -05:00
Diegoisawesome
43316ffae8
Merge pull request #356 from DizzyEggg/clean_battlestruct
Clean a couple of battlestructs' fields
2018-10-14 13:18:29 -05:00
Diegoisawesome
0979ea91fb
Merge pull request #357 from DizzyEggg/move_heap
Move HEAP_SIZE to malloc and use void instead of empty argument list
2018-10-14 13:15:31 -05:00
DizzyEggg
c3113db931 Move HEAP_SIZE to malloc and use void instead of empty argument list 2018-10-14 20:00:14 +02:00
Diegoisawesome
d40e737d52
Merge pull request #349 from golemgalvanize/decompile_field_effect_helpers
Decompile field effect helpers
2018-10-14 12:48:18 -05:00
Diegoisawesome
e0bc3fd59c
Merge pull request #355 from DizzyEggg/use_eos
Use defines for text chars
2018-10-14 12:21:37 -05:00
DizzyEggg
ecdf0fd69d Clean battle structs 2018-10-14 18:37:52 +02:00
DizzyEggg
b73611bccb clean battle structs 2018-10-14 18:10:54 +02:00
DizzyEggg
f47ed3268c Finish documenting apprentice for now 2018-10-14 17:00:41 +02:00
DizzyEggg
7952cfeba5 document more of apprentice 2018-10-14 16:27:48 +02:00
DizzyEggg
84936b4260 Merge branch 'master' into apprentice 2018-10-14 15:07:16 +02:00
DizzyEggg
541043a661 Use defines for text chars 2018-10-14 15:04:25 +02:00
DizzyEggg
7a008a944a Move 'blend_palette'.c to util.c 2018-10-14 14:43:19 +02:00
DizzyEggg
145df49063 Document more of apprentice 2018-10-14 14:35:51 +02:00
DizzyEggg
b4a42a6832 Decompile apprentice 2018-10-14 11:37:44 +02:00
DizzyEggg
36b8a6a9a2 More apprentice work 2018-10-13 23:23:33 +02:00
DizzyEggg
a496a763ca Merge record mixing, pokemon and global with apprentice 2018-10-13 20:38:46 +02:00
Diegoisawesome
32fbf67d47
Merge branch 'master' into shop 2018-10-13 12:55:06 -05:00
Diegoisawesome
a26380663c Merge branch 'master' of github.com:pret/pokeemerald 2018-10-13 12:44:23 -05:00
Diegoisawesome
35c6938814 Port/decompile cable_club.s 2018-10-13 12:41:10 -05:00
Marcus Huderle
b24559d69b Merge remote-tracking branch 'upstream/master' into shop
# Conflicts:
#	asm/shop.s
2018-10-13 10:22:58 -05:00
DizzyEggg
74b81bf229 start apprentice 2018-10-13 00:48:26 +02:00
Diegoisawesome
04836db167 Start porting cable_club.c 2018-10-11 16:02:58 -05:00
golem galvanize
803c2388ce finish porting field_effect_helpers 2018-10-10 12:02:02 -04:00
golem galvanize
35ee9f67c0 ported some of field_effect_helpers 2018-10-09 17:32:39 -04:00
Diegoisawesome
72c9abbb66
Remove invalid version entries 2018-10-07 23:28:36 -05:00
DizzyEggg
b80b94ee73 merge with master 2018-10-07 19:40:34 +02:00
Marcus Huderle
807050a048
Merge pull request #348 from DizzyEggg/anim_files
Decompile/Port battle_anim_80A5C6C
2018-10-07 12:23:07 -05:00
DizzyEggg
413e26e83d port 80d51ac 2018-10-07 17:45:37 +02:00
DizzyEggg
61343d5069 Decompile battle_anim_80A9C70 2018-10-07 15:39:46 +02:00
DizzyEggg
8c834b9ae8 battle anim 80a5c6c decompiled 2018-10-07 12:32:20 +02:00
DizzyEggg
54fc92bc92 Start porting ruby battle anim file 2018-10-06 23:04:53 +02:00
Diegoisawesome
7a7aeed5e8
Merge pull request #347 from Deokishisu/GamV
Fill out VERSION_ enum with all possible values
2018-10-06 13:45:21 -05:00
DizzyEggg
7925000a54 merge with master 2018-10-06 16:05:58 +02:00
DizzyEggg
6b5c52e926 Flower Shield and protect moves 2018-10-06 15:50:35 +02:00
Marcus Huderle
b9e38a569e
Merge pull request #320 from DizzyEggg/anims
Document battle animation scripts
2018-10-06 08:20:41 -05:00
Deokishisu
2070c246f9
Added new findings about invalid version IDs.
After transferring Pokemon up to Gen 6 and then to Gen 7, I discovered that invalid version IDs display the "a distant land" string that is used for the Gamecube games, so that information was added in a comment.

Also clarified that it's not just Gen 4 that displays the Johto string, it's Gen 4 and up.
2018-10-06 07:40:56 -04:00
DizzyEggg
17c5b4089a Label most of the anim tags 2018-10-06 09:37:52 +02:00
Deokishisu
76a9cf0d54
Fix captitalization of HGSS in comment and match FRLG formatting in enum 2018-10-06 01:56:03 -04:00
Deokishisu
cc0d2288d5
Match comment formatting 2018-10-06 01:46:17 -04:00
Deokishisu
024700769a
Document all possible VERSION_ numbers and add them to the enum 2018-10-06 01:45:36 -04:00
Tetrable
61ab631dec
Fixed a small error 2018-10-05 23:02:04 +01:00
Tetrable
e80a53060b Start anim tags 2018-10-05 23:00:07 +01:00
Marcus Huderle
ec0d350137 Move metatile behavior constants to include/constants and sync closer to pokeruby 2018-10-04 17:57:07 -05:00
DizzyEggg
de9e9072fc Rototiller and 2 turn moves 2018-09-30 14:04:46 +02:00
DizzyEggg
162c83fcff Bestow 2018-09-30 12:27:51 +02:00
DizzyEggg
7623eabdee After you 2018-09-29 19:37:39 +02:00
DizzyEggg
b9cf1fdcfe Psycho Shift, Power Trick, Flame Burst 2018-09-29 18:40:14 +02:00
DizzyEggg
dddefbb0e3 Full support for moves hitting all battlers 2018-09-29 16:41:25 +02:00
DizzyEggg
ada76cbe4f Synchronoise and Smack Down 2018-09-29 15:43:56 +02:00
DizzyEggg
597299136f Add Pollen Puff effect 2018-09-29 14:10:53 +02:00
DizzyEggg
cbaae44f9f Add pop-up to battlescripts 2018-09-29 13:36:33 +02:00
DizzyEggg
731ff38067 Ability pop-up functionality is done 2018-09-29 12:47:35 +02:00
DizzyEggg
3f2beff554 Defog 2018-09-23 19:03:53 +02:00
DizzyEggg
6b7a171dbe Ability pop-up fail, maybe will do something about it later 2018-09-23 14:24:06 +02:00
Diegoisawesome
584cad6c0b
Merge pull request #339 from Kermalis/master
Rename voicegroups
2018-09-22 15:48:29 -05:00
Kermalis
e93f1182e6 Rename voicegroups 2018-09-22 16:42:34 -04:00
Diegoisawesome
58a5e4a261 Merge branch 'master' of github.com:pret/pokeemerald 2018-09-22 15:39:34 -05:00
Diegoisawesome
9e840dc5fe Merge remote-tracking branch 'Tetra/master' 2018-09-22 15:23:47 -05:00
Diegoisawesome
d50554bb8e Use macros and defines in tileset_anims 2018-09-22 15:02:49 -05:00
DizzyEggg
60e8c80c4c Merge branch 'master' into battle_engine_v2 2018-09-22 19:14:56 +02:00
DizzyEggg
e362c06aea gRandomMove to gCalledMove 2018-09-22 18:41:00 +02:00
DizzyEggg
19e1606595 Add Copycat 2018-09-22 18:37:03 +02:00
DizzyEggg
db44a7e25a Techno Blast and Autotomize 2018-09-22 17:27:51 +02:00
DizzyEggg
9474254e4d Final Gambit, Dragon Tail 2018-09-22 16:15:00 +02:00
DizzyEggg
fd15e23419 Placeholder entries for gen7 moves 2018-09-22 14:04:15 +02:00
DizzyEggg
bf11c35eaf Add gen7 learsnets for pokemon 2018-09-22 13:52:38 +02:00
DizzyEggg
ca9876b0b4 Updated Wrap Mechanics, Infestation, stat changing move effects 2018-09-22 12:20:33 +02:00
DizzyEggg
f455f663f4 Shell Smash move effect 2018-09-22 11:13:17 +02:00
DizzyEggg
1284bb94f1 Last Resort, Fangs and Flare Blitz/Volt Tackle 2018-09-22 10:45:43 +02:00
DizzyEggg
23a06c0836 Close combat effect 2018-09-22 01:12:27 +02:00
DizzyEggg
7b60a654b2 Growth gen6 effect 2018-09-22 01:01:13 +02:00
DizzyEggg
a69af8f2f5 Merge with master 2018-09-22 00:22:13 +02:00
DizzyEggg
66fd9b2ddf Label trainer hill battle type 2018-09-20 22:00:00 +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
0755240fbc link battles mega evo fix hopefully????? 2018-09-20 17:59:17 +02:00
DizzyEggg
2bae70a66b Convert mega related struct fields to a seperate struct 2018-09-20 17:33:27 +02:00
DizzyEggg
a181900141 Merge branch 'master' into battle_engine_v2 2018-09-20 11:58:23 +02:00
DizzyEggg
e4b7ba0977 Document some not labeled battle things 2018-09-20 11:55:35 +02:00
DizzyEggg
602c1322e4 almost full support for link battles mega evolution 2018-09-20 11:23:12 +02:00
Diegoisawesome
8a05bf82ec Merge branch 'master' of github.com:pret/pokeemerald 2018-09-18 10:03:57 -05:00
Diegoisawesome
899ae7a59a Add defines for tile, metatile, and palette count 2018-09-18 10:03:24 -05:00
DizzyEggg
add1f4910c Add mega trigger png 2018-09-17 22:40:49 +02:00
DizzyEggg
abebf479a6 Tweak mega evo to hopefully be compatibile with recorded battles. 2018-09-17 20:37:33 +02:00
DizzyEggg
1018b8f2a8
Merge pull request #13 from Tetrable/battle_engine_v2
Add periods to the end of ability descriptions.
2018-09-17 20:03:32 +02:00
DizzyEggg
2042788fdc Mega Evolution done except sprites. 2018-09-16 21:08:49 +02:00
DizzyEggg
55f21c1776 Mega Evolution support is mostly done. 2018-09-16 18:55:32 +02:00
Tetrable
967eb2a276 Accidentally got rid of move defines, added them back 2018-09-16 16:41:52 +01:00
Tetrable
9397618d9d Missed a description 2018-09-16 16:40:02 +01:00
Tetrable
8d4d5b501c Add periods to the end of ability descriptions. 2018-09-16 16:36:47 +01:00
DizzyEggg
0800a44f7a Merge branch 'master' into battle_engine_v2 2018-09-16 09:22:05 +02:00
Diegoisawesome
6a8f27c1ac
Merge pull request #326 from DizzyEggg/cablecarutil
Decompile cable_car_util.c
2018-09-16 01:06:33 -05:00
DizzyEggg
0547e260a4 More of slot machine 2018-09-15 18:01:20 +02:00
DizzyEggg
ff13cb6352 decompile cable car util which has nothing to do with actual cable car 2018-09-15 13:50:23 +02:00
Diegoisawesome
b8c9d9a980
Merge pull request #324 from Diegoisawesome/master
Document main_menu
2018-09-14 12:17:11 -05:00