Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,621 Commits 1 Branch 0 Tags
552fe79762d4a11dd70f392ea0ee26305c551625
Commit Graph
2309 Commits
Author SHA1 Message Date
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
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
ghoulslash dc9f0b5107 Implement Customizable NPC Trainer Parties (#2733) 2023-03-26 09:32:51 -04:00
sbird aea5d79aa2 [trainer_parties] implement fully customizable npc trainer parties 
fix nature related bug, fix hash generation, add tests
 2023-03-25 20:00:04 +01: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
Bassoonian e601719c91 Add new PLA form change items 2023-03-24 00:04:08 +01:00
Bassoonian 80d0efae0c Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhhupcomingdev 2023-03-23 23:04:23 +01: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
Eduardo Quezada D'Ottone 2658fe32c2 Removed ITEM_HAS_EFFECT (#2840) 2023-03-23 10:02:32 +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
Bassoonian 372c6a1afa Add new item variables and defines 2023-03-19 20:55:39 +01:00
LOuroboros f4e8389779 Added Psyblade and Hydro Steam 2023-03-17 09:25:39 -03:00
Eduardo Quezada 0a9ab96390 Added STANDARD_FRIENDSHIP constant to allow easier custom adjustments 2023-03-14 08:54:49 -03:00
GriffinR 0c380862d6 Document the trendy saying word group 2023-03-13 15:58:40 -04:00
Alex aa29eced1f Merge branch 'rh-hideout:upcoming' into PLA_missing_sprites 2023-03-13 17:46:53 +01:00
W1serV1ser 76ba156a5c Merge branch 'master' into FollowingPokemon_Gen1-3 2023-03-11 16:31:44 -08: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
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
Alex 487e26e700 fix enamorus_t + samuroutt sprite + conflicts 2023-03-02 11:05:59 +01: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 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
GriffinR 8d88a38561 Merge pull request #1854 from GriffinRichards/constants-num-frames 
Add MAX_MON_PIC_FRAMES, and trainer pic size constants
 2023-02-27 13:16:49 -05:00
DizzyEggg 3338a6b786 add messages for stockpile effects wear off 2023-02-27 12:31:29 +01:00
AgustinGDLV e537be76ea Z-moves bypass protection (#2730) 2023-02-27 09:17:07 +01: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
Eduardo Quezada f5aa3b8272 Document the 2 different sText_GotchaPkmnCaught 2023-02-23 11:43:40 -03:00
Alex a870ec3c22 enamorus_t cry, basculegionf sprite, new typhlosion back sprite 2023-02-23 15:20:12 +01:00
Zunawe 60be59d18b Fix wrong route in hidden item flag name 2023-02-22 13:13:57 -08:00
DizzyEgggandAgustinGDLV e0b76e98ff Add MOVE_SHELL_TRAP Effect (#2716) 
* implemented Shell Trap

Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com>
 2023-02-22 13:55:34 +00:00
DizzyEggg 31138455de remove unneeded VARIOUS_JUMP_IF_NO_VALID_TARGETS 2023-02-22 09:28:12 +01:00
Martin Griffin 29c64c82f3 Test Red Card 
Dragon Tail activates Red Card if the target does not switch.
 2023-02-21 10:44:58 +00:00
Zunawe 8f74a6777a Fix spelling mistake for item flag 2023-02-20 18:17:30 -08:00