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
261b0ff118
Standardize judgement vs judgment spelling
2022-08-20 22:58:46 -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
Eduardo Quezada
76d2d92abb
Merge branch 'pretmaster' into pret_clean2
2022-08-20 12:43:09 -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
11b4958f23
Incorporate commented bug fixes in contest AI scripts
2022-08-19 19:45:15 -04:00
GriffinR
c2d5dd2a1f
Additional battle anim sync
2022-08-19 11:51:13 -04:00
Blackforest92
2b512a8e03
Fix Voltorb and Exeggutor' form species table
2022-08-19 18:14:11 +07:00
Blackforest92
346f3b7f4c
Fix PLA's base_stats.h (rename .item2 to .itemRare)
2022-08-19 18:01:28 +07:00
Blackforest92
a9d09bcd17
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into Legends_Arceus_Expansion
2022-08-19 17:53:01 +07:00
Blackforest92
00a827b3fb
Add PLA pokemon to Form Species Table, add Kleavor's graphics
2022-08-19 17:47:34 +07:00
GriffinR
cce9918908
Add Wnum_tiles to additional num_tiles rules
2022-08-18 23:13:27 -04:00
Martin Griffin
5e593a62fb
Ignore num_tiles if it would truncate non-transparent tiles ( #1729 )
2022-08-18 23:07:25 -04:00
Eduardo Quezada
3bc2cf921c
Sync src/battle_controllers.c with pokefirered
2022-08-18 14:30:22 -04:00
Eduardo Quezada
59f89bde9e
Misc cleanup
2022-08-18 14:23:45 -04:00
Ct11217
a4b53126f6
Added AI_FLAG_ACE_POKEMON
...
When this flag is set, the trainer will have an "Ace" pokemon that will
always be sent out last.
If this flag is set, the last Pokemon in the party will be considered the
"Ace" Pokemon.
This is similar to the gym leader functionality found in Sword & Shield.
2022-08-17 18:23:12 -06:00
GriffinR
936ebbd973
Fix phaseShit typo
2022-08-17 11:47:00 -04:00
GriffinR
e707cdffa8
Merge pull request #1744 from AsparagusEduardo/pret_syncMapSec
...
Synced Route 4 and 10's MapSec labels
2022-08-16 19:12:45 -04:00
Eduardo Quezada
5933c42439
Synced Route 4 and 10's MapSec labels
2022-08-16 18:23:37 -04:00
GriffinR
2ec8f27811
Add missing usage of SOUND_PAN_*
2022-08-16 13:04:00 -04:00
Eduardo Quezada
e43f65cc69
using BATTLE_RUN constants in BattleScript_EffectTeleport
2022-08-15 21:06:26 -04:00
Eduardo Quezada
7b0c8ec972
Revert style changes
2022-08-15 20:41:12 -04:00
GriffinR
26734d80f3
Merge pull request #1728 from AsparagusEduardo/pret_monDataEnum
...
Convert MON_DATA constants into enum to ease editing and addition of fields.
2022-08-15 18:51:32 -04:00
Eduardo Quezada
44b26cc8aa
From pokefirered
2022-08-15 18:27:37 -04:00
Eduardo Quezada
0149f420f9
Corrected comment
2022-08-15 17:36:55 -04:00
Eduardo Quezada
e8a05e92e4
Corrected additional inconsistent uses of whitespace
2022-08-15 17:04:34 -04:00
GriffinR
96fa350b45
Merge pull request #1741 from tustin2121/tustin2121-patch-scriptcontext
...
Renaming the Script Contexts
2022-08-15 16:46:01 -04:00
tustin2121
ec73158f16
Moving documentation comments per request
...
from the discord chat.
2022-08-15 16:37:38 -04:00
tustin2121
1cb659df8c
Renaming Script Contexts
...
- Determined how the various script contexts were used and renamed accordingly.
- ScriptContext2_Enable/Disable => Lock/UnlockPlayerFieldControls - The sole purpose of the flag is to make sure the player can't move around in the overworld. It has nothing to do with script contexts.
- ScriptContext1 => ScriptContext - It is the global script context used to set up scripts which run over many frames.
- ScriptContext2_RunNewScript => RunScriptImmediately - ScriptContext2's sole purpose was to run scripts immediately and in a separate context, usually while the global context is waiting for things like map loads or screen changes.
2022-08-15 15:18:12 -04:00
Eduardo Quezada
63e4a8adcd
Fixed instances of .string being used with spaces instead of tabs
2022-08-15 14:32:01 -04:00
GriffinR
3dc3dc847f
Merge pull request #1738 from mrgriffin/wildcard-ld-script
...
Wildcards in ld_script.txt
2022-08-15 08:35:48 -04:00
Martin Griffin
c5b30b7f21
Wildcards in ld_script.txt
...
Allows hacks to introduce new files and variables without needing to
change ld_script.txt similar to ld_script_modern.txt.
2022-08-15 12:25:16 +01:00
Ct11217
bb978764f3
Fixed recommended changes
...
Added additional double battle logic for yawn
2022-08-13 00:39:44 -06:00
GriffinR
5515e328b2
Clean up lock/unlock anim movement
2022-08-12 21:18:10 -04:00
Ct11217
7378d1099b
Removed AI_GetAbility
...
Misc cleanup
2022-08-12 15:21:25 -06:00
AgustinGDLV
a5e742afcd
implemented review changes
2022-08-12 12:00:05 -07:00
GriffinR
2df6cc1820
Merge pull request #1730 from GriffinRichards/sync-naming-screen
...
Clean up naming screen graphics
2022-08-12 11:05:55 -04:00
GriffinR
574cf1ddb9
Merge pull request #1725 from GriffinRichards/security-signature
...
Sector security -> signature
2022-08-12 10:47:10 -04:00
Ct11217
b95e450cb6
Added corner case logic for AI Switching.
...
1. Refactor Perish Song
2. Yawn
3. Secondary Damage (Leech Seed, Cursed etc).
4. Added Preliminary logic to help AI be smarter against semi-invulnerable
Added AI logic regarding abilities that benefit from switching
1. Natural Cure
2. Regenerator
2022-08-11 22:48:36 -06:00
GriffinR
cf4d05e9e7
Fix typo
2022-08-11 12:09:38 -04:00
GriffinR
63468f9fcb
Add some missing battle arena constants
2022-08-11 12:02:56 -04:00
