Commit Graph

5849 Commits

Author SHA1 Message Date
GriffinR
b1d131ace2 Convert base_stats.h to UTF-8 2020-02-25 12:46:03 -06:00
DizzyEggg
108f6b711f Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-02-23 10:58:26 +01:00
DizzyEggg
3ce29d0559 Fix AI Volt Absorb 2020-02-22 20:07:51 +01:00
Eduardo Alvaro Quezada D'Ottone
e1dbf8e064
Fix for Turboblaze's Battle string formatting (#281)
* Fix for Turboblaze's Battle string formatting

* Moved the "a" down the line.
2020-02-22 19:27:45 +01:00
DizzyEggg
da965700ff Draining abilities have the pop-up appear now 2020-02-22 19:25:35 +01:00
DizzyEggg
b1b1bf7f12 Fix two turn moves not activating moxie 2020-02-22 18:43:16 +01:00
DizzyEggg
bd75f16a9b Clear move effect after each turn 2020-02-22 18:22:04 +01:00
DizzyEggg
517974ebcb Can't Knock Off mega stones 2020-02-22 17:30:07 +01:00
Diegoisawesome
a85587d8c2
Merge pull request #984 from Diegoisawesome/master
Make aif2pcm looping not dependent on order of MARK and INST chunks
2020-02-19 09:18:16 -08:00
Diegoisawesome
f84ac6d633 Make aif2pcm looping not dependent on order of MARK and INST chunks 2020-02-19 08:51:01 -08:00
PikalaxALT
da7e797236
Merge pull request #982 from jiangzhengwenjz/nonmatching
real match sub_802C838
2020-02-19 08:47:03 -05:00
Diegoisawesome
cbb2088d15
Merge pull request #983 from Diegoisawesome/master
Fix aif2pcm Pascal string bug and follow AIFF loop point standard
2020-02-18 22:38:04 -08:00
Diegoisawesome
4dd4c4d077 Allow INST chunk loops without MARK chunk 2020-02-18 22:32:27 -08:00
Diegoisawesome
059e5467f7 Add safety check 2020-02-18 22:11:04 -08:00
Diegoisawesome
57af90158d Follow defined AIFF loop standard 2020-02-18 22:08:38 -08:00
Diegoisawesome
437cb7c452 Fix aif2pcm Pascal string bug, allow flexibility in marker names for loop 2020-02-18 20:59:08 -08:00
jiangzhengwenjz
097b847303 sub_802C838 2020-02-19 06:23:01 +08:00
GriffinR
3456578c0f Move berry crush data to src 2020-02-17 13:10:23 -06:00
GriffinR
f6275cce57 Misc constant use in TV 2020-02-17 13:09:35 -06:00
GriffinR
e7ff7fb032 Fix move relearner struct 2020-02-17 13:08:03 -06:00
DizzyEggg
6c71f9b57b Abilities up to gen7 2020-02-17 15:26:04 +01:00
Eduardo Alvaro Quezada D'Ottone
1acd82ece6
Added non-traceable abilities. (#275)
* Added non-traceable abilities.

* Added ABILITIES_COUNT to array size
2020-02-17 10:59:39 +01:00
DizzyEggg
e64b810463 Fix Dragon Pulse and Shadow Force animations 2020-02-17 10:55:55 +01:00
Diegoisawesome
bb22dde048
Merge pull request #980 from PikalaxALT/port_librfu_lman
Port librfu from pokefirered
2020-02-16 17:43:18 -08:00
PikalaxALT
867734a791 Fix alignment in AgbRfu_LinkManager.h 2020-02-16 15:32:10 -05:00
PikalaxALT
a851a02f01 fix modern 2020-02-16 14:24:06 -05:00
PikalaxALT
91dd7f5cc3 Port librfu from firered 2020-02-16 13:49:36 -05:00
DizzyEggg
017f65de59 Add easy to use macros for custom multi battles 2020-02-16 15:45:54 +01:00
DizzyEggg
edb581af1f Mega evo elevation shadow 2020-02-16 13:46:35 +01:00
DizzyEggg
7c81accf7b Switch-in abilities for megas 2020-02-16 13:34:25 +01:00
DizzyEggg
5054727167 Allow second mon to throw a ball if first dead 2020-02-16 13:24:50 +01:00
LOuroboros
a1c425fffb
Fixed Bad Dreams' in battle text. (#272) 2020-02-16 13:17:00 +01:00
LOuroboros
0bccf91f1a
Cleaned up the transition of many battlescripts in battle_scripts_1.s (#273) 2020-02-16 13:14:18 +01:00
GriffinR
ac1738e11d Move smokescreen data to src 2020-02-13 14:48:19 -06:00
GriffinR
d11cd5d217 Move text input strings to src 2020-02-13 14:48:19 -06:00
huderlem
204c431993
Merge pull request #910 from GriffinRichards/fix-eventobj
Standardize Object Event naming
2020-02-12 18:34:19 -06:00
Marcus Huderle
6b966d20e5 Update spritesheet rules 2020-02-12 18:07:13 -06: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
Diegoisawesome
66c6b7a38b
Merge pull request #976 from GriffinRichards/fix-parens
Resolve missing parens errors
2020-02-11 21:54:23 -08:00
GriffinR
eaf508ba5e Resolve missing parens errors 2020-02-12 00:44:09 -05:00
GriffinR
689acd3613 Move slot machine data to src 2020-02-09 14:11:50 -06:00
DizzyEggg
360665fac8 Fix ability preventing escape string 2020-02-09 11:02:22 +01:00
GriffinR
084bd66924 Document Trainer Card 2020-02-08 14:31:17 -06:00
GriffinR
faeb974c46 Minor berry fix data clean up 2020-02-08 14:23:41 -06:00
GriffinR
6640c509c0 Remove unnecessary declaration 2020-02-08 14:22:53 -06:00
GriffinR
43ec11b92a Move berry powder data to src 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
GriffinR
85dc8a528c Move rotating tile puzzle data to src 2020-02-08 14:22:53 -06:00
Pokestia
f92b03f266 Fix wrong variable name 2020-02-08 14:19:53 -06:00