ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-05 02:40:56 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,655 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

1578 Commits

Author SHA1 Message Date
Papa Cancer
fd6dc98045 Hold Hands fix 
Better check for valid ally. If there isn't one, the target defaults to the attacker, causing the move to fail.
 2019-04-06 22:23:34 +01:00
DizzyEggg
f8713f9c15 Merge with master 2019-04-06 20:43:13 +02:00
Fontbane
6a14cd418e Match 2019-04-06 12:48:50 -05:00
Fontbane
4a09a5da33 Doc field move scripts completely, use fldeff constants for dofieldeffect 
Fix labels

Fix labels again

Delete extra boulder scripts

Now it should build fine
 2019-04-06 12:48:50 -05:00
AJ Fontaine
621e5d2263 Start documenting field move scripts 2019-04-06 12:48:50 -05:00
DizzyEggg
b85a74afc5 Give names to battle anim backgrounds 2019-04-06 12:44:27 -05:00
DizzyEggg
5183cdb357 change anim sprite name 2019-04-06 10:14:48 -05:00
Papa Cancer
43525d2a9c
Merge branch 'battle_engine_v2' into delta 2019-04-05 23:13:41 +01:00
DizzyEggg
a83255d103 fix after prs 2019-04-06 00:03:03 +02:00
DizzyEggg
0aefbe1098 Merge branch 'battle_engine_v2' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-04-05 23:47:55 +02:00
DizzyEggg
794c9aa255
Merge pull request #121 from thechurchofcage/epsilon 
Three pointless moves
 2019-04-05 23:47:54 +02: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
Marcus Huderle
033580da96 Document secret base 2019-04-05 16:24:57 -05:00
Papa Cancer
4c8bc9d526 Three pointless moves 
Celebrate, Hold Hands and Happy Hour. Yay(!)
Update: turns out Pay Day works differently to how I thought, so I added a new move effect for Happy Hour doubling prize money.
Made all three effects subset of EFFECT_SPLASH, now called EFFECT_DUMB, as per Egg's instructions ( ͡° ͜ʖ ͡°)
 2019-04-05 18:10:02 +01:00
Fontbane
e8dd8f93d1 Remove Honey functionality 2019-04-05 10:33:19 -04:00
DizzyEggg
dd24597d52 Finish up menu specialised 2019-04-05 07:53:23 -05:00
DizzyEggg
05487c8820 animation for power whip, it sucks i know 2019-04-05 14:21:33 +02:00
DizzyEggg
c9cabe8d59 Bug Buzz animation 2019-04-05 14:04:38 +02:00
DizzyEggg
978781d656 Improve Tailwind animation 2019-04-05 13:38:13 +02:00
DizzyEggg
183b714ff1 Merge with master and fix web moves 2019-04-05 12:43:44 +02:00
Fontbane
9e74409bb2 Fix labels, label more scripts 2019-04-04 19:34:35 -05:00
Fontbane
8b88ef3e01 Document berry tree events 2019-04-04 19:34:35 -05:00
Fontbane
90e32f4ec5 Document landmark setting and item balls 2019-04-04 19:34:35 -05:00
PikalaxALT
c46f271f67 Documentation of ereader_helpers, 1 2019-04-04 19:26:45 -05:00
PikalaxALT
53efbe2832 Finish decomp of union_room_chat 2019-04-04 19:26:45 -05:00
PikalaxALT
a47abb3949 union_room_chat data, 1 2019-04-04 19:26:45 -05:00
PikalaxALT
4fadbaf161 Minor fixes 
gotoram --> returnram
cmdCF/execram --> gotoram
fix indentation in sym_ewram.txt
fix mevent_client.h guard name
 2019-04-03 17:04:42 -05:00
PikalaxALT
28646ea64e Decompile mevent server scripts 2019-04-03 17:04:42 -05:00
PikalaxALT
6c12d154e7 Reformat mevent server and client scripts 2019-04-03 17:04:42 -05:00
PikalaxALT
03badd9c40 mevent_server_ish 2019-04-03 17:04:42 -05:00
PikalaxALT
dabd1f6177 finish mevent_server.s 2019-04-03 17:04:42 -05:00
PikalaxALT
a455d98385 start porting mevent_server from firered 2019-04-03 17:04:42 -05:00
Marcus Huderle
181baf9fe5 Merge remote-tracking branch 'upstream/master' into misc_docs 
# Conflicts:
#	src/field_weather_effect.c
 2019-04-02 18:29:51 -05:00
Marcus Huderle
1241700b20 Finish documenting the other weather effects 2019-04-02 18:28:56 -05:00
DizzyEggg
baa187665b Document a bit of script menu and battle anims 2019-04-02 16:28:38 -05:00
DizzyEggg
1aa95a1821 Document a bit of anims 2019-04-02 07:31:06 -05:00
DizzyEggg
79fec8a38d Energy Ball animation 2019-04-02 13:05:20 +02:00
DizzyEggg
7f07aae89b Power-up-Punch animation 2019-04-02 09:22:28 +02:00
DizzyEggg
cd3de7821e Merge branch 'master' into battle_engine_v2 2019-04-02 08:37:54 +02:00
DizzyEggg
63b04d5d6f Iron Head animatiion 2019-04-02 07:33:19 +02:00
PikalaxALT
7571969a45 Finish union room battle 2019-04-01 22:08:50 -05:00
PikalaxALT
4be97b2dc6 through sub_801A960 2019-04-01 22:08:50 -05:00
DizzyEggg
743a42fec2 Cross Poison animation 2019-04-01 23:39:30 +02:00
DizzyEggg
22be08f723 Revert Bubblebeam to hit only one target 2019-04-01 23:17:50 +02:00
DizzyEggg
737c49853b Fix Flare Blitz 2019-04-01 23:08:21 +02:00
DizzyEggg
88424b0ea3 Support for custom multi battle choose mons 2019-04-01 21:56:25 +02:00
PikalaxALT
08f4d3e105 Rename these objects to union_room_battle 2019-04-01 14:41:37 -04:00
PikalaxALT
4ea8217f81 file split 2019-04-01 14:25:58 -04:00
PikalaxALT
1fe5208560 through sub_801A02C 2019-04-01 12:05:58 -04:00
DizzyEggg
62863516c8 Fix Bubblebeam animation in double battles 2019-04-01 15:03:04 +02:00