khbsd
|
38ba41b324
|
fix: better area mons handling, no longer duplicates hiddenMons field (#6945)
|
2025-05-30 17:22:05 +02:00 |
|
psf
|
9656400f88
|
Moved time constants to dedicated files (#7019)
|
2025-05-30 16:39:01 +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
|
647c786c53
|
Merge commit '07c897a' into pret-merge
Conflicts:
include/constants/heal_locations.h
map_data_rules.mk
|
2025-05-27 19:46:13 +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
|
4a442cc3e6
|
Merge commit '091b726' into pret-merge
Conflicts:
include/constants/heal_locations.h
map_data_rules.mk
|
2025-05-27 19:02:53 +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 |
|
jfb1337
|
ce9bbcc3b7
|
Fix trainers.party parser failing on apostrophes (#6938)
|
2025-05-21 10:41:18 +02:00 |
|
Eduardo Quezada
|
406fd7ce81
|
Expand trainerproc to support additional battle types (#6770)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-05-17 15:08:44 +02:00 |
|
Pawkkie
|
3f5335c4ba
|
Refactor AI flags to u64 (#6753)
Co-authored-by: DizzyEggg
|
2025-05-04 17:16:34 +02:00 |
|
AlexOn1ine
|
40bf9ae087
|
conflicts
|
2025-05-03 10:26:07 +02:00 |
|
Hedara
|
4fa48b6e89
|
Merge remote-tracking branch 'pret/master' into pret-merge-2025-05-02
|
2025-05-02 17:29:41 +02:00 |
|
Hedara
|
c8d3a6b4df
|
Added missing include due to g++ changes
|
2025-05-02 16:03:55 +02:00 |
|
PCG
|
f661f3b3ac
|
Pokedex Plus HGSS move configs (#6687)
|
2025-04-24 19:34:37 +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 |
|
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 |
|
khbsd
|
26f28103ec
|
Add Time-Based Encounters (#6454)
|
2025-04-09 09:49:09 +02:00 |
|
aronson
|
991065f25a
|
Support make check on macOS (#6513)
|
2025-04-01 21:52:49 +02:00 |
|
AlexOn1ine
|
ccebebf64f
|
31-03-25 Master merge
|
2025-03-31 18:23:46 +02:00 |
|
malad1211
|
190b916db0
|
Fix move names in learnset helper (#6510)
|
2025-03-31 13:41:51 +02:00 |
|
hedara90
|
b0c7d1a8ee
|
Made memory integrity checks run betweeen PARAMETRIZE runs (#6462)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-03-28 21:43:04 +01:00 |
|
khbsd
|
816ed0d963
|
Low Health Beeps Configuration (#6328)
|
2025-03-15 22:02:48 -07:00 |
|
Rachel
|
c7ac1a19df
|
Refactor teachable learnset helper (#6378)
|
2025-03-04 20:10:00 +01:00 |
|
Eduardo Quezada
|
2428af66cd
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-02-20 19:17:59 -03:00 |
|
GriffinR
|
cdadd7d2ed
|
Generate heal location constants automatically, move data back to a single file.
|
2025-02-03 20:25:11 -05:00 |
|
hedara90
|
88986baf5f
|
Trainer Party Pools (#5731)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-01-25 13:28:46 +01:00 |
|
Eduardo Quezada
|
a756bb501c
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-01-19 22:31:33 -03:00 |
|
Eduardo Quezada
|
f6a86a65ef
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-19 10:32:57 -03:00 |
|
Eduardo Quezada
|
937b3106b4
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-01-17 19:33:48 -03:00 |
|
Eduardo Quezada
|
ffc8903f93
|
More review addressing
|
2025-01-17 18:47:38 -03:00 |
|
Eduardo Quezada
|
17e224343f
|
Fixed whitespace issue with trainerproc (#6042)
|
2025-01-17 22:04:16 +01:00 |
|
psf
|
a7f77ed08d
|
Adds B_VAR_DIFFICULTY and related functions READ DESC (#5337)
Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2025-01-04 14:25:03 +01:00 |
|
Eduardo Quezada
|
89f90e1f69
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-01-03 13:58:10 -03:00 |
|
Alex
|
3db351359a
|
Clean up redundancy for mugshots (#5906)
|
2024-12-30 18:32:21 +01:00 |
|
Eduardo Quezada
|
05f300f6cc
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2024-12-20 15:22:14 -03:00 |
|
Alex
|
a45f18b9b7
|
Fixes Wormadam define for teachable learnset script (#5783)
|
2024-12-07 13:37:37 +01:00 |
|
Eduardo Quezada
|
d151e00c70
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2024-12-04 19:15:48 -03:00 |
|
Martin Griffin
|
c714caa27a
|
trainerproc: Fix showing incorrect error context (#5769)
|
2024-12-04 19:22:35 +01:00 |
|
Hedara
|
f6fdca615f
|
Merge branch 'master' into master-to-upcoming
|
2024-11-29 11:32:12 +01:00 |
|
cawtds
|
632ef149e0
|
Handle showdowns apostrophe the same way as ASCII apostrophe (#5712)
|
2024-11-24 20:42:14 +01:00 |
|
Eduardo Quezada
|
ee2535be96
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2024-11-03 12:21:22 -03:00 |
|
Martin Griffin
|
7f52fca8fe
|
Hydra: Support %p in test summaries (#5626)
|
2024-10-31 13:56:06 +01:00 |
|
Eduardo Quezada
|
3442b09852
|
Renamed folders and symbols to match species defines (#5581)
|
2024-10-27 20:15:11 +01:00 |
|
Martin Griffin
|
111a95951c
|
Fallback memmem implementation
|
2024-10-22 13:25:46 +01:00 |
|
Martin Griffin
|
1421ed1b24
|
Tests: detect task leaks (#5528)
|
2024-10-22 10:19:00 +02:00 |
|
GriffinR
|
0eb6d1d74c
|
Merge branch 'porymap-6' of https://github.com/pret/pokeemerald into generate-map-constants
|
2024-10-15 22:04:45 -04:00 |
|
GriffinR
|
da9c0239d9
|
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
|
2024-10-15 22:02:40 -04:00 |
|
Eduardo Quezada
|
80447bee8e
|
Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015
|
2024-10-15 20:56:56 -03:00 |
|