DizzyEggg
e055456b7e
Fix Protean / Libero when AI calculates Damage ( #2714 )
...
* Fix Protean / Libero when AI calculates Damage
* fix ai changing types when calculating dmg
2023-03-07 09:34:26 +01:00
DizzyEggg
a04046dbb6
Add tests for Defog and fix Defog battle strings ( #2737 )
...
* start working on defog tests
* defog tests + improve terrain end battlescripts
* newline
2023-03-06 20:35:08 +01:00
DizzyEggg
306c4565a0
merge
2023-03-06 15:32:28 +01:00
DizzyEggg
d3d99c3f8c
alpha omega indicator sprites use the same palete
2023-03-06 15:22:28 +01:00
GriffinR
bb078e0618
Merge pull request #1864 from AsparagusEduardo/pret/doc/songsComments
...
Document music usage to make it easier to search for a specific track
2023-03-05 15:29:38 -05:00
Eduardo Quezada
a6bd35ceab
Review changes
2023-03-05 17:17:39 -03:00
ghoulslash
dec1b16138
Swallow/Spit Up Gen 5 Behavior and tests for Swallow/Spit Up/Stockpile ( #2790 )
2023-03-05 09:50:47 -05:00
GriffinR
4d99d2c926
Merge pull request #1859 from AsparagusEduardo/pret/doc/natures
...
Reformatted gNatureStatTable
2023-03-04 23:31:43 -05:00
Eduardo Quezada
9917f5cc8b
Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303
...
# Conflicts:
# Makefile
# include/constants/pokemon.h
# include/pokemon.h
# make_tools.mk
# src/battle_ai_script_commands.c
# src/battle_controllers.c
# src/battle_main.c
# src/battle_script_commands.c
# src/party_menu.c
# src/pokemon.c
# src/trade.c
# src/trainer_pokemon_sprites.c
2023-03-03 11:00:50 -03:00
Alex
58b408cbbf
some new sprites
2023-03-02 17:04:24 +01:00
ghoulslash
6cf84ee53e
Fixes certain moves preventing Z status moves. ( #2791 )
2023-03-02 09:41:02 -05:00
ghoulslash
ad6495980f
Partially fix dex size inconsistencies ( #2799 )
2023-03-02 09:35:32 -05:00
Alex
487e26e700
fix enamorus_t + samuroutt sprite + conflicts
2023-03-02 11:05:59 +01:00
LOuroboros
ff15856820
Added yet another trainer slide condition
...
Now a trainer NPC can also say something before the first turn of a battle starts for good.
2023-03-02 06:16:44 -03:00
LOuroboros
fe735f9700
Applied review suggestions
...
-Merged EFFECT_CEASELESS_EDGE and EFFECT_STONE_AXE into EFFECT_HIT_SET_ENTRY_HAZARD
-Updated gDmgHazardsStringIds and relevant battle scripts. Can't say that I like it at all. String tables are stupid imo.
-Coupled Barb Barrage's effect in CalcMoveBasePower with Venoshock's
2023-03-02 01:39:44 -03:00
LOuroboros
23673c2e9d
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1
2023-03-01 03:57:00 -03:00
GriffinR
ec89e519f9
Merge pull request #1858 from AsparagusEduardo/pret/doc/fateful
...
Rename eventLegal to modernFatefulEncounter
2023-02-28 11:48:34 -05:00
DizzyEggg
12db276a71
fix endif
2023-02-28 10:36:11 +01:00
DizzyEggg
1fb2560f7b
newline
2023-02-28 10:14:16 +01:00
DizzyEggg
9d1e31ab39
accidentally removed ifs
2023-02-28 10:12:50 +01:00
DizzyEggg
cc2778b8bb
some touches
2023-02-28 10:08:31 +01:00
Eduardo Quezada
90021f3be6
Removed zMovePower field in gBattleMoves in favor of a function.
2023-02-27 23:49:43 -03:00
DizzyEggg
3159508603
fix dex size inaccuraccies
2023-02-27 23:08:54 +01:00
GriffinR
adf28c2f63
Merge pull request #1855 from GriffinRichards/doc-chat
...
Add/correct some union room chat documentation
2023-02-27 13:25:05 -05:00
GriffinR
8d88a38561
Merge pull request #1854 from GriffinRichards/constants-num-frames
...
Add MAX_MON_PIC_FRAMES, and trainer pic size constants
2023-02-27 13:16:49 -05:00
Alex
21ca6defa7
forgot torment
2023-02-27 18:39:17 +01:00
Alex
1a2504d5ee
forgot disable
2023-02-27 18:29:29 +01:00
Alex
930a88b0e2
z status moves did not work properly
2023-02-27 18:00:32 +01:00
DizzyEggg
5a745020ee
add tests for stockpile swallow spit up
2023-02-27 16:27:58 +01:00
DizzyEggg
3338a6b786
add messages for stockpile effects wear off
2023-02-27 12:31:29 +01:00
LOuroboros
8a036e6007
Made this build again
2023-02-27 07:51:36 -03:00
LOuroboros
a54a8d9b2a
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate
2023-02-27 07:43:19 -03:00
DizzyEggg
468625ed1d
fit long z-moves names on battle textbox
2023-02-27 10:32:45 +01:00
AgustinGDLV
e537be76ea
Z-moves bypass protection ( #2730 )
2023-02-27 09:17:07 +01:00
DizzyEggg
919fb184fe
AI knows how to handle Illusion ( #2726 )
...
* AI knows how to handle Illusion
2023-02-27 09:12:52 +01:00
DizzyEggg
44d2cc7232
Fix bugs related to Trainer Slide messages ( #2699 )
...
* start working on trainer slides
* use cmd->nextInstr
2023-02-27 09:11:25 +01:00
LOuroboros
fe09f3e0d3
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate
2023-02-26 23:42:01 -03:00
Eduardo Quezada
41bf9ea63c
Removed trailing whitespaces
2023-02-26 18:43:15 -03:00
DizzyEggg
4bdca43dbd
refactor mega evolution indicator sprite
2023-02-26 12:51:35 +01:00
BuffelSaft
deb3109c81
Use proper symbol name styles for Jangmo-o family ( #2739 )
2023-02-26 13:15:53 +13:00
Eduardo Quezada D'Ottone
abc0e20aaf
Consider Nature Power in AI_CalcDamage ( #2776 )
2023-02-25 12:30:53 -03:00
Alex
f249b58c01
fix style
2023-02-25 15:24:31 +01:00
Alex
7ea82820ec
Consider nature power in AI_CalcDamage
2023-02-25 15:07:45 +01:00
Eduardo Quezada
31ab56bceb
Fixed footprint symbol names.
2023-02-25 09:23:34 -03:00
Alex
df47312e32
Fix move to battle_util.c
2023-02-25 12:38:57 +01:00
Alex
fc5c93fd83
exclude status move type check
2023-02-25 12:15:40 +01:00
Eduardo Quezada
ca81d7a0f9
Forgot about Jangmo-o
2023-02-24 21:58:09 -03:00
Alex
1e1686b69a
Fixes #2414
2023-02-24 23:38:23 +01:00
Eduardo Quezada
bbefee6bd4
Use proper symbol styles for Hakamo-O and Kommo-O
2023-02-24 15:22:58 -03:00
Eduardo Quezada
079ca8ab29
Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarification
2023-02-24 07:53:02 -03:00
