mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-02 10:11:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #701 from Henny022p/cleanup/250302

Browse Source 
Various code cleanup changes
This commit is contained in:
Henny022p
2026-02-08 18:32:38 +01:00
committed by GitHub
parent 73901a0a01 5b2cafdc89
commit 5ab63f00e5
599 changed files with 5472 additions and 4041 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/src/code_08003FC4.s
+8 -8
View File
@@ -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:
asm/src/code_080043E8.s
+4 -4
View File
@@ -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
asm/src/enemy.s
+5 -5
View File
@@ -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