ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-24 22:48:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,601 Commits 1 Branch 0 Tags
Commit Graph

1470 Commits

Author SHA1 Message Date
CallmeEchoo
99cbd2af37 add snow weather 2023-04-29 20:35:58 +02:00
Martin Griffin
4a0abc5129
Merge branch 'upcoming' into rhh-get-party 2023-04-26 12:12:03 +01:00
Salem
78c4d07b23
Add Berserk Gene Item (#2893) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-04-25 15:03:57 -04:00
Frank DeBlasio
9562c7a37a
Added forbidden Metronome moves from PLA and SV (#2949) 2023-04-24 18:49:53 -04:00
LOuroboros
a128192bfe Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate 2023-04-24 09:36:09 -03:00
Alex
3aec63b8cf new define to restore items after battle 2023-04-20 15:08:42 +02:00
CallmeEchoo
efd7465c12 fix gBattleMons using party indices instead of battle indices 2023-04-17 13:34:11 +02:00
CallmeEchoo
7d4807d956 fix nightmare status only being healed in doubles 
this came up in a conversation on discord. its not tested.
 2023-04-16 13:11:49 +02:00
Martin Griffin
aefe582596 GetSideParty/GetBattlerParty 
Inline GetBattlerPartyData into its callers because its name is
confusing and we couldn't think of a better one.

This seems to fix a bug in one place where GetBattlerPartyData was being
used as if it had GetBattlerParty semantics.
 2023-04-15 23:04:13 +01:00
AgustinGDLV
2eabcea86e
Battle Item Refactor (#2902) 
* items that can be used in battle now use battlescripts
* removed ExecuteTableBasedItemEffect_
* taught AI how to use items, removed AI_itemtype/flag
* X-Items store stages raised in holdEffectParam
* USE_ITEM in tests
 2023-04-14 19:25:50 +01:00
AgustinGDLV
86242c1c70
MOVE_REVIVAL_BLESSING Effect (#2883) 
* implemented Revival Blessing
 2023-04-12 01:14:25 +01:00
ghoulslash
5f4bfd9bb4 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into be/aiflag 2023-04-10 09:48:49 -04:00
ghoulslash
e49bb21ee4 some IsBattlerAIControlled replacements w BattlerHasAi 2023-04-10 09:48:44 -04:00
Eduardo Quezada D'Ottone
5c1efe9419
RandomElement for structured RNG (#2868) 2023-04-09 21:20:04 -04:00
Martin Griffin
7b306b6147 RandomElement for structured RNG 
Converts Tri Attack and Dire Claw to use structured RNG.
 2023-03-27 18:50:18 +01:00
Eduardo Quezada
f6a924a791 Fixed instances of gSideTimers not using side constants 2023-03-27 11:49:50 -03:00
ghoulslash
8d8819b797
Adds missing cases for 'Everything Customized' (#2862) 2023-03-26 21:02:46 -04:00
ghoulslash
6574e01e73
Gen. 9 Move Effects, 1st batch (#2534) 2023-03-26 16:20:47 -04:00
Alex
4b43f3eb9d add cases for everything customized 2023-03-26 21:10:51 +02:00
ghoulslash
dc63d096f2
add check for Gorilla Tactics when resetting choicedMove from knock off (#2854) 2023-03-26 15:03:56 -04:00
ghoulslash
a0b95ae27e
Fix Intimidate targetting dead sides and false postpones (#2850) 2023-03-26 07:27:14 -04:00
sbird
b9447f88fc fix compound eyes ohko test 2023-03-24 16:37:52 +01:00
Philipp AUER
4928911cd0
Speed up PASSES_RANDOMLY via structured RNG (#2720) 2023-03-24 15:16:29 +01:00
DizzyEggg
8cf357a37b tests for dire claw ceaseless edge barb barrage 2023-03-23 12:29:04 +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
CallmeEchoo
4541cc3319 add check for Gorilla Tactics 
knock off shouldnt reset choicedMove when the pokemon has the Gorilla Tactics ability
 2023-03-22 22:30:24 +01:00
tennis
358180946d Fix Intimidate targetting dead sides and false postpones 2023-03-22 11:46:50 +00:00
Martin Griffin
89deda0416 Allow tests to override specific RNG calls 2023-03-15 13:39:17 +00:00
LOuroboros
aefd318945 Applied review suggestions and expanded usage of activateAfterFaint in Cmd_setmoveeffect 2023-03-14 11:43:52 -03:00
LOuroboros
6dbe772e27 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate 2023-03-10 18:23:33 -03:00
DizzyEggg
d695c76881 test for assist and removed assist array from battle struct 2023-03-08 22:11:28 +01:00
Eduardo Quezada D'Ottone
81a80e566c
Refactor Mega Evolution indicator sprite (#2805) 2023-03-07 08:06:28 -03:00
DizzyEggg
e055456b7e
Fix Protean / Libero when AI calculates Damage (#2714) 
* Fix Protean / Libero when AI calculates Damage

* fix ai changing types when calculating dmg
 2023-03-07 09:34:26 +01: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
ghoulslash
dec1b16138
Swallow/Spit Up Gen 5 Behavior and tests for Swallow/Spit Up/Stockpile (#2790) 2023-03-05 09:50:47 -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
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
DizzyEggg
3338a6b786 add messages for stockpile effects wear off 2023-02-27 12:31:29 +01:00
LOuroboros
8a036e6007 Made this build again 2023-02-27 07:51:36 -03:00
LOuroboros
a54a8d9b2a Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate 2023-02-27 07:43:19 -03:00
AgustinGDLV
e537be76ea
Z-moves bypass protection (#2730) 2023-02-27 09:17:07 +01:00
DizzyEggg
44d2cc7232
Fix bugs related to Trainer Slide messages (#2699) 
* start working on trainer slides

* use cmd->nextInstr
 2023-02-27 09:11:25 +01:00
LOuroboros
fe09f3e0d3 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate 2023-02-26 23:42:01 -03:00
DizzyEggg
4bdca43dbd refactor mega evolution indicator sprite 2023-02-26 12:51:35 +01:00
Eduardo Quezada
079ca8ab29 Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarification 2023-02-24 07:53:02 -03:00
DizzyEggg
877e3fd6af merge with upcoming 2023-02-22 19:27:42 +01:00
DizzyEggg
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
Jaizu
403a6f4544
Merge pull request #2712 from DizzyEggg/fix_abilities_empty_field 
Fix switch-in abilities activating on an empty field
 2023-02-22 09:49:13 +01:00