ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-12 14:43:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,611 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

5313 Commits

Author SHA1 Message Date
Slawter666
f08b56d645 Move apprentice data to C 2018-10-14 15:26:13 +01:00
DizzyEggg
af7aa624cd make aprentice compile 2018-10-14 15:23:14 +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
golem galvanize
d3d725cc83 decompiled up to sub_81B0948 2018-10-11 21:23:39 -04: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
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
dbb09aa445 get rid of SPRITE and TASK 2018-10-07 19:19:13 +02: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
9f69ea1931
Update gGameVersion to use GAME_VERSION 2018-10-06 01:57:39 -04: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
65a48e16ee
Merge pull request #19 from LOuroboros/patch-11 
Update move_names.h
 2018-09-30 11:43:57 +02:00
DizzyEggg
eb4a8b8748
Merge pull request #20 from LOuroboros/patch-12 
Update battle_moves.h
 2018-09-30 11:43:49 +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
LOuroboros
0621d5ceb7
Update battle_moves.h 
When I made the Gen. 7 moves data, I screwed up Spirit Shackle's effect. I should have gave it EFFECT_PLACEHOLDER as it will probably need a new effect.
 2018-09-29 12:39:27 -03: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
LOuroboros
258f1ea606
Update move_names.h 
Decapped move names and fixed U-Turn's,
 2018-09-29 10:06:10 -03:00
DizzyEggg
597299136f Add Pollen Puff effect 2018-09-29 14:10:53 +02:00
DizzyEggg
2ebffb9912 allow gen7 moves and abilities for debug 2018-09-29 13:53:37 +02:00
DizzyEggg
b8440f4a03
Merge pull request #17 from LOuroboros/patch-9 
Update move_names.h
 2018-09-29 13:49:58 +02:00
DizzyEggg
38fe5011ad
Merge pull request #18 from LOuroboros/patch-10 
Update move_descriptions.h
 2018-09-29 13:49:50 +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
Diegoisawesome
25033ef311 Finish tileset_anims macroization 2018-09-23 14:58:36 -05: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