Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,646 Commits 1 Branch 0 Tags
main
Commit Graph
39 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
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
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
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
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
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 c54bf21b01 Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system 2022-04-16 23:18:35 +02:00
GriffinR 2495d18132 Add missing :req, remove old macros 2022-01-23 18:52:04 -05:00
TheXaman 2f8896f2f0 Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system 2021-11-18 15:13:04 +01:00
luckytyphlosion c723d980e7 Merge branch 'master' of https://github.com/pret/pokeemerald 2021-05-23 10:51:26 -04:00
GriffinR 65fd334256 Name map groups 2021-05-11 10:16:04 -05: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
TheXaman 6456009a44 Implementation if Pyredrid and AsparagusEduardo debug menu plus huge rewrite and tons of additions 
V2: Fly, Warp, Flags, Vars, give items, give pkm 2 versions

Improved cheats, reworked the vars system

vars function now starts at VARS_START and end VARS_END

Figured out how to display FieldMessages, reimplemented CheckSafeBlock, cleanup

DebugAction_DestroyExtraWindow instead of multiple, renamed text variables

cleanup + pokemon simple

give pokemon complex nearly done

Complex pkm works, items now with icons

if statement cleanup

alter build tools to include maps per map group

Warp functionallity

added hex value to flags and vars

cleanup

Credits
 2020-10-20 20:37:02 +02:00
GriffinR 2439f42de4 Add warnings to generated files 2020-07-24 03:43:37 -04:00
GriffinR b1d26e10a8 Sync map header property names with pokefirered 2020-04-28 19:59:08 -05:00
GriffinR ec3e86f1d2 Standardize Event Object to Object Event 2019-11-20 22:55:44 -05:00
aaaaaa123456789 e28cf5406b Fix Makefiles to account for the $CC and $CXX environment variables 2019-08-06 20:30:57 -03:00
PikalaxALT 6ff1426abe Quieter "make tools" 2019-07-23 16:17:00 -04:00
Marcus Huderle 19b76bffda Use strings for map json trainer_type and trainer_sight_or_berry_tree_id fields 2019-02-16 16:56:41 -06:00
garak 0b1bb9e4e9 use strings for map json coord_event var_value 2019-02-16 16:14:43 -06:00
Marcus Huderle d4125fef9b Cleanup and add game version flag to mapjson tool 2019-02-04 17:28:45 -06:00
garak 82abc164dc convert mapjson.py to mapjson.cpp 2019-02-03 09:38:29 -06:00
Marcus Huderle 29d6221935 Convert map data to JSON 2019-01-31 15:51:20 -06:00