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,480 Commits 1 Branch 0 Tags 235 MiB
934fe46008
Commit Graph

611 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
GriffinR
b248791f47
Merge pull request #1904 from GriffinRichards/temp-alias 
Add temp flag and var aliases
 2023-08-11 15:45:00 -04:00
Martin Griffin
912a80e27a
Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
GriffinR
866c32a735 Add temp var aliases 2023-08-04 14:17:28 -04:00
GriffinR
6d4dadd7b5 Add temp flag aliases 2023-08-03 15:55:06 -04:00
Eduardo Quezada
1980a115b4 Integrated GAME_STAT_ENTERED_BATTLE_TOWER bugfix from upstream 2023-07-06 13:07:03 -04:00
Eduardo Quezada
f21953f254 Merge remote-tracking branch 'pret/master' into RHH/master 2023-07-06 13:06:31 -04:00
PSF
b2901c51b0 Added bugfix for SaveBeforeLinkMultisChallenge to remove extra incrementgamestat 2023-06-27 15:34:31 -07:00
Eduardo Quezada
7c29a24110 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretsync20230413 2023-04-13 17:05:48 -04:00
Zunawe
492422b6bd Fix scanner item flag name 2023-03-23 21:47:26 -07:00
Eduardo Quezada
51b716c9d9 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319 
# Conflicts:
#	data/battle_scripts_2.s
#	include/constants/battle_string_ids.h
#	include/constants/songs.h
#	src/battle_message.c
#	src/data/pokemon/species_info.h
 2023-03-19 20:28:56 -03:00
GriffinR
bb078e0618
Merge pull request #1864 from AsparagusEduardo/pret/doc/songsComments 
Document music usage to make it easier to search for a specific track
 2023-03-05 15:29:38 -05:00
Eduardo Quezada
a6bd35ceab Review changes 2023-03-05 17:17:39 -03:00
GriffinR
ce6875817f
Merge pull request #1860 from GriffinRichards/metatile-labels 
Format metatile_labels
 2023-03-04 23:36:04 -05: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
Zunawe
f376b71f7c Fix wrong route in item flag name 2023-02-25 13:48:39 -08:00
Eduardo Quezada
d330ca051a Document music usage to make it easier to search for a specific track 2023-02-23 11:44:23 -03:00
Zunawe
60be59d18b Fix wrong route in hidden item flag name 2023-02-22 13:13:57 -08:00
Zunawe
8f74a6777a Fix spelling mistake for item flag 2023-02-20 18:17:30 -08: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
GriffinR
b656565af0 Standardize RS mossdeep gym metatile labels 2023-02-14 11:42:13 -05:00
GriffinR
9003966fcc Misc field_specials cleanup 2023-02-01 11:48:55 -05:00
Eduardo Quezada
4a9515e8db Restored improvements from upstream 2023-01-20 12:34:15 -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
e88139d1b5 Add fix for Battle Tower cloning bug 2022-12-29 11:22:53 -05:00
Eduardo Quezada
55ba9d8364 Fixed right Frontier move tutor not loading their move list correctly. 2022-12-18 13:17:33 -03: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
GriffinR
c76beed989
Merge pull request #1807 from pret/porymap-5 
Update for Porymap 5.0.0
 2022-10-30 11:01:37 -04:00
GriffinR
01c71b4ce1 Fix more text and movements labeled as scripts 2022-10-30 03:27:28 -04:00
GriffinR
f439a2dee7 Fix EventScript_WroteSecretCodeLockOpened typo 2022-10-30 03:14:47 -04:00
GriffinR
cc182bf05e Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04: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
tustin2121
4730870646 VAR_RUN_TRIGGER_IMMEDIATELY -> TRIGGER_RUN_IMMEDIATELY 
Getting rid of the VAR_ prefix, to avoid the porymap problem.
 2022-10-18 21:12:31 -04:00
tustin2121
327c648e87 Document seldom-used trigger functionality 
Added a define for use in overworld triggers where the goal is to run the provided script in the immediate script context instead of the global one like normal. This is used in triggers in the desert, on faraway island, and a couple other places to do weather effects quickly and on the same frame. Suggestions for a better define name are welcome.
 2022-10-16 20:46:50 -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
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
LOuroboros
222362e804 Fixed Raquaza typo 2022-09-12 21:26:22 -03:00
Eduardo Quezada
69f01d73cd Added missing uses of Fairy type for Union Room and Battle Factory 2022-09-11 12:41:56 -04:00
GriffinR
36551dff2f Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Eduardo Quezada
5403cd036e Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 
# Conflicts:
#	include/battle.h
#	include/battle_controllers.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
 2022-09-02 23:24:08 -04:00
Eduardo Quezada
c7fc2e13f7 Renamed TM flags to keep consistency with the rest of the repo 2022-09-02 16:54:58 -04:00
Eduardo Quezada D'Ottone
8ca2f949e3
Merge pull request #2233 from gruxor/tmhm_rework 
Reworked TMHM into expandable list format
 2022-08-29 04:20:45 -04:00
crater-git
9f16d1dd12 Fixed battle frontier tutors (for real this time) 2022-08-27 22:45:10 -04:00
Eduardo Quezada
7c86bd5d08 Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826 
# Conflicts:
#	include/battle_interface.h
#	src/battle_anim_effects_1.c
#	src/battle_script_commands.c
#	src/field_specials.c
 2022-08-26 22:23:37 -04:00
GriffinR
0516f94837
Merge pull request #1753 from LOuroboros/GetLeadMonFriendshipScore 
Added constants for GetLeadMonFriendshipScore
 2022-08-26 14:52:10 -04:00
crater-git
54ee960970 Fixed Battle Frontier tutor move IDs 2022-08-26 10:12:11 -04:00
Eduardo Quezada
6fb4da68f3 Corrected Oldale Town Sign labels 2022-08-25 22:00:24 -04:00
GriffinR
ce4a6e9067 MAP_NONE -> MAP_DYNAMIC 2022-08-25 21:34:05 -04:00
LOuroboros
11d6ae4820 Renamed the GetLeadMonFriendshipScore constants 2022-08-25 11:34:37 -03:00
LOuroboros
1f4ef2a0fb Added constants for GetLeadMonFriendshipScore 2022-08-25 10:40:56 -03:00