Alex
97fa0be36e
Dynamic move type clean up ( #5132 )
...
* Minor clean up of the new function DynamicMoveType
* wrongly removed func
* Overworld Weather Bug
* wrong comparison
2024-08-11 14:18:56 +02:00
Eduardo Quezada
113f8de9b1
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_controller_player.c
2024-08-08 13:22:49 -04:00
Eduardo Quezada
182809b515
Made perfect IV count into a granular setting ( #5115 )
...
* Made perfect IV count into a granular setting
* Fixed optional parameter comment in SPECIES_NONE
2024-08-08 13:46:22 -05:00
Frank DeBlasio
754beeee5d
Created COMPOUND_STRINGs for default player names ( #5037 )
...
* Converted default names to COMPOUND_STRINGs
* Moved new game strings out to main_menu
2024-08-08 14:46:17 +02:00
Galaxeeh
355739db63
Dynamic Move Types in Summary Screen/Battle ( #5084 )
...
* Dynamic Hidden Power Types
* Dynamic Ivy Cudgel is summary screens
* Dynamic Move types
* missed unnecessary comment that got left in
* format cleanup, return cleanup, added Tera Blast and Tera Starstorm, Revelation dance fix-> now displays live type update when tera is selected during battle before move selection
* forgot to revert config defaults
* Update src/pokemon.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* if block spaces/ raging bull fix/ more condensing on checks/ reallocating config check/ tera blast fix (was displaying tera blast type on non tera'd mons in party when battler was tera'd)
* revert configs
* added Hail check to Weather Ball
* Fixed agbcc compile/brackets/u32 changes
* Quick fix to ensure Judgment/Techno Blast/Natural Gift are not affected by -ate abilities
* Update src/pokemon_summary_screen.c
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-08-08 11:08:50 +02:00
Bassoonian
c390999141
Pret Merge (7th of August) ( #5116 )
2024-08-08 10:23:14 +02:00
psf
b8dab587ab
Update include/battle.h
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-08-07 14:32:36 -07:00
pkmnsnfrn
5fbe5a331c
Updated spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5114\#discussion_r1707607637
2024-08-07 13:33:35 -07:00
Bassoonian
0b1f06b594
Merrp merge (7th of August) ( #5110 )
2024-08-07 22:05:07 +02:00
pkmnsnfrn
5635f94036
More changes from typeX to types[X]
2024-08-07 11:35:45 -07:00
Bassoonian
cb4e687917
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergeforpsf
2024-08-07 19:05:46 +02:00
Pawkkie
9f845a79e5
Fix Switch AI Bug: AI never switching out when it could be OHKO'd ( #5089 )
...
* Fix switch AI bug
* Forgot to save a file lol
* Fix infinite loop test compatibility
2024-08-07 15:58:39 +02:00
Bassoonian
207129e0c8
Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into pretmerge7aug
2024-08-07 12:42:45 +02:00
psf
312749dd31
Changed type1 and type2 to be consistent ( #2021 )
...
* Changed type1 and type2 in gBattleMons to match gSpeciesInfo
* Changed monType1 and monType2 to monTypes to match gSpeciesInfo
2024-08-07 06:44:03 +01:00
kittenchilly
e4f09c8103
Move Relearner now displays move category ( #5081 )
...
* Move relearner now displays move category
* Update move_relearner.c
* Update move_relearner.c
* Address reviews
2024-08-06 23:58:18 +02:00
Alex
dbb9ee874b
Change GET_MOVE_TYPE to a function ( #5090 )
...
* Change GET_MOVE_TYPE to a function
* add in battle check to GetMoveType function, move it to battle_util.c
* Update src/battle_util.c
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Update src/battle_util.c
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-08-05 22:02:31 -04:00
Alex
745db06dc8
Doesn't compile on some compilers ( #5099 )
...
the u8 should be brought back once we remove agbcc.
2024-08-05 18:12:55 -04:00
Alex
12351d520d
Changes Evolution methods to Enums ( #4977 )
...
* Changes Evolution methods to Enums
* make U8_ENUM to include/constants/global.h
* revert previous commit
* Update include/constants/pokemon.h
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-08-05 15:54:37 -04:00
DizzyEggg
9ac8d0de25
Optimize/get rid of unused palette vars/functions ( #4841 )
2024-08-04 21:41:55 -04:00
pkmnsnfrn
0fb48e8a9a
Fixed expanded OW IDs
2024-08-03 17:04:33 -07:00
AlexOn1ine
0f3f2915fb
Merge remote-tracking branch 'rhh/master' into master_merge
2024-08-03 20:19:33 +02:00
Martin Griffin
9d97537ee2
Fix speed ties ( #4780 )
...
* Fix speed ties
* fixup! Fix speed ties
* fixup! Fix speed ties
* fixup! fixup! Fix speed ties
* fixup! Fix speed ties
* Workaround for Comatose-Ditto interaction
2024-08-03 17:29:47 +02:00
cawtds
3af93bdfee
FRLG+ whiteout message ( #4967 )
...
* FRLG whiteout message + post whiteout event
2024-08-02 08:28:05 -07:00
Eduardo Quezada
4082adf5b1
Start 1.10.0 cycle
2024-08-01 17:07:50 -04:00
Eduardo Quezada
512c44b698
Start 1.9.1 cycle
2024-08-01 17:04:48 -04:00
Eduardo Quezada
7ec24b89c8
Merge branch '_RHH/upcoming' into _RHH/pr/master/1.9.0
2024-08-01 16:58:19 -04:00
Eduardo Quezada
f95322628d
Merge branch '_RHH/upcoming' into _RHH/pr/master/1.9.0
2024-08-01 16:47:50 -04:00
Eduardo Quezada
483121dfc0
Version 1.8.6 ( #5005 )
2024-08-01 19:52:29 -04:00
Eduardo Quezada
3372503430
Added OBJ_EVENT_GFX_SPECIES_SHINY macro ( #5049 )
...
* Added OBJ_EVENT_GFX_SPECIES_SHINY
* Update src/event_object_movement.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-07-29 18:41:03 +02:00
Eduardo Quezada
b4eca0a6ec
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# data/battle_anim_scripts.s
# src/battle_util.c
2024-07-29 09:36:16 -04:00
hedara90
a89820fa96
Fixed Hidden Power damage category for PSS < GEN_4 ( #5053 )
...
* Fixed Hidden Power damage category for PSS < GEN_4
* Fixed category display regression
* Wrapped GET_MOVE_TYPE
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-29 13:45:14 +02:00
Eduardo Quezada
18aff2db3b
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# asm/macros/battle_anim_script.inc
# data/battle_anim_scripts.s
# include/constants/battle_anim.h
# src/battle_anim.c
# src/data/battle_anim.h
2024-07-27 16:26:37 -04:00
Eduardo Quezada
bb471746d6
Renamed EVO_DEFEAT_WITH_ITEM to EVO_DEFEAT_THREE_WITH_ITEM ( #5046 )
2024-07-27 21:41:05 +02:00
Eduardo Quezada
1e8773356c
Changed EVO_OVERWORLD_STEPS to use an EWRAM variable ( #5047 )
...
* Changed EVO_OVERWORLD_STEPS to use an EWRAM variable
* Fixed PC swapping not resetting the follower steps
2024-07-27 20:48:59 +02:00
Bassoonian
c603e11310
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge27july
2024-07-27 12:01:39 +02:00
pkmnsnfrn
91b48a10d4
Added constant for NUM_SNOWFLAKE_SPRITES
2024-07-26 21:57:42 -07:00
Pawkkie
3c1fbbb06e
Fixes cantBeSurpressed ability check for breakable abilities ( #5043 )
2024-07-26 15:57:01 -04:00
AlexOn1ine
89563cb9b1
check for breakable ability
2024-07-26 21:11:16 +02:00
hedara90
b0b63f66b9
Added Ivy Cudgel Animation ( #5034 )
...
* Added Ivy Cudgel Anim, changed Ogerpon palettes, added jumpifmovetypeequals command
* Make the 20 year old compiler not complain
* Maybe better cudgel
* Moved animation
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-26 18:06:44 +02:00
Martin Griffin
5b251b614c
trainerproc: Support Ogerpon
2024-07-25 14:50:32 +01:00
Eduardo Quezada
0b02527e5c
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# test/test_runner.c
2024-07-21 13:36:07 -04:00
Eduardo Quezada
9d5e253867
Improved Test Runner Summary ( #4641 )
...
* Filename in list (no proper sorting yet)
* Line number and message in error list + removed sorting
* Style adjustment
* Added missing file/line number to "expected N passes/successes"
* Fixed Known Failing Passing test list
* Separated test list from totals
* Assumption fails list
* Better names
* Filename for KNOWN_FAILINGs passing
* Moved total back to the bottom
* Spaces correction
* Fixed test list count
* Source file for Alloc fails on tests
* Moved sourceLine from BattleTest to Test struct
* Fixed assumptions failed "and more" counter
* Fixed ASSUMPTION block not printing their line numbers
* Fixed when stopLine is printed
* Renamed stopLine to failedAssumptionsBlockLine
2024-07-20 18:22:40 +02:00
tertu
5ccf3e2688
Fix chain fishing shiny rolls ( #4906 )
2024-07-19 09:48:14 -05:00
Eduardo Quezada
98eb4e5027
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# asm/macros/battle_script.inc
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
# src/frontier_util.c
# test/battle/ai/ai.c
2024-07-19 09:20:05 -04:00
Alex
552e2768da
Fixes to Opportunist and Mirror Herb adjustments ( #4928 )
...
* Replace Opportunist todo tests with proper tests
* add failing test
* desc
* Fixes to Opportunist and Mirror Herb adjustments
* more tests
* some fixes
* first turn events switch
* simple enum + revert test desc
2024-07-19 11:01:46 +02:00
Alex
b21ffa1f9b
Changes score adjustments to tempScore increases ( #4987 )
2024-07-17 23:36:15 +02:00
fakuzatsu
0625c90277
fix tests when B_USE_FROSTBITE is TRUE ( #4986 )
2024-07-17 23:23:52 +02:00
psf
7b3b635c67
Add AUTO_LOWERCASE_KEYBOARD ( #4976 )
...
* Added SwapKeyboardToLowerAfterFirstCapitalLetter and AUTO_LOWERCASE_KEYBOARD
* Fixed tabs and spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/4976/files\#r1677868397
* Removed semicolon found by https://github.com/rh-hideout/pokeemerald-expansion/pull/4976\#discussion_r1678105502
2024-07-15 19:06:01 +02:00
Eduardo Quezada
2b40e79ac3
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# include/battle_util.h
# src/battle_ai_main.c
2024-07-14 22:44:00 -04:00
sneed
6aa308e1d8
EFFECT_PHOTON_GEYSER and restored EFFECT_SHELL_SIDE_ARM work for physical moves ( #4923 )
2024-07-14 15:35:11 +02:00
