diff options
| -rw-r--r-- | include/code_8041D5C.h | 48 | ||||
| -rw-r--r-- | include/dungeon_entity.h | 106 | ||||
| -rw-r--r-- | include/gUnknown_203B418.h | 4 | ||||
| -rw-r--r-- | src/code_8041AD0.c | 170 | ||||
| -rw-r--r-- | src/code_80428A0.c | 62 | ||||
| -rw-r--r-- | src/code_8048480.c | 80 | ||||
| -rw-r--r-- | src/code_80521D0_1.c | 144 | ||||
| -rw-r--r-- | src/code_8057824.c | 40 | ||||
| -rw-r--r-- | src/code_8057824_1.c | 704 | ||||
| -rw-r--r-- | src/code_80869E4.c | 76 |
10 files changed, 746 insertions, 688 deletions
diff --git a/include/code_8041D5C.h b/include/code_8041D5C.h deleted file mode 100644 index 6cf46bf..0000000 --- a/include/code_8041D5C.h +++ /dev/null @@ -1,48 +0,0 @@ -#ifndef GUARD_CODE_8041D5C_H -#define GUARD_CODE_8041D5C_H - -struct subStruct_8048524 -{ - u8 fill0[0x6]; - u8 unk6; - u8 unk7; - u8 fill8[0xE - 0x8]; - /* 0xE */ s16 HP; // HP?? - s16 unk10; - u8 fill12[0x46 - 0x12]; - s8 unk46; - u8 fill47[0xA4 - 0x47]; - u8 unkA4; - u8 fillA5[0xAC - 0xA5]; - /* 0xAC */ u8 statusCondition; - u8 fillAD[0xFB - 0xAD]; - u8 unkFB; - u8 fillFC[0x112 - 0xFC]; - u8 unk112; - u8 fill113[0x13C - 0x113]; - u32 unk13C; - u8 fill140[0x15C - 0x140]; - u8 unk15C; - u8 unk15D; - u8 unk15E; - u8 unk15F; - u8 fill160[0x174 - 0x160]; - u32 unk174; -}; - -struct unkDungeon_8041D5C -{ - u8 fill0[4]; - /* 0x4 */ s16 posWorldX; - /* 0x6 */ s16 posWorldY; - /* 0x8 */ s16 prevPosWorldX; - /* 0xA */ s16 prevPosWorldY; - /* 0xC */ s32 unkC; - /* 0x10 */ s32 unk10; - /* 0x14 */ u8 fill14[0x20 - 0x14]; - /* 0x20 */ u8 unk20; - /* 0x21 */ u8 unk21[0x70 - 0x21]; - struct subStruct_8048524 *unk70; -}; - -#endif diff --git a/include/dungeon_entity.h b/include/dungeon_entity.h new file mode 100644 index 0000000..82e2791 --- /dev/null +++ b/include/dungeon_entity.h @@ -0,0 +1,106 @@ +#ifndef GUARD_DUNGEON_ENTITY_H +#define GUARD_DUNGEON_ENTITY_H + +struct subStruct_8048524 +{ + u8 fill0[0x6]; + u8 unk6; + u8 unk7; + u8 fill8[0xE - 0x8]; + /* 0xE */ s16 HP; // HP?? + s16 unk10; + u8 fill12[0x46 - 0x12]; + s8 unk46; + u8 fill47[0xA4 - 0x47]; + u8 unkA4; + u8 fillA5[0xAC - 0xA5]; + /* 0xAC */ u8 statusCondition; + u8 fillAD[0xFB - 0xAD]; + u8 unkFB; + u8 fillFC[0x112 - 0xFC]; + u8 unk112; + u8 fill113[0x13C - 0x113]; + u32 unk13C; + u8 fill140[0x15C - 0x140]; + u8 unk15C; + u8 unk15D; + u8 unk15E; + u8 unk15F; + u8 fill160[0x174 - 0x160]; + u32 unk174; +}; + +// Used for Pokémon, items, and traps. +struct DungeonEntity +{ + /* 0x0 */ u8 entityType; + u8 fill1[0x4 - 0x1]; + /* 0x4 */ s16 posWorldX; + /* 0x6 */ s16 posWorldY; + /* 0x8 */ s16 prevPosWorldX; + /* 0xA */ s16 prevPosWorldY; + // The center of the entity acccording to pixel-space coordinates, using the same origin as posWorld. + // X = (posWorld * 24 + 16) * 256, while Y = (posWorld * 24 + 12) * 256. + /* 0xC */ s32 posPixelX; + /* 0x10 */ s32 posPixelY; + /* 0x14 */ s32 prevPosPixelX; + /* 0x18 */ s32 prevPosPixelY; + u8 fill1C[0x20 - 0x1C]; + /* 0x20 */ bool8 active; // Turned off when a Pokémon faints. + u8 fill21[0x25 - 0x21]; + /* 0x25 */ u8 roomIndex; + // The global spawn index counter starts at 10. Each Pokémon that spawns increments the counter and + // gets assigned the current counter value as its spawn index. + /* 0x26 */ u16 spawnIndex; + u8 fill28[0x2A - 0x28]; + // 0x2A and 0x2E seem to be related to the sprite animation, though not sure how they're related. + /* 0x2A */ u16 spriteAnimationCounter; + // Each animation has a few different sprites that it transitions between. + // This is the index of the currently displayed sprite within the animation. + // Differs from 0x34 as this index is only between the sprites used by the animation, + // while 0x34 is a shared index among all sprites. + /* 0x2C */ u16 spriteAnimationIndex; + /* 0x2E */ u16 spriteAnimationCounter2; + // The position of the sprite within the tile. The animation may change the position slightly. + /* 0x30 */ u16 spritePosX; + /* 0x32 */ u16 spritePosY; + // Offset of the sprite from its position at the start of the animation. Changes alongside spritePos. + /* 0x34 */ s16 spritePosOffsetX; + /* 0x36 */ s16 spritePosOffsetY; + u8 fill38[0x48 - 0x38]; + // The sprite index to display, among the Pokémon's possible sprites. + /* 0x48 */ u16 spriteIndexForEntity; + /* 0x4A */ u16 spriteIndexForEntity2; + // Some kind of base sprite index depending on which way the Pokémon is facing. + // and which animation is playing (e.g., idle, moving). + // Compared to 0x48, 0x50 and 0x54 are much larger and could be global indexes among all sprites in the game. + /* 0x50 */ u16 spriteBaseForDirection; + u8 fill52[0x54 - 0x52]; + /* 0x54 */ u16 spriteGlobalIndex; + u8 fill56[0x6C - 0x56]; + /* 0x6C */ u8 facingDirection; + /* 0x6D */ u8 facingDirection2; // Duplicate of 0x6C? + u8 fill6D[0x70 - 0x6D]; + struct subStruct_8048524 *unk70; +}; + +enum EntityType +{ + ENTITY_POKEMON = 1, + ENTITY_ITEM = 2, + ENTITY_TRAP = 3 +}; + +enum FacingDirection +{ + SOUTH, + SOUTHEAST, + EAST, + NORTHEAST, + NORTH, + NORTHWEST, + WEST, + SOUTHWEST +}; + +#endif diff --git a/include/gUnknown_203B418.h b/include/gUnknown_203B418.h index 5323a6e..902b591 100644 --- a/include/gUnknown_203B418.h +++ b/include/gUnknown_203B418.h @@ -1,7 +1,7 @@ #ifndef GUARD_GUNKNOWN_203B418_H #define GUARD_GUNKNOWN_203B418_H -#include "code_8041D5C.h" +#include "dungeon_entity.h" struct unkStruct_203B418 { @@ -27,7 +27,7 @@ struct unkStruct_203B418 u8 fillE26D[0x1356C - 0xE26D]; u8 unk1356C; u8 fill1356D[0x1358C - 0x1356D]; - struct unkDungeon_8041D5C *unk1358C[0x10]; + struct DungeonEntity *unk1358C[0x10]; u8 fill135CC[0x181FC - 0x135CC]; u32 unk181FC; u32 unk18200; diff --git a/src/code_8041AD0.c b/src/code_8041AD0.c index b411a26..28ac016 100644 --- a/src/code_8041AD0.c +++ b/src/code_8041AD0.c @@ -1,5 +1,5 @@ #include "global.h" -#include "code_8041D5C.h" +#include "dungeon_entity.h" #include "gUnknown_203B418.h" struct unkStruct_80420E8 @@ -12,32 +12,32 @@ struct unkStruct_80420E8 extern struct unkStruct_203B418 *gUnknown_203B418; -extern void sub_803ED30(u8, struct unkDungeon_8041D5C *r0, u8, u8); -extern void sub_804151C(struct unkDungeon_8041D5C *r0, u32 r1, u8 r2); -extern void sub_80416E0(struct unkDungeon_8041D5C *r0, u32, u32); -extern u8 sub_8042768(struct unkDungeon_8041D5C *r0); -extern void sub_806CDD4(struct unkDungeon_8041D5C *r0, u8, u32); -extern u8 sub_8071858(struct unkDungeon_8041D5C *r0, u8); +extern void sub_803ED30(u8, struct DungeonEntity *r0, u8, u8); +extern void sub_804151C(struct DungeonEntity *r0, u32 r1, u8 r2); +extern void sub_80416E0(struct DungeonEntity *r0, u32, u32); +extern u8 sub_8042768(struct DungeonEntity *r0); +extern void sub_806CDD4(struct DungeonEntity *r0, u8, u32); +extern u8 sub_8071858(struct DungeonEntity *r0, u8); extern u32 sub_806F62C(u32); extern void PlaySoundEffect(u32); -extern u8 sub_803F428(struct unkDungeon_8041D5C *r0); -extern void sub_8041550(struct unkDungeon_8041D5C *r0, u32, u32, u32, u32, u32); +extern u8 sub_803F428(struct DungeonEntity *r0); +extern void sub_8041550(struct DungeonEntity *r0, u32, u32, u32, u32, u32); -void sub_80421C0(struct unkDungeon_8041D5C *r0, u16 r1); +void sub_80421C0(struct DungeonEntity *r0, u16 r1); -void sub_8041AD0(struct unkDungeon_8041D5C *r0) +void sub_8041AD0(struct DungeonEntity *r0) { sub_804151C(r0, 0xA2 << 1, 1); } -void sub_8041AE0(struct unkDungeon_8041D5C *r0) +void sub_8041AE0(struct DungeonEntity *r0) { sub_804151C(r0, 0x143, 1); } -void sub_8041AF4(struct unkDungeon_8041D5C *r0) +void sub_8041AF4(struct DungeonEntity *r0) { sub_804151C(r0, 0x25, 1); sub_80421C0(r0, 0x197); @@ -47,7 +47,7 @@ void nullsub_57(void) { } -void sub_8041B18(struct unkDungeon_8041D5C *r0) +void sub_8041B18(struct DungeonEntity *r0) { sub_804151C(r0, 0x141, 1); } @@ -60,7 +60,7 @@ void nullsub_59(void) { } -void sub_8041B34(struct unkDungeon_8041D5C *r0) +void sub_8041B34(struct DungeonEntity *r0) { sub_804151C(r0, 7, 1); } @@ -69,7 +69,7 @@ void nullsub_60(void) { } -void sub_8041B48(struct unkDungeon_8041D5C *r0) +void sub_8041B48(struct DungeonEntity *r0) { sub_804151C(r0, 4, 0); } @@ -78,16 +78,16 @@ void nullsub_61(void) { } -void sub_8041B5C(struct unkDungeon_8041D5C *r0) +void sub_8041B5C(struct DungeonEntity *r0) { sub_804151C(r0, 0x171, 1); } -void nullsub_62(struct unkDungeon_8041D5C *r0) +void nullsub_62(struct DungeonEntity *r0) { } -void sub_8041B74(struct unkDungeon_8041D5C *r0) +void sub_8041B74(struct DungeonEntity *r0) { sub_804151C(r0, 0x171, 0); } @@ -100,7 +100,7 @@ void nullsub_64(void) { } -void sub_8041B90(struct unkDungeon_8041D5C *r0) +void sub_8041B90(struct DungeonEntity *r0) { sub_804151C(r0, 0xD6 << 1, 0); } @@ -113,7 +113,7 @@ void nullsub_66(void) { } -void sub_8041BA8(struct unkDungeon_8041D5C *r0) +void sub_8041BA8(struct DungeonEntity *r0) { sub_804151C(r0, 4, 1); } @@ -122,7 +122,7 @@ void nullsub_67(void) { } -void sub_8041BBC(struct unkDungeon_8041D5C *r0) +void sub_8041BBC(struct DungeonEntity *r0) { sub_804151C(r0, 0xD4 << 1, 1); } @@ -131,7 +131,7 @@ void nullsub_68(void) { } -void sub_8041BD0(struct unkDungeon_8041D5C *r0, u8 r1) +void sub_8041BD0(struct DungeonEntity *r0, u8 r1) { if(r1 == 0) { @@ -140,22 +140,22 @@ void sub_8041BD0(struct unkDungeon_8041D5C *r0, u8 r1) sub_80421C0(r0, 0x1a5); } -void sub_8041BE8(struct unkDungeon_8041D5C *r0) +void sub_8041BE8(struct DungeonEntity *r0) { sub_80421C0(r0, 0xCB << 1); } -void sub_8041BF8(struct unkDungeon_8041D5C *r0) +void sub_8041BF8(struct DungeonEntity *r0) { sub_806CDD4(r0, 0xA, 8); } -void sub_8041C08(struct unkDungeon_8041D5C *r0) +void sub_8041C08(struct DungeonEntity *r0) { sub_804151C(r0, 0x1a7, 1); } -void sub_8041C1C(struct unkDungeon_8041D5C *r0) +void sub_8041C1C(struct DungeonEntity *r0) { sub_804151C(r0, 0x1a7, 1); } @@ -164,7 +164,7 @@ void nullsub_69(void) { } -void sub_8041C34(struct unkDungeon_8041D5C *r0) +void sub_8041C34(struct DungeonEntity *r0) { sub_804151C(r0, 0x4C, 1); } @@ -177,22 +177,22 @@ void nullsub_71(void) { } -void sub_8041C4C(struct unkDungeon_8041D5C *r0, u32 r1) +void sub_8041C4C(struct DungeonEntity *r0, u32 r1) { sub_804151C(r0, r1, 1); } -void sub_8041C58(struct unkDungeon_8041D5C *r0) +void sub_8041C58(struct DungeonEntity *r0) { sub_804151C(r0, 0x1a9, 1); } -void sub_8041C6C(struct unkDungeon_8041D5C *r0) +void sub_8041C6C(struct DungeonEntity *r0) { sub_804151C(r0, 0x9D << 1, 1); } -void sub_8041C7C(struct unkDungeon_8041D5C *r0) +void sub_8041C7C(struct DungeonEntity *r0) { sub_804151C(r0, 0x9D << 1, 1); } @@ -205,32 +205,32 @@ void nullsub_73(void) { } -void sub_8041C94(struct unkDungeon_8041D5C *r0) +void sub_8041C94(struct DungeonEntity *r0) { sub_804151C(r0, 0x171, 1); } -void sub_8041CA8(struct unkDungeon_8041D5C *r0) +void sub_8041CA8(struct DungeonEntity *r0) { sub_804151C(r0, 7, 1); } -void sub_8041CB8(struct unkDungeon_8041D5C *r0) +void sub_8041CB8(struct DungeonEntity *r0) { sub_804151C(r0, 0x18b, 1); } -void sub_8041CCC(struct unkDungeon_8041D5C *r0) +void sub_8041CCC(struct DungeonEntity *r0) { sub_804151C(r0, 0xC5 << 1, 1); } -void sub_8041CDC(struct unkDungeon_8041D5C *r0) +void sub_8041CDC(struct DungeonEntity *r0) { sub_804151C(r0, 5, 1); } -void sub_8041CEC(struct unkDungeon_8041D5C *r0) +void sub_8041CEC(struct DungeonEntity *r0) { sub_80421C0(r0, 0x19d); } @@ -239,7 +239,7 @@ void nullsub_74(void) { } -void sub_8041D00(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) +void sub_8041D00(struct DungeonEntity *r0, struct DungeonEntity *r1) { sub_804151C(r1, 0x2F, 1); sub_804151C(r0, 0x30, 1); @@ -269,12 +269,12 @@ void nullsub_80(void) { } -void sub_8041D38(struct unkDungeon_8041D5C * r0) +void sub_8041D38(struct DungeonEntity * r0) { sub_804151C(r0, 0x21, 1); } -void sub_8041D48(struct unkDungeon_8041D5C * r0) +void sub_8041D48(struct DungeonEntity * r0) { sub_80421C0(r0, 0x191); } @@ -283,7 +283,7 @@ void nullsub_81(void) { } -void sub_8041D5C(struct unkDungeon_8041D5C *r0) +void sub_8041D5C(struct DungeonEntity *r0) { if(sub_8042768(r0) == 0) { @@ -292,7 +292,7 @@ void sub_8041D5C(struct unkDungeon_8041D5C *r0) sub_803ED30(r0->unk70->unk112 , r0, 1, 0xB); } -void sub_8041D84(struct unkDungeon_8041D5C * r0) +void sub_8041D84(struct DungeonEntity * r0) { sub_80421C0(r0, 0x19f); } @@ -305,12 +305,12 @@ void nullsub_83(void) { } -void sub_8041D9C(struct unkDungeon_8041D5C * r0) +void sub_8041D9C(struct DungeonEntity * r0) { sub_804151C(r0, 0x131, 1); } -void sub_8041DB0(struct unkDungeon_8041D5C * r0) +void sub_8041DB0(struct DungeonEntity * r0) { sub_804151C(r0, 0x30, 1); } @@ -339,7 +339,7 @@ void nullsub_88(void) { } -void sub_8041DD8(struct unkDungeon_8041D5C *r0, s16 r1) +void sub_8041DD8(struct DungeonEntity *r0, s16 r1) { u32 temp; temp = r1; @@ -354,78 +354,78 @@ void nullsub_89(void) { } -void sub_8041E0C(struct unkDungeon_8041D5C *r0) +void sub_8041E0C(struct DungeonEntity *r0) { sub_804151C(r0, 0x41, 1); } -void sub_8041E1C(struct unkDungeon_8041D5C *r0) +void sub_8041E1C(struct DungeonEntity *r0) { sub_804151C(r0, 0x8F << 1, 1); sub_80421C0(r0, 0xCE << 1); } -void sub_8041E3C(struct unkDungeon_8041D5C *r0) +void sub_8041E3C(struct DungeonEntity *r0) { sub_804151C(r0, 0xD7 << 1, 1); } -void sub_8041E4C(struct unkDungeon_8041D5C *r0) +void sub_8041E4C(struct DungeonEntity *r0) { sub_804151C(r0, 0x1b1, 1); } -void sub_8041E60(struct unkDungeon_8041D5C *r0) +void sub_8041E60(struct DungeonEntity *r0) { sub_804151C(r0, 0x1a9, 1); } -void sub_8041E74(struct unkDungeon_8041D5C *r0) +void sub_8041E74(struct DungeonEntity *r0) { sub_804151C(r0, 0xC9 << 1, 1); } -void sub_8041E84(struct unkDungeon_8041D5C *r0) +void sub_8041E84(struct DungeonEntity *r0) { sub_804151C(r0, 0xC7 << 1, 1); } -void sub_8041E94(struct unkDungeon_8041D5C *r0) +void sub_8041E94(struct DungeonEntity *r0) { sub_804151C(r0, 0xC8 << 1, 1); } -void sub_8041EA4(struct unkDungeon_8041D5C *r0) +void sub_8041EA4(struct DungeonEntity *r0) { sub_804151C(r0, 0x15, 1); } -void sub_8041EB4(struct unkDungeon_8041D5C *r0) +void sub_8041EB4(struct DungeonEntity *r0) { sub_804151C(r0, 0x171, 1); } -void sub_8041EC8(struct unkDungeon_8041D5C *r0) +void sub_8041EC8(struct DungeonEntity *r0) { sub_80421C0(r0, 0x197); } -void sub_8041ED8(struct unkDungeon_8041D5C *r0) +void sub_8041ED8(struct DungeonEntity *r0) { sub_80421C0(r0, 0x197); } -void sub_8041EE8(struct unkDungeon_8041D5C *r0) +void sub_8041EE8(struct DungeonEntity *r0) { sub_804151C(r0, 0x15, 1); } -void sub_8041EF8(struct unkDungeon_8041D5C *r0) +void sub_8041EF8(struct DungeonEntity *r0) { sub_804151C(r0, 0xF, 1); } -void sub_8041F08(struct unkDungeon_8041D5C *r0) +void sub_8041F08(struct DungeonEntity *r0) { sub_8041550(r0, 0x15, 1, 3, 2, 0); } @@ -434,7 +434,7 @@ void nullsub_90(void) { } -void sub_8041F28(struct unkDungeon_8041D5C *r0, u32 r1) +void sub_8041F28(struct DungeonEntity *r0, u32 r1) { if(r1 == 0) { @@ -446,7 +446,7 @@ void sub_8041F28(struct unkDungeon_8041D5C *r0, u32 r1) } } -void sub_8041F4C(struct unkDungeon_8041D5C *r0, u32 r1) +void sub_8041F4C(struct DungeonEntity *r0, u32 r1) { if(r1 == 0) { @@ -458,7 +458,7 @@ void sub_8041F4C(struct unkDungeon_8041D5C *r0, u32 r1) } } -void sub_8041F70(struct unkDungeon_8041D5C *r0, u32 r1) +void sub_8041F70(struct DungeonEntity *r0, u32 r1) { if(r1 == 0) { @@ -470,7 +470,7 @@ void sub_8041F70(struct unkDungeon_8041D5C *r0, u32 r1) } } -void sub_8041F94(struct unkDungeon_8041D5C *r0, u32 r1) +void sub_8041F94(struct DungeonEntity *r0, u32 r1) { if(r1 == 0) { @@ -482,7 +482,7 @@ void sub_8041F94(struct unkDungeon_8041D5C *r0, u32 r1) } } -void sub_8041FB4(struct unkDungeon_8041D5C *r0, u32 r1) +void sub_8041FB4(struct DungeonEntity *r0, u32 r1) { if(r1 == 0) { @@ -494,7 +494,7 @@ void sub_8041FB4(struct unkDungeon_8041D5C *r0, u32 r1) } } -void sub_8041FD8(struct unkDungeon_8041D5C *r0, u32 r1) +void sub_8041FD8(struct DungeonEntity *r0, u32 r1) { if(r1 == 0) { @@ -506,7 +506,7 @@ void sub_8041FD8(struct unkDungeon_8041D5C *r0, u32 r1) } } -void sub_8041FFC(struct unkDungeon_8041D5C *r0, u32 r1) +void sub_8041FFC(struct DungeonEntity *r0, u32 r1) { if(r1 == 0) { @@ -518,7 +518,7 @@ void sub_8041FFC(struct unkDungeon_8041D5C *r0, u32 r1) } } -void sub_804201C(struct unkDungeon_8041D5C *r0, u32 r1) +void sub_804201C(struct DungeonEntity *r0, u32 r1) { if(r1 == 0) { @@ -530,7 +530,7 @@ void sub_804201C(struct unkDungeon_8041D5C *r0, u32 r1) } } -void sub_8042040(struct unkDungeon_8041D5C *r0, u32 r1) +void sub_8042040(struct DungeonEntity *r0, u32 r1) { if(r1 == 0) { @@ -542,7 +542,7 @@ void sub_8042040(struct unkDungeon_8041D5C *r0, u32 r1) } } -void sub_8042060(struct unkDungeon_8041D5C *r0, u32 r1) +void sub_8042060(struct DungeonEntity *r0, u32 r1) { if(r1 == 0) { @@ -554,7 +554,7 @@ void sub_8042060(struct unkDungeon_8041D5C *r0, u32 r1) } } -void sub_8042080(struct unkDungeon_8041D5C *r0, u32 r1) +void sub_8042080(struct DungeonEntity *r0, u32 r1) { if(r1 == 0) { @@ -566,7 +566,7 @@ void sub_8042080(struct unkDungeon_8041D5C *r0, u32 r1) } } -void sub_80420A0(struct unkDungeon_8041D5C *r0, u32 r1) +void sub_80420A0(struct DungeonEntity *r0, u32 r1) { sub_804151C(r0, 0x143, 1); } @@ -575,12 +575,12 @@ void nullsub_91(void) { } -void sub_80420B8(struct unkDungeon_8041D5C *r0, u32 r1) +void sub_80420B8(struct DungeonEntity *r0, u32 r1) { sub_804151C(r0, 0x19, 1); } -void sub_80420C8(struct unkDungeon_8041D5C *r0) +void sub_80420C8(struct DungeonEntity *r0) { sub_8041550(r0, 0x15, 1, 3, 2, 0); } @@ -589,7 +589,7 @@ void nullsub_92(void) { } -void sub_80420E8(struct unkDungeon_8041D5C *r0, struct unkStruct_80420E8 *r1) +void sub_80420E8(struct DungeonEntity *r0, struct unkStruct_80420E8 *r1) { u32 temp; u32 arg; @@ -615,7 +615,7 @@ void sub_80420E8(struct unkDungeon_8041D5C *r0, struct unkStruct_80420E8 *r1) sub_8041550(r0, arg, 1, 3, 0, 1); } -void sub_8042148(struct unkDungeon_8041D5C *r0) +void sub_8042148(struct DungeonEntity *r0) { sub_80421C0(r0, 0x1a7); sub_804151C(r0, 0x9F << 1, 1); @@ -625,7 +625,7 @@ void nullsub_93() { } -void sub_804216C(u32 r0, struct unkDungeon_8041D5C *r1, u32 r2) +void sub_804216C(u32 r0, struct DungeonEntity *r1, u32 r2) { if(r2 == 1) sub_804151C(r1, 0xF8, 1); @@ -633,22 +633,22 @@ void sub_804216C(u32 r0, struct unkDungeon_8041D5C *r1, u32 r2) sub_804151C(r1, 0xF9, 1); } -void sub_804218C(u32 r0, struct unkDungeon_8041D5C *r1) +void sub_804218C(u32 r0, struct DungeonEntity *r1) { sub_804151C(r1, 0x2A, 1); } -void sub_804219C(struct unkDungeon_8041D5C *r0) +void sub_804219C(struct DungeonEntity *r0) { sub_80416E0(r0, 0x90, 1); } -void sub_80421AC(u32 r0, struct unkDungeon_8041D5C * r1) +void sub_80421AC(u32 r0, struct DungeonEntity * r1) { sub_804151C(r1, 0x167, 1); } -void sub_80421C0(struct unkDungeon_8041D5C *r0, u16 r1) +void sub_80421C0(struct DungeonEntity *r0, u16 r1) { if(r0 == NULL) PlaySoundEffect(r1); @@ -657,13 +657,13 @@ void sub_80421C0(struct unkDungeon_8041D5C *r0, u16 r1) PlaySoundEffect(r1); } -void sub_80421EC(struct unkDungeon_8041D5C *r0, u16 r1) +void sub_80421EC(struct DungeonEntity *r0, u16 r1) { if(sub_803F428(r0) != 0) PlaySoundEffect(r1); } -void sub_8042208(struct unkDungeon_8041D5C *r0, u8 r1) +void sub_8042208(struct DungeonEntity *r0, u8 r1) { if(r1 == 0) PlaySoundEffect(0x152); @@ -673,7 +673,7 @@ void sub_8042208(struct unkDungeon_8041D5C *r0, u8 r1) PlaySoundEffect(0x150); } -void sub_8042238(u32 r0, struct unkDungeon_8041D5C *r1) +void sub_8042238(u32 r0, struct DungeonEntity *r1) { if(r1->unk70->unk6 != 0) PlaySoundEffect(0x157); diff --git a/src/code_80428A0.c b/src/code_80428A0.c index 1596c4b..da72193 100644 --- a/src/code_80428A0.c +++ b/src/code_80428A0.c @@ -1,148 +1,148 @@ #include "global.h" -#include "code_8041D5C.h" +#include "dungeon_entity.h" -extern void sub_804151C(struct unkDungeon_8041D5C *r0, u32 r1, u8 r2); +extern void sub_804151C(struct DungeonEntity *r0, u32 r1, u8 r2); extern void sub_803E708(u32 r0, u32 r1); -extern void sub_80416A4(struct unkDungeon_8041D5C *r0, u32 r1, u32 r2); -extern void sub_80421C0(struct unkDungeon_8041D5C *r0, u16 r1); +extern void sub_80416A4(struct DungeonEntity *r0, u32 r1, u32 r2); +extern void sub_80421C0(struct DungeonEntity *r0, u16 r1); -void sub_80428A0(struct unkDungeon_8041D5C *r0) +void sub_80428A0(struct DungeonEntity *r0) { sub_804151C(r0, 0x29, 1); } -void sub_80428B0(struct unkDungeon_8041D5C *r0) +void sub_80428B0(struct DungeonEntity *r0) { sub_804151C(r0, 0x1a9, 0); } -void sub_80428C4(struct unkDungeon_8041D5C *r0) +void sub_80428C4(struct DungeonEntity *r0) { sub_804151C(r0, 0x1a9, 0); } -void sub_80428D8(struct unkDungeon_8041D5C *r0) +void sub_80428D8(struct DungeonEntity *r0) { sub_804151C(r0, 0x1a9, 0); } -void sub_80428EC(struct unkDungeon_8041D5C *r0) +void sub_80428EC(struct DungeonEntity *r0) { sub_804151C(r0, 0x1a9, 0); } -void sub_8042900(struct unkDungeon_8041D5C *r0) +void sub_8042900(struct DungeonEntity *r0) { sub_804151C(r0, 0xD4 << 1, 0); } -void sub_8042910(struct unkDungeon_8041D5C *r0) +void sub_8042910(struct DungeonEntity *r0) { sub_804151C(r0, 0x29, 0); } -void sub_8042920(struct unkDungeon_8041D5C *r0) +void sub_8042920(struct DungeonEntity *r0) { sub_804151C(r0, 0x48, 0); } -void sub_8042930(struct unkDungeon_8041D5C *r0) +void sub_8042930(struct DungeonEntity *r0) { sub_804151C(r0, 0xD3 << 1, 1); } -void sub_8042940(struct unkDungeon_8041D5C *r0) +void sub_8042940(struct DungeonEntity *r0) { sub_804151C(r0, 0xC7 << 1, 0); } -void sub_8042950(struct unkDungeon_8041D5C *r0) +void sub_8042950(struct DungeonEntity *r0) { sub_804151C(r0, 0xD8 << 1, 1); sub_803E708(0xA, 0x42); } -void sub_8042968(struct unkDungeon_8041D5C *r0) +void sub_8042968(struct DungeonEntity *r0) { sub_804151C(r0, 0xD4 << 1, 0); } -void sub_8042978(struct unkDungeon_8041D5C *r0) +void sub_8042978(struct DungeonEntity *r0) { sub_804151C(r0, 0x1a9, 0); } -void sub_804298C(struct unkDungeon_8041D5C *r0) +void sub_804298C(struct DungeonEntity *r0) { sub_804151C(r0, 0x1a9, 0); } -void sub_80429A0(struct unkDungeon_8041D5C *r0) +void sub_80429A0(struct DungeonEntity *r0) { sub_804151C(r0, 0x199, 0); } -void sub_80429B4(struct unkDungeon_8041D5C *r0) +void sub_80429B4(struct DungeonEntity *r0) { sub_804151C(r0, 0x1ab, 0); } -void sub_80429C8(struct unkDungeon_8041D5C *r0) +void sub_80429C8(struct DungeonEntity *r0) { sub_804151C(r0, 0x4, 1); } -void sub_80429D8(struct unkDungeon_8041D5C *r0) +void sub_80429D8(struct DungeonEntity *r0) { sub_804151C(r0, 0x8F << 1, 1); } -void sub_80429E8(struct unkDungeon_8041D5C *r0) +void sub_80429E8(struct DungeonEntity *r0) { sub_804151C(r0, 0x11d, 1); } -void sub_80429FC(struct unkDungeon_8041D5C *r0) +void sub_80429FC(struct DungeonEntity *r0) { sub_80416A4(r0, 0xCF << 1, 1); sub_80421C0(NULL, 0xD4); } -void sub_8042A14(struct unkDungeon_8041D5C *r0) +void sub_8042A14(struct DungeonEntity *r0) { sub_80416A4(r0, 0x36, 1); } -void sub_8042A24(struct unkDungeon_8041D5C *r0) +void sub_8042A24(struct DungeonEntity *r0) { sub_804151C(r0, 0x15, 1); } -void sub_8042A34(struct unkDungeon_8041D5C *r0) +void sub_8042A34(struct DungeonEntity *r0) { sub_80416A4(r0, 0x9F << 1, 0); } -void sub_8042A44(struct unkDungeon_8041D5C *r0) +void sub_8042A44(struct DungeonEntity *r0) { sub_804151C(r0, 0xDA << 1, 1); } -void sub_8042A54(struct unkDungeon_8041D5C *r0) +void sub_8042A54(struct DungeonEntity *r0) { sub_80416A4(r0, 0x37, 1); } -void sub_8042A64(struct unkDungeon_8041D5C *r0) +void sub_8042A64(struct DungeonEntity *r0) { sub_80416A4(r0, 0x29, 1); } -void sub_8042A74(struct unkDungeon_8041D5C *r0) +void sub_8042A74(struct DungeonEntity *r0) { sub_804151C(r0, 0x18, 1); } diff --git a/src/code_8048480.c b/src/code_8048480.c index 2995170..470de97 100644 --- a/src/code_8048480.c +++ b/src/code_8048480.c @@ -1,5 +1,5 @@ #include "global.h" -#include "code_8041D5C.h" +#include "dungeon_entity.h" extern u32 gUnknown_80F89F4; extern u8 gAvailablePokemonNames[0x58]; @@ -10,76 +10,76 @@ extern s16 gUnknown_80F4FBA; extern s16 gUnknown_80F4FBC; extern s16 gUnknown_80F4FBE; -extern void sub_807D148(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32 r2, u32 r3); -extern void sub_8075FCC(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1); -extern void sub_8077AE4(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32 r2); -extern void sub_8072008(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32 r2, u8 r3, u32); -extern void sub_8076D10(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1); -extern void LevelDownTarget(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32 r2); - -extern void sub_8045B94(u8 *r0, struct unkDungeon_8041D5C *r1, u32); -extern void sub_807A290(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1); -extern void sub_80522F4(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32); -extern void RestoreVisionTarget(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1); -extern void sub_8077910(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32, u32); -extern void sub_80791D8(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1); -extern void BlindTarget(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1); -extern void HealTargetHP(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, s16, s16, u32); -extern void sub_80792F8(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32); -extern void sub_8079F20(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32, u8); -extern void sub_806F370(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32, u32, u32, u32, u32, u32, u32, u32); - -void sub_8048340(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32 r2) +extern void sub_807D148(struct DungeonEntity *r0, struct DungeonEntity *r1, u32 r2, u32 r3); +extern void sub_8075FCC(struct DungeonEntity *r0, struct DungeonEntity *r1); +extern void sub_8077AE4(struct DungeonEntity *r0, struct DungeonEntity *r1, u32 r2); +extern void sub_8072008(struct DungeonEntity *r0, struct DungeonEntity *r1, u32 r2, u8 r3, u32); +extern void sub_8076D10(struct DungeonEntity *r0, struct DungeonEntity *r1); +extern void LevelDownTarget(struct DungeonEntity *r0, struct DungeonEntity *r1, u32 r2); + +extern void sub_8045B94(u8 *r0, struct DungeonEntity *r1, u32); +extern void sub_807A290(struct DungeonEntity *r0, struct DungeonEntity *r1); +extern void sub_80522F4(struct DungeonEntity *r0, struct DungeonEntity *r1, u32); +extern void RestoreVisionTarget(struct DungeonEntity *r0, struct DungeonEntity *r1); +extern void sub_8077910(struct DungeonEntity *r0, struct DungeonEntity *r1, u32, u32); +extern void sub_80791D8(struct DungeonEntity *r0, struct DungeonEntity *r1); +extern void BlindTarget(struct DungeonEntity *r0, struct DungeonEntity *r1); +extern void HealTargetHP(struct DungeonEntity *r0, struct DungeonEntity *r1, s16, s16, u32); +extern void sub_80792F8(struct DungeonEntity *r0, struct DungeonEntity *r1, u32); +extern void sub_8079F20(struct DungeonEntity *r0, struct DungeonEntity *r1, u32, u8); +extern void sub_806F370(struct DungeonEntity *r0, struct DungeonEntity *r1, u32, u32, u32, u32, u32, u32, u32, u32); + +void sub_8048340(struct DungeonEntity *r0, struct DungeonEntity *r1, u32 r2) { sub_806F370(r0, r1, r2, 1, 0, 0, 528, 0, 0, 0); } -void sub_8048364(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u8 r2) +void sub_8048364(struct DungeonEntity *r0, struct DungeonEntity *r1, u8 r2) { sub_8079F20(r0, r1, 1, r2); } -void sub_8048374(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) +void sub_8048374(struct DungeonEntity *r0, struct DungeonEntity *r1) { HealTargetHP(r0, r1, gUnknown_80F4FB6, gUnknown_80F4FB8, 1); } -void sub_804839C(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) +void sub_804839C(struct DungeonEntity *r0, struct DungeonEntity *r1) { HealTargetHP(r0, r1, gUnknown_80F4FBA, gUnknown_80F4FBC, 1); } -void sub_80483C4(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) +void sub_80483C4(struct DungeonEntity *r0, struct DungeonEntity *r1) { sub_80792F8(r0, r1, 999); } -void sub_80483D4(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) +void sub_80483D4(struct DungeonEntity *r0, struct DungeonEntity *r1) { HealTargetHP(r0, r1, 0, gUnknown_80F4FBE, 1); } -void sub_80483F4(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) +void sub_80483F4(struct DungeonEntity *r0, struct DungeonEntity *r1) { BlindTarget(r0, r1); } -void sub_8048400(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) +void sub_8048400(struct DungeonEntity *r0, struct DungeonEntity *r1) { sub_80791D8(r0, r1); } -void sub_804840C(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) +void sub_804840C(struct DungeonEntity *r0, struct DungeonEntity *r1) { sub_8077910(r0, r1, 0, 1); } -void sub_804841C(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) +void sub_804841C(struct DungeonEntity *r0, struct DungeonEntity *r1) { RestoreVisionTarget(r0, r1); } -void sub_8048428(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) +void sub_8048428(struct DungeonEntity *r0, struct DungeonEntity *r1) { if(r1->unk70->statusCondition == 4) // 4 - Paralyzed?? sub_807A290(r0, r1); @@ -88,7 +88,7 @@ void sub_8048428(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) sub_80522F4(r0, r1, gUnknown_80F89F4); } -void sub_8048450(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) +void sub_8048450(struct DungeonEntity *r0, struct DungeonEntity *r1) { if((u8)(r1->unk70->statusCondition - 2) <= 1) sub_807A290(r0, r1); @@ -97,43 +97,43 @@ void sub_8048450(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) sub_80522F4(r0, r1, gUnknown_80F89F4); } -void sub_8048480(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) +void sub_8048480(struct DungeonEntity *r0, struct DungeonEntity *r1) { sub_807D148(r0, r1, 0, 0); } -void sub_8048490(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) +void sub_8048490(struct DungeonEntity *r0, struct DungeonEntity *r1) { sub_8075FCC(r0, r1); } -void sub_804849C(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) +void sub_804849C(struct DungeonEntity *r0, struct DungeonEntity *r1) { sub_8077AE4(r0, r1, 1); } -void sub_80484A8(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) +void sub_80484A8(struct DungeonEntity *r0, struct DungeonEntity *r1) { sub_8072008(r0, r1, 1, 1, 1); } -void sub_80484BC(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) +void sub_80484BC(struct DungeonEntity *r0, struct DungeonEntity *r1) { sub_8076D10(r0, r1); } -void sub_80484C8(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) +void sub_80484C8(struct DungeonEntity *r0, struct DungeonEntity *r1) { // Pointer to "But nothing happened!" sub_80522F4(r0, r1, gUnknown_80F89F4); } -void sub_80484DC(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) +void sub_80484DC(struct DungeonEntity *r0, struct DungeonEntity *r1) { LevelDownTarget(r0, r1, 1); } -void sub_80484E8(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) +void sub_80484E8(struct DungeonEntity *r0, struct DungeonEntity *r1) { if(r1->unk70->statusCondition == 1) // 1 - Burn?? sub_807A290(r0, r1); diff --git a/src/code_80521D0_1.c b/src/code_80521D0_1.c index 2bfe414..f275279 100644 --- a/src/code_80521D0_1.c +++ b/src/code_80521D0_1.c @@ -1,12 +1,12 @@ #include "global.h" #include "gUnknown_203B418.h" -#include "code_8041D5C.h" +#include "dungeon_entity.h" #include "friend_area.h" #include "constants/friend_area.h" #include "pokemon.h" -extern struct unkDungeon_8041D5C *sub_8085480(void); -extern struct unkDungeon_8041D5C *sub_8085680(u32); +extern struct DungeonEntity *sub_8085480(void); +extern struct DungeonEntity *sub_8085680(u32); extern char gUnknown_202E038[0x50]; extern struct unkStruct_203B418 *gUnknown_203B418; extern u32 gUnknown_202EDC8; @@ -65,12 +65,12 @@ extern u8 sub_800E9A8(u32); extern void sub_800DC14(u32); extern void sub_808BAA4(); -extern void sub_8086A3C(struct unkDungeon_8041D5C *r0); +extern void sub_8086A3C(struct DungeonEntity *r0); extern void sub_8083E88(u32); extern void sub_80854D4(void); extern void sub_80855E4(void *); extern void sub_8085930(u32); -extern void sub_8068FE0(struct unkDungeon_8041D5C *, u32, u32); +extern void sub_8068FE0(struct DungeonEntity *, u32, u32); extern void sub_8085860(s16 r0, u32 r1); extern void sub_80866C4(u32 *); extern void sub_8083EA8(u32, u32); @@ -80,33 +80,33 @@ extern void sub_80866C4(u32 *r0); extern void sub_803E708(u32, u32); extern void sub_8086448(void); extern void sub_8086598(void); -extern void SpriteLookAroundEffect(struct unkDungeon_8041D5C *); -extern void sub_80862BC(struct unkDungeon_8041D5C *); +extern void SpriteLookAroundEffect(struct DungeonEntity *); +extern void sub_80862BC(struct DungeonEntity *); extern void PlaySoundEffect(u32); -extern void sub_806CDD4(struct unkDungeon_8041D5C *, u32, u32); -extern void sub_80869E4(struct unkDungeon_8041D5C *, u32, u32, u32); -extern void sub_806CE68(struct unkDungeon_8041D5C *, u32); -extern void sub_804539C(struct unkDungeon_8041D5C *, u32, u32); +extern void sub_806CDD4(struct DungeonEntity *, u32, u32); +extern void sub_80869E4(struct DungeonEntity *, u32, u32, u32); +extern void sub_806CE68(struct DungeonEntity *, u32); +extern void sub_804539C(struct DungeonEntity *, u32, u32); extern void sub_803E46C(u32); -extern void sub_8042B0C(struct unkDungeon_8041D5C *); -extern void sub_8085918(struct unkDungeon_8041D5C *, u32); -extern void sub_806CE68(struct unkDungeon_8041D5C *r0, u32); +extern void sub_8042B0C(struct DungeonEntity *); +extern void sub_8085918(struct DungeonEntity *, u32); +extern void sub_806CE68(struct DungeonEntity *r0, u32); extern void sub_8052910(u32 *); extern void sub_803E708(u32, u32); -extern u8 sub_80450E0(struct unkDungeon_8041D5C *); +extern u8 sub_80450E0(struct DungeonEntity *); extern u8 HasRecruitedMon(u32); -extern u8 sub_806FD18(struct unkDungeon_8041D5C *); +extern u8 sub_806FD18(struct DungeonEntity *); extern u8 sub_8083E74(u32); extern s32 sub_8052C68(u32 *, u32 *, u32 *, u32); extern void sub_8083F14(); -extern void sub_80861D4(struct unkDungeon_8041D5C *, u32, u32); -extern void sub_806FDF4(struct unkDungeon_8041D5C *, struct unkDungeon_8041D5C *, struct unkDungeon_8041D5C **); -extern u32 sub_80861F8(u32, struct unkDungeon_8041D5C *, u32); +extern void sub_80861D4(struct DungeonEntity *, u32, u32); +extern void sub_806FDF4(struct DungeonEntity *, struct DungeonEntity *, struct DungeonEntity **); +extern u32 sub_80861F8(u32, struct DungeonEntity *, u32); extern void sub_8083ED8(u32); extern u32 sub_803F994(); extern s32 sub_803F9B0(); extern void sub_803F878(u32, s32); -extern void sub_8086A70(struct unkDungeon_8041D5C *, u32, u32); +extern void sub_8086A70(struct DungeonEntity *, u32, u32); extern void sub_8085C54(u32, u32, u32, u32, u32); extern void sub_803E9D0(void); extern void DeoxysScreenFlash(void); @@ -114,19 +114,19 @@ extern void sub_8085EB0(); extern void sub_808563C(void *); extern void sub_80858AC(u32 *, u32); -void sub_808C5AC(struct unkDungeon_8041D5C *r0); +void sub_808C5AC(struct DungeonEntity *r0); void sub_808C550(void); -void sub_808C590(struct unkDungeon_8041D5C *r0); -void sub_808C5A0(struct unkDungeon_8041D5C *r0); +void sub_808C590(struct DungeonEntity *r0); +void sub_808C5A0(struct DungeonEntity *r0); void sub_808C9B0(); -void sub_808C8E0(struct unkDungeon_8041D5C *param_1); +void sub_808C8E0(struct DungeonEntity *param_1); void sub_808C360(void); void KyogreScreenFlash(); void sub_808C0CC(); void sub_808BFA0(); void sub_808C02C(); -extern void sub_80861B8(struct unkDungeon_8041D5C *, u32, u32); +extern void sub_80861B8(struct DungeonEntity *, u32, u32); void nullsub_99(); extern u32 sub_8084100(s32); @@ -136,7 +136,7 @@ extern void sub_8049884(); extern void sub_8049B8C(); extern void sub_8049ED4(); extern void sub_8040A84(); -extern void sub_8086A54(struct unkDungeon_8041D5C *); +extern void sub_8086A54(struct DungeonEntity *); struct unk8049590 { @@ -150,16 +150,16 @@ struct unk8049590 extern struct unk8049590 *sub_8049590(u32, u32); extern void sub_806BFC0(struct subStruct_8048524 *, u32); -void sub_808BBA8(struct unkDungeon_8041D5C *param_1) +void sub_808BBA8(struct DungeonEntity *param_1) { sub_806BFC0(param_1->unk70,0); } -void sub_808BBB8(struct unkDungeon_8041D5C *param_1) +void sub_808BBB8(struct DungeonEntity *param_1) { s32 iVar1; s32 iVar2; - + sub_80861F8(0x1b,param_1,0); sub_8086A54(param_1); sub_80861B8(param_1,0xe,0); @@ -178,10 +178,10 @@ void sub_808BBB8(struct unkDungeon_8041D5C *param_1) param_1->unk70->unk174 = 0; } -void sub_808BC20(struct unkDungeon_8041D5C * param_1) +void sub_808BC20(struct DungeonEntity * param_1) { s32 uVar1; - + PlaySoundEffect(0x298); for(uVar1 = 0; uVar1 < 0x19; uVar1++){ sub_8085918(param_1,uVar1 & 7); @@ -192,10 +192,10 @@ void sub_808BC20(struct unkDungeon_8041D5C * param_1) sub_80861F8(99,param_1,1); } -void JirachiWishGrantDialogue(struct unkDungeon_8041D5C *param_1) +void JirachiWishGrantDialogue(struct DungeonEntity *param_1) { u32 uVar2; - + param_1->unk70->unk15D = 1; // Nnnnnnnnnn! sub_8052910(&gUnknown_81058A8); @@ -277,8 +277,8 @@ u8 JirachiFriendAreaSearch(void) void sub_808BDEC(void) { - struct unkDungeon_8041D5C * iVar2; - struct unkDungeon_8041D5C * uVar3; + struct DungeonEntity * iVar2; + struct DungeonEntity * uVar3; iVar2 = sub_8085480(); uVar3 = sub_8085680(0x1b); @@ -308,8 +308,8 @@ void sub_808BE70(u8 param_1,u8 param_2) void LugiaPreFightDialogue(void) { - struct unkDungeon_8041D5C * iVar2; - struct unkDungeon_8041D5C * uVar3; + struct DungeonEntity * iVar2; + struct DungeonEntity * uVar3; iVar2 = sub_8085480(); uVar3 = sub_8085680(0x1b); @@ -343,7 +343,7 @@ void LugiaPreFightDialogue(void) sub_808BFA0(); sub_8086A70(uVar3,800,0x20); sub_8083E88(0x23); - sub_80858AC(&iVar2->unkC,0x10); + sub_80858AC(&iVar2->posPixelX,0x10); } } @@ -414,8 +414,8 @@ void sub_808C0CC(void) void sub_808C10C(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; u32 uVar3; s32 iVar2; @@ -451,8 +451,8 @@ void sub_808C1A4(u8 param_1,u8 param_2) void KyogrePreFightDialogue(void) { - struct unkDungeon_8041D5C *iVar2; - struct unkDungeon_8041D5C *uVar3; + struct DungeonEntity *iVar2; + struct DungeonEntity *uVar3; iVar2 = sub_8085480(); uVar3 = sub_8085680(0x1c); @@ -493,7 +493,7 @@ void KyogrePreFightDialogue(void) sub_803E708(10,0x46); sub_8086A70(uVar3,600,0xb); sub_8083E88(0x23); - sub_80858AC(&iVar2->unkC,0x10); + sub_80858AC(&iVar2->posPixelX,0x10); } } @@ -536,7 +536,7 @@ void sub_808C360(void) void sub_808C3A0(void) { - struct unkDungeon_8041D5C * iVar2; + struct DungeonEntity * iVar2; iVar2 = sub_8085480(); sub_8083F14(); @@ -564,8 +564,8 @@ void sub_808C414(u8 param_1,u8 param_2) void DeoxysPreFightDialogue(void) { - struct unkDungeon_8041D5C * iVar2; - + struct DungeonEntity * iVar2; + iVar2 = sub_8085480(); sub_8086448(); if (HasRecruitedMon(SPECIES_DEOXYS_NORMAL)) { @@ -584,14 +584,14 @@ void DeoxysPreFightDialogue(void) sub_8052910(&gUnknown_8106390); sub_803E708(10,0x46); sub_808563C(sub_808C5AC); - sub_80858AC(&iVar2->unkC,0x10); + sub_80858AC(&iVar2->posPixelX,0x10); } } void DeoxysScreenFlash(void) { s32 iVar1; - + PlaySoundEffect(0x2c1); for(iVar1 = 250; iVar1 > 149; iVar1 -= 10){ sub_8085C54(iVar1,0,0,1,1); @@ -621,25 +621,25 @@ void sub_808C550(void) DeoxysScreenFlash(); } -void sub_808C590(struct unkDungeon_8041D5C *r0) +void sub_808C590(struct DungeonEntity *r0) { sub_8068FE0(r0, 0x21C, 0); } -void sub_808C5A0(struct unkDungeon_8041D5C *r0) +void sub_808C5A0(struct DungeonEntity *r0) { sub_8085918(r0, 0); } -void sub_808C5AC(struct unkDungeon_8041D5C *r0) +void sub_808C5AC(struct DungeonEntity *r0) { sub_8086A70(r0, 0x3b6, 0x20); } void sub_808C5C0(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; u32 uVar3; s32 iVar2; @@ -665,14 +665,14 @@ void nullsub_100(void) #ifdef NONMATCHING void CelebiJoinDialogue(void) { - struct unkDungeon_8041D5C *uVar2; + struct DungeonEntity *uVar2; s32 state; s32 menuChoice; - struct unkDungeon_8041D5C *local_1c; + struct DungeonEntity *local_1c; uVar2 = sub_8085480(); local_1c = sub_8085680(0x1e); - if ((HasRecruitedMon(SPECIES_CELEBI)) || (sub_806FD18(local_1c) == '\0')) + if ((HasRecruitedMon(SPECIES_CELEBI)) || (sub_806FD18(local_1c) == '\0')) { sub_8068FE0(local_1c,0x21c,0); SpriteLookAroundEffect(uVar2); @@ -680,7 +680,7 @@ void CelebiJoinDialogue(void) // ......... sub_8052910(&gUnknown_810663C); } - else + else { SpriteLookAroundEffect(uVar2); sub_803E708(10,0x46); @@ -715,7 +715,7 @@ void CelebiJoinDialogue(void) &gPurityForestAllowCelebiToJoinPrompt,0x701); } while (menuChoice < 1); sub_803E708(10,0x46); - if (menuChoice == 1) + if (menuChoice == 1) { sub_8083F14(); PlaySoundEffect(0xcc); @@ -1069,7 +1069,7 @@ void CelebiJoinDialogue(void) } #endif -void sub_808C8E0(struct unkDungeon_8041D5C *param_1) +void sub_808C8E0(struct DungeonEntity *param_1) { s32 iVar1; @@ -1091,11 +1091,11 @@ void sub_808C938(void) sub_80855E4(sub_808C9B0); } -void sub_808C948(struct unkDungeon_8041D5C *param_1, u8 param_2) +void sub_808C948(struct DungeonEntity *param_1, u8 param_2) { bool8 flag; s32 iVar3; - struct unkDungeon_8041D5C *iVar2; + struct DungeonEntity *iVar2; if (param_2 == 0x37) { flag = FALSE; @@ -1120,7 +1120,7 @@ void sub_808C998(void) sub_803E708(0xA, 0x46); } -void sub_808C9B0(struct unkDungeon_8041D5C *param_1) +void sub_808C9B0(struct DungeonEntity *param_1) { param_1->unk70->unk46 = 4; sub_806CE68(param_1, 4); @@ -1128,8 +1128,8 @@ void sub_808C9B0(struct unkDungeon_8041D5C *param_1) void sub_808C9C4(void) { - struct unkDungeon_8041D5C *temp; - struct unkDungeon_8041D5C *temp_2; + struct DungeonEntity *temp; + struct DungeonEntity *temp_2; temp = sub_8085480(); temp_2 = sub_8085680(7); @@ -1145,7 +1145,7 @@ void sub_808C9C4(void) // Medicham Rescue Dialogue? void MedichamRescueDialogue(void) { - struct unkDungeon_8041D5C *temp; + struct DungeonEntity *temp; s32 counter; temp = sub_8085680(7); @@ -1197,8 +1197,8 @@ void MedichamRescueDialogue(void) void sub_808CB5C(void) { - struct unkDungeon_8041D5C *temp; - struct unkDungeon_8041D5C *temp_2; + struct DungeonEntity *temp; + struct DungeonEntity *temp_2; temp = sub_8085480(); temp_2 = sub_8085680(7); @@ -1216,8 +1216,8 @@ void DummyFightDialogue(void) void sub_808CBB0(void) { - struct unkDungeon_8041D5C *temp; - struct unkDungeon_8041D5C *temp_2; + struct DungeonEntity *temp; + struct DungeonEntity *temp_2; temp = sub_8085480(); temp_2 = sub_8085680(0x1F); @@ -1233,7 +1233,7 @@ void sub_808CBB0(void) // Smeargle Rescue dialogue scene void SmeargleRescueDialogue(void) { - struct unkDungeon_8041D5C *temp; + struct DungeonEntity *temp; s32 counter; temp = sub_8085680(0x1F); @@ -1288,8 +1288,8 @@ void SmeargleRescueDialogue(void) void sub_808CD44(void) { - struct unkDungeon_8041D5C *temp; - struct unkDungeon_8041D5C *temp_2; + struct DungeonEntity *temp; + struct DungeonEntity *temp_2; temp = sub_8085480(); temp_2 = sub_8085680(0x1F); diff --git a/src/code_8057824.c b/src/code_8057824.c index 248709f..c80aa55 100644 --- a/src/code_8057824.c +++ b/src/code_8057824.c @@ -1,6 +1,6 @@ #include "global.h" #include "gUnknown_203B418.h" -#include "code_8041D5C.h" +#include "dungeon_entity.h" extern struct unkStruct_203B418 *gUnknown_203B418; @@ -13,19 +13,19 @@ extern u32 gUnknown_8106A4C; extern s16 gUnknown_80F4DB6; extern u32 gUnknown_80FAC88; -extern void sub_80775DC(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32, u32); -extern void sub_80772C0(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32, u32, u32); +extern void sub_80775DC(struct DungeonEntity *r0, struct DungeonEntity *r1, u32, u32); +extern void sub_80772C0(struct DungeonEntity *r0, struct DungeonEntity *r1, u32, u32, u32); extern u8 sub_807EAA0(u32, u32); -extern void sub_80522F4(struct unkDungeon_8041D5C *r1, struct unkDungeon_8041D5C *r2, u32); -extern void sub_8079F20(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32, u32); +extern void sub_80522F4(struct DungeonEntity *r1, struct DungeonEntity *r2, u32); +extern void sub_8079F20(struct DungeonEntity *r0, struct DungeonEntity *r1, u32, u32); -extern u8 sub_805727C(struct unkDungeon_8041D5C *, struct unkDungeon_8041D5C *, s16); -extern u32 sub_8055640(struct unkDungeon_8041D5C *, struct unkDungeon_8041D5C *, u32, u32, u32); -extern void sub_80779F0(struct unkDungeon_8041D5C *, struct unkDungeon_8041D5C *, u32, u32); -extern void sub_8078968(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1); -extern void sub_8079618(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32, u32, u32); +extern u8 sub_805727C(struct DungeonEntity *, struct DungeonEntity *, s16); +extern u32 sub_8055640(struct DungeonEntity *, struct DungeonEntity *, u32, u32, u32); +extern void sub_80779F0(struct DungeonEntity *, struct DungeonEntity *, u32, u32); +extern void sub_8078968(struct DungeonEntity *r0, struct DungeonEntity *r1); +extern void sub_8079618(struct DungeonEntity *r0, struct DungeonEntity *r1, u32, u32, u32); -extern void sub_806F370(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32, u32, u8 *, u8, s32, u32, u32, u32); +extern void sub_806F370(struct DungeonEntity *r0, struct DungeonEntity *r1, u32, u32, u8 *, u8, s32, u32, u32, u32); @@ -33,21 +33,21 @@ extern u32 gUnknown_80FD018; extern s16 sub_8057600(void*, u32); extern u32 sub_8092B00(void*); -bool32 sub_8057824(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2) +bool32 sub_8057824(struct DungeonEntity *param_1, struct DungeonEntity *param_2) { // Lower evasion? sub_80775DC(param_1,param_2,gUnknown_8106A50,1); return TRUE; } -bool32 sub_805783C(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2) +bool32 sub_805783C(struct DungeonEntity *param_1, struct DungeonEntity *param_2) { // Lower attack? sub_80772C0(param_1,param_2,gUnknown_8106A4C,0x80,1); return TRUE; } -bool32 sub_805785C(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2) +bool32 sub_805785C(struct DungeonEntity *param_1, struct DungeonEntity *param_2) { gUnknown_203B418->unkE26B = gUnknown_80F4F42; if (sub_807EAA0(1,0) == '\0') { @@ -57,7 +57,7 @@ bool32 sub_805785C(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C return TRUE; } -bool32 sub_80578A4(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2) +bool32 sub_80578A4(struct DungeonEntity *param_1, struct DungeonEntity *param_2) { gUnknown_203B418->unkE26C = gUnknown_80F4F42; if (sub_807EAA0(1,0) == '\0') { @@ -67,13 +67,13 @@ bool32 sub_80578A4(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C return TRUE; } -bool32 sub_80578EC(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) +bool32 sub_80578EC(struct DungeonEntity *r0, struct DungeonEntity *r1) { sub_8079F20(r0, r1, 1, 0); return TRUE; } -bool32 sub_80578FC(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2, u32 param_3, u32 param_4) +bool32 sub_80578FC(struct DungeonEntity *param_1, struct DungeonEntity *param_2, u32 param_3, u32 param_4) { bool32 uVar3; @@ -87,20 +87,20 @@ bool32 sub_80578FC(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C return uVar3; } -bool32 sub_8057948(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2) +bool32 sub_8057948(struct DungeonEntity *param_1, struct DungeonEntity *param_2) { sub_8078968(param_1, param_2); return TRUE; } -bool32 sub_8057954(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2, u32 param_3) +bool32 sub_8057954(struct DungeonEntity *param_1, struct DungeonEntity *param_2, u32 param_3) { // $m0 is enraged sub_8079618(param_1,param_2,0xc,param_3,gUnknown_80FAC88); return TRUE; } -bool32 sub_8057974(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2, void* param_3, u32 param_4) +bool32 sub_8057974(struct DungeonEntity *param_1, struct DungeonEntity *param_2, void* param_3, u32 param_4) { s32 newHP; u8 local_24; diff --git a/src/code_8057824_1.c b/src/code_8057824_1.c index 7b98ab4..5f38346 100644 --- a/src/code_8057824_1.c +++ b/src/code_8057824_1.c @@ -1,6 +1,6 @@ #include "global.h" #include "gUnknown_203B418.h" -#include "code_8041D5C.h" +#include "dungeon_entity.h" #include "pokemon.h" #include "item.h" @@ -8,7 +8,7 @@ extern struct unkStruct_203B418 *gUnknown_203B418; extern u32 gUnknown_202EDC8; extern u8 gUnknown_202E038[0x50]; -extern u8 gAvailablePokemonNames[0x58]; +extern u8 gAvailablePokemonNames[0x58]; extern s16 gUnknown_80F57CA; extern s16 gUnknown_80F57D2; @@ -218,47 +218,47 @@ extern u32 gUnknown_81019E4; extern u32 gUnknown_8101A04; extern u32 gUnknown_8101A38; -extern struct unkDungeon_8041D5C *sub_8085480(void); -extern struct unkDungeon_8041D5C *sub_8085680(u32); -extern void sub_808BBA8(struct unkDungeon_8041D5C * ); +extern struct DungeonEntity *sub_8085480(void); +extern struct DungeonEntity *sub_8085680(u32); +extern void sub_808BBA8(struct DungeonEntity * ); extern void sub_80855E4(void *); extern void sub_8041888(u32); -extern void sub_80861B8(struct unkDungeon_8041D5C *, u32, u32); +extern void sub_80861B8(struct DungeonEntity *, u32, u32); extern void sub_8083ED8(u32); extern void sub_803E708(u32, u32); extern void sub_8052910(u32 *r0); extern void sub_8083E88(u32); -extern void sub_808BC20(struct unkDungeon_8041D5C *); +extern void sub_808BC20(struct DungeonEntity *); -extern void sub_80862BC(struct unkDungeon_8041D5C *); +extern void sub_80862BC(struct DungeonEntity *); extern void sub_8086448(); extern void SpriteLookAroundEffect(); -extern u32 sub_80861F8(u32, struct unkDungeon_8041D5C *, u32); -extern void sub_8086A70(struct unkDungeon_8041D5C *, u32, u32); +extern u32 sub_80861F8(u32, struct DungeonEntity *, u32); +extern void sub_8086A70(struct DungeonEntity *, u32, u32); extern void sub_80858AC(u32 *, u32); extern void sub_8097FA8(u32); extern void JirachiWish(); extern u8 sub_80860A8(u32); extern void sub_8040A84(); -extern void sub_8086A3C(struct unkDungeon_8041D5C *); +extern void sub_8086A3C(struct DungeonEntity *); extern u8 HasRecruitedMon(u32); extern void sub_80854D4(); extern void sub_8085930(u32); -extern void sub_8068FE0(struct unkDungeon_8041D5C *, u32, u32); -extern void sub_8085918(struct unkDungeon_8041D5C *, u32); +extern void sub_8068FE0(struct DungeonEntity *, u32, u32); +extern void sub_8085918(struct DungeonEntity *, u32); extern void sub_8049ED4(); extern void sub_8085860(s32 r0, u32 r1); -extern void sub_806CE68(struct unkDungeon_8041D5C *, u32); +extern void sub_806CE68(struct DungeonEntity *, u32); -extern void sub_8052D44(u8 *, struct unkDungeon_8041D5C *, struct unkDungeon_8041D5C *); +extern void sub_8052D44(u8 *, struct DungeonEntity *, struct DungeonEntity *); extern void sub_8097FD0(u32); -extern void sub_8045B94(u8 *, struct unkDungeon_8041D5C *, u32); -extern struct unkDungeon_8041D5C *sub_8083600(); -extern void sub_80421C0(struct unkDungeon_8041D5C *, u32); +extern void sub_8045B94(u8 *, struct DungeonEntity *, u32); +extern struct DungeonEntity *sub_8083600(); +extern void sub_80421C0(struct DungeonEntity *, u32); extern void sub_8046D20(); extern void sub_808B1CC(u8); -extern void sub_80464C8(struct unkDungeon_8041D5C *, u32, struct ItemSlot *); +extern void sub_80464C8(struct DungeonEntity *, u32, struct ItemSlot *); extern void sub_8098044(u32); extern void PlaySoundEffect(u32); extern void sub_8085C54(u32, u32, u32, u32, u32); @@ -281,27 +281,27 @@ extern void sub_807EAA0(u32, u32); extern void sub_808563C(void *); extern void sub_808BCE4(void); -extern void sub_808BBB8(struct unkDungeon_8041D5C *param_1); +extern void sub_808BBB8(struct DungeonEntity *param_1); extern u8 sub_8098100(u32); extern void sub_8086794(); void EnteiScreenFlash(void); void RaikouScreenFlash(void); -void sub_808A528(struct unkDungeon_8041D5C * param_1); +void sub_808A528(struct DungeonEntity * param_1); void SuicuneScreenFlash(); -void sub_808A904(struct unkDungeon_8041D5C * param_1); +void sub_808A904(struct DungeonEntity * param_1); void HoOhScreenFlash(void); void LatiosScreenFlash(void); -void sub_808B2B0(struct unkDungeon_8041D5C *r0); -void sub_808B2C4(struct unkDungeon_8041D5C *r0); -void sub_808B2D4(struct unkDungeon_8041D5C *r0); -void sub_808B2E4(struct unkDungeon_8041D5C *r0); +void sub_808B2B0(struct DungeonEntity *r0); +void sub_808B2C4(struct DungeonEntity *r0); +void sub_808B2D4(struct DungeonEntity *r0); +void sub_808B2E4(struct DungeonEntity *r0); void sub_808B50C(void); -void sub_8089B64(struct unkDungeon_8041D5C *param_1); +void sub_8089B64(struct DungeonEntity *param_1); void MewtwoScreenFlash(void); -void sub_80898F8(struct unkDungeon_8041D5C *r0); -void sub_8089908(struct unkDungeon_8041D5C *r0); -void sub_8089620(struct unkDungeon_8041D5C *param_1); +void sub_80898F8(struct DungeonEntity *r0); +void sub_8089908(struct DungeonEntity *r0); +void sub_8089620(struct DungeonEntity *param_1); void RayquazaScreenFlash(void); void sub_80891F0(void); void sub_8089294(void); @@ -312,36 +312,36 @@ void sub_808919C(); void sub_8088D30(void); extern void sub_8083F14(); -extern u8 sub_80450E0(struct unkDungeon_8041D5C *); +extern u8 sub_80450E0(struct DungeonEntity *); extern u8 sub_8086AE4(u32); -extern void sub_8072008(struct unkDungeon_8041D5C *, struct unkDungeon_8041D5C *, s16, u32, u32); -extern struct unkDungeon_8041D5C *sub_808548C(); -extern void sub_80856E0(struct unkDungeon_8041D5C *, u32); -extern void sub_80869E4(struct unkDungeon_8041D5C *, u32, u32, u32); -extern void sub_804539C(struct unkDungeon_8041D5C *, u32, u32); -extern void sub_806CDD4(struct unkDungeon_8041D5C *, u32, u32); +extern void sub_8072008(struct DungeonEntity *, struct DungeonEntity *, s16, u32, u32); +extern struct DungeonEntity *sub_808548C(); +extern void sub_80856E0(struct DungeonEntity *, u32); +extern void sub_80869E4(struct DungeonEntity *, u32, u32, u32); +extern void sub_804539C(struct DungeonEntity *, u32, u32); +extern void sub_806CDD4(struct DungeonEntity *, u32, u32); extern void sub_8085374(); extern void sub_8086848(u32 ,u32); -extern void sub_80856C8(struct unkDungeon_8041D5C *, s32, s32); -extern void sub_80861D4(struct unkDungeon_8041D5C *, u32, u32); +extern void sub_80856C8(struct DungeonEntity *, s32, s32); +extern void sub_80861D4(struct DungeonEntity *, u32, u32); extern void sub_8086738(); -extern void sub_8086A54(struct unkDungeon_8041D5C *); +extern void sub_8086A54(struct DungeonEntity *); extern void sub_8086764(); extern u32 sub_803F994(); extern s32 sub_803F9B0(); extern void sub_803F878(u32,s32); -void sub_8088C08(struct unkDungeon_8041D5C * param_1); +void sub_8088C08(struct DungeonEntity * param_1); void sub_8088CA0(void); void ArticunoScreenFlash(void); -void sub_8088484(struct unkDungeon_8041D5C *param_1); +void sub_8088484(struct DungeonEntity *param_1); void sub_8088574(void); -void sub_8087D30(struct unkDungeon_8041D5C * param_1); +void sub_8087D30(struct DungeonEntity * param_1); void sub_8087D80(s32 r0, s32 r1); void sub_8087DE8(s32 r0, s32 r1); void sub_8087EB0(void); @@ -355,7 +355,7 @@ extern void sub_8086500(void); extern void sub_8086690(void); void sub_8087F24(void); extern void sub_808663C(void); -void sub_8087704(struct unkDungeon_8041D5C *param_1); +void sub_8087704(struct DungeonEntity *param_1); void sub_808775C(int param_1); extern u32 gUnknown_81017E4; @@ -367,9 +367,9 @@ extern u32 gUnknown_8101918; void ZapdosReFightDialogue(void) { - struct unkDungeon_8041D5C *iVar1; - struct unkDungeon_8041D5C *uVar2; - + struct DungeonEntity *iVar1; + struct DungeonEntity *uVar2; + iVar1 = sub_8085480(); uVar2 = sub_8085680(8); sub_8086448(); @@ -387,14 +387,14 @@ void ZapdosReFightDialogue(void) sub_808775C(2); sub_8052910(&gUnknown_8101918); sub_8086A70(uVar2,300,0xb); - sub_80858AC(&iVar1->unkC,0x10); + sub_80858AC(&iVar1->posPixelX,0x10); } void ZapdosPostStoryPreFightDialogue(void) { - struct unkDungeon_8041D5C * iVar2; - struct unkDungeon_8041D5C * uVar3; - + struct DungeonEntity * iVar2; + struct DungeonEntity * uVar3; + iVar2 = sub_8085480(); uVar3 = sub_8085680(8); sub_8086448(); @@ -415,15 +415,15 @@ void ZapdosPostStoryPreFightDialogue(void) sub_8052910(&gUnknown_8101A04); sub_803E708(10,0x46); sub_8086A70(uVar3,300,0xb); - sub_80858AC(&iVar2->unkC,0x10); + sub_80858AC(&iVar2->posPixelX,0x10); } } -void sub_8087704(struct unkDungeon_8041D5C *param_1) +void sub_8087704(struct DungeonEntity *param_1) { int iVar1; - + param_1->unk70->unk15C = 1; param_1->unk70->unk15E = 0; param_1->unk70->unk174 = 200; @@ -440,7 +440,7 @@ void sub_808775C(int param_1) { int iVar1; int iVar2; - + PlaySoundEffect(0x1f6); if (2 < param_1) { for(iVar2 = 250; iVar2 > 199; iVar2 -= 10) @@ -472,9 +472,9 @@ void sub_808775C(int param_1) void sub_80877E8(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; - + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; + iVar1 = sub_8085480(); uVar2 = sub_8085680(9); sub_8083E88(0x26); @@ -490,12 +490,12 @@ void sub_80877E8(void) void sub_8087848(void) { - struct unkDungeon_8041D5C *iVar2; - struct unkDungeon_8041D5C *uVar3; + struct DungeonEntity *iVar2; + struct DungeonEntity *uVar3; u32 uVar4; s32 iVar3; - + iVar2 = sub_8085480(); uVar3 = sub_8085680(9); sub_8083E88(0x26); @@ -529,10 +529,10 @@ void sub_80878F4(char param_1, s32 param_2) void MoltresPreFightDialogue(void) { - struct unkDungeon_8041D5C *iVar1; - struct unkDungeon_8041D5C *uVar2; - struct unkDungeon_8041D5C *uVar3; - + struct DungeonEntity *iVar1; + struct DungeonEntity *uVar2; + struct DungeonEntity *uVar3; + iVar1 = sub_8085480(); uVar2 = sub_808548C(); uVar3 = sub_8085680(9); @@ -593,16 +593,16 @@ void MoltresPreFightDialogue(void) sub_8052910(&gUnknown_8102108); sub_803E708(10,0x46); sub_8086A70(uVar3,400,0xb); - sub_80858AC(&iVar1->unkC,0x10); + sub_80858AC(&iVar1->posPixelX,0x10); } void MoltresReFightDialogue(void) { - struct unkDungeon_8041D5C *iVar1; - struct unkDungeon_8041D5C *uVar2; - struct unkDungeon_8041D5C *uVar3; - + struct DungeonEntity *iVar1; + struct DungeonEntity *uVar2; + struct DungeonEntity *uVar3; + iVar1 = sub_8085480(); uVar2 = sub_808548C(); uVar3 = sub_8085680(9); @@ -636,14 +636,14 @@ void MoltresReFightDialogue(void) sub_8052910(&gUnknown_81022F8); sub_803E708(10,0x46); sub_8086A70(uVar3,400,0xb); - sub_80858AC(&iVar1->unkC,0x10); + sub_80858AC(&iVar1->posPixelX,0x10); } void MoltresPostStoryPreFightDialogue(void) { - struct unkDungeon_8041D5C * iVar2; - struct unkDungeon_8041D5C * uVar3; - + struct DungeonEntity * iVar2; + struct DungeonEntity * uVar3; + iVar2 = sub_8085480(); uVar3 = sub_8085680(9); sub_8087D80(0xc,5); @@ -674,14 +674,14 @@ void MoltresPostStoryPreFightDialogue(void) sub_8052910(&gUnknown_8102454); sub_803E708(10,0x46); sub_8086A70(uVar3,400,0xb); - sub_80858AC(&iVar2->unkC,0x10); + sub_80858AC(&iVar2->posPixelX,0x10); } } -void sub_8087D30(struct unkDungeon_8041D5C * param_1) +void sub_8087D30(struct DungeonEntity * param_1) { s32 iVar1; - + param_1->unk70->unk15C = 1; param_1->unk70->unk15E = 0; param_1->unk70->unk174 = 0xc800; @@ -851,7 +851,7 @@ void sub_8087DE8(s32 r0, s32 r1) void sub_8087EB0(void) { int iVar1; - + PlaySoundEffect(0x1ed); iVar1 = 0xfa; for(iVar1 = 250; iVar1 > 9; iVar1 -= 10) @@ -873,7 +873,7 @@ void sub_8087EB0(void) void sub_8087F24(void) { s32 iVar1; - + for(iVar1 = 0; iVar1 >= -80; iVar1 -= 8) { sub_8085C54(iVar1,iVar1,iVar1,0,0); @@ -884,9 +884,9 @@ void sub_8087F24(void) void sub_8087F54(void) { - struct unkDungeon_8041D5C *iVar2; - struct unkDungeon_8041D5C *uVar3; - + struct DungeonEntity *iVar2; + struct DungeonEntity *uVar3; + iVar2 = sub_8085480(); uVar3 = sub_8085680(0xd); sub_8083E88(0x72); @@ -902,8 +902,8 @@ void sub_8087F54(void) void sub_8087FB4(void) { - struct unkDungeon_8041D5C *iVar2; - + struct DungeonEntity *iVar2; + iVar2 = sub_8085680(0xd); sub_8083E88(0x72); sub_8085374(); @@ -916,9 +916,9 @@ void sub_8087FB4(void) void sub_8087FF8(void) { - struct unkDungeon_8041D5C *iVar2; - struct unkDungeon_8041D5C *uVar3; - + struct DungeonEntity *iVar2; + struct DungeonEntity *uVar3; + iVar2 = sub_8085480(); uVar3 = sub_8085680(0xd); sub_8085374(); @@ -949,10 +949,10 @@ void sub_8088088(char param_1, s32 param_2) void ArticunoPreFightDialogue(void) { - struct unkDungeon_8041D5C *iVar1; - struct unkDungeon_8041D5C *uVar2; - struct unkDungeon_8041D5C *uVar3; - + struct DungeonEntity *iVar1; + struct DungeonEntity *uVar2; + struct DungeonEntity *uVar3; + iVar1 = sub_8085480(); uVar2 = sub_808548C(); uVar3 = sub_8085680(0xd); @@ -1022,14 +1022,14 @@ void ArticunoPreFightDialogue(void) sub_806CDD4(uVar3,0xf,0); sub_803E708(0x10,0x46); sub_8086A70(uVar3,0x1c2,0xb); - sub_80858AC(&iVar1->unkC,0x10); + sub_80858AC(&iVar1->posPixelX,0x10); } void ArticunoReFightDialogue(void) { - struct unkDungeon_8041D5C *iVar1; - struct unkDungeon_8041D5C *uVar2; - + struct DungeonEntity *iVar1; + struct DungeonEntity *uVar2; + iVar1 = sub_8085480(); uVar2 = sub_8085680(0xd); gUnknown_203B418->unkE265 = 7; @@ -1044,14 +1044,14 @@ void ArticunoReFightDialogue(void) sub_806CDD4(uVar2,0xf,0); sub_803E708(0x28,0x46); sub_8086A70(uVar2,0x1c2,0xb); - sub_80858AC(&iVar1->unkC,0x10); + sub_80858AC(&iVar1->posPixelX,0x10); } void ArticunoPostStoryPreFightDialogue(void) { - struct unkDungeon_8041D5C *iVar2; - struct unkDungeon_8041D5C *uVar3; - + struct DungeonEntity *iVar2; + struct DungeonEntity *uVar3; + iVar2 = sub_8085480(); uVar3 = sub_8085680(0xd); sub_8086448(); @@ -1080,14 +1080,14 @@ void ArticunoPostStoryPreFightDialogue(void) sub_806CDD4(uVar3,0xf,0); sub_803E708(0x28,0x46); sub_8086A70(uVar3,0x1c2,0xb); - sub_80858AC(&iVar2->unkC,0x10); + sub_80858AC(&iVar2->posPixelX,0x10); } } -void sub_8088484(struct unkDungeon_8041D5C *param_1) +void sub_8088484(struct DungeonEntity *param_1) { int iVar1; - + param_1->unk70->unk15C = 1; param_1->unk70->unk15E = 0; PlaySoundEffect(0x1ea); @@ -1102,7 +1102,7 @@ void sub_8088484(struct unkDungeon_8041D5C *param_1) void ArticunoScreenFlash(void) { int iVar1; - + PlaySoundEffect(0x2ad); for(iVar1 = 250; iVar1 > 0x95; iVar1 -= 10) { @@ -1128,7 +1128,7 @@ void ArticunoScreenFlash(void) void sub_8088574(void) { int iVar1; - + for(iVar1 = 0; iVar1 <= 80; iVar1 += 8) { sub_8085C54(iVar1,iVar1,iVar1,0,0); @@ -1146,8 +1146,8 @@ void sub_80885A0(void) void sub_80885C4(void) { - struct unkDungeon_8041D5C * iVar1; - + struct DungeonEntity * iVar1; + iVar1 = sub_8085480(); sub_8083ED8(0x3c); sub_803E708(0x3c,0x46); @@ -1174,10 +1174,10 @@ void sub_8088618(void) void sub_808862C(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; - struct unkDungeon_8041D5C * uVar3; - + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; + struct DungeonEntity * uVar3; + iVar1 = sub_8085480(); uVar2 = sub_8085680(10); uVar3 = sub_8085680(0xe); @@ -1198,13 +1198,13 @@ void sub_808862C(void) void sub_80886C4(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; - struct unkDungeon_8041D5C * uVar3; + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; + struct DungeonEntity * uVar3; u32 uVar4; s32 iVar2; - + iVar1 = sub_8085480(); uVar2 = sub_8085680(10); uVar3 = sub_8085680(0xe); @@ -1226,9 +1226,9 @@ void sub_80886C4(void) void sub_808875C(void) { - struct unkDungeon_8041D5C * iVar2; - struct unkDungeon_8041D5C * uVar3; - struct unkDungeon_8041D5C * uVar4; + struct DungeonEntity * iVar2; + struct DungeonEntity * uVar3; + struct DungeonEntity * uVar4; iVar2 = sub_8085480(); uVar3 = sub_8085680(10); @@ -1266,11 +1266,11 @@ void sub_8088848(void) void GroudonPreFightDialogue(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; - struct unkDungeon_8041D5C * uVar3; - struct unkDungeon_8041D5C * uVar4; - + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; + struct DungeonEntity * uVar3; + struct DungeonEntity * uVar4; + iVar1 = sub_8085480(); uVar2 = sub_808548C(); uVar3 = sub_8085680(10); @@ -1343,14 +1343,14 @@ void GroudonPreFightDialogue(void) sub_8085930(4); sub_8086764(); sub_8086A70(uVar4,500,0xb); - sub_80858AC(&iVar1->unkC,0x10); + sub_80858AC(&iVar1->posPixelX,0x10); } void GroudonReFightDialogue(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; - + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; + iVar1 = sub_8085480(); uVar2 = sub_8085680(0xe); sub_8086838(1,1,1); @@ -1375,14 +1375,14 @@ void GroudonReFightDialogue(void) sub_8085930(4); sub_8086764(); sub_8086A70(uVar2,500,0xb); - sub_80858AC(&iVar1->unkC,0x10); + sub_80858AC(&iVar1->posPixelX,0x10); } void GroudonPostStoryPreFightDialogue(void) { - struct unkDungeon_8041D5C * iVar2; - struct unkDungeon_8041D5C * uVar3; - + struct DungeonEntity * iVar2; + struct DungeonEntity * uVar3; + iVar2 = sub_8085480(); uVar3 = sub_8085680(0xe); sub_8086448(); @@ -1403,14 +1403,14 @@ void GroudonPostStoryPreFightDialogue(void) sub_8052910(&gUnknown_810347C); sub_803E708(10,0x46); sub_8086A70(uVar3,500,0xb); - sub_80858AC(&iVar2->unkC,0x10); + sub_80858AC(&iVar2->posPixelX,0x10); } } -void sub_8088C08(struct unkDungeon_8041D5C * param_1) +void sub_8088C08(struct DungeonEntity * param_1) { int iVar1; - + sub_8086848(0x18,0x10); sub_806CDD4(param_1,0,0); for(iVar1 = 0; iVar1 < 0x2C; iVar1++) @@ -1436,7 +1436,7 @@ void sub_8088C08(struct unkDungeon_8041D5C * param_1) void sub_8088CA0(void) { s32 iVar1; - + for(iVar1 = 250; iVar1 > 0x95; iVar1 -= 10) { sub_8085C54(iVar1,iVar1 / 2,iVar1 / 2,1,1); @@ -1463,7 +1463,7 @@ void sub_8088CA0(void) void sub_8088D30(void) { s32 iVar1; - + for(iVar1 = 250; iVar1 > 0x95; iVar1 -= 10) { sub_8085C54(iVar1,iVar1 / 2,iVar1 / 2,1,1); @@ -1490,10 +1490,10 @@ void sub_8088D30(void) void sub_8088DC0(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; - struct unkDungeon_8041D5C * uVar3; - + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; + struct DungeonEntity * uVar3; + iVar1 = sub_8085480(); uVar2 = sub_8085680(0xb); uVar3 = sub_8085680(0xc); @@ -1514,10 +1514,10 @@ void sub_8088DC0(void) void sub_8088E5C(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; - struct unkDungeon_8041D5C * uVar3; - + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; + struct DungeonEntity * uVar3; + iVar1 = sub_8085480(); uVar2 = sub_8085680(0xb); uVar3 = sub_8085680(0xc); @@ -1541,13 +1541,13 @@ void sub_8088EE8(void) void MagmaCavernMidDialogue(void) { - struct unkDungeon_8041D5C * uVar1; - struct unkDungeon_8041D5C * uVar2; - struct unkDungeon_8041D5C * iVar3; - struct unkDungeon_8041D5C * iVar4; + struct DungeonEntity * uVar1; + struct DungeonEntity * uVar2; + struct DungeonEntity * iVar3; + struct DungeonEntity * iVar4; u8 auStack36 [4]; s32 local_20[2]; - + uVar1 = sub_8085480(); uVar2 = sub_808548C(); iVar3 = sub_8085680(0xb); @@ -1585,7 +1585,7 @@ void MagmaCavernMidDialogue(void) sub_803E708(10,0x46); // Whew! // It settled down. - // + // // Whew // It's over. sub_8052910(&gUnknown_8102BE4); @@ -1599,8 +1599,8 @@ void MagmaCavernMidDialogue(void) sub_8052910(&gUnknown_8102C30); iVar3->unk70->unk15E = 0; iVar4->unk70->unk15E =0; - local_20[0] = (iVar3->unkC + iVar4->unkC) / 2; - local_20[1] = (iVar3->unk10 + iVar4->unk10) / 2 + 0x800; + local_20[0] = (iVar3->posPixelX + iVar4->posPixelX) / 2; + local_20[1] = (iVar3->posPixelY + iVar4->posPixelY) / 2 + 0x800; sub_80858AC(local_20,0x20); sub_803E708(0x3c,0x46); sub_80891F0(); @@ -1662,29 +1662,29 @@ void MagmaCavernMidDialogue(void) void sub_8089168(void) { - struct unkDungeon_8041D5C *iVar1; - + struct DungeonEntity *iVar1; + iVar1 = sub_8085480(); sub_8086448(); sub_803E708(10,0x46); SpriteLookAroundEffect(iVar1); sub_803E708(10,0x46); - sub_80858AC(&iVar1->unkC,0x10); + sub_80858AC(&iVar1->posPixelX,0x10); } -void sub_808919C(struct unkDungeon_8041D5C *r0) +void sub_808919C(struct DungeonEntity *r0) { sub_804539C(r0, 0, 0xfffffe00); } -void sub_80891B0(struct unkDungeon_8041D5C *r0) +void sub_80891B0(struct DungeonEntity *r0) { sub_806CDD4(r0, 0, 4); r0->unk70->unk15F = 1; } -void sub_80891D0(struct unkDungeon_8041D5C *r0) +void sub_80891D0(struct DungeonEntity *r0) { sub_806CDD4(r0, 7, 4); r0->unk70->unk15F = 0; @@ -1693,7 +1693,7 @@ void sub_80891D0(struct unkDungeon_8041D5C *r0) void sub_80891F0(void) { s32 iVar1; - + sub_80855E4(sub_80891B0); for(iVar1 = 0; iVar1 < 0x30; iVar1++) { @@ -1703,14 +1703,14 @@ void sub_80891F0(void) sub_80855E4(sub_80891D0); } -void sub_8089224(struct unkDungeon_8041D5C * param_1) +void sub_8089224(struct DungeonEntity * param_1) { s32 iVar1; - - if (param_1->unk10 < 0x9001) { + + if (param_1->posPixelY < 0x9001) { return; } - iVar1 = param_1->unkC; + iVar1 = param_1->posPixelX; if(iVar1 < 0xE400) { @@ -1748,7 +1748,7 @@ void sub_8089224(struct unkDungeon_8041D5C * param_1) void sub_8089294(void) { s32 iVar1; - + sub_80855E4(sub_80891B0); for(iVar1 = 0; iVar1 <= 0x77; iVar1++) { @@ -1760,9 +1760,9 @@ void sub_8089294(void) void sub_80892C8(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; - + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; + iVar1 = sub_8085480(); uVar2 = sub_8085680(0xf); sub_8083E88(0x1a); @@ -1778,9 +1778,9 @@ void sub_80892C8(void) void sub_8089328(void) { - struct unkDungeon_8041D5C * iVar2; - struct unkDungeon_8041D5C * uVar3; - + struct DungeonEntity * iVar2; + struct DungeonEntity * uVar3; + iVar2 = sub_8085480(); uVar3 = sub_8085680(0xf); sub_8083E88(0x1a); @@ -1808,10 +1808,10 @@ void sub_80893B4(char param_1, s32 param_2) void RayquazaPreFightDialogue(void) { - struct unkDungeon_8041D5C *iVar1; - struct unkDungeon_8041D5C *uVar2; - struct unkDungeon_8041D5C *uVar3; - + struct DungeonEntity *iVar1; + struct DungeonEntity *uVar2; + struct DungeonEntity *uVar3; + iVar1 = sub_8085480(); uVar2 = sub_808548C(); uVar3 = sub_8085680(0xf); @@ -1844,14 +1844,14 @@ void RayquazaPreFightDialogue(void) RayquazaScreenFlash(); sub_8052910(&gUnknown_8103820); sub_8086A70(uVar3,600,0x20); - sub_80858AC(&iVar1->unkC,0x10); + sub_80858AC(&iVar1->posPixelX,0x10); } void RayquazaReFightDialogue(void) { - struct unkDungeon_8041D5C *iVar1; - struct unkDungeon_8041D5C *uVar2; - + struct DungeonEntity *iVar1; + struct DungeonEntity *uVar2; + iVar1 = sub_8085480(); uVar2 = sub_8085680(0xf); sub_8086448(); @@ -1868,14 +1868,14 @@ void RayquazaReFightDialogue(void) RayquazaScreenFlash(); sub_8052910(&gUnknown_81038F8); sub_8086A70(uVar2,600,0x20); - sub_80858AC(&iVar1->unkC,0x10); + sub_80858AC(&iVar1->posPixelX,0x10); } void RayquazaPostStoryPreFightDialogue(void) { - struct unkDungeon_8041D5C *iVar2; - struct unkDungeon_8041D5C *uVar3; - + struct DungeonEntity *iVar2; + struct DungeonEntity *uVar3; + iVar2 = sub_8085480(); uVar3 = sub_8085680(0xf); sub_8086448(); @@ -1894,15 +1894,15 @@ void RayquazaPostStoryPreFightDialogue(void) RayquazaScreenFlash(); sub_8052910(&gUnknown_8103B30); sub_8086A70(uVar3,600,0xb); - sub_80858AC(&iVar2->unkC,0x10); + sub_80858AC(&iVar2->posPixelX,0x10); } } -void sub_8089620(struct unkDungeon_8041D5C *param_1) +void sub_8089620(struct DungeonEntity *param_1) { s32 iVar1; s32 iVar2; - + param_1->unk70->unk15E = 0; iVar2 = 51200; iVar1 = 0x600; @@ -1923,7 +1923,7 @@ void sub_8089620(struct unkDungeon_8041D5C *param_1) void RayquazaScreenFlash(void) { s32 iVar1; - + PlaySoundEffect(0x1f6); for(iVar1 = 250; iVar1 > 149; iVar1 -= 10) { @@ -1949,8 +1949,8 @@ void RayquazaScreenFlash(void) void sub_808970C(void) { - struct unkDungeon_8041D5C *iVar1; - + struct DungeonEntity *iVar1; + iVar1 = sub_8085480(); sub_8083E88(0x7D); sub_80854D4(); @@ -1962,8 +1962,8 @@ void sub_808970C(void) void sub_808974C(void) { - struct unkDungeon_8041D5C *iVar1; - + struct DungeonEntity *iVar1; + iVar1 = sub_8085480(); sub_80854D4(); sub_8085930(4); @@ -1972,14 +1972,14 @@ void sub_808974C(void) sub_8085860(iVar1->posWorldX,iVar1->posWorldY + -3); } -void sub_8089788(struct unkDungeon_8041D5C *param_1, u8 param_2, s32 param_3) +void sub_8089788(struct DungeonEntity *param_1, u8 param_2, s32 param_3) { - struct unkDungeon_8041D5C *iVar2; + struct DungeonEntity *iVar2; s32 iVar3; u32 unk1; unk1 = 0; - + if ((((param_3 * 0x1000000) + 0xe6000000U) >> 0x18) < 2) { for(iVar3 = 0; iVar3 < 0x10; iVar3++) { @@ -1998,8 +1998,8 @@ void sub_8089788(struct unkDungeon_8041D5C *param_1, u8 param_2, s32 param_3) void sub_80897F0(void) { - struct unkDungeon_8041D5C *iVar1; - + struct DungeonEntity *iVar1; + iVar1 = sub_8085480(); sub_8086448(); sub_803E708(10,0x46); @@ -2007,7 +2007,7 @@ void sub_80897F0(void) sub_803E708(0x20,0x46); sub_808692C(); sub_8052910(&gUnknown_8103BD8); - // We don't like to brag or + // We don't like to brag or // nothing, but sub_8052910(&gUnknown_8103C00); // We get furious real easy @@ -2028,15 +2028,15 @@ void sub_80897F0(void) // Get 'em! It's frenzy time! sub_8052910(&gUnknown_8103D50); sub_803E708(10,0x46); - sub_80858AC(&iVar1->unkC,0x10); + sub_80858AC(&iVar1->posPixelX,0x10); } void sub_8089878(void) { - struct unkDungeon_8041D5C *iVar1; - + struct DungeonEntity *iVar1; + iVar1 = sub_8085480(); sub_8086448(); sub_803E708(10,0x46); @@ -2048,7 +2048,7 @@ void sub_8089878(void) sub_8052910(&gUnknown_8103DD8); sub_8052910(&gUnknown_8103E28); sub_803E708(10,0x46); - sub_80858AC(&iVar1->unkC,0x10); + sub_80858AC(&iVar1->posPixelX,0x10); } void sub_80898E4(void) @@ -2057,21 +2057,21 @@ void sub_80898E4(void) sub_80866C4(&gUnknown_8103E34); } -void sub_80898F8(struct unkDungeon_8041D5C *r0) +void sub_80898F8(struct DungeonEntity *r0) { sub_8068FE0(r0, 0x21C, 0); } -void sub_8089908(struct unkDungeon_8041D5C *r0) +void sub_8089908(struct DungeonEntity *r0) { sub_8085918(r0, 4); } void sub_8089914(void) { - struct unkDungeon_8041D5C *iVar1; - struct unkDungeon_8041D5C *uVar2; - + struct DungeonEntity *iVar1; + struct DungeonEntity *uVar2; + iVar1 = sub_8085480(); uVar2 = sub_8085680(0x11); sub_8083F14(); @@ -2087,9 +2087,9 @@ void sub_8089914(void) void sub_8089978(void) { - struct unkDungeon_8041D5C *iVar2; - struct unkDungeon_8041D5C *uVar3; - + struct DungeonEntity *iVar2; + struct DungeonEntity *uVar3; + iVar2 = sub_8085480(); uVar3 = sub_8085680(0x11); sub_8083F14(); @@ -2119,9 +2119,9 @@ void sub_8089A00(char param_1, s32 param_2) void MewtwoPreFightDialogue(void) { - struct unkDungeon_8041D5C *iVar1; - struct unkDungeon_8041D5C *uVar2; - + struct DungeonEntity *iVar1; + struct DungeonEntity *uVar2; + iVar1 = sub_8085480(); uVar2 = sub_8085680(0x11); sub_8086448(); @@ -2141,14 +2141,14 @@ void MewtwoPreFightDialogue(void) sub_8052910(&gUnknown_8104008); sub_803E708(10,0x46); sub_8086A70(uVar2,900,0x20); - sub_80858AC(&iVar1->unkC,0x10); + sub_80858AC(&iVar1->posPixelX,0x10); } void MewtwoPreFightDialogue1(void) { - struct unkDungeon_8041D5C *iVar2; - struct unkDungeon_8041D5C *uVar3; - + struct DungeonEntity *iVar2; + struct DungeonEntity *uVar3; + iVar2 = sub_8085480(); uVar3 = sub_8085680(0x11); sub_8086448(); @@ -2167,15 +2167,15 @@ void MewtwoPreFightDialogue1(void) MewtwoScreenFlash(); sub_8052910(&gUnknown_8104114); sub_8086A70(uVar3,900,0x20); - sub_80858AC(&iVar2->unkC,0x10); + sub_80858AC(&iVar2->posPixelX,0x10); } } -void sub_8089B64(struct unkDungeon_8041D5C *param_1) +void sub_8089B64(struct DungeonEntity *param_1) { s32 iVar1; s32 iVar2; - + param_1->unk70->unk15E = 0; iVar2 = 51200; iVar1 = 0x400; @@ -2196,7 +2196,7 @@ void sub_8089B64(struct unkDungeon_8041D5C *param_1) void MewtwoScreenFlash(void) { int iVar1; - + PlaySoundEffect(0x1f6); for(iVar1 = 250; iVar1 > 149; iVar1 -= 10) { @@ -2205,7 +2205,7 @@ void MewtwoScreenFlash(void) } sub_803E708(10,0x46); for(iVar1 = 250; iVar1 > 199; iVar1 -= 10) - { + { sub_8085C54(iVar1,iVar1,0,1,1); sub_803E46C(0x46); } @@ -2221,9 +2221,9 @@ void MewtwoScreenFlash(void) void sub_8089C44(void) { - struct unkDungeon_8041D5C * iVar2; - struct unkDungeon_8041D5C * uVar3; - + struct DungeonEntity * iVar2; + struct DungeonEntity * uVar3; + iVar2 = sub_8085480(); uVar3 = sub_8085680(0x12); sub_8083E88(0x72); @@ -2237,9 +2237,9 @@ void sub_8089C44(void) void sub_8089C90(void) { - struct unkDungeon_8041D5C * iVar2; - struct unkDungeon_8041D5C * uVar3; - + struct DungeonEntity * iVar2; + struct DungeonEntity * uVar3; + iVar2 = sub_8085480(); uVar3 = sub_8085680(0x12); sub_8083E88(0x72); @@ -2267,9 +2267,9 @@ void sub_8089CFC(char param_1,int param_2) void EnteiPreFightDialogue(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; - + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; + iVar1 = sub_8085480(); uVar2 = sub_8085680(0x12); EnteiScreenFlash(); @@ -2280,14 +2280,14 @@ void EnteiPreFightDialogue(void) sub_8052910(&gUnknown_81041F8); sub_803E708(10,70); sub_8086A70(uVar2,600,0xb); - sub_80858AC(&iVar1->unkC,0x10); + sub_80858AC(&iVar1->posPixelX,0x10); } void EnteiPreFightDialogue1(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; - + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; + iVar1 = sub_8085480(); uVar2 = sub_8085680(0x12); EnteiScreenFlash(); @@ -2298,14 +2298,14 @@ void EnteiPreFightDialogue1(void) sub_8052910(&gUnknown_81042B8); sub_803E708(10,70); sub_8086A70(uVar2,600,0xb); - sub_80858AC(&iVar1->unkC,0x10); + sub_80858AC(&iVar1->posPixelX,0x10); } void EnteiPreFightDialogue2(void) { - struct unkDungeon_8041D5C * iVar2; - struct unkDungeon_8041D5C * uVar3; - + struct DungeonEntity * iVar2; + struct DungeonEntity * uVar3; + iVar2 = sub_8085480(); uVar3 = sub_8085680(0x12); if (HasRecruitedMon(SPECIES_ENTEI)) { @@ -2320,14 +2320,14 @@ void EnteiPreFightDialogue2(void) sub_8052910(&gUnknown_81043C0); sub_803E708(10,70); sub_8086A70(uVar3,600,0xb); - sub_80858AC(&iVar2->unkC,0x10); + sub_80858AC(&iVar2->posPixelX,0x10); } } void EnteiScreenFlash(void) { s32 iVar1; - + PlaySoundEffect(0x1ed); for(iVar1 = 250; iVar1 > 149; iVar1 -= 10) { @@ -2352,9 +2352,9 @@ void EnteiScreenFlash(void) void sub_8089EFC(void) { - struct unkDungeon_8041D5C * iVar2; - struct unkDungeon_8041D5C * uVar3; - + struct DungeonEntity * iVar2; + struct DungeonEntity * uVar3; + iVar2 = sub_8085480(); uVar3 = sub_8085680(0x13); sub_8083E88(0x72); @@ -2368,9 +2368,9 @@ void sub_8089EFC(void) void sub_8089F44(void) { - struct unkDungeon_8041D5C * iVar2; - struct unkDungeon_8041D5C * uVar3; - + struct DungeonEntity * iVar2; + struct DungeonEntity * uVar3; + iVar2 = sub_8085480(); uVar3 = sub_8085680(0x13); sub_8083E88(0x72); @@ -2384,9 +2384,9 @@ void sub_8089F44(void) void sub_8089F8C(void) { - struct unkDungeon_8041D5C * iVar2; - struct unkDungeon_8041D5C * uVar3; - + struct DungeonEntity * iVar2; + struct DungeonEntity * uVar3; + iVar2 = sub_8085480(); uVar3 = sub_8085680(0x13); sub_8083E88(0x72); @@ -2413,9 +2413,9 @@ void sub_8089FF0(char param_1,int param_2) void RaikouPreFightDialogue(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; - + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; + iVar1 = sub_8085480(); uVar2 = sub_8085680(0x13); sub_8052910(&gUnknown_8104450); @@ -2433,14 +2433,14 @@ void RaikouPreFightDialogue(void) sub_8052910(&gUnknown_81045B0); sub_803E708(10,70); sub_8086A70(uVar2,0x28a,0xb); - sub_80858AC(&iVar1->unkC,0x10); + sub_80858AC(&iVar1->posPixelX,0x10); } void RaikouPreFightDialogue1(void) { - struct unkDungeon_8041D5C * iVar2; - struct unkDungeon_8041D5C * uVar3; - + struct DungeonEntity * iVar2; + struct DungeonEntity * uVar3; + iVar2 = sub_8085480(); uVar3 = sub_8085680(0x13); gUnknown_203B418->unkE265 = 4; @@ -2453,14 +2453,14 @@ void RaikouPreFightDialogue1(void) sub_8052910(&gUnknown_81046A0); sub_803E708(10,70); sub_8086A70(uVar3,0x28a,0xb); - sub_80858AC(&iVar2->unkC,0x10); + sub_80858AC(&iVar2->posPixelX,0x10); } void RaikouPreFightDialogue2(void) { - struct unkDungeon_8041D5C * iVar2; - struct unkDungeon_8041D5C * uVar3; - + struct DungeonEntity * iVar2; + struct DungeonEntity * uVar3; + iVar2 = sub_8085480(); uVar3 = sub_8085680(0x13); if (HasRecruitedMon(SPECIES_RAIKOU)) { @@ -2476,14 +2476,14 @@ void RaikouPreFightDialogue2(void) sub_8052910(&gUnknown_810476C); sub_803E708(10,70); sub_8086A70(uVar3,0x28a,0xb); - sub_80858AC(&iVar2->unkC,0x10); + sub_80858AC(&iVar2->posPixelX,0x10); } } void RaikouScreenFlash(void) { s32 iVar1; - + PlaySoundEffect(0x1f6); for(iVar1 = 250; iVar1 > 149; iVar1 -= 10) { @@ -2508,9 +2508,9 @@ void RaikouScreenFlash(void) void sub_808A264(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; - + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; + iVar1 = sub_8085480(); uVar2 = sub_8085680(0x14); sub_8083E88(0x72); @@ -2525,9 +2525,9 @@ void sub_808A264(void) void sub_808A2C0(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; - + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; + iVar1 = sub_8085480(); uVar2 = sub_8085680(0x14); sub_8083E88(0x72); @@ -2540,9 +2540,9 @@ void sub_808A2C0(void) void sub_808A308(void) { - struct unkDungeon_8041D5C * iVar2; - struct unkDungeon_8041D5C * uVar3; - + struct DungeonEntity * iVar2; + struct DungeonEntity * uVar3; + iVar2 = sub_8085480(); uVar3 = sub_8085680(0x14); sub_8083E88(0x72); @@ -2568,9 +2568,9 @@ void sub_808A36C(char param_1,int param_2) void SuicunePreFightDialogue(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; - + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; + iVar1 = sub_8085480(); uVar2 = sub_8085680(0x14); sub_8086448(); @@ -2591,14 +2591,14 @@ void SuicunePreFightDialogue(void) sub_8052910(&gUnknown_8104914); sub_803E708(10,70); sub_8086A70(uVar2,0x28a,0xb); - sub_80858AC(&iVar1->unkC,0x10); + sub_80858AC(&iVar1->posPixelX,0x10); } void SuicunePreFightDialogue1(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; - + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; + iVar1 = sub_8085480(); uVar2 = sub_8085680(0x14); sub_8052910(&gUnknown_8104930); @@ -2608,14 +2608,14 @@ void SuicunePreFightDialogue1(void) sub_8052910(&gUnknown_8104998); sub_803E708(10,70); sub_8086A70(uVar2,0x28a,0xb); - sub_80858AC(&iVar1->unkC,0x10); + sub_80858AC(&iVar1->posPixelX,0x10); } void SuicunePreFightDialogue2(void) { - struct unkDungeon_8041D5C * iVar2; - struct unkDungeon_8041D5C * uVar3; - + struct DungeonEntity * iVar2; + struct DungeonEntity * uVar3; + iVar2 = sub_8085480(); uVar3 = sub_8085680(0x14); if (HasRecruitedMon(SPECIES_SUICUNE)) { @@ -2629,15 +2629,15 @@ void SuicunePreFightDialogue2(void) sub_8052910(&gUnknown_8104A9C); sub_803E708(10,70); sub_8086A70(uVar3,0x28a,0xb); - sub_80858AC(&iVar2->unkC,0x10); + sub_80858AC(&iVar2->posPixelX,0x10); } } -void sub_808A528(struct unkDungeon_8041D5C * param_1) +void sub_808A528(struct DungeonEntity * param_1) { s32 iVar1; s32 iVar2; - + param_1->unk70->unk15E = 0; iVar2 = 51200; iVar1 = 3072; @@ -2658,7 +2658,7 @@ void sub_808A528(struct unkDungeon_8041D5C * param_1) void SuicuneScreenFlash(void) { s32 iVar1; - + PlaySoundEffect(0x1ee); for(iVar1 = 250; iVar1 > 149; iVar1 -= 10) { @@ -2683,9 +2683,9 @@ void SuicuneScreenFlash(void) void sub_808A608(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; - + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; + iVar1 = sub_8085480(); uVar2 = sub_8085680(0x15); sub_8083E88(0x1c); @@ -2701,9 +2701,9 @@ void sub_808A608(void) void sub_808A668(void) { - struct unkDungeon_8041D5C * iVar2; - struct unkDungeon_8041D5C * uVar3; - + struct DungeonEntity * iVar2; + struct DungeonEntity * uVar3; + iVar2 = sub_8085480(); uVar3 = sub_8085680(0x15); sub_8083E88(0x1c); @@ -2738,14 +2738,14 @@ void sub_808A718(void) void HoOhPreFightDialogue(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; int local_14[2]; iVar1 = sub_8085480(); uVar2 = sub_8085680(0x15); - local_14[0] = iVar1->unkC; - local_14[1] = iVar1->unk10 + -0x1000; + local_14[0] = iVar1->posPixelX; + local_14[1] = iVar1->posPixelY + -0x1000; sub_80858AC(local_14,0x88); sub_803E708(0x40,70); sub_8052910(&gUnknown_8104AD4); @@ -2772,20 +2772,20 @@ void HoOhPreFightDialogue(void) sub_8052910(&gUnknown_8104CE0); sub_803E708(10,70); sub_8086A70(uVar2,800,0x20); - sub_80858AC(&iVar1->unkC,0x10); + sub_80858AC(&iVar1->posPixelX,0x10); } void HoOhPreFightDialogue1(void) { - struct unkDungeon_8041D5C * iVar2; - struct unkDungeon_8041D5C * uVar3; + struct DungeonEntity * iVar2; + struct DungeonEntity * uVar3; u32 local_14[2]; iVar2 = sub_8085480(); uVar3 = sub_8085680(0x15); - local_14[0] = iVar2->unkC; - local_14[1] = iVar2->unk10 + -0x1000; + local_14[0] = iVar2->posPixelX; + local_14[1] = iVar2->posPixelY + -0x1000; sub_80858AC(local_14,0x88); sub_803E708(0x40,70); if (HasRecruitedMon(SPECIES_HO_OH)) { @@ -2808,15 +2808,15 @@ void HoOhPreFightDialogue1(void) sub_8052910(&gUnknown_8104E0C); sub_803E708(10,70); sub_8086A70(uVar3,800,0x20); - sub_80858AC(&iVar2->unkC,0x10); + sub_80858AC(&iVar2->posPixelX,0x10); } } -void sub_808A904(struct unkDungeon_8041D5C * param_1) +void sub_808A904(struct DungeonEntity * param_1) { s32 iVar1; s32 iVar2; - + param_1->unk70->unk15E = 0; iVar2 = 51200; iVar1 = 3072; @@ -2837,7 +2837,7 @@ void sub_808A904(struct unkDungeon_8041D5C * param_1) void HoOhScreenFlash(void) { s32 iVar1; - + PlaySoundEffect(0x1ed); for(iVar1 = 250; iVar1 > 149; iVar1 -= 10) { @@ -2862,9 +2862,9 @@ void HoOhScreenFlash(void) void sub_808A9E4(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; - + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; + iVar1 = sub_8085480(); uVar2 = sub_8085680(0x16); sub_8083E88(0x72); @@ -2878,9 +2878,9 @@ void sub_808A9E4(void) void sub_808AA3C(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; - + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; + iVar1 = sub_8085480(); uVar2 = sub_8085680(0x16); sub_8083E88(0x72); @@ -2894,9 +2894,9 @@ void sub_808AA3C(void) void sub_808AA94(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; - + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; + iVar1 = sub_8085480(); uVar2 = sub_8085680(0x16); sub_8083E88(0x72); @@ -2918,15 +2918,15 @@ void sub_808AAF0(char param_1, s32 param_2) void LatiosPreFightDialogue(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * iVar2; + struct DungeonEntity * iVar1; + struct DungeonEntity * iVar2; u32 local_18[3]; iVar1 = sub_8085480(); iVar2 = sub_8085680(0x16); - local_18[0] = iVar2->unkC; - local_18[1] = iVar2->unk10 + (0x80 << 6); + local_18[0] = iVar2->posPixelX; + local_18[1] = iVar2->posPixelY + (0x80 << 6); local_18[2] = 0x7000fc; sub_8085EC8(0x1bd,0,0,&local_18[2],1); @@ -2944,14 +2944,14 @@ void LatiosPreFightDialogue(void) sub_8052910(&gUnknown_8104F30); sub_803E708(10,70); sub_8086A70(iVar2,600,0xb); - sub_80858AC(&iVar1->unkC,0x10); + sub_80858AC(&iVar1->posPixelX,0x10); } void LatiosReFightDialogue(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; - + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; + iVar1 = sub_8085480(); uVar2 = sub_8085680(0x16); sub_8086448(); @@ -2963,7 +2963,7 @@ void LatiosReFightDialogue(void) sub_8052910(&gUnknown_8104F30); sub_803E708(10,70); sub_8086A70(uVar2,600,0xb); - sub_80858AC(&iVar1->unkC,0x10); + sub_80858AC(&iVar1->posPixelX,0x10); } void sub_808AC3C(void) @@ -2976,7 +2976,7 @@ void sub_808AC3C(void) void LatiosScreenFlash(void) { s32 iVar1; - + PlaySoundEffect(0x1ee); gUnknown_202EDC8 = 0x1f; for(iVar1 = 250; iVar1 > 149; iVar1 -= 10) @@ -2996,7 +2996,7 @@ void LatiosScreenFlash(void) void sub_808ACC0(void) { - struct unkDungeon_8041D5C * uVar2; + struct DungeonEntity * uVar2; if (HasRecruitedMon(SPECIES_REGIROCK)) { uVar2 = sub_8085680(0x17); @@ -3015,7 +3015,7 @@ void sub_808ACC0(void) if (sub_80860A8(ITEM_ID_MUSIC_BOX) != 0) { sub_8098044(0x22); sub_8097FA8(0x1d); - } + } else { sub_8098044(0x22); sub_8098044(0x1d); @@ -3028,7 +3028,7 @@ void sub_808ACC0(void) void sub_808AD48(void) { - struct unkDungeon_8041D5C * uVar2; + struct DungeonEntity * uVar2; if (HasRecruitedMon(SPECIES_REGICE)) { uVar2 = sub_8085680(0x18); @@ -3047,7 +3047,7 @@ void sub_808AD48(void) if (sub_80860A8(ITEM_ID_MUSIC_BOX) != 0) { sub_8098044(0x22); sub_8097FA8(0x1d); - } + } else { sub_8098044(0x22); sub_8098044(0x1d); @@ -3061,7 +3061,7 @@ void sub_808AD48(void) void sub_808ADCC(void) { - struct unkDungeon_8041D5C * uVar2; + struct DungeonEntity * uVar2; if (HasRecruitedMon(SPECIES_REGISTEEL)) { uVar2 = sub_8085680(0x19); @@ -3080,7 +3080,7 @@ void sub_808ADCC(void) if (sub_80860A8(ITEM_ID_MUSIC_BOX) != 0) { sub_8098044(0x22); sub_8097FA8(0x1d); - } + } else { sub_8098044(0x22); sub_8098044(0x1d); @@ -3093,7 +3093,7 @@ void sub_808ADCC(void) void sub_808AE54(char param_1,char param_2,u32 param_3) { - struct unkDungeon_8041D5C * uVar3; + struct DungeonEntity * uVar3; u8 auStack24 [4]; struct ItemSlot auStack20; @@ -3116,7 +3116,7 @@ void sub_808AE54(char param_1,char param_2,u32 param_3) void sub_808AEC8(char param_1,char param_2,u32 param_3) { - struct unkDungeon_8041D5C * uVar3; + struct DungeonEntity * uVar3; u8 auStack24 [4]; struct ItemSlot auStack20; @@ -3138,7 +3138,7 @@ void sub_808AEC8(char param_1,char param_2,u32 param_3) void sub_808AF3C(char param_1,char param_2,u32 param_3) { - struct unkDungeon_8041D5C * uVar3; + struct DungeonEntity * uVar3; u8 auStack24 [4]; struct ItemSlot auStack20; @@ -3160,7 +3160,7 @@ void sub_808AF3C(char param_1,char param_2,u32 param_3) void sub_808AFB0(char param_1) { - struct unkDungeon_8041D5C * uVar3; + struct DungeonEntity * uVar3; u8 auStack12 [4]; uVar3 = sub_8085480(); @@ -3178,7 +3178,7 @@ void sub_808AFB0(char param_1) void sub_808B030(char param_1) { - struct unkDungeon_8041D5C * uVar3; + struct DungeonEntity * uVar3; u8 auStack12 [4]; uVar3 = sub_8085480(); @@ -3196,9 +3196,9 @@ void sub_808B030(char param_1) void sub_808B0B0(char param_1) { - struct unkDungeon_8041D5C * uVar3; + struct DungeonEntity * uVar3; u8 auStack12 [4]; - + uVar3 = sub_8085480(); sub_8052D44(auStack12,uVar3,0); if ((sub_8098100(0x22) == 0) && (param_1 == 0x30) && (sub_8098100(0x1d) == 0) && (sub_80860A8(ITEM_ID_STEEL_PART) != 0)) { @@ -3360,35 +3360,35 @@ void sub_808B1CC(u8 r0) } -void sub_808B2B0(struct unkDungeon_8041D5C *r0) +void sub_808B2B0(struct DungeonEntity *r0) { r0->unk70->unk46 = 4; sub_806CE68(r0, 4); } -void sub_808B2C4(struct unkDungeon_8041D5C *r0) +void sub_808B2C4(struct DungeonEntity *r0) { sub_8086A70(r0, 0xE1 << 1, 0xB); } -void sub_808B2D4(struct unkDungeon_8041D5C *r0) +void sub_808B2D4(struct DungeonEntity *r0) { sub_8086A70(r0, 0xE1 << 1, 0xB); } -void sub_808B2E4(struct unkDungeon_8041D5C *r0) +void sub_808B2E4(struct DungeonEntity *r0) { sub_8086A70(r0, 0xE1 << 1, 0xB); } void sub_808B2F4(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; - + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; + iVar1 = sub_8085480(); uVar2 = sub_8085680(0x1a); sub_8083E88(0x79); @@ -3405,9 +3405,9 @@ void sub_808B2F4(void) void sub_808B35C(void) { - struct unkDungeon_8041D5C * iVar2; - struct unkDungeon_8041D5C * uVar3; - + struct DungeonEntity * iVar2; + struct DungeonEntity * uVar3; + iVar2 = sub_8085480(); uVar3 = sub_8085680(0x1a); sub_8083E88(0x79); @@ -3432,7 +3432,7 @@ void sub_808B35C(void) void sub_808B3E4(u8 param_1,u8 param_2,u8 param_3) { u8 uVar1; - + // TODO R1 and R2 shifts are switched ordering but matches if (((((param_2 * 0x1000000) + 0xcf000000U) >> 0x18) < 2) && (param_1 == 0x1A)){ sub_8097FA8(0x1e); @@ -3519,9 +3519,9 @@ void sub_808B3E4(u8 param_1, u8 param_2, u8 param_3) void JirachiPreFightDialogue(void) { - struct unkDungeon_8041D5C * iVar1; - struct unkDungeon_8041D5C * uVar2; - + struct DungeonEntity * iVar1; + struct DungeonEntity * uVar2; + iVar1 = sub_8085480(); uVar2 = sub_8085680(0x1a); sub_8086448(); @@ -3541,13 +3541,13 @@ void JirachiPreFightDialogue(void) sub_8052910(&gUnknown_810550C); sub_803E708(10,70); sub_8086A70(uVar2,0x15e,0x20); - sub_80858AC(&iVar1->unkC,0x10); + sub_80858AC(&iVar1->posPixelX,0x10); } void sub_808B50C(void) { - struct unkDungeon_8041D5C * iVar1; - + struct DungeonEntity * iVar1; + iVar1 = sub_8085680(0x1a); CopySpeciesNametoBuffer(gUnknown_202E038, SPECIES_JIRACHI); sub_80855E4(sub_808BBA8); diff --git a/src/code_80869E4.c b/src/code_80869E4.c index 07c657f..18261a0 100644 --- a/src/code_80869E4.c +++ b/src/code_80869E4.c @@ -1,5 +1,5 @@ #include "global.h" -#include "code_8041D5C.h" +#include "dungeon_entity.h" #include "gUnknown_203B418.h" #include "random.h" @@ -18,14 +18,14 @@ extern struct unkStruct_203B418 *gUnknown_203B418; s8 sub_8002984(s8, u8); void sub_803E708(u32, u32); -void sub_80869E4(struct unkDungeon_8041D5C *r0, u32, u8, s8); +void sub_80869E4(struct DungeonEntity *r0, u32, u8, s8); extern void sub_80859F0(u32); extern void sub_803E46C(u32); extern void sub_803E9D0(void); extern void sub_8085C54(u32, u32, u32, u32, u32); extern void PlaySoundEffect(u32); -extern struct unkDungeon_8041D5C *sub_8085480(void); -void SpriteLookAroundEffect(struct unkDungeon_8041D5C *r0); +extern struct DungeonEntity *sub_8085480(void); +void SpriteLookAroundEffect(struct DungeonEntity *r0); extern void sub_8052910(u32); void sub_8086494(); @@ -39,109 +39,109 @@ extern void sub_80855E4(void *); extern u32 sub_803F994(void); extern u32 sub_803F9B0(void); extern void sub_803F878(u32, u32); -extern void sub_8086384(struct unkDungeon_8041D5C *r0); +extern void sub_8086384(struct DungeonEntity *r0); extern void sub_8085930(u32); -extern void sub_804539C(struct unkDungeon_8041D5C *, u32, u32); -extern void sub_806CE68(struct unkDungeon_8041D5C *, u32); -extern void sub_806CDD4(struct unkDungeon_8041D5C *, u8, u32); -extern void sub_804535C(struct unkDungeon_8041D5C *, u32 *); -extern void sub_8086A54(struct unkDungeon_8041D5C *); -extern void sub_8086A3C(struct unkDungeon_8041D5C *); +extern void sub_804539C(struct DungeonEntity *, u32, u32); +extern void sub_806CE68(struct DungeonEntity *, u32); +extern void sub_806CDD4(struct DungeonEntity *, u8, u32); +extern void sub_804535C(struct DungeonEntity *, u32 *); +extern void sub_8086A54(struct DungeonEntity *); +extern void sub_8086A3C(struct DungeonEntity *); extern void PlaySoundEffect(u32); -extern void sub_80861F8(u32, struct unkDungeon_8041D5C *, u32); +extern void sub_80861F8(u32, struct DungeonEntity *, u32); -void sub_80862BC(struct unkDungeon_8041D5C *r0) +void sub_80862BC(struct DungeonEntity *r0) { PlaySoundEffect(0xE8 << 1); sub_80861F8(0x143, r0, 0); } -void sub_80862DC(struct unkDungeon_8041D5C *r0) +void sub_80862DC(struct DungeonEntity *r0) { u32 array[2]; - array[0] = r0->unkC; - array[1] = r0->unk10 + (0xE0 << 6); + array[0] = r0->posPixelX; + array[1] = r0->posPixelY + (0xE0 << 6); sub_804535C(r0, array); sub_806CDD4(r0, 0, 4); sub_8086A54(r0); } -void sub_8086310(struct unkDungeon_8041D5C *r0) +void sub_8086310(struct DungeonEntity *r0) { u32 array[2]; - array[0] = r0->unkC; - array[1] = r0->unk10 + (0x90 << 8); + array[0] = r0->posPixelX; + array[1] = r0->posPixelY + (0x90 << 8); sub_804535C(r0, array); sub_806CE68(r0, 0); sub_8086A3C(r0); - r0->unk20 = 0; + r0->active = 0; } -void sub_8086348(struct unkDungeon_8041D5C *r0) +void sub_8086348(struct DungeonEntity *r0) { u32 array[2]; - array[0] = r0->unkC + (0xF0 << 7); - array[1] = r0->unk10 + 0xffffe000; + array[0] = r0->posPixelX + (0xF0 << 7); + array[1] = r0->posPixelY + 0xffffe000; sub_804535C(r0, array); sub_806CDD4(r0, 0, 6); sub_8086A54(r0); } -void sub_8086384(struct unkDungeon_8041D5C *r0) +void sub_8086384(struct DungeonEntity *r0) { u32 array[2]; - array[0] = r0->unkC + (0xF0 << 7); - array[1] = r0->unk10; + array[0] = r0->posPixelX + (0xF0 << 7); + array[1] = r0->posPixelY; sub_804535C(r0, array); sub_806CDD4(r0, 0, 6); sub_8086A54(r0); } -void sub_80863B8(struct unkDungeon_8041D5C *r0) +void sub_80863B8(struct DungeonEntity *r0) { sub_806CDD4(r0, 0, 4); } -void sub_80863C8(struct unkDungeon_8041D5C *r0) +void sub_80863C8(struct DungeonEntity *r0) { sub_806CDD4(r0, 0, 0); } -void sub_80863D8(struct unkDungeon_8041D5C *r0) +void sub_80863D8(struct DungeonEntity *r0) { sub_806CDD4(r0, 0, 6); } -void sub_80863E8(struct unkDungeon_8041D5C *r0) +void sub_80863E8(struct DungeonEntity *r0) { sub_806CDD4(r0, 6, 4); } -void sub_80863F8(struct unkDungeon_8041D5C *r0) +void sub_80863F8(struct DungeonEntity *r0) { sub_806CE68(r0, 4); } -void sub_8086404(struct unkDungeon_8041D5C *r0) +void sub_8086404(struct DungeonEntity *r0) { sub_806CE68(r0, 6); } -void sub_8086410(struct unkDungeon_8041D5C *r0) +void sub_8086410(struct DungeonEntity *r0) { sub_804539C(r0, 0, 0xffffff00); } -void sub_8086424(struct unkDungeon_8041D5C *r0) +void sub_8086424(struct DungeonEntity *r0) { sub_804539C(r0, 0, 0x80 << 1); } -void sub_8086434(struct unkDungeon_8041D5C *r0) +void sub_8086434(struct DungeonEntity *r0) { sub_804539C(r0, 0xffffff00, 0); } @@ -446,13 +446,13 @@ void sub_8086854(void) } } -void sub_80868F4(struct unkDungeon_8041D5C *r0) +void sub_80868F4(struct DungeonEntity *r0) { r0->unk70->unk15C = 1; r0->unk70->unk15D = 1; } -void sub_8086910(struct unkDungeon_8041D5C *r0) +void sub_8086910(struct DungeonEntity *r0) { r0->unk70->unk15C = 0; r0->unk70->unk15D = 0; @@ -473,7 +473,7 @@ void sub_808692C(void) sub_803E708(0x4, 0x46); } -void SpriteLookAroundEffect(struct unkDungeon_8041D5C *r0) +void SpriteLookAroundEffect(struct DungeonEntity *r0) { s8 r4; s8 r3; |