mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-11 15:28:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #701 from Henny022p/cleanup/250302

Browse Source 
Various code cleanup changes
This commit is contained in:
Henny022p
2026-02-08 18:32:38 +01:00
committed by GitHub
parent 73901a0a01 5b2cafdc89
commit 5ab63f00e5
599 changed files with 5472 additions and 4041 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/affine.c
+1 -2
View File
@@ -1,8 +1,7 @@
#include "affine.h"
#include "global.h"
#include "structures.h"
#include "main.h"
#include "room.h"
#include "screen.h"
extern u32 gFrameObjLists[];
src/backgroundAnimations.c
+2 -1
View File
@@ -8,7 +8,8 @@
#include "asm.h"
#include "assets/gfx_offsets.h"
#include "common.h"
#include "functions.h"
#include "gfx.h"
#include "fade.h"
void LoadBgAnimationGfx(const BgAnimationGfx*);
u32 GetBgAnimationTimer(const s32*);
src/beanstalkSubtask.c
+13 -7
View File
@@ -4,7 +4,6 @@
#include "collision.h"
#include "common.h"
#include "fade.h"
#include "functions.h"
#include "game.h"
#include "item.h"
#include "main.h"
@@ -12,10 +11,16 @@
#include "manager/diggingCaveEntranceManager.h"
#include "menu.h"
#include "object.h"
#include "asm.h"
#include "flags.h"
#include "room.h"
#include "player.h"
#include "screen.h"
#include "scroll.h"
#include "structures.h"
#include "tiles.h"
#include "affine.h"
#include "subtask.h"
#include "ui.h"
extern void sub_0807C898(void);
extern void sub_0805BB74(s32);
@@ -63,7 +68,7 @@ extern void sub_0804B388(u32 a1, u32 a2);
extern u32 sub_080A7CFC(u32 a1, u32 tmp); // TODO does this really have a second param?
extern void OpenSmallChest(u32 pos, u32 layer);
extern bool32 sub_08079778();
extern Transition* sub_08080734(u32, u32);
extern Transition* FindApplicableAreaTransition(u32, u32);
extern const s16 gUnk_080B4490[];
extern const s16 gUnk_080B4468[];
@@ -206,8 +211,8 @@ u32 UpdatePlayerCollision(void) {
gPlayerEntity.base.collisionLayer) == COLLISION_DATA_255) {
if ((((gPlayerState.flags & (PL_FLAGS10000 | PL_FLAGS2)) != 0) ||
((gPlayerState.sword_state & 0x10) != 0)) ||
((sub_080806BC(gPlayerEntity.base.x.HALF.HI - gRoomControls.origin_x,
gPlayerEntity.base.y.HALF.HI - gRoomControls.origin_y, index, 5) == 0 &&
((DoApplicableTransition(gPlayerEntity.base.x.HALF.HI - gRoomControls.origin_x,
gPlayerEntity.base.y.HALF.HI - gRoomControls.origin_y, index, 5) == 0 &&
(((gPlayerState.heldObject != 0 || ((gPlayerState.gustJarState & 0xf) != 0)) ||
(sub_0807BD14(&gPlayerEntity.base, index) == 0)))))) {
return 3;
@@ -269,8 +274,9 @@ u32 UpdatePlayerCollision(void) {
}
ptr1 = &gUnk_080B4478[gPlayerEntity.base.animationState & 6];
transition = sub_08080734((gPlayerEntity.base.x.HALF.HI - gRoomControls.origin_x) + ptr1[0],
(gPlayerEntity.base.y.HALF.HI - gRoomControls.origin_y) + ptr1[1]);
transition =
FindApplicableAreaTransition((gPlayerEntity.base.x.HALF.HI - gRoomControls.origin_x) + ptr1[0],
(gPlayerEntity.base.y.HALF.HI - gRoomControls.origin_y) + ptr1[1]);
if (transition == NULL) {
return 0;
}
src/code_08049CD4.c
+1
View File
@@ -1,6 +1,7 @@
#include "global.h"
#include "room.h"
#include "enemy.h"
#include "common.h"
extern void MemFill32(u32, void*, u32);
src/code_08049DF4.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include "asm.h"
#include "global.h"
#include "entity.h"
#include "functions.h"
#include "map.h"
#include "player.h"
#include "room.h"
src/code_0805EC04.c
+1 -1
View File
@@ -2,7 +2,7 @@
#include "entity.h"
#include "player.h"
#include "room.h"
#include "structures.h"
#include "vram.h"
const u8 gUnk_08109202[] = {
255, 8, 24, 255, 0, 4, 28, 255, 16, 12, 20, 255, 255, 255, 255, 255, 0, 0,
src/collision.c
+3 -2
View File
@@ -2,12 +2,13 @@
#include "collision.h"
#include "common.h"
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "entity.h"
#include "functions.h"
#include "game.h"
#include "global.h"
#include "item.h"
#include "object.h"
#include "physics.h"
#include "player.h"
#include "save.h"
#include "tiles.h"
src/color.c
+8 -9
View File
@@ -3,14 +3,13 @@
#include "common.h"
#include "color.h"
#include "room.h"
#include "global.h"
#include "fileselect.h"
#include "main.h"
#include "physics.h"
#include "gfx.h"
#include "fade.h"
extern Palette gUnk_02001A3C;
void LoadObjPaletteAtIndex(u32 a1, u32 a2);
void LoadObjPaletteAtIndex(u32 a1, u32 paletteIndex);
void CleanUpObjPalettes();
u32 FindFreeObjPalette(u32);
void SetEntityObjPalette(Entity*, s32);
@@ -237,21 +236,21 @@ void ChangeObjPalette(Entity* entity, u32 objPaletteId) {
LoadObjPalette(entity, objPaletteId);
}
void LoadObjPaletteAtIndex(u32 objPaletteId, u32 a2) {
void LoadObjPaletteAtIndex(u32 objPaletteId, u32 paletteIndex) {
u16* buffer;
gUsedPalettes |= 1 << (a2 + 16);
USE_PALETTE(paletteIndex + 16);
if (objPaletteId > 5) {
if (objPaletteId == 0x15) {
buffer = gPaletteBuffer;
MemFill16(buffer[0x3C], buffer + (a2 + 16) * 16, 0x20);
MemFill16(buffer[0x3C], buffer + (paletteIndex + 16) * 16, 0x20);
} else if (objPaletteId < 0x15) {
LoadPalettes((u8*)(gPaletteBuffer + (objPaletteId - 6) * 16), a2 + 16, 1);
LoadPalettes((u8*)(gPaletteBuffer + (objPaletteId - 6) * 16), paletteIndex + 16, 1);
} else {
u32 offset = gUnk_08133368[(objPaletteId - 0x16)].WORD_U;
u32 numPalettes = (offset >> 0x18) & 0xf;
offset &= 0xffffff;
LoadPalettes(gGlobalGfxAndPalettes + offset, a2 + 16, numPalettes);
LoadPalettes(&gGlobalGfxAndPalettes[offset], paletteIndex + 16, numPalettes);
}
}
}
src/common.c
+25 -21
View File
@@ -1,10 +1,11 @@
#include "common.h"
#include "assets/map_offsets.h"
#include "assets/gfx_offsets.h"
#include "area.h"
#include "asm.h"
#include "flags.h"
#include "functions.h"
#include "physics.h"
#include "game.h"
#include "global.h"
#include "item.h"
@@ -15,7 +16,8 @@
#include "save.h"
#include "screen.h"
#include "sound.h"
#include "structures.h"
#include "subtask.h"
#include "fade.h"
extern u8 gUnk_03003DE0;
extern u8 gzHeap[0x1000];
@@ -97,9 +99,7 @@ typedef struct {
u8 y;
} PACKED DungeonMapObject;
// More like PrepareTileEntitesForDungeonMap or so
u32 DecToHex(u32 value) {
u32 EncodeBCD(u32 value) {
u32 result;
FORCE_REGISTER(u32 r1, r1);
@@ -244,7 +244,7 @@ void LoadPalettes(const u8* src, s32 destPaletteNum, s32 numPalettes) {
u32 size = numPalettes * 32;
u32 usedPalettesMask = 1 << destPaletteNum;
while (--numPalettes > 0) {
usedPalettesMask |= (usedPalettesMask << 1);
usedPalettesMask |= usedPalettesMask << 1;
}
gUsedPalettes |= usedPalettesMask;
dest = &gPaletteBuffer[destPaletteNum * 16];
@@ -253,7 +253,7 @@ void LoadPalettes(const u8* src, s32 destPaletteNum, s32 numPalettes) {
void SetColor(u32 colorIndex, u32 color) {
gPaletteBuffer[colorIndex] = color;
gUsedPalettes |= 1 << (colorIndex / 16);
USE_PALETTE(colorIndex / 16);
}
void SetFillColor(u32 color, u32 disable_layers) {
@@ -596,7 +596,7 @@ void sub_0801DD58(u32 area, u32 room) {
}
void LoadDungeonMap(void) {
LoadResourceAsync(gDungeonMap, 0x6006000, sizeof(gDungeonMap));
LoadResourceAsync(gDungeonMap, BG_SCREEN_ADDR(12), sizeof(gDungeonMap));
}
void DrawDungeonFeatures(u32 floor, void* data, u32 size) {
@@ -1923,19 +1923,23 @@ const KinstoneWorldEvent gKinstoneWorldEvents[] = {
#endif
// For sub_080A4418
// TODO these are gGlobalGfxAndPalettes offsets with the size of 0x80
#ifdef EU
const u32 gUnk_080CA06C[] = { 139744, 139744, 140256, 140768, 141280, 141792, 142304, 142816, 143840, 144864, 145888,
146912, 147936, 148960, 149984, 151008, 152032, 153056, 154080, 155104, 156128, 157152,
158176, 159200, 160224, 161248, 143328, 144352, 145376, 146400, 147424, 148448, 149472,
150496, 151520, 152544, 153568, 154592, 155616, 156640, 157664, 158688, 159712, 160736 };
#else
const u32 gUnk_080CA06C[] = { 139808, 139808, 140320, 140832, 141344, 141856, 142368, 142880, 143904, 144928, 145952,
146976, 148000, 149024, 150048, 151072, 152096, 153120, 154144, 155168, 156192, 157216,
158240, 159264, 160288, 161312, 143392, 144416, 145440, 146464, 147488, 148512, 149536,
150560, 151584, 152608, 153632, 154656, 155680, 156704, 157728, 158752, 159776, 160800 };
#endif
const u32 gUnk_080CA06C[] = {
offset_gUnk_data3_085C4FE0 + 0xC0, offset_gUnk_data3_085C4FE0 + 0xC0, offset_gUnk_data3_085C4FE0 + 0x2C0,
offset_gUnk_data3_085C4FE0 + 0x4C0, offset_gUnk_data3_085C4FE0 + 0x6C0, offset_gUnk_data3_085C4FE0 + 0x8C0,
offset_gUnk_data3_085C4FE0 + 0xAC0, offset_gUnk_data3_085C4FE0 + 0xCC0, offset_gUnk_data3_085C4FE0 + 0x10C0,
offset_gUnk_data3_085C4FE0 + 0x14C0, offset_gUnk_data3_085C4FE0 + 0x18C0, offset_gUnk_data3_085C4FE0 + 0x1CC0,
offset_gUnk_data3_085C4FE0 + 0x20C0, offset_gUnk_data3_085C4FE0 + 0x24C0, offset_gUnk_data3_085C4FE0 + 0x28C0,
offset_gUnk_data3_085C4FE0 + 0x2CC0, offset_gUnk_data3_085C4FE0 + 0x30C0, offset_gUnk_data3_085C4FE0 + 0x34C0,
offset_gUnk_data3_085C4FE0 + 0x38C0, offset_gUnk_data3_085C4FE0 + 0x3CC0, offset_gUnk_data3_085C4FE0 + 0x40C0,
offset_gUnk_data3_085C4FE0 + 0x44C0, offset_gUnk_data3_085C4FE0 + 0x48C0, offset_gUnk_data3_085C4FE0 + 0x4CC0,
offset_gUnk_data3_085C4FE0 + 0x50C0, offset_gUnk_data3_085C4FE0 + 0x54C0, offset_gUnk_data3_085C4FE0 + 0xEC0,
offset_gUnk_data3_085C4FE0 + 0x12C0, offset_gUnk_data3_085C4FE0 + 0x16C0, offset_gUnk_data3_085C4FE0 + 0x1AC0,
offset_gUnk_data3_085C4FE0 + 0x1EC0, offset_gUnk_data3_085C4FE0 + 0x22C0, offset_gUnk_data3_085C4FE0 + 0x26C0,
offset_gUnk_data3_085C4FE0 + 0x2AC0, offset_gUnk_data3_085C4FE0 + 0x2EC0, offset_gUnk_data3_085C4FE0 + 0x32C0,
offset_gUnk_data3_085C4FE0 + 0x36C0, offset_gUnk_data3_085C4FE0 + 0x3AC0, offset_gUnk_data3_085C4FE0 + 0x3EC0,
offset_gUnk_data3_085C4FE0 + 0x42C0, offset_gUnk_data3_085C4FE0 + 0x46C0, offset_gUnk_data3_085C4FE0 + 0x4AC0,
offset_gUnk_data3_085C4FE0 + 0x4EC0, offset_gUnk_data3_085C4FE0 + 0x52C0,
};
const u8 SharedFusions[] = {
0x18, 0x2D, 0x35, 0x36, 0x37, 0x39, 0x3C, 0x44, 0x46, 0x47, 0x4E, 0x50, 0x53, 0x55, 0x56, 0x58, 0x5F, 0x60, 0, 0,
};
src/cutscene.c
+8 -1
View File
@@ -6,16 +6,23 @@
#include "cutscene.h"
#include "enemy.h"
#include "sound.h"
#include "flags.h"
#include "common.h"
#include "fade.h"
#include "fileselect.h"
#include "functions.h"
#include "game.h"
#include "main.h"
#include "menu.h"
#include "npc.h"
#include "object.h"
#include "room.h"
#include "screen.h"
#include "subtask.h"
#include "beanstalkSubtask.h"
#include "tiles.h"
#include "backgroundAnimations.h"
#include "manager/staticBackgroundManager.h"
void sub_08051F78(void);
void sub_08051FF0(void);
src/data/screenTransitions.c
+51 -51
View File
@@ -4,72 +4,72 @@
// clang-format off
const ScreenTransitionData gUnk_0813AA54 = { 1, { 0, 0, 0, 0 }, 0x98, 0xa8, 0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MAIN_CART, 1, 2, 0, 0 };
const ScreenTransitionData gUnk_0813AA68 = { 1, { 0, 0, 0, 0 }, 0xa8, 0xb8, 0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_ENTRANCE, 1, 2, 0, 0 };
const ScreenTransitionData gUnk_0813AA7C = { 1, { 0, 0, 0, 0 }, 0x98, 0xa8, 0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MAIN_CART, 1, 2, 0, 0 };
const ScreenTransitionData gUnk_0813AA90 = { 1, { 0, 0, 0, 0 }, 0x78, 0xa8, 0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_CENTER_STAIRS_1F, 1, 2, 0, 0 };
const ScreenTransitionData gUnk_0813AAA4 = { 1, { 0, 0, 0, 0 }, 0x108, 0xf8, 0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ENTRANCE, 1, 2, 0, 0 };
const ScreenTransitionData gUnk_0813AAB8 = { 1, { 0, 0, 0, 0 }, 0x238, 0x58, 0, AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_ENTRANCE_ROOM, 1, 2, 6, 0 };
const ScreenTransitionData gUnk_0813AACC = { 1, { 0, 0, 0, 0 }, 0x198, 0x1d8, 0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE, 1, 2, 0, 0 };
const ScreenTransitionData gUnk_0813AAE0 = { 1, { 0, 0, 0, 0 }, 0x88, 0x78, 0, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_ENTRANCE, 1, 2, 0, 0 };
const ScreenTransitionData gUnk_0813AB08 = { 1, { 0, 0, 0, 0 }, 0x98, 0xa8, 0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MAIN_CART, 1, 2, 0, 0 };
const ScreenTransitionData gUnk_0813AAF4 = { 1, { 0, 0, 0, 0 }, 0x98, 0xa8, 0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MAIN_CART, 1, 2, 0, 0 };
const Transition gUnk_0813AA54 = { WARP_TYPE_AREA, 0, 0, 0x98, 0xa8, 0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MAIN_CART, 1, 2, 0, 0 };
const Transition gUnk_0813AA68 = { WARP_TYPE_AREA, 0, 0, 0xa8, 0xb8, 0, AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_ENTRANCE, 1, 2, 0, 0 };
const Transition gUnk_0813AA7C = { WARP_TYPE_AREA, 0, 0, 0x98, 0xa8, 0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MAIN_CART, 1, 2, 0, 0 };
const Transition gUnk_0813AA90 = { WARP_TYPE_AREA, 0, 0, 0x78, 0xa8, 0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_CENTER_STAIRS_1F, 1, 2, 0, 0 };
const Transition gUnk_0813AAA4 = { WARP_TYPE_AREA, 0, 0, 0x108, 0xf8, 0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ENTRANCE, 1, 2, 0, 0 };
const Transition gUnk_0813AAB8 = { WARP_TYPE_AREA, 0, 0, 0x238, 0x58, 0, AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_ENTRANCE_ROOM, 1, 2, 6, 0 };
const Transition gUnk_0813AACC = { WARP_TYPE_AREA, 0, 0, 0x198, 0x1d8, 0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE, 1, 2, 0, 0 };
const Transition gUnk_0813AAE0 = { WARP_TYPE_AREA, 0, 0, 0x88, 0x78, 0, AREA_ROYAL_CRYPT, ROOM_ROYAL_CRYPT_ENTRANCE, 1, 2, 0, 0 };
const Transition gUnk_0813AB08 = { WARP_TYPE_AREA, 0, 0, 0x98, 0xa8, 0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MAIN_CART, 1, 2, 0, 0 };
const Transition gUnk_0813AAF4 = { WARP_TYPE_AREA, 0, 0, 0x98, 0xa8, 0, AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MAIN_CART, 1, 2, 0, 0 };
const ScreenTransitionData* const gWallMasterScreenTransitions[] = {
const Transition* const gWallMasterScreenTransitions[] = {
&gUnk_0813AA54, &gUnk_0813AA68, &gUnk_0813AA7C, &gUnk_0813AA90, &gUnk_0813AAA4,
&gUnk_0813AAB8, &gUnk_0813AACC, &gUnk_0813AAE0, &gUnk_0813AB08, &gUnk_0813AAF4,
};
const ScreenTransitionData unusedScreenTransition = { 1, { 0, 0, 0, 0 }, 0x48, 0x68, 0, AREA_CASTLE_GARDEN, ROOM_CASTLE_GARDEN_MAIN, 1, 0, 2, 0 };
const Transition unusedScreenTransition = { WARP_TYPE_AREA, 0, 0, 0x48, 0x68, 0, AREA_CASTLE_GARDEN, ROOM_CASTLE_GARDEN_MAIN, 1, 0, 2, 0 };
const ScreenTransitionData gUnk_0813AB58 = { 1, { 0, 0, 0, 0 }, 0x108, 0xc8, 0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ENTRANCE, 2, 2, 4, 0 };
const ScreenTransitionData gUnk_0813AB6C = { 1, { 0, 0, 0, 0 }, 0x198, 0x68, 0, AREA_RUINS, ROOM_RUINS_FORTRESS_ENTRANCE, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813AB80 = { 1, { 0, 0, 0, 0 }, 0xc8, 0x48, 0, AREA_HYRULE_CASTLE, ROOM_HYRULE_CASTLE_4, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813AB94 = { 1, { 0, 0, 0, 0 }, 0xb8, 0x5c, 0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MAZAAL, 1, 1, 4, 0 };
const ScreenTransitionData gUnk_0813ABA8 = { 1, { 0, 0, 0, 0 }, 0xb8, 0x78, 0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MAZAAL, 1, 0, 0, 0 };
const ScreenTransitionData gUnk_0813ABBC = { 1, { 0, 0, 0, 0 }, 0xf0, 0xbc, 0, AREA_ROYAL_VALLEY, ROOM_ROYAL_VALLEY_MAIN, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813ABD0 = { 1, { 0, 0, 0, 0 }, 0x1d8, 0xd8, 0, AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_GYORG_TORNADO, 2, 2, 4, 0 };
const ScreenTransitionData gUnk_0813ABE4 = { 1, { 0, 0, 0, 0 }, 0x198, 0x168, 0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE, 1, 0, 4, 0 };
const Transition gUnk_0813AB58 = { WARP_TYPE_AREA, 0, 0, 0x108, 0xc8, 0, AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ENTRANCE, 2, 2, 4, 0 };
const Transition gUnk_0813AB6C = { WARP_TYPE_AREA, 0, 0, 0x198, 0x68, 0, AREA_RUINS, ROOM_RUINS_FORTRESS_ENTRANCE, 1, 0, 4, 0 };
const Transition gUnk_0813AB80 = { WARP_TYPE_AREA, 0, 0, 0xc8, 0x48, 0, AREA_HYRULE_CASTLE, ROOM_HYRULE_CASTLE_4, 1, 0, 4, 0 };
const Transition gUnk_0813AB94 = { WARP_TYPE_AREA, 0, 0, 0xb8, 0x5c, 0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MAZAAL, 1, 1, 4, 0 };
const Transition gUnk_0813ABA8 = { WARP_TYPE_AREA, 0, 0, 0xb8, 0x78, 0, AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MAZAAL, 1, 0, 0, 0 };
const Transition gUnk_0813ABBC = { WARP_TYPE_AREA, 0, 0, 0xf0, 0xbc, 0, AREA_ROYAL_VALLEY, ROOM_ROYAL_VALLEY_MAIN, 1, 0, 4, 0 };
const Transition gUnk_0813ABD0 = { WARP_TYPE_AREA, 0, 0, 0x1d8, 0xd8, 0, AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_GYORG_TORNADO, 2, 2, 4, 0 };
const Transition gUnk_0813ABE4 = { WARP_TYPE_AREA, 0, 0, 0x198, 0x168, 0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE, 1, 0, 4, 0 };
#if defined(EU) || defined(JP)
const ScreenTransitionData gUnk_0813ABF8 = { 1, { 0, 0, 0, 0 }, 0x128, 0x1a8, 0, AREA_CASTLE_GARDEN, ROOM_CASTLE_GARDEN_MAIN, 1, 0, 0, 0 };
const Transition gUnk_0813ABF8 = { WARP_TYPE_AREA, 0, 0, 0x128, 0x1a8, 0, AREA_CASTLE_GARDEN, ROOM_CASTLE_GARDEN_MAIN, 1, 0, 0, 0 };
#else
const ScreenTransitionData gUnk_0813ABF8 = { 1, { 0, 0, 0, 0 }, 0x128, 0x1b0, 0, AREA_CASTLE_GARDEN, ROOM_CASTLE_GARDEN_MAIN, 1, 0, 0, 0 };
const Transition gUnk_0813ABF8 = { WARP_TYPE_AREA, 0, 0, 0x128, 0x1b0, 0, AREA_CASTLE_GARDEN, ROOM_CASTLE_GARDEN_MAIN, 1, 0, 0, 0 };
#endif
const ScreenTransitionData gUnk_0813AC0C = { 1, { 0, 0, 0, 0 }, 0xb0, 0xd8, 0, AREA_VAATI_2, ROOM_VAATI_2_0, 2, 0, 0, 0 };
const ScreenTransitionData gUnk_0813AC20 = { 1, { 0, 0, 0, 0 }, 0xa8, 0x78, 0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_TRIPLE_DARKNUT, 1, 0, 0, 0 };
const ScreenTransitionData gUnk_0813AC34 = { 1, { 0, 0, 0, 0 }, 0xb0, 0x88, 0, AREA_VAATI_3, ROOM_VAATI_3_0, 1, 0, 0, 0 };
const ScreenTransitionData gUnk_0813AC48 = { 1, { 0, 0, 0, 0 }, 0xb0, 0x88, 0, AREA_VAATI_3, ROOM_VAATI_3_0, 1, 1, 4, 0 };
const ScreenTransitionData gUnk_0813AC5C = { 1, { 0, 0, 0, 0 }, 0xa8, 0x88, 0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_GARDEN, 1, 0, 6, 0 };
const ScreenTransitionData gUnk_0813AC70 = { 1, { 0, 0, 0, 0 }, 0x0, 0x0, 0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_THRONE_ROOM, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813AC84 = { 1, { 0, 0, 0, 0 }, 0x0, 0x0, 0, AREA_HYRULE_CASTLE, ROOM_HYRULE_CASTLE_2, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813AC98 = { 1, { 0, 0, 0, 0 }, 0x0, 0x0, 0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813ACAC = { 1, { 0, 0, 0, 0 }, 0x0, 0x0, 0, AREA_HYRULE_CASTLE, ROOM_HYRULE_CASTLE_0, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813ACC0 = { 1, { 0, 0, 0, 0 }, 0x0, 0x0, 0, AREA_HYRULE_CASTLE, ROOM_HYRULE_CASTLE_1, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813ACD4 = { 1, { 0, 0, 0, 0 }, 0x0, 0x0, 0, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813ACE8 = { 1, { 0, 0, 0, 0 }, 0x0, 0x0, 0, AREA_MT_CRENEL, ROOM_MT_CRENEL_TOP, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813ACFC = { 1, { 0, 0, 0, 0 }, 0xa8, 0x88, 0, AREA_SANCTUARY_ENTRANCE, ROOM_SANCTUARY_ENTRANCE_MAIN, 1, 0, 6, 0 };
const ScreenTransitionData gUnk_0813AD10 = { 1, { 0, 0, 0, 0 }, 0x50, 0x38, 0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_WEST_ROOM, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813AD24 = { 1, { 0, 0, 0, 0 }, 0x50, 0x38, 0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_MIDDLE_ROOM, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813AD38 = { 1, { 0, 0, 0, 0 }, 0x60, 0x38, 0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_EAST_ROOM, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813AD4C = { 1, { 0, 0, 0, 0 }, 0x78, 0x68, 0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_BORLOV_ENTRANCE, 1, 0, 0, 0 };
const ScreenTransitionData gUnk_0813AD60 = { 1, { 0, 0, 0, 0 }, 0x98, 0x88, 0, AREA_SIMONS_SIMULATION, ROOM_SIMONS_SIMULATION_0, 1, 2, 4, 0 };
const ScreenTransitionData gUnk_0813AD74 = { 1, { 0, 0, 0, 0 }, 0x50, 0x48, 0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_SIMON, 1, 0, 4, 0 };
const Transition gUnk_0813AC0C = { WARP_TYPE_AREA, 0, 0, 0xb0, 0xd8, 0, AREA_VAATI_2, ROOM_VAATI_2_0, 2, 0, 0, 0 };
const Transition gUnk_0813AC20 = { WARP_TYPE_AREA, 0, 0, 0xa8, 0x78, 0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_TRIPLE_DARKNUT, 1, 0, 0, 0 };
const Transition gUnk_0813AC34 = { WARP_TYPE_AREA, 0, 0, 0xb0, 0x88, 0, AREA_VAATI_3, ROOM_VAATI_3_0, 1, 0, 0, 0 };
const Transition gUnk_0813AC48 = { WARP_TYPE_AREA, 0, 0, 0xb0, 0x88, 0, AREA_VAATI_3, ROOM_VAATI_3_0, 1, 1, 4, 0 };
const Transition gUnk_0813AC5C = { WARP_TYPE_AREA, 0, 0, 0xa8, 0x88, 0, AREA_DARK_HYRULE_CASTLE_OUTSIDE, ROOM_DARK_HYRULE_CASTLE_OUTSIDE_GARDEN, 1, 0, 6, 0 };
const Transition gUnk_0813AC70 = { WARP_TYPE_AREA, 0, 0, 0x0, 0x0, 0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_THRONE_ROOM, 1, 0, 4, 0 };
const Transition gUnk_0813AC84 = { WARP_TYPE_AREA, 0, 0, 0x0, 0x0, 0, AREA_HYRULE_CASTLE, ROOM_HYRULE_CASTLE_2, 1, 0, 4, 0 };
const Transition gUnk_0813AC98 = { WARP_TYPE_AREA, 0, 0, 0x0, 0x0, 0, AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE, 1, 0, 4, 0 };
const Transition gUnk_0813ACAC = { WARP_TYPE_AREA, 0, 0, 0x0, 0x0, 0, AREA_HYRULE_CASTLE, ROOM_HYRULE_CASTLE_0, 1, 0, 4, 0 };
const Transition gUnk_0813ACC0 = { WARP_TYPE_AREA, 0, 0, 0x0, 0x0, 0, AREA_HYRULE_CASTLE, ROOM_HYRULE_CASTLE_1, 1, 0, 4, 0 };
const Transition gUnk_0813ACD4 = { WARP_TYPE_AREA, 0, 0, 0x0, 0x0, 0, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, 1, 0, 4, 0 };
const Transition gUnk_0813ACE8 = { WARP_TYPE_AREA, 0, 0, 0x0, 0x0, 0, AREA_MT_CRENEL, ROOM_MT_CRENEL_TOP, 1, 0, 4, 0 };
const Transition gUnk_0813ACFC = { WARP_TYPE_AREA, 0, 0, 0xa8, 0x88, 0, AREA_SANCTUARY_ENTRANCE, ROOM_SANCTUARY_ENTRANCE_MAIN, 1, 0, 6, 0 };
const Transition gUnk_0813AD10 = { WARP_TYPE_AREA, 0, 0, 0x50, 0x38, 0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_WEST_ROOM, 1, 0, 4, 0 };
const Transition gUnk_0813AD24 = { WARP_TYPE_AREA, 0, 0, 0x50, 0x38, 0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_MIDDLE_ROOM, 1, 0, 4, 0 };
const Transition gUnk_0813AD38 = { WARP_TYPE_AREA, 0, 0, 0x60, 0x38, 0, AREA_HOUSE_INTERIORS_1, ROOM_HOUSE_INTERIORS_1_INN_EAST_ROOM, 1, 0, 4, 0 };
const Transition gUnk_0813AD4C = { WARP_TYPE_AREA, 0, 0, 0x78, 0x68, 0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_BORLOV_ENTRANCE, 1, 0, 0, 0 };
const Transition gUnk_0813AD60 = { WARP_TYPE_AREA, 0, 0, 0x98, 0x88, 0, AREA_SIMONS_SIMULATION, ROOM_SIMONS_SIMULATION_0, 1, 2, 4, 0 };
const Transition gUnk_0813AD74 = { WARP_TYPE_AREA, 0, 0, 0x50, 0x48, 0, AREA_HOUSE_INTERIORS_3, ROOM_HOUSE_INTERIORS_3_SIMON, 1, 0, 4, 0 };
const ScreenTransitionData gUnk_0813AD88[] = {
{ 1, { 0, 0, 0, 0 }, 0x128, 0x188, 0, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 1, 9, 4, 0},
{ 1, { 0, 0, 0, 0 }, 0x190, 0x1c0, 0, AREA_CLOUD_TOPS, ROOM_CLOUD_TOPS_CLOUD_BOTTOMS, 1, 10, 4, 0},
{ 1, { 0, 0, 0, 0 }, 0x1e8, 0x1f0, 0, AREA_CLOUD_TOPS, ROOM_CLOUD_TOPS_CLOUD_TOPS, 1, 10, 4, 0},
{ 1, { 0, 0, 0, 0 }, 0x268, 0x58, 0, AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_ENTRANCE_ROOM, 1, 10, 6, 0},
const Transition gUnk_0813AD88[] = {
{ WARP_TYPE_AREA, 0, 0, 0x128, 0x188, 0, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 1, 9, 4, 0},
{ WARP_TYPE_AREA, 0, 0, 0x190, 0x1c0, 0, AREA_CLOUD_TOPS, ROOM_CLOUD_TOPS_CLOUD_BOTTOMS, 1, 10, 4, 0},
{ WARP_TYPE_AREA, 0, 0, 0x1e8, 0x1f0, 0, AREA_CLOUD_TOPS, ROOM_CLOUD_TOPS_CLOUD_TOPS, 1, 10, 4, 0},
{ WARP_TYPE_AREA, 0, 0, 0x268, 0x58, 0, AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_ENTRANCE_ROOM, 1, 10, 6, 0},
#if defined(EU)
{ 1, { 0, 0, 0, 0 }, 0x200, 0x350, 0, AREA_PALACE_OF_WINDS_BOSS, ROOM_PALACE_OF_WINDS_BOSS_0, 2, 10, 4, 0},
{ WARP_TYPE_AREA, 0, 0, 0x200, 0x350, 0, AREA_PALACE_OF_WINDS_BOSS, ROOM_PALACE_OF_WINDS_BOSS_0, 2, 10, 4, 0},
#else
{ 1, { 0, 0, 0, 0 }, 0x200, 0x300, 0, AREA_PALACE_OF_WINDS_BOSS, ROOM_PALACE_OF_WINDS_BOSS_0, 2, 10, 4, 0},
{ WARP_TYPE_AREA, 0, 0, 0x200, 0x300, 0, AREA_PALACE_OF_WINDS_BOSS, ROOM_PALACE_OF_WINDS_BOSS_0, 2, 10, 4, 0},
#endif
};
const ScreenTransitionData gUnk_0813ADEC[] = {
{ 1, { 0, 0, 0, 0 }, 0xb8, 0x58, 0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_ENTRANCE, 1, 0, 4, 0},
{ 1, { 0, 0, 0, 0 }, 0x248, 0x108, 0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_SOUTH_HYRULE_FIELD, 1, 0, 4, 0},
const Transition gUnk_0813ADEC[] = {
{ WARP_TYPE_AREA, 0, 0, 0xb8, 0x58, 0, AREA_WIND_TRIBE_TOWER, ROOM_WIND_TRIBE_TOWER_ENTRANCE, 1, 0, 4, 0},
{ WARP_TYPE_AREA, 0, 0, 0x248, 0x108, 0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_SOUTH_HYRULE_FIELD, 1, 0, 4, 0},
};
// clang-format on
src/data/transitions.c
+1505 -1505
View File
File diff suppressed because it is too large Load Diff
src/debug.c
+2 -1
View File
@@ -6,13 +6,14 @@
*/
#include "common.h"
#include "functions.h"
#include "game.h"
#include "main.h"
#include "menu.h"
#include "message.h"
#include "screen.h"
#include "sound.h"
#include "save.h"
#include "fade.h"
void sub_0805FA04(void);
void sub_0805FA98(void);
src/demo.c
+3 -2
View File
@@ -7,14 +7,15 @@
#include "common.h"
#include "fileselect.h"
#include "functions.h"
#include "game.h"
#include "global.h"
#include "main.h"
#include "menu.h"
#include "message.h"
#include "screen.h"
#include "menu.h"
#include "sound.h"
#include "affine.h"
#include "fade.h"
void sub_080A30AC(void);
void sub_080A2E40(void);
src/droptables.c
-1
View File
@@ -1,4 +1,3 @@
#include "global.h"
#include "droptables.h"
const Droptable gEnemyDroptables[] = {
src/enemy/acroBandits.c
+5 -1
View File
@@ -5,7 +5,11 @@
* @brief Acro Bandits enemy
*/
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "player.h"
#include "physics.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/armos.c
+12 -6
View File
@@ -4,21 +4,27 @@
*
* @brief Armos enemy
*/
#include "enemy/armos.h"
#include "collision.h"
#include "common.h"
#include "enemy.h"
#include "sound.h"
#include "flags.h"
#include "functions.h"
#include "physics.h"
#include "global.h"
#include "hitbox.h"
#include "tiles.h"
#include "room.h"
#include "player.h"
#include "asm.h"
#include "map.h"
typedef struct {
/*0x00*/ Entity base;
/*0x68*/ u8 unk_68[0x10];
/*0x78*/ u16 unk_78;
/*0x7a*/ u16 unk_7a;
/*0x7c*/ ScreenTransitionData* unk_7c;
/*0x7c*/ Transition* unk_7c;
/*0x80*/ u8 unk_80;
/*0x81*/ u8 unk_81;
/*0x82*/ u8 unk_82;
@@ -66,11 +72,11 @@ void sub_080300E8(void) {
}
}
void sub_08030118(u32 armosId) {
void Armos_SetFlagFromTransition(u32 armosId) {
if (((gRoomTransition.armos_data.field_0xac >> armosId) & 1) != 0) {
SetLocalFlagByBank(FLAG_BANK_3, armosId + 0x67);
SetLocalFlagByBank(FLAG_BANK_3, armosId + AMOS_00_00);
} else {
ClearLocalFlagByBank(FLAG_BANK_3, armosId + 0x67);
ClearLocalFlagByBank(FLAG_BANK_3, armosId + AMOS_00_00);
}
}
@@ -132,7 +138,7 @@ void sub_0803026C(ArmosEntity* this) {
this->unk_84 = (0x47d >> this->unk_80) & 1;
}
if (super->type2 != 0) {
this->unk_7c = (ScreenTransitionData*)GetCurrentRoomProperty(super->type2);
this->unk_7c = (Transition*)GetCurrentRoomProperty(super->type2);
}
this->unk_81 = super->health;
sub_08030580(this);
src/enemy/ballChainSoldier.c
+5 -1
View File
@@ -5,8 +5,12 @@
* @brief Ball Chain Soldier enemy
*/
#include "enemy.h"
#include "sound.h"
#include "projectile.h"
#include "entity.h"
#include "functions.h"
#include "room.h"
#include "physics.h"
#include "asm.h"
typedef struct {
Entity base;
src/enemy/beetle.c
+5 -1
View File
@@ -5,7 +5,11 @@
* @brief Beetle enemy
*/
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "player.h"
#include "physics.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/bladeTrap.c
+2 -2
View File
@@ -4,10 +4,10 @@
*
* @brief Blade Trap enemy
*/
#include "entity.h"
#include "object.h"
#include "room.h"
#include "sound.h"
#include "room.h"
#include "physics.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/bobomb.c
+5 -3
View File
@@ -7,9 +7,11 @@
#include "asm.h"
#include "collision.h"
#include "enemy.h"
#include "functions.h"
#include "object.h"
#include "sound.h"
#include "effects.h"
#include "object.h"
#include "physics.h"
#include "player.h"
typedef struct {
/*0x00*/ Entity base;
@@ -177,7 +179,7 @@ void sub_0802C91C(BobombEntity* this) {
sub_0802CBC4(this);
} else {
if ((super->timer & 0xf) == 8) {
CreateDustSmall(super);
CreateDashFx(super);
}
sub_0802CC18(this);
}
src/enemy/bombPeahat.c
+2
View File
@@ -9,6 +9,8 @@
#include "entity.h"
#include "functions.h"
#include "object.h"
#include "room.h"
#include "physics.h"
#include "player.h"
typedef struct {
src/enemy/bombarossa.c
+4 -1
View File
@@ -5,9 +5,12 @@
* @brief Bombarossa enemy
*/
#include "enemy.h"
#include "entity.h"
#include "sound.h"
#include "effects.h"
#include "object.h"
#include "asm.h"
#include "room.h"
#include "physics.h"
typedef struct {
Entity base;
src/enemy/bowMoblin.c
+5 -1
View File
@@ -5,8 +5,12 @@
* @brief Bow Moblin enemy
*/
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "projectile.h"
#include "entity.h"
#include "functions.h"
#include "physics.h"
#include "asm.h"
typedef struct {
Entity base;
src/enemy/businessScrub.c
+9 -5
View File
@@ -6,14 +6,18 @@
*/
#include "asm.h"
#include "enemy.h"
#include "functions.h"
#include "game.h"
#include "sound.h"
#include "effects.h"
#include "flags.h"
#include "projectile.h"
#include "item.h"
#include "kinstone.h"
#include "message.h"
#include "npc.h"
#include "save.h"
#include "tiles.h"
#include "vram.h"
#include "color.h"
struct SalesOffering {
u8 field_0x0;
@@ -37,7 +41,7 @@ typedef struct {
/*0x80*/ u8 unk_80;
/*0x81*/ u8 unk_81;
/*0x82*/ u8 unused2[4];
/*0x86*/ u16 unk_86;
/*0x86*/ u16 flag;
} BusinessScrubEntity;
void sub_08028E9C(BusinessScrubEntity*);
@@ -95,7 +99,7 @@ void BusinessScrub_Action0(BusinessScrubEntity* this) {
super->animationState = 0;
super->direction = DirectionSouth;
sub_08028E9C(this);
if ((*(u8*)this->unk_7c & 1) || CheckFlags(this->unk_86)) {
if ((*(u8*)this->unk_7c & 1) || CheckFlags(this->flag)) {
super->action = 4;
super->timer = 120;
super->spritePriority.b1 = 1;
@@ -227,7 +231,7 @@ void BusinessScrub_Action3(BusinessScrubEntity* this) {
iVar1->z.HALF.HI -= 12;
SetEntityPriority(iVar1, PRIO_MESSAGE);
}
SetFlag(this->unk_86);
SetFlag(this->flag);
sub_0802925C(this);
}
break;
src/enemy/businessScrubPrologue.c
+9 -1
View File
@@ -4,9 +4,17 @@
*
* @brief Business Scrub Prologue enemy
*/
#include "object/cutsceneMiscObject.h"
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "projectile.h"
#include "entity.h"
#include "functions.h"
#include "script.h"
#include "physics.h"
#include "room.h"
#include "player.h"
#include "asm.h"
typedef struct {
Entity base;
src/enemy/chaser.c
+4
View File
@@ -5,7 +5,11 @@
* @brief Chaser enemy
*/
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "functions.h"
#include "player.h"
#include "physics.h"
extern void (*const Chaser_Functions[])(Entity*);
extern void (*const gUnk_080CD298[])(Entity*);
src/enemy/chuchu.c
+4 -2
View File
@@ -6,7 +6,9 @@
*/
#include "asm.h"
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "physics.h"
#include "tiles.h"
typedef struct {
@@ -71,7 +73,7 @@ void Chuchu(ChuchuEntity* this) {
/* ... */
break;
case 2:
CreateDrownFX(super);
CreateDrownFx(super);
return;
}
}
src/enemy/chuchuBoss.c
+12 -2
View File
@@ -5,9 +5,20 @@
* @brief Chuchu Boss enemy
*/
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "common.h"
#include "object.h"
#include "asm.h"
#include "room.h"
#include "physics.h"
#include "player.h"
#include "tiles.h"
#include "pauseMenu.h"
#ifndef EU
#include "vram.h"
#include "color.h"
#endif
typedef struct {
u8 unk_00;
@@ -1094,7 +1105,6 @@ void sub_08026E1C(ChuchuBossEntity* this) {
COLLISION_ON(super);
if (sub_08027C54(this)) {
this->unk_84->unk_04++;
;
super->child->health = 0xff;
}
if (this->unk_84->unk_04 == 3) {
src/enemy/cloudPiranha.c
+5 -1
View File
@@ -6,9 +6,13 @@
*/
#include "collision.h"
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "room.h"
#include "physics.h"
#include "tiles.h"
#include "asm.h"
#include "color.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/crow.c
+3 -1
View File
@@ -5,8 +5,10 @@
* @brief Crow enemy
*/
#include "enemy.h"
#include "sound.h"
#include "entity.h"
#include "functions.h"
#include "physics.h"
#include "asm.h"
typedef struct {
Entity base;
src/enemy/cuccoAggr.c
+7 -1
View File
@@ -5,8 +5,14 @@
* @brief Cucco Aggr enemy
*/
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "flags.h"
#include "entity.h"
#include "functions.h"
#include "room.h"
#include "player.h"
#include "physics.h"
#include "asm.h"
typedef struct {
Entity base;
src/enemy/cuccoChickAggr.c
+4 -1
View File
@@ -5,7 +5,10 @@
* @brief Cucco Chick Aggr enemy
*/
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "player.h"
#include "asm.h"
void sub_08022A88(Entity*);
void sub_08022AA4(Entity*);
src/enemy/curtain.c
+2
View File
@@ -5,6 +5,8 @@
* @brief Curtain enemy
*/
#include "enemy.h"
#include "sound.h"
#include "flags.h"
#include "entity.h"
void (*const Curtain_Functions[])(Entity*);
src/enemy/darkNut.c
+4 -1
View File
@@ -5,7 +5,10 @@
* @brief Dark Nut enemy
*/
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "projectile.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/doorMimic.c
+6 -2
View File
@@ -5,9 +5,13 @@
* @brief Door Mimic enemy
*/
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "common.h"
#include "tiles.h"
#include "object.h"
#include "asm.h"
#include "room.h"
typedef struct {
/*0x00*/ Entity base;
@@ -51,7 +55,7 @@ void DoorMimic_OnCollision(DoorMimicEntity* this) {
void DoorMimic_OnDeath(DoorMimicEntity* this) {
SetTile(this->unk_7c, this->unk_7e, super->collisionLayer);
CreateFx(super, FX_POT_SHATTER, 0);
EnemyDisableRespawn(super);
EnemyDisableRespawn((Enemy*)super);
DeleteThisEntity();
}
src/enemy/dust.c
+5 -1
View File
@@ -6,12 +6,16 @@
*/
#include "asm.h"
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "flags.h"
#include "common.h"
#include "entity.h"
#include "hitbox.h"
#include "object.h"
#include "room.h"
#include "physics.h"
#include "player.h"
#include "room.h"
typedef struct {
Entity base;
src/enemy/enemy4D.c
+5 -1
View File
@@ -5,8 +5,12 @@
* @brief Enemy4D enemy
*/
#include "enemy.h"
#include "sound.h"
#include "projectile.h"
#include "entity.h"
#include "functions.h"
#include "room.h"
#include "physics.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/enemy50.c
+5 -1
View File
@@ -6,8 +6,12 @@
*/
#include "area.h"
#include "enemy.h"
#include "functions.h"
#include "effects.h"
#include "physics.h"
#include "player.h"
#include "room.h"
#include "script.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/enemy64.c
+10 -1
View File
@@ -5,9 +5,18 @@
* @brief Enemy64 enemy
*/
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "flags.h"
#include "projectile.h"
#include "fade.h"
#include "functions.h"
#include "scroll.h"
#include "physics.h"
#include "tiles.h"
#include "room.h"
#include "player.h"
#include "asm.h"
#include "map.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/enemyE.c
+1 -1
View File
@@ -5,7 +5,7 @@
* @brief EnemyE enemy
*/
#include "enemy.h"
#include "functions.h"
#include "effects.h"
void sub_08023000(Entity*, int);
src/enemy/eyegore.c
+10 -5
View File
@@ -5,10 +5,15 @@
* @brief Eyegore enemy
*/
#include "enemy.h"
#include "fade.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "flags.h"
#include "hitbox.h"
#include "object.h"
#include "asm.h"
#include "room.h"
#include "physics.h"
#include "player.h"
#include "tiles.h"
typedef struct {
@@ -22,7 +27,7 @@ typedef struct {
/*0x79*/ u8 unk_79;
/*0x7a*/ u8 unk_7a;
/*0x7b*/ u8 unk_7b;
/*0x7c*/ u16 unk_7c;
/*0x7c*/ u16 flag;
/*0x7e*/ u8 unk_7e;
/*0x7f*/ u8 unk_7f;
/*0x80*/ u16 tileIndex1;
@@ -151,7 +156,7 @@ void Eyegore_Init(EyegoreEntity* this) {
this->unk_76 = super->y.HALF.HI;
this->unk_7e = 0x3c;
sub_08030F00(this);
if (this->unk_7c != 0) {
if (this->flag != 0) {
super->flags &= ~ENT_COLLIDE;
InitializeAnimation(super, 10);
} else {
@@ -160,7 +165,7 @@ void Eyegore_Init(EyegoreEntity* this) {
}
void Eyegore_Action1(EyegoreEntity* this) {
if ((this->unk_7c != 0) && CheckFlags(this->unk_7c)) {
if ((this->flag != 0) && CheckFlags(this->flag)) {
sub_08031320(this);
}
}
src/enemy/fallingBoulder.c
+6 -1
View File
@@ -5,7 +5,12 @@
* @brief Falling Boulder enemy
*/
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "room.h"
#include "player.h"
#include "physics.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/fireballGuy.c
+5 -1
View File
@@ -5,7 +5,11 @@
* @brief Fireball Guy enemy
*/
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "player.h"
#include "physics.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/flyingPot.c
+3 -1
View File
@@ -6,10 +6,12 @@
*/
#include "collision.h"
#include "enemy.h"
#include "functions.h"
#include "effects.h"
#include "physics.h"
#include "player.h"
#include "room.h"
#include "tiles.h"
#include "asm.h"
extern Hitbox gUnk_080FD34C;
src/enemy/flyingSkull.c
+6 -1
View File
@@ -4,12 +4,17 @@
*
* @brief Flying Skull enemy
*/
#include "object/pot.h"
#include "collision.h"
#include "enemy.h"
#include "effects.h"
#include "entity.h"
#include "functions.h"
#include "physics.h"
#include "hitbox.h"
#include "tiles.h"
#include "room.h"
#include "player.h"
#include "asm.h"
typedef struct {
Entity base;
src/enemy/ghini.c
+4 -1
View File
@@ -6,8 +6,11 @@
*/
#include "area.h"
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "player.h"
#include "physics.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/gibdo.c
+5 -1
View File
@@ -5,8 +5,12 @@
* @brief Gibdo enemy
*/
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "object.h"
#include "asm.h"
#include "physics.h"
#include "player.h"
typedef struct {
Entity base;
src/enemy/gleerok.c
+11 -1
View File
@@ -5,11 +5,21 @@
* @brief Gleerok enemy
*/
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "flags.h"
#include "common.h"
#include "projectile.h"
#include "entity.h"
#include "functions.h"
#include "object.h"
#include "asm.h"
#include "room.h"
#include "physics.h"
#include "player.h"
#include "screen.h"
#include "pauseMenu.h"
#include "color.h"
#include "fade.h"
typedef struct {
union SplitHWord unk0;
src/enemy/gyorgChild.c
+3 -1
View File
@@ -6,8 +6,10 @@
*/
#include "asm.h"
#include "enemy/gyorg.h"
#include "functions.h"
#include "room.h"
#include "player.h"
#include "physics.h"
#include "sound.h"
void GyorgChild_OnTick(GyorgChildEntity*);
void GyorgChild_OnCollision(GyorgChildEntity*);
src/enemy/gyorgFemale.c
+16 -13
View File
@@ -8,11 +8,15 @@
#include "beanstalkSubtask.h"
#include "collision.h"
#include "enemy.h"
#include "enemy/gyorg.h"
#include "entity.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "common.h"
#include "projectile.h"
#include "enemy/gyorg.h"
#include "assets/map_offsets.h"
#include "game.h"
#include "player.h"
#include "room.h"
extern u8 gEntCount;
extern u8 gMapDataTopSpecial[];
@@ -20,11 +24,10 @@ extern u8 gMapDataTopSpecial[];
extern u16 gMapDataBottomSpecial[];
extern u32 sub_08000E62(u32);
extern void RegisterTransitionManager(void*, void (*)(), void (*)());
void sub_08046498();
void GyorgFemale_OnEnterRoom();
void sub_0804660C(GyorgFemaleEntity*, u32);
void sub_080464C0(GyorgFemaleEntity*);
void GyorgFemale_Reset(GyorgFemaleEntity*);
void GyorgFemale_SpawnChildren(GyorgFemaleEntity* this, bool32 unlimit_tmp);
void sub_080465C8(void);
void GyorgFemale_ProcessEyeHit(GyorgFemaleEntity* this);
@@ -92,13 +95,13 @@ void GyorgFemale_Setup(GyorgFemaleEntity* this) {
MemClear(&gMapDataBottomSpecial, 0x8000);
MemClear(&gMapDataTopSpecial, 0x8000);
sub_0804660C(this, 0);
sub_080464C0(this);
GyorgFemale_Reset(this);
gPlayerEntity.base.collisionLayer = 2;
UpdateSpriteForCollisionLayer(&gPlayerEntity.base);
#ifndef EU
RegisterTransitionManager(this, sub_08046498, 0);
RegisterTransitionHandler(this, GyorgFemale_OnEnterRoom, NULL);
#else
RegisterTransitionManager(this, sub_080464C0, 0);
RegisterTransitionHandler(this, GyorgFemale_Reset, NULL);
#endif
}
@@ -110,7 +113,7 @@ void GyorgFemale_Action1(GyorgFemaleEntity* this) {
} else {
if (this->unk_79 & 0x40) {
this->unk_79 &= ~0x40;
sub_080464C0(this);
GyorgFemale_Reset(this);
}
}
sub_080465C8();
@@ -217,14 +220,14 @@ void GyorgFemale_Action3(GyorgFemaleEntity* this) {
}
#ifndef EU
void sub_08046498(GyorgFemaleEntity* this) {
void GyorgFemale_OnEnterRoom(GyorgFemaleEntity* this) {
MemClear(&gMapDataBottomSpecial, 0x8000);
MemClear(&gMapDataTopSpecial, 0x8000);
sub_080464C0(this);
GyorgFemale_Reset(this);
}
#endif
void sub_080464C0(GyorgFemaleEntity* this) {
void GyorgFemale_Reset(GyorgFemaleEntity* this) {
static const MapDataDefinition* const gyorgMappings[] = {
gGyorgMapping0,
gGyorgMapping1,
src/enemy/gyorgFemaleEye.c
+4 -1
View File
@@ -5,10 +5,13 @@
* @brief Gyorg Female Eye enemy
*/
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "enemy/gyorg.h"
#include "entity.h"
#include "functions.h"
#include "player.h"
#include "room.h"
#include "asm.h"
void GyorgFemaleEye_OnTick(GyorgFemaleEyeEntity*);
void GyorgFemaleEye_OnCollision(GyorgFemaleEyeEntity*);
src/enemy/gyorgMale.c
+4 -1
View File
@@ -6,10 +6,13 @@
*/
#include "effects.h"
#include "enemy.h"
#include "sound.h"
#include "projectile.h"
#include "enemy/gyorg.h"
#include "fileselect.h"
#include "functions.h"
#include "physics.h"
#include "player.h"
#include "asm.h"
// todo: wrong types
extern void sub_080A1D70(Entity*, u32);
src/enemy/gyorgMaleEye.c
+4 -2
View File
@@ -5,8 +5,10 @@
* @brief GyorgMaleEye enemy
*/
#include "enemy.h"
#include "fade.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "physics.h"
#include "room.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/hangingSeed.c
+2 -1
View File
@@ -5,8 +5,9 @@
* @brief Hanging Seed enemy
*/
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "entity.h"
#include "functions.h"
extern void (*const HangingSeed_Functions[])(Entity*);
extern void (*const gUnk_080CB588[])(Entity*);
src/enemy/helmasaur.c
+6 -1
View File
@@ -6,8 +6,13 @@
*/
#include "collision.h"
#include "enemy.h"
#include "functions.h"
#include "effects.h"
#include "object.h"
#include "asm.h"
#include "room.h"
#include "physics.h"
#include "player.h"
#include "map.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/keaton.c
+5 -1
View File
@@ -5,7 +5,11 @@
* @brief keaton enemy
*/
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "projectile.h"
#include "physics.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/keese.c
+3
View File
@@ -5,8 +5,11 @@
* @brief Keese enemy
*/
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "physics.h"
#include "player.h"
#include "asm.h"
typedef struct {
/* 0x00 */ Entity base;
src/enemy/lakitu.c
+4
View File
@@ -5,8 +5,12 @@
* @brief Lakitu enemy
*/
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "projectile.h"
#include "physics.h"
#include "player.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/lakituCloud.c
+1
View File
@@ -7,6 +7,7 @@
#include "asm.h"
#include "effects.h"
#include "enemy.h"
#include "sound.h"
#include "entity.h"
#include "object.h"
#include "physics.h"
src/enemy/leever.c
+1
View File
@@ -6,6 +6,7 @@
*/
#include "asm.h"
#include "enemy.h"
#include "effects.h"
#include "physics.h"
#include "tiles.h"
src/enemy/likeLike.c
+7 -2
View File
@@ -5,9 +5,14 @@
* @brief Like Like enemy
*/
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "item.h"
#include "message.h"
#include "object.h"
#include "asm.h"
#include "physics.h"
#include "player.h"
#include "save.h"
typedef struct {
@@ -145,7 +150,7 @@ void sub_08027F84(LikeLikeEntity* this) {
super->action = 5;
super->spriteSettings.draw = 1;
InitializeAnimation(super, 0);
CreateDust(super);
CreateDeathFx(super);
}
}
@@ -177,7 +182,7 @@ void sub_0802802C(LikeLikeEntity* this) {
super->spriteSettings.draw = 0;
super->direction = 0;
super->timer = 0;
CreateDust(super);
CreateDeathFx(super);
}
}
src/enemy/madderpillar.c
+6 -1
View File
@@ -5,8 +5,13 @@
* @brief Madderpillar enemy
*/
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "hitbox.h"
#include "room.h"
#include "physics.h"
#include "asm.h"
#include "color.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/mazaalBracelet.c
+8 -1
View File
@@ -5,9 +5,16 @@
* @brief Mazaal Bracelet enemy
*/
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "hitbox.h"
#include "object.h"
#include "asm.h"
#include "script.h"
#include "room.h"
#include "physics.h"
#include "player.h"
#include "color.h"
typedef struct MazaalBraceletEntity_ {
/*0x00*/ Entity base;
src/enemy/mazaalHead.c
+9 -7
View File
@@ -6,8 +6,14 @@
*/
#include "area.h"
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "projectile.h"
#include "object.h"
#include "asm.h"
#include "room.h"
#include "physics.h"
#include "player.h"
#include "roomid.h"
#include "screen.h"
@@ -118,12 +124,8 @@ void (*const gUnk_080CED74[])(MazaalHeadEntity*) = {
sub_08034BA0,
};
const s8 gUnk_080CED84[] = { 0x0d, 0x10, -0xd, 0x10 };
const ScreenTransitionData gUnk_080CED88 = {
1, { 0, 0, 0, 0 }, 0x88, 0xf8, 0, AREA_INNER_MAZAAL, ROOM_INNER_MAZAAL_PHASE_1, 1, 0, 0, 0
};
const ScreenTransitionData gUnk_080CED9C = {
1, { 0, 0, 0, 0 }, 0x88, 0xf8, 0, AREA_INNER_MAZAAL, ROOM_INNER_MAZAAL_MAIN, 1, 0, 0, 0
};
const Transition gUnk_080CED88 = { 1, 0, 0, 0x88, 0xf8, 0, AREA_INNER_MAZAAL, ROOM_INNER_MAZAAL_PHASE_1, 1, 0, 0, 0 };
const Transition gUnk_080CED9C = { 1, 0, 0, 0x88, 0xf8, 0, AREA_INNER_MAZAAL, ROOM_INNER_MAZAAL_MAIN, 1, 0, 0, 0 };
void MazaalHead(MazaalHeadEntity* this) {
MazaalHead_Functions[GetNextFunction(super)](this);
src/enemy/mazaalMacro.c
+6 -2
View File
@@ -5,11 +5,15 @@
* @brief Mazaal Macro enemy
*/
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "screenTransitions.h"
#include "room.h"
#include "script.h"
#include "structures.h"
#include "tiles.h"
#include "player.h"
#include "physics.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/miniFireballGuy.c
+4 -1
View File
@@ -5,7 +5,10 @@
* @brief Mini Fireball Guy enemy
*/
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "physics.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/miniSlime.c
+3
View File
@@ -5,7 +5,10 @@
* @brief Mini Slime enemy
*/
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "physics.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/moldorm.c
+2 -1
View File
@@ -6,7 +6,8 @@
*/
#include "collision.h"
#include "enemy.h"
#include "functions.h"
#include "physics.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/moldworm.c
+7 -1
View File
@@ -6,8 +6,14 @@
*/
#include "collision.h"
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "physics.h"
#include "tiles.h"
#include "room.h"
#include "player.h"
#include "asm.h"
#include "color.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/mulldozer.c
+3
View File
@@ -6,6 +6,9 @@
*/
#include "collision.h"
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/octorok.c
+4
View File
@@ -5,7 +5,11 @@
* @brief Octorok enemy
*/
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "projectile.h"
#include "physics.h"
#include "asm.h"
void Octorok_Pause(Entity*);
bool32 Octorok_FacesPlayer(Entity*);
src/enemy/octorokBoss.c
+10 -1
View File
@@ -6,10 +6,19 @@
*/
#include "enemy/octorokBoss.h"
#include "collision.h"
#include "functions.h"
#include "pauseMenu.h"
#include "game.h"
#include "object.h"
#include "asm.h"
#include "common.h"
#include "sound.h"
#include "effects.h"
#include "room.h"
#include "physics.h"
#include "player.h"
#include "projectile.h"
#include "vram.h"
#include "color.h"
#define IS_FROZEN(this) ((this)->bossPhase & 1)
src/enemy/octorokGolden.c
+5
View File
@@ -6,9 +6,14 @@
*/
#include "collision.h"
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "flags.h"
#include "projectile.h"
#include "map.h"
#include "player.h"
#include "item.h"
#include "asm.h"
void (*const OctorokGolden_Functions[])(Entity*);
void (*const gUnk_080CF484[])(Entity*);
src/enemy/peahat.c
+4 -1
View File
@@ -5,7 +5,10 @@
* @brief Peahat enemy
*/
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "physics.h"
#include "asm.h"
#include "room.h"
typedef struct {
@@ -286,7 +289,7 @@ void Peahat_Stunned(PeahatEntity* this) {
super->hitType = 0x71;
}
break;
};
}
}
void Peahat_RepairPropeller(PeahatEntity* this) {
src/enemy/pesto.c
+8 -1
View File
@@ -6,8 +6,15 @@
*/
#include "collision.h"
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "projectile.h"
#include "game.h"
#include "object.h"
#include "asm.h"
#include "room.h"
#include "physics.h"
#include "player.h"
#include "playeritem.h"
#include "save.h"
@@ -137,7 +144,7 @@ void nullsub_138(PestoEntity* this) {
void sub_0802409C(PestoEntity* this) {
super->health = 0;
InitializeAnimation(super, super->animationState);
CreateDust(super);
CreateDeathFx(super);
}
void sub_080240B8(PestoEntity* this) {
src/enemy/puffstool.c
+7
View File
@@ -6,8 +6,15 @@
*/
#include "collision.h"
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "object.h"
#include "asm.h"
#include "room.h"
#include "physics.h"
#include "player.h"
#include "tiles.h"
#include "color.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/rockChuchu.c
+3
View File
@@ -5,7 +5,10 @@
* @brief Rock Chuchu enemy
*/
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "player.h"
#include "asm.h"
extern void (*const RockChuchu_Functions[])(Entity*);
extern void (*const gUnk_080CB960[])(Entity*);
src/enemy/rollobite.c
+2
View File
@@ -6,10 +6,12 @@
*/
#include "collision.h"
#include "enemy.h"
#include "sound.h"
#include "physics.h"
#include "player.h"
#include "room.h"
#include "tiles.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/rope.c
+3
View File
@@ -5,8 +5,11 @@
* @brief Rope enemy
*/
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "physics.h"
#include "tiles.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/ropeGolden.c
+4
View File
@@ -5,10 +5,14 @@
* @brief Golden Rope enemy
*/
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "flags.h"
#include "entity.h"
#include "physics.h"
#include "player.h"
#include "item.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/rupeeLike.c
+7 -2
View File
@@ -8,7 +8,12 @@
#include "entity.h"
#include "hitbox.h"
#include "object.h"
#include "room.h"
#include "asm.h"
#include "sound.h"
#include "effects.h"
#include "physics.h"
#include "player.h"
#include "vram.h"
#include "save.h"
typedef struct {
@@ -275,7 +280,7 @@ void sub_08029770(RupeeLikeEntity* this) {
InitializeAnimation(super, 2);
super->child->spriteSettings.draw = TRUE;
InitializeAnimation(super->child, 6);
CreateDust(super);
CreateDeathFx(super);
}
}
src/enemy/scissorsBeetle.c
+4
View File
@@ -6,7 +6,11 @@
*/
#include "collision.h"
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "projectile.h"
#include "entity.h"
#include "asm.h"
typedef struct {
Entity base;
src/enemy/sensorBladeTrap.c
+1
View File
@@ -6,6 +6,7 @@
*/
#include "collision.h"
#include "enemy.h"
#include "sound.h"
#include "map.h"
#include "physics.h"
src/enemy/slime.c
+3
View File
@@ -5,8 +5,11 @@
* @brief Slime enemy
*/
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "physics.h"
#include "room.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/sluggula.c
+3
View File
@@ -5,7 +5,10 @@
* @brief Sluggula enemy
*/
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "physics.h"
#include "asm.h"
void sub_08023E10(Entity*);
void sub_08023E54(Entity*);
src/enemy/smallPesto.c
+3
View File
@@ -5,7 +5,10 @@
* @brief Small Pesto enemy
*/
#include "enemy.h"
#include "sound.h"
#include "effects.h"
#include "physics.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/spark.c
+2
View File
@@ -6,7 +6,9 @@
*/
#include "collision.h"
#include "enemy.h"
#include "effects.h"
#include "object.h"
#include "physics.h"
extern void (*const Spark_Functions[])(Entity*);
extern void (*const gUnk_080CD24C[])(Entity*);
src/enemy/spearMoblin.c
+6 -1
View File
@@ -5,7 +5,12 @@
* @brief Spear Moblin enemy
*/
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "projectile.h"
#include "object.h"
#include "asm.h"
#include "physics.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/spikedBeetle.c
+5 -1
View File
@@ -5,7 +5,11 @@
* @brief Spiked Beetle enemy
*/
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "player.h"
#include "physics.h"
#include "asm.h"
extern u32 sub_0804A024(Entity*, u32, u32);
src/enemy/spinyBeetle.c
+6 -1
View File
@@ -5,9 +5,14 @@
* @brief Spiny Beetle enemy
*/
#include "enemy.h"
#include "sound.h"
#include "entity.h"
#include "functions.h"
#include "object.h"
#include "asm.h"
#include "effects.h"
#include "room.h"
#include "physics.h"
#include "player.h"
#include "tiles.h"
typedef struct {
src/enemy/spinyChuchu.c
+4 -1
View File
@@ -5,8 +5,11 @@
* @brief Spiny Chuchu enemy
*/
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "hitbox.h"
#include "physics.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/stalfos.c
+7 -1
View File
@@ -6,8 +6,14 @@
*/
#include "collision.h"
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "projectile.h"
#include "physics.h"
#include "tiles.h"
#include "room.h"
#include "player.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/takkuri.c
+14 -10
View File
@@ -5,10 +5,14 @@
* @brief Takkuri enemy
*/
#include "enemy.h"
#include "sound.h"
#include "entity.h"
#include "functions.h"
#include "item.h"
#include "object.h"
#include "asm.h"
#include "room.h"
#include "physics.h"
#include "player.h"
#include "save.h"
typedef struct {
@@ -47,7 +51,7 @@ void Takkuri_OnCollision(TakkuriEntity* this) {
if (super->contactFlags & CONTACT_NOW) {
if ((super->contactFlags & 0x7f) == 0) {
u32 direction;
sub_0803C0AC(super);
StealRupees(super);
COLLISION_OFF(super);
direction = super->direction;
if (!DirectionIsHorizontal(DirectionRoundUp(direction))) {
@@ -305,8 +309,8 @@ void sub_0803BF70(TakkuriEntity* this) {
GetNextFrame(super);
}
void sub_0803C0AC(Entity* this) {
u32 index, rupeeType, rupees;
void StealRupees(Entity* this) {
u32 rupeeCount, rupeeType, rupees;
Entity* entity;
entity = sub_08049DF4(1);
if (entity == NULL)
@@ -315,22 +319,22 @@ void sub_0803C0AC(Entity* this) {
rupees = gSave.stats.rupees;
if (rupees >= 500) {
rupeeType = ITEM_RUPEE20;
index = 5;
rupeeCount = 5;
ModRupees(-100);
} else if (rupees >= 100) {
rupeeType = ITEM_RUPEE5;
index = 5;
rupeeCount = 5;
ModRupees(-25);
} else {
rupeeType = ITEM_RUPEE1;
index = rupees;
rupeeCount = rupees;
if (rupees >= 0x5) {
index = 5;
rupeeCount = 5;
}
ModRupees(-index);
ModRupees(-rupeeCount);
}
for (; index != 0; index--) {
for (; rupeeCount != 0; rupeeCount--) {
Entity* obj = CreateObject(RUPEE_OBJECT, rupeeType, 0);
if (obj) {
src/enemy/tektite.c
+2 -1
View File
@@ -6,7 +6,8 @@
*/
#include "collision.h"
#include "enemy.h"
#include "functions.h"
#include "effects.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/tektiteGolden.c
+3 -1
View File
@@ -6,8 +6,10 @@
*/
#include "collision.h"
#include "enemy.h"
#include "functions.h"
#include "effects.h"
#include "flags.h"
#include "item.h"
#include "asm.h"
typedef struct {
/*0x00*/ Entity base;
src/enemy/torchTrap.c
+14 -10
View File
@@ -5,11 +5,15 @@
* @brief Torch Trap enemy
*/
#include "enemy.h"
#include "sound.h"
#include "flags.h"
#include "projectile.h"
#include "entity.h"
#include "physics.h"
#include "player.h"
#include "room.h"
#include "tiles.h"
#include "asm.h"
typedef struct {
Entity base;
@@ -18,9 +22,9 @@ typedef struct {
u16 filler2;
u16 unk_78;
u16 projectileTimer;
u16 unk_7c;
u16 flag1;
u8 filler3[0x2];
u16 unk_80;
u16 flag2;
u16 unk_82;
u16 unk_84;
} TorchTrapEntity;
@@ -75,35 +79,35 @@ void sub_0803CF38(TorchTrapEntity* this) {
void sub_0803CF94(TorchTrapEntity* this) {
if (GetTileTypeAtTilePos(this->tilePos, super->collisionLayer) == TILE_TYPE_118) {
this->unk_80 = 0;
this->flag2 = 0;
TorchTrap_Reset(this);
} else if (this->unk_7c && sub_0803CFD8(this)) {
} else if (this->flag1 && sub_0803CFD8(this)) {
TorchTrap_Reset(this);
}
}
bool32 sub_0803CFD8(TorchTrapEntity* this) {
u32 result;
if (this->unk_7c == 0) {
if (this->flag1 == 0) {
result = TRUE;
} else {
result = CheckFlags(this->unk_7c);
result = CheckFlags(this->flag1);
}
return result;
}
bool32 sub_0803CFF0(TorchTrapEntity* this) {
u32 result;
if (this->unk_80 != 0) {
if (this->unk_80 == this->unk_7c) {
u32 val = CheckFlags(this->unk_80);
if (this->flag2 != 0) {
if (this->flag2 == this->flag1) {
u32 val = CheckFlags(this->flag2);
result = FALSE;
if (val == 0) {
result = TRUE;
}
return result;
} else {
return CheckFlags(this->unk_80);
return CheckFlags(this->flag2);
}
}
src/enemy/treeItem.c
+6 -2
View File
@@ -5,9 +5,13 @@
* @brief Tree Item enemy
*/
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "item.h"
#include "object.h"
#include "asm.h"
#include "physics.h"
#include "player.h"
typedef struct {
/*0x00*/ Entity base;
@@ -73,7 +77,7 @@ void TreeItem(TreeItemEntity* this) {
break;
}
EnemyDisableRespawn(super);
EnemyDisableRespawn((Enemy*)super);
DeleteThisEntity();
}
src/enemy/vaatiArm.c
+9 -4
View File
@@ -6,9 +6,16 @@
*/
#include "area.h"
#include "enemy.h"
#include "functions.h"
#include "sound.h"
#include "effects.h"
#include "common.h"
#include "projectile.h"
#include "hitbox.h"
#include "object.h"
#include "asm.h"
#include "room.h"
#include "physics.h"
#include "player.h"
#include "roomid.h"
typedef struct {
@@ -185,9 +192,7 @@ const Coords gUnk_080D13D8[] = { { .HALF = { -0x60, 0x80 } }, { .HALF = { 0x60,
const u8 gUnk_080D13E0[] = { 0xc, 0xe, 0x10 };
const u8 gUnk_080D13E3[] = { 8, 9, 10, 4, 4, 5 };
const s8 gUnk_080D13E9[] = { -8, 8 };
const ScreenTransitionData gUnk_080D13EC = {
1, { 0, 0, 0, 0 }, 0x98, 0xb8, 0, AREA_VAATIS_ARMS, ROOM_VAATIS_ARMS_FIRST, 1, 0, 0, 0
};
const Transition gUnk_080D13EC = { 1, 0, 0, 0x98, 0xb8, 0, AREA_VAATIS_ARMS, ROOM_VAATIS_ARMS_FIRST, 1, 0, 0, 0 };
const u16 gUnk_080D1400[][5] = {
{ 0x8000, 0x7000, 0x6000, 0x5000, 0x4000 },
{ 0x8000, -0x7000, -0x6000, -0x5000, -0x4000 },
src/enemy/vaatiBall.c
+6 -2
View File
@@ -5,9 +5,13 @@
* @brief Vaati Ball enemy
*/
#include "enemy.h"
#include "projectile.h"
#include "entity.h"
#include "functions.h"
#include "object.h"
#include "asm.h"
#include "sound.h"
#include "effects.h"
#include "physics.h"
#include "player.h"
typedef struct {
@@ -72,7 +76,7 @@ void VaatiBall(VaatiBallEntity* this) {
COLLISION_OFF(super);
super->health = -1;
((VaatiBallEntity*)parent)->unk_80--;
CreateDust(super);
CreateDeathFx(super);
SoundReq(SFX_1C3);
}
}

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