ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,600 Commits 1 Branch 0 Tags 235 MiB
408aa30aa7
Commit Graph

2303 Commits

Author SHA1 Message Date
DizzyEggg
56c9564e7a
8th gen Howl's effect (#2700) 
* Howl gen8 effect
 2023-02-17 10:28:46 +00:00
Eduardo Quezada D'Ottone
625a7622e2
Merge pull request #2697 from AsparagusEduardo/RHH/sync/pret_20230214 
It's ya boi, pret merge! (pret merge 2023/02/16)
 2023-02-16 21:57:41 -03:00
Eduardo Quezada
f4f8ab6ee9 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 2023-02-16 17:06:49 -03:00
ghoulslash
6b0b427d93
Merge pull request #2680 from DizzyEggg/mirror_armor 
Fix Mirror Armor against Clear Body
 2023-02-16 09:29:04 -05: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
d3d680c1dd Sort metatile labels alphabetically 2023-02-14 14:36:27 -05:00
GriffinR
b656565af0 Standardize RS mossdeep gym metatile labels 2023-02-14 11:42:13 -05:00
GriffinR
0df56b808d Remove duplicate metatile label sections 2023-02-14 11:40:15 -05:00
ghoulslash
908b509401
Fix Round's Base Power calc, Add Turn order effects (#2602) 
* fix round base power calc, add turn order change

* remove unused callnative cmd

* fix round turn order update

* fix moveTarget getting set incorrectly in HandleAction_UseMove. also redirection doesn't affect MOVE_TARGET_ALL_BATTLERS

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-02-14 16:49:50 +01:00
DizzyEggg
0577d8d04d Fix Mirror Armor against Clear Body 2023-02-13 14:44:34 +01:00
GriffinR
c32fbf594a
Merge pull request #1851 from GriffinRichards/doc-fldspc 
Document remaining field_specials task data
 2023-02-08 22:34:57 -05:00
GriffinR
de56e400ff Sync clone object macro 2023-02-08 13:11:10 -05:00
DizzyEggg
ff088752e7
Insomnia ability pop-up (#2643) 
* Insomnia ability pop-up

* remove B_MSG_STAYED_AWAKE_USING constant
 2023-02-07 18:47:23 +01:00
ghoulslash
7e9d40d401
Merge pull request #2645 from DizzyEggg/damp_aftermath 
Damp shows ability pop-up when reacting with Aftermath
 2023-02-07 10:18:23 -05:00
DizzyEggg
dcb63e1518
Merge pull request #2610 from ghoulslash/be/animsilktrap 
Silk trap Animation
 2023-02-07 16:13:53 +01:00
DizzyEggg
47ebf2e167 hmm 2023-02-07 13:33:43 +01:00
DizzyEggg
0dc5e1e685 aftermath damp pop-ups and string 2023-02-07 13:01:56 +01:00
Eduardo Quezada
101ea6522d Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_util.c
 2023-02-02 17:56:13 -03:00
LOuroboros
4b5a6e2328 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1 2023-02-01 20:18:56 -03:00
GriffinR
3b15fd34cc Merge branch 'master' of https://github.com/pret/pokeemerald into constants-num-frames 2023-02-01 16:09:01 -05:00
GriffinR
9003966fcc Misc field_specials cleanup 2023-02-01 11:48:55 -05:00
Jaizu
424f457ec2 Remove unused INHERITED_IV_COUNT define 2023-01-31 09:44:47 +01:00
ghoulslash
3f616215ea add silk trap anim 2023-01-28 09:03:18 -05:00
Eduardo Quezada D'Ottone
53e41a2b3d
Merge pull request #2605 from mrgriffin/rhh-battle-tests-fixes 
Rhh battle tests fixes
 2023-01-27 19:24:13 -03:00
ghoulslash
2b58593e33
Merge pull request #2595 from AsparagusEduardo/RHH/pr/data/Gen9Items 
Added some Gen9 item data and fixed Punching Glove's effect
 2023-01-27 16:13:50 -05:00
Martin Griffin
a13ffdbfba U-turn does not switch the user out if Emergency Exit activates 2023-01-27 00:57:22 +00:00
Eduardo Quezada
7774c9727d Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230125 
# Conflicts:
#	tools/mapjson/mapjson.cpp
 2023-01-25 20:28:55 -03:00
Eduardo Quezada
3288309c43 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_script_commands.c
 2023-01-25 19:57:19 -03:00
Eduardo Quezada
a044774896 Added Gen9 item data and fixed Punching Glove's effect 2023-01-24 16:47:54 -03:00
GriffinR
7681340966 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-trade 2023-01-23 14:45:51 -05:00
Eduardo Quezada D'Ottone
1bfc922c72
Merge pull request #2471 from ghoulslash/be/gen9items 
Start Gen9 Hold Effects
 2023-01-23 14:58:08 -03:00
Eduardo Quezada D'Ottone
2b22bdf1e7
Merge pull request #2579 from LOuroboros/allahu 
Fixed Explosion & Intimidate's 'interaction'
 2023-01-23 11:37:06 -03:00
ghoulslash
f97ec1975a merge w upcoming 2023-01-23 09:24:03 -05:00
GriffinR
29c1af50ca Fix Best Streak stat name 2023-01-20 11:25:04 -05: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
0851e55ccb
Merge pull request #1657 from PikalaxALT/sync_battle_anim_args 
Sync battle anim args
 2023-01-18 12:16:49 -05:00
GriffinR
b7d92e8537 Revert incorrect constant usage, add new correct ones 2023-01-18 12:11:09 -05:00
GriffinR
d1e4bd44ce Correct comment in maps.h 2023-01-18 11:54:06 -05:00
GriffinR
5a906c33ac
Merge branch 'master' into sync_battle_anim_args 2023-01-18 11:47:33 -05:00
GriffinR
d68e81c2be Clarify MB_SEMI_DEEP_WATER name 2023-01-17 21:32:55 -05:00
LOuroboros
773e7f0de2 Fixed Explosion & Intimidate's 'interaction' 2023-01-17 22:16:42 -03:00
Eduardo Quezada
70d59d6aa9 Improve Easy Chat documentation 2023-01-15 02:15:11 -03:00
Eduardo Quezada
ac4825ad28 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_util.c
 2023-01-13 11:50:47 -03:00
GriffinR
b873d69679 Sync trade anim 2023-01-09 15:32:04 -05:00
ghoulslash
cc7c546011
Merge pull request #2473 from LOuroboros/mimicry 
Reimplemented Mimicry
 2023-01-09 12:54:44 -05:00
Eduardo Quezada
911541ba4f Merge branch 'RHH/upcoming' into RHH/pr/feature/IncenseBaby 
# Conflicts:
#	include/config/pokemon.h
 2023-01-08 18:48:01 -03:00
ghoulslash
da27df9f18
Merge pull request #2326 from AsparagusEduardo/RHH/pr/reworkScald 
Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change
 2023-01-08 16:25:29 -05:00
Eduardo Quezada D'Ottone
7622d84a4f
Revert "Removed Unown hack" 2023-01-07 11:39:56 -03:00
Eduardo Quezada
d72a3731d4 Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald 
# Conflicts:
#	include/constants/battle_move_effects.h
 2023-01-06 15:25:49 -03:00
LOuroboros
72566e6323 Turned Stone Axe's and Ceaseless Edge's effects into MOVE_EFFECTs 2023-01-05 03:02:56 -03:00
Eduardo Quezada
74d8c587fe Merge branch 'RHH/upcoming' into RHH/pr/cleanup/unown 
# Conflicts:
#	src/data/pokemon/species_info.h
#	src/data/pokemon_graphics/front_pic_anims.h
 2023-01-04 17:58:54 -03:00
GriffinR
36c89d345c
Merge branch 'master' into doc-wnews 2023-01-03 22:28:21 -05:00
Eduardo Quezada
e0802f13a2 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20230103 
# Conflicts:
#	include/link_rfu.h
 2023-01-03 15:40:33 -03:00
LOuroboros
f1ca254c28 Updated the Mimicry reimplementation 
Mimicry is now a proud member of ABILITYEFFECT_ON_TERRAIN.

Misc. changes:
-Ditched the dependency on and usage of gBattlerAttacker for the effects inside ABILITYEFFECT_ON_WEATHER and ABILITYEFFECT_ON_TERRAIN.
-Made Cmd_switchineffects activate ABILITYEFFECT_ON_TERRAIN to take into account overworld weather-induced field terrains.
-Updated the text strings printed by the battle scripts inside the aforementioned AbilityBattleEffects caseIDs.
-Removed constant label of unused VARIOUS_TRY_TO_APPLY_MIMICRY which I forgot about.
-Updated ChangeTypeBasedOnTerrain, partly as a result of the aforementioned changes but also for optimization purposes.
 -There was never a reason to establish an empty scope, or to use GET_MOVE_TYPE and the variables that complemented it.
-Removed case ABILITY_QUARK_DRIVE from AbilityBattleEffects' case ABILITYEFFECT_ON_SWITCHIN.
 2023-01-03 02:27:41 -03:00
LOuroboros
d0f5653f5e Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry 2023-01-02 19:00:41 -03:00
Eduardo Quezada
a23501a4a3 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_script_commands.c
 2023-01-02 18:54:57 -03:00
LOuroboros
0a00942a26 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1 2023-01-02 16:00:13 -03:00
LOuroboros
13d8c0d167 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities 2023-01-02 14:34:24 -03:00
LOuroboros
ca32d43433 Streamlined ability-on-weather changes 
Also renamed activateweatherabilities and activateterrainabilities.
 2023-01-02 14:32:56 -03:00
Eduardo Quezada
16e8a5dd7f Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	include/battle_util.h
 2023-01-01 16:02:40 -03:00
LOuroboros
e8dfb66c30 Adding ability effect triggers for terrains and weather 
A new, probably better way to handle the announcement trigger that abilities such as Protosynthesis and Quark Drive have, when the battle weather or the field terrain change.

Misc. changes:
-EFFECT_DAMAGE_SET_TERRAIN -> EFFECT_HIT_SET_REMOVE_TERRAIN
 -It's more appropriate as the effect can be used to force set a terrain or simply to remove an active terrain, after all.
 -The main reason for the rename was the inconsistency with the battle script's label.
-Reverted accidentally committed change to B_DOUBLE_WILD_CHANCE, performed back in c8abf00c.
 2022-12-30 03:25:16 -03:00
LOuroboros
0159065dea Removed Shell Trap 
It's time to let it go for my own mental sanity.
Besides, it's a Gen. 7 move. I shouldn't have added it here.
 2022-12-28 07:51:11 -03:00
Eduardo Quezada D'Ottone
b5b7631be7 Added guards to form_change_types.h 2022-12-26 09:14:28 -03:00
Eduardo Quezada
28cffda9d4 Hatch level config 2022-12-22 10:38:54 -03:00
LOuroboros
4bb86c5d96 Implemented Barb Barrage's effect 2022-12-21 19:48:50 -03:00
LOuroboros
1229fa752a Fixed Triple Axe's target, added its effect and fixed Ceaseless Edge's 2022-12-21 19:48:49 -03:00
LOuroboros
2cb9400ef0 Implemented Dire Claw's effect 2022-12-21 19:48:48 -03:00
LOuroboros
3ce4869766 Implemented Shell Trap's effect 2022-12-21 19:48:10 -03:00
LOuroboros
ae482ed1f4 Implemented Ceaseless Edge's effect 2022-12-21 19:47:00 -03:00
Eduardo Quezada
c0d4e14a61 Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald 
# Conflicts:
#	include/config/battle.h
#	include/constants/battle_move_effects.h
 2022-12-21 12:46:09 -03:00
LOuroboros
d943f891c5 Applied Wind Power and Wind Rider correction 
-Renamed TryActivateWindRiderLoop to BattleScript_TryTailwindAbilitiesLoop
-Modified how it handles the check for Wind Rider by using a various and incorporated Wind Power into the mix because that ability is affected by Tailwind as well.
 2022-12-21 10:08:16 -03:00
SonikkuA-DatH
2c28076696
Update include/constants/battle_script_commands.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-12-20 18:08:38 -08:00
LOuroboros
6153b8e904 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities 2022-12-20 07:11:36 -03:00
SonikkuA-DatH
f6fab92ac8
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2 2022-12-19 15:52:20 -08:00
Eduardo Quezada
1580f892a5 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	include/constants/pokemon.h
#	src/battle_script_commands.c
 2022-12-19 18:53:26 -03:00
SonikkuA-DatH
ffda816507
Update battle_script_commands.h 
Whoops, forgot the to copy paste various
 2022-12-18 22:41:15 -08:00
SonikkuA-DatH
f0aee1f8d3
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2 2022-12-18 17:50:39 -08:00
GriffinR
2aa6a9c164 Remove two unreferenced metatile labels 2022-12-16 11:05:56 -05:00
GriffinR
347a02ace1 Sync trade 2022-12-15 15:40:59 -05:00
LOuroboros
4c9446ed0a Fixed Speed Swap's effect 2022-12-14 12:00:45 -03:00
LOuroboros
6ef30da492
Update battle.h 2022-12-13 02:44:49 -03:00
LOuroboros
a56cfd1aa7 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities 2022-12-12 19:55:48 -03:00
ghoulslash
340278c83b
Merge pull request #2452 from LOuroboros/intimidate 
Optimized Intimidate's code
 2022-12-11 22:04:16 -05:00
ghoulslash
e3e0d60222
Merge pull request #2467 from Bassoonian/gen9moves 
Generation IX Moves
 2022-12-11 14:47:47 -05:00
LOuroboros
0d1f9d9613 Reimplemented Mimicry 2022-12-09 20:46:18 -03:00
ghoulslash
6d28882e44 start gen9 hold effects 2022-12-06 09:48:36 -05:00
LOuroboros
7a52404fd3 Implemented Supreme Overlord's effect 2022-12-06 05:23:30 -03:00
LOuroboros
3c30e6bdc3 Implemented Sharpness' effect 2022-12-06 05:23:30 -03:00
LOuroboros
24465858a7 Implemented the 4 Ruin Abilities 2022-12-06 05:23:29 -03:00
LOuroboros
e25f843db3 Implemented Quark Drive's effect 
Also tweaked STRINGID_SUNLIGHTACTIVATEDABILITY and STRINGID_STATWASHEIGHTENED.
 2022-12-06 05:23:29 -03:00
LOuroboros
a328088122 Implemented Protosynthesis' effect 
Also turned GetHighestStatId into a global function since Protosynthesis' effect uses it.
 2022-12-06 05:23:29 -03:00
LOuroboros
88cae380d0 Implemented Wind Power's effect 2022-12-06 05:23:29 -03:00
LOuroboros
4dc44150c5 Implemented Wind Rider's effect 2022-12-06 05:23:29 -03:00
LOuroboros
653364fd71 Added the basic data for the Gen. 9 Abilities 2022-12-02 23:01:22 -03:00
Eduardo Quezada
9d1149c423 Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221124 
# Conflicts:
#	src/pokemon.c
 2022-11-29 17:40:09 -03:00
Eduardo Quezada
4bac880042 Removed Unown hack 2022-11-25 16:55:53 -03:00
Eduardo Quezada
e858b4e709 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124 
# Conflicts:
#	include/battle.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_dome.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/battle_tower.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
 2022-11-24 15:36:00 -03:00
GriffinR
483c3d5c13 Document wonder news 2022-11-22 02:17:03 -05:00
GriffinR
5fa364256d
Merge pull request #1808 from AsparagusEduardo/pret/PR/numSides 
Introduce NUM_BATTLE_SIDES
 2022-11-18 17:39:00 -05:00
Bassoonian
739680e425 Victory Dance effect 2022-11-18 22:23:34 +01:00