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
luckytyphlosion
a55c75d350
Get rid of common syms ( #2040 )
2024-10-14 23:52:11 -04:00
GriffinR
a2a3255bdd
Fix typo, remove old size check
2024-10-12 03:30:35 -04:00
GriffinR
9f31b0fe90
Generate local IDs from map.json files
2024-10-12 03:04:24 -04:00
GriffinR
6518f1e3ff
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
2024-10-11 15:26:58 -04:00
GriffinR
091b7269df
Move heal locations data to their associated map.json ( #2034 )
2024-10-11 15:15:55 -04:00
GriffinR
b6892f5b67
Let scaninc ignore empty C files
2024-10-11 15:03:38 -04:00
mid-kid
2c7964dbc2
Fix deleting files with dependency files ( #2045 )
2024-10-11 14:33:32 -04:00
Martin Griffin
fcc067e515
[preproc] support C23 enum underlying type syntax ( #2043 )
2024-10-11 13:50:26 -04:00
Eduardo Quezada
1d9557811b
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-10-08 15:58:17 -03:00
Eduardo Quezada
0f8b2a1ba8
Merge branch '_RHH/master' into _RHH/pr/master/pretSync20240909
2024-10-04 10:23:58 -03:00
Eduardo Quezada
4183fa9d50
Fixed test assumption fail summary fields using more memory than needed ( #5443 )
2024-09-29 14:40:37 -03: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
302193a814
Have scaninc ignore non-existing files
2024-09-14 00:28:57 -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
GriffinR
d9b824db3f
Sync missing alignment from pokefirered
2024-09-12 12:27:31 -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
GriffinR
2d5231149e
Merge branch 'master' of https://github.com/pret/pokeemerald into build-scaninc-speed
2024-08-31 00:39:48 -04:00
Icedude907
625a006cab
[Build System Rewrite] mapjson now takes output directory parameters. ( #1949 )
2024-08-29 14:01:01 -04:00
Greenphx9
ad969c968c
Merge branch 'lighting' of https://github.com/aarant/pokeemerald into lighting-expansion-v2
2024-08-25 17:54:28 +10:00
Martin Griffin
5c55cc3748
[preproc] support arbitrary expressions in enums
2024-08-21 07:50:41 +01:00
Eduardo Quezada
18980b20a3
Remove trailing whitespace (master) ( #5174 )
2024-08-14 19:48:20 -07:00
Martin Griffin
a5e0738484
trainerproc: Parse line markers ( #5122 )
2024-08-08 20:12:18 +02:00
Martin Griffin
5b251b614c
trainerproc: Support Ogerpon
2024-07-25 14:50:32 +01:00
hedara90
3f4b4adae5
Updated reference to config location to new location ( #5026 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-23 14:09:32 -04:00
Eduardo Quezada
0b02527e5c
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# test/test_runner.c
2024-07-21 13:36:07 -04:00
Eduardo Quezada
9d5e253867
Improved Test Runner Summary ( #4641 )
...
* Filename in list (no proper sorting yet)
* Line number and message in error list + removed sorting
* Style adjustment
* Added missing file/line number to "expected N passes/successes"
* Fixed Known Failing Passing test list
* Separated test list from totals
* Assumption fails list
* Better names
* Filename for KNOWN_FAILINGs passing
* Moved total back to the bottom
* Spaces correction
* Fixed test list count
* Source file for Alloc fails on tests
* Moved sourceLine from BattleTest to Test struct
* Fixed assumptions failed "and more" counter
* Fixed ASSUMPTION block not printing their line numbers
* Fixed when stopLine is printed
* Renamed stopLine to failedAssumptionsBlockLine
2024-07-20 18:22:40 +02:00
