ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-22 21:48:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,566 Commits 1 Branch 0 Tags
Commit Graph

47 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
023cc4d38d
Fixed erroneous uses of non e-reader Enigma Berries (#2839) 2023-03-23 09:58:26 +01:00
Eduardo Quezada
90021f3be6 Removed zMovePower field in gBattleMoves in favor of a function. 2023-02-27 23:49:43 -03:00
Eduardo Quezada D'Ottone
ec343cef02
Config to have Shuckle make Berry Juice from Oran Berries (#2331) 
* Removed unused ifdefs and made actually check for Z Power Ring

* Config to have Shuckle make Berry Juice from Oran Berries

* Ordered species-specific configs
 2023-02-19 10:45:59 +01:00
Alex
2b32bfcdc1 add battlerId arg to ShowZMoveTriggerSprite 2023-02-12 19:39:14 +01:00
Alex
d363ed8152 z indicator in double battles 2023-02-11 19:55:08 +01:00
ghoulslash
1037613b0e
Merge pull request #2418 from LOuroboros/zPP 
Made Z-Moves unusable without PP
 2022-11-28 09:52:28 -05:00
Eduardo Quezada
011ec16f1e Organized conffig files into their own folder and cleaned up 2022-11-14 11:03:49 -03:00
LOuroboros
bdd082f869 Made Z-Moves unusable without PP 2022-10-29 12:07:59 -03:00
Eduardo Quezada D'Ottone
bb564d805f
Merge pull request #2353 from LOuroboros/siTypes 
Fixed Z-Moves showing the wrong type in battle
 2022-09-24 10:36:38 -03:00
LOuroboros
696d90880e Made Z-Moves always show the right type 2022-09-24 09:33:31 -03:00
LOuroboros
64405250ae
Updated IsViableZMove 2022-09-24 08:50:48 -03:00
Eduardo Quezada
de32940fdf Further removed trailing whitespaces 2022-09-13 16:26:36 -03:00
Eduardo Quezada
1f5adf93c7 Cleaned up use of configs be almost exclusively preproc functions 2022-08-23 21:00:08 -04:00
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
2b7a2c4d09 Merge remote-tracking branch 'RHH/battle_engine' into MergedBranchUltimate 2022-08-22 17:30:48 -04:00
ghoulslash
eb0cc91dce
Merge pull request #2224 from AsparagusEduardo/BE_cosntantsZmove 
B_WIN constants in battle_z_move.c
 2022-08-08 21:13:23 -04:00
LOuroboros
80057fc990
Update battle_z_move.c 2022-08-07 10:19:03 -03:00
Eduardo Quezada D'Ottone
08f08ece98 B_WIN constants in battle_z_move.c 2022-08-04 15:35:08 -04:00
ExpoSeed
49da2ee53f Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION 2022-08-02 00:15:55 -05:00
Eduardo Quezada D'Ottone
25397e5794 Fixed Light That Burns The Sky not using the calculated damage category 
Also:
- Modified move defines to ease with future move expansion.
- Enabled Instruct's check for Z Moves in AI_CheckBadMove.
 2022-07-21 15:13:00 -04:00
ghoulslash
f2ee9f3ba0 tweak z indicator position relative to healthbox 2022-07-18 09:44:04 -04:00
ghoulslash
18affe8c1a new z move indicator, credits to blackforest 2022-07-18 09:21:59 -04:00
ghoulslash
f6b6ab56be some style fixes 2022-07-17 19:16:13 -04:00
ghoulslash
6b84a9f0b3 merge w be 2022-07-17 12:40:43 -04:00
ghoulslash
9b5aee3b93 fix z stat-boosts 2022-07-17 12:17:54 -04:00
ExpoSeed
5fd468f507 Review comments. Commented code removed, ShouldAIUseZMove moved to battle_ai_util and renamed to be consistent with other fns 2022-03-22 13:10:24 -05:00
ExpoSeed
0f99d9d4c6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-08-30 13:26:40 -05:00
ExpoSeed
4d6e64b336 Review comments. 2021-06-10 11:48:26 -05:00
ghoulslash
c356ffaed4 merge with be. fix null ptr check in GetBattleMoveSplit 2021-05-24 10:46:53 -06:00
ghoulslash
26ada22762
Update src/battle_z_move.c 
Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com>
 2021-03-01 16:38:54 -07:00
ghoulslash
fa32603e73
Update src/battle_z_move.c 
Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com>
 2021-03-01 16:38:49 -07:00
ghoulslash
d686bab213
Update src/battle_z_move.c 
Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com>
 2021-03-01 16:38:41 -07:00
ghoulslash
b663eb7188
Update src/battle_z_move.c 
Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com>
 2021-03-01 16:38:32 -07:00
ghoulslash
0ef91d4601
Update src/battle_z_move.c 
Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com>
 2021-03-01 16:36:39 -07:00
Evan
0483114a05 merge and some fixes 2021-02-02 11:45:15 -07:00
Evan
8ef6a2c80d merge with be 2021-01-13 14:23:30 -07:00
Evan
25abdeacc5 tidy up z move code 2020-12-01 16:36:44 -05:00
Evan
f54cd0b25d fix z effect scripts 2020-12-01 15:35:39 -05:00
Evan
9755923cc3 light that burns the sky split, fix electric z move anims 2020-12-01 14:44:45 -05:00
Evan
ce19e33cc4 handle double and multi battles 2020-12-01 13:43:15 -05:00
Evan
fd8951d040 trainer z move ai 2020-12-01 08:24:33 -05:00
Evan
a0bde70493 z move effects 2020-11-30 10:55:46 -05:00
Evan
71857f4c89 secondary id for type-z moves, fix signature z move loading 2020-11-29 10:16:01 -05:00
Evan
f114534ae3 z move anim/effect, black hole eclipse anim 2020-11-28 13:09:43 -05:00
Evan
2b1dfe73cf z move unleash anim, fix active/used flags 2020-11-27 23:38:29 -05:00
Evan
4060b09bd6 expand top left move window. add z move init anim 2020-11-27 17:06:36 -05:00
Evan
348d70b309 z move indicator and some data 2020-11-26 15:56:18 -05:00