Commit graph

12546 commits

Author SHA1 Message Date
LOuroboros
fdebc994d2 Updated Supreme Overlord's effect's code 2023-03-07 19:14:38 -03:00
AgustinGDLV
7de7599a7b reworked scripts to remove jumpifnotally / jumpiftargetabsent 2023-03-07 12:07:11 -08:00
AgustinGDLV
e937482c27 fixed potential G-Max Chi Strike, Court Change bugs 2023-03-07 11:18:19 -08:00
Eduardo Quezada
46bdd21e7a Cleaned up stray comment 2023-03-07 11:39:47 -03:00
Eduardo Quezada
4625a46748 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
# Conflicts:
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/battle_util.c
2023-03-07 11:26:33 -03:00
Eduardo Quezada D'Ottone
13ca2271e2
Add meltan and melmetal teachable moves (#2732) 2023-03-07 10:25:05 -03:00
DizzyEggg
318666e21d debug minor touches to give item max quantity and map number display 2023-03-07 12:20:36 +01:00
Eduardo Quezada D'Ottone
81a80e566c
Refactor Mega Evolution indicator sprite (#2805) 2023-03-07 08:06:28 -03:00
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
Eduardo Quezada D'Ottone
b3ffc9d1c4
Set link tutorial as complete when using Cheat Start (#2802) 2023-03-06 09:29:34 +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
ce6875817f
Merge pull request #1860 from GriffinRichards/metatile-labels
Format metatile_labels
2023-03-04 23:36:04 -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 D'Ottone
33dc7cb13a
pret sync 2023/03/03 (#2801) 2023-03-03 16:29:30 -03: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
b8fec80f78 small braviary sprite fix 2023-03-02 18:04:12 +01:00
Alex
e16b5c2477 leftover 2023-03-02 17:27:45 +01: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
4e138fa4b7
Fix wrong Contrary message when affected by Intimidate (#2723) 2023-03-02 09:38:00 -05:00
ghoulslash
ad6495980f
Partially fix dex size inconsistencies (#2799) 2023-03-02 09:35:32 -05:00
ghoulslash
2c407a362a
Removed zMovePower field in gBattleMoves in favor of a function. (#2794) 2023-03-02 09:34:46 -05:00
Alex
487e26e700 fix enamorus_t + samuroutt sprite + conflicts 2023-03-02 11:05:59 +01:00
AgustinGDLV
7c853ef45e implemented G-Max Sweetness, Overgrowth, One Blow, Rapid Flow, and Finale 2023-02-28 16:37:48 -08: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
AgustinGDLV
3cdcf2a356 implemented G-Max Chi Strike, finished G-Max Gold Rush 2023-02-27 22:01:19 -08:00
AgustinGDLV
da24b717e4 implemented all status1 and status2 G-Max Moves: Befuddle, Volt Crash, Malodor, Stun Shock, Gold Rush, Cuddle, Terror, Meltdown, Smite 2023-02-27 21:26:03 -08:00
Eduardo Quezada
3b27b602fd End of file 2023-02-28 00:09:43 -03:00
Eduardo Quezada
90021f3be6 Removed zMovePower field in gBattleMoves in favor of a function. 2023-02-27 23:49:43 -03:00
AgustinGDLV
0908129c84 implemented G-Max Gravitas, G-Max Snooze, G-Max Depletion; Spite works on Max Moves 2023-02-27 18:43:06 -08:00
AgustinGDLV
689069005a bringing back gMaxMovePowers to temp. fix exceptions 2023-02-27 15:18:33 -08:00
AgustinGDLV
ad54b0d392 changed max move power calc from table to formula 2023-02-27 15:02:56 -08:00
AgustinGDLV
9ef7717cd8 max move effects don't apply if the move didn't land 2023-02-27 14:39:24 -08:00
AgustinGDLV
93d8efd51f implemented G-Max Resonance 2023-02-27 14:34:08 -08:00
Jaizu
86144c6a53
Removed unused single-frame front pics (#2793) 2023-02-27 23:12:44 +01:00
DizzyEggg
3159508603 fix dex size inaccuraccies 2023-02-27 23:08:54 +01:00
Eduardo Quezada
501cff84b9 Removed unused single-frame front pics 2023-02-27 18:09:54 -03:00
AgustinGDLV
05fe62cbab implemented G-Max Drum Solo, G-Max Hydrosnipe, G-Max Fireball 2023-02-27 12:11:52 -08:00
DizzyEggg
c92a65dc40 Add config for stockpile raising def stats 2023-02-27 21:09:02 +01:00
AgustinGDLV
92c8503869 reorganized max move functionality to remove redundant move effects 2023-02-27 11:54:49 -08: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