khbsd
|
38ba41b324
|
fix: better area mons handling, no longer duplicates hiddenMons field (#6945)
|
2025-05-30 17:22:05 +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 |
|
Martin Griffin
|
372553b319
|
Explicit -std=gnu17 in CPPFLAGS to mirror CFLAGS (#6839)
|
2025-05-26 09:33:17 +02:00 |
|
AlexOn1ine
|
35dff24c9b
|
Master to upcoming merge
|
2025-05-15 20:37:27 +02:00 |
|
hedara90
|
9924ae3391
|
Make make clean work again (#6848)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-15 10:40:35 +02:00 |
|
mudskipper13
|
ad0e98bb12
|
Prevent scaninc touching tests when make-ing non-test builds (#6812)
|
2025-05-15 10:15:22 +02:00 |
|
Hedara
|
1abfa7acfa
|
Merge branch 'master' into master-upcoming
Conflicts:
include/battle.h
include/constants/battle_string_ids.h
src/battle_ai_util.c
src/battle_main.c
src/battle_util.c
test/battle/ai/ai.c
|
2025-05-12 18:21:35 +02:00 |
|
hedara90
|
2bc82a886a
|
Add AUTO_GEN_TARGETS for .party files and map_groups_count, but on master (#6824)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-11 22:37:11 +02:00 |
|
PCG
|
f661f3b3ac
|
Pokedex Plus HGSS move configs (#6687)
|
2025-04-24 19:34:37 +02:00 |
|
Hedara
|
2210e2d410
|
Merge branch 'master' into upcoming-master
|
2025-04-09 11:06:38 +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 |
|
Rachel
|
c7ac1a19df
|
Refactor teachable learnset helper (#6378)
|
2025-03-04 20:10:00 +01:00 |
|
Eduardo Quezada
|
cd84e07341
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-23 23:01:25 -03:00 |
|
RavePossum
|
2aa0ee3de8
|
Add dependency on json files to learnset helper (#6083)
|
2025-01-23 00:20:07 +01:00 |
|
Eduardo Quezada
|
cacd07db9a
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-17 13:49:32 -03:00 |
|
RavePossum
|
536f386bed
|
Explicitly specify dependencies for teachable learnset helper (#6015)
|
2025-01-13 00:01:47 +01:00 |
|
hedara90
|
846734e894
|
Ported Makefile fix from upcoming (#6007)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-01-11 21:53:15 +01:00 |
|
Martin Griffin
|
7f2b76d597
|
Fix Makefile rules so that test.elf builds in build/test (#6004)
|
2025-01-11 11:29:51 -03:00 |
|
Eduardo Quezada
|
8821779815
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-11 08:07:15 -03:00 |
|
psf
|
71cf1bfaa7
|
Updated Makefile to allow for the creation of specific tests (#5993)
|
2025-01-11 07:25:04 +00:00 |
|
Eduardo Quezada
|
004efd1e5a
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2024-12-31 18:38:03 -03:00 |
|
Eduardo Quezada
|
009de5c98c
|
Setting Battle configs during tests (#5803)
Co-authored-by: sbird <sbird@no.tld>
|
2024-12-29 23:28:39 +01:00 |
|
DizzyEggg
|
6a2a3b2540
|
remove fno-toplevel-reorder
|
2024-12-21 14:30:15 +01:00 |
|
GriffinR
|
dbff8c4360
|
Merge branch 'porymap-6' into generate-map-constants
|
2024-12-09 20:25:41 -05:00 |
|
kittenchilly
|
ec60c6536c
|
Merge branch 'master' into upcoming-pret-merge-nov
|
2024-11-30 10:49:37 -06:00 |
|
Hedara
|
2125bee3cd
|
Merge remote-tracking branch 'pret/master' into pret-to-master
|
2024-11-29 13:36:26 +01:00 |
|
GriffinR
|
6560bbab21
|
Restore .map file creation
|
2024-11-23 14:17:40 -05:00 |
|
Eduardo Quezada
|
e005ffb576
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2024-11-06 10:01:48 -03:00 |
|
Bassoonian
|
6d38e260d6
|
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge5nov
|
2024-11-05 10:31:40 +01:00 |
|
GriffinR
|
f04c2faeb0
|
Silence 'Nothing to be done for generated' messages (#2059)
|
2024-11-03 23:53:53 +01:00 |
|
Eduardo Quezada
|
fa8e1782d0
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2024-10-30 11:08:50 -03:00 |
|
RavePossum
|
0a830b5a5a
|
Restore test file dependencies so they're rebuilt properly (#5617)
|
2024-10-30 09:20:50 +01:00 |
|
Eduardo Quezada
|
5d4ab8cc7e
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2024-10-27 08:02:45 -03:00 |
|
RavePossum
|
a2c64b0ed0
|
Fix unnecessary dependency scanning for test build and test rom names
|
2024-10-26 18:13:04 -04:00 |
|
Eduardo Quezada
|
f88046b1c3
|
Re-removed agbcc for new Makefile
|
2024-10-17 06:26:55 -03:00 |
|
Eduardo Quezada
|
bb5aaa4005
|
Restored Debug build
|
2024-10-17 00:30:20 -03:00 |
|
Eduardo Quezada
|
d58bbe2a6f
|
Removed all instances of gflib from ld_scripts
|
2024-10-16 09:44:48 -03: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 |
|
Eduardo Quezada
|
80447bee8e
|
Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015
|
2024-10-15 20:56:56 -03:00 |
|
luckytyphlosion
|
a55c75d350
|
Get rid of common syms (#2040)
|
2024-10-14 23:52:11 -04:00 |
|
mid-kid
|
253d3dd7ef
|
Remove unnecessary looping for rule generation and unroll macros (#2046)
|
2024-10-14 23:47:07 -04:00 |
|
GriffinR
|
9f31b0fe90
|
Generate local IDs from map.json files
|
2024-10-12 03:04:24 -04:00 |
|
mid-kid
|
2c7964dbc2
|
Fix deleting files with dependency files (#2045)
|
2024-10-11 14:33:32 -04:00 |
|
GriffinR
|
8f41d9eb17
|
Merge branch 'master' into fix-toolchain
|
2024-09-19 12:20:51 -04:00 |
|
Kurausukun
|
52c2728ff6
|
remove gflib
|
2024-09-18 10:37:34 -04:00 |
|
GriffinR
|
b8c71fa84d
|
Fix .d files not updating if .o fails, fix clean rule, remove some unnecessary warnings
|
2024-09-13 23:38:50 -04:00 |
|
Eduardo Quezada
|
5954d662a5
|
Rebuild of makefile 7: Test Runner
|
2024-09-13 15:26:42 -03:00 |
|
Eduardo Quezada
|
bee1452c8e
|
Rebuild of makefile 6: File-specific stuff
|
2024-09-13 14:38:43 -03:00 |
|