ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,364 Commits 1 Branch 0 Tags 235 MiB
5b498e968f
Commit Graph

164 Commits

Author SHA1 Message Date
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
GriffinR
a418f8d976
Merge pull request #1755 from GriffinRichards/map-dynamic 
Rename special map constants, treat warp ids as strings
 2022-10-18 22:45:56 -04:00
GriffinR
e473aaf783 Merge branch 'master' of https://github.com/pret/pokeemerald into entry_json 2022-09-25 18:10:04 -04:00
Eduardo Quezada
6b79c7772c Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909 
# Conflicts:
#	src/battle_interface.c
 2022-09-16 11:56:50 -03:00
Eduardo Quezada
de32940fdf Further removed trailing whitespaces 2022-09-13 16:26:36 -03:00
Eduardo Quezada
a462db5e69 Automated creation of MAP_GROUP_COUNT for the debug menu 2022-09-09 23:34:05 -04:00
GriffinR
36551dff2f Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
TheXaman
13cc640b78 whitspace changes, removed wrong comment 2022-09-02 18:53:51 +02:00
TheXaman
8c9a59ec1c Merge branch 'tx_debug_system' of https://github.com/TheXaman/pokeemerald into tx_debug_system_rhh 2022-08-29 19:13:11 +02:00
Martin Griffin
5e593a62fb
Ignore num_tiles if it would truncate non-transparent tiles (#1729) 2022-08-18 23:07:25 -04:00
Kurausukun
2e7f50064c use floats for tempo calculation 2022-06-28 00:11:59 -04:00
TheXaman
c54bf21b01 Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system 2022-04-16 23:18:35 +02:00
garakmon
3fe423a6f4 use json for region map sections 
- update nlohmann/json and pantor/inja in tools/
  - create new inja template
 2022-04-04 23:32:03 -04:00
Andrea Jemmett
f8b3a1c658 Fix finding libpng in gbagfx and rsfont 
On macOS 12, Homebrew installs libpng in a custom location.
 2022-03-16 14:41:12 +01:00