LOuroboros
927f098cf5
Renamed setmodernfatefulencounter and checkmodernfatefulencounter for consistency reasons
2024-03-11 01:46:59 -03:00
ghoulslash
0dabcfc966
fix repeated quick claw/quick draw checks ( #4266 )
...
* fix repeated quick claw/quick draw checks
* fix field names
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-03-10 22:49:00 +01:00
DizzyEggg
82f8636502
Simplify division in berry_crush and field weather functions
2024-03-09 20:06:58 +01:00
LOuroboros
ff482957bd
Made ScriptGiveMonParameterized recognize the state of P_FLAG_FORCE_SHINY and P_FLAG_FORCE_NO_SHINY ( #4256 )
...
* Made ScriptGiveMonParameterized recognize the state of the P_FLAG_FORCE_SHINY
* And made it respect P_FLAG_FORCE_NO_SHINY too
2024-03-08 23:26:25 +01:00
kittenchilly
b7f5ef3cd7
Add Paldean Wooper mini icon ( #4260 )
2024-03-08 23:25:59 +01:00
DizzyEggg
9e67594dce
Simplify weirdly matching division/substraction code
2024-03-08 16:19:04 +01:00
Eduardo Quezada
3697363198
Pret merge 07.03.2024 ( #4255 )
2024-03-08 08:57:27 -03:00
DizzyEggg
48d49b40c5
Merge branch 'master' of https://github.com/pret/pokeemerald into upcoming
2024-03-07 20:57:07 +01:00
GriffinR
82c3e4af14
Merge pull request #1981 from DizzyEggg/patch-3
...
Make sure gHeap is always aligned
2024-03-07 10:33:52 -05:00
DizzyEggg
95270e5400
gHeap can go in the middle of ram ( #4253 )
2024-03-06 22:27:21 +01:00
DizzyEggg
a36cfb1093
unify monSpritesGfx sprites/ptr and fix various compiler errors on o3/os/og ( #4252 )
2024-03-06 22:26:33 +01:00
DizzyEggg
3b45fda8e9
Use u32 in gflib functions and remove unused ( #4250 )
2024-03-06 22:22:05 +01:00
Eduardo Quezada
c91af31a26
Fixed P_FOOTPRINTS not compiling ( #4251 )
2024-03-06 16:54:44 +01:00
DizzyEggg
7da5cb421e
Make sure gHeap is always aligned
2024-03-06 16:13:06 +01:00
Eduardo Quezada
49ddefe84a
Merge branch '_RHH/master' into _RHH/upcoming
2024-03-06 10:40:20 -03:00
Eduardo Quezada
1565171235
Fixed considering Mold Breaker but not Turboblaze/Teravolt for flinch-related decisions ( #4244 )
2024-03-05 18:08:02 +01:00
DizzyEggg
b9f715f114
Fix possible multi battle bug ( #4240 )
2024-03-04 22:31:05 +01:00
DizzyEggg
650f80d57e
remove some unused data ( #4239 )
2024-03-04 17:36:23 +01:00
Alex
8d58af4d33
Move most damage AI_BadMove checks to AI_CalcDamage ( #4238 )
...
* Move a couple damage AI_BadMove checks to AI_CalcDamage
* re-add effectivness score decrease
* reduce score for bad move in ai_checkviability
* review changes
2024-03-04 09:54:04 +01:00
Eduardo Quezada
5acc770f00
Fixed config comment ( #4237 )
2024-03-03 09:07:47 +01:00
Eduardo Quezada
d811614f60
Merge branch '_RHH/master' into _RHH/upcoming
2024-03-02 11:04:48 -03:00
LOuroboros
64b7cfeb29
Upgrading the debug menu's 'Poison Party' ( #4235 )
...
* Upgrading the debug menu's 'Poison Party'
* Optimized the 'No Pokémon' check in Debug_EventScript_InflictStatus1
* Killed a pointless function call in Script_SetStatus1
* Added Frostbite support to ¡inflict status1'
2024-03-01 19:55:54 +01:00
tertu
e3d9a19f45
Use a 32 bit seed for new game seeding in HQ mode. ( #4218 )
...
Also adjust some comments
2024-02-28 06:04:47 +00:00
Eduardo Quezada D'Ottone
918a0be312
MoveInfo rearrangement and flag optimisation ( #4096 )
2024-02-27 09:32:54 -03:00
Nephrite
e9b2f33084
Fixed Tangling Hair + Mirror Armor interaction
2024-02-27 13:38:38 +09:00
Nephrite
b1f0fbdf89
Merge remote-tracking branch 'rhh/upcoming' into battlemove_refactored
2024-02-27 13:03:26 +09:00
Eduardo Quezada D'Ottone
9e0ae222c3
Fixed Tri Attack status ability immunity test ( #4229 )
...
* Fixed Tri Attack test incorrectly having abilities that don't prevent Paralysis
* Fixed Dauntless Shield test names
2024-02-26 18:33:06 +01:00
Nephrite
4781ca41a9
Renamed GET_ADDITIONAL_EFFECT_COUNT macro
2024-02-27 00:03:25 +09:00
Nephrite
170070baef
Apply suggestions from code review
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-02-26 23:59:15 +09:00
Eduardo Quezada
38e7de211f
Merge branch '_RHH/master' into _RHH/upcoming
2024-02-26 11:52:55 -03:00
Nephrite
b0d36b22ba
Fixed test
2024-02-26 15:12:34 +09:00
Nephrite
0aac57bf60
Renamed TestSheerForceFlag
2024-02-26 15:11:21 +09:00
Nephrite
46b67355a5
Merge remote-tracking branch 'rhh/upcoming' into battlemove_refactored
2024-02-26 14:23:53 +09:00
Nephrite
174c6fc999
Renamed "MoveHasMoveEffect" functions
2024-02-26 14:21:38 +09:00
DizzyEggg
d2e84afd03
AI sets up double flags correctly ( #4228 )
...
* Fix AI double flag not being set up
* ai vs ai doubles
2024-02-25 11:20:23 +01:00
Nephrite
9db03fb263
Removed GET_MOVE_EFFECT
2024-02-25 18:22:21 +09:00
Eduardo Quezada D'Ottone
8671da436b
Add LGPE+ Premier Ball Bonus config ( #4191 )
...
* Add LGPE+ Premier Ball Bonus config
* Capitalization
* Premier Ball count in message + only give the amount of Premier Balls possible
* Review changes
* Updated B_TELEPORT_BEHAVIOR to match Premier Ball config
* Update src/shop.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-02-25 10:13:26 +01:00
Nephrite
b55b1eaa5d
Added word comment
2024-02-25 17:54:04 +09:00
Nephrite
7592ec5973
Revert moves_info.h reorder
2024-02-25 17:49:13 +09:00
Eduardo Quezada D'Ottone
0522ec0247
Trainer data encapsulation ( #4216 )
...
* Moved existing sanitized trainer data functions to include/data.h
* Sanitized encounterMusic_gender
* Sanitized trainer class ID
* Sanitized trainer pic ID
* Sanitized trainer starting status
* Sanitized obtaining Trainer struct
* Sanitized trainer double battle flag
* Sanitized trainer party size
* Sanitized trainer mugshot data
* Sanitized trainer name
* Consolidated Dome Brain trainer data to the rest of the frontier data
* Sanitized trainer items
* Removed accidental test data
* Sanitized trainer party
* Sanitized trainer AI flags
* Final encapsulation bit
2024-02-22 14:22:57 +01:00
Alex
750eb40a75
Fixes Tangling Hair, Rocky Helmet interaction ( #4219 )
2024-02-21 23:55:38 +01:00
Eduardo Quezada D'Ottone
5e79fcd5b4
Added FREE_EXTRA_SEEN_FLAGS to Pokedex struct ( #4213 )
...
* Added FREE_EXTRA_SEEN_FLAGS to Pokedex struct
* Fixed SaveBlock1 comment (please squash)
* Separated FREE_EXTRA_SEEN_FLAGS for each SaveBlock
2024-02-19 18:42:56 +01:00
Eduardo Quezada
75ad61e5bf
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
# src/battle_ai_main.c
# src/battle_ai_util.c
# src/battle_tv.c
# src/data/battle_moves.h
# src/data/graphics/pokemon.h
2024-02-19 10:13:13 -03:00
Alex
57e0d7b20b
Partial fix for Teeter Dance and Ability Dancer interaction ( #4129 )
...
* Parial fix for Teeter Dance and Ability Dancer interaction
* Removes rest of teeter dance checks and make it work with effect_confuse
* Update test/battle/ability/dancer.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Update test/battle/ability/dancer.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2024-02-19 13:36:21 +01:00
Eduardo Quezada
5be97faf9d
Non-tagged
2024-02-18 22:09:08 -03:00
Eduardo Quezada D'Ottone
bb01ab6ff1
Version 1.7.4 ( #4203 )
...
* Version 1.7.4
2024-02-18 21:53:12 -03:00
kittenchilly
585e06e756
Move Tatsugiri and Squawkabilly base species icons to graphic root folders ( #4212 )
2024-02-18 21:30:52 +01:00
Alex
cd596fdd80
Adds Tidy Up + minor Dragon Cheer follow up ( #4136 )
...
* Adds Tidy Up + minor Dragon Cheer follow up
* improve tidy up script
* Add IncreaseTidyUpScore function
* remove useless calls
* 2 small tests and a correction for IncreasyTidyUpScore
2024-02-18 20:00:36 +01:00
Alex
7694628296
Adds Powerful status move flag ( #4125 )
...
* Adds Powerful status move flag
* fix flag
* fixed final issues
* review changes
2024-02-18 15:05:08 +01:00
Alex
7ab23cf426
Sets neutral nature and ability 0 as default in trainer control ( #4172 )
...
* Sets neutral nature and ability 0 as default in trainer control
* add config to generate a random ability
* minor correction
* move config to battle.h
* fixed compiling
2024-02-18 15:02:58 +01:00
