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

13793 commits

This branch
This branch
All branches
Author SHA1 Message Date
kittenchilly
9d2be9f3a6
Remove all trailing whitespace (upcoming) (#3473) 2023-10-27 13:54:55 -03:00
Eduardo Quezada D'Ottone
db00839d64
Fixes Syrup bomb, new Octolock script, some Intim changes + Tests (#3437) 2023-10-27 12:25:55 -03:00
Eduardo Quezada D'Ottone
5e67625e05
It was a dark and spooky merge... 🎃 (pret merge 2023/10/27) (#3471) 2023-10-27 11:35:03 -03:00
Eduardo Quezada
8e0991475c Incorporated upstream fixes 2023-10-27 11:04:10 -03:00
Eduardo Quezada
7ae37ab79c Merge branch 'pret_master' into RHH/upcoming 
# Conflicts:
#	README.md
#	data/battle_ai_scripts.s
#	data/event_scripts.s
 2023-10-27 11:03:37 -03:00
Alex
57a99e9be6
Fixes dynamax move target and canceling in doubles (#3470) 2023-10-27 10:38:40 -03:00
Eduardo Quezada
b5607209f3 Fixed G-Max Finale test 2023-10-27 09:16:39 -03:00
Eduardo Quezada
59c0de0967 Merge branch 'RHH/master' into RHH/upcoming 2023-10-27 09:16:21 -03:00
GriffinR
2304283c3e
Merge pull request #1935 from GriffinRichards/bugfixfix 
Use BUGFIX in assembly files
 2023-10-26 17:42:41 -04:00
kittenchilly
a8632f0fc5
Update PLA Pokemon data to correct values (#3458) 
* Fix PLA Pokemon data to use correct values

* oops, cant forget basculin white stripe

* Update level_up_learnsets.h

* Update species_info.h
 2023-10-26 22:45:33 +02:00
GriffinR
c169b856d4
Merge pull request #1937 from kittenchilly/removewhitespace 
Remove all trailing whitespace
 2023-10-26 10:09:00 -04:00
GriffinR
3a8df46832
Merge pull request #1938 from AsparagusEduardo/pret/pr2/ndebugModern 
Fix mini_printf encoded string -Werror=pointer-sign warning
 2023-10-26 10:08:25 -04:00
Bassoonian
bb9d3208b0
Frontier ban refactor (#3465) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-10-26 10:52:43 -03:00
Eduardo Quezada
25d6f8ba74 Fix mini_printf encoded string -Werror=pointer-sign warning 2023-10-26 09:25:50 -03:00
Alex
cb38f3bee6
Fixes legendary backgrounds (#3464) 
* Fixes legendary backgrounds

* missed one

* forgot break
 2023-10-25 17:06:25 +02:00
Bassoonian
7a9221e7b9
Rename output roms (#3462) 
* Rename output roms

* Update build.yml
 2023-10-25 07:51:12 -03:00
Alex
25a57d48d9 fixes tests 2023-10-25 10:18:59 +02:00
Alex
f6781a77d4 merge rhh/upcoming 2023-10-25 09:42:19 +02:00
Alex
591ef71e3b
Fixes form change when using switch moves (#3463) 
* Fixes form change with switch moves
 2023-10-25 08:33:43 +01:00
Eduardo Quezada D'Ottone
81cbbdb185
Setting Modern as default (#3305) 2023-10-24 13:31:03 +01:00
Eduardo Quezada D'Ottone
4b1d774373
Merge master (#3460) 2023-10-24 06:42:56 -03:00
Martin Griffin
74c08dc955 Merge remote-tracking branch 'rhh/master' into upcoming 2023-10-24 08:58:02 +01:00
Martin Griffin
5fe564f014
Detect 'NOT x; NOT y;' (#3459) 
Fix Purifying Salt to be immune to statuses from secondary effects.
 2023-10-24 09:55:32 +02:00
Martin Griffin
bb6efb1d83
fix -Wmaybe-uninitialized for ModifyPersonalityForNature test (#3457) 2023-10-24 06:10:51 +01:00
sbird
4488f983be fix -Wmaybe-uninitialized for ModifyPersonalityForNature test 2023-10-24 01:02:02 +02:00
Eduardo Quezada
1137d54b61 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	asm/macros/battle_script.inc
#	src/battle_script_commands.c
 2023-10-23 17:36:42 -03:00
Martin Griffin
1110d0aeb9
ROM space on debug menu (#3453) 2023-10-23 17:12:17 -03:00
Frank DeBlasio
bac135c6e8
Gave Razor Fang EVO_HELD_ITEM type/fieldUseFunc properties (#3456) 2023-10-23 17:03:31 -03:00
kittenchilly
333523e5f7 Remove all leading whitespace 2023-10-23 13:24:38 -05:00
Philipp AUER
4aabd09ab3
Fix test_runner.c modern warning (#3451) 2023-10-23 19:41:59 +02:00
Martin Griffin
3b8446d7e5
Fix Synchronize devnote + Gen9 behaviour (#3455) 2023-10-23 17:19:08 +01:00
Bassoonian
5592706a71 Fix Synchronize devnote + Gen9 behaviour 2023-10-23 17:59:07 +02:00
Martin Griffin
5fd36a8e39
Fix ModifyPersonalityForNature (#3452) 2023-10-23 09:37:40 -03:00
Eduardo Quezada D'Ottone
26971fc3ac
Add species defines for base forms with names (#3248) 
* Fixed Aegislash test not being properly made.
* Added conditions to BattleSetup_StartLegendaryBattle switch
 2023-10-23 12:59:15 +01:00
Eduardo Quezada D'Ottone
6585a62b13
Dynamax Cleanup (#3435) 
* Mon animation names
* Moved indicator code so it follows the same standards as the other indicators
* Whitespace
* Fixed modern compile
* Fixed issue that caused Low Key Toxtricity learning Amped moves when Gigantamaxed
 2023-10-23 11:39:22 +01:00
LOuroboros
cd59e055c2
Made Reflect Type handle 3rd types (#3303) 
* Made Reflect Type handle 3rd types

Misc:
-Turned VARIOUS_TRY_REFLECT_TYPE into a callnative (BS_TryReflectType)
-Introduced a macro to to check for typeless Pokémon (Pokémon who have Mystery in all 3 type slots) in battle.
-Made the new BS_TryReflectType take into account the forms for Arceus and Silvally, rather than just their default form.
 2023-10-23 10:08:36 +01:00
Martin Griffin
b0b6e16042 Separate ASSIGN_TEST from NEXT_TEST 
Silences a warning about an invalid pointer when building with modern.
 2023-10-23 07:58:45 +01:00
Martin Griffin
6e7e7fdafa make check MODERN=1 in a separate build directory 2023-10-23 07:47:13 +01:00
Martin Griffin
ef1c60de67 Buffer 'GBA: '-prefixed messages 
TODO: Detect illegal opcodes in the test runner because mgba-rom-test
evaluates them very slowly, making the TIMEOUT mechanism effectively
realtime.
 2023-10-23 07:47:13 +01:00
kittenchilly
3755155e9d
Update friendship evo threshold to gen 8+ with config (#3376) 2023-10-22 18:05:54 -03:00
Eduardo Quezada
bcf0377d9a Merge branch 'RHH/master' into RHH/upcoming 2023-10-22 16:30:26 -03:00
Eduardo Quezada D'Ottone
77e2b0dd2c
Test cleanup and improvements (#3449) 
* Fixed duplicated test names

* Test improvements for Jaboca, Kee and Rowap Berries

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

* Lansat Berry test improvements

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

* Jaboca Berry/Bug Bite interaction test

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

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-10-22 21:22:59 +02:00
kittenchilly
d495e177b9
Add Snow weather animation (#3440) 
* Snow weather animation

* Update battle_anim_scripts.s

* Apply changes from review
 2023-10-22 21:15:07 +02:00
Eduardo Quezada D'Ottone
7fdc4aacda
Fixed Cheat Start not initiating time-based events (#3446) 2023-10-22 21:03:54 +02:00
Alex
bf56ea8a8b apply suggestions 2023-10-22 19:46:31 +02:00
Martin Griffin
8a6284c408
Fix battle test estimateCost bug (#3448) 2023-10-22 10:03:46 -03:00
Alex
8ab2fbd9a2
Fixes tests rng (#3433) 
* Seed RNG before setUp

Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
 2023-10-22 10:20:27 +01:00
Martin Griffin
551dc62085
Added a macro to flush the text box in battles (#3442) 2023-10-22 08:26:36 +01:00
Eduardo Quezada
a34c260169 Merge branch 'RHH/master' into RHH/upcoming 2023-10-21 23:59:33 -03:00
Eduardo Quezada D'Ottone
eb907c343d
[pokedex_plus] refactor #if to C if (#3445) 2023-10-21 23:10:30 -03:00