Skip to content

Commit c0065f1

Browse files
authored
Merge pull request #44 from MokhaLeee/main
ekrgauge in process
2 parents a00715b + de13623 commit c0065f1

14 files changed

+210
-395
lines changed

asm/banim_efxquake.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ EfxHitQuake_Loop: @ 0x0804646C
323323
rsbs r1, r2, #0
324324
lsls r1, r1, #0x10
325325
asrs r1, r1, #0x10
326-
bl func_fe6_0804392C
326+
bl EkrGauge_Setxy323A
327327
ldrh r3, [r4]
328328
rsbs r0, r3, #0
329329
lsls r0, r0, #0x10
@@ -451,7 +451,7 @@ EfxHitQuake_Loop: @ 0x0804646C
451451
rsbs r1, r1, #0
452452
lsls r1, r1, #0x10
453453
asrs r1, r1, #0x10
454-
bl func_fe6_0804392C
454+
bl EkrGauge_Setxy323A
455455
ldrh r3, [r5]
456456
ldrh r1, [r4]
457457
adds r0, r3, r1

asm/banim_ekrbattleintrofx.s

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,11 +1114,11 @@ NewEkrWindowAppear: @ 0x08048DA4
11141114
adds r1, r1, r2
11151115
lsls r1, r1, #0x10
11161116
asrs r1, r1, #0x10
1117-
bl func_fe6_08043918
1117+
bl EkrGauge_Clr323A
11181118
ldr r1, .L08048DF0 @ =gUnk_Banim_0201E0EC
11191119
movs r0, #1
11201120
str r0, [r1]
1121-
bl func_fe6_08043950
1121+
bl EkrGauge_ClrInitFlag
11221122
pop {r4, r5}
11231123
pop {r0}
11241124
bx r0
@@ -1157,7 +1157,7 @@ func_fe6_08048E08: @ 0x08048E08
11571157
ldr r1, .L08048E30 @ =gUnk_Banim_0201E0EC
11581158
movs r0, #0
11591159
str r0, [r1]
1160-
bl func_fe6_08043940
1160+
bl EkrGauge_SetInitFlag
11611161
adds r0, r4, #0
11621162
bl Proc_Break
11631163
b .L08048E7C
@@ -1199,7 +1199,7 @@ func_fe6_08048E08: @ 0x08048E08
11991199
adds r1, r1, r2
12001200
lsls r1, r1, #0x10
12011201
asrs r1, r1, #0x10
1202-
bl func_fe6_08043918
1202+
bl EkrGauge_Clr323A
12031203
.L08048E7C:
12041204
add sp, #4
12051205
pop {r4}

0 commit comments

Comments
 (0)