Merge pull request #1741 from tustin2121/tustin2121-patch-scriptcontext

This commit is contained in:
GriffinRichards
2022-08-15 20:50:31 +00:00
parent e1930820f2
commit eb2ee02306
+15 -15
View File
@@ -779,10 +779,10 @@
03000e2a l 00000002 sVerticalCameraPan 03000e2a l 00000002 sVerticalCameraPan
03000e2c l 00000001 sBikeCameraPanFlag 03000e2c l 00000001 sBikeCameraPanFlag
03000e30 l 00000004 sFieldCameraPanningCallback 03000e30 l 00000004 sFieldCameraPanningCallback
03000e38 l 00000001 sScriptContext1Status 03000e38 l 00000001 sGlobalScriptContextStatus
03000e40 l 00000074 sScriptContext1 03000e40 l 00000074 sGlobalScriptContext
03000eb8 l 00000074 sScriptContext2 03000eb8 l 00000074 sImmediateScriptContext
03000f2c l 00000001 sScriptContext2Enabled 03000f2c l 00000001 sLockFieldControls
03000f30 l 00000001 sBrailleWindowId 03000f30 l 00000001 sBrailleWindowId
03000f34 l 00000001 sTilesetDMA3TransferBufferSize 03000f34 l 00000001 sTilesetDMA3TransferBufferSize
03000f36 l 00000002 sPrimaryTilesetAnimCounter 03000f36 l 00000002 sPrimaryTilesetAnimCounter
@@ -5913,16 +5913,16 @@
08098dfc g 00000010 ScriptReturn 08098dfc g 00000010 ScriptReturn
08098e0c g 00000016 ScriptReadHalfword 08098e0c g 00000016 ScriptReadHalfword
08098e24 g 00000030 ScriptReadWord 08098e24 g 00000030 ScriptReadWord
08098e54 g 0000000c ScriptContext2_Enable 08098e54 g 0000000c LockPlayerFieldControls
08098e60 g 0000000c ScriptContext2_Disable 08098e60 g 0000000c UnlockPlayerFieldControls
08098e6c g 0000000c ScriptContext2_IsEnabled 08098e6c g 0000000c ArePlayerFieldControlsLocked
08098e78 g 0000001a ScriptContext1_IsScriptSetUp 08098e78 g 0000001a ScriptContext_IsEnabled
08098e94 g 00000028 ScriptContext1_Init 08098e94 g 00000028 ScriptContext_Init
08098ebc g 0000003c ScriptContext2_RunScript 08098ebc g 0000003c ScriptContext_RunScript
08098ef8 g 00000038 ScriptContext1_SetupScript 08098ef8 g 00000038 ScriptContext_SetupScript
08098f30 g 0000000c ScriptContext1_Stop 08098f30 g 0000000c ScriptContext_Stop
08098f3c g 00000014 EnableBothScriptContexts 08098f3c g 00000014 ScriptContext_Enable
08098f50 g 00000038 ScriptContext2_RunNewScript 08098f50 g 00000038 RunScriptImmediately
08098f88 g 0000003e MapHeaderGetScriptTable 08098f88 g 0000003e MapHeaderGetScriptTable
08098fc8 g 00000016 MapHeaderRunScriptType 08098fc8 g 00000016 MapHeaderRunScriptType
08098fe0 g 00000060 MapHeaderCheckScriptTable 08098fe0 g 00000060 MapHeaderCheckScriptTable
@@ -14676,7 +14676,7 @@
0819f8e0 l 000000bc Swap_CreateMonSprite 0819f8e0 l 000000bc Swap_CreateMonSprite
0819f99c g 000000b4 BufferApprenticeChallengeText 0819f99c g 000000b4 BufferApprenticeChallengeText
0819f99c l 00000000 .gcc2_compiled. 0819f99c l 00000000 .gcc2_compiled.
0819fa50 g 0000000a Apprentice_EnableBothScriptContexts 0819fa50 g 0000000a Apprentice_ScriptContext_Enable
0819fa5c g 00000044 ResetApprenticeStruct 0819fa5c g 00000044 ResetApprenticeStruct
0819faa0 g 00000110 ResetAllApprenticeData 0819faa0 g 00000110 ResetAllApprenticeData
0819fbb0 l 00000018 GivenApprenticeLvlMode 0819fbb0 l 00000018 GivenApprenticeLvlMode