falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ply

This commit is contained in:
notyourav 2021-03-17 20:23:01 -07:00 committed by GitHub
parent a39686c24c 2d1b0da52e
commit 8b81269271
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
250 changed files with 580 additions and 1024 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/bigGoron.s
View File

@ -95,7 +95,7 @@ sub_0806D0B0: @ 0x0806D0B0
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #6 lsls r1, r1, #6
adds r0, r5, #0 adds r0, r5, #0
bl MemClear32 bl MemClear
cmp r4, #0 cmp r4, #0
beq _0806D0DA beq _0806D0DA
adds r0, r4, #0 adds r0, r4, #0

2
asm/code_08018500.s
View File

@ -58,7 +58,7 @@ sub_0801855C: @ 0x0801855C
ldr r4, _08018570 @ =gUnk_02033AB8 ldr r4, _08018570 @ =gUnk_02033AB8
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0x14 movs r1, #0x14
bl MemClear32 bl MemClear
adds r5, r4, #0 adds r5, r4, #0
ldr r4, _08018574 @ =gUnk_080B3D20 ldr r4, _08018574 @ =gUnk_080B3D20
movs r6, #0 movs r6, #0

6
asm/code_0801C370.s
View File

@ -32,7 +32,7 @@ _0801C398:
movs r1, #0xcd movs r1, #0xcd
lsls r1, r1, #2 lsls r1, r1, #2
adds r0, r5, #0 adds r0, r5, #0
bl MemClear32 bl MemClear
strb r6, [r5, #3] strb r6, [r5, #3]
strh r4, [r5, #0xe] strh r4, [r5, #0xe]
ldr r0, _0801C474 @ =gSave ldr r0, _0801C474 @ =gSave
@ -48,7 +48,7 @@ _0801C398:
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #4 lsls r1, r1, #4
adds r0, r4, #0 adds r0, r4, #0
bl MemClear32 bl MemClear
ldr r1, _0801C47C @ =gScreen ldr r1, _0801C47C @ =gScreen
str r4, [r1, #0x10] str r4, [r1, #0x10]
ldr r0, _0801C480 @ =0x00001F0C ldr r0, _0801C480 @ =0x00001F0C
@ -93,7 +93,7 @@ _0801C398:
adds r0, #0x34 adds r0, #0x34
movs r1, #0xc0 movs r1, #0xc0
lsls r1, r1, #2 lsls r1, r1, #2
bl MemClear32 bl MemClear
movs r0, #5 movs r0, #5
movs r1, #9 movs r1, #9
bl sub_0801CA6C bl sub_0801CA6C

2
asm/code_0801CEC0.s
View File

@ -12,7 +12,7 @@ sub_0801CFA8: @ 0x0801CFA8
adds r5, r0, #0 adds r5, r0, #0
ldr r0, _0801CFCC @ =gUnk_02001A00 ldr r0, _0801CFCC @ =gUnk_02001A00
movs r1, #0x40 movs r1, #0x40
bl MemClear32 bl MemClear
movs r4, #0 movs r4, #0
_0801CFB6: _0801CFB6:
adds r0, r4, #0 adds r0, r4, #0

24
asm/code_0801D79C.s
View File

@ -203,7 +203,7 @@ _0801D9D8:
strh r0, [r3] strh r0, [r3]
adds r0, r4, #0 adds r0, r4, #0
mov r1, ip mov r1, ip
bl MemClear32 bl MemClear
adds r0, r4, #0 adds r0, r4, #0
b _0801DA02 b _0801DA02
.align 2, 0 .align 2, 0
@ -282,7 +282,7 @@ zMallocInit: @ 0x0801DA7C
ldr r0, _0801DA8C @ =gzHeap ldr r0, _0801DA8C @ =gzHeap
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #5 lsls r1, r1, #5
bl MemClear32 bl MemClear
pop {pc} pop {pc}
.align 2, 0 .align 2, 0
_0801DA8C: .4byte gzHeap _0801DA8C: .4byte gzHeap
@ -323,11 +323,11 @@ sub_0801DA90: @ 0x0801DA90
bl sub_0801DB34 bl sub_0801DB34
ldr r0, _0801DB08 @ =0x0600C000 ldr r0, _0801DB08 @ =0x0600C000
movs r1, #0x20 movs r1, #0x20
bl MemClear32 bl MemClear
ldr r0, _0801DB0C @ =gBG0Buffer ldr r0, _0801DB0C @ =gBG0Buffer
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #4 lsls r1, r1, #4
bl MemClear32 bl MemClear
strh r4, [r5, #0xe] strh r4, [r5, #0xe]
pop {r4, r5, pc} pop {r4, r5, pc}
.align 2, 0 .align 2, 0
@ -369,7 +369,7 @@ sub_0801DB34: @ 0x0801DB34
ldr r4, _0801DB6C @ =gScreen ldr r4, _0801DB6C @ =gScreen
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0x7c movs r1, #0x7c
bl MemClear32 bl MemClear
ldr r0, _0801DB70 @ =gBG0Buffer ldr r0, _0801DB70 @ =gBG0Buffer
str r0, [r4, #0x10] str r0, [r4, #0x10]
ldr r0, _0801DB74 @ =0x00001F0C ldr r0, _0801DB74 @ =0x00001F0C
@ -424,7 +424,7 @@ sub_0801DBA0: @ 0x0801DBA0
adds r5, r1, #0 adds r5, r1, #0
adds r1, r2, #0 adds r1, r2, #0
adds r0, r5, #0 adds r0, r5, #0
bl MemClear32 bl MemClear
movs r0, #1 movs r0, #1
strb r0, [r5] strb r0, [r5]
ldr r2, _0801DBE4 @ =gScreenTransition ldr r2, _0801DBE4 @ =gScreenTransition
@ -699,7 +699,7 @@ _0801DDB8:
ldr r0, _0801DDE0 @ =gUnk_02019EE0 ldr r0, _0801DDE0 @ =gUnk_02019EE0
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #8 lsls r1, r1, #8
bl MemClear32 bl MemClear
b _0801DEE2 b _0801DEE2
.align 2, 0 .align 2, 0
_0801DDD8: .4byte gUnk_080C9C50 _0801DDD8: .4byte gUnk_080C9C50
@ -968,7 +968,7 @@ sub_0801DFB4: @ 0x0801DFB4
ldr r7, _0801E004 @ =gUnk_02022740 ldr r7, _0801E004 @ =gUnk_02022740
adds r0, r7, #0 adds r0, r7, #0
movs r1, #0x10 movs r1, #0x10
bl MemClear32 bl MemClear
strh r4, [r7, #6] strh r4, [r7, #6]
strh r5, [r7, #8] strh r5, [r7, #8]
strh r6, [r7, #0xa] strh r6, [r7, #0xa]
@ -1209,7 +1209,7 @@ sub_0801E160: @ 0x0801E160
adds r0, r0, r4 adds r0, r0, r4
movs r1, #0xa0 movs r1, #0xa0
lsls r1, r1, #4 lsls r1, r1, #4
bl MemClear32 bl MemClear
adds r0, r6, #0 adds r0, r6, #0
mov r1, r8 mov r1, r8
mov r2, sb mov r2, sb
@ -1279,7 +1279,7 @@ sub_0801E1EC: @ 0x0801E1EC
adds r0, r0, r5 adds r0, r0, r5
movs r1, #0xa0 movs r1, #0xa0
lsls r1, r1, #4 lsls r1, r1, #4
bl MemClear32 bl MemClear
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0 movs r1, #0
bl sub_0801E24C bl sub_0801E24C
@ -1443,7 +1443,7 @@ sub_0801E31C: @ 0x0801E31C
adds r0, r0, r1 adds r0, r0, r1
movs r1, #0xa0 movs r1, #0xa0
lsls r1, r1, #4 lsls r1, r1, #4
bl MemClear32 bl MemClear
cmp sl, sb cmp sl, sb
bge _0801E3DC bge _0801E3DC
movs r6, #0 movs r6, #0
@ -1738,7 +1738,7 @@ sub_0801E49C: @ 0x0801E49C
adds r0, r0, r6 adds r0, r0, r6
movs r1, #0xa0 movs r1, #0xa0
lsls r1, r1, #4 lsls r1, r1, #4
bl MemClear32 bl MemClear
ldr r2, _0801E5E8 @ =gUnk_02018EE0 ldr r2, _0801E5E8 @ =gUnk_02018EE0
ldrb r1, [r5] ldrb r1, [r5]
lsls r0, r1, #2 lsls r0, r1, #2

4
asm/code_0804B9F8.s
View File

@ -50,10 +50,10 @@ sub_0804FFE4: @ 0x0804FFE4
ldr r4, _08050000 @ =gFadeControl ldr r4, _08050000 @ =gFadeControl
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0x1c movs r1, #0x1c
bl MemClear32 bl MemClear
ldr r0, _08050004 @ =gUnk_020354C0 ldr r0, _08050004 @ =gUnk_020354C0
movs r1, #0x80 movs r1, #0x80
bl MemClear32 bl MemClear
movs r0, #1 movs r0, #1
rsbs r0, r0, #0 rsbs r0, r0, #0
str r0, [r4, #4] str r0, [r4, #4]

16
asm/code_080526F8.s
View File

@ -791,7 +791,7 @@ sub_08052CFC: @ 0x08052CFC
ldr r4, _08052D44 @ =gArea ldr r4, _08052D44 @ =gArea
ldr r1, _08052D48 @ =0x00000894 ldr r1, _08052D48 @ =0x00000894
adds r0, r4, #0 adds r0, r4, #0
bl MemClear32 bl MemClear
ldr r0, _08052D4C @ =gRoomControls ldr r0, _08052D4C @ =gRoomControls
ldrb r1, [r0, #4] ldrb r1, [r0, #4]
lsls r1, r1, #2 lsls r1, r1, #2
@ -996,7 +996,7 @@ sub_08052EA0: @ 0x08052EA0
ldr r4, _08052EE4 @ =gRoomVars ldr r4, _08052EE4 @ =gRoomVars
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0xcc movs r1, #0xcc
bl MemClear32 bl MemClear
movs r0, #0xff movs r0, #0xff
strb r0, [r4, #0x10] strb r0, [r4, #0x10]
strb r0, [r4, #0x11] strb r0, [r4, #0x11]
@ -1178,7 +1178,7 @@ sub_08052FF4: @ 0x08052FF4
ldr r5, _08053074 @ =gUnk_020342CC ldr r5, _08053074 @ =gUnk_020342CC
adds r0, r5, #0 adds r0, r5, #0
movs r1, #0x20 movs r1, #0x20
bl MemClear32 bl MemClear
str r5, [r5, #0x20] str r5, [r5, #0x20]
ldr r0, _08053078 @ =gAreaRoomHeaders ldr r0, _08053078 @ =gAreaRoomHeaders
lsls r6, r6, #2 lsls r6, r6, #2
@ -1570,17 +1570,17 @@ sub_08053320: @ 0x08053320
movs r4, #0x80 movs r4, #0x80
lsls r4, r4, #4 lsls r4, r4, #4
adds r1, r4, #0 adds r1, r4, #0
bl MemClear32 bl MemClear
ldr r0, _08053380 @ =gBG1Buffer ldr r0, _08053380 @ =gBG1Buffer
adds r1, r4, #0 adds r1, r4, #0
bl MemClear32 bl MemClear
ldr r0, _08053384 @ =gBG2Buffer ldr r0, _08053384 @ =gBG2Buffer
adds r1, r4, #0 adds r1, r4, #0
bl MemClear32 bl MemClear
ldr r0, _08053388 @ =gBG3Buffer ldr r0, _08053388 @ =gBG3Buffer
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #5 lsls r1, r1, #5
bl MemClear32 bl MemClear
movs r0, #0x10 movs r0, #0x10
bl LoadGfxGroup bl LoadGfxGroup
movs r0, #0x17 movs r0, #0x17
@ -2222,7 +2222,7 @@ sub_08053800: @ 0x08053800
ldr r0, _08053888 @ =gBG1Buffer ldr r0, _08053888 @ =gBG1Buffer
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #4 lsls r1, r1, #4
bl MemClear32 bl MemClear
ldr r0, _0805388C @ =0x00000F01 ldr r0, _0805388C @ =0x00000F01
adds r5, r5, r0 adds r5, r5, r0
ldr r1, [r4] ldr r1, [r4]

6
asm/code_08056418.s
View File

@ -267,11 +267,11 @@ _080568B2:
beq _080568D2 beq _080568D2
adds r0, r6, #0 adds r0, r6, #0
movs r1, #4 movs r1, #4
bl MemClear32 bl MemClear
ldr r4, _08056910 @ =gUnk_02024030 ldr r4, _08056910 @ =gUnk_02024030
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0x18 movs r1, #0x18
bl MemClear32 bl MemClear
movs r0, #1 movs r0, #1
strb r0, [r4] strb r0, [r4]
strb r0, [r6] strb r0, [r6]
@ -472,7 +472,7 @@ _08056A30:
movs r1, #3 movs r1, #3
strb r1, [r2] strb r1, [r2]
movs r1, #0x18 movs r1, #0x18
bl MemClear32 bl MemClear
movs r0, #0x6a movs r0, #0x6a
bl SoundReq bl SoundReq
adds r1, r6, #0 adds r1, r6, #0

6
asm/code_0805E3B0.s
View File

@ -360,15 +360,15 @@ EraseAllEntities: @ 0x0805E60C
bl DeleteAllEntities bl DeleteAllEntities
ldr r0, _0805E654 @ =gUnk_03003DC0 ldr r0, _0805E654 @ =gUnk_03003DC0
movs r1, #0xc movs r1, #0xc
bl MemClear32 bl MemClear
ldr r0, _0805E658 @ =gPlayerEntity ldr r0, _0805E658 @ =gPlayerEntity
movs r1, #0xaa movs r1, #0xaa
lsls r1, r1, #6 lsls r1, r1, #6
bl MemClear32 bl MemClear
ldr r0, _0805E65C @ =gUnk_02033290 ldr r0, _0805E65C @ =gUnk_02033290
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #4 lsls r1, r1, #4
bl MemClear32 bl MemClear
bl sub_0805E98C bl sub_0805E98C
ldr r0, _0805E660 @ =gEntCount ldr r0, _0805E660 @ =gEntCount
movs r1, #0 movs r1, #0

8
asm/code_0805EC04.s
View File

@ -751,7 +751,7 @@ _0805F2D0:
bne _0805F2F0 bne _0805F2F0
adds r0, r5, #0 adds r0, r5, #0
movs r1, #0xc movs r1, #0xc
bl MemClear32 bl MemClear
ldrb r0, [r4] ldrb r0, [r4]
movs r1, #1 movs r1, #1
orrs r0, r1 orrs r0, r1
@ -781,7 +781,7 @@ _0805F308:
cmp r0, r2 cmp r0, r2
bne _0805F318 bne _0805F318
movs r1, #0xc movs r1, #0xc
bl MemClear32 bl MemClear
b _0805F320 b _0805F320
.align 2, 0 .align 2, 0
_0805F314: .4byte gUnk_02036540 _0805F314: .4byte gUnk_02036540
@ -944,7 +944,7 @@ sub_0805F440: @ 0x0805F440
adds r4, r0, #0 adds r4, r0, #0
adds r5, r1, #0 adds r5, r1, #0
movs r1, #0x30 movs r1, #0x30
bl MemClear32 bl MemClear
ldr r0, _0805F45C @ =0x0000FFFF ldr r0, _0805F45C @ =0x0000FFFF
cmp r5, r0 cmp r5, r0
bls _0805F460 bls _0805F460
@ -1122,7 +1122,7 @@ _0805F596:
_0805F59E: _0805F59E:
ldr r0, _0805F5C8 @ =gUnk_02034330 ldr r0, _0805F5C8 @ =gUnk_02034330
movs r1, #0x18 movs r1, #0x18
bl MemClear32 bl MemClear
_0805F5A6: _0805F5A6:
mov r0, sb mov r0, sb
mov r1, sp mov r1, sp

2
asm/code_0806ED78.s
View File

@ -842,7 +842,7 @@ sub_0806F364: @ 0x0806F364
adds r1, r2, r3 adds r1, r2, r3
adds r0, r0, r1 adds r0, r0, r1
movs r1, #0x10 movs r1, #0x10
bl MemClear32 bl MemClear
pop {pc} pop {pc}
.align 2, 0 .align 2, 0
_0806F384: .4byte gArea _0806F384: .4byte gArea

6
asm/code_0806FA6C.s
View File

@ -385,7 +385,7 @@ sub_0806FD8C: @ 0x0806FD8C
ldr r0, _0806FD9C @ =gUnk_020000C0 ldr r0, _0806FD9C @ =gUnk_020000C0
movs r1, #0xc0 movs r1, #0xc0
lsls r1, r1, #4 lsls r1, r1, #4
bl MemClear32 bl MemClear
pop {pc} pop {pc}
.align 2, 0 .align 2, 0
_0806FD9C: .4byte gUnk_020000C0 _0806FD9C: .4byte gUnk_020000C0
@ -534,7 +534,7 @@ _0806FE9E:
bls _0806FE9E bls _0806FE9E
adds r0, r6, #0 adds r0, r6, #0
movs r1, #0x40 movs r1, #0x40
bl MemClear32 bl MemClear
_0806FEB4: _0806FEB4:
pop {r4, r5, r6, pc} pop {r4, r5, r6, pc}
.align 2, 0 .align 2, 0
@ -1454,7 +1454,7 @@ sub_0807059C: @ 0x0807059C
push {lr} push {lr}
ldr r0, _080705A8 @ =gUnk_02034490 ldr r0, _080705A8 @ =gUnk_02034490
movs r1, #0x18 movs r1, #0x18
bl MemClear32 bl MemClear
pop {pc} pop {pc}
.align 2, 0 .align 2, 0
_080705A8: .4byte gUnk_02034490 _080705A8: .4byte gUnk_02034490

2
asm/code_080732D0.s
View File

@ -4198,7 +4198,7 @@ sub_080751E8: @ 0x080751E8
ldr r4, _08075230 @ =gPlayerScriptExecutionContext ldr r4, _08075230 @ =gPlayerScriptExecutionContext
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0x24 movs r1, #0x24
bl MemClear32 bl MemClear
str r6, [r4] str r6, [r4]
ldr r0, _08075234 @ =gPlayerEntity ldr r0, _08075234 @ =gPlayerEntity
adds r0, #0x84 adds r0, #0x84

2
asm/code_08077B98.s
View File

@ -642,7 +642,7 @@ sub_080784C8: @ 0x080784C8
movs r1, #0xc4 movs r1, #0xc4
lsls r1, r1, #1 lsls r1, r1, #1
adds r0, r4, #0 adds r0, r4, #0
bl MemClear32 bl MemClear
ldr r0, _080784E0 @ =gUnk_0811C000 ldr r0, _080784E0 @ =gUnk_0811C000
str r0, [r4, #4] str r0, [r4, #4]
pop {r4, pc} pop {r4, pc}

4
asm/code_08078778.s
View File

@ -70,7 +70,7 @@ sub_080788E0: @ 0x080788E0
ldr r1, _08078900 @ =gUnk_03003DF8 ldr r1, _08078900 @ =gUnk_03003DF8
adds r0, r0, r1 adds r0, r0, r1
movs r1, #0xc movs r1, #0xc
bl MemClear32 bl MemClear
_080788FC: _080788FC:
pop {pc} pop {pc}
.align 2, 0 .align 2, 0
@ -542,7 +542,7 @@ sub_08078C24: @ 0x08078C24
ldr r0, _08078CB0 @ =gUnk_03003DF0 ldr r0, _08078CB0 @ =gUnk_03003DF0
movs r1, #0xc4 movs r1, #0xc4
lsls r1, r1, #1 lsls r1, r1, #1
bl MemClear32 bl MemClear
pop {pc} pop {pc}
.align 2, 0 .align 2, 0
_08078CAC: .4byte gPlayerState _08078CAC: .4byte gPlayerState

26
asm/code_0807B9B8.s
View File

@ -948,19 +948,19 @@ sub_0807C0DC: @ 0x0807C0DC
lsls r6, r6, #6 lsls r6, r6, #6
adds r0, r5, #0 adds r0, r5, #0
adds r1, r6, #0 adds r1, r6, #0
bl MemClear32 bl MemClear
adds r0, r5, r6 adds r0, r5, r6
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #5 lsls r1, r1, #5
bl MemClear32 bl MemClear
ldr r0, _0807C160 @ =gUnk_02019EE0 ldr r0, _0807C160 @ =gUnk_02019EE0
movs r4, #0x80 movs r4, #0x80
lsls r4, r4, #8 lsls r4, r4, #8
adds r1, r4, #0 adds r1, r4, #0
bl MemClear32 bl MemClear
ldr r0, _0807C164 @ =gMapDataTopSpecial ldr r0, _0807C164 @ =gMapDataTopSpecial
adds r1, r4, #0 adds r1, r4, #0
bl MemClear32 bl MemClear
ldr r0, _0807C168 @ =gArea ldr r0, _0807C168 @ =gArea
ldr r1, _0807C16C @ =0x0000085C ldr r1, _0807C16C @ =0x0000085C
adds r0, r0, r1 adds r0, r0, r1
@ -999,7 +999,7 @@ _0807C174: .4byte 0x0000FFFF
_0807C178: _0807C178:
adds r0, r2, #4 adds r0, r2, #4
adds r1, r6, #0 adds r1, r6, #0
bl MemClear32 bl MemClear
movs r3, #1 movs r3, #1
mov sb, r3 mov sb, r3
_0807C184: _0807C184:
@ -1167,7 +1167,7 @@ _0807C2E4:
bl sub_0807C5F4 bl sub_0807C5F4
adds r0, r5, #0 adds r0, r5, #0
adds r1, r6, #0 adds r1, r6, #0
bl MemClear32 bl MemClear
ldr r4, _0807C350 @ =gMapDataTopSpecial ldr r4, _0807C350 @ =gMapDataTopSpecial
adds r5, r4, r6 adds r5, r4, r6
adds r0, r4, #0 adds r0, r4, #0
@ -1179,7 +1179,7 @@ _0807C2E4:
bl sub_0807C5F4 bl sub_0807C5F4
adds r0, r5, #0 adds r0, r5, #0
adds r1, r6, #0 adds r1, r6, #0
bl MemClear32 bl MemClear
_0807C326: _0807C326:
mov r1, sb mov r1, sb
cmp r1, #0 cmp r1, #0
@ -1406,10 +1406,10 @@ sub_0807C4F8: @ 0x0807C4F8
movs r4, #0x80 movs r4, #0x80
lsls r4, r4, #8 lsls r4, r4, #8
adds r1, r4, #0 adds r1, r4, #0
bl MemClear32 bl MemClear
ldr r0, _0807C59C @ =gMapDataTopSpecial ldr r0, _0807C59C @ =gMapDataTopSpecial
adds r1, r4, #0 adds r1, r4, #0
bl MemClear32 bl MemClear
ldr r5, _0807C5A0 @ =gUnk_02022830 ldr r5, _0807C5A0 @ =gUnk_02022830
ldr r0, _0807C5A4 @ =gArea ldr r0, _0807C5A4 @ =gArea
ldr r1, _0807C5A8 @ =0x0000085C ldr r1, _0807C5A8 @ =0x0000085C
@ -1455,7 +1455,7 @@ _0807C54A:
bl sub_0807C5F4 bl sub_0807C5F4
adds r0, r5, #0 adds r0, r5, #0
adds r1, r6, #0 adds r1, r6, #0
bl MemClear32 bl MemClear
ldr r4, _0807C59C @ =gMapDataTopSpecial ldr r4, _0807C59C @ =gMapDataTopSpecial
adds r5, r4, r6 adds r5, r4, r6
adds r0, r4, #0 adds r0, r4, #0
@ -1467,7 +1467,7 @@ _0807C54A:
bl sub_0807C5F4 bl sub_0807C5F4
adds r0, r5, #0 adds r0, r5, #0
adds r1, r6, #0 adds r1, r6, #0
bl MemClear32 bl MemClear
_0807C592: _0807C592:
pop {r4, r5, r6, pc} pop {r4, r5, r6, pc}
.align 2, 0 .align 2, 0
@ -1694,7 +1694,7 @@ _0807C710:
_0807C726: _0807C726:
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0x40 movs r1, #0x40
bl MemClear32 bl MemClear
adds r4, #0x40 adds r4, #0x40
adds r5, #1 adds r5, #1
cmp r5, r7 cmp r5, r7
@ -1984,7 +1984,7 @@ _0807C92E:
_0807C946: _0807C946:
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0x80 movs r1, #0x80
bl MemClear32 bl MemClear
adds r4, #0x80 adds r4, #0x80
adds r5, #1 adds r5, #1
cmp r5, r6 cmp r5, r6

8
asm/code_0807F0D8.s
View File

@ -2934,11 +2934,11 @@ sub_08080668: @ 0x08080668
ldr r5, _080806A4 @ =gRoomControls ldr r5, _080806A4 @ =gRoomControls
adds r0, r5, #0 adds r0, r5, #0
movs r1, #0x38 movs r1, #0x38
bl MemClear32 bl MemClear
ldr r4, _080806A8 @ =gUnk_03004030 ldr r4, _080806A8 @ =gUnk_03004030
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0xc movs r1, #0xc
bl MemClear32 bl MemClear
ldr r0, _080806AC @ =0x0000FFFF ldr r0, _080806AC @ =0x0000FFFF
strh r0, [r5, #0x22] strh r0, [r5, #0x22]
movs r0, #0xff movs r0, #0xff
@ -2950,10 +2950,10 @@ sub_08080668: @ 0x08080668
movs r4, #0x80 movs r4, #0x80
lsls r4, r4, #8 lsls r4, r4, #8
adds r1, r4, #0 adds r1, r4, #0
bl MemClear32 bl MemClear
ldr r0, _080806B8 @ =gMapDataTopSpecial ldr r0, _080806B8 @ =gMapDataTopSpecial
adds r1, r4, #0 adds r1, r4, #0
bl MemClear32 bl MemClear
pop {r4, r5, pc} pop {r4, r5, pc}
.align 2, 0 .align 2, 0
_080806A4: .4byte gRoomControls _080806A4: .4byte gRoomControls

2
asm/code_080A29BC.s
View File

@ -995,7 +995,7 @@ sub_080A3210: @ 0x080A3210
ldr r4, _080A3230 @ =gUnk_02021EE0 ldr r4, _080A3230 @ =gUnk_02021EE0
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0x18 movs r1, #0x18
bl MemClear32 bl MemClear
bl sub_080A35C8 bl sub_080A35C8
movs r0, #0x80 movs r0, #0x80
lsls r0, r0, #1 lsls r0, r0, #1

10
asm/code_080A3480.s
View File

@ -354,7 +354,7 @@ sub_080A36F8: @ 0x080A36F8
ldr r0, _080A3760 @ =gBG1Buffer ldr r0, _080A3760 @ =gBG1Buffer
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #4 lsls r1, r1, #4
bl MemClear32 bl MemClear
ldr r1, _080A3764 @ =gScreen ldr r1, _080A3764 @ =gScreen
movs r2, #0 movs r2, #0
movs r0, #1 movs r0, #1
@ -410,7 +410,7 @@ _080A378A:
ldr r0, _080A37B8 @ =gBG1Buffer ldr r0, _080A37B8 @ =gBG1Buffer
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #4 lsls r1, r1, #4
bl MemClear32 bl MemClear
movs r1, #0x10 movs r1, #0x10
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
ldr r2, _080A37BC @ =gUnk_081272E0 ldr r2, _080A37BC @ =gUnk_081272E0
@ -580,7 +580,7 @@ sub_080A38D0: @ 0x080A38D0
movs r6, #0x80 movs r6, #0x80
lsls r6, r6, #4 lsls r6, r6, #4
adds r1, r6, #0 adds r1, r6, #0
bl MemClear32 bl MemClear
ldr r4, _080A3924 @ =gScreen ldr r4, _080A3924 @ =gScreen
movs r0, #0 movs r0, #0
mov r8, r0 mov r8, r0
@ -588,7 +588,7 @@ sub_080A38D0: @ 0x080A38D0
strh r5, [r4, #0x1a] strh r5, [r4, #0x1a]
ldr r0, _080A3928 @ =gBG2Buffer ldr r0, _080A3928 @ =gBG2Buffer
adds r1, r6, #0 adds r1, r6, #0
bl MemClear32 bl MemClear
strh r5, [r4, #0x26] strh r5, [r4, #0x26]
adds r4, #0x68 adds r4, #0x68
movs r0, #0x80 movs r0, #0x80
@ -712,7 +712,7 @@ _080A39C8:
movs r0, #0xc0 movs r0, #0xc0
lsls r0, r0, #0x13 lsls r0, r0, #0x13
movs r1, #0x20 movs r1, #0x20
bl MemClear32 bl MemClear
movs r0, #0 movs r0, #0
movs r1, #0 movs r1, #0
bl sub_08052418 bl sub_08052418

26
asm/code_080A3BD0.s
View File

@ -935,7 +935,7 @@ sub_080A4398: @ 0x080A4398
push {lr} push {lr}
ldr r0, _080A43A4 @ =gUnk_02019EE0 ldr r0, _080A43A4 @ =gUnk_02019EE0
movs r1, #0x40 movs r1, #0x40
bl MemClear32 bl MemClear
pop {pc} pop {pc}
.align 2, 0 .align 2, 0
_080A43A4: .4byte gUnk_02019EE0 _080A43A4: .4byte gUnk_02019EE0
@ -1119,7 +1119,7 @@ sub_080A44E0: @ 0x080A44E0
mov r8, r0 mov r8, r0
ldr r0, [r4, #8] ldr r0, [r4, #8]
mov r1, r8 mov r1, r8
bl MemClear32 bl MemClear
adds r0, r6, #0 adds r0, r6, #0
adds r1, r4, #0 adds r1, r4, #0
bl sub_0805F76C bl sub_0805F76C
@ -1269,11 +1269,11 @@ sub_080A4608: @ 0x080A4608
ldr r0, _080A46A4 @ =gBG0Buffer ldr r0, _080A46A4 @ =gBG0Buffer
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #4 lsls r1, r1, #4
bl MemClear32 bl MemClear
ldr r0, _080A46A8 @ =gBG3Buffer ldr r0, _080A46A8 @ =gBG3Buffer
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #5 lsls r1, r1, #5
bl MemClear32 bl MemClear
ldr r2, _080A46AC @ =gScreen ldr r2, _080A46AC @ =gScreen
adds r1, r2, #0 adds r1, r2, #0
adds r1, #0x58 adds r1, #0x58
@ -1976,7 +1976,7 @@ sub_080A4BA0: @ 0x080A4BA0
adds r6, r1, #0 adds r6, r1, #0
add r0, sp, #0x18 add r0, sp, #0x18
movs r1, #0x30 movs r1, #0x30
bl MemClear32 bl MemClear
ldr r0, _080A4C08 @ =gUnk_0812816C ldr r0, _080A4C08 @ =gUnk_0812816C
mov r1, sp mov r1, sp
movs r2, #0x18 movs r2, #0x18
@ -2123,7 +2123,7 @@ sub_080A4CBC: @ 0x080A4CBC
lsls r5, r5, #4 lsls r5, r5, #4
adds r0, r4, #0 adds r0, r4, #0
adds r1, r5, #0 adds r1, r5, #0
bl MemClear32 bl MemClear
ldr r1, _080A4D14 @ =0x0600E000 ldr r1, _080A4D14 @ =0x0600E000
adds r0, r4, #0 adds r0, r4, #0
adds r2, r5, #0 adds r2, r5, #0
@ -2217,7 +2217,7 @@ sub_080A4D88: @ 0x080A4D88
push {lr} push {lr}
ldr r0, _080A4DA4 @ =gUnk_020344A0 ldr r0, _080A4DA4 @ =gUnk_020344A0
movs r1, #8 movs r1, #8
bl MemClear32 bl MemClear
movs r0, #1 movs r0, #1
movs r1, #0 movs r1, #0
bl MenuFadeIn bl MenuFadeIn
@ -2245,21 +2245,21 @@ sub_080A4DB8: @ 0x080A4DB8
movs r4, #0x80 movs r4, #0x80
lsls r4, r4, #4 lsls r4, r4, #4
adds r1, r4, #0 adds r1, r4, #0
bl MemClear32 bl MemClear
ldr r0, _080A4E5C @ =gBG1Buffer ldr r0, _080A4E5C @ =gBG1Buffer
adds r1, r4, #0 adds r1, r4, #0
bl MemClear32 bl MemClear
ldr r0, _080A4E60 @ =gBG2Buffer ldr r0, _080A4E60 @ =gBG2Buffer
adds r1, r4, #0 adds r1, r4, #0
bl MemClear32 bl MemClear
ldr r0, _080A4E64 @ =gUnk_0200AF34 ldr r0, _080A4E64 @ =gUnk_0200AF34
movs r1, #0xc0 movs r1, #0xc0
lsls r1, r1, #2 lsls r1, r1, #2
bl MemClear32 bl MemClear
ldr r4, _080A4E68 @ =gMenu ldr r4, _080A4E68 @ =gMenu
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0x30 movs r1, #0x30
bl MemClear32 bl MemClear
ldr r0, _080A4E6C @ =0x0000FFFF ldr r0, _080A4E6C @ =0x0000FFFF
strh r0, [r4, #0x2e] strh r0, [r4, #0x2e]
ldr r0, _080A4E70 @ =gUnk_02034490 ldr r0, _080A4E70 @ =gUnk_02034490
@ -2580,7 +2580,7 @@ _080A5080:
ldr r0, _080A5098 @ =gBG0Buffer ldr r0, _080A5098 @ =gBG0Buffer
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #4 lsls r1, r1, #4
bl MemClear32 bl MemClear
ldr r1, _080A509C @ =gScreen ldr r1, _080A509C @ =gScreen
movs r0, #1 movs r0, #1
strh r0, [r1, #0xe] strh r0, [r1, #0xe]

24
asm/code_080A5574.s
View File

@ -2442,7 +2442,7 @@ _080A6886:
ldr r0, _080A68D0 @ =gUnk_02019EE0 ldr r0, _080A68D0 @ =gUnk_02019EE0
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #3 lsls r1, r1, #3
bl MemClear32 bl MemClear
pop {r4, r5, r6, r7, pc} pop {r4, r5, r6, r7, pc}
.align 2, 0 .align 2, 0
_080A68AC: .4byte gUnk_02032EC0 _080A68AC: .4byte gUnk_02032EC0
@ -3307,7 +3307,7 @@ sub_080A6F6C: @ 0x080A6F6C
ldr r0, _080A6FA8 @ =gUnk_020350F0 ldr r0, _080A6FA8 @ =gUnk_020350F0
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #1 lsls r1, r1, #1
bl MemClear32 bl MemClear
movs r0, #0xff movs r0, #0xff
ands r0, r4 ands r0, r4
cmp r0, #0 cmp r0, #0
@ -3376,7 +3376,7 @@ _080A6FFA:
ldr r0, _080A7038 @ =gUnk_020350F0 ldr r0, _080A7038 @ =gUnk_020350F0
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #1 lsls r1, r1, #1
bl MemClear32 bl MemClear
movs r0, #0xff movs r0, #0xff
ands r0, r4 ands r0, r4
cmp r0, #0 cmp r0, #0
@ -3413,7 +3413,7 @@ sub_080A7040: @ 0x080A7040
movs r1, #0xc0 movs r1, #0xc0
lsls r1, r1, #2 lsls r1, r1, #2
adds r0, r4, #0 adds r0, r4, #0
bl MemClear32 bl MemClear
ldr r0, _080A7098 @ =0xFFFFFE00 ldr r0, _080A7098 @ =0xFFFFFE00
adds r4, r4, r0 adds r4, r4, r0
ldr r1, _080A709C @ =0x0600E000 ldr r1, _080A709C @ =0x0600E000
@ -3456,7 +3456,7 @@ sub_080A70AC: @ 0x080A70AC
movs r1, #0xc0 movs r1, #0xc0
lsls r1, r1, #2 lsls r1, r1, #2
adds r0, r4, #0 adds r0, r4, #0
bl MemClear32 bl MemClear
adds r2, r4, #0 adds r2, r4, #0
subs r2, #0x34 subs r2, #0x34
movs r0, #0x7f movs r0, #0x7f
@ -3519,7 +3519,7 @@ sub_080A7124: @ 0x080A7124
ldr r0, _080A7134 @ =gUnk_02032EC0 ldr r0, _080A7134 @ =gUnk_02032EC0
movs r1, #0xed movs r1, #0xed
lsls r1, r1, #2 lsls r1, r1, #2
bl MemClear32 bl MemClear
pop {pc} pop {pc}
.align 2, 0 .align 2, 0
_080A7134: .4byte gUnk_02032EC0 _080A7134: .4byte gUnk_02032EC0
@ -3536,7 +3536,7 @@ MenuFadeIn: @ 0x080A7138
movs r1, #0xed movs r1, #0xed
lsls r1, r1, #2 lsls r1, r1, #2
adds r0, r4, #0 adds r0, r4, #0
bl MemClear32 bl MemClear
strb r5, [r4, #2] strb r5, [r4, #2]
strb r6, [r4, #3] strb r6, [r4, #3]
ldr r0, _080A7160 @ =gMain ldr r0, _080A7160 @ =gMain
@ -3767,18 +3767,18 @@ sub_080A7328: @ 0x080A7328
bl DeleteAllEntities bl DeleteAllEntities
ldr r0, _080A738C @ =gMenu ldr r0, _080A738C @ =gMenu
movs r1, #0x30 movs r1, #0x30
bl MemClear32 bl MemClear
ldr r0, _080A7390 @ =gRoomControls ldr r0, _080A7390 @ =gRoomControls
movs r1, #0x38 movs r1, #0x38
bl MemClear32 bl MemClear
ldr r0, _080A7394 @ =gUnk_03000420 ldr r0, _080A7394 @ =gUnk_03000420
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #1 lsls r1, r1, #1
bl MemClear32 bl MemClear
ldr r4, _080A7398 @ =gActiveScriptInfo ldr r4, _080A7398 @ =gActiveScriptInfo
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0xc movs r1, #0xc
bl MemClear32 bl MemClear
movs r0, #8 movs r0, #8
strb r0, [r4, #8] strb r0, [r4, #8]
movs r0, #1 movs r0, #1
@ -4943,7 +4943,7 @@ sub_080A7C7C: @ 0x080A7C7C
push {lr} push {lr}
ldr r0, _080A7C88 @ =gUnk_02017660 ldr r0, _080A7C88 @ =gUnk_02017660
movs r1, #0x40 movs r1, #0x40
bl MemClear32 bl MemClear
pop {pc} pop {pc}
.align 2, 0 .align 2, 0
_080A7C88: .4byte gUnk_02017660 _080A7C88: .4byte gUnk_02017660

8
asm/code_080AD90C.s
View File

@ -567,7 +567,7 @@ sub_080ADD30: @ 0x080ADD30
movs r1, #0x85 movs r1, #0x85
lsls r1, r1, #2 lsls r1, r1, #2
adds r0, r4, #0 adds r0, r4, #0
bl MemClear32 bl MemClear
movs r5, #0 movs r5, #0
adds r4, #4 adds r4, #4
movs r0, #0x10 movs r0, #0x10
@ -718,7 +718,7 @@ _080ADE54: .4byte gUnk_02024494
_080ADE58: _080ADE58:
adds r0, r1, #0 adds r0, r1, #0
movs r1, #0xc movs r1, #0xc
bl MemClear32 bl MemClear
_080ADE60: _080ADE60:
adds r5, #0xc adds r5, #0xc
adds r4, #1 adds r4, #1
@ -1084,7 +1084,7 @@ sub_080AE104: @ 0x080AE104
adds r1, r1, r5 adds r1, r1, r5
lsls r1, r1, #2 lsls r1, r1, #2
adds r0, r4, #0 adds r0, r4, #0
bl MemClear32 bl MemClear
strb r5, [r4, #1] strb r5, [r4, #1]
strh r6, [r4, #4] strh r6, [r4, #4]
adds r0, r4, #0 adds r0, r4, #0
@ -1396,7 +1396,7 @@ _080AE350:
stm r0!, {r2, r3, r7} stm r0!, {r2, r3, r7}
adds r0, r6, #0 adds r0, r6, #0
movs r1, #0xc movs r1, #0xc
bl MemClear32 bl MemClear
adds r6, #0xc adds r6, #0xc
adds r5, #0xc adds r5, #0xc
movs r0, #0xc movs r0, #0xc

14
asm/fileScreen.s
View File

@ -41,7 +41,7 @@ sub_080519B0: @ 0x080519B0
ldr r4, _08051A08 @ =gScreenTransition ldr r4, _08051A08 @ =gScreenTransition
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0xb0 movs r1, #0xb0
bl MemClear32 bl MemClear
bl sub_08049CD4 bl sub_08049CD4
bl sub_080300AC bl sub_080300AC
bl sub_0807CA18 bl sub_0807CA18
@ -76,11 +76,11 @@ sub_08051A14: @ 0x08051A14
str r0, [r1, #4] str r0, [r1, #4]
ldr r0, _08051A74 @ =gUnk_03000000 ldr r0, _08051A74 @ =gUnk_03000000
ldr r1, _08051A78 @ =0x00000B74 ldr r1, _08051A78 @ =0x00000B74
bl MemClear32 bl MemClear
ldr r0, _08051A7C @ =gUnk_02032EC0 ldr r0, _08051A7C @ =gUnk_02032EC0
movs r1, #0xed movs r1, #0xed
lsls r1, r1, #2 lsls r1, r1, #2
bl MemClear32 bl MemClear
bl EraseAllEntities bl EraseAllEntities
bl sub_080197AC bl sub_080197AC
bl sub_08080668 bl sub_08080668
@ -734,10 +734,10 @@ sub_08052010: @ 0x08052010
movs r4, #0x80 movs r4, #0x80
lsls r4, r4, #4 lsls r4, r4, #4
adds r1, r4, #0 adds r1, r4, #0
bl MemClear32 bl MemClear
ldr r0, _08052080 @ =gBG2Buffer ldr r0, _08052080 @ =gBG2Buffer
adds r1, r4, #0 adds r1, r4, #0
bl MemClear32 bl MemClear
bl sub_080A4D34 bl sub_080A4D34
movs r0, #0xa movs r0, #0xa
bl LoadPaletteGroup bl LoadPaletteGroup
@ -749,10 +749,10 @@ sub_08052010: @ 0x08052010
movs r0, #0xc0 movs r0, #0xc0
lsls r0, r0, #0x13 lsls r0, r0, #0x13
movs r1, #0x20 movs r1, #0x20
bl MemClear32 bl MemClear
ldr r0, _08052084 @ =gMenu ldr r0, _08052084 @ =gMenu
movs r1, #0x30 movs r1, #0x30
bl MemClear32 bl MemClear
ldr r1, _08052088 @ =gScreen ldr r1, _08052088 @ =gScreen
ldrh r2, [r1] ldrh r2, [r1]
movs r3, #0x80 movs r3, #0x80

10
asm/gyorgFemale.s
View File

@ -112,10 +112,10 @@ sub_0804614C: @ 0x0804614C
movs r4, #0x80 movs r4, #0x80
lsls r4, r4, #8 lsls r4, r4, #8
adds r1, r4, #0 adds r1, r4, #0
bl MemClear32 bl MemClear
ldr r0, _08046250 @ =gMapDataTopSpecial ldr r0, _08046250 @ =gMapDataTopSpecial
adds r1, r4, #0 adds r1, r4, #0
bl MemClear32 bl MemClear
adds r0, r6, #0 adds r0, r6, #0
movs r1, #0 movs r1, #0
bl sub_0804660C bl sub_0804660C
@ -445,10 +445,10 @@ sub_08046498: @ 0x08046498
movs r4, #0x80 movs r4, #0x80
lsls r4, r4, #8 lsls r4, r4, #8
adds r1, r4, #0 adds r1, r4, #0
bl MemClear32 bl MemClear
ldr r0, _080464BC @ =gMapDataTopSpecial ldr r0, _080464BC @ =gMapDataTopSpecial
adds r1, r4, #0 adds r1, r4, #0
bl MemClear32 bl MemClear
adds r0, r5, #0 adds r0, r5, #0
bl sub_080464C0 bl sub_080464C0
pop {r4, r5, pc} pop {r4, r5, pc}
@ -486,7 +486,7 @@ _080464DE:
ldr r0, _0804650C @ =gUnk_02019EE0 ldr r0, _0804650C @ =gUnk_02019EE0
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #4 lsls r1, r1, #4
bl MemClear32 bl MemClear
ldr r1, _08046514 @ =gUnk_02000070 ldr r1, _08046514 @ =gUnk_02000070
movs r0, #1 movs r0, #1
strb r0, [r1] strb r0, [r1]

2
asm/manager10.s
View File

@ -338,7 +338,7 @@ _08059800:
lsls r5, r5, #4 lsls r5, r5, #4
adds r0, r4, #0 adds r0, r4, #0
adds r1, r5, #0 adds r1, r5, #0
bl MemClear32 bl MemClear
ldr r1, _08059820 @ =0x0600E800 ldr r1, _08059820 @ =0x0600E800
adds r0, r4, #0 adds r0, r4, #0
adds r2, r5, #0 adds r2, r5, #0

2
asm/manager2C.s
View File

@ -44,7 +44,7 @@ _0805D184:
ldr r4, _0805D1F8 @ =gUnk_030010AC ldr r4, _0805D1F8 @ =gUnk_030010AC
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0x20 movs r1, #0x20
bl MemClear32 bl MemClear
subs r4, #0xc subs r4, #0xc
movs r1, #0 movs r1, #0
movs r0, #1 movs r0, #1

2
asm/non_matching/arm_proxy/ItemInit.inc
View File

@ -127,4 +127,4 @@ _08017438:
.align 2, 0 .align 2, 0
_0801749C: .4byte 0x000003FF _0801749C: .4byte 0x000003FF
_080174A0: .4byte gPlayerEntity _080174A0: .4byte gPlayerEntity
.syntax divided .syntax divided

2
asm/non_matching/arm_proxy/sub_08017530.inc
View File

@ -87,4 +87,4 @@ _080175D8: .4byte gUnk_020342F8
_080175DC: .4byte gNPCFunctions _080175DC: .4byte gNPCFunctions
_080175E0: .4byte gUnk_02031EC0 _080175E0: .4byte gUnk_02031EC0
_080175E4: .4byte gRoomControls _080175E4: .4byte gRoomControls
.syntax divided .syntax divided

2
asm/non_matching/arm_proxy/sub_0801766C.inc
View File

@ -65,4 +65,4 @@ _080176DE:
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
.syntax divided .syntax divided

2
asm/non_matching/arm_proxy/sub_080176E4.inc
View File

@ -51,4 +51,4 @@ _0801773A:
bx r1 bx r1
.align 2, 0 .align 2, 0
_08017740: .4byte gUnk_03003C70 _08017740: .4byte gUnk_03003C70
.syntax divided .syntax divided

2
asm/non_matching/arm_proxy/sub_08017744.inc
View File

@ -47,4 +47,4 @@ _0801779A:
pop {r4, r5, r6, r7} pop {r4, r5, r6, r7}
pop {r0} pop {r0}
bx r0 bx r0
.syntax divided .syntax divided

2
asm/non_matching/arm_proxy/sub_080177A0.inc
View File

@ -92,4 +92,4 @@ _0801784A:
pop {r4, r5, r6} pop {r4, r5, r6}
pop {r1} pop {r1}
bx r1 bx r1
.syntax divided .syntax divided

2
asm/non_matching/fileScreen/sub_08050EF4.inc
View File

@ -135,4 +135,4 @@ _08050FF4:
mov r8, r3 mov r8, r3
pop {r4, r5, r6, r7, pc} pop {r4, r5, r6, r7, pc}
.align 2, 0 .align 2, 0
.syntax divided .syntax divided

2
asm/non_matching/fileScreen/sub_08051738.inc
View File

@ -62,4 +62,4 @@ _080517A2:
pop {r4, r5, r6, r7, pc} pop {r4, r5, r6, r7, pc}
.align 2, 0 .align 2, 0
_080517B0: .4byte gMenu _080517B0: .4byte gMenu
.syntax divided .syntax divided

2
asm/non_matching/fileScreen/sub_080517B4.inc
View File

@ -29,4 +29,4 @@ _080517DE:
.align 2, 0 .align 2, 0
_080517E4: .4byte gUnk_02019EE0 _080517E4: .4byte gUnk_02019EE0
_080517E8: .4byte gUnk_02000090 _080517E8: .4byte gUnk_02000090
.syntax divided .syntax divided

2
asm/non_matching/fileScreen/sub_080610B8.inc
View File

@ -345,4 +345,4 @@ _0805134C:
.align 2, 0 .align 2, 0
_08051350: .4byte gSave _08051350: .4byte gSave
_08051354: .4byte gMenu _08051354: .4byte gMenu
.syntax divided .syntax divided

4
asm/non_matching/game/sub_08052418.inc
View File

@ -6,7 +6,7 @@
ldr r0, _08052494 @ =gBG1Buffer ldr r0, _08052494 @ =gBG1Buffer
movs r1, #0x80 movs r1, #0x80
lsls r1, r1, #4 lsls r1, r1, #4
bl MemClear32 bl MemClear
ldr r0, _08052498 @ =gUnk_020227E8 ldr r0, _08052498 @ =gUnk_020227E8
movs r1, #0xf movs r1, #0xf
str r1, [r0] str r1, [r0]
@ -63,4 +63,4 @@ _08052498: .4byte gUnk_020227E8
_0805249C: .4byte gUnk_080FCA8C _0805249C: .4byte gUnk_080FCA8C
_080524A0: .4byte gUnk_080FCAA4 _080524A0: .4byte gUnk_080FCAA4
_080524A4: .4byte gScreen _080524A4: .4byte gScreen
.syntax divided .syntax divided

2
asm/non_matching/gibdo/sub_080376D0.inc
View File

@ -54,4 +54,4 @@ _0803772C:
_0803773A: _0803773A:
pop {r4, pc} pop {r4, pc}
.syntax divided .syntax divided

2
asm/non_matching/gibdo/sub_08037810.inc
View File

@ -83,4 +83,4 @@ _080378AC:
_080378AE: _080378AE:
pop {r4, r5, r6, pc} pop {r4, r5, r6, pc}
.syntax divided .syntax divided

2
asm/non_matching/gibdo/sub_0803797C.inc
View File

@ -36,4 +36,4 @@
_080379BA: _080379BA:
pop {r4, r5, pc} pop {r4, r5, pc}
.syntax divided .syntax divided

2
asm/non_matching/save/sub_08050B3C.inc
View File

@ -122,4 +122,4 @@ _08050C1C: .4byte 0x0000F24C
_08050C20: .4byte 0x040000D4 _08050C20: .4byte 0x040000D4
_08050C24: .4byte gUnk_080FC914 _08050C24: .4byte gUnk_080FC914
_08050C28: .4byte 0xFFFFF24D _08050C28: .4byte 0xFFFFF24D
.syntax divided .syntax divided

2
asm/non_matching/sub_080560B8.inc
View File

@ -54,7 +54,7 @@ _08056112:
ldr r4, _0805612C @ =gUnk_02000010 ldr r4, _0805612C @ =gUnk_02000010
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0x20 movs r1, #0x20
bl MemClear32 bl MemClear
ldr r0, _08056130 @ =0x4D435A33 ldr r0, _08056130 @ =0x4D435A33
str r0, [r4] str r0, [r4]
_08056124: _08056124:

8
asm/non_matching/textbox/sub_080564EC.inc
View File

@ -2,14 +2,14 @@
push {r4, lr} push {r4, lr}
ldr r0, _08056598 @ =gUnk_02036A40 ldr r0, _08056598 @ =gUnk_02036A40
movs r1, #8 movs r1, #8
bl MemClear32 bl MemClear
ldr r0, _0805659C @ =gUnk_02024030 ldr r0, _0805659C @ =gUnk_02024030
movs r1, #0x18 movs r1, #0x18
bl MemClear32 bl MemClear
ldr r4, _080565A0 @ =gUnk_02022780 ldr r4, _080565A0 @ =gUnk_02022780
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0xa8 movs r1, #0xa8
bl MemClear32 bl MemClear
ldr r0, _080565A4 @ =gTextBox ldr r0, _080565A4 @ =gTextBox
adds r1, r4, #0 adds r1, r4, #0
movs r2, #0x20 movs r2, #0x20
@ -87,4 +87,4 @@ _080565A4: .4byte gTextBox
_080565A8: .4byte gSave _080565A8: .4byte gSave
_080565AC: .4byte gUnk_08107BE0 _080565AC: .4byte gUnk_08107BE0
_080565B0: .4byte gUnk_02000D00 _080565B0: .4byte gUnk_02000D00
.syntax divided .syntax divided

2
asm/object3D.s
View File

@ -170,7 +170,7 @@ sub_0808D030: @ 0x0808D030
adds r0, r4, #0 adds r0, r4, #0
subs r0, #0x20 subs r0, #0x20
ldr r1, _0808D05C @ =0x00000B74 ldr r1, _0808D05C @ =0x00000B74
bl MemClear32 bl MemClear
movs r1, #0xa8 movs r1, #0xa8
lsls r1, r1, #2 lsls r1, r1, #2
adds r0, r1, #0 adds r0, r1, #0

8
include/createObject.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef CREATEOBJECT_H
#define CREATEOBJECT_H
// maybe a dedicated (create)Effect.h/c
void CreateDust(Entity* parent);
void CreateDustSmall(Entity* parent);
#endif // CREATEOBJECT_H

9
include/dma.h Normal file
View File

@ -0,0 +1,9 @@
#ifndef DMA_H
#define DMA_H
void MemFill16(u32 value, void* dest, u32 size);
void MemFill32(u32 value, void* dest, u32 size);
void MemClear(void* dest, u32 size);
void MemCopy(const void* src, void* dest, u32 size);
#endif // DMA_H

2
include/enemy.h
View File

@ -89,7 +89,6 @@ extern void VaatiWrath(Entity*);
extern void VaatiArm(Entity*); extern void VaatiArm(Entity*);
extern void Dust(Entity*); extern void Dust(Entity*);
extern void VaatiBall(Entity*); extern void VaatiBall(Entity*);
extern void Octorok(Entity*);
extern void Slime(Entity*); extern void Slime(Entity*);
extern void MiniSlime(Entity*); extern void MiniSlime(Entity*);
extern void FireballGuy(Entity*); extern void FireballGuy(Entity*);
@ -110,6 +109,5 @@ extern void Enemy66(Entity*);
extern u32 GetNextFunction(Entity*); extern u32 GetNextFunction(Entity*);
extern void EnemyFunctionHandler(Entity*, void (*const func[])(Entity*)); extern void EnemyFunctionHandler(Entity*, void (*const func[])(Entity*));
extern void sub_0804AA30(Entity*, void (*const func[])(Entity*));
extern void sub_08001324(Entity*); extern void sub_08001324(Entity*);
#endif #endif

25
include/entity.h
View File

@ -166,15 +166,16 @@ extern LinkedList gUnk_03003D90;
extern LinkedList gUnk_03003DA0; extern LinkedList gUnk_03003DA0;
#define TILE(x, y) \ #define TILE(x, y) \
((((x - gRoomControls.roomOriginX) >> 4) & 0x3fU) | \ (((((x) - gRoomControls.roomOriginX) >> 4) & 0x3fU) | \
(((y - gRoomControls.roomOriginY) >> 4) & 0x3fU) << 6) ((((y) - gRoomControls.roomOriginY) >> 4) & 0x3fU) << 6)
#define COORD_TO_TILE(entity) \ #define COORD_TO_TILE(entity) \
TILE(entity->x.HALF.HI, entity->y.HALF.HI) TILE((entity)->x.HALF.HI, (entity)->y.HALF.HI)
#define COORD_TO_TILE_OFFSET(entity, xOff, yOff) \ #define COORD_TO_TILE_OFFSET(entity, xOff, yOff) \
TILE(entity->x.HALF.HI - xOff, entity->y.HALF.HI - yOff) TILE((entity)->x.HALF.HI - (xOff), (entity)->y.HALF.HI - (yOff))
Entity* GetEmptyEntity(void);
extern Entity* CreateEnemy(u32 subtype, u32 form); extern Entity* CreateEnemy(u32 subtype, u32 form);
extern Entity* CreateObject(u32 subtype, u32 form, u32 parameter); extern Entity* CreateObject(u32 subtype, u32 form, u32 parameter);
extern Entity* CreateNPC(u32 subtype, u32 form, u32 parameter); extern Entity* CreateNPC(u32 subtype, u32 form, u32 parameter);
@ -193,10 +194,14 @@ extern void SetSpriteSubEntryOffsetData2(Entity*, u32, u32);
extern u32 GetFacingDirection(Entity*, Entity*); extern u32 GetFacingDirection(Entity*, Entity*);
extern void DeleteThisEntity(void); void DeleteThisEntity(void);
extern void CopyPosition(Entity*, Entity*); void DeleteEntity(Entity*);
extern void DeleteEntity(Entity*);
extern void PositionRelative(Entity*, Entity*, s32, s32); void AppendEntityToList(Entity* entity, u32 listIndex);
void PrependEntityToList(Entity* entity, int listIndex);
Entity* FindEntityInListBySubtype(u32 type, u32 subtype, u32 listIndex);
Entity* FindEntityInListByForm(u32 type, u32 subtype, u32 listIndex, u32 form, u32 parameter);
enum { enum {
DirectionNorth = 0x00, DirectionNorth = 0x00,
@ -211,12 +216,12 @@ enum {
#define DirectionIsVertical(expr) ((expr) & 0x10) #define DirectionIsVertical(expr) ((expr) & 0x10)
#define DirectionTurnAround(expr) (DirectionRoundUp(expr) ^ 0x10) #define DirectionTurnAround(expr) (DirectionRoundUp(expr) ^ 0x10)
#define DirectionToAnimationState(expr) (DirectionRoundUp(expr) >> 3) #define DirectionToAnimationState(expr) (DirectionRoundUp(expr) >> 3)
#define DirectionFromAnimationState(expr) (expr << 3) #define DirectionFromAnimationState(expr) ((expr) << 3)
#define Direction8Round(expr) ((expr) & 0x1c) #define Direction8Round(expr) ((expr) & 0x1c)
#define Direction8RoundUp(expr) Direction8Round((expr) + 2) #define Direction8RoundUp(expr) Direction8Round((expr) + 2)
#define Direction8TurnAround(expr) (Direction8RoundUp(expr) ^ 0x10) #define Direction8TurnAround(expr) (Direction8RoundUp(expr) ^ 0x10)
#define Direction8ToAnimationState(expr) (Direction8RoundUp(expr) >> 2) #define Direction8ToAnimationState(expr) (Direction8RoundUp(expr) >> 2)
#define Direction8FromAnimationState(expr) (expr << 2) #define Direction8FromAnimationState(expr) (((expr) << 2)
#endif #endif

6
include/fileScreen.h
View File

@ -2,12 +2,6 @@
#define FILESELECT_H #define FILESELECT_H
#include "global.h" #include "global.h"
#include "functions.h"
#include "main.h"
#include "player.h"
#include "readKeyInput.h"
#include "screen.h"
#include "menu.h"
#include "save.h" #include "save.h"
typedef struct { typedef struct {

36
include/functions.h
View File

@ -7,70 +7,49 @@
#include "manager.h" #include "manager.h"
#include "position.h" #include "position.h"
#include "player.h" #include "player.h"
#include "structures.h"
#include "room.h" #include "room.h"
#include "structures.h"
// Identified - to be sorted into header files // Identified - to be sorted into header files
extern u32 Random(void);
extern void SoundReq(u32); extern void SoundReq(u32);
extern void ShowNPCDialogue(Entity*, Dialog*); extern void ShowNPCDialogue(Entity*, Dialog*);
extern u32 UpdateFuseInteraction();
extern void DeleteEntity(Entity*);
extern u32 __modsi3(u32, u32); extern u32 __modsi3(u32, u32);
extern void DoFade(u32, u32); extern void DoFade(u32, u32);
extern u32 GetInventoryValue(u32);
extern u32 CheckKinstoneFused(u32); extern u32 CheckKinstoneFused(u32);
extern void ForceEquipItem(u32, u8); extern void ForceEquipItem(u32, u8);
extern void LoadRoomEntityList(); extern void LoadRoomEntityList(EntityData* listPtr);
void CopyPosition(Entity*, Entity*);
extern void ResolveEntityOnTop(Entity*, Entity*);
extern void EnemyFunctionHandler(Entity*, void (*const funcs[])(Entity*));
extern u32 GetAnimationState(Entity*); extern u32 GetAnimationState(Entity*);
extern void SetChildOffset(Entity*, s32, s32, s32); extern void SetChildOffset(Entity*, s32, s32, s32);
extern u32 GetFacingDirection(Entity*, Entity*);
extern Entity* CreatePlayerItem(u32, u32, u32, u32); extern Entity* CreatePlayerItem(u32, u32, u32, u32);
extern Entity* GetEmptyEntity(void);
extern u32 GetTileTypeByPos(s32 x, s32 y, u32 layer); extern u32 GetTileTypeByPos(s32 x, s32 y, u32 layer);
extern u32 GetTileType(u32 pos, u32 layer); extern u32 GetTileType(u32 pos, u32 layer);
extern void MemClear32(void* src, u32 count);
extern void EraseAllEntities(void); extern void EraseAllEntities(void);
extern void SetTile(u32, u32, u32); extern void SetTile(u32, u32, u32);
extern void SetDirtTile(u32); extern void SetDirtTile(u32);
extern void LoadRoomTileEntities(); // tba extern void LoadRoomTileEntities(); // tba
extern Entity* CreateDeathFx(Entity*, u32, u32); extern Entity* CreateDeathFx(Entity*, u32, u32);
extern void UpdateAnimationVariableFrames(Entity*, u32); extern void UpdateAnimationVariableFrames(Entity*, u32);
extern void CopyPositionAndSpriteOffset(Entity*, Entity*);
extern u8* GetSpriteSubEntryOffsetDataPointer(u32, u32); extern u8* GetSpriteSubEntryOffsetDataPointer(u32, u32);
extern u32 LoadFixedGFX(Entity*, u32); extern u32 LoadFixedGFX(Entity*, u32);
extern void MemFill32(u32, void*, u32);
extern Entity* CreateItemEntity(u32, u32, u32); extern Entity* CreateItemEntity(u32, u32, u32);
void MemCopy(const void* src, void* dst, u32 size);
extern u32 ProcessMovement(Entity*); extern u32 ProcessMovement(Entity*);
extern Entity* FindEntityInListBySubtype(u32, u32, u32);
extern Entity* FindEntityInListByForm(u32, u32, u32, u32, u32);
extern void MemClear32(void*, u32);
extern void MenuFadeIn(u32, u32); extern void MenuFadeIn(u32, u32);
extern void LoadResourceAsync(const void*, u32, u32); extern void LoadResourceAsync(const void*, u32, u32);
extern void LoadPaletteGroup(u32); extern void LoadPaletteGroup(u32);
extern void TryLoadPrologueHyruleTown(void); extern void TryLoadPrologueHyruleTown(void);
extern Manager* GetEmptyManager(void); extern Manager* GetEmptyManager(void);
extern void AppendEntityToList(void*, u32);
extern void LoadGfxGroup(u32); extern void LoadGfxGroup(u32);
extern void EnqueueSFX(u32); extern void EnqueueSFX(u32);
extern void ResetPlayer(void); extern void ResetPlayer(void);
extern void CreateDust(Entity*);
extern u32 IsItemEquipped(u32); extern u32 IsItemEquipped(u32);
extern void DeleteManager(Manager*); extern void DeleteManager(Manager*);
extern bool32 CheckPlayerInRegion(u32 centerX, u32 centerY, u32 radiusX, u32 radiusY); extern bool32 CheckPlayerInRegion(u32 centerX, u32 centerY, u32 radiusX, u32 radiusY);
extern u32 CheckIsDungeon(void);
extern u32 GetTileTypeByEntity(Entity*); extern u32 GetTileTypeByEntity(Entity*);
// Unidentified // Unidentified
extern u32 sub_0806ED78(Entity*); extern u32 sub_0806ED78(Entity*);
extern void sub_0806920C(Entity*);
extern u32 sub_0805ACC0(Entity*); extern u32 sub_0805ACC0(Entity*);
extern u32 sub_0801E99C(Entity*); extern u32 sub_0801E99C(Entity*);
extern void sub_0806924C(Entity*);
extern Entity* sub_080873AC(Entity*, u32, u32); extern Entity* sub_080873AC(Entity*, u32, u32);
extern void sub_08078778(Entity*); extern void sub_08078778(Entity*);
extern void sub_080787A8(Entity*, u32); extern void sub_080787A8(Entity*, u32);
@ -78,7 +57,6 @@ extern void sub_0806F118(Entity*);
extern void sub_080791D0(); extern void sub_080791D0();
extern void sub_0805EC9C(); extern void sub_0805EC9C();
extern void sub_0805EC60(); extern void sub_0805EC60();
extern void sub_080873D0();
extern u32 sub_080045D4(s16, s16, u32, u32); extern u32 sub_080045D4(s16, s16, u32, u32);
extern void sub_0806F69C(Entity*); extern void sub_0806F69C(Entity*);
extern void sub_0805E3A0(void*, u32); extern void sub_0805E3A0(void*, u32);
@ -91,16 +69,11 @@ extern void sub_0807000C(Entity*);
extern void sub_0805E47C(Entity*); extern void sub_0805E47C(Entity*);
extern void sub_0805E584(Entity*); extern void sub_0805E584(Entity*);
extern void sub_08068BEC(Entity*, u32); extern void sub_08068BEC(Entity*, u32);
extern void sub_08078778(Entity*);
extern s32 sub_0806ED9C(Entity*, u32, u32);
extern s32 sub_0806F078(Entity*, s32); extern s32 sub_0806F078(Entity*, s32);
extern void sub_0801D2B4(Entity*, u32); extern void sub_0801D2B4(Entity*, u32);
extern void sub_0806FD3C(Entity*); extern void sub_0806FD3C(Entity*);
extern u32 sub_0801E99C(Entity*);
extern void sub_0806F118(Entity*);
extern void sub_0805ED14(u32*); extern void sub_0805ED14(u32*);
extern void sub_080A7C18(u32, u32, u32); extern void sub_080A7C18(u32, u32, u32);
extern void sub_08068BEC(Entity*, u32);
extern void sub_0804AA30(Entity*, void (*const funcs[])(Entity*)); extern void sub_0804AA30(Entity*, void (*const funcs[])(Entity*));
extern Entity* sub_0804A9FC(Entity*, u32); extern Entity* sub_0804A9FC(Entity*, u32);
extern void sub_0804A720(Entity*); extern void sub_0804A720(Entity*);
@ -155,8 +128,6 @@ extern void sub_080530C8(void);
extern void sub_0805B4D0(u32); extern void sub_0805B4D0(u32);
extern void sub_0804D0B4(void); extern void sub_0804D0B4(void);
extern void sub_0805308C(u32); extern void sub_0805308C(u32);
extern void sub_0805AF60();
extern void sub_0805D3C8(u32);
extern void sub_080534AC(); extern void sub_080534AC();
extern void sub_0807BA8C(u32, u32); extern void sub_0807BA8C(u32, u32);
extern void sub_0804D9B0(); extern void sub_0804D9B0();
@ -170,7 +141,6 @@ extern void sub_08054564();
extern void sub_0801DD58(u32, u32); extern void sub_0801DD58(u32, u32);
extern void sub_0804ED18(); extern void sub_0804ED18();
extern void sub_080AF2E4(void); extern void sub_080AF2E4(void);
extern void sub_0805ADD8(u32);
extern void sub_0804F578(void); extern void sub_0804F578(void);
extern void sub_08059994(void); extern void sub_08059994(void);
extern s32 sub_0801CFA8(u32); extern s32 sub_0801CFA8(u32);
@ -262,7 +232,6 @@ u32 sub_0806FCB8(Entity*, u32, u32, u32);
extern Entity* sub_080A7EE0(u32); extern Entity* sub_080A7EE0(u32);
extern void sub_080A1D70(Entity*, u32); extern void sub_080A1D70(Entity*, u32);
extern void sub_0806F62C(Entity*, u32, u32); extern void sub_0806F62C(Entity*, u32, u32);
extern u32 sub_08079F8C(void);
extern void sub_080A1ED0(u32, u32, u32); extern void sub_080A1ED0(u32, u32, u32);
extern u32 sub_0806F5B0(u32); extern u32 sub_0806F5B0(u32);
extern void sub_0801DFB4(Entity*, u32, u32, u32); extern void sub_0801DFB4(Entity*, u32, u32, u32);
@ -288,7 +257,6 @@ extern void sub_080791BC9();
extern void sub_080791BC(); extern void sub_080791BC();
extern void sub_08056360(); extern void sub_08056360();
extern u32 sub_080542AC(u32); extern u32 sub_080542AC(u32);
extern void sub_0807A108();
extern u32 sub_08079FC4(u32); extern u32 sub_08079FC4(u32);
extern void sub_0800455E(Entity*); extern void sub_0800455E(Entity*);
extern void sub_08008790(Entity*, u32); extern void sub_08008790(Entity*, u32);

6
include/game.h Normal file
View File

@ -0,0 +1,6 @@
#ifndef GAME_H
#define GAME_H
u32 CheckIsDungeon(void);
#endif // GAME_H

20
include/gba/macro.h
View File

@ -1,16 +1,16 @@
#ifndef GUARD_GBA_MACRO_H #ifndef GUARD_GBA_MACRO_H
#define GUARD_GBA_MACRO_H #define GUARD_GBA_MACRO_H
#define CPU_FILL(value, dest, size, bit) \ #define CPU_FILL(value, dest, size, bit) \
{ \ { \
vu##bit tmp = (vu##bit)(value); \ vu##bit tmp = (vu##bit)(value); \
CpuSet((void*)&tmp, dest, CPU_SET_##bit##BIT | CPU_SET_SRC_FIXED | ((size) / (bit / 8) & 0x1FFFFF)); \ CpuSet((void*)&tmp, dest, CPU_SET_##bit##BIT | CPU_SET_SRC_FIXED | ((size) / ((bit) / 8) & 0x1FFFFF)); \
} }
#define CpuFill16(value, dest, size) CPU_FILL(value, dest, size, 16) #define CpuFill16(value, dest, size) CPU_FILL(value, dest, size, 16)
#define CpuFill32(value, dest, size) CPU_FILL(value, dest, size, 32) #define CpuFill32(value, dest, size) CPU_FILL(value, dest, size, 32)
#define CPU_COPY(src, dest, size, bit) CpuSet(src, dest, CPU_SET_##bit##BIT | ((size) / (bit / 8) & 0x1FFFFF)) #define CPU_COPY(src, dest, size, bit) CpuSet(src, dest, CPU_SET_##bit##BIT | ((size) / ((bit) / 8) & 0x1FFFFF))
#define CpuCopy16(src, dest, size) CPU_COPY(src, dest, size, 16) #define CpuCopy16(src, dest, size) CPU_COPY(src, dest, size, 16)
#define CpuCopy32(src, dest, size) CPU_COPY(src, dest, size, 32) #define CpuCopy32(src, dest, size) CPU_COPY(src, dest, size, 32)
@ -42,7 +42,7 @@
vu##bit tmp = (vu##bit)(value); \ vu##bit tmp = (vu##bit)(value); \
DmaSet(dmaNum, &tmp, dest, \ DmaSet(dmaNum, &tmp, dest, \
(DMA_ENABLE | DMA_START_NOW | DMA_##bit##BIT | DMA_SRC_FIXED | DMA_DEST_INC) << 16 | \ (DMA_ENABLE | DMA_START_NOW | DMA_##bit##BIT | DMA_SRC_FIXED | DMA_DEST_INC) << 16 | \
((size) / (bit / 8))); \ ((size) / ((bit) / 8))); \
} }
#define DmaFill16(dmaNum, value, dest, size) DMA_FILL(dmaNum, value, dest, size, 16) #define DmaFill16(dmaNum, value, dest, size) DMA_FILL(dmaNum, value, dest, size, 16)
@ -65,7 +65,7 @@
#define DMA_COPY(dmaNum, src, dest, size, bit) \ #define DMA_COPY(dmaNum, src, dest, size, bit) \
DmaSet(dmaNum, src, dest, \ DmaSet(dmaNum, src, dest, \
(DMA_ENABLE | DMA_START_NOW | DMA_##bit##BIT | DMA_SRC_INC | DMA_DEST_INC) << 16 | ((size) / (bit / 8))) (DMA_ENABLE | DMA_START_NOW | DMA_##bit##BIT | DMA_SRC_INC | DMA_DEST_INC) << 16 | ((size) / ((bit) / 8)))
#define DmaCopy16(dmaNum, src, dest, size) DMA_COPY(dmaNum, src, dest, size, 16) #define DmaCopy16(dmaNum, src, dest, size) DMA_COPY(dmaNum, src, dest, size, 16)
#define DmaCopy32(dmaNum, src, dest, size) DMA_COPY(dmaNum, src, dest, size, 32) #define DmaCopy32(dmaNum, src, dest, size) DMA_COPY(dmaNum, src, dest, size, 32)
@ -112,7 +112,7 @@
#define DmaFillLarge(dmaNum, value, dest, size, block, bit) \ #define DmaFillLarge(dmaNum, value, dest, size, block, bit) \
{ \ { \
void* _dest = (void*)dest; \ void* _dest = (void*)(dest); \
u32 _size = size; \ u32 _size = size; \
while (1) { \ while (1) { \
DmaFill##bit(dmaNum, value, _dest, (block)); \ DmaFill##bit(dmaNum, value, _dest, (block)); \
@ -149,7 +149,7 @@
#define DmaFillDefvars(dmaNum, value, dest, size, bit) \ #define DmaFillDefvars(dmaNum, value, dest, size, bit) \
{ \ { \
void* _dest = (void*)dest; \ void* _dest = (void*)(dest); \
u32 _size = size; \ u32 _size = size; \
DmaFill##bit(dmaNum, value, _dest, _size); \ DmaFill##bit(dmaNum, value, _dest, _size); \
} }
@ -180,7 +180,7 @@
\ \
imeTemp = REG_IME; \ imeTemp = REG_IME; \
REG_IME = 0; \ REG_IME = 0; \
REG_IE |= flags; \ REG_IE |= (flags); \
REG_IME = imeTemp; \ REG_IME = imeTemp; \
} }

8
include/global.h
View File

@ -31,9 +31,9 @@
#define SWAP(a, b, temp) \ #define SWAP(a, b, temp) \
{ \ { \
temp = a; \ (temp) = a; \
a = b; \ (a) = b; \
b = temp; \ (b) = temp; \
} }
// useful math macros // useful math macros
@ -47,7 +47,7 @@
#define min(a, b) ((a) < (b) ? (a) : (b)) #define min(a, b) ((a) < (b) ? (a) : (b))
#define max(a, b) ((a) >= (b) ? (a) : (b)) #define max(a, b) ((a) >= (b) ? (a) : (b))
#define BOOLCAST(x) ((-x | x) >> 31) #define BOOLCAST(x) ((-(x) | (x)) >> 31)
#define static_assert(cond) extern char assertion[(cond) ? 1 : -1] #define static_assert(cond) extern char assertion[(cond) ? 1 : -1]
#if NON_MATCHING #if NON_MATCHING

25
include/greatFairy.h
View File

@ -3,23 +3,9 @@
#include "screen.h" #include "screen.h"
extern u32 __modsi3(u32, u32); void GreatFairy_InitializeAnimation(Entity*);
extern void InitializeAnimation(Entity*, u32); Entity* GreatFairy_CreateForm(Entity*, u32, u32);
extern void GreatFairy_InitializeAnimation(Entity*); void sub_080873D0();
extern u32 CheckRoomFlag();
extern Entity* GreatFairy_CreateForm(Entity*, u32, u32);
extern void PositionRelative();
extern void CopyPosition();
extern void DoFade();
extern void SoundReq();
extern void GetNextFrame();
extern void sub_0805EC9C();
extern void sub_0805EC60();
extern void sub_080873D0();
extern void DeleteEntity();
extern void sub_0806F69C();
extern Entity* FindEntityInListBySubtype(u32, u32, u32);
extern void sub_080791D0();
extern void (*const GreatFairy_Main[])(Entity*); extern void (*const GreatFairy_Main[])(Entity*);
extern void (*const GreatFairy_Behaviors[])(Entity*); extern void (*const GreatFairy_Behaviors[])(Entity*);
extern void (*const GreatFairy_WingsBehaviors[])(Entity*); extern void (*const GreatFairy_WingsBehaviors[])(Entity*);
@ -35,13 +21,8 @@ extern void (*const GreatFairy_Form2Behaviors[])(Entity*);
extern void (*const gUnk_081207A4[])(Entity*); extern void (*const gUnk_081207A4[])(Entity*);
extern u32 gUnk_0810C2E4; extern u32 gUnk_0810C2E4;
extern RoomControls gRoomControls;
extern Entity gPlayerEntity;
extern const s16 GreatFairy_RippleOffsets[10]; extern const s16 GreatFairy_RippleOffsets[10];
extern u32 gUnk_02034350; extern u32 gUnk_02034350;
extern RoomVars gRoomVars;
extern Screen gScreen;
extern struct_02033280 gActiveScriptInfo;
extern u8 gUnk_0812079C[8]; extern u8 gUnk_0812079C[8];
extern s16 gSineTable[]; extern s16 gSineTable[];
extern s8 gUnk_081207AC[]; extern s8 gUnk_081207AC[];

17
include/item.h
View File

@ -7,36 +7,19 @@
extern void DebugItem(ItemBehavior*, u32); extern void DebugItem(ItemBehavior*, u32);
extern void Sword(ItemBehavior*, u32); extern void Sword(ItemBehavior*, u32);
extern void Sword(ItemBehavior*, u32);
extern void Sword(ItemBehavior*, u32);
extern void Sword(ItemBehavior*, u32);
extern void Sword(ItemBehavior*, u32);
extern void Sword(ItemBehavior*, u32);
extern void Bomb(ItemBehavior*, u32);
extern void Bomb(ItemBehavior*, u32); extern void Bomb(ItemBehavior*, u32);
extern void Bow(ItemBehavior*, u32); extern void Bow(ItemBehavior*, u32);
extern void Bow(ItemBehavior*, u32);
extern void sub_08075D14(ItemBehavior*, u32);
extern void sub_08075D14(ItemBehavior*, u32); extern void sub_08075D14(ItemBehavior*, u32);
extern void Shield(ItemBehavior*, u32); extern void Shield(ItemBehavior*, u32);
extern void Shield(ItemBehavior*, u32);
extern void Lantern(ItemBehavior*, u32);
extern void Lantern(ItemBehavior*, u32); extern void Lantern(ItemBehavior*, u32);
extern void GustJar(ItemBehavior*, u32); extern void GustJar(ItemBehavior*, u32);
extern void PacciCane(ItemBehavior*, u32); extern void PacciCane(ItemBehavior*, u32);
extern void MoleMitts(ItemBehavior*, u32); extern void MoleMitts(ItemBehavior*, u32);
extern void RocsCape(ItemBehavior*, u32); extern void RocsCape(ItemBehavior*, u32);
extern void sub_08076800(ItemBehavior*, u32); extern void sub_08076800(ItemBehavior*, u32);
extern void DebugItem(ItemBehavior*, u32);
extern void Ocarina(ItemBehavior*, u32); extern void Ocarina(ItemBehavior*, u32);
extern void DebugItem(ItemBehavior*, u32);
extern void DebugItem(ItemBehavior*, u32);
extern void DebugItem(ItemBehavior*, u32);
extern void TryPickupObject(ItemBehavior*, u32); extern void TryPickupObject(ItemBehavior*, u32);
extern void JarEmpty(ItemBehavior*, u32); extern void JarEmpty(ItemBehavior*, u32);
extern void JarEmpty(ItemBehavior*, u32);
extern void JarEmpty(ItemBehavior*, u32);
extern void JarEmpty(ItemBehavior*, u32);
/* On hold until naming conflicts are resolved */ /* On hold until naming conflicts are resolved */
/* /*

4
include/npc.h
View File

@ -42,10 +42,6 @@ extern void SittingPerson_Head(Entity*);
extern void SittingPerson_Fusion(Entity*); extern void SittingPerson_Fusion(Entity*);
extern void Pina(Entity*); extern void Pina(Entity*);
extern void Pina_Fusion(Entity*); extern void Pina_Fusion(Entity*);
extern void Guard(Entity*);
extern void Guard_Head(Entity*);
extern void Maid(Entity*);
extern void Maid_Head(Entity*);
extern void Din(Entity*); extern void Din(Entity*);
extern void Din_Fusion(Entity*); extern void Din_Fusion(Entity*);
extern void Nayru(Entity*); extern void Nayru(Entity*);

1
include/position.h
View File

@ -7,6 +7,7 @@
void CopyPosition(Entity*, Entity*); void CopyPosition(Entity*, Entity*);
void PositionEntityOnTop(Entity*, Entity*); void PositionEntityOnTop(Entity*, Entity*);
void PositionRelative(Entity*, Entity*, s32, s32); void PositionRelative(Entity*, Entity*, s32, s32);
void CopyPositionAndSpriteOffset(Entity* param_1, Entity* param_2);
void sub_0806FA90(Entity*, Entity*, s32, s32); void sub_0806FA90(Entity*, Entity*, s32, s32);
void ResolveEntityOnTop(Entity*, Entity*); void ResolveEntityOnTop(Entity*, Entity*);
void sub_0806FAD8(Entity*, Entity*); void sub_0806FAD8(Entity*, Entity*);

3
include/structures.h
View File

@ -39,8 +39,7 @@ typedef struct {
u8 field_0x4[0x4]; u8 field_0x4[0x4];
bool8 transitioningOut; bool8 transitioningOut;
u8 transitionType; // transition when changing areas u8 transitionType; // transition when changing areas
u8 field_0xa; // seems to be a tile type u16 field_0xa; // seems to be a tile type
u8 field_0xb;
u8 areaID; u8 areaID;
u8 roomID; u8 roomID;
u8 playerState; u8 playerState;

5
src/arm_proxy.c
View File

@ -8,6 +8,7 @@
#include "functions.h" #include "functions.h"
#include "object.h" #include "object.h"
#include "manager.h" #include "manager.h"
#include "dma.h"
#include "npc.h" #include "npc.h"
extern u8 gUnk_03003DE0; extern u8 gUnk_03003DE0;
@ -252,7 +253,7 @@ void sub_080171F0(void) {
gPlayerState.field_0x1a[0] = 0; gPlayerState.field_0x1a[0] = 0;
gPlayerState.field_0x80 = 0; gPlayerState.field_0x80 = 0;
gPlayerState.field_0xaa = 0; gPlayerState.field_0xaa = 0;
MemClear32(&gUnk_03003BE0, 0x8c); MemClear(&gUnk_03003BE0, 0x8c);
gPlayerEntity.spriteOffsetY = gPlayerState.field_0x3f; gPlayerEntity.spriteOffsetY = gPlayerState.field_0x3f;
gPlayerState.field_0x3f = 0; gPlayerState.field_0x3f = 0;
sub_0807B0C8(); sub_0807B0C8();
@ -392,7 +393,7 @@ void CollisionMain(void) {
} }
void RegisterPlayerHitbox(void) { void RegisterPlayerHitbox(void) {
MemClear32(&gUnk_03003C70, sizeof(gUnk_03003C70)); MemClear(&gUnk_03003C70, sizeof(gUnk_03003C70));
gUnk_02018EA0 = (LinkedList2*)&gUnk_03003C70[0].last; gUnk_02018EA0 = (LinkedList2*)&gUnk_03003C70[0].last;
gUnk_03003C70[0].last = &gUnk_03003C70[0].last; gUnk_03003C70[0].last = &gUnk_03003C70[0].last;
gUnk_03003C70[0].first = &gUnk_03003C70[0].last; gUnk_03003C70[0].first = &gUnk_03003C70[0].last;

1
src/code_08018C58.c
View File

@ -1,5 +1,4 @@
#include "global.h" #include "global.h"
#include "entity.h"
extern u32 SetTileType(u32 tileID, u32 tilePos, u32 layerID); extern u32 SetTileType(u32 tileID, u32 tilePos, u32 layerID);

8
src/code_080300AC.c
View File

@ -1,9 +1,7 @@
#include "global.h" #include "global.h"
#include "entity.h" #include "dma.h"
#include "functions.h" #include "functions.h"
// extern void DmaZero(void*, u32);
typedef struct { typedef struct {
u16 unk0; u16 unk0;
u16 filler2[32]; u16 filler2[32];
@ -13,13 +11,13 @@ typedef struct {
extern struct_0300110C gUnk_0300110C; extern struct_0300110C gUnk_0300110C;
void sub_080300AC(void) { void sub_080300AC(void) {
MemClear32(&gUnk_0300110C.unk0, 0x44); MemClear(&gUnk_0300110C.unk0, 0x44);
gUnk_0300110C.unk66 = 0xff; gUnk_0300110C.unk66 = 0xff;
} }
void sub_080300C4(void) { void sub_080300C4(void) {
if (gScreenTransition.field_0xae == 0xff) { if (gScreenTransition.field_0xae == 0xff) {
gScreenTransition.field_0xac = 0; gScreenTransition.field_0xac = 0;
MemClear32(&gScreenTransition.field_0x4c[32], 0x40); MemClear(&gScreenTransition.field_0x4c[32], 0x40);
} }
} }

5
src/code_0804AA84.c
View File

@ -2,6 +2,7 @@
#include "entity.h" #include "entity.h"
#include "area.h" #include "area.h"
#include "main.h" #include "main.h"
#include "dma.h"
#include "functions.h" #include "functions.h"
#include "screen.h" #include "screen.h"
@ -10,8 +11,6 @@ typedef struct {
u32 unk; u32 unk;
} struct_02018EB0; } struct_02018EB0;
extern void sub_0805E5A8();
extern void (*const gUnk_080D4120[])(); extern void (*const gUnk_080D4120[])();
extern void (*const gUnk_080D412C[])(); extern void (*const gUnk_080D412C[])();
@ -37,7 +36,7 @@ void sub_0804AAB8(void) {
} }
void sub_0804AAD4(void) { void sub_0804AAD4(void) {
MemClear32((void*)&gUnk_02018EB0, 0x28); MemClear(&gUnk_02018EB0, 0x28);
gUnk_02018EB0.unk = 0; gUnk_02018EB0.unk = 0;
EraseAllEntities(); EraseAllEntities();
CreateObject(0x3d, gArea.curPortalType, 0); CreateObject(0x3d, gArea.curPortalType, 0);

1
src/code_0805436C.c
View File

@ -1,5 +1,4 @@
#include "global.h" #include "global.h"
#include "entity.h"
#include "player.h" #include "player.h"
#include "room.h" #include "room.h"
#include "menu.h" #include "menu.h"

3
src/code_0805F9A0.c
View File

@ -1,6 +1,7 @@
#include "global.h" #include "global.h"
#include "functions.h" #include "dma.h"
#include "structures.h" #include "structures.h"
#include "functions.h"
extern u16 gUnk_081092D4; extern u16 gUnk_081092D4;
extern u8 gUnk_02036AD8; extern u8 gUnk_02036AD8;

3
src/code_08077DF4.c
View File

@ -1,6 +1,7 @@
#include "global.h" #include "global.h"
#include "entity.h" #include "entity.h"
#include "player.h" #include "player.h"
#include "dma.h"
#include "functions.h" #include "functions.h"
typedef struct { typedef struct {
@ -57,7 +58,7 @@ void sub_08077E78(void* arg0, u32 bits) {
not = ~not ; not = ~not ;
gPlayerState.field_0xa &= not ; gPlayerState.field_0xa &= not ;
gPlayerState.keepFacing &= not ; gPlayerState.keepFacing &= not ;
MemClear32(arg0, 0x1c); MemClear(arg0, 0x1c);
} }
u32 sub_08077EC8(Unk_struct* arg0) { u32 sub_08077EC8(Unk_struct* arg0) {

3
src/code_0808091C.c
View File

@ -4,16 +4,13 @@
#include "functions.h" #include "functions.h"
#include "room.h" #include "room.h"
extern void sub_0805E5A8();
extern void sub_08080BC4(void); extern void sub_08080BC4(void);
extern RoomControls gRoomControls;
extern u32 gUnk_0200B650; extern u32 gUnk_0200B650;
extern u32 gUnk_02025EB0; extern u32 gUnk_02025EB0;
extern u8 gUnk_02000070; extern u8 gUnk_02000070;
extern void DoExitTransition(ScreenTransitionData*); extern void DoExitTransition(ScreenTransitionData*);
extern void sub_080809D4();
void sub_080808D8(void) { void sub_080808D8(void) {
gScreenTransition.transitionType = 0; gScreenTransition.transitionType = 0;

5
src/createEnemy.c
View File

@ -1,8 +1,5 @@
#include "entity.h"
#include "global.h" #include "global.h"
#include "entity.h"
extern Entity* GetEmptyEntity();
extern void AppendEntityToList(Entity*, u8);
Entity* CreateEnemy(u32 subtype, u32 form) { Entity* CreateEnemy(u32 subtype, u32 form) {
Entity* enemy; Entity* enemy;

21
src/createNPC.c
View File

@ -1,19 +1,16 @@
#include "global.h" #include "global.h"
#include "entity.h" #include "entity.h"
extern Entity* GetEmptyEntity();
extern void AppendEntityToList(Entity*, u8);
Entity* CreateNPC(u32 subtype, u32 form, u32 parameter) { Entity* CreateNPC(u32 subtype, u32 form, u32 parameter) {
Entity* pEVar1; Entity* entity;
pEVar1 = GetEmptyEntity(); entity = GetEmptyEntity();
if (pEVar1 != NULL) { if (entity != NULL) {
pEVar1->kind = 7; entity->kind = 7;
pEVar1->id = subtype; entity->id = subtype;
pEVar1->type = form; entity->type = form;
pEVar1->type2 = parameter; entity->type2 = parameter;
AppendEntityToList(pEVar1, 7); AppendEntityToList(entity, 7);
} }
return pEVar1; return entity;
} }

23
src/createObject.c
View File

@ -1,22 +1,21 @@
#include "global.h" #include "global.h"
#include "entity.h" #include "entity.h"
#include "position.h"
#include "room.h" #include "room.h"
#include "createObject.h"
extern Entity* GetEmptyEntity();
extern void AppendEntityToList(Entity*, u8);
Entity* CreateObject(u32 subtype, u32 form, u32 parameter) { Entity* CreateObject(u32 subtype, u32 form, u32 parameter) {
Entity* ent; Entity* entity;
ent = GetEmptyEntity(); entity = GetEmptyEntity();
if (ent != NULL) { if (entity != NULL) {
ent->kind = 6; entity->kind = 6;
ent->id = subtype; entity->id = subtype;
ent->type = form; entity->type = form;
ent->type2 = parameter; entity->type2 = parameter;
AppendEntityToList(ent, 6); AppendEntityToList(entity, 6);
} }
return ent; return entity;
} }
Entity* CreateObjectWithParent(Entity* parentEnt, u32 subtype, u32 form, u32 parameter) { Entity* CreateObjectWithParent(Entity* parentEnt, u32 subtype, u32 form, u32 parameter) {

33
src/dma.c
View File

@ -1,49 +1,46 @@
#include "global.h" #include "global.h"
#include "entity.h" #include "dma.h"
void MemFill32(u32, u8*, u32); void MemFill16(u32 value, void* dest, u32 size) {
void MemFill16(u32, u8*, u32);
void MemFill16(u32 value, u8* dest, u32 size) {
DmaFill16(3, value, dest, size); DmaFill16(3, value, dest, size);
} }
void MemFill32(u32 value, u8* dest, u32 size) { void MemFill32(u32 value, void* dest, u32 size) {
DmaFill32(3, value, dest, size); DmaFill32(3, value, dest, size);
} }
void MemClear32(u8* src, u32 size) { void MemClear(void* dest, u32 size) {
u32 zero = 0; u32 zero = 0;
switch (((u32)src | size) & 3) { switch (((u32)dest | size) & 3) {
case 0: case 0:
MemFill32(0, src, size); MemFill32(0, dest, size);
break; break;
case 2: case 2:
MemFill16(0, src, size); MemFill16(0, dest, size);
break; break;
default: default:
do { do {
*src = zero; *(u8*)dest = zero;
src++; dest++;
size--; size--;
} while (size != 0); } while (size != 0);
} }
} }
void MemCopy(const u8* src, u8* dst, u32 size) { void MemCopy(const void* src, void* dest, u32 size) {
switch (((u32)src | (u32)dst | size) & 3) { switch (((u32)src | (u32)dest | size) & 3) {
case 0: case 0:
DmaCopy32(3, src, dst, size); DmaCopy32(3, src, dest, size);
break; break;
case 2: case 2:
DmaCopy16(3, src, dst, size); DmaCopy16(3, src, dest, size);
break; break;
default: default:
do { do {
*dst = *src; *(u8*)dest = *(u8*)src;
src++; src++;
dst++; dest++;
} while (--size); } while (--size);
} }
} }

5
src/enemy/acroBandits.c
View File

@ -1,10 +1,10 @@
#include "global.h" #include "global.h"
#include "entity.h" #include "entity.h"
#include "random.h"
#include "functions.h" #include "functions.h"
extern u32 sub_080002D4(s32, s32, u32); extern u32 sub_080002D4(s32, s32, u32);
extern s32 sub_080012DC(Entity*); extern s32 sub_080012DC(Entity*);
extern u32 sub_080044EC(Entity*, u32);
extern u32 sub_08031E04(Entity*); extern u32 sub_08031E04(Entity*);
extern void sub_08031E48(Entity*, Entity*); extern void sub_08031E48(Entity*, Entity*);
extern void sub_08032290(Entity*); extern void sub_08032290(Entity*);
@ -12,10 +12,7 @@ extern u32 sub_080322A4(Entity*);
void sub_080322E8(Entity*); void sub_080322E8(Entity*);
extern void sub_08032338(Entity*); extern void sub_08032338(Entity*);
extern Entity* sub_08049DF4(u32); extern Entity* sub_08049DF4(u32);
extern void sub_0804AA30(Entity*, void (*const funcs[])(Entity*));
extern u32 sub_0806FCB8(Entity*, u32, u32, u32);
extern u32 GetNextFunction(Entity*); extern u32 GetNextFunction(Entity*);
extern void SetChildOffset(Entity*, s32, s32, s32);
extern Entity* gUnk_020000B0; extern Entity* gUnk_020000B0;
extern u8 gEntCount; extern u8 gEntCount;

4
src/enemy/beetle.c
View File

@ -1,6 +1,8 @@
#include "entity.h" #include "entity.h"
#include "functions.h" #include "enemy.h"
#include "player.h" #include "player.h"
#include "random.h"
#include "functions.h"
extern u32 PlayerInRange(Entity*, u32, u32); extern u32 PlayerInRange(Entity*, u32, u32);

3
src/enemy/bladeTrap.c
View File

@ -1,10 +1,9 @@
#include "global.h" #include "global.h"
#include "entity.h" #include "entity.h"
#include "room.h" #include "room.h"
#include "functions.h"
extern void sub_080A2CC0(); extern void sub_080A2CC0();
extern void sub_0806F69C();
extern void EnqueueSFX();
void BladeTrap(Entity* this) { void BladeTrap(Entity* this) {
if (this->action == 0) { if (this->action == 0) {

3
src/enemy/bobomb.c
View File

@ -1,7 +1,8 @@
#include "enemy.h" #include "enemy.h"
#include "random.h"
#include "createObject.h"
#include "functions.h" #include "functions.h"
extern void CreateDustSmall(Entity*);
extern void sub_08078930(Entity*); extern void sub_08078930(Entity*);
extern void sub_08078954(Entity*); extern void sub_08078954(Entity*);

6
src/enemy/bombPeahat.c
View File

@ -1,17 +1,15 @@
#include "global.h" #include "global.h"
#include "entity.h" #include "entity.h"
#include "functions.h"
#include "player.h" #include "player.h"
#include "random.h"
#include "functions.h"
extern void sub_08078954(Entity*); extern void sub_08078954(Entity*);
extern u32 sub_0800442E(Entity*);
extern void sub_08078930(Entity*); extern void sub_08078930(Entity*);
extern s32 sub_080012DC(Entity*); extern s32 sub_080012DC(Entity*);
extern u32 GetNextFunction(Entity*); extern u32 GetNextFunction(Entity*);
extern void sub_0806F4E8(Entity*);
extern Entity* sub_08049DF4(u32); extern Entity* sub_08049DF4(u32);
extern void sub_08079BD8(Entity*); extern void sub_08079BD8(Entity*);
extern u32 GetTileTypeByEntity(Entity*);
void sub_0802AD1C(Entity*, u32); void sub_0802AD1C(Entity*, u32);
void sub_0802AD54(Entity*); void sub_0802AD54(Entity*);

8
src/enemy/bowMoblin.c
View File

@ -1,10 +1,8 @@
#include "global.h" #include "global.h"
#include "entity.h" #include "entity.h"
#include "enemy.h"
#include "functions.h"
extern void EnemyFunctionHandler(Entity*, void (*const funcs[])(Entity*));
extern void SetChildOffset(Entity*, u32, u32, u32);
extern void sub_0804A9FC(Entity*, u32);
extern void sub_0804AA30(Entity*, void (*const funcs[][])(Entity*));
extern void sub_0803C5F0(Entity*); extern void sub_0803C5F0(Entity*);
extern void (*const gUnk_080CFF78[])(Entity*); extern void (*const gUnk_080CFF78[])(Entity*);
@ -25,7 +23,7 @@ void sub_0803C198(Entity* this) {
if (this->field_0x43 != 0) { if (this->field_0x43 != 0) {
sub_0804A9FC(this, 0x1c); sub_0804A9FC(this, 0x1c);
} }
sub_0804AA30(this, &gUnk_080CFF78); sub_0804AA30(this, gUnk_080CFF78);
if ((this->bitfield & 0x80) != 0) { if ((this->bitfield & 0x80) != 0) {
sub_0803C5F0(this); sub_0803C5F0(this);
pEVar1 = this->attachedEntity; pEVar1 = this->attachedEntity;

6
src/enemy/businessScrub.c
View File

@ -1,9 +1,11 @@
#include "enemy.h" #include "enemy.h"
#include "entity.h" #include "entity.h"
#include "flags.h" #include "flags.h"
#include "functions.h"
#include "textbox.h" #include "textbox.h"
#include "save.h" #include "save.h"
#include "random.h"
#include "npc.h"
#include "functions.h"
extern void sub_0801D040(Entity*, u32); extern void sub_0801D040(Entity*, u32);
extern Entity* sub_08049DF4(u32); extern Entity* sub_08049DF4(u32);
@ -326,7 +328,7 @@ void sub_08028E40(Entity* this) {
} }
void sub_08028E84(Entity* this) { void sub_08028E84(Entity* this) {
if (UpdateFuseInteraction()) { if (UpdateFuseInteraction(this)) {
this->action = 4; this->action = 4;
this->actionDelay = 1; this->actionDelay = 1;
} }

1
src/enemy/chuchu.c
View File

@ -1,5 +1,6 @@
#include "enemy.h" #include "enemy.h"
#include "entity.h" #include "entity.h"
#include "random.h"
#include "functions.h" #include "functions.h"
extern s32 sub_080012DC(Entity*); extern s32 sub_080012DC(Entity*);

4
src/enemy/chuchuBoss.c
View File

@ -2,8 +2,6 @@
#include "entity.h" #include "entity.h"
#include "functions.h" #include "functions.h"
extern void sub_08078B48(void);
void sub_08027870(Entity*); void sub_08027870(Entity*);
extern void (*const gUnk_080CC19C[])(Entity*); extern void (*const gUnk_080CC19C[])(Entity*);
@ -36,13 +34,11 @@ void sub_08025CBC(Entity* this) {
void sub_08025DC0(Entity*); void sub_08025DC0(Entity*);
void sub_08025CD4(Entity*); void sub_08025CD4(Entity*);
void sub_08001242(Entity*);
void sub_08025DD8(Entity*); void sub_08025DD8(Entity*);
void sub_08026060(Entity*); void sub_08026060(Entity*);
void sub_08026110(Entity*); void sub_08026110(Entity*);
void sub_080272D4(Entity*); void sub_080272D4(Entity*);
void sub_0802720C(Entity*); void sub_0802720C(Entity*);
void sub_0802720C(Entity*);
void sub_08026090(Entity*); void sub_08026090(Entity*);
void sub_0802626C(Entity*); void sub_0802626C(Entity*);
void sub_08026580(Entity*); void sub_08026580(Entity*);

1
src/enemy/cuccoChickAggr.c
View File

@ -1,5 +1,6 @@
#include "enemy.h" #include "enemy.h"
#include "entity.h" #include "entity.h"
#include "random.h"
#include "functions.h" #include "functions.h"
extern Entity* sub_08049DF4(u32); extern Entity* sub_08049DF4(u32);

2
src/enemy/darkNut.c
View File

@ -1,4 +1,6 @@
#include "entity.h" #include "entity.h"
#include "enemy.h"
#include "random.h"
#include "functions.h" #include "functions.h"
typedef struct { typedef struct {

1
src/enemy/fallingBoulder.c
View File

@ -1,4 +1,5 @@
#include "enemy.h" #include "enemy.h"
#include "random.h"
#include "functions.h" #include "functions.h"
void sub_0802C4B0(Entity*); void sub_0802C4B0(Entity*);

2
src/enemy/fireballGuy.c
View File

@ -1,5 +1,7 @@
#include "global.h" #include "global.h"
#include "entity.h" #include "entity.h"
#include "enemy.h"
#include "random.h"
#include "functions.h" #include "functions.h"
typedef struct { typedef struct {

3
src/enemy/gibdo.c
View File

@ -1,8 +1,9 @@
#include "global.h" #include "global.h"
#include "entity.h" #include "entity.h"
#include "sprite.h" #include "sprite.h"
#include "functions.h"
#include "enemy.h" #include "enemy.h"
#include "random.h"
#include "functions.h"
// Gibudo // Gibudo
void sub_08037794(); void sub_08037794();
void sub_08037B10(); void sub_08037B10();

5
src/enemy/gyorgMale.c
View File

@ -3,9 +3,9 @@
#include "player.h" #include "player.h"
#include "room.h" #include "room.h"
#include "trig.h" #include "trig.h"
#include "structures.h"
#include "functions.h"
#include "fileScreen.h" #include "fileScreen.h"
#include "random.h"
#include "functions.h"
void (*const gUnk_080D1AFC[8])(Entity*); void (*const gUnk_080D1AFC[8])(Entity*);
void (*const gUnk_080D1B1C[7])(Entity*); void (*const gUnk_080D1B1C[7])(Entity*);
@ -26,7 +26,6 @@ const u8 gUnk_080D1C44[0xC];
const u16 gUnk_080D1C50[8]; const u16 gUnk_080D1C50[8];
const u16 gUnk_080D1C60[8]; const u16 gUnk_080D1C60[8];
void GyorgMale(Entity*);
void sub_08046898(Entity*); // action 0 void sub_08046898(Entity*); // action 0
void sub_08046910(Entity*); // action 1 void sub_08046910(Entity*); // action 1
void sub_08046930(Entity*); // action 1 subAction 0 void sub_08046930(Entity*); // action 1 subAction 0

1
src/enemy/hangingSeed.c
View File

@ -1,4 +1,5 @@
#include "entity.h" #include "entity.h"
#include "enemy.h"
#include "functions.h" #include "functions.h"
extern void (*const gHangingSeedFunctions[])(Entity*); extern void (*const gHangingSeedFunctions[])(Entity*);

1
src/enemy/helmasaur.c
View File

@ -1,4 +1,5 @@
#include "enemy.h" #include "enemy.h"
#include "random.h"
#include "functions.h" #include "functions.h"
extern void sub_08008796(Entity*, u32, u32, u32); extern void sub_08008796(Entity*, u32, u32, u32);

10
src/enemy/keaton.c
View File

@ -1,5 +1,7 @@
#include "global.h" #include "global.h"
#include "entity.h" #include "entity.h"
#include "enemy.h"
#include "random.h"
#include "functions.h" #include "functions.h"
extern Entity* gUnk_020000B0; extern Entity* gUnk_020000B0;
@ -164,17 +166,17 @@ void sub_08032650(Entity* this) {
sub_0803269C(this, this->direction); sub_0803269C(this, this->direction);
} }
void sub_0803269C(Entity* this, u32 param_2) { void sub_0803269C(Entity* this, u32 direction) {
u32 uVar1; u32 uVar1;
if (((param_2 - 3) & 7) < 3) { if (((direction - 3) & 7) < 3) {
uVar1 = DirectionToAnimationState(param_2); uVar1 = DirectionToAnimationState(direction);
if (((this->animationState - uVar1) & 3) > 1) { if (((this->animationState - uVar1) & 3) > 1) {
this->animationState = uVar1; this->animationState = uVar1;
InitAnimationForceUpdate(this, (this->animIndex & 0xFC) + uVar1); InitAnimationForceUpdate(this, (this->animIndex & 0xFC) + uVar1);
} }
} else { } else {
uVar1 = DirectionToAnimationState(param_2); uVar1 = DirectionToAnimationState(direction);
if (uVar1 != this->animationState) { if (uVar1 != this->animationState) {
this->animationState = uVar1; this->animationState = uVar1;
InitAnimationForceUpdate(this, (this->animIndex & 0xFC) + uVar1); InitAnimationForceUpdate(this, (this->animIndex & 0xFC) + uVar1);

8
src/enemy/keese.c
View File

@ -2,19 +2,13 @@
#include "entity.h" #include "entity.h"
#include "enemy.h" #include "enemy.h"
#include "player.h" #include "player.h"
#include "random.h"
#include "functions.h" #include "functions.h"
extern void sub_08001328(Entity*); extern void sub_08001328(Entity*);
extern u32 sub_0806F520(Entity*);
extern void sub_0806F4E8(Entity*);
extern u32 sub_0806F3E4(Entity*);
extern void sub_0804A7D4(Entity*);
extern void sub_0804A720(Entity*);
extern void Keese_StartFly(Entity*); extern void Keese_StartFly(Entity*);
extern void sub_080AEFB4(Entity*); extern void sub_080AEFB4(Entity*);
extern void sub_08021F24(Entity*); extern void sub_08021F24(Entity*);
extern u32 sub_08049FA0(Entity*);
extern u32 sub_08049EE4(Entity*);
extern void (*const gKeeseFunctions[])(Entity*); extern void (*const gKeeseFunctions[])(Entity*);
extern void (*const gKeeseActions[])(Entity*); extern void (*const gKeeseActions[])(Entity*);

49
src/enemy/lakitu.c
View File

@ -1,5 +1,6 @@
#include "global.h" #include "global.h"
#include "entity.h" #include "entity.h"
#include "enemy.h"
#include "functions.h" #include "functions.h"
#include "trig.h" #include "trig.h"
#include "random.h" #include "random.h"
@ -7,51 +8,6 @@
extern void (*const LakituActionFuncs[])(Entity*); extern void (*const LakituActionFuncs[])(Entity*);
// Lakitu
extern void EnemyFunctionHandler(Entity*, void (*const funcs[])(Entity*));
// sub_0803C784
extern void sub_0804AA30(Entity*, void (*const funcs[])(Entity*));
// sub_0803C820
extern u32 sub_0806F520(Entity*);
// sub_0803C850
extern void sub_0806F4E8(Entity*);
// Lakitu_Initialize
extern void sub_0804A720(Entity*);
// Lakitu_Cloudless
extern u32 sub_08003FC4(Entity*, u32);
// sub_0803CA4C
extern u32 sub_080041A0(Entity*, Entity*, u32, u32);
// sub_0803CAD0
extern u32 sub_080AEFE0(Entity*);
// Lakitu_SpawnLightning
void PositionRelative(Entity*, Entity*, s32, s32);
extern void EnqueueSFX(u32);
// sub_0803CC08
extern void DeleteEntity(Entity*);
// Part of function tables
extern void sub_08001324(Entity*);
extern void sub_0804A7D4(Entity*);
extern void sub_08001242(Entity*);
// Used in multiple functions
extern Entity* CreateFx(Entity*, u32, u32);
extern Entity* sub_0804A98C(Entity* positionEntity, u8 subtype,
u8 form); // Creates a projectile positioned at the given entity
extern void UpdateAnimationSingleFrame(Entity*);
extern void InitAnimationForceUpdate(Entity*, u32);
extern u32 sub_0806FCB8(Entity*, u32, u32, u32);
extern u32 GetFacingDirection(Entity*, Entity*);
// Forward references to functions in lakitu.c // Forward references to functions in lakitu.c
extern void sub_0803CAD0(Entity*); extern void sub_0803CAD0(Entity*);
extern void sub_0803CBAC(Entity*); extern void sub_0803CBAC(Entity*);
@ -78,9 +34,6 @@ typedef struct {
s8 y; s8 y;
} PACKED OffsetCoords; } PACKED OffsetCoords;
// sub_0803CC08
extern void DeleteEntity(Entity*);
// Variables // Variables
extern void (*const gUnk_080D0110[])(Entity*); extern void (*const gUnk_080D0110[])(Entity*);
extern void (*const gUnk_080D0128[])(Entity*); extern void (*const gUnk_080D0128[])(Entity*);

10
src/enemy/lakituCloud.c
View File

@ -1,25 +1,17 @@
#include "global.h" #include "global.h"
#include "entity.h" #include "entity.h"
#include "player.h" #include "player.h"
#include "functions.h"
extern u32 GetNextFunction(Entity*); extern u32 GetNextFunction(Entity*);
extern void sub_0804A7D4(Entity*);
extern void sub_08001242(Entity*);
extern void (*const gUnk_080D0418[6])(Entity*); extern void (*const gUnk_080D0418[6])(Entity*);
extern void (*const gUnk_080D0430[3])(Entity*); extern void (*const gUnk_080D0430[3])(Entity*);
extern void (*const gUnk_080D043C[3])(Entity*); extern void (*const gUnk_080D043C[3])(Entity*);
extern bool32 sub_0806F3E4(Entity*);
extern bool32 sub_0806F520(Entity*);
extern void sub_0800449C(Entity*, u32); extern void sub_0800449C(Entity*, u32);
extern void sub_0803CE14(Entity*); extern void sub_0803CE14(Entity*);
extern void sub_0803CE3C(Entity*); extern void sub_0803CE3C(Entity*);
extern Entity* GetCurrentRoomProperty(u8);
extern void sub_0806F4E8(Entity*);
extern void sub_0806F69C(Entity*);
extern void sub_08079D84(void); extern void sub_08079D84(void);
extern void sub_080A2CC0(Entity*, Entity**, u16*); extern void sub_080A2CC0(Entity*, Entity**, u16*);

7
src/enemy/leever.c
View File

@ -1,16 +1,11 @@
#include "global.h" #include "global.h"
#include "entity.h" #include "entity.h"
#include "enemy.h" #include "enemy.h"
#include "random.h"
#include "functions.h" #include "functions.h"
extern void SetChildOffset(Entity*, s32, s32, s32);
extern void sub_0804AA30(Entity*, void (*const func[])(Entity*));
extern void sub_0804A7D4(Entity*);
extern Entity* CreateDeathFx(Entity*, u32, u32);
extern void sub_0804A720(Entity*);
extern u32 sub_080002D4(s32, s32, u32); extern u32 sub_080002D4(s32, s32, u32);
extern u32 sub_080002BC(s32, s32, u32); extern u32 sub_080002BC(s32, s32, u32);
extern u32 sub_08049FDC(Entity*, u32);
extern Entity* gUnk_020000B0; extern Entity* gUnk_020000B0;
extern s16 gSineTable[]; extern s16 gSineTable[];

5
src/enemy/likeLike.c
View File

@ -1,11 +1,12 @@
#include "enemy.h" #include "enemy.h"
#include "entity.h" #include "entity.h"
#include "functions.h"
#include "textbox.h" #include "textbox.h"
#include "save.h" #include "save.h"
#include "random.h"
#include "createObject.h"
#include "functions.h"
extern bool32 sub_080544B4(u32); extern bool32 sub_080544B4(u32);
extern void sub_0807CAA0(u32, u32);
void sub_0802810C(Entity*); void sub_0802810C(Entity*);
void sub_080281A0(Entity*); void sub_080281A0(Entity*);

1
src/enemy/madderpillar.c
View File

@ -1,5 +1,6 @@
#include "enemy.h" #include "enemy.h"
#include "entity.h" #include "entity.h"
#include "random.h"
#include "functions.h" #include "functions.h"
extern u8 gEntCount; extern u8 gEntCount;

6
src/enemy/miniFireballGuy.c
View File

@ -1,11 +1,9 @@
#include "global.h" #include "global.h"
#include "entity.h" #include "entity.h"
#include "enemy.h"
#include "random.h"
#include "functions.h" #include "functions.h"
extern void EnemyFunctionHandler(Entity*, void (*const func[])(Entity*));
extern void sub_0804A7D4(Entity*);
extern void sub_0804A720(Entity*);
extern void sub_08045678(Entity*);
extern void sub_08045678(Entity*); extern void sub_08045678(Entity*);
extern void (*const gUnk_080D1868[])(Entity*); extern void (*const gUnk_080D1868[])(Entity*);

6
src/enemy/miniSlime.c
View File

@ -1,16 +1,14 @@
#include "global.h" #include "global.h"
#include "entity.h" #include "entity.h"
#include "room.h" #include "enemy.h"
#include "random.h"
#include "functions.h" #include "functions.h"
void sub_08045374(Entity*); void sub_08045374(Entity*);
extern u32 sub_0806FA04(u32, u32); extern u32 sub_0806FA04(u32, u32);
extern void sub_0804A720();
extern void sub_080452E4(); extern void sub_080452E4();
extern void sub_0804AA30();
extern void ReplaceMonitoredEntity(Entity*, Entity*); extern void ReplaceMonitoredEntity(Entity*, Entity*);
extern void sub_0804A7D4(Entity*);
extern void (*const gUnk_080D17C0[])(Entity*); extern void (*const gUnk_080D17C0[])(Entity*);
extern void (*const gUnk_080D17D8[])(Entity*); extern void (*const gUnk_080D17D8[])(Entity*);

1
src/enemy/moldorm.c
View File

@ -1,5 +1,6 @@
#include "enemy.h" #include "enemy.h"
#include "entity.h" #include "entity.h"
#include "random.h"
#include "functions.h" #include "functions.h"
void sub_08022EAC(Entity*); void sub_08022EAC(Entity*);

1
src/enemy/moldworm.c
View File

@ -1,5 +1,6 @@
#include "enemy.h" #include "enemy.h"
#include "entity.h" #include "entity.h"
#include "random.h"
#include "functions.h" #include "functions.h"
extern void sub_0800449C(Entity*, u32); extern void sub_0800449C(Entity*, u32);

10
src/enemy/octorok.c
View File

@ -1,15 +1,9 @@
#include "global.h" #include "global.h"
#include "entity.h" #include "entity.h"
#include "enemy.h"
#include "random.h"
#include "functions.h" #include "functions.h"
extern void EnemyFunctionHandler();
extern void SetChildOffset();
extern void sub_0804AA30();
extern void sub_0804A7D4();
extern u32 sub_0806F520();
extern void sub_0806F4E8();
extern void UpdateAnimationVariableFrames();
extern void sub_0804A720();
extern Entity* sub_08049DF4(u32); extern Entity* sub_08049DF4(u32);
void Octorok_Pause(); void Octorok_Pause();

2
src/enemy/peahat.c
View File

@ -1,4 +1,6 @@
#include "entity.h" #include "entity.h"
#include "enemy.h"
#include "random.h"
#include "functions.h" #include "functions.h"
extern void (*const gPeahatFunctions[])(Entity*); extern void (*const gPeahatFunctions[])(Entity*);

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