add battle music hooks

bpre.sym

@@ -1,184 +1,186 @@
-agbprintf = 0x081E39D8|1;
-agbprint_flush = 0x081E3B04|1;
-agb_assert = 0x081E3B14|1;
-set_callback2 = 0x08000545;
-vblank_handler_set = 0x080006F5;
-malloc = 0x08002BB0|1;
-free = 0x08002BC4|1;
-memmove = 0x081E8E60|1;
-memset = 0x081E5ED8|1;
-memcpy = 0x081E5E78|1;
-obj_template_instanciate_forward_search = 0x08006F8D;
-gpu_copy_to_vram_by_bgid = 0x08001298|1;
-virtual_bg_set_tilemap = 0x08001FA0|1;
-virtual_bg_nullify_tilemap = 0x08001FD4|1;
-virtual_bg_get_tilemap = 0x08002008|1;
-virtual_bg_send_tilemap = 0x080020BC|1;
-gpu_init_bgs = 0x08001028|1;
-gpu_tile_bg_drop_all_sets = 0x08001618|1;
-gpu_bg_vram_setup = 0x08001658|1;
-gpu_bg_show = 0x08001320|1;
-gpu_bg_hide = 0x0800139C|1;
-gpu_sync_bg_visibility_and_mode = 0x080013D0|1;
-gpu_pal_upload = 0x08070474|1;
-obj_gpu_sprites_upload = 0x08007320|1;
-obj_delete_all = 0x8007770|1;
-camera_move_and_redraw = 0x0805ACB4|1;
-calc_circle = 0x0807EE2C|1;
-random = 0x08044EC8|1;
-
-palette_unfaded_buffer = 0x020371F8;
-palette_faded_buffer = 0x020375F8;
-current_mapheader = 0x02036DFC;
-
-script_something = 0x08069AA8|1;
-camera_update = 0x0805ABB0|1;
-foo_115798 = 0x08115798|1;
-foo_5ae28 = 0x0805AE28|1;
-foo_6ffbc = 0x0806ffbc|1;
-tilemaps_sync = 0x080F67B8|1;
-
-mapdata_load_palettes_to_gpu = 0x08059AD8|1;
-npc_paltag_by_palslot = 0x0805FF34|1;
-
-oe_read_word = 0x08083550|1;
-some_weather_func = 0x0807AA8C|1;
-
-blockset_load_palette_to_gpu = 0x080599C8|1;
-npc_pal_idx_for_given_tag = 0x0805F5A0|1;
-gpu_pal_apply = 0x080703EC|1;
-tint_palette = 0x08083598|1;
-tint_filter = 0x02036E28;
-gpu_pal_tags_index_of = 0x080089E8|1;
-load_palette_3 = 0x080598CC|1;
-lz77u_wram = 0x0800EBB4|1;
-
-vram_decompress = 0x081E3B6C|1;
-pal_decompress_slice_to_faded_and_unfaded = 0x080703A8|1;
-obj_gpu_tile_decompress_alloc_tag_and_upload = 0x0800F035;
-obj_gpu_pal_alloc_tag_and_apply = 0x08008929;
-obj_gpu_tile_free_by_tag = 0x0800874D;
-gpu_pal_free_by_tag = 0x08008A31;
-obj_delete_and_free_tiles = 0x08007281;
-box_zero_flag = 0x0203709C;
-task_add_func = 0x0807741D;
-lcd_io_set_func = 0x08000A39;
-lcd_io_get = 0x08000AC4|1;
-flag_decrypt_func = 0x0806E6D1;
-var_access = 0x0806E455;
-var_get = 0x0806E569;
-var_set = 0x0806E585;
-flag_check = 0x0806E6D1;
-get_bs_elem_env_index = 0x0800FC2D;
-load_battle_screen_elements_1 = 0x0800F261;
-npc_states = 0x02036E38;
-battlescript_cursor = 0x02023D74;
-item_table = 0x0876DD80;
-execute_battle_script = 0x0801BC24;
-dp_01_prepare_buffer = 0x0800D8B1;
-wram_decompress = 0x081E3B70|1;
-battle_script_push = 0x08017544|1;
-
-fade_screen = 0x08070589;
-fade_update = 0x080704D1;
-
-callback_overworld = 0x080568C5;
-task_exec = 0x08077579;
-objc_exec = 0x08006B5D;
-obj_sync = 0x08006BA9;
-
-flag_clear = 0x0806E6A9;
-
-divide = 0x081E4018;
-
-get_side_from_bank = 0x080751C4|1;
-prepare_setattributes_in_battle = 0x0800DFF0|1;
-mark_buffer_bank_for_execution = 0x8017248|1;
-
-decompression_buffer = 0x0201C000;
-superstate = 0x030030F0;
-
-fade_controller = 0x02037AB8;
-
-npc_states = 0x02036E38;
-
-sav_one = 0x03005008;
-
-weather_turns = 0x02023F48;
-battle_type_flags = 0x02022B4C;
-battle_active_bank = 0x02023BC4;
-battle_num_active_sides = 0x02023BCC;
-battle_mode = 0x02023BE3;
-battle_participants	= 0x02023BE4;
-battle_data_ability = 0x02023C04;
-battle_data_current_hp = 0x02023C0C;
-battle_executed_move = 0x02023D4A;
-battle_last_used_ability = 0x02023D6A;
-battle_attacker_bank = 0x02023D6B;
-battle_defender_bank = 0x02023D6C;
-battle_attacker_p_bank = 0x02023D6D;
-battle_defender_p_bank = 0x02023D6E;
-battle_attack_effectivity = 0x02023DCC;
-battle_weather = 0x02023F1C;
-battle_damage_store = 0x02023D50;
-battle_base_power = 0x02023F50;
-battle_string_message_table = 0x083FDF3C;
-battle_string_chooser = 0x0203C020;
-battle_crit_loc = 0x02023D71;
-battle_side_unknown = 0x02023FDB;
-battle_side_timers = 0x02023DE4;
-battle_hitmarker = 0x02023dd0;
-battle_stat_changer = 0x02023FDE;
-battle_menu_chosen_item = 0x02023D7C;
-battle_stuff_ptr = 0x02023FE8;
-battle_enigma_berry = 0x02023F54;
-battle_turn_random = 0x02023e80;
-battle_damage_multiplier = 0x02023FD2;
-battle_protect = 0x02023E8C;
-side_affecting_halfword = 0x2023DDE;
-battle_turn_order = 0x02023bde;
-battle_status_3 = 0x02023DFC;
-
-battle_80801F0_something = 0x080801F0|1;
-battle_init = 0x08080110|1;
-
-trainerbattle_battle_type = 0x020386AC;
-trainerbattle_flag_id = 0x020386AE;
-trainerbattle_arg2 = 0x020386B0;
-trainerbattle_message_intro = 0x020386B4;
-trainerbattle_message_defeat = 0x020386B8;
-trainerbattle_message_2 = 0x020386BC;
-trainerbattle_message_need_2_poke = 0x020386C0;
-trainerbattle_next_scr_cmd = 0x020386C4;
-trainerbattle_message_4 = 0x020386C8;
-trainerbattle_unknown = 0x020386CC;
-
-item_get_quality = 0x0809A948|1;
-item_get_x12 = 0x0809A924|1;
-
-party_player = 0x02024284;
-party_opponent = 0x0202402C;
-
-pokemon_get_attribute = 0x0803FBE8|1;
-pokemon_set_attribute = 0x0804037C|1;
-pokemon_get_gender = 0x0803F720|1;
-
-pokemon_evolution_table = 08259754;
-
-
-battle_status3_bits_pbs = 0x02023DFC;
-
-battle_bg_table = 0x0824ee34;
-custom_battle_elements = 0x0203FE00;
-
-script_mode_set_stopped = 0x080697FD;
-
-mplay_table = 0x084A329C;
-
-m4aSongNumStart = 0x081DD0F5;
-MPlayStart_rev01 = 0x081DD859;
-MPlayContinue = 0x081DCFF9;
-__aeabi_idiv = 0x081E4018|1;
-__aeabi_idivmod = 0x081E40F4|1;
-__aeabi_uidiv = 0x081E460C|1;
-__aeabi_uidivmod = 0x081E4684|1;
+agbprintf = 0x081E39D8|1;
+agbprint_flush = 0x081E3B04|1;
+agb_assert = 0x081E3B14|1;
+set_callback2 = 0x08000545;
+vblank_handler_set = 0x080006F5;
+malloc = 0x08002BB0|1;
+free = 0x08002BC4|1;
+memmove = 0x081E8E60|1;
+memset = 0x081E5ED8|1;
+memcpy = 0x081E5E78|1;
+obj_template_instanciate_forward_search = 0x08006F8D;
+gpu_copy_to_vram_by_bgid = 0x08001298|1;
+virtual_bg_set_tilemap = 0x08001FA0|1;
+virtual_bg_nullify_tilemap = 0x08001FD4|1;
+virtual_bg_get_tilemap = 0x08002008|1;
+virtual_bg_send_tilemap = 0x080020BC|1;
+gpu_init_bgs = 0x08001028|1;
+gpu_tile_bg_drop_all_sets = 0x08001618|1;
+gpu_bg_vram_setup = 0x08001658|1;
+gpu_bg_show = 0x08001320|1;
+gpu_bg_hide = 0x0800139C|1;
+gpu_sync_bg_visibility_and_mode = 0x080013D0|1;
+gpu_pal_upload = 0x08070474|1;
+obj_gpu_sprites_upload = 0x08007320|1;
+obj_delete_all = 0x8007770|1;
+camera_move_and_redraw = 0x0805ACB4|1;
+calc_circle = 0x0807EE2C|1;
+random = 0x08044EC8|1;
+
+palette_unfaded_buffer = 0x020371F8;
+palette_faded_buffer = 0x020375F8;
+current_mapheader = 0x02036DFC;
+
+script_something = 0x08069AA8|1;
+camera_update = 0x0805ABB0|1;
+foo_115798 = 0x08115798|1;
+foo_5ae28 = 0x0805AE28|1;
+foo_6ffbc = 0x0806ffbc|1;
+tilemaps_sync = 0x080F67B8|1;
+
+mapdata_load_palettes_to_gpu = 0x08059AD8|1;
+npc_paltag_by_palslot = 0x0805FF34|1;
+
+oe_read_word = 0x08083550|1;
+some_weather_func = 0x0807AA8C|1;
+
+blockset_load_palette_to_gpu = 0x080599C8|1;
+npc_pal_idx_for_given_tag = 0x0805F5A0|1;
+gpu_pal_apply = 0x080703EC|1;
+tint_palette = 0x08083598|1;
+tint_filter = 0x02036E28;
+gpu_pal_tags_index_of = 0x080089E8|1;
+load_palette_3 = 0x080598CC|1;
+lz77u_wram = 0x0800EBB4|1;
+
+vram_decompress = 0x081E3B6C|1;
+pal_decompress_slice_to_faded_and_unfaded = 0x080703A8|1;
+obj_gpu_tile_decompress_alloc_tag_and_upload = 0x0800F035;
+obj_gpu_pal_alloc_tag_and_apply = 0x08008929;
+obj_gpu_tile_free_by_tag = 0x0800874D;
+gpu_pal_free_by_tag = 0x08008A31;
+obj_delete_and_free_tiles = 0x08007281;
+box_zero_flag = 0x0203709C;
+task_add_func = 0x0807741D;
+lcd_io_set_func = 0x08000A39;
+lcd_io_get = 0x08000AC4|1;
+flag_decrypt_func = 0x0806E6D1;
+var_access = 0x0806E455;
+var_get = 0x0806E569;
+var_set = 0x0806E585;
+flag_check = 0x0806E6D1;
+get_bs_elem_env_index = 0x0800FC2D;
+load_battle_screen_elements_1 = 0x0800F261;
+npc_states = 0x02036E38;
+battlescript_cursor = 0x02023D74;
+item_table = 0x0876DD80;
+execute_battle_script = 0x0801BC24;
+dp_01_prepare_buffer = 0x0800D8B1;
+wram_decompress = 0x081E3B70|1;
+battle_script_push = 0x08017544|1;
+
+fade_screen = 0x08070589;
+fade_update = 0x080704D1;
+
+callback_overworld = 0x080568C5;
+task_exec = 0x08077579;
+objc_exec = 0x08006B5D;
+obj_sync = 0x08006BA9;
+
+flag_clear = 0x0806E6A9;
+
+divide = 0x081E4018;
+
+get_side_from_bank = 0x080751C4|1;
+prepare_setattributes_in_battle = 0x0800DFF0|1;
+mark_buffer_bank_for_execution = 0x8017248|1;
+
+decompression_buffer = 0x0201C000;
+superstate = 0x030030F0;
+
+fade_controller = 0x02037AB8;
+
+npc_states = 0x02036E38;
+
+sav_one = 0x03005008;
+
+weather_turns = 0x02023F48;
+battle_type_flags = 0x02022B4C;
+battle_active_bank = 0x02023BC4;
+battle_num_active_sides = 0x02023BCC;
+battle_mode = 0x02023BE3;
+battle_participants	= 0x02023BE4;
+battle_data_ability = 0x02023C04;
+battle_data_current_hp = 0x02023C0C;
+battle_executed_move = 0x02023D4A;
+battle_last_used_ability = 0x02023D6A;
+battle_attacker_bank = 0x02023D6B;
+battle_defender_bank = 0x02023D6C;
+battle_attacker_p_bank = 0x02023D6D;
+battle_defender_p_bank = 0x02023D6E;
+battle_attack_effectivity = 0x02023DCC;
+battle_weather = 0x02023F1C;
+battle_damage_store = 0x02023D50;
+battle_base_power = 0x02023F50;
+battle_string_message_table = 0x083FDF3C;
+battle_string_chooser = 0x0203C020;
+battle_crit_loc = 0x02023D71;
+battle_side_unknown = 0x02023FDB;
+battle_side_timers = 0x02023DE4;
+battle_hitmarker = 0x02023dd0;
+battle_stat_changer = 0x02023FDE;
+battle_menu_chosen_item = 0x02023D7C;
+battle_stuff_ptr = 0x02023FE8;
+battle_enigma_berry = 0x02023F54;
+battle_turn_random = 0x02023e80;
+battle_damage_multiplier = 0x02023FD2;
+battle_protect = 0x02023E8C;
+side_affecting_halfword = 0x2023DDE;
+battle_turn_order = 0x02023bde;
+battle_status_3 = 0x02023DFC;
+
+battle_80801F0_something = 0x080801F0|1;
+battle_init = 0x08080110|1;
+
+trainerbattle_battle_type = 0x020386AC;
+trainerbattle_flag_id = 0x020386AE;
+trainerbattle_arg2 = 0x020386B0;
+trainerbattle_message_intro = 0x020386B4;
+trainerbattle_message_defeat = 0x020386B8;
+trainerbattle_message_2 = 0x020386BC;
+trainerbattle_message_need_2_poke = 0x020386C0;
+trainerbattle_next_scr_cmd = 0x020386C4;
+trainerbattle_message_4 = 0x020386C8;
+trainerbattle_unknown = 0x020386CC;
+
+song_play_for_text = 0x080722A0|1;
+
+item_get_quality = 0x0809A948|1;
+item_get_x12 = 0x0809A924|1;
+
+party_player = 0x02024284;
+party_opponent = 0x0202402C;
+
+pokemon_get_attribute = 0x0803FBE8|1;
+pokemon_set_attribute = 0x0804037C|1;
+pokemon_get_gender = 0x0803F720|1;
+
+pokemon_evolution_table = 08259754;
+
+
+battle_status3_bits_pbs = 0x02023DFC;
+
+battle_bg_table = 0x0824ee34;
+custom_battle_elements = 0x0203FE00;
+
+script_mode_set_stopped = 0x080697FD;
+
+mplay_table = 0x084A329C;
+
+m4aSongNumStart = 0x081DD0F5;
+MPlayStart_rev01 = 0x081DD859;
+MPlayContinue = 0x081DCFF9;
+__aeabi_idiv = 0x081E4018|1;
+__aeabi_idivmod = 0x081E40F4|1;
+__aeabi_uidiv = 0x081E460C|1;
+__aeabi_uidivmod = 0x081E4684|1;

patches/hooks.asm

@@ -1,222 +1,249 @@
-//Ipatix sound stuff
-.org 0x080007B4
-    .word  0x0203E000   // new PCM work area
-.org 0x081DD0B4
-    .word  main_mixer   // new mixer ROM location
-    .word  0x03005F50   // new mixer RAM location (used for loading)
-    .halfword mixer_size
-    .halfword 0x400        // CpuSet, copy code by 32 bit units
-    .word  0x0203E000   // new PCM work area
-.org 0x081DD0C8
-     // set correct sound driver operation mode
-     // 12 channels at 26758 Hz samplerate
-    .byte  0x00, 0xCC, 0x98, 0x00
-.org 0x081DC094
-    .word  0x03005F50+1 // new mixer RAM location (used for branch)
-
-   // repoint correctly to the new cry tables
-.org 0x080720C8
-    .include "patches/disable_cry_table_blocks.s"
-
-   // cry-ID = poke-ID
-.org 0x08043304
-    LSL R0, R0, #0x10
-    LSR R0, R0, #0x10
-    BX  LR
-
-   // music overrides
-.org 0x081DD0F4
-    LDR R1, =music_override|1
-    BX  R1
-    .pool
-
-.org 0x0808064C
-    LDR R1, =trainer_intro_music_id_to_song|1
-    LDR R2, =0x080806BA|1 // return location
-    MOV LR, R2
-    BX  R1
-    .pool
-
-//End of sound stuff
-
-//Don't know what thats all about... leaving it commented for now
-//.org 0x0800f268
-//    .halfword 0xE000
-
-//Battle bg use new table
-.org 0x0800F2A0
-    .word battle_bg_table
-
-.org 0x0800F2E0
-    .word battle_bg_table
-
-.org 0x0800F320
-    .word battle_bg_table
-
-.org 0x0800F40E
-    ldr r0, =battle_bg_hook|1
-    bx r0
-    lsl r0, #0
-	.pool
-
-.org 0x0800FD5C
-    .word battle_bg_table
-
-.org 0x0800FD88
-    .word battle_bg_table
-//end of battle bg table
-
-//flag routine
-.org 0x0806E5D6
-	ldr r0, =flag_hook|1
-	bx r0
-	lsl r0, #0
-	.pool
-//end of flag routine
-
-//var routine
-.org 0x0806E45C
-    ldr r0,=var_hook+1
-    bx r0
-	.pool
-
-//end of var routine
-
-//trainer Flag stuff
-.org 0x08080382
-	mov r1, #0x80
-	lsl r1, #0x15
-
-.org 0x080800BA
-	mov r2, #0x80
-	lsl r2, #0x5
-
-.org 0x08080428
-    mov r1, #0x80
-    lsl r1, #0x15
-
-.org 0x08080440
-    mov r1, #0x80
-    lsl r1, #0x15
-
-.org 0x08080454
-    mov r1, #0x80
-    lsl r1, #0x15
-//end of trainer flag stuff
-
-//New behavior bytes for jumping
-
-.org 0x0806811A
-	ldr r0,=jump_behavior|1
-	bx r0
-	.pool
-
-//behavior walk stuff
-.org 0x0806D720
-	ldr r0,=on_step|1
-	bx r0
-	.pool
-
-//end of new behavior bytes for jumping
-
-//transparent textboxes and mugshots
-.org 0x08069410
-    bx r0
-
-.org 0x0806941C
-    .word trans_activate|1
-
-.org 0x08069504
-    bx r1
-
-.org 0x0806950C
-    .word trans_deactivate|1
-
-.org 0x08150000
-    ldr r0, =pal_load_hook_2|1
-    bx r0
-	.pool
-
-.org 0x0815044A
-    bx r1
-
-.org 0x08150450
-    .word pal_load_hook|1
-
-.org 0x0809CEB2
-    ldr r0, =trans_mug_close_fix+1
-    bx r0
-    lsl r0, #0
-	.pool
-
-//end of transparent textboxes and mugshots
-
-//saveblock routine start
-
-.org 0x080D9EDC
-    ldr r0, =load_hijack|1
-    bx r0
-    .pool
-
-.org 0x080d991E
-    bx r7
-.org 0x080d995C
-    .word store_hijack|1
-
-.org 0x083FEC94
-.include "patches/save_table/save_table.S"
-
-//end of saveblock routine
-//new battle script commands
-	//replace tables
-.org 0x08014C1C
-	.word bs_command_table
-.org 0x08015A28
-	.word bs_command_table
-.org 0x08015C6C
-	.word bs_command_table
-.org 0x08015C98
-	.word bs_command_table
-.org 0x0801D054
-	.word bs_command_table
-
-//end of new battle script commands
-
-//move effect table
-
-.org 0x08016364
-	.word m_effect_table
-.org 0x08023328
-	.word m_effect_table
-.org 0x08025CF8
-	.word m_effect_table
-.org 0x08027464
-	.word m_effect_table
-.org 0x080297F0
-	.word m_effect_table
-.org 0x0802BE80
-	.word m_effect_table
-
-//end of move effect table
-
-//move limits
-
-.org 0x080D75FC
-	.byte 0,0,0,0,0,0
-
-//end of move limits
-
-//print string mod
-
-.org 0x080D77C0
-	bx r1
-
-.org 0x080D77CC
-	.word custom_print_string|1
-
-//end of print string mod
-
-//new move animation table
-.org 0x080725d0
-    .word m_animation_table
-//end of new move animation table
+_call_via_r0 equ 0x081E3BA8
+_call_via_r1 equ 0x081E3BAC
+
+//Ipatix sound stuff
+.org 0x080007B4
+    .word  0x0203E000   // new PCM work area
+.org 0x081DD0B4
+    .word  main_mixer   // new mixer ROM location
+    .word  0x03005F50   // new mixer RAM location (used for loading)
+    .halfword mixer_size
+    .halfword 0x400        // CpuSet, copy code by 32 bit units
+    .word  0x0203E000   // new PCM work area
+.org 0x081DD0C8
+     // set correct sound driver operation mode
+     // 12 channels at 26758 Hz samplerate
+    .byte  0x00, 0xCC, 0x98, 0x00
+.org 0x081DC094
+    .word  0x03005F50+1 // new mixer RAM location (used for branch)
+
+   // repoint correctly to the new cry tables
+.org 0x080720C8
+    .include "patches/disable_cry_table_blocks.s"
+
+   // cry-ID = poke-ID
+.org 0x08043304
+    LSL R0, R0, #0x10
+    LSR R0, R0, #0x10
+    BX  LR
+
+   // music overrides
+.org 0x081DD0F4
+    LDR R1, =music_override|1  // TODO wait for replacement by functions below, but can stay for now
+    BX  R1
+    .pool
+
+.org 0x0808064C // intro music (!) song hook
+    LDR R1, =mhk_intro_music_id_to_song|1
+    BL  _call_via_r1
+    B   0x080806BA
+    .pool
+
+.org 0x08043FD4 // batle music song hook
+    LDR R0, =mhk_song_id_for_battle|1
+    BX  R0
+    .pool
+
+.org 0x080156FE // trainer victory music hook
+    LDR R0, =mhk_trainer_battle_play_defeat|1
+    BL  _call_via_r0
+    B   0x0801576E
+    .pool
+
+.org 0x08021D46  // wild poke defeated
+    BL  _call_via_r0 // call via r0
+.org 0x08021D94
+    .word   mhk_wild_poke_def_music|1
+
+.org 0x0807F9F8
+    LDR R1, =0x0807FA3E
+    BL  _call_via_r1 // call via r1
+    MOV R1, R0
+    B   0x0807FA3E
+    .pool
+
+
+
+//End of sound stuff
+
+//Don't know what thats all about... leaving it commented for now
+//.org 0x0800f268
+//    .halfword 0xE000
+
+//Battle bg use new table
+.org 0x0800F2A0
+    .word battle_bg_table
+
+.org 0x0800F2E0
+    .word battle_bg_table
+
+.org 0x0800F320
+    .word battle_bg_table
+
+.org 0x0800F40E
+    ldr r0, =battle_bg_hook|1
+    bx r0
+    lsl r0, #0
+	.pool
+
+.org 0x0800FD5C
+    .word battle_bg_table
+
+.org 0x0800FD88
+    .word battle_bg_table
+//end of battle bg table
+
+//flag routine
+.org 0x0806E5D6
+	ldr r0, =flag_hook|1
+	bx r0
+	lsl r0, #0
+	.pool
+//end of flag routine
+
+//var routine
+.org 0x0806E45C
+    ldr r0,=var_hook+1
+    bx r0
+	.pool
+
+//end of var routine
+
+//trainer Flag stuff
+.org 0x08080382
+	mov r1, #0x80
+	lsl r1, #0x15
+
+.org 0x080800BA
+	mov r2, #0x80
+	lsl r2, #0x5
+
+.org 0x08080428
+    mov r1, #0x80
+    lsl r1, #0x15
+
+.org 0x08080440
+    mov r1, #0x80
+    lsl r1, #0x15
+
+.org 0x08080454
+    mov r1, #0x80
+    lsl r1, #0x15
+//end of trainer flag stuff
+
+//New behavior bytes for jumping
+
+.org 0x0806811A
+	ldr r0,=jump_behavior|1
+	bx r0
+	.pool
+
+//behavior walk stuff
+.org 0x0806D720
+	ldr r0,=on_step|1
+	bx r0
+	.pool
+
+//end of new behavior bytes for jumping
+
+//transparent textboxes and mugshots
+.org 0x08069410
+    bx r0
+
+.org 0x0806941C
+    .word trans_activate|1
+
+.org 0x08069504
+    bx r1
+
+.org 0x0806950C
+    .word trans_deactivate|1
+
+.org 0x08150000
+    ldr r0, =pal_load_hook_2|1
+    bx r0
+	.pool
+
+.org 0x0815044A
+    bx r1
+
+.org 0x08150450
+    .word pal_load_hook|1
+
+.org 0x0809CEB2
+    ldr r0, =trans_mug_close_fix+1
+    bx r0
+    lsl r0, #0
+	.pool
+
+//end of transparent textboxes and mugshots
+
+//saveblock routine start
+
+.org 0x080D9EDC
+    ldr r0, =load_hijack|1
+    bx r0
+    .pool
+
+.org 0x080d991E
+    bx r7
+.org 0x080d995C
+    .word store_hijack|1
+
+.org 0x083FEC94
+.include "patches/save_table/save_table.S"
+
+//end of saveblock routine
+//new battle script commands
+	//replace tables
+.org 0x08014C1C
+	.word bs_command_table
+.org 0x08015A28
+	.word bs_command_table
+.org 0x08015C6C
+	.word bs_command_table
+.org 0x08015C98
+	.word bs_command_table
+.org 0x0801D054
+	.word bs_command_table
+
+//end of new battle script commands
+
+//move effect table
+
+.org 0x08016364
+	.word m_effect_table
+.org 0x08023328
+	.word m_effect_table
+.org 0x08025CF8
+	.word m_effect_table
+.org 0x08027464
+	.word m_effect_table
+.org 0x080297F0
+	.word m_effect_table
+.org 0x0802BE80
+	.word m_effect_table
+
+//end of move effect table
+
+//move limits
+
+.org 0x080D75FC
+	.byte 0,0,0,0,0,0
+
+//end of move limits
+
+//print string mod
+
+.org 0x080D77C0
+	bx r1
+
+.org 0x080D77CC
+	.word custom_print_string|1
+
+//end of print string mod
+
+//new move animation table
+.org 0x080725d0
+    .word m_animation_table
+//end of new move animation table

src/include/battle_common.h

@@ -1,17 +1,19 @@
-#ifndef BATTLE_H_
-#define BATTLE_H_
-
-#include <types.h>
-
-#define REQUEST_HELDITEM_BATTLE 0x2
-#define REQUEST_STATUS_BATTLE 0x28
-
-u8 get_side_from_bank(u8 bank);
-u16 battle_turn_random;
-void mark_buffer_bank_for_execution(u8 bank);
-void prepare_setattributes_in_battle(u8 buffer, u8 data_request, u8 unkown, u8 data_to_add, void* ptr_to_attribute);
-u8 item_get_quality(u8 item_id);
-u8 get_item_x12_battle_function(u16 item_id);
-void battle_script_push();
-
-#endif
+#ifndef BATTLE_H_
+#define BATTLE_H_
+
+#include <types.h>
+
+#define REQUEST_HELDITEM_BATTLE 0x2
+#define REQUEST_STATUS_BATTLE 0x28
+
+u8 get_side_from_bank(u8 bank);
+u16 battle_turn_random;
+void mark_buffer_bank_for_execution(u8 bank);
+void prepare_setattributes_in_battle(u8 buffer, u8 data_request, u8 unkown, u8 data_to_add, void* ptr_to_attribute);
+u8 item_get_quality(u8 item_id);
+u8 get_item_x12_battle_function(u16 item_id);
+void battle_script_push(void);
+
+void song_play_for_text(u16 songid);
+
+#endif

src/include/battle_structs.h

@@ -1,344 +1,387 @@
-#ifndef BATTLE_STRUCT_H_
-#define BATTLE_STRUCT_H_
-
-#include <types.h>
-
-struct side_affecting_hword{
-    u16 reflect_on : 1;
-    u16 light_screen_on : 1;
-    u16 unkown1 : 2;
-    u16 spikes_on : 1;
-    u16 safeguard_on : 1;
-    u16 unkown2 : 2;
-    u16 mist_on : 1;
-    u16 spikes_damage_done : 1;
-};
-
-extern struct side_affecting_hword side_affecting_halfword[2];
-
-struct status_main{
-    u32 sleep : 3;
-    u32 poison : 1;
-    u32 burn : 1;
-    u32 freeze : 1;
-    u32 paralysis: 1;
-    u32 toxic_poison : 1;
-    u32 poison_counter : 4;
-};
-
-union main_status{
-    u32 int_status;
-    struct status_main flags;
-};
-
-struct protect_struct{
-    u8 flag0_protect : 1;
-    u8 flag0_endure : 1;
-    u8 flag0_onlystruggle : 1;
-    u8 flag0_helpinghand : 1;
-    u8 flag0_bouncemove : 1;
-    u8 flag0_stealmove : 1;
-    u8 flag0_unknown: 1;
-    u8 flag0_prlz_immobility: 1;
-    u8 flag1_confusion_self_damage: 1;
-    u8 flag1_noteffective: 1;
-    u8 flag1_chargingturn: 1; //dive, dig etc.
-    u8 flag1_smokeballflee: 1;
-    u8 flag1_runaway_flee: 1;
-    u8 flag1_used_imprisoned_move: 1;
-    u8 flag1_love_immobility: 1;
-    u8 flag1_used_disabled_move: 1;
-    u8 flag2_used_taunted_move: 1;
-    u8 flag2_unknown: 1;
-    u8 flag2_flinch_immobility : 1;
-    u8 flag2_notfirststrike : 1;
-    u8 flag2_free: 4;
-    u8 field3;
-    u32 physical_damage;
-    u32 special_damage;
-    u8 counter_target;
-    u8 mirrorcoat_target;
-    u16 fieldE;
-};
-
-extern struct protect_struct battle_protect[4];
-
-#define STATUS_SLEEP 0x7
-#define STATUS_POISON 0x8
-#define STATUS_BURN 0x10
-#define STATUS_FREEZE 0x20
-#define STATUS_PARALYSIS 0x40
-#define STATUS_TOXIC_POISON 0x80
-
-struct flags2{
-    u32 confusion : 3;
-    u32 flinched : 1;
-    u32 uproar : 3;
-    u32 flag_x80 : 1;
-    u32 bide : 2;
-    u32 locked_and_confuse : 2;
-    u32 multiple_turn_move : 1;
-    u32 trapped_in_wrap : 3;
-    u32 in_love : 4;
-    u32 focus_energy : 1;
-    u32 transformed : 1;
-    u32 recharge : 1;
-    u32 raged : 1;
-    u32 substitute : 1;
-    u32 destinny_bond : 1;
-    u32 cant_escape : 1;
-    u32 nightmare : 1;
-    u32 cursed : 1;
-    u32 foresight : 1;
-    u32 defense_curled : 1;
-    u32 tormented : 1;
-};
-
-struct iv_set
-{
-    u32 iv_hp: 5;
-    u32 iv_atk: 5;
-    u32 iv_def: 5;
-    u32 iv_spd: 5;
-    u32 iv_sp_atk: 5;
-    u32 iv_sp_def: 5;
-};
-
-struct pokemon{
-	u32 PID;
-	u32 OTID;
-	char name[10];
-	u16 language;
-	u8 OT_name[7];
-	u8 markings;
-	u16 checksum;
-	u16 padding_maybe;
-	u8 data[48];
-	u32 ailment;
-	u8 level;
-	u8 pokerus;
-	u16 current_hp;
-	u16 total_hp;
-	u16 attack;
-	u16 defense;
-	u16 speed;
-	u16 sp_attack;
-	u16 sp_defense;
-};
-
-extern struct pokemon party_opponent[6];
-extern struct pokemon party_player[6];
-
-struct battle_participant {
-    u16 poke_species;
-    u16 atk;
-    u16 def;
-    u16 spd;
-    u16 sp_atk;
-    u16 sp_def;
-    u16 moves[4];
-    struct iv_set ivs;
-    u8 hp_buff;
-    u8 atk_buff;
-    u8 def_buff;
-    u8 spd_buff;
-    u8 sp_atk_buff;
-    u8 sp_def_buff;
-    u8 acc_buff;
-    u8 evasion_buff;
-    u8 ability_id;
-    u8 type1;
-    u8 type2;
-    u8 padd;
-    u8 current_pp[4];
-    u16 current_hp;
-    u8 level;
-    u8 happiness;
-    u16 max_hp;
-    u16 held_item;
-    u8 poke_name[12];
-    u8 trainer_name[8];
-    u32 padd2;
-    u32 pid;
-    union main_status status;
-    struct flags2 status2;
-    u32 otid;
-};
-
-extern struct battle_participant battle_participants[4];
-
-struct side_timer{
-    u8 reflect_timer;
-    u8 reflect_bank;
-    u8 lightscreen_timer;
-    u8 lightscreen_bank;
-    u8 mist_timer;
-    u8 mist_bank;
-    u8 safeguard_timer;
-    u8 safeguard_bank;
-    u8 followme_timer;
-    u8 followme_target;
-    u8 spikes_amount;
-    u8 fieldB;
-};
-
-extern struct side_timer battle_side_timers[2];
-
-struct in_battle_weather{
-    u32 rain : 1;
-    u32 downpour : 1;
-    u32 permament_rain : 1;
-    u32 sandstorm : 1;
-    u32 permament_sandstorm : 1;
-    u32 sun : 1;
-    u32 permament_sun : 1;
-    u32 hail : 1;
-    //custom flags
-    u32 permament_hail : 1;
-    u32 fog : 1;
-    u32 permament_fog : 1;
-    u32 harsh_sun : 1;
-    u32 heavy_rain : 1;
-    u32 air_current : 1;
-};
-
-struct status_3{
-    u32 leech_seed_hp_receiver : 2; // 2 bits
-    u32 leech_seed : 1; //4
-    u32 always_hits : 2; //x8 | x10
-    u32 perish_song : 1; //x20
-    u32 on_air : 1; //x40
-    u32 underground : 1;//80
-    u32 minimized : 1; //x100
-    u32 charged_up : 1; //x200
-    u32 rooted : 1; //x400
-    u32 yawn : 2; //x800 || x1000
-    u32 imprision : 1; //x2000
-    u32 grudge : 1; //x4000
-    u32 unkown_no_crit : 1; //x8000
-    u32 mud_sport : 1; //x10 000
-    u32 watersport : 1; //x20 000
-    u32 underwater : 1; //x40 000
-    u32 switchinlock : 1; //x80 000
-    u32 unburden : 1; //x100 000 (previously trace)
-    u32 phantomforce : 1; //x200 000
-};
-
-extern struct status_3 battle_status_3[4];
-
-union battle_weather{
-    u32 int_bw;
-    struct in_battle_weather flags;
-};
-
-extern union battle_weather battle_weather;
-
-struct mirror_move_set_per_bank
-{
-    u16 moves_per_target[4];
-};
-
-struct battle_stuff{
-    u8 end_turn_statetracker1; //0x0
-    u8 end_turn_checked_bank; //0x1
-    u8 field_2; //0x2
-    u8 end_turn_statetracker2; //0x3
-    u16 trapped_move[4]; //0x4 - 0xB
-    u8 move_target[4]; //0xC - 0xF
-    u8 field_10; //0x10
-    u8 field_11; //0x11
-    u8 field_12; //0x12
-    u8 dynamic_move_type; //0x13
-    u8 trapper[4];//0x14-0x17
-    u8 field_18[48]; //0x18-0x47
-    u8 pre_attacks_bank_counter; //0x48
-    u8 field_49; //0x49
-    u8 money_multiplier; //0x4A
-    u8 field_4B; //0x4B
-    u8 switch_in_ability_bank_counter; //0x4C
-    u8 field_4D[7]; //0x4D-0x53
-    u8 field_54; //0x54
-    u8 field_55; //0x55
-    u8 field_56; //0x56
-    u8 field_57; //0x57
-    u8 field_58[4];
-    u8 field_5C[35];
-    u8 castform_switch_form; //0x7F
-    u8 chosen_move_position[4]; //0x80
-    u8 field_84[13]; //0x84-0x90
-    u8 absent_bank_flags_prev_turn; //0x91
-    u8 field_92[6]; //0x92-0x97
-    u16 mirror_moves_pbs[4]; //0x98-0x9F
-    u8 field_A0[18]; //0xA0-0xB1
-    u8 synchronize_effect_chooser; //0xB2
-    u8 field_B3[5];
-    u16 used_held_items[4]; //0xB8-0xBF
-    u8 field_C0[8]; //0xC0-0xC7
-    u16 choiced_move[4]; //0xC8-0xCF (checked in cmd49)
-    u16 changed_held_items[4]; //0xD0-0xD8 (later written to battlestruct in cmd49)
-    u8 intimidate_user; //0xD8
-    u8 switch_in_item_bank_counter; //0xD9
-    u8 field_DA; //0xDA
-    u8 field_DB; //0xDB
-    u8 field_DC; //0xDC
-    u8 field_DD; //0xDD
-    u8 field_DE; //0xDE
-    u8 field_DF; //0xDF
-    struct mirror_move_set_per_bank mirror_move_set_pbs[4]; //0xE0-0xFF
-    u8 field_100[162]; //0x100-0x1A1
-    u8 battle_load_weather_from_map_flag; //0x1A2
-    u8 atk_canceller_state_tracker; //0x1A3
-    u8 field_1A4[240]; //0x1A4-0x293
-    u8 switchout_index[4]; //0x294-0x297
-    u8 field_298[11];
-    u8 field_2A3;
-};
-
-struct battle_stuff_struct{
-    struct battle_stuff *ptr;
-};
-
-extern struct battle_stuff_struct battle_stuff_ptr;
-
-struct prop_flags{
-    u8 makes_contact : 1;//1
-    u8 affected_by_protect : 1;//2
-    u8 affected_by_magic_coat : 1;//4
-    u8 affected_by_snatch : 1;//8
-    u8 affected_by_mirrormove :1;//x10
-    u8 affected_by_kingsrock :1;//x20
-    u8 raised_crit_ratio :1;//x40
-    u8 unused_bit : 1;//x80
-};
-
-union move_flags{
-    u8 int_flag;
-    struct prop_flags flags;
-};
-
-struct move_info{
-    u8 script_id;
-    u8 base_power;
-    u8 type;
-    u8 accuracy;
-    u8 pp;
-    u8 effect_chance;
-    u8 target;
-    s8 priority;
-    union move_flags move_flags;
-    u8 arg1;
-    u8 split;
-    u8 arg2;
-};
-
-struct b_enigma_berry{
-    u8 field0[7];
-    u8 battle_effect_x12;
-    u8 field8[18];
-    u8 quality;
-    u8 field1B;
-};
-
-extern struct b_enigma_berry battle_enigma_berry[4];
-
-#endif
+#ifndef BATTLE_STRUCT_H_
+#define BATTLE_STRUCT_H_
+
+#include <types.h>
+
+struct side_affecting_hword{
+    u16 reflect_on : 1;
+    u16 light_screen_on : 1;
+    u16 unkown1 : 2;
+    u16 spikes_on : 1;
+    u16 safeguard_on : 1;
+    u16 unkown2 : 2;
+    u16 mist_on : 1;
+    u16 spikes_damage_done : 1;
+};
+
+extern struct side_affecting_hword side_affecting_halfword[2];
+
+struct status_main{
+    u32 sleep : 3;
+    u32 poison : 1;
+    u32 burn : 1;
+    u32 freeze : 1;
+    u32 paralysis: 1;
+    u32 toxic_poison : 1;
+    u32 poison_counter : 4;
+};
+
+union main_status{
+    u32 int_status;
+    struct status_main flags;
+};
+
+struct protect_struct{
+    u8 flag0_protect : 1;
+    u8 flag0_endure : 1;
+    u8 flag0_onlystruggle : 1;
+    u8 flag0_helpinghand : 1;
+    u8 flag0_bouncemove : 1;
+    u8 flag0_stealmove : 1;
+    u8 flag0_unknown: 1;
+    u8 flag0_prlz_immobility: 1;
+    u8 flag1_confusion_self_damage: 1;
+    u8 flag1_noteffective: 1;
+    u8 flag1_chargingturn: 1; //dive, dig etc.
+    u8 flag1_smokeballflee: 1;
+    u8 flag1_runaway_flee: 1;
+    u8 flag1_used_imprisoned_move: 1;
+    u8 flag1_love_immobility: 1;
+    u8 flag1_used_disabled_move: 1;
+    u8 flag2_used_taunted_move: 1;
+    u8 flag2_unknown: 1;
+    u8 flag2_flinch_immobility : 1;
+    u8 flag2_notfirststrike : 1;
+    u8 flag2_free: 4;
+    u8 field3;
+    u32 physical_damage;
+    u32 special_damage;
+    u8 counter_target;
+    u8 mirrorcoat_target;
+    u16 fieldE;
+};
+
+extern struct protect_struct battle_protect[4];
+
+#define STATUS_SLEEP 0x7
+#define STATUS_POISON 0x8
+#define STATUS_BURN 0x10
+#define STATUS_FREEZE 0x20
+#define STATUS_PARALYSIS 0x40
+#define STATUS_TOXIC_POISON 0x80
+
+struct flags2{
+    u32 confusion : 3;
+    u32 flinched : 1;
+    u32 uproar : 3;
+    u32 flag_x80 : 1;
+    u32 bide : 2;
+    u32 locked_and_confuse : 2;
+    u32 multiple_turn_move : 1;
+    u32 trapped_in_wrap : 3;
+    u32 in_love : 4;
+    u32 focus_energy : 1;
+    u32 transformed : 1;
+    u32 recharge : 1;
+    u32 raged : 1;
+    u32 substitute : 1;
+    u32 destinny_bond : 1;
+    u32 cant_escape : 1;
+    u32 nightmare : 1;
+    u32 cursed : 1;
+    u32 foresight : 1;
+    u32 defense_curled : 1;
+    u32 tormented : 1;
+};
+
+struct iv_set
+{
+    u32 iv_hp: 5;
+    u32 iv_atk: 5;
+    u32 iv_def: 5;
+    u32 iv_spd: 5;
+    u32 iv_sp_atk: 5;
+    u32 iv_sp_def: 5;
+};
+
+struct pokemon{
+	u32 PID;
+	u32 OTID;
+	char name[10];
+	u16 language;
+	u8 OT_name[7];
+	u8 markings;
+	u16 checksum;
+	u16 padding_maybe;
+	u8 data[48];
+	u32 ailment;
+	u8 level;
+	u8 pokerus;
+	u16 current_hp;
+	u16 total_hp;
+	u16 attack;
+	u16 defense;
+	u16 speed;
+	u16 sp_attack;
+	u16 sp_defense;
+};
+
+extern struct pokemon party_opponent[6];
+extern struct pokemon party_player[6];
+
+struct battle_participant {
+    u16 poke_species;
+    u16 atk;
+    u16 def;
+    u16 spd;
+    u16 sp_atk;
+    u16 sp_def;
+    u16 moves[4];
+    struct iv_set ivs;
+    u8 hp_buff;
+    u8 atk_buff;
+    u8 def_buff;
+    u8 spd_buff;
+    u8 sp_atk_buff;
+    u8 sp_def_buff;
+    u8 acc_buff;
+    u8 evasion_buff;
+    u8 ability_id;
+    u8 type1;
+    u8 type2;
+    u8 padd;
+    u8 current_pp[4];
+    u16 current_hp;
+    u8 level;
+    u8 happiness;
+    u16 max_hp;
+    u16 held_item;
+    u8 poke_name[12];
+    u8 trainer_name[8];
+    u32 padd2;
+    u32 pid;
+    union main_status status;
+    struct flags2 status2;
+    u32 otid;
+};
+
+extern struct battle_participant battle_participants[4];
+
+struct side_timer{
+    u8 reflect_timer;
+    u8 reflect_bank;
+    u8 lightscreen_timer;
+    u8 lightscreen_bank;
+    u8 mist_timer;
+    u8 mist_bank;
+    u8 safeguard_timer;
+    u8 safeguard_bank;
+    u8 followme_timer;
+    u8 followme_target;
+    u8 spikes_amount;
+    u8 fieldB;
+};
+
+extern struct side_timer battle_side_timers[2];
+
+struct in_battle_weather{
+    u32 rain : 1;
+    u32 downpour : 1;
+    u32 permament_rain : 1;
+    u32 sandstorm : 1;
+    u32 permament_sandstorm : 1;
+    u32 sun : 1;
+    u32 permament_sun : 1;
+    u32 hail : 1;
+    //custom flags
+    u32 permament_hail : 1;
+    u32 fog : 1;
+    u32 permament_fog : 1;
+    u32 harsh_sun : 1;
+    u32 heavy_rain : 1;
+    u32 air_current : 1;
+};
+
+struct status_3{
+    u32 leech_seed_hp_receiver : 2; // 2 bits
+    u32 leech_seed : 1; //4
+    u32 always_hits : 2; //x8 | x10
+    u32 perish_song : 1; //x20
+    u32 on_air : 1; //x40
+    u32 underground : 1;//80
+    u32 minimized : 1; //x100
+    u32 charged_up : 1; //x200
+    u32 rooted : 1; //x400
+    u32 yawn : 2; //x800 || x1000
+    u32 imprision : 1; //x2000
+    u32 grudge : 1; //x4000
+    u32 unkown_no_crit : 1; //x8000
+    u32 mud_sport : 1; //x10 000
+    u32 watersport : 1; //x20 000
+    u32 underwater : 1; //x40 000
+    u32 switchinlock : 1; //x80 000
+    u32 unburden : 1; //x100 000 (previously trace)
+    u32 phantomforce : 1; //x200 000
+};
+
+extern struct status_3 battle_status_3[4];
+
+union battle_weather{
+    u32 int_bw;
+    struct in_battle_weather flags;
+};
+
+extern union battle_weather battle_weather;
+
+struct mirror_move_set_per_bank
+{
+    u16 moves_per_target[4];
+};
+
+struct battle_stuff{
+    u8 end_turn_statetracker1; //0x0
+    u8 end_turn_checked_bank; //0x1
+    u8 field_2; //0x2
+    u8 end_turn_statetracker2; //0x3
+    u16 trapped_move[4]; //0x4 - 0xB
+    u8 move_target[4]; //0xC - 0xF
+    u8 field_10; //0x10
+    u8 field_11; //0x11
+    u8 field_12; //0x12
+    u8 dynamic_move_type; //0x13
+    u8 trapper[4];//0x14-0x17
+    u8 field_18[48]; //0x18-0x47
+    u8 pre_attacks_bank_counter; //0x48
+    u8 field_49; //0x49
+    u8 money_multiplier; //0x4A
+    u8 field_4B; //0x4B
+    u8 switch_in_ability_bank_counter; //0x4C
+    u8 field_4D[7]; //0x4D-0x53
+    u8 field_54; //0x54
+    u8 field_55; //0x55
+    u8 field_56; //0x56
+    u8 field_57; //0x57
+    u8 field_58[4];
+    u8 field_5C[35];
+    u8 castform_switch_form; //0x7F
+    u8 chosen_move_position[4]; //0x80
+    u8 field_84[13]; //0x84-0x90
+    u8 absent_bank_flags_prev_turn; //0x91
+    u8 field_92[6]; //0x92-0x97
+    u16 mirror_moves_pbs[4]; //0x98-0x9F
+    u8 field_A0[18]; //0xA0-0xB1
+    u8 synchronize_effect_chooser; //0xB2
+    u8 field_B3[5];
+    u16 used_held_items[4]; //0xB8-0xBF
+    u8 field_C0[8]; //0xC0-0xC7
+    u16 choiced_move[4]; //0xC8-0xCF (checked in cmd49)
+    u16 changed_held_items[4]; //0xD0-0xD8 (later written to battlestruct in cmd49)
+    u8 intimidate_user; //0xD8
+    u8 switch_in_item_bank_counter; //0xD9
+    u8 field_DA; //0xDA
+    u8 field_DB; //0xDB
+    u8 field_DC; //0xDC
+    u8 field_DD; //0xDD
+    u8 field_DE; //0xDE
+    u8 field_DF; //0xDF
+    struct mirror_move_set_per_bank mirror_move_set_pbs[4]; //0xE0-0xFF
+    u8 field_100[162]; //0x100-0x1A1
+    u8 battle_load_weather_from_map_flag; //0x1A2
+    u8 atk_canceller_state_tracker; //0x1A3
+    u8 field_1A4[240]; //0x1A4-0x293
+    u8 switchout_index[4]; //0x294-0x297
+    u8 field_298[11];
+    u8 field_2A3;
+};
+
+struct battle_stuff_struct{
+    struct battle_stuff *ptr;
+};
+
+extern struct battle_stuff_struct battle_stuff_ptr;
+
+struct prop_flags{
+    u8 makes_contact : 1;//1
+    u8 affected_by_protect : 1;//2
+    u8 affected_by_magic_coat : 1;//4
+    u8 affected_by_snatch : 1;//8
+    u8 affected_by_mirrormove :1;//x10
+    u8 affected_by_kingsrock :1;//x20
+    u8 raised_crit_ratio :1;//x40
+    u8 unused_bit : 1;//x80
+};
+
+union move_flags{
+    u8 int_flag;
+    struct prop_flags flags;
+};
+
+struct move_info{
+    u8 script_id;
+    u8 base_power;
+    u8 type;
+    u8 accuracy;
+    u8 pp;
+    u8 effect_chance;
+    u8 target;
+    s8 priority;
+    union move_flags move_flags;
+    u8 arg1;
+    u8 split;
+    u8 arg2;
+};
+
+struct b_enigma_berry{
+    u8 field0[7];
+    u8 battle_effect_x12;
+    u8 field8[18];
+    u8 quality;
+    u8 field1B;
+};
+
+extern struct b_enigma_berry battle_enigma_berry[4];
+
+// trainerbattle stuff
+
+extern u16 trainerbattle_flag_id;
+
+extern struct {
+    u8 battle_double : 1;       //   1
+    u8 battle_link : 1;         //   2
+    u8 battle_wild : 1;         //   4
+    u8 battle_trainer : 1;      //   8
+    u8 battle_oak_comments : 1; //0x10
+    u8 _battle_unk_1 : 1;       //0x20
+    u8 battle_double_2 : 1;     //0x40
+    u8 battle_safari : 1;       //0x80
+    u8 battle_trainer_tower : 1;//0x100
+    u8 _battle_unk_2 : 1;       //0x200
+    u8 battle_old_man : 1;      //0x400
+    u8 battle_trainer_tower_2 : 1;//0x800
+    u8 _battle_unk_3 : 1;       //0x1000
+    u8 _battle_unk_4 : 1;       //0x2000
+    u8 _battle_unk_5 : 1;       //0x4000
+    u8 battle_ghost : 1;        //0x8000
+    u8 battle_poke_dude : 1;    //0x10000
+    u8 _battle_unk_6 : 1;       //0x20000
+    u8 battle_secret_base : 1;  //0x40000
+} battle_type_flags;
+
+_Static_assert(sizeof(battle_type_flags) <= 4, "Invalid struct size for battle_type_flags");
+
+struct trainer_table_entry {
+    u8 _unk_1;
+    u8 trainer_class;
+    u8 encounter_music;
+    u8 _unk_2;
+    u8 _unk_3[16];
+    u8 _unk_4[16];
+    u32 _unk; // probably pokemon data
+};
+
+_Static_assert(sizeof(struct trainer_table_entry) == 0x28, "Invalid struct size for trainer_table_entry");
+
+extern struct trainer_table_entry trainer_data[];
+
+
+#endif

src/include/pokemon.h

@@ -1,48 +1,55 @@
-#ifndef POKE_INDICES_H
-#define POKE_INDICES_H
-
-#define POKE_PIKACHU 0x19
-#define POKE_CUBONE 0x68
-#define POKE_MAROWAK 0x69
-#define POKE_FARFETCHD 0x53
-#define POKE_CHANSEY 0x71
-#define POKE_DITTO 132
-#define POKE_CLAMPERL 0x175
-#define POKE_LATIAS 0x197
-#define POKE_LATIOS 0x198
-#define POKE_CHERRIM 0x200
-#define POKE_DIALGA 0x218
-#define POKE_PALKIA 0x219
-#define POKE_GIRATINA 0x21C || 0x21C //for that another form
-
-struct pokemon_data
-{
-    u8 hp;
-    u8 attack;
-    u8 defence;
-    u8 speed;
-    u8 sp_attack;
-    u8 sp_defence;
-    u8 type_one;
-    u8 type_two;
-    u8 catch_rate;
-    u8 base_exp_yield;
-    u16 effort_yield;
-    u16 item_one;
-    u16 item_two;
-    u8 gender;
-    u8 egg_cycles;
-    u8 base_friendship;
-    u8 level_type;
-    u8 egg_group_one;
-    u8 egg_group_two;
-    u8 ability_one;
-    u8 ability_two;
-    u8 safari_rate;
-    u8 color_flip;
-    u16 padding;
-};
-
-extern struct pokemon_data pokemon_stats[1300];
-
-#endif /* POKE_INDICES_H */
+#ifndef POKE_INDICES_H
+#define POKE_INDICES_H
+
+#define POKE_PIKACHU    25
+#define POKE_FARFETCHD  83
+#define POKE_CUBONE     104
+#define POKE_MAROWAK    105
+#define POKE_CHANSEY    113
+#define POKE_DITTO      132
+#define POKE_ARTICUNO   144
+#define POKE_ZAPDOS     145
+#define POKE_MOLTRES    146
+#define POKE_MEWTWO     150
+#define POKE_LUGIA      249
+#define POKE_HOOH       250
+#define POKE_CLAMPERL   373
+#define POKE_LATIAS     407
+#define POKE_LATIOS     408
+#define POKE_DEOXYS     410
+#define POKE_CHERRIM    512
+#define POKE_DIALGA     536
+#define POKE_PALKIA     537
+#define POKE_GIRATINA   540 || 540 //for that another form
+
+struct pokemon_data
+{
+    u8 hp;
+    u8 attack;
+    u8 defence;
+    u8 speed;
+    u8 sp_attack;
+    u8 sp_defence;
+    u8 type_one;
+    u8 type_two;
+    u8 catch_rate;
+    u8 base_exp_yield;
+    u16 effort_yield;
+    u16 item_one;
+    u16 item_two;
+    u8 gender;
+    u8 egg_cycles;
+    u8 base_friendship;
+    u8 level_type;
+    u8 egg_group_one;
+    u8 egg_group_two;
+    u8 ability_one;
+    u8 ability_two;
+    u8 safari_rate;
+    u8 color_flip;
+    u16 padding;
+};
+
+extern struct pokemon_data pokemon_stats[1300];
+
+#endif /* POKE_INDICES_H */

src/include/songlist.h

@@ -46,11 +46,24 @@
 #define SEQ_BGM_VS_TT_BOSS_JANA     384
 #define SEQ_BGM_VS_TT_BOSS_NORMAN   388
 
+#define SEQ_BGM_VS_POKE             298
+#define SEQ_BGM_VS_RSE              266
+#define SEQ_BGM_VS_CHAMP            299
+#define SEQ_BGM_VS_LEADER           296
+#define SEQ_BGM_VS_TRAINER          297
+
+#define SEQ_BGM_VS_DEOXYS           399
+#define SEQ_BGM_VS_MEWTWO           340
+#define SEQ_BGM_VS_LEG1             341
+
 // Victories
 
 #define SEQ_BGM_VIC_TT              387
 #define SEQ_BGM_VIC_TRAINER         310
 
+#define SEQ_BGM_VIC_LEADER          312
+#define SEQ_BGM_VIC_POKE            311
+
 // Various Events
 
 #define SEQ_BGM_EVENT_TT_RAID       375

src/include/types.h

@@ -14,14 +14,8 @@ typedef     signed long long int    s64;
 typedef     float                   f32;
 typedef     double                  f64;
 
-typedef     unsigned int            size_t;
-
-typedef     unsigned char           bool;
-
-#define true 1
-#define false 0
-
-#define NULL 0
+#include <stddef.h>
+#include <stdbool.h>
 
 #define rgb5(r,g,b)                 (u16)( r | ( g << 5) | ( b << 10) )
 

src/music/battle_music_lookup.c

@@ -0,0 +1,106 @@
+#include <songlist.h>
+#include <game_engine.h>
+#include <bpre.h>
+#include <battle_structs.h>
+#include <battle_common.h>
+#include <pokemon.h>
+
+u16 mhk_intro_music_id_to_song(u8 introid) {
+    u16 res = 0;
+
+    switch (introid) {
+        case 0:
+        case 4:
+        case 5:
+        case 8:
+        case 10:
+        case 11:
+        case 12:
+        case 13:
+            res = SEQ_FRLG_E_3;
+            break;
+        case 1:
+        case 2:
+        case 9:
+            res = SEQ_FRLG_E_2;
+            break;
+        default:
+            res = SEQ_FRLG_E_3;
+            break;
+    }
+
+    return res;
+}
+
+// replaces sub_08043FD4
+u16 mhk_song_id_for_battle(void) {
+    u16 res = 0;
+
+    if (battle_type_flags._battle_unk_3) {
+        res = SEQ_BGM_VS_POKE;
+    } else if (battle_type_flags._battle_unk_5 || battle_type_flags.battle_link) {
+        res = SEQ_BGM_VS_RSE;
+    } else if (battle_type_flags.battle_trainer) {
+        switch (trainer_data[trainerbattle_flag_id].trainer_class) {
+            case 90:
+                res = SEQ_BGM_VS_CHAMP;
+                break;
+            case 84:
+            case 87:
+                res = SEQ_BGM_VS_LEADER;
+                break;
+            default:
+                res = SEQ_BGM_VS_TRAINER;
+                break;
+        }
+    } else {
+        res = SEQ_BGM_VS_POKE;
+    }
+
+    return res;
+}
+
+void mhk_trainer_battle_play_defeat(void) {
+    u16 song = 0;
+
+    switch (trainer_data[trainerbattle_flag_id].trainer_class) {
+        case 84:
+        case 90:
+            song = SEQ_BGM_VIC_LEADER;
+            break;
+        default:
+            song = SEQ_BGM_VIC_TRAINER;
+            break;
+    }
+
+    song_play_for_text(song);
+}
+
+void mhk_wild_poke_def_music(void) {
+    song_play_for_text(SEQ_BGM_VIC_POKE);
+}
+
+u16 mhk_species_to_song(u16 species) {
+    u16 res = 0;
+
+    switch (species) {
+        case POKE_MEWTWO:
+            res = SEQ_BGM_VS_MEWTWO;
+            break;
+        case POKE_ARTICUNO:
+        case POKE_ZAPDOS:
+        case POKE_MOLTRES:
+        case POKE_LUGIA:
+        case POKE_HOOH:
+            res = SEQ_BGM_VS_LEG1;
+            break;
+        case POKE_DEOXYS:
+            res = SEQ_BGM_VS_DEOXYS;
+            break;
+        default:
+            res = SEQ_BGM_VS_RSE;
+            break;
+    }
+
+    return res;
+}

src/music/encounter_lookup.c

@@ -1,27 +0,0 @@
-#include <songlist.h>
-#include <game_engine.h>
-
-u16 trainer_intro_music_id_to_song(u8 introid) {
-    u16 res = 0;
-    switch (introid) {
-        case 0:
-        case 4:
-        case 5:
-        case 8:
-        case 10:
-        case 11:
-        case 12:
-        case 13:
-            res = SEQ_FRLG_E_3;
-            break;
-        case 1:
-        case 2:
-        case 9:
-            res = SEQ_FRLG_E_2;
-            break;
-        default:
-            res = SEQ_FRLG_E_3;
-            break;
-    }
-    return res;
-}