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

clang-format and newlines

This commit is contained in:
theo3 2020-11-13 23:27:50 -08:00
parent 8fd7481395
commit 3079c016b4
236 changed files with 4010 additions and 4415 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -64,4 +64,4 @@ types_*.taghl
_Deparsed_XSubs.pm
*.py
*.sna
__pycache__
__pycache__

2
asm/bowUse.s
View File

@ -336,4 +336,4 @@ _08019402:
.align 2, 0
_08019404: .4byte gUnk_02002A40
_08019408: .4byte gPlayerEntity
_0801940C: .4byte gPlayerState
_0801940C: .4byte gPlayerState

2
asm/cat.s
View File

@ -854,4 +854,4 @@ _08067E22:
bl UpdateAnimationSingleFrame
_08067E28:
pop {pc}
.align 2, 0
.align 2, 0

2
asm/code_08000F10.s
View File

@ -48,4 +48,4 @@ _08000F40:
pop {r4, r5, r6, r7}
bx lr
.align 2, 0
_08000F50: .4byte gUnk_03005E60
_08000F50: .4byte gUnk_03005E60

2
asm/code_080041E8.s
View File

@ -292,4 +292,4 @@ _080043B6:
_080043E0:
adds r0, r4, #0
bl DeleteEntity
pop {r4, pc}
pop {r4, pc}

2
asm/code_080043E8.s
View File

@ -1849,4 +1849,4 @@ _08007DE2:
ldrh r3, [r1, #2]
movs r2, #1
_08007DF2:
bx lr
bx lr

2
asm/code_08016DF8.s
View File

@ -3098,4 +3098,4 @@ _080184F0:
pop {r1}
bx r1
.align 2, 0
_080184FC: .4byte gPlayerEntity
_080184FC: .4byte gPlayerEntity

2
asm/code_08019444.s
View File

@ -5620,4 +5620,4 @@ _0801BEEE:
pop {r4, pc}
.align 2, 0
_0801BEF0: .4byte gPlayerEntity
_0801BEF4: .4byte gUnk_080B7878
_0801BEF4: .4byte gUnk_080B7878

2
asm/code_0801C370.s
View File

@ -148,4 +148,4 @@ sub_0801C4A0: @ 0x0801C4A0
strb r0, [r1, #0xa]
bx lr
.align 2, 0
_0801C4AC: .4byte gUnk_0200AF00
_0801C4AC: .4byte gUnk_0200AF00

2
asm/code_0801C85C.s
View File

@ -866,4 +866,4 @@ _0801CEB4:
pop {r4, pc}
.align 2, 0
_0801CEB8: .4byte gUnk_0200AF00
_0801CEBC: .4byte gTextBox
_0801CEBC: .4byte gTextBox

2
asm/code_0801CEC0.s
View File

@ -860,4 +860,4 @@ ClearBit: @ 0x0801D5D4
bics r1, r2
strb r1, [r3]
ands r0, r2
bx lr
bx lr

2
asm/code_080526F8.s
View File

@ -3577,4 +3577,4 @@ _080542E8:
pop {pc}
.align 2, 0
_080542F0: .4byte 0x000003E7

2
asm/code_0805EC04.s
View File

@ -2252,4 +2252,4 @@ _0805FD1C:
bl DeleteThisEntity
_0805FD20:
pop {r4, r5, pc}
.align 2, 0
.align 2, 0

2
asm/code_0806EC20.s
View File

@ -167,4 +167,4 @@ _0806ECD0:
_0806ED4A:
pop {r4, r5, pc}
.align 2, 0
_0806ED4C: .4byte gUnk_08114EE4
_0806ED4C: .4byte gUnk_08114EE4

2
asm/code_08076C80.s
View File

@ -1718,4 +1718,4 @@ sub_08077B20: @ 0x08077B20
push {lr}
bl ResetPlayer
bl sub_08077AEC
pop {pc}
pop {pc}

2
asm/code_0807B9B8.s
View File

@ -1994,4 +1994,4 @@ _0807C956:
mov r8, r3
mov sb, r4
pop {r4, r5, r6, r7, pc}
.align 2, 0
.align 2, 0

2
asm/code_0807CC3C.s
View File

@ -7970,4 +7970,4 @@ _080808B8:
.align 2, 0
_080808CC: .4byte gRoomControls
_080808D0: .4byte 0xFFFF8000
_080808D4: .4byte gUnk_0811E7C4
_080808D4: .4byte gUnk_0811E7C4

2
asm/code_0808091C.s
View File

@ -433,4 +433,4 @@ _08080DEE:
_08080E00:
pop {r4, r5, pc}
.align 2, 0
_08080E04: .4byte gScreenTransition
_08080E04: .4byte gScreenTransition

2
asm/code_080A3480.s
View File

@ -908,4 +908,4 @@ sub_080A3B74: @ 0x080A3B74
strb r1, [r0]
bx lr
.align 2, 0
_080A3B80: .4byte gMenu
_080A3B80: .4byte gMenu

2
asm/code_080AD90C.s
View File

@ -3527,4 +3527,4 @@ _080AF300:
.align 2, 0
_080AF304: .4byte gArea
_080AF308: .4byte 0x0000085C
_080AF30C: .4byte gUnk_0813A76C
_080AF30C: .4byte gUnk_0813A76C

2
asm/code_080B1520.s
View File

@ -548,4 +548,4 @@ _080B1912:
pop {r1}
bx r1
.align 2, 0

2
asm/dog.s
View File

@ -884,4 +884,4 @@ _0806A1CE:
bl GetNextFrame
_0806A1D4:
pop {r4, pc}
.align 2, 0
.align 2, 0

2
asm/drawRupees.s
View File

@ -157,4 +157,4 @@ _0801C5D0:
.align 2, 0
_0801C5D4: .4byte gUnk_0200AF00
_0801C5D8: .4byte gWalletSizes
_0801C5DC: .4byte gUnk_02002A40
_0801C5DC: .4byte gUnk_02002A40

2
asm/drawUI.s
View File

@ -23,4 +23,4 @@ sub_0801C344: @ 0x0801C344
bl sub_0801C1D4
pop {r4, r5, pc}
.align 2, 0
_0801C36C: .4byte gUnk_0200AF00
_0801C36C: .4byte gUnk_0200AF00

2
asm/enemy5F.s
View File

@ -471,4 +471,4 @@ sub_080485FC: @ 0x080485FC
pop {r4, pc}
.align 2, 0
_08048638: .4byte gUnk_080D1D98
_0804863C: .4byte gUnk_080D1D78
_0804863C: .4byte gUnk_080D1D78

2
asm/evilSpirit/sub_080862B8.inc
View File

@ -97,4 +97,4 @@ _08086360:
adds r0, r4, #0
bl sub_08086370
pop {r4, r5, pc}
.syntax divided
.syntax divided

2
asm/festari.s
View File

@ -103,4 +103,4 @@ _0805FFCE:
bl UpdateAnimationSingleFrame
_0805FFD4:
pop {r4, pc}
.align 2, 0
.align 2, 0

2
asm/fusionMenuNPC.s
View File

@ -50,4 +50,4 @@ FusionMenuNPC_Head: @ 0x0806E8F8
_0806E916:
pop {pc}
.align 2, 0
_0806E918: .4byte gNPCFunctions
_0806E918: .4byte gNPCFunctions

2
asm/getInventoryValue.s
View File

@ -20,4 +20,4 @@ GetInventoryValue: @ 0x0807CA84
ands r0, r1
bx lr
.align 2, 0
_0807CA9C: .4byte gUnk_02002B32
_0807CA9C: .4byte gUnk_02002B32

2
asm/hurdyGurdyMan.s
View File

@ -206,4 +206,4 @@ _0806E498:
adds r0, r4, #0
bl GetNextFrame
_0806E49E:
pop {r4, pc}
pop {r4, pc}

2
asm/item11.s
View File

@ -191,4 +191,4 @@ _08018FBC:
bl PlaySFX
pop {pc}
.align 2, 0
_08018FC8: .4byte gPlayerEntity
_08018FC8: .4byte gPlayerEntity

2
asm/kingGustaf.s
View File

@ -76,4 +76,4 @@ _0806C124:
_0806C134:
pop {r4, r5, pc}
.align 2, 0
_0806C138: .4byte gScreen
_0806C138: .4byte gScreen

2
asm/loadRoomEntity.s
View File

@ -98,4 +98,4 @@ _0804AEAA:
adds r0, r5, #0
_0804AEAC:
pop {r4, r5, r6, r7, pc}
.align 2, 0
.align 2, 0

2
asm/m4a.s
View File

@ -3024,4 +3024,4 @@ ply_xswee: @ 0x080B14AC
nullsub_544: @ 0x080B14C0
bx lr
.align 2, 0

2
asm/macroMushroomStalks.s
View File

@ -17,4 +17,4 @@ MacroMushromStalks: @ 0x0808C91C
bl _call_via_r1
pop {pc}
.align 2, 0
_0808C930: .4byte gUnk_08121668
_0808C930: .4byte gUnk_08121668

2
asm/manager11.s
View File

@ -30,4 +30,4 @@ _080599D6:
bl SetFlag
bl DeleteThisEntity
_080599EA:
pop {r4, pc}
pop {r4, pc}

2
asm/manager18.s
View File

@ -192,4 +192,4 @@ sub_0805AF3C: @ 0x0805AF3C
bx lr
.align 2, 0
_0805AF58: .4byte gScreen
_0805AF5C: .4byte 0x0000F7FF
_0805AF5C: .4byte 0x0000F7FF

2
asm/manager34.s
View File

@ -140,4 +140,4 @@ sub_0805DC70: @ 0x0805DC70
bl DoExitTransition
pop {pc}
.align 2, 0
_0805DC80: .4byte gUnk_0813AC48
_0805DC80: .4byte gUnk_0813AC48

2
asm/manager39.s
View File

@ -289,4 +289,4 @@ _0805E360: .4byte 0x0000026E
_0805E364: .4byte 0x00000275
_0805E368: .4byte 0x0000026F
_0805E36C: .4byte 0x00000272
_0805E370: .4byte gUnk_02000070
_0805E370: .4byte gUnk_02000070

2
asm/mazaalHead.s
View File

@ -1850,4 +1850,4 @@ _08034C54:
_08034C5A:
pop {r4, pc}
.align 2, 0
_08034C5C: .4byte gUnk_080CED9C
_08034C5C: .4byte gUnk_080CED9C

2
asm/modArrows.s
View File

@ -37,4 +37,4 @@ _08054362:
adds r0, #0xad
strb r3, [r0]
pop {pc}
.align 2, 0
.align 2, 0

2
asm/modBombs.s
View File

@ -37,4 +37,4 @@ _08054326:
adds r0, #0xac
strb r3, [r0]
pop {pc}
.align 2, 0
.align 2, 0

2
asm/non_matching/code_0805457C.inc
View File

@ -364,4 +364,4 @@ _0805486A:
_0805486C:
pop {r4, r5, r6, pc}
.align 2, 0
.syntax divided
.syntax divided

2
asm/non_matching/putItemOnSlot.s
View File

@ -117,4 +117,4 @@ _08054456:
_08054458: .4byte gUnk_02002A40
_0805445C: .4byte gUnk_080FD5B4
_08054460: .4byte gUnk_0200AF00
.syntax divided
.syntax divided

2
asm/non_matching/sub_0804BF38.inc
View File

@ -108,4 +108,4 @@ _0804BFE8:
_0804C000: .4byte gUnk_080D8E50
_0804C004: .4byte gRoomControls
_0804C008: .4byte 0x0000FFF4
.syntax divided
.syntax divided

2
asm/non_matching/sub_0804C128.inc
View File

@ -145,4 +145,4 @@ _0804C250:
_0804C254:
pop {r4, r5, pc}
.align 2, 0
.syntax divided
.syntax divided

2
asm/non_matching/sub_0804C258.inc
View File

@ -25,4 +25,4 @@ _0804C284:
.align 2, 0
_0804C288: .4byte gArea
_0804C28C: .4byte gScreenTransition
.syntax divided
.syntax divided

2
asm/non_matching/sub_0804C290.inc
View File

@ -20,4 +20,4 @@ _0804C2B2:
.align 2, 0
_0804C2B4: .4byte gArea
_0804C2B8: .4byte gUnk_080D9348
.syntax divided
.syntax divided

2
asm/non_matching/sub_0804DE00.inc
View File

@ -88,4 +88,4 @@ _0804DEC4:
_0804DECC:
movs r0, #1
pop {r4, r5, r6, pc}
.syntax divided
.syntax divided

2
asm/non_matching/sub_0804E150.inc
View File

@ -83,4 +83,4 @@ _0804E1EC:
bne _0804E1D8
_0804E1F2:
pop {r4, r5, pc}
.syntax divided
.syntax divided

2
asm/non_matching/sub_08054524.inc
View File

@ -28,4 +28,4 @@ _08054554: .4byte gScreenTransition
_08054558: .4byte gUnk_080FE1C6
_0805455C: .4byte gUnk_080015BC
_08054560: .4byte gUnk_02034398
.syntax divided
.syntax divided

2
asm/non_matching/sub_08077D38.inc
View File

@ -101,4 +101,4 @@ _08077DE8:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08077DF0: .4byte gPlayerState
.syntax divided
.syntax divided

2
asm/non_matching/sub_08077F24.inc
View File

@ -31,4 +31,4 @@ _08077F42:
_08077F4C:
pop {pc}
.align 2, 0
.syntax divided
.syntax divided

2
asm/non_matching/syrup/sub_0806A26C.inc
View File

@ -40,4 +40,4 @@ _0806A2AE:
pop {r4, r5, pc}
.align 2, 0
_0806A2B0: .4byte gUnk_081121DC
.syntax divided
.syntax divided

2
asm/non_matching/townsperson/sub_08061C60.inc
View File

@ -43,4 +43,4 @@
.align 2, 0
_08061CAC: .4byte gUnk_0810B78C
_08061CB0: .4byte gUnk_0810B680
.syntax divided
.syntax divided

2
asm/non_matching/wallMaster2/sub_0802CF8C.inc
View File

@ -47,4 +47,4 @@ _0802CFD0:
.align 2, 0
_0802CFD4: .4byte gUnk_080CD730
.syntax divided
.syntax divided

2
asm/npc4E.s
View File

@ -32,4 +32,4 @@ _0806DD5A:
strb r0, [r4]
_0806DD74:
pop {r4, pc}
.align 2, 0
.align 2, 0

2
asm/npc58.s
View File

@ -146,4 +146,4 @@ NPC58_Head: @ 0x0806EBAC
adds r0, r4, #0
bl sub_0807000C
pop {r4, pc}
.align 2, 0
.align 2, 0

2
asm/object74.s
View File

@ -274,4 +274,4 @@ _08097D6C:
pop {r4, r5, r6, pc}
.align 2, 0
_08097D70: .4byte gUnk_08123344
_08097D74: .4byte gRoomControls
_08097D74: .4byte gRoomControls

2
asm/objectBF.s
View File

@ -9,4 +9,4 @@
thumb_func_start ObjectBF
ObjectBF: @ 0x080A2444
bx lr
.align 2, 0
.align 2, 0

2
asm/ocarina.s
View File

@ -147,4 +147,4 @@ _08076C6E:
_08076C70: .4byte gPlayerEntity
_08076C74: .4byte gPlayerState
_08076C78: .4byte 0xEFFFFFFF
_08076C7C: .4byte gUnk_02034490
_08076C7C: .4byte gUnk_02034490

2
asm/ocarinaUpdate.s
View File

@ -43,4 +43,4 @@ _08076C6E:
_08076C70: .4byte gPlayerEntity
_08076C74: .4byte gPlayerState
_08076C78: .4byte 0xEFFFFFFF
_08076C7C: .4byte gUnk_02034490
_08076C7C: .4byte gUnk_02034490

2
asm/phonograph.s
View File

@ -247,4 +247,4 @@ _0806EAE0: .4byte gUnk_020227E8
_0806EAE4: .4byte 0x00202020
_0806EAE8: .4byte 0x00003302
_0806EAEC: .4byte gUnk_081146B8
_0806EAF0: .4byte gScreen
_0806EAF0: .4byte gScreen

2
asm/playSFX.s
View File

@ -277,4 +277,4 @@ _080A3476:
bl sub_080A353C
_080A347C:
pop {r4, r5, pc}
.align 2, 0
.align 2, 0

2
asm/respawnPlayer.s
View File

@ -60,4 +60,4 @@ _08077B86:
_08077B88: .4byte gUnk_03000B80
_08077B8C: .4byte gPlayerState
_08077B90: .4byte 0xF7FBFFFF
_08077B94: .4byte gPlayerEntity
_08077B94: .4byte gPlayerEntity

2
asm/smallTownMinish.s
View File

@ -79,4 +79,4 @@ _0806E2EC:
pop {pc}
.align 2, 0
_0806E300: .4byte gUnk_02002A40
_0806E304: .4byte gUnk_08114308
_0806E304: .4byte gUnk_08114308

2
asm/sub_08007DE0.s
View File

@ -19,4 +19,4 @@ _08007DE2:
ldrh r3, [r1, #2]
movs r2, #1
_08007DF2:
bx lr
bx lr

2
asm/sub_08019410.s
View File

@ -33,4 +33,4 @@ _0801942E:
bl DeleteThisEntity
_08019440:
pop {r4, pc}
.align 2, 0
.align 2, 0

2
asm/sub_0801C824.s
View File

@ -35,4 +35,4 @@ _0801C84E:
.align 2, 0
_0801C850: .4byte gUnk_0200AF00
_0801C854: .4byte gUnk_02034D30
_0801C858: .4byte gScreen
_0801C858: .4byte gScreen

2
asm/sub_0804AA30.s
View File

@ -28,4 +28,4 @@ sub_0804AA30: @ 0x0804AA30
adds r0, r4, #0
bl _call_via_r1
pop {r4, r5, r6, pc}
.align 2, 0
.align 2, 0

2
asm/sub_08052418.s
View File

@ -70,4 +70,4 @@ _08052494: .4byte gUnk_02021F30
_08052498: .4byte gUnk_020227E8
_0805249C: .4byte gUnk_080FCA8C
_080524A0: .4byte gUnk_080FCAA4
_080524A4: .4byte gScreen
_080524A4: .4byte gScreen

2
asm/sub_0807CA18.s
View File

@ -60,4 +60,4 @@ _0807CA78:
pop {pc}
.align 2, 0
_0807CA7C: .4byte gUnk_02002A40
_0807CA80: .4byte gUnk_0811E470
_0807CA80: .4byte gUnk_0811E470

2
asm/sub_080A276C.s
View File

@ -103,4 +103,4 @@ _080A2820:
_080A2828: .4byte gPlayerEntity
_080A282C: .4byte gUnk_03003DC0
_080A2830: .4byte gUnk_02034490
_080A2834: .4byte gPlayerState
_080A2834: .4byte gPlayerState

2
asm/sub_080A285C.s
View File

@ -141,4 +141,4 @@ _080A28D2:
_080A2958:
pop {r4, r5, pc}
.align 2, 0
_080A295C: .4byte gUnk_08125104
_080A295C: .4byte gUnk_08125104

2
asm/wizzrobeIce.s
View File

@ -375,4 +375,4 @@ _080300A2:
adds r0, r4, #0
bl sub_0802F9C8
pop {r4, pc}
.align 2, 0
.align 2, 0

2
data/data_080B2A70.s
View File

@ -10,4 +10,4 @@ gUnk_080B2A70:: @ 080B2A70
gUnk_080B2CD8:: @ 080B2CD8
gUnk_080B2CD8_2:: @ 080B2CD8
gUnk_080B2CD8_3:: @ 080B2CD8
.incbin "baserom.gba", 0x0B2CD8, 0x0000010
.incbin "baserom.gba", 0x0B2CD8, 0x0000010

2
data/data_080B3054.s
View File

@ -5,4 +5,4 @@
.align 2
gUnk_080B3054:: @ 080B3054
.incbin "baserom.gba", 0x0B3054, 0x00000E8
.incbin "baserom.gba", 0x0B3054, 0x00000E8

BIN
data/ddump
View File

Binary file not shown.

2
data/gfx.ddscript
View File

@ -1,2 +1,2 @@
$data :
.data $data
.data $data

2
data/playerItemFunctions.s
View File

@ -58,4 +58,4 @@
.4byte SwordBeam
.4byte NulledItem
.4byte CellOverwriteSet
*/
*/

2
data/ptr_array.ddscript
View File

@ -1,2 +1,2 @@
$ptr :4 int:4
.4byte $*ptr
.4byte $*ptr

2
data/text.ddscript
View File

@ -1,2 +1,2 @@
$data :
.data $data
.data $data

BIN
data/tilesets/minish_woods/tiles_bottom.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

BIN
graphics/font.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
graphics/intro/nintendo_capcom.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
graphics/npc/malon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
graphics/npc/postman.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
graphics/pot_portal.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

2
graphics_file_rules.mk
View File

@ -13,4 +13,4 @@ $(GFXDIR)/npc/postman.4bpp: %.4bpp: %.png
$(GFX) $< $@
$(GFXDIR)/npc/malon.4bpp: %.4bpp: %.png
$(GFX) $< $@
$(GFX) $< $@

3
include/area.h
View File

@ -3,7 +3,6 @@
#include "global.h"
typedef struct {
u8 areaMetadata;
u8 locationIndex;
@ -17,7 +16,7 @@ typedef struct {
u8 field_0x16;
u8 field_0x17;
u8 field_0x18;
//u8 filler3[7];
// u8 filler3[7];
u8 fadeOut;
u8 filler2[14];
u8 filler4[0x835];

2
include/createEnemy.h
View File

@ -1 +1 @@
Entity* CreateEnemy(u8, u8);
Entity* CreateEnemy(u8, u8);

2
include/cutscene.h
View File

@ -13,4 +13,4 @@ typedef struct {
s32 targetY;
} CutsceneBehavior;
#endif
#endif

2
include/enemy.h
View File

@ -112,4 +112,4 @@ extern u32 GetNextFunction(Entity*);
extern void EnemyFunctionHandler(Entity*, void (*const func[])(Entity*));
extern void sub_0804AA30(Entity*, void (*const func[])(Entity*));
extern void sub_08001324(Entity*);
#endif
#endif

2
include/flags.h
View File

@ -132,4 +132,4 @@ enum {
/*0x64*/ CASTLE_BGM, /* Castle intro BGM */
};
#endif
#endif

12
include/functions.h
View File

@ -37,13 +37,13 @@ extern void _DmaZero(void* src, u32 count);
extern void EraseAllEntities(void);
extern void SetTile(u32, u32, u32);
extern void SetDirtTile(u32);
extern void LoadRoomTileEntities(); //tba
extern void LoadRoomTileEntities(); // tba
extern Entity* CreateDeathFx(Entity*, u32, u32);
extern void UpdateAnimationVariableFrames(Entity*, u32);
extern void CopyPositionAndSpriteOffset(Entity*, Entity*);
extern u8* GetSpriteSubEntryOffsetDataPointer(u32, u32);
extern u32 LoadFixedGFX(Entity*, u32);
extern void ExecuteScriptCommandSet(Entity*, void *);
extern void ExecuteScriptCommandSet(Entity*, void*);
extern void _DmaFill32(u32, void*, u32);
extern Entity* CreateItemEntity(u32, u32, u32);
@ -99,16 +99,16 @@ 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 sub_080041A0(Entity*, Entity*, u32, u32);
extern u32 sub_08049EE4(Entity*);
extern Entity *sub_0804A98C(Entity *, u8, u8);
extern Entity* sub_0804A98C(Entity*, u8, u8);
extern u32 sub_080544DC(u8);
extern void sub_08077E54(Entity*);
extern void sub_080042BA(Entity*, u32);
extern void _DmaZero(void*, u32);
extern void sub_08077F24(ItemBehavior*, u32);
extern void sub_08079184();
extern void sub_08077F50(ItemBehavior *beh, u32 arg1);
extern void sub_08077F50(ItemBehavior* beh, u32 arg1);
extern void sub_0807AA80(Entity*);
extern s32 sub_0807887C(Entity*, u32, u32);
extern s32 sub_08078904();
@ -210,7 +210,7 @@ extern u32 sub_08052638(u32);
extern void sub_0805616C(void);
extern u32 sub_0807CF08(u32, u8*);
extern void sub_0807CF48(u32);
extern u32 sub_0807CF10(u8 *);
extern u32 sub_0807CF10(u8*);
extern void sub_08056208(void);
extern void sub_08050384();
extern void sub_080B1520(u32);

3
include/greatFairy.h
View File

@ -44,10 +44,9 @@ extern u8 gUnk_0812079C[8];
extern s16 gSineTable[];
extern s8 gUnk_081207AC[];
typedef struct {
s32 unk0;
s32 unk4;
} struct_08087424;
#endif
#endif

2
include/item.h
View File

@ -162,4 +162,4 @@ void extern JarEmpty(ItemBehavior*, u32);
LongSpin = 0x75
} ItemType;
*/
#endif
#endif

3
include/main.h
View File

@ -54,7 +54,6 @@ typedef struct {
extern Main gUnk_03001000;
extern UI gUnk_02032EC0;
extern void sub_080A3204(void);
extern void sub_0807CE90(void);
extern void sub_080560B8(void);
@ -74,4 +73,4 @@ extern void sub_08056458(void);
extern void sub_08050154(void);
extern void sub_080A3480(void);
#endif
#endif

2
include/manager.h
View File

@ -24,7 +24,7 @@ typedef struct Manager {
/*0x0f*/ u8 unk_0f;
/*0x10*/ u8 unk_10;
/*0x11*/ u8 unk_11[3];
/*0x14*/ struct Manager * parent;
/*0x14*/ struct Manager* parent;
/*0x18*/ u8 unk_18[0x8];
// union SplitHWord unk_20;
// u16 unk_22;

2
include/menu.h
View File

@ -41,4 +41,4 @@ typedef struct {
extern Menu gMenu;
#endif
#endif

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