Hedara
|
2b92ba315a
|
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
Conflicts:
include/battle_anim.h
include/battle_controllers.h
include/battle_gfx_sfx_util.h
include/battle_interface.h
include/battle_main.h
include/battle_script_commands.h
include/battle_util.h
include/easy_chat.h
include/event_object_movement.h
include/field_effect.h
include/field_effect_helpers.h
include/field_player_avatar.h
include/intro.h
include/item_use.h
include/metatile_behavior.h
include/move_relearner.h
include/pokedex.h
include/pokemon.h
include/pokemon_icon.h
include/roamer.h
include/script_pokemon_util.h
include/sprite.h
include/text.h
include/wild_encounter.h
src/battle_controllers.c
|
2025-05-24 20:38:21 +02:00 |
|
Bassoonian
|
59d315734d
|
Update header files to match source files (#2143)
|
2025-05-19 09:18:04 +01:00 |
|
Bassoonian
|
b56a9e6286
|
Remove unused function
|
2024-01-04 16:04:00 +00:00 |
|
Bassoonian
|
8e43b7d696
|
Debug Berry functions
|
2023-12-06 21:08:09 +01:00 |
|
Bassoonian
|
b02b3d074f
|
Add Mulch effects
|
2023-12-03 13:17:34 +01:00 |
|
GriffinR
|
22e2c0a47c
|
Document Berry Crush
|
2021-03-18 15:18:23 -04:00 |
|
GriffinR
|
0851c34bac
|
Add berry tree id constants
|
2021-02-05 15:25:12 -05:00 |
|
GriffinR
|
92bd6400b7
|
Fix up berry sparkle
|
2021-01-26 05:40:34 -05:00 |
|
GriffinR
|
ec3e86f1d2
|
Standardize Event Object to Object Event
|
2019-11-20 22:55:44 -05:00 |
|
GriffinR
|
06af24bce5
|
Use misc ScrCmd constants
|
2019-09-16 19:44:47 -05:00 |
|
DizzyEggg
|
dc764698c9
|
Use implicilt berry indexes in arrays
|
2019-04-14 10:15:18 -05:00 |
|
Marcus Huderle
|
b6ee970e7a
|
Minor berry.c cleanup
|
2018-12-31 16:53:38 -06:00 |
|
Slawter666
|
15117a8d09
|
Remove redundancy in berry.c
|
2018-11-06 23:15:57 +00:00 |
|
Slawter666
|
b7b1d609d0
|
More synchronisation
|
2018-10-17 13:52:26 +01:00 |
|
Marcus Huderle
|
aa9a45c16f
|
Rebrand 'map object' and 'field object' to 'event object'
|
2018-06-11 19:11:48 -05:00 |
|
Marcus Huderle
|
89edf6d9e9
|
Move all field object data into src/data and event_object_movement.c
|
2018-06-11 17:33:50 -05:00 |
|
DizzyEggg
|
237261e193
|
berry blender review changes
|
2017-11-27 20:03:41 +01:00 |
|
DizzyEggg
|
8fd3081306
|
start working on berry blender
|
2017-11-18 16:11:34 +01:00 |
|
scnorton
|
bf9e2b7210
|
split data3_a1
|
2017-09-25 15:03:52 -04:00 |
|
PikalaxALT
|
559833ccf6
|
Merge branch 'master' into field_map_obj
|
2017-09-16 15:41:54 -04:00 |
|
PikalaxALT
|
64ffa8f963
|
Merge branch 'master' into field_map_obj
|
2017-09-13 19:29:19 -04:00 |
|
DizzyEggg
|
5f4c5e280c
|
berry.s decompiled
|
2017-09-13 11:16:26 +02:00 |
|
scnorton
|
823f8d6a0c
|
get_berry_tree_graphics
|
2017-09-08 14:05:45 -04:00 |
|
DizzyEggg
|
4a1b2967ca
|
make lots of define files
|
2017-09-07 19:45:32 +02:00 |
|