 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 |
|
|
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 |
|
|
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
|
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 |
|
|
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 |
|
|
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 |
|
|
GriffinR
|
4a6ea87247
|
Merge pull request #1865 from AsparagusEduardo/pret/doc/species2
Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarity
|
2023-02-27 13:06:04 -05:00 |
|
|
GriffinR
|
c7b50c6dcb
|
Merge pull request #1866 from AsparagusEduardo/pret/feature/toolsWhitelist
Whitelist instead of Blacklist for TOOLDIRS in Makefiles
|
2023-02-27 12:59:52 -05:00 |
|
|
GriffinR
|
be84793713
|
Let scaninc/preproc ignore empty asm files
|
2023-02-27 12:47:35 -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 |
|
|
Eduardo Quezada D'Ottone
|
c6149ea7fb
|
fit long z-moves names on battle textbox (#2789)
|
2023-02-27 13:02:29 -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 |
|
|
Eduardo Quezada D'Ottone
|
137c13aa69
|
Fix sprite palettes up to Ampharos included (#2783)
|
2023-02-26 23:38:33 -03:00 |
|
|
DizzyEggg
|
b2a50b88fb
|
Removed trailing whitespaces (#2787)
|
2023-02-26 23:14:44 +01:00 |
|
|
Eduardo Quezada
|
41bf9ea63c
|
Removed trailing whitespaces
|
2023-02-26 18:43:15 -03:00 |
|
|
DizzyEggg
|
b41ba839a2
|
fix createspriteontargets on electricy anim (#2785)
|
2023-02-26 21:14:01 +01:00 |
|
|
DizzyEggg
|
8ccffa617a
|
fix createspriteontargets on electricy anim
|
2023-02-26 19:47:44 +01:00 |
|
|
Jaizu
|
8143f57eb9
|
Fix sprite palettes up to Ampharos included
|
2023-02-26 14:06:32 +01:00 |
|
|
BuffelSaft
|
deb3109c81
|
Use proper symbol name styles for Jangmo-o family (#2739)
|
2023-02-26 13:15:53 +13:00 |
|
|
GriffinR
|
588100e4ab
|
Merge pull request #1867 from Zunawe/fix-item-flag
Fix wrong route in item flag name
|
2023-02-25 17:12:08 -05:00 |
|
|
Zunawe
|
f376b71f7c
|
Fix wrong route in item flag name
|
2023-02-25 13:48:39 -08:00 |
|
|
Eduardo Quezada
|
d00c8902f9
|
Whitelist instead of Blacklist for TOOLDIRS in Makefiles
|
2023-02-25 16:49:41 -03: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 D'Ottone
|
05b52cf3f1
|
Status moves should not be considered for type effectiveness (#2743)
|
2023-02-25 10:45:38 -03: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 |
|
|
Eduardo Quezada D'Ottone
|
cf1231d69a
|
Merge pull request #2740 from AlexOn1ine/AI_TryToFaint
Fix AI mon getting lower score when it is faster
|
2023-02-24 20:26:47 -03:00 |
|
|
Alex
|
1e1686b69a
|
Fixes #2414
|
2023-02-24 23:38:23 +01:00 |
|
|
Eduardo Quezada D'Ottone
|
0669ac851f
|
Merge pull request #2735 from LOuroboros/libertePNG
Purged the bKGD warning once and for all
|
2023-02-24 16:13:48 -03:00 |
|