From 10cc816f84d5b7fd7fa99ed39e1cdc2ea612d6d2 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Sun, 20 Feb 2022 23:03:43 +0000 Subject: [PATCH] Merge pull request #1633 from abaresk/slot-cleanup --- pokeemerald.sym | 226 ++++++++++++++++++++++++------------------------ 1 file changed, 113 insertions(+), 113 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index 0ec93eca26..426a0dd100 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -11060,113 +11060,113 @@ 0812a670 l 00000016 CB2_SlotMachine 0812a688 l 0000004c SlotMachine_VBlankCB 0812a6d4 l 0000003c PlaySlotMachine_Internal -0812a710 l 0000003c SlotMachineInitDummyTask +0812a710 l 0000003c SlotMachine_InitFromTask 0812a74c l 00000002 SlotMachineDummyTask 0812a750 l 0000004c SlotMachineSetup_InitBgsWindows 0812a79c l 00000020 SlotMachineSetup_InitVBlank 0812a7bc l 00000054 SlotMachineSetup_InitVRAM 0812a810 l 00000024 SlotMachineSetup_InitOAM 0812a834 l 00000090 SlotMachineSetup_InitGpuRegs -0812a8c4 l 000000e8 SlotMachineSetup_InitSlotMachineStruct +0812a8c4 l 000000e8 InitSlotMachine 0812a9ac l 00000020 SlotMachineSetup_InitPalsSpritesTasks 0812a9cc l 0000007c SlotMachineSetup_InitTilemaps 0812aa48 l 00000030 SlotMachineSetup_LoadGfxAndTilemaps 0812aa78 l 00000016 CreateSlotMachineSprites 0812aa90 l 00000016 CreateGameplayTasks -0812aaa8 l 00000020 CreateSlotMachineTask +0812aaa8 l 00000020 CreateSlotMachineTasks 0812aac8 l 0000003c Task_SlotMachine -0812ab04 l 00000034 SlotAction_UnfadeScreen -0812ab38 l 00000028 SlotAction_WaitForUnfade -0812ab60 l 00000046 SlotAction_ReadyNewSpin -0812aba8 l 00000020 SlotAction_ReadyNewReelTimeSpin -0812abc8 l 00000030 SlotAction_AskInsertBet -0812abf8 l 000000fc SlotAction_HandleBetInput -0812acf4 l 00000040 SlotAction_PrintMsg_Need3Coins -0812ad34 l 0000002c SlotAction_WaitMsg_Need3Coins -0812ad60 l 00000020 SlotAction_WaitForInfoBox -0812ad80 l 00000074 SlotAction_StartSpin -0812adf4 l 00000030 SlotAction_StartReelTimeSpin -0812ae24 l 00000028 SlotAction_SetLuckySpins -0812ae4c l 0000003c SlotAction_AwaitReelStop -0812ae88 l 0000003c SlotAction_WaitForAllReelsToStop -0812aec4 l 00000138 SlotAction_CheckMatches -0812affc l 00000020 SlotAction_WaitForPayoutToBeAwarded -0812b01c l 00000078 SlotAction_EndPayout -0812b094 l 00000044 SlotAction_MatchedPower -0812b0d8 l 00000030 SlotAction_WaitReelTimeAnim -0812b108 l 00000028 SlotAction_ResetBetTiles -0812b130 l 00000028 SlotAction_NoMatches -0812b158 l 00000058 SlotAction_AskQuit -0812b1b0 l 00000064 SlotAction_HandleQuitInput -0812b214 l 00000040 SlotAction_PrintMsg_9999Coins -0812b254 l 0000002c SlotAction_WaitMsg_9999Coins -0812b280 l 00000040 SlotAction_PrintMsg_NoMoreCoins -0812b2c0 l 0000002c SlotAction_WaitMsg_NoMoreCoins -0812b2ec l 00000040 SlotAction_EndGame -0812b32c l 000001c0 SlotAction_FreeDataStructures -0812b4ec l 00000070 DrawLuckyFlags -0812b55c l 00000020 SetLuckySpins -0812b57c l 00000034 GetBiasTag -0812b5b0 l 0000003c IsThisRoundLucky -0812b5ec l 00000048 AttemptsAtLuckyFlags_Top3 -0812b634 l 00000098 AttemptsAtLuckyFlags_NotTop3 -0812b6cc l 00000034 GetReelTimeProbability -0812b700 l 00000060 GetReeltimeDraw +0812ab04 l 00000034 SlotTask_UnfadeScreen +0812ab38 l 00000028 SlotTask_WaitUnfade +0812ab60 l 00000046 SlotTask_ReadyNewSpin +0812aba8 l 00000020 SlotTask_ReadyNewReelTimeSpin +0812abc8 l 00000030 SlotTask_AskInsertBet +0812abf8 l 000000fc SlotTask_HandleBetInput +0812acf4 l 00000040 SlotTask_PrintMsg_Need3Coins +0812ad34 l 0000002c SlotTask_WaitMsg_Need3Coins +0812ad60 l 00000020 SlotTask_WaitInfoBox +0812ad80 l 00000074 SlotTask_StartSpin +0812adf4 l 00000030 SlotTask_StartReelTimeSpin +0812ae24 l 00000028 SlotTask_ResetBiasFailure +0812ae4c l 0000003c SlotTask_WaitReelStop +0812ae88 l 0000003c SlotTask_WaitAllReelsStop +0812aec4 l 00000138 SlotTask_CheckMatches +0812affc l 00000020 SlotTask_WaitPayout +0812b01c l 00000078 SlotTask_EndPayout +0812b094 l 00000044 SlotTask_MatchedPower +0812b0d8 l 00000030 SlotTask_WaitReelTimeAnim +0812b108 l 00000028 SlotTask_ResetBetTiles +0812b130 l 00000028 SlotTask_NoMatches +0812b158 l 00000058 SlotTask_AskQuit +0812b1b0 l 00000064 SlotTask_HandleQuitInput +0812b214 l 00000040 SlotTask_PrintMsg_MaxCoins +0812b254 l 0000002c SlotTask_WaitMsg_MaxCoins +0812b280 l 00000040 SlotTask_PrintMsg_NoMoreCoins +0812b2c0 l 0000002c SlotTask_WaitMsg_NoMoreCoins +0812b2ec l 00000040 SlotTask_EndGame +0812b32c l 000001c0 SlotTask_FreeDataStructures +0812b4ec l 00000070 DrawMachineBias +0812b55c l 00000020 ResetBiasFailure +0812b57c l 00000034 GetBiasSymbol +0812b5b0 l 0000003c ShouldTrySpecialBias +0812b5ec l 00000048 TrySelectBias_Special +0812b634 l 00000098 TrySelectBias_Regular +0812b6cc l 00000034 GetReelTimeSpinProbability +0812b700 l 00000060 GetReelTimeDraw 0812b760 l 0000002c ShouldReelTimeMachineExplode -0812b78c l 0000009c SlowReelSpeed +0812b78c l 0000009c ReelTimeSpeed 0812b828 l 00000034 CheckMatch 0812b85c l 00000074 CheckMatch_CenterRow 0812b8d0 l 000000d0 CheckMatch_TopAndBottom 0812b9a0 l 000000cc CheckMatch_Diagonals 0812ba6c l 0000004e GetMatchFromSymbols 0812babc l 00000020 AwardPayout -0812badc l 0000001e IsFinalTask_RunAwardPayoutActions -0812bafc l 00000038 RunAwardPayoutActions -0812bb34 l 00000034 AwardPayoutAction0 -0812bb68 l 000000b8 AwardPayoutAction_GivePayoutToPlayer -0812bc20 l 00000024 AwardPayoutAction_FreeTask -0812bc44 l 00000054 GetTagAtRest -0812bc98 l 00000050 GetTag -0812bce8 l 00000040 GetNearbyReelTimeTag +0812badc l 0000001e IsFinalTask_Task_Payout +0812bafc l 00000038 Task_Payout +0812bb34 l 00000034 PayoutTask_Init +0812bb68 l 000000b8 PayoutTask_GivePayout +0812bc20 l 00000024 PayoutTask_Free +0812bc44 l 00000054 GetSymbolAtRest +0812bc98 l 00000050 GetSymbol +0812bce8 l 00000040 GetReelTimeSymbol 0812bd28 l 00000048 AdvanceSlotReel -0812bd70 g 00000064 AdvanceSlotReelToNextTag +0812bd70 g 00000064 AdvanceSlotReelToNextSymbol 0812bdd4 l 00000038 AdvanceReeltimeReel -0812be0c g 00000050 AdvanceReeltimeReelToNextTag -0812be5c l 00000048 CreateSlotReelTasks +0812be0c g 00000050 AdvanceReeltimeReelToNextSymbol +0812be5c l 00000048 CreateReelTasks 0812bea4 l 00000038 SpinSlotReel 0812bedc l 00000028 StopSlotReel 0812bf04 l 00000028 IsSlotReelMoving -0812bf2c l 00000038 Task_RunSlotReelActions -0812bf64 l 00000004 SlotReelAction_StayStill -0812bf68 l 00000020 SlotReelAction_Spin -0812bf88 l 00000094 SlotReelAction_DecideWhereToStop -0812c01c l 000000c4 SlotReelAction_MoveToStop -0812c0e0 l 00000058 SlotReelAction_OscillatingStop -0812c138 l 0000004c DecideReelTurns_BiasTag_Reel1 -0812c184 l 00000040 AreTagsAtPosition_Reel1 +0812bf2c l 00000038 Task_Reel +0812bf64 l 00000004 ReelTask_StayStill +0812bf68 l 00000020 ReelTask_Spin +0812bf88 l 00000094 ReelTask_DecideStop +0812c01c l 000000c4 ReelTask_MoveToStop +0812c0e0 l 00000058 ReelTask_ShakingStop +0812c138 l 0000004c DecideStop_Bias_Reel1 +0812c184 l 00000040 EitherSymbolAtPos_Reel1 0812c1c4 l 00000054 AreCherriesOnScreen_Reel1 -0812c218 l 0000001e IsBiasTowardsCherryOr7s -0812c238 l 00000058 DecideReelTurns_BiasTag_Reel1_Bet1 -0812c290 l 0000010e DecideReelTurns_BiasTag_Reel1_Bet2or3 -0812c3a0 l 00000028 DecideReelTurns_BiasTag_Reel2 -0812c3c8 l 0000004c DecideReelTurns_BiasTag_Reel2_Bet1or2 -0812c414 l 000000a8 DecideReelTurns_BiasTag_Reel2_Bet3 -0812c4bc l 00000044 DecideReelTurns_BiasTag_Reel3 -0812c500 l 0000005c DecideReelTurns_BiasTag_Reel3_Bet1or2 -0812c55c l 00000080 DecideReelTurns_BiasTag_Reel3_Bet3 -0812c5dc l 0000002c DecideReelTurns_NoBiasTag_Reel1 -0812c608 l 00000020 IsBiasTag777_SwitchColor -0812c628 l 00000024 DecideReelTurns_NoBiasTag_Reel2 -0812c64c l 00000080 DecideReelTurns_NoBiasTag_Reel2_Bet1 -0812c6cc l 00000080 DecideReelTurns_NoBiasTag_Reel2_Bet2 -0812c74c l 00000106 DecideReelTurns_NoBiasTag_Reel2_Bet3 -0812c854 l 00000026 AreTagsMixed77 -0812c87c l 00000030 AreTagsMixed777 -0812c8ac l 00000050 TagsDontMatchOrHaveAny7s -0812c8fc l 00000024 DecideReelTurns_NoBiasTag_Reel3 -0812c920 l 000000e8 DecideReelTurns_NoBiasTag_Reel3_Bet1 -0812ca08 l 00000178 DecideReelTurns_NoBiasTag_Reel3_Bet2 -0812cb80 l 000001be DecideReelTurns_NoBiasTag_Reel3_Bet3 +0812c218 l 0000001e BiasedTowardCherryOr7s +0812c238 l 00000058 DecideStop_Bias_Reel1_Bet1 +0812c290 l 0000010e DecideStop_Bias_Reel1_Bet2or3 +0812c3a0 l 00000028 DecideStop_Bias_Reel2 +0812c3c8 l 0000004c DecideStop_Bias_Reel2_Bet1or2 +0812c414 l 000000a8 DecideStop_Bias_Reel2_Bet3 +0812c4bc l 00000044 DecideStop_Bias_Reel3 +0812c500 l 0000005c DecideStop_Bias_Reel3_Bet1or2 +0812c55c l 00000080 DecideStop_Bias_Reel3_Bet3 +0812c5dc l 0000002c DecideStop_NoBias_Reel1 +0812c608 l 00000020 IfSymbol7_SwitchColor +0812c628 l 00000024 DecideStop_NoBias_Reel2 +0812c64c l 00000080 DecideStop_NoBias_Reel2_Bet1 +0812c6cc l 00000080 DecideStop_NoBias_Reel2_Bet2 +0812c74c l 00000106 DecideStop_NoBias_Reel2_Bet3 +0812c854 l 00000026 MismatchedSyms_77 +0812c87c l 00000030 MismatchedSyms_777 +0812c8ac l 00000050 NeitherMatchNor7Mismatch +0812c8fc l 00000024 DecideStop_NoBias_Reel3 +0812c920 l 000000e8 DecideStop_NoBias_Reel3_Bet1 +0812ca08 l 00000178 DecideStop_NoBias_Reel3_Bet2 +0812cb80 l 000001be DecideStop_NoBias_Reel3_Bet3 0812cd40 l 00000034 PressStopReelButton 0812cd74 l 00000030 Task_PressStopReelButton 0812cda4 l 00000034 StopReelButton_Press @@ -11211,7 +11211,7 @@ 0812d920 l 0000002e ReelTime_WaitClearPikaPower 0812d950 l 00000054 ReelTime_CloseWindow 0812d9a4 l 0000007c ReelTime_DestroySprites -0812da20 l 0000004c ReelTime_SetReelIncrement +0812da20 l 0000004c ReelTime_SetReelSpeed 0812da6c l 00000024 ReelTime_EndSuccess 0812da90 l 00000074 ReelTime_ExplodeMachine 0812db04 l 00000088 ReelTime_WaitExplode @@ -11221,12 +11221,12 @@ 0812dc50 l 00000030 ClearReelTimeWindowTilemap 0812dc80 l 00000034 OpenInfoBox 0812dcb4 l 0000001e IsInfoBoxClosed -0812dcd4 l 00000030 RunInfoBoxActions +0812dcd4 l 00000030 Task_InfoBox 0812dd04 l 00000024 InfoBox_FadeIn -0812dd28 l 00000020 InfoBox_WaitForFade +0812dd28 l 00000020 InfoBox_WaitFade 0812dd48 l 00000030 InfoBox_DrawWindow 0812dd78 l 0000004c InfoBox_AddText -0812ddc4 l 00000050 InfoBox_AwaitPlayerInput +0812ddc4 l 00000050 InfoBox_WaitInput 0812de14 l 0000001a InfoBox_LoadSlotMachineTilemap 0812de30 l 00000016 InfoBox_CreateDigitalDisplay 0812de48 l 00000034 InfoBox_LoadPikaPowerMeter @@ -52369,42 +52369,42 @@ 085a7434 l 00000010 sWindowTemplates 085a7444 l 00000008 sWindowTemplate_InfoBox 085a744c l 00000003 sColors_ReeltimeHelp -085a7450 l 00000074 sSlotActions -085a74c4 l 0000000c sAwardPayoutActions -085a74d0 l 00000014 sSlotReelActions -085a74e4 l 0000000c sDecideReelTurns_BiasTag -085a74f0 l 0000000c sDecideReelTurns_NoBiasTag +085a7450 l 00000074 sSlotTasks +085a74c4 l 0000000c sPayoutTasks +085a74d0 l 00000014 sReelTasks +085a74e4 l 0000000c sDecideStop_Bias +085a74f0 l 0000000c sDecideStop_NoBias 085a74fc l 0000000a sReelStopShocks -085a7508 l 0000000c sDecideReelTurns_BiasTag_Reel1_Bets -085a7514 l 0000000c sDecideReelTurns_BiasTag_Reel2_Bets -085a7520 l 0000000c sDecideReelTurns_BiasTag_Reel3_Bets -085a752c l 0000000c sDecideReelTurns_NoBiasTag_Reel2_Bets -085a7538 l 0000000c sDecideReelTurns_NoBiasTag_Reel3_Bets -085a7544 l 0000000c sReelStopButtonFuncs +085a7508 l 0000000c sDecideStop_Bias_Reel1_Bets +085a7514 l 0000000c sDecideStop_Bias_Reel2_Bets +085a7520 l 0000000c sDecideStop_Bias_Reel3_Bets +085a752c l 0000000c sDecideStop_NoBias_Reel2_Bets +085a7538 l 0000000c sDecideStop_NoBias_Reel3_Bets +085a7544 l 0000000c sReelStopButtonTasks 085a7550 l 00000006 sReelButtonOffsets -085a7558 l 00000010 sPikaPowerBoltFuncs +085a7558 l 00000010 sPikaPowerBoltTasks 085a7568 l 0000000c sPikaPowerTileTable -085a7574 l 0000004c sReelTimeActions +085a7574 l 0000004c sReelTimeTasks 085a75c0 l 00000004 sReelTimePikachuAnimIds 085a75c4 l 00000008 sReelTimeBoltDelays 085a75cc l 00000008 sPikachuAuraFlashDelays -085a75d4 l 0000003c sInfoBoxActions -085a7610 l 00000004 sDigitalDisplayActions -085a766e l 0000003f sReelSymbolTileTags -085a76ad l 00000006 sReelTimeTags +085a75d4 l 0000003c sInfoBoxTasks +085a7610 l 00000004 sDigitalDisplayTasks +085a766e l 0000003f sReelSymbols +085a76ad l 00000006 sReelTimeSymbols 085a76b4 l 0000000c sInitialReelPositions -085a76c0 l 00000012 sLuckyRoundProbabilities -085a76d2 l 00000012 sLuckyFlagProbabilities_Top3 -085a76e4 l 0000001e sLuckyFlagProbabilities_NotTop3 -085a7702 l 00000066 sReeltimeProbabilities_UnluckyGame +085a76c0 l 00000012 sSpecialDrawOdds +085a76d2 l 00000012 sBiasProbabilities_Special +085a76e4 l 0000001e sBiasProbabilities_Regular +085a7702 l 00000066 sReelTimeProbabilities_NormalGame 085a7768 l 00000066 sReelTimeProbabilities_LuckyGame 085a77ce l 0000000a sReelTimeExplodeProbability -085a77d8 l 00000014 sReelIncrementTable -085a77ec l 0000000a sReelTimeBonusIncrementTable -085a77f6 l 00000008 sBiasTags -085a77fe l 00000006 sLuckyFlagSettings_Top3 -085a7804 l 0000000a sLuckyFlagSettings_NotTop3 -085a780e l 00000007 sSymToMatch +085a77d8 l 00000014 sReelTimeSpeed_Probabilities +085a77ec l 0000000a sQuarterSpeed_ProbabilityBoost +085a77f6 l 00000008 sBiasSymbols +085a77fe l 00000006 sBiasesSpecial +085a7804 l 0000000a sBiasesRegular +085a780e l 00000007 sSymbolToMatch 085a7816 l 00000012 sSlotMatchFlags 085a7828 l 00000012 sSlotPayouts 085a783a l 0000008c sDigitalDisplay_SpriteCoords