From e9c8c4f6395bf0139551248b609277d4c236f49d Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Fri, 5 Nov 2021 22:11:59 +0000 Subject: [PATCH] Merge pull request #1545 from sphericalice/pal-constants --- pokeemerald.sym | 74 ++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index 66532c0033..2be2076ba4 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -590,7 +590,7 @@ 0203bcee l 00000002 sOtIdDigit 0203bcf0 l 00000004 sDiplomaTilemapPtr 0203bcf4 l 00000004 sBerryTag -0203bcf8 l 00000001 sUnknown_0203BCF8 +0203bcf8 l 00000001 sUnused 0203bcfc l 00000002 sSaveFailedType 0203bcfe l 00000004 sClockInfo 0203bd02 l 0000000c sUnused1 @@ -1357,9 +1357,9 @@ 08007da0 l 00000038 AffineAnimCmd_frame 08007dd8 l 00000020 CopyOamMatrix 08007df8 l 00000020 GetSpriteMatrixNum -08007e18 g 00000010 sub_8007E18 -08007e28 g 0000002a sub_8007E28 -08007e54 l 0000009c obj_update_pos2 +08007e18 g 00000010 SetSpriteMatrixAnchor +08007e28 l 0000002a GetAnchorCoord +08007e54 l 0000009c UpdateSpriteMatrixAnchorPos 08007ef0 l 00000072 SetSpriteOamFlipBits 08007f64 l 0000001c AffineAnimStateRestartAnim 08007f80 l 00000028 AffineAnimStateStartAnim @@ -1552,7 +1552,7 @@ 0800b4a4 l 0000001c SetWirelessCommType0_Internal 0800b4c0 g 0000001c SetWirelessCommType0 0800b4dc g 00000028 GetLinkRecvQueueLength -0800b504 g 00000014 IsLinkRecvQueueLengthAtLeast3 +0800b504 g 00000014 IsLinkRecvQueueAtOverworldMax 0800b518 g 0000000c GetWirelessCommType 0800b524 g 00000016 ConvertLinkPlayerName 0800b53c l 00000058 DisableSerial @@ -2219,7 +2219,7 @@ 08020584 l 00000030 ClearBg0 080205b4 l 00000050 LoadChatWindowBorderGfx 08020604 l 0000007c LoadChatWindowGfx -08020680 l 00000024 sub_8020680 +08020680 l 00000024 LoadChatUnkPalette 080206a4 l 0000002c LoadChatMessagesWindow 080206d0 l 00000018 LoadKeyboardWindow 080206e8 l 00000058 LoadTextEntryWindow @@ -2875,7 +2875,7 @@ 08034628 g 0000002c HandleLoadSpecialPokePic 08034654 g 000000bc LoadSpecialPokePic 08034710 g 0000000c Unused_LZDecompressWramIndirect -0803471c g 00000258 sub_803471C +0803471c l 00000258 StitchObjectsOn8x8Canvas 08034974 g 00000012 GetDecompressedDataSize 08034988 g 0000003c LoadCompressedSpriteSheetUsingHeap 080349c4 g 00000044 LoadCompressedSpritePaletteUsingHeap @@ -4464,7 +4464,7 @@ 08085ca8 l 0000008c InitOverworldBgs 08085d34 g 0000004c CleanupOverworldWindowsAndTilemaps 08085d80 l 0000000a ResetSafariZoneFlag_ -08085d8c g 0000001e IsUpdateLinkStateCBActive +08085d8c g 0000001e IsOverworldLinkActive 08085dac l 00000056 DoCB1_Overworld 08085e04 g 00000020 CB1_Overworld 08085e24 l 0000002a OverworldBasic @@ -4513,7 +4513,7 @@ 08086ae4 l 00000030 OffsetCameraFocusByLinkPlayerId 08086b14 l 00000088 SpawnLinkPlayers 08086b9c l 0000003c CreateLinkPlayerSprites -08086bd8 l 00000054 CB1_UpdateLinkState +08086bd8 l 00000054 CB1_OverworldLink 08086c2c g 00000014 ResetAllMultiplayerState 08086c40 l 00000010 ClearAllPlayerKeys 08086c50 l 00000014 SetKeyInterceptCallback @@ -4558,7 +4558,7 @@ 0808754c l 0000001c RunConfirmLeaveCableClubScript 08087568 l 0000001a InitMenuBasedScript 08087584 l 00000014 RunTerminateLinkScript -08087598 g 00000030 Overworld_LinkRecvQueueLengthMoreThan2 +08087598 g 00000030 Overworld_IsRecvQueueAtMax 080875c8 g 0000006a Overworld_RecvKeysFromLinkIsRunning 08087634 g 00000036 Overworld_SendKeysToLinkIsRunning 0808766c g 00000022 IsSendingKeysOverCable @@ -4699,7 +4699,7 @@ 080892b0 g 00000014 Unref_MetatileBehavior_IsSecretBaseUnused_B2 080892c4 g 00000014 MetatileBehavior_IsBlockDecoration 080892d8 g 00000014 MetatileBehavior_IsSecretBaseImpassable -080892ec g 00000014 MetatileBehavior_IsMB_C6 +080892ec g 00000014 MetatileBehavior_IsSecretBaseDecorationBase 08089300 g 00000014 MetatileBehavior_IsSecretBasePoster 08089314 g 00000012 MetatileBehavior_IsNormal 08089328 g 00000014 MetatileBehavior_IsSecretBaseNorthWall @@ -4760,7 +4760,7 @@ 08089870 g 00000014 MetatileBehavior_IsLavaridgeB1FWarp 08089884 g 00000014 MetatileBehavior_IsLavaridge1FWarp 08089898 g 00000014 MetatileBehavior_IsAquaHideoutWarp -080898ac g 00000014 MetatileBehavior_IsBridgeOverOcean +080898ac g 00000014 MetatileBehavior_IsUnionRoomWarp 080898c0 g 00000014 MetatileBehavior_IsMossdeepGymWarp 080898d4 g 0000002e MetatileBehavior_IsSurfableFishableWater 08089904 g 00000014 MetatileBehavior_IsMtPyreHole @@ -5340,13 +5340,13 @@ 08091f20 g 00000026 MovementType_CopyPlayer_Step2 08091f48 g 00000004 CopyablePlayerMovement_None 08091f4c g 00000048 CopyablePlayerMovement_FaceDirection -08091f94 g 00000110 CopyablePlayerMovement_GoSpeed0 -080920a4 g 000000b8 CopyablePlayerMovement_GoSpeed1 -0809215c g 000000b8 CopyablePlayerMovement_GoSpeed2 +08091f94 g 00000110 CopyablePlayerMovement_WalkNormal +080920a4 g 000000b8 CopyablePlayerMovement_WalkFast +0809215c g 000000b8 CopyablePlayerMovement_WalkFaster 08092214 g 000000b8 CopyablePlayerMovement_Slide -080922cc g 00000048 cph_IM_DIFFERENT -08092314 g 000000b8 CopyablePlayerMovement_GoSpeed4 -080923cc g 000000c8 CopyablePlayerMovement_Jump +080922cc g 00000048 CopyablePlayerMovement_JumpInPlace +08092314 g 000000b8 CopyablePlayerMovement_Jump +080923cc g 000000c8 CopyablePlayerMovement_Jump2 08092494 g 00000024 MovementType_CopyPlayerInGrass 080924b8 l 00000020 MovementType_CopyPlayerInGrass_callback 080924d8 g 00000064 MovementType_CopyPlayerInGrass_Step1 @@ -5451,8 +5451,8 @@ 080937a8 g 0000002c GetAcroWheelieMoveDirectionMovementAction 080937d4 g 0000002c GetAcroEndWheelieMoveDirectionMovementAction 08093800 g 00000032 GetOppositeDirection -08093834 l 00000018 zffu_offset_calc -0809384c l 00000040 state_to_direction +08093834 l 00000018 GetPlayerDirectionForCopy +0809384c l 00000040 GetCopyDirection 0809388c l 00000038 ObjectEventExecHeldMovementAction 080938c4 l 00000040 ObjectEventExecSingleMovementAction 08093904 l 00000008 ObjectEventSetSingleMovement @@ -5899,7 +5899,7 @@ 08098b7c g 0000009c rbox_fill_rectangle 08098c18 g 0000004c GetTextWindowPalette 08098c64 g 00000008 GetOverworldTextboxPalettePtr -08098c6c g 0000004c sub_8098C6C +08098c6c g 0000004c LoadUserWindowBorderGfxOnBg 08098cb8 g 0000003a InitScriptContext 08098cb8 l 00000000 .gcc2_compiled. 08098cf4 g 0000000a SetupBytecodeScript @@ -6855,7 +6855,7 @@ 080abbcc l 00000034 MarkFogSpritePalToLighten 080abc00 l 00000046 LightenSpritePaletteInFog 080abc48 g 00000034 ApplyWeatherGammaShiftIfIdle -080abc7c g 00000054 sub_80ABC7C +080abc7c g 00000054 ApplyWeatherGammaShiftIfIdle_Gradual 080abcd0 g 0000012c FadeScreen 080abdfc g 0000001c IsWeatherNotFadingIn 080abe18 g 000000e8 UpdateSpritePaletteWithWeather @@ -10791,9 +10791,9 @@ 0812210c g 0000003c GetLRKeysPressedAndHeld 08122148 g 00000032 IsHoldingItemAllowed 0812217c g 00000030 IsWritingMailAllowed -081221ac g 00000022 MenuHelpers_LinkSomething -081221d0 l 0000001c sub_81221D0 -081221ec g 00000020 MenuHelpers_CallLinkSomething +081221ac g 00000022 MenuHelpers_IsLinkActive +081221d0 l 0000001c IsActiveOverworldLinkBusy +081221ec g 00000020 MenuHelpers_ShouldWaitForLinkRecv 0812220c g 0000004e SetItemListPerPageCount 0812225c g 0000003a SetCursorWithinListBounds 08122298 g 00000090 SetCursorScrollWithinListBounds @@ -12389,12 +12389,12 @@ 08151ca8 g 0000007e MarkUsedPulseBlendPalettes 08151d28 g 00000128 UnmarkUsedPulseBlendPalettes 08151e50 g 000001b6 UpdatePulseBlend -08152008 g 00000050 ClearTilemapRect +08152008 g 00000050 FillTilemapRect 08152058 g 00000050 SetTilemapRect -081520a8 l 00000000 .gcc2_compiled. -081520a8 l 0000008a sub_81520A8 -08152134 l 0000008a sub_8152134 +081520a8 l 0000008a FillTilemapRect_Unused +08152134 l 0000008a SetTilemapRect_Unused 081521c0 g 00000094 ConfettiUtil_Init +081521c0 l 00000000 .gcc2_compiled. 08152254 g 00000080 ConfettiUtil_Free 081522d4 g 00000120 ConfettiUtil_Update 081523f4 l 00000044 SetAnimAndTileNum @@ -14358,7 +14358,7 @@ 08194f58 l 00000400 InitRandomTourneyTreeResults 08195358 l 00000048 TrainerIdToTournamentId 081953a0 g 00000048 TrainerIdToDomeTournamentId -081953e8 l 00000050 sub_81953E8 +081953e8 l 00000050 GetOpposingNPCTournamentIdByRound 08195438 l 00000460 DecideRoundWinners 08195898 l 00000078 CopyDomeTrainerName 08195910 l 00000014 GetDomeBrainTrainerPicId @@ -16850,7 +16850,7 @@ 081db5ac g 0000003c ConvertInternationalContestantName 081db5e8 g 0000001c TVShowConvertInternationalString 081db604 g 0000001a GetNicknameLanguage -081db620 g 0000005c sub_81DB620 +081db620 g 0000005c FillWindowTilesByRow 081db67c g 00000000 gScriptCmdTable 081db67c l 00000000 script_data 081dba08 g 00000000 gScriptCmdTableEnd @@ -37363,7 +37363,7 @@ 082f06c8 l 00000018 sListMenu_ReceiveToss 082f06e0 l 00000018 sListMenu_ReceiveSend 082f06f8 l 00000018 sListMenu_Receive -082f0710 l 00000010 Unref_082F0710 +082f0710 l 00000010 sUnusedMenuTexts 082f0720 l 00000003 sTextColors_TopMenu 082f0724 l 00000003 sTextColors_TopMenu_Copy 082f0728 l 00000003 sMG_Ereader_TextColor_2 @@ -44192,7 +44192,7 @@ 08505018 g 00000400 gObjectEventPic_HoOh 08505418 g 00000020 gObjectEventPal_HoOh 08505438 l 00000144 sMovementTypeCallbacks -0850557c g 00000051 gRangedMovementTypes +0850557c l 00000051 sMovementTypeHasRange 085055cd g 00000051 gInitialMovementTypeFacingDirections 08505620 g 000003bc gObjectEventGraphicsInfoPointers 085059dc g 0000001c gMauvilleOldManGraphicsInfoPointers @@ -45226,8 +45226,8 @@ 0850dc1d g 00000005 gAcroWheelieMoveDirectionMovementActions 0850dc22 g 00000005 gAcroEndWheelieMoveDirectionMovementActions 0850dc27 l 00000008 sOppositeDirections -0850dc2f g 00000010 gUnknown_0850DC2F -0850dc3f g 00000010 gUnknown_0850DC3F +0850dc2f l 00000010 sPlayerDirectionsForCopy +0850dc3f l 00000010 sPlayerDirectionToCopyDirection 0850dc50 g 00000278 gMovementActionFuncs 0850dec8 g 00000008 gMovementActionFuncs_FaceDown 0850ded0 g 00000008 gMovementActionFuncs_FaceUp @@ -57102,8 +57102,8 @@ 0860d14c l 00000010 sTourneyTreeTrainerOpponentIds 0860d15c l 00000040 sIdToMatchNumber 0860d19c l 00000004 sLastMatchCardNum -0860d1a0 l 00000020 gUnknown_0860D1A0 -0860d1c0 l 00000010 gUnknown_0860D1C0 +0860d1a0 l 00000020 sTrainerAndRoundToLastMatchCardNum +0860d1c0 l 00000010 sTournamentIdToPairedTrainerIds 0860d1d0 l 00000044 sBattleDomePotentialTexts 0860d214 l 00000080 sBattleDomeOpponentStyleTexts 0860d294 l 000000ac sBattleDomeOpponentStatsTexts