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
3388 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
AgustinGDLV d9ab2d1976 combined TerrainSeed and TerrainAbility loops + added terrain tests 2023-04-03 18:53:34 -07:00
AgustinGDLV f292fefca3 fixed bad switchinabilities call in TerrainSeedLoop 2023-04-03 09:18:47 -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
PSF 0176563d26 Merge branch 'master' of https://github.com/pret/pokeemerald into no-whiteout 2023-03-30 12:47:36 -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
ghoulslash 6574e01e73 Gen. 9 Move Effects, 1st batch (#2534) 2023-03-26 16:20:47 -04:00
GriffinR 6be9a79b8c Merge pull request #1871 from GriffinRichards/doc-trendy-sayings 
Document the trendy sayings word group
 2023-03-24 08:05:51 -04:00
Zunawe 492422b6bd Fix scanner item flag name 2023-03-23 21:47:26 -07:00
LOuroboros 7ce5c5fc66 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1 2023-03-23 06:27:09 -03:00
tennis 358180946d Fix Intimidate targetting dead sides and false postpones 2023-03-22 11:46:50 +00:00
May8th1995andtennis 9ec31c61bf Fixes weirdly set value for eject buttons etc (#2846) 
* Fixes weirdly set value for eject buttons etc

* Remove known fialing from fixed test

---------

Co-authored-by: tennis <May8th1995@users.noreply.github.com>
 2023-03-21 20:12:46 +01: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
LOuroboros f4e8389779 Added Psyblade and Hydro Steam 2023-03-17 09:25:39 -03:00
LOuroboros aefd318945 Applied review suggestions and expanded usage of activateAfterFaint in Cmd_setmoveeffect 2023-03-14 11:43:52 -03:00
GriffinR 0c380862d6 Document the trendy saying word group 2023-03-13 15:58:40 -04:00
W1serV1ser 76ba156a5c Merge branch 'master' into FollowingPokemon_Gen1-3 2023-03-11 16:31:44 -08:00
LOuroboros f06c040bca Updated the debug menu 
-Updated the text string used by Debug_FlagsNotSetMessage.
-Renamed Debug_FlagsNotSetMessage to Debug_FlagsNotSetOverworldConfigMessage.
-Added an equivalent for the battle config file called Debug_FlagsNotSetBattleConfigMessage,
-DEBUG_FLAG_NO_COLLISION -> OW_FLAG_NO_COLLISION
 -And moved it to include/config/overworld.h, because at the end of the day it's still an overworld flag just like the other 2 already in that file.
-Corrected miswritten preproc config in DebugAction_Flags_CatchingOnOff.
-Updated the comment that describes the effect of DEBUG_OVERWORLD_MENU reducing the number of characters a tiny bit and fixing a typo.
 2023-03-08 15:27:22 -03:00
Eduardo Quezada D'Ottone 81a80e566c Refactor Mega Evolution indicator sprite (#2805) 2023-03-07 08:06:28 -03:00
DizzyEggg a04046dbb6 Add tests for Defog and fix Defog battle strings (#2737) 
* start working on defog tests

* defog tests + improve terrain end battlescripts

* newline
 2023-03-06 20:35:08 +01:00
DizzyEggg 306c4565a0 merge 2023-03-06 15:32:28 +01:00
Eduardo Quezada D'Ottone b3ffc9d1c4 Set link tutorial as complete when using Cheat Start (#2802) 2023-03-06 09:29:34 +01: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
ghoulslash dec1b16138 Swallow/Spit Up Gen 5 Behavior and tests for Swallow/Spit Up/Stockpile (#2790) 2023-03-05 09:50:47 -05: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
ghoulslash 4e138fa4b7 Fix wrong Contrary message when affected by Intimidate (#2723) 2023-03-02 09:38:00 -05:00
LOuroboros fe735f9700 Applied review suggestions 
-Merged EFFECT_CEASELESS_EDGE and EFFECT_STONE_AXE into EFFECT_HIT_SET_ENTRY_HAZARD

-Updated gDmgHazardsStringIds and relevant battle scripts. Can't say that I like it at all. String tables are stupid imo.

-Coupled Barb Barrage's effect in CalcMoveBasePower with Venoshock's
 2023-03-02 01:39:44 -03:00
LOuroboros fe74dd938b Small corrections 2023-03-01 04:00:19 -03:00
LOuroboros 23673c2e9d Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1 2023-03-01 03:57:00 -03:00