Commit graph

14713 commits

Author SHA1 Message Date
Bassoonian
c8c97edf89
Update teachable_learnsets.h (#4064) 2024-01-24 18:52:26 +01:00
Bassoonian
78708cad55
Adds universal move array (#4052)
* Add universal move list

* Exclude TM illiterates from learning universal moves

* Add config for literacy checks

* Fix config check

* Update src/pokemon.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Other review remarks

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-01-24 11:45:22 -03:00
Eduardo Quezada D'Ottone
6d1d6a5d5f
Fixed test battle move category assumptions (#4051)
* Fixed move category assumptions

* Update test/battle/ai_check_viability.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-24 10:43:57 +01:00
Bassoonian
4c21c85ee2
PLA Items (#3825)
* Add PLA item data

* Add most item sprites

* Incorporate review feedback
2024-01-23 18:24:58 +01:00
Eduardo Quezada
00e2ca6030 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	data/battle_scripts_1.s
#	include/constants/battle_move_effects.h
#	src/battle_ai_util.c
#	src/battle_script_commands.c
#	src/battle_tv.c
#	src/data/battle_moves.h
#	src/data/pokemon/species_info/gen_9.h
2024-01-22 15:56:10 -03:00
Alex
91f429b5e5
Fixes Glimmering Charm (#4047)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-01-22 13:55:08 +01:00
Bassoonian
b99ec5d43c
Update level_up_learnsets.h (#4046) 2024-01-22 00:07:19 +01:00
Alex
0ec777dd24
Fixes Mind Blown / Magic Guard interaction and renames Steel Beam effect (#4043)
* Fixes Mind Blown / Magic Guard interaction and renames Steel Beam effect

* review fixes

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-21 23:42:01 +01:00
Ninjdai
7ba3f53d42
Add ITEMS_COUNT and ITEM_NAME_LENGTH to RHH rom header (#3988)
* Add item count to RHH rom header

There was no way for an external program to access the ITEMS_COUNT.

* Add items.h include

* Add itemNameLength to RHH rom header

* Added padding for additional u8s

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Change itemsCount to a u16

* Fix padding (again)

* Update src/rom_header_rhh.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-21 18:25:43 -03:00
Mathew Arnold
a01d442f36
Fixed Kingra's learnset gen (#4044)
In level_up_learnsets.h, Kingdra's learnset was inside a check for P_GEN_4_CROSS_EVOS. As a Gen 2 Pokemon, this has been updated to check for P_GEN_2_CROSS_EVOS instead.
2024-01-21 18:23:55 +01:00
Bassoonian
9286b80866
Remove illegal moves from teachable learnsets (#4042)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-01-21 13:02:45 +01:00
Alex
35e2157c09
Fixes ability Corrosion (#4037)
* Fixes ability Corrosion

* forgot AI_CanPoisonType

* More tests

* review comments applied

* more review changes

* simplify CanPosionType (original state)

* remove redundant function

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-21 12:27:58 +01:00
Alex
04fa3aa725
Fixes Emergency Exit when hp is restored over tag out range (#4041)
* Fixes Emergency Exit when hp is restored over tag out range

* Update test/battle/ability/emergency_exit.c

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-21 11:08:25 +01:00
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
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
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
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
Bassoonian
1aff65029f
Deprecate GetBerryCountString (#4012)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-01-18 18:59:42 +01: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 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
Alex
bb190d33dd
Fix stat drop in doubles for single target moves (#4003)
* Fix stat drop in doubles for single target moves

* Update test/battle/move_effect/pay_day.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/battle/move_effect/pay_day.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/battle/move_effect/sp_atk_two_down.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/battle/move_effect/sp_atk_two_down.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-01-16 09:25:40 -03:00
Frank DeBlasio
0bdac90cfe
Refactor mugshots (#4000)
* Refactor battle mugshots
The battle mugshot transitions have been merged into the one transition id and are now loaded depending on the trainer data.

Two new fields have been added to struct Trainer; mugshotEnabled and mugshotColor. mugshotEnabled is the toggle for loading the mugshot transition when set to TRUE and mugshotColor is the color of the mugshot for that particular trainer.

The Elite Four and Champion have been updated so their mugshots are correctly loaded when you battle them.

A bug has also been fixed where if the player starts on a tile that has an active field effect, the player's sprite will use the palette of the opponent's sprite.

* Added a new folder in src/data named battle_transitions.

The two look ups for the opponent rotation scaling and coords have been put into their own files and added into this new folder.

The coords look up has also been changed to use the  struct.

* Fixed errors with modern that were preventing compile

* Added mugshot coords to gTrainerSprites

* Added rotation scales to gTrainerSprites

* Replaced tabs with spaces

* Incorporated comments

* Added battle_transition include back to data.c

* Fixed alignment issues in Mugshots_CreateTrainerPics

---------

Co-authored-by: pkmnsnfrn <pkmnsnfrn@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-01-16 00:45:13 +01:00
Bassoonian
e8a238a775
Exp yield configs (#3995)
* Gen 1 exp yield config

* I'm a dumdum

* Gen 2 configs

* Exp yield configs up to gen3

* Gen 4 configs

* Gen 5 configs

* Configs up to gen6

* Gen7 configs

* Final form exp adjustments
2024-01-15 23:49:12 +01:00
Bassoonian
1182368330
Fix battle frontier random loss (#3990)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-01-15 22:07:27 +01:00