Alex
76eae8ed00
Decouple Poke Ball ids from item ids ( #5560 )
2024-10-28 18:03:15 +01:00
Eduardo Quezada
ddc752eb14
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# asm/macros/event.inc
# data/field_effect_scripts.s
# data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
# data/script_cmd_table.inc
# graphics/pokemon/castform/sunny/anim_front.png
# graphics/pokemon/castform/sunny/normal.pal
# include/battle_util.h
# include/constants/event_object_movement.h
# include/constants/field_effects.h
# src/battle_controller_player.c
# src/battle_util.c
# src/data/object_events/movement_action_func_tables.h
# src/data/object_events/object_event_pic_tables.h
# src/data/trainer_graphics/back_pic_anims.h
# src/daycare.c
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/load_save.c
# src/scrcmd.c
# src/trainer_see.c
2024-01-17 18:11:35 -03:00
DizzyEggg
156aa59f18
start removing gActiveBattler in controller emitters
2023-08-29 15:21:31 +02:00
Martin Griffin
0e5c78aeb6
Merge remote-tracking branch 'pret/master' into 'rhh/master'
2023-07-25 19:49:18 +01:00
Bassoonian
7fa6ed8b05
Fix priortiy typos
2023-07-19 17:33:28 +02:00
Eduardo Quezada
341ce6fd95
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
...
# Conflicts:
# .github/workflows/build.yml
# README.md
# gflib/sprite.c
# graphics/pokemon/banette/anim_front.png
# graphics/pokemon/banette/normal.pal
# graphics/pokemon/sentret/normal.pal
# graphics/pokemon/togetic/anim_front.png
# graphics/pokemon/togetic/normal.pal
# include/battle_script_commands.h
# include/data.h
# ld_script.txt
# src/battle_controller_player.c
# src/bike.c
# src/event_object_movement.c
2023-06-16 21:25:16 -04:00
Ariel A
7edb7bbc23
Added battle slide-in animation for Pokemon follower.
2022-08-16 19:52:38 -04:00
Eduardo Quezada
f3bebcd12c
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
...
# Conflicts:
# include/battle_anim.h
# include/global.h
# include/pokemon.h
# src/battle_message.c
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
2022-07-22 22:57:02 -04:00
GriffinR
34438e6bc4
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
ultima-soul
a8f9a54787
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-11-21 10:41:32 -08:00
GriffinR
ef2971d8dc
Convert GF ROM header to C
2021-11-01 01:42:02 -04:00
LOuroboros
554210c5e3
Removed trailing spaces in the most relevant files
...
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g'
Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
ultima-soul
9e0b866f09
Rearranged Poke Ball item ids.
2021-06-18 21:46:20 -07:00
ultima-soul
7abfe7469a
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-03-23 18:41:53 -07:00
GriffinR
63a7828772
Document battle_controller_player.c
2021-01-22 20:03:27 -05:00
DizzyEggg
271219f962
Merge with master
2020-09-08 12:00:51 +02:00
hondew
328aecc96e
Document throwing pokeball
...
continue
Document more
Doc more funcs
Remove workspace
Document shiny stars
Document PokeBlock
Clean up
Clean more
2020-08-30 14:08:06 -04:00
DizzyEggg
1d10d44a4d
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion
2019-10-19 15:17:45 +02:00
GriffinR
2c062dc764
More trade documentation
2019-10-09 05:56:44 -04:00
DizzyEggg
9ca2af0ce9
More pokeballs expansion
2019-04-14 12:13:44 +02:00
DizzyEggg
38c89b9d0f
Bank to battler
2018-09-01 18:36:08 +02:00
Diegoisawesome
a07d69d7c2
Finish pokemon_summary_screen
2018-08-14 22:00:35 -07:00
DizzyEggg
2fe25da65a
move pokeball data to rom
2017-12-02 21:27:00 +01:00
DizzyEggg
c2fdde3a49
pokeball file is decompiled
2017-12-02 20:38:26 +01:00
DizzyEggg
c27f7a8131
start working on pokeball
2017-12-02 19:39:07 +01:00
DizzyEggg
df4e32a307
player battle controller is done
2017-10-22 18:43:15 +02:00
