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
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
Bassoonian
8ba96fdac4
Add OW_AUTO_SIGNPOST and associated metatile behaviors ( #5044 )
2024-09-21 20:39:07 +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
Sadfish the Sad
f6319d8446
new animations for many moves more details in description ( #5367 )
...
New: Me First, Zippy Zap, Splishy Splash, Floaty Fall, Pika Papow, Bouncy Bubble, Buzzy Buzz, Sizzly Slide, Glitzy Glow, Baddy Bad, Sappy Seed, Freezy Frost, Sparkly Swirl, Veevee Volley, Snap Trap, Astral Barrage, Burning Bulwark
Updated: Aura Sphere, Dark Void, Spirit Shackle
Fixed: Springtide Storm, Bleakwind Storm, Wildbolt Storm, Sandsear Storm, Clangorous Soul(Blaze)
2024-09-15 08:22:40 +02:00
psf
1ba8e7d300
Merge branch 'upcoming' into signpost
2024-09-12 14:45:37 -07:00
Eduardo Quezada
551c558186
Merge branch '_RHH/master' into _RHH/upcoming
2024-09-11 07:28:02 -03:00
Eduardo Quezada
cdf781f726
Fixed Toxic Thread stat increase ( #5369 )
2024-09-11 11:18:58 +02:00
Alex
5089b1d0b4
Adds callnative for soundproofcheck to addtionally check the flag ( #5301 )
...
* Adds callnative for soundproofcheck to addtionally check the flag
* rename callnative, include parish song and missing ability recording
2024-09-09 06:52:26 -03:00
hedara90
d62b7270c8
Fixed trainerslide arguments ( #5344 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-09 10:49:05 +02:00
SonikkuA-DatH
8c3531ffc7
Grass/Water Pledge Swamp Animation + Sea of Fire animation tweak ( #5325 )
2024-09-07 18:04:47 +02:00
Salem
90089ecf51
add debug build target ( #4817 )
...
* add debug build target
* fix maybe uninitialized error
* add option to undef NDEBUG
* debug for agbcc
* init instead of ignore to not break agbcc
* make clean removes modern and agbcc artifacts. explicit use of -O0 again for NOOPT
* automatically enable debug menu when building for debug
* automatically enable debug menu when building for debug
* automatically enable debug menu when building for debug
* clean up previous mess omg
* remove preproc around debug menus
* automatically enable debug menu when building for debug
* clean up previous mess omg
* Apply suggestions from code review
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Update Makefile
* Update field_control_avatar.c
* make debug print independent
* remove unwanted changes
* remove trailing endif
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-09-07 10:13:22 -04:00
psf
0e1b62c732
Merge branch 'upcoming' into signpost
2024-09-05 17:11:32 -07:00
Frank DeBlasio
3aa24f527e
Converted Mechadoll text to COMPOUND_STRINGs ( #5276 )
2024-09-04 14:56:19 -04:00
cawtds
6e3ce9db2f
Move battle anim arrays to C ( #5306 )
...
* move battle anim arrays to c
* use ARRAY_COUNT instead
* remove B_ANIM_STATUS_WRAPPED
* move anim rename
* rename battle anims status/general/special
2024-09-04 11:21:40 +02:00
Eduardo Quezada
8533b0c045
Merge branch '_RHH/master' into _RHH/upcoming
2024-09-03 14:39:50 -04:00
ghoulslash
28a9ad3399
(Default Off) Item Description Headers ( #4767 )
...
* add item descption headers and (default-off) config
* revert test script
* OW_SHOW_ITEM_DESCRIPTIONS can be 0(off), 1(first time) or 2(always), move code to overworld.c to prevent issues with users whove merged original branch. fix styling
* add ow item header config value labels
* Update include/config/overworld.h
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Update src/overworld.c
* Update include/overworld.h
* ScriptShowItemDescription remove unused var
* fix ScriptShowItemDescription warning
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-03 20:22:01 +02:00
Alex
e09a59a7e4
Fixes Tar Shot on Tera mons ( #5302 )
...
* Fixes Tar Shot on Tera mon
* new line
2024-08-31 12:24:28 -04:00
psf
95167936d4
Merge branch 'upcoming' into signpost
2024-08-31 07:02:18 -07:00
Eduardo Quezada
aebbe448b8
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-28 12:58:14 -04:00
psf
23134cec85
Merge branch 'upcoming' into signpost
2024-08-27 21:31:07 -07:00
PhallenTree
930cac6aca
Fix Instruct bypassing AtkCanceler, Entry Hazards targeting wrong side of the field if opponent fainted ( #5262 )
...
* Fix Instruct bypassing AtkCanceler + interaction with firstTurnOnly moves
* Fix Entry Hazards targeting the wrong side of the field if opponent fainted
* Remove unused BattleScript_AuroraVeilEnds and STRINGID_AURORAVEILENDS
* Alternative fix + Fix gBattlerTarget initially set to 2
* Fix Instruct animation
* Alternative anim fix
2024-08-27 14:46:56 +02:00
kittenchilly
8d47db6160
Add Population Bomb animation ( #5194 )
...
* Population Bomb animation
* Update battle_anim_new.c
* Update battle_anim_new.c
2024-08-25 23:39:25 +02:00
Eduardo Quezada
abf60e9c64
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-24 19:44:35 -04:00
Alex
5a320f94d2
Fixes Hyperspace Fury softlock ( #5237 )
...
Fixes #5236
2024-08-21 11:43:57 -04:00
Eduardo Quezada
6ac18a6fe5
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-20 08:00:05 -04:00
Alex
bde6982890
Fixes weather abilities not activating when Cloud Nine user leaves th… ( #5209 )
...
* Fixes weather abilities not activating when Cloud Nine user leaves the field
* parametrize
2024-08-20 07:24:48 -04:00
PhallenTree
ec3a86dd9a
Adds in-battle effect of Pickup, adds Harvest and Pickup tests ( #5170 )
...
* Adds Harvest tests
* Adds Pickup in-battle effect + tests
* Fix G-Max Replenish test (Munchlax activates Pickup before G-Max Replenish)
* Change canPickupItem to bit field
* Make RandomUniformExcept inclusive (higher end) + convert bitfield
* Use CantPickupItem in PickupHasValidTargetc check
* Review
2024-08-16 15:37:23 +02:00
Eduardo Quezada
fe275ef062
Teatime animations use B_WAIT_TIME_LONG ( #5173 )
2024-08-15 13:45:01 +02:00
Eduardo Quezada
18980b20a3
Remove trailing whitespace (master) ( #5174 )
2024-08-14 19:48:20 -07:00
Eduardo Quezada
661ec0a9fd
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-14 17:10:20 -04:00
Alex
4d78d5e507
Fixes Poltergeist missing accuracy check ( #5168 )
2024-08-14 12:07:01 -04:00
Sadfish the Sad
fde85e9357
some gen 9 move anims + fickle beam rework ( #5159 )
...
* new move anims + fickle beam rework
* more fickle beam changes
* removed the true for consistency
* ficklebeamboosted gets cleared now
* mortal spin and thunderclap changes
* minor mortal spin pal change
* removed hex numbers and made hard press quicker
2024-08-14 17:20:18 +02:00
Eduardo Quezada
113f8de9b1
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_controller_player.c
2024-08-08 13:22:49 -04:00
PhallenTree
67f049fddb
Fixes Defiant interaction with Court Changed Sticky Web + Fickle Beam description ( #5093 )
...
* Fixes Court Changed Sticky Web deactivating Defiant/Competitive
* Fixes Fickle Beam's description
* Alternative fix
* Remove extra newLine
2024-08-06 10:45:30 +02:00
cawtds
3af93bdfee
FRLG+ whiteout message ( #4967 )
...
* FRLG whiteout message + post whiteout event
2024-08-02 08:28:05 -07:00
Eduardo Quezada
b4eca0a6ec
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# data/battle_anim_scripts.s
# src/battle_util.c
2024-07-29 09:36:16 -04:00
kittenchilly
904d59220d
Shorten squish anim
2024-07-28 11:55:57 -05:00
kittenchilly
9979fe01ac
Update battle_anim_scripts.s
2024-07-28 11:47:49 -05:00
kittenchilly
f22666c2a3
Merge branch 'master' into axekick-anim
2024-07-28 11:46:14 -05:00
Eduardo Quezada
18aff2db3b
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# asm/macros/battle_anim_script.inc
# data/battle_anim_scripts.s
# include/constants/battle_anim.h
# src/battle_anim.c
# src/data/battle_anim.h
2024-07-27 16:26:37 -04:00
Eduardo Quezada
1e8773356c
Changed EVO_OVERWORLD_STEPS to use an EWRAM variable ( #5047 )
...
* Changed EVO_OVERWORLD_STEPS to use an EWRAM variable
* Fixed PC swapping not resetting the follower steps
2024-07-27 20:48:59 +02:00
hedara90
b0b63f66b9
Added Ivy Cudgel Animation ( #5034 )
...
* Added Ivy Cudgel Anim, changed Ogerpon palettes, added jumpifmovetypeequals command
* Make the 20 year old compiler not complain
* Maybe better cudgel
* Moved animation
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-26 18:06:44 +02:00
pkmnsnfrn
bf11e0c27b
Revert metatile behavior
2024-07-25 20:23:04 -07:00
pkmnsnfrn
2a5f384e66
Added metatile behaviors to mart and center signs
2024-07-25 19:44:26 -07:00
kittenchilly
b4792d3f7e
Add Axe Kick animation
2024-07-25 14:06:02 -05:00
Eduardo Quezada
98eb4e5027
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# asm/macros/battle_script.inc
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
# src/frontier_util.c
# test/battle/ai/ai.c
2024-07-19 09:20:05 -04:00
Alex
552e2768da
Fixes to Opportunist and Mirror Herb adjustments ( #4928 )
...
* Replace Opportunist todo tests with proper tests
* add failing test
* desc
* Fixes to Opportunist and Mirror Herb adjustments
* more tests
* some fixes
* first turn events switch
* simple enum + revert test desc
2024-07-19 11:01:46 +02:00
pkmnsnfrn
8445d44fb6
Renamed DoPicboxCancel to UseBlankMessageToCancelPokemonPic
2024-07-15 21:48:24 -07:00
pkmnsnfrn
28183ec299
first merge of ghoul's branch
2024-07-15 21:35:58 -07:00
