From f5ed7e95f8df63fa986d9704a863b09fff246e9f Mon Sep 17 00:00:00 2001 From: huderlem Date: Sun, 22 Mar 2026 13:30:56 +0000 Subject: [PATCH] combine palettes (#723) --- pokefirered.sym | 3 +-- pokefirered_rev1.sym | 3 +-- pokefirered_switch.sym | 3 +-- pokeleafgreen.sym | 3 +-- pokeleafgreen_rev1.sym | 3 +-- pokeleafgreen_switch.sym | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/pokefirered.sym b/pokefirered.sym index 3fdb77c2d..d2a826948 100644 --- a/pokefirered.sym +++ b/pokefirered.sym @@ -36405,8 +36405,7 @@ 083f5738 l 000000cc sTransitionTypes 083f5804 l 00000020 sCaveTransitionPalette_White 083f5824 l 00000020 sCaveTransitionPalette_Black -083f5844 l 00000010 sCaveTransitionPalette_Enter -083f5854 l 00000010 sCaveTransitionPalette_Exit +083f5844 l 00000020 sCaveTransitionPalette 083f5864 l 000001e0 sCaveTransitionTilemap 083f5a44 l 000000b4 sCaveTransitionTiles 083f5af8 l 0000000c sStringVarPtrs diff --git a/pokefirered_rev1.sym b/pokefirered_rev1.sym index 8da490b2d..3520a87d7 100644 --- a/pokefirered_rev1.sym +++ b/pokefirered_rev1.sym @@ -36406,8 +36406,7 @@ 083f57a8 l 000000cc sTransitionTypes 083f5874 l 00000020 sCaveTransitionPalette_White 083f5894 l 00000020 sCaveTransitionPalette_Black -083f58b4 l 00000010 sCaveTransitionPalette_Enter -083f58c4 l 00000010 sCaveTransitionPalette_Exit +083f58b4 l 00000020 sCaveTransitionPalette 083f58d4 l 000001e0 sCaveTransitionTilemap 083f5ab4 l 000000b4 sCaveTransitionTiles 083f5b68 l 0000000c sStringVarPtrs diff --git a/pokefirered_switch.sym b/pokefirered_switch.sym index b69c982a4..bba7f56ef 100644 --- a/pokefirered_switch.sym +++ b/pokefirered_switch.sym @@ -36429,8 +36429,7 @@ 083f3234 l 000000cc sTransitionTypes 083f3300 l 00000020 sCaveTransitionPalette_White 083f3320 l 00000020 sCaveTransitionPalette_Black -083f3340 l 00000010 sCaveTransitionPalette_Enter -083f3350 l 00000010 sCaveTransitionPalette_Exit +083f3340 l 00000020 sCaveTransitionPalette 083f3360 l 000001e0 sCaveTransitionTilemap 083f3540 l 000000b4 sCaveTransitionTiles 083f35f4 l 0000000c sStringVarPtrs diff --git a/pokeleafgreen.sym b/pokeleafgreen.sym index b123f3f11..d0af8a480 100644 --- a/pokeleafgreen.sym +++ b/pokeleafgreen.sym @@ -36407,8 +36407,7 @@ 083f5574 l 000000cc sTransitionTypes 083f5640 l 00000020 sCaveTransitionPalette_White 083f5660 l 00000020 sCaveTransitionPalette_Black -083f5680 l 00000010 sCaveTransitionPalette_Enter -083f5690 l 00000010 sCaveTransitionPalette_Exit +083f5680 l 00000020 sCaveTransitionPalette 083f56a0 l 000001e0 sCaveTransitionTilemap 083f5880 l 000000b4 sCaveTransitionTiles 083f5934 l 0000000c sStringVarPtrs diff --git a/pokeleafgreen_rev1.sym b/pokeleafgreen_rev1.sym index 9e3ca21af..250256240 100644 --- a/pokeleafgreen_rev1.sym +++ b/pokeleafgreen_rev1.sym @@ -36408,8 +36408,7 @@ 083f55e4 l 000000cc sTransitionTypes 083f56b0 l 00000020 sCaveTransitionPalette_White 083f56d0 l 00000020 sCaveTransitionPalette_Black -083f56f0 l 00000010 sCaveTransitionPalette_Enter -083f5700 l 00000010 sCaveTransitionPalette_Exit +083f56f0 l 00000020 sCaveTransitionPalette 083f5710 l 000001e0 sCaveTransitionTilemap 083f58f0 l 000000b4 sCaveTransitionTiles 083f59a4 l 0000000c sStringVarPtrs diff --git a/pokeleafgreen_switch.sym b/pokeleafgreen_switch.sym index 26dee0656..4c51bde46 100644 --- a/pokeleafgreen_switch.sym +++ b/pokeleafgreen_switch.sym @@ -36431,8 +36431,7 @@ 083f3070 l 000000cc sTransitionTypes 083f313c l 00000020 sCaveTransitionPalette_White 083f315c l 00000020 sCaveTransitionPalette_Black -083f317c l 00000010 sCaveTransitionPalette_Enter -083f318c l 00000010 sCaveTransitionPalette_Exit +083f317c l 00000020 sCaveTransitionPalette 083f319c l 000001e0 sCaveTransitionTilemap 083f337c l 000000b4 sCaveTransitionTiles 083f3430 l 0000000c sStringVarPtrs