Fix status-removal
This commit is contained in:
parent
cbae542ae8
commit
f3808c4e85
|
@ -480,6 +480,7 @@ pop {pc}
|
||||||
.org 0x80D6960 :: bl sick_name
|
.org 0x80D6960 :: bl sick_name
|
||||||
.org 0x80D68C2 :: bl dead_name
|
.org 0x80D68C2 :: bl dead_name
|
||||||
.org 0x80D6A8A :: bl alive_name
|
.org 0x80D6A8A :: bl alive_name
|
||||||
|
.org 0x80D6DAC :: bl d6dac_alive_name
|
||||||
|
|
||||||
.org m2_stat_symb_checker :: .incbin "data/m2-status-symbols-checkerboard.bin"
|
.org m2_stat_symb_checker :: .incbin "data/m2-status-symbols-checkerboard.bin"
|
||||||
|
|
||||||
|
|
|
@ -2962,10 +2962,18 @@ bl 0x80CABF8 //Name
|
||||||
mov r0,r4
|
mov r0,r4
|
||||||
pop {pc}
|
pop {pc}
|
||||||
|
|
||||||
|
//==============================================================================
|
||||||
|
//Prints the alive tiles and then the names - right after the normal status is restored
|
||||||
|
d6dac_alive_name:
|
||||||
|
push {r7,lr}
|
||||||
|
mov r7,r5
|
||||||
|
bl alive_name
|
||||||
|
pop {r7,pc}
|
||||||
|
|
||||||
//==============================================================================
|
//==============================================================================
|
||||||
//Prints the alive tiles and then the names
|
//Prints the alive tiles and then the names
|
||||||
alive_name:
|
alive_name:
|
||||||
push {lr}
|
push {r4,lr}
|
||||||
push {r5}
|
push {r5}
|
||||||
mov r5,r2
|
mov r5,r2
|
||||||
push {r0-r3}
|
push {r0-r3}
|
||||||
|
@ -3003,6 +3011,6 @@ pop {r0-r3}
|
||||||
pop {r5}
|
pop {r5}
|
||||||
bl 0x80CABF8 //Name
|
bl 0x80CABF8 //Name
|
||||||
mov r0,r4
|
mov r0,r4
|
||||||
pop {pc}
|
pop {r4,pc}
|
||||||
|
|
||||||
.pool
|
.pool
|
||||||
|
|
Loading…
Reference in New Issue