1 files changed, 199 insertions, 199 deletions
diff --git a/data/script_cmd_table.s b/data/script_cmd_table.s
index 696b20f40..a68f2ca8d 100644
--- a/data/script_cmd_table.s
+++ b/data/script_cmd_table.s
@@ -1,203 +1,203 @@
 	.align 2
 gScriptCmdTable:: @ 814AE30
-	.4byte s00_nop
-	.4byte sub_8065870
-	.4byte s02_end
-	.4byte s03_return
-	.4byte s04_call
-	.4byte s05_goto
-	.4byte s06_if_jump
-	.4byte s07_if_call
-	.4byte s08_jumpstd
-	.4byte s09_callstd
-	.4byte s0A_jumpstd_if
-	.4byte s0B_callstd_if
-	.4byte s0C_restore_execution_after_sCF
-	.4byte s0D_endscript_killram
-	.4byte s0E_set_byte
-	.4byte s0F_u32_var_to_const
-	.4byte sub_8065C44
-	.4byte s11_u8_ptr_to_const
-	.4byte s12_u32_var_to_ptr
-	.4byte s13_u8_var_to_ptr
-	.4byte s14_u32_var_to_var
-	.4byte s15_u8_ptr_to_ptr
-	.4byte s16_u16_gvar_to_const
-	.4byte s17_u16_gvar_add_const
-	.4byte sub_8065EDC
-	.4byte s19_u16_gvar_gvar
-	.4byte s1A_u16_gvar_gvar
-	.4byte s1B_cmp_u8_var_var
-	.4byte s1C_cmp_u8_var_const
-	.4byte s1D_cmp_u8_var_ptr
-	.4byte s1E_cmp_u8_ptr_var
-	.4byte s1F_cmp_u8_ptr_const
-	.4byte s20_cmp_u8_ptr_ptr
-	.4byte s21_cmp_u16_gvar_const
-	.4byte s22_cmp_u16_gvar_gvar
-	.4byte sub_80658EC
-	.4byte s24_execute_ASM_2
-	.4byte sub_8065898
-	.4byte sub_80658B8
-	.4byte sub_80658FC
-	.4byte s28_pause
-	.4byte s29_flag_set
-	.4byte s2A_flag_clear
-	.4byte s2B_flag_check
-	.4byte s2C_unknown
-	.4byte s2D_unknown
-	.4byte s2E_unknown
-	.4byte s2F_music_play
-	.4byte sub_806697C
-	.4byte s31_fanfare_play
-	.4byte sub_80669B4
-	.4byte s33_play_music
-	.4byte s34_unknown
-	.4byte s35_fade_to_default
-	.4byte s36_fade_to_music
-	.4byte s37_fadeout
-	.4byte s38_fadein
-	.4byte s39_warp_sfx
-	.4byte s3A_warp_new_music
-	.4byte s3B_warp_keep_music
-	.4byte sub_806657C
-	.4byte s3D_warp_v4
-	.4byte s3E_set_new_map
-	.4byte s3F_set_new_map_DMA
-	.4byte sub_806677C
-	.4byte sub_80667FC
-	.4byte sub_80668FC
-	.4byte s43_get_player_party_count
-	.4byte sub_8065F40
-	.4byte sub_8065F84
-	.4byte sub_8065FC8
-	.4byte sub_806600C
-	.4byte s48_get_item_type
-	.4byte sub_806607C
-	.4byte sub_80660C0
-	.4byte sub_8066104
-	.4byte sub_8066130
-	.4byte sub_8066188
-	.4byte sub_806615C
-	.4byte s4F_execute_movement
-	.4byte s50_execute_movement_remote
-	.4byte s51_waitmove
-	.4byte s52_waitmove_remote
-	.4byte sub_8066BD8
-	.4byte s54_hide_sprite_set_coords
-	.4byte sub_8066C30
-	.4byte s56_show_sprite_set_coords
-	.4byte s57_move_sprites
-	.4byte s58_npc_f1_clear_x20
-	.4byte s59_npc_f1_set_x20
-	.4byte s5A_face_player
-	.4byte s5B_npc_set_direction
-	.4byte s5C_trainer_battle_configure_and_start
-	.4byte sub_8067908
-	.4byte sub_8067914
-	.4byte sub_8067928
-	.4byte s60_check_trainer_flag
-	.4byte s61_set_trainer_flag
-	.4byte s62_unset_trainer_flag
-	.4byte s63_new_sprite_location_permanent
-	.4byte s64_set_sprite_top_left_corner
-	.4byte s65_set_sprite_behaviour
-	.4byte sub_80670A0
-	.4byte s67_execute_box
-	.4byte s68_close_box
-	.4byte sub_8066F58
-	.4byte sub_8066F80
-	.4byte s6B_release
-	.4byte s6C_release_2
-	.4byte sub_80670E8
-	.4byte s6E_yes_no
-	.4byte sub_8067128
-	.4byte sub_8067164
-	.4byte sub_80671E0
-	.4byte sub_80671B4
-	.4byte sub_8067230
-	.4byte s6F_multichoice
-	.4byte sub_8067298
-	.4byte s76_close_picture_box
-	.4byte s77_showcontestwinner
-	.4byte sub_806730C
-	.4byte s79_give_pokemon
-	.4byte s7A_create_egg
-	.4byte s7B_change_pokedata_AP
-	.4byte sub_80676E0
-	.4byte s7D_load_pokename
-	.4byte s7E_load_first_pokenames
-	.4byte s7F_load_pokename_team
-	.4byte s80_load_item_name
-	.4byte sub_8067488
-	.4byte s82_load_item_name
-	.4byte s83_load_textvar_var
-	.4byte s84_load_textvar_std_expression
-	.4byte s85_load_textvar_pointer
-	.4byte s86_pokemart
-	.4byte s87_pokemartdecor
-	.4byte s88_pokemartbp
-	.4byte s89_open_casino_game1
-	.4byte berry_script_cmd
-	.4byte sub_8067AA8
-	.4byte sub_8067AB8
-	.4byte sub_8067AC8
-	.4byte sub_8067AD8
-	.4byte s8F_get_random_val
-	.4byte sub_806775C
-	.4byte sub_8067788
-	.4byte s92_check_money
-	.4byte sub_80677F4
-	.4byte sub_806782C
-	.4byte sub_8067848
-	.4byte sub_8067A7C
-	.4byte s97_screen_special_effect
-	.4byte sub_8066290
-	.4byte sub_806622C
-	.4byte s9A_unknown
-	.4byte s9B_unknown
-	.4byte s9C_execute_HM
-	.4byte s9D_set_HM_animation_data
-	.4byte s9E_checkarray_HM_animation
-	.4byte sub_8067B94
-	.4byte sub_8067BB0
-	.4byte sA1_play_cry
-	.4byte sA2_setmaptile
-	.4byte sA3_set_standard_weather_data
-	.4byte sA4_set_weather_data
-	.4byte sub_80663A4
-	.4byte sA6_activate_per_step_callback_eg_ash
-	.4byte sub_80663C8
-	.4byte sA8_unknown
-	.4byte sA9_unknown
-	.4byte sAA_create_new_sprite
-	.4byte sAB_unknown
-	.4byte sAC_open_door
-	.4byte sub_8067CE8
-	.4byte sub_8067D44
-	.4byte sub_8067D58
-	.4byte sub_8067D9C
-	.4byte sub_8067DE0
-	.4byte sub_8067E4C
-	.4byte sB3_get_coin_amount
-	.4byte sub_8067E7C
-	.4byte sub_8067EB4
-	.4byte sB6_load_battle
-	.4byte sub_80679CC
-	.4byte sB8_set_virtual_address
-	.4byte sB9_virtual_jump
-	.4byte sBA_virtual_call
-	.4byte sBB_virtual_if_jump
-	.4byte sBC_virtual_if_call
-	.4byte sBD_virtual_message
-	.4byte sBE_virtual_load_text
-	.4byte sBF_virtual_load_textbuffer
-	.4byte sub_8067880
-	.4byte sub_80678AC
-	.4byte sub_80678C8
-	.4byte sC3_unknown
-	.4byte sC4_unknown
-	.4byte sub_8067BFC
+	.4byte ScrCmd_snop
+	.4byte ScrCmd_snop1
+	.4byte ScrCmd_end
+	.4byte ScrCmd_return
+	.4byte ScrCmd_call
+	.4byte ScrCmd_jump
+	.4byte ScrCmd_jumpif
+	.4byte ScrCmd_callif
+	.4byte ScrCmd_jumpstd
+	.4byte ScrCmd_callstd
+	.4byte ScrCmd_jumpstdif
+	.4byte ScrCmd_callstdif
+	.4byte ScrCmd_jumpram
+	.4byte ScrCmd_die
+	.4byte ScrCmd_setbyte
+	.4byte ScrCmd_loadptr
+	.4byte ScrCmd_setbufferbyte
+	.4byte ScrCmd_writebytetooffset
+	.4byte ScrCmd_loadbytefrompointer
+	.4byte ScrCmd_setptrbyte
+	.4byte ScrCmd_copybuffers
+	.4byte ScrCmd_copybyte
+	.4byte ScrCmd_setvar
+	.4byte ScrCmd_addvar
+	.4byte ScrCmd_subvar
+	.4byte ScrCmd_copyvar
+	.4byte ScrCmd_setorcopyvar
+	.4byte ScrCmd_comparebuffers
+	.4byte ScrCmd_comparebuffertobyte
+	.4byte ScrCmd_comparebuffertoptrbyte
+	.4byte ScrCmd_compareptrbytetobuffer
+	.4byte ScrCmd_compareptrbytetobyte
+	.4byte ScrCmd_compareptrbytes
+	.4byte ScrCmd_compare
+	.4byte ScrCmd_comparevars
+	.4byte ScrCmd_callasm
+	.4byte ScrCmd_jumpasm
+	.4byte ScrCmd_special
+	.4byte ScrCmd_specialval
+	.4byte ScrCmd_waitstate
+	.4byte ScrCmd_pause
+	.4byte ScrCmd_setflag
+	.4byte ScrCmd_clearflag
+	.4byte ScrCmd_checkflag
+	.4byte ScrCmd_compareflags
+	.4byte ScrCmd_checkdailyflags
+	.4byte ScrCmd_resetvars
+	.4byte ScrCmd_playsfx
+	.4byte ScrCmd_checksound
+	.4byte ScrCmd_fanfare
+	.4byte ScrCmd_waitfanfare
+	.4byte ScrCmd_playmusic
+	.4byte ScrCmd_playmusicbattle
+	.4byte ScrCmd_fadedefault
+	.4byte ScrCmd_fademusic
+	.4byte ScrCmd_fadeout
+	.4byte ScrCmd_fadein
+	.4byte ScrCmd_warp
+	.4byte ScrCmd_warpmuted
+	.4byte ScrCmd_warpwalk
+	.4byte ScrCmd_warphole
+	.4byte ScrCmd_warpteleport
+	.4byte ScrCmd_warp3
+	.4byte ScrCmd_warpplace
+	.4byte ScrCmd_warp4
+	.4byte ScrCmd_warp5
+	.4byte ScrCmd_getplayerxy
+	.4byte ScrCmd_countpokemon
+	.4byte ScrCmd_additem
+	.4byte ScrCmd_removeitem
+	.4byte ScrCmd_checkitemspace
+	.4byte ScrCmd_checkitem
+	.4byte ScrCmd_checkitemtype
+	.4byte ScrCmd_addpcitem
+	.4byte ScrCmd_checkpcitem
+	.4byte ScrCmd_adddecor
+	.4byte ScrCmd_removedecor
+	.4byte ScrCmd_testdecor
+	.4byte ScrCmd_checkdecor
+	.4byte ScrCmd_move
+	.4byte ScrCmd_movecoords
+	.4byte ScrCmd_waitmove
+	.4byte ScrCmd_waitmovexy
+	.4byte ScrCmd_disappear
+	.4byte ScrCmd_disappearxy
+	.4byte ScrCmd_reappear
+	.4byte ScrCmd_reappearxy
+	.4byte ScrCmd_movesprite
+	.4byte ScrCmd_spritevisible
+	.4byte ScrCmd_spriteinvisible
+	.4byte ScrCmd_faceplayer
+	.4byte ScrCmd_spriteface
+	.4byte ScrCmd_trainerbattle
+	.4byte ScrCmd_reptrainerbattle
+	.4byte ScrCmd_endtrainerbattle
+	.4byte ScrCmd_endtrainerbattle2
+	.4byte ScrCmd_checktrainerflag
+	.4byte ScrCmd_cleartrainerflag
+	.4byte ScrCmd_settrainerflag
+	.4byte ScrCmd_movespriteperm
+	.4byte ScrCmd_moveoffscreen
+	.4byte ScrCmd_spritebehave
+	.4byte ScrCmd_waittext
+	.4byte ScrCmd_message
+	.4byte ScrCmd_closebutton
+	.4byte ScrCmd_lockall
+	.4byte ScrCmd_lock
+	.4byte ScrCmd_releaseall
+	.4byte ScrCmd_release
+	.4byte ScrCmd_waitbutton
+	.4byte ScrCmd_yesnobox
+	.4byte ScrCmd_multichoice
+	.4byte ScrCmd_multichoicedef
+	.4byte ScrCmd_multichoicerow
+	.4byte ScrCmd_showbox
+	.4byte ScrCmd_hidebox
+	.4byte ScrCmd_clearbox
+	.4byte ScrCmd_showpokepic
+	.4byte ScrCmd_hidepokepic
+	.4byte ScrCmd_showcontestwinner
+	.4byte ScrCmd_braillemsg
+	.4byte ScrCmd_givepokemon
+	.4byte ScrCmd_giveegg
+	.4byte ScrCmd_setpokemove
+	.4byte ScrCmd_checkattack
+	.4byte ScrCmd_bufferpoke
+	.4byte ScrCmd_bufferfirstpoke
+	.4byte ScrCmd_bufferpartypoke
+	.4byte ScrCmd_bufferitem
+	.4byte ScrCmd_bufferdecor
+	.4byte ScrCmd_bufferattack
+	.4byte ScrCmd_buffernum
+	.4byte ScrCmd_bufferstd
+	.4byte ScrCmd_buffertext
+	.4byte ScrCmd_pokemart
+	.4byte ScrCmd_pokemartdecor
+	.4byte ScrCmd_pokemartbp
+	.4byte ScrCmd_pokecasino
+	.4byte ScrCmd_event_8a
+	.4byte ScrCmd_choosecontestpkmn
+	.4byte ScrCmd_startcontest
+	.4byte ScrCmd_showcontestresults
+	.4byte ScrCmd_contestlinktransfer
+	.4byte ScrCmd_random
+	.4byte ScrCmd_givemoney
+	.4byte ScrCmd_paymoney
+	.4byte ScrCmd_checkmoney
+	.4byte ScrCmd_showmoney
+	.4byte ScrCmd_hidemoney
+	.4byte ScrCmd_updatemoney
+	.4byte ScrCmd_event_96
+	.4byte ScrCmd_fadescreen
+	.4byte ScrCmd_fadescreendelay
+	.4byte ScrCmd_darken
+	.4byte ScrCmd_lighten
+	.4byte ScrCmd_message2
+	.4byte ScrCmd_doanimation
+	.4byte ScrCmd_setanimation
+	.4byte ScrCmd_checkanimation
+	.4byte ScrCmd_sethealplace
+	.4byte ScrCmd_checkgender
+	.4byte ScrCmd_pokecry
+	.4byte ScrCmd_setmaptile
+	.4byte ScrCmd_resetweather
+	.4byte ScrCmd_setweather
+	.4byte ScrCmd_doweather
+	.4byte ScrCmd_tileeffect
+	.4byte ScrCmd_setmapfooter
+	.4byte ScrCmd_spritelevelup
+	.4byte ScrCmd_restorespritelevel
+	.4byte ScrCmd_createvsprite
+	.4byte ScrCmd_vspriteface
+	.4byte ScrCmd_setdooropened
+	.4byte ScrCmd_setdoorclosed
+	.4byte ScrCmd_doorchange
+	.4byte ScrCmd_setdooropened2
+	.4byte ScrCmd_setdoorclosed2
+	.4byte ScrCmd_event_b1
+	.4byte ScrCmd_event_b2
+	.4byte ScrCmd_checkcoins
+	.4byte ScrCmd_givecoins
+	.4byte ScrCmd_removecoins
+	.4byte ScrCmd_setwildbattle
+	.4byte ScrCmd_dowildbattle
+	.4byte ScrCmd_setvaddress
+	.4byte ScrCmd_vjump
+	.4byte ScrCmd_vcall
+	.4byte ScrCmd_if5
+	.4byte ScrCmd_if6
+	.4byte ScrCmd_vtext
+	.4byte ScrCmd_vloadptr
+	.4byte ScrCmd_vbuffer
+	.4byte ScrCmd_showcoins
+	.4byte ScrCmd_hidecoins
+	.4byte ScrCmd_updatecoins
+	.4byte ScrCmd_inccounter
+	.4byte ScrCmd_warp6
+	.4byte ScrCmd_waitpokecry
 
 gScriptCmdTableEnd::
-	.4byte s00_nop
+	.4byte ScrCmd_snop