Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pret merge (15th of October) #5527

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
7fa9819
Makefile uses make_tools, mapjson takes out dir.
Icedude907 Nov 11, 2023
2198ca3
Reordered makefile.
Icedude907 Nov 12, 2023
4b2054c
Parallel SCANINC via `.d` generation.
Icedude907 Nov 12, 2023
85f4ca6
All `mid2agb` songs are controlled by a `midi.cfg` file
Icedude907 Nov 15, 2023
cf1eaea
Coalesced audio rules into `audio.mk`
Icedude907 Nov 15, 2023
5e4e522
`.cfg` edits now rebuild `.mid`
Icedude907 Nov 15, 2023
5eea3d3
UB fix ClockwiseWipe_TopRight
cawtds Jun 25, 2024
7d921fa
Slight storage system documentation
luckytyphlosion Aug 14, 2024
c1ee432
Clean up defines lacking spaces
Bassoonian Aug 15, 2024
3f49c5c
Fix trainer match call flags
GriffinRichards Aug 7, 2024
5c55cc3
[preproc] support arbitrary expressions in enums
mrgriffin Aug 21, 2024
ea726ee
Merge pull request #2024 from luckytyphlosion/master
mrgriffin Aug 21, 2024
56d3faa
Merge pull request #2025 from Bassoonian/cleandefinespaces
mrgriffin Aug 21, 2024
ac28fc5
Merge pull request #2007 from cawtds/ub-fix-battle-transition
mrgriffin Aug 21, 2024
bc7c46f
Merge pull request #2026 from mrgriffin/preproc-enum-arbitrary-expr
GriffinRichards Aug 26, 2024
625a006
[Build System Rewrite] `mapjson` now takes output directory parameter…
Icedude907 Aug 29, 2024
19ad2e1
Merge branch 'master' of https://github.com/pret/pokeemerald into bui…
GriffinRichards Aug 31, 2024
a4dd821
Restore review changes from dependent PR
GriffinRichards Aug 31, 2024
4d74dd5
Merge pull request #1950 from Icedude907/build-makefile-cleanup
GriffinRichards Aug 31, 2024
2d52311
Merge branch 'master' of https://github.com/pret/pokeemerald into bui…
GriffinRichards Aug 31, 2024
c265c3f
Merge branch 'master' of https://github.com/pret/pokeemerald into bui…
GriffinRichards Aug 31, 2024
32f0526
Add missing terminal newlines
GriffinRichards Aug 31, 2024
04197b4
Fix swapped cycling road entrances
GriffinRichards Aug 31, 2024
71fcb2e
Fix incorrect point macros in contest_ai_script.inc
NTx86 Sep 8, 2024
cfdb06a
Merge pull request #2028 from NTx86/fix-contest-ai-point-macros
GriffinRichards Sep 8, 2024
28786b4
Update INSTALL.md to state that Windows 8 is no longer supported by M…
luciofstars Sep 11, 2024
a75be41
Update pull_request_template.md to include Discord username update
luciofstars Sep 11, 2024
831b394
Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909
AsparagusEduardo Sep 8, 2024
20e937a
Rebuild of makefile 1: Modern as default
AsparagusEduardo Sep 11, 2024
83872ab
Rebuild of makefile 2: -Wall and UNUSED_ERROR
AsparagusEduardo Sep 11, 2024
5f8c915
Rebuild of makefile 3: ANALYZE
AsparagusEduardo Sep 11, 2024
5790200
Rebuild of makefile 4: Teachable learnset helper
AsparagusEduardo Sep 11, 2024
51131e2
Merge pull request #1954 from Icedude907/build-scaninc-speed
GriffinRichards Sep 12, 2024
9e22bf1
Merge pull request #1957 from Icedude907/build-music-config
GriffinRichards Sep 12, 2024
d9b824d
Sync missing alignment from pokefirered
GriffinRichards Sep 12, 2024
7007439
Remove old ld_script processing
GriffinRichards Sep 12, 2024
5ea1f39
Rebuild of makefile 5: trainerproc
AsparagusEduardo Sep 13, 2024
bee1452
Rebuild of makefile 6: File-specific stuff
AsparagusEduardo Sep 13, 2024
5954d66
Rebuild of makefile 7: Test Runner
AsparagusEduardo Sep 13, 2024
b8c71fa
Fix .d files not updating if .o fails, fix clean rule, remove some un…
GriffinRichards Sep 14, 2024
302193a
Have scaninc ignore non-existing files
GriffinRichards Sep 14, 2024
bc58a4a
Merge pull request #2029 from skyeforeverblue/patch-1
GriffinRichards Sep 14, 2024
db898f8
Merge pull request #2030 from skyeforeverblue/patch-2
GriffinRichards Sep 14, 2024
c4b5818
remove ScriptContext_Enable from secret_base.h
DizzyEggg Sep 14, 2024
62c27fa
Merge pull request #2032 from DizzyEggg/patch-1
GriffinRichards Sep 14, 2024
f720916
CI fix attempt
AsparagusEduardo Sep 15, 2024
52c2728
remove gflib
Kurausukun Sep 18, 2024
9cb3531
fix indentation
Kurausukun Sep 18, 2024
6353253
Merge pull request #2033 from Kurausukun/goodbye_gflib
GriffinRichards Sep 19, 2024
8f41d9e
Merge branch 'master' into fix-toolchain
GriffinRichards Sep 19, 2024
473e062
Merge pull request #2031 from GriffinRichards/fix-toolchain
GriffinRichards Sep 19, 2024
80a37c1
Remove explicit symbol sizes in sym_common.txt
GriffinRichards Sep 25, 2024
8e2c3ca
Bugfix for cable car sprite array count
Scyrous Sep 29, 2024
1dc85df
Update cable_car.c
Scyrous Sep 29, 2024
c8cc0fa
Ignore mGBA screenshots
Jaizu Oct 1, 2024
37d104f
Merge pull request #2039 from Scyrous/patch-1
GriffinRichards Oct 2, 2024
44e9228
Merge pull request #2038 from GriffinRichards/gflib-syms
GriffinRichards Oct 2, 2024
2b73d10
Merge pull request #2041 from Jaizu/patch-9
GriffinRichards Oct 2, 2024
9a24c03
Replaced copyright magic numbers in intro.c with constants (#2035)
pkmnsnfrn Oct 3, 2024
0f8b2a1
Merge branch '_RHH/master' into _RHH/pr/master/pretSync20240909
AsparagusEduardo Oct 4, 2024
9ad0018
Fix typo: | should be || in Task_TryFieldPoisonWhiteOut
AreaZR Oct 10, 2024
6395d55
Merge pull request #2044 from AreaZR/Excessive
mrgriffin Oct 10, 2024
6d24d8a
Fix libpng installation for workflow on Ubuntu 24.04
GriffinRichards Oct 11, 2024
fcc067e
[preproc] support C23 enum underlying type syntax (#2043)
mrgriffin Oct 11, 2024
2c7964d
Fix deleting files with dependency files (#2045)
mid-kid Oct 11, 2024
b6892f5
Let scaninc ignore empty C files
GriffinRichards Oct 11, 2024
a0be2cb
Fix Fallorbor typo
GriffinRichards Oct 13, 2024
253d3dd
Remove unnecessary looping for rule generation and unroll macros (#2046)
mid-kid Oct 15, 2024
a55c75d
Get rid of common syms (#2040)
luckytyphlosion Oct 15, 2024
80447be
Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015
AsparagusEduardo Oct 15, 2024
9ed153f
Merge branch '_RHH/master' into _RHH/pr/master/pretSync20241015
AsparagusEduardo Oct 16, 2024
d58bbe2
Removed all instances of gflib from ld_scripts
AsparagusEduardo Oct 16, 2024
20c5df7
Updated .gitignore for agbcc screenshot suffix
AsparagusEduardo Oct 16, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
<!-- If it doesn't apply, feel free to remove this section. -->

## **Discord contact info**
<!--- formatted as name#numbers, e.g. Lunos#4026 -->
<!--- Formatted as username (e.g. Lunos) or username#numbers (e.g. Lunos#4026) -->
<!--- Contributors must join https://discord.gg/6CzjAG6GZk -->
3 changes: 1 addition & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: |
sudo apt update
sudo apt install -y build-essential libpng-dev libelf-dev
# build-essential, git, and libpng-dev are already installed
# build-essential and git are already installed
# gcc-arm-none-eabi is only needed for the modern build
# as an alternative to dkP

Expand All @@ -59,5 +59,4 @@ jobs:
MODERN: 1
TEST: 1
run: |
make -j${nproc} -O pokeemerald-test.elf
make -j${nproc} check
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,7 @@ prefabs.json
*.diff
*.sym
*.js
/pokeemerald-*.png
/pokeemerald_agbcc-*.png
src/data/map_group_count.h
tools/trainerproc/trainerproc
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Unscientific benchmarks suggest **msys2 is 2x slower** than WSL1, and **Cygwin i

All of the Windows instructions assume that the default drive is C:\\. If this differs to your actual drive letter, then replace C with the correct drive letter when reading the instructions.

**A note of caution**: As Windows 7 is officially unsupported by Microsoft and Windows 8 has very little usage, some maintainers are unwilling to maintain the Windows 7/8 instructions. Thus, these instructions may break in the future with fixes taking longer than fixes to the Windows 10 instructions.
**A note of caution**: As Windows 7 and Windows 8 are officially unsupported by Microsoft, some maintainers are unwilling to maintain the Windows 7/8 instructions. Thus, these instructions may break in the future with fixes taking longer than fixes to the Windows 10/11 instructions.

## Windows 10/11 (WSL1)
WSL1 is the preferred terminal to build **pokeemerald Expansion**. The following instructions will explain how to install WSL1 (referred to interchangeably as WSL).
Expand Down
Loading
Loading