From a7487b4140dcf26793eaed21d7f2c5fb98c8f042 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Tue, 23 Nov 2021 00:16:04 +0000 Subject: [PATCH] Merge pull request #1558 from GriffinRichards/update-macros --- pokeemerald.sym | 156 ++++++++++++++++++++++++------------------------ 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index 621291a8aa..d4cf71ffc8 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -254,8 +254,8 @@ 020375c4 l 00000004 sAddressOffset 020375c8 l 00000002 sPauseCounter 020375ca l 00000002 sMovingNpcId -020375cc l 00000002 sMovingNpcMapBank -020375ce l 00000002 sMovingNpcMapId +020375cc l 00000002 sMovingNpcMapGroup +020375ce l 00000002 sMovingNpcMapNum 020375d0 l 00000002 sFieldEffectScriptId 020375d4 l 00000001 sWildEncounterImmunitySteps 020375d6 l 00000002 sPreviousPlayerMetatileBehavior @@ -784,7 +784,7 @@ 03000e40 l 00000074 sScriptContext1 03000eb8 l 00000074 sScriptContext2 03000f2c l 00000001 sScriptContext2Enabled -03000f30 l 00000001 gBrailleWindowId +03000f30 l 00000001 sBrailleWindowId 03000f34 l 00000001 sTilesetDMA3TransferBufferSize 03000f36 l 00000002 sPrimaryTilesetAnimCounter 03000f38 l 00000002 sPrimaryTilesetAnimCounterMax @@ -1401,10 +1401,10 @@ 08008874 g 0000000a SetSubspriteTables 08008880 g 0000006c AddSpriteToOamBuffer 080088ec g 00000224 AddSubspritesToOamBuffer -08008b10 g 00000032 StringCopy10 +08008b10 g 00000032 StringCopy_Nickname 08008b10 l 00000000 .gcc2_compiled. -08008b44 g 0000002a StringGetEnd10 -08008b70 g 0000002e StringCopy7 +08008b44 g 0000002a StringGet_Nickname +08008b70 g 0000002e StringCopy_PlayerName 08008ba0 g 0000001e StringCopy 08008bc0 g 00000018 StringAppend 08008bd8 g 0000002e StringCopyN @@ -4376,8 +4376,8 @@ 08084864 g 00000030 ApplyNewEncryptionKeyToGameStats 08084894 g 0000004c LoadObjEventTemplatesFromHeader 080848e0 g 00000030 LoadSaveblockObjEventScripts -08084910 g 0000003a Overworld_SetObjEventTemplateCoords -0808494c g 00000032 Overworld_SetObjEventTemplateMovementType +08084910 g 0000003a SetObjEventTemplateCoords +0808494c g 00000032 SetObjEventTemplateMovementType 08084980 l 00000028 InitMapView 080849a8 g 00000028 GetMapLayout 080849d0 g 00000044 ApplyCurrentWarp @@ -4423,8 +4423,8 @@ 08085450 l 00000024 GetCenterScreenMetatileBehavior 08085474 g 0000001e Overworld_IsBikingAllowed 08085494 g 00000058 SetDefaultFlashLevel -080854ec g 00000028 Overworld_SetFlashLevel -08085514 g 00000010 Overworld_GetFlashLevel +080854ec g 00000028 SetFlashLevel +08085514 g 00000010 GetFlashLevel 08085524 g 0000001c SetCurrentMapLayout 08085540 g 0000000c SetObjectEventLoadFlag 0808554c l 0000000c GetObjectEventLoadFlag @@ -4742,10 +4742,10 @@ 08089728 g 00000014 MetatileBehavior_IsHotSprings 0808973c g 00000014 MetatileBehavior_IsWaterfall 08089750 g 00000014 MetatileBehavior_IsFortreeBridge -08089764 g 00000014 MetatileBehavior_IsPacifidlogVerticalLog1 -08089778 g 00000014 MetatileBehavior_IsPacifidlogVerticalLog2 -0808978c g 00000014 MetatileBehavior_IsPacifidlogHorizontalLog1 -080897a0 g 00000014 MetatileBehavior_IsPacifidlogHorizontalLog2 +08089764 g 00000014 MetatileBehavior_IsPacifidlogVerticalLogTop +08089778 g 00000014 MetatileBehavior_IsPacifidlogVerticalLogBottom +0808978c g 00000014 MetatileBehavior_IsPacifidlogHorizontalLogLeft +080897a0 g 00000014 MetatileBehavior_IsPacifidlogHorizontalLogRight 080897b4 g 0000001a MetatileBehavior_IsPacifidlogLog 080897d0 g 00000014 MetatileBehavior_IsTrickHousePuzzleDoor 080897e4 g 00000014 MetatileBehavior_IsRegionMap @@ -5030,11 +5030,11 @@ 0808dc08 g 0000003c SpawnSpecialObjectEvent 0808dc44 g 00000068 SpawnSpecialObjectEventParameterized 0808dcac g 00000050 TrySpawnObjectEvent -0808dcfc l 00000034 MakeObjectTemplateFromObjectEventGraphicsInfo -0808dd30 l 00000020 MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex -0808dd50 l 00000018 MakeObjectTemplateFromObjectEventTemplate -0808dd68 g 000000a4 AddPseudoObjectEvent -0808de0c g 00000172 CreateObjectSprite +0808dcfc l 00000034 CopyObjectGraphicsInfoToSpriteTemplate +0808dd30 l 00000020 CopyObjectGraphicsInfoToSpriteTemplate_WithMovementType +0808dd50 l 00000018 MakeSpriteTemplateFromObjectEventTemplate +0808dd68 g 000000a4 CreateObjectGraphicsSprite +0808de0c g 00000172 CreateVirtualObject 0808df80 g 0000010c TrySpawnObjectEvents 0808e08c g 00000060 RemoveObjectEventsOutsideView 0808e0ec l 00000080 RemoveObjectEventIfOutsideView @@ -5053,8 +5053,8 @@ 0808e6f8 g 00000050 SetObjectInvisibility 0808e748 g 00000014 ObjectEventGetLocalIdAndMap 0808e75c g 00000030 AllowObjectAtPosTriggerGroundEffects -0808e78c g 00000058 SetObjectPriority -0808e7e4 g 00000048 ResetObjectPriority +0808e78c g 00000058 SetObjectSubpriority +0808e7e4 g 00000048 ResetObjectSubpriority 0808e82c g 00000054 SetObjectEventSpritePosByLocalIdAndMap 0808e880 g 00000014 FreeAndReserveObjectSpritePalettes 0808e894 l 0000002c LoadObjectEventPalette @@ -5826,18 +5826,18 @@ 08097994 g 00000026 SetAndStartSpriteAnim 080979bc g 00000018 SpriteAnimEnded 080979d4 g 000000f4 UpdateObjectEventSpriteInvisibility -08097ac8 l 00000028 UpdateObjectEventSprite -08097af0 l 0000003c DestroyObjectEventSprites -08097b2c l 0000004c GetObjectEventSpriteId -08097b78 g 0000003c TurnObjectEventSprite -08097bb4 g 00000090 SetObjectEventSpriteGraphics -08097c44 g 00000048 SetObjectEventSpriteInvisibility -08097c8c g 00000038 IsObjectEventSpriteInvisible -08097cc4 g 00000030 SetObjectEventSpriteAnim +08097ac8 l 00000028 SpriteCB_VirtualObject +08097af0 l 0000003c DestroyVirtualObjects +08097b2c l 0000004c GetVirtualObjectSpriteId +08097b78 g 0000003c TurnVirtualObject +08097bb4 g 00000090 SetVirtualObjectGraphics +08097c44 g 00000048 SetVirtualObjectInvisibility +08097c8c g 00000038 IsVirtualObjectInvisible +08097cc4 g 00000030 SetVirtualObjectSpriteAnim 08097cf4 l 0000003c MoveUnionRoomObjectUp 08097d30 l 00000038 MoveUnionRoomObjectDown -08097d68 l 00000034 UpdateObjectEventSpritePosition -08097d9c g 00000032 IsObjectEventSpriteAnimating +08097d68 l 00000034 VirtualObject_UpdateAnim +08097d9c g 00000032 IsVirtualObjectAnimating 08097dd0 g 00000028 StartFieldEffectForObjectEvent 08097df8 l 0000001c DoShadowFieldEffect 08097e14 l 0000003c DoRippleFieldEffect @@ -5962,11 +5962,11 @@ 08099568 g 0000004c ScrCmd_gotostd_if 080995b4 g 0000004c ScrCmd_callstd_if 08099600 g 00000014 ScrCmd_returnram -08099614 g 00000016 ScrCmd_killscript +08099614 g 00000016 ScrCmd_endram 0809962c g 00000016 ScrCmd_setmysteryeventstatus 08099644 g 00000022 ScrCmd_loadword -08099668 g 00000024 ScrCmd_loadbytefromaddr -0809968c g 00000018 ScrCmd_writebytetoaddr +08099668 g 00000024 ScrCmd_loadbytefromptr +0809968c g 00000018 ScrCmd_setptr 080996a4 g 0000001c ScrCmd_loadbyte 080996c0 g 00000024 ScrCmd_setptrbyte 080996e4 g 00000020 ScrCmd_copylocal @@ -5977,10 +5977,10 @@ 0809979c g 00000020 Compare 080997bc g 00000030 ScrCmd_compare_local_to_local 080997ec g 00000028 ScrCmd_compare_local_to_value -08099814 g 0000002c ScrCmd_compare_local_to_addr -08099840 g 0000002a ScrCmd_compare_addr_to_local -0809986c g 00000020 ScrCmd_compare_addr_to_value -0809988c g 00000022 ScrCmd_compare_addr_to_addr +08099814 g 0000002c ScrCmd_compare_local_to_ptr +08099840 g 0000002a ScrCmd_compare_ptr_to_local +0809986c g 00000020 ScrCmd_compare_ptr_to_value +0809988c g 00000022 ScrCmd_compare_ptr_to_ptr 080998b0 g 0000002e ScrCmd_compare_var_to_value 080998e0 g 00000034 ScrCmd_compare_var_to_var 08099914 g 00000026 ScrCmd_addvar @@ -6002,7 +6002,7 @@ 08099c3c g 0000001a ScrCmd_checkflag 08099c58 g 00000016 ScrCmd_incrementgamestat 08099c70 g 0000001a ScrCmd_animateflash -08099c8c g 0000001c ScrCmd_setflashradius +08099c8c g 0000001c ScrCmd_setflashlevel 08099ca8 l 0000001e IsPaletteNotActive 08099cc8 g 00000028 ScrCmd_fadescreen 08099cf0 g 00000030 ScrCmd_fadescreenspeed @@ -6056,8 +6056,8 @@ 0809a8b0 g 00000028 ScrCmd_copyobjectxytoperm 0809a8d8 g 00000030 ScrCmd_showobject_at 0809a908 g 00000030 ScrCmd_hideobject_at -0809a938 g 0000003a ScrCmd_setobjectpriority -0809a974 g 0000002e ScrCmd_resetobjectpriority +0809a938 g 0000003a ScrCmd_setobjectsubpriority +0809a974 g 0000002e ScrCmd_resetobjectsubpriority 0809a9a4 g 00000038 ScrCmd_faceplayer 0809a9dc g 00000034 ScrCmd_turnobject 0809aa10 g 00000028 ScrCmd_setobjectmovementtype @@ -6097,9 +6097,9 @@ 0809b150 g 00000040 ScrCmd_buffermovename 0809b190 g 00000044 ScrCmd_buffernumberstring 0809b1d4 g 00000040 ScrCmd_bufferstdstring -0809b214 g 00000034 ScrCmd_buffercontesttype +0809b214 g 00000034 ScrCmd_buffercontestname 0809b248 g 00000028 ScrCmd_bufferstring -0809b270 g 00000024 ScrCmd_vloadword +0809b270 g 00000024 ScrCmd_vbuffermessage 0809b294 g 00000034 ScrCmd_vbufferstring 0809b2c8 g 0000003c ScrCmd_bufferboxname 0809b304 g 00000080 ScrCmd_givemon @@ -6129,13 +6129,13 @@ 0809b6e0 g 00000014 ScrCmd_pokemartdecoration2 0809b6f4 g 00000028 ScrCmd_playslotmachine 0809b71c g 0000003c ScrCmd_setberrytree -0809b758 g 0000002c ScrCmd_getpricereduction +0809b758 g 0000002c ScrCmd_getpokenewsactive 0809b784 g 00000010 ScrCmd_choosecontestmon 0809b794 g 00000010 ScrCmd_startcontest 0809b7a4 g 00000010 ScrCmd_showcontestresults 0809b7b4 g 00000018 ScrCmd_contestlinktransfer 0809b7cc g 00000028 ScrCmd_dofieldeffect -0809b7f4 g 00000030 ScrCmd_setfieldeffectarg +0809b7f4 g 00000030 ScrCmd_setfieldeffectargument 0809b824 l 0000001e WaitForFieldEffectFinish 0809b844 g 0000002c ScrCmd_waitfieldeffect 0809b870 g 0000001c ScrCmd_setrespawn @@ -6162,14 +6162,14 @@ 0809bbfc g 00000048 ScrCmd_lockfortrainer 0809bc44 g 00000038 ScrCmd_setmoneventlegal 0809bc7c g 00000038 ScrCmd_checkmoneventlegal -0809bcb4 g 00000028 ScrCmd_gotoram +0809bcb4 g 00000028 ScrCmd_trywondercardscript 0809bcdc g 00000092 ScrCmd_warpspinenter 0809bd70 g 00000044 ScrCmd_setmonmetlocation 0809bdb4 l 0000001c CloseBrailleWindow 0809bdd0 g 0000003c ScrCmd_buffertrainerclassname 0809be0c g 0000003c ScrCmd_buffertrainername 0809be48 g 0000000c SetMovingNpcId -0809be54 g 00000086 ScrCmd_warpsootopolislegend +0809be54 g 00000086 ScrCmd_warpwhitefade 0809bedc g 0000002c FieldClearPlayerInput 0809bedc l 00000000 .gcc2_compiled. 0809bf08 g 0000010a FieldGetPlayerInput @@ -6262,15 +6262,15 @@ 0809d9f0 g 0000003c ResetFieldTasksArgs 0809da2c l 00000002 DummyPerStepCallback 0809da30 l 00000056 GetPacifidlogBridgeMetatileOffsets -0809da88 l 00000088 SetPacifidlogBridgeMetatiles -0809db10 l 00000024 UpdateHalfSubmergedBridgeMetatiles -0809db34 l 00000024 UpdateFullySubmergedBridgeMetatiles -0809db58 l 00000024 UpdateFloatingBridgeMetatiles -0809db7c l 0000009a StandingOnNewPacifidlogBridge -0809dc18 l 0000009a StandingOnSamePacifidlogBridge +0809da88 l 00000088 TrySetPacifidlogBridgeMetatiles +0809db10 l 00000024 TrySetLogBridgeHalfSubmerged +0809db34 l 00000024 TrySetLogBridgeFullySubmerged +0809db58 l 00000024 TrySetLogBridgeFloating +0809db7c l 0000009a ShouldRaisePacifidlogLogs +0809dc18 l 0000009a ShouldSinkPacifidlogLogs 0809dcb4 l 00000172 PacifidlogBridgePerStepCallback -0809de28 l 00000064 SetLoweredForetreeBridgeMetatile -0809de8c l 00000064 SetNormalFortreeBridgeMetatile +0809de28 l 00000064 TryLowerFortreeBridge +0809de8c l 00000064 TryRaiseFortreeBridge 0809def0 l 00000216 FortreeBridgePerStepCallback 0809e108 l 00000042 CoordInIcePuzzleRegion 0809e14c l 00000038 MarkIcePuzzleCoordVisited @@ -6975,9 +6975,9 @@ 080aec94 l 00000014 UnusedSetCurrentAbnormalWeather 080aeca8 l 00000080 Task_DoAbnormalWeather 080aed28 l 00000054 CreateAbnormalWeatherTask -080aed7c g 00000030 SetSav1Weather -080aedac g 00000010 GetSav1Weather -080aedbc g 00000034 SetSav1WeatherFromCurrMapHeader +080aed7c g 00000030 SetSavedWeather +080aedac g 00000010 GetSavedWeather +080aedbc g 00000034 SetSavedWeatherFromCurrMapHeader 080aedf0 g 00000016 SetWeather 080aee08 g 00000016 SetWeather_Unused 080aee20 g 00000064 DoCurrentWeather @@ -7022,7 +7022,7 @@ 080af71c l 00000018 WaitForWeatherFadeIn 080af734 g 00000038 DoWarp 080af76c g 00000030 DoDiveWarp -080af79c g 00000034 DoSootopolisLegendWarp +080af79c g 00000034 DoWhiteFadeWarp 080af7d0 g 00000024 DoDoorWarp 080af7f4 g 00000018 DoFallWarp 080af80c g 0000001a DoEscalatorWarp @@ -8270,7 +8270,7 @@ 080d467c l 00000004 DummyMailFunc 080d4680 g 00000060 TakeMailFromMon 080d46e0 g 00000020 ClearMailItemId -080d4700 g 000000ba TakeMailFromMon2 +080d4700 g 000000ba TakeMailFromMonAndSave 080d47bc g 00000018 ItemIsMail 080d47d4 l 00000000 .gcc2_compiled. 080d47d4 l 00000010 StartMenu_ShowMapNamePopup @@ -8718,7 +8718,7 @@ 080e2878 g 00000020 GetLilycoveSSTidalSelection 080e2898 l 00000066 Task_PokemonPicWindow 080e2900 g 000000c4 ScriptMenu_ShowPokemonPic -080e29c4 g 00000036 ScriptMenu_GetPicboxWaitFunc +080e29c4 g 00000036 ScriptMenu_HidePokemonPic 080e29fc l 0000001e IsPicboxClosed 080e2a1c g 0000005c CreateWindowFromRect 080e2a78 g 0000001c ClearToTransparentAndRemoveWindow @@ -9147,10 +9147,10 @@ 080eeeb8 l 00000068 CompactPokeNews 080eef20 l 0000004a FindAnyPokeNewsOnTheAir 080eef6c g 000000cc DoPokeNews -080ef038 g 0000005a GetPriceReduction -080ef094 l 00000050 IsPriceDiscounted +080ef038 g 0000005a IsPokeNewsActive +080ef094 l 00000050 ShouldApplyPokeNewsEffect 080ef0e4 l 0000003c IsAddingPokeNewsDisallowed -080ef120 l 0000009c UpdatePokeNewsTimeLeft +080ef120 l 0000009c UpdatePokeNewsCountdown 080ef1bc g 00000094 CopyContestRankToStringVar 080ef250 g 000000bc CopyContestCategoryToStringVar 080ef30c g 00000034 SetContestCategoryStringVarForInterview @@ -19752,15 +19752,15 @@ 081fc636 g 00000000 DewfordTown_PokemonCenter_2F_EventScript_RecordCorner 081fc63c g 00000000 DewfordTown_Gym_MapScripts 081fc642 l 00000000 DewfordTown_Gym_OnTransition -081fc648 g 00000000 DewfordTown_Gym_EventScript_SetFlashRadius +081fc648 g 00000000 DewfordTown_Gym_EventScript_SetFlashLevel 081fc6a2 g 00000000 DewfordTown_Gym_EventScript_SetLightsOn -081fc6a6 g 00000000 DewfordTown_Gym_EventScript_SetFlashRadius1 -081fc6aa g 00000000 DewfordTown_Gym_EventScript_SetFlashRadius2 -081fc6ae g 00000000 DewfordTown_Gym_EventScript_SetFlashRadius3 -081fc6b2 g 00000000 DewfordTown_Gym_EventScript_SetFlashRadius4 -081fc6b6 g 00000000 DewfordTown_Gym_EventScript_SetFlashRadius5 -081fc6ba g 00000000 DewfordTown_Gym_EventScript_SetFlashRadius6 -081fc6be g 00000000 DewfordTown_Gym_EventScript_SetFlashRadius7 +081fc6a6 g 00000000 DewfordTown_Gym_EventScript_SetFlashLevel1 +081fc6aa g 00000000 DewfordTown_Gym_EventScript_SetFlashLevel2 +081fc6ae g 00000000 DewfordTown_Gym_EventScript_SetFlashLevel3 +081fc6b2 g 00000000 DewfordTown_Gym_EventScript_SetFlashLevel4 +081fc6b6 g 00000000 DewfordTown_Gym_EventScript_SetFlashLevel5 +081fc6ba g 00000000 DewfordTown_Gym_EventScript_SetFlashLevel6 +081fc6be g 00000000 DewfordTown_Gym_EventScript_SetFlashLevel7 081fc6c2 g 00000000 DewfordTown_Gym_EventScript_BrightenRoom 081fc71a g 00000000 DewfordTown_Gym_EventScript_NoLightChange 081fc71b g 00000000 DewfordTown_Gym_EventScript_AnimateFlash1Trainer @@ -29083,7 +29083,7 @@ 0827132a l 00000000 Std_MsgboxDefault 08271332 l 00000000 Std_MsgboxYesNo 0827133c l 00000000 Std_MsgboxGetPoints -08271347 l 00000000 Std_10 +08271347 l 00000000 Std_MsgboxPokenav 0827134e l 00000000 EventScript_UnusedReturn 0827134f g 00000000 Common_EventScript_SaveGame 08271354 g 00000000 EventScript_StartTrainerApproach @@ -29651,7 +29651,7 @@ 08276afb g 00000000 CableClub_EventScript_ShowMysteryGiftMan 08276aff g 00000000 CableClub_EventScript_HideMysteryGiftMan 08276b03 g 00000000 CableClub_EventScript_MysteryGiftMan -08276b19 g 00000000 CableClub_EventScript_AlreadyGotEonTicket +08276b19 g 00000000 CableClub_EventScript_TryWonderCardScript 08276b1a g 00000000 CableClub_EventScript_MysteryGiftThankYou 08276b23 g 00000000 CableClub_EventScript_DistributeEonTicket 08276b62 g 00000000 CableClub_EventScript_MysteryGiftThankYou2 @@ -47472,7 +47472,7 @@ 0854fe44 l 00000018 sBubbleSpriteTemplate 0854fe5c l 00000004 sWeatherCycleRoute119 0854fe60 l 00000004 sWeatherCycleRoute123 -0854fe64 l 00000012 sFlashLevelPixelRadii +0854fe64 l 00000012 sFlashLevelToRadius 0854fe78 g 00000004 gMaxFlashLevel 0854fe7c g 0000000c sFlashEffectParams 0854fe88 l 00000008 sBattleTransitionTable_Wild @@ -52714,9 +52714,9 @@ 085b2b68 l 00000010 sMauvilleGymSwitchCoords 085b2b78 l 00000005 sSlidingDoorNextFrameDelay 085b2b7e l 0000000a sPetalburgGymSlidingDoorMetatiles -085b2b88 l 00000000 sSlotMachineRandomSeeds.198 -085b2b94 l 00000000 sSlotMachineIds.199 -085b2ba0 l 00000000 sSlotMachineServiceDayIds.200 +085b2b88 l 0000000c sSlotMachineRandomSeeds.198 +085b2b94 l 0000000c sSlotMachineIds.199 +085b2ba0 l 0000000c sSlotMachineServiceDayIds.200 085b2bac g 00000008 gElevatorFloor_WindowTemplate 085b2bb4 g 00000040 gDeptStoreFloorNames 085b2bf4 l 00000012 sElevatorWindowTiles_Ascending