Bassoonian
|
de6947a6e5
|
Fix spacing for conditions (#9369)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-02-27 15:10:52 +01:00 |
|
FosterProgramming
|
06aeabce5b
|
Fix ss anne disappearing early (#9334)
|
2026-02-25 07:25:33 +00:00 |
|
FosterProgramming
|
9f1cdbdcaa
|
Add wander around slower movement type (#9164)
|
2026-02-09 15:10:04 +01:00 |
|
Alex
|
829488e761
|
Merge branch 'upcoming' into master-merge-3
|
2026-01-30 12:55:34 +01:00 |
|
AlexOn1ine
|
396c64c22a
|
30/01/26 Master to upcoming merge
|
2026-01-30 12:49:21 +01:00 |
|
cawtds
|
97e83ebe6a
|
Add FRLG (#7423)
|
2026-01-28 17:41:12 +01:00 |
|
FosterProgramming
|
c468c9a5f7
|
Fix substitute follower appearing with dead party (#9028)
|
2026-01-27 14:17:26 +01:00 |
|
Bassoonian
|
fb4c8ef62c
|
More type checking across the repo (#8988)
|
2026-01-22 17:40:09 +01:00 |
|
FosterProgramming
|
e95b4de84e
|
Add trainers submenu for debug menu (#8399)
|
2025-12-27 16:57:13 +01:00 |
|
Martin Griffin
|
efced1d62c
|
Support NULLs in SpriteTemplate (#8292)
|
2025-12-03 19:57:08 +01:00 |
|
AlexOn1ine
|
6a28506ee2
|
19/11/25 Master to upcoming merge
|
2025-11-19 18:20:30 +01:00 |
|
FosterProgramming
|
e472d277d2
|
Fix light flickering when different types of light sprite are present (#8043)
|
2025-11-15 15:14:17 +01:00 |
|
Zimmermann Gyula
|
772abe6e7d
|
Implement GSC berry/apricorn tree functionality. (#7777)
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-11-14 20:28:55 +01:00 |
|
AlexOn1ine
|
6acabd4ba2
|
Master to upcoming merge
|
2025-10-25 16:19:32 +02:00 |
|
Marky
|
c3735c5bd0
|
Fix OW Pokémon VObjects (#7991)
|
2025-10-21 11:23:05 +02:00 |
|
FosterProgramming
|
f6c6ed6956
|
Fix follower NPC sidewaystair movement (#7909)
|
2025-10-16 13:37:36 +02:00 |
|
khbsd
|
e385c7f59f
|
feat: change defines in constants/abilities.h to an enum (#7006)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-09-29 21:35:09 +02:00 |
|
hedara90
|
5aac8bb7e4
|
Removed superflous palette compression check (#7718)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-09-11 16:14:23 +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
|
bc73f4654b
|
merge master 31/07/25
|
2025-08-01 12:18:11 +02:00 |
|
Eduardo Quezada
|
d801556a97
|
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727
|
2025-07-27 11:59:07 -04:00 |
|
AlexOn1ine
|
68db4c5a77
|
12/07/25 master to upcoming merge
|
2025-07-12 11:55:06 +02:00 |
|
GriffinR
|
0c7c81e02f
|
Merge branch 'master' into _pret/pr/pyramidLocation
|
2025-06-30 11:51:45 -04:00 |
|
Hedara
|
3ce34c41b6
|
Merge commit '1f2fe7396b68d82da356b93fca10cc5736d3159c' into merrp-merge
Conflicts:
include/follower_helper.h
src/follower_helper.c
|
2025-06-25 17:20:38 +02:00 |
|
Ariel A
|
1f2fe7396b
|
feat: added abnormal weather follower message
Includes support for follower matching != species
|
2025-06-24 20:19:23 -04:00 |
|
Bassoonian
|
1a6ed20713
|
Add dedicated getter functions for Pokémon types and abilities (#7043)
|
2025-06-03 22:05:22 +02:00 |
|
Bassoonian
|
c5c7bb13c9
|
Converts a bunch of defines to enums (#7041)
|
2025-06-02 15:54:37 +02:00 |
|
Hedara
|
9d80ad530d
|
Merge branch 'master' into master-to-upcoming
Conflicts:
Makefile
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
data/maps/MtChimney/scripts.inc
data/maps/MtPyre_Summit/scripts.inc
data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
include/constants/event_objects.h
include/constants/expansion.h
src/battle_script_commands.c
src/battle_util.c
src/field_screen_effect.c
|
2025-05-28 14:26:15 +02:00 |
|
Hedara
|
c27930eabf
|
Merge commit '678fdf9' into pret-merge
Conflicts:
data/maps/BirthIsland_Exterior/scripts.inc
data/maps/DesertUnderpass/scripts.inc
data/maps/Route117/scripts.inc
data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
data/maps/SootopolisCity/scripts.inc
include/constants/event_objects.h
src/battle_setup.c
src/event_object_movement.c
src/field_control_avatar.c
src/item_use.c
src/scrcmd.c
tools/mapjson/mapjson.cpp
|
2025-05-27 19:22:40 +02:00 |
|
Hedara
|
9bfef357a2
|
Merge commit 'e4e90ea' into pret-merge
Conflicts:
src/battle_setup.c
src/field_specials.c
src/menu_helpers.c
src/pokedex_area_screen.c
src/roamer.c
src/script.c
|
2025-05-27 18:53:30 +02:00 |
|
Bivurnum
|
ddff74e8f9
|
Bug fix: add proper elevation handling for npc followers (#6871)
|
2025-05-16 09:54:22 +02:00 |
|
GriffinR
|
929bc8b990
|
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
|
2025-05-14 11:50:11 -04:00 |
|
Bivurnum
|
49ae82c679
|
changed remove check from objId to localId for npc followers
|
2025-04-28 10:58:35 -05:00 |
|
hedara90
|
5dfbdf56da
|
27/04/25 Master to upcoming merge (#6701)
|
2025-04-27 18:01:50 +02:00 |
|
Bivurnum
|
47723c34e5
|
Follower NPCs (follow-me) (#6500)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-04-27 14:56:18 +02:00 |
|
AlexOn1ine
|
e246b20e72
|
27/04/25 Master to upcoming merge
|
2025-04-27 09:50:25 +02:00 |
|
hedara90
|
d1aa49cca3
|
Remove compressed palettes (#6455)
|
2025-04-26 22:58:40 +02:00 |
|
hedara90
|
6fdb6a9e34
|
Fixed broken palette load for shiny followers in the sprite visualizer (#6683)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-04-23 12:17:54 +02:00 |
|
Hedara
|
9afd8800f3
|
Merge branch 'upcoming' into merrps-dns
|
2025-04-12 16:33:02 +02:00 |
|
Hedara
|
11df205d89
|
Merge branch 'nemo-merrp-fix' into merrps-dns
|
2025-04-11 18:50:24 +02:00 |
|
Bassoonian
|
708bb4a831
|
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge10apr
|
2025-04-10 23:57:57 +02:00 |
|
Hedara
|
d78afca94f
|
More shadow options and documentation
|
2025-04-10 22:41:38 +02:00 |
|
Hedara
|
b075163c57
|
Cleanup and config options
|
2025-04-10 21:17:20 +02:00 |
|
cawtds
|
1672d99060
|
make linkDirection more robust to member reordering
|
2025-04-09 13:40:39 +02:00 |
|
Hedara
|
08a2ad2c98
|
Merge branch 'upcoming' into merrps-dns
|
2025-04-09 10:01:51 +02:00 |
|
Deokishisu
|
eaf7549854
|
Replace Incorrect Slow Stairs Movement with Correct One (#6275)
|
2025-03-16 14:51:36 -07:00 |
|
Eduardo Quezada
|
1895e6263b
|
Applied a proper fix to blending
|
2025-02-23 16:44:05 -03:00 |
|
Eduardo Quezada
|
4492f02171
|
Fixed follower palettes not blending
|
2025-02-20 22:27:02 -03:00 |
|
Eduardo Quezada
|
ce71dc1adb
|
Removed unused function
|
2025-02-20 19:52:23 -03:00 |
|
Eduardo Quezada
|
2428af66cd
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-02-20 19:17:59 -03:00 |
|