diff --git a/m2-hack.asm b/m2-hack.asm index f2d6ea9..63f47e4 100644 --- a/m2-hack.asm +++ b/m2-hack.asm @@ -201,10 +201,25 @@ org $80C4F84; bl m2_vwf_entries.c4b2c_clear_right // C980C hacks (main character printing) //--------------------------------------------------------- +// Reset pixel X during scroll +org $80C9858; bl m2_vwf_entries.c980c_resetx_newline +org $80C9BF0; bl m2_vwf_entries.c980c_resetx_scroll +org $80C9D18; bl m2_vwf_entries.c980c_resetx_newline +org $80CA336; bl m2_vwf_entries.c980c_resetx_newline + // Reset pixel X during a newline org $80C9CC4 bl m2_vwf_entries.c980c_resetx_newline +// Other reset X +org $80C9D62; bl m2_vwf_entries.c980c_resetx_other +org $80C9D76; bl m2_vwf_entries.c980c_resetx_other2 +org $80C9EEC; bl m2_vwf_entries.c980c_resetx_other3 +org $80C9F34; bl m2_vwf_entries.c980c_resetx_other3 +org $80CA204; bl m2_vwf_entries.c980c_resetx_other4 +org $80CA274; bl m2_vwf_entries.c980c_resetx_other4 +org $80CA30E; bl m2_vwf_entries.c980c_resetx_newline + // Custom codes check org $80CA2BC bl m2_vwf_entries.c980c_custom_codes diff --git a/m2-vwf-entries.asm b/m2-vwf-entries.asm index 0e1058d..0749aa0 100644 --- a/m2-vwf-entries.asm +++ b/m2-vwf-entries.asm @@ -71,6 +71,45 @@ strh r4,[r5,#0x2A] strh r4,[r5,#2] pop {pc} +//============================================================================== +.c980c_resetx_scroll: +push {lr} +strh r0,[r5,#0x2C] +strh r1,[r5,#0x2A] +strh r1,[r5,#2] +pop {pc} + +//============================================================================== +.c980c_resetx_other: +push {lr} +strh r0,[r5,#0x2C] +strh r2,[r5,#0x2A] +strh r2,[r5,#2] +pop {pc} + +//============================================================================== +.c980c_resetx_other2: +push {lr} +mov r2,#0 +strh r2,[r5,#0x2A] +strh r2,[r5,#2] +pop {pc} + +//============================================================================== +.c980c_resetx_other3: +push {lr} +mov r1,#0 +strh r1,[r5,#0x2A] +strh r1,[r5,#2] +pop {pc} + +//============================================================================== +.c980c_resetx_other4: +push {lr} +strh r0,[r5,#0x2C] +strh r6,[r5,#0x2A] +strh r6,[r5,#2] +pop {pc} //============================================================================== .c87d0_clear_entry: