Commit Graph

7232 Commits

Author SHA1 Message Date
GriffinR
6c91534304
Merge pull request #1307 from Kurausukun/channel_constant
use constant for max directsound channels
2021-01-16 08:31:34 -05:00
Kurausukun
c96a52b1f7 use constant for max directsound channels
makes it easier to modify the size of the struct used in m4a_1
2021-01-16 04:18:45 -05:00
LOuroboros
af3dcf7543 Fixed Focus Blast animation
Its gSuperpowerOrbSpriteTemplate was overlapping the battle textbox.
2021-01-16 03:57:47 -03:00
Evan
24b19eb9a4 fix AI_WeatherHasEffect 2021-01-15 21:29:39 -07:00
ExpoSeed
bd8950e8a0
Merge pull request #1348 from LOuroboros/intimidate_preproc
Fixed incorrect preprocessor directive in ASM file
2021-01-15 12:45:05 -06: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
Evan
44a124acb7 fix CanBeParayzed 2021-01-15 09:23:23 -07:00
sbird
5d02cc2059 [battle_engine] fix wrap style move damage 2021-01-15 16:04:09 +01:00
GriffinR
f19d1b2590
Merge pull request #1306 from GriffinRichards/pokefiller
Make filler in PokemonSubstruct0 explicit
2021-01-15 00:28:26 -05:00
GriffinR
2da0c3436e Make filler in PokemonSubstruct0 explicit 2021-01-15 00:14:46 -05:00
GriffinR
8305342521
Merge pull request #1304 from GriffinRichards/misc-clean
Minor table clean up
2021-01-14 15:34:26 -05: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
GriffinR
7dc52f6a5e
Merge pull request #1303 from GriffinRichards/doc-battledef
Label remaining battle types
2021-01-14 02:20:55 -05:00
LOuroboros
c21c0f8c37 Fixed incorrect preprocessor directive in ASM file 2021-01-13 22:42:56 -03:00
Evan
062d2ee50e add atk up 3 effects to HpAware 2021-01-13 16:42:10 -07:00
GriffinR
b9e1b050e1 Label remaining battle types 2021-01-13 15:20:29 -05:00
GriffinR
29e59c8eef
Merge pull request #1300 from GriffinRichards/bugfix-clean
Minor BUGFIX changes, remove redundant bug fix descriptions
2021-01-13 14:22:42 -05:00
Evan
09dc1b7e89 fix double battle ai logic 2021-01-13 11:08:43 -07: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
Evan
47bf5b2840 a few tweaks 2021-01-12 22:45:02 -07:00
GriffinR
707441827b
Merge pull request #1301 from GriffinRichards/anim-index
List battle animation indexes alongside tables
2021-01-12 23:41:49 -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
92de664f79 List battle animation indexes alongside tables 2021-01-11 16:07:16 -05:00
surskitty
29343ce1ec
Remove synonyms
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-01-11 15:00:11 -05:00
GriffinR
9ed413fe8f Remove redundant bug fix description 2021-01-11 10:39:53 -05: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
GriffinR
a6317b7f57
Merge pull request #1299 from opakedragon/payday-string-id
rename payday string id
2021-01-11 09:51:18 -05:00
opakedragon
295ec313f5
rename string id/variable to reflect usage 2021-01-11 08:49:31 -05:00
opakedragon
cbaf9b38b2
rename string id to reflect usage 2021-01-11 08:48:00 -05:00
opakedragon
3ce4e6b24b
rename string id to reflect usage 2021-01-11 08:47:11 -05:00
ultima-soul
e804e4c4ba
Merge pull request #1242 from ghoulslash/totem
Totem Boosts
2021-01-10 18:43:46 -08: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
6a3266a265 fix syntax err 2021-01-10 09:02:06 -07:00
Evan
bb540b6236 fix AI_WeatherHasEffect to handle unknown abilities 2021-01-10 08:58:41 -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
LOuroboros
3ffa7f993a Renamed some X Defend labels to reflect its new name in the IE 2021-01-10 01:58:02 -03:00