ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-07 18:13:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,816 Commits 1 Branch 0 Tags 235 MiB
c4db74460a
Commit Graph

8395 Commits

Author SHA1 Message Date
Eduardo Quezada
5e399955d5 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/monAnimations 2022-09-09 17:37:23 -04:00
Eduardo Quezada
503b85aa2d Generating music names for the debug menu based on their labels 2022-09-09 16:44:34 -04:00
LOuroboros
ceb0c67bcf Modified check in case FORM_ITEM_USE of GetFormChangeTargetSpeciesBoxMon 2022-09-09 16:17:13 -03:00
LOuroboros
12fee71008 Merged FORM_ITEM_USE_TIME into FORM_ITEM_USE 2022-09-09 15:39:48 -03:00
Eduardo Quezada D'Ottone
69d3fafdcf
Merge pull request #2273 from LOuroboros/zazaForms 
Introduced FORM_BATTLE form changes
 2022-09-09 14:15:53 -04:00
LOuroboros
e8832a2655 Updated FORM_ITEM_HOLD check in GetFormChangeTargetSpeciesBoxMon 2022-09-09 14:56:12 -03:00
Blackforest92
431cb6fa7c Tidying graphics - Trio Weather 2022-09-09 21:57:40 +07:00
ghoulslash
61cde312cc
Merge pull request #2301 from Blackforest92/RHH-PR-Branch 
Tyding graphics - Acupressure
 2022-09-09 10:26:23 -04:00
Eduardo Quezada
8449f237c2 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonFlags 
# Conflicts:
#	src/pokemon.c
 2022-09-09 09:02:35 -04:00
Eduardo Quezada
21df8c279b Added SPECIES_FLAG_CANNOT_BE_TRADED 
- Also corrected Cylarex's forms not having the legendary flag
 2022-09-09 08:59:53 -04:00
Eduardo Quezada
1fa9bc1b5c Adjusted style of coords tables 2022-09-08 18:32:01 -04:00
LOuroboros
db6d285f00
Small syntax fix for CanLearnTeachableMove 2022-09-08 17:53:15 -03:00
Blackforest92
3acb32acb8 Tyding graphics - Acupressure 2022-09-09 00:25:43 +07:00
Eduardo Quezada
7fe1e706b7 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonConfig 
# Conflicts:
#	include/constants/pokemon_config.h
 2022-09-08 08:52:13 -04:00
Jaizu
d58af1ba92
Fix 'y' actually being 'x' in CreatePCMultichoice 2022-09-08 10:38:52 +02:00
Eduardo Quezada D'Ottone
066a5bee85
Merge pull request #2277 from TheXaman/tx_debug_system_rhh 
Inclusion of the tx_debug_system
 2022-09-08 00:26:37 -04:00
Eduardo Quezada D'Ottone
4a6d3d1deb
Whitespace 2022-09-08 00:19:13 -04:00
Eduardo Quezada D'Ottone
47a50b3dac
Merge branch 'master' into weather_forms_fixes 2022-09-07 23:07:25 -04:00
LOuroboros
05c13614c6
Undefined temporary preproc macro HIBYTE 2022-09-07 13:41:48 -03:00
sbird
3a0759d458 [doc] fix misnamed dma <--> aslr 2022-09-07 14:37:03 +02:00
GriffinR
281bddcd3d
Merge pull request #1765 from AsparagusEduardo/pret/pokefirered_sync4 
Implemented review changes from https://github.com/pret/pokefirered/pull/548
 2022-09-06 21:40:37 -04:00
GriffinR
74b563f696
Merge pull request #1749 from GriffinRichards/ur-classes 
Fix names and constant usage for union room classes
 2022-09-06 21:35:10 -04:00
LOuroboros
8705d1656b Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into teleport 2022-09-06 20:38:28 -03:00
LOuroboros
a7a1ab9aeb Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD 
There was never a reason not to.
 2022-09-06 19:20:11 -03:00
TheXaman
6062cf45fa
Merge branch 'master' into tx_debug_system_rhh 2022-09-07 00:03:58 +02:00
LOuroboros
f1c153e469 Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD 
There was never a reason not to.
 2022-09-06 18:37:16 -03:00
TheXaman
94995c54fb fix? 2022-09-06 23:35:05 +02:00
Eduardo Quezada
12bb32666b Aligned FRONTIER_MONS trainer macros with the rest for consistency 2022-09-06 17:05:56 -04:00
Eduardo Quezada D'Ottone
f79e9f02de
Merge pull request #2289 from Blackforest92/RHH-PR-Branch 
Tidying Graphics/Battle_Anims
 2022-09-06 17:02:25 -04:00
TheXaman
b249399a53 changed 'B_FLAG_NO_CATCHING' to be evaluated by 'GetBallThrowableState()' 2022-09-06 23:00:26 +02:00
ghoulslash
d33e4b0fe8
Merge pull request #2297 from AsparagusEduardo/RHH/pr/configRefactor 
Config refactor
 2022-09-06 15:32:37 -04:00
Eduardo Quezada
3a6318f1d9 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/configRefactor 
# Conflicts:
#	include/constants/battle_config.h
 2022-09-06 15:20:54 -04:00
ghoulslash
79bfbfb1b0
Merge pull request #2198 from AsparagusEduardo/BE_BattlePikeComatose 
Comatose prevents Battle Pike's status effects.
 2022-09-06 15:18:48 -04:00
ghoulslash
971081b8fd
Merge pull request #2286 from AsparagusEduardo/RHH/pr/pretMerge_20220902 
Flat Merge Friday (Weekly merge)
 2022-09-06 15:13:47 -04:00
ghoulslash
51a569b66b
Merge pull request #2290 from AsparagusEduardo/RHH/pr/ballMulti_fix 
Fixed ball multiplier fallthroughs
 2022-09-06 15:10:28 -04:00
Eduardo Quezada
7a0838a0f2 Adjusted GetFormChangeTargetSpeciesBoxMon to allow having form changes of the same method in the same table 2022-09-06 10:53:18 -03:00
LOuroboros
0b07f4a06e Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into zazaForms 2022-09-06 10:53:12 -03:00
LOuroboros
bb290d5ab0 Updates 
-Removed the pointless param1 setting in sXerneasFormChangeTable
-Updated the descriptions of Behemoth Blade and Behemoth Bash
-Added a new parameter to the struct FormChange
-Allowed FORM_BATTLE_BEGIN and FORM_BATTLE_END to replace a move through a new function called "TryToSetBattleFormChangeMoves".
-Added missing calls to "CalculateMonStats".
-Renamed BoxPokemon pointer in GetFormChangeTargetSpeciesBoxMon for consistency's sake
-Optimized check inside UndoFormChange (even though the plan is to get rid of that func entirely.)

Special thanks to Blecoutre who fixed my TryToSetBattleFormChangeMoves function. It just wasn't working correctly at all.
 2022-09-06 10:45:07 -03:00
sbird
584bfe0221 [debug] add support for mgba printf 
* adds support for mgba printf debugging as well as adding support for switching between debugging configuration
* adds `mini_printf` as an alternative to libc printf as well as switches to choose a pretty printing handler
* adds a pretty printing format to `mini_printf` to print preproc encoded strings
 2022-09-06 13:40:31 +02:00
GriffinR
c8afeea182 Generate trainer pic palettes from image 2022-09-05 16:09:45 -04:00
Eduardo Quezada
cb97f93ef6 Fixed B_SHADOW_TAG_ESCAPE use for Gen 3 config 2022-09-05 14:49:40 -04:00
Eduardo Quezada
7c7da8e176 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs 
# Conflicts:
#	src/battle_script_commands.c
 2022-09-05 14:43:04 -04:00
Eduardo Quezada
dbd56efaef Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 
# Conflicts:
#	src/battle_util.c
 2022-09-05 12:20:57 -04:00
U-DESKTOP-K1J86FD\Owner
7dabd903ce v -> STATUS4_WATER_SPORT (applicable to Gens 3-5) 2022-09-05 12:07:38 -04:00
tustin2121
33f10d2139 Adding missing externs 
If there are not externs on these forward declarations, it's entirely possible for the program to link and missing data to be assigned to someplace presumed in IWRAM or something.
 2022-09-05 09:49:20 -04:00
Eduardo Quezada D'Ottone
99a9b9f859
Merge pull request #2218 from LOuroboros/patch-1 
Updated Serene Grace checks in AI_CheckViability
 2022-09-05 10:30:18 -03:00
Eduardo Quezada
d699ea3334 Fixed macro alignments 2022-09-05 08:38:35 -04:00
TheXaman
f6d111d0c7
Update src/debug.c 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-09-05 11:17:21 +02:00
TheXaman
40e3379921 removed music expansion songs, added newline, removed all weekday remains 2022-09-05 11:15:18 +02:00
TheXaman
7696a78760
Update src/trainer_see.c 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-09-05 11:04:21 +02:00
TheXaman
57296dde71
Update src/field_control_avatar.c 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-09-05 11:03:23 +02:00
TheXaman
0b3eddc9a4
Update src/field_control_avatar.c 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-09-05 11:03:01 +02:00
LOuroboros
2deabc2f36
Quick update for GetBattleMonMoveSlot 2022-09-05 04:27:21 -03:00
Eduardo Quezada
2ee843c70d Proper label for species flags 2022-09-04 22:13:28 -03:00
Eduardo Quezada D'Ottone
d0d4c52d84
Update src/pokemon.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-09-04 22:03:17 -03:00
Eduardo Quezada
a4c242f2f8 Implemented Shiny Lock functionality 2022-09-04 21:55:59 -03:00
Eduardo Quezada
7500435a80 Implemented review changes from https://github.com/pret/pokefirered/pull/548 2022-09-04 21:24:12 -03:00
Eduardo Quezada
74c3fdfba7 Flag to allow certain species to always have perfect IVs (like Partner Pikachu and Eevee) 2022-09-04 19:41:01 -03:00
Eduardo Quezada
89550ed05d Updated Sport Ball's modifier. 2022-09-04 18:54:23 -03:00
Eduardo Quezada
ce3dec43a7 Fixed ball multiplier fallthroughs 2022-09-04 17:21:23 -03:00
Blackforest92
2a8d2df6e7 Fix minor oopsies of src/graphics.c - gBattleAnimSpritePal_PrimalParticles 2022-09-04 23:40:00 +07:00
Blackforest92
7e9d243677 Tidying graphics/battle_anims 2022-09-04 23:24:37 +07:00
Eduardo Quezada D'Ottone
1287c3d263
Fixed call to ItemIdToBattleMoveId 2022-09-03 21:27:29 -04:00
Eduardo Quezada D'Ottone
4017fc3e20
Apply style suggestions from code review 2022-09-03 21:22:15 -04:00
Eduardo Quezada
41bf6bde25 Removed pointless macro 2022-09-03 00:28:53 -04:00
Eduardo Quezada
790bdd69f8 Using GET_BATTLER_SIDE and GET_BATTLER_SIDE2 2022-09-03 00:28:32 -04:00
Eduardo Quezada
03498d7240 Applied remaining instances of BATTLE_OPPOSITE and BATTLE_PARTNER 2022-09-02 23:57:43 -04:00
Eduardo Quezada
5403cd036e Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 
# Conflicts:
#	include/battle.h
#	include/battle_controllers.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
 2022-09-02 23:24:08 -04:00
GriffinR
97021baec6 Drop usage of global directive 2022-09-02 21:53:44 -04:00
GriffinR
8b7230c3c4 CpuFastFill -> CpuFastFill16 in fieldmap 2022-09-02 19:41:28 -04:00
GriffinR
7f1c4720a2 Update arguments for ApplyGlobalTintToPaletteSlot 2022-09-02 19:36:46 -04:00
GriffinR
03a98c72bc Sync fieldmap 2022-09-02 19:29:35 -04:00
Porygon23
ba6aad5bcc
Merge branch 'master' into AI-Logic-Updates 2022-09-02 14:44:47 -06:00
TheXaman
13cc640b78 whitspace changes, removed wrong comment 2022-09-02 18:53:51 +02:00
TheXaman
b4b3e84cbd removed default flags and added ingame warning if a function that requires them is used 2022-09-02 18:39:38 +02:00
Eduardo Quezada D'Ottone
c58dfa63a1 Merge remote-tracking branch 'RHH/master' into PE_monAnimations 
# Conflicts:
#	src/pokemon.c
 2022-09-02 12:06:43 -04:00
TheXaman
367b12801e changed debug_config.h to overworld_config.h, 
changed no bag use and no catching flags to battle_config.h,
removed TX reference (big sad)
 2022-09-02 12:33:42 +02:00
TheXaman
ad57551db1 removed unnecessary script, cheat start now with national dex, reverted accidental type hin removal, changed indentation 2022-09-02 12:10:11 +02:00
Eduardo Quezada D'Ottone
59f1f10dec
Merge pull request #2260 from DizzyEggg/magic_bounce 
Fix Magic Bounce targets
 2022-09-01 19:56:15 -04:00
Sérgio Augusto Vianna
60132b29fb Fixed pickup running when it shouldn't in some cases. 2022-09-01 15:37:52 -03:00
GriffinR
a28fbbc1b8
Merge pull request #1748 from GriffinRichards/fix-judgement 
Standardize judgement vs judgment spelling
 2022-09-01 11:51:04 -04:00
LOuroboros
5d346fd939 Updated a couple more sizeofs 2022-08-31 23:49:43 -03:00
LOuroboros
b9a32a93f5 Update src/data/text/move_descriptions.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-08-31 23:39:59 -03:00
LOuroboros
ea345f90f5 Picked the correct pointers for correctness' sake 2022-08-31 23:06:20 -03:00
LOuroboros
e02b33ee11 Automatized the contents of some sideof in src/item.c 2022-08-31 23:00:24 -03:00
Eduardo Quezada
8d94c58cac Shows exp when leveling up with Exp Candies 2022-08-31 21:54:27 -04:00
LOuroboros
452b135c7f I forgot to replace the function calls where appropriate :P 2022-08-31 19:17:09 -03:00
Eduardo Quezada
3264c3c87a Shows amount of Exp gained. 2022-08-31 09:05:51 -04:00
Eduardo Quezada
fe5f30c200 Fixed moves learned at the same level being skipped while using exp candies 2022-08-30 22:50:46 -04:00
Eduardo Quezada
29448b6acc Fixed XL Candy going out of bounds. Also added failsafe in case an invalid param is used. 2022-08-30 22:06:25 -04:00
Eduardo Quezada
494e8791d7 Fixed tutors changing levels 2022-08-30 22:06:25 -04:00
LOuroboros
7b8226a8af Added descriptions for LA's moves 2022-08-30 23:05:22 -03:00
LOuroboros
cc86b2fd96 Added Z-Move stats for LA's moves 2022-08-30 20:29:36 -03:00
LOuroboros
c167e2c6cc Added Legends: Arceus' move data 2022-08-30 19:32:44 -03:00
DizzyEggg
7cb010d71e fix magic bounce conflicts and fix magic coat 2022-08-30 19:36:06 +02:00
Eduardo Quezada
c2c18444b1 Updated HasAllMons to account for all Pokémon 2022-08-30 12:51:00 -04:00
Eduardo Quezada
925384eedc Generations of Pokémon can now be disabled individually 2022-08-30 12:50:59 -04:00
Eduardo Quezada
e9a5442be5 Removed unused ITEM_EXPANSION constants from base stats 2022-08-30 12:50:59 -04:00
Eduardo Quezada
df4c065ea6 Separated P_NEW_POKEMON into sections by generation. 
Sizes:
- GEN_3 15.690.076 bytes
- GEN_4 17.480.816 bytes
- GEN_5 19.544.944 bytes
- GEN_6 20.907.332 bytes
- GEN_7 22.233.288 bytes
- GEN_8 23.605.744 bytes
 2022-08-30 12:50:59 -04:00
TheXaman
c13561e5ba simplified filed controls code for debug menu 2022-08-30 18:15:06 +02:00
TheXaman
04c40677bd Changed the way debug flags are handled, now in constants/battle_config.h 2022-08-30 17:41:35 +02:00
TheXaman
e09ba650f3 imrpoved code formatting in field_control_avatar as per suggestion 2022-08-30 17:12:23 +02:00
TheXaman
5fed45e40b
Update src/item_use.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-30 17:04:14 +02:00
TheXaman
2f61407c78
Update src/field_control_avatar.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-30 17:04:02 +02:00
TheXaman
725a9102ee
Update src/new_game.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-30 17:03:44 +02:00
TheXaman
155465a919
Update src/pokemon_storage_system.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-30 17:03:28 +02:00
TheXaman
79c4fa560f
Update src/start_menu.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-30 17:03:07 +02:00
TheXaman
cc921c62d7
Update src/field_control_avatar.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-30 17:01:59 +02:00
TheXaman
61c95421eb
Update src/event_object_movement.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-30 17:01:46 +02:00
LOuroboros
df88317a98 Introduced FORM_BATTLE form changes 
For species such as Xerneas and Zacian.
 2022-08-29 19:10:52 -03:00
TheXaman
8cf2933658 added preproc directive to main debug.c code 2022-08-29 19:46:03 +02:00
TheXaman
bed5639074 Changed preproc defines to TRUE/FALSE, small cleanup 2022-08-29 19:36:44 +02:00
TheXaman
8c9a59ec1c Merge branch 'tx_debug_system' of https://github.com/TheXaman/pokeemerald into tx_debug_system_rhh 2022-08-29 19:13:11 +02:00
ghoulslash
2cd01bd95d
Merge pull request #2239 from DizzyEggg/quash 
Quash
 2022-08-29 10:43:54 -04:00
Blackforest92
b209645b20 Changes Origin to Origin Forme 2022-08-29 21:33:28 +07:00
Eduardo Quezada D'Ottone
32a1017c2d
Fixed tab 2022-08-29 10:13:01 -04:00
Blackforest92
61c33f56a0 Updated to latest master branch + add PLA's data to teachable_learnsets.h 2022-08-29 21:01:31 +07:00
TheXaman
006d28fd69 tiny fix for wrong "give pokemon" window 2022-08-29 14:51:40 +02:00
TheXaman
94183b45c7 Added options for ttoggling battle frontier pass and giving max BPs 2022-08-29 14:48:40 +02:00
DizzyEggg
2d4ac679a6 tabs 2022-08-29 10:26:55 +02:00
DizzyEggg
27010e9ee6 quash faintclearsetdata 2022-08-29 10:23:26 +02:00
Eduardo Quezada D'Ottone
8612300020
Merge branch 'master' into patch-1 2022-08-29 04:22:48 -04:00
Eduardo Quezada D'Ottone
8ca2f949e3
Merge pull request #2233 from gruxor/tmhm_rework 
Reworked TMHM into expandable list format
 2022-08-29 04:20:45 -04:00
crater-git
1c735e1abe Restored bool32 type to shouldUseMove 2022-08-29 03:47:11 -04:00
DizzyEggg
b9babd9ff1
Merge pull request #2264 from AsparagusEduardo/RHH_pretMerge20220826 
Friday Night Mergin' (weekly merge)
 2022-08-29 09:17:40 +02:00
LOuroboros
5801047e50
Removed unused local var in SetMonFormPSS 2022-08-28 12:10:54 -03:00
Blackforest92
d6998d4579 Edited PLA' pokedex_text.h 2022-08-28 19:55:45 +07:00
crater-git
9f16d1dd12 Fixed battle frontier tutors (for real this time) 2022-08-27 22:45:10 -04:00
Eduardo Quezada
1c8d3a4922 Removed unnecessary parenthesis 2022-08-27 11:19:50 -04:00
Eduardo Quezada
99fbad92e2 IS_BATTLER_OF_TYPE 2022-08-27 02:50:55 -04:00
Eduardo Quezada
69f4c226f0 Merge remote-tracking branch 'RHH/master' into RHH_cleanConfigs 
# Conflicts:
#	src/battle_ai_main.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_script_commands.c
#	src/pokemon.c
#	src/pokemon_summary_screen.c
 2022-08-27 02:42:22 -04:00
Eduardo Quezada
866d916f2f SpriteTemplate formatting 2022-08-27 02:07:58 -04:00
Eduardo Quezada
1f0a952546 Usage of BATTLE_OPPOSITE 2022-08-27 01:44:39 -04:00
Eduardo Quezada
15d611ba65 Usage of BATTLE_PARTNER 2022-08-27 01:26:13 -04:00
Eduardo Quezada
6c457f42af Corrected uses of GetBattlerSide 2022-08-27 00:59:12 -04:00
Eduardo Quezada
0a34d47041 Merge remote-tracking branch 'pret/master' into pret_clean2 2022-08-27 00:56:00 -04:00
Eduardo Quezada
481210b7f3 Missing uses of MAX_SPRITES 2022-08-27 00:54:30 -04:00
Eduardo Quezada
7c86bd5d08 Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826 
# Conflicts:
#	include/battle_interface.h
#	src/battle_anim_effects_1.c
#	src/battle_script_commands.c
#	src/field_specials.c
 2022-08-26 22:23:37 -04:00
SomeLoserThatCantPickOriginalUsernames
bd81841c30 Fix Escape Rope Message when on gen 8 mechanics 2022-08-26 17:47:45 -07:00
LOuroboros
922bbacd71 Updated GetMonFriendshipScore 
-Moved it to src/pokemon.c
-Made a battle specific variant called GetBattlerFriendshipScore.
-Made that variant return 0 for Mega Evolved 'mons and if called on link battles.
 2022-08-26 21:33:43 -03:00
GriffinR
578064d799 Add missing use of METATILE_ROW_WIDTH 2022-08-26 15:23:54 -04:00
Eduardo Quezada D'Ottone
bee36edd9c
Merge pull request #2173 from LOuroboros/yourAffection 
Implement affection-now-friendship mechanics
 2022-08-26 14:54:32 -04:00
GriffinR
0516f94837
Merge pull request #1753 from LOuroboros/GetLeadMonFriendshipScore 
Added constants for GetLeadMonFriendshipScore
 2022-08-26 14:52:10 -04:00
crater-git
f8fb4e8cf2 Renamed funcs, lists, etc. - Teach->Teachable 2022-08-26 14:48:06 -04:00
GriffinR
c5e873aa2b
Merge pull request #1742 from GriffinRichards/sound-pan 
Add missing usage of SOUND_PAN_*
 2022-08-26 14:47:24 -04:00
crater-git
b8a3cc2846 Consolidated funcs, renamed CanMonLearnMove 2022-08-26 11:07:08 -04:00
crater-git
54ee960970 Fixed Battle Frontier tutor move IDs 2022-08-26 10:12:11 -04:00
DizzyEggg
6331931ba3 Fix Magic Coat targets 2022-08-26 15:01:51 +02:00
Eduardo Quezada
77e2a2da32 Fixed Net Ball Gen 7+ multiplier 2022-08-25 23:19:46 -04:00
Eduardo Quezada D'Ottone
399a0c9d6f
Merge pull request #2142 from AgustinGDLV/exp_candy 
Gen 8 EXP Candies
 2022-08-25 23:03:24 -04:00
Eduardo Quezada D'Ottone
57d583b783
Fixed call to sExpCandyExperienceTable 2022-08-25 22:49:23 -04:00
Eduardo Quezada D'Ottone
6b414d9555
Apply suggestions from code review 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-25 22:40:19 -04:00
GriffinR
ce4a6e9067 MAP_NONE -> MAP_DYNAMIC 2022-08-25 21:34:05 -04:00
crater-git
ed02c4b425 Removed tutor move distinction, combined llists 2022-08-25 19:56:47 -04:00
AgustinGDLV
e204527f43 changed candy item parameters 2022-08-25 15:52:47 -07:00
LOuroboros
8bd7103b9d Even more review corrections 2022-08-25 17:32:12 -03:00
DizzyEggg
622a7f8141 merge with master 2022-08-25 22:10:59 +02:00
LOuroboros
2cf2c00b29 Updated friendship labels 2022-08-25 17:10:11 -03:00
LOuroboros
7539051942 Further tweaked the affection animation 2022-08-25 17:05:57 -03: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
LOuroboros
1bfff42ad2 Fixed ENDTURN_STATUS_HEAL 2022-08-25 12:38:47 -03: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
LOuroboros
1fc63c3431 More review corrections 2022-08-25 11:52:21 -03:00
LOuroboros
23bf67c63f Removed unnecessary inclusion of header in src/field_specials.c 2022-08-25 11:43:01 -03:00
DizzyEggg
a0ec8a5a80 4 digit hp in battle 2022-08-25 16:40:56 +02:00
LOuroboros
11d6ae4820 Renamed the GetLeadMonFriendshipScore constants 2022-08-25 11:34:37 -03:00
GriffinR
8a1130d046 Missing constant in friendshiptodamagecalculation 2022-08-25 10:21:41 -04:00
LOuroboros
e792fae415 Review corrections 
-Simplified the affection mechanics' battle scripts.
-Corrected the value seting inside CalcCritChanceStage.
-Simplified the checks inside Cmd_adjustdamage
-Simplified the contents of GetLeadMonFriendshipScore now that a more general function to do the same thing was added.
-Added constants for the values returned by GetMonFriendshipScore.
 2022-08-25 10:45:57 -03:00
LOuroboros
1f4ef2a0fb Added constants for GetLeadMonFriendshipScore 2022-08-25 10:40:56 -03: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
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
gruxor
d719510d32
Apply suggestions from code review 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-08-24 22:31:52 -04:00
LOuroboros
1d512ed57d Updated Serene Grace checks in AI_CheckViability 2022-08-24 20:00:13 -03: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
30594a9773 Included PR that was accidentally merged into BE 2022-08-24 18:37:25 -04:00
DizzyEggg
4f790a6ec0 spaces 2022-08-24 23:47:42 +02:00
DizzyEggg
91b76e2e4f quash pr clean up 2022-08-24 23:39:34 +02:00
DizzyEggg
06b4548603 Merge branch 'SonikkuA-DatH-Quashh' of https://github.com/SonikkuA-DatH/pokeemerald-expansion into quash 2022-08-24 23:35:42 +02:00
GriffinR
32ea55dcba
Merge pull request #1752 from LOuroboros/patch-4 
Re-aligned READ_PTR_FROM_TASK's 2nd line EoL
 2022-08-24 17:08:15 -04:00
GriffinR
8cc520ccd7
Merge pull request #1751 from LOuroboros/patch-3 
Fixed KeyInterCB_DeferToEventScript comment
 2022-08-24 17:07:59 -04:00
DizzyEggg
7aa55f2753 better interface 1 player mon in double 2022-08-24 23:00:21 +02:00
LOuroboros
015961c00a
Re-aligned READ_PTR_FROM_TASK's 2nd line EoL 2022-08-24 17:19:24 -03:00
LOuroboros
3a65529293
Fixed KeyInterCB_DeferToEventScript comment 2022-08-24 17:12:59 -03:00
LOuroboros
90f72a745a
Fixed switch syntax in Task_TryFieldPoisonWhiteOut 2022-08-24 17:01:36 -03: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
crater-git
1ff5bdca9d Added list endings to otherwise empty learnsets 2022-08-24 11:55:39 -04:00
Blackforest92
fb00ac977a Adjust endif in form_species_tables.h to include Hisuian Sneasel and Qwilfish 2022-08-24 16:21:45 +07:00
Blackforest92
07a07ddc8d Update to latest master branch + allow Reveal Glass to work with Enamorus 2022-08-24 15:00:48 +07:00
Eduardo Quezada D'Ottone
ec4ff0acb7
Update battle_debug.c 2022-08-24 01:33:00 -04:00
Eduardo Quezada D'Ottone
2bd06dee1d
Update battle_debug.c 2022-08-24 01:21:06 -04:00
Eduardo Quezada D'Ottone
21867a6061
Merge branch 'master' into AI 2022-08-24 01:07:35 -04: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
crater-git
7ac2f566fd Re-added PP if statements for P_NEW_POKEMON 2022-08-23 23:08:38 -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
Ct11217
67f473f38b Fixed recommended issues. 
Added additional comments.
Reordered switching ladder in ShouldSwitch() function.
Functions that can specify a specific party mon to switch into need to come first.
 2022-08-23 19:49:54 -06:00
crater-git
45511fcc44 Reworked TMHM into expandable list format 2022-08-23 21:44:42 -04:00
Eduardo Quezada
1f5adf93c7 Cleaned up use of configs be almost exclusively preproc functions 2022-08-23 21:00:08 -04:00
GriffinR
3771abbe08 Fix names and constant usage for union room classes 2022-08-23 12:44:07 -04:00
DizzyEggg
05ec8fb182 AI knows Party mons 2022-08-23 11:58:17 +02: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
DizzyEggg
327782646b Save party mons ai 2022-08-23 01:07:25 +02:00
Eduardo Quezada
c1c9837bfc Merge remote-tracking branch 'RHH/item_expansion' into MergedBranchUltimate 2022-08-22 17:31:21 -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
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
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
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
7b0c8ec972 Revert style changes 2022-08-15 20:41:12 -04:00
Eduardo Quezada
44b26cc8aa From pokefirered 2022-08-15 18:27:37 -04:00
Eduardo Quezada
e8a05e92e4 Corrected additional inconsistent uses of whitespace 2022-08-15 17:04:34 -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
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
Eduardo Quezada D'Ottone
3d94ada041
Merge pull request #2166 from Sneed69/fix_tm_compat 
Fix tm/hm compatibility
 2022-08-11 10:07:03 -04:00
GriffinR
286a99eb1d
Merge pull request #1723 from GriffinRichards/fix-impassable 
MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes
 2022-08-10 21:28:14 -04:00
WhenGryphonsFly
475658116e Fix BUGFIX return statement in battle_dome.c 2022-08-10 20:00:16 -05:00
WhenGryphonsFly
86881b12ef Use PARTY_SIZE for Pokerus Nurse Conversation 2022-08-10 19:09:59 -05:00
GriffinR
e06ba39751 Use button constants in Task_HandleChooseMonInput 2022-08-10 15:14:35 -04:00
GriffinR
f534e8e44a Move party menu data constants 2022-08-10 14:30:01 -04:00
GriffinR
bfdbbad468 Split naming screen palettes/graphics, use correct image palettes, clean up 2022-08-09 09:27:28 -04:00
ghoulslash
eb0cc91dce
Merge pull request #2224 from AsparagusEduardo/BE_cosntantsZmove 
B_WIN constants in battle_z_move.c
 2022-08-08 21:13:23 -04:00
Eduardo Quezada
4b08a511c3 Cleanup from https://github.com/pret/pokefirered/pull/532 2022-08-07 22:40:15 -04:00
LOuroboros
80057fc990
Update battle_z_move.c 2022-08-07 10:19:03 -03:00
GriffinR
079b1762ac Update special save sector size checks 2022-08-05 12:11:33 -04:00
GriffinR
2487ddb128 Sector security -> signature 2022-08-05 10:42:31 -04:00
Eduardo Quezada D'Ottone
08f08ece98 B_WIN constants in battle_z_move.c 2022-08-04 15:35:08 -04:00
DizzyEggg
c991131b75 Change language stuff based on the french decomp 2022-08-04 11:53:16 +02:00
GriffinR
e5c36cd745 MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes 2022-08-03 14:21:13 -04:00
GriffinR
79384ec9f3
Merge pull request #1702 from GriffinRichards/clean-psn 
Clean up field_poison.c
 2022-08-02 13:20:49 -04:00
GriffinR
99a37b5aa5
Merge pull request #1717 from mrgriffin/trainer-party-macro 
Macros for keeping .partyFlags, .partySize, and .party in sync
 2022-08-02 13:11:43 -04:00
ExpoSeed
49da2ee53f Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION 2022-08-02 00:15:55 -05:00
Ariel A
9a0a759b3f Fixed multihit odds. 2022-08-01 20:23:25 -04:00
Eduardo Quezada
b49f8c10ad Review changes from https://github.com/pret/pokefirered/pull/525 2022-08-01 15:37:05 -04:00
Eduardo Quezada
cc288e3786 Review changes 2022-08-01 15:14:21 -04:00
Eduardo Quezada
7ea49adf3c CpuCopy16 in UnkUtil_CpuRun 2022-08-01 08:04:48 -04:00
Eduardo Quezada
c6cdb2a281 Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 2022-07-31 22:57:46 -04:00
benicioneto
3d8aeeac77 Fix the AI 
The AI was using only the first move, and soft locking when the first move's PP ends
 2022-07-30 17:33:48 -03:00
Eduardo Quezada
a72d4c4168 Cleanup from syncing pss and mon markings 2022-07-30 12:43:14 -04:00
Eduardo Quezada D'Ottone
22ab78e2f8 Fixed Steam Eruption's long name 2022-07-30 00:10:20 -04:00
Eduardo Quezada
897b3d07f6 Sync src/pokeball.c with pokefirered 2022-07-29 21:29:12 -04:00
Eduardo Quezada
2e1bf0d965 OamData mosaic FALSE 2022-07-29 21:27:39 -04:00
Eduardo Quezada
2214b01954 Forgot to include this fix 2022-07-29 17:07:56 -04:00
Eduardo Quezada
5d4b76c0ba Review changes from pokefirered #524 2022-07-29 17:00:07 -04:00
Eduardo Quezada
9dc64b67cd Review changes 2022-07-29 15:38:23 -04:00
Eduardo Quezada
01558ff8f3 Struct pointers star standarizing 2022-07-29 11:15:33 -04:00
Eduardo Quezada
13672680b0 void pointer standarized 2022-07-29 10:52:35 -04:00
Eduardo Quezada
aa93af4083 Fixed check 2022-07-29 10:34:21 -04:00
Eduardo Quezada
fa32f337be Review changes 2022-07-29 10:21:20 -04:00
Eduardo Quezada
7b3401ee27 Standarized use of star in pointer types 2022-07-29 10:17:58 -04:00
Eduardo Quezada
9caca17064 Cleanup by syncing src/battle_script_commands.c with pokefirered 2022-07-29 09:43:16 -04:00
Greenphx9
05cbd6a906 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into 16-letter-move-names 2022-07-29 18:49:25 +10:00
ghoulslash
0c79d04dec
Merge pull request #1928 from AsparagusEduardo/BE_fixTransformForm 
Prevent Transforming Pokémon from changing forms
 2022-07-28 22:26:56 -04:00
ghoulslash
5a850b0b4e
Merge pull request #2212 from AsparagusEduardo/BE_healBallFix 
Fixed Heal Ball not always healing caught Pokémon
 2022-07-28 22:22:20 -04:00
Eduardo Quezada
09af7422d5 Further cleaning after comparing with pokefirered 
STAT_BUFF changed to STAT_CHANGE, as it also uses debuffs
 2022-07-28 01:27:05 -04:00
Eduardo Quezada
dc47a959da Reverted comments from pokefirered 2022-07-27 20:33:34 -04:00
Eduardo Quezada
b00bd8b181 Cleaned by comparing evolution_scene.c with pokefirered 2022-07-27 18:51:32 -04:00
Martin Griffin
2380d13a43 Macros for keeping .partyFlags, .partySize, and .party in sync 2022-07-27 23:25:37 +01:00
GriffinR
4ffe75c611
Merge pull request #1707 from GriffinRichards/use-pocket-consts 
Add some missing pocket constant usage
 2022-07-27 12:22:01 -04:00
GriffinR
1da46a4bbc
Merge pull request #1715 from AsparagusEduardo/pret_docBooleans 
Documented boolean uses
 2022-07-27 12:09:02 -04:00
Eduardo Quezada
e1c15a9cf6 Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 2022-07-27 08:16:10 -04:00
Eduardo Quezada D'Ottone
0f6186d8ab
Merge pull request #2211 from AsparagusEduardo/BE_Gen3Switch 
Config for Gen 3 faint switch mechanics
 2022-07-27 08:14:13 -04:00
Eduardo Quezada
7af85b0c49 Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 2022-07-27 08:12:08 -04:00
Eduardo Quezada D'Ottone
aebd667260 Merge remote-tracking branch 'RHH/battle_engine' into BE_fixTransformForm 
# Conflicts:
#	src/battle_ai_main.c
 2022-07-26 17:00:53 -04:00
GriffinR
5366e89258
Merge pull request #1713 from DizzyEggg/patch-1 
Change GAME_LANGUAGE to LANGUAGE_ENGLISH
 2022-07-26 11:08:05 -05:00
Eduardo Quezada D'Ottone
611b192e8c Small AI fixes by mrgriffin 2022-07-26 09:53:39 -04:00
DizzyEggg
b7c78571a6
Update src/international_string_util.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-07-26 15:39:29 +02:00
DizzyEggg
c557c4eb27
Add a comment 2022-07-26 14:44:53 +02:00
LOuroboros
b59f7aed7f
Added a constant for NPC trainer name length (#1712) 2022-07-25 22:59:13 -04:00
Eduardo Quezada
a37d8b1346 Documented boolean uses 2022-07-25 14:59:14 -04:00
LOuroboros
032b7b2ab9 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into yourAffection 2022-07-25 10:24:19 -03:00
Eduardo Quezada D'Ottone
8d18fc0dd8 Fixed Heal Ball not always healing caught Pokémon 2022-07-25 08:54:03 -04:00
Eduardo Quezada D'Ottone
bfb86fdc86 Config for Gen 3 faint switch mechanics 2022-07-24 14:57:47 -04:00
Eduardo Quezada
be22f299f8 Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 2022-07-24 14:00:10 -04:00
LOuroboros
f1d8d006f3 Corrected usage of B_PRANKSTER_DARK_TYPES in AI_CheckBadMove 2022-07-24 06:47:50 -03:00
DizzyEggg
151b5a5f8a
Change GAME_LANGUAGE to LANGUAGE_ENGLISH 2022-07-23 12:23:04 +02:00
Eduardo Quezada
e96c9c87fa Merge remote-tracking branch 'RHH/item_expansion' into RHH_masterMerge 
# Conflicts:
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
 2022-07-22 23:38:52 -04:00
Eduardo Quezada
231727d02b Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge 
# Conflicts:
#	asm/macros/event.inc
#	data/specials.inc
#	include/constants/species.h
#	src/data/pokemon/base_stats.h
 2022-07-22 23:33:04 -04:00
Eduardo Quezada
f3bebcd12c Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 
# Conflicts:
#	include/battle_anim.h
#	include/global.h
#	include/pokemon.h
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
 2022-07-22 22:57:02 -04:00
ghoulslash
1260666c91
Merge pull request #1911 from AsparagusEduardo/PE_breedOverrides 
Added Egg breeding species overrides.
 2022-07-22 14:05:14 -04:00
ghoulslash
cef730e451
Merge pull request #2196 from AsparagusEduardo/IE_pretmerge 
Item Expansion pret merge
 2022-07-22 14:01:50 -04:00
ghoulslash
0588bba193
Merge pull request #2195 from AsparagusEduardo/PE_pretmerge 
Pokémon Expansion pret merge
 2022-07-22 14:01:27 -04:00
ghoulslash
3a77b52bad
Merge pull request #2194 from AsparagusEduardo/BE_pretmerge 
Battle Engine pret merge
 2022-07-22 14:00:40 -04:00
Blackforest92
56f4c319a4 Fix multiple pokemon graphics, tidying pokemon graphic folders 2022-07-22 22:17:29 +07:00
Eduardo Quezada D'Ottone
af72fb0d32 Simplified pre-gen5 checks 2022-07-21 16:36:07 -04:00
Eduardo Quezada D'Ottone
56b9a50109 Merge remote-tracking branch 'RHH/battle_engine' into BE_plusMinus 
# Conflicts:
#	include/constants/battle_config.h
 2022-07-21 16:28:16 -04:00
ghoulslash
24bb2f7ed0
Merge pull request #2179 from LOuroboros/pinch 
Removed global and unused IsPinchBerryItemEffect
 2022-07-21 16:14:56 -04:00
ghoulslash
49a932a892
Merge pull request #2205 from AsparagusEduardo/BE_LightThatBurnsTheSky 
Fixed Light That Burns The Sky not using the calculated damage category
 2022-07-21 16:14:38 -04:00
ghoulslash
30a494f964
Merge pull request #2197 from AsparagusEduardo/BE_explosion 
Config for Explosion halving defense
 2022-07-21 16:11:32 -04:00
ghoulslash
504600c996
Merge pull request #2201 from AsparagusEduardo/BE_sturdy 
Config for Sturdy's Gen5+ effect.
 2022-07-21 16:09:01 -04:00
ghoulslash
2ce32afeaa
Merge pull request #2202 from AsparagusEduardo/BE_SkyDrop 
Sky Drop fixes
 2022-07-21 16:06:42 -04:00
ghoulslash
2fc15ab779
Merge pull request #2203 from AsparagusEduardo/BE_ghostEscapeAiFix 
Ghost Escape config AI fix
 2022-07-21 16:00:33 -04:00
Eduardo Quezada D'Ottone
e4ae280ca6 Fixed calls to IsZMove 2022-07-21 15:32:14 -04:00
Eduardo Quezada D'Ottone
25397e5794 Fixed Light That Burns The Sky not using the calculated damage category 
Also:
- Modified move defines to ease with future move expansion.
- Enabled Instruct's check for Z Moves in AI_CheckBadMove.
 2022-07-21 15:13:00 -04:00
Eduardo Quezada D'Ottone
eb582b1355
Merge pull request #2178 from ghoulslash/be/ai_fix 
fix GetAiLogicData logic
 2022-07-21 14:47:21 -04:00
ghoulslash
462a144956
Merge pull request #2200 from AsparagusEduardo/BE_ZMove_power 
Updated Z-Move power for Gen 8 moves and moves with power varying by Gen
 2022-07-20 18:10:31 -04:00
Eduardo Quezada D'Ottone
d87610a1e0 Ghost Escape config AI fix 2022-07-20 15:31:08 -04:00
Eduardo Quezada D'Ottone
76f5926743 Sky Drop check in IsBattlerTrapped 2022-07-20 15:29:40 -04:00
Eduardo Quezada D'Ottone
343e685537 Sky Drop fixes 
- Sky Drop was using lbs in the formula instead of hectograms. This has been fixed.
- Sky Drop is now affected by weight modifiers like Float Stone.
- Enabled AI_CheckBadMove for Sky Drop.
 2022-07-20 15:13:53 -04:00
Eduardo Quezada D'Ottone
b8ea412e61 AI logic for Charge 2022-07-20 14:44:57 -04:00
Eduardo Quezada D'Ottone
212ecb98ce Added AI checks. 2022-07-20 14:28:49 -04:00
AgustinGDLV
90d86d4b04 pulled IE 2022-07-20 10:53:19 -07:00
AgustinGDLV
9c73cb322e replaced bitfield with LUT 2022-07-20 10:48:09 -07:00
Eduardo Quezada D'Ottone
0f3fdd410a Config for Sturdy's Gen5+ effect. 2022-07-20 13:06:41 -04:00
Eduardo Quezada D'Ottone
f00beac3f9 Updated Z-Move power for Gen 8 moves and moves with power varying by Gen 2022-07-20 11:32:16 -04:00
Eduardo Quezada D'Ottone
e14afd8957 Added Growth's Atk. raise to the its configuration, as that was also introduced in Gen 5. 2022-07-20 10:33:18 -04:00
Eduardo Quezada D'Ottone
fe63dafcc1 Merge branch 'battle_engine' into BE_pretmerge 
# Conflicts:
#	src/battle_anim_fire.c
#	src/battle_controller_player.c
 2022-07-20 08:50:30 -04:00
ghoulslash
2b5bb9f6e4 move gSwapDamagecategory to battle struct, use GetSplitBasedOnStats for photon geyser check 2022-07-19 18:24:53 -04:00
Eduardo Quezada D'Ottone
64115a873f Comatose prevents Battle Pike's status effects. 2022-07-18 18:15:44 -04:00
Eduardo Quezada D'Ottone
1cfb267b34 Config for Explosion halving defense 2022-07-18 13:10:27 -04:00
ghoulslash
f2ee9f3ba0 tweak z indicator position relative to healthbox 2022-07-18 09:44:04 -04:00
Eduardo Quezada D'Ottone
e55fea47f3 Added missing MOVE_UNAVAILABLE to Gorilla Tactics check 2022-07-18 09:24:08 -04:00
ghoulslash
18affe8c1a new z move indicator, credits to blackforest 2022-07-18 09:21:59 -04:00