Commit Graph

2434 Commits

Author SHA1 Message Date
DizzyEggg
ea5ffa3375 Merge with master 2018-07-16 20:23:05 +02:00
DizzyEggg
5318cc656a Add some new battlestrings. 2018-07-15 18:53:43 +02:00
DizzyEggg
6f484c20ce Final ai damage calc touches 2018-07-15 18:07:01 +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
DizzyEggg
967117093d Add type modyfing option to debug 2018-07-15 12:51:45 +02:00
DizzyEggg
9c7db9f45e New AI damage and type functions 2018-07-15 12:39:07 +02:00
DizzyEggg
5a38bb61db Basic damage calc is ready. 2018-07-14 22:56:03 +02:00
DizzyEggg
c00fa14b66 Create template of new dmg calc 2018-07-14 19:29:25 +02:00
DizzyEggg
2ebf14a83d Get rid of scripting dmg multiplier 2018-07-14 18:58:45 +02:00
DizzyEggg
baf172d605 Prepare damage calc huge changes 2018-07-14 18:44:38 +02:00
DizzyEggg
939127bfff Important battle util functions 2018-07-14 16:41:14 +02:00
DizzyEggg
b24427f3bf Introduce Field Statuses 2018-07-14 13:17:10 +02:00
DizzyEggg
3a10ae9a94 Crit changes accomodated to ai scripts 2018-07-14 12:54:12 +02:00
DizzyEggg
2293d1ddbc Get rid of duplicate bs command jumpiftype 2018-07-14 12:02:29 +02:00
DizzyEggg
1afbcda042 Add ability names 2018-07-14 11:20:57 +02:00
DizzyEggg
fe15e56f31 Add Gen4 move names and fairy type name 2018-07-14 10:57:34 +02:00
DizzyEggg
c9d1ee3c4a Move high crit to a flag and update move table 2018-07-14 10:11:38 +02: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
DizzyEggg
e94a0e2ddf Add new gen constants. 2018-07-13 23:31:00 +02:00
DizzyEggg
626b80106e Basic Battle Debug Menu is done 2018-07-13 23:00:56 +02: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
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
6313f360d5 Merge branch 'DizzyEggg-decompile_cut' 2018-07-05 20:33:47 -07: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
Diegoisawesome
efebc51972
Merge pull request #268 from DizzyEggg/decompile_battle_tent
Decompile a bit of battle tent
2018-06-30 11:25:19 -07: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