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
244 Commits
Author SHA1 Message Date
Suppai_Neko 7c9ae20407 Added Custom Wild Battles 2023-04-09 14:09:22 -07:00
Suppai_Neko d28afca972 Merged Emerald Expansion and Follower Pokemon 2023-04-07 19:22:49 -07: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
Eduardo Quezada b62e5aa72e Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 
# Conflicts:
#	src/battle_main.c
#	src/field_specials.c
#	src/trade.c
 2023-02-15 14:11:03 -03:00
Eduardo Quezada bd54990333 Review changes 2023-02-15 13:56:11 -03:00
Eduardo Quezada 96865f66af Updated term to modernFatefulEncounter 2023-02-11 22:36:42 -03:00
Eduardo Quezada 6da5e0a280 Rename eventLegal to fatefulEncounter 2023-02-11 17:13:53 -03:00
GriffinR 9003966fcc Misc field_specials cleanup 2023-02-01 11:48:55 -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 29c1af50ca Fix Best Streak stat name 2023-01-20 11:25:04 -05: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 483c3d5c13 Document wonder news 2022-11-22 02:17:03 -05:00
crater-git 9f16d1dd12 Fixed battle frontier tutors (for real this time) 2022-08-27 22:45:10 -04:00
Eduardo Quezada 231727d02b Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge 
# Conflicts:
#	asm/macros/event.inc
#	data/specials.inc
#	include/constants/species.h
#	src/data/pokemon/base_stats.h
 2022-07-22 23:33:04 -04:00
AgustinGDLV 54163240d8 implemented toggelable cancellation / multi-evo 2022-05-08 20:55:29 -07:00
ultima-soul 3ed51d6d91 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-21 10:40:26 -08:00
GriffinR 71605556ab Clean up braille_puzzles 2021-10-30 11:59:14 -04:00
GriffinR 6dc3c9864c Merge pull request #1520 from GriffinRichards/doc-random 
Document random remaining symbols
 2021-10-24 23:43:17 -04:00
GriffinR 7590bacec1 Label remaining symbols in field_specials 2021-10-18 02:14:29 -04:00
GriffinR db8ce5d7f9 Clean up mauville_old_man, drop ScrSpecial prefix 2021-10-18 01:09:41 -04:00
GriffinR 3cd27acbea Document wonder news 2021-10-17 02:09:31 -04:00
GriffinR 845a5e99cc General mystery gift documentation, finish mystery gift client/server/scripts 2021-10-16 23:35:17 -04:00
GriffinR c02001c46d Document mystery gift link scripts, general mystery gift 2021-10-15 12:05:06 -04:00
GriffinR a2655ba9ab Merge branch 'master' into doc-union 2021-10-07 16:10:35 -04:00
GriffinR dfdcfc1568 Document remaining functions in cable_club 2021-08-15 16:22:15 -04:00
ultima-soul 02c9e040df Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-11 16:33:10 -07:00
GriffinR 06351bf63c Remove address comments 2021-07-20 15:18:31 -04:00
ultima-soul 56fc420187 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-28 21:34:30 -07:00
GriffinR f7a699c686 Merge pull request #1421 from GriffinRichards/doc-tvrecordmix 
Document TV
 2021-04-29 00:25:01 -04:00
GriffinR aad090e154 Document TV 2021-04-26 12:35:35 -04:00
GriffinR bc9fc38254 Misc contest cleanup 2021-04-22 15:51:04 -04:00
GriffinR dbe24f0baa Clean up contest_painting 2021-04-21 20:04:12 -04:00
ultima-soul 939608f5b8 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-02 13:16:40 -07:00
GriffinR 86856098a3 Document Dewford Trend 2021-03-31 16:08:42 -04:00
ultima-soul 5bab9474dc Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-03-22 23:08:19 -07:00
GriffinR 55a40b901f Label battle tower link script 2021-03-04 19:30:19 -06:00
Deokishisu 7b2bf8c7e2 Rename obedient/fatefulEncounter to eventLegal 
Per discussion on pret, `obedient`/`fatefulEncounter` has been renamed to `eventLegal`, and all related functions and constants have been modified with this in mind.

Additionally, fixed some whitespace alignment issues in `script_cmd_table.h`, `pokemon.h`, and `tv.c` from the last commit.
 2021-02-15 14:54:35 -05:00
Deokishisu b89c3e901e Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h 
The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi.

The giftRibbon fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the obedient bit was renamed `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
 2021-02-15 11:40:16 -05:00
GriffinR 9e59581220 Document object lock and some trainer approach 2021-01-26 04:42:18 -05:00
Evan 99d9a36860 add totem boosts 2020-11-19 10:35:37 -07:00
GriffinR 65bd2faf94 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest 2020-08-16 05:59:10 -04:00
GriffinR 3779422489 Split contest funcs from script_pokemon_util 2020-08-13 17:42:12 -04:00
GriffinR a1cc7d2bd6 Document faraway island 2020-07-19 14:12:38 -04:00
GriffinR 431c60c92c Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti 2020-07-08 15:45:31 -04:00
GriffinR 76f6d05173 Document confetti 2020-06-17 03:39:03 -04:00
GriffinR 2859900ea9 Second pass on documenting union room 2020-06-10 17:30:59 -04:00
GriffinR 3f97763181 Document cable_club.c 2020-06-06 16:10:03 -04:00
GriffinR fd77eb1eb9 Document wireless_communication_status_screen.c 2020-06-03 14:07:40 -04:00
GriffinR dde4a0416c Label GCN link flags field 2020-04-13 08:42:31 -04:00
Martin Griffin 4485d51522 Document decoration.c 2020-03-06 09:47:20 +00:00