ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 12:07:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,843 Commits 1 Branch 0 Tags 235 MiB
b9cf1fdcfe
Commit Graph

2843 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DizzyEggg
537ebd36ac Merge contests with master 2018-08-11 19:04:28 +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
DizzyEggg
0e0d103044 port more of slot machine 2018-08-11 18:47:56 +02:00
DizzyEggg
7961aa44ba start porting slot machine 2018-08-11 17:57:20 +02:00
garak
2fc3b7f171 change sUnknown_085A1E3C to sMapHealLocations 2018-08-11 10:28:13 -04:00
DizzyEggg
59d8d56868 merge easy chat with master 2018-08-11 14:14:51 +02:00
DizzyEggg
4cb1e880da Reflect Type and SOAK 2018-08-11 13:30:34 +02:00
DizzyEggg
e259000dc3 Coil and Quiver Dance 2018-08-11 12:29:01 +02:00
DizzyEggg
674d35861c Couple bug fixes 2018-08-11 12:16:00 +02:00
DizzyEggg
f126585e71 Merge with master 2018-08-11 11:05:57 +02:00
Diegoisawesome
1e0f3ec433 Continue decompiling field_specials 2018-08-10 14:07:23 -07:00
garak
c3512e3b39 port larger heal location changes from poke ruby pr 2018-08-10 10:45:15 -04:00
Diegoisawesome
12ff59f9c1 Continue decompiling field_specials 2018-08-10 00:42:06 -07:00
Slawter666
bc42c5054c Merge remaining overworld frames 2018-08-10 00:20:19 +01:00
Slawter666
877a80d3bc Merge berry tree frames 2018-08-09 23:19:45 +01:00
Diegoisawesome
bad170b0cb Continue decompiling field_specials 2018-08-08 23:53:21 -07:00
Slawter666
dea0bba64e Merge "pokemon" frames 2018-08-09 00:55:32 +01:00
Diegoisawesome
90896e38c9 Begin porting/decompiling field_specials 2018-08-08 01:37:12 -07:00
garak
45b730e474 copy heal_location changes from pokeruby 2018-08-07 23:05:48 -04:00
Garak
96ab357bed
Merge pull request #3 from pret/master 
syncing with source repo
 2018-08-07 22:21:10 -04:00
Slawter666
704e3c7334 Merge https://github.com/pret/pokeemerald into spritesheet 2018-08-07 22:18:30 +01:00
Slawter666
ab2cc59629 Merge remaining "people" overworld frames 2018-08-07 22:16:03 +01:00
DizzyEggg
d230d986fa Me First. 2018-08-05 16:43:07 +02:00
DizzyEggg
de85f88bbb Support for two typed moves. 2018-08-05 13:57:37 +02:00
DizzyEggg
5fbeef860c Bulletproof and a couple of new moves 2018-08-05 13:39:22 +02:00
DizzyEggg
065032bf35 Moves changing terrains 2018-08-05 12:43:57 +02:00
Diegoisawesome
85ebd76cd0 Fix fanfare constant to use define 2018-08-04 18:41:53 -07:00
Diegoisawesome
4070152b0e
Merge pull request #284 from DizzyEggg/patch-1 
Use constant in a battle script.
 2018-08-04 18:32:04 -07:00
Diegoisawesome
002016e764
Merge pull request #283 from DizzyEggg/battle_pr_again 
Battle code enums in switches
 2018-08-04 18:31:49 -07:00
DizzyEggg
2218949d7c Topsy Turvy and Ion Deluge. 2018-08-04 23:34:29 +02:00
DizzyEggg
222ea7269d Rapid Spin blews all hazards, Quash and a couple of new move effects 2018-08-04 22:23:07 +02:00
DizzyEggg
9ff7b0e849 Effect to u16, Lucky Chant, Sucker Punch, Sticky Web and Metal Burst 2018-08-04 20:36:24 +02:00
DizzyEggg
f8f46244fb Add Infatuation to debug. 2018-08-03 22:45:27 +02:00
DizzyEggg
2d73637ff4 Introduce argument and do Draining kiss 2018-08-03 19:01:03 +02:00
DizzyEggg
3d5f512aec
Use constant in a battle script. 2018-08-03 18:07:45 +02:00
DizzyEggg
39f9b1ddf0 Experience on caught mon 2018-08-03 18:01:14 +02:00
DizzyEggg
eb4d9f6fed Tabs to spaces 2018-08-03 00:24:10 +02:00
DizzyEggg
28b4d0d9dc Make it compile 2018-08-03 00:21:40 +02:00
DizzyEggg
320120d529 Merge with master 2018-08-03 00:20:34 +02:00
DizzyEggg
d6537c811b Battle code enums in case switches 2018-08-03 00:13:44 +02:00
DizzyEggg
92f3d89598 Gravity and Heal Block preventing after choosing a move 2018-08-02 21:27:28 +02:00
DizzyEggg
c7baa71a5e Add placeholder string for not done moves. 2018-08-02 20:32:13 +02:00
DizzyEggg
198a1a8646 Proper Sound moves and substitute 2018-08-02 20:24:18 +02:00
Diegoisawesome
759bc2671c
Merge pull request #280 from DizzyEggg/decompile_part_mon_summary 
Decompile a few pokemon summary screen functions
 2018-08-02 08:27:05 -07:00
Diegoisawesome
722b07707c
Merge pull request #282 from DizzyEggg/stats_bits 
Add some more stat defines for battle scripts
 2018-08-02 08:11:44 -07:00
Slawter666
5917f7d108 Merge frontier brains, team magma and team aqua frames 2018-08-02 00:34:28 +01:00
DizzyEggg
5e27cd53a9 Add Substitute handler to debug 2018-08-01 23:14:02 +02:00
DizzyEggg
4c3de6f58a Fix moves always hitting 2018-08-01 22:39:42 +02:00
DizzyEggg
a62bd511c8 Fix opponent hp bar issue 2018-08-01 22:01:37 +02:00
DizzyEggg
0f29610a61 Flying type pokemon can take ground type moves damage if grounded 2018-07-31 23:21:42 +02:00