From b4b1d6fdc54b0de70dbbc334e2883a38d3fa67cb Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Sun, 14 Aug 2022 21:34:04 +0000 Subject: [PATCH] Merge pull request #534 from GriffinRichards/sync-scriptcmds --- pokefirered.sym | 102 ++++++++++++++++++++--------------------- pokefirered_rev1.sym | 102 ++++++++++++++++++++--------------------- pokeleafgreen.sym | 102 ++++++++++++++++++++--------------------- pokeleafgreen_rev1.sym | 102 ++++++++++++++++++++--------------------- 4 files changed, 204 insertions(+), 204 deletions(-) diff --git a/pokefirered.sym b/pokefirered.sym index ea737b3d1..136e88013 100644 --- a/pokefirered.sym +++ b/pokefirered.sym @@ -209,12 +209,12 @@ 0203709c l 00000001 sMessageBoxType 020370a0 g 00000001 gWalkAwayFromSignInhibitTimer 020370a4 g 00000004 gRAMScriptPtr -020370a8 l 00000004 gVScriptOffset +020370a8 l 00000004 sAddressOffset 020370ac l 00000001 sQuestLogWaitButtonPressTimer 020370ae l 00000002 sPauseCounter 020370b0 l 00000002 sMovingNpcId -020370b2 l 00000002 sMovingNpcMapBank -020370b4 l 00000002 sMovingNpcMapId +020370b2 l 00000002 sMovingNpcMapGroup +020370b4 l 00000002 sMovingNpcMapNum 020370b6 l 00000002 sFieldEffectScriptId 020370b8 g 00000002 gSpecialVar_0x8000 020370ba g 00000002 gSpecialVar_0x8001 @@ -2873,8 +2873,8 @@ 08054f38 g 00000030 ApplyNewEncryptionKeyToGameStats 08054f68 l 00000140 LoadObjEventTemplatesFromHeader 080550a8 l 00000030 LoadSaveblockObjEventScripts -080550d8 g 0000003a Overworld_SetMapObjTemplateCoords -08055114 g 00000032 Overworld_SetObjEventTemplateMovementType +080550d8 g 0000003a SetObjEventTemplateCoords +08055114 g 00000032 SetObjEventTemplateMovementType 08055148 l 00000028 InitMapView 08055170 l 00000028 GetMapLayout 08055198 l 00000044 ApplyCurrentWarp @@ -2923,7 +2923,7 @@ 08055c74 l 00000028 GetCenterScreenMetatileBehavior 08055c9c g 0000001a Overworld_IsBikingAllowed 08055cb8 l 00000050 SetDefaultFlashLevel -08055d08 g 00000028 Overworld_SetFlashLevel +08055d08 g 00000028 SetFlashLevel 08055d30 g 00000010 Overworld_GetFlashLevel 08055d40 g 0000001c SetCurrentMapLayout 08055d5c g 00000010 Overworld_SetWarpDestinationFromWarp @@ -3562,7 +3562,7 @@ 0805e940 l 00000020 MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex 0805e960 l 00000018 MakeObjectTemplateFromObjectEventTemplate 0805e978 g 00000080 AddPseudoObjectEvent -0805e9f8 g 0000014c sprite_new +0805e9f8 g 0000014c CreateVirtualObject 0805eb44 g 000000ec sub_805EB44 0805ec30 g 000000e0 TrySpawnObjectEvents 0805ed10 g 00000060 RemoveObjectEventsOutsideView @@ -3578,11 +3578,11 @@ 0805f2a8 g 00000020 PlayerObjectTurn 0805f2c8 g 00000030 GetObjectEventGraphicsInfo 0805f2f8 l 0000001c SetObjectEventDynamicGraphicsId -0805f314 g 00000050 ShowOrHideObjectByLocalIdAndMap +0805f314 g 00000050 SetObjectInvisibility 0805f364 g 00000014 ObjectEventGetLocalIdAndMap 0805f378 g 00000030 EnableObjectGroundEffectsByXY -0805f3a8 g 00000058 SetObjectPriorityByLocalIdAndMap -0805f400 g 00000048 UnfixObjectPriorityByLocalIdAndMap +0805f3a8 g 00000058 SetObjectSubpriority +0805f400 g 00000048 ResetObjectSubpriority 0805f448 g 00000054 SetObjectPositionByLocalIdAndMap 0805f49c g 00000014 FreeAndReserveObjectSpritePalettes 0805f4b0 l 0000002c LoadObjectEventPalette @@ -4411,7 +4411,7 @@ 08068fa8 g 00000028 UpdateObjectEventSpriteSubpriorityAndVisibility 08068fd0 g 0000003c sub_8068FD0 0806900c l 0000004c GetObjectEventSpriteId -08069058 g 0000003c TurnObjectEvent +08069058 g 0000003c TurnVirtualObject 08069094 g 00000090 RfuUnionObjectSetFacingDirection 08069124 g 00000048 RfuUnionObjectToggleInvisibility 0806916c g 00000038 RfuUnionObjectIsInvisible @@ -4441,11 +4441,11 @@ 08069554 g 0000001a walkrun_is_standing_still 08069554 l 00000000 .gcc2_compiled. 08069570 g 00000020 Task_WaitPlayerStopMoving -08069590 g 00000022 NativeScript_WaitPlayerStopMoving -080695b4 g 00000018 ScriptFreezeObjectEvents +08069590 g 00000022 IsFreezePlayerFinished +080695b4 g 00000018 FreezeObjects_WaitForPlayer 080695cc g 0000007c Task_WaitPlayerAndTargetNPCStopMoving -08069648 g 00000022 NativeScript_WaitPlayerAndTargetNPCStopMoving -0806966c g 00000054 LockSelectedObjectEvent +08069648 g 00000022 IsFreezeSelectedObjectAndPlayerFinished +0806966c g 00000054 FreezeObjects_WaitForPlayerAndSelected 080696c0 g 00000030 ClearPlayerHeldMovementAndUnfreezeObjectEvents 080696f0 g 00000050 UnionRoom_UnlockPlayerAndChatPartner 08069740 g 00000028 Script_FacePlayer @@ -4506,7 +4506,7 @@ 08069d00 g 0000008a InitRamScript 08069d8c g 00000070 GetRamScript 08069dfc g 0000004c ValidateRamScript -08069e48 g 0000005c sub_8069E48 +08069e48 g 0000005c GetSavedRamScriptIfValid 08069ea4 g 0000002c MEventSetRamScript 08069ed0 g 00000004 ScrCmd_nop 08069ed0 l 00000000 .gcc2_compiled. @@ -4531,13 +4531,13 @@ 0806a180 g 00000030 ScrCmd_callstd 0806a1b0 g 0000004c ScrCmd_gotostd_if 0806a1fc g 0000004c ScrCmd_callstd_if -0806a248 g 00000014 ScrCmd_gotoram -0806a25c g 00000016 ScrCmd_killscript +0806a248 g 00000014 ScrCmd_returnram +0806a25c g 00000016 ScrCmd_endram 0806a274 g 00000016 ScrCmd_setmysteryeventstatus -0806a28c g 00000028 ScrCmd_execram +0806a28c g 00000028 ScrCmd_trywondercardscript 0806a2b4 g 00000022 ScrCmd_loadword -0806a2d8 g 00000024 ScrCmd_loadbytefromaddr -0806a2fc g 00000018 ScrCmd_writebytetoaddr +0806a2d8 g 00000024 ScrCmd_loadbytefromptr +0806a2fc g 00000018 ScrCmd_setptr 0806a314 g 0000001c ScrCmd_loadbyte 0806a330 g 00000024 ScrCmd_setptrbyte 0806a354 g 00000020 ScrCmd_copylocal @@ -4545,13 +4545,13 @@ 0806a390 g 00000022 ScrCmd_setvar 0806a3b4 g 0000002c ScrCmd_copyvar 0806a3e0 g 0000002a ScrCmd_setorcopyvar -0806a40c g 00000020 compare_012 +0806a40c l 00000020 Compare 0806a42c g 00000030 ScrCmd_compare_local_to_local 0806a45c g 00000028 ScrCmd_compare_local_to_value -0806a484 g 0000002c ScrCmd_compare_local_to_addr -0806a4b0 g 0000002a ScrCmd_compare_addr_to_local -0806a4dc g 00000020 ScrCmd_compare_addr_to_value -0806a4fc g 00000022 ScrCmd_compare_addr_to_addr +0806a484 g 0000002c ScrCmd_compare_local_to_ptr +0806a4b0 g 0000002a ScrCmd_compare_ptr_to_local +0806a4dc g 00000020 ScrCmd_compare_ptr_to_value +0806a4fc g 00000022 ScrCmd_compare_ptr_to_ptr 0806a520 g 0000002e ScrCmd_compare_var_to_value 0806a550 g 00000034 ScrCmd_compare_var_to_var 0806a584 g 00000026 ScrCmd_addvar @@ -4564,25 +4564,25 @@ 0806a728 g 0000002c ScrCmd_checkitemtype 0806a754 g 00000044 ScrCmd_addpcitem 0806a798 g 00000044 ScrCmd_checkpcitem -0806a7dc g 00000014 ScrCmd_givedecoration -0806a7f0 g 00000014 ScrCmd_takedecoration +0806a7dc g 00000014 ScrCmd_adddecoration +0806a7f0 g 00000014 ScrCmd_removedecoration 0806a804 g 00000014 ScrCmd_checkdecorspace 0806a818 g 00000014 ScrCmd_checkdecor 0806a82c g 00000014 ScrCmd_setflag 0806a840 g 00000014 ScrCmd_clearflag 0806a854 g 0000001a ScrCmd_checkflag 0806a870 g 00000016 ScrCmd_incrementgamestat -0806a888 g 00000036 ScrCmd_comparestattoword +0806a888 g 00000036 ScrCmd_comparestat 0806a8c0 g 00000020 ScrCmd_setworldmapflag 0806a8e0 g 0000001a ScrCmd_animateflash -0806a8fc g 0000001c ScrCmd_setflashradius +0806a8fc g 0000001c ScrCmd_setflashlevel 0806a918 l 0000001e IsPaletteNotActive 0806a938 g 00000028 ScrCmd_fadescreen 0806a960 g 00000030 ScrCmd_fadescreenspeed 0806a990 l 0000001e RunPauseTimer 0806a9b0 g 00000024 ScrCmd_delay 0806a9d4 g 00000004 ScrCmd_initclock -0806a9d8 g 00000004 ScrCmd_dodailyevents +0806a9d8 g 00000004 ScrCmd_dotimebasedevents 0806a9dc g 00000020 ScrCmd_gettime 0806a9fc g 0000001c ScrCmd_setweather 0806aa18 g 0000000c ScrCmd_resetweather @@ -4594,7 +4594,7 @@ 0806ab74 g 00000086 ScrCmd_warpdoor 0806abfc g 00000074 ScrCmd_warphole 0806ac70 g 00000086 ScrCmd_warpteleport -0806acf8 g 00000092 ScrCmd_warpteleport2 +0806acf8 g 00000092 ScrCmd_warpspinenter 0806ad8c g 0000007e ScrCmd_setwarp 0806ae0c g 00000082 ScrCmd_setdynamicwarp 0806ae90 g 0000007e ScrCmd_setdivewarp @@ -4615,21 +4615,21 @@ 0806b17c g 0000004c ScrCmd_fadeoutbgm 0806b1c8 g 00000038 ScrCmd_fadeinbgm 0806b200 g 00000044 ScrCmd_applymovement -0806b244 g 00000044 ScrCmd_applymovement_at +0806b244 g 00000044 ScrCmd_applymovementat 0806b288 l 00000028 WaitForMovementFinish 0806b2b0 g 00000054 ScrCmd_waitmovement -0806b304 g 00000054 ScrCmd_waitmovement_at +0806b304 g 00000054 ScrCmd_waitmovementat 0806b358 g 00000028 ScrCmd_removeobject -0806b380 g 0000002e ScrCmd_removeobject_at +0806b380 g 0000002e ScrCmd_removeobjectat 0806b3b0 g 00000028 ScrCmd_addobject -0806b3d8 g 0000002e ScrCmd_addobject_at +0806b3d8 g 0000002e ScrCmd_addobjectat 0806b408 g 00000068 ScrCmd_setobjectxy 0806b470 g 00000056 ScrCmd_setobjectxyperm -0806b4c8 g 00000028 ScrCmd_moveobjectoffscreen -0806b4f0 g 00000030 ScrCmd_showobject_at -0806b520 g 00000030 ScrCmd_hideobject_at -0806b550 g 0000003a ScrCmd_setobjectpriority -0806b58c g 0000002e ScrCmd_resetobjectpriority +0806b4c8 g 00000028 ScrCmd_copyobjectxytoperm +0806b4f0 g 00000030 ScrCmd_showobjectat +0806b520 g 00000030 ScrCmd_hideobjectat +0806b550 g 0000003a ScrCmd_setobjectsubpriority +0806b58c g 0000002e ScrCmd_resetobjectsubpriority 0806b5bc g 00000038 ScrCmd_faceplayer 0806b5f4 g 00000034 ScrCmd_turnobject 0806b628 g 00000028 ScrCmd_setobjectmovementtype @@ -4659,7 +4659,7 @@ 0806bb98 g 00000004 ScrCmd_drawboxtext 0806bb9c g 0000003a ScrCmd_showmonpic 0806bbd8 g 00000020 ScrCmd_hidemonpic -0806bbf8 g 0000000a ScrCmd_showcontestwinner +0806bbf8 g 0000000a ScrCmd_showcontestpainting 0806bc04 g 0000003c ScrCmd_braillemessage 0806bc40 g 0000002c ScrCmd_getbraillestringwidth 0806bc6c g 0000001c ScrCmd_vmessage @@ -4673,7 +4673,7 @@ 0806be90 g 00000044 ScrCmd_buffernumberstring 0806bed4 g 00000040 ScrCmd_bufferstdstring 0806bf14 g 00000028 ScrCmd_bufferstring -0806bf3c g 00000024 ScrCmd_vloadword +0806bf3c g 00000024 ScrCmd_vbuffermessage 0806bf60 g 00000034 ScrCmd_vbufferstring 0806bf94 g 0000003c ScrCmd_bufferboxname 0806bfd0 g 00000080 ScrCmd_givemon @@ -4703,13 +4703,13 @@ 0806c3d4 g 00000014 ScrCmd_pokemartdecoration2 0806c3e8 g 00000028 ScrCmd_playslotmachine 0806c410 g 00000004 ScrCmd_setberrytree -0806c414 g 00000004 ScrCmd_getpricereduction +0806c414 g 00000004 ScrCmd_getpokenewsactive 0806c418 g 0000000c ScrCmd_choosecontestmon 0806c424 g 00000004 ScrCmd_startcontest 0806c428 g 00000004 ScrCmd_showcontestresults 0806c42c g 00000004 ScrCmd_contestlinktransfer 0806c430 g 00000028 ScrCmd_dofieldeffect -0806c458 g 00000030 ScrCmd_setfieldeffectarg +0806c458 g 00000030 ScrCmd_setfieldeffectargument 0806c488 l 0000001e WaitForFieldEffectFinish 0806c4a8 g 0000002c ScrCmd_waitfieldeffect 0806c4d4 g 0000001c ScrCmd_setrespawn @@ -5355,10 +5355,10 @@ 0807b084 g 00000030 PreservePaletteInWeather 0807b0b4 g 00000010 ResetPreservedPalettesInWeather 0807b0c4 g 0000003a SlightlyDarkenPalsInWeather -0807b100 g 00000030 SetSav1Weather +0807b100 g 00000030 SetSavedWeather 0807b100 l 00000000 .gcc2_compiled. 0807b130 g 00000010 GetSav1Weather -0807b140 g 00000034 SetSav1WeatherFromCurrMapHeader +0807b140 g 00000034 SetSavedWeatherFromCurrMapHeader 0807b174 g 00000016 SetWeather 0807b18c g 00000016 SetWeather_Unused 0807b1a4 g 00000012 DoCurrentWeather @@ -6728,7 +6728,7 @@ 0809d254 g 00000034 ScriptMenu_DisplayPCStartupPrompt 0809d288 l 00000066 Task_ScriptShowMonPic 0809d2f0 g 000000dc ScriptMenu_ShowPokemonPic -0809d3cc g 00000036 ScriptMenu_GetPicboxWaitFunc +0809d3cc g 00000036 ScriptMenu_HidePokemonPic 0809d404 l 0000001e PicboxWait 0809d424 g 0000006e PicboxCancel 0809d494 g 0000006e Task_WaitMuseumFossilPic @@ -31125,8 +31125,8 @@ 083a7244 g 00000004 gNullScriptPtr 083a7248 l 00000012 sScriptConditionTable 083a7294 g 0000000c sScriptStringVars -083a72a0 g 00000002 gUnknown_83A72A0 -083a72a2 g 00000004 gUnknown_83A72A2 +083a72a0 l 00000002 sText_S +083a72a2 l 00000004 sText_IES 083a72a8 l 00000068 sWeatherCoordEventFuncs 083a7310 l 00000020 sPerStepCallbacks 083a7330 l 00000012 sIcefallCaveIceTileCoords @@ -37103,7 +37103,7 @@ 083fea28 l 00000048 sATypeMove_Table 083fea70 l 000000ec sGrammarMoveUsedTable 083feb64 l 0000012c sTextOnWindowsInfo_Normal -083fec90 g 00000004 gUnknown_83FEC90 +083fec90 l 00000004 sNpcTextColorToFont 083fec94 l 00000038 sSaveSlotLayout 083fecd2 g 00000004 gShadowEffectTemplateIds 083fecd6 g 00000008 gShadowVerticalOffsets diff --git a/pokefirered_rev1.sym b/pokefirered_rev1.sym index 8d2e72e55..cfae980c8 100644 --- a/pokefirered_rev1.sym +++ b/pokefirered_rev1.sym @@ -209,12 +209,12 @@ 0203709c l 00000001 sMessageBoxType 020370a0 g 00000001 gWalkAwayFromSignInhibitTimer 020370a4 g 00000004 gRAMScriptPtr -020370a8 l 00000004 gVScriptOffset +020370a8 l 00000004 sAddressOffset 020370ac l 00000001 sQuestLogWaitButtonPressTimer 020370ae l 00000002 sPauseCounter 020370b0 l 00000002 sMovingNpcId -020370b2 l 00000002 sMovingNpcMapBank -020370b4 l 00000002 sMovingNpcMapId +020370b2 l 00000002 sMovingNpcMapGroup +020370b4 l 00000002 sMovingNpcMapNum 020370b6 l 00000002 sFieldEffectScriptId 020370b8 g 00000002 gSpecialVar_0x8000 020370ba g 00000002 gSpecialVar_0x8001 @@ -2873,8 +2873,8 @@ 08054f4c g 00000030 ApplyNewEncryptionKeyToGameStats 08054f7c l 00000140 LoadObjEventTemplatesFromHeader 080550bc l 00000030 LoadSaveblockObjEventScripts -080550ec g 0000003a Overworld_SetMapObjTemplateCoords -08055128 g 00000032 Overworld_SetObjEventTemplateMovementType +080550ec g 0000003a SetObjEventTemplateCoords +08055128 g 00000032 SetObjEventTemplateMovementType 0805515c l 00000028 InitMapView 08055184 l 00000028 GetMapLayout 080551ac l 00000044 ApplyCurrentWarp @@ -2923,7 +2923,7 @@ 08055c88 l 00000028 GetCenterScreenMetatileBehavior 08055cb0 g 0000001a Overworld_IsBikingAllowed 08055ccc l 00000050 SetDefaultFlashLevel -08055d1c g 00000028 Overworld_SetFlashLevel +08055d1c g 00000028 SetFlashLevel 08055d44 g 00000010 Overworld_GetFlashLevel 08055d54 g 0000001c SetCurrentMapLayout 08055d70 g 00000010 Overworld_SetWarpDestinationFromWarp @@ -3562,7 +3562,7 @@ 0805e954 l 00000020 MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex 0805e974 l 00000018 MakeObjectTemplateFromObjectEventTemplate 0805e98c g 00000080 AddPseudoObjectEvent -0805ea0c g 0000014c sprite_new +0805ea0c g 0000014c CreateVirtualObject 0805eb58 g 000000ec sub_805EB44 0805ec44 g 000000e0 TrySpawnObjectEvents 0805ed24 g 00000060 RemoveObjectEventsOutsideView @@ -3578,11 +3578,11 @@ 0805f2bc g 00000020 PlayerObjectTurn 0805f2dc g 00000030 GetObjectEventGraphicsInfo 0805f30c l 0000001c SetObjectEventDynamicGraphicsId -0805f328 g 00000050 ShowOrHideObjectByLocalIdAndMap +0805f328 g 00000050 SetObjectInvisibility 0805f378 g 00000014 ObjectEventGetLocalIdAndMap 0805f38c g 00000030 EnableObjectGroundEffectsByXY -0805f3bc g 00000058 SetObjectPriorityByLocalIdAndMap -0805f414 g 00000048 UnfixObjectPriorityByLocalIdAndMap +0805f3bc g 00000058 SetObjectSubpriority +0805f414 g 00000048 ResetObjectSubpriority 0805f45c g 00000054 SetObjectPositionByLocalIdAndMap 0805f4b0 g 00000014 FreeAndReserveObjectSpritePalettes 0805f4c4 l 0000002c LoadObjectEventPalette @@ -4411,7 +4411,7 @@ 08068fbc g 00000028 UpdateObjectEventSpriteSubpriorityAndVisibility 08068fe4 g 0000003c sub_8068FD0 08069020 l 0000004c GetObjectEventSpriteId -0806906c g 0000003c TurnObjectEvent +0806906c g 0000003c TurnVirtualObject 080690a8 g 00000090 RfuUnionObjectSetFacingDirection 08069138 g 00000048 RfuUnionObjectToggleInvisibility 08069180 g 00000038 RfuUnionObjectIsInvisible @@ -4441,11 +4441,11 @@ 08069568 g 0000001a walkrun_is_standing_still 08069568 l 00000000 .gcc2_compiled. 08069584 g 00000020 Task_WaitPlayerStopMoving -080695a4 g 00000022 NativeScript_WaitPlayerStopMoving -080695c8 g 00000018 ScriptFreezeObjectEvents +080695a4 g 00000022 IsFreezePlayerFinished +080695c8 g 00000018 FreezeObjects_WaitForPlayer 080695e0 g 0000007c Task_WaitPlayerAndTargetNPCStopMoving -0806965c g 00000022 NativeScript_WaitPlayerAndTargetNPCStopMoving -08069680 g 00000054 LockSelectedObjectEvent +0806965c g 00000022 IsFreezeSelectedObjectAndPlayerFinished +08069680 g 00000054 FreezeObjects_WaitForPlayerAndSelected 080696d4 g 00000030 ClearPlayerHeldMovementAndUnfreezeObjectEvents 08069704 g 00000050 UnionRoom_UnlockPlayerAndChatPartner 08069754 g 00000028 Script_FacePlayer @@ -4506,7 +4506,7 @@ 08069d14 g 0000008a InitRamScript 08069da0 g 00000070 GetRamScript 08069e10 g 0000004c ValidateRamScript -08069e5c g 0000005c sub_8069E48 +08069e5c g 0000005c GetSavedRamScriptIfValid 08069eb8 g 0000002c MEventSetRamScript 08069ee4 g 00000004 ScrCmd_nop 08069ee4 l 00000000 .gcc2_compiled. @@ -4531,13 +4531,13 @@ 0806a194 g 00000030 ScrCmd_callstd 0806a1c4 g 0000004c ScrCmd_gotostd_if 0806a210 g 0000004c ScrCmd_callstd_if -0806a25c g 00000014 ScrCmd_gotoram -0806a270 g 00000016 ScrCmd_killscript +0806a25c g 00000014 ScrCmd_returnram +0806a270 g 00000016 ScrCmd_endram 0806a288 g 00000016 ScrCmd_setmysteryeventstatus -0806a2a0 g 00000028 ScrCmd_execram +0806a2a0 g 00000028 ScrCmd_trywondercardscript 0806a2c8 g 00000022 ScrCmd_loadword -0806a2ec g 00000024 ScrCmd_loadbytefromaddr -0806a310 g 00000018 ScrCmd_writebytetoaddr +0806a2ec g 00000024 ScrCmd_loadbytefromptr +0806a310 g 00000018 ScrCmd_setptr 0806a328 g 0000001c ScrCmd_loadbyte 0806a344 g 00000024 ScrCmd_setptrbyte 0806a368 g 00000020 ScrCmd_copylocal @@ -4545,13 +4545,13 @@ 0806a3a4 g 00000022 ScrCmd_setvar 0806a3c8 g 0000002c ScrCmd_copyvar 0806a3f4 g 0000002a ScrCmd_setorcopyvar -0806a420 g 00000020 compare_012 +0806a420 l 00000020 Compare 0806a440 g 00000030 ScrCmd_compare_local_to_local 0806a470 g 00000028 ScrCmd_compare_local_to_value -0806a498 g 0000002c ScrCmd_compare_local_to_addr -0806a4c4 g 0000002a ScrCmd_compare_addr_to_local -0806a4f0 g 00000020 ScrCmd_compare_addr_to_value -0806a510 g 00000022 ScrCmd_compare_addr_to_addr +0806a498 g 0000002c ScrCmd_compare_local_to_ptr +0806a4c4 g 0000002a ScrCmd_compare_ptr_to_local +0806a4f0 g 00000020 ScrCmd_compare_ptr_to_value +0806a510 g 00000022 ScrCmd_compare_ptr_to_ptr 0806a534 g 0000002e ScrCmd_compare_var_to_value 0806a564 g 00000034 ScrCmd_compare_var_to_var 0806a598 g 00000026 ScrCmd_addvar @@ -4564,25 +4564,25 @@ 0806a73c g 0000002c ScrCmd_checkitemtype 0806a768 g 00000044 ScrCmd_addpcitem 0806a7ac g 00000044 ScrCmd_checkpcitem -0806a7f0 g 00000014 ScrCmd_givedecoration -0806a804 g 00000014 ScrCmd_takedecoration +0806a7f0 g 00000014 ScrCmd_adddecoration +0806a804 g 00000014 ScrCmd_removedecoration 0806a818 g 00000014 ScrCmd_checkdecorspace 0806a82c g 00000014 ScrCmd_checkdecor 0806a840 g 00000014 ScrCmd_setflag 0806a854 g 00000014 ScrCmd_clearflag 0806a868 g 0000001a ScrCmd_checkflag 0806a884 g 00000016 ScrCmd_incrementgamestat -0806a89c g 00000036 ScrCmd_comparestattoword +0806a89c g 00000036 ScrCmd_comparestat 0806a8d4 g 00000020 ScrCmd_setworldmapflag 0806a8f4 g 0000001a ScrCmd_animateflash -0806a910 g 0000001c ScrCmd_setflashradius +0806a910 g 0000001c ScrCmd_setflashlevel 0806a92c l 0000001e IsPaletteNotActive 0806a94c g 00000028 ScrCmd_fadescreen 0806a974 g 00000030 ScrCmd_fadescreenspeed 0806a9a4 l 0000001e RunPauseTimer 0806a9c4 g 00000024 ScrCmd_delay 0806a9e8 g 00000004 ScrCmd_initclock -0806a9ec g 00000004 ScrCmd_dodailyevents +0806a9ec g 00000004 ScrCmd_dotimebasedevents 0806a9f0 g 00000020 ScrCmd_gettime 0806aa10 g 0000001c ScrCmd_setweather 0806aa2c g 0000000c ScrCmd_resetweather @@ -4594,7 +4594,7 @@ 0806ab88 g 00000086 ScrCmd_warpdoor 0806ac10 g 00000074 ScrCmd_warphole 0806ac84 g 00000086 ScrCmd_warpteleport -0806ad0c g 00000092 ScrCmd_warpteleport2 +0806ad0c g 00000092 ScrCmd_warpspinenter 0806ada0 g 0000007e ScrCmd_setwarp 0806ae20 g 00000082 ScrCmd_setdynamicwarp 0806aea4 g 0000007e ScrCmd_setdivewarp @@ -4615,21 +4615,21 @@ 0806b190 g 0000004c ScrCmd_fadeoutbgm 0806b1dc g 00000038 ScrCmd_fadeinbgm 0806b214 g 00000044 ScrCmd_applymovement -0806b258 g 00000044 ScrCmd_applymovement_at +0806b258 g 00000044 ScrCmd_applymovementat 0806b29c l 00000028 WaitForMovementFinish 0806b2c4 g 00000054 ScrCmd_waitmovement -0806b318 g 00000054 ScrCmd_waitmovement_at +0806b318 g 00000054 ScrCmd_waitmovementat 0806b36c g 00000028 ScrCmd_removeobject -0806b394 g 0000002e ScrCmd_removeobject_at +0806b394 g 0000002e ScrCmd_removeobjectat 0806b3c4 g 00000028 ScrCmd_addobject -0806b3ec g 0000002e ScrCmd_addobject_at +0806b3ec g 0000002e ScrCmd_addobjectat 0806b41c g 00000068 ScrCmd_setobjectxy 0806b484 g 00000056 ScrCmd_setobjectxyperm -0806b4dc g 00000028 ScrCmd_moveobjectoffscreen -0806b504 g 00000030 ScrCmd_showobject_at -0806b534 g 00000030 ScrCmd_hideobject_at -0806b564 g 0000003a ScrCmd_setobjectpriority -0806b5a0 g 0000002e ScrCmd_resetobjectpriority +0806b4dc g 00000028 ScrCmd_copyobjectxytoperm +0806b504 g 00000030 ScrCmd_showobjectat +0806b534 g 00000030 ScrCmd_hideobjectat +0806b564 g 0000003a ScrCmd_setobjectsubpriority +0806b5a0 g 0000002e ScrCmd_resetobjectsubpriority 0806b5d0 g 00000038 ScrCmd_faceplayer 0806b608 g 00000034 ScrCmd_turnobject 0806b63c g 00000028 ScrCmd_setobjectmovementtype @@ -4659,7 +4659,7 @@ 0806bbac g 00000004 ScrCmd_drawboxtext 0806bbb0 g 0000003a ScrCmd_showmonpic 0806bbec g 00000020 ScrCmd_hidemonpic -0806bc0c g 0000000a ScrCmd_showcontestwinner +0806bc0c g 0000000a ScrCmd_showcontestpainting 0806bc18 g 0000003c ScrCmd_braillemessage 0806bc54 g 0000002c ScrCmd_getbraillestringwidth 0806bc80 g 0000001c ScrCmd_vmessage @@ -4673,7 +4673,7 @@ 0806bea4 g 00000044 ScrCmd_buffernumberstring 0806bee8 g 00000040 ScrCmd_bufferstdstring 0806bf28 g 00000028 ScrCmd_bufferstring -0806bf50 g 00000024 ScrCmd_vloadword +0806bf50 g 00000024 ScrCmd_vbuffermessage 0806bf74 g 00000034 ScrCmd_vbufferstring 0806bfa8 g 0000003c ScrCmd_bufferboxname 0806bfe4 g 00000080 ScrCmd_givemon @@ -4703,13 +4703,13 @@ 0806c3e8 g 00000014 ScrCmd_pokemartdecoration2 0806c3fc g 00000028 ScrCmd_playslotmachine 0806c424 g 00000004 ScrCmd_setberrytree -0806c428 g 00000004 ScrCmd_getpricereduction +0806c428 g 00000004 ScrCmd_getpokenewsactive 0806c42c g 0000000c ScrCmd_choosecontestmon 0806c438 g 00000004 ScrCmd_startcontest 0806c43c g 00000004 ScrCmd_showcontestresults 0806c440 g 00000004 ScrCmd_contestlinktransfer 0806c444 g 00000028 ScrCmd_dofieldeffect -0806c46c g 00000030 ScrCmd_setfieldeffectarg +0806c46c g 00000030 ScrCmd_setfieldeffectargument 0806c49c l 0000001e WaitForFieldEffectFinish 0806c4bc g 0000002c ScrCmd_waitfieldeffect 0806c4e8 g 0000001c ScrCmd_setrespawn @@ -5355,10 +5355,10 @@ 0807b098 g 00000030 PreservePaletteInWeather 0807b0c8 g 00000010 ResetPreservedPalettesInWeather 0807b0d8 g 0000003a SlightlyDarkenPalsInWeather -0807b114 g 00000030 SetSav1Weather +0807b114 g 00000030 SetSavedWeather 0807b114 l 00000000 .gcc2_compiled. 0807b144 g 00000010 GetSav1Weather -0807b154 g 00000034 SetSav1WeatherFromCurrMapHeader +0807b154 g 00000034 SetSavedWeatherFromCurrMapHeader 0807b188 g 00000016 SetWeather 0807b1a0 g 00000016 SetWeather_Unused 0807b1b8 g 00000012 DoCurrentWeather @@ -6728,7 +6728,7 @@ 0809d268 g 00000034 ScriptMenu_DisplayPCStartupPrompt 0809d29c l 00000066 Task_ScriptShowMonPic 0809d304 g 000000dc ScriptMenu_ShowPokemonPic -0809d3e0 g 00000036 ScriptMenu_GetPicboxWaitFunc +0809d3e0 g 00000036 ScriptMenu_HidePokemonPic 0809d418 l 0000001e PicboxWait 0809d438 g 0000006e PicboxCancel 0809d4a8 g 0000006e Task_WaitMuseumFossilPic @@ -31126,8 +31126,8 @@ 083a72b4 g 00000004 gNullScriptPtr 083a72b8 l 00000012 sScriptConditionTable 083a7304 g 0000000c sScriptStringVars -083a7310 g 00000002 gUnknown_83A72A0 -083a7312 g 00000004 gUnknown_83A72A2 +083a7310 l 00000002 sText_S +083a7312 l 00000004 sText_IES 083a7318 l 00000068 sWeatherCoordEventFuncs 083a7380 l 00000020 sPerStepCallbacks 083a73a0 l 00000012 sIcefallCaveIceTileCoords @@ -37104,7 +37104,7 @@ 083fea98 l 00000048 sATypeMove_Table 083feae0 l 000000ec sGrammarMoveUsedTable 083febd4 l 0000012c sTextOnWindowsInfo_Normal -083fed00 g 00000004 gUnknown_83FEC90 +083fed00 l 00000004 sNpcTextColorToFont 083fed04 l 00000038 sSaveSlotLayout 083fed42 g 00000004 gShadowEffectTemplateIds 083fed46 g 00000008 gShadowVerticalOffsets diff --git a/pokeleafgreen.sym b/pokeleafgreen.sym index d1029ddb8..242314577 100644 --- a/pokeleafgreen.sym +++ b/pokeleafgreen.sym @@ -209,12 +209,12 @@ 0203709c l 00000001 sMessageBoxType 020370a0 g 00000001 gWalkAwayFromSignInhibitTimer 020370a4 g 00000004 gRAMScriptPtr -020370a8 l 00000004 gVScriptOffset +020370a8 l 00000004 sAddressOffset 020370ac l 00000001 sQuestLogWaitButtonPressTimer 020370ae l 00000002 sPauseCounter 020370b0 l 00000002 sMovingNpcId -020370b2 l 00000002 sMovingNpcMapBank -020370b4 l 00000002 sMovingNpcMapId +020370b2 l 00000002 sMovingNpcMapGroup +020370b4 l 00000002 sMovingNpcMapNum 020370b6 l 00000002 sFieldEffectScriptId 020370b8 g 00000002 gSpecialVar_0x8000 020370ba g 00000002 gSpecialVar_0x8001 @@ -2873,8 +2873,8 @@ 08054f38 g 00000030 ApplyNewEncryptionKeyToGameStats 08054f68 l 00000140 LoadObjEventTemplatesFromHeader 080550a8 l 00000030 LoadSaveblockObjEventScripts -080550d8 g 0000003a Overworld_SetMapObjTemplateCoords -08055114 g 00000032 Overworld_SetObjEventTemplateMovementType +080550d8 g 0000003a SetObjEventTemplateCoords +08055114 g 00000032 SetObjEventTemplateMovementType 08055148 l 00000028 InitMapView 08055170 l 00000028 GetMapLayout 08055198 l 00000044 ApplyCurrentWarp @@ -2923,7 +2923,7 @@ 08055c74 l 00000028 GetCenterScreenMetatileBehavior 08055c9c g 0000001a Overworld_IsBikingAllowed 08055cb8 l 00000050 SetDefaultFlashLevel -08055d08 g 00000028 Overworld_SetFlashLevel +08055d08 g 00000028 SetFlashLevel 08055d30 g 00000010 Overworld_GetFlashLevel 08055d40 g 0000001c SetCurrentMapLayout 08055d5c g 00000010 Overworld_SetWarpDestinationFromWarp @@ -3562,7 +3562,7 @@ 0805e940 l 00000020 MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex 0805e960 l 00000018 MakeObjectTemplateFromObjectEventTemplate 0805e978 g 00000080 AddPseudoObjectEvent -0805e9f8 g 0000014c sprite_new +0805e9f8 g 0000014c CreateVirtualObject 0805eb44 g 000000ec sub_805EB44 0805ec30 g 000000e0 TrySpawnObjectEvents 0805ed10 g 00000060 RemoveObjectEventsOutsideView @@ -3578,11 +3578,11 @@ 0805f2a8 g 00000020 PlayerObjectTurn 0805f2c8 g 00000030 GetObjectEventGraphicsInfo 0805f2f8 l 0000001c SetObjectEventDynamicGraphicsId -0805f314 g 00000050 ShowOrHideObjectByLocalIdAndMap +0805f314 g 00000050 SetObjectInvisibility 0805f364 g 00000014 ObjectEventGetLocalIdAndMap 0805f378 g 00000030 EnableObjectGroundEffectsByXY -0805f3a8 g 00000058 SetObjectPriorityByLocalIdAndMap -0805f400 g 00000048 UnfixObjectPriorityByLocalIdAndMap +0805f3a8 g 00000058 SetObjectSubpriority +0805f400 g 00000048 ResetObjectSubpriority 0805f448 g 00000054 SetObjectPositionByLocalIdAndMap 0805f49c g 00000014 FreeAndReserveObjectSpritePalettes 0805f4b0 l 0000002c LoadObjectEventPalette @@ -4411,7 +4411,7 @@ 08068fa8 g 00000028 UpdateObjectEventSpriteSubpriorityAndVisibility 08068fd0 g 0000003c sub_8068FD0 0806900c l 0000004c GetObjectEventSpriteId -08069058 g 0000003c TurnObjectEvent +08069058 g 0000003c TurnVirtualObject 08069094 g 00000090 RfuUnionObjectSetFacingDirection 08069124 g 00000048 RfuUnionObjectToggleInvisibility 0806916c g 00000038 RfuUnionObjectIsInvisible @@ -4441,11 +4441,11 @@ 08069554 g 0000001a walkrun_is_standing_still 08069554 l 00000000 .gcc2_compiled. 08069570 g 00000020 Task_WaitPlayerStopMoving -08069590 g 00000022 NativeScript_WaitPlayerStopMoving -080695b4 g 00000018 ScriptFreezeObjectEvents +08069590 g 00000022 IsFreezePlayerFinished +080695b4 g 00000018 FreezeObjects_WaitForPlayer 080695cc g 0000007c Task_WaitPlayerAndTargetNPCStopMoving -08069648 g 00000022 NativeScript_WaitPlayerAndTargetNPCStopMoving -0806966c g 00000054 LockSelectedObjectEvent +08069648 g 00000022 IsFreezeSelectedObjectAndPlayerFinished +0806966c g 00000054 FreezeObjects_WaitForPlayerAndSelected 080696c0 g 00000030 ClearPlayerHeldMovementAndUnfreezeObjectEvents 080696f0 g 00000050 UnionRoom_UnlockPlayerAndChatPartner 08069740 g 00000028 Script_FacePlayer @@ -4506,7 +4506,7 @@ 08069d00 g 0000008a InitRamScript 08069d8c g 00000070 GetRamScript 08069dfc g 0000004c ValidateRamScript -08069e48 g 0000005c sub_8069E48 +08069e48 g 0000005c GetSavedRamScriptIfValid 08069ea4 g 0000002c MEventSetRamScript 08069ed0 g 00000004 ScrCmd_nop 08069ed0 l 00000000 .gcc2_compiled. @@ -4531,13 +4531,13 @@ 0806a180 g 00000030 ScrCmd_callstd 0806a1b0 g 0000004c ScrCmd_gotostd_if 0806a1fc g 0000004c ScrCmd_callstd_if -0806a248 g 00000014 ScrCmd_gotoram -0806a25c g 00000016 ScrCmd_killscript +0806a248 g 00000014 ScrCmd_returnram +0806a25c g 00000016 ScrCmd_endram 0806a274 g 00000016 ScrCmd_setmysteryeventstatus -0806a28c g 00000028 ScrCmd_execram +0806a28c g 00000028 ScrCmd_trywondercardscript 0806a2b4 g 00000022 ScrCmd_loadword -0806a2d8 g 00000024 ScrCmd_loadbytefromaddr -0806a2fc g 00000018 ScrCmd_writebytetoaddr +0806a2d8 g 00000024 ScrCmd_loadbytefromptr +0806a2fc g 00000018 ScrCmd_setptr 0806a314 g 0000001c ScrCmd_loadbyte 0806a330 g 00000024 ScrCmd_setptrbyte 0806a354 g 00000020 ScrCmd_copylocal @@ -4545,13 +4545,13 @@ 0806a390 g 00000022 ScrCmd_setvar 0806a3b4 g 0000002c ScrCmd_copyvar 0806a3e0 g 0000002a ScrCmd_setorcopyvar -0806a40c g 00000020 compare_012 +0806a40c l 00000020 Compare 0806a42c g 00000030 ScrCmd_compare_local_to_local 0806a45c g 00000028 ScrCmd_compare_local_to_value -0806a484 g 0000002c ScrCmd_compare_local_to_addr -0806a4b0 g 0000002a ScrCmd_compare_addr_to_local -0806a4dc g 00000020 ScrCmd_compare_addr_to_value -0806a4fc g 00000022 ScrCmd_compare_addr_to_addr +0806a484 g 0000002c ScrCmd_compare_local_to_ptr +0806a4b0 g 0000002a ScrCmd_compare_ptr_to_local +0806a4dc g 00000020 ScrCmd_compare_ptr_to_value +0806a4fc g 00000022 ScrCmd_compare_ptr_to_ptr 0806a520 g 0000002e ScrCmd_compare_var_to_value 0806a550 g 00000034 ScrCmd_compare_var_to_var 0806a584 g 00000026 ScrCmd_addvar @@ -4564,25 +4564,25 @@ 0806a728 g 0000002c ScrCmd_checkitemtype 0806a754 g 00000044 ScrCmd_addpcitem 0806a798 g 00000044 ScrCmd_checkpcitem -0806a7dc g 00000014 ScrCmd_givedecoration -0806a7f0 g 00000014 ScrCmd_takedecoration +0806a7dc g 00000014 ScrCmd_adddecoration +0806a7f0 g 00000014 ScrCmd_removedecoration 0806a804 g 00000014 ScrCmd_checkdecorspace 0806a818 g 00000014 ScrCmd_checkdecor 0806a82c g 00000014 ScrCmd_setflag 0806a840 g 00000014 ScrCmd_clearflag 0806a854 g 0000001a ScrCmd_checkflag 0806a870 g 00000016 ScrCmd_incrementgamestat -0806a888 g 00000036 ScrCmd_comparestattoword +0806a888 g 00000036 ScrCmd_comparestat 0806a8c0 g 00000020 ScrCmd_setworldmapflag 0806a8e0 g 0000001a ScrCmd_animateflash -0806a8fc g 0000001c ScrCmd_setflashradius +0806a8fc g 0000001c ScrCmd_setflashlevel 0806a918 l 0000001e IsPaletteNotActive 0806a938 g 00000028 ScrCmd_fadescreen 0806a960 g 00000030 ScrCmd_fadescreenspeed 0806a990 l 0000001e RunPauseTimer 0806a9b0 g 00000024 ScrCmd_delay 0806a9d4 g 00000004 ScrCmd_initclock -0806a9d8 g 00000004 ScrCmd_dodailyevents +0806a9d8 g 00000004 ScrCmd_dotimebasedevents 0806a9dc g 00000020 ScrCmd_gettime 0806a9fc g 0000001c ScrCmd_setweather 0806aa18 g 0000000c ScrCmd_resetweather @@ -4594,7 +4594,7 @@ 0806ab74 g 00000086 ScrCmd_warpdoor 0806abfc g 00000074 ScrCmd_warphole 0806ac70 g 00000086 ScrCmd_warpteleport -0806acf8 g 00000092 ScrCmd_warpteleport2 +0806acf8 g 00000092 ScrCmd_warpspinenter 0806ad8c g 0000007e ScrCmd_setwarp 0806ae0c g 00000082 ScrCmd_setdynamicwarp 0806ae90 g 0000007e ScrCmd_setdivewarp @@ -4615,21 +4615,21 @@ 0806b17c g 0000004c ScrCmd_fadeoutbgm 0806b1c8 g 00000038 ScrCmd_fadeinbgm 0806b200 g 00000044 ScrCmd_applymovement -0806b244 g 00000044 ScrCmd_applymovement_at +0806b244 g 00000044 ScrCmd_applymovementat 0806b288 l 00000028 WaitForMovementFinish 0806b2b0 g 00000054 ScrCmd_waitmovement -0806b304 g 00000054 ScrCmd_waitmovement_at +0806b304 g 00000054 ScrCmd_waitmovementat 0806b358 g 00000028 ScrCmd_removeobject -0806b380 g 0000002e ScrCmd_removeobject_at +0806b380 g 0000002e ScrCmd_removeobjectat 0806b3b0 g 00000028 ScrCmd_addobject -0806b3d8 g 0000002e ScrCmd_addobject_at +0806b3d8 g 0000002e ScrCmd_addobjectat 0806b408 g 00000068 ScrCmd_setobjectxy 0806b470 g 00000056 ScrCmd_setobjectxyperm -0806b4c8 g 00000028 ScrCmd_moveobjectoffscreen -0806b4f0 g 00000030 ScrCmd_showobject_at -0806b520 g 00000030 ScrCmd_hideobject_at -0806b550 g 0000003a ScrCmd_setobjectpriority -0806b58c g 0000002e ScrCmd_resetobjectpriority +0806b4c8 g 00000028 ScrCmd_copyobjectxytoperm +0806b4f0 g 00000030 ScrCmd_showobjectat +0806b520 g 00000030 ScrCmd_hideobjectat +0806b550 g 0000003a ScrCmd_setobjectsubpriority +0806b58c g 0000002e ScrCmd_resetobjectsubpriority 0806b5bc g 00000038 ScrCmd_faceplayer 0806b5f4 g 00000034 ScrCmd_turnobject 0806b628 g 00000028 ScrCmd_setobjectmovementtype @@ -4659,7 +4659,7 @@ 0806bb98 g 00000004 ScrCmd_drawboxtext 0806bb9c g 0000003a ScrCmd_showmonpic 0806bbd8 g 00000020 ScrCmd_hidemonpic -0806bbf8 g 0000000a ScrCmd_showcontestwinner +0806bbf8 g 0000000a ScrCmd_showcontestpainting 0806bc04 g 0000003c ScrCmd_braillemessage 0806bc40 g 0000002c ScrCmd_getbraillestringwidth 0806bc6c g 0000001c ScrCmd_vmessage @@ -4673,7 +4673,7 @@ 0806be90 g 00000044 ScrCmd_buffernumberstring 0806bed4 g 00000040 ScrCmd_bufferstdstring 0806bf14 g 00000028 ScrCmd_bufferstring -0806bf3c g 00000024 ScrCmd_vloadword +0806bf3c g 00000024 ScrCmd_vbuffermessage 0806bf60 g 00000034 ScrCmd_vbufferstring 0806bf94 g 0000003c ScrCmd_bufferboxname 0806bfd0 g 00000080 ScrCmd_givemon @@ -4703,13 +4703,13 @@ 0806c3d4 g 00000014 ScrCmd_pokemartdecoration2 0806c3e8 g 00000028 ScrCmd_playslotmachine 0806c410 g 00000004 ScrCmd_setberrytree -0806c414 g 00000004 ScrCmd_getpricereduction +0806c414 g 00000004 ScrCmd_getpokenewsactive 0806c418 g 0000000c ScrCmd_choosecontestmon 0806c424 g 00000004 ScrCmd_startcontest 0806c428 g 00000004 ScrCmd_showcontestresults 0806c42c g 00000004 ScrCmd_contestlinktransfer 0806c430 g 00000028 ScrCmd_dofieldeffect -0806c458 g 00000030 ScrCmd_setfieldeffectarg +0806c458 g 00000030 ScrCmd_setfieldeffectargument 0806c488 l 0000001e WaitForFieldEffectFinish 0806c4a8 g 0000002c ScrCmd_waitfieldeffect 0806c4d4 g 0000001c ScrCmd_setrespawn @@ -5357,10 +5357,10 @@ 0807b058 g 00000030 PreservePaletteInWeather 0807b088 g 00000010 ResetPreservedPalettesInWeather 0807b098 g 0000003a SlightlyDarkenPalsInWeather -0807b0d4 g 00000030 SetSav1Weather +0807b0d4 g 00000030 SetSavedWeather 0807b0d4 l 00000000 .gcc2_compiled. 0807b104 g 00000010 GetSav1Weather -0807b114 g 00000034 SetSav1WeatherFromCurrMapHeader +0807b114 g 00000034 SetSavedWeatherFromCurrMapHeader 0807b148 g 00000016 SetWeather 0807b160 g 00000016 SetWeather_Unused 0807b178 g 00000012 DoCurrentWeather @@ -6730,7 +6730,7 @@ 0809d228 g 00000034 ScriptMenu_DisplayPCStartupPrompt 0809d25c l 00000066 Task_ScriptShowMonPic 0809d2c4 g 000000dc ScriptMenu_ShowPokemonPic -0809d3a0 g 00000036 ScriptMenu_GetPicboxWaitFunc +0809d3a0 g 00000036 ScriptMenu_HidePokemonPic 0809d3d8 l 0000001e PicboxWait 0809d3f8 g 0000006e PicboxCancel 0809d468 g 0000006e Task_WaitMuseumFossilPic @@ -31127,8 +31127,8 @@ 083a7224 g 00000004 gNullScriptPtr 083a7228 l 00000012 sScriptConditionTable 083a7274 g 0000000c sScriptStringVars -083a7280 g 00000002 gUnknown_83A72A0 -083a7282 g 00000004 gUnknown_83A72A2 +083a7280 l 00000002 sText_S +083a7282 l 00000004 sText_IES 083a7288 l 00000068 sWeatherCoordEventFuncs 083a72f0 l 00000020 sPerStepCallbacks 083a7310 l 00000012 sIcefallCaveIceTileCoords @@ -37105,7 +37105,7 @@ 083fe864 l 00000048 sATypeMove_Table 083fe8ac l 000000ec sGrammarMoveUsedTable 083fe9a0 l 0000012c sTextOnWindowsInfo_Normal -083feacc g 00000004 gUnknown_83FEC90 +083feacc l 00000004 sNpcTextColorToFont 083fead0 l 00000038 sSaveSlotLayout 083feb0e g 00000004 gShadowEffectTemplateIds 083feb12 g 00000008 gShadowVerticalOffsets diff --git a/pokeleafgreen_rev1.sym b/pokeleafgreen_rev1.sym index cfc9fb48e..e9820ec5a 100644 --- a/pokeleafgreen_rev1.sym +++ b/pokeleafgreen_rev1.sym @@ -209,12 +209,12 @@ 0203709c l 00000001 sMessageBoxType 020370a0 g 00000001 gWalkAwayFromSignInhibitTimer 020370a4 g 00000004 gRAMScriptPtr -020370a8 l 00000004 gVScriptOffset +020370a8 l 00000004 sAddressOffset 020370ac l 00000001 sQuestLogWaitButtonPressTimer 020370ae l 00000002 sPauseCounter 020370b0 l 00000002 sMovingNpcId -020370b2 l 00000002 sMovingNpcMapBank -020370b4 l 00000002 sMovingNpcMapId +020370b2 l 00000002 sMovingNpcMapGroup +020370b4 l 00000002 sMovingNpcMapNum 020370b6 l 00000002 sFieldEffectScriptId 020370b8 g 00000002 gSpecialVar_0x8000 020370ba g 00000002 gSpecialVar_0x8001 @@ -2873,8 +2873,8 @@ 08054f4c g 00000030 ApplyNewEncryptionKeyToGameStats 08054f7c l 00000140 LoadObjEventTemplatesFromHeader 080550bc l 00000030 LoadSaveblockObjEventScripts -080550ec g 0000003a Overworld_SetMapObjTemplateCoords -08055128 g 00000032 Overworld_SetObjEventTemplateMovementType +080550ec g 0000003a SetObjEventTemplateCoords +08055128 g 00000032 SetObjEventTemplateMovementType 0805515c l 00000028 InitMapView 08055184 l 00000028 GetMapLayout 080551ac l 00000044 ApplyCurrentWarp @@ -2923,7 +2923,7 @@ 08055c88 l 00000028 GetCenterScreenMetatileBehavior 08055cb0 g 0000001a Overworld_IsBikingAllowed 08055ccc l 00000050 SetDefaultFlashLevel -08055d1c g 00000028 Overworld_SetFlashLevel +08055d1c g 00000028 SetFlashLevel 08055d44 g 00000010 Overworld_GetFlashLevel 08055d54 g 0000001c SetCurrentMapLayout 08055d70 g 00000010 Overworld_SetWarpDestinationFromWarp @@ -3562,7 +3562,7 @@ 0805e954 l 00000020 MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex 0805e974 l 00000018 MakeObjectTemplateFromObjectEventTemplate 0805e98c g 00000080 AddPseudoObjectEvent -0805ea0c g 0000014c sprite_new +0805ea0c g 0000014c CreateVirtualObject 0805eb58 g 000000ec sub_805EB44 0805ec44 g 000000e0 TrySpawnObjectEvents 0805ed24 g 00000060 RemoveObjectEventsOutsideView @@ -3578,11 +3578,11 @@ 0805f2bc g 00000020 PlayerObjectTurn 0805f2dc g 00000030 GetObjectEventGraphicsInfo 0805f30c l 0000001c SetObjectEventDynamicGraphicsId -0805f328 g 00000050 ShowOrHideObjectByLocalIdAndMap +0805f328 g 00000050 SetObjectInvisibility 0805f378 g 00000014 ObjectEventGetLocalIdAndMap 0805f38c g 00000030 EnableObjectGroundEffectsByXY -0805f3bc g 00000058 SetObjectPriorityByLocalIdAndMap -0805f414 g 00000048 UnfixObjectPriorityByLocalIdAndMap +0805f3bc g 00000058 SetObjectSubpriority +0805f414 g 00000048 ResetObjectSubpriority 0805f45c g 00000054 SetObjectPositionByLocalIdAndMap 0805f4b0 g 00000014 FreeAndReserveObjectSpritePalettes 0805f4c4 l 0000002c LoadObjectEventPalette @@ -4411,7 +4411,7 @@ 08068fbc g 00000028 UpdateObjectEventSpriteSubpriorityAndVisibility 08068fe4 g 0000003c sub_8068FD0 08069020 l 0000004c GetObjectEventSpriteId -0806906c g 0000003c TurnObjectEvent +0806906c g 0000003c TurnVirtualObject 080690a8 g 00000090 RfuUnionObjectSetFacingDirection 08069138 g 00000048 RfuUnionObjectToggleInvisibility 08069180 g 00000038 RfuUnionObjectIsInvisible @@ -4441,11 +4441,11 @@ 08069568 g 0000001a walkrun_is_standing_still 08069568 l 00000000 .gcc2_compiled. 08069584 g 00000020 Task_WaitPlayerStopMoving -080695a4 g 00000022 NativeScript_WaitPlayerStopMoving -080695c8 g 00000018 ScriptFreezeObjectEvents +080695a4 g 00000022 IsFreezePlayerFinished +080695c8 g 00000018 FreezeObjects_WaitForPlayer 080695e0 g 0000007c Task_WaitPlayerAndTargetNPCStopMoving -0806965c g 00000022 NativeScript_WaitPlayerAndTargetNPCStopMoving -08069680 g 00000054 LockSelectedObjectEvent +0806965c g 00000022 IsFreezeSelectedObjectAndPlayerFinished +08069680 g 00000054 FreezeObjects_WaitForPlayerAndSelected 080696d4 g 00000030 ClearPlayerHeldMovementAndUnfreezeObjectEvents 08069704 g 00000050 UnionRoom_UnlockPlayerAndChatPartner 08069754 g 00000028 Script_FacePlayer @@ -4506,7 +4506,7 @@ 08069d14 g 0000008a InitRamScript 08069da0 g 00000070 GetRamScript 08069e10 g 0000004c ValidateRamScript -08069e5c g 0000005c sub_8069E48 +08069e5c g 0000005c GetSavedRamScriptIfValid 08069eb8 g 0000002c MEventSetRamScript 08069ee4 g 00000004 ScrCmd_nop 08069ee4 l 00000000 .gcc2_compiled. @@ -4531,13 +4531,13 @@ 0806a194 g 00000030 ScrCmd_callstd 0806a1c4 g 0000004c ScrCmd_gotostd_if 0806a210 g 0000004c ScrCmd_callstd_if -0806a25c g 00000014 ScrCmd_gotoram -0806a270 g 00000016 ScrCmd_killscript +0806a25c g 00000014 ScrCmd_returnram +0806a270 g 00000016 ScrCmd_endram 0806a288 g 00000016 ScrCmd_setmysteryeventstatus -0806a2a0 g 00000028 ScrCmd_execram +0806a2a0 g 00000028 ScrCmd_trywondercardscript 0806a2c8 g 00000022 ScrCmd_loadword -0806a2ec g 00000024 ScrCmd_loadbytefromaddr -0806a310 g 00000018 ScrCmd_writebytetoaddr +0806a2ec g 00000024 ScrCmd_loadbytefromptr +0806a310 g 00000018 ScrCmd_setptr 0806a328 g 0000001c ScrCmd_loadbyte 0806a344 g 00000024 ScrCmd_setptrbyte 0806a368 g 00000020 ScrCmd_copylocal @@ -4545,13 +4545,13 @@ 0806a3a4 g 00000022 ScrCmd_setvar 0806a3c8 g 0000002c ScrCmd_copyvar 0806a3f4 g 0000002a ScrCmd_setorcopyvar -0806a420 g 00000020 compare_012 +0806a420 l 00000020 Compare 0806a440 g 00000030 ScrCmd_compare_local_to_local 0806a470 g 00000028 ScrCmd_compare_local_to_value -0806a498 g 0000002c ScrCmd_compare_local_to_addr -0806a4c4 g 0000002a ScrCmd_compare_addr_to_local -0806a4f0 g 00000020 ScrCmd_compare_addr_to_value -0806a510 g 00000022 ScrCmd_compare_addr_to_addr +0806a498 g 0000002c ScrCmd_compare_local_to_ptr +0806a4c4 g 0000002a ScrCmd_compare_ptr_to_local +0806a4f0 g 00000020 ScrCmd_compare_ptr_to_value +0806a510 g 00000022 ScrCmd_compare_ptr_to_ptr 0806a534 g 0000002e ScrCmd_compare_var_to_value 0806a564 g 00000034 ScrCmd_compare_var_to_var 0806a598 g 00000026 ScrCmd_addvar @@ -4564,25 +4564,25 @@ 0806a73c g 0000002c ScrCmd_checkitemtype 0806a768 g 00000044 ScrCmd_addpcitem 0806a7ac g 00000044 ScrCmd_checkpcitem -0806a7f0 g 00000014 ScrCmd_givedecoration -0806a804 g 00000014 ScrCmd_takedecoration +0806a7f0 g 00000014 ScrCmd_adddecoration +0806a804 g 00000014 ScrCmd_removedecoration 0806a818 g 00000014 ScrCmd_checkdecorspace 0806a82c g 00000014 ScrCmd_checkdecor 0806a840 g 00000014 ScrCmd_setflag 0806a854 g 00000014 ScrCmd_clearflag 0806a868 g 0000001a ScrCmd_checkflag 0806a884 g 00000016 ScrCmd_incrementgamestat -0806a89c g 00000036 ScrCmd_comparestattoword +0806a89c g 00000036 ScrCmd_comparestat 0806a8d4 g 00000020 ScrCmd_setworldmapflag 0806a8f4 g 0000001a ScrCmd_animateflash -0806a910 g 0000001c ScrCmd_setflashradius +0806a910 g 0000001c ScrCmd_setflashlevel 0806a92c l 0000001e IsPaletteNotActive 0806a94c g 00000028 ScrCmd_fadescreen 0806a974 g 00000030 ScrCmd_fadescreenspeed 0806a9a4 l 0000001e RunPauseTimer 0806a9c4 g 00000024 ScrCmd_delay 0806a9e8 g 00000004 ScrCmd_initclock -0806a9ec g 00000004 ScrCmd_dodailyevents +0806a9ec g 00000004 ScrCmd_dotimebasedevents 0806a9f0 g 00000020 ScrCmd_gettime 0806aa10 g 0000001c ScrCmd_setweather 0806aa2c g 0000000c ScrCmd_resetweather @@ -4594,7 +4594,7 @@ 0806ab88 g 00000086 ScrCmd_warpdoor 0806ac10 g 00000074 ScrCmd_warphole 0806ac84 g 00000086 ScrCmd_warpteleport -0806ad0c g 00000092 ScrCmd_warpteleport2 +0806ad0c g 00000092 ScrCmd_warpspinenter 0806ada0 g 0000007e ScrCmd_setwarp 0806ae20 g 00000082 ScrCmd_setdynamicwarp 0806aea4 g 0000007e ScrCmd_setdivewarp @@ -4615,21 +4615,21 @@ 0806b190 g 0000004c ScrCmd_fadeoutbgm 0806b1dc g 00000038 ScrCmd_fadeinbgm 0806b214 g 00000044 ScrCmd_applymovement -0806b258 g 00000044 ScrCmd_applymovement_at +0806b258 g 00000044 ScrCmd_applymovementat 0806b29c l 00000028 WaitForMovementFinish 0806b2c4 g 00000054 ScrCmd_waitmovement -0806b318 g 00000054 ScrCmd_waitmovement_at +0806b318 g 00000054 ScrCmd_waitmovementat 0806b36c g 00000028 ScrCmd_removeobject -0806b394 g 0000002e ScrCmd_removeobject_at +0806b394 g 0000002e ScrCmd_removeobjectat 0806b3c4 g 00000028 ScrCmd_addobject -0806b3ec g 0000002e ScrCmd_addobject_at +0806b3ec g 0000002e ScrCmd_addobjectat 0806b41c g 00000068 ScrCmd_setobjectxy 0806b484 g 00000056 ScrCmd_setobjectxyperm -0806b4dc g 00000028 ScrCmd_moveobjectoffscreen -0806b504 g 00000030 ScrCmd_showobject_at -0806b534 g 00000030 ScrCmd_hideobject_at -0806b564 g 0000003a ScrCmd_setobjectpriority -0806b5a0 g 0000002e ScrCmd_resetobjectpriority +0806b4dc g 00000028 ScrCmd_copyobjectxytoperm +0806b504 g 00000030 ScrCmd_showobjectat +0806b534 g 00000030 ScrCmd_hideobjectat +0806b564 g 0000003a ScrCmd_setobjectsubpriority +0806b5a0 g 0000002e ScrCmd_resetobjectsubpriority 0806b5d0 g 00000038 ScrCmd_faceplayer 0806b608 g 00000034 ScrCmd_turnobject 0806b63c g 00000028 ScrCmd_setobjectmovementtype @@ -4659,7 +4659,7 @@ 0806bbac g 00000004 ScrCmd_drawboxtext 0806bbb0 g 0000003a ScrCmd_showmonpic 0806bbec g 00000020 ScrCmd_hidemonpic -0806bc0c g 0000000a ScrCmd_showcontestwinner +0806bc0c g 0000000a ScrCmd_showcontestpainting 0806bc18 g 0000003c ScrCmd_braillemessage 0806bc54 g 0000002c ScrCmd_getbraillestringwidth 0806bc80 g 0000001c ScrCmd_vmessage @@ -4673,7 +4673,7 @@ 0806bea4 g 00000044 ScrCmd_buffernumberstring 0806bee8 g 00000040 ScrCmd_bufferstdstring 0806bf28 g 00000028 ScrCmd_bufferstring -0806bf50 g 00000024 ScrCmd_vloadword +0806bf50 g 00000024 ScrCmd_vbuffermessage 0806bf74 g 00000034 ScrCmd_vbufferstring 0806bfa8 g 0000003c ScrCmd_bufferboxname 0806bfe4 g 00000080 ScrCmd_givemon @@ -4703,13 +4703,13 @@ 0806c3e8 g 00000014 ScrCmd_pokemartdecoration2 0806c3fc g 00000028 ScrCmd_playslotmachine 0806c424 g 00000004 ScrCmd_setberrytree -0806c428 g 00000004 ScrCmd_getpricereduction +0806c428 g 00000004 ScrCmd_getpokenewsactive 0806c42c g 0000000c ScrCmd_choosecontestmon 0806c438 g 00000004 ScrCmd_startcontest 0806c43c g 00000004 ScrCmd_showcontestresults 0806c440 g 00000004 ScrCmd_contestlinktransfer 0806c444 g 00000028 ScrCmd_dofieldeffect -0806c46c g 00000030 ScrCmd_setfieldeffectarg +0806c46c g 00000030 ScrCmd_setfieldeffectargument 0806c49c l 0000001e WaitForFieldEffectFinish 0806c4bc g 0000002c ScrCmd_waitfieldeffect 0806c4e8 g 0000001c ScrCmd_setrespawn @@ -5357,10 +5357,10 @@ 0807b06c g 00000030 PreservePaletteInWeather 0807b09c g 00000010 ResetPreservedPalettesInWeather 0807b0ac g 0000003a SlightlyDarkenPalsInWeather -0807b0e8 g 00000030 SetSav1Weather +0807b0e8 g 00000030 SetSavedWeather 0807b0e8 l 00000000 .gcc2_compiled. 0807b118 g 00000010 GetSav1Weather -0807b128 g 00000034 SetSav1WeatherFromCurrMapHeader +0807b128 g 00000034 SetSavedWeatherFromCurrMapHeader 0807b15c g 00000016 SetWeather 0807b174 g 00000016 SetWeather_Unused 0807b18c g 00000012 DoCurrentWeather @@ -6730,7 +6730,7 @@ 0809d23c g 00000034 ScriptMenu_DisplayPCStartupPrompt 0809d270 l 00000066 Task_ScriptShowMonPic 0809d2d8 g 000000dc ScriptMenu_ShowPokemonPic -0809d3b4 g 00000036 ScriptMenu_GetPicboxWaitFunc +0809d3b4 g 00000036 ScriptMenu_HidePokemonPic 0809d3ec l 0000001e PicboxWait 0809d40c g 0000006e PicboxCancel 0809d47c g 0000006e Task_WaitMuseumFossilPic @@ -31128,8 +31128,8 @@ 083a7294 g 00000004 gNullScriptPtr 083a7298 l 00000012 sScriptConditionTable 083a72e4 g 0000000c sScriptStringVars -083a72f0 g 00000002 gUnknown_83A72A0 -083a72f2 g 00000004 gUnknown_83A72A2 +083a72f0 l 00000002 sText_S +083a72f2 l 00000004 sText_IES 083a72f8 l 00000068 sWeatherCoordEventFuncs 083a7360 l 00000020 sPerStepCallbacks 083a7380 l 00000012 sIcefallCaveIceTileCoords @@ -37106,7 +37106,7 @@ 083fe8d4 l 00000048 sATypeMove_Table 083fe91c l 000000ec sGrammarMoveUsedTable 083fea10 l 0000012c sTextOnWindowsInfo_Normal -083feb3c g 00000004 gUnknown_83FEC90 +083feb3c l 00000004 sNpcTextColorToFont 083feb40 l 00000038 sSaveSlotLayout 083feb7e g 00000004 gShadowEffectTemplateIds 083feb82 g 00000008 gShadowVerticalOffsets