Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,854 Commits 1 Branch 0 Tags
Commit Graph

2251 Commits

Author SHA1 Message Date
Martin Griffin
17f8f50a59 Merge remote-tracking branch 'rhh/master' into upcoming 2023-07-16 07:46:34 +01:00
Martin Griffin
58ede15263
Fix Roullout Fury Cutter AI power calc (#3110) 2023-07-16 06:45:35 +01:00
DizzyEggg
2a249654e7 fix mirror move/metronome powder/multi hit moves & tests 2023-07-15 14:00:55 +02:00
DizzyEggg
0c0b841a80
Remove debug item effect override (#3106) 2023-07-13 18:47:01 -04:00
sbird
6482279fa3 [battle, math] refactor damage calculation to use proper fp type and inlined multiplication 2023-07-07 18:51:23 +02:00
DizzyEggg
9a09f1e3b9 Fix Roullout Fury Cutter AI power calc 2023-07-06 13:41:16 +02:00
ghoulslash
cc3a6d4d94
make special case ABILITYEFFECT_xx ids their own caseId switch cases to fix potential overlap with ability IDs 0xFF etc (#3083) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-07-03 10:03:50 +02:00
Eduardo Quezada D'Ottone
1fa9a05470
Convert move flags and bans into GCC bitfields (#2952) 
* Slicing moves to new bitfield

* Wind moves to new bitfield

* Two-strike moves to new bitfield

* Forgot to add flagTwoStrikes to battle_moves.h

* Removed "flag" from field names

* FLAG_HIT_IN_SUBSTITUTE and FLAG_THAW_USER

* Airborne moves

* FLAG_POWDER, FLAG_TARGET_ABILITY_IGNORED and FLAG_DANCE

* FLAG_BALLISTIC and FLAG_PROTECTION_MOVE

* Fixed missing uses of MOVE_UNAVAILABLE in battle_ai_util.c

* FLAG_SOUND

* FLAG_DMG_UNDERGROUND and FLAG_DMG_UNDERWATER

* FLAG_DMG_MINIMIZE

* Cleanup

* FLAG_STAT_STAGES_IGNORED

* Updated Pollen Puff's ballistic flag

* FLAG_STRONG_JAW_BOOST and FLAG_MEGA_LAUNCHER_BOOST

* thaw

* FLAG_THREE_STRIKES

* FLAG_IRON_FIST_BOOST

* FLAG_RECKLESS_BOOST

* FLAG_HIGH_CRIT

* Removed empty flags

* Moves that fail when called by Me First + added missing Shell Trap

* Moves that fail when Gravity is active

* Better names for banned fields

* Moves that fail when called by Instruct

* Cleanup

* Contact Moves + Fixed Wandering Spirit skipping contact checks

* Inverted FLAG_PROTECT_AFFECTED so that there's a flag for moves that SKIP protect.

* Simplified B_MOVE_FLAGS configs

* FORBIDDEN_METRONOME

* Renamed hitsPastSubstitute to ignoresSubstitute

* FORBIDDEN_PARENTAL_BOND

* Struggle uncallable by Metronome

* FORBIDDEN_MIMIC

* FLAG_KINGS_ROCK_AFFECTED

* Made a single config for move flags

* Macro for checking move flags

* FLAG_MAGIC_COAT_AFFECTED

* Fixed HasMagicCoatAffectedMove

* FLAG_SNATCH_AFFECTED

* Removed unused EFFECT_FLINCH_MINIMIZE_HIT

* Fixed Stench/King's Rock interaction

* Removed sMovesNotAffectedByStench in favor of checking move effects

* Removed EFFECT_TWISTER, which was a repeat of EFFECT_FLINCH_HIT

* Changed Gen2 configs to less than Gen 3

* FORBIDDEN_SLEEP_TALK

* Cleanup

* Inverted FLAG_MIRROR_MOVE_AFFECTED

* FLAG_SHEER_FORCE_BOOST

* Ordered

* FORBIDDEN_ASSIST and FORBIDDEN_COPYCAT

* Removed TestMoveFlags and TestMoveFlagsInMoveset + flags field

* Fixed Triple Arrows test
 2023-07-03 10:01:59 +02:00
Eduardo Quezada
ca1d9f5393 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	include/battle_util.h
 2023-06-21 15:01:14 -04:00
ghoulslash
7371a9e401
Add many gen 8 move animations (#2861) 
* port many gen8 and 9 move anims from cfru

* fix thunder cage, shell smash, shelter anims. update anim credits

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-06-21 13:19:54 -04:00
Pawkkie
62ae3b1df1
Fix bug due to variable overflow when AI chooses new Pokemon to send out (#3068) 2023-06-21 12:59:30 -04:00
LOuroboros
2bf88502a7 More corrections 2023-06-19 04:18:53 -03: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
LOuroboros
9896f20eb8 Applied fixes and corrections (Jun 2023) 2023-06-15 09:22:26 -03:00
LOuroboros
313f522622 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch2 2023-06-13 05:44:37 -03:00
BuffelSaft
2e08277a4e
Fixes Triple Kick effect and Z move damage calc (#2983) 2023-05-31 22:25:16 +12:00
Alex
5a384f9090 Fixes Triple Kick effect and Z move damage calc 
minor correction to the z-move fix

Add comment to EFFECT_TRIPLE_KICK
 2023-05-29 15:28:40 +02:00
AgustinGDLV
3d4789c492 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-05-28 11:10:50 -07:00
Eduardo Quezada D'Ottone
d0e6ea7612
Optimized battle gender checks (#3020) 
* Optimized battle gender checks

* Apply suggestions from code review

Co-authored-by: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com>

---------

Co-authored-by: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com>
 2023-05-27 17:23:02 -04:00
AgustinGDLV
5a8715e608 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into castform_fix 2023-05-23 16:10:44 -07:00
AgustinGDLV
6a92caa9fb removed old B_WEATHER_FORMS use, tests now have assumptions for config 2023-05-23 16:10:26 -07:00
AgustinGDLV
d4c7e5e559 changed B_WEATHER_FORM preproc to affect tables instead of function 2023-05-23 14:03:38 -07:00
Alex
109b4c4f6c
Small clean up: EndTurnTerrain, BattleScript_GrassyTerrainHeals (#3018) 
remove leftover
 2023-05-20 15:58:55 -04:00
Alex
a0881b8e8d
Terrains freeze the game after player mon faints (#3016) 2023-05-20 11:10:45 -04:00
ghoulslash
487415e56b
Move direct statStage boosts to use statbuffchange (#3000) 
* fix double counting stat boosts for download, moxie beast boost etc

* speed boost use statbuffchange

* BattleScript_MoveStatDrain use statbuffchange

* statbuffchange for rage

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-05-17 11:22:23 -04:00
AgustinGDLV
d133564e21 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-05-16 21:57:06 -07:00
AgustinGDLV
b269cc6906 changed gastro acid check to properly use GetBattlerAbility 2023-05-16 16:37:18 -07:00
AgustinGDLV
785b100693 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into castform_fix 2023-05-16 16:29:38 -07:00
AgustinGDLV
0c182345bf reworked weather form reversion + added more tests 2023-05-16 16:24:25 -07:00
Eduardo Quezada D'Ottone
2aca82300c
Merge branch 'upcoming' into mega_evo_issues 2023-05-14 22:33:01 -04:00
Eduardo Quezada D'Ottone
447739d005
Fix shiny animation not respecting Illusion mon target and Imposter revealing opponent ability (#2985) 2023-05-14 22:16:58 -04:00
Eclipse
76379661d0
Fixed mons mot disobeying with Gen8 mechanics disabled (#2990) 2023-05-14 22:09:45 -04:00
AgustinGDLV
aec51b5b04 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-05-11 20:02:06 -07:00
Salem
8fc4aa9dcd
Remove duplicate CanBePoisoned condition (#2988) 2023-05-10 18:16:57 -04:00
Ultimate Bob
64c2eb39c0 Ignore Illusion if the pokemon is the last slot in the party. 2023-05-09 02:33:12 +10:00
Salem
fe5e59c910
Merge branch 'upcoming' into RHH/content/gen9SnowWeather 2023-05-07 17:27:58 +02:00
Eduardo Quezada D'Ottone
c530eb2445
Add mirror herb (#2873) 2023-05-06 21:20:37 -04:00
AgustinGDLV
a5f28afe42 fixed Forecast and Flower Gift 2023-05-04 17:04:54 -07:00
CallmeEchoo
eb5b81684c refactored snow into damaging weather 
this is necessary for ice body to properly work.
doesnt actually do any damage
 2023-05-05 01:38:12 +02:00
Bassoonian
1068ec5d9f Fix Plus/Minus to only work with special moves 2023-05-03 13:03:40 +02:00
Salem
a877266400
Merge branch 'upcoming' into RHH/content/gen9SnowWeather 2023-05-02 21:19:01 +02:00
Alex
dd43d62a12
Fixes Triple Dive effect (#2947) 2023-05-02 15:06:21 -04:00
CallmeEchoo
c6fbde6d5c remove stupidity 
for some reason I added the 50% def increase in snow check twice? this removes that
 2023-05-02 16:25:26 +02:00
CallmeEchoo
76721b16f8 add snow weather 2023-05-02 16:25:26 +02:00
ghoulslash
445e9c4b8b merge w upcoming 2023-05-01 12:05:07 -04:00
ghoulslash
8cce130643
Add Frostbite status (#2942) 2023-05-01 09:45:47 -04:00
Bassoonian
39b50d09dd Add missing CanGetFrostbite 2023-05-01 11:19:10 +02:00
ghoulslash
62ca66bc6b
Refactoring Battle Form changes into the form change tables (#2411) 2023-04-30 08:41:54 -04:00
ghoulslash
b30dad3e7a
Fix anger shell activating when fainted (#2945) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-04-29 21:56:23 -04:00
Bassoonian
c82c2c185e Integrate ghoul's review 
Co-Authored-By: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
 2023-04-29 18:29:50 +02:00