Bassoonian
53a46b7a29
Remove faulty teachable learnset moves ( #4039 )
2024-01-21 10:25:37 +01:00
Philipp AUER
73a1fa30e9
fix: emergency exit cutoff off by 1 on odd max hp ( #4040 )
...
* fix: emergency exit cutoff off by 1 on odd max hp
* squash!: newline at end of file
---------
Co-authored-by: sbird <sbird@no.tld>
2024-01-21 09:11:10 +01:00
Alex
d125da7797
Fixes Life Orb + Eject Pack / Red Card interaction ( #4038 )
...
* Fixes Life Orb + Eject Pack / Red Card interaction
* fix test
2024-01-20 22:48:34 +01:00
Alex
b0c76563bf
Fixes Psychic Noise, Aroma Veil interaction in doubles ( #4021 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-20 14:10:22 +01:00
Eduardo Quezada
89958a0dc0
Gen 4+ followers
2024-01-20 00:32:52 -03:00
Eduardo Quezada
48df87577b
Ascending frames
2024-01-19 23:50:52 -03:00
Eduardo Quezada
9ff599963c
0xFFFF -> TAG_NONE
2024-01-19 23:50:38 -03:00
Eduardo Quezada
e452ee93b9
Preparing ready for Gen 4+ followers
2024-01-19 23:06:32 -03:00
Zimmermann Gyula
58102e6fe8
Fix a typo in the Berry Exp. config setup. ( #4028 )
2024-01-19 23:58:58 +01:00
Eduardo Quezada D'Ottone
6857497f60
Debug menu tweaks ( #4025 )
...
* Moved Access PC to the first option of the PC/Bag debug submenu
* Prevent item give music from cutting off by having a shorter jingle
* Removed redundant "Give all TMs" option
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-01-19 21:06:21 +01:00
Eduardo Quezada
11b97597c8
Moved old mon graphics to its own folder so it's easier for the script to run
2024-01-19 14:52:34 -03:00
Eduardo Quezada
17a7c26b90
Reverted accidental INCBIN_COMPs
2024-01-19 14:27:11 -03:00
Eduardo Quezada
9d27aa7b70
Fixed Steelix, Lugia, Ho-Oh, Wailord, Kyogre and Rayquaza sizes
2024-01-19 14:26:43 -03:00
Eduardo Quezada
d1f02a8395
Centered follower sprite better in debug menu
2024-01-19 14:24:50 -03:00
Bassoonian
f3342de00b
Condense Oinkologne teachable learnsets ( #4026 )
...
* Condense Oinkologne teachable learnsets
* Fix redundant backslash
2024-01-19 17:01:14 +01:00
GriffinR
bcd5fc1481
Merge pull request #1972 from GriffinRichards/metatile-labels
...
Remove non-existent tilesets from label comments and alphabetize
2024-01-19 10:44:29 -05:00
Nephrite
89a632cfa4
Moved scripts array to src/data/battle_move_effects.h ( #3994 )
...
* Created gMoveBattleEffects array
* Renamed array to gBattleMoveEffects
Applied array in battle_util.c and battle_script_commands.c; doesn't build yet...
* Got it building...
* Added missing battle_tv effects
* Fixed and got it building
I'm an idiot sometimes
* Added battle_tv scores, encourage Encore flag
All works and builds just fine
* Merge fixes
* Reformatted battle_move_effects
Also tweaked struct, added macro
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-01-19 16:44:09 +01:00
GriffinR
1eadbc39da
Merge pull request #1973 from AsparagusEduardo/_pret/pr2/braces
...
Fixed braces style
2024-01-19 10:40:25 -05:00
Eduardo Quezada
1aa7fea14f
Made OW_GFX_COMPRESS into C ifs
2024-01-19 10:58:02 -03:00
Eduardo Quezada
d4f97c7a38
Fixed Groudon follower size
2024-01-19 10:42:21 -03:00
Eduardo Quezada
7e8ea89ded
Merge branch '_RHH/master' into _RHH/upcoming
2024-01-19 09:34:05 -03:00
tertu
179a0ea97a
Seed the RNG with the time in seconds in HQ mode ( #3812 )
2024-01-19 10:27:42 +00:00
Alex
d3dbfaf1af
Adds function AI_CalcMoveScore to more easily control score increases ( #3984 )
...
* Adds function AI_CalcMoveScore to more easily control score increases
2024-01-19 09:48:31 +00:00
Eduardo Quezada D'Ottone
fd5d5cd055
Fixed incorrect family toggle preproc blocks ( #4024 )
...
* Fixed incorrect family toggle preproc blocks
* More fixes
2024-01-19 09:28:51 +01:00
Eduardo Quezada
8cab1b7094
Fixed braces style
2024-01-18 17:07:17 -03:00
GriffinR
8e8d2f5efa
Remove non-existent tilesets from label comments and alphabetize
2024-01-18 14:31:04 -05:00
Eduardo Quezada
396a44cd17
Follower animation in debug menu
2024-01-18 15:54:36 -03:00
Bassoonian
1aff65029f
Deprecate GetBerryCountString ( #4012 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-01-18 18:59:42 +01:00
Eduardo Quezada
47578fc666
Unified loading of mon palettes
2024-01-18 13:33:49 -03:00
Eduardo Quezada
5233d0dc97
Showing followers in debug menu (no animation yet)
2024-01-18 12:00:11 -03:00
Eduardo Quezada
d53d34b3c5
Restored missing code
2024-01-18 09:36:39 -03:00
Eduardo Quezada
381a0bf8a1
Fixed compile issues
2024-01-18 09:10:20 -03:00
Eduardo Quezada
5d372b5f8a
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# README.md
# gflib/sprite.c
# graphics/object_events/pics/pokemon/togetic.png
# src/data/object_events/object_event_graphics.h
# src/data/object_events/object_event_graphics_info.h
# src/data/object_events/object_event_graphics_info_followers.h
# src/event_object_movement.c
# src/field_effect_helpers.c
2024-01-18 08:12:09 -03:00
Alex
9efdd9e0cd
Adds Move Shed Tail ( #4016 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-18 00:14:18 +01:00
fakuzatsu
cae58ca93e
fixed oversight causing chosen fossil to be lost if bag is full ( #3978 )
...
* fixed oversight causing chosen fossil to be lost
* fixed an error with my condition
* - conditional check and + underpass fossil check
2024-01-18 00:03:55 +01:00
Eduardo Quezada
ddc752eb14
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# asm/macros/event.inc
# data/field_effect_scripts.s
# data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
# data/script_cmd_table.inc
# graphics/pokemon/castform/sunny/anim_front.png
# graphics/pokemon/castform/sunny/normal.pal
# include/battle_util.h
# include/constants/event_object_movement.h
# include/constants/field_effects.h
# src/battle_controller_player.c
# src/battle_util.c
# src/data/object_events/movement_action_func_tables.h
# src/data/object_events/object_event_pic_tables.h
# src/data/trainer_graphics/back_pic_anims.h
# src/daycare.c
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/load_save.c
# src/scrcmd.c
# src/trainer_see.c
2024-01-17 18:11:35 -03:00
Eduardo Quezada D'Ottone
b20be66175
Max Soup ban now checks for mythicals instead of array ( #4017 )
...
* Removed sGigantaxFactorLockedSpecies to instead check for mythicals
* Applied review comments
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-17 13:08:34 -03:00
Bassoonian
1f9655ee2b
Fixed plural item names ( #4015 )
...
* Update items.h
* Update items.h
---------
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-01-17 16:53:12 +01:00
Eduardo Quezada
71fe6b34dc
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# include/battle_scripts.h
# src/battle_script_commands.c
2024-01-17 12:29:33 -03:00
Eduardo Quezada
cadaeb7074
Non-tagged
2024-01-17 11:52:04 -03:00
Eduardo Quezada D'Ottone
3636ff6d69
Version 1.7.2 ( #4013 )
...
* Version 1.7.2
* I got one more in me, couch
2024-01-17 11:51:00 -03:00
Eduardo Quezada D'Ottone
4c5e1317d5
Added Calyrex's blue Dynamax aura ( #4018 )
...
* Added Calyrex's blue Dynamax aura
* and
2024-01-17 15:43:09 +01:00
Alex
af27621579
Fixes effect field on Dragon Darts ( #4014 )
2024-01-17 09:44:15 -03:00
Ariel A
8a52316dd2
Reformatted for code review. Moved config to include/config/decap.h.
2024-01-17 01:12:04 -05:00
Alex
87472d4a6c
A few new gen 9 move animations ( #3989 )
...
* A few new gen 9 move animations
* draco meteor anim
tmp
* applied suggestions
* fix compile
* add more crystals to ice spinner
* further fixes
---------
Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
2024-01-16 19:33:49 -07:00
Alex
8f99ef16be
Adds Move Psychic Noise ( #4005 )
...
* Adds Move Psychic Noise
* changes psychic noise from effect to move_effect
* remove leftover
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-16 22:52:56 +01:00
psf
cdf7190d15
Add pluralName to gItems to allow the proper spelling when multiple items are received at once ( #4001 )
...
* Updated CopyItemNameHandlePlural to deal with plural names
* Fixed whitespace in a few places
* Fixed whitespace in a few places
* Add remaining plural forms.
* Created ITEM_NAME_PLURAL_LENGTH
* Updated ITEM_NAME_PLURAL_LENGTH per feedback https://github.com/rh-hideout/pokeemerald-expansion/pull/4001\#discussion_r1453598165
* Reverted ITEM_NAME_PLURAL_LENGTH to +2 and added new comment
* Removed GetBerryCountString from CopyItemNameHandlePlural
Will deprecate the former in a future feature: https://github.com/rh-hideout/pokeemerald-expansion/issues/4010
---------
Co-authored-by: Zimmermann Gyula <graiondilach@hotmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-16 19:05:41 +01:00
Bassoonian
9a1f6dfb64
Allow one-mon double battles ( #4007 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-01-16 18:24:49 +01:00
psf
778712b366
Added directory for migration scripts and added item_ball migration script ( #3997 )
...
* Created migration script README
Added Jasper's migration script to migration directory
* Updated relative file paths
* Moved from migration to migration_scripts
* Update migration_scripts/item_ball_refactor.py
Updated script per feedback
https://github.com/rh-hideout/pokeemerald-expansion/pull/3997#discussion_r1453367466
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-16 18:12:05 +01:00
Eduardo Quezada D'Ottone
e1cd7b61ed
Small CanFirstMonBoostHeldItemRarity optimization ( #4008 )
2024-01-16 13:45:09 -03:00
