From bde85fd004f20b594e2fb00fa1e2c870d73e9dda Mon Sep 17 00:00:00 2001 From: theo3 Date: Wed, 5 Jan 2022 20:41:34 -0800 Subject: doxygen groups --- src/debug.c | 103 ++++++++++++++++++ src/debugScreen.c | 96 ----------------- src/demo.c | 224 +++++++++++++++++++++++++++++++++++++++ src/demoScreen.c | 217 ------------------------------------- src/enemy/acroBandits.c | 7 ++ src/enemy/beetle.c | 7 ++ src/enemy/bladeTrap.c | 7 ++ src/enemy/bobomb.c | 7 ++ src/enemy/bombPeahat.c | 7 ++ src/enemy/bowMoblin.c | 7 ++ src/enemy/businessScrub.c | 7 ++ src/enemy/chaser.c | 7 ++ src/enemy/chuchu.c | 7 ++ src/enemy/chuchuBoss.c | 7 ++ src/enemy/cuccoChickAggr.c | 7 ++ src/enemy/darkNut.c | 7 ++ src/enemy/doorMimic.c | 7 ++ src/enemy/enemy4D.c | 7 ++ src/enemy/enemyE.c | 7 ++ src/enemy/fallingBoulder.c | 7 ++ src/enemy/fireballGuy.c | 7 ++ src/enemy/gibdo.c | 7 ++ src/enemy/gyorgMale.c | 7 ++ src/enemy/hangingSeed.c | 7 ++ src/enemy/helmasaur.c | 7 ++ src/enemy/keaton.c | 7 ++ src/enemy/keese.c | 7 ++ src/enemy/lakitu.c | 7 ++ src/enemy/lakituCloud.c | 7 ++ src/enemy/leever.c | 7 ++ src/enemy/likeLike.c | 7 ++ src/enemy/madderpillar.c | 7 ++ src/enemy/mazaalBracelet.c | 7 ++ src/enemy/mazaalHand.c | 7 ++ src/enemy/mazaalHead.c | 7 ++ src/enemy/mazaalMacro.c | 7 ++ src/enemy/miniFireballGuy.c | 7 ++ src/enemy/miniSlime.c | 7 ++ src/enemy/moldorm.c | 7 ++ src/enemy/moldworm.c | 7 ++ src/enemy/octorok.c | 7 ++ src/enemy/octorokBoss.c | 7 ++ src/enemy/peahat.c | 7 ++ src/enemy/pesto.c | 7 ++ src/enemy/puffstool.c | 7 ++ src/enemy/rockChuchu.c | 7 ++ src/enemy/rollobite.c | 7 ++ src/enemy/rope.c | 7 ++ src/enemy/ropeGolden.c | 7 ++ src/enemy/rupeeLike.c | 7 ++ src/enemy/sensorBladeTrap.c | 7 ++ src/enemy/slime.c | 7 ++ src/enemy/sluggula.c | 7 ++ src/enemy/smallPesto.c | 7 ++ src/enemy/spark.c | 7 ++ src/enemy/spearMoblin.c | 7 ++ src/enemy/spikedBeetle.c | 7 ++ src/enemy/spinyChuchu.c | 7 ++ src/enemy/tektite.c | 7 ++ src/enemy/tektiteGolden.c | 7 ++ src/enemy/treeItem.c | 7 ++ src/enemy/vaatiArm.c | 7 ++ src/enemy/vaatiBall.c | 7 ++ src/enemy/vaatiEyesMacro.c | 7 ++ src/enemy/vaatiProjectile.c | 7 ++ src/enemy/vaatiRebornEnemy.c | 7 ++ src/enemy/vaatiTransfigured.c | 7 ++ src/enemy/vaatiTransfiguredEye.c | 7 ++ src/enemy/vaatiWrath.c | 7 ++ src/enemy/vaatiWrathEye.c | 7 ++ src/enemy/wallMaster.c | 7 ++ src/enemy/wallMaster2.c | 7 ++ src/enemy/waterDrop.c | 7 ++ src/enemy/wisp.c | 7 ++ src/fileselect.c | 7 ++ src/game.c | 7 ++ src/player.c | 7 ++ src/title.c | 7 ++ 78 files changed, 845 insertions(+), 313 deletions(-) create mode 100644 src/debug.c delete mode 100644 src/debugScreen.c create mode 100644 src/demo.c delete mode 100644 src/demoScreen.c (limited to 'src') diff --git a/src/debug.c b/src/debug.c new file mode 100644 index 00000000..19b3ae04 --- /dev/null +++ b/src/debug.c @@ -0,0 +1,103 @@ +/** + * @file debug.c + * @ingroup Tasks + * + * @brief Debug task + */ + +#include "global.h" +#include "sound.h" +#include "common.h" +#include "functions.h" +#include "main.h" +#include "menu.h" +#include "screen.h" +#include "message.h" +#include "game.h" + +extern void (*const gUnk_08109A30[])(void); + +void DebugTask(void) { + gUnk_08109A30[gMain.state](); +} + +void sub_0805FA04(void) { + DispReset(1); + MemClear(&gBG0Buffer, sizeof(gBG0Buffer)); + MemClear(&gBG3Buffer, sizeof(gBG3Buffer)); + gScreen.lcd.displayControl = DISPCNT_BG0_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_1D_MAP; + gScreen.bg0.xOffset = 0; + gScreen.bg0.yOffset = 0; + gScreen.bg3.xOffset = 0; + gScreen.bg3.yOffset = 0; + gScreen.bg3.control = BGCNT_SCREENBASE(30) | BGCNT_PRIORITY(3) | BGCNT_CHARBASE(3); + gScreen.bg3.updated = 1; + MessageInitialize(); + MemClear((void*)&gUnk_02032EC0, sizeof(UI)); + MemClear((void*)&gMenu, sizeof(Menu)); + gMenu.unk16 = gSaveHeader->language; + LoadGfxGroups(); + SetColor(0, 0x1144); + gMain.state = 1; + InitSoundPlayingInfo(); + ResetFadeMask(); +} + +void sub_0805FA98(void) { + int iVar1; + + switch (gInput.newKeys) { + case DPAD_UP: + gMenu.focusCoords[1] -= 1; + break; + case DPAD_DOWN: + gMenu.focusCoords[1] += 1; + break; + case L_BUTTON: + gMenu.focusCoords[0] ^= 1; + if (gMenu.focusCoords[0] == 0) { + gScreen.bg0.control = BGCNT_SCREENBASE(31) | BGCNT_CHARBASE(3); + gScreen.bg3.control = BGCNT_SCREENBASE(30) | BGCNT_CHARBASE(3) | BGCNT_PRIORITY(3); + } else { + gScreen.bg0.control = BGCNT_SCREENBASE(31) | BGCNT_CHARBASE(3) | BGCNT_PRIORITY(3); + gScreen.bg3.control = BGCNT_SCREENBASE(30) | BGCNT_CHARBASE(3); + } + break; + case R_BUTTON: + gSaveHeader->language = gMenu.unk16; + MessageFromTarget(gMenu.unk14 * 0x100 + gMenu.unk15); + break; + case B_BUTTON: + MessageInitialize(); + break; + default: + switch (gInput.unk4) { + case DPAD_LEFT: + iVar1 = -1; + break; + case DPAD_RIGHT: + iVar1 = 1; + break; + default: + iVar1 = 0; + break; + } + switch (gMenu.focusCoords[1]) { + case 0: + gMenu.unk14 = (gMenu.unk14 + iVar1 + 0x50) % 0x50; + break; + case 1: + gMenu.unk15 += iVar1; + break; + case 2: + gMenu.unk16 = (gMenu.unk16 + iVar1 + 7) % 7; + break; + } + } + gMenu.focusCoords[1] = (gMenu.focusCoords[1] + 3) % 3; + gScreen.bg3.updated = 1; +} + +void sub_0805FBC4(void) { + SetTask(TASK_TITLE); +} diff --git a/src/debugScreen.c b/src/debugScreen.c deleted file mode 100644 index a4772841..00000000 --- a/src/debugScreen.c +++ /dev/null @@ -1,96 +0,0 @@ -#include "global.h" -#include "sound.h" -#include "common.h" -#include "functions.h" -#include "main.h" -#include "menu.h" -#include "screen.h" -#include "message.h" -#include "game.h" - -extern void (*const gUnk_08109A30[])(void); - -void DebugTask(void) { - gUnk_08109A30[gMain.state](); -} - -void sub_0805FA04(void) { - DispReset(1); - MemClear(&gBG0Buffer, sizeof(gBG0Buffer)); - MemClear(&gBG3Buffer, sizeof(gBG3Buffer)); - gScreen.lcd.displayControl = DISPCNT_BG0_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_1D_MAP; - gScreen.bg0.xOffset = 0; - gScreen.bg0.yOffset = 0; - gScreen.bg3.xOffset = 0; - gScreen.bg3.yOffset = 0; - gScreen.bg3.control = BGCNT_SCREENBASE(30) | BGCNT_PRIORITY(3) | BGCNT_CHARBASE(3); - gScreen.bg3.updated = 1; - MessageInitialize(); - MemClear((void*)&gUnk_02032EC0, sizeof(UI)); - MemClear((void*)&gMenu, sizeof(Menu)); - gMenu.unk16 = gSaveHeader->language; - LoadGfxGroups(); - SetColor(0, 0x1144); - gMain.state = 1; - InitSoundPlayingInfo(); - ResetFadeMask(); -} - -void sub_0805FA98(void) { - int iVar1; - - switch (gInput.newKeys) { - case DPAD_UP: - gMenu.focusCoords[1] -= 1; - break; - case DPAD_DOWN: - gMenu.focusCoords[1] += 1; - break; - case L_BUTTON: - gMenu.focusCoords[0] ^= 1; - if (gMenu.focusCoords[0] == 0) { - gScreen.bg0.control = BGCNT_SCREENBASE(31) | BGCNT_CHARBASE(3); - gScreen.bg3.control = BGCNT_SCREENBASE(30) | BGCNT_CHARBASE(3) | BGCNT_PRIORITY(3); - } else { - gScreen.bg0.control = BGCNT_SCREENBASE(31) | BGCNT_CHARBASE(3) | BGCNT_PRIORITY(3); - gScreen.bg3.control = BGCNT_SCREENBASE(30) | BGCNT_CHARBASE(3); - } - break; - case R_BUTTON: - gSaveHeader->language = gMenu.unk16; - MessageFromTarget(gMenu.unk14 * 0x100 + gMenu.unk15); - break; - case B_BUTTON: - MessageInitialize(); - break; - default: - switch (gInput.unk4) { - case DPAD_LEFT: - iVar1 = -1; - break; - case DPAD_RIGHT: - iVar1 = 1; - break; - default: - iVar1 = 0; - break; - } - switch (gMenu.focusCoords[1]) { - case 0: - gMenu.unk14 = (gMenu.unk14 + iVar1 + 0x50) % 0x50; - break; - case 1: - gMenu.unk15 += iVar1; - break; - case 2: - gMenu.unk16 = (gMenu.unk16 + iVar1 + 7) % 7; - break; - } - } - gMenu.focusCoords[1] = (gMenu.focusCoords[1] + 3) % 3; - gScreen.bg3.updated = 1; -} - -void sub_0805FBC4(void) { - SetTask(TASK_TITLE); -} diff --git a/src/demo.c b/src/demo.c new file mode 100644 index 00000000..6364397c --- /dev/null +++ b/src/demo.c @@ -0,0 +1,224 @@ +/** + * @file demo.c + * @ingroup Tasks + * + * @brief Demo task + */ + +#include "global.h" +#include "functions.h" +#include "main.h" +#include "common.h" +#include "message.h" +#include "fileselect.h" +#include "screen.h" +#include "game.h" + +extern void (*const demoFunctions[])(void); +void sub_080A30AC(void); + +extern u8 gUnk_02000004; +void sub_080A3198(u32, u32); + +extern u8 gUnk_02017760[]; +extern u8 gUnk_08A05751[]; + +// sprite_table +extern void gUnk_089FD1B4; +extern void gUnk_089FD2F4; + +extern u16 gUnk_08127CC8[4]; +extern void* gUnk_08127C98; +extern u8 gUnk_08A068BF[129]; + +void DemoTask(void) { + FlushSprites(); + demoFunctions[gMain.state](); + sub_080A30AC(); + CopyOAM(); +} + +void sub_080A2E40(void) { + DispReset(1); + InitSoundPlayingInfo(); + MemClear((void*)VRAM, 0x80); + MessageInitialize(); + EraseAllEntities(); + ResetPalettes(); + ResetPaletteTable(0); + MemClear(&gUnk_02032EC0, sizeof gUnk_02032EC0); + MemClear(&gChooseFileState, sizeof gChooseFileState); + MemClear(&gBG0Buffer, sizeof gBG0Buffer); + LoadGfxGroups(); + LoadPaletteGroup(0xb5); + LoadGfxGroup(0x56); + MemCopy(&gUnk_089FD1B4, &gUnk_02017760[0], 0x100); + MemCopy(&gUnk_089FD1B4, &gUnk_02017760[0x200], 0x100); + MemCopy(&gUnk_089FD2F4, (void*)0x6000000, 0x8000); + MemCopy(&gUnk_089FD2F4, (void*)0x6010000, 0x8000); + MemCopy(&gUnk_08A05751, &gBG1Buffer, 0x800); + MemCopy(&gUnk_08A05751[0x800], &gBG2Buffer, 0x800); + gScreen.lcd.displayControl = 0x1f00; + gScreen.bg1.control = 0x1c81; + gScreen.bg2.control = 0x1d82; + gScreen.bg3.control = 0x1e0b; + gScreen.bg1.updated = 1; + gScreen.bg2.updated = 1; + gScreen.bg3.updated = 1; + gScreen.controls.layerFXControl = 0x1044; + gScreen.controls.alphaBlend = 0xb04; + { + // TODO write to 0x2000004 + u32 addr = (0x80 << 0x12); + *(u8*)(addr + 4) = 0; + } + sub_080A3198(0, 0); + gMain.state = 1; + SoundReq(BGM_FILE_SELECT); + SetFade(4, 8); +} + +void sub_080A2F8C(void) { + if (gFadeControl.active == 0) { + switch (gMain.substate) { + case 0: + gMain.substate = 1; + { + // TODO write to 0x2000005 + u32 addr = (0x80 << 0x12); + *(u8*)(addr + 5) = 1; + *(u8*)(addr + 6) = 1; + } + gMain.state = 2; + SetFade(5, 8); + break; + case 1: + SetTask(TASK_GAME); + break; + } + } +} + +// The condition on the left dpad is very convuluted for some reason (instead oj just an equality check). +// This causes the entire function heirarchy to change on a whim and I couldn't quite figure out +// the correct conditions/code to make it like the original function. +NONMATCH("asm/non_matching/demoScreen/sub_080A2FD0.inc", void sub_080A2FD0(void)) { + s32 tmp; + u32 tmp2; + u32 val; + s32 tmp3; + u32 unk_0x0; + u32 tmp4; + s32 tmp5; + u32 keys; + + if (gFadeControl.active == 0) { + val = 0; + keys = gInput.heldKeys; + switch (keys) { + case DPAD_RIGHT: { + if (gChooseFileState.unk_0x0 == 0) { + val = 1; + gChooseFileState.unk_0x20 = 4; + SoundReq(SFX_TEXTBOX_CHOICE); + } + } + case DPAD_LEFT: { + if (gChooseFileState.unk_0x0 == 0) { + val = -1; + gChooseFileState.unk_0x20 = 0xfc; + SoundReq(SFX_TEXTBOX_CHOICE); + } + } + case START_BUTTON: + case A_BUTTON: { + if (gChooseFileState.unk_0x0 == 0) { + gMain.task = 2; + gMain.state = gChooseFileState.unk_0x0; + SoundReq(SFX_TEXTBOX_SELECT); + } + } + } + tmp = gSaveHeader->saveFileId; + tmp2 = val + 3; + tmp += tmp2; + gSaveHeader->saveFileId = tmp % 3; + + tmp3 = gChooseFileState.unk_0x10; + + tmp = gSaveHeader->saveFileId; + tmp *= 0x68; + + if (tmp != tmp3) { + tmp5 = gChooseFileState.unk_0x20; + tmp5 += tmp3; + gChooseFileState.unk_0x10 = (tmp5 + (0x9c << 1)) % (0x9c << 1); + unk_0x0 = 1; + } else { + unk_0x0 = 0; + } + + gChooseFileState.unk_0x0 = unk_0x0; + sub_080A3198(gSaveHeader->saveFileId, 0); + } +} +END_NONMATCH + +NONMATCH("asm/non_matching/demoScreen/sub_080A30AC.inc", void sub_080A30AC(void)) { + u32 unk_0x10; + u8* ptr; + u8* currentPtr; + u32 offset; + u32 xoffset; + gOamCmd._4 = 0x2000; + gOamCmd._6 = 0; + gOamCmd._8 = 0xc00; + gOamCmd.y = 0x40; + unk_0x10 = gChooseFileState.unk_0x10; + gOamCmd.x = 0xFFFFFED8 - unk_0x10; + offset = *(u32*)gUnk_08A068BF; + ptr = gUnk_08A068BF - 0xc; + sub_080ADA04(&gOamCmd, ptr + offset); + // FIX: original assembly uses r1 for xoffset for no apparent reason. Could not make it compile to do the same. + // Maybe the original code was some sort of loop unrolling. + xoffset = -0xc0; + gOamCmd.x = xoffset - unk_0x10; + sub_080ADA04(&gOamCmd, ptr + *(u32*)(ptr + 4)); + xoffset = -0x58; + gOamCmd.x = xoffset - unk_0x10; + sub_080ADA04(&gOamCmd, ptr + *(u32*)(ptr + 8)); + xoffset = 0x10; + gOamCmd.x = xoffset - unk_0x10; + sub_080ADA04(&gOamCmd, ptr + *(u32*)(gUnk_08A068BF)); + xoffset = 0x78; + gOamCmd.x = xoffset - unk_0x10; + sub_080ADA04(&gOamCmd, ptr + *(u32*)(ptr + 4)); + xoffset = 0xe0; + gOamCmd.x = xoffset - unk_0x10; + sub_080ADA04(&gOamCmd, ptr + *(u32*)(ptr + 8)); + xoffset = 0xa4 << 1; + gOamCmd.x = xoffset - unk_0x10; + sub_080ADA04(&gOamCmd, ptr + *(u32*)(gUnk_08A068BF)); + xoffset = 0xd8 << 1; + gOamCmd.x = xoffset - unk_0x10; + sub_080ADA04(&gOamCmd, ptr + *(u32*)(ptr + 4)); + xoffset = 0x86 << 2; + gOamCmd.x = xoffset - unk_0x10; + sub_080ADA04(&gOamCmd, ptr + *(u32*)(ptr + 8)); +} +END_NONMATCH + +void sub_080A3198(u32 param_1, u32 param_2) { + u16 r4 = gUnk_08127CC8[param_1]; + + if (gChooseFileState.unk_0x12 != r4) { + gChooseFileState.unk_0x12 = r4; + MemClear(gUnk_08127C98 - 0x1e, 0x180); + + if (r4 != 0) { + sub_0805F46C(r4, &gUnk_08127C98); + } + + gScreen.bg0.updated = 1; + } +} diff --git a/src/demoScreen.c b/src/demoScreen.c deleted file mode 100644 index dd8e29b4..00000000 --- a/src/demoScreen.c +++ /dev/null @@ -1,217 +0,0 @@ -#include "global.h" -#include "functions.h" -#include "main.h" -#include "common.h" -#include "message.h" -#include "fileselect.h" -#include "screen.h" -#include "game.h" - -extern void (*const demoFunctions[])(void); -void sub_080A30AC(void); - -extern u8 gUnk_02000004; -void sub_080A3198(u32, u32); - -extern u8 gUnk_02017760[]; -extern u8 gUnk_08A05751[]; - -// sprite_table -extern void gUnk_089FD1B4; -extern void gUnk_089FD2F4; - -extern u16 gUnk_08127CC8[4]; -extern void* gUnk_08127C98; -extern u8 gUnk_08A068BF[129]; - -void DemoTask(void) { - FlushSprites(); - demoFunctions[gMain.state](); - sub_080A30AC(); - CopyOAM(); -} - -void sub_080A2E40(void) { - DispReset(1); - InitSoundPlayingInfo(); - MemClear((void*)VRAM, 0x80); - MessageInitialize(); - EraseAllEntities(); - ResetPalettes(); - ResetPaletteTable(0); - MemClear(&gUnk_02032EC0, sizeof gUnk_02032EC0); - MemClear(&gChooseFileState, sizeof gChooseFileState); - MemClear(&gBG0Buffer, sizeof gBG0Buffer); - LoadGfxGroups(); - LoadPaletteGroup(0xb5); - LoadGfxGroup(0x56); - MemCopy(&gUnk_089FD1B4, &gUnk_02017760[0], 0x100); - MemCopy(&gUnk_089FD1B4, &gUnk_02017760[0x200], 0x100); - MemCopy(&gUnk_089FD2F4, (void*)0x6000000, 0x8000); - MemCopy(&gUnk_089FD2F4, (void*)0x6010000, 0x8000); - MemCopy(&gUnk_08A05751, &gBG1Buffer, 0x800); - MemCopy(&gUnk_08A05751[0x800], &gBG2Buffer, 0x800); - gScreen.lcd.displayControl = 0x1f00; - gScreen.bg1.control = 0x1c81; - gScreen.bg2.control = 0x1d82; - gScreen.bg3.control = 0x1e0b; - gScreen.bg1.updated = 1; - gScreen.bg2.updated = 1; - gScreen.bg3.updated = 1; - gScreen.controls.layerFXControl = 0x1044; - gScreen.controls.alphaBlend = 0xb04; - { - // TODO write to 0x2000004 - u32 addr = (0x80 << 0x12); - *(u8*)(addr + 4) = 0; - } - sub_080A3198(0, 0); - gMain.state = 1; - SoundReq(BGM_FILE_SELECT); - SetFade(4, 8); -} - -void sub_080A2F8C(void) { - if (gFadeControl.active == 0) { - switch (gMain.substate) { - case 0: - gMain.substate = 1; - { - // TODO write to 0x2000005 - u32 addr = (0x80 << 0x12); - *(u8*)(addr + 5) = 1; - *(u8*)(addr + 6) = 1; - } - gMain.state = 2; - SetFade(5, 8); - break; - case 1: - SetTask(TASK_GAME); - break; - } - } -} - -// The condition on the left dpad is very convuluted for some reason (instead oj just an equality check). -// This causes the entire function heirarchy to change on a whim and I couldn't quite figure out -// the correct conditions/code to make it like the original function. -NONMATCH("asm/non_matching/demoScreen/sub_080A2FD0.inc", void sub_080A2FD0(void)) { - s32 tmp; - u32 tmp2; - u32 val; - s32 tmp3; - u32 unk_0x0; - u32 tmp4; - s32 tmp5; - u32 keys; - - if (gFadeControl.active == 0) { - val = 0; - keys = gInput.heldKeys; - switch (keys) { - case DPAD_RIGHT: { - if (gChooseFileState.unk_0x0 == 0) { - val = 1; - gChooseFileState.unk_0x20 = 4; - SoundReq(SFX_TEXTBOX_CHOICE); - } - } - case DPAD_LEFT: { - if (gChooseFileState.unk_0x0 == 0) { - val = -1; - gChooseFileState.unk_0x20 = 0xfc; - SoundReq(SFX_TEXTBOX_CHOICE); - } - } - case START_BUTTON: - case A_BUTTON: { - if (gChooseFileState.unk_0x0 == 0) { - gMain.task = 2; - gMain.state = gChooseFileState.unk_0x0; - SoundReq(SFX_TEXTBOX_SELECT); - } - } - } - tmp = gSaveHeader->saveFileId; - tmp2 = val + 3; - tmp += tmp2; - gSaveHeader->saveFileId = tmp % 3; - - tmp3 = gChooseFileState.unk_0x10; - - tmp = gSaveHeader->saveFileId; - tmp *= 0x68; - - if (tmp != tmp3) { - tmp5 = gChooseFileState.unk_0x20; - tmp5 += tmp3; - gChooseFileState.unk_0x10 = (tmp5 + (0x9c << 1)) % (0x9c << 1); - unk_0x0 = 1; - } else { - unk_0x0 = 0; - } - - gChooseFileState.unk_0x0 = unk_0x0; - sub_080A3198(gSaveHeader->saveFileId, 0); - } -} -END_NONMATCH - -NONMATCH("asm/non_matching/demoScreen/sub_080A30AC.inc", void sub_080A30AC(void)) { - u32 unk_0x10; - u8* ptr; - u8* currentPtr; - u32 offset; - u32 xoffset; - gOamCmd._4 = 0x2000; - gOamCmd._6 = 0; - gOamCmd._8 = 0xc00; - gOamCmd.y = 0x40; - unk_0x10 = gChooseFileState.unk_0x10; - gOamCmd.x = 0xFFFFFED8 - unk_0x10; - offset = *(u32*)gUnk_08A068BF; - ptr = gUnk_08A068BF - 0xc; - sub_080ADA04(&gOamCmd, ptr + offset); - // FIX: original assembly uses r1 for xoffset for no apparent reason. Could not make it compile to do the same. - // Maybe the original code was some sort of loop unrolling. - xoffset = -0xc0; - gOamCmd.x = xoffset - unk_0x10; - sub_080ADA04(&gOamCmd, ptr + *(u32*)(ptr + 4)); - xoffset = -0x58; - gOamCmd.x = xoffset - unk_0x10; - sub_080ADA04(&gOamCmd, ptr + *(u32*)(ptr + 8)); - xoffset = 0x10; - gOamCmd.x = xoffset - unk_0x10; - sub_080ADA04(&gOamCmd, ptr + *(u32*)(gUnk_08A068BF)); - xoffset = 0x78; - gOamCmd.x = xoffset - unk_0x10; - sub_080ADA04(&gOamCmd, ptr + *(u32*)(ptr + 4)); - xoffset = 0xe0; - gOamCmd.x = xoffset - unk_0x10; - sub_080ADA04(&gOamCmd, ptr + *(u32*)(ptr + 8)); - xoffset = 0xa4 << 1; - gOamCmd.x = xoffset - unk_0x10; - sub_080ADA04(&gOamCmd, ptr + *(u32*)(gUnk_08A068BF)); - xoffset = 0xd8 << 1; - gOamCmd.x = xoffset - unk_0x10; - sub_080ADA04(&gOamCmd, ptr + *(u32*)(ptr + 4)); - xoffset = 0x86 << 2; - gOamCmd.x = xoffset - unk_0x10; - sub_080ADA04(&gOamCmd, ptr + *(u32*)(ptr + 8)); -} -END_NONMATCH - -void sub_080A3198(u32 param_1, u32 param_2) { - u16 r4 = gUnk_08127CC8[param_1]; - - if (gChooseFileState.unk_0x12 != r4) { - gChooseFileState.unk_0x12 = r4; - MemClear(gUnk_08127C98 - 0x1e, 0x180); - - if (r4 != 0) { - sub_0805F46C(r4, &gUnk_08127C98); - } - - gScreen.bg0.updated = 1; - } -} diff --git a/src/enemy/acroBandits.c b/src/enemy/acroBandits.c index 2fe6e41b..b73c8104 100644 --- a/src/enemy/acroBandits.c +++ b/src/enemy/acroBandits.c @@ -1,3 +1,10 @@ +/** + * @file acroBandits.c + * @ingroup Enemies + * + * @brief Acro Bandits enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/beetle.c b/src/enemy/beetle.c index bba26d7a..c03ff919 100644 --- a/src/enemy/beetle.c +++ b/src/enemy/beetle.c @@ -1,3 +1,10 @@ +/** + * @file beetle.c + * @ingroup Enemies + * + * @brief Beetle enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/bladeTrap.c b/src/enemy/bladeTrap.c index eeee9ffe..815b0dcd 100644 --- a/src/enemy/bladeTrap.c +++ b/src/enemy/bladeTrap.c @@ -1,3 +1,10 @@ +/** + * @file bladeTrap.c + * @ingroup Enemies + * + * @brief Blade Trap enemy + */ + #include "sound.h" #include "entity.h" #include "room.h" diff --git a/src/enemy/bobomb.c b/src/enemy/bobomb.c index 94ba6b9d..ebc47375 100644 --- a/src/enemy/bobomb.c +++ b/src/enemy/bobomb.c @@ -1,3 +1,10 @@ +/** + * @file bobomb.c + * @ingroup Enemies + * + * @brief Bobomb enemy + */ + #include "asm.h" #include "sound.h" #include "enemy.h" diff --git a/src/enemy/bombPeahat.c b/src/enemy/bombPeahat.c index 3a3eddc7..dbdda527 100644 --- a/src/enemy/bombPeahat.c +++ b/src/enemy/bombPeahat.c @@ -1,3 +1,10 @@ +/** + * @file bombPeahat.c + * @ingroup Enemies + * + * @brief Bomb Peahat enemy + */ + #include "asm.h" #include "entity.h" #include "enemy.h" diff --git a/src/enemy/bowMoblin.c b/src/enemy/bowMoblin.c index 29fdd6bc..2889b8ac 100644 --- a/src/enemy/bowMoblin.c +++ b/src/enemy/bowMoblin.c @@ -1,3 +1,10 @@ +/** + * @file bowMoblin.c + * @ingroup Enemies + * + * @brief Bow Moblin enemy + */ + #define NENT_DEPRECATED #include "global.h" #include "entity.h" diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c index b2b20f06..5f2d6535 100644 --- a/src/enemy/businessScrub.c +++ b/src/enemy/businessScrub.c @@ -1,3 +1,10 @@ +/** + * @file businessScrub.c + * @ingroup Enemies + * + * @brief Business Scrub enemy + */ + #include "asm.h" #include "enemy.h" #include "message.h" diff --git a/src/enemy/chaser.c b/src/enemy/chaser.c index af6f4b86..2efbe92b 100644 --- a/src/enemy/chaser.c +++ b/src/enemy/chaser.c @@ -1,3 +1,10 @@ +/** + * @file chaser.c + * @ingroup Enemies + * + * @brief Chaser enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/chuchu.c b/src/enemy/chuchu.c index 308fb47f..9d8d4ff3 100644 --- a/src/enemy/chuchu.c +++ b/src/enemy/chuchu.c @@ -1,3 +1,10 @@ +/** + * @file chuchu.c + * @ingroup Enemies + * + * @brief Chuchu enemy + */ + #include "asm.h" #include "enemy.h" #include "functions.h" diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c index 29c1611c..4204609f 100644 --- a/src/enemy/chuchuBoss.c +++ b/src/enemy/chuchuBoss.c @@ -1,3 +1,10 @@ +/** + * @file chuchuBoss.c + * @ingroup Enemies + * + * @brief Chuchu Boss enemy + */ + #include "enemy.h" void sub_08027870(Entity*); diff --git a/src/enemy/cuccoChickAggr.c b/src/enemy/cuccoChickAggr.c index 46b7c58b..e4946da6 100644 --- a/src/enemy/cuccoChickAggr.c +++ b/src/enemy/cuccoChickAggr.c @@ -1,3 +1,10 @@ +/** + * @file cuccoChickAggr.c + * @ingroup Enemies + * + * @brief Cucco Chick Aggr enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/darkNut.c b/src/enemy/darkNut.c index 7e200a8a..7084ae0c 100644 --- a/src/enemy/darkNut.c +++ b/src/enemy/darkNut.c @@ -1,3 +1,10 @@ +/** + * @file darkNut.c + * @ingroup Enemies + * + * @brief Dark Nut enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/doorMimic.c b/src/enemy/doorMimic.c index 413046c9..bcb1e1af 100644 --- a/src/enemy/doorMimic.c +++ b/src/enemy/doorMimic.c @@ -1,3 +1,10 @@ +/** + * @file doorMimic.c + * @ingroup Enemies + * + * @brief Door Mimic enemy + */ + #include "sound.h" #include "enemy.h" #include "functions.h" diff --git a/src/enemy/enemy4D.c b/src/enemy/enemy4D.c index 3e6508ad..b44585da 100644 --- a/src/enemy/enemy4D.c +++ b/src/enemy/enemy4D.c @@ -1,3 +1,10 @@ +/** + * @file enemy4D.c + * @ingroup Enemies + * + * @brief enemy 4D + */ + #include "global.h" #include "entity.h" #include "enemy.h" diff --git a/src/enemy/enemyE.c b/src/enemy/enemyE.c index 5f712d7d..d19d110b 100644 --- a/src/enemy/enemyE.c +++ b/src/enemy/enemyE.c @@ -1,3 +1,10 @@ +/** + * @file enemyE.c + * @ingroup Enemies + * + * @brief enemy E + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/fallingBoulder.c b/src/enemy/fallingBoulder.c index bac04237..d414ce52 100644 --- a/src/enemy/fallingBoulder.c +++ b/src/enemy/fallingBoulder.c @@ -1,3 +1,10 @@ +/** + * @file fallingBoulder.c + * @ingroup Enemies + * + * @brief Falling Boulder enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/fireballGuy.c b/src/enemy/fireballGuy.c index 8b2fc55a..5e81c1d6 100644 --- a/src/enemy/fireballGuy.c +++ b/src/enemy/fireballGuy.c @@ -1,3 +1,10 @@ +/** + * @file fireballGuy.c + * @ingroup Enemies + * + * @brief Fireball Guy enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/gibdo.c b/src/enemy/gibdo.c index 71dfe53f..9a4929fe 100644 --- a/src/enemy/gibdo.c +++ b/src/enemy/gibdo.c @@ -1,3 +1,10 @@ +/** + * @file gibdo.c + * @ingroup Enemies + * + * @brief Gibdo enemy + */ + #include "global.h" #include "enemy.h" #include "object.h" diff --git a/src/enemy/gyorgMale.c b/src/enemy/gyorgMale.c index dc99d749..95df10fe 100644 --- a/src/enemy/gyorgMale.c +++ b/src/enemy/gyorgMale.c @@ -1,3 +1,10 @@ +/** + * @file gyorgMale.c + * @ingroup Enemies + * + * @brief Gyorg Male enemy + */ + #include "global.h" #include "enemy.h" #include "player.h" diff --git a/src/enemy/hangingSeed.c b/src/enemy/hangingSeed.c index d63e3650..4839642f 100644 --- a/src/enemy/hangingSeed.c +++ b/src/enemy/hangingSeed.c @@ -1,3 +1,10 @@ +/** + * @file hangingSeed.c + * @ingroup Enemies + * + * @brief Hanging Seed enemy + */ + #include "entity.h" #include "enemy.h" #include "functions.h" diff --git a/src/enemy/helmasaur.c b/src/enemy/helmasaur.c index 9539b36d..3187c340 100644 --- a/src/enemy/helmasaur.c +++ b/src/enemy/helmasaur.c @@ -1,3 +1,10 @@ +/** + * @file helmasaur.c + * @ingroup Enemies + * + * @brief Helmasaur enemy + */ + #include "enemy.h" #include "object.h" #include "functions.h" diff --git a/src/enemy/keaton.c b/src/enemy/keaton.c index 6c551e9c..3e1a0679 100644 --- a/src/enemy/keaton.c +++ b/src/enemy/keaton.c @@ -1,3 +1,10 @@ +/** + * @file keaton.c + * @ingroup Enemies + * + * @brief keaton enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/keese.c b/src/enemy/keese.c index 1b3c4e11..9eb4ecbb 100644 --- a/src/enemy/keese.c +++ b/src/enemy/keese.c @@ -1,3 +1,10 @@ +/** + * @file keese.c + * @ingroup Enemies + * + * @brief Keese enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/lakitu.c b/src/enemy/lakitu.c index 9179a7a5..25dd93ea 100644 --- a/src/enemy/lakitu.c +++ b/src/enemy/lakitu.c @@ -1,3 +1,10 @@ +/** + * @file lakitu.c + * @ingroup Enemies + * + * @brief Lakitu enemy + */ + #include "global.h" #include "enemy.h" #include "functions.h" diff --git a/src/enemy/lakituCloud.c b/src/enemy/lakituCloud.c index 502e4ab8..3caf7608 100644 --- a/src/enemy/lakituCloud.c +++ b/src/enemy/lakituCloud.c @@ -1,3 +1,10 @@ +/** + * @file lakituCloud.c + * @ingroup Enemies + * + * @brief Lakitu Cloud enemy + */ + #include "global.h" #include "asm.h" #include "entity.h" diff --git a/src/enemy/leever.c b/src/enemy/leever.c index e7624432..3f33914b 100644 --- a/src/enemy/leever.c +++ b/src/enemy/leever.c @@ -1,3 +1,10 @@ +/** + * @file leever.c + * @ingroup Enemies + * + * @brief Leever enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/likeLike.c b/src/enemy/likeLike.c index 7d764c07..df692772 100644 --- a/src/enemy/likeLike.c +++ b/src/enemy/likeLike.c @@ -1,3 +1,10 @@ +/** + * @file likeLike.c + * @ingroup Enemies + * + * @brief Like Like enemy + */ + #include "enemy.h" #include "message.h" #include "save.h" diff --git a/src/enemy/madderpillar.c b/src/enemy/madderpillar.c index 5750e102..a804035b 100644 --- a/src/enemy/madderpillar.c +++ b/src/enemy/madderpillar.c @@ -1,3 +1,10 @@ +/** + * @file madderpillar.c + * @ingroup Enemies + * + * @brief Madderpillar enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/mazaalBracelet.c b/src/enemy/mazaalBracelet.c index 9f40f40c..f976a2e7 100644 --- a/src/enemy/mazaalBracelet.c +++ b/src/enemy/mazaalBracelet.c @@ -1,3 +1,10 @@ +/** + * @file mazaalBracelet.c + * @ingroup Enemies + * + * @brief Mazaal Bracelet enemy + */ + #include "enemy.h" #include "object.h" #include "functions.h" diff --git a/src/enemy/mazaalHand.c b/src/enemy/mazaalHand.c index 2a64cd24..b8f0eaf3 100644 --- a/src/enemy/mazaalHand.c +++ b/src/enemy/mazaalHand.c @@ -1,3 +1,10 @@ +/** + * @file mazaalHand.c + * @ingroup Enemies + * + * @brief Mazaal Hand enemy + */ + #include "entity.h" void sub_08035194(Entity*); diff --git a/src/enemy/mazaalHead.c b/src/enemy/mazaalHead.c index 3a065362..6ca1ca83 100644 --- a/src/enemy/mazaalHead.c +++ b/src/enemy/mazaalHead.c @@ -1,3 +1,10 @@ +/** + * @file mazaalHead.c + * @ingroup Enemies + * + * @brief Mazaal Head enemy + */ + #include "enemy.h" #include "object.h" #include "functions.h" diff --git a/src/enemy/mazaalMacro.c b/src/enemy/mazaalMacro.c index c13bea87..aa47e78b 100644 --- a/src/enemy/mazaalMacro.c +++ b/src/enemy/mazaalMacro.c @@ -1,3 +1,10 @@ +/** + * @file mazaalMacro.c + * @ingroup Enemies + * + * @brief Mazaal Macro enemy + */ + #include "enemy.h" #include "script.h" #include "structures.h" diff --git a/src/enemy/miniFireballGuy.c b/src/enemy/miniFireballGuy.c index 0cde6285..b9a64caf 100644 --- a/src/enemy/miniFireballGuy.c +++ b/src/enemy/miniFireballGuy.c @@ -1,3 +1,10 @@ +/** + * @file miniFireballGuy.c + * @ingroup Enemies + * + * @brief Mini Fireball Guy enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/miniSlime.c b/src/enemy/miniSlime.c index 1bfc3fc6..8de89a28 100644 --- a/src/enemy/miniSlime.c +++ b/src/enemy/miniSlime.c @@ -1,3 +1,10 @@ +/** + * @file miniSlime.c + * @ingroup Enemies + * + * @brief Mini Slime enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/moldorm.c b/src/enemy/moldorm.c index 33a1fa8b..e53f2856 100644 --- a/src/enemy/moldorm.c +++ b/src/enemy/moldorm.c @@ -1,3 +1,10 @@ +/** + * @file moldorm.c + * @ingroup Enemies + * + * @brief Moldorm enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/moldworm.c b/src/enemy/moldworm.c index 3eb92c55..cb055f0b 100644 --- a/src/enemy/moldworm.c +++ b/src/enemy/moldworm.c @@ -1,3 +1,10 @@ +/** + * @file moldworm.c + * @ingroup Enemies + * + * @brief Moldworm enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/octorok.c b/src/enemy/octorok.c index 47d4c486..b1aedfc6 100644 --- a/src/enemy/octorok.c +++ b/src/enemy/octorok.c @@ -1,3 +1,10 @@ +/** + * @file octorok.c + * @ingroup Enemies + * + * @brief Octorok enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/octorokBoss.c b/src/enemy/octorokBoss.c index d368dc5b..8514214a 100644 --- a/src/enemy/octorokBoss.c +++ b/src/enemy/octorokBoss.c @@ -1,3 +1,10 @@ +/** + * @file octorokBoss.c + * @ingroup Enemies + * + * @brief Octorok boss enemy + */ + #include "enemy.h" #include "functions.h" #include "object.h" diff --git a/src/enemy/peahat.c b/src/enemy/peahat.c index e8353ae5..2f08e47a 100644 --- a/src/enemy/peahat.c +++ b/src/enemy/peahat.c @@ -1,3 +1,10 @@ +/** + * @file peahat.c + * @ingroup Enemies + * + * @brief Peahat enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c index 2770f4fa..e0dc9ad1 100644 --- a/src/enemy/pesto.c +++ b/src/enemy/pesto.c @@ -1,3 +1,10 @@ +/** + * @file pesto.c + * @ingroup Enemies + * + * @brief Pesto enemy + */ + #include "enemy.h" #include "object.h" #include "game.h" diff --git a/src/enemy/puffstool.c b/src/enemy/puffstool.c index be5b30d0..6c08d954 100644 --- a/src/enemy/puffstool.c +++ b/src/enemy/puffstool.c @@ -1,3 +1,10 @@ +/** + * @file puffstool.c + * @ingroup Enemies + * + * @brief Puffstool enemy + */ + #include "enemy.h" #include "object.h" #include "functions.h" diff --git a/src/enemy/rockChuchu.c b/src/enemy/rockChuchu.c index dd3987cd..8f86eebb 100644 --- a/src/enemy/rockChuchu.c +++ b/src/enemy/rockChuchu.c @@ -1,3 +1,10 @@ +/** + * @file rockChuchu.c + * @ingroup Enemies + * + * @brief Rock Chuchu enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/rollobite.c b/src/enemy/rollobite.c index bf367eef..9a86c115 100644 --- a/src/enemy/rollobite.c +++ b/src/enemy/rollobite.c @@ -1,3 +1,10 @@ +/** + * @file rollobite.c + * @ingroup Enemies + * + * @brief Rollobite enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/rope.c b/src/enemy/rope.c index bf0a7ecb..d2ca5b18 100644 --- a/src/enemy/rope.c +++ b/src/enemy/rope.c @@ -1,3 +1,10 @@ +/** + * @file rope.c + * @ingroup Enemies + * + * @brief Rope enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/ropeGolden.c b/src/enemy/ropeGolden.c index 136d14c3..581c92d3 100644 --- a/src/enemy/ropeGolden.c +++ b/src/enemy/ropeGolden.c @@ -1,3 +1,10 @@ +/** + * @file ropeGolden.c + * @ingroup Enemies + * + * @brief Golden Rope enemy + */ + #include "global.h" #include "entity.h" #include "functions.h" diff --git a/src/enemy/rupeeLike.c b/src/enemy/rupeeLike.c index cd068b96..d2393187 100644 --- a/src/enemy/rupeeLike.c +++ b/src/enemy/rupeeLike.c @@ -1,3 +1,10 @@ +/** + * @file rupeeLike.c + * @ingroup Enemies + * + * @brief Rupee Like enemy + */ + #include "global.h" #include "asm.h" #include "sound.h" diff --git a/src/enemy/sensorBladeTrap.c b/src/enemy/sensorBladeTrap.c index 2e99de0e..0db62349 100644 --- a/src/enemy/sensorBladeTrap.c +++ b/src/enemy/sensorBladeTrap.c @@ -1,3 +1,10 @@ +/** + * @file sensorBladeTrap.c + * @ingroup Enemies + * + * @brief Sensor Blade Trap enemy + */ + #include "enemy.h" extern u32 sub_0804A024(Entity*, u32, u32); diff --git a/src/enemy/slime.c b/src/enemy/slime.c index e6faf992..e95bc8c7 100644 --- a/src/enemy/slime.c +++ b/src/enemy/slime.c @@ -1,3 +1,10 @@ +/** + * @file slime.c + * @ingroup Enemies + * + * @brief Slime enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/sluggula.c b/src/enemy/sluggula.c index 57a6b416..308d914f 100644 --- a/src/enemy/sluggula.c +++ b/src/enemy/sluggula.c @@ -1,3 +1,10 @@ +/** + * @file sluggula.c + * @ingroup Enemies + * + * @brief Sluggula enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/smallPesto.c b/src/enemy/smallPesto.c index 7e26ab7d..6d444f71 100644 --- a/src/enemy/smallPesto.c +++ b/src/enemy/smallPesto.c @@ -1,3 +1,10 @@ +/** + * @file smallPesto.c + * @ingroup Enemies + * + * @brief Small Pesto enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/spark.c b/src/enemy/spark.c index d96bdfaa..30940109 100644 --- a/src/enemy/spark.c +++ b/src/enemy/spark.c @@ -1,3 +1,10 @@ +/** + * @file spark.c + * @ingroup Enemies + * + * @brief Spark enemy + */ + #include "enemy.h" #include "object.h" #include "functions.h" diff --git a/src/enemy/spearMoblin.c b/src/enemy/spearMoblin.c index 6e35d52a..91475342 100644 --- a/src/enemy/spearMoblin.c +++ b/src/enemy/spearMoblin.c @@ -1,3 +1,10 @@ +/** + * @file spearMoblin.c + * @ingroup Enemies + * + * @brief Spear Moblin enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/spikedBeetle.c b/src/enemy/spikedBeetle.c index ec281989..a6fa4ae6 100644 --- a/src/enemy/spikedBeetle.c +++ b/src/enemy/spikedBeetle.c @@ -1,3 +1,10 @@ +/** + * @file spikedBeetle.c + * @ingroup Enemies + * + * @brief Spiked Beetle enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/spinyChuchu.c b/src/enemy/spinyChuchu.c index 7d5ea60b..a51c8ac4 100644 --- a/src/enemy/spinyChuchu.c +++ b/src/enemy/spinyChuchu.c @@ -1,3 +1,10 @@ +/** + * @file spinyChuchu.c + * @ingroup Enemies + * + * @brief Spiny Chuchu enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/tektite.c b/src/enemy/tektite.c index e029da29..168f69b6 100644 --- a/src/enemy/tektite.c +++ b/src/enemy/tektite.c @@ -1,3 +1,10 @@ +/** + * @file tektite.c + * @ingroup Enemies + * + * @brief Tektite enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/tektiteGolden.c b/src/enemy/tektiteGolden.c index 2fc3bfb0..4c63076d 100644 --- a/src/enemy/tektiteGolden.c +++ b/src/enemy/tektiteGolden.c @@ -1,3 +1,10 @@ +/** + * @file tektiteGolden.c + * @ingroup Enemies + * + * @brief Golden Tektite enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/treeItem.c b/src/enemy/treeItem.c index c1383be0..188476a4 100644 --- a/src/enemy/treeItem.c +++ b/src/enemy/treeItem.c @@ -1,3 +1,10 @@ +/** + * @file treeItem.c + * @ingroup Enemies + * + * @brief Tree Item enemy + */ + #include "global.h" #include "enemy.h" #include "object.h" diff --git a/src/enemy/vaatiArm.c b/src/enemy/vaatiArm.c index cb01f671..be058d3c 100644 --- a/src/enemy/vaatiArm.c +++ b/src/enemy/vaatiArm.c @@ -1,3 +1,10 @@ +/** + * @file vaatiArm.c + * @ingroup Enemies + * + * @brief Vaati Arm enemy + */ + #include "enemy.h" #include "object.h" #include "functions.h" diff --git a/src/enemy/vaatiBall.c b/src/enemy/vaatiBall.c index f02eedd3..760bcb5d 100644 --- a/src/enemy/vaatiBall.c +++ b/src/enemy/vaatiBall.c @@ -1,3 +1,10 @@ +/** + * @file vaatiBall.c + * @ingroup Enemies + * + * @brief Vaati Ball enemy + */ + #include "entity.h" #include "enemy.h" #include "player.h" diff --git a/src/enemy/vaatiEyesMacro.c b/src/enemy/vaatiEyesMacro.c index 6d187547..d268a30e 100644 --- a/src/enemy/vaatiEyesMacro.c +++ b/src/enemy/vaatiEyesMacro.c @@ -1,3 +1,10 @@ +/** + * @file vaatiEyesMacro.c + * @ingroup Enemies + * + * @brief Vaati Eyes Macro enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/vaatiProjectile.c b/src/enemy/vaatiProjectile.c index b770e2e6..d4194d4d 100644 --- a/src/enemy/vaatiProjectile.c +++ b/src/enemy/vaatiProjectile.c @@ -1,3 +1,10 @@ +/** + * @file vaatiProjectile.c + * @ingroup Enemies + * + * @brief Vaati Projectile enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/vaatiRebornEnemy.c b/src/enemy/vaatiRebornEnemy.c index f4732e17..e76ef4f8 100644 --- a/src/enemy/vaatiRebornEnemy.c +++ b/src/enemy/vaatiRebornEnemy.c @@ -1,3 +1,10 @@ +/** + * @file vaatiRebornEnemy.c + * @ingroup Enemies + * + * @brief Vaati Reborn enemy + */ + #include "enemy.h" #include "area.h" #include "functions.h" diff --git a/src/enemy/vaatiTransfigured.c b/src/enemy/vaatiTransfigured.c index 29191e73..62ac8918 100644 --- a/src/enemy/vaatiTransfigured.c +++ b/src/enemy/vaatiTransfigured.c @@ -1,3 +1,10 @@ +/** + * @file vaatiTransfigured.c + * @ingroup Enemies + * + * @brief Vaati Transfigured enemy + */ + #include "enemy.h" #include "object.h" #include "functions.h" diff --git a/src/enemy/vaatiTransfiguredEye.c b/src/enemy/vaatiTransfiguredEye.c index 67e795ac..80fbb07f 100644 --- a/src/enemy/vaatiTransfiguredEye.c +++ b/src/enemy/vaatiTransfiguredEye.c @@ -1,3 +1,10 @@ +/** + * @file vaatiTransfiguredEye.c + * @ingroup Enemies + * + * @brief Vaati Transfigured Eye enemy + */ + #include "entity.h" #include "enemy.h" #include "message.h" diff --git a/src/enemy/vaatiWrath.c b/src/enemy/vaatiWrath.c index 6898a7c9..e77a11cd 100644 --- a/src/enemy/vaatiWrath.c +++ b/src/enemy/vaatiWrath.c @@ -1,3 +1,10 @@ +/** + * @file vaatiWrath.c + * @ingroup Enemies + * + * @brief Vaati Wrath enemy + */ + #include "enemy.h" #include "object.h" #include "message.h" diff --git a/src/enemy/vaatiWrathEye.c b/src/enemy/vaatiWrathEye.c index 126e9912..3a076bb6 100644 --- a/src/enemy/vaatiWrathEye.c +++ b/src/enemy/vaatiWrathEye.c @@ -1,3 +1,10 @@ +/** + * @file vaatiWrathEye.c + * @ingroup Enemies + * + * @brief Vaati Wrath Eye enemy + */ + #include "enemy.h" #include "functions.h" diff --git a/src/enemy/wallMaster.c b/src/enemy/wallMaster.c index 05848590..554ca1c5 100644 --- a/src/enemy/wallMaster.c +++ b/src/enemy/wallMaster.c @@ -1,3 +1,10 @@ +/** + * @file wallMaster.c + * @ingroup Enemies + * + * @brief Wall Master enemy + */ + #include "enemy.h" #include "area.h" #include "functions.h" diff --git a/src/enemy/wallMaster2.c b/src/enemy/wallMaster2.c index c034989b..1e4538dc 100644 --- a/src/enemy/wallMaster2.c +++ b/src/enemy/wallMaster2.c @@ -1,3 +1,10 @@ +/** + * @file wallMaster2.c + * @ingroup Enemies + * + * @brief Wall Master 2 enemy + */ + #include "enemy.h" #include "area.h" #include "functions.h" diff --git a/src/enemy/waterDrop.c b/src/enemy/waterDrop.c index f3b936df..3ce0985c 100644 --- a/src/enemy/waterDrop.c +++ b/src/enemy/waterDrop.c @@ -1,3 +1,10 @@ +/** + * @file waterDrop.c + * @ingroup Enemies + * + * @brief Water Drop enemy + */ + #include "enemy.h" #include "screen.h" #include "object.h" diff --git a/src/enemy/wisp.c b/src/enemy/wisp.c index 190167e5..1d2f7a98 100644 --- a/src/enemy/wisp.c +++ b/src/enemy/wisp.c @@ -1,3 +1,10 @@ +/** + * @file wisp.c + * @ingroup Enemies + * + * @brief Wisp enemy + */ + #include "enemy.h" #include "save.h" #include "object.h" diff --git a/src/fileselect.c b/src/fileselect.c index 3e3d25a9..71ed5e76 100644 --- a/src/fileselect.c +++ b/src/fileselect.c @@ -1,3 +1,10 @@ +/** + * @file fileselect.c + * @ingroup Tasks + * + * @brief File select task + */ + #include "fileselect.h" #include "main.h" #include "common.h" diff --git a/src/game.c b/src/game.c index 523c4e1b..b2aefb17 100644 --- a/src/game.c +++ b/src/game.c @@ -1,3 +1,10 @@ +/** + * @file game.c + * @ingroup Tasks + * + * @brief Game task + */ + #include "global.h" #include "asm.h" #include "sound.h" diff --git a/src/player.c b/src/player.c index cac85584..0efaaf66 100644 --- a/src/player.c +++ b/src/player.c @@ -1,3 +1,10 @@ +/** + * @file player.c + * @ingroup Player + * + * @brief Player entity + */ + #include "global.h" #include "asm.h" #include "sound.h" diff --git a/src/title.c b/src/title.c index 6eebfbb4..d01e6bef 100644 --- a/src/title.c +++ b/src/title.c @@ -1,3 +1,10 @@ +/** + * @file title.c + * @ingroup Tasks + * + * @brief Title task + */ + #include "sound.h" #include "main.h" #include "entity.h" -- cgit v1.2.3