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

15640 commits

This branch
This branch
All branches
Author SHA1 Message Date
sneed
3fa6bf46db
Test battlers always have their forced abilities (#4707) 
* Test battlers always have their forced abilities

* indentation
 2024-07-21 21:20:39 +02: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
Eduardo Quezada
01831a30b9
Temporarely revert regional form inheritance (#5004) 2024-07-20 18:23:47 +02:00
Eduardo Quezada
9d5e253867
Improved Test Runner Summary (#4641) 
* Filename in list (no proper sorting yet)

* Line number and message in error list + removed sorting

* Style adjustment

* Added missing file/line number to "expected N passes/successes"

* Fixed Known Failing Passing test list

* Separated test list from totals

* Assumption fails list

* Better names

* Filename for KNOWN_FAILINGs passing

* Moved total back to the bottom

* Spaces correction

* Fixed test list count

* Source file for Alloc fails on tests

* Moved sourceLine from BattleTest to Test struct

* Fixed assumptions failed "and more" counter

* Fixed ASSUMPTION block not printing their line numbers

* Fixed when stopLine is printed

* Renamed stopLine to failedAssumptionsBlockLine
 2024-07-20 18:22:40 +02:00
tertu
5ccf3e2688
Fix chain fishing shiny rolls (#4906) 2024-07-19 09:48:14 -05:00
Eduardo Quezada
98eb4e5027 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	asm/macros/battle_script.inc
#	include/constants/battle_string_ids.h
#	src/battle_ai_switch_items.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/frontier_util.c
#	test/battle/ai/ai.c
 2024-07-19 09:20:05 -04:00
Bassoonian
f2311b4c97
Add trainer class ball test (#4999) 2024-07-19 12:30:06 +02:00
Bassoonian
296bd05f53
Fix tests not compiling outside of CI (#4998) 2024-07-19 11:58:42 +02:00
Bassoonian
9ff30ee87a
Fix frontier ineligibility fix (#4997) 2024-07-19 11:46:25 +02:00
Alex
552e2768da
Fixes to Opportunist and Mirror Herb adjustments (#4928) 
* Replace Opportunist todo tests with proper tests

* add failing test

* desc

* Fixes to Opportunist and Mirror Herb adjustments

* more tests

* some fixes

* first turn events switch

* simple enum + revert test desc
 2024-07-19 11:01:46 +02:00
Bassoonian
93ee3a9197
Fix Psycho Shift Frostbite interaction (#4995) 2024-07-18 21:51:21 +02:00
Alex
62640456e7
Fixes residual damage order. #4945 Follow up. (#4993) 2024-07-18 12:48:23 +02:00
Alex
b21ffa1f9b
Changes score adjustments to tempScore increases (#4987) 2024-07-17 23:36:15 +02:00
fakuzatsu
0625c90277
fix tests when B_USE_FROSTBITE is TRUE (#4986) 2024-07-17 23:23:52 +02:00
Martin Griffin
2ad81d3446
Deprecate agbcc (#4989) 
* Deprecate agbcc

* Update Makefile

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

* Update Makefile

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-07-17 22:40:19 +02:00
Martin Griffin
23aa9f0433
trainers.h (#4990) 2024-07-17 21:41:52 +02:00
innocenthedgehog
d333f9f066
Fix typos in trainers.party documentation (#4988) 
Co-authored-by: psytp2 <psytp2@nottingham.ac.uk>
 2024-07-17 13:46:44 +02:00
hedara90
7703cb314b
trainerproc documentation (#4734) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-07-16 18:50:31 +01:00
iriv24
0e21e0debf
replace gTransformedPersonalities[battlerAtk] in HandleLoadSpecialPokePic with personalityValue in HandleSpeciesGfxDataChange (#4975) 2024-07-15 19:41:23 +02:00
psf
7b3b635c67
Add AUTO_LOWERCASE_KEYBOARD (#4976) 
* Added SwapKeyboardToLowerAfterFirstCapitalLetter and AUTO_LOWERCASE_KEYBOARD

* Fixed tabs and spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/4976/files\#r1677868397

* Removed semicolon found by https://github.com/rh-hideout/pokeemerald-expansion/pull/4976\#discussion_r1678105502
 2024-07-15 19:06:01 +02:00
Alex
0d0100d8f8
Reduces AI_WhoStrikesFirst to the most essential parts (#4978) 
* Reduces AI_WhoStrikesFirst to the most essential parts

* abgcc

* add stall check + minor clean up

* add comment
 2024-07-15 17:18:03 +02:00
iriv24
684e8af181
Vanilla species names fit in health box without narrowing (#4979) 2024-07-15 16:01:36 +01:00
Bassoonian
cfcac0b0f9
Clean up battle scripts (#4839) 
* Clean up battle and anim scripts

* Revert anim cleanup
 2024-07-15 16:25:25 +02:00
Pawkkie
b5a7185841
Fix U-Turn With Ace Mon (#4748) (#4972) 
* Fix U-Turn With Ace Mon

* ASSUME for test
 2024-07-15 09:19:41 +02:00
Eduardo Quezada
2b40e79ac3 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	include/battle_util.h
#	src/battle_ai_main.c
 2024-07-14 22:44:00 -04:00
Pawkkie
b084dcd8d3
Fix Upper Hand being used blindly (#4973) 2024-07-14 22:00:51 +02:00
sneed
6aa308e1d8
EFFECT_PHOTON_GEYSER and restored EFFECT_SHELL_SIDE_ARM work for physical moves (#4923) 2024-07-14 15:35:11 +02:00
psf
5c38532281
Add B_ENEMY_THROW_BALLS, B_PLAYER_THROW_BALLS_SOUND, and B_ENEMY_THROW_BALLS_SOUND (#4953) 
* First proof of concept works

* Added B_THROW_BALLS_SOUND

* Made generic MonSendOut

* Changed magic number to constant

* added acute e and changed to GEN_LATEST

* Removed tabs

* Undef'd HIBYTE and removed extra bool32

* Made functions inline per https://github.com/rh-hideout/pokeemerald-expansion/pull/4953/files\#r1675397114
Split into B_THROW_BALLS_SOUND B_PLAYER_THROW_BALLS_SOUND and B_ENEMY_THROW_BALLS_SOUND per https://github.com/rh-hideout/pokeemerald-expansion/pull/4953/files\#r1676143761

* Reset debug script

* Removed static assert per Discord conversation with Alex
 2024-07-14 14:46:04 +02:00
Bassoonian
0b9cdf4716
Update README.md (#4966) 2024-07-14 11:59:58 +02:00
Martin Griffin
9c1a85ef0f
trainerproc: use -traditional-cpp to preserve Unicode characters (#4969) 2024-07-14 11:28:05 +02:00
psf
d410f56a8c
Add P_CAN_FORGET_HIDDEN_MOVE (#4968) 
* Added P_CAN_FORGET_HMS

* Renamed to can forget hidden move

* Bypass IsLastMonThatKnowsSurf

* Fixed typo

* Moved P_CAN_FORGET_HIDDEN_MOVE

* Update src/party_menu.c per https://github.com/rh-hideout/pokeemerald-expansion/pull/4968#discussion_r1677033837

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

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-07-14 11:23:49 +02:00
Pawkkie
c721f1b04a
Smarter Focus Punch and Substitute (#4952) 
* Smarter Focus Punch

* Smarter Substitute, review feedback

* Use HasAnyKnownMove instead of isFirstTurn

* When are we removing agbcc again

* Use HasMoveEffect
 2024-07-14 08:29:27 +02:00
Bassoonian
f6d2b2861a
Fix Tera indicators (#4960) 
* Fix Tera indicators

* Better fix
 2024-07-13 23:08:43 +02:00
Alex
45275fee17
Fix Infinite Tera Orb racharging (#4863) 
* Fix Infinte Tera Orb charges

* trainer_parties.h
 2024-07-13 22:38:06 +02:00
Bassoonian
385b7017f3
Fix fake RTC being on by default (#4965) 2024-07-13 21:20:55 +02:00
Alex
5e2e2e9fce
Minor shouldUseGimmick refactor (#4962) 2024-07-13 20:56:18 +02:00
psf
3e03419bdb
Add OW_FLAG_PAUSE_TIME, pausefakertc, resumefakertc and togglefakertc (#4954) 
* First concept

* Fixed config file and added static assert

* Reset debug scripts

* Cleaned up overworld config

* Renamed new Rtc pausing functions per https://github.com/rh-hideout/pokeemerald-expansion/pull/4954\#discussion_r1675393121

* Added tabs instead of spaces per https://github.com/rh-hideout/pokeemerald-expansion/pull/4954\#discussion_r1676791279

* Update include/config/overworld.h

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-07-13 20:44:27 +02:00
Martin Griffin
e480f73e5a
Pret Merge (13th of July) (#4964) 2024-07-13 19:00:10 +01:00
Bassoonian
50f368eceb Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge13july 2024-07-13 19:42:29 +02:00
Philipp AUER
550e6688aa
Support C-Style enum in preproc (#1984) 
* [preproc] C-style enums

- asm files parseable from stdin
- 2nd preproc pass
- add parser for C-style `enum`
- positional arguments at end of command

---------

Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
 2024-07-13 18:26:33 +01:00
Frank DeBlasio
d224db43c8
Consolidated Lilycove Contest Lady's values into one struct (#4951) 
* Consolidated Lilycove Contest Lady's values into one struct

* Converted Lilycove Lady strings to COMPOUND_STRINGS
 2024-07-13 14:44:22 +02:00
Alex
edc883d038
Refactors residual damage (#4945) 
* Refactors damage non types

* correction

* Refactor weather damage script

* new line

* correction

* there was a hail test already

* ndebug

* add sandstorm test

* Update src/battle_script_commands.c

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

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-07-13 12:12:40 +02:00
psf
522a8ba3f7
Allow users to increase MAX_MONEY (#4943) 
* Added GetMaxNumMoneyDigits and GetMoneyBoxHorizontalPosition to header
Replaced use of PrintMoneyAmount

* Added define for MAX_MONEY_DIGITS
Removed GetMaxNumMoneyDigits
Converted uses of ConvertIntToDecimalStringN that called for 7 money digits to use MAX_MONEY_DIGITS
Replaced 6 money digits in PrintMoneyAmount with MAX_MONEY_DIGITS

* Use preproc and MAX_MONEY_DIGITS to increase the width of the sell item money box

* Added GetItemSoldMoneyHorizonalPosition and fixed ConvertInt in PrintMoneyAmount to use MAX_MONEY_DIGITS

* Added GetItemSoldMoneyHorizonalPosition and fixed ConvertInt in PrintMoneyAmount to use MAX_MONEY_DIGITS

* Removed width and tilemap changes

* Modified CountDigits to count digits greater than 1
Fixed PrintMoneyAmount to work with large digits

* Added an early return to PrependFontIdToFit

* First prototype working

* Updated GetMoneyBoxHorizontalPosition with amount

* Updated GetMoneyBoxHorizontalPosition with amount

* Got version working with one space before

* Got version working with one space before

* Got version working with all spacingOC

* cleaned up PrintMoneyAmount

* Created CalculateleadingSpacesForMoney

* Cleaned up for PR

* Changed tabs to spaces per https://github.com/rh-hideout/pokeemerald-expansion/pull/4943\#issuecomment-2223023365
 2024-07-13 11:16:34 +02:00
Bassoonian
deb2b69a76
Fix Diamond Storm's effect (#4947) 2024-07-11 09:28:38 -04:00
Bassoonian
f85bff6e30
Fix Basculegion's gen9 level up learnset (#4948) 2024-07-11 15:07:39 +02:00
ghoulslash
7c23a39c5e
Disable OW followers by default (#4720) 2024-07-11 08:51:38 -04:00
Eduardo Quezada
9e0af6c84d
Merrp's follower merge (11th of July) (#4944) 2024-07-11 08:36:45 -04:00
Bassoonian
ef76a6b21b
Merge branch 'upcoming' into disablefollowersbydefault 2024-07-11 14:08:55 +02:00
Bassoonian
b695ddfe37 Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into merrpmerge11july 2024-07-11 09:57:03 +02:00