ghoulslash
79f39a1fd0
fix eject button
2021-09-03 14:56:36 -04:00
ghoulslash
5c5276b04d
red card fixes
2021-09-03 14:29:28 -04:00
ghoulslash
93e2e09148
fix terrain seeds. create generic CompareStat function
2021-09-03 12:17:38 -04:00
ghoulslash
6ce1227447
fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case
2021-09-03 11:05:11 -04:00
ghoulslash
7c53214dad
merge with be
2021-09-02 15:33:42 -04:00
ultima-soul
a10a02a536
Merge pull request #1221 from ghoulslash/battle_engine
...
Implement Pickpocket
2021-09-02 11:33:34 -07:00
LOuroboros
69b7910f47
Gave an entrance animation to Delta Stream
2021-08-31 00:15:17 -03:00
LOuroboros
0a38054925
Print STRINGID_ATTACKWEAKENEDBSTRONGWINDS properly
2021-08-30 21:21:07 -03:00
LOuroboros
216d8f0608
Solved game freezing issue
...
My approach with BattleScript_AttackWeakenedByStrongWinds was incorrect and thus caused the game to freeze when Battle Scene is enabled, so I resorted to printing the string directly, which I don't like because there is no pauses between `attackstring` and `STRINGID_ATTACKWEAKENEDBSTRONGWINDS`.
2021-08-27 18:28:34 -03:00
LOuroboros
9e4f33d09e
Implemented Desolate Land, Primordial Sea and Delta Stream
2021-08-27 17:56:43 -03:00
LOuroboros
554210c5e3
Removed trailing spaces in the most relevant files
...
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g'
Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
GriffinR
dfdcfc1568
Document remaining functions in cable_club
2021-08-15 16:22:15 -04:00
ghoulslash
85f98300ff
use B_WAIT_TIME_SHORT and B_WAIT_TIME_LONG
2021-08-12 14:14:51 -06:00
ghoulslash
0bbbd1e7a9
fix electric/misty yawn/rest interactions
2021-08-12 14:08:41 -06:00
ghoulslash
c7c0fbc296
merge with be, make AI CanBeStatused functions separate from general util ones
2021-08-12 13:37:53 -06:00
ghoulslash
d218322b2c
merge with be
2021-08-12 01:26:13 -04:00
ultima-soul
02c9e040df
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-08-11 16:33:10 -07:00
LOuroboros
b4c4650186
Corrected inconsistent flag label spelling
2021-08-05 17:26:03 -03:00
GriffinR
44cd9eed6b
Add align directives to all marts
2021-08-04 11:50:33 -04:00
ghoulslash
ab529b4e89
add stuff cheeks
2021-07-27 10:31:48 -06:00
LOuroboros
f1195e1884
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile
2021-07-27 09:08:52 -03:00
ghoulslash
4ca6d76160
add bug bite
2021-07-25 14:55:52 -06:00
ghoulslash
c914ed8572
fix sucker punch, surging strikes, obstruct, and snipe shot
2021-07-25 09:38:54 -06:00
ghoulslash
a37d4c3da9
merge with be, give life dew jungle healing effect
2021-07-25 08:22:05 -06:00
ghoulslash
fd61770c34
water bubble prevents burn
2021-07-25 07:53:44 -06:00
ghoulslash
72d346fa46
Merge pull request #1560 from rh-hideout/DizzyEggg-patch-3
...
Fix White Smoke affecting Shell Smash's def drop
2021-07-24 07:14:08 -06:00
GriffinR
06351bf63c
Remove address comments
2021-07-20 15:18:31 -04:00
ghoulslash
a29c9f9339
Merge pull request #1569 from LOuroboros/cotton_down
...
Fixed Cotton Down
2021-07-13 11:06:59 -06:00
ghoulslash
ebc187c16d
Merge pull request #1536 from DizzyEggg/gravity
...
Fix Gravity's animation
2021-07-13 10:54:45 -06:00
LOuroboros
02eace4574
Fixed Cotton Down
...
It will no longer affect fainted 'mons.
2021-07-13 13:54:33 -03:00
GriffinR
72bb2bd160
Merge pull request #1474 from GriffinRichards/clean-miragetower
...
Clean up Mirage Tower
2021-07-10 23:26:41 -04:00
DizzyEggg
34f869ef40
Fix White Smoke affecting Shell Smash's def drop
2021-07-06 10:37:17 +02:00
GriffinR
0f538102d9
Add local id constants for C
2021-07-05 13:54:43 -04:00
GriffinR
d2701b51ab
Combine battle script labels, add EFFECT comments
2021-07-02 15:37:59 -04:00
GriffinR
64d06f4c8f
Condense battle AI scripts, minor clean up
2021-07-02 02:46:01 -04:00
GriffinR
8f43d1ebeb
Document smart shopper TV show
2021-07-02 01:45:23 -04:00
GriffinR
10886a586b
Clean up mirage tower
2021-07-01 23:46:15 -04:00
BuffelSaft
4c18cb7fe7
Remove EFFECT_THAW_HIT
2021-06-19 11:49:00 +12:00
SphericalIce
0a94dba4a7
Rename item script labels to fit the established name scheme
2021-06-13 13:21:23 +01:00
MissingNoL
32c8de5eca
Finished!
2021-06-12 21:23:56 -07:00
MissingNoL
721dbe9178
Implemented all PLG effects
2021-06-12 18:01:35 -07:00
MissingNoL
610b18bfdb
Implemented Double Iron Bash's effect
2021-06-12 14:27:50 -07:00
MissingNoL
beb126b534
Implemented Zippy Zap's effect
2021-06-12 13:58:54 -07:00
ExpoSeed
3ed06c2cc2
Remove remaining grey and replace with gray
2021-06-10 11:36:10 -05:00
DizzyEggg
59ea75f99f
Fix Ability-popup lag
2021-06-08 12:56:38 +02:00
DizzyEggg
e2f14d43db
Fix Gravity's animation
2021-06-08 12:13:40 +02:00
LOuroboros
588b3638d3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into inner_focus
2021-06-07 19:22:20 -03:00
LOuroboros
8726107d42
Removed BattleScript_FlinchPrevention
...
Also reverted a nonsensical change in SetMoveEffect's case MOVE_EFFECT_FLINCH.
2021-06-07 19:18:15 -03:00
ultima-soul
092f02f119
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-06-07 12:00:23 -07:00
MissingNoL
bfc66a21cc
gBattlescriptCurrInstr[3] is not reading species parameter
2021-06-06 19:14:11 -07:00
MissingNoL
c876de5a5b
Done! Merge branch 'battle_engine' into Photon_Geyser
2021-06-05 17:40:06 -07:00
ultima-soul
6edec5bc3d
Merge pull request #1437 from LOuroboros/oblivious
...
Tweaked Oblivious
2021-06-04 16:51:38 -07:00
LOuroboros
b552db7193
Tweaked the Oblivious immunities
...
Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.
2021-06-04 19:23:07 -03:00
ultima-soul
2813b4f9bf
Merge pull request #1519 from DizzyEggg/flameburst
...
Fix FlameBurst
2021-06-03 09:30:50 -07:00
LOuroboros
b215b44951
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into clanging_scales
2021-06-03 05:09:14 -03:00
DizzyEggg
85ff866998
Fix FlameBurst
2021-06-03 09:50:43 +02:00
ultima-soul
b7f9009c1e
Merge pull request #1515 from DizzyEggg/battle_engine
...
Get rid of SOUND_PAN_ATTACKER in launchtemplate
2021-06-02 23:45:12 -07:00
LOuroboros
a60fd31b9f
Added the MOVE_EFFECT_CERTAIN arg to BattleScript_EffectAttackerDefenseDownHit
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-06-02 16:42:02 -03:00
BuffelSaft
2a6b989c92
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into body-press
2021-06-02 12:41:28 +12:00
LOuroboros
c21a00a5d1
Replaced magic numbers with constants in BattleScript_NotAffectedAbilityPopUp
2021-06-01 18:20:33 -03:00
LOuroboros
d48a6e00d4
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into oblivious
2021-06-01 18:15:01 -03:00
DizzyEggg
dd88be659c
Get rid of SOUND_PAN_ATTACKER in launchtemplate
2021-06-01 13:44:02 +02:00
DizzyEggg
72b7cb2dad
Merge pull request #1474 from LOuroboros/overdrive
...
Fixed Overdrive's animation
2021-06-01 13:33:11 +02:00
MissingNoL
0f09055cfe
Fixes and added Poison chance to Shell Side Arm (needs contact on physical)
2021-05-28 11:11:03 -07:00
MissingNoL
f30a9542ee
Problem: Photon Geyser is calculating as Shell Side Arm?? Needs: Poison effect, contact move for Shell Side Arm
2021-05-27 22:21:55 -07:00
ghoulslash
5840b1f0ed
utility umbrella effect
2021-05-24 09:52:45 -06:00
ghoulslash
c3e28e9b1a
merge with be
2021-05-23 12:22:52 -06:00
LOuroboros
9b46b6fb45
pause 0x40 -> pause B_WAIT_TIME_LONG
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-05-22 16:34:39 -03:00
LOuroboros
8cbdde3fba
waitmessage 0x40 -> waitmessage B_WAIT_TIME_LONG
2021-05-21 20:22:04 -03:00
LOuroboros
1bd451e232
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into 2turn_move_tweaks
2021-05-21 20:21:51 -03:00
ExpoSeed
6a977bdbfc
Document second parameter of playbgm
2021-05-21 15:08:00 -05:00
GriffinR
c8be6a1fbb
Remove leftover berry descriptions
2021-05-17 03:06:02 -04:00
GriffinR
65fd334256
Name map groups
2021-05-11 10:16:04 -05:00
LOuroboros
95d41524a2
Implemented Clanging Scales' effect
2021-05-09 18:20:03 -03:00
Flametix
a8fab62c89
Fix Substitute typo
2021-05-06 20:49:04 -04:00
LOuroboros
64a86d0285
Swapped launchtemplate calls with createsprite calls
2021-05-04 15:36:00 -03:00
ultima-soul
e864c39a5d
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync
2021-05-04 10:04:35 -07:00
ghoulslash
22fc9733e5
Merge pull request #1480 from BuffelSaft/big_root_fix
...
Make Big Root affect absorb moves
2021-05-04 09:32:18 -06:00
BuffelSaft
5d177f0a15
Make Big Root affect absorb moves
...
Big Root should increase the HP recovered by Absorb, Giga Drain etc.
2021-05-04 23:20:22 +12:00
LOuroboros
fa0d3a351e
Fixed Overdrive's animation
2021-05-02 20:10:48 -03:00
ultima-soul
56fc420187
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 21:34:30 -07:00
GriffinR
f7a699c686
Merge pull request #1421 from GriffinRichards/doc-tvrecordmix
...
Document TV
2021-04-29 00:25:01 -04:00
ultima-soul
14a0303e2f
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-27 18:36:37 -07:00
GriffinR
aad090e154
Document TV
2021-04-26 12:35:35 -04:00
GriffinR
bc9fc38254
Misc contest cleanup
2021-04-22 15:51:04 -04:00
GriffinR
dbe24f0baa
Clean up contest_painting
2021-04-21 20:04:12 -04:00
GriffinR
09a9efd5c5
Merge pull request #1398 from GriffinRichards/doc-field
...
Document field
2021-04-10 13:05:51 -04:00
GriffinR
4a1cfbead2
Document remaining overworld
2021-04-06 16:55:43 -04:00
GriffinR
802d2b2f0f
Label Kyogre/Groudon anims
2021-04-06 03:46:19 -04:00
GriffinR
00c3044c96
Clarify Groudon/Kyogre/Rayquaza gfx names
2021-04-06 02:38:15 -04:00
GriffinR
b6711441f5
Fix AI Guard Spec use, and Specs->Spec
2021-04-03 15:18:17 -04:00
GriffinR
f4d8a91ba4
Misc battle script cleanup
2021-04-03 14:07:31 -04:00
GriffinR
9ea9ffde09
Add remaining multistring chooser constants
2021-04-03 11:49:06 -04:00
LOuroboros
480e6a1ffc
Tweaked Ability PopUp for Inner Focus
2021-04-02 21:04:04 -03:00
ultima-soul
939608f5b8
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-02 13:16:40 -07:00
GriffinR
a836bd1085
Add missing trainer constant use
2021-04-02 02:17:36 -04:00
GriffinR
87430a1ebc
Add WAIT_TIME battle script constants
2021-04-02 02:16:01 -04:00
GriffinR
c9d3b26ff7
Label miss string indexes
2021-04-02 02:12:46 -04:00
GriffinR
8be2c5d60b
Document Contest Lady TV Show
2021-04-02 01:49:38 -04:00
GriffinR
51970f97b0
Merge pull request #1393 from GriffinRichards/doc-dewfordtrend
...
Document Dewford Trend and match_call.c
2021-04-01 22:19:48 -04:00
LOuroboros
ed74430d26
Added a variation of BattleScript_NotAffected
...
This one triggers the Ability PopUp.
2021-03-31 23:33:51 -03:00
GriffinR
771a434730
Label Trend Watcher TV show texts
2021-03-31 16:29:42 -04:00
GriffinR
86856098a3
Document Dewford Trend
2021-03-31 16:08:42 -04:00
GriffinR
f602a9dcbf
Use bool for multichoice ignoreBPress
2021-03-31 00:35:56 -04:00
ghoulslash
a595b213b4
merge with be
2021-03-28 17:29:22 -06:00
GriffinR
7a5c6d4d86
Standardize Friendship/Happiness
2021-03-27 17:27:20 -05:00
ultima-soul
5bab9474dc
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-03-22 23:08:19 -07:00
GriffinR
8eafe1fd4e
Move pointillism points array to src
2021-03-18 17:36:18 -05:00
BuffelSaft
7d237d8ff6
Implement Body Press' effect
...
Body Press calculates damage using the user's defense stat instead of its attack. Also adds a special variant of the effect that uses the special defense stat.
2021-03-16 22:56:44 +13:00
GriffinR
fd3175bde4
Note missing end in Trainer Hill
2021-03-13 16:40:29 -05:00
Eduardo Quezada D'Ottone
292993e360
Merge pull request #1338 from ghoulslash/ripen
...
Add Ripen and Finish Gen4 Berries
2021-03-13 11:16:42 -03:00
LOuroboros
68980cf18c
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile
2021-03-10 03:58:21 -03:00
ExpoSeed
685c8283ed
Merge pull request #1411 from BuffelSaft/Batte_Engine_Only
...
Fix Spiky Shield/Jump Kick freeze
2021-03-08 17:24:36 -06:00
GriffinR
55a40b901f
Label battle tower link script
2021-03-04 19:30:19 -06:00
GriffinR
734a15135f
Clean up a few unlabeled scripts
2021-03-04 19:30:19 -06:00
Evan
2ccdf1d89e
merge with be. magic guard checks
2021-03-03 09:21:06 -07:00
ultima-soul
e5fa583a08
Merge pull request #1334 from ghoulslash/gen8_abilities
...
More Gen 8 Abilities
2021-03-01 10:40:09 -08:00
Evan
6cb8c6309a
merge with be
2021-03-01 11:28:51 -07:00
Evan
55b8538f68
merge with be
2021-03-01 11:22:37 -07:00
Marcus Huderle
a85fada314
Document more battle anim effects
2021-02-28 09:54:55 -06:00
GriffinR
ea748ff7f5
Merge pull request #1344 from GriffinRichards/doc-ec
...
Document easy chat and mail, script.c cleanup, add/use some general constants
2021-02-28 10:26:49 -05:00
Marcus Huderle
c323e7f061
Document some battle anim funcs and data
2021-02-27 11:04:45 -06:00
GriffinR
c6141fea83
Document easy chat
2021-02-24 11:03:45 -05:00
BuffelSaft
2b90c0b945
Fix Spiky Shield/Jump Kick bug
...
Spiky Shield no longer tries to hurt a Pokemon that has already fainted. Previously this would freeze the game if Jump Kick recoil fainted a Pokemon due to the target using Spiky Shield.
2021-02-19 13:57:29 +13:00
GriffinR
02c1fbd733
Document ribbon TV show, add new ribbon IDs/size
2021-02-18 09:59:24 -05:00
Deokishisu
7b2bf8c7e2
Rename obedient/fatefulEncounter to eventLegal
...
Per discussion on pret, `obedient`/`fatefulEncounter` has been renamed to `eventLegal`, and all related functions and constants have been modified with this in mind.
Additionally, fixed some whitespace alignment issues in `script_cmd_table.h`, `pokemon.h`, and `tv.c` from the last commit.
2021-02-15 14:54:35 -05:00
Deokishisu
b89c3e901e
Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h
...
The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi.
The giftRibbon fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the obedient bit was renamed `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
2021-02-15 11:40:16 -05:00
GriffinR
5f58ea02c6
Merge pull request #1330 from sphericalice/hidden-to-buried
...
Rename 'hidden' Trainers/obj events to 'buried'
2021-02-14 21:48:21 -05:00
SphericalIce
56e047f949
Fix Lilcove Motel typos
2021-02-14 21:38:39 +00:00
SphericalIce
70ff6c3b84
Rename 'hidden' Trainers/obj events to 'buried'
2021-02-14 19:25:23 +00:00
GriffinR
be0699bd64
Merge pull request #1326 from GriffinRichards/doc-layouts
...
Label unused layouts
2021-02-14 14:22:28 -05:00
Evan
f3d975e239
merge with be
2021-02-12 08:59:55 -07:00
GriffinR
20b76c6071
Fix swapped route 102 berries
2021-02-10 16:26:09 -05:00
LOuroboros
43d6340b92
Corrected the order of actions in BattleScript_FirstChargingTurn
2021-02-08 17:51:46 -03:00
GriffinR
2237d0748f
Label unused layouts
2021-02-08 14:45:56 -05:00
GriffinR
0851c34bac
Add berry tree id constants
2021-02-05 15:25:12 -05:00
ultima-soul
7a237595c9
Merge pull request #1389 from LOuroboros/syntax
...
Removed trailing spaces from various files
2021-02-02 11:04:34 -08:00
Evan
f4d4cf262e
fix screen cleaner, curious medicine, as one
2021-02-02 09:00:07 -07:00
GriffinR
64460e01ae
Merge pull request #1314 from GriffinRichards/doc-controllers
...
Document battle controllers, misc other battle
2021-02-02 00:24:16 -05:00
ultima-soul
2a20d50904
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-02-01 15:54:08 -08:00
LOuroboros
fc04c6974b
Edit->Blank Operations->Trim Trailing Space for the win
2021-02-01 17:05:49 -03:00
Evan
f428e5e2dc
some quick claw/custap berry fixes
2021-01-31 23:31:27 -07:00
Evan
c009b51ae8
add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot
2021-01-28 13:27:00 -07:00
Evan
a37acb8345
coaching, lash out, burning jealousy
2021-01-28 12:21:11 -07:00
Evan
dd51edd881
add eerie spell, surging strikes, jungle healing
2021-01-28 10:51:00 -07:00
Evan
c003f1c023
check move effectiveness with status effects
2021-01-26 15:41:59 -07:00
GriffinR
9e59581220
Document object lock and some trainer approach
2021-01-26 04:42:18 -05:00
GriffinR
0064333e4a
Clean up scrcmd.c
2021-01-26 02:16:26 -05:00
GriffinR
4eca05ccf5
Document remainder of battle_controllers.c
2021-01-22 02:48:22 -05:00
Evan
4611c71bd1
merge with be
2021-01-21 08:55:14 -07:00
Evan
8ec12c665c
merge with be
2021-01-20 17:36:13 -07:00
Evan
e61309dce6
merge with be
2021-01-20 17:34:24 -07:00
Evan
16d54b6d32
merge with be, add form checks to CanBattlerGetOrLoseItem
2021-01-20 14:28:03 -07:00
GriffinR
de52df5613
Fix some mislabeled scripts
2021-01-19 04:51:34 -05:00
GriffinR
1a40202ea4
Note bug in Foresight AI
2021-01-19 04:46:31 -05:00
GriffinR
c6a81c5277
Use MON_MALE/FEMALE for get_gender
2021-01-19 04:37:17 -05:00
Evan
a49b5d1ad0
prankster updated to gen 7
2021-01-16 16:14:36 -07:00
Evan
0dabbc2d31
fix misty terrain check
2021-01-16 12:39:44 -07:00
Evan
c2dfc571b2
misty terrain blocks confusion
2021-01-16 12:21:04 -07:00
Evan
10b1d33d13
handle battler being affected by terrain
2021-01-16 12:05:51 -07:00
Evan
9e29d303ec
electric and misty terrain preventions
2021-01-16 11:40:02 -07:00
LOuroboros
af3dcf7543
Fixed Focus Blast animation
...
Its gSuperpowerOrbSpriteTemplate was overlapping the battle textbox.
2021-01-16 03:57:47 -03:00
Evan
0d8f804194
update mental herb to gen 5
2021-01-15 18:11:55 -07:00
LOuroboros
c2f718d3d3
Implemented Cramorant's Gulp Missile form change
2021-01-14 17:23:09 -03:00
LOuroboros
c21c0f8c37
Fixed incorrect preprocessor directive in ASM file
2021-01-13 22:42:56 -03:00
Evan
d26605c9fe
fix bad bg fade if no permanent terrain
2021-01-13 16:01:47 -07:00
Evan
9902f6e603
merge with be
2021-01-13 14:32:14 -07:00
GriffinR
b9e1b050e1
Label remaining battle types
2021-01-13 15:20:29 -05:00
Evan
56395a060f
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai
2021-01-13 09:23:07 -07:00
ghoulslash
fba17a96a4
Merge pull request #1253 from surskitty/battle_engine
...
Increase readability of too-long names
2021-01-12 09:20:53 -07:00
GriffinR
92de664f79
List battle animation indexes alongside tables
2021-01-11 16:07:16 -05:00
opakedragon
3ce4e6b24b
rename string id to reflect usage
2021-01-11 08:47:11 -05:00
surskitty
a0f1dcb9cf
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine
2021-01-10 15:40:21 -05:00
Evan
1e22ae4cf2
merge with be
2021-01-10 09:08:25 -07:00
Evan
d4e4405cf5
merge with be
2021-01-10 09:04:21 -07:00
Evan
e748db8ef4
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai
2021-01-10 08:58:16 -07:00
Evan
b5128be68b
eject packer invisible before openpartymenu
2021-01-08 08:02:00 -07:00
Evan
6dabff1ee3
merge with be
2021-01-07 21:24:21 -07:00
Evan
2bd5167a6c
eject pack
2021-01-07 21:11:56 -07:00
Evan
0118723a9c
add eject button
2021-01-07 20:31:27 -07:00
Evan
5eb49722c0
add red card effect
2021-01-07 19:33:39 -07:00
ultima-soul
d2d961e447
Merge pull request #1262 from LOuroboros/gen8_abilities_BE
...
Implemented various Gen. 8 abilities
2021-01-07 13:31:17 -08:00
LOuroboros
8511ed57e4
Tweaked Steam Engine's battle string
2021-01-07 18:13:16 -03:00
ghoulslash
c392a2011e
Merge pull request #1325 from ExpoSeed/BE/sync
...
Sync battle engine
2021-01-07 12:13:26 -07:00
LOuroboros
339aa95c1d
Review corrections
...
-Intrepid Sword and Dauntless Shield are now properly affecting the user
-Slightly tweaked Ball Fetch's effect, since an operation involving gBattleResults.catchAttempts was being done twice unnecessarily.
2021-01-07 04:31:26 -03:00
Evan
7fffe23e63
add terrain seeds
2021-01-06 20:22:05 -07:00
Evan
c1dd3fca21
add room service
2021-01-06 18:00:14 -07:00
Evan
db6f9d05ec
add throat spray
2021-01-06 15:28:58 -07:00
Evan
c3615485f3
merge in berry branch
2021-01-06 12:54:02 -07:00
Evan
7646855e79
jaboca, rowap berry effects
2021-01-06 11:15:56 -07:00
Evan
efa4fe89ad
micle berry
2021-01-06 10:47:07 -07:00
Evan
f2e486eb0d
custap berry effect, custap/quick claw activation message
2021-01-06 09:37:31 -07:00
Evan
b3a6df8d57
stat raising berries
2021-01-05 22:13:32 -07:00
Evan
f046a25ce0
ripen & hp restoring berries
2021-01-05 21:15:21 -07:00
Evan
0a3908ee92
add neigh and as one abilities
2021-01-05 19:37:23 -07:00
Evan
5ae1e3c25b
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai
2021-01-04 11:43:36 -07:00
LOuroboros
517c8ffdd0
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_abilities_BE
2021-01-03 22:05:14 -03:00
ExpoSeed
7dadcb94b8
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-03 17:14:43 -06:00
BuffelSaft
10cf5b3673
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into Batte_Engine_Only
2021-01-04 10:55:30 +13:00
GriffinR
d992e4277e
Merge pull request #1283 from GriffinRichards/doc-factscreen
...
Document battle factory screen
2021-01-03 02:51:59 -05:00
GriffinR
c711a2f73b
Document warp spin functions
2021-01-01 17:11:02 -05:00
Evan
f172245ad6
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into totem
2021-01-01 08:49:43 -07:00
ExpoSeed
b7b1b26b57
Merge pull request #1289 from LOuroboros/final_gambit
...
Corrected Final Gambit's move data and tweaked its effect
2020-12-31 18:39:00 -06:00
ExpoSeed
24362e8bed
Merge pull request #1250 from ghoulslash/infestation
...
infestation between turn anim
2020-12-31 18:06:13 -06:00
surskitty
aa9796a6ae
Renaming constants for High Jump Kick, Faint Attack, Smelling Salts, and Vise Grip.
2020-12-31 18:57:36 -05:00
GriffinR
ec85c01e7c
Merge branch 'master' into doc-factscreen
2020-12-31 00:40:45 -05:00
GriffinR
769ddf22c2
Label remaining subs in battle_tower.c
2020-12-24 16:18:47 -05:00
ghoulslash
0af8cab87e
Merge pull request #1283 from LOuroboros/ct_moves_data
...
Added the data of SwSh's Crown Tundra's moves
2020-12-21 23:13:23 -07:00
LOuroboros
3918542b3e
Corrections to Final Gambit's effect's battle script
...
-Restored the call to resultmessage
-Corrected its behavior against Endured, Focus Banded/Sashed and Sturdy foes
2020-12-20 21:31:36 -03:00
Evan
a0b9ece980
merge with BE
2020-12-20 16:39:50 -07:00
Evan
21e7d6d318
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai
2020-12-20 16:33:43 -07:00
Evan
7988a1f41d
Ai_TryOnAlly and reorganize files
2020-12-20 14:47:20 -07:00
Evan
a504199ea6
ai prefer baton pass
2020-12-19 22:51:25 -07:00
Evan
b2e5760479
risky ai script -> c
2020-12-19 22:12:31 -07:00
Evan
cd119ed6c3
first turn ai script
2020-12-19 22:07:21 -07:00
Evan
31ec3e8479
non-partner good move checks
2020-12-19 21:58:23 -07:00
LOuroboros
9f2dc914ba
Tweaked Final Gambit's effect
...
-Made the user faint before the foe like in the official games
-Removed calls to resultmessage and critmessage as those were never needed by this move's effect
2020-12-19 22:12:17 -03:00
LOuroboros
89989943b3
Added placeholders for the anims of CT's moves
2020-12-19 19:11:17 -03:00
ultima-soul
aefa35a04f
Merge pull request #1275 from ghoulslash/battle_anims
...
Fix Shadow Sneak Animation
2020-12-18 23:15:07 -08:00
Evan
b85dacce9d
fix conflicts
2020-12-14 08:50:41 -07:00
Evan
67fefd0261
var terrain, surge fixes
2020-12-13 19:42:48 -07:00
LOuroboros
785e23222b
Review correction
2020-12-13 21:20:27 -03:00
Evan
ead8637e4f
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation
2020-12-13 17:09:04 -07:00
Evan
36b0e6dedc
fix shake duration
2020-12-13 17:08:35 -07:00
Evan
ac332d5e98
check bad move
2020-12-13 15:02:21 -07:00
GriffinR
81d95b9325
Use BUGFIX for some inline fixes
2020-12-12 23:30:51 -05:00
LOuroboros
dc34ad7e83
Tweaked abilitypopup usage on Cotton Down's BattleScript
2020-12-12 21:24:39 -03:00
LOuroboros
c5e04cf243
Removed the unnecessary Dragon Energy effect
...
The move is an Eruption clone, whose effect was already done. Thanks to BuffelSaft for the heads up.
I took the chance and fixed its target too.
2020-12-12 01:35:54 -03:00
LOuroboros
0ac026e6ca
Added the data of SwSh's Crown Tundra's moves
...
And Dragon Energy's effect. Eerie Spell's is the only one missing out of this bunch.
2020-12-11 20:49:23 -03:00
LOuroboros
2b0702ec04
Implemented Perish Body
...
Inspired by Raguzero's implementation.
2020-12-11 19:44:32 -03:00
LOuroboros
7d8b8083e8
Implemented Sand Spit
2020-12-11 16:47:23 -03:00
Evan
aad3a800c3
c functions for ai roamers/safari/first battle
2020-12-10 22:10:21 -07:00
LOuroboros
322918e280
Implemented Steam Engine
...
And I also made the BattleScript created for Anger Point a bit more neutral friendly so it can be reused on situations like this.
2020-12-10 18:27:35 -03:00
Evan
34dd11448b
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 10:28:18 -07:00
Evan
a93a8b2194
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine
2020-12-08 20:50:43 -07:00
Evan
964ec53a65
port cfru shadow sneak anim
2020-12-08 11:36:19 -07:00
LOuroboros
c9824a8dd9
Fixed Cotton Down
...
It was tough, but the nightmare is finally over.
Ghoulslash, Blurose, Cancer Fairy, thanks to all of you guys!
2020-12-07 20:08:36 -03:00
BuffelSaft
72b769ec75
Add config options for Jump Kick
...
Added options for:
- Gen 4 style recoil when target is immune (user takes 50% of target's max HP)
- Gen 3 style recoil when target is immune (i.e no recoil)
- Gen 5+ recoil was already implemented but was bugged
2020-12-07 19:30:31 +13:00
Evan
21cab1b7a7
better negative totem boost system, totems occur before switch in abilities
2020-12-05 21:00:51 -07:00
BuffelSaft
ef41a4c14d
Fix Jump Kick
...
* Now inflicts recoil damage on the user if the target was immune to the attack
* Gen V+ recoil damage is now half of the user's HP instead of half of the target's HP.
2020-12-06 16:14:02 +13:00
LOuroboros
42a06c6003
Fixed softlock caused by the majority of Techno Blast's animations
...
And made the checks that sets its animation use the Type constants instead of their internal IDs.
2020-12-05 21:23:59 -03:00
LOuroboros
6a0fee9c56
Fixed Intrepid Sword and Dauntless Shield
...
And also introduced a new BattleString for BattleScript_BattlerAbilityStatRaiseOnSwitchIn
2020-12-05 14:03:13 -03:00
LOuroboros
002973d373
Renamed BattleScript_TargetAbilityStatRaiseOnSwitchIn
...
This battlescript is meant to be called within the case ABILITYEFFECT_ON_SWITCHIN of AbilityBattleEffects, which refers to the currently selected battler as Battler instead of Attacker or Target.
2020-12-05 13:50:47 -03:00
LOuroboros
6bbd88049a
Ball Fetch tweaks
2020-12-05 03:03:55 -03:00
LOuroboros
e2f4ca27b0
BattleScript_TargetAbilityStatRaiseOnSwitchin -> BattleScript_TargetAbilityStatRaiseOnSwitchIn
2020-12-05 02:43:29 -03:00
ultima-soul
e05b5fc8a3
Merge pull request #1260 from ghoulslash/BE_test
...
Fix Babydoll eyes animation
2020-12-04 15:46:17 -08:00
Evan
39cbc21925
fix trainer theft, update config option
2020-12-03 08:42:12 -05:00
LOuroboros
9e1d7cc827
Implemented Ball Fetch
2020-12-02 23:09:35 -03:00
LOuroboros
0c4c6fc778
Implemented Cotton Down
2020-12-02 22:53:00 -03:00
LOuroboros
e11fa09632
Implemented Intrepid Sword and Dauntless Shield and...
...
-Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd
-Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin
Their labels reflect the instances of a battle in which they can be called.
2020-12-02 19:07:08 -03:00
Evan
3102e499da
fix babydoll eyes anim priority
2020-12-02 14:23:03 -05:00
Evan
4ad5e368a9
fix merge conflicts
2020-12-01 17:57:57 -05:00
Evan
58a79a4f37
shorten between-turn infestation anim length
2020-12-01 17:52:44 -05:00
Evan
1e68c46890
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation
2020-12-01 17:51:38 -05:00
Evan
5478179464
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_anims
2020-12-01 17:46:26 -05:00
ExpoSeed
aa7facf57b
Merge pull request #1243 from ghoulslash/abilities
...
Finish Switch In Ability Activation Messages
2020-11-28 20:27:32 -06:00
Evan
6c0878b5fe
infestation between turn anim
2020-11-24 17:21:59 -05:00
GriffinR
513c7c5f45
Clarify Kecleon objects
2020-11-23 14:42:47 -05:00
Eduardo Quezada D'Ottone
47fe30f0a1
Merge pull request #1246 from ExpoSeed/BE-patch
...
Remove Techno Blast and Judgment from battle scripts
2020-11-20 20:49:38 -03:00
ExpoSeed
914c830616
Remove Techno Blast and Judgment from battle scripts
2020-11-19 21:21:34 -06:00
Evan
07a4400d50
finish switch in ability messages
2020-11-19 11:42:00 -07:00
Evan
1c398c3d4b
totem format fixes
2020-11-19 10:37:15 -07:00
Evan
99d9a36860
add totem boosts
2020-11-19 10:35:37 -07:00
Evan
c026f705b3
permanent terrain move bgs
2020-11-17 19:45:27 -07:00
Evan
479f6be51a
redo power trick anim
2020-11-17 15:31:18 -07:00
ghoulslash
686ff59b11
Merge pull request #13 from AsparagusEduardo/PR-LGPE_IOA_Moves
...
LGPE & Isle of Armor move data.
2020-11-15 08:29:10 -07:00
Eduardo Quezada D'Ottone
f0154028ff
Review changes 2
2020-11-14 09:01:43 -03:00
Eduardo Quezada D'Ottone
e87f0f1ddb
Review changes
2020-11-13 14:51:50 -03:00
Evan
64bcac4589
move pickpocket to back of moveend sequence
2020-11-12 23:30:00 -07:00
Evan
e585be6f2e
format fix
2020-11-11 18:37:11 -07:00
Evan
520f00f4ae
add pickpocket
2020-11-11 18:08:46 -07:00
ExpoSeed
0912577ea1
Merge pull request #575 from AsparagusEduardo/BE-WishMegaEvo
...
Implemented Wish Mega Evolution
2020-11-11 11:05:06 -06:00
Eduardo Quezada D'Ottone
98d3427e62
Prevent Ability Popup overwrites #1218 from ghoulslash
2020-11-10 17:34:33 -03:00
Eduardo Quezada D'Ottone
e6f8d57f08
Merge remote-tracking branch 'RHH/battle_engine' into BE-WishMegaEvo
...
# Conflicts:
# include/constants/battle_string_ids.h
2020-11-10 17:28:17 -03:00
LOuroboros
bb4f00737e
B_EXPANDED_INTIMIDATE->B_UPDATED_INTIMIDATE
2020-11-10 14:26:47 -03:00
Evan
0683dc9c3f
longer ability popup delay to prevent overwriting
2020-11-10 10:05:11 -07:00
LOuroboros
a25190f357
A few things.
...
-Introduced a Gen. 8 styled text string for Intimidate
-Added an ability popup to BattleScript_IntimidatePrevented
2020-11-10 10:34:51 -03:00
LOuroboros
e179b9b5fe
Updated Intimidate to Gen. 8 standard
2020-11-10 10:18:16 -03:00
Eduardo Quezada D'Ottone
09a5d6c722
Implemented Wish Mega Evolution
2020-11-07 10:13:32 -03:00
LOuroboros
c66b77fbf8
Changed Hurricane's animation
2020-11-06 21:06:04 -03:00
Eduardo Quezada
b5834b617d
Merge branch 'BattleEngine' into PR-LGPE_IOA_Moves
...
# Conflicts:
# src/data/text/move_descriptions.h
2020-10-24 00:36:29 -03:00
Eduardo Quezada D'Ottone
c783f789ed
Merge pull request #523 from LOuroboros/eerie_impulse
...
Fixed Eerie Impulse's animation again
2020-10-20 18:52:36 -03:00
LOuroboros
22093e75fc
Fixed Electrify's animation again
...
For more details, see: https://github.com/DizzyEggg/pokeemerald/pull/425#issuecomment-672012634
2020-10-20 10:30:32 -03:00
LOuroboros
ea54afbdc7
Fixed Eerie Impulse's animation again
...
For more details, see: https://github.com/DizzyEggg/pokeemerald/pull/425#issuecomment-672012634
2020-10-20 10:15:49 -03:00
Eduardo Quezada
d0feac8fe4
Fix comment identation.
2020-10-19 17:48:27 -03:00
Eduardo Quezada
5f7c01bd41
Replaced spaces to tabs.
2020-10-19 11:58:19 -03:00
Eduardo Quezada
8f9659f846
Fixed Pika Papow's name.
2020-10-19 11:45:54 -03:00
Eduardo Alvaro Quezada D'Ottone
1df696c1fb
Merge pull request #17 from LOuroboros/move_updates
...
Updated many moves' data to Gen. 8 standards
2020-10-15 20:56:58 -03:00
LOuroboros
fcc3c6c6ba
Added a way to quickly switch Rapid Spin's move effect from Gen. 3 to 8
2020-10-15 04:21:40 -03:00
Eduardo Quezada
47259092e3
LGPE & Isle of Armor move data.
2020-10-14 21:50:22 -03:00
ExpoSeed
88b9847772
Merge branch 'master' of https://github.com/pret/pokeemerald into sync-battle-engine-v2
2020-10-12 12:42:37 -05:00
GriffinR
1472111c5d
Fix PutAwayDecorationLoop UB comment
2020-10-11 19:02:10 -04:00
ExpoSeed
9e2c8a95c1
Sync bev2 with pret
2020-10-11 01:01:47 -05:00
Eduardo Quezada
96e4b43ce5
Documenting where each of the berries are generated in new_game.inc
2020-10-03 21:52:09 -03:00
ExpoSeed
032669e2ab
Change script command table comment alignment from tabs to spaces
2020-09-25 14:05:17 -05:00
ExpoSeed
31d12383b1
Add byte comments to mystery event script command table
2020-09-25 13:27:15 -05:00
ExpoSeed
e7340ca0e1
Add byte comments to script command table
2020-09-25 13:25:36 -05:00
Eduardo Quezada
46ccb91155
Fixed "Ultra Rope" name.
2020-09-13 11:35:05 -03:00
GriffinR
921f389e4e
Fix Rusboro and Lavarige typos
2020-09-11 14:47:47 -04:00
DizzyEggg
97d0643110
Merge with master
2020-09-08 12:48:28 +02:00
PikalaxALT
135ed6a162
Merge pull request #1163 from GriffinRichards/doc-animthrow
...
Minor battle_anim_throw cleanup
2020-09-04 19:44:33 -04:00
GriffinR
1264c4615a
Merge pull request #1158 from GriffinRichards/doc-cablecar
...
Document cable car
2020-09-03 16:24:27 -04:00
GriffinR
4ad147f75d
Merge pull request #1156 from GriffinRichards/doc-rayscene
...
Document Rayquaza cutscene
2020-09-01 14:46:14 -04:00
GriffinR
f5495d1220
Give proper names to underwater maps
2020-09-01 03:03:14 -04:00
GriffinR
bf61de01a7
Start documenting battle factory screen
2020-08-31 13:36:48 -04:00
GriffinR
5773bb8643
Merge pull request #1152 from GriffinRichards/doc-blender
...
Document berry blender
2020-08-30 15:33:17 -04:00
GriffinR
afb3472282
Minor battle_anim_throw cleanup
2020-08-30 15:11:44 -04:00
hondew
e46b35455d
Merge branch 'master' into pokeball-doc
2020-08-30 14:14:38 -04:00
hondew
328aecc96e
Document throwing pokeball
...
continue
Document more
Doc more funcs
Remove workspace
Document shiny stars
Document PokeBlock
Clean up
Clean more
2020-08-30 14:08:06 -04:00
GriffinR
08a8aad65a
Merge branch 'master' into doc-cablecar
2020-08-28 16:17:48 -04:00
GriffinR
0cfc279af5
Merge branch 'master' into doc-rayscene
2020-08-28 16:17:11 -04:00
GriffinR
c830731734
Merge branch 'master' into doc-blender
2020-08-28 16:16:00 -04:00
GriffinR
09cfed64b5
Merge pull request #1146 from GriffinRichards/rename-songs
...
Give songs meaningful english names
2020-08-28 16:14:21 -04:00
GriffinR
71a066f945
Document cable car
2020-08-28 03:54:04 -04:00
DizzyEggg
f70a9ce153
Merge with master
2020-08-27 12:01:28 +02:00
GriffinR
95ea0e92e7
Start documenting rayquaza_scene
2020-08-25 17:49:42 -04:00
GriffinR
0ff767a9b5
Start documenting berry blender
2020-08-22 19:39:39 -04:00
GriffinR
fbb70b3727
Document contest AI scripts
2020-08-21 14:57:17 -04:00
GriffinR
469ec5f248
Document contest AI commands
2020-08-21 02:36:48 -04:00
GriffinR
d356e35b64
Fix incorrect pike curtain SE names
2020-08-20 20:23:08 -04:00
GriffinR
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
GriffinR
6c34effda9
Merge pull request #1138 from GriffinRichards/doc-contest
...
Document contest
2020-08-20 16:03:47 -04:00
LOuroboros
1b9aa1f023
Updated many moves' data to Gen. 8 standards
2020-08-20 15:44:58 -03:00
GriffinR
503dafd210
Fix wallys parents misnamed as uncle/aunt
2020-08-18 17:51:41 -04:00
GriffinR
3ba8cabd80
Fix Brenday typo
2020-08-18 15:56:44 -04:00
GriffinR
65bd2faf94
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest
2020-08-16 05:59:10 -04:00
GriffinR
2749948eeb
Clean up contest doc
2020-08-16 05:52:17 -04:00
GriffinR
e98e4652fd
Document contest live updates
2020-08-16 05:18:09 -04:00
GriffinR
3779422489
Split contest funcs from script_pokemon_util
2020-08-13 17:42:12 -04:00
GriffinR
8b95e1964b
Merge pull request #1121 from GriffinRichards/doc-roulette
...
Document roulette
2020-08-10 17:18:09 -04:00
GriffinR
078c341b2b
Merge pull request #1122 from GriffinRichards/clean-battlemsg
...
Add stat stage constants, clean up misc battle msg data
2020-08-10 14:29:27 -04:00
GriffinR
5e8ffff62f
Add stat stage constants
2020-08-04 20:38:57 -04:00
GriffinR
22b5b6b074
Start documenting roulette
2020-07-30 19:37:16 -04:00
DizzyEggg
356216d15e
Mirror Shot improve animation
2020-07-27 22:11:52 +02:00
DizzyEggg
0066640a1e
Merge with master
2020-07-27 14:51:39 +02:00
DizzyEggg
3a220d0733
ai tweaks
2020-07-26 13:48:25 +02:00
GriffinR
aca50c87be
Continue new contest documentation
2020-07-24 00:14:53 -04:00
GriffinR
52a4428ba6
Begin new contest documentation
2020-07-23 17:55:40 -04:00
GriffinR
4a42e2a710
Merge branch 'master' into doc-overworld
2020-07-23 10:31:52 -04:00
PikalaxALT
2e077f09e4
Merge pull request #1111 from GriffinRichards/sync-flags
...
Sync unused flags with pokeruby
2020-07-23 09:12:33 -04:00
PikalaxALT
5348674bc4
Merge pull request #1102 from GriffinRichards/doc-faraway
...
Document faraway island
2020-07-23 09:12:19 -04:00
GriffinR
60ca1aa3fd
Restore tabs in field_effect_scripts.s
2020-07-23 05:07:20 -04:00
GriffinR
a4e47f1201
Clean some battle_message.c data
2020-07-23 05:01:42 -04:00
GriffinR
813f0c724f
Sync flags with pokeruby
2020-07-22 18:00:41 -04:00
GriffinR
33523d1b06
Comment gBattleAI_ScriptsTable with constants
2020-07-20 14:20:25 -04:00
GriffinR
a1cc7d2bd6
Document faraway island
2020-07-19 14:12:38 -04:00
GriffinR
af09e73d67
Merge branch 'master' into doc-overworld
2020-07-18 20:24:09 -04:00
GriffinR
1a27af8855
Merge pull request #1100 from GriffinRichards/clean-battlescrdata
...
Misc battle and battle palace documentation
2020-07-18 20:22:44 -04:00
GriffinR
aba42513d3
Clean up some battle scr cmd data
2020-07-18 18:10:15 -04:00
GriffinR
96fd719a19
Merge pull request #1081 from GriffinRichards/add-localids
...
Add local object event ids for referenced objects
2020-07-17 18:18:47 -04:00
