ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

label gHealthBoxesIds

Browse Source
This commit is contained in:
DizzyEggg 2017-09-08 22:27:27 +02:00
parent 44dbf4dea0
commit 5eff1d5bdb
16 changed files with 137 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/battle_2.s
View File

@ -5429,7 +5429,7 @@ sub_8039838: @ 8039838
lsls r0, 24
lsrs r0, 24
bl sub_8076918
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
movs r2, 0x2E
ldrsh r0, [r4, r2]
adds r0, r1
@ -5989,7 +5989,7 @@ _08039C76:
mov r0, r8
cmp r0, 0x1
bne _08039CD0
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r4, r0
ldrb r7, [r0]
ldr r2, =gUnknown_020244D0

12
asm/battle_7.s
View File

@ -2029,7 +2029,7 @@ _0805E24C:
ldrb r0, [r4]
bl battle_make_oam_normal_battle
_0805E252:
ldr r2, =gUnknown_03005D70
ldr r2, =gHealthBoxesIds
ldrb r1, [r4]
adds r1, r2
strb r0, [r1]
@ -2044,7 +2044,7 @@ _0805E260:
ldrb r0, [r0]
cmp r0, 0x1
bhi _0805E288
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r1, r0
ldrb r0, [r0]
movs r1, 0
@ -2052,7 +2052,7 @@ _0805E260:
b _0805E30E
.pool
_0805E288:
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r1, r0
ldrb r0, [r0]
movs r1, 0x1
@ -2071,7 +2071,7 @@ _0805E29C:
ands r0, r1
cmp r0, 0
bne _0805E302
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]
@ -2088,7 +2088,7 @@ _0805E29C:
b _0805E302
.pool
_0805E2E4:
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]
@ -2103,7 +2103,7 @@ _0805E2E4:
movs r2, 0
bl healthbar_draw_field_maybe
_0805E302:
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r4]
adds r0, r1
ldrb r0, [r0]

6
asm/battle_anim_80FE840.s
View File

@ -7544,7 +7544,7 @@ sub_8102434: @ 8102434
cmp r4, r0
bcs _08102490
ldr r6, =gBattleAnimArgs
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
_08102448:
movs r1, 0
ldrsh r0, [r6, r1]
@ -7597,7 +7597,7 @@ sub_81024A8: @ 81024A8
movs r4, 0
b _081024C2
_081024B2:
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r4, r0
ldrb r0, [r0]
bl sub_80729D0
@ -46450,7 +46450,7 @@ _08115FF8:
cmp r0, 0
beq _08116028
ldr r2, =gSprites
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
add r0, r9
ldrb r1, [r0]
lsls r0, r1, 4

8
asm/battle_anim_8170478.s
View File

@ -56,7 +56,7 @@ sub_8170478: @ 8170478
movs r1, 0x3
movs r2, 0x1
bl lcd_bg_operations
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r4, r0
ldrb r0, [r4]
ldr r1, =gSprites
@ -373,7 +373,7 @@ _0817076C:
movs r1, 0x1
movs r2, 0
bl lcd_bg_operations
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
add r0, r8
ldrb r0, [r0]
lsls r1, r0, 4
@ -434,7 +434,7 @@ sub_8170834: @ 8170834
adds r7, r1, 0
lsls r2, 24
lsrs r2, 24
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r2, r0
ldrb r0, [r2]
lsls r5, r0, 4
@ -561,7 +561,7 @@ sub_817094C: @ 817094C
push {r5,r6}
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r0, r1
ldrb r0, [r0]
ldr r1, =gSprites

26
asm/battle_controller_linkopponent.s
View File

@ -215,7 +215,7 @@ sub_8064520: @ 8064520
beq _08064584
_0806454C:
ldr r2, =gSprites
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldr r3, =gActiveBank
ldrb r0, [r3]
adds r0, r1
@ -234,7 +234,7 @@ _0806454C:
.pool
_08064584:
ldr r3, =gSprites
ldr r6, =gUnknown_03005D70
ldr r6, =gHealthBoxesIds
ldr r2, =gActiveBank
ldrb r4, [r2]
adds r0, r4, r6
@ -541,7 +541,7 @@ _080647B4:
ands r0, r1
cmp r0, 0
bne _0806484A
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
mov r1, r9
ldrb r0, [r1]
adds r1, r7, 0
@ -569,7 +569,7 @@ _080647B4:
ldrb r0, [r0]
bl sub_80729D0
_0806484A:
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r1, [r4]
adds r0, r1, r5
@ -962,7 +962,7 @@ sub_8064BC0: @ 8064BC0
push {r4-r6,lr}
ldr r6, =gActiveBank
ldrb r0, [r6]
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
adds r1, r0, r5
ldrb r1, [r1]
movs r2, 0
@ -1014,7 +1014,7 @@ sub_8064C14: @ 8064C14
lsls r0, 31
cmp r0, 0
bne _08064C42
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r3, r0
ldrb r0, [r0]
bl sub_8072984
@ -1061,7 +1061,7 @@ sub_8064C58: @ 8064C58
bl DestroySprite
ldrb r0, [r6]
bl sub_805EEE0
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@ -1152,7 +1152,7 @@ _08064D5A:
sub_8064D60: @ 8064D60
push {r4,lr}
ldr r2, =gSprites
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r3, [r4]
adds r0, r3, r0
@ -1308,7 +1308,7 @@ sub_8064E50: @ 8064E50
adds r0, r7
movs r1, 0
bl StartSpriteAnim
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r1, [r5]
adds r0, r1, r4
ldrb r0, [r0]
@ -3943,7 +3943,7 @@ _0806666C:
bl DestroySprite
ldrb r0, [r6]
bl sub_805EEE0
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@ -5166,7 +5166,7 @@ sub_80670A0: @ 80670A0
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@ -5188,7 +5188,7 @@ _08067130:
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@ -5229,7 +5229,7 @@ sub_806719C: @ 806719C
lsls r0, 24
cmp r0, 0
bne _080671F0
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]

26
asm/battle_controller_linkpartner.s
View File

@ -184,7 +184,7 @@ sub_814B004: @ 814B004
beq _0814B05C
_0814B028:
ldr r2, =gSprites
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldr r0, =gActiveBank
ldrb r0, [r0]
adds r0, r1
@ -202,7 +202,7 @@ _0814B028:
.pool
_0814B05C:
ldr r2, =gSprites
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldr r0, =gActiveBank
ldrb r3, [r0]
adds r0, r3, r5
@ -368,7 +368,7 @@ _0814B136:
lsls r0, 2
add r0, r10
bl DestroySprite
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r0, [r7]
mov r1, r8
eors r1, r0
@ -406,7 +406,7 @@ _0814B1F0:
ldr r1, =gSprites
adds r0, r1
bl DestroySprite
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r5
ldrb r0, [r0]
@ -486,7 +486,7 @@ bx_t4_healthbar_update: @ 814B2D0
push {r4-r6,lr}
ldr r5, =gActiveBank
ldrb r0, [r5]
ldr r6, =gUnknown_03005D70
ldr r6, =gHealthBoxesIds
adds r1, r0, r6
ldrb r1, [r1]
movs r2, 0
@ -583,7 +583,7 @@ sub_814B340: @ 814B340
lsls r0, 2
adds r0, r6
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r4]
adds r0, r1
ldrb r0, [r0]
@ -630,7 +630,7 @@ sub_814B3DC: @ 814B3DC
lsls r0, 2
adds r0, r4
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@ -721,7 +721,7 @@ _0814B4DA:
sub_814B4E0: @ 814B4E0
push {r4,lr}
ldr r2, =gSprites
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r3, [r4]
adds r0, r3, r0
@ -868,7 +868,7 @@ sub_814B5A8: @ 814B5A8
adds r0, r1
movs r1, 0
bl StartSpriteAnim
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r1, [r7]
adds r0, r1, r4
ldrb r0, [r0]
@ -3510,7 +3510,7 @@ _0814CE5C:
lsls r0, 2
adds r0, r4
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@ -4475,7 +4475,7 @@ sub_814D63C: @ 814D63C
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@ -4497,7 +4497,7 @@ _0814D6CC:
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@ -4538,7 +4538,7 @@ sub_814D738: @ 814D738
lsls r0, 24
cmp r0, 0
bne _0814D78C
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]

26
asm/battle_controller_opponent.s
View File

@ -224,7 +224,7 @@ _0805F31E:
beq _0805F368
_0805F32C:
ldr r2, =gSprites
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldr r3, =gActiveBank
ldrb r0, [r3]
adds r0, r1
@ -246,7 +246,7 @@ _0805F34E:
.pool
_0805F368:
ldr r3, =gSprites
ldr r6, =gUnknown_03005D70
ldr r6, =gHealthBoxesIds
ldr r2, =gActiveBank
ldrb r4, [r2]
adds r0, r4, r6
@ -593,7 +593,7 @@ _0805F5EE:
ands r0, r1
cmp r0, 0
bne _0805F684
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
mov r1, r8
ldrb r0, [r1]
adds r1, r7, 0
@ -621,7 +621,7 @@ _0805F5EE:
ldrb r0, [r0]
bl sub_80729D0
_0805F684:
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r1, [r4]
adds r0, r1, r5
@ -1056,7 +1056,7 @@ sub_805FA70: @ 805FA70
push {r4-r6,lr}
ldr r6, =gActiveBank
ldrb r0, [r6]
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
adds r1, r0, r5
ldrb r1, [r1]
movs r2, 0
@ -1108,7 +1108,7 @@ sub_805FAC4: @ 805FAC4
lsls r0, 31
cmp r0, 0
bne _0805FAF2
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r3, r0
ldrb r0, [r0]
bl sub_8072984
@ -1155,7 +1155,7 @@ sub_805FB08: @ 805FB08
bl DestroySprite
ldrb r0, [r6]
bl sub_805EEE0
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@ -1246,7 +1246,7 @@ _0805FC0A:
sub_805FC10: @ 805FC10
push {r4,lr}
ldr r2, =gSprites
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r3, [r4]
adds r0, r3, r0
@ -1402,7 +1402,7 @@ sub_805FD00: @ 805FD00
adds r0, r7
movs r1, 0
bl StartSpriteAnim
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r1, [r5]
adds r0, r1, r4
ldrb r0, [r0]
@ -4105,7 +4105,7 @@ _080615B4:
bl DestroySprite
ldrb r0, [r6]
bl sub_805EEE0
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@ -5616,7 +5616,7 @@ sub_8062294: @ 8062294
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@ -5638,7 +5638,7 @@ _08062324:
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@ -5679,7 +5679,7 @@ sub_8062390: @ 8062390
lsls r0, 24
cmp r0, 0
bne _080623E4
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]

34
asm/battle_controller_player.s
View File

@ -2401,7 +2401,7 @@ sub_805896C: @ 805896C
beq _080589D0
_08058998:
ldr r2, =gSprites
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldr r3, =gActiveBank
ldrb r0, [r3]
adds r0, r1
@ -2420,7 +2420,7 @@ _08058998:
.pool
_080589D0:
ldr r3, =gSprites
ldr r6, =gUnknown_03005D70
ldr r6, =gHealthBoxesIds
ldr r2, =gActiveBank
ldrb r4, [r2]
adds r0, r4, r6
@ -2682,7 +2682,7 @@ _08058BB2:
ands r0, r1
cmp r0, 0
bne _08058C38
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r0, [r7]
adds r1, r6, 0
eors r1, r0
@ -2707,7 +2707,7 @@ _08058BB2:
ldrb r0, [r0]
bl sub_80729D0
_08058C38:
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r1, [r4]
adds r0, r1, r5
@ -3001,7 +3001,7 @@ _08058EAA:
sub_8058EDC: @ 8058EDC
push {r4-r6,lr}
ldr r2, =gSprites
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldr r6, =gActiveBank
ldrb r3, [r6]
adds r0, r3, r0
@ -3194,7 +3194,7 @@ _0805905E:
bne _080590D2
adds r0, r3, r4
bl DestroySprite
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r1, [r5]
adds r0, r1, r4
ldrb r0, [r0]
@ -3255,7 +3255,7 @@ bx_t1_healthbar_update: @ 8059130
push {r4-r6,lr}
ldr r5, =gActiveBank
ldrb r0, [r5]
ldr r6, =gUnknown_03005D70
ldr r6, =gHealthBoxesIds
adds r1, r0, r6
ldrb r1, [r1]
movs r2, 0
@ -3550,7 +3550,7 @@ sub_8059330: @ 8059330
adds r4, r6
ldr r2, [r4]
subs r2, r1
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
add r0, r10
ldrb r1, [r0]
mov r0, r9
@ -3605,7 +3605,7 @@ _08059430:
ldrh r2, [r6, 0xA]
mov r10, r2
ldrb r7, [r6, 0xC]
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
adds r5, r7, r5
ldrb r1, [r5]
adds r0, r7, 0
@ -3809,7 +3809,7 @@ sub_80595A4: @ 80595A4
ldrh r0, [r0]
cmp r4, r0
bne _08059624
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r2, r0
ldrb r0, [r0]
adds r1, r7, 0
@ -3818,7 +3818,7 @@ sub_80595A4: @ 80595A4
b _08059638
.pool
_08059624:
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r5, r0
ldrb r0, [r0]
movs r1, 0x64
@ -3926,7 +3926,7 @@ sub_80596A8: @ 80596A8
lsls r0, 2
adds r0, r6
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r4]
adds r0, r1
ldrb r0, [r0]
@ -3973,7 +3973,7 @@ sub_8059744: @ 8059744
lsls r0, 2
adds r0, r4
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@ -7158,7 +7158,7 @@ _0805B41C:
lsls r0, 2
adds r0, r4
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@ -8987,7 +8987,7 @@ _0805C44A:
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@ -9011,7 +9011,7 @@ _0805C4B4:
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
adds r1, r0, r4
ldrb r1, [r1]
str r7, [sp]
@ -9117,7 +9117,7 @@ sub_805C5C4: @ 805C5C4
lsls r0, 24
cmp r0, 0
bne _0805C618
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]

34
asm/battle_controller_player_partner.s
View File

@ -185,7 +185,7 @@ sub_81BAF48: @ 81BAF48
beq _081BAFA0
_081BAF6C:
ldr r2, =gSprites
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldr r0, =gActiveBank
ldrb r0, [r0]
adds r0, r1
@ -203,7 +203,7 @@ _081BAF6C:
.pool
_081BAFA0:
ldr r2, =gSprites
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldr r0, =gActiveBank
ldrb r3, [r0]
adds r0, r3, r5
@ -369,7 +369,7 @@ _081BB07A:
lsls r0, 2
add r0, r10
bl DestroySprite
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r0, [r7]
mov r1, r8
eors r1, r0
@ -407,7 +407,7 @@ _081BB134:
ldr r1, =gSprites
adds r0, r1
bl DestroySprite
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r5
ldrb r0, [r0]
@ -487,7 +487,7 @@ bx_t3_healthbar_update: @ 81BB214
push {r4-r6,lr}
ldr r5, =gActiveBank
ldrb r0, [r5]
ldr r6, =gUnknown_03005D70
ldr r6, =gHealthBoxesIds
adds r1, r0, r6
ldrb r1, [r1]
movs r2, 0
@ -782,7 +782,7 @@ sub_81BB414: @ 81BB414
adds r4, r6
ldr r2, [r4]
subs r2, r1
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
add r0, r10
ldrb r1, [r0]
mov r0, r9
@ -837,7 +837,7 @@ _081BB514:
ldrh r2, [r6, 0xA]
mov r10, r2
ldrb r7, [r6, 0xC]
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
adds r5, r7, r5
ldrb r1, [r5]
adds r0, r7, 0
@ -1041,7 +1041,7 @@ sub_81BB688: @ 81BB688
ldrh r0, [r0]
cmp r4, r0
bne _081BB708
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r2, r0
ldrb r0, [r0]
adds r1, r7, 0
@ -1050,7 +1050,7 @@ sub_81BB688: @ 81BB688
b _081BB71C
.pool
_081BB708:
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r5, r0
ldrb r0, [r0]
movs r1, 0x64
@ -1158,7 +1158,7 @@ sub_81BB78C: @ 81BB78C
lsls r0, 2
adds r0, r6
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r4]
adds r0, r1
ldrb r0, [r0]
@ -1205,7 +1205,7 @@ sub_81BB828: @ 81BB828
lsls r0, 2
adds r0, r4
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@ -1296,7 +1296,7 @@ _081BB926:
sub_81BB92C: @ 81BB92C
push {r4,lr}
ldr r2, =gSprites
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r3, [r4]
adds r0, r3, r0
@ -1443,7 +1443,7 @@ sub_81BB9F4: @ 81BB9F4
adds r0, r1
movs r1, 0
bl StartSpriteAnim
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r1, [r7]
adds r0, r1, r4
ldrb r0, [r0]
@ -4085,7 +4085,7 @@ _081BD2A8:
lsls r0, 2
adds r0, r4
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@ -5204,7 +5204,7 @@ sub_81BDC10: @ 81BDC10
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@ -5226,7 +5226,7 @@ _081BDCA0:
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@ -5325,7 +5325,7 @@ sub_81BDD9C: @ 81BDD9C
lsls r0, 24
cmp r0, 0
bne _081BDDF0
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]

26
asm/battle_controller_recorded_opponent.s
View File

@ -214,7 +214,7 @@ sub_8186678: @ 8186678
beq _081866F8
_081866A4:
ldr r4, =gSprites
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldr r2, =gActiveBank
ldrb r3, [r2]
adds r0, r3, r0
@ -246,7 +246,7 @@ _081866A4:
.pool
_081866F8:
ldr r6, =gSprites
ldr r7, =gUnknown_03005D70
ldr r7, =gHealthBoxesIds
ldr r2, =gActiveBank
ldrb r3, [r2]
adds r0, r3, r7
@ -514,7 +514,7 @@ _081868DE:
ands r0, r1
cmp r0, 0
bne _08186964
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r0, [r7]
adds r1, r6, 0
eors r1, r0
@ -539,7 +539,7 @@ _081868DE:
ldrb r0, [r0]
bl sub_80729D0
_08186964:
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r1, [r4]
adds r0, r1, r5
@ -943,7 +943,7 @@ sub_8186D04: @ 8186D04
push {r4-r6,lr}
ldr r6, =gActiveBank
ldrb r0, [r6]
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
adds r1, r0, r5
ldrb r1, [r1]
movs r2, 0
@ -995,7 +995,7 @@ sub_8186D58: @ 8186D58
lsls r0, 31
cmp r0, 0
bne _08186D86
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r3, r0
ldrb r0, [r0]
bl sub_8072984
@ -1042,7 +1042,7 @@ sub_8186D9C: @ 8186D9C
bl DestroySprite
ldrb r0, [r6]
bl sub_805EEE0
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@ -1133,7 +1133,7 @@ _08186E9E:
sub_8186EA4: @ 8186EA4
push {r4,lr}
ldr r2, =gSprites
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r3, [r4]
adds r0, r3, r0
@ -1289,7 +1289,7 @@ sub_8186F94: @ 8186F94
adds r0, r7
movs r1, 0
bl StartSpriteAnim
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r1, [r5]
adds r0, r1, r4
ldrb r0, [r0]
@ -3924,7 +3924,7 @@ _081887B0:
bl DestroySprite
ldrb r0, [r6]
bl sub_805EEE0
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@ -4905,7 +4905,7 @@ sub_8188FD0: @ 8188FD0
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@ -4927,7 +4927,7 @@ _08189060:
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@ -4968,7 +4968,7 @@ sub_81890CC: @ 81890CC
lsls r0, 24
cmp r0, 0
bne _08189120
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]

30
asm/battle_controller_recorded_player.s
View File

@ -196,7 +196,7 @@ _08189ABA:
beq _08189B0C
_08189ADA:
ldr r2, =gSprites
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r4]
adds r0, r1
ldrb r1, [r0]
@ -213,7 +213,7 @@ _08189ADA:
.pool
_08189B0C:
ldr r2, =gSprites
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldr r0, =gActiveBank
ldrb r3, [r0]
adds r0, r3, r5
@ -382,7 +382,7 @@ _08189C60:
beq _08189CB0
_08189C80:
ldr r2, =gSprites
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r4]
adds r0, r1
ldrb r1, [r0]
@ -399,7 +399,7 @@ _08189C80:
.pool
_08189CB0:
ldr r2, =gSprites
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldr r0, =gActiveBank
ldrb r3, [r0]
adds r0, r3, r5
@ -571,7 +571,7 @@ _08189DBE:
ands r0, r1
cmp r0, 0
bne _08189E54
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
mov r1, r9
ldrb r0, [r1]
adds r1, r7, 0
@ -599,7 +599,7 @@ _08189DBE:
ldrb r0, [r0]
bl sub_80729D0
_08189E54:
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r1, [r4]
adds r0, r1, r5
@ -862,7 +862,7 @@ sub_818A0A4: @ 818A0A4
push {r4-r6,lr}
ldr r5, =gActiveBank
ldrb r0, [r5]
ldr r6, =gUnknown_03005D70
ldr r6, =gHealthBoxesIds
adds r1, r0, r6
ldrb r1, [r1]
movs r2, 0
@ -959,7 +959,7 @@ sub_818A114: @ 818A114
lsls r0, 2
adds r0, r6
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r4]
adds r0, r1
ldrb r0, [r0]
@ -1006,7 +1006,7 @@ sub_818A1B0: @ 818A1B0
lsls r0, 2
adds r0, r4
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@ -1097,7 +1097,7 @@ _0818A2AE:
sub_818A2B4: @ 818A2B4
push {r4,lr}
ldr r2, =gSprites
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r3, [r4]
adds r0, r3, r0
@ -1244,7 +1244,7 @@ sub_818A37C: @ 818A37C
adds r0, r1
movs r1, 0
bl StartSpriteAnim
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r1, [r7]
adds r0, r1, r4
ldrb r0, [r0]
@ -3886,7 +3886,7 @@ _0818BC30:
lsls r0, 2
adds r0, r4
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@ -5049,7 +5049,7 @@ sub_818C5E8: @ 818C5E8
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@ -5071,7 +5071,7 @@ _0818C678:
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
adds r1, r0, r4
ldrb r1, [r1]
str r7, [sp]
@ -5119,7 +5119,7 @@ sub_818C6F4: @ 818C6F4
lsls r0, 24
cmp r0, 0
bne _0818C748
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r0
ldrb r0, [r0]

6
asm/battle_controller_safari.s
View File

@ -280,7 +280,7 @@ _081595A6:
sub_81595AC: @ 81595AC
push {lr}
ldr r2, =gSprites
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldr r0, =gActiveBank
ldrb r0, [r0]
adds r0, r1
@ -967,7 +967,7 @@ sub_8159B78: @ 8159B78
thumb_func_start sub_8159B84
sub_8159B84: @ 8159B84
push {lr}
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldr r1, =gActiveBank
ldrb r1, [r1]
adds r0, r1, r0
@ -1242,7 +1242,7 @@ dp01t_2E_6_battle_intro: @ 8159D5C
thumb_func_start sub_8159D90
sub_8159D90: @ 8159D90
push {r4,r5,lr}
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldr r4, =gActiveBank
ldrb r1, [r4]
adds r0, r1, r5

16
asm/battle_controller_wally.s
View File

@ -444,7 +444,7 @@ _081686D2:
lsls r0, 2
add r0, r8
bl DestroySprite
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
ldrb r0, [r5]
adds r1, r6, 0
eors r1, r0
@ -480,7 +480,7 @@ _0816877A:
ldr r1, =gSprites
adds r0, r1
bl DestroySprite
ldr r5, =gUnknown_03005D70
ldr r5, =gHealthBoxesIds
ldrb r1, [r4]
adds r0, r1, r5
ldrb r0, [r0]
@ -530,7 +530,7 @@ sub_8168818: @ 8168818
push {r7}
movs r4, 0
ldr r2, =gSprites
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
ldr r1, =gActiveBank
mov r8, r1
ldrb r3, [r1]
@ -653,7 +653,7 @@ sub_8168934: @ 8168934
push {r4-r6,lr}
ldr r5, =gActiveBank
ldrb r0, [r5]
ldr r6, =gUnknown_03005D70
ldr r6, =gHealthBoxesIds
adds r1, r0, r6
ldrb r1, [r1]
movs r2, 0
@ -792,7 +792,7 @@ sub_8168A20: @ 8168A20
lsls r0, 2
adds r0, r4
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@ -3011,7 +3011,7 @@ _08169E80:
lsls r0, 2
adds r0, r4
bl DestroySprite
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
@ -3878,7 +3878,7 @@ sub_816A5D4: @ 816A5D4
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r1, =gUnknown_03005D70
ldr r1, =gHealthBoxesIds
adds r1, r0, r1
ldrb r1, [r1]
str r7, [sp]
@ -3900,7 +3900,7 @@ _0816A664:
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
ldr r4, =gUnknown_03005D70
ldr r4, =gHealthBoxesIds
adds r1, r0, r4
ldrb r1, [r1]
str r7, [sp]

6
asm/reshow_battle_screen.s
View File

@ -905,7 +905,7 @@ _080A9B1E:
_080A9B24:
lsls r0, 24
lsrs r6, r0, 24
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r4, r5, r0
strb r6, [r4]
adds r0, r5, 0
@ -976,7 +976,7 @@ _080A9BB8:
cmp r0, 0x2
bne _080A9BF0
_080A9BD4:
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r5, r0
ldrb r0, [r0]
movs r1, 0x1
@ -984,7 +984,7 @@ _080A9BD4:
b _080A9BFC
.pool
_080A9BF0:
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r5, r0
ldrb r0, [r0]
movs r1, 0

12
asm/rom_8072304.s
View File

@ -962,7 +962,7 @@ sub_8072A88: @ 8072A88
lsls r5, r0, 2
movs r7, 0xD
negs r7, r7
ldr r2, =gUnknown_03005D70
ldr r2, =gHealthBoxesIds
mov r9, r2
_08072AB2:
mov r1, r9
@ -1071,7 +1071,7 @@ _08072B78:
movs r5, 0x20
movs r4, 0x2C
_08072B7C:
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r6, r0
ldrb r0, [r0]
adds r1, r5, 0
@ -1966,7 +1966,7 @@ _0807332E:
ldr r2, =gBattlePartyID
mov r8, r2
_08073336:
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
mov r1, r9
adds r6, r1, r0
ldrb r1, [r6]
@ -2224,7 +2224,7 @@ _0807355C:
movs r2, 0x4
bl healthbar_draw_field_maybe
_08073592:
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
add r0, r9
ldrb r1, [r0]
lsls r0, r1, 4
@ -8512,7 +8512,7 @@ sub_8076918: @ 8076918
lsls r0, 24
lsrs r0, 24
adds r5, r0, 0
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r0, r5, r0
ldrb r1, [r0]
lsls r0, r1, 4
@ -8635,7 +8635,7 @@ sub_80769F4: @ 80769F4
adds r3, r1, r2
movs r0, 0x1
strh r0, [r3, 0x2E]
ldr r0, =gUnknown_03005D70
ldr r0, =gHealthBoxesIds
adds r4, r0
ldrb r0, [r4]
strh r0, [r3, 0x30]

2
sym_common.txt
View File

@ -224,7 +224,7 @@ gUnknown_03005D54: @ 3005D54
gBattleBankFunc: @ 3005D60
.space 0x10
gUnknown_03005D70: @ 3005D70
gHealthBoxesIds: @ 3005D70
.space 0x4
gUnknown_03005D74: @ 3005D74