psf
|
d01442299a
|
Running from trainer battles properly handles whiteouts (#9228)
|
2026-02-16 22:58:57 +01:00 |
|
psf
|
03c63f5e4a
|
NO_WHITEOUT now prevent forfeits from B_RUN_TRAINER_BATTLE (#9112)
|
2026-02-02 18:35:58 +00:00 |
|
AlexOn1ine
|
15d9342fe5
|
30/11/25 master to upcoming merge
|
2025-11-30 14:57:50 +01:00 |
|
FosterProgramming
|
21c4200421
|
Fix debug battle flag never being cleared (#8357)
|
2025-11-27 21:12:23 +01:00 |
|
AlexOn1ine
|
93cc143134
|
conflicts
|
2025-11-11 13:12:00 +01:00 |
|
FosterProgramming
|
8eea132406
|
Fix missing FREE_MATCH_CALL (#8171)
Co-authored-by: Zimmermann Gyula <graiondilach@hotmail.com>
|
2025-11-09 09:16:19 -08:00 |
|
grintoul1
|
c230e54678
|
Master to Upcoming merge 20251107
|
2025-11-07 22:45:57 +00:00 |
|
FosterProgramming
|
97b115d572
|
Adds an auto-generated include file of script commands (#8156)
|
2025-11-06 21:10:42 -08:00 |
|
FosterProgramming
|
be7646b67a
|
Allow vs seekers to work with script not starting with trainerbattle (#8062)
Co-authored-by: pkmnsnfrn <pkmnsnfrn@gmail.com>
|
2025-11-06 10:16:19 -08:00 |
|
Bassoonian
|
fb660061ab
|
Converts some defines to enums and name unnamed enums (#8019)
|
2025-10-23 18:06:29 +02:00 |
|
FosterProgramming
|
a595696086
|
Update fishing odds to match official games (#7574)
|
2025-10-04 09:05:28 -07:00 |
|
AlexOn1ine
|
a4470cac2c
|
Master to upcoming merge
|
2025-09-27 22:42:53 +02:00 |
|
Estellar
|
2f69b44f81
|
Added missing LOCALID_NONE (#7783)
|
2025-09-25 14:52:00 +02:00 |
|
mudskipper13
|
59a214828e
|
Implement field_name_box (#7697)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-09-14 20:45:18 +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 |
|
Frank DeBlasio
|
c9ec896312
|
Refactor battle environment (#4891)
|
2025-07-12 12:38:06 -04:00 |
|
GriffinR
|
0c7c81e02f
|
Merge branch 'master' into _pret/pr/pyramidLocation
|
2025-06-30 11:51:45 -04:00 |
|
Nephrite
|
a18709fb47
|
Bag refactor (groundwork for expansion) (#7018)
|
2025-06-18 10:59:24 +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 |
|
Eduardo Quezada
|
17e570407e
|
Remove trailing whitespace (#6968)
|
2025-05-23 22:33:12 +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 |
|
Bassoonian
|
54806c8838
|
Add no-whiteout feature (#6795)
|
2025-05-17 11:20:35 +02:00 |
|
GriffinR
|
929bc8b990
|
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
|
2025-05-14 11:50:11 -04: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
|
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 |
|
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 |
|
GriffinR
|
709cfa1c9a
|
Merge pull request #2014 from Bassoonian/battleterrain
Rename battle terrain to environment
|
2025-04-13 19:32:06 -04:00 |
|
psf
|
17d851e1f9
|
Add B_RUN_TRAINER_BATTLE - players can run from Trainer Battles (#6456)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-10 14:59:58 +02:00 |
|
kittenchilly
|
058bf58b7b
|
Match current gen behavior for battle environment after fishing (#6099)
|
2025-01-26 22:39:14 +01:00 |
|
Salem
|
01e8d8233e
|
Trainer Battle Parameter Consolidation (#5982)
|
2025-01-25 22:02:39 +01:00 |
|
Bassoonian
|
a1c47a931f
|
Revert "Converts a bunch of defines to enums" (#6082)
|
2025-01-22 21:50:39 +01:00 |
|
Eduardo Quezada
|
af884b1be4
|
Cleaned up Debug Menu (#6070)
|
2025-01-22 15:27:08 +01:00 |
|
Bassoonian
|
a3ce3a569d
|
Converts a bunch of defines to enums (#6071)
|
2025-01-21 21:19:41 +01:00 |
|
Mercy
|
21d2e40f0a
|
Fix Match Call Behavior (#5931) (#6033)
|
2025-01-16 21:23:12 -08:00 |
|
Eduardo Quezada
|
29ef1cf9ad
|
Stick to the new name
|
2024-12-05 21:00:55 -03:00 |
|
GriffinR
|
9f31b0fe90
|
Generate local IDs from map.json files
|
2024-10-12 03:04:24 -04:00 |
|
GriffinR
|
e4e90eacd6
|
Merge pull request #2023 from Bassoonian/updatemapmacros
Fix defines in MAP_NUM and MAP_GROUP
|
2024-09-19 12:17:16 -04:00 |
|
Eduardo Quezada
|
831b394ca1
|
Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909
# Conflicts:
# Makefile
# include/battle.h
# include/battle_main.h
# include/battle_util.h
# include/data.h
# make_tools.mk
# map_data_rules.mk
# src/battle_setup.c
# src/fieldmap.c
|
2024-09-11 15:26:14 -03:00 |
|
Martin Griffin
|
56d3faa32f
|
Merge pull request #2025 from Bassoonian/cleandefinespaces
Clean up defines lacking spaces
|
2024-08-21 19:04:12 +01:00 |
|
GriffinR
|
3f49c5cbaf
|
Fix trainer match call flags
|
2024-08-15 23:00:20 +02:00 |
|
Bassoonian
|
c1ee43254e
|
Clean up defines lacking spaces
|
2024-08-15 19:34:56 +02:00 |
|
Eduardo Quezada
|
18980b20a3
|
Remove trailing whitespace (master) (#5174)
|
2024-08-14 19:48:20 -07:00 |
|
Bassoonian
|
5fefd743a2
|
Fix defines in MAP_NUM and MAP_GROUP
|
2024-08-14 13:02:40 +02:00 |
|
Bassoonian
|
367f6dc8fd
|
Address concerns
|
2024-07-13 18:01:54 +02:00 |
|
Bassoonian
|
003bd54600
|
Rename battle terrain to environment
|
2024-07-13 12:02:18 +02:00 |
|
Eduardo Quezada
|
fcdc9ed65a
|
Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
# src/battle_util.c
# src/data/pokemon/species_info/gen_7_families.h
# test/battle/ability/download.c
# test/battle/ability/intimidate.c
# test/battle/ability/supreme_overlord.c
# test/battle/ability/zero_to_hero.c
# test/battle/ai/ai.c
# test/battle/move_effect/plasma_fists.c
|
2024-07-05 14:25:25 -04:00 |
|