decompile battle music and pokemon palette functions

1 files changed, 0 insertions, 336 deletions

diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s
index 53015de14..50d22a1de 100644
--- a/asm/pokemon_3.s
+++ b/asm/pokemon_3.s
@@ -6,342 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_8040728
-sub_8040728: @ 8040728
-	push {lr}
-	ldr r0, _0804073C @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x80
-	lsls r0, 5
-	ands r0, r1
-	cmp r0, 0
-	beq _08040744
-	ldr r0, _08040740 @ =0x000001cf
-	b _080408B2
-	.align 2, 0
-_0804073C: .4byte gBattleTypeFlags
-_08040740: .4byte 0x000001cf
-_08040744:
-	movs r0, 0x80
-	lsls r0, 7
-	ands r0, r1
-	cmp r0, 0
-	beq _08040754
-	movs r0, 0xE7
-	lsls r0, 1
-	b _080408B2
-_08040754:
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _0804075E
-	b _080408A8
-_0804075E:
-	movs r0, 0x8
-	ands r0, r1
-	cmp r0, 0
-	bne _08040768
-	b _080408B0
-_08040768:
-	ldr r3, _0804078C @ =gTrainers
-	ldr r2, _08040790 @ =gTrainerBattleOpponent
-	ldrh r1, [r2]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r3
-	ldrb r0, [r0, 0x1]
-	subs r0, 0x2
-	cmp r0, 0x31
-	bls _08040780
-	b _080408A8
-_08040780:
-	lsls r0, 2
-	ldr r1, _08040794 @ =_08040798
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0804078C: .4byte gTrainers
-_08040790: .4byte gTrainerBattleOpponent
-_08040794: .4byte _08040798
-	.align 2, 0
-_08040798:
-	.4byte _08040860
-	.4byte _08040866
-	.4byte _08040866
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A0
-	.4byte _0804086C
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _08040872
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _0804087C
-	.4byte _080408A8
-	.4byte _080408A8
-	.4byte _08040860
-	.4byte _08040866
-	.4byte _08040866
-_08040860:
-	movs r0, 0xE9
-	lsls r0, 1
-	b _080408B2
-_08040866:
-	movs r0, 0xE5
-	lsls r0, 1
-	b _080408B2
-_0804086C:
-	movs r0, 0xE6
-	lsls r0, 1
-	b _080408B2
-_08040872:
-	ldr r0, _08040878 @ =0x000001cd
-	b _080408B2
-	.align 2, 0
-_08040878: .4byte 0x000001cd
-_0804087C:
-	ldrh r1, [r2]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	ldr r1, _08040898 @ =gTrainers + 0x4
-	adds r0, r1
-	ldr r1, _0804089C @ =gUnknown_08400E42
-	bl StringCompare
-	cmp r0, 0
-	beq _080408A8
-	movs r0, 0xE8
-	lsls r0, 1
-	b _080408B2
-	.align 2, 0
-_08040898: .4byte gTrainers + 0x4
-_0804089C: .4byte gUnknown_08400E42
-_080408A0:
-	ldr r0, _080408A4 @ =0x000001d1
-	b _080408B2
-	.align 2, 0
-_080408A4: .4byte 0x000001d1
-_080408A8:
-	ldr r0, _080408AC @ =0x000001cb
-	b _080408B2
-	.align 2, 0
-_080408AC: .4byte 0x000001cb
-_080408B0:
-	ldr r0, _080408B8 @ =0x000001c9
-_080408B2:
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080408B8: .4byte 0x000001c9
-	thumb_func_end sub_8040728
-
-	thumb_func_start sub_80408BC
-sub_80408BC: @ 80408BC
-	push {lr}
-	bl ResetMapMusic
-	bl m4aMPlayAllStop
-	bl sub_8040728
-	lsls r0, 16
-	lsrs r0, 16
-	bl PlayBGM
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80408BC
-
-	thumb_func_start current_map_music_set__default_for_battle
-current_map_music_set__default_for_battle: @ 80408D8
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r4, r0, 16
-	bl ResetMapMusic
-	bl m4aMPlayAllStop
-	cmp r4, 0
-	beq _080408F2
-	adds r0, r4, 0
-	bl PlayNewMapMusic
-	b _080408FE
-_080408F2:
-	bl sub_8040728
-	lsls r0, 16
-	lsrs r0, 16
-	bl PlayNewMapMusic
-_080408FE:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end current_map_music_set__default_for_battle
-
-	thumb_func_start pokemon_get_pal
-pokemon_get_pal: @ 8040904
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	movs r1, 0x41
-	movs r2, 0
-	bl GetMonData
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	adds r0, r5, 0
-	movs r1, 0x1
-	movs r2, 0
-	bl GetMonData
-	adds r6, r0, 0
-	adds r0, r5, 0
-	movs r1, 0
-	movs r2, 0
-	bl GetMonData
-	adds r2, r0, 0
-	adds r0, r4, 0
-	adds r1, r6, 0
-	bl species_and_otid_get_pal
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end pokemon_get_pal
-
-	thumb_func_start species_and_otid_get_pal
-species_and_otid_get_pal: @ 804093C
-	push {r4,r5,lr}
-	adds r3, r2, 0
-	lsls r0, 16
-	lsrs r4, r0, 16
-	adds r5, r4, 0
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r4, r0
-	bls _08040958
-	ldr r0, _08040954 @ =gMonPaletteTable
-	ldr r0, [r0]
-	b _08040984
-	.align 2, 0
-_08040954: .4byte gMonPaletteTable
-_08040958:
-	lsrs r0, r1, 16
-	ldr r2, _08040974 @ =0x0000ffff
-	ands r1, r2
-	eors r0, r1
-	lsrs r1, r3, 16
-	eors r0, r1
-	ands r3, r2
-	eors r0, r3
-	cmp r0, 0x7
-	bls _0804097C
-	ldr r0, _08040978 @ =gMonPaletteTable
-	lsls r1, r4, 3
-	b _08040980
-	.align 2, 0
-_08040974: .4byte 0x0000ffff
-_08040978: .4byte gMonPaletteTable
-_0804097C:
-	ldr r0, _0804098C @ =gMonShinyPaletteTable
-	lsls r1, r5, 3
-_08040980:
-	adds r1, r0
-	ldr r0, [r1]
-_08040984:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0804098C: .4byte gMonShinyPaletteTable
-	thumb_func_end species_and_otid_get_pal
-
-	thumb_func_start sub_8040990
-sub_8040990: @ 8040990
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	movs r1, 0x41
-	movs r2, 0
-	bl GetMonData
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	adds r0, r5, 0
-	movs r1, 0x1
-	movs r2, 0
-	bl GetMonData
-	adds r6, r0, 0
-	adds r0, r5, 0
-	movs r1, 0
-	movs r2, 0
-	bl GetMonData
-	adds r2, r0, 0
-	adds r0, r4, 0
-	adds r1, r6, 0
-	bl sub_80409C8
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8040990
-
-	thumb_func_start sub_80409C8
-sub_80409C8: @ 80409C8
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r4, r0, 16
-	lsrs r0, r1, 16
-	ldr r3, _080409E8 @ =0x0000ffff
-	ands r1, r3
-	eors r0, r1
-	lsrs r1, r2, 16
-	eors r0, r1
-	ands r2, r3
-	eors r0, r2
-	cmp r0, 0x7
-	bls _080409F0
-	lsls r0, r4, 3
-	ldr r1, _080409EC @ =gMonPaletteTable
-	b _080409F4
-	.align 2, 0
-_080409E8: .4byte 0x0000ffff
-_080409EC: .4byte gMonPaletteTable
-_080409F0:
-	lsls r0, r4, 3
-	ldr r1, _080409FC @ =gMonShinyPaletteTable
-_080409F4:
-	adds r0, r1
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080409FC: .4byte gMonShinyPaletteTable
-	thumb_func_end sub_80409C8
-
 	thumb_func_start sub_8040A00
 sub_8040A00: @ 8040A00
 	push {r4,lr}