Commit Graph
8903 Commits
Author SHA1 Message Date
ultima-soul 0312c5be8b Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-27 21:38:26 -08:00
ultima-soul 3ed51d6d91 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-21 10:40:26 -08:00
GriffinR 5cb875b6cb Merge pull request #1559 from GriffinRichards/remove-flower
Fix incorrect flower animation palettes
2021-11-21 11:29:11 -05:00
GriffinR 23dd1dad7f Fix incorrect palettes in Mauville flower tileset anims 2021-11-21 11:23:03 -05:00
GriffinR cfb9ae40d7 Merge pull request #1557 from GriffinRichards/fix-calcrom-0
Fix calcrom's handling of 0s
2021-11-17 15:11:23 -05:00
GriffinR ec97a21f95 Fix calcrom's handling of 0s 2021-11-17 15:04:42 -05:00
GriffinR ecb13cdbf7 Merge pull request #1550 from GriffinRichards/doc-pokenav
Document Pokénav
2021-11-17 14:47:34 -05:00
GriffinR f872ac1b80 Merge pull request #1556 from cbt6/move-enum
Use movement action constant values over enum
2021-11-17 14:14:37 -05:00
cbt6 9d18ad0b5a Make arguments for create_movement_action required 2021-11-18 03:07:09 +08:00
cbt6 f23d9ff30e Use movement action constant values over enum 2021-11-18 02:43:39 +08:00
GriffinR d98bd4dba7 Name pokenav region map structs 2021-11-15 01:37:22 -05:00
GriffinR 4275cf4b90 Rename pokenav match call files 2021-11-15 01:30:21 -05:00
GriffinR 14d78d7633 Finish match call menu doc 2021-11-15 01:20:03 -05:00
GriffinR c779d03b3e Rename pokenav_match_call_ui 2021-11-15 00:21:40 -05:00
GriffinR d4d4234283 Finish pokenav list ui doc 2021-11-15 00:09:02 -05:00
GriffinR 7e27a0746d Misc text clean-up 2021-11-14 22:21:17 -05:00
GriffinR 793947cd4b Merge pull request #1553 from GBAWiz420/Typo
Designate gBattleAnimBgImage_Attract and related as arrays
2021-11-14 18:02:20 -05:00
Wiz 927f9d27df Designate gBattleAnimBgImage_Attract and related as arrays 2021-11-14 17:08:03 -05:00
GriffinR 70577e844d Merge pull request #1548 from GriffinRichards/doc-banim
Document battle_anim_mons
2021-11-13 23:32:10 -05:00
GriffinR f42eafc85b Merge branch 'master' into doc-banim 2021-11-13 23:26:46 -05:00
GriffinR 8d18d03c79 Merge pull request #1552 from ProjectRevoTPP/fix_saveblock_reorder
Enforce structs to enforce save block order for modern toolchains.
2021-11-13 23:25:29 -05:00
GriffinR 159bb37bbe Merge branch 'master' into fix_saveblock_reorder 2021-11-13 23:19:57 -05:00
GriffinR 9a932cd9c3 Merge pull request #1549 from GriffinRichards/doc-binterface
Document remaining symbols in battle_interface, palette, and save
2021-11-13 23:19:08 -05:00
ProjectRevoTPP 9d3345a6d6 Enforce structs to enforce save block order for modern toolchains. 2021-11-13 21:41:16 -05:00
GriffinR 8e8b70c15c Add clarifying comment to LinkFullSave_WriteSector 2021-11-13 17:23:03 -05:00
GriffinR 4c4fa1f25e Typo fix 2021-11-13 16:56:45 -05:00
GriffinR b14fe9dce3 Merge pull request #1547 from GriffinRichards/doc-sounddata
Clean up sound, add CRY_MODE constants
2021-11-13 15:54:40 -05:00
GriffinR b3e593dff5 Continue pokenav list ui doc 2021-11-13 15:52:58 -05:00
GriffinR ec05157568 Move pokenav list item union out of list struct 2021-11-13 11:27:11 -05:00
ghoulslash 23104a02e7 Merge pull request #1891 from AsparagusEduardo/BE_assaultVestText
Fix Assault Vest's battle message and effect on Me First
2021-11-13 09:06:12 -05:00
Eduardo Quezada D'Ottone 8f52996144 Merge pull request #1892 from ghoulslash/be/wish
wish update
2021-11-13 11:01:04 -03:00
Eduardo Quezada D'Ottone ad393385ac Oops 2021-11-13 10:58:18 -03:00
ghoulslash 9df66f4ac1 Merge pull request #1843 from Blackforest92/battle_engine
Update Giga Impact's graphic and use fade-in battle animation.
2021-11-13 08:54:37 -05:00
ghoulslashandEduardo Quezada D'Ottone b68c596ce5 Update src/battle_script_commands.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-11-13 08:50:30 -05:00
ghoulslashandEduardo Quezada D'Ottone a4204e5491 Update include/constants/battle_config.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-11-13 08:50:24 -05:00
ghoulslash c779d7f0b0 Merge pull request #1894 from AsparagusEduardo/BE_fixRelicSong
Fixed Relic Song's SE
2021-11-13 08:50:01 -05:00
Eduardo Quezada D'Ottone bcb0f1b915 Merge pull request #1890 from kleeenexfeu/battle_engine
Bypassing screens and protections correctly
2021-11-13 10:11:02 -03:00
kleeenexfeu b3b3cd2c67 IsBattlerProtected 2021-11-13 13:48:08 +01:00
kleeenexfeu 89e9b989c9 Moving isBattlerProtected 2021-11-13 13:40:19 +01:00
kleeenexfeu f808710932 Moving IsBattlerProtected 2021-11-13 13:38:07 +01:00
kleeenexfeu 90b6c7d56c Remove unwanted check
According to bulbapedia this check shouldn't exist. It was just preventing effectiveness from being calculated when a move bypassing protection would go through king's shield
2021-11-13 13:24:30 +01:00
kleeenexfeu 10c390b9ec Effectiveness is calculated for moves bypassing king's shield
I'm curious what this is for. Before the change it just prevented moves that bypass protections from dealing super effective/not very effective damage to an aegislash using king's shield. So I just added a check with IsBattlerProtected, but in my opinion this line should be entirely removed. Unless I'm missing something.
2021-11-13 11:53:49 +01:00
Eduardo Quezada D'Ottone 704957efb9 Fixed Relic Song's SE 2021-11-13 07:30:12 -03:00
GriffinR 3b91d8fdaf Start pokenav list ui doc 2021-11-12 20:36:19 -05:00
GriffinR da5752fd0d Start match call menu doc 2021-11-12 20:17:06 -05:00
ghoulslash c4efe06f38 wish update 2021-11-12 17:55:05 -05:00
kleeenexfeuandEduardo Quezada D'Ottone fdff1ae1b6 Update src/battle_util.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-11-12 23:34:44 +01:00
Eduardo Quezada D'Ottone 2489023332 Fixed assault Vest restricting Me First 2021-11-12 19:24:50 -03:00
GriffinR ffe2970e30 Rename pokenav menu handler files 2021-11-12 17:13:50 -05:00
GriffinR baeacbe2f1 Clean up pokenav general menus, organize pokenav graphics 2021-11-12 17:08:12 -05:00