Code

Friday Night Mergin' (weekly merge)#2264

Code

Merged

DizzyEggg merged 18 commits intorh-hideout:masterrh-hideout/pokeemerald-expansion:masterfrom AsparagusEduardo:RHH_pretMerge20220826AsparagusEduardo/pokeemerald:RHH_pretMerge20220826Copy head branch name to clipboardAug 29, 2022

+172-182

Commits

Commits on Aug 16, 2022

• Add missing usage of SOUND_PAN_*

  GriffinRichards

  committed
  2ec8f27

  Copy full SHA for 2ec8f27

Commits on Aug 19, 2022

• Additional battle anim sync

  GriffinRichards

  committed
  c2d5dd2

  Copy full SHA for c2d5dd2

Commits on Aug 24, 2022

• Fixed switch syntax in Task_TryFieldPoisonWhiteOut

  LOuroboros

  authored
  90f72a7

  Copy full SHA for 90f72a7

• Fixed KeyInterCB_DeferToEventScript comment

  LOuroboros

  authored
  3a65529

  Copy full SHA for 3a65529

• Re-aligned READ_PTR_FROM_TASK's 2nd line EoL

  LOuroboros

  authored
  015961c

  Copy full SHA for 015961c

• Merge pull request pret#1750 from LOuroboros/patch-2

  Show description for eecf968
  GriffinRichards

  authored
  eecf968

  Copy full SHA for eecf968

• Merge pull request pret#1751 from LOuroboros/patch-3

  Show description for 8cc520c
  GriffinRichards

  authored
  8cc520c

  Copy full SHA for 8cc520c

• Merge pull request pret#1752 from LOuroboros/patch-4

  Show description for 32ea55d
  GriffinRichards

  authored
  32ea55d

  Copy full SHA for 32ea55d

Commits on Aug 25, 2022

• Added constants for GetLeadMonFriendshipScore

  LOuroboros

  committed
  1f4ef2a

  Copy full SHA for 1f4ef2a

• Missing constant in friendshiptodamagecalculation

  GriffinRichards

  committed
  8a1130d

  Copy full SHA for 8a1130d

• Renamed the GetLeadMonFriendshipScore constants

  LOuroboros

  committed
  11d6ae4

  Copy full SHA for 11d6ae4

• Removed unnecessary inclusion of header in src/field_specials.c

  LOuroboros

  committed
  23bf67c

  Copy full SHA for 23bf67c

Commits on Aug 26, 2022

• Corrected Oldale Town Sign labels

  AsparagusEduardo

  committed
  6fb4da6

  Copy full SHA for 6fb4da6

• Merge pull request pret#1754 from AsparagusEduardo/pret_citySigns

  Show description for 005c46f
  GriffinRichards

  authored
  005c46f

  Copy full SHA for 005c46f

• Merge pull request pret#1742 from GriffinRichards/sound-pan

  Show description for c5e873a
  GriffinRichards

  authored
  c5e873a

  Copy full SHA for c5e873a

• Merge pull request pret#1753 from LOuroboros/GetLeadMonFriendshipScore

  Show description for 0516f94
  GriffinRichards

  authored
  0516f94

  Copy full SHA for 0516f94

• Add missing use of METATILE_ROW_WIDTH

  GriffinRichards

  committed
  578064d

  Copy full SHA for 578064d

Commits on Aug 27, 2022

• Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826

  Show description for 7c86bd5
  AsparagusEduardo

  committed
  7c86bd5

  Copy full SHA for 7c86bd5