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
|
13672680b0
|
void pointer standarized
|
2022-07-29 10:52:35 -04:00 |
|
ultima-soul
|
0312c5be8b
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-11-27 21:38:26 -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 |
|
GriffinR
|
e3b6337c3a
|
Finish battle_anim_mons doc
|
2021-11-08 14:29:37 -05:00 |
|
GriffinR
|
28de627913
|
Add TRACKS_ALL, remove BGCntrlBitfield
|
2021-10-09 11:34:51 -04:00 |
|
GriffinR
|
a66d7e1b43
|
Document some single-remaining symbols
|
2021-09-24 17:14:20 -04:00 |
|
ultima-soul
|
5bab9474dc
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-03-22 23:08:19 -07:00 |
|
GriffinR
|
63a7828772
|
Document battle_controller_player.c
|
2021-01-22 20:03:27 -05:00 |
|
ExpoSeed
|
9e2c8a95c1
|
Sync bev2 with pret
|
2020-10-11 01:01:47 -05:00 |
|
GriffinR
|
5259898325
|
Replace POKEMON_SLOTS_NUMBER
|
2020-10-01 17:07:12 -05:00 |
|
DizzyEggg
|
2646f3b26a
|
Merge with master
|
2019-04-13 13:42:44 +02:00 |
|
Phlosioneer
|
50350cc2e1
|
Merge branch 'master' into contest-ai-cleanup
|
2019-04-07 20:20:22 -04:00 |
|
DizzyEggg
|
f8713f9c15
|
Merge with master
|
2019-04-06 20:43:13 +02:00 |
|
DizzyEggg
|
b0223f691f
|
Clean up data headers
|
2019-04-05 07:53:23 -05:00 |
|
Phlosioneer
|
1360b3a477
|
RGB Constants
|
2019-04-04 17:05:46 -04:00 |
|
Phlosioneer
|
3a2ea40188
|
Rename and document more contest setup functions
Also properly label the link contest flags variable, and label the
contest window ID's.
|
2019-04-03 17:24:32 -04:00 |
|
DizzyEggg
|
54ab6b43dc
|
Merge with master
|
2019-03-22 10:40:31 +01:00 |
|
Phlosioneer
|
49bef25856
|
Clean up the last extern functions
|
2019-03-02 03:18:08 -05:00 |
|
DizzyEggg
|
4827776a3c
|
Merge with master
|
2019-01-05 10:14:20 +01:00 |
|
Philipp AUER
|
55202eac24
|
rename coords to size in struct MonCoords
|
2019-01-04 19:59:55 -06:00 |
|
DizzyEggg
|
517573eb4b
|
Update with master
|
2018-12-26 17:46:51 +01:00 |
|
DizzyEggg
|
7f6f6c33ab
|
Fix BgAttributes
|
2018-12-26 13:05:02 +01:00 |
|
DizzyEggg
|
e54dd6a02b
|
Merge with master
|
2018-12-22 13:53:07 +01:00 |
|
Marcus Huderle
|
c74468fd11
|
Document a bunch of battle anim stuff
|
2018-12-17 22:16:17 -06:00 |
|
shinny456
|
60484153a5
|
decompile electric.s
|
2018-12-16 22:23:05 -05:00 |
|
DizzyEggg
|
a5df797804
|
Merge branch 'master' into battle_engine_v2
|
2018-11-19 20:42:07 +01:00 |
|
Marcus Huderle
|
72f0a079a9
|
Decompile all of battle_anim_utility_funcs
|
2018-11-19 09:37:25 -06:00 |
|
DizzyEggg
|
39f9b1ddf0
|
Experience on caught mon
|
2018-08-03 18:01:14 +02:00 |
|
DizzyEggg
|
c556358e47
|
label multiuse sprite template functions
|
2018-07-01 15:28:57 +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
|
caa36b530a
|
label and document battle windows
|
2018-06-17 16:48:58 +02:00 |
|
DizzyEggg
|
fed5f03097
|
get rid of unnecessary externs
|
2018-02-28 23:57:08 +01:00 |
|
Diegoisawesome
|
a4787bc06a
|
Merge pull request #207 from DizzyEggg/decompile_pokemon_123
Decompile and clean pokemon files
|
2018-02-11 22:13:15 -06:00 |
|
PikalaxALT
|
ea347199a2
|
Merge branch 'master' into link
|
2018-02-11 19:22:06 -05:00 |
|
DizzyEggg
|
2736c0fd4a
|
add more const pokemon data, clear include
|
2018-02-11 23:46:50 +01:00 |
|
DizzyEggg
|
fd17ca59b0
|
more pokemon work
|
2018-02-11 17:35:01 +01:00 |
|
DizzyEggg
|
ff6a0316c1
|
get rid of unnecessary externs
|
2018-02-09 01:09:02 +01:00 |
|
DizzyEggg
|
caf9af321d
|
get rid of unnecessary externs
|
2018-02-08 00:00:25 +01:00 |
|
DizzyEggg
|
5ac6cc4860
|
move battle vars to c file
|
2018-02-07 22:53:40 +01:00 |
|
camthesaxman
|
c3dc14ba66
|
more renaming
|
2018-02-06 16:09:39 -06: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
|
607cba8c2e
|
Merge branch 'master' into battle_refactor
|
2018-02-05 17:38:23 -06:00 |
|
PikalaxALT
|
d52f52fa73
|
Merge branch 'master' into link
|
2018-02-03 09:42:19 -05:00 |
|
DizzyEggg
|
db3ecf5012
|
decompile scanline effect
|
2018-01-29 17:47:12 +01:00 |
|
scnorton
|
c6ff1a6ce3
|
Merge branch 'master' into link
|
2018-01-18 12:53:31 -05: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 |
|
DizzyEggg
|
eb8055eb07
|
battle 1 is decompiled
|
2017-12-17 20:10:57 +01:00 |
|