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
Alex
5fa1bffa8d
Adds Glaive Rush, fixes for Plasma Fists and Relic Song (#3476) 
* Adds Glaive Rush

* Fixes: Glaive Rush status is removed until users next turn

* Glaive Rush no affect

* simplify glaive rush script

* simlify script further

* leftover

* Fix Plasma Fists and Relic Song + tests

* Callnative for Plasma Fists

* Use Status Field Ion Deludge for Plasma Fists

* add assumes for flinch_status

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-11-18 15:19:38 +01:00
SnorlaxMonster
190e77e9c8 Rename HITMARKER_IGNORE_SAFEGUARD 
Rename HITMARKER_IGNORE_SAFEGUARD to HITMARKER_STATUS_ABILITY_EFFECT.
This flag is used exclusively by status-inflicting Abilities,
and has 3 main functions:
- Whether the effect bypasses Shield Dust
- Whether the effect bypasses Safeguard
- Which text string to display when the status condition is inflicted
   (i.e. whether it was inflicted by a move or Ability)

I believe this new name better represents what the flag actually does.
This name was structured to parallel HITMARKER_SYNCHRONISE_EFFECT.
 2023-11-18 13:57:50 +11:00
Frank DeBlasio
8981897c9b
Fixed logic to allow Shadow Tag to work (#3549) 
* Fixed logic to allow Shadow Tag to work

* Fixed which boolean is changed

* Reverted boolean change and updated B_SHADOW_TAG_ESCAPE comparison

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-11-16 21:36:04 +01:00
kittenchilly
85e75a72c6
Update affection mechanics to gen 8+ (#3495) 
* Update affection mechanics to gen 8+

* Update battle.h

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-11-14 21:29:38 +01:00
Alex
4b3c96a89b
Adds ability Zero to Hero (#3542) 2023-11-09 08:25:46 -03:00
Eduardo Quezada
57c1dd97bb Merge branch 'RHH/master' into RHH/upcoming 2023-11-03 21:59:08 -03:00
DizzyEggg
8b359c2ca4
fix psychic terrain blocking moves it shouldnt block (#3521) 2023-11-03 21:01:02 +01:00
DizzyEggg
90d9334f0b
Fix Sap Sipper not blocking Bullet Seed (#3516) 
* Fix Sap Sipper not blocking bullet seed

* add defiant sticky web test
 2023-11-02 11:43:06 +01:00
DizzyEggg
47341f3f30
Fix Anger Shell activation (#3508) 2023-11-01 14:55:50 +01:00
Alex
64ba52d214
Remove redundant AI score increases (#3504) 
* Remove redundant AI score increases

* review applied

* fix score
 2023-10-31 13:41:22 +01:00
Eduardo Quezada
e28d0c627a Merge branch 'RHH/master' into RHH/upcoming 2023-10-30 16:51:04 -03:00
DizzyEggg
72dad4d7c6
Fix Weak Armor interrupting multi hit moves (#3497) 2023-10-30 16:44:42 -03:00
kittenchilly
5087095aae
Obedience levels now increase per badge (#3475) 2023-10-27 19:17:17 -03:00
Eduardo Quezada D'Ottone
db00839d64
Fixes Syrup bomb, new Octolock script, some Intim changes + Tests (#3437) 2023-10-27 12:25:55 -03:00
Alex
57a99e9be6
Fixes dynamax move target and canceling in doubles (#3470) 2023-10-27 10:38:40 -03:00
Alex
f6781a77d4 merge rhh/upcoming 2023-10-25 09:42:19 +02:00
Martin Griffin
74c08dc955 Merge remote-tracking branch 'rhh/master' into upcoming 2023-10-24 08:58:02 +01:00
Martin Griffin
5fe564f014
Detect 'NOT x; NOT y;' (#3459) 
Fix Purifying Salt to be immune to statuses from secondary effects.
 2023-10-24 09:55:32 +02:00
Eduardo Quezada D'Ottone
26971fc3ac
Add species defines for base forms with names (#3248) 
* Fixed Aegislash test not being properly made.
* Added conditions to BattleSetup_StartLegendaryBattle switch
 2023-10-23 12:59:15 +01:00
GriffinR
ffdc2456cb Document datahpupdate 2023-10-20 12:50:32 -04:00
Alex
ab6c5bafe9 New function to check ability stat loss 2023-10-20 12:29:55 +02:00
kittenchilly
33a0fdbbc6
Add new move flags and update all flags for every move (#3425) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-10-19 20:16:37 -03:00
Eduardo Quezada D'Ottone
14b7a70254
Dynamax (#2417) 2023-10-19 11:32:25 -03:00
Eduardo Quezada
6348c24be1 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	src/battle_script_commands.c
 2023-10-19 08:10:49 -03:00
Alex
ceb6beb254 merge upcoming 2023-10-19 12:30:55 +02:00
Eduardo Quezada D'Ottone
d153947aa2
Merge branch 'upcoming' into dynamax 2023-10-18 19:37:09 -03:00
Alex
91b6722322 Octolock, more tests 2023-10-18 20:25:34 +02:00
kittenchilly
70985ed3d6
Fixed and more accurate Ruin abilities (#3415) 2023-10-18 08:29:53 -03:00
sbird
b77bc71862 fix -Warray-parameter, -Waddress, -Warray-bounds warnings 
those are introduced by some compiler between gcc 10 and gcc 13
when using -Wall
 2023-10-16 09:36:36 +01:00
Eduardo Quezada
c0540a3559 Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax 
# Conflicts:
#	include/battle.h
#	include/constants/battle_move_effects.h
#	include/constants/battle_string_ids.h
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
 2023-10-15 00:30:00 -03:00
Eduardo Quezada
a936b78ad5 Merge branch 'RHH/master' into RHH/upcoming 2023-10-14 21:32:20 -03:00
LOuroboros
b46c2c2bf8
Made AbilityBattleEffects use the B_MSG_TERRAIN constants for the field terrain intro text (#3410) 2023-10-14 10:23:45 +02:00
Alex
1ae26b32e6
Fix Kee Berry and Custap Berry + Tests (#3409) 
* Fix Kee Berry and Custap Berry + Tests

* add missing assumes

* fix wrong test files

* fix new line
 2023-10-13 23:07:04 +02:00
DizzyEggg
a7b9d139da
Fix Wall Werrors on modern (#3412) 
* Fix Wall Werror errors

* fix hgss pokedex modern errors

* tests build on modern

* learnset change

* Update src/battle_ai_util.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/battle_anim_new.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/pokedex_plus_hgss.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* review changes

* unused cmd args

* various args back

---------

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
 2023-10-13 18:39:35 +02:00
Alex
6ed8ab771b Fix Syrup Bomb and change Octolock 2023-10-13 14:08:44 +02:00
Martin Griffin
311224d32f
Converted most battle preproc ifs to regular ifs (#3392) 2023-10-12 15:28:41 +01:00
Eduardo Quezada
805c65b255 Merge branch 'RHH/master' into RHH/upcoming 2023-10-11 13:14:23 -03:00
Eduardo Quezada
482029d7ec Removed Transistor from master 2023-10-11 13:07:16 -03:00
Eduardo Quezada
186884120c Merge branch 'RHH/master' into RHH/upcoming 2023-10-11 13:02:12 -03:00
Eduardo Quezada D'Ottone
eedc61709d
Various tests + Poison Heal fix + Transistor update (#3385) 2023-10-11 11:34:20 -03:00
Alex
0b9126ff53
Adds moves Matcha Gotcha, Syrup Bomb and Ivy Cudgel (#3402) 
* initial commit

* done

* clean up
 2023-10-11 11:09:50 +02:00
Eduardo Quezada
8f4c1e9a11 Frostbite NonDynamaxMaxHP to mimic Burn 2023-10-10 09:15:36 -03:00
ghoulslash
70fbf9e9df
Opportunist Ability (#2994) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-10-09 22:35:00 -03:00
Eduardo Quezada
2fac60055f Merge branch 'RHH/master' into RHH/upcoming 2023-10-09 22:08:32 -03:00
Eduardo Quezada
92301398bc Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax 
# Conflicts:
#	asm/macros/battle_script.inc
#	data/battle_anim_scripts.s
#	data/battle_scripts_1.s
#	include/battle.h
#	include/battle_controllers.h
#	include/battle_interface.h
#	include/config/battle.h
#	include/constants/battle.h
#	include/constants/battle_anim.h
#	include/constants/battle_move_effects.h
#	include/constants/battle_string_ids.h
#	include/data.h
#	include/random.h
#	sound/cry_tables.inc
#	src/battle_anim_new.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/pokemon/form_change_table_pointers.h
#	src/data/pokemon/species_info.h
#	src/data/text/move_names.h
#	test/test_runner_battle.c
 2023-10-09 16:51:41 -03:00
Eduardo Quezada D'Ottone
9ed7fe1c94
Made Gen6 exp share easier to understand (#3384) 2023-10-09 12:15:13 +02:00
Eduardo Quezada D'Ottone
25540a7fec
Fixed Rivalry's effect + Tests (#3381) 
- It was doing the opposite if neither attacker or target were genderless
- It wasn't accounting for genderless mon
 2023-10-09 12:14:18 +02:00
Eduardo Quezada
d1c672d3ce Converted most battle preproc ifs to regular ifs 2023-10-08 21:32:15 -03:00
Petuuuhhh
fd19c261d2
Add calculation boosts for Light Ball and Sandstorm (#3387) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-10-07 22:30:16 -03:00
Bassoonian
cee84f0f74 Fix issues and add more ability tests 2023-10-06 15:13:26 +02:00