mirrors
/
Mother2GbaTranslation
mirror of https://github.com/jeffman/Mother2GbaTranslation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Convert tabs to spaces

This commit is contained in:
jeffman 2015-03-18 13:31:21 -04:00
parent 02110180f3
commit 60980ee787
2 changed files with 45 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
m2-hack.asm
View File

@ -7,9 +7,6 @@ arch gba.thumb
// Move the werird box font from 0xFCE6C
org $80B3274; dd m2_font_relocate
// Ness mom test
//org $808F6B0; dd m2_nessmom
//==============================================================================
// Font hacks
//==============================================================================
@ -144,11 +141,11 @@ add r1,#0x60
// Make PP cost use the correct space value if there's only one digit
org $80CA712
mov r0,#0x50
mov r0,#0x50
// Fix PSI target offset calculation
org $80B8B08
mov r1,#100
mov r1,#100
mul r1,r2
nop
nop

86
m2-vwf.asm
View File

@ -120,7 +120,7 @@ dw $E801 // Break by means of invalid opcode
ldrb r0,[r1,#0]
sub r0,#0x50
bpl +
mov r0,#0x1F // Replace char with ? if it's invalid
mov r0,#0x1F // Replace char with ? if it's invalid
b .char_custom
+
cmp r0,#0x60
@ -1375,34 +1375,34 @@ pop {r0-r2,pc}
//==============================================================================
.ppcost_once:
print "m2vwf.ppcost_once: $",pc
print "m2vwf.ppcost_once: $",pc
// Need to copy LR to somewhere other than the stack
push {r1,r3}
ldr r3,=#m2_custom_wram
mov r1,lr
str r1,[r3,#0x10]
pop {r1,r3}
push {r1,r3}
ldr r3,=#m2_custom_wram
mov r1,lr
str r1,[r3,#0x10]
pop {r1,r3}
// Check [r0 + 0x30]: if it's 0xFFFF, then we've already drawn the window
push {r1,r2}
mov r1,#0x30
ldsh r2,[r0,r1]
mov r1,#1
neg r1,r1
cmp r1,r2
pop {r1,r2}
beq +
bl $80C9634
push {r1,r2}
mov r1,#0x30
ldsh r2,[r0,r1]
mov r1,#1
neg r1,r1
cmp r1,r2
pop {r1,r2}
beq +
bl $80C9634
+
// Get back LR
push {r1,r3}
ldr r3,=#m2_custom_wram
ldr r1,[r3,#0x10]
mov lr,r1
pop {r1,r3}
mov pc,lr
push {r1,r3}
ldr r3,=#m2_custom_wram
ldr r1,[r3,#0x10]
mov lr,r1
pop {r1,r3}
mov pc,lr
//==============================================================================
@ -1415,31 +1415,31 @@ mov pc,lr
// if it causes problems
.ppcost_once2:
print "m2vwf.ppcost_once2: $",pc
print "m2vwf.ppcost_once2: $",pc
// Need to copy LR to somewhere other than the stack
push {r1,r3}
ldr r3,=#m2_custom_wram
mov r1,lr
str r1,[r3,#0x10]
pop {r1,r3}
push {r1,r3}
ldr r3,=#m2_custom_wram
mov r1,lr
str r1,[r3,#0x10]
pop {r1,r3}
// Check [r0 + 0x80]: if it's 0xFFFF, then we've already drawn the window
push {r1,r2}
mov r1,#0x80
ldsh r2,[r0,r1]
mov r1,#1
neg r1,r1
cmp r1,r2
pop {r1,r2}
beq +
bl $80C9634
push {r1,r2}
mov r1,#0x80
ldsh r2,[r0,r1]
mov r1,#1
neg r1,r1
cmp r1,r2
pop {r1,r2}
beq +
bl $80C9634
+
// Get back LR
push {r1,r3}
ldr r3,=#m2_custom_wram
ldr r1,[r3,#0x10]
mov lr,r1
pop {r1,r3}
mov pc,lr
push {r1,r3}
ldr r3,=#m2_custom_wram
ldr r1,[r3,#0x10]
mov lr,r1
pop {r1,r3}
mov pc,lr