diff options
| author | Henny022p <73211432+Henny022p@users.noreply.github.com> | 2026-02-08 18:32:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-08 18:32:38 +0100 |
| commit | 5ab63f00e522ff69c5bc987e379f0163943f2833 (patch) | |
| tree | 53622222ac729c6ab6dc75ef7f9bafa8031daf18 /asm | |
| parent | 73901a0a012d55ebb66a4627dcb246d19737fcb5 (diff) | |
| parent | 5b2cafdc894823d57beee8f3947a391d881d91de (diff) | |
Various code cleanup changes
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/src/code_08003FC4.s | 16 | ||||
| -rw-r--r-- | asm/src/code_080043E8.s | 8 | ||||
| -rw-r--r-- | asm/src/enemy.s | 10 |
3 files changed, 17 insertions, 17 deletions
diff --git a/asm/src/code_08003FC4.s b/asm/src/code_08003FC4.s index d244179e..34d4b52f 100644 --- a/asm/src/code_08003FC4.s +++ b/asm/src/code_08003FC4.s @@ -621,23 +621,23 @@ _0800439C: .4byte gSpritePtrs _080043A0: .4byte gSpritePtrs _080043A4: .4byte gGFXSlots+4 - thumb_func_start CreateDrownFX -CreateDrownFX: @ 0x080043A8 + thumb_func_start CreateDrownFx +CreateDrownFx: @ 0x080043A8 movs r1, #0xb // FX_WATER_SPLASH b create_fx - thumb_func_start CreateLavaDrownFX -CreateLavaDrownFX: @ 0x080043AC + thumb_func_start CreateLavaDrownFx +CreateLavaDrownFx: @ 0x080043AC movs r1, #0xc // FX_LAVA_SPLASH b create_fx - thumb_func_start CreateSwampDrownFX -CreateSwampDrownFX: @ 0x080043AC + thumb_func_start CreateSwampDrownFx +CreateSwampDrownFx: @ 0x080043AC movs r1, #0x52 // FX_GREEN_SPLASH b create_fx - thumb_func_start CreatePitFallFX -CreatePitFallFX: @ 0x080043B4 + thumb_func_start CreatePitFallFx +CreatePitFallFx: @ 0x080043B4 movs r1, #0 // FX_FALL_DOWN create_fx: diff --git a/asm/src/code_080043E8.s b/asm/src/code_080043E8.s index 8442e031..6193ca01 100644 --- a/asm/src/code_080043E8.s +++ b/asm/src/code_080043E8.s @@ -62,10 +62,10 @@ sub_0800442E: @ 0x0800442E not_hazard: movs r0, #0 pop {r1, pc} -_0800444C: .4byte CreatePitFallFX -_08004450: .4byte CreateDrownFX -_08004454: .4byte CreateLavaDrownFX -_08004458: .4byte CreateSwampDrownFX +_0800444C: .4byte CreatePitFallFx +_08004450: .4byte CreateDrownFx +_08004454: .4byte CreateLavaDrownFx +_08004458: .4byte CreateSwampDrownFx thumb_func_start sub_0800445C sub_0800445C: @ 0x0800445C diff --git a/asm/src/enemy.s b/asm/src/enemy.s index d2dcd5ff..d8149fdf 100644 --- a/asm/src/enemy.s +++ b/asm/src/enemy.s @@ -71,7 +71,7 @@ _08001230: ldr r3, _0800135C @ =UpdateAnimationVariableFrames bx r3 _0800123E: - ldr r3, _08001360 @ =CreatePitFallFX + ldr r3, _08001360 @ =CreatePitFallFx bx r3 non_word_aligned_thumb_func_start GenericConfused @@ -155,9 +155,9 @@ _080012BA: gUnk_080012C8:: .4byte 0x00000000 _080012CC: .4byte sub_08001214 -_080012D0: .4byte CreateDrownFX -_080012D4: .4byte CreateLavaDrownFX -_080012D8: .4byte CreateSwampDrownFX +_080012D0: .4byte CreateDrownFx +_080012D4: .4byte CreateLavaDrownFx +_080012D8: .4byte CreateSwampDrownFx thumb_func_start sub_080012DC sub_080012DC: @ 0x080012DC @@ -241,7 +241,7 @@ _08001352: .align 2, 0 _08001358: .4byte gEnemyFunctions _0800135C: .4byte UpdateAnimationVariableFrames -_08001360: .4byte CreatePitFallFX +_08001360: .4byte CreatePitFallFx _08001364: .4byte 0x00001800 _08001368: .4byte gUnk_080012C8 _0800136C: .4byte gUnk_080012C8 |