Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 8 additions & 8 deletions asm/src/code_08003FC4.s
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions asm/src/code_080043E8.s
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions asm/src/enemy.s
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
54 changes: 27 additions & 27 deletions assets/assets.json
Original file line number Diff line number Diff line change
Expand Up @@ -13037,137 +13037,137 @@
"size": 8
},
{
"path": "holeManager/gUnk_08108764.bin",
"path": "holeManager/gHoleTransitions.bin",
"start": 1083236,
"size": 32
},
{
"path": "holeManager/gUnk_08108764_1.bin",
"path": "holeManager/gHoleTransitions_1.bin",
"start": 1083272,
"size": 16
},
{
"path": "holeManager/gUnk_08108764_2.bin",
"path": "holeManager/gHoleTransitions_2.bin",
"start": 1083292,
"size": 20
},
{
"path": "holeManager/gUnk_08108764_3.bin",
"path": "holeManager/gHoleTransitions_3.bin",
"start": 1083316,
"size": 12
},
{
"path": "holeManager/gUnk_08108764_4.bin",
"path": "holeManager/gHoleTransitions_4.bin",
"start": 1083332,
"size": 16
},
{
"path": "holeManager/gUnk_08108764_5.bin",
"path": "holeManager/gHoleTransitions_5.bin",
"start": 1083352,
"size": 16
},
{
"path": "holeManager/gUnk_08108764_6.bin",
"path": "holeManager/gHoleTransitions_6.bin",
"start": 1083372,
"size": 40
},
{
"path": "holeManager/gUnk_08108764_7.bin",
"path": "holeManager/gHoleTransitions_7.bin",
"start": 1083416,
"size": 16
},
{
"path": "holeManager/gUnk_08108764_8.bin",
"path": "holeManager/gHoleTransitions_8.bin",
"start": 1083436,
"size": 16
},
{
"path": "holeManager/gUnk_08108764_9.bin",
"path": "holeManager/gHoleTransitions_9.bin",
"start": 1083456,
"size": 16
},
{
"path": "holeManager/gUnk_08108764_10.bin",
"path": "holeManager/gHoleTransitions_10.bin",
"start": 1083476,
"size": 32
},
{
"path": "holeManager/gUnk_08108764_11.bin",
"path": "holeManager/gHoleTransitions_11.bin",
"start": 1083512,
"size": 440
},
{
"path": "holeManager/gUnk_08108764_12.bin",
"path": "holeManager/gHoleTransitions_12.bin",
"start": 1083956,
"size": 16
},
{
"path": "holeManager/gUnk_08108764_13.bin",
"path": "holeManager/gHoleTransitions_13.bin",
"start": 1083976,
"size": 36
},
{
"path": "holeManager/gUnk_08108764_14.bin",
"path": "holeManager/gHoleTransitions_14.bin",
"start": 1084016,
"size": 16
},
{
"path": "holeManager/gUnk_08108764_15.bin",
"path": "holeManager/gHoleTransitions_15.bin",
"start": 1084036,
"size": 16
},
{
"path": "holeManager/gUnk_08108764_16.bin",
"path": "holeManager/gHoleTransitions_16.bin",
"start": 1084056,
"size": 36
},
{
"path": "holeManager/gUnk_08108764_17.bin",
"path": "holeManager/gHoleTransitions_17.bin",
"start": 1084096,
"size": 16
},
{
"path": "holeManager/gUnk_08108764_18.bin",
"path": "holeManager/gHoleTransitions_18.bin",
"start": 1084116,
"size": 36
},
{
"path": "holeManager/gUnk_08108764_19.bin",
"path": "holeManager/gHoleTransitions_19.bin",
"start": 1084156,
"size": 36
},
{
"path": "holeManager/gUnk_08108764_20.bin",
"path": "holeManager/gHoleTransitions_20.bin",
"start": 1084196,
"size": 16
},
{
"path": "holeManager/gUnk_08108764_21.bin",
"path": "holeManager/gHoleTransitions_21.bin",
"start": 1084216,
"size": 16
},
{
"path": "holeManager/gUnk_08108764_22.bin",
"path": "holeManager/gHoleTransitions_22.bin",
"start": 1084236,
"size": 16
},
{
"path": "holeManager/gUnk_08108764_23.bin",
"path": "holeManager/gHoleTransitions_23.bin",
"start": 1084256,
"size": 32
},
{
"path": "holeManager/gUnk_08108764_24.bin",
"path": "holeManager/gHoleTransitions_24.bin",
"start": 1084292,
"size": 16
},
{
"path": "holeManager/gUnk_08108764_25.bin",
"path": "holeManager/gHoleTransitions_25.bin",
"start": 1084312,
"size": 16
},
{
"path": "holeManager/gUnk_08108764_26.bin",
"path": "holeManager/gHoleTransitions_26.bin",
"start": 1084332,
"size": 124
},
Expand Down
Loading