Frank DeBlasio
c9ec896312
Refactor battle environment ( #4891 )
2025-07-12 12:38:06 -04:00
mudskipper13
aae04ffc84
Improve trainer back pic-related data and code (+ smol documentation) ( #6821 )
2025-06-30 23:50:48 +02:00
Hedara
51a5577f65
Merge branch 'master' into master-upcoming
...
Conflicts:
src/battle_controller_safari.c
src/data/moves_info.h
src/graphics.c
2025-06-25 14:17:07 +02:00
Hedara
726f18f360
Merge remote-tracking branch 'pret/master' into pret-merge
...
Conflicts:
asm/macros/event.inc
data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
data/scripts/trainer_hill.inc
include/graphics.h
2025-06-24 10:42:24 +02:00
DizzyEggg
e1b83d6056
Match graphics declarations with externs ( #2089 )
2025-06-23 20:31:18 +01:00
wiz1989
e63ac48de2
added Ash Greninja overworld sprites ( #6976 )
2025-06-07 09:57:43 +02:00
hedara90
0917af214c
Replace all usages of lz compression with smol ( #7032 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-31 19:47:54 +02:00
Hedara
90aed43c27
Merge branch 'master' into master-upcoming
...
Conflicts:
.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
.github/ISSUE_TEMPLATE/03_feature_requests.yaml
.github/ISSUE_TEMPLATE/04_other_errors.yaml
.github/pull_request_template.md
src/battle_controller_player.c
src/battle_main.c
src/battle_script_commands.c
src/battle_util.c
src/data/graphics/pokemon.h
src/data/pokemon/species_info/gen_9_families.h
test/battle/ability/flower_veil.c
test/battle/ability/sweet_veil.c
test/battle/ability/synchronize.c
test/battle/ability/water_bubble.c
test/battle/move_effect/fell_stinger.c
test/battle/move_effect/level_damage.c
test/battle/move_effect/magic_room.c
test/battle/move_effect/me_first.c
test/battle/move_effect/sky_drop.c
test/battle/move_effect/smack_down.c
test/battle/move_effect/wish.c
test/battle/move_flags/ignore_type_if_flying_and_ungrounded.c
2025-05-22 15:41:08 +02:00
kittenchilly
75f6d85582
Improve a few Gen 9 Pokemon sprites ( #6885 )
2025-05-17 19:48:44 +02:00
AlexOn1ine
33607529cd
conflicts
2025-05-16 10:46:32 +02:00
kittenchilly
7359d234c8
PokeCommunity sprites batch (April 2025) ( #6840 )
2025-05-16 09:35:30 +02:00
Hedara
0eeba00d1b
Merge branch 'master' into master-upcoming-2025-04-30
...
Conflicts:
include/battle.h
include/constants/expansion.h
include/graphics.h
src/battle_bg.c
src/battle_util.c
src/data/graphics/battle_terrain.h
src/data/graphics/pokemon.h
src/pokeblock_feed.c
src/pokemon_sprite_visualizer.c
2025-04-30 15:22:37 +02:00
Cafe
b451bc3606
New Lurantis animation ( #6725 )
2025-04-30 12:45:29 +02:00
Hedara
4873589c65
Merge remote-tracking branch 'pret/master' into new-pret-merge
...
Conflicts:
asm/macros/battle_script.inc
data/battle_anim_scripts.s
include/battle.h
include/battle_controllers.h
include/battle_setup.h
include/constants/battle.h
src/battle_anim_normal.c
src/battle_anim_utility_funcs.c
src/battle_bg.c
src/battle_controllers.c
src/battle_main.c
src/battle_script_commands.c
2025-04-29 20:27:33 +02:00
hedara90
d1aa49cca3
Remove compressed palettes ( #6455 )
2025-04-26 22:58:40 +02:00
GriffinR
709cfa1c9a
Merge pull request #2014 from Bassoonian/battleterrain
...
Rename battle terrain to environment
2025-04-13 19:32:06 -04:00
Alex
f3c76e866b
Fix potential compile error caused by sTeraIndicatorDataPtrs ( #6599 )
2025-04-13 19:06:44 +02:00
hedara90
cf98d764ad
Gimmick Indicator refactor ( #6553 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-10 23:56:26 +02:00
Hedara
a3a48c59b8
Merge remote-tracking branch 'pret/master' into pret-merge-2025-03-29
2025-03-29 14:21:29 +01:00
Hedara
521432b269
Renamed a berry tag variable
2025-03-24 13:47:47 +01:00
Hedara
06d31bc8ea
Merge branch 'master' into final-1.10-master-upcoming-merge
2025-02-26 22:07:10 +01:00
hedara90
4cf219e5c7
Resized gimmick indicators to reduce VRAM usage ( #6319 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-22 12:28:53 -03:00
khbsd
4fc56128d0
Add Mega Evo, Primal Reversion, and Ultra Necrozma OW sprites ( #5874 )
...
Co-authored-by: kittenchilly <mario.pikmin.zelda@gmail.com>
2025-01-30 22:29:20 -03:00
Eduardo Quezada
a34a3cad36
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-26 22:57:11 -03:00
Cafe
37b6f031c8
Duraludon battle animation ( #6086 )
2025-01-26 17:27:05 +01:00
Eduardo Quezada
ed505cfb5f
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-21 19:32:51 -03:00
kittenchilly
4bcb07a6a7
Add Clodsire second frame and fixed Grookey backsprite + overworld ( #6047 )
2025-01-20 09:49:20 +01:00
moostoet
3b19f6972b
Rename Furfrou Species tags to match Pokemon Showdown exports ( #6041 )
2025-01-17 14:39:52 -03:00
Eduardo Quezada
9a0b5756ca
Fix "PlantCloak" references ( #5821 )
2024-12-20 22:25:18 +01:00
kittenchilly
a669c4c109
New Enamorus-Incarnate sprite ( #5797 )
2024-12-13 15:26:12 +01:00
Eduardo Quezada
dfa3690d74
Added config to disable gender differences ( #5595 )
2024-10-29 15:38:26 +01:00
Alex
76eae8ed00
Decouple Poke Ball ids from item ids ( #5560 )
2024-10-28 18:03:15 +01:00
Eduardo Quezada
3442b09852
Renamed folders and symbols to match species defines ( #5581 )
2024-10-27 20:15:11 +01:00
Eduardo Quezada
358c0d0699
Added back GBA sprites via config ( #5206 )
...
* Add back older sprites
* Graphics config
* Added GBA most graphical data to gSpeciesInfo
* Footprints are now affected by P_GBA_SPECIES_GFX + removed duplicated files
* GBA mon icons
* Split GBA footprints into separate config
* Separated GBA icons into their own config
* Fixed GBA icons depending on P_GBA_SPECIES_GFX instead of P_GBA_ICONS
* Moved GBA sprites to regular folder with prefix
* Renamed configs
* Temporarely disabled shadows when GBA sprites are enabled
* Removed remaining files from pokemon_old folder
2024-10-18 13:37:00 +02:00
Eduardo Quezada
ee00c251ae
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-08 14:52:12 -03:00
hedara90
f8f4fc9afd
Removed old checksum matching workaround ( #5480 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-10-08 14:02:31 +02:00
kittenchilly
19009c6d21
Add support for overworld sprite gender differences + add all the sprites ( #5394 )
2024-10-04 17:56:21 +02:00
kittenchilly
a135876dc0
Remove trailing whitespace pass 10-2-2024 (Upcoming) ( #5456 )
2024-10-02 21:20:23 +02:00
kittenchilly
d5560bbc87
Remove trailing whitespace pass 10-2-2024 (Master) ( #5455 )
2024-10-02 21:20:02 +02:00
Eduardo Quezada
5130ea9da3
Merge branch '_RHH/master' into _RHH/upcoming
2024-09-28 11:45:49 -03: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
Liamjd14
5d8c61d813
Pokemon follower changes for issue #5135 ( #5336 )
2024-09-12 18:55:30 +02:00
Liamjd14
e9c0784dc0
Gen 9 Follower pokemon sprites ( #5304 )
...
* Gen 9 Follower Sprites
2024-09-05 22:31:14 +02:00
Cafei
213c097dc0
Paldean Wooper and Clodsire followers ( #5277 )
2024-08-28 11:47:08 +02:00
Hiram Anderson
36a5c6ed4f
Basculin graphics config fix ( #5256 )
...
This fixes a compilation error that occurs if OW_POKEMON_OBJECT_EVENTS is true but P_HISUIAN_FORMS is false.
2024-08-25 10:03:33 +02:00
Hedara
a9492f5b1c
Fixed Xerneas
2024-08-06 16:52:42 +02:00
Hedara
29bb658d1b
Fixed some overworld palettes
2024-08-06 13:25:26 +02:00
Eduardo Quezada
cc00446eb8
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info/gen_9_families.h
2024-07-26 09:42:52 -04:00
hedara90
7a4df80f89
Added Ogerpon Tera Sprites ( #4996 )
...
* Added Ogerpon Tera Sprites
* Updated references to Ogerpon Tera forms
* Fixed back sprite offsets and color indices for Hearthflame Tera
* Removed Ogerpon data duplicates
---------
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-07-23 11:55:07 -04:00
Eduardo Quezada
0b02527e5c
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# test/test_runner.c
2024-07-21 13:36:07 -04:00
