Commit Graph

2554 Commits

Author SHA1 Message Date
DizzyEggg
68145cd002 Document atk48 2018-07-29 15:33:16 +02:00
Diegoisawesome
df4c20f1f8
Merge pull request #281 from einstein95/master
Port over preproc commit from pokeruby
2018-07-29 02:19:09 -07:00
einstein95
aeceecea3d Port over 9d96147bbf 2018-07-29 20:11:04 +12:00
DizzyEggg
4080c6f831 Decompile a few pokemon summary screen functions 2018-07-28 23:26:19 +02:00
Diegoisawesome
919e7b4387
Merge pull request #279 from Diegoisawesome/master
Move strings to C, misc cleanup
2018-07-25 08:10:18 -07: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
Diegoisawesome
c47aac3538
Merge pull request #260 from DizzyEggg/decompile_union_room
Decompile part of union room
2018-07-24 18:48:23 -07:00
MCboy
1b3d7a5bef
Update field_player_avatar.s 2018-07-24 17:04:02 +04:30
MCboy
64f40bbfee
Add field_player_avatar to rodata 2018-07-24 17:03:16 +04:30
MCboy
ed3a698b98
Update field_player_avatar.s 2018-07-24 17:01:44 +04:30
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
3d04105488 Remove unnecessary files. 2018-07-21 01:51:44 -05:00
vblm12
29276cc76c Move some trainer data from data2b.s to c structs. 2018-07-20 22:14:31 -05: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
MCboy
05c5469f61
Update field_player_avatar.s 2018-07-21 03:07:19 +04:30
MCboy
201fb6f818
ported code over from pokeruby 2018-07-21 03:06:40 +04:30
MCboy
62a4193f8f
Update field_player_avatar.s 2018-07-20 03:46:55 +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
MCboy
34e3638f6c
decompile field_player_avatar.s 2018-07-19 21:17:27 +04:30
MCboy
663bb3112a
add player_field_avatar.c 2018-07-19 21:15:35 +04:30
MCboy
9bb23388a5
Fixed a typo
i couldnt find a function for 15 minutes because of this :(
2018-07-19 20:51:40 +04:30
garakmon
1ab872c68e Allow make compare to work on all platforms 2018-07-18 15:06:18 -04:00
Garak
5e46a0fcc5
Merge pull request #2 from pret/master
sync with source repo
2018-07-17 09:24:30 -04:00
Diegoisawesome
06b3ce408f
Merge pull request #272 from DizzyEggg/final_battle_files_touches
Thoroughly document and label battle files
2018-07-16 13:35:17 -07: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
24f6484643
Merge pull request #274 from huderlem/movement_constants
Move and use movement constants
2018-07-13 18:53:27 -07:00
Marcus Huderle
94650495c6 Use map battle scene constants in map headers 2018-07-12 22:45:41 -05:00
Marcus Huderle
546819bc72 Use map type constants in map headers 2018-07-12 22:39:38 -05:00
Marcus Huderle
d53e8137cd Use weather constants in map headers 2018-07-12 22:15:35 -05:00
Marcus Huderle
d5eb94330a Use region map section constants in map headers 2018-07-12 21:47:04 -05:00
Marcus Huderle
7d375972ba Sync bg_event macros with pokeruby 2018-07-11 11:12:26 -05:00
Marcus Huderle
8ffd7a70fc Use movement type constants in object_event macros 2018-07-10 18:04:51 -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
Diegoisawesome
abc1905cab
Merge pull request #273 from Slawter666/pokedex-doc
Minor labelling of pokedex.c
2018-07-08 15:13:03 -07:00