Commit graph

1177 commits

Author SHA1 Message Date
psf
1ba8e7d300
Merge branch 'upcoming' into signpost 2024-09-12 14:45:37 -07:00
Eduardo Quezada
551c558186 Merge branch '_RHH/master' into _RHH/upcoming 2024-09-11 07:28:02 -03:00
Rachel
b478881fc6
Add in-battle shadows underneath all enemy battlers (#5178)
* Add data to SpeciesInfo entries for in-battle shadows

* Implement sized shadows in the sprite visualizer

* Implement sized shadows in game code

* Show shadows for the lead battler for opponents during their battle anim

* Feedback on shadows, round 1

* Revert removal of Goomy and Sliggoo shadows

* Fixed GEN_3 setting

* Code cleanup + remove pre-processor branches

* Fix bugs with gen-3 configuration branch

* Style corrections, final shadow coordinate adjustments

* Adjustments to Garbodor and Araquanid
2024-09-10 21:27:49 +02:00
hedara90
36ff435ab6
Liam follower fixes (#5334)
* Fix Blinking on Meganium South Sprite

* Fixes Lediba and Ledian Blinking

* Fixes two blinking spots on spinerak

* Crobat Eye and Igglibuff butt vlinking fix

* More blinking follower fixes

flaaffy
xatu
hoppip line

* Blinking Gen 2 Fixes

Mantine
Miltank
Raikou
yanma
wooper
skarmory

* Gen 4 Fixes + donphan and espeon

prinplup
starraptor
shieldon
roserade
ambipom
mamoswine
Stunky

Donphan - gen 2 fix
Espion - noticed a flickering pixel on south walk

* Synchronization with Cafeei

* Messed up the merge, fixing now

* Added mantine

---------

Co-authored-by: Liamjd14 <Liamjdgaming@gmail.com>
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-09 21:03:52 +02:00
kittenchilly
ab279d9f8c
Update Move Category icons (#5080)
Update Category Icons to be more accurate to Gen 5
2024-09-09 09:52:48 +02:00
Eduardo Quezada
2a27aad259 Merge branch '_RHH/master' into _RHH/upcoming 2024-09-08 14:50:39 -03:00
Eduardo Quezada
9bc21c043c Fix swamp pal linebreaks 2024-09-08 14:30:01 -03:00
SonikkuA-DatH
8c3531ffc7
Grass/Water Pledge Swamp Animation + Sea of Fire animation tweak (#5325) 2024-09-07 18:04:47 +02:00
Cafei
ac7abb6d59
Followers sprite fixes (#5333)
Follower sprite fixes
Mothim and Combusken shiny fixes
2024-09-07 15:59:09 +02:00
psf
0e1b62c732
Merge branch 'upcoming' into signpost 2024-09-05 17:11:32 -07:00
Liamjd14
e9c0784dc0
Gen 9 Follower pokemon sprites (#5304)
* Gen 9 Follower Sprites
2024-09-05 22:31:14 +02:00
Sadfish the Sad
59787d0c13
new terrain bgs (#5162)
Toggled by B_NEW_TERRAIN_BACKGROUNDS
2024-09-05 08:18:09 +02:00
Eduardo Quezada
8533b0c045 Merge branch '_RHH/master' into _RHH/upcoming 2024-09-03 14:39:50 -04:00
Alex
04b5c013a9
Adds config to show target of ingame partner (#5307)
* Adds config to show chosen move and target of ingame partner, `#define B_SHOW_PARTNER_TARGET`, default `FALSE`
---------

Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-03 19:28:59 +02:00
psf
95167936d4
Merge branch 'upcoming' into signpost 2024-08-31 07:02:18 -07:00
hedara90
073d599fc5
Fixed Cinderace GMax back sprite (#5295)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-31 12:39:56 +02:00
Cafei
8053f4ab1e
Enable female Indeedee follower and improve shiny Indeedees (#5285)
Enable Indeedee female follower sprite.
Shiny improvements.
Fix front Indeedee male shading.
2024-08-29 18:14:46 +02:00
Eduardo Quezada
aebbe448b8 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-28 12:58:14 -04:00
Cafei
213c097dc0
Paldean Wooper and Clodsire followers (#5277) 2024-08-28 11:47:08 +02:00
psf
23134cec85
Merge branch 'upcoming' into signpost 2024-08-27 21:31:07 -07:00
Eduardo Quezada
abf60e9c64 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-24 19:44:35 -04:00
Cafei
4cc193ebf1
A bunch of fixes for follower Pokemon sprites (#5241) 2024-08-23 10:38:09 +02:00
kittenchilly
bd38c64f29
New Garganacl and Naclstack battle sprite + various battle sprite fixes (#5142)
Garganacl, Spidops, Wattrel, Kilowattrel, Shroodle, Bombirdier, Orthworm, Veluza, Aerodactyl-Mega, Medicham-Mega, Latis-Mega, Diancie-Mega, Ponyta-Galar, Rapidash-Galar, Magearna, Landorus.
2024-08-20 20:16:32 +02:00
Eduardo Quezada
661ec0a9fd Merge branch '_RHH/master' into _RHH/upcoming 2024-08-14 17:10:20 -04:00
Sadfish the Sad
fde85e9357
some gen 9 move anims + fickle beam rework (#5159)
* new move anims + fickle beam rework

* more fickle beam changes

* removed the true for consistency

* ficklebeamboosted gets cleared now

* mortal spin and thunderclap changes

* minor mortal spin pal change

* removed hex numbers and made hard press quicker
2024-08-14 17:20:18 +02:00
Eduardo Quezada
abb1fd20f3 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-12 16:24:04 -04:00
hedara90
5df53a5c1c
Added fixed Unown follower sprites by Sarn (#5146)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-12 15:39:11 -04:00
psf
d1183f4b8a
Add B_SHOW_TYPES and cleaned up IsDoubleBattle (#5131)
* First attempt at a port

* Slightly broken but working

* Got images working and opponent palettes

* half finished compressed spritesheet approach instead

* fix the palettes (smh)

* fix hflip, and a lot of clean-up

* Add B_SHOW_TYPES

* Got Illusion working

* Add num type enum

* Updated function to get type

* Fixed type icon position and cleaned up functions

* Updated illusions and Tera handling

* Added BATTLE_TYPE_IS_SINGLE and DOUBLE

* Removed IS_BATTLE_TYPE_SINGLE

* Implemented BATTLE_TYPE_IS_DOUBLE across repo

* Removed SIDE macro

* Updated config

* Deprecated battler alive macro

* Reindented file

* Added exceptions for 2v1

* Replaced Fainted check with Null check

* Added functionality for only types of caught mons

* UseDoubleBattleCoords updated

* Added ShouldFlipTypeIcon

* Renamed TryLoadTypeIcon

* Refactored functions

* Refactored functions

* Refactored functions

* Refactored functions

* Renamed SEEN to CAUGHT

* Reset config

* Added useSecondPalette and isOrdinary to gTypesInfo

* Further simplified secondPalette and isOrdinary

* Changed isordinary to isSpecialCase

* Renamed to useSecondTypeIconPalette

* Fixed Stellar type interactions

* fixed spacing

* fixed include/config/battle.h

* fixed

* fixed include/config/general.h

* changed type1 and type2

* Moved IsDoubleBattle to include.battle.h
Removed BATTLE_TYPE_IS_DOUBLE
Removed IS_DOUBLE_BATTLE

* Changed IsBattlerFainted to IsBattlerAlive

* Removed IsBattlerNull

* Moved GetBattlerData to be inline

* Renamed GetMonDefensiveTeraType

* Removed IsIllusionActive

* Fixed identation

* found one last isDoubleBattle hold out

* fixed redundant brackets

* Fixed spacing for B_SHOW_TYPES

* Update src/battle_script_commands.c

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Fixed padding

* Reindent file and refactored GetTypeIconHideMovement

* Update include/data.h

---------

Co-authored-by: RavePossum <ravepossum@proton.me>
Co-authored-by: Frank <fdeblasio1004@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-08-11 17:55:51 +02:00
Cafei
2237e33ab2
Pokemon spite fixes (#5126)
Various Gen 8 (+Sawsbuck Summer) sprite fixes for overworld and battle sprites.
2024-08-10 19:43:19 +02:00
hedara90
db3bb40c1a
Accidentaly the Giratina origin overworld shiny pal (#5108)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-06 14:22:51 -05:00
Hedara
a9492f5b1c Fixed Xerneas 2024-08-06 16:52:42 +02:00
Hedara
29bb658d1b Fixed some overworld palettes 2024-08-06 13:25:26 +02:00
hedara90
45835a2c33
Fixed stray transparent pixels in Urshifu sprites (#5071)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-02 11:48:20 -07:00
Eduardo Quezada
18aff2db3b Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	asm/macros/battle_anim_script.inc
#	data/battle_anim_scripts.s
#	include/constants/battle_anim.h
#	src/battle_anim.c
#	src/data/battle_anim.h
2024-07-27 16:26:37 -04:00
hedara90
b0b63f66b9
Added Ivy Cudgel Animation (#5034)
* Added Ivy Cudgel Anim, changed Ogerpon palettes, added jumpifmovetypeequals command

* Make the 20 year old compiler not complain

* Maybe better cudgel

* Moved animation

---------

Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-26 18:06:44 +02:00
Eduardo Quezada
cc00446eb8 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/data/graphics/pokemon.h
#	src/data/pokemon/species_info/gen_9_families.h
2024-07-26 09:42:52 -04:00
hedara90
3d65141db8
Fixed Sandile sprite (#5038)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-26 00:07:43 +02:00
pkmnsnfrn
389f4e4180 Worked with ShinyDragonHunter to get signpost working 2024-07-24 20:58:18 -07:00
pkmnsnfrn
a0c5e5511c Added gSignPostWindow_Gfx
Added LoadSignBoxGfx
Add LoadSignPostWindowFrameGfx
2024-07-24 19:41:36 -07:00
hedara90
7a4df80f89
Added Ogerpon Tera Sprites (#4996)
* Added Ogerpon Tera Sprites

* Updated references to Ogerpon Tera forms

* Fixed back sprite offsets and color indices for Hearthflame Tera

* Removed Ogerpon data duplicates

---------

Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-07-23 11:55:07 -04:00
Eduardo Quezada
0b02527e5c Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	test/test_runner.c
2024-07-21 13:36:07 -04:00
hedara90
7e509c440b
Added Terapagos Stellar Sprite (#5008)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-21 08:17:31 +02:00
pkmnsnfrn
61eff23d89 Moved menu defines to header file
Added FRLG signpost border
Started working on LoadSignPostWindowFrameGfx
2024-07-15 22:57:29 -07:00
Eduardo Quezada
fcdc9ed65a Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/battle_util.c
#	src/data/pokemon/species_info/gen_7_families.h
#	test/battle/ability/download.c
#	test/battle/ability/intimidate.c
#	test/battle/ability/supreme_overlord.c
#	test/battle/ability/zero_to_hero.c
#	test/battle/ai/ai.c
#	test/battle/move_effect/plasma_fists.c
2024-07-05 14:25:25 -04:00
Cafei
3ec371de05
Fixes (#4887) 2024-06-29 20:46:00 +02:00
AgustinGDLV
9797640dff
Gimmick Refactor (#4449)
* consolidated gimmick checks, triggers, communication, and activation; updated test runner

* fixed improper use of .usableGimmick

* cleaning up battle_dynamax.c, changing function args to u32s

* fixed '#ifdef TESTING' causing errors

* updated z-moves to use gimmick interface, pared down redundancies; no AI/tests

* added support for z-moves in tests, consolidated gimmick fields

* removed ShouldUseMaxMove and .usingMaxMove

* renamed TryChangeZIndicator, updated z move display

* added several z-move tests and fixed various z-move interactions; fixed z-move category calc

* fixed useless battler arg in GetTypeBasedZMove

* added basic test check for bad Z-Move or Mega usage

* reworked test runner gimmick functionality; added support for Ultra Burst + Z-Move to test Light That Burns the Sky

* fixed gimmick test logic; fixed damage category override

* fixed mega rayquaza test fail

* consolidated gimmick indicator logic; added graphics to gGimmicksInfo

* removed TeraData struct

* reimplemented AI logic for Z-Moves; no changes

* updated Z-Move and Ultra Burst trigger gfx

* added testrunner check for multiple gimmick use

* fixed duplicate z-move call in test

* reorganized data/graphics/gimmicks.h

* added signature Z-Move ability tests; implemented Guardian of Alola

* fixed bad test update

* fixed Thousand Arrows not affecting Tera Flying; clean-up

* fixed -ate tests

* fixed tera tests

* fixed tera tests really

* fixed last batch of tests

* fixed -ate mega test again

* code review

* code review pt.2

* tweaked CanTera again

* dynamax flag only required for player
2024-06-22 22:25:40 +02:00
Eduardo Quezada
88028c0c37
Split Pokémon Object Events from Following Pokémon functionality (#4761)
* Split Pokémon Object Events from Following Pokémon functionality

* Renamed follower pngs and palettes

* Define renames

* Reorder configs

* Renaming: SpeciesInfo fields, macros and palettes.
2024-06-13 22:46:27 +02:00
Eduardo Quezada
7df0219003
BW2 Style Map Pop-Ups (#4396) 2024-06-09 16:03:41 -04:00
Eduardo Quezada
dce10ab705 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	test/species.c
2024-06-04 16:47:29 -04:00
kittenchilly
a5b75746ea Pawmi 2024-06-03 14:17:34 -05:00