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

16359 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eduardo Quezada
5f8c915826 Rebuild of makefile 3: ANALYZE 2024-09-11 19:40:52 -03:00
Eduardo Quezada
83872ab89f Rebuild of makefile 2: -Wall and UNUSED_ERROR 2024-09-11 19:31:40 -03:00
Eduardo Quezada
20e937a724 Rebuild of makefile 1: Modern as default 2024-09-11 16:33:11 -03:00
Eduardo Quezada
831b394ca1 Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909 
# Conflicts:
#	Makefile
#	include/battle.h
#	include/battle_main.h
#	include/battle_util.h
#	include/data.h
#	make_tools.mk
#	map_data_rules.mk
#	src/battle_setup.c
#	src/fieldmap.c
 2024-09-11 15:26:14 -03:00
Eduardo Quezada
551c558186 Merge branch '_RHH/master' into _RHH/upcoming 2024-09-11 07:28:02 -03:00
Eduardo Quezada
cdf781f726
Fixed Toxic Thread stat increase (#5369) 2024-09-11 11:18:58 +02:00
Skye Chappelle
a75be4124d
Update pull_request_template.md to include Discord username update 2024-09-10 23:39:41 -04:00
Skye Chappelle
28786b42a6
Update INSTALL.md to state that Windows 8 is no longer supported by Microsoft 2024-09-10 23:36:13 -04:00
Pawkkie
047289a639
Improve AI's Skill Swap handling in double battles (#5360) 
* Improve AI contrary

* Update src/battle_ai_util.c

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

* Fix additionalEffects loop

* moves[i] to aiMove

* Update src/battle_ai_util.c

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

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-09-11 00:00:29 +02:00
hedara90
c57d149003
Fixes with Pledge combos and absorption abilities (#5364) 
* Fixes with Pledge combos and absorption moves

* Fixed incorrect merge

* Removed superflous if statement

---------

Co-authored-by: Hedara <hedara90@gmail.com>
 2024-09-10 23:53:55 +02:00
Pawkkie
3aa46c3ca0
Fix stat id check (#5366) 2024-09-10 23:52:49 +02: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
psf
2477f1d5ca
Made BuildColorMaps redundant by using static tables (#5289) 
* Added config for ColorMaps

* Fixed delclartion of static maps

* First commit complete

* Removed config

* Removed config

* fixed overworld config per https://github.com/rh-hideout/pokeemerald-expansion/pull/5289\#discussion_r1747583812

* Fixed pointer alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5289\#pullrequestreview-2286973040

* Update overworld.h

Removed new lines per https://github.com/rh-hideout/pokeemerald-expansion/pull/5289/files#r1749325673
 2024-09-10 14:44:08 +02:00
Pawkkie
6f922df7ef
Frostbite score fixes (#5362) 2024-09-10 12:58:30 +02:00
ghoulslash
2b20e6cae1
reset item flags on new game (#5363) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2024-09-10 08:33:59 +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
Pawkkie
4c49dfdd1d
AI burn score fixes and improvements (#5356) 
* Burn score fixes

* Remove CanTargetFaintAi check
 2024-09-09 21:03:24 +02:00
Eduardo Quezada
60803cdba9 Fixed braces style 2024-09-09 13:58:23 -03:00
Eduardo Quezada
002c770f07 Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/master/merrpMerge 2024-09-09 13:52:34 -03:00
Alex
3cfc0004b6
Removes redundant moveTargetType ai function (#5354) 
* Removes redundant moveTargetType ai function

* Beautify GetBattlerMoveTargetType for better readability
 2024-09-09 11:30:39 -04:00
Alex
389e5c20dd
Fixes berries missing timing (#5300) 
* Fixes berries missing timing

* salac berry test
 2024-09-09 10:40:56 -03:00
hedara90
dc2bbe0448
Fixed loading into the wrong version of a map after saving in areas with multiple layouts (#5347) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-09-09 09:34:21 -03:00
Alex
5089b1d0b4
Adds callnative for soundproofcheck to addtionally check the flag (#5301) 
* Adds callnative for soundproofcheck to addtionally check the flag

* rename callnative, include parish song and missing ability recording
 2024-09-09 06:52:26 -03:00
hedara90
d62b7270c8
Fixed trainerslide arguments (#5344) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-09-09 10:49:05 +02:00
Pawkkie
32dde8af64
Composite flag docs (#5349) 2024-09-09 10:43:15 +02:00
ghoulslash
fd4860d17e
fix missing break in ENDTURNs (#5350) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2024-09-09 10:41:43 +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
2f21073555
Fixed Tera Shift description (#5351) 2024-09-08 22:13:32 -04:00
GriffinR
cfdb06a813
Merge pull request #2028 from NTx86/fix-contest-ai-point-macros 
Fix incorrect point macros in contest_ai_script.inc
 2024-09-08 14:47:28 -04: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
Eduardo Quezada
6d020eb366
Cleaned up duplicate dynamic type functions (#5338) 
* Cleaned up duplicated dynamic type functions

* Small cleanup

* Oops, last cleanup broke stuff

* Alignment

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

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-09-08 19:14:05 +02:00
hedara90
b8251e3a75
Another Pledge fix, Powder this time (#5341) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-09-08 16:17:18 +02:00
PhallenTree
d6d2f2033d
Fixes Pledge move combo timeout if frozen (#5340) 
Missing `HITMARKER_UNABLE_TO_USE_MOVE` in the frozen canceller
 2024-09-08 13:41:23 +02:00
NT_x86
71fcb2e7b5
Fix incorrect point macros in contest_ai_script.inc 2024-09-08 12:50:35 +03:00
hedara90
03e87a7d62
Pledge fail into opponent pledge loop fix (#5339) 
* Pledge fail into opponent pledge loop fix

* Fixed excessively aggressive canceller

* Move the Pledge bit clear to its proper place

---------

Co-authored-by: Hedara <hedara90@gmail.com>
 2024-09-08 10:38:52 +02:00
PhallenTree
68701a9e2d
Fix some Pledge move combo issues (#5330) 
Fix Pledge moves looping, adds tests for pledge+incapacitation situations
 2024-09-08 08:28:16 +02:00
SonikkuA-DatH
8c3531ffc7
Grass/Water Pledge Swamp Animation + Sea of Fire animation tweak (#5325) 2024-09-07 18:04:47 +02:00
Salem
90089ecf51
add debug build target (#4817) 
* add debug build target

* fix maybe uninitialized error

* add option to undef NDEBUG

* debug for agbcc

* init instead of ignore to not break agbcc

* make clean removes modern and agbcc artifacts. explicit use of -O0 again for NOOPT

* automatically enable debug menu when building for debug

* automatically enable debug menu when building for debug

* automatically enable debug menu when building for debug

* clean up previous mess omg

* remove preproc around debug menus

* automatically enable debug menu when building for debug

* clean up previous mess omg

* Apply suggestions from code review

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

* Update Makefile

* Update field_control_avatar.c

* make debug print independent

* remove unwanted changes

* remove trailing endif

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-09-07 10:13:22 -04:00
Cafei
ac7abb6d59
Followers sprite fixes (#5333) 
Follower sprite fixes
Mothim and Combusken shiny fixes
 2024-09-07 15:59:09 +02:00
Alex
5c86aa126f
Revert rtc based encounters (#5331) 
* Revert "RTC-based wild encounters follow up (#5328)"

This reverts commit 9a95c9b07a.

* Revert "RTC-based wild encounters (#5313)"

This reverts commit 7c7fd905ba.
 2024-09-06 21:09:04 +02:00
Alex
28287fe80a
Fixes minor wrong order in AI_CalcDamage and adds Tera Blast/Tera Storm (#5155) 
* Fixes minor wrong order in AI_CalcDamage and adds Tera Blast/Tera Storm

* update moveEffect

* fix compile
 2024-09-06 21:08:54 +02:00
Alex
9a95c9b07a
RTC-based wild encounters follow up (#5328) 
During my review of #5313 I overlooked that the function vars used a u8 instead of u32. This follow up fixes it
 2024-09-06 06:36:21 -04:00
psf
0e1b62c732
Merge branch 'upcoming' into signpost 2024-09-05 17:11:32 -07:00
psf
1143da0c1c
Merge branch 'upcoming' into stairWarps 2024-09-05 17:09:45 -07:00
Liamjd14
e9c0784dc0
Gen 9 Follower pokemon sprites (#5304) 
* Gen 9 Follower Sprites
 2024-09-05 22:31:14 +02:00
ghoulslash
ff72723464
Fix Cmd_trainerslidein/out (#5326) 
* fix Cmd_trainerslidein battler Id

* GetBattlerForBattleScript in trainerslideout

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2024-09-05 20:51:13 +02:00
Sadfish the Sad
59787d0c13
new terrain bgs (#5162) 
Toggled by B_NEW_TERRAIN_BACKGROUNDS
 2024-09-05 08:18:09 +02:00
Frank DeBlasio
d3a3565fef
Converted PC strings to COMPOUND_STRINGs (#5314) 
* Converted PC strings to COMPOUND_STRINGs

* Update src/pokemon_storage_system.c

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-09-04 16:43:34 -04:00
hedara90
181c4ea476
Typeless fix (#5323) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-09-04 22:25:41 +02:00