mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-26 03:34:15 +01:00
battle interface is done
This commit is contained in:
DizzyEggg
parent
ee6bdc9068
commit
11bead31e9
@ -2857,7 +2857,7 @@ sub_805E990: @ 805E990
|
||||
lsls r1, 16
|
||||
asrs r1, 16
|
||||
adds r0, r4, 0
|
||||
bl sub_8075060
|
||||
bl GetHPBarLevel
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@ -2997,7 +2997,7 @@ sub_805EAB4: @ 805EAB4
|
||||
lsls r1, 16
|
||||
asrs r1, 16
|
||||
adds r0, r4, 0
|
||||
bl sub_8075060
|
||||
bl GetHPBarLevel
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
pop {r4,r5}
|
||||
@ -3796,7 +3796,7 @@ sub_805F110: @ 805F110
|
||||
lsls r1, 16
|
||||
asrs r1, 16
|
||||
adds r0, r4, 0
|
||||
bl sub_8075060
|
||||
bl GetHPBarLevel
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x2
|
||||
|
||||
@ -1,996 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
|
||||
thumb_func_start sub_8074AA0
|
||||
sub_8074AA0: @ 8074AA0
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
mov r5, r8
|
||||
push {r5-r7}
|
||||
sub sp, 0x8
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r8, r0
|
||||
lsls r2, 24
|
||||
lsrs r2, 24
|
||||
mov r9, r2
|
||||
cmp r2, 0
|
||||
bne _08074AEC
|
||||
ldr r0, =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0xC]
|
||||
mov r1, r8
|
||||
lsls r5, r1, 2
|
||||
adds r3, r5, r1
|
||||
lsls r3, 2
|
||||
adds r3, r0
|
||||
ldr r0, [r3, 0x4]
|
||||
ldr r1, [r3, 0x8]
|
||||
ldr r2, [r3, 0xC]
|
||||
adds r3, 0x10
|
||||
movs r4, 0x6
|
||||
str r4, [sp]
|
||||
movs r4, 0x1
|
||||
str r4, [sp, 0x4]
|
||||
bl sub_8074DB8
|
||||
adds r4, r0, 0
|
||||
adds r7, r5, 0
|
||||
b _08074B48
|
||||
.pool
|
||||
_08074AEC:
|
||||
ldr r2, =gBattleSpritesDataPtr
|
||||
mov r10, r2
|
||||
ldr r0, [r2]
|
||||
ldr r2, [r0, 0xC]
|
||||
mov r0, r8
|
||||
lsls r4, r0, 2
|
||||
adds r0, r4, r0
|
||||
lsls r6, r0, 2
|
||||
adds r2, r6, r2
|
||||
ldr r0, [r2, 0x8]
|
||||
ldr r1, [r2, 0xC]
|
||||
ldr r2, [r2, 0x4]
|
||||
movs r3, 0x8
|
||||
bl sub_8074FE8
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
adds r7, r4, 0
|
||||
cmp r5, 0
|
||||
bne _08074B16
|
||||
movs r5, 0x1
|
||||
_08074B16:
|
||||
mov r1, r10
|
||||
ldr r0, [r1]
|
||||
ldr r0, [r0, 0xC]
|
||||
adds r4, r6, r0
|
||||
ldr r6, [r4, 0xC]
|
||||
adds r0, r6, 0
|
||||
adds r1, r5, 0
|
||||
bl __divsi3
|
||||
cmp r0, 0
|
||||
bge _08074B2E
|
||||
negs r0, r0
|
||||
_08074B2E:
|
||||
lsls r0, 16
|
||||
lsrs r5, r0, 16
|
||||
ldr r0, [r4, 0x4]
|
||||
ldr r1, [r4, 0x8]
|
||||
adds r3, r4, 0
|
||||
adds r3, 0x10
|
||||
movs r2, 0x8
|
||||
str r2, [sp]
|
||||
str r5, [sp, 0x4]
|
||||
adds r2, r6, 0
|
||||
bl sub_8074DB8
|
||||
adds r4, r0, 0
|
||||
_08074B48:
|
||||
mov r2, r9
|
||||
cmp r2, 0x1
|
||||
beq _08074B64
|
||||
cmp r2, 0
|
||||
bne _08074B6C
|
||||
ldr r0, =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0]
|
||||
adds r0, r7, r0
|
||||
ldrb r1, [r0]
|
||||
movs r0, 0x10
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _08074B6C
|
||||
_08074B64:
|
||||
mov r0, r8
|
||||
mov r1, r9
|
||||
bl sub_8074B9C
|
||||
_08074B6C:
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
cmp r4, r0
|
||||
bne _08074B86
|
||||
ldr r0, =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r1, [r0, 0xC]
|
||||
mov r2, r8
|
||||
adds r0, r7, r2
|
||||
lsls r0, 2
|
||||
adds r0, r1
|
||||
movs r1, 0
|
||||
str r1, [r0, 0x10]
|
||||
_08074B86:
|
||||
adds r0, r4, 0
|
||||
add sp, 0x8
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
mov r9, r4
|
||||
mov r10, r5
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end sub_8074AA0
|
||||
|
||||
thumb_func_start sub_8074B9C
|
||||
sub_8074B9C: @ 8074B9C
|
||||
push {r4-r7,lr}
|
||||
mov r7, r9
|
||||
mov r6, r8
|
||||
push {r6,r7}
|
||||
sub sp, 0x10
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
cmp r1, 0
|
||||
beq _08074BB8
|
||||
cmp r1, 0x1
|
||||
beq _08074CA0
|
||||
b _08074D9E
|
||||
_08074BB8:
|
||||
ldr r0, =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0xC]
|
||||
lsls r5, r6, 2
|
||||
adds r3, r5, r6
|
||||
lsls r3, 2
|
||||
adds r3, r0
|
||||
ldr r0, [r3, 0x4]
|
||||
ldr r1, [r3, 0x8]
|
||||
ldr r2, [r3, 0xC]
|
||||
adds r3, 0x10
|
||||
add r4, sp, 0x8
|
||||
str r4, [sp]
|
||||
movs r4, 0x6
|
||||
str r4, [sp, 0x4]
|
||||
bl sub_8074E8C
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0x3
|
||||
mov r9, r1
|
||||
adds r7, r5, 0
|
||||
cmp r0, 0x18
|
||||
bhi _08074BF4
|
||||
movs r2, 0x38
|
||||
mov r9, r2
|
||||
cmp r0, 0x9
|
||||
bls _08074BF4
|
||||
movs r4, 0x2F
|
||||
mov r9, r4
|
||||
_08074BF4:
|
||||
movs r5, 0
|
||||
ldr r0, =gSprites
|
||||
mov r8, r0
|
||||
_08074BFA:
|
||||
ldr r0, =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r1, [r0, 0xC]
|
||||
adds r0, r7, r6
|
||||
lsls r0, 2
|
||||
adds r0, r1
|
||||
ldrb r1, [r0]
|
||||
lsls r0, r1, 4
|
||||
adds r0, r1
|
||||
lsls r0, 2
|
||||
add r0, r8
|
||||
ldrh r0, [r0, 0x38]
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
cmp r5, 0x1
|
||||
bhi _08074C5C
|
||||
mov r0, r9
|
||||
bl GetHealthboxElementGfxPtr
|
||||
mov r1, sp
|
||||
adds r1, r5
|
||||
adds r1, 0x8
|
||||
ldrb r1, [r1]
|
||||
lsls r1, 5
|
||||
adds r0, r1
|
||||
lsls r1, r4, 4
|
||||
adds r1, r4
|
||||
lsls r1, 2
|
||||
add r1, r8
|
||||
ldrh r1, [r1, 0x4]
|
||||
lsls r1, 22
|
||||
lsrs r1, 22
|
||||
adds r2, r5, 0x2
|
||||
adds r1, r2
|
||||
lsls r1, 5
|
||||
ldr r2, =0x06010000
|
||||
adds r1, r2
|
||||
ldr r2, =0x04000008
|
||||
bl CpuSet
|
||||
b _08074C8A
|
||||
.pool
|
||||
_08074C5C:
|
||||
mov r0, r9
|
||||
bl GetHealthboxElementGfxPtr
|
||||
mov r1, sp
|
||||
adds r1, r5
|
||||
adds r1, 0x8
|
||||
ldrb r1, [r1]
|
||||
lsls r1, 5
|
||||
adds r0, r1
|
||||
lsls r1, r4, 4
|
||||
adds r1, r4
|
||||
lsls r1, 2
|
||||
add r1, r8
|
||||
ldrh r1, [r1, 0x4]
|
||||
lsls r1, 22
|
||||
lsrs r1, 22
|
||||
adds r1, r5, r1
|
||||
lsls r1, 5
|
||||
ldr r4, =0x06010040
|
||||
adds r1, r4
|
||||
ldr r2, =0x04000008
|
||||
bl CpuSet
|
||||
_08074C8A:
|
||||
adds r0, r5, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
cmp r5, 0x5
|
||||
bls _08074BFA
|
||||
b _08074D9E
|
||||
.pool
|
||||
_08074CA0:
|
||||
ldr r0, =gBattleSpritesDataPtr
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0xC]
|
||||
lsls r5, r6, 2
|
||||
adds r3, r5, r6
|
||||
lsls r3, 2
|
||||
adds r3, r0
|
||||
ldr r0, [r3, 0x4]
|
||||
ldr r1, [r3, 0x8]
|
||||
ldr r2, [r3, 0xC]
|
||||
adds r3, 0x10
|
||||
add r4, sp, 0x8
|
||||
str r4, [sp]
|
||||
movs r4, 0x8
|
||||
str r4, [sp, 0x4]
|
||||
bl sub_8074E8C
|
||||
ldr r1, =gBattlePartyID
|
||||
lsls r0, r6, 1
|
||||
adds r0, r1
|
||||
ldrh r1, [r0]
|
||||
movs r0, 0x64
|
||||
muls r0, r1
|
||||
ldr r1, =gPlayerParty
|
||||
adds r0, r1
|
||||
movs r1, 0x38
|
||||
bl GetMonData
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r7, r5, 0
|
||||
cmp r0, 0x64
|
||||
bne _08074CF8
|
||||
movs r5, 0
|
||||
movs r1, 0
|
||||
_08074CE6:
|
||||
mov r0, sp
|
||||
adds r0, r5
|
||||
adds r0, 0x8
|
||||
strb r1, [r0]
|
||||
adds r0, r5, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
cmp r5, 0x7
|
||||
bls _08074CE6
|
||||
_08074CF8:
|
||||
movs r5, 0
|
||||
ldr r0, =gSprites
|
||||
mov r8, r0
|
||||
adds r0, r7, r6
|
||||
lsls r4, r0, 2
|
||||
_08074D02:
|
||||
cmp r5, 0x3
|
||||
bhi _08074D5C
|
||||
movs r0, 0xC
|
||||
bl GetHealthboxElementGfxPtr
|
||||
mov r1, sp
|
||||
adds r1, r5
|
||||
adds r1, 0x8
|
||||
ldrb r1, [r1]
|
||||
lsls r1, 5
|
||||
adds r0, r1
|
||||
ldr r1, =gBattleSpritesDataPtr
|
||||
ldr r1, [r1]
|
||||
ldr r1, [r1, 0xC]
|
||||
adds r1, r4, r1
|
||||
ldrb r2, [r1]
|
||||
lsls r1, r2, 4
|
||||
adds r1, r2
|
||||
lsls r1, 2
|
||||
add r1, r8
|
||||
ldrh r1, [r1, 0x4]
|
||||
lsls r1, 22
|
||||
lsrs r1, 22
|
||||
adds r2, r5, 0
|
||||
adds r2, 0x24
|
||||
adds r1, r2
|
||||
lsls r1, 5
|
||||
ldr r2, =0x06010000
|
||||
adds r1, r2
|
||||
ldr r2, =0x04000008
|
||||
bl CpuSet
|
||||
b _08074D94
|
||||
.pool
|
||||
_08074D5C:
|
||||
movs r0, 0xC
|
||||
bl GetHealthboxElementGfxPtr
|
||||
mov r1, sp
|
||||
adds r1, r5
|
||||
adds r1, 0x8
|
||||
ldrb r1, [r1]
|
||||
lsls r1, 5
|
||||
adds r0, r1
|
||||
ldr r1, =gBattleSpritesDataPtr
|
||||
ldr r1, [r1]
|
||||
ldr r1, [r1, 0xC]
|
||||
adds r1, r4, r1
|
||||
ldrb r2, [r1]
|
||||
lsls r1, r2, 4
|
||||
adds r1, r2
|
||||
lsls r1, 2
|
||||
add r1, r8
|
||||
ldrh r1, [r1, 0x4]
|
||||
lsls r1, 22
|
||||
lsrs r1, 22
|
||||
adds r1, r5, r1
|
||||
lsls r1, 5
|
||||
ldr r2, =0x06010b80
|
||||
adds r1, r2
|
||||
ldr r2, =0x04000008
|
||||
bl CpuSet
|
||||
_08074D94:
|
||||
adds r0, r5, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
cmp r5, 0x7
|
||||
bls _08074D02
|
||||
_08074D9E:
|
||||
add sp, 0x10
|
||||
pop {r3,r4}
|
||||
mov r8, r3
|
||||
mov r9, r4
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_8074B9C
|
||||
|
||||
thumb_func_start sub_8074DB8
|
||||
sub_8074DB8: @ 8074DB8
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
adds r7, r0, 0
|
||||
adds r4, r1, 0
|
||||
mov r8, r2
|
||||
adds r5, r3, 0
|
||||
ldr r1, [sp, 0x18]
|
||||
ldr r0, [sp, 0x1C]
|
||||
lsls r0, 16
|
||||
lsrs r3, r0, 16
|
||||
lsls r1, 27
|
||||
lsrs r2, r1, 24
|
||||
ldr r1, [r5]
|
||||
ldr r0, =0xffff8000
|
||||
cmp r1, r0
|
||||
bne _08074DEA
|
||||
cmp r7, r2
|
||||
bge _08074DE8
|
||||
lsls r0, r4, 8
|
||||
str r0, [r5]
|
||||
b _08074DEA
|
||||
.pool
|
||||
_08074DE8:
|
||||
str r4, [r5]
|
||||
_08074DEA:
|
||||
mov r0, r8
|
||||
subs r4, r0
|
||||
cmp r4, 0
|
||||
bge _08074DF6
|
||||
movs r4, 0
|
||||
b _08074DFC
|
||||
_08074DF6:
|
||||
cmp r4, r7
|
||||
ble _08074DFC
|
||||
adds r4, r7, 0
|
||||
_08074DFC:
|
||||
cmp r7, r2
|
||||
bge _08074E18
|
||||
ldr r0, [r5]
|
||||
asrs r1, r0, 8
|
||||
adds r6, r0, 0
|
||||
cmp r4, r1
|
||||
bne _08074E24
|
||||
movs r0, 0xFF
|
||||
ands r0, r6
|
||||
cmp r0, 0
|
||||
bne _08074E24
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
b _08074E80
|
||||
_08074E18:
|
||||
ldr r6, [r5]
|
||||
cmp r4, r6
|
||||
bne _08074E24
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
b _08074E80
|
||||
_08074E24:
|
||||
cmp r7, r2
|
||||
bge _08074E5E
|
||||
lsls r0, r7, 8
|
||||
adds r1, r2, 0
|
||||
bl __divsi3
|
||||
mov r1, r8
|
||||
cmp r1, 0
|
||||
bge _08074E42
|
||||
adds r0, r6, r0
|
||||
str r0, [r5]
|
||||
asrs r2, r0, 8
|
||||
cmp r2, r4
|
||||
blt _08074E7E
|
||||
b _08074E56
|
||||
_08074E42:
|
||||
subs r0, r6, r0
|
||||
str r0, [r5]
|
||||
asrs r2, r0, 8
|
||||
movs r1, 0xFF
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
ble _08074E52
|
||||
adds r2, 0x1
|
||||
_08074E52:
|
||||
cmp r2, r4
|
||||
bgt _08074E7E
|
||||
_08074E56:
|
||||
lsls r0, r4, 8
|
||||
str r0, [r5]
|
||||
adds r2, r4, 0
|
||||
b _08074E7E
|
||||
_08074E5E:
|
||||
mov r0, r8
|
||||
cmp r0, 0
|
||||
bge _08074E70
|
||||
ldr r0, [r5]
|
||||
adds r0, r3
|
||||
str r0, [r5]
|
||||
cmp r0, r4
|
||||
ble _08074E7C
|
||||
b _08074E7A
|
||||
_08074E70:
|
||||
ldr r0, [r5]
|
||||
subs r0, r3
|
||||
str r0, [r5]
|
||||
cmp r0, r4
|
||||
bge _08074E7C
|
||||
_08074E7A:
|
||||
str r4, [r5]
|
||||
_08074E7C:
|
||||
ldr r2, [r5]
|
||||
_08074E7E:
|
||||
adds r0, r2, 0
|
||||
_08074E80:
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8074DB8
|
||||
|
||||
thumb_func_start sub_8074E8C
|
||||
sub_8074E8C: @ 8074E8C
|
||||
push {r4-r7,lr}
|
||||
adds r4, r0, 0
|
||||
mov r12, r3
|
||||
ldr r7, [sp, 0x14]
|
||||
ldr r0, [sp, 0x18]
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
subs r5, r1, r2
|
||||
cmp r5, 0
|
||||
bge _08074EA4
|
||||
movs r5, 0
|
||||
b _08074EAA
|
||||
_08074EA4:
|
||||
cmp r5, r4
|
||||
ble _08074EAA
|
||||
adds r5, r4, 0
|
||||
_08074EAA:
|
||||
lsls r0, r6, 27
|
||||
lsrs r3, r0, 24
|
||||
movs r1, 0
|
||||
cmp r1, r6
|
||||
bcs _08074EC4
|
||||
movs r2, 0
|
||||
_08074EB6:
|
||||
adds r0, r7, r1
|
||||
strb r2, [r0]
|
||||
adds r0, r1, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
cmp r1, r6
|
||||
bcc _08074EB6
|
||||
_08074EC4:
|
||||
cmp r4, r3
|
||||
bge _08074ED8
|
||||
mov r1, r12
|
||||
ldr r0, [r1]
|
||||
muls r0, r3
|
||||
adds r1, r4, 0
|
||||
bl __divsi3
|
||||
asrs r0, 8
|
||||
b _08074EE4
|
||||
_08074ED8:
|
||||
mov r1, r12
|
||||
ldr r0, [r1]
|
||||
muls r0, r3
|
||||
adds r1, r4, 0
|
||||
bl __divsi3
|
||||
_08074EE4:
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
adds r3, r2, 0
|
||||
cmp r3, 0
|
||||
bne _08074EFA
|
||||
cmp r5, 0
|
||||
ble _08074EFA
|
||||
movs r0, 0x1
|
||||
strb r0, [r7]
|
||||
movs r3, 0x1
|
||||
b _08074F1E
|
||||
_08074EFA:
|
||||
movs r1, 0
|
||||
movs r4, 0x8
|
||||
_08074EFE:
|
||||
cmp r1, r6
|
||||
bcs _08074F1E
|
||||
cmp r2, 0x7
|
||||
bls _08074F1A
|
||||
adds r0, r7, r1
|
||||
strb r4, [r0]
|
||||
adds r0, r2, 0
|
||||
subs r0, 0x8
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
adds r0, r1, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
b _08074EFE
|
||||
_08074F1A:
|
||||
adds r0, r7, r1
|
||||
strb r2, [r0]
|
||||
_08074F1E:
|
||||
adds r0, r3, 0
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8074E8C
|
||||
|
||||
thumb_func_start sub_8074F28
|
||||
sub_8074F28: @ 8074F28
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
sub sp, 0x8
|
||||
adds r5, r0, 0
|
||||
adds r6, r1, 0
|
||||
adds r4, r2, 0
|
||||
mov r8, r3
|
||||
ldr r0, [r5]
|
||||
ldr r1, [r5, 0x4]
|
||||
ldr r2, [r5, 0x8]
|
||||
movs r3, 0x6
|
||||
str r3, [sp]
|
||||
movs r3, 0x1
|
||||
str r3, [sp, 0x4]
|
||||
adds r3, r6, 0
|
||||
bl sub_8074DB8
|
||||
lsls r0, 16
|
||||
lsrs r7, r0, 16
|
||||
adds r0, r5, 0
|
||||
adds r1, r6, 0
|
||||
adds r2, r4, 0
|
||||
bl sub_8074F88
|
||||
ldr r0, [r5]
|
||||
cmp r0, 0x2F
|
||||
bgt _08074F68
|
||||
ldr r0, [r6]
|
||||
lsls r0, 8
|
||||
lsrs r1, r0, 16
|
||||
b _08074F6A
|
||||
_08074F68:
|
||||
ldrh r1, [r6]
|
||||
_08074F6A:
|
||||
movs r2, 0
|
||||
ldrsh r0, [r5, r2]
|
||||
lsls r1, 16
|
||||
asrs r1, 16
|
||||
mov r2, r8
|
||||
bl sub_8072304
|
||||
lsls r0, r7, 16
|
||||
asrs r0, 16
|
||||
add sp, 0x8
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8074F28
|
||||
|
||||
thumb_func_start sub_8074F88
|
||||
sub_8074F88: @ 8074F88
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
sub sp, 0x1C
|
||||
adds r5, r0, 0
|
||||
adds r3, r1, 0
|
||||
mov r8, r2
|
||||
ldr r0, [r5]
|
||||
ldr r1, [r5, 0x4]
|
||||
ldr r2, [r5, 0x8]
|
||||
add r4, sp, 0x8
|
||||
str r4, [sp]
|
||||
movs r4, 0x6
|
||||
str r4, [sp, 0x4]
|
||||
bl sub_8074E8C
|
||||
movs r3, 0
|
||||
add r7, sp, 0x10
|
||||
mov r12, r7
|
||||
ldrb r0, [r5, 0xC]
|
||||
lsls r6, r0, 27
|
||||
ldr r4, [r5, 0x10]
|
||||
_08074FB4:
|
||||
lsls r2, r3, 1
|
||||
add r2, r12
|
||||
lsrs r1, r6, 15
|
||||
mov r0, sp
|
||||
adds r0, r3
|
||||
adds r0, 0x8
|
||||
ldrb r0, [r0]
|
||||
adds r0, r4, r0
|
||||
orrs r1, r0
|
||||
strh r1, [r2]
|
||||
adds r0, r3, 0x1
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
cmp r3, 0x5
|
||||
bls _08074FB4
|
||||
adds r0, r7, 0
|
||||
mov r1, r8
|
||||
movs r2, 0x6
|
||||
bl CpuSet
|
||||
add sp, 0x1C
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8074F88
|
||||
|
||||
thumb_func_start sub_8074FE8
|
||||
sub_8074FE8: @ 8074FE8
|
||||
push {r4-r7,lr}
|
||||
adds r6, r2, 0
|
||||
lsls r3, 27
|
||||
lsrs r7, r3, 24
|
||||
subs r5, r0, r1
|
||||
cmp r5, 0
|
||||
bge _08074FFA
|
||||
movs r5, 0
|
||||
b _08075000
|
||||
_08074FFA:
|
||||
cmp r5, r6
|
||||
ble _08075000
|
||||
adds r5, r6, 0
|
||||
_08075000:
|
||||
muls r0, r7
|
||||
adds r1, r6, 0
|
||||
bl __divsi3
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
adds r0, r5, 0
|
||||
muls r0, r7
|
||||
adds r1, r6, 0
|
||||
bl __divsi3
|
||||
lsls r4, 24
|
||||
asrs r4, 24
|
||||
lsls r0, 24
|
||||
asrs r0, 24
|
||||
subs r0, r4, r0
|
||||
cmp r0, 0
|
||||
bge _08075028
|
||||
negs r0, r0
|
||||
_08075028:
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8074FE8
|
||||
|
||||
thumb_func_start GetScaledHPFraction
|
||||
GetScaledHPFraction: @ 8075034
|
||||
push {r4,lr}
|
||||
lsls r2, 24
|
||||
lsrs r2, 24
|
||||
lsls r0, 16
|
||||
asrs r4, r0, 16
|
||||
adds r0, r4, 0
|
||||
muls r0, r2
|
||||
lsls r1, 16
|
||||
asrs r1, 16
|
||||
bl __divsi3
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0
|
||||
bne _08075058
|
||||
cmp r4, 0
|
||||
ble _08075058
|
||||
movs r0, 0x1
|
||||
_08075058:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end GetScaledHPFraction
|
||||
|
||||
thumb_func_start sub_8075060
|
||||
sub_8075060: @ 8075060
|
||||
push {lr}
|
||||
lsls r0, 16
|
||||
asrs r0, 16
|
||||
lsls r1, 16
|
||||
asrs r1, 16
|
||||
cmp r0, r1
|
||||
bne _08075072
|
||||
movs r0, 0x4
|
||||
b _0807508E
|
||||
_08075072:
|
||||
movs r2, 0x30
|
||||
bl GetScaledHPFraction
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
movs r0, 0x3
|
||||
cmp r1, 0x18
|
||||
bhi _0807508E
|
||||
movs r0, 0x2
|
||||
cmp r1, 0x9
|
||||
bhi _0807508E
|
||||
negs r0, r1
|
||||
orrs r0, r1
|
||||
lsrs r0, 31
|
||||
_0807508E:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_8075060
|
||||
|
||||
thumb_func_start AddTextPrinterAndCreateWindowOnHealthbox
|
||||
AddTextPrinterAndCreateWindowOnHealthbox: @ 8075094
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
mov r5, r8
|
||||
push {r5-r7}
|
||||
sub sp, 0x20
|
||||
mov r10, r0
|
||||
mov r8, r1
|
||||
mov r9, r2
|
||||
adds r5, r3, 0
|
||||
ldr r7, [sp, 0x40]
|
||||
ldr r0, =gUnknown_0832C3F8
|
||||
ldr r1, [r0, 0x4]
|
||||
ldr r0, [r0]
|
||||
str r0, [sp, 0x18]
|
||||
str r1, [sp, 0x1C]
|
||||
add r0, sp, 0x18
|
||||
bl AddWindow
|
||||
adds r4, r0, 0
|
||||
lsls r4, 16
|
||||
lsrs r4, 16
|
||||
lsls r6, r4, 24
|
||||
lsrs r6, 24
|
||||
lsls r1, r5, 4
|
||||
orrs r1, r5
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
adds r0, r6, 0
|
||||
bl FillWindowPixelBuffer
|
||||
add r0, sp, 0x14
|
||||
movs r2, 0
|
||||
strb r5, [r0]
|
||||
adds r1, r0, 0
|
||||
movs r0, 0x1
|
||||
strb r0, [r1, 0x1]
|
||||
movs r0, 0x3
|
||||
strb r0, [r1, 0x2]
|
||||
mov r0, r8
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r8, r0
|
||||
mov r0, r9
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
mov r9, r0
|
||||
str r2, [sp]
|
||||
str r2, [sp, 0x4]
|
||||
str r1, [sp, 0x8]
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
str r0, [sp, 0xC]
|
||||
mov r0, r10
|
||||
str r0, [sp, 0x10]
|
||||
adds r0, r6, 0
|
||||
movs r1, 0
|
||||
mov r2, r8
|
||||
mov r3, r9
|
||||
bl AddTextPrinterParametrized2
|
||||
str r4, [r7]
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x7
|
||||
bl GetWindowAttribute
|
||||
add sp, 0x20
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
mov r9, r4
|
||||
mov r10, r5
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end AddTextPrinterAndCreateWindowOnHealthbox
|
||||
|
||||
thumb_func_start RemoveWindowOnHealthbox
|
||||
RemoveWindowOnHealthbox: @ 807512C
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl RemoveWindow
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end RemoveWindowOnHealthbox
|
||||
|
||||
thumb_func_start sub_807513C
|
||||
sub_807513C: @ 807513C
|
||||
push {lr}
|
||||
sub sp, 0x4
|
||||
adds r3, r0, 0
|
||||
lsls r0, r1, 4
|
||||
adds r0, r1
|
||||
lsls r1, r0, 8
|
||||
adds r0, r1
|
||||
lsls r1, r0, 16
|
||||
adds r0, r1
|
||||
str r0, [sp]
|
||||
lsls r2, 3
|
||||
ldr r0, =0x001fffff
|
||||
ands r2, r0
|
||||
movs r0, 0xA0
|
||||
lsls r0, 19
|
||||
orrs r2, r0
|
||||
mov r0, sp
|
||||
adds r1, r3, 0
|
||||
bl CpuSet
|
||||
add sp, 0x4
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_807513C
|
||||
|
||||
thumb_func_start sub_8075170
|
||||
sub_8075170: @ 8075170
|
||||
push {lr}
|
||||
adds r3, r0, 0
|
||||
adds r0, r1, 0
|
||||
movs r1, 0x80
|
||||
lsls r1, 1
|
||||
adds r0, r1
|
||||
lsls r2, 3
|
||||
ldr r1, =0x001fffff
|
||||
ands r2, r1
|
||||
movs r1, 0x80
|
||||
lsls r1, 19
|
||||
orrs r2, r1
|
||||
adds r1, r3, 0
|
||||
bl CpuSet
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_8075170
|
||||
|
||||
thumb_func_start sub_8075198
|
||||
sub_8075198: @ 8075198
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
adds r5, r1, 0
|
||||
adds r4, r2, 0
|
||||
movs r1, 0x80
|
||||
lsls r1, 1
|
||||
adds r0, r5, r1
|
||||
adds r1, r6, r1
|
||||
lsls r2, r4, 3
|
||||
ldr r3, =0x001fffff
|
||||
ands r2, r3
|
||||
movs r3, 0x80
|
||||
lsls r3, 19
|
||||
orrs r2, r3
|
||||
bl CpuSet
|
||||
cmp r4, 0
|
||||
ble _080751D4
|
||||
_080751BC:
|
||||
adds r0, r5, 0
|
||||
adds r0, 0x14
|
||||
adds r1, r6, 0
|
||||
adds r1, 0x14
|
||||
ldr r2, =0x04000003
|
||||
bl CpuSet
|
||||
adds r6, 0x20
|
||||
adds r5, 0x20
|
||||
subs r4, 0x1
|
||||
cmp r4, 0
|
||||
bne _080751BC
|
||||
_080751D4:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_8075198
|
||||
|
||||
thumb_func_start sub_80751E4
|
||||
sub_80751E4: @ 80751E4
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
adds r5, r1, 0
|
||||
lsls r4, r2, 3
|
||||
ldr r0, =0x001fffff
|
||||
ands r4, r0
|
||||
movs r0, 0x80
|
||||
lsls r0, 19
|
||||
orrs r4, r0
|
||||
adds r0, r5, 0
|
||||
adds r1, r6, 0
|
||||
adds r2, r4, 0
|
||||
bl CpuSet
|
||||
movs r0, 0x80
|
||||
lsls r0, 1
|
||||
adds r5, r0
|
||||
adds r6, r0
|
||||
adds r0, r5, 0
|
||||
adds r1, r6, 0
|
||||
adds r2, r4, 0
|
||||
bl CpuSet
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_80751E4
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
@ -5441,7 +5441,7 @@ sub_81B2E64: @ 81B2E64
|
||||
mov r2, r9
|
||||
lsls r1, r2, 16
|
||||
asrs r1, 16
|
||||
bl sub_8075060
|
||||
bl GetHPBarLevel
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x2
|
||||
@ -10452,7 +10452,7 @@ sub_81B5A8C: @ 81B5A8C
|
||||
asrs r2, 16
|
||||
adds r0, r1, 0
|
||||
adds r1, r2, 0
|
||||
bl sub_8075060
|
||||
bl GetHPBarLevel
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x2
|
||||
|
||||
@ -5954,7 +5954,7 @@ _0807A488:
|
||||
asrs r0, 16
|
||||
lsls r1, 16
|
||||
asrs r1, 16
|
||||
bl sub_8075060
|
||||
bl GetHPBarLevel
|
||||
ldr r1, [r7]
|
||||
adds r1, 0x5D
|
||||
adds r1, r6
|
||||
@ -5997,7 +5997,7 @@ _0807A4E8:
|
||||
asrs r0, 16
|
||||
lsls r1, 16
|
||||
asrs r1, 16
|
||||
bl sub_8075060
|
||||
bl GetHPBarLevel
|
||||
ldr r1, [r7]
|
||||
adds r1, 0x63
|
||||
adds r1, r6
|
||||
|
||||
@ -1,139 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
.align 2, 0
|
||||
|
||||
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C220:: @ 832C220
|
||||
.byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
|
||||
.byte 0xf0, 0x20, 0x05, 0x43, 0x10, 0x20, 0x45, 0x43
|
||||
.byte 0x30, 0x20, 0x85, 0x43
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C234:: @ 832C234
|
||||
.byte 0xf0, 0x00, 0x0d, 0x44, 0x30, 0x00, 0x08, 0x46
|
||||
.byte 0xf0, 0x20, 0x05, 0x47, 0x10, 0x20, 0x45, 0x47
|
||||
.byte 0x30, 0x20, 0x85, 0x47
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C248:: @ 832C248
|
||||
.byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C250:: @ 832C250
|
||||
.byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C258:: @ 832C258
|
||||
.byte 0xf0, 0x00, 0x05, 0x40, 0x10, 0x00, 0x45, 0x40
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C260:: @ 832C260
|
||||
.byte 0xf0, 0x00, 0x05, 0x40, 0x10, 0x00, 0x45, 0x40
|
||||
.byte 0xe0, 0x00, 0x80, 0x40
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C26C:: @ 832C26C
|
||||
.4byte 0x00000005, gUnknown_0832C220
|
||||
.4byte 0x00000002, gUnknown_0832C248
|
||||
.4byte 0x00000005, gUnknown_0832C234
|
||||
.4byte 0x00000002, gUnknown_0832C250
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C28C:: @ 832C28C
|
||||
.4byte 0x00000002, gUnknown_0832C258
|
||||
.4byte 0x00000003, gUnknown_0832C260
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C29C:: @ 832C29C
|
||||
.byte 0xa0, 0x00, 0x05, 0x40, 0xc0, 0x00, 0x45, 0x40
|
||||
.byte 0xe0, 0x00, 0x85, 0x40, 0x00, 0x00, 0xc5, 0x40
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C2AC:: @ 832C2AC
|
||||
.byte 0xa0, 0x00, 0x05, 0x40, 0xc0, 0x00, 0x45, 0x40
|
||||
.byte 0xe0, 0x00, 0x85, 0x40, 0x00, 0x00, 0x85, 0x40
|
||||
.byte 0x20, 0x00, 0x85, 0x40, 0x40, 0x00, 0xc5, 0x40
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C2C4:: @ 832C2C4
|
||||
.4byte 0x00000004, gUnknown_0832C29C
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C2CC:: @ 832C2CC
|
||||
.4byte 0x00000006, gUnknown_0832C2AC
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C2D4:: @ 832C2D4
|
||||
.2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
|
||||
.2byte 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777
|
||||
|
||||
.2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
|
||||
.2byte 0x7777, 0x7777, 0x7777, 0x7717, 0x1777, 0x7177, 0x7777, 0x7771
|
||||
|
||||
.2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
|
||||
.2byte 0x7777, 0x7777, 0x7777, 0x7111, 0x7777, 0x7171, 0x7777, 0x7111
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C334:: @ 832C334
|
||||
obj_tiles gBattleInterface_BallStatusBarGfx, 0x0200, 0xd70c
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C33C:: @ 832C33C
|
||||
obj_pal gBattleInterface_BallStatusBarPal, 0xd710
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C344:: @ 832C344
|
||||
obj_pal gBattleInterface_BallDisplayPal, 0xd712
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C34C:: @ 832C34C
|
||||
obj_tiles gBattleInterface_BallDisplayGfx, 0x0080, 0xd714
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C354:: @ 832C354
|
||||
.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C35C:: @ 832C35C
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C364:: @ 832C364
|
||||
spr_template 0xd70c, 0xd710, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8074078
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C37C:: @ 832C37C
|
||||
spr_template 0xd70c, 0xd710, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8074078
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C394:: @ 832C394
|
||||
spr_template 0xd714, 0xd712, gUnknown_0832C35C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80740C4
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C3AC:: @ 832C3AC
|
||||
spr_template 0xd714, 0xd712, gUnknown_0832C35C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80740C4
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C3C4:: @ 832C3C4
|
||||
.byte 0xfc, 0x01, 0x01, 0xfc, 0x02, 0x02, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C3D8:: @ 832C3D8
|
||||
.byte 0xfc, 0x01, 0x01, 0xfc, 0x02, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gBattleInterfaceStatusIcons_DynPals:: @ 832C3EC
|
||||
.byte 0x98, 0x61, 0xf7, 0x0e, 0x94, 0x46, 0xd1, 0x72
|
||||
.byte 0xdc, 0x29, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_0832C3F8:: @ 832C3F8
|
||||
.byte 0x00, 0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0x00
|
||||
@ -919,9 +919,9 @@ struct BattleHealthboxInfo
|
||||
struct BattleBarInfo
|
||||
{
|
||||
u8 healthboxSpriteId;
|
||||
u32 maxValue;
|
||||
u32 currentValue;
|
||||
bool32 isDoubleBattle;
|
||||
s32 maxValue;
|
||||
s32 currentValue;
|
||||
s32 field_C;
|
||||
s32 field_10;
|
||||
};
|
||||
|
||||
|
||||
@ -19,10 +19,20 @@ enum
|
||||
|
||||
u8 CreateBankHealthboxSprites(u8 bank);
|
||||
u8 CreateSafariPlayerHealthboxSprites(void);
|
||||
void SetBankHealthboxSpritePos(u8 bank);
|
||||
void SetHealthboxSpriteVisible(u8 healthboxSpriteId);
|
||||
void SetBattleBarStruct(u8 bank, u8 healthboxSpriteId, s32 maxVal, s32 currVal, s32 field_C);
|
||||
void SetHealthboxSpriteInvisible(u8 healthboxSpriteId);
|
||||
void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elementId);
|
||||
void SetHealthboxSpriteVisible(u8 healthboxSpriteId);
|
||||
void DestoryHealthboxSprite(u8 healthboxSpriteId);
|
||||
void nullsub_30(u8 healthboxSpriteId, bool8 isDoubleBattleBankOnly);
|
||||
void UpdateOamPriorityInAllHealthboxes(u8 priority);
|
||||
void SetBankHealthboxSpritePos(u8 bank);
|
||||
void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent);
|
||||
void SwapHpBarsWithHpText(void);
|
||||
u8 CreatePartyStatusSummarySprites(u8 bank, struct HpAndStatus *partyInfo, u8 arg2, bool8 isBattleStart);
|
||||
void sub_8073C30(u8 taskId);
|
||||
void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elementId);
|
||||
s32 sub_8074AA0(u8 bank, u8 healthboxSpriteId, u8 whichBar, u8 arg3);
|
||||
u8 GetScaledHPFraction(s16 hp, s16 maxhp, u8 scale);
|
||||
u8 GetHPBarLevel(s16 hp, s16 maxhp);
|
||||
|
||||
#endif // GUARD_BATTLE_INTERFACE_H
|
||||
|
||||
@ -80,7 +80,6 @@ SECTIONS {
|
||||
asm/daycare.o(.text);
|
||||
src/egg_hatch.o(.text);
|
||||
src/battle_interface.o(.text);
|
||||
asm/battle_interface.o(.text);
|
||||
asm/smokescreen.o(.text);
|
||||
asm/pokeball.o(.text);
|
||||
src/load_save.o(.text);
|
||||
@ -342,7 +341,6 @@ SECTIONS {
|
||||
src/egg_hatch.o(.rodata);
|
||||
data/battle_7.o(.rodata);
|
||||
src/battle_interface.o(.rodata);
|
||||
data/battle_interface.o(.rodata);
|
||||
data/pokeball.o(.rodata);
|
||||
data/trade.o(.rodata);
|
||||
data/berry_blender.o(.rodata);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user