Code

Pret merge (17 of January)#6045

Code

Merged

AlexOn1ine merged 18 commits intorh-hideout:masterrh-hideout/pokeemerald-expansion:masterfrom Bassoonian:pretmerge17janBassoonian/pokeemerald-expansion:pretmerge17janCopy head branch name to clipboardJan 18, 2025

+7,463-7,336

Commits

Commits on Dec 27, 2024

• Slight contest documentation (rh-hideout#2078)

  AsparagusEduardo

  authored
  50d325f

  Copy full SHA for 50d325f

Commits on Jan 6, 2025

• Update vars.h (cleanup)

  Show description for a0e8753
  shachar700

  authored
  a0e8753

  Copy full SHA for a0e8753

• Merge pull request rh-hideout#2082 from shachar700/patch-2

  Show description for 5e75cd0
  mrgriffin

  authored
  5e75cd0

  Copy full SHA for 5e75cd0

Commits on Jan 7, 2025

• extern const gBasicHitSplatSpriteTemplate

  DizzyEggg

  authored
  0ec1189

  Copy full SHA for 0ec1189

Commits on Jan 8, 2025

• Merge pull request rh-hideout#2083 from DizzyEggg/patch-2

  Show description for 697d2b7
  mrgriffin

  authored
  697d2b7

  Copy full SHA for 697d2b7

Commits on Jan 9, 2025

• extern gAncientPowerRockSpriteTemplate fix

  DizzyEggg

  authored
  9ab4f5d

  Copy full SHA for 9ab4f5d

• Merge pull request rh-hideout#2084 from DizzyEggg/patch-3

  Show description for 0779c9c
  mrgriffin

  authored
  0779c9c

  Copy full SHA for 0779c9c

• remove undef TASK_NONE from list_menu

  DizzyEggg

  authored
  8485681

  Copy full SHA for 8485681

• Merge pull request rh-hideout#2085 from DizzyEggg/patch-4

  Show description for 1c765d1
  mrgriffin

  authored
  1c765d1

  Copy full SHA for 1c765d1

Commits on Jan 15, 2025

• Fix CaveTransition pals

  DizzyEggg

  committed
  9385dfe

  Copy full SHA for 9385dfe

• Merge pull request rh-hideout#2095 from DizzyEggg/transition

  Show description for 9952b67
  mrgriffin

  authored
  9952b67

  Copy full SHA for 9952b67

Commits on Jan 17, 2025

• Define field script opcode constants (rh-hideout#2005)

  Show description for b5b0ffd
  rayrobdod

  authored
  b5b0ffd

  Copy full SHA for b5b0ffd

• Document bard music (rh-hideout#2053)

  Show description for 2f67b17
  GriffinRichards

  authored
  2f67b17

  Copy full SHA for 2f67b17

• Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan

  Bassoonian

  committed
  bcf9a1e

  Copy full SHA for bcf9a1e

• Extern gSprites and gOamMatrices with known array size (rh-hideout#2090)

  DizzyEggg

  authored
  0a436d5

  Copy full SHA for 0a436d5

• Fix conflicting types for rotating gate functions (rh-hideout#2087)

  DizzyEggg

  authored
  e83f7c7

  Copy full SHA for e83f7c7

Commits on Jan 18, 2025

• Fix tests not building

  Bassoonian

  committed
  cc9a4d3

  Copy full SHA for cc9a4d3

• Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan

  Bassoonian

  committed
  db5dc85

  Copy full SHA for db5dc85