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,554 Commits 1 Branch 0 Tags 235 MiB
f3e4280f3e
Commit Graph

41 Commits

Author SHA1 Message Date
Ninjdai
56d3506a6f Added day/night system 2023-11-11 20:08:20 +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
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
GriffinR
6fdf75bd8c Support plain pixel conversion, convert spinda spots to .png 2023-05-11 13:41:38 -04: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
3ee3d6e346 Support reducing png bit depth 2023-01-11 10:11:11 -05:00
Eduardo Quezada
de32940fdf Further removed trailing whitespaces 2022-09-13 16:26:36 -03:00
Martin Griffin
5e593a62fb
Ignore num_tiles if it would truncate non-transparent tiles (#1729) 2022-08-18 23:07:25 -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
LOuroboros
554210c5e3 Removed trailing spaces in the most relevant files 
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
 2021-08-24 19:59:32 -03: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
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
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
luckytyphlosion
cc5db41f30 Revert multiple source change commits for rebase. 2020-12-16 13:29:02 -05:00
luckytyphlosion
976b967732 Add msys2 and Cygwin instructions, also add .exe extension to built tools. 
Todo: actually extensively test out msys2 and Cygwin, and double check the readme.
 2020-11-26 20:21:16 -05:00
PokeCodec
fb6f859edd semicolon 2020-07-27 19:17:34 -04:00
GriffinR
a35ab0d023 Fix segfault in gbagfx 2020-06-29 15:28:59 -04:00
PikalaxALT
e0ae696479
Merge pull request #1027 from PikalaxALT/gbagfx_tilemap 
Add tilemap rendering capability to gbagfx
 2020-05-29 16:49:46 -04:00
GriffinR
b057411eea Fix -Wmissing-braces clang warning 2020-04-29 16:39:14 -04:00
PikalaxALT
a4509d06ef Fix an issue with uninitialized tilemap ptr 2020-04-25 16:54:27 -04:00
PikalaxALT
14f76fbe03 Add tilemap rendering capability to gbagfx 2020-04-24 08:47:22 -04:00
Sierraffinity
b2d8c6793d gbagfx: Check for nullptr for new output path 2020-04-22 16:53:11 -07:00
Sierraffinity
21e9ed6615 gbagfx: Various fixes and improvements 
Fix num_colors exceeding amount of colors in palette leading to use of uninitialized colors

Handle png -> pal conversion (aka extracting JASC palettes from png

Allow using only file extension as output to reuse entire path from input before extension
 2020-04-22 14:39:20 -07:00
PikalaxALT
1f4c88c952
Copy Berry Fix MB dism from FR (#777) 
* Copy Berry Fix MB dism from FR
 2019-09-03 15:33:11 -04:00
aaaaaa123456789
e28cf5406b Fix Makefiles to account for the $CC and $CXX environment variables 2019-08-06 20:30:57 -03:00
garak
da1b5365a7 label a flag in the asm 2018-10-17 08:55:09 -04:00
Slawter666
9dec2bdef8 Merge branch 'master' of https://github.com/pret/pokeemerald into spritesheet 2018-09-07 11:50:23 +01:00
Marcus Huderle
78cdd97c8b Add ability to specify metatile dimensions to gbagfx 2018-09-06 11:44:50 -05:00
garakmon
13ed20c6e3 compiler fixes 
The compiler flag -s is not necessary and causes build failure on some
systems (macOS, clang compilers) due to it being deprecated.
Additionally, on those same systems, tools/aif2pcm/main.c failed to
compile due to an overly cautious compiler not liking some struct
declarations.
These changes afaik do not affect other builds.
 2018-06-16 18:49:27 -04:00
golem galvanize
5a5eb4ff59 dumped most of pokenav.s 2018-01-15 23:38:10 -05:00
xenonnsmb
e649e3d248 adding tools from pokeruby 2017-12-03 19:55:01 -06:00
YamaArashi
74834c0ca0 remove old tools 2016-11-01 07:59:44 -07:00
YamaArashi
69d1b312f6 title screen background tiles and palettes 2015-11-24 01:41:14 -08:00
YamaArashi
066d199fe3 add space in include directive 2015-11-23 19:06:19 -08:00
YamaArashi
b951fb1113 dumped fonts 2015-11-23 17:44:06 -08:00
YamaArashi
3e95160b25 tilesets 2015-11-22 15:29:11 -08:00
YamaArashi
8d0d89c00c formatting and license 2015-11-13 22:44:23 -08:00
YamaArashi
4c733f3811 pokemon PNGs and palettes 2015-11-13 21:57:22 -08:00