Skip to content

Commit 8f12be5

Browse files
authored
Merge pull request #63 from MokhaLeee/main
code review, opinfo in process
2 parents c02f1f1 + de70e9d commit 8f12be5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+4206
-4171
lines changed

asm/classdemo.s

Lines changed: 0 additions & 2706 deletions
This file was deleted.

asm/opanim.s

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3272,20 +3272,20 @@ func_fe6_0809A0A8: @ 0x0809A0A8
32723272
.L0809A0D8: .4byte gUnk_08379D0C
32733273
.L0809A0DC: .4byte gPal
32743274

3275-
thumb_func_start func_fe6_0809A0E0
3276-
func_fe6_0809A0E0: @ 0x0809A0E0
3275+
thumb_func_start OpAnimSparksOBJ_Init
3276+
OpAnimSparksOBJ_Init: @ 0x0809A0E0
32773277
push {r4, lr}
32783278
adds r4, r0, #0
3279-
bl func_fe6_0809A114
3279+
bl PutOpAnimSparksObjGfx
32803280
adds r4, #0x64
32813281
movs r0, #0
32823282
strh r0, [r4]
32833283
pop {r4}
32843284
pop {r0}
32853285
bx r0
32863286

3287-
thumb_func_start func_fe6_0809A0F4
3288-
func_fe6_0809A0F4: @ 0x0809A0F4
3287+
thumb_func_start OpAnimSparksOBJ_Loop
3288+
OpAnimSparksOBJ_Loop: @ 0x0809A0F4
32893289
push {lr}
32903290
adds r2, r0, #0
32913291
adds r0, #0x64
@@ -3303,29 +3303,29 @@ func_fe6_0809A0F4: @ 0x0809A0F4
33033303
bx r0
33043304
.align 2, 0
33053305

3306-
thumb_func_start func_fe6_0809A114
3307-
func_fe6_0809A114: @ 0x0809A114
3306+
thumb_func_start PutOpAnimSparksObjGfx
3307+
PutOpAnimSparksObjGfx: @ 0x0809A114
33083308
push {lr}
3309-
ldr r0, .L0809A130 @ =gUnk_0837AB18
3309+
ldr r0, .L0809A130 @ =Img_OpAnimSparksOBJ
33103310
ldr r1, .L0809A134 @ =0x06010000
33113311
bl Decompress
3312-
ldr r0, .L0809A138 @ =gUnk_0837ACB0
3312+
ldr r0, .L0809A138 @ =Pal_OpAnimSparksOBJ
33133313
movs r1, #0x88
33143314
lsls r1, r1, #2
33153315
movs r2, #0x20
33163316
bl ApplyPaletteExt
33173317
pop {r0}
33183318
bx r0
33193319
.align 2, 0
3320-
.L0809A130: .4byte gUnk_0837AB18
3320+
.L0809A130: .4byte Img_OpAnimSparksOBJ
33213321
.L0809A134: .4byte 0x06010000
3322-
.L0809A138: .4byte gUnk_0837ACB0
3322+
.L0809A138: .4byte Pal_OpAnimSparksOBJ
33233323

33243324
thumb_func_start func_fe6_0809A13C
33253325
func_fe6_0809A13C: @ 0x0809A13C
33263326
push {r4, lr}
33273327
adds r1, r0, #0
3328-
ldr r0, .L0809A1AC @ =ProcScr_OpAnim_08691CA8
3328+
ldr r0, .L0809A1AC @ =ProcScr_OpAnimSparksOBJFALL
33293329
bl SpawnProc
33303330
adds r4, r0, #0
33313331
bl RandNextB
@@ -3368,19 +3368,19 @@ func_fe6_0809A13C: @ 0x0809A13C
33683368
pop {r0}
33693369
bx r0
33703370
.align 2, 0
3371-
.L0809A1AC: .4byte ProcScr_OpAnim_08691CA8
3371+
.L0809A1AC: .4byte ProcScr_OpAnimSparksOBJFALL
33723372
.L0809A1B0: .4byte gUnk_08380F5A
33733373
.L0809A1B4: .4byte 0x00000101
33743374

3375-
thumb_func_start func_fe6_0809A1B8
3376-
func_fe6_0809A1B8: @ 0x0809A1B8
3375+
thumb_func_start OpAnimSparksOBJFALL_Init
3376+
OpAnimSparksOBJFALL_Init: @ 0x0809A1B8
33773377
movs r1, #0
33783378
strh r1, [r0, #0x32]
33793379
bx lr
33803380
.align 2, 0
33813381

3382-
thumb_func_start func_fe6_0809A1C0
3383-
func_fe6_0809A1C0: @ 0x0809A1C0
3382+
thumb_func_start OpAnimSparksOBJFALL_Loop
3383+
OpAnimSparksOBJFALL_Loop: @ 0x0809A1C0
33843384
push {r4, r5, lr}
33853385
sub sp, #4
33863386
mov ip, r0

0 commit comments

Comments
 (0)