Merge branch 'RHH/upcoming' into RHH/pr/upcoming/debugCleanup2

# Conflicts: # src/debug.c
2026-09-30 13:57:40 -05:00 · 2023-10-30 08:05:14 -03:00
parent 4f0802f96e f461bc3256
commit 661becc3b6
568 changed files with 23320 additions and 9176 deletions
--- a/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
+++ b/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
@@ -11,7 +11,7 @@ body:
    attributes:
      label: Description
      description: |
-        Describe the issue you are experiencing. 
+        Describe the issue you are experiencing.
        Attach images/videos if possible.
      placeholder: |
        Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
--- a/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
+++ b/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
@@ -11,7 +11,7 @@ body:
    attributes:
      label: Description
      description: |
-        Describe the issue you are experiencing. 
+        Describe the issue you are experiencing.
        Attach images/videos if possible.
      placeholder: |
        Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
--- a/.github/ISSUE_TEMPLATE/03_feature_requests.yaml
+++ b/.github/ISSUE_TEMPLATE/03_feature_requests.yaml
@@ -11,7 +11,7 @@ body:
    attributes:
      label: Description
      description: |
-        Describe the issue you are experiencing. 
+        Describe the issue you are experiencing.
        Attach images/videos if possible.
      placeholder: |
        Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
--- a/.github/ISSUE_TEMPLATE/04_other_errors.yaml
+++ b/.github/ISSUE_TEMPLATE/04_other_errors.yaml
@@ -11,7 +11,7 @@ body:
    attributes:
      label: Description
      description: |
-        Describe the issue you are experiencing. 
+        Describe the issue you are experiencing.
        Attach images/videos if possible.
      placeholder: |
        Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
-contact_links: 
+contact_links:
  - name: Rom-Hacking Hideout's Discord server!
    url: https://discord.gg/6CzjAG6GZk
    about: You can follow the development of pokeemerald-expansion and be notified of new releases :)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,6 +10,7 @@ on:
 jobs:
  build:
    runs-on: ubuntu-latest
+    container: devkitpro/devkitarm
    env:
      GAME_VERSION: EMERALD
      GAME_REVISION: 0
@@ -27,7 +28,7 @@ jobs:
          repository: pret/agbcc

      - name: Install binutils
-        run: sudo apt install gcc-arm-none-eabi binutils-arm-none-eabi libelf-dev
+        run: sudo apt install -y build-essential libpng-dev libelf-dev
        # build-essential, git, and libpng-dev are already installed
        # gcc-arm-none-eabi is only needed for the modern build
        # as an alternative to dkP
@@ -39,6 +40,9 @@ jobs:
        working-directory: agbcc

      - name: Agbcc
+        env:
+          MODERN: 0
+          COMPARE: 0
        run: make -j${nproc} -O all

      - name: Modern
@@ -49,6 +53,7 @@ jobs:

      - name: Test
        env:
+          MODERN: 1
          TEST: 1
        run: |
          make -j${nproc} -O pokeemerald-test.elf
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@ prefabs.json
 *.diff
 *.sym
 *.js
+src/data/map_group_count.h
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -150,9 +150,9 @@ Note that in msys2, Copy is Ctrl+Insert and Paste is Shift+Insert.
    <details>
        <summary><i>Notes...</i></summary>

-    >   Note 1: While not shown, msys uses forward slashes `/` instead of backwards slashes `\` as the directory separator.  
-    >   Note 2: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "Downloads/My Downloads"`.  
-    >   Note 3: Windows path names are case-insensitive so adhering to capitalization isn’t needed.   
+    >   Note 1: While not shown, msys uses forward slashes `/` instead of backwards slashes `\` as the directory separator.
+    >   Note 2: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "Downloads/My Downloads"`.
+    >   Note 3: Windows path names are case-insensitive so adhering to capitalization isn’t needed.
    >   Note 4: If libpng was saved elsewhere, you will need to specify the full path to where libpng was downloaded, e.g. `cd c:/devkitpro/msys2` if it was saved there.
    </details>

--- a/21
+++ b/21
@@ -40,12 +40,12 @@ TITLE       := POKEMON EMER
 GAME_CODE   := BPEE
 MAKER_CODE  := 01
 REVISION    := 0
-MODERN      ?= 0
+MODERN      ?= 1
 TEST        ?= 0
 ANALYZE     ?= 0

-ifeq (modern,$(MAKECMDGOALS))
-  MODERN := 1
+ifeq (agbcc,$(MAKECMDGOALS))
+  MODERN := 0
 endif

 ifeq (check,$(MAKECMDGOALS))
@@ -69,12 +69,12 @@ else
  CPP := $(PREFIX)cpp
 endif

-ROM_NAME := pokeemerald.gba
+ROM_NAME := pokeemerald_agbcc.gba
 ELF_NAME := $(ROM_NAME:.gba=.elf)
 MAP_NAME := $(ROM_NAME:.gba=.map)
 OBJ_DIR_NAME := build/emerald

-MODERN_ROM_NAME := pokeemerald_modern.gba
+MODERN_ROM_NAME := pokeemerald.gba
 MODERN_ELF_NAME := $(MODERN_ROM_NAME:.gba=.elf)
 MODERN_MAP_NAME := $(MODERN_ROM_NAME:.gba=.map)
 MODERN_OBJ_DIR_NAME := build/modern
@@ -85,7 +85,11 @@ ELF = $(ROM:.gba=.elf)
 MAP = $(ROM:.gba=.map)
 SYM = $(ROM:.gba=.sym)

+ifeq ($(MODERN),0)
 TEST_OBJ_DIR_NAME := build/test
+else
+TEST_OBJ_DIR_NAME := build/modern-test
+endif
 TESTELF = $(ROM:.gba=-test.elf)
 HEADLESSELF = $(ROM:.gba=-test-headless.elf)

@@ -178,7 +182,7 @@ MAKEFLAGS += --no-print-directory
 # Secondary expansion is required for dependency variables in object rules.
 .SECONDEXPANSION:

-.PHONY: all rom clean compare tidy tools check-tools mostlyclean clean-tools clean-check-tools $(TOOLDIRS) $(CHECKTOOLDIRS) libagbsyscall modern tidymodern tidynonmodern check
+.PHONY: all rom clean compare tidy tools check-tools mostlyclean clean-tools clean-check-tools $(TOOLDIRS) $(CHECKTOOLDIRS) libagbsyscall agbcc modern tidymodern tidynonmodern check

 infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))

@@ -186,7 +190,7 @@ infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst
 # Disable dependency scanning for clean/tidy/tools
 # Use a separate minimal makefile for speed
 # Since we don't need to reload most of this makefile
-ifeq (,$(filter-out all rom compare modern check libagbsyscall syms $(TESTELF),$(MAKECMDGOALS)))
+ifeq (,$(filter-out all rom compare agbcc modern check libagbsyscall syms $(TESTELF),$(MAKECMDGOALS)))
 $(call infoshell, $(MAKE) -f make_tools.mk)
 else
 NODEP ?= 1
@@ -345,6 +349,7 @@ $(C_BUILDDIR)/librfu_intr.o: CC1 := tools/agbcc/bin/agbcc_arm$(EXE)
 $(C_BUILDDIR)/librfu_intr.o: CFLAGS := -O2 -mthumb-interwork -quiet
 else
 $(C_BUILDDIR)/librfu_intr.o: CFLAGS := -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast
+$(C_BUILDDIR)/pokedex_plus_hgss.o: CFLAGS := -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -Wno-pointer-to-int-cast -std=gnu17 -Werror -Wall -Wno-strict-aliasing -Wno-attribute-alias
 endif

 ifeq ($(DINFO),1)
@@ -480,6 +485,8 @@ $(ROM): $(ELF)
 	$(OBJCOPY) -O binary $< $@
 	$(FIX) $@ -p --silent

+agbcc: all
+
 modern: all

 LD_SCRIPT_TEST := ld_script_test.txt
--- a/README.md
+++ b/README.md
@@ -108,11 +108,17 @@ The pokeemerald Expansion is a feature branch meant to be integrated into existi
 - Feature branches incorporated:
    - [RHH intro credits](https://github.com/Xhyzi/pokeemerald/tree/rhh-intro-credits) by Xhyzi.
        - A small signature from all of us to show the collective effort in the project :)
-    - [Overworld debug]() by TheXaman
+    - [Overworld debug](https://github.com/TheXaman/pokeemerald/tree/tx_debug_system) by TheXaman
+        - May be disabled.
        - Accesible by pressing `R + Start` in the overworld by default.
        - **Additional features**:
            - *Clear Boxes*: cleans every Pokémon from the Boxes.
            - *Hatch an Egg*: lets you choose an Egg in your party and immediatly hatch it.
+    - [HGSS Pokédex](https://github.com/TheXaman/pokeemerald/tree/tx_pokedexPlus_hgss) by TheXaman
+        - May be disabled.
+        - **Additional features**:
+            - *Support for new evolution methods*.
+            - *Dark Mode*.
 - Other features
    - Pressing B while holding a Pokémon drops them like in modern games (configurable).
    - Running indoors (configurable).
--- a/asm/macros/battle_script.inc
+++ b/asm/macros/battle_script.inc
@@ -1366,6 +1366,12 @@
 	.byte \battler
 	.endm

+	.macro trysetoctolock battler:req, failInstr:req
+	callnative BS_TrySetOctolock
+	.byte \battler
+	.4byte \failInstr
+	.endm
+
 	.macro setzeffect
 	callnative BS_SetZEffect
 	.endm
@@ -1456,6 +1462,54 @@
 	.4byte \jumpInstr
 	.endm

+	.macro tryreflecttype failInstr:req
+	callnative BS_TryReflectType
+	.4byte \failInstr
+	.endm
+
+	@ Used to active a different Max Move effects.
+	.macro setmaxmoveeffect
+	callnative BS_SetMaxMoveEffect
+	.endm
+
+	.macro setsteelsurge, failInstr:req
+	callnative BS_SetSteelsurge
+	.4byte \failInstr
+	.endm
+
+	.macro damagenontypes
+	callnative BS_DamageNonTypes
+	.endm
+
+	.macro trysetstatus1, ptr:req
+	callnative BS_TrySetStatus1
+	.4byte \ptr
+	.endm
+
+	.macro trysetstatus2, ptr:req
+	callnative BS_TrySetStatus2
+	.4byte \ptr
+	.endm
+
+	.macro tryhealsixthhealth, ptr:req
+	callnative BS_HealOneSixth
+	.4byte \ptr
+	.endm
+
+	.macro tryrecycleberry, ptr:req
+	callnative BS_TryRecycleBerry
+	.4byte \ptr
+	.endm
+	
+	.macro updatedynamax
+	callnative BS_UpdateDynamax
+	.endm
+
+	.macro jumpiftargetdynamaxed, ptr:req
+	callnative BS_JumpIfDynamaxed
+	.4byte \ptr
+	.endm
+
@ various command changed to more readable macros
 	.macro cancelmultiturnmoves battler:req
 	various \battler, VARIOUS_CANCEL_MULTI_TURN_MOVES
@@ -1686,11 +1740,6 @@
 	.4byte \failInstr
 	.endm

-	.macro tryreflecttype failInstr:req
-	various BS_ATTACKER, VARIOUS_TRY_REFLECT_TYPE
-	.4byte \failInstr
-	.endm
-
 	.macro trysoak failInstr:req
 	various BS_ATTACKER, VARIOUS_TRY_SOAK
 	.4byte \failInstr
@@ -2044,11 +2093,6 @@
 	.4byte \failInstr
 	.endm

-	.macro setoctolock battler:req, failInstr:req
-	various \battler, VARIOUS_SET_OCTOLOCK
-	.4byte \failInstr
-	.endm
-
 	.macro cutonethirdhpraisestats failInstr:req
 	various BS_ATTACKER, VARIOUS_CUT_1_3_HP_RAISE_STATS
 	.4byte \failInstr
@@ -2340,3 +2384,8 @@
 	getbattlerfainted \battler
 	jumpifbyte CMP_EQUAL, gBattleCommunication, \value, \ptr
 	.endm
+
+	.macro flushtextbox
+	printstring STRINGID_EMPTYSTRING3
+	waitmessage 1
+	.endm
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -780,7 +780,7 @@ gBattleAnims_Moves::
 	.4byte Move_GLACIAL_LANCE
 	.4byte Move_ASTRAL_BARRAGE
 	.4byte Move_EERIE_SPELL
-@@@@LA MOVES
+@@@@ LA MOVES
 	.4byte Move_DIRE_CLAW
 	.4byte Move_PSYSHIELD_BASH
 	.4byte Move_POWER_SHIFT
@@ -896,6 +896,60 @@ gBattleAnims_Moves::
 	.4byte Move_MENACING_MOONRAZE_MAELSTROM
 	.4byte Move_LIGHT_THAT_BURNS_THE_SKY
 	.4byte Move_SOUL_STEALING_7_STAR_STRIKE
+@@@@ MAX MOVES
+	.4byte Move_MAX_GUARD
+	.4byte Move_MAX_STRIKE
+	.4byte Move_MAX_KNUCKLE
+	.4byte Move_MAX_AIRSTREAM
+	.4byte Move_MAX_OOZE
+	.4byte Move_MAX_QUAKE
+	.4byte Move_MAX_ROCKFALL
+	.4byte Move_MAX_FLUTTERBY
+	.4byte Move_MAX_PHANTASM
+	.4byte Move_MAX_STEELSPIKE
+	.4byte Move_MAX_FLARE
+	.4byte Move_MAX_GEYSER
+	.4byte Move_MAX_OVERGROWTH
+	.4byte Move_MAX_LIGHTNING
+	.4byte Move_MAX_MINDSTORM
+	.4byte Move_MAX_HAILSTORM
+	.4byte Move_MAX_WYRMWIND
+	.4byte Move_MAX_DARKNESS
+	.4byte Move_MAX_STARFALL
+@@@@ G-MAX MOVES
+	.4byte Move_G_MAX_VINE_LASH
+	.4byte Move_G_MAX_WILDFIRE
+	.4byte Move_G_MAX_CANNONADE
+	.4byte Move_G_MAX_BEFUDDLE
+	.4byte Move_G_MAX_VOLT_CRASH
+	.4byte Move_G_MAX_GOLD_RUSH
+	.4byte Move_G_MAX_CHI_STRIKE
+	.4byte Move_G_MAX_TERROR
+	.4byte Move_G_MAX_FOAM_BURST
+	.4byte Move_G_MAX_RESONANCE
+	.4byte Move_G_MAX_CUDDLE
+	.4byte Move_G_MAX_REPLENISH
+	.4byte Move_G_MAX_MALODOR
+	.4byte Move_G_MAX_MELTDOWN
+	.4byte Move_G_MAX_DRUM_SOLO
+	.4byte Move_G_MAX_FIREBALL
+	.4byte Move_G_MAX_HYDROSNIPE
+	.4byte Move_G_MAX_WIND_RAGE
+	.4byte Move_G_MAX_GRAVITAS
+	.4byte Move_G_MAX_STONESURGE
+	.4byte Move_G_MAX_VOLCALITH
+	.4byte Move_G_MAX_TARTNESS
+	.4byte Move_G_MAX_SWEETNESS
+	.4byte Move_G_MAX_SANDBLAST
+	.4byte Move_G_MAX_STUN_SHOCK
+	.4byte Move_G_MAX_CENTIFERNO
+	.4byte Move_G_MAX_SMITE
+	.4byte Move_G_MAX_SNOOZE
+	.4byte Move_G_MAX_FINALE
+	.4byte Move_G_MAX_STEELSURGE
+	.4byte Move_G_MAX_DEPLETION
+	.4byte Move_G_MAX_ONE_BLOW
+	.4byte Move_G_MAX_RAPID_FLOW
@@@ Last Move - cannot be reached
 	.4byte Move_COUNT

@@ -953,6 +1007,9 @@ gBattleAnims_General::
 	.4byte General_Snow                     @ B_ANIM_SNOW_CONTINUES
 	.4byte General_UltraBurst               @ B_ANIM_ULTRA_BURST
 	.4byte General_SaltCureDamage           @ B_ANIM_SALT_CURE_DAMAGE
+	.4byte General_DynamaxGrowth            @ B_ANIM_DYNAMAX_GROWTH
+	.4byte General_SetWeather               @ B_ANIM_MAX_SET_WEATHER
+	.4byte General_SyrupBombSpeedDrop       @ B_ANIM_SYRUP_BOMB_SPEED_DROP

 	.align 2
 gBattleAnims_Special::
@@ -15105,16 +15162,21 @@ Move_SILK_TRAP::
 	clearmonbg ANIM_ATK_PARTNER
 	end

-@ Also used by Snow weather. Currently identical with Move_HAIL
+@ Also used by Snow weather. Credits to Dat.H A
 Move_SNOWSCAPE::
-	loadspritegfx ANIM_TAG_HAIL
-	loadspritegfx ANIM_TAG_ICE_CRYSTALS
-	createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 3, 0, 6, RGB_BLACK
+	loadspritegfx ANIM_TAG_SNOWFLAKES
+	playsewithpan SE_M_GUST, SOUND_PAN_ATTACKER
+	createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 2, 0, 4, RGB(11, 18, 22)
 	waitforvisualfinish
-	createvisualtask AnimTask_Hail, 5
-	loopsewithpan SE_M_HAIL, 0, 8, 10
+	createvisualtask AnimTask_CreateSnowflakes, 2, 0, 3, 120
+	createvisualtask AnimTask_CreateSnowflakes, 2, 0, 3, 120
+	createvisualtask AnimTask_CreateSnowflakes, 2, 0, 3, 120
+	delay 120
+	playsewithpan SE_M_GUST2, SOUND_PAN_ATTACKER
+	delay 30
+	waitforvisualfinish
+	createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 2, 4, 0, RGB(11, 18, 22)
 	waitforvisualfinish
-	createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 3, 6, 0, RGB_BLACK
 	end

@Credits to Skeli
@@ -16463,6 +16525,113 @@ Move_DOUBLE_SHOCK::
 	blendoff
 	end

+Move_SYRUP_BOMB::
+	createvisualtask AnimTask_SyrupBomb, 0x5
+	jumpargeq 0x0, FALSE, Move_SYRUP_BOMB_RED
+	jumpargeq 0x0, TRUE, Move_SYRUP_BOMB_YELLOW
+
+@ Credits to Dat.H A
+Move_SYRUP_BOMB_RED:
+	loadspritegfx ANIM_TAG_SYRUP_BLOB_RED
+	loadspritegfx ANIM_TAG_SYRUP_SPLAT_RED
+	loadspritegfx ANIM_TAG_SYRUP_SHELL_RED
+	call SyrupBombProjectileRed
+	call SyrupBombProjectileRed
+	call SyrupBombProjectileRed
+	call SyrupBombProjectileRed
+	call SyrupBombProjectileRed
+	call SyrupBombProjectileRed
+	call SyrupBombProjectileRed
+	call SyrupBombProjectileRed
+	call SyrupBombProjectileRed
+	call SyrupBombProjectileRed
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 3, 0, 15, 1
+	createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 1, 2, 0, 12, RGB(20, 3, 3)
+	createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, 42, 27, 20
+	createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, -27, 44, 20
+	createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, 39, -28, 20
+	createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, -42, -42, 20
+	playsewithpan SE_M_DIG, SOUND_PAN_TARGET
+	delay 5
+	createsprite gSyrupBombRedShellSpriteTemplate, ANIM_TARGET, 1, ANIM_TARGET, 100
+	createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, 0, 40, 20
+	createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, -8, -44, 20
+	createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, -46, -28, 20
+	createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, 46, 9, 20
+	playsewithpan SE_M_DIG, SOUND_PAN_TARGET
+	delay 5
+	waitsound
+	waitforvisualfinish
+	end
+SyrupBombProjectileRed:
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
+	createsprite gSyrupRedProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 0
+	delay 3
+	return
+
+Move_SYRUP_BOMB_YELLOW:
+	loadspritegfx ANIM_TAG_SYRUP_BLOB_YELLOW
+	loadspritegfx ANIM_TAG_SYRUP_SPLAT_YELLOW
+	loadspritegfx ANIM_TAG_SYRUP_SHELL_YELLOW
+	call SyrupBombProjectileYellow
+	call SyrupBombProjectileYellow
+	call SyrupBombProjectileYellow
+	call SyrupBombProjectileYellow
+	call SyrupBombProjectileYellow
+	call SyrupBombProjectileYellow
+	call SyrupBombProjectileYellow
+	call SyrupBombProjectileYellow
+	call SyrupBombProjectileYellow
+	call SyrupBombProjectileYellow
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 3, 0, 15, 1
+	createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 1, 2, 0, 12, RGB(23, 13, 1)
+	createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, 42, 27, 20
+	createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, -27, 44, 20
+	createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, 39, -28, 20
+	createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, -42, -42, 20
+	playsewithpan SE_M_DIG, SOUND_PAN_TARGET
+	delay 5
+	createsprite gSyrupBombYellowShellSpriteTemplate, ANIM_TARGET, 1, ANIM_TARGET, 100
+	createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, 0, 40, 20
+	createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, -8, -44, 20
+	createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, -46, -28, 20
+	createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, 46, 9, 20
+	playsewithpan SE_M_DIG, SOUND_PAN_TARGET
+	delay 5
+	waitsound
+	waitforvisualfinish
+	end
+SyrupBombProjectileYellow:
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
+	createsprite gSyrupYellowProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 0
+	delay 3
+	return
+
+General_SyrupBombSpeedDrop::
+	createvisualtask AnimTask_StickySyrup, 0x5
+	jumpargeq 0x0, FALSE, SyrupBombSpeedDropRed
+	jumpargeq 0x0, TRUE, SyrupBombSpeedDropYellow
+
+SyrupBombSpeedDropRed:
+	loadspritegfx ANIM_TAG_SYRUP_BLOB_RED
+	loadspritegfx ANIM_TAG_SYRUP_SHELL_RED
+	loopsewithpan SE_M_TOXIC, SOUND_PAN_TARGET, 13, 6
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 3, 0, 15, 1
+	createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 1, 2, 0, 12, RGB(20, 3, 3)
+	createsprite gSyrupBombRedShellBSpriteTemplate, ANIM_TARGET, 1, ANIM_TARGET, 60
+	waitforvisualfinish
+	end
+
+SyrupBombSpeedDropYellow:
+	loadspritegfx ANIM_TAG_SYRUP_BLOB_YELLOW
+	loadspritegfx ANIM_TAG_SYRUP_SHELL_YELLOW
+	loopsewithpan SE_M_TOXIC, SOUND_PAN_TARGET, 13, 6
+	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 3, 0, 15, 1
+	createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 1, 2, 0, 12, RGB(23, 13, 1)
+	createsprite gSyrupBombYellowShellBSpriteTemplate, ANIM_TARGET, 1, ANIM_TARGET, 60
+	waitforvisualfinish
+	end
+
 Move_TERA_BLAST::
 Move_AXE_KICK::
 Move_LAST_RESPECTS::
@@ -16511,7 +16680,6 @@ Move_PSYBLADE::
 Move_HYDRO_STEAM::
 Move_BLOOD_MOON::
 Move_MATCHA_GOTCHA::
-Move_SYRUP_BOMB::
 Move_IVY_CUDGEL::
 	end @to do

@@ -32868,3 +33036,182 @@ SoulStealingSevenStarStrikeExplosion:
 	createsprite gSoulStealExplosionSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x10, ANIM_TARGET, 0x1
 	delay 0x6
 	return
+
+@@@@@@@@@@ MAX MOVES @@@@@@@@@@
+General_SetWeather::
+	createvisualtask AnimTask_GetWeatherToSet, 2
+	jumpreteq 1, General_Sun
+	jumpreteq 2, General_Rain
+	jumpreteq 3, General_Sandstorm
+	jumpreteq 4, General_Hail
+	end
+
+Move_MAX_GUARD:
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
+	waitforvisualfinish
+	goto Move_PROTECT
+	end
+
+Move_MAX_STRIKE:
+Move_G_MAX_REPLENISH:
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
+	waitforvisualfinish
+	goto Move_GIGA_IMPACT
+	end
+
+Move_MAX_AIRSTREAM:
+Move_G_MAX_WIND_RAGE:
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
+	waitforvisualfinish
+	goto Move_AEROBLAST
+	end
+
+Move_MAX_OOZE:
+Move_G_MAX_MALODOR:
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
+	waitforvisualfinish
+	goto Move_GUNK_SHOT
+	end
+
+Move_G_MAX_WILDFIRE:
+Move_G_MAX_FIREBALL:
+Move_G_MAX_CENTIFERNO:
+Move_MAX_FLARE:
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
+	waitforvisualfinish
+	goto Move_BLAST_BURN
+	end
+
+Move_G_MAX_CANNONADE:
+Move_G_MAX_HYDROSNIPE:
+Move_G_MAX_FOAM_BURST:
+Move_MAX_GEYSER:
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
+	waitforvisualfinish
+	goto Move_HYDRO_CANNON
+	end
+
+Move_G_MAX_VINE_LASH:
+Move_G_MAX_DRUM_SOLO:
+Move_G_MAX_TARTNESS:
+Move_G_MAX_SWEETNESS:
+Move_MAX_OVERGROWTH:
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
+	waitforvisualfinish
+	goto Move_FRENZY_PLANT
+	end
+
+Move_MAX_LIGHTNING:
+Move_G_MAX_STUN_SHOCK:
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
+	waitforvisualfinish
+	goto Move_ZAP_CANNON
+	end
+
+Move_G_MAX_CHI_STRIKE:
+Move_G_MAX_ONE_BLOW:
+Move_G_MAX_RAPID_FLOW:
+Move_MAX_KNUCKLE:
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
+	waitforvisualfinish
+	goto Move_CLOSE_COMBAT
+	end
+
+Move_G_MAX_RESONANCE:
+Move_MAX_HAILSTORM:
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
+	waitforvisualfinish
+	goto Move_SHEER_COLD
+	end
+
+Move_G_MAX_SANDBLAST:
+Move_MAX_QUAKE:
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
+	waitforvisualfinish
+	goto Move_FISSURE
+	end
+
+Move_G_MAX_BEFUDDLE:
+Move_MAX_FLUTTERBY:
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
+	waitforvisualfinish
+	goto Move_BUG_BUZZ
+	end
+
+Move_G_MAX_STEELSURGE:
+Move_G_MAX_MELTDOWN:
+Move_MAX_STEELSPIKE:
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
+	waitforvisualfinish
+	goto Move_HEAVY_SLAM
+	end
+
+Move_G_MAX_TERROR:
+Move_MAX_PHANTASM:
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
+	waitforvisualfinish
+	goto Move_PHANTOM_FORCE
+	end
+
+Move_G_MAX_GRAVITAS:
+Move_MAX_MINDSTORM:
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
+	waitforvisualfinish
+	goto Move_PSYCHO_BOOST
+	end
+
+Move_G_MAX_SMITE:
+Move_G_MAX_FINALE:
+Move_MAX_STARFALL:
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
+	waitforvisualfinish
+	goto Move_MOONBLAST
+	end
+
+Move_G_MAX_STONESURGE:
+Move_G_MAX_VOLCALITH:
+Move_MAX_ROCKFALL:
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
+	waitforvisualfinish
+	goto Move_ROCK_WRECKER
+	end
+
+Move_G_MAX_DEPLETION:
+Move_MAX_WYRMWIND:
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
+	waitforvisualfinish
+	goto Move_SPACIAL_REND
+	end
+
+Move_G_MAX_SNOOZE:
+Move_MAX_DARKNESS:
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
+	waitforvisualfinish
+	goto Move_DARK_PULSE
+	end
+
+Move_G_MAX_CUDDLE:
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
+	waitforvisualfinish
+	goto Move_COVET
+	end
+
+Move_G_MAX_VOLT_CRASH:
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
+	waitforvisualfinish
+	goto Move_VOLT_TACKLE
+	end
+
+Move_G_MAX_GOLD_RUSH:
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
+	waitforvisualfinish
+	goto Move_PAY_DAY
+	end
+
+@@@ DYNAMAX AND MAX RAIDS
+General_DynamaxGrowth:: @ PORTED FROM CFRU
+	createvisualtask SoundTask_PlayCryWithEcho, 2, ANIM_ATTACKER, 2
+	delay 8
+	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x0
+	waitforvisualfinish
+	end
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -435,45 +435,32 @@ gBattleScriptsForMoveEffects::
 	.4byte BattleScript_EffectCorrosiveGas            @ EFFECT_CORROSIVE_GAS
 	.4byte BattleScript_EffectHit                     @ EFFECT_POPULATION_BOMB
 	.4byte BattleScript_EffectMortalSpin              @ EFFECT_MORTAL_SPIN
-	.4byte BattleScript_EffectHit                     @ EFFECT_GIGATON_HAMMER
 	.4byte BattleScript_EffectSaltCure                @ EFFECT_SALT_CURE
-
 	.4byte BattleScript_EffectMatchaGotcha            @ EFFECT_MATCHA_GOTCHA
 	.4byte BattleScript_EffectSyrupBomb               @ EFFECT_SYRUP_BOMB
 	.4byte BattleScript_EffectHit                     @ EFFECT_IVY_CUDGEL
+	.4byte BattleScript_EffectMaxMove                 @ EFFECT_MAX_MOVE

 BattleScript_EffectSyrupBomb::
 	setmoveeffect MOVE_EFFECT_SYRUP_BOMB
 	call BattleScript_EffectHit_Ret
 	seteffectwithchance
 	tryfaintmon BS_TARGET
-	printstring STRINGID_TARGETCOVEREDINSTICKYCANDYSYRUP
-	waitmessage B_WAIT_TIME_LONG
 	goto BattleScript_MoveEnd

+BattleScript_SyrupBombActivates::
+	printstring STRINGID_TARGETCOVEREDINSTICKYCANDYSYRUP
+	waitmessage B_WAIT_TIME_LONG
+	return
+
 BattleScript_SyrupBombEndTurn::
-	setbyte sSTAT_ANIM_PLAYED, FALSE
-	copybyte sBATTLER, gBattlerTarget
-	jumpifholdeffect BS_TARGET, HOLD_EFFECT_CLEAR_AMULET, BattleScript_SyrupBombItemNoStatLoss
-	jumpifability BS_TARGET, ABILITY_CLEAR_BODY, BattleScript_SyrupBombAbilityNoStatLoss
-	jumpifability BS_TARGET, ABILITY_FULL_METAL_BODY, BattleScript_SyrupBombAbilityNoStatLoss
-	jumpifability BS_TARGET, ABILITY_WHITE_SMOKE, BattleScript_SyrupBombAbilityNoStatLoss
-	jumpifstat BS_TARGET, CMP_GREATER_THAN, BIT_SPEED, MIN_STAT_STAGE, BattleScript_SyrupBombLowerSpeed
-	goto BattleScript_SyrupBombEnd2
-BattleScript_SyrupBombLowerSpeed:
-	playstatchangeanimation BS_ATTACKER, BIT_SPEED, STAT_CHANGE_NEGATIVE
-	setbyte sSTAT_ANIM_PLAYED, TRUE
+	flushtextbox
+	playanimation BS_ATTACKER, B_ANIM_SYRUP_BOMB_SPEED_DROP
 	setstatchanger STAT_SPEED, 1, TRUE
-	statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_SyrupBombEnd2
-	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_SyrupBombEnd2
+	statbuffchange STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_SyrupBombTurnDmgEnd
 	printfromtable gStatDownStringIds
 	waitmessage B_WAIT_TIME_LONG
-BattleScript_SyrupBombItemNoStatLoss::
-	call BattleScript_ItemNoStatLoss
-	goto BattleScript_SyrupBombEnd2
-BattleScript_SyrupBombAbilityNoStatLoss::
-	call BattleScript_AbilityNoStatLoss
-BattleScript_SyrupBombEnd2::
+BattleScript_SyrupBombTurnDmgEnd:
 	end2

 BattleScript_EffectMatchaGotcha::
@@ -538,6 +525,8 @@ BattleScript_CorrosiveGasFail:
 	goto BattleScript_MoveEnd

 BattleScript_EffectMakeItRain:
+	jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_MakeItRainDoubles
+BattleScript_MakeItRainContinuous:
 	setmoveeffect MOVE_EFFECT_PAYDAY
 	call BattleScript_EffectHit_Ret
 	seteffectwithchance
@@ -545,6 +534,9 @@ BattleScript_EffectMakeItRain:
 	setmoveeffect MOVE_EFFECT_SP_ATK_MINUS_1 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
 	seteffectprimary
 	goto BattleScript_MoveEnd
+BattleScript_MakeItRainDoubles:
+	jumpifword CMP_NO_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING | HITMARKER_NO_PPDEDUCT, BattleScript_NoMoveEffect
+	goto BattleScript_MakeItRainContinuous

 BattleScript_EffectSpinOut::
 	setmoveeffect MOVE_EFFECT_SPD_MINUS_2 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
@@ -758,8 +750,7 @@ BattleScript_AffectionBasedStatusHeal_Continue:
 	end2

 BattleScript_ShellTrapSetUp::
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 0x1
+	flushtextbox
 	playanimation BS_ATTACKER, B_ANIM_SHELL_TRAP_SETUP, NULL
 	printstring STRINGID_PREPARESHELLTRAP
 	waitmessage B_WAIT_TIME_LONG
@@ -832,8 +823,7 @@ BattleScript_EffectCourtChange::

 BattleScript_BeakBlastSetUp::
 	setbeakblast BS_ATTACKER
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	playanimation BS_ATTACKER, B_ANIM_BEAK_BLAST_SETUP, NULL
 	printstring STRINGID_HEATUPBEAK
 	waitmessage B_WAIT_TIME_LONG
@@ -857,7 +847,7 @@ BattleScript_EffectMeteorBeam::

 BattleScript_FirstChargingTurnMeteorBeam::
 	attackcanceler
-	printstring STRINGID_EMPTYSTRING3
+	flushtextbox
 	ppreduce
 	attackanimation
 	waitanimation
@@ -1048,7 +1038,7 @@ BattleScript_EffectPhotonGeyser:
 	goto BattleScript_MoveEnd

 BattleScript_EffectAuraWheel: @ Aura Wheel can only be used by Morpeko
-	jumpifspecies BS_ATTACKER, SPECIES_MORPEKO, BattleScript_EffectSpeedUpHit
+	jumpifspecies BS_ATTACKER, SPECIES_MORPEKO_FULL_BELLY, BattleScript_EffectSpeedUpHit
 	jumpifspecies BS_ATTACKER, SPECIES_MORPEKO_HANGRY, BattleScript_EffectSpeedUpHit
 	goto BattleScript_PokemonCantUseTheMove

@@ -1071,7 +1061,7 @@ BattleScript_EffectOctolock:
 	accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
 	attackstring
 	ppreduce
-	setoctolock BS_TARGET, BattleScript_ButItFailed
+	trysetoctolock BS_TARGET, BattleScript_ButItFailed
 	attackanimation
 	waitanimation
 	printstring STRINGID_CANTESCAPEBECAUSEOFCURRENTMOVE
@@ -1079,29 +1069,19 @@ BattleScript_EffectOctolock:
 	goto BattleScript_MoveEnd

 BattleScript_OctolockEndTurn::
-	setbyte sSTAT_ANIM_PLAYED, FALSE
-	jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_DEF, MIN_STAT_STAGE, BattleScript_OctolockLowerDef
-	jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_SPDEF, MIN_STAT_STAGE, BattleScript_OctolockTryLowerSpDef
-	goto BattleScript_OctolockEnd2
-BattleScript_OctolockLowerDef:
-	jumpifability BS_TARGET, ABILITY_BIG_PECKS, BattleScript_OctolockTryLowerSpDef
 	playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, STAT_CHANGE_NEGATIVE
-	setbyte sSTAT_ANIM_PLAYED, TRUE
 	setstatchanger STAT_DEF, 1, TRUE
-	statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_OctolockTryLowerSpDef
-	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_OctolockTryLowerSpDef
-	printfromtable gStatUpStringIds
+	statbuffchange STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_OctolockTryLowerSpDef
+BattleScript_OctolockTryLowerDef:
+	printfromtable gStatDownStringIds
 	waitmessage B_WAIT_TIME_LONG
 BattleScript_OctolockTryLowerSpDef:
-	jumpifbyte CMP_EQUAL, sSTAT_ANIM_PLAYED, TRUE, BattleScript_OctolockSkipSpDefAnim
-	playstatchangeanimation BS_ATTACKER, BIT_SPDEF, STAT_CHANGE_NEGATIVE
-BattleScript_OctolockSkipSpDefAnim:
 	setstatchanger STAT_SPDEF, 1, TRUE
-	statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_OctolockEnd2
-	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_OctolockEnd2
-	printfromtable gStatUpStringIds
+	statbuffchange STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_OctlockTurnDmgEnd
+BattleScript_OctolockTurnDmgPrintMsg:
+	printfromtable gStatDownStringIds
 	waitmessage B_WAIT_TIME_LONG
-BattleScript_OctolockEnd2::
+BattleScript_OctlockTurnDmgEnd:
 	end2

 BattleScript_EffectPoltergeist:
@@ -1161,7 +1141,7 @@ BattleScript_BothCanNoLongerEscape::

 BattleScript_EffectHyperspaceFury:
 	jumpifspecies BS_ATTACKER, SPECIES_HOOPA_UNBOUND, BattleScript_EffectHyperspaceFuryUnbound
-	jumpifspecies BS_ATTACKER, SPECIES_HOOPA, BattleScript_ButHoopaCantUseIt
+	jumpifspecies BS_ATTACKER, SPECIES_HOOPA_CONFINED, BattleScript_ButHoopaCantUseIt
 	goto BattleScript_PokemonCantUseTheMove

 BattleScript_EffectHyperspaceFuryUnbound::
@@ -1537,8 +1517,7 @@ BattleScript_MoveEffectCoreEnforcer::
 	waitmessage B_WAIT_TIME_LONG
 	trytoclearprimalweather
 	tryrevertweatherform
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 BattleScript_CoreEnforcerRet:
 	return

@@ -1632,8 +1611,7 @@ BattleScript_EffectPartingShotSwitch:
 	switchindataupdate BS_ATTACKER
 	hpthresholds BS_ATTACKER
 	trytoclearprimalweather
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	printstring STRINGID_SWITCHINMON
 	switchinanim BS_ATTACKER, TRUE
 	waitstate
@@ -1988,8 +1966,7 @@ BattleScript_SynchronoiseLoop:
 	waitmessage B_WAIT_TIME_LONG
 	resultmessage
 	waitmessage B_WAIT_TIME_LONG
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	tryfaintmon BS_TARGET
 BattleScript_SynchronoiseMoveTargetEnd:
 	moveendto MOVEEND_NEXT_TARGET
@@ -2138,10 +2115,14 @@ BattleScript_EffectHitSwitchTarget:
 	moveendall
 	jumpifability BS_TARGET, ABILITY_SUCTION_CUPS, BattleScript_AbilityPreventsPhasingOut
 	jumpifstatus3 BS_TARGET, STATUS3_ROOTED, BattleScript_PrintMonIsRooted
+	jumpiftargetdynamaxed BattleScript_HitSwitchTargetDynamaxed
 	tryhitswitchtarget BattleScript_MoveEnd
 	forcerandomswitch BattleScript_HitSwitchTargetForceRandomSwitchFailed
 	goto BattleScript_MoveEnd

+BattleScript_HitSwitchTargetDynamaxed:
+	printstring STRINGID_MOVEBLOCKEDBYDYNAMAX
+	waitmessage B_WAIT_TIME_LONG
 BattleScript_HitSwitchTargetForceRandomSwitchFailed:
 	hitswitchtargetfailed
 	setbyte sSWITCH_CASE, B_SWITCH_NORMAL
@@ -2669,8 +2650,7 @@ BattleScript_EffectSimpleBeam:
 	waitmessage B_WAIT_TIME_LONG
 	trytoclearprimalweather
 	tryrevertweatherform
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	tryendneutralizinggas BS_TARGET
 	goto BattleScript_MoveEnd

@@ -2723,8 +2703,7 @@ BattleScript_EffectHealingWish:
 	switchindataupdate BS_ATTACKER
 	hpthresholds BS_ATTACKER
 	trytoclearprimalweather
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	printstring STRINGID_SWITCHINMON
 	switchinanim BS_ATTACKER, TRUE
 	waitstate
@@ -2769,8 +2748,7 @@ BattleScript_EffectWorrySeed:
 	waitmessage B_WAIT_TIME_LONG
 	trytoclearprimalweather
 	tryrevertweatherform
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	goto BattleScript_MoveEnd

 BattleScript_EffectPowerSplit:
@@ -2901,8 +2879,7 @@ BattleScript_EffectGastroAcid:
 	waitmessage B_WAIT_TIME_LONG
 	trytoclearprimalweather
 	tryrevertweatherform
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	tryendneutralizinggas BS_TARGET
 	goto BattleScript_MoveEnd

@@ -3037,6 +3014,7 @@ BattleScript_EffectGravity:
 	setgravity BattleScript_ButItFailed
 	attackanimation
 	waitanimation
+BattleScript_EffectGravitySuccess::
 	printstring STRINGID_GRAVITYINTENSIFIED
 	waitmessage B_WAIT_TIME_LONG
 	selectfirstvalidtarget
@@ -3111,8 +3089,7 @@ BattleScript_EffectHitEscape:
 	switchindataupdate BS_ATTACKER
 	hpthresholds BS_ATTACKER
 	trytoclearprimalweather
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	printstring STRINGID_SWITCHINMON
 	switchinanim BS_ATTACKER, TRUE
 	waitstate
@@ -3727,11 +3704,17 @@ BattleScript_EffectRoar::
 	jumpifability BS_TARGET, ABILITY_GUARD_DOG, BattleScript_ButItFailed
 	jumpifability BS_TARGET, ABILITY_SUCTION_CUPS, BattleScript_AbilityPreventsPhasingOut
 	jumpifstatus3 BS_TARGET, STATUS3_ROOTED, BattleScript_PrintMonIsRooted
+	jumpiftargetdynamaxed BattleScript_RoarBlockedByDynamax
 	accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
 	accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
 	jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_ButItFailed
 	forcerandomswitch BattleScript_ButItFailed

+BattleScript_RoarBlockedByDynamax:
+	printstring STRINGID_MOVEBLOCKEDBYDYNAMAX
+	waitmessage B_WAIT_TIME_LONG
+	goto BattleScript_MoveEnd
+
 BattleScript_EffectMultiHit::
 	attackcanceler
 	accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
@@ -3762,8 +3745,7 @@ BattleScript_DoMultiHit::
 	critmessage
 	waitmessage B_WAIT_TIME_LONG
 	multihitresultmessage
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	addbyte sMULTIHIT_STRING + 4, 1
 	moveendto MOVEEND_NEXT_TARGET
 	jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_MultiHitPrintStrings
@@ -3954,7 +3936,7 @@ BattleScript_TwoTurnMovesSecondTurn::

 BattleScriptFirstChargingTurn::
 	attackcanceler
-	printstring STRINGID_EMPTYSTRING3
+	flushtextbox
 	ppreduce
 	attackstring
 BattleScriptFirstChargingTurnAfterAttackString:
@@ -4129,8 +4111,7 @@ BattleScript_EffectTransform::
 	attackstring
 	ppreduce
 	trytoclearprimalweather
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	transformdataexecution
 	attackanimation
 	waitanimation
@@ -4174,6 +4155,7 @@ BattleScript_EffectReflect::
 BattleScript_PrintReflectLightScreenSafeguardString::
 	attackanimation
 	waitanimation
+BattleScript_EffectAuroraVeilSuccess::
 	printfromtable gReflectLightScreenSafeguardStringIds
 	waitmessage B_WAIT_TIME_LONG
 	goto BattleScript_MoveEnd
@@ -5030,8 +5012,7 @@ BattleScript_EffectBatonPass::
 	switchindataupdate BS_ATTACKER
 	hpthresholds BS_ATTACKER
 	trytoclearprimalweather
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	printstring STRINGID_SWITCHINMON
 	switchinanim BS_ATTACKER, TRUE
 	waitstate
@@ -5926,6 +5907,7 @@ BattleScript_EffectYawn::
 	setyawn BattleScript_ButItFailed
 	attackanimation
 	waitanimation
+ BattleScript_EffectYawnSuccess::
 	printstring STRINGID_PKMNWASMADEDROWSY
 	waitmessage B_WAIT_TIME_LONG
 	goto BattleScript_MoveEnd
@@ -6357,8 +6339,7 @@ BattleScript_FaintedMonTryChoose:
 	switchindataupdate BS_ATTACKER
 	hpthresholds BS_ATTACKER
 	trytoclearprimalweather
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	printstring STRINGID_SWITCHINMON
 	hidepartystatussummary BS_ATTACKER
 	switchinanim BS_ATTACKER, 0
@@ -6370,8 +6351,7 @@ BattleScript_FaintedMonSendOutNew:
 	switchindataupdate BS_FAINTED
 	hpthresholds BS_FAINTED
 	trytoclearprimalweather
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	printstring STRINGID_SWITCHINMON
 	hidepartystatussummary BS_FAINTED
 	switchinanim BS_FAINTED, FALSE
@@ -6405,8 +6385,7 @@ BattleScript_LinkHandleFaintedMonLoop::
 	switchindataupdate BS_FAINTED
 	hpthresholds BS_FAINTED
 	trytoclearprimalweather
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	printstring STRINGID_SWITCHINMON
 	hidepartystatussummary BS_FAINTED
 	switchinanim BS_FAINTED, FALSE
@@ -6620,6 +6599,7 @@ BattleScript_PursuitSwitchDmgLoop::
 BattleScript_DoSwitchOut::
 	decrementmultihit BattleScript_PursuitSwitchDmgLoop
 	switchoutabilities BS_ATTACKER
+	updatedynamax
 	waitstate
 	returnatktoball
 	waitstate
@@ -6629,8 +6609,7 @@ BattleScript_DoSwitchOut::
 	switchindataupdate BS_ATTACKER
 	hpthresholds BS_ATTACKER
 	trytoclearprimalweather
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	printstring STRINGID_SWITCHINMON
 	hidepartystatussummary BS_ATTACKER
 	switchinanim BS_ATTACKER, FALSE
@@ -6925,8 +6904,7 @@ BattleScript_RoarSuccessSwitch::
 	getswitchedmondata BS_TARGET
 	switchindataupdate BS_TARGET
 	trytoclearprimalweather
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	switchinanim BS_TARGET, FALSE
 	waitstate
 	printstring STRINGID_PKMNWASDRAGGEDOUT
@@ -7368,6 +7346,11 @@ BattleScript_StealthRockFree::
 	waitmessage B_WAIT_TIME_LONG
 	return

+BattleScript_SteelsurgeFree::
+	printstring STRINGID_PKMNBLEWAWAYSHARPSTEEL
+	waitmessage B_WAIT_TIME_LONG
+	return
+
 BattleScript_SpikesDefog::
 	printstring STRINGID_SPIKESDISAPPEAREDFROMTEAM
 	waitmessage B_WAIT_TIME_LONG
@@ -7388,6 +7371,11 @@ BattleScript_StealthRockDefog::
 	waitmessage B_WAIT_TIME_LONG
 	return

+BattleScript_SteelsurgeDefog::
+	printstring STRINGID_SHARPSTEELDISAPPEAREDFROMTEAM
+	waitmessage B_WAIT_TIME_LONG
+	return
+
 BattleScript_MonTookFutureAttack::
 	printstring STRINGID_PKMNTOOKATTACK
 	waitmessage B_WAIT_TIME_LONG
@@ -7742,15 +7730,14 @@ BattleScript_MoveEffectClearSmog::
 	return

 BattleScript_FocusPunchSetUp::
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	playanimation BS_ATTACKER, B_ANIM_FOCUS_PUNCH_SETUP
 	printstring STRINGID_PKMNTIGHTENINGFOCUS
 	waitmessage B_WAIT_TIME_LONG
 	end3

 BattleScript_MegaEvolution::
-	printstring STRINGID_EMPTYSTRING3
+	flushtextbox
 	trytrainerslidemegaevolutionmsg BS_ATTACKER
 	printstring STRINGID_MEGAEVOREACTING
 BattleScript_MegaEvolutionAfterString:
@@ -7766,7 +7753,7 @@ BattleScript_MegaEvolutionAfterString:
 	end3

 BattleScript_WishMegaEvolution::
-	printstring STRINGID_EMPTYSTRING3
+	flushtextbox
 	trytrainerslidemegaevolutionmsg BS_ATTACKER
 	printstring STRINGID_FERVENTWISHREACHED
 	goto BattleScript_MegaEvolutionAfterString
@@ -7781,8 +7768,7 @@ BattleScript_PrimalReversionRestoreAttacker::
 	end2

 BattleScript_PrimalReversionRet::
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	setbyte gIsCriticalHit, 0
 	handleprimalreversion BS_ATTACKER, 0
 	handleprimalreversion BS_ATTACKER, 1
@@ -7795,7 +7781,7 @@ BattleScript_PrimalReversionRet::
 	return

 BattleScript_UltraBurst::
-	printstring STRINGID_EMPTYSTRING3
+	flushtextbox
 	trytrainerslidezmovemsg BS_ATTACKER
 	printstring STRINGID_ULTRABURSTREACTING
 	waitmessage B_WAIT_TIME_LONG
@@ -7813,8 +7799,7 @@ BattleScript_AttackerFormChange::
 	pause 5
 	copybyte gBattlerAbility, gBattlerAttacker
 	call BattleScript_AbilityPopUp
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 BattleScript_AttackerFormChangeNoPopup::
 	handleformchange BS_ATTACKER, 0
 	handleformchange BS_ATTACKER, 1
@@ -7861,8 +7846,7 @@ BattleScript_CudChewActivates::
 	end3

 BattleScript_TargetFormChangeNoPopup:
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	handleformchange BS_TARGET, 0
 	handleformchange BS_TARGET, 1
 	playanimation BS_TARGET, B_ANIM_FORM_CHANGE
@@ -7893,8 +7877,7 @@ BattleScript_TargetFormChangeWithStringNoPopup::
 BattleScript_BattlerFormChangeWithStringEnd3::
 	pause 5
 	call BattleScript_AbilityPopUp
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	handleformchange BS_SCRIPTING, 0
 	handleformchange BS_SCRIPTING, 1
 	playanimation BS_SCRIPTING, B_ANIM_FORM_CHANGE, NULL
@@ -8573,13 +8556,6 @@ BattleScript_IntimidateLoop:
 	jumpiftargetally BattleScript_IntimidateLoopIncrement
 	jumpifabsent BS_TARGET, BattleScript_IntimidateLoopIncrement
 	jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_IntimidateLoopIncrement
-	jumpifability BS_TARGET, ABILITY_HYPER_CUTTER, BattleScript_IntimidatePrevented
-.if B_UPDATED_INTIMIDATE >= GEN_8
-	jumpifability BS_TARGET, ABILITY_INNER_FOCUS, BattleScript_IntimidatePrevented
-	jumpifability BS_TARGET, ABILITY_SCRAPPY, BattleScript_IntimidatePrevented
-	jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_IntimidatePrevented
-	jumpifability BS_TARGET, ABILITY_OBLIVIOUS, BattleScript_IntimidatePrevented
-.endif
 	jumpifability BS_TARGET, ABILITY_GUARD_DOG, BattleScript_IntimidateInReverse
 BattleScript_IntimidateEffect:
 	copybyte sBATTLER, gBattlerAttacker
@@ -8612,16 +8588,6 @@ BattleScript_IntimidateContrary_WontIncrease:
 	printstring STRINGID_TARGETSTATWONTGOHIGHER
 	goto BattleScript_IntimidateEffect_WaitString

-BattleScript_IntimidatePrevented:
-	call BattleScript_AbilityPopUp
-	pause B_WAIT_TIME_LONG
-	setbyte gBattleCommunication STAT_ATK
-	stattextbuffer BS_TARGET
-	printstring STRINGID_STATWASNOTLOWERED
-	waitmessage B_WAIT_TIME_LONG
-	call BattleScript_TryAdrenalineOrb
-	goto BattleScript_IntimidateLoopIncrement
-
 BattleScript_IntimidateInReverse:
 	copybyte sBATTLER, gBattlerTarget
 	call BattleScript_AbilityPopUpTarget
@@ -8928,7 +8894,7 @@ BattleScript_AbilityNoStatLoss::

 BattleScript_ItemNoStatLoss::
 	pause B_WAIT_TIME_SHORT
-	printstring STRINGID_STATWASNOTLOWERED
+	printstring STRINGID_CLEARAMULETWONTLOWERSTATS
 	waitmessage B_WAIT_TIME_LONG
 	return

@@ -9771,7 +9737,7 @@ BattleScript_ActionSelectionItemsCantBeUsed::
 	endselectionscript

 BattleScript_FlushMessageBox::
-	printstring STRINGID_EMPTYSTRING3
+	flushtextbox
 	return

 BattleScript_PalacePrintFlavorText::
@@ -9958,8 +9924,7 @@ BattleScript_AnnounceAirLockCloudNine::
 	end3

 BattleScript_QuickClawActivation::
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT
 	waitanimation
 	printstring STRINGID_CANACTFASTERTHANKSTO
@@ -9967,16 +9932,14 @@ BattleScript_QuickClawActivation::
 	end2

 BattleScript_QuickDrawActivation::
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	call BattleScript_AbilityPopUp
 	printstring STRINGID_CANACTFASTERTHANKSTO
 	waitmessage B_WAIT_TIME_LONG
 	end2

 BattleScript_CustapBerryActivation::
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT
 	waitanimation
 	printstring STRINGID_CANACTFASTERTHANKSTO
@@ -10024,7 +9987,7 @@ BattleScript_JabocaRowapBerryActivate_Dmg:

@ z moves / effects
 BattleScript_ZMoveActivateDamaging::
-	printstring STRINGID_EMPTYSTRING3
+	flushtextbox
 	trytrainerslidezmovemsg BS_ATTACKER
 	printstring STRINGID_ZPOWERSURROUNDS
 	playanimation BS_ATTACKER, B_ANIM_ZMOVE_ACTIVATE, NULL
@@ -10033,7 +9996,7 @@ BattleScript_ZMoveActivateDamaging::
 	return

 BattleScript_ZMoveActivateStatus::
-	printstring STRINGID_EMPTYSTRING3
+	flushtextbox
 	trytrainerslidezmovemsg BS_ATTACKER
 	savetarget
 	printstring STRINGID_ZPOWERSURROUNDS
@@ -10202,6 +10165,7 @@ BattleScript_RedCardActivates::
 	swapattackerwithtarget
 	jumpifstatus3 BS_EFFECT_BATTLER, STATUS3_ROOTED, BattleScript_RedCardIngrain
 	jumpifability BS_EFFECT_BATTLER, ABILITY_SUCTION_CUPS, BattleScript_RedCardSuctionCups
+	jumpiftargetdynamaxed BattleScript_RedCardDynamaxed
 	removeitem BS_SCRIPTING
 	setbyte sSWITCH_CASE, B_SWITCH_RED_CARD
 	forcerandomswitch BattleScript_RedCardEnd
@@ -10220,6 +10184,12 @@ BattleScript_RedCardSuctionCups:
 	removeitem BS_SCRIPTING
 	swapattackerwithtarget
 	return
+BattleScript_RedCardDynamaxed:
+	printstring STRINGID_MOVEBLOCKEDBYDYNAMAX
+	waitmessage B_WAIT_TIME_LONG
+	removeitem BS_SCRIPTING
+	swapattackerwithtarget
+	return

 BattleScript_EjectButtonActivates::
 	makevisible BS_ATTACKER
@@ -10237,8 +10207,7 @@ BattleScript_EjectButtonActivates::
 	switchindataupdate BS_SCRIPTING
 	hpthresholds BS_SCRIPTING
 	trytoclearprimalweather
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
+	flushtextbox
 	printstring 0x3
 	switchinanim BS_SCRIPTING 0x1
 	waitstate
@@ -10358,6 +10327,294 @@ BattleScript_TargetAbilityStatRaiseRet_End:
 	copybyte gBattlerAttacker, sSAVED_BATTLER
 	return

+@@@ MAX MOVES @@@
+BattleScript_EffectMaxMove::
+	attackcanceler
+	accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
+	attackstring
+	ppreduce
+	critcalc
+	damagecalc
+	adjustdamage
+	attackanimation
+	waitanimation
+	effectivenesssound
+	hitanimation BS_TARGET
+	waitstate
+	healthbarupdate BS_TARGET
+	datahpupdate BS_TARGET
+	critmessage
+	waitmessage B_WAIT_TIME_LONG
+	resultmessage
+	waitmessage B_WAIT_TIME_LONG
+	tryfaintmon BS_TARGET
+	setmaxmoveeffect
+	moveendall
+	end
+
+BattleScript_EffectRaiseStatAllies::
+	savetarget
+	copybyte gBattlerTarget, gBattlerAttacker
+BattleScript_RaiseSideStatsLoop:
+	jumpifabsent BS_TARGET, BattleScript_RaiseSideStatsIncrement
+	statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_RaiseSideStatsIncrement
+	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_RaiseSideStatsIncrement
+	setgraphicalstatchangevalues
+	playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+	printfromtable gStatUpStringIds
+	waitmessage B_WAIT_TIME_LONG
+BattleScript_RaiseSideStatsIncrement:
+	setbyte sSTAT_ANIM_PLAYED, FALSE
+	jumpifbytenotequal gBattlerTarget, gBattlerAttacker, BattleScript_RaiseSideStatsEnd
+	setallytonexttarget BattleScript_RaiseSideStatsLoop
+BattleScript_RaiseSideStatsEnd:
+	restoretarget
+	goto BattleScript_MoveEnd
+
+BattleScript_EffectLowerStatFoes::
+	savetarget
+	copybyte sBATTLER, gBattlerTarget
+BattleScript_LowerSideStatsLoop:
+	jumpifabsent BS_TARGET, BattleScript_LowerSideStatsIncrement
+	statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_LowerSideStatsIncrement
+	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_LowerSideStatsIncrement
+	setgraphicalstatchangevalues
+	playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+	printfromtable gStatDownStringIds
+	waitmessage B_WAIT_TIME_LONG
+BattleScript_LowerSideStatsIncrement:
+	setbyte sSTAT_ANIM_PLAYED, FALSE
+	jumpifbytenotequal gBattlerTarget, sBATTLER, BattleScript_LowerSideStatsEnd
+	setallytonexttarget BattleScript_LowerSideStatsLoop
+BattleScript_LowerSideStatsEnd:
+	restoretarget
+	goto BattleScript_MoveEnd
+
+BattleScript_EffectSetWeather::
+	playanimation 0, B_ANIM_MAX_SET_WEATHER
+	printfromtable gMoveWeatherChangeStringIds
+	waitmessage B_WAIT_TIME_LONG
+	call BattleScript_ActivateWeatherAbilities
+	goto BattleScript_MoveEnd
+
+BattleScript_EffectSetTerrain::
+	printfromtable gTerrainStringIds
+	waitmessage B_WAIT_TIME_LONG
+	playanimation BS_ATTACKER, B_ANIM_RESTORE_BG
+	call BattleScript_ActivateTerrainEffects
+	goto BattleScript_MoveEnd
+
+BattleScript_DamageNonTypesStarts::
+	printfromtable gDamageNonTypesStartStringIds
+	waitmessage B_WAIT_TIME_LONG
+	goto BattleScript_MoveEnd
+
+BattleScript_DamageNonTypesContinues::
+	setbyte gBattleCommunication, 0
+BattleScript_DamageNonTypesLoop::
+	copyarraywithindex gBattlerAttacker, gBattlerByTurnOrder, gBattleCommunication, 1
+	damagenontypes
+	jumpifword CMP_EQUAL, gBattleMoveDamage, 0, BattleScript_DamageNonTypesLoopIncrement
+	printfromtable gDamageNonTypesDmgStringIds
+	waitmessage B_WAIT_TIME_LONG
+	effectivenesssound
+	hitanimation BS_ATTACKER
+	orword gHitMarker, HITMARKER_SKIP_DMG_TRACK | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE | HITMARKER_GRUDGE
+	healthbarupdate BS_ATTACKER
+	datahpupdate BS_ATTACKER
+	tryfaintmon BS_ATTACKER
+	checkteamslost BattleScript_DamageNonTypesLoopIncrement
+BattleScript_DamageNonTypesLoopIncrement::
+	jumpifbyte CMP_NOT_EQUAL, gBattleOutcome, 0, BattleScript_DamageNonTypesContinuesEnd
+	addbyte gBattleCommunication, 1
+	jumpifbytenotequal gBattleCommunication, gBattlersCount, BattleScript_DamageNonTypesLoop
+BattleScript_DamageNonTypesContinuesEnd::
+	bicword gHitMarker, HITMARKER_SKIP_DMG_TRACK | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE | HITMARKER_GRUDGE
+	end2
+
+BattleScript_EffectTryReducePP::
+	tryspiteppreduce BattleScript_MoveEnd
+	printstring STRINGID_PKMNREDUCEDPP
+	waitmessage B_WAIT_TIME_LONG
+	goto BattleScript_MoveEnd
+
+BattleScript_EffectStatus1Foes::
+	savetarget
+	copybyte sBATTLER, gBattlerTarget
+BattleScript_Status1FoesLoop:
+	jumpifabsent BS_TARGET, BattleScript_Status1FoesIncrement
+	trysetstatus1 BattleScript_Status1FoesIncrement
+	statusanimation BS_TARGET
+	updatestatusicon BS_TARGET
+	printfromtable gStatusConditionsStringIds
+	waitmessage B_WAIT_TIME_LONG
+	updatestatusicon BS_EFFECT_BATTLER
+	waitstate
+BattleScript_Status1FoesIncrement:
+	jumpifbytenotequal gBattlerTarget, sBATTLER, BattleScript_Status1FoesEnd
+	setallytonexttarget BattleScript_Status1FoesLoop
+BattleScript_Status1FoesEnd:
+	restoretarget
+	goto BattleScript_MoveEnd
+
+BattleScript_EffectStatus2Foes::
+	savetarget
+	copybyte sBATTLER, gBattlerTarget
+BattleScript_Status2FoesLoop:
+	jumpifabsent BS_TARGET, BattleScript_Status2FoesIncrement
+	trysetstatus2 BattleScript_Status2FoesIncrement
+	jumpifbyte CMP_EQUAL, gBattleCommunication, 1, BattleScript_DoConfuseAnim
+	jumpifbyte CMP_EQUAL, gBattleCommunication, 2, BattleScript_DoInfatuationAnim
+BattleScript_Status2FoesPrintMessage:
+	printfromtable gStatus2StringIds
+	waitmessage B_WAIT_TIME_LONG
+BattleScript_Status2FoesIncrement:
+	jumpifbytenotequal gBattlerTarget, sBATTLER, BattleScript_Status2FoesEnd
+	setallytonexttarget BattleScript_Status2FoesLoop
+BattleScript_Status2FoesEnd:
+	restoretarget
+	jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 1, BattleScript_PrintCoinsScattered @ Gold Rush
+	goto BattleScript_MoveEnd
+
+BattleScript_DoConfuseAnim:
+	status2animation BS_EFFECT_BATTLER, STATUS2_CONFUSION
+	goto BattleScript_Status2FoesPrintMessage
+
+BattleScript_DoInfatuationAnim:
+	status2animation BS_EFFECT_BATTLER, STATUS2_INFATUATION
+	goto BattleScript_Status2FoesPrintMessage
+
+BattleScript_PrintCoinsScattered:
+	printstring STRINGID_COINSSCATTERED
+	goto BattleScript_MoveEnd
+
+BattleScript_TormentEnds::
+	printstring STRINGID_TORMENTEDNOMORE
+	waitmessage B_WAIT_TIME_LONG
+	end2
+
+BattleScript_EffectRaiseCritAlliesAnim::
+	savetarget
+	copybyte gBattlerTarget, gBattlerAttacker
+BattleScript_RaiseCritAlliesLoop:
+	jumpifabsent BS_TARGET, BattleScript_RaiseCritAlliesIncrement
+	setstatchanger STAT_ATK, 0, FALSE @ for animation
+	setgraphicalstatchangevalues
+	playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+	swapattackerwithtarget
+	printstring STRINGID_PKMNGETTINGPUMPED
+	waitmessage B_WAIT_TIME_LONG
+	swapattackerwithtarget
+BattleScript_RaiseCritAlliesIncrement:
+	setbyte sSTAT_ANIM_PLAYED, FALSE
+	jumpifbytenotequal gBattlerTarget, gBattlerAttacker, BattleScript_RaiseCritAlliesEnd
+	setallytonexttarget BattleScript_RaiseCritAlliesLoop
+BattleScript_RaiseCritAlliesEnd:
+	restoretarget
+	goto BattleScript_MoveEnd
+
+BattleScript_EffectHealOneSixthAllies::
+	jumpifteamhealthy BS_ATTACKER, BattleScript_MoveEnd
+	savetarget
+	copybyte gBattlerTarget, gBattlerAttacker
+BattleScript_HealOneSixthAlliesLoop:
+	jumpifabsent BS_TARGET, BattleScript_HealOneSixthAlliesIncrement
+	tryhealsixthhealth BattleScript_HealOneSixthAlliesIncrement
+	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
+	healthbarupdate BS_TARGET
+	datahpupdate BS_TARGET
+	printstring STRINGID_PKMNREGAINEDHEALTH
+	waitmessage B_WAIT_TIME_LONG
+BattleScript_HealOneSixthAlliesIncrement:
+	jumpifbytenotequal gBattlerTarget, gBattlerAttacker, BattleScript_HealOneSixthAlliesEnd
+	setallytonexttarget BattleScript_HealOneSixthAlliesLoop
+BattleScript_HealOneSixthAlliesEnd:
+	restoretarget
+	goto BattleScript_MoveEnd
+
+BattleScript_EffectCureStatusAllies::
+	jumpifteamhealthy BS_ATTACKER, BattleScript_MoveEnd
+	savetarget
+	copybyte gBattlerTarget, gBattlerAttacker
+BattleScript_CureStatusAlliesLoop:
+	jumpifabsent BS_TARGET, BattleScript_CureStatusAlliesIncrement
+	jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_CureStatusActivate
+BattleScript_CureStatusAlliesIncrement:
+	jumpifbytenotequal gBattlerTarget, gBattlerAttacker, BattleScript_CureStatusAlliesEnd
+	setallytonexttarget BattleScript_CureStatusAlliesLoop
+BattleScript_CureStatusAlliesEnd:
+	restoretarget
+	goto BattleScript_MoveEnd
+
+BattleScript_CureStatusActivate:
+	curestatus BS_TARGET
+	updatestatusicon BS_TARGET
+	swapattackerwithtarget
+	printstring STRINGID_PKMNSTATUSNORMAL
+	waitmessage B_WAIT_TIME_LONG
+	swapattackerwithtarget
+	goto BattleScript_CureStatusAlliesIncrement
+
+BattleScript_EffectRecycleBerriesAllies::
+	savetarget
+	copybyte gBattlerTarget, gBattlerAttacker
+BattleScript_RecycleBerriesAlliesLoop:
+	jumpifabsent BS_TARGET, BattleScript_RecycleBerriesAlliesIncrement
+	tryrecycleberry BattleScript_RecycleBerriesAlliesIncrement
+	swapattackerwithtarget
+	printstring STRINGID_XFOUNDONEY
+	waitmessage B_WAIT_TIME_LONG
+	swapattackerwithtarget
+BattleScript_RecycleBerriesAlliesIncrement:
+	jumpifbytenotequal gBattlerTarget, gBattlerAttacker, BattleScript_RecycleBerriesAlliesEnd
+	setallytonexttarget BattleScript_RecycleBerriesAlliesLoop
+BattleScript_RecycleBerriesAlliesEnd:
+	restoretarget
+	goto BattleScript_MoveEnd
+
+BattleScript_EffectStonesurge::
+	setstealthrock BattleScript_MoveEnd
+	printfromtable gDmgHazardsStringIds
+	waitmessage B_WAIT_TIME_LONG
+	goto BattleScript_MoveEnd
+
+BattleScript_EffectSteelsurge::
+	setsteelsurge BattleScript_MoveEnd
+	printfromtable gDmgHazardsStringIds
+	waitmessage B_WAIT_TIME_LONG
+	goto BattleScript_MoveEnd
+
+@@@ END MAX MOVES @@@
+
+BattleScript_DynamaxBegins::
+	flushtextbox
+	returnatktoball
+	pause B_WAIT_TIME_SHORT
+	returntoball BS_SCRIPTING
+	switchinanim BS_SCRIPTING, TRUE
+	updatedynamax
+	playanimation BS_SCRIPTING, B_ANIM_DYNAMAX_GROWTH
+	waitanimation
+	end3
+
+BattleScript_DynamaxEnds::
+	flushtextbox
+	updatedynamax
+	playanimation BS_SCRIPTING, B_ANIM_FORM_CHANGE
+	waitanimation
+	end2
+
+BattleScript_MoveBlockedByDynamax::
+	accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
+	attackstring
+	pause B_WAIT_TIME_SHORT
+	ppreduce
+	jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_STRING_PRINTED, BattleScript_MoveEnd
+	printstring STRINGID_MOVEBLOCKEDBYDYNAMAX
+	waitmessage B_WAIT_TIME_LONG
+	orword gHitMarker, HITMARKER_STRING_PRINTED
+	goto BattleScript_MoveEnd
+
 BattleScript_PokemonCantUseTheMove::
 	attackstring
 	ppreduce
--- a/data/battle_scripts_2.s
+++ b/data/battle_scripts_2.s
@@ -245,7 +245,7 @@ BattleScript_TrainerASlideMsgRet::
 BattleScript_TrainerASlideMsgEnd2::
    call BattleScript_TrainerASlideMsgRet
    end2
-    
+
 BattleScript_TrainerBSlideMsgRet::
    handletrainerslidemsg BS_SCRIPTING, 0
    trainerslidein B_POSITION_OPPONENT_RIGHT
--- a/data/contest_ai_scripts.s
+++ b/data/contest_ai_scripts.s
@@ -1,3 +1,4 @@
+#include "config.h"
 #include "constants/global.h"
 #include "constants/contest.h"
 	.include "asm/macros.inc"
@@ -435,11 +436,11 @@ AI_CGM_BetterWhenAudienceExcited:
 AI_CGM_BetterWhenAudienceExcited_1stUp:
 	@ BUG: Should be if_appeal_num_eq 0
 	@ 1st up on 1st appeal excitement will always be 0
-.ifdef BUGFIX
+#ifdef BUGFIX
 	if_appeal_num_eq 0, AI_CGM_BetterWhenAudienceExcited_1stAppeal
-.else
+#else
 	if_appeal_num_not_eq 0, AI_CGM_BetterWhenAudienceExcited_1stAppeal
-.endif
+#endif
 	if_excitement_eq 4, AI_CGM_BetterWhenAudienceExcited_1AwayFromMax
 	if_excitement_eq 3, AI_CGM_BetterWhenAudienceExcited_2AwayFromMax
 	end
@@ -546,11 +547,11 @@ AI_CGM_TargetMonWithJudgesAttention:
 	end
 AI_CGM_TargetMonWithJudgesAttention_CheckMon1:
 	if_cannot_participate MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
-.ifdef BUGFIX
+#ifdef BUGFIX
 	if_not_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
-.else
+#else
 	if_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
-.endif
+#endif
 	if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
 	score +2
 	if_not_completed_combo MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
@@ -559,11 +560,11 @@ AI_CGM_TargetMonWithJudgesAttention_CheckMon1:
 AI_CGM_TargetMonWithJudgesAttention_CheckMon2:
 	if_user_order_eq MON_2, AI_CGM_End
 	if_cannot_participate MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
-.ifdef BUGFIX
+#ifdef BUGFIX
 	if_not_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
-.else
+#else
 	if_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
-.endif
+#endif
 	if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
 	score +2
 	if_not_completed_combo MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
@@ -572,11 +573,11 @@ AI_CGM_TargetMonWithJudgesAttention_CheckMon2:
 AI_CGM_TargetMonWithJudgesAttention_CheckMon3:
 	if_user_order_eq MON_3, AI_CGM_End
 	if_cannot_participate MON_3, AI_CGM_End
-.ifdef BUGFIX
+#ifdef BUGFIX
 	if_not_used_combo_starter MON_3, AI_CGM_End
-.else
+#else
 	if_used_combo_starter MON_3, AI_CGM_End
-.endif
+#endif
 	if_random_less_than 125, AI_CGM_End
 	score +2
 	if_not_completed_combo MON_3, AI_CGM_End
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1,3 +1,4 @@
+#include "config.h"
 #include "config/battle.h"
 #include "config/item.h"
 #include "constants/global.h"
--- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
@@ -415,18 +415,18 @@ BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeLinkMultisChallenge::
@ to the flash, but not data in PokemonStorage. The SaveGame script that follows asks the player to do a full save,
@ which they can opt out of. As a result the player can save their party and quit without having saved the PC.
@ This allows players to clone pokemon and their held items by withdrawing them (or erase them by despositing).
-.ifndef BUGFIX
+#ifndef BUGFIX
 	tower_save 0
-.endif
+#endif
 	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_CHALLENGE_STATUS, 255
 	goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed
@ GAME_STAT_ENTERED_BATTLE_TOWER should not be incremented here, for two reasons:
@ 1. It is incremented again in BattleFrontier_BattleTowerLobby_EventScript_CableLinkSuccessful or BattleFrontier_BattleTowerLobby_EventScript_WirelessLinkSuccessful
-@ 2. If the player tries to save, but fails, the counter will still be incremented even if the player never enters the tower.
-.ifndef BUGFIX
+@ 2. If the player tries to connect, but fails, the counter will still be incremented even if the player never enters the tower.
+#ifndef BUGFIX
 	incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER
-.endif
+#endif
 	specialvar VAR_RESULT, IsWirelessAdapterConnected
 	goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleTowerLobby_EventScript_TryWirelessLink
 	goto BattleFrontier_BattleTowerLobby_EventScript_TryCableLink
--- a/data/maps/BirthIsland_Exterior/scripts.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -81,11 +81,11 @@ BirthIsland_Exterior_EventScript_Deoxys::
 	applymovement LOCALID_DEOXYS, BirthIsland_Exterior_Movement_DeoxysApproach
 	waitmovement 0
 	waitse
-	playmoncry SPECIES_DEOXYS, CRY_MODE_ENCOUNTER
+	playmoncry SPECIES_DEOXYS_NORMAL, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
 	setvar VAR_LAST_TALKED, LOCALID_DEOXYS
-	seteventmon SPECIES_DEOXYS, 30
+	seteventmon SPECIES_DEOXYS_NORMAL, 30
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	special BattleSetup_StartLegendaryBattle
 	waitstate
@@ -100,12 +100,12 @@ BirthIsland_Exterior_EventScript_Deoxys::

 BirthIsland_Exterior_EventScript_DefeatedDeoxys::
 	setflag FLAG_DEFEATED_DEOXYS
-	setvar VAR_0x8004, SPECIES_DEOXYS
+	setvar VAR_0x8004, SPECIES_DEOXYS_NORMAL
 	goto Common_EventScript_LegendaryFlewAway
 	end

 BirthIsland_Exterior_EventScript_RanFromDeoxys::
-	setvar VAR_0x8004, SPECIES_DEOXYS
+	setvar VAR_0x8004, SPECIES_DEOXYS_NORMAL
 	goto Common_EventScript_LegendaryFlewAway
 	end

--- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
@@ -229,11 +229,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_Grunt2::
 	copyobjectxytoperm LOCALID_STAIR_GRUNT
 	switch VAR_FACING
 	case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsWest
-	#ifdef BUGFIX
+#ifdef BUGFIX
 	case DIR_EAST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast
-	#else
+#else
 	case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast
-	#endif
+#endif
 	applymovement LOCALID_STAIR_GRUNT, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairs
 	waitmovement 0
 	setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 2
--- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
@@ -88,8 +88,8 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated::

 Route119_WeatherInstitute_2F_EventScript_ReceiveCastform::
 	msgbox Route119_WeatherInstitute_2F_Text_ThanksPleaseTakePokemon, MSGBOX_DEFAULT
-	setvar VAR_TEMP_TRANSFERRED_SPECIES, SPECIES_CASTFORM
-	givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER
+	setvar VAR_TEMP_TRANSFERRED_SPECIES, SPECIES_CASTFORM_NORMAL
+	givemon SPECIES_CASTFORM_NORMAL, 25, ITEM_MYSTIC_WATER
 	goto_if_eq VAR_RESULT, MON_GIVEN_TO_PARTY, Route119_WeatherInstitute_2F_EventScript_ReceiveCastformParty
 	goto_if_eq VAR_RESULT, MON_GIVEN_TO_PC, Route119_WeatherInstitute_2F_EventScript_ReceiveCastformPC
 	goto Common_EventScript_NoMoreRoomForPokemon
@@ -122,7 +122,7 @@ Route119_WeatherInstitute_2F_EventScript_ReceivedCastformFanfare::
 	message Route119_WeatherInstitute_2F_Text_PlayerReceivedCastform
 	waitmessage
 	waitfanfare
-	bufferspeciesname STR_VAR_1, SPECIES_CASTFORM
+	bufferspeciesname STR_VAR_1, SPECIES_CASTFORM_NORMAL
 	return

 Route119_WeatherInstitute_2F_EventScript_ExplainCastform::
--- a/data/scripts/debug.inc
+++ b/data/scripts/debug.inc
@@ -104,13 +104,26 @@ Debug_CheckSaveBlock::
 	end

 Debug_SaveBlock1Size::
-	.string "SaveBlock1 size: {STR_VAR_1}/{STR_VAR_2}.$"
+	.string "SaveBlock1 size: {STR_VAR_1}b/{STR_VAR_2}b.\n"
+	.string "Free space: {STR_VAR_3}b.$"

 Debug_SaveBlock2Size::
-	.string "SaveBlock2 size: {STR_VAR_1}/{STR_VAR_2}.$"
+	.string "SaveBlock2 size: {STR_VAR_1}b/{STR_VAR_2}b.\n"
+	.string "Free space: {STR_VAR_3}b.$"

 Debug_PokemonStorageSize::
-	.string "{PKMN}Storage size: {STR_VAR_1}/{STR_VAR_2}.$"
+	.string "{PKMN}Storage size: {STR_VAR_1}b/{STR_VAR_2}b.\n"
+	.string "Free space: {STR_VAR_3}b.$"
+
+Debug_CheckROMSpace::
+	callnative CheckROMSize
+	msgbox Debug_ROMSize, MSGBOX_DEFAULT
+	release
+	end
+
+Debug_ROMSize::
+	.string "ROM size: {STR_VAR_1}MB/32MB.\n"
+	.string "Free space: {STR_VAR_2}MB.$"

 Debug_HatchAnEgg::
 	lockall
@@ -142,28 +155,28 @@ DebugScript_HatchAnEgg_Text_EmptyParty::

 DebugScript_HatchAnEgg_Text_NotAnEgg::
 	.string "That's not a Pokémon Egg.$"
-	
+
 DebugScript_ZeroDaycareMons::
 	msgbox DebugText_DaycareNoPokemon, MSGBOX_DEFAULT
 	releaseall
 	end
-	
+
 DebugScript_OneDaycareMons::
 	msgbox DebugText_DaycareOnePokemon, MSGBOX_DEFAULT
 	releaseall
 	end
-	
+
 DebugScript_DaycareMonsNotCompatible::
 	msgbox DebugText_DaycarePokemonNotCompatible, MSGBOX_DEFAULT
 	releaseall
 	end
-	
+
 DebugText_DaycareNoPokemon:
 	.string "You have no Pokémon at Daycare.$"
-	
+
 DebugText_DaycareOnePokemon:
 	.string "You have only one Pokémon at Daycare.$"
-	
+
 DebugText_DaycarePokemonNotCompatible:
 	.string "Your Pokémon at Daycare can't\nhave babies together!$"

--- a/data/scripts/trainer_hill.inc
+++ b/data/scripts/trainer_hill.inc
@@ -13,9 +13,9 @@ TrainerHill_OnWarp:

 TrainerHill_1F_EventScript_DummyOnWarp::
 	setvar VAR_TEMP_3, 1
-.ifdef BUGFIX
+#ifdef BUGFIX
 	end  @ Missing end. By chance, the next byte (0x02 of VAR_TEMP_2) is also the id for the end cmd
-.endif
+#endif

 TrainerHill_OnFrame:
 	map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_DummyWarpToEntranceCounter
--- a/gflib/bg.c
+++ b/gflib/bg.c
@@ -377,6 +377,9 @@ u16 LoadBgTiles(u8 bg, const void *src, u16 size, u16 destOffset)
    u16 tileOffset;
    u8 cursor;

+    if (bg > 3)
+        return -1;
+
    if (GetBgControlAttribute(bg, BG_CTRL_ATTR_PALETTEMODE) == 0)
    {
        tileOffset = (sGpuBgConfigs2[bg].baseTile + destOffset) * 0x20;
--- a/graphics/battle_anims/sprites/snowflakes.png
+++ b/graphics/battle_anims/sprites/snowflakes.png
--- a/graphics/battle_anims/sprites/syrup_bomb_blob.png
+++ b/graphics/battle_anims/sprites/syrup_bomb_blob.png
--- a/graphics/battle_anims/sprites/syrup_bomb_shell.png
+++ b/graphics/battle_anims/sprites/syrup_bomb_shell.png
--- a/graphics/battle_anims/sprites/syrup_bomb_splat.png
+++ b/graphics/battle_anims/sprites/syrup_bomb_splat.png
--- a/graphics/battle_anims/sprites/syrup_red.pal
+++ b/graphics/battle_anims/sprites/syrup_red.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+30 255 0
+242 242 242
+255 194 173
+255 129 110
+224 51 38
+161 24 26
+110 30 36
+13 2 4
+200 224 240
+200 224 240
+200 224 240
+200 224 240
+200 224 240
+200 224 240
+200 224 240
+200 224 240
--- a/graphics/battle_anims/sprites/syrup_yellow.pal
+++ b/graphics/battle_anims/sprites/syrup_yellow.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+30 255 0
+242 242 242
+255 255 168
+255 235 82
+255 192 0
+185 104 4
+107 59 19
+13 2 4
+200 224 240
+200 224 240
+200 224 240
+200 224 240
+200 224 240
+200 224 240
+200 224 240
+200 224 240
--- a/graphics/battle_interface/dynamax_indicator.png
+++ b/graphics/battle_interface/dynamax_indicator.png
--- a/graphics/battle_interface/dynamax_trigger.png
+++ b/graphics/battle_interface/dynamax_trigger.png
--- a/graphics/battle_interface/misc_indicator.pal
+++ b/graphics/battle_interface/misc_indicator.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 0
+224 74 106
+236 234 108
+154 45 48
+244 162 132
+32 127 216
+16 75 156
+184 224 240
+136 184 224
+213 207 207
+246 246 246
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
--- a/graphics/pokedex/bg_hoenn.pal
+++ b/graphics/pokedex/bg_hoenn.pal
@@ -1,21 +1,21 @@
 JASC-PAL
 0100
 48
-193 33 177
-249 249 249
-225 225 225
-201 201 201
-169 169 169
-129 129 129
-249 153 161
-233 49 49
-193 33 41
-145 17 33
-249 153 161
-193 33 41
-141 251 184
-52 66 162
-194 181 66
+123 131 0
+255 255 255
+222 222 222
+189 189 189
+164 164 164
+98 98 115
+41 57 65
+41 57 106
+0 0 41
+255 255 255
+238 246 57
+255 0 189
+49 213 74
+24 131 32
+189 156 90
 0 0 0
 123 131 0
 255 255 255
--- a/graphics/pokedex/caught_screen.pal
+++ b/graphics/pokedex/caught_screen.pal
@@ -1,21 +1,21 @@
 JASC-PAL
 0100
 48
-193 33 177
-249 249 249
-225 225 225
-201 201 201
-169 169 169
-129 129 129
-249 153 161
-233 49 49
-193 33 41
-145 17 33
-249 153 161
-193 33 41
-141 251 184
-52 66 162
-194 181 66
+123 131 0
+255 255 255
+255 238 0
+255 189 0
+255 115 0
+98 98 115
+41 57 65
+41 57 106
+0 0 41
+255 255 255
+238 246 57
+255 0 189
+49 213 74
+24 131 32
+189 156 90
 0 0 0
 123 131 0
 255 255 255
--- a/graphics/pokemon/alcremie/berry/Berry_Caramel_Swirl.pal
+++ b/graphics/pokemon/alcremie/berry/Berry_Caramel_Swirl.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 232 184
+200 168 120
+232 168 96
+144 112 72
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+0 120 200
+0 80 144
+0 40 104
+0 0 0
--- a/graphics/pokemon/alcremie/berry/Berry_Default.pal
+++ b/graphics/pokemon/alcremie/berry/Berry_Default.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 224 208
+208 160 168
+240 136 144
+128 80 88
+248 224 200
+208 128 136
+248 224 200
+208 160 168
+248 224 200
+208 160 168
+0 120 200
+0 80 144
+0 40 104
+0 0 0
--- a/graphics/pokemon/alcremie/berry/Berry_Lemon_Cream.pal
+++ b/graphics/pokemon/alcremie/berry/Berry_Lemon_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 248 152
+208 184 72
+232 224 0
+112 120 24
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+0 120 200
+0 80 144
+0 40 104
+0 0 0
--- a/graphics/pokemon/alcremie/berry/Berry_Matcha_Cream.pal
+++ b/graphics/pokemon/alcremie/berry/Berry_Matcha_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+232 248 208
+176 208 152
+192 224 96
+104 128 80
+232 248 200
+176 208 152
+232 248 200
+176 208 152
+232 248 200
+176 208 152
+0 120 200
+0 80 144
+0 40 104
+0 0 0
--- a/graphics/pokemon/alcremie/berry/Berry_Mint_Cream.pal
+++ b/graphics/pokemon/alcremie/berry/Berry_Mint_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+208 240 232
+152 168 176
+112 208 200
+72 112 128
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+0 120 200
+0 80 144
+0 40 104
+0 0 0
--- a/graphics/pokemon/alcremie/berry/Berry_Rainbow_Swirl.pal
+++ b/graphics/pokemon/alcremie/berry/Berry_Rainbow_Swirl.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 248 184
+208 192 120
+216 144 88
+120 88 64
+240 160 168
+208 128 136
+176 232 224
+128 160 168
+248 248 112
+216 192 40
+0 120 200
+0 80 144
+0 40 104
+0 0 0
--- a/graphics/pokemon/alcremie/berry/Berry_Ruby_Cream.pal
+++ b/graphics/pokemon/alcremie/berry/Berry_Ruby_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 208 208
+200 152 184
+232 112 192
+128 80 112
+248 208 208
+200 152 184
+248 208 208
+200 152 184
+248 208 208
+200 152 184
+0 120 200
+0 80 144
+0 40 104
+0 0 0
--- a/graphics/pokemon/alcremie/berry/Berry_Ruby_Swirl.pal
+++ b/graphics/pokemon/alcremie/berry/Berry_Ruby_Swirl.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 240 208
+208 184 160
+240 192 128
+128 96 80
+248 176 192
+224 120 128
+248 176 192
+224 120 128
+248 176 192
+224 120 128
+0 120 200
+0 80 144
+0 40 104
+0 0 0
--- a/graphics/pokemon/alcremie/berry/Berry_Salted_Cream.pal
+++ b/graphics/pokemon/alcremie/berry/Berry_Salted_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+232 232 248
+176 176 184
+112 208 200
+88 88 96
+232 232 248
+176 176 184
+232 232 248
+176 176 184
+232 232 248
+176 176 184
+0 120 200
+0 80 144
+0 40 104
+0 0 0
--- a/graphics/pokemon/alcremie/berry/Berry_Shiny.pal
+++ b/graphics/pokemon/alcremie/berry/Berry_Shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
+216 216 216
+152 152 152
+128 128 128
+88 88 96
 72 80 72
 248 248 248
-88 88 96
-128 128 128
+168 176 176
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+0 120 200
+0 80 144
+0 40 104
 16 16 16
-152 152 152
-136 32 56
-248 88 112
-192 48 72
-168 176 176
-168 176 176
-216 216 216
-0 0 0
-0 0 0
-0 0 0
--- a/graphics/pokemon/alcremie/berry/back.png
+++ b/graphics/pokemon/alcremie/berry/back.png
--- a/graphics/pokemon/alcremie/berry/front.png
+++ b/graphics/pokemon/alcremie/berry/front.png
--- a/graphics/pokemon/alcremie/clover/Clover_Caramel_Swirl.pal
+++ b/graphics/pokemon/alcremie/clover/Clover_Caramel_Swirl.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 232 184
+200 168 120
+232 168 96
+144 112 72
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+136 216 64
+24 144 36
+24 80 36
+0 0 0
--- a/graphics/pokemon/alcremie/clover/Clover_Default.pal
+++ b/graphics/pokemon/alcremie/clover/Clover_Default.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 224 208
+208 160 168
+240 136 144
+128 80 88
+248 224 200
+208 128 136
+248 224 200
+208 160 168
+248 224 200
+208 160 168
+136 216 64
+24 144 36
+24 80 36
+0 0 0
--- a/graphics/pokemon/alcremie/clover/Clover_Lemon_Cream.pal
+++ b/graphics/pokemon/alcremie/clover/Clover_Lemon_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 248 152
+208 184 72
+232 224 0
+112 120 24
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+136 216 64
+24 144 36
+24 80 36
+0 0 0
--- a/graphics/pokemon/alcremie/clover/Clover_Matcha_Cream.pal
+++ b/graphics/pokemon/alcremie/clover/Clover_Matcha_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+232 248 208
+176 208 152
+192 224 96
+104 128 80
+232 248 200
+176 208 152
+232 248 200
+176 208 152
+232 248 200
+176 208 152
+136 216 64
+24 144 36
+24 80 36
+0 0 0
--- a/graphics/pokemon/alcremie/clover/Clover_Mint_Cream.pal
+++ b/graphics/pokemon/alcremie/clover/Clover_Mint_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+208 240 232
+152 168 176
+112 208 200
+72 112 128
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+136 216 64
+24 144 36
+24 80 36
+0 0 0
--- a/graphics/pokemon/alcremie/clover/Clover_Rainbow_Swirl.pal
+++ b/graphics/pokemon/alcremie/clover/Clover_Rainbow_Swirl.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 248 184
+208 192 120
+216 144 88
+120 88 64
+240 160 168
+208 128 136
+176 232 224
+128 160 168
+248 248 112
+216 192 40
+136 216 64
+24 144 36
+24 80 36
+0 0 0
--- a/graphics/pokemon/alcremie/clover/Clover_Ruby_Cream.pal
+++ b/graphics/pokemon/alcremie/clover/Clover_Ruby_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 208 208
+200 152 184
+232 112 192
+128 80 112
+248 208 208
+200 152 184
+248 208 208
+200 152 184
+248 208 208
+200 152 184
+136 216 64
+24 144 36
+24 80 36
+0 0 0
--- a/graphics/pokemon/alcremie/clover/Clover_Ruby_Swirl.pal
+++ b/graphics/pokemon/alcremie/clover/Clover_Ruby_Swirl.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 240 208
+208 184 160
+240 192 128
+128 96 80
+248 176 192
+224 120 128
+248 176 192
+224 120 128
+248 176 192
+224 120 128
+136 216 64
+24 144 36
+24 80 36
+0 0 0
--- a/graphics/pokemon/alcremie/clover/Clover_Salted_Cream.pal
+++ b/graphics/pokemon/alcremie/clover/Clover_Salted_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+232 232 248
+176 176 184
+112 208 200
+88 88 96
+232 232 248
+176 176 184
+232 232 248
+176 176 184
+232 232 248
+176 176 184
+136 216 64
+24 144 36
+24 80 36
+0 0 0
--- a/graphics/pokemon/alcremie/clover/Clover_Shiny.pal
+++ b/graphics/pokemon/alcremie/clover/Clover_Shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
+216 216 216
+152 152 152
+128 128 128
+88 88 96
 72 80 72
 248 248 248
-88 88 96
-128 128 128
-16 16 16
-152 152 152
-216 216 216
-136 32 56
-248 88 112
-192 48 72
+168 176 176
 248 248 248
 168 176 176
-0 0 0
-0 0 0
-0 0 0
+248 248 248
+168 176 176
+136 216 64
+24 144 36
+24 80 36
+16 16 16
--- a/graphics/pokemon/alcremie/clover/back.png
+++ b/graphics/pokemon/alcremie/clover/back.png
--- a/graphics/pokemon/alcremie/clover/front.png
+++ b/graphics/pokemon/alcremie/clover/front.png
--- a/graphics/pokemon/alcremie/flower/Flower_Caramel_Swirl.pal
+++ b/graphics/pokemon/alcremie/flower/Flower_Caramel_Swirl.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 232 184
+200 168 120
+232 168 96
+144 112 72
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 248 0
+248 104 40
+152 56 24
+0 0 0
--- a/graphics/pokemon/alcremie/flower/Flower_Default.pal
+++ b/graphics/pokemon/alcremie/flower/Flower_Default.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 224 208
+208 160 168
+240 136 144
+128 80 88
+248 224 200
+208 128 136
+248 224 200
+208 160 168
+248 224 200
+208 160 168
+248 248 0
+248 104 40
+152 56 24
+0 0 0
--- a/graphics/pokemon/alcremie/flower/Flower_Lemon_Cream.pal
+++ b/graphics/pokemon/alcremie/flower/Flower_Lemon_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 248 152
+208 184 72
+232 224 0
+112 120 24
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 248 0
+248 104 40
+152 56 24
+0 0 0
--- a/graphics/pokemon/alcremie/flower/Flower_Matcha_Cream.pal
+++ b/graphics/pokemon/alcremie/flower/Flower_Matcha_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+232 248 208
+176 208 152
+192 224 96
+104 128 80
+232 248 200
+176 208 152
+232 248 200
+176 208 152
+232 248 200
+176 208 152
+248 248 0
+248 104 40
+152 56 24
+0 0 0
--- a/graphics/pokemon/alcremie/flower/Flower_Mint_Cream.pal
+++ b/graphics/pokemon/alcremie/flower/Flower_Mint_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+208 240 232
+152 168 176
+112 208 200
+72 112 128
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 248 0
+248 104 40
+152 56 24
+0 0 0
--- a/graphics/pokemon/alcremie/flower/Flower_Rainbow_Swirl.pal
+++ b/graphics/pokemon/alcremie/flower/Flower_Rainbow_Swirl.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 248 184
+208 192 120
+216 144 88
+120 88 64
+240 160 168
+208 128 136
+176 232 224
+128 160 168
+248 248 112
+216 192 40
+248 248 0
+248 104 40
+152 56 24
+0 0 0
--- a/graphics/pokemon/alcremie/flower/Flower_Ruby_Cream.pal
+++ b/graphics/pokemon/alcremie/flower/Flower_Ruby_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 208 208
+200 152 184
+232 112 192
+128 80 112
+248 208 208
+200 152 184
+248 208 208
+200 152 184
+248 208 208
+200 152 184
+248 248 0
+248 104 40
+152 56 24
+0 0 0
--- a/graphics/pokemon/alcremie/flower/Flower_Ruby_Swirl.pal
+++ b/graphics/pokemon/alcremie/flower/Flower_Ruby_Swirl.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 240 208
+208 184 160
+240 192 128
+128 96 80
+248 176 192
+224 120 128
+248 176 192
+224 120 128
+248 176 192
+224 120 128
+248 248 0
+248 104 40
+152 56 24
+0 0 0
--- a/graphics/pokemon/alcremie/flower/Flower_Salted_Cream.pal
+++ b/graphics/pokemon/alcremie/flower/Flower_Salted_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+232 232 248
+176 176 184
+112 208 200
+88 88 96
+232 232 248
+176 176 184
+232 232 248
+176 176 184
+232 232 248
+176 176 184
+248 248 0
+248 104 40
+152 56 24
+0 0 0
--- a/graphics/pokemon/alcremie/flower/Flower_Shiny.pal
+++ b/graphics/pokemon/alcremie/flower/Flower_Shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
+216 216 216
+152 152 152
+128 128 128
+88 88 96
 72 80 72
 248 248 248
-88 88 96
-128 128 128
-16 16 16
-152 152 152
-216 216 216
-136 32 56
-248 88 112
-192 48 72
+168 176 176
 248 248 248
 168 176 176
-0 0 0
-0 0 0
-0 0 0
+248 248 248
+168 176 176
+248 248 0
+248 104 40
+152 56 24
+16 16 16
--- a/graphics/pokemon/alcremie/flower/back.png
+++ b/graphics/pokemon/alcremie/flower/back.png
--- a/graphics/pokemon/alcremie/flower/front.png
+++ b/graphics/pokemon/alcremie/flower/front.png
--- a/graphics/pokemon/alcremie/gigantamax/back.png
+++ b/graphics/pokemon/alcremie/gigantamax/back.png
--- a/graphics/pokemon/alcremie/gigantamax/front.png
+++ b/graphics/pokemon/alcremie/gigantamax/front.png
--- a/graphics/pokemon/alcremie/gigantamax/icon.png
+++ b/graphics/pokemon/alcremie/gigantamax/icon.png
--- a/graphics/pokemon/alcremie/gigantamax/normal.pal
+++ b/graphics/pokemon/alcremie/gigantamax/normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+153 211 165
+147 116 87
+16 16 16
+214 191 164
+253 241 208
+217 194 40
+254 255 112
+185 119 190
+164 153 183
+240 189 195
+254 109 38
+232 254 23
+86 225 210
+247 86 144
+28 151 140
+226 122 129
--- a/graphics/pokemon/alcremie/gigantamax/shiny.pal
+++ b/graphics/pokemon/alcremie/gigantamax/shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+153 211 165
+108 127 125
+16 16 16
+184 203 202
+240 253 255
+35 36 35
+66 69 66
+185 119 190
+91 69 73
+139 113 119
+254 109 38
+232 254 23
+187 157 165
+247 86 144
+28 151 140
+75 79 75
--- a/graphics/pokemon/alcremie/lemon_cream/back.png
+++ b/graphics/pokemon/alcremie/lemon_cream/back.png
--- a/graphics/pokemon/alcremie/lemon_cream/front.png
+++ b/graphics/pokemon/alcremie/lemon_cream/front.png
--- a/graphics/pokemon/alcremie/lemon_cream/shiny.pal
+++ b/graphics/pokemon/alcremie/lemon_cream/shiny.pal
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-72 80 72
-248 248 248
-88 88 96
-128 128 128
-16 16 16
-152 152 152
-136 32 56
-248 88 112
-192 48 72
-168 176 176
-216 216 216
-0 0 0
-0 0 0
-0 0 0
-0 0 0
--- a/graphics/pokemon/alcremie/love/Love_Caramel_Swirl.pal
+++ b/graphics/pokemon/alcremie/love/Love_Caramel_Swirl.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 232 184
+200 168 120
+232 168 96
+144 112 72
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 152 200
+248 112 120
+216 56 104
+0 0 0
--- a/graphics/pokemon/alcremie/love/Love_Default.pal
+++ b/graphics/pokemon/alcremie/love/Love_Default.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 224 208
+208 160 168
+240 136 144
+128 80 88
+248 224 200
+208 128 136
+248 224 200
+208 160 168
+248 224 200
+208 160 168
+248 152 200
+248 112 120
+216 56 104
+0 0 0
--- a/graphics/pokemon/alcremie/love/Love_Lemon_Cream.pal
+++ b/graphics/pokemon/alcremie/love/Love_Lemon_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 248 152
+208 184 72
+232 224 0
+112 120 24
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 152 200
+248 112 120
+216 56 104
+0 0 0
--- a/graphics/pokemon/alcremie/love/Love_Matcha_Cream.pal
+++ b/graphics/pokemon/alcremie/love/Love_Matcha_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+232 248 208
+176 208 152
+192 224 96
+104 128 80
+232 248 200
+176 208 152
+232 248 200
+176 208 152
+232 248 200
+176 208 152
+248 152 200
+248 112 120
+216 56 104
+0 0 0
--- a/graphics/pokemon/alcremie/love/Love_Mint_Cream.pal
+++ b/graphics/pokemon/alcremie/love/Love_Mint_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+208 240 232
+152 168 176
+112 208 200
+72 112 128
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 152 200
+248 112 120
+216 56 104
+0 0 0
--- a/graphics/pokemon/alcremie/love/Love_Rainbow_Swirl.pal
+++ b/graphics/pokemon/alcremie/love/Love_Rainbow_Swirl.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 248 184
+208 192 120
+216 144 88
+120 88 64
+240 160 168
+208 128 136
+176 232 224
+128 160 168
+248 248 112
+216 192 40
+248 152 200
+248 112 120
+216 56 104
+0 0 0
--- a/graphics/pokemon/alcremie/love/Love_Ruby_Cream.pal
+++ b/graphics/pokemon/alcremie/love/Love_Ruby_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 208 208
+200 152 184
+232 112 192
+128 80 112
+248 208 208
+200 152 184
+248 208 208
+200 152 184
+248 208 208
+200 152 184
+248 152 200
+248 112 120
+216 56 104
+0 0 0
--- a/graphics/pokemon/alcremie/love/Love_Ruby_Swirl.pal
+++ b/graphics/pokemon/alcremie/love/Love_Ruby_Swirl.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 240 208
+208 184 160
+240 192 128
+128 96 80
+248 176 192
+224 120 128
+248 176 192
+224 120 128
+248 176 192
+224 120 128
+248 152 200
+248 112 120
+216 56 104
+0 0 0
--- a/graphics/pokemon/alcremie/love/Love_Salted_Cream.pal
+++ b/graphics/pokemon/alcremie/love/Love_Salted_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+232 232 248
+176 176 184
+112 208 200
+88 88 96
+232 232 248
+176 176 184
+232 232 248
+176 176 184
+232 232 248
+176 176 184
+248 152 200
+248 112 120
+216 56 104
+0 0 0
--- a/graphics/pokemon/alcremie/love/Love_Shiny.pal
+++ b/graphics/pokemon/alcremie/love/Love_Shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+216 216 216
+152 152 152
+128 128 128
+88 88 96
+72 80 72
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 152 200
+248 112 120
+216 56 104
+16 16 16
--- a/graphics/pokemon/alcremie/love/back.png
+++ b/graphics/pokemon/alcremie/love/back.png
--- a/graphics/pokemon/alcremie/love/front.png
+++ b/graphics/pokemon/alcremie/love/front.png
--- a/graphics/pokemon/alcremie/matcha_cream/back.png
+++ b/graphics/pokemon/alcremie/matcha_cream/back.png
--- a/graphics/pokemon/alcremie/matcha_cream/front.png
+++ b/graphics/pokemon/alcremie/matcha_cream/front.png
--- a/graphics/pokemon/alcremie/mint_cream/back.png
+++ b/graphics/pokemon/alcremie/mint_cream/back.png
--- a/graphics/pokemon/alcremie/mint_cream/front.png
+++ b/graphics/pokemon/alcremie/mint_cream/front.png
--- a/graphics/pokemon/alcremie/ribbon/Ribbon_Caramel_Swirl.pal
+++ b/graphics/pokemon/alcremie/ribbon/Ribbon_Caramel_Swirl.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 232 184
+200 168 120
+232 168 96
+144 112 72
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+176 136 176
+144 96 168
+112 72 136
+0 0 0
--- a/graphics/pokemon/alcremie/ribbon/Ribbon_Default.pal
+++ b/graphics/pokemon/alcremie/ribbon/Ribbon_Default.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 224 208
+208 160 168
+240 136 144
+128 80 88
+248 224 200
+208 128 136
+248 224 200
+208 160 168
+248 224 200
+208 160 168
+176 136 176
+144 96 168
+112 72 136
+0 0 0
--- a/graphics/pokemon/alcremie/ribbon/Ribbon_Lemon_Cream.pal
+++ b/graphics/pokemon/alcremie/ribbon/Ribbon_Lemon_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 248 152
+208 184 72
+232 224 0
+112 120 24
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+176 136 176
+144 96 168
+112 72 136
+0 0 0
--- a/graphics/pokemon/alcremie/ribbon/Ribbon_Matcha_Cream.pal
+++ b/graphics/pokemon/alcremie/ribbon/Ribbon_Matcha_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+232 248 208
+176 208 152
+192 224 96
+104 128 80
+232 248 200
+176 208 152
+232 248 200
+176 208 152
+232 248 200
+176 208 152
+176 136 176
+144 96 168
+112 72 136
+0 0 0
--- a/graphics/pokemon/alcremie/ribbon/Ribbon_Mint_Cream.pal
+++ b/graphics/pokemon/alcremie/ribbon/Ribbon_Mint_Cream.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+208 240 232
+152 168 176
+112 208 200
+72 112 128
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+248 248 248
+168 176 176
+176 136 176
+144 96 168
+112 72 136
+0 0 0
--- a/graphics/pokemon/alcremie/ribbon/Ribbon_Rainbow_Swirl.pal
+++ b/graphics/pokemon/alcremie/ribbon/Ribbon_Rainbow_Swirl.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 248 248
+248 248 184
+208 192 120
+216 144 88
+120 88 64
+240 160 168
+208 128 136
+176 232 224
+128 160 168
+248 248 112
+216 192 40
+176 136 176
+144 96 168
+112 72 136
+0 0 0
--- a/Show More
+++ b/Show More