Eduardo Quezada D'Ottone
|
0095b3181b
|
Merge pull request #2256 from DizzyEggg/hp
4digits HP display
|
2022-08-25 20:42:50 -04:00 |
|
DizzyEggg
|
622a7f8141
|
merge with master
|
2022-08-25 22:10:59 +02:00 |
|
ghoulslash
|
552d1f3d7b
|
Merge pull request #2237 from gruxor/compat_define
Reworked branch defines into single compatibility define
|
2022-08-25 15:36:01 -04:00 |
|
ghoulslash
|
15a368163d
|
Merge pull request #2247 from AsparagusEduardo/RHH_specialPic
LoadSpecialPokePic adjustments
|
2022-08-25 15:35:21 -04:00 |
|
ghoulslash
|
591bac25c4
|
Merge pull request #2243 from AsparagusEduardo/RHH_placeholderMoves
Moves with EFFECT_PLACEHOLDER can't be used.
|
2022-08-25 15:34:23 -04:00 |
|
ghoulslash
|
b45e1887d8
|
Merge pull request #2242 from AsparagusEduardo/RHH_fixOrbPower
Fixed creation trio orbs not boosting power for non-base forms.
|
2022-08-25 15:18:02 -04:00 |
|
DizzyEggg
|
1b9c2816c2
|
fix updatehptextinhealthbox arguments
|
2022-08-25 17:37:47 +02:00 |
|
DizzyEggg
|
63370b065d
|
Party menu supports 4digit hp
|
2022-08-25 17:31:14 +02:00 |
|
DizzyEggg
|
a0ec8a5a80
|
4 digit hp in battle
|
2022-08-25 16:40:56 +02:00 |
|
ghoulslash
|
90ae339cac
|
Merge pull request #2240 from AsparagusEduardo/RHH_fixBEMerge
Included PR #2219 that was accidentally merged into BE
|
2022-08-25 08:47:38 -04:00 |
|
ghoulslash
|
f736766c94
|
Merge pull request #2238 from DizzyEggg/multi
Wild multi battles and doubles 2 vs 1 interface
|
2022-08-25 08:47:02 -04:00 |
|
Eduardo Quezada
|
af137c9b9d
|
Multiple changes
- Simplified LoadSpecialPokePic
- Changed all checks flag checks to houldShowFemaleDifferences
|
2022-08-25 03:42:41 -04:00 |
|
DizzyEggg
|
c17db6d2d5
|
Merge pull request #2245 from AsparagusEduardo/RHH_criticalCaptureBool
Fixed critical capture fields not using TRUE or FALSE
|
2022-08-25 08:56:57 +02:00 |
|
Eduardo Quezada
|
b2af7a1b47
|
Fixed critical capture fields not using TRUE or FALSE
|
2022-08-25 01:17:17 -04:00 |
|
Eduardo Quezada
|
045dbcf81e
|
Fixed creation trio orbs not boosting power for non-base forms.
|
2022-08-25 00:48:35 -04:00 |
|
Eduardo Quezada D'Ottone
|
a210e45c61
|
Merge pull request #2234 from rh-hideout/DizzyEggg-abilpopup
Ability pop-up displays properly long abilities
|
2022-08-25 00:17:38 -04:00 |
|
Eduardo Quezada D'Ottone
|
5659f6178f
|
Optimized x adjustment
|
2022-08-25 00:03:43 -04:00 |
|
Eduardo Quezada D'Ottone
|
b4b0c6b885
|
Merge pull request #2241 from LOuroboros/patch-lmao
Fixed P_UPDATED_ABILITIES's comment
|
2022-08-24 19:47:07 -04:00 |
|
LOuroboros
|
7b7ba93d45
|
Fixed P_UPDATED_ABILITIES's comment
|
2022-08-24 20:35:13 -03:00 |
|
crater-git
|
6012731f27
|
Removed redundant ifdef
|
2022-08-24 19:31:55 -04:00 |
|
Eduardo Quezada D'Ottone
|
62175cc655
|
Merge pull request #2235 from rh-hideout/DizzyEggg-patch-1
Get rid of garbage bytes in graphics.c
|
2022-08-24 18:56:08 -04:00 |
|
Eduardo Quezada D'Ottone
|
1a9a2a2c29
|
Merge pull request #2236 from rh-hideout/DizzyEggg-patch-2
ENDTURN_WISH resets gBattleStruct->turnSideTracker
|
2022-08-24 18:40:12 -04:00 |
|
Eduardo Quezada
|
30594a9773
|
Included PR that was accidentally merged into BE
|
2022-08-24 18:37:25 -04:00 |
|
DizzyEggg
|
7aa55f2753
|
better interface 1 player mon in double
|
2022-08-24 23:00:21 +02:00 |
|
crater-git
|
940f9f1726
|
Moved branch defs to config.h, now only for compat
|
2022-08-24 16:10:32 -04:00 |
|
DizzyEggg
|
e3ab439ec0
|
Fix multi wild battles
|
2022-08-24 21:56:24 +02:00 |
|
DizzyEggg
|
cc8dd92247
|
ENDTURN_WISH resets gBattleStruct->turnSideTracker
|
2022-08-24 20:48:47 +02:00 |
|
DizzyEggg
|
0bf2b26491
|
Get rid of garbage bytes in graphics.c
|
2022-08-24 20:36:49 +02:00 |
|
DizzyEggg
|
17b47de90d
|
Ability pop-up displays properly long abilities
|
2022-08-24 20:20:44 +02:00 |
|
Eduardo Quezada D'Ottone
|
21fe205f0f
|
Merge pull request #2206 from Blackforest92/Minor_Graphic_Fixes
Fix multiple pokemon icons & tidying pokemon graphic folders
|
2022-08-24 00:52:49 -04:00 |
|
Eduardo Quezada D'Ottone
|
8f12e1f5c6
|
Merge pull request #2125 from ghoulslash/be/escapepreventionfix
fix IsAbilityPreventingEscape message in party menu
|
2022-08-24 00:48:57 -04:00 |
|
Eduardo Quezada D'Ottone
|
33e1562253
|
Merge pull request #2219 from aarant/battle_engine
Fixed Gen5+ multihit odds.
|
2022-08-24 00:34:58 -04:00 |
|
Eduardo Quezada
|
eea718cfc6
|
Placeholder moves can't be used in battle.
|
2022-08-24 00:30:49 -04:00 |
|
Eduardo Quezada
|
56a2e91518
|
Updated move limitations
|
2022-08-23 22:40:04 -04:00 |
|
Eduardo Quezada
|
09fd393f97
|
Replaced instances of power == 0 with IS_MOVE_STATUS + fixed Wonder Skin
|
2022-08-23 22:38:35 -04:00 |
|
Eduardo Quezada D'Ottone
|
4f333766fa
|
Merge pull request #2229 from AsparagusEduardo/RHH_MergedBranchUltimate
Merged branch
|
2022-08-23 13:12:22 -04:00 |
|
Eduardo Quezada
|
7c7887aa65
|
Moved ABILITY_NAME_LENGTH back to include/constants/global.h to keep in line with upstream pret
|
2022-08-23 08:25:27 -04:00 |
|
Eduardo Quezada
|
4c5acca0ce
|
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
|
2022-08-22 20:31:44 -04:00 |
|
Eduardo Quezada
|
afcc1178b2
|
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
# Conflicts:
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# include/battle_controllers.h
# include/battle_script_commands.h
# include/battle_util.h
# include/constants/battle_script_commands.h
# include/constants/global.h
# include/decompress.h
# src/battle_anim_effects_1.c
# src/battle_anim_normal.c
# src/battle_anim_poison.c
# src/battle_anim_water.c
# src/battle_arena.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/berry.c
# src/data/trainers.h
# src/decompress.c
# src/field_effect.c
# src/hall_of_fame.c
# src/overworld.c
# src/pokeball.c
# src/pokemon.c
# src/pokemon_icon.c
# src/pokemon_storage_system.c
# src/scrcmd.c
|
2022-08-22 20:30:45 -04:00 |
|
GriffinR
|
8a8ba92f21
|
Revert COMMON wildcards
|
2022-08-22 19:04:47 -04:00 |
|
Eduardo Quezada
|
c1c9837bfc
|
Merge remote-tracking branch 'RHH/item_expansion' into MergedBranchUltimate
|
2022-08-22 17:31:21 -04:00 |
|
Eduardo Quezada
|
18612b7686
|
Merge remote-tracking branch 'RHH/pokemon_expansion' into MergedBranchUltimate
|
2022-08-22 17:31:00 -04:00 |
|
Eduardo Quezada
|
2b7a2c4d09
|
Merge remote-tracking branch 'RHH/battle_engine' into MergedBranchUltimate
|
2022-08-22 17:30:48 -04:00 |
|
Eduardo Quezada
|
75ac960365
|
Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms
|
2022-08-22 17:27:21 -04:00 |
|
GriffinR
|
898ec580ae
|
Merge pull request #1737 from GriffinRichards/lock-unlock
Clean up lock/unlock anim movement
|
2022-08-22 01:30:33 -04:00 |
|
GriffinR
|
30906762ed
|
Merge pull request #1740 from AsparagusEduardo/pret_stringTabs
Fixed inconsistent use of white space for scripts, .c files and .h files.
|
2022-08-20 23:03:59 -04:00 |
|
GriffinR
|
9e175a1037
|
Merge pull request #1735 from GriffinRichards/arena-const
Add some missing battle arena constants
|
2022-08-20 22:54:32 -04:00 |
|
GriffinR
|
81ef818f61
|
Merge pull request #1731 from GriffinRichards/missing-tag
Move party menu data constants
|
2022-08-20 22:43:52 -04:00 |
|
GriffinR
|
1685365cd4
|
Merge pull request #1727 from AsparagusEduardo/pret_clean
Cleanup from https://github.com/pret/pokefirered/pull/532
|
2022-08-19 21:27:55 -04:00 |
|
GriffinR
|
cce9918908
|
Add Wnum_tiles to additional num_tiles rules
|
2022-08-18 23:13:27 -04:00 |
|