Merge pull request #541 from GriffinRichards/sync-script

pokefirered.sym

@@ -208,7 +208,7 @@
 0203709a g 00000002 sCurrentSpecialObjectPaletteTag
 0203709c l 00000001 sMessageBoxType
 020370a0 g 00000001 gWalkAwayFromSignInhibitTimer
-020370a4 g 00000004 gRAMScriptPtr
+020370a4 g 00000004 gRamScriptRetAddr
 020370a8 l 00000004 sAddressOffset
 020370ac l 00000001 sQuestLogWaitButtonPressTimer
 020370ae l 00000002 sPauseCounter
@@ -660,12 +660,12 @@
 03000e9a l 00000002 sVerticalCameraPan
 03000e9c l 00000001 gUnknown_3000E9C
 03000ea0 l 00000004 sFieldCameraPanningCallback
-03000ea8 l 00000001 sScriptContext1Status
+03000ea8 l 00000001 sGlobalScriptContextStatus
 03000eac l 00000004 sUnusedVariable1
-03000eb0 l 00000074 sScriptContext1
+03000eb0 l 00000074 sGlobalScriptContext
 03000f24 l 00000004 sUnusedVariable2
-03000f28 l 00000074 sScriptContext2
-03000f9c l 00000001 sScriptContext2Enabled
+03000f28 l 00000074 sImmediateScriptContext
+03000f9c l 00000001 sLockFieldControls
 03000f9d l 00000001 sMsgBoxWalkawayDisabled
 03000f9e l 00000001 sMsgBoxIsCancelable
 03000f9f l 00000001 sQuestLogInput
@@ -4458,16 +4458,16 @@
 080697f4 g 00000008 SetupNativeScript
 080697fc g 00000008 StopScript
 08069804 g 0000007e RunScriptCommand
-08069884 g 00000028 ScriptPush
-080698ac g 00000022 ScriptPop
+08069884 l 00000028 ScriptPush
+080698ac l 00000022 ScriptPop
 080698d0 g 00000004 ScriptJump
 080698d4 g 00000014 ScriptCall
 080698e8 g 00000010 ScriptReturn
 080698f8 g 00000016 ScriptReadHalfword
 08069910 g 00000030 ScriptReadWord
-08069940 g 0000000c ScriptContext2_Enable
-0806994c g 0000000c ScriptContext2_Disable
-08069958 g 0000000c ScriptContext2_IsEnabled
+08069940 g 0000000c LockPlayerFieldControls
+0806994c g 0000000c UnlockPlayerFieldControls
+08069958 g 0000000c ArePlayerFieldControlsLocked
 08069964 g 0000000c SetQuestLogInputIsDpadFlag
 08069970 g 0000000c ClearQuestLogInputIsDpadFlag
 0806997c g 0000001a IsQuestLogInputDpad
@@ -4484,16 +4484,16 @@
 08069a2c g 0000000c MsgSetNotSignPost
 08069a38 g 0000001a IsMsgSignPost
 08069a54 g 0000000e ResetFacingNpcOrSignPostVars
-08069a64 g 0000001a ScriptContext1_IsScriptSetUp
-08069a80 g 00000028 ScriptContext1_Init
-08069aa8 g 0000003c ScriptContext2_RunScript
-08069ae4 g 00000044 ScriptContext1_SetupScript
-08069b28 g 0000000c ScriptContext1_Stop
-08069b34 g 00000014 EnableBothScriptContexts
-08069b48 g 00000038 ScriptContext2_RunNewScript
-08069b80 g 0000003e mapheader_get_tagged_pointer
-08069bc0 g 00000016 mapheader_run_script_by_tag
-08069bd8 g 00000060 mapheader_get_first_match_from_tagged_ptr_list
+08069a64 g 0000001a ScriptContext_IsEnabled
+08069a80 g 00000028 ScriptContext_Init
+08069aa8 g 0000003c ScriptContext_RunScript
+08069ae4 g 00000044 ScriptContext_SetupScript
+08069b28 g 0000000c ScriptContext_Stop
+08069b34 g 00000014 ScriptContext_Enable
+08069b48 g 00000038 RunScriptImmediately
+08069b80 l 0000003e MapHeaderGetScriptTable
+08069bc0 l 00000016 MapHeaderRunScriptType
+08069bd8 l 00000060 MapHeaderCheckScriptTable
 08069c38 g 0000000c RunOnLoadMapScript
 08069c44 g 0000000c RunOnTransitionMapScript
 08069c50 g 0000000c RunOnResumeMapScript
@@ -4507,7 +4507,7 @@
 08069d8c g 00000070 GetRamScript
 08069dfc g 0000004c ValidateRamScript
 08069e48 g 0000005c GetSavedRamScriptIfValid
-08069ea4 g 0000002c MEventSetRamScript
+08069ea4 g 0000002c InitRamScript_NoObjectEvent
 08069ed0 g 00000004 ScrCmd_nop
 08069ed0 l 00000000 .gcc2_compiled.
 08069ed4 g 00000004 ScrCmd_nop1

pokefirered_rev1.sym

@@ -208,7 +208,7 @@
 0203709a g 00000002 sCurrentSpecialObjectPaletteTag
 0203709c l 00000001 sMessageBoxType
 020370a0 g 00000001 gWalkAwayFromSignInhibitTimer
-020370a4 g 00000004 gRAMScriptPtr
+020370a4 g 00000004 gRamScriptRetAddr
 020370a8 l 00000004 sAddressOffset
 020370ac l 00000001 sQuestLogWaitButtonPressTimer
 020370ae l 00000002 sPauseCounter
@@ -660,12 +660,12 @@
 03000e9a l 00000002 sVerticalCameraPan
 03000e9c l 00000001 gUnknown_3000E9C
 03000ea0 l 00000004 sFieldCameraPanningCallback
-03000ea8 l 00000001 sScriptContext1Status
+03000ea8 l 00000001 sGlobalScriptContextStatus
 03000eac l 00000004 sUnusedVariable1
-03000eb0 l 00000074 sScriptContext1
+03000eb0 l 00000074 sGlobalScriptContext
 03000f24 l 00000004 sUnusedVariable2
-03000f28 l 00000074 sScriptContext2
-03000f9c l 00000001 sScriptContext2Enabled
+03000f28 l 00000074 sImmediateScriptContext
+03000f9c l 00000001 sLockFieldControls
 03000f9d l 00000001 sMsgBoxWalkawayDisabled
 03000f9e l 00000001 sMsgBoxIsCancelable
 03000f9f l 00000001 sQuestLogInput
@@ -4458,16 +4458,16 @@
 08069808 g 00000008 SetupNativeScript
 08069810 g 00000008 StopScript
 08069818 g 0000007e RunScriptCommand
-08069898 g 00000028 ScriptPush
-080698c0 g 00000022 ScriptPop
+08069898 l 00000028 ScriptPush
+080698c0 l 00000022 ScriptPop
 080698e4 g 00000004 ScriptJump
 080698e8 g 00000014 ScriptCall
 080698fc g 00000010 ScriptReturn
 0806990c g 00000016 ScriptReadHalfword
 08069924 g 00000030 ScriptReadWord
-08069954 g 0000000c ScriptContext2_Enable
-08069960 g 0000000c ScriptContext2_Disable
-0806996c g 0000000c ScriptContext2_IsEnabled
+08069954 g 0000000c LockPlayerFieldControls
+08069960 g 0000000c UnlockPlayerFieldControls
+0806996c g 0000000c ArePlayerFieldControlsLocked
 08069978 g 0000000c SetQuestLogInputIsDpadFlag
 08069984 g 0000000c ClearQuestLogInputIsDpadFlag
 08069990 g 0000001a IsQuestLogInputDpad
@@ -4484,16 +4484,16 @@
 08069a40 g 0000000c MsgSetNotSignPost
 08069a4c g 0000001a IsMsgSignPost
 08069a68 g 0000000e ResetFacingNpcOrSignPostVars
-08069a78 g 0000001a ScriptContext1_IsScriptSetUp
-08069a94 g 00000028 ScriptContext1_Init
-08069abc g 0000003c ScriptContext2_RunScript
-08069af8 g 00000044 ScriptContext1_SetupScript
-08069b3c g 0000000c ScriptContext1_Stop
-08069b48 g 00000014 EnableBothScriptContexts
-08069b5c g 00000038 ScriptContext2_RunNewScript
-08069b94 g 0000003e mapheader_get_tagged_pointer
-08069bd4 g 00000016 mapheader_run_script_by_tag
-08069bec g 00000060 mapheader_get_first_match_from_tagged_ptr_list
+08069a78 g 0000001a ScriptContext_IsEnabled
+08069a94 g 00000028 ScriptContext_Init
+08069abc g 0000003c ScriptContext_RunScript
+08069af8 g 00000044 ScriptContext_SetupScript
+08069b3c g 0000000c ScriptContext_Stop
+08069b48 g 00000014 ScriptContext_Enable
+08069b5c g 00000038 RunScriptImmediately
+08069b94 l 0000003e MapHeaderGetScriptTable
+08069bd4 l 00000016 MapHeaderRunScriptType
+08069bec l 00000060 MapHeaderCheckScriptTable
 08069c4c g 0000000c RunOnLoadMapScript
 08069c58 g 0000000c RunOnTransitionMapScript
 08069c64 g 0000000c RunOnResumeMapScript
@@ -4507,7 +4507,7 @@
 08069da0 g 00000070 GetRamScript
 08069e10 g 0000004c ValidateRamScript
 08069e5c g 0000005c GetSavedRamScriptIfValid
-08069eb8 g 0000002c MEventSetRamScript
+08069eb8 g 0000002c InitRamScript_NoObjectEvent
 08069ee4 g 00000004 ScrCmd_nop
 08069ee4 l 00000000 .gcc2_compiled.
 08069ee8 g 00000004 ScrCmd_nop1

pokeleafgreen.sym

@@ -208,7 +208,7 @@
 0203709a g 00000002 sCurrentSpecialObjectPaletteTag
 0203709c l 00000001 sMessageBoxType
 020370a0 g 00000001 gWalkAwayFromSignInhibitTimer
-020370a4 g 00000004 gRAMScriptPtr
+020370a4 g 00000004 gRamScriptRetAddr
 020370a8 l 00000004 sAddressOffset
 020370ac l 00000001 sQuestLogWaitButtonPressTimer
 020370ae l 00000002 sPauseCounter
@@ -660,12 +660,12 @@
 03000e9a l 00000002 sVerticalCameraPan
 03000e9c l 00000001 gUnknown_3000E9C
 03000ea0 l 00000004 sFieldCameraPanningCallback
-03000ea8 l 00000001 sScriptContext1Status
+03000ea8 l 00000001 sGlobalScriptContextStatus
 03000eac l 00000004 sUnusedVariable1
-03000eb0 l 00000074 sScriptContext1
+03000eb0 l 00000074 sGlobalScriptContext
 03000f24 l 00000004 sUnusedVariable2
-03000f28 l 00000074 sScriptContext2
-03000f9c l 00000001 sScriptContext2Enabled
+03000f28 l 00000074 sImmediateScriptContext
+03000f9c l 00000001 sLockFieldControls
 03000f9d l 00000001 sMsgBoxWalkawayDisabled
 03000f9e l 00000001 sMsgBoxIsCancelable
 03000f9f l 00000001 sQuestLogInput
@@ -4458,16 +4458,16 @@
 080697f4 g 00000008 SetupNativeScript
 080697fc g 00000008 StopScript
 08069804 g 0000007e RunScriptCommand
-08069884 g 00000028 ScriptPush
-080698ac g 00000022 ScriptPop
+08069884 l 00000028 ScriptPush
+080698ac l 00000022 ScriptPop
 080698d0 g 00000004 ScriptJump
 080698d4 g 00000014 ScriptCall
 080698e8 g 00000010 ScriptReturn
 080698f8 g 00000016 ScriptReadHalfword
 08069910 g 00000030 ScriptReadWord
-08069940 g 0000000c ScriptContext2_Enable
-0806994c g 0000000c ScriptContext2_Disable
-08069958 g 0000000c ScriptContext2_IsEnabled
+08069940 g 0000000c LockPlayerFieldControls
+0806994c g 0000000c UnlockPlayerFieldControls
+08069958 g 0000000c ArePlayerFieldControlsLocked
 08069964 g 0000000c SetQuestLogInputIsDpadFlag
 08069970 g 0000000c ClearQuestLogInputIsDpadFlag
 0806997c g 0000001a IsQuestLogInputDpad
@@ -4484,16 +4484,16 @@
 08069a2c g 0000000c MsgSetNotSignPost
 08069a38 g 0000001a IsMsgSignPost
 08069a54 g 0000000e ResetFacingNpcOrSignPostVars
-08069a64 g 0000001a ScriptContext1_IsScriptSetUp
-08069a80 g 00000028 ScriptContext1_Init
-08069aa8 g 0000003c ScriptContext2_RunScript
-08069ae4 g 00000044 ScriptContext1_SetupScript
-08069b28 g 0000000c ScriptContext1_Stop
-08069b34 g 00000014 EnableBothScriptContexts
-08069b48 g 00000038 ScriptContext2_RunNewScript
-08069b80 g 0000003e mapheader_get_tagged_pointer
-08069bc0 g 00000016 mapheader_run_script_by_tag
-08069bd8 g 00000060 mapheader_get_first_match_from_tagged_ptr_list
+08069a64 g 0000001a ScriptContext_IsEnabled
+08069a80 g 00000028 ScriptContext_Init
+08069aa8 g 0000003c ScriptContext_RunScript
+08069ae4 g 00000044 ScriptContext_SetupScript
+08069b28 g 0000000c ScriptContext_Stop
+08069b34 g 00000014 ScriptContext_Enable
+08069b48 g 00000038 RunScriptImmediately
+08069b80 l 0000003e MapHeaderGetScriptTable
+08069bc0 l 00000016 MapHeaderRunScriptType
+08069bd8 l 00000060 MapHeaderCheckScriptTable
 08069c38 g 0000000c RunOnLoadMapScript
 08069c44 g 0000000c RunOnTransitionMapScript
 08069c50 g 0000000c RunOnResumeMapScript
@@ -4507,7 +4507,7 @@
 08069d8c g 00000070 GetRamScript
 08069dfc g 0000004c ValidateRamScript
 08069e48 g 0000005c GetSavedRamScriptIfValid
-08069ea4 g 0000002c MEventSetRamScript
+08069ea4 g 0000002c InitRamScript_NoObjectEvent
 08069ed0 g 00000004 ScrCmd_nop
 08069ed0 l 00000000 .gcc2_compiled.
 08069ed4 g 00000004 ScrCmd_nop1

pokeleafgreen_rev1.sym

@@ -208,7 +208,7 @@
 0203709a g 00000002 sCurrentSpecialObjectPaletteTag
 0203709c l 00000001 sMessageBoxType
 020370a0 g 00000001 gWalkAwayFromSignInhibitTimer
-020370a4 g 00000004 gRAMScriptPtr
+020370a4 g 00000004 gRamScriptRetAddr
 020370a8 l 00000004 sAddressOffset
 020370ac l 00000001 sQuestLogWaitButtonPressTimer
 020370ae l 00000002 sPauseCounter
@@ -660,12 +660,12 @@
 03000e9a l 00000002 sVerticalCameraPan
 03000e9c l 00000001 gUnknown_3000E9C
 03000ea0 l 00000004 sFieldCameraPanningCallback
-03000ea8 l 00000001 sScriptContext1Status
+03000ea8 l 00000001 sGlobalScriptContextStatus
 03000eac l 00000004 sUnusedVariable1
-03000eb0 l 00000074 sScriptContext1
+03000eb0 l 00000074 sGlobalScriptContext
 03000f24 l 00000004 sUnusedVariable2
-03000f28 l 00000074 sScriptContext2
-03000f9c l 00000001 sScriptContext2Enabled
+03000f28 l 00000074 sImmediateScriptContext
+03000f9c l 00000001 sLockFieldControls
 03000f9d l 00000001 sMsgBoxWalkawayDisabled
 03000f9e l 00000001 sMsgBoxIsCancelable
 03000f9f l 00000001 sQuestLogInput
@@ -4458,16 +4458,16 @@
 08069808 g 00000008 SetupNativeScript
 08069810 g 00000008 StopScript
 08069818 g 0000007e RunScriptCommand
-08069898 g 00000028 ScriptPush
-080698c0 g 00000022 ScriptPop
+08069898 l 00000028 ScriptPush
+080698c0 l 00000022 ScriptPop
 080698e4 g 00000004 ScriptJump
 080698e8 g 00000014 ScriptCall
 080698fc g 00000010 ScriptReturn
 0806990c g 00000016 ScriptReadHalfword
 08069924 g 00000030 ScriptReadWord
-08069954 g 0000000c ScriptContext2_Enable
-08069960 g 0000000c ScriptContext2_Disable
-0806996c g 0000000c ScriptContext2_IsEnabled
+08069954 g 0000000c LockPlayerFieldControls
+08069960 g 0000000c UnlockPlayerFieldControls
+0806996c g 0000000c ArePlayerFieldControlsLocked
 08069978 g 0000000c SetQuestLogInputIsDpadFlag
 08069984 g 0000000c ClearQuestLogInputIsDpadFlag
 08069990 g 0000001a IsQuestLogInputDpad
@@ -4484,16 +4484,16 @@
 08069a40 g 0000000c MsgSetNotSignPost
 08069a4c g 0000001a IsMsgSignPost
 08069a68 g 0000000e ResetFacingNpcOrSignPostVars
-08069a78 g 0000001a ScriptContext1_IsScriptSetUp
-08069a94 g 00000028 ScriptContext1_Init
-08069abc g 0000003c ScriptContext2_RunScript
-08069af8 g 00000044 ScriptContext1_SetupScript
-08069b3c g 0000000c ScriptContext1_Stop
-08069b48 g 00000014 EnableBothScriptContexts
-08069b5c g 00000038 ScriptContext2_RunNewScript
-08069b94 g 0000003e mapheader_get_tagged_pointer
-08069bd4 g 00000016 mapheader_run_script_by_tag
-08069bec g 00000060 mapheader_get_first_match_from_tagged_ptr_list
+08069a78 g 0000001a ScriptContext_IsEnabled
+08069a94 g 00000028 ScriptContext_Init
+08069abc g 0000003c ScriptContext_RunScript
+08069af8 g 00000044 ScriptContext_SetupScript
+08069b3c g 0000000c ScriptContext_Stop
+08069b48 g 00000014 ScriptContext_Enable
+08069b5c g 00000038 RunScriptImmediately
+08069b94 l 0000003e MapHeaderGetScriptTable
+08069bd4 l 00000016 MapHeaderRunScriptType
+08069bec l 00000060 MapHeaderCheckScriptTable
 08069c4c g 0000000c RunOnLoadMapScript
 08069c58 g 0000000c RunOnTransitionMapScript
 08069c64 g 0000000c RunOnResumeMapScript
@@ -4507,7 +4507,7 @@
 08069da0 g 00000070 GetRamScript
 08069e10 g 0000004c ValidateRamScript
 08069e5c g 0000005c GetSavedRamScriptIfValid
-08069eb8 g 0000002c MEventSetRamScript
+08069eb8 g 0000002c InitRamScript_NoObjectEvent
 08069ee4 g 00000004 ScrCmd_nop
 08069ee4 l 00000000 .gcc2_compiled.
 08069ee8 g 00000004 ScrCmd_nop1