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

177 commits

Author SHA1 Message Date
Bassoonian
e8890bc8f3
Fix teachable learnsets crashing in some environments (#4389) 2024-04-15 15:57:42 -04:00
Eduardo Quezada
ec83b11354 Merge branch '_pret/master' into _RHH/pr/upcoming/pret_20240210 
# Conflicts:
#	gflib/malloc.c
 2024-02-10 18:05:20 -03:00
Eduardo Quezada D'Ottone
ce97984d80
Updated teacheable learnests to Indigo Disk data (#4155) 
* Updated teacheable learnests to Indigo Disk data

* Adjusted titles to indicate where to modify the moves
 2024-02-08 17:27:26 +01:00
Bassoonian
5d5cc76a2c
Teachable learnset helper mechanics (#3856) 
* Teachable learnset helper mechanics

* Rename folder and python script

* Some teachable learnset work

* Update PoryMoves file labels

* Add header and make custom json

* Include found moves in output file

* Update SV file to latest version

* Don't run if there are no jsons to be found

* Add Basculin duplication in json

* Add universal move support to

* Ignore and skip Mew

* Integrate tool in Makefile

* Condense Basculin learnsets

* Split Oinkologne for easier generation

* Add Deoxys' XD move tutor data

* Add missing Darumaka/Yamask Galarian SwSh TMs

* Add TID species to sv.json

* Update sv.json to The Indigo Disk data

* Add Python install instructions

* Fix Makefile

* Expand header with more information

* Add config to allow disabling the learnset helper

* Update include/config/pokemon.h

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

* Don't crash if the config is missing

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2024-02-08 11:32:48 -03:00
Eduardo Quezada
09d12fb154 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	ld_script_modern.ld
#	src/battle_ai_switch_items.c
 2024-02-01 12:52:31 -03:00
Eduardo Quezada D'Ottone
a2a38a57e0
Added passing "KNOWN_FAILING" to test summary (#4063) 
* Added passing "KNOWN_FAILING" to test summary

* Added test names for passing KNOWN_FAILING to summary

* Removed unused function
 2024-01-29 17:01:50 -03:00
GriffinR
232eab4bee
Merge pull request #1975 from Sierraffinity/jsonproc-fix 
jsonproc: filter out every non-alphanumeric character
 2024-01-28 13:54:11 -05:00
Sierraffinity
b98e044ce9 jsonproc: filter out every non-alphanumeric character 2024-01-27 19:29:29 -08:00
Sierraffinity
e85750bb55 gbagfx bit depth upconversion fix 2024-01-27 14:29:31 -08:00
Ariel A
85aab338a9 Merge branch 'guillotine' into guillotine-expansion 2024-01-08 19:43:06 -05:00
Ariel A
1ce961768e Added automatic runtime decapitalization. 2024-01-07 20:21:14 -05:00
kittenchilly
333523e5f7 Remove all leading whitespace 2023-10-23 13:24:38 -05: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
Eduardo Quezada
0d5b00aaf2 Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829 
# Conflicts:
#	README.md
#	data/battle_ai_scripts.s
#	data/battle_scripts_1.s
#	data/maps/BattleFrontier_Lounge7/scripts.inc
#	include/battle_anim.h
#	include/battle_message.h
#	include/constants/items.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_anim_throw.c
#	src/battle_anim_utility_funcs.c
#	src/battle_controller_link_opponent.c
#	src/battle_controller_link_partner.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_recorded_player.c
#	src/battle_controller_wally.c
#	src/battle_gfx_sfx_util.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/party_menu.h
#	src/data/pokemon/tmhm_learnsets.h
#	src/daycare.c
#	src/field_specials.c
#	src/hall_of_fame.c
#	src/party_menu.c
#	src/pokemon.c
#	src/tv.c
 2023-08-31 14:28:01 -04:00
grunt-lucas
9d170c7e35 gbagfx to respect user CC setting 2023-08-22 07:37:48 -07:00
Martin Griffin
b31f10d124
Make Hydra respect -jN (#3132) 2023-07-14 19:10:42 +02:00
Eduardo Quezada D'Ottone
5f29ae6f99
Failed tests are now listed in the total (#3073) 
* Failed tests are now listed in the total
 2023-07-14 10:17:54 +01:00
Martin Griffin
72bb8b71b6 More conservative unlink error in Hydra 2023-06-22 17:17:43 +01:00
Martin Griffin
e8b2eea89d Sensible names for temporary ROMs in Hydra 2023-06-22 17:17:41 +01:00
Martin Griffin
20aea1f32f Print runner number in Hydra 2023-06-22 17:17:41 +01:00
Eduardo Quezada
4c57b84cd9 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230602 
# Conflicts:
#	graphics/pokemon/mawile/footprint.png
#	src/battle_gfx_sfx_util.c
#	src/fldeff_sweetscent.c
#	src/pokedex.c
 2023-06-02 11:45:28 -04:00
Bassoonian
c05404e772 Merge branch 'master' of https://github.com/pret/pokeemerald into rhhpretmerge 2023-05-12 13:48:52 +02:00
GriffinR
6fdf75bd8c Support plain pixel conversion, convert spinda spots to .png 2023-05-11 13:41:38 -04:00
Bassoonian
069627a7fc Hydra OSX support 2023-05-03 15:36:17 +02:00
GriffinR
8e5347b450 Fix mapjson misreporting errors when processing map_groups.json 2023-04-30 23:29:31 -04:00
Eduardo Quezada D'Ottone
c922ff69b9 Added To-Do test results 2023-03-23 22:34:08 -03:00
Eduardo Quezada D'Ottone
dd686ee606
More detailed hydra test results (#2722) 2023-03-08 10:11:11 -03:00
Eduardo Quezada
9917f5cc8b Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303 
# Conflicts:
#	Makefile
#	include/constants/pokemon.h
#	include/pokemon.h
#	make_tools.mk
#	src/battle_ai_script_commands.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/party_menu.c
#	src/pokemon.c
#	src/trade.c
#	src/trainer_pokemon_sprites.c
 2023-03-03 11:00:50 -03:00
GriffinR
be84793713 Let scaninc/preproc ignore empty asm files 2023-02-27 12:47:35 -05:00
Eduardo Quezada
e3ed114754 Updated commands comment 2023-02-22 15:09:47 -03:00
Eduardo Quezada
5808e82434 Added assumption fail total, made fails into their own counter and changed "SKIP" to "ASSUMPTION_FAIIL" in log 2023-02-22 15:05:39 -03:00
Eduardo Quezada
54e388a375 More detailed hydra test results 2023-02-22 00:30:12 -03:00
Martin Griffin
f3c6b647c0
Hydra fixes and improvements (#2718) 
* Build tools for check

* Display PASSes when Hydra exits

* Print buffered output at exit

* Remove unused test summaries

* Show SKIP if ASSUMPTIONS fails
 2023-02-21 16:30:42 +01:00
Martin Griffin
d59e576b51
Hydra: remove tmpnam (#2668) 
* Use a PID-based filename instead of tmpnam

* Use FILENAME_MAX over L_tmpnam

---------

Co-authored-by: Martin Griffin <martin.griffin@algosport.co.uk>
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
 2023-02-09 23:54:11 +01:00
GriffinR
c29cf5a5e5 Remove unnecessary version check 2023-02-08 13:34:38 -05:00
GriffinR
de56e400ff Sync clone object macro 2023-02-08 13:11:10 -05:00
GriffinR
118a9701c9 Add event type errors 2023-02-08 12:52:28 -05:00
GriffinR
db5edc49d7 Sync mapjson 2023-02-08 12:52:06 -05:00
Martin Griffin
f1b9872bf0 Test moves, items, and abilities in battle 
Thank you to SBird for providing mgba-rom-test binaries and Spikes/Toxic
Spikes tests!

Co-authored-by: sbird <sbird@no.tld>
 2023-02-01 13:53:57 +00:00
Eduardo Quezada
7774c9727d Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230125 
# Conflicts:
#	tools/mapjson/mapjson.cpp
 2023-01-25 20:28:55 -03:00
Eduardo Quezada
749225ace1 Matching merge from upstream pret 
# Conflicts:
#	graphics/interface/menu_info.png
#	include/pokemon.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_mons.c
#	src/battle_anim_water.c
#	src/battle_controller_opponent.c
#	src/battle_gfx_sfx_util.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
#	src/pokemon_summary_screen.c
 2023-01-20 12:31:54 -03:00
GriffinR
713e1825bd Report JSON field names in errors 2023-01-17 16:25:33 -05:00
GriffinR
1e3b0e8d76 Treat all mapjson fields as strings 2023-01-17 16:00:09 -05:00
GriffinR
b836d9ebfb Stop some redundant JSON reads 2023-01-17 15:40:39 -05:00
GriffinR
15431bd397 Add initial mapsjon type conversions 2023-01-17 15:25:39 -05:00
GriffinR
3ee3d6e346 Support reducing png bit depth 2023-01-11 10:11:11 -05:00
Eduardo Quezada
fbc71b3686 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 2022-11-03 21:46:37 -03:00
tustin2121
116364334d Fix build of jsonproc 
- Changing uint to unsigned int, as uint is not standard.
 2022-11-02 19:51:43 -05:00
Eduardo Quezada
e4a439aa46 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 
# Conflicts:
#	src/data/bard_music/moves.h
#	src/data/bard_music/pokemon.h
 2022-10-30 12:30:38 -03:00
Marcus Huderle
ae6ec3b1b8 Change cleanString() to convert invalid chars to underscores 2022-10-22 15:09:37 -05:00