ghoulslash
be3ee1ba85
merge w upcoming
2024-09-29 13:33:20 -04:00
Pawkkie
5908fbef9c
Wake-Up Slap test typo ( #5442 )
...
* Wake-Up Slap test typo
* Update test/battle/move_effect/wake_up_slap.c
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-09-29 12:34:34 -04:00
Pawkkie
5e027754c7
Add ShouldSwitch result to AiLogicData ( #5440 )
...
* Add ShouldSwitch to AiLogicData
* Convert shouldSwitch to bitfield
* Update include/battle.h
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Update include/battle.h
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-29 12:16:33 -04:00
Scyrous
1dc85df1f0
Update cable_car.c
2024-09-29 14:38:08 +02:00
Scyrous
8e2c3ca3f2
Bugfix for cable car sprite array count
2024-09-29 14:13:50 +02:00
Eduardo Quezada
5130ea9da3
Merge branch '_RHH/master' into _RHH/upcoming
2024-09-28 11:45:49 -03:00
Bassoonian
7dad83070f
Added MB_X_Y_STAIR_WARP metatile behaviors ( #5278 )
2024-09-28 15:21:11 +02:00
Bassoonian
580b9e3b84
Update src/metatile_behavior.c
2024-09-28 15:02:51 +02:00
Alex
1956376e0e
Use move effect for some moves instead of ids ( #5433 )
2024-09-28 02:46:52 -03:00
pkmnsnfrn
6cea365135
Merge branch 'upcoming' into stairWarps
2024-09-27 17:25:57 -07:00
pkmnsnfrn
874d4d0470
Removed switch case per https://github.com/rh-hideout/pokeemerald-expansion/pull/5278\#discussion_r1779197182
2024-09-27 17:19:58 -07:00
pkmnsnfrn
eb1469af1d
added curly braces per https://github.com/rh-hideout/pokeemerald-expansion/pull/5278\#discussion_r1779196726
2024-09-27 17:15:05 -07:00
pkmnsnfrn
796a598549
Combined lines per https://github.com/rh-hideout/pokeemerald-expansion/pull/5278\#discussion_r1779193552
2024-09-27 17:13:17 -07:00
pkmnsnfrn
cf2f85bdd7
Fixed identation per
...
https://github.com/rh-hideout/pokeemerald-expansion/pull/5278\#discussion_r1779192846
https://github.com/rh-hideout/pokeemerald-expansion/pull/5278#discussion_r1779195689
https://github.com/rh-hideout/pokeemerald-expansion/pull/5278#discussion_r1779196484
2024-09-27 17:12:20 -07:00
kittenchilly
c1dffc694e
Merge level_caps and ev_caps into one caps file ( #5429 )
...
* Merge level_caps and ev_caps into one caps file
* Update caps.h
2024-09-27 23:40:49 +02:00
GriffinR
80a37c16be
Remove explicit symbol sizes in sym_common.txt
2024-09-25 16:14:10 -04:00
PhallenTree
e67d5a23ed
Adds some Snatch interactions, fixes for Dragon Darts, Trace, Primal Reversion, Protosynthesis/Quark Drive ( #5430 )
...
* Fixes Electrified Dragon Darts sometimes targeting battlers with absorbing abilities (Volt Absorb, Motor Drive)
* Add Snatch interactions with Dancer, Swallow
* Trace fix + cleanup
* Simplify Quash
* Fixes multiple mons with Primal Reversion causing only one Primal Reversion, add tests
* Fix Booster Energy Ability Popup
* Accidentally removed healing from Swallow
* More Trace cleanup
2024-09-24 18:40:44 +02:00
psf
55086586c5
Revert 5422 ( #5424 )
2024-09-22 16:59:43 -07:00
ghoulslash
acd07ccfc1
add rocky helmet dmg to tangling hair + defiant test to ensure original battler IDs from chaining effects ( #5423 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-09-22 19:44:18 +02:00
psf
ad0778722b
Adds SAVE_TYPE_ERROR_SCREEN ( #5188 )
...
* Original commit
* Moved config from save to general https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720747901
Reindent function per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720747984
Split Compound String into seperate lines
per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720748104
Changed Rom to ROM per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720748104
Removed extra new line per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720748172
* fixed spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#issuecomment-2295134679
* Updated spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#issuecomment-2306527812
* Removed comment and made line breaks consistent per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#pullrequestreview-2320266015
2024-09-22 19:07:17 +02:00
psf
009b42394e
Merge branch 'upcoming' into stairWarps
2024-09-22 09:40:34 -07:00
Alex
b924461ae3
Clean up Unseen Fist Check ( #5420 )
...
* Clean up Unseedn Fist Check
* fix compiling
2024-09-22 16:41:26 +02:00
Bassoonian
918d45a623
Fix default tera type changing upon evolution/form change ( #5422 )
2024-09-22 16:33:17 +02:00
ghoulslash
bfa020da08
fix tile attributes
2024-09-22 09:19:58 -04:00
ghoulslash
b7246a018c
merge w upcoming
2024-09-22 09:13:25 -04:00
ghoulslash
ed005fc345
Fix affection check for exp multiplier ( #5421 )
2024-09-22 08:47:37 -04:00
Bassoonian
d122c0a222
Fix affection check for exp multiplier
2024-09-22 14:14:15 +02:00
Bassoonian
60e2c0f859
Merge item description branch history ( #5419 )
...
* Recreated ghoul's item_desc_header branch
Fixed tabs vs spaces
Fixing whitespace
* Fixed item in header not showing on maximum flash level
* Fixed item icon being affected by thunderstorms
* Shops now set the obtained item flag.
* Fixed build
* fix seashore house
* better soda pop fix, thx asparagus
* fix item icon showing in battle pyramid
* fix hiding item desc in battle pyramid
---------
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-09-22 12:05:45 +02:00
ghoulslash
d695a6240d
Convert settotemboost command to callnative ( #5418 )
...
* settotemboost use callnative
* Update src/battle_main.c
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-22 11:25:42 +02:00
Frank DeBlasio
1ba0875654
Removed FRONTIER_BRAIN_SPRITES and updated TRAINER_SPRITE, TRAINER_BACK_SPRITE, and TRAINER_CLASS ( #5166 )
...
* Removed FRONTIER_BRAIN_SPRITES
* Updated TRAINER_SPRITE and TRAINER_BACK_SPRITE
* Updated TRAINER_CLASS macro
* Removed FRONTIER_BRAIN_TEXTS
* Turned Frontier Brain text to COMPOUND_STRINGs
* Removed frontier_brain.inc from event_scripts.s
* Addressed front sprite comment
* Addressed backsprite comments
2024-09-22 09:54:01 +02:00
kleenxfeu
16e8be1233
Mega evolution animation is a little smoother ( #4816 )
...
* Smoother primal/mega animation
* Just to make the CI run. It needs to run
* Update src/battle_anim_effects_3.c
---------
Co-authored-by: kleeenexfeu <94004034+kleeenexfeu@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-21 23:47:19 +02:00
Bassoonian
832a7b286d
Update item_use.c ( #5415 )
2024-09-21 21:22:30 +02:00
Frank DeBlasio
d1bb7770d3
Converted berry and PokeBlock strings to COMPOUND_STRINGs ( #5324 )
...
* Converted bag pocket names to COMPOUND_STRINGs
* Converted berry-related text to COMPOUND_STRINGs
* Converted PokeBlock-related text to COMPOUND_STRINGs
* Added indexes to BerryFirmnessStrings
* Updated call to sBerryFirmnessStrings
* Changed gText to sText
2024-09-21 20:44:25 +02:00
Bassoonian
8ba96fdac4
Add OW_AUTO_SIGNPOST and associated metatile behaviors ( #5044 )
2024-09-21 20:39:07 +02:00
kittenchilly
39a8a77d3d
Play point animation when sending a follower into battle ( #5406 )
...
* Add point animation when sending a follower into battle
* Update trainers.h
2024-09-21 20:28:20 +02:00
kittenchilly
f7d2e62ccc
Fix Switcheroo giving score even if the opponent has no held item ( #5412 )
2024-09-21 18:51:08 +02:00
ghoulslash
4cd23a377d
anger shell use saveattacker ( #5409 )
...
* anger shell use saveattacker
* tabs instead of spaces
* add BattleScript_RestoreAttackerButItFailed for anger shell failure
* Update data/battle_scripts_1.s
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-20 18:19:45 +02:00
GriffinR
473e0623ba
Merge pull request #2031 from GriffinRichards/fix-toolchain
...
Minor toolchain fixes
2024-09-19 12:23:58 -04:00
GriffinR
8f41d9eb17
Merge branch 'master' into fix-toolchain
2024-09-19 12:20:51 -04:00
GriffinR
635325304b
Merge pull request #2033 from Kurausukun/goodbye_gflib
...
Remove gflib
2024-09-19 12:19:48 -04:00
Rose Silicon
64d4d7e570
Simplify HP Logic ( #5403 )
2024-09-19 18:03:13 +02:00
pkmnsnfrn
f0bd3c57da
Fixed spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044\#pullrequestreview-2315029773
2024-09-19 05:45:11 -07:00
psf
fee26e29f5
Add AUTO_SCROLL_TEXT and NUM_FRAMES_AUTO_SCROLL_DELAY ( #5054 )
...
* Added AUTO_SCROLL_TEXT
* Moved NUM_FRAMES_AUTO_SCROLL_DELAY
* Moved NUM_FRAMES_AUTO_SCROLL_DELAY per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054/files#r1698268265
* Apply suggestions from https://github.com/rh-hideout/pokeemerald-expansion/pull/5054/files#r1698268524
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Added ability to skip text with button press per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054\#issuecomment-2267100771
* Update gflib/text.h per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054#issuecomment-2274402891
* Update text.h
* Fixed alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054/files\#r1711780606
* Moved NUM_FRAMES_AUTO_SCROLL_DELAY
* Update gflib/text.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-09-19 12:01:12 +02:00
Alex
68c51f8412
Fixes Spiky Shield Counter interaction ( #5402 )
...
* Fixes Spiky Shield Counter interaction
* Update test/battle/move_effect/protect.c
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-09-19 12:00:32 +02:00
Alex
5cb1be7e5c
Minor Gem check optimazation ( #5401 )
...
Since the variable is only used once I removed it and replaced it with a direct call. Also the if statement is short enough to fit into one line.
very ocd induced change but I couldn't look away.
2024-09-19 10:58:56 +02:00
Alex
71dfd3e7c0
Ogerpon masks were missing their hold effects ( #5391 )
...
* Ogerpon masks were missing their hold effects
* fix wrong num
* test
* correct tests and additional fix
* added hold effect to battle debug
2024-09-19 00:25:53 +02:00
PhallenTree
76656e85c2
Fix Quash implementation, adds After You and Quash missing configs + tests ( #5400 )
...
* Fix Quash + After You and Quash configs
* Add tests
2024-09-19 00:10:29 +02:00
nescioquid
ac2b41ae71
Typo fixes and Growth move description change ( #5398 )
...
* changes Growth's move description to account for Gen 5+ behavior
* completes B_DIVE_BALL_MODIFIER comment
* fixes typos and incongruent spacing in various files
* Update src/data/moves_info.h
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-09-18 23:03:36 +02:00
Alex
6ef36837e9
Fixed corruption of the next turn used move caused by Scale Shot ( #5397 )
2024-09-18 16:58:49 +02:00
RavePossum
27db57f854
fallback on default BW popup theme to reduce potential for error ( #5392 )
2024-09-18 16:57:13 +02:00
