Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-05-31 21:02:57 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
12,480 Commits 3 Branches 0 Tags 958 MiB
7b306b6147
Commit Graph

8856 Commits

Author SHA1 Message Date
sbird
fea54c9277 [intro] add fading, refactor abort, align intro gfx 2023-02-16 10:43:50 +01:00
DizzyEggg
97f9c0a4d9 oof 2023-02-15 23:45:53 +01:00
DizzyEggg
f6a0c882d1 Fix Shield Down Ability pop-up 2023-02-15 23:44:00 +01:00
DizzyEggg
94651e77a5 Fix Clang Scales target and effect 2023-02-15 22:18:18 +01:00
Eduardo Quezada
7ddebb6671 Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 
# Conflicts:
#	data/battle_ai_scripts.s
#	src/menu_specialized.c
#	src/mystery_gift_menu.c
 2023-02-15 14:18:00 -03: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
Eduardo Quezada
bd54990333 Review changes 2023-02-15 13:56:11 -03:00
GriffinR
69fdf0faa4
Merge pull request #1853 from GriffinRichards/doc-contest-bar 
Clarify AI_CV_AttackDown_UnknownTypeList
 2023-02-15 11:29:57 -05:00
GriffinR
671c9c5353 Merge branch 'master' into doc-chat 2023-02-15 10:57:05 -05:00
Alex
e4045a7a5f
z move pp color (#2690) 2023-02-15 16:19:09 +01:00
GriffinR
a322379feb
Merge branch 'master' into doc-windows 2023-02-15 10:04:48 -05:00
GriffinR
9c1c598160 GROUPTYPE_NONE to unsigned 2023-02-15 09:49:33 -05:00
DizzyEggg
3f0f7c6b7f Fix Battle Bond activating multiple times in battle 2023-02-15 15:30:29 +01:00
LOuroboros
7885941d3c Tweaked Task_HandleExpansionIntro to fix the water drops glitch 
Thanks to Tustin2121.
 2023-02-14 14:03:18 -03: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
ghoulslash
094554b3a3
Merge pull request #2681 from DizzyEggg/jaw_lock 
Fix Jaw Lock locking player pokemon
 2023-02-13 10:40:47 -05:00
DizzyEggg
2b4d2a7695 Fix Jaw Lock locking player pokemon 2023-02-13 16:27:21 +01:00
ghoulslash
d1ef53f93a
Merge pull request #2678 from AlexOn1ine/z_indicator_in_doubles 
Z-Move Indicator was wrongly displayed in double battles
 2023-02-13 08:52:06 -05:00
DizzyEggg
0577d8d04d Fix Mirror Armor against Clear Body 2023-02-13 14:44:34 +01:00
ghoulslash
c399391891
Merge pull request #2677 from AlexOn1ine/z_moves_switch_order 
Fix switching Z-Moves when pressing SELECT in battle
 2023-02-13 08:41:58 -05:00
DizzyEggg
5d958e245a
Merge pull request #2669 from Jaizu/giga_impact_contests 
Fix Giga Impact on contests.
 2023-02-13 09:22:24 +01:00
Alex
2b32bfcdc1 add battlerId arg to ShowZMoveTriggerSprite 2023-02-12 19:39:14 +01:00
Eduardo Quezada
d699d55ba3 Reformatted gNatureStatTable 2023-02-12 01:19:03 -03:00
Eduardo Quezada
a937b3221a Documented Ribbons 2023-02-11 23:16:24 -03:00
Eduardo Quezada
96865f66af Updated term to modernFatefulEncounter 2023-02-11 22:36:42 -03:00
Eduardo Quezada
6da5e0a280 Rename eventLegal to fatefulEncounter 2023-02-11 17:13:53 -03:00
Alex
d363ed8152 z indicator in double battles 2023-02-11 19:55:08 +01:00
Alex
ce416be297 z_move switch move bug 2023-02-11 18:32:07 +01:00
sbird
4bcbb7c9e1 [intro] refactor expansion intro 2023-02-09 23:12:29 +01:00
ghoulslash
deb23fc7c6
Merge pull request #2648 from AlexOn1ine/pollen_puff 
Fixes Pollen Puff issue #2611
 2023-02-09 08:21:33 -05:00
ghoulslash
27933836b5
Merge pull request #2662 from AlexOn1ine/heal_pulse_v2 
Add Logic for Heal Pulse effects in double battles
 2023-02-09 08:18:00 -05:00
Jaizu
9f7267e48d Fix Giga Impact on contests. 2023-02-09 11:29:29 +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
Eduardo Quezada D'Ottone
8381b14c51
Implemented Xhyzi's RHH copyright intro (with config) (#2415) 
* Rhh & Pret Copyright Screen

* Porygon recovered his voice

* Expansion text

---------

Co-authored-by: Xhyzi <xhyzdot@gmail.com>
Co-authored-by: Jaizu <jaizu85@gmail.com>
 2023-02-08 15:54:12 +01:00
Alex
41d64ea41e heal pulse effect in double battles 2023-02-08 13:02:41 +01:00
DizzyEggg
84d7024add cleanup 2023-02-08 12:48:48 +01:00
DizzyEggg
896b575c07 Fix volt switch breaking ace pokemon 2023-02-08 12:42:38 +01:00
DizzyEggg
8c257bde99 Fix 1 vs 2 battles with eggs 2023-02-08 10:24:19 +01:00
Eduardo Quezada
6c30c5490c Test PR 2023-02-08 00:51:59 -03: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
Alex
5bf607049e Fix Pollen Puff score 2023-02-07 16:41:30 +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
0d6b640876
Merge pull request #2439 from AsparagusEduardo/RHH/pr/cleanup/DragonTailEffect 
Cleaned up move effect checks for Dragon Tail/Circle Throw
 2023-02-07 16:17:12 +01:00
DizzyEggg
f762ed728d remove pointless timers from disable struct 2023-02-07 15:10:20 +01:00
DizzyEggg
0dc5e1e685 aftermath damp pop-ups and string 2023-02-07 13:01:56 +01:00
ghoulslash
0c4c3fbbb7
Fix Poison Gas Anim for MOVE_TARGET_BOTH (#2608) 
* poison gas anim handles MOVE_TARGET_BOTH

* fix sprite position fields

* fix it again

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-02-07 12:14:36 +01:00
GriffinR
bbf0cf0103 Stop hard-coding number of preset names 2023-02-04 00:00:38 -05:00
GriffinR
5496f0e6b0
Merge pull request #1850 from GriffinRichards/sync-trade 
Sync trade
 2023-02-03 19:05:00 -05:00
GriffinR
c1cfd3ac66 Add fix for commented bug 2023-02-03 16:01:13 -05:00
Jaizu
717ba22ea1
Make contest opponents an enum 
I'm sure that at least 2 people eventually might consider editing them, this makes it easier.
 2023-02-03 15:49:22 +01:00
GriffinR
5793a1a5e7 Correct some union room chat documentation 2023-02-02 11:41:02 -05: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
Philipp AUER
8983739267
Merge pull request #2564 from mrgriffin/rhh-battle-tests 
Battle Tests
 2023-02-01 22:18:17 +01: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
28ada9c93b Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest-bar 2023-02-01 15:52:19 -05:00
GriffinR
020266463c Add fix for described UB 2023-02-01 15:44:48 -05:00
GriffinR
07e00b2e41 Additional window id constant usage 2023-02-01 15:24:15 -05:00
GriffinR
4328ed8b19 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows 2023-02-01 14:59:45 -05:00
GriffinR
30f893f255 Fix comment mistake 2023-02-01 11:52:32 -05:00
GriffinR
9003966fcc Misc field_specials cleanup 2023-02-01 11:48:55 -05:00
GriffinR
43af7d46ca Label data for elevator effects 2023-02-01 10:43:10 -05:00
GriffinR
27a5e05f75 Label data for screen effect tasks 2023-02-01 10:20:23 -05:00
GriffinR
603d870ea0 Fix debug printing negative values 2023-02-01 09:36:18 -05:00
GriffinR
65d476d575 Remove some incorrect color constant usage 2023-02-01 09:32:41 -05:00
Martin Griffin
f1b9872bf0 Test moves, items, and abilities in battle 
Thank you to SBird for providing mgba-rom-test binaries and Spikes/Toxic
Spikes tests!

Co-authored-by: sbird <sbird@no.tld>
 2023-02-01 13:53:57 +00:00
Martin Griffin
c11774acb8 Decap gStatNamesTable, Spikes, Sturdy, and Torment 2023-02-01 13:53:57 +00:00
Eduardo Quezada D'Ottone
fcccffce45
Apply suggestions from code review 
* Jaizu ran away *
 2023-01-31 09:07:45 -03:00
Jaizu
074e601c1f Fix transform on players side too 2023-01-31 13:02:24 +01:00
Jaizu
4eb7b7048e Make transform not break 2023-01-31 12:41:07 +01:00
Jaizu
767008427f Don't pass down daycare like AlterEggSpeciesWithIncenseItem 2023-01-31 09:47:02 +01:00
Jaizu
68ee9e5739
Restore bugfix 
Ooopsie!
 2023-01-30 13:57:59 +01:00
Jaizu
267cf1e6f0
Update comment 2023-01-29 19:45:43 +01:00
Jaizu
8b1f4ac3ac
Implement Destiny Knot 2023-01-29 19:35:46 +01:00
Jaizu
761878f1fe
Fix ball resetting when hatching an Egg 2023-01-28 21:35:04 +01:00
ghoulslash
feb4bfee42 fix toxic debris side status check 2023-01-28 13:56:09 -05:00
Martin Griffin
bdb04da9a5 Refactor battle animations 2023-01-28 00:16:25 +00:00
Martin Griffin
cba4b78df6 Move-based mega evolution message for NPCs/recorded battles 2023-01-28 00:16:24 +00:00
Eduardo Quezada D'Ottone
f1d97bfad7
Merge pull request #2607 from mrgriffin/rhh-battlescript-fixes 
Fix uses of gBattlescriptCurrInstr
 2023-01-27 19:25:06 -03: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
Martin Griffin
4e19d1aaec Fix uses of gBattlescriptCurrInstr 
- VARIOUS_SWAP_STATS and moveend could branch inside their own arguments.
- VARIOUS_JUMP_IF_LAST_USED_ITEM_BERRY was implemented in reverse.
 2023-01-27 21:27:57 +00: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
4ad4d8e25c Encore fails if target has not moved 2023-01-27 18:55:50 +00:00
Eduardo Quezada D'Ottone
4c4fa6a2b6
Merge pull request #2603 from TeamAquasHideout/upcoming 
Fix Wood Hammer To Have 1/3rd Recoil
 2023-01-27 10:47:32 -03:00
Team Aqua's Hideout
e87e8d0898
Fix Wood Hammer To Have 1/3rd Recoil 
Wood Hammer was set to 1/4th recoil before
 2023-01-27 08:16:37 -05:00
Martin Griffin
6a403ab45c Pastel Veil grants immunity to poison 2023-01-27 00:57:24 +00:00
Martin Griffin
3647825a30 Fix Poison Point 
It incorrectly activated only if the Pokémon with Poison Point could be
poisoned by the attacker.
 2023-01-27 00:57:24 +00:00
Martin Griffin
a13ffdbfba U-turn does not switch the user out if Emergency Exit activates 2023-01-27 00:57:22 +00:00
ghoulslash
92341e6d6a fix flame burst hitting semi-invulnerable partner 2023-01-26 13:04:01 -05:00
Jaizu
d074daedbe
Allow exiting the Battle Debug menu pressing B 2023-01-26 16:36:33 +01: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
walkingeyerobot
f9bb0bfb29
better handle throwing balls in a double wild battle (#2587) 
* Handle throwing balls in a double wild battle where the player has only a single Pokémon.
 2023-01-25 20:15:58 +00:00
GriffinR
f4cb6d229f Add some missing sizeof usage for SpriteSheets 2023-01-24 17:04:48 -05:00
Eduardo Quezada
a044774896 Added Gen9 item data and fixed Punching Glove's effect 2023-01-24 16:47:54 -03:00
GriffinR
10230799d3 Simplify some max value macros 2023-01-23 16:01:46 -05:00
Eduardo Quezada D'Ottone
1202f0366c
Merge pull request #2586 from Jaizu/ability_popup_fixes 
Ability popup updates
 2023-01-23 17:34:18 -03:00
GriffinR
7681340966 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-trade 2023-01-23 14:45:51 -05:00
ghoulslash
321634ed3b
Silk Trap Effect (#2512) 
* add silk trap effect, analog of obstruct

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-01-23 16:42:47 -03:00
Eduardo Quezada D'Ottone
fbcad9d3ec
Merge pull request #2572 from rh-hideout/AsparagusEduardo-patch-1 
Fixed Exp Candy S using the XS description
 2023-01-23 15:00:25 -03: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
ghoulslash
8cc923ebcc parentheses around random & 1 2023-01-23 09:42:04 -05: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
e93d22c0f1 optimize IsMoveMakingContact 2023-01-23 09:37:05 -05:00
ghoulslash
125e73dd07 loaded dice fix 2023-01-23 09:36:17 -05:00
ghoulslash
f97ec1975a merge w upcoming 2023-01-23 09:24:03 -05:00
TeamAquasHideout
af07c451d0 Fix Psycho Shift printfromtable Error 2023-01-23 05:01:55 -05:00
Jaizu
a7ce3974ad Apply feedback 2023-01-21 19:25:02 +01:00
Jaizu
c6811fb692 Ability popup fixes 2023-01-21 18:12:12 +01:00
ghoulslash
428ea97028 IsBattlerAlive instead of hp check 2023-01-21 12:11:12 -05:00
ghoulslash
a044084182 Remove redundant IsBattlerAlive checks from ITEMEFFECT_ORBS 2023-01-21 11:11:50 -05:00
ghoulslash
9e6c5725d0 add hp check to ITEMEFFECT_ORBS 2023-01-21 08:55:20 -05:00
GriffinR
29c1af50ca Fix Best Streak stat name 2023-01-20 11:25:04 -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
b7d92e8537 Revert incorrect constant usage, add new correct ones 2023-01-18 12:11:09 -05:00
GriffinR
0cc10a1ada Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize 2023-01-18 11:07:12 -05:00
GriffinR
4a9c4951ab
Merge pull request #1815 from tustin2121/patch-5 
Adding FindObjectEventPaletteIndexByTag bugfix
 2023-01-18 10:40:07 -05:00
GriffinR
a203c03eac Add bugfix to LoadObjectEventPalette 2023-01-18 10:33:39 -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
GriffinR
d5a4bfcd6f
Merge pull request #1843 from GriffinRichards/colorize 
Colorize more grayscaled/incorrectly colored pngs
 2023-01-15 12:48:42 -05:00
Jaizu
a3ae182fc2
Add constants when using GetMonsStateToDoubles_2 2023-01-15 09:50:31 +01:00
GriffinR
c0e68f33f7 Colorize pokemon storage tiles 2023-01-15 00:39:51 -05:00
GriffinR
18384894e0
Merge pull request #1822 from AsparagusEduardo/pret/doc/typesEggGroups 
Made Types and Egg Groups into arrays
 2023-01-15 00:27:20 -05:00
Eduardo Quezada
70d59d6aa9 Improve Easy Chat documentation 2023-01-15 02:15:11 -03:00
GriffinR
387ea563fc Move FRLG trainer card gfx to own folder, fix tiles 2023-01-13 13:40:13 -05:00
GriffinR
1707f82992 Combine/colorize status graphics 2023-01-13 12:53:08 -05:00
Eduardo Quezada D'Ottone
6e1981369b
Fixed Exp Candy S using the XS description 2023-01-13 13:22:27 -03:00
ghoulslash
c72274ee98
Merge pull request #2566 from AsparagusEduardo/RHH/pr/feature/breedBalls 
Config for ball inheritence when breeding
 2023-01-13 09:35:15 -05:00
GriffinR
ee3f5033b3 Colorize contest/interface.png 2023-01-13 00:26:40 -05:00
Eduardo Quezada
77cc407386 Review change 2023-01-12 23:44:34 -03:00
GriffinR
12cbb0b30f Colorize and combine birch_bag/birch_grass 2023-01-12 15:22:23 -05:00
GriffinR
5b3596108d Add some missing PARTY_SIZE usage 2023-01-12 10:51:20 -05:00
Bassoonian
3b4cba9b51
Apply suggestions from code review 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2023-01-11 14:11:47 +01:00
Bassoonian
333917941b Add PLA+ obedience mechanics (with config) 2023-01-11 08:15:57 +01:00
GriffinR
b873d69679 Sync trade anim 2023-01-09 15:32:04 -05:00
LOuroboros
bdcc84f019 Updated the implementation 2023-01-09 15:18:22 -03:00
LOuroboros
dccceb9689 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux 2023-01-09 14:59:41 -03:00
ghoulslash
cc7c546011
Merge pull request #2473 from LOuroboros/mimicry 
Reimplemented Mimicry
 2023-01-09 12:54:44 -05:00
LOuroboros
ba21ffb3f2 Oopsie. Protosynthesis is NOT a terrain ability 2023-01-09 14:37:18 -03:00
LOuroboros
620a6a5e90 Extra review changes 
-Foolproofed the ability checks in ABILITYEFFECT_ON_WEATHER and ABILITYEFFECT_ON_TERRAIN
-Made BattleScript_OverworldWeatherStarts and BattleScript_OverworldTerrain call the battle scripts that handle weather form changes, weather abilities, terrain seeds and terrain abilities.
-Consequentially, I removed the activation for weather and terrain abilities that I added to TryDoEventsBeforeFirstTurn, and the activation of Protosynthesis in ABILITYEFFECT_ON_SWITCHIN.
-Added a weatherAbilityDone to prevent abilities that lack self-checks like Protosynthesis from getting stuck in a loop.
-Removed now pointless ABILITYEFFECT_WEATHER_FORM. I think Duke/Sneed69 added it to fix Castform's form change, but it no longer serves a purpose.
 2023-01-09 14:22:14 -03:00
LOuroboros
91b2e1bb50 More review changes and added lackings 
-Removed unnecessary special handling of terrain-inducing overworld weather states from ChangeTypeBasedOnTerrain.
-Mimicry now activates normally for terrain-inducing overworld weather states.
-Weather abilities now activate normally when switchineffects is called, and at the beginning of a battle.
-Terrain abilities now activate normally at the beginning of a battle.
 2023-01-09 07:55:55 -03:00
Eduardo Quezada
1b0ce96e12 Config for ball inheritence when breeding 2023-01-09 02:16:29 -03:00
LOuroboros
c32f584940 Applied review changes 2023-01-08 19:50:27 -03:00
Eduardo Quezada
612ef46d82 Forgot to add these suggestions 2023-01-08 19:26:34 -03: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
Eduardo Quezada
c5ea97ecc3 Review changes 2023-01-08 18:42:39 -03:00
Eduardo Quezada
9250f8c994 Standarized Pichu/Light Ball/Volt Tackle interaction into their own table, allowing for custom combinations 2023-01-08 18:35:47 -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
GriffinR
c91b13a12b Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows 2023-01-07 13:30:11 -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
f39f48fc51 Made MOVE_EFFECT_DIRE_CLAW a tiny bit prettier 2023-01-05 03:07:28 -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 D'Ottone
34d27eca0e
Merge pull request #2457 from AsparagusEduardo/RHH/pr/cleanup/unown 
Removed Unown hack
 2023-01-04 18:57:28 -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
Eduardo Quezada
55be15f690 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2 
# Conflicts:
#	include/config/pokemon.h
 2023-01-04 16:19:57 -03:00
LOuroboros
7e398ce80e Corrected the AI conditionals 2023-01-04 12:45:49 -03:00
LOuroboros
9a6bdfb74f Added AI conditionals for the new move effects in this batch 2023-01-04 12:13:34 -03:00
ghoulslash
1d2cb49bc6
Merge pull request #2542 from AsparagusEduardo/RHH/pr/config/multiTargetDmg 
Config to restore Gen 3's damage reduction to multi target moves
 2023-01-04 09:18:39 -05:00
ghoulslash
a425de77a6
Merge pull request #2446 from LOuroboros/primal 
Updated AnimTask_PrimalReversion
 2023-01-04 09:16:28 -05:00
ghoulslash
a6269f8cc7
Merge pull request #2559 from AsparagusEduardo/RHH/pr/sync/pretmerge_20230103 
For me, it was tuesday. (pret merge 2023/01/03)
 2023-01-04 09:15:08 -05:00
GriffinR
36c89d345c
Merge branch 'master' into doc-wnews 2023-01-03 22:28:21 -05:00
Eduardo Quezada D'Ottone
41d846c74c
Merge pull request #2551 from ghoulslash/be/frontier_bp 
Reshape sBattlePointAwards to be easier to read
 2023-01-03 21:48:08 -03:00
ghoulslash
2ee26c6240 align cols 2023-01-03 19:36:19 -05:00
Eduardo Quezada
b897b7787e Applied bugfix from upstream 2023-01-03 15:41:03 -03: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
bb218b1616
Updated HOLD_EFFECT_ZOOM_LENS check 2023-01-03 01:10:21 -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
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
ghoulslash
2944ebfe7b
Merge pull request #2543 from AsparagusEduardo/RHH/pr/fix/shinyChances 
Reverting P_SHINY_BASE_CHANCE implementation as it wasn't accuerate to Gen6+
 2023-01-02 13:55:36 -05:00
ghoulslash
759ee8854a
Merge pull request #2470 from LOuroboros/dev_gen9_abilities 
Implemented the majority of the Gen. 9 Abilities
 2023-01-02 13:39:38 -05:00
ghoulslash
a06135b2f4
Merge pull request #2539 from AsparagusEduardo/RHH/pr/fix/FixEgg 
Fixed Eggs sometimes reading garbage graphic data.
 2023-01-02 13:27:28 -05:00
ghoulslash
82bf76588c move challengeNum index to end of sBattlePointAwards, explicitly call out frontier facilities, modes 2023-01-02 13:12:46 -05: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
LOuroboros
d3443396e2 Made Clear Body and similar abilities be normally affected by their own stat stage reductions 2023-01-01 10:45:38 -03:00
LOuroboros
f2e63a2e41 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux 2022-12-31 03:33:42 -03:00
Bassoonian
453aa2ffe7 Fix faulty gBaseStats reference 2022-12-31 02:01:56 +01:00
Eduardo Quezada D'Ottone
0e1836d42b
Merge pull request #2106 from Sneed69/PartyBattlerShouldAvoidHazards 
PartyBattlerShouldAvoidHazards rewrite
 2022-12-30 17:55:53 -03:00
Eduardo Quezada D'Ottone
2d222ad0a9
Merge pull request #2544 from LOuroboros/miscs 
Applied minor tweaks
 2022-12-30 17:51:55 -03:00
Eduardo Quezada D'Ottone
4dc72dcfc1
Merge pull request #1956 from SonikkuA-DatH/SonikkuA-DatH-Teatime2 
Implementing Teatime effect
 2022-12-30 17:49:54 -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
Jaizu
c40c7e7e65
Fix breaking modern, correct labels. 2022-12-29 16:11:17 +01:00
Jaizu
e2d47a07f5
Fix ANIM_SPRITE on regular builds with BUGFIX. 
Dicussion about this being a BUGFIX define instead limiting it only to modern.
Credit SBird.
 2022-12-29 12:28:44 +01:00
LOuroboros
0ef148dfbb Applied more corrections 
-Removed BattleScript_WindRiderActivatesEnd2
-Tweaked the condition of Wind Power in AbilityBattleEffects
-Renamed ApplySupremeOverlordModifier to GetSupremeOverlordModifier
 2022-12-28 08:50:15 -03:00
LOuroboros
9bad91b167 Applied minor tweaks 
-Made setbeakblast affect a specified battler instead of the gBattlerAttacker to justify the macro's layout.
-Added Shell Trap to the list of moves unaffected by Encore.
-Renamed CheckFocusPunch_ClearVarsBeforeTurnStarts into CheckChosenMoveForEffectsBeforeTurnStarts because that function doesn't just check for Focus Punch anymore, and it doesn't clear any variables either.
 2022-12-28 08:33:31 -03:00
LOuroboros
f5c165ff0c Updated Dire Claw's effect again 
Thanks to MGriffin for providing a much nicer code for it.
 2022-12-28 08:30:22 -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
GriffinR
d02d518917
Merge pull request #1829 from AsparagusEduardo/pret/doc/SaveBlockPadding 
Documenting padding in structs used by Saveblocks
 2022-12-27 20:50:37 -05:00
Eduardo Quezada
1fc86e52b5 Reverting P_SHINY_BASE_CHANCE implementation as it wasn't accuerate to Gen6+ 2022-12-27 21:18:20 -03:00
Eduardo Quezada
95f39c8c81 Config to restore Gen 3's damage reduction to multi target moves 2022-12-27 15:24:43 -03:00
SphericalIce
200b71be02 Fix Beat Up's battle script to avoid an out-of-bounds array access 2022-12-27 10:49:57 +00:00
Eduardo Quezada
b0127428c6 Review suggestions. 2022-12-27 00:04:46 -03:00
Eduardo Quezada
701179eb1f Documented missing use of SPRITE_ARR_ID_MOVE_SELECTOR1 2022-12-26 21:05:18 -03:00
Eduardo Quezada D'Ottone
263ed33755 Fixed Eggs sometimes reading garbage graphic data. 2022-12-26 11:56:27 -03:00
SphericalIce
09d20bd634 Rename ball_display_unused_extra 2022-12-26 11:30:12 +00:00
Eduardo Quezada
d103025527 Merge branch 'RHH/upcoming' into RHH/pr/feature/palleteConversion2 
# Conflicts:
#	include/config/pokemon.h
 2022-12-22 10:30:01 -03:00
LOuroboros
9972cce0ec Updated MOVE_EFFECT_DIRE_CLAW 2022-12-21 20:05:10 -03:00