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
c4323a230f
Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# include/data.h
2024-02-22 11:24:19 -03: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
Ariel A
11def0fcc5
Optimized IsLZ77Data to return size.
2024-02-20 20:36:48 -05: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
ead108d28e
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# src/data/graphics/pokemon.h
2024-02-19 13:49:10 -03:00
Eduardo Quezada
70924c64b4
Better handling of disabling followers
2024-02-19 13:11:53 -03: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
Ultimate_Bob
d608af5662
Copy null terminator when decapping player name. ( #4206 )
2024-02-18 10:24:21 +01:00
Eduardo Quezada D'Ottone
3d2e0d2065
Fixed Ursaluna's cry using P_GEN_9_CROSS_EVOS ( #4210 )
2024-02-18 10:21:56 +01:00
Eduardo Quezada
1a4bc69c5a
Moved follower settings to overworld config
2024-02-18 00:16:59 -03:00
Eduardo Quezada
f350000b44
Option to disabling follower Pokémon
2024-02-17 23:49:52 -03:00
Eduardo Quezada
124c17d315
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# README.md
# data/field_effect_scripts.s
# data/maps/AncientTomb/scripts.inc
# data/maps/DesertRuins/scripts.inc
# data/maps/IslandCave/scripts.inc
# data/scripts/follower.inc
# graphics/object_events/pics/pokemon/wailord.png
# graphics/object_events/pics/pokemon_old/substitute.png
# include/constants/event_objects.h
# include/global.h
# remote_build.sh
# spritesheet_rules.mk
# src/bike.c
# src/data/object_events/object_event_anims.h
# src/data/object_events/object_event_graphics.h
# src/data/object_events/object_event_graphics_info_followers.h
# src/data/object_events/object_event_pic_tables.h
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/field_screen_effect.c
# src/overworld.c
# src/palette.c
# src/pokemon_summary_screen.c
# src/scrcmd.c
# src/trainer_see.c
2024-02-17 23:40:08 -03:00
Eduardo Quezada
ed4a291b37
Revert Object Event change from vanilla
2024-02-17 18:09:11 -05:00
Ariel A
195d2bb79a
Merge branch 'followers' into followers-expanded-id
2024-02-17 17:19:01 -05:00
Ariel A
6bceacf403
Added override table for standalone follower palettes.
2024-02-17 16:55:11 -05:00
Wesmaster
45cee8124d
Fixed LastUsedBall not being saved and DisplayBall not being shown ( #4209 )
...
In #4168 b7d7709#4200 . The sizeof was done on the variable instead of the struct. This caused other variables in EWRAM to loose their value. I have no idea if this fix breaks what was intented to do in #4168 .
Also fixed the issue reported in my comment. When you run out of balls gLastThrownBall has a value, but you enter the if statement because you have no more balls. There the next in line ball is set to display but if there are non there is nothing to display. Afterwards when you get a new ball, you do not enter the if statement to update the gBallToDisplay because the ball is in the bag and gLastThrownBall is still set to not 0. Then it's checked if the bag has gBallToDisplay which does not point to a ball and therefor nothing is shown. Now we only update gBallToDisplay if there is actually a ball to display.
2024-02-17 20:26:45 +01:00
Alex
d102467d8d
AI PR 4036 follow up ( #4199 )
2024-02-16 19:18:43 +01:00
Eduardo Quezada D'Ottone
fcc2839346
Fixed missing Z-Move power override ( #4201 )
2024-02-16 19:18:26 +01:00
Eduardo Quezada
ebe13ffc3c
Merge branch '_RHH/master' into _RHH/upcoming
2024-02-16 11:30:01 -03:00
Ariel A
4afb386ab4
Added .git-blame-ignore-revs to hide whitespace-only changes from blame.
2024-02-15 23:06:05 -05:00
Ariel A
725252905b
Merge branch 'merrp/pr/style' into followers
2024-02-15 22:49:36 -05:00
Ariel A
afbb88d77a
Undo (most) indentation changes.
2024-02-15 22:24:20 -05:00
Ariel A
f861504cfc
Undo map.json changes.
2024-02-15 22:23:59 -05:00
MelonSpeedruns
20a3d91de7
Fixed Basculegion Back Sprite Offset & Greninja forms animations ( #4198 )
2024-02-15 15:56:32 -03:00
LOuroboros
1f349e0fb9
Renamed NUM_ABILITY_VANILLA to NUM_ABILITY_PERSONALITY ( #4196 )
2024-02-15 15:22:25 +01:00
Bassoonian
6a61e6525e
Fix height call ( #4195 )
2024-02-15 13:07:31 +01:00
psf
cc22fef6c8
- Fixes Seedot and Lotad House to give measurements based on the unit system and decimal seperator chosen by the developer. ( #4193 )
...
- Created `ConvertMonHeightToString` and `ConvertMonWeightToString` for developers to use
2024-02-15 10:23:11 +01:00
cmy2008
ab2260a81e
Deleted a space ( #4194 )
2024-02-15 10:21:35 +01:00
