ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-10 05:35:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,811 Commits 1 Branch 0 Tags 235 MiB
fdfe330330
Commit Graph

242 Commits

Author SHA1 Message Date
DizzyEggg
15d34c3513 Fix strings coz they had the same name for some unknown to me reason 2019-12-23 17:09:13 +01:00
LOuroboros
c690d577a5 Implemented Aftermath's effect 2019-12-21 05:01:42 -03:00
DizzyEggg
dcb5d16cb3 Merge with master 2019-11-29 21:47:31 +01:00
GriffinR
63ee15fc28 Document Frontier Util 2019-11-25 18:37:48 -06:00
DizzyEggg
8cc0439182 merge master 2019-11-22 22:47:19 +01:00
GriffinR
5e01871f8b Document Trainer Hill 2019-11-16 13:02:35 -06:00
GriffinR
a3ee92a4e7 Document some frontier util funcs 2019-11-10 16:37:14 -06:00
DizzyEggg
1d8cc9b741 Fix merge conflicts 2019-11-03 19:55:19 +01:00
GriffinR
ca2c6fa9b1 Document pc_transfer.inc 2019-10-22 17:57:28 -05:00
DizzyEggg
bae5d2038f Update with master 2019-10-10 16:18:48 +02:00
GriffinR
5325835ee7 Use STR_CONV constants 2019-09-30 15:43:44 -04:00
DizzyEggg
c9de753ecc Illusion 2019-08-08 13:06:55 +02:00
DizzyEggg
0dd9a3dd0c Fix Stealth Rock msg and target 2019-08-05 12:26:53 +02:00
DizzyEggg
2863045241 Fix switch-in abilities text/pop-up 2019-08-05 11:24:49 +02:00
DizzyEggg
d1fa9c24cc Fix Wory Seed string 2019-07-07 09:58:36 +02:00
DizzyEggg
65be7868ec Fix string 2019-05-23 12:38:41 +02:00
DizzyEggg
76c5287629 Bug Bite 2019-05-23 12:32:14 +02:00
DizzyEggg
824a95fe07 Incinerate 2019-05-10 15:12:33 +02:00
DizzyEggg
875b413a09 Various battle target items 2019-05-09 20:31:58 +02:00
DizzyEggg
bb8e397e5b Gems and dmg reducing berries 2019-05-07 15:26:58 +02:00
Papa Cancer
b50007e861 Instruct 
Re-PR'd due to excess "merges"
 2019-04-20 20:11:49 +01:00
Papa Cancer
7e99272482 Laser Focus 
Re-PR'd due to excess "merges"
 2019-04-20 20:02:52 +01:00
Papa Cancer
c4acc3dbf8
Merge branch 'battle_engine_v2' into beta 2019-04-20 16:49:57 +01:00
Papa Cancer
754befe393 Baneful Bunker + King's Shield 
Both apply a move effect from atk49. King's Shield swaps attacker and defender for the sake of Defiant etc. and then swaps them back!
 2019-04-17 14:54:21 +01:00
Papa Cancer
e5e45bbcf5 Throat Chop 
Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
 2019-04-17 13:52:25 +01:00
DizzyEggg
f8713f9c15 Merge with master 2019-04-06 20:43:13 +02:00
DizzyEggg
794c9aa255
Merge pull request #121 from thechurchofcage/epsilon 
Three pointless moves
 2019-04-05 23:47:54 +02: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
DizzyEggg
b0223f691f Clean up data headers 2019-04-05 07:53:23 -05:00
DizzyEggg
183b714ff1 Merge with master and fix web moves 2019-04-05 12:43:44 +02:00
DizzyEggg
944dc4f6bf Merge with master 2019-04-01 13:40:42 +02:00
DizzyEggg
62192b86f7 Aroma Veil 2019-04-01 11:42:37 +02:00
DizzyEggg
6f9096c613 Add Sweet Veil 2019-03-31 22:02:39 +02:00
DizzyEggg
b12334c88b Remove cases from ABE, add functionality of Flower Veil 2019-03-31 21:38:58 +02:00
Marcus Huderle
462b196abc Give battle_anim files appropriate names 2019-03-31 12:15:39 -05:00
DizzyEggg
876be1d9cd
Merge pull request #104 from thechurchofcage/beta 
Spiky Shield
 2019-03-30 11:21:27 +01:00
Papa Cancer
a3b4767dd2 Spiky Shield 
Created generic string "Atk was hurt by Def's BUFF" for use for both Spiky Shield and Rough Skin - can also be used for Aftermath and Rocky Helmet, when programmed
 2019-03-26 17:45:34 +00:00
Papa Cancer
61a7bd2788 Taunt fix etc. 
Taunt now works for the correct number of turns and has its own ending string - made by reusing the "Heal Block ends" string as a multi-purpose "X wore off" one. Fixed a bug in PREPARE_STRING_BUFFER and touched up the ENDTURN timers for various STATUS3's.
Heal Block now displays the correct string when preventing usage of a move.
 2019-03-24 12:54:01 +00:00
DizzyEggg
c329252ce3 Add Safety Googles effect 2019-03-08 10:16:54 +01:00
DizzyEggg
fddb5159b4 Merge with master 2019-03-05 21:46:45 +01:00
Papa Cancer
2050ac3963 Grassy Terrain v2 
All corrected, simplest version
Also includes proper ending strings for all terrains
 2019-03-05 19:13:25 +00:00
Papa Cancer
cfd50eb65a Grassy Terrain + minor fixes 
Includes strings for all
Fixes:
・Psychic Terrain blocks priority if the TARGET is grounded, not the user
・Psychic Terrain no longer targets an opponent
・Terrains no longer boost (or nerf, for Misty) the power of certain moves if the affect mon is semi-invulnerable
・Small fix: Meteor Mash corrected to being a physical attack
 2019-03-02 22:52:43 +00:00
Phlosioneer
3716da5430 Rename macro with correct name for pixel values 2019-03-02 17:25:39 -05:00
DizzyEggg
8e9296a42b Fix team messages 2019-03-02 12:31:07 +01:00
Papa Cancer
d704b9cd5b Gravity fix 
Brings down Pokémon in the middle of a two-turn flying move (only Bounce and Fly at the moment); says the appropriate message for all mons brought to the ground via Gravity
 2019-02-24 13:28:24 +00:00
Phlosioneer
c96f8751cd Improve window palette macros 2019-02-21 23:27:12 -05:00
DizzyEggg
dc39f76a95 Spectral Thief effect 2019-02-14 12:15:53 +01:00
DizzyEggg
f415871369 Merge with master 2019-02-03 10:44:05 +01:00
DizzyEggg
b3d48c0ed6
Get rid of an unnecessary extern 2019-02-01 19:45:06 +01:00
DizzyEggg
a3460c9e45 Code Belch effect 2019-02-01 14:17:24 +01:00
DizzyEggg
736826e863 New feature - battle 2 vs 1 opponent 2019-01-27 20:54:34 +01:00
DizzyEggg
2c3210f4d1 merge with master 2019-01-18 22:30:34 +01:00
DizzyEggg
edddd847c5 Document and clean up trainer hill 2019-01-13 20:50:08 +01:00
DizzyEggg
78d7c29290 Move buffers to allocated reousrces, get rid of old type effectiveness table 2019-01-05 16:00:57 +01:00
DizzyEggg
517573eb4b Update with master 2018-12-26 17:46:51 +01:00
melthelesbian
2dd706ca54 use max mon moves constant where able (#480) 
* use max mon moves constant where able

* fix errors in script commands file

* fix more errors
 2018-12-25 11:50:15 -06:00
DizzyEggg
6fa5f33519 Merge branch 'master' into battle_engine_v2 2018-12-24 09:07:18 +01:00
DizzyEggg
9320fe8f85 Clear includes 2018-12-24 00:02:29 +01:00
DizzyEggg
f7a7ddde0c Fix Quick Guard 2018-12-22 15:10:24 +01:00
DizzyEggg
180aa839c4 Fix conflicts 2018-12-09 13:12:02 +01:00
DizzyEggg
b60915539d Fix Phantom Force 2018-12-08 16:19:50 +01:00
nullableVoidPtr
f50faac244 Clean more tables 2018-12-08 14:10:30 +08:00
nullableVoidPtr
8a8baaeaaa Merge remote-tracking branch 'upstream/master' 2018-12-08 12:13:15 +08:00
DizzyEggg
470df386c9 Fix conflicts 2018-12-07 23:01:14 +01:00
Melody
2615ece23b Use normal apostrophes like adults 2018-12-07 10:41:08 -05:00
nullableVoidPtr
f9ff7316d5 Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs 2018-12-06 10:38:28 +08:00
nullableVoidPtr
3909b6408c Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325 
Some of the INVALID_ are likely erroneously placed, due to lack of documentation
 2018-12-06 09:44:08 +08:00
DizzyEggg
b9e711bbf4 Add Powder 2018-12-03 12:50:32 +01:00
DizzyEggg
1a8859b1d8 Add Dazzling 2018-11-30 22:12:18 +01:00
DizzyEggg
7fa55704b2 merge with master 2018-11-30 20:46:09 +01:00
DizzyEggg
194139a35b Add Move Effect - Feint 2018-11-24 19:37:10 +01:00
DizzyEggg
539b05ff73 Begin working on custom multi battles 2018-11-24 01:02:02 +01:00
Slawter666
3b501cb470 Document battle ui 2018-11-22 01:10:50 +00:00
DizzyEggg
15b8046b2b Add third type 2018-11-17 12:10:24 +01:00
DizzyEggg
bb9dbc0c6d Merge with master 2018-11-14 22:50:27 +01:00
Diegoisawesome
9afe7a896e Merge remote-tracking branch 'pret/master' into render_text 2018-11-06 11:40:17 -06:00
Diegoisawesome
f8d337e491 Finish cleaning up text.c 2018-11-06 11:30:21 -06:00
Diegoisawesome
6d38431c33 Begin cleaning text.c 2018-11-06 10:44:48 -06:00
DizzyEggg
68d94ad316 Implement trainer sliding 2018-11-03 01:17:16 +01:00
DizzyEggg
e9965dd341 merge with master 2018-11-02 22:55:32 +01:00
DizzyEggg
7de1c4bd14 Make frontier util compile 2018-10-30 22:17:03 +01:00
DizzyEggg
e850517123 more battle frontier 2 2018-10-27 21:01:35 +02:00
DizzyEggg
dc273cc19d Battle tower - ewram variables 2018-10-26 23:54:41 +02:00
DizzyEggg
67384c08be Implement double wild battle functionality 2018-10-15 21:19:52 +02:00
DizzyEggg
6b5c52e926 Flower Shield and protect moves 2018-10-06 15:50:35 +02:00
DizzyEggg
162c83fcff Bestow 2018-09-30 12:27:51 +02:00
DizzyEggg
b9cf1fdcfe Psycho Shift, Power Trick, Flame Burst 2018-09-29 18:40:14 +02:00
DizzyEggg
ada76cbe4f Synchronoise and Smack Down 2018-09-29 15:43:56 +02:00
DizzyEggg
9474254e4d Final Gambit, Dragon Tail 2018-09-22 16:15:00 +02:00
DizzyEggg
ca9876b0b4 Updated Wrap Mechanics, Infestation, stat changing move effects 2018-09-22 12:20:33 +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
13e434f874 Fix trainer name getter function 2018-09-20 17:22:16 +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
DizzyEggg
55f21c1776 Mega Evolution support is mostly done. 2018-09-16 18:55:32 +02:00
DizzyEggg
490a4f993b Merge with master 2018-09-01 12:38:38 +02:00
DizzyEggg
e2f5e73445 More battle dome 2018-08-15 23:04:46 +02:00
LOuroboros
5bb3af11bd
Update battle_message.c 
Added strings for Sticky Web, Quash, Ion Deluge, Topsy-Turby, Misty Terrain, Grassy Terrain, Electric Terrain, Psychic Terrain, Electrify, Assault Vest, Gravity and Heal Block.
 2018-08-11 13:53:10 -03:00