Code

Pret merge (15th of October)#5527

Code

Merged

Bassoonian merged 73 commits intorh-hideout:masterrh-hideout/pokeemerald-expansion:masterfrom AsparagusEduardo:_RHH/pr/master/pretSync20241015AsparagusEduardo/pokeemerald:_RHH/pr/master/pretSync20241015Copy head branch name to clipboardOct 17, 2024

+1,534-3,580

Commits

Commits on Nov 11, 2023

• Makefile uses make_tools, mapjson takes out dir.

  Show description for 7fa9819
  Icedude907

  committed
  7fa9819

Commits on Nov 12, 2023

• Reordered makefile.

  Show description for 2198ca3
  Icedude907

  committed
  2198ca3

• Parallel SCANINC via .d generation.

  Show description for 4b2054c
  Icedude907

  committed
  4b2054c

Commits on Nov 15, 2023

• All mid2agb songs are controlled by a midi.cfg file

  Icedude907

  committed
  85f4ca6

• Coalesced audio rules into audio.mk

  Icedude907

  committed
  cf1eaea

• .cfg edits now rebuild .mid

  Icedude907

  committed
  5e4e522

Commits on Jun 25, 2024

• UB fix ClockwiseWipe_TopRight

  cawtds

  committed
  5eea3d3

Commits on Aug 14, 2024

• Slight storage system documentation

  luckytyphlosion

  committed
  7d921fa

Commits on Aug 15, 2024

• Clean up defines lacking spaces

  Bassoonian

  committed
  c1ee432

• Fix trainer match call flags

  

  GriffinRichards

  authored and

  SBird1337

  committed
  3f49c5c

Commits on Aug 21, 2024

• [preproc] support arbitrary expressions in enums

  mrgriffin

  committed
  5c55cc3

• Merge pull request pret#2024 from luckytyphlosion/master

  Show description for ea726ee
  mrgriffin

  authored
  ea726ee

• Merge pull request pret#2025 from Bassoonian/cleandefinespaces

  Show description for 56d3faa
  mrgriffin

  authored
  56d3faa

• Merge pull request pret#2007 from cawtds/ub-fix-battle-transition

  Show description for ac28fc5
  mrgriffin

  authored
  ac28fc5

Commits on Aug 26, 2024

• Merge pull request pret#2026 from mrgriffin/preproc-enum-arbitrary-expr

  Show description for bc7c46f
  GriffinRichards

  authored
  bc7c46f

Commits on Aug 29, 2024

• [Build System Rewrite] mapjson now takes output directory parameters. (pret#1949)

  Icedude907

  authored
  625a006

Commits on Aug 31, 2024

• Merge branch 'master' of https://github.com/pret/pokeemerald into build-makefile-cleanup

  GriffinRichards

  committed
  19ad2e1

• Restore review changes from dependent PR

  GriffinRichards

  committed
  a4dd821

• Merge pull request pret#1950 from Icedude907/build-makefile-cleanup

  Show description for 4d74dd5
  GriffinRichards

  authored
  4d74dd5

• Merge branch 'master' of https://github.com/pret/pokeemerald into build-scaninc-speed

  GriffinRichards

  committed
  2d52311

• Merge branch 'master' of https://github.com/pret/pokeemerald into build-music-config

  GriffinRichards

  committed
  c265c3f

• Add missing terminal newlines

  GriffinRichards

  committed
  32f0526

• Fix swapped cycling road entrances

  GriffinRichards

  committed
  04197b4

Commits on Sep 8, 2024

• Fix incorrect point macros in contest_ai_script.inc

  NTx86

  committed
  71fcb2e

• Merge pull request pret#2028 from NTx86/fix-contest-ai-point-macros

  Show description for cfdb06a
  GriffinRichards

  authored
  cfdb06a

Commits on Sep 11, 2024

• Update INSTALL.md to state that Windows 8 is no longer supported by Microsoft

  luciofstars

  authored
  28786b4

• Update pull_request_template.md to include Discord username update

  luciofstars

  authored
  a75be41

• Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909

  Show description for 831b394
  AsparagusEduardo

  committed
  831b394

• Rebuild of makefile 1: Modern as default

  AsparagusEduardo

  committed
  20e937a

• Rebuild of makefile 2: -Wall and UNUSED_ERROR

  AsparagusEduardo

  committed
  83872ab

• Rebuild of makefile 3: ANALYZE

  AsparagusEduardo

  committed
  5f8c915

• Rebuild of makefile 4: Teachable learnset helper

  AsparagusEduardo

  committed
  5790200

Commits on Sep 12, 2024

• Merge pull request pret#1954 from Icedude907/build-scaninc-speed

  Show description for 51131e2
  GriffinRichards

  authored
  51131e2

• Merge pull request pret#1957 from Icedude907/build-music-config

  Show description for 9e22bf1
  GriffinRichards

  authored
  9e22bf1

• Sync missing alignment from pokefirered

  GriffinRichards

  committed
  d9b824d

• Remove old ld_script processing

  GriffinRichards

  committed
  7007439

Commits on Sep 13, 2024

• Rebuild of makefile 5: trainerproc

  AsparagusEduardo

  committed
  5ea1f39

• Rebuild of makefile 6: File-specific stuff

  AsparagusEduardo

  committed
  bee1452

• Rebuild of makefile 7: Test Runner

  AsparagusEduardo

  committed
  5954d66

Commits on Sep 14, 2024

• Fix .d files not updating if .o fails, fix clean rule, remove some unnecessary warnings

  GriffinRichards

  committed
  b8c71fa

• Have scaninc ignore non-existing files

  GriffinRichards

  committed
  302193a

• Merge pull request pret#2029 from skyeforeverblue/patch-1

  Show description for bc58a4a
  GriffinRichards

  authored
  bc58a4a

• Merge pull request pret#2030 from skyeforeverblue/patch-2

  Show description for db898f8
  GriffinRichards

  authored
  db898f8

• remove ScriptContext_Enable from secret_base.h

  DizzyEggg

  authored
  c4b5818

• Merge pull request pret#2032 from DizzyEggg/patch-1

  Show description for 62c27fa
  GriffinRichards

  authored
  62c27fa

Commits on Sep 15, 2024

• CI fix attempt

  AsparagusEduardo

  committed
  f720916

Commits on Sep 18, 2024

• remove gflib

  Kurausukun

  committed
  52c2728

• fix indentation

  Kurausukun

  committed
  9cb3531

Commits on Sep 19, 2024

• Merge pull request pret#2033 from Kurausukun/goodbye_gflib

  Show description for 6353253
  GriffinRichards

  authored
  6353253

• Merge branch 'master' into fix-toolchain

  GriffinRichards

  authored
  8f41d9e

• Merge pull request pret#2031 from GriffinRichards/fix-toolchain

  Show description for 473e062
  GriffinRichards

  authored
  473e062

Commits on Sep 25, 2024

• Remove explicit symbol sizes in sym_common.txt

  GriffinRichards

  committed
  80a37c1

Commits on Sep 29, 2024

• Bugfix for cable car sprite array count

  Scyrous

  authored
  8e2c3ca

• Update cable_car.c

  Scyrous

  authored
  1dc85df

Commits on Oct 1, 2024

• Ignore mGBA screenshots

  Show description for c8cc0fa
  Jaizu

  authored
  c8cc0fa

Commits on Oct 2, 2024

• Merge pull request pret#2039 from Scyrous/patch-1

  Show description for 37d104f
  GriffinRichards

  authored
  37d104f

• Merge pull request pret#2038 from GriffinRichards/gflib-syms

  Show description for 44e9228
  GriffinRichards

  authored
  44e9228

• Merge pull request pret#2041 from Jaizu/patch-9

  Show description for 2b73d10
  GriffinRichards

  authored
  2b73d10

Commits on Oct 3, 2024

• Replaced copyright magic numbers in intro.c with constants (pret#2035)

  pkmnsnfrn

  authored
  9a24c03

Commits on Oct 4, 2024

• Merge branch '_RHH/master' into _RHH/pr/master/pretSync20240909

  AsparagusEduardo

  committed
  0f8b2a1

Commits on Oct 10, 2024

• Fix typo: | should be || in Task_TryFieldPoisonWhiteOut

  Show description for 9ad0018
  AZero13

  committed
  9ad0018

• Merge pull request pret#2044 from AreaZR/Excessive

  Show description for 6395d55
  mrgriffin

  authored
  6395d55

Commits on Oct 11, 2024

• Fix libpng installation for workflow on Ubuntu 24.04

  GriffinRichards

  committed
  6d24d8a

• [preproc] support C23 enum underlying type syntax (pret#2043)

  mrgriffin

  authored
  fcc067e

• Fix deleting files with dependency files (pret#2045)

  mid-kid

  authored
  2c7964d

• Let scaninc ignore empty C files

  GriffinRichards

  committed
  b6892f5

Commits on Oct 13, 2024

• Fix Fallorbor typo

  GriffinRichards

  committed
  a0be2cb

Commits on Oct 15, 2024

• Remove unnecessary looping for rule generation and unroll macros (pret#2046)

  mid-kid

  authored
  253d3dd

• Get rid of common syms (pret#2040)

  luckytyphlosion

  authored
  a55c75d

• Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015

  AsparagusEduardo

  committed
  80447be

Commits on Oct 16, 2024

• Merge branch '_RHH/master' into _RHH/pr/master/pretSync20241015

  AsparagusEduardo

  committed
  9ed153f

• Removed all instances of gflib from ld_scripts

  AsparagusEduardo

  committed
  d58bbe2

• Updated .gitignore for agbcc screenshot suffix

  AsparagusEduardo

  committed
  20c5df7