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

16019 commits

This branch
This branch
All branches
Author SHA1 Message Date
GriffinR
9e22bf1af4
Merge pull request #1957 from Icedude907/build-music-config 
[Build System Rewrite] Improved audio rules
 2024-09-12 10:46:30 -04:00
GriffinR
51131e2582
Merge pull request #1954 from Icedude907/build-scaninc-speed 
[Build System Rewrite] Massive build speed improvement via scaninc changes
 2024-09-12 10:45:41 -04:00
Eduardo Quezada
5790200e2d Rebuild of makefile 4: Teachable learnset helper 2024-09-11 20:05:18 -03:00
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
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
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
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
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
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
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
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
Cafei
ac7abb6d59
Followers sprite fixes (#5333) 
Follower sprite fixes
Mothim and Combusken shiny fixes
 2024-09-07 15:59:09 +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
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
Pawkkie
9bd5601b5c
Wonder Guard AI Fix (#5317) 
* Fix Wonder Guard looping

* Review + Sheer Cold
 2024-09-02 17:43:41 -04:00
SarnPoke
a422db09c6
Fix Slateport Battle Tent/Battle Factory (#5281) 
* Fix Slateport Battle Tent/Battle Factory

Stops the Battle Factory and Slateport Battle Tent from returning no Pokémon when player wants to swap their Pokémon.

* Fix player rental party being junk data after rest

Fixes #5280

* Consolidate checks into single method

Consolidates every gSpecialVar_0x8005 check into a singular method.
 2024-09-02 16:53:03 -04:00
hedara90
fb1f12aa1b
Fixed Max Attacks into Max Guards message printing (#5312) 
* Fixed Max Attacks into Max Guards message printing

* Updated the solution

---------

Co-authored-by: Hedara <hedara90@gmail.com>
 2024-09-02 13:58:10 +02:00
Ariel A
42d9f24c84 feat: added OW_MON_WANDER_WALK config option 2024-09-01 17:17:24 -04:00
Eduardo Quezada
33d5cbd7a2
Moved ASSUMEs to inside GIVEN blocks (#5308) 2024-09-01 23:13:58 +02:00
Ariel A
839cf2e790 feat: static OW pokemon now bob while walking in place (per OW_MON_BOBBING) 2024-09-01 15:31:12 -04:00
Alex
6648498e2e
Fixes dmax move base power not seen by ai (#5299) 2024-09-01 18:07:18 +02:00
Alex
e09a59a7e4
Fixes Tar Shot on Tera mons (#5302) 
* Fixes Tar Shot on Tera mon

* new line
 2024-08-31 12:24:28 -04:00
AgustinGDLV
cfa56962e1
fixed dupe gimmick use in doubles (#5235) 
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
 2024-08-31 13:15:56 +02:00
hedara90
073d599fc5
Fixed Cinderace GMax back sprite (#5295) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-08-31 12:39:56 +02:00
PhallenTree
ac9b40a423
Fixes Max Moves ignoring absorbing abilities, G-Max Corviknight and Centiskorch names (#5296) 
* Fix Max and G-Max Moves bypassing absorbing abilities

* Fix G-Max Corviknight and Centiskorch speciesName

* Remove some outdated comments

* Missing Dynamax check

* Add Max Quake and Max Overgrowth to test
 2024-08-31 12:39:37 +02:00
GriffinR
04197b4912 Fix swapped cycling road entrances 2024-08-31 01:54:25 -04:00
GriffinR
32f05269a3 Add missing terminal newlines 2024-08-31 00:53:23 -04:00
GriffinR
c265c3f837 Merge branch 'master' of https://github.com/pret/pokeemerald into build-music-config 2024-08-31 00:51:15 -04:00
GriffinR
2d5231149e Merge branch 'master' of https://github.com/pret/pokeemerald into build-scaninc-speed 2024-08-31 00:39:48 -04:00
GriffinR
4d74dd5e33
Merge pull request #1950 from Icedude907/build-makefile-cleanup 
[Build System Rewrite] Refactored `Makefile`
 2024-08-31 00:36:50 -04:00
GriffinR
a4dd821658 Restore review changes from dependent PR 2024-08-31 00:33:02 -04:00
GriffinR
19ad2e16ac Merge branch 'master' of https://github.com/pret/pokeemerald into build-makefile-cleanup 2024-08-31 00:17:07 -04:00