Added a "The" flag check
This commit is contained in:
parent
9d3b15c4b7
commit
bc0b26cd63
|
@ -452,6 +452,9 @@ org $80DCD94; bl m2_vwf_entries.dcd00_enemy_letter
|
||||||
org $80DCD9A; strb r0,[r5,#2]
|
org $80DCD9A; strb r0,[r5,#2]
|
||||||
org $80DCD9E; strb r0,[r5,#3]
|
org $80DCD9E; strb r0,[r5,#3]
|
||||||
|
|
||||||
|
// "The" flag checks
|
||||||
|
org $80DB084; bl m2_vwf_entries.db04c_theflag; nop; nop
|
||||||
|
|
||||||
// Ignore the hard-coded Japanese "and cohorts"
|
// Ignore the hard-coded Japanese "and cohorts"
|
||||||
org $80DB0E6; b $80DB0FE
|
org $80DB0E6; b $80DB0FE
|
||||||
|
|
||||||
|
|
|
@ -893,3 +893,29 @@ strb r0,[r5,#1]
|
||||||
mov r0,#0x50
|
mov r0,#0x50
|
||||||
strb r0,[r5,#0]
|
strb r0,[r5,#0]
|
||||||
bx lr
|
bx lr
|
||||||
|
|
||||||
|
//==============================================================================
|
||||||
|
// "The" flag checks
|
||||||
|
.db04c_theflag:
|
||||||
|
push {r4,lr}
|
||||||
|
|
||||||
|
// Clobbered code: get enemy string pointer
|
||||||
|
lsl r4,r2,#1
|
||||||
|
bl $80BE260
|
||||||
|
mov r1,r0
|
||||||
|
mov r0,sp
|
||||||
|
add r0,#8
|
||||||
|
|
||||||
|
// Check for "The" flag
|
||||||
|
ldr r3,=#m2_enemy_attributes
|
||||||
|
ldrb r3,[r3,r4] // "The" flag
|
||||||
|
cmp r3,#0
|
||||||
|
beq +
|
||||||
|
|
||||||
|
// Write "The " before the enemy name
|
||||||
|
ldr r2,=#0x50959884
|
||||||
|
str r2,[r0,#0]
|
||||||
|
add r0,#4
|
||||||
|
|
||||||
|
+
|
||||||
|
pop {r4,pc}
|
||||||
|
|
Loading…
Reference in New Issue