From 05507dfdffdf54be1e76e30570083694a952a7f5 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Mon, 12 Sep 2022 19:01:51 +0000 Subject: [PATCH] Merge pull request #551 from GriffinRichards/sync-rouletteutil --- pokefirered.sym | 20 ++++++++++---------- pokefirered_rev1.sym | 20 ++++++++++---------- pokeleafgreen.sym | 20 ++++++++++---------- pokeleafgreen_rev1.sym | 20 ++++++++++---------- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/pokefirered.sym b/pokefirered.sym index c437594e7..91ad8fda1 100644 --- a/pokefirered.sym +++ b/pokefirered.sym @@ -8668,15 +8668,15 @@ 080d8b90 g 00000018 Q_8_8_inv 080d8ba8 g 0000001e Q_N_S_inv 080d8bc8 g 0000001c Q_24_8_inv -080d8be4 g 00000014 sub_80D8BE4 +080d8be4 g 00000014 RouletteFlash_Reset 080d8be4 l 00000000 .gcc2_compiled. -080d8bf8 g 00000084 sub_80D8BF8 -080d8c7c g 00000034 sub_80D8C7C -080d8cb0 g 00000208 sub_80D8CB0 -080d8eb8 g 00000090 sub_80D8EB8 -080d8f48 g 0000006a task_tutorial_controls_fadein -080d8fb4 g 00000054 sub_80D8FB4 -080d9008 g 0000009e sub_80D9008 +080d8bf8 g 00000084 RouletteFlash_Add +080d8c7c l 00000034 RouletteFlash_Remove +080d8cb0 l 00000208 RouletteFlash_FadePalette +080d8eb8 l 00000090 RouletteFlash_FlashPalette +080d8f48 g 0000006a RouletteFlash_Run +080d8fb4 g 00000054 RouletteFlash_Enable +080d9008 g 0000009e RouletteFlash_Stop 080d90a8 g 0000002c InitPulseBlend 080d90d4 g 0000006a InitPulseBlendPaletteSettings 080d9140 l 0000007c ClearPulseBlendPalettesSettings @@ -8684,8 +8684,8 @@ 080d9214 g 0000007e MarkUsedPulseBlendPalettes 080d9294 g 00000128 UnmarkUsedPulseBlendPalettes 080d93bc g 000001b6 UpdatePulseBlend -080d9574 g 00000050 sub_80D9574 -080d95c4 g 00000050 sub_80D95C4 +080d9574 g 00000050 FillTilemapRect +080d95c4 g 00000050 SetTilemapRect 080d9614 l 00000000 .gcc2_compiled. 080d9614 l 0000008a CableCarUtil_FillWrapped 080d96a0 l 0000008a CableCarUtil_CopyWrapped diff --git a/pokefirered_rev1.sym b/pokefirered_rev1.sym index 43cc26b6f..7285a5b5d 100644 --- a/pokefirered_rev1.sym +++ b/pokefirered_rev1.sym @@ -8668,15 +8668,15 @@ 080d8ba4 g 00000018 Q_8_8_inv 080d8bbc g 0000001e Q_N_S_inv 080d8bdc g 0000001c Q_24_8_inv -080d8bf8 g 00000014 sub_80D8BE4 +080d8bf8 g 00000014 RouletteFlash_Reset 080d8bf8 l 00000000 .gcc2_compiled. -080d8c0c g 00000084 sub_80D8BF8 -080d8c90 g 00000034 sub_80D8C7C -080d8cc4 g 00000208 sub_80D8CB0 -080d8ecc g 00000090 sub_80D8EB8 -080d8f5c g 0000006a task_tutorial_controls_fadein -080d8fc8 g 00000054 sub_80D8FB4 -080d901c g 0000009e sub_80D9008 +080d8c0c g 00000084 RouletteFlash_Add +080d8c90 l 00000034 RouletteFlash_Remove +080d8cc4 l 00000208 RouletteFlash_FadePalette +080d8ecc l 00000090 RouletteFlash_FlashPalette +080d8f5c g 0000006a RouletteFlash_Run +080d8fc8 g 00000054 RouletteFlash_Enable +080d901c g 0000009e RouletteFlash_Stop 080d90bc g 0000002c InitPulseBlend 080d90e8 g 0000006a InitPulseBlendPaletteSettings 080d9154 l 0000007c ClearPulseBlendPalettesSettings @@ -8684,8 +8684,8 @@ 080d9228 g 0000007e MarkUsedPulseBlendPalettes 080d92a8 g 00000128 UnmarkUsedPulseBlendPalettes 080d93d0 g 000001b6 UpdatePulseBlend -080d9588 g 00000050 sub_80D9574 -080d95d8 g 00000050 sub_80D95C4 +080d9588 g 00000050 FillTilemapRect +080d95d8 g 00000050 SetTilemapRect 080d9628 l 00000000 .gcc2_compiled. 080d9628 l 0000008a CableCarUtil_FillWrapped 080d96b4 l 0000008a CableCarUtil_CopyWrapped diff --git a/pokeleafgreen.sym b/pokeleafgreen.sym index f31abec7d..3b63430e4 100644 --- a/pokeleafgreen.sym +++ b/pokeleafgreen.sym @@ -8670,15 +8670,15 @@ 080d8b64 g 00000018 Q_8_8_inv 080d8b7c g 0000001e Q_N_S_inv 080d8b9c g 0000001c Q_24_8_inv -080d8bb8 g 00000014 sub_80D8BE4 +080d8bb8 g 00000014 RouletteFlash_Reset 080d8bb8 l 00000000 .gcc2_compiled. -080d8bcc g 00000084 sub_80D8BF8 -080d8c50 g 00000034 sub_80D8C7C -080d8c84 g 00000208 sub_80D8CB0 -080d8e8c g 00000090 sub_80D8EB8 -080d8f1c g 0000006a task_tutorial_controls_fadein -080d8f88 g 00000054 sub_80D8FB4 -080d8fdc g 0000009e sub_80D9008 +080d8bcc g 00000084 RouletteFlash_Add +080d8c50 l 00000034 RouletteFlash_Remove +080d8c84 l 00000208 RouletteFlash_FadePalette +080d8e8c l 00000090 RouletteFlash_FlashPalette +080d8f1c g 0000006a RouletteFlash_Run +080d8f88 g 00000054 RouletteFlash_Enable +080d8fdc g 0000009e RouletteFlash_Stop 080d907c g 0000002c InitPulseBlend 080d90a8 g 0000006a InitPulseBlendPaletteSettings 080d9114 l 0000007c ClearPulseBlendPalettesSettings @@ -8686,8 +8686,8 @@ 080d91e8 g 0000007e MarkUsedPulseBlendPalettes 080d9268 g 00000128 UnmarkUsedPulseBlendPalettes 080d9390 g 000001b6 UpdatePulseBlend -080d9548 g 00000050 sub_80D9574 -080d9598 g 00000050 sub_80D95C4 +080d9548 g 00000050 FillTilemapRect +080d9598 g 00000050 SetTilemapRect 080d95e8 l 00000000 .gcc2_compiled. 080d95e8 l 0000008a CableCarUtil_FillWrapped 080d9674 l 0000008a CableCarUtil_CopyWrapped diff --git a/pokeleafgreen_rev1.sym b/pokeleafgreen_rev1.sym index c9115cd6d..30c15dc9a 100644 --- a/pokeleafgreen_rev1.sym +++ b/pokeleafgreen_rev1.sym @@ -8670,15 +8670,15 @@ 080d8b78 g 00000018 Q_8_8_inv 080d8b90 g 0000001e Q_N_S_inv 080d8bb0 g 0000001c Q_24_8_inv -080d8bcc g 00000014 sub_80D8BE4 +080d8bcc g 00000014 RouletteFlash_Reset 080d8bcc l 00000000 .gcc2_compiled. -080d8be0 g 00000084 sub_80D8BF8 -080d8c64 g 00000034 sub_80D8C7C -080d8c98 g 00000208 sub_80D8CB0 -080d8ea0 g 00000090 sub_80D8EB8 -080d8f30 g 0000006a task_tutorial_controls_fadein -080d8f9c g 00000054 sub_80D8FB4 -080d8ff0 g 0000009e sub_80D9008 +080d8be0 g 00000084 RouletteFlash_Add +080d8c64 l 00000034 RouletteFlash_Remove +080d8c98 l 00000208 RouletteFlash_FadePalette +080d8ea0 l 00000090 RouletteFlash_FlashPalette +080d8f30 g 0000006a RouletteFlash_Run +080d8f9c g 00000054 RouletteFlash_Enable +080d8ff0 g 0000009e RouletteFlash_Stop 080d9090 g 0000002c InitPulseBlend 080d90bc g 0000006a InitPulseBlendPaletteSettings 080d9128 l 0000007c ClearPulseBlendPalettesSettings @@ -8686,8 +8686,8 @@ 080d91fc g 0000007e MarkUsedPulseBlendPalettes 080d927c g 00000128 UnmarkUsedPulseBlendPalettes 080d93a4 g 000001b6 UpdatePulseBlend -080d955c g 00000050 sub_80D9574 -080d95ac g 00000050 sub_80D95C4 +080d955c g 00000050 FillTilemapRect +080d95ac g 00000050 SetTilemapRect 080d95fc l 00000000 .gcc2_compiled. 080d95fc l 0000008a CableCarUtil_FillWrapped 080d9688 l 0000008a CableCarUtil_CopyWrapped