summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--asm/rom.s12
-rw-r--r--data/data1.s7
-rw-r--r--data/script_cmd_table.s203
3 files changed, 211 insertions, 11 deletions
diff --git a/asm/rom.s b/asm/rom.s
index e63e4149a..05132f1c2 100644
--- a/asm/rom.s
+++ b/asm/rom.s
@@ -207605,8 +207605,8 @@ script_env_1_init: ; 8065554
bx r0
.align 2
_0806556C: .4byte 0x030005b8
-_08065570: .4byte gUnknown_0814AE30
-_08065574: .4byte gUnknown_0814B148
+_08065570: .4byte gScriptCmdTable
+_08065574: .4byte gScriptCmdTableEnd
_08065578: .4byte 0x030005b0
thumb_func_end script_env_1_init
@@ -207663,8 +207663,8 @@ script_env_1_execute_new_script: ; 80655B8
bx r0
.align 2
_080655E0: .4byte 0x030005b8
-_080655E4: .4byte gUnknown_0814AE30
-_080655E8: .4byte gUnknown_0814B148
+_080655E4: .4byte gScriptCmdTable
+_080655E8: .4byte gScriptCmdTableEnd
_080655EC: .4byte 0x030005b0
thumb_func_end script_env_1_execute_new_script
@@ -207715,8 +207715,8 @@ _08065628:
bx r0
.align 2
_0806563C: .4byte 0x03000630
-_08065640: .4byte gUnknown_0814AE30
-_08065644: .4byte gUnknown_0814B148
+_08065640: .4byte gScriptCmdTable
+_08065644: .4byte gScriptCmdTableEnd
thumb_func_end script_env_2_execute_new_script
thumb_func_start mapheader_get_tagged_pointer
diff --git a/data/data1.s b/data/data1.s
index 9352de82e..a4bfd3906 100644
--- a/data/data1.s
+++ b/data/data1.s
@@ -1,10 +1,7 @@
; the first big chunk of data
-gUnknown_0814AE30: ; 814AE30
- .incbin "baserom.gba", 0x0014ae30, 0x318
-
-gUnknown_0814B148: ; 814B148
- .incbin "baserom.gba", 0x0014b148, 0x4
+; 814AE30
+ .include "data/script_cmd_table.s"
gUnknown_0814B14C: ; 814B14C
.incbin "baserom.gba", 0x0014b14c, 0x48
diff --git a/data/script_cmd_table.s b/data/script_cmd_table.s
new file mode 100644
index 000000000..64a8c5ce9
--- /dev/null
+++ b/data/script_cmd_table.s
@@ -0,0 +1,203 @@
+ .align 2
+
+gScriptCmdTable: ; 814AE30
+ .4byte sub_806586C
+ .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 sub_80672E8
+ .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
+gScriptCmdTableEnd:
+ .4byte sub_806586C