N
26246ce281
Update task.c
2021-01-16 20:29:42 -05:00
N
926ef40c52
Get rid of Task_data_OP macro
...
This macro is so annoying. Can we please do away with it?
2021-01-16 20:19:00 -05:00
ultima-soul
8647895f1a
Merge pull request #1259 from ghoulslash/be_config
...
anim particle configs false by default
2021-01-16 10:41:18 -08:00
Evan
544d598506
update tailwind timer
2021-01-15 18:34:47 -07:00
ExpoSeed
98b4af151c
Merge pull request #1346 from luckytyphlosion/origin/battle_engine
...
Fix AI corruption bug.
2021-01-15 12:44:27 -06:00
Evan
f1d89b2d79
merge with be
2021-01-15 11:17:45 -07:00
ExpoSeed
b166e9a5e3
Merge pull request #1276 from LOuroboros/x_items_BE
...
Reworked the effects of the X Items #1
2021-01-15 12:05:07 -06:00
sbird
5d02cc2059
[battle_engine] fix wrap style move damage
2021-01-15 16:04:09 +01:00
GriffinR
564278fd49
Document battle tv data
2021-01-14 06:29:59 -05:00
GriffinR
8e06d5679c
Index gBardSoundsTable
2021-01-14 03:54:59 -05:00
GriffinR
46e0a0607d
Array count for easy chat word groups
2021-01-14 03:48:49 -05:00
GriffinR
f63bc6e27a
Index sTMHMMoves
2021-01-14 03:41:28 -05: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
luckytyphlosion
cb7b77500f
Just remove the commented out function and notes.
2021-01-12 18:52:37 -05:00
luckytyphlosion
f626fac9dc
Fix AI corruption bug.
2021-01-12 18:43:16 -05: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
fa3acd79e7
Fix missing header for sub_817F77C BUGFIX
2021-01-11 10:37:22 -05:00
GriffinR
4a7a3df205
Move SeedRngWithRtc fix to BUGFIX conditional
2021-01-11 10:36:53 -05:00
GriffinR
a733b211a3
Merge pull request #1297 from SatoMew/master
...
Document the unused battle strings for downpour weather
2021-01-11 10:01:57 -05:00
opakedragon
295ec313f5
rename string id/variable to reflect usage
2021-01-11 08:49:31 -05:00
Evan
8bad377a2e
magic room affects macho brace/power item speed drop
2021-01-10 16:57:27 -07:00
SatoMew
ead437e89b
Document the unused battle strings for downpour weather
2021-01-10 22:26:00 +00:00
surskitty
f58539b602
Renaming the last two and fixing the merge conflict with PE.
2021-01-10 15:48:57 -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
GriffinR
e6aebc16da
Merge pull request #1296 from GriffinRichards/bugfix-typo
...
Add missing braces to bugfix in CalculateMonStats
2021-01-10 12:34:39 -05:00
GriffinR
8afc28c98f
Add missing braces to bugfix in CalculateMonStats
2021-01-10 12:24:59 -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
LOuroboros
3ffa7f993a
Renamed some X Defend labels to reflect its new name in the IE
2021-01-10 01:58:02 -03:00
ultima-soul
b5b4efdaa0
Merge pull request #1314 from LOuroboros/battle_debug_constant
...
battle_config.h tweaks
2021-01-09 12:36:37 -08:00
ultima-soul
1caed479de
Merge pull request #1298 from ghoulslash/mummy
...
Fix Early Mummy Activation
2021-01-09 12:33:04 -08:00
SphericalIce
f02afc134b
Use the correct constant for max-IV masks
2021-01-07 22:34:57 +00:00
SphericalIce
3c2a33b9b2
Use constants for max IVs & the random IV generation flag
2021-01-07 22:13:14 +00: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
a481233304
Review correction to case 2 of PokemonUseItemEffects
2021-01-07 18:20:53 -03:00
LOuroboros
8511ed57e4
Tweaked Steam Engine's battle string
2021-01-07 18:13:16 -03:00
SphericalIce
fb69d97b24
Use the constant for the max total of EVs
2021-01-07 21:11:45 +00:00
LOuroboros
de9b0328ec
Corrections to Steam Engine
2021-01-07 16:33:52 -03:00
ghoulslash
c392a2011e
Merge pull request #1325 from ExpoSeed/BE/sync
...
Sync battle engine
2021-01-07 12:13:26 -07:00
LOuroboros
8d9c10224d
Removed pointless EmptyString print
2021-01-07 15:51:52 -03: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
aac3f9c3db
kee, maranga, sitrus beries
2021-01-06 13:07:18 -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
d3ae05189d
resist berry ripen boost
2021-01-05 22:21:38 -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
4c1e8f2f2e
add curious medicine
2021-01-05 20:02:11 -07:00
Evan
0a3908ee92
add neigh and as one abilities
2021-01-05 19:37:23 -07:00
LOuroboros
3246c20be5
Moved Power Spot's effect to CalcMoveBasePowerAfterModifiers
2021-01-05 19:51:52 -03:00
Evan
4923af960e
steely spirit, screen cleaner, transistor, dragon's maw
2021-01-05 15:44:12 -07:00
GriffinR
c506cf747f
Merge pull request #1293 from GriffinRichards/typo-pyramind
...
Fix sPyramindFloorNames typo
2021-01-05 00:16:24 -05:00
GriffinR
fe5269b875
Fix sPyramindFloorNames typo
2021-01-04 23:58:33 -05:00
GriffinR
a291bc4a2c
Merge pull request #1292 from GriffinRichards/fix-partymenu
...
Remove unnecessary subtraction in switch
2021-01-04 20:49:08 -05:00
GriffinR
1b2c9d00ca
Merge pull request #1291 from Sierraffinity/master
...
Fix/document possible division by zero in ConvertScaleParam
2021-01-04 20:48:58 -05:00
GriffinR
eba7933c0c
Remove unnecessary subtraction in switch
2021-01-04 19:50:05 -05:00
Sierraffinity
67a656a4df
Fix/document possible division by zero in ConvertScaleParam
2021-01-04 16:26:28 -08:00
GriffinR
0ca76fc179
Some decoration labels, use constant for tileset size
2021-01-04 16:27:57 -06:00
GriffinR
039108284d
Clean up gDecorations with gItems format
2021-01-04 16:27:57 -06:00
GriffinR
e0c0143f41
Fix substitute back sprite
2021-01-04 10:14:01 -05:00
LOuroboros
adf039fe12
Made BufferStatRoseMessage print an extra string if B_X_ITEMS_BUFF == GEN_7
...
Also turned sText_StatSharply into gText_StatSharply.
2021-01-04 07:41:56 -03:00
LOuroboros
be46ed84ea
Made the old X Items buff code make use of B_X_ITEMS_BUFF
2021-01-04 04:15:58 -03:00
LOuroboros
dbc3690282
Tweaked preprocessor directives
...
Changed #ifdef X_ITEMS_REWORK == FALSE to #ifndef ITEM_EXPANSION
Changed #ifdef X_ITEMS_REWORK == TRUE to #ifdef ITEM_EXPANSION
2021-01-04 03:58:31 -03: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
amiosi
19b82dcf57
tabs -> spaces
2021-01-03 19:12:47 -05: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
06af0f0fe5
Remove unnecessary string.h includes
2021-01-03 13:36:07 -05:00
LOuroboros
da1f525d45
Made Alolan Marowak be affected by Thick Club
2021-01-03 09:58:19 -03:00
GriffinR
d992e4277e
Merge pull request #1283 from GriffinRichards/doc-factscreen
...
Document battle factory screen
2021-01-03 02:51:59 -05:00
GriffinR
f2ce06683d
Merge pull request #1285 from GriffinRichards/doc-fieldscr
...
Minor field_screen_effect / field_player_avatar documentation
2021-01-03 01:59:36 -05:00
ultima-soul
c2a3c5687b
Add Fairy-type icon to fix Fairy TM info icon being blank.
2021-01-02 21:11:47 -08:00
surskitty
a96179a308
Changed Neutralizing Gas.
2021-01-02 17:16:44 -05:00
GriffinR
4a04b16ac1
Merge pull request #1281 from GriffinRichards/index-bc
...
Index battle controller cmd tables
2021-01-01 17:14:34 -05:00
GriffinR
88e951bfe3
Label some ReturnToField funcs
2021-01-01 17:11:06 -05:00
GriffinR
c711a2f73b
Document warp spin functions
2021-01-01 17:11:02 -05:00
GriffinR
8cad412ae2
Label a few flash effect functions
2021-01-01 13:34:25 -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
8cfdbaefeb
Merge pull request #1294 from LOuroboros/flower_gift
...
Added missing check to Flower Gift (offensive)
2020-12-31 18:41:50 -06: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
surskitty
533d9f1c54
Updating move names and ability names.
2020-12-31 18:45:25 -05:00
GriffinR
84fbcc9dd6
Fix modern -> UBFIX macro change
2020-12-31 00:44:43 -05:00
GriffinR
ec85c01e7c
Merge branch 'master' into doc-factscreen
2020-12-31 00:40:45 -05:00
GriffinR
093610b46e
Finish factory swap screen doc
2020-12-31 00:26:14 -05:00
amiosi
8d1383f0d5
no text
2020-12-30 23:51:08 -05:00
amiosi
556a863ee3
minimize pr (also text)
2020-12-30 22:56:15 -05:00
Sierraffinity
ef7832a55c
Change how mon affine transform fix is handled
2020-12-30 17:36:53 -08:00
GriffinR
7ae78dc773
Finish factory select screen doc
2020-12-30 17:56:31 -05:00
GriffinR
0bf49198f6
Resume factory screen doc
2020-12-30 13:28:15 -05:00
GriffinR
2f426e0e7d
Index battle controller cmd tables
2020-12-29 17:21:58 -05:00
Sierraffinity
127bb97c0e
Add UBFIX for division by zero in SpriteCB_PokedexListMonSprite
2020-12-26 18:25:21 -08:00
Sierraffinity
bafbf9240d
Add UBFIX for null deref in sub_80D08CC
2020-12-26 17:47:36 -08:00
Sierraffinity
86fdd033c6
Add UBFIX for null derefs in sub_8088950
2020-12-26 17:39:52 -08:00
Sierraffinity
b155c307ea
Add UBFIX for null deref in CameraObjectReset2
2020-12-26 17:25:51 -08:00
GriffinR
d74f739e05
Merge pull request #1277 from GriffinRichards/doc-tower
...
Label remaining subs in battle_tower.c
2020-12-25 00:19:24 -05:00
GriffinR
769ddf22c2
Label remaining subs in battle_tower.c
2020-12-24 16:18:47 -05:00
Evan
59813c9ce7
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into be_config
2020-12-23 10:27:54 -07:00
LOuroboros
320cc37ac9
USE_BATTLE_DEBUG -> B_ENABLE_DEBUG
2020-12-23 14:04:14 -03: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
Kurausukun
254b4e621c
change "filler" to "unk", remove newline
2020-12-22 00:08:15 -05:00
Kurausukun
45a1156dc8
fix remaining functions, finally matches
2020-12-21 22:36:28 -05:00
Kurausukun
01ea479390
oops
2020-12-21 20:25:59 -05:00
Kurausukun
b3f9a08ba6
fix sub_8021A28
2020-12-21 20:24:36 -05:00
Kurausukun
3203bac053
fix struct
2020-12-20 23:15:35 -05:00
Kurausukun
14e2898a29
fix structs and some function logic
...
(currently does not match)
2020-12-20 02:54:33 -05:00
LOuroboros
0aae069db8
Made Fiery Wrath unaffected by King's Rock
2020-12-19 21:11:17 -03:00
LOuroboros
819001c102
Removed redundant check in Punk Rock's effect
2020-12-19 19:15:12 -03:00
LOuroboros
a417a1b2b9
Corrected Punk Rock's checks
2020-12-19 16:18:39 -03:00
LOuroboros
ffa35a33c1
Review corrections
2020-12-19 07:44:34 -03:00
ultima-soul
1b1b2ff0a3
Merge pull request #1281 from NamNguyenUTSA/patch-2
...
Allow player partner NPC's to mega evolve
2020-12-18 23:39:15 -08:00
ultima-soul
aefa35a04f
Merge pull request #1275 from ghoulslash/battle_anims
...
Fix Shadow Sneak Animation
2020-12-18 23:15:07 -08:00
GriffinR
15c2856b24
Merge pull request #1265 from Kurausukun/berry_crush
...
fakematch fixes, begin documenting Berry Crush (based on #1187 )
2020-12-14 23:22:41 -05:00
Kurausukun
69cfe5ad01
use direction constant
2020-12-14 21:54:19 -05:00
Kurausukun
68b456e7f9
name a2
2020-12-14 21:51:38 -05:00
Kurausukun
266a23b327
fix indentation
2020-12-14 21:44:25 -05:00
Kurausukun
6faa63347a
document reuse of variables in link mode
2020-12-14 21:41:30 -05:00
GriffinR
c611421882
Merge pull request #1267 from ipatix/m4a_names
...
refactor m4a.c/m4a_1.s constant/variable/type naming
2020-12-14 20:03:53 -05:00
GriffinR
18a5feb413
Merge pull request #1269 from GriffinRichards/bugfix
...
Use BUGFIX for some inline fixes
2020-12-14 20:00:59 -05:00
Evan
259e59bae0
fix early mummy activation on two-turn moves
2020-12-14 12:27:48 -07:00
Evan
09496abef0
reset VAR_TERRAIN on whiteout
2020-12-14 08:59:57 -07:00
Evan
b85dacce9d
fix conflicts
2020-12-14 08:50:41 -07:00
Evan
9c64635ebe
remove redundant permanent terrain check
2020-12-13 19:50:02 -07:00
Evan
67fefd0261
var terrain, surge fixes
2020-12-13 19:42:48 -07:00
Evan
97172fc5b5
merge with be
2020-12-13 17:21:22 -07: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
Sierraffinity
1aca378634
Fix name of SetDexNumberColor
2020-12-12 21:08:15 -08:00
GriffinR
b1197ac2da
UBFIX for if_status_not_in_party
2020-12-12 23:57:25 -05:00
GriffinR
81d95b9325
Use BUGFIX for some inline fixes
2020-12-12 23:30:51 -05:00
Sierraffinity
abef3065d0
Fix affine anim bug with Pokémon going in and out of balls without an intermediate screen transition
2020-12-12 20:29:20 -08:00
Eduardo Quezada D'Ottone
47d96aed3c
Merge pull request #1285 from LOuroboros/spite
...
Updated Spite
2020-12-12 22:27:26 -03:00
Eduardo Quezada D'Ottone
ea1dca3024
Merge pull request #1270 from LOuroboros/drives_and_types
...
Made Techno Blast's animation change depending on the Drive held
2020-12-12 21:43:45 -03:00
LOuroboros
1f10b94a11
Implemented Power Spot
2020-12-12 21:22:42 -03:00
Eduardo Quezada D'Ottone
db9933ce67
Merge pull request #1244 from ghoulslash/popup
...
toggleable manual ability popup destruction
2020-12-12 20:36:55 -03:00
LOuroboros
305bea32df
Added missing check to Flower Gift (offensive)
2020-12-12 20:32:52 -03:00
LOuroboros
8e187d1d5b
Implemented Ice Scales
2020-12-12 19:39:35 -03:00
LOuroboros
55bc2b4bb9
Corrected small inconsistency in move flag names
2020-12-12 12:18:56 -03:00
LOuroboros
e9c6c96b9d
Corrected Final Gambit's move data
...
It didn't have its own working effect assigned, and it wasn't being affected by King's Rock even though it should.
2020-12-12 11:57:49 -03:00
Michael Panzlaff
eaff64e223
remove trailing spaces
2020-12-12 13:19:08 +01: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
9ec2e44f4c
Updated Spite
2020-12-11 21:36:59 -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
c930a63c84
Implemented Punk Rock
2020-12-11 19:46:33 -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
