atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14131 commits 2 branches 40 tags 600 MiB
Commit graph

14131 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nephrite
1708c80200
Removed ALWAYS_CRIT, renamed critBoost (#3779) 
Replaced ALWAYS_CRIT with an alwaysCriticalHit flag to account for the fact that in earlier generations, there is no crit stage at which crits are guaranteed. Renamed critBoost to criticalHitStage (at Edu's prompting). Reorder .criticalHitStage defines in battle_moves.h to be aligned with struct order.
 2023-12-20 16:16:02 +01:00
DizzyEggg
6137db102e
Ally Switch (#3533) 
* ally switch move animation

* Ally Switch anim done

* ally switch test and improve animation

* derp

* add ally switch known failing test for ally targeting moves

* moves which targetted ally fail after ally switch

* ally switch works like protect

---------

Co-authored-by: root <root@LAPTOP-3SNV7DEQ>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-20 15:26:28 +01:00
DizzyEggg
8d238c88b9
Follow -1, 1, 0 convention for comparision functions (#3777) 
* change comparision functions to use -1, 1, 0

* m
 2023-12-20 14:47:14 +01:00
Martin Griffin
50cbcebc81 Merge remote-tracking branch 'rhh/master' into upcoming 2023-12-20 12:56:35 +00:00
Alex
1e25b53433
Partner Battle refactor (#3592) 
* Partner Battle refactor

* fix for steven id

* clean up

* Use trainer partner names for id

* removed testing leftover

* comment change

* more review changes

* fix compiling

* remove partener count

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-20 12:38:28 +01:00
DizzyEggg
3b7782ed49
Clear BattleScripting struct at the battle start (#3776) 2023-12-20 10:48:52 +00:00
Alex
069769710b
Fixes Item Metronome damage (#3767) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-20 11:24:12 +01:00
kittenchilly
bb94d302ae
Add Meteorite form change functionality (#3770) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-20 10:33:08 +01:00
Eduardo Quezada D'Ottone
442620cf6b
Renamed Battle Move "Split" to the proper "Category" (#3774) 2023-12-20 10:08:26 +01:00
Martin Griffin
eee5be704c
Realign battleanim array with battlemove array. (#3769) 2023-12-19 18:24:24 +00:00
Martin Griffin
13a4bf5838 Merge remote-tracking branch 'rhh/master' into upcoming 2023-12-19 18:08:13 +00:00
Zimmermann Gyula
df447c48d3 Realign battleanim array with battlemove array. 2023-12-19 19:03:23 +01:00
Martin Griffin
982cc7539d
EXPECT_MUL_EQ thresholds are always at least ±1 (#3768) 2023-12-19 15:34:18 +00:00
kittenchilly
c16d85e497 EXPECT_MUL_EQ thresholds are always ±1 2023-12-19 09:21:18 -06:00
Nephrite
4a1a6c5625
Battlemove refactored (recoil, crit and Z moves) (#3575) 
* Unified EFFECT_RECOIL

Combined EFFECT_RECOIL_25/33/50/33_STATUS into a single EFFECT; added an extra field to BattleMove 'secondaryData' that contains the franction of HP recoil; argument still holds status effect for Flare Blitz/Volt Tackle

* BattleMove struct change

Added critrate, recoil, multihit fields, made zMove into a union of effect/powerOverride for status/non-status moves respectively. Added new recoil field and zMove field to all moves. To-do: crit rate, multihit

* Critrate field added

Moves use a critRate field instead of a flag - obsoletes EFFECT_ALWAYS_CRIT

* Just a little define

Makes clear that critBoost = 3 means ALWAYS CRIT

* Added a proper recoil field

Just to make it unambiguous and flexible - can finally have a move with 69% recoil.

* Fixed AI damage calculation for multi-strike moves

* Fixes + removed unused effects

* Tests fixes

Two to fix: pass when run in isolation but not when the whole group is run, which is annoying...

* Minor fixes

* Minor tweaks

* Fixed move effects

* recoil tests

---------

Co-authored-by: Alex <alexthenotes@gmail.com>
 2023-12-19 16:10:07 +01:00
DizzyEggg
e8e9d37640
Prankster tests + fixes (#3766) 
* Prankster tests + partial fix

* Fix Prankster tests and some edge cases

---------

Co-authored-by: Alex <alexthenotes@gmail.com>
 2023-12-19 11:17:31 +01:00
Eduardo Quezada
ce03d49d35 Forgot to disable EXPANSION_TAGGED_RELEASE 2023-12-18 16:27:12 -03:00
DizzyEggg
1ec0333432
Fix Ion Deluge interaction with VoltAbsorb/LightRod (#3764) 
* Fix Ion Deluge interaction with VoltAbsorb/LightRod

* Use move target all battlers for ion deluge fix

* fix teatime failing

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-18 16:57:56 +01:00
DizzyEggg
59a159c338
Fix Ice Face ignoring move effects (#3755) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-18 16:02:07 +01:00
DizzyEggg
64f8635496
fix telekinesis not working (#3763) 
* fix telekinesis not working

* typo

* remove one roost known failing

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-18 15:50:03 +01:00
DizzyEggg
e1d4bcc04e
fix frisk msg + tests (#3762) 2023-12-18 15:13:14 +01:00
Martin Griffin
74a6b8764c
overworld_ascending_frames to simplify overworld_frames (#3625) 
Introduces relativeFrames which automates the process of using
overworld_frames with ascending frames.

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-18 13:47:15 +01:00
kaicardenas2
b65b6d8a80
Fix README (#3759) 2023-12-18 09:31:46 +01:00
Eduardo Quezada D'Ottone
c409ae4152
Version 1.7.0 (#3743) 2023-12-17 18:48:50 -03:00
Eduardo Quezada
1b586e78a3 Version 1.7.0 2023-12-17 18:18:54 -03:00
Eduardo Quezada
c505abd53d Merge branch 'RHH/master' into RHH/upcoming 2023-12-17 18:13:26 -03:00
DizzyEggg
e22ac51617
Fix Innards Out doing dmg after Gastro Acid / vs Magic Guard (#3758) 
* gastro acid stays for fainted mons

* Innards Out does not damage Magic Guard Pokemon
 2023-12-17 21:47:12 +01:00
Eduardo Quezada
d92c046a80 Merge branch 'RHH/master' into RHH/upcoming 2023-12-17 17:31:10 -03:00
ghoulslash
c5ef339b25
add TryShinyAnimation to Controller_PlayerPartnerShowIntroHealthbox (#3757) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-12-17 21:10:03 +01:00
DizzyEggg
76a7513dcd
Fix Magician Life orb recoil when stealing (#3753) 
* Fix Magician Life orb recoil

* get rid of unneeded assume
 2023-12-17 19:50:43 +01:00
Eduardo Quezada D'Ottone
5d2efbe1a2
Fixed Raging Fury not causing rampage on user (#3754) 2023-12-17 19:23:09 +01:00
DizzyEggg
d79fe11bb1
get rid of known failing in ai test (#3748) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-12-17 15:11:02 +01:00
Eduardo Quezada D'Ottone
0f7fbc628d
Fixed miscelaneous mon data (#3749) 2023-12-17 09:35:55 -03:00
Eduardo Quezada D'Ottone
df1a8a25cb
Reserved remaining form ID that are left to support (#3750) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-17 09:22:33 -03:00
Katy
8a644e00a0
Gen 9 Species Sprite Fixes (#3751) 
* Charcadet GFX Changes

* Capsakid Shiny Pal

* Rellor Back Sprite

* Wiglett GFX Changes

* Wugtrio Shiny Pal

* Finizen Shiny Pal

* Palafin Zero Shiny Pal

* Cyclizar Shiny Pal

* Orthworm GFX Changes

* Glimmet Shiny Pal

* Glimmora Shiny Pal

* Dondozo Shiny Pal

* Frigibax Back Sprite

I honestly think this thing needs a new backsprite
 2023-12-17 12:55:13 +01:00
DizzyEggg
acec68fdb8
fix neutralising gas visual glitch (#3746) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-17 00:41:50 +01:00
DizzyEggg
3df101a6a0
fix baton pass not passing embargo (#3745) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-17 00:25:16 +01:00
Eduardo Quezada
537f1c9235 Merge branch 'RHH/master' into RHH/upcoming 2023-12-16 20:13:15 -03:00
CyanSMP64
a6622ec931
fix some sprite palettes (#3744) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-16 16:25:11 +01:00
ghoulslash
050d3a546f
Fix regression introduced for Eject Button (#3738) 
Fix regression introduced for Eject Button
 2023-12-16 07:57:36 -05:00
ghoulslash
3209cb0dc9
Merge branch 'upcoming' into regression 2023-12-16 07:39:08 -05:00
Alex
65bfab1a38 rename Cmd_jumpifaffectedbyprotect 2023-12-16 09:48:41 +01:00
Alex
cdeb43228d Use battler turn damaged 2023-12-16 09:33:45 +01:00
Eduardo Quezada D'Ottone
ef6edcf098
Fixed Ivy Cudgel test name (#3742) 2023-12-16 09:22:36 +01:00
Eduardo Quezada
fbbee39886 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	src/battle_main.c
 2023-12-15 18:50:20 -03:00
Alex
e339bc4f29
Fix Fiery Wrath anim (#3739) 2023-12-15 20:27:04 +01:00
Alex
94ffeb2cf8
Fix Quick Claw chance (#3737) 2023-12-15 17:05:11 +01:00
Alex
fbd7d88e4f Fix regression introduced for Eject Button 2023-12-15 16:54:10 +01:00
Eduardo Quezada D'Ottone
9ba31ac306
Separated gSpeciesInfo by Generation (#3729) 2023-12-15 12:29:00 +00:00
Martin Griffin
6cc1ebfd9c
Add status form change (#3734) 2023-12-15 10:34:22 +00:00