DizzyEggg
|
0d68af7f06
|
copy contest effect from ruby
|
2018-08-12 23:20:17 +02:00 |
|
Diegoisawesome
|
b40957c09b
|
Finish decompiling learn_move
|
2018-08-12 13:33:41 -07:00 |
|
Diegoisawesome
|
bd2b7beb07
|
Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move
|
2018-08-12 13:17:51 -07: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 |
|
Diegoisawesome
|
9a73a47ddd
|
Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move
|
2018-08-12 12:55:21 -07: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
|
2dd5fc23d4
|
Prepare learn_move for merge
|
2018-08-12 12:54:07 -07: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
|
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 |
|
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 658f9351fe.
|
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 |
|
MCboy
|
3a15012085
|
Update field_player_avatar.c
|
2018-07-25 17:28:25 +04:30 |
|
MCboy
|
94a5f8d529
|
made file better ?
|
2018-07-25 17:18:49 +04:30 |
|
Diegoisawesome
|
7270e73fee
|
Move strings to C
|
2018-07-25 01:15:36 -07: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 |
|
MCboy
|
82d88479ce
|
decompiled a bunch of functions
i also made TryInterruptEventObjectSpecialAnim functionally equivalent tho its still nonmatching so i need help with that
|
2018-07-24 16:59:52 +04:30 |
|
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
|
29276cc76c
|
Move some trainer data from data2b.s to c structs.
|
2018-07-20 22:14:31 -05:00 |
|
MCboy
|
201fb6f818
|
ported code over from pokeruby
|
2018-07-21 03:06:40 +04:30 |
|
MCboy
|
43fa9da52a
|
decompile more code
1 non matching need help
|
2018-07-20 03:44:20 +04:30 |
|
MCboy
|
416db8e751
|
oops
|
2018-07-19 21:23:45 +04:30 |
|
MCboy
|
a8f9adeaf5
|
decompile player_field_avatar
|
2018-07-19 21:22:35 +04:30 |
|
MCboy
|
e3a82bd2c5
|
decompile player_field_avatar.s
|
2018-07-19 21:18:09 +04:30 |
|
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 |
|
Marcus Huderle
|
7d375972ba
|
Sync bg_event macros with pokeruby
|
2018-07-11 11:12:26 -05:00 |
|
Marcus Huderle
|
d675b7578c
|
Move movement type constants into include/constants/event_object_movement_constants.h
|
2018-07-10 18:04:41 -05:00 |
|
Slawter666
|
08774bdd88
|
Merge https://github.com/pret/pokeemerald into pokedex-doc
|
2018-07-08 01:23:28 +01:00 |
|
Slawter666
|
dd228fae5a
|
Minor variable labelling
|
2018-07-08 01:20:01 +01:00 |
|
DizzyEggg
|
ee3d505b58
|
little touches for HandleTurnActionSelectionState
|
2018-07-07 21:14:41 +02:00 |
|
DizzyEggg
|
008d961b2a
|
add party menu defines
|
2018-07-07 19:57:09 +02:00 |
|
DizzyEggg
|
1c48e58574
|
small fixes
|
2018-07-07 14:24:19 +02:00 |
|
DizzyEggg
|
9892298645
|
Merge branch 'master' into final_battle_files_touches
|
2018-07-07 14:11:04 +02:00 |
|
Diegoisawesome
|
f79ac26ce3
|
Rename SetLastTalkedObjectInFrontOfPlayer to CheckObjectGraphicsInFrontOfPlayer
|
2018-07-05 20:33:07 -07:00 |
|
Diegoisawesome
|
5189442bcc
|
Merge branch 'decompile_cut' of git://github.com/DizzyEggg/pokeemerald into DizzyEggg-decompile_cut
|
2018-07-05 20:32:12 -07:00 |
|
DizzyEggg
|
e6d67c7c22
|
give labels to player controller functions
|
2018-07-01 15:45:47 +02:00 |
|
DizzyEggg
|
c556358e47
|
label multiuse sprite template functions
|
2018-07-01 15:28:57 +02:00 |
|
DizzyEggg
|
f35c0abe80
|
merge with battle tent update
|
2018-07-01 12:16:52 +02:00 |
|
DizzyEggg
|
d2e47323fe
|
document frontier related
|
2018-07-01 11:15:42 +02:00 |
|
DizzyEggg
|
2d0be91217
|
Move all trainer defines to trainers.h and identify frontier brain trainer id
|
2018-06-30 18:55:34 +02:00 |
|
DizzyEggg
|
bfc64c9689
|
C vars sym ewram
|
2018-06-30 15:35:54 +02:00 |
|
DizzyEggg
|
97712ec931
|
change mapDataId to mapLayoutId
|
2018-06-30 14:52:13 +02:00 |
|
DizzyEggg
|
15fe5a031b
|
Merge branch 'master' into decompile_battle_tent
|
2018-06-30 14:43:41 +02:00 |
|
DizzyEggg
|
cdacc27714
|
change for loop in fldeff_cut
|
2018-06-30 14:26:33 +02:00 |
|
DizzyEggg
|
5434db2fc6
|
use region map constants
|
2018-06-30 14:22:09 +02:00 |
|
DizzyEggg
|
30c85a5128
|
more battle documentation
|
2018-06-30 14:12:17 +02:00 |
|
DizzyEggg
|
272b98da6c
|
document party status summary
|
2018-06-28 21:06:32 +02:00 |
|
Marcus Huderle
|
5e00c0bfcf
|
Fix map constants
|
2018-06-20 19:54:21 -05:00 |
|
Marcus Huderle
|
ed8b006e67
|
Rename map-layout-related things
|
2018-06-20 19:54:21 -05:00 |
|
DizzyEggg
|
ab36efdaf4
|
document bounce effect
|
2018-06-20 23:07:51 +02:00 |
|
DizzyEggg
|
94752d4207
|
document battle bars
|
2018-06-19 00:43:15 +02:00 |
|
DizzyEggg
|
caa36b530a
|
label and document battle windows
|
2018-06-17 16:48:58 +02:00 |
|
DizzyEggg
|
9329ffc2bc
|
review cut changes
|
2018-06-17 12:39:58 +02:00 |
|