Hedara
|
b0ccddac69
|
Merge branch 'master' into master-to-upcoming
Conflicts:
include/constants/expansion.h
|
2025-11-03 11:11:07 +01:00 |
|
Hedara
|
5c31b58b81
|
Merge commit 'd1d543548772cbdf087c5ccc1e0b19980aa9ad87' into pret-merge
Conflicts:
spritesheet_rules.mk
tools/mapjson/mapjson.cpp
|
2025-11-01 15:13:16 +01:00 |
|
Hedara
|
a2ef3284dd
|
Merge branch 'master' into master-to-upcoming
Conflicts:
data/battle_scripts_1.s
include/battle_util.h
include/constants/battle.h
src/battle_script_commands.c
src/battle_util.c
|
2025-10-29 18:42:59 +01:00 |
|
Bivurnum
|
6ddabde582
|
New Feature: ORAS Dowsing (#7211)
|
2025-10-27 17:41:07 +01:00 |
|
Raymond Dodge
|
95d98305dd
|
Add camera-facing right-walking Krabby and Kingler follower sprites (#7881)
|
2025-10-26 11:45:40 +01:00 |
|
AlexOn1ine
|
6acabd4ba2
|
Master to upcoming merge
|
2025-10-25 16:19:32 +02:00 |
|
Josh
|
fa5ca10b17
|
Add spritesheet rules for healthbox graphics (#2180)
|
2025-10-19 18:32:19 +01:00 |
|
hedara90
|
358f3211ca
|
Fix nicknames containing many / overflowing the party screen textbox (#7970)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-10-17 20:17:35 +02:00 |
|
AlexOn1ine
|
e365add4cf
|
15/10/25 Master to upcoming merge
|
2025-10-15 21:31:00 +02:00 |
|
FosterProgramming
|
d84d5cb0d4
|
Fix pikachu starter icon (#7879)
|
2025-10-08 10:36:30 +02:00 |
|
Eva
|
4822d94667
|
Nickit & Thievul visual revamp (#7689)
|
2025-09-16 13:04:17 +02:00 |
|
mudskipper13
|
59a214828e
|
Implement field_name_box (#7697)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-09-14 20:45:18 +02:00 |
|
pokesidv
|
4d31693005
|
Rock climb by ghoulslash (#7432)
Co-authored-by: Evan <eroelke@gmail.com>
Co-authored-by: Jaizu <jaizu85@gmail.com>
Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-08-03 14:52:07 +02:00 |
|
AlexOn1ine
|
68db4c5a77
|
12/07/25 master to upcoming merge
|
2025-07-12 11:55:06 +02:00 |
|
Linathan
|
9228826ae1
|
New and polished battle animations (#7074)
|
2025-07-11 19:14:19 +02:00 |
|
Phantonomy
|
809379797e
|
Better Hydrapple Backsprite (Adapted from DegelAlex on deviantart (#7246)
|
2025-07-10 23:43:43 -04:00 |
|
mudskipper13
|
0d09e5cce8
|
battle_interface: overhaul ability pop up (#7227)
|
2025-07-10 19:09:52 +02:00 |
|
wiz1989
|
e63ac48de2
|
added Ash Greninja overworld sprites (#6976)
|
2025-06-07 09:57:43 +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 |
|
GriffinR
|
f11bddf854
|
Fixes for Mirage Tower graphics (#2120)
* Add documentation for CreateCeilingCrumbleSprites
* Combine mirage tower graphics
* Add comment about mirage tower / player palette
|
2025-04-14 08:12:45 +02:00 |
|
GriffinR
|
709cfa1c9a
|
Merge pull request #2014 from Bassoonian/battleterrain
Rename battle terrain to environment
|
2025-04-13 19:32:06 -04:00 |
|
Hedara
|
348f5967ac
|
Remove Ampharos .pla files
|
2025-04-12 16:35:45 +02:00 |
|
Hedara
|
9afd8800f3
|
Merge branch 'upcoming' into merrps-dns
|
2025-04-12 16:33:02 +02:00 |
|
agsmgmaster64
|
1344d8e9dd
|
Type Effectiveness Indicators when selecting moves (#6559)
|
2025-04-12 01:03:45 +02:00 |
|
Hedara
|
08a2ad2c98
|
Merge branch 'upcoming' into merrps-dns
|
2025-04-09 10:01:51 +02:00 |
|
SundayMoonday
|
bbe8bbc45b
|
Replaced Blue Sky background for Rock Field (#6516)
|
2025-04-07 11:04:21 +02: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 |
|
Eduardo Quezada
|
8c57172f2a
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-02-20 19:46:02 -03:00 |
|
Eduardo Quezada
|
fe7ed22f5b
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-02-20 19:44:00 -03:00 |
|
Eduardo Quezada
|
2428af66cd
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-02-20 19:17:59 -03:00 |
|
hedara90
|
290ddfb9ad
|
Fixed Kecleon Shiny palette (#6298)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-02-19 18:07:40 +01:00 |
|
hedara90
|
cad1a37566
|
Tachyon Cutter and Salt Cure animations (#6182)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-02-05 15:27:21 +01:00 |
|
Eduardo Quezada
|
64c5113b23
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-02-02 14:18:13 -03:00 |
|
Eduardo Quezada
|
7c6eda21b1
|
Added missing in-battle "Move Info" button prompt (#6155)
|
2025-02-01 18:47:36 +01: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 |
|
hedara90
|
e1e3bcfa91
|
Tera starstorm (#6073)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-01-26 11:08:46 +01:00 |
|
Eduardo Quezada
|
26daf15ce0
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-01-24 18:29:28 -03: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 |
|
khbsd
|
52666fb545
|
IV/EV Info on Summary Screen (#6027)
|
2025-01-20 09:41:31 +01:00 |
|
Eduardo Quezada
|
a756bb501c
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-01-19 22:31:33 -03:00 |
|