added item extension and support for more tms

data/item/tm_hm_move_table.S

@@ -0,0 +1,9 @@
+.align 2
+.thumb
+.text
+
+
+@TODO: Use attack names to build table
+.global tm_hm_move_table
+tm_hm_move_table:
+.incbin "data/item/tm_hm_moves.bin"

todo/pokemon_tm_vm.s → data/pkmn_tables/pokemon_tm_vm.s

@@ -1,7 +1,7 @@
 .text
 .align 2
-.global tm_vm_kompatibilitaet
-tm_vm_kompatibilitaet:
+.global tm_hm_comp_table
+tm_hm_comp_table:
 
 .byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 .byte 160, 135, 57, 132, 9, 138, 17, 0, 32, 4, 224, 162, 8, 4, 0, 41

main.asm

@@ -8,6 +8,7 @@
 .include "patches/special.asm"
 .include "patches/moves.asm"
 .include "patches/music.asm"
+.include "patches/items/items.asm"
 
 .include "patches/pokemon_data/pokemon_footprints.asm"
 .include "patches/pokemon_data/altitude_table.asm"

patches/items/item_limits.asm

@@ -0,0 +1,7 @@
+NUMBER_OF_ITEMS EQU 375
+
+.org 0x08098998
+.halfword NUMBER_OF_ITEMS
+
+.org 0x0809a8ae
+.word 0x00000000

patches/items/item_routines.asm

@@ -0,0 +1,19 @@
+.org 0x08125A78
+ldr r1, =new_tm_index+1
+bx r1
+.pool
+
+.org 0x08131D5A
+ldr r0, =new_tm_number_name+1
+bx r0
+.pool
+
+.org 0x08043C40
+ldr r0, =tm_compat+1
+bx r0
+.pool
+
+.org 0x08099E6A
+ldr r0, =tm_save_slot+1
+bx r0
+.pool

patches/items/item_tables.asm

@@ -0,0 +1,8 @@
+//which tms are bound to which move
+
+.org 0x08125A8C
+.word tm_hm_move_table
+
+.org 0x0812AAAC
+.word tm_hm_move_table
+

patches/items/items.asm

@@ -0,0 +1,4 @@
+.include "patches/items/item_limits.asm"
+.include "patches/items/item_tables.asm"
+.include "patches/items/item_routines.asm"
+.include "patches/items/tm_fixes.asm"

patches/items/tm_fixes.asm

@@ -0,0 +1,6 @@
+.org 0x0811CE6E
+.halfword 0x0000
+
+.org 0x0811CA2C
+.halfword 0xF000
+.halfword 0xFA0E

src/item/tmhm/tm_compatability.S

@@ -0,0 +1,70 @@
+.text
+.align 2
+.thumb
+.global tm_compat
+
+tm_compat:
+mov r3, r1
+cmp r4, #0x56 @number between last hm and first new tm plus 0x3a
+bge newtm
+
+check:
+cmp r4, #0x1f
+bls first_32
+cmp r4, #0x3f
+bls first_64
+cmp r4, #0x5f
+bls first_96
+
+after_96:
+mov r0, r4
+sub r0, #0x60
+mov r2, #0x1
+lsl r2, r0
+ldr r0, =tm_hm_comp_table
+lsl r1, r1, #0x4
+add r0, #0xC
+
+get_offset:
+add r1, r1, r0
+ldr r0, [r1]
+and r0, r2
+b exit
+
+newtm:
+sub r4, #0x1C @number between last hm and first new tm
+b check
+
+first_64:
+mov r0, r4
+sub r0, #0x20
+mov r2, #0x1
+lsl r2, r0
+ldr r0, =tm_hm_comp_table
+lsl r1, r1, #0x4
+add r0, #0x4
+b get_offset
+
+first_96:
+mov r0, r4
+sub r0, #0x40
+mov r2, #0x1
+lsl r2, r0
+ldr r0, =tm_hm_comp_table
+lsl r1, r1, #0x4
+add r0, #0x8
+b get_offset
+
+first_32:
+mov r1, #0x1
+lsl r1, r5
+ldr r2, =tm_hm_comp_table
+lsl r0, r3, #0x4
+add r0, r0, r2
+ldr r0, [r0]
+and r0, r1
+
+exit:
+pop {r4-r5}
+pop {r1}
+bx r1

src/item/tmhm/tm_index.S

@@ -0,0 +1,30 @@
+.text
+.align 2
+.thumb
+
+.global new_tm_index
+
+new_tm_index:
+mov r1, #0xBB @=176/2 which is the new first tm index - 1
+lsl r1, r1, #0x1
+cmp r0, r1
+bhi newtm
+
+mov r1, #0x90
+lsl r1, r1, #0x1
+add r1, r1, #0x1
+sub r0, r0 ,r1
+lsl r0, r0, #0x1
+b exit
+
+newtm:
+add r1, r1, #0x1
+sub r0, r0, r1
+lsl r0, r0, #0x1
+add r0, r0, #0x74
+
+exit:
+ldr r1, =tm_hm_move_table
+add r0, r0, r1
+ldrh r0, [r0]
+bx lr

src/item/tmhm/tm_number.S

@@ -0,0 +1,49 @@
+.text
+.align 2
+.thumb
+.global new_tm_number_name
+
+new_tm_number_name:
+mov r0, #0xBB @=176/2 which is the new first tm index - 1
+lsl r0, r0, #0x1
+cmp r6, r0
+bhi new_tm
+
+mov r0, #0xA9
+lsl r0, r0, #0x1
+cmp r6, r0
+bls old_tm
+
+ldr r1, temp
+ldr r0, return1
+bx r0
+
+new_tm:
+ldr r1, =string_no
+mov r0, r5
+bl refresh
+
+ldr r4, ram
+ldr r0, value
+ldr r1, return3
+bx r1
+
+old_tm:
+ldr r1, return2
+bx r1
+
+refresh:
+ldr r2, routine
+bx r2
+
+.align 2
+routine: .word 0x08008DA5
+temp: .word 0x08463178
+return1: .word 0x08131D65
+return2: .word 0x08131DA5
+ram: .word 0x02021CD0
+value: .word 0xFFFFFEBC
+return3: .word 0x08131DB1
+
+string_no:
+	.byte 0xF9, 0x08, 0xFC, 0x11, 0x01, 0xFF

src/item/tmhm/tm_save_block.S

@@ -0,0 +1,16 @@
+.text
+.align 2
+.thumb
+.global tm_save_slot
+
+tm_save_slot:
+ldr r0, tm_save
+str r0, [r1, #0x18]
+mov r0, #0x6C		@108
+strb r0, [r1, #0x1c]
+ldr r0, return
+bx r0
+
+.align
+tm_save: .word 0x0203cB10
+return: .word 0x08099e74+1