psf
|
cc8694d26d
|
Clarifies when to use each merge type for maintainers (#6999)
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2025-05-28 17:22:11 +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
|
7d1833f277
|
1.11.3 release
|
2025-05-27 20:33:27 +02:00 |
|
Bivurnum
|
494a04cd76
|
Add follower NPC documentation (#6704)
|
2025-05-26 17:05:54 +02:00 |
|
surskitty
|
8a960e77f7
|
Beefing up the DNS tutorial for some of the common questions/errors. (#6922)
|
2025-05-24 23:06:51 -04:00 |
|
Eduardo Quezada
|
17e570407e
|
Remove trailing whitespace (#6968)
|
2025-05-23 22:33:12 +02:00 |
|
psf
|
591c8cc69c
|
Updated CONTRIBUTING.md and Merge Freeze definition (#6952)
|
2025-05-22 09:29:13 +02:00 |
|
Eduardo Quezada
|
5f0a853e74
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/isOnPlayerSide
|
2025-05-12 20:58:27 -04:00 |
|
Alex
|
006abe097e
|
Add AI_FLAG_PREDICT_MOVES (#6551)
|
2025-05-12 23:10:10 +02:00 |
|
Eduardo Quezada
|
13071f7019
|
Added IsOnPlayerSide
|
2025-05-12 13:53:15 -04:00 |
|
hedara90
|
e587757fa6
|
Added JSON as the preferred data format (#6801)
|
2025-05-09 15:15:48 +02:00 |
|
Pawkkie
|
c7ee329433
|
Full functionality
|
2025-05-08 16:45:10 -04:00 |
|
Pawkkie
|
5e2a066eda
|
Add AI_FLAG_PP_STALL_PREVENTION to ai_flags.md (#6756)
|
2025-05-03 10:48: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 |
|
Hedara
|
accb85554a
|
Expansion 1.11.2 Release
|
2025-04-30 11:23:05 +02:00 |
|
khbsd
|
6b8e680139
|
Remove hardcoded values from wild_encounter.h generation (#6640)
Co-authored-by: Moos Toet <moostoet@hotmail.com>
|
2025-04-20 22:27:36 +02:00 |
|
khbsd
|
0534e7a87b
|
Add Time-Based Encounter Tutorial (#6568)
|
2025-04-14 23:13:25 -04:00 |
|
Hedara
|
9afd8800f3
|
Merge branch 'upcoming' into merrps-dns
|
2025-04-12 16:33:02 +02:00 |
|
Bassoonian
|
d86aedfd32
|
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into mastertoupcoming12apr
|
2025-04-12 14:59:06 +02:00 |
|
hedara90
|
a243b97907
|
Documentation (#6576)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-04-11 12:52:12 +02:00 |
|
Hedara
|
301ef288f5
|
Review comments
|
2025-04-11 11:37:36 +02:00 |
|
Hedara
|
d78afca94f
|
More shadow options and documentation
|
2025-04-10 22:41:38 +02:00 |
|
psf
|
7ff50e3586
|
Fix broken links in merge_checklist.md (#6570)
|
2025-04-10 15:38:51 +02:00 |
|
Hedara
|
76a08abeaa
|
Updated documentation
|
2025-04-09 12:59:03 +02:00 |
|
Hedara
|
e419606a10
|
Merge branch 'upcoming' into merrps-dns
|
2025-04-09 12:48:18 +02:00 |
|
Hedara
|
2210e2d410
|
Merge branch 'master' into upcoming-master
|
2025-04-09 11:06:38 +02:00 |
|
Hedara
|
08a2ad2c98
|
Merge branch 'upcoming' into merrps-dns
|
2025-04-09 10:01:51 +02:00 |
|
Eduardo Quezada
|
ce1943904a
|
Consolidated "How to add Pokémon" tutorials (#6541)
|
2025-04-07 22:44:59 +02:00 |
|
aronson
|
991065f25a
|
Support make check on macOS (#6513)
|
2025-04-01 21:52:49 +02:00 |
|
psf
|
2e6c62ff54
|
Add CONTRIBUTING.md and STYLEGUIDE.md (#6340)
Co-authored-by: HackMD <37423+hackmd-hub[bot]@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2025-04-01 15:38:59 +02:00 |
|
Hedara
|
e350bea168
|
Expansion 1.11.1 Release
|
2025-03-30 14:55:51 +02:00 |
|
hedara90
|
002e674497
|
Update docs/changelogs/1.11.x/1.11.0.md
|
2025-02-27 10:27:14 +01:00 |
|
Hedara
|
4f6733f45d
|
1.11.0 Release
|
2025-02-27 10:07:50 +01:00 |
|
Hedara
|
06d31bc8ea
|
Merge branch 'master' into final-1.10-master-upcoming-merge
|
2025-02-26 22:07:10 +01:00 |
|
Pawkkie
|
ce0491dffa
|
Update SCOPE.md with Intergenerational Feature Compatibility (#6325)
|
2025-02-24 16:41:10 -05:00 |
|
Eduardo Quezada
|
9b139510b4
|
Moved Follower FAQ to new 1.11 "how to add new pokemon" tutorial
|
2025-02-23 16:50:00 -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
|
e09ac1d969
|
Update how_to_testing_system.md (#6281)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-02-19 18:07:54 +01:00 |
|
Eduardo Quezada
|
ee1b75614d
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-30 22:46:06 -03:00 |
|
Eduardo Quezada
|
397e98b954
|
Version 1.10.2 (#6144)
|
2025-01-30 18:38:28 -03:00 |
|
Eduardo Quezada
|
3fc9b0195d
|
Cleaned up code to align with previous review comments
|
2025-01-26 17:14:00 -03:00 |
|
PhallenTree
|
4158f9251f
|
Fix Powder (status) config and some terrain timers not using gBattleTurnCounter (#6109)
|
2025-01-26 13:06:11 +01:00 |
|
Frank DeBlasio
|
4e8ddebb8d
|
Updated trainer pic tutorial (#6049)
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
|
2025-01-25 19:36:19 -05:00 |
|
Pawkkie
|
43e41bbed8
|
Add Code Entry functionality (#5951)
|
2025-01-25 22:03:08 +01:00 |
|
hedara90
|
88986baf5f
|
Trainer Party Pools (#5731)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-01-25 13:28: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 |
|
psf
|
b109aa0c92
|
Cleaned up Trainer Slides, added automated Trainer Slide tests, add new Enemy Critical Hit Slide (#6018)
|
2025-01-23 16:28:33 +01:00 |
|
Eduardo Quezada
|
ed505cfb5f
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-21 19:32:51 -03:00 |
|