summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-09-22 01:04:02 -0700
committerYamaArashi <shadow962@live.com>2016-09-22 01:04:02 -0700
commit7d57a4fc2384faa07e82112cf530aef2beb8869d (patch)
tree06f7a9d83330ccbf878757e4891270871d8bc4d8
parent2ac23e201bddac0793e763c907f7e4ae362236e4 (diff)
rename some script functions
Diffstat
-rw-r--r--asm/rom4.s88
-rw-r--r--asm/rom5.s440
-rw-r--r--asm/rom_8040EB4.s8
-rw-r--r--asm/rom_8065394.s28
-rw-r--r--include/script.h42
-rw-r--r--src/scrcmd.c460
-rw-r--r--src/script.c90
7 files changed, 578 insertions, 578 deletions
diff --git a/asm/rom4.s b/asm/rom4.s
index aa8f661af..90882d660 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -271,7 +271,7 @@ _08052E7E:
bl sub_8145A78
bl sub_8052E04
ldr r0, _08052F58
- bl script_env_2_execute_new_script
+ bl ScriptContext2_RunNewScript
pop {r4,r5}
pop {r0}
bx r0
@@ -290,7 +290,7 @@ _08052F58: .4byte gUnknown_0819FA81
sub_8052F5C: @ 8052F5C
push {lr}
ldr r0, _08052F88
- bl script_env_2_execute_new_script
+ bl ScriptContext2_RunNewScript
ldr r1, _08052F8C
movs r0, 0x92
lsls r0, 3
@@ -348,7 +348,7 @@ new_game: @ 8052FCC
ldr r0, _0805300C
bl FlagReset
ldr r0, _08053010
- bl script_env_2_execute_new_script
+ bl ScriptContext2_RunNewScript
pop {r0}
bx r0
.align 2, 0
@@ -3000,7 +3000,7 @@ c1_overworld_normal: @ 80542F8
adds r1, r5, 0
adds r2, r4, 0
bl process_overworld_input
- bl script_env_2_is_enabled
+ bl ScriptContext2_IsEnabled
lsls r0, 24
cmp r0, 0
bne _08054346
@@ -3008,7 +3008,7 @@ c1_overworld_normal: @ 80542F8
bl sub_8068024
cmp r0, 0x1
bne _0805433C
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl HideMapNamePopUpWindow
b _08054346
_0805433C:
@@ -3045,7 +3045,7 @@ _0805436C: .4byte c2_overworld
thumb_func_start c2_overworld_basic
c2_overworld_basic: @ 8054370
push {lr}
- bl script_env_2_run_current_script
+ bl ScriptContext2_RunScript
bl RunTasks
bl AnimateSprites
bl CameraUpdate
@@ -3139,8 +3139,8 @@ CB2_NewGame: @ 8054410
bl NewGameInitData
bl player_avatar_init_params_reset
bl PlayTimeCounter_Start
- bl script_env_1_init
- bl script_env_2_disable
+ bl ScriptContext1_Init
+ bl ScriptContext2_Disable
ldr r1, _08054454
ldr r0, _08054458
str r0, [r1]
@@ -3180,8 +3180,8 @@ c2_whiteout: @ 8054468
bl ResetSafariZoneFlag_
bl sub_8052F5C
bl player_avatar_init_params_reset
- bl script_env_1_init
- bl script_env_2_disable
+ bl ScriptContext1_Init
+ bl ScriptContext2_Disable
ldr r1, _080544CC
ldr r0, _080544D0
str r0, [r1]
@@ -3212,8 +3212,8 @@ _080544D8: .4byte c2_overworld
CB2_LoadMap: @ 80544DC
push {lr}
bl FieldClearVBlankHBlankCallbacks
- bl script_env_1_init
- bl script_env_2_disable
+ bl ScriptContext1_Init
+ bl ScriptContext2_Disable
movs r0, 0
bl set_callback1
ldr r0, _08054500
@@ -3257,8 +3257,8 @@ sub_8054534: @ 8054534
cmp r0, 0
bne _08054554
bl FieldClearVBlankHBlankCallbacks
- bl script_env_1_init
- bl script_env_2_disable
+ bl ScriptContext1_Init
+ bl ScriptContext2_Disable
movs r0, 0
bl set_callback1
_08054554:
@@ -3397,8 +3397,8 @@ sub_805465C: @ 805465C
ldr r1, _08054694
ldr r0, _08054698
str r0, [r1]
- bl script_env_1_init
- bl script_env_2_disable
+ bl ScriptContext1_Init
+ bl ScriptContext2_Disable
bl c2_exit_to_overworld_2_switch
pop {r0}
bx r0
@@ -3503,8 +3503,8 @@ CB2_ContinueSavedGame: @ 8054734
bl sub_805308C
bl sub_8055FC0
bl PlayTimeCounter_Start
- bl script_env_1_init
- bl script_env_2_disable
+ bl ScriptContext1_Init
+ bl ScriptContext2_Disable
bl sub_80479F8
cmp r0, 0x1
bne _08054788
@@ -3639,8 +3639,8 @@ _08054854:
.4byte _08054930
_0805488C:
bl FieldClearVBlankHBlankCallbacks
- bl script_env_1_init
- bl script_env_2_disable
+ bl ScriptContext1_Init
+ bl ScriptContext2_Disable
bl sub_8054F70
bl sub_8054BA8
b _08054928
@@ -5015,7 +5015,7 @@ _0805538C: .4byte 0x03000584
sub_8055390: @ 8055390
push {r4,lr}
adds r4, r0, 0
- bl script_env_2_is_enabled
+ bl ScriptContext2_IsEnabled
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5064,7 +5064,7 @@ sub_80553E0: @ 80553E0
thumb_func_start sub_80553E4
sub_80553E4: @ 80553E4
push {r4,lr}
- bl script_env_2_is_enabled
+ bl ScriptContext2_IsEnabled
lsls r0, 24
lsrs r0, 24
movs r4, 0x11
@@ -5093,7 +5093,7 @@ sub_8055408: @ 8055408
cmp r0, 0x2
bhi _08055424
movs r4, 0x1A
- bl script_env_2_disable
+ bl ScriptContext2_Disable
ldr r0, _08055434
bl sub_80543DC
_08055424:
@@ -5118,7 +5118,7 @@ sub_8055438: @ 8055438
cmp r0, 0x2
bhi _08055454
movs r4, 0x1A
- bl script_env_2_disable
+ bl ScriptContext2_Disable
ldr r0, _08055464
bl sub_80543DC
_08055454:
@@ -5193,7 +5193,7 @@ sub_80554BC: @ 80554BC
cmp r0, 0x1
bne _080554D4
ldr r0, _080554DC
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
ldr r0, _080554E0
bl sub_80543DC
_080554D4:
@@ -5621,7 +5621,7 @@ _080557E2:
thumb_func_start sub_80557E8
sub_80557E8: @ 80557E8
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
pop {r0}
bx r0
thumb_func_end sub_80557E8
@@ -5632,7 +5632,7 @@ sub_80557F4: @ 80557F4
movs r0, 0x6
bl audio_play
bl sub_8071310
- bl script_env_2_enable
+ bl ScriptContext2_Enable
pop {r0}
bx r0
thumb_func_end sub_80557F4
@@ -5644,8 +5644,8 @@ sub_8055808: @ 8055808
movs r0, 0x5
bl audio_play
adds r0, r4, 0
- bl script_env_1_execute_new_script
- bl script_env_2_enable
+ bl ScriptContext1_SetupScript
+ bl ScriptContext2_Enable
pop {r4}
pop {r0}
bx r0
@@ -5657,8 +5657,8 @@ sub_8055824: @ 8055824
movs r0, 0x6
bl audio_play
ldr r0, _0805583C
- bl script_env_1_execute_new_script
- bl script_env_2_enable
+ bl ScriptContext1_SetupScript
+ bl ScriptContext2_Enable
pop {r0}
bx r0
.align 2, 0
@@ -5672,8 +5672,8 @@ sub_8055840: @ 8055840
movs r0, 0x5
bl audio_play
adds r0, r4, 0
- bl script_env_1_execute_new_script
- bl script_env_2_enable
+ bl ScriptContext1_SetupScript
+ bl ScriptContext2_Enable
pop {r4}
pop {r0}
bx r0
@@ -5683,8 +5683,8 @@ sub_8055840: @ 8055840
sub_805585C: @ 805585C
push {lr}
ldr r0, _0805586C
- bl script_env_1_execute_new_script
- bl script_env_2_enable
+ bl ScriptContext1_SetupScript
+ bl ScriptContext2_Enable
pop {r0}
bx r0
.align 2, 0
@@ -16055,7 +16055,7 @@ _08059E80: .4byte 0x0202e858
sub_8059E84: @ 8059E84
push {r4,lr}
adds r4, r0, 0
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r1, _08059EA0
movs r0, 0x1
strb r0, [r1, 0x6]
@@ -16163,7 +16163,7 @@ sub_8059F40: @ 8059F40
ldr r1, _08059F8C
movs r0, 0
strb r0, [r1, 0x6]
- bl script_env_2_disable
+ bl ScriptContext2_Disable
ldr r0, _08059F90
bl FindTaskIdByFunc
lsls r0, 24
@@ -16355,7 +16355,7 @@ sub_805A0D8: @ 805A0D8
ldr r1, _0805A0FC
movs r0, 0x1
strb r0, [r1, 0x6]
- bl script_env_2_enable
+ bl ScriptContext2_Enable
movs r0, 0x2D
bl audio_play
movs r0, 0x1
@@ -16478,7 +16478,7 @@ sub_805A1B8: @ 805A1B8
lsrs r1, 24
adds r0, r5, 0
bl FieldObjectSetSpecialAnim
- bl script_env_2_disable
+ bl ScriptContext2_Disable
ldr r1, _0805A204
movs r0, 0
strb r0, [r1, 0x6]
@@ -16503,7 +16503,7 @@ sub_805A20C: @ 805A20C
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl sav1_reset_battle_music_maybe
bl sub_8053F84
ldr r2, _0805A258
@@ -16623,7 +16623,7 @@ sub_805A2D0: @ 805A2D0
bl FieldObjectSetSpecialAnim
movs r0, 0
strb r0, [r6, 0x6]
- bl script_env_2_disable
+ bl ScriptContext2_Disable
ldrb r1, [r4, 0x1A]
lsls r0, r1, 4
adds r0, r1
@@ -16704,7 +16704,7 @@ _0805A3B0: .4byte 0x03004b20
sub_805A3B4: @ 805A3B4
push {r4,lr}
adds r4, r0, 0
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r1, _0805A3D0
movs r0, 0x1
strb r0, [r1, 0x6]
@@ -17204,7 +17204,7 @@ _0805A780:
ldr r1, _0805A7B4
movs r0, 0
strb r0, [r1, 0x6]
- bl script_env_2_disable
+ bl ScriptContext2_Disable
ldrh r0, [r5, 0x26]
lsls r0, 24
lsrs r0, 24
@@ -17403,7 +17403,7 @@ fishF: @ 805A914
ldr r1, _0805A94C
movs r0, 0
strb r0, [r1, 0x6]
- bl script_env_2_disable
+ bl ScriptContext2_Disable
bl sub_806451C
bl MenuZeroFillScreen
movs r0, 0
diff --git a/asm/rom5.s b/asm/rom5.s
index 71ce6d1aa..f4dda2c3f 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -6891,7 +6891,7 @@ _0807E344:
_0807E34C: .4byte REG_BLDCNT
_0807E350: .4byte REG_WININ
_0807E354:
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
adds r0, r4, 0
bl DestroyTask
_0807E35E:
@@ -11867,7 +11867,7 @@ task0A_asap_script_env_2_enable_and_set_ctx_running: @ 8080970
bne _08080988
adds r0, r4, 0
bl DestroyTask
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
_08080988:
pop {r4}
pop {r0}
@@ -11877,7 +11877,7 @@ _08080988:
thumb_func_start sub_8080990
sub_8080990: @ 8080990
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl sub_8053E90
bl pal_fill_black
ldr r0, _080809AC
@@ -11892,7 +11892,7 @@ _080809AC: .4byte task0A_asap_script_env_2_enable_and_set_ctx_running
thumb_func_start sub_80809B0
sub_80809B0: @ 80809B0
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl pal_fill_black
ldr r0, _080809C8
movs r1, 0xA
@@ -11954,7 +11954,7 @@ _08080A24:
bl sub_8080E70
cmp r0, 0x1
bne _08080A36
- bl script_env_2_disable
+ bl ScriptContext2_Disable
adds r0, r5, 0
bl DestroyTask
_08080A36:
@@ -11966,7 +11966,7 @@ _08080A36:
thumb_func_start sub_8080A3C
sub_8080A3C: @ 8080A3C
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl sub_8053E90
bl palette_bg_faded_fill_white
ldr r0, _08080A58
@@ -12022,7 +12022,7 @@ _08080AA6:
cmp r0, 0x1
bne _08080ABC
bl sub_8007B14
- bl script_env_2_disable
+ bl ScriptContext2_Disable
adds r0, r5, 0
bl DestroyTask
_08080ABC:
@@ -12034,7 +12034,7 @@ _08080ABC:
thumb_func_start sub_8080AC4
sub_8080AC4: @ 8080AC4
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl sub_8053E90
bl palette_bg_faded_fill_white
ldr r0, _08080AE0
@@ -12101,7 +12101,7 @@ mapldr_default: @ 8080B48
bl sub_8053E90
bl pal_fill_for_maplights
bl sub_8080AE4
- bl script_env_2_enable
+ bl ScriptContext2_Enable
pop {r0}
bx r0
thumb_func_end mapldr_default
@@ -12112,7 +12112,7 @@ sub_8080B60: @ 8080B60
bl sub_8053E90
bl pal_fill_black
bl sub_8080AE4
- bl script_env_2_enable
+ bl ScriptContext2_Enable
pop {r0}
bx r0
thumb_func_end sub_8080B60
@@ -12127,7 +12127,7 @@ sub_8080B78: @ 8080B78
ldr r0, _08080B98
movs r1, 0xA
bl CreateTask
- bl script_env_2_enable
+ bl ScriptContext2_Enable
pop {r0}
bx r0
.align 2, 0
@@ -12257,7 +12257,7 @@ _08080C9A:
strh r0, [r5, 0x8]
b _08080CAE
_08080CA4:
- bl script_env_2_disable
+ bl ScriptContext2_Disable
adds r0, r4, 0
bl DestroyTask
_08080CAE:
@@ -12348,7 +12348,7 @@ _08080D50:
strh r0, [r5, 0x8]
b _08080D6E
_08080D64:
- bl script_env_2_disable
+ bl ScriptContext2_Disable
adds r0, r4, 0
bl DestroyTask
_08080D6E:
@@ -12378,7 +12378,7 @@ task_map_chg_seq_0807E2CC: @ 8080D74
_08080D94: .4byte 0x03004b20
_08080D98:
bl player_bitmagic
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -12388,7 +12388,7 @@ _08080DA8:
cmp r0, 0
beq _08080DBE
bl sub_806451C
- bl script_env_2_disable
+ bl ScriptContext2_Disable
adds r0, r5, 0
bl DestroyTask
_08080DBE:
@@ -12424,7 +12424,7 @@ atk17_seteffectuser: @ 8080DEC
bl pal_fill_black
ldr r0, _08080E00
bl sub_8071284
- bl script_env_2_enable
+ bl ScriptContext2_Enable
pop {r0}
bx r0
.align 2, 0
@@ -12439,7 +12439,7 @@ task_mpl_807E3C8: @ 8080E04
bl sub_8080E70
cmp r0, 0x1
bne _08080E20
- bl script_env_2_disable
+ bl ScriptContext2_Disable
adds r0, r4, 0
bl DestroyTask
bl sub_8064E2C
@@ -12452,7 +12452,7 @@ _08080E20:
thumb_func_start sub_8080E28
sub_8080E28: @ 8080E28
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl pal_fill_black
ldr r0, _08080E40
movs r1, 0xA
@@ -12466,7 +12466,7 @@ _08080E40: .4byte task_mpl_807E3C8
thumb_func_start sub_8080E44
sub_8080E44: @ 8080E44
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl sub_8053E90
bl pal_fill_black
ldr r0, _08080E60
@@ -12508,7 +12508,7 @@ _08080E84:
thumb_func_start sub_8080E88
sub_8080E88: @ 8080E88
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl sub_8053FF8
bl sub_8080918
bl play_some_sound
@@ -12531,7 +12531,7 @@ _08080EBC: .4byte task0A_fade_n_map_maybe
thumb_func_start sp13E_warp_to_last_warp
sp13E_warp_to_last_warp: @ 8080EC0
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl sub_8053FF8
bl sub_8080918
bl play_some_sound
@@ -12552,7 +12552,7 @@ _08080EEC: .4byte task0A_fade_n_map_maybe
thumb_func_start sub_8080EF0
sub_8080EF0: @ 8080EF0
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r0, _08080F08
ldr r1, _08080F0C
str r1, [r0]
@@ -12587,7 +12587,7 @@ sub_8080F2C: @ 8080F2C
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl script_env_2_enable
+ bl ScriptContext2_Enable
adds r0, r4, 0
movs r1, 0xA
bl sub_8086A2C
@@ -12599,7 +12599,7 @@ sub_8080F2C: @ 8080F2C
thumb_func_start sub_8080F48
sub_8080F48: @ 8080F48
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
movs r0, 0xA
bl sub_80871B8
pop {r0}
@@ -12609,7 +12609,7 @@ sub_8080F48: @ 8080F48
thumb_func_start sub_8080F58
sub_8080F58: @ 8080F58
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
movs r0, 0xA
bl sub_8087654
pop {r0}
@@ -12619,7 +12619,7 @@ sub_8080F58: @ 8080F58
thumb_func_start sub_8080F68
sub_8080F68: @ 8080F68
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl sub_8053FF8
bl sub_8080918
movs r0, 0x2D
@@ -12641,7 +12641,7 @@ _08080F98: .4byte sub_8080B78
thumb_func_start sub_8080F9C
sub_8080F9C: @ 8080F9C
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl sub_8080918
ldr r0, _08080FB8
movs r1, 0xA
@@ -12683,7 +12683,7 @@ _08080FEC:
beq _08081012
b _08081022
_08080FF2:
- bl script_env_2_enable
+ bl ScriptContext2_Enable
b _0808100A
_08080FF8:
bl sub_8080E64
@@ -12715,7 +12715,7 @@ _08081028: .4byte sub_8054588
thumb_func_start sub_808102C
sub_808102C: @ 808102C
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl sub_8053FF8
bl sub_8080918
movs r0, 0x9
@@ -12835,7 +12835,7 @@ _08081118:
b _08081152
_0808111E:
bl player_bitmagic
- bl script_env_2_enable
+ bl ScriptContext2_Enable
b _0808113A
_08081128:
bl sub_8080E64
@@ -13063,7 +13063,7 @@ _080812F0:
b _0808132A
_080812F6:
bl player_bitmagic
- bl script_env_2_enable
+ bl ScriptContext2_Enable
b _08081312
_08081300:
bl sub_8080E64
@@ -13095,7 +13095,7 @@ _08081330: .4byte sub_8054534
thumb_func_start sub_8081334
sub_8081334: @ 8081334
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl sub_8053FF8
bl sub_8080918
bl play_some_sound
@@ -13327,7 +13327,7 @@ sub_80814E8: @ 80814E8
lsls r0, 24
cmp r0, 0
bne _08081504
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
adds r0, r4, 0
bl DestroyTask
_08081504:
@@ -13438,7 +13438,7 @@ _080815AE:
movs r1, 0x50
bl sub_8081534
bl sub_8081510
- bl script_env_2_enable
+ bl ScriptContext2_Enable
add sp, 0x8
pop {r4,r5}
pop {r0}
@@ -13688,7 +13688,7 @@ _080817BC:
lsls r0, 24
cmp r0, 0
bne _08081892
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
movs r0, 0x3
strh r0, [r7]
b _08081892
@@ -13781,7 +13781,7 @@ _08081852:
adds r1, 0x2
ldrh r0, [r7, 0x14]
strh r0, [r1]
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
adds r0, r4, 0
bl DestroyTask
_08081892:
@@ -13888,7 +13888,7 @@ task50_0807F0C8: @ 808193C
bne _08081958
adds r0, r4, 0
bl DestroyTask
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
_08081958:
pop {r4}
pop {r0}
@@ -13992,7 +13992,7 @@ _08081A14:
thumb_func_start sub_8081A18
sub_8081A18: @ 8081A18
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl player_bitmagic
bl sub_80597F4
ldr r1, _08081A50
@@ -14021,7 +14021,7 @@ _08081A58: .4byte 0x020239f8
thumb_func_start sub_8081A5C
sub_8081A5C: @ 8081A5C
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl player_bitmagic
bl sub_80597F4
ldr r1, _08081A98
@@ -14052,7 +14052,7 @@ _08081AA0: .4byte 0x020239f8
thumb_func_start sub_8081AA4
sub_8081AA4: @ 8081AA4
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl player_bitmagic
bl sub_80597F4
ldr r1, _08081AD0
@@ -14098,7 +14098,7 @@ sub_8081AFC: @ 8081AFC
lsls r1, 1
movs r2, 0x5
bl CreateMaleMon
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r1, _08081B30
ldr r0, _08081B34
str r0, [r1, 0x8]
@@ -14122,7 +14122,7 @@ _08081B38: .4byte 0x020239f8
thumb_func_start sub_8081B3C
sub_8081B3C: @ 8081B3C
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r1, _08081B6C
ldr r0, _08081B70
str r0, [r1, 0x8]
@@ -14149,7 +14149,7 @@ _08081B74: .4byte 0x020239f8
thumb_func_start sub_8081B78
sub_8081B78: @ 8081B78
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r1, _08081BAC
ldr r0, _08081BB0
str r0, [r1, 0x8]
@@ -14178,7 +14178,7 @@ _08081BB4: .4byte 0x020239f8
thumb_func_start sub_8081BB8
sub_8081BB8: @ 8081BB8
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r1, _08081BE8
ldr r0, _08081BEC
str r0, [r1, 0x8]
@@ -14206,7 +14206,7 @@ _08081BF4: .4byte 0x000001cf
thumb_func_start sub_8081BF8
sub_8081BF8: @ 8081BF8
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r1, _08081C20
ldr r0, _08081C24
str r0, [r1, 0x8]
@@ -14247,7 +14247,7 @@ _08081C4C: .4byte 0x000001cf
thumb_func_start sub_8081C50
sub_8081C50: @ 8081C50
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r1, _08081C80
ldr r0, _08081C84
str r0, [r1, 0x8]
@@ -15347,8 +15347,8 @@ SingleTrainerWantsBattle: @ 80824C0
adds r0, r1, 0
bl sub_80823C8
ldr r0, _08082500
- bl script_env_1_execute_new_script
- bl script_env_2_enable
+ bl ScriptContext1_SetupScript
+ bl ScriptContext2_Enable
pop {r4}
pop {r0}
bx r0
@@ -15498,7 +15498,7 @@ sub_80825E4: @ 80825E4
ldr r0, _08082608
str r0, [r1, 0x8]
bl task_add_01_battle_start_with_music_and_stats
- bl sub_80655F0
+ bl ScriptContext1_Stop
pop {r0}
bx r0
.align 2, 0
@@ -15594,7 +15594,7 @@ sub_80826B0: @ 80826B0
ldr r0, _080826D4
str r0, [r1, 0x8]
bl task_add_01_battle_start_with_music_and_stats
- bl sub_80655F0
+ bl ScriptContext1_Stop
pop {r0}
bx r0
.align 2, 0
@@ -17305,7 +17305,7 @@ _0808335A:
ldrh r1, [r0]
ldr r0, _080833A0
bl sub_8082D4C
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
adds r0, r5, 0
bl DestroyTask
b _080833B6
@@ -17342,7 +17342,7 @@ sub_80833C4: @ 80833C4
cmp r0, 0
bne _080833E0
bl sub_8082D4C
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
adds r0, r4, 0
bl DestroyTask
_080833E0:
@@ -17364,7 +17364,7 @@ sub_80833EC: @ 80833EC
strh r0, [r1]
bl sub_8082D4C
bl textbox_close
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
adds r0, r4, 0
bl DestroyTask
pop {r4}
@@ -17385,7 +17385,7 @@ sub_8083418: @ 8083418
strh r0, [r1]
bl sub_8082D4C
bl textbox_close
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
adds r0, r4, 0
bl DestroyTask
pop {r4}
@@ -17569,7 +17569,7 @@ _08083578:
cmp r1, r0
blt _08083578
_08083586:
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
adds r0, r5, 0
bl DestroyTask
b _080835CE
@@ -17596,7 +17596,7 @@ _080835BC:
ldrb r0, [r0]
cmp r0, 0
bne _080835CE
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
adds r0, r5, 0
bl DestroyTask
_080835CE:
@@ -18197,7 +18197,7 @@ _08083A68:
bl MenuZeroFillScreen
adds r0, r4, 0
bl DestroyTask
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
_08083A7E:
pop {r4,r5}
pop {r0}
@@ -18217,7 +18217,7 @@ sub_8083A84: @ 8083A84
adds r1, r4, 0
adds r2, r5, 0
bl SetTaskFuncWithFollowupFunc
- bl sub_80655F0
+ bl ScriptContext1_Stop
pop {r4,r5}
pop {r0}
bx r0
@@ -18253,7 +18253,7 @@ _08083AD4:
beq _08083B20
b _08083B34
_08083ADE:
- bl script_env_2_enable
+ bl ScriptContext2_Enable
movs r0, 0x1
movs r1, 0
bl fade_screen
@@ -18342,7 +18342,7 @@ _08083B7C: .4byte sub_8083AAC
sub_8083B80: @ 8083B80
push {lr}
bl sub_8083B6C
- bl sub_80655F0
+ bl ScriptContext1_Stop
pop {r0}
bx r0
thumb_func_end sub_8083B80
@@ -18376,7 +18376,7 @@ unref_sub_8083BB0: @ 8083BB0
ldr r2, _08083BD8
adds r1, r4, 0
bl SetTaskFuncWithFollowupFunc
- bl sub_80655F0
+ bl ScriptContext1_Stop
pop {r4}
pop {r0}
bx r0
@@ -18493,7 +18493,7 @@ sub_8083CA4: @ 8083CA4
ldrb r0, [r0]
cmp r0, 0
bne _08083CBC
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
adds r0, r4, 0
bl DestroyTask
_08083CBC:
@@ -19989,7 +19989,7 @@ sub_80847D8: @ 80847D8
lsls r0, 24
lsrs r0, 24
bl DestroyTask
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
pop {r0}
bx r0
thumb_func_end sub_80847D8
@@ -21813,7 +21813,7 @@ sub_8085558: @ 8085558
cmp r4, 0
bne _08085590
ldr r0, _0808558C
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
movs r0, 0x1
b _08085592
.align 2, 0
@@ -24003,7 +24003,7 @@ mapldr_080842E8: @ 80865DC
ldr r0, _080865FC
movs r1, 0
bl CreateTask
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl player_bitmagic
ldr r1, _08086600
movs r0, 0
@@ -24106,7 +24106,7 @@ mapldr_08084390: @ 8086684
movs r1, 0x3
bl FieldObjectTurn
_080866C6:
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl player_bitmagic
ldr r1, _080866E8
movs r0, 0
@@ -24153,7 +24153,7 @@ _0808671E:
lsls r0, 24
cmp r0, 0
bne _08086738
- bl script_env_2_disable
+ bl ScriptContext2_Disable
bl sub_806451C
adds r0, r5, 0
bl DestroyTask
@@ -24171,7 +24171,7 @@ sub_8086748: @ 8086748
push {lr}
bl sub_8053E90
bl pal_fill_for_maplights
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl player_bitmagic
ldr r0, _0808676C
movs r1, 0
@@ -24527,7 +24527,7 @@ sub_80869F8: @ 80869F8
ldr r1, _08086A24
movs r0, 0
strb r0, [r1, 0x6]
- bl script_env_2_disable
+ bl ScriptContext2_Disable
bl CameraObjectReset1
bl sub_806451C
bl InstallCameraPanAheadCallback
@@ -24869,7 +24869,7 @@ sub_8086C94: @ 8086C94
push {lr}
bl sub_8053E90
bl pal_fill_for_maplights
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r0, _08086CB4
movs r1, 0
bl CreateTask
@@ -25177,7 +25177,7 @@ sub_8086ED4: @ 8086ED4
cmp r0, 0
beq _08086F18
bl CameraObjectReset1
- bl script_env_2_disable
+ bl ScriptContext2_Disable
movs r0, 0x4
bl GetGoSpeed0AnimId
adds r1, r0, 0
@@ -25272,7 +25272,7 @@ _08086FAC: .4byte 0x030048a0
sub_8086FB0: @ 8086FB0
push {r4,lr}
adds r4, r0, 0
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r1, _08086FCC
movs r0, 0x1
strb r0, [r1, 0x6]
@@ -25292,7 +25292,7 @@ waterfall_1_do_anim_probably: @ 8086FD0
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl script_env_2_enable
+ bl ScriptContext2_Enable
adds r0, r5, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
@@ -25380,7 +25380,7 @@ _0808706E:
lsrs r4, r0, 24
cmp r4, 0
bne _080870A4
- bl script_env_2_disable
+ bl ScriptContext2_Disable
ldr r0, _0808709C
strb r4, [r0, 0x6]
ldr r0, _080870A0
@@ -25483,7 +25483,7 @@ _08087134: .4byte 0x0202e858
dive_2_unknown: @ 8087138
push {r4,lr}
adds r4, r0, 0
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r1, _0808715C
movs r2, 0x26
ldrsh r0, [r4, r2]
@@ -25888,7 +25888,7 @@ mapldr_080851BC: @ 8087448
push {lr}
bl sub_8053E90
bl pal_fill_for_maplights
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r0, _08087468
movs r1, 0
str r1, [r0]
@@ -26067,7 +26067,7 @@ sub_808759C: @ 808759C
ldr r1, _080875CC
movs r0, 0
strb r0, [r1, 0x6]
- bl script_env_2_disable
+ bl ScriptContext2_Disable
bl sub_806451C
ldr r0, _080875D0
bl FindTaskIdByFunc
@@ -26457,7 +26457,7 @@ _080878A4:
thumb_func_start sub_80878A8
sub_80878A8: @ 80878A8
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl player_bitmagic
ldr r0, _080878C0
movs r1, 0x50
@@ -26642,7 +26642,7 @@ mapldr_080859D4: @ 8087A28
push {lr}
bl sub_8053E90
bl pal_fill_for_maplights
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl player_bitmagic
ldr r1, _08087A64
movs r0, 0
@@ -26770,7 +26770,7 @@ _08087B12:
negs r0, r0
ands r0, r1
strb r0, [r6, 0x1]
- bl script_env_2_disable
+ bl ScriptContext2_Disable
bl sub_806451C
ldr r0, _08087B58
bl FindTaskIdByFunc
@@ -26866,7 +26866,7 @@ _08087BE8: .4byte 0x03004b20
sub_8087BEC: @ 8087BEC
push {r4,lr}
adds r4, r0, 0
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl player_bitmagic
bl CameraObjectReset2
bl player_get_direction_lower_nybble
@@ -27102,7 +27102,7 @@ mapldr_08085D88: @ 8087DCC
push {lr}
bl sub_8053E90
bl pal_fill_for_maplights
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl player_bitmagic
ldr r1, _08087E0C
movs r0, 0
@@ -27403,7 +27403,7 @@ sub_8087FDC: @ 8087FDC
lsrs r0, 28
cmp r1, r0
bne _08088050
- bl script_env_2_disable
+ bl ScriptContext2_Disable
bl CameraObjectReset1
bl sub_806451C
ldr r0, _08088064
@@ -28620,7 +28620,7 @@ sub_8088984: @ 8088984
mov r6, r8
push {r6}
adds r4, r0, 0
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl player_bitmagic
ldr r5, _080889DC
movs r0, 0x1
@@ -28825,7 +28825,7 @@ sub_8088AF4: @ 8088AF4
movs r1, 0x1
bl sub_8127ED0
bl sub_806451C
- bl script_env_2_disable
+ bl ScriptContext2_Disable
movs r0, 0x9
bl FieldEffectActiveListRemove
ldr r0, _08088B64
@@ -55547,8 +55547,8 @@ _08095FC8:
movs r2, 0xD
movs r3, 0x9
bl MenuZeroFillWindowRect
- bl script_env_2_disable
- bl script_env_2_enable_and_set_ctx_running
+ bl ScriptContext2_Disable
+ bl EnableBothScriptContexts
adds r0, r5, 0
bl DestroyTask
b _080960F4
@@ -55705,7 +55705,7 @@ sub_8096100: @ 8096100
movs r0, 0
strh r0, [r1, 0x8]
strh r0, [r1, 0xA]
- bl script_env_2_enable
+ bl ScriptContext2_Enable
pop {r0}
bx r0
.align 2, 0
@@ -80663,7 +80663,7 @@ sub_80A2634: @ 80A2634
ldrb r0, [r0]
str r0, [r1]
ldr r0, _080A2650
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
pop {r0}
bx r0
.align 2, 0
@@ -81271,7 +81271,7 @@ _080A2ABC:
movs r1, 0x3A
bl FieldEffectStop
bl sub_8064E2C
- bl script_env_2_disable
+ bl ScriptContext2_Disable
pop {r4-r6}
pop {r0}
bx r0
@@ -81287,7 +81287,7 @@ sub_80A2B00: @ 80A2B00
bl audio_play
movs r0, 0x2
bl FieldEffectActiveListRemove
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
pop {r0}
bx r0
thumb_func_end sub_80A2B00
@@ -87595,7 +87595,7 @@ sub_80A5C9C: @ 80A5C9C
adds r0, r4, 0
bl DestroyTask
bl sub_8064E2C
- bl script_env_2_disable
+ bl ScriptContext2_Disable
pop {r4}
pop {r0}
bx r0
@@ -89642,7 +89642,7 @@ sub_80A6D1C: @ 80A6D1C
lsrs r5, r0, 24
cmp r5, 0x1
bne _080A6D80
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl player_bitmagic
bl sub_80594C0
bl sub_80597F4
@@ -89672,7 +89672,7 @@ _080A6D80:
strh r0, [r4]
_080A6D84:
ldr r0, _080A6D94
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
_080A6D8A:
movs r0, 0x1
pop {r4,r5}
@@ -104300,8 +104300,8 @@ _080AE00C: .4byte c2_exit_to_overworld_2_switch
thumb_func_start sub_80AE010
sub_80AE010: @ 80AE010
push {lr}
- bl script_env_2_disable
- bl script_env_2_enable_and_set_ctx_running
+ bl ScriptContext2_Disable
+ bl EnableBothScriptContexts
pop {r0}
bx r0
thumb_func_end sub_80AE010
@@ -114433,7 +114433,7 @@ CreateShopMenu: @ 80B2D54
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r1, _080B2D90
movs r0, 0
strb r4, [r1, 0xC]
@@ -114703,7 +114703,7 @@ HandleShopMenuQuit: @ 80B2F64
movs r3, 0x8
bl MenuZeroFillWindowRect
bl sub_80BE3BC
- bl script_env_2_disable
+ bl ScriptContext2_Disable
adds r0, r4, 0
bl DestroyTask
ldr r0, _080B2F9C
@@ -117427,7 +117427,7 @@ CreatePokemartMenu: @ 80B4550
pop {r0}
bx r0
.align 2, 0
-_080B4570: .4byte script_env_2_enable_and_set_ctx_running
+_080B4570: .4byte EnableBothScriptContexts
thumb_func_end CreatePokemartMenu
thumb_func_start CreateDecorationShop1Menu
@@ -117444,7 +117444,7 @@ CreateDecorationShop1Menu: @ 80B4574
pop {r0}
bx r0
.align 2, 0
-_080B4590: .4byte script_env_2_enable_and_set_ctx_running
+_080B4590: .4byte EnableBothScriptContexts
thumb_func_end CreateDecorationShop1Menu
thumb_func_start CreateDecorationShop2Menu
@@ -117461,7 +117461,7 @@ CreateDecorationShop2Menu: @ 80B4594
pop {r0}
bx r0
.align 2, 0
-_080B45B0: .4byte script_env_2_enable_and_set_ctx_running
+_080B45B0: .4byte EnableBothScriptContexts
thumb_func_end CreateDecorationShop2Menu
thumb_func_start sub_80B45B4
@@ -119307,7 +119307,7 @@ _080B532C:
bl MenuZeroFillWindowRect
adds r0, r4, 0
bl DestroyTask
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
_080B534E:
pop {r4,r5}
pop {r0}
@@ -119589,7 +119589,7 @@ _080B5542:
bl MenuZeroFillWindowRect
adds r0, r4, 0
bl DestroyTask
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
_080B556A:
pop {r4}
pop {r0}
@@ -119785,7 +119785,7 @@ _080B56D2:
bl MenuZeroFillWindowRect
adds r0, r5, 0
bl DestroyTask
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
_080B56F4:
pop {r4,r5}
pop {r0}
@@ -128240,7 +128240,7 @@ _080B95C0:
bl MenuZeroFillScreen
adds r0, r5, 0
bl DestroyTask
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
_080B95E6:
pop {r4,r5}
pop {r0}
@@ -133002,7 +133002,7 @@ sub_80BBB50: @ 80BBB50
lsrs r0, 24
cmp r0, 0x1
bne _080BBB80
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
adds r0, r4, 0
bl DestroyTask
_080BBB80:
@@ -133018,7 +133018,7 @@ _080BBB8C: .4byte 0x030048a0
sub_80BBB90: @ 80BBB90
push {r4,lr}
sub sp, 0x4
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl HideMapNamePopUpWindow
mov r4, sp
adds r4, 0x2
@@ -133602,7 +133602,7 @@ sub_80BC038: @ 80BC038
bl sub_80BBFD8
bl sub_80BB5E4
ldr r0, _080BC04C
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
pop {r0}
bx r0
.align 2, 0
@@ -133655,7 +133655,7 @@ _080BC09C:
beq _080BC0C4
b _080BC0E4
_080BC0A2:
- bl script_env_2_enable
+ bl ScriptContext2_Enable
movs r0, 0x1
strh r0, [r4, 0x8]
b _080BC0E4
@@ -133680,7 +133680,7 @@ _080BC0C4:
str r1, [r0]
ldr r0, _080BC0F4
bl SetMainCallback2
- bl script_env_2_disable
+ bl ScriptContext2_Disable
adds r0, r5, 0
bl DestroyTask
_080BC0E4:
@@ -134378,7 +134378,7 @@ sub_80BC62C: @ 80BC62C
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl sub_80F944C
bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed
lsls r0, r5, 2
@@ -135162,14 +135162,14 @@ sub_80BCC54: @ 80BCC54
cmp r4, 0
bne _080BCC8C
ldr r0, _080BCC88
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
b _080BCC92
.align 2, 0
_080BCC84: .4byte 0x00004054
_080BCC88: .4byte gUnknown_0815F399
_080BCC8C:
ldr r0, _080BCCA0
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
_080BCC92:
adds r0, r5, 0
bl DestroyTask
@@ -150782,7 +150782,7 @@ _080C48C4: .4byte sub_80C488C
sub_80C48C8: @ 80C48C8
push {lr}
sub sp, 0x4
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r0, _080C48F0
movs r1, 0xA
bl CreateTask
@@ -150844,7 +150844,7 @@ _080C493C: .4byte sub_80C2358
sub_80C4940: @ 80C4940
push {lr}
sub sp, 0x4
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r0, _080C4968
movs r1, 0xA
bl CreateTask
@@ -150880,7 +150880,7 @@ sub_80C4980: @ 80C4980
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r6, _080C49B8
adds r0, r6, 0
movs r1, 0
@@ -151148,8 +151148,8 @@ _080C4B8C: .4byte sub_80C4BA4
_080C4B90:
adds r0, r4, 0
bl DestroyTask
- bl script_env_2_disable
- bl script_env_2_enable_and_set_ctx_running
+ bl ScriptContext2_Disable
+ bl EnableBothScriptContexts
_080C4B9E:
pop {r4}
pop {r0}
@@ -151189,8 +151189,8 @@ sub_80C4BCC: @ 80C4BCC
bne _080C4BE8
adds r0, r1, 0
bl DestroyTask
- bl script_env_2_disable
- bl script_env_2_enable_and_set_ctx_running
+ bl ScriptContext2_Disable
+ bl EnableBothScriptContexts
_080C4BE8:
pop {r0}
bx r0
@@ -152800,7 +152800,7 @@ _080C580C:
ldr r0, _080C5820
strh r1, [r0]
_080C5810:
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
adds r0, r5, 0
bl DestroyTask
_080C581A:
@@ -152817,7 +152817,7 @@ sub_80C5824: @ 80C5824
ldr r0, _080C5838
movs r1, 0x50
bl CreateTask
- bl sub_80655F0
+ bl ScriptContext1_Stop
pop {r0}
bx r0
.align 2, 0
@@ -154288,7 +154288,7 @@ sub_80C639C: @ 80C639C
ldrb r0, [r0]
str r0, [r1]
ldr r0, _080C63B8
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
pop {r0}
bx r0
.align 2, 0
@@ -154420,7 +154420,7 @@ sub_80C6498: @ 80C6498
push {lr}
movs r1, 0x37
bl FieldEffectStop
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
pop {r0}
bx r0
thumb_func_end sub_80C6498
@@ -154433,7 +154433,7 @@ sub_80C64A8: @ 80C64A8
ldrb r0, [r0]
str r0, [r1]
ldr r0, _080C64C4
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
pop {r0}
bx r0
.align 2, 0
@@ -154607,7 +154607,7 @@ sub_80C65FC: @ 80C65FC
push {lr}
movs r1, 0x38
bl FieldEffectStop
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
pop {r0}
bx r0
thumb_func_end sub_80C65FC
@@ -154620,7 +154620,7 @@ sub_80C660C: @ 80C660C
ldrb r0, [r0]
str r0, [r1]
ldr r0, _080C6628
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
pop {r0}
bx r0
.align 2, 0
@@ -154752,7 +154752,7 @@ sub_80C6708: @ 80C6708
push {lr}
movs r1, 0x39
bl FieldEffectStop
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
pop {r0}
bx r0
thumb_func_end sub_80C6708
@@ -154874,7 +154874,7 @@ _080C6800:
bl CurrentMapDrawMetatileAt
movs r0, 0x3D
bl FieldEffectActiveListRemove
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
adds r0, r5, 0
bl DestroyTask
b _080C6834
@@ -155500,7 +155500,7 @@ _080C6D38: .4byte sub_80C6C64
sub_80C6D3C: @ 80C6D3C
push {r4,lr}
sub sp, 0x4
- bl script_env_2_enable
+ bl ScriptContext2_Enable
mov r4, sp
adds r4, 0x2
mov r0, sp
@@ -155734,7 +155734,7 @@ sub_80C6F28: @ 80C6F28
push {lr}
movs r1, 0x34
bl FieldEffectStop
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
pop {r0}
bx r0
thumb_func_end sub_80C6F28
@@ -156063,7 +156063,7 @@ sub_80C71A0: @ 80C71A0
bl SetPlayerAvatarTransitionFlags
adds r0, r4, 0
bl DestroyTask
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
pop {r4}
pop {r0}
bx r0
@@ -156673,7 +156673,7 @@ _080C7652:
bl audio_play
adds r0, r5, 0
bl DestroyTask
- bl script_env_2_disable
+ bl ScriptContext2_Disable
_080C7698:
pop {r4,r5}
pop {r0}
@@ -156697,7 +156697,7 @@ sub_80C76A0: @ 80C76A0
movs r1, 0xA
bl MapGridSetMetatileIdAt
bl DrawWholeMapView
- bl script_env_2_enable
+ bl ScriptContext2_Enable
movs r0, 0
str r0, [sp]
ldr r1, _080C76F4
@@ -157011,7 +157011,7 @@ sub_80C791C: @ 80C791C
ldr r0, _080C7954
movs r1, 0x50
bl CreateTask
- bl script_env_2_enable
+ bl ScriptContext2_Enable
pop {r0}
bx r0
.align 2, 0
@@ -158221,7 +158221,7 @@ _080C8224:
_080C8228: .4byte 0x0203880a
_080C822C:
ldr r0, _080C8238
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
movs r0, 0x1
_080C8234:
pop {r1}
@@ -158234,7 +158234,7 @@ _080C8238: .4byte gUnknown_081C3448
sub_80C823C: @ 80C823C
push {lr}
ldr r0, _080C8248
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
pop {r0}
bx r0
.align 2, 0
@@ -158260,7 +158260,7 @@ _080C8268:
cmp r0, 0x8
bne _080C829C
ldr r0, _080C828C
- bl script_env_2_execute_new_script
+ bl ScriptContext2_RunNewScript
bl warp_in
ldr r1, _080C8290
ldr r0, _080C8294
@@ -158278,8 +158278,8 @@ _080C829C:
cmp r0, 0x7
bne _080C82B0
ldr r0, _080C82B4
- bl script_env_1_execute_new_script
- bl sub_80655F0
+ bl ScriptContext1_SetupScript
+ bl ScriptContext1_Stop
ldr r0, _080C82B8
bl SetMainCallback2
_080C82B0:
@@ -160365,7 +160365,7 @@ _080C92B6:
bl GetOnOffBike
_080C92CA:
bl sub_8064E2C
- bl script_env_2_disable
+ bl ScriptContext2_Disable
adds r0, r5, 0
bl DestroyTask
pop {r4,r5}
@@ -160677,7 +160677,7 @@ sub_80C9520: @ 80C9520
movs r3, 0x13
bl MenuZeroFillWindowRect
bl sub_8064E2C
- bl script_env_2_disable
+ bl ScriptContext2_Disable
adds r0, r4, 0
bl DestroyTask
pop {r4}
@@ -161728,9 +161728,9 @@ sub_80C9D00: @ 80C9D00
ldrh r0, [r0]
movs r1, 0x1
bl sub_80A9538
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r0, _080C9D2C
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
adds r0, r4, 0
bl DestroyTask
pop {r4}
@@ -161783,9 +161783,9 @@ sub_80C9D74: @ 80C9D74
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r0, _080C9D94
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
adds r0, r4, 0
bl DestroyTask
pop {r4}
@@ -256324,7 +256324,7 @@ sub_80F7C54: @ 80F7C54
ldrb r0, [r0]
bl sub_80F7F80
bl MenuDisplayMessageBox
- bl sub_80655F0
+ bl ScriptContext1_Stop
pop {r0}
bx r0
.align 2, 0
@@ -257185,7 +257185,7 @@ _080F82D8:
ldr r0, _080F8308
movs r1, 0x2
bl sub_81DE0D0
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
adds r0, r6, 0
bl DestroyTask
b _080F83C8
@@ -257915,7 +257915,7 @@ _080F8848:
bl MenuZeroFillWindowRect
adds r0, r6, 0
bl DestroyTask
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
_080F8862:
add sp, 0x8
pop {r4-r6}
@@ -260233,7 +260233,7 @@ _080F99C8: .4byte 0x02020004
sub_80F99CC: @ 80F99CC
push {lr}
sub sp, 0x4
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r0, _080F9A04
movs r1, 0xA
bl CreateTask
@@ -260264,7 +260264,7 @@ _080F9A08: .4byte 0x03004b20
sub_80F9A0C: @ 80F9A0C
push {lr}
sub sp, 0x4
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r0, _080F9A44
movs r1, 0xA
bl CreateTask
@@ -260295,7 +260295,7 @@ _080F9A48: .4byte 0x03004b20
sub_80F9A4C: @ 80F9A4C
push {lr}
sub sp, 0x4
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r0, _080F9A84
movs r1, 0xA
bl CreateTask
@@ -269682,7 +269682,7 @@ sub_80FE220: @ 80FE220
ldr r1, _080FE238
movs r0, 0
strb r0, [r1]
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl sub_80FE1DC
bl sub_80FE394
pop {r0}
@@ -269910,7 +269910,7 @@ gpu_pal_decompress_alloc_tag_and_upload: @ 80FE3C4
cmp r0, 0
bne _080FE40C
ldr r0, _080FE408
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
adds r0, r4, 0
bl DestroyTask
b _080FE412
@@ -273625,7 +273625,7 @@ _0810011C:
subs r0, 0x7
strh r0, [r2]
ldr r0, _08100168
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
_0810013C:
ldr r2, _0810016C
ldr r0, _08100170
@@ -273848,7 +273848,7 @@ c1_overworld_prev_quest: @ 81002BC
.align 2, 0
_081002DC: .4byte 0x03004b20
_081002E0:
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r0, _081002FC
ldrb r1, [r0, 0x7]
movs r0, 0x80
@@ -273913,7 +273913,7 @@ _08100360: .4byte sub_80FE948
thumb_func_start sub_8100364
sub_8100364: @ 8100364
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed
bl pal_fill_black
ldr r0, _08100388
@@ -275200,7 +275200,7 @@ _08100CC4:
bne _08100D24
bl DrawWholeMapView
ldr r0, _08100CF0
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
movs r0, 0
movs r1, 0
movs r2, 0x1D
@@ -275213,7 +275213,7 @@ _08100CC4:
_08100CEC: .4byte 0x0202f388
_08100CF0: .4byte gUnknown_081A2F8A
_08100CF4:
- bl script_env_2_enable
+ bl ScriptContext2_Enable
adds r0, r4, 0
bl sub_80FED90
bl pal_fill_black
@@ -294253,7 +294253,7 @@ _08109B58:
bl MenuZeroFillWindowRect
adds r0, r4, 0
bl DestroyTask
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
pop {r4}
pop {r0}
bx r0
@@ -294521,7 +294521,7 @@ _08109D8C:
_08109D94:
adds r0, r6, 0
bl DestroyTask
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
pop {r4-r6}
pop {r0}
bx r0
@@ -294547,7 +294547,7 @@ sub_8109DAC: @ 8109DAC
strh r0, [r1]
adds r0, r4, 0
bl DestroyTask
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
pop {r4}
pop {r0}
bx r0
@@ -297263,7 +297263,7 @@ task08_080C9820: @ 810B34C
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r1, _0810B3A0
movs r0, 0x1
strb r0, [r1, 0x6]
@@ -297507,7 +297507,7 @@ sub_810B53C: @ 810B53C
ldrb r0, [r0]
str r0, [r1]
ldr r0, _0810B558
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
pop {r0}
bx r0
.align 2, 0
@@ -297548,7 +297548,7 @@ sub_810B58C: @ 810B58C
bl audio_play
movs r0, 0x25
bl FieldEffectActiveListRemove
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
pop {r0}
bx r0
thumb_func_end sub_810B58C
@@ -300397,7 +300397,7 @@ sub_810CC34: @ 810CC34
ldr r0, _0810CC4C
bl FlagSet
ldr r0, _0810CC50
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
pop {r0}
bx r0
.align 2, 0
@@ -301370,7 +301370,7 @@ sub_810D3C8: @ 810D3C8
lsls r0, 24
cmp r0, 0
beq _0810D3E2
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
adds r0, r4, 0
bl DestroyTask
_0810D3E2:
@@ -301688,7 +301688,7 @@ sub_810D618: @ 810D618
push {lr}
ldr r0, _0810D628
bl SetMainCallback2
- bl script_env_2_enable
+ bl ScriptContext2_Enable
pop {r0}
bx r0
.align 2, 0
@@ -301715,7 +301715,7 @@ _0810D648: .4byte mapldr_080CA5C0
mapldr_080CA5C0: @ 810D64C
push {lr}
sub sp, 0x4
- bl script_env_2_enable
+ bl ScriptContext2_Enable
bl sub_8053E90
movs r0, 0x1
negs r0, r0
@@ -301761,7 +301761,7 @@ sub_810D6A4: @ 810D6A4
push {lr}
ldr r0, _0810D6B4
bl SetMainCallback2
- bl script_env_2_enable
+ bl ScriptContext2_Enable
pop {r0}
bx r0
.align 2, 0
@@ -301776,7 +301776,7 @@ sub_810D6B8: @ 810D6B8
str r1, [r0, 0x8]
ldr r0, _0810D6D8
bl SetMainCallback2
- bl script_env_2_enable
+ bl ScriptContext2_Enable
pop {r0}
bx r0
.align 2, 0
@@ -303024,7 +303024,7 @@ sub_810E09C: @ 810E09C
bne _0810E0FC
adds r0, r6, 0
bl DestroyTask
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
b _0810E0FC
.align 2, 0
_0810E0E4: .4byte gUnknown_083F8370
@@ -304074,7 +304074,7 @@ _0810E870: .4byte 0x03000760
sub_810E874: @ 810E874
push {r4-r6,lr}
sub sp, 0x8
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r4, _0810E8B8
ldrb r0, [r4]
cmp r0, 0x5
@@ -304587,7 +304587,7 @@ sub_810EC9C: @ 810EC9C
lsls r0, 24
lsrs r0, 24
bl DestroyTask
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
pop {r0}
bx r0
thumb_func_end sub_810EC9C
@@ -305095,7 +305095,7 @@ _0810F08C: .4byte 0x0202e8dc
sub_810F090: @ 810F090
push {r4,r5,lr}
sub sp, 0x8
- bl script_env_2_enable
+ bl ScriptContext2_Enable
movs r0, 0
movs r1, 0
movs r2, 0xA
@@ -306085,7 +306085,7 @@ sub_810F814: @ 810F814
lsls r0, 24
lsrs r0, 24
bl DestroyTask
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
pop {r0}
bx r0
thumb_func_end sub_810F814
@@ -321586,7 +321586,7 @@ sub_81175C0: @ 81175C0
lsls r4, 24
lsrs r4, 24
bl MenuZeroFillScreen
- bl script_env_2_disable
+ bl ScriptContext2_Disable
adds r0, r4, 0
bl DestroyTask
pop {r4}
@@ -321623,7 +321623,7 @@ _08117608:
movs r0, 0x1
strh r0, [r1]
bl MenuZeroFillScreen
- bl script_env_2_disable
+ bl ScriptContext2_Disable
adds r0, r4, 0
bl DestroyTask
_0811761C:
@@ -321841,7 +321841,7 @@ _081177F8: .4byte sub_81175DC
thumb_func_start sub_81177FC
sub_81177FC: @ 81177FC
push {lr}
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r0, _08117828
movs r1, 0
bl CreateTask
@@ -328255,7 +328255,7 @@ sub_811AA18: @ 811AA18
ldrb r0, [r0]
str r0, [r1]
ldr r0, _0811AA34
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
pop {r0}
bx r0
.align 2, 0
@@ -328326,7 +328326,7 @@ sub_811AA9C: @ 811AA9C
_0811AAAE:
movs r0, 0x28
bl FieldEffectActiveListRemove
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
_0811AAB8:
pop {r0}
bx r0
@@ -345344,8 +345344,8 @@ sub_81231C4: @ 81231C4
bne _081231E4
adds r0, r4, 0
bl DestroyTask
- bl script_env_2_disable
- bl script_env_2_enable_and_set_ctx_running
+ bl ScriptContext2_Disable
+ bl EnableBothScriptContexts
_081231E4:
pop {r4}
pop {r0}
@@ -345380,7 +345380,7 @@ _08123214: .4byte sub_8123244
sub_8123218: @ 8123218
push {lr}
sub sp, 0x4
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r0, _08123240
movs r1, 0x1
bl CreateTask
@@ -351420,10 +351420,10 @@ sub_81260EC: @ 81260EC
adds r5, r1, 0
ldr r1, _08126114
ldr r2, _08126118
- bl script_env_init
+ bl InitScriptContext
adds r0, r4, 0
adds r1, r5, 0
- bl script_setup_bytecode_script
+ bl SetupBytecodeScript
str r5, [r4, 0x64]
movs r0, 0
str r0, [r4, 0x68]
@@ -351441,7 +351441,7 @@ _08126118: .4byte gScriptFuncs_End
sub_812611C: @ 812611C
push {r4,lr}
adds r4, r0, 0
- bl sub_80653EC
+ bl RunScript
lsls r0, 24
cmp r0, 0
beq _08126134
@@ -351785,7 +351785,7 @@ _0812636E:
thumb_func_start script_status_stop_and_ret_1
script_status_stop_and_ret_1: @ 8126374
push {lr}
- bl script_stop
+ bl StopScript
movs r0, 0x1
pop {r1}
bx r1
@@ -351795,23 +351795,23 @@ script_status_stop_and_ret_1: @ 8126374
sub_8126380: @ 8126380
push {r4-r7,lr}
adds r7, r0, 0
- bl script_read_word
+ bl ScriptReadWord
str r0, [r7, 0x68]
adds r0, r7, 0
- bl script_read_halfword
+ bl ScriptReadHalfword
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r7, 0
- bl script_read_word
+ bl ScriptReadWord
adds r6, r0, 0
adds r0, r7, 0
- bl script_read_halfword
+ bl ScriptReadHalfword
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r7, 0
- bl script_read_word
+ bl ScriptReadWord
adds r3, r0, 0
adds r0, r5, 0
adds r1, r6, 0
@@ -351856,7 +351856,7 @@ sub_81263E4: @ 81263E4
adds r0, 0x1
str r0, [r4, 0x8]
adds r0, r4, 0
- bl script_read_word
+ bl ScriptReadWord
ldr r1, [r4, 0x68]
subs r0, r1
ldr r1, [r4, 0x64]
@@ -351882,12 +351882,12 @@ _08126418: .4byte 0x020234cc
sub_812641C: @ 812641C
push {r4,lr}
adds r4, r0, 0
- bl script_read_word
+ bl ScriptReadWord
ldr r1, [r4, 0x68]
subs r0, r1
ldr r1, [r4, 0x64]
adds r0, r1
- bl script_env_2_execute_new_script
+ bl ScriptContext2_RunNewScript
movs r0, 0
pop {r4}
pop {r1}
@@ -351903,7 +351903,7 @@ sub_8126438: @ 8126438
bl sub_80B4940
mov r8, r0
adds r0, r7, 0
- bl script_read_word
+ bl ScriptReadWord
adds r4, r0, 0
ldr r0, [r7, 0x68]
subs r4, r0
@@ -352023,14 +352023,14 @@ sub_8126524: @ 8126524
adds r1, 0x1
str r1, [r4, 0x8]
adds r0, r4, 0
- bl script_read_word
+ bl ScriptReadWord
adds r5, r0, 0
ldr r0, [r4, 0x68]
subs r5, r0
ldr r0, [r4, 0x64]
adds r5, r0
adds r0, r4, 0
- bl script_read_word
+ bl ScriptReadWord
adds r1, r0, 0
ldr r0, [r4, 0x68]
subs r1, r0
@@ -352043,7 +352043,7 @@ sub_8126524: @ 8126524
adds r0, r5, 0
mov r2, r9
mov r3, r8
- bl sub_80657A8
+ bl InitRamScript
movs r0, 0
add sp, 0x4
pop {r3,r4}
@@ -352106,7 +352106,7 @@ sub_81265DC: @ 81265DC
ldrb r4, [r1]
adds r1, 0x1
str r1, [r0, 0x8]
- bl script_read_halfword
+ bl ScriptReadHalfword
adds r2, r0, 0
lsls r2, 16
lsrs r2, 16
@@ -352126,7 +352126,7 @@ sub_8126608: @ 8126608
push {r7}
sub sp, 0x88
adds r6, r0, 0
- bl script_read_word
+ bl ScriptReadWord
ldr r1, [r6, 0x68]
subs r0, r1
ldr r1, [r6, 0x64]
@@ -352241,7 +352241,7 @@ _08126710: .4byte gOtherText_PokeWasSentOver
sub_8126714: @ 8126714
push {r4,lr}
adds r4, r0, 0
- bl script_read_word
+ bl ScriptReadWord
adds r1, r0, 0
ldr r0, [r4, 0x68]
subs r1, r0
@@ -352289,17 +352289,17 @@ _08126774: .4byte gSystemText_ClockAdjustmentUsable
sub_8126778: @ 8126778
push {r4-r6,lr}
adds r6, r0, 0
- bl script_read_word
+ bl ScriptReadWord
adds r5, r0, 0
adds r0, r6, 0
- bl script_read_word
+ bl ScriptReadWord
adds r4, r0, 0
ldr r0, [r6, 0x68]
subs r4, r0
ldr r0, [r6, 0x64]
adds r4, r0
adds r0, r6, 0
- bl script_read_word
+ bl ScriptReadWord
adds r1, r0, 0
ldr r0, [r6, 0x68]
subs r1, r0
@@ -352325,17 +352325,17 @@ _081267B6:
sub_81267C0: @ 81267C0
push {r4-r6,lr}
adds r6, r0, 0
- bl script_read_word
+ bl ScriptReadWord
adds r5, r0, 0
adds r0, r6, 0
- bl script_read_word
+ bl ScriptReadWord
adds r4, r0, 0
ldr r0, [r6, 0x68]
subs r4, r0
ldr r0, [r6, 0x64]
adds r4, r0
adds r0, r6, 0
- bl script_read_word
+ bl ScriptReadWord
adds r1, r0, 0
ldr r0, [r6, 0x68]
subs r1, r0
@@ -364388,7 +364388,7 @@ sub_812C118: @ 812C118
cmp r0, 0
bne _0812C136
ldr r0, _0812C140
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
adds r0, r4, 0
bl DestroyTask
_0812C136:
@@ -377502,7 +377502,7 @@ sub_813265C: @ 813265C
sub_8132670: @ 8132670
push {lr}
sub sp, 0x4
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r0, _08132698
movs r1, 0xA
bl CreateTask
@@ -392553,7 +392553,7 @@ sub_8139EF8: @ 8139EF8
cmp r0, 0
bne _08139F30
ldr r0, _08139F2C
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
b _08139F4C
.align 2, 0
_08139F24: .4byte 0x030007b4
@@ -392561,7 +392561,7 @@ _08139F28: .4byte gSaveBlock2
_08139F2C: .4byte gUnknown_08152850
_08139F30:
ldr r0, _08139F38
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
b _08139F4C
.align 2, 0
_08139F38: .4byte gUnknown_08152C75
@@ -392571,7 +392571,7 @@ _08139F3C:
movs r2, 0xA
movs r3, 0x9
bl MenuZeroFillWindowRect
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
_08139F4C:
adds r0, r4, 0
bl DestroyTask
@@ -419456,7 +419456,7 @@ sub_8147408: @ 8147408
bl audio_play
ldr r0, _08147474
bl FlagSet
- bl script_env_2_disable
+ bl ScriptContext2_Disable
pop {r0}
bx r0
.align 2, 0
@@ -419584,7 +419584,7 @@ sub_8147514: @ 8147514
movs r0, 0x85
lsls r0, 4
bl FlagSet
- bl script_env_2_disable
+ bl ScriptContext2_Disable
pop {r0}
bx r0
.align 2, 0
@@ -419708,7 +419708,7 @@ sub_814761C: @ 814761C
bl audio_play
ldr r0, _08147688
bl FlagSet
- bl script_env_2_disable
+ bl ScriptContext2_Disable
pop {r0}
bx r0
.align 2, 0
@@ -419806,7 +419806,7 @@ _08147730:
bl sub_8064E2C
adds r0, r5, 0
bl DestroyTask
- bl script_env_2_disable
+ bl ScriptContext2_Disable
b _0814776A
_08147748:
ldrh r0, [r4, 0x2]
@@ -419821,7 +419821,7 @@ _08147748:
_0814775A:
bl sub_8064E2C
ldr r0, _08147770
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
adds r0, r5, 0
bl DestroyTask
_0814776A:
@@ -419970,7 +419970,7 @@ sub_814782C: @ 814782C
bne _08147884
adds r0, r5, 0
bl DestroyTask
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
bl InstallCameraPanAheadCallback
_08147884:
pop {r4,r5}
diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s
index fbc7d3d34..66d18c08c 100644
--- a/asm/rom_8040EB4.s
+++ b/asm/rom_8040EB4.s
@@ -3356,7 +3356,7 @@ _0804279C:
movs r2, 0x1D
movs r3, 0xD
bl MenuZeroFillWindowRect
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
b _08042816
.align 2, 0
_080427DC: .4byte 0x03005ce0
@@ -3381,7 +3381,7 @@ _080427E8:
movs r2, 0x1D
movs r3, 0xD
bl MenuZeroFillWindowRect
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
_08042816:
pop {r4,r5}
pop {r0}
@@ -3923,7 +3923,7 @@ sub_8042C6C: @ 8042C6C
sub_8042C80: @ 8042C80
push {lr}
sub sp, 0x4
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r0, _08042CA8
movs r1, 0xA
bl CreateTask
@@ -26165,7 +26165,7 @@ _0804E170: .4byte sub_8047CD8
sub_804E174: @ 804E174
push {lr}
sub sp, 0x4
- bl script_env_2_enable
+ bl ScriptContext2_Enable
ldr r0, _0804E19C
movs r1, 0xA
bl CreateTask
diff --git a/asm/rom_8065394.s b/asm/rom_8065394.s
index 8c270b3a5..6e7b07780 100644
--- a/asm/rom_8065394.s
+++ b/asm/rom_8065394.s
@@ -440,7 +440,7 @@ _08068208:
bl audio_play
_0806822C:
adds r0, r4, 0
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
movs r0, 0x1
_08068234:
pop {r4}
@@ -675,7 +675,7 @@ _080683E8:
bl GetFieldObjectScriptPointerByFieldObjectId
adds r1, r0, 0
ldrb r0, [r4]
- bl sub_806580C
+ bl GetRamScript
adds r1, r0, 0
_0806840C:
pop {r4-r6}
@@ -1109,7 +1109,7 @@ sub_8068770: @ 8068770
cmp r0, 0x2
bne _0806879C
ldr r0, _08068798
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
movs r0, 0x1
b _0806879E
.align 2, 0
@@ -1140,7 +1140,7 @@ sub_80687A4: @ 80687A4
cmp r0, 0x1
bne _080687DC
ldr r0, _080687D8
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
movs r0, 0x1
b _080687DE
.align 2, 0
@@ -1216,7 +1216,7 @@ mapheader_trigger_activate_at__run_now: @ 806883C
bl mapheader_trigger_activate_at
cmp r0, 0
beq _08068868
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
movs r0, 0x1
b _0806886A
.align 2, 0
@@ -1242,7 +1242,7 @@ sub_8068870: @ 8068870
b _0806888C
_08068884:
ldr r0, _08068890
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
movs r0, 0x1
_0806888C:
pop {r1}
@@ -1291,7 +1291,7 @@ _080688CC:
_080688E6:
ldr r0, _080688F4
_080688E8:
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
_080688EC:
movs r0, 0x1
_080688EE:
@@ -1579,7 +1579,7 @@ _08068B02:
cmp r0, 0x1
bne _08068B20
ldr r0, _08068B1C
- bl script_env_1_execute_new_script
+ bl ScriptContext1_SetupScript
movs r0, 0x1
b _08068B2A
.align 2, 0
@@ -1931,7 +1931,7 @@ _08068D92:
b _08068DB4
_08068DAC:
adds r0, r1, 0
- bl script_env_2_execute_new_script
+ bl ScriptContext2_RunNewScript
_08068DB2:
movs r0, 0
_08068DB4:
@@ -2952,7 +2952,7 @@ sub_80694B8: @ 80694B8
lsls r1, 3
ldr r0, _080694E8
adds r4, r1, r0
- bl script_env_2_is_enabled
+ bl ScriptContext2_IsEnabled
lsls r0, 24
cmp r0, 0
bne _080694E0
@@ -18934,7 +18934,7 @@ sub_8071310: @ 8071310
_08071326:
ldr r0, _08071334
bl sub_8071284
- bl script_env_2_enable
+ bl ScriptContext2_Enable
pop {r0}
bx r0
.align 2, 0
@@ -19310,7 +19310,7 @@ _080715F0: .4byte sub_8071338
_080715F4:
bl MenuZeroFillScreen
bl sub_8064E2C
- bl script_env_2_disable
+ bl ScriptContext2_Disable
movs r0, 0x1
b _08071606
_08071604:
@@ -19439,7 +19439,7 @@ _080716E8:
_080716EC:
adds r0, r4, 0
bl DestroyTask
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
_080716F6:
pop {r4}
pop {r0}
@@ -20140,7 +20140,7 @@ sub_8071C20: @ 8071C20
bl audio_play
bl MenuZeroFillScreen
bl sub_8064E2C
- bl script_env_2_disable
+ bl ScriptContext2_Disable
bl sub_8072DEC
pop {r0}
bx r0
diff --git a/include/script.h b/include/script.h
index d38d176f1..96e13d072 100644
--- a/include/script.h
+++ b/include/script.h
@@ -18,26 +18,26 @@ struct ScriptContext
u32 data[4];
};
-void script_env_init(struct ScriptContext *ctx, void *cmdTable, void *cmdTableEnd);
-u8 script_setup_bytecode_script(struct ScriptContext *ctx, void *ptr);
-void script_setup_asm_script(struct ScriptContext *ctx, void *ptr);
-void script_stop(struct ScriptContext *ctx);
-u8 sub_80653EC(struct ScriptContext *ctx);
-u8 script_stack_push(struct ScriptContext *ctx, u8 *ptr);
-u8 *script_stack_pop(struct ScriptContext *ctx);
-void script_jump(struct ScriptContext *ctx, u8 *ptr);
-void script_call(struct ScriptContext *ctx, u8 *ptr);
-void script_return(struct ScriptContext *ctx);
-u16 script_read_halfword(struct ScriptContext *ctx);
-u32 script_read_word(struct ScriptContext *ctx);
-void script_env_2_enable(void);
-void script_env_2_disable(void);
-bool8 script_env_2_is_enabled(void);
-void script_env_1_init(void);
-bool8 script_env_2_run_current_script(void);
-void script_env_1_execute_new_script(u8 *ptr);
-void sub_80655F0(void);
-void script_env_2_enable_and_set_ctx_running();
-void script_env_2_execute_new_script(u8 *ptr);
+void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, void *cmdTableEnd);
+u8 SetupBytecodeScript(struct ScriptContext *ctx, void *ptr);
+void SetupNativeScript(struct ScriptContext *ctx, void *ptr);
+void StopScript(struct ScriptContext *ctx);
+u8 RunScript(struct ScriptContext *ctx);
+u8 ScriptPush(struct ScriptContext *ctx, u8 *ptr);
+u8 *ScriptPop(struct ScriptContext *ctx);
+void ScriptJump(struct ScriptContext *ctx, u8 *ptr);
+void ScriptCall(struct ScriptContext *ctx, u8 *ptr);
+void ScriptReturn(struct ScriptContext *ctx);
+u16 ScriptReadHalfword(struct ScriptContext *ctx);
+u32 ScriptReadWord(struct ScriptContext *ctx);
+void ScriptContext2_Enable(void);
+void ScriptContext2_Disable(void);
+bool8 ScriptContext2_IsEnabled(void);
+void ScriptContext1_Init(void);
+bool8 ScriptContext2_RunScript(void);
+void ScriptContext1_SetupScript(u8 *ptr);
+void ScriptContext1_Stop(void);
+void EnableBothScriptContexts();
+void ScriptContext2_RunNewScript(u8 *ptr);
#endif // GUARD_SCRIPT_H
diff --git a/src/scrcmd.c b/src/scrcmd.c
index c6da1b33e..29c227146 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -8,7 +8,7 @@
#include "main.h"
#include "decoration.h"
-extern void killram(void);
+extern void ClearRamScript(void);
extern u16 *GetVarPointer(u16);
extern u16 VarGet(u16);
extern void sub_8126160(u8);
@@ -199,120 +199,120 @@ bool8 ScrCmd_snop1(struct ScriptContext *ctx)
bool8 ScrCmd_end(struct ScriptContext *ctx)
{
- script_stop(ctx);
+ StopScript(ctx);
return FALSE;
}
bool8 ScrCmd_jumpasm(struct ScriptContext *ctx)
{
- u32 addr = script_read_word(ctx);
- script_setup_asm_script(ctx, (void *)addr);
+ u32 addr = ScriptReadWord(ctx);
+ SetupNativeScript(ctx, (void *)addr);
return TRUE;
}
bool8 ScrCmd_special(struct ScriptContext *ctx)
{
- u16 index = script_read_halfword(ctx);
+ u16 index = ScriptReadHalfword(ctx);
gSpecials[index]();
return FALSE;
}
bool8 ScrCmd_specialval(struct ScriptContext *ctx)
{
- u16 *var = GetVarPointer(script_read_halfword(ctx));
- *var = gSpecials[script_read_halfword(ctx)]();
+ u16 *var = GetVarPointer(ScriptReadHalfword(ctx));
+ *var = gSpecials[ScriptReadHalfword(ctx)]();
return FALSE;
}
bool8 ScrCmd_callasm(struct ScriptContext *ctx)
{
- NativeFunc func = (NativeFunc)script_read_word(ctx);
+ NativeFunc func = (NativeFunc)ScriptReadWord(ctx);
func();
return FALSE;
}
bool8 ScrCmd_waitstate(struct ScriptContext *ctx)
{
- sub_80655F0();
+ ScriptContext1_Stop();
return TRUE;
}
bool8 ScrCmd_jump(struct ScriptContext *ctx)
{
- u8 *ptr = (u8 *)script_read_word(ctx);
- script_jump(ctx, ptr);
+ u8 *ptr = (u8 *)ScriptReadWord(ctx);
+ ScriptJump(ctx, ptr);
return FALSE;
}
bool8 ScrCmd_return(struct ScriptContext *ctx)
{
- script_return(ctx);
+ ScriptReturn(ctx);
return FALSE;
}
bool8 ScrCmd_call(struct ScriptContext *ctx)
{
- u8 *ptr = (u8 *)script_read_word(ctx);
- script_call(ctx, ptr);
+ u8 *ptr = (u8 *)ScriptReadWord(ctx);
+ ScriptCall(ctx, ptr);
return FALSE;
}
bool8 ScrCmd_jumpif(struct ScriptContext *ctx)
{
u8 condition = *(ctx->scriptPtr++);
- u8 *ptr = (u8 *)script_read_word(ctx);
+ u8 *ptr = (u8 *)ScriptReadWord(ctx);
if (gUnknown_083762DC[condition][ctx->comparisonResult] == 1)
- script_jump(ctx, ptr);
+ ScriptJump(ctx, ptr);
return FALSE;
}
bool8 ScrCmd_callif(struct ScriptContext *ctx)
{
u8 condition = *(ctx->scriptPtr++);
- u8 *ptr = (u8 *)script_read_word(ctx);
+ u8 *ptr = (u8 *)ScriptReadWord(ctx);
if (gUnknown_083762DC[condition][ctx->comparisonResult] == 1)
- script_call(ctx, ptr);
+ ScriptCall(ctx, ptr);
return FALSE;
}
bool8 ScrCmd_setvaddress(struct ScriptContext *ctx)
{
u32 addr1 = (u32)ctx->scriptPtr - 1;
- u32 addr2 = script_read_word(ctx);
+ u32 addr2 = ScriptReadWord(ctx);
gUnknown_0202E8B0 = addr2 - addr1;
return FALSE;
}
bool8 ScrCmd_vjump(struct ScriptContext *ctx)
{
- u32 addr = script_read_word(ctx);
- script_jump(ctx, (u8 *)(addr - gUnknown_0202E8B0));
+ u32 addr = ScriptReadWord(ctx);
+ ScriptJump(ctx, (u8 *)(addr - gUnknown_0202E8B0));
return FALSE;
}
bool8 ScrCmd_vcall(struct ScriptContext *ctx)
{
- u32 addr = script_read_word(ctx);
- script_call(ctx, (u8 *)(addr - gUnknown_0202E8B0));
+ u32 addr = ScriptReadWord(ctx);
+ ScriptCall(ctx, (u8 *)(addr - gUnknown_0202E8B0));
return FALSE;
}
bool8 ScrCmd_if5(struct ScriptContext *ctx)
{
u8 condition = *(ctx->scriptPtr++);
- u8 *ptr = (u8 *)(script_read_word(ctx) - gUnknown_0202E8B0);
+ u8 *ptr = (u8 *)(ScriptReadWord(ctx) - gUnknown_0202E8B0);
if (gUnknown_083762DC[condition][ctx->comparisonResult] == 1)
- script_jump(ctx, ptr);
+ ScriptJump(ctx, ptr);
return FALSE;
}
bool8 ScrCmd_if6(struct ScriptContext *ctx)
{
u8 condition = *(ctx->scriptPtr++);
- u8 *ptr = (u8 *)(script_read_word(ctx) - gUnknown_0202E8B0);
+ u8 *ptr = (u8 *)(ScriptReadWord(ctx) - gUnknown_0202E8B0);
if (gUnknown_083762DC[condition][ctx->comparisonResult] == 1)
- script_call(ctx, ptr);
+ ScriptCall(ctx, ptr);
return FALSE;
}
@@ -321,7 +321,7 @@ bool8 ScrCmd_jumpstd(struct ScriptContext *ctx)
u8 index = *(ctx->scriptPtr++);
u8 **ptr = &gStdScripts[index];
if (ptr < gStdScripts_End)
- script_jump(ctx, *ptr);
+ ScriptJump(ctx, *ptr);
return FALSE;
}
@@ -330,7 +330,7 @@ bool8 ScrCmd_callstd(struct ScriptContext *ctx)
u8 index = *(ctx->scriptPtr++);
u8 **ptr = &gStdScripts[index];
if (ptr < gStdScripts_End)
- script_call(ctx, *ptr);
+ ScriptCall(ctx, *ptr);
return FALSE;
}
@@ -342,7 +342,7 @@ bool8 ScrCmd_jumpstdif(struct ScriptContext *ctx)
{
u8 **ptr = &gStdScripts[index];
if (ptr < gStdScripts_End)
- script_jump(ctx, *ptr);
+ ScriptJump(ctx, *ptr);
}
return FALSE;
}
@@ -355,21 +355,21 @@ bool8 ScrCmd_callstdif(struct ScriptContext *ctx)
{
u8 **ptr = &gStdScripts[index];
if (ptr < gStdScripts_End)
- script_call(ctx, *ptr);
+ ScriptCall(ctx, *ptr);
}
return FALSE;
}
bool8 ScrCmd_jumpram(struct ScriptContext *ctx)
{
- script_jump(ctx, (u8 *)gUnknown_0202E8AC);
+ ScriptJump(ctx, (u8 *)gUnknown_0202E8AC);
return FALSE;
}
bool8 ScrCmd_die(struct ScriptContext *ctx)
{
- killram();
- script_stop(ctx);
+ ClearRamScript();
+ StopScript(ctx);
return TRUE;
}
@@ -383,21 +383,21 @@ bool8 ScrCmd_setbyte(struct ScriptContext *ctx)
bool8 ScrCmd_loadptr(struct ScriptContext *ctx)
{
u8 index = *(ctx->scriptPtr++);
- ctx->data[index] = script_read_word(ctx);
+ ctx->data[index] = ScriptReadWord(ctx);
return FALSE;
}
bool8 ScrCmd_loadbytefrompointer(struct ScriptContext *ctx)
{
u8 index = *(ctx->scriptPtr++);
- ctx->data[index] = *(u8 *)script_read_word(ctx);
+ ctx->data[index] = *(u8 *)ScriptReadWord(ctx);
return FALSE;
}
bool8 ScrCmd_writebytetooffset(struct ScriptContext *ctx)
{
u8 value = *(ctx->scriptPtr++);
- *(u8 *)script_read_word(ctx) = value;
+ *(u8 *)ScriptReadWord(ctx) = value;
return FALSE;
}
@@ -411,7 +411,7 @@ bool8 ScrCmd_setbufferbyte(struct ScriptContext *ctx)
bool8 ScrCmd_setptrbyte(struct ScriptContext *ctx)
{
u8 index = *(ctx->scriptPtr++);
- *(u8 *)script_read_word(ctx) = ctx->data[index];
+ *(u8 *)ScriptReadWord(ctx) = ctx->data[index];
return FALSE;
}
@@ -425,29 +425,29 @@ bool8 ScrCmd_copybuffers(struct ScriptContext *ctx)
bool8 ScrCmd_copybyte(struct ScriptContext *ctx)
{
- u8 *ptr = (u8 *)script_read_word(ctx);
- *ptr = *(u8 *)script_read_word(ctx);
+ u8 *ptr = (u8 *)ScriptReadWord(ctx);
+ *ptr = *(u8 *)ScriptReadWord(ctx);
return FALSE;
}
bool8 ScrCmd_setvar(struct ScriptContext *ctx)
{
- u16 *ptr = GetVarPointer(script_read_halfword(ctx));
- *ptr = script_read_halfword(ctx);
+ u16 *ptr = GetVarPointer(ScriptReadHalfword(ctx));
+ *ptr = ScriptReadHalfword(ctx);
return FALSE;
}
bool8 ScrCmd_copyvar(struct ScriptContext *ctx)
{
- u16 *ptr = GetVarPointer(script_read_halfword(ctx));
- *ptr = *GetVarPointer(script_read_halfword(ctx));
+ u16 *ptr = GetVarPointer(ScriptReadHalfword(ctx));
+ *ptr = *GetVarPointer(ScriptReadHalfword(ctx));
return FALSE;
}
bool8 ScrCmd_setorcopyvar(struct ScriptContext *ctx)
{
- u16 *ptr = GetVarPointer(script_read_halfword(ctx));
- *ptr = VarGet(script_read_halfword(ctx));
+ u16 *ptr = GetVarPointer(ScriptReadHalfword(ctx));
+ *ptr = VarGet(ScriptReadHalfword(ctx));
return FALSE;
}
@@ -481,14 +481,14 @@ bool8 ScrCmd_comparebuffertobyte(struct ScriptContext *ctx)
bool8 ScrCmd_comparebuffertoptrbyte(struct ScriptContext *ctx)
{
u8 value1 = ctx->data[*(ctx->scriptPtr++)];
- u8 value2 = *(u8 *)script_read_word(ctx);
+ u8 value2 = *(u8 *)ScriptReadWord(ctx);
ctx->comparisonResult = compare_012(value1, value2);
return FALSE;
}
bool8 ScrCmd_compareptrbytetobuffer(struct ScriptContext *ctx)
{
- u8 value1 = *(u8 *)script_read_word(ctx);
+ u8 value1 = *(u8 *)ScriptReadWord(ctx);
u8 value2 = ctx->data[*(ctx->scriptPtr++)];
ctx->comparisonResult = compare_012(value1, value2);
return FALSE;
@@ -496,7 +496,7 @@ bool8 ScrCmd_compareptrbytetobuffer(struct ScriptContext *ctx)
bool8 ScrCmd_compareptrbytetobyte(struct ScriptContext *ctx)
{
- u8 value1 = *(u8 *)script_read_word(ctx);
+ u8 value1 = *(u8 *)ScriptReadWord(ctx);
u8 value2 = *(ctx->scriptPtr++);
ctx->comparisonResult = compare_012(value1, value2);
return FALSE;
@@ -504,147 +504,147 @@ bool8 ScrCmd_compareptrbytetobyte(struct ScriptContext *ctx)
bool8 ScrCmd_compareptrbytes(struct ScriptContext *ctx)
{
- u8 value1 = *(u8 *)script_read_word(ctx);
- u8 value2 = *(u8 *)script_read_word(ctx);
+ u8 value1 = *(u8 *)ScriptReadWord(ctx);
+ u8 value2 = *(u8 *)ScriptReadWord(ctx);
ctx->comparisonResult = compare_012(value1, value2);
return FALSE;
}
bool8 ScrCmd_compare(struct ScriptContext *ctx)
{
- u16 value1 = *GetVarPointer(script_read_halfword(ctx));
- u16 value2 = script_read_halfword(ctx);
+ u16 value1 = *GetVarPointer(ScriptReadHalfword(ctx));
+ u16 value2 = ScriptReadHalfword(ctx);
ctx->comparisonResult = compare_012(value1, value2);
return FALSE;
}
bool8 ScrCmd_comparevars(struct ScriptContext *ctx)
{
- u16 *ptr1 = GetVarPointer(script_read_halfword(ctx));
- u16 *ptr2 = GetVarPointer(script_read_halfword(ctx));
+ u16 *ptr1 = GetVarPointer(ScriptReadHalfword(ctx));
+ u16 *ptr2 = GetVarPointer(ScriptReadHalfword(ctx));
ctx->comparisonResult = compare_012(*ptr1, *ptr2);
return FALSE;
}
bool8 ScrCmd_addvar(struct ScriptContext *ctx)
{
- u16 *ptr = GetVarPointer(script_read_halfword(ctx));
- *ptr += script_read_halfword(ctx);
+ u16 *ptr = GetVarPointer(ScriptReadHalfword(ctx));
+ *ptr += ScriptReadHalfword(ctx);
return FALSE;
}
bool8 ScrCmd_subvar(struct ScriptContext *ctx)
{
- u16 *ptr = GetVarPointer(script_read_halfword(ctx));
- *ptr -= VarGet(script_read_halfword(ctx));
+ u16 *ptr = GetVarPointer(ScriptReadHalfword(ctx));
+ *ptr -= VarGet(ScriptReadHalfword(ctx));
return FALSE;
}
bool8 ScrCmd_random(struct ScriptContext *ctx)
{
- u16 max = VarGet(script_read_halfword(ctx));
+ u16 max = VarGet(ScriptReadHalfword(ctx));
gScriptResult = Random() % max;
return FALSE;
}
bool8 ScrCmd_additem(struct ScriptContext *ctx)
{
- u16 itemId = VarGet(script_read_halfword(ctx));
- u32 quantity = VarGet(script_read_halfword(ctx));
+ u16 itemId = VarGet(ScriptReadHalfword(ctx));
+ u32 quantity = VarGet(ScriptReadHalfword(ctx));
gScriptResult = sub_80A9424(itemId, (u8)quantity);
return FALSE;
}
bool8 ScrCmd_removeitem(struct ScriptContext *ctx)
{
- u16 itemId = VarGet(script_read_halfword(ctx));
- u32 quantity = VarGet(script_read_halfword(ctx));
+ u16 itemId = VarGet(ScriptReadHalfword(ctx));
+ u32 quantity = VarGet(ScriptReadHalfword(ctx));
gScriptResult = sub_80A9538(itemId, (u8)quantity);
return FALSE;
}
bool8 ScrCmd_checkitemspace(struct ScriptContext *ctx)
{
- u16 itemId = VarGet(script_read_halfword(ctx));
- u32 quantity = VarGet(script_read_halfword(ctx));
+ u16 itemId = VarGet(ScriptReadHalfword(ctx));
+ u32 quantity = VarGet(ScriptReadHalfword(ctx));
gScriptResult = sub_80A9344(itemId, (u8)quantity);
return FALSE;
}
bool8 ScrCmd_checkitem(struct ScriptContext *ctx)
{
- u16 itemId = VarGet(script_read_halfword(ctx));
- u32 quantity = VarGet(script_read_halfword(ctx));
+ u16 itemId = VarGet(ScriptReadHalfword(ctx));
+ u32 quantity = VarGet(ScriptReadHalfword(ctx));
gScriptResult = sub_80A92D4(itemId, (u8)quantity);
return FALSE;
}
bool8 ScrCmd_checkitemtype(struct ScriptContext *ctx)
{
- u16 itemId = VarGet(script_read_halfword(ctx));
+ u16 itemId = VarGet(ScriptReadHalfword(ctx));
gScriptResult = sub_80A9670(itemId);
return FALSE;
}
bool8 ScrCmd_addpcitem(struct ScriptContext *ctx)
{
- u16 itemId = VarGet(script_read_halfword(ctx));
- u16 quantity = VarGet(script_read_halfword(ctx));
+ u16 itemId = VarGet(ScriptReadHalfword(ctx));
+ u16 quantity = VarGet(ScriptReadHalfword(ctx));
gScriptResult = sub_80A9760(itemId, quantity);
return FALSE;
}
bool8 ScrCmd_checkpcitem(struct ScriptContext *ctx)
{
- u16 itemId = VarGet(script_read_halfword(ctx));
- u16 quantity = VarGet(script_read_halfword(ctx));
+ u16 itemId = VarGet(ScriptReadHalfword(ctx));
+ u16 quantity = VarGet(ScriptReadHalfword(ctx));
gScriptResult = sub_80A9718(itemId, quantity);
return FALSE;
}
bool8 ScrCmd_adddecor(struct ScriptContext *ctx)
{
- u32 decorId = VarGet(script_read_halfword(ctx));
+ u32 decorId = VarGet(ScriptReadHalfword(ctx));
gScriptResult = IsThereStorageSpaceForDecoration(decorId);
return FALSE;
}
bool8 ScrCmd_removedecor(struct ScriptContext *ctx)
{
- u32 decorId = VarGet(script_read_halfword(ctx));
+ u32 decorId = VarGet(ScriptReadHalfword(ctx));
gScriptResult = sub_81340A8(decorId);
return FALSE;
}
bool8 ScrCmd_checkdecor(struct ScriptContext *ctx)
{
- u32 decorId = VarGet(script_read_halfword(ctx));
+ u32 decorId = VarGet(ScriptReadHalfword(ctx));
gScriptResult = sub_8134074(decorId);
return FALSE;
}
bool8 ScrCmd_testdecor(struct ScriptContext *ctx)
{
- u32 decorId = VarGet(script_read_halfword(ctx));
+ u32 decorId = VarGet(ScriptReadHalfword(ctx));
gScriptResult = sub_8133FE4(decorId);
return FALSE;
}
bool8 ScrCmd_setflag(struct ScriptContext *ctx)
{
- FlagSet(script_read_halfword(ctx));
+ FlagSet(ScriptReadHalfword(ctx));
return FALSE;
}
bool8 ScrCmd_clearflag(struct ScriptContext *ctx)
{
- FlagReset(script_read_halfword(ctx));
+ FlagReset(ScriptReadHalfword(ctx));
return FALSE;
}
bool8 ScrCmd_checkflag(struct ScriptContext *ctx)
{
- ctx->comparisonResult = FlagGet(script_read_halfword(ctx));
+ ctx->comparisonResult = FlagGet(ScriptReadHalfword(ctx));
return FALSE;
}
@@ -657,13 +657,13 @@ bool8 ScrCmd_inccounter(struct ScriptContext *ctx)
bool8 ScrCmd_lighten(struct ScriptContext *ctx)
{
sub_8081594(*(ctx->scriptPtr++));
- sub_80655F0();
+ ScriptContext1_Stop();
return TRUE;
}
bool8 ScrCmd_darken(struct ScriptContext *ctx)
{
- u16 value = VarGet(script_read_halfword(ctx));
+ u16 value = VarGet(ScriptReadHalfword(ctx));
sub_8053CE4(value);
return FALSE;
}
@@ -679,7 +679,7 @@ bool8 sub_8066248(void)
bool8 ScrCmd_fadescreen(struct ScriptContext *ctx)
{
fade_screen(*(ctx->scriptPtr++), 0);
- script_setup_asm_script(ctx, sub_8066248);
+ SetupNativeScript(ctx, sub_8066248);
return TRUE;
}
@@ -688,7 +688,7 @@ bool8 ScrCmd_fadescreendelay(struct ScriptContext *ctx)
u8 val1 = *(ctx->scriptPtr++);
u8 val2 = *(ctx->scriptPtr++);
fade_screen(val1, val2);
- script_setup_asm_script(ctx, sub_8066248);
+ SetupNativeScript(ctx, sub_8066248);
return TRUE;
}
@@ -704,15 +704,15 @@ bool8 s28_pause_asm()
bool8 ScrCmd_pause(struct ScriptContext *ctx)
{
- gUnknown_0202E8B4 = script_read_halfword(ctx);
- script_setup_asm_script(ctx, s28_pause_asm);
+ gUnknown_0202E8B4 = ScriptReadHalfword(ctx);
+ SetupNativeScript(ctx, s28_pause_asm);
return TRUE;
}
bool8 ScrCmd_compareflags(struct ScriptContext *ctx)
{
- u8 hour = VarGet(script_read_halfword(ctx));
- u8 minute = VarGet(script_read_halfword(ctx));
+ u8 hour = VarGet(ScriptReadHalfword(ctx));
+ u8 minute = VarGet(ScriptReadHalfword(ctx));
RtcInitLocalTimeOffset(hour, minute);
return FALSE;
}
@@ -734,7 +734,7 @@ bool8 ScrCmd_resetvars(struct ScriptContext *ctx)
bool8 ScrCmd_setweather(struct ScriptContext *ctx)
{
- u16 value = VarGet(script_read_halfword(ctx));
+ u16 value = VarGet(ScriptReadHalfword(ctx));
sub_80806B4(value);
return FALSE;
}
@@ -759,7 +759,7 @@ bool8 ScrCmd_tileeffect(struct ScriptContext *ctx)
bool8 ScrCmd_setmapfooter(struct ScriptContext *ctx)
{
- u16 value = VarGet(script_read_halfword(ctx));
+ u16 value = VarGet(ScriptReadHalfword(ctx));
sub_8053D14(value);
return FALSE;
}
@@ -769,8 +769,8 @@ bool8 ScrCmd_warp(struct ScriptContext *ctx)
u8 v1 = *(ctx->scriptPtr++);
u8 v2 = *(ctx->scriptPtr++);
u8 v3 = *(ctx->scriptPtr++);
- u16 v4 = VarGet(script_read_halfword(ctx));
- s8 v5 = VarGet(script_read_halfword(ctx));
+ u16 v4 = VarGet(ScriptReadHalfword(ctx));
+ s8 v5 = VarGet(ScriptReadHalfword(ctx));
warp1_set(v1, v2, v3, v4, v5);
sub_8080E88();
player_avatar_init_params_reset();
@@ -782,8 +782,8 @@ bool8 ScrCmd_warpmuted(struct ScriptContext *ctx)
u8 v1 = *(ctx->scriptPtr++);
u8 v2 = *(ctx->scriptPtr++);
u8 v3 = *(ctx->scriptPtr++);
- u16 v4 = VarGet(script_read_halfword(ctx));
- s8 v5 = VarGet(script_read_halfword(ctx));
+ u16 v4 = VarGet(ScriptReadHalfword(ctx));
+ s8 v5 = VarGet(ScriptReadHalfword(ctx));
warp1_set(v1, v2, v3, v4, v5);
sp13E_warp_to_last_warp();
player_avatar_init_params_reset();
@@ -795,8 +795,8 @@ bool8 ScrCmd_warpwalk(struct ScriptContext *ctx)
u8 v1 = *(ctx->scriptPtr++);
u8 v2 = *(ctx->scriptPtr++);
u8 v3 = *(ctx->scriptPtr++);
- u16 v4 = VarGet(script_read_halfword(ctx));
- s8 v5 = VarGet(script_read_halfword(ctx));
+ u16 v4 = VarGet(ScriptReadHalfword(ctx));
+ s8 v5 = VarGet(ScriptReadHalfword(ctx));
warp1_set(v1, v2, v3, v4, v5);
sub_8080EF0();
player_avatar_init_params_reset();
@@ -827,8 +827,8 @@ bool8 ScrCmd_warpteleport(struct ScriptContext *ctx)
u8 v1 = *(ctx->scriptPtr++);
u8 v2 = *(ctx->scriptPtr++);
u8 v3 = *(ctx->scriptPtr++);
- u16 v4 = VarGet(script_read_halfword(ctx));
- s8 v5 = VarGet(script_read_halfword(ctx));
+ u16 v4 = VarGet(ScriptReadHalfword(ctx));
+ s8 v5 = VarGet(ScriptReadHalfword(ctx));
warp1_set(v1, v2, v3, v4, v5);
sub_8080F68();
player_avatar_init_params_reset();
@@ -840,8 +840,8 @@ bool8 ScrCmd_warp3(struct ScriptContext *ctx)
u8 v1 = *(ctx->scriptPtr++);
u8 v2 = *(ctx->scriptPtr++);
u8 v3 = *(ctx->scriptPtr++);
- u16 v4 = VarGet(script_read_halfword(ctx));
- s8 v5 = VarGet(script_read_halfword(ctx));
+ u16 v4 = VarGet(ScriptReadHalfword(ctx));
+ s8 v5 = VarGet(ScriptReadHalfword(ctx));
warp1_set(v1, v2, v3, v4, v5);
return FALSE;
}
@@ -851,8 +851,8 @@ bool8 ScrCmd_warpplace(struct ScriptContext *ctx)
u8 v1 = *(ctx->scriptPtr++);
u8 v2 = *(ctx->scriptPtr++);
u8 v3 = *(ctx->scriptPtr++);
- u16 v4 = VarGet(script_read_halfword(ctx));
- s8 v5 = VarGet(script_read_halfword(ctx));
+ u16 v4 = VarGet(ScriptReadHalfword(ctx));
+ s8 v5 = VarGet(ScriptReadHalfword(ctx));
saved_warp2_set_2(0, v1, v2, v3, v4, v5);
return FALSE;
}
@@ -862,8 +862,8 @@ bool8 ScrCmd_warp4(struct ScriptContext *ctx)
u8 v1 = *(ctx->scriptPtr++);
u8 v2 = *(ctx->scriptPtr++);
u8 v3 = *(ctx->scriptPtr++);
- u16 v4 = VarGet(script_read_halfword(ctx));
- s8 v5 = VarGet(script_read_halfword(ctx));
+ u16 v4 = VarGet(ScriptReadHalfword(ctx));
+ s8 v5 = VarGet(ScriptReadHalfword(ctx));
sub_8053690(v1, v2, v3, v4, v5);
return FALSE;
}
@@ -873,8 +873,8 @@ bool8 ScrCmd_warp5(struct ScriptContext *ctx)
u8 v1 = *(ctx->scriptPtr++);
u8 v2 = *(ctx->scriptPtr++);
u8 v3 = *(ctx->scriptPtr++);
- u16 v4 = VarGet(script_read_halfword(ctx));
- s8 v5 = VarGet(script_read_halfword(ctx));
+ u16 v4 = VarGet(ScriptReadHalfword(ctx));
+ s8 v5 = VarGet(ScriptReadHalfword(ctx));
sub_80536E4(v1, v2, v3, v4, v5);
return FALSE;
}
@@ -884,16 +884,16 @@ bool8 ScrCmd_warp6(struct ScriptContext *ctx)
u8 v1 = *(ctx->scriptPtr++);
u8 v2 = *(ctx->scriptPtr++);
u8 v3 = *(ctx->scriptPtr++);
- u16 v4 = VarGet(script_read_halfword(ctx));
- s8 v5 = VarGet(script_read_halfword(ctx));
+ u16 v4 = VarGet(ScriptReadHalfword(ctx));
+ s8 v5 = VarGet(ScriptReadHalfword(ctx));
sub_805363C(v1, v2, v3, v4, v5);
return FALSE;
}
bool8 ScrCmd_getplayerxy(struct ScriptContext *ctx)
{
- u16 *ptr1 = GetVarPointer(script_read_halfword(ctx));
- u16 *ptr2 = GetVarPointer(script_read_halfword(ctx));
+ u16 *ptr1 = GetVarPointer(ScriptReadHalfword(ctx));
+ u16 *ptr2 = GetVarPointer(ScriptReadHalfword(ctx));
*ptr1 = gSaveBlock1.pos.x;
*ptr2 = gSaveBlock1.pos.y;
return FALSE;
@@ -907,7 +907,7 @@ bool8 ScrCmd_countpokemon(struct ScriptContext *ctx)
bool8 ScrCmd_playsfx(struct ScriptContext *ctx)
{
- audio_play(script_read_halfword(ctx));
+ audio_play(ScriptReadHalfword(ctx));
return FALSE;
}
@@ -921,13 +921,13 @@ bool8 s30_music_check_asm()
bool8 ScrCmd_checksound(struct ScriptContext *ctx)
{
- script_setup_asm_script(ctx, s30_music_check_asm);
+ SetupNativeScript(ctx, s30_music_check_asm);
return TRUE;
}
bool8 ScrCmd_fanfare(struct ScriptContext *ctx)
{
- fanfare_play(script_read_halfword(ctx));
+ fanfare_play(ScriptReadHalfword(ctx));
return FALSE;
}
@@ -938,13 +938,13 @@ bool8 s32_fanfare_wait_asm()
bool8 ScrCmd_waitfanfare(struct ScriptContext *ctx)
{
- script_setup_asm_script(ctx, s32_fanfare_wait_asm);
+ SetupNativeScript(ctx, s32_fanfare_wait_asm);
return TRUE;
}
bool8 ScrCmd_playmusic(struct ScriptContext *ctx)
{
- u16 songId = script_read_halfword(ctx);
+ u16 songId = ScriptReadHalfword(ctx);
bool8 val = *(ctx->scriptPtr++);
if (val == TRUE)
sav1_set_battle_music_maybe(songId);
@@ -954,7 +954,7 @@ bool8 ScrCmd_playmusic(struct ScriptContext *ctx)
bool8 ScrCmd_playmusicbattle(struct ScriptContext *ctx)
{
- sav1_set_battle_music_maybe(script_read_halfword(ctx));
+ sav1_set_battle_music_maybe(ScriptReadHalfword(ctx));
return FALSE;
}
@@ -966,7 +966,7 @@ bool8 ScrCmd_fadedefault(struct ScriptContext *ctx)
bool8 ScrCmd_fademusic(struct ScriptContext *ctx)
{
- sub_8053FB0(script_read_halfword(ctx));
+ sub_8053FB0(ScriptReadHalfword(ctx));
return FALSE;
}
@@ -977,7 +977,7 @@ bool8 ScrCmd_fadeout(struct ScriptContext *ctx)
sub_8074FB8(4 * val);
else
sub_8074FB8(4);
- script_setup_asm_script(ctx, sub_8074FD0);
+ SetupNativeScript(ctx, sub_8074FD0);
return TRUE;
}
@@ -993,8 +993,8 @@ bool8 ScrCmd_fadein(struct ScriptContext *ctx)
bool8 ScrCmd_move(struct ScriptContext *ctx)
{
- u16 v1 = VarGet(script_read_halfword(ctx));
- void *v2 = (void *)script_read_word(ctx);
+ u16 v1 = VarGet(ScriptReadHalfword(ctx));
+ void *v2 = (void *)ScriptReadWord(ctx);
exec_movement(v1, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, v2);
gUnknown_0202E8B6 = v1;
return FALSE;
@@ -1002,8 +1002,8 @@ bool8 ScrCmd_move(struct ScriptContext *ctx)
bool8 ScrCmd_movecoords(struct ScriptContext *ctx)
{
- u16 v1 = VarGet(script_read_halfword(ctx));
- void *v2 = (void *)script_read_word(ctx);
+ u16 v1 = VarGet(ScriptReadHalfword(ctx));
+ void *v2 = (void *)ScriptReadWord(ctx);
u8 v3 = *(ctx->scriptPtr++);
u8 v4 = *(ctx->scriptPtr++);
exec_movement(v1, v4, v3, v2);
@@ -1018,18 +1018,18 @@ bool8 s51a_0806B288(void)
bool8 ScrCmd_waitmove(struct ScriptContext *ctx)
{
- u16 v1 = VarGet(script_read_halfword(ctx));
+ u16 v1 = VarGet(ScriptReadHalfword(ctx));
if (v1)
gUnknown_0202E8B6 = v1;
gUnknown_0202E8B8 = gSaveBlock1.location.mapGroup;
gUnknown_0202E8BA = gSaveBlock1.location.mapNum;
- script_setup_asm_script(ctx, s51a_0806B288);
+ SetupNativeScript(ctx, s51a_0806B288);
return TRUE;
}
bool8 ScrCmd_waitmovexy(struct ScriptContext *ctx)
{
- u16 v1 = VarGet(script_read_halfword(ctx));
+ u16 v1 = VarGet(ScriptReadHalfword(ctx));
u8 v2;
u8 v3;
@@ -1040,20 +1040,20 @@ bool8 ScrCmd_waitmovexy(struct ScriptContext *ctx)
v3 = *(ctx->scriptPtr++);
gUnknown_0202E8B8 = v2;
gUnknown_0202E8BA = v3;
- script_setup_asm_script(ctx, s51a_0806B288);
+ SetupNativeScript(ctx, s51a_0806B288);
return TRUE;
}
bool8 ScrCmd_disappear(struct ScriptContext *ctx)
{
- u16 objectId = VarGet(script_read_halfword(ctx));
+ u16 objectId = VarGet(ScriptReadHalfword(ctx));
RemoveFieldObjectByLocalIdAndMap(objectId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
return FALSE;
}
bool8 ScrCmd_disappearxy(struct ScriptContext *ctx)
{
- u16 objectId = VarGet(script_read_halfword(ctx));
+ u16 objectId = VarGet(ScriptReadHalfword(ctx));
u8 mapGroup = *(ctx->scriptPtr++);
u8 mapNum = *(ctx->scriptPtr++);
RemoveFieldObjectByLocalIdAndMap(objectId, mapNum, mapGroup);
@@ -1062,14 +1062,14 @@ bool8 ScrCmd_disappearxy(struct ScriptContext *ctx)
bool8 ScrCmd_reappear(struct ScriptContext *ctx)
{
- u16 objectId = VarGet(script_read_halfword(ctx));
+ u16 objectId = VarGet(ScriptReadHalfword(ctx));
show_sprite(objectId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
return FALSE;
}
bool8 ScrCmd_reappearxy(struct ScriptContext *ctx)
{
- u16 objectId = VarGet(script_read_halfword(ctx));
+ u16 objectId = VarGet(ScriptReadHalfword(ctx));
u8 mapGroup = *(ctx->scriptPtr++);
u8 mapNum = *(ctx->scriptPtr++);
show_sprite(objectId, mapNum, mapGroup);
@@ -1078,32 +1078,32 @@ bool8 ScrCmd_reappearxy(struct ScriptContext *ctx)
bool8 ScrCmd_movesprite(struct ScriptContext *ctx)
{
- u16 v1 = VarGet(script_read_halfword(ctx));
- u16 v2 = VarGet(script_read_halfword(ctx));
- u32 v3 = VarGet(script_read_halfword(ctx));
+ u16 v1 = VarGet(ScriptReadHalfword(ctx));
+ u16 v2 = VarGet(ScriptReadHalfword(ctx));
+ u32 v3 = VarGet(ScriptReadHalfword(ctx));
sub_805C0F8(v1, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, v2, v3);
return FALSE;
}
bool8 ScrCmd_movespriteperm(struct ScriptContext *ctx)
{
- u16 v1 = VarGet(script_read_halfword(ctx));
- u16 v2 = VarGet(script_read_halfword(ctx));
- u32 v3 = VarGet(script_read_halfword(ctx));
+ u16 v1 = VarGet(ScriptReadHalfword(ctx));
+ u16 v2 = VarGet(ScriptReadHalfword(ctx));
+ u32 v3 = VarGet(ScriptReadHalfword(ctx));
update_saveblock1_field_object_coords(v1, v2, v3);
return FALSE;
}
bool8 ScrCmd_moveoffscreen(struct ScriptContext *ctx)
{
- u16 v1 = VarGet(script_read_halfword(ctx));
+ u16 v1 = VarGet(ScriptReadHalfword(ctx));
sub_805C78C(v1, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
return FALSE;
}
bool8 ScrCmd_spritevisible(struct ScriptContext *ctx)
{
- u16 v1 = VarGet(script_read_halfword(ctx));
+ u16 v1 = VarGet(ScriptReadHalfword(ctx));
u8 v2 = *(ctx->scriptPtr++);
u8 v3 = *(ctx->scriptPtr++);
npc_by_local_id_and_map_set_field_1_bit_x20(v1, v3, v2, 0);
@@ -1112,7 +1112,7 @@ bool8 ScrCmd_spritevisible(struct ScriptContext *ctx)
bool8 ScrCmd_spriteinvisible(struct ScriptContext *ctx)
{
- u16 v1 = VarGet(script_read_halfword(ctx));
+ u16 v1 = VarGet(ScriptReadHalfword(ctx));
u8 v2 = *(ctx->scriptPtr++);
u8 v3 = *(ctx->scriptPtr++);
npc_by_local_id_and_map_set_field_1_bit_x20(v1, v3, v2, 1);
@@ -1121,7 +1121,7 @@ bool8 ScrCmd_spriteinvisible(struct ScriptContext *ctx)
bool8 ScrCmd_spritelevelup(struct ScriptContext *ctx)
{
- u16 v1 = VarGet(script_read_halfword(ctx));
+ u16 v1 = VarGet(ScriptReadHalfword(ctx));
u8 v2 = *(ctx->scriptPtr++);
u8 v3 = *(ctx->scriptPtr++);
u8 v4 = *(ctx->scriptPtr++);
@@ -1131,7 +1131,7 @@ bool8 ScrCmd_spritelevelup(struct ScriptContext *ctx)
bool8 ScrCmd_restorespritelevel(struct ScriptContext *ctx)
{
- u16 v1 = VarGet(script_read_halfword(ctx));
+ u16 v1 = VarGet(ScriptReadHalfword(ctx));
u8 v2 = *(ctx->scriptPtr++);
u8 v3 = *(ctx->scriptPtr++);
sub_805BD48(v1, v3, v2);
@@ -1152,7 +1152,7 @@ bool8 ScrCmd_faceplayer(struct ScriptContext *ctx)
bool8 ScrCmd_spriteface(struct ScriptContext *ctx)
{
- u16 v1 = VarGet(script_read_halfword(ctx));
+ u16 v1 = VarGet(ScriptReadHalfword(ctx));
u8 v2 = *(ctx->scriptPtr++);
FieldObjectTurnByLocalIdAndMap(v1, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, v2);
return FALSE;
@@ -1160,7 +1160,7 @@ bool8 ScrCmd_spriteface(struct ScriptContext *ctx)
bool8 ScrCmd_spritebehave(struct ScriptContext *ctx)
{
- u16 v1 = VarGet(script_read_halfword(ctx));
+ u16 v1 = VarGet(ScriptReadHalfword(ctx));
u8 v2 = *(ctx->scriptPtr++);
update_saveblock1_field_object_movement_behavior(v1, v2);
return FALSE;
@@ -1170,8 +1170,8 @@ bool8 ScrCmd_createvsprite(struct ScriptContext *ctx)
{
u8 v1 = *(ctx->scriptPtr++);
u8 v2 = *(ctx->scriptPtr++);
- u16 v3 = VarGet(script_read_halfword(ctx));
- u32 v4 = VarGet(script_read_halfword(ctx));
+ u16 v3 = VarGet(ScriptReadHalfword(ctx));
+ u32 v4 = VarGet(ScriptReadHalfword(ctx));
u8 v5 = *(ctx->scriptPtr++);
u8 v6 = *(ctx->scriptPtr++);
sub_805B410(v1, v2, v3, v4, v5, v6);
@@ -1195,7 +1195,7 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx)
else
{
sub_8064D20();
- script_setup_asm_script(ctx, sub_8064CFC);
+ SetupNativeScript(ctx, sub_8064CFC);
return TRUE;
}
}
@@ -1211,12 +1211,12 @@ bool8 ScrCmd_lock(struct ScriptContext *ctx)
if (gMapObjects[gSelectedMapObject].active)
{
sub_8064DD8();
- script_setup_asm_script(ctx, sub_8064DB4);
+ SetupNativeScript(ctx, sub_8064DB4);
}
else
{
sub_8064D20();
- script_setup_asm_script(ctx, sub_8064CFC);
+ SetupNativeScript(ctx, sub_8064CFC);
}
return TRUE;
@@ -1251,7 +1251,7 @@ bool8 ScrCmd_release(struct ScriptContext *ctx)
bool8 ScrCmd_message(struct ScriptContext *ctx)
{
- u8 *msg = (u8 *)script_read_word(ctx);
+ u8 *msg = (u8 *)ScriptReadWord(ctx);
if (!msg)
msg = (u8 *)ctx->data[0];
box_related_two__2(msg);
@@ -1260,7 +1260,7 @@ bool8 ScrCmd_message(struct ScriptContext *ctx)
bool8 ScrCmd_message2(struct ScriptContext *ctx)
{
- u8 *msg = (u8 *)script_read_word(ctx);
+ u8 *msg = (u8 *)ScriptReadWord(ctx);
if (!msg)
msg = (u8 *)ctx->data[0];
box_related_two__3(msg);
@@ -1269,7 +1269,7 @@ bool8 ScrCmd_message2(struct ScriptContext *ctx)
bool8 ScrCmd_waittext(struct ScriptContext *ctx)
{
- script_setup_asm_script(ctx, sub_8064C84);
+ SetupNativeScript(ctx, sub_8064C84);
return TRUE;
}
@@ -1290,7 +1290,7 @@ bool8 sub_80670C0()
bool8 ScrCmd_waitbutton(struct ScriptContext *ctx)
{
- script_setup_asm_script(ctx, sub_80670C0);
+ SetupNativeScript(ctx, sub_80670C0);
return TRUE;
}
@@ -1300,7 +1300,7 @@ bool8 ScrCmd_yesnobox(struct ScriptContext *ctx)
u8 v2 = *(ctx->scriptPtr++);
if (yes_no_box(v1, v2) == 1)
{
- sub_80655F0();
+ ScriptContext1_Stop();
return TRUE;
}
else
@@ -1317,7 +1317,7 @@ bool8 ScrCmd_multichoice(struct ScriptContext *ctx)
u8 v4 = *(ctx->scriptPtr++);
if (sub_80B5054(v1, v2, v3, v4) == 1)
{
- sub_80655F0();
+ ScriptContext1_Stop();
return TRUE;
}
else
@@ -1335,7 +1335,7 @@ bool8 ScrCmd_multichoicedef(struct ScriptContext *ctx)
u8 v5 = *(ctx->scriptPtr++);
if (sub_80B50B0(v1, v2, v3, v5, v4) == 1)
{
- sub_80655F0();
+ ScriptContext1_Stop();
return TRUE;
}
else
@@ -1363,7 +1363,7 @@ bool8 ScrCmd_multichoicerow(struct ScriptContext *ctx)
u8 v5 = *(ctx->scriptPtr++);
if (sub_80B5578(v1, v2, v3, v5, v4) == 1)
{
- sub_80655F0();
+ ScriptContext1_Stop();
return TRUE;
}
else
@@ -1390,7 +1390,7 @@ bool8 ScrCmd_clearbox(struct ScriptContext *ctx)
u8 v4 = *(ctx->scriptPtr++);
if (Multichoice(v1, v2, v3, v4) == 1)
{
- sub_80655F0();
+ ScriptContext1_Stop();
return TRUE;
}
else
@@ -1401,7 +1401,7 @@ bool8 ScrCmd_clearbox(struct ScriptContext *ctx)
bool8 ScrCmd_showpokepic(struct ScriptContext *ctx)
{
- u16 v1 = VarGet(script_read_halfword(ctx));
+ u16 v1 = VarGet(ScriptReadHalfword(ctx));
u8 v2 = *(ctx->scriptPtr++);
u8 v3 = *(ctx->scriptPtr++);
sub_80B58C4(v1, v2, v3);
@@ -1414,7 +1414,7 @@ bool8 ScrCmd_hidepokepic(struct ScriptContext *ctx)
if (!func)
return FALSE;
- script_setup_asm_script(ctx, func);
+ SetupNativeScript(ctx, func);
return TRUE;
}
@@ -1424,13 +1424,13 @@ bool8 ScrCmd_showcontestwinner(struct ScriptContext *ctx)
if (v1)
sub_8106630(v1);
sub_80C4F10();
- sub_80655F0();
+ ScriptContext1_Stop();
return TRUE;
}
bool8 ScrCmd_braillemsg(struct ScriptContext *ctx)
{
- u8 *ptr = (u8 *)script_read_word(ctx);
+ u8 *ptr = (u8 *)ScriptReadWord(ctx);
u8 v2 = ptr[0];
u8 v3 = ptr[1];
u8 v4 = ptr[2];
@@ -1445,7 +1445,7 @@ bool8 ScrCmd_braillemsg(struct ScriptContext *ctx)
bool8 ScrCmd_vtext(struct ScriptContext *ctx)
{
- u32 v1 = script_read_word(ctx);
+ u32 v1 = ScriptReadWord(ctx);
box_related_two__2((u8 *)(v1 - gUnknown_0202E8B0));
return FALSE;
}
@@ -1453,7 +1453,7 @@ bool8 ScrCmd_vtext(struct ScriptContext *ctx)
bool8 ScrCmd_bufferpoke(struct ScriptContext *ctx)
{
u8 stringVarIndex = *(ctx->scriptPtr++);
- u16 species = VarGet(script_read_halfword(ctx));
+ u16 species = VarGet(ScriptReadHalfword(ctx));
StringCopy(gUnknown_083762F0[stringVarIndex], &gSpeciesNames[species]);
return FALSE;
}
@@ -1471,7 +1471,7 @@ bool8 ScrCmd_bufferfirstpoke(struct ScriptContext *ctx)
bool8 ScrCmd_bufferpartypoke(struct ScriptContext *ctx)
{
u8 stringVarIndex = *(ctx->scriptPtr++);
- u16 partyIndex = VarGet(script_read_halfword(ctx));
+ u16 partyIndex = VarGet(ScriptReadHalfword(ctx));
GetMonData(&gPlayerParty[partyIndex], MON_DATA_NICKNAME, gUnknown_083762F0[stringVarIndex]);
StringGetEnd10(gUnknown_083762F0[stringVarIndex]);
return FALSE;
@@ -1480,7 +1480,7 @@ bool8 ScrCmd_bufferpartypoke(struct ScriptContext *ctx)
bool8 ScrCmd_bufferitem(struct ScriptContext *ctx)
{
u8 stringVarIndex = *(ctx->scriptPtr++);
- u16 itemId = VarGet(script_read_halfword(ctx));
+ u16 itemId = VarGet(ScriptReadHalfword(ctx));
itemid_copy_name(itemId, gUnknown_083762F0[stringVarIndex]);
return FALSE;
}
@@ -1488,7 +1488,7 @@ bool8 ScrCmd_bufferitem(struct ScriptContext *ctx)
bool8 ScrCmd_bufferdecor(struct ScriptContext *ctx)
{
u8 stringVarIndex = *(ctx->scriptPtr++);
- u16 decorId = VarGet(script_read_halfword(ctx));
+ u16 decorId = VarGet(ScriptReadHalfword(ctx));
StringCopy(gUnknown_083762F0[stringVarIndex], gDecorations[decorId].name);
return FALSE;
}
@@ -1496,7 +1496,7 @@ bool8 ScrCmd_bufferdecor(struct ScriptContext *ctx)
bool8 ScrCmd_bufferattack(struct ScriptContext *ctx)
{
u8 stringVarIndex = *(ctx->scriptPtr++);
- u16 moveId = VarGet(script_read_halfword(ctx));
+ u16 moveId = VarGet(ScriptReadHalfword(ctx));
StringCopy(gUnknown_083762F0[stringVarIndex], &gMoveNames[moveId]);
return FALSE;
}
@@ -1504,7 +1504,7 @@ bool8 ScrCmd_bufferattack(struct ScriptContext *ctx)
bool8 ScrCmd_buffernum(struct ScriptContext *ctx)
{
u8 stringVarIndex = *(ctx->scriptPtr++);
- u16 v1 = VarGet(script_read_halfword(ctx));
+ u16 v1 = VarGet(ScriptReadHalfword(ctx));
u8 v2 = sub_80BF0B8(v1);
ConvertIntToDecimalStringN(gUnknown_083762F0[stringVarIndex], v1, 0, v2);
return FALSE;
@@ -1513,7 +1513,7 @@ bool8 ScrCmd_buffernum(struct ScriptContext *ctx)
bool8 ScrCmd_bufferstd(struct ScriptContext *ctx)
{
u8 stringVarIndex = *(ctx->scriptPtr++);
- u16 index = VarGet(script_read_halfword(ctx));
+ u16 index = VarGet(ScriptReadHalfword(ctx));
StringCopy(gUnknown_083762F0[stringVarIndex], gUnknown_083CE048[index]);
return FALSE;
}
@@ -1521,14 +1521,14 @@ bool8 ScrCmd_bufferstd(struct ScriptContext *ctx)
bool8 ScrCmd_buffertext(struct ScriptContext *ctx)
{
u8 stringVarIndex = *(ctx->scriptPtr++);
- u8 *text = (u8 *)script_read_word(ctx);
+ u8 *text = (u8 *)ScriptReadWord(ctx);
StringCopy(gUnknown_083762F0[stringVarIndex], text);
return FALSE;
}
bool8 ScrCmd_vloadptr(struct ScriptContext *ctx)
{
- u8 *ptr = (u8 *)(script_read_word(ctx) - gUnknown_0202E8B0);
+ u8 *ptr = (u8 *)(ScriptReadWord(ctx) - gUnknown_0202E8B0);
StringExpandPlaceholders(gStringVar4, ptr);
return FALSE;
}
@@ -1536,7 +1536,7 @@ bool8 ScrCmd_vloadptr(struct ScriptContext *ctx)
bool8 ScrCmd_vbuffer(struct ScriptContext *ctx)
{
u8 stringVarIndex = *(ctx->scriptPtr++);
- u32 addr = script_read_word(ctx);
+ u32 addr = ScriptReadWord(ctx);
u8 *src = (u8 *)(addr - gUnknown_0202E8B0);
u8 *dest = gUnknown_083762F0[stringVarIndex];
StringCopy(dest, src);
@@ -1545,11 +1545,11 @@ bool8 ScrCmd_vbuffer(struct ScriptContext *ctx)
bool8 ScrCmd_givepokemon(struct ScriptContext *ctx)
{
- u16 v3 = VarGet(script_read_halfword(ctx));
+ u16 v3 = VarGet(ScriptReadHalfword(ctx));
u8 v5 = *(ctx->scriptPtr++);
- u16 v7 = VarGet(script_read_halfword(ctx));
- u32 v8 = script_read_word(ctx);
- u32 v9 = script_read_word(ctx);
+ u16 v7 = VarGet(ScriptReadHalfword(ctx));
+ u32 v8 = ScriptReadWord(ctx);
+ u32 v9 = ScriptReadWord(ctx);
u8 v10 = *(ctx->scriptPtr++);
gScriptResult = sub_80C5374(v3, v5, v7, v8, v9, v10);
return FALSE;
@@ -1557,7 +1557,7 @@ bool8 ScrCmd_givepokemon(struct ScriptContext *ctx)
bool8 ScrCmd_giveegg(struct ScriptContext *ctx)
{
- u16 value = VarGet(script_read_halfword(ctx));
+ u16 value = VarGet(ScriptReadHalfword(ctx));
gScriptResult = sub_80C53F8(value);
return FALSE;
}
@@ -1566,7 +1566,7 @@ bool8 ScrCmd_setpokemove(struct ScriptContext *ctx)
{
u8 v2 = *(ctx->scriptPtr++);
u8 v3 = *(ctx->scriptPtr++);
- u16 v4 = script_read_halfword(ctx);
+ u16 v4 = ScriptReadHalfword(ctx);
sub_80C5530(v2, v4, v3);
return FALSE;
}
@@ -1574,11 +1574,11 @@ bool8 ScrCmd_setpokemove(struct ScriptContext *ctx)
bool8 ScrCmd_checkattack(struct ScriptContext *ctx)
{
u8 i;
- u16 moveId = script_read_halfword(ctx);
+ u16 moveId = ScriptReadHalfword(ctx);
gScriptResult = 6;
for (i = 0; i < 6; i++)
{
- register u8 *dummy asm("r2");
+ register u8 *dummy asm("r2"); // UB: use of uninitialized variable
u16 species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES, NULL);
if (!species)
break;
@@ -1594,7 +1594,7 @@ bool8 ScrCmd_checkattack(struct ScriptContext *ctx)
bool8 ScrCmd_givemoney(struct ScriptContext *ctx)
{
- u32 amount = script_read_word(ctx);
+ u32 amount = ScriptReadWord(ctx);
u8 ignore = *(ctx->scriptPtr++);
if (!ignore)
sub_80B79B8(&gSaveBlock1.money, amount);
@@ -1603,7 +1603,7 @@ bool8 ScrCmd_givemoney(struct ScriptContext *ctx)
bool8 ScrCmd_paymoney(struct ScriptContext *ctx)
{
- u32 amount = script_read_word(ctx);
+ u32 amount = ScriptReadWord(ctx);
u8 ignore = *(ctx->scriptPtr++);
if (!ignore)
sub_80B79E0(&gSaveBlock1.money, amount);
@@ -1612,7 +1612,7 @@ bool8 ScrCmd_paymoney(struct ScriptContext *ctx)
bool8 ScrCmd_checkmoney(struct ScriptContext *ctx)
{
- u32 amount = script_read_word(ctx);
+ u32 amount = ScriptReadWord(ctx);
u8 ignore = *(ctx->scriptPtr++);
if (!ignore)
gScriptResult = IsEnoughMoney(gSaveBlock1.money, amount);
@@ -1697,30 +1697,30 @@ bool8 ScrCmd_endtrainerbattle2(struct ScriptContext *ctx)
bool8 ScrCmd_checktrainerflag(struct ScriptContext *ctx)
{
- u16 index = VarGet(script_read_halfword(ctx));
+ u16 index = VarGet(ScriptReadHalfword(ctx));
ctx->comparisonResult = trainer_flag_check(index);
return FALSE;
}
bool8 ScrCmd_cleartrainerflag(struct ScriptContext *ctx)
{
- u16 index = VarGet(script_read_halfword(ctx));
+ u16 index = VarGet(ScriptReadHalfword(ctx));
trainer_flag_set(index);
return FALSE;
}
bool8 ScrCmd_settrainerflag(struct ScriptContext *ctx)
{
- u16 index = VarGet(script_read_halfword(ctx));
+ u16 index = VarGet(ScriptReadHalfword(ctx));
trainer_flag_clear(index);
return FALSE;
}
bool8 ScrCmd_setwildbattle(struct ScriptContext *ctx)
{
- u16 v2 = script_read_halfword(ctx);
+ u16 v2 = ScriptReadHalfword(ctx);
u8 v4 = *(ctx->scriptPtr++);
- u16 v5 = script_read_halfword(ctx);
+ u16 v5 = ScriptReadHalfword(ctx);
sub_80C54D0(v2, v4, v5);
return FALSE;
}
@@ -1728,39 +1728,39 @@ bool8 ScrCmd_setwildbattle(struct ScriptContext *ctx)
bool8 ScrCmd_dowildbattle(struct ScriptContext *ctx)
{
sub_8081B3C();
- sub_80655F0();
+ ScriptContext1_Stop();
return TRUE;
}
bool8 ScrCmd_pokemart(struct ScriptContext *ctx)
{
- void *ptr = (void *)script_read_word(ctx);
+ void *ptr = (void *)ScriptReadWord(ctx);
CreatePokemartMenu(ptr);
- sub_80655F0();
+ ScriptContext1_Stop();
return TRUE;
}
bool8 ScrCmd_pokemartdecor(struct ScriptContext *ctx)
{
- void *ptr = (void *)script_read_word(ctx);
+ void *ptr = (void *)ScriptReadWord(ctx);
CreateDecorationShop1Menu(ptr);
- sub_80655F0();
+ ScriptContext1_Stop();
return TRUE;
}
bool8 ScrCmd_pokemartbp(struct ScriptContext *ctx)
{
- void *ptr = (void *)script_read_word(ctx);
+ void *ptr = (void *)ScriptReadWord(ctx);
CreateDecorationShop2Menu(ptr);
- sub_80655F0();
+ ScriptContext1_Stop();
return TRUE;
}
bool8 ScrCmd_pokecasino(struct ScriptContext *ctx)
{
- u8 v2 = VarGet(script_read_halfword(ctx));
+ u8 v2 = VarGet(ScriptReadHalfword(ctx));
sub_81018A0(v2, c2_exit_to_overworld_1_continue_scripts_restart_music);
- sub_80655F0();
+ ScriptContext1_Stop();
return TRUE;
}
@@ -1778,7 +1778,7 @@ bool8 ScrCmd_event_8a(struct ScriptContext *ctx)
bool8 ScrCmd_event_96(struct ScriptContext *ctx)
{
- u16 value = VarGet(script_read_halfword(ctx));
+ u16 value = VarGet(ScriptReadHalfword(ctx));
gScriptResult = GetPriceReduction(value);
return FALSE;
}
@@ -1786,34 +1786,34 @@ bool8 ScrCmd_event_96(struct ScriptContext *ctx)
bool8 ScrCmd_choosecontestpkmn(struct ScriptContext *ctx)
{
sub_80F99CC();
- sub_80655F0();
+ ScriptContext1_Stop();
return TRUE;
}
bool8 ScrCmd_startcontest(struct ScriptContext *ctx)
{
sub_80C48C8();
- sub_80655F0();
+ ScriptContext1_Stop();
return TRUE;
}
bool8 ScrCmd_showcontestresults(struct ScriptContext *ctx)
{
sub_80C4940();
- sub_80655F0();
+ ScriptContext1_Stop();
return TRUE;
}
bool8 ScrCmd_contestlinktransfer(struct ScriptContext *ctx)
{
sub_80C4980(gUnknown_0203869C);
- sub_80655F0();
+ ScriptContext1_Stop();
return TRUE;
}
bool8 ScrCmd_doanimation(struct ScriptContext *ctx)
{
- u16 effectId = VarGet(script_read_halfword(ctx));
+ u16 effectId = VarGet(ScriptReadHalfword(ctx));
gUnknown_0202E8BC = effectId;
FieldEffectStart(gUnknown_0202E8BC);
return FALSE;
@@ -1822,7 +1822,7 @@ bool8 ScrCmd_doanimation(struct ScriptContext *ctx)
bool8 ScrCmd_setanimation(struct ScriptContext *ctx)
{
u8 v2 = *(ctx->scriptPtr++);
- gUnknown_0202FF84[v2] = (s16)VarGet(script_read_halfword(ctx));
+ gUnknown_0202FF84[v2] = (s16)VarGet(ScriptReadHalfword(ctx));
return FALSE;
}
@@ -1836,14 +1836,14 @@ bool8 sub_8067B48()
bool8 ScrCmd_checkanimation(struct ScriptContext *ctx)
{
- gUnknown_0202E8BC = VarGet(script_read_halfword(ctx));
- script_setup_asm_script(ctx, sub_8067B48);
+ gUnknown_0202E8BC = VarGet(ScriptReadHalfword(ctx));
+ SetupNativeScript(ctx, sub_8067B48);
return TRUE;
}
bool8 ScrCmd_sethealplace(struct ScriptContext *ctx)
{
- u16 v2 = VarGet(script_read_halfword(ctx));
+ u16 v2 = VarGet(ScriptReadHalfword(ctx));
sub_8053588(v2);
return FALSE;
}
@@ -1856,24 +1856,24 @@ bool8 ScrCmd_checkgender(struct ScriptContext *ctx)
bool8 ScrCmd_pokecry(struct ScriptContext *ctx)
{
- u16 v3 = VarGet(script_read_halfword(ctx));
- u16 v5 = VarGet(script_read_halfword(ctx));
+ u16 v3 = VarGet(ScriptReadHalfword(ctx));
+ u16 v5 = VarGet(ScriptReadHalfword(ctx));
sub_8075178(v3, v5);
return FALSE;
}
bool8 ScrCmd_waitpokecry(struct ScriptContext *ctx)
{
- script_setup_asm_script(ctx, sub_8075374);
+ SetupNativeScript(ctx, sub_8075374);
return TRUE;
}
bool8 ScrCmd_setmaptile(struct ScriptContext *ctx)
{
- u16 v3 = VarGet(script_read_halfword(ctx));
- u16 v5 = VarGet(script_read_halfword(ctx));
- u16 v7 = VarGet(script_read_halfword(ctx));
- u16 v8 = VarGet(script_read_halfword(ctx));
+ u16 v3 = VarGet(ScriptReadHalfword(ctx));
+ u16 v5 = VarGet(ScriptReadHalfword(ctx));
+ u16 v7 = VarGet(ScriptReadHalfword(ctx));
+ u16 v8 = VarGet(ScriptReadHalfword(ctx));
v3 += 7;
v5 += 7;
if (!v8)
@@ -1885,8 +1885,8 @@ bool8 ScrCmd_setmaptile(struct ScriptContext *ctx)
bool8 ScrCmd_setdooropened(struct ScriptContext *ctx)
{
- u16 v3 = VarGet(script_read_halfword(ctx));
- u16 v4 = VarGet(script_read_halfword(ctx));
+ u16 v3 = VarGet(ScriptReadHalfword(ctx));
+ u16 v4 = VarGet(ScriptReadHalfword(ctx));
u16 v7;
v3 += 7;
v4 += 7;
@@ -1898,8 +1898,8 @@ bool8 ScrCmd_setdooropened(struct ScriptContext *ctx)
bool8 ScrCmd_setdoorclosed(struct ScriptContext *ctx)
{
- u16 v3 = VarGet(script_read_halfword(ctx));
- u16 v5 = VarGet(script_read_halfword(ctx));
+ u16 v3 = VarGet(ScriptReadHalfword(ctx));
+ u16 v5 = VarGet(ScriptReadHalfword(ctx));
v3 += 7;
v5 += 7;
sub_805870C(v3, v5);
@@ -1916,14 +1916,14 @@ bool8 sub_8067D2C()
bool8 ScrCmd_doorchange(struct ScriptContext *ctx)
{
- script_setup_asm_script(ctx, sub_8067D2C);
+ SetupNativeScript(ctx, sub_8067D2C);
return TRUE;
}
bool8 ScrCmd_setdooropened2(struct ScriptContext *ctx)
{
- u16 v3 = VarGet(script_read_halfword(ctx));
- u16 v5 = VarGet(script_read_halfword(ctx));
+ u16 v3 = VarGet(ScriptReadHalfword(ctx));
+ u16 v5 = VarGet(ScriptReadHalfword(ctx));
v3 += 7;
v5 += 7;
sub_80586B4(v3, v5);
@@ -1932,8 +1932,8 @@ bool8 ScrCmd_setdooropened2(struct ScriptContext *ctx)
bool8 ScrCmd_setdoorclosed2(struct ScriptContext *ctx)
{
- u16 v3 = VarGet(script_read_halfword(ctx));
- u16 v5 = VarGet(script_read_halfword(ctx));
+ u16 v3 = VarGet(ScriptReadHalfword(ctx));
+ u16 v5 = VarGet(ScriptReadHalfword(ctx));
v3 += 7;
v5 += 7;
sub_80586E0(v3, v5);
@@ -1943,9 +1943,9 @@ bool8 ScrCmd_setdoorclosed2(struct ScriptContext *ctx)
bool8 ScrCmd_event_b1(struct ScriptContext *ctx)
{
u8 v3 = *(ctx->scriptPtr++);
- u16 v5 = VarGet(script_read_halfword(ctx));
- u16 v7 = VarGet(script_read_halfword(ctx));
- u16 v9 = VarGet(script_read_halfword(ctx));
+ u16 v5 = VarGet(ScriptReadHalfword(ctx));
+ u16 v7 = VarGet(ScriptReadHalfword(ctx));
+ u16 v9 = VarGet(ScriptReadHalfword(ctx));
sub_810E7AC(v3, v5, v7, v9);
return FALSE;
}
@@ -1953,20 +1953,20 @@ bool8 ScrCmd_event_b1(struct ScriptContext *ctx)
bool8 ScrCmd_event_b2(struct ScriptContext *ctx)
{
sub_810E824();
- sub_80655F0();
+ ScriptContext1_Stop();
return TRUE;
}
bool8 ScrCmd_checkcoins(struct ScriptContext *ctx)
{
- u16 *ptr = GetVarPointer(script_read_halfword(ctx));
+ u16 *ptr = GetVarPointer(ScriptReadHalfword(ctx));
*ptr = GetCoins();
return FALSE;
}
bool8 ScrCmd_givecoins(struct ScriptContext *ctx)
{
- u16 v2 = VarGet(script_read_halfword(ctx));
+ u16 v2 = VarGet(ScriptReadHalfword(ctx));
if (sub_811A840(v2) == TRUE)
gScriptResult = 0;
else
@@ -1977,7 +1977,7 @@ bool8 ScrCmd_givecoins(struct ScriptContext *ctx)
bool8 ScrCmd_removecoins(struct ScriptContext *ctx)
{
- u16 v2 = VarGet(script_read_halfword(ctx));
+ u16 v2 = VarGet(ScriptReadHalfword(ctx));
if (sub_811A898(v2) == TRUE)
gScriptResult = 0;
else
diff --git a/src/script.c b/src/script.c
index 4bb4efdae..eb6750899 100644
--- a/src/script.c
+++ b/src/script.c
@@ -16,7 +16,7 @@ extern ScrCmdFunc gScriptCmdTable[];
extern ScrCmdFunc gScriptCmdTableEnd[];
extern void *gUnknown_083762D8;
-void script_env_init(struct ScriptContext *ctx, void *cmdTable, void *cmdTableEnd)
+void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, void *cmdTableEnd)
{
s32 i;
@@ -34,26 +34,26 @@ void script_env_init(struct ScriptContext *ctx, void *cmdTable, void *cmdTableEn
ctx->stack[i] = 0;
}
-u8 script_setup_bytecode_script(struct ScriptContext *ctx, void *ptr)
+u8 SetupBytecodeScript(struct ScriptContext *ctx, void *ptr)
{
ctx->scriptPtr = ptr;
ctx->mode = 1;
return 1;
}
-void script_setup_asm_script(struct ScriptContext *ctx, void *ptr)
+void SetupNativeScript(struct ScriptContext *ctx, void *ptr)
{
ctx->mode = 2;
ctx->nativePtr = ptr;
}
-void script_stop(struct ScriptContext *ctx)
+void StopScript(struct ScriptContext *ctx)
{
ctx->mode = 0;
ctx->scriptPtr = 0;
}
-u8 sub_80653EC(struct ScriptContext *ctx)
+u8 RunScript(struct ScriptContext *ctx)
{
if (ctx->mode == 0)
return 0;
@@ -106,7 +106,7 @@ u8 sub_80653EC(struct ScriptContext *ctx)
return 1;
}
-u8 script_stack_push(struct ScriptContext *ctx, u8 *ptr)
+u8 ScriptPush(struct ScriptContext *ctx, u8 *ptr)
{
if (ctx->stackDepth + 1 >= 20)
{
@@ -120,7 +120,7 @@ u8 script_stack_push(struct ScriptContext *ctx, u8 *ptr)
}
}
-u8 *script_stack_pop(struct ScriptContext *ctx)
+u8 *ScriptPop(struct ScriptContext *ctx)
{
if (ctx->stackDepth == 0)
return NULL;
@@ -129,30 +129,30 @@ u8 *script_stack_pop(struct ScriptContext *ctx)
return ctx->stack[ctx->stackDepth];
}
-void script_jump(struct ScriptContext *ctx, u8 *ptr)
+void ScriptJump(struct ScriptContext *ctx, u8 *ptr)
{
ctx->scriptPtr = ptr;
}
-void script_call(struct ScriptContext *ctx, u8 *ptr)
+void ScriptCall(struct ScriptContext *ctx, u8 *ptr)
{
- script_stack_push(ctx, ctx->scriptPtr);
+ ScriptPush(ctx, ctx->scriptPtr);
ctx->scriptPtr = ptr;
}
-void script_return(struct ScriptContext *ctx)
+void ScriptReturn(struct ScriptContext *ctx)
{
- ctx->scriptPtr = script_stack_pop(ctx);
+ ctx->scriptPtr = ScriptPop(ctx);
}
-u16 script_read_halfword(struct ScriptContext *ctx)
+u16 ScriptReadHalfword(struct ScriptContext *ctx)
{
u16 value = *(ctx->scriptPtr++);
value |= *(ctx->scriptPtr++) << 8;
return value;
}
-u32 script_read_word(struct ScriptContext *ctx)
+u32 ScriptReadWord(struct ScriptContext *ctx)
{
u32 value0 = *(ctx->scriptPtr++);
u32 value1 = *(ctx->scriptPtr++);
@@ -161,28 +161,28 @@ u32 script_read_word(struct ScriptContext *ctx)
return (((((value3 << 8) + value2) << 8) + value1) << 8) + value0;
}
-void script_env_2_enable(void)
+void ScriptContext2_Enable(void)
{
sScriptContext2Enabled = TRUE;
}
-void script_env_2_disable(void)
+void ScriptContext2_Disable(void)
{
sScriptContext2Enabled = FALSE;
}
-bool8 script_env_2_is_enabled(void)
+bool8 ScriptContext2_IsEnabled(void)
{
return sScriptContext2Enabled;
}
-void script_env_1_init(void)
+void ScriptContext1_Init(void)
{
- script_env_init(&sScriptContext1, gScriptCmdTable, gScriptCmdTableEnd);
+ InitScriptContext(&sScriptContext1, gScriptCmdTable, gScriptCmdTableEnd);
sScriptContext1Status = 2;
}
-bool8 script_env_2_run_current_script(void)
+bool8 ScriptContext2_RunScript(void)
{
if (sScriptContext1Status == 2)
return 0;
@@ -190,42 +190,42 @@ bool8 script_env_2_run_current_script(void)
if (sScriptContext1Status == 1)
return 0;
- script_env_2_enable();
+ ScriptContext2_Enable();
- if (!sub_80653EC(&sScriptContext1))
+ if (!RunScript(&sScriptContext1))
{
sScriptContext1Status = 2;
- script_env_2_disable();
+ ScriptContext2_Disable();
return 0;
}
return 1;
}
-void script_env_1_execute_new_script(u8 *ptr)
+void ScriptContext1_SetupScript(u8 *ptr)
{
- script_env_init(&sScriptContext1, gScriptCmdTable, gScriptCmdTableEnd);
- script_setup_bytecode_script(&sScriptContext1, ptr);
- script_env_2_enable();
+ InitScriptContext(&sScriptContext1, gScriptCmdTable, gScriptCmdTableEnd);
+ SetupBytecodeScript(&sScriptContext1, ptr);
+ ScriptContext2_Enable();
sScriptContext1Status = 0;
}
-void sub_80655F0(void)
+void ScriptContext1_Stop(void)
{
sScriptContext1Status = 1;
}
-void script_env_2_enable_and_set_ctx_running()
+void EnableBothScriptContexts()
{
sScriptContext1Status = 0;
- script_env_2_enable();
+ ScriptContext2_Enable();
}
-void script_env_2_execute_new_script(u8 *ptr)
+void ScriptContext2_RunNewScript(u8 *ptr)
{
- script_env_init(&sScriptContext2, &gScriptCmdTable, &gScriptCmdTableEnd);
- script_setup_bytecode_script(&sScriptContext2, ptr);
- while (sub_80653EC(&sScriptContext2) == 1)
+ InitScriptContext(&sScriptContext2, &gScriptCmdTable, &gScriptCmdTableEnd);
+ SetupBytecodeScript(&sScriptContext2, ptr);
+ while (RunScript(&sScriptContext2) == 1)
;
}
@@ -253,7 +253,7 @@ void mapheader_run_script_by_tag(u8 tag)
{
u8 *ptr = mapheader_get_tagged_pointer(tag);
if (ptr)
- script_env_2_execute_new_script(ptr);
+ ScriptContext2_RunNewScript(ptr);
}
u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag)
@@ -306,7 +306,7 @@ bool8 mapheader_run_first_tag2_script_list_match(void)
if (!ptr)
return 0;
- script_env_1_execute_new_script(ptr);
+ ScriptContext1_SetupScript(ptr);
return 1;
}
@@ -314,10 +314,10 @@ void mapheader_run_first_tag4_script_list_match()
{
u8 *ptr = mapheader_get_first_match_from_tagged_ptr_list(4);
if (ptr)
- script_env_2_execute_new_script(ptr);
+ ScriptContext2_RunNewScript(ptr);
}
-u32 sub_8065760(void)
+u32 CalculateRamScriptChecksum(void)
{
u32 i;
u32 sum = 0;
@@ -326,16 +326,16 @@ u32 sub_8065760(void)
return sum;
}
-void killram(void)
+void ClearRamScript(void)
{
CpuFill32(0, &gSaveBlock1.ramScript, sizeof(struct RamScript));
}
-bool8 sub_80657A8(u8 *a1, u16 a2, u8 a3, u8 a4, u8 a5)
+bool8 InitRamScript(u8 *a1, u16 a2, u8 a3, u8 a4, u8 a5)
{
struct RamScriptData *scriptData = &gSaveBlock1.ramScript.data;
- killram();
+ ClearRamScript();
if (a2 > 995)
return FALSE;
@@ -345,11 +345,11 @@ bool8 sub_80657A8(u8 *a1, u16 a2, u8 a3, u8 a4, u8 a5)
scriptData->mapNum = a4;
scriptData->objectId = a5;
memcpy(scriptData->script, a1, a2);
- gSaveBlock1.ramScript.checksum = sub_8065760();
+ gSaveBlock1.ramScript.checksum = CalculateRamScriptChecksum();
return TRUE;
}
-u8 *sub_806580C(u8 a1, u8 *a2)
+u8 *GetRamScript(u8 a1, u8 *a2)
{
struct RamScriptData *scriptData = &gSaveBlock1.ramScript.data;
gUnknown_0202E8AC = 0;
@@ -358,12 +358,12 @@ u8 *sub_806580C(u8 a1, u8 *a2)
&& scriptData->mapNum == gSaveBlock1.location.mapNum
&& scriptData->objectId == a1)
{
- if (sub_8065760() == gSaveBlock1.ramScript.checksum)
+ if (CalculateRamScriptChecksum() == gSaveBlock1.ramScript.checksum)
{
gUnknown_0202E8AC = a2;
return scriptData->script;
}
- killram();
+ ClearRamScript();
}
return a2;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 14:19:15 +0000