mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-09 04:40:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
theo3
2021-12-14 23:31:27 -08:00
parent 83fc028502
commit 34e69959df
198 changed files with 1578 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/beanstalk.s
+1 -1
View File
@@ -810,7 +810,7 @@ _0808A0FC:
adds r0, r5, #0
movs r2, #0
movs r3, #8
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
beq _0808A1DC
b _0808A1B0
asm/bird.s
+1 -1
View File
@@ -158,7 +158,7 @@ _0809D2D6:
adds r1, r6, #0
movs r2, #0xe
movs r3, #0xe
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
beq _0809D3A8
movs r1, #0x36
asm/businessScrubPrologue.s
+2 -2
View File
@@ -517,7 +517,7 @@ sub_08045F54: @ 0x08045F54
adds r1, r4, #0
movs r2, #0x20
movs r3, #0x20
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
bne _08045F90
cmp r5, #2
@@ -530,7 +530,7 @@ _08045F82:
adds r0, r6, #0
adds r1, r4, #0
adds r2, r3, #0
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
bne _08045F94
_08045F90:
asm/chestSpawner.s
+1 -1
View File
@@ -163,7 +163,7 @@ _08083F78:
adds r1, r5, #0
movs r2, #0x10
movs r3, #8
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
beq _08083F98
movs r0, #0x10
asm/code_08003FC4.s
+2 -2
View File
@@ -293,8 +293,8 @@ sub_0800419C: @ 0x0800419C
push {r5, r6, lr}
b _080041B0
thumb_func_start sub_080041A0
sub_080041A0: @ 0x080041A0
thumb_func_start EntityInRectRadius
EntityInRectRadius: @ 0x080041A0
push {r5, r6, lr}
movs r6, #0x38
ldrb r5, [r0, r6]
asm/code_0806ED78.s
+3 -3
View File
@@ -36,7 +36,7 @@ sub_0806ED9C: @ 0x0806ED9C
rsbs r6, r6, #0
ldr r1, _0806EDC0 @ =gPlayerEntity
adds r2, r4, #0
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
beq _0806EDBC
adds r0, r5, #0
@@ -69,7 +69,7 @@ sub_0806EDD8: @ 0x0806EDD8
ldr r6, _0806EE00 @ =gPlayerEntity
adds r1, r6, #0
adds r2, r4, #0
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
beq _0806EDFC
adds r0, r5, #0
@@ -1106,7 +1106,7 @@ sub_0806F548: @ 0x0806F548
push {r4, r5, lr}
adds r4, r0, #0
adds r5, r1, #0
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
bne _0806F55A
movs r0, #0
asm/code_080732D0.s
+2 -2
View File
@@ -1799,7 +1799,7 @@ sub_08074060: @ 0x08074060
bl sub_08003FC4
cmp r0, #0
bne _080740D0
ldr r0, _080740C4 @ =gUnk_08114F88
ldr r0, _080740C4 @ =gPlayerHitbox
str r0, [r4, #0x48]
movs r3, #0x10
movs r0, #0x10
@@ -1840,7 +1840,7 @@ sub_08074060: @ 0x08074060
bl sub_0805EC60
b _080740D6
.align 2, 0
_080740C4: .4byte gUnk_08114F88
_080740C4: .4byte gPlayerHitbox
_080740C8: .4byte gPlayerState
_080740CC: .4byte 0x0000080C
_080740D0:
asm/crow.s
+1 -1
View File
@@ -241,7 +241,7 @@ sub_0803298C: @ 0x0803298C
adds r0, r4, #0
movs r2, #0x88
movs r3, #0x50
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
beq _080329E2
ldr r0, [r5]
asm/enemy4D.s
+1 -1
View File
@@ -558,7 +558,7 @@ sub_0803EFAC: @ 0x0803EFAC
adds r4, r1, #0
movs r2, #0x50
movs r3, #0x50
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
beq _0803EFD6
adds r0, r4, #0
asm/enemy50.s
+1 -1
View File
@@ -907,7 +907,7 @@ _08041184:
adds r0, r4, #0
movs r2, #0x70
movs r3, #0x48
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
beq _080411C8
_080411B6:
asm/object6.s → asm/ezloCap.s
+2 -2
View File
@@ -7,8 +7,8 @@
.text
thumb_func_start Object6
Object6: @ 0x080828E0
thumb_func_start EzloCap
EzloCap: @ 0x080828E0
push {lr}
adds r2, r0, #0
ldrb r1, [r2, #0x10]
asm/floatingPlatform.s
+1 -1
View File
@@ -107,7 +107,7 @@ sub_08086168: @ 0x08086168
ldrb r2, [r1]
ldrb r3, [r1, #1]
adds r1, r4, #0
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
beq _080861A8
bl sub_08079F8C
asm/ghini.s
+1 -1
View File
@@ -824,7 +824,7 @@ _0803F5E8:
adds r0, r4, #0
movs r2, #0x70
movs r3, #0x48
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
beq _0803F62C
_0803F61A:
asm/gleerok.s
+1 -1
View File
@@ -1266,7 +1266,7 @@ _0802D924:
adds r0, r4, #0
movs r2, #8
movs r3, #8
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
bne _0802D936
b _0802DB7E
asm/lavaPlatform.s
+1 -1
View File
@@ -603,7 +603,7 @@ sub_0809269C: @ 0x0809269C
adds r1, r5, #0
movs r2, #0x10
movs r3, #0x10
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
beq _080926E0
bl sub_08079F8C
asm/macroBook.s
+1 -1
View File
@@ -399,7 +399,7 @@ _0809AA5C:
adds r1, r4, #0
movs r2, #0x20
movs r3, #0x22
bl sub_080041A0
bl EntityInRectRadius
strh r0, [r7]
lsls r0, r0, #0x10
cmp r0, #0
asm/macros/scripts.inc
+2 -2
View File
@@ -308,7 +308,7 @@
.4byte \w
.endm
.macro WaitPlayerAction8
.macro WaitPlayerGetItem
.2byte 0x0434
.endm
@@ -563,7 +563,7 @@
.2byte \yOffset
.endm
.macro SetEntityPosition x:req, y:req
.macro OffsetEntityPosition x:req, y:req
.2byte 0x0c6a
.2byte \x
.2byte \y
asm/mulldozer.s
+1 -1
View File
@@ -978,7 +978,7 @@ sub_08033364: @ 0x08033364
_0803337E:
adds r0, r4, #0
adds r2, r3, #0
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
beq _080333B4
ldrb r0, [r4, #0xa]
asm/non_matching/eu/sub_0802AAC0.inc
+1 -1
View File
@@ -60,7 +60,7 @@ _0802AAD4:
adds r0, r4, #0
movs r2, #0x10
movs r3, #0x10
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
beq _0802AB56
ldrb r0, [r5, #0xf]
asm/non_matching/player/sub_08072D54.inc
+8 -8
View File
@@ -38,7 +38,7 @@ _08072D9C:
beq _08072E30
b _08072E6C
_08072DA6:
ldr r1, _08072DC8 @ =gUnk_0811BBD4
ldr r1, _08072DC8 @ =sTileTable
ldr r0, _08072DCC @ =gPlayerEntity
ldrb r0, [r0, #0x14]
lsrs r0, r0, #1
@@ -54,10 +54,10 @@ _08072DA6:
strb r0, [r4, #0xf]
b _08072E6C
.align 2, 0
_08072DC8: .4byte gUnk_0811BBD4
_08072DC8: .4byte sTileTable
_08072DCC: .4byte gPlayerEntity
_08072DD0:
ldr r1, _08072DEC @ =gUnk_0811BBD4
ldr r1, _08072DEC @ =sTileTable
ldr r0, _08072DF0 @ =gPlayerEntity
ldrb r0, [r0, #0x14]
lsrs r0, r0, #1
@@ -71,7 +71,7 @@ _08072DD0:
strb r5, [r4, #0xe]
b _08072E6C
.align 2, 0
_08072DEC: .4byte gUnk_0811BBD4
_08072DEC: .4byte sTileTable
_08072DF0: .4byte gPlayerEntity
_08072DF4:
movs r0, #2
@@ -82,7 +82,7 @@ _08072DFA:
movs r5, #4
eors r0, r5
strb r0, [r4, #0x14]
ldr r1, _08072E28 @ =gUnk_0811BBD4
ldr r1, _08072E28 @ =sTileTable
ldr r0, _08072E2C @ =gPlayerEntity
ldrb r0, [r0, #0x14]
lsrs r0, r0, #1
@@ -102,14 +102,14 @@ _08072E22:
eors r0, r5
b _08072E6A
.align 2, 0
_08072E28: .4byte gUnk_0811BBD4
_08072E28: .4byte sTileTable
_08072E2C: .4byte gPlayerEntity
_08072E30:
ldrb r0, [r4, #0x14]
movs r1, #4
eors r0, r1
strb r0, [r4, #0x14]
ldr r1, _08072E58 @ =gUnk_0811BBD4
ldr r1, _08072E58 @ =sTileTable
ldr r0, _08072E5C @ =gPlayerEntity
ldrb r0, [r0, #0x14]
lsrs r0, r0, #1
@@ -124,7 +124,7 @@ _08072E30:
strb r0, [r4, #0xe]
b _08072E64
.align 2, 0
_08072E58: .4byte gUnk_0811BBD4
_08072E58: .4byte sTileTable
_08072E5C: .4byte gPlayerEntity
_08072E60:
movs r0, #4
asm/non_matching/sub_080560B8.inc
+2 -2
View File
@@ -7,7 +7,7 @@
.text
push {r4, lr}
bl sub_08056134
bl CheckHeaderValid
cmp r0, #0
bne _080560F8
movs r0, #0x80
@@ -22,7 +22,7 @@
ble _080560E4
cmp r1, #1
bne _080560E4
bl sub_08056134
bl CheckHeaderValid
cmp r0, #0
bne _080560F8
_080560E4:
asm/object29.s
+3 -3
View File
@@ -304,7 +304,7 @@ _0808999E:
adds r1, r5, #0
movs r2, #0xf
movs r3, #0xf
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
beq _08089A62
ldrb r0, [r4, #0xe]
@@ -418,7 +418,7 @@ sub_08089A7C: @ 0x08089A7C
adds r1, r5, #0
movs r2, #0xf
movs r3, #0xf
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
beq _08089AB8
ldr r2, _08089AB4 @ =gPlayerState
@@ -461,7 +461,7 @@ sub_08089AE0: @ 0x08089AE0
ldr r1, _08089AF8 @ =gPlayerEntity
movs r2, #0xf
movs r3, #0xf
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
beq _08089AF6
ldr r1, _08089AFC @ =gPlayerState
asm/object87.s
+1 -1
View File
@@ -454,7 +454,7 @@ _0809A25C:
adds r0, r7, #0
movs r2, #2
movs r3, #2
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
bne _0809A2A6
b _0809A632
asm/objectAB.s
+1 -1
View File
@@ -89,7 +89,7 @@ sub_080A0158: @ 0x080A0158
adds r0, r4, #0
movs r2, #0x10
movs r3, #0x10
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
beq _080A018A
movs r0, #0x37
asm/takkuri.s
+1 -1
View File
@@ -251,7 +251,7 @@ _0803BD2C:
adds r0, r4, #0
movs r2, #0x88
movs r3, #0x50
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
beq _0803BD80
ldr r0, [r5]
asm/wizzrobeFire.s
+1 -1
View File
@@ -238,7 +238,7 @@ _0802FCDE:
adds r0, r4, #0
movs r2, #0xa0
movs r3, #0xa0
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
beq _0802FDCA
adds r0, r4, #0
asm/wizzrobeIce.s
+1 -1
View File
@@ -265,7 +265,7 @@ _0802FFB6:
adds r0, r4, #0
movs r2, #0xa0
movs r3, #0xa0
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
beq _080300A2
adds r0, r4, #0
asm/wizzrobeWind.s
+1 -1
View File
@@ -290,7 +290,7 @@ _0802F6B6:
adds r0, r4, #0
movs r2, #0xa0
movs r3, #0xa0
bl sub_080041A0
bl EntityInRectRadius
cmp r0, #0
beq _0802F7A2
adds r0, r4, #0
assets/assets.json
+41 -51
View File
@@ -41601,7 +41601,7 @@
"size": 8
},
{
"path": "data_081146D0/gUnk_08114F88.bin",
"path": "data_081146D0/gPlayerHitbox.bin",
"start": 1134472,
"size": 16
},
@@ -41666,7 +41666,7 @@
"type": "sprite_frame"
},
{
"path": "sprites/gSpriteFrames_Object6.bin",
"path": "sprites/gSpriteFrames_EzloCap.bin",
"start": 1142228,
"size": 400,
"type": "sprite_frame"
@@ -42750,16 +42750,6 @@
"DEMO_JP": -2192
}
},
{
"path": "data_0811E454/gUnk_0811E510.bin",
"start": 1172752,
"size": 4
},
{
"path": "data_0811E454/gUnk_0811E514.bin",
"start": 1172756,
"size": 16
},
{
"path": "data_0811E750/gUnk_0811E750.bin",
"start": 1173328,
@@ -43052,233 +43042,233 @@
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_0.bin",
"path": "animations/gSpriteAnimations_EzloCap_0.bin",
"start": 1175952,
"size": 29,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_1.bin",
"path": "animations/gSpriteAnimations_EzloCap_1.bin",
"start": 1175981,
"size": 29,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_2.bin",
"path": "animations/gSpriteAnimations_EzloCap_2.bin",
"start": 1176010,
"size": 29,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_3.bin",
"path": "animations/gSpriteAnimations_EzloCap_3.bin",
"start": 1176039,
"size": 41,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_8.bin",
"path": "animations/gSpriteAnimations_EzloCap_8.bin",
"start": 1176080,
"size": 29,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_9.bin",
"path": "animations/gSpriteAnimations_EzloCap_9.bin",
"start": 1176109,
"size": 29,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_10.bin",
"path": "animations/gSpriteAnimations_EzloCap_10.bin",
"start": 1176138,
"size": 29,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_11.bin",
"path": "animations/gSpriteAnimations_EzloCap_11.bin",
"start": 1176167,
"size": 41,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_4.bin",
"path": "animations/gSpriteAnimations_EzloCap_4.bin",
"start": 1176208,
"size": 29,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_5.bin",
"path": "animations/gSpriteAnimations_EzloCap_5.bin",
"start": 1176237,
"size": 29,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_6.bin",
"path": "animations/gSpriteAnimations_EzloCap_6.bin",
"start": 1176266,
"size": 29,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_7.bin",
"path": "animations/gSpriteAnimations_EzloCap_7.bin",
"start": 1176295,
"size": 41,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_12.bin",
"path": "animations/gSpriteAnimations_EzloCap_12.bin",
"start": 1176336,
"size": 13,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_13.bin",
"path": "animations/gSpriteAnimations_EzloCap_13.bin",
"start": 1176349,
"size": 13,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_14.bin",
"path": "animations/gSpriteAnimations_EzloCap_14.bin",
"start": 1176362,
"size": 13,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_15.bin",
"path": "animations/gSpriteAnimations_EzloCap_15.bin",
"start": 1176375,
"size": 41,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_16.bin",
"path": "animations/gSpriteAnimations_EzloCap_16.bin",
"start": 1176416,
"size": 13,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_17.bin",
"path": "animations/gSpriteAnimations_EzloCap_17.bin",
"start": 1176429,
"size": 13,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_18.bin",
"path": "animations/gSpriteAnimations_EzloCap_18.bin",
"start": 1176442,
"size": 13,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_19.bin",
"path": "animations/gSpriteAnimations_EzloCap_19.bin",
"start": 1176455,
"size": 41,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_20.bin",
"path": "animations/gSpriteAnimations_EzloCap_20.bin",
"start": 1176496,
"size": 13,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_21.bin",
"path": "animations/gSpriteAnimations_EzloCap_21.bin",
"start": 1176509,
"size": 13,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_22.bin",
"path": "animations/gSpriteAnimations_EzloCap_22.bin",
"start": 1176522,
"size": 13,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_23.bin",
"path": "animations/gSpriteAnimations_EzloCap_23.bin",
"start": 1176535,
"size": 41,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_31.bin",
"path": "animations/gSpriteAnimations_EzloCap_31.bin",
"start": 1176576,
"size": 5,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_32.bin",
"path": "animations/gSpriteAnimations_EzloCap_32.bin",
"start": 1176581,
"size": 17,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_33.bin",
"path": "animations/gSpriteAnimations_EzloCap_33.bin",
"start": 1176598,
"size": 41,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_34.bin",
"path": "animations/gSpriteAnimations_EzloCap_34.bin",
"start": 1176639,
"size": 41,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_24.bin",
"path": "animations/gSpriteAnimations_EzloCap_24.bin",
"start": 1176680,
"size": 81,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_25.bin",
"path": "animations/gSpriteAnimations_EzloCap_25.bin",
"start": 1176761,
"size": 25,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_26.bin",
"path": "animations/gSpriteAnimations_EzloCap_26.bin",
"start": 1176786,
"size": 5,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_27.bin",
"path": "animations/gSpriteAnimations_EzloCap_27.bin",
"start": 1176791,
"size": 116,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_28.bin",
"path": "animations/gSpriteAnimations_EzloCap_28.bin",
"start": 1176907,
"size": 21,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_29.bin",
"path": "animations/gSpriteAnimations_EzloCap_29.bin",
"start": 1176928,
"size": 21,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_30.bin",
"path": "animations/gSpriteAnimations_EzloCap_30.bin",
"start": 1176949,
"size": 21,
"type": "animation"
},
{
"path": "animations/gSpriteAnimations_Object6_35.bin",
"path": "animations/gSpriteAnimations_EzloCap_35.bin",
"start": 1176970,
"size": 6,
"type": "animation"
},
{
"path": "object6/gUnk_0811F16C.bin",
"path": "ezloCap/gUnk_0811F16C.bin",
"start": 1175916,
"size": 12
},
{
"path": "object6/gUnk_0811F178.bin",
"path": "ezloCap/gUnk_0811F178.bin",
"start": 1175928,
"size": 20
},
{
"path": "object6/gUnk_0811F18C.bin",
"path": "ezloCap/gUnk_0811F18C.bin",
"start": 1175948,
"size": 4
},
data/animations/object/ezloCap.s
+152
View File
@@ -0,0 +1,152 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gSpriteAnimations_EzloCap_0:: @ 0811F190
.include "animations/gSpriteAnimations_EzloCap_0.s"
gSpriteAnimations_EzloCap_1:: @ 0811F1AD
.include "animations/gSpriteAnimations_EzloCap_1.s"
gSpriteAnimations_EzloCap_2:: @ 0811F1CA
.include "animations/gSpriteAnimations_EzloCap_2.s"
gSpriteAnimations_EzloCap_3:: @ 0811F1E7
.include "animations/gSpriteAnimations_EzloCap_3.s"
gSpriteAnimations_EzloCap_8:: @ 0811F210
.include "animations/gSpriteAnimations_EzloCap_8.s"
gSpriteAnimations_EzloCap_9:: @ 0811F22D
.include "animations/gSpriteAnimations_EzloCap_9.s"
gSpriteAnimations_EzloCap_10:: @ 0811F24A
.include "animations/gSpriteAnimations_EzloCap_10.s"
gSpriteAnimations_EzloCap_11:: @ 0811F267
.include "animations/gSpriteAnimations_EzloCap_11.s"
gSpriteAnimations_EzloCap_4:: @ 0811F290
.include "animations/gSpriteAnimations_EzloCap_4.s"
gSpriteAnimations_EzloCap_5:: @ 0811F2AD
.include "animations/gSpriteAnimations_EzloCap_5.s"
gSpriteAnimations_EzloCap_6:: @ 0811F2CA
.include "animations/gSpriteAnimations_EzloCap_6.s"
gSpriteAnimations_EzloCap_7:: @ 0811F2E7
.include "animations/gSpriteAnimations_EzloCap_7.s"
gSpriteAnimations_EzloCap_12:: @ 0811F310
.include "animations/gSpriteAnimations_EzloCap_12.s"
gSpriteAnimations_EzloCap_13:: @ 0811F31D
.include "animations/gSpriteAnimations_EzloCap_13.s"
gSpriteAnimations_EzloCap_14:: @ 0811F32A
.include "animations/gSpriteAnimations_EzloCap_14.s"
gSpriteAnimations_EzloCap_15:: @ 0811F337
.include "animations/gSpriteAnimations_EzloCap_15.s"
gSpriteAnimations_EzloCap_16:: @ 0811F360
.include "animations/gSpriteAnimations_EzloCap_16.s"
gSpriteAnimations_EzloCap_17:: @ 0811F36D
.include "animations/gSpriteAnimations_EzloCap_17.s"
gSpriteAnimations_EzloCap_18:: @ 0811F37A
.include "animations/gSpriteAnimations_EzloCap_18.s"
gSpriteAnimations_EzloCap_19:: @ 0811F387
.include "animations/gSpriteAnimations_EzloCap_19.s"
gSpriteAnimations_EzloCap_20:: @ 0811F3B0
.include "animations/gSpriteAnimations_EzloCap_20.s"
gSpriteAnimations_EzloCap_21:: @ 0811F3BD
.include "animations/gSpriteAnimations_EzloCap_21.s"
gSpriteAnimations_EzloCap_22:: @ 0811F3CA
.include "animations/gSpriteAnimations_EzloCap_22.s"
gSpriteAnimations_EzloCap_23:: @ 0811F3D7
.include "animations/gSpriteAnimations_EzloCap_23.s"
gSpriteAnimations_EzloCap_31:: @ 0811F400
.include "animations/gSpriteAnimations_EzloCap_31.s"
gSpriteAnimations_EzloCap_32:: @ 0811F405
.include "animations/gSpriteAnimations_EzloCap_32.s"
gSpriteAnimations_EzloCap_33:: @ 0811F416
.include "animations/gSpriteAnimations_EzloCap_33.s"
gSpriteAnimations_EzloCap_34:: @ 0811F43F
.include "animations/gSpriteAnimations_EzloCap_34.s"
gSpriteAnimations_EzloCap_24:: @ 0811F468
.include "animations/gSpriteAnimations_EzloCap_24.s"
gSpriteAnimations_EzloCap_25:: @ 0811F4B9
.include "animations/gSpriteAnimations_EzloCap_25.s"
gSpriteAnimations_EzloCap_26:: @ 0811F4D2
.include "animations/gSpriteAnimations_EzloCap_26.s"
gSpriteAnimations_EzloCap_27:: @ 0811F4D7
.include "animations/gSpriteAnimations_EzloCap_27.s"
gSpriteAnimations_EzloCap_28:: @ 0811F54B
.include "animations/gSpriteAnimations_EzloCap_28.s"
gSpriteAnimations_EzloCap_29:: @ 0811F560
.include "animations/gSpriteAnimations_EzloCap_29.s"
gSpriteAnimations_EzloCap_30:: @ 0811F575
.include "animations/gSpriteAnimations_EzloCap_30.s"
gSpriteAnimations_EzloCap_35:: @ 0811F58A
.include "animations/gSpriteAnimations_EzloCap_35.s"
gSpriteAnimations_EzloCap:: @ 0811F590
.4byte gSpriteAnimations_EzloCap_0
.4byte gSpriteAnimations_EzloCap_1
.4byte gSpriteAnimations_EzloCap_2
.4byte gSpriteAnimations_EzloCap_3
.4byte gSpriteAnimations_EzloCap_4
.4byte gSpriteAnimations_EzloCap_5
.4byte gSpriteAnimations_EzloCap_6
.4byte gSpriteAnimations_EzloCap_7
.4byte gSpriteAnimations_EzloCap_8
.4byte gSpriteAnimations_EzloCap_9
.4byte gSpriteAnimations_EzloCap_10
.4byte gSpriteAnimations_EzloCap_11
.4byte gSpriteAnimations_EzloCap_12
.4byte gSpriteAnimations_EzloCap_13
.4byte gSpriteAnimations_EzloCap_14
.4byte gSpriteAnimations_EzloCap_15
.4byte gSpriteAnimations_EzloCap_16
.4byte gSpriteAnimations_EzloCap_17
.4byte gSpriteAnimations_EzloCap_18
.4byte gSpriteAnimations_EzloCap_19
.4byte gSpriteAnimations_EzloCap_20
.4byte gSpriteAnimations_EzloCap_21
.4byte gSpriteAnimations_EzloCap_22
.4byte gSpriteAnimations_EzloCap_23
.4byte gSpriteAnimations_EzloCap_24
.4byte gSpriteAnimations_EzloCap_25
.4byte gSpriteAnimations_EzloCap_26
.4byte gSpriteAnimations_EzloCap_27
.4byte gSpriteAnimations_EzloCap_28
.4byte gSpriteAnimations_EzloCap_29
.4byte gSpriteAnimations_EzloCap_30
.4byte gSpriteAnimations_EzloCap_31
.4byte gSpriteAnimations_EzloCap_32
.4byte gSpriteAnimations_EzloCap_33
.4byte gSpriteAnimations_EzloCap_34
.4byte gSpriteAnimations_EzloCap_35
.4byte 00000000
data/animations/object/object6.s
-152
View File
@@ -1,152 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gSpriteAnimations_Object6_0:: @ 0811F190
.include "animations/gSpriteAnimations_Object6_0.s"
gSpriteAnimations_Object6_1:: @ 0811F1AD
.include "animations/gSpriteAnimations_Object6_1.s"
gSpriteAnimations_Object6_2:: @ 0811F1CA
.include "animations/gSpriteAnimations_Object6_2.s"
gSpriteAnimations_Object6_3:: @ 0811F1E7
.include "animations/gSpriteAnimations_Object6_3.s"
gSpriteAnimations_Object6_8:: @ 0811F210
.include "animations/gSpriteAnimations_Object6_8.s"
gSpriteAnimations_Object6_9:: @ 0811F22D
.include "animations/gSpriteAnimations_Object6_9.s"
gSpriteAnimations_Object6_10:: @ 0811F24A
.include "animations/gSpriteAnimations_Object6_10.s"
gSpriteAnimations_Object6_11:: @ 0811F267
.include "animations/gSpriteAnimations_Object6_11.s"
gSpriteAnimations_Object6_4:: @ 0811F290
.include "animations/gSpriteAnimations_Object6_4.s"
gSpriteAnimations_Object6_5:: @ 0811F2AD
.include "animations/gSpriteAnimations_Object6_5.s"
gSpriteAnimations_Object6_6:: @ 0811F2CA
.include "animations/gSpriteAnimations_Object6_6.s"
gSpriteAnimations_Object6_7:: @ 0811F2E7
.include "animations/gSpriteAnimations_Object6_7.s"
gSpriteAnimations_Object6_12:: @ 0811F310
.include "animations/gSpriteAnimations_Object6_12.s"
gSpriteAnimations_Object6_13:: @ 0811F31D
.include "animations/gSpriteAnimations_Object6_13.s"
gSpriteAnimations_Object6_14:: @ 0811F32A
.include "animations/gSpriteAnimations_Object6_14.s"
gSpriteAnimations_Object6_15:: @ 0811F337
.include "animations/gSpriteAnimations_Object6_15.s"
gSpriteAnimations_Object6_16:: @ 0811F360
.include "animations/gSpriteAnimations_Object6_16.s"
gSpriteAnimations_Object6_17:: @ 0811F36D
.include "animations/gSpriteAnimations_Object6_17.s"
gSpriteAnimations_Object6_18:: @ 0811F37A
.include "animations/gSpriteAnimations_Object6_18.s"
gSpriteAnimations_Object6_19:: @ 0811F387
.include "animations/gSpriteAnimations_Object6_19.s"
gSpriteAnimations_Object6_20:: @ 0811F3B0
.include "animations/gSpriteAnimations_Object6_20.s"
gSpriteAnimations_Object6_21:: @ 0811F3BD
.include "animations/gSpriteAnimations_Object6_21.s"
gSpriteAnimations_Object6_22:: @ 0811F3CA
.include "animations/gSpriteAnimations_Object6_22.s"
gSpriteAnimations_Object6_23:: @ 0811F3D7
.include "animations/gSpriteAnimations_Object6_23.s"
gSpriteAnimations_Object6_31:: @ 0811F400
.include "animations/gSpriteAnimations_Object6_31.s"
gSpriteAnimations_Object6_32:: @ 0811F405
.include "animations/gSpriteAnimations_Object6_32.s"
gSpriteAnimations_Object6_33:: @ 0811F416
.include "animations/gSpriteAnimations_Object6_33.s"
gSpriteAnimations_Object6_34:: @ 0811F43F
.include "animations/gSpriteAnimations_Object6_34.s"
gSpriteAnimations_Object6_24:: @ 0811F468
.include "animations/gSpriteAnimations_Object6_24.s"
gSpriteAnimations_Object6_25:: @ 0811F4B9
.include "animations/gSpriteAnimations_Object6_25.s"
gSpriteAnimations_Object6_26:: @ 0811F4D2
.include "animations/gSpriteAnimations_Object6_26.s"
gSpriteAnimations_Object6_27:: @ 0811F4D7
.include "animations/gSpriteAnimations_Object6_27.s"
gSpriteAnimations_Object6_28:: @ 0811F54B
.include "animations/gSpriteAnimations_Object6_28.s"
gSpriteAnimations_Object6_29:: @ 0811F560
.include "animations/gSpriteAnimations_Object6_29.s"
gSpriteAnimations_Object6_30:: @ 0811F575
.include "animations/gSpriteAnimations_Object6_30.s"
gSpriteAnimations_Object6_35:: @ 0811F58A
.include "animations/gSpriteAnimations_Object6_35.s"
gSpriteAnimations_Object6:: @ 0811F590
.4byte gSpriteAnimations_Object6_0
.4byte gSpriteAnimations_Object6_1
.4byte gSpriteAnimations_Object6_2
.4byte gSpriteAnimations_Object6_3
.4byte gSpriteAnimations_Object6_4
.4byte gSpriteAnimations_Object6_5
.4byte gSpriteAnimations_Object6_6
.4byte gSpriteAnimations_Object6_7
.4byte gSpriteAnimations_Object6_8
.4byte gSpriteAnimations_Object6_9
.4byte gSpriteAnimations_Object6_10
.4byte gSpriteAnimations_Object6_11
.4byte gSpriteAnimations_Object6_12
.4byte gSpriteAnimations_Object6_13
.4byte gSpriteAnimations_Object6_14
.4byte gSpriteAnimations_Object6_15
.4byte gSpriteAnimations_Object6_16
.4byte gSpriteAnimations_Object6_17
.4byte gSpriteAnimations_Object6_18
.4byte gSpriteAnimations_Object6_19
.4byte gSpriteAnimations_Object6_20
.4byte gSpriteAnimations_Object6_21
.4byte gSpriteAnimations_Object6_22
.4byte gSpriteAnimations_Object6_23
.4byte gSpriteAnimations_Object6_24
.4byte gSpriteAnimations_Object6_25
.4byte gSpriteAnimations_Object6_26
.4byte gSpriteAnimations_Object6_27
.4byte gSpriteAnimations_Object6_28
.4byte gSpriteAnimations_Object6_29
.4byte gSpriteAnimations_Object6_30
.4byte gSpriteAnimations_Object6_31
.4byte gSpriteAnimations_Object6_32
.4byte gSpriteAnimations_Object6_33
.4byte gSpriteAnimations_Object6_34
.4byte gSpriteAnimations_Object6_35
.4byte 00000000
data/const/object/object6.s → data/const/object/ezloCap.s
+3 -3
View File
@@ -19,10 +19,10 @@ gUnk_0811F15C:: @ 0811F15C
.4byte sub_08082E6C
gUnk_0811F16C:: @ 0811F16C
.incbin "object6/gUnk_0811F16C.bin"
.incbin "ezloCap/gUnk_0811F16C.bin"
gUnk_0811F178:: @ 0811F178
.incbin "object6/gUnk_0811F178.bin"
.incbin "ezloCap/gUnk_0811F178.bin"
gUnk_0811F18C:: @ 0811F18C
.incbin "object6/gUnk_0811F18C.bin"
.incbin "ezloCap/gUnk_0811F18C.bin"
data/data_081146D0.s
+2 -2
View File
@@ -48,6 +48,6 @@ gUnk_08114F78:: @ 08114F78
gUnk_08114F80:: @ 08114F80
.incbin "data_081146D0/gUnk_08114F80.bin"
gUnk_08114F88:: @ 08114F88
.incbin "data_081146D0/gUnk_08114F88.bin"
gPlayerHitbox:: @ 08114F88
.incbin "data_081146D0/gPlayerHitbox.bin"
data/data_0811B9E0.s
-150
View File
@@ -4,156 +4,6 @@
.section .rodata
.align 2
gUnk_0811BA60:: @ 0811BA60
.4byte sub_08070C3C
.4byte sub_08070CB4
gUnk_0811BA68:: @ 0811BA68
.4byte sub_08070D38
.4byte sub_08070DC4
.4byte sub_08070E7C
gUnk_0811BA74:: @ 0811BA74
.4byte sub_08070EDC
.4byte sub_08070f24
gUnk_0811BA7C:: @ 0811BA7C
.4byte sub_08070FA4
.4byte sub_08071020
.4byte sub_08071038
gUnk_0811BA88:: @ 0811BA88
.4byte sub_080710A8
.4byte sub_08071130
.4byte sub_08071208
gUnk_0811BA94:: @ 0811BA94
.4byte sub_0807127C
.4byte sub_080712F0
gUnk_0811BA9C:: @ 0811BA9C
.4byte PortalJumpOnUpdate
.4byte PortalStandUpdate
.4byte PortalActivateInit
.4byte PortalActivateUpdate
.4byte PortalShrinkInit
.4byte PortalShrinkUpdate
.4byte PortalEnterUpdate
.4byte PortalUnknownUpdate
gUnk_0811BABC:: @ 0811BABC
.incbin "data_0811B9E0/gUnk_0811BABC.bin"
gUnk_0811BAC4:: @ 0811BAC4
.incbin "data_0811B9E0/gUnk_0811BAC4.bin"
gUnk_0811BAD4:: @ 0811BAD4
.4byte sub_080718A0
.4byte sub_0807193C
.4byte sub_08071990
.4byte sub_08071A4C
gUnk_0811BAE4:: @ 0811BAE4
.4byte sub_08071AB0
.4byte sub_08071AF0
.4byte sub_08071B60
gUnk_0811BAF0:: @ 0811BAF0
.incbin "data_0811B9E0/gUnk_0811BAF0.bin"
gUnk_0811BB2C:: @ 0811BB2C
.4byte sub_08071BDC
.4byte sub_08071CAC
.4byte sub_08071D04
.4byte sub_08071D80
gUnk_0811BB3C:: @ 0811BB3C
.4byte sub_08071DD0
.4byte sub_08071E04
.4byte sub_08071E74
gUnk_0811BB48:: @ 0811BB48
.4byte sub_08071EB0
.4byte sub_08071F14
gUnk_0811BB50:: @ 0811BB50
.4byte sub_08071F50
.4byte sub_08071F80
gUnk_0811BB58:: @ 0811BB58
.4byte sub_08072064
.4byte sub_08072098
gUnk_0811BB60:: @ 0811BB60
.4byte sub_08072100
.4byte sub_08072168
gUnk_0811BB68:: @ 0811BB68
.4byte sub_08072214
.4byte sub_08072260
gUnk_0811BB70:: @ 0811BB70
.4byte sub_080722DC
.4byte sub_08072354
.4byte sub_080723D0
.4byte sub_0807240C
gUnk_0811BB80:: @ 0811BB80
.4byte sub_0807246C
.4byte sub_08072490
gUnk_0811BB88:: @ 0811BB88
.4byte sub_080724DC
.4byte sub_0807258C
gUnk_0811BB90:: @ 0811BB90
.4byte sub_08072650
.4byte sub_080726F4
gUnk_0811BB98:: @ 0811BB98
.4byte sub_08072970
.4byte sub_08072A60
.4byte sub_08072ACC
.4byte sub_08072B5C
.4byte sub_08072C48
gUnk_0811BBAC:: @ 0811BBAC
.4byte sub_08072CC0
.4byte sub_08072CFC
.4byte sub_08072D54
.4byte sub_08072F14
gUnk_0811BBBC:: @ 0811BBBC
.incbin "data_0811B9E0/gUnk_0811BBBC.bin"
gUnk_0811BBC2:: @ 0811BBC2
.incbin "data_0811B9E0/gUnk_0811BBC2.bin"
gUnk_0811BBC8:: @ 0811BBC8
.incbin "data_0811B9E0/gUnk_0811BBC8.bin"
gUnk_0811BBCE:: @ 0811BBCE
.incbin "data_0811B9E0/gUnk_0811BBCE.bin"
gUnk_0811BBD4:: @ 0811BBD4
.4byte gUnk_0811BBBC
.4byte gUnk_0811BBC2
.4byte gUnk_0811BBC8
.4byte gUnk_0811BBCE
gUnk_0811BBE4:: @ 0811BBE4
.4byte sub_08072F94
.4byte sub_08073094
gUnk_0811BBEC:: @ 0811BBEC
.incbin "data_0811B9E0/gUnk_0811BBEC.bin"
gUnk_0811BBF8:: @ 0811BBF8
.4byte sub_080731D8
.4byte sub_080732D0
.4byte sub_0807332C
.4byte sub_080733BC
gUnk_0811BC08:: @ 0811BC08
.4byte sub_08073468
.4byte sub_080734D4
data/data_0811E454.s
-11
View File
@@ -1,11 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0811E510:: @ 0811E510
.incbin "data_0811E454/gUnk_0811E510.bin"
gUnk_0811E514:: @ 0811E514
.incbin "data_0811E454/gUnk_0811E514.bin"
data/data_0811E750.s
-9
View File
@@ -4,15 +4,6 @@
.section .rodata
.align 2
gUnk_0811E750:: @ 0811E750
.incbin "data_0811E750/gUnk_0811E750.bin"
gUnk_0811E758:: @ 0811E758
.incbin "data_0811E750/gUnk_0811E758.bin"
gUnk_0811E760:: @ 0811E760
.incbin "data_0811E750/gUnk_0811E760.bin"
gUnk_0811E768:: @ 0811E768
.4byte sub_0807FC64
.4byte sub_0807FC7C
data/gfx/sprite_frames.s
+2 -2
View File
@@ -34,8 +34,8 @@ gSpriteFrames_9:: @ 08116A9C
gSpriteFrames_Object4:: @ 08116D0C
.include "sprites/gSpriteFrames_Object4.s"
gSpriteFrames_Object6:: @ 08116DD4
.include "sprites/gSpriteFrames_Object6.s"
gSpriteFrames_EzloCap:: @ 08116DD4
.include "sprites/gSpriteFrames_EzloCap.s"
gSpriteFrames_12:: @ 08116F64
.include "sprites/gSpriteFrames_12.s"
data/gfx/sprite_ptrs.s
+2 -2
View File
@@ -60,8 +60,8 @@ gSpritePtrs:: @ 080029B4
.4byte gSprite_Link
.4byte 00000000
.4byte gSpriteAnimations_Object6
.4byte gSpriteFrames_Object6
.4byte gSpriteAnimations_EzloCap
.4byte gSpriteFrames_EzloCap
.4byte gSprite_Link
.4byte 00000000
data/scripts/script_08008D8C.inc
+2 -2
View File
@@ -81,7 +81,7 @@ script_08008E12:
_0807E5F8 0x00000001
WaitForSomething2 0x00000002
_0807F034 0x0035
WaitPlayerAction8
WaitPlayerGetItem
StartPlayerScript script_08008FC0
WaitForSomething2 0x00000020
_0807E8E4_0
@@ -95,7 +95,7 @@ script_08008E12:
_0807E5F8 0x00000001
WaitForSomething2 0x00000002
_0807F034 0x0047
WaitPlayerAction8
WaitPlayerGetItem
SetIntVariable 0x00000003
Call sub_0807F420
_0807E8E4_0
data/scripts/script_08009464.inc
+1 -1
View File
@@ -20,7 +20,7 @@ SCRIPT_START script_08009464
.endif
Call sub_0806D620
Wait 0x003c
WaitPlayerAction8
WaitPlayerGetItem
_0807EB8C
MessageNoOverlap 0x1d0c
WaitUntilTextboxCloses
data/scripts/script_080095F2.inc
+1 -1
View File
@@ -10,7 +10,7 @@ SCRIPT_START script_080095F2
PlaySound SFX_109
_0807F088 0x003c
MessageFromTarget 0x053c
WaitPlayerAction8
WaitPlayerGetItem
WaitUntilTextboxCloses
_0807F078 0x003c, 0x0001
script_08009622:
data/scripts/script_08009B78.inc
+1 -1
View File
@@ -42,7 +42,7 @@ SCRIPT_START script_08009B78
WaitForSomething2 0x00000008
Call sub_08053250
_0807F034 0x0034
WaitPlayerAction8
WaitPlayerGetItem
_0807E8E4_1
DoPostScriptAction 0x0001
MessageFromTargetPos 0x100c, 0x0000
data/scripts/script_08009F14.inc
+3 -3
View File
@@ -25,7 +25,7 @@ script_08009F36:
WaitUntilTextboxCloses
Wait 0x001e
_0807F034 0x0065
WaitPlayerAction8
WaitPlayerGetItem
DoPostScriptAction 0x000a
Call sub_0807DF50
_0807E878
@@ -74,7 +74,7 @@ script_0800A002:
Wait 0x0008
_0807F034 0x0008
Call sub_08060318
WaitPlayerAction8
WaitPlayerGetItem
Wait 0x0008
_0807EB8C
MessageFromTarget 0x1f13
@@ -108,7 +108,7 @@ script_0800A064:
Wait 0x0008
_0807F034 0x0007
Call sub_08060318
WaitPlayerAction8
WaitPlayerGetItem
Wait 0x0008
_0807EB8C
MessageFromTarget 0x1f10
data/scripts/script_0800AB6E.inc
+3 -3
View File
@@ -5,7 +5,7 @@ SCRIPT_START script_0800AB6E
_0807E8E4_0
_0807E5F8 0x00000040
WaitForSomething2 0x00000080
SetEntityPosition 0x0000, 0xffe0
OffsetEntityPosition 0x0000, 0xffe0
Call sub_0807F5C0
Wait 0x003c
CallWithArg DeleteManager36, 0x00000001
@@ -26,7 +26,7 @@ SCRIPT_START script_0800AB6E
_0807E5F8 0x00000008
_0807E5F8 0x00000002
WaitForSomething2 0x00000004
SetEntityPosition 0x0000, 0x0020
OffsetEntityPosition 0x0000, 0x0020
Call sub_0807F5C0
WaitForSomething2 0x00000010
StartPlayerScript script_0800ACE0
@@ -36,7 +36,7 @@ SCRIPT_START script_0800AB6E
WaitUntilTextboxCloses
MessageFromTargetPos 0x1663, 0x000e
WaitUntilTextboxCloses
SetEntityPosition 0x0000, 0xffe0
OffsetEntityPosition 0x0000, 0xffe0
Call sub_0807F5C0
_0807E5F8 0x00000002
WaitForSomething2 0x00000004
data/scripts/script_0800B41C.inc
+1 -1
View File
@@ -17,7 +17,7 @@ SCRIPT_START script_0800B41C
Wait 0x003c
PlaySound SFX_TASK_COMPLETE
_0807F088 0x0037
WaitPlayerAction8
WaitPlayerGetItem
_0807EB8C
MessageFromTarget 0x200c
WaitUntilTextboxCloses
data/scripts/script_0800B5EC.inc
+1 -1
View File
@@ -49,7 +49,7 @@ script_0800B68E:
SetLocalFlag 0x009e
_0807F034 0x0066
script_0800B698:
WaitPlayerAction8
WaitPlayerGetItem
_0807EB8C
Wait 0x001e
MessageNoOverlap 0x057f
data/scripts/script_0800C550.inc
+1 -1
View File
@@ -89,7 +89,7 @@ SCRIPT_START script_0800C634
_0807EB44 0x0004
CheckLocalFlag 0x0082
JumpIfNot script_0800C650
SetEntityPosition 0x0010, 0x0000
OffsetEntityPosition 0x0010, 0x0000
script_0800C650:
EndBlock
script_0800C652:
data/scripts/script_0800CD7C.inc
+4 -4
View File
@@ -43,7 +43,7 @@ script_0800CDEC:
JumpIfNot script_0800CF40
PlaySound SFX_TASK_COMPLETE
_0807F088 0x0023
WaitPlayerAction8
WaitPlayerGetItem
Jump script_0800CE32
script_0800CE14:
_0807E48C 0x0022
@@ -54,7 +54,7 @@ script_0800CE14:
JumpIfNot script_0800CF40
PlaySound SFX_TASK_COMPLETE
_0807F088 0x0022
WaitPlayerAction8
WaitPlayerGetItem
script_0800CE32:
_0807EB8C
SetGlobalFlag 0x0054
@@ -83,7 +83,7 @@ script_0800CE6E:
JumpIfNot script_0800CF40
PlaySound SFX_TASK_COMPLETE
_0807F088 0x0027
WaitPlayerAction8
WaitPlayerGetItem
_0807EB8C
SetGlobalFlag 0x0054
Call sub_08060340
@@ -111,7 +111,7 @@ script_0800CECE:
JumpIfNot script_0800CF40
PlaySound SFX_TASK_COMPLETE
_0807F088 0x0024
WaitPlayerAction8
WaitPlayerGetItem
_0807EB8C
SetGlobalFlag 0x0054
Call sub_08060340
data/scripts/script_0800D874.inc
+1 -1
View File
@@ -42,7 +42,7 @@ script_0800D8F4:
JumpIfNot script_0800D8F4
Call sub_0807DF28
_0807E864
WaitPlayerAction8
WaitPlayerGetItem
_0807EB28 0x1325
WaitUntilTextboxCloses
PlaySound SFX_113
data/scripts/script_0800D954.inc
+1 -1
View File
@@ -27,7 +27,7 @@ script_0800D962:
_0807E5F8 0x00000004
WaitForSomething2 0x00000002
_0807F050 0x006d
WaitPlayerAction8
WaitPlayerGetItem
_0807EB28 0x1703
WaitUntilTextboxCloses
Wait 0x003c
data/scripts/script_0800E0BC.inc
+1 -1
View File
@@ -227,7 +227,7 @@ script_0800E3C8:
WaitUntilTextboxCloses
Wait 0x000f
_0807F034 0x0053
WaitPlayerAction8
WaitPlayerGetItem
SetLocalFlag 0x0071
_0807E878
script_0800E3E8:
data/scripts/script_0800E6B0.inc
+1 -1
View File
@@ -41,7 +41,7 @@ script_0800E708:
script_0800E722:
WaitUntilTextboxCloses
_0807F034 0x0057
WaitPlayerAction8
WaitPlayerGetItem
WaitUntilTextboxCloses
_0807E878
Jump script_0800E6F4
data/scripts/script_0800EA54.inc
+1 -1
View File
@@ -220,7 +220,7 @@ script_0800ED20:
WaitUntilTextboxCloses
JumpIfNot script_0800ED46
_0807F050 0x0070
WaitPlayerAction8
WaitPlayerGetItem
script_0800ED46:
_0807E878
Call sub_08063874
data/scripts/script_0800EFC0.inc
+1 -1
View File
@@ -66,7 +66,7 @@ script_0800F09A:
MessageFromTargetPos 0x1202, 0x000c
WaitUntilTextboxCloses
_0807F034 0x0067
WaitPlayerAction8
WaitPlayerGetItem
_0807E8E4_0
_0807E5F8 0x00000002
WaitForSomething2 0x00000040
data/scripts/script_0800F724.inc
+1 -1
View File
@@ -175,7 +175,7 @@ SCRIPT_START script_0800F73C
MessageFromTargetPos 0x102b, 0x0000
WaitUntilTextboxCloses
_0807F034 0x000d
WaitPlayerAction8
WaitPlayerGetItem
Call sub_0806DC3C
Call sub_080791BC
CallWithArg sub_0807F244, 0x0000000d
data/scripts/script_080100C8.inc
+1 -1
View File
@@ -107,7 +107,7 @@ script_080101AC:
WaitUntilTextboxCloses
JumpIfNot script_08010240
Call sub_080A13E8
WaitPlayerAction8
WaitPlayerGetItem
Call sub_080A1460
WaitUntilTextboxCloses
Call sub_080A14A8
data/scripts/script_08010264.inc
+4 -4
View File
@@ -246,7 +246,7 @@ script_08010570:
MessageNoOverlap 0x2b07
WaitUntilTextboxCloses
CallWithArg sub_0807F800, 0x00000000
WaitPlayerAction8
WaitPlayerGetItem
WaitUntilTextboxCloses
MessageNoOverlap 0x2b0c
Jump script_080105E0
@@ -366,14 +366,14 @@ script_080106E0:
MessageNoOverlap 0x3c04
Jump script_08010726
script_0801070C:
WaitPlayerAction8
WaitPlayerGetItem
ModHealth 0x0008
Call sub_08062EDC
JumpIf script_08010724
MessageNoOverlap 0x3c06
Jump script_08010726
script_08010724:
WaitPlayerAction8
WaitPlayerGetItem
script_08010726:
WaitUntilTextboxCloses
_0807E878
@@ -489,7 +489,7 @@ script_08010860:
JumpIfNot script_080108B2
Call GoronMerchant_TryToBuyKinstone
JumpIfNot script_080108B2
WaitPlayerAction8
WaitPlayerGetItem
WaitUntilTextboxCloses
_0807EB8C
CheckGlobalFlag 0x0042
data/scripts/script_08011B40.inc
+1 -1
View File
@@ -74,7 +74,7 @@ script_08011C28:
CheckLocalFlag 0x0001
JumpIfNot script_08011C28
_0807E888
WaitPlayerAction8
WaitPlayerGetItem
Wait 0x001e
CallWithArg sub_0806C2A0, 0x00000000
WaitFor_2
data/scripts/script_08011C7C.inc
+3 -3
View File
@@ -362,7 +362,7 @@ script_08012070:
MessageNoOverlap 0x3125
WaitUntilTextboxCloses
_0807F034 0x0031
WaitPlayerAction8
WaitPlayerGetItem
.ifdef USA
Call sub_0807FC24
.else
@@ -420,7 +420,7 @@ script_080120FC:
MessageNoOverlap 0x3119
WaitUntilTextboxCloses
_0807F034 0x002f
WaitPlayerAction8
WaitPlayerGetItem
.ifdef USA
Call sub_0807FC24
.else
@@ -478,7 +478,7 @@ script_08012188:
MessageNoOverlap 0x311f
WaitUntilTextboxCloses
_0807F034 0x0030
WaitPlayerAction8
WaitPlayerGetItem
.ifdef USA
Call sub_0807FC24
.else
data/scripts/script_0801232C.inc
+1 -1
View File
@@ -15,7 +15,7 @@ script_08012338:
JumpIf script_0801235A
SetLocalFlag 0x0042
_0807F034 0x0057
WaitPlayerAction8
WaitPlayerGetItem
script_0801235A:
_0807E878
Jump script_08012338
data/scripts/script_08012430.inc
+1 -1
View File
@@ -17,7 +17,7 @@ script_08012440:
JumpIf script_08012474
SetLocalFlag 0x00b3
_0807F034 0x0062
WaitPlayerAction8
WaitPlayerGetItem
.ifdef USA
SetLocalFlag 0x00d0
.else
data/scripts/script_08012F86.inc
+2 -2
View File
@@ -39,7 +39,7 @@ script_08013006:
EndBlock
PlaySound SFX_TASK_COMPLETE
_0807F088 0x0038
WaitPlayerAction8
WaitPlayerGetItem
Wait 0x001e
_0807E8E4_0
Call sub_0806AB9C
@@ -62,7 +62,7 @@ script_08013006:
WaitUntilTextboxCloses
_0807E5F8 0x00000200
_0807F034 0x0015
WaitPlayerAction8
WaitPlayerGetItem
_0807EB8C
MessageNoOverlap 0x4406
WaitUntilTextboxCloses
data/scripts/script_0801319A.inc
+1 -1
View File
@@ -24,7 +24,7 @@ SCRIPT_START script_080131AC
StartPlayerScript script_08013330
WaitForSomething2 0x00000002
MoveEntityToPlayer
SetEntityPosition 0x0000, 0xfff0
OffsetEntityPosition 0x0000, 0xfff0
Call sub_0807F844
CameraTargetEntity
Call sub_080536B8
data/scripts/script_08014094.inc
+1 -1
View File
@@ -3,7 +3,7 @@ SCRIPT_START script_08014094
DoPostScriptAction 0x0007
_0807E930 0x0002
Call sub_0807F738
SetEntityPosition 0x0000, 0xfff0
OffsetEntityPosition 0x0000, 0xfff0
EndBlock
WaitForSomething 0x00000040
DoPostScriptAction 0x0006
data/scripts/script_080140B8.inc
+1 -1
View File
@@ -3,7 +3,7 @@ SCRIPT_START script_080140B8
DoPostScriptAction 0x0007
_0807E930 0x0003
Call sub_0807F738
SetEntityPosition 0x0000, 0xfff0
OffsetEntityPosition 0x0000, 0xfff0
EndBlock
WaitForSomething 0x00000040
DoPostScriptAction 0x0006
data/scripts/script_08014154.inc
+1 -1
View File
@@ -2,7 +2,7 @@ SCRIPT_START script_08014154
BeginBlock
DoPostScriptAction 0x0007
_0807E930 0x0006
SetEntityPosition 0x0000, 0xfff0
OffsetEntityPosition 0x0000, 0xfff0
EndBlock
WaitForSomething2 0x00000800
_0807E930 0x000a
data/scripts/script_08014198.inc
+1 -1
View File
@@ -2,7 +2,7 @@ SCRIPT_START script_08014198
BeginBlock
DoPostScriptAction 0x0007
_0807E930 0x0007
SetEntityPosition 0x0000, 0xfff0
OffsetEntityPosition 0x0000, 0xfff0
EndBlock
WaitForSomething2 0x00001000
_0807E930 0x000b
data/scripts/script_080143C0.inc
+1 -1
View File
@@ -22,7 +22,7 @@ script_080143FA:
SetIntVariable 0x00000000
Call sub_08065528
_0807F034 0x0036
WaitPlayerAction8
WaitPlayerGetItem
MessageNoOverlap 0x2c19
WaitUntilTextboxCloses
SetIntVariable 0x00000303
data/scripts/script_080145E8.inc
+1 -1
View File
@@ -233,7 +233,7 @@ script_0801478A:
Call sub_08088478
WaitUntilTextboxCloses
Call sub_080885B0
WaitPlayerAction8
WaitPlayerGetItem
_0807E5F8 0x00000008
Jump script_080147CE
script_080147A4:
data/scripts/script_08014B34.inc
+2 -2
View File
@@ -60,7 +60,7 @@ script_08014BF2:
WaitUntilTextboxCloses
SetIntVariable 0x00000064
_0807F034 0x003f
WaitPlayerAction8
WaitPlayerGetItem
Jump script_08014C22
script_08014C1C:
MessageNoOverlap 0x2f08
@@ -93,7 +93,7 @@ script_08014C56:
MessageNoOverlap 0x2f0d
WaitUntilTextboxCloses
_0807F034 0x000a
WaitPlayerAction8
WaitPlayerGetItem
Jump script_08014C82
script_08014C7C:
MessageNoOverlap 0x2f09
data/scripts/script_08014E14.inc
+2 -2
View File
@@ -38,7 +38,7 @@ script_08014E64:
_0807E48C 0x0020
JumpIfNot script_08014EB8
CallWithArg sub_0807F800, 0x00000022
WaitPlayerAction8
WaitPlayerGetItem
MessageNoOverlap 0x0a04
Jump script_08014EBC
script_08014EB0:
@@ -117,7 +117,7 @@ script_08014F4A:
JumpIfNot script_08014FA2
ModRupees 0xff9c
_0807F034 0x0022
WaitPlayerAction8
WaitPlayerGetItem
MessageNoOverlap 0x3b11
Jump script_08014FA6
script_08014F9A:
data/scripts/script_08016062.inc
+1 -1
View File
@@ -1,4 +1,4 @@
SCRIPT_START script_08016062
SetEntityPosition 0xfff0, 0x0000
OffsetEntityPosition 0xfff0, 0x0000
SCRIPT_END
.2byte 0x0000
data/scripts/script_0801609E.inc
+1 -1
View File
@@ -1,4 +1,4 @@
SCRIPT_START script_0801609E
SetEntityPosition 0x0010, 0x0000
OffsetEntityPosition 0x0010, 0x0000
SCRIPT_END
.2byte 0x0000
data/scripts/script_080160A8.inc
+4 -4
View File
@@ -33,7 +33,7 @@ script_080160E0:
WaitUntilTextboxCloses
Jump script_08016132
script_0801610C:
WaitPlayerAction8
WaitPlayerGetItem
.ifndef EU
_0807EB8C
MessageFromTarget 0x2d0d
@@ -79,7 +79,7 @@ script_08016172:
MessageFromTarget 0x2d0b
Jump script_0801618A
script_08016184:
WaitPlayerAction8
WaitPlayerGetItem
MessageFromTarget 0x2d06
script_0801618A:
_0807E878
@@ -109,7 +109,7 @@ script_080161C6:
Jump script_080161E2
script_080161D8:
.ifndef EU
WaitPlayerAction8
WaitPlayerGetItem
WaitUntilTextboxCloses
_0807EB8C
MessageNoOverlap 0x2d06
@@ -205,7 +205,7 @@ script_0801631C:
Call sub_08068E30
WaitUntilTextboxCloses
Call sub_08068C6C
WaitPlayerAction8
WaitPlayerGetItem
WaitUntilTextboxCloses
Jump script_08016346
script_08016332:
data/scripts/script_08016384.inc
+1 -1
View File
@@ -61,7 +61,7 @@ SCRIPT_START script_08016384
Wait 0x001e
WaitForSomething 0x00000001
WaitForSomething2 0x00000002
WaitPlayerAction8
WaitPlayerGetItem
WaitForPlayerAction0x17
WaitFor_1
WaitFor_2
data/scripts/script_080165D8.inc
+1 -1
View File
@@ -225,7 +225,7 @@ script_0801690A:
WaitUntilTextboxCloses
JumpIfNot script_08016926
_0807F034 0x003d
WaitPlayerAction8
WaitPlayerGetItem
script_08016926:
_0807E878
SetGlobalFlag 0x005c
include/definitions.h
+1 -1
View File
@@ -114,7 +114,7 @@ typedef enum {
SPRITE_8,
SPRITE_9,
SPRITE_OBJECT4,
SPRITE_OBJECT6,
SPRITE_EZLOCAP,
SPRITE_12,
SPRITE_13,
SPRITE_14,
include/effects.h
+1 -1
View File
@@ -115,4 +115,4 @@ typedef enum {
FX_6C,
} Effect;
#endif // EFFECTS_H
#endif // EFFECTS_H
include/entity.h
+18 -6
View File
@@ -5,6 +5,8 @@
#include "global.h"
#include "sprite.h"
#define MAX_ENTITIES 71
typedef enum {
PLAYER = 1,
ENEMY = 3,
@@ -175,6 +177,13 @@ enum {
#define COORD_TO_TILE_OFFSET(entity, xOff, yOff) \
TILE((entity)->x.HALF.HI - (xOff), (entity)->y.HALF.HI - (yOff))
enum {
IdleNorth = 0x0,
IdleEast = 0x2,
IdleSouth = 0x4,
IdleWest = 0x6,
};
enum {
DirectionNorth = 0x00,
DirectionEast = 0x08,
@@ -182,6 +191,10 @@ enum {
DirectionWest = 0x18,
};
#define AnimationStateTurnAround(expr) ((expr) ^ 0x4)
#define AnimationStateIdle(expr) ((expr) & 0x6)
#define AnimationStateWalk(expr) ((expr) & 0xe)
#define DirectionRound(expr) ((expr) & 0x18)
#define DirectionRoundUp(expr) DirectionRound((expr) + 4)
#define DirectionIsHorizontal(expr) ((expr) & 0x08)
@@ -194,7 +207,7 @@ enum {
#define Direction8Round(expr) ((expr) & 0x1c)
#define Direction8RoundUp(expr) Direction8Round((expr) + 2)
#define Direction8TurnAround(expr) (Direction8RoundUp(expr) ^ 0x10)
#define Direction8ToAnimationState(expr) (Direction8RoundUp(expr) >> 2)
#define Direction8ToAnimationState(expr) ((expr) >> 2)
#define Direction8FromAnimationState(expr) ((expr) << 2)
Entity* GetEmptyEntity(void);
@@ -270,11 +283,10 @@ void EraseAllEntities(void);
enum {
PRIO_MIN = 0,
PRIO_PLAYER = 1,
PRIO_REQUESTED = 2,
PRIO_MESSAGE = 2,
PRIO_OVERRIDE_MESSAGE = 3,
PRIO_PLAYER_EVENT = 6,
PRIO_INITIALIZING = 7,
PRIO_MESSAGE = 2, /* do not block during message */
PRIO_NO_BLOCK = 3, /* do not block during entity requested priority */
PRIO_PLAYER_EVENT = 6, /* do not block during special player event */
PRIO_HIGHEST = 7, /* do not block EVER */
};
/**
include/fileScreen.h
+1
View File
@@ -12,6 +12,7 @@ typedef struct {
u16 timer;
u8 fillerA[0x26];
} ChooseFileState;
static_assert(sizeof(ChooseFileState) == 0x30);
// TODO: This occupies the same memory region as gMenu
extern ChooseFileState gChooseFileState;
include/functions.h
+2 -2
View File
@@ -90,7 +90,7 @@ extern void sub_0804A720(Entity*);
extern u32 sub_080AEFE0(Entity*);
extern u32 sub_08049FA0(Entity*);
extern u32 sub_08049FDC(Entity*, u32);
extern u32 sub_080041A0(Entity*, Entity*, u32, u32);
extern u32 EntityInRectRadius(Entity*, Entity*, u32, u32);
extern u32 sub_08049EE4(Entity*);
extern void sub_08077E54(ItemBehavior*);
extern void sub_080042BA(Entity*, u32);
@@ -260,7 +260,7 @@ extern void sub_0800455E(Entity*);
extern u32* sub_08008790(Entity*, u32);
extern void sub_0804ACF8();
extern void sub_08073904(Entity*);
extern u32 sub_08056134(void);
extern u32 CheckHeaderValid(void);
extern void sub_08004484(Entity*, Entity*);
extern void sub_0805F8E4(u32 r0, WStruct* r1);
extern u32 sub_08002632(Entity*);
include/hitbox.h
+2 -1
View File
@@ -88,4 +88,5 @@ extern const Hitbox gUnk_080FD4E0;
extern const Hitbox gUnk_080FD3F4;
extern const Hitbox gUnk_080FD3FC;
extern const Hitbox gUnk_080FD43C;
#endif
extern const Hitbox gPlayerHitbox;
#endif
include/npc.h
+2 -2
View File
@@ -83,7 +83,7 @@ enum NPC {
/*0x4a*/ GREGAL,
/*0x4b*/ MAYOR_HAGEN,
/*0x4c*/ BIG_GORON,
/*0x4d*/ EZLO_CAP,
/*0x4d*/ EZLO,
/*0x4e*/ NPC_UNK_4E,
/*0x4f*/ NPC_UNK_4F,
/*0x50*/ CLOTHES_RACK,
@@ -277,7 +277,7 @@ extern void Gregal_Fusion(Entity*);
extern void MayorHagen(Entity*);
extern void MayorHagen_Fusion(Entity*);
extern void BigGoron(Entity*);
extern void EzloCap(Entity*);
extern void Ezlo(Entity*);
extern void NPC4E(Entity*);
extern void NPC4E_Fusion(Entity*);
extern void NPC4F(Entity*);
include/object.h
+2 -2
View File
@@ -11,7 +11,7 @@ typedef enum {
BUTTON,
OBJECT_4,
POT,
OBJECT_6,
EZLO_CAP,
PUSHED_BLOCK,
LOCKED_DOOR,
OBJECT_9,
@@ -207,7 +207,7 @@ extern void ItemForSale(Entity*);
extern void Button(Entity*);
extern void Object4(Entity*);
extern void Pot(Entity*);
extern void Object6(Entity*);
extern void EzloCap(Entity*);
extern void BlockPushed(Entity*);
extern void LockedDoor(Entity*);
extern void Object9(Entity*);
include/player.h
+10 -2
View File
@@ -63,8 +63,16 @@ typedef enum {
} PlayerControlMode;
enum PlayerFlags {
PL_BUSY = (1 << 0),
PL_DROWNING = (1 << 2),
PL_NO_CAP = (1 << 3),
PL_USE_PORTAL = (1 << 5),
PL_MINISH = (1 << 7),
PL_BURNING = (1 << 10),
PL_ROLLING = (1 << 18),
PL_IN_HOLE = (1 << 20),
PL_USE_LANTERN = (1 << 23),
PL_USE_OCARINA = (1 << 28),
};
typedef struct {
@@ -74,7 +82,7 @@ typedef struct {
/*0x05*/ u8 heldObject;
/*0x06*/ u8 pushedObject;
/*0x07*/ u8 field_0x7;
/*0x08*/ u16 field_0x8;
/*0x08*/ u16 animation;
/*0x0a*/ u8 field_0xa;
/*0x0b*/ u8 keepFacing;
/*0x0c*/ u8 playerAction;
@@ -121,7 +129,7 @@ typedef struct {
/*0x40*/ u8 hurtType[64];
/*0x80*/ u16 field_0x80;
/*0x82*/ u8 field_0x82[9];
/*0x8b*/ u8 field_0x8b;
/*0x8b*/ u8 controlMode;
/*0x8c*/ u32 field_0x8c;
/*0x90*/ union SplitWord field_0x90;
/*0x94*/ u32 field_0x94;
include/room.h
+2 -2
View File
@@ -60,8 +60,8 @@ typedef struct {
u8 field_0x3;
u8 field_0x4;
u8 filler1[1];
u8 itemForSaleIndex;
u8 field_0x7;
u8 shopItemType;
u8 shopItemType2;
u8 field_0x8;
u8 field_0x9;
u8 unk2;
include/structures.h
+2
View File
@@ -32,7 +32,9 @@ typedef struct {
u8 listenForKeyPresses;
u8 field_0x6;
u8 field_0x7;
u8 pad[24];
} struct_02000010;
static_assert(sizeof(struct_02000010) == 0x20);
extern struct_02000010 gUnk_02000010;
linker.ld
+8 -9
View File
@@ -407,8 +407,8 @@ SECTIONS {
asm/wizzrobeWind.o(.text);
asm/wizzrobeFire.o(.text);
asm/wizzrobeIce.o(.text);
src/code_080300AC.o(.text); /* ??? */
asm/code_080300AC.o(.text); /* ??? */
src/code_080300AC.o(.text);
asm/code_080300AC.o(.text);
asm/armos.o(.text);
asm/eyegore.o(.text);
src/enemy/rope.o(.text);
@@ -641,7 +641,7 @@ SECTIONS {
src/npc/gregal.o(.text);
src/npc/mayorHagen.o(.text);
src/npc/bigGoron.o(.text);
src/npc/ezloCap.o(.text);
src/npc/ezlo.o(.text);
src/npc/npc4E.o(.text);
src/npc/npc4F.o(.text);
src/npc/clothesRack.o(.text);
@@ -707,7 +707,7 @@ SECTIONS {
src/object/button.o(.text);
asm/object4.o(.text);
src/object/pot.o(.text);
asm/object6.o(.text);
asm/ezloCap.o(.text);
asm/blockPushed.o(.text);
src/object/lockedDoor.o(.text);
asm/object9.o(.text);
@@ -971,9 +971,9 @@ SECTIONS {
asm/libagbsyscall.o(.text);
src/eeprom.o(.text);
*libc.a:memcpy.o(.text);
/* handwritten assembly in arm mode */
asm/intr.o(.text);
/* data */
data/data_080B2A70.o(.rodata);
src/interrupts.o(.rodata);
@@ -1369,7 +1369,7 @@ SECTIONS {
data/const/npc/mayorHagen.o(.rodata);
data/animations/npc/mayorHagen.o(.rodata);
data/const/npc/bigGoron.o(.rodata);
src/npc/ezloCap.o(.rodata);
src/npc/ezlo.o(.rodata);
src/npc/npc4E.o(.rodata);
src/npc/npc4F.o(.rodata);
data/animations/npc/npc4F.o(.rodata);
@@ -1409,7 +1409,6 @@ SECTIONS {
data/map/room_headers.o(.rodata);
src/flags.o(.rodata);
src/save.o(.rodata);
data/data_0811E454.o(.rodata);
src/script.o(.rodata);
data/data_0811E750.o(.rodata);
data/const/object/itemOnGround.o(.rodata);
@@ -1421,8 +1420,8 @@ SECTIONS {
data/animations/object/object4.o(.rodata);
data/const/object/pot.o(.rodata);
data/animations/object/pot.o(.rodata);
data/const/object/object6.o(.rodata);
data/animations/object/object6.o(.rodata);
data/const/object/ezloCap.o(.rodata);
data/animations/object/ezloCap.o(.rodata);
data/const/object/blockPushed.o(.rodata);
src/object/lockedDoor.o(.rodata);
data/const/object/object9.o(.rodata);
src/collision.c
+1 -1
View File
@@ -65,7 +65,7 @@ void CollisionMain(void) {
doCollision = &gDoCollision;
// Check to see if we should disable collision this frame
if (gPlayerState.field_0x8b != 0) {
if (gPlayerState.controlMode != CONTROL_ENABLED) {
u32 flags = gPlayerEntity.flags;
COLLISION_OFF(&gPlayerEntity);
doCollision();
src/coord.c
+2 -2
View File
@@ -29,7 +29,7 @@ void PositionEntityOnTop(Entity* ent, Entity* ent2) {
ResolveEntityOnTop(ent, ent2);
}
void PositionRelative(Entity* source, Entity* target, s32 offsetX, s32 offsetY) { // r0, r1, r2, r3
void PositionRelative(Entity* source, Entity* target, s32 offsetX, s32 offsetY) {
s32 x;
s32 y;
@@ -39,7 +39,7 @@ void PositionRelative(Entity* source, Entity* target, s32 offsetX, s32 offsetY)
y = source->y.WORD;
target->y.WORD = y + offsetY;
target->z = source->z; // ldr
target->z = source->z;
target->collisionLayer = source->collisionLayer;
UpdateSpriteForCollisionLayer(target);
}
src/createEnemy.c
+1 -1
View File
@@ -6,7 +6,7 @@ Entity* CreateEnemy(u32 subtype, u32 form) {
enemy = GetEmptyEntity();
if (enemy != NULL) {
enemy->kind = 3;
enemy->kind = ENEMY;
enemy->id = subtype;
enemy->type = form;
AppendEntityToList(enemy, 4);
src/debugScreen.c
+13 -13
View File
@@ -17,12 +17,12 @@ void sub_0805FA04(void) {
DispReset(1);
MemClear(&gBG0Buffer, sizeof(gBG0Buffer));
MemClear(&gBG3Buffer, sizeof(gBG3Buffer));
gScreen.lcd.displayControl = 0x940;
gScreen.lcd.displayControl = DISPCNT_BG0_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_1D_MAP;
gScreen.bg0.xOffset = 0;
gScreen.bg0.yOffset = 0;
gScreen.bg3.xOffset = 0;
gScreen.bg3.yOffset = 0;
gScreen.bg3.control = 0x1e0f;
gScreen.bg3.control = BGCNT_SCREENBASE(30) | BGCNT_PRIORITY(3) | BGCNT_CHARBASE(3);
gScreen.bg3.updated = 1;
MessageInitialize();
MemClear((void*)&gUnk_02032EC0, sizeof(UI));
@@ -39,35 +39,35 @@ void sub_0805FA98(void) {
int iVar1;
switch (gInput.newKeys) {
case 0x40:
case DPAD_UP:
gMenu.focusCoords[1] -= 1;
break;
case 0x80:
case DPAD_DOWN:
gMenu.focusCoords[1] += 1;
break;
case 0x200:
case L_BUTTON:
gMenu.focusCoords[0] ^= 1;
if (gMenu.focusCoords[0] == 0) {
gScreen.bg0.control = 0x1f0c;
gScreen.bg3.control = 0x1e0f;
gScreen.bg0.control = BGCNT_SCREENBASE(31) | BGCNT_CHARBASE(3);
gScreen.bg3.control = BGCNT_SCREENBASE(30) | BGCNT_CHARBASE(3) | BGCNT_PRIORITY(3);
} else {
gScreen.bg0.control = 0x1f0f;
gScreen.bg3.control = 0x1e0c;
gScreen.bg0.control = BGCNT_SCREENBASE(31) | BGCNT_CHARBASE(3) | BGCNT_PRIORITY(3);
gScreen.bg3.control = BGCNT_SCREENBASE(30) | BGCNT_CHARBASE(3);
}
break;
case 0x100:
case R_BUTTON:
gSaveHeader->gameLanguage = gMenu.unk16;
MessageFromTarget(gMenu.unk14 * 0x100 + gMenu.unk15);
break;
case 0x2:
case B_BUTTON:
MessageInitialize();
break;
default:
switch (gInput.unk4) {
case 0x20:
case DPAD_LEFT:
iVar1 = -1;
break;
case 0x10:
case DPAD_RIGHT:
iVar1 = 1;
break;
default:
src/demoScreen.c
+4 -4
View File
@@ -31,14 +31,14 @@ void HandleChooseDemoScreen(void) {
void sub_080A2E40(void) {
DispReset(1);
InitSoundPlayingInfo();
MemClear((void*)0x6000000, 0x80);
MemClear((void*)VRAM, 0x80);
MessageInitialize();
EraseAllEntities();
sub_080ADD30();
sub_0801CFA8(0);
MemClear(&gUnk_02032EC0, 0x3b4);
MemClear(&gChooseFileState, 0x30);
MemClear(&gBG0Buffer, 0x800);
MemClear(&gUnk_02032EC0, sizeof gUnk_02032EC0);
MemClear(&gChooseFileState, sizeof gChooseFileState);
MemClear(&gBG0Buffer, sizeof gBG0Buffer);
sub_08053320();
LoadPaletteGroup(0xb5);
LoadGfxGroup(0x56);
src/enemy/acroBandits.c
+1 -1
View File
@@ -81,7 +81,7 @@ void sub_080318DC(Entity* this) {
}
if (this->health == 0) {
this->knockbackDirection = ((this->knockbackDirection + (7 & Random())) - 4) & 0x1f;
this->knockbackDirection = DirectionNormalize((this->knockbackDirection + (7 & Random())) - 4);
this->knockbackDuration += this->type2 * 3;
sub_08032338(this);
}
src/enemy/beetle.c
+1 -1
View File
@@ -150,7 +150,7 @@ void sub_08021984(Entity* this) {
void sub_08021A10(Entity* this) {
GetNextFrame(this);
if (sub_080041A0(this, &gPlayerEntity, 120, 80) && sub_08021D00(this) == 0) {
if (EntityInRectRadius(this, &gPlayerEntity, 120, 80) && sub_08021D00(this) == 0) {
if (--this->actionDelay == 0) {
this->action = 3;
this->actionDelay = (Random() & 0x3f) + 30;
src/enemy/businessScrub.c
+3 -3
View File
@@ -210,7 +210,7 @@ void sub_08028BC4(Entity* this) {
if (iVar1 != NULL) {
iVar1->spritePriority.b0 = 3;
iVar1->z.HALF.HI -= 12;
SetDefaultPriority(iVar1, 2);
SetDefaultPriority(iVar1, PRIO_MESSAGE);
}
SetFlag(this->field_0x86.HWORD);
sub_0802925C(this);
@@ -390,14 +390,14 @@ void sub_08028F0C(Entity* this) {
bool32 sub_08028F98(Entity* this, u32 param_2) {
Entity* ent = sub_08049DF4(1);
if (ent == NULL || sub_080041A0(this, ent, 0x28, 0x28)) {
if (ent == NULL || EntityInRectRadius(this, ent, 0x28, 0x28)) {
return FALSE;
}
if (param_2 != 2) {
u32 distance = param_2 ? 0x58 : 0x50;
if (!sub_080041A0(this, ent, distance, distance)) {
if (!EntityInRectRadius(this, ent, distance, distance)) {
return FALSE;
}
}
src/enemy/cuccoChickAggr.c
+1 -1
View File
@@ -134,7 +134,7 @@ u32 sub_08022B20(Entity* this) {
if (!sub_08049DF4(2))
return 0;
return sub_080041A0(this, &gPlayerEntity, 0x24, 0x24);
return EntityInRectRadius(this, &gPlayerEntity, 36, 36);
}
void sub_08022B44(Entity* this) {
src/enemy/darkNut.c
+2 -2
View File
@@ -180,7 +180,7 @@ void sub_08020E78(Entity* this) {
}
void sub_08020E98(Entity* this) {
if (PlayerInRange(this, 1, 0x38)) {
if (PlayerInRange(this, 1, 56)) {
if (sub_0802169C(this, gUnk_020000B0)) {
this->action = 8;
sub_08021218(this, 7, this->animationState);
@@ -190,7 +190,7 @@ void sub_08020E98(Entity* this) {
this->action = 8;
sub_08021218(this, 7, this->animationState);
} else {
this->direction ^= 0x10;
this->direction = DirectionTurnAround(this->direction);
sub_0802124C(this);
sub_08021644(this);
}
src/enemy/fireballGuy.c
+1 -1
View File
@@ -67,7 +67,7 @@ void sub_08045454(Entity* this) {
/* Can we create enough new entities? */
count = gUnk_080D180C[this->type];
if (72 - count <= gEntCount)
if (MAX_ENTITIES + 1 - count <= gEntCount)
return;
/* Create 2-5 new MiniFireballGuy */
src/enemy/keaton.c
+1 -1
View File
@@ -143,7 +143,7 @@ void sub_080325C4(Entity* this) {
u32 sub_080325E8(Entity* this) {
if (((sub_08049FA0(this) != 0) && (sub_08049FDC(this, 1) != 0)) &&
(sub_080041A0(this, gUnk_020000B0, 0x68, 0x40) != 0)) {
(EntityInRectRadius(this, gUnk_020000B0, 0x68, 0x40) != 0)) {
if (((GetFacingDirection(this, gUnk_020000B0) - (DirectionRound(this->frame)) + 2) & 0x1F) < 5) {
this->action = 3;
this->actionDelay = 0xC;

Some files were not shown because too many files have changed in this diff Show More