grintoul
|
5fb688bf27
|
Corrects music for FRLG maps and some functions (#9606)
|
2026-03-22 19:43:10 +01:00 |
|
FosterProgramming
|
77fa8e086b
|
Version specific tweaks of post whiteout script (#9521)
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2026-03-16 13:17:35 +01:00 |
|
Bassoonian
|
310f746565
|
Fix space indentation in .s and .inc files (#9371)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-02-27 12:45:00 -08:00 |
|
FosterProgramming
|
18acbf853d
|
Redraw money box after multi choice in bike shop script (#9331)
|
2026-02-25 17:27:38 +01:00 |
|
FosterProgramming
|
91a1278934
|
Fix region text when looking at map in frlg (#9347)
|
2026-02-25 15:19:09 +01:00 |
|
FosterProgramming
|
d56112cd78
|
Fix frlg coinbox window (#9336)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-02-25 08:17:46 +00:00 |
|
cawtds
|
97e83ebe6a
|
Add FRLG (#7423)
|
2026-01-28 17:41:12 +01:00 |
|
FosterProgramming
|
fe2c154b89
|
Refactor chooseboxmon (#8491)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2026-01-22 19:54:19 +01:00 |
|
Frank DeBlasio
|
e587cff9dd
|
Refactor exchange service corner (#8840)
|
2026-01-11 18:31:38 +01:00 |
|
FosterProgramming
|
8c9d3b9c7a
|
Add gym leader support for vs seeker and clean vs seeker code (#8172)
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2026-01-04 20:03:41 -08:00 |
|
FosterProgramming
|
30e5fc6958
|
Refactoring the way teachable learnsets are generated (#8027)
|
2025-12-26 13:13:29 +01:00 |
|
FosterProgramming
|
cbef5276e8
|
Fix slateport battle tent battle type (#8475)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2025-12-09 17:00:01 +01:00 |
|
Paccy
|
47e1ca999a
|
Add Chooseboxmon special (#5428)
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-12-04 22:46:55 +01:00 |
|
Salem
|
29f83ea5e0
|
Trainerbattle Type Differentiation (#6424)
Co-authored-by: CallmeEchoo <callmeechoo@github.com>
Co-authored-by: Your Name <you@example.com>
|
2025-12-01 19:28:09 +01:00 |
|
hedara90
|
58317e35b9
|
Cawt FRLG part 1 (#8396)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-11-30 09:28:36 -08:00 |
|
hedara90
|
4d43030df2
|
Revert "Add FRLG (Part 1)" (#8395)
|
2025-11-30 09:17:24 -08:00 |
|
hedara90
|
6f207521fa
|
Add FRLG (Part 1) (#7572)
|
2025-11-30 17:29:01 +01:00 |
|
AlexOn1ine
|
6a28506ee2
|
19/11/25 Master to upcoming merge
|
2025-11-19 18:20:30 +01:00 |
|
AlexOn1ine
|
ba74c076f6
|
pret merge
|
2025-11-16 12:01:13 +01:00 |
|
hedara90
|
f8e7a2db5f
|
Fix incorrect UBFIX checks (#2206)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-11-16 10:33:16 +00:00 |
|
PCG
|
d2425c1468
|
Move Relearners for TMs, Tutors and Egg moves (#8040)
Co-authored-by: khbsd <khb.dev@gmail.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-11-09 12:54:01 -08:00 |
|
FosterProgramming
|
232ddb04f4
|
porymap default settings (#8038)
|
2025-11-07 19:41:08 -08:00 |
|
Martin Griffin
|
1a9fbbcfba
|
Fix copyvar with non-var argument
|
2025-11-06 14:29:09 +01:00 |
|
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 |
|
Martin Griffin
|
d1d5435487
|
Improve undefined map assembler messages (#2196)
|
2025-10-29 21:34:03 -04:00 |
|
AlexOn1ine
|
6acabd4ba2
|
Master to upcoming merge
|
2025-10-25 16:19:32 +02:00 |
|
FosterProgramming
|
b4041535cf
|
Fix battle dome bug (again) (#8007)
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
|
2025-10-24 18:55:32 +02:00 |
|
FosterProgramming
|
5348de4abb
|
Banned species list (#8003)
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2025-10-23 21:29:33 +02:00 |
|
FosterProgramming
|
90c3a8cb2c
|
Fix battle dome pre round 1 waiting room (#7976)
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
|
2025-10-18 18:52:57 +02:00 |
|
cawtds
|
9d6fd719e8
|
rename bottom_frlg -> base_frlg
|
2025-09-28 02:31:36 +02:00 |
|
cawtds
|
8b9eacb945
|
add frlg suffix to all files/directories and remove unused data
|
2025-09-27 16:33:35 +02:00 |
|
cawtds
|
a266c307f5
|
add map data
|
2025-08-17 13:56:49 +02:00 |
|
Hedara
|
c0a50096f3
|
Merge commit '75642625439306f0cc5aed81177dc191f0d5950e' into merrp-merge
Conflicts:
include/constants/event_objects.h
src/event_object_movement.c
src/follower_helper.c
|
2025-06-25 17:54:59 +02:00 |
|
Hedara
|
1916703e5a
|
Merge commit '685a8a911878f54463845c9f2ebbf11bd04ff4ee' into merrp-merge
Conflicts:
include/battle_script_commands.h
include/constants/event_objects.h
include/event_object_movement.h
include/field_effect.h
include/field_effect_helpers.h
include/sprite.h
src/battle_controller_player.c
src/event_object_movement.c
src/pokeball.c
|
2025-06-25 17:49:19 +02:00 |
|
Ariel A
|
7564262543
|
Merge branch 'followers' into lighting
|
2025-06-24 20:44:44 -04:00 |
|
Ariel A
|
685a8a9118
|
Merge remote-tracking branch 'upstream/master' into followers
|
2025-06-24 20:39:12 -04: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 |
|
GriffinR
|
e2e3438674
|
Add missing uses of LOCALID_NONE for trainerbattle
|
2025-06-20 15:33:12 -04: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
|
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 |
|
GriffinR
|
929bc8b990
|
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
|
2025-05-14 11:50:11 -04:00 |
|
Eduardo Quezada
|
2428af66cd
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-02-20 19:17:59 -03:00 |
|
Ariel A
|
a4e032c28d
|
Merge branch 'followers' into lighting
|
2025-02-10 00:19:48 -05:00 |
|
Ariel A
|
ef05bbf394
|
Merge remote-tracking branch 'upstream/master' into followers
|
2025-02-10 00:11:38 -05:00 |
|
Frank DeBlasio
|
41882b267d
|
Consolidate duplicate dialogue of nature girl in Battle Frontier (#6195)
|
2025-02-08 12:51:22 -08:00 |
|
GriffinR
|
cdadd7d2ed
|
Generate heal location constants automatically, move data back to a single file.
|
2025-02-03 20:25:11 -05:00 |
|