ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 12:14:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,427 Commits 1 Branch 0 Tags 235 MiB
c922ff69b9
Commit Graph

12427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Griffin
afe09e9653 Test Dragon Tail 
Remove the "But it failed!" message if the foe cannot be switched.
 2023-02-21 10:43:57 +00:00
Martin Griffin
666e59b37f Test Roar 
The original implementation of forcerandomswitch was biased towards
certain party members.
 2023-02-21 10:43:57 +00:00
Martin Griffin
2eb6401d52 Test Overgrow, Swarm and Torrent 2023-02-21 10:43:57 +00:00
GriffinR
d45e67e16e
Merge pull request #1862 from Zunawe/fix-spelling 
Fix spelling mistake for item flag
 2023-02-20 22:10:07 -05:00
Zunawe
8f74a6777a Fix spelling mistake for item flag 2023-02-20 18:17:30 -08:00
ghoulslash
6f23ada6e2
Merge pull request #2705 from DizzyEggg/pickup 
correct Cmd_pickup
 2023-02-20 12:15:20 -05:00
DizzyEggg
7d23d5433b try fix tests failing 2023-02-20 16:38:37 +01:00
DizzyEggg
a6f6c205c9 add tests for download 2023-02-20 15:41:22 +01:00
DizzyEggg
a8c0e1ebeb fix intimidate 2023-02-20 13:15:08 +01:00
DizzyEggg
03915524c5 Fix switch-in abilities activating on empty field 2023-02-20 12:42:06 +01:00
DizzyEggg
53180ebf87
Update Healing wish to gen5 / gen8 mechanics (#2708) 
* Updated Healing Wish and added config
* Fixed Lunar Dance message

Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com>
Co-authored-by: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
 2023-02-20 11:25:43 +00:00
GriffinR
f888021c8f
Merge pull request #1857 from GriffinRichards/sync-mapjson 
Sync mapjson
 2023-02-19 20:48:13 -05:00
Eduardo Quezada D'Ottone
2581f91353
Merge pull request #2710 from LOuroboros/patch-1 
Updated Psyshield Bash's accuracy
 2023-02-19 19:23:05 -03:00
LOuroboros
c33cc834bc
Updated Psyshield Bash's accuracy 2023-02-19 19:04:36 -03:00
DizzyEggg
380af442c3
Fix buggy pokemon anims with Illusion (#2639) 
* try illusion fix

* fix
 2023-02-19 12:05:56 +01:00
DizzyEggg
dcb1117470 a 2023-02-19 12:01:47 +01:00
DizzyEggg
c82f35d6bf correct Cmd_pickup 2023-02-19 12:01:13 +01:00
ghoulslash
4b64433816
Add Battle Anim cmds for dynamic Task, Sprite creation + Misc. Anim Fixes (#2649) 
* add createvisualtaskontargets, createspriteontargets to fix electroweb, fiery wrath anims

* add missing semicolon

* add Cmd_createspriteontargets_onpos for heal block, fix heal block targeting

* remove duplicate func

* improve origin pulse anim

* fix IsDoubleBattle call

* venom drench acid uses average battler positions

* add GetSubpriorityForMoveAnim

* add GetBattleAnimMoveTargets for CreateSpriteOnTargets and Cmd_createvisualtaskontargets

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-02-19 11:48:12 +01:00
Eduardo Quezada D'Ottone
ec343cef02
Config to have Shuckle make Berry Juice from Oran Berries (#2331) 
* Removed unused ifdefs and made actually check for Z Power Ring

* Config to have Shuckle make Berry Juice from Oran Berries

* Ordered species-specific configs
 2023-02-19 10:45:59 +01:00
Eduardo Quezada D'Ottone
fcf13aab2b
Fixed evolutions that use held items to evolve not working when using Rare Candies. (#2565) 2023-02-19 10:40:55 +01:00
ghoulslash
79ea2e8074
add howl AI check for new effect (#2703) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-02-18 11:37:29 +01:00
GriffinR
a164a021e4
Merge pull request #1861 from LOuroboros/metatitle 
Fixed minor spelling mistake
 2023-02-17 15:26:38 -05:00
LOuroboros
4be4ec3081 metatitleBehavior -> metatileBehavior 2023-02-17 16:43:22 -03:00
GriffinR
bc3805f9d3 Fix two binary palettes 2023-02-17 13:27:39 -05:00
DizzyEggg
66d2f253a1 merge with master 2023-02-17 15:43:15 +01:00
Jaizu
31316dbfd2
Merge pull request #2529 from mrgriffin/rhh-battlescript-cmd-args 
Readable BattleScript command arguments
 2023-02-17 15:35:03 +01:00
DizzyEggg
0c523f9518
Fix Magic bounce powder moves against grass types (#2633) 
* Fix Magic bounce powder moves against grass types
 2023-02-17 13:55:51 +00:00
DizzyEggg
56c9564e7a
8th gen Howl's effect (#2700) 
* Howl gen8 effect
 2023-02-17 10:28:46 +00:00
Martin Griffin
0573aa455a Introduce macros to parse battle script arguments 
CMD_ARGS for regular commands, VARIOUS_ARGS for various commands, and
NATIVE_ARGS for callnative commands.
 2023-02-17 10:05:57 +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
a60b179bcb Incorporated fixes from upstream 2023-02-16 18:20:54 -03:00
DizzyEggg
d637ee3b13
Fix After You for gen8 (#2646) 
Fix After You
 2023-02-16 20:59:36 +00:00
DizzyEggg
6cdca24c31 use forced switch battler bit 2023-02-16 21:58:00 +01:00
DizzyEggg
d7f68a3893 IsAceMon - not isAceMon 2023-02-16 15:57:15 +01:00
Martin Griffin
6b08120d5f
Merge pull request #2695 from SBird1337/hydra/better-output 
Improve Hydra output
 2023-02-16 14:42:51 +00:00
ghoulslash
f4ef67d897
Merge pull request #2689 from DizzyEggg/grenja 
Fix Battle Bond activating multiple times in battle
 2023-02-16 09:36:02 -05:00
sbird
0d78b29902 [test, output] display KNOWN_FAILING in yellow 2023-02-16 15:31:28 +01: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
DizzyEggg
978d342953 use NUM_BATTLE_SIDES 2023-02-16 15:26:26 +01:00
ghoulslash
05bef50a1f
Merge pull request #2658 from DizzyEggg/one_vs_two_egg 
Fix 1 vs 2 battles with eggs
 2023-02-16 09:20:18 -05:00
ghoulslash
60a3da5811
Merge pull request #2691 from DizzyEggg/clang_scales 
Fix Clanging Scales target and effect
 2023-02-16 09:13:33 -05:00
DizzyEggg
4c18ed2bd4 remove comment 2023-02-16 15:11:48 +01:00
ghoulslash
8c81cf1e66
Merge pull request #2692 from DizzyEggg/shields_down 
Fix Shield Down Ability pop-up
 2023-02-16 09:11:24 -05:00
DizzyEggg
1c970afd6a
fix follow me working in singles (#2644) 
* fix follow me working in singles
 2023-02-16 10:53:29 +01:00
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