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
638 Commits
Author SHA1 Message Date
Suppai_Neko 9379107d15 Pulled updated Follow Me Code 2023-04-22 08:33:55 -07:00
Suppai_Neko e8c5f309e1 Added route 111 east 2023-04-21 16:43:30 -07:00
Suppai_Neko 55e0af6d7a Added route 117south and pokemon breeded trainers 2023-04-20 17:45:39 -07:00
Suppai_Neko d6066d9fe0 Added Route 114 south 2023-04-20 07:44:34 -07:00
Suppai_Neko ce2baad217 More maps 2023-04-19 10:32:56 -07:00
Suppai_Neko 7e20448256 Fixed bugs after playtesting 2023-04-17 09:40:20 -07:00
Suppai_Neko 5d92d4d025 Added 2 new routes 2023-04-15 16:36:38 -07:00
Suppai_Neko 6dada29301 Misc 2023-04-13 19:07:04 -07:00
Suppai_Neko 040b0bdc67 Added additional map, PEtalburg North 2023-04-12 09:43:07 -07:00
Suppai_Neko 49fdfecf80 Added Rustboro East Route 2023-04-10 17:42:33 -07:00
Suppai_Neko 552fe79762 Finished Stevens event. Added Fast walking 2023-04-09 18:51:33 -07:00
Suppai_Neko 7c9ae20407 Added Custom Wild Battles 2023-04-09 14:09:22 -07:00
Suppai_Neko aa31fc840f Fixed looking back at pokemon when leaving door going south 2023-04-07 21:19:28 -07:00
Suppai_Neko d28afca972 Merged Emerald Expansion and Follower Pokemon 2023-04-07 19:22:49 -07:00
Suppai_Neko 9bee74dd25 Added extra content in granitecave 2023-04-07 07:43:23 -07:00
Suppai_Neko b30f237786 Added leafs House and 2 new trainers 2023-04-04 18:30:33 -07:00
Suppai_Neko ac596bf32e Added Feebass event 2023-04-03 22:15:08 -07:00
Suppai_Neko e527efc56c Changed maps. Added Trainer. Changed max trainer limit to 1000 2023-04-03 18:56:23 -07:00
Suppai_Neko 72c9413737 Added several more locations 2023-04-02 22:29:52 -07:00
Suppai_Neko 3322391b95 Added extra content to Littleroot 2023-04-02 17:09:34 -07:00
W1serV1ser d076aa96d4 Merge branch 'master' into FollowingPokemon_Gen1-3 2023-03-29 21:31:06 -07:00
W1serV1ser 2dbeffa92b Added option to speed up follower interactions 
By setting the FAST_FOLLOWERS define to TRUE, you can now:
- Have the follower exit a door faster, avoiding the need to stop and wait for the follower to exit.
- Have the follower jump down ledges faster, avoiding the need to stop and wait for the follower to land.
 2023-03-29 20:58:14 -07: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
W1serV1ser 76ba156a5c Merge branch 'master' into FollowingPokemon_Gen1-3 2023-03-11 16:31:44 -08: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