1701 Commits

Author SHA1 Message Date
DizzyEggg
0b22ad4ab5 make contest effect build 2018-08-15 00:01:43 +02:00
DizzyEggg
0c7063c5ba Make contest effect table easier to edit in the future 2018-08-14 23:50:58 +02:00
DizzyEggg
c72b55a5c4 Match the worst function ever 2018-08-14 22:28:25 +02:00
DizzyEggg
1a0e6f7aed match contest effect 2018-08-13 21:24:11 +02:00
DizzyEggg
0d68af7f06 copy contest effect from ruby 2018-08-12 23:20:17 +02:00
Diegoisawesome
335f4c1e81
Merge pull request #296 from DizzyEggg/event_data
Event data
2018-08-12 13:17:36 -07:00
DizzyEggg
f1daf7442d event data review changes 2018-08-12 22:04:49 +02:00
DizzyEggg
577e6e7c1f Merge branch 'patch-2' of https://github.com/DizzyEggg/pokeemerald into event_data 2018-08-12 21:55:20 +02:00
Diegoisawesome
25832810f6
Merge pull request #288 from DizzyEggg/slot_machine
Port a little bit of slot machine
2018-08-12 12:27:23 -07:00
Diegoisawesome
32b0e102cf
Merge pull request #287 from DizzyEggg/easy_chat
Pikalax's Easy chat
2018-08-12 12:17:23 -07:00
Diegoisawesome
6bb761a711
Merge pull request #277 from atasro2/player_field_avatar
decompile a portion of field_player_avatar.s
2018-08-12 12:09:09 -07:00
Diegoisawesome
26e18f2292
Merge pull request #289 from DizzyEggg/contests
Pikalax's contests
2018-08-12 12:04:53 -07:00
MCboy
1bc93c5a66
Merge branch 'master' into player_field_avatar 2018-08-12 23:26:00 +04:30
MCboy
2ddabca996
apply some changes 2018-08-12 22:31:58 +04:30
DizzyEggg
7dac22314e Decompile a bit of pokemon storarage system 2018-08-12 16:40:31 +02:00
DizzyEggg
957dcd01b3 merge with master 2018-08-12 12:11:35 +02:00
DizzyEggg
e787d5b602 Contest review changes 2018-08-12 12:08:51 +02:00
DizzyEggg
1229bead2e slot machine review changes 2018-08-12 11:50:26 +02:00
DizzyEggg
3a72e6a80d Easy chat review changes 2018-08-12 11:39:09 +02:00
Diegoisawesome
18d5186630 Merge remote-tracking branch 'garakmon/heal-loc-2' 2018-08-11 16:57:46 -07:00
Diegoisawesome
cf9518f237 Merge branch 'master' of github.com:pret/pokeemerald 2018-08-11 16:32:03 -07:00
Diegoisawesome
94eef0bfa5
Merge pull request #294 from DizzyEggg/learnsets
Make learnsets easier to edit
2018-08-11 16:27:52 -07:00
Diegoisawesome
0c29447717
Merge pull request #292 from DizzyEggg/move_desc
Move move descriptions to C
2018-08-11 16:26:16 -07:00
DizzyEggg
7b9a7765e0 Make learnsets easier to edit 2018-08-12 00:42:25 +02:00
Diegoisawesome
57b3393192 Fix compile error 2018-08-11 15:42:08 -07:00
Diegoisawesome
cb9127ccaf Revert "Rename some specials"
This reverts commit 658f9351fe9349eb16edab8d5d503ef741449d4a.
2018-08-11 15:16:41 -07:00
DizzyEggg
df5009cb3e Move move descriptions to C 2018-08-12 00:03:19 +02:00
Diegoisawesome
658f9351fe Rename some specials 2018-08-11 14:59:43 -07:00
Diegoisawesome
b54793be91 Finish decompiling field_specials 2018-08-11 14:51:54 -07:00
DizzyEggg
7f167ca9f4
Update battle_script_commands.c 2018-08-11 23:00:16 +02:00
DizzyEggg
feee4751eb
Make event data look cleaner 2018-08-11 22:54:34 +02:00
DizzyEggg
537ebd36ac Merge contests with master 2018-08-11 19:04:28 +02: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
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
Diegoisawesome
bad170b0cb Continue decompiling field_specials 2018-08-08 23:53:21 -07: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
Diegoisawesome
85ebd76cd0 Fix fanfare constant to use define 2018-08-04 18:41:53 -07:00
DizzyEggg
eb4d9f6fed Tabs to spaces 2018-08-03 00:24:10 +02:00
DizzyEggg
d6537c811b Battle code enums in case switches 2018-08-03 00:13:44 +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
DizzyEggg
9febcd3a0a Document a bit of atk47 2018-07-29 15:51:08 +02:00
DizzyEggg
68145cd002 Document atk48 2018-07-29 15:33:16 +02:00
DizzyEggg
4080c6f831 Decompile a few pokemon summary screen functions 2018-07-28 23:26:19 +02:00
MCboy
6c365fdc94
Update field_player_avatar.c 2018-07-25 17:47:04 +04:30