move sFixedRoomEntities to src

This commit is contained in:
DizzyEggg 2025-03-28 11:17:36 +01:00
parent 7ee10cb405
commit 7aa1a10fa5
5 changed files with 787 additions and 244 deletions

View File

@ -2,214 +2,9 @@
.section .rodata
.align 2
.global gUnknown_80F6E20
gUnknown_80F6E20:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xfc, 0x00, 0x03, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x32, 0x00, 0x04, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x5e, 0x00, 0x05, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x17, 0x00, 0x06, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x4d, 0x01, 0x07, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x91, 0x00, 0x08, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x92, 0x00, 0x09, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x41, 0x00, 0x0a, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x11, 0x01, 0x0b, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x0c, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x90, 0x00, 0x0d, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x9b, 0x01, 0x0e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x9c, 0x01, 0x0f, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x38, 0x00, 0x10, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x96, 0x00, 0x11, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x0d, 0x01, 0x12, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x0c, 0x01, 0x13, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x0e, 0x01, 0x14, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x13, 0x01, 0x15, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x99, 0x01, 0x16, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x95, 0x01, 0x17, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x96, 0x01, 0x18, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x97, 0x01, 0x19, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x9d, 0x01, 0x1a, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x12, 0x01, 0x1b, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x9a, 0x01, 0x1c, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x9e, 0x01, 0x1d, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa1, 0x01, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa2, 0x01, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa3, 0x01, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x37, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x18, 0x01, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x1b, 0x01, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x04, 0x01, 0x1f, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0xe1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0xe2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0xe6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x14, 0x01, 0x1e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0xaf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0xd1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0xe3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0xe5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x20, 0x01, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa2, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x53, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x14, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x4d, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xf3, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x09, 0x01, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x3c, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x66, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xbf, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x36, 0x01, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x64, 0x01, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x4e, 0x01, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x64, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xf5, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xf6, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x85, 0x01, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x4c, 0x01, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x05, 0x01, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x6a, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x01, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x32, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x54, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x53, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x10, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xe3, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x1d, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x20, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x7f, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x0f, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x0d, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x10, 0x01, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xb9, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x4a, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x5c, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x8f, 0x01, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x90, 0x01, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x1e, 0x01, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xc6, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x49, 0x01, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x92, 0x01, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xf9, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x49, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x73, 0x01, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x09, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa0, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x1d, 0x01, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x4c, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x4b, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x1b, 0x01, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x2c, 0x01, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x2b, 0x01, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x3c, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x3c, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x3c, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x3c, 0x00, 0x24, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x6b, 0x73, 0x64, 0x69, 0x72, 0x30, 0x00
.string "pksdir0\0"
.align 2
.global gUnknown_80F7AE8
gUnknown_80F7AE8: @ 80F7AE8
.byte 0x00, 0x00

View File

@ -424,8 +424,8 @@ enum MonsterBehavior
BEHAVIOR_ALLY,
BEHAVIOR_SKARMORY,
BEHAVIOR_DIGLETT, // Used for Diglett in the Skarmory boss fight.
BEHAVIOR_5, // 5 and 6 are probably Gengar and Ekans, but not sure which is which.
BEHAVIOR_6,
BEHAVIOR_GENGAR,
BEHAVIOR_EKANS,
BEHAVIOR_MEDICHAM,
BEHAVIOR_ZAPDOS,
BEHAVIOR_MOLTRES,
@ -435,7 +435,7 @@ enum MonsterBehavior
BEHAVIOR_ARTICUNO,
BEHAVIOR_GROUDON_2,
BEHAVIOR_RAYQUAZA,
BEHAVIOR_16,
BEHAVIOR_MANKEY,
BEHAVIOR_MEWTWO,
BEHAVIOR_ENTEI,
BEHAVIOR_RAIKOU,
@ -455,7 +455,7 @@ enum MonsterBehavior
BEHAVIOR_33,
BEHAVIOR_34,
BEHAVIOR_35,
BEHAVIOR_36,
BEHAVIOR_MAZE_BOSS,
};
enum VisualFlag

View File

@ -771,9 +771,9 @@ void sub_8087130(void)
void sub_8087144(void)
{
Entity *iVar2;
Entity *iVar3;
Entity *iVar4;
Entity *gengarEntity;
Entity *ekansEntity;
Entity *medichamEntity;
s16 auStack_10c[28];
s16 puStack_60[28];
s16 puStack_5c[28];
@ -781,33 +781,33 @@ void sub_8087144(void)
Entity *pEStack_58[3];
struct_8085B80 auStack_4c[3];
iVar2 = GetEntityFromMonsterBehavior(BEHAVIOR_5);
iVar3 = GetEntityFromMonsterBehavior(BEHAVIOR_6);
iVar4 = GetEntityFromMonsterBehavior(BEHAVIOR_MEDICHAM);
gengarEntity = GetEntityFromMonsterBehavior(BEHAVIOR_GENGAR);
ekansEntity = GetEntityFromMonsterBehavior(BEHAVIOR_EKANS);
medichamEntity = GetEntityFromMonsterBehavior(BEHAVIOR_MEDICHAM);
memcpy(auStack_10c,gUnknown_810739C, 0x38);
memcpy(puStack_60, gUnknown_81073D4, 0x38);
memcpy(puStack_5c, gUnknown_810740C, 0x38);
puStack_64[0] = auStack_10c;
puStack_64[1] = puStack_60;
puStack_64[2] = puStack_5c;
pEStack_58[0] = iVar2;
pEStack_58[1] = iVar3;
pEStack_58[2] = iVar4;
pEStack_58[0] = gengarEntity;
pEStack_58[1] = ekansEntity;
pEStack_58[2] = medichamEntity;
DungeonStartNewBGM(MUS_THERES_TROUBLE);
sub_8086A54(iVar2);
sub_8086A54(iVar3);
sub_8086A54(iVar4);
sub_8086A54(gengarEntity);
sub_8086A54(ekansEntity);
sub_8086A54(medichamEntity);
sub_8085B4C(auStack_4c,puStack_64,pEStack_58,3);
GetEntInfo(iVar2)->unk15F = 1;
GetEntInfo(iVar3)->unk15F = 1;
GetEntInfo(iVar4)->unk15F = 1;
GetEntInfo(gengarEntity)->unk15F = 1;
GetEntInfo(ekansEntity)->unk15F = 1;
GetEntInfo(medichamEntity)->unk15F = 1;
while( TRUE ) {
if (!sub_8085B80(auStack_4c)) break;
DungeonRunFrameActions(0x46);
}
GetEntInfo(iVar2)->unk15F = 0;
GetEntInfo(iVar3)->unk15F = 0;
GetEntInfo(iVar4)->unk15F = 0;
GetEntInfo(gengarEntity)->unk15F = 0;
GetEntInfo(ekansEntity)->unk15F = 0;
GetEntInfo(medichamEntity)->unk15F = 0;
}
void sub_8087230(void)

View File

@ -41,16 +41,16 @@ static void SpawnItemAtPos(u8 itemId, s32 x, s32 y, s32 quantity, u32 itemFlags)
}
// s16 species memes strike again. Will the fix ever be discovered?
static void SpawnSpeciesAtPos(s16 species_, s32 x, s32 y, u32 unk2_, u32 UNUSED unused)
static void SpawnSpeciesAtPos(s16 species_, s32 x, s32 y, u32 monsterBehav_, u32 UNUSED unused)
{
struct unkStruct_806B7F8 unkStruct;
s32 species = SpeciesId(species_);
u8 unk2 = unk2_;
u8 monsterBehav = monsterBehav_;
if (species_ == MONSTER_DECOY) {
unkStruct.species = MONSTER_POLIWAG;
unkStruct.level = sub_803DA20(MONSTER_POLIWAG);
unkStruct.unk2 = unk2;
unkStruct.unk2 = monsterBehav;
unkStruct.unk4 = 0;
unkStruct.unk10 = 0;
unkStruct.pos.x = x;
@ -60,7 +60,7 @@ static void SpawnSpeciesAtPos(s16 species_, s32 x, s32 y, u32 unk2_, u32 UNUSED
else if (species != MONSTER_NONE) {
unkStruct.species = species;
unkStruct.level = sub_803DA20(species);
unkStruct.unk2 = unk2;
unkStruct.unk2 = monsterBehav;
unkStruct.unk4 = 0;
unkStruct.unk10 = 0;
unkStruct.pos.x = x;
@ -84,20 +84,768 @@ static void SpawnEnemyTrapAtPos(u8 trapId, s32 x, s32 y, bool8 isVisible)
}
}
struct UnkStruct_80F6D20
struct FixedRoomEntitiesInfo
{
u8 itemId;
s16 unk2;
s16 itemQuantity;
u32 unk4;
s16 speciesId;
u8 unkA;
u8 monsterBehavior;
u8 trapId;
u8 roomId;
bool8 trapVisible;
bool8 setTerrainToSecondary;
};
extern const struct UnkStruct_80F6D20 gUnknown_80F6E20[];
static const struct FixedRoomEntitiesInfo sFixedRoomEntities[204] = {
[0] = {
.speciesId = MONSTER_SKARMORY,
.monsterBehavior = BEHAVIOR_SKARMORY,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[1] = {
.speciesId = MONSTER_DIGLETT,
.monsterBehavior = BEHAVIOR_DIGLETT,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[2] = {
.speciesId = MONSTER_GENGAR,
.monsterBehavior = BEHAVIOR_GENGAR,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[3] = {
.speciesId = MONSTER_EKANS,
.monsterBehavior = BEHAVIOR_EKANS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[4] = {
.speciesId = MONSTER_MEDICHAM,
.monsterBehavior = BEHAVIOR_MEDICHAM,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[5] = {
.speciesId = MONSTER_ZAPDOS,
.monsterBehavior = BEHAVIOR_ZAPDOS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[6] = {
.unk4 = 1,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[7] = {
.unk4 = 2,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[8] = {
.unk4 = 3,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[9] = {
.unk4 = 4,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[10] = {
.unk4 = 5,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[11] = {
.unk4 = 6,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[12] = {
.unk4 = 7,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[13] = {
.unk4 = 8,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[14] = {
.speciesId = MONSTER_MOLTRES,
.monsterBehavior = BEHAVIOR_MOLTRES,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[15] = {
.speciesId = MONSTER_ALAKAZAM,
.monsterBehavior = BEHAVIOR_ALAKAZAM_1,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[16] = {
.speciesId = MONSTER_TYRANITAR,
.monsterBehavior = BEHAVIOR_GROUDON_1,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[17] = {
.speciesId = MONSTER_CHARIZARD,
.monsterBehavior = BEHAVIOR_ALAKAZAM_2,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[18] = {
.speciesId = MONSTER_ARTICUNO,
.monsterBehavior = BEHAVIOR_ARTICUNO,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[19] = {
.speciesId = MONSTER_GROUDON,
.monsterBehavior = BEHAVIOR_GROUDON_2,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[20] = {
.speciesId = MONSTER_RAYQUAZA,
.monsterBehavior = BEHAVIOR_RAYQUAZA,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[21] = {
.speciesId = MONSTER_MANKEY,
.monsterBehavior = BEHAVIOR_MANKEY,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[22] = {
.speciesId = MONSTER_MEWTWO,
.monsterBehavior = BEHAVIOR_MEWTWO,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[23] = {
.speciesId = MONSTER_ENTEI,
.monsterBehavior = BEHAVIOR_ENTEI,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[24] = {
.speciesId = MONSTER_RAIKOU,
.monsterBehavior = BEHAVIOR_RAIKOU,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[25] = {
.speciesId = MONSTER_SUICUNE,
.monsterBehavior = BEHAVIOR_SUICUNE,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[26] = {
.speciesId = MONSTER_HO_OH,
.monsterBehavior = BEHAVIOR_HO_OH,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[27] = {
.speciesId = MONSTER_LATIOS,
.monsterBehavior = BEHAVIOR_LATIOS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[28] = {
.speciesId = MONSTER_REGIROCK,
.monsterBehavior = BEHAVIOR_REGIROCK,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[29] = {
.speciesId = MONSTER_REGICE,
.monsterBehavior = BEHAVIOR_REGICE,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[30] = {
.speciesId = MONSTER_REGISTEEL,
.monsterBehavior = BEHAVIOR_REGISTEEL,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[31] = {
.speciesId = MONSTER_JIRACHI,
.monsterBehavior = BEHAVIOR_JIRACHI,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[32] = {
.speciesId = MONSTER_LUGIA,
.monsterBehavior = BEHAVIOR_LUGIA,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[33] = {
.speciesId = MONSTER_KYOGRE,
.monsterBehavior = BEHAVIOR_KYOGRE,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[34] = {
.speciesId = MONSTER_DEOXYS_NORMAL,
.monsterBehavior = BEHAVIOR_29,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[35] = {
.speciesId = MONSTER_DEOXYS_ATTACK,
.monsterBehavior = BEHAVIOR_FIXED_ENEMY,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[36] = {
.speciesId = MONSTER_DEOXYS_DEFENSE,
.monsterBehavior = BEHAVIOR_FIXED_ENEMY,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[37] = {
.speciesId = MONSTER_DEOXYS_SPEED,
.monsterBehavior = BEHAVIOR_FIXED_ENEMY,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[38] = {
.itemId = ITEM_ORAN_BERRY,
.itemQuantity = 0,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[39] = {
.itemId = ITEM_STICK,
.itemQuantity = 0,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[40] = {
.speciesId = MONSTER_TORCHIC,
.monsterBehavior = BEHAVIOR_FIXED_ENEMY,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[41] = {
.speciesId = MONSTER_IVYSAUR,
.monsterBehavior = BEHAVIOR_FIXED_ENEMY,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[42] = {
.speciesId = MONSTER_MUDKIP,
.monsterBehavior = BEHAVIOR_FIXED_ENEMY,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[43] = {
.speciesId = MONSTER_SMEARGLE,
.monsterBehavior = BEHAVIOR_SMEARGLE,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[44] = {
.trapId = NUM_TRAPS,
.roomId = 0,
},
[45] = {
.trapId = NUM_TRAPS,
.roomId = 1,
},
[46] = {
.trapId = NUM_TRAPS,
.roomId = 2,
},
[47] = {
.trapId = NUM_TRAPS,
.roomId = 3,
},
[48] = {
.trapId = NUM_TRAPS,
.roomId = 4,
},
[49] = {
.trapId = NUM_TRAPS,
.roomId = 5,
},
[50] = {
.trapId = NUM_TRAPS,
.roomId = 0,
.setTerrainToSecondary = TRUE,
},
[51] = {
.trapId = NUM_TRAPS,
.roomId = 0,
},
[52] = {
.trapId = NUM_TRAPS,
.roomId = 0,
},
[53] = {
.trapId = NUM_TRAPS,
.roomId = 0,
},
[54] = {
.itemId = ITEM_HM_FLY,
.itemQuantity = 0,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[55] = {
.itemId = ITEM_HM_SURF,
.itemQuantity = 0,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[56] = {
.itemId = ITEM_HM_DIVE,
.itemQuantity = 0,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[57] = {
.itemId = ITEM_HM_WATERFALL,
.itemQuantity = 0,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[58] = {
.itemId = ITEM_BEAUTY_SCARF,
.itemQuantity = 0,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[59] = {
.speciesId = MONSTER_CELEBI,
.monsterBehavior = BEHAVIOR_CELEBI,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[60] = {
.itemId = ITEM_FRIEND_BOW,
.itemQuantity = 0,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[61] = {
.itemId = ITEM_TM_WIDE_SLASH,
.itemQuantity = 0,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[62] = {
.itemId = ITEM_VACUUM_CUT,
.itemQuantity = 0,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[63] = {
.itemId = ITEM_SUN_RIBBON,
.itemQuantity = 0,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[64] = {
.itemId = ITEM_LUNAR_RIBBON,
.itemQuantity = 0,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[65] = {
.itemId = ITEM_LUNAR_RIBBON,
.itemQuantity = 0,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[66] = {
.itemId = ITEM_HM_CUT,
.itemQuantity = 0,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[67] = {
.itemId = ITEM_HM_STRENGTH,
.itemQuantity = 0,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[68] = {
.itemId = ITEM_HM_FLASH,
.itemQuantity = 0,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[69] = {
.itemId = ITEM_HM_ROCK_SMASH,
.itemQuantity = 0,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[70] = {
.itemId = ITEM_DEEPSEASCALE,
.itemQuantity = 0,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[71] = {
.itemId = ITEM_WISH_STONE,
.itemQuantity = 0,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[72] = {
.itemId = ITEM_DEEPSEATOOTH,
.itemQuantity = 0,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[73] = {
.speciesId = MONSTER_ZIGZAGOON,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[74] = {
.speciesId = MONSTER_FURRET,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[75] = {
.speciesId = MONSTER_FARFETCHD,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[76] = {
.speciesId = MONSTER_RATICATE,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[77] = {
.speciesId = MONSTER_PONYTA,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[78] = {
.speciesId = MONSTER_SLUGMA,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[79] = {
.speciesId = MONSTER_MAGBY,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[80] = {
.speciesId = MONSTER_POLIWAG,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[81] = {
.speciesId = MONSTER_EXEGGCUTE,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[82] = {
.speciesId = MONSTER_SUNKERN,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[83] = {
.speciesId = MONSTER_SHROOMISH,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[84] = {
.speciesId = MONSTER_CACNEA,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[85] = {
.speciesId = MONSTER_ELECTRIKE,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[86] = {
.speciesId = MONSTER_VOLTORB,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[87] = {
.speciesId = MONSTER_SWINUB,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[88] = {
.speciesId = MONSTER_PILOSWINE,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[89] = {
.speciesId = MONSTER_SNORUNT,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[90] = {
.speciesId = MONSTER_MEDITITE,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[91] = {
.speciesId = MONSTER_TYROGUE,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[92] = {
.speciesId = MONSTER_HITMONLEE,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[93] = {
.speciesId = MONSTER_PHANPY,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[94] = {
.speciesId = MONSTER_DIGLETT,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[95] = {
.speciesId = MONSTER_DODUO,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[96] = {
.speciesId = MONSTER_FARFETCHD,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[97] = {
.speciesId = MONSTER_PIDGEY,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[98] = {
.speciesId = MONSTER_WOBBUFFET,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[99] = {
.speciesId = MONSTER_NIDORAN_F,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[100] = {
.speciesId = MONSTER_NIDORAN_M,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[101] = {
.speciesId = MONSTER_PINSIR,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[102] = {
.speciesId = MONSTER_BEEDRILL,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[103] = {
.speciesId = MONSTER_WEEDLE,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[104] = {
.speciesId = MONSTER_PUPITAR,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[105] = {
.speciesId = MONSTER_SUDOWOODO,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[106] = {
.speciesId = MONSTER_GEODUDE,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[107] = {
.speciesId = MONSTER_GASTLY,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[108] = {
.speciesId = MONSTER_BAGON,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[109] = {
.speciesId = MONSTER_SHELGON,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[110] = {
.speciesId = MONSTER_POOCHYENA,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[111] = {
.speciesId = MONSTER_MURKROW,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[112] = {
.speciesId = MONSTER_ARON,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[113] = {
.speciesId = MONSTER_BELDUM,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[114] = {
.speciesId = MONSTER_OCTILLERY,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[115] = {
.speciesId = MONSTER_TENTACRUEL,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[116] = {
.speciesId = MONSTER_CRADILY,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[117] = {
.speciesId = MONSTER_BLASTOISE,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[118] = {
.speciesId = MONSTER_FERALIGATR,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[119] = {
.speciesId = MONSTER_SWAMPERT,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[120] = {
.speciesId = MONSTER_GOLEM,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[121] = {
.speciesId = MONSTER_GRAVELER,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[122] = {
.speciesId = MONSTER_MUDKIP,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[123] = {
.speciesId = MONSTER_SHIFTRY,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[124] = {
.speciesId = MONSTER_NUZLEAF,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[125] = {
.speciesId = MONSTER_POLIWAG,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[126] = {
.speciesId = MONSTER_POLIWAG,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[127] = {
.speciesId = MONSTER_POLIWAG,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
[128] = {
.speciesId = MONSTER_POLIWAG,
.monsterBehavior = BEHAVIOR_MAZE_BOSS,
.trapId = NUM_TRAPS,
.roomId = 0,
},
};
// Used to spawn a single tile when generating a fixed room. The tile might contain an item or a monster.
bool8 PlaceFixedRoomTile(Tile *tile, u8 fixedRoomActionId, s32 x, s32 y, bool8 spawnTrapOrItem)
@ -184,11 +932,11 @@ bool8 PlaceFixedRoomTile(Tile *tile, u8 fixedRoomActionId, s32 x, s32 y, bool8 s
break;
default:
if (fixedRoomActionId >= 16 && fixedRoomActionId <= 219) {
const struct UnkStruct_80F6D20 *ptr = &gUnknown_80F6E20[fixedRoomActionId - 16];
const struct FixedRoomEntitiesInfo *ptr = &sFixedRoomEntities[fixedRoomActionId - 16];
tile->room = ptr->roomId;
if (ptr->itemId != 0) {
if (spawnTrapOrItem) {
SpawnItemAtPos(ptr->itemId, x, y, ptr->unk2, ptr->unk4);
SpawnItemAtPos(ptr->itemId, x, y, ptr->itemQuantity, ptr->unk4);
}
else {
gDungeon->unk644.unk47 = ptr->itemId;
@ -202,7 +950,7 @@ bool8 PlaceFixedRoomTile(Tile *tile, u8 fixedRoomActionId, s32 x, s32 y, bool8 s
}
if (ptr->speciesId != 0) {
SpawnSpeciesAtPos(ptr->speciesId, x, y, ptr->unkA, fixedRoomActionId);
SpawnSpeciesAtPos(ptr->speciesId, x, y, ptr->monsterBehavior, fixedRoomActionId);
}
if (ptr->trapId != NUM_TRAPS && spawnTrapOrItem) {

View File

@ -345,15 +345,15 @@ bool8 ShouldRunMonsterAI(Entity *pokemon)
{
case BEHAVIOR_RESCUE_TARGET:
case BEHAVIOR_SKARMORY:
case BEHAVIOR_5:
case BEHAVIOR_6:
case BEHAVIOR_GENGAR:
case BEHAVIOR_EKANS:
case BEHAVIOR_MEDICHAM:
case BEHAVIOR_ZAPDOS:
case BEHAVIOR_MOLTRES:
case BEHAVIOR_ARTICUNO:
case BEHAVIOR_GROUDON_2:
case BEHAVIOR_RAYQUAZA:
case BEHAVIOR_16:
case BEHAVIOR_MANKEY:
case BEHAVIOR_MEWTWO:
case BEHAVIOR_ENTEI:
case BEHAVIOR_RAIKOU:
@ -373,7 +373,7 @@ bool8 ShouldRunMonsterAI(Entity *pokemon)
case BEHAVIOR_33:
case BEHAVIOR_34:
case BEHAVIOR_35:
case BEHAVIOR_36:
case BEHAVIOR_MAZE_BOSS:
return TRUE;
case BEHAVIOR_FIXED_ENEMY:
case BEHAVIOR_ALLY: