Eduardo Quezada
|
afcc1178b2
|
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
# Conflicts:
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# include/battle_controllers.h
# include/battle_script_commands.h
# include/battle_util.h
# include/constants/battle_script_commands.h
# include/constants/global.h
# include/decompress.h
# src/battle_anim_effects_1.c
# src/battle_anim_normal.c
# src/battle_anim_poison.c
# src/battle_anim_water.c
# src/battle_arena.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/berry.c
# src/data/trainers.h
# src/decompress.c
# src/field_effect.c
# src/hall_of_fame.c
# src/overworld.c
# src/pokeball.c
# src/pokemon.c
# src/pokemon_icon.c
# src/pokemon_storage_system.c
# src/scrcmd.c
|
2022-08-22 20:30:45 -04:00 |
|
Eduardo Quezada
|
7b3401ee27
|
Standarized use of star in pointer types
|
2022-07-29 10:17:58 -04:00 |
|
ghoulslash
|
035b2332af
|
cache ai damage, effectiveness calcs
|
2022-01-13 11:28:27 -05:00 |
|
ultima-soul
|
7369f60c06
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync
|
2021-12-03 17:30:45 -08:00 |
|
ultima-soul
|
3ed51d6d91
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-11-21 10:40:26 -08:00 |
|
ghoulslash
|
a2b8f3f169
|
replace gBattleMons[x].ability w GetBattlerAbility
|
2021-10-31 17:19:30 -04:00 |
|
GriffinR
|
fc15b0d5f0
|
Add controller buffer constants, finish misc battle doc
|
2021-10-13 16:21:39 -04:00 |
|
GriffinR
|
31b501e7eb
|
Start misc battle documentation
|
2021-10-08 16:39:46 -04:00 |
|
GriffinR
|
a66d7e1b43
|
Document some single-remaining symbols
|
2021-09-24 17:14:20 -04:00 |
|
ghoulslash
|
c3e28e9b1a
|
merge with be
|
2021-05-23 12:22:52 -06:00 |
|
ultima-soul
|
14a0303e2f
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-04-27 18:36:37 -07:00 |
|
GriffinR
|
9ea9ffde09
|
Add remaining multistring chooser constants
|
2021-04-03 11:49:06 -04:00 |
|
Evan
|
f3d975e239
|
merge with be
|
2021-02-12 08:59:55 -07:00 |
|
LOuroboros
|
fc04c6974b
|
Edit->Blank Operations->Trim Trailing Space for the win
|
2021-02-01 17:05:49 -03:00 |
|
Evan
|
7988a1f41d
|
Ai_TryOnAlly and reorganize files
|
2020-12-20 14:47:20 -07:00 |
|
Evan
|
37aeeae277
|
fix terrain bg on subsequent battle start
|
2020-12-05 20:25:03 -07:00 |
|
DizzyEggg
|
834b7b52d3
|
Merge with master
|
2020-02-08 09:38:29 +01:00 |
|
GriffinR
|
27c4329e45
|
Use friendship event constants
|
2020-02-04 12:16:15 -06:00 |
|
DizzyEggg
|
1d8cc9b741
|
Fix merge conflicts
|
2019-11-03 19:55:19 +01:00 |
|
GriffinR
|
e01ec84837
|
Document party_menu second pass
|
2019-10-31 03:25:56 -04:00 |
|
GriffinR
|
6db014cc32
|
Document party_menu first pass
|
2019-10-25 15:41:06 -04:00 |
|
DizzyEggg
|
bae5d2038f
|
Update with master
|
2019-10-10 16:18:48 +02:00 |
|
PikalaxALT
|
306ce048ad
|
Move gflib srcs and headers to gflib subdir
|
2019-09-08 21:07:54 -04:00 |
|
DizzyEggg
|
f8713f9c15
|
Merge with master
|
2019-04-06 20:43:13 +02:00 |
|
DizzyEggg
|
8751fafad1
|
Make it compile
|
2019-04-05 07:53:23 -05:00 |
|
DizzyEggg
|
944dc4f6bf
|
Merge with master
|
2019-04-01 13:40:42 +02:00 |
|
Marcus Huderle
|
462b196abc
|
Give battle_anim files appropriate names
|
2019-03-31 12:15:39 -05:00 |
|
DizzyEggg
|
2c3210f4d1
|
merge with master
|
2019-01-18 22:30:34 +01:00 |
|
DizzyEggg
|
edddd847c5
|
Document and clean up trainer hill
|
2019-01-13 20:50:08 +01:00 |
|
DizzyEggg
|
6fa5f33519
|
Merge branch 'master' into battle_engine_v2
|
2018-12-24 09:07:18 +01:00 |
|
DizzyEggg
|
9320fe8f85
|
Clear includes
|
2018-12-24 00:02:29 +01:00 |
|
DizzyEggg
|
e54dd6a02b
|
Merge with master
|
2018-12-22 13:53:07 +01:00 |
|
garak
|
e292d0ca83
|
Merge branch 'master' into fldeff
|
2018-12-16 20:05:31 -05:00 |
|
garak
|
b4312648e2
|
decompile fldeff_80F9BCC with data
|
2018-12-09 19:22:59 -05:00 |
|
DizzyEggg
|
180aa839c4
|
Fix conflicts
|
2018-12-09 13:12:02 +01:00 |
|
nullableVoidPtr
|
3909b6408c
|
Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325
Some of the INVALID_ are likely erroneously placed, due to lack of documentation
|
2018-12-06 09:44:08 +08:00 |
|
DizzyEggg
|
a69af8f2f5
|
Merge with master
|
2018-09-22 00:22:13 +02:00 |
|
DizzyEggg
|
66fd9b2ddf
|
Label trainer hill battle type
|
2018-09-20 22:00:00 +02:00 |
|
DizzyEggg
|
6f484c20ce
|
Final ai damage calc touches
|
2018-07-15 18:07:01 +02:00 |
|
DizzyEggg
|
b846015343
|
more battle files cleaning
|
2018-03-01 00:59:52 +01:00 |
|
DizzyEggg
|
96290f4ee3
|
pokemon and battle constants
|
2018-02-08 11:17:41 +01:00 |
|
DizzyEggg
|
caf9af321d
|
get rid of unnecessary externs
|
2018-02-08 00:00:25 +01:00 |
|
camthesaxman
|
6a4967689e
|
more renaming
|
2018-02-06 13:48:02 -06:00 |
|
camthesaxman
|
f78fa6aabf
|
rename bank to battler
|
2018-02-05 19:46:59 -06:00 |
|
camthesaxman
|
c3c13d0acf
|
more renaming
|
2018-01-16 15:12:38 -06:00 |
|
camthesaxman
|
157b88b6db
|
identity -> position
|
2018-01-16 14:01:31 -06:00 |
|
camthesaxman
|
19fbf024ff
|
fix merge conflicts
|
2017-12-05 12:42:30 -06:00 |
|
camthesaxman
|
00896cb3b5
|
rename rng.c to random.c and rom4.c to overworld.c
|
2017-12-05 12:27:33 -06:00 |
|
camthesaxman
|
caa13f8777
|
convert some constants to C headers
|
2017-12-05 11:55:48 -06:00 |
|
DizzyEggg
|
d75e7ace1d
|
label battle stuff
|
2017-12-02 14:08:55 +01:00 |
|