From 2aabbf00e2d3f2803ffe2c996c47f431075abc8b Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Thu, 1 Jun 2023 14:34:04 +0000 Subject: [PATCH] Merge pull request #628 from GriffinRichards/pal-macros --- pokefirered.sym | 89 +++++++++++++++++++++--------------------- pokefirered_rev1.sym | 89 +++++++++++++++++++++--------------------- pokeleafgreen.sym | 89 +++++++++++++++++++++--------------------- pokeleafgreen_rev1.sym | 89 +++++++++++++++++++++--------------------- 4 files changed, 180 insertions(+), 176 deletions(-) diff --git a/pokefirered.sym b/pokefirered.sym index ee9449eb1..5a7015819 100644 --- a/pokefirered.sym +++ b/pokefirered.sym @@ -409,9 +409,9 @@ 0203ab20 l 00000002 sStarSparklesYspeed 0203ab22 l 00000002 sStarSparklesXprecision 0203ab24 l 00000002 sStarSparklesYprecision -0203ab28 l 00000004 sStarSparklesRngSeed.138 -0203ab2c l 00000002 sYmod.142 -0203ab30 l 00000004 sGengarScroll.176 +0203ab28 l 00000004 sStarSparklesRngSeed.144 +0203ab2c l 00000002 sYmod.148 +0203ab30 l 00000004 sGengarScroll.182 0203ab34 l 00000004 sSelectedPaletteIndices 0203ab38 l 00000004 sHofMonPtr 0203ab3c l 00000004 sHofGfxPtr @@ -649,7 +649,7 @@ 03000e6b l 00000001 sHandshakePlayerCount 03000e6c l 00000006 MultiBoot_required_data 03000e74 l 00000004 sEggHatchData -03000e78 l 00000002 dummy.3 +03000e78 l 00000002 dummy.9 03000e7c l 00000001 sPlayTimeCounterState 03000e80 l 00000004 sPlayerLinkStates 03000e84 l 00000004 sPlayerKeyInterceptCallback @@ -687,26 +687,26 @@ 03000fc5 l 00000001 sMapMusicFadeInSpeed 03000fc6 l 00000002 sFanfareCounter 03000fc8 l 00000020 sFieldEffectActiveList -03000fe8 l 00000184 sItemIconGfxBuffer.84 -0300116c l 00000004 i.90 -03001170 l 00000004 j.91 -03001174 l 00000004 k.92 -03001178 l 00000004 index.93 -0300117c l 00000004 numWords.94 -03001180 l 00000004 numToProcess.95 -03001184 l 00000004 words.96 -03001188 l 00000001 heldKeyCount.117 +03000fe8 l 00000184 sItemIconGfxBuffer.90 +0300116c l 00000004 i.96 +03001170 l 00000004 j.97 +03001174 l 00000004 k.98 +03001178 l 00000004 index.99 +0300117c l 00000004 numWords.100 +03001180 l 00000004 numToProcess.101 +03001184 l 00000004 words.102 +03001188 l 00000001 heldKeyCount.123 03001190 l 00000e64 sRfuAPIBuffer 03001ff8 l 00000010 sResendBlock8 03002008 l 00000010 sResendBlock16 -03002018 l 00000001 counter.36 +03002018 l 00000001 counter.42 0300201c l 00000004 sFlagOrVarRecords 03002020 l 00000002 sNumFlagsOrVars 03002024 l 00000004 sLeader 03002028 l 00000004 sGroup 0300202c l 00000004 sURoom -03002030 l 00000008 spriteSheet.183 -03002038 l 00000008 spritePalette.184 +03002030 l 00000008 spriteSheet.189 +03002038 l 00000008 spritePalette.190 03002040 l 00000004 sStatusScreen 03002044 l 00000004 sExitingGame 03002048 l 00000018 sSendRecvMgr @@ -720,9 +720,9 @@ 03002070 l 00000002 sSavedTm3Cnt 03002072 l 00000002 sSavedSioCnt 03002074 l 00000002 sSavedRCnt -03002078 l 00000004 oamId.21 -0300207c l 00000004 curDigit.22 -03002080 l 00000004 firstDigit.23 +03002078 l 00000004 oamId.27 +0300207c l 00000004 curDigit.28 +03002080 l 00000004 firstDigit.29 03002088 l 00000040 sDecodingBuffer 030020c8 g 00000320 gMPlayTrack_BGM 030023e8 g 000000f0 gMPlayTrack_SE1 @@ -25713,8 +25713,8 @@ 08231e28 g 00000004 gBGVOffsetRegOffsets 08231e2c l 00000010 sDigits 08231e3c l 00000028 sPowersOfTen -08231e70 l 00000000 funcs.87 -08231ea8 l 00000000 lengths.109 +08231e70 l 00000000 funcs.93 +08231ea8 l 00000000 lengths.115 08231ec4 l 00000020 sWirelessLinkDisplayPal 08231ee4 l 000004a8 sWirelessLinkDisplayGfx 0823238c l 000001ec sWirelessLinkDisplayTilemap @@ -29854,7 +29854,7 @@ 0835b8ac l 00000004 sPlayerAvatarSecretBaseMatJump 0835b8b0 l 00000010 sPlayerAvatarSecretBaseMatSpin 0835b8cc l 00000040 sFishingStateFuncs -0835b918 l 00000000 dot.465 +0835b918 l 00000000 dot.471 0835b92c l 00000005 sTeleportFacingDirectionSequence 0835b934 g 00000010 gReflectionEffectPaletteMap 0835b944 l 00000018 gCameraSpriteTemplate @@ -31108,14 +31108,14 @@ 083a7004 l 00000008 sMovementActionFuncs_ShakeHeadOrWalkInPlace 083a700c l 0000000c sMovementActionFuncs_FlyUp 083a7018 l 0000000c sMovementActionFuncs_FlyDown -083a702c l 00000000 metatileFuncs.2418 -083a7044 l 00000000 jumpLandingFlags.2419 -083a705c l 00000010 ledgeBehaviorFuncs.2429 +083a702c l 00000000 metatileFuncs.2424 +083a7044 l 00000000 jumpLandingFlags.2425 +083a705c l 00000010 ledgeBehaviorFuncs.2435 083a706c l 00000010 sElevationToSubpriority 083a707c l 00000010 sElevationToPriority 083a708c l 00000010 sElevationToSubspriteTableNum 083a709c l 0000000c sGroundEffectTracksFuncs -083a70ac l 00000010 bikeTireTracks_Transitions.2493 +083a70ac l 00000010 bikeTireTracks_Transitions.2499 083a70bc l 00000050 sGroundEffectFuncs 083a710c l 00000040 sSpeedNormalStepFuncs 083a714c l 00000020 sSpeedFast1StepFuncs @@ -33569,17 +33569,17 @@ 083d2bcc l 00000020 sPokeStorageMisc1Pal 083d2bec l 00000800 sHandCursorTiles 083d33ec l 00000080 sHandCursorShadowTiles -083d346c l 0000000c placeChangeFuncs.45 -083d3478 l 00000000 inputFuncs.187 -083d34c8 l 00000008 sOamData_Cursor.206 -083d34d0 l 00000008 sOamData_CursorShadow.207 -083d34d8 l 00000000 sAnim_Cursor_Bouncing.208 -083d34e4 l 00000000 sAnim_Cursor_Still.209 -083d34ec l 00000000 sAnim_Cursor_Open.210 -083d34f4 l 00000000 sAnim_Cursor_Fist.211 -083d34fc l 00000000 sAnims_Cursor.212 -083d350c l 00000018 sSpriteTemplate_Cursor.213 -083d3524 l 00000018 sSpriteTemplate_CursorShadow.214 +083d346c l 0000000c placeChangeFuncs.51 +083d3478 l 00000000 inputFuncs.193 +083d34c8 l 00000008 sOamData_Cursor.212 +083d34d0 l 00000008 sOamData_CursorShadow.213 +083d34d8 l 00000000 sAnim_Cursor_Bouncing.214 +083d34e4 l 00000000 sAnim_Cursor_Still.215 +083d34ec l 00000000 sAnim_Cursor_Open.216 +083d34f4 l 00000000 sAnim_Cursor_Fist.217 +083d34fc l 00000000 sAnims_Cursor.218 +083d350c l 00000018 sSpriteTemplate_Cursor.219 +083d3524 l 00000018 sSpriteTemplate_CursorShadow.220 083d353c l 00000098 sMenuTexts 083d35d4 l 00000008 sWindowTemplate_MultiMove 083d35dc l 00000080 sItemInfoFrame_Gfx @@ -36406,7 +36406,8 @@ 083f5738 l 000000cc sTransitionTypes 083f5804 l 00000020 sCaveTransitionPalette_White 083f5824 l 00000020 sCaveTransitionPalette_Black -083f5844 l 00000020 sCaveTransitionPalette_Gradient +083f5844 l 00000010 sCaveTransitionPalette_Enter +083f5854 l 00000010 sCaveTransitionPalette_Exit 083f5864 l 000001e0 sCaveTransitionTilemap 083f5a44 l 000000b4 sCaveTransitionTiles 083f5af8 l 0000000c sStringVarPtrs @@ -40485,8 +40486,8 @@ 08456928 l 00000008 sHelpMessageWindowTemplate 08456930 l 00000003 sHelpMessageTextColors 08456934 g 00000004 sCounterIncrements -08456938 l 00000000 sFanClubMemberIds.21 -08456940 l 00000000 sFanClubMemberIds.25 +08456938 l 00000000 sFanClubMemberIds.27 +08456940 l 00000000 sFanClubMemberIds.31 08456948 l 000000ac sQuestLogStorageCBs 084569f4 l 000000ac sQuestLogEventTextBufferCBs 08456aa0 l 0000002b sQuestLogEventCmdSizes @@ -41878,7 +41879,7 @@ 08478d8c l 00000004 sAnims_Cloud 08478dc0 l 0000000a sUnusedSounds 08478dd4 l 00000008 sBerryIconXCoords -08478e0c l 00000000 moveDelays.342 +08478e0c l 00000000 moveDelays.348 08478e0e l 00000008 sCloudStartCoords 08478e38 l 0000000c sTextColorTable 08478e44 l 00000004 sNameWindowCoords_1Player @@ -41931,9 +41932,9 @@ 0847947c l 0000004c sCatchingScript 084794c8 l 00000040 sTMsScript 08479508 l 00000040 sRegisterKeyItemScript -08479548 l 00000018 array.90 -08479560 l 00000000 texts.94 -08479578 l 00000000 texts.98 +08479548 l 00000018 array.96 +08479560 l 00000000 texts.100 +08479578 l 00000000 texts.104 08479590 l 00000020 sBg1EndGraphic 084795b0 l 00000008 sSubspriteArray 084795b8 l 00000010 sSubspriteTableArray diff --git a/pokefirered_rev1.sym b/pokefirered_rev1.sym index 07b64cc7b..bdacbfc13 100644 --- a/pokefirered_rev1.sym +++ b/pokefirered_rev1.sym @@ -409,9 +409,9 @@ 0203ab20 l 00000002 sStarSparklesYspeed 0203ab22 l 00000002 sStarSparklesXprecision 0203ab24 l 00000002 sStarSparklesYprecision -0203ab28 l 00000004 sStarSparklesRngSeed.138 -0203ab2c l 00000002 sYmod.142 -0203ab30 l 00000004 sGengarScroll.179 +0203ab28 l 00000004 sStarSparklesRngSeed.144 +0203ab2c l 00000002 sYmod.148 +0203ab30 l 00000004 sGengarScroll.185 0203ab34 l 00000004 sSelectedPaletteIndices 0203ab38 l 00000004 sHofMonPtr 0203ab3c l 00000004 sHofGfxPtr @@ -649,7 +649,7 @@ 03000e6b l 00000001 sHandshakePlayerCount 03000e6c l 00000006 MultiBoot_required_data 03000e74 l 00000004 sEggHatchData -03000e78 l 00000002 dummy.3 +03000e78 l 00000002 dummy.9 03000e7c l 00000001 sPlayTimeCounterState 03000e80 l 00000004 sPlayerLinkStates 03000e84 l 00000004 sPlayerKeyInterceptCallback @@ -687,26 +687,26 @@ 03000fc5 l 00000001 sMapMusicFadeInSpeed 03000fc6 l 00000002 sFanfareCounter 03000fc8 l 00000020 sFieldEffectActiveList -03000fe8 l 00000184 sItemIconGfxBuffer.84 -0300116c l 00000004 i.90 -03001170 l 00000004 j.91 -03001174 l 00000004 k.92 -03001178 l 00000004 index.93 -0300117c l 00000004 numWords.94 -03001180 l 00000004 numToProcess.95 -03001184 l 00000004 words.96 -03001188 l 00000001 heldKeyCount.117 +03000fe8 l 00000184 sItemIconGfxBuffer.90 +0300116c l 00000004 i.96 +03001170 l 00000004 j.97 +03001174 l 00000004 k.98 +03001178 l 00000004 index.99 +0300117c l 00000004 numWords.100 +03001180 l 00000004 numToProcess.101 +03001184 l 00000004 words.102 +03001188 l 00000001 heldKeyCount.123 03001190 l 00000e64 sRfuAPIBuffer 03001ff8 l 00000010 sResendBlock8 03002008 l 00000010 sResendBlock16 -03002018 l 00000001 counter.36 +03002018 l 00000001 counter.42 0300201c l 00000004 sFlagOrVarRecords 03002020 l 00000002 sNumFlagsOrVars 03002024 l 00000004 sLeader 03002028 l 00000004 sGroup 0300202c l 00000004 sURoom -03002030 l 00000008 spriteSheet.183 -03002038 l 00000008 spritePalette.184 +03002030 l 00000008 spriteSheet.189 +03002038 l 00000008 spritePalette.190 03002040 l 00000004 sStatusScreen 03002044 l 00000004 sExitingGame 03002048 l 00000018 sSendRecvMgr @@ -720,9 +720,9 @@ 03002070 l 00000002 sSavedTm3Cnt 03002072 l 00000002 sSavedSioCnt 03002074 l 00000002 sSavedRCnt -03002078 l 00000004 oamId.21 -0300207c l 00000004 curDigit.22 -03002080 l 00000004 firstDigit.23 +03002078 l 00000004 oamId.27 +0300207c l 00000004 curDigit.28 +03002080 l 00000004 firstDigit.29 03002088 l 00000040 sDecodingBuffer 030020c8 g 00000320 gMPlayTrack_BGM 030023e8 g 000000f0 gMPlayTrack_SE1 @@ -25714,8 +25714,8 @@ 08231e98 g 00000004 gBGVOffsetRegOffsets 08231e9c l 00000010 sDigits 08231eac l 00000028 sPowersOfTen -08231ee0 l 00000000 funcs.87 -08231f18 l 00000000 lengths.109 +08231ee0 l 00000000 funcs.93 +08231f18 l 00000000 lengths.115 08231f34 l 00000020 sWirelessLinkDisplayPal 08231f54 l 000004a8 sWirelessLinkDisplayGfx 082323fc l 000001ec sWirelessLinkDisplayTilemap @@ -29855,7 +29855,7 @@ 0835b91c l 00000004 sPlayerAvatarSecretBaseMatJump 0835b920 l 00000010 sPlayerAvatarSecretBaseMatSpin 0835b93c l 00000040 sFishingStateFuncs -0835b988 l 00000000 dot.465 +0835b988 l 00000000 dot.471 0835b99c l 00000005 sTeleportFacingDirectionSequence 0835b9a4 g 00000010 gReflectionEffectPaletteMap 0835b9b4 l 00000018 gCameraSpriteTemplate @@ -31109,14 +31109,14 @@ 083a7074 l 00000008 sMovementActionFuncs_ShakeHeadOrWalkInPlace 083a707c l 0000000c sMovementActionFuncs_FlyUp 083a7088 l 0000000c sMovementActionFuncs_FlyDown -083a709c l 00000000 metatileFuncs.2418 -083a70b4 l 00000000 jumpLandingFlags.2419 -083a70cc l 00000010 ledgeBehaviorFuncs.2429 +083a709c l 00000000 metatileFuncs.2424 +083a70b4 l 00000000 jumpLandingFlags.2425 +083a70cc l 00000010 ledgeBehaviorFuncs.2435 083a70dc l 00000010 sElevationToSubpriority 083a70ec l 00000010 sElevationToPriority 083a70fc l 00000010 sElevationToSubspriteTableNum 083a710c l 0000000c sGroundEffectTracksFuncs -083a711c l 00000010 bikeTireTracks_Transitions.2493 +083a711c l 00000010 bikeTireTracks_Transitions.2499 083a712c l 00000050 sGroundEffectFuncs 083a717c l 00000040 sSpeedNormalStepFuncs 083a71bc l 00000020 sSpeedFast1StepFuncs @@ -33570,17 +33570,17 @@ 083d2c3c l 00000020 sPokeStorageMisc1Pal 083d2c5c l 00000800 sHandCursorTiles 083d345c l 00000080 sHandCursorShadowTiles -083d34dc l 0000000c placeChangeFuncs.45 -083d34e8 l 00000000 inputFuncs.187 -083d3538 l 00000008 sOamData_Cursor.206 -083d3540 l 00000008 sOamData_CursorShadow.207 -083d3548 l 00000000 sAnim_Cursor_Bouncing.208 -083d3554 l 00000000 sAnim_Cursor_Still.209 -083d355c l 00000000 sAnim_Cursor_Open.210 -083d3564 l 00000000 sAnim_Cursor_Fist.211 -083d356c l 00000000 sAnims_Cursor.212 -083d357c l 00000018 sSpriteTemplate_Cursor.213 -083d3594 l 00000018 sSpriteTemplate_CursorShadow.214 +083d34dc l 0000000c placeChangeFuncs.51 +083d34e8 l 00000000 inputFuncs.193 +083d3538 l 00000008 sOamData_Cursor.212 +083d3540 l 00000008 sOamData_CursorShadow.213 +083d3548 l 00000000 sAnim_Cursor_Bouncing.214 +083d3554 l 00000000 sAnim_Cursor_Still.215 +083d355c l 00000000 sAnim_Cursor_Open.216 +083d3564 l 00000000 sAnim_Cursor_Fist.217 +083d356c l 00000000 sAnims_Cursor.218 +083d357c l 00000018 sSpriteTemplate_Cursor.219 +083d3594 l 00000018 sSpriteTemplate_CursorShadow.220 083d35ac l 00000098 sMenuTexts 083d3644 l 00000008 sWindowTemplate_MultiMove 083d364c l 00000080 sItemInfoFrame_Gfx @@ -36407,7 +36407,8 @@ 083f57a8 l 000000cc sTransitionTypes 083f5874 l 00000020 sCaveTransitionPalette_White 083f5894 l 00000020 sCaveTransitionPalette_Black -083f58b4 l 00000020 sCaveTransitionPalette_Gradient +083f58b4 l 00000010 sCaveTransitionPalette_Enter +083f58c4 l 00000010 sCaveTransitionPalette_Exit 083f58d4 l 000001e0 sCaveTransitionTilemap 083f5ab4 l 000000b4 sCaveTransitionTiles 083f5b68 l 0000000c sStringVarPtrs @@ -40486,8 +40487,8 @@ 08456988 l 00000008 sHelpMessageWindowTemplate 08456990 l 00000003 sHelpMessageTextColors 08456994 g 00000004 sCounterIncrements -08456998 l 00000000 sFanClubMemberIds.21 -084569a0 l 00000000 sFanClubMemberIds.25 +08456998 l 00000000 sFanClubMemberIds.27 +084569a0 l 00000000 sFanClubMemberIds.31 084569a8 l 000000ac sQuestLogStorageCBs 08456a54 l 000000ac sQuestLogEventTextBufferCBs 08456b00 l 0000002b sQuestLogEventCmdSizes @@ -41879,7 +41880,7 @@ 08478dec l 00000004 sAnims_Cloud 08478e20 l 0000000a sUnusedSounds 08478e34 l 00000008 sBerryIconXCoords -08478e6c l 00000000 moveDelays.342 +08478e6c l 00000000 moveDelays.348 08478e6e l 00000008 sCloudStartCoords 08478e98 l 0000000c sTextColorTable 08478ea4 l 00000004 sNameWindowCoords_1Player @@ -41932,9 +41933,9 @@ 084794dc l 0000004c sCatchingScript 08479528 l 00000040 sTMsScript 08479568 l 00000040 sRegisterKeyItemScript -084795a8 l 00000018 array.90 -084795c0 l 00000000 texts.94 -084795d8 l 00000000 texts.98 +084795a8 l 00000018 array.96 +084795c0 l 00000000 texts.100 +084795d8 l 00000000 texts.104 084795f0 l 00000020 sBg1EndGraphic 08479610 l 00000008 sSubspriteArray 08479618 l 00000010 sSubspriteTableArray diff --git a/pokeleafgreen.sym b/pokeleafgreen.sym index ac2233edc..53a12757d 100644 --- a/pokeleafgreen.sym +++ b/pokeleafgreen.sym @@ -409,9 +409,9 @@ 0203ab20 l 00000002 sStarSparklesYspeed 0203ab22 l 00000002 sStarSparklesXprecision 0203ab24 l 00000002 sStarSparklesYprecision -0203ab28 l 00000004 sStarSparklesRngSeed.138 -0203ab2c l 00000002 sYmod.142 -0203ab30 l 00000004 sGengarScroll.176 +0203ab28 l 00000004 sStarSparklesRngSeed.144 +0203ab2c l 00000002 sYmod.148 +0203ab30 l 00000004 sGengarScroll.182 0203ab34 l 00000004 sSelectedPaletteIndices 0203ab38 l 00000004 sHofMonPtr 0203ab3c l 00000004 sHofGfxPtr @@ -649,7 +649,7 @@ 03000e6b l 00000001 sHandshakePlayerCount 03000e6c l 00000006 MultiBoot_required_data 03000e74 l 00000004 sEggHatchData -03000e78 l 00000002 dummy.3 +03000e78 l 00000002 dummy.9 03000e7c l 00000001 sPlayTimeCounterState 03000e80 l 00000004 sPlayerLinkStates 03000e84 l 00000004 sPlayerKeyInterceptCallback @@ -687,26 +687,26 @@ 03000fc5 l 00000001 sMapMusicFadeInSpeed 03000fc6 l 00000002 sFanfareCounter 03000fc8 l 00000020 sFieldEffectActiveList -03000fe8 l 00000184 sItemIconGfxBuffer.84 -0300116c l 00000004 i.90 -03001170 l 00000004 j.91 -03001174 l 00000004 k.92 -03001178 l 00000004 index.93 -0300117c l 00000004 numWords.94 -03001180 l 00000004 numToProcess.95 -03001184 l 00000004 words.96 -03001188 l 00000001 heldKeyCount.117 +03000fe8 l 00000184 sItemIconGfxBuffer.90 +0300116c l 00000004 i.96 +03001170 l 00000004 j.97 +03001174 l 00000004 k.98 +03001178 l 00000004 index.99 +0300117c l 00000004 numWords.100 +03001180 l 00000004 numToProcess.101 +03001184 l 00000004 words.102 +03001188 l 00000001 heldKeyCount.123 03001190 l 00000e64 sRfuAPIBuffer 03001ff8 l 00000010 sResendBlock8 03002008 l 00000010 sResendBlock16 -03002018 l 00000001 counter.36 +03002018 l 00000001 counter.42 0300201c l 00000004 sFlagOrVarRecords 03002020 l 00000002 sNumFlagsOrVars 03002024 l 00000004 sLeader 03002028 l 00000004 sGroup 0300202c l 00000004 sURoom -03002030 l 00000008 spriteSheet.183 -03002038 l 00000008 spritePalette.184 +03002030 l 00000008 spriteSheet.189 +03002038 l 00000008 spritePalette.190 03002040 l 00000004 sStatusScreen 03002044 l 00000004 sExitingGame 03002048 l 00000018 sSendRecvMgr @@ -720,9 +720,9 @@ 03002070 l 00000002 sSavedTm3Cnt 03002072 l 00000002 sSavedSioCnt 03002074 l 00000002 sSavedRCnt -03002078 l 00000004 oamId.21 -0300207c l 00000004 curDigit.22 -03002080 l 00000004 firstDigit.23 +03002078 l 00000004 oamId.27 +0300207c l 00000004 curDigit.28 +03002080 l 00000004 firstDigit.29 03002088 l 00000040 sDecodingBuffer 030020c8 g 00000320 gMPlayTrack_BGM 030023e8 g 000000f0 gMPlayTrack_SE1 @@ -25715,8 +25715,8 @@ 08231e04 g 00000004 gBGVOffsetRegOffsets 08231e08 l 00000010 sDigits 08231e18 l 00000028 sPowersOfTen -08231e4c l 00000000 funcs.87 -08231e84 l 00000000 lengths.109 +08231e4c l 00000000 funcs.93 +08231e84 l 00000000 lengths.115 08231ea0 l 00000020 sWirelessLinkDisplayPal 08231ec0 l 000004a8 sWirelessLinkDisplayGfx 08232368 l 000001ec sWirelessLinkDisplayTilemap @@ -29856,7 +29856,7 @@ 0835b88c l 00000004 sPlayerAvatarSecretBaseMatJump 0835b890 l 00000010 sPlayerAvatarSecretBaseMatSpin 0835b8ac l 00000040 sFishingStateFuncs -0835b8f8 l 00000000 dot.465 +0835b8f8 l 00000000 dot.471 0835b90c l 00000005 sTeleportFacingDirectionSequence 0835b914 g 00000010 gReflectionEffectPaletteMap 0835b924 l 00000018 gCameraSpriteTemplate @@ -31110,14 +31110,14 @@ 083a6fe4 l 00000008 sMovementActionFuncs_ShakeHeadOrWalkInPlace 083a6fec l 0000000c sMovementActionFuncs_FlyUp 083a6ff8 l 0000000c sMovementActionFuncs_FlyDown -083a700c l 00000000 metatileFuncs.2418 -083a7024 l 00000000 jumpLandingFlags.2419 -083a703c l 00000010 ledgeBehaviorFuncs.2429 +083a700c l 00000000 metatileFuncs.2424 +083a7024 l 00000000 jumpLandingFlags.2425 +083a703c l 00000010 ledgeBehaviorFuncs.2435 083a704c l 00000010 sElevationToSubpriority 083a705c l 00000010 sElevationToPriority 083a706c l 00000010 sElevationToSubspriteTableNum 083a707c l 0000000c sGroundEffectTracksFuncs -083a708c l 00000010 bikeTireTracks_Transitions.2493 +083a708c l 00000010 bikeTireTracks_Transitions.2499 083a709c l 00000050 sGroundEffectFuncs 083a70ec l 00000040 sSpeedNormalStepFuncs 083a712c l 00000020 sSpeedFast1StepFuncs @@ -33571,17 +33571,17 @@ 083d2a08 l 00000020 sPokeStorageMisc1Pal 083d2a28 l 00000800 sHandCursorTiles 083d3228 l 00000080 sHandCursorShadowTiles -083d32a8 l 0000000c placeChangeFuncs.45 -083d32b4 l 00000000 inputFuncs.187 -083d3304 l 00000008 sOamData_Cursor.206 -083d330c l 00000008 sOamData_CursorShadow.207 -083d3314 l 00000000 sAnim_Cursor_Bouncing.208 -083d3320 l 00000000 sAnim_Cursor_Still.209 -083d3328 l 00000000 sAnim_Cursor_Open.210 -083d3330 l 00000000 sAnim_Cursor_Fist.211 -083d3338 l 00000000 sAnims_Cursor.212 -083d3348 l 00000018 sSpriteTemplate_Cursor.213 -083d3360 l 00000018 sSpriteTemplate_CursorShadow.214 +083d32a8 l 0000000c placeChangeFuncs.51 +083d32b4 l 00000000 inputFuncs.193 +083d3304 l 00000008 sOamData_Cursor.212 +083d330c l 00000008 sOamData_CursorShadow.213 +083d3314 l 00000000 sAnim_Cursor_Bouncing.214 +083d3320 l 00000000 sAnim_Cursor_Still.215 +083d3328 l 00000000 sAnim_Cursor_Open.216 +083d3330 l 00000000 sAnim_Cursor_Fist.217 +083d3338 l 00000000 sAnims_Cursor.218 +083d3348 l 00000018 sSpriteTemplate_Cursor.219 +083d3360 l 00000018 sSpriteTemplate_CursorShadow.220 083d3378 l 00000098 sMenuTexts 083d3410 l 00000008 sWindowTemplate_MultiMove 083d3418 l 00000080 sItemInfoFrame_Gfx @@ -36408,7 +36408,8 @@ 083f5574 l 000000cc sTransitionTypes 083f5640 l 00000020 sCaveTransitionPalette_White 083f5660 l 00000020 sCaveTransitionPalette_Black -083f5680 l 00000020 sCaveTransitionPalette_Gradient +083f5680 l 00000010 sCaveTransitionPalette_Enter +083f5690 l 00000010 sCaveTransitionPalette_Exit 083f56a0 l 000001e0 sCaveTransitionTilemap 083f5880 l 000000b4 sCaveTransitionTiles 083f5934 l 0000000c sStringVarPtrs @@ -40487,8 +40488,8 @@ 08456348 l 00000008 sHelpMessageWindowTemplate 08456350 l 00000003 sHelpMessageTextColors 08456354 g 00000004 sCounterIncrements -08456358 l 00000000 sFanClubMemberIds.21 -08456360 l 00000000 sFanClubMemberIds.25 +08456358 l 00000000 sFanClubMemberIds.27 +08456360 l 00000000 sFanClubMemberIds.31 08456368 l 000000ac sQuestLogStorageCBs 08456414 l 000000ac sQuestLogEventTextBufferCBs 084564c0 l 0000002b sQuestLogEventCmdSizes @@ -41880,7 +41881,7 @@ 08478668 l 00000004 sAnims_Cloud 0847869c l 0000000a sUnusedSounds 084786b0 l 00000008 sBerryIconXCoords -084786e8 l 00000000 moveDelays.342 +084786e8 l 00000000 moveDelays.348 084786ea l 00000008 sCloudStartCoords 08478714 l 0000000c sTextColorTable 08478720 l 00000004 sNameWindowCoords_1Player @@ -41933,9 +41934,9 @@ 08478d58 l 0000004c sCatchingScript 08478da4 l 00000040 sTMsScript 08478de4 l 00000040 sRegisterKeyItemScript -08478e24 l 00000018 array.90 -08478e3c l 00000000 texts.94 -08478e54 l 00000000 texts.98 +08478e24 l 00000018 array.96 +08478e3c l 00000000 texts.100 +08478e54 l 00000000 texts.104 08478e6c l 00000020 sBg1EndGraphic 08478e8c l 00000008 sSubspriteArray 08478e94 l 00000010 sSubspriteTableArray diff --git a/pokeleafgreen_rev1.sym b/pokeleafgreen_rev1.sym index f5b0511e3..394a74bab 100644 --- a/pokeleafgreen_rev1.sym +++ b/pokeleafgreen_rev1.sym @@ -409,9 +409,9 @@ 0203ab20 l 00000002 sStarSparklesYspeed 0203ab22 l 00000002 sStarSparklesXprecision 0203ab24 l 00000002 sStarSparklesYprecision -0203ab28 l 00000004 sStarSparklesRngSeed.138 -0203ab2c l 00000002 sYmod.142 -0203ab30 l 00000004 sGengarScroll.179 +0203ab28 l 00000004 sStarSparklesRngSeed.144 +0203ab2c l 00000002 sYmod.148 +0203ab30 l 00000004 sGengarScroll.185 0203ab34 l 00000004 sSelectedPaletteIndices 0203ab38 l 00000004 sHofMonPtr 0203ab3c l 00000004 sHofGfxPtr @@ -649,7 +649,7 @@ 03000e6b l 00000001 sHandshakePlayerCount 03000e6c l 00000006 MultiBoot_required_data 03000e74 l 00000004 sEggHatchData -03000e78 l 00000002 dummy.3 +03000e78 l 00000002 dummy.9 03000e7c l 00000001 sPlayTimeCounterState 03000e80 l 00000004 sPlayerLinkStates 03000e84 l 00000004 sPlayerKeyInterceptCallback @@ -687,26 +687,26 @@ 03000fc5 l 00000001 sMapMusicFadeInSpeed 03000fc6 l 00000002 sFanfareCounter 03000fc8 l 00000020 sFieldEffectActiveList -03000fe8 l 00000184 sItemIconGfxBuffer.84 -0300116c l 00000004 i.90 -03001170 l 00000004 j.91 -03001174 l 00000004 k.92 -03001178 l 00000004 index.93 -0300117c l 00000004 numWords.94 -03001180 l 00000004 numToProcess.95 -03001184 l 00000004 words.96 -03001188 l 00000001 heldKeyCount.117 +03000fe8 l 00000184 sItemIconGfxBuffer.90 +0300116c l 00000004 i.96 +03001170 l 00000004 j.97 +03001174 l 00000004 k.98 +03001178 l 00000004 index.99 +0300117c l 00000004 numWords.100 +03001180 l 00000004 numToProcess.101 +03001184 l 00000004 words.102 +03001188 l 00000001 heldKeyCount.123 03001190 l 00000e64 sRfuAPIBuffer 03001ff8 l 00000010 sResendBlock8 03002008 l 00000010 sResendBlock16 -03002018 l 00000001 counter.36 +03002018 l 00000001 counter.42 0300201c l 00000004 sFlagOrVarRecords 03002020 l 00000002 sNumFlagsOrVars 03002024 l 00000004 sLeader 03002028 l 00000004 sGroup 0300202c l 00000004 sURoom -03002030 l 00000008 spriteSheet.183 -03002038 l 00000008 spritePalette.184 +03002030 l 00000008 spriteSheet.189 +03002038 l 00000008 spritePalette.190 03002040 l 00000004 sStatusScreen 03002044 l 00000004 sExitingGame 03002048 l 00000018 sSendRecvMgr @@ -720,9 +720,9 @@ 03002070 l 00000002 sSavedTm3Cnt 03002072 l 00000002 sSavedSioCnt 03002074 l 00000002 sSavedRCnt -03002078 l 00000004 oamId.21 -0300207c l 00000004 curDigit.22 -03002080 l 00000004 firstDigit.23 +03002078 l 00000004 oamId.27 +0300207c l 00000004 curDigit.28 +03002080 l 00000004 firstDigit.29 03002088 l 00000040 sDecodingBuffer 030020c8 g 00000320 gMPlayTrack_BGM 030023e8 g 000000f0 gMPlayTrack_SE1 @@ -25716,8 +25716,8 @@ 08231e74 g 00000004 gBGVOffsetRegOffsets 08231e78 l 00000010 sDigits 08231e88 l 00000028 sPowersOfTen -08231ebc l 00000000 funcs.87 -08231ef4 l 00000000 lengths.109 +08231ebc l 00000000 funcs.93 +08231ef4 l 00000000 lengths.115 08231f10 l 00000020 sWirelessLinkDisplayPal 08231f30 l 000004a8 sWirelessLinkDisplayGfx 082323d8 l 000001ec sWirelessLinkDisplayTilemap @@ -29857,7 +29857,7 @@ 0835b8fc l 00000004 sPlayerAvatarSecretBaseMatJump 0835b900 l 00000010 sPlayerAvatarSecretBaseMatSpin 0835b91c l 00000040 sFishingStateFuncs -0835b968 l 00000000 dot.465 +0835b968 l 00000000 dot.471 0835b97c l 00000005 sTeleportFacingDirectionSequence 0835b984 g 00000010 gReflectionEffectPaletteMap 0835b994 l 00000018 gCameraSpriteTemplate @@ -31111,14 +31111,14 @@ 083a7054 l 00000008 sMovementActionFuncs_ShakeHeadOrWalkInPlace 083a705c l 0000000c sMovementActionFuncs_FlyUp 083a7068 l 0000000c sMovementActionFuncs_FlyDown -083a707c l 00000000 metatileFuncs.2418 -083a7094 l 00000000 jumpLandingFlags.2419 -083a70ac l 00000010 ledgeBehaviorFuncs.2429 +083a707c l 00000000 metatileFuncs.2424 +083a7094 l 00000000 jumpLandingFlags.2425 +083a70ac l 00000010 ledgeBehaviorFuncs.2435 083a70bc l 00000010 sElevationToSubpriority 083a70cc l 00000010 sElevationToPriority 083a70dc l 00000010 sElevationToSubspriteTableNum 083a70ec l 0000000c sGroundEffectTracksFuncs -083a70fc l 00000010 bikeTireTracks_Transitions.2493 +083a70fc l 00000010 bikeTireTracks_Transitions.2499 083a710c l 00000050 sGroundEffectFuncs 083a715c l 00000040 sSpeedNormalStepFuncs 083a719c l 00000020 sSpeedFast1StepFuncs @@ -33572,17 +33572,17 @@ 083d2a78 l 00000020 sPokeStorageMisc1Pal 083d2a98 l 00000800 sHandCursorTiles 083d3298 l 00000080 sHandCursorShadowTiles -083d3318 l 0000000c placeChangeFuncs.45 -083d3324 l 00000000 inputFuncs.187 -083d3374 l 00000008 sOamData_Cursor.206 -083d337c l 00000008 sOamData_CursorShadow.207 -083d3384 l 00000000 sAnim_Cursor_Bouncing.208 -083d3390 l 00000000 sAnim_Cursor_Still.209 -083d3398 l 00000000 sAnim_Cursor_Open.210 -083d33a0 l 00000000 sAnim_Cursor_Fist.211 -083d33a8 l 00000000 sAnims_Cursor.212 -083d33b8 l 00000018 sSpriteTemplate_Cursor.213 -083d33d0 l 00000018 sSpriteTemplate_CursorShadow.214 +083d3318 l 0000000c placeChangeFuncs.51 +083d3324 l 00000000 inputFuncs.193 +083d3374 l 00000008 sOamData_Cursor.212 +083d337c l 00000008 sOamData_CursorShadow.213 +083d3384 l 00000000 sAnim_Cursor_Bouncing.214 +083d3390 l 00000000 sAnim_Cursor_Still.215 +083d3398 l 00000000 sAnim_Cursor_Open.216 +083d33a0 l 00000000 sAnim_Cursor_Fist.217 +083d33a8 l 00000000 sAnims_Cursor.218 +083d33b8 l 00000018 sSpriteTemplate_Cursor.219 +083d33d0 l 00000018 sSpriteTemplate_CursorShadow.220 083d33e8 l 00000098 sMenuTexts 083d3480 l 00000008 sWindowTemplate_MultiMove 083d3488 l 00000080 sItemInfoFrame_Gfx @@ -36409,7 +36409,8 @@ 083f55e4 l 000000cc sTransitionTypes 083f56b0 l 00000020 sCaveTransitionPalette_White 083f56d0 l 00000020 sCaveTransitionPalette_Black -083f56f0 l 00000020 sCaveTransitionPalette_Gradient +083f56f0 l 00000010 sCaveTransitionPalette_Enter +083f5700 l 00000010 sCaveTransitionPalette_Exit 083f5710 l 000001e0 sCaveTransitionTilemap 083f58f0 l 000000b4 sCaveTransitionTiles 083f59a4 l 0000000c sStringVarPtrs @@ -40488,8 +40489,8 @@ 084563b8 l 00000008 sHelpMessageWindowTemplate 084563c0 l 00000003 sHelpMessageTextColors 084563c4 g 00000004 sCounterIncrements -084563c8 l 00000000 sFanClubMemberIds.21 -084563d0 l 00000000 sFanClubMemberIds.25 +084563c8 l 00000000 sFanClubMemberIds.27 +084563d0 l 00000000 sFanClubMemberIds.31 084563d8 l 000000ac sQuestLogStorageCBs 08456484 l 000000ac sQuestLogEventTextBufferCBs 08456530 l 0000002b sQuestLogEventCmdSizes @@ -41881,7 +41882,7 @@ 084786d8 l 00000004 sAnims_Cloud 0847870c l 0000000a sUnusedSounds 08478720 l 00000008 sBerryIconXCoords -08478758 l 00000000 moveDelays.342 +08478758 l 00000000 moveDelays.348 0847875a l 00000008 sCloudStartCoords 08478784 l 0000000c sTextColorTable 08478790 l 00000004 sNameWindowCoords_1Player @@ -41934,9 +41935,9 @@ 08478dc8 l 0000004c sCatchingScript 08478e14 l 00000040 sTMsScript 08478e54 l 00000040 sRegisterKeyItemScript -08478e94 l 00000018 array.90 -08478eac l 00000000 texts.94 -08478ec4 l 00000000 texts.98 +08478e94 l 00000018 array.96 +08478eac l 00000000 texts.100 +08478ec4 l 00000000 texts.104 08478edc l 00000020 sBg1EndGraphic 08478efc l 00000008 sSubspriteArray 08478f04 l 00000010 sSubspriteTableArray