 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
|
9e9ec8dc96
|
god damn it contributers :c
|
2018-08-12 23:17:27 +04:30 |
|
|
MCboy
|
f7c3151ef2
|
add functions to header
|
2018-08-12 22:31:19 +04:30 |
|
|
MCboy
|
e6db9c5d19
|
add function to header
|
2018-08-12 22:29:44 +04:30 |
|
|
MCboy
|
8650f2345d
|
define function in header
|
2018-08-12 22:28:41 +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
|
3a72e6a80d
|
Easy chat review changes
|
2018-08-12 11:39:09 +02:00 |
|
|
Diegoisawesome
|
a000eb4f36
|
Merge branch 'learn_move' of git://github.com/Edwearth/pokeemerald into Edwearth-learn_move
|
2018-08-11 19:03:38 -07: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 |
|
|
DizzyEggg
|
7b9a7765e0
|
Make learnsets easier to edit
|
2018-08-12 00:42:25 +02:00 |
|
|
Diegoisawesome
|
cb9127ccaf
|
Revert "Rename some specials"
This reverts commit 658f9351fe.
|
2018-08-11 15:16:41 -07:00 |
|
|
DizzyEggg
|
9bb7a2c7a5
|
make move desc compile
|
2018-08-12 00:09:53 +02: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
|
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 |
|
|
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 |
|
|
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 |
|
|
Diegoisawesome
|
e92e2cb0aa
|
Merge branch 'master' of github.com:pret/pokeemerald
|
2018-07-24 21:18:36 -07:00 |
|
|
Diegoisawesome
|
156fb472e1
|
Clean up files and add entries to charmap
|
2018-07-24 21:18:23 -07:00 |
|
|
Diegoisawesome
|
5883f867f0
|
Merge pull request #278 from vblm12/trainer_data
Move some trainer data into c structs
|
2018-07-24 18:58:56 -07:00 |
|
|
DizzyEggg
|
1e9143e0b2
|
merge union room with master
|
2018-07-22 13:14:58 +02:00 |
|
|
DizzyEggg
|
c9d486a5d3
|
make union room compile i guess
|
2018-07-22 12:49:49 +02:00 |
|
|
vblm12
|
07ea34e4c2
|
Make TrainerMonPtr fields const
|
2018-07-20 22:08:38 -05:00 |
|
|
vblm12
|
c41b8123e3
|
Move trainer defines to one place in opponent.h...
... to match pokeruby
|
2018-07-20 22:03:22 -05:00 |
|
|
DizzyEggg
|
118fa3afce
|
IS_MOVE_PHYSICAL to IS_TYPE_PHYSIAL
|
2018-07-16 22:00:27 +02:00 |
|
|
DizzyEggg
|
bf0178238a
|
Battle files - review changes
|
2018-07-16 20:47:30 +02:00 |
|
|
DizzyEggg
|
ea5ffa3375
|
Merge with master
|
2018-07-16 20:23:05 +02:00 |
|
|
Diegoisawesome
|
07ef762770
|
Merge pull request #275 from Diegoisawesome/master
Document list_menu.c and main_menu.c
|
2018-07-15 04:43:03 -07:00 |
|
|
Diegoisawesome
|
731d6d59bc
|
Document list_menu.c and main_menu.c
|
2018-07-15 04:30:37 -07:00 |
|
|
Marcus Huderle
|
546819bc72
|
Use map type constants in map headers
|
2018-07-12 22:39:38 -05:00 |
|