Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,621 Commits 1 Branch 0 Tags
552fe79762d4a11dd70f392ea0ee26305c551625
Commit Graph
179 Commits
Author SHA1 Message Date
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
Eduardo Quezada d00c8902f9 Whitelist instead of Blacklist for TOOLDIRS in Makefiles 2023-02-25 16:49:41 -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 f933ad3183 Build patchelf and hydra only for check 2023-02-10 18:06:15 +01:00
Martin Griffin 074f1b544e Use variable in patchelf invocation 2023-02-09 23:29:14 +01:00
Martin Griffinandsbird 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 1d7e8bd730 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 
# Conflicts:
#	asm/macros/battle_ai_script.inc
#	asm/macros/battle_script.inc
#	data/battle_ai_scripts.s
#	include/link_rfu.h
#	src/pokemon.c
#	src/pokemon_summary_screen.c
#	src/sound.c
 2022-09-13 16:22:42 -03:00
Eduardo Quezada 65108c3192 Cleaned trailing whitespace 2022-09-11 14:14:49 -04:00
Eduardo Quezada f3bebcd12c Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 
# Conflicts:
#	include/battle_anim.h
#	include/global.h
#	include/pokemon.h
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
 2022-07-22 22:57:02 -04:00
Kurausukun 0bda107188 don't build modern with -g by default 2022-04-20 01:07:10 -04:00
LOuroboros fa39dc76dc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
GriffinR fd7457b05a Remove berry fix 2022-01-13 15:26:20 -05:00
ultima-soul 988320b89a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-08-17 11:25:13 -07:00
luckytyphlosion b3d66f5528 Merge branch 'master' of https://github.com/pret/pokeemerald 2021-07-02 12:53:12 -04:00
luckytyphlosion 9fd27fe855 Fix modern builds when devkitARM is not in PATH. 2021-07-02 12:52:31 -04:00
PikalaxALT 6ca73737cf Fix regex error 2021-06-18 12:53:15 -04:00
PikalaxALT ae8f6e29f8 Symplifi symfiles 2021-06-16 14:43:35 -04:00
PikalaxALT 5ccac26f26 Port symfile implementation from Ruby, FireRed 2021-06-16 11:03:23 -04:00
ultima-soul 0a87adad1a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-06-07 18:05:52 -07:00
luckytyphlosion 7e1ae9f95d Remove debug print statements in Makefile. 2021-06-03 18:22:49 -04:00
luckytyphlosion 4687847ace Fix building with KEEP_TEMPS=1, and NODEP=1. 
KEEP_TEMPS=1 not working was due to the pattern substitution in the old makefile rules for compiling C files ($*) not working with the explicit generation of dependencies. NODEP=1 not working was due to the NODEP rule for src/%.s not being updated to use preproc and cpp.
 2021-06-03 17:46:09 -04:00
luckytyphlosion 92152e45e2 Fixes to makefile. 
Merge C_ASM_DEP and DATA_ASM_DEP, NODEP and SCAN_DEPS can be overridden, add --no-print-directory to MAKEFLAGS in make_tools.mk (also removed some unused variables), add newline to help message in preproc.
 2021-06-01 23:22:15 -04:00
luckytyphlosion f0b41debc3 Merge branch 'master' of https://github.com/pret/pokeemerald into remove-temps 2021-06-01 20:40:27 -04:00
luckytyphlosion a839463c84 Optimize Makefile. 
Don't do recursive makes for COMPARE and MODERN, use minimal makefile for making tools.
 2021-06-01 20:40:11 -04:00
luckytyphlosion c723d980e7 Merge branch 'master' of https://github.com/pret/pokeemerald 2021-05-23 10:51:26 -04:00
luckytyphlosion c50a21fba0 Tidy just cleans both normal and modern. 2021-05-05 16:07:21 -04:00
luckytyphlosion 9da2142a39 Scan all deps of time, also prevent deps from being scanned twice for compare and modern. 2021-05-04 10:08:54 -04:00
Michael Panzlaff 2859fa60cb Makefile: use different linker library sets for modern 2021-04-17 23:19:01 +02:00
Michael Panzlaff 38d0cca903 modern: link against libnosys 
Without libnosys undefined references will occur if
libc functions are used.
 2021-04-17 22:48:57 +02:00
Michael Panzlaff 0767f4b9ce Makefile: resolve libgcc and libc in correct order 
When actually utilizing functions from libc, linking will fail
because the functions used from libc have to be defined after libc.

This is the case with libgcc, so we swap their order.
 2021-04-17 19:00:02 +02:00
ultima-soul be7acc919a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-04-03 21:53:29 -07:00
ExpoSeed 4a8e18cea2 Merge pull request #1336 from LOuroboros/cries_PE_redux 
Various tweaks related to Pokémon cries
 2021-02-03 11:26:44 -06:00
GriffinR 45ee3a687d Add comments for some data in crt0.s 2021-01-29 18:36:39 -05:00
luckytyphlosion 57bc32e300 Fix templess builds from not exiting on error. 2021-01-27 09:57:50 -05:00
luckytyphlosion 10c0566121 Don't keep temporary C build files by default. 2021-01-19 11:43:50 -05:00
LOuroboros c2805ff35b Tweaked Makefile after cry changes 2021-01-18 11:42:42 -03:00
luckytyphlosion 98f8c96c9e Fix $(AR) define, remove \u warns on macOS. 2021-01-04 11:35:59 -05:00
ExpoSeed 10f4b48215 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-01 14:14:51 -08:00
luckytyphlosion 3d686116d8 [Round 3] Apply all source related changes for the new INSTALL.md in one commit. 2020-12-16 21:24:44 -05:00
luckytyphlosion 5a5acfb0ad [Round 3] Revert multiple source change commits for re-commit. 2020-12-16 21:24:08 -05:00
luckytyphlosion 32e566def0 Don't define CPP until MODERN is defined. 2020-12-16 21:16:55 -05:00
luckytyphlosion 166183d5ed [Round 2] Apply all source related changes for the new INSTALL.md in one commit. 2020-12-16 20:31:56 -05:00
luckytyphlosion 345aab63cf [Round 2] Revert multiple source change commits for re-commit. 2020-12-16 20:31:10 -05:00
luckytyphlosion 11df2113d9 Use arm-none-eabi-cpp for modern. 2020-12-16 20:29:58 -05:00
luckytyphlosion d597c5c883 Fix modern builds. 
We actually need standard includes for modern.
 2020-12-16 20:17:27 -05:00
luckytyphlosion 2783eed825 Check for $(TOOLCHAIN) before checking for $(TOOLCHAIN)/bin 
if TOOLCHAIN is blank, wildcard can still detect the `/bin` directory.
 2020-12-16 19:54:12 -05:00
luckytyphlosion 936ba7f1bf Apply all source related changes for the new INSTALL.md in one commit. 
For people who want to have dkPless builds in their repo.
 2020-12-16 15:10:01 -05:00
GriffinR 49bdaeb940 Remove redundant modern CFLAGS 2020-12-16 14:10:30 -05:00
Kurausukun 58976ebaa8 Merge remote-tracking branch 'upstream/master' into berry_crush 2020-12-10 23:30:52 -05:00
luckytyphlosion 70b6e05a47 Remove useless comment. 2020-11-18 21:31:04 -05:00