ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,101 Commits 1 Branch 0 Tags 235 MiB
f1b9872bf0
Commit Graph

46 Commits

Author SHA1 Message Date
Eduardo Quezada
7c86bd5d08 Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826 
# Conflicts:
#	include/battle_interface.h
#	src/battle_anim_effects_1.c
#	src/battle_script_commands.c
#	src/field_specials.c
 2022-08-26 22:23:37 -04:00
DizzyEggg
622a7f8141 merge with master 2022-08-25 22:10:59 +02:00
DizzyEggg
a0ec8a5a80 4 digit hp in battle 2022-08-25 16:40:56 +02:00
DizzyEggg
7aa55f2753 better interface 1 player mon in double 2022-08-24 23:00:21 +02:00
GriffinR
c2d5dd2a1f Additional battle anim sync 2022-08-19 11:51:13 -04:00
Eduardo Quezada D'Ottone
fe63dafcc1 Merge branch 'battle_engine' into BE_pretmerge 
# Conflicts:
#	src/battle_anim_fire.c
#	src/battle_controller_player.c
 2022-07-20 08:50:30 -04:00
Eduardo Quezada D'Ottone
e791cf90ad Merge tag 'pretmaster' into BE_pretmerge2 
# Conflicts:
#	data/battle_anim_scripts.s
#	include/battle_anim.h
#	include/battle_controllers.h
#	include/battle_interface.h
#	include/battle_main.h
#	include/battle_setup.h
#	include/constants/battle_anim.h
#	include/constants/battle_string_ids.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_fire.c
#	src/battle_anim_normal.c
#	src/battle_controllers.c
#	src/battle_dome.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/pokemon.c
 2022-07-15 12:58:46 -04:00
GriffinR
34438e6bc4 Continue documenting generic arguments 2022-06-03 15:38:03 -04:00
GriffinR
5e6d8a77e4 Document some generic argument names 2022-05-31 14:34:25 -04:00
ExpoSeed
d6747527da Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-12-16 21:44:01 -06:00
ghoulslash
f342e7c590 merge with be 2021-10-28 17:03:10 -04:00
LOuroboros
d9b8e11a9c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE 2021-10-19 07:47:42 -03:00
ghoulslash
bbd09fdcf7 add wandering spirit 2021-10-12 10:32:51 -04:00
LOuroboros
91a68cd5db Implemented Primal Reversion 2021-10-09 00:36:41 -03:00
ghoulslash
c06029bc72 add last used ball 2021-06-25 13:37:59 -06:00
ghoulslash
d89e2c1775 merge with be 2021-04-02 08:55:54 -06:00
Evan
6139b12a49 fix hp boxes not dissapearing 2021-02-02 23:30:08 -07:00
Evan
e70e2bcd65 merge with be 2020-12-14 09:09:51 -07:00
Evan
348d70b309 z move indicator and some data 2020-11-26 15:56:18 -05:00
Evan
ef43596a79 toggleable manual ability popup destruction 2020-11-19 15:16:27 -07:00
DizzyEggg
f19ba68cb9 Fix mega indicator sprite overwriting ram 2020-06-24 12:55:08 +02:00
DizzyEggg
c97869018d Fix Mega Indicator appearing and priority 2019-08-25 15:33:28 +02:00
DizzyEggg
d0f91a996d Tweak up mega evo 2019-05-02 23:10:01 +02:00
DizzyEggg
e54dd6a02b Merge with master 2018-12-22 13:53:07 +01:00
Marcus Huderle
d1e6e705cc Decompile battle_anim_effects_1.c 2018-12-16 11:39:22 -06:00
DizzyEggg
65036b9a09 Merge with master 2018-11-15 21:53:32 +01:00
Slawter666
6fcf878e2f Tidy up header files 2018-11-13 22:28:46 +00:00
DizzyEggg
731ff38067 Ability pop-up functionality is done 2018-09-29 12:47:35 +02:00
DizzyEggg
6b7a171dbe Ability pop-up fail, maybe will do something about it later 2018-09-23 14:24:06 +02:00
DizzyEggg
d05875dd04 New mega trigger sprite 2018-09-20 20:59:00 +02:00
DizzyEggg
602c1322e4 almost full support for link battles mega evolution 2018-09-20 11:23:12 +02:00
DizzyEggg
add1f4910c Add mega trigger png 2018-09-17 22:40:49 +02:00
DizzyEggg
38c89b9d0f Bank to battler 2018-09-01 18:36:08 +02:00
DizzyEggg
272b98da6c document party status summary 2018-06-28 21:06:32 +02:00
DizzyEggg
94752d4207 document battle bars 2018-06-19 00:43:15 +02: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
DizzyEggg
6c8155074b battle 7 is decompiled 2017-11-04 16:11:13 +01:00
DizzyEggg
df4e32a307 player battle controller is done 2017-10-22 18:43:15 +02:00
DizzyEggg
3d1c16523e start working on battle controllers, especially player 2017-10-21 17:32:35 +02:00
DizzyEggg
b65da491a9 merge with master, fix conflicts 2017-10-20 10:49:21 +02:00
DizzyEggg
9ccc472b97 label some functions 2017-10-19 18:25:48 +02:00
DizzyEggg
11bead31e9 battle interface is done 2017-10-19 15:28:41 +02:00
DizzyEggg
ee6bdc9068 more battle interface 2017-10-18 23:52:21 +02:00
DizzyEggg
752ce9b90d start working on battle anim 2017-10-14 16:55:25 +02:00
DizzyEggg
ab03b03c4b decompile reshow battle screen 2017-10-09 18:18:40 +02:00