diff --git a/asm/lib/libgcc.s b/asm/lib/libgcc.s index c56171e5..8e88a4f7 100644 --- a/asm/lib/libgcc.s +++ b/asm/lib/libgcc.s @@ -8,7 +8,7 @@ @ custom libgcc implementation .code 16 -_08000ED8: +_divide_by_zero: movs r0, #0 movs r1, #0 movs r2, #0 @@ -17,14 +17,14 @@ _08000ED8: thumb_func_start __divsi3 __divsi3: @ 0x08000EE0 cmp r1, #0 - beq _08000ED8 + beq _divide_by_zero svc #6 bx lr thumb_func_start __modsi3 __modsi3: @ 0x08000EE8 cmp r1, #0 - beq _08000ED8 + beq _divide_by_zero svc #6 adds r0, r1, #0 bx lr diff --git a/asm/macros/entity.inc b/asm/macros/entity.inc index 394eb9e9..9795fe70 100755 --- a/asm/macros/entity.inc +++ b/asm/macros/entity.inc @@ -126,12 +126,12 @@ .2byte \paramB, \paramC, \paramD .endm - .macro chest type, id, item, subnum, tileset_id + .macro chest type, id, item, subnum, tileSet_id .2byte (\map_x) << 4 .2byte (\map_y) << 4 .2byte \pixel_width .2byte \pixel_height - .2byte \tileset_id + .2byte \tileSet_id .endm .macro delayed_entity_raw subtype:req, paramA=0, paramB=0, layer=0, x=0, y=0, paramC=0, paramD=0, conditions=0 diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 0a2ac5c5..5f43a1e7 100755 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -3,25 +3,25 @@ .set TOP_TILEDATA, gMapTop+0x4 .set TOP_COLLISIONDATA, gMapTop+0x2004 - .set TOP_TILEDATACLONE, gMapTop+0x3004 - .set TOP_METATILETYPES, gMapTop+0x5004 - .set TOP_UNKDATA2, gMapTop+0x6004 - .set TOP_METATILES, gMapTop+0x7004 - .set TOP_UNKDATA3, gMapTop+0xb004 + .set TOP_TILEDATAORIGINAL, gMapTop+0x3004 + .set TOP_TILETYPES, gMapTop+0x5004 + .set TOP_TILEINDICES, gMapTop+0x6004 + .set TOP_TILES, gMapTop+0x7004 + .set TOP_ACTTILES, gMapTop+0xb004 .set BOTTOM_TILEDATA, gMapBottom+0x4 .set BOTTOM_COLLISIONDATA, gMapBottom+0x2004 - .set BOTTOM_TILEDATACLONE, gMapBottom+0x3004 - .set BOTTOM_METATILETYPES, gMapBottom+0x5004 - .set BOTTOM_UNKDATA2, gMapBottom+0x6004 - .set BOTTOM_METATILES, gMapBottom+0x7004 - .set BOTTOM_UNKDATA3, gMapBottom+0xb004 + .set BOTTOM_TILEDATAORIGINAL, gMapBottom+0x3004 + .set BOTTOM_TILETYPES, gMapBottom+0x5004 + .set BOTTOM_TILEINDICES, gMapBottom+0x6004 + .set BOTTOM_TILES, gMapBottom+0x7004 + .set BOTTOM_ACTTILES, gMapBottom+0xb004 - .macro room_header map_x, map_y, pixel_width, pixel_height, tileset_id + .macro room_header map_x, map_y, pixel_width, pixel_height, tileSet_id .2byte (\map_x) << 4 .2byte (\map_y) << 4 .2byte \pixel_width .2byte \pixel_height - .2byte \tileset_id + .2byte \tileSet_id .endm @@ -31,29 +31,29 @@ .4byte (\compressed << 0x1F) | (\size) .endm - .macro tileset_tiles src_offset, dest, size, compressed, terminator=0 + .macro tileSet_tiles src_offset, dest, size, compressed, terminator=0 map_data \src_offset, \dest, \size, \compressed, \terminator .endm - .macro tileset_palette_set id, terminator=0 + .macro tileSet_palette_set id, terminator=0 .4byte (!(\terminator) << 0x1F) | (\id) .4byte 0x0 .4byte 0x0 .endm - .macro metatiles_bottom src_offset, size, compressed, terminator=0 + .macro tiles_bottom src_offset, size, compressed, terminator=0 map_data \src_offset, gMapBottom+0x7004, \size, \compressed, \terminator .endm - .macro metatiles_top src_offset, size, compressed, terminator=0 + .macro tiles_top src_offset, size, compressed, terminator=0 map_data \src_offset, gMapTop+0x7004, \size, \compressed, \terminator .endm - .macro metatile_types_bottom src_offset, size, compressed, terminator=0 + .macro tile_types_bottom src_offset, size, compressed, terminator=0 map_data \src_offset, gMapBottom+0x5004, \size, \compressed, \terminator .endm - .macro metatile_types_top src_offset, size, compressed, terminator=0 + .macro tile_types_top src_offset, size, compressed, terminator=0 map_data \src_offset, gMapTop+0x5004, \size, \compressed, \terminator .endm diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc index 7d0ba66a..5adcf2fb 100644 --- a/asm/macros/scripts.inc +++ b/asm/macros/scripts.inc @@ -635,27 +635,27 @@ .2byte \c .endm -.macro _0807EDD4 a:req, b:req +.macro MoveTo a:req, b:req .2byte 0x0c73 .2byte \a .2byte \b .endm -.macro _0807EE04 a:req, b:req +.macro LookAt a:req, b:req .2byte 0x0c74 .2byte \a .2byte \b .endm -.macro _0807EE30 +.macro MoveTowardsTarget .2byte 0x0475 .endm -.macro _0807EEB4 +.macro MoveToPlayer .2byte 0x0476 .endm -.macro _0807EEF4 a:req, b:req +.macro MoveToOffset a:req, b:req .2byte 0x0c77 .2byte \a .2byte \b diff --git a/asm/src/code_08000F10.s b/asm/src/code_08000F10.s index 7ecc84d5..1cdcab60 100644 --- a/asm/src/code_08000F10.s +++ b/asm/src/code_08000F10.s @@ -26,7 +26,7 @@ _08000F18: bpl _08000F18 pop {r4, r5, r6} bx lr - + // sum 3 drop probabilities, clamp to 0, return scalar sum thumb_func_start SumDropProbabilities2 SumDropProbabilities2: @ 0x08000F2C diff --git a/asm/src/code_08003FC4.s b/asm/src/code_08003FC4.s index cf5a3f86..d244179e 100644 --- a/asm/src/code_08003FC4.s +++ b/asm/src/code_08003FC4.s @@ -210,7 +210,7 @@ _080040F2: movs r3, #0x38 ldrb r3, [r0, r3] lsls r3, r3, #2 - ldr r4, _08004380 @ =gUnk_08000248 + ldr r4, _08004380 @ =gCollisionDataPtrs ldr r3, [r4, r3] ldrb r4, [r3, r2] pop {r2, r3} @@ -403,7 +403,7 @@ _0800423C: movs r4, #0x38 ldrb r4, [r0, r4] lsls r4, r4, #3 - ldr r3, _08004394 @ =gUnk_08000228 + ldr r3, _08004394 @ =gMapDataPtrs adds r3, r3, r4 ldr r4, [r3] ldrh r1, [r4, r2] @@ -610,12 +610,12 @@ _08004370: .4byte 0x0000011E _08004374: .4byte gRoomControls + 6 _08004378: .4byte gRoomControls + 8 _0800437C: .4byte 0x000003F0 -_08004380: .4byte gUnk_08000248 +_08004380: .4byte gCollisionDataPtrs _08004384: .4byte 0x000FFFFF _08004388: .4byte 0x00080000 _0800438C: .4byte 0x0000EE00 _08004390: .4byte 0x00001FFF -_08004394: .4byte gUnk_08000228 +_08004394: .4byte gMapDataPtrs _08004398: .4byte 0x00004000 _0800439C: .4byte gSpritePtrs _080043A0: .4byte gSpritePtrs diff --git a/asm/src/code_080043E8.s b/asm/src/code_080043E8.s index fa2ddead..8442e031 100644 --- a/asm/src/code_080043E8.s +++ b/asm/src/code_080043E8.s @@ -185,7 +185,7 @@ _08004516: thumb_func_start sub_0800451C sub_0800451C: @ 0x0800451C push {r0, lr} - bl GetActTile + bl GetActTileAtEntity adds r1, r0, #0 pop {r0, r3} mov lr, r3 @@ -301,8 +301,8 @@ CalculateDirectionTo: @ 0x080045D4 ldr r3, _08004694 @ =ram_CalcCollisionDirection bx r3 - non_word_aligned_thumb_func_start CalcOffsetAngle -CalcOffsetAngle: @ 0x080045DA + non_word_aligned_thumb_func_start CalculateDirectionFromOffsets +CalculateDirectionFromOffsets: @ 0x080045DA push {r0, r1, r4, r5, r6, lr} movs r6, #0x40 cmp r0, #0 @@ -382,44 +382,3 @@ _08004694: .4byte ram_CalcCollisionDirection _08004698: .4byte gUnk_080C93E0 _0800469C: .4byte 0x00000106 _080046A0: .4byte 0x00000280 - -gUnk_080046A4:: @ 080046A4 - .incbin "code_080043E8/gUnk_080046A4.bin" - -gUnk_080047F6:: @ 080047F6 - .incbin "code_080043E8/gUnk_080047F6.bin" - -@ TODO PlayerMacros - -gUnk_080049D6:: @ 080049D6 - .incbin "code_080043E8/gUnk_080049D6.bin" - -gUnk_080049F6:: @ 080049F6 - .incbin "code_080043E8/gUnk_080049F6.bin" - -gUnk_080049FE:: @ gUnk_080049FE - .incbin "code_080043E8/gUnk_080049FE.bin" - -gUnk_08004A0C:: @ 08004A0C - .incbin "code_080043E8/gUnk_08004A0C.bin" - -gUnk_08004A16:: @ 08004A16 - .incbin "code_080043E8/gUnk_08004A16.bin" - -gUnk_08004A24:: @ 08004A24 - .incbin "code_080043E8/gUnk_08004A24.bin" - -gUnk_08004A32:: @ 08004A32 - .incbin "code_080043E8/gUnk_08004A32.bin" - -gUnk_08004A48:: @ 08004A48 - .incbin "code_080043E8/gUnk_08004A48.bin" - -gUnk_08004A72:: @ 08004A72 - .incbin "code_080043E8/gUnk_08004A72.bin" - -gUnk_08004A8C:: @ 08004A8C - .incbin "code_080043E8/gUnk_08004A8C.bin" - -gUnk_08004AA6:: @ 08004AA6 - .incbin "code_080043E8/gUnk_08004AA6.bin" diff --git a/asm/src/code_08007CAC.s b/asm/src/code_08007CAC.s index 146e4ac7..3f430e6e 100644 --- a/asm/src/code_08007CAC.s +++ b/asm/src/code_08007CAC.s @@ -5,48 +5,42 @@ .text -gUnk_08007CAC:: @ 08007CAC - .incbin "code_080043E8/gUnk_08007CAC.bin" -.ifdef DEMO_JP -@ TODO only one byte differs - .incbin "code_080043E8/gUnk_08007CAC_1_DEMO_JP.bin" -.else -.ifdef DEMO_USA -@ TODO only one byte differs - .incbin "code_080043E8/gUnk_08007CAC_2_DEMO_USA.bin" -.else -.ifdef JP -@ TODO only one byte differs - .incbin "code_080043E8/gUnk_08007CAC_3_JP.bin" -.else -.ifdef EU -@ TODO only two bytes differ - .incbin "code_080043E8/gUnk_08007CAC_4_EU.bin" -.else - .incbin "code_080043E8/gUnk_08007CAC_5_USA.bin" -.endif -.endif -.endif -.endif +// TODO cannot add this at the end of mapActTileToSurfaceType.c due to alignment? +.2byte 0 - non_word_aligned_thumb_func_start ActTileToTile -ActTileToTile: @ 0x08007DD6 +// TODO unused? might also be code? +gUnk_08007DBE:: @ 08007DBE + .byte 0x42, 0x7b, 0x01, 0x32, 0x42, 0x73, 0x70, 0x47, 0x02, 0x73, 0x00, 0x23, 0x43, 0x73, 0x0b, 0x73 + + // seems unused? + non_word_aligned_thumb_func_start sub_08007DCE +sub_08007DCE: push {lr} - bl ActTileConv - adds r0, r3, #0 + bl DoPlayerAction pop {pc} - thumb_func_start ActTileConv -ActTileConv: @ 0x08007DE0 + +// Searches for a KeyValuePair with the key in the keyValuePairList and returns its value. Returns 0 if the key is not found. +// r0: key +// r1: keyValuePairList + non_word_aligned_thumb_func_start FindValueForKey +FindValueForKey: @ 0x08007DD6 + push {lr} + bl FindEntryForKey + adds r0, r3, #0 // move the found value into r0 + pop {pc} + + thumb_func_start FindEntryForKey +FindEntryForKey: @ 0x08007DE0 subs r1, #4 _08007DE2: - adds r1, #4 - ldrh r3, [r1] - cmp r3, #0 // reached end - beq _08007DF2 - cmp r0, r3 // equal - bne _08007DE2 - ldrh r3, [r1, #2] - movs r2, #1 + adds r1, #4 // add +4 to r1 at the end of loop + ldrh r3, [r1] // r3: key + cmp r3, #0 + beq _08007DF2 // key == 0 -> end of map + cmp r0, r3 + bne _08007DE2 // r3 == r0 -> found + ldrh r3, [r1, #2] // r3: value + movs r2, #1 // r2 = 1 _08007DF2: bx lr diff --git a/asm/src/intr.s b/asm/src/intr.s index 86ec0618..a82a6364 100644 --- a/asm/src/intr.s +++ b/asm/src/intr.s @@ -10,6 +10,7 @@ .global RAMFUNCS_BASE RAMFUNCS_BASE:: +@ Called when gUpdateVisibleTiles == 1 sub_080B197C:: @ 0x080B197C push {r4, r5, r6} ldr r2, _080B19C0 @ =gRoomControls @@ -77,37 +78,36 @@ arm_sub_080B1A04: ldr r2, _080B1C14 @ =gUnk_08000258 b _080B1A64 - arm_func_start arm_sub_080B1A0C -arm_sub_080B1A0C: @ 0x080B1A0C + arm_func_start arm_GetTileTypeRelativeToEntity +arm_GetTileTypeRelativeToEntity: @ 0x080B1A0C ldrh r3, [r0, #0x2e] add r3, r3, r1 ldrh r1, [r0, #0x32] add r1, r1, r2 ldrb r2, [r0, #0x38] mov r0, r3 - b arm_GetTileTypeByPos -arm_GetTileTypeByEntity: // GetCell + b arm_GetTileTypeAtWorldCoords +arm_GetTileTypeAtEntity: // GetCell ldrb r2, [r0, #0x38] ldrh r1, [r0, #0x32] ldrh r0, [r0, #0x2e] -arm_GetTileTypeByPos: +arm_GetTileTypeAtWorldCoords: ldr ip, _080B1C18 @ =gRoomControls ldrh r3, [ip, #6] sub r0, r0, r3 ldrh r3, [ip, #8] sub r1, r1, r3 -arm_sub_080B1A48: +arm_GetTileTypeAtRoomCoords: lsl r0, r0, #0x16 lsr r0, r0, #0x1a lsl r1, r1, #0x16 lsr r1, r1, #0x1a -arm_sub_080B1A58: +arm_GetTileTypeAtRoomTile: add r0, r0, r1, lsl #6 mov r1, r2 - - arm_func_start arm_GetTileType -arm_GetTileType: @ 0x080B1A60 - ldr r2, _080B1C1C @ =gUnk_08000228 + arm_func_start arm_GetTileTypeAtTilePos +arm_GetTileTypeAtTilePos: @ 0x080B1A60 + ldr r2, _080B1C1C @ =gMapDataPtrs _080B1A64: add r2, r2, r1, lsl #3 ldr r1, [r2] @@ -120,81 +120,82 @@ _080B1A64: ldrh r0, [r1, r0] bx lr - arm_func_start arm_GetActTileRelative -arm_GetActTileRelative: @ 0x080B1A8C +// entity plus offset to world pixel coordinates and layer + arm_func_start arm_GetActTileRelativeToEntity +arm_GetActTileRelativeToEntity: @ 0x080B1A8C ldrh r3, [r0, #0x2e] add r3, r3, r1 ldrh r1, [r0, #0x32] add r1, r1, r2 ldrb r2, [r0, #0x38] mov r0, r3 - b arm_sub_080B1AB4 -arm_GetActTile: // GetCellAct + b arm_GetActTileAtWorldCoords +// entity to world pixel coordinates and layer +arm_GetActTileAtEntity: // GetCellAct ldrb r2, [r0, #0x38] ldrh r1, [r0, #0x32] ldrh r0, [r0, #0x2e] -arm_sub_080B1AB4: +arm_GetActTileAtWorldCoords: @ world pixel coordinates to room pixel coordinates ldr ip, _080B1C20 @ =gRoomControls ldrh r3, [ip, #6] sub r0, r0, r3 ldrh r3, [ip, #8] sub r1, r1, r3 -arm_sub_080B1AC8: +arm_GetActTileAtRoomCoords: @ room pixel coordinates to room tile coordinates lsl r0, r0, #0x16 lsr r0, r0, #0x1a lsl r1, r1, #0x16 lsr r1, r1, #0x1a -arm_sub_080B1AD8: +arm_GetActTileAtRoomTile: add r0, r0, r1, lsl #6 - mov r1, r2 -arm_sub_080B1AE0: - ldr r2, _080B1C24 @ =gUnkDataPtrs + mov r1, r2 @ move layer to r1 +arm_GetActTileAtTilePos: + ldr r2, _080B1C24 @ =gActTilePtrs ldr r2, [r2, r1, lsl #2] ldrb r0, [r2, r0] bx lr - arm_func_start arm_sub_080B1AF0 -arm_sub_080B1AF0: @ 0x080B1AF0 + arm_func_start arm_GetCollisionDataRelativeTo +arm_GetCollisionDataRelativeTo: @ 0x080B1AF0 @ r0 = entity* @ r1 = x @ r2 = y - ldrh r3, [r0, #0x2e] @ ent.x + x add r3, r3, r1 ldrh r1, [r0, #0x32] @ ent.y + y add r1, r1, r2 ldrb r2, [r0, #0x38] @ ent.layer mov r0, r3 - b arm_sub_080B1B18 -arm_sub_080B1B0C: // GetCellAtt + b arm_GetCollisionDataAtWorldCoords +arm_GetCollisionDataAtEntity: // GetCellAtt ldrb r2, [r0, #0x38] @ ent.layer ldrh r1, [r0, #0x32] @ ent.y ldrh r0, [r0, #0x2e] @ ent.x -arm_sub_080B1B18: +arm_GetCollisionDataAtWorldCoords: ldr ip, _080B1C28 @ =gRoomControls ldrh r3, [ip, #6] sub r0, r0, r3 @ ent.x - gRoomControls.origin_x ldrh r3, [ip, #8] sub r1, r1, r3 @ ent.y - gRoomControls.origin_y -arm_sub_080B1B2C: +arm_GetCollisionDataAtRoomCoords: lsl r0, r0, #0x16 lsr r0, r0, #0x1a @ /= 16 lsl r1, r1, #0x16 lsr r1, r1, #0x1a @ /= 16 -arm_sub_080B1B3C: - add r0, r0, r1, lsl #6 @ convert coords to tile index +arm_GetCollisionDataAtRoomTile: + add r0, r0, r1, lsl #6 @ convert coords to tile pos mov r1, r2 -arm_sub_080B1B44: - ldr r2, _080B1C2C @ =gUnk_08000248 +arm_GetCollisionDataAtTilePos: + ldr r2, _080B1C2C @ =gCollisionDataPtrs ldr r1, [r2, r1, lsl #2] ldrb r0, [r1, r0] @ load collision tile at my location bx lr - arm_func_start arm_sub_080B1B54 -arm_sub_080B1B54: @ 0x080B1B54 + arm_func_start arm_GetActTileForTileType +arm_GetActTileForTileType: @ 0x080B1B54 lsls r0, r0, #0x12 - ldrlo r1, _080B1C30 @ =gUnk_080B37A0 - ldrhs r1, _080B1C34 @ =gUnk_080B7910 + ldrlo r1, _080B1C30 @ =gMapTileTypeToActTile + ldrhs r1, _080B1C34 @ =gMapSpecialTileToActTile ldrb r0, [r1, r0, lsr #18] bx lr @@ -202,7 +203,7 @@ arm_sub_080B1B54: @ 0x080B1B54 arm_sub_080B1B68: @ 0x080B1B68 lsrs r2, r0, #0xe bxne lr - ldr r2, _080B1C38 @ =gUnk_0800022C + ldr r2, _080B1C38 @ =gTileTypesPtrs ldr r1, [r2, r1, lsl #3] lsl r0, r0, #1 ldrh r0, [r1, r0] @@ -211,7 +212,7 @@ arm_sub_080B1B68: @ 0x080B1B68 arm_func_start arm_sub_080B1B84 arm_sub_080B1B84: @ 0x080B1B84 mov ip, lr - bl arm_GetTileType + bl arm_GetTileTypeAtTilePos lsls r0, r0, #0x12 ldrlo r1, _080B1C3C @ =gUnk_08000360 ldrhs r1, _080B1C40 @ =gUnk_080B7A3E @@ -223,7 +224,7 @@ arm_sub_080B1B84: @ 0x080B1B84 arm_sub_080B1BA4: @ 0x080B1BA4 mov ip, lr mov r3, r2 - bl arm_GetTileType + bl arm_GetTileTypeAtTilePos lsls r0, r0, #0x12 ldrlo r1, _080B1C44 @ =gUnk_08000360 ldrhs r1, _080B1C48 @ =gUnk_080B7A3E @@ -246,7 +247,7 @@ sub_080B1BCC: @ 0x080B1BCC and r1, r1, #0x3f0 and r2, r2, #0x3f0 add r1, r1, r2, lsl #6 - ldr r2, _080B1C50 @ =gUnkDataPtrs + ldr r2, _080B1C50 @ =gActTilePtrs ldrb r3, [r0, #0x38] ldr r2, [r2, r3, lsl #2] ldrb r0, [r2, r1, lsr #4] @@ -255,20 +256,20 @@ sub_080B1BCC: @ 0x080B1BCC _080B1C10: .4byte gRoomControls _080B1C14: .4byte gUnk_08000258 _080B1C18: .4byte gRoomControls -_080B1C1C: .4byte gUnk_08000228 +_080B1C1C: .4byte gMapDataPtrs _080B1C20: .4byte gRoomControls -_080B1C24: .4byte gUnkDataPtrs +_080B1C24: .4byte gActTilePtrs _080B1C28: .4byte gRoomControls -_080B1C2C: .4byte gUnk_08000248 -_080B1C30: .4byte gUnk_080B37A0 -_080B1C34: .4byte gUnk_080B7910 -_080B1C38: .4byte gUnk_0800022C +_080B1C2C: .4byte gCollisionDataPtrs +_080B1C30: .4byte gMapTileTypeToActTile +_080B1C34: .4byte gMapSpecialTileToActTile +_080B1C38: .4byte gTileTypesPtrs _080B1C3C: .4byte gUnk_08000360 _080B1C40: .4byte gUnk_080B7A3E _080B1C44: .4byte gUnk_08000360 _080B1C48: .4byte gUnk_080B7A3E _080B1C4C: .4byte gRoomControls -_080B1C50: .4byte gUnkDataPtrs +_080B1C50: .4byte gActTilePtrs arm_func_start UpdateCollision UpdateCollision: @ 0x080B1C54 @@ -1722,7 +1723,7 @@ _080B1FBC: mov r3, #0 bl arm_CheckBitsEU mov r5, #0 - ldr r4, _080B2194 @ =0x03003DF8 + ldr r4, _080B2194 @ =gInteractableObjects _080B1FECEU: ldr r0, [r4, #8] cmp r0, #0 @@ -1838,7 +1839,7 @@ _080B1FBC: mov r3, #0 bl arm_CheckBitsEU mov r5, #0 - ldr r4, _080B2194 @ =0x03003DF8 + ldr r4, _080B2194 @ =gInteractableObjects _080B1FECEU: ldr r0, [r4, #8] cmp r0, #0 @@ -1965,8 +1966,8 @@ _080B2A64: .4byte gOAMControls _080B2A68: .4byte ram_0x80b2be8 _080B2A6C: .4byte 0x3E003F00 .ifdef EU -_080B2194: .4byte 0x03003DF8 @TODO pointer? +_080B2194: .4byte gInteractableObjects .endif .ifdef DEMO_JP @ TODO deduplicate same as EU -_080B2194: .4byte 0x03003DF8 @TODO pointer? +_080B2194: .4byte gInteractableObjects .endif diff --git a/asm/src/player.s b/asm/src/player.s index 488fdbaa..f99cde9f 100644 --- a/asm/src/player.s +++ b/asm/src/player.s @@ -205,7 +205,7 @@ sub_080086D8: @ 0x080086D8 movs r3, #0x38 ldrb r3, [r2, r3] lsls r3, r3, #2 - ldr r1, _080088C4 @ =gUnk_08000248 + ldr r1, _080088C4 @ =gCollisionDataPtrs ldr r1, [r1, r3] ldrb r2, [r0, r1] push {r2} @@ -326,9 +326,9 @@ DoTileInteraction: @ 0x08008796 adds r1, r7, #0 movs r2, #0x38 ldrb r2, [r4, r2] // collision layer - bl GetTileTypeByPos + bl GetTileTypeAtWorldCoords ldr r1, _080088D8 @ =gUnk_080046A4 - bl ActTileConv + bl FindEntryForKey beq _080087CE_return0 lsls r1, r3, #3 adds r3, r5, #0 @@ -417,7 +417,7 @@ after_create_obj: beq _08008876 push {r0, r1} adds r0, r2, #0 - bl GetTileBuffer + bl GetLayerByIndex adds r3, r0, #4 pop {r0, r1} lsls r1, r1, #1 @@ -451,7 +451,7 @@ _080088B4: .4byte gRoomControls + 6 _080088B8: .4byte gRoomControls + 8 _080088BC: .4byte gPlayerEntity _080088C0: .4byte 0x000003F0 -_080088C4: .4byte gUnk_08000248 +_080088C4: .4byte gCollisionDataPtrs _080088C8: .4byte gPlayerState _080088CC: .4byte gUnk_0800823C _080088D0: .4byte gUnk_08007DF4 @@ -758,13 +758,13 @@ CheckNEastTile: @ 0x08008B02 push {r0, r1, lr} movs r1, #0 movs r2, #0 - bl GetActTileRelative + bl GetActTileRelativeToEntity // check if north east collision? ldr r1, =0x4000 tst r0, r1 bne _08008B1E - ldr r1, =gUnk_08007CAC - bl ActTileConv + ldr r1, =gMapActTileToSurfaceType + bl FindEntryForKey movs r2, #1 cmp r3, #1 beq _08008B20 diff --git a/asm/src/script.s b/asm/src/script.s index fd37d8f8..25d62798 100644 --- a/asm/src/script.s +++ b/asm/src/script.s @@ -46,7 +46,7 @@ gShakeOffsets:: .byte 0, -1, 0, -2, 0, -1, 0, 0, 0, 1, 0, 2, 0, 0, 0, 1 .byte 2, 0, 1, 0, 0, 0, -1, 0, -1, 0, -1, 0, 0, 0, 1, 0 -UpdateSpriteForCollisionLayer:: +UpdateSpriteForCollisionLayer:: @ 0x08016A04 movs r1, #0x38 ldrb r1, [r0, r1] lsls r1, r1, #1 @@ -78,11 +78,11 @@ ResolveCollisionLayer:: ldrh r0, [r4, #0x2e] ldrh r1, [r4, #0x32] movs r2, #2 - bl GetTileTypeByPos + bl GetTileTypeAtWorldCoords movs r3, #1 cmp r0, #0 beq _08016A62 - bl sub_080B1B54 + bl GetActTileForTileType movs r3, #2 add r1, pc, #0x40 _08016A54: @@ -103,7 +103,7 @@ _08016A64: CheckOnLayerTransition:: push {r4, r5, lr} adds r4, r0, #0 - bl GetActTile // tile under me + bl GetActTileAtEntity // tile under me adr r1, gTransitionTiles-4 loop: adds r1, #4 // p += 4 diff --git a/asm/src/veneer.s b/asm/src/veneer.s index 45ffb90a..420ab8b4 100644 --- a/asm/src/veneer.s +++ b/asm/src/veneer.s @@ -5,19 +5,20 @@ .text +@ copies from the gMapDataBottomSpecial to the bg buffers depending on gUpdateVisibleTiles thumb_func_start UpdateScrollVram UpdateScrollVram: @ 0x08000108 push {r4, lr} ldr r0, _080001E8 @ =gUpdateVisibleTiles ldrb r1, [r0] lsls r1, r1, #2 - beq _08000136 - add r4, pc, #0x20 - ldr r4, [r4, r1] + beq _08000136 @ jump if gUpdateVisibleTiles == 0 + add r4, pc, #0x20 @ r4 = 0x8000134 + ldr r4, [r4, r1] @ r4 = r4[gUpdateVisibleTiles] (1: _08000138, 2: _0800013C, 3: _08000140, 4:_08000144) ldr r0, _080001EC @ =gMapBottom ldr r0, [r0] cmp r0, #0 - beq _08000126 + beq _08000126 @ jump if gMapBottom.bgSettings == NULL ldr r0, _080001F0 @ =gMapDataBottomSpecial ldr r1, _080001F4 @ =gBG1Buffer+0x40 bl _call_via_r4 @@ -25,7 +26,7 @@ _08000126: ldr r0, _080001F8 @ =gMapTop ldr r0, [r0] cmp r0, #0 - beq _08000136 + beq _08000136 @ jump if gMapTop.bgSettings == NULL ldr r0, _080001FC @ =gMapDataTopSpecial ldr r1, _08000200 @ =gBG2Buffer+0x40 bl _call_via_r4 @@ -37,10 +38,10 @@ _0800013C: .4byte sub_0807D280 @ layer 1, 2, 3? _08000140: .4byte sub_0807D46C _08000144: .4byte sub_0807D6D8 - thumb_func_start sub_08000148 -sub_08000148: @ 0x08000148 + thumb_func_start SetCollisionData +SetCollisionData: @ 0x08000148 lsls r2, r2, #2 - ldr r3, _08000204 @ =gUnk_08000248 + ldr r3, _08000204 @ =gCollisionDataPtrs ldr r2, [r3, r2] strb r0, [r2, r1] bx lr @@ -54,47 +55,47 @@ CloneTile: @ 0x08000152 ldrh r0, [r3, r0] lsrs r2, r2, #2 - non_word_aligned_thumb_func_start SetBottomTile -SetBottomTile: @ r0 = tile type, r1, = tile position, r2 = layer + non_word_aligned_thumb_func_start SetTile +SetTile: @ r0 = tile index, r1, = tile position, r2 = layer push {r4-r7, lr} - lsls r3, r2, #3 - ldr r4, _08000208 @ =gUnk_08000228 - ldr r5, [r4, r3] + lsls r3, r2, #3 @ 1: 8, 2: 16 + ldr r4, _08000208 @ =gMapDataPtrs + ldr r5, [r4, r3] @ layer 1: gMapBottom.mapData, 2: gMapTop.mapData lsls r6, r1, #1 - ldrh r7, [r5, r6] - strh r0, [r5, r6] + ldrh r7, [r5, r6] @ r7 (oldTile) = gMapBottom.mapData[tilePos] + strh r0, [r5, r6] @ gMapBottom.mapData[tilePos] = tileIndex ldr r6, _0800020C @ =0x00004000 cmp r0, r6 - blo tile_wrong_type + blo tile_wrong_type @ jump if tileIndex < 0x4000 push {r1, r2} - subs r4, r0, r6 - ldr r3, _08000210 @ =gUnk_080B7910 - ldrb r0, [r3, r4] - bl sub_080001D0 - ldr r3, _08000214 @ =gUnk_080B79A7 - ldrb r0, [r3, r4] - lsrs r2, r2, #2 - bl sub_08000148 + subs r4, r0, r6 @ r4 = tileIndex - 0x4000 + ldr r3, _08000210 @ =gMapSpecialTileToActTile + ldrb r0, [r3, r4] @ r0 = gMapSpecialTileToActTile[tileIndex - 0x4000] + bl SetActTileAtTilePos + ldr r3, _08000214 @ =gMapSpecialTileToCollisionData + ldrb r0, [r3, r4] @ r0 = gMapSpecialTileToCollisionData[tileIndex - 0x4000] + lsrs r2, r2, #2 @ r2 = layer + bl SetCollisionData pop {r0, r1} @ tilepos, layer push {r0, r1} - bl UnregisterInteractTile - adds r0, r7, #0 + bl UnregisterInteractTile @ DeleteLoadedTileEntity(tilePos, layer) + adds r0, r7, #0 @ r0 = oldTile pop {r1, r2} - bl RegisterInteractTile - pop {r4, r5, r6, r7, pc} + bl RegisterInteractTile @ StoreTileForSpecialTile(oldTile, tilePos, layer) + pop {r4, r5, r6, r7, pc} @ pop pc results in returning to the calling function tile_wrong_type: - adds r3, #4 + adds r3, #4 @ r3 = layer * 8 + 4 ldr r4, [r4, r3] - lsls r0, r0, #1 - ldrh r4, [r4, r0] + lsls r0, r0, #1 @ r0 = tileIndex * 2 + ldrh r4, [r4, r0] @ r4 (tileType) = gMapBottom.tileTypes[tileIndex] push {r1, r2} - ldr r3, _08000218 @ =gUnk_080B37A0 - ldrb r0, [r3, r4] - bl sub_080001D0 - ldr r3, _0800021C @ =gUnk_080B3E80 - ldrb r0, [r3, r4] - lsrs r2, r2, #2 - bl sub_08000148 + ldr r3, _08000218 @ =gMapTileTypeToActTile + ldrb r0, [r3, r4] @ r0 = gMapTileTypeToActTile[tileType] + bl SetActTileAtTilePos + ldr r3, _0800021C @ =gMapTileTypeToCollisionData + ldrb r0, [r3, r4] @ r0 = gMapTileTypeToCollisionData[tileType] + lsrs r2, r2, #2 @ r2 = layer + bl SetCollisionData pop {r0, r1} bl UnregisterInteractTile pop {r4, r5, r6, r7, pc} @@ -104,18 +105,19 @@ _080001C4: .4byte gMapBottom+0x6004 _080001C8: .4byte gMapTop+0x6004 _080001CC: .4byte gMapBottom+0x6004 - thumb_func_start sub_080001D0 -sub_080001D0: @ 0x080001D0 +@ r0: @see gMapSpecialTileToActTile r1: tilePos, r2: layer + thumb_func_start SetActTileAtTilePos +SetActTileAtTilePos: @ 0x080001D0 lsls r2, r2, #2 - ldr r3, _08000220 @ =gUnkDataPtrs - ldr r3, [r3, r2] - strb r0, [r3, r1] + ldr r3, _08000220 @ =gActTilePtrs + ldr r3, [r3, r2] @ r3 = gMapBottom.actTiles + strb r0, [r3, r1] @ gMapBottom.actTiles[tilePos] = r0 bx lr non_word_aligned_thumb_func_start GetTileIndex GetTileIndex: @ 0x080001DA lsls r1, r1, #3 - ldr r2, _08000224 @ =gUnk_08000228 + ldr r2, _08000224 @ =gMapDataPtrs ldr r1, [r2, r1] lsls r0, r0, #1 ldrh r0, [r1, r0] @@ -128,44 +130,45 @@ _080001F4: .4byte gBG1Buffer+0x40 _080001F8: .4byte gMapTop _080001FC: .4byte gMapDataTopSpecial _08000200: .4byte gBG2Buffer+0x40 -_08000204: .4byte gUnk_08000248 -_08000208: .4byte gUnk_08000228 +_08000204: .4byte gCollisionDataPtrs +_08000208: .4byte gMapDataPtrs _0800020C: .4byte 0x00004000 -_08000210: .4byte gUnk_080B7910 -_08000214: .4byte gUnk_080B79A7 -_08000218: .4byte gUnk_080B37A0 -_0800021C: .4byte gUnk_080B3E80 -_08000220: .4byte gUnkDataPtrs -_08000224: .4byte gUnk_08000228 -gUnk_08000228:: - .4byte BOTTOM_TILEDATA -gUnk_0800022C:: - .4byte BOTTOM_METATILETYPES - .4byte BOTTOM_TILEDATA - .4byte BOTTOM_METATILETYPES - .4byte TOP_TILEDATA - .4byte TOP_METATILETYPES - .4byte BOTTOM_TILEDATA - .4byte BOTTOM_METATILETYPES -gUnk_08000248:: - .4byte BOTTOM_COLLISIONDATA - .4byte BOTTOM_COLLISIONDATA - .4byte TOP_COLLISIONDATA - .4byte BOTTOM_COLLISIONDATA -gUnk_08000258:: - .4byte BOTTOM_TILEDATACLONE - .4byte BOTTOM_METATILETYPES - .4byte BOTTOM_TILEDATACLONE - .4byte BOTTOM_METATILETYPES - .4byte TOP_TILEDATACLONE - .4byte TOP_METATILETYPES - .4byte BOTTOM_TILEDATACLONE - .4byte BOTTOM_METATILETYPES -gUnkDataPtrs:: - .4byte BOTTOM_UNKDATA3 - .4byte BOTTOM_UNKDATA3 - .4byte TOP_UNKDATA3 - .4byte BOTTOM_UNKDATA3 +_08000210: .4byte gMapSpecialTileToActTile +_08000214: .4byte gMapSpecialTileToCollisionData +_08000218: .4byte gMapTileTypeToActTile +_0800021C: .4byte gMapTileTypeToCollisionData +_08000220: .4byte gActTilePtrs +_08000224: .4byte gMapDataPtrs + +gMapDataPtrs:: + .4byte BOTTOM_TILEDATA @ layer 0 +gTileTypesPtrs:: + .4byte BOTTOM_TILETYPES + .4byte BOTTOM_TILEDATA @ layer 1 + .4byte BOTTOM_TILETYPES + .4byte TOP_TILEDATA @ layer 2 + .4byte TOP_TILETYPES + .4byte BOTTOM_TILEDATA @ layer 3 + .4byte BOTTOM_TILETYPES +gCollisionDataPtrs:: + .4byte BOTTOM_COLLISIONDATA @ layer 0 + .4byte BOTTOM_COLLISIONDATA @ layer 1 + .4byte TOP_COLLISIONDATA @ layer 2 + .4byte BOTTOM_COLLISIONDATA @ layer 3 +gUnk_08000258:: @ mapDataOriginal and tileTypes + .4byte BOTTOM_TILEDATAORIGINAL @ layer 0 + .4byte BOTTOM_TILETYPES + .4byte BOTTOM_TILEDATAORIGINAL @ layer 1 + .4byte BOTTOM_TILETYPES + .4byte TOP_TILEDATAORIGINAL @ layer 2 + .4byte TOP_TILETYPES + .4byte BOTTOM_TILEDATAORIGINAL @ layer 3 + .4byte BOTTOM_TILETYPES +gActTilePtrs:: @ actTile for layers + .4byte BOTTOM_ACTTILES @ layer 0 + .4byte BOTTOM_ACTTILES @ layer 1 + .4byte TOP_ACTTILES @ layer 2 + .4byte BOTTOM_ACTTILES @ layer 3 @ call 0x80B19CC @ ======== @@ -211,17 +214,17 @@ sub_080B1A04: @ 0x08000298 @ r0: entity* @ r1: s32 @ r2: s32 - thumb_func_start sub_080B1A0C -sub_080B1A0C: @ 0x0800029C - ldr r3, _08000308 @ =ram_sub_080B1A0C + thumb_func_start GetTileTypeRelativeToEntity +GetTileTypeRelativeToEntity: @ 0x0800029C + ldr r3, _08000308 @ =ram_GetTileTypeRelativeToEntity bx r3 @ call 0x080B1A28 @ r0: entity @ return: u32 (tileType) - thumb_func_start GetTileTypeByEntity -GetTileTypeByEntity: @ 0x080002A0 - ldr r3, _0800030C @ =ram_GetTileTypeByEntity + thumb_func_start GetTileTypeAtEntity +GetTileTypeAtEntity: @ 0x080002A0 + ldr r3, _0800030C @ =ram_GetTileTypeAtEntity bx r3 @ call 0x080B1A34 @@ -229,35 +232,35 @@ GetTileTypeByEntity: @ 0x080002A0 @ r1: s32 (yPos) @ r2: u32 (layer) @ return: u32 (tileType) - thumb_func_start GetTileTypeByPos -GetTileTypeByPos: @ 0x080002A4 - ldr r3, _08000310 @ =ram_GetTileTypeByPos + thumb_func_start GetTileTypeAtWorldCoords +GetTileTypeAtWorldCoords: @ 0x080002A4 + ldr r3, _08000310 @ =ram_GetTileTypeAtWorldCoords bx r3 @ call 0x080B1A48 @ r0: s32 (xPos) @ r1: s32 (yPos) @ r2: u32 (layer) - thumb_func_start sub_080B1A48 -sub_080B1A48: @ 0x080002A8 - ldr r3, _08000314 @ =ram_sub_080B1A48 + thumb_func_start GetTileTypeAtRoomCoords +GetTileTypeAtRoomCoords: @ 0x080002A8 + ldr r3, _08000314 @ =ram_GetTileTypeAtRoomCoords bx r3 @ call 0x080B1A58 @ r0: s32 (xPos) @ r1: s32 (yPos) @ r2: u32 (layer) - thumb_func_start sub_080B1A58 -sub_080B1A58: @ 0x080002AC - ldr r3, _08000318 @ =ram_sub_080B1A58 + thumb_func_start GetTileTypeAtRoomTile +GetTileTypeAtRoomTile: @ 0x080002AC + ldr r3, _08000318 @ =ram_GetTileTypeAtRoomTile bx r3 @ call 0x080B1A60 @ r0: u32 (tileIndex) @ r1: u32 (layer) @ return: u32 (tileType) - thumb_func_start GetTileType -GetTileType: @ 0x080002B0 + thumb_func_start GetTileTypeAtTilePos +GetTileTypeAtTilePos: @ 0x080002B0 ldr r3, _0800031C @ =ram_GetTileType bx r3 @@ -265,9 +268,9 @@ GetTileType: @ 0x080002B0 @ r0: Entity* @ r1: u32 @ r2: u32 - thumb_func_start GetActTileRelative -GetActTileRelative: @ 0x080002B4 - ldr r3, _08000320 @ =ram_GetActTileRelative + thumb_func_start GetActTileRelativeToEntity +GetActTileRelativeToEntity: @ 0x080002B4 + ldr r3, _08000320 @ =ram_GetActTileRelativeToEntity bx r3 @ call 0x080B1AA8 @@ -277,18 +280,18 @@ GetActTileRelative: @ 0x080002B4 @ return: @ ======== @ Called every frame a pot is thrown, every frame the screen is sliding in a transition, and once when entering stairs. - thumb_func_start GetActTile -GetActTile: @ 0x080002B8 - ldr r3, _08000324 @ =ram_GetActTile + thumb_func_start GetActTileAtEntity +GetActTileAtEntity: @ 0x080002B8 + ldr r3, _08000324 @ =ram_GetActTileAtEntity bx r3 @ call 0x080B1AB4 @ r0: s32 (xPos) @ r1: s32 (yPos) @ r2: u32 (layer) - thumb_func_start sub_080B1AB4 -sub_080B1AB4: @ 0x080002BC - ldr r3, _08000328 @ =ram_sub_080B1AB4 + thumb_func_start GetActTileAtWorldCoords +GetActTileAtWorldCoords: @ 0x080002BC + ldr r3, _08000328 @ =ram_GetActTileAtWorldCoords bx r3 @ call 0x080B1AC8 @@ -296,9 +299,9 @@ sub_080B1AB4: @ 0x080002BC @ r1: u32 @ r2: u32 @ return: ??? - thumb_func_start sub_080B1AC8 -sub_080B1AC8: @ 0x080002C0 - ldr r3, _0800032C @ =ram_sub_080B1AC8 + thumb_func_start GetActTileAtRoomCoords +GetActTileAtRoomCoords: @ 0x080002C0 + ldr r3, _0800032C @ =ram_GetActTileAtRoomCoords bx r3 @ call 0x080B1AD8 @@ -307,71 +310,71 @@ sub_080B1AC8: @ 0x080002C0 @ r2: s32 (yOffset) @ ======== @ Unused? Doesn't seem to be called by anything in Ghidra. - thumb_func_start sub_080B1AD8 -sub_080B1AD8: @ 0x080002C4 - ldr r3, _08000330 @ =ram_sub_080B1AD8 + thumb_func_start GetActTileAtRoomTile +GetActTileAtRoomTile: @ 0x080002C4 + ldr r3, _08000330 @ =ram_GetActTileAtRoomTile bx r3 @ call 0x080B1AE0 @ r0: u32 (tileIndex) @ r1: u32 (layer) - thumb_func_start sub_080B1AE0 -sub_080B1AE0: @ 0x080002C8 - ldr r3, _08000334 @ =ram_sub_080B1AE0 + thumb_func_start GetActTileAtTilePos +GetActTileAtTilePos: @ 0x080002C8 + ldr r3, _08000334 @ =ram_GetActTileAtTilePos bx r3 @ call 0x080B1AF0 @ r0: Entity* @ r1: ??? @ r2: ??? - thumb_func_start sub_080B1AF0 -sub_080B1AF0: @ 0x080002CC - ldr r3, _08000338 @ =ram_sub_080B1AF0 + thumb_func_start GetCollisionDataRelativeTo +GetCollisionDataRelativeTo: @ 0x080002CC + ldr r3, _08000338 @ =ram_GetCollisionDataRelativeTo bx r3 @ call 0x080B1B0C @ r0: Entity* - thumb_func_start sub_080B1B0C -sub_080B1B0C: @ 0x080002D0 - ldr r3, _0800033C @ =ram_sub_080B1B0C + thumb_func_start GetCollisionDataAtEntity +GetCollisionDataAtEntity: @ 0x080002D0 + ldr r3, _0800033C @ =ram_GetCollisionDataAtEntity bx r3 @ call 0x080B1B18 @ r0: s32 (xPos) @ r1: s32 (yPos) @ r2: u32 (layer) - thumb_func_start sub_080B1B18 -sub_080B1B18: @ 0x080002D4 - ldr r3, _08000340 @ =ram_sub_080B1B18 + thumb_func_start GetCollisionDataAtWorldCoords +GetCollisionDataAtWorldCoords: @ 0x080002D4 + ldr r3, _08000340 @ =ram_GetCollisionDataAtWorldCoords bx r3 @ call 0x080B1B2C @ ======== @ Unused? Doesn't seem to be called by anything in Ghidra. - thumb_func_start sub_080B1B2C -sub_080B1B2C: @ 0x080002D8 - ldr r3, _08000344 @ =ram_sub_080B1B2C + thumb_func_start GetCollisionDataAtRoomCoords +GetCollisionDataAtRoomCoords: @ 0x080002D8 + ldr r3, _08000344 @ =ram_GetCollisionDataAtRoomCoords bx r3 @ call 0x080B1B3C @ ======== @ Unused? Doesn't seem to be called by anything in Ghidra. - thumb_func_start sub_080B1B3C -sub_080B1B3C: @ 0x080002DC - ldr r3, _08000348 @ =ram_sub_080B1B3C + thumb_func_start GetCollisionDataAtRoomTile +GetCollisionDataAtRoomTile: @ 0x080002DC + ldr r3, _08000348 @ =ram_GetCollisionDataAtRoomTile bx r3 @ call 0x080B1B44 - thumb_func_start sub_080B1B44 -sub_080B1B44: @ 0x080002E0 - ldr r3, _0800034C @ =ram_sub_080B1B44 + thumb_func_start GetCollisionDataAtTilePos +GetCollisionDataAtTilePos: @ 0x080002E0 + ldr r3, _0800034C @ =ram_GetCollisionDataAtTilePos bx r3 @ call 0x080B1B54 @ r0: u32 (tileIndex) - thumb_func_start sub_080B1B54 -sub_080B1B54: @ 0x080002E4 - ldr r3, _08000350 @ =ram_sub_080B1B54 + thumb_func_start GetActTileForTileType +GetActTileForTileType: @ 0x080002E4 + ldr r3, _08000350 @ =ram_GetActTileForTileType bx r3 @ call 0x080B1B68 @@ -404,25 +407,25 @@ _080002F8: .4byte ram_sub_080B19D8 _080002FC: .4byte ram_sub_080B19EC _08000300: .4byte ram_sub_080B19FC _08000304: .4byte ram_sub_080B1A04 -_08000308: .4byte ram_sub_080B1A0C -_0800030C: .4byte ram_GetTileTypeByEntity -_08000310: .4byte ram_GetTileTypeByPos -_08000314: .4byte ram_sub_080B1A48 -_08000318: .4byte ram_sub_080B1A58 +_08000308: .4byte ram_GetTileTypeRelativeToEntity +_0800030C: .4byte ram_GetTileTypeAtEntity +_08000310: .4byte ram_GetTileTypeAtWorldCoords +_08000314: .4byte ram_GetTileTypeAtRoomCoords +_08000318: .4byte ram_GetTileTypeAtRoomTile _0800031C: .4byte ram_GetTileType -_08000320: .4byte ram_GetActTileRelative -_08000324: .4byte ram_GetActTile -_08000328: .4byte ram_sub_080B1AB4 -_0800032C: .4byte ram_sub_080B1AC8 -_08000330: .4byte ram_sub_080B1AD8 -_08000334: .4byte ram_sub_080B1AE0 -_08000338: .4byte ram_sub_080B1AF0 -_0800033C: .4byte ram_sub_080B1B0C -_08000340: .4byte ram_sub_080B1B18 -_08000344: .4byte ram_sub_080B1B2C -_08000348: .4byte ram_sub_080B1B3C -_0800034C: .4byte ram_sub_080B1B44 -_08000350: .4byte ram_sub_080B1B54 +_08000320: .4byte ram_GetActTileRelativeToEntity +_08000324: .4byte ram_GetActTileAtEntity +_08000328: .4byte ram_GetActTileAtWorldCoords +_0800032C: .4byte ram_GetActTileAtRoomCoords +_08000330: .4byte ram_GetActTileAtRoomTile +_08000334: .4byte ram_GetActTileAtTilePos +_08000338: .4byte ram_GetCollisionDataRelativeTo +_0800033C: .4byte ram_GetCollisionDataAtEntity +_08000340: .4byte ram_GetCollisionDataAtWorldCoords +_08000344: .4byte ram_GetCollisionDataAtRoomCoords +_08000348: .4byte ram_GetCollisionDataAtRoomTile +_0800034C: .4byte ram_GetCollisionDataAtTilePos +_08000350: .4byte ram_GetActTileForTileType _08000354: .4byte ram_sub_080B1B68 _08000358: .4byte ram_sub_080B1B84 _0800035C: .4byte ram_sub_080B1BA4 diff --git a/assets/assets.json b/assets/assets.json index d66c23e9..159dcb76 100644 --- a/assets/assets.json +++ b/assets/assets.json @@ -975,71 +975,6 @@ "start": 15940, "size": 384 }, - { - "path": "code_080043E8/gUnk_080046A4.bin", - "start": 18084, - "size": 338 - }, - { - "path": "code_080043E8/gUnk_080047F6.bin", - "start": 18422, - "size": 480 - }, - { - "path": "code_080043E8/gUnk_080049D6.bin", - "start": 18902, - "size": 32 - }, - { - "path": "code_080043E8/gUnk_080049F6.bin", - "start": 18934, - "size": 8 - }, - { - "path": "code_080043E8/gUnk_080049FE.bin", - "start": 18942, - "size": 14 - }, - { - "path": "code_080043E8/gUnk_08004A0C.bin", - "start": 18956, - "size": 10 - }, - { - "path": "code_080043E8/gUnk_08004A16.bin", - "start": 18966, - "size": 14 - }, - { - "path": "code_080043E8/gUnk_08004A24.bin", - "start": 18980, - "size": 14 - }, - { - "path": "code_080043E8/gUnk_08004A32.bin", - "start": 18994, - "size": 22 - }, - { - "path": "code_080043E8/gUnk_08004A48.bin", - "start": 19016, - "size": 42 - }, - { - "path": "code_080043E8/gUnk_08004A72.bin", - "start": 19058, - "size": 26 - }, - { - "path": "code_080043E8/gUnk_08004A8C.bin", - "start": 19084, - "size": 26 - }, - { - "path": "code_080043E8/gUnk_08004AA6.bin", - "start": 19110, - "size": 70 - }, { "path": "animations/gSpriteAnimations_1_0.bin", "start": 19180, @@ -3158,59 +3093,6 @@ "size": 59, "type": "animation" }, - { - "path": "code_080043E8/gUnk_08007CAC.bin", - "start": 31916, - "size": 91 - }, - { - "path": "code_080043E8/gUnk_08007CAC_1_DEMO_JP.bin", - "variants": [ - "DEMO_JP" - ], - "starts": { - "DEMO_JP": 32079 - }, - "size": 207 - }, - { - "path": "code_080043E8/gUnk_08007CAC_2_DEMO_USA.bin", - "variants": [ - "DEMO_USA" - ], - "starts": { - "DEMO_USA": 32007 - }, - "size": 207 - }, - { - "path": "code_080043E8/gUnk_08007CAC_3_JP.bin", - "variants": [ - "JP" - ], - "starts": { - "JP": 32007 - }, - "size": 207 - }, - { - "path": "code_080043E8/gUnk_08007CAC_4_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 32159 - }, - "size": 207 - }, - { - "path": "code_080043E8/gUnk_08007CAC_5_USA.bin", - "variants": [ - "USA" - ], - "start": 32007, - "size": 207 - }, { "path": "data_08007DF4/gUnk_08007DF4.bin", "start": 32244, @@ -3480,11 +3362,6 @@ "start": 732376, "size": 16 }, - { - "path": "data_080B3E70/gUnk_080B3E80.bin", - "start": 736896, - "size": 1396 - }, { "path": "data_080B4410/gUnk_080B4410_JP.bin", "variants": [ @@ -3564,21 +3441,6 @@ "start": 738498, "size": 14 }, - { - "path": "data_080B7910/gUnk_080B7910.bin", - "start": 751888, - "size": 151 - }, - { - "path": "data_080B7910/gUnk_080B79A7.bin", - "start": 752039, - "size": 151 - }, - { - "path": "data_080B7910/gUnk_080B7A3E.bin", - "start": 752190, - "size": 302 - }, { "path": "data_080B7B74/gCollisionMtx.bin", "start": 752500, @@ -3937,684 +3799,6 @@ "start": 823444, "size": 204 }, - { - "path": "data_080C93E0/gUnk_080C93E0.bin", - "start": 824288, - "size": 128 - }, - { - "path": "data_080C93E0/gUnk_080C9460.bin", - "start": 824416, - "size": 32 - }, - { - "path": "data_080C93E0/gUnk_080C9480.bin", - "start": 824448, - "size": 8 - }, - { - "path": "data_080C93E0/gUnk_080C948C_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 822196 - }, - "size": 24 - }, - { - "path": "data_080C93E0/gUnk_080C948C_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 824460, - "size": 24 - }, - { - "path": "data_080C93E0/gUnk_080C94A4_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 822220 - }, - "size": 112 - }, - { - "path": "data_080C93E0/gUnk_080C94A4_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 824484, - "size": 112 - }, - { - "path": "data_080C93E0/gUnk_080C9514_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 822332 - }, - "size": 40 - }, - { - "path": "data_080C93E0/gUnk_080C9514_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 824596, - "size": 40 - }, - { - "path": "data_080C93E0/gUnk_080C9548_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 822384 - }, - "size": 40 - }, - { - "path": "data_080C93E0/gUnk_080C9548_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 824648, - "size": 40 - }, - { - "path": "data_080C93E0/gUnk_080C9570_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 822424 - }, - "size": 72 - }, - { - "path": "data_080C93E0/gUnk_080C9570_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 824688, - "size": 72 - }, - { - "path": "data_080C93E0/gUnk_080C95B8_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 822496 - }, - "size": 56 - }, - { - "path": "data_080C93E0/gUnk_080C95B8_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 824760, - "size": 56 - }, - { - "path": "data_080C93E0/gUnk_080C95F0_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 822552 - }, - "size": 16 - }, - { - "path": "data_080C93E0/gUnk_080C95F0_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 824816, - "size": 16 - }, - { - "path": "data_080C93E0/gUnk_080C9610_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 822584 - }, - "size": 56 - }, - { - "path": "data_080C93E0/gUnk_080C9610_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 824848, - "size": 56 - }, - { - "path": "data_080C93E0/gUnk_080C9648_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 822640 - }, - "size": 128 - }, - { - "path": "data_080C93E0/gUnk_080C9648_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 824904, - "size": 128 - }, - { - "path": "data_080C93E0/gUnk_080C96C8_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 822768 - }, - "size": 48 - }, - { - "path": "data_080C93E0/gUnk_080C96C8_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 825032, - "size": 48 - }, - { - "path": "data_080C93E0/gUnk_080C9704_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 822828 - }, - "size": 144 - }, - { - "path": "data_080C93E0/gUnk_080C9704_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 825092, - "size": 144 - }, - { - "path": "data_080C93E0/gUnk_080C9794_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 822972 - }, - "size": 192 - }, - { - "path": "data_080C93E0/gUnk_080C9794_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 825236, - "size": 192 - }, - { - "path": "data_080C93E0/gUnk_080C9854_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 823164 - }, - "size": 16 - }, - { - "path": "data_080C93E0/gUnk_080C9854_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 825428, - "size": 16 - }, - { - "path": "data_080C93E0/gUnk_080C9870_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 823192 - }, - "size": 120 - }, - { - "path": "data_080C93E0/gUnk_080C9870_1_JP.bin", - "variants": [ - "JP" - ], - "starts": { - "JP": 824848 - }, - "size": 120 - }, - { - "path": "data_080C93E0/gUnk_080C9870_2_DEMO_JP.bin", - "variants": [ - "DEMO_JP" - ], - "starts": { - "DEMO_JP": 823476 - }, - "size": 120 - }, - { - "path": "data_080C93E0/gUnk_080C9870_3_USA-DEMO_USA.bin", - "variants": [ - "USA", - "DEMO_USA" - ], - "start": 825456, - "size": 120 - }, - { - "path": "data_080C93E0/gUnk_080C98E8_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 823312 - }, - "size": 64 - }, - { - "path": "data_080C93E0/gUnk_080C98E8_1_JP.bin", - "variants": [ - "JP" - ], - "starts": { - "JP": 824968 - }, - "size": 64 - }, - { - "path": "data_080C93E0/gUnk_080C98E8_2_DEMO_JP.bin", - "variants": [ - "DEMO_JP" - ], - "starts": { - "DEMO_JP": 823596 - }, - "size": 64 - }, - { - "path": "data_080C93E0/gUnk_080C98E8_3_USA-DEMO_USA.bin", - "variants": [ - "USA", - "DEMO_USA" - ], - "start": 825576, - "size": 64 - }, - { - "path": "data_080C93E0/gUnk_080C9928_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 823376 - }, - "size": 96 - }, - { - "path": "data_080C93E0/gUnk_080C9928_1_JP.bin", - "variants": [ - "JP" - ], - "starts": { - "JP": 825032 - }, - "size": 96 - }, - { - "path": "data_080C93E0/gUnk_080C9928_2_DEMO_JP.bin", - "variants": [ - "DEMO_JP" - ], - "starts": { - "DEMO_JP": 823660 - }, - "size": 96 - }, - { - "path": "data_080C93E0/gUnk_080C9928_3_USA-DEMO_USA.bin", - "variants": [ - "USA", - "DEMO_USA" - ], - "start": 825640, - "size": 96 - }, - { - "path": "data_080C93E0/gUnk_080C9988_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 823472 - }, - "size": 96 - }, - { - "path": "data_080C93E0/gUnk_080C9988_1_JP.bin", - "variants": [ - "JP" - ], - "starts": { - "JP": 825128 - }, - "size": 96 - }, - { - "path": "data_080C93E0/gUnk_080C9988_2_DEMO_JP.bin", - "variants": [ - "DEMO_JP" - ], - "starts": { - "DEMO_JP": 823756 - }, - "size": 96 - }, - { - "path": "data_080C93E0/gUnk_080C9988_3_USA-DEMO_USA.bin", - "variants": [ - "USA", - "DEMO_USA" - ], - "start": 825736, - "size": 96 - }, - { - "path": "data_080C93E0/gUnk_080C99E8_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 823568 - }, - "size": 72 - }, - { - "path": "data_080C93E0/gUnk_080C99E8_1_JP.bin", - "variants": [ - "JP" - ], - "starts": { - "JP": 825224 - }, - "size": 72 - }, - { - "path": "data_080C93E0/gUnk_080C99E8_2_DEMO_JP.bin", - "variants": [ - "DEMO_JP" - ], - "starts": { - "DEMO_JP": 823852 - }, - "size": 72 - }, - { - "path": "data_080C93E0/gUnk_080C99E8_3_USA-DEMO_USA.bin", - "variants": [ - "USA", - "DEMO_USA" - ], - "start": 825832, - "size": 72 - }, - { - "path": "data_080C93E0/gUnk_080C9A44_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 823660 - }, - "size": 56 - }, - { - "path": "data_080C93E0/gUnk_080C9A44_1_JP.bin", - "variants": [ - "JP" - ], - "starts": { - "JP": 825316 - }, - "size": 56 - }, - { - "path": "data_080C93E0/gUnk_080C9A44_2_DEMO_JP.bin", - "variants": [ - "DEMO_JP" - ], - "starts": { - "DEMO_JP": 823944 - }, - "size": 56 - }, - { - "path": "data_080C93E0/gUnk_080C9A44_3_USA-DEMO_USA.bin", - "variants": [ - "USA", - "DEMO_USA" - ], - "start": 825924, - "size": 56 - }, - { - "path": "data_080C93E0/gUnk_080C9A7C_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 823716 - }, - "size": 176 - }, - { - "path": "data_080C93E0/gUnk_080C9A7C_1_JP.bin", - "variants": [ - "JP" - ], - "starts": { - "JP": 825372 - }, - "size": 176 - }, - { - "path": "data_080C93E0/gUnk_080C9A7C_2_DEMO_JP.bin", - "variants": [ - "DEMO_JP" - ], - "starts": { - "DEMO_JP": 824000 - }, - "size": 176 - }, - { - "path": "data_080C93E0/gUnk_080C9A7C_3_USA-DEMO_USA.bin", - "variants": [ - "USA", - "DEMO_USA" - ], - "start": 825980, - "size": 176 - }, - { - "path": "data_080C93E0/gUnk_080C9B2C_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 823892 - }, - "size": 136 - }, - { - "path": "data_080C93E0/gUnk_080C9B2C_1_JP.bin", - "variants": [ - "JP" - ], - "starts": { - "JP": 825548 - }, - "size": 136 - }, - { - "path": "data_080C93E0/gUnk_080C9B2C_2_DEMO_JP.bin", - "variants": [ - "DEMO_JP" - ], - "starts": { - "DEMO_JP": 824176 - }, - "size": 136 - }, - { - "path": "data_080C93E0/gUnk_080C9B2C_3_USA-DEMO_USA.bin", - "variants": [ - "USA", - "DEMO_USA" - ], - "start": 826156, - "size": 136 - }, - { - "path": "data_080C93E0/gUnk_080C9BB4_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 824028 - }, - "size": 104 - }, - { - "path": "data_080C93E0/gUnk_080C9BB4_1_JP.bin", - "variants": [ - "JP" - ], - "starts": { - "JP": 825684 - }, - "size": 104 - }, - { - "path": "data_080C93E0/gUnk_080C9BB4_2_DEMO_JP.bin", - "variants": [ - "DEMO_JP" - ], - "starts": { - "DEMO_JP": 824312 - }, - "size": 104 - }, - { - "path": "data_080C93E0/gUnk_080C9BB4_3_USA-DEMO_USA.bin", - "variants": [ - "USA", - "DEMO_USA" - ], - "start": 826292, - "size": 104 - }, - { - "path": "data_080C93E0/gUnk_080C9C1C_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 824132 - }, - "size": 32 - }, - { - "path": "data_080C93E0/gUnk_080C9C1C_1_JP.bin", - "variants": [ - "JP" - ], - "starts": { - "JP": 825788 - }, - "size": 32 - }, - { - "path": "data_080C93E0/gUnk_080C9C1C_2_DEMO_JP.bin", - "variants": [ - "DEMO_JP" - ], - "starts": { - "DEMO_JP": 824416 - }, - "size": 32 - }, - { - "path": "data_080C93E0/gUnk_080C9C1C_3_USA-DEMO_USA.bin", - "variants": [ - "USA", - "DEMO_USA" - ], - "start": 826396, - "size": 32 - }, { "path": "animations/gSpriteAnimations_Octorok_0.bin", "start": 827776, @@ -14007,814 +13191,6 @@ "start": 1085024, "size": 12 }, - { - "path": "data_08108E6C/gUnk_08108E6C.bin", - "start": 1085036, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08108E78_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1082828 - }, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08108E78_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085048, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08108E98_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1082860 - }, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08108E98_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085080, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08108EA4.bin", - "start": 1085092, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08108EC4_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1082904 - }, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08108EC4_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085124, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08108ED0_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1082916 - }, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08108ED0_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085136, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08108EF0_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1082948 - }, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08108EF0_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085168, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08108EFC_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1082960 - }, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08108EFC_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085180, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08108F1C_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1082992 - }, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08108F1C_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085212, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08108F28_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083004 - }, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08108F28_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085224, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08108F48_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083036 - }, - "size": 4 - }, - { - "path": "data_08108E6C/gUnk_08108F48_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085256, - "size": 4 - }, - { - "path": "data_08108E6C/gUnk_08108F48_2_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083040 - }, - "size": 8 - }, - { - "path": "data_08108E6C/gUnk_08108F48_3_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085260, - "size": 8 - }, - { - "path": "data_08108E6C/gUnk_08108F54_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083048 - }, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08108F54_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085268, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08108F74_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083080 - }, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08108F74_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085300, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08108F80_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083092 - }, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08108F80_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085312, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08108FA0_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083124 - }, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08108FA0_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085344, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08108FAC_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083136 - }, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08108FAC_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085356, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08108FCC_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083168 - }, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08108FCC_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085388, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08108FD8_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083180 - }, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08108FD8_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085400, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08108FF8_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083212 - }, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08108FF8_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085432, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08109004_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083224 - }, - "size": 1 - }, - { - "path": "data_08108E6C/gUnk_08109004_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085444, - "size": 1 - }, - { - "path": "data_08108E6C/gUnk_08109004_2_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083225 - }, - "size": 20 - }, - { - "path": "data_08108E6C/gUnk_08109004_3_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085445, - "size": 20 - }, - { - "path": "data_08108E6C/gUnk_08109004_4_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083245 - }, - "size": 3 - }, - { - "path": "data_08108E6C/gUnk_08109004_5_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085465, - "size": 3 - }, - { - "path": "data_08108E6C/gUnk_08109024_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083256 - }, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08109024_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085476, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08109030_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083268 - }, - "size": 3 - }, - { - "path": "data_08108E6C/gUnk_08109030_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085488, - "size": 3 - }, - { - "path": "data_08108E6C/gUnk_08109030_2_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083271 - }, - "size": 21 - }, - { - "path": "data_08108E6C/gUnk_08109030_3_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085491, - "size": 21 - }, - { - "path": "data_08108E6C/gUnk_08109050_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083300 - }, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08109050_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085520, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_0810905C_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083312 - }, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_0810905C_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085532, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_0810907C_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083344 - }, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_0810907C_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085564, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08109088_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083356 - }, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08109088_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085576, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_081090A8_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083388 - }, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_081090A8_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085608, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_081090B4_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083400 - }, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_081090B4_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085620, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_081090D4_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083432 - }, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_081090D4_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085652, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_081090E0_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083444 - }, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_081090E0_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085664, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08109100_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083476 - }, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08109100_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085696, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_0810910C_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083488 - }, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_0810910C_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085708, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_0810912C_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083520 - }, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_0810912C_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085740, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08109140_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083540 - }, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08109140_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085760, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08109160_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083572 - }, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08109160_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085792, - "size": 24 - }, - { - "path": "data_08108E6C/gUnk_08109180_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1083604 - }, - "size": 12 - }, - { - "path": "data_08108E6C/gUnk_08109180_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1085824, - "size": 12 - }, { "path": "data_08108E6C/gUnk_08109230.bin", "start": 1086000, @@ -15271,351 +13647,6 @@ "size": 49, "type": "animation" }, - { - "path": "postman/gUnk_0810A66C.bin", - "start": 1091180, - "size": 252 - }, - { - "path": "postman/gUnk_0810A768.bin", - "start": 1091432, - "size": 5 - }, - { - "path": "postman/gUnk_0810A76D.bin", - "start": 1091437, - "size": 5 - }, - { - "path": "postman/gUnk_0810A772.bin", - "start": 1091442, - "size": 5 - }, - { - "path": "postman/gUnk_0810A777.bin", - "start": 1091447, - "size": 6 - }, - { - "path": "postman/gUnk_0810A77D.bin", - "start": 1091453, - "size": 6 - }, - { - "path": "postman/gUnk_0810A783.bin", - "start": 1091459, - "size": 6 - }, - { - "path": "postman/gUnk_0810A789.bin", - "start": 1091465, - "size": 5 - }, - { - "path": "postman/gUnk_0810A78E.bin", - "start": 1091470, - "size": 6 - }, - { - "path": "postman/gUnk_0810A794.bin", - "start": 1091476, - "size": 6 - }, - { - "path": "postman/gUnk_0810A79A.bin", - "start": 1091482, - "size": 6 - }, - { - "path": "postman/gUnk_0810A7A0.bin", - "start": 1091488, - "size": 6 - }, - { - "path": "postman/gUnk_0810A7A6.bin", - "start": 1091494, - "size": 6 - }, - { - "path": "postman/gUnk_0810A7AC.bin", - "start": 1091500, - "size": 7 - }, - { - "path": "postman/gUnk_0810A7B3.bin", - "start": 1091507, - "size": 6 - }, - { - "path": "postman/gUnk_0810A7B9.bin", - "start": 1091513, - "size": 6 - }, - { - "path": "postman/gUnk_0810A7BF.bin", - "start": 1091519, - "size": 6 - }, - { - "path": "postman/gUnk_0810A7C5.bin", - "start": 1091525, - "size": 5 - }, - { - "path": "postman/gUnk_0810A7CA.bin", - "start": 1091530, - "size": 6 - }, - { - "path": "postman/gUnk_0810A7D0.bin", - "start": 1091536, - "size": 6 - }, - { - "path": "postman/gUnk_0810A7D6.bin", - "start": 1091542, - "size": 5 - }, - { - "path": "postman/gUnk_0810A7DB.bin", - "start": 1091547, - "size": 5 - }, - { - "path": "postman/gUnk_0810A7E0.bin", - "start": 1091552, - "size": 5 - }, - { - "path": "postman/gUnk_0810A7E5.bin", - "start": 1091557, - "size": 16 - }, - { - "path": "postman/gUnk_0810A7F5.bin", - "start": 1091573, - "size": 16 - }, - { - "path": "postman/gUnk_0810A805.bin", - "start": 1091589, - "size": 8 - }, - { - "path": "postman/gUnk_0810A80D.bin", - "start": 1091597, - "size": 8 - }, - { - "path": "postman/gUnk_0810A815.bin", - "start": 1091605, - "size": 5 - }, - { - "path": "postman/gUnk_0810A81A.bin", - "start": 1091610, - "size": 5 - }, - { - "path": "postman/gUnk_0810A81F.bin", - "start": 1091615, - "size": 6 - }, - { - "path": "postman/gUnk_0810A825.bin", - "start": 1091621, - "size": 5 - }, - { - "path": "postman/gUnk_0810A82A.bin", - "start": 1091626, - "size": 5 - }, - { - "path": "postman/gUnk_0810A82F.bin", - "start": 1091631, - "size": 6 - }, - { - "path": "postman/gUnk_0810A835.bin", - "start": 1091637, - "size": 6 - }, - { - "path": "postman/gUnk_0810A83B.bin", - "start": 1091643, - "size": 6 - }, - { - "path": "postman/gUnk_0810A841.bin", - "start": 1091649, - "size": 7 - }, - { - "path": "postman/gUnk_0810A848.bin", - "start": 1091656, - "size": 7 - }, - { - "path": "postman/gUnk_0810A84F.bin", - "start": 1091663, - "size": 15 - }, - { - "path": "postman/gUnk_0810A85E.bin", - "start": 1091678, - "size": 15 - }, - { - "path": "postman/gUnk_0810A86D.bin", - "start": 1091693, - "size": 5 - }, - { - "path": "postman/gUnk_0810A872.bin", - "start": 1091698, - "size": 5 - }, - { - "path": "postman/gUnk_0810A877.bin", - "start": 1091703, - "size": 5 - }, - { - "path": "postman/gUnk_0810A87C.bin", - "start": 1091708, - "size": 5 - }, - { - "path": "postman/gUnk_0810A881.bin", - "start": 1091713, - "size": 5 - }, - { - "path": "postman/gUnk_0810A886.bin", - "start": 1091718, - "size": 5 - }, - { - "path": "postman/gUnk_0810A88B.bin", - "start": 1091723, - "size": 6 - }, - { - "path": "postman/gUnk_0810A891.bin", - "start": 1091729, - "size": 6 - }, - { - "path": "postman/gUnk_0810A897.bin", - "start": 1091735, - "size": 5 - }, - { - "path": "postman/gUnk_0810A89C.bin", - "start": 1091740, - "size": 6 - }, - { - "path": "postman/gUnk_0810A8A2.bin", - "start": 1091746, - "size": 5 - }, - { - "path": "postman/gUnk_0810A8A7.bin", - "start": 1091751, - "size": 5 - }, - { - "path": "postman/gUnk_0810A8AC.bin", - "start": 1091756, - "size": 5 - }, - { - "path": "postman/gUnk_0810A8B1.bin", - "start": 1091761, - "size": 5 - }, - { - "path": "postman/gUnk_0810A8B6.bin", - "start": 1091766, - "size": 5 - }, - { - "path": "postman/gUnk_0810A8BB.bin", - "start": 1091771, - "size": 5 - }, - { - "path": "postman/gUnk_0810A8C0.bin", - "start": 1091776, - "size": 11 - }, - { - "path": "postman/gUnk_0810A8CB.bin", - "start": 1091787, - "size": 11 - }, - { - "path": "postman/gUnk_0810A8D6.bin", - "start": 1091798, - "size": 5 - }, - { - "path": "postman/gUnk_0810A8DB.bin", - "start": 1091803, - "size": 5 - }, - { - "path": "postman/gUnk_0810A8E0.bin", - "start": 1091808, - "size": 9 - }, - { - "path": "postman/gUnk_0810A8E9.bin", - "start": 1091817, - "size": 9 - }, - { - "path": "postman/gUnk_0810A8F2.bin", - "start": 1091826, - "size": 7 - }, - { - "path": "postman/gUnk_0810A8F9.bin", - "start": 1091833, - "size": 7 - }, - { - "path": "postman/gUnk_0810A900.bin", - "start": 1091840, - "size": 5 - }, - { - "path": "postman/gUnk_0810A905.bin", - "start": 1091845, - "size": 6 - }, - { - "path": "postman/gUnk_0810A90B.bin", - "start": 1091851, - "size": 6 - }, - { - "path": "postman/gUnk_0810A911.bin", - "start": 1091857, - "size": 7 - }, - { - "path": "postman/gUnk_0810AA30.bin", - "start": 1092144, - "size": 64 - }, - { - "path": "postman/gUnk_0810AA70.bin", - "start": 1092208, - "size": 32 - }, { "path": "animations/gSpriteAnimations_Npc5_0.bin", "start": 1092728, @@ -16746,116 +14777,6 @@ "size": 18, "type": "animation" }, - { - "path": "sittingPerson/gUnk_0810CB78.bin", - "start": 1100664, - "size": 72 - }, - { - "path": "sittingPerson/gUnk_0810CBC0.bin", - "start": 1100736, - "size": 24 - }, - { - "path": "sittingPerson/gUnk_0810CBE4.bin", - "start": 1100772, - "size": 32 - }, - { - "path": "sittingPerson/gUnk_0810CC04.bin", - "start": 1100804, - "size": 4 - }, - { - "path": "sittingPerson/gUnk_0810CC08.bin", - "start": 1100808, - "size": 196 - }, - { - "path": "sittingPerson/gUnk_0810CC08_1.bin", - "start": 1101008, - "size": 4 - }, - { - "path": "sittingPerson/gUnk_0810CC08_2.bin", - "start": 1101016, - "size": 4 - }, - { - "path": "sittingPerson/gUnk_0810CC08_3.bin", - "start": 1101024, - "size": 4 - }, - { - "path": "sittingPerson/gUnk_0810CC08_4.bin", - "start": 1101032, - "size": 4 - }, - { - "path": "sittingPerson/gUnk_0810CC08_5.bin", - "start": 1101040, - "size": 4 - }, - { - "path": "sittingPerson/gUnk_0810CC08_6.bin", - "start": 1101048, - "size": 4 - }, - { - "path": "sittingPerson/gUnk_0810CC08_7.bin", - "start": 1101056, - "size": 4 - }, - { - "path": "sittingPerson/gUnk_0810CC08_8.bin", - "start": 1101064, - "size": 4 - }, - { - "path": "sittingPerson/gUnk_0810CC08_9.bin", - "start": 1101072, - "size": 4 - }, - { - "path": "sittingPerson/gUnk_0810CC08_10.bin", - "start": 1101080, - "size": 4 - }, - { - "path": "sittingPerson/gUnk_0810CC08_11.bin", - "start": 1101088, - "size": 4 - }, - { - "path": "sittingPerson/gUnk_0810CC08_12.bin", - "start": 1101096, - "size": 4 - }, - { - "path": "sittingPerson/gUnk_0810CC08_13.bin", - "start": 1101104, - "size": 4 - }, - { - "path": "sittingPerson/gUnk_0810CC08_14.bin", - "start": 1101112, - "size": 4 - }, - { - "path": "sittingPerson/gUnk_0810CC08_15.bin", - "start": 1101120, - "size": 4 - }, - { - "path": "sittingPerson/gUnk_0810CC08_16.bin", - "start": 1101128, - "size": 64 - }, - { - "path": "sittingPerson/gUnk_0810CD88.bin", - "start": 1101192, - "size": 24 - }, { "path": "animations/gSpriteAnimations_Pina_0.bin", "start": 1101396, @@ -22665,26 +20586,6 @@ "size": 4, "type": "animation" }, - { - "path": "minecart/gUnk_081223E8.bin", - "start": 1188840, - "size": 26 - }, - { - "path": "minecart/gUnk_08122402.bin", - "start": 1188866, - "size": 26 - }, - { - "path": "minecart/gUnk_0812241C.bin", - "start": 1188892, - "size": 26 - }, - { - "path": "minecart/gUnk_08122436.bin", - "start": 1188918, - "size": 26 - }, { "path": "animations/gSpriteAnimations_Minecart_0.bin", "start": 1188944, @@ -24126,36 +22027,6 @@ "size": 9, "type": "animation" }, - { - "path": "playerItemShield/gUnk_081271DC.bin", - "start": 1208796, - "size": 68 - }, - { - "path": "playerItemShield/gUnk_08127220.bin", - "start": 1208864, - "size": 32 - }, - { - "path": "playerItemShield/gUnk_08127250.bin", - "start": 1208912, - "size": 8 - }, - { - "path": "playerItemShield/gUnk_08127258.bin", - "start": 1208920, - "size": 8 - }, - { - "path": "playerItemShield/gUnk_08127260.bin", - "start": 1208928, - "size": 8 - }, - { - "path": "playerItemShield/gUnk_08127268.bin", - "start": 1208936, - "size": 8 - }, { "offsets": { "DEMO_USA": 2640 @@ -24181,32 +22052,6 @@ "start": 1211628, "size": 20 }, - { - "path": "data_08127280/gAreaMetadata_EU.bin", - "variants": [ - "EU" - ], - "starts": { - "EU": 1209448 - }, - "size": 612 - }, - { - "path": "data_08127280/gAreaMetadata_1_USA-JP-DEMO_USA-DEMO_JP.bin", - "variants": [ - "USA", - "JP", - "DEMO_USA", - "DEMO_JP" - ], - "start": 1211696, - "size": 612 - }, - { - "path": "data_08127280/gUnk_08127F94.bin", - "start": 1212308, - "size": 144 - }, { "path": "data_08127280/gUnk_08128C00.bin", "start": 1215488, @@ -24328,7 +22173,7 @@ "size": 24 }, { - "path": "data_08127280/gUnk_08128FF0.bin", + "path": "data_08127280/gDungeonNames.bin", "start": 1216496, "size": 20 }, diff --git a/assets/gfx.json b/assets/gfx.json index fa8a9f93..9dc01aef 100644 --- a/assets/gfx.json +++ b/assets/gfx.json @@ -19565,8 +19565,7 @@ "JP", "DEMO_USA", "DEMO_JP" - ], - "TODO": "which variants?" + ] }, { "path": "gfx/fixedTypeGfx_502.4bpp", @@ -23255,7 +23254,6 @@ "path": "gfx/gGfx_72_1.4bpp", "start": 8647424, "size": 2048, - "TODO": "WHAT WAS ASSET EXTRACTION THINKING HERE?", "type": "gfx", "variants": [ "EU" diff --git a/assets/map.json b/assets/map.json index c5e40c33..cc425cd7 100644 --- a/assets/map.json +++ b/assets/map.json @@ -12,187 +12,193 @@ "start": 3295972 }, { - "path": "assets/gAreaRoomMap_TownMinishHoles_8_0.bin", + "path": "assets/gAreaRoomMap_None.bin.lz", "start": 3295972, - "size": 974, - "type": "map_layer2" + "size": 976, + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_LakeWoodsCave_0_0.4bpp.lz", + "path": "maps/areas/000_MinishWoods/tileSets/0/gAreaTileSet_MinishWoods_0_0.4bpp.lz", "start": 3296948, - "size": 11346, - "type": "tileset" + "size": 11348, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_LakeWoodsCave_0_1.4bpp.lz", + "path": "maps/areas/000_MinishWoods/tileSets/0/gAreaTileSet_MinishWoods_0_1.4bpp.lz", "start": 3308296, "size": 9712, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_LakeWoodsCave_0_2.4bpp.lz", + "path": "maps/areas/000_MinishWoods/tileSets/0/gAreaTileSet_MinishWoods_0_2.4bpp.lz", "start": 3318008, - "size": 8429, - "type": "tileset" + "size": 8432, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_MinishWoods_0.bin", + "path": "maps/areas/000_MinishWoods/tileSet/gAreaTileSet_MinishWoods_bottom.bin.lz", "start": 3326440, - "size": 7034, - "type": "metatiles_tileset2" + "size": 7036, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_MinishWoods_1.bin", + "path": "maps/areas/000_MinishWoods/tileSet/gAreaTileSet_MinishWoods_top.bin.lz", "start": 3333476, - "size": 3467, - "type": "metatiles_tileset1" + "size": 3468, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_MinishWoods_2.bin", + "path": "maps/areas/000_MinishWoods/tileSet/gAreaTileSetTypes_MinishWoods_bottom.bin.lz", "start": 3336944, - "size": 1071, - "type": "metatiles_tile_types2" + "size": 1072, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_MinishWoods_3.bin", + "path": "maps/areas/000_MinishWoods/tileSet/gAreaTileSetTypes_MinishWoods_top.bin.lz", "start": 3338016, - "size": 707, - "type": "metatiles_tile_types1" + "size": 708, + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_MinishWoods_0_0.bin", + "path": "maps/areas/000_MinishWoods/rooms/00_Main/gAreaRoomMap_MinishWoods_Main_bottom.bin.lz", "start": 3338724, - "size": 4265, - "type": "map_layer2" + "size": 4268, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishWoods_0_1.bin", + "path": "maps/areas/000_MinishWoods/rooms/00_Main/gAreaRoomMap_MinishWoods_Main_top.bin.lz", "start": 3342992, - "size": 1541, - "type": "map_layer1" + "size": 1544, + "type": "tileMap" }, { - "path": "assets/unknown_0.bin", + "path": "maps/areas/000_MinishWoods/rooms/00_Main/gCaveBorder_LakeWoods_outside.bin.lz", "start": 3344536, - "size": 2176, - "type": "unknown" + "size": 1012, + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_HyliaDigCaves_0_0.4bpp.lz", + "path": "maps/areas/000_MinishWoods/rooms/00_Main/gCaveBorder_LakeWoods_unused.bin.lz", + "start": 3345548, + "size": 1164, + "type": "tileMap" + }, + { + "path": "maps/areas/011_LakeHylia/tileSets/0/gAreaTileSet_LakeHylia_0_0.4bpp.lz", "start": 3346712, - "size": 8203, - "type": "tileset" + "size": 8204, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_HyliaDigCaves_0_1.4bpp.lz", + "path": "maps/areas/011_LakeHylia/tileSets/0/gAreaTileSet_LakeHylia_0_1.4bpp.lz", "start": 3354916, - "size": 9774, - "type": "tileset" + "size": 9776, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_HyliaDigCaves_0_2.4bpp.lz", + "path": "maps/areas/011_LakeHylia/tileSets/0/gAreaTileSet_LakeHylia_0_2.4bpp.lz", "start": 3364692, - "size": 7618, - "type": "tileset" + "size": 7620, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_LakeHylia_0.bin", + "path": "maps/areas/011_LakeHylia/tileSet/gAreaTileSet_LakeHylia_bottom.bin.lz", "start": 3372312, - "size": 6103, - "type": "metatiles_tileset2" + "size": 6104, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_LakeHylia_1.bin", + "path": "maps/areas/011_LakeHylia/tileSet/gAreaTileSet_LakeHylia_top.bin.lz", "start": 3378416, - "size": 3583, - "type": "metatiles_tileset1" + "size": 3584, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_LakeHylia_2.bin", + "path": "maps/areas/011_LakeHylia/tileSet/gAreaTileSetTypes_LakeHylia_bottom.bin.lz", "start": 3382000, - "size": 1143, - "type": "metatiles_tile_types2" + "size": 1144, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_LakeHylia_3.bin", + "path": "maps/areas/011_LakeHylia/tileSet/gAreaTileSetTypes_LakeHylia_top.bin.lz", "start": 3383144, - "size": 726, - "type": "metatiles_tile_types1" + "size": 728, + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_LakeHylia_0_0.bin", + "path": "maps/areas/011_LakeHylia/rooms/00_Main/gAreaRoomMap_LakeHylia_Main_bottom.bin.lz", "start": 3383872, - "size": 3187, - "type": "map_layer2" + "size": 3188, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_LakeHylia_0_1.bin", + "path": "maps/areas/011_LakeHylia/rooms/00_Main/gAreaRoomMap_LakeHylia_Main_top.bin.lz", "start": 3387060, - "size": 1083, - "type": "map_layer1" + "size": 1084, + "type": "tileMap" }, { - "path": "assets/unknown_1.bin", + "path": "maps/areas/011_LakeHylia/rooms/00_Main/gCaveBorder_LakeHyliaNorth_outside.bin.lz", "start": 3388144, "size": 760, - "type": "unknown" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_LakeHylia_1_0.bin", + "path": "maps/areas/011_LakeHylia/rooms/01_Beanstalk/gAreaRoomMap_LakeHylia_Beanstalk_bottom.bin.lz", "start": 3388904, - "size": 367, - "type": "map_layer2" + "size": 368, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_LakeHylia_1_1.bin", + "path": "maps/areas/011_LakeHylia/rooms/01_Beanstalk/gAreaRoomMap_LakeHylia_Beanstalk_top.bin.lz", "start": 3389272, - "size": 322, - "type": "map_layer1" + "size": 324, + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_OuterFortressOfWinds_0_0.4bpp.lz", + "path": "maps/areas/004_CastorWilds/tileSets/0/gAreaTileSet_CastorWilds_0_0.4bpp.lz", "start": 3389596, "size": 11284, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_OuterFortressOfWinds_0_1.4bpp.lz", + "path": "maps/areas/004_CastorWilds/tileSets/0/gAreaTileSet_CastorWilds_0_1.4bpp.lz", "start": 3400880, - "size": 10121, - "type": "tileset" + "size": 10124, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_OuterFortressOfWinds_0_2.4bpp.lz", + "path": "maps/areas/004_CastorWilds/tileSets/0/gAreaTileSet_CastorWilds_0_2.4bpp.lz", "start": 3411004, - "size": 5254, - "type": "tileset" + "size": 5256, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_CastorWilds_0.bin", + "path": "maps/areas/004_CastorWilds/tileSet/gAreaTileSet_CastorWilds_bottom.bin.lz", "start": 3416260, "size": 7472, - "type": "metatiles_tileset2" + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_CastorWilds_1.bin", + "path": "maps/areas/004_CastorWilds/tileSet/gAreaTileSet_CastorWilds_top.bin.lz", "start": 3423732, - "size": 3634, - "type": "metatiles_tileset1" + "size": 3636, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_CastorWilds_2.bin", + "path": "maps/areas/004_CastorWilds/tileSet/gAreaTileSetTypes_CastorWilds_bottom.bin.lz", "start": 3427368, - "size": 1254, - "type": "metatiles_tile_types2" + "size": 1256, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_CastorWilds_3.bin", + "path": "maps/areas/004_CastorWilds/tileSet/gAreaTileSetTypes_CastorWilds_top.bin.lz", "start": 3428624, "size": 744, - "type": "metatiles_tile_types1" + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_CastorWilds_0_0.bin", + "path": "maps/areas/004_CastorWilds/rooms/00_Main/gAreaRoomMap_CastorWilds_Main_bottom.bin.lz", "variants": [ "DEMO_JP", "DEMO_USA", @@ -200,17 +206,17 @@ "USA" ], "start": 3429368, - "size": 4218, - "type": "map_layer2" + "size": 4220, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CastorWilds_0_0.bin", + "path": "maps/areas/004_CastorWilds/rooms/00_Main/gAreaRoomMap_CastorWilds_Main_bottom.bin.lz", "variants": [ "EU" ], "start": 3429368, - "size": 4214, - "type": "map_layer2" + "size": 4216, + "type": "tileMap" }, { "offsets": { @@ -218,7207 +224,7690 @@ } }, { - "path": "assets/gAreaRoomMap_CastorWilds_0_1.bin", + "path": "maps/areas/004_CastorWilds/rooms/00_Main/gAreaRoomMap_CastorWilds_Main_top.bin.lz", "start": 3433588, - "size": 1018, - "type": "map_layer1" + "size": 1020, + "type": "tileMap" }, { - "path": "assets/unknown_2.bin", + "path": "maps/areas/004_CastorWilds/rooms/00_Main/gCaveBorder_CastorWilds_outside.bin.lz", "start": 3434608, "size": 964, - "type": "unknown" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Ruins_0_0.bin", + "path": "maps/areas/005_Ruins/rooms/00_Entrance/gAreaRoomMap_Ruins_Entrance_bottom.bin.lz", "start": 3435572, - "size": 733, - "type": "map_layer2" + "size": 736, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Ruins_0_1.bin", + "path": "maps/areas/005_Ruins/rooms/00_Entrance/gAreaRoomMap_Ruins_Entrance_top.bin.lz", "start": 3436308, - "size": 206, - "type": "map_layer1" + "size": 208, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Ruins_1_0.bin", + "path": "maps/areas/005_Ruins/rooms/01_Beanstalk/gAreaRoomMap_Ruins_Beanstalk_bottom.bin.lz", "start": 3436516, "size": 284, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Ruins_1_1.bin", + "path": "maps/areas/005_Ruins/rooms/01_Beanstalk/gAreaRoomMap_Ruins_Beanstalk_top.bin.lz", "start": 3436800, "size": 108, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Ruins_2_0.bin", + "path": "maps/areas/005_Ruins/rooms/02_Tektites/gAreaRoomMap_Ruins_Tektites_bottom.bin.lz", "start": 3436908, - "size": 246, - "type": "map_layer2" + "size": 248, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Ruins_2_1.bin", + "path": "maps/areas/005_Ruins/rooms/02_Tektites/gAreaRoomMap_Ruins_Tektites_top.bin.lz", "start": 3437156, - "size": 98, - "type": "map_layer1" + "size": 100, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Ruins_3_0.bin", + "path": "maps/areas/005_Ruins/rooms/03_LadderToTektites/gAreaRoomMap_Ruins_LadderToTektites_bottom.bin.lz", "start": 3437256, - "size": 254, - "type": "map_layer2" + "size": 256, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Ruins_3_1.bin", + "path": "maps/areas/005_Ruins/rooms/03_LadderToTektites/gAreaRoomMap_Ruins_LadderToTektites_top.bin.lz", "start": 3437512, - "size": 91, - "type": "map_layer1" + "size": 92, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Ruins_4_0.bin", + "path": "maps/areas/005_Ruins/rooms/04_FortressEntrance/gAreaRoomMap_Ruins_FortressEntrance_bottom.bin.lz", "start": 3437604, - "size": 769, - "type": "map_layer2" + "size": 772, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Ruins_4_1.bin", + "path": "maps/areas/005_Ruins/rooms/04_FortressEntrance/gAreaRoomMap_Ruins_FortressEntrance_top.bin.lz", "start": 3438376, "size": 236, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Ruins_5_0.bin", + "path": "maps/areas/005_Ruins/rooms/05_BelowFortressEntrance/gAreaRoomMap_Ruins_BelowFortressEntrance_bottom.bin.lz", "start": 3438612, - "size": 651, - "type": "map_layer2" + "size": 652, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Ruins_5_1.bin", + "path": "maps/areas/005_Ruins/rooms/05_BelowFortressEntrance/gAreaRoomMap_Ruins_BelowFortressEntrance_top.bin.lz", "start": 3439264, - "size": 223, - "type": "map_layer1" + "size": 224, + "type": "tileMap" }, { "path": "assets/unknown_3.bin", "start": 3439488, "size": 26328, - "type": "unknown" + "type": "unknown", + "TODO": "three tileSets" }, { - "path": "assets/gAreaMetatiles_HyruleTown_0.bin", + "path": "maps/areas/002_HyruleTown/tileSet/gAreaTileSet_HyruleTown_bottom.bin.lz", "start": 3465816, - "size": 8210, - "type": "metatiles_tileset2" + "size": 8212, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_HyruleTown_1.bin", + "path": "maps/areas/002_HyruleTown/tileSet/gAreaTileSet_HyruleTown_top.bin.lz", "start": 3474028, - "size": 7411, - "type": "metatiles_tileset1" + "size": 7412, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_HyruleTown_2.bin", + "path": "maps/areas/002_HyruleTown/tileSet/gAreaTileSetTypes_HyruleTown_bottom.bin.lz", "start": 3481440, - "size": 1285, - "type": "metatiles_tile_types2" + "size": 1288, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_HyruleTown_3.bin", + "path": "maps/areas/002_HyruleTown/tileSet/gAreaTileSetTypes_HyruleTown_top.bin.lz", "start": 3482728, - "size": 806, - "type": "metatiles_tile_types1" + "size": 808, + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_HyruleDigCaves_0_0.4bpp.lz", + "path": "maps/areas/002_HyruleTown/tileSets/0/gAreaTileSet_HyruleTown_0_0.4bpp.lz", "start": 3483536, - "size": 9757, - "type": "tileset" + "size": 9760, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_HyruleDigCaves_0_1.4bpp.lz", + "path": "maps/areas/002_HyruleTown/tileSets/0/gAreaTileSet_HyruleTown_0_1.4bpp.lz", "start": 3493296, - "size": 9362, - "type": "tileset" + "size": 9364, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_HyruleDigCaves_0_2.4bpp.lz", + "path": "maps/areas/002_HyruleTown/tileSets/0/gAreaTileSet_HyruleTown_0_2.4bpp.lz", "start": 3502660, "size": 7964, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_FestivalTown_0_0.4bpp.lz", + "path": "maps/areas/021_FestivalTown/tileSets/0/gAreaTileSet_FestivalTown_0_0.4bpp.lz", "start": 3510624, "size": 7144, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_FestivalTown_0_1.4bpp.lz", + "path": "maps/areas/021_FestivalTown/tileSets/0/gAreaTileSet_FestivalTown_0_1.4bpp.lz", "start": 3517768, - "size": 9362, - "type": "tileset" + "size": 9364, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_FestivalTown_0_2.4bpp.lz", + "path": "maps/areas/021_FestivalTown/tileSets/0/gAreaTileSet_FestivalTown_0_2.4bpp.lz", "start": 3527132, - "size": 7515, - "type": "tileset" + "size": 7516, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_HyruleTown_0_0.bin", + "path": "maps/areas/002_HyruleTown/rooms/00_Main/gAreaRoomMap_HyruleTown_Main_bottom.bin.lz", "start": 3534648, - "size": 4509, - "type": "map_layer2" + "size": 4512, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTown_0_1.bin", + "path": "maps/areas/002_HyruleTown/rooms/00_Main/gAreaRoomMap_HyruleTown_Main_top.bin.lz", "start": 3539160, "size": 2272, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_4.bin", + "path": "maps/areas/002_HyruleTown/rooms/00_Main/gCaveBorder_HyruleTown_outside.bin.lz", "start": 3541432, "size": 956, - "type": "unknown" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FestivalTown_0_0.bin", + "path": "maps/areas/021_FestivalTown/rooms/00_Main/gAreaRoomMap_FestivalTown_Main_bottom.bin.lz", "start": 3542388, - "size": 2109, - "type": "map_layer2" + "size": 2112, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FestivalTown_0_1.bin", + "path": "maps/areas/021_FestivalTown/rooms/00_Main/gAreaRoomMap_FestivalTown_Main_top.bin.lz", "start": 3544500, - "size": 1369, - "type": "map_layer1" + "size": 1372, + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_CrenelDigCave_0_0.4bpp.lz", + "path": "maps/areas/006_MtCrenel/tileSets/0/gAreaTileSet_MtCrenel_0_0.4bpp.lz", "start": 3545872, - "size": 10517, - "type": "tileset" + "size": 10520, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_CrenelDigCave_0_1.4bpp.lz", + "path": "maps/areas/006_MtCrenel/tileSets/0/gAreaTileSet_MtCrenel_0_1.4bpp.lz", "start": 3556392, "size": 9536, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_CrenelDigCave_0_2.4bpp.lz", + "path": "maps/areas/006_MtCrenel/tileSets/0/gAreaTileSet_MtCrenel_0_2.4bpp.lz", "start": 3565928, - "size": 8553, - "type": "tileset" + "size": 8556, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_MtCrenel_0.bin", + "path": "maps/areas/006_MtCrenel/tileSet/gAreaTileSet_MtCrenel_bottom.bin.lz", "start": 3574484, - "size": 7451, - "type": "metatiles_tileset2" + "size": 7452, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_MtCrenel_1.bin", + "path": "maps/areas/006_MtCrenel/tileSet/gAreaTileSet_MtCrenel_top.bin.lz", "start": 3581936, - "size": 3734, - "type": "metatiles_tileset1" + "size": 3736, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_MtCrenel_2.bin", + "path": "maps/areas/006_MtCrenel/tileSet/gAreaTileSetTypes_MtCrenel_bottom.bin.lz", "start": 3585672, "size": 1416, - "type": "metatiles_tile_types2" + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_MtCrenel_3.bin", + "path": "maps/areas/006_MtCrenel/tileSet/gAreaTileSetTypes_MtCrenel_top.bin.lz", "start": 3587088, - "size": 739, - "type": "metatiles_tile_types1" + "size": 740, + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_MtCrenel_0_0.bin", + "path": "maps/areas/006_MtCrenel/rooms/00_Top/gAreaRoomMap_MtCrenel_Top_bottom.bin.lz", "start": 3587828, "size": 848, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MtCrenel_0_1.bin", + "path": "maps/areas/006_MtCrenel/rooms/00_Top/gAreaRoomMap_MtCrenel_Top_top.bin.lz", "start": 3588676, - "size": 215, - "type": "map_layer1" + "size": 216, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MtCrenel_1_0.bin", + "path": "maps/areas/006_MtCrenel/rooms/01_WallClimb/gAreaRoomMap_MtCrenel_WallClimb_bottom.bin.lz", "start": 3588892, "size": 824, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MtCrenel_1_1.bin", + "path": "maps/areas/006_MtCrenel/rooms/01_WallClimb/gAreaRoomMap_MtCrenel_WallClimb_top.bin.lz", "start": 3589716, "size": 236, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_5.bin", + "path": "maps/areas/006_MtCrenel/rooms/01_WallClimb/gCaveBorder_Crenel_outside.bin.lz", "start": 3589952, "size": 264, - "type": "unknown" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MtCrenel_2_0.bin", + "path": "maps/areas/006_MtCrenel/rooms/02_CavernOfFlamesEntrance/gAreaRoomMap_MtCrenel_CavernOfFlamesEntrance_bottom.bin.lz", "start": 3590216, "size": 1636, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MtCrenel_2_1.bin", + "path": "maps/areas/006_MtCrenel/rooms/02_CavernOfFlamesEntrance/gAreaRoomMap_MtCrenel_CavernOfFlamesEntrance_top.bin.lz", "start": 3591852, "size": 448, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MtCrenel_3_0.bin", + "path": "maps/areas/006_MtCrenel/rooms/03_Center/gAreaRoomMap_MtCrenel_Center_bottom.bin.lz", "start": 3592300, - "size": 1651, - "type": "map_layer2" + "size": 1652, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MtCrenel_3_1.bin", + "path": "maps/areas/006_MtCrenel/rooms/03_Center/gAreaRoomMap_MtCrenel_Center_top.bin.lz", "start": 3593952, - "size": 405, - "type": "map_layer1" + "size": 408, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MtCrenel_4_0.bin", + "path": "maps/areas/006_MtCrenel/rooms/04_Entrance/gAreaRoomMap_MtCrenel_Entrance_bottom.bin.lz", "start": 3594360, - "size": 2370, - "type": "map_layer2" + "size": 2372, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MtCrenel_4_1.bin", + "path": "maps/areas/006_MtCrenel/rooms/04_Entrance/gAreaRoomMap_MtCrenel_Entrance_top.bin.lz", "start": 3596732, - "size": 651, - "type": "map_layer1" + "size": 652, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleField_7_0.bin", + "path": "maps/areas/003_HyruleField/tileSets/0/gAreaTileSet_HyruleField_0_0.4bpp.lz", "start": 3597384, - "size": 10191, - "type": "map_gfx" + "size": 10192, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_DigCaves1_0_1.4bpp.lz", + "path": "maps/areas/003_HyruleField/tileSets/0/gAreaTileSet_HyruleField_0_1.4bpp.lz", "start": 3607576, - "size": 10455, - "type": "tileset" + "size": 10456, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_HyruleField_7_1.bin", + "path": "maps/areas/003_HyruleField/tileSets/0/gAreaTileSet_HyruleField_0_2.4bpp.lz", "start": 3618032, - "size": 7733, - "type": "map_gfx" + "size": 7736, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_HyruleField_6_0.bin", + "path": "maps/areas/003_HyruleField/tileSets/2/gAreaTileSet_HyruleField_2_0.4bpp.lz", "start": 3625768, "size": 8748, - "type": "map_gfx" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_HyruleField_2_1.4bpp.lz", + "path": "maps/areas/003_HyruleField/tileSets/2/gAreaTileSet_HyruleField_2_1.4bpp.lz", "start": 3634516, - "size": 10455, - "type": "tileset" + "size": 10456, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_HyruleField_6_1.bin", + "path": "maps/areas/003_HyruleField/tileSets/2/gAreaTileSet_HyruleField_2_2.4bpp.lz", "start": 3644972, "size": 5768, - "type": "map_gfx" + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_HyruleField_5_0.bin", + "path": "maps/areas/003_HyruleField/tileSets/1/gAreaTileSet_HyruleField_1_0.4bpp.lz", "start": 3650740, - "size": 9895, - "type": "map_gfx" + "size": 9896, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_HyruleField_1_1.4bpp.lz", + "path": "maps/areas/003_HyruleField/tileSets/1/gAreaTileSet_HyruleField_1_1.4bpp.lz", "start": 3660636, - "size": 10455, - "type": "tileset" + "size": 10456, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_HyruleField_5_1.bin", + "path": "maps/areas/003_HyruleField/tileSets/1/gAreaTileSet_HyruleField_1_2.4bpp.lz", "start": 3671092, "size": 6760, - "type": "map_gfx" + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_HyruleField_0.bin", + "path": "maps/areas/003_HyruleField/tileSet/gAreaTileSet_HyruleField_bottom.bin.lz", "start": 3677852, - "size": 8650, - "type": "metatiles_tileset2" + "size": 8652, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_HyruleField_1.bin", + "path": "maps/areas/003_HyruleField/tileSet/gAreaTileSet_HyruleField_top.bin.lz", "start": 3686504, - "size": 4294, - "type": "metatiles_tileset1" + "size": 4296, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_HyruleField_2.bin", + "path": "maps/areas/003_HyruleField/tileSet/gAreaTileSetTypes_HyruleField_bottom.bin.lz", "start": 3690800, "size": 1560, - "type": "metatiles_tile_types2" + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_HyruleField_3.bin", + "path": "maps/areas/003_HyruleField/tileSet/gAreaTileSetTypes_HyruleField_top.bin.lz", "start": 3692360, "size": 772, - "type": "metatiles_tile_types1" + "type": "tileSet_types" }, { - "path": "assets/gAreaTileset_HyruleField_2_3.bin", + "path": "maps/areas/003_HyruleField/tileSets/0/gAreaTileSet_HyruleField_0_3.4bpp.lz", "start": 3693132, - "size": 354, - "type": "tileset_mapping3" + "size": 356, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_HyruleField_0_0.bin", + "path": "maps/areas/003_HyruleField/rooms/00_WesternWoodsSouth/gAreaRoomMap_HyruleField_WesternWoodsSouth_bottom.bin.lz", "start": 3693488, "size": 492, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleField_0_1.bin", + "path": "maps/areas/003_HyruleField/rooms/00_WesternWoodsSouth/gAreaRoomMap_HyruleField_WesternWoodsSouth_top.bin.lz", "start": 3693980, - "size": 202, - "type": "map_layer1" + "size": 204, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleField_1_3.bin", + "path": "maps/areas/003_HyruleField/rooms/01_SouthHyruleField/gAreaRoomMap_HyruleField_SouthHyruleField_bottom.bin.lz", "start": 3694184, - "size": 3134, - "type": "map_layer2" + "size": 3136, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleField_1_4.bin", + "path": "maps/areas/003_HyruleField/rooms/01_SouthHyruleField/gAreaRoomMap_HyruleField_SouthHyruleField_top.bin.lz", "start": 3697320, - "size": 957, - "type": "map_layer1" + "size": 960, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleField_2_0.bin", + "path": "maps/areas/003_HyruleField/rooms/02_EasternHillsSouth/gAreaRoomMap_HyruleField_EasternHillsSouth_bottom.bin.lz", "start": 3698280, "size": 564, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleField_2_1.bin", + "path": "maps/areas/003_HyruleField/rooms/02_EasternHillsSouth/gAreaRoomMap_HyruleField_EasternHillsSouth_top.bin.lz", "start": 3698844, - "size": 207, - "type": "map_layer1" + "size": 208, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleField_3_3.bin", + "path": "maps/areas/003_HyruleField/rooms/03_EasternHillsCenter/gAreaRoomMap_HyruleField_EasternHillsCenter_bottom.bin.lz", "start": 3699052, "size": 584, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleField_3_4.bin", + "path": "maps/areas/003_HyruleField/rooms/03_EasternHillsCenter/gAreaRoomMap_HyruleField_EasternHillsCenter_top.bin.lz", "start": 3699636, - "size": 215, - "type": "map_layer1" + "size": 216, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleField_4_3.bin", + "path": "maps/areas/003_HyruleField/rooms/04_EasternHillsNorth/gAreaRoomMap_HyruleField_EasternHillsNorth_bottom.bin.lz", "start": 3699852, "size": 1228, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleField_4_4.bin", + "path": "maps/areas/003_HyruleField/rooms/04_EasternHillsNorth/gAreaRoomMap_HyruleField_EasternHillsNorth_top.bin.lz", "start": 3701080, - "size": 422, - "type": "map_layer1" + "size": 424, + "type": "tileMap" }, { - "path": "assets/unknown_6.bin", + "path": "maps/areas/003_HyruleField/rooms/04_EasternHillsNorth/gCaveBorder_EasternHills_outside.bin.lz", "start": 3701504, "size": 296, - "type": "unknown" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleField_5_3.bin", + "path": "maps/areas/003_HyruleField/rooms/05_LonLonRanch/gAreaRoomMap_HyruleField_LonLonRanch_bottom.bin.lz", "start": 3701800, "size": 3264, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleField_5_4.bin", + "path": "maps/areas/003_HyruleField/rooms/05_LonLonRanch/gAreaRoomMap_HyruleField_LonLonRanch_top.bin.lz", "start": 3705064, - "size": 909, - "type": "map_layer1" + "size": 912, + "type": "tileMap" }, { - "path": "assets/unknown_7.bin", + "path": "maps/areas/003_HyruleField/rooms/05_LonLonRanch/gCaveBorder_LonLonRanch_outside.bin.lz", "start": 3705976, "size": 684, - "type": "unknown" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleField_6_3.bin", + "path": "maps/areas/003_HyruleField/rooms/06_NorthHyruleField/gAreaRoomMap_HyruleField_NorthHyruleField_bottom.bin.lz", "start": 3706660, - "size": 3322, - "type": "map_layer2" + "size": 3324, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleField_6_4.bin", + "path": "maps/areas/003_HyruleField/rooms/06_NorthHyruleField/gAreaRoomMap_HyruleField_NorthHyruleField_top.bin.lz", "start": 3709984, "size": 1060, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleField_7_3.bin", + "path": "maps/areas/003_HyruleField/rooms/07_TrilbyHighlands/gAreaRoomMap_HyruleField_TrilbyHighlands_bottom.bin.lz", "start": 3711044, "size": 2140, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleField_7_4.bin", + "path": "maps/areas/003_HyruleField/rooms/07_TrilbyHighlands/gAreaRoomMap_HyruleField_TrilbyHighlands_top.bin.lz", "start": 3713184, - "size": 623, - "type": "map_layer1" + "size": 624, + "type": "tileMap" }, { - "path": "assets/unknown_8.bin", + "path": "maps/areas/003_HyruleField/rooms/07_TrilbyHighlands/gCaveBorder_TrilbyHighlands_outside.bin.lz", "start": 3713808, "size": 480, - "type": "unknown" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleField_8_0.bin", + "path": "maps/areas/003_HyruleField/rooms/08_WesternWoodsNorth/gAreaRoomMap_HyruleField_WesternWoodsNorth_bottom.bin.lz", "start": 3714288, - "size": 1405, - "type": "map_layer2" + "size": 1408, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleField_8_1.bin", + "path": "maps/areas/003_HyruleField/rooms/08_WesternWoodsNorth/gAreaRoomMap_HyruleField_WesternWoodsNorth_top.bin.lz", "start": 3715696, - "size": 527, - "type": "map_layer1" + "size": 528, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleField_9_0.bin", + "path": "maps/areas/003_HyruleField/rooms/09_WesternWoodsCenter/gAreaRoomMap_HyruleField_WesternWoodsCenter_bottom.bin.lz", "start": 3716224, - "size": 449, - "type": "map_layer2" + "size": 452, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleField_9_1.bin", + "path": "maps/areas/003_HyruleField/rooms/09_WesternWoodsCenter/gAreaRoomMap_HyruleField_WesternWoodsCenter_top.bin.lz", "start": 3716676, - "size": 197, - "type": "map_layer1" + "size": 200, + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_CastleGarden_0_0.4bpp.lz", + "path": "maps/areas/007_CastleGarden/tileSets/0/gAreaTileSet_CastleGarden_0_0.4bpp.lz", "start": 3716876, - "size": 7853, - "type": "tileset" + "size": 7856, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_CastleGarden_0_1.4bpp.lz", + "path": "maps/areas/007_CastleGarden/tileSets/0/gAreaTileSet_CastleGarden_0_1.4bpp.lz", "start": 3724732, - "size": 7399, - "type": "tileset" + "size": 7400, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_CastleGarden_0_2.4bpp.lz", + "path": "maps/areas/007_CastleGarden/tileSets/0/gAreaTileSet_CastleGarden_0_2.4bpp.lz", "start": 3732132, - "size": 4057, - "type": "tileset" + "size": 4060, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_CastleGarden_0.bin", + "path": "maps/areas/007_CastleGarden/tileSet/gAreaTileSet_CastleGarden_bottom.bin.lz", "start": 3736192, - "size": 5494, - "type": "metatiles_tileset2" + "size": 5496, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_CastleGarden_1.bin", + "path": "maps/areas/007_CastleGarden/tileSet/gAreaTileSet_CastleGarden_top.bin.lz", "start": 3741688, - "size": 2706, - "type": "metatiles_tileset1" + "size": 2708, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_CastleGarden_2.bin", + "path": "maps/areas/007_CastleGarden/tileSet/gAreaTileSetTypes_CastleGarden_bottom.bin.lz", "start": 3744396, "size": 828, - "type": "metatiles_tile_types2" + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_CastleGarden_3.bin", + "path": "maps/areas/007_CastleGarden/tileSet/gAreaTileSetTypes_CastleGarden_top.bin.lz", "start": 3745224, "size": 556, - "type": "metatiles_tile_types1" + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_CastleGarden_0_0.bin", + "path": "maps/areas/007_CastleGarden/rooms/00_Main/gAreaRoomMap_CastleGarden_Main_bottom.bin.lz", "start": 3745780, - "size": 2418, - "type": "map_layer2" + "size": 2420, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CastleGarden_0_1.bin", + "path": "maps/areas/007_CastleGarden/rooms/00_Main/gAreaRoomMap_CastleGarden_Main_top.bin.lz", "start": 3748200, - "size": 1047, - "type": "map_layer1" + "size": 1048, + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_CloudTops_0_0.4bpp.lz", + "path": "maps/areas/008_CloudTops/tileSets/0/gAreaTileSet_CloudTops_0_0.4bpp.lz", "start": 3749248, - "size": 5919, - "type": "tileset" + "size": 5920, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_CloudTops_0_1.4bpp.lz", + "path": "maps/areas/008_CloudTops/tileSets/0/gAreaTileSet_CloudTops_0_1.4bpp.lz", "start": 3755168, "size": 6232, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_CloudTops_0_2.4bpp.lz", + "path": "maps/areas/008_CloudTops/tileSets/0/gAreaTileSet_CloudTops_0_2.4bpp.lz", "start": 3761400, - "size": 3713, - "type": "tileset" + "size": 3716, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_CloudTops_0.bin", + "path": "maps/areas/008_CloudTops/tileSet/gAreaTileSet_CloudTops_bottom.bin.lz", "start": 3765116, "size": 4796, - "type": "metatiles_tileset2" + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_CloudTops_1.bin", + "path": "maps/areas/008_CloudTops/tileSet/gAreaTileSet_CloudTops_top.bin.lz", "start": 3769912, - "size": 2525, - "type": "metatiles_tileset1" + "size": 2528, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_CloudTops_2.bin", + "path": "maps/areas/008_CloudTops/tileSet/gAreaTileSetTypes_CloudTops_bottom.bin.lz", "start": 3772440, "size": 752, - "type": "metatiles_tile_types2" + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_CloudTops_3.bin", + "path": "maps/areas/008_CloudTops/tileSet/gAreaTileSetTypes_CloudTops_top.bin.lz", "start": 3773192, - "size": 682, - "type": "metatiles_tile_types1" + "size": 684, + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_CloudTops_0_0.bin", + "path": "maps/areas/008_CloudTops/rooms/00_CloudTops/gAreaRoomMap_CloudTops_CloudTops_bottom.bin.lz", "start": 3773876, - "size": 1822, - "type": "map_layer2" + "size": 1824, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CloudTops_0_1.bin", + "path": "maps/areas/008_CloudTops/rooms/00_CloudTops/gAreaRoomMap_CloudTops_CloudTops_top.bin.lz", "start": 3775700, "size": 1024, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CloudTops_1_0.bin", + "path": "maps/areas/008_CloudTops/rooms/01_CloudMiddles/gAreaRoomMap_CloudTops_CloudMiddles_bottom.bin.lz", "start": 3776724, "size": 2620, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CloudTops_1_1.bin", + "path": "maps/areas/008_CloudTops/rooms/01_CloudMiddles/gAreaRoomMap_CloudTops_CloudMiddles_top.bin.lz", "start": 3779344, - "size": 1129, - "type": "map_layer1" + "size": 1132, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CloudTops_2_0.bin", + "path": "maps/areas/008_CloudTops/rooms/02_CloudBottoms/gAreaRoomMap_CloudTops_CloudBottoms_bottom.bin.lz", "start": 3780476, - "size": 2337, - "type": "map_layer2" + "size": 2340, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CloudTops_2_1.bin", + "path": "maps/areas/008_CloudTops/rooms/02_CloudBottoms/gAreaRoomMap_CloudTops_CloudBottoms_top.bin.lz", "start": 3782816, - "size": 983, - "type": "map_layer1" + "size": 984, + "type": "tileMap" }, { - "path": "assets/gAreaTileset_CloudTops_0_3.bin", + "path": "maps/areas/008_CloudTops/tileSets/0/gAreaTileSet_CloudTops_0_3.4bpp.lz", "start": 3783800, - "size": 530, - "type": "tileset_mapping3" + "size": 532, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_RoyalValley_0_0.4bpp.lz", + "path": "maps/areas/009_RoyalValley/tileSets/0/gAreaTileSet_RoyalValley_0_0.4bpp.lz", "start": 3784332, "size": 8672, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_RoyalValley_0_1.4bpp.lz", + "path": "maps/areas/009_RoyalValley/tileSets/0/gAreaTileSet_RoyalValley_0_1.4bpp.lz", "start": 3793004, - "size": 6905, - "type": "tileset" + "size": 6908, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_RoyalValley_0_2.4bpp.lz", + "path": "maps/areas/009_RoyalValley/tileSets/0/gAreaTileSet_RoyalValley_0_2.4bpp.lz", "start": 3799912, - "size": 6707, - "type": "tileset" + "size": 6708, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_RoyalValley_0.bin", + "path": "maps/areas/009_RoyalValley/tileSet/gAreaTileSet_RoyalValley_bottom.bin.lz", "start": 3806620, - "size": 4403, - "type": "metatiles_tileset2" + "size": 4404, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_RoyalValley_1.bin", + "path": "maps/areas/009_RoyalValley/tileSet/gAreaTileSet_RoyalValley_top.bin.lz", "start": 3811024, - "size": 2826, - "type": "metatiles_tileset1" + "size": 2828, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_RoyalValley_2.bin", + "path": "maps/areas/009_RoyalValley/tileSet/gAreaTileSetTypes_RoyalValley_bottom.bin.lz", "start": 3813852, "size": 852, - "type": "metatiles_tile_types2" + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_RoyalValley_3.bin", + "path": "maps/areas/009_RoyalValley/tileSet/gAreaTileSetTypes_RoyalValley_top.bin.lz", "start": 3814704, "size": 556, - "type": "metatiles_tile_types1" + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_RoyalValley_0_0.bin", + "path": "maps/areas/009_RoyalValley/rooms/00_Main/gAreaRoomMap_RoyalValley_Main_bottom.bin.lz", "start": 3815260, - "size": 1907, - "type": "map_layer2" + "size": 1908, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalValley_0_1.bin", + "path": "maps/areas/009_RoyalValley/rooms/00_Main/gAreaRoomMap_RoyalValley_Main_top.bin.lz", "start": 3817168, - "size": 777, - "type": "map_layer1" + "size": 780, + "type": "tileMap" }, { "path": "assets/unknown_9.bin", "start": 3817948, "size": 512, - "type": "unknown" + "type": "unknown", + "TODO": "tileMap 30x63" }, { - "path": "assets/gAreaRoomMap_RoyalValley_1_0.bin", + "path": "maps/areas/009_RoyalValley/rooms/01_ForestMaze/gAreaRoomMap_RoyalValley_ForestMaze_bottom.bin.lz", "start": 3818460, - "size": 237, - "type": "map_layer2" + "size": 240, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalValley_1_1.bin", + "path": "maps/areas/009_RoyalValley/rooms/01_ForestMaze/gAreaRoomMap_RoyalValley_ForestMaze_top.bin.lz", "start": 3818700, "size": 108, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_VeilFallsTop_0_0.4bpp.lz", + "path": "maps/areas/010_VeilFalls/tileSets/0/gAreaTileSet_VeilFalls_0_0.4bpp.lz", "start": 3818808, "size": 8960, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_VeilFallsTop_0_1.4bpp.lz", + "path": "maps/areas/010_VeilFalls/tileSets/0/gAreaTileSet_VeilFalls_0_1.4bpp.lz", "start": 3827768, - "size": 9555, - "type": "tileset" + "size": 9556, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_VeilFallsDigCave_0_2.4bpp.lz", + "path": "maps/areas/010_VeilFalls/tileSets/0/gAreaTileSet_VeilFalls_0_2.4bpp.lz", "start": 3837324, - "size": 6522, - "type": "tileset" + "size": 6524, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_VeilFalls_0_0.bin", + "path": "maps/areas/010_VeilFalls/rooms/00_Main/gAreaRoomMap_VeilFalls_Main_bottom.bin.lz", "start": 3843848, - "size": 2362, - "type": "map_layer2" + "size": 2364, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFalls_0_1.bin", + "path": "maps/areas/010_VeilFalls/rooms/00_Main/gAreaRoomMap_VeilFalls_Main_top.bin.lz", "start": 3846212, - "size": 537, - "type": "map_layer1" + "size": 540, + "type": "tileMap" }, { - "path": "assets/unknown_10.bin", + "path": "maps/areas/010_VeilFalls/rooms/00_Main/gCaveBorder_VeilFalls_outside.bin.lz", "start": 3846752, "size": 520, - "type": "unknown" + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_VeilFallsTop_0_2.4bpp.lz", + "path": "maps/areas/026_VeilFallsTop/tileSets/0/gAreaTileSet_VeilFallsTop_0_2.4bpp.lz", "start": 3847272, "size": 5680, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_VeilFallsTop_0_0.bin", + "path": "maps/areas/026_VeilFallsTop/rooms/00_0/gAreaRoomMap_VeilFallsTop_0_bottom.bin.lz", "start": 3852952, - "size": 374, - "type": "map_layer2" + "size": 376, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsTop_0_1.bin", + "path": "maps/areas/026_VeilFallsTop/rooms/00_0/gAreaRoomMap_VeilFallsTop_0_top.bin.lz", "start": 3853328, "size": 92, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_Beanstalks_0_0.4bpp.lz", + "path": "maps/areas/013_Beanstalks/tileSets/0/gAreaTileSet_Beanstalks_0_0.4bpp.lz", "start": 3853420, - "size": 4239, - "type": "tileset" + "size": 4240, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_Beanstalks_0_1.4bpp.lz", + "path": "maps/areas/013_Beanstalks/tileSets/0/gAreaTileSet_Beanstalks_0_1.4bpp.lz", "start": 3857660, - "size": 3049, - "type": "tileset" + "size": 3052, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_Beanstalks_0_2.4bpp.lz", + "path": "maps/areas/013_Beanstalks/tileSets/0/gAreaTileSet_Beanstalks_0_2.4bpp.lz", "start": 3860712, - "size": 6153, - "type": "tileset" + "size": 6156, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_Beanstalks_0.bin", + "path": "maps/areas/013_Beanstalks/tileSet/gAreaTileSet_Beanstalks_bottom.bin.lz", "start": 3866868, - "size": 797, - "type": "metatiles_tileset2" + "size": 800, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_Beanstalks_1.bin", + "path": "maps/areas/013_Beanstalks/tileSet/gAreaTileSetTypes_Beanstalks_bottom.bin.lz", "start": 3867668, - "size": 114, - "type": "metatiles_tile_types2" + "size": 116, + "type": "tileSet_types" }, { - "path": "assets/gAreaTileset_Beanstalks_0_3.bin", + "path": "maps/areas/013_Beanstalks/tileSets/0/gAreaTileSet_Beanstalks_0_3.4bpp.lz", "start": 3867784, - "size": 439, - "type": "tileset_mapping3" + "size": 440, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_Beanstalks_5_1.bin", + "path": "maps/areas/013_Beanstalks/rooms/16_CrenelClimb/gRoomMapping_Beanstalks_CrenelClimb_top.bin.lz", "start": 3868224, - "size": 1470, + "size": 1472, "type": "map_mapping1" }, { - "path": "assets/gAreaRoomMap_Beanstalks_0_0.bin", + "path": "maps/areas/013_Beanstalks/rooms/00_Crenel/gAreaRoomMap_Beanstalks_Crenel_bottom.bin", "start": 3869696, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Beanstalks_1_0.bin", + "path": "maps/areas/013_Beanstalks/rooms/01_LakeHylia/gAreaRoomMap_Beanstalks_LakeHylia_bottom.bin", "start": 3869996, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Beanstalks_2_0.bin", + "path": "maps/areas/013_Beanstalks/rooms/02_Ruins/gAreaRoomMap_Beanstalks_Ruins_bottom.bin", "start": 3870296, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Beanstalks_3_0.bin", + "path": "maps/areas/013_Beanstalks/rooms/03_EasternHills/gAreaRoomMap_Beanstalks_EasternHills_bottom.bin", "start": 3870596, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Beanstalks_4_0.bin", + "path": "maps/areas/013_Beanstalks/rooms/04_WesternWoods/gAreaRoomMap_Beanstalks_WesternWoods_bottom.bin", "start": 3870896, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { "path": "assets/unknown_11.bin", "start": 3871196, "size": 220, - "type": "unknown" + "type": "unknown", + "TODO": "5 files just containing 300 bytes of 10 00" }, { - "path": "assets/gAreaRoomMap_Empty_0_0.bin", + "path": "maps/areas/014_Empty/rooms/00_0/gAreaRoomMap_Empty_0_bottom.bin.lz", "start": 3871416, - "size": 1446, - "type": "map_layer2" + "size": 1448, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Empty_0_1.bin", + "path": "maps/areas/014_Empty/rooms/00_0/gAreaRoomMap_Empty_0_top.bin.lz", "start": 3872864, "size": 996, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_45_0_0.4bpp.lz", + "path": "maps/areas/038_CrenelCaves/tileSets/0/gAreaTileSet_CrenelCaves_0_0.4bpp.lz", "start": 3873860, - "size": 10637, - "type": "tileset" + "size": 10640, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_45_0_1.4bpp.lz", + "path": "maps/areas/038_CrenelCaves/tileSets/0/gAreaTileSet_CrenelCaves_0_1.4bpp.lz", "start": 3884500, "size": 10564, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_45_0_2.4bpp.lz", + "path": "maps/areas/038_CrenelCaves/tileSets/0/gAreaTileSet_CrenelCaves_0_2.4bpp.lz", "start": 3895064, - "size": 6861, - "type": "tileset" + "size": 6864, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_CrenelCaves_0.bin", + "path": "maps/areas/032_MinishHouseInteriors/tileSet/gAreaTileSet_MinishHouseInteriors_bottom.bin.lz", "start": 3901928, - "size": 8138, - "type": "metatiles_tileset2" + "size": 8140, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_CrenelCaves_1.bin", + "path": "maps/areas/032_MinishHouseInteriors/tileSet/gAreaTileSet_MinishHouseInteriors_top.bin.lz", "start": 3910068, - "size": 6281, - "type": "metatiles_tileset1" + "size": 6284, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_CrenelCaves_2.bin", + "path": "maps/areas/032_MinishHouseInteriors/tileSet/gAreaTileSetTypes_MinishHouseInteriors_bottom.bin.lz", "start": 3916352, - "size": 1531, - "type": "metatiles_tile_types2" + "size": 1532, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_CrenelCaves_3.bin", + "path": "maps/areas/032_MinishHouseInteriors/tileSet/gAreaTileSetTypes_MinishHouseInteriors_top.bin.lz", "start": 3917884, - "size": 1310, - "type": "metatiles_tile_types1" + "size": 1312, + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_0_0.bin", + "path": "maps/areas/038_CrenelCaves/rooms/00_BlockPushing/gAreaRoomMap_CrenelCaves_BlockPushing_bottom.bin.lz", "start": 3919196, - "size": 1051, - "type": "map_layer2" + "size": 1052, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_0_1.bin", + "path": "maps/areas/038_CrenelCaves/rooms/00_BlockPushing/gAreaRoomMap_CrenelCaves_BlockPushing_top.bin.lz", "start": 3920248, - "size": 487, - "type": "map_layer1" + "size": 488, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_1_0.bin", + "path": "maps/areas/038_CrenelCaves/rooms/01_PillarCave/gAreaRoomMap_CrenelCaves_PillarCave_bottom.bin.lz", "start": 3920736, "size": 256, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_1_1.bin", + "path": "maps/areas/038_CrenelCaves/rooms/01_PillarCave/gAreaRoomMap_CrenelCaves_PillarCave_top.bin.lz", "start": 3920992, "size": 84, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_2_0.bin", + "path": "maps/areas/038_CrenelCaves/rooms/02_BridgeSwitch/gAreaRoomMap_CrenelCaves_BridgeSwitch_bottom.bin.lz", "start": 3921076, "size": 580, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_2_1.bin", + "path": "maps/areas/038_CrenelCaves/rooms/02_BridgeSwitch/gAreaRoomMap_CrenelCaves_BridgeSwitch_top.bin.lz", "start": 3921656, - "size": 161, - "type": "map_layer1" + "size": 164, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_3_0.bin", + "path": "maps/areas/038_CrenelCaves/rooms/03_ExitToMines/gAreaRoomMap_CrenelCaves_ExitToMines_bottom.bin.lz", "start": 3921820, - "size": 274, - "type": "map_layer2" + "size": 276, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_3_1.bin", + "path": "maps/areas/038_CrenelCaves/rooms/03_ExitToMines/gAreaRoomMap_CrenelCaves_ExitToMines_top.bin.lz", "start": 3922096, - "size": 75, - "type": "map_layer1" + "size": 76, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_4_0.bin", + "path": "maps/areas/038_CrenelCaves/rooms/04_GripRing/gAreaRoomMap_CrenelCaves_GripRing_bottom.bin.lz", "start": 3922172, - "size": 245, - "type": "map_layer2" + "size": 248, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_4_1.bin", + "path": "maps/areas/038_CrenelCaves/rooms/04_GripRing/gAreaRoomMap_CrenelCaves_GripRing_top.bin.lz", "start": 3922420, "size": 84, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_5_0.bin", + "path": "maps/areas/038_CrenelCaves/rooms/05_FairyFountain/gAreaRoomMap_CrenelCaves_FairyFountain_bottom.bin.lz", "start": 3922504, - "size": 283, - "type": "map_layer2" + "size": 284, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_5_1.bin", + "path": "maps/areas/038_CrenelCaves/rooms/05_FairyFountain/gAreaRoomMap_CrenelCaves_FairyFountain_top.bin.lz", "start": 3922788, "size": 84, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_6_0.bin", + "path": "maps/areas/038_CrenelCaves/rooms/06_SpinyChuPuzzle/gAreaRoomMap_CrenelCaves_SpinyChuPuzzle_bottom.bin.lz", "start": 3922872, - "size": 298, - "type": "map_layer2" + "size": 300, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_6_1.bin", + "path": "maps/areas/038_CrenelCaves/rooms/06_SpinyChuPuzzle/gAreaRoomMap_CrenelCaves_SpinyChuPuzzle_top.bin.lz", "start": 3923172, "size": 80, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_7_0.bin", + "path": "maps/areas/038_CrenelCaves/rooms/07_ChuchuPotChest/gAreaRoomMap_CrenelCaves_ChuchuPotChest_bottom.bin.lz", "start": 3923252, "size": 256, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_7_1.bin", + "path": "maps/areas/038_CrenelCaves/rooms/07_ChuchuPotChest/gAreaRoomMap_CrenelCaves_ChuchuPotChest_top.bin.lz", "start": 3923508, - "size": 86, - "type": "map_layer1" + "size": 88, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_8_0.bin", + "path": "maps/areas/038_CrenelCaves/rooms/08_WaterHeartPiece/gAreaRoomMap_CrenelCaves_WaterHeartPiece_bottom.bin.lz", "start": 3923596, - "size": 430, - "type": "map_layer2" + "size": 432, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_8_1.bin", + "path": "maps/areas/038_CrenelCaves/rooms/08_WaterHeartPiece/gAreaRoomMap_CrenelCaves_WaterHeartPiece_top.bin.lz", "start": 3924028, - "size": 153, - "type": "map_layer1" + "size": 156, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_9_0.bin", + "path": "maps/areas/038_CrenelCaves/rooms/09_RupeeFairyFouintain/gAreaRoomMap_CrenelCaves_RupeeFairyFouintain_bottom.bin", "start": 3924184, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_9_1.bin", + "path": "maps/areas/038_CrenelCaves/rooms/09_RupeeFairyFouintain/gAreaRoomMap_CrenelCaves_RupeeFairyFouintain_top.bin.lz", "start": 3924484, - "size": 62, - "type": "map_layer1" + "size": 64, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_10_0.bin", + "path": "maps/areas/038_CrenelCaves/rooms/10_HelmasaurHallway/gAreaRoomMap_CrenelCaves_HelmasaurHallway_bottom.bin.lz", "start": 3924548, - "size": 481, - "type": "map_layer2" + "size": 484, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_10_1.bin", + "path": "maps/areas/038_CrenelCaves/rooms/10_HelmasaurHallway/gAreaRoomMap_CrenelCaves_HelmasaurHallway_top.bin.lz", "start": 3925032, - "size": 175, - "type": "map_layer1" + "size": 176, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_11_0.bin", + "path": "maps/areas/038_CrenelCaves/rooms/11_MushroomKeese/gAreaRoomMap_CrenelCaves_MushroomKeese_bottom.bin.lz", "start": 3925208, - "size": 475, - "type": "map_layer2" + "size": 476, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_11_1.bin", + "path": "maps/areas/038_CrenelCaves/rooms/11_MushroomKeese/gAreaRoomMap_CrenelCaves_MushroomKeese_top.bin.lz", "start": 3925684, - "size": 143, - "type": "map_layer1" + "size": 144, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_12_0.bin", + "path": "maps/areas/038_CrenelCaves/rooms/12_LadderToSpringWater/gAreaRoomMap_CrenelCaves_LadderToSpringWater_bottom.bin.lz", "start": 3925828, - "size": 282, - "type": "map_layer2" + "size": 284, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_12_1.bin", + "path": "maps/areas/038_CrenelCaves/rooms/12_LadderToSpringWater/gAreaRoomMap_CrenelCaves_LadderToSpringWater_top.bin.lz", "start": 3926112, - "size": 50, - "type": "map_layer1" + "size": 52, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_13_0.bin", + "path": "maps/areas/038_CrenelCaves/rooms/13_BombBusinessScrub/gAreaRoomMap_CrenelCaves_BombBusinessScrub_bottom.bin.lz", "start": 3926164, - "size": 258, - "type": "map_layer2" + "size": 260, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_13_1.bin", + "path": "maps/areas/038_CrenelCaves/rooms/13_BombBusinessScrub/gAreaRoomMap_CrenelCaves_BombBusinessScrub_top.bin.lz", "start": 3926424, - "size": 86, - "type": "map_layer1" + "size": 88, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_14_0.bin", + "path": "maps/areas/038_CrenelCaves/rooms/14_Hermit/gAreaRoomMap_CrenelCaves_Hermit_bottom.bin.lz", "start": 3926512, - "size": 259, - "type": "map_layer2" + "size": 260, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_14_1.bin", + "path": "maps/areas/038_CrenelCaves/rooms/14_Hermit/gAreaRoomMap_CrenelCaves_Hermit_top.bin.lz", "start": 3926772, - "size": 62, - "type": "map_layer1" + "size": 64, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_15_0.bin", + "path": "maps/areas/038_CrenelCaves/rooms/15_HintScrub/gAreaRoomMap_CrenelCaves_HintScrub_bottom.bin.lz", "start": 3926836, - "size": 246, - "type": "map_layer2" + "size": 248, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_15_1.bin", + "path": "maps/areas/038_CrenelCaves/rooms/15_HintScrub/gAreaRoomMap_CrenelCaves_HintScrub_top.bin.lz", "start": 3927084, - "size": 66, - "type": "map_layer1" + "size": 68, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_16_0.bin", + "path": "maps/areas/038_CrenelCaves/rooms/16_ToGrayblade/gAreaRoomMap_CrenelCaves_ToGrayblade_bottom.bin.lz", "start": 3927152, "size": 380, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelCaves_16_1.bin", + "path": "maps/areas/038_CrenelCaves/rooms/16_ToGrayblade/gAreaRoomMap_CrenelCaves_ToGrayblade_top.bin.lz", "start": 3927532, - "size": 126, - "type": "map_layer1" + "size": 128, + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_GreatFairies_2_0.4bpp.lz", + "path": "maps/areas/041_GreatFairies/tileSets/0/gAreaTileSet_GreatFairies_0_0.4bpp.lz", "start": 3927660, "size": 7708, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_GreatFairies_2_1.4bpp.lz", + "path": "maps/areas/041_GreatFairies/tileSets/0/gAreaTileSet_GreatFairies_0_1.4bpp.lz", "start": 3935368, - "size": 5469, - "type": "tileset" + "size": 5472, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_GreatFairies_2_2.4bpp.lz", + "path": "maps/areas/041_GreatFairies/tileSets/0/gAreaTileSet_GreatFairies_0_2.4bpp.lz", "start": 3940840, - "size": 3018, - "type": "tileset" + "size": 3020, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_GreatFairies_0.bin", + "path": "maps/areas/041_GreatFairies/tileSet/gAreaTileSet_GreatFairies_bottom.bin.lz", "start": 3943860, - "size": 3275, - "type": "metatiles_tileset2" + "size": 3276, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_GreatFairies_1.bin", + "path": "maps/areas/041_GreatFairies/tileSet/gAreaTileSet_GreatFairies_top.bin.lz", "start": 3947136, - "size": 1330, - "type": "metatiles_tileset1" + "size": 1332, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_GreatFairies_2.bin", + "path": "maps/areas/041_GreatFairies/tileSet/gAreaTileSetTypes_GreatFairies_bottom.bin.lz", "start": 3948468, - "size": 382, - "type": "metatiles_tile_types2" + "size": 384, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_GreatFairies_3.bin", + "path": "maps/areas/041_GreatFairies/tileSet/gAreaTileSetTypes_GreatFairies_top.bin.lz", "start": 3948852, - "size": 242, - "type": "metatiles_tile_types1" + "size": 244, + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_GreatFairies_0_0.bin", + "path": "maps/areas/041_GreatFairies/rooms/00_Graveyard/gAreaRoomMap_GreatFairies_Graveyard_bottom.bin.lz", "start": 3949096, - "size": 479, - "type": "map_layer2" + "size": 480, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_GreatFairies_0_1.bin", + "path": "maps/areas/041_GreatFairies/rooms/00_Graveyard/gAreaRoomMap_GreatFairies_Graveyard_top.bin.lz", "start": 3949576, - "size": 159, - "type": "map_layer1" + "size": 160, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_GreatFairies_1_0.bin", + "path": "maps/areas/041_GreatFairies/rooms/01_MinishWoods/gAreaRoomMap_GreatFairies_MinishWoods_bottom.bin.lz", "start": 3949736, "size": 468, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_GreatFairies_1_1.bin", + "path": "maps/areas/041_GreatFairies/rooms/01_MinishWoods/gAreaRoomMap_GreatFairies_MinishWoods_top.bin.lz", "start": 3950204, - "size": 159, - "type": "map_layer1" + "size": 160, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_GreatFairies_2_0.bin", + "path": "maps/areas/041_GreatFairies/rooms/02_Crenel/gAreaRoomMap_GreatFairies_Crenel_bottom.bin.lz", "start": 3950364, - "size": 475, - "type": "map_layer2" + "size": 476, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_GreatFairies_2_1.bin", + "path": "maps/areas/041_GreatFairies/rooms/02_Crenel/gAreaRoomMap_GreatFairies_Crenel_top.bin.lz", "start": 3950840, - "size": 159, - "type": "map_layer1" + "size": 160, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CastorCaves_0_0.bin", + "path": "maps/areas/042_CastorCaves/rooms/00_South/gAreaRoomMap_CastorCaves_South_bottom.bin.lz", "start": 3951000, "size": 304, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CastorCaves_0_1.bin", + "path": "maps/areas/042_CastorCaves/rooms/00_South/gAreaRoomMap_CastorCaves_South_top.bin.lz", "start": 3951304, "size": 76, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CastorCaves_1_0.bin", + "path": "maps/areas/042_CastorCaves/rooms/01_North/gAreaRoomMap_CastorCaves_North_bottom.bin.lz", "start": 3951380, - "size": 354, - "type": "map_layer2" + "size": 356, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CastorCaves_1_1.bin", + "path": "maps/areas/042_CastorCaves/rooms/01_North/gAreaRoomMap_CastorCaves_North_top.bin.lz", "start": 3951736, - "size": 69, - "type": "map_layer1" + "size": 72, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CastorCaves_2_0.bin", + "path": "maps/areas/042_CastorCaves/rooms/02_WindRuins/gAreaRoomMap_CastorCaves_WindRuins_bottom.bin.lz", "start": 3951808, - "size": 214, - "type": "map_layer2" + "size": 216, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CastorCaves_2_1.bin", + "path": "maps/areas/042_CastorCaves/rooms/02_WindRuins/gAreaRoomMap_CastorCaves_WindRuins_top.bin.lz", "start": 3952024, - "size": 113, - "type": "map_layer1" + "size": 116, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CastorCaves_3_0.bin", + "path": "maps/areas/042_CastorCaves/rooms/03_Darknut/gAreaRoomMap_CastorCaves_Darknut_bottom.bin.lz", "start": 3952140, - "size": 235, - "type": "map_layer2" + "size": 236, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CastorCaves_3_1.bin", + "path": "maps/areas/042_CastorCaves/rooms/03_Darknut/gAreaRoomMap_CastorCaves_Darknut_top.bin.lz", "start": 3952376, - "size": 113, - "type": "map_layer1" + "size": 116, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CastorCaves_4_0.bin", + "path": "maps/areas/042_CastorCaves/rooms/04_HeartPiece/gAreaRoomMap_CastorCaves_HeartPiece_bottom.bin.lz", "start": 3952492, - "size": 258, - "type": "map_layer2" + "size": 260, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CastorCaves_4_1.bin", + "path": "maps/areas/042_CastorCaves/rooms/04_HeartPiece/gAreaRoomMap_CastorCaves_HeartPiece_top.bin.lz", "start": 3952752, - "size": 50, - "type": "map_layer1" + "size": 52, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CastorDarknut_0_0.bin", + "path": "maps/areas/043_CastorDarknut/rooms/00_Main/gAreaRoomMap_CastorDarknut_Main_bottom.bin.lz", "start": 3952804, "size": 356, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CastorDarknut_0_1.bin", + "path": "maps/areas/043_CastorDarknut/rooms/00_Main/gAreaRoomMap_CastorDarknut_Main_top.bin.lz", "start": 3953160, - "size": 67, - "type": "map_layer1" + "size": 68, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CastorDarknut_1_0.bin", + "path": "maps/areas/043_CastorDarknut/rooms/01_Hall/gAreaRoomMap_CastorDarknut_Hall_bottom.bin.lz", "start": 3953228, - "size": 338, - "type": "map_layer2" + "size": 340, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CastorDarknut_1_1.bin", + "path": "maps/areas/043_CastorDarknut/rooms/01_Hall/gAreaRoomMap_CastorDarknut_Hall_top.bin.lz", "start": 3953568, - "size": 102, - "type": "map_layer1" + "size": 104, + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_ArmosInteriors_0_0.4bpp.lz", + "path": "maps/areas/044_ArmosInteriors/tileSets/0/gAreaTileSet_ArmosInteriors_0_0.4bpp.lz", "start": 3953672, - "size": 4505, - "type": "tileset" + "size": 4508, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_ArmosInteriors_0_1.4bpp.lz", + "path": "maps/areas/044_ArmosInteriors/tileSets/0/gAreaTileSet_ArmosInteriors_0_1.4bpp.lz", "start": 3958180, "size": 7140, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_ArmosInteriors_0_2.4bpp.lz", + "path": "maps/areas/044_ArmosInteriors/tileSets/0/gAreaTileSet_ArmosInteriors_0_2.4bpp.lz", "start": 3965320, - "size": 4507, - "type": "tileset" + "size": 4508, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_ArmosInteriors_0.bin", + "path": "maps/areas/044_ArmosInteriors/tileSet/gAreaTileSet_ArmosInteriors_bottom.bin.lz", "start": 3969828, - "size": 1905, - "type": "metatiles_tileset2" + "size": 1908, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_ArmosInteriors_1.bin", + "path": "maps/areas/044_ArmosInteriors/tileSet/gAreaTileSet_ArmosInteriors_top.bin.lz", "start": 3971736, - "size": 1905, - "type": "metatiles_tileset1" + "size": 1908, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_ArmosInteriors_2.bin", + "path": "maps/areas/044_ArmosInteriors/tileSet/gAreaTileSetTypes_ArmosInteriors_bottom.bin.lz", "start": 3973644, - "size": 279, - "type": "metatiles_tile_types2" + "size": 280, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_ArmosInteriors_3.bin", + "path": "maps/areas/044_ArmosInteriors/tileSet/gAreaTileSetTypes_ArmosInteriors_top.bin.lz", "start": 3973924, - "size": 283, - "type": "metatiles_tile_types1" + "size": 284, + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_ArmosInteriors_0_0.bin", + "path": "maps/areas/044_ArmosInteriors/rooms/00_RuinsEntranceNorth/gAreaRoomMap_ArmosInteriors_RuinsEntranceNorth_bottom.bin", "start": 3974208, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_ArmosInteriors_0_1.bin", + "path": "maps/areas/044_ArmosInteriors/rooms/00_RuinsEntranceNorth/gAreaRoomMap_ArmosInteriors_RuinsEntranceNorth_top.bin.lz", "start": 3974508, "size": 64, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_ArmosInteriors_1_0.bin", + "path": "maps/areas/044_ArmosInteriors/rooms/01_RuinsEntranceSouth/gAreaRoomMap_ArmosInteriors_RuinsEntranceSouth_bottom.bin", "start": 3974572, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_ArmosInteriors_1_1.bin", + "path": "maps/areas/044_ArmosInteriors/rooms/01_RuinsEntranceSouth/gAreaRoomMap_ArmosInteriors_RuinsEntranceSouth_top.bin.lz", "start": 3974872, "size": 64, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_ArmosInteriors_2_0.bin", + "path": "maps/areas/044_ArmosInteriors/rooms/02_RuinsLeft/gAreaRoomMap_ArmosInteriors_RuinsLeft_bottom.bin", "start": 3974936, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_ArmosInteriors_2_1.bin", + "path": "maps/areas/044_ArmosInteriors/rooms/02_RuinsLeft/gAreaRoomMap_ArmosInteriors_RuinsLeft_top.bin.lz", "start": 3975236, "size": 64, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_ArmosInteriors_3_0.bin", + "path": "maps/areas/044_ArmosInteriors/rooms/03_RuinsMiddleLeft/gAreaRoomMap_ArmosInteriors_RuinsMiddleLeft_bottom.bin", "start": 3975300, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_ArmosInteriors_3_1.bin", + "path": "maps/areas/044_ArmosInteriors/rooms/03_RuinsMiddleLeft/gAreaRoomMap_ArmosInteriors_RuinsMiddleLeft_top.bin.lz", "start": 3975600, "size": 64, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_ArmosInteriors_4_0.bin", + "path": "maps/areas/044_ArmosInteriors/rooms/04_RuinsMiddleRight/gAreaRoomMap_ArmosInteriors_RuinsMiddleRight_bottom.bin", "start": 3975664, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_ArmosInteriors_4_1.bin", + "path": "maps/areas/044_ArmosInteriors/rooms/04_RuinsMiddleRight/gAreaRoomMap_ArmosInteriors_RuinsMiddleRight_top.bin.lz", "start": 3975964, "size": 64, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_ArmosInteriors_5_0.bin", + "path": "maps/areas/044_ArmosInteriors/rooms/05_RuinsRight/gAreaRoomMap_ArmosInteriors_RuinsRight_bottom.bin", "start": 3976028, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_ArmosInteriors_5_1.bin", + "path": "maps/areas/044_ArmosInteriors/rooms/05_RuinsRight/gAreaRoomMap_ArmosInteriors_RuinsRight_top.bin.lz", "start": 3976328, "size": 64, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_ArmosInteriors_6_0.bin", + "path": "maps/areas/044_ArmosInteriors/rooms/06_6/gAreaRoomMap_ArmosInteriors_6_bottom.bin", "start": 3976392, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_ArmosInteriors_6_1.bin", + "path": "maps/areas/044_ArmosInteriors/rooms/06_6/gAreaRoomMap_ArmosInteriors_6_top.bin.lz", "start": 3976692, "size": 64, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_ArmosInteriors_7_0.bin", + "path": "maps/areas/044_ArmosInteriors/rooms/07_RuinsGrassPath/gAreaRoomMap_ArmosInteriors_RuinsGrassPath_bottom.bin", "start": 3976756, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_ArmosInteriors_7_1.bin", + "path": "maps/areas/044_ArmosInteriors/rooms/07_RuinsGrassPath/gAreaRoomMap_ArmosInteriors_RuinsGrassPath_top.bin.lz", "start": 3977056, "size": 64, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_ArmosInteriors_8_0.bin", + "path": "maps/areas/044_ArmosInteriors/rooms/08_8/gAreaRoomMap_ArmosInteriors_8_bottom.bin", "start": 3977120, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_ArmosInteriors_8_1.bin", + "path": "maps/areas/044_ArmosInteriors/rooms/08_8/gAreaRoomMap_ArmosInteriors_8_top.bin.lz", "start": 3977420, "size": 64, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_ArmosInteriors_9_0.bin", + "path": "maps/areas/044_ArmosInteriors/rooms/09_FortressLeft/gAreaRoomMap_ArmosInteriors_FortressLeft_bottom.bin", "start": 3977484, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_ArmosInteriors_9_1.bin", + "path": "maps/areas/044_ArmosInteriors/rooms/09_FortressLeft/gAreaRoomMap_ArmosInteriors_FortressLeft_top.bin.lz", "start": 3977784, "size": 64, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_ArmosInteriors_10_0.bin", + "path": "maps/areas/044_ArmosInteriors/rooms/10_FortressRight/gAreaRoomMap_ArmosInteriors_FortressRight_bottom.bin", "start": 3977848, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_ArmosInteriors_10_1.bin", + "path": "maps/areas/044_ArmosInteriors/rooms/10_FortressRight/gAreaRoomMap_ArmosInteriors_FortressRight_top.bin.lz", "start": 3978148, "size": 64, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_GoronCave_0_0.4bpp.lz", + "path": "maps/areas/047_GoronCave/tileSets/0/gAreaTileSet_GoronCave_0_0.4bpp.lz", "start": 3978212, "size": 7288, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_GoronCave_0_1.4bpp.lz", + "path": "maps/areas/047_GoronCave/tileSets/0/gAreaTileSet_GoronCave_0_1.4bpp.lz", "start": 3985500, - "size": 9418, - "type": "tileset" + "size": 9420, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_GoronCave_0_2.4bpp.lz", + "path": "maps/areas/047_GoronCave/tileSets/0/gAreaTileSet_GoronCave_0_2.4bpp.lz", "start": 3994920, - "size": 6654, - "type": "tileset" + "size": 6656, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_GoronCave_0.bin", + "path": "maps/areas/047_GoronCave/tileSet/gAreaTileSet_GoronCave_bottom.bin.lz", "start": 4001576, - "size": 6657, - "type": "metatiles_tileset2" + "size": 6660, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_GoronCave_1.bin", + "path": "maps/areas/047_GoronCave/tileSet/gAreaTileSet_GoronCave_top.bin.lz", "start": 4008236, "size": 6152, - "type": "metatiles_tileset1" + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_GoronCave_2.bin", + "path": "maps/areas/047_GoronCave/tileSet/gAreaTileSetTypes_GoronCave_bottom.bin.lz", "start": 4014388, "size": 1340, - "type": "metatiles_tile_types2" + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_GoronCave_3.bin", + "path": "maps/areas/047_GoronCave/tileSet/gAreaTileSetTypes_GoronCave_top.bin.lz", "start": 4015728, - "size": 1222, - "type": "metatiles_tile_types1" + "size": 1224, + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_GoronCave_0_0.bin", + "path": "maps/areas/047_GoronCave/rooms/00_Stairs/gAreaRoomMap_GoronCave_Stairs_bottom.bin.lz", "start": 4016952, - "size": 193, - "type": "map_layer2" + "size": 196, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_GoronCave_0_1.bin", + "path": "maps/areas/047_GoronCave/rooms/00_Stairs/gAreaRoomMap_GoronCave_Stairs_top.bin.lz", "start": 4017148, - "size": 66, - "type": "map_layer1" + "size": 68, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_GoronCave_1_0.bin", + "path": "maps/areas/047_GoronCave/rooms/01_Main/gAreaRoomMap_GoronCave_Main_bottom.bin.lz", "start": 4017216, "size": 644, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_GoronCave_1_1.bin", + "path": "maps/areas/047_GoronCave/rooms/01_Main/gAreaRoomMap_GoronCave_Main_top.bin.lz", "start": 4017860, "size": 204, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_0_0.bin", + "path": "maps/areas/050_Caves/rooms/00_Boomerang/gAreaRoomMap_Caves_Boomerang_bottom.bin.lz", "start": 4018064, - "size": 538, - "type": "map_layer2" + "size": 540, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_0_1.bin", + "path": "maps/areas/050_Caves/rooms/00_Boomerang/gAreaRoomMap_Caves_Boomerang_top.bin.lz", "start": 4018604, "size": 112, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_1_0.bin", + "path": "maps/areas/050_Caves/rooms/01_ToGraveyard/gAreaRoomMap_Caves_ToGraveyard_bottom.bin.lz", "start": 4018716, - "size": 467, - "type": "map_layer2" + "size": 468, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_1_1.bin", + "path": "maps/areas/050_Caves/rooms/01_ToGraveyard/gAreaRoomMap_Caves_ToGraveyard_top.bin.lz", "start": 4019184, - "size": 169, - "type": "map_layer1" + "size": 172, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_2_0.bin", + "path": "maps/areas/050_Caves/rooms/02_2/gAreaRoomMap_Caves_2_bottom.bin.lz", "start": 4019356, "size": 260, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_2_1.bin", + "path": "maps/areas/050_Caves/rooms/02_2/gAreaRoomMap_Caves_2_top.bin.lz", "start": 4019616, - "size": 43, - "type": "map_layer1" + "size": 44, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_3_0.bin", + "path": "maps/areas/050_Caves/rooms/03_3/gAreaRoomMap_Caves_3_bottom.bin.lz", "start": 4019660, - "size": 266, - "type": "map_layer2" + "size": 268, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_3_1.bin", + "path": "maps/areas/050_Caves/rooms/03_3/gAreaRoomMap_Caves_3_top.bin.lz", "start": 4019928, - "size": 43, - "type": "map_layer1" + "size": 44, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_4_0.bin", + "path": "maps/areas/050_Caves/rooms/04_4/gAreaRoomMap_Caves_4_bottom.bin.lz", "start": 4019972, - "size": 239, - "type": "map_layer2" + "size": 240, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_4_1.bin", + "path": "maps/areas/050_Caves/rooms/04_4/gAreaRoomMap_Caves_4_top.bin.lz", "start": 4020212, - "size": 43, - "type": "map_layer1" + "size": 44, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_5_0.bin", + "path": "maps/areas/050_Caves/rooms/05_5/gAreaRoomMap_Caves_5_bottom.bin.lz", "start": 4020256, - "size": 202, - "type": "map_layer2" + "size": 204, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_5_1.bin", + "path": "maps/areas/050_Caves/rooms/05_5/gAreaRoomMap_Caves_5_top.bin.lz", "start": 4020460, - "size": 43, - "type": "map_layer1" + "size": 44, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_6_0.bin", + "path": "maps/areas/050_Caves/rooms/06_6/gAreaRoomMap_Caves_6_bottom.bin.lz", "start": 4020504, - "size": 275, - "type": "map_layer2" + "size": 276, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_6_1.bin", + "path": "maps/areas/050_Caves/rooms/06_6/gAreaRoomMap_Caves_6_top.bin.lz", "start": 4020780, - "size": 150, - "type": "map_layer1" + "size": 152, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_7_0.bin", + "path": "maps/areas/050_Caves/rooms/07_TrilbyKeeseChest/gAreaRoomMap_Caves_TrilbyKeeseChest_bottom.bin.lz", "start": 4020932, - "size": 261, - "type": "map_layer2" + "size": 264, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_7_1.bin", + "path": "maps/areas/050_Caves/rooms/07_TrilbyKeeseChest/gAreaRoomMap_Caves_TrilbyKeeseChest_top.bin.lz", "start": 4021196, - "size": 82, - "type": "map_layer1" + "size": 84, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_8_0.bin", + "path": "maps/areas/050_Caves/rooms/08_TrilbyFairyFountain/gAreaRoomMap_Caves_TrilbyFairyFountain_bottom.bin.lz", "start": 4021280, - "size": 275, - "type": "map_layer2" + "size": 276, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_8_1.bin", + "path": "maps/areas/050_Caves/rooms/08_TrilbyFairyFountain/gAreaRoomMap_Caves_TrilbyFairyFountain_top.bin.lz", "start": 4021556, - "size": 61, - "type": "map_layer1" + "size": 64, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_9_0.bin", + "path": "maps/areas/050_Caves/rooms/09_SouthHyruleFieldFairyFountain/gAreaRoomMap_Caves_SouthHyruleFieldFairyFountain_bottom.bin.lz", "start": 4021620, "size": 256, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_9_1.bin", + "path": "maps/areas/050_Caves/rooms/09_SouthHyruleFieldFairyFountain/gAreaRoomMap_Caves_SouthHyruleFieldFairyFountain_top.bin.lz", "start": 4021876, "size": 96, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_10_0.bin", + "path": "maps/areas/050_Caves/rooms/10_A/gAreaRoomMap_Caves_A_bottom.bin.lz", "start": 4021972, - "size": 250, - "type": "map_layer2" + "size": 252, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_10_1.bin", + "path": "maps/areas/050_Caves/rooms/10_A/gAreaRoomMap_Caves_A_top.bin.lz", "start": 4022224, - "size": 50, - "type": "map_layer1" + "size": 52, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_11_0.bin", + "path": "maps/areas/050_Caves/rooms/11_HyruleTownWaterfall/gAreaRoomMap_Caves_HyruleTownWaterfall_bottom.bin.lz", "start": 4022276, "size": 260, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_11_1.bin", + "path": "maps/areas/050_Caves/rooms/11_HyruleTownWaterfall/gAreaRoomMap_Caves_HyruleTownWaterfall_top.bin.lz", "start": 4022536, - "size": 50, - "type": "map_layer1" + "size": 52, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_12_0.bin", + "path": "maps/areas/050_Caves/rooms/12_LonLonRanch/gAreaRoomMap_Caves_LonLonRanch_bottom.bin.lz", "start": 4022588, - "size": 357, - "type": "map_layer2" + "size": 360, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_12_1.bin", + "path": "maps/areas/050_Caves/rooms/12_LonLonRanch/gAreaRoomMap_Caves_LonLonRanch_top.bin.lz", "start": 4022948, - "size": 122, - "type": "map_layer1" + "size": 124, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_13_0.bin", + "path": "maps/areas/050_Caves/rooms/13_LonLonRanchSecret/gAreaRoomMap_Caves_LonLonRanchSecret_bottom.bin.lz", "start": 4023072, - "size": 258, - "type": "map_layer2" + "size": 260, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_13_1.bin", + "path": "maps/areas/050_Caves/rooms/13_LonLonRanchSecret/gAreaRoomMap_Caves_LonLonRanchSecret_top.bin.lz", "start": 4023332, - "size": 142, - "type": "map_layer1" + "size": 144, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_14_0.bin", + "path": "maps/areas/050_Caves/rooms/14_TrilbyHighlands/gAreaRoomMap_Caves_TrilbyHighlands_bottom.bin.lz", "start": 4023476, - "size": 303, - "type": "map_layer2" + "size": 304, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_14_1.bin", + "path": "maps/areas/050_Caves/rooms/14_TrilbyHighlands/gAreaRoomMap_Caves_TrilbyHighlands_top.bin.lz", "start": 4023780, - "size": 123, - "type": "map_layer1" + "size": 124, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_15_0.bin", + "path": "maps/areas/050_Caves/rooms/15_LonLonRanchWallet/gAreaRoomMap_Caves_LonLonRanchWallet_bottom.bin.lz", "start": 4023904, - "size": 265, - "type": "map_layer2" + "size": 268, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_15_1.bin", + "path": "maps/areas/050_Caves/rooms/15_LonLonRanchWallet/gAreaRoomMap_Caves_LonLonRanchWallet_top.bin.lz", "start": 4024172, - "size": 50, - "type": "map_layer1" + "size": 52, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_16_0.bin", + "path": "maps/areas/050_Caves/rooms/16_SouthHyruleFieldRupee/gAreaRoomMap_Caves_SouthHyruleFieldRupee_bottom.bin.lz", "start": 4024224, "size": 240, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_16_1.bin", + "path": "maps/areas/050_Caves/rooms/16_SouthHyruleFieldRupee/gAreaRoomMap_Caves_SouthHyruleFieldRupee_top.bin.lz", "start": 4024464, - "size": 50, - "type": "map_layer1" + "size": 52, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_17_0.bin", + "path": "maps/areas/050_Caves/rooms/17_TrilbyRupee/gAreaRoomMap_Caves_TrilbyRupee_bottom.bin.lz", "start": 4024516, - "size": 249, - "type": "map_layer2" + "size": 252, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_17_1.bin", + "path": "maps/areas/050_Caves/rooms/17_TrilbyRupee/gAreaRoomMap_Caves_TrilbyRupee_top.bin.lz", "start": 4024768, - "size": 50, - "type": "map_layer1" + "size": 52, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_18_0.bin", + "path": "maps/areas/050_Caves/rooms/18_TrilbyMittsFairyFountain/gAreaRoomMap_Caves_TrilbyMittsFairyFountain_bottom.bin.lz", "start": 4024820, - "size": 249, - "type": "map_layer2" + "size": 252, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_18_1.bin", + "path": "maps/areas/050_Caves/rooms/18_TrilbyMittsFairyFountain/gAreaRoomMap_Caves_TrilbyMittsFairyFountain_top.bin.lz", "start": 4025072, - "size": 43, - "type": "map_layer1" + "size": 44, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_19_0.bin", + "path": "maps/areas/050_Caves/rooms/19_HillsKeeseChest/gAreaRoomMap_Caves_HillsKeeseChest_bottom.bin.lz", "start": 4025116, - "size": 235, - "type": "map_layer2" + "size": 236, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_19_1.bin", + "path": "maps/areas/050_Caves/rooms/19_HillsKeeseChest/gAreaRoomMap_Caves_HillsKeeseChest_top.bin.lz", "start": 4025352, "size": 80, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_20_0.bin", + "path": "maps/areas/050_Caves/rooms/20_BottleBusinessScrub/gAreaRoomMap_Caves_BottleBusinessScrub_bottom.bin.lz", "start": 4025432, - "size": 231, - "type": "map_layer2" + "size": 232, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_20_1.bin", + "path": "maps/areas/050_Caves/rooms/20_BottleBusinessScrub/gAreaRoomMap_Caves_BottleBusinessScrub_top.bin.lz", "start": 4025664, - "size": 53, - "type": "map_layer1" + "size": 56, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_21_0.bin", + "path": "maps/areas/050_Caves/rooms/21_HeartPieceHallway/gAreaRoomMap_Caves_HeartPieceHallway_bottom.bin.lz", "start": 4025720, - "size": 223, - "type": "map_layer2" + "size": 224, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_21_1.bin", + "path": "maps/areas/050_Caves/rooms/21_HeartPieceHallway/gAreaRoomMap_Caves_HeartPieceHallway_top.bin.lz", "start": 4025944, - "size": 154, - "type": "map_layer1" + "size": 156, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_22_0.bin", + "path": "maps/areas/050_Caves/rooms/22_NorthHyruleFieldFairyFountain/gAreaRoomMap_Caves_NorthHyruleFieldFairyFountain_bottom.bin.lz", "start": 4026100, "size": 276, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_22_1.bin", + "path": "maps/areas/050_Caves/rooms/22_NorthHyruleFieldFairyFountain/gAreaRoomMap_Caves_NorthHyruleFieldFairyFountain_top.bin.lz", "start": 4026376, "size": 60, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_23_0.bin", + "path": "maps/areas/050_Caves/rooms/23_KinstoneBusinessScrub/gAreaRoomMap_Caves_KinstoneBusinessScrub_bottom.bin.lz", "start": 4026436, - "size": 195, - "type": "map_layer2" + "size": 196, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Caves_23_1.bin", + "path": "maps/areas/050_Caves/rooms/23_KinstoneBusinessScrub/gAreaRoomMap_Caves_KinstoneBusinessScrub_top.bin.lz", "start": 4026632, - "size": 50, - "type": "map_layer1" + "size": 52, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsCaves_0_0.bin", + "path": "maps/areas/051_VeilFallsCaves/rooms/00_Hallway2f/gAreaRoomMap_VeilFallsCaves_Hallway2f_bottom.bin.lz", "start": 4026684, - "size": 289, - "type": "map_layer2" + "size": 292, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsCaves_0_1.bin", + "path": "maps/areas/051_VeilFallsCaves/rooms/00_Hallway2f/gAreaRoomMap_VeilFallsCaves_Hallway2f_top.bin.lz", "start": 4026976, - "size": 105, - "type": "map_layer1" + "size": 108, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsCaves_1_0.bin", + "path": "maps/areas/051_VeilFallsCaves/rooms/01_Hallway1f/gAreaRoomMap_VeilFallsCaves_Hallway1f_bottom.bin.lz", "start": 4027084, - "size": 401, - "type": "map_layer2" + "size": 404, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsCaves_1_1.bin", + "path": "maps/areas/051_VeilFallsCaves/rooms/01_Hallway1f/gAreaRoomMap_VeilFallsCaves_Hallway1f_top.bin.lz", "start": 4027488, - "size": 189, - "type": "map_layer1" + "size": 192, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsCaves_2_0.bin", + "path": "maps/areas/051_VeilFallsCaves/rooms/02_HallwaySecretRoom/gAreaRoomMap_VeilFallsCaves_HallwaySecretRoom_bottom.bin.lz", "start": 4027680, - "size": 218, - "type": "map_layer2" + "size": 220, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsCaves_2_1.bin", + "path": "maps/areas/051_VeilFallsCaves/rooms/02_HallwaySecretRoom/gAreaRoomMap_VeilFallsCaves_HallwaySecretRoom_top.bin.lz", "start": 4027900, "size": 148, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsCaves_3_0.bin", + "path": "maps/areas/051_VeilFallsCaves/rooms/03_Entrance/gAreaRoomMap_VeilFallsCaves_Entrance_bottom.bin.lz", "start": 4028048, - "size": 314, - "type": "map_layer2" + "size": 316, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsCaves_3_1.bin", + "path": "maps/areas/051_VeilFallsCaves/rooms/03_Entrance/gAreaRoomMap_VeilFallsCaves_Entrance_top.bin.lz", "start": 4028364, "size": 76, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsCaves_4_0.bin", + "path": "maps/areas/051_VeilFallsCaves/rooms/04_Exit/gAreaRoomMap_VeilFallsCaves_Exit_bottom.bin.lz", "start": 4028440, - "size": 221, - "type": "map_layer2" + "size": 224, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsCaves_4_1.bin", + "path": "maps/areas/051_VeilFallsCaves/rooms/04_Exit/gAreaRoomMap_VeilFallsCaves_Exit_top.bin.lz", "start": 4028664, "size": 116, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsCaves_5_0.bin", + "path": "maps/areas/051_VeilFallsCaves/rooms/05_SecretChest/gAreaRoomMap_VeilFallsCaves_SecretChest_bottom.bin.lz", "start": 4028780, "size": 200, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsCaves_5_1.bin", + "path": "maps/areas/051_VeilFallsCaves/rooms/05_SecretChest/gAreaRoomMap_VeilFallsCaves_SecretChest_top.bin.lz", "start": 4028980, - "size": 135, - "type": "map_layer1" + "size": 136, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsCaves_6_0.bin", + "path": "maps/areas/051_VeilFallsCaves/rooms/06_HallwaySecretStaircase/gAreaRoomMap_VeilFallsCaves_HallwaySecretStaircase_bottom.bin.lz", "start": 4029116, - "size": 194, - "type": "map_layer2" + "size": 196, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsCaves_6_1.bin", + "path": "maps/areas/051_VeilFallsCaves/rooms/06_HallwaySecretStaircase/gAreaRoomMap_VeilFallsCaves_HallwaySecretStaircase_top.bin.lz", "start": 4029312, - "size": 110, - "type": "map_layer1" + "size": 112, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsCaves_7_0.bin", + "path": "maps/areas/051_VeilFallsCaves/rooms/07_HallwayBlockPuzzle/gAreaRoomMap_VeilFallsCaves_HallwayBlockPuzzle_bottom.bin.lz", "start": 4029424, - "size": 382, - "type": "map_layer2" + "size": 384, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsCaves_7_1.bin", + "path": "maps/areas/051_VeilFallsCaves/rooms/07_HallwayBlockPuzzle/gAreaRoomMap_VeilFallsCaves_HallwayBlockPuzzle_top.bin.lz", "start": 4029808, - "size": 139, - "type": "map_layer1" + "size": 140, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsCaves_8_0.bin", + "path": "maps/areas/051_VeilFallsCaves/rooms/08_HallwayRupeePath/gAreaRoomMap_VeilFallsCaves_HallwayRupeePath_bottom.bin.lz", "start": 4029948, - "size": 461, - "type": "map_layer2" + "size": 464, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsCaves_8_1.bin", + "path": "maps/areas/051_VeilFallsCaves/rooms/08_HallwayRupeePath/gAreaRoomMap_VeilFallsCaves_HallwayRupeePath_top.bin.lz", "start": 4030412, - "size": 141, - "type": "map_layer1" + "size": 144, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsCaves_9_0.bin", + "path": "maps/areas/051_VeilFallsCaves/rooms/09_HallwayHeartPiece/gAreaRoomMap_VeilFallsCaves_HallwayHeartPiece_bottom.bin.lz", "start": 4030556, - "size": 283, - "type": "map_layer2" + "size": 284, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsCaves_9_1.bin", + "path": "maps/areas/051_VeilFallsCaves/rooms/09_HallwayHeartPiece/gAreaRoomMap_VeilFallsCaves_HallwayHeartPiece_top.bin.lz", "start": 4030840, - "size": 50, - "type": "map_layer1" + "size": 52, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalValleyGraves_0_0.bin", + "path": "maps/areas/052_RoyalValleyGraves/rooms/00_HeartPiece/gAreaRoomMap_RoyalValleyGraves_HeartPiece_bottom.bin.lz", "start": 4030892, - "size": 282, - "type": "map_layer2" + "size": 284, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalValleyGraves_0_1.bin", + "path": "maps/areas/052_RoyalValleyGraves/rooms/00_HeartPiece/gAreaRoomMap_RoyalValleyGraves_HeartPiece_top.bin.lz", "start": 4031176, - "size": 50, - "type": "map_layer1" + "size": 52, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalValleyGraves_1_0.bin", + "path": "maps/areas/052_RoyalValleyGraves/rooms/01_Gina/gAreaRoomMap_RoyalValleyGraves_Gina_bottom.bin.lz", "start": 4031228, - "size": 363, - "type": "map_layer2" + "size": 364, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalValleyGraves_1_1.bin", + "path": "maps/areas/052_RoyalValleyGraves/rooms/01_Gina/gAreaRoomMap_RoyalValleyGraves_Gina_top.bin.lz", "start": 4031592, "size": 92, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_MinishCaves_0_0.4bpp.lz", + "path": "maps/areas/053_MinishCaves/tileSets/0/gAreaTileSet_MinishCaves_0_0.4bpp.lz", "start": 4031684, "size": 8544, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_MinishCaves_0_1.4bpp.lz", + "path": "maps/areas/053_MinishCaves/tileSets/0/gAreaTileSet_MinishCaves_0_1.4bpp.lz", "start": 4040228, - "size": 8711, - "type": "tileset" + "size": 8712, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_MinishCaves_0_2.4bpp.lz", + "path": "maps/areas/053_MinishCaves/tileSets/0/gAreaTileSet_MinishCaves_0_2.4bpp.lz", "start": 4048940, - "size": 5071, - "type": "tileset" + "size": 5072, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_MinishCaves_0.bin", + "path": "maps/areas/053_MinishCaves/tileSet/gAreaTileSet_MinishCaves_bottom.bin.lz", "start": 4054012, - "size": 7737, - "type": "metatiles_tileset2" + "size": 7740, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_MinishCaves_1.bin", + "path": "maps/areas/053_MinishCaves/tileSet/gAreaTileSet_MinishCaves_top.bin.lz", "start": 4061752, - "size": 4470, - "type": "metatiles_tileset1" + "size": 4472, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_MinishCaves_2.bin", + "path": "maps/areas/053_MinishCaves/tileSet/gAreaTileSetTypes_MinishCaves_bottom.bin.lz", "start": 4066224, - "size": 1185, - "type": "metatiles_tile_types2" + "size": 1188, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_MinishCaves_3.bin", + "path": "maps/areas/053_MinishCaves/tileSet/gAreaTileSetTypes_MinishCaves_top.bin.lz", "start": 4067412, - "size": 898, - "type": "metatiles_tile_types1" + "size": 900, + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_37_0_0.4bpp.lz", + "path": "maps/areas/054_CastleGardenMinishHoles/tileSets/0/gAreaTileSet_CastleGardenMinishHoles_0_0.4bpp.lz", "start": 4068312, "size": 5060, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_37_0_1.4bpp.lz", + "path": "maps/areas/054_CastleGardenMinishHoles/tileSets/0/gAreaTileSet_CastleGardenMinishHoles_0_1.4bpp.lz", "start": 4073372, - "size": 4506, - "type": "tileset" + "size": 4508, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_37_0_2.4bpp.lz", + "path": "maps/areas/054_CastleGardenMinishHoles/tileSets/0/gAreaTileSet_CastleGardenMinishHoles_0_2.4bpp.lz", "start": 4077880, - "size": 3319, - "type": "tileset" + "size": 3320, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_CastleGardenMinishHoles_0.bin", + "path": "maps/areas/054_CastleGardenMinishHoles/tileSet/gAreaTileSet_CastleGardenMinishHoles_bottom.bin.lz", "start": 4081200, - "size": 2594, - "type": "metatiles_tileset2" + "size": 2596, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_CastleGardenMinishHoles_1.bin", + "path": "maps/areas/054_CastleGardenMinishHoles/tileSet/gAreaTileSet_CastleGardenMinishHoles_top.bin.lz", "start": 4083796, - "size": 2750, - "type": "metatiles_tileset1" + "size": 2752, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_CastleGardenMinishHoles_2.bin", + "path": "maps/areas/054_CastleGardenMinishHoles/tileSet/gAreaTileSetTypes_CastleGardenMinishHoles_bottom.bin.lz", "start": 4086548, - "size": 390, - "type": "metatiles_tile_types2" + "size": 392, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_CastleGardenMinishHoles_3.bin", + "path": "maps/areas/054_CastleGardenMinishHoles/tileSet/gAreaTileSetTypes_CastleGardenMinishHoles_top.bin.lz", "start": 4086940, - "size": 283, - "type": "metatiles_tile_types1" + "size": 284, + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_MinishCaves_0_0.bin", + "path": "maps/areas/053_MinishCaves/rooms/00_BeanPesto/gAreaRoomMap_MinishCaves_BeanPesto_bottom.bin.lz", "start": 4087224, - "size": 797, - "type": "map_layer2" + "size": 800, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCaves_0_1.bin", + "path": "maps/areas/053_MinishCaves/rooms/00_BeanPesto/gAreaRoomMap_MinishCaves_BeanPesto_top.bin.lz", "start": 4088024, - "size": 181, - "type": "map_layer1" + "size": 184, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCaves_1_0.bin", + "path": "maps/areas/053_MinishCaves/rooms/01_SoutheastWater1/gAreaRoomMap_MinishCaves_SoutheastWater1_bottom.bin.lz", "start": 4088208, - "size": 735, - "type": "map_layer2" + "size": 736, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCaves_1_1.bin", + "path": "maps/areas/053_MinishCaves/rooms/01_SoutheastWater1/gAreaRoomMap_MinishCaves_SoutheastWater1_top.bin.lz", "start": 4088944, "size": 164, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCaves_2_0.bin", + "path": "maps/areas/053_MinishCaves/rooms/02_2/gAreaRoomMap_MinishCaves_2_bottom.bin.lz", "start": 4089108, "size": 352, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCaves_2_1.bin", + "path": "maps/areas/053_MinishCaves/rooms/02_2/gAreaRoomMap_MinishCaves_2_top.bin.lz", "start": 4089460, - "size": 89, - "type": "map_layer1" + "size": 92, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCaves_3_0.bin", + "path": "maps/areas/053_MinishCaves/rooms/03_Ruins/gAreaRoomMap_MinishCaves_Ruins_bottom.bin.lz", "start": 4089552, - "size": 751, - "type": "map_layer2" + "size": 752, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCaves_3_1.bin", + "path": "maps/areas/053_MinishCaves/rooms/03_Ruins/gAreaRoomMap_MinishCaves_Ruins_top.bin.lz", "start": 4090304, "size": 196, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCaves_4_0.bin", + "path": "maps/areas/053_MinishCaves/rooms/04_OutsideLinksHouse/gAreaRoomMap_MinishCaves_OutsideLinksHouse_bottom.bin.lz", "start": 4090500, - "size": 386, - "type": "map_layer2" + "size": 388, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCaves_4_1.bin", + "path": "maps/areas/053_MinishCaves/rooms/04_OutsideLinksHouse/gAreaRoomMap_MinishCaves_OutsideLinksHouse_top.bin.lz", "start": 4090888, - "size": 79, - "type": "map_layer1" + "size": 80, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCaves_5_0.bin", + "path": "maps/areas/053_MinishCaves/rooms/05_MinishWoodsNorth1/gAreaRoomMap_MinishCaves_MinishWoodsNorth1_bottom.bin.lz", "start": 4090968, - "size": 498, - "type": "map_layer2" + "size": 500, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCaves_5_1.bin", + "path": "maps/areas/053_MinishCaves/rooms/05_MinishWoodsNorth1/gAreaRoomMap_MinishCaves_MinishWoodsNorth1_top.bin.lz", "start": 4091468, "size": 112, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCaves_6_0.bin", + "path": "maps/areas/053_MinishCaves/rooms/06_6/gAreaRoomMap_MinishCaves_6_bottom.bin.lz", "start": 4091580, - "size": 491, - "type": "map_layer2" + "size": 492, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCaves_6_1.bin", + "path": "maps/areas/053_MinishCaves/rooms/06_6/gAreaRoomMap_MinishCaves_6_top.bin.lz", "start": 4092072, "size": 104, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCaves_7_0.bin", + "path": "maps/areas/053_MinishCaves/rooms/07_LakeHyliaNorth/gAreaRoomMap_MinishCaves_LakeHyliaNorth_bottom.bin.lz", "start": 4092176, - "size": 1062, - "type": "map_layer2" + "size": 1064, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCaves_7_1.bin", + "path": "maps/areas/053_MinishCaves/rooms/07_LakeHyliaNorth/gAreaRoomMap_MinishCaves_LakeHyliaNorth_top.bin.lz", "start": 4093240, - "size": 271, - "type": "map_layer1" + "size": 272, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCaves_8_0.bin", + "path": "maps/areas/053_MinishCaves/rooms/08_LakeHyliaLibrari/gAreaRoomMap_MinishCaves_LakeHyliaLibrari_bottom.bin.lz", "start": 4093512, - "size": 661, - "type": "map_layer2" + "size": 664, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCaves_8_1.bin", + "path": "maps/areas/053_MinishCaves/rooms/08_LakeHyliaLibrari/gAreaRoomMap_MinishCaves_LakeHyliaLibrari_top.bin.lz", "start": 4094176, - "size": 149, - "type": "map_layer1" + "size": 152, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCaves_9_0.bin", + "path": "maps/areas/053_MinishCaves/rooms/09_MinishWoodsSouthwest/gAreaRoomMap_MinishCaves_MinishWoodsSouthwest_bottom.bin.lz", "start": 4094328, - "size": 1021, - "type": "map_layer2" + "size": 1024, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCaves_9_1.bin", + "path": "maps/areas/053_MinishCaves/rooms/09_MinishWoodsSouthwest/gAreaRoomMap_MinishCaves_MinishWoodsSouthwest_top.bin.lz", "start": 4095352, - "size": 210, - "type": "map_layer1" + "size": 212, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CastleGardenMinishHoles_0_0.bin", + "path": "maps/areas/054_CastleGardenMinishHoles/rooms/00_0/gAreaRoomMap_CastleGardenMinishHoles_0_bottom.bin.lz", "start": 4095564, - "size": 415, - "type": "map_layer2" + "size": 416, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CastleGardenMinishHoles_0_1.bin", + "path": "maps/areas/054_CastleGardenMinishHoles/rooms/00_0/gAreaRoomMap_CastleGardenMinishHoles_0_top.bin.lz", "start": 4095980, - "size": 73, - "type": "map_layer1" + "size": 76, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CastleGardenMinishHoles_1_0.bin", + "path": "maps/areas/054_CastleGardenMinishHoles/rooms/01_1/gAreaRoomMap_CastleGardenMinishHoles_1_bottom.bin.lz", "start": 4096056, - "size": 409, - "type": "map_layer2" + "size": 412, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CastleGardenMinishHoles_1_1.bin", + "path": "maps/areas/054_CastleGardenMinishHoles/rooms/01_1/gAreaRoomMap_CastleGardenMinishHoles_1_top.bin.lz", "start": 4096468, - "size": 73, - "type": "map_layer1" + "size": 76, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_37_0_0.bin", + "path": "maps/areas/055_37/rooms/00_0/gAreaRoomMap_37_0_bottom.bin.lz", "start": 4096544, "size": 436, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_37_0_1.bin", + "path": "maps/areas/055_37/rooms/00_0/gAreaRoomMap_37_0_top.bin.lz", "start": 4096980, - "size": 150, - "type": "map_layer1" + "size": 152, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_37_1_0.bin", + "path": "maps/areas/055_37/rooms/01_1/gAreaRoomMap_37_1_bottom.bin.lz", "start": 4097132, - "size": 429, - "type": "map_layer2" + "size": 432, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_37_1_1.bin", + "path": "maps/areas/055_37/rooms/01_1/gAreaRoomMap_37_1_top.bin.lz", "start": 4097564, - "size": 171, - "type": "map_layer1" + "size": 172, + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_LakeWoodsCave_0_3.4bpp.lz", + "path": "maps/areas/000_MinishWoods/tileSets/1/gAreaTileSet_MinishWoods_1_0.4bpp.lz", "start": 4097736, - "size": 4118, - "type": "tileset" + "size": 4120, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_LakeWoodsCave_0_4.4bpp.lz", + "path": "maps/areas/000_MinishWoods/tileSets/1/gAreaTileSet_MinishWoods_1_1.4bpp.lz", "start": 4101856, "size": 2564, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_HyruleDigCaves_0_3.4bpp.lz", + "path": "maps/areas/015_HyruleDigCaves/tileSets/0/gAreaTileSet_HyruleDigCaves_0_3.4bpp.lz", "start": 4104420, "size": 3616, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_HyruleDigCaves_0_4.4bpp.lz", + "path": "maps/areas/015_HyruleDigCaves/tileSets/0/gAreaTileSet_HyruleDigCaves_0_4.4bpp.lz", "start": 4108036, - "size": 2519, - "type": "tileset" + "size": 2520, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_VeilFallsDigCave_0_3.4bpp.lz", + "path": "maps/areas/020_CrenelDigCave/tileSets/0/gAreaTileSet_CrenelDigCave_0_3.4bpp.lz", "start": 4110556, "size": 4456, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_VeilFallsDigCave_0_4.4bpp.lz", + "path": "maps/areas/020_CrenelDigCave/tileSets/0/gAreaTileSet_CrenelDigCave_0_4.4bpp.lz", "start": 4115012, - "size": 2986, - "type": "tileset" + "size": 2988, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_DigCaves1_0_3.4bpp.lz", + "path": "maps/areas/019_DigCaves/tileSets/0/gAreaTileSet_DigCaves_0_3.4bpp.lz", "start": 4118000, "size": 3808, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_DigCaves1_0_4.4bpp.lz", + "path": "maps/areas/019_DigCaves/tileSets/0/gAreaTileSet_DigCaves_0_4.4bpp.lz", "start": 4121808, - "size": 2769, - "type": "tileset" + "size": 2772, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_OuterFortressOfWinds_0_3.4bpp.lz", + "path": "maps/areas/023_CastorWildsDigCave/tileSets/0/gAreaTileSet_CastorWildsDigCave_0_3.4bpp.lz", "start": 4124580, - "size": 5015, - "type": "tileset" + "size": 5016, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_OuterFortressOfWinds_0_4.4bpp.lz", + "path": "maps/areas/023_CastorWildsDigCave/tileSets/0/gAreaTileSet_CastorWildsDigCave_0_4.4bpp.lz", "start": 4129596, "size": 2780, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_HyliaDigCaves_0_3.4bpp.lz", + "path": "maps/areas/025_HyliaDigCaves/tileSets/0/gAreaTileSet_HyliaDigCaves_0_3.4bpp.lz", "start": 4132376, - "size": 3117, - "type": "tileset" + "size": 3120, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_HyliaDigCaves_0_4.4bpp.lz", + "path": "maps/areas/025_HyliaDigCaves/tileSets/0/gAreaTileSet_HyliaDigCaves_0_4.4bpp.lz", "start": 4135496, "size": 2564, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_LakeWoodsCave_0_0.bin", + "path": "maps/areas/012_LakeWoodsCave/rooms/00_Main/gAreaRoomMap_LakeWoodsCave_Main_bottom.bin.lz", "start": 4138060, "size": 1344, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/unknown_12.bin", + "path": "maps/areas/012_LakeWoodsCave/rooms/00_Main/gCaveBorder_LakeWoods_inside.bin.lz", "start": 4139404, "size": 1028, - "type": "unknown" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_LakeWoodsCave_0_1.bin", + "path": "maps/areas/012_LakeWoodsCave/rooms/00_Main/gAreaRoomMap_LakeWoodsCave_Main_top.bin.lz", "start": 4140432, - "size": 1261, - "type": "map_layer1" + "size": 1264, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyliaDigCaves_0_0.bin", + "path": "maps/areas/025_HyliaDigCaves/rooms/00_0/gAreaRoomMap_HyliaDigCaves_0_bottom.bin.lz", "start": 4141696, "size": 188, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/unknown_13.bin", + "path": "maps/areas/025_HyliaDigCaves/rooms/00_0/gCaveBorder_LakeHyliaCenter_inside.bin.lz", "start": 4141884, "size": 116, - "type": "unknown" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyliaDigCaves_0_1.bin", + "path": "maps/areas/025_HyliaDigCaves/rooms/00_0/gAreaRoomMap_HyliaDigCaves_0_top.bin.lz", "start": 4142000, - "size": 170, - "type": "map_layer1" + "size": 172, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyliaDigCaves_1_0.bin", + "path": "maps/areas/025_HyliaDigCaves/rooms/01_1/gAreaRoomMap_HyliaDigCaves_1_bottom.bin.lz", "start": 4142172, - "size": 946, - "type": "map_layer2" + "size": 948, + "type": "tileMap" }, { - "path": "assets/unknown_14.bin", + "path": "maps/areas/025_HyliaDigCaves/rooms/01_1/gCaveBorder_LakeHyliaNorth_inside.bin.lz", "start": 4143120, "size": 460, - "type": "unknown" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyliaDigCaves_1_1.bin", + "path": "maps/areas/025_HyliaDigCaves/rooms/01_1/gAreaRoomMap_HyliaDigCaves_1_top.bin.lz", "start": 4143580, - "size": 981, - "type": "map_layer1" + "size": 984, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CastorWildsDigCave_0_0.bin", + "path": "maps/areas/023_CastorWildsDigCave/rooms/00_0/gAreaRoomMap_CastorWildsDigCave_0_bottom.bin.lz", "start": 4144564, "size": 1080, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/unknown_15.bin", + "path": "maps/areas/023_CastorWildsDigCave/rooms/00_0/gCaveBorder_CastorWilds_inside.bin.lz", "start": 4145644, "size": 964, - "type": "unknown" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CastorWildsDigCave_0_1.bin", + "path": "maps/areas/023_CastorWildsDigCave/rooms/00_0/gAreaRoomMap_CastorWildsDigCave_0_top.bin.lz", "start": 4146608, - "size": 1045, - "type": "map_layer1" + "size": 1048, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleDigCaves_0_0.bin", + "path": "maps/areas/015_HyruleDigCaves/rooms/00_Town/gAreaRoomMap_HyruleDigCaves_Town_bottom.bin.lz", "start": 4147656, - "size": 1311, - "type": "map_layer2" + "size": 1312, + "type": "tileMap" }, { - "path": "assets/unknown_16.bin", + "path": "maps/areas/015_HyruleDigCaves/rooms/00_Town/gCaveBorder_HyruleTown_inside.bin.lz", "start": 4148968, "size": 956, - "type": "unknown" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleDigCaves_0_1.bin", + "path": "maps/areas/015_HyruleDigCaves/rooms/00_Town/gAreaRoomMap_HyruleDigCaves_Town_top.bin.lz", "start": 4149924, - "size": 1343, - "type": "map_layer1" + "size": 1344, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelDigCave_0_0.bin", + "path": "maps/areas/020_CrenelDigCave/rooms/00_0/gAreaRoomMap_CrenelDigCave_0_bottom.bin.lz", "start": 4151268, - "size": 805, - "type": "map_layer2" + "size": 808, + "type": "tileMap" }, { - "path": "assets/unknown_17.bin", + "path": "maps/areas/020_CrenelDigCave/rooms/00_0/gCaveBorder_Crenel_inside.bin.lz", "start": 4152076, "size": 280, - "type": "unknown" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelDigCave_0_1.bin", + "path": "maps/areas/020_CrenelDigCave/rooms/00_0/gAreaRoomMap_CrenelDigCave_0_top.bin.lz", "start": 4152356, - "size": 717, - "type": "map_layer1" + "size": 720, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DigCaves_0_0.bin", + "path": "maps/areas/019_DigCaves/rooms/00_EasternHills/gAreaRoomMap_DigCaves_EasternHills_bottom.bin.lz", "start": 4153076, "size": 400, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/unknown_18.bin", + "path": "maps/areas/019_DigCaves/rooms/00_EasternHills/gCaveBorder_EasternHills_inside.bin.lz", "start": 4153476, "size": 296, - "type": "unknown" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DigCaves_0_1.bin", + "path": "maps/areas/019_DigCaves/rooms/00_EasternHills/gAreaRoomMap_DigCaves_EasternHills_top.bin.lz", "start": 4153772, - "size": 435, - "type": "map_layer1" + "size": 436, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DigCaves_1_0.bin", + "path": "maps/areas/019_DigCaves/rooms/03_TrilbyHighlands/gAreaRoomMap_DigCaves_TrilbyHighlands_bottom.bin.lz", "start": 4154208, - "size": 719, - "type": "map_layer2" + "size": 720, + "type": "tileMap" }, { - "path": "assets/unknown_19.bin", + "path": "maps/areas/019_DigCaves/rooms/03_TrilbyHighlands/gCaveBorder_TrilbyHighlands_inside.bin.lz", "start": 4154928, "size": 480, - "type": "unknown" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DigCaves_1_1.bin", + "path": "maps/areas/019_DigCaves/rooms/03_TrilbyHighlands/gAreaRoomMap_DigCaves_TrilbyHighlands_top.bin.lz", "start": 4155408, - "size": 723, - "type": "map_layer1" + "size": 724, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsDigCave_0_0.bin", + "path": "maps/areas/022_VeilFallsDigCave/rooms/00_0/gAreaRoomMap_VeilFallsDigCave_0_bottom.bin.lz", "start": 4156132, - "size": 754, - "type": "map_layer2" + "size": 756, + "type": "tileMap" }, { - "path": "assets/unknown_20.bin", + "path": "maps/areas/022_VeilFallsDigCave/rooms/00_0/gCaveBorder_VeilFalls_inside.bin.lz", "start": 4156888, "size": 520, - "type": "unknown" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VeilFallsDigCave_0_1.bin", + "path": "maps/areas/022_VeilFallsDigCave/rooms/00_0/gAreaRoomMap_VeilFallsDigCave_0_top.bin.lz", "start": 4157408, - "size": 737, - "type": "map_layer1" + "size": 740, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_OuterFortressOfWinds_0_0.bin", + "path": "maps/areas/024_OuterFortressOfWinds/rooms/00_EntranceHall/gAreaRoomMap_OuterFortressOfWinds_EntranceHall_bottom.bin.lz", "start": 4158148, - "size": 367, - "type": "map_layer2" + "size": 368, + "type": "tileMap" }, { "path": "assets/unknown_21.bin", "start": 4158516, "size": 192, - "type": "unknown" + "type": "unknown", + "TODO": "0x5fe * 0" }, { - "path": "assets/gAreaRoomMap_OuterFortressOfWinds_0_1.bin", + "path": "maps/areas/024_OuterFortressOfWinds/rooms/00_EntranceHall/gAreaRoomMap_OuterFortressOfWinds_EntranceHall_top.bin.lz", "start": 4158708, - "size": 409, - "type": "map_layer1" + "size": 412, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_OuterFortressOfWinds_1_0.bin", + "path": "maps/areas/024_OuterFortressOfWinds/rooms/01_2f/gAreaRoomMap_OuterFortressOfWinds_2f_bottom.bin.lz", "start": 4159120, - "size": 565, - "type": "map_layer2" + "size": 568, + "type": "tileMap" }, { "path": "assets/unknown_22.bin", "start": 4159688, "size": 296, - "type": "unknown" + "type": "unknown", + "TODO": "tileMap 59x20 or 20x59?" }, { - "path": "assets/gAreaRoomMap_OuterFortressOfWinds_1_1.bin", + "path": "maps/areas/024_OuterFortressOfWinds/rooms/01_2f/gAreaRoomMap_OuterFortressOfWinds_2f_top.bin.lz", "start": 4159984, - "size": 678, - "type": "map_layer1" + "size": 680, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_OuterFortressOfWinds_2_0.bin", + "path": "maps/areas/024_OuterFortressOfWinds/rooms/02_3f/gAreaRoomMap_OuterFortressOfWinds_3f_bottom.bin.lz", "start": 4160664, - "size": 446, - "type": "map_layer2" + "size": 448, + "type": "tileMap" }, { "path": "assets/unknown_23.bin", "start": 4161112, "size": 192, - "type": "unknown" + "type": "unknown", + "TODO": "0x5fe * 0" }, { - "path": "assets/gAreaRoomMap_OuterFortressOfWinds_2_1.bin", + "path": "maps/areas/024_OuterFortressOfWinds/rooms/02_3f/gAreaRoomMap_OuterFortressOfWinds_3f_top.bin.lz", "start": 4161304, - "size": 482, - "type": "map_layer1" + "size": 484, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_OuterFortressOfWinds_3_0.bin", + "path": "maps/areas/024_OuterFortressOfWinds/rooms/03_MoleMitts/gAreaRoomMap_OuterFortressOfWinds_MoleMitts_bottom.bin.lz", "start": 4161788, - "size": 161, - "type": "map_layer2" + "size": 164, + "type": "tileMap" }, { "path": "assets/unknown_24.bin", "start": 4161952, "size": 76, - "type": "unknown" + "type": "unknown", + "TODO": "tileMap 19x13" }, { - "path": "assets/gAreaRoomMap_OuterFortressOfWinds_3_1.bin", + "path": "maps/areas/024_OuterFortressOfWinds/rooms/03_MoleMitts/gAreaRoomMap_OuterFortressOfWinds_MoleMitts_top.bin.lz", "start": 4162028, - "size": 265, - "type": "map_layer1" + "size": 268, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_OuterFortressOfWinds_4_0.bin", + "path": "maps/areas/024_OuterFortressOfWinds/rooms/04_SmallKey/gAreaRoomMap_OuterFortressOfWinds_SmallKey_bottom.bin.lz", "start": 4162296, - "size": 174, - "type": "map_layer2" + "size": 176, + "type": "tileMap" }, { "path": "assets/unknown_25.bin", "start": 4162472, "size": 60, - "type": "unknown" + "type": "unknown", + "TODO": "tileMap 13x15 or 15x13" }, { - "path": "assets/gAreaRoomMap_OuterFortressOfWinds_4_1.bin", + "path": "maps/areas/024_OuterFortressOfWinds/rooms/04_SmallKey/gAreaRoomMap_OuterFortressOfWinds_SmallKey_top.bin.lz", "start": 4162532, - "size": 186, - "type": "map_layer1" + "size": 188, + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_MinishVillage_0_0.4bpp.lz", + "path": "maps/areas/001_MinishVillage/tileSets/0/gAreaTileSet_MinishVillage_0_0.4bpp.lz", "start": 4162720, - "size": 6774, - "type": "tileset" + "size": 6776, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_MinishVillage_0_1.4bpp.lz", + "path": "maps/areas/001_MinishVillage/tileSets/0/gAreaTileSet_MinishVillage_0_1.4bpp.lz", "start": 4169496, "size": 8896, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_MinishVillage_0_2.4bpp.lz", + "path": "maps/areas/001_MinishVillage/tileSets/0/gAreaTileSet_MinishVillage_0_2.4bpp.lz", "start": 4178392, - "size": 8090, - "type": "tileset" + "size": 8092, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_MinishVillage_0.bin", + "path": "maps/areas/001_MinishVillage/tileSet/gAreaTileSet_MinishVillage_bottom.bin.lz", "start": 4186484, - "size": 7170, - "type": "metatiles_tileset2" + "size": 7172, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_MinishVillage_1.bin", + "path": "maps/areas/001_MinishVillage/tileSet/gAreaTileSet_MinishVillage_top.bin.lz", "start": 4193656, - "size": 5382, - "type": "metatiles_tileset1" + "size": 5384, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_MinishVillage_2.bin", + "path": "maps/areas/001_MinishVillage/tileSet/gAreaTileSetTypes_MinishVillage_bottom.bin.lz", "start": 4199040, "size": 748, - "type": "metatiles_tile_types2" + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_MinishVillage_3.bin", + "path": "maps/areas/001_MinishVillage/tileSet/gAreaTileSetTypes_MinishVillage_top.bin.lz", "start": 4199788, - "size": 427, - "type": "metatiles_tile_types1" + "size": 428, + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_MinishVillage_1_0.4bpp.lz", + "path": "maps/areas/001_MinishVillage/tileSets/1/gAreaTileSet_MinishVillage_1_0.4bpp.lz", "start": 4200216, - "size": 5014, - "type": "tileset" + "size": 5016, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_MinishVillage_1_1.4bpp.lz", + "path": "maps/areas/001_MinishVillage/tileSets/1/gAreaTileSet_MinishVillage_1_1.4bpp.lz", "start": 4205232, "size": 8896, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_MinishVillage_1_2.4bpp.lz", + "path": "maps/areas/001_MinishVillage/tileSets/1/gAreaTileSet_MinishVillage_1_2.4bpp.lz", "start": 4214128, "size": 3192, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_MinishVillage_0_0.bin", + "path": "maps/areas/001_MinishVillage/rooms/00_Main/gAreaRoomMap_MinishVillage_Main_bottom.bin.lz", "start": 4217320, - "size": 3014, - "type": "map_layer2" + "size": 3016, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishVillage_0_1.bin", + "path": "maps/areas/001_MinishVillage/rooms/00_Main/gAreaRoomMap_MinishVillage_Main_top.bin.lz", "start": 4220336, "size": 2744, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishVillage_1_0.bin", + "path": "maps/areas/001_MinishVillage/rooms/01_SideHouseArea/gAreaRoomMap_MinishVillage_SideHouseArea_bottom.bin.lz", "start": 4223080, - "size": 417, - "type": "map_layer2" + "size": 420, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishVillage_1_1.bin", + "path": "maps/areas/001_MinishVillage/rooms/01_SideHouseArea/gAreaRoomMap_MinishVillage_SideHouseArea_top.bin.lz", "start": 4223500, - "size": 451, - "type": "map_layer1" + "size": 452, + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_MelarisMine_0_0.4bpp.lz", + "path": "maps/areas/016_MelarisMine/tileSets/0/gAreaTileSet_MelarisMine_0_0.4bpp.lz", "start": 4223952, - "size": 9349, - "type": "tileset" + "size": 9352, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_MelarisMine_0_1.4bpp.lz", + "path": "maps/areas/016_MelarisMine/tileSets/0/gAreaTileSet_MelarisMine_0_1.4bpp.lz", "start": 4233304, - "size": 7199, - "type": "tileset" + "size": 7200, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_MelarisMine_0_2.4bpp.lz", + "path": "maps/areas/016_MelarisMine/tileSets/0/gAreaTileSet_MelarisMine_0_2.4bpp.lz", "start": 4240504, - "size": 9094, - "type": "tileset" + "size": 9096, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_MelarisMine_0.bin", + "path": "maps/areas/016_MelarisMine/tileSet/gAreaTileSet_MelarisMine_bottom.bin.lz", "start": 4249600, "size": 5764, - "type": "metatiles_tileset2" + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_MelarisMine_1.bin", + "path": "maps/areas/016_MelarisMine/tileSet/gAreaTileSet_MelarisMine_top.bin.lz", "start": 4255364, "size": 196, - "type": "metatiles_tileset1" + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_MelarisMine_2.bin", + "path": "maps/areas/016_MelarisMine/tileSet/gAreaTileSetTypes_MelarisMine_bottom.bin.lz", "start": 4255560, - "size": 543, - "type": "metatiles_tile_types2" + "size": 544, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_MelarisMine_3.bin", + "path": "maps/areas/016_MelarisMine/tileSet/gAreaTileSetTypes_MelarisMine_top.bin.lz", "start": 4256104, "size": 48, - "type": "metatiles_tile_types1" + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_MelarisMine_0_0.bin", + "path": "maps/areas/016_MelarisMine/rooms/00_Main/gAreaRoomMap_MelarisMine_Main_bottom.bin.lz", "start": 4256152, "size": 1936, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MelarisMine_0_1.bin", + "path": "maps/areas/016_MelarisMine/rooms/00_Main/gAreaRoomMap_MelarisMine_Main_top.bin.lz", "start": 4258088, - "size": 453, - "type": "map_layer1" + "size": 456, + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_MinishPaths_2_0.4bpp.lz", + "path": "maps/areas/017_MinishPaths/tileSets/0/gAreaTileSet_MinishPaths_0_0.4bpp.lz", "start": 4258544, "size": 7044, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_MinishPaths_2_1.4bpp.lz", + "path": "maps/areas/017_MinishPaths/tileSets/0/gAreaTileSet_MinishPaths_0_1.4bpp.lz", "start": 4265588, - "size": 6917, - "type": "tileset" + "size": 6920, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_MnishPaths1_0.bin", + "path": "maps/areas/017_MinishPaths/tileSet/gAreaTileSet_MinishPaths_bottom.bin.lz", "start": 4272508, - "size": 3222, - "type": "metatiles_tileset2" + "size": 3224, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_MnishPaths1_1.bin", + "path": "maps/areas/017_MinishPaths/tileSet/gAreaTileSetTypes_MinishPaths_bottom.bin.lz", "start": 4275732, "size": 296, - "type": "metatiles_tile_types2" + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_MinishPaths_0_0.bin", + "path": "maps/areas/017_MinishPaths/rooms/00_MinishVillage/gAreaRoomMap_MinishPaths_MinishVillage_bottom.bin.lz", "start": 4276028, - "size": 446, - "type": "map_layer2" + "size": 448, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishPaths_1_0.bin", + "path": "maps/areas/017_MinishPaths/rooms/01_Bow/gAreaRoomMap_MinishPaths_Bow_bottom.bin.lz", "start": 4276476, - "size": 534, - "type": "map_layer2" + "size": 536, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishPaths_2_0.bin", + "path": "maps/areas/017_MinishPaths/rooms/02_Schoolyard/gAreaRoomMap_MinishPaths_Schoolyard_bottom.bin.lz", "start": 4277012, - "size": 554, - "type": "map_layer2" + "size": 556, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishPaths_3_0.bin", + "path": "maps/areas/017_MinishPaths/rooms/03_LonLonRanch/gAreaRoomMap_MinishPaths_LonLonRanch_bottom.bin.lz", "start": 4277568, "size": 520, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishPaths_4_0.bin", + "path": "maps/areas/017_MinishPaths/rooms/04_LakeHylia/gAreaRoomMap_MinishPaths_LakeHylia_bottom.bin.lz", "start": 4278088, - "size": 413, - "type": "map_layer2" + "size": 416, + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_CrenelMinishPaths_0_0.4bpp.lz", + "path": "maps/areas/018_CrenelMinishPaths/tileSets/0/gAreaTileSet_CrenelMinishPaths_0_0.4bpp.lz", "start": 4278504, - "size": 6205, - "type": "tileset" + "size": 6208, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_CrenelMinishPaths_0_1.4bpp.lz", + "path": "maps/areas/018_CrenelMinishPaths/tileSets/0/gAreaTileSet_CrenelMinishPaths_0_1.4bpp.lz", "start": 4284712, - "size": 6190, - "type": "tileset" + "size": 6192, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_CrenelMinishPaths_2_0.4bpp.lz", + "path": "maps/areas/018_CrenelMinishPaths/tileSets/1/gAreaTileSet_CrenelMinishPaths_1_0.4bpp.lz", "start": 4290904, "size": 4844, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_CrenelMinishPaths_2_1.4bpp.lz", + "path": "maps/areas/018_CrenelMinishPaths/tileSets/1/gAreaTileSet_CrenelMinishPaths_1_1.4bpp.lz", "start": 4295748, - "size": 5587, - "type": "tileset" + "size": 5588, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_CrenelMinishPaths_0.bin", + "path": "maps/areas/018_CrenelMinishPaths/tileSet/gAreaTileSet_CrenelMinishPaths_bottom.bin.lz", "start": 4301336, - "size": 4694, - "type": "metatiles_tileset2" + "size": 4696, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_CrenelMinishPaths_1.bin", + "path": "maps/areas/018_CrenelMinishPaths/tileSet/gAreaTileSetTypes_CrenelMinishPaths_bottom.bin.lz", "start": 4306032, - "size": 418, - "type": "metatiles_tile_types2" + "size": 420, + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_CrenelMinishPaths_0_0.bin", + "path": "maps/areas/018_CrenelMinishPaths/rooms/00_Bean/gAreaRoomMap_CrenelMinishPaths_Bean_bottom.bin.lz", "start": 4306452, "size": 500, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelMinishPaths_1_0.bin", + "path": "maps/areas/018_CrenelMinishPaths/rooms/01_SpringWater/gAreaRoomMap_CrenelMinishPaths_SpringWater_bottom.bin.lz", "start": 4306952, - "size": 678, - "type": "map_layer2" + "size": 680, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelMinishPaths_2_0.bin", + "path": "maps/areas/018_CrenelMinishPaths/rooms/02_Rain/gAreaRoomMap_CrenelMinishPaths_Rain_bottom.bin.lz", "start": 4307632, - "size": 381, - "type": "map_layer2" + "size": 384, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CrenelMinishPaths_3_0.bin", + "path": "maps/areas/018_CrenelMinishPaths/rooms/03_Melari/gAreaRoomMap_CrenelMinishPaths_Melari_bottom.bin.lz", "start": 4308016, "size": 444, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_EzloCutscene_0_2.4bpp.lz", + "path": "maps/areas/033_HouseInteriors1/tileSets/0/gAreaTileSet_HouseInteriors1_0_2.4bpp.lz", "start": 4308460, - "size": 1998, - "type": "tileset" + "size": 2000, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_EzloCutscene_1.bin", + "path": "maps/areas/033_HouseInteriors1/tileSet/gAreaTileSet_HouseInteriors1_top.bin.lz", "start": 4310460, - "size": 3969, - "type": "metatiles_tileset1" + "size": 3972, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_EzloCutscene_3.bin", + "path": "maps/areas/033_HouseInteriors1/tileSet/gAreaTileSetTypes_HouseInteriors1_top.bin.lz", "start": 4314432, - "size": 698, - "type": "metatiles_tile_types1" + "size": 700, + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_HouseInteriors1_0_0.4bpp.lz", + "path": "maps/areas/033_HouseInteriors1/tileSets/0/gAreaTileSet_HouseInteriors1_0_0.4bpp.lz", "start": 4315132, "size": 8172, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_HouseInteriors1_0_1.4bpp.lz", + "path": "maps/areas/033_HouseInteriors1/tileSets/0/gAreaTileSet_HouseInteriors1_0_1.4bpp.lz", "start": 4323304, "size": 8568, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_HouseInteriors1_0.bin", + "path": "maps/areas/033_HouseInteriors1/tileSet/gAreaTileSet_HouseInteriors1_bottom.bin.lz", "start": 4331872, - "size": 4770, - "type": "metatiles_tileset2" + "size": 4772, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_HouseInteriors1_2.bin", + "path": "maps/areas/033_HouseInteriors1/tileSet/gAreaTileSetTypes_HouseInteriors1_bottom.bin.lz", "start": 4336644, - "size": 619, - "type": "metatiles_tile_types2" + "size": 620, + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_HouseInteriors2_2_0.4bpp.lz", + "path": "maps/areas/034_HouseInteriors2/tileSets/0/gAreaTileSet_HouseInteriors2_0_0.4bpp.lz", "start": 4337264, - "size": 9651, - "type": "tileset" + "size": 9652, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_HouseInteriors2_2_1.4bpp.lz", + "path": "maps/areas/034_HouseInteriors2/tileSets/0/gAreaTileSet_HouseInteriors2_0_1.4bpp.lz", "start": 4346916, "size": 8568, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_HouseInteriors2_0.bin", + "path": "maps/areas/034_HouseInteriors2/tileSet/gAreaTileSet_HouseInteriors2_bottom.bin.lz", "start": 4355484, "size": 4764, - "type": "metatiles_tileset2" + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_HouseInteriors2_2.bin", + "path": "maps/areas/034_HouseInteriors2/tileSet/gAreaTileSetTypes_HouseInteriors2_bottom.bin.lz", "start": 4360248, - "size": 749, - "type": "metatiles_tile_types2" + "size": 752, + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_HouseInteriors4_0_0.4bpp.lz", + "path": "maps/areas/040_HouseInteriors4/tileSets/0/gAreaTileSet_HouseInteriors4_0_0.4bpp.lz", "start": 4361000, - "size": 8318, - "type": "tileset" + "size": 8320, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_HouseInteriors4_0_1.4bpp.lz", + "path": "maps/areas/040_HouseInteriors4/tileSets/0/gAreaTileSet_HouseInteriors4_0_1.4bpp.lz", "start": 4369320, "size": 8568, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_HouseInteriors4_0.bin", + "path": "maps/areas/040_HouseInteriors4/tileSet/gAreaTileSet_HouseInteriors4_bottom.bin.lz", "start": 4377888, "size": 4852, - "type": "metatiles_tileset2" + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_HouseInteriors4_2.bin", + "path": "maps/areas/040_HouseInteriors4/tileSet/gAreaTileSetTypes_HouseInteriors4_bottom.bin.lz", "start": 4382740, - "size": 793, - "type": "metatiles_tile_types2" + "size": 796, + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_HouseInteriors3_0_0.4bpp.lz", + "path": "maps/areas/035_HouseInteriors3/tileSets/0/gAreaTileSet_HouseInteriors3_0_0.4bpp.lz", "start": 4383536, "size": 8420, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_HouseInteriors3_0_1.4bpp.lz", + "path": "maps/areas/035_HouseInteriors3/tileSets/0/gAreaTileSet_HouseInteriors3_0_1.4bpp.lz", "start": 4391956, "size": 8568, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_HouseInteriors3_0.bin", + "path": "maps/areas/035_HouseInteriors3/tileSet/gAreaTileSet_HouseInteriors3_bottom.bin.lz", "start": 4400524, - "size": 3910, - "type": "metatiles_tileset2" + "size": 3912, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_HouseInteriors3_2.bin", + "path": "maps/areas/035_HouseInteriors3/tileSet/gAreaTileSetTypes_HouseInteriors3_bottom.bin.lz", "start": 4404436, - "size": 607, - "type": "metatiles_tile_types2" + "size": 608, + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_TreeInteriors_0_0.4bpp.lz", + "path": "maps/areas/036_TreeInteriors/tileSets/0/gAreaTileSet_TreeInteriors_0_0.4bpp.lz", "start": 4405044, - "size": 7718, - "type": "tileset" + "size": 7720, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_TreeInteriors_0_1.4bpp.lz", + "path": "maps/areas/036_TreeInteriors/tileSets/0/gAreaTileSet_TreeInteriors_0_1.4bpp.lz", "start": 4412764, "size": 8568, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_TreeInteriors_0.bin", + "path": "maps/areas/036_TreeInteriors/tileSet/gAreaTileSet_TreeInteriors_bottom.bin.lz", "start": 4421332, - "size": 3733, - "type": "metatiles_tileset2" + "size": 3736, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_TreeInteriors_2.bin", + "path": "maps/areas/036_TreeInteriors/tileSet/gAreaTileSetTypes_TreeInteriors_bottom.bin.lz", "start": 4425068, - "size": 527, - "type": "metatiles_tile_types2" + "size": 528, + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_MinishCracks_4_0.4bpp.lz", + "path": "maps/areas/039_MinishCracks/tileSets/0/gAreaTileSet_MinishCracks_0_0.4bpp.lz", "start": 4425596, - "size": 8755, - "type": "tileset" + "size": 8756, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_MinishCracks_4_1.4bpp.lz", + "path": "maps/areas/039_MinishCracks/tileSets/0/gAreaTileSet_MinishCracks_0_1.4bpp.lz", "start": 4434352, "size": 8568, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_MinishCracks_0.bin", + "path": "maps/areas/039_MinishCracks/tileSet/gAreaTileSet_MinishCracks_bottom.bin.lz", "start": 4442920, "size": 3920, - "type": "metatiles_tileset2" + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_MinishCracks_2.bin", + "path": "maps/areas/039_MinishCracks/tileSet/gAreaTileSetTypes_MinishCracks_bottom.bin.lz", "start": 4446840, - "size": 517, - "type": "metatiles_tile_types2" + "size": 520, + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_Dojos_5_0.4bpp.lz", + "path": "maps/areas/037_Dojos/tileSets/0/gAreaTileSet_Dojos_0_0.4bpp.lz", "start": 4447360, "size": 7812, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_Dojos_5_1.4bpp.lz", + "path": "maps/areas/037_Dojos/tileSets/0/gAreaTileSet_Dojos_0_1.4bpp.lz", "start": 4455172, "size": 8568, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_Dojos_0.bin", + "path": "maps/areas/037_Dojos/tileSet/gAreaTileSet_Dojos_bottom.bin.lz", "start": 4463740, - "size": 3733, - "type": "metatiles_tileset2" + "size": 3736, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_Dojos_2.bin", + "path": "maps/areas/037_Dojos/tileSet/gAreaTileSetTypes_Dojos_bottom.bin.lz", "start": 4467476, "size": 692, - "type": "metatiles_tile_types2" + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_MinishRafters_0_0.4bpp.lz", + "path": "maps/areas/046_MinishRafters/tileSets/0/gAreaTileSet_MinishRafters_0_0.4bpp.lz", "start": 4468168, - "size": 6646, - "type": "tileset" + "size": 6648, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_MinishRafters_0_1.4bpp.lz", + "path": "maps/areas/046_MinishRafters/tileSets/0/gAreaTileSet_MinishRafters_0_1.4bpp.lz", "start": 4474816, - "size": 1947, - "type": "tileset" + "size": 1948, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_MinishRafters_0.bin", + "path": "maps/areas/046_MinishRafters/tileSet/gAreaTileSet_MinishRafters_bottom.bin.lz", "start": 4476764, - "size": 3151, - "type": "metatiles_tileset2" + "size": 3152, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_MinishRafters_2.bin", + "path": "maps/areas/046_MinishRafters/tileSet/gAreaTileSetTypes_MinishRafters_bottom.bin.lz", "start": 4479916, - "size": 394, - "type": "metatiles_tile_types2" + "size": 396, + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_WindTribeTower_0_0.4bpp.lz", + "path": "maps/areas/048_WindTribeTower/tileSets/0/gAreaTileSet_WindTribeTower_0_0.4bpp.lz", "start": 4480312, - "size": 7474, - "type": "tileset" + "size": 7476, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_WindTribeTower_0_1.4bpp.lz", + "path": "maps/areas/048_WindTribeTower/tileSets/0/gAreaTileSet_WindTribeTower_0_1.4bpp.lz", "start": 4487788, "size": 8568, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_WindTribeTower_0.bin", + "path": "maps/areas/048_WindTribeTower/tileSet/gAreaTileSet_WindTribeTower_bottom.bin.lz", "start": 4496356, - "size": 3901, - "type": "metatiles_tileset2" + "size": 3904, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_WindTribeTower_2.bin", + "path": "maps/areas/048_WindTribeTower/tileSet/gAreaTileSetTypes_WindTribeTower_bottom.bin.lz", "start": 4500260, - "size": 481, - "type": "metatiles_tile_types2" + "size": 484, + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_WindTribeTowerRoof_0_0.4bpp.lz", + "path": "maps/areas/049_WindTribeTowerRoof/tileSets/0/gAreaTileSet_WindTribeTowerRoof_0_0.4bpp.lz", "start": 4500744, "size": 6468, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_WindTribeTowerRoof_0_1.4bpp.lz", + "path": "maps/areas/049_WindTribeTowerRoof/tileSets/0/gAreaTileSet_WindTribeTowerRoof_0_1.4bpp.lz", "start": 4507212, "size": 8568, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_WindTribeTowerRoof_0_2.4bpp.lz", + "path": "maps/areas/049_WindTribeTowerRoof/tileSets/0/gAreaTileSet_WindTribeTowerRoof_0_2.4bpp.lz", "start": 4515780, - "size": 3535, - "type": "tileset" + "size": 3536, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_WindTribeTowerRoof_0.bin", + "path": "maps/areas/049_WindTribeTowerRoof/tileSet/gAreaTileSet_WindTribeTowerRoof_bottom.bin.lz", "start": 4519316, - "size": 1673, - "type": "metatiles_tileset2" + "size": 1676, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_WindTribeTowerRoof_1.bin", + "path": "maps/areas/049_WindTribeTowerRoof/tileSet/gAreaTileSet_WindTribeTowerRoof_top.bin.lz", "start": 4520992, - "size": 1607, - "type": "metatiles_tileset1" + "size": 1608, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_WindTribeTowerRoof_2.bin", + "path": "maps/areas/049_WindTribeTowerRoof/tileSet/gAreaTileSetTypes_WindTribeTowerRoof_bottom.bin.lz", "start": 4522600, - "size": 186, - "type": "metatiles_tile_types2" + "size": 188, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_WindTribeTowerRoof_3.bin", + "path": "maps/areas/049_WindTribeTowerRoof/tileSet/gAreaTileSetTypes_WindTribeTowerRoof_top.bin.lz", "start": 4522788, - "size": 222, - "type": "metatiles_tile_types1" + "size": 224, + "type": "tileSet_types" }, { "path": "assets/unknown_26.bin", "start": 4523012, "size": 592, - "type": "unknown" + "type": "unknown", + "TODO": "maybe a mapping?" }, { - "path": "tilesets/gAreaTileset_EzloCutscene_0_0.4bpp.lz", + "path": "maps/areas/056_EzloCutscene/tileSets/0/gAreaTileSet_EzloCutscene_0_0.4bpp.lz", "start": 4523604, "size": 4564, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_EzloCutscene_0_1.4bpp.lz", + "path": "maps/areas/056_EzloCutscene/tileSets/0/gAreaTileSet_EzloCutscene_0_1.4bpp.lz", "start": 4528168, "size": 8568, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_EzloCutscene_0.bin", + "path": "maps/areas/056_EzloCutscene/tileSet/gAreaTileSet_EzloCutscene_bottom.bin.lz", "start": 4536736, - "size": 1701, - "type": "metatiles_tileset2" + "size": 1704, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_EzloCutscene_2.bin", + "path": "maps/areas/056_EzloCutscene/tileSet/gAreaTileSetTypes_EzloCutscene_bottom.bin.lz", "start": 4538440, "size": 240, - "type": "metatiles_tile_types2" + "type": "tileSet_types" }, { "path": "assets/unknown_27.bin", "start": 4538680, "size": 884, - "type": "unknown" + "type": "unknown", + "TODO": "proably 4 mappings" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_0_0.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/00_Stranger/gAreaRoomMap_HouseInteriors2_Stranger_bottom.bin.lz", "start": 4539564, - "size": 286, - "type": "map_layer2" + "size": 288, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_0_1.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/00_Stranger/gAreaRoomMap_HouseInteriors2_Stranger_top.bin.lz", "start": 4539852, "size": 88, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_1_0.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/01_WestOracle/gAreaRoomMap_HouseInteriors2_WestOracle_bottom.bin.lz", "start": 4539940, "size": 284, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_1_1.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/01_WestOracle/gAreaRoomMap_HouseInteriors2_WestOracle_top.bin.lz", "start": 4540224, - "size": 117, - "type": "map_layer1" + "size": 120, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_2_0.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/02_2/gAreaRoomMap_HouseInteriors2_2_bottom.bin.lz", "start": 4540344, - "size": 286, - "type": "map_layer2" + "size": 288, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_2_1.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/02_2/gAreaRoomMap_HouseInteriors2_2_top.bin.lz", "start": 4540632, - "size": 110, - "type": "map_layer1" + "size": 112, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_3_0.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/03_3/gAreaRoomMap_HouseInteriors2_3_bottom.bin.lz", "start": 4540744, - "size": 289, - "type": "map_layer2" + "size": 292, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_3_1.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/03_3/gAreaRoomMap_HouseInteriors2_3_top.bin.lz", "start": 4541036, "size": 108, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_4_0.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/04_DrLeft/gAreaRoomMap_HouseInteriors2_DrLeft_bottom.bin.lz", "start": 4541144, "size": 292, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_4_1.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/04_DrLeft/gAreaRoomMap_HouseInteriors2_DrLeft_top.bin.lz", "start": 4541436, - "size": 74, - "type": "map_layer1" + "size": 76, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_5_0.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/05_5/gAreaRoomMap_HouseInteriors2_5_bottom.bin.lz", "start": 4541512, - "size": 238, - "type": "map_layer2" + "size": 240, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_5_1.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/05_5/gAreaRoomMap_HouseInteriors2_5_top.bin.lz", "start": 4541752, - "size": 82, - "type": "map_layer1" + "size": 84, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_6_0.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/06_Romio/gAreaRoomMap_HouseInteriors2_Romio_bottom.bin.lz", "start": 4541836, "size": 288, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_6_1.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/06_Romio/gAreaRoomMap_HouseInteriors2_Romio_top.bin.lz", "start": 4542124, - "size": 95, - "type": "map_layer1" + "size": 96, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_7_0.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/07_Julietta/gAreaRoomMap_HouseInteriors2_Julietta_bottom.bin.lz", "start": 4542220, "size": 280, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_7_1.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/07_Julietta/gAreaRoomMap_HouseInteriors2_Julietta_top.bin.lz", "start": 4542500, - "size": 86, - "type": "map_layer1" + "size": 88, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_8_0.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/08_Percy/gAreaRoomMap_HouseInteriors2_Percy_bottom.bin.lz", "start": 4542588, - "size": 299, - "type": "map_layer2" + "size": 300, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_8_1.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/08_Percy/gAreaRoomMap_HouseInteriors2_Percy_top.bin.lz", "start": 4542888, - "size": 83, - "type": "map_layer1" + "size": 84, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_9_0.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/09_EastOracle/gAreaRoomMap_HouseInteriors2_EastOracle_bottom.bin.lz", "start": 4542972, "size": 268, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_9_1.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/09_EastOracle/gAreaRoomMap_HouseInteriors2_EastOracle_top.bin.lz", "start": 4543240, - "size": 86, - "type": "map_layer1" + "size": 88, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_10_0.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/10_A/gAreaRoomMap_HouseInteriors2_A_bottom.bin.lz", "start": 4543328, - "size": 270, - "type": "map_layer2" + "size": 272, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_10_1.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/10_A/gAreaRoomMap_HouseInteriors2_A_top.bin.lz", "start": 4543600, "size": 84, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_11_0.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/11_B/gAreaRoomMap_HouseInteriors2_B_bottom.bin.lz", "start": 4543684, - "size": 279, - "type": "map_layer2" + "size": 280, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_11_1.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/11_B/gAreaRoomMap_HouseInteriors2_B_top.bin.lz", "start": 4543964, - "size": 89, - "type": "map_layer1" + "size": 92, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_12_0.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/12_Cucco/gAreaRoomMap_HouseInteriors2_Cucco_bottom.bin.lz", "start": 4544056, - "size": 278, - "type": "map_layer2" + "size": 280, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_12_1.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/12_Cucco/gAreaRoomMap_HouseInteriors2_Cucco_top.bin.lz", "start": 4544336, - "size": 71, - "type": "map_layer1" + "size": 72, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_13_0.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/16_LinksHouseEntrance/gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_bottom.bin.lz", "start": 4544408, - "size": 291, - "type": "map_layer2" + "size": 292, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_13_1.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/16_LinksHouseEntrance/gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_top.bin.lz", "start": 4544700, - "size": 77, - "type": "map_layer1" + "size": 80, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_14_0.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/17_LinksHouseSmith/gAreaRoomMap_HouseInteriors2_LinksHouseSmith_bottom.bin.lz", "start": 4544780, - "size": 287, - "type": "map_layer2" + "size": 288, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_14_1.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/17_LinksHouseSmith/gAreaRoomMap_HouseInteriors2_LinksHouseSmith_top.bin.lz", "start": 4545068, - "size": 65, - "type": "map_layer1" + "size": 68, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_15_0.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/18_Dampe/gAreaRoomMap_HouseInteriors2_Dampe_bottom.bin.lz", "start": 4545136, - "size": 275, - "type": "map_layer2" + "size": 276, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_15_1.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/18_Dampe/gAreaRoomMap_HouseInteriors2_Dampe_top.bin.lz", "start": 4545412, - "size": 91, - "type": "map_layer1" + "size": 92, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_16_0.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/19_13/gAreaRoomMap_HouseInteriors2_13_bottom.bin.lz", "start": 4545504, - "size": 210, - "type": "map_layer2" + "size": 212, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_16_1.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/19_13/gAreaRoomMap_HouseInteriors2_13_top.bin.lz", "start": 4545716, - "size": 98, - "type": "map_layer1" + "size": 100, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_17_0.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/20_StockwellLakeHouse/gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_bottom.bin.lz", "start": 4545816, - "size": 267, - "type": "map_layer2" + "size": 268, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_17_1.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/20_StockwellLakeHouse/gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_top.bin.lz", "start": 4546084, "size": 76, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_18_0.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/21_LinksHouseBedroom/gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_bottom.bin.lz", "start": 4546160, - "size": 271, - "type": "map_layer2" + "size": 272, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors2_18_1.bin", + "path": "maps/areas/034_HouseInteriors2/rooms/21_LinksHouseBedroom/gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_top.bin.lz", "start": 4546432, "size": 88, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors4_0_0.bin", + "path": "maps/areas/040_HouseInteriors4/rooms/00_Carpenter/gAreaRoomMap_HouseInteriors4_Carpenter_bottom.bin.lz", "start": 4546520, - "size": 267, - "type": "map_layer2" + "size": 268, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors4_0_1.bin", + "path": "maps/areas/040_HouseInteriors4/rooms/00_Carpenter/gAreaRoomMap_HouseInteriors4_Carpenter_top.bin.lz", "start": 4546788, "size": 68, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors4_1_0.bin", + "path": "maps/areas/040_HouseInteriors4/rooms/01_Swiftblade/gAreaRoomMap_HouseInteriors4_Swiftblade_bottom.bin.lz", "start": 4546856, - "size": 338, - "type": "map_layer2" + "size": 340, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors4_1_1.bin", + "path": "maps/areas/040_HouseInteriors4/rooms/01_Swiftblade/gAreaRoomMap_HouseInteriors4_Swiftblade_top.bin.lz", "start": 4547196, "size": 64, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors4_2_0.bin", + "path": "maps/areas/040_HouseInteriors4/rooms/02_RanchHouseWest/gAreaRoomMap_HouseInteriors4_RanchHouseWest_bottom.bin.lz", "start": 4547260, "size": 276, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors4_2_1.bin", + "path": "maps/areas/040_HouseInteriors4/rooms/02_RanchHouseWest/gAreaRoomMap_HouseInteriors4_RanchHouseWest_top.bin.lz", "start": 4547536, - "size": 61, - "type": "map_layer1" + "size": 64, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors4_3_0.bin", + "path": "maps/areas/040_HouseInteriors4/rooms/03_RanchHouseEast/gAreaRoomMap_HouseInteriors4_RanchHouseEast_bottom.bin.lz", "start": 4547600, - "size": 279, - "type": "map_layer2" + "size": 280, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors4_3_1.bin", + "path": "maps/areas/040_HouseInteriors4/rooms/03_RanchHouseEast/gAreaRoomMap_HouseInteriors4_RanchHouseEast_top.bin.lz", "start": 4547880, - "size": 43, - "type": "map_layer1" + "size": 44, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors4_4_0.bin", + "path": "maps/areas/040_HouseInteriors4/rooms/04_FarmHouse/gAreaRoomMap_HouseInteriors4_FarmHouse_bottom.bin.lz", "start": 4547924, - "size": 271, - "type": "map_layer2" + "size": 272, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors4_4_1.bin", + "path": "maps/areas/040_HouseInteriors4/rooms/04_FarmHouse/gAreaRoomMap_HouseInteriors4_FarmHouse_top.bin.lz", "start": 4548196, - "size": 90, - "type": "map_layer1" + "size": 92, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors4_5_0.bin", + "path": "maps/areas/040_HouseInteriors4/rooms/05_MayorLakeCabin/gAreaRoomMap_HouseInteriors4_MayorLakeCabin_bottom.bin.lz", "start": 4548288, - "size": 307, - "type": "map_layer2" + "size": 308, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors4_5_1.bin", + "path": "maps/areas/040_HouseInteriors4/rooms/05_MayorLakeCabin/gAreaRoomMap_HouseInteriors4_MayorLakeCabin_top.bin.lz", "start": 4548596, - "size": 55, - "type": "map_layer1" + "size": 56, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors3_0_0.bin", + "path": "maps/areas/035_HouseInteriors3/rooms/00_StockwellShop/gAreaRoomMap_HouseInteriors3_StockwellShop_bottom.bin.lz", "start": 4548652, - "size": 307, - "type": "map_layer2" + "size": 308, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors3_0_1.bin", + "path": "maps/areas/035_HouseInteriors3/rooms/00_StockwellShop/gAreaRoomMap_HouseInteriors3_StockwellShop_top.bin.lz", "start": 4548960, - "size": 121, - "type": "map_layer1" + "size": 124, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors3_1_0.bin", + "path": "maps/areas/035_HouseInteriors3/rooms/01_Cafe/gAreaRoomMap_HouseInteriors3_Cafe_bottom.bin.lz", "start": 4549084, "size": 308, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors3_1_1.bin", + "path": "maps/areas/035_HouseInteriors3/rooms/01_Cafe/gAreaRoomMap_HouseInteriors3_Cafe_top.bin.lz", "start": 4549392, - "size": 94, - "type": "map_layer1" + "size": 96, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors3_2_0.bin", + "path": "maps/areas/035_HouseInteriors3/rooms/02_RemShoeShop/gAreaRoomMap_HouseInteriors3_RemShoeShop_bottom.bin.lz", "start": 4549488, - "size": 277, - "type": "map_layer2" + "size": 280, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors3_2_1.bin", + "path": "maps/areas/035_HouseInteriors3/rooms/02_RemShoeShop/gAreaRoomMap_HouseInteriors3_RemShoeShop_top.bin.lz", "start": 4549768, - "size": 78, - "type": "map_layer1" + "size": 80, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors3_3_0.bin", + "path": "maps/areas/035_HouseInteriors3/rooms/03_Bakery/gAreaRoomMap_HouseInteriors3_Bakery_bottom.bin.lz", "start": 4549848, "size": 272, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors3_3_1.bin", + "path": "maps/areas/035_HouseInteriors3/rooms/03_Bakery/gAreaRoomMap_HouseInteriors3_Bakery_top.bin.lz", "start": 4550120, "size": 80, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors3_4_0.bin", + "path": "maps/areas/035_HouseInteriors3/rooms/04_Simon/gAreaRoomMap_HouseInteriors3_Simon_bottom.bin.lz", "start": 4550200, - "size": 273, - "type": "map_layer2" + "size": 276, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors3_4_1.bin", + "path": "maps/areas/035_HouseInteriors3/rooms/04_Simon/gAreaRoomMap_HouseInteriors3_Simon_top.bin.lz", "start": 4550476, - "size": 73, - "type": "map_layer1" + "size": 76, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors3_5_0.bin", + "path": "maps/areas/035_HouseInteriors3/rooms/05_FigurineHouse/gAreaRoomMap_HouseInteriors3_FigurineHouse_bottom.bin.lz", "start": 4550552, - "size": 245, - "type": "map_layer2" + "size": 248, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors3_5_1.bin", + "path": "maps/areas/035_HouseInteriors3/rooms/05_FigurineHouse/gAreaRoomMap_HouseInteriors3_FigurineHouse_top.bin.lz", "start": 4550800, - "size": 71, - "type": "map_layer1" + "size": 72, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors3_6_0.bin", + "path": "maps/areas/035_HouseInteriors3/rooms/06_BorlovEntrance/gAreaRoomMap_HouseInteriors3_BorlovEntrance_bottom.bin.lz", "start": 4550872, - "size": 309, - "type": "map_layer2" + "size": 312, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors3_6_1.bin", + "path": "maps/areas/035_HouseInteriors3/rooms/06_BorlovEntrance/gAreaRoomMap_HouseInteriors3_BorlovEntrance_top.bin.lz", "start": 4551184, - "size": 74, - "type": "map_layer1" + "size": 76, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors3_7_0.bin", + "path": "maps/areas/035_HouseInteriors3/rooms/07_Carlov/gAreaRoomMap_HouseInteriors3_Carlov_bottom.bin.lz", "start": 4551260, - "size": 253, - "type": "map_layer2" + "size": 256, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors3_7_1.bin", + "path": "maps/areas/035_HouseInteriors3/rooms/07_Carlov/gAreaRoomMap_HouseInteriors3_Carlov_top.bin.lz", "start": 4551516, - "size": 65, - "type": "map_layer1" + "size": 68, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors3_8_0.bin", + "path": "maps/areas/035_HouseInteriors3/rooms/08_Borlov/gAreaRoomMap_HouseInteriors3_Borlov_bottom.bin.lz", "start": 4551584, - "size": 278, - "type": "map_layer2" + "size": 280, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors3_8_1.bin", + "path": "maps/areas/035_HouseInteriors3/rooms/08_Borlov/gAreaRoomMap_HouseInteriors3_Borlov_top.bin.lz", "start": 4551864, - "size": 71, - "type": "map_layer1" + "size": 72, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_0_0.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/00_Mayor/gAreaRoomMap_HouseInteriors1_Mayor_bottom.bin.lz", "start": 4551936, - "size": 334, - "type": "map_layer2" + "size": 336, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_0_1.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/00_Mayor/gAreaRoomMap_HouseInteriors1_Mayor_top.bin.lz", "start": 4552272, - "size": 71, - "type": "map_layer1" + "size": 72, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_1_0.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/01_PostOffice/gAreaRoomMap_HouseInteriors1_PostOffice_bottom.bin.lz", "start": 4552344, - "size": 291, - "type": "map_layer2" + "size": 292, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_1_1.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/01_PostOffice/gAreaRoomMap_HouseInteriors1_PostOffice_top.bin.lz", "start": 4552636, - "size": 95, - "type": "map_layer1" + "size": 96, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_2_0.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/02_Library2f/gAreaRoomMap_HouseInteriors1_Library2f_bottom.bin.lz", "start": 4552732, - "size": 277, - "type": "map_layer2" + "size": 280, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_2_1.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/02_Library2f/gAreaRoomMap_HouseInteriors1_Library2f_top.bin.lz", "start": 4553012, "size": 48, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_3_0.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/03_Library1f/gAreaRoomMap_HouseInteriors1_Library1f_bottom.bin.lz", "start": 4553060, "size": 476, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_3_1.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/03_Library1f/gAreaRoomMap_HouseInteriors1_Library1f_top.bin.lz", "start": 4553536, "size": 140, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_4_0.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/04_Inn1f/gAreaRoomMap_HouseInteriors1_Inn1f_bottom.bin.lz", "start": 4553676, - "size": 323, - "type": "map_layer2" + "size": 324, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_4_1.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/04_Inn1f/gAreaRoomMap_HouseInteriors1_Inn1f_top.bin.lz", "start": 4554000, - "size": 83, - "type": "map_layer1" + "size": 84, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_5_0.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/05_InnWestRoom/gAreaRoomMap_HouseInteriors1_InnWestRoom_bottom.bin.lz", "start": 4554084, - "size": 257, - "type": "map_layer2" + "size": 260, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_5_1.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/05_InnWestRoom/gAreaRoomMap_HouseInteriors1_InnWestRoom_top.bin.lz", "start": 4554344, - "size": 105, - "type": "map_layer1" + "size": 108, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_6_0.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/06_InnMiddleRoom/gAreaRoomMap_HouseInteriors1_InnMiddleRoom_bottom.bin.lz", "start": 4554452, - "size": 259, - "type": "map_layer2" + "size": 260, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_6_1.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/06_InnMiddleRoom/gAreaRoomMap_HouseInteriors1_InnMiddleRoom_top.bin.lz", "start": 4554712, - "size": 78, - "type": "map_layer1" + "size": 80, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_7_0.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/07_InnEastRoom/gAreaRoomMap_HouseInteriors1_InnEastRoom_bottom.bin.lz", "start": 4554792, - "size": 251, - "type": "map_layer2" + "size": 252, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_7_1.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/07_InnEastRoom/gAreaRoomMap_HouseInteriors1_InnEastRoom_top.bin.lz", "start": 4555044, - "size": 82, - "type": "map_layer1" + "size": 84, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_8_0.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/08_InnWest2f/gAreaRoomMap_HouseInteriors1_InnWest2f_bottom.bin.lz", "start": 4555128, - "size": 249, - "type": "map_layer2" + "size": 252, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_8_1.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/08_InnWest2f/gAreaRoomMap_HouseInteriors1_InnWest2f_top.bin.lz", "start": 4555380, - "size": 45, - "type": "map_layer1" + "size": 48, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_9_0.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/09_InnEast2f/gAreaRoomMap_HouseInteriors1_InnEast2f_bottom.bin.lz", "start": 4555428, - "size": 633, - "type": "map_layer2" + "size": 636, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_9_1.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/09_InnEast2f/gAreaRoomMap_HouseInteriors1_InnEast2f_top.bin.lz", "start": 4556064, - "size": 142, - "type": "map_layer1" + "size": 144, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_10_0.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/10_InnMinishHeartPiece/gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_bottom.bin.lz", "start": 4556208, - "size": 270, - "type": "map_layer2" + "size": 272, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_10_1.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/10_InnMinishHeartPiece/gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_top.bin.lz", "start": 4556480, - "size": 43, - "type": "map_layer1" + "size": 44, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_11_0.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/11_SchoolWest/gAreaRoomMap_HouseInteriors1_SchoolWest_bottom.bin.lz", "start": 4556524, "size": 392, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_11_1.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/11_SchoolWest/gAreaRoomMap_HouseInteriors1_SchoolWest_top.bin.lz", "start": 4556916, - "size": 62, - "type": "map_layer1" + "size": 64, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_12_0.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/12_SchoolEast/gAreaRoomMap_HouseInteriors1_SchoolEast_bottom.bin.lz", "start": 4556980, - "size": 373, - "type": "map_layer2" + "size": 376, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HouseInteriors1_12_1.bin", + "path": "maps/areas/033_HouseInteriors1/rooms/12_SchoolEast/gAreaRoomMap_HouseInteriors1_SchoolEast_top.bin.lz", "start": 4557356, - "size": 61, - "type": "map_layer1" + "size": 64, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_0_0.bin", + "path": "maps/areas/037_Dojos/rooms/00_Grayblade/gAreaRoomMap_Dojos_Grayblade_bottom.bin.lz", "start": 4557420, - "size": 295, - "type": "map_layer2" + "size": 296, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_0_1.bin", + "path": "maps/areas/037_Dojos/rooms/00_Grayblade/gAreaRoomMap_Dojos_Grayblade_top.bin.lz", "start": 4557716, - "size": 57, - "type": "map_layer1" + "size": 60, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_1_0.bin", + "path": "maps/areas/037_Dojos/rooms/01_Splitblade/gAreaRoomMap_Dojos_Splitblade_bottom.bin.lz", "start": 4557776, - "size": 301, - "type": "map_layer2" + "size": 304, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_1_1.bin", + "path": "maps/areas/037_Dojos/rooms/01_Splitblade/gAreaRoomMap_Dojos_Splitblade_top.bin.lz", "start": 4558080, - "size": 54, - "type": "map_layer1" + "size": 56, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_2_0.bin", + "path": "maps/areas/037_Dojos/rooms/02_Greatblade/gAreaRoomMap_Dojos_Greatblade_bottom.bin.lz", "start": 4558136, - "size": 301, - "type": "map_layer2" + "size": 304, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_2_1.bin", + "path": "maps/areas/037_Dojos/rooms/02_Greatblade/gAreaRoomMap_Dojos_Greatblade_top.bin.lz", "start": 4558440, - "size": 54, - "type": "map_layer1" + "size": 56, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_3_0.bin", + "path": "maps/areas/037_Dojos/rooms/03_Scarblade/gAreaRoomMap_Dojos_Scarblade_bottom.bin.lz", "start": 4558496, "size": 292, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_3_1.bin", + "path": "maps/areas/037_Dojos/rooms/03_Scarblade/gAreaRoomMap_Dojos_Scarblade_top.bin.lz", "start": 4558788, - "size": 54, - "type": "map_layer1" + "size": 56, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_4_0.bin", + "path": "maps/areas/037_Dojos/rooms/04_SwiftbladeI/gAreaRoomMap_Dojos_SwiftbladeI_bottom.bin.lz", "start": 4558844, "size": 292, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_4_1.bin", + "path": "maps/areas/037_Dojos/rooms/04_SwiftbladeI/gAreaRoomMap_Dojos_SwiftbladeI_top.bin.lz", "start": 4559136, - "size": 54, - "type": "map_layer1" + "size": 56, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_5_0.bin", + "path": "maps/areas/037_Dojos/rooms/05_Grimblade/gAreaRoomMap_Dojos_Grimblade_bottom.bin.lz", "start": 4559192, - "size": 305, - "type": "map_layer2" + "size": 308, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_5_1.bin", + "path": "maps/areas/037_Dojos/rooms/05_Grimblade/gAreaRoomMap_Dojos_Grimblade_top.bin.lz", "start": 4559500, - "size": 54, - "type": "map_layer1" + "size": 56, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_6_0.bin", + "path": "maps/areas/037_Dojos/rooms/06_Waveblade/gAreaRoomMap_Dojos_Waveblade_bottom.bin.lz", "start": 4559556, - "size": 299, - "type": "map_layer2" + "size": 300, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_6_1.bin", + "path": "maps/areas/037_Dojos/rooms/06_Waveblade/gAreaRoomMap_Dojos_Waveblade_top.bin.lz", "start": 4559856, - "size": 54, - "type": "map_layer1" + "size": 56, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_7_0.bin", + "path": "maps/areas/037_Dojos/rooms/07_7/gAreaRoomMap_Dojos_7_bottom.bin.lz", "start": 4559912, - "size": 158, - "type": "map_layer2" + "size": 160, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_7_1.bin", + "path": "maps/areas/037_Dojos/rooms/07_7/gAreaRoomMap_Dojos_7_top.bin.lz", "start": 4560072, - "size": 65, - "type": "map_layer1" + "size": 68, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_8_0.bin", + "path": "maps/areas/037_Dojos/rooms/08_8/gAreaRoomMap_Dojos_8_bottom.bin.lz", "start": 4560140, - "size": 161, - "type": "map_layer2" + "size": 164, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_8_1.bin", + "path": "maps/areas/037_Dojos/rooms/08_8/gAreaRoomMap_Dojos_8_top.bin.lz", "start": 4560304, - "size": 78, - "type": "map_layer1" + "size": 80, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_9_0.bin", + "path": "maps/areas/037_Dojos/rooms/09_9/gAreaRoomMap_Dojos_9_bottom.bin.lz", "start": 4560384, - "size": 163, - "type": "map_layer2" + "size": 164, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_9_1.bin", + "path": "maps/areas/037_Dojos/rooms/09_9/gAreaRoomMap_Dojos_9_top.bin.lz", "start": 4560548, - "size": 114, - "type": "map_layer1" + "size": 116, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_10_0.bin", + "path": "maps/areas/037_Dojos/rooms/10_ToGrimblade/gAreaRoomMap_Dojos_ToGrimblade_bottom.bin.lz", "start": 4560664, "size": 196, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_10_1.bin", + "path": "maps/areas/037_Dojos/rooms/10_ToGrimblade/gAreaRoomMap_Dojos_ToGrimblade_top.bin.lz", "start": 4560860, - "size": 47, - "type": "map_layer1" + "size": 48, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_11_0.bin", + "path": "maps/areas/037_Dojos/rooms/11_ToSplitblade/gAreaRoomMap_Dojos_ToSplitblade_bottom.bin.lz", "start": 4560908, - "size": 253, - "type": "map_layer2" + "size": 256, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_11_1.bin", + "path": "maps/areas/037_Dojos/rooms/11_ToSplitblade/gAreaRoomMap_Dojos_ToSplitblade_top.bin.lz", "start": 4561164, - "size": 46, - "type": "map_layer1" + "size": 48, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_12_0.bin", + "path": "maps/areas/037_Dojos/rooms/12_ToGreatblade/gAreaRoomMap_Dojos_ToGreatblade_bottom.bin.lz", "start": 4561212, - "size": 249, - "type": "map_layer2" + "size": 252, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_12_1.bin", + "path": "maps/areas/037_Dojos/rooms/12_ToGreatblade/gAreaRoomMap_Dojos_ToGreatblade_top.bin.lz", "start": 4561464, - "size": 46, - "type": "map_layer1" + "size": 48, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_13_0.bin", + "path": "maps/areas/037_Dojos/rooms/13_ToScarblade/gAreaRoomMap_Dojos_ToScarblade_bottom.bin.lz", "start": 4561512, - "size": 247, - "type": "map_layer2" + "size": 248, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Dojos_13_1.bin", + "path": "maps/areas/037_Dojos/rooms/13_ToScarblade/gAreaRoomMap_Dojos_ToScarblade_top.bin.lz", "start": 4561760, - "size": 46, - "type": "map_layer1" + "size": 48, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_0_0.bin", + "path": "maps/areas/036_TreeInteriors/rooms/00_WitchHut/gAreaRoomMap_TreeInteriors_WitchHut_bottom.bin", "start": 4561808, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_0_1.bin", + "path": "maps/areas/036_TreeInteriors/rooms/00_WitchHut/gAreaRoomMap_TreeInteriors_WitchHut_top.bin.lz", "start": 4562108, - "size": 46, - "type": "map_layer1" + "size": 48, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_1_0.bin", + "path": "maps/areas/036_TreeInteriors/rooms/16_StairsToCarlov/gAreaRoomMap_TreeInteriors_StairsToCarlov_bottom.bin", "start": 4562156, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_1_1.bin", + "path": "maps/areas/036_TreeInteriors/rooms/16_StairsToCarlov/gAreaRoomMap_TreeInteriors_StairsToCarlov_top.bin.lz", "start": 4562456, "size": 44, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_2_0.bin", + "path": "maps/areas/036_TreeInteriors/rooms/17_PercysTreehouse/gAreaRoomMap_TreeInteriors_PercysTreehouse_bottom.bin", "start": 4562500, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_2_1.bin", + "path": "maps/areas/036_TreeInteriors/rooms/17_PercysTreehouse/gAreaRoomMap_TreeInteriors_PercysTreehouse_top.bin.lz", "start": 4562800, - "size": 65, - "type": "map_layer1" + "size": 68, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_3_0.bin", + "path": "maps/areas/036_TreeInteriors/rooms/18_SouthHyruleFieldHeartPiece/gAreaRoomMap_TreeInteriors_SouthHyruleFieldHeartPiece_bottom.bin", "start": 4562868, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_3_1.bin", + "path": "maps/areas/036_TreeInteriors/rooms/18_SouthHyruleFieldHeartPiece/gAreaRoomMap_TreeInteriors_SouthHyruleFieldHeartPiece_top.bin.lz", "start": 4563168, "size": 44, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_4_0.bin", + "path": "maps/areas/036_TreeInteriors/rooms/19_Waveblade/gAreaRoomMap_TreeInteriors_Waveblade_bottom.bin", "start": 4563212, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_4_1.bin", + "path": "maps/areas/036_TreeInteriors/rooms/19_Waveblade/gAreaRoomMap_TreeInteriors_Waveblade_top.bin.lz", "start": 4563512, "size": 44, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_5_0.bin", + "path": "maps/areas/036_TreeInteriors/rooms/20_14/gAreaRoomMap_TreeInteriors_14_bottom.bin", "start": 4563556, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_5_1.bin", + "path": "maps/areas/036_TreeInteriors/rooms/20_14/gAreaRoomMap_TreeInteriors_14_top.bin.lz", "start": 4563856, "size": 44, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_6_0.bin", + "path": "maps/areas/036_TreeInteriors/rooms/21_BoomerangNorthwest/gAreaRoomMap_TreeInteriors_BoomerangNorthwest_bottom.bin", "start": 4563900, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_6_1.bin", + "path": "maps/areas/036_TreeInteriors/rooms/21_BoomerangNorthwest/gAreaRoomMap_TreeInteriors_BoomerangNorthwest_top.bin.lz", "start": 4564200, "size": 44, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_7_0.bin", + "path": "maps/areas/036_TreeInteriors/rooms/22_BoomerangNortheast/gAreaRoomMap_TreeInteriors_BoomerangNortheast_bottom.bin", "start": 4564244, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_7_1.bin", + "path": "maps/areas/036_TreeInteriors/rooms/22_BoomerangNortheast/gAreaRoomMap_TreeInteriors_BoomerangNortheast_top.bin.lz", "start": 4564544, "size": 44, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_8_0.bin", + "path": "maps/areas/036_TreeInteriors/rooms/23_BoomerangSouthwest/gAreaRoomMap_TreeInteriors_BoomerangSouthwest_bottom.bin", "start": 4564588, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_8_1.bin", + "path": "maps/areas/036_TreeInteriors/rooms/23_BoomerangSouthwest/gAreaRoomMap_TreeInteriors_BoomerangSouthwest_top.bin.lz", "start": 4564888, "size": 44, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_9_0.bin", + "path": "maps/areas/036_TreeInteriors/rooms/24_BoomerangSoutheast/gAreaRoomMap_TreeInteriors_BoomerangSoutheast_bottom.bin", "start": 4564932, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_9_1.bin", + "path": "maps/areas/036_TreeInteriors/rooms/24_BoomerangSoutheast/gAreaRoomMap_TreeInteriors_BoomerangSoutheast_top.bin.lz", "start": 4565232, "size": 44, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_10_0.bin", + "path": "maps/areas/036_TreeInteriors/rooms/25_WesternWoodsHeartPiece/gAreaRoomMap_TreeInteriors_WesternWoodsHeartPiece_bottom.bin", "start": 4565276, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_10_1.bin", + "path": "maps/areas/036_TreeInteriors/rooms/25_WesternWoodsHeartPiece/gAreaRoomMap_TreeInteriors_WesternWoodsHeartPiece_top.bin.lz", "start": 4565576, "size": 44, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_11_0.bin", + "path": "maps/areas/036_TreeInteriors/rooms/26_NorthHyruleFieldFairyFountain/gAreaRoomMap_TreeInteriors_NorthHyruleFieldFairyFountain_bottom.bin", "start": 4565620, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_11_1.bin", + "path": "maps/areas/036_TreeInteriors/rooms/26_NorthHyruleFieldFairyFountain/gAreaRoomMap_TreeInteriors_NorthHyruleFieldFairyFountain_top.bin.lz", "start": 4565920, - "size": 45, - "type": "map_layer1" + "size": 48, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_12_0.bin", + "path": "maps/areas/036_TreeInteriors/rooms/27_MinishWoodsGreatFairy/gAreaRoomMap_TreeInteriors_MinishWoodsGreatFairy_bottom.bin", "start": 4565968, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_12_1.bin", + "path": "maps/areas/036_TreeInteriors/rooms/27_MinishWoodsGreatFairy/gAreaRoomMap_TreeInteriors_MinishWoodsGreatFairy_top.bin.lz", "start": 4566268, - "size": 47, - "type": "map_layer1" + "size": 48, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_13_0.bin", + "path": "maps/areas/036_TreeInteriors/rooms/28_1c/gAreaRoomMap_TreeInteriors_1c_bottom.bin", "start": 4566316, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_13_1.bin", + "path": "maps/areas/036_TreeInteriors/rooms/28_1c/gAreaRoomMap_TreeInteriors_1c_top.bin.lz", "start": 4566616, - "size": 85, - "type": "map_layer1" + "size": 88, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_14_0.bin", + "path": "maps/areas/036_TreeInteriors/rooms/29_MinishWoodsBusinessScrub/gAreaRoomMap_TreeInteriors_MinishWoodsBusinessScrub_bottom.bin", "start": 4566704, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_14_1.bin", + "path": "maps/areas/036_TreeInteriors/rooms/29_MinishWoodsBusinessScrub/gAreaRoomMap_TreeInteriors_MinishWoodsBusinessScrub_top.bin.lz", "start": 4567004, - "size": 45, - "type": "map_layer1" + "size": 48, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_15_0.bin", + "path": "maps/areas/036_TreeInteriors/rooms/30_1e/gAreaRoomMap_TreeInteriors_1e_bottom.bin", "start": 4567052, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_15_1.bin", + "path": "maps/areas/036_TreeInteriors/rooms/30_1e/gAreaRoomMap_TreeInteriors_1e_top.bin.lz", "start": 4567352, "size": 64, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_16_0.bin", + "path": "maps/areas/036_TreeInteriors/rooms/31_UnusedHeartContainer/gAreaRoomMap_TreeInteriors_UnusedHeartContainer_bottom.bin", "start": 4567416, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TreeInteriors_16_1.bin", + "path": "maps/areas/036_TreeInteriors/rooms/31_UnusedHeartContainer/gAreaRoomMap_TreeInteriors_UnusedHeartContainer_top.bin.lz", "start": 4567716, "size": 44, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_0_0.bin", + "path": "maps/areas/039_MinishCracks/rooms/00_LonLonRanchNorth/gAreaRoomMap_MinishCracks_LonLonRanchNorth_bottom.bin", "start": 4567760, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_0_1.bin", + "path": "maps/areas/039_MinishCracks/rooms/00_LonLonRanchNorth/gAreaRoomMap_MinishCracks_LonLonRanchNorth_top.bin.lz", "start": 4568060, - "size": 46, - "type": "map_layer1" + "size": 48, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_1_0.bin", + "path": "maps/areas/039_MinishCracks/rooms/01_LakeHyliaEast/gAreaRoomMap_MinishCracks_LakeHyliaEast_bottom.bin", "start": 4568108, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_1_1.bin", + "path": "maps/areas/039_MinishCracks/rooms/01_LakeHyliaEast/gAreaRoomMap_MinishCracks_LakeHyliaEast_top.bin.lz", "start": 4568408, - "size": 78, - "type": "map_layer1" + "size": 80, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_2_0.bin", + "path": "maps/areas/039_MinishCracks/rooms/02_HyruleCastleGarden/gAreaRoomMap_MinishCracks_HyruleCastleGarden_bottom.bin", "start": 4568488, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_2_1.bin", + "path": "maps/areas/039_MinishCracks/rooms/02_HyruleCastleGarden/gAreaRoomMap_MinishCracks_HyruleCastleGarden_top.bin.lz", "start": 4568788, - "size": 83, - "type": "map_layer1" + "size": 84, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_3_0.bin", + "path": "maps/areas/039_MinishCracks/rooms/03_MtCrenel/gAreaRoomMap_MinishCracks_MtCrenel_bottom.bin", "start": 4568872, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_3_1.bin", + "path": "maps/areas/039_MinishCracks/rooms/03_MtCrenel/gAreaRoomMap_MinishCracks_MtCrenel_top.bin.lz", "start": 4569172, - "size": 82, - "type": "map_layer1" + "size": 84, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_4_0.bin", + "path": "maps/areas/039_MinishCracks/rooms/04_EastHyruleCastle/gAreaRoomMap_MinishCracks_EastHyruleCastle_bottom.bin", "start": 4569256, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_4_1.bin", + "path": "maps/areas/039_MinishCracks/rooms/04_EastHyruleCastle/gAreaRoomMap_MinishCracks_EastHyruleCastle_top.bin.lz", "start": 4569556, "size": 80, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_5_0.bin", + "path": "maps/areas/039_MinishCracks/rooms/05_5/gAreaRoomMap_MinishCracks_5_bottom.bin.lz", "start": 4569636, - "size": 279, - "type": "map_layer2" + "size": 280, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_5_1.bin", + "path": "maps/areas/039_MinishCracks/rooms/05_5/gAreaRoomMap_MinishCracks_5_top.bin.lz", "start": 4569916, "size": 68, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_6_0.bin", + "path": "maps/areas/039_MinishCracks/rooms/06_CastorWildsBow/gAreaRoomMap_MinishCracks_CastorWildsBow_bottom.bin", "start": 4569984, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_6_1.bin", + "path": "maps/areas/039_MinishCracks/rooms/06_CastorWildsBow/gAreaRoomMap_MinishCracks_CastorWildsBow_top.bin.lz", "start": 4570284, - "size": 43, - "type": "map_layer1" + "size": 44, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_7_0.bin", + "path": "maps/areas/039_MinishCracks/rooms/07_RuinsEntrance/gAreaRoomMap_MinishCracks_RuinsEntrance_bottom.bin", "start": 4570328, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_7_1.bin", + "path": "maps/areas/039_MinishCracks/rooms/07_RuinsEntrance/gAreaRoomMap_MinishCracks_RuinsEntrance_top.bin.lz", "start": 4570628, - "size": 83, - "type": "map_layer1" + "size": 84, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_8_0.bin", + "path": "maps/areas/039_MinishCracks/rooms/08_MinishWoodsSouth/gAreaRoomMap_MinishCracks_MinishWoodsSouth_bottom.bin", "start": 4570712, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_8_1.bin", + "path": "maps/areas/039_MinishCracks/rooms/08_MinishWoodsSouth/gAreaRoomMap_MinishCracks_MinishWoodsSouth_top.bin.lz", "start": 4571012, - "size": 46, - "type": "map_layer1" + "size": 48, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_9_0.bin", + "path": "maps/areas/039_MinishCracks/rooms/09_CastorWildsNorth/gAreaRoomMap_MinishCracks_CastorWildsNorth_bottom.bin", "start": 4571060, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_9_1.bin", + "path": "maps/areas/039_MinishCracks/rooms/09_CastorWildsNorth/gAreaRoomMap_MinishCracks_CastorWildsNorth_top.bin.lz", "start": 4571360, - "size": 46, - "type": "map_layer1" + "size": 48, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_10_0.bin", + "path": "maps/areas/039_MinishCracks/rooms/10_CastorWildsWest/gAreaRoomMap_MinishCracks_CastorWildsWest_bottom.bin", "start": 4571408, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_10_1.bin", + "path": "maps/areas/039_MinishCracks/rooms/10_CastorWildsWest/gAreaRoomMap_MinishCracks_CastorWildsWest_top.bin.lz", "start": 4571708, - "size": 46, - "type": "map_layer1" + "size": 48, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_11_0.bin", + "path": "maps/areas/039_MinishCracks/rooms/11_CastorWildsMiddle/gAreaRoomMap_MinishCracks_CastorWildsMiddle_bottom.bin", "start": 4571756, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_11_1.bin", + "path": "maps/areas/039_MinishCracks/rooms/11_CastorWildsMiddle/gAreaRoomMap_MinishCracks_CastorWildsMiddle_top.bin.lz", "start": 4572056, - "size": 46, - "type": "map_layer1" + "size": 48, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_12_0.bin", + "path": "maps/areas/039_MinishCracks/rooms/12_RuinsTektite/gAreaRoomMap_MinishCracks_RuinsTektite_bottom.bin", "start": 4572104, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_12_1.bin", + "path": "maps/areas/039_MinishCracks/rooms/12_RuinsTektite/gAreaRoomMap_MinishCracks_RuinsTektite_top.bin.lz", "start": 4572404, - "size": 46, - "type": "map_layer1" + "size": 48, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_13_0.bin", + "path": "maps/areas/039_MinishCracks/rooms/13_CastorWildsNextToBow/gAreaRoomMap_MinishCracks_CastorWildsNextToBow_bottom.bin", "start": 4572452, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_13_1.bin", + "path": "maps/areas/039_MinishCracks/rooms/13_CastorWildsNextToBow/gAreaRoomMap_MinishCracks_CastorWildsNextToBow_top.bin.lz", "start": 4572752, - "size": 46, - "type": "map_layer1" + "size": 48, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_14_0.bin", + "path": "maps/areas/039_MinishCracks/rooms/14_E/gAreaRoomMap_MinishCracks_E_bottom.bin.lz", "start": 4572800, - "size": 270, - "type": "map_layer2" + "size": 272, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_14_1.bin", + "path": "maps/areas/039_MinishCracks/rooms/14_E/gAreaRoomMap_MinishCracks_E_top.bin.lz", "start": 4573072, "size": 48, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_15_0.bin", + "path": "maps/areas/039_MinishCracks/rooms/15_F/gAreaRoomMap_MinishCracks_F_bottom.bin.lz", "start": 4573120, - "size": 270, - "type": "map_layer2" + "size": 272, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_15_1.bin", + "path": "maps/areas/039_MinishCracks/rooms/15_F/gAreaRoomMap_MinishCracks_F_top.bin.lz", "start": 4573392, "size": 48, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_16_0.bin", + "path": "maps/areas/039_MinishCracks/rooms/16_10/gAreaRoomMap_MinishCracks_10_bottom.bin.lz", "start": 4573440, - "size": 270, - "type": "map_layer2" + "size": 272, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_16_1.bin", + "path": "maps/areas/039_MinishCracks/rooms/16_10/gAreaRoomMap_MinishCracks_10_top.bin.lz", "start": 4573712, - "size": 54, - "type": "map_layer1" + "size": 56, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_17_0.bin", + "path": "maps/areas/039_MinishCracks/rooms/17_11/gAreaRoomMap_MinishCracks_11_bottom.bin.lz", "start": 4573768, - "size": 273, - "type": "map_layer2" + "size": 276, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishCracks_17_1.bin", + "path": "maps/areas/039_MinishCracks/rooms/17_11/gAreaRoomMap_MinishCracks_11_top.bin.lz", "start": 4574044, "size": 48, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishRafters_0_0.bin", + "path": "maps/areas/046_MinishRafters/rooms/00_Cafe/gAreaRoomMap_MinishRafters_Cafe_bottom.bin.lz", "start": 4574092, - "size": 585, - "type": "map_layer2" + "size": 588, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishRafters_1_0.bin", + "path": "maps/areas/046_MinishRafters/rooms/01_Stockwell/gAreaRoomMap_MinishRafters_Stockwell_bottom.bin.lz", "start": 4574680, - "size": 538, - "type": "map_layer2" + "size": 540, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishRafters_2_0.bin", + "path": "maps/areas/046_MinishRafters/rooms/02_DrLeft/gAreaRoomMap_MinishRafters_DrLeft_bottom.bin.lz", "start": 4575220, "size": 676, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishRafters_3_0.bin", + "path": "maps/areas/046_MinishRafters/rooms/03_Bakery/gAreaRoomMap_MinishRafters_Bakery_bottom.bin.lz", "start": 4575896, - "size": 515, - "type": "map_layer2" + "size": 516, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_EzloCutscene_0_0.bin", + "path": "maps/areas/056_EzloCutscene/rooms/00_0/gAreaRoomMap_EzloCutscene_0_bottom.bin.lz", "start": 4576412, - "size": 407, - "type": "map_layer2" + "size": 408, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_EzloCutscene_0_1.bin", + "path": "maps/areas/056_EzloCutscene/rooms/00_0/gAreaRoomMap_EzloCutscene_0_top.bin.lz", "start": 4576820, "size": 136, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_WindTribeTower_0_0.bin", + "path": "maps/areas/048_WindTribeTower/rooms/00_Entrance/gAreaRoomMap_WindTribeTower_Entrance_bottom.bin.lz", "start": 4576956, "size": 480, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_WindTribeTower_0_1.bin", + "path": "maps/areas/048_WindTribeTower/rooms/00_Entrance/gAreaRoomMap_WindTribeTower_Entrance_top.bin.lz", "start": 4577436, - "size": 131, - "type": "map_layer1" + "size": 132, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_WindTribeTower_1_0.bin", + "path": "maps/areas/048_WindTribeTower/rooms/01_Floor1/gAreaRoomMap_WindTribeTower_Floor1_bottom.bin.lz", "start": 4577568, - "size": 489, - "type": "map_layer2" + "size": 492, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_WindTribeTower_1_1.bin", + "path": "maps/areas/048_WindTribeTower/rooms/01_Floor1/gAreaRoomMap_WindTribeTower_Floor1_top.bin.lz", "start": 4578060, - "size": 121, - "type": "map_layer1" + "size": 124, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_WindTribeTower_2_0.bin", + "path": "maps/areas/048_WindTribeTower/rooms/02_Floor2/gAreaRoomMap_WindTribeTower_Floor2_bottom.bin.lz", "start": 4578184, - "size": 470, - "type": "map_layer2" + "size": 472, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_WindTribeTower_2_1.bin", + "path": "maps/areas/048_WindTribeTower/rooms/02_Floor2/gAreaRoomMap_WindTribeTower_Floor2_top.bin.lz", "start": 4578656, - "size": 125, - "type": "map_layer1" + "size": 128, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_WindTribeTower_3_0.bin", + "path": "maps/areas/048_WindTribeTower/rooms/03_Floor3/gAreaRoomMap_WindTribeTower_Floor3_bottom.bin.lz", "start": 4578784, - "size": 495, - "type": "map_layer2" + "size": 496, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_WindTribeTower_3_1.bin", + "path": "maps/areas/048_WindTribeTower/rooms/03_Floor3/gAreaRoomMap_WindTribeTower_Floor3_top.bin.lz", "start": 4579280, - "size": 93, - "type": "map_layer1" + "size": 96, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_WindTribeTowerRoof_0_0.bin", + "path": "maps/areas/049_WindTribeTowerRoof/rooms/00_0/gAreaRoomMap_WindTribeTowerRoof_0_bottom.bin.lz", "start": 4579376, - "size": 594, - "type": "map_layer2" + "size": 596, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_WindTribeTowerRoof_0_1.bin", + "path": "maps/areas/049_WindTribeTowerRoof/rooms/00_0/gAreaRoomMap_WindTribeTowerRoof_0_top.bin.lz", "start": 4579972, "size": 100, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_0_2.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/00_GentariMain/gRoomMapping_MinishHouseInteriors_GentariMain_bottom.bin.lz", "start": 4580072, - "size": 1413, + "size": 1416, "type": "map_mapping2" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_0_1.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/00_GentariMain/gRoomCollisionMap_MinishHouseInteriors_GentariMain.bin.lz", "start": 4581488, - "size": 63, + "size": 64, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_1_2.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/01_GentariExit/gRoomMapping_MinishHouseInteriors_GentariExit_bottom.bin.lz", "start": 4581552, "size": 1100, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_0_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tileSets/0/gAreaTileSet_MinishHouseInteriors_0_0.8bpp.lz", "start": 4582652, - "size": 17751, - "type": "tileset" + "size": 17752, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_1_1.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/01_GentariExit/gRoomCollisionMap_MinishHouseInteriors_GentariExit.bin.lz", "start": 4600404, - "size": 59, + "size": 60, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_2_2.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/02_Festari/gRoomMapping_MinishHouseInteriors_Festari_bottom.bin.lz", "start": 4600464, "size": 3700, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_1_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tileSets/1/gAreaTileSet_MinishHouseInteriors_1_0.8bpp.lz", "start": 4604164, "size": 11540, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_2_1.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/02_Festari/gRoomCollisionMap_MinishHouseInteriors_Festari.bin.lz", "start": 4615704, "size": 112, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_3_2.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/03_Red/gRoomMapping_MinishHouseInteriors_Red_bottom.bin.lz", "start": 4615816, - "size": 1042, + "size": 1044, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_2_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tileSets/2/gAreaTileSet_MinishHouseInteriors_2_0.8bpp.lz", "start": 4616860, "size": 9324, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_3_1.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/03_Red/gRoomCollisionMap_MinishHouseInteriors_Red.bin.lz", "start": 4626184, - "size": 49, + "size": 52, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_4_2.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/04_Green/gRoomMapping_MinishHouseInteriors_Green_bottom.bin.lz", "start": 4626236, - "size": 1041, + "size": 1044, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_3_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tileSets/3/gAreaTileSet_MinishHouseInteriors_3_0.8bpp.lz", "start": 4627280, "size": 9204, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_4_1.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/04_Green/gRoomCollisionMap_MinishHouseInteriors_Green.bin.lz", "start": 4636484, "size": 44, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_5_2.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/05_Blue/gRoomMapping_MinishHouseInteriors_Blue_bottom.bin.lz", "start": 4636528, "size": 1040, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_4_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tileSets/4/gAreaTileSet_MinishHouseInteriors_4_0.8bpp.lz", "start": 4637568, - "size": 8933, - "type": "tileset" + "size": 8936, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_5_1.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/05_Blue/gRoomCollisionMap_MinishHouseInteriors_Blue.bin.lz", "start": 4646504, - "size": 47, + "size": 48, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_6_2.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/06_SideArea/gRoomMapping_MinishHouseInteriors_SideArea_bottom.bin.lz", "start": 4646552, - "size": 1043, + "size": 1044, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_5_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tileSets/5/gAreaTileSet_MinishHouseInteriors_5_0.8bpp.lz", "start": 4647596, "size": 10216, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_6_1.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/06_SideArea/gRoomCollisionMap_MinishHouseInteriors_SideArea.bin.lz", "start": 4657812, "size": 60, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_7_2.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/07_ShoeMinish/gRoomMapping_MinishHouseInteriors_ShoeMinish_bottom.bin.lz", "start": 4657872, "size": 1444, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_6_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tileSets/6/gAreaTileSet_MinishHouseInteriors_6_0.8bpp.lz", "start": 4659316, - "size": 20013, - "type": "tileset" + "size": 20016, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_7_1.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/07_ShoeMinish/gRoomCollisionMap_MinishHouseInteriors_ShoeMinish.bin.lz", "start": 4679332, "size": 52, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_8_2.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/08_PotMinish/gRoomMapping_MinishHouseInteriors_PotMinish_bottom.bin.lz", "start": 4679384, - "size": 1838, + "size": 1840, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_7_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tileSets/7/gAreaTileSet_MinishHouseInteriors_7_0.8bpp.lz", "start": 4681224, - "size": 13589, - "type": "tileset" + "size": 13592, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_8_1.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/08_PotMinish/gRoomCollisionMap_MinishHouseInteriors_PotMinish.bin.lz", "start": 4694816, - "size": 77, + "size": 80, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_9_2.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/09_BarrelMinish/gRoomMapping_MinishHouseInteriors_BarrelMinish_bottom.bin.lz", "start": 4694896, - "size": 2653, + "size": 2656, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_8_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tileSets/8/gAreaTileSet_MinishHouseInteriors_8_0.8bpp.lz", "start": 4697552, - "size": 16289, - "type": "tileset" + "size": 16292, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_9_1.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/09_BarrelMinish/gRoomCollisionMap_MinishHouseInteriors_BarrelMinish.bin.lz", "start": 4713844, - "size": 83, + "size": 84, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_10_2.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/16_MelariMinesSouthwest/gRoomMapping_MinishHouseInteriors_MelariMinesSouthwest_bottom.bin.lz", "start": 4713928, - "size": 1357, + "size": 1360, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_9_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tileSets/9/gAreaTileSet_MinishHouseInteriors_9_0.8bpp.lz", "start": 4715288, - "size": 11535, - "type": "tileset" + "size": 11536, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_10_1.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/16_MelariMinesSouthwest/gRoomCollisionMap_MinishHouseInteriors_MelariMinesSouthwest.bin.lz", "start": 4726824, - "size": 54, + "size": 56, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_11_2.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/17_MelariMinesSoutheast/gRoomMapping_MinishHouseInteriors_MelariMinesSoutheast_bottom.bin.lz", "start": 4726880, - "size": 1378, + "size": 1380, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_10_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tileSets/10/gAreaTileSet_MinishHouseInteriors_10_0.8bpp.lz", "start": 4728260, - "size": 11703, - "type": "tileset" + "size": 11704, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_11_1.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/17_MelariMinesSoutheast/gRoomCollisionMap_MinishHouseInteriors_MelariMinesSoutheast.bin.lz", "start": 4739964, "size": 68, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_12_2.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/18_MelariMinesEast/gRoomMapping_MinishHouseInteriors_MelariMinesEast_bottom.bin.lz", "start": 4740032, - "size": 1837, + "size": 1840, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_11_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tileSets/11/gAreaTileSet_MinishHouseInteriors_11_0.8bpp.lz", "start": 4741872, - "size": 9865, - "type": "tileset" + "size": 9868, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_12_1.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/18_MelariMinesEast/gRoomCollisionMap_MinishHouseInteriors_MelariMinesEast.bin.lz", "start": 4751740, - "size": 83, + "size": 84, "type": "map_collision" }, { "path": "assets/unknown_28.bin", "start": 4751824, "size": 23532, - "type": "unknown" + "type": "unknown", + "TODO": "mapping?, 8bpp subTileSet, mapping?" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_13_2.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/32_HyruleFieldSouthwest/gRoomMapping_MinishHouseInteriors_HyruleFieldSouthwest_bottom.bin.lz", "start": 4775356, - "size": 1118, + "size": 1120, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_12_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tileSets/12/gAreaTileSet_MinishHouseInteriors_12_0.8bpp.lz", "start": 4776476, - "size": 12221, - "type": "tileset" + "size": 12224, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_13_1.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/32_HyruleFieldSouthwest/gRoomCollisionMap_MinishHouseInteriors_HyruleFieldSouthwest.bin.lz", "start": 4788700, - "size": 53, + "size": 56, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_14_2.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/33_SouthHyruleField/gRoomMapping_MinishHouseInteriors_SouthHyruleField_bottom.bin.lz", "start": 4788756, - "size": 1127, + "size": 1128, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_13_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tileSets/13/gAreaTileSet_MinishHouseInteriors_13_0.8bpp.lz", "start": 4789884, "size": 11968, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_14_1.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/33_SouthHyruleField/gRoomCollisionMap_MinishHouseInteriors_SouthHyruleField.bin.lz", "start": 4801852, - "size": 50, + "size": 52, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_15_2.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/34_NextToKnuckle/gRoomMapping_MinishHouseInteriors_NextToKnuckle_bottom.bin.lz", "start": 4801904, - "size": 1115, + "size": 1116, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_14_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tileSets/14/gAreaTileSet_MinishHouseInteriors_14_0.8bpp.lz", "start": 4803020, - "size": 12141, - "type": "tileset" + "size": 12144, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_15_1.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/34_NextToKnuckle/gRoomCollisionMap_MinishHouseInteriors_NextToKnuckle.bin.lz", "start": 4815164, "size": 52, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_16_2.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/35_Librari/gRoomMapping_MinishHouseInteriors_Librari_bottom.bin.lz", "start": 4815216, "size": 1116, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_15_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tileSets/15/gAreaTileSet_MinishHouseInteriors_15_0.8bpp.lz", "start": 4816332, - "size": 7859, - "type": "tileset" + "size": 7860, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_16_1.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/35_Librari/gRoomCollisionMap_MinishHouseInteriors_Librari.bin.lz", "start": 4824192, - "size": 50, + "size": 52, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_17_2.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/36_HyruleFieldExit/gRoomMapping_MinishHouseInteriors_HyruleFieldExit_bottom.bin.lz", "start": 4824244, - "size": 1125, + "size": 1128, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_16_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tileSets/16/gAreaTileSet_MinishHouseInteriors_16_0.8bpp.lz", "start": 4825372, "size": 12332, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_17_1.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/36_HyruleFieldExit/gRoomCollisionMap_MinishHouseInteriors_HyruleFieldExit.bin.lz", "start": 4837704, - "size": 58, + "size": 60, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_18_2.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/37_HyruleTown/gRoomMapping_MinishHouseInteriors_HyruleTown_bottom.bin.lz", "start": 4837764, - "size": 1127, + "size": 1128, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_17_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tileSets/17/gAreaTileSet_MinishHouseInteriors_17_0.8bpp.lz", "start": 4838892, "size": 10416, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_18_1.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/37_HyruleTown/gRoomCollisionMap_MinishHouseInteriors_HyruleTown.bin.lz", "start": 4849308, - "size": 53, + "size": 56, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_19_2.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/38_MinishWoodsBomb/gRoomMapping_MinishHouseInteriors_MinishWoodsBomb_bottom.bin.lz", "start": 4849364, "size": 1124, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_18_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tileSets/18/gAreaTileSet_MinishHouseInteriors_18_0.8bpp.lz", "start": 4850488, "size": 12716, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_19_1.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/38_MinishWoodsBomb/gRoomCollisionMap_MinishHouseInteriors_MinishWoodsBomb.bin.lz", "start": 4863204, - "size": 49, + "size": 52, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_20_2.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/39_LakeHyliaOcarina/gRoomMapping_MinishHouseInteriors_LakeHyliaOcarina_bottom.bin.lz", "start": 4863256, - "size": 1127, + "size": 1128, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_19_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tileSets/19/gAreaTileSet_MinishHouseInteriors_19_0.8bpp.lz", "start": 4864384, - "size": 12254, - "type": "tileset" + "size": 12256, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_MinishHouseInteriors_20_1.bin", + "path": "maps/areas/032_MinishHouseInteriors/rooms/39_LakeHyliaOcarina/gRoomCollisionMap_MinishHouseInteriors_LakeHyliaOcarina.bin.lz", "start": 4876640, - "size": 53, + "size": 56, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_TownMinishHoles_0_2.bin", + "path": "maps/areas/045_TownMinishHoles/rooms/00_MayorsHouse/gRoomMapping_TownMinishHoles_MayorsHouse_bottom.bin.lz", "start": 4876696, - "size": 1285, + "size": 1288, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_TownMinishHoles_0_0.8bpp.lz", + "path": "maps/areas/045_TownMinishHoles/tileSets/0/gAreaTileSet_TownMinishHoles_0_0.8bpp.lz", "start": 4877984, - "size": 8598, - "type": "tileset" + "size": 8600, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_TownMinishHoles_0_1.bin", + "path": "maps/areas/045_TownMinishHoles/rooms/00_MayorsHouse/gRoomCollisionMap_TownMinishHoles_MayorsHouse.bin.lz", "start": 4886584, - "size": 50, + "size": 52, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_TownMinishHoles_1_2.bin", + "path": "maps/areas/045_TownMinishHoles/rooms/01_WestOracle/gRoomMapping_TownMinishHoles_WestOracle_bottom.bin.lz", "start": 4886636, - "size": 1413, + "size": 1416, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_TownMinishHoles_1_0.8bpp.lz", + "path": "maps/areas/045_TownMinishHoles/tileSets/1/gAreaTileSet_TownMinishHoles_1_0.8bpp.lz", "start": 4888052, - "size": 10686, - "type": "tileset" + "size": 10688, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_TownMinishHoles_1_1.bin", + "path": "maps/areas/045_TownMinishHoles/rooms/01_WestOracle/gRoomCollisionMap_TownMinishHoles_WestOracle.bin.lz", "start": 4898740, - "size": 65, + "size": 68, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_TownMinishHoles_2_2.bin", + "path": "maps/areas/045_TownMinishHoles/rooms/02_DrLeft/gRoomMapping_TownMinishHoles_DrLeft_bottom.bin.lz", "start": 4898808, - "size": 1317, + "size": 1320, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_TownMinishHoles_2_0.8bpp.lz", + "path": "maps/areas/045_TownMinishHoles/tileSets/2/gAreaTileSet_TownMinishHoles_2_0.8bpp.lz", "start": 4900128, - "size": 9694, - "type": "tileset" + "size": 9696, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_TownMinishHoles_2_1.bin", + "path": "maps/areas/045_TownMinishHoles/rooms/02_DrLeft/gRoomCollisionMap_TownMinishHoles_DrLeft.bin.lz", "start": 4909824, - "size": 47, + "size": 48, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_TownMinishHoles_3_2.bin", + "path": "maps/areas/045_TownMinishHoles/rooms/03_Carpenter/gRoomMapping_TownMinishHoles_Carpenter_bottom.bin.lz", "start": 4909872, - "size": 1415, + "size": 1416, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_TownMinishHoles_3_0.8bpp.lz", + "path": "maps/areas/045_TownMinishHoles/tileSets/3/gAreaTileSet_TownMinishHoles_3_0.8bpp.lz", "start": 4911288, - "size": 10723, - "type": "tileset" + "size": 10724, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_TownMinishHoles_3_1.bin", + "path": "maps/areas/045_TownMinishHoles/rooms/03_Carpenter/gRoomCollisionMap_TownMinishHoles_Carpenter.bin.lz", "start": 4922012, - "size": 59, + "size": 60, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_TownMinishHoles_4_2.bin", + "path": "maps/areas/045_TownMinishHoles/rooms/04_Cafe/gRoomMapping_TownMinishHoles_Cafe_bottom.bin.lz", "start": 4922072, - "size": 1339, + "size": 1340, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_TownMinishHoles_4_0.8bpp.lz", + "path": "maps/areas/045_TownMinishHoles/tileSets/4/gAreaTileSet_TownMinishHoles_4_0.8bpp.lz", "start": 4923412, - "size": 9306, - "type": "tileset" + "size": 9308, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_TownMinishHoles_4_1.bin", + "path": "maps/areas/045_TownMinishHoles/rooms/04_Cafe/gRoomCollisionMap_TownMinishHoles_Cafe.bin.lz", "start": 4932720, "size": 60, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_TownMinishHoles_5_2.bin", + "path": "maps/areas/045_TownMinishHoles/rooms/05_5/gRoomMapping_TownMinishHoles_5_bottom.bin.lz", "start": 4932780, "size": 1424, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_TownMinishHoles_5_0.8bpp.lz", + "path": "maps/areas/045_TownMinishHoles/tileSets/5/gAreaTileSet_TownMinishHoles_5_0.8bpp.lz", "start": 4934204, - "size": 12389, - "type": "tileset" + "size": 12392, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_TownMinishHoles_5_1.bin", + "path": "maps/areas/045_TownMinishHoles/rooms/05_5/gRoomCollisionMap_TownMinishHoles_5.bin.lz", "start": 4946596, "size": 52, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_TownMinishHoles_6_2.bin", + "path": "maps/areas/045_TownMinishHoles/rooms/16_LibraryBookshelf/gRoomMapping_TownMinishHoles_LibraryBookshelf_bottom.bin.lz", "start": 4946648, - "size": 3294, + "size": 3296, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_TownMinishHoles_6_0.8bpp.lz", + "path": "maps/areas/045_TownMinishHoles/tileSets/6/gAreaTileSet_TownMinishHoles_6_0.8bpp.lz", "start": 4949944, - "size": 12973, - "type": "tileset" + "size": 12976, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_TownMinishHoles_6_1.bin", + "path": "maps/areas/045_TownMinishHoles/rooms/16_LibraryBookshelf/gRoomCollisionMap_TownMinishHoles_LibraryBookshelf.bin.lz", "start": 4962920, - "size": 119, + "size": 120, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_TownMinishHoles_7_2.bin", + "path": "maps/areas/045_TownMinishHoles/rooms/17_LibraryBooksHouse/gRoomMapping_TownMinishHoles_LibraryBooksHouse_bottom.bin.lz", "start": 4963040, "size": 1676, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_TownMinishHoles_7_0.8bpp.lz", + "path": "maps/areas/045_TownMinishHoles/tileSets/7/gAreaTileSet_TownMinishHoles_7_0.8bpp.lz", "start": 4964716, "size": 17700, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_TownMinishHoles_7_1.bin", + "path": "maps/areas/045_TownMinishHoles/rooms/17_LibraryBooksHouse/gRoomCollisionMap_TownMinishHoles_LibraryBooksHouse.bin.lz", "start": 4982416, - "size": 55, + "size": 56, "type": "map_collision" }, { - "path": "assets/gAreaRoomMap_TownMinishHoles_8_2.bin", + "path": "maps/areas/045_TownMinishHoles/rooms/18_RemShoeShop/gRoomMapping_TownMinishHoles_RemShoeShop_bottom.bin.lz", "start": 4982472, - "size": 2978, + "size": 2980, "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_TownMinishHoles_8_0.8bpp.lz", + "path": "maps/areas/045_TownMinishHoles/tileSets/8/gAreaTileSet_TownMinishHoles_8_0.8bpp.lz", "start": 4985452, - "size": 13622, - "type": "tileset" + "size": 13624, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_TownMinishHoles_8_1.bin", + "path": "maps/areas/045_TownMinishHoles/rooms/18_RemShoeShop/gRoomCollisionMap_TownMinishHoles_RemShoeShop.bin.lz", "start": 4999076, - "size": 78, + "size": 80, "type": "map_collision" }, { - "path": "tilesets/gAreaTileset_SimonsSimulation_0_0.4bpp.lz", + "path": "maps/areas/064_40/tileSets/0/gAreaTileSet_40_0_0.4bpp.lz", "start": 4999156, - "size": 8059, - "type": "tileset" + "size": 8060, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_SimonsSimulation_0_1.4bpp.lz", + "path": "maps/areas/064_40/tileSets/0/gAreaTileSet_40_0_1.4bpp.lz", "start": 5007216, "size": 8020, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_SimonsSimulation_0_2.4bpp.lz", + "path": "maps/areas/064_40/tileSets/0/gAreaTileSet_40_0_2.4bpp.lz", "start": 5015236, - "size": 5590, - "type": "tileset" + "size": 5592, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_HyruleTownUnderground_0.bin", + "path": "maps/areas/064_40/tileSet/gAreaTileSet_40_bottom.bin.lz", "start": 5020828, - "size": 8858, - "type": "metatiles_tileset2" + "size": 8860, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_HyruleTownUnderground_1.bin", + "path": "maps/areas/064_40/tileSet/gAreaTileSet_40_top.bin.lz", "start": 5029688, - "size": 5819, - "type": "metatiles_tileset1" + "size": 5820, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_HyruleTownUnderground_2.bin", + "path": "maps/areas/064_40/tileSet/gAreaTileSetTypes_40_bottom.bin.lz", "start": 5035508, "size": 1264, - "type": "metatiles_tile_types2" + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_HyruleTownUnderground_3.bin", + "path": "maps/areas/064_40/tileSet/gAreaTileSetTypes_40_top.bin.lz", "start": 5036772, "size": 1004, - "type": "metatiles_tile_types1" + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_40_0_0.bin", + "path": "maps/areas/064_40/rooms/00_0/gAreaRoomMap_40_0_bottom.bin.lz", "start": 5037776, "size": 416, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_40_0_1.bin", + "path": "maps/areas/064_40/rooms/00_0/gAreaRoomMap_40_0_top.bin.lz", "start": 5038192, - "size": 107, - "type": "map_layer1" + "size": 108, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_40_1_0.bin", + "path": "maps/areas/064_40/rooms/01_1/gAreaRoomMap_40_1_bottom.bin.lz", "start": 5038300, - "size": 563, - "type": "map_layer2" + "size": 564, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_40_1_1.bin", + "path": "maps/areas/064_40/rooms/01_1/gAreaRoomMap_40_1_top.bin.lz", "start": 5038864, - "size": 158, - "type": "map_layer1" + "size": 160, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_40_2_0.bin", + "path": "maps/areas/064_40/rooms/02_2/gAreaRoomMap_40_2_bottom.bin.lz", "start": 5039024, - "size": 355, - "type": "map_layer2" + "size": 356, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_40_2_1.bin", + "path": "maps/areas/064_40/rooms/02_2/gAreaRoomMap_40_2_top.bin.lz", "start": 5039380, "size": 160, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_40_3_0.bin", + "path": "maps/areas/064_40/rooms/03_3/gAreaRoomMap_40_3_bottom.bin.lz", "start": 5039540, - "size": 342, - "type": "map_layer2" + "size": 344, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_40_3_1.bin", + "path": "maps/areas/064_40/rooms/03_3/gAreaRoomMap_40_3_top.bin.lz", "start": 5039884, - "size": 159, - "type": "map_layer1" + "size": 160, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_40_4_0.bin", + "path": "maps/areas/064_40/rooms/04_4/gAreaRoomMap_40_4_bottom.bin.lz", "start": 5040044, "size": 416, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_40_4_1.bin", + "path": "maps/areas/064_40/rooms/04_4/gAreaRoomMap_40_4_top.bin.lz", "start": 5040460, "size": 140, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_40_5_0.bin", + "path": "maps/areas/064_40/rooms/05_5/gAreaRoomMap_40_5_bottom.bin.lz", "start": 5040600, - "size": 397, - "type": "map_layer2" + "size": 400, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_40_5_1.bin", + "path": "maps/areas/064_40/rooms/05_5/gAreaRoomMap_40_5_top.bin.lz", "start": 5041000, - "size": 141, - "type": "map_layer1" + "size": 144, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_40_6_0.bin", + "path": "maps/areas/064_40/rooms/06_6/gAreaRoomMap_40_6_bottom.bin.lz", "start": 5041144, - "size": 622, - "type": "map_layer2" + "size": 624, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_40_6_1.bin", + "path": "maps/areas/064_40/rooms/06_6/gAreaRoomMap_40_6_top.bin.lz", "start": 5041768, - "size": 226, - "type": "map_layer1" + "size": 228, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_40_7_0.bin", + "path": "maps/areas/064_40/rooms/07_7/gAreaRoomMap_40_7_bottom.bin.lz", "start": 5041996, - "size": 321, - "type": "map_layer2" + "size": 324, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_40_7_1.bin", + "path": "maps/areas/064_40/rooms/07_7/gAreaRoomMap_40_7_top.bin.lz", "start": 5042320, - "size": 121, - "type": "map_layer1" + "size": 124, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_40_8_0.bin", + "path": "maps/areas/064_40/rooms/08_8/gAreaRoomMap_40_8_bottom.bin.lz", "start": 5042444, - "size": 257, - "type": "map_layer2" + "size": 260, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_40_8_1.bin", + "path": "maps/areas/064_40/rooms/08_8/gAreaRoomMap_40_8_top.bin.lz", "start": 5042704, - "size": 117, - "type": "map_layer1" + "size": 120, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownUnderground_0_0.bin", + "path": "maps/areas/065_HyruleTownUnderground/rooms/00_0/gAreaRoomMap_HyruleTownUnderground_0_bottom.bin.lz", "start": 5042824, - "size": 1230, - "type": "map_layer2" + "size": 1232, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownUnderground_0_1.bin", + "path": "maps/areas/065_HyruleTownUnderground/rooms/00_0/gAreaRoomMap_HyruleTownUnderground_0_top.bin.lz", "start": 5044056, "size": 448, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownUnderground_1_0.bin", + "path": "maps/areas/065_HyruleTownUnderground/rooms/01_1/gAreaRoomMap_HyruleTownUnderground_1_bottom.bin.lz", "start": 5044504, "size": 228, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownUnderground_1_1.bin", + "path": "maps/areas/065_HyruleTownUnderground/rooms/01_1/gAreaRoomMap_HyruleTownUnderground_1_top.bin.lz", "start": 5044732, - "size": 43, - "type": "map_layer1" + "size": 44, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_GardenFountains_0_0.bin", + "path": "maps/areas/066_GardenFountains/rooms/00_East/gAreaRoomMap_GardenFountains_East_bottom.bin.lz", "start": 5044776, - "size": 221, - "type": "map_layer2" + "size": 224, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_GardenFountains_0_1.bin", + "path": "maps/areas/066_GardenFountains/rooms/00_East/gAreaRoomMap_GardenFountains_East_top.bin.lz", "start": 5045000, - "size": 50, - "type": "map_layer1" + "size": 52, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_GardenFountains_1_0.bin", + "path": "maps/areas/066_GardenFountains/rooms/01_West/gAreaRoomMap_GardenFountains_West_bottom.bin.lz", "start": 5045052, - "size": 247, - "type": "map_layer2" + "size": 248, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_GardenFountains_1_1.bin", + "path": "maps/areas/066_GardenFountains/rooms/01_West/gAreaRoomMap_GardenFountains_West_top.bin.lz", "start": 5045300, - "size": 50, - "type": "map_layer1" + "size": 52, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleCastleCellar_0_0.bin", + "path": "maps/areas/067_HyruleCastleCellar/rooms/00_0/gAreaRoomMap_HyruleCastleCellar_0_bottom.bin.lz", "start": 5045352, - "size": 333, - "type": "map_layer2" + "size": 336, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleCastleCellar_0_1.bin", + "path": "maps/areas/067_HyruleCastleCellar/rooms/00_0/gAreaRoomMap_HyruleCastleCellar_0_top.bin.lz", "start": 5045688, - "size": 127, - "type": "map_layer1" + "size": 128, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleCastleCellar_1_0.bin", + "path": "maps/areas/067_HyruleCastleCellar/rooms/01_1/gAreaRoomMap_HyruleCastleCellar_1_bottom.bin.lz", "start": 5045816, "size": 212, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleCastleCellar_1_1.bin", + "path": "maps/areas/067_HyruleCastleCellar/rooms/01_1/gAreaRoomMap_HyruleCastleCellar_1_top.bin.lz", "start": 5046028, - "size": 74, - "type": "map_layer1" + "size": 76, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_SimonsSimulation_0_0.bin", + "path": "maps/areas/068_SimonsSimulation/rooms/00_0/gAreaRoomMap_SimonsSimulation_0_bottom.bin.lz", "start": 5046104, - "size": 305, - "type": "map_layer2" + "size": 308, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_SimonsSimulation_0_1.bin", + "path": "maps/areas/068_SimonsSimulation/rooms/00_0/gAreaRoomMap_SimonsSimulation_0_top.bin.lz", "start": 5046412, - "size": 75, - "type": "map_layer1" + "size": 76, + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_DeepwoodShrine_0_0.4bpp.lz", + "path": "maps/areas/072_DeepwoodShrine/tileSets/0/gAreaTileSet_DeepwoodShrine_0_0.4bpp.lz", "start": 5046488, "size": 9452, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_DeepwoodShrine_0_1.4bpp.lz", + "path": "maps/areas/072_DeepwoodShrine/tileSets/0/gAreaTileSet_DeepwoodShrine_0_1.4bpp.lz", "start": 5055940, - "size": 9626, - "type": "tileset" + "size": 9628, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_DeepwoodShrine_0_2.4bpp.lz", + "path": "maps/areas/072_DeepwoodShrine/tileSets/0/gAreaTileSet_DeepwoodShrine_0_2.4bpp.lz", "start": 5065568, - "size": 8262, - "type": "tileset" + "size": 8264, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_DeepwoodShrine_0.bin", + "path": "maps/areas/072_DeepwoodShrine/tileSet/gAreaTileSet_DeepwoodShrine_bottom.bin.lz", "start": 5073832, - "size": 9597, - "type": "metatiles_tileset2" + "size": 9600, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_DeepwoodShrine_1.bin", + "path": "maps/areas/072_DeepwoodShrine/tileSet/gAreaTileSet_DeepwoodShrine_top.bin.lz", "start": 5083432, "size": 6656, - "type": "metatiles_tileset1" + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_DeepwoodShrine_2.bin", + "path": "maps/areas/072_DeepwoodShrine/tileSet/gAreaTileSetTypes_DeepwoodShrine_bottom.bin.lz", "start": 5090088, "size": 1204, - "type": "metatiles_tile_types2" + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_DeepwoodShrine_3.bin", + "path": "maps/areas/072_DeepwoodShrine/tileSet/gAreaTileSetTypes_DeepwoodShrine_top.bin.lz", "start": 5091292, - "size": 945, - "type": "metatiles_tile_types1" + "size": 948, + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_DeepwoodShrineBoss_0_0.4bpp.lz", + "path": "maps/areas/073_DeepwoodShrineBoss/tileSets/0/gAreaTileSet_DeepwoodShrineBoss_0_0.4bpp.lz", "start": 5092240, - "size": 3675, - "type": "tileset" + "size": 3676, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_DeepwoodShrineBoss_0_1.4bpp.lz", + "path": "maps/areas/073_DeepwoodShrineBoss/tileSets/0/gAreaTileSet_DeepwoodShrineBoss_0_1.4bpp.lz", "start": 5095916, - "size": 8030, - "type": "tileset" + "size": 8032, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_DeepwoodShrineBoss_0_2.4bpp.lz", + "path": "maps/areas/073_DeepwoodShrineBoss/tileSets/0/gAreaTileSet_DeepwoodShrineBoss_0_2.4bpp.lz", "start": 5103948, - "size": 1949, - "type": "tileset" + "size": 1952, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_DeepwoodShrineBoss_0.bin", + "path": "maps/areas/073_DeepwoodShrineBoss/tileSet/gAreaTileSet_DeepwoodShrineBoss_bottom.bin.lz", "start": 5105900, - "size": 4394, - "type": "metatiles_tileset2" + "size": 4396, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_DeepwoodShrineBoss_1.bin", + "path": "maps/areas/073_DeepwoodShrineBoss/tileSet/gAreaTileSet_DeepwoodShrineBoss_top.bin.lz", "start": 5110296, - "size": 790, - "type": "metatiles_tileset1" + "size": 792, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_DeepwoodShrineBoss_2.bin", + "path": "maps/areas/073_DeepwoodShrineBoss/tileSet/gAreaTileSetTypes_DeepwoodShrineBoss_bottom.bin.lz", "start": 5111088, - "size": 621, - "type": "metatiles_tile_types2" + "size": 624, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_DeepwoodShrineBoss_3.bin", + "path": "maps/areas/073_DeepwoodShrineBoss/tileSet/gAreaTileSetTypes_DeepwoodShrineBoss_top.bin.lz", "start": 5111712, - "size": 217, - "type": "metatiles_tile_types1" + "size": 220, + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_DeepwoodShrineEntry_0_0.4bpp.lz", + "path": "maps/areas/074_DeepwoodShrineEntry/tileSets/0/gAreaTileSet_DeepwoodShrineEntry_0_0.4bpp.lz", "start": 5111932, - "size": 5426, - "type": "tileset" + "size": 5428, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_DeepwoodShrineEntry_0_1.4bpp.lz", + "path": "maps/areas/074_DeepwoodShrineEntry/tileSets/0/gAreaTileSet_DeepwoodShrineEntry_0_1.4bpp.lz", "start": 5117360, - "size": 2130, - "type": "tileset" + "size": 2132, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_DeepwoodShrineEntry_0_2.4bpp.lz", + "path": "maps/areas/074_DeepwoodShrineEntry/tileSets/0/gAreaTileSet_DeepwoodShrineEntry_0_2.4bpp.lz", "start": 5119492, - "size": 4605, - "type": "tileset" + "size": 4608, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_DeepwoodShrineEntry_0.bin", + "path": "maps/areas/074_DeepwoodShrineEntry/tileSet/gAreaTileSet_DeepwoodShrineEntry_bottom.bin.lz", "start": 5124100, - "size": 1515, - "type": "metatiles_tileset2" + "size": 1516, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_DeepwoodShrineEntry_1.bin", + "path": "maps/areas/074_DeepwoodShrineEntry/tileSet/gAreaTileSet_DeepwoodShrineEntry_top.bin.lz", "start": 5125616, - "size": 1026, - "type": "metatiles_tileset1" + "size": 1028, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_DeepwoodShrineEntry_2.bin", + "path": "maps/areas/074_DeepwoodShrineEntry/tileSet/gAreaTileSetTypes_DeepwoodShrineEntry_bottom.bin.lz", "start": 5126644, - "size": 175, - "type": "metatiles_tile_types2" + "size": 176, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_DeepwoodShrineEntry_3.bin", + "path": "maps/areas/074_DeepwoodShrineEntry/tileSet/gAreaTileSetTypes_DeepwoodShrineEntry_top.bin.lz", "start": 5126820, - "size": 117, - "type": "metatiles_tile_types1" + "size": 120, + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_0_0.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/00_Madderpillar/gAreaRoomMap_DeepwoodShrine_Madderpillar_bottom.bin.lz", "start": 5126940, - "size": 275, - "type": "map_layer2" + "size": 276, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_0_1.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/00_Madderpillar/gAreaRoomMap_DeepwoodShrine_Madderpillar_top.bin.lz", "start": 5127216, - "size": 217, - "type": "map_layer1" + "size": 220, + "type": "tileMap" }, { - "path": "assets/unknown_29.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/00_Madderpillar/dungeon_map.bin", "start": 5127436, "size": 76, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 15 + }, + "name": "gDungeonMaps_DeepwoodShrine_Madderpillar" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_1_0.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/01_BluePortal/gAreaRoomMap_DeepwoodShrine_BluePortal_bottom.bin.lz", "start": 5127512, - "size": 462, - "type": "map_layer2" + "size": 464, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_1_1.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/01_BluePortal/gAreaRoomMap_DeepwoodShrine_BluePortal_top.bin.lz", "start": 5127976, - "size": 250, - "type": "map_layer1" + "size": 252, + "type": "tileMap" }, { - "path": "assets/unknown_30.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/01_BluePortal/dungeon_map.bin", "start": 5128228, "size": 108, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 7, + "height": 15 + }, + "name": "gDungeonMaps_DeepwoodShrine_BluePortal" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_2_0.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/02_StairsToB1/gAreaRoomMap_DeepwoodShrine_StairsToB1_bottom.bin.lz", "start": 5128336, - "size": 426, - "type": "map_layer2" + "size": 428, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_2_1.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/02_StairsToB1/gAreaRoomMap_DeepwoodShrine_StairsToB1_top.bin.lz", "start": 5128764, - "size": 230, - "type": "map_layer1" + "size": 232, + "type": "tileMap" }, { - "path": "assets/unknown_31.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/02_StairsToB1/dungeon_map.bin", "start": 5128996, "size": 92, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 15 + }, + "name": "gDungeonMaps_DeepwoodShrine_StairsToB1" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_3_0.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/03_PotBridge/gAreaRoomMap_DeepwoodShrine_PotBridge_bottom.bin.lz", "start": 5129088, - "size": 406, - "type": "map_layer2" + "size": 408, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_3_1.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/03_PotBridge/gAreaRoomMap_DeepwoodShrine_PotBridge_top.bin.lz", "start": 5129496, - "size": 178, - "type": "map_layer1" + "size": 180, + "type": "tileMap" }, { - "path": "assets/unknown_32.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/03_PotBridge/dungeon_map.bin", "start": 5129676, "size": 76, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 15 + }, + "name": "gDungeonMaps_DeepwoodShrine_PotBridge" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_4_0.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/04_DoubleStatue/gAreaRoomMap_DeepwoodShrine_DoubleStatue_bottom.bin.lz", "start": 5129752, "size": 292, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_4_1.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/04_DoubleStatue/gAreaRoomMap_DeepwoodShrine_DoubleStatue_top.bin.lz", "start": 5130044, - "size": 162, - "type": "map_layer1" + "size": 164, + "type": "tileMap" }, { - "path": "assets/unknown_33.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/04_DoubleStatue/dungeon_map.bin", "start": 5130208, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 10 + }, + "name": "gDungeonMaps_DeepwoodShrine_DoubleStatue" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_5_0.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/05_Map/gAreaRoomMap_DeepwoodShrine_Map_bottom.bin.lz", "start": 5130260, - "size": 621, - "type": "map_layer2" + "size": 624, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_5_1.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/05_Map/gAreaRoomMap_DeepwoodShrine_Map_top.bin.lz", "start": 5130884, - "size": 213, - "type": "map_layer1" + "size": 216, + "type": "tileMap" }, { - "path": "assets/unknown_34.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/05_Map/dungeon_map.bin", "start": 5131100, "size": 128, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 25 + }, + "name": "gDungeonMaps_DeepwoodShrine_Map" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_6_0.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/06_Barrel/gAreaRoomMap_DeepwoodShrine_Barrel_bottom.bin.lz", "start": 5131228, "size": 888, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_6_1.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/06_Barrel/gAreaRoomMap_DeepwoodShrine_Barrel_top.bin.lz", "start": 5132116, - "size": 259, - "type": "map_layer1" + "size": 260, + "type": "tileMap" }, { - "path": "assets/unknown_35.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/06_Barrel/dungeon_map.bin", "start": 5132376, "size": 200, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 25 + }, + "name": "gDungeonMaps_DeepwoodShrine_Barrel" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_7_0.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/07_Button/gAreaRoomMap_DeepwoodShrine_Button_bottom.bin.lz", "start": 5132576, - "size": 589, - "type": "map_layer2" + "size": 592, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_7_1.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/07_Button/gAreaRoomMap_DeepwoodShrine_Button_top.bin.lz", "start": 5133168, "size": 180, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_36.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/07_Button/dungeon_map.bin", "start": 5133348, "size": 128, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 25 + }, + "name": "gDungeonMaps_DeepwoodShrine_Button" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_8_0.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/08_Mulldozer/gAreaRoomMap_DeepwoodShrine_Mulldozer_bottom.bin.lz", "start": 5133476, "size": 308, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_8_1.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/08_Mulldozer/gAreaRoomMap_DeepwoodShrine_Mulldozer_top.bin.lz", "start": 5133784, "size": 188, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_37.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/08_Mulldozer/dungeon_map.bin", "start": 5133972, "size": 60, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 12 + }, + "name": "gDungeonMaps_DeepwoodShrine_Mulldozer" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_9_0.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/09_Pillars/gAreaRoomMap_DeepwoodShrine_Pillars_bottom.bin.lz", "start": 5134032, - "size": 346, - "type": "map_layer2" + "size": 348, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_9_1.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/09_Pillars/gAreaRoomMap_DeepwoodShrine_Pillars_top.bin.lz", "start": 5134380, - "size": 163, - "type": "map_layer1" + "size": 164, + "type": "tileMap" }, { - "path": "assets/unknown_38.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/09_Pillars/dungeon_map.bin", "start": 5134544, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DeepwoodShrine_Pillars" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_10_0.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/10_Lever/gAreaRoomMap_DeepwoodShrine_Lever_bottom.bin.lz", "start": 5134612, - "size": 471, - "type": "map_layer2" + "size": 472, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_10_1.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/10_Lever/gAreaRoomMap_DeepwoodShrine_Lever_top.bin.lz", "start": 5135084, - "size": 226, - "type": "map_layer1" + "size": 228, + "type": "tileMap" }, { - "path": "assets/unknown_39.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/10_Lever/dungeon_map.bin", "start": 5135312, "size": 104, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 17 + }, + "name": "gDungeonMaps_DeepwoodShrine_Lever" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_11_0.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/11_Entrance/gAreaRoomMap_DeepwoodShrine_Entrance_bottom.bin.lz", "start": 5135416, - "size": 469, - "type": "map_layer2" + "size": 472, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_11_1.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/11_Entrance/gAreaRoomMap_DeepwoodShrine_Entrance_top.bin.lz", "start": 5135888, - "size": 335, - "type": "map_layer1" + "size": 336, + "type": "tileMap" }, { - "path": "assets/unknown_40.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/11_Entrance/dungeon_map.bin", "start": 5136224, "size": 104, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 17 + }, + "name": "gDungeonMaps_DeepwoodShrine_Entrance" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_12_0.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/16_Torches/gAreaRoomMap_DeepwoodShrine_Torches_bottom.bin.lz", "start": 5136328, - "size": 425, - "type": "map_layer2" + "size": 428, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_12_1.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/16_Torches/gAreaRoomMap_DeepwoodShrine_Torches_top.bin.lz", "start": 5136756, "size": 264, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_41.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/16_Torches/dungeon_map.bin", "start": 5137020, "size": 104, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 17 + }, + "name": "gDungeonMaps_DeepwoodShrine_Torches" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_13_0.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/17_BossKey/gAreaRoomMap_DeepwoodShrine_BossKey_bottom.bin.lz", "start": 5137124, "size": 564, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_13_1.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/17_BossKey/gAreaRoomMap_DeepwoodShrine_BossKey_top.bin.lz", "start": 5137688, - "size": 109, - "type": "map_layer1" + "size": 112, + "type": "tileMap" }, { - "path": "assets/unknown_42.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/17_BossKey/dungeon_map.bin", "start": 5137800, "size": 108, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 7, + "height": 15 + }, + "name": "gDungeonMaps_DeepwoodShrine_BossKey" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_14_0.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/18_Compass/gAreaRoomMap_DeepwoodShrine_Compass_bottom.bin.lz", "start": 5137908, "size": 504, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_14_1.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/18_Compass/gAreaRoomMap_DeepwoodShrine_Compass_top.bin.lz", "start": 5138412, - "size": 117, - "type": "map_layer1" + "size": 120, + "type": "tileMap" }, { - "path": "assets/unknown_43.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/18_Compass/dungeon_map.bin", "start": 5138532, "size": 92, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 15 + }, + "name": "gDungeonMaps_DeepwoodShrine_Compass" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_15_0.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/19_13/gAreaRoomMap_DeepwoodShrine_13_bottom.bin.lz", "start": 5138624, - "size": 309, - "type": "map_layer2" + "size": 312, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_15_1.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/19_13/gAreaRoomMap_DeepwoodShrine_13_top.bin.lz", "start": 5138936, - "size": 97, - "type": "map_layer1" + "size": 100, + "type": "tileMap" }, { - "path": "assets/unknown_44.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/19_13/dungeon_map.bin", "start": 5139036, "size": 60, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 12 + }, + "name": "gDungeonMaps_072_DeepwoodShrine_13_unused" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_16_0.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/20_LilyPadWest/gAreaRoomMap_DeepwoodShrine_LilyPadWest_bottom.bin.lz", "start": 5139096, - "size": 687, - "type": "map_layer2" + "size": 688, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_16_1.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/20_LilyPadWest/gAreaRoomMap_DeepwoodShrine_LilyPadWest_top.bin.lz", "start": 5139784, "size": 356, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_45.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/20_LilyPadWest/dungeon_map.bin", "start": 5140140, "size": 200, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 25 + }, + "name": "gDungeonMaps_DeepwoodShrine_LilyPadWest" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_17_0.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/21_LilyPadEast/gAreaRoomMap_DeepwoodShrine_LilyPadEast_bottom.bin.lz", "start": 5140340, - "size": 322, - "type": "map_layer2" + "size": 324, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_17_1.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/21_LilyPadEast/gAreaRoomMap_DeepwoodShrine_LilyPadEast_top.bin.lz", "start": 5140664, - "size": 187, - "type": "map_layer1" + "size": 188, + "type": "tileMap" }, { - "path": "assets/unknown_46.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/21_LilyPadEast/dungeon_map.bin", "start": 5140852, "size": 92, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 18 + }, + "name": "gDungeonMaps_DeepwoodShrine_LilyPadEast" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrineBoss_0_0.bin", + "path": "maps/areas/073_DeepwoodShrineBoss/rooms/00_Main/gAreaRoomMap_DeepwoodShrineBoss_Main_bottom.bin.lz", "start": 5140944, "size": 472, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrineBoss_0_1.bin", + "path": "maps/areas/073_DeepwoodShrineBoss/rooms/00_Main/gAreaRoomMap_DeepwoodShrineBoss_Main_top.bin.lz", "start": 5141416, - "size": 90, - "type": "map_layer1" + "size": 92, + "type": "tileMap" }, { - "path": "assets/unknown_47.bin", + "path": "maps/areas/073_DeepwoodShrineBoss/rooms/00_Main/dungeon_map.bin", "start": 5141508, "size": 76, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 15 + }, + "name": "gDungeonMaps_DeepwoodShrineBoss_Main" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_18_0.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/23_BossDoor/gAreaRoomMap_DeepwoodShrine_BossDoor_bottom.bin.lz", "start": 5141584, - "size": 466, - "type": "map_layer2" + "size": 468, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_18_1.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/23_BossDoor/gAreaRoomMap_DeepwoodShrine_BossDoor_top.bin.lz", "start": 5142052, - "size": 330, - "type": "map_layer1" + "size": 332, + "type": "tileMap" }, { - "path": "assets/unknown_48.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/23_BossDoor/dungeon_map.bin", "start": 5142384, "size": 104, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 17 + }, + "name": "gDungeonMaps_DeepwoodShrine_BossDoor" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_19_0.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/32_InsideBarrel/gAreaRoomMap_DeepwoodShrine_InsideBarrel_bottom.bin.lz", "start": 5142488, - "size": 54, - "type": "map_layer2" + "size": 56, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrine_19_1.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/32_InsideBarrel/gAreaRoomMap_DeepwoodShrine_InsideBarrel_top.bin.lz", "start": 5142544, - "size": 43, - "type": "map_layer1" + "size": 44, + "type": "tileMap" }, { - "path": "assets/unknown_49.bin", + "path": "maps/areas/072_DeepwoodShrine/rooms/32_InsideBarrel/dungeon_map.bin", "start": 5142588, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_DeepwoodShrine_InsideBarrel_unused" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrineEntry_0_0.bin", + "path": "maps/areas/074_DeepwoodShrineEntry/rooms/00_Main/gAreaRoomMap_DeepwoodShrineEntry_Main_bottom.bin", "start": 5142628, - "size": 450, - "type": "map_layer2" + "size": 452, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DeepwoodShrineEntry_0_1.bin", + "path": "maps/areas/074_DeepwoodShrineEntry/rooms/00_Main/gAreaRoomMap_DeepwoodShrineEntry_Main_top.bin.lz", "start": 5143080, "size": 256, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_CaveOfFlames_0_0.4bpp.lz", + "path": "maps/areas/080_CaveOfFlames/tileSets/0/gAreaTileSet_CaveOfFlames_0_0.4bpp.lz", "start": 5143336, - "size": 9905, - "type": "tileset" + "size": 9908, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_CaveOfFlames_0_1.4bpp.lz", + "path": "maps/areas/080_CaveOfFlames/tileSets/0/gAreaTileSet_CaveOfFlames_0_1.4bpp.lz", "start": 5153244, - "size": 8807, - "type": "tileset" + "size": 8808, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_CaveOfFlames_0_2.4bpp.lz", + "path": "maps/areas/080_CaveOfFlames/tileSets/0/gAreaTileSet_CaveOfFlames_0_2.4bpp.lz", "start": 5162052, - "size": 10087, - "type": "tileset" + "size": 10088, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_CaveOfFlames_0.bin", + "path": "maps/areas/080_CaveOfFlames/tileSet/gAreaTileSet_CaveOfFlames_bottom.bin.lz", "start": 5172140, - "size": 7209, - "type": "metatiles_tileset2" + "size": 7212, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_CaveOfFlames_1.bin", + "path": "maps/areas/080_CaveOfFlames/tileSet/gAreaTileSet_CaveOfFlames_top.bin.lz", "start": 5179352, "size": 6656, - "type": "metatiles_tileset1" + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_CaveOfFlames_2.bin", + "path": "maps/areas/080_CaveOfFlames/tileSet/gAreaTileSetTypes_CaveOfFlames_bottom.bin.lz", "start": 5186008, - "size": 1169, - "type": "metatiles_tile_types2" + "size": 1172, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_CaveOfFlames_3.bin", + "path": "maps/areas/080_CaveOfFlames/tileSet/gAreaTileSetTypes_CaveOfFlames_top.bin.lz", "start": 5187180, - "size": 1179, - "type": "metatiles_tile_types1" + "size": 1180, + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_CaveOfFlamesBoss_0_0.4bpp.lz", + "path": "maps/areas/081_CaveOfFlamesBoss/tileSets/0/gAreaTileSet_CaveOfFlamesBoss_0_0.4bpp.lz", "start": 5188360, - "size": 6937, - "type": "tileset" + "size": 6940, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_CaveOfFlamesBoss_0_1.4bpp.lz", + "path": "maps/areas/081_CaveOfFlamesBoss/tileSets/0/gAreaTileSet_CaveOfFlamesBoss_0_1.4bpp.lz", "start": 5195300, - "size": 9046, - "type": "tileset" + "size": 9048, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_CaveOfFlamesBoss_0_2.4bpp.lz", + "path": "maps/areas/081_CaveOfFlamesBoss/tileSets/0/gAreaTileSet_CaveOfFlamesBoss_0_2.4bpp.lz", "start": 5204348, - "size": 6385, - "type": "tileset" + "size": 6388, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_CaveOfFlamesBoss_0.bin", + "path": "maps/areas/081_CaveOfFlamesBoss/tileSet/gAreaTileSet_CaveOfFlamesBoss_bottom.bin.lz", "start": 5210736, - "size": 4999, - "type": "metatiles_tileset2" + "size": 5000, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_CaveOfFlamesBoss_1.bin", + "path": "maps/areas/081_CaveOfFlamesBoss/tileSet/gAreaTileSet_CaveOfFlamesBoss_top.bin.lz", "start": 5215736, - "size": 4442, - "type": "metatiles_tileset1" + "size": 4444, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_CaveOfFlamesBoss_2.bin", + "path": "maps/areas/081_CaveOfFlamesBoss/tileSet/gAreaTileSetTypes_CaveOfFlamesBoss_bottom.bin.lz", "start": 5220180, - "size": 651, - "type": "metatiles_tile_types2" + "size": 652, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_CaveOfFlamesBoss_3.bin", + "path": "maps/areas/081_CaveOfFlamesBoss/tileSet/gAreaTileSetTypes_CaveOfFlamesBoss_top.bin.lz", "start": 5220832, - "size": 617, - "type": "metatiles_tile_types1" + "size": 620, + "type": "tileSet_types" }, { - "path": "assets/gAreaTileset_CaveOfFlames_0_3.bin", + "path": "maps/areas/080_CaveOfFlames/tileSets/0/gAreaTileSet_CaveOfFlames_0_3.4bpp.lz", "start": 5221452, - "size": 749, - "type": "tileset_mapping3" + "size": 752, + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_0_0.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/00_AfterCane/gAreaRoomMap_CaveOfFlames_AfterCane_bottom.bin.lz", "start": 5222204, - "size": 370, - "type": "map_layer2" + "size": 372, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_0_1.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/00_AfterCane/gAreaRoomMap_CaveOfFlames_AfterCane_top.bin.lz", "start": 5222576, "size": 372, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_50.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/00_AfterCane/dungeon_map.bin", "start": 5222948, "size": 104, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 17 + }, + "name": "gDungeonMaps_CaveOfFlames_AfterCane" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_1_0.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/01_SpinyChu/gAreaRoomMap_CaveOfFlames_SpinyChu_bottom.bin.lz", "start": 5223052, "size": 352, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_1_1.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/01_SpinyChu/gAreaRoomMap_CaveOfFlames_SpinyChu_top.bin.lz", "start": 5223404, - "size": 366, - "type": "map_layer1" + "size": 368, + "type": "tileMap" }, { - "path": "assets/unknown_51.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/01_SpinyChu/dungeon_map.bin", "start": 5223772, "size": 104, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 17 + }, + "name": "gDungeonMaps_CaveOfFlames_SpinyChu" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_2_0.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/02_CartToSpinyChu/gAreaRoomMap_CaveOfFlames_CartToSpinyChu_bottom.bin.lz", "start": 5223876, - "size": 287, - "type": "map_layer2" + "size": 288, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_2_1.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/02_CartToSpinyChu/gAreaRoomMap_CaveOfFlames_CartToSpinyChu_top.bin.lz", "start": 5224164, "size": 628, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_52.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/02_CartToSpinyChu/dungeon_map.bin", "start": 5224792, "size": 156, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 12, + "height": 13 + }, + "name": "gDungeonMaps_CaveOfFlames_CartToSpinyChu" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_3_0.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/03_Entrance/gAreaRoomMap_CaveOfFlames_Entrance_bottom.bin.lz", "start": 5224948, "size": 60, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_3_1.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/03_Entrance/gAreaRoomMap_CaveOfFlames_Entrance_top.bin.lz", "start": 5225008, - "size": 323, - "type": "map_layer1" + "size": 324, + "type": "tileMap" }, { - "path": "assets/unknown_53.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/03_Entrance/dungeon_map.bin", "start": 5225332, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_CaveOfFlames_Entrance" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_4_0.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/04_MainCart/gAreaRoomMap_CaveOfFlames_MainCart_bottom.bin.lz", "start": 5225400, - "size": 487, - "type": "map_layer2" + "size": 488, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_4_1.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/04_MainCart/gAreaRoomMap_CaveOfFlames_MainCart_top.bin.lz", "start": 5225888, - "size": 827, - "type": "map_layer1" + "size": 828, + "type": "tileMap" }, { - "path": "assets/unknown_54.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/04_MainCart/dungeon_map.bin", "start": 5226716, "size": 240, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 14, + "height": 17 + }, + "name": "gDungeonMaps_CaveOfFlames_MainCart" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_5_0.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/05_NorthEntrance/gAreaRoomMap_CaveOfFlames_NorthEntrance_bottom.bin.lz", "start": 5226956, "size": 60, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_5_1.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/05_NorthEntrance/gAreaRoomMap_CaveOfFlames_NorthEntrance_top.bin.lz", "start": 5227016, - "size": 355, - "type": "map_layer1" + "size": 356, + "type": "tileMap" }, { - "path": "assets/unknown_55.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/05_NorthEntrance/dungeon_map.bin", "start": 5227372, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_CaveOfFlames_NorthEntrance" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_6_0.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/06_CartWest/gAreaRoomMap_CaveOfFlames_CartWest_bottom.bin.lz", "start": 5227440, - "size": 183, - "type": "map_layer2" + "size": 184, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_6_1.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/06_CartWest/gAreaRoomMap_CaveOfFlames_CartWest_top.bin.lz", "start": 5227624, - "size": 693, - "type": "map_layer1" + "size": 696, + "type": "tileMap" }, { - "path": "assets/unknown_56.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/06_CartWest/dungeon_map.bin", "start": 5228320, "size": 188, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 11, + "height": 17 + }, + "name": "gDungeonMaps_CaveOfFlames_CartWest" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_7_0.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/07_HelmasaurFight/gAreaRoomMap_CaveOfFlames_HelmasaurFight_bottom.bin.lz", "start": 5228508, "size": 68, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_7_1.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/07_HelmasaurFight/gAreaRoomMap_CaveOfFlames_HelmasaurFight_top.bin.lz", "start": 5228576, - "size": 383, - "type": "map_layer1" + "size": 384, + "type": "tileMap" }, { - "path": "assets/unknown_57.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/07_HelmasaurFight/dungeon_map.bin", "start": 5228960, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 17 + }, + "name": "gDungeonMaps_CaveOfFlames_HelmasaurFight" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_8_0.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/08_RollobiteLavaRoom/gAreaRoomMap_CaveOfFlames_RollobiteLavaRoom_bottom.bin.lz", "start": 5229028, "size": 600, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_8_1.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/08_RollobiteLavaRoom/gAreaRoomMap_CaveOfFlames_RollobiteLavaRoom_top.bin.lz", "start": 5229628, - "size": 543, - "type": "map_layer1" + "size": 544, + "type": "tileMap" }, { - "path": "assets/unknown_58.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/08_RollobiteLavaRoom/dungeon_map.bin", "start": 5230172, "size": 168, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 28 + }, + "name": "gDungeonMaps_CaveOfFlames_RollobiteLavaRoom" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_9_0.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/09_MinishLavaRoom/gAreaRoomMap_CaveOfFlames_MinishLavaRoom_bottom.bin.lz", "start": 5230340, - "size": 634, - "type": "map_layer2" + "size": 636, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_9_1.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/09_MinishLavaRoom/gAreaRoomMap_CaveOfFlames_MinishLavaRoom_top.bin.lz", "start": 5230976, - "size": 505, - "type": "map_layer1" + "size": 508, + "type": "tileMap" }, { - "path": "assets/unknown_59.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/09_MinishLavaRoom/dungeon_map.bin", "start": 5231484, "size": 168, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 28 + }, + "name": "gDungeonMaps_CaveOfFlames_MinishLavaRoom" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_10_0.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/16_MinishSpikes/gAreaRoomMap_CaveOfFlames_MinishSpikes_bottom.bin.lz", "start": 5231652, "size": 876, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_10_1.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/16_MinishSpikes/gAreaRoomMap_CaveOfFlames_MinishSpikes_top.bin.lz", "start": 5232528, - "size": 665, - "type": "map_layer1" + "size": 668, + "type": "tileMap" }, { - "path": "assets/unknown_60.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/16_MinishSpikes/dungeon_map.bin", "start": 5233196, "size": 332, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 11, + "height": 30 + }, + "name": "gDungeonMaps_CaveOfFlames_MinishSpikes" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_11_0.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/17_TompasDoom/gAreaRoomMap_CaveOfFlames_TompasDoom_bottom.bin.lz", "start": 5233528, "size": 464, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_11_1.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/17_TompasDoom/gAreaRoomMap_CaveOfFlames_TompasDoom_top.bin.lz", "start": 5233992, "size": 256, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_61.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/17_TompasDoom/dungeon_map.bin", "start": 5234248, "size": 168, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 11, + "height": 15 + }, + "name": "gDungeonMaps_CaveOfFlames_TompasDoom" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_12_0.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/18_BeforeGleerok/gAreaRoomMap_CaveOfFlames_BeforeGleerok_bottom.bin.lz", "start": 5234416, "size": 352, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_12_1.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/18_BeforeGleerok/gAreaRoomMap_CaveOfFlames_BeforeGleerok_top.bin.lz", "start": 5234768, "size": 192, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_62.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/18_BeforeGleerok/dungeon_map.bin", "start": 5234960, "size": 92, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 15 + }, + "name": "gDungeonMaps_CaveOfFlames_BeforeGleerok" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_13_0.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/19_BosskeyPath1/gAreaRoomMap_CaveOfFlames_BosskeyPath1_bottom.bin.lz", "start": 5235052, - "size": 343, - "type": "map_layer2" + "size": 344, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_13_1.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/19_BosskeyPath1/gAreaRoomMap_CaveOfFlames_BosskeyPath1_top.bin.lz", "start": 5235396, - "size": 239, - "type": "map_layer1" + "size": 240, + "type": "tileMap" }, { - "path": "assets/unknown_63.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/19_BosskeyPath1/dungeon_map.bin", "start": 5235636, "size": 92, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 15 + }, + "name": "gDungeonMaps_CaveOfFlames_BosskeyPath1" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_14_0.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/20_BosskeyPath2/gAreaRoomMap_CaveOfFlames_BosskeyPath2_bottom.bin.lz", "start": 5235728, "size": 252, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_14_1.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/20_BosskeyPath2/gAreaRoomMap_CaveOfFlames_BosskeyPath2_top.bin.lz", "start": 5235980, "size": 292, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_64.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/20_BosskeyPath2/dungeon_map.bin", "start": 5236272, "size": 92, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 15 + }, + "name": "gDungeonMaps_CaveOfFlames_BosskeyPath2" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_15_0.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/21_Compass/gAreaRoomMap_CaveOfFlames_Compass_bottom.bin.lz", "start": 5236364, - "size": 53, - "type": "map_layer2" + "size": 56, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_15_1.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/21_Compass/gAreaRoomMap_CaveOfFlames_Compass_top.bin.lz", "start": 5236420, - "size": 305, - "type": "map_layer1" + "size": 308, + "type": "tileMap" }, { - "path": "assets/unknown_65.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/21_Compass/dungeon_map.bin", "start": 5236728, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_CaveOfFlames_Compass" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_16_0.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/22_BobOmbWall/gAreaRoomMap_CaveOfFlames_BobOmbWall_bottom.bin.lz", "start": 5236780, - "size": 53, - "type": "map_layer2" + "size": 56, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_16_1.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/22_BobOmbWall/gAreaRoomMap_CaveOfFlames_BobOmbWall_top.bin.lz", "start": 5236836, "size": 276, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_66.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/22_BobOmbWall/dungeon_map.bin", "start": 5237112, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_CaveOfFlames_BobOmbWall" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_17_0.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/23_BossDoor/gAreaRoomMap_CaveOfFlames_BossDoor_bottom.bin.lz", "start": 5237164, - "size": 1258, - "type": "map_layer2" + "size": 1260, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CaveOfFlames_17_1.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/23_BossDoor/gAreaRoomMap_CaveOfFlames_BossDoor_top.bin.lz", "start": 5238424, - "size": 487, - "type": "map_layer1" + "size": 488, + "type": "tileMap" }, { - "path": "assets/unknown_67.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/23_BossDoor/dungeon_map.bin", "start": 5238912, "size": 332, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 11, + "height": 30 + }, + "name": "gDungeonMaps_CaveOfFlames_BossDoor" }, { - "path": "assets/gAreaRoomMap_CaveOfFlamesBoss_0_0.bin", + "path": "maps/areas/081_CaveOfFlamesBoss/rooms/00_0/gAreaRoomMap_CaveOfFlamesBoss_0_bottom.bin.lz", "start": 5239244, "size": 680, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_CaveOfFlamesBoss_0_1.bin", + "path": "maps/areas/081_CaveOfFlamesBoss/rooms/00_0/gAreaRoomMap_CaveOfFlamesBoss_0_top.bin.lz", "start": 5239924, "size": 680, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_68.bin", + "path": "maps/areas/081_CaveOfFlamesBoss/rooms/00_00_0/dungeon_map.bin", "start": 5240604, "size": 108, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 18 + }, + "name": "gDungeonMaps_CaveOfFlamesBoss_0" }, { - "path": "tilesets/gAreaTileset_CastorDarknut_0_0.4bpp.lz", + "path": "maps/areas/043_CastorDarknut/tileSets/0/gAreaTileSet_CastorDarknut_0_0.4bpp.lz", "start": 5240712, - "size": 9770, - "type": "tileset" + "size": 9772, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_CastorDarknut_0_1.4bpp.lz", + "path": "maps/areas/043_CastorDarknut/tileSets/0/gAreaTileSet_CastorDarknut_0_1.4bpp.lz", "start": 5250484, - "size": 8674, - "type": "tileset" + "size": 8676, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_CastorDarknut_0_2.4bpp.lz", + "path": "maps/areas/043_CastorDarknut/tileSets/0/gAreaTileSet_CastorDarknut_0_2.4bpp.lz", "start": 5259160, "size": 8584, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_FortressOfWinds_0.bin", + "path": "maps/areas/043_CastorDarknut/tileSet/gAreaTileSet_CastorDarknut_bottom.bin.lz", "start": 5267744, - "size": 8241, - "type": "metatiles_tileset2" + "size": 8244, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_FortressOfWinds_1.bin", + "path": "maps/areas/043_CastorDarknut/tileSet/gAreaTileSet_CastorDarknut_top.bin.lz", "start": 5275988, - "size": 6169, - "type": "metatiles_tileset1" + "size": 6172, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_FortressOfWinds_2.bin", + "path": "maps/areas/043_CastorDarknut/tileSet/gAreaTileSetTypes_CastorDarknut_bottom.bin.lz", "start": 5282160, - "size": 1102, - "type": "metatiles_tile_types2" + "size": 1104, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_FortressOfWinds_3.bin", + "path": "maps/areas/043_CastorDarknut/tileSet/gAreaTileSetTypes_CastorDarknut_top.bin.lz", "start": 5283264, - "size": 1131, - "type": "metatiles_tile_types1" + "size": 1132, + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_InnerMazaal_0_0.4bpp.lz", + "path": "maps/areas/090_InnerMazaal/tileSets/0/gAreaTileSet_InnerMazaal_0_0.4bpp.lz", "start": 5284396, - "size": 7481, - "type": "tileset" + "size": 7484, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_InnerMazaal_0_1.4bpp.lz", + "path": "maps/areas/090_InnerMazaal/tileSets/0/gAreaTileSet_InnerMazaal_0_1.4bpp.lz", "start": 5291880, - "size": 5449, - "type": "tileset" + "size": 5452, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_InnerMazaal_0_2.4bpp.lz", + "path": "maps/areas/090_InnerMazaal/tileSets/0/gAreaTileSet_InnerMazaal_0_2.4bpp.lz", "start": 5297332, - "size": 5222, - "type": "tileset" + "size": 5224, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_InnerMazaal_0.bin", + "path": "maps/areas/090_InnerMazaal/tileSet/gAreaTileSet_InnerMazaal_bottom.bin.lz", "start": 5302556, - "size": 3493, - "type": "metatiles_tileset2" + "size": 3496, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_InnerMazaal_1.bin", + "path": "maps/areas/090_InnerMazaal/tileSet/gAreaTileSet_InnerMazaal_top.bin.lz", "start": 5306052, - "size": 3787, - "type": "metatiles_tileset1" + "size": 3788, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_InnerMazaal_2.bin", + "path": "maps/areas/090_InnerMazaal/tileSet/gAreaTileSetTypes_InnerMazaal_bottom.bin.lz", "start": 5309840, - "size": 689, - "type": "metatiles_tile_types2" + "size": 692, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_InnerMazaal_3.bin", + "path": "maps/areas/090_InnerMazaal/tileSet/gAreaTileSetTypes_InnerMazaal_top.bin.lz", "start": 5310532, - "size": 795, - "type": "metatiles_tile_types1" + "size": 796, + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_FortressOfWindsTop_0_0.4bpp.lz", + "path": "maps/areas/089_FortressOfWindsTop/tileSets/0/gAreaTileSet_FortressOfWindsTop_0_0.4bpp.lz", "start": 5311328, - "size": 4962, - "type": "tileset" + "size": 4964, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_FortressOfWindsTop_0_1.4bpp.lz", + "path": "maps/areas/089_FortressOfWindsTop/tileSets/0/gAreaTileSet_FortressOfWindsTop_0_1.4bpp.lz", "start": 5316292, - "size": 6827, - "type": "tileset" + "size": 6828, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_FortressOfWindsTop_0_2.4bpp.lz", + "path": "maps/areas/089_FortressOfWindsTop/tileSets/0/gAreaTileSet_FortressOfWindsTop_0_2.4bpp.lz", "start": 5323120, - "size": 6229, - "type": "tileset" + "size": 6232, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_FortressOfWindsTop_0.bin", + "path": "maps/areas/089_FortressOfWindsTop/tileSet/gAreaTileSet_FortressOfWindsTop_bottom.bin.lz", "start": 5329352, - "size": 2759, - "type": "metatiles_tileset2" + "size": 2760, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_FortressOfWindsTop_1.bin", + "path": "maps/areas/089_FortressOfWindsTop/tileSet/gAreaTileSet_FortressOfWindsTop_top.bin.lz", "start": 5332112, - "size": 1425, - "type": "metatiles_tileset1" + "size": 1428, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_FortressOfWindsTop_2.bin", + "path": "maps/areas/089_FortressOfWindsTop/tileSet/gAreaTileSetTypes_FortressOfWindsTop_bottom.bin.lz", "start": 5333540, "size": 404, - "type": "metatiles_tile_types2" + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_FortressOfWindsTop_3.bin", + "path": "maps/areas/089_FortressOfWindsTop/tileSet/gAreaTileSetTypes_FortressOfWindsTop_top.bin.lz", "start": 5333944, - "size": 273, - "type": "metatiles_tile_types1" + "size": 276, + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_0_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/00_DoubleEyegore/gAreaRoomMap_FortressOfWinds_DoubleEyegore_bottom.bin.lz", "start": 5334220, - "size": 307, - "type": "map_layer2" + "size": 308, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_0_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/00_DoubleEyegore/gAreaRoomMap_FortressOfWinds_DoubleEyegore_top.bin.lz", "start": 5334528, - "size": 107, - "type": "map_layer1" + "size": 108, + "type": "tileMap" }, { - "path": "assets/unknown_69.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/00_DoubleEyegore/dungeon_map.bin", "start": 5334636, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_DoubleEyegore" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_1_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/01_BeforeMazaal/gAreaRoomMap_FortressOfWinds_BeforeMazaal_bottom.bin.lz", "start": 5334704, - "size": 289, - "type": "map_layer2" + "size": 292, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_1_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/01_BeforeMazaal/gAreaRoomMap_FortressOfWinds_BeforeMazaal_top.bin.lz", "start": 5334996, - "size": 151, - "type": "map_layer1" + "size": 152, + "type": "tileMap" }, { - "path": "assets/unknown_70.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/01_BeforeMazaal/dungeon_map.bin", "start": 5335148, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_BeforeMazaal" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_2_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/02_EastKeyLever/gAreaRoomMap_FortressOfWinds_EastKeyLever_bottom.bin.lz", "start": 5335216, - "size": 877, - "type": "map_layer2" + "size": 880, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_2_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/02_EastKeyLever/gAreaRoomMap_FortressOfWinds_EastKeyLever_top.bin.lz", "start": 5336096, "size": 404, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_71.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/02_EastKeyLever/dungeon_map.bin", "start": 5336500, "size": 272, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 10, + "height": 27 + }, + "name": "gDungeonMaps_FortressOfWinds_EastKeyLever" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_3_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/03_PitPlatforms/gAreaRoomMap_FortressOfWinds_PitPlatforms_bottom.bin.lz", "start": 5336772, - "size": 345, - "type": "map_layer2" + "size": 348, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_3_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/03_PitPlatforms/gAreaRoomMap_FortressOfWinds_PitPlatforms_top.bin.lz", "start": 5337120, - "size": 121, - "type": "map_layer1" + "size": 124, + "type": "tileMap" }, { - "path": "assets/unknown_72.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/03_PitPlatforms/dungeon_map.bin", "start": 5337244, "size": 72, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 14 + }, + "name": "gDungeonMaps_FortressOfWinds_PitPlatforms" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_4_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/04_WestKeyLever/gAreaRoomMap_FortressOfWinds_WestKeyLever_bottom.bin.lz", "start": 5337316, "size": 564, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_4_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/04_WestKeyLever/gAreaRoomMap_FortressOfWinds_WestKeyLever_top.bin.lz", "start": 5337880, - "size": 230, - "type": "map_layer1" + "size": 232, + "type": "tileMap" }, { - "path": "assets/unknown_73.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/04_WestKeyLever/dungeon_map.bin", "start": 5338112, - "size": 248, - "type": "unknown" + "size": 112, + "type": "dungeon_map", + "options": { + "width": 8, + "height": 14 + }, + "name": "gDungeonMaps_FortressOfWinds_WestKeyLever" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_5_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/05_5/dungeon_map.bin", + "start": 5338224, + "size": 68, + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_5" + }, + { + "path": "maps/areas/088_FortressOfWinds/rooms/06_6/dungeon_map.bin", + "start": 5338292, + "size": 68, + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_6" + }, + { + "path": "maps/areas/088_FortressOfWinds/rooms/16_DarknutRoom/gAreaRoomMap_FortressOfWinds_DarknutRoom_bottom.bin.lz", "start": 5338360, "size": 60, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_5_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/16_DarknutRoom/gAreaRoomMap_FortressOfWinds_DarknutRoom_top.bin.lz", "start": 5338420, - "size": 383, - "type": "map_layer1" + "size": 384, + "type": "tileMap" }, { - "path": "assets/unknown_74.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/16_DarknutRoom/dungeon_map.bin", "start": 5338804, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_DarknutRoom" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_6_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/17_ArrowEyeBridge/gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_bottom.bin.lz", "start": 5338872, - "size": 134, - "type": "map_layer2" + "size": 136, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_6_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/17_ArrowEyeBridge/gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_top.bin.lz", "start": 5339008, - "size": 298, - "type": "map_layer1" + "size": 300, + "type": "tileMap" }, { - "path": "assets/unknown_75.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/17_ArrowEyeBridge/dungeon_map.bin", "start": 5339308, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_ArrowEyeBridge" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_7_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/18_NorthSplitPathPit/gAreaRoomMap_FortressOfWinds_NorthSplitPathPit_bottom.bin.lz", "start": 5339376, "size": 432, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_7_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/18_NorthSplitPathPit/gAreaRoomMap_FortressOfWinds_NorthSplitPathPit_top.bin.lz", "start": 5339808, - "size": 305, - "type": "map_layer1" + "size": 308, + "type": "tileMap" }, { - "path": "assets/unknown_76.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/18_NorthSplitPathPit/dungeon_map.bin", "start": 5340116, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 26 + }, + "name": "gDungeonMaps_FortressOfWinds_NorthSplitPathPit" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_8_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/19_WallmasterMinishPortal/gAreaRoomMap_FortressOfWinds_WallmasterMinishPortal_bottom.bin.lz", "start": 5340248, "size": 60, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_8_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/19_WallmasterMinishPortal/gAreaRoomMap_FortressOfWinds_WallmasterMinishPortal_top.bin.lz", "start": 5340308, - "size": 298, - "type": "map_layer1" + "size": 300, + "type": "tileMap" }, { - "path": "assets/unknown_77.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/19_WallmasterMinishPortal/dungeon_map.bin", "start": 5340608, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_WallmasterMinishPortal" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_9_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/20_PillarCloneButtons/gAreaRoomMap_FortressOfWinds_PillarCloneButtons_bottom.bin.lz", "start": 5340676, - "size": 111, - "type": "map_layer2" + "size": 112, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_9_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/20_PillarCloneButtons/gAreaRoomMap_FortressOfWinds_PillarCloneButtons_top.bin.lz", "start": 5340788, - "size": 553, - "type": "map_layer1" + "size": 556, + "type": "tileMap" }, { - "path": "assets/unknown_78.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/20_PillarCloneButtons/dungeon_map.bin", "start": 5341344, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 26 + }, + "name": "gDungeonMaps_FortressOfWinds_PillarCloneButtons" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_10_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/21_RotatingSpikeTraps/gAreaRoomMap_FortressOfWinds_RotatingSpikeTraps_bottom.bin.lz", "start": 5341476, "size": 60, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_10_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/21_RotatingSpikeTraps/gAreaRoomMap_FortressOfWinds_RotatingSpikeTraps_top.bin.lz", "start": 5341536, - "size": 362, - "type": "map_layer1" + "size": 364, + "type": "tileMap" }, { - "path": "assets/unknown_79.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/21_RotatingSpikeTraps/dungeon_map.bin", "start": 5341900, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_RotatingSpikeTraps" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_11_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/22_Mazaal/gAreaRoomMap_FortressOfWinds_Mazaal_bottom.bin.lz", "start": 5341968, "size": 364, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_11_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/22_Mazaal/gAreaRoomMap_FortressOfWinds_Mazaal_top.bin.lz", "start": 5342332, - "size": 86, - "type": "map_layer1" + "size": 88, + "type": "tileMap" }, { - "path": "assets/unknown_80.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/22_Mazaal/dungeon_map.bin", "start": 5342420, "size": 80, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_Mazaal" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_12_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/23_Stalfos/gAreaRoomMap_FortressOfWinds_Stalfos_bottom.bin.lz", "start": 5342500, - "size": 249, - "type": "map_layer2" + "size": 252, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_12_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/23_Stalfos/gAreaRoomMap_FortressOfWinds_Stalfos_top.bin.lz", "start": 5342752, - "size": 183, - "type": "map_layer1" + "size": 184, + "type": "tileMap" }, { - "path": "assets/unknown_81.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/23_Stalfos/dungeon_map.bin", "start": 5342936, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_Stalfos" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_13_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/24_EntranceMoleMitts/gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_bottom.bin.lz", "start": 5343004, - "size": 213, - "type": "map_layer2" + "size": 216, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_13_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/24_EntranceMoleMitts/gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_top.bin.lz", "start": 5343220, "size": 156, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_82.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/24_EntranceMoleMitts/dungeon_map.bin", "start": 5343376, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_EntranceMoleMitts" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_14_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/25_Main2f/gAreaRoomMap_FortressOfWinds_Main2f_bottom.bin.lz", "start": 5343444, - "size": 609, - "type": "map_layer2" + "size": 612, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_14_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/25_Main2f/gAreaRoomMap_FortressOfWinds_Main2f_top.bin.lz", "start": 5344056, - "size": 233, - "type": "map_layer1" + "size": 236, + "type": "tileMap" }, { - "path": "assets/unknown_83.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/25_Main2f/dungeon_map.bin", "start": 5344292, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 26 + }, + "name": "gDungeonMaps_FortressOfWinds_Main2f" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_15_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/26_MinishHole/gAreaRoomMap_FortressOfWinds_MinishHole_bottom.bin.lz", "start": 5344424, "size": 224, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_15_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/26_MinishHole/gAreaRoomMap_FortressOfWinds_MinishHole_top.bin.lz", "start": 5344648, - "size": 173, - "type": "map_layer1" + "size": 176, + "type": "tileMap" }, { - "path": "assets/unknown_84.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/26_MinishHole/dungeon_map.bin", "start": 5344824, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_MinishHole" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_16_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/27_BossKey/gAreaRoomMap_FortressOfWinds_BossKey_bottom.bin.lz", "start": 5344892, - "size": 162, - "type": "map_layer2" + "size": 164, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_16_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/27_BossKey/gAreaRoomMap_FortressOfWinds_BossKey_top.bin.lz", "start": 5345056, - "size": 265, - "type": "map_layer1" + "size": 268, + "type": "tileMap" }, { - "path": "assets/unknown_85.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/27_BossKey/dungeon_map.bin", "start": 5345324, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_BossKey" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_17_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/28_WestStairs2f/gAreaRoomMap_FortressOfWinds_WestStairs2f_bottom.bin.lz", "start": 5345392, "size": 280, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_17_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/28_WestStairs2f/gAreaRoomMap_FortressOfWinds_WestStairs2f_top.bin.lz", "start": 5345672, - "size": 115, - "type": "map_layer1" + "size": 116, + "type": "tileMap" }, { - "path": "assets/unknown_86.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/28_WestStairs2f/dungeon_map.bin", "start": 5345788, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_WestStairs2f" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_18_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/29_EastStairs2f/gAreaRoomMap_FortressOfWinds_EastStairs2f_bottom.bin.lz", "start": 5345856, "size": 324, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_18_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/29_EastStairs2f/gAreaRoomMap_FortressOfWinds_EastStairs2f_top.bin.lz", "start": 5346180, "size": 104, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_87.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/29_EastStairs2f/dungeon_map.bin", "start": 5346284, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_EastStairs2f" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_19_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/32_WestStairs1f/gAreaRoomMap_FortressOfWinds_WestStairs1f_bottom.bin.lz", "start": 5346352, - "size": 229, - "type": "map_layer2" + "size": 232, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_19_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/32_WestStairs1f/gAreaRoomMap_FortressOfWinds_WestStairs1f_top.bin.lz", "start": 5346584, - "size": 122, - "type": "map_layer1" + "size": 124, + "type": "tileMap" }, { - "path": "assets/unknown_88.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/32_WestStairs1f/dungeon_map.bin", "start": 5346708, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_WestStairs1f" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_20_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/33_CenterStairs1f/gAreaRoomMap_FortressOfWinds_CenterStairs1f_bottom.bin.lz", "start": 5346760, "size": 260, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_20_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/33_CenterStairs1f/gAreaRoomMap_FortressOfWinds_CenterStairs1f_top.bin.lz", "start": 5347020, - "size": 110, - "type": "map_layer1" + "size": 112, + "type": "tileMap" }, { - "path": "assets/unknown_89.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/33_CenterStairs1f/dungeon_map.bin", "start": 5347132, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_CenterStairs1f" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_21_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/34_EastStairs1f/gAreaRoomMap_FortressOfWinds_EastStairs1f_bottom.bin.lz", "start": 5347184, - "size": 258, - "type": "map_layer2" + "size": 260, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_21_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/34_EastStairs1f/gAreaRoomMap_FortressOfWinds_EastStairs1f_top.bin.lz", "start": 5347444, "size": 120, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_90.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/34_EastStairs1f/dungeon_map.bin", "start": 5347564, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_EastStairs1f" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_22_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/35_Wizzrobe/gAreaRoomMap_FortressOfWinds_Wizzrobe_bottom.bin.lz", "start": 5347616, "size": 220, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_22_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/35_Wizzrobe/gAreaRoomMap_FortressOfWinds_Wizzrobe_top.bin.lz", "start": 5347836, - "size": 101, - "type": "map_layer1" + "size": 104, + "type": "tileMap" }, { - "path": "assets/unknown_91.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/35_Wizzrobe/dungeon_map.bin", "start": 5347940, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_Wizzrobe" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_23_0.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/36_HeartPiece/gAreaRoomMap_FortressOfWinds_HeartPiece_bottom.bin.lz", "start": 5347992, - "size": 247, - "type": "map_layer2" + "size": 248, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWinds_23_1.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/36_HeartPiece/gAreaRoomMap_FortressOfWinds_HeartPiece_top.bin.lz", "start": 5348240, - "size": 105, - "type": "map_layer1" + "size": 108, + "type": "tileMap" }, { - "path": "assets/unknown_92.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/36_HeartPiece/dungeon_map.bin", "start": 5348348, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_FortressOfWinds_HeartPiece" }, { - "path": "assets/gAreaRoomMap_InnerMazaal_0_0.bin", + "path": "maps/areas/090_InnerMazaal/rooms/00_Main/gAreaRoomMap_InnerMazaal_Main_bottom.bin.lz", "start": 5348400, - "size": 197, - "type": "map_layer2" + "size": 200, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_InnerMazaal_0_1.bin", + "path": "maps/areas/090_InnerMazaal/rooms/00_Main/gAreaRoomMap_InnerMazaal_Main_top.bin.lz", "start": 5348600, - "size": 375, - "type": "map_layer1" + "size": 376, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_InnerMazaal_1_0.bin", + "path": "maps/areas/090_InnerMazaal/rooms/01_Phase1/gAreaRoomMap_InnerMazaal_Phase1_bottom.bin.lz", "start": 5348976, - "size": 209, - "type": "map_layer2" + "size": 212, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_InnerMazaal_1_1.bin", + "path": "maps/areas/090_InnerMazaal/rooms/01_Phase1/gAreaRoomMap_InnerMazaal_Phase1_top.bin.lz", "start": 5349188, - "size": 381, - "type": "map_layer1" + "size": 384, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWindsTop_0_0.bin", + "path": "maps/areas/089_FortressOfWindsTop/rooms/00_Main/gAreaRoomMap_FortressOfWindsTop_Main_bottom.bin.lz", "start": 5349572, "size": 728, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_FortressOfWindsTop_0_1.bin", + "path": "maps/areas/089_FortressOfWindsTop/rooms/00_Main/gAreaRoomMap_FortressOfWindsTop_Main_top.bin.lz", "start": 5350300, "size": 356, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_HyruleTownMinishCaves_0_0.4bpp.lz", + "path": "maps/areas/096_TempleOfDroplets/tileSets/0/gAreaTileSet_TempleOfDroplets_0_0.4bpp.lz", "start": 5350656, "size": 8744, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_HyruleTownMinishCaves_0_1.4bpp.lz", + "path": "maps/areas/096_TempleOfDroplets/tileSets/0/gAreaTileSet_TempleOfDroplets_0_1.4bpp.lz", "start": 5359400, - "size": 9899, - "type": "tileset" + "size": 9900, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_HyruleTownMinishCaves_0_2.4bpp.lz", + "path": "maps/areas/096_TempleOfDroplets/tileSets/0/gAreaTileSet_TempleOfDroplets_0_2.4bpp.lz", "start": 5369300, - "size": 8707, - "type": "tileset" + "size": 8708, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_TempleOfDroplets_0.bin", + "path": "maps/areas/096_TempleOfDroplets/tileSet/gAreaTileSet_TempleOfDroplets_bottom.bin.lz", "start": 5378008, - "size": 8683, - "type": "metatiles_tileset2" + "size": 8684, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_TempleOfDroplets_1.bin", + "path": "maps/areas/096_TempleOfDroplets/tileSet/gAreaTileSet_TempleOfDroplets_top.bin.lz", "start": 5386692, - "size": 9146, - "type": "metatiles_tileset1" + "size": 9148, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_TempleOfDroplets_2.bin", + "path": "maps/areas/096_TempleOfDroplets/tileSet/gAreaTileSetTypes_TempleOfDroplets_bottom.bin.lz", "start": 5395840, - "size": 1234, - "type": "metatiles_tile_types2" + "size": 1236, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_TempleOfDroplets_3.bin", + "path": "maps/areas/096_TempleOfDroplets/tileSet/gAreaTileSetTypes_TempleOfDroplets_top.bin.lz", "start": 5397076, "size": 1228, - "type": "metatiles_tile_types1" + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_61_0_0.4bpp.lz", + "path": "maps/areas/097_Null61/tileSets/0/gAreaTileSet_Null61_0_0.4bpp.lz", "start": 5398304, "size": 7596, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_61_0_1.4bpp.lz", + "path": "maps/areas/097_Null61/tileSets/0/gAreaTileSet_Null61_0_1.4bpp.lz", "start": 5405900, - "size": 4487, - "type": "tileset" + "size": 4488, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_61_0_2.4bpp.lz", + "path": "maps/areas/097_Null61/tileSets/0/gAreaTileSet_Null61_0_2.4bpp.lz", "start": 5410388, - "size": 2147, - "type": "tileset" + "size": 2148, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_61_0.bin", + "path": "maps/areas/097_Null61/tileSet/gAreaTileSet_Null61_bottom.bin.lz", "start": 5412536, - "size": 1222, - "type": "metatiles_tileset2" + "size": 1224, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_61_1.bin", + "path": "maps/areas/097_Null61/tileSet/gAreaTileSet_Null61_top.bin.lz", "start": 5413760, - "size": 285, - "type": "metatiles_tileset1" + "size": 288, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_61_2.bin", + "path": "maps/areas/097_Null61/tileSet/gAreaTileSetTypes_Null61_bottom.bin.lz", "start": 5414048, - "size": 151, - "type": "metatiles_tile_types2" + "size": 152, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_61_3.bin", + "path": "maps/areas/097_Null61/tileSet/gAreaTileSetTypes_Null61_top.bin.lz", "start": 5414200, - "size": 102, - "type": "metatiles_tile_types1" + "size": 104, + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_0_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/00_WestHole/gAreaRoomMap_TempleOfDroplets_WestHole_bottom.bin.lz", "start": 5414304, - "size": 271, - "type": "map_layer2" + "size": 272, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_0_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/00_WestHole/gAreaRoomMap_TempleOfDroplets_WestHole_top.bin.lz", "start": 5414576, - "size": 131, - "type": "map_layer1" + "size": 132, + "type": "tileMap" }, { - "path": "assets/unknown_93.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/00_WestHole/dungeon_map.bin", "start": 5414708, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_WestHole" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_1_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/01_NorthSplitRoom/gAreaRoomMap_TempleOfDroplets_NorthSplitRoom_bottom.bin.lz", "start": 5414776, "size": 284, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_1_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/01_NorthSplitRoom/gAreaRoomMap_TempleOfDroplets_NorthSplitRoom_top.bin.lz", "start": 5415060, - "size": 131, - "type": "map_layer1" + "size": 132, + "type": "tileMap" }, { - "path": "assets/unknown_94.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/01_NorthSplitRoom/dungeon_map.bin", "start": 5415192, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_NorthSplitRoom" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_2_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/02_EastHole/gAreaRoomMap_TempleOfDroplets_EastHole_bottom.bin.lz", "start": 5415260, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_2_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/02_EastHole/gAreaRoomMap_TempleOfDroplets_EastHole_top.bin.lz", "start": 5415560, "size": 112, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_95.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/02_EastHole/dungeon_map.bin", "start": 5415672, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_EastHole" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_3_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/03_Entrance/gAreaRoomMap_TempleOfDroplets_Entrance_bottom.bin.lz", "start": 5415740, - "size": 583, - "type": "map_layer2" + "size": 584, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_3_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/03_Entrance/gAreaRoomMap_TempleOfDroplets_Entrance_top.bin.lz", "start": 5416324, - "size": 529, - "type": "map_layer1" + "size": 532, + "type": "tileMap" }, { - "path": "assets/unknown_96.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/03_Entrance/dungeon_map.bin", "start": 5416856, "size": 236, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 9, + "height": 26 + }, + "name": "gDungeonMaps_TempleOfDroplets_Entrance" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_4_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/04_NorthwestStairs/gAreaRoomMap_TempleOfDroplets_NorthwestStairs_bottom.bin.lz", "start": 5417092, "size": 188, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_4_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/04_NorthwestStairs/gAreaRoomMap_TempleOfDroplets_NorthwestStairs_top.bin.lz", "start": 5417280, "size": 260, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_97.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/04_NorthwestStairs/dungeon_map.bin", "start": 5417540, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_NorthwestStairs" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_5_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/05_ScissorsMiniboss/gAreaRoomMap_TempleOfDroplets_ScissorsMiniboss_bottom.bin.lz", "start": 5417608, "size": 60, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_5_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/05_ScissorsMiniboss/gAreaRoomMap_TempleOfDroplets_ScissorsMiniboss_top.bin.lz", "start": 5417668, - "size": 297, - "type": "map_layer1" + "size": 300, + "type": "tileMap" }, { - "path": "assets/unknown_98.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/05_ScissorsMiniboss/dungeon_map.bin", "start": 5417968, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_ScissorsMiniboss" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_6_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/06_WaterfallNorthwest/gAreaRoomMap_TempleOfDroplets_WaterfallNorthwest_bottom.bin.lz", "start": 5418036, - "size": 287, - "type": "map_layer2" + "size": 288, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_6_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/06_WaterfallNorthwest/gAreaRoomMap_TempleOfDroplets_WaterfallNorthwest_top.bin.lz", "start": 5418324, - "size": 407, - "type": "map_layer1" + "size": 408, + "type": "tileMap" }, { - "path": "assets/unknown_99.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/06_WaterfallNorthwest/dungeon_map.bin", "start": 5418732, "size": 104, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 26 + }, + "name": "gDungeonMaps_TempleOfDroplets_WaterfallNorthwest" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_7_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/07_WaterfallNortheast/gAreaRoomMap_TempleOfDroplets_WaterfallNortheast_bottom.bin.lz", "start": 5418836, - "size": 329, - "type": "map_layer2" + "size": 332, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_7_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/07_WaterfallNortheast/gAreaRoomMap_TempleOfDroplets_WaterfallNortheast_top.bin.lz", "start": 5419168, "size": 344, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_100.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/07_WaterfallNortheast/dungeon_map.bin", "start": 5419512, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 26 + }, + "name": "gDungeonMaps_TempleOfDroplets_WaterfallNortheast" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_8_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/08_Element/gAreaRoomMap_TempleOfDroplets_Element_bottom.bin.lz", "start": 5419644, - "size": 778, - "type": "map_layer2" + "size": 780, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_8_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/08_Element/gAreaRoomMap_TempleOfDroplets_Element_top.bin.lz", "start": 5420424, - "size": 763, - "type": "map_layer1" + "size": 764, + "type": "tileMap" }, { - "path": "assets/unknown_101.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/08_Element/dungeon_map.bin", "start": 5421188, "size": 324, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 9, + "height": 36 + }, + "name": "gDungeonMaps_TempleOfDroplets_Element" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_9_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/09_IceCorner/gAreaRoomMap_TempleOfDroplets_IceCorner_bottom.bin.lz", "start": 5421512, - "size": 214, - "type": "map_layer2" + "size": 216, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_9_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/09_IceCorner/gAreaRoomMap_TempleOfDroplets_IceCorner_top.bin.lz", "start": 5421728, - "size": 191, - "type": "map_layer1" + "size": 192, + "type": "tileMap" }, { - "path": "assets/unknown_102.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/09_IceCorner/dungeon_map.bin", "start": 5421920, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_IceCorner" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_10_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/10_IcePitMaze/gAreaRoomMap_TempleOfDroplets_IcePitMaze_bottom.bin.lz", "start": 5421988, - "size": 666, - "type": "map_layer2" + "size": 668, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_10_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/10_IcePitMaze/gAreaRoomMap_TempleOfDroplets_IcePitMaze_top.bin.lz", "start": 5422656, - "size": 237, - "type": "map_layer1" + "size": 240, + "type": "tileMap" }, { - "path": "assets/unknown_103.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/10_IcePitMaze/dungeon_map.bin", "start": 5422896, "size": 156, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 39 + }, + "name": "gDungeonMaps_TempleOfDroplets_IcePitMaze" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_11_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/11_HoleToBlueChuKey/gAreaRoomMap_TempleOfDroplets_HoleToBlueChuKey_bottom.bin.lz", "start": 5423052, "size": 312, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_11_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/11_HoleToBlueChuKey/gAreaRoomMap_TempleOfDroplets_HoleToBlueChuKey_top.bin.lz", "start": 5423364, - "size": 171, - "type": "map_layer1" + "size": 172, + "type": "tileMap" }, { - "path": "assets/unknown_104.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/11_HoleToBlueChuKey/dungeon_map.bin", "start": 5423536, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_HoleToBlueChuKey" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_12_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/12_WestWaterfallSoutheast/gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_bottom.bin.lz", "start": 5423604, - "size": 53, - "type": "map_layer2" + "size": 56, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_12_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/12_WestWaterfallSoutheast/gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_top.bin.lz", "start": 5423660, "size": 256, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_105.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/12_WestWaterfallSoutheast/dungeon_map.bin", "start": 5423916, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_WestWaterfallSoutheast" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_13_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/13_WestWaterfallSouthwest/gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_bottom.bin.lz", "start": 5423968, - "size": 369, - "type": "map_layer2" + "size": 372, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_13_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/13_WestWaterfallSouthwest/gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_top.bin.lz", "start": 5424340, - "size": 358, - "type": "map_layer1" + "size": 360, + "type": "tileMap" }, { - "path": "assets/unknown_106.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/13_WestWaterfallSouthwest/dungeon_map.bin", "start": 5424700, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 26 + }, + "name": "gDungeonMaps_TempleOfDroplets_WestWaterfallSouthwest" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_14_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/14_BigOcto/gAreaRoomMap_TempleOfDroplets_BigOcto_bottom.bin.lz", "start": 5424832, - "size": 285, - "type": "map_layer2" + "size": 288, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_14_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/14_BigOcto/gAreaRoomMap_TempleOfDroplets_BigOcto_top.bin.lz", "start": 5425120, "size": 132, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_107.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/14_BigOcto/dungeon_map.bin", "start": 5425252, "size": 144, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 9, + "height": 16 + }, + "name": "gDungeonMaps_TempleOfDroplets_BigOcto" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_15_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/15_ToBlueChu/gAreaRoomMap_TempleOfDroplets_ToBlueChu_bottom.bin.lz", "start": 5425396, - "size": 285, - "type": "map_layer2" + "size": 288, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_15_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/15_ToBlueChu/gAreaRoomMap_TempleOfDroplets_ToBlueChu_top.bin.lz", "start": 5425684, "size": 152, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_108.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/15_ToBlueChu/dungeon_map.bin", "start": 5425836, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_ToBlueChu" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_16_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/16_BlueChu/gAreaRoomMap_TempleOfDroplets_BlueChu_bottom.bin.lz", "start": 5425904, - "size": 255, - "type": "map_layer2" + "size": 256, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_16_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/16_BlueChu/gAreaRoomMap_TempleOfDroplets_BlueChu_top.bin.lz", "start": 5426160, "size": 60, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_109.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/16_BlueChu/dungeon_map.bin", "start": 5426220, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_BlueChu" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_17_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/17_BlueChuKey/gAreaRoomMap_TempleOfDroplets_BlueChuKey_bottom.bin.lz", "start": 5426288, - "size": 199, - "type": "map_layer2" + "size": 200, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_17_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/17_BlueChuKey/gAreaRoomMap_TempleOfDroplets_BlueChuKey_top.bin.lz", "start": 5426488, - "size": 134, - "type": "map_layer1" + "size": 136, + "type": "tileMap" }, { - "path": "assets/unknown_110.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/17_BlueChuKey/dungeon_map.bin", "start": 5426624, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_BlueChuKey" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_18_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/32_BossKey/gAreaRoomMap_TempleOfDroplets_BossKey_bottom.bin.lz", "start": 5426676, - "size": 347, - "type": "map_layer2" + "size": 348, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_18_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/32_BossKey/gAreaRoomMap_TempleOfDroplets_BossKey_top.bin.lz", "start": 5427024, - "size": 213, - "type": "map_layer1" + "size": 216, + "type": "tileMap" }, { - "path": "assets/unknown_111.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/32_BossKey/dungeon_map.bin", "start": 5427240, "size": 120, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 9, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_BossKey" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_19_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/33_NorthSmallKey/gAreaRoomMap_TempleOfDroplets_NorthSmallKey_bottom.bin.lz", "start": 5427360, - "size": 301, - "type": "map_layer2" + "size": 304, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_19_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/33_NorthSmallKey/gAreaRoomMap_TempleOfDroplets_NorthSmallKey_top.bin.lz", "start": 5427664, - "size": 131, - "type": "map_layer1" + "size": 132, + "type": "tileMap" }, { - "path": "assets/unknown_112.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/33_NorthSmallKey/dungeon_map.bin", "start": 5427796, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_NorthSmallKey" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_20_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/34_BlockCloneButtonPuzzle/gAreaRoomMap_TempleOfDroplets_BlockCloneButtonPuzzle_bottom.bin.lz", "start": 5427864, - "size": 281, - "type": "map_layer2" + "size": 284, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_20_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/34_BlockCloneButtonPuzzle/gAreaRoomMap_TempleOfDroplets_BlockCloneButtonPuzzle_top.bin.lz", "start": 5428148, - "size": 243, - "type": "map_layer1" + "size": 244, + "type": "tileMap" }, { - "path": "assets/unknown_113.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/34_BlockCloneButtonPuzzle/dungeon_map.bin", "start": 5428392, "size": 120, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 9, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_BlockCloneButtonPuzzle" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_21_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/35_BlockClonePuzzle/gAreaRoomMap_TempleOfDroplets_BlockClonePuzzle_bottom.bin.lz", "start": 5428512, - "size": 266, - "type": "map_layer2" + "size": 268, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_21_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/35_BlockClonePuzzle/gAreaRoomMap_TempleOfDroplets_BlockClonePuzzle_top.bin.lz", "start": 5428780, "size": 112, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_114.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/35_BlockClonePuzzle/dungeon_map.bin", "start": 5428892, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_BlockClonePuzzle" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_22_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/36_BlockCloneIceBridge/gAreaRoomMap_TempleOfDroplets_BlockCloneIceBridge_bottom.bin.lz", "start": 5428960, - "size": 314, - "type": "map_layer2" + "size": 316, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_22_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/36_BlockCloneIceBridge/gAreaRoomMap_TempleOfDroplets_BlockCloneIceBridge_top.bin.lz", "start": 5429276, - "size": 569, - "type": "map_layer1" + "size": 572, + "type": "tileMap" }, { - "path": "assets/unknown_115.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/36_BlockCloneIceBridge/dungeon_map.bin", "start": 5429848, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 26 + }, + "name": "gDungeonMaps_TempleOfDroplets_BlockCloneIceBridge" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_23_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/37_StairsToScissorsMiniboss/gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_bottom.bin.lz", "start": 5429980, - "size": 278, - "type": "map_layer2" + "size": 280, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_23_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/37_StairsToScissorsMiniboss/gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_top.bin.lz", "start": 5430260, - "size": 199, - "type": "map_layer1" + "size": 200, + "type": "tileMap" }, { - "path": "assets/unknown_116.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/37_StairsToScissorsMiniboss/dungeon_map.bin", "start": 5430460, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_StairsToScissorsMiniboss" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_24_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/38_SpikeBarFlipperRoom/gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_bottom.bin.lz", "start": 5430528, - "size": 149, - "type": "map_layer2" + "size": 152, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_24_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/38_SpikeBarFlipperRoom/gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_top.bin.lz", "start": 5430680, - "size": 710, - "type": "map_layer1" + "size": 712, + "type": "tileMap" }, { - "path": "assets/unknown_117.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/38_SpikeBarFlipperRoom/dungeon_map.bin", "start": 5431392, "size": 160, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 40 + }, + "name": "gDungeonMaps_TempleOfDroplets_SpikeBarFlipperRoom" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_25_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/39_9Lanterns/gAreaRoomMap_TempleOfDroplets_9Lanterns_bottom.bin.lz", "start": 5431552, - "size": 58, - "type": "map_layer2" + "size": 60, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_25_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/39_9Lanterns/gAreaRoomMap_TempleOfDroplets_9Lanterns_top.bin.lz", "start": 5431612, - "size": 306, - "type": "map_layer1" + "size": 308, + "type": "tileMap" }, { - "path": "assets/unknown_118.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/39_9Lanterns/dungeon_map.bin", "start": 5431920, "size": 56, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 14 + }, + "name": "gDungeonMaps_TempleOfDroplets_9Lanterns" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_26_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/40_LilypadIceBlocks/gAreaRoomMap_TempleOfDroplets_LilypadIceBlocks_bottom.bin.lz", "variants": [ "DEMO_JP", "DEMO_USA", @@ -7426,17 +7915,17 @@ "USA" ], "start": 5431976, - "size": 1025, - "type": "map_layer2" + "size": 1028, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_26_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/40_LilypadIceBlocks/gAreaRoomMap_TempleOfDroplets_LilypadIceBlocks_bottom.bin.lz", "variants": [ "EU" ], "start": 5431976, - "size": 1001, - "type": "map_layer2" + "size": 1004, + "type": "tileMap" }, { "offsets": { @@ -7444,283 +7933,358 @@ } }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_26_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/40_LilypadIceBlocks/gAreaRoomMap_TempleOfDroplets_LilypadIceBlocks_top.bin.lz", "start": 5433004, "size": 548, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_119.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/40_LilypadIceBlocks/dungeon_map.bin", "start": 5433552, "size": 352, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 9, + "height": 39 + }, + "name": "gDungeonMaps_TempleOfDroplets_LilypadIceBlocks" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_27_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/41_29/gAreaRoomMap_TempleOfDroplets_29_bottom.bin.lz", "start": 5433904, "size": 332, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_27_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/41_29/gAreaRoomMap_TempleOfDroplets_29_top.bin.lz", "start": 5434236, "size": 104, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_120.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/41_29/dungeon_map.bin", "start": 5434340, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_29" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_28_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/42_MulldozersFireBars/gAreaRoomMap_TempleOfDroplets_MulldozersFireBars_bottom.bin.lz", "start": 5434408, - "size": 237, - "type": "map_layer2" + "size": 240, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_28_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/42_MulldozersFireBars/gAreaRoomMap_TempleOfDroplets_MulldozersFireBars_top.bin.lz", "start": 5434648, - "size": 97, - "type": "map_layer1" + "size": 100, + "type": "tileMap" }, { - "path": "assets/unknown_121.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/42_MulldozersFireBars/dungeon_map.bin", "start": 5434748, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_MulldozersFireBars" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_29_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/43_DarkMaze/gAreaRoomMap_TempleOfDroplets_DarkMaze_bottom.bin.lz", "start": 5434800, - "size": 511, - "type": "map_layer2" + "size": 512, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_29_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/43_DarkMaze/gAreaRoomMap_TempleOfDroplets_DarkMaze_top.bin.lz", "start": 5435312, - "size": 171, - "type": "map_layer1" + "size": 172, + "type": "tileMap" }, { - "path": "assets/unknown_122.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/43_DarkMaze/dungeon_map.bin", "start": 5435484, "size": 156, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 39 + }, + "name": "gDungeonMaps_TempleOfDroplets_DarkMaze" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_30_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/44_TwinMadderpillars/gAreaRoomMap_TempleOfDroplets_TwinMadderpillars_bottom.bin.lz", "start": 5435640, - "size": 53, - "type": "map_layer2" + "size": 56, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_30_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/44_TwinMadderpillars/gAreaRoomMap_TempleOfDroplets_TwinMadderpillars_top.bin.lz", "start": 5435696, "size": 260, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_123.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/44_TwinMadderpillars/dungeon_map.bin", "start": 5435956, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_TwinMadderpillars" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_31_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/45_AfterTwinMadderpillars/gAreaRoomMap_TempleOfDroplets_AfterTwinMadderpillars_bottom.bin.lz", "start": 5436008, - "size": 174, - "type": "map_layer2" + "size": 176, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_31_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/45_AfterTwinMadderpillars/gAreaRoomMap_TempleOfDroplets_AfterTwinMadderpillars_top.bin.lz", "start": 5436184, "size": 264, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_124.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/45_AfterTwinMadderpillars/dungeon_map.bin", "start": 5436448, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_AfterTwinMadderpillars" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_32_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/46_BlueChuKeyLever/gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_bottom.bin.lz", "start": 5436516, - "size": 241, - "type": "map_layer2" + "size": 244, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_32_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/46_BlueChuKeyLever/gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_top.bin.lz", "start": 5436760, "size": 156, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_125.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/46_BlueChuKeyLever/dungeon_map.bin", "start": 5436916, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_BlueChuKeyLever" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_33_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/47_MulldozerKey/gAreaRoomMap_TempleOfDroplets_MulldozerKey_bottom.bin.lz", "start": 5436984, - "size": 187, - "type": "map_layer2" + "size": 188, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_33_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/47_MulldozerKey/gAreaRoomMap_TempleOfDroplets_MulldozerKey_top.bin.lz", "start": 5437172, - "size": 111, - "type": "map_layer1" + "size": 112, + "type": "tileMap" }, { - "path": "assets/unknown_126.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/47_MulldozerKey/dungeon_map.bin", "start": 5437284, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_MulldozerKey" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_34_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/48_BeforeTwinMadderpillars/gAreaRoomMap_TempleOfDroplets_BeforeTwinMadderpillars_bottom.bin.lz", "start": 5437336, - "size": 53, - "type": "map_layer2" + "size": 56, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_34_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/48_BeforeTwinMadderpillars/gAreaRoomMap_TempleOfDroplets_BeforeTwinMadderpillars_top.bin.lz", "start": 5437392, - "size": 282, - "type": "map_layer1" + "size": 284, + "type": "tileMap" }, { - "path": "assets/unknown_127.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/48_BeforeTwinMadderpillars/dungeon_map.bin", "start": 5437676, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_BeforeTwinMadderpillars" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_35_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/49_LilypadB2West/gAreaRoomMap_TempleOfDroplets_LilypadB2West_bottom.bin.lz", "start": 5437728, "size": 512, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_35_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/49_LilypadB2West/gAreaRoomMap_TempleOfDroplets_LilypadB2West_top.bin.lz", "start": 5438240, - "size": 194, - "type": "map_layer1" + "size": 196, + "type": "tileMap" }, { - "path": "assets/unknown_128.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/49_LilypadB2West/dungeon_map.bin", "start": 5438436, "size": 136, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 27 + }, + "name": "gDungeonMaps_TempleOfDroplets_LilypadB2West" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_36_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/50_Compass/gAreaRoomMap_TempleOfDroplets_Compass_bottom.bin.lz", "start": 5438572, "size": 312, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_36_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/50_Compass/gAreaRoomMap_TempleOfDroplets_Compass_top.bin.lz", "start": 5438884, - "size": 143, - "type": "map_layer1" + "size": 144, + "type": "tileMap" }, { - "path": "assets/unknown_129.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/50_Compass/dungeon_map.bin", "start": 5439028, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_Compass" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_37_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/51_DarkScissorBeetles/gAreaRoomMap_TempleOfDroplets_DarkScissorBeetles_bottom.bin.lz", "start": 5439096, - "size": 298, - "type": "map_layer2" + "size": 300, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_37_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/51_DarkScissorBeetles/gAreaRoomMap_TempleOfDroplets_DarkScissorBeetles_top.bin.lz", "start": 5439396, "size": 100, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_130.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/51_DarkScissorBeetles/dungeon_map.bin", "start": 5439496, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_DarkScissorBeetles" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_38_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/52_LilypadB2Middle/gAreaRoomMap_TempleOfDroplets_LilypadB2Middle_bottom.bin.lz", "start": 5439548, "size": 460, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_38_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/52_LilypadB2Middle/gAreaRoomMap_TempleOfDroplets_LilypadB2Middle_top.bin.lz", "start": 5440008, "size": 136, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_131.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/52_LilypadB2Middle/dungeon_map.bin", "start": 5440144, "size": 128, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 9, + "height": 14 + }, + "name": "gDungeonMaps_TempleOfDroplets_LilypadB2Middle" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_39_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/53_IceMadderpillar/gAreaRoomMap_TempleOfDroplets_IceMadderpillar_bottom.bin.lz", "start": 5440272, - "size": 291, - "type": "map_layer2" + "size": 292, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_39_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/53_IceMadderpillar/gAreaRoomMap_TempleOfDroplets_IceMadderpillar_top.bin.lz", "start": 5440564, - "size": 113, - "type": "map_layer1" + "size": 116, + "type": "tileMap" }, { - "path": "assets/unknown_132.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/53_IceMadderpillar/dungeon_map.bin", "start": 5440680, "size": 72, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 14 + }, + "name": "gDungeonMaps_TempleOfDroplets_IceMadderpillar" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_40_0.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/54_FlamebarBlockPuzzle/gAreaRoomMap_TempleOfDroplets_FlamebarBlockPuzzle_bottom.bin.lz", "start": 5440752, - "size": 205, - "type": "map_layer2" + "size": 208, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_TempleOfDroplets_40_1.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/54_FlamebarBlockPuzzle/gAreaRoomMap_TempleOfDroplets_FlamebarBlockPuzzle_top.bin.lz", "start": 5440960, "size": 180, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_133.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/54_FlamebarBlockPuzzle/dungeon_map.bin", "start": 5441140, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_TempleOfDroplets_FlamebarBlockPuzzle" }, { - "path": "assets/gAreaRoomMap_61_0_0.bin", + "path": "maps/areas/097_Null61/rooms/00_0/gAreaRoomMap_Null61_0_bottom.bin.lz", "start": 5441192, - "size": 307, - "type": "map_layer2" + "size": 308, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_61_0_1.bin", + "path": "maps/areas/097_Null61/rooms/00_0/gAreaRoomMap_Null61_0_top.bin.lz", "start": 5441500, "size": 68, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_0_0.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/00_0/gAreaRoomMap_HyruleTownMinishCaves_0_bottom.bin.lz", "variants": [ "DEMO_JP", "DEMO_USA", @@ -7728,17 +8292,17 @@ "USA" ], "start": 5441568, - "size": 475, - "type": "map_layer2" + "size": 476, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_0_0.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/00_0/gAreaRoomMap_HyruleTownMinishCaves_0_bottom.bin.lz", "variants": [ "EU" ], "start": 5441568, - "size": 459, - "type": "map_layer2" + "size": 460, + "type": "tileMap" }, { "offsets": { @@ -7746,355 +8310,355 @@ } }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_0_1.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/00_0/gAreaRoomMap_HyruleTownMinishCaves_0_top.bin.lz", "start": 5442044, - "size": 166, - "type": "map_layer1" + "size": 168, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_1_0.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/01_1/gAreaRoomMap_HyruleTownMinishCaves_1_bottom.bin.lz", "start": 5442212, - "size": 373, - "type": "map_layer2" + "size": 376, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_1_1.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/01_1/gAreaRoomMap_HyruleTownMinishCaves_1_top.bin.lz", "start": 5442588, - "size": 166, - "type": "map_layer1" + "size": 168, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_2_0.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/02_2/gAreaRoomMap_HyruleTownMinishCaves_2_bottom.bin.lz", "start": 5442756, - "size": 269, - "type": "map_layer2" + "size": 272, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_2_1.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/02_2/gAreaRoomMap_HyruleTownMinishCaves_2_top.bin.lz", "start": 5443028, - "size": 209, - "type": "map_layer1" + "size": 212, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_3_0.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/03_3/gAreaRoomMap_HyruleTownMinishCaves_3_bottom.bin.lz", "start": 5443240, "size": 68, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_3_1.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/03_3/gAreaRoomMap_HyruleTownMinishCaves_3_top.bin.lz", "start": 5443308, - "size": 302, - "type": "map_layer1" + "size": 304, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_4_0.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/04_4/gAreaRoomMap_HyruleTownMinishCaves_4_bottom.bin.lz", "start": 5443612, - "size": 234, - "type": "map_layer2" + "size": 236, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_4_1.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/04_4/gAreaRoomMap_HyruleTownMinishCaves_4_top.bin.lz", "start": 5443848, - "size": 134, - "type": "map_layer1" + "size": 136, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_5_0.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/16_Unused10/gAreaRoomMap_HyruleTownMinishCaves_Unused10_bottom.bin.lz", "start": 5443984, - "size": 306, - "type": "map_layer2" + "size": 308, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_5_1.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/16_Unused10/gAreaRoomMap_HyruleTownMinishCaves_Unused10_top.bin.lz", "start": 5444292, - "size": 101, - "type": "map_layer1" + "size": 104, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_6_0.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/17_6/gAreaRoomMap_HyruleTownMinishCaves_6_bottom.bin.lz", "start": 5444396, - "size": 275, - "type": "map_layer2" + "size": 276, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_6_1.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/17_6/gAreaRoomMap_HyruleTownMinishCaves_6_top.bin.lz", "start": 5444672, "size": 60, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_7_0.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/18_7/gAreaRoomMap_HyruleTownMinishCaves_7_bottom.bin.lz", "start": 5444732, "size": 268, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_7_1.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/18_7/gAreaRoomMap_HyruleTownMinishCaves_7_top.bin.lz", "start": 5445000, - "size": 85, - "type": "map_layer1" + "size": 88, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_8_0.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/19_8/gAreaRoomMap_HyruleTownMinishCaves_8_bottom.bin.lz", "start": 5445088, - "size": 331, - "type": "map_layer2" + "size": 332, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_8_1.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/19_8/gAreaRoomMap_HyruleTownMinishCaves_8_top.bin.lz", "start": 5445420, - "size": 110, - "type": "map_layer1" + "size": 112, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_9_0.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/20_9/gAreaRoomMap_HyruleTownMinishCaves_9_bottom.bin.lz", "start": 5445532, "size": 280, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_9_1.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/20_9/gAreaRoomMap_HyruleTownMinishCaves_9_top.bin.lz", "start": 5445812, - "size": 70, - "type": "map_layer1" + "size": 72, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_10_0.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/21_10/gAreaRoomMap_HyruleTownMinishCaves_10_bottom.bin.lz", "start": 5445884, - "size": 219, - "type": "map_layer2" + "size": 220, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleTownMinishCaves_10_1.bin", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/21_10/gAreaRoomMap_HyruleTownMinishCaves_10_top.bin.lz", "start": 5446104, - "size": 207, - "type": "map_layer1" + "size": 208, + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_RoyalCrypt_0_0.4bpp.lz", + "path": "maps/areas/104_RoyalCrypt/tileSets/0/gAreaTileSet_RoyalCrypt_0_0.4bpp.lz", "start": 5446312, - "size": 8126, - "type": "tileset" + "size": 8128, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_RoyalCrypt_0_1.4bpp.lz", + "path": "maps/areas/104_RoyalCrypt/tileSets/0/gAreaTileSet_RoyalCrypt_0_1.4bpp.lz", "start": 5454440, - "size": 7161, - "type": "tileset" + "size": 7164, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_RoyalCrypt_0_2.4bpp.lz", + "path": "maps/areas/104_RoyalCrypt/tileSets/0/gAreaTileSet_RoyalCrypt_0_2.4bpp.lz", "start": 5461604, - "size": 5569, - "type": "tileset" + "size": 5572, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_RoyalCrypt_0.bin", + "path": "maps/areas/104_RoyalCrypt/tileSet/gAreaTileSet_RoyalCrypt_bottom.bin.lz", "start": 5467176, - "size": 7149, - "type": "metatiles_tileset2" + "size": 7152, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_RoyalCrypt_1.bin", + "path": "maps/areas/104_RoyalCrypt/tileSet/gAreaTileSet_RoyalCrypt_top.bin.lz", "start": 5474328, - "size": 5117, - "type": "metatiles_tileset1" + "size": 5120, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_RoyalCrypt_2.bin", + "path": "maps/areas/104_RoyalCrypt/tileSet/gAreaTileSetTypes_RoyalCrypt_bottom.bin.lz", "start": 5479448, - "size": 1195, - "type": "metatiles_tile_types2" + "size": 1196, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_RoyalCrypt_3.bin", + "path": "maps/areas/104_RoyalCrypt/tileSet/gAreaTileSetTypes_RoyalCrypt_top.bin.lz", "start": 5480644, - "size": 963, - "type": "metatiles_tile_types1" + "size": 964, + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_RoyalCrypt_0_0.bin", + "path": "maps/areas/104_RoyalCrypt/rooms/00_0/gAreaRoomMap_RoyalCrypt_0_bottom.bin.lz", "start": 5481608, - "size": 551, - "type": "map_layer2" + "size": 552, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalCrypt_0_1.bin", + "path": "maps/areas/104_RoyalCrypt/rooms/00_0/gAreaRoomMap_RoyalCrypt_0_top.bin.lz", "start": 5482160, "size": 412, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalCrypt_1_0.bin", + "path": "maps/areas/104_RoyalCrypt/rooms/01_WaterRope/gAreaRoomMap_RoyalCrypt_WaterRope_bottom.bin.lz", "start": 5482572, - "size": 289, - "type": "map_layer2" + "size": 292, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalCrypt_1_1.bin", + "path": "maps/areas/104_RoyalCrypt/rooms/01_WaterRope/gAreaRoomMap_RoyalCrypt_WaterRope_top.bin.lz", "start": 5482864, - "size": 122, - "type": "map_layer1" + "size": 124, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalCrypt_2_0.bin", + "path": "maps/areas/104_RoyalCrypt/rooms/02_Gibdo/gAreaRoomMap_RoyalCrypt_Gibdo_bottom.bin.lz", "start": 5482988, - "size": 290, - "type": "map_layer2" + "size": 292, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalCrypt_2_1.bin", + "path": "maps/areas/104_RoyalCrypt/rooms/02_Gibdo/gAreaRoomMap_RoyalCrypt_Gibdo_top.bin.lz", "start": 5483280, "size": 216, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalCrypt_3_0.bin", + "path": "maps/areas/104_RoyalCrypt/rooms/03_3/gAreaRoomMap_RoyalCrypt_3_bottom.bin.lz", "start": 5483496, - "size": 371, - "type": "map_layer2" + "size": 372, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalCrypt_3_1.bin", + "path": "maps/areas/104_RoyalCrypt/rooms/03_3/gAreaRoomMap_RoyalCrypt_3_top.bin.lz", "start": 5483868, - "size": 202, - "type": "map_layer1" + "size": 204, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalCrypt_4_0.bin", + "path": "maps/areas/104_RoyalCrypt/rooms/04_KeyBlock/gAreaRoomMap_RoyalCrypt_KeyBlock_bottom.bin.lz", "start": 5484072, "size": 820, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalCrypt_4_1.bin", + "path": "maps/areas/104_RoyalCrypt/rooms/04_KeyBlock/gAreaRoomMap_RoyalCrypt_KeyBlock_top.bin.lz", "start": 5484892, "size": 340, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalCrypt_5_0.bin", + "path": "maps/areas/104_RoyalCrypt/rooms/05_5/gAreaRoomMap_RoyalCrypt_5_bottom.bin.lz", "start": 5485232, "size": 392, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalCrypt_5_1.bin", + "path": "maps/areas/104_RoyalCrypt/rooms/05_5/gAreaRoomMap_RoyalCrypt_5_top.bin.lz", "start": 5485624, - "size": 157, - "type": "map_layer1" + "size": 160, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalCrypt_6_0.bin", + "path": "maps/areas/104_RoyalCrypt/rooms/06_6/gAreaRoomMap_RoyalCrypt_6_bottom.bin.lz", "start": 5485784, - "size": 353, - "type": "map_layer2" + "size": 356, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalCrypt_6_1.bin", + "path": "maps/areas/104_RoyalCrypt/rooms/06_6/gAreaRoomMap_RoyalCrypt_6_top.bin.lz", "start": 5486140, "size": 152, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalCrypt_7_0.bin", + "path": "maps/areas/104_RoyalCrypt/rooms/07_MushroomPit/gAreaRoomMap_RoyalCrypt_MushroomPit_bottom.bin.lz", "start": 5486292, - "size": 342, - "type": "map_layer2" + "size": 344, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalCrypt_7_1.bin", + "path": "maps/areas/104_RoyalCrypt/rooms/07_MushroomPit/gAreaRoomMap_RoyalCrypt_MushroomPit_top.bin.lz", "start": 5486636, "size": 184, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalCrypt_8_0.bin", + "path": "maps/areas/104_RoyalCrypt/rooms/08_Entrance/gAreaRoomMap_RoyalCrypt_Entrance_bottom.bin.lz", "start": 5486820, "size": 240, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_RoyalCrypt_8_1.bin", + "path": "maps/areas/104_RoyalCrypt/rooms/08_Entrance/gAreaRoomMap_RoyalCrypt_Entrance_top.bin.lz", "start": 5487060, - "size": 118, - "type": "map_layer1" + "size": 120, + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_PalaceOfWinds_GyorgTornado_0.4bpp.lz", + "path": "maps/areas/112_PalaceOfWinds/tileSets/0/gAreaTileSet_PalaceOfWinds_0_0.4bpp.lz", "start": 5487180, "size": 9192, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_PalaceOfWinds_GyorgTornado_1.4bpp.lz", + "path": "maps/areas/112_PalaceOfWinds/tileSets/0/gAreaTileSet_PalaceOfWinds_0_1.4bpp.lz", "start": 5496372, - "size": 8581, - "type": "tileset" + "size": 8584, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_PalaceOfWinds_GyorgTornado_2.4bpp.lz", + "path": "maps/areas/112_PalaceOfWinds/tileSets/0/gAreaTileSet_PalaceOfWinds_0_2.4bpp.lz", "start": 5504956, - "size": 7510, - "type": "tileset" + "size": 7512, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_PalaceOfWinds_GyorgTornado.bin", + "path": "maps/areas/112_PalaceOfWinds/tileSet/gAreaTileSet_PalaceOfWinds_bottom.bin.lz", "start": 5512468, - "size": 7283, - "type": "metatiles_tileset2" + "size": 7284, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_PalaceOfWinds_BossKey.bin", + "path": "maps/areas/112_PalaceOfWinds/tileSet/gAreaTileSet_PalaceOfWinds_top.bin.lz", "start": 5519752, "size": 6372, - "type": "metatiles_tileset1" + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_PalaceOfWinds_BeforeBallAndChainSoldiers.bin", + "path": "maps/areas/112_PalaceOfWinds/tileSet/gAreaTileSetTypes_PalaceOfWinds_bottom.bin.lz", "start": 5526124, "size": 1228, - "type": "metatiles_tile_types2" + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_PalaceOfWinds_GyorgBossDoor.bin", + "path": "maps/areas/112_PalaceOfWinds/tileSet/gAreaTileSetTypes_PalaceOfWinds_top.bin.lz", "start": 5527352, - "size": 1187, - "type": "metatiles_tile_types1" + "size": 1188, + "type": "tileSet_types" }, { - "path": "assets/gAreaTileset_PalaceOfWinds_GyorgTornado_3.bin", + "path": "maps/areas/112_PalaceOfWinds/tileSets/0/gAreaTileSet_PalaceOfWinds_0_3.4bpp.lz", "start": 5528540, "size": 548, - "type": "tileset_mapping3" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_PalaceOfWindsBoss_0_0.4bpp.lz", + "path": "maps/areas/113_PalaceOfWindsBoss/tileSets/0/gAreaTileSet_PalaceOfWindsBoss_0_0.4bpp.lz", "start": 5529088, - "size": 4886, - "type": "tileset" + "size": 4888, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_PalaceOfWindsBoss_0_1.4bpp.lz", + "path": "maps/areas/113_PalaceOfWindsBoss/tileSets/0/gAreaTileSet_PalaceOfWindsBoss_0_1.4bpp.lz", "variants": [ "DEMO_JP", "JP", "EU" ], "start": 5533976, - "size": 4171, - "type": "tileset" + "size": 4172, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_PalaceOfWindsBoss_0_1.4bpp.lz", + "path": "maps/areas/113_PalaceOfWindsBoss/tileSets/0/gAreaTileSet_PalaceOfWindsBoss_0_1.4bpp.lz", "variants": [ "DEMO_USA", "USA" ], "start": 5533976, - "size": 4055, - "type": "tileset" + "size": 4056, + "type": "subTileSet" }, { "offsets": { @@ -8104,3036 +8668,3627 @@ } }, { - "path": "assets/gAreaMetatiles_PalaceOfWindsBoss_0.bin", + "path": "maps/areas/113_PalaceOfWindsBoss/tileSet/gAreaTileSet_PalaceOfWindsBoss_top.bin.lz", "start": 5538032, - "size": 70, - "type": "metatiles_tileset1" + "size": 72, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_PalaceOfWindsBoss_1.bin", + "path": "maps/areas/113_PalaceOfWindsBoss/tileSet/gAreaTileSetTypes_PalaceOfWindsBoss_top.bin.lz", "start": 5538104, - "size": 25, - "type": "metatiles_tile_types1" + "size": 28, + "type": "tileSet_types" }, { - "path": "assets/unknown_134.bin", + "path": "maps/areas/113_PalaceOfWindsBoss/mappings/gyorgMapping_2_bottom.bin.lz", "start": 5538132, - "size": 3628, - "type": "unknown" + "size": 916, + "type": "map_mapping2" }, { - "path": "assets/gAreaTileset_PalaceOfWindsBoss_0_2.bin", + "path": "maps/areas/113_PalaceOfWindsBoss/mappings/gyorgMapping_3_bottom.bin.lz", + "start": 5539048, + "size": 900, + "type": "map_mapping2" + }, + { + "path": "maps/areas/113_PalaceOfWindsBoss/mappings/gyorgMapping_1_bottom.bin.lz", + "start": 5539948, + "size": 896, + "type": "map_mapping2" + }, + { + "path": "maps/areas/113_PalaceOfWindsBoss/mappings/gyorgMapping_0_bottom.bin.lz", + "start": 5540844, + "size": 916, + "type": "map_mapping2" + }, + { + "path": "maps/areas/113_PalaceOfWindsBoss/tileSets/0/gAreaTileSet_PalaceOfWindsBoss_0_2.4bpp.lz", "start": 5541760, "size": 548, - "type": "tileset_mapping3" + "type": "subTileSet" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_GyorgTornado_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/00_GyorgTornado/gAreaRoomMap_PalaceOfWinds_GyorgTornado_bottom.bin.lz", "start": 5542308, - "size": 829, - "type": "map_layer2" + "size": 832, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_GyorgTornado_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/00_GyorgTornado/gAreaRoomMap_PalaceOfWinds_GyorgTornado_top.bin.lz", "start": 5543140, - "size": 426, - "type": "map_layer1" + "size": 428, + "type": "tileMap" }, { - "path": "assets/unknown_135.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/00_GyorgTornado/dungeon_map.bin", "start": 5543568, "size": 360, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 12, + "height": 30 + }, + "name": "gDungeonMaps_PalaceOfWinds_GyorgTornado" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_BossKey_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/01_BossKey/gAreaRoomMap_PalaceOfWinds_BossKey_bottom.bin.lz", "start": 5543928, - "size": 237, - "type": "map_layer2" + "size": 240, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_BossKey_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/01_BossKey/gAreaRoomMap_PalaceOfWinds_BossKey_top.bin.lz", "start": 5544168, - "size": 53, - "type": "map_layer1" + "size": 56, + "type": "tileMap" }, { - "path": "assets/unknown_136.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/01_BossKey/dungeon_map.bin", "start": 5544224, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_BossKey" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/02_BeforeBallAndChainSoldiers/gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_bottom.bin.lz", "start": 5544264, "size": 344, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/02_BeforeBallAndChainSoldiers/gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_top.bin.lz", "start": 5544608, - "size": 101, - "type": "map_layer1" + "size": 104, + "type": "tileMap" }, { - "path": "assets/unknown_137.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/02_BeforeBallAndChainSoldiers/dungeon_map.bin", "start": 5544712, "size": 56, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 14 + }, + "name": "gDungeonMaps_PalaceOfWinds_BeforeBallAndChainSoldiers" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/03_GyorgBossDoor/gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_bottom.bin.lz", "start": 5544768, - "size": 582, - "type": "map_layer2" + "size": 584, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/03_GyorgBossDoor/gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_top.bin.lz", "start": 5545352, "size": 224, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_138.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/03_GyorgBossDoor/dungeon_map.bin", "start": 5545576, "size": 120, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 12, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_GyorgBossDoor" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/04_EastChestFromGyorgBossDoor/gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_bottom.bin.lz", "start": 5545696, - "size": 201, - "type": "map_layer2" + "size": 204, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/04_EastChestFromGyorgBossDoor/gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_top.bin.lz", "start": 5545900, - "size": 49, - "type": "map_layer1" + "size": 52, + "type": "tileMap" }, { - "path": "assets/unknown_139.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/04_EastChestFromGyorgBossDoor/dungeon_map.bin", "start": 5545952, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_EastChestFromGyorgBossDoor" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/05_MoblinAndWizzrobeFight/gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_bottom.bin.lz", "start": 5545992, - "size": 517, - "type": "map_layer2" + "size": 520, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/05_MoblinAndWizzrobeFight/gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_top.bin.lz", "start": 5546512, - "size": 169, - "type": "map_layer1" + "size": 172, + "type": "tileMap" }, { - "path": "assets/unknown_140.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/05_MoblinAndWizzrobeFight/dungeon_map.bin", "start": 5546684, "size": 120, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 30 + }, + "name": "gDungeonMaps_PalaceOfWinds_MoblinAndWizzrobeFight" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/06_FourButtonStalfos/gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_bottom.bin.lz", "start": 5546804, - "size": 493, - "type": "map_layer2" + "size": 496, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/06_FourButtonStalfos/gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_top.bin.lz", "start": 5547300, - "size": 166, - "type": "map_layer1" + "size": 168, + "type": "tileMap" }, { - "path": "assets/unknown_141.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/06_FourButtonStalfos/dungeon_map.bin", "start": 5547468, "size": 120, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 30 + }, + "name": "gDungeonMaps_PalaceOfWinds_FourButtonStalfos" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/07_FanAndKeyToBossKey/gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_bottom.bin.lz", "start": 5547588, - "size": 517, - "type": "map_layer2" + "size": 520, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/07_FanAndKeyToBossKey/gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_top.bin.lz", "start": 5548108, - "size": 183, - "type": "map_layer1" + "size": 184, + "type": "tileMap" }, { - "path": "assets/unknown_142.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/07_FanAndKeyToBossKey/dungeon_map.bin", "start": 5548292, "size": 120, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 30 + }, + "name": "gDungeonMaps_PalaceOfWinds_FanAndKeyToBossKey" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/08_BallAndChainSoldiers/gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_bottom.bin.lz", "start": 5548412, - "size": 387, - "type": "map_layer2" + "size": 388, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/08_BallAndChainSoldiers/gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_top.bin.lz", "start": 5548800, - "size": 186, - "type": "map_layer1" + "size": 188, + "type": "tileMap" }, { - "path": "assets/unknown_143.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/08_BallAndChainSoldiers/dungeon_map.bin", "start": 5548988, "size": 80, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_BallAndChainSoldiers" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_BombarossaPath_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/09_BombarossaPath/gAreaRoomMap_PalaceOfWinds_BombarossaPath_bottom.bin.lz", "start": 5549068, - "size": 214, - "type": "map_layer2" + "size": 216, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_BombarossaPath_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/09_BombarossaPath/gAreaRoomMap_PalaceOfWinds_BombarossaPath_top.bin.lz", "start": 5549284, "size": 60, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_144.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/09_BombarossaPath/dungeon_map.bin", "start": 5549344, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_BombarossaPath" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_HoleToDarknut_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/10_HoleToDarknut/gAreaRoomMap_PalaceOfWinds_HoleToDarknut_bottom.bin.lz", "start": 5549384, - "size": 253, - "type": "map_layer2" + "size": 256, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_HoleToDarknut_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/10_HoleToDarknut/gAreaRoomMap_PalaceOfWinds_HoleToDarknut_top.bin.lz", "start": 5549640, - "size": 127, - "type": "map_layer1" + "size": 128, + "type": "tileMap" }, { - "path": "assets/unknown_145.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/10_HoleToDarknut/dungeon_map.bin", "start": 5549768, "size": 52, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 13 + }, + "name": "gDungeonMaps_PalaceOfWinds_HoleToDarknut" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/11_ToBombarossaPath/gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_bottom.bin.lz", "start": 5549820, - "size": 225, - "type": "map_layer2" + "size": 228, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/11_ToBombarossaPath/gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_top.bin.lz", "start": 5550048, - "size": 81, - "type": "map_layer1" + "size": 84, + "type": "tileMap" }, { - "path": "assets/unknown_146.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/11_ToBombarossaPath/dungeon_map.bin", "start": 5550132, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_ToBombarossaPath" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/12_DarknutMiniboss/gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_bottom.bin.lz", "start": 5550172, - "size": 195, - "type": "map_layer2" + "size": 196, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/12_DarknutMiniboss/gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_top.bin.lz", "start": 5550368, "size": 64, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_147.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/12_DarknutMiniboss/dungeon_map.bin", "start": 5550432, "size": 64, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 16 + }, + "name": "gDungeonMaps_PalaceOfWinds_DarknutMiniboss" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_BombWallInside_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/13_BombWallInside/gAreaRoomMap_PalaceOfWinds_BombWallInside_bottom.bin.lz", "start": 5550496, - "size": 221, - "type": "map_layer2" + "size": 224, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_BombWallInside_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/13_BombWallInside/gAreaRoomMap_PalaceOfWinds_BombWallInside_top.bin.lz", "start": 5550720, - "size": 83, - "type": "map_layer1" + "size": 84, + "type": "tileMap" }, { - "path": "assets/unknown_148.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/13_BombWallInside/dungeon_map.bin", "start": 5550804, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_BombWallInside" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_BombWallOutside_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/14_BombWallOutside/gAreaRoomMap_PalaceOfWinds_BombWallOutside_bottom.bin.lz", "start": 5550844, "size": 304, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_BombWallOutside_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/14_BombWallOutside/gAreaRoomMap_PalaceOfWinds_BombWallOutside_top.bin.lz", "start": 5551148, - "size": 89, - "type": "map_layer1" + "size": 92, + "type": "tileMap" }, { - "path": "assets/unknown_149.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/14_BombWallOutside/dungeon_map.bin", "start": 5551240, "size": 80, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_BombWallOutside" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_CloudJumps_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/15_CloudJumps/gAreaRoomMap_PalaceOfWinds_CloudJumps_bottom.bin.lz", "start": 5551320, - "size": 582, - "type": "map_layer2" + "size": 584, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_CloudJumps_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/15_CloudJumps/gAreaRoomMap_PalaceOfWinds_CloudJumps_top.bin.lz", "start": 5551904, - "size": 321, - "type": "map_layer1" + "size": 324, + "type": "tileMap" }, { - "path": "assets/unknown_150.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/15_CloudJumps/dungeon_map.bin", "start": 5552228, "size": 240, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 12, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_CloudJumps" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/16_BlockMazeToBossDoor/gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_bottom.bin.lz", "start": 5552468, - "size": 817, - "type": "map_layer2" + "size": 820, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/16_BlockMazeToBossDoor/gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_top.bin.lz", "start": 5553288, - "size": 334, - "type": "map_layer1" + "size": 336, + "type": "tileMap" }, { - "path": "assets/unknown_151.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/16_BlockMazeToBossDoor/dungeon_map.bin", "start": 5553624, "size": 360, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 12, + "height": 30 + }, + "name": "gDungeonMaps_PalaceOfWinds_BlockMazeToBossDoor" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/17_CrackedFloorLakitu/gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_bottom.bin.lz", "start": 5553984, - "size": 523, - "type": "map_layer2" + "size": 524, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/17_CrackedFloorLakitu/gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_top.bin.lz", "start": 5554508, - "size": 147, - "type": "map_layer1" + "size": 148, + "type": "tileMap" }, { - "path": "assets/unknown_152.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/17_CrackedFloorLakitu/dungeon_map.bin", "start": 5554656, "size": 120, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 30 + }, + "name": "gDungeonMaps_PalaceOfWinds_CrackedFloorLakitu" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/18_HeartPieceBridge/gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_bottom.bin.lz", "start": 5554776, - "size": 235, - "type": "map_layer2" + "size": 236, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/18_HeartPieceBridge/gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_top.bin.lz", "start": 5555012, "size": 116, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_153.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/18_HeartPieceBridge/dungeon_map.bin", "start": 5555128, "size": 80, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_HeartPieceBridge" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_FanBridge_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/19_FanBridge/gAreaRoomMap_PalaceOfWinds_FanBridge_bottom.bin.lz", "start": 5555208, - "size": 583, - "type": "map_layer2" + "size": 584, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_FanBridge_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/19_FanBridge/gAreaRoomMap_PalaceOfWinds_FanBridge_top.bin.lz", "start": 5555792, - "size": 295, - "type": "map_layer1" + "size": 296, + "type": "tileMap" }, { - "path": "assets/unknown_154.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/19_FanBridge/dungeon_map.bin", "start": 5556088, "size": 160, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_FanBridge" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_ToFanBridge_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/20_ToFanBridge/gAreaRoomMap_PalaceOfWinds_ToFanBridge_bottom.bin.lz", "start": 5556248, - "size": 371, - "type": "map_layer2" + "size": 372, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_ToFanBridge_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/20_ToFanBridge/gAreaRoomMap_PalaceOfWinds_ToFanBridge_top.bin.lz", "start": 5556620, - "size": 79, - "type": "map_layer1" + "size": 80, + "type": "tileMap" }, { - "path": "assets/unknown_155.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/20_ToFanBridge/dungeon_map.bin", "start": 5556700, "size": 80, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_ToFanBridge" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_RedWarpHall_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/21_RedWarpHall/gAreaRoomMap_PalaceOfWinds_RedWarpHall_bottom.bin.lz", "start": 5556780, - "size": 998, - "type": "map_layer2" + "size": 1000, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_RedWarpHall_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/21_RedWarpHall/gAreaRoomMap_PalaceOfWinds_RedWarpHall_top.bin.lz", "start": 5557780, - "size": 329, - "type": "map_layer1" + "size": 332, + "type": "tileMap" }, { - "path": "assets/unknown_156.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/21_RedWarpHall/dungeon_map.bin", "start": 5558112, "size": 240, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 12, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_RedWarpHall" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/22_PlatformCloneRide/gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_bottom.bin.lz", "start": 5558352, "size": 588, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/22_PlatformCloneRide/gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_top.bin.lz", "start": 5558940, - "size": 301, - "type": "map_layer1" + "size": 304, + "type": "tileMap" }, { - "path": "assets/unknown_157.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/22_PlatformCloneRide/dungeon_map.bin", "start": 5559244, "size": 160, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_PlatformCloneRide" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/23_PitCornerAfterKey/gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_bottom.bin.lz", "start": 5559404, - "size": 207, - "type": "map_layer2" + "size": 208, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/23_PitCornerAfterKey/gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_top.bin.lz", "start": 5559612, - "size": 83, - "type": "map_layer1" + "size": 84, + "type": "tileMap" }, { - "path": "assets/unknown_158.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/23_PitCornerAfterKey/dungeon_map.bin", "start": 5559696, "size": 80, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_PitCornerAfterKey" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_CrowRide_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/24_PlatformCrowRide/gAreaRoomMap_PalaceOfWinds_PlatformCrowRide_bottom.bin.lz", "start": 5559776, - "size": 383, - "type": "map_layer2" + "size": 384, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_CrowRide_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/24_PlatformCrowRide/gAreaRoomMap_PalaceOfWinds_PlatformCrowRide_top.bin.lz", "start": 5560160, - "size": 198, - "type": "map_layer1" + "size": 200, + "type": "tileMap" }, { - "path": "assets/unknown_159.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/24_PlatformCrowRide/dungeon_map.bin", "start": 5560360, "size": 160, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 40 + }, + "name": "gDungeonMaps_PalaceOfWinds_PlatformCrowRide" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_GratePlatformRide_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/25_GratePlatformRide/gAreaRoomMap_PalaceOfWinds_GratePlatformRide_bottom.bin.lz", "start": 5560520, - "size": 425, - "type": "map_layer2" + "size": 428, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_GratePlatformRide_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/25_GratePlatformRide/gAreaRoomMap_PalaceOfWinds_GratePlatformRide_top.bin.lz", "start": 5560948, "size": 264, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_160.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/25_GratePlatformRide/dungeon_map.bin", "start": 5561212, "size": 160, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_GratePlatformRide" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_PotPush_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/26_PotPush/gAreaRoomMap_PalaceOfWinds_PotPush_bottom.bin.lz", "start": 5561372, "size": 620, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_PotPush_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/26_PotPush/gAreaRoomMap_PalaceOfWinds_PotPush_top.bin.lz", "start": 5561992, - "size": 302, - "type": "map_layer1" + "size": 304, + "type": "tileMap" }, { - "path": "assets/unknown_161.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/26_PotPush/dungeon_map.bin", "start": 5562296, "size": 160, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_PotPush" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_FloormasterLever_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/27_FloormasterLever/gAreaRoomMap_PalaceOfWinds_FloormasterLever_bottom.bin.lz", "start": 5562456, - "size": 215, - "type": "map_layer2" + "size": 216, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_FloormasterLever_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/27_FloormasterLever/gAreaRoomMap_PalaceOfWinds_FloormasterLever_top.bin.lz", "start": 5562672, - "size": 97, - "type": "map_layer1" + "size": 100, + "type": "tileMap" }, { - "path": "assets/unknown_162.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/27_FloormasterLever/dungeon_map.bin", "start": 5562772, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_FloormasterLever" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_Map_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/28_Map/gAreaRoomMap_PalaceOfWinds_Map_bottom.bin.lz", "start": 5562812, "size": 232, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_Map_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/28_Map/gAreaRoomMap_PalaceOfWinds_Map_top.bin.lz", "start": 5563044, - "size": 55, - "type": "map_layer1" + "size": 56, + "type": "tileMap" }, { - "path": "assets/unknown_163.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/28_Map/dungeon_map.bin", "start": 5563100, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_Map" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_CornerToMap_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/29_CornerToMap/gAreaRoomMap_PalaceOfWinds_CornerToMap_bottom.bin.lz", "start": 5563140, - "size": 215, - "type": "map_layer2" + "size": 216, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_CornerToMap_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/29_CornerToMap/gAreaRoomMap_PalaceOfWinds_CornerToMap_top.bin.lz", "start": 5563356, "size": 88, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_164.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/29_CornerToMap/dungeon_map.bin", "start": 5563444, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_CornerToMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/30_StairsAfterFloormaster/gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_bottom.bin.lz", "start": 5563484, - "size": 223, - "type": "map_layer2" + "size": 224, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/30_StairsAfterFloormaster/gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_top.bin.lz", "start": 5563708, - "size": 81, - "type": "map_layer1" + "size": 84, + "type": "tileMap" }, { - "path": "assets/unknown_165.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/30_StairsAfterFloormaster/dungeon_map.bin", "start": 5563792, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_StairsAfterFloormaster" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/31_HoleToKinstoneWizzrobe/gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_bottom.bin.lz", "start": 5563832, - "size": 205, - "type": "map_layer2" + "size": 208, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/31_HoleToKinstoneWizzrobe/gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_top.bin.lz", "start": 5564040, - "size": 70, - "type": "map_layer1" + "size": 72, + "type": "tileMap" }, { - "path": "assets/unknown_166.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/31_HoleToKinstoneWizzrobe/dungeon_map.bin", "start": 5564112, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_HoleToKinstoneWizzrobe" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_KeyArrowButton_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/32_KeyArrowButton/gAreaRoomMap_PalaceOfWinds_KeyArrowButton_bottom.bin.lz", "start": 5564152, - "size": 209, - "type": "map_layer2" + "size": 212, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_KeyArrowButton_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/32_KeyArrowButton/gAreaRoomMap_PalaceOfWinds_KeyArrowButton_top.bin.lz", "start": 5564364, - "size": 75, - "type": "map_layer1" + "size": 76, + "type": "tileMap" }, { - "path": "assets/unknown_167.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/32_KeyArrowButton/dungeon_map.bin", "start": 5564440, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_KeyArrowButton" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_GratesTo3F_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/33_GratesTo3f/gAreaRoomMap_PalaceOfWinds_GratesTo3f_bottom.bin.lz", "start": 5564480, "size": 916, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_GratesTo3F_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/33_GratesTo3f/gAreaRoomMap_PalaceOfWinds_GratesTo3f_top.bin.lz", "start": 5565396, - "size": 506, - "type": "map_layer1" + "size": 508, + "type": "tileMap" }, { - "path": "assets/unknown_168.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/33_GratesTo3f/dungeon_map.bin", "start": 5565904, "size": 360, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 12, + "height": 30 + }, + "name": "gDungeonMaps_PalaceOfWinds_GratesTo3f" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_SpinyFight_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/34_SpinyFight/gAreaRoomMap_PalaceOfWinds_SpinyFight_bottom.bin.lz", "start": 5566264, - "size": 778, - "type": "map_layer2" + "size": 780, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_SpinyFight_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/34_SpinyFight/gAreaRoomMap_PalaceOfWinds_SpinyFight_top.bin.lz", "start": 5567044, "size": 332, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_169.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/34_SpinyFight/dungeon_map.bin", "start": 5567376, "size": 240, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 30 + }, + "name": "gDungeonMaps_PalaceOfWinds_SpinyFight" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_PeahatSwitch_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/35_PeahatSwitch/gAreaRoomMap_PalaceOfWinds_PeahatSwitch_bottom.bin.lz", "start": 5567616, - "size": 369, - "type": "map_layer2" + "size": 372, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_PeahatSwitch_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/35_PeahatSwitch/gAreaRoomMap_PalaceOfWinds_PeahatSwitch_top.bin.lz", "start": 5567988, - "size": 143, - "type": "map_layer1" + "size": 144, + "type": "tileMap" }, { - "path": "assets/unknown_170.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/35_PeahatSwitch/dungeon_map.bin", "start": 5568132, "size": 80, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_PeahatSwitch" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/36_WhirlwindBombarossa/gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_bottom.bin.lz", "start": 5568212, - "size": 390, - "type": "map_layer2" + "size": 392, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/36_WhirlwindBombarossa/gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_top.bin.lz", "start": 5568604, "size": 172, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_171.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/36_WhirlwindBombarossa/dungeon_map.bin", "start": 5568776, "size": 160, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_WhirlwindBombarossa" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/37_DoorToStalfosFirebar/gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_bottom.bin.lz", "start": 5568936, - "size": 254, - "type": "map_layer2" + "size": 256, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/37_DoorToStalfosFirebar/gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_top.bin.lz", "start": 5569192, - "size": 77, - "type": "map_layer1" + "size": 80, + "type": "tileMap" }, { - "path": "assets/unknown_172.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/37_DoorToStalfosFirebar/dungeon_map.bin", "start": 5569272, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_DoorToStalfosFirebar" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_StalfosFireborHole_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/38_StalfosFirebarHole/gAreaRoomMap_PalaceOfWinds_StalfosFirebarHole_bottom.bin.lz", "start": 5569312, - "size": 274, - "type": "map_layer2" + "size": 276, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_StalfosFireborHole_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/38_StalfosFirebarHole/gAreaRoomMap_PalaceOfWinds_StalfosFirebarHole_top.bin.lz", "start": 5569588, - "size": 55, - "type": "map_layer1" + "size": 56, + "type": "tileMap" }, { - "path": "assets/unknown_173.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/38_StalfosFirebarHole/dungeon_map.bin", "start": 5569644, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_StalfosFirebarHole" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/39_ShortcutDoorButtons/gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_bottom.bin.lz", "start": 5569684, "size": 248, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/39_ShortcutDoorButtons/gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_top.bin.lz", "start": 5569932, - "size": 81, - "type": "map_layer1" + "size": 84, + "type": "tileMap" }, { - "path": "assets/unknown_174.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/39_ShortcutDoorButtons/dungeon_map.bin", "start": 5570016, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_ShortcutDoorButtons" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/40_ToPeahatSwitch/gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_bottom.bin.lz", "start": 5570056, - "size": 237, - "type": "map_layer2" + "size": 240, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/40_ToPeahatSwitch/gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_top.bin.lz", "start": 5570296, - "size": 91, - "type": "map_layer1" + "size": 92, + "type": "tileMap" }, { - "path": "assets/unknown_175.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/40_ToPeahatSwitch/dungeon_map.bin", "start": 5570388, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_ToPeahatSwitch" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/41_KinstoneWizzrobeFight/gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_bottom.bin.lz", "start": 5570428, - "size": 210, - "type": "map_layer2" + "size": 212, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/41_KinstoneWizzrobeFight/gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_top.bin.lz", "start": 5570640, - "size": 86, - "type": "map_layer1" + "size": 88, + "type": "tileMap" }, { - "path": "assets/unknown_176.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/41_KinstoneWizzrobeFight/dungeon_map.bin", "start": 5570728, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_KinstoneWizzrobeFight" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_GibdoStairs_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/42_GibdoStairs/gAreaRoomMap_PalaceOfWinds_GibdoStairs_bottom.bin.lz", "start": 5570768, - "size": 235, - "type": "map_layer2" + "size": 236, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_GibdoStairs_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/42_GibdoStairs/gAreaRoomMap_PalaceOfWinds_GibdoStairs_top.bin.lz", "start": 5571004, - "size": 87, - "type": "map_layer1" + "size": 88, + "type": "tileMap" }, { - "path": "assets/unknown_177.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/42_GibdoStairs/dungeon_map.bin", "start": 5571092, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_GibdoStairs" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/43_SpikeBarSmallKey/gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_bottom.bin.lz", "start": 5571132, - "size": 346, - "type": "map_layer2" + "size": 348, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/43_SpikeBarSmallKey/gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_top.bin.lz", "start": 5571480, "size": 144, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_178.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/43_SpikeBarSmallKey/dungeon_map.bin", "start": 5571624, "size": 80, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_SpikeBarSmallKey" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_RocCape_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/44_RocCape/gAreaRoomMap_PalaceOfWinds_RocCape_bottom.bin.lz", "variants": [ "DEMO_JP", "JP", "EU" ], "start": 5571704, - "size": 737, - "type": "map_layer2" + "size": 740, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_RocCape_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/44_RocCape/gAreaRoomMap_PalaceOfWinds_RocCape_bottom.bin.lz", "variants": [ "DEMO_USA", "USA" ], "start": 5571704, - "size": 739, - "type": "map_layer2" + "size": 740, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_RocCape_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/44_RocCape/gAreaRoomMap_PalaceOfWinds_RocCape_top.bin.lz", "start": 5572444, "size": 256, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_179.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/44_RocCape/dungeon_map.bin", "start": 5572700, "size": 240, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 30 + }, + "name": "gDungeonMaps_PalaceOfWinds_RocCape" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_FireBarGrates_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/45_FireBarGrates/gAreaRoomMap_PalaceOfWinds_FireBarGrates_bottom.bin.lz", "start": 5572940, - "size": 529, - "type": "map_layer2" + "size": 532, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_FireBarGrates_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/45_FireBarGrates/gAreaRoomMap_PalaceOfWinds_FireBarGrates_top.bin.lz", "start": 5573472, - "size": 407, - "type": "map_layer1" + "size": 408, + "type": "tileMap" }, { - "path": "assets/unknown_180.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/45_FireBarGrates/dungeon_map.bin", "start": 5573880, "size": 240, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 30 + }, + "name": "gDungeonMaps_PalaceOfWinds_FireBarGrates" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/46_PlatformRideBombarossas/gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_bottom.bin.lz", "start": 5574120, - "size": 425, - "type": "map_layer2" + "size": 428, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/46_PlatformRideBombarossas/gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_top.bin.lz", "start": 5574548, "size": 208, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_181.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/46_PlatformRideBombarossas/dungeon_map.bin", "start": 5574756, "size": 200, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 40 + }, + "name": "gDungeonMaps_PalaceOfWinds_PlatformRideBombarossas" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/47_BridgeAfterDarknut/gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_bottom.bin.lz", "start": 5574956, - "size": 126, - "type": "map_layer2" + "size": 128, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/47_BridgeAfterDarknut/gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_top.bin.lz", "start": 5575084, - "size": 43, - "type": "map_layer1" + "size": 44, + "type": "tileMap" }, { - "path": "assets/unknown_182.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/47_BridgeAfterDarknut/dungeon_map.bin", "start": 5575128, "size": 40, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 10 + }, + "name": "gDungeonMaps_PalaceOfWinds_BridgeAfterDarknut" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/48_BridgeSwitchesCloneBlock/gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_bottom.bin.lz", "start": 5575168, "size": 676, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/48_BridgeSwitchesCloneBlock/gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_top.bin.lz", "start": 5575844, - "size": 159, - "type": "map_layer1" + "size": 160, + "type": "tileMap" }, { - "path": "assets/unknown_183.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/48_BridgeSwitchesCloneBlock/dungeon_map.bin", "start": 5576004, "size": 160, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 8, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_BridgeSwitchesCloneBlock" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_EntranceRoom_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/49_EntranceRoom/gAreaRoomMap_PalaceOfWinds_EntranceRoom_bottom.bin.lz", "start": 5576164, - "size": 357, - "type": "map_layer2" + "size": 360, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_EntranceRoom_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/49_EntranceRoom/gAreaRoomMap_PalaceOfWinds_EntranceRoom_top.bin.lz", "start": 5576524, - "size": 129, - "type": "map_layer1" + "size": 132, + "type": "tileMap" }, { - "path": "assets/unknown_184.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/49_EntranceRoom/dungeon_map.bin", "start": 5576656, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 12, + "height": 11 + }, + "name": "gDungeonMaps_PalaceOfWinds_EntranceRoom" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_DarkCompassHall_0.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/50_DarkCompassHall/gAreaRoomMap_PalaceOfWinds_DarkCompassHall_bottom.bin.lz", "start": 5576788, - "size": 767, - "type": "map_layer2" + "size": 768, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_PalaceOfWinds_DarkCompassHall_1.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/50_DarkCompassHall/gAreaRoomMap_PalaceOfWinds_DarkCompassHall_top.bin.lz", "start": 5577556, - "size": 342, - "type": "map_layer1" + "size": 344, + "type": "tileMap" }, { - "path": "assets/unknown_185.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/50_DarkCompassHall/dungeon_map.bin", "start": 5577900, "size": 240, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 12, + "height": 20 + }, + "name": "gDungeonMaps_PalaceOfWinds_DarkCompassHall" }, { - "path": "assets/gAreaRoomMap_PalaceOfWindsBoss_0_0.bin", + "path": "maps/areas/113_PalaceOfWindsBoss/rooms/00_0/gAreaRoomMap_PalaceOfWindsBoss_0_top.bin.lz", "start": 5578140, "size": 972, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_186.bin", + "path": "maps/areas/113_PalaceOfWindsBoss/rooms/00_0/gyorgRoomMap_1_top.bin.lz", "start": 5579112, - "size": 2904, - "type": "unknown" + "size": 968, + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_Sanctuary_0_0.4bpp.lz", + "path": "maps/areas/113_PalaceOfWindsBoss/rooms/00_0/gyorgRoomMap_2_top.bin.lz", + "start": 5580080, + "size": 968, + "type": "tileMap" + }, + { + "path": "maps/areas/113_PalaceOfWindsBoss/rooms/00_0/gyorgRoomMap_3_top.bin.lz", + "start": 5581048, + "size": 968, + "type": "tileMap" + }, + { + "path": "maps/areas/120_Sanctuary/tileSets/0/gAreaTileSet_Sanctuary_0_0.4bpp.lz", "start": 5582016, - "size": 7505, - "type": "tileset" + "size": 7508, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_Sanctuary_0_1.4bpp.lz", + "path": "maps/areas/120_Sanctuary/tileSets/0/gAreaTileSet_Sanctuary_0_1.4bpp.lz", "start": 5589524, - "size": 8322, - "type": "tileset" + "size": 8324, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_Sanctuary_0_2.4bpp.lz", + "path": "maps/areas/120_Sanctuary/tileSets/0/gAreaTileSet_Sanctuary_0_2.4bpp.lz", "start": 5597848, "size": 5104, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_Sanctuary_0.bin", + "path": "maps/areas/120_Sanctuary/tileSet/gAreaTileSet_Sanctuary_bottom.bin.lz", "start": 5602952, - "size": 7941, - "type": "metatiles_tileset2" + "size": 7944, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_Sanctuary_1.bin", + "path": "maps/areas/120_Sanctuary/tileSet/gAreaTileSet_Sanctuary_top.bin.lz", "start": 5610896, - "size": 4354, - "type": "metatiles_tileset1" + "size": 4356, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_Sanctuary_2.bin", + "path": "maps/areas/120_Sanctuary/tileSet/gAreaTileSetTypes_Sanctuary_bottom.bin.lz", "start": 5615252, - "size": 866, - "type": "metatiles_tile_types2" + "size": 868, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_Sanctuary_3.bin", + "path": "maps/areas/120_Sanctuary/tileSet/gAreaTileSetTypes_Sanctuary_top.bin.lz", "start": 5616120, "size": 756, - "type": "metatiles_tile_types1" + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_Sanctuary_0_0.bin", + "path": "maps/areas/120_Sanctuary/rooms/00_Hall/gAreaRoomMap_Sanctuary_Hall_bottom.bin.lz", "start": 5616876, - "size": 786, - "type": "map_layer2" + "size": 788, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Sanctuary_0_1.bin", + "path": "maps/areas/120_Sanctuary/rooms/00_Hall/gAreaRoomMap_Sanctuary_Hall_top.bin.lz", "start": 5617664, - "size": 246, - "type": "map_layer1" + "size": 248, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Sanctuary_1_0.bin", + "path": "maps/areas/120_Sanctuary/rooms/01_Main/gAreaRoomMap_Sanctuary_Main_bottom.bin.lz", "start": 5617912, - "size": 1289, - "type": "map_layer2" + "size": 1292, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Sanctuary_1_1.bin", + "path": "maps/areas/120_Sanctuary/rooms/01_Main/gAreaRoomMap_Sanctuary_Main_top.bin.lz", "start": 5619204, - "size": 695, - "type": "map_layer1" + "size": 696, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Sanctuary_2_0.bin", + "path": "maps/areas/120_Sanctuary/rooms/02_StainedGlass/gAreaRoomMap_Sanctuary_StainedGlass_bottom.bin.lz", "start": 5619900, - "size": 691, - "type": "map_layer2" + "size": 692, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Sanctuary_2_1.bin", + "path": "maps/areas/120_Sanctuary/rooms/02_StainedGlass/gAreaRoomMap_Sanctuary_StainedGlass_top.bin.lz", "start": 5620592, - "size": 191, - "type": "map_layer1" + "size": 192, + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_HyruleCastle_0_0.4bpp.lz", + "path": "maps/areas/128_HyruleCastle/tileSets/0/gAreaTileSet_HyruleCastle_0_0.4bpp.lz", "start": 5620784, - "size": 8590, - "type": "tileset" + "size": 8592, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_HyruleCastle_0_1.4bpp.lz", + "path": "maps/areas/128_HyruleCastle/tileSets/0/gAreaTileSet_HyruleCastle_0_1.4bpp.lz", "start": 5629376, - "size": 7541, - "type": "tileset" + "size": 7544, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_HyruleCastle_0_2.4bpp.lz", + "path": "maps/areas/128_HyruleCastle/tileSets/0/gAreaTileSet_HyruleCastle_0_2.4bpp.lz", "start": 5636920, - "size": 6489, - "type": "tileset" + "size": 6492, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_HyruleCastle_0.bin", + "path": "maps/areas/128_HyruleCastle/tileSet/gAreaTileSet_HyruleCastle_bottom.bin.lz", "start": 5643412, - "size": 7538, - "type": "metatiles_tileset2" + "size": 7540, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_HyruleCastle_1.bin", + "path": "maps/areas/128_HyruleCastle/tileSet/gAreaTileSet_HyruleCastle_top.bin.lz", "start": 5650952, - "size": 5287, - "type": "metatiles_tileset1" + "size": 5288, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_HyruleCastle_2.bin", + "path": "maps/areas/128_HyruleCastle/tileSet/gAreaTileSetTypes_HyruleCastle_bottom.bin.lz", "start": 5656240, - "size": 1066, - "type": "metatiles_tile_types2" + "size": 1068, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_HyruleCastle_3.bin", + "path": "maps/areas/128_HyruleCastle/tileSet/gAreaTileSetTypes_HyruleCastle_top.bin.lz", "start": 5657308, "size": 844, - "type": "metatiles_tile_types1" + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_HyruleCastle_0_0.bin", + "path": "maps/areas/128_HyruleCastle/rooms/00_0/gAreaRoomMap_HyruleCastle_0_bottom.bin.lz", "start": 5658152, - "size": 1002, - "type": "map_layer2" + "size": 1004, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleCastle_0_1.bin", + "path": "maps/areas/128_HyruleCastle/rooms/00_0/gAreaRoomMap_HyruleCastle_0_top.bin.lz", "start": 5659156, "size": 488, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleCastle_1_0.bin", + "path": "maps/areas/128_HyruleCastle/rooms/01_1/gAreaRoomMap_HyruleCastle_1_bottom.bin.lz", "start": 5659644, - "size": 777, - "type": "map_layer2" + "size": 780, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleCastle_1_1.bin", + "path": "maps/areas/128_HyruleCastle/rooms/01_1/gAreaRoomMap_HyruleCastle_1_top.bin.lz", "start": 5660424, "size": 396, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleCastle_2_0.bin", + "path": "maps/areas/128_HyruleCastle/rooms/02_2/gAreaRoomMap_HyruleCastle_2_bottom.bin.lz", "start": 5660820, - "size": 519, - "type": "map_layer2" + "size": 520, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleCastle_2_1.bin", + "path": "maps/areas/128_HyruleCastle/rooms/02_2/gAreaRoomMap_HyruleCastle_2_top.bin.lz", "start": 5661340, - "size": 177, - "type": "map_layer1" + "size": 180, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleCastle_3_0.bin", + "path": "maps/areas/128_HyruleCastle/rooms/03_3/gAreaRoomMap_HyruleCastle_3_bottom.bin.lz", "start": 5661520, - "size": 1195, - "type": "map_layer2" + "size": 1196, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleCastle_3_1.bin", + "path": "maps/areas/128_HyruleCastle/rooms/03_3/gAreaRoomMap_HyruleCastle_3_top.bin.lz", "start": 5662716, - "size": 469, - "type": "map_layer1" + "size": 472, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleCastle_4_0.bin", + "path": "maps/areas/128_HyruleCastle/rooms/04_4/gAreaRoomMap_HyruleCastle_4_bottom.bin.lz", "start": 5663188, - "size": 337, - "type": "map_layer2" + "size": 340, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleCastle_4_1.bin", + "path": "maps/areas/128_HyruleCastle/rooms/04_4/gAreaRoomMap_HyruleCastle_4_top.bin.lz", "start": 5663528, "size": 96, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleCastle_5_0.bin", + "path": "maps/areas/128_HyruleCastle/rooms/05_5/gAreaRoomMap_HyruleCastle_5_bottom.bin.lz", "start": 5663624, - "size": 214, - "type": "map_layer2" + "size": 216, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleCastle_5_1.bin", + "path": "maps/areas/128_HyruleCastle/rooms/05_5/gAreaRoomMap_HyruleCastle_5_top.bin.lz", "start": 5663840, - "size": 43, - "type": "map_layer1" + "size": 44, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleCastle_6_0.bin", + "path": "maps/areas/128_HyruleCastle/rooms/06_6/gAreaRoomMap_HyruleCastle_6_bottom.bin.lz", "start": 5663884, - "size": 203, - "type": "map_layer2" + "size": 204, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_HyruleCastle_6_1.bin", + "path": "maps/areas/128_HyruleCastle/rooms/06_6/gAreaRoomMap_HyruleCastle_6_top.bin.lz", "start": 5664088, - "size": 43, - "type": "map_layer1" + "size": 44, + "type": "tileMap" }, { "path": "assets/unknown_187.bin", "start": 5664132, "size": 284, - "type": "unknown" + "type": "unknown", + "TODO": "2* tileMap 11x15 or 15x11" }, { - "path": "tilesets/gAreaTileset_SanctuaryEntrance_0_0.4bpp.lz", + "path": "maps/areas/129_SanctuaryEntrance/tileSets/0/gAreaTileSet_SanctuaryEntrance_0_0.4bpp.lz", "start": 5664416, - "size": 6970, - "type": "tileset" + "size": 6972, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_SanctuaryEntrance_0_1.4bpp.lz", + "path": "maps/areas/129_SanctuaryEntrance/tileSets/0/gAreaTileSet_SanctuaryEntrance_0_1.4bpp.lz", "start": 5671388, - "size": 5610, - "type": "tileset" + "size": 5612, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_SanctuaryEntrance_0_2.4bpp.lz", + "path": "maps/areas/129_SanctuaryEntrance/tileSets/0/gAreaTileSet_SanctuaryEntrance_0_2.4bpp.lz", "start": 5677000, - "size": 3069, - "type": "tileset" + "size": 3072, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_SanctuaryEntrance_0.bin", + "path": "maps/areas/129_SanctuaryEntrance/tileSet/gAreaTileSet_SanctuaryEntrance_bottom.bin.lz", "start": 5680072, - "size": 2899, - "type": "metatiles_tileset2" + "size": 2900, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_SanctuaryEntrance_1.bin", + "path": "maps/areas/129_SanctuaryEntrance/tileSet/gAreaTileSet_SanctuaryEntrance_top.bin.lz", "start": 5682972, - "size": 893, - "type": "metatiles_tileset1" + "size": 896, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_SanctuaryEntrance_2.bin", + "path": "maps/areas/129_SanctuaryEntrance/tileSet/gAreaTileSetTypes_SanctuaryEntrance_bottom.bin.lz", "start": 5683868, - "size": 365, - "type": "metatiles_tile_types2" + "size": 368, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_SanctuaryEntrance_3.bin", + "path": "maps/areas/129_SanctuaryEntrance/tileSet/gAreaTileSetTypes_SanctuaryEntrance_top.bin.lz", "start": 5684236, - "size": 237, - "type": "metatiles_tile_types1" + "size": 240, + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_SanctuaryEntrance_0_0.bin", + "path": "maps/areas/129_SanctuaryEntrance/rooms/00_Main/gAreaRoomMap_SanctuaryEntrance_Main_bottom.bin.lz", "start": 5684476, - "size": 577, - "type": "map_layer2" + "size": 580, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_SanctuaryEntrance_0_1.bin", + "path": "maps/areas/129_SanctuaryEntrance/rooms/00_Main/gAreaRoomMap_SanctuaryEntrance_Main_top.bin.lz", "start": 5685056, - "size": 142, - "type": "map_layer1" + "size": 144, + "type": "tileMap" }, { - "path": "tilesets/gAreaTileset_DarkHyruleCastle_1FEntrance_0.4bpp.lz", + "path": "maps/areas/136_DarkHyruleCastle/tileSets/0/gAreaTileSet_DarkHyruleCastle_0_0.4bpp.lz", "start": 5685200, - "size": 8657, - "type": "tileset" + "size": 8660, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_DarkHyruleCastle_1FEntrance_1.4bpp.lz", + "path": "maps/areas/136_DarkHyruleCastle/tileSets/0/gAreaTileSet_DarkHyruleCastle_0_1.4bpp.lz", "start": 5693860, - "size": 8806, - "type": "tileset" + "size": 8808, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_DarkHyruleCastle_1FEntrance_2.4bpp.lz", + "path": "maps/areas/136_DarkHyruleCastle/tileSets/0/gAreaTileSet_DarkHyruleCastle_0_2.4bpp.lz", "start": 5702668, - "size": 8098, - "type": "tileset" + "size": 8100, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_DarkHyruleCastle_1FEntrance.bin", + "path": "maps/areas/136_DarkHyruleCastle/tileSet/gAreaTileSet_DarkHyruleCastle_bottom.bin.lz", "start": 5710768, - "size": 11581, - "type": "metatiles_tileset2" + "size": 11584, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_DarkHyruleCastle_3FTopLeftTower.bin", + "path": "maps/areas/136_DarkHyruleCastle/tileSet/gAreaTileSet_DarkHyruleCastle_top.bin.lz", "start": 5722352, "size": 7796, - "type": "metatiles_tileset1" + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_DarkHyruleCastle_3FTopRightTower.bin", + "path": "maps/areas/136_DarkHyruleCastle/tileSet/gAreaTileSetTypes_DarkHyruleCastle_bottom.bin.lz", "start": 5730148, - "size": 1413, - "type": "metatiles_tile_types2" + "size": 1416, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_DarkHyruleCastle_3FBottomLeftTower.bin", + "path": "maps/areas/136_DarkHyruleCastle/tileSet/gAreaTileSetTypes_DarkHyruleCastle_top.bin.lz", "start": 5731564, - "size": 1263, - "type": "metatiles_tile_types1" + "size": 1264, + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_DarkHyruleCastleBridge_0_0.4bpp.lz", + "path": "maps/areas/141_DarkHyruleCastleBridge/tileSets/0/gAreaTileSet_DarkHyruleCastleBridge_0_0.4bpp.lz", "start": 5732828, - "size": 4386, - "type": "tileset" + "size": 4388, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_DarkHyruleCastleBridge_0_1.4bpp.lz", + "path": "maps/areas/141_DarkHyruleCastleBridge/tileSets/0/gAreaTileSet_DarkHyruleCastleBridge_0_1.4bpp.lz", "start": 5737216, - "size": 5945, - "type": "tileset" + "size": 5948, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_DarkHyruleCastleBridge_0_2.4bpp.lz", + "path": "maps/areas/141_DarkHyruleCastleBridge/tileSets/0/gAreaTileSet_DarkHyruleCastleBridge_0_2.4bpp.lz", "start": 5743164, - "size": 3769, - "type": "tileset" + "size": 3772, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_DarkHyruleCastleBridge_0.bin", + "path": "maps/areas/141_DarkHyruleCastleBridge/tileSet/gAreaTileSet_DarkHyruleCastleBridge_bottom.bin.lz", "start": 5746936, - "size": 3549, - "type": "metatiles_tileset2" + "size": 3552, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_DarkHyruleCastleBridge_1.bin", + "path": "maps/areas/141_DarkHyruleCastleBridge/tileSet/gAreaTileSet_DarkHyruleCastleBridge_top.bin.lz", "start": 5750488, - "size": 2319, - "type": "metatiles_tileset1" + "size": 2320, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_DarkHyruleCastleBridge_2.bin", + "path": "maps/areas/141_DarkHyruleCastleBridge/tileSet/gAreaTileSetTypes_DarkHyruleCastleBridge_bottom.bin.lz", "start": 5752808, "size": 628, - "type": "metatiles_tile_types2" + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_DarkHyruleCastleBridge_3.bin", + "path": "maps/areas/141_DarkHyruleCastleBridge/tileSet/gAreaTileSetTypes_DarkHyruleCastleBridge_top.bin.lz", "start": 5753436, - "size": 534, - "type": "metatiles_tile_types1" + "size": 536, + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_Vaati3_0_0.4bpp.lz", + "path": "maps/areas/139_Vaati3/tileSets/0/gAreaTileSet_Vaati3_0_0.4bpp.lz", "start": 5753972, - "size": 4362, - "type": "tileset" + "size": 4364, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_Vaati3_0_1.4bpp.lz", + "path": "maps/areas/139_Vaati3/tileSets/0/gAreaTileSet_Vaati3_0_1.4bpp.lz", "start": 5758336, - "size": 4633, - "type": "tileset" + "size": 4636, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_Vaati3_0_2.4bpp.lz", + "path": "maps/areas/139_Vaati3/tileSets/0/gAreaTileSet_Vaati3_0_2.4bpp.lz", "start": 5762972, - "size": 8707, - "type": "tileset" + "size": 8708, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_Vaati3_0.bin", + "path": "maps/areas/139_Vaati3/tileSet/gAreaTileSet_Vaati3_bottom.bin.lz", "start": 5771680, - "size": 1718, - "type": "metatiles_tileset2" + "size": 1720, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_Vaati3_1.bin", + "path": "maps/areas/139_Vaati3/tileSet/gAreaTileSet_Vaati3_top.bin.lz", "start": 5773400, "size": 476, - "type": "metatiles_tileset1" + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_Vaati3_2.bin", + "path": "maps/areas/139_Vaati3/tileSet/gAreaTileSetTypes_Vaati3_bottom.bin.lz", "start": 5773876, - "size": 210, - "type": "metatiles_tile_types2" + "size": 212, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_Vaati3_3.bin", + "path": "maps/areas/139_Vaati3/tileSet/gAreaTileSetTypes_Vaati3_top.bin.lz", "start": 5774088, - "size": 143, - "type": "metatiles_tile_types1" + "size": 144, + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_Vaati2_0_0.4bpp.lz", + "path": "maps/areas/140_Vaati2/tileSets/0/gAreaTileSet_Vaati2_0_0.4bpp.lz", "start": 5774232, "size": 2784, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_Vaati2_0_1.4bpp.lz", + "path": "maps/areas/140_Vaati2/tileSets/0/gAreaTileSet_Vaati2_0_1.4bpp.lz", "start": 5777016, - "size": 4679, - "type": "tileset" + "size": 4680, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_Vaati2_0_2.4bpp.lz", + "path": "maps/areas/140_Vaati2/tileSets/0/gAreaTileSet_Vaati2_0_2.4bpp.lz", "start": 5781696, "size": 6676, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_Vaati2_0.bin", + "path": "maps/areas/140_Vaati2/tileSet/gAreaTileSet_Vaati2_bottom.bin.lz", "start": 5788372, - "size": 1065, - "type": "metatiles_tileset2" + "size": 1068, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_Vaati2_1.bin", + "path": "maps/areas/140_Vaati2/tileSet/gAreaTileSet_Vaati2_top.bin.lz", "start": 5789440, - "size": 157, - "type": "metatiles_tileset1" + "size": 160, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_Vaati2_2.bin", + "path": "maps/areas/140_Vaati2/tileSet/gAreaTileSetTypes_Vaati2_bottom.bin.lz", "start": 5789600, - "size": 121, - "type": "metatiles_tile_types2" + "size": 124, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_Vaati2_3.bin", + "path": "maps/areas/140_Vaati2/tileSet/gAreaTileSetTypes_Vaati2_top.bin.lz", "start": 5789724, - "size": 77, - "type": "metatiles_tile_types1" + "size": 80, + "type": "tileSet_types" }, { - "path": "tilesets/gAreaTileset_VaatisArms_0_0.4bpp.lz", + "path": "maps/areas/138_VaatisArms/tileSets/0/gAreaTileSet_VaatisArms_0_0.4bpp.lz", "start": 5789804, - "size": 6054, - "type": "tileset" + "size": 6056, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_VaatisArms_0_1.4bpp.lz", + "path": "maps/areas/138_VaatisArms/tileSets/0/gAreaTileSet_VaatisArms_0_1.4bpp.lz", "start": 5795860, - "size": 2513, - "type": "tileset" + "size": 2516, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_VaatisArms_0_2.4bpp.lz", + "path": "maps/areas/138_VaatisArms/tileSets/0/gAreaTileSet_VaatisArms_0_2.4bpp.lz", "start": 5798376, - "size": 3574, - "type": "tileset" + "size": 3576, + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_VaatisArms_0.bin", + "path": "maps/areas/138_VaatisArms/tileSet/gAreaTileSet_VaatisArms_bottom.bin.lz", "start": 5801952, - "size": 3269, - "type": "metatiles_tileset2" + "size": 3272, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_VaatisArms_1.bin", + "path": "maps/areas/138_VaatisArms/tileSet/gAreaTileSet_VaatisArms_top.bin.lz", "start": 5805224, - "size": 898, - "type": "metatiles_tileset1" + "size": 900, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_VaatisArms_2.bin", + "path": "maps/areas/138_VaatisArms/tileSet/gAreaTileSetTypes_VaatisArms_bottom.bin.lz", "start": 5806124, - "size": 259, - "type": "metatiles_tile_types2" + "size": 260, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_VaatisArms_3.bin", + "path": "maps/areas/138_VaatisArms/tileSet/gAreaTileSetTypes_VaatisArms_top.bin.lz", "start": 5806384, "size": 168, - "type": "metatiles_tile_types1" + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FEntrance_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/00_1fEntrance/gAreaRoomMap_DarkHyruleCastle_1fEntrance_bottom.bin.lz", "start": 5806552, - "size": 1154, - "type": "map_layer2" + "size": 1156, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FEntrance_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/00_1fEntrance/gAreaRoomMap_DarkHyruleCastle_1fEntrance_top.bin.lz", "start": 5807708, - "size": 634, - "type": "map_layer1" + "size": 636, + "type": "tileMap" }, { - "path": "assets/unknown_188.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/00_1fEntrance/dungeon_map.bin", "start": 5808344, "size": 468, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 13, + "height": 36 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fEntrance" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/01_3fTopLeftTower/gAreaRoomMap_DarkHyruleCastle_3fTopLeftTower_bottom.bin.lz", "start": 5808812, - "size": 217, - "type": "map_layer2" + "size": 220, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/01_3fTopLeftTower/gAreaRoomMap_DarkHyruleCastle_3fTopLeftTower_top.bin.lz", "start": 5809032, - "size": 123, - "type": "map_layer1" + "size": 124, + "type": "tileMap" }, { - "path": "assets/unknown_189.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/01_3fTopLeftTower/dungeon_map.bin", "start": 5809156, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_3fTopLeftTower" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/02_3fTopRightTower/gAreaRoomMap_DarkHyruleCastle_3fTopRightTower_bottom.bin.lz", "start": 5809224, - "size": 221, - "type": "map_layer2" + "size": 224, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/02_3fTopRightTower/gAreaRoomMap_DarkHyruleCastle_3fTopRightTower_top.bin.lz", "start": 5809448, - "size": 142, - "type": "map_layer1" + "size": 144, + "type": "tileMap" }, { - "path": "assets/unknown_190.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/02_3fTopRightTower/dungeon_map.bin", "start": 5809592, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_3fTopRightTower" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/03_3fBottomLeftTower/gAreaRoomMap_DarkHyruleCastle_3fBottomLeftTower_bottom.bin.lz", "start": 5809660, - "size": 239, - "type": "map_layer2" + "size": 240, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/03_3fBottomLeftTower/gAreaRoomMap_DarkHyruleCastle_3fBottomLeftTower_top.bin.lz", "start": 5809900, - "size": 135, - "type": "map_layer1" + "size": 136, + "type": "tileMap" }, { - "path": "assets/unknown_191.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/03_3fBottomLeftTower/dungeon_map.bin", "start": 5810036, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_3fBottomLeftTower" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/04_3fBottomRightTower/gAreaRoomMap_DarkHyruleCastle_3fBottomRightTower_bottom.bin.lz", "start": 5810104, "size": 244, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/04_3fBottomRightTower/gAreaRoomMap_DarkHyruleCastle_3fBottomRightTower_top.bin.lz", "start": 5810348, - "size": 138, - "type": "map_layer1" + "size": 140, + "type": "tileMap" }, { - "path": "assets/unknown_192.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/04_3fBottomRightTower/dungeon_map.bin", "start": 5810488, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_3fBottomRightTower" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/05_3fKeatonHallToVaati/gAreaRoomMap_DarkHyruleCastle_3fKeatonHallToVaati_bottom.bin.lz", "start": 5810556, - "size": 546, - "type": "map_layer2" + "size": 548, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/05_3fKeatonHallToVaati/gAreaRoomMap_DarkHyruleCastle_3fKeatonHallToVaati_top.bin.lz", "start": 5811104, - "size": 177, - "type": "map_layer1" + "size": 180, + "type": "tileMap" }, { - "path": "assets/unknown_193.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/05_3fKeatonHallToVaati/dungeon_map.bin", "start": 5811284, "size": 156, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 26 + }, + "name": "gDungeonMaps_DarkHyruleCastle_3fKeatonHallToVaati" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/06_3fTripleDarknut/gAreaRoomMap_DarkHyruleCastle_3fTripleDarknut_bottom.bin.lz", "start": 5811440, "size": 404, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/06_3fTripleDarknut/gAreaRoomMap_DarkHyruleCastle_3fTripleDarknut_top.bin.lz", "start": 5811844, - "size": 157, - "type": "map_layer1" + "size": 160, + "type": "tileMap" }, { - "path": "assets/unknown_194.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/06_3fTripleDarknut/dungeon_map.bin", "start": 5812004, "size": 96, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 6, + "height": 16 + }, + "name": "gDungeonMaps_DarkHyruleCastle_3fTripleDarknut" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/07_2fTopLeftTower/gAreaRoomMap_DarkHyruleCastle_2fTopLeftTower_bottom.bin.lz", "start": 5812100, - "size": 329, - "type": "map_layer2" + "size": 332, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/07_2fTopLeftTower/gAreaRoomMap_DarkHyruleCastle_2fTopLeftTower_top.bin.lz", "start": 5812432, "size": 192, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_195.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/07_2fTopLeftTower/dungeon_map.bin", "start": 5812624, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 26 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fTopLeftTower" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/08_2fTopLeftCorner/gAreaRoomMap_DarkHyruleCastle_2fTopLeftCorner_bottom.bin.lz", "start": 5812756, - "size": 477, - "type": "map_layer2" + "size": 480, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/08_2fTopLeftCorner/gAreaRoomMap_DarkHyruleCastle_2fTopLeftCorner_top.bin.lz", "start": 5813236, "size": 176, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_196.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/08_2fTopLeftCorner/dungeon_map.bin", "start": 5813412, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 26 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fTopLeftCorner" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBossKey_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/09_2fBossKey/gAreaRoomMap_DarkHyruleCastle_2fBossKey_bottom.bin.lz", "start": 5813544, - "size": 339, - "type": "map_layer2" + "size": 340, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBossKey_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/09_2fBossKey/gAreaRoomMap_DarkHyruleCastle_2fBossKey_top.bin.lz", "start": 5813884, - "size": 146, - "type": "map_layer1" + "size": 148, + "type": "tileMap" }, { - "path": "assets/unknown_197.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/09_2fBossKey/dungeon_map.bin", "start": 5814032, "size": 76, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 15 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fBossKey" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/10_2fBlueWarp/gAreaRoomMap_DarkHyruleCastle_2fBlueWarp_bottom.bin.lz", "start": 5814108, - "size": 297, - "type": "map_layer2" + "size": 300, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/10_2fBlueWarp/gAreaRoomMap_DarkHyruleCastle_2fBlueWarp_top.bin.lz", "start": 5814408, - "size": 133, - "type": "map_layer1" + "size": 136, + "type": "tileMap" }, { - "path": "assets/unknown_198.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/10_2fBlueWarp/dungeon_map.bin", "start": 5814544, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fBlueWarp" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/11_2fTopRightCornerGhini/gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerGhini_bottom.bin.lz", "start": 5814612, - "size": 265, - "type": "map_layer2" + "size": 268, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/11_2fTopRightCornerGhini/gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerGhini_top.bin.lz", "start": 5814880, - "size": 91, - "type": "map_layer1" + "size": 92, + "type": "tileMap" }, { - "path": "assets/unknown_199.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/11_2fTopRightCornerGhini/dungeon_map.bin", "start": 5814972, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fTopRightCornerGhini" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/12_2fTopRightCornerTorches/gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerTorches_bottom.bin.lz", "start": 5815040, - "size": 271, - "type": "map_layer2" + "size": 272, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/12_2fTopRightCornerTorches/gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerTorches_top.bin.lz", "start": 5815312, - "size": 107, - "type": "map_layer1" + "size": 108, + "type": "tileMap" }, { - "path": "assets/unknown_200.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/12_2fTopRightCornerTorches/dungeon_map.bin", "start": 5815420, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fTopRightCornerTorches" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/13_2fTopRightTower/gAreaRoomMap_DarkHyruleCastle_2fTopRightTower_bottom.bin.lz", "start": 5815488, - "size": 267, - "type": "map_layer2" + "size": 268, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/13_2fTopRightTower/gAreaRoomMap_DarkHyruleCastle_2fTopRightTower_top.bin.lz", "start": 5815756, - "size": 135, - "type": "map_layer1" + "size": 136, + "type": "tileMap" }, { - "path": "assets/unknown_201.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/13_2fTopRightTower/dungeon_map.bin", "start": 5815892, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fTopRightTower" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/14_2fTopLeftDarknut/gAreaRoomMap_DarkHyruleCastle_2fTopLeftDarknut_bottom.bin.lz", "start": 5815960, - "size": 315, - "type": "map_layer2" + "size": 316, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/14_2fTopLeftDarknut/gAreaRoomMap_DarkHyruleCastle_2fTopLeftDarknut_top.bin.lz", "start": 5816276, - "size": 158, - "type": "map_layer1" + "size": 160, + "type": "tileMap" }, { - "path": "assets/unknown_202.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/14_2fTopLeftDarknut/dungeon_map.bin", "start": 5816436, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fTopLeftDarknut" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FSparks_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/15_2fSparks/gAreaRoomMap_DarkHyruleCastle_2fSparks_bottom.bin.lz", "start": 5816504, "size": 292, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FSparks_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/15_2fSparks/gAreaRoomMap_DarkHyruleCastle_2fSparks_top.bin.lz", "start": 5816796, - "size": 125, - "type": "map_layer1" + "size": 128, + "type": "tileMap" }, { - "path": "assets/unknown_203.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/15_2fSparks/dungeon_map.bin", "start": 5816924, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fSparks" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/16_2fTopRightDarknuts/gAreaRoomMap_DarkHyruleCastle_2fTopRightDarknuts_bottom.bin.lz", "start": 5816992, - "size": 306, - "type": "map_layer2" + "size": 308, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/16_2fTopRightDarknuts/gAreaRoomMap_DarkHyruleCastle_2fTopRightDarknuts_top.bin.lz", "start": 5817300, - "size": 155, - "type": "map_layer1" + "size": 156, + "type": "tileMap" }, { - "path": "assets/unknown_204.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/16_2fTopRightDarknuts/dungeon_map.bin", "start": 5817456, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fTopRightDarknuts" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FLeft_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/17_2fLeft/gAreaRoomMap_DarkHyruleCastle_2fLeft_bottom.bin.lz", "start": 5817524, - "size": 414, - "type": "map_layer2" + "size": 416, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FLeft_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/17_2fLeft/gAreaRoomMap_DarkHyruleCastle_2fLeft_top.bin.lz", "start": 5817940, - "size": 195, - "type": "map_layer1" + "size": 196, + "type": "tileMap" }, { - "path": "assets/unknown_205.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/17_2fLeft/dungeon_map.bin", "start": 5818136, "size": 100, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 20 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fLeft" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FRight_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/18_2fRight/gAreaRoomMap_DarkHyruleCastle_2fRight_bottom.bin.lz", "start": 5818236, "size": 360, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FRight_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/18_2fRight/gAreaRoomMap_DarkHyruleCastle_2fRight_top.bin.lz", "start": 5818596, "size": 228, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_206.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/18_2fRight/dungeon_map.bin", "start": 5818824, "size": 100, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 20 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fRight" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/19_2fBottomLeftDarknuts/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftDarknuts_bottom.bin.lz", "start": 5818924, - "size": 309, - "type": "map_layer2" + "size": 312, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/19_2fBottomLeftDarknuts/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftDarknuts_top.bin.lz", "start": 5819236, - "size": 163, - "type": "map_layer1" + "size": 164, + "type": "tileMap" }, { - "path": "assets/unknown_207.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/19_2fBottomLeftDarknuts/dungeon_map.bin", "start": 5819400, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fBottomLeftDarknuts" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBossDoor_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/20_2fBossDoor/gAreaRoomMap_DarkHyruleCastle_2fBossDoor_bottom.bin.lz", "start": 5819468, - "size": 350, - "type": "map_layer2" + "size": 352, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBossDoor_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/20_2fBossDoor/gAreaRoomMap_DarkHyruleCastle_2fBossDoor_top.bin.lz", "start": 5819820, "size": 152, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_208.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/20_2fBossDoor/dungeon_map.bin", "start": 5819972, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fBossDoor" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/21_2fBottomRightDarknut/gAreaRoomMap_DarkHyruleCastle_2fBottomRightDarknut_bottom.bin.lz", "start": 5820040, "size": 296, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/21_2fBottomRightDarknut/gAreaRoomMap_DarkHyruleCastle_2fBottomRightDarknut_top.bin.lz", "start": 5820336, - "size": 151, - "type": "map_layer1" + "size": 152, + "type": "tileMap" }, { - "path": "assets/unknown_209.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/21_2fBottomRightDarknut/dungeon_map.bin", "start": 5820488, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fBottomRightDarknut" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/22_2fBottomLeftCornerPuzzle/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftCornerPuzzle_bottom.bin.lz", "start": 5820556, - "size": 263, - "type": "map_layer2" + "size": 264, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/22_2fBottomLeftCornerPuzzle/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftCornerPuzzle_top.bin.lz", "start": 5820820, - "size": 118, - "type": "map_layer1" + "size": 120, + "type": "tileMap" }, { - "path": "assets/unknown_210.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/22_2fBottomLeftCornerPuzzle/dungeon_map.bin", "start": 5820940, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fBottomLeftCornerPuzzle" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FEntrance_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/23_2fEntrance/gAreaRoomMap_DarkHyruleCastle_2fEntrance_bottom.bin.lz", "start": 5821008, - "size": 450, - "type": "map_layer2" + "size": 452, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FEntrance_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/23_2fEntrance/gAreaRoomMap_DarkHyruleCastle_2fEntrance_top.bin.lz", "start": 5821460, "size": 228, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_211.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/23_2fEntrance/dungeon_map.bin", "start": 5821688, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 26 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fEntrance" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/24_2fBottomRightCorner/gAreaRoomMap_DarkHyruleCastle_2fBottomRightCorner_bottom.bin.lz", "start": 5821820, - "size": 401, - "type": "map_layer2" + "size": 404, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/24_2fBottomRightCorner/gAreaRoomMap_DarkHyruleCastle_2fBottomRightCorner_top.bin.lz", "start": 5822224, - "size": 161, - "type": "map_layer1" + "size": 164, + "type": "tileMap" }, { - "path": "assets/unknown_212.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/24_2fBottomRightCorner/dungeon_map.bin", "start": 5822388, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 26 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fBottomRightCorner" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/25_2fBottomLeftTower/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftTower_bottom.bin.lz", "start": 5822520, "size": 232, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/25_2fBottomLeftTower/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftTower_top.bin.lz", "start": 5822752, - "size": 137, - "type": "map_layer1" + "size": 140, + "type": "tileMap" }, { - "path": "assets/unknown_213.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/25_2fBottomLeftTower/dungeon_map.bin", "start": 5822892, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fBottomLeftTower" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/26_2fBottomLeftGhini/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftGhini_bottom.bin.lz", "start": 5822960, - "size": 258, - "type": "map_layer2" + "size": 260, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/26_2fBottomLeftGhini/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftGhini_top.bin.lz", "start": 5823220, "size": 88, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_214.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/26_2fBottomLeftGhini/dungeon_map.bin", "start": 5823308, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fBottomLeftGhini" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/27_1b/gAreaRoomMap_DarkHyruleCastle_1b_bottom.bin.lz", "start": 5823376, "size": 60, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/27_1b/gAreaRoomMap_DarkHyruleCastle_1b_top.bin.lz", "start": 5823436, "size": 60, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_215.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/27_1b/dungeon_map.bin", "start": 5823496, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1b_unused" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Entrance_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/28_B1Entrance/gAreaRoomMap_DarkHyruleCastle_B1Entrance_bottom.bin.lz", "start": 5823564, - "size": 294, - "type": "map_layer2" + "size": 296, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Entrance_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/28_B1Entrance/gAreaRoomMap_DarkHyruleCastle_B1Entrance_top.bin.lz", "start": 5823860, "size": 152, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_216.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/28_B1Entrance/dungeon_map.bin", "start": 5824012, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1Entrance" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/29_2fBottomRightTower/gAreaRoomMap_DarkHyruleCastle_2fBottomRightTower_bottom.bin.lz", "start": 5824080, - "size": 323, - "type": "map_layer2" + "size": 324, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/29_2fBottomRightTower/gAreaRoomMap_DarkHyruleCastle_2fBottomRightTower_top.bin.lz", "start": 5824404, "size": 188, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_217.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/29_2fBottomRightTower/dungeon_map.bin", "start": 5824592, "size": 132, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 26 + }, + "name": "gDungeonMaps_DarkHyruleCastle_2fBottomRightTower" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/30_1fTopLeftTower/gAreaRoomMap_DarkHyruleCastle_1fTopLeftTower_bottom.bin.lz", "start": 5824724, "size": 228, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/30_1fTopLeftTower/gAreaRoomMap_DarkHyruleCastle_1fTopLeftTower_top.bin.lz", "start": 5824952, "size": 124, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_218.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/30_1fTopLeftTower/dungeon_map.bin", "start": 5825076, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fTopLeftTower" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/31_1fThroneRoom/gAreaRoomMap_DarkHyruleCastle_1fThroneRoom_bottom.bin.lz", "start": 5825144, - "size": 335, - "type": "map_layer2" + "size": 336, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/31_1fThroneRoom/gAreaRoomMap_DarkHyruleCastle_1fThroneRoom_top.bin.lz", "start": 5825480, - "size": 147, - "type": "map_layer1" + "size": 148, + "type": "tileMap" }, { - "path": "assets/unknown_219.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/31_1fThroneRoom/dungeon_map.bin", "start": 5825628, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fThroneRoom" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FCompass_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/32_1fCompass/gAreaRoomMap_DarkHyruleCastle_1fCompass_bottom.bin.lz", "start": 5825696, - "size": 305, - "type": "map_layer2" + "size": 308, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FCompass_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/32_1fCompass/gAreaRoomMap_DarkHyruleCastle_1fCompass_top.bin.lz", "start": 5826004, - "size": 161, - "type": "map_layer1" + "size": 164, + "type": "tileMap" }, { - "path": "assets/unknown_220.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/32_1fCompass/dungeon_map.bin", "start": 5826168, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fCompass" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/33_1fTopRightTower/gAreaRoomMap_DarkHyruleCastle_1fTopRightTower_bottom.bin.lz", "start": 5826236, - "size": 261, - "type": "map_layer2" + "size": 264, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/33_1fTopRightTower/gAreaRoomMap_DarkHyruleCastle_1fTopRightTower_top.bin.lz", "start": 5826500, "size": 144, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_221.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/33_1fTopRightTower/dungeon_map.bin", "start": 5826644, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fTopRightTower" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/34_1fBeforeThrone/gAreaRoomMap_DarkHyruleCastle_1fBeforeThrone_bottom.bin.lz", "start": 5826712, - "size": 282, - "type": "map_layer2" + "size": 284, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/34_1fBeforeThrone/gAreaRoomMap_DarkHyruleCastle_1fBeforeThrone_top.bin.lz", "start": 5826996, - "size": 149, - "type": "map_layer1" + "size": 152, + "type": "tileMap" }, { - "path": "assets/unknown_222.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/34_1fBeforeThrone/dungeon_map.bin", "start": 5827148, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fBeforeThrone" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/35_1fLoopTopLeft/gAreaRoomMap_DarkHyruleCastle_1fLoopTopLeft_bottom.bin.lz", "start": 5827216, "size": 60, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/35_1fLoopTopLeft/gAreaRoomMap_DarkHyruleCastle_1fLoopTopLeft_top.bin.lz", "start": 5827276, "size": 316, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_223.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/35_1fLoopTopLeft/dungeon_map.bin", "start": 5827592, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fLoopTopLeft" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTop_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/36_1fLoopTop/gAreaRoomMap_DarkHyruleCastle_1fLoopTop_bottom.bin.lz", "start": 5827660, "size": 60, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTop_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/36_1fLoopTop/gAreaRoomMap_DarkHyruleCastle_1fLoopTop_top.bin.lz", "start": 5827720, "size": 272, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_224.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/36_1fLoopTop/dungeon_map.bin", "start": 5827992, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fLoopTop" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/37_1fLoopTopRight/gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_bottom.bin.lz", "start": 5828060, "size": 60, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/37_1fLoopTopRight/gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_top.bin.lz", "start": 5828120, - "size": 295, - "type": "map_layer1" + "size": 296, + "type": "tileMap" }, { - "path": "assets/unknown_225.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/37_1fLoopTopRight/dungeon_map.bin", "start": 5828416, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fLoopTopRight" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/38_1fLoopLeft/gAreaRoomMap_DarkHyruleCastle_1fLoopLeft_bottom.bin.lz", "start": 5828484, "size": 300, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/38_1fLoopLeft/gAreaRoomMap_DarkHyruleCastle_1fLoopLeft_top.bin.lz", "start": 5828784, - "size": 217, - "type": "map_layer1" + "size": 220, + "type": "tileMap" }, { - "path": "assets/unknown_226.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/38_1fLoopLeft/dungeon_map.bin", "start": 5829004, "size": 100, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 20 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fLoopLeft" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopRight_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/39_1fLoopRight/gAreaRoomMap_DarkHyruleCastle_1fLoopRight_bottom.bin.lz", "start": 5829104, - "size": 175, - "type": "map_layer2" + "size": 176, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopRight_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/39_1fLoopRight/gAreaRoomMap_DarkHyruleCastle_1fLoopRight_top.bin.lz", "start": 5829280, "size": 288, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_227.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/39_1fLoopRight/dungeon_map.bin", "start": 5829568, "size": 100, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 20 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fLoopRight" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/40_1fLoopBottomLeft/gAreaRoomMap_DarkHyruleCastle_1fLoopBottomLeft_bottom.bin.lz", "start": 5829668, - "size": 226, - "type": "map_layer2" + "size": 228, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/40_1fLoopBottomLeft/gAreaRoomMap_DarkHyruleCastle_1fLoopBottomLeft_top.bin.lz", "start": 5829896, "size": 144, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_228.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/40_1fLoopBottomLeft/dungeon_map.bin", "start": 5830040, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fLoopBottomLeft" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/41_1fLoopBottom/gAreaRoomMap_DarkHyruleCastle_1fLoopBottom_bottom.bin.lz", "start": 5830108, - "size": 187, - "type": "map_layer2" + "size": 188, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/41_1fLoopBottom/gAreaRoomMap_DarkHyruleCastle_1fLoopBottom_top.bin.lz", "start": 5830296, - "size": 127, - "type": "map_layer1" + "size": 128, + "type": "tileMap" }, { - "path": "assets/unknown_229.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/41_1fLoopBottom/dungeon_map.bin", "start": 5830424, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fLoopBottom" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/42_1fLoopBottomRight/gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_bottom.bin.lz", "start": 5830492, - "size": 202, - "type": "map_layer2" + "size": 204, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/42_1fLoopBottomRight/gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_top.bin.lz", "start": 5830696, - "size": 141, - "type": "map_layer1" + "size": 144, + "type": "tileMap" }, { - "path": "assets/unknown_230.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/42_1fLoopBottomRight/dungeon_map.bin", "start": 5830840, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fLoopBottomRight" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/43_1fBottomLeftTower/gAreaRoomMap_DarkHyruleCastle_1fBottomLeftTower_bottom.bin.lz", "start": 5830908, - "size": 223, - "type": "map_layer2" + "size": 224, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/43_1fBottomLeftTower/gAreaRoomMap_DarkHyruleCastle_1fBottomLeftTower_top.bin.lz", "start": 5831132, "size": 128, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_231.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/43_1fBottomLeftTower/dungeon_map.bin", "start": 5831260, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fBottomLeftTower" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/44_1fBottomRightTower/gAreaRoomMap_DarkHyruleCastle_1fBottomRightTower_bottom.bin.lz", "start": 5831328, "size": 216, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/44_1fBottomRightTower/gAreaRoomMap_DarkHyruleCastle_1fBottomRightTower_top.bin.lz", "start": 5831544, - "size": 129, - "type": "map_layer1" + "size": 132, + "type": "tileMap" }, { - "path": "assets/unknown_232.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/44_1fBottomRightTower/dungeon_map.bin", "start": 5831676, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_1fBottomRightTower" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/45_B1BelowThrone/gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_bottom.bin.lz", "start": 5831744, "size": 244, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/45_B1BelowThrone/gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_top.bin.lz", "start": 5831988, - "size": 93, - "type": "map_layer1" + "size": 96, + "type": "tileMap" }, { - "path": "assets/unknown_233.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/45_B1BelowThrone/dungeon_map.bin", "start": 5832084, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1BelowThrone" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/46_B1BelowCompass/gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_bottom.bin.lz", "start": 5832152, - "size": 275, - "type": "map_layer2" + "size": 276, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/46_B1BelowCompass/gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_top.bin.lz", "start": 5832428, - "size": 110, - "type": "map_layer1" + "size": 112, + "type": "tileMap" }, { - "path": "assets/unknown_234.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/46_B1BelowCompass/dungeon_map.bin", "start": 5832540, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1BelowCompass" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/47_B1BeforeThrone/gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_bottom.bin.lz", "start": 5832608, "size": 60, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/47_B1BeforeThrone/gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_top.bin.lz", "start": 5832668, "size": 284, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_235.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/47_B1BeforeThrone/dungeon_map.bin", "start": 5832952, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1BeforeThrone" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrison_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/48_B1ToPrison/gAreaRoomMap_DarkHyruleCastle_B1ToPrison_bottom.bin.lz", "start": 5833020, "size": 60, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrison_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/48_B1ToPrison/gAreaRoomMap_DarkHyruleCastle_B1ToPrison_top.bin.lz", "start": 5833080, "size": 276, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_236.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/48_B1ToPrison/dungeon_map.bin", "start": 5833356, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1ToPrison" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1BombWall_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/49_B1BombWall/gAreaRoomMap_DarkHyruleCastle_B1BombWall_bottom.bin.lz", "start": 5833424, "size": 60, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1BombWall_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/49_B1BombWall/gAreaRoomMap_DarkHyruleCastle_B1BombWall_top.bin.lz", "start": 5833484, - "size": 277, - "type": "map_layer1" + "size": 280, + "type": "tileMap" }, { - "path": "assets/unknown_237.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/49_B1BombWall/dungeon_map.bin", "start": 5833764, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1BombWall" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Keatons_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/50_B1Keatons/gAreaRoomMap_DarkHyruleCastle_B1Keatons_bottom.bin.lz", "start": 5833832, "size": 60, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Keatons_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/50_B1Keatons/gAreaRoomMap_DarkHyruleCastle_B1Keatons_top.bin.lz", "start": 5833892, - "size": 302, - "type": "map_layer1" + "size": 304, + "type": "tileMap" }, { - "path": "assets/unknown_238.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/50_B1Keatons/dungeon_map.bin", "start": 5834196, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1Keatons" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/51_B1ToPrisonFirebar/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_bottom.bin.lz", "start": 5834264, - "size": 87, - "type": "map_layer2" + "size": 88, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/51_B1ToPrisonFirebar/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_top.bin.lz", "start": 5834352, "size": 408, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_239.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/51_B1ToPrisonFirebar/dungeon_map.bin", "start": 5834760, "size": 100, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 20 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1ToPrisonFirebar" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Cannons_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/52_B1Cannons/gAreaRoomMap_DarkHyruleCastle_B1Cannons_bottom.bin.lz", "start": 5834860, - "size": 87, - "type": "map_layer2" + "size": 88, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Cannons_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/52_B1Cannons/gAreaRoomMap_DarkHyruleCastle_B1Cannons_top.bin.lz", "start": 5834948, "size": 368, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_240.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/52_B1Cannons/dungeon_map.bin", "start": 5835316, "size": 100, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 20 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1Cannons" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Left_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/53_B1Left/gAreaRoomMap_DarkHyruleCastle_B1Left_bottom.bin.lz", "start": 5835416, - "size": 171, - "type": "map_layer2" + "size": 172, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Left_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/53_B1Left/gAreaRoomMap_DarkHyruleCastle_B1Left_top.bin.lz", "start": 5835588, - "size": 235, - "type": "map_layer1" + "size": 236, + "type": "tileMap" }, { - "path": "assets/unknown_241.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/53_B1Left/dungeon_map.bin", "start": 5835824, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1Left" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Right_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/54_B1Right/gAreaRoomMap_DarkHyruleCastle_B1Right_bottom.bin.lz", "start": 5835892, - "size": 170, - "type": "map_layer2" + "size": 172, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Right_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/54_B1Right/gAreaRoomMap_DarkHyruleCastle_B1Right_top.bin.lz", "start": 5836064, "size": 236, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_242.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/54_B1Right/dungeon_map.bin", "start": 5836300, "size": 68, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 13 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1Right" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Map_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/55_B1Map/gAreaRoomMap_DarkHyruleCastle_B1Map_bottom.bin.lz", "start": 5836368, - "size": 522, - "type": "map_layer2" + "size": 524, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B1Map_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/55_B1Map/gAreaRoomMap_DarkHyruleCastle_B1Map_top.bin.lz", "start": 5836892, - "size": 1102, - "type": "map_layer1" + "size": 1104, + "type": "tileMap" }, { - "path": "assets/unknown_243.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/55_B1Map/dungeon_map.bin", "start": 5837996, "size": 340, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 13, + "height": 26 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B1Map" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B2ToPrison_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/56_B2ToPrison/gAreaRoomMap_DarkHyruleCastle_B2ToPrison_bottom.bin.lz", "start": 5838336, - "size": 310, - "type": "map_layer2" + "size": 312, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B2ToPrison_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/56_B2ToPrison/gAreaRoomMap_DarkHyruleCastle_B2ToPrison_top.bin.lz", "start": 5838648, "size": 116, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_244.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/56_B2ToPrison/dungeon_map.bin", "start": 5838764, "size": 76, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 15 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B2ToPrison" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B2Prison_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/57_B2Prison/gAreaRoomMap_DarkHyruleCastle_B2Prison_bottom.bin.lz", "start": 5838840, - "size": 381, - "type": "map_layer2" + "size": 384, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B2Prison_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/57_B2Prison/gAreaRoomMap_DarkHyruleCastle_B2Prison_top.bin.lz", "start": 5839224, "size": 180, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_245.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/57_B2Prison/dungeon_map.bin", "start": 5839404, "size": 136, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 9, + "height": 15 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B2Prison" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B2Dropdown_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/58_B2Dropdown/gAreaRoomMap_DarkHyruleCastle_B2Dropdown_bottom.bin.lz", "start": 5839540, - "size": 243, - "type": "map_layer2" + "size": 244, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_B2Dropdown_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/58_B2Dropdown/gAreaRoomMap_DarkHyruleCastle_B2Dropdown_top.bin.lz", "start": 5839784, - "size": 113, - "type": "map_layer1" + "size": 116, + "type": "tileMap" }, { - "path": "assets/unknown_246.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/58_B2Dropdown/dungeon_map.bin", "start": 5839900, "size": 92, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 18 + }, + "name": "gDungeonMaps_DarkHyruleCastle_B2Dropdown" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_0.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/59_3b/gAreaRoomMap_DarkHyruleCastle_3b_bottom.bin.lz", "start": 5839992, "size": 60, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_1.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/59_3b/gAreaRoomMap_DarkHyruleCastle_3b_top.bin.lz", "start": 5840052, "size": 60, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/unknown_247.bin", + "path": "maps/areas/136_DarkHyruleCastle/rooms/59_3b/dungeon_map.bin", "start": 5840112, "size": 112, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 4, + "height": 28 + }, + "name": "gDungeonMaps_DarkHyruleCastle_3b_unused" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastleBridge_0_0.bin", + "path": "maps/areas/141_DarkHyruleCastleBridge/rooms/00_Main/gAreaRoomMap_DarkHyruleCastleBridge_Main_bottom.bin.lz", "start": 5840224, - "size": 498, - "type": "map_layer2" + "size": 500, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastleBridge_0_1.bin", + "path": "maps/areas/141_DarkHyruleCastleBridge/rooms/00_Main/gAreaRoomMap_DarkHyruleCastleBridge_Main_top.bin.lz", "start": 5840724, - "size": 143, - "type": "map_layer1" + "size": 144, + "type": "tileMap" }, { - "path": "assets/unknown_248.bin", + "path": "maps/areas/141_DarkHyruleCastleBridge/rooms/00_Main/dungeon_map.bin", "start": 5840868, "size": 100, - "type": "unknown" + "type": "dungeon_map", + "options": { + "width": 5, + "height": 20 + }, + "name": "gDungeonMaps_DarkHyruleCastleBridge_Main_unused" }, { - "path": "assets/gAreaRoomMap_Vaati3_0_0.bin", + "path": "maps/areas/139_Vaati3/rooms/00_0/gAreaRoomMap_Vaati3_0_bottom.bin.lz", "start": 5840968, "size": 416, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Vaati3_0_1.bin", + "path": "maps/areas/139_Vaati3/rooms/00_0/gAreaRoomMap_Vaati3_0_top.bin.lz", "start": 5841384, - "size": 85, - "type": "map_layer1" + "size": 88, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Vaati3_1_0.bin", + "path": "maps/areas/139_Vaati3/rooms/01_1/gAreaRoomMap_Vaati3_1_bottom.bin.lz", "start": 5841472, - "size": 318, - "type": "map_layer2" + "size": 320, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Vaati3_1_1.bin", + "path": "maps/areas/139_Vaati3/rooms/01_1/gAreaRoomMap_Vaati3_1_top.bin.lz", "start": 5841792, - "size": 70, - "type": "map_layer1" + "size": 72, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Vaati2_0_0.bin", + "path": "maps/areas/140_Vaati2/rooms/00_0/gAreaRoomMap_Vaati2_0_bottom.bin.lz", "start": 5841864, "size": 320, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_Vaati2_0_1.bin", + "path": "maps/areas/140_Vaati2/rooms/00_0/gAreaRoomMap_Vaati2_0_top.bin.lz", "start": 5842184, - "size": 91, - "type": "map_layer1" + "size": 92, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VaatisArms_0_0.bin", + "path": "maps/areas/138_VaatisArms/rooms/00_First/gAreaRoomMap_VaatisArms_First_bottom.bin.lz", "start": 5842276, - "size": 445, - "type": "map_layer2" + "size": 448, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VaatisArms_0_1.bin", + "path": "maps/areas/138_VaatisArms/rooms/00_First/gAreaRoomMap_VaatisArms_First_top.bin.lz", "start": 5842724, - "size": 87, - "type": "map_layer1" + "size": 88, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VaatisArms_1_0.bin", + "path": "maps/areas/138_VaatisArms/rooms/01_Second/gAreaRoomMap_VaatisArms_Second_bottom.bin.lz", "start": 5842812, - "size": 445, - "type": "map_layer2" + "size": 448, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VaatisArms_1_1.bin", + "path": "maps/areas/138_VaatisArms/rooms/01_Second/gAreaRoomMap_VaatisArms_Second_top.bin.lz", "start": 5843260, - "size": 87, - "type": "map_layer1" + "size": 88, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VaatisArms_2_0.bin", + "path": "maps/areas/138_VaatisArms/rooms/02_3/gAreaRoomMap_VaatisArms_3_bottom.bin.lz", "start": 5843348, - "size": 445, - "type": "map_layer2" + "size": 448, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_VaatisArms_2_1.bin", + "path": "maps/areas/138_VaatisArms/rooms/02_3/gAreaRoomMap_VaatisArms_3_top.bin.lz", "start": 5843796, - "size": 87, - "type": "map_layer1" + "size": 88, + "type": "tileMap" }, { - "path": "assets/gAreaTileset_Vaati2_0_3.bin", + "path": "maps/areas/140_Vaati2/tileSets/0/gAreaTileSet_Vaati2_0_3.4bpp.lz", "start": 5843884, - "size": 754, - "type": "tileset_mapping3" + "size": 756, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_DarkHyruleCastleOutside_0_0.4bpp.lz", + "path": "maps/areas/137_DarkHyruleCastleOutside/tileSets/0/gAreaTileSet_DarkHyruleCastleOutside_0_0.4bpp.lz", "start": 5844640, - "size": 8175, - "type": "tileset" + "size": 8176, + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_DarkHyruleCastleOutside_0_1.4bpp.lz", + "path": "maps/areas/137_DarkHyruleCastleOutside/tileSets/0/gAreaTileSet_DarkHyruleCastleOutside_0_1.4bpp.lz", "start": 5852816, "size": 7300, - "type": "tileset" + "type": "subTileSet" }, { - "path": "tilesets/gAreaTileset_DarkHyruleCastleOutside_0_2.4bpp.lz", + "path": "maps/areas/137_DarkHyruleCastleOutside/tileSets/0/gAreaTileSet_DarkHyruleCastleOutside_0_2.4bpp.lz", "start": 5860116, "size": 7748, - "type": "tileset" + "type": "subTileSet" }, { - "path": "assets/gAreaMetatiles_DarkHyruleCastleOutside_0.bin", + "path": "maps/areas/137_DarkHyruleCastleOutside/tileSet/gAreaTileSet_DarkHyruleCastleOutside_bottom.bin.lz", "start": 5867864, "size": 5412, - "type": "metatiles_tileset2" + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_DarkHyruleCastleOutside_1.bin", + "path": "maps/areas/137_DarkHyruleCastleOutside/tileSet/gAreaTileSet_DarkHyruleCastleOutside_top.bin.lz", "start": 5873276, - "size": 3129, - "type": "metatiles_tileset1" + "size": 3132, + "type": "tileSet" }, { - "path": "assets/gAreaMetatiles_DarkHyruleCastleOutside_2.bin", + "path": "maps/areas/137_DarkHyruleCastleOutside/tileSet/gAreaTileSetTypes_DarkHyruleCastleOutside_bottom.bin.lz", "start": 5876408, - "size": 729, - "type": "metatiles_tile_types2" + "size": 732, + "type": "tileSet_types" }, { - "path": "assets/gAreaMetatiles_DarkHyruleCastleOutside_3.bin", + "path": "maps/areas/137_DarkHyruleCastleOutside/tileSet/gAreaTileSetTypes_DarkHyruleCastleOutside_top.bin.lz", "start": 5877140, - "size": 459, - "type": "metatiles_tile_types1" + "size": 460, + "type": "tileSet_types" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastleOutside_0_0.bin", + "path": "maps/areas/137_DarkHyruleCastleOutside/rooms/00_ZeldaStatuePlatform/gAreaRoomMap_DarkHyruleCastleOutside_ZeldaStatuePlatform_bottom.bin.lz", "start": 5877600, "size": 536, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastleOutside_0_1.bin", + "path": "maps/areas/137_DarkHyruleCastleOutside/rooms/00_ZeldaStatuePlatform/gAreaRoomMap_DarkHyruleCastleOutside_ZeldaStatuePlatform_top.bin.lz", "start": 5878136, - "size": 109, - "type": "map_layer1" + "size": 112, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastleOutside_1_0.bin", + "path": "maps/areas/137_DarkHyruleCastleOutside/rooms/01_Garden/gAreaRoomMap_DarkHyruleCastleOutside_Garden_bottom.bin.lz", "start": 5878248, - "size": 541, - "type": "map_layer2" + "size": 544, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastleOutside_1_1.bin", + "path": "maps/areas/137_DarkHyruleCastleOutside/rooms/01_Garden/gAreaRoomMap_DarkHyruleCastleOutside_Garden_top.bin.lz", "start": 5878792, "size": 124, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastleOutside_2_0.bin", + "path": "maps/areas/137_DarkHyruleCastleOutside/rooms/02_Northwest/gAreaRoomMap_DarkHyruleCastleOutside_Northwest_bottom.bin.lz", "start": 5878916, - "size": 234, - "type": "map_layer2" + "size": 236, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastleOutside_2_1.bin", + "path": "maps/areas/137_DarkHyruleCastleOutside/rooms/02_Northwest/gAreaRoomMap_DarkHyruleCastleOutside_Northwest_top.bin.lz", "start": 5879152, - "size": 347, - "type": "map_layer1" + "size": 348, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastleOutside_3_0.bin", + "path": "maps/areas/137_DarkHyruleCastleOutside/rooms/03_Northeast/gAreaRoomMap_DarkHyruleCastleOutside_Northeast_bottom.bin.lz", "start": 5879500, "size": 324, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastleOutside_3_1.bin", + "path": "maps/areas/137_DarkHyruleCastleOutside/rooms/03_Northeast/gAreaRoomMap_DarkHyruleCastleOutside_Northeast_top.bin.lz", "start": 5879824, - "size": 446, - "type": "map_layer1" + "size": 448, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastleOutside_4_0.bin", + "path": "maps/areas/137_DarkHyruleCastleOutside/rooms/04_East/gAreaRoomMap_DarkHyruleCastleOutside_East_bottom.bin.lz", "start": 5880272, - "size": 139, - "type": "map_layer2" + "size": 140, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastleOutside_4_1.bin", + "path": "maps/areas/137_DarkHyruleCastleOutside/rooms/04_East/gAreaRoomMap_DarkHyruleCastleOutside_East_top.bin.lz", "start": 5880412, - "size": 225, - "type": "map_layer1" + "size": 228, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastleOutside_5_0.bin", + "path": "maps/areas/137_DarkHyruleCastleOutside/rooms/05_Southwest/gAreaRoomMap_DarkHyruleCastleOutside_Southwest_bottom.bin.lz", "start": 5880640, "size": 264, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastleOutside_5_1.bin", + "path": "maps/areas/137_DarkHyruleCastleOutside/rooms/05_Southwest/gAreaRoomMap_DarkHyruleCastleOutside_Southwest_top.bin.lz", "start": 5880904, - "size": 363, - "type": "map_layer1" + "size": 364, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastleOutside_6_0.bin", + "path": "maps/areas/137_DarkHyruleCastleOutside/rooms/06_South/gAreaRoomMap_DarkHyruleCastleOutside_South_bottom.bin.lz", "start": 5881268, - "size": 431, - "type": "map_layer2" + "size": 432, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastleOutside_6_1.bin", + "path": "maps/areas/137_DarkHyruleCastleOutside/rooms/06_South/gAreaRoomMap_DarkHyruleCastleOutside_South_top.bin.lz", "start": 5881700, - "size": 581, - "type": "map_layer1" + "size": 584, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastleOutside_7_0.bin", + "path": "maps/areas/137_DarkHyruleCastleOutside/rooms/07_Southeast/gAreaRoomMap_DarkHyruleCastleOutside_Southeast_bottom.bin.lz", "start": 5882284, "size": 384, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastleOutside_7_1.bin", + "path": "maps/areas/137_DarkHyruleCastleOutside/rooms/07_Southeast/gAreaRoomMap_DarkHyruleCastleOutside_Southeast_top.bin.lz", "start": 5882668, - "size": 477, - "type": "map_layer1" + "size": 480, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastleOutside_8_0.bin", + "path": "maps/areas/137_DarkHyruleCastleOutside/rooms/08_8/gAreaRoomMap_DarkHyruleCastleOutside_8_bottom.bin.lz", "start": 5883148, - "size": 194, - "type": "map_layer2" + "size": 196, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_DarkHyruleCastleOutside_8_1.bin", + "path": "maps/areas/137_DarkHyruleCastleOutside/rooms/08_8/gAreaRoomMap_DarkHyruleCastleOutside_8_top.bin.lz", "start": 5883344, - "size": 194, - "type": "map_layer1" + "size": 196, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_47_0_0.bin", + "path": "maps/areas/071_47/rooms/00_0/gAreaRoomMap_47_0_bottom.bin.lz", "start": 5883540, - "size": 293, - "type": "map_layer2" + "size": 296, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_47_0_1.bin", + "path": "maps/areas/071_47/rooms/00_0/gAreaRoomMap_47_0_top.bin.lz", "start": 5883836, - "size": 95, - "type": "map_layer1" + "size": 96, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_47_1_0.bin", + "path": "maps/areas/071_47/rooms/01_1/gAreaRoomMap_47_1_bottom.bin.lz", "start": 5883932, "size": 292, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_47_1_1.bin", + "path": "maps/areas/071_47/rooms/01_1/gAreaRoomMap_47_1_top.bin.lz", "start": 5884224, - "size": 110, - "type": "map_layer1" + "size": 112, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_47_2_0.bin", + "path": "maps/areas/071_47/rooms/02_2/gAreaRoomMap_47_2_bottom.bin.lz", "start": 5884336, "size": 496, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_47_2_1.bin", + "path": "maps/areas/071_47/rooms/02_2/gAreaRoomMap_47_2_top.bin.lz", "start": 5884832, - "size": 153, - "type": "map_layer1" + "size": 156, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_45_0_0.bin", + "path": "maps/areas/069_45/rooms/00_0/gAreaRoomMap_45_0_bottom.bin.lz", "start": 5884988, - "size": 306, - "type": "map_layer2" + "size": 308, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_45_0_1.bin", + "path": "maps/areas/069_45/rooms/00_0/gAreaRoomMap_45_0_top.bin.lz", "start": 5885296, "size": 68, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_46_0_0.bin", + "path": "maps/areas/070_Null46/rooms/00_0/gAreaRoomMap_Null46_0_bottom.bin.lz", "start": 5885364, - "size": 387, - "type": "map_layer2" + "size": 388, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_46_0_1.bin", + "path": "maps/areas/070_Null46/rooms/00_0/gAreaRoomMap_Null46_0_top.bin.lz", "start": 5885752, "size": 112, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_46_1_0.bin", + "path": "maps/areas/070_Null46/rooms/01_1/gAreaRoomMap_Null46_1_bottom.bin.lz", "start": 5885864, - "size": 539, - "type": "map_layer2" + "size": 540, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_46_1_1.bin", + "path": "maps/areas/070_Null46/rooms/01_1/gAreaRoomMap_Null46_1_top.bin.lz", "start": 5886404, - "size": 173, - "type": "map_layer1" + "size": 176, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_46_2_0.bin", + "path": "maps/areas/070_Null46/rooms/02_2/gAreaRoomMap_Null46_2_bottom.bin.lz", "start": 5886580, - "size": 373, - "type": "map_layer2" + "size": 376, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_46_2_1.bin", + "path": "maps/areas/070_Null46/rooms/02_2/gAreaRoomMap_Null46_2_top.bin.lz", "start": 5886956, "size": 152, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_46_3_0.bin", + "path": "maps/areas/070_Null46/rooms/03_3/gAreaRoomMap_Null46_3_bottom.bin.lz", "start": 5887108, - "size": 330, - "type": "map_layer2" + "size": 332, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_46_3_1.bin", + "path": "maps/areas/070_Null46/rooms/03_3/gAreaRoomMap_Null46_3_top.bin.lz", "start": 5887440, "size": 156, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_46_4_0.bin", + "path": "maps/areas/070_Null46/rooms/04_4/gAreaRoomMap_Null46_4_bottom.bin.lz", "start": 5887596, - "size": 431, - "type": "map_layer2" + "size": 432, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_46_4_1.bin", + "path": "maps/areas/070_Null46/rooms/04_4/gAreaRoomMap_Null46_4_top.bin.lz", "start": 5888028, - "size": 163, - "type": "map_layer1" + "size": 164, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_46_5_0.bin", + "path": "maps/areas/070_Null46/rooms/05_5/gAreaRoomMap_Null46_5_bottom.bin.lz", "start": 5888192, - "size": 334, - "type": "map_layer2" + "size": 336, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_46_5_1.bin", + "path": "maps/areas/070_Null46/rooms/05_5/gAreaRoomMap_Null46_5_top.bin.lz", "start": 5888528, - "size": 123, - "type": "map_layer1" + "size": 124, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_46_6_0.bin", + "path": "maps/areas/070_Null46/rooms/06_6/gAreaRoomMap_Null46_6_bottom.bin.lz", "start": 5888652, - "size": 626, - "type": "map_layer2" + "size": 628, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_46_6_1.bin", + "path": "maps/areas/070_Null46/rooms/06_6/gAreaRoomMap_Null46_6_top.bin.lz", "start": 5889280, - "size": 269, - "type": "map_layer1" + "size": 272, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_46_7_0.bin", + "path": "maps/areas/070_Null46/rooms/07_7/gAreaRoomMap_Null46_7_bottom.bin.lz", "start": 5889552, "size": 376, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_46_7_1.bin", + "path": "maps/areas/070_Null46/rooms/07_7/gAreaRoomMap_Null46_7_top.bin.lz", "start": 5889928, - "size": 122, - "type": "map_layer1" + "size": 124, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_08107870_0.bin", + "path": "assets/gAreaRoomMap_08107870_0.bin.lz", "start": 5890052, "size": 1168, - "type": "map_layer2" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_08107870_1.bin", + "path": "assets/gAreaRoomMap_08107870_1.bin.lz", "start": 5891220, "size": 888, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_4D_0_0.bin", + "path": "maps/areas/077_4d/rooms/00_0/gAreaRoomMap_4d_0_bottom.bin.lz", "start": 5892108, - "size": 1482, - "type": "map_layer2" + "size": 1484, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_4D_0_1.bin", + "path": "maps/areas/077_4d/rooms/00_0/gAreaRoomMap_4d_0_top.bin.lz", "start": 5893592, - "size": 637, - "type": "map_layer1" + "size": 640, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_57_0_0.bin", + "path": "maps/areas/087_57/rooms/00_0/gAreaRoomMap_57_0_bottom.bin.lz", "start": 5894232, - "size": 1389, - "type": "map_layer2" + "size": 1392, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_57_0_1.bin", + "path": "maps/areas/087_57/rooms/00_0/gAreaRoomMap_57_0_top.bin.lz", "start": 5895624, "size": 620, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_5F_0_0.bin", + "path": "maps/areas/095_5f/rooms/00_0/gAreaRoomMap_5f_0_bottom.bin.lz", "start": 5896244, - "size": 965, - "type": "map_layer2" + "size": 968, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_5F_0_1.bin", + "path": "maps/areas/095_5f/rooms/00_0/gAreaRoomMap_5f_0_top.bin.lz", "start": 5897212, - "size": 646, - "type": "map_layer1" + "size": 648, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_67_0_0.bin", + "path": "maps/areas/103_67/rooms/00_0/gAreaRoomMap_67_0_bottom.bin.lz", "start": 5897860, - "size": 205, - "type": "map_layer2" + "size": 208, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_67_0_1.bin", + "path": "maps/areas/103_67/rooms/00_0/gAreaRoomMap_67_0_top.bin.lz", "start": 5898068, - "size": 57, - "type": "map_layer1" + "size": 60, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_6F_0_0.bin", + "path": "maps/areas/111_6f/rooms/00_0/gAreaRoomMap_6f_0_bottom.bin.lz", "start": 5898128, - "size": 1221, - "type": "map_layer2" + "size": 1224, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_6F_0_1.bin", + "path": "maps/areas/111_6f/rooms/00_0/gAreaRoomMap_6f_0_top.bin.lz", "start": 5899352, - "size": 853, - "type": "map_layer1" + "size": 856, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_77_0_0.bin", + "path": "maps/areas/119_77/rooms/00_0/gAreaRoomMap_77_0_bottom.bin.lz", "start": 5900208, - "size": 1530, - "type": "map_layer2" + "size": 1532, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_77_0_1.bin", + "path": "maps/areas/119_77/rooms/00_0/gAreaRoomMap_77_0_top.bin.lz", "start": 5901740, - "size": 1109, - "type": "map_layer1" + "size": 1112, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_7F_0_0.bin", + "path": "maps/areas/127_7f/rooms/00_0/gAreaRoomMap_7f_0_bottom.bin.lz", "start": 5902852, - "size": 1285, - "type": "map_layer2" + "size": 1288, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_7F_0_1.bin", + "path": "maps/areas/127_7f/rooms/00_0/gAreaRoomMap_7f_0_top.bin.lz", "start": 5904140, - "size": 814, - "type": "map_layer1" + "size": 816, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_87_0_0.bin", + "path": "maps/areas/135_87/rooms/00_0/gAreaRoomMap_87_0_bottom.bin.lz", "start": 5904956, - "size": 1985, - "type": "map_layer2" + "size": 1988, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_87_0_1.bin", + "path": "maps/areas/135_87/rooms/00_0/gAreaRoomMap_87_0_top.bin.lz", "start": 5906944, "size": 740, - "type": "map_layer1" + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_8F_0_0.bin", + "path": "maps/areas/143_8f/rooms/00_0/gAreaRoomMap_8f_0_bottom.bin.lz", "start": 5907684, - "size": 1523, - "type": "map_layer2" + "size": 1524, + "type": "tileMap" }, { - "path": "assets/gAreaRoomMap_8F_0_1.bin", + "path": "maps/areas/143_8f/rooms/00_0/gAreaRoomMap_8f_0_top.bin.lz", "start": 5909208, - "size": 935, - "type": "map_layer1" + "size": 936, + "type": "tileMap" } ] \ No newline at end of file diff --git a/data/animations/npc/kid.s b/data/animations/npc/kid.s index fcaf867e..6e81c22f 100644 --- a/data/animations/npc/kid.s +++ b/data/animations/npc/kid.s @@ -91,6 +91,7 @@ gSpriteAnimations_Kid:: @ 0810C1E4 .4byte 00000000 @ TODO data of an unused entity? +@ maybe the unused original guard npc? gUnk_0810C268:: @ 0810C268 .4byte sub_08062AD0 .4byte sub_08062AD4 @@ -103,6 +104,8 @@ gUnk_0810C275:: @ 0810C275 gUnk_0810C27A:: @ 0810C27A .incbin "kid/gUnk_0810C27A.bin" + +gUnk_0810C280:: @ 0810C280 .4byte gUnk_0810C270 .4byte gUnk_0810C275 .4byte gUnk_0810C27A diff --git a/data/animations/object/minecart.s b/data/animations/object/minecart.s index 21b6acbb..c05e1d01 100644 --- a/data/animations/object/minecart.s +++ b/data/animations/object/minecart.s @@ -4,23 +4,6 @@ .section .rodata .align 2 -gUnk_081223D8:: @ 081223D8 - .4byte gUnk_081223E8 - .4byte gUnk_08122402 - .4byte gUnk_0812241C - .4byte gUnk_08122436 - -gUnk_081223E8:: @ 081223E8 - .incbin "minecart/gUnk_081223E8.bin" - -gUnk_08122402:: @ 08122402 - .incbin "minecart/gUnk_08122402.bin" - -gUnk_0812241C:: @ 0812241C - .incbin "minecart/gUnk_0812241C.bin" - -gUnk_08122436:: @ 08122436 - .incbin "minecart/gUnk_08122436.bin" gSpriteAnimations_Minecart_0:: @ 08122450 .include "animations/gSpriteAnimations_Minecart_0.s" diff --git a/data/const/common.s b/data/const/common.s deleted file mode 100644 index d40d1700..00000000 --- a/data/const/common.s +++ /dev/null @@ -1,336 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -@ before: playerItemCellOverwriteSet -@ in here: ui.c, color.c, common.c -@ before on data side: sineTable.c -@ after: octorok.c - -@ code_080043E8.c -gUnk_080C93E0:: @ 080C93E0 - .incbin "data_080C93E0/gUnk_080C93E0.bin" - -@ common.c -gUnk_080C9460:: @ 080C9460 - .incbin "data_080C93E0/gUnk_080C9460.bin" - - -@ DungeonLayout - -gUnk_080C9480:: @ 080C9480 - .incbin "data_080C93E0/gUnk_080C9480.bin" - -gUnk_080C9488:: @ 080C9488 - .4byte gUnk_080C9480 - -gUnk_080C948C:: @ 080C948C -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C948C_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C948C_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C94A4:: @ 080C94A4 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C94A4_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C94A4_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C9514:: @ 080C9514 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9514_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C9514_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C953C:: @ 080C953C - .4byte gUnk_080C948C - .4byte gUnk_080C94A4 - .4byte gUnk_080C9514 - -gUnk_080C9548:: @ 080C9548 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9548_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C9548_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C9570:: @ 080C9570 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9570_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C9570_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C95B8:: @ 080C95B8 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C95B8_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C95B8_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C95F0:: @ 080C95F0 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C95F0_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C95F0_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C9600:: @ 080C9600 - .4byte gUnk_080C9548 - .4byte gUnk_080C9570 - .4byte gUnk_080C95B8 - .4byte gUnk_080C95F0 - -gUnk_080C9610:: @ 080C9610 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9610_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C9610_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C9648:: @ 080C9648 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9648_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C9648_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C96C8:: @ 080C96C8 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C96C8_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C96C8_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C96F8:: @ 080C96F8 - .4byte gUnk_080C9610 - .4byte gUnk_080C9648 - .4byte gUnk_080C96C8 - -gUnk_080C9704:: @ 080C9704 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9704_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C9704_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C9794:: @ 080C9794 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9794_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C9794_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C9854:: @ 080C9854 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9854_EU.bin" -.else - .incbin "data_080C93E0/gUnk_080C9854_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_080C9864:: @ 080C9864 - .4byte gUnk_080C9704 - .4byte gUnk_080C9794 - .4byte gUnk_080C9854 - -gUnk_080C9870:: @ 080C9870 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9870_EU.bin" -.else -.ifdef JP - .incbin "data_080C93E0/gUnk_080C9870_1_JP.bin" -.else -.ifdef DEMO_JP - .incbin "data_080C93E0/gUnk_080C9870_2_DEMO_JP.bin" -.else - .incbin "data_080C93E0/gUnk_080C9870_3_USA-DEMO_USA.bin" -.endif -.endif -.endif - -gUnk_080C98E8:: @ 080C98E8 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C98E8_EU.bin" -.else -.ifdef JP - .incbin "data_080C93E0/gUnk_080C98E8_1_JP.bin" -.else -.ifdef DEMO_JP - .incbin "data_080C93E0/gUnk_080C98E8_2_DEMO_JP.bin" -.else - .incbin "data_080C93E0/gUnk_080C98E8_3_USA-DEMO_USA.bin" -.endif -.endif -.endif - -gUnk_080C9928:: @ 080C9928 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9928_EU.bin" -.else -.ifdef JP - .incbin "data_080C93E0/gUnk_080C9928_1_JP.bin" -.else -.ifdef DEMO_JP - .incbin "data_080C93E0/gUnk_080C9928_2_DEMO_JP.bin" -.else - .incbin "data_080C93E0/gUnk_080C9928_3_USA-DEMO_USA.bin" -.endif -.endif -.endif - -gUnk_080C9988:: @ 080C9988 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9988_EU.bin" -.else -.ifdef JP - .incbin "data_080C93E0/gUnk_080C9988_1_JP.bin" -.else -.ifdef DEMO_JP - .incbin "data_080C93E0/gUnk_080C9988_2_DEMO_JP.bin" -.else - .incbin "data_080C93E0/gUnk_080C9988_3_USA-DEMO_USA.bin" -.endif -.endif -.endif - -gUnk_080C99E8:: @ 080C99E8 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C99E8_EU.bin" -.else -.ifdef JP - .incbin "data_080C93E0/gUnk_080C99E8_1_JP.bin" -.else -.ifdef DEMO_JP - .incbin "data_080C93E0/gUnk_080C99E8_2_DEMO_JP.bin" -.else - .incbin "data_080C93E0/gUnk_080C99E8_3_USA-DEMO_USA.bin" -.endif -.endif -.endif - -gUnk_080C9A30:: @ 080C9A30 - .4byte gUnk_080C9870 - .4byte gUnk_080C98E8 - .4byte gUnk_080C9928 - .4byte gUnk_080C9988 - .4byte gUnk_080C99E8 - -gUnk_080C9A44:: @ 080C9A44 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9A44_EU.bin" -.else -.ifdef JP - .incbin "data_080C93E0/gUnk_080C9A44_1_JP.bin" -.else -.ifdef DEMO_JP - .incbin "data_080C93E0/gUnk_080C9A44_2_DEMO_JP.bin" -.else - .incbin "data_080C93E0/gUnk_080C9A44_3_USA-DEMO_USA.bin" -.endif -.endif -.endif - -gUnk_080C9A7C:: @ 080C9A7C -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9A7C_EU.bin" -.else -.ifdef JP - .incbin "data_080C93E0/gUnk_080C9A7C_1_JP.bin" -.else -.ifdef DEMO_JP - .incbin "data_080C93E0/gUnk_080C9A7C_2_DEMO_JP.bin" -.else - .incbin "data_080C93E0/gUnk_080C9A7C_3_USA-DEMO_USA.bin" -.endif -.endif -.endif - -gUnk_080C9B2C:: @ 080C9B2C -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9B2C_EU.bin" -.else -.ifdef JP - .incbin "data_080C93E0/gUnk_080C9B2C_1_JP.bin" -.else -.ifdef DEMO_JP - .incbin "data_080C93E0/gUnk_080C9B2C_2_DEMO_JP.bin" -.else - .incbin "data_080C93E0/gUnk_080C9B2C_3_USA-DEMO_USA.bin" -.endif -.endif -.endif - -gUnk_080C9BB4:: @ 080C9BB4 -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9BB4_EU.bin" -.else -.ifdef JP - .incbin "data_080C93E0/gUnk_080C9BB4_1_JP.bin" -.else -.ifdef DEMO_JP - .incbin "data_080C93E0/gUnk_080C9BB4_2_DEMO_JP.bin" -.else - .incbin "data_080C93E0/gUnk_080C9BB4_3_USA-DEMO_USA.bin" -.endif -.endif -.endif - -gUnk_080C9C1C:: @ 080C9C1C -.ifdef EU - @ TODO only small differences - .incbin "data_080C93E0/gUnk_080C9C1C_EU.bin" -.else -.ifdef JP - .incbin "data_080C93E0/gUnk_080C9C1C_1_JP.bin" -.else -.ifdef DEMO_JP - .incbin "data_080C93E0/gUnk_080C9C1C_2_DEMO_JP.bin" -.else - .incbin "data_080C93E0/gUnk_080C9C1C_3_USA-DEMO_USA.bin" -.endif -.endif -.endif - -gUnk_080C9C3C:: @ 080C9C3C - .4byte gUnk_080C9A44 - .4byte gUnk_080C9A7C - .4byte gUnk_080C9B2C - .4byte gUnk_080C9BB4 - .4byte gUnk_080C9C1C - -@ common.c -gUnk_080C9C50:: @ 080C9C50 - .4byte gUnk_080C9488 - .4byte gUnk_080C953C - .4byte gUnk_080C9600 - .4byte gUnk_080C96F8 - .4byte gUnk_080C9864 - .4byte gUnk_080C9A30 - .4byte gUnk_080C9C3C diff --git a/data/const/entity.s b/data/const/entity.s deleted file mode 100644 index af8d9ff0..00000000 --- a/data/const/entity.s +++ /dev/null @@ -1,380 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08108E6C:: @ 08108E6C - .incbin "data_08108E6C/gUnk_08108E6C.bin" - -gUnk_08108E78:: @ 08108E78 -.ifdef EU - @ TODO only small differences - .incbin "data_08108E6C/gUnk_08108E78_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08108E78_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08108E90:: @ 08108E90 - .4byte gUnk_08108E6C - .4byte gUnk_08108E78 - -gUnk_08108E98:: @ 08108E98 -.ifdef EU - @ TODO only small differences - .incbin "data_08108E6C/gUnk_08108E98_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08108E98_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08108EA4:: @ 08108EA4 - .incbin "data_08108E6C/gUnk_08108EA4.bin" - -gUnk_08108EBC:: @ 08108EBC - .4byte gUnk_08108E98 - .4byte gUnk_08108EA4 - -gUnk_08108EC4:: @ 08108EC4 -.ifdef EU - @ TODO only small differences - .incbin "data_08108E6C/gUnk_08108EC4_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08108EC4_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08108ED0:: @ 08108ED0 -.ifdef EU - @ TODO only small differences - .incbin "data_08108E6C/gUnk_08108ED0_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08108ED0_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08108EE8:: @ 08108EE8 - .4byte gUnk_08108EC4 - .4byte gUnk_08108ED0 - -gUnk_08108EF0:: @ 08108EF0 -.ifdef EU - @ TODO only small differences - .incbin "data_08108E6C/gUnk_08108EF0_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08108EF0_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08108EFC:: @ 08108EFC -.ifdef EU - .incbin "data_08108E6C/gUnk_08108EFC_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08108EFC_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08108F14:: @ 08108F14 - .4byte gUnk_08108EF0 - .4byte gUnk_08108EFC - -gUnk_08108F1C:: @ 08108F1C -.ifdef EU - @ TODO only small differences - .incbin "data_08108E6C/gUnk_08108F1C_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08108F1C_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08108F28:: @ 08108F28 -.ifdef EU - @ TODO only small differences - .incbin "data_08108E6C/gUnk_08108F28_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08108F28_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08108F40:: @ 08108F40 - .4byte gUnk_08108F1C - .4byte gUnk_08108F28 - -gUnk_08108F48:: @ 08108F48 -.ifdef EU - .incbin "data_08108E6C/gUnk_08108F48_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08108F48_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif -.ifdef EU - .incbin "data_08108E6C/gUnk_08108F48_2_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08108F48_3_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08108F54:: @ 08108F54 -.ifdef EU - .incbin "data_08108E6C/gUnk_08108F54_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08108F54_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08108F6C:: @ 08108F6C - .4byte gUnk_08108F48 - .4byte gUnk_08108F54 - -gUnk_08108F74:: @ 08108F74 -.ifdef EU - .incbin "data_08108E6C/gUnk_08108F74_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08108F74_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08108F80:: @ 08108F80 -.ifdef EU - .incbin "data_08108E6C/gUnk_08108F80_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08108F80_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08108F98:: @ 08108F98 - .4byte gUnk_08108F74 - .4byte gUnk_08108F80 - -gUnk_08108FA0:: @ 08108FA0 -.ifdef EU - .incbin "data_08108E6C/gUnk_08108FA0_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08108FA0_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08108FAC:: @ 08108FAC -.ifdef EU - .incbin "data_08108E6C/gUnk_08108FAC_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08108FAC_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08108FC4:: @ 08108FC4 - .4byte gUnk_08108FA0 - .4byte gUnk_08108FAC - -gUnk_08108FCC:: @ 08108FCC -.ifdef EU - .incbin "data_08108E6C/gUnk_08108FCC_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08108FCC_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08108FD8:: @ 08108FD8 -.ifdef EU - .incbin "data_08108E6C/gUnk_08108FD8_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08108FD8_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08108FF0:: @ 08108FF0 - .4byte gUnk_08108FCC - .4byte gUnk_08108FD8 - -gUnk_08108FF8:: @ 08108FF8 -.ifdef EU - .incbin "data_08108E6C/gUnk_08108FF8_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08108FF8_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08109004:: @ 08109004 -.ifdef EU - .incbin "data_08108E6C/gUnk_08109004_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08109004_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif -.ifdef EU - .incbin "data_08108E6C/gUnk_08109004_2_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08109004_3_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif -.ifdef EU - .incbin "data_08108E6C/gUnk_08109004_4_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08109004_5_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_0810901C:: @ 0810901C - .4byte gUnk_08108FF8 - .4byte gUnk_08109004 - -gUnk_08109024:: @ 08109024 -.ifdef EU - .incbin "data_08108E6C/gUnk_08109024_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08109024_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08109030:: @ 08109030 -.ifdef EU - .incbin "data_08108E6C/gUnk_08109030_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08109030_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif -.ifdef EU - .incbin "data_08108E6C/gUnk_08109030_2_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08109030_3_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08109048:: @ 08109048 - .4byte gUnk_08109024 - .4byte gUnk_08109030 - -gUnk_08109050:: @ 08109050 -.ifdef EU - .incbin "data_08108E6C/gUnk_08109050_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08109050_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_0810905C:: @ 0810905C -.ifdef EU - .incbin "data_08108E6C/gUnk_0810905C_EU.bin" -.else - .incbin "data_08108E6C/gUnk_0810905C_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08109074:: @ 08109074 - .4byte gUnk_08109050 - .4byte gUnk_0810905C - -gUnk_0810907C:: @ 0810907C -.ifdef EU - .incbin "data_08108E6C/gUnk_0810907C_EU.bin" -.else - .incbin "data_08108E6C/gUnk_0810907C_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08109088:: @ 08109088 -.ifdef EU - .incbin "data_08108E6C/gUnk_08109088_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08109088_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_081090A0:: @ 081090A0 - .4byte gUnk_0810907C - .4byte gUnk_08109088 - -gUnk_081090A8:: @ 081090A8 -.ifdef EU - .incbin "data_08108E6C/gUnk_081090A8_EU.bin" -.else - .incbin "data_08108E6C/gUnk_081090A8_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_081090B4:: @ 081090B4 -.ifdef EU - .incbin "data_08108E6C/gUnk_081090B4_EU.bin" -.else - .incbin "data_08108E6C/gUnk_081090B4_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_081090CC:: @ 081090CC - .4byte gUnk_081090A8 - .4byte gUnk_081090B4 - -gUnk_081090D4:: @ 081090D4 -.ifdef EU - .incbin "data_08108E6C/gUnk_081090D4_EU.bin" -.else - .incbin "data_08108E6C/gUnk_081090D4_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_081090E0:: @ 081090E0 -.ifdef EU - .incbin "data_08108E6C/gUnk_081090E0_EU.bin" -.else - .incbin "data_08108E6C/gUnk_081090E0_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_081090F8:: @ 081090F8 - .4byte gUnk_081090D4 - .4byte gUnk_081090E0 - -gUnk_08109100:: @ 08109100 -.ifdef EU - .incbin "data_08108E6C/gUnk_08109100_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08109100_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_0810910C:: @ 0810910C -.ifdef EU - .incbin "data_08108E6C/gUnk_0810910C_EU.bin" -.else - .incbin "data_08108E6C/gUnk_0810910C_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08109124:: @ 08109124 - .4byte gUnk_08109100 - .4byte gUnk_0810910C - -gUnk_0810912C:: @ 0810912C -.ifdef EU - .incbin "data_08108E6C/gUnk_0810912C_EU.bin" -.else - .incbin "data_08108E6C/gUnk_0810912C_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08109138:: @ 08109138 - .4byte gUnk_0810912C - .4byte gUnk_081090E0 - -gUnk_08109140:: @ 08109140 -.ifdef EU - .incbin "data_08108E6C/gUnk_08109140_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08109140_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08109158:: @ 08109158 - .4byte gUnk_08109100 - .4byte gUnk_08109140 - -gUnk_08109160:: @ 08109160 -.ifdef EU - @ TODO only small differences - .incbin "data_08108E6C/gUnk_08109160_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08109160_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_08109178:: @ 08109178 - .4byte gUnk_081090D4 - .4byte gUnk_08109160 - -gUnk_08109180:: @ 08109180 -.ifdef EU - .incbin "data_08108E6C/gUnk_08109180_EU.bin" -.else - .incbin "data_08108E6C/gUnk_08109180_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -gUnk_0810918C:: @ 0810918C - .4byte gUnk_08109180 - .4byte gUnk_0810910C - -@ scroll.c -gUnk_08109194:: @ 08109194 - .4byte gUnk_08108E90 - .4byte gUnk_08108EBC - .4byte gUnk_08108EE8 - .4byte gUnk_08108F14 - .4byte gUnk_08108F40 - .4byte gUnk_08108F6C - .4byte gUnk_08108F98 - .4byte gUnk_08108FC4 - .4byte gUnk_08108FF0 - .4byte gUnk_0810901C - .4byte gUnk_08109048 - .4byte gUnk_08109074 - .4byte gUnk_081090A0 - .4byte gUnk_081090CC - .4byte gUnk_081090F8 - .4byte gUnk_08109124 - .4byte gUnk_08109138 - .4byte gUnk_08109158 - .4byte gUnk_08109178 - .4byte gUnk_0810918C diff --git a/data/const/playerItem/playerItemCellOverwriteSet.s b/data/const/playerItem/playerItemCellOverwriteSet.s deleted file mode 100644 index 97280cad..00000000 --- a/data/const/playerItem/playerItemCellOverwriteSet.s +++ /dev/null @@ -1,21 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - @.align 2 - -@ before: playerItemBottle -@ after: playerItemCellOverwriteSet - -@ scroll.c, intr.s, veener.s -gUnk_080B7910:: @ 080B7910 - .incbin "data_080B7910/gUnk_080B7910.bin" - -@ veener.s, playerUtils.c -gUnk_080B79A7:: @ 080B79A7 - .incbin "data_080B7910/gUnk_080B79A7.bin" - -@ intr.s -gUnk_080B7A3E:: @ 080B7A3E - .incbin "data_080B7910/gUnk_080B7A3E.bin" - diff --git a/data/const/staffroll.s b/data/const/staffroll.s index 5b03d4e7..565fc171 100644 --- a/data/const/staffroll.s +++ b/data/const/staffroll.s @@ -36,17 +36,3 @@ gUnk_08127D10:: @ 08127D10 .4byte StaffrollTask_State1MenuType7 @ End of staffroll - - -@ game.c -gAreaMetadata:: @ 08127D30 -.ifdef EU - @ TODO only small differences - .incbin "data_08127280/gAreaMetadata_EU.bin" -.else - .incbin "data_08127280/gAreaMetadata_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif - -@ game.c, subtask2.c -gUnk_08127F94:: @ 08127F94 - .incbin "data_08127280/gUnk_08127F94.bin" diff --git a/data/const/subtask.s b/data/const/subtask.s index a5234fc3..fea1f958 100644 --- a/data/const/subtask.s +++ b/data/const/subtask.s @@ -123,8 +123,8 @@ gUnk_08128FC0:: @ 08128FC0 gUnk_08128FD8:: @ 08128FD8 .incbin "data_08127280/gUnk_08128FD8.bin" -gUnk_08128FF0:: @ 08128FF0 - .incbin "data_08127280/gUnk_08128FF0.bin" +gDungeonNames:: @ 08128FF0 + .incbin "data_08127280/gDungeonNames.bin" gUnk_08129004:: @ 08129004 .incbin "data_08127280/gUnk_08129004.bin" diff --git a/data/gfx/palette_groups.s b/data/gfx/palette_groups.s index 93873c37..d6d40796 100644 --- a/data/gfx/palette_groups.s +++ b/data/gfx/palette_groups.s @@ -3495,623 +3495,623 @@ gPaletteGroup_10:: palette_set palette=pal_0, offset=0x10, count=5 palette_set palette=pal_3438, offset=0x18, count=1, terminator=1 -gPaletteGroup_21:: +gPaletteGroup_12:: palette_set palette=pal_12, offset=0xf, count=1, terminator=1 -gPaletteGroup_20:: +gPaletteGroup_11:: palette_set palette=pal_0, offset=0x10, count=5 palette_set palette=pal_0, count=5, terminator=1 -gPaletteGroup_37:: +gPaletteGroup_28:: palette_set palette=pal_354, offset=0x2, count=13, terminator=1 -gPaletteGroup_48:: +gPaletteGroup_39:: palette_set palette=pal_380, offset=0x2, count=13, terminator=1 -gPaletteGroup_30:: +gPaletteGroup_21:: palette_set palette=pal_367, offset=0x2, count=13, terminator=1 -gPaletteGroup_29:: +gPaletteGroup_20:: palette_set palette=pal_393, offset=0x2, count=13, terminator=1 -gPaletteGroup_23:: +gPaletteGroup_14:: palette_set palette=pal_1118, offset=0x2, count=13, terminator=1 -gPaletteGroup_31:: - palette_set palette=pal_1118, offset=0x2, count=13, terminator=1 - -gPaletteGroup_32:: - palette_set palette=pal_1131, offset=0x2, count=13, terminator=1 - -gPaletteGroup_33:: - palette_set palette=pal_1144, offset=0x2, count=13, terminator=1 - -gPaletteGroup_34:: - palette_set palette=pal_1157, offset=0x2, count=13, terminator=1 - -gPaletteGroup_70:: - palette_set palette=pal_1170, offset=0x2, count=13, terminator=1 - -gPaletteGroup_36:: - palette_set palette=pal_406, offset=0x2, count=13, terminator=1 - -gPaletteGroup_269:: - palette_set palette=pal_419, offset=0x2, count=13, terminator=1 - -gPaletteGroup_63:: - palette_set palette=pal_432, offset=0x2, count=13, terminator=1 - -gPaletteGroup_27:: - palette_set palette=pal_1183, offset=0x2, count=13, terminator=1 - -gPaletteGroup_72:: - palette_set palette=pal_1196, offset=0x2, count=13, terminator=1 - -gPaletteGroup_73:: - palette_set palette=pal_1209, offset=0x2, count=13, terminator=1 - -gPaletteGroup_74:: - palette_set palette=pal_1222, offset=0x2, count=13, terminator=1 - -gPaletteGroup_75:: - palette_set palette=pal_1235, offset=0x2, count=13, terminator=1 - -gPaletteGroup_102:: - palette_set palette=pal_1248, offset=0x2, count=13, terminator=1 - -gPaletteGroup_24:: - palette_set palette=pal_685, offset=0x2, count=13, terminator=1 - -gPaletteGroup_208:: - palette_set palette=pal_698, offset=0x2, count=13, terminator=1 - -gPaletteGroup_26:: - palette_set palette=pal_711, offset=0x2, count=13, terminator=1 - -gPaletteGroup_35:: - palette_set palette=pal_724, offset=0x2, count=13, terminator=1 - -gPaletteGroup_99:: - palette_set palette=pal_737, offset=0x2, count=13, terminator=1 - -gPaletteGroup_45:: - palette_set palette=pal_750, offset=0x2, count=13, terminator=1 - -gPaletteGroup_46:: - palette_set palette=pal_763, offset=0x2, count=13, terminator=1 - -gPaletteGroup_227:: - palette_set palette=pal_776, offset=0x2, count=13, terminator=1 - -gPaletteGroup_103:: - palette_set palette=pal_789, offset=0x2, count=13, terminator=1 - -gPaletteGroup_64:: - palette_set palette=pal_802, offset=0x2, count=13, terminator=1 - -gPaletteGroup_203:: - palette_set palette=pal_815, offset=0x2, count=13, terminator=1 - -gPaletteGroup_229:: - palette_set palette=pal_828, offset=0x2, count=13, terminator=1 - -gPaletteGroup_69:: - palette_set palette=pal_845, offset=0x2, count=13, terminator=1 - -gPaletteGroup_65:: - palette_set palette=pal_858, offset=0x2, count=13, terminator=1 - -gPaletteGroup_261:: - palette_set palette=pal_1105, offset=0x2, count=13, terminator=1 - -gPaletteGroup_66:: - palette_set palette=pal_871, offset=0x2, count=13, terminator=1 - -gPaletteGroup_67:: - palette_set palette=pal_884, offset=0x2, count=13, terminator=1 - -gPaletteGroup_244:: - palette_set palette=pal_897, offset=0x2, count=13, terminator=1 - -gPaletteGroup_68:: - palette_set palette=pal_910, offset=0x2, count=13, terminator=1 - -gPaletteGroup_243:: - palette_set palette=pal_962, offset=0x2, count=13, terminator=1 - -gPaletteGroup_279:: - palette_set palette=pal_923, offset=0x2, count=13, terminator=1 - -gPaletteGroup_254:: - palette_set palette=pal_936, offset=0x2, count=13, terminator=1 - -gPaletteGroup_255:: - palette_set palette=pal_949, offset=0x2, count=13, terminator=1 - -gPaletteGroup_268:: - palette_set palette=pal_975, offset=0x2, count=13, terminator=1 - -gPaletteGroup_204:: - palette_set palette=pal_988, offset=0x2, count=13, terminator=1 - -gPaletteGroup_205:: - palette_set palette=pal_1001, offset=0x2, count=13, terminator=1 - -gPaletteGroup_206:: - palette_set palette=pal_1014, offset=0x2, count=13, terminator=1 - -gPaletteGroup_207:: - palette_set palette=pal_1027, offset=0x2, count=13, terminator=1 - -gPaletteGroup_219:: - palette_set palette=pal_1040, offset=0x2, count=13, terminator=1 - -gPaletteGroup_262:: - palette_set palette=pal_1053, offset=0x2, count=13, terminator=1 - -gPaletteGroup_263:: - palette_set palette=pal_1066, offset=0x2, count=13, terminator=1 - -gPaletteGroup_264:: - palette_set palette=pal_1079, offset=0x2, count=13, terminator=1 - -gPaletteGroup_265:: - palette_set palette=pal_1092, offset=0x2, count=13, terminator=1 - -gPaletteGroup_25:: - palette_set palette=pal_445, offset=0x2, count=13, terminator=1 - -gPaletteGroup_55:: - palette_set palette=pal_458, offset=0x2, count=13, terminator=1 - -gPaletteGroup_76:: - palette_set palette=pal_471, offset=0x2, count=13, terminator=1 - -gPaletteGroup_94:: - palette_set palette=pal_484, offset=0x2, count=13, terminator=1 - -gPaletteGroup_28:: - palette_set palette=pal_497, offset=0x2, count=13, terminator=1 - -gPaletteGroup_38:: - palette_set palette=pal_536, offset=0x2, count=13, terminator=1 - -gPaletteGroup_39:: - palette_set palette=pal_549, offset=0x2, count=13, terminator=1 - -gPaletteGroup_42:: - palette_set palette=pal_588, offset=0x2, count=13, terminator=1 - -gPaletteGroup_108:: - palette_set palette=pal_601, offset=0x2, count=13, terminator=1 - -gPaletteGroup_109:: - palette_set palette=pal_510, offset=0x2, count=13, terminator=1 - -gPaletteGroup_266:: - palette_set palette=pal_523, offset=0x2, count=13, terminator=1 - -gPaletteGroup_53:: - palette_set palette=pal_575, offset=0x2, count=13, terminator=1 - -gPaletteGroup_40:: - palette_set palette=pal_614, offset=0x2, count=13, terminator=1 - -gPaletteGroup_41:: - palette_set palette=pal_627, offset=0x2, count=13, terminator=1 - -gPaletteGroup_47:: - palette_set palette=pal_640, offset=0x2, count=13, terminator=1 - -gPaletteGroup_50:: - palette_set palette=pal_666, offset=0x2, count=13, terminator=1 - -gPaletteGroup_71:: - palette_set palette=pal_1921, offset=0x2, count=13, terminator=1 - -gPaletteGroup_101:: - palette_set palette=pal_1934, offset=0x2, count=13, terminator=1 - -gPaletteGroup_201:: - palette_set palette=pal_1947, offset=0x2, count=13, terminator=1 - -gPaletteGroup_202:: - palette_set palette=pal_1960, offset=0x2, count=13, terminator=1 - -gPaletteGroup_60:: - palette_set palette=pal_1262, offset=0x2, count=13, terminator=1 - -gPaletteGroup_61:: - palette_set palette=pal_1275, offset=0x2, count=13, terminator=1 - -gPaletteGroup_98:: - palette_set palette=pal_1288, offset=0x2, count=13, terminator=1 - -gPaletteGroup_256:: - palette_set palette=pal_1301, offset=0x2, count=13, terminator=1 - -gPaletteGroup_267:: - palette_set palette=pal_1314, offset=0x2, count=13, terminator=1 - -gPaletteGroup_62:: - palette_set palette=pal_1327, offset=0x2, count=13, terminator=1 - gPaletteGroup_22:: - palette_set palette=pal_1340, offset=0x2, count=13, terminator=1 + palette_set palette=pal_1118, offset=0x2, count=13, terminator=1 + +gPaletteGroup_23:: + palette_set palette=pal_1131, offset=0x2, count=13, terminator=1 + +gPaletteGroup_24:: + palette_set palette=pal_1144, offset=0x2, count=13, terminator=1 + +gPaletteGroup_25:: + palette_set palette=pal_1157, offset=0x2, count=13, terminator=1 + +gPaletteGroup_61:: + palette_set palette=pal_1170, offset=0x2, count=13, terminator=1 + +gPaletteGroup_27:: + palette_set palette=pal_406, offset=0x2, count=13, terminator=1 + +gPaletteGroup_170:: + palette_set palette=pal_419, offset=0x2, count=13, terminator=1 gPaletteGroup_54:: - palette_set palette=pal_1353, offset=0x2, count=13, terminator=1 + palette_set palette=pal_432, offset=0x2, count=13, terminator=1 -gPaletteGroup_245:: - palette_set palette=pal_1366, offset=0x2, count=13, terminator=1 +gPaletteGroup_18:: + palette_set palette=pal_1183, offset=0x2, count=13, terminator=1 -gPaletteGroup_246:: - palette_set palette=pal_1379, offset=0x2, count=13, terminator=1 +gPaletteGroup_63:: + palette_set palette=pal_1196, offset=0x2, count=13, terminator=1 -gPaletteGroup_247:: - palette_set palette=pal_1392, offset=0x2, count=13, terminator=1 +gPaletteGroup_64:: + palette_set palette=pal_1209, offset=0x2, count=13, terminator=1 -gPaletteGroup_248:: - palette_set palette=pal_1405, offset=0x2, count=13, terminator=1 +gPaletteGroup_65:: + palette_set palette=pal_1222, offset=0x2, count=13, terminator=1 -gPaletteGroup_249:: - palette_set palette=pal_1418, offset=0x2, count=13, terminator=1 - -gPaletteGroup_43:: - palette_set palette=pal_1431, offset=0x2, count=13, terminator=1 - -gPaletteGroup_250:: - palette_set palette=pal_1444, offset=0x2, count=13, terminator=1 - -gPaletteGroup_251:: - palette_set palette=pal_1457, offset=0x2, count=13, terminator=1 - -gPaletteGroup_252:: - palette_set palette=pal_1470, offset=0x2, count=13, terminator=1 - -gPaletteGroup_253:: - palette_set palette=pal_1483, offset=0x2, count=13, terminator=1 - -gPaletteGroup_44:: - palette_set palette=pal_1908, offset=0x2, count=13, terminator=1 - -gPaletteGroup_200:: - palette_set palette=pal_1973, offset=0x2, count=13, terminator=1 - -gPaletteGroup_209:: - palette_set palette=pal_1986, offset=0x2, count=13, terminator=1 - -gPaletteGroup_220:: - palette_set palette=pal_1496, offset=0x2, count=13, terminator=1 - -gPaletteGroup_224:: - palette_set palette=pal_1999, offset=0x2, count=13, terminator=1 - -gPaletteGroup_225:: - palette_set palette=pal_1509, offset=0x2, count=13, terminator=1 - -gPaletteGroup_226:: - palette_set palette=pal_1522, offset=0x2, count=13, terminator=1 - -gPaletteGroup_230:: - palette_set palette=pal_2012, offset=0x2, count=13, terminator=1 - -gPaletteGroup_231:: - palette_set palette=pal_2025, offset=0x2, count=13, terminator=1 - -gPaletteGroup_232:: - palette_set palette=pal_2038, offset=0x2, count=13, terminator=1 - -gPaletteGroup_257:: - palette_set palette=pal_2051, offset=0x2, count=13, terminator=1 - -gPaletteGroup_258:: - palette_set palette=pal_2064, offset=0x2, count=13, terminator=1 - -gPaletteGroup_259:: - palette_set palette=pal_2077, offset=0x2, count=13, terminator=1 - -gPaletteGroup_260:: - palette_set palette=pal_1535, offset=0x2, count=13, terminator=1 - -gPaletteGroup_210:: - palette_set palette=pal_2090, offset=0xb, count=1, terminator=1 - -gPaletteGroup_211:: - palette_set palette=pal_2091, offset=0xb, count=1, terminator=1 - -gPaletteGroup_212:: - palette_set palette=pal_2092, offset=0xb, count=1, terminator=1 - -gPaletteGroup_213:: - palette_set palette=pal_2093, offset=0xb, count=1, terminator=1 - -gPaletteGroup_104:: - palette_set palette=pal_2124, count=16, terminator=1 - -gPaletteGroup_105:: - palette_set palette=pal_2143, count=16, terminator=1 - -gPaletteGroup_106:: - palette_set palette=pal_2162, count=16, terminator=1 - -gPaletteGroup_107:: - palette_set palette=pal_2181, count=16, terminator=1 - -gPaletteGroup_77:: - palette_set palette=pal_1548, offset=0x3, count=12, terminator=1 - -gPaletteGroup_78:: - palette_set palette=pal_1560, offset=0x3, count=12, terminator=1 - -gPaletteGroup_79:: - palette_set palette=pal_1572, offset=0x3, count=12, terminator=1 - -gPaletteGroup_80:: - palette_set palette=pal_1584, offset=0x3, count=12, terminator=1 - -gPaletteGroup_81:: - palette_set palette=pal_1596, offset=0x3, count=12, terminator=1 - -gPaletteGroup_82:: - palette_set palette=pal_1608, offset=0x3, count=12, terminator=1 - -gPaletteGroup_83:: - palette_set palette=pal_1620, offset=0x3, count=12, terminator=1 - -gPaletteGroup_84:: - palette_set palette=pal_1632, offset=0x3, count=12, terminator=1 - -gPaletteGroup_85:: - palette_set palette=pal_1644, offset=0x3, count=12, terminator=1 - -gPaletteGroup_95:: - palette_set palette=pal_1656, offset=0x3, count=12, terminator=1 - -gPaletteGroup_96:: - palette_set palette=pal_1668, offset=0x3, count=12, terminator=1 - -gPaletteGroup_97:: - palette_set palette=pal_1680, offset=0x3, count=12, terminator=1 - -gPaletteGroup_86:: - palette_set palette=pal_1692, offset=0x3, count=12, terminator=1 - -gPaletteGroup_87:: - palette_set palette=pal_1704, offset=0x3, count=12, terminator=1 - -gPaletteGroup_88:: - palette_set palette=pal_1716, offset=0x3, count=12, terminator=1 - -gPaletteGroup_89:: - palette_set palette=pal_1728, offset=0x3, count=12, terminator=1 - -gPaletteGroup_90:: - palette_set palette=pal_1740, offset=0x3, count=12, terminator=1 - -gPaletteGroup_91:: - palette_set palette=pal_1752, offset=0x3, count=12, terminator=1 - -gPaletteGroup_92:: - palette_set palette=pal_1764, offset=0x3, count=12, terminator=1 +gPaletteGroup_66:: + palette_set palette=pal_1235, offset=0x2, count=13, terminator=1 gPaletteGroup_93:: - palette_set palette=pal_1776, offset=0x3, count=12, terminator=1 + palette_set palette=pal_1248, offset=0x2, count=13, terminator=1 -gPaletteGroup_214:: - palette_set palette=pal_1788, offset=0x3, count=12, terminator=1 +gPaletteGroup_15:: + palette_set palette=pal_685, offset=0x2, count=13, terminator=1 -gPaletteGroup_215:: - palette_set palette=pal_1800, offset=0x3, count=12, terminator=1 +gPaletteGroup_109:: + palette_set palette=pal_698, offset=0x2, count=13, terminator=1 -gPaletteGroup_216:: - palette_set palette=pal_1812, offset=0x3, count=12, terminator=1 +gPaletteGroup_17:: + palette_set palette=pal_711, offset=0x2, count=13, terminator=1 -gPaletteGroup_217:: - palette_set palette=pal_1824, offset=0x3, count=12, terminator=1 +gPaletteGroup_26:: + palette_set palette=pal_724, offset=0x2, count=13, terminator=1 -gPaletteGroup_218:: - palette_set palette=pal_1836, offset=0x3, count=12, terminator=1 +gPaletteGroup_90:: + palette_set palette=pal_737, offset=0x2, count=13, terminator=1 -gPaletteGroup_228:: - palette_set palette=pal_1848, offset=0x3, count=12, terminator=1 +gPaletteGroup_36:: + palette_set palette=pal_750, offset=0x2, count=13, terminator=1 -gPaletteGroup_223:: - palette_set palette=pal_1860, offset=0x3, count=12, terminator=1 +gPaletteGroup_37:: + palette_set palette=pal_763, offset=0x2, count=13, terminator=1 -gPaletteGroup_222:: - palette_set palette=pal_1872, offset=0x3, count=12, terminator=1 +gPaletteGroup_128:: + palette_set palette=pal_776, offset=0x2, count=13, terminator=1 -gPaletteGroup_221:: - palette_set palette=pal_1884, offset=0x3, count=12, terminator=1 +gPaletteGroup_94:: + palette_set palette=pal_789, offset=0x2, count=13, terminator=1 -gPaletteGroup_49:: - palette_set palette=pal_2204, count=8, terminator=1 +gPaletteGroup_55:: + palette_set palette=pal_802, offset=0x2, count=13, terminator=1 -gPaletteGroup_51:: - palette_set palette=pal_2094, offset=0x5, count=3, terminator=1 +gPaletteGroup_104:: + palette_set palette=pal_815, offset=0x2, count=13, terminator=1 -gPaletteGroup_52:: - palette_set palette=pal_2097, offset=0x5, count=3, terminator=1 +gPaletteGroup_130:: + palette_set palette=pal_828, offset=0x2, count=13, terminator=1 + +gPaletteGroup_60:: + palette_set palette=pal_845, offset=0x2, count=13, terminator=1 gPaletteGroup_56:: - palette_set palette=pal_5, offset=0x1f, count=1, terminator=1 + palette_set palette=pal_858, offset=0x2, count=13, terminator=1 + +gPaletteGroup_162:: + palette_set palette=pal_1105, offset=0x2, count=13, terminator=1 gPaletteGroup_57:: - palette_set palette=pal_6, offset=0x1f, count=1, terminator=1 + palette_set palette=pal_871, offset=0x2, count=13, terminator=1 gPaletteGroup_58:: - palette_set palette=pal_7, offset=0x1f, count=1, terminator=1 + palette_set palette=pal_884, offset=0x2, count=13, terminator=1 + +gPaletteGroup_145:: + palette_set palette=pal_897, offset=0x2, count=13, terminator=1 gPaletteGroup_59:: - palette_set palette=pal_8, offset=0x1f, count=1, terminator=1 + palette_set palette=pal_910, offset=0x2, count=13, terminator=1 + +gPaletteGroup_144:: + palette_set palette=pal_962, offset=0x2, count=13, terminator=1 + +gPaletteGroup_180:: + palette_set palette=pal_923, offset=0x2, count=13, terminator=1 + +gPaletteGroup_155:: + palette_set palette=pal_936, offset=0x2, count=13, terminator=1 + +gPaletteGroup_156:: + palette_set palette=pal_949, offset=0x2, count=13, terminator=1 + +gPaletteGroup_169:: + palette_set palette=pal_975, offset=0x2, count=13, terminator=1 + +gPaletteGroup_105:: + palette_set palette=pal_988, offset=0x2, count=13, terminator=1 + +gPaletteGroup_106:: + palette_set palette=pal_1001, offset=0x2, count=13, terminator=1 + +gPaletteGroup_107:: + palette_set palette=pal_1014, offset=0x2, count=13, terminator=1 + +gPaletteGroup_108:: + palette_set palette=pal_1027, offset=0x2, count=13, terminator=1 + +gPaletteGroup_120:: + palette_set palette=pal_1040, offset=0x2, count=13, terminator=1 + +gPaletteGroup_163:: + palette_set palette=pal_1053, offset=0x2, count=13, terminator=1 + +gPaletteGroup_164:: + palette_set palette=pal_1066, offset=0x2, count=13, terminator=1 + +gPaletteGroup_165:: + palette_set palette=pal_1079, offset=0x2, count=13, terminator=1 + +gPaletteGroup_166:: + palette_set palette=pal_1092, offset=0x2, count=13, terminator=1 + +gPaletteGroup_16:: + palette_set palette=pal_445, offset=0x2, count=13, terminator=1 + +gPaletteGroup_46:: + palette_set palette=pal_458, offset=0x2, count=13, terminator=1 + +gPaletteGroup_67:: + palette_set palette=pal_471, offset=0x2, count=13, terminator=1 + +gPaletteGroup_85:: + palette_set palette=pal_484, offset=0x2, count=13, terminator=1 + +gPaletteGroup_19:: + palette_set palette=pal_497, offset=0x2, count=13, terminator=1 + +gPaletteGroup_29:: + palette_set palette=pal_536, offset=0x2, count=13, terminator=1 + +gPaletteGroup_30:: + palette_set palette=pal_549, offset=0x2, count=13, terminator=1 + +gPaletteGroup_33:: + palette_set palette=pal_588, offset=0x2, count=13, terminator=1 + +gPaletteGroup_99:: + palette_set palette=pal_601, offset=0x2, count=13, terminator=1 gPaletteGroup_100:: + palette_set palette=pal_510, offset=0x2, count=13, terminator=1 + +gPaletteGroup_167:: + palette_set palette=pal_523, offset=0x2, count=13, terminator=1 + +gPaletteGroup_44:: + palette_set palette=pal_575, offset=0x2, count=13, terminator=1 + +gPaletteGroup_31:: + palette_set palette=pal_614, offset=0x2, count=13, terminator=1 + +gPaletteGroup_32:: + palette_set palette=pal_627, offset=0x2, count=13, terminator=1 + +gPaletteGroup_38:: + palette_set palette=pal_640, offset=0x2, count=13, terminator=1 + +gPaletteGroup_41:: + palette_set palette=pal_666, offset=0x2, count=13, terminator=1 + +gPaletteGroup_62:: + palette_set palette=pal_1921, offset=0x2, count=13, terminator=1 + +gPaletteGroup_92:: + palette_set palette=pal_1934, offset=0x2, count=13, terminator=1 + +gPaletteGroup_102:: + palette_set palette=pal_1947, offset=0x2, count=13, terminator=1 + +gPaletteGroup_103:: + palette_set palette=pal_1960, offset=0x2, count=13, terminator=1 + +gPaletteGroup_51:: + palette_set palette=pal_1262, offset=0x2, count=13, terminator=1 + +gPaletteGroup_52:: + palette_set palette=pal_1275, offset=0x2, count=13, terminator=1 + +gPaletteGroup_89:: + palette_set palette=pal_1288, offset=0x2, count=13, terminator=1 + +gPaletteGroup_157:: + palette_set palette=pal_1301, offset=0x2, count=13, terminator=1 + +gPaletteGroup_168:: + palette_set palette=pal_1314, offset=0x2, count=13, terminator=1 + +gPaletteGroup_53:: + palette_set palette=pal_1327, offset=0x2, count=13, terminator=1 + +gPaletteGroup_13:: + palette_set palette=pal_1340, offset=0x2, count=13, terminator=1 + +gPaletteGroup_45:: + palette_set palette=pal_1353, offset=0x2, count=13, terminator=1 + +gPaletteGroup_146:: + palette_set palette=pal_1366, offset=0x2, count=13, terminator=1 + +gPaletteGroup_147:: + palette_set palette=pal_1379, offset=0x2, count=13, terminator=1 + +gPaletteGroup_148:: + palette_set palette=pal_1392, offset=0x2, count=13, terminator=1 + +gPaletteGroup_149:: + palette_set palette=pal_1405, offset=0x2, count=13, terminator=1 + +gPaletteGroup_150:: + palette_set palette=pal_1418, offset=0x2, count=13, terminator=1 + +gPaletteGroup_34:: + palette_set palette=pal_1431, offset=0x2, count=13, terminator=1 + +gPaletteGroup_151:: + palette_set palette=pal_1444, offset=0x2, count=13, terminator=1 + +gPaletteGroup_152:: + palette_set palette=pal_1457, offset=0x2, count=13, terminator=1 + +gPaletteGroup_153:: + palette_set palette=pal_1470, offset=0x2, count=13, terminator=1 + +gPaletteGroup_154:: + palette_set palette=pal_1483, offset=0x2, count=13, terminator=1 + +gPaletteGroup_35:: + palette_set palette=pal_1908, offset=0x2, count=13, terminator=1 + +gPaletteGroup_101:: + palette_set palette=pal_1973, offset=0x2, count=13, terminator=1 + +gPaletteGroup_110:: + palette_set palette=pal_1986, offset=0x2, count=13, terminator=1 + +gPaletteGroup_121:: + palette_set palette=pal_1496, offset=0x2, count=13, terminator=1 + +gPaletteGroup_125:: + palette_set palette=pal_1999, offset=0x2, count=13, terminator=1 + +gPaletteGroup_126:: + palette_set palette=pal_1509, offset=0x2, count=13, terminator=1 + +gPaletteGroup_127:: + palette_set palette=pal_1522, offset=0x2, count=13, terminator=1 + +gPaletteGroup_131:: + palette_set palette=pal_2012, offset=0x2, count=13, terminator=1 + +gPaletteGroup_132:: + palette_set palette=pal_2025, offset=0x2, count=13, terminator=1 + +gPaletteGroup_133:: + palette_set palette=pal_2038, offset=0x2, count=13, terminator=1 + +gPaletteGroup_158:: + palette_set palette=pal_2051, offset=0x2, count=13, terminator=1 + +gPaletteGroup_159:: + palette_set palette=pal_2064, offset=0x2, count=13, terminator=1 + +gPaletteGroup_160:: + palette_set palette=pal_2077, offset=0x2, count=13, terminator=1 + +gPaletteGroup_161:: + palette_set palette=pal_1535, offset=0x2, count=13, terminator=1 + +gPaletteGroup_111:: + palette_set palette=pal_2090, offset=0xb, count=1, terminator=1 + +gPaletteGroup_112:: + palette_set palette=pal_2091, offset=0xb, count=1, terminator=1 + +gPaletteGroup_113:: + palette_set palette=pal_2092, offset=0xb, count=1, terminator=1 + +gPaletteGroup_114:: + palette_set palette=pal_2093, offset=0xb, count=1, terminator=1 + +gPaletteGroup_95:: + palette_set palette=pal_2124, count=16, terminator=1 + +gPaletteGroup_96:: + palette_set palette=pal_2143, count=16, terminator=1 + +gPaletteGroup_97:: + palette_set palette=pal_2162, count=16, terminator=1 + +gPaletteGroup_98:: + palette_set palette=pal_2181, count=16, terminator=1 + +gPaletteGroup_68:: + palette_set palette=pal_1548, offset=0x3, count=12, terminator=1 + +gPaletteGroup_69:: + palette_set palette=pal_1560, offset=0x3, count=12, terminator=1 + +gPaletteGroup_70:: + palette_set palette=pal_1572, offset=0x3, count=12, terminator=1 + +gPaletteGroup_71:: + palette_set palette=pal_1584, offset=0x3, count=12, terminator=1 + +gPaletteGroup_72:: + palette_set palette=pal_1596, offset=0x3, count=12, terminator=1 + +gPaletteGroup_73:: + palette_set palette=pal_1608, offset=0x3, count=12, terminator=1 + +gPaletteGroup_74:: + palette_set palette=pal_1620, offset=0x3, count=12, terminator=1 + +gPaletteGroup_75:: + palette_set palette=pal_1632, offset=0x3, count=12, terminator=1 + +gPaletteGroup_76:: + palette_set palette=pal_1644, offset=0x3, count=12, terminator=1 + +gPaletteGroup_86:: + palette_set palette=pal_1656, offset=0x3, count=12, terminator=1 + +gPaletteGroup_87:: + palette_set palette=pal_1668, offset=0x3, count=12, terminator=1 + +gPaletteGroup_88:: + palette_set palette=pal_1680, offset=0x3, count=12, terminator=1 + +gPaletteGroup_77:: + palette_set palette=pal_1692, offset=0x3, count=12, terminator=1 + +gPaletteGroup_78:: + palette_set palette=pal_1704, offset=0x3, count=12, terminator=1 + +gPaletteGroup_79:: + palette_set palette=pal_1716, offset=0x3, count=12, terminator=1 + +gPaletteGroup_80:: + palette_set palette=pal_1728, offset=0x3, count=12, terminator=1 + +gPaletteGroup_81:: + palette_set palette=pal_1740, offset=0x3, count=12, terminator=1 + +gPaletteGroup_82:: + palette_set palette=pal_1752, offset=0x3, count=12, terminator=1 + +gPaletteGroup_83:: + palette_set palette=pal_1764, offset=0x3, count=12, terminator=1 + +gPaletteGroup_84:: + palette_set palette=pal_1776, offset=0x3, count=12, terminator=1 + +gPaletteGroup_115:: + palette_set palette=pal_1788, offset=0x3, count=12, terminator=1 + +gPaletteGroup_116:: + palette_set palette=pal_1800, offset=0x3, count=12, terminator=1 + +gPaletteGroup_117:: + palette_set palette=pal_1812, offset=0x3, count=12, terminator=1 + +gPaletteGroup_118:: + palette_set palette=pal_1824, offset=0x3, count=12, terminator=1 + +gPaletteGroup_119:: + palette_set palette=pal_1836, offset=0x3, count=12, terminator=1 + +gPaletteGroup_129:: + palette_set palette=pal_1848, offset=0x3, count=12, terminator=1 + +gPaletteGroup_124:: + palette_set palette=pal_1860, offset=0x3, count=12, terminator=1 + +gPaletteGroup_123:: + palette_set palette=pal_1872, offset=0x3, count=12, terminator=1 + +gPaletteGroup_122:: + palette_set palette=pal_1884, offset=0x3, count=12, terminator=1 + +gPaletteGroup_40:: + palette_set palette=pal_2204, count=8, terminator=1 + +gPaletteGroup_42:: + palette_set palette=pal_2094, offset=0x5, count=3, terminator=1 + +gPaletteGroup_43:: + palette_set palette=pal_2097, offset=0x5, count=3, terminator=1 + +gPaletteGroup_47:: + palette_set palette=pal_5, offset=0x1f, count=1, terminator=1 + +gPaletteGroup_48:: + palette_set palette=pal_6, offset=0x1f, count=1, terminator=1 + +gPaletteGroup_49:: + palette_set palette=pal_7, offset=0x1f, count=1, terminator=1 + +gPaletteGroup_50:: + palette_set palette=pal_8, offset=0x1f, count=1, terminator=1 + +gPaletteGroup_91:: palette_set palette=pal_562, offset=0x2, count=13, terminator=1 -gPaletteGroup_233:: +gPaletteGroup_134:: palette_set palette=pal_2100, offset=0x9, count=6, terminator=1 -gPaletteGroup_234:: +gPaletteGroup_135:: palette_set palette=pal_2106, offset=0x9, count=6, terminator=1 -gPaletteGroup_235:: +gPaletteGroup_136:: palette_set palette=pal_2112, offset=0x9, count=6, terminator=1 -gPaletteGroup_236:: +gPaletteGroup_137:: palette_set palette=pal_2118, offset=0x9, count=6, terminator=1 -gPaletteGroup_237:: +gPaletteGroup_138:: palette_set palette=pal_2307, offset=0x6, count=9, terminator=1 -gPaletteGroup_238:: +gPaletteGroup_139:: palette_set palette=pal_2316, offset=0x6, count=9, terminator=1 -gPaletteGroup_239:: +gPaletteGroup_140:: palette_set palette=pal_2325, offset=0x6, count=9, terminator=1 -gPaletteGroup_240:: +gPaletteGroup_141:: palette_set palette=pal_2334, offset=0x6, count=9, terminator=1 -gPaletteGroup_241:: +gPaletteGroup_142:: palette_set palette=pal_2343, offset=0x6, count=9, terminator=1 -gPaletteGroup_242:: +gPaletteGroup_143:: palette_set palette=pal_2352, offset=0x6, count=9, terminator=1 -gPaletteGroup_270:: +gPaletteGroup_171:: palette_set palette=pal_2361, offset=0x7, count=8, terminator=1 -gPaletteGroup_271:: +gPaletteGroup_172:: palette_set palette=pal_2369, offset=0x7, count=8, terminator=1 -gPaletteGroup_272:: +gPaletteGroup_173:: palette_set palette=pal_2377, offset=0x7, count=8, terminator=1 -gPaletteGroup_273:: +gPaletteGroup_174:: palette_set palette=pal_2385, offset=0x7, count=8, terminator=1 -gPaletteGroup_274:: +gPaletteGroup_175:: palette_set palette=pal_2393, offset=0x7, count=8, terminator=1 -gPaletteGroup_275:: +gPaletteGroup_176:: palette_set palette=pal_2401, offset=0x7, count=8, terminator=1 -gPaletteGroup_276:: +gPaletteGroup_177:: palette_set palette=pal_2409, offset=0x7, count=8, terminator=1 -gPaletteGroup_277:: +gPaletteGroup_178:: palette_set palette=pal_2417, offset=0x7, count=8, terminator=1 -gPaletteGroup_278:: +gPaletteGroup_179:: palette_set palette=pal_2425, offset=0x7, count=8, terminator=1 -gPaletteGroup_280:: +gPaletteGroup_181:: palette_set palette=pal_0, count=4 palette_set palette=pal_2215, offset=0xd, count=2 palette_set palette=pal_0, offset=0x10, count=5, terminator=1 -gPaletteGroup_281:: +gPaletteGroup_182:: palette_set palette=pal_2215, offset=0xd, count=2 palette_set palette=pal_2220, offset=0x15, count=6, terminator=1 -gPaletteGroup_282:: +gPaletteGroup_183:: palette_set palette=pal_2215, offset=0xd, count=2 palette_set palette=pal_2220, offset=0x15, count=6 palette_set palette=pal_13, offset=0x1e, count=1, terminator=1 -gPaletteGroup_283:: +gPaletteGroup_184:: palette_set palette=pal_2215, offset=0xd, count=2 palette_set palette=pal_2254, offset=0xb, count=2 palette_set palette=pal_2220, offset=0x15, count=6, terminator=1 -gPaletteGroup_284:: +gPaletteGroup_185:: palette_set palette=pal_2215, offset=0xd, count=2 palette_set palette=pal_2217, offset=0x5, count=1 palette_set palette=pal_2226, offset=0x6, count=7 palette_set palette=pal_2220, offset=0x15, count=6 palette_set palette=pal_14, offset=0x17, count=1, terminator=1 -gPaletteGroup_285:: +gPaletteGroup_186:: palette_set palette=pal_2215, offset=0xd, count=2 palette_set palette=pal_2233, offset=0xc, count=1, terminator=1 -gPaletteGroup_286:: +gPaletteGroup_187:: palette_set palette=pal_2215, offset=0xd, count=2 palette_set palette=pal_2233, offset=0xc, count=1, terminator=1 -gPaletteGroup_287:: +gPaletteGroup_188:: palette_set palette=pal_2215, offset=0xd, count=2 palette_set palette=pal_2234, offset=0xb, count=2, terminator=1 -gPaletteGroup_288:: +gPaletteGroup_189:: palette_set palette=pal_2215, offset=0xd, count=2 palette_set palette=pal_2234, offset=0xb, count=2, terminator=1 -gPaletteGroup_289:: +gPaletteGroup_190:: palette_set palette=pal_2215, offset=0xd, count=2 palette_set palette=pal_2236, offset=0x9, count=4, terminator=1 -gPaletteGroup_290:: +gPaletteGroup_191:: palette_set palette=pal_2215, offset=0xd, count=2 palette_set palette=pal_2240, offset=0x9, count=4, terminator=1 -gPaletteGroup_291:: +gPaletteGroup_192:: palette_set palette=pal_2215, offset=0xd, count=2 palette_set palette=pal_2240, offset=0x9, count=4, terminator=1 -gPaletteGroup_292:: +gPaletteGroup_193:: palette_set palette=pal_2215, offset=0xd, count=2 palette_set palette=pal_2244, offset=0xa, count=3, terminator=1 -gPaletteGroup_293:: +gPaletteGroup_194:: palette_set palette=pal_2215, offset=0xd, count=2 palette_set palette=pal_2240, offset=0x9, count=4, terminator=1 -gPaletteGroup_294:: +gPaletteGroup_195:: palette_set palette=pal_2215, offset=0xd, count=2 palette_set palette=pal_2244, offset=0xa, count=3, terminator=1 -gPaletteGroup_295:: +gPaletteGroup_196:: palette_set palette=pal_2215, offset=0xd, count=2 palette_set palette=pal_2240, offset=0x9, count=4, terminator=1 -gPaletteGroup_296:: +gPaletteGroup_197:: palette_set palette=pal_2215, offset=0xd, count=2 palette_set palette=pal_2236, offset=0x9, count=4, terminator=1 -gPaletteGroup_297:: +gPaletteGroup_198:: palette_set palette=pal_2215, offset=0xd, count=2 palette_set palette=pal_2240, offset=0x9, count=4, terminator=1 -gPaletteGroup_298:: +gPaletteGroup_199:: palette_set palette=pal_2215, offset=0xd, count=2 palette_set palette=pal_2240, offset=0x9, count=4, terminator=1 -gPaletteGroup_299:: +gPaletteGroup_200:: palette_set palette=pal_2215, offset=0xd, count=2 palette_set palette=pal_2247, offset=0xb, count=2, terminator=1 -gPaletteGroup_300:: +gPaletteGroup_201:: palette_set palette=pal_2215, offset=0xd, count=2 palette_set palette=pal_2249, offset=0xa, count=3, terminator=1 -gPaletteGroup_301:: +gPaletteGroup_202:: palette_set palette=pal_2215, offset=0xd, count=2 palette_set palette=pal_2252, offset=0xb, count=2, terminator=1 -gPaletteGroup_302:: +gPaletteGroup_203:: palette_set palette=pal_0, count=5 palette_set palette=pal_2256, offset=0xb, count=2 palette_set palette=pal_0, offset=0x10, count=5 palette_set palette=pal_2258, offset=0x15, count=1, terminator=1 -gPaletteGroup_303:: +gPaletteGroup_204:: palette_set palette=pal_0, count=5 palette_set palette=pal_0, offset=0x10, count=5 palette_set palette=pal_2258, offset=0x15, count=1, terminator=1 -gPaletteGroup_304:: +gPaletteGroup_205:: palette_set palette=pal_0, count=5 palette_set palette=pal_0, offset=0x10, count=5 palette_set palette=pal_157, offset=0x18, count=1 @@ -4123,12 +4123,12 @@ gPaletteGroup_304:: palette_set palette=pal_163, offset=0x1e, count=1 palette_set palette=pal_164, offset=0x1f, count=1, terminator=1 -gPaletteGroup_305:: +gPaletteGroup_206:: palette_set palette=pal_11, offset=0xc, count=1 palette_set palette=pal_2433, offset=0x13, count=1, terminator=1 .ifndef EU -gPaletteGroup_306:: +gPaletteGroup_207:: palette_set palette=pal_0, count=4 palette_set palette=pal_0, offset=0x10, count=5 palette_set palette=pal_2218, offset=0xc, count=2, terminator=1 @@ -4146,6 +4146,15 @@ gPaletteGroups:: .4byte gPaletteGroup_8 .4byte gPaletteGroup_9 .4byte gPaletteGroup_10 + .4byte gPaletteGroup_11 + .4byte gPaletteGroup_12 + .4byte gPaletteGroup_13 + .4byte gPaletteGroup_14 + .4byte gPaletteGroup_15 + .4byte gPaletteGroup_16 + .4byte gPaletteGroup_17 + .4byte gPaletteGroup_18 + .4byte gPaletteGroup_19 .4byte gPaletteGroup_20 .4byte gPaletteGroup_21 .4byte gPaletteGroup_22 @@ -4236,6 +4245,96 @@ gPaletteGroups:: .4byte gPaletteGroup_107 .4byte gPaletteGroup_108 .4byte gPaletteGroup_109 + .4byte gPaletteGroup_110 + .4byte gPaletteGroup_111 + .4byte gPaletteGroup_112 + .4byte gPaletteGroup_113 + .4byte gPaletteGroup_114 + .4byte gPaletteGroup_115 + .4byte gPaletteGroup_116 + .4byte gPaletteGroup_117 + .4byte gPaletteGroup_118 + .4byte gPaletteGroup_119 + .4byte gPaletteGroup_120 + .4byte gPaletteGroup_121 + .4byte gPaletteGroup_122 + .4byte gPaletteGroup_123 + .4byte gPaletteGroup_124 + .4byte gPaletteGroup_125 + .4byte gPaletteGroup_126 + .4byte gPaletteGroup_127 + .4byte gPaletteGroup_128 + .4byte gPaletteGroup_129 + .4byte gPaletteGroup_130 + .4byte gPaletteGroup_131 + .4byte gPaletteGroup_132 + .4byte gPaletteGroup_133 + .4byte gPaletteGroup_134 + .4byte gPaletteGroup_135 + .4byte gPaletteGroup_136 + .4byte gPaletteGroup_137 + .4byte gPaletteGroup_138 + .4byte gPaletteGroup_139 + .4byte gPaletteGroup_140 + .4byte gPaletteGroup_141 + .4byte gPaletteGroup_142 + .4byte gPaletteGroup_143 + .4byte gPaletteGroup_144 + .4byte gPaletteGroup_145 + .4byte gPaletteGroup_146 + .4byte gPaletteGroup_147 + .4byte gPaletteGroup_148 + .4byte gPaletteGroup_149 + .4byte gPaletteGroup_150 + .4byte gPaletteGroup_151 + .4byte gPaletteGroup_152 + .4byte gPaletteGroup_153 + .4byte gPaletteGroup_154 + .4byte gPaletteGroup_155 + .4byte gPaletteGroup_156 + .4byte gPaletteGroup_157 + .4byte gPaletteGroup_158 + .4byte gPaletteGroup_159 + .4byte gPaletteGroup_160 + .4byte gPaletteGroup_161 + .4byte gPaletteGroup_162 + .4byte gPaletteGroup_163 + .4byte gPaletteGroup_164 + .4byte gPaletteGroup_165 + .4byte gPaletteGroup_166 + .4byte gPaletteGroup_167 + .4byte gPaletteGroup_168 + .4byte gPaletteGroup_169 + .4byte gPaletteGroup_170 + .4byte gPaletteGroup_171 + .4byte gPaletteGroup_172 + .4byte gPaletteGroup_173 + .4byte gPaletteGroup_174 + .4byte gPaletteGroup_175 + .4byte gPaletteGroup_176 + .4byte gPaletteGroup_177 + .4byte gPaletteGroup_178 + .4byte gPaletteGroup_179 + .4byte gPaletteGroup_180 + .4byte gPaletteGroup_181 + .4byte gPaletteGroup_182 + .4byte gPaletteGroup_183 + .4byte gPaletteGroup_184 + .4byte gPaletteGroup_185 + .4byte gPaletteGroup_186 + .4byte gPaletteGroup_187 + .4byte gPaletteGroup_188 + .4byte gPaletteGroup_189 + .4byte gPaletteGroup_190 + .4byte gPaletteGroup_191 + .4byte gPaletteGroup_192 + .4byte gPaletteGroup_193 + .4byte gPaletteGroup_194 + .4byte gPaletteGroup_195 + .4byte gPaletteGroup_196 + .4byte gPaletteGroup_197 + .4byte gPaletteGroup_198 + .4byte gPaletteGroup_199 .4byte gPaletteGroup_200 .4byte gPaletteGroup_201 .4byte gPaletteGroup_202 @@ -4243,105 +4342,6 @@ gPaletteGroups:: .4byte gPaletteGroup_204 .4byte gPaletteGroup_205 .4byte gPaletteGroup_206 - .4byte gPaletteGroup_207 - .4byte gPaletteGroup_208 - .4byte gPaletteGroup_209 - .4byte gPaletteGroup_210 - .4byte gPaletteGroup_211 - .4byte gPaletteGroup_212 - .4byte gPaletteGroup_213 - .4byte gPaletteGroup_214 - .4byte gPaletteGroup_215 - .4byte gPaletteGroup_216 - .4byte gPaletteGroup_217 - .4byte gPaletteGroup_218 - .4byte gPaletteGroup_219 - .4byte gPaletteGroup_220 - .4byte gPaletteGroup_221 - .4byte gPaletteGroup_222 - .4byte gPaletteGroup_223 - .4byte gPaletteGroup_224 - .4byte gPaletteGroup_225 - .4byte gPaletteGroup_226 - .4byte gPaletteGroup_227 - .4byte gPaletteGroup_228 - .4byte gPaletteGroup_229 - .4byte gPaletteGroup_230 - .4byte gPaletteGroup_231 - .4byte gPaletteGroup_232 - .4byte gPaletteGroup_233 - .4byte gPaletteGroup_234 - .4byte gPaletteGroup_235 - .4byte gPaletteGroup_236 - .4byte gPaletteGroup_237 - .4byte gPaletteGroup_238 - .4byte gPaletteGroup_239 - .4byte gPaletteGroup_240 - .4byte gPaletteGroup_241 - .4byte gPaletteGroup_242 - .4byte gPaletteGroup_243 - .4byte gPaletteGroup_244 - .4byte gPaletteGroup_245 - .4byte gPaletteGroup_246 - .4byte gPaletteGroup_247 - .4byte gPaletteGroup_248 - .4byte gPaletteGroup_249 - .4byte gPaletteGroup_250 - .4byte gPaletteGroup_251 - .4byte gPaletteGroup_252 - .4byte gPaletteGroup_253 - .4byte gPaletteGroup_254 - .4byte gPaletteGroup_255 - .4byte gPaletteGroup_256 - .4byte gPaletteGroup_257 - .4byte gPaletteGroup_258 - .4byte gPaletteGroup_259 - .4byte gPaletteGroup_260 - .4byte gPaletteGroup_261 - .4byte gPaletteGroup_262 - .4byte gPaletteGroup_263 - .4byte gPaletteGroup_264 - .4byte gPaletteGroup_265 - .4byte gPaletteGroup_266 - .4byte gPaletteGroup_267 - .4byte gPaletteGroup_268 - .4byte gPaletteGroup_269 - .4byte gPaletteGroup_270 - .4byte gPaletteGroup_271 - .4byte gPaletteGroup_272 - .4byte gPaletteGroup_273 - .4byte gPaletteGroup_274 - .4byte gPaletteGroup_275 - .4byte gPaletteGroup_276 - .4byte gPaletteGroup_277 - .4byte gPaletteGroup_278 - .4byte gPaletteGroup_279 - .4byte gPaletteGroup_280 - .4byte gPaletteGroup_281 - .4byte gPaletteGroup_282 - .4byte gPaletteGroup_283 - .4byte gPaletteGroup_284 - .4byte gPaletteGroup_285 - .4byte gPaletteGroup_286 - .4byte gPaletteGroup_287 - .4byte gPaletteGroup_288 - .4byte gPaletteGroup_289 - .4byte gPaletteGroup_290 - .4byte gPaletteGroup_291 - .4byte gPaletteGroup_292 - .4byte gPaletteGroup_293 - .4byte gPaletteGroup_294 - .4byte gPaletteGroup_295 - .4byte gPaletteGroup_296 - .4byte gPaletteGroup_297 - .4byte gPaletteGroup_298 - .4byte gPaletteGroup_299 - .4byte gPaletteGroup_300 - .4byte gPaletteGroup_301 - .4byte gPaletteGroup_302 - .4byte gPaletteGroup_303 - .4byte gPaletteGroup_304 - .4byte gPaletteGroup_305 .ifndef EU - .4byte gPaletteGroup_306 + .4byte gPaletteGroup_207 .endif diff --git a/data/map/map_data.s b/data/map/map_data.s index dcffdb56..35f6a519 100644 --- a/data/map/map_data.s +++ b/data/map/map_data.s @@ -4,4883 +4,3699 @@ .section .rodata .align 2 + gMapData:: @ 08324AE4 -gAreaRoomMap_TownMinishHoles_8_0:: - .incbin "assets/gAreaRoomMap_TownMinishHoles_8_0.bin" - .align 2 -gAreaTileset_LakeWoodsCave_0_0:: - .incbin "tilesets/gAreaTileset_LakeWoodsCave_0_0.4bpp.lz" - .align 2 -gAreaTileset_LakeWoodsCave_0_1:: - .incbin "tilesets/gAreaTileset_LakeWoodsCave_0_1.4bpp.lz" -gAreaTileset_LakeWoodsCave_0_2:: - .incbin "tilesets/gAreaTileset_LakeWoodsCave_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_MinishWoods_0:: - .incbin "assets/gAreaMetatiles_MinishWoods_0.bin" - .align 2 -gAreaMetatiles_MinishWoods_1:: - .incbin "assets/gAreaMetatiles_MinishWoods_1.bin" - .align 2 -gAreaMetatiles_MinishWoods_2:: - .incbin "assets/gAreaMetatiles_MinishWoods_2.bin" - .align 2 -gAreaMetatiles_MinishWoods_3:: - .incbin "assets/gAreaMetatiles_MinishWoods_3.bin" - .align 2 -gAreaRoomMap_MinishWoods_0_0:: - .incbin "assets/gAreaRoomMap_MinishWoods_0_0.bin" - .align 2 -gAreaRoomMap_MinishWoods_0_1:: - .incbin "assets/gAreaRoomMap_MinishWoods_0_1.bin" - .align 2 -unknown_0:: - .incbin "assets/unknown_0.bin" -gAreaTileset_HyliaDigCaves_0_0:: - .incbin "tilesets/gAreaTileset_HyliaDigCaves_0_0.4bpp.lz" - .align 2 -gAreaTileset_HyliaDigCaves_0_1:: - .incbin "tilesets/gAreaTileset_HyliaDigCaves_0_1.4bpp.lz" - .align 2 -gAreaTileset_HyliaDigCaves_0_2:: - .incbin "tilesets/gAreaTileset_HyliaDigCaves_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_LakeHylia_0:: - .incbin "assets/gAreaMetatiles_LakeHylia_0.bin" - .align 2 -gAreaMetatiles_LakeHylia_1:: - .incbin "assets/gAreaMetatiles_LakeHylia_1.bin" - .align 2 -gAreaMetatiles_LakeHylia_2:: - .incbin "assets/gAreaMetatiles_LakeHylia_2.bin" - .align 2 -gAreaMetatiles_LakeHylia_3:: - .incbin "assets/gAreaMetatiles_LakeHylia_3.bin" - .align 2 -gAreaRoomMap_LakeHylia_0_0:: - .incbin "assets/gAreaRoomMap_LakeHylia_0_0.bin" - .align 2 -gAreaRoomMap_LakeHylia_0_1:: - .incbin "assets/gAreaRoomMap_LakeHylia_0_1.bin" - .align 2 -unknown_1:: - .incbin "assets/unknown_1.bin" -gAreaRoomMap_LakeHylia_1_0:: - .incbin "assets/gAreaRoomMap_LakeHylia_1_0.bin" - .align 2 -gAreaRoomMap_LakeHylia_1_1:: - .incbin "assets/gAreaRoomMap_LakeHylia_1_1.bin" - .align 2 -gAreaTileset_OuterFortressOfWinds_0_0:: - .incbin "tilesets/gAreaTileset_OuterFortressOfWinds_0_0.4bpp.lz" -gAreaTileset_OuterFortressOfWinds_0_1:: - .incbin "tilesets/gAreaTileset_OuterFortressOfWinds_0_1.4bpp.lz" - .align 2 -gAreaTileset_OuterFortressOfWinds_0_2:: - .incbin "tilesets/gAreaTileset_OuterFortressOfWinds_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_CastorWilds_0:: - .incbin "assets/gAreaMetatiles_CastorWilds_0.bin" -gAreaMetatiles_CastorWilds_1:: - .incbin "assets/gAreaMetatiles_CastorWilds_1.bin" - .align 2 -gAreaMetatiles_CastorWilds_2:: - .incbin "assets/gAreaMetatiles_CastorWilds_2.bin" - .align 2 -gAreaMetatiles_CastorWilds_3:: - .incbin "assets/gAreaMetatiles_CastorWilds_3.bin" -gAreaRoomMap_CastorWilds_0_0:: - .incbin "assets/gAreaRoomMap_CastorWilds_0_0.bin" - .align 2 -gAreaRoomMap_CastorWilds_0_1:: - .incbin "assets/gAreaRoomMap_CastorWilds_0_1.bin" - .align 2 -unknown_2:: - .incbin "assets/unknown_2.bin" -gAreaRoomMap_Ruins_0_0:: - .incbin "assets/gAreaRoomMap_Ruins_0_0.bin" - .align 2 -gAreaRoomMap_Ruins_0_1:: - .incbin "assets/gAreaRoomMap_Ruins_0_1.bin" - .align 2 -gAreaRoomMap_Ruins_1_0:: - .incbin "assets/gAreaRoomMap_Ruins_1_0.bin" -gAreaRoomMap_Ruins_1_1:: - .incbin "assets/gAreaRoomMap_Ruins_1_1.bin" -gAreaRoomMap_Ruins_2_0:: - .incbin "assets/gAreaRoomMap_Ruins_2_0.bin" - .align 2 -gAreaRoomMap_Ruins_2_1:: - .incbin "assets/gAreaRoomMap_Ruins_2_1.bin" - .align 2 -gAreaRoomMap_Ruins_3_0:: - .incbin "assets/gAreaRoomMap_Ruins_3_0.bin" - .align 2 -gAreaRoomMap_Ruins_3_1:: - .incbin "assets/gAreaRoomMap_Ruins_3_1.bin" - .align 2 -gAreaRoomMap_Ruins_4_0:: - .incbin "assets/gAreaRoomMap_Ruins_4_0.bin" - .align 2 -gAreaRoomMap_Ruins_4_1:: - .incbin "assets/gAreaRoomMap_Ruins_4_1.bin" -gAreaRoomMap_Ruins_5_0:: - .incbin "assets/gAreaRoomMap_Ruins_5_0.bin" - .align 2 -gAreaRoomMap_Ruins_5_1:: - .incbin "assets/gAreaRoomMap_Ruins_5_1.bin" - .align 2 +@ Contains purely 0xff to indicate that no tiles are used, but the mapping for the tiles is supplied directly. +gAreaRoomMap_None:: + .incbin "assets/gAreaRoomMap_None.bin.lz" +gAreaTileSet_MinishWoods_0_0:: + .incbin "maps/areas/000_MinishWoods/tileSets/0/gAreaTileSet_MinishWoods_0_0.4bpp.lz" +gAreaTileSet_MinishWoods_0_1:: + .incbin "maps/areas/000_MinishWoods/tileSets/0/gAreaTileSet_MinishWoods_0_1.4bpp.lz" +gAreaTileSet_MinishWoods_0_2:: + .incbin "maps/areas/000_MinishWoods/tileSets/0/gAreaTileSet_MinishWoods_0_2.4bpp.lz" +gAreaTileSet_MinishWoods_bottom:: + .incbin "maps/areas/000_MinishWoods/tileSet/gAreaTileSet_MinishWoods_bottom.bin.lz" +gAreaTileSet_MinishWoods_top:: + .incbin "maps/areas/000_MinishWoods/tileSet/gAreaTileSet_MinishWoods_top.bin.lz" +gAreaTileSetTypes_MinishWoods_bottom:: + .incbin "maps/areas/000_MinishWoods/tileSet/gAreaTileSetTypes_MinishWoods_bottom.bin.lz" +gAreaTileSetTypes_MinishWoods_top:: + .incbin "maps/areas/000_MinishWoods/tileSet/gAreaTileSetTypes_MinishWoods_top.bin.lz" +gAreaRoomMap_MinishWoods_Main_bottom:: + .incbin "maps/areas/000_MinishWoods/rooms/00_Main/gAreaRoomMap_MinishWoods_Main_bottom.bin.lz" +gAreaRoomMap_MinishWoods_Main_top:: + .incbin "maps/areas/000_MinishWoods/rooms/00_Main/gAreaRoomMap_MinishWoods_Main_top.bin.lz" +gCaveBorder_LakeWoods_outside:: + .incbin "maps/areas/000_MinishWoods/rooms/00_Main/gCaveBorder_LakeWoods_outside.bin.lz" +gCaveBorder_LakeWoods_unused:: + .incbin "maps/areas/000_MinishWoods/rooms/00_Main/gCaveBorder_LakeWoods_unused.bin.lz" +gAreaTileSet_LakeHylia_0_0:: + .incbin "maps/areas/011_LakeHylia/tileSets/0/gAreaTileSet_LakeHylia_0_0.4bpp.lz" +gAreaTileSet_LakeHylia_0_1:: + .incbin "maps/areas/011_LakeHylia/tileSets/0/gAreaTileSet_LakeHylia_0_1.4bpp.lz" +gAreaTileSet_LakeHylia_0_2:: + .incbin "maps/areas/011_LakeHylia/tileSets/0/gAreaTileSet_LakeHylia_0_2.4bpp.lz" +gAreaTileSet_LakeHylia_bottom:: + .incbin "maps/areas/011_LakeHylia/tileSet/gAreaTileSet_LakeHylia_bottom.bin.lz" +gAreaTileSet_LakeHylia_top:: + .incbin "maps/areas/011_LakeHylia/tileSet/gAreaTileSet_LakeHylia_top.bin.lz" +gAreaTileSetTypes_LakeHylia_bottom:: + .incbin "maps/areas/011_LakeHylia/tileSet/gAreaTileSetTypes_LakeHylia_bottom.bin.lz" +gAreaTileSetTypes_LakeHylia_top:: + .incbin "maps/areas/011_LakeHylia/tileSet/gAreaTileSetTypes_LakeHylia_top.bin.lz" +gAreaRoomMap_LakeHylia_Main_bottom:: + .incbin "maps/areas/011_LakeHylia/rooms/00_Main/gAreaRoomMap_LakeHylia_Main_bottom.bin.lz" +gAreaRoomMap_LakeHylia_Main_top:: + .incbin "maps/areas/011_LakeHylia/rooms/00_Main/gAreaRoomMap_LakeHylia_Main_top.bin.lz" +gCaveBorder_LakeHyliaNorth_outside:: + .incbin "maps/areas/011_LakeHylia/rooms/00_Main/gCaveBorder_LakeHyliaNorth_outside.bin.lz" +gAreaRoomMap_LakeHylia_Beanstalk_bottom:: + .incbin "maps/areas/011_LakeHylia/rooms/01_Beanstalk/gAreaRoomMap_LakeHylia_Beanstalk_bottom.bin.lz" +gAreaRoomMap_LakeHylia_Beanstalk_top:: + .incbin "maps/areas/011_LakeHylia/rooms/01_Beanstalk/gAreaRoomMap_LakeHylia_Beanstalk_top.bin.lz" +gAreaTileSet_CastorWilds_0_0:: + .incbin "maps/areas/004_CastorWilds/tileSets/0/gAreaTileSet_CastorWilds_0_0.4bpp.lz" +gAreaTileSet_CastorWilds_0_1:: + .incbin "maps/areas/004_CastorWilds/tileSets/0/gAreaTileSet_CastorWilds_0_1.4bpp.lz" +gAreaTileSet_CastorWilds_0_2:: + .incbin "maps/areas/004_CastorWilds/tileSets/0/gAreaTileSet_CastorWilds_0_2.4bpp.lz" +gAreaTileSet_CastorWilds_bottom:: + .incbin "maps/areas/004_CastorWilds/tileSet/gAreaTileSet_CastorWilds_bottom.bin.lz" +gAreaTileSet_CastorWilds_top:: + .incbin "maps/areas/004_CastorWilds/tileSet/gAreaTileSet_CastorWilds_top.bin.lz" +gAreaTileSetTypes_CastorWilds_bottom:: + .incbin "maps/areas/004_CastorWilds/tileSet/gAreaTileSetTypes_CastorWilds_bottom.bin.lz" +gAreaTileSetTypes_CastorWilds_top:: + .incbin "maps/areas/004_CastorWilds/tileSet/gAreaTileSetTypes_CastorWilds_top.bin.lz" +gAreaRoomMap_CastorWilds_Main_bottom:: + .incbin "maps/areas/004_CastorWilds/rooms/00_Main/gAreaRoomMap_CastorWilds_Main_bottom.bin.lz" +gAreaRoomMap_CastorWilds_Main_top:: + .incbin "maps/areas/004_CastorWilds/rooms/00_Main/gAreaRoomMap_CastorWilds_Main_top.bin.lz" +gCaveBorder_CastorWilds_outside:: + .incbin "maps/areas/004_CastorWilds/rooms/00_Main/gCaveBorder_CastorWilds_outside.bin.lz" +gAreaRoomMap_Ruins_Entrance_bottom:: + .incbin "maps/areas/005_Ruins/rooms/00_Entrance/gAreaRoomMap_Ruins_Entrance_bottom.bin.lz" +gAreaRoomMap_Ruins_Entrance_top:: + .incbin "maps/areas/005_Ruins/rooms/00_Entrance/gAreaRoomMap_Ruins_Entrance_top.bin.lz" +gAreaRoomMap_Ruins_Beanstalk_bottom:: + .incbin "maps/areas/005_Ruins/rooms/01_Beanstalk/gAreaRoomMap_Ruins_Beanstalk_bottom.bin.lz" +gAreaRoomMap_Ruins_Beanstalk_top:: + .incbin "maps/areas/005_Ruins/rooms/01_Beanstalk/gAreaRoomMap_Ruins_Beanstalk_top.bin.lz" +gAreaRoomMap_Ruins_Tektites_bottom:: + .incbin "maps/areas/005_Ruins/rooms/02_Tektites/gAreaRoomMap_Ruins_Tektites_bottom.bin.lz" +gAreaRoomMap_Ruins_Tektites_top:: + .incbin "maps/areas/005_Ruins/rooms/02_Tektites/gAreaRoomMap_Ruins_Tektites_top.bin.lz" +gAreaRoomMap_Ruins_LadderToTektites_bottom:: + .incbin "maps/areas/005_Ruins/rooms/03_LadderToTektites/gAreaRoomMap_Ruins_LadderToTektites_bottom.bin.lz" +gAreaRoomMap_Ruins_LadderToTektites_top:: + .incbin "maps/areas/005_Ruins/rooms/03_LadderToTektites/gAreaRoomMap_Ruins_LadderToTektites_top.bin.lz" +gAreaRoomMap_Ruins_FortressEntrance_bottom:: + .incbin "maps/areas/005_Ruins/rooms/04_FortressEntrance/gAreaRoomMap_Ruins_FortressEntrance_bottom.bin.lz" +gAreaRoomMap_Ruins_FortressEntrance_top:: + .incbin "maps/areas/005_Ruins/rooms/04_FortressEntrance/gAreaRoomMap_Ruins_FortressEntrance_top.bin.lz" +gAreaRoomMap_Ruins_BelowFortressEntrance_bottom:: + .incbin "maps/areas/005_Ruins/rooms/05_BelowFortressEntrance/gAreaRoomMap_Ruins_BelowFortressEntrance_bottom.bin.lz" +gAreaRoomMap_Ruins_BelowFortressEntrance_top:: + .incbin "maps/areas/005_Ruins/rooms/05_BelowFortressEntrance/gAreaRoomMap_Ruins_BelowFortressEntrance_top.bin.lz" unknown_3:: .incbin "assets/unknown_3.bin" -gAreaMetatiles_HyruleTown_0:: - .incbin "assets/gAreaMetatiles_HyruleTown_0.bin" - .align 2 -gAreaMetatiles_HyruleTown_1:: - .incbin "assets/gAreaMetatiles_HyruleTown_1.bin" - .align 2 -gAreaMetatiles_HyruleTown_2:: - .incbin "assets/gAreaMetatiles_HyruleTown_2.bin" - .align 2 -gAreaMetatiles_HyruleTown_3:: - .incbin "assets/gAreaMetatiles_HyruleTown_3.bin" - .align 2 -gAreaTileset_HyruleDigCaves_0_0:: - .incbin "tilesets/gAreaTileset_HyruleDigCaves_0_0.4bpp.lz" - .align 2 -gAreaTileset_HyruleDigCaves_0_1:: - .incbin "tilesets/gAreaTileset_HyruleDigCaves_0_1.4bpp.lz" - .align 2 -gAreaTileset_HyruleDigCaves_0_2:: - .incbin "tilesets/gAreaTileset_HyruleDigCaves_0_2.4bpp.lz" -gAreaTileset_FestivalTown_0_0:: - .incbin "tilesets/gAreaTileset_FestivalTown_0_0.4bpp.lz" -gAreaTileset_FestivalTown_0_1:: - .incbin "tilesets/gAreaTileset_FestivalTown_0_1.4bpp.lz" - .align 2 -gAreaTileset_FestivalTown_0_2:: - .incbin "tilesets/gAreaTileset_FestivalTown_0_2.4bpp.lz" - .align 2 -gAreaRoomMap_HyruleTown_0_0:: - .incbin "assets/gAreaRoomMap_HyruleTown_0_0.bin" - .align 2 -gAreaRoomMap_HyruleTown_0_1:: - .incbin "assets/gAreaRoomMap_HyruleTown_0_1.bin" - .align 2 -unknown_4:: - .incbin "assets/unknown_4.bin" -gAreaRoomMap_FestivalTown_0_0:: - .incbin "assets/gAreaRoomMap_FestivalTown_0_0.bin" - .align 2 -gAreaRoomMap_FestivalTown_0_1:: - .incbin "assets/gAreaRoomMap_FestivalTown_0_1.bin" - .align 2 -gAreaTileset_CrenelDigCave_0_0:: - .incbin "tilesets/gAreaTileset_CrenelDigCave_0_0.4bpp.lz" - .align 2 -gAreaTileset_CrenelDigCave_0_1:: - .incbin "tilesets/gAreaTileset_CrenelDigCave_0_1.4bpp.lz" -gAreaTileset_CrenelDigCave_0_2:: - .incbin "tilesets/gAreaTileset_CrenelDigCave_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_MtCrenel_0:: - .incbin "assets/gAreaMetatiles_MtCrenel_0.bin" - .align 2 -gAreaMetatiles_MtCrenel_1:: - .incbin "assets/gAreaMetatiles_MtCrenel_1.bin" - .align 2 -gAreaMetatiles_MtCrenel_2:: - .incbin "assets/gAreaMetatiles_MtCrenel_2.bin" -gAreaMetatiles_MtCrenel_3:: - .incbin "assets/gAreaMetatiles_MtCrenel_3.bin" - .align 2 -gAreaRoomMap_MtCrenel_0_0:: - .incbin "assets/gAreaRoomMap_MtCrenel_0_0.bin" -gAreaRoomMap_MtCrenel_0_1:: - .incbin "assets/gAreaRoomMap_MtCrenel_0_1.bin" - .align 2 -gAreaRoomMap_MtCrenel_1_0:: - .incbin "assets/gAreaRoomMap_MtCrenel_1_0.bin" -gAreaRoomMap_MtCrenel_1_1:: - .incbin "assets/gAreaRoomMap_MtCrenel_1_1.bin" - .align 2 -unknown_5:: - .incbin "assets/unknown_5.bin" -gAreaRoomMap_MtCrenel_2_0:: - .incbin "assets/gAreaRoomMap_MtCrenel_2_0.bin" -gAreaRoomMap_MtCrenel_2_1:: - .incbin "assets/gAreaRoomMap_MtCrenel_2_1.bin" -gAreaRoomMap_MtCrenel_3_0:: - .incbin "assets/gAreaRoomMap_MtCrenel_3_0.bin" - .align 2 -gAreaRoomMap_MtCrenel_3_1:: - .incbin "assets/gAreaRoomMap_MtCrenel_3_1.bin" - .align 2 -gAreaRoomMap_MtCrenel_4_0:: - .incbin "assets/gAreaRoomMap_MtCrenel_4_0.bin" - .align 2 -gAreaRoomMap_MtCrenel_4_1:: - .incbin "assets/gAreaRoomMap_MtCrenel_4_1.bin" - .align 2 -gAreaRoomMap_HyruleField_7_0:: - .incbin "assets/gAreaRoomMap_HyruleField_7_0.bin" - .align 2 -gAreaTileset_DigCaves1_0_1:: - .incbin "tilesets/gAreaTileset_DigCaves1_0_1.4bpp.lz" - .align 2 -gAreaRoomMap_HyruleField_7_1:: - .incbin "assets/gAreaRoomMap_HyruleField_7_1.bin" - .align 2 -gAreaRoomMap_HyruleField_6_0:: - .incbin "assets/gAreaRoomMap_HyruleField_6_0.bin" -gAreaTileset_HyruleField_2_1:: - .incbin "tilesets/gAreaTileset_HyruleField_2_1.4bpp.lz" - .align 2 -gAreaRoomMap_HyruleField_6_1:: - .incbin "assets/gAreaRoomMap_HyruleField_6_1.bin" -gAreaRoomMap_HyruleField_5_0:: - .incbin "assets/gAreaRoomMap_HyruleField_5_0.bin" - .align 2 -gAreaTileset_HyruleField_1_1:: - .incbin "tilesets/gAreaTileset_HyruleField_1_1.4bpp.lz" - .align 2 -gAreaRoomMap_HyruleField_5_1:: - .incbin "assets/gAreaRoomMap_HyruleField_5_1.bin" -gAreaMetatiles_HyruleField_0:: - .incbin "assets/gAreaMetatiles_HyruleField_0.bin" - .align 2 -gAreaMetatiles_HyruleField_1:: - .incbin "assets/gAreaMetatiles_HyruleField_1.bin" - .align 2 -gAreaMetatiles_HyruleField_2:: - .incbin "assets/gAreaMetatiles_HyruleField_2.bin" -gAreaMetatiles_HyruleField_3:: - .incbin "assets/gAreaMetatiles_HyruleField_3.bin" -gAreaTileset_HyruleField_2_3:: - .incbin "assets/gAreaTileset_HyruleField_2_3.bin" - .align 2 -gAreaRoomMap_HyruleField_0_0:: - .incbin "assets/gAreaRoomMap_HyruleField_0_0.bin" -gAreaRoomMap_HyruleField_0_1:: - .incbin "assets/gAreaRoomMap_HyruleField_0_1.bin" - .align 2 -gAreaRoomMap_HyruleField_1_3:: - .incbin "assets/gAreaRoomMap_HyruleField_1_3.bin" - .align 2 -gAreaRoomMap_HyruleField_1_4:: - .incbin "assets/gAreaRoomMap_HyruleField_1_4.bin" - .align 2 -gAreaRoomMap_HyruleField_2_0:: - .incbin "assets/gAreaRoomMap_HyruleField_2_0.bin" -gAreaRoomMap_HyruleField_2_1:: - .incbin "assets/gAreaRoomMap_HyruleField_2_1.bin" - .align 2 -gAreaRoomMap_HyruleField_3_3:: - .incbin "assets/gAreaRoomMap_HyruleField_3_3.bin" -gAreaRoomMap_HyruleField_3_4:: - .incbin "assets/gAreaRoomMap_HyruleField_3_4.bin" - .align 2 -gAreaRoomMap_HyruleField_4_3:: - .incbin "assets/gAreaRoomMap_HyruleField_4_3.bin" -gAreaRoomMap_HyruleField_4_4:: - .incbin "assets/gAreaRoomMap_HyruleField_4_4.bin" - .align 2 -unknown_6:: - .incbin "assets/unknown_6.bin" -gAreaRoomMap_HyruleField_5_3:: - .incbin "assets/gAreaRoomMap_HyruleField_5_3.bin" -gAreaRoomMap_HyruleField_5_4:: - .incbin "assets/gAreaRoomMap_HyruleField_5_4.bin" - .align 2 -unknown_7:: - .incbin "assets/unknown_7.bin" -gAreaRoomMap_HyruleField_6_3:: - .incbin "assets/gAreaRoomMap_HyruleField_6_3.bin" - .align 2 -gAreaRoomMap_HyruleField_6_4:: - .incbin "assets/gAreaRoomMap_HyruleField_6_4.bin" -gAreaRoomMap_HyruleField_7_3:: - .incbin "assets/gAreaRoomMap_HyruleField_7_3.bin" -gAreaRoomMap_HyruleField_7_4:: - .incbin "assets/gAreaRoomMap_HyruleField_7_4.bin" - .align 2 -unknown_8:: - .incbin "assets/unknown_8.bin" -gAreaRoomMap_HyruleField_8_0:: - .incbin "assets/gAreaRoomMap_HyruleField_8_0.bin" - .align 2 -gAreaRoomMap_HyruleField_8_1:: - .incbin "assets/gAreaRoomMap_HyruleField_8_1.bin" - .align 2 -gAreaRoomMap_HyruleField_9_0:: - .incbin "assets/gAreaRoomMap_HyruleField_9_0.bin" - .align 2 -gAreaRoomMap_HyruleField_9_1:: - .incbin "assets/gAreaRoomMap_HyruleField_9_1.bin" - .align 2 -gAreaTileset_CastleGarden_0_0:: - .incbin "tilesets/gAreaTileset_CastleGarden_0_0.4bpp.lz" - .align 2 -gAreaTileset_CastleGarden_0_1:: - .incbin "tilesets/gAreaTileset_CastleGarden_0_1.4bpp.lz" - .align 2 -gAreaTileset_CastleGarden_0_2:: - .incbin "tilesets/gAreaTileset_CastleGarden_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_CastleGarden_0:: - .incbin "assets/gAreaMetatiles_CastleGarden_0.bin" - .align 2 -gAreaMetatiles_CastleGarden_1:: - .incbin "assets/gAreaMetatiles_CastleGarden_1.bin" - .align 2 -gAreaMetatiles_CastleGarden_2:: - .incbin "assets/gAreaMetatiles_CastleGarden_2.bin" -gAreaMetatiles_CastleGarden_3:: - .incbin "assets/gAreaMetatiles_CastleGarden_3.bin" -gAreaRoomMap_CastleGarden_0_0:: - .incbin "assets/gAreaRoomMap_CastleGarden_0_0.bin" - .align 2 -gAreaRoomMap_CastleGarden_0_1:: - .incbin "assets/gAreaRoomMap_CastleGarden_0_1.bin" - .align 2 -gAreaTileset_CloudTops_0_0:: - .incbin "tilesets/gAreaTileset_CloudTops_0_0.4bpp.lz" - .align 2 -gAreaTileset_CloudTops_0_1:: - .incbin "tilesets/gAreaTileset_CloudTops_0_1.4bpp.lz" -gAreaTileset_CloudTops_0_2:: - .incbin "tilesets/gAreaTileset_CloudTops_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_CloudTops_0:: - .incbin "assets/gAreaMetatiles_CloudTops_0.bin" -gAreaMetatiles_CloudTops_1:: - .incbin "assets/gAreaMetatiles_CloudTops_1.bin" - .align 2 -gAreaMetatiles_CloudTops_2:: - .incbin "assets/gAreaMetatiles_CloudTops_2.bin" -gAreaMetatiles_CloudTops_3:: - .incbin "assets/gAreaMetatiles_CloudTops_3.bin" - .align 2 -gAreaRoomMap_CloudTops_0_0:: - .incbin "assets/gAreaRoomMap_CloudTops_0_0.bin" - .align 2 -gAreaRoomMap_CloudTops_0_1:: - .incbin "assets/gAreaRoomMap_CloudTops_0_1.bin" -gAreaRoomMap_CloudTops_1_0:: - .incbin "assets/gAreaRoomMap_CloudTops_1_0.bin" -gAreaRoomMap_CloudTops_1_1:: - .incbin "assets/gAreaRoomMap_CloudTops_1_1.bin" - .align 2 -gAreaRoomMap_CloudTops_2_0:: - .incbin "assets/gAreaRoomMap_CloudTops_2_0.bin" - .align 2 -gAreaRoomMap_CloudTops_2_1:: - .incbin "assets/gAreaRoomMap_CloudTops_2_1.bin" - .align 2 -gAreaTileset_CloudTops_0_3:: - .incbin "assets/gAreaTileset_CloudTops_0_3.bin" - .align 2 -gAreaTileset_RoyalValley_0_0:: - .incbin "tilesets/gAreaTileset_RoyalValley_0_0.4bpp.lz" -gAreaTileset_RoyalValley_0_1:: - .incbin "tilesets/gAreaTileset_RoyalValley_0_1.4bpp.lz" - .align 2 -gAreaTileset_RoyalValley_0_2:: - .incbin "tilesets/gAreaTileset_RoyalValley_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_RoyalValley_0:: - .incbin "assets/gAreaMetatiles_RoyalValley_0.bin" - .align 2 -gAreaMetatiles_RoyalValley_1:: - .incbin "assets/gAreaMetatiles_RoyalValley_1.bin" - .align 2 -gAreaMetatiles_RoyalValley_2:: - .incbin "assets/gAreaMetatiles_RoyalValley_2.bin" -gAreaMetatiles_RoyalValley_3:: - .incbin "assets/gAreaMetatiles_RoyalValley_3.bin" -gAreaRoomMap_RoyalValley_0_0:: - .incbin "assets/gAreaRoomMap_RoyalValley_0_0.bin" - .align 2 -gAreaRoomMap_RoyalValley_0_1:: - .incbin "assets/gAreaRoomMap_RoyalValley_0_1.bin" - .align 2 +gAreaTileSet_HyruleTown_bottom:: + .incbin "maps/areas/002_HyruleTown/tileSet/gAreaTileSet_HyruleTown_bottom.bin.lz" +gAreaTileSet_HyruleTown_top:: + .incbin "maps/areas/002_HyruleTown/tileSet/gAreaTileSet_HyruleTown_top.bin.lz" +gAreaTileSetTypes_HyruleTown_bottom:: + .incbin "maps/areas/002_HyruleTown/tileSet/gAreaTileSetTypes_HyruleTown_bottom.bin.lz" +gAreaTileSetTypes_HyruleTown_top:: + .incbin "maps/areas/002_HyruleTown/tileSet/gAreaTileSetTypes_HyruleTown_top.bin.lz" +gAreaTileSet_HyruleTown_0_0:: + .incbin "maps/areas/002_HyruleTown/tileSets/0/gAreaTileSet_HyruleTown_0_0.4bpp.lz" +gAreaTileSet_HyruleTown_0_1:: + .incbin "maps/areas/002_HyruleTown/tileSets/0/gAreaTileSet_HyruleTown_0_1.4bpp.lz" +gAreaTileSet_HyruleTown_0_2:: + .incbin "maps/areas/002_HyruleTown/tileSets/0/gAreaTileSet_HyruleTown_0_2.4bpp.lz" +gAreaTileSet_FestivalTown_0_0:: + .incbin "maps/areas/021_FestivalTown/tileSets/0/gAreaTileSet_FestivalTown_0_0.4bpp.lz" +gAreaTileSet_FestivalTown_0_1:: + .incbin "maps/areas/021_FestivalTown/tileSets/0/gAreaTileSet_FestivalTown_0_1.4bpp.lz" +gAreaTileSet_FestivalTown_0_2:: + .incbin "maps/areas/021_FestivalTown/tileSets/0/gAreaTileSet_FestivalTown_0_2.4bpp.lz" +gAreaRoomMap_HyruleTown_Main_bottom:: + .incbin "maps/areas/002_HyruleTown/rooms/00_Main/gAreaRoomMap_HyruleTown_Main_bottom.bin.lz" +gAreaRoomMap_HyruleTown_Main_top:: + .incbin "maps/areas/002_HyruleTown/rooms/00_Main/gAreaRoomMap_HyruleTown_Main_top.bin.lz" +gCaveBorder_HyruleTown_outside:: + .incbin "maps/areas/002_HyruleTown/rooms/00_Main/gCaveBorder_HyruleTown_outside.bin.lz" +gAreaRoomMap_FestivalTown_Main_bottom:: + .incbin "maps/areas/021_FestivalTown/rooms/00_Main/gAreaRoomMap_FestivalTown_Main_bottom.bin.lz" +gAreaRoomMap_FestivalTown_Main_top:: + .incbin "maps/areas/021_FestivalTown/rooms/00_Main/gAreaRoomMap_FestivalTown_Main_top.bin.lz" +gAreaTileSet_MtCrenel_0_0:: + .incbin "maps/areas/006_MtCrenel/tileSets/0/gAreaTileSet_MtCrenel_0_0.4bpp.lz" +gAreaTileSet_MtCrenel_0_1:: + .incbin "maps/areas/006_MtCrenel/tileSets/0/gAreaTileSet_MtCrenel_0_1.4bpp.lz" +gAreaTileSet_MtCrenel_0_2:: + .incbin "maps/areas/006_MtCrenel/tileSets/0/gAreaTileSet_MtCrenel_0_2.4bpp.lz" +gAreaTileSet_MtCrenel_bottom:: + .incbin "maps/areas/006_MtCrenel/tileSet/gAreaTileSet_MtCrenel_bottom.bin.lz" +gAreaTileSet_MtCrenel_top:: + .incbin "maps/areas/006_MtCrenel/tileSet/gAreaTileSet_MtCrenel_top.bin.lz" +gAreaTileSetTypes_MtCrenel_bottom:: + .incbin "maps/areas/006_MtCrenel/tileSet/gAreaTileSetTypes_MtCrenel_bottom.bin.lz" +gAreaTileSetTypes_MtCrenel_top:: + .incbin "maps/areas/006_MtCrenel/tileSet/gAreaTileSetTypes_MtCrenel_top.bin.lz" +gAreaRoomMap_MtCrenel_Top_bottom:: + .incbin "maps/areas/006_MtCrenel/rooms/00_Top/gAreaRoomMap_MtCrenel_Top_bottom.bin.lz" +gAreaRoomMap_MtCrenel_Top_top:: + .incbin "maps/areas/006_MtCrenel/rooms/00_Top/gAreaRoomMap_MtCrenel_Top_top.bin.lz" +gAreaRoomMap_MtCrenel_WallClimb_bottom:: + .incbin "maps/areas/006_MtCrenel/rooms/01_WallClimb/gAreaRoomMap_MtCrenel_WallClimb_bottom.bin.lz" +gAreaRoomMap_MtCrenel_WallClimb_top:: + .incbin "maps/areas/006_MtCrenel/rooms/01_WallClimb/gAreaRoomMap_MtCrenel_WallClimb_top.bin.lz" +gCaveBorder_Crenel_outside:: + .incbin "maps/areas/006_MtCrenel/rooms/01_WallClimb/gCaveBorder_Crenel_outside.bin.lz" +gAreaRoomMap_MtCrenel_CavernOfFlamesEntrance_bottom:: + .incbin "maps/areas/006_MtCrenel/rooms/02_CavernOfFlamesEntrance/gAreaRoomMap_MtCrenel_CavernOfFlamesEntrance_bottom.bin.lz" +gAreaRoomMap_MtCrenel_CavernOfFlamesEntrance_top:: + .incbin "maps/areas/006_MtCrenel/rooms/02_CavernOfFlamesEntrance/gAreaRoomMap_MtCrenel_CavernOfFlamesEntrance_top.bin.lz" +gAreaRoomMap_MtCrenel_Center_bottom:: + .incbin "maps/areas/006_MtCrenel/rooms/03_Center/gAreaRoomMap_MtCrenel_Center_bottom.bin.lz" +gAreaRoomMap_MtCrenel_Center_top:: + .incbin "maps/areas/006_MtCrenel/rooms/03_Center/gAreaRoomMap_MtCrenel_Center_top.bin.lz" +gAreaRoomMap_MtCrenel_Entrance_bottom:: + .incbin "maps/areas/006_MtCrenel/rooms/04_Entrance/gAreaRoomMap_MtCrenel_Entrance_bottom.bin.lz" +gAreaRoomMap_MtCrenel_Entrance_top:: + .incbin "maps/areas/006_MtCrenel/rooms/04_Entrance/gAreaRoomMap_MtCrenel_Entrance_top.bin.lz" +gAreaTileSet_HyruleField_0_0:: + .incbin "maps/areas/003_HyruleField/tileSets/0/gAreaTileSet_HyruleField_0_0.4bpp.lz" +gAreaTileSet_HyruleField_0_1:: + .incbin "maps/areas/003_HyruleField/tileSets/0/gAreaTileSet_HyruleField_0_1.4bpp.lz" +gAreaTileSet_HyruleField_0_2:: + .incbin "maps/areas/003_HyruleField/tileSets/0/gAreaTileSet_HyruleField_0_2.4bpp.lz" +gAreaTileSet_HyruleField_2_0:: + .incbin "maps/areas/003_HyruleField/tileSets/2/gAreaTileSet_HyruleField_2_0.4bpp.lz" +gAreaTileSet_HyruleField_2_1:: + .incbin "maps/areas/003_HyruleField/tileSets/2/gAreaTileSet_HyruleField_2_1.4bpp.lz" +gAreaTileSet_HyruleField_2_2:: + .incbin "maps/areas/003_HyruleField/tileSets/2/gAreaTileSet_HyruleField_2_2.4bpp.lz" +gAreaTileSet_HyruleField_1_0:: + .incbin "maps/areas/003_HyruleField/tileSets/1/gAreaTileSet_HyruleField_1_0.4bpp.lz" +gAreaTileSet_HyruleField_1_1:: + .incbin "maps/areas/003_HyruleField/tileSets/1/gAreaTileSet_HyruleField_1_1.4bpp.lz" +gAreaTileSet_HyruleField_1_2:: + .incbin "maps/areas/003_HyruleField/tileSets/1/gAreaTileSet_HyruleField_1_2.4bpp.lz" +gAreaTileSet_HyruleField_bottom:: + .incbin "maps/areas/003_HyruleField/tileSet/gAreaTileSet_HyruleField_bottom.bin.lz" +gAreaTileSet_HyruleField_top:: + .incbin "maps/areas/003_HyruleField/tileSet/gAreaTileSet_HyruleField_top.bin.lz" +gAreaTileSetTypes_HyruleField_bottom:: + .incbin "maps/areas/003_HyruleField/tileSet/gAreaTileSetTypes_HyruleField_bottom.bin.lz" +gAreaTileSetTypes_HyruleField_top:: + .incbin "maps/areas/003_HyruleField/tileSet/gAreaTileSetTypes_HyruleField_top.bin.lz" +gAreaTileSet_HyruleField_0_3:: + .incbin "maps/areas/003_HyruleField/tileSets/0/gAreaTileSet_HyruleField_0_3.4bpp.lz" +gAreaRoomMap_HyruleField_WesternWoodsSouth_bottom:: + .incbin "maps/areas/003_HyruleField/rooms/00_WesternWoodsSouth/gAreaRoomMap_HyruleField_WesternWoodsSouth_bottom.bin.lz" +gAreaRoomMap_HyruleField_WesternWoodsSouth_top:: + .incbin "maps/areas/003_HyruleField/rooms/00_WesternWoodsSouth/gAreaRoomMap_HyruleField_WesternWoodsSouth_top.bin.lz" +gAreaRoomMap_HyruleField_SouthHyruleField_bottom:: + .incbin "maps/areas/003_HyruleField/rooms/01_SouthHyruleField/gAreaRoomMap_HyruleField_SouthHyruleField_bottom.bin.lz" +gAreaRoomMap_HyruleField_SouthHyruleField_top:: + .incbin "maps/areas/003_HyruleField/rooms/01_SouthHyruleField/gAreaRoomMap_HyruleField_SouthHyruleField_top.bin.lz" +gAreaRoomMap_HyruleField_EasternHillsSouth_bottom:: + .incbin "maps/areas/003_HyruleField/rooms/02_EasternHillsSouth/gAreaRoomMap_HyruleField_EasternHillsSouth_bottom.bin.lz" +gAreaRoomMap_HyruleField_EasternHillsSouth_top:: + .incbin "maps/areas/003_HyruleField/rooms/02_EasternHillsSouth/gAreaRoomMap_HyruleField_EasternHillsSouth_top.bin.lz" +gAreaRoomMap_HyruleField_EasternHillsCenter_bottom:: + .incbin "maps/areas/003_HyruleField/rooms/03_EasternHillsCenter/gAreaRoomMap_HyruleField_EasternHillsCenter_bottom.bin.lz" +gAreaRoomMap_HyruleField_EasternHillsCenter_top:: + .incbin "maps/areas/003_HyruleField/rooms/03_EasternHillsCenter/gAreaRoomMap_HyruleField_EasternHillsCenter_top.bin.lz" +gAreaRoomMap_HyruleField_EasternHillsNorth_bottom:: + .incbin "maps/areas/003_HyruleField/rooms/04_EasternHillsNorth/gAreaRoomMap_HyruleField_EasternHillsNorth_bottom.bin.lz" +gAreaRoomMap_HyruleField_EasternHillsNorth_top:: + .incbin "maps/areas/003_HyruleField/rooms/04_EasternHillsNorth/gAreaRoomMap_HyruleField_EasternHillsNorth_top.bin.lz" +gCaveBorder_EasternHills_outside:: + .incbin "maps/areas/003_HyruleField/rooms/04_EasternHillsNorth/gCaveBorder_EasternHills_outside.bin.lz" +gAreaRoomMap_HyruleField_LonLonRanch_bottom:: + .incbin "maps/areas/003_HyruleField/rooms/05_LonLonRanch/gAreaRoomMap_HyruleField_LonLonRanch_bottom.bin.lz" +gAreaRoomMap_HyruleField_LonLonRanch_top:: + .incbin "maps/areas/003_HyruleField/rooms/05_LonLonRanch/gAreaRoomMap_HyruleField_LonLonRanch_top.bin.lz" +gCaveBorder_LonLonRanch_outside:: + .incbin "maps/areas/003_HyruleField/rooms/05_LonLonRanch/gCaveBorder_LonLonRanch_outside.bin.lz" +gAreaRoomMap_HyruleField_NorthHyruleField_bottom:: + .incbin "maps/areas/003_HyruleField/rooms/06_NorthHyruleField/gAreaRoomMap_HyruleField_NorthHyruleField_bottom.bin.lz" +gAreaRoomMap_HyruleField_NorthHyruleField_top:: + .incbin "maps/areas/003_HyruleField/rooms/06_NorthHyruleField/gAreaRoomMap_HyruleField_NorthHyruleField_top.bin.lz" +gAreaRoomMap_HyruleField_TrilbyHighlands_bottom:: + .incbin "maps/areas/003_HyruleField/rooms/07_TrilbyHighlands/gAreaRoomMap_HyruleField_TrilbyHighlands_bottom.bin.lz" +gAreaRoomMap_HyruleField_TrilbyHighlands_top:: + .incbin "maps/areas/003_HyruleField/rooms/07_TrilbyHighlands/gAreaRoomMap_HyruleField_TrilbyHighlands_top.bin.lz" +gCaveBorder_TrilbyHighlands_outside:: + .incbin "maps/areas/003_HyruleField/rooms/07_TrilbyHighlands/gCaveBorder_TrilbyHighlands_outside.bin.lz" +gAreaRoomMap_HyruleField_WesternWoodsNorth_bottom:: + .incbin "maps/areas/003_HyruleField/rooms/08_WesternWoodsNorth/gAreaRoomMap_HyruleField_WesternWoodsNorth_bottom.bin.lz" +gAreaRoomMap_HyruleField_WesternWoodsNorth_top:: + .incbin "maps/areas/003_HyruleField/rooms/08_WesternWoodsNorth/gAreaRoomMap_HyruleField_WesternWoodsNorth_top.bin.lz" +gAreaRoomMap_HyruleField_WesternWoodsCenter_bottom:: + .incbin "maps/areas/003_HyruleField/rooms/09_WesternWoodsCenter/gAreaRoomMap_HyruleField_WesternWoodsCenter_bottom.bin.lz" +gAreaRoomMap_HyruleField_WesternWoodsCenter_top:: + .incbin "maps/areas/003_HyruleField/rooms/09_WesternWoodsCenter/gAreaRoomMap_HyruleField_WesternWoodsCenter_top.bin.lz" +gAreaTileSet_CastleGarden_0_0:: + .incbin "maps/areas/007_CastleGarden/tileSets/0/gAreaTileSet_CastleGarden_0_0.4bpp.lz" +gAreaTileSet_CastleGarden_0_1:: + .incbin "maps/areas/007_CastleGarden/tileSets/0/gAreaTileSet_CastleGarden_0_1.4bpp.lz" +gAreaTileSet_CastleGarden_0_2:: + .incbin "maps/areas/007_CastleGarden/tileSets/0/gAreaTileSet_CastleGarden_0_2.4bpp.lz" +gAreaTileSet_CastleGarden_bottom:: + .incbin "maps/areas/007_CastleGarden/tileSet/gAreaTileSet_CastleGarden_bottom.bin.lz" +gAreaTileSet_CastleGarden_top:: + .incbin "maps/areas/007_CastleGarden/tileSet/gAreaTileSet_CastleGarden_top.bin.lz" +gAreaTileSetTypes_CastleGarden_bottom:: + .incbin "maps/areas/007_CastleGarden/tileSet/gAreaTileSetTypes_CastleGarden_bottom.bin.lz" +gAreaTileSetTypes_CastleGarden_top:: + .incbin "maps/areas/007_CastleGarden/tileSet/gAreaTileSetTypes_CastleGarden_top.bin.lz" +gAreaRoomMap_CastleGarden_Main_bottom:: + .incbin "maps/areas/007_CastleGarden/rooms/00_Main/gAreaRoomMap_CastleGarden_Main_bottom.bin.lz" +gAreaRoomMap_CastleGarden_Main_top:: + .incbin "maps/areas/007_CastleGarden/rooms/00_Main/gAreaRoomMap_CastleGarden_Main_top.bin.lz" +gAreaTileSet_CloudTops_0_0:: + .incbin "maps/areas/008_CloudTops/tileSets/0/gAreaTileSet_CloudTops_0_0.4bpp.lz" +gAreaTileSet_CloudTops_0_1:: + .incbin "maps/areas/008_CloudTops/tileSets/0/gAreaTileSet_CloudTops_0_1.4bpp.lz" +gAreaTileSet_CloudTops_0_2:: + .incbin "maps/areas/008_CloudTops/tileSets/0/gAreaTileSet_CloudTops_0_2.4bpp.lz" +gAreaTileSet_CloudTops_bottom:: + .incbin "maps/areas/008_CloudTops/tileSet/gAreaTileSet_CloudTops_bottom.bin.lz" +gAreaTileSet_CloudTops_top:: + .incbin "maps/areas/008_CloudTops/tileSet/gAreaTileSet_CloudTops_top.bin.lz" +gAreaTileSetTypes_CloudTops_bottom:: + .incbin "maps/areas/008_CloudTops/tileSet/gAreaTileSetTypes_CloudTops_bottom.bin.lz" +gAreaTileSetTypes_CloudTops_top:: + .incbin "maps/areas/008_CloudTops/tileSet/gAreaTileSetTypes_CloudTops_top.bin.lz" +gAreaRoomMap_CloudTops_CloudTops_bottom:: + .incbin "maps/areas/008_CloudTops/rooms/00_CloudTops/gAreaRoomMap_CloudTops_CloudTops_bottom.bin.lz" +gAreaRoomMap_CloudTops_CloudTops_top:: + .incbin "maps/areas/008_CloudTops/rooms/00_CloudTops/gAreaRoomMap_CloudTops_CloudTops_top.bin.lz" +gAreaRoomMap_CloudTops_CloudMiddles_bottom:: + .incbin "maps/areas/008_CloudTops/rooms/01_CloudMiddles/gAreaRoomMap_CloudTops_CloudMiddles_bottom.bin.lz" +gAreaRoomMap_CloudTops_CloudMiddles_top:: + .incbin "maps/areas/008_CloudTops/rooms/01_CloudMiddles/gAreaRoomMap_CloudTops_CloudMiddles_top.bin.lz" +gAreaRoomMap_CloudTops_CloudBottoms_bottom:: + .incbin "maps/areas/008_CloudTops/rooms/02_CloudBottoms/gAreaRoomMap_CloudTops_CloudBottoms_bottom.bin.lz" +gAreaRoomMap_CloudTops_CloudBottoms_top:: + .incbin "maps/areas/008_CloudTops/rooms/02_CloudBottoms/gAreaRoomMap_CloudTops_CloudBottoms_top.bin.lz" +gAreaTileSet_CloudTops_0_3:: + .incbin "maps/areas/008_CloudTops/tileSets/0/gAreaTileSet_CloudTops_0_3.4bpp.lz" +gAreaTileSet_RoyalValley_0_0:: + .incbin "maps/areas/009_RoyalValley/tileSets/0/gAreaTileSet_RoyalValley_0_0.4bpp.lz" +gAreaTileSet_RoyalValley_0_1:: + .incbin "maps/areas/009_RoyalValley/tileSets/0/gAreaTileSet_RoyalValley_0_1.4bpp.lz" +gAreaTileSet_RoyalValley_0_2:: + .incbin "maps/areas/009_RoyalValley/tileSets/0/gAreaTileSet_RoyalValley_0_2.4bpp.lz" +gAreaTileSet_RoyalValley_bottom:: + .incbin "maps/areas/009_RoyalValley/tileSet/gAreaTileSet_RoyalValley_bottom.bin.lz" +gAreaTileSet_RoyalValley_top:: + .incbin "maps/areas/009_RoyalValley/tileSet/gAreaTileSet_RoyalValley_top.bin.lz" +gAreaTileSetTypes_RoyalValley_bottom:: + .incbin "maps/areas/009_RoyalValley/tileSet/gAreaTileSetTypes_RoyalValley_bottom.bin.lz" +gAreaTileSetTypes_RoyalValley_top:: + .incbin "maps/areas/009_RoyalValley/tileSet/gAreaTileSetTypes_RoyalValley_top.bin.lz" +gAreaRoomMap_RoyalValley_Main_bottom:: + .incbin "maps/areas/009_RoyalValley/rooms/00_Main/gAreaRoomMap_RoyalValley_Main_bottom.bin.lz" +gAreaRoomMap_RoyalValley_Main_top:: + .incbin "maps/areas/009_RoyalValley/rooms/00_Main/gAreaRoomMap_RoyalValley_Main_top.bin.lz" unknown_9:: .incbin "assets/unknown_9.bin" -gAreaRoomMap_RoyalValley_1_0:: - .incbin "assets/gAreaRoomMap_RoyalValley_1_0.bin" - .align 2 -gAreaRoomMap_RoyalValley_1_1:: - .incbin "assets/gAreaRoomMap_RoyalValley_1_1.bin" -gAreaTileset_VeilFallsTop_0_0:: - .incbin "tilesets/gAreaTileset_VeilFallsTop_0_0.4bpp.lz" -gAreaTileset_VeilFallsTop_0_1:: - .incbin "tilesets/gAreaTileset_VeilFallsTop_0_1.4bpp.lz" - .align 2 -gAreaTileset_VeilFallsDigCave_0_2:: - .incbin "tilesets/gAreaTileset_VeilFallsDigCave_0_2.4bpp.lz" - .align 2 -gAreaRoomMap_VeilFalls_0_0:: - .incbin "assets/gAreaRoomMap_VeilFalls_0_0.bin" - .align 2 -gAreaRoomMap_VeilFalls_0_1:: - .incbin "assets/gAreaRoomMap_VeilFalls_0_1.bin" - .align 2 -unknown_10:: - .incbin "assets/unknown_10.bin" -gAreaTileset_VeilFallsTop_0_2:: - .incbin "tilesets/gAreaTileset_VeilFallsTop_0_2.4bpp.lz" -gAreaRoomMap_VeilFallsTop_0_0:: - .incbin "assets/gAreaRoomMap_VeilFallsTop_0_0.bin" - .align 2 -gAreaRoomMap_VeilFallsTop_0_1:: - .incbin "assets/gAreaRoomMap_VeilFallsTop_0_1.bin" -gAreaTileset_Beanstalks_0_0:: - .incbin "tilesets/gAreaTileset_Beanstalks_0_0.4bpp.lz" - .align 2 -gAreaTileset_Beanstalks_0_1:: - .incbin "tilesets/gAreaTileset_Beanstalks_0_1.4bpp.lz" - .align 2 -gAreaTileset_Beanstalks_0_2:: - .incbin "tilesets/gAreaTileset_Beanstalks_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_Beanstalks_0:: - .incbin "assets/gAreaMetatiles_Beanstalks_0.bin" - .align 2 -gAreaMetatiles_Beanstalks_1:: - .incbin "assets/gAreaMetatiles_Beanstalks_1.bin" - .align 2 -gAreaTileset_Beanstalks_0_3:: - .incbin "assets/gAreaTileset_Beanstalks_0_3.bin" - .align 2 -gAreaRoomMap_Beanstalks_5_1:: - .incbin "assets/gAreaRoomMap_Beanstalks_5_1.bin" - .align 2 -gAreaRoomMap_Beanstalks_0_0:: - .incbin "assets/gAreaRoomMap_Beanstalks_0_0.bin" -gAreaRoomMap_Beanstalks_1_0:: - .incbin "assets/gAreaRoomMap_Beanstalks_1_0.bin" -gAreaRoomMap_Beanstalks_2_0:: - .incbin "assets/gAreaRoomMap_Beanstalks_2_0.bin" -gAreaRoomMap_Beanstalks_3_0:: - .incbin "assets/gAreaRoomMap_Beanstalks_3_0.bin" -gAreaRoomMap_Beanstalks_4_0:: - .incbin "assets/gAreaRoomMap_Beanstalks_4_0.bin" - .align 2 +gAreaRoomMap_RoyalValley_ForestMaze_bottom:: + .incbin "maps/areas/009_RoyalValley/rooms/01_ForestMaze/gAreaRoomMap_RoyalValley_ForestMaze_bottom.bin.lz" +gAreaRoomMap_RoyalValley_ForestMaze_top:: + .incbin "maps/areas/009_RoyalValley/rooms/01_ForestMaze/gAreaRoomMap_RoyalValley_ForestMaze_top.bin.lz" +gAreaTileSet_VeilFalls_0_0:: + .incbin "maps/areas/010_VeilFalls/tileSets/0/gAreaTileSet_VeilFalls_0_0.4bpp.lz" +gAreaTileSet_VeilFalls_0_1:: + .incbin "maps/areas/010_VeilFalls/tileSets/0/gAreaTileSet_VeilFalls_0_1.4bpp.lz" +gAreaTileSet_VeilFalls_0_2:: + .incbin "maps/areas/010_VeilFalls/tileSets/0/gAreaTileSet_VeilFalls_0_2.4bpp.lz" +gAreaRoomMap_VeilFalls_Main_bottom:: + .incbin "maps/areas/010_VeilFalls/rooms/00_Main/gAreaRoomMap_VeilFalls_Main_bottom.bin.lz" +gAreaRoomMap_VeilFalls_Main_top:: + .incbin "maps/areas/010_VeilFalls/rooms/00_Main/gAreaRoomMap_VeilFalls_Main_top.bin.lz" +gCaveBorder_VeilFalls_outside:: + .incbin "maps/areas/010_VeilFalls/rooms/00_Main/gCaveBorder_VeilFalls_outside.bin.lz" +gAreaTileSet_VeilFallsTop_0_2:: + .incbin "maps/areas/026_VeilFallsTop/tileSets/0/gAreaTileSet_VeilFallsTop_0_2.4bpp.lz" +gAreaRoomMap_VeilFallsTop_0_bottom:: + .incbin "maps/areas/026_VeilFallsTop/rooms/00_0/gAreaRoomMap_VeilFallsTop_0_bottom.bin.lz" +gAreaRoomMap_VeilFallsTop_0_top:: + .incbin "maps/areas/026_VeilFallsTop/rooms/00_0/gAreaRoomMap_VeilFallsTop_0_top.bin.lz" +gAreaTileSet_Beanstalks_0_0:: + .incbin "maps/areas/013_Beanstalks/tileSets/0/gAreaTileSet_Beanstalks_0_0.4bpp.lz" +gAreaTileSet_Beanstalks_0_1:: + .incbin "maps/areas/013_Beanstalks/tileSets/0/gAreaTileSet_Beanstalks_0_1.4bpp.lz" +gAreaTileSet_Beanstalks_0_2:: + .incbin "maps/areas/013_Beanstalks/tileSets/0/gAreaTileSet_Beanstalks_0_2.4bpp.lz" +gAreaTileSet_Beanstalks_bottom:: + .incbin "maps/areas/013_Beanstalks/tileSet/gAreaTileSet_Beanstalks_bottom.bin.lz" +gAreaTileSetTypes_Beanstalks_bottom:: + .incbin "maps/areas/013_Beanstalks/tileSet/gAreaTileSetTypes_Beanstalks_bottom.bin.lz" +gAreaTileSet_Beanstalks_0_3:: + .incbin "maps/areas/013_Beanstalks/tileSets/0/gAreaTileSet_Beanstalks_0_3.4bpp.lz" +gRoomMapping_Beanstalks_CrenelClimb_top:: + .incbin "maps/areas/013_Beanstalks/rooms/16_CrenelClimb/gRoomMapping_Beanstalks_CrenelClimb_top.bin.lz" +gAreaRoomMap_Beanstalks_Crenel_bottom:: + .incbin "maps/areas/013_Beanstalks/rooms/00_Crenel/gAreaRoomMap_Beanstalks_Crenel_bottom.bin" +gAreaRoomMap_Beanstalks_LakeHylia_bottom:: + .incbin "maps/areas/013_Beanstalks/rooms/01_LakeHylia/gAreaRoomMap_Beanstalks_LakeHylia_bottom.bin" +gAreaRoomMap_Beanstalks_Ruins_bottom:: + .incbin "maps/areas/013_Beanstalks/rooms/02_Ruins/gAreaRoomMap_Beanstalks_Ruins_bottom.bin" +gAreaRoomMap_Beanstalks_EasternHills_bottom:: + .incbin "maps/areas/013_Beanstalks/rooms/03_EasternHills/gAreaRoomMap_Beanstalks_EasternHills_bottom.bin" +gAreaRoomMap_Beanstalks_WesternWoods_bottom:: + .incbin "maps/areas/013_Beanstalks/rooms/04_WesternWoods/gAreaRoomMap_Beanstalks_WesternWoods_bottom.bin" unknown_11:: .incbin "assets/unknown_11.bin" -gAreaRoomMap_Empty_0_0:: - .incbin "assets/gAreaRoomMap_Empty_0_0.bin" - .align 2 -gAreaRoomMap_Empty_0_1:: - .incbin "assets/gAreaRoomMap_Empty_0_1.bin" -gAreaTileset_45_0_0:: - .incbin "tilesets/gAreaTileset_45_0_0.4bpp.lz" - .align 2 -gAreaTileset_45_0_1:: - .incbin "tilesets/gAreaTileset_45_0_1.4bpp.lz" -gAreaTileset_45_0_2:: - .incbin "tilesets/gAreaTileset_45_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_CrenelCaves_0:: - .incbin "assets/gAreaMetatiles_CrenelCaves_0.bin" - .align 2 -gAreaMetatiles_CrenelCaves_1:: - .incbin "assets/gAreaMetatiles_CrenelCaves_1.bin" - .align 2 -gAreaMetatiles_CrenelCaves_2:: - .incbin "assets/gAreaMetatiles_CrenelCaves_2.bin" - .align 2 -gAreaMetatiles_CrenelCaves_3:: - .incbin "assets/gAreaMetatiles_CrenelCaves_3.bin" - .align 2 -gAreaRoomMap_CrenelCaves_0_0:: - .incbin "assets/gAreaRoomMap_CrenelCaves_0_0.bin" - .align 2 -gAreaRoomMap_CrenelCaves_0_1:: - .incbin "assets/gAreaRoomMap_CrenelCaves_0_1.bin" - .align 2 -gAreaRoomMap_CrenelCaves_1_0:: - .incbin "assets/gAreaRoomMap_CrenelCaves_1_0.bin" -gAreaRoomMap_CrenelCaves_1_1:: - .incbin "assets/gAreaRoomMap_CrenelCaves_1_1.bin" -gAreaRoomMap_CrenelCaves_2_0:: - .incbin "assets/gAreaRoomMap_CrenelCaves_2_0.bin" -gAreaRoomMap_CrenelCaves_2_1:: - .incbin "assets/gAreaRoomMap_CrenelCaves_2_1.bin" - .align 2 -gAreaRoomMap_CrenelCaves_3_0:: - .incbin "assets/gAreaRoomMap_CrenelCaves_3_0.bin" - .align 2 -gAreaRoomMap_CrenelCaves_3_1:: - .incbin "assets/gAreaRoomMap_CrenelCaves_3_1.bin" - .align 2 -gAreaRoomMap_CrenelCaves_4_0:: - .incbin "assets/gAreaRoomMap_CrenelCaves_4_0.bin" - .align 2 -gAreaRoomMap_CrenelCaves_4_1:: - .incbin "assets/gAreaRoomMap_CrenelCaves_4_1.bin" -gAreaRoomMap_CrenelCaves_5_0:: - .incbin "assets/gAreaRoomMap_CrenelCaves_5_0.bin" - .align 2 -gAreaRoomMap_CrenelCaves_5_1:: - .incbin "assets/gAreaRoomMap_CrenelCaves_5_1.bin" -gAreaRoomMap_CrenelCaves_6_0:: - .incbin "assets/gAreaRoomMap_CrenelCaves_6_0.bin" - .align 2 -gAreaRoomMap_CrenelCaves_6_1:: - .incbin "assets/gAreaRoomMap_CrenelCaves_6_1.bin" -gAreaRoomMap_CrenelCaves_7_0:: - .incbin "assets/gAreaRoomMap_CrenelCaves_7_0.bin" -gAreaRoomMap_CrenelCaves_7_1:: - .incbin "assets/gAreaRoomMap_CrenelCaves_7_1.bin" - .align 2 -gAreaRoomMap_CrenelCaves_8_0:: - .incbin "assets/gAreaRoomMap_CrenelCaves_8_0.bin" - .align 2 -gAreaRoomMap_CrenelCaves_8_1:: - .incbin "assets/gAreaRoomMap_CrenelCaves_8_1.bin" - .align 2 -gAreaRoomMap_CrenelCaves_9_0:: - .incbin "assets/gAreaRoomMap_CrenelCaves_9_0.bin" -gAreaRoomMap_CrenelCaves_9_1:: - .incbin "assets/gAreaRoomMap_CrenelCaves_9_1.bin" - .align 2 -gAreaRoomMap_CrenelCaves_10_0:: - .incbin "assets/gAreaRoomMap_CrenelCaves_10_0.bin" - .align 2 -gAreaRoomMap_CrenelCaves_10_1:: - .incbin "assets/gAreaRoomMap_CrenelCaves_10_1.bin" - .align 2 -gAreaRoomMap_CrenelCaves_11_0:: - .incbin "assets/gAreaRoomMap_CrenelCaves_11_0.bin" - .align 2 -gAreaRoomMap_CrenelCaves_11_1:: - .incbin "assets/gAreaRoomMap_CrenelCaves_11_1.bin" - .align 2 -gAreaRoomMap_CrenelCaves_12_0:: - .incbin "assets/gAreaRoomMap_CrenelCaves_12_0.bin" - .align 2 -gAreaRoomMap_CrenelCaves_12_1:: - .incbin "assets/gAreaRoomMap_CrenelCaves_12_1.bin" - .align 2 -gAreaRoomMap_CrenelCaves_13_0:: - .incbin "assets/gAreaRoomMap_CrenelCaves_13_0.bin" - .align 2 -gAreaRoomMap_CrenelCaves_13_1:: - .incbin "assets/gAreaRoomMap_CrenelCaves_13_1.bin" - .align 2 -gAreaRoomMap_CrenelCaves_14_0:: - .incbin "assets/gAreaRoomMap_CrenelCaves_14_0.bin" - .align 2 -gAreaRoomMap_CrenelCaves_14_1:: - .incbin "assets/gAreaRoomMap_CrenelCaves_14_1.bin" - .align 2 -gAreaRoomMap_CrenelCaves_15_0:: - .incbin "assets/gAreaRoomMap_CrenelCaves_15_0.bin" - .align 2 -gAreaRoomMap_CrenelCaves_15_1:: - .incbin "assets/gAreaRoomMap_CrenelCaves_15_1.bin" - .align 2 -gAreaRoomMap_CrenelCaves_16_0:: - .incbin "assets/gAreaRoomMap_CrenelCaves_16_0.bin" -gAreaRoomMap_CrenelCaves_16_1:: - .incbin "assets/gAreaRoomMap_CrenelCaves_16_1.bin" - .align 2 -gAreaTileset_GreatFairies_2_0:: - .incbin "tilesets/gAreaTileset_GreatFairies_2_0.4bpp.lz" -gAreaTileset_GreatFairies_2_1:: - .incbin "tilesets/gAreaTileset_GreatFairies_2_1.4bpp.lz" - .align 2 -gAreaTileset_GreatFairies_2_2:: - .incbin "tilesets/gAreaTileset_GreatFairies_2_2.4bpp.lz" - .align 2 -gAreaMetatiles_GreatFairies_0:: - .incbin "assets/gAreaMetatiles_GreatFairies_0.bin" - .align 2 -gAreaMetatiles_GreatFairies_1:: - .incbin "assets/gAreaMetatiles_GreatFairies_1.bin" - .align 2 -gAreaMetatiles_GreatFairies_2:: - .incbin "assets/gAreaMetatiles_GreatFairies_2.bin" - .align 2 -gAreaMetatiles_GreatFairies_3:: - .incbin "assets/gAreaMetatiles_GreatFairies_3.bin" - .align 2 -gAreaRoomMap_GreatFairies_0_0:: - .incbin "assets/gAreaRoomMap_GreatFairies_0_0.bin" - .align 2 -gAreaRoomMap_GreatFairies_0_1:: - .incbin "assets/gAreaRoomMap_GreatFairies_0_1.bin" - .align 2 -gAreaRoomMap_GreatFairies_1_0:: - .incbin "assets/gAreaRoomMap_GreatFairies_1_0.bin" -gAreaRoomMap_GreatFairies_1_1:: - .incbin "assets/gAreaRoomMap_GreatFairies_1_1.bin" - .align 2 -gAreaRoomMap_GreatFairies_2_0:: - .incbin "assets/gAreaRoomMap_GreatFairies_2_0.bin" - .align 2 -gAreaRoomMap_GreatFairies_2_1:: - .incbin "assets/gAreaRoomMap_GreatFairies_2_1.bin" - .align 2 -gAreaRoomMap_CastorCaves_0_0:: - .incbin "assets/gAreaRoomMap_CastorCaves_0_0.bin" -gAreaRoomMap_CastorCaves_0_1:: - .incbin "assets/gAreaRoomMap_CastorCaves_0_1.bin" -gAreaRoomMap_CastorCaves_1_0:: - .incbin "assets/gAreaRoomMap_CastorCaves_1_0.bin" - .align 2 -gAreaRoomMap_CastorCaves_1_1:: - .incbin "assets/gAreaRoomMap_CastorCaves_1_1.bin" - .align 2 -gAreaRoomMap_CastorCaves_2_0:: - .incbin "assets/gAreaRoomMap_CastorCaves_2_0.bin" - .align 2 -gAreaRoomMap_CastorCaves_2_1:: - .incbin "assets/gAreaRoomMap_CastorCaves_2_1.bin" - .align 2 -gAreaRoomMap_CastorCaves_3_0:: - .incbin "assets/gAreaRoomMap_CastorCaves_3_0.bin" - .align 2 -gAreaRoomMap_CastorCaves_3_1:: - .incbin "assets/gAreaRoomMap_CastorCaves_3_1.bin" - .align 2 -gAreaRoomMap_CastorCaves_4_0:: - .incbin "assets/gAreaRoomMap_CastorCaves_4_0.bin" - .align 2 -gAreaRoomMap_CastorCaves_4_1:: - .incbin "assets/gAreaRoomMap_CastorCaves_4_1.bin" - .align 2 -gAreaRoomMap_CastorDarknut_0_0:: - .incbin "assets/gAreaRoomMap_CastorDarknut_0_0.bin" -gAreaRoomMap_CastorDarknut_0_1:: - .incbin "assets/gAreaRoomMap_CastorDarknut_0_1.bin" - .align 2 -gAreaRoomMap_CastorDarknut_1_0:: - .incbin "assets/gAreaRoomMap_CastorDarknut_1_0.bin" - .align 2 -gAreaRoomMap_CastorDarknut_1_1:: - .incbin "assets/gAreaRoomMap_CastorDarknut_1_1.bin" - .align 2 -gAreaTileset_ArmosInteriors_0_0:: - .incbin "tilesets/gAreaTileset_ArmosInteriors_0_0.4bpp.lz" - .align 2 -gAreaTileset_ArmosInteriors_0_1:: - .incbin "tilesets/gAreaTileset_ArmosInteriors_0_1.4bpp.lz" -gAreaTileset_ArmosInteriors_0_2:: - .incbin "tilesets/gAreaTileset_ArmosInteriors_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_ArmosInteriors_0:: - .incbin "assets/gAreaMetatiles_ArmosInteriors_0.bin" - .align 2 -gAreaMetatiles_ArmosInteriors_1:: - .incbin "assets/gAreaMetatiles_ArmosInteriors_1.bin" - .align 2 -gAreaMetatiles_ArmosInteriors_2:: - .incbin "assets/gAreaMetatiles_ArmosInteriors_2.bin" - .align 2 -gAreaMetatiles_ArmosInteriors_3:: - .incbin "assets/gAreaMetatiles_ArmosInteriors_3.bin" - .align 2 -gAreaRoomMap_ArmosInteriors_0_0:: - .incbin "assets/gAreaRoomMap_ArmosInteriors_0_0.bin" -gAreaRoomMap_ArmosInteriors_0_1:: - .incbin "assets/gAreaRoomMap_ArmosInteriors_0_1.bin" -gAreaRoomMap_ArmosInteriors_1_0:: - .incbin "assets/gAreaRoomMap_ArmosInteriors_1_0.bin" -gAreaRoomMap_ArmosInteriors_1_1:: - .incbin "assets/gAreaRoomMap_ArmosInteriors_1_1.bin" -gAreaRoomMap_ArmosInteriors_2_0:: - .incbin "assets/gAreaRoomMap_ArmosInteriors_2_0.bin" -gAreaRoomMap_ArmosInteriors_2_1:: - .incbin "assets/gAreaRoomMap_ArmosInteriors_2_1.bin" -gAreaRoomMap_ArmosInteriors_3_0:: - .incbin "assets/gAreaRoomMap_ArmosInteriors_3_0.bin" -gAreaRoomMap_ArmosInteriors_3_1:: - .incbin "assets/gAreaRoomMap_ArmosInteriors_3_1.bin" -gAreaRoomMap_ArmosInteriors_4_0:: - .incbin "assets/gAreaRoomMap_ArmosInteriors_4_0.bin" -gAreaRoomMap_ArmosInteriors_4_1:: - .incbin "assets/gAreaRoomMap_ArmosInteriors_4_1.bin" -gAreaRoomMap_ArmosInteriors_5_0:: - .incbin "assets/gAreaRoomMap_ArmosInteriors_5_0.bin" -gAreaRoomMap_ArmosInteriors_5_1:: - .incbin "assets/gAreaRoomMap_ArmosInteriors_5_1.bin" -gAreaRoomMap_ArmosInteriors_6_0:: - .incbin "assets/gAreaRoomMap_ArmosInteriors_6_0.bin" -gAreaRoomMap_ArmosInteriors_6_1:: - .incbin "assets/gAreaRoomMap_ArmosInteriors_6_1.bin" -gAreaRoomMap_ArmosInteriors_7_0:: - .incbin "assets/gAreaRoomMap_ArmosInteriors_7_0.bin" -gAreaRoomMap_ArmosInteriors_7_1:: - .incbin "assets/gAreaRoomMap_ArmosInteriors_7_1.bin" -gAreaRoomMap_ArmosInteriors_8_0:: - .incbin "assets/gAreaRoomMap_ArmosInteriors_8_0.bin" -gAreaRoomMap_ArmosInteriors_8_1:: - .incbin "assets/gAreaRoomMap_ArmosInteriors_8_1.bin" -gAreaRoomMap_ArmosInteriors_9_0:: - .incbin "assets/gAreaRoomMap_ArmosInteriors_9_0.bin" -gAreaRoomMap_ArmosInteriors_9_1:: - .incbin "assets/gAreaRoomMap_ArmosInteriors_9_1.bin" -gAreaRoomMap_ArmosInteriors_10_0:: - .incbin "assets/gAreaRoomMap_ArmosInteriors_10_0.bin" -gAreaRoomMap_ArmosInteriors_10_1:: - .incbin "assets/gAreaRoomMap_ArmosInteriors_10_1.bin" -gAreaTileset_GoronCave_0_0:: - .incbin "tilesets/gAreaTileset_GoronCave_0_0.4bpp.lz" -gAreaTileset_GoronCave_0_1:: - .incbin "tilesets/gAreaTileset_GoronCave_0_1.4bpp.lz" - .align 2 -gAreaTileset_GoronCave_0_2:: - .incbin "tilesets/gAreaTileset_GoronCave_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_GoronCave_0:: - .incbin "assets/gAreaMetatiles_GoronCave_0.bin" - .align 2 -gAreaMetatiles_GoronCave_1:: - .incbin "assets/gAreaMetatiles_GoronCave_1.bin" -gAreaMetatiles_GoronCave_2:: - .incbin "assets/gAreaMetatiles_GoronCave_2.bin" -gAreaMetatiles_GoronCave_3:: - .incbin "assets/gAreaMetatiles_GoronCave_3.bin" - .align 2 -gAreaRoomMap_GoronCave_0_0:: - .incbin "assets/gAreaRoomMap_GoronCave_0_0.bin" - .align 2 -gAreaRoomMap_GoronCave_0_1:: - .incbin "assets/gAreaRoomMap_GoronCave_0_1.bin" - .align 2 -gAreaRoomMap_GoronCave_1_0:: - .incbin "assets/gAreaRoomMap_GoronCave_1_0.bin" -gAreaRoomMap_GoronCave_1_1:: - .incbin "assets/gAreaRoomMap_GoronCave_1_1.bin" -gAreaRoomMap_Caves_0_0:: - .incbin "assets/gAreaRoomMap_Caves_0_0.bin" - .align 2 -gAreaRoomMap_Caves_0_1:: - .incbin "assets/gAreaRoomMap_Caves_0_1.bin" -gAreaRoomMap_Caves_1_0:: - .incbin "assets/gAreaRoomMap_Caves_1_0.bin" - .align 2 -gAreaRoomMap_Caves_1_1:: - .incbin "assets/gAreaRoomMap_Caves_1_1.bin" - .align 2 -gAreaRoomMap_Caves_2_0:: - .incbin "assets/gAreaRoomMap_Caves_2_0.bin" -gAreaRoomMap_Caves_2_1:: - .incbin "assets/gAreaRoomMap_Caves_2_1.bin" - .align 2 -gAreaRoomMap_Caves_3_0:: - .incbin "assets/gAreaRoomMap_Caves_3_0.bin" - .align 2 -gAreaRoomMap_Caves_3_1:: - .incbin "assets/gAreaRoomMap_Caves_3_1.bin" - .align 2 -gAreaRoomMap_Caves_4_0:: - .incbin "assets/gAreaRoomMap_Caves_4_0.bin" - .align 2 -gAreaRoomMap_Caves_4_1:: - .incbin "assets/gAreaRoomMap_Caves_4_1.bin" - .align 2 -gAreaRoomMap_Caves_5_0:: - .incbin "assets/gAreaRoomMap_Caves_5_0.bin" - .align 2 -gAreaRoomMap_Caves_5_1:: - .incbin "assets/gAreaRoomMap_Caves_5_1.bin" - .align 2 -gAreaRoomMap_Caves_6_0:: - .incbin "assets/gAreaRoomMap_Caves_6_0.bin" - .align 2 -gAreaRoomMap_Caves_6_1:: - .incbin "assets/gAreaRoomMap_Caves_6_1.bin" - .align 2 -gAreaRoomMap_Caves_7_0:: - .incbin "assets/gAreaRoomMap_Caves_7_0.bin" - .align 2 -gAreaRoomMap_Caves_7_1:: - .incbin "assets/gAreaRoomMap_Caves_7_1.bin" - .align 2 -gAreaRoomMap_Caves_8_0:: - .incbin "assets/gAreaRoomMap_Caves_8_0.bin" - .align 2 -gAreaRoomMap_Caves_8_1:: - .incbin "assets/gAreaRoomMap_Caves_8_1.bin" - .align 2 -gAreaRoomMap_Caves_9_0:: - .incbin "assets/gAreaRoomMap_Caves_9_0.bin" -gAreaRoomMap_Caves_9_1:: - .incbin "assets/gAreaRoomMap_Caves_9_1.bin" -gAreaRoomMap_Caves_10_0:: - .incbin "assets/gAreaRoomMap_Caves_10_0.bin" - .align 2 -gAreaRoomMap_Caves_10_1:: - .incbin "assets/gAreaRoomMap_Caves_10_1.bin" - .align 2 -gAreaRoomMap_Caves_11_0:: - .incbin "assets/gAreaRoomMap_Caves_11_0.bin" -gAreaRoomMap_Caves_11_1:: - .incbin "assets/gAreaRoomMap_Caves_11_1.bin" - .align 2 -gAreaRoomMap_Caves_12_0:: - .incbin "assets/gAreaRoomMap_Caves_12_0.bin" - .align 2 -gAreaRoomMap_Caves_12_1:: - .incbin "assets/gAreaRoomMap_Caves_12_1.bin" - .align 2 -gAreaRoomMap_Caves_13_0:: - .incbin "assets/gAreaRoomMap_Caves_13_0.bin" - .align 2 -gAreaRoomMap_Caves_13_1:: - .incbin "assets/gAreaRoomMap_Caves_13_1.bin" - .align 2 -gAreaRoomMap_Caves_14_0:: - .incbin "assets/gAreaRoomMap_Caves_14_0.bin" - .align 2 -gAreaRoomMap_Caves_14_1:: - .incbin "assets/gAreaRoomMap_Caves_14_1.bin" - .align 2 -gAreaRoomMap_Caves_15_0:: - .incbin "assets/gAreaRoomMap_Caves_15_0.bin" - .align 2 -gAreaRoomMap_Caves_15_1:: - .incbin "assets/gAreaRoomMap_Caves_15_1.bin" - .align 2 -gAreaRoomMap_Caves_16_0:: - .incbin "assets/gAreaRoomMap_Caves_16_0.bin" -gAreaRoomMap_Caves_16_1:: - .incbin "assets/gAreaRoomMap_Caves_16_1.bin" - .align 2 -gAreaRoomMap_Caves_17_0:: - .incbin "assets/gAreaRoomMap_Caves_17_0.bin" - .align 2 -gAreaRoomMap_Caves_17_1:: - .incbin "assets/gAreaRoomMap_Caves_17_1.bin" - .align 2 -gAreaRoomMap_Caves_18_0:: - .incbin "assets/gAreaRoomMap_Caves_18_0.bin" - .align 2 -gAreaRoomMap_Caves_18_1:: - .incbin "assets/gAreaRoomMap_Caves_18_1.bin" - .align 2 -gAreaRoomMap_Caves_19_0:: - .incbin "assets/gAreaRoomMap_Caves_19_0.bin" - .align 2 -gAreaRoomMap_Caves_19_1:: - .incbin "assets/gAreaRoomMap_Caves_19_1.bin" -gAreaRoomMap_Caves_20_0:: - .incbin "assets/gAreaRoomMap_Caves_20_0.bin" - .align 2 -gAreaRoomMap_Caves_20_1:: - .incbin "assets/gAreaRoomMap_Caves_20_1.bin" - .align 2 -gAreaRoomMap_Caves_21_0:: - .incbin "assets/gAreaRoomMap_Caves_21_0.bin" - .align 2 -gAreaRoomMap_Caves_21_1:: - .incbin "assets/gAreaRoomMap_Caves_21_1.bin" - .align 2 -gAreaRoomMap_Caves_22_0:: - .incbin "assets/gAreaRoomMap_Caves_22_0.bin" -gAreaRoomMap_Caves_22_1:: - .incbin "assets/gAreaRoomMap_Caves_22_1.bin" -gAreaRoomMap_Caves_23_0:: - .incbin "assets/gAreaRoomMap_Caves_23_0.bin" - .align 2 -gAreaRoomMap_Caves_23_1:: - .incbin "assets/gAreaRoomMap_Caves_23_1.bin" - .align 2 -gAreaRoomMap_VeilFallsCaves_0_0:: - .incbin "assets/gAreaRoomMap_VeilFallsCaves_0_0.bin" - .align 2 -gAreaRoomMap_VeilFallsCaves_0_1:: - .incbin "assets/gAreaRoomMap_VeilFallsCaves_0_1.bin" - .align 2 -gAreaRoomMap_VeilFallsCaves_1_0:: - .incbin "assets/gAreaRoomMap_VeilFallsCaves_1_0.bin" - .align 2 -gAreaRoomMap_VeilFallsCaves_1_1:: - .incbin "assets/gAreaRoomMap_VeilFallsCaves_1_1.bin" - .align 2 -gAreaRoomMap_VeilFallsCaves_2_0:: - .incbin "assets/gAreaRoomMap_VeilFallsCaves_2_0.bin" - .align 2 -gAreaRoomMap_VeilFallsCaves_2_1:: - .incbin "assets/gAreaRoomMap_VeilFallsCaves_2_1.bin" -gAreaRoomMap_VeilFallsCaves_3_0:: - .incbin "assets/gAreaRoomMap_VeilFallsCaves_3_0.bin" - .align 2 -gAreaRoomMap_VeilFallsCaves_3_1:: - .incbin "assets/gAreaRoomMap_VeilFallsCaves_3_1.bin" -gAreaRoomMap_VeilFallsCaves_4_0:: - .incbin "assets/gAreaRoomMap_VeilFallsCaves_4_0.bin" - .align 2 -gAreaRoomMap_VeilFallsCaves_4_1:: - .incbin "assets/gAreaRoomMap_VeilFallsCaves_4_1.bin" -gAreaRoomMap_VeilFallsCaves_5_0:: - .incbin "assets/gAreaRoomMap_VeilFallsCaves_5_0.bin" -gAreaRoomMap_VeilFallsCaves_5_1:: - .incbin "assets/gAreaRoomMap_VeilFallsCaves_5_1.bin" - .align 2 -gAreaRoomMap_VeilFallsCaves_6_0:: - .incbin "assets/gAreaRoomMap_VeilFallsCaves_6_0.bin" - .align 2 -gAreaRoomMap_VeilFallsCaves_6_1:: - .incbin "assets/gAreaRoomMap_VeilFallsCaves_6_1.bin" - .align 2 -gAreaRoomMap_VeilFallsCaves_7_0:: - .incbin "assets/gAreaRoomMap_VeilFallsCaves_7_0.bin" - .align 2 -gAreaRoomMap_VeilFallsCaves_7_1:: - .incbin "assets/gAreaRoomMap_VeilFallsCaves_7_1.bin" - .align 2 -gAreaRoomMap_VeilFallsCaves_8_0:: - .incbin "assets/gAreaRoomMap_VeilFallsCaves_8_0.bin" - .align 2 -gAreaRoomMap_VeilFallsCaves_8_1:: - .incbin "assets/gAreaRoomMap_VeilFallsCaves_8_1.bin" - .align 2 -gAreaRoomMap_VeilFallsCaves_9_0:: - .incbin "assets/gAreaRoomMap_VeilFallsCaves_9_0.bin" - .align 2 -gAreaRoomMap_VeilFallsCaves_9_1:: - .incbin "assets/gAreaRoomMap_VeilFallsCaves_9_1.bin" - .align 2 -gAreaRoomMap_RoyalValleyGraves_0_0:: - .incbin "assets/gAreaRoomMap_RoyalValleyGraves_0_0.bin" - .align 2 -gAreaRoomMap_RoyalValleyGraves_0_1:: - .incbin "assets/gAreaRoomMap_RoyalValleyGraves_0_1.bin" - .align 2 -gAreaRoomMap_RoyalValleyGraves_1_0:: - .incbin "assets/gAreaRoomMap_RoyalValleyGraves_1_0.bin" - .align 2 -gAreaRoomMap_RoyalValleyGraves_1_1:: - .incbin "assets/gAreaRoomMap_RoyalValleyGraves_1_1.bin" -gAreaTileset_MinishCaves_0_0:: - .incbin "tilesets/gAreaTileset_MinishCaves_0_0.4bpp.lz" -gAreaTileset_MinishCaves_0_1:: - .incbin "tilesets/gAreaTileset_MinishCaves_0_1.4bpp.lz" - .align 2 -gAreaTileset_MinishCaves_0_2:: - .incbin "tilesets/gAreaTileset_MinishCaves_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_MinishCaves_0:: - .incbin "assets/gAreaMetatiles_MinishCaves_0.bin" - .align 2 -gAreaMetatiles_MinishCaves_1:: - .incbin "assets/gAreaMetatiles_MinishCaves_1.bin" - .align 2 -gAreaMetatiles_MinishCaves_2:: - .incbin "assets/gAreaMetatiles_MinishCaves_2.bin" - .align 2 -gAreaMetatiles_MinishCaves_3:: - .incbin "assets/gAreaMetatiles_MinishCaves_3.bin" - .align 2 -gAreaTileset_37_0_0:: - .incbin "tilesets/gAreaTileset_37_0_0.4bpp.lz" -gAreaTileset_37_0_1:: - .incbin "tilesets/gAreaTileset_37_0_1.4bpp.lz" - .align 2 -gAreaTileset_37_0_2:: - .incbin "tilesets/gAreaTileset_37_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_CastleGardenMinishHoles_0:: - .incbin "assets/gAreaMetatiles_CastleGardenMinishHoles_0.bin" - .align 2 -gAreaMetatiles_CastleGardenMinishHoles_1:: - .incbin "assets/gAreaMetatiles_CastleGardenMinishHoles_1.bin" - .align 2 -gAreaMetatiles_CastleGardenMinishHoles_2:: - .incbin "assets/gAreaMetatiles_CastleGardenMinishHoles_2.bin" - .align 2 -gAreaMetatiles_CastleGardenMinishHoles_3:: - .incbin "assets/gAreaMetatiles_CastleGardenMinishHoles_3.bin" - .align 2 -gAreaRoomMap_MinishCaves_0_0:: - .incbin "assets/gAreaRoomMap_MinishCaves_0_0.bin" - .align 2 -gAreaRoomMap_MinishCaves_0_1:: - .incbin "assets/gAreaRoomMap_MinishCaves_0_1.bin" - .align 2 -gAreaRoomMap_MinishCaves_1_0:: - .incbin "assets/gAreaRoomMap_MinishCaves_1_0.bin" - .align 2 -gAreaRoomMap_MinishCaves_1_1:: - .incbin "assets/gAreaRoomMap_MinishCaves_1_1.bin" -gAreaRoomMap_MinishCaves_2_0:: - .incbin "assets/gAreaRoomMap_MinishCaves_2_0.bin" -gAreaRoomMap_MinishCaves_2_1:: - .incbin "assets/gAreaRoomMap_MinishCaves_2_1.bin" - .align 2 -gAreaRoomMap_MinishCaves_3_0:: - .incbin "assets/gAreaRoomMap_MinishCaves_3_0.bin" - .align 2 -gAreaRoomMap_MinishCaves_3_1:: - .incbin "assets/gAreaRoomMap_MinishCaves_3_1.bin" -gAreaRoomMap_MinishCaves_4_0:: - .incbin "assets/gAreaRoomMap_MinishCaves_4_0.bin" - .align 2 -gAreaRoomMap_MinishCaves_4_1:: - .incbin "assets/gAreaRoomMap_MinishCaves_4_1.bin" - .align 2 -gAreaRoomMap_MinishCaves_5_0:: - .incbin "assets/gAreaRoomMap_MinishCaves_5_0.bin" - .align 2 -gAreaRoomMap_MinishCaves_5_1:: - .incbin "assets/gAreaRoomMap_MinishCaves_5_1.bin" -gAreaRoomMap_MinishCaves_6_0:: - .incbin "assets/gAreaRoomMap_MinishCaves_6_0.bin" - .align 2 -gAreaRoomMap_MinishCaves_6_1:: - .incbin "assets/gAreaRoomMap_MinishCaves_6_1.bin" -gAreaRoomMap_MinishCaves_7_0:: - .incbin "assets/gAreaRoomMap_MinishCaves_7_0.bin" - .align 2 -gAreaRoomMap_MinishCaves_7_1:: - .incbin "assets/gAreaRoomMap_MinishCaves_7_1.bin" - .align 2 -gAreaRoomMap_MinishCaves_8_0:: - .incbin "assets/gAreaRoomMap_MinishCaves_8_0.bin" - .align 2 -gAreaRoomMap_MinishCaves_8_1:: - .incbin "assets/gAreaRoomMap_MinishCaves_8_1.bin" - .align 2 -gAreaRoomMap_MinishCaves_9_0:: - .incbin "assets/gAreaRoomMap_MinishCaves_9_0.bin" - .align 2 -gAreaRoomMap_MinishCaves_9_1:: - .incbin "assets/gAreaRoomMap_MinishCaves_9_1.bin" - .align 2 -gAreaRoomMap_CastleGardenMinishHoles_0_0:: - .incbin "assets/gAreaRoomMap_CastleGardenMinishHoles_0_0.bin" - .align 2 -gAreaRoomMap_CastleGardenMinishHoles_0_1:: - .incbin "assets/gAreaRoomMap_CastleGardenMinishHoles_0_1.bin" - .align 2 -gAreaRoomMap_CastleGardenMinishHoles_1_0:: - .incbin "assets/gAreaRoomMap_CastleGardenMinishHoles_1_0.bin" - .align 2 -gAreaRoomMap_CastleGardenMinishHoles_1_1:: - .incbin "assets/gAreaRoomMap_CastleGardenMinishHoles_1_1.bin" - .align 2 -gAreaRoomMap_37_0_0:: - .incbin "assets/gAreaRoomMap_37_0_0.bin" -gAreaRoomMap_37_0_1:: - .incbin "assets/gAreaRoomMap_37_0_1.bin" - .align 2 -gAreaRoomMap_37_1_0:: - .incbin "assets/gAreaRoomMap_37_1_0.bin" - .align 2 -gAreaRoomMap_37_1_1:: - .incbin "assets/gAreaRoomMap_37_1_1.bin" - .align 2 -gAreaTileset_LakeWoodsCave_0_3:: - .incbin "tilesets/gAreaTileset_LakeWoodsCave_0_3.4bpp.lz" - .align 2 -gAreaTileset_LakeWoodsCave_0_4:: - .incbin "tilesets/gAreaTileset_LakeWoodsCave_0_4.4bpp.lz" -gAreaTileset_HyruleDigCaves_0_3:: - .incbin "tilesets/gAreaTileset_HyruleDigCaves_0_3.4bpp.lz" -gAreaTileset_HyruleDigCaves_0_4:: - .incbin "tilesets/gAreaTileset_HyruleDigCaves_0_4.4bpp.lz" - .align 2 -gAreaTileset_VeilFallsDigCave_0_3:: - .incbin "tilesets/gAreaTileset_VeilFallsDigCave_0_3.4bpp.lz" -gAreaTileset_VeilFallsDigCave_0_4:: - .incbin "tilesets/gAreaTileset_VeilFallsDigCave_0_4.4bpp.lz" - .align 2 -gAreaTileset_DigCaves1_0_3:: - .incbin "tilesets/gAreaTileset_DigCaves1_0_3.4bpp.lz" -gAreaTileset_DigCaves1_0_4:: - .incbin "tilesets/gAreaTileset_DigCaves1_0_4.4bpp.lz" - .align 2 -gAreaTileset_OuterFortressOfWinds_0_3:: - .incbin "tilesets/gAreaTileset_OuterFortressOfWinds_0_3.4bpp.lz" - .align 2 -gAreaTileset_OuterFortressOfWinds_0_4:: - .incbin "tilesets/gAreaTileset_OuterFortressOfWinds_0_4.4bpp.lz" -gAreaTileset_HyliaDigCaves_0_3:: - .incbin "tilesets/gAreaTileset_HyliaDigCaves_0_3.4bpp.lz" - .align 2 -gAreaTileset_HyliaDigCaves_0_4:: - .incbin "tilesets/gAreaTileset_HyliaDigCaves_0_4.4bpp.lz" -gAreaRoomMap_LakeWoodsCave_0_0:: - .incbin "assets/gAreaRoomMap_LakeWoodsCave_0_0.bin" - .align 2 -unknown_12:: - .incbin "assets/unknown_12.bin" -gAreaRoomMap_LakeWoodsCave_0_1:: - .incbin "assets/gAreaRoomMap_LakeWoodsCave_0_1.bin" - .align 2 -gAreaRoomMap_HyliaDigCaves_0_0:: - .incbin "assets/gAreaRoomMap_HyliaDigCaves_0_0.bin" - .align 2 -unknown_13:: - .incbin "assets/unknown_13.bin" -gAreaRoomMap_HyliaDigCaves_0_1:: - .incbin "assets/gAreaRoomMap_HyliaDigCaves_0_1.bin" - .align 2 -gAreaRoomMap_HyliaDigCaves_1_0:: - .incbin "assets/gAreaRoomMap_HyliaDigCaves_1_0.bin" - .align 2 -unknown_14:: - .incbin "assets/unknown_14.bin" -gAreaRoomMap_HyliaDigCaves_1_1:: - .incbin "assets/gAreaRoomMap_HyliaDigCaves_1_1.bin" - .align 2 -gAreaRoomMap_CastorWildsDigCave_0_0:: - .incbin "assets/gAreaRoomMap_CastorWildsDigCave_0_0.bin" - .align 2 -unknown_15:: - .incbin "assets/unknown_15.bin" -gAreaRoomMap_CastorWildsDigCave_0_1:: - .incbin "assets/gAreaRoomMap_CastorWildsDigCave_0_1.bin" - .align 2 -gAreaRoomMap_HyruleDigCaves_0_0:: - .incbin "assets/gAreaRoomMap_HyruleDigCaves_0_0.bin" - .align 2 -unknown_16:: - .incbin "assets/unknown_16.bin" -gAreaRoomMap_HyruleDigCaves_0_1:: - .incbin "assets/gAreaRoomMap_HyruleDigCaves_0_1.bin" - .align 2 -gAreaRoomMap_CrenelDigCave_0_0:: - .incbin "assets/gAreaRoomMap_CrenelDigCave_0_0.bin" - .align 2 -unknown_17:: - .incbin "assets/unknown_17.bin" -gAreaRoomMap_CrenelDigCave_0_1:: - .incbin "assets/gAreaRoomMap_CrenelDigCave_0_1.bin" - .align 2 -gAreaRoomMap_DigCaves_0_0:: - .incbin "assets/gAreaRoomMap_DigCaves_0_0.bin" - .align 2 -unknown_18:: - .incbin "assets/unknown_18.bin" -gAreaRoomMap_DigCaves_0_1:: - .incbin "assets/gAreaRoomMap_DigCaves_0_1.bin" - .align 2 -gAreaRoomMap_DigCaves_1_0:: - .incbin "assets/gAreaRoomMap_DigCaves_1_0.bin" - .align 2 -unknown_19:: - .incbin "assets/unknown_19.bin" -gAreaRoomMap_DigCaves_1_1:: - .incbin "assets/gAreaRoomMap_DigCaves_1_1.bin" - .align 2 -gAreaRoomMap_VeilFallsDigCave_0_0:: - .incbin "assets/gAreaRoomMap_VeilFallsDigCave_0_0.bin" - .align 2 -unknown_20:: - .incbin "assets/unknown_20.bin" -gAreaRoomMap_VeilFallsDigCave_0_1:: - .incbin "assets/gAreaRoomMap_VeilFallsDigCave_0_1.bin" - .align 2 -gAreaRoomMap_OuterFortressOfWinds_0_0:: - .incbin "assets/gAreaRoomMap_OuterFortressOfWinds_0_0.bin" - .align 2 +gAreaRoomMap_Empty_0_bottom:: + .incbin "maps/areas/014_Empty/rooms/00_0/gAreaRoomMap_Empty_0_bottom.bin.lz" +gAreaRoomMap_Empty_0_top:: + .incbin "maps/areas/014_Empty/rooms/00_0/gAreaRoomMap_Empty_0_top.bin.lz" +gAreaTileSet_CrenelCaves_0_0:: + .incbin "maps/areas/038_CrenelCaves/tileSets/0/gAreaTileSet_CrenelCaves_0_0.4bpp.lz" +gAreaTileSet_CrenelCaves_0_1:: + .incbin "maps/areas/038_CrenelCaves/tileSets/0/gAreaTileSet_CrenelCaves_0_1.4bpp.lz" +gAreaTileSet_CrenelCaves_0_2:: + .incbin "maps/areas/038_CrenelCaves/tileSets/0/gAreaTileSet_CrenelCaves_0_2.4bpp.lz" +gAreaTileSet_MinishHouseInteriors_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSet/gAreaTileSet_MinishHouseInteriors_bottom.bin.lz" +gAreaTileSet_MinishHouseInteriors_top:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSet/gAreaTileSet_MinishHouseInteriors_top.bin.lz" +gAreaTileSetTypes_MinishHouseInteriors_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSet/gAreaTileSetTypes_MinishHouseInteriors_bottom.bin.lz" +gAreaTileSetTypes_MinishHouseInteriors_top:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSet/gAreaTileSetTypes_MinishHouseInteriors_top.bin.lz" +gAreaRoomMap_CrenelCaves_BlockPushing_bottom:: + .incbin "maps/areas/038_CrenelCaves/rooms/00_BlockPushing/gAreaRoomMap_CrenelCaves_BlockPushing_bottom.bin.lz" +gAreaRoomMap_CrenelCaves_BlockPushing_top:: + .incbin "maps/areas/038_CrenelCaves/rooms/00_BlockPushing/gAreaRoomMap_CrenelCaves_BlockPushing_top.bin.lz" +gAreaRoomMap_CrenelCaves_PillarCave_bottom:: + .incbin "maps/areas/038_CrenelCaves/rooms/01_PillarCave/gAreaRoomMap_CrenelCaves_PillarCave_bottom.bin.lz" +gAreaRoomMap_CrenelCaves_PillarCave_top:: + .incbin "maps/areas/038_CrenelCaves/rooms/01_PillarCave/gAreaRoomMap_CrenelCaves_PillarCave_top.bin.lz" +gAreaRoomMap_CrenelCaves_BridgeSwitch_bottom:: + .incbin "maps/areas/038_CrenelCaves/rooms/02_BridgeSwitch/gAreaRoomMap_CrenelCaves_BridgeSwitch_bottom.bin.lz" +gAreaRoomMap_CrenelCaves_BridgeSwitch_top:: + .incbin "maps/areas/038_CrenelCaves/rooms/02_BridgeSwitch/gAreaRoomMap_CrenelCaves_BridgeSwitch_top.bin.lz" +gAreaRoomMap_CrenelCaves_ExitToMines_bottom:: + .incbin "maps/areas/038_CrenelCaves/rooms/03_ExitToMines/gAreaRoomMap_CrenelCaves_ExitToMines_bottom.bin.lz" +gAreaRoomMap_CrenelCaves_ExitToMines_top:: + .incbin "maps/areas/038_CrenelCaves/rooms/03_ExitToMines/gAreaRoomMap_CrenelCaves_ExitToMines_top.bin.lz" +gAreaRoomMap_CrenelCaves_GripRing_bottom:: + .incbin "maps/areas/038_CrenelCaves/rooms/04_GripRing/gAreaRoomMap_CrenelCaves_GripRing_bottom.bin.lz" +gAreaRoomMap_CrenelCaves_GripRing_top:: + .incbin "maps/areas/038_CrenelCaves/rooms/04_GripRing/gAreaRoomMap_CrenelCaves_GripRing_top.bin.lz" +gAreaRoomMap_CrenelCaves_FairyFountain_bottom:: + .incbin "maps/areas/038_CrenelCaves/rooms/05_FairyFountain/gAreaRoomMap_CrenelCaves_FairyFountain_bottom.bin.lz" +gAreaRoomMap_CrenelCaves_FairyFountain_top:: + .incbin "maps/areas/038_CrenelCaves/rooms/05_FairyFountain/gAreaRoomMap_CrenelCaves_FairyFountain_top.bin.lz" +gAreaRoomMap_CrenelCaves_SpinyChuPuzzle_bottom:: + .incbin "maps/areas/038_CrenelCaves/rooms/06_SpinyChuPuzzle/gAreaRoomMap_CrenelCaves_SpinyChuPuzzle_bottom.bin.lz" +gAreaRoomMap_CrenelCaves_SpinyChuPuzzle_top:: + .incbin "maps/areas/038_CrenelCaves/rooms/06_SpinyChuPuzzle/gAreaRoomMap_CrenelCaves_SpinyChuPuzzle_top.bin.lz" +gAreaRoomMap_CrenelCaves_ChuchuPotChest_bottom:: + .incbin "maps/areas/038_CrenelCaves/rooms/07_ChuchuPotChest/gAreaRoomMap_CrenelCaves_ChuchuPotChest_bottom.bin.lz" +gAreaRoomMap_CrenelCaves_ChuchuPotChest_top:: + .incbin "maps/areas/038_CrenelCaves/rooms/07_ChuchuPotChest/gAreaRoomMap_CrenelCaves_ChuchuPotChest_top.bin.lz" +gAreaRoomMap_CrenelCaves_WaterHeartPiece_bottom:: + .incbin "maps/areas/038_CrenelCaves/rooms/08_WaterHeartPiece/gAreaRoomMap_CrenelCaves_WaterHeartPiece_bottom.bin.lz" +gAreaRoomMap_CrenelCaves_WaterHeartPiece_top:: + .incbin "maps/areas/038_CrenelCaves/rooms/08_WaterHeartPiece/gAreaRoomMap_CrenelCaves_WaterHeartPiece_top.bin.lz" +gAreaRoomMap_CrenelCaves_RupeeFairyFouintain_bottom:: + .incbin "maps/areas/038_CrenelCaves/rooms/09_RupeeFairyFouintain/gAreaRoomMap_CrenelCaves_RupeeFairyFouintain_bottom.bin" +gAreaRoomMap_CrenelCaves_RupeeFairyFouintain_top:: + .incbin "maps/areas/038_CrenelCaves/rooms/09_RupeeFairyFouintain/gAreaRoomMap_CrenelCaves_RupeeFairyFouintain_top.bin.lz" +gAreaRoomMap_CrenelCaves_HelmasaurHallway_bottom:: + .incbin "maps/areas/038_CrenelCaves/rooms/10_HelmasaurHallway/gAreaRoomMap_CrenelCaves_HelmasaurHallway_bottom.bin.lz" +gAreaRoomMap_CrenelCaves_HelmasaurHallway_top:: + .incbin "maps/areas/038_CrenelCaves/rooms/10_HelmasaurHallway/gAreaRoomMap_CrenelCaves_HelmasaurHallway_top.bin.lz" +gAreaRoomMap_CrenelCaves_MushroomKeese_bottom:: + .incbin "maps/areas/038_CrenelCaves/rooms/11_MushroomKeese/gAreaRoomMap_CrenelCaves_MushroomKeese_bottom.bin.lz" +gAreaRoomMap_CrenelCaves_MushroomKeese_top:: + .incbin "maps/areas/038_CrenelCaves/rooms/11_MushroomKeese/gAreaRoomMap_CrenelCaves_MushroomKeese_top.bin.lz" +gAreaRoomMap_CrenelCaves_LadderToSpringWater_bottom:: + .incbin "maps/areas/038_CrenelCaves/rooms/12_LadderToSpringWater/gAreaRoomMap_CrenelCaves_LadderToSpringWater_bottom.bin.lz" +gAreaRoomMap_CrenelCaves_LadderToSpringWater_top:: + .incbin "maps/areas/038_CrenelCaves/rooms/12_LadderToSpringWater/gAreaRoomMap_CrenelCaves_LadderToSpringWater_top.bin.lz" +gAreaRoomMap_CrenelCaves_BombBusinessScrub_bottom:: + .incbin "maps/areas/038_CrenelCaves/rooms/13_BombBusinessScrub/gAreaRoomMap_CrenelCaves_BombBusinessScrub_bottom.bin.lz" +gAreaRoomMap_CrenelCaves_BombBusinessScrub_top:: + .incbin "maps/areas/038_CrenelCaves/rooms/13_BombBusinessScrub/gAreaRoomMap_CrenelCaves_BombBusinessScrub_top.bin.lz" +gAreaRoomMap_CrenelCaves_Hermit_bottom:: + .incbin "maps/areas/038_CrenelCaves/rooms/14_Hermit/gAreaRoomMap_CrenelCaves_Hermit_bottom.bin.lz" +gAreaRoomMap_CrenelCaves_Hermit_top:: + .incbin "maps/areas/038_CrenelCaves/rooms/14_Hermit/gAreaRoomMap_CrenelCaves_Hermit_top.bin.lz" +gAreaRoomMap_CrenelCaves_HintScrub_bottom:: + .incbin "maps/areas/038_CrenelCaves/rooms/15_HintScrub/gAreaRoomMap_CrenelCaves_HintScrub_bottom.bin.lz" +gAreaRoomMap_CrenelCaves_HintScrub_top:: + .incbin "maps/areas/038_CrenelCaves/rooms/15_HintScrub/gAreaRoomMap_CrenelCaves_HintScrub_top.bin.lz" +gAreaRoomMap_CrenelCaves_ToGrayblade_bottom:: + .incbin "maps/areas/038_CrenelCaves/rooms/16_ToGrayblade/gAreaRoomMap_CrenelCaves_ToGrayblade_bottom.bin.lz" +gAreaRoomMap_CrenelCaves_ToGrayblade_top:: + .incbin "maps/areas/038_CrenelCaves/rooms/16_ToGrayblade/gAreaRoomMap_CrenelCaves_ToGrayblade_top.bin.lz" +gAreaTileSet_GreatFairies_0_0:: + .incbin "maps/areas/041_GreatFairies/tileSets/0/gAreaTileSet_GreatFairies_0_0.4bpp.lz" +gAreaTileSet_GreatFairies_0_1:: + .incbin "maps/areas/041_GreatFairies/tileSets/0/gAreaTileSet_GreatFairies_0_1.4bpp.lz" +gAreaTileSet_GreatFairies_0_2:: + .incbin "maps/areas/041_GreatFairies/tileSets/0/gAreaTileSet_GreatFairies_0_2.4bpp.lz" +gAreaTileSet_GreatFairies_bottom:: + .incbin "maps/areas/041_GreatFairies/tileSet/gAreaTileSet_GreatFairies_bottom.bin.lz" +gAreaTileSet_GreatFairies_top:: + .incbin "maps/areas/041_GreatFairies/tileSet/gAreaTileSet_GreatFairies_top.bin.lz" +gAreaTileSetTypes_GreatFairies_bottom:: + .incbin "maps/areas/041_GreatFairies/tileSet/gAreaTileSetTypes_GreatFairies_bottom.bin.lz" +gAreaTileSetTypes_GreatFairies_top:: + .incbin "maps/areas/041_GreatFairies/tileSet/gAreaTileSetTypes_GreatFairies_top.bin.lz" +gAreaRoomMap_GreatFairies_Graveyard_bottom:: + .incbin "maps/areas/041_GreatFairies/rooms/00_Graveyard/gAreaRoomMap_GreatFairies_Graveyard_bottom.bin.lz" +gAreaRoomMap_GreatFairies_Graveyard_top:: + .incbin "maps/areas/041_GreatFairies/rooms/00_Graveyard/gAreaRoomMap_GreatFairies_Graveyard_top.bin.lz" +gAreaRoomMap_GreatFairies_MinishWoods_bottom:: + .incbin "maps/areas/041_GreatFairies/rooms/01_MinishWoods/gAreaRoomMap_GreatFairies_MinishWoods_bottom.bin.lz" +gAreaRoomMap_GreatFairies_MinishWoods_top:: + .incbin "maps/areas/041_GreatFairies/rooms/01_MinishWoods/gAreaRoomMap_GreatFairies_MinishWoods_top.bin.lz" +gAreaRoomMap_GreatFairies_Crenel_bottom:: + .incbin "maps/areas/041_GreatFairies/rooms/02_Crenel/gAreaRoomMap_GreatFairies_Crenel_bottom.bin.lz" +gAreaRoomMap_GreatFairies_Crenel_top:: + .incbin "maps/areas/041_GreatFairies/rooms/02_Crenel/gAreaRoomMap_GreatFairies_Crenel_top.bin.lz" +gAreaRoomMap_CastorCaves_South_bottom:: + .incbin "maps/areas/042_CastorCaves/rooms/00_South/gAreaRoomMap_CastorCaves_South_bottom.bin.lz" +gAreaRoomMap_CastorCaves_South_top:: + .incbin "maps/areas/042_CastorCaves/rooms/00_South/gAreaRoomMap_CastorCaves_South_top.bin.lz" +gAreaRoomMap_CastorCaves_North_bottom:: + .incbin "maps/areas/042_CastorCaves/rooms/01_North/gAreaRoomMap_CastorCaves_North_bottom.bin.lz" +gAreaRoomMap_CastorCaves_North_top:: + .incbin "maps/areas/042_CastorCaves/rooms/01_North/gAreaRoomMap_CastorCaves_North_top.bin.lz" +gAreaRoomMap_CastorCaves_WindRuins_bottom:: + .incbin "maps/areas/042_CastorCaves/rooms/02_WindRuins/gAreaRoomMap_CastorCaves_WindRuins_bottom.bin.lz" +gAreaRoomMap_CastorCaves_WindRuins_top:: + .incbin "maps/areas/042_CastorCaves/rooms/02_WindRuins/gAreaRoomMap_CastorCaves_WindRuins_top.bin.lz" +gAreaRoomMap_CastorCaves_Darknut_bottom:: + .incbin "maps/areas/042_CastorCaves/rooms/03_Darknut/gAreaRoomMap_CastorCaves_Darknut_bottom.bin.lz" +gAreaRoomMap_CastorCaves_Darknut_top:: + .incbin "maps/areas/042_CastorCaves/rooms/03_Darknut/gAreaRoomMap_CastorCaves_Darknut_top.bin.lz" +gAreaRoomMap_CastorCaves_HeartPiece_bottom:: + .incbin "maps/areas/042_CastorCaves/rooms/04_HeartPiece/gAreaRoomMap_CastorCaves_HeartPiece_bottom.bin.lz" +gAreaRoomMap_CastorCaves_HeartPiece_top:: + .incbin "maps/areas/042_CastorCaves/rooms/04_HeartPiece/gAreaRoomMap_CastorCaves_HeartPiece_top.bin.lz" +gAreaRoomMap_CastorDarknut_Main_bottom:: + .incbin "maps/areas/043_CastorDarknut/rooms/00_Main/gAreaRoomMap_CastorDarknut_Main_bottom.bin.lz" +gAreaRoomMap_CastorDarknut_Main_top:: + .incbin "maps/areas/043_CastorDarknut/rooms/00_Main/gAreaRoomMap_CastorDarknut_Main_top.bin.lz" +gAreaRoomMap_CastorDarknut_Hall_bottom:: + .incbin "maps/areas/043_CastorDarknut/rooms/01_Hall/gAreaRoomMap_CastorDarknut_Hall_bottom.bin.lz" +gAreaRoomMap_CastorDarknut_Hall_top:: + .incbin "maps/areas/043_CastorDarknut/rooms/01_Hall/gAreaRoomMap_CastorDarknut_Hall_top.bin.lz" +gAreaTileSet_ArmosInteriors_0_0:: + .incbin "maps/areas/044_ArmosInteriors/tileSets/0/gAreaTileSet_ArmosInteriors_0_0.4bpp.lz" +gAreaTileSet_ArmosInteriors_0_1:: + .incbin "maps/areas/044_ArmosInteriors/tileSets/0/gAreaTileSet_ArmosInteriors_0_1.4bpp.lz" +gAreaTileSet_ArmosInteriors_0_2:: + .incbin "maps/areas/044_ArmosInteriors/tileSets/0/gAreaTileSet_ArmosInteriors_0_2.4bpp.lz" +gAreaTileSet_ArmosInteriors_bottom:: + .incbin "maps/areas/044_ArmosInteriors/tileSet/gAreaTileSet_ArmosInteriors_bottom.bin.lz" +gAreaTileSet_ArmosInteriors_top:: + .incbin "maps/areas/044_ArmosInteriors/tileSet/gAreaTileSet_ArmosInteriors_top.bin.lz" +gAreaTileSetTypes_ArmosInteriors_bottom:: + .incbin "maps/areas/044_ArmosInteriors/tileSet/gAreaTileSetTypes_ArmosInteriors_bottom.bin.lz" +gAreaTileSetTypes_ArmosInteriors_top:: + .incbin "maps/areas/044_ArmosInteriors/tileSet/gAreaTileSetTypes_ArmosInteriors_top.bin.lz" +gAreaRoomMap_ArmosInteriors_RuinsEntranceNorth_bottom:: + .incbin "maps/areas/044_ArmosInteriors/rooms/00_RuinsEntranceNorth/gAreaRoomMap_ArmosInteriors_RuinsEntranceNorth_bottom.bin" +gAreaRoomMap_ArmosInteriors_RuinsEntranceNorth_top:: + .incbin "maps/areas/044_ArmosInteriors/rooms/00_RuinsEntranceNorth/gAreaRoomMap_ArmosInteriors_RuinsEntranceNorth_top.bin.lz" +gAreaRoomMap_ArmosInteriors_RuinsEntranceSouth_bottom:: + .incbin "maps/areas/044_ArmosInteriors/rooms/01_RuinsEntranceSouth/gAreaRoomMap_ArmosInteriors_RuinsEntranceSouth_bottom.bin" +gAreaRoomMap_ArmosInteriors_RuinsEntranceSouth_top:: + .incbin "maps/areas/044_ArmosInteriors/rooms/01_RuinsEntranceSouth/gAreaRoomMap_ArmosInteriors_RuinsEntranceSouth_top.bin.lz" +gAreaRoomMap_ArmosInteriors_RuinsLeft_bottom:: + .incbin "maps/areas/044_ArmosInteriors/rooms/02_RuinsLeft/gAreaRoomMap_ArmosInteriors_RuinsLeft_bottom.bin" +gAreaRoomMap_ArmosInteriors_RuinsLeft_top:: + .incbin "maps/areas/044_ArmosInteriors/rooms/02_RuinsLeft/gAreaRoomMap_ArmosInteriors_RuinsLeft_top.bin.lz" +gAreaRoomMap_ArmosInteriors_RuinsMiddleLeft_bottom:: + .incbin "maps/areas/044_ArmosInteriors/rooms/03_RuinsMiddleLeft/gAreaRoomMap_ArmosInteriors_RuinsMiddleLeft_bottom.bin" +gAreaRoomMap_ArmosInteriors_RuinsMiddleLeft_top:: + .incbin "maps/areas/044_ArmosInteriors/rooms/03_RuinsMiddleLeft/gAreaRoomMap_ArmosInteriors_RuinsMiddleLeft_top.bin.lz" +gAreaRoomMap_ArmosInteriors_RuinsMiddleRight_bottom:: + .incbin "maps/areas/044_ArmosInteriors/rooms/04_RuinsMiddleRight/gAreaRoomMap_ArmosInteriors_RuinsMiddleRight_bottom.bin" +gAreaRoomMap_ArmosInteriors_RuinsMiddleRight_top:: + .incbin "maps/areas/044_ArmosInteriors/rooms/04_RuinsMiddleRight/gAreaRoomMap_ArmosInteriors_RuinsMiddleRight_top.bin.lz" +gAreaRoomMap_ArmosInteriors_RuinsRight_bottom:: + .incbin "maps/areas/044_ArmosInteriors/rooms/05_RuinsRight/gAreaRoomMap_ArmosInteriors_RuinsRight_bottom.bin" +gAreaRoomMap_ArmosInteriors_RuinsRight_top:: + .incbin "maps/areas/044_ArmosInteriors/rooms/05_RuinsRight/gAreaRoomMap_ArmosInteriors_RuinsRight_top.bin.lz" +gAreaRoomMap_ArmosInteriors_6_bottom:: + .incbin "maps/areas/044_ArmosInteriors/rooms/06_6/gAreaRoomMap_ArmosInteriors_6_bottom.bin" +gAreaRoomMap_ArmosInteriors_6_top:: + .incbin "maps/areas/044_ArmosInteriors/rooms/06_6/gAreaRoomMap_ArmosInteriors_6_top.bin.lz" +gAreaRoomMap_ArmosInteriors_RuinsGrassPath_bottom:: + .incbin "maps/areas/044_ArmosInteriors/rooms/07_RuinsGrassPath/gAreaRoomMap_ArmosInteriors_RuinsGrassPath_bottom.bin" +gAreaRoomMap_ArmosInteriors_RuinsGrassPath_top:: + .incbin "maps/areas/044_ArmosInteriors/rooms/07_RuinsGrassPath/gAreaRoomMap_ArmosInteriors_RuinsGrassPath_top.bin.lz" +gAreaRoomMap_ArmosInteriors_8_bottom:: + .incbin "maps/areas/044_ArmosInteriors/rooms/08_8/gAreaRoomMap_ArmosInteriors_8_bottom.bin" +gAreaRoomMap_ArmosInteriors_8_top:: + .incbin "maps/areas/044_ArmosInteriors/rooms/08_8/gAreaRoomMap_ArmosInteriors_8_top.bin.lz" +gAreaRoomMap_ArmosInteriors_FortressLeft_bottom:: + .incbin "maps/areas/044_ArmosInteriors/rooms/09_FortressLeft/gAreaRoomMap_ArmosInteriors_FortressLeft_bottom.bin" +gAreaRoomMap_ArmosInteriors_FortressLeft_top:: + .incbin "maps/areas/044_ArmosInteriors/rooms/09_FortressLeft/gAreaRoomMap_ArmosInteriors_FortressLeft_top.bin.lz" +gAreaRoomMap_ArmosInteriors_FortressRight_bottom:: + .incbin "maps/areas/044_ArmosInteriors/rooms/10_FortressRight/gAreaRoomMap_ArmosInteriors_FortressRight_bottom.bin" +gAreaRoomMap_ArmosInteriors_FortressRight_top:: + .incbin "maps/areas/044_ArmosInteriors/rooms/10_FortressRight/gAreaRoomMap_ArmosInteriors_FortressRight_top.bin.lz" +gAreaTileSet_GoronCave_0_0:: + .incbin "maps/areas/047_GoronCave/tileSets/0/gAreaTileSet_GoronCave_0_0.4bpp.lz" +gAreaTileSet_GoronCave_0_1:: + .incbin "maps/areas/047_GoronCave/tileSets/0/gAreaTileSet_GoronCave_0_1.4bpp.lz" +gAreaTileSet_GoronCave_0_2:: + .incbin "maps/areas/047_GoronCave/tileSets/0/gAreaTileSet_GoronCave_0_2.4bpp.lz" +gAreaTileSet_GoronCave_bottom:: + .incbin "maps/areas/047_GoronCave/tileSet/gAreaTileSet_GoronCave_bottom.bin.lz" +gAreaTileSet_GoronCave_top:: + .incbin "maps/areas/047_GoronCave/tileSet/gAreaTileSet_GoronCave_top.bin.lz" +gAreaTileSetTypes_GoronCave_bottom:: + .incbin "maps/areas/047_GoronCave/tileSet/gAreaTileSetTypes_GoronCave_bottom.bin.lz" +gAreaTileSetTypes_GoronCave_top:: + .incbin "maps/areas/047_GoronCave/tileSet/gAreaTileSetTypes_GoronCave_top.bin.lz" +gAreaRoomMap_GoronCave_Stairs_bottom:: + .incbin "maps/areas/047_GoronCave/rooms/00_Stairs/gAreaRoomMap_GoronCave_Stairs_bottom.bin.lz" +gAreaRoomMap_GoronCave_Stairs_top:: + .incbin "maps/areas/047_GoronCave/rooms/00_Stairs/gAreaRoomMap_GoronCave_Stairs_top.bin.lz" +gAreaRoomMap_GoronCave_Main_bottom:: + .incbin "maps/areas/047_GoronCave/rooms/01_Main/gAreaRoomMap_GoronCave_Main_bottom.bin.lz" +gAreaRoomMap_GoronCave_Main_top:: + .incbin "maps/areas/047_GoronCave/rooms/01_Main/gAreaRoomMap_GoronCave_Main_top.bin.lz" +gAreaRoomMap_Caves_Boomerang_bottom:: + .incbin "maps/areas/050_Caves/rooms/00_Boomerang/gAreaRoomMap_Caves_Boomerang_bottom.bin.lz" +gAreaRoomMap_Caves_Boomerang_top:: + .incbin "maps/areas/050_Caves/rooms/00_Boomerang/gAreaRoomMap_Caves_Boomerang_top.bin.lz" +gAreaRoomMap_Caves_ToGraveyard_bottom:: + .incbin "maps/areas/050_Caves/rooms/01_ToGraveyard/gAreaRoomMap_Caves_ToGraveyard_bottom.bin.lz" +gAreaRoomMap_Caves_ToGraveyard_top:: + .incbin "maps/areas/050_Caves/rooms/01_ToGraveyard/gAreaRoomMap_Caves_ToGraveyard_top.bin.lz" +gAreaRoomMap_Caves_2_bottom:: + .incbin "maps/areas/050_Caves/rooms/02_2/gAreaRoomMap_Caves_2_bottom.bin.lz" +gAreaRoomMap_Caves_2_top:: + .incbin "maps/areas/050_Caves/rooms/02_2/gAreaRoomMap_Caves_2_top.bin.lz" +gAreaRoomMap_Caves_3_bottom:: + .incbin "maps/areas/050_Caves/rooms/03_3/gAreaRoomMap_Caves_3_bottom.bin.lz" +gAreaRoomMap_Caves_3_top:: + .incbin "maps/areas/050_Caves/rooms/03_3/gAreaRoomMap_Caves_3_top.bin.lz" +gAreaRoomMap_Caves_4_bottom:: + .incbin "maps/areas/050_Caves/rooms/04_4/gAreaRoomMap_Caves_4_bottom.bin.lz" +gAreaRoomMap_Caves_4_top:: + .incbin "maps/areas/050_Caves/rooms/04_4/gAreaRoomMap_Caves_4_top.bin.lz" +gAreaRoomMap_Caves_5_bottom:: + .incbin "maps/areas/050_Caves/rooms/05_5/gAreaRoomMap_Caves_5_bottom.bin.lz" +gAreaRoomMap_Caves_5_top:: + .incbin "maps/areas/050_Caves/rooms/05_5/gAreaRoomMap_Caves_5_top.bin.lz" +gAreaRoomMap_Caves_6_bottom:: + .incbin "maps/areas/050_Caves/rooms/06_6/gAreaRoomMap_Caves_6_bottom.bin.lz" +gAreaRoomMap_Caves_6_top:: + .incbin "maps/areas/050_Caves/rooms/06_6/gAreaRoomMap_Caves_6_top.bin.lz" +gAreaRoomMap_Caves_TrilbyKeeseChest_bottom:: + .incbin "maps/areas/050_Caves/rooms/07_TrilbyKeeseChest/gAreaRoomMap_Caves_TrilbyKeeseChest_bottom.bin.lz" +gAreaRoomMap_Caves_TrilbyKeeseChest_top:: + .incbin "maps/areas/050_Caves/rooms/07_TrilbyKeeseChest/gAreaRoomMap_Caves_TrilbyKeeseChest_top.bin.lz" +gAreaRoomMap_Caves_TrilbyFairyFountain_bottom:: + .incbin "maps/areas/050_Caves/rooms/08_TrilbyFairyFountain/gAreaRoomMap_Caves_TrilbyFairyFountain_bottom.bin.lz" +gAreaRoomMap_Caves_TrilbyFairyFountain_top:: + .incbin "maps/areas/050_Caves/rooms/08_TrilbyFairyFountain/gAreaRoomMap_Caves_TrilbyFairyFountain_top.bin.lz" +gAreaRoomMap_Caves_SouthHyruleFieldFairyFountain_bottom:: + .incbin "maps/areas/050_Caves/rooms/09_SouthHyruleFieldFairyFountain/gAreaRoomMap_Caves_SouthHyruleFieldFairyFountain_bottom.bin.lz" +gAreaRoomMap_Caves_SouthHyruleFieldFairyFountain_top:: + .incbin "maps/areas/050_Caves/rooms/09_SouthHyruleFieldFairyFountain/gAreaRoomMap_Caves_SouthHyruleFieldFairyFountain_top.bin.lz" +gAreaRoomMap_Caves_A_bottom:: + .incbin "maps/areas/050_Caves/rooms/10_A/gAreaRoomMap_Caves_A_bottom.bin.lz" +gAreaRoomMap_Caves_A_top:: + .incbin "maps/areas/050_Caves/rooms/10_A/gAreaRoomMap_Caves_A_top.bin.lz" +gAreaRoomMap_Caves_HyruleTownWaterfall_bottom:: + .incbin "maps/areas/050_Caves/rooms/11_HyruleTownWaterfall/gAreaRoomMap_Caves_HyruleTownWaterfall_bottom.bin.lz" +gAreaRoomMap_Caves_HyruleTownWaterfall_top:: + .incbin "maps/areas/050_Caves/rooms/11_HyruleTownWaterfall/gAreaRoomMap_Caves_HyruleTownWaterfall_top.bin.lz" +gAreaRoomMap_Caves_LonLonRanch_bottom:: + .incbin "maps/areas/050_Caves/rooms/12_LonLonRanch/gAreaRoomMap_Caves_LonLonRanch_bottom.bin.lz" +gAreaRoomMap_Caves_LonLonRanch_top:: + .incbin "maps/areas/050_Caves/rooms/12_LonLonRanch/gAreaRoomMap_Caves_LonLonRanch_top.bin.lz" +gAreaRoomMap_Caves_LonLonRanchSecret_bottom:: + .incbin "maps/areas/050_Caves/rooms/13_LonLonRanchSecret/gAreaRoomMap_Caves_LonLonRanchSecret_bottom.bin.lz" +gAreaRoomMap_Caves_LonLonRanchSecret_top:: + .incbin "maps/areas/050_Caves/rooms/13_LonLonRanchSecret/gAreaRoomMap_Caves_LonLonRanchSecret_top.bin.lz" +gAreaRoomMap_Caves_TrilbyHighlands_bottom:: + .incbin "maps/areas/050_Caves/rooms/14_TrilbyHighlands/gAreaRoomMap_Caves_TrilbyHighlands_bottom.bin.lz" +gAreaRoomMap_Caves_TrilbyHighlands_top:: + .incbin "maps/areas/050_Caves/rooms/14_TrilbyHighlands/gAreaRoomMap_Caves_TrilbyHighlands_top.bin.lz" +gAreaRoomMap_Caves_LonLonRanchWallet_bottom:: + .incbin "maps/areas/050_Caves/rooms/15_LonLonRanchWallet/gAreaRoomMap_Caves_LonLonRanchWallet_bottom.bin.lz" +gAreaRoomMap_Caves_LonLonRanchWallet_top:: + .incbin "maps/areas/050_Caves/rooms/15_LonLonRanchWallet/gAreaRoomMap_Caves_LonLonRanchWallet_top.bin.lz" +gAreaRoomMap_Caves_SouthHyruleFieldRupee_bottom:: + .incbin "maps/areas/050_Caves/rooms/16_SouthHyruleFieldRupee/gAreaRoomMap_Caves_SouthHyruleFieldRupee_bottom.bin.lz" +gAreaRoomMap_Caves_SouthHyruleFieldRupee_top:: + .incbin "maps/areas/050_Caves/rooms/16_SouthHyruleFieldRupee/gAreaRoomMap_Caves_SouthHyruleFieldRupee_top.bin.lz" +gAreaRoomMap_Caves_TrilbyRupee_bottom:: + .incbin "maps/areas/050_Caves/rooms/17_TrilbyRupee/gAreaRoomMap_Caves_TrilbyRupee_bottom.bin.lz" +gAreaRoomMap_Caves_TrilbyRupee_top:: + .incbin "maps/areas/050_Caves/rooms/17_TrilbyRupee/gAreaRoomMap_Caves_TrilbyRupee_top.bin.lz" +gAreaRoomMap_Caves_TrilbyMittsFairyFountain_bottom:: + .incbin "maps/areas/050_Caves/rooms/18_TrilbyMittsFairyFountain/gAreaRoomMap_Caves_TrilbyMittsFairyFountain_bottom.bin.lz" +gAreaRoomMap_Caves_TrilbyMittsFairyFountain_top:: + .incbin "maps/areas/050_Caves/rooms/18_TrilbyMittsFairyFountain/gAreaRoomMap_Caves_TrilbyMittsFairyFountain_top.bin.lz" +gAreaRoomMap_Caves_HillsKeeseChest_bottom:: + .incbin "maps/areas/050_Caves/rooms/19_HillsKeeseChest/gAreaRoomMap_Caves_HillsKeeseChest_bottom.bin.lz" +gAreaRoomMap_Caves_HillsKeeseChest_top:: + .incbin "maps/areas/050_Caves/rooms/19_HillsKeeseChest/gAreaRoomMap_Caves_HillsKeeseChest_top.bin.lz" +gAreaRoomMap_Caves_BottleBusinessScrub_bottom:: + .incbin "maps/areas/050_Caves/rooms/20_BottleBusinessScrub/gAreaRoomMap_Caves_BottleBusinessScrub_bottom.bin.lz" +gAreaRoomMap_Caves_BottleBusinessScrub_top:: + .incbin "maps/areas/050_Caves/rooms/20_BottleBusinessScrub/gAreaRoomMap_Caves_BottleBusinessScrub_top.bin.lz" +gAreaRoomMap_Caves_HeartPieceHallway_bottom:: + .incbin "maps/areas/050_Caves/rooms/21_HeartPieceHallway/gAreaRoomMap_Caves_HeartPieceHallway_bottom.bin.lz" +gAreaRoomMap_Caves_HeartPieceHallway_top:: + .incbin "maps/areas/050_Caves/rooms/21_HeartPieceHallway/gAreaRoomMap_Caves_HeartPieceHallway_top.bin.lz" +gAreaRoomMap_Caves_NorthHyruleFieldFairyFountain_bottom:: + .incbin "maps/areas/050_Caves/rooms/22_NorthHyruleFieldFairyFountain/gAreaRoomMap_Caves_NorthHyruleFieldFairyFountain_bottom.bin.lz" +gAreaRoomMap_Caves_NorthHyruleFieldFairyFountain_top:: + .incbin "maps/areas/050_Caves/rooms/22_NorthHyruleFieldFairyFountain/gAreaRoomMap_Caves_NorthHyruleFieldFairyFountain_top.bin.lz" +gAreaRoomMap_Caves_KinstoneBusinessScrub_bottom:: + .incbin "maps/areas/050_Caves/rooms/23_KinstoneBusinessScrub/gAreaRoomMap_Caves_KinstoneBusinessScrub_bottom.bin.lz" +gAreaRoomMap_Caves_KinstoneBusinessScrub_top:: + .incbin "maps/areas/050_Caves/rooms/23_KinstoneBusinessScrub/gAreaRoomMap_Caves_KinstoneBusinessScrub_top.bin.lz" +gAreaRoomMap_VeilFallsCaves_Hallway2f_bottom:: + .incbin "maps/areas/051_VeilFallsCaves/rooms/00_Hallway2f/gAreaRoomMap_VeilFallsCaves_Hallway2f_bottom.bin.lz" +gAreaRoomMap_VeilFallsCaves_Hallway2f_top:: + .incbin "maps/areas/051_VeilFallsCaves/rooms/00_Hallway2f/gAreaRoomMap_VeilFallsCaves_Hallway2f_top.bin.lz" +gAreaRoomMap_VeilFallsCaves_Hallway1f_bottom:: + .incbin "maps/areas/051_VeilFallsCaves/rooms/01_Hallway1f/gAreaRoomMap_VeilFallsCaves_Hallway1f_bottom.bin.lz" +gAreaRoomMap_VeilFallsCaves_Hallway1f_top:: + .incbin "maps/areas/051_VeilFallsCaves/rooms/01_Hallway1f/gAreaRoomMap_VeilFallsCaves_Hallway1f_top.bin.lz" +gAreaRoomMap_VeilFallsCaves_HallwaySecretRoom_bottom:: + .incbin "maps/areas/051_VeilFallsCaves/rooms/02_HallwaySecretRoom/gAreaRoomMap_VeilFallsCaves_HallwaySecretRoom_bottom.bin.lz" +gAreaRoomMap_VeilFallsCaves_HallwaySecretRoom_top:: + .incbin "maps/areas/051_VeilFallsCaves/rooms/02_HallwaySecretRoom/gAreaRoomMap_VeilFallsCaves_HallwaySecretRoom_top.bin.lz" +gAreaRoomMap_VeilFallsCaves_Entrance_bottom:: + .incbin "maps/areas/051_VeilFallsCaves/rooms/03_Entrance/gAreaRoomMap_VeilFallsCaves_Entrance_bottom.bin.lz" +gAreaRoomMap_VeilFallsCaves_Entrance_top:: + .incbin "maps/areas/051_VeilFallsCaves/rooms/03_Entrance/gAreaRoomMap_VeilFallsCaves_Entrance_top.bin.lz" +gAreaRoomMap_VeilFallsCaves_Exit_bottom:: + .incbin "maps/areas/051_VeilFallsCaves/rooms/04_Exit/gAreaRoomMap_VeilFallsCaves_Exit_bottom.bin.lz" +gAreaRoomMap_VeilFallsCaves_Exit_top:: + .incbin "maps/areas/051_VeilFallsCaves/rooms/04_Exit/gAreaRoomMap_VeilFallsCaves_Exit_top.bin.lz" +gAreaRoomMap_VeilFallsCaves_SecretChest_bottom:: + .incbin "maps/areas/051_VeilFallsCaves/rooms/05_SecretChest/gAreaRoomMap_VeilFallsCaves_SecretChest_bottom.bin.lz" +gAreaRoomMap_VeilFallsCaves_SecretChest_top:: + .incbin "maps/areas/051_VeilFallsCaves/rooms/05_SecretChest/gAreaRoomMap_VeilFallsCaves_SecretChest_top.bin.lz" +gAreaRoomMap_VeilFallsCaves_HallwaySecretStaircase_bottom:: + .incbin "maps/areas/051_VeilFallsCaves/rooms/06_HallwaySecretStaircase/gAreaRoomMap_VeilFallsCaves_HallwaySecretStaircase_bottom.bin.lz" +gAreaRoomMap_VeilFallsCaves_HallwaySecretStaircase_top:: + .incbin "maps/areas/051_VeilFallsCaves/rooms/06_HallwaySecretStaircase/gAreaRoomMap_VeilFallsCaves_HallwaySecretStaircase_top.bin.lz" +gAreaRoomMap_VeilFallsCaves_HallwayBlockPuzzle_bottom:: + .incbin "maps/areas/051_VeilFallsCaves/rooms/07_HallwayBlockPuzzle/gAreaRoomMap_VeilFallsCaves_HallwayBlockPuzzle_bottom.bin.lz" +gAreaRoomMap_VeilFallsCaves_HallwayBlockPuzzle_top:: + .incbin "maps/areas/051_VeilFallsCaves/rooms/07_HallwayBlockPuzzle/gAreaRoomMap_VeilFallsCaves_HallwayBlockPuzzle_top.bin.lz" +gAreaRoomMap_VeilFallsCaves_HallwayRupeePath_bottom:: + .incbin "maps/areas/051_VeilFallsCaves/rooms/08_HallwayRupeePath/gAreaRoomMap_VeilFallsCaves_HallwayRupeePath_bottom.bin.lz" +gAreaRoomMap_VeilFallsCaves_HallwayRupeePath_top:: + .incbin "maps/areas/051_VeilFallsCaves/rooms/08_HallwayRupeePath/gAreaRoomMap_VeilFallsCaves_HallwayRupeePath_top.bin.lz" +gAreaRoomMap_VeilFallsCaves_HallwayHeartPiece_bottom:: + .incbin "maps/areas/051_VeilFallsCaves/rooms/09_HallwayHeartPiece/gAreaRoomMap_VeilFallsCaves_HallwayHeartPiece_bottom.bin.lz" +gAreaRoomMap_VeilFallsCaves_HallwayHeartPiece_top:: + .incbin "maps/areas/051_VeilFallsCaves/rooms/09_HallwayHeartPiece/gAreaRoomMap_VeilFallsCaves_HallwayHeartPiece_top.bin.lz" +gAreaRoomMap_RoyalValleyGraves_HeartPiece_bottom:: + .incbin "maps/areas/052_RoyalValleyGraves/rooms/00_HeartPiece/gAreaRoomMap_RoyalValleyGraves_HeartPiece_bottom.bin.lz" +gAreaRoomMap_RoyalValleyGraves_HeartPiece_top:: + .incbin "maps/areas/052_RoyalValleyGraves/rooms/00_HeartPiece/gAreaRoomMap_RoyalValleyGraves_HeartPiece_top.bin.lz" +gAreaRoomMap_RoyalValleyGraves_Gina_bottom:: + .incbin "maps/areas/052_RoyalValleyGraves/rooms/01_Gina/gAreaRoomMap_RoyalValleyGraves_Gina_bottom.bin.lz" +gAreaRoomMap_RoyalValleyGraves_Gina_top:: + .incbin "maps/areas/052_RoyalValleyGraves/rooms/01_Gina/gAreaRoomMap_RoyalValleyGraves_Gina_top.bin.lz" +gAreaTileSet_MinishCaves_0_0:: + .incbin "maps/areas/053_MinishCaves/tileSets/0/gAreaTileSet_MinishCaves_0_0.4bpp.lz" +gAreaTileSet_MinishCaves_0_1:: + .incbin "maps/areas/053_MinishCaves/tileSets/0/gAreaTileSet_MinishCaves_0_1.4bpp.lz" +gAreaTileSet_MinishCaves_0_2:: + .incbin "maps/areas/053_MinishCaves/tileSets/0/gAreaTileSet_MinishCaves_0_2.4bpp.lz" +gAreaTileSet_MinishCaves_bottom:: + .incbin "maps/areas/053_MinishCaves/tileSet/gAreaTileSet_MinishCaves_bottom.bin.lz" +gAreaTileSet_MinishCaves_top:: + .incbin "maps/areas/053_MinishCaves/tileSet/gAreaTileSet_MinishCaves_top.bin.lz" +gAreaTileSetTypes_MinishCaves_bottom:: + .incbin "maps/areas/053_MinishCaves/tileSet/gAreaTileSetTypes_MinishCaves_bottom.bin.lz" +gAreaTileSetTypes_MinishCaves_top:: + .incbin "maps/areas/053_MinishCaves/tileSet/gAreaTileSetTypes_MinishCaves_top.bin.lz" +gAreaTileSet_CastleGardenMinishHoles_0_0:: + .incbin "maps/areas/054_CastleGardenMinishHoles/tileSets/0/gAreaTileSet_CastleGardenMinishHoles_0_0.4bpp.lz" +gAreaTileSet_CastleGardenMinishHoles_0_1:: + .incbin "maps/areas/054_CastleGardenMinishHoles/tileSets/0/gAreaTileSet_CastleGardenMinishHoles_0_1.4bpp.lz" +gAreaTileSet_CastleGardenMinishHoles_0_2:: + .incbin "maps/areas/054_CastleGardenMinishHoles/tileSets/0/gAreaTileSet_CastleGardenMinishHoles_0_2.4bpp.lz" +gAreaTileSet_CastleGardenMinishHoles_bottom:: + .incbin "maps/areas/054_CastleGardenMinishHoles/tileSet/gAreaTileSet_CastleGardenMinishHoles_bottom.bin.lz" +gAreaTileSet_CastleGardenMinishHoles_top:: + .incbin "maps/areas/054_CastleGardenMinishHoles/tileSet/gAreaTileSet_CastleGardenMinishHoles_top.bin.lz" +gAreaTileSetTypes_CastleGardenMinishHoles_bottom:: + .incbin "maps/areas/054_CastleGardenMinishHoles/tileSet/gAreaTileSetTypes_CastleGardenMinishHoles_bottom.bin.lz" +gAreaTileSetTypes_CastleGardenMinishHoles_top:: + .incbin "maps/areas/054_CastleGardenMinishHoles/tileSet/gAreaTileSetTypes_CastleGardenMinishHoles_top.bin.lz" +gAreaRoomMap_MinishCaves_BeanPesto_bottom:: + .incbin "maps/areas/053_MinishCaves/rooms/00_BeanPesto/gAreaRoomMap_MinishCaves_BeanPesto_bottom.bin.lz" +gAreaRoomMap_MinishCaves_BeanPesto_top:: + .incbin "maps/areas/053_MinishCaves/rooms/00_BeanPesto/gAreaRoomMap_MinishCaves_BeanPesto_top.bin.lz" +gAreaRoomMap_MinishCaves_SoutheastWater1_bottom:: + .incbin "maps/areas/053_MinishCaves/rooms/01_SoutheastWater1/gAreaRoomMap_MinishCaves_SoutheastWater1_bottom.bin.lz" +gAreaRoomMap_MinishCaves_SoutheastWater1_top:: + .incbin "maps/areas/053_MinishCaves/rooms/01_SoutheastWater1/gAreaRoomMap_MinishCaves_SoutheastWater1_top.bin.lz" +gAreaRoomMap_MinishCaves_2_bottom:: + .incbin "maps/areas/053_MinishCaves/rooms/02_2/gAreaRoomMap_MinishCaves_2_bottom.bin.lz" +gAreaRoomMap_MinishCaves_2_top:: + .incbin "maps/areas/053_MinishCaves/rooms/02_2/gAreaRoomMap_MinishCaves_2_top.bin.lz" +gAreaRoomMap_MinishCaves_Ruins_bottom:: + .incbin "maps/areas/053_MinishCaves/rooms/03_Ruins/gAreaRoomMap_MinishCaves_Ruins_bottom.bin.lz" +gAreaRoomMap_MinishCaves_Ruins_top:: + .incbin "maps/areas/053_MinishCaves/rooms/03_Ruins/gAreaRoomMap_MinishCaves_Ruins_top.bin.lz" +gAreaRoomMap_MinishCaves_OutsideLinksHouse_bottom:: + .incbin "maps/areas/053_MinishCaves/rooms/04_OutsideLinksHouse/gAreaRoomMap_MinishCaves_OutsideLinksHouse_bottom.bin.lz" +gAreaRoomMap_MinishCaves_OutsideLinksHouse_top:: + .incbin "maps/areas/053_MinishCaves/rooms/04_OutsideLinksHouse/gAreaRoomMap_MinishCaves_OutsideLinksHouse_top.bin.lz" +gAreaRoomMap_MinishCaves_MinishWoodsNorth1_bottom:: + .incbin "maps/areas/053_MinishCaves/rooms/05_MinishWoodsNorth1/gAreaRoomMap_MinishCaves_MinishWoodsNorth1_bottom.bin.lz" +gAreaRoomMap_MinishCaves_MinishWoodsNorth1_top:: + .incbin "maps/areas/053_MinishCaves/rooms/05_MinishWoodsNorth1/gAreaRoomMap_MinishCaves_MinishWoodsNorth1_top.bin.lz" +gAreaRoomMap_MinishCaves_6_bottom:: + .incbin "maps/areas/053_MinishCaves/rooms/06_6/gAreaRoomMap_MinishCaves_6_bottom.bin.lz" +gAreaRoomMap_MinishCaves_6_top:: + .incbin "maps/areas/053_MinishCaves/rooms/06_6/gAreaRoomMap_MinishCaves_6_top.bin.lz" +gAreaRoomMap_MinishCaves_LakeHyliaNorth_bottom:: + .incbin "maps/areas/053_MinishCaves/rooms/07_LakeHyliaNorth/gAreaRoomMap_MinishCaves_LakeHyliaNorth_bottom.bin.lz" +gAreaRoomMap_MinishCaves_LakeHyliaNorth_top:: + .incbin "maps/areas/053_MinishCaves/rooms/07_LakeHyliaNorth/gAreaRoomMap_MinishCaves_LakeHyliaNorth_top.bin.lz" +gAreaRoomMap_MinishCaves_LakeHyliaLibrari_bottom:: + .incbin "maps/areas/053_MinishCaves/rooms/08_LakeHyliaLibrari/gAreaRoomMap_MinishCaves_LakeHyliaLibrari_bottom.bin.lz" +gAreaRoomMap_MinishCaves_LakeHyliaLibrari_top:: + .incbin "maps/areas/053_MinishCaves/rooms/08_LakeHyliaLibrari/gAreaRoomMap_MinishCaves_LakeHyliaLibrari_top.bin.lz" +gAreaRoomMap_MinishCaves_MinishWoodsSouthwest_bottom:: + .incbin "maps/areas/053_MinishCaves/rooms/09_MinishWoodsSouthwest/gAreaRoomMap_MinishCaves_MinishWoodsSouthwest_bottom.bin.lz" +gAreaRoomMap_MinishCaves_MinishWoodsSouthwest_top:: + .incbin "maps/areas/053_MinishCaves/rooms/09_MinishWoodsSouthwest/gAreaRoomMap_MinishCaves_MinishWoodsSouthwest_top.bin.lz" +gAreaRoomMap_CastleGardenMinishHoles_0_bottom:: + .incbin "maps/areas/054_CastleGardenMinishHoles/rooms/00_0/gAreaRoomMap_CastleGardenMinishHoles_0_bottom.bin.lz" +gAreaRoomMap_CastleGardenMinishHoles_0_top:: + .incbin "maps/areas/054_CastleGardenMinishHoles/rooms/00_0/gAreaRoomMap_CastleGardenMinishHoles_0_top.bin.lz" +gAreaRoomMap_CastleGardenMinishHoles_1_bottom:: + .incbin "maps/areas/054_CastleGardenMinishHoles/rooms/01_1/gAreaRoomMap_CastleGardenMinishHoles_1_bottom.bin.lz" +gAreaRoomMap_CastleGardenMinishHoles_1_top:: + .incbin "maps/areas/054_CastleGardenMinishHoles/rooms/01_1/gAreaRoomMap_CastleGardenMinishHoles_1_top.bin.lz" +gAreaRoomMap_37_0_bottom:: + .incbin "maps/areas/055_37/rooms/00_0/gAreaRoomMap_37_0_bottom.bin.lz" +gAreaRoomMap_37_0_top:: + .incbin "maps/areas/055_37/rooms/00_0/gAreaRoomMap_37_0_top.bin.lz" +gAreaRoomMap_37_1_bottom:: + .incbin "maps/areas/055_37/rooms/01_1/gAreaRoomMap_37_1_bottom.bin.lz" +gAreaRoomMap_37_1_top:: + .incbin "maps/areas/055_37/rooms/01_1/gAreaRoomMap_37_1_top.bin.lz" +gAreaTileSet_MinishWoods_1_0:: + .incbin "maps/areas/000_MinishWoods/tileSets/1/gAreaTileSet_MinishWoods_1_0.4bpp.lz" +gAreaTileSet_MinishWoods_1_1:: + .incbin "maps/areas/000_MinishWoods/tileSets/1/gAreaTileSet_MinishWoods_1_1.4bpp.lz" +gAreaTileSet_HyruleDigCaves_0_3:: + .incbin "maps/areas/015_HyruleDigCaves/tileSets/0/gAreaTileSet_HyruleDigCaves_0_3.4bpp.lz" +gAreaTileSet_HyruleDigCaves_0_4:: + .incbin "maps/areas/015_HyruleDigCaves/tileSets/0/gAreaTileSet_HyruleDigCaves_0_4.4bpp.lz" +gAreaTileSet_CrenelDigCave_0_3:: + .incbin "maps/areas/020_CrenelDigCave/tileSets/0/gAreaTileSet_CrenelDigCave_0_3.4bpp.lz" +gAreaTileSet_CrenelDigCave_0_4:: + .incbin "maps/areas/020_CrenelDigCave/tileSets/0/gAreaTileSet_CrenelDigCave_0_4.4bpp.lz" +gAreaTileSet_DigCaves_0_3:: + .incbin "maps/areas/019_DigCaves/tileSets/0/gAreaTileSet_DigCaves_0_3.4bpp.lz" +gAreaTileSet_DigCaves_0_4:: + .incbin "maps/areas/019_DigCaves/tileSets/0/gAreaTileSet_DigCaves_0_4.4bpp.lz" +gAreaTileSet_CastorWildsDigCave_0_3:: + .incbin "maps/areas/023_CastorWildsDigCave/tileSets/0/gAreaTileSet_CastorWildsDigCave_0_3.4bpp.lz" +gAreaTileSet_CastorWildsDigCave_0_4:: + .incbin "maps/areas/023_CastorWildsDigCave/tileSets/0/gAreaTileSet_CastorWildsDigCave_0_4.4bpp.lz" +gAreaTileSet_HyliaDigCaves_0_3:: + .incbin "maps/areas/025_HyliaDigCaves/tileSets/0/gAreaTileSet_HyliaDigCaves_0_3.4bpp.lz" +gAreaTileSet_HyliaDigCaves_0_4:: + .incbin "maps/areas/025_HyliaDigCaves/tileSets/0/gAreaTileSet_HyliaDigCaves_0_4.4bpp.lz" +gAreaRoomMap_LakeWoodsCave_Main_bottom:: + .incbin "maps/areas/012_LakeWoodsCave/rooms/00_Main/gAreaRoomMap_LakeWoodsCave_Main_bottom.bin.lz" +gCaveBorder_LakeWoods_inside:: + .incbin "maps/areas/012_LakeWoodsCave/rooms/00_Main/gCaveBorder_LakeWoods_inside.bin.lz" +gAreaRoomMap_LakeWoodsCave_Main_top:: + .incbin "maps/areas/012_LakeWoodsCave/rooms/00_Main/gAreaRoomMap_LakeWoodsCave_Main_top.bin.lz" +gAreaRoomMap_HyliaDigCaves_0_bottom:: + .incbin "maps/areas/025_HyliaDigCaves/rooms/00_0/gAreaRoomMap_HyliaDigCaves_0_bottom.bin.lz" +gCaveBorder_LakeHyliaCenter_inside:: + .incbin "maps/areas/025_HyliaDigCaves/rooms/00_0/gCaveBorder_LakeHyliaCenter_inside.bin.lz" +gAreaRoomMap_HyliaDigCaves_0_top:: + .incbin "maps/areas/025_HyliaDigCaves/rooms/00_0/gAreaRoomMap_HyliaDigCaves_0_top.bin.lz" +gAreaRoomMap_HyliaDigCaves_1_bottom:: + .incbin "maps/areas/025_HyliaDigCaves/rooms/01_1/gAreaRoomMap_HyliaDigCaves_1_bottom.bin.lz" +gCaveBorder_LakeHyliaNorth_inside:: + .incbin "maps/areas/025_HyliaDigCaves/rooms/01_1/gCaveBorder_LakeHyliaNorth_inside.bin.lz" +gAreaRoomMap_HyliaDigCaves_1_top:: + .incbin "maps/areas/025_HyliaDigCaves/rooms/01_1/gAreaRoomMap_HyliaDigCaves_1_top.bin.lz" +gAreaRoomMap_CastorWildsDigCave_0_bottom:: + .incbin "maps/areas/023_CastorWildsDigCave/rooms/00_0/gAreaRoomMap_CastorWildsDigCave_0_bottom.bin.lz" +gCaveBorder_CastorWilds_inside:: + .incbin "maps/areas/023_CastorWildsDigCave/rooms/00_0/gCaveBorder_CastorWilds_inside.bin.lz" +gAreaRoomMap_CastorWildsDigCave_0_top:: + .incbin "maps/areas/023_CastorWildsDigCave/rooms/00_0/gAreaRoomMap_CastorWildsDigCave_0_top.bin.lz" +gAreaRoomMap_HyruleDigCaves_Town_bottom:: + .incbin "maps/areas/015_HyruleDigCaves/rooms/00_Town/gAreaRoomMap_HyruleDigCaves_Town_bottom.bin.lz" +gCaveBorder_HyruleTown_inside:: + .incbin "maps/areas/015_HyruleDigCaves/rooms/00_Town/gCaveBorder_HyruleTown_inside.bin.lz" +gAreaRoomMap_HyruleDigCaves_Town_top:: + .incbin "maps/areas/015_HyruleDigCaves/rooms/00_Town/gAreaRoomMap_HyruleDigCaves_Town_top.bin.lz" +gAreaRoomMap_CrenelDigCave_0_bottom:: + .incbin "maps/areas/020_CrenelDigCave/rooms/00_0/gAreaRoomMap_CrenelDigCave_0_bottom.bin.lz" +gCaveBorder_Crenel_inside:: + .incbin "maps/areas/020_CrenelDigCave/rooms/00_0/gCaveBorder_Crenel_inside.bin.lz" +gAreaRoomMap_CrenelDigCave_0_top:: + .incbin "maps/areas/020_CrenelDigCave/rooms/00_0/gAreaRoomMap_CrenelDigCave_0_top.bin.lz" +gAreaRoomMap_DigCaves_EasternHills_bottom:: + .incbin "maps/areas/019_DigCaves/rooms/00_EasternHills/gAreaRoomMap_DigCaves_EasternHills_bottom.bin.lz" +gCaveBorder_EasternHills_inside:: + .incbin "maps/areas/019_DigCaves/rooms/00_EasternHills/gCaveBorder_EasternHills_inside.bin.lz" +gAreaRoomMap_DigCaves_EasternHills_top:: + .incbin "maps/areas/019_DigCaves/rooms/00_EasternHills/gAreaRoomMap_DigCaves_EasternHills_top.bin.lz" +gAreaRoomMap_DigCaves_TrilbyHighlands_bottom:: + .incbin "maps/areas/019_DigCaves/rooms/03_TrilbyHighlands/gAreaRoomMap_DigCaves_TrilbyHighlands_bottom.bin.lz" +gCaveBorder_TrilbyHighlands_inside:: + .incbin "maps/areas/019_DigCaves/rooms/03_TrilbyHighlands/gCaveBorder_TrilbyHighlands_inside.bin.lz" +gAreaRoomMap_DigCaves_TrilbyHighlands_top:: + .incbin "maps/areas/019_DigCaves/rooms/03_TrilbyHighlands/gAreaRoomMap_DigCaves_TrilbyHighlands_top.bin.lz" +gAreaRoomMap_VeilFallsDigCave_0_bottom:: + .incbin "maps/areas/022_VeilFallsDigCave/rooms/00_0/gAreaRoomMap_VeilFallsDigCave_0_bottom.bin.lz" +gCaveBorder_VeilFalls_inside:: + .incbin "maps/areas/022_VeilFallsDigCave/rooms/00_0/gCaveBorder_VeilFalls_inside.bin.lz" +gAreaRoomMap_VeilFallsDigCave_0_top:: + .incbin "maps/areas/022_VeilFallsDigCave/rooms/00_0/gAreaRoomMap_VeilFallsDigCave_0_top.bin.lz" +gAreaRoomMap_OuterFortressOfWinds_EntranceHall_bottom:: + .incbin "maps/areas/024_OuterFortressOfWinds/rooms/00_EntranceHall/gAreaRoomMap_OuterFortressOfWinds_EntranceHall_bottom.bin.lz" unknown_21:: .incbin "assets/unknown_21.bin" -gAreaRoomMap_OuterFortressOfWinds_0_1:: - .incbin "assets/gAreaRoomMap_OuterFortressOfWinds_0_1.bin" - .align 2 -gAreaRoomMap_OuterFortressOfWinds_1_0:: - .incbin "assets/gAreaRoomMap_OuterFortressOfWinds_1_0.bin" - .align 2 +gAreaRoomMap_OuterFortressOfWinds_EntranceHall_top:: + .incbin "maps/areas/024_OuterFortressOfWinds/rooms/00_EntranceHall/gAreaRoomMap_OuterFortressOfWinds_EntranceHall_top.bin.lz" +gAreaRoomMap_OuterFortressOfWinds_2f_bottom:: + .incbin "maps/areas/024_OuterFortressOfWinds/rooms/01_2f/gAreaRoomMap_OuterFortressOfWinds_2f_bottom.bin.lz" unknown_22:: .incbin "assets/unknown_22.bin" -gAreaRoomMap_OuterFortressOfWinds_1_1:: - .incbin "assets/gAreaRoomMap_OuterFortressOfWinds_1_1.bin" - .align 2 -gAreaRoomMap_OuterFortressOfWinds_2_0:: - .incbin "assets/gAreaRoomMap_OuterFortressOfWinds_2_0.bin" - .align 2 +gAreaRoomMap_OuterFortressOfWinds_2f_top:: + .incbin "maps/areas/024_OuterFortressOfWinds/rooms/01_2f/gAreaRoomMap_OuterFortressOfWinds_2f_top.bin.lz" +gAreaRoomMap_OuterFortressOfWinds_3f_bottom:: + .incbin "maps/areas/024_OuterFortressOfWinds/rooms/02_3f/gAreaRoomMap_OuterFortressOfWinds_3f_bottom.bin.lz" unknown_23:: .incbin "assets/unknown_23.bin" -gAreaRoomMap_OuterFortressOfWinds_2_1:: - .incbin "assets/gAreaRoomMap_OuterFortressOfWinds_2_1.bin" - .align 2 -gAreaRoomMap_OuterFortressOfWinds_3_0:: - .incbin "assets/gAreaRoomMap_OuterFortressOfWinds_3_0.bin" - .align 2 +gAreaRoomMap_OuterFortressOfWinds_3f_top:: + .incbin "maps/areas/024_OuterFortressOfWinds/rooms/02_3f/gAreaRoomMap_OuterFortressOfWinds_3f_top.bin.lz" +gAreaRoomMap_OuterFortressOfWinds_MoleMitts_bottom:: + .incbin "maps/areas/024_OuterFortressOfWinds/rooms/03_MoleMitts/gAreaRoomMap_OuterFortressOfWinds_MoleMitts_bottom.bin.lz" unknown_24:: .incbin "assets/unknown_24.bin" -gAreaRoomMap_OuterFortressOfWinds_3_1:: - .incbin "assets/gAreaRoomMap_OuterFortressOfWinds_3_1.bin" - .align 2 -gAreaRoomMap_OuterFortressOfWinds_4_0:: - .incbin "assets/gAreaRoomMap_OuterFortressOfWinds_4_0.bin" - .align 2 +gAreaRoomMap_OuterFortressOfWinds_MoleMitts_top:: + .incbin "maps/areas/024_OuterFortressOfWinds/rooms/03_MoleMitts/gAreaRoomMap_OuterFortressOfWinds_MoleMitts_top.bin.lz" +gAreaRoomMap_OuterFortressOfWinds_SmallKey_bottom:: + .incbin "maps/areas/024_OuterFortressOfWinds/rooms/04_SmallKey/gAreaRoomMap_OuterFortressOfWinds_SmallKey_bottom.bin.lz" unknown_25:: .incbin "assets/unknown_25.bin" -gAreaRoomMap_OuterFortressOfWinds_4_1:: - .incbin "assets/gAreaRoomMap_OuterFortressOfWinds_4_1.bin" - .align 2 -gAreaTileset_MinishVillage_0_0:: - .incbin "tilesets/gAreaTileset_MinishVillage_0_0.4bpp.lz" - .align 2 -gAreaTileset_MinishVillage_0_1:: - .incbin "tilesets/gAreaTileset_MinishVillage_0_1.4bpp.lz" -gAreaTileset_MinishVillage_0_2:: - .incbin "tilesets/gAreaTileset_MinishVillage_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_MinishVillage_0:: - .incbin "assets/gAreaMetatiles_MinishVillage_0.bin" - .align 2 -gAreaMetatiles_MinishVillage_1:: - .incbin "assets/gAreaMetatiles_MinishVillage_1.bin" - .align 2 -gAreaMetatiles_MinishVillage_2:: - .incbin "assets/gAreaMetatiles_MinishVillage_2.bin" -gAreaMetatiles_MinishVillage_3:: - .incbin "assets/gAreaMetatiles_MinishVillage_3.bin" - .align 2 -gAreaTileset_MinishVillage_1_0:: - .incbin "tilesets/gAreaTileset_MinishVillage_1_0.4bpp.lz" - .align 2 -gAreaTileset_MinishVillage_1_1:: - .incbin "tilesets/gAreaTileset_MinishVillage_1_1.4bpp.lz" -gAreaTileset_MinishVillage_1_2:: - .incbin "tilesets/gAreaTileset_MinishVillage_1_2.4bpp.lz" -gAreaRoomMap_MinishVillage_0_0:: - .incbin "assets/gAreaRoomMap_MinishVillage_0_0.bin" - .align 2 -gAreaRoomMap_MinishVillage_0_1:: - .incbin "assets/gAreaRoomMap_MinishVillage_0_1.bin" -gAreaRoomMap_MinishVillage_1_0:: - .incbin "assets/gAreaRoomMap_MinishVillage_1_0.bin" - .align 2 -gAreaRoomMap_MinishVillage_1_1:: - .incbin "assets/gAreaRoomMap_MinishVillage_1_1.bin" - .align 2 -gAreaTileset_MelarisMine_0_0:: - .incbin "tilesets/gAreaTileset_MelarisMine_0_0.4bpp.lz" - .align 2 -gAreaTileset_MelarisMine_0_1:: - .incbin "tilesets/gAreaTileset_MelarisMine_0_1.4bpp.lz" - .align 2 -gAreaTileset_MelarisMine_0_2:: - .incbin "tilesets/gAreaTileset_MelarisMine_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_MelarisMine_0:: - .incbin "assets/gAreaMetatiles_MelarisMine_0.bin" -gAreaMetatiles_MelarisMine_1:: - .incbin "assets/gAreaMetatiles_MelarisMine_1.bin" -gAreaMetatiles_MelarisMine_2:: - .incbin "assets/gAreaMetatiles_MelarisMine_2.bin" - .align 2 -gAreaMetatiles_MelarisMine_3:: - .incbin "assets/gAreaMetatiles_MelarisMine_3.bin" -gAreaRoomMap_MelarisMine_0_0:: - .incbin "assets/gAreaRoomMap_MelarisMine_0_0.bin" -gAreaRoomMap_MelarisMine_0_1:: - .incbin "assets/gAreaRoomMap_MelarisMine_0_1.bin" - .align 2 -gAreaTileset_MinishPaths_2_0:: - .incbin "tilesets/gAreaTileset_MinishPaths_2_0.4bpp.lz" -gAreaTileset_MinishPaths_2_1:: - .incbin "tilesets/gAreaTileset_MinishPaths_2_1.4bpp.lz" - .align 2 -gAreaMetatiles_MnishPaths1_0:: - .incbin "assets/gAreaMetatiles_MnishPaths1_0.bin" - .align 2 -gAreaMetatiles_MnishPaths1_1:: - .incbin "assets/gAreaMetatiles_MnishPaths1_1.bin" -gAreaRoomMap_MinishPaths_0_0:: - .incbin "assets/gAreaRoomMap_MinishPaths_0_0.bin" - .align 2 -gAreaRoomMap_MinishPaths_1_0:: - .incbin "assets/gAreaRoomMap_MinishPaths_1_0.bin" - .align 2 -gAreaRoomMap_MinishPaths_2_0:: - .incbin "assets/gAreaRoomMap_MinishPaths_2_0.bin" - .align 2 -gAreaRoomMap_MinishPaths_3_0:: - .incbin "assets/gAreaRoomMap_MinishPaths_3_0.bin" -gAreaRoomMap_MinishPaths_4_0:: - .incbin "assets/gAreaRoomMap_MinishPaths_4_0.bin" - .align 2 -gAreaTileset_CrenelMinishPaths_0_0:: - .incbin "tilesets/gAreaTileset_CrenelMinishPaths_0_0.4bpp.lz" - .align 2 -gAreaTileset_CrenelMinishPaths_0_1:: - .incbin "tilesets/gAreaTileset_CrenelMinishPaths_0_1.4bpp.lz" - .align 2 -gAreaTileset_CrenelMinishPaths_2_0:: - .incbin "tilesets/gAreaTileset_CrenelMinishPaths_2_0.4bpp.lz" -gAreaTileset_CrenelMinishPaths_2_1:: - .incbin "tilesets/gAreaTileset_CrenelMinishPaths_2_1.4bpp.lz" - .align 2 -gAreaMetatiles_CrenelMinishPaths_0:: - .incbin "assets/gAreaMetatiles_CrenelMinishPaths_0.bin" - .align 2 -gAreaMetatiles_CrenelMinishPaths_1:: - .incbin "assets/gAreaMetatiles_CrenelMinishPaths_1.bin" - .align 2 -gAreaRoomMap_CrenelMinishPaths_0_0:: - .incbin "assets/gAreaRoomMap_CrenelMinishPaths_0_0.bin" -gAreaRoomMap_CrenelMinishPaths_1_0:: - .incbin "assets/gAreaRoomMap_CrenelMinishPaths_1_0.bin" - .align 2 -gAreaRoomMap_CrenelMinishPaths_2_0:: - .incbin "assets/gAreaRoomMap_CrenelMinishPaths_2_0.bin" - .align 2 -gAreaRoomMap_CrenelMinishPaths_3_0:: - .incbin "assets/gAreaRoomMap_CrenelMinishPaths_3_0.bin" -gAreaTileset_EzloCutscene_0_2:: - .incbin "tilesets/gAreaTileset_EzloCutscene_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_EzloCutscene_1:: - .incbin "assets/gAreaMetatiles_EzloCutscene_1.bin" - .align 2 -gAreaMetatiles_EzloCutscene_3:: - .incbin "assets/gAreaMetatiles_EzloCutscene_3.bin" - .align 2 -gAreaTileset_HouseInteriors1_0_0:: - .incbin "tilesets/gAreaTileset_HouseInteriors1_0_0.4bpp.lz" -gAreaTileset_HouseInteriors1_0_1:: - .incbin "tilesets/gAreaTileset_HouseInteriors1_0_1.4bpp.lz" -gAreaMetatiles_HouseInteriors1_0:: - .incbin "assets/gAreaMetatiles_HouseInteriors1_0.bin" - .align 2 -gAreaMetatiles_HouseInteriors1_2:: - .incbin "assets/gAreaMetatiles_HouseInteriors1_2.bin" - .align 2 -gAreaTileset_HouseInteriors2_2_0:: - .incbin "tilesets/gAreaTileset_HouseInteriors2_2_0.4bpp.lz" - .align 2 -gAreaTileset_HouseInteriors2_2_1:: - .incbin "tilesets/gAreaTileset_HouseInteriors2_2_1.4bpp.lz" -gAreaMetatiles_HouseInteriors2_0:: - .incbin "assets/gAreaMetatiles_HouseInteriors2_0.bin" -gAreaMetatiles_HouseInteriors2_2:: - .incbin "assets/gAreaMetatiles_HouseInteriors2_2.bin" - .align 2 -gAreaTileset_HouseInteriors4_0_0:: - .incbin "tilesets/gAreaTileset_HouseInteriors4_0_0.4bpp.lz" - .align 2 -gAreaTileset_HouseInteriors4_0_1:: - .incbin "tilesets/gAreaTileset_HouseInteriors4_0_1.4bpp.lz" -gAreaMetatiles_HouseInteriors4_0:: - .incbin "assets/gAreaMetatiles_HouseInteriors4_0.bin" -gAreaMetatiles_HouseInteriors4_2:: - .incbin "assets/gAreaMetatiles_HouseInteriors4_2.bin" - .align 2 -gAreaTileset_HouseInteriors3_0_0:: - .incbin "tilesets/gAreaTileset_HouseInteriors3_0_0.4bpp.lz" -gAreaTileset_HouseInteriors3_0_1:: - .incbin "tilesets/gAreaTileset_HouseInteriors3_0_1.4bpp.lz" -gAreaMetatiles_HouseInteriors3_0:: - .incbin "assets/gAreaMetatiles_HouseInteriors3_0.bin" - .align 2 -gAreaMetatiles_HouseInteriors3_2:: - .incbin "assets/gAreaMetatiles_HouseInteriors3_2.bin" - .align 2 -gAreaTileset_TreeInteriors_0_0:: - .incbin "tilesets/gAreaTileset_TreeInteriors_0_0.4bpp.lz" - .align 2 -gAreaTileset_TreeInteriors_0_1:: - .incbin "tilesets/gAreaTileset_TreeInteriors_0_1.4bpp.lz" -gAreaMetatiles_TreeInteriors_0:: - .incbin "assets/gAreaMetatiles_TreeInteriors_0.bin" - .align 2 -gAreaMetatiles_TreeInteriors_2:: - .incbin "assets/gAreaMetatiles_TreeInteriors_2.bin" - .align 2 -gAreaTileset_MinishCracks_4_0:: - .incbin "tilesets/gAreaTileset_MinishCracks_4_0.4bpp.lz" - .align 2 -gAreaTileset_MinishCracks_4_1:: - .incbin "tilesets/gAreaTileset_MinishCracks_4_1.4bpp.lz" -gAreaMetatiles_MinishCracks_0:: - .incbin "assets/gAreaMetatiles_MinishCracks_0.bin" -gAreaMetatiles_MinishCracks_2:: - .incbin "assets/gAreaMetatiles_MinishCracks_2.bin" - .align 2 -gAreaTileset_Dojos_5_0:: - .incbin "tilesets/gAreaTileset_Dojos_5_0.4bpp.lz" -gAreaTileset_Dojos_5_1:: - .incbin "tilesets/gAreaTileset_Dojos_5_1.4bpp.lz" -gAreaMetatiles_Dojos_0:: - .incbin "assets/gAreaMetatiles_Dojos_0.bin" - .align 2 -gAreaMetatiles_Dojos_2:: - .incbin "assets/gAreaMetatiles_Dojos_2.bin" -gAreaTileset_MinishRafters_0_0:: - .incbin "tilesets/gAreaTileset_MinishRafters_0_0.4bpp.lz" - .align 2 -gAreaTileset_MinishRafters_0_1:: - .incbin "tilesets/gAreaTileset_MinishRafters_0_1.4bpp.lz" - .align 2 -gAreaMetatiles_MinishRafters_0:: - .incbin "assets/gAreaMetatiles_MinishRafters_0.bin" - .align 2 -gAreaMetatiles_MinishRafters_2:: - .incbin "assets/gAreaMetatiles_MinishRafters_2.bin" - .align 2 -gAreaTileset_WindTribeTower_0_0:: - .incbin "tilesets/gAreaTileset_WindTribeTower_0_0.4bpp.lz" - .align 2 -gAreaTileset_WindTribeTower_0_1:: - .incbin "tilesets/gAreaTileset_WindTribeTower_0_1.4bpp.lz" -gAreaMetatiles_WindTribeTower_0:: - .incbin "assets/gAreaMetatiles_WindTribeTower_0.bin" - .align 2 -gAreaMetatiles_WindTribeTower_2:: - .incbin "assets/gAreaMetatiles_WindTribeTower_2.bin" - .align 2 -gAreaTileset_WindTribeTowerRoof_0_0:: - .incbin "tilesets/gAreaTileset_WindTribeTowerRoof_0_0.4bpp.lz" -gAreaTileset_WindTribeTowerRoof_0_1:: - .incbin "tilesets/gAreaTileset_WindTribeTowerRoof_0_1.4bpp.lz" -gAreaTileset_WindTribeTowerRoof_0_2:: - .incbin "tilesets/gAreaTileset_WindTribeTowerRoof_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_WindTribeTowerRoof_0:: - .incbin "assets/gAreaMetatiles_WindTribeTowerRoof_0.bin" - .align 2 -gAreaMetatiles_WindTribeTowerRoof_1:: - .incbin "assets/gAreaMetatiles_WindTribeTowerRoof_1.bin" - .align 2 -gAreaMetatiles_WindTribeTowerRoof_2:: - .incbin "assets/gAreaMetatiles_WindTribeTowerRoof_2.bin" - .align 2 -gAreaMetatiles_WindTribeTowerRoof_3:: - .incbin "assets/gAreaMetatiles_WindTribeTowerRoof_3.bin" - .align 2 +gAreaRoomMap_OuterFortressOfWinds_SmallKey_top:: + .incbin "maps/areas/024_OuterFortressOfWinds/rooms/04_SmallKey/gAreaRoomMap_OuterFortressOfWinds_SmallKey_top.bin.lz" +gAreaTileSet_MinishVillage_0_0:: + .incbin "maps/areas/001_MinishVillage/tileSets/0/gAreaTileSet_MinishVillage_0_0.4bpp.lz" +gAreaTileSet_MinishVillage_0_1:: + .incbin "maps/areas/001_MinishVillage/tileSets/0/gAreaTileSet_MinishVillage_0_1.4bpp.lz" +gAreaTileSet_MinishVillage_0_2:: + .incbin "maps/areas/001_MinishVillage/tileSets/0/gAreaTileSet_MinishVillage_0_2.4bpp.lz" +gAreaTileSet_MinishVillage_bottom:: + .incbin "maps/areas/001_MinishVillage/tileSet/gAreaTileSet_MinishVillage_bottom.bin.lz" +gAreaTileSet_MinishVillage_top:: + .incbin "maps/areas/001_MinishVillage/tileSet/gAreaTileSet_MinishVillage_top.bin.lz" +gAreaTileSetTypes_MinishVillage_bottom:: + .incbin "maps/areas/001_MinishVillage/tileSet/gAreaTileSetTypes_MinishVillage_bottom.bin.lz" +gAreaTileSetTypes_MinishVillage_top:: + .incbin "maps/areas/001_MinishVillage/tileSet/gAreaTileSetTypes_MinishVillage_top.bin.lz" +gAreaTileSet_MinishVillage_1_0:: + .incbin "maps/areas/001_MinishVillage/tileSets/1/gAreaTileSet_MinishVillage_1_0.4bpp.lz" +gAreaTileSet_MinishVillage_1_1:: + .incbin "maps/areas/001_MinishVillage/tileSets/1/gAreaTileSet_MinishVillage_1_1.4bpp.lz" +gAreaTileSet_MinishVillage_1_2:: + .incbin "maps/areas/001_MinishVillage/tileSets/1/gAreaTileSet_MinishVillage_1_2.4bpp.lz" +gAreaRoomMap_MinishVillage_Main_bottom:: + .incbin "maps/areas/001_MinishVillage/rooms/00_Main/gAreaRoomMap_MinishVillage_Main_bottom.bin.lz" +gAreaRoomMap_MinishVillage_Main_top:: + .incbin "maps/areas/001_MinishVillage/rooms/00_Main/gAreaRoomMap_MinishVillage_Main_top.bin.lz" +gAreaRoomMap_MinishVillage_SideHouseArea_bottom:: + .incbin "maps/areas/001_MinishVillage/rooms/01_SideHouseArea/gAreaRoomMap_MinishVillage_SideHouseArea_bottom.bin.lz" +gAreaRoomMap_MinishVillage_SideHouseArea_top:: + .incbin "maps/areas/001_MinishVillage/rooms/01_SideHouseArea/gAreaRoomMap_MinishVillage_SideHouseArea_top.bin.lz" +gAreaTileSet_MelarisMine_0_0:: + .incbin "maps/areas/016_MelarisMine/tileSets/0/gAreaTileSet_MelarisMine_0_0.4bpp.lz" +gAreaTileSet_MelarisMine_0_1:: + .incbin "maps/areas/016_MelarisMine/tileSets/0/gAreaTileSet_MelarisMine_0_1.4bpp.lz" +gAreaTileSet_MelarisMine_0_2:: + .incbin "maps/areas/016_MelarisMine/tileSets/0/gAreaTileSet_MelarisMine_0_2.4bpp.lz" +gAreaTileSet_MelarisMine_bottom:: + .incbin "maps/areas/016_MelarisMine/tileSet/gAreaTileSet_MelarisMine_bottom.bin.lz" +gAreaTileSet_MelarisMine_top:: + .incbin "maps/areas/016_MelarisMine/tileSet/gAreaTileSet_MelarisMine_top.bin.lz" +gAreaTileSetTypes_MelarisMine_bottom:: + .incbin "maps/areas/016_MelarisMine/tileSet/gAreaTileSetTypes_MelarisMine_bottom.bin.lz" +gAreaTileSetTypes_MelarisMine_top:: + .incbin "maps/areas/016_MelarisMine/tileSet/gAreaTileSetTypes_MelarisMine_top.bin.lz" +gAreaRoomMap_MelarisMine_Main_bottom:: + .incbin "maps/areas/016_MelarisMine/rooms/00_Main/gAreaRoomMap_MelarisMine_Main_bottom.bin.lz" +gAreaRoomMap_MelarisMine_Main_top:: + .incbin "maps/areas/016_MelarisMine/rooms/00_Main/gAreaRoomMap_MelarisMine_Main_top.bin.lz" +gAreaTileSet_MinishPaths_0_0:: + .incbin "maps/areas/017_MinishPaths/tileSets/0/gAreaTileSet_MinishPaths_0_0.4bpp.lz" +gAreaTileSet_MinishPaths_0_1:: + .incbin "maps/areas/017_MinishPaths/tileSets/0/gAreaTileSet_MinishPaths_0_1.4bpp.lz" +gAreaTileSet_MinishPaths_bottom:: + .incbin "maps/areas/017_MinishPaths/tileSet/gAreaTileSet_MinishPaths_bottom.bin.lz" +gAreaTileSetTypes_MinishPaths_bottom:: + .incbin "maps/areas/017_MinishPaths/tileSet/gAreaTileSetTypes_MinishPaths_bottom.bin.lz" +gAreaRoomMap_MinishPaths_MinishVillage_bottom:: + .incbin "maps/areas/017_MinishPaths/rooms/00_MinishVillage/gAreaRoomMap_MinishPaths_MinishVillage_bottom.bin.lz" +gAreaRoomMap_MinishPaths_Bow_bottom:: + .incbin "maps/areas/017_MinishPaths/rooms/01_Bow/gAreaRoomMap_MinishPaths_Bow_bottom.bin.lz" +gAreaRoomMap_MinishPaths_Schoolyard_bottom:: + .incbin "maps/areas/017_MinishPaths/rooms/02_Schoolyard/gAreaRoomMap_MinishPaths_Schoolyard_bottom.bin.lz" +gAreaRoomMap_MinishPaths_LonLonRanch_bottom:: + .incbin "maps/areas/017_MinishPaths/rooms/03_LonLonRanch/gAreaRoomMap_MinishPaths_LonLonRanch_bottom.bin.lz" +gAreaRoomMap_MinishPaths_LakeHylia_bottom:: + .incbin "maps/areas/017_MinishPaths/rooms/04_LakeHylia/gAreaRoomMap_MinishPaths_LakeHylia_bottom.bin.lz" +gAreaTileSet_CrenelMinishPaths_0_0:: + .incbin "maps/areas/018_CrenelMinishPaths/tileSets/0/gAreaTileSet_CrenelMinishPaths_0_0.4bpp.lz" +gAreaTileSet_CrenelMinishPaths_0_1:: + .incbin "maps/areas/018_CrenelMinishPaths/tileSets/0/gAreaTileSet_CrenelMinishPaths_0_1.4bpp.lz" +gAreaTileSet_CrenelMinishPaths_1_0:: + .incbin "maps/areas/018_CrenelMinishPaths/tileSets/1/gAreaTileSet_CrenelMinishPaths_1_0.4bpp.lz" +gAreaTileSet_CrenelMinishPaths_1_1:: + .incbin "maps/areas/018_CrenelMinishPaths/tileSets/1/gAreaTileSet_CrenelMinishPaths_1_1.4bpp.lz" +gAreaTileSet_CrenelMinishPaths_bottom:: + .incbin "maps/areas/018_CrenelMinishPaths/tileSet/gAreaTileSet_CrenelMinishPaths_bottom.bin.lz" +gAreaTileSetTypes_CrenelMinishPaths_bottom:: + .incbin "maps/areas/018_CrenelMinishPaths/tileSet/gAreaTileSetTypes_CrenelMinishPaths_bottom.bin.lz" +gAreaRoomMap_CrenelMinishPaths_Bean_bottom:: + .incbin "maps/areas/018_CrenelMinishPaths/rooms/00_Bean/gAreaRoomMap_CrenelMinishPaths_Bean_bottom.bin.lz" +gAreaRoomMap_CrenelMinishPaths_SpringWater_bottom:: + .incbin "maps/areas/018_CrenelMinishPaths/rooms/01_SpringWater/gAreaRoomMap_CrenelMinishPaths_SpringWater_bottom.bin.lz" +gAreaRoomMap_CrenelMinishPaths_Rain_bottom:: + .incbin "maps/areas/018_CrenelMinishPaths/rooms/02_Rain/gAreaRoomMap_CrenelMinishPaths_Rain_bottom.bin.lz" +gAreaRoomMap_CrenelMinishPaths_Melari_bottom:: + .incbin "maps/areas/018_CrenelMinishPaths/rooms/03_Melari/gAreaRoomMap_CrenelMinishPaths_Melari_bottom.bin.lz" +gAreaTileSet_HouseInteriors1_0_2:: + .incbin "maps/areas/033_HouseInteriors1/tileSets/0/gAreaTileSet_HouseInteriors1_0_2.4bpp.lz" +gAreaTileSet_HouseInteriors1_top:: + .incbin "maps/areas/033_HouseInteriors1/tileSet/gAreaTileSet_HouseInteriors1_top.bin.lz" +gAreaTileSetTypes_HouseInteriors1_top:: + .incbin "maps/areas/033_HouseInteriors1/tileSet/gAreaTileSetTypes_HouseInteriors1_top.bin.lz" +gAreaTileSet_HouseInteriors1_0_0:: + .incbin "maps/areas/033_HouseInteriors1/tileSets/0/gAreaTileSet_HouseInteriors1_0_0.4bpp.lz" +gAreaTileSet_HouseInteriors1_0_1:: + .incbin "maps/areas/033_HouseInteriors1/tileSets/0/gAreaTileSet_HouseInteriors1_0_1.4bpp.lz" +gAreaTileSet_HouseInteriors1_bottom:: + .incbin "maps/areas/033_HouseInteriors1/tileSet/gAreaTileSet_HouseInteriors1_bottom.bin.lz" +gAreaTileSetTypes_HouseInteriors1_bottom:: + .incbin "maps/areas/033_HouseInteriors1/tileSet/gAreaTileSetTypes_HouseInteriors1_bottom.bin.lz" +gAreaTileSet_HouseInteriors2_0_0:: + .incbin "maps/areas/034_HouseInteriors2/tileSets/0/gAreaTileSet_HouseInteriors2_0_0.4bpp.lz" +gAreaTileSet_HouseInteriors2_0_1:: + .incbin "maps/areas/034_HouseInteriors2/tileSets/0/gAreaTileSet_HouseInteriors2_0_1.4bpp.lz" +gAreaTileSet_HouseInteriors2_bottom:: + .incbin "maps/areas/034_HouseInteriors2/tileSet/gAreaTileSet_HouseInteriors2_bottom.bin.lz" +gAreaTileSetTypes_HouseInteriors2_bottom:: + .incbin "maps/areas/034_HouseInteriors2/tileSet/gAreaTileSetTypes_HouseInteriors2_bottom.bin.lz" +gAreaTileSet_HouseInteriors4_0_0:: + .incbin "maps/areas/040_HouseInteriors4/tileSets/0/gAreaTileSet_HouseInteriors4_0_0.4bpp.lz" +gAreaTileSet_HouseInteriors4_0_1:: + .incbin "maps/areas/040_HouseInteriors4/tileSets/0/gAreaTileSet_HouseInteriors4_0_1.4bpp.lz" +gAreaTileSet_HouseInteriors4_bottom:: + .incbin "maps/areas/040_HouseInteriors4/tileSet/gAreaTileSet_HouseInteriors4_bottom.bin.lz" +gAreaTileSetTypes_HouseInteriors4_bottom:: + .incbin "maps/areas/040_HouseInteriors4/tileSet/gAreaTileSetTypes_HouseInteriors4_bottom.bin.lz" +gAreaTileSet_HouseInteriors3_0_0:: + .incbin "maps/areas/035_HouseInteriors3/tileSets/0/gAreaTileSet_HouseInteriors3_0_0.4bpp.lz" +gAreaTileSet_HouseInteriors3_0_1:: + .incbin "maps/areas/035_HouseInteriors3/tileSets/0/gAreaTileSet_HouseInteriors3_0_1.4bpp.lz" +gAreaTileSet_HouseInteriors3_bottom:: + .incbin "maps/areas/035_HouseInteriors3/tileSet/gAreaTileSet_HouseInteriors3_bottom.bin.lz" +gAreaTileSetTypes_HouseInteriors3_bottom:: + .incbin "maps/areas/035_HouseInteriors3/tileSet/gAreaTileSetTypes_HouseInteriors3_bottom.bin.lz" +gAreaTileSet_TreeInteriors_0_0:: + .incbin "maps/areas/036_TreeInteriors/tileSets/0/gAreaTileSet_TreeInteriors_0_0.4bpp.lz" +gAreaTileSet_TreeInteriors_0_1:: + .incbin "maps/areas/036_TreeInteriors/tileSets/0/gAreaTileSet_TreeInteriors_0_1.4bpp.lz" +gAreaTileSet_TreeInteriors_bottom:: + .incbin "maps/areas/036_TreeInteriors/tileSet/gAreaTileSet_TreeInteriors_bottom.bin.lz" +gAreaTileSetTypes_TreeInteriors_bottom:: + .incbin "maps/areas/036_TreeInteriors/tileSet/gAreaTileSetTypes_TreeInteriors_bottom.bin.lz" +gAreaTileSet_MinishCracks_0_0:: + .incbin "maps/areas/039_MinishCracks/tileSets/0/gAreaTileSet_MinishCracks_0_0.4bpp.lz" +gAreaTileSet_MinishCracks_0_1:: + .incbin "maps/areas/039_MinishCracks/tileSets/0/gAreaTileSet_MinishCracks_0_1.4bpp.lz" +gAreaTileSet_MinishCracks_bottom:: + .incbin "maps/areas/039_MinishCracks/tileSet/gAreaTileSet_MinishCracks_bottom.bin.lz" +gAreaTileSetTypes_MinishCracks_bottom:: + .incbin "maps/areas/039_MinishCracks/tileSet/gAreaTileSetTypes_MinishCracks_bottom.bin.lz" +gAreaTileSet_Dojos_0_0:: + .incbin "maps/areas/037_Dojos/tileSets/0/gAreaTileSet_Dojos_0_0.4bpp.lz" +gAreaTileSet_Dojos_0_1:: + .incbin "maps/areas/037_Dojos/tileSets/0/gAreaTileSet_Dojos_0_1.4bpp.lz" +gAreaTileSet_Dojos_bottom:: + .incbin "maps/areas/037_Dojos/tileSet/gAreaTileSet_Dojos_bottom.bin.lz" +gAreaTileSetTypes_Dojos_bottom:: + .incbin "maps/areas/037_Dojos/tileSet/gAreaTileSetTypes_Dojos_bottom.bin.lz" +gAreaTileSet_MinishRafters_0_0:: + .incbin "maps/areas/046_MinishRafters/tileSets/0/gAreaTileSet_MinishRafters_0_0.4bpp.lz" +gAreaTileSet_MinishRafters_0_1:: + .incbin "maps/areas/046_MinishRafters/tileSets/0/gAreaTileSet_MinishRafters_0_1.4bpp.lz" +gAreaTileSet_MinishRafters_bottom:: + .incbin "maps/areas/046_MinishRafters/tileSet/gAreaTileSet_MinishRafters_bottom.bin.lz" +gAreaTileSetTypes_MinishRafters_bottom:: + .incbin "maps/areas/046_MinishRafters/tileSet/gAreaTileSetTypes_MinishRafters_bottom.bin.lz" +gAreaTileSet_WindTribeTower_0_0:: + .incbin "maps/areas/048_WindTribeTower/tileSets/0/gAreaTileSet_WindTribeTower_0_0.4bpp.lz" +gAreaTileSet_WindTribeTower_0_1:: + .incbin "maps/areas/048_WindTribeTower/tileSets/0/gAreaTileSet_WindTribeTower_0_1.4bpp.lz" +gAreaTileSet_WindTribeTower_bottom:: + .incbin "maps/areas/048_WindTribeTower/tileSet/gAreaTileSet_WindTribeTower_bottom.bin.lz" +gAreaTileSetTypes_WindTribeTower_bottom:: + .incbin "maps/areas/048_WindTribeTower/tileSet/gAreaTileSetTypes_WindTribeTower_bottom.bin.lz" +gAreaTileSet_WindTribeTowerRoof_0_0:: + .incbin "maps/areas/049_WindTribeTowerRoof/tileSets/0/gAreaTileSet_WindTribeTowerRoof_0_0.4bpp.lz" +gAreaTileSet_WindTribeTowerRoof_0_1:: + .incbin "maps/areas/049_WindTribeTowerRoof/tileSets/0/gAreaTileSet_WindTribeTowerRoof_0_1.4bpp.lz" +gAreaTileSet_WindTribeTowerRoof_0_2:: + .incbin "maps/areas/049_WindTribeTowerRoof/tileSets/0/gAreaTileSet_WindTribeTowerRoof_0_2.4bpp.lz" +gAreaTileSet_WindTribeTowerRoof_bottom:: + .incbin "maps/areas/049_WindTribeTowerRoof/tileSet/gAreaTileSet_WindTribeTowerRoof_bottom.bin.lz" +gAreaTileSet_WindTribeTowerRoof_top:: + .incbin "maps/areas/049_WindTribeTowerRoof/tileSet/gAreaTileSet_WindTribeTowerRoof_top.bin.lz" +gAreaTileSetTypes_WindTribeTowerRoof_bottom:: + .incbin "maps/areas/049_WindTribeTowerRoof/tileSet/gAreaTileSetTypes_WindTribeTowerRoof_bottom.bin.lz" +gAreaTileSetTypes_WindTribeTowerRoof_top:: + .incbin "maps/areas/049_WindTribeTowerRoof/tileSet/gAreaTileSetTypes_WindTribeTowerRoof_top.bin.lz" unknown_26:: .incbin "assets/unknown_26.bin" -gAreaTileset_EzloCutscene_0_0:: - .incbin "tilesets/gAreaTileset_EzloCutscene_0_0.4bpp.lz" -gAreaTileset_EzloCutscene_0_1:: - .incbin "tilesets/gAreaTileset_EzloCutscene_0_1.4bpp.lz" -gAreaMetatiles_EzloCutscene_0:: - .incbin "assets/gAreaMetatiles_EzloCutscene_0.bin" - .align 2 -gAreaMetatiles_EzloCutscene_2:: - .incbin "assets/gAreaMetatiles_EzloCutscene_2.bin" - .align 2 +gAreaTileSet_EzloCutscene_0_0:: + .incbin "maps/areas/056_EzloCutscene/tileSets/0/gAreaTileSet_EzloCutscene_0_0.4bpp.lz" +gAreaTileSet_EzloCutscene_0_1:: + .incbin "maps/areas/056_EzloCutscene/tileSets/0/gAreaTileSet_EzloCutscene_0_1.4bpp.lz" +gAreaTileSet_EzloCutscene_bottom:: + .incbin "maps/areas/056_EzloCutscene/tileSet/gAreaTileSet_EzloCutscene_bottom.bin.lz" +gAreaTileSetTypes_EzloCutscene_bottom:: + .incbin "maps/areas/056_EzloCutscene/tileSet/gAreaTileSetTypes_EzloCutscene_bottom.bin.lz" unknown_27:: .incbin "assets/unknown_27.bin" -gAreaRoomMap_HouseInteriors2_0_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_0_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_0_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_0_1.bin" -gAreaRoomMap_HouseInteriors2_1_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_1_0.bin" -gAreaRoomMap_HouseInteriors2_1_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_1_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_2_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_2_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_2_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_2_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_3_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_3_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_3_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_3_1.bin" -gAreaRoomMap_HouseInteriors2_4_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_4_0.bin" -gAreaRoomMap_HouseInteriors2_4_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_4_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_5_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_5_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_5_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_5_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_6_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_6_0.bin" -gAreaRoomMap_HouseInteriors2_6_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_6_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_7_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_7_0.bin" -gAreaRoomMap_HouseInteriors2_7_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_7_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_8_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_8_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_8_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_8_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_9_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_9_0.bin" -gAreaRoomMap_HouseInteriors2_9_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_9_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_10_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_10_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_10_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_10_1.bin" -gAreaRoomMap_HouseInteriors2_11_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_11_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_11_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_11_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_12_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_12_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_12_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_12_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_13_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_13_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_13_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_13_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_14_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_14_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_14_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_14_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_15_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_15_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_15_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_15_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_16_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_16_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_16_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_16_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_17_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_17_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_17_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_17_1.bin" -gAreaRoomMap_HouseInteriors2_18_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_18_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors2_18_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors2_18_1.bin" -gAreaRoomMap_HouseInteriors4_0_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors4_0_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors4_0_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors4_0_1.bin" -gAreaRoomMap_HouseInteriors4_1_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors4_1_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors4_1_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors4_1_1.bin" -gAreaRoomMap_HouseInteriors4_2_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors4_2_0.bin" -gAreaRoomMap_HouseInteriors4_2_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors4_2_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors4_3_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors4_3_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors4_3_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors4_3_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors4_4_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors4_4_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors4_4_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors4_4_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors4_5_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors4_5_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors4_5_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors4_5_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors3_0_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors3_0_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors3_0_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors3_0_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors3_1_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors3_1_0.bin" -gAreaRoomMap_HouseInteriors3_1_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors3_1_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors3_2_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors3_2_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors3_2_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors3_2_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors3_3_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors3_3_0.bin" -gAreaRoomMap_HouseInteriors3_3_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors3_3_1.bin" -gAreaRoomMap_HouseInteriors3_4_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors3_4_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors3_4_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors3_4_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors3_5_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors3_5_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors3_5_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors3_5_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors3_6_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors3_6_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors3_6_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors3_6_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors3_7_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors3_7_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors3_7_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors3_7_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors3_8_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors3_8_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors3_8_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors3_8_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors1_0_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_0_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors1_0_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_0_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors1_1_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_1_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors1_1_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_1_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors1_2_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_2_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors1_2_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_2_1.bin" -gAreaRoomMap_HouseInteriors1_3_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_3_0.bin" -gAreaRoomMap_HouseInteriors1_3_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_3_1.bin" -gAreaRoomMap_HouseInteriors1_4_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_4_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors1_4_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_4_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors1_5_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_5_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors1_5_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_5_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors1_6_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_6_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors1_6_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_6_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors1_7_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_7_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors1_7_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_7_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors1_8_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_8_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors1_8_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_8_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors1_9_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_9_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors1_9_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_9_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors1_10_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_10_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors1_10_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_10_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors1_11_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_11_0.bin" -gAreaRoomMap_HouseInteriors1_11_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_11_1.bin" - .align 2 -gAreaRoomMap_HouseInteriors1_12_0:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_12_0.bin" - .align 2 -gAreaRoomMap_HouseInteriors1_12_1:: - .incbin "assets/gAreaRoomMap_HouseInteriors1_12_1.bin" - .align 2 -gAreaRoomMap_Dojos_0_0:: - .incbin "assets/gAreaRoomMap_Dojos_0_0.bin" - .align 2 -gAreaRoomMap_Dojos_0_1:: - .incbin "assets/gAreaRoomMap_Dojos_0_1.bin" - .align 2 -gAreaRoomMap_Dojos_1_0:: - .incbin "assets/gAreaRoomMap_Dojos_1_0.bin" - .align 2 -gAreaRoomMap_Dojos_1_1:: - .incbin "assets/gAreaRoomMap_Dojos_1_1.bin" - .align 2 -gAreaRoomMap_Dojos_2_0:: - .incbin "assets/gAreaRoomMap_Dojos_2_0.bin" - .align 2 -gAreaRoomMap_Dojos_2_1:: - .incbin "assets/gAreaRoomMap_Dojos_2_1.bin" - .align 2 -gAreaRoomMap_Dojos_3_0:: - .incbin "assets/gAreaRoomMap_Dojos_3_0.bin" -gAreaRoomMap_Dojos_3_1:: - .incbin "assets/gAreaRoomMap_Dojos_3_1.bin" - .align 2 -gAreaRoomMap_Dojos_4_0:: - .incbin "assets/gAreaRoomMap_Dojos_4_0.bin" -gAreaRoomMap_Dojos_4_1:: - .incbin "assets/gAreaRoomMap_Dojos_4_1.bin" - .align 2 -gAreaRoomMap_Dojos_5_0:: - .incbin "assets/gAreaRoomMap_Dojos_5_0.bin" - .align 2 -gAreaRoomMap_Dojos_5_1:: - .incbin "assets/gAreaRoomMap_Dojos_5_1.bin" - .align 2 -gAreaRoomMap_Dojos_6_0:: - .incbin "assets/gAreaRoomMap_Dojos_6_0.bin" - .align 2 -gAreaRoomMap_Dojos_6_1:: - .incbin "assets/gAreaRoomMap_Dojos_6_1.bin" - .align 2 -gAreaRoomMap_Dojos_7_0:: - .incbin "assets/gAreaRoomMap_Dojos_7_0.bin" - .align 2 -gAreaRoomMap_Dojos_7_1:: - .incbin "assets/gAreaRoomMap_Dojos_7_1.bin" - .align 2 -gAreaRoomMap_Dojos_8_0:: - .incbin "assets/gAreaRoomMap_Dojos_8_0.bin" - .align 2 -gAreaRoomMap_Dojos_8_1:: - .incbin "assets/gAreaRoomMap_Dojos_8_1.bin" - .align 2 -gAreaRoomMap_Dojos_9_0:: - .incbin "assets/gAreaRoomMap_Dojos_9_0.bin" - .align 2 -gAreaRoomMap_Dojos_9_1:: - .incbin "assets/gAreaRoomMap_Dojos_9_1.bin" - .align 2 -gAreaRoomMap_Dojos_10_0:: - .incbin "assets/gAreaRoomMap_Dojos_10_0.bin" -gAreaRoomMap_Dojos_10_1:: - .incbin "assets/gAreaRoomMap_Dojos_10_1.bin" - .align 2 -gAreaRoomMap_Dojos_11_0:: - .incbin "assets/gAreaRoomMap_Dojos_11_0.bin" - .align 2 -gAreaRoomMap_Dojos_11_1:: - .incbin "assets/gAreaRoomMap_Dojos_11_1.bin" - .align 2 -gAreaRoomMap_Dojos_12_0:: - .incbin "assets/gAreaRoomMap_Dojos_12_0.bin" - .align 2 -gAreaRoomMap_Dojos_12_1:: - .incbin "assets/gAreaRoomMap_Dojos_12_1.bin" - .align 2 -gAreaRoomMap_Dojos_13_0:: - .incbin "assets/gAreaRoomMap_Dojos_13_0.bin" - .align 2 -gAreaRoomMap_Dojos_13_1:: - .incbin "assets/gAreaRoomMap_Dojos_13_1.bin" - .align 2 -gAreaRoomMap_TreeInteriors_0_0:: - .incbin "assets/gAreaRoomMap_TreeInteriors_0_0.bin" -gAreaRoomMap_TreeInteriors_0_1:: - .incbin "assets/gAreaRoomMap_TreeInteriors_0_1.bin" - .align 2 -gAreaRoomMap_TreeInteriors_1_0:: - .incbin "assets/gAreaRoomMap_TreeInteriors_1_0.bin" -gAreaRoomMap_TreeInteriors_1_1:: - .incbin "assets/gAreaRoomMap_TreeInteriors_1_1.bin" -gAreaRoomMap_TreeInteriors_2_0:: - .incbin "assets/gAreaRoomMap_TreeInteriors_2_0.bin" -gAreaRoomMap_TreeInteriors_2_1:: - .incbin "assets/gAreaRoomMap_TreeInteriors_2_1.bin" - .align 2 -gAreaRoomMap_TreeInteriors_3_0:: - .incbin "assets/gAreaRoomMap_TreeInteriors_3_0.bin" -gAreaRoomMap_TreeInteriors_3_1:: - .incbin "assets/gAreaRoomMap_TreeInteriors_3_1.bin" -gAreaRoomMap_TreeInteriors_4_0:: - .incbin "assets/gAreaRoomMap_TreeInteriors_4_0.bin" -gAreaRoomMap_TreeInteriors_4_1:: - .incbin "assets/gAreaRoomMap_TreeInteriors_4_1.bin" -gAreaRoomMap_TreeInteriors_5_0:: - .incbin "assets/gAreaRoomMap_TreeInteriors_5_0.bin" -gAreaRoomMap_TreeInteriors_5_1:: - .incbin "assets/gAreaRoomMap_TreeInteriors_5_1.bin" -gAreaRoomMap_TreeInteriors_6_0:: - .incbin "assets/gAreaRoomMap_TreeInteriors_6_0.bin" -gAreaRoomMap_TreeInteriors_6_1:: - .incbin "assets/gAreaRoomMap_TreeInteriors_6_1.bin" -gAreaRoomMap_TreeInteriors_7_0:: - .incbin "assets/gAreaRoomMap_TreeInteriors_7_0.bin" -gAreaRoomMap_TreeInteriors_7_1:: - .incbin "assets/gAreaRoomMap_TreeInteriors_7_1.bin" -gAreaRoomMap_TreeInteriors_8_0:: - .incbin "assets/gAreaRoomMap_TreeInteriors_8_0.bin" -gAreaRoomMap_TreeInteriors_8_1:: - .incbin "assets/gAreaRoomMap_TreeInteriors_8_1.bin" -gAreaRoomMap_TreeInteriors_9_0:: - .incbin "assets/gAreaRoomMap_TreeInteriors_9_0.bin" -gAreaRoomMap_TreeInteriors_9_1:: - .incbin "assets/gAreaRoomMap_TreeInteriors_9_1.bin" -gAreaRoomMap_TreeInteriors_10_0:: - .incbin "assets/gAreaRoomMap_TreeInteriors_10_0.bin" -gAreaRoomMap_TreeInteriors_10_1:: - .incbin "assets/gAreaRoomMap_TreeInteriors_10_1.bin" -gAreaRoomMap_TreeInteriors_11_0:: - .incbin "assets/gAreaRoomMap_TreeInteriors_11_0.bin" -gAreaRoomMap_TreeInteriors_11_1:: - .incbin "assets/gAreaRoomMap_TreeInteriors_11_1.bin" - .align 2 -gAreaRoomMap_TreeInteriors_12_0:: - .incbin "assets/gAreaRoomMap_TreeInteriors_12_0.bin" -gAreaRoomMap_TreeInteriors_12_1:: - .incbin "assets/gAreaRoomMap_TreeInteriors_12_1.bin" - .align 2 -gAreaRoomMap_TreeInteriors_13_0:: - .incbin "assets/gAreaRoomMap_TreeInteriors_13_0.bin" -gAreaRoomMap_TreeInteriors_13_1:: - .incbin "assets/gAreaRoomMap_TreeInteriors_13_1.bin" - .align 2 -gAreaRoomMap_TreeInteriors_14_0:: - .incbin "assets/gAreaRoomMap_TreeInteriors_14_0.bin" -gAreaRoomMap_TreeInteriors_14_1:: - .incbin "assets/gAreaRoomMap_TreeInteriors_14_1.bin" - .align 2 -gAreaRoomMap_TreeInteriors_15_0:: - .incbin "assets/gAreaRoomMap_TreeInteriors_15_0.bin" -gAreaRoomMap_TreeInteriors_15_1:: - .incbin "assets/gAreaRoomMap_TreeInteriors_15_1.bin" -gAreaRoomMap_TreeInteriors_16_0:: - .incbin "assets/gAreaRoomMap_TreeInteriors_16_0.bin" -gAreaRoomMap_TreeInteriors_16_1:: - .incbin "assets/gAreaRoomMap_TreeInteriors_16_1.bin" -gAreaRoomMap_MinishCracks_0_0:: - .incbin "assets/gAreaRoomMap_MinishCracks_0_0.bin" -gAreaRoomMap_MinishCracks_0_1:: - .incbin "assets/gAreaRoomMap_MinishCracks_0_1.bin" - .align 2 -gAreaRoomMap_MinishCracks_1_0:: - .incbin "assets/gAreaRoomMap_MinishCracks_1_0.bin" -gAreaRoomMap_MinishCracks_1_1:: - .incbin "assets/gAreaRoomMap_MinishCracks_1_1.bin" - .align 2 -gAreaRoomMap_MinishCracks_2_0:: - .incbin "assets/gAreaRoomMap_MinishCracks_2_0.bin" -gAreaRoomMap_MinishCracks_2_1:: - .incbin "assets/gAreaRoomMap_MinishCracks_2_1.bin" - .align 2 -gAreaRoomMap_MinishCracks_3_0:: - .incbin "assets/gAreaRoomMap_MinishCracks_3_0.bin" -gAreaRoomMap_MinishCracks_3_1:: - .incbin "assets/gAreaRoomMap_MinishCracks_3_1.bin" - .align 2 -gAreaRoomMap_MinishCracks_4_0:: - .incbin "assets/gAreaRoomMap_MinishCracks_4_0.bin" -gAreaRoomMap_MinishCracks_4_1:: - .incbin "assets/gAreaRoomMap_MinishCracks_4_1.bin" -gAreaRoomMap_MinishCracks_5_0:: - .incbin "assets/gAreaRoomMap_MinishCracks_5_0.bin" - .align 2 -gAreaRoomMap_MinishCracks_5_1:: - .incbin "assets/gAreaRoomMap_MinishCracks_5_1.bin" -gAreaRoomMap_MinishCracks_6_0:: - .incbin "assets/gAreaRoomMap_MinishCracks_6_0.bin" -gAreaRoomMap_MinishCracks_6_1:: - .incbin "assets/gAreaRoomMap_MinishCracks_6_1.bin" - .align 2 -gAreaRoomMap_MinishCracks_7_0:: - .incbin "assets/gAreaRoomMap_MinishCracks_7_0.bin" -gAreaRoomMap_MinishCracks_7_1:: - .incbin "assets/gAreaRoomMap_MinishCracks_7_1.bin" - .align 2 -gAreaRoomMap_MinishCracks_8_0:: - .incbin "assets/gAreaRoomMap_MinishCracks_8_0.bin" -gAreaRoomMap_MinishCracks_8_1:: - .incbin "assets/gAreaRoomMap_MinishCracks_8_1.bin" - .align 2 -gAreaRoomMap_MinishCracks_9_0:: - .incbin "assets/gAreaRoomMap_MinishCracks_9_0.bin" -gAreaRoomMap_MinishCracks_9_1:: - .incbin "assets/gAreaRoomMap_MinishCracks_9_1.bin" - .align 2 -gAreaRoomMap_MinishCracks_10_0:: - .incbin "assets/gAreaRoomMap_MinishCracks_10_0.bin" -gAreaRoomMap_MinishCracks_10_1:: - .incbin "assets/gAreaRoomMap_MinishCracks_10_1.bin" - .align 2 -gAreaRoomMap_MinishCracks_11_0:: - .incbin "assets/gAreaRoomMap_MinishCracks_11_0.bin" -gAreaRoomMap_MinishCracks_11_1:: - .incbin "assets/gAreaRoomMap_MinishCracks_11_1.bin" - .align 2 -gAreaRoomMap_MinishCracks_12_0:: - .incbin "assets/gAreaRoomMap_MinishCracks_12_0.bin" -gAreaRoomMap_MinishCracks_12_1:: - .incbin "assets/gAreaRoomMap_MinishCracks_12_1.bin" - .align 2 -gAreaRoomMap_MinishCracks_13_0:: - .incbin "assets/gAreaRoomMap_MinishCracks_13_0.bin" -gAreaRoomMap_MinishCracks_13_1:: - .incbin "assets/gAreaRoomMap_MinishCracks_13_1.bin" - .align 2 -gAreaRoomMap_MinishCracks_14_0:: - .incbin "assets/gAreaRoomMap_MinishCracks_14_0.bin" - .align 2 -gAreaRoomMap_MinishCracks_14_1:: - .incbin "assets/gAreaRoomMap_MinishCracks_14_1.bin" -gAreaRoomMap_MinishCracks_15_0:: - .incbin "assets/gAreaRoomMap_MinishCracks_15_0.bin" - .align 2 -gAreaRoomMap_MinishCracks_15_1:: - .incbin "assets/gAreaRoomMap_MinishCracks_15_1.bin" -gAreaRoomMap_MinishCracks_16_0:: - .incbin "assets/gAreaRoomMap_MinishCracks_16_0.bin" - .align 2 -gAreaRoomMap_MinishCracks_16_1:: - .incbin "assets/gAreaRoomMap_MinishCracks_16_1.bin" - .align 2 -gAreaRoomMap_MinishCracks_17_0:: - .incbin "assets/gAreaRoomMap_MinishCracks_17_0.bin" - .align 2 -gAreaRoomMap_MinishCracks_17_1:: - .incbin "assets/gAreaRoomMap_MinishCracks_17_1.bin" -gAreaRoomMap_MinishRafters_0_0:: - .incbin "assets/gAreaRoomMap_MinishRafters_0_0.bin" - .align 2 -gAreaRoomMap_MinishRafters_1_0:: - .incbin "assets/gAreaRoomMap_MinishRafters_1_0.bin" - .align 2 -gAreaRoomMap_MinishRafters_2_0:: - .incbin "assets/gAreaRoomMap_MinishRafters_2_0.bin" -gAreaRoomMap_MinishRafters_3_0:: - .incbin "assets/gAreaRoomMap_MinishRafters_3_0.bin" - .align 2 -gAreaRoomMap_EzloCutscene_0_0:: - .incbin "assets/gAreaRoomMap_EzloCutscene_0_0.bin" - .align 2 -gAreaRoomMap_EzloCutscene_0_1:: - .incbin "assets/gAreaRoomMap_EzloCutscene_0_1.bin" -gAreaRoomMap_WindTribeTower_0_0:: - .incbin "assets/gAreaRoomMap_WindTribeTower_0_0.bin" -gAreaRoomMap_WindTribeTower_0_1:: - .incbin "assets/gAreaRoomMap_WindTribeTower_0_1.bin" - .align 2 -gAreaRoomMap_WindTribeTower_1_0:: - .incbin "assets/gAreaRoomMap_WindTribeTower_1_0.bin" - .align 2 -gAreaRoomMap_WindTribeTower_1_1:: - .incbin "assets/gAreaRoomMap_WindTribeTower_1_1.bin" - .align 2 -gAreaRoomMap_WindTribeTower_2_0:: - .incbin "assets/gAreaRoomMap_WindTribeTower_2_0.bin" - .align 2 -gAreaRoomMap_WindTribeTower_2_1:: - .incbin "assets/gAreaRoomMap_WindTribeTower_2_1.bin" - .align 2 -gAreaRoomMap_WindTribeTower_3_0:: - .incbin "assets/gAreaRoomMap_WindTribeTower_3_0.bin" - .align 2 -gAreaRoomMap_WindTribeTower_3_1:: - .incbin "assets/gAreaRoomMap_WindTribeTower_3_1.bin" - .align 2 -gAreaRoomMap_WindTribeTowerRoof_0_0:: - .incbin "assets/gAreaRoomMap_WindTribeTowerRoof_0_0.bin" - .align 2 -gAreaRoomMap_WindTribeTowerRoof_0_1:: - .incbin "assets/gAreaRoomMap_WindTribeTowerRoof_0_1.bin" -gAreaRoomMap_MinishHouseInteriors_0_2:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_0_2.bin" - .align 2 -gAreaRoomMap_MinishHouseInteriors_0_1:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_0_1.bin" - .align 2 -gAreaRoomMap_MinishHouseInteriors_1_2:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_1_2.bin" -gAreaTileset_MinishHouseInteriors_0_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_0_0.8bpp.lz" - .align 2 -gAreaRoomMap_MinishHouseInteriors_1_1:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_1_1.bin" - .align 2 -gAreaRoomMap_MinishHouseInteriors_2_2:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_2_2.bin" -gAreaTileset_MinishHouseInteriors_1_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_1_0.8bpp.lz" -gAreaRoomMap_MinishHouseInteriors_2_1:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_2_1.bin" -gAreaRoomMap_MinishHouseInteriors_3_2:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_3_2.bin" - .align 2 -gAreaTileset_MinishHouseInteriors_2_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_2_0.8bpp.lz" -gAreaRoomMap_MinishHouseInteriors_3_1:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_3_1.bin" - .align 2 -gAreaRoomMap_MinishHouseInteriors_4_2:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_4_2.bin" - .align 2 -gAreaTileset_MinishHouseInteriors_3_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_3_0.8bpp.lz" -gAreaRoomMap_MinishHouseInteriors_4_1:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_4_1.bin" -gAreaRoomMap_MinishHouseInteriors_5_2:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_5_2.bin" -gAreaTileset_MinishHouseInteriors_4_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_4_0.8bpp.lz" - .align 2 -gAreaRoomMap_MinishHouseInteriors_5_1:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_5_1.bin" - .align 2 -gAreaRoomMap_MinishHouseInteriors_6_2:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_6_2.bin" - .align 2 -gAreaTileset_MinishHouseInteriors_5_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_5_0.8bpp.lz" -gAreaRoomMap_MinishHouseInteriors_6_1:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_6_1.bin" -gAreaRoomMap_MinishHouseInteriors_7_2:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_7_2.bin" -gAreaTileset_MinishHouseInteriors_6_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_6_0.8bpp.lz" - .align 2 -gAreaRoomMap_MinishHouseInteriors_7_1:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_7_1.bin" -gAreaRoomMap_MinishHouseInteriors_8_2:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_8_2.bin" - .align 2 -gAreaTileset_MinishHouseInteriors_7_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_7_0.8bpp.lz" - .align 2 -gAreaRoomMap_MinishHouseInteriors_8_1:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_8_1.bin" - .align 2 -gAreaRoomMap_MinishHouseInteriors_9_2:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_9_2.bin" - .align 2 -gAreaTileset_MinishHouseInteriors_8_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_8_0.8bpp.lz" - .align 2 -gAreaRoomMap_MinishHouseInteriors_9_1:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_9_1.bin" - .align 2 -gAreaRoomMap_MinishHouseInteriors_10_2:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_10_2.bin" - .align 2 -gAreaTileset_MinishHouseInteriors_9_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_9_0.8bpp.lz" - .align 2 -gAreaRoomMap_MinishHouseInteriors_10_1:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_10_1.bin" - .align 2 -gAreaRoomMap_MinishHouseInteriors_11_2:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_11_2.bin" - .align 2 -gAreaTileset_MinishHouseInteriors_10_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_10_0.8bpp.lz" - .align 2 -gAreaRoomMap_MinishHouseInteriors_11_1:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_11_1.bin" -gAreaRoomMap_MinishHouseInteriors_12_2:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_12_2.bin" - .align 2 -gAreaTileset_MinishHouseInteriors_11_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_11_0.8bpp.lz" - .align 2 -gAreaRoomMap_MinishHouseInteriors_12_1:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_12_1.bin" - .align 2 +gAreaRoomMap_HouseInteriors2_Stranger_bottom:: + .incbin "maps/areas/034_HouseInteriors2/rooms/00_Stranger/gAreaRoomMap_HouseInteriors2_Stranger_bottom.bin.lz" +gAreaRoomMap_HouseInteriors2_Stranger_top:: + .incbin "maps/areas/034_HouseInteriors2/rooms/00_Stranger/gAreaRoomMap_HouseInteriors2_Stranger_top.bin.lz" +gAreaRoomMap_HouseInteriors2_WestOracle_bottom:: + .incbin "maps/areas/034_HouseInteriors2/rooms/01_WestOracle/gAreaRoomMap_HouseInteriors2_WestOracle_bottom.bin.lz" +gAreaRoomMap_HouseInteriors2_WestOracle_top:: + .incbin "maps/areas/034_HouseInteriors2/rooms/01_WestOracle/gAreaRoomMap_HouseInteriors2_WestOracle_top.bin.lz" +gAreaRoomMap_HouseInteriors2_2_bottom:: + .incbin "maps/areas/034_HouseInteriors2/rooms/02_2/gAreaRoomMap_HouseInteriors2_2_bottom.bin.lz" +gAreaRoomMap_HouseInteriors2_2_top:: + .incbin "maps/areas/034_HouseInteriors2/rooms/02_2/gAreaRoomMap_HouseInteriors2_2_top.bin.lz" +gAreaRoomMap_HouseInteriors2_3_bottom:: + .incbin "maps/areas/034_HouseInteriors2/rooms/03_3/gAreaRoomMap_HouseInteriors2_3_bottom.bin.lz" +gAreaRoomMap_HouseInteriors2_3_top:: + .incbin "maps/areas/034_HouseInteriors2/rooms/03_3/gAreaRoomMap_HouseInteriors2_3_top.bin.lz" +gAreaRoomMap_HouseInteriors2_DrLeft_bottom:: + .incbin "maps/areas/034_HouseInteriors2/rooms/04_DrLeft/gAreaRoomMap_HouseInteriors2_DrLeft_bottom.bin.lz" +gAreaRoomMap_HouseInteriors2_DrLeft_top:: + .incbin "maps/areas/034_HouseInteriors2/rooms/04_DrLeft/gAreaRoomMap_HouseInteriors2_DrLeft_top.bin.lz" +gAreaRoomMap_HouseInteriors2_5_bottom:: + .incbin "maps/areas/034_HouseInteriors2/rooms/05_5/gAreaRoomMap_HouseInteriors2_5_bottom.bin.lz" +gAreaRoomMap_HouseInteriors2_5_top:: + .incbin "maps/areas/034_HouseInteriors2/rooms/05_5/gAreaRoomMap_HouseInteriors2_5_top.bin.lz" +gAreaRoomMap_HouseInteriors2_Romio_bottom:: + .incbin "maps/areas/034_HouseInteriors2/rooms/06_Romio/gAreaRoomMap_HouseInteriors2_Romio_bottom.bin.lz" +gAreaRoomMap_HouseInteriors2_Romio_top:: + .incbin "maps/areas/034_HouseInteriors2/rooms/06_Romio/gAreaRoomMap_HouseInteriors2_Romio_top.bin.lz" +gAreaRoomMap_HouseInteriors2_Julietta_bottom:: + .incbin "maps/areas/034_HouseInteriors2/rooms/07_Julietta/gAreaRoomMap_HouseInteriors2_Julietta_bottom.bin.lz" +gAreaRoomMap_HouseInteriors2_Julietta_top:: + .incbin "maps/areas/034_HouseInteriors2/rooms/07_Julietta/gAreaRoomMap_HouseInteriors2_Julietta_top.bin.lz" +gAreaRoomMap_HouseInteriors2_Percy_bottom:: + .incbin "maps/areas/034_HouseInteriors2/rooms/08_Percy/gAreaRoomMap_HouseInteriors2_Percy_bottom.bin.lz" +gAreaRoomMap_HouseInteriors2_Percy_top:: + .incbin "maps/areas/034_HouseInteriors2/rooms/08_Percy/gAreaRoomMap_HouseInteriors2_Percy_top.bin.lz" +gAreaRoomMap_HouseInteriors2_EastOracle_bottom:: + .incbin "maps/areas/034_HouseInteriors2/rooms/09_EastOracle/gAreaRoomMap_HouseInteriors2_EastOracle_bottom.bin.lz" +gAreaRoomMap_HouseInteriors2_EastOracle_top:: + .incbin "maps/areas/034_HouseInteriors2/rooms/09_EastOracle/gAreaRoomMap_HouseInteriors2_EastOracle_top.bin.lz" +gAreaRoomMap_HouseInteriors2_A_bottom:: + .incbin "maps/areas/034_HouseInteriors2/rooms/10_A/gAreaRoomMap_HouseInteriors2_A_bottom.bin.lz" +gAreaRoomMap_HouseInteriors2_A_top:: + .incbin "maps/areas/034_HouseInteriors2/rooms/10_A/gAreaRoomMap_HouseInteriors2_A_top.bin.lz" +gAreaRoomMap_HouseInteriors2_B_bottom:: + .incbin "maps/areas/034_HouseInteriors2/rooms/11_B/gAreaRoomMap_HouseInteriors2_B_bottom.bin.lz" +gAreaRoomMap_HouseInteriors2_B_top:: + .incbin "maps/areas/034_HouseInteriors2/rooms/11_B/gAreaRoomMap_HouseInteriors2_B_top.bin.lz" +gAreaRoomMap_HouseInteriors2_Cucco_bottom:: + .incbin "maps/areas/034_HouseInteriors2/rooms/12_Cucco/gAreaRoomMap_HouseInteriors2_Cucco_bottom.bin.lz" +gAreaRoomMap_HouseInteriors2_Cucco_top:: + .incbin "maps/areas/034_HouseInteriors2/rooms/12_Cucco/gAreaRoomMap_HouseInteriors2_Cucco_top.bin.lz" +gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_bottom:: + .incbin "maps/areas/034_HouseInteriors2/rooms/16_LinksHouseEntrance/gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_bottom.bin.lz" +gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_top:: + .incbin "maps/areas/034_HouseInteriors2/rooms/16_LinksHouseEntrance/gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_top.bin.lz" +gAreaRoomMap_HouseInteriors2_LinksHouseSmith_bottom:: + .incbin "maps/areas/034_HouseInteriors2/rooms/17_LinksHouseSmith/gAreaRoomMap_HouseInteriors2_LinksHouseSmith_bottom.bin.lz" +gAreaRoomMap_HouseInteriors2_LinksHouseSmith_top:: + .incbin "maps/areas/034_HouseInteriors2/rooms/17_LinksHouseSmith/gAreaRoomMap_HouseInteriors2_LinksHouseSmith_top.bin.lz" +gAreaRoomMap_HouseInteriors2_Dampe_bottom:: + .incbin "maps/areas/034_HouseInteriors2/rooms/18_Dampe/gAreaRoomMap_HouseInteriors2_Dampe_bottom.bin.lz" +gAreaRoomMap_HouseInteriors2_Dampe_top:: + .incbin "maps/areas/034_HouseInteriors2/rooms/18_Dampe/gAreaRoomMap_HouseInteriors2_Dampe_top.bin.lz" +gAreaRoomMap_HouseInteriors2_13_bottom:: + .incbin "maps/areas/034_HouseInteriors2/rooms/19_13/gAreaRoomMap_HouseInteriors2_13_bottom.bin.lz" +gAreaRoomMap_HouseInteriors2_13_top:: + .incbin "maps/areas/034_HouseInteriors2/rooms/19_13/gAreaRoomMap_HouseInteriors2_13_top.bin.lz" +gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_bottom:: + .incbin "maps/areas/034_HouseInteriors2/rooms/20_StockwellLakeHouse/gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_bottom.bin.lz" +gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_top:: + .incbin "maps/areas/034_HouseInteriors2/rooms/20_StockwellLakeHouse/gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_top.bin.lz" +gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_bottom:: + .incbin "maps/areas/034_HouseInteriors2/rooms/21_LinksHouseBedroom/gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_bottom.bin.lz" +gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_top:: + .incbin "maps/areas/034_HouseInteriors2/rooms/21_LinksHouseBedroom/gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_top.bin.lz" +gAreaRoomMap_HouseInteriors4_Carpenter_bottom:: + .incbin "maps/areas/040_HouseInteriors4/rooms/00_Carpenter/gAreaRoomMap_HouseInteriors4_Carpenter_bottom.bin.lz" +gAreaRoomMap_HouseInteriors4_Carpenter_top:: + .incbin "maps/areas/040_HouseInteriors4/rooms/00_Carpenter/gAreaRoomMap_HouseInteriors4_Carpenter_top.bin.lz" +gAreaRoomMap_HouseInteriors4_Swiftblade_bottom:: + .incbin "maps/areas/040_HouseInteriors4/rooms/01_Swiftblade/gAreaRoomMap_HouseInteriors4_Swiftblade_bottom.bin.lz" +gAreaRoomMap_HouseInteriors4_Swiftblade_top:: + .incbin "maps/areas/040_HouseInteriors4/rooms/01_Swiftblade/gAreaRoomMap_HouseInteriors4_Swiftblade_top.bin.lz" +gAreaRoomMap_HouseInteriors4_RanchHouseWest_bottom:: + .incbin "maps/areas/040_HouseInteriors4/rooms/02_RanchHouseWest/gAreaRoomMap_HouseInteriors4_RanchHouseWest_bottom.bin.lz" +gAreaRoomMap_HouseInteriors4_RanchHouseWest_top:: + .incbin "maps/areas/040_HouseInteriors4/rooms/02_RanchHouseWest/gAreaRoomMap_HouseInteriors4_RanchHouseWest_top.bin.lz" +gAreaRoomMap_HouseInteriors4_RanchHouseEast_bottom:: + .incbin "maps/areas/040_HouseInteriors4/rooms/03_RanchHouseEast/gAreaRoomMap_HouseInteriors4_RanchHouseEast_bottom.bin.lz" +gAreaRoomMap_HouseInteriors4_RanchHouseEast_top:: + .incbin "maps/areas/040_HouseInteriors4/rooms/03_RanchHouseEast/gAreaRoomMap_HouseInteriors4_RanchHouseEast_top.bin.lz" +gAreaRoomMap_HouseInteriors4_FarmHouse_bottom:: + .incbin "maps/areas/040_HouseInteriors4/rooms/04_FarmHouse/gAreaRoomMap_HouseInteriors4_FarmHouse_bottom.bin.lz" +gAreaRoomMap_HouseInteriors4_FarmHouse_top:: + .incbin "maps/areas/040_HouseInteriors4/rooms/04_FarmHouse/gAreaRoomMap_HouseInteriors4_FarmHouse_top.bin.lz" +gAreaRoomMap_HouseInteriors4_MayorLakeCabin_bottom:: + .incbin "maps/areas/040_HouseInteriors4/rooms/05_MayorLakeCabin/gAreaRoomMap_HouseInteriors4_MayorLakeCabin_bottom.bin.lz" +gAreaRoomMap_HouseInteriors4_MayorLakeCabin_top:: + .incbin "maps/areas/040_HouseInteriors4/rooms/05_MayorLakeCabin/gAreaRoomMap_HouseInteriors4_MayorLakeCabin_top.bin.lz" +gAreaRoomMap_HouseInteriors3_StockwellShop_bottom:: + .incbin "maps/areas/035_HouseInteriors3/rooms/00_StockwellShop/gAreaRoomMap_HouseInteriors3_StockwellShop_bottom.bin.lz" +gAreaRoomMap_HouseInteriors3_StockwellShop_top:: + .incbin "maps/areas/035_HouseInteriors3/rooms/00_StockwellShop/gAreaRoomMap_HouseInteriors3_StockwellShop_top.bin.lz" +gAreaRoomMap_HouseInteriors3_Cafe_bottom:: + .incbin "maps/areas/035_HouseInteriors3/rooms/01_Cafe/gAreaRoomMap_HouseInteriors3_Cafe_bottom.bin.lz" +gAreaRoomMap_HouseInteriors3_Cafe_top:: + .incbin "maps/areas/035_HouseInteriors3/rooms/01_Cafe/gAreaRoomMap_HouseInteriors3_Cafe_top.bin.lz" +gAreaRoomMap_HouseInteriors3_RemShoeShop_bottom:: + .incbin "maps/areas/035_HouseInteriors3/rooms/02_RemShoeShop/gAreaRoomMap_HouseInteriors3_RemShoeShop_bottom.bin.lz" +gAreaRoomMap_HouseInteriors3_RemShoeShop_top:: + .incbin "maps/areas/035_HouseInteriors3/rooms/02_RemShoeShop/gAreaRoomMap_HouseInteriors3_RemShoeShop_top.bin.lz" +gAreaRoomMap_HouseInteriors3_Bakery_bottom:: + .incbin "maps/areas/035_HouseInteriors3/rooms/03_Bakery/gAreaRoomMap_HouseInteriors3_Bakery_bottom.bin.lz" +gAreaRoomMap_HouseInteriors3_Bakery_top:: + .incbin "maps/areas/035_HouseInteriors3/rooms/03_Bakery/gAreaRoomMap_HouseInteriors3_Bakery_top.bin.lz" +gAreaRoomMap_HouseInteriors3_Simon_bottom:: + .incbin "maps/areas/035_HouseInteriors3/rooms/04_Simon/gAreaRoomMap_HouseInteriors3_Simon_bottom.bin.lz" +gAreaRoomMap_HouseInteriors3_Simon_top:: + .incbin "maps/areas/035_HouseInteriors3/rooms/04_Simon/gAreaRoomMap_HouseInteriors3_Simon_top.bin.lz" +gAreaRoomMap_HouseInteriors3_FigurineHouse_bottom:: + .incbin "maps/areas/035_HouseInteriors3/rooms/05_FigurineHouse/gAreaRoomMap_HouseInteriors3_FigurineHouse_bottom.bin.lz" +gAreaRoomMap_HouseInteriors3_FigurineHouse_top:: + .incbin "maps/areas/035_HouseInteriors3/rooms/05_FigurineHouse/gAreaRoomMap_HouseInteriors3_FigurineHouse_top.bin.lz" +gAreaRoomMap_HouseInteriors3_BorlovEntrance_bottom:: + .incbin "maps/areas/035_HouseInteriors3/rooms/06_BorlovEntrance/gAreaRoomMap_HouseInteriors3_BorlovEntrance_bottom.bin.lz" +gAreaRoomMap_HouseInteriors3_BorlovEntrance_top:: + .incbin "maps/areas/035_HouseInteriors3/rooms/06_BorlovEntrance/gAreaRoomMap_HouseInteriors3_BorlovEntrance_top.bin.lz" +gAreaRoomMap_HouseInteriors3_Carlov_bottom:: + .incbin "maps/areas/035_HouseInteriors3/rooms/07_Carlov/gAreaRoomMap_HouseInteriors3_Carlov_bottom.bin.lz" +gAreaRoomMap_HouseInteriors3_Carlov_top:: + .incbin "maps/areas/035_HouseInteriors3/rooms/07_Carlov/gAreaRoomMap_HouseInteriors3_Carlov_top.bin.lz" +gAreaRoomMap_HouseInteriors3_Borlov_bottom:: + .incbin "maps/areas/035_HouseInteriors3/rooms/08_Borlov/gAreaRoomMap_HouseInteriors3_Borlov_bottom.bin.lz" +gAreaRoomMap_HouseInteriors3_Borlov_top:: + .incbin "maps/areas/035_HouseInteriors3/rooms/08_Borlov/gAreaRoomMap_HouseInteriors3_Borlov_top.bin.lz" +gAreaRoomMap_HouseInteriors1_Mayor_bottom:: + .incbin "maps/areas/033_HouseInteriors1/rooms/00_Mayor/gAreaRoomMap_HouseInteriors1_Mayor_bottom.bin.lz" +gAreaRoomMap_HouseInteriors1_Mayor_top:: + .incbin "maps/areas/033_HouseInteriors1/rooms/00_Mayor/gAreaRoomMap_HouseInteriors1_Mayor_top.bin.lz" +gAreaRoomMap_HouseInteriors1_PostOffice_bottom:: + .incbin "maps/areas/033_HouseInteriors1/rooms/01_PostOffice/gAreaRoomMap_HouseInteriors1_PostOffice_bottom.bin.lz" +gAreaRoomMap_HouseInteriors1_PostOffice_top:: + .incbin "maps/areas/033_HouseInteriors1/rooms/01_PostOffice/gAreaRoomMap_HouseInteriors1_PostOffice_top.bin.lz" +gAreaRoomMap_HouseInteriors1_Library2f_bottom:: + .incbin "maps/areas/033_HouseInteriors1/rooms/02_Library2f/gAreaRoomMap_HouseInteriors1_Library2f_bottom.bin.lz" +gAreaRoomMap_HouseInteriors1_Library2f_top:: + .incbin "maps/areas/033_HouseInteriors1/rooms/02_Library2f/gAreaRoomMap_HouseInteriors1_Library2f_top.bin.lz" +gAreaRoomMap_HouseInteriors1_Library1f_bottom:: + .incbin "maps/areas/033_HouseInteriors1/rooms/03_Library1f/gAreaRoomMap_HouseInteriors1_Library1f_bottom.bin.lz" +gAreaRoomMap_HouseInteriors1_Library1f_top:: + .incbin "maps/areas/033_HouseInteriors1/rooms/03_Library1f/gAreaRoomMap_HouseInteriors1_Library1f_top.bin.lz" +gAreaRoomMap_HouseInteriors1_Inn1f_bottom:: + .incbin "maps/areas/033_HouseInteriors1/rooms/04_Inn1f/gAreaRoomMap_HouseInteriors1_Inn1f_bottom.bin.lz" +gAreaRoomMap_HouseInteriors1_Inn1f_top:: + .incbin "maps/areas/033_HouseInteriors1/rooms/04_Inn1f/gAreaRoomMap_HouseInteriors1_Inn1f_top.bin.lz" +gAreaRoomMap_HouseInteriors1_InnWestRoom_bottom:: + .incbin "maps/areas/033_HouseInteriors1/rooms/05_InnWestRoom/gAreaRoomMap_HouseInteriors1_InnWestRoom_bottom.bin.lz" +gAreaRoomMap_HouseInteriors1_InnWestRoom_top:: + .incbin "maps/areas/033_HouseInteriors1/rooms/05_InnWestRoom/gAreaRoomMap_HouseInteriors1_InnWestRoom_top.bin.lz" +gAreaRoomMap_HouseInteriors1_InnMiddleRoom_bottom:: + .incbin "maps/areas/033_HouseInteriors1/rooms/06_InnMiddleRoom/gAreaRoomMap_HouseInteriors1_InnMiddleRoom_bottom.bin.lz" +gAreaRoomMap_HouseInteriors1_InnMiddleRoom_top:: + .incbin "maps/areas/033_HouseInteriors1/rooms/06_InnMiddleRoom/gAreaRoomMap_HouseInteriors1_InnMiddleRoom_top.bin.lz" +gAreaRoomMap_HouseInteriors1_InnEastRoom_bottom:: + .incbin "maps/areas/033_HouseInteriors1/rooms/07_InnEastRoom/gAreaRoomMap_HouseInteriors1_InnEastRoom_bottom.bin.lz" +gAreaRoomMap_HouseInteriors1_InnEastRoom_top:: + .incbin "maps/areas/033_HouseInteriors1/rooms/07_InnEastRoom/gAreaRoomMap_HouseInteriors1_InnEastRoom_top.bin.lz" +gAreaRoomMap_HouseInteriors1_InnWest2f_bottom:: + .incbin "maps/areas/033_HouseInteriors1/rooms/08_InnWest2f/gAreaRoomMap_HouseInteriors1_InnWest2f_bottom.bin.lz" +gAreaRoomMap_HouseInteriors1_InnWest2f_top:: + .incbin "maps/areas/033_HouseInteriors1/rooms/08_InnWest2f/gAreaRoomMap_HouseInteriors1_InnWest2f_top.bin.lz" +gAreaRoomMap_HouseInteriors1_InnEast2f_bottom:: + .incbin "maps/areas/033_HouseInteriors1/rooms/09_InnEast2f/gAreaRoomMap_HouseInteriors1_InnEast2f_bottom.bin.lz" +gAreaRoomMap_HouseInteriors1_InnEast2f_top:: + .incbin "maps/areas/033_HouseInteriors1/rooms/09_InnEast2f/gAreaRoomMap_HouseInteriors1_InnEast2f_top.bin.lz" +gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_bottom:: + .incbin "maps/areas/033_HouseInteriors1/rooms/10_InnMinishHeartPiece/gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_bottom.bin.lz" +gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_top:: + .incbin "maps/areas/033_HouseInteriors1/rooms/10_InnMinishHeartPiece/gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_top.bin.lz" +gAreaRoomMap_HouseInteriors1_SchoolWest_bottom:: + .incbin "maps/areas/033_HouseInteriors1/rooms/11_SchoolWest/gAreaRoomMap_HouseInteriors1_SchoolWest_bottom.bin.lz" +gAreaRoomMap_HouseInteriors1_SchoolWest_top:: + .incbin "maps/areas/033_HouseInteriors1/rooms/11_SchoolWest/gAreaRoomMap_HouseInteriors1_SchoolWest_top.bin.lz" +gAreaRoomMap_HouseInteriors1_SchoolEast_bottom:: + .incbin "maps/areas/033_HouseInteriors1/rooms/12_SchoolEast/gAreaRoomMap_HouseInteriors1_SchoolEast_bottom.bin.lz" +gAreaRoomMap_HouseInteriors1_SchoolEast_top:: + .incbin "maps/areas/033_HouseInteriors1/rooms/12_SchoolEast/gAreaRoomMap_HouseInteriors1_SchoolEast_top.bin.lz" +gAreaRoomMap_Dojos_Grayblade_bottom:: + .incbin "maps/areas/037_Dojos/rooms/00_Grayblade/gAreaRoomMap_Dojos_Grayblade_bottom.bin.lz" +gAreaRoomMap_Dojos_Grayblade_top:: + .incbin "maps/areas/037_Dojos/rooms/00_Grayblade/gAreaRoomMap_Dojos_Grayblade_top.bin.lz" +gAreaRoomMap_Dojos_Splitblade_bottom:: + .incbin "maps/areas/037_Dojos/rooms/01_Splitblade/gAreaRoomMap_Dojos_Splitblade_bottom.bin.lz" +gAreaRoomMap_Dojos_Splitblade_top:: + .incbin "maps/areas/037_Dojos/rooms/01_Splitblade/gAreaRoomMap_Dojos_Splitblade_top.bin.lz" +gAreaRoomMap_Dojos_Greatblade_bottom:: + .incbin "maps/areas/037_Dojos/rooms/02_Greatblade/gAreaRoomMap_Dojos_Greatblade_bottom.bin.lz" +gAreaRoomMap_Dojos_Greatblade_top:: + .incbin "maps/areas/037_Dojos/rooms/02_Greatblade/gAreaRoomMap_Dojos_Greatblade_top.bin.lz" +gAreaRoomMap_Dojos_Scarblade_bottom:: + .incbin "maps/areas/037_Dojos/rooms/03_Scarblade/gAreaRoomMap_Dojos_Scarblade_bottom.bin.lz" +gAreaRoomMap_Dojos_Scarblade_top:: + .incbin "maps/areas/037_Dojos/rooms/03_Scarblade/gAreaRoomMap_Dojos_Scarblade_top.bin.lz" +gAreaRoomMap_Dojos_SwiftbladeI_bottom:: + .incbin "maps/areas/037_Dojos/rooms/04_SwiftbladeI/gAreaRoomMap_Dojos_SwiftbladeI_bottom.bin.lz" +gAreaRoomMap_Dojos_SwiftbladeI_top:: + .incbin "maps/areas/037_Dojos/rooms/04_SwiftbladeI/gAreaRoomMap_Dojos_SwiftbladeI_top.bin.lz" +gAreaRoomMap_Dojos_Grimblade_bottom:: + .incbin "maps/areas/037_Dojos/rooms/05_Grimblade/gAreaRoomMap_Dojos_Grimblade_bottom.bin.lz" +gAreaRoomMap_Dojos_Grimblade_top:: + .incbin "maps/areas/037_Dojos/rooms/05_Grimblade/gAreaRoomMap_Dojos_Grimblade_top.bin.lz" +gAreaRoomMap_Dojos_Waveblade_bottom:: + .incbin "maps/areas/037_Dojos/rooms/06_Waveblade/gAreaRoomMap_Dojos_Waveblade_bottom.bin.lz" +gAreaRoomMap_Dojos_Waveblade_top:: + .incbin "maps/areas/037_Dojos/rooms/06_Waveblade/gAreaRoomMap_Dojos_Waveblade_top.bin.lz" +gAreaRoomMap_Dojos_7_bottom:: + .incbin "maps/areas/037_Dojos/rooms/07_7/gAreaRoomMap_Dojos_7_bottom.bin.lz" +gAreaRoomMap_Dojos_7_top:: + .incbin "maps/areas/037_Dojos/rooms/07_7/gAreaRoomMap_Dojos_7_top.bin.lz" +gAreaRoomMap_Dojos_8_bottom:: + .incbin "maps/areas/037_Dojos/rooms/08_8/gAreaRoomMap_Dojos_8_bottom.bin.lz" +gAreaRoomMap_Dojos_8_top:: + .incbin "maps/areas/037_Dojos/rooms/08_8/gAreaRoomMap_Dojos_8_top.bin.lz" +gAreaRoomMap_Dojos_9_bottom:: + .incbin "maps/areas/037_Dojos/rooms/09_9/gAreaRoomMap_Dojos_9_bottom.bin.lz" +gAreaRoomMap_Dojos_9_top:: + .incbin "maps/areas/037_Dojos/rooms/09_9/gAreaRoomMap_Dojos_9_top.bin.lz" +gAreaRoomMap_Dojos_ToGrimblade_bottom:: + .incbin "maps/areas/037_Dojos/rooms/10_ToGrimblade/gAreaRoomMap_Dojos_ToGrimblade_bottom.bin.lz" +gAreaRoomMap_Dojos_ToGrimblade_top:: + .incbin "maps/areas/037_Dojos/rooms/10_ToGrimblade/gAreaRoomMap_Dojos_ToGrimblade_top.bin.lz" +gAreaRoomMap_Dojos_ToSplitblade_bottom:: + .incbin "maps/areas/037_Dojos/rooms/11_ToSplitblade/gAreaRoomMap_Dojos_ToSplitblade_bottom.bin.lz" +gAreaRoomMap_Dojos_ToSplitblade_top:: + .incbin "maps/areas/037_Dojos/rooms/11_ToSplitblade/gAreaRoomMap_Dojos_ToSplitblade_top.bin.lz" +gAreaRoomMap_Dojos_ToGreatblade_bottom:: + .incbin "maps/areas/037_Dojos/rooms/12_ToGreatblade/gAreaRoomMap_Dojos_ToGreatblade_bottom.bin.lz" +gAreaRoomMap_Dojos_ToGreatblade_top:: + .incbin "maps/areas/037_Dojos/rooms/12_ToGreatblade/gAreaRoomMap_Dojos_ToGreatblade_top.bin.lz" +gAreaRoomMap_Dojos_ToScarblade_bottom:: + .incbin "maps/areas/037_Dojos/rooms/13_ToScarblade/gAreaRoomMap_Dojos_ToScarblade_bottom.bin.lz" +gAreaRoomMap_Dojos_ToScarblade_top:: + .incbin "maps/areas/037_Dojos/rooms/13_ToScarblade/gAreaRoomMap_Dojos_ToScarblade_top.bin.lz" +gAreaRoomMap_TreeInteriors_WitchHut_bottom:: + .incbin "maps/areas/036_TreeInteriors/rooms/00_WitchHut/gAreaRoomMap_TreeInteriors_WitchHut_bottom.bin" +gAreaRoomMap_TreeInteriors_WitchHut_top:: + .incbin "maps/areas/036_TreeInteriors/rooms/00_WitchHut/gAreaRoomMap_TreeInteriors_WitchHut_top.bin.lz" +gAreaRoomMap_TreeInteriors_StairsToCarlov_bottom:: + .incbin "maps/areas/036_TreeInteriors/rooms/16_StairsToCarlov/gAreaRoomMap_TreeInteriors_StairsToCarlov_bottom.bin" +gAreaRoomMap_TreeInteriors_StairsToCarlov_top:: + .incbin "maps/areas/036_TreeInteriors/rooms/16_StairsToCarlov/gAreaRoomMap_TreeInteriors_StairsToCarlov_top.bin.lz" +gAreaRoomMap_TreeInteriors_PercysTreehouse_bottom:: + .incbin "maps/areas/036_TreeInteriors/rooms/17_PercysTreehouse/gAreaRoomMap_TreeInteriors_PercysTreehouse_bottom.bin" +gAreaRoomMap_TreeInteriors_PercysTreehouse_top:: + .incbin "maps/areas/036_TreeInteriors/rooms/17_PercysTreehouse/gAreaRoomMap_TreeInteriors_PercysTreehouse_top.bin.lz" +gAreaRoomMap_TreeInteriors_SouthHyruleFieldHeartPiece_bottom:: + .incbin "maps/areas/036_TreeInteriors/rooms/18_SouthHyruleFieldHeartPiece/gAreaRoomMap_TreeInteriors_SouthHyruleFieldHeartPiece_bottom.bin" +gAreaRoomMap_TreeInteriors_SouthHyruleFieldHeartPiece_top:: + .incbin "maps/areas/036_TreeInteriors/rooms/18_SouthHyruleFieldHeartPiece/gAreaRoomMap_TreeInteriors_SouthHyruleFieldHeartPiece_top.bin.lz" +gAreaRoomMap_TreeInteriors_Waveblade_bottom:: + .incbin "maps/areas/036_TreeInteriors/rooms/19_Waveblade/gAreaRoomMap_TreeInteriors_Waveblade_bottom.bin" +gAreaRoomMap_TreeInteriors_Waveblade_top:: + .incbin "maps/areas/036_TreeInteriors/rooms/19_Waveblade/gAreaRoomMap_TreeInteriors_Waveblade_top.bin.lz" +gAreaRoomMap_TreeInteriors_14_bottom:: + .incbin "maps/areas/036_TreeInteriors/rooms/20_14/gAreaRoomMap_TreeInteriors_14_bottom.bin" +gAreaRoomMap_TreeInteriors_14_top:: + .incbin "maps/areas/036_TreeInteriors/rooms/20_14/gAreaRoomMap_TreeInteriors_14_top.bin.lz" +gAreaRoomMap_TreeInteriors_BoomerangNorthwest_bottom:: + .incbin "maps/areas/036_TreeInteriors/rooms/21_BoomerangNorthwest/gAreaRoomMap_TreeInteriors_BoomerangNorthwest_bottom.bin" +gAreaRoomMap_TreeInteriors_BoomerangNorthwest_top:: + .incbin "maps/areas/036_TreeInteriors/rooms/21_BoomerangNorthwest/gAreaRoomMap_TreeInteriors_BoomerangNorthwest_top.bin.lz" +gAreaRoomMap_TreeInteriors_BoomerangNortheast_bottom:: + .incbin "maps/areas/036_TreeInteriors/rooms/22_BoomerangNortheast/gAreaRoomMap_TreeInteriors_BoomerangNortheast_bottom.bin" +gAreaRoomMap_TreeInteriors_BoomerangNortheast_top:: + .incbin "maps/areas/036_TreeInteriors/rooms/22_BoomerangNortheast/gAreaRoomMap_TreeInteriors_BoomerangNortheast_top.bin.lz" +gAreaRoomMap_TreeInteriors_BoomerangSouthwest_bottom:: + .incbin "maps/areas/036_TreeInteriors/rooms/23_BoomerangSouthwest/gAreaRoomMap_TreeInteriors_BoomerangSouthwest_bottom.bin" +gAreaRoomMap_TreeInteriors_BoomerangSouthwest_top:: + .incbin "maps/areas/036_TreeInteriors/rooms/23_BoomerangSouthwest/gAreaRoomMap_TreeInteriors_BoomerangSouthwest_top.bin.lz" +gAreaRoomMap_TreeInteriors_BoomerangSoutheast_bottom:: + .incbin "maps/areas/036_TreeInteriors/rooms/24_BoomerangSoutheast/gAreaRoomMap_TreeInteriors_BoomerangSoutheast_bottom.bin" +gAreaRoomMap_TreeInteriors_BoomerangSoutheast_top:: + .incbin "maps/areas/036_TreeInteriors/rooms/24_BoomerangSoutheast/gAreaRoomMap_TreeInteriors_BoomerangSoutheast_top.bin.lz" +gAreaRoomMap_TreeInteriors_WesternWoodsHeartPiece_bottom:: + .incbin "maps/areas/036_TreeInteriors/rooms/25_WesternWoodsHeartPiece/gAreaRoomMap_TreeInteriors_WesternWoodsHeartPiece_bottom.bin" +gAreaRoomMap_TreeInteriors_WesternWoodsHeartPiece_top:: + .incbin "maps/areas/036_TreeInteriors/rooms/25_WesternWoodsHeartPiece/gAreaRoomMap_TreeInteriors_WesternWoodsHeartPiece_top.bin.lz" +gAreaRoomMap_TreeInteriors_NorthHyruleFieldFairyFountain_bottom:: + .incbin "maps/areas/036_TreeInteriors/rooms/26_NorthHyruleFieldFairyFountain/gAreaRoomMap_TreeInteriors_NorthHyruleFieldFairyFountain_bottom.bin" +gAreaRoomMap_TreeInteriors_NorthHyruleFieldFairyFountain_top:: + .incbin "maps/areas/036_TreeInteriors/rooms/26_NorthHyruleFieldFairyFountain/gAreaRoomMap_TreeInteriors_NorthHyruleFieldFairyFountain_top.bin.lz" +gAreaRoomMap_TreeInteriors_MinishWoodsGreatFairy_bottom:: + .incbin "maps/areas/036_TreeInteriors/rooms/27_MinishWoodsGreatFairy/gAreaRoomMap_TreeInteriors_MinishWoodsGreatFairy_bottom.bin" +gAreaRoomMap_TreeInteriors_MinishWoodsGreatFairy_top:: + .incbin "maps/areas/036_TreeInteriors/rooms/27_MinishWoodsGreatFairy/gAreaRoomMap_TreeInteriors_MinishWoodsGreatFairy_top.bin.lz" +gAreaRoomMap_TreeInteriors_1c_bottom:: + .incbin "maps/areas/036_TreeInteriors/rooms/28_1c/gAreaRoomMap_TreeInteriors_1c_bottom.bin" +gAreaRoomMap_TreeInteriors_1c_top:: + .incbin "maps/areas/036_TreeInteriors/rooms/28_1c/gAreaRoomMap_TreeInteriors_1c_top.bin.lz" +gAreaRoomMap_TreeInteriors_MinishWoodsBusinessScrub_bottom:: + .incbin "maps/areas/036_TreeInteriors/rooms/29_MinishWoodsBusinessScrub/gAreaRoomMap_TreeInteriors_MinishWoodsBusinessScrub_bottom.bin" +gAreaRoomMap_TreeInteriors_MinishWoodsBusinessScrub_top:: + .incbin "maps/areas/036_TreeInteriors/rooms/29_MinishWoodsBusinessScrub/gAreaRoomMap_TreeInteriors_MinishWoodsBusinessScrub_top.bin.lz" +gAreaRoomMap_TreeInteriors_1e_bottom:: + .incbin "maps/areas/036_TreeInteriors/rooms/30_1e/gAreaRoomMap_TreeInteriors_1e_bottom.bin" +gAreaRoomMap_TreeInteriors_1e_top:: + .incbin "maps/areas/036_TreeInteriors/rooms/30_1e/gAreaRoomMap_TreeInteriors_1e_top.bin.lz" +gAreaRoomMap_TreeInteriors_UnusedHeartContainer_bottom:: + .incbin "maps/areas/036_TreeInteriors/rooms/31_UnusedHeartContainer/gAreaRoomMap_TreeInteriors_UnusedHeartContainer_bottom.bin" +gAreaRoomMap_TreeInteriors_UnusedHeartContainer_top:: + .incbin "maps/areas/036_TreeInteriors/rooms/31_UnusedHeartContainer/gAreaRoomMap_TreeInteriors_UnusedHeartContainer_top.bin.lz" +gAreaRoomMap_MinishCracks_LonLonRanchNorth_bottom:: + .incbin "maps/areas/039_MinishCracks/rooms/00_LonLonRanchNorth/gAreaRoomMap_MinishCracks_LonLonRanchNorth_bottom.bin" +gAreaRoomMap_MinishCracks_LonLonRanchNorth_top:: + .incbin "maps/areas/039_MinishCracks/rooms/00_LonLonRanchNorth/gAreaRoomMap_MinishCracks_LonLonRanchNorth_top.bin.lz" +gAreaRoomMap_MinishCracks_LakeHyliaEast_bottom:: + .incbin "maps/areas/039_MinishCracks/rooms/01_LakeHyliaEast/gAreaRoomMap_MinishCracks_LakeHyliaEast_bottom.bin" +gAreaRoomMap_MinishCracks_LakeHyliaEast_top:: + .incbin "maps/areas/039_MinishCracks/rooms/01_LakeHyliaEast/gAreaRoomMap_MinishCracks_LakeHyliaEast_top.bin.lz" +gAreaRoomMap_MinishCracks_HyruleCastleGarden_bottom:: + .incbin "maps/areas/039_MinishCracks/rooms/02_HyruleCastleGarden/gAreaRoomMap_MinishCracks_HyruleCastleGarden_bottom.bin" +gAreaRoomMap_MinishCracks_HyruleCastleGarden_top:: + .incbin "maps/areas/039_MinishCracks/rooms/02_HyruleCastleGarden/gAreaRoomMap_MinishCracks_HyruleCastleGarden_top.bin.lz" +gAreaRoomMap_MinishCracks_MtCrenel_bottom:: + .incbin "maps/areas/039_MinishCracks/rooms/03_MtCrenel/gAreaRoomMap_MinishCracks_MtCrenel_bottom.bin" +gAreaRoomMap_MinishCracks_MtCrenel_top:: + .incbin "maps/areas/039_MinishCracks/rooms/03_MtCrenel/gAreaRoomMap_MinishCracks_MtCrenel_top.bin.lz" +gAreaRoomMap_MinishCracks_EastHyruleCastle_bottom:: + .incbin "maps/areas/039_MinishCracks/rooms/04_EastHyruleCastle/gAreaRoomMap_MinishCracks_EastHyruleCastle_bottom.bin" +gAreaRoomMap_MinishCracks_EastHyruleCastle_top:: + .incbin "maps/areas/039_MinishCracks/rooms/04_EastHyruleCastle/gAreaRoomMap_MinishCracks_EastHyruleCastle_top.bin.lz" +gAreaRoomMap_MinishCracks_5_bottom:: + .incbin "maps/areas/039_MinishCracks/rooms/05_5/gAreaRoomMap_MinishCracks_5_bottom.bin.lz" +gAreaRoomMap_MinishCracks_5_top:: + .incbin "maps/areas/039_MinishCracks/rooms/05_5/gAreaRoomMap_MinishCracks_5_top.bin.lz" +gAreaRoomMap_MinishCracks_CastorWildsBow_bottom:: + .incbin "maps/areas/039_MinishCracks/rooms/06_CastorWildsBow/gAreaRoomMap_MinishCracks_CastorWildsBow_bottom.bin" +gAreaRoomMap_MinishCracks_CastorWildsBow_top:: + .incbin "maps/areas/039_MinishCracks/rooms/06_CastorWildsBow/gAreaRoomMap_MinishCracks_CastorWildsBow_top.bin.lz" +gAreaRoomMap_MinishCracks_RuinsEntrance_bottom:: + .incbin "maps/areas/039_MinishCracks/rooms/07_RuinsEntrance/gAreaRoomMap_MinishCracks_RuinsEntrance_bottom.bin" +gAreaRoomMap_MinishCracks_RuinsEntrance_top:: + .incbin "maps/areas/039_MinishCracks/rooms/07_RuinsEntrance/gAreaRoomMap_MinishCracks_RuinsEntrance_top.bin.lz" +gAreaRoomMap_MinishCracks_MinishWoodsSouth_bottom:: + .incbin "maps/areas/039_MinishCracks/rooms/08_MinishWoodsSouth/gAreaRoomMap_MinishCracks_MinishWoodsSouth_bottom.bin" +gAreaRoomMap_MinishCracks_MinishWoodsSouth_top:: + .incbin "maps/areas/039_MinishCracks/rooms/08_MinishWoodsSouth/gAreaRoomMap_MinishCracks_MinishWoodsSouth_top.bin.lz" +gAreaRoomMap_MinishCracks_CastorWildsNorth_bottom:: + .incbin "maps/areas/039_MinishCracks/rooms/09_CastorWildsNorth/gAreaRoomMap_MinishCracks_CastorWildsNorth_bottom.bin" +gAreaRoomMap_MinishCracks_CastorWildsNorth_top:: + .incbin "maps/areas/039_MinishCracks/rooms/09_CastorWildsNorth/gAreaRoomMap_MinishCracks_CastorWildsNorth_top.bin.lz" +gAreaRoomMap_MinishCracks_CastorWildsWest_bottom:: + .incbin "maps/areas/039_MinishCracks/rooms/10_CastorWildsWest/gAreaRoomMap_MinishCracks_CastorWildsWest_bottom.bin" +gAreaRoomMap_MinishCracks_CastorWildsWest_top:: + .incbin "maps/areas/039_MinishCracks/rooms/10_CastorWildsWest/gAreaRoomMap_MinishCracks_CastorWildsWest_top.bin.lz" +gAreaRoomMap_MinishCracks_CastorWildsMiddle_bottom:: + .incbin "maps/areas/039_MinishCracks/rooms/11_CastorWildsMiddle/gAreaRoomMap_MinishCracks_CastorWildsMiddle_bottom.bin" +gAreaRoomMap_MinishCracks_CastorWildsMiddle_top:: + .incbin "maps/areas/039_MinishCracks/rooms/11_CastorWildsMiddle/gAreaRoomMap_MinishCracks_CastorWildsMiddle_top.bin.lz" +gAreaRoomMap_MinishCracks_RuinsTektite_bottom:: + .incbin "maps/areas/039_MinishCracks/rooms/12_RuinsTektite/gAreaRoomMap_MinishCracks_RuinsTektite_bottom.bin" +gAreaRoomMap_MinishCracks_RuinsTektite_top:: + .incbin "maps/areas/039_MinishCracks/rooms/12_RuinsTektite/gAreaRoomMap_MinishCracks_RuinsTektite_top.bin.lz" +gAreaRoomMap_MinishCracks_CastorWildsNextToBow_bottom:: + .incbin "maps/areas/039_MinishCracks/rooms/13_CastorWildsNextToBow/gAreaRoomMap_MinishCracks_CastorWildsNextToBow_bottom.bin" +gAreaRoomMap_MinishCracks_CastorWildsNextToBow_top:: + .incbin "maps/areas/039_MinishCracks/rooms/13_CastorWildsNextToBow/gAreaRoomMap_MinishCracks_CastorWildsNextToBow_top.bin.lz" +gAreaRoomMap_MinishCracks_E_bottom:: + .incbin "maps/areas/039_MinishCracks/rooms/14_E/gAreaRoomMap_MinishCracks_E_bottom.bin.lz" +gAreaRoomMap_MinishCracks_E_top:: + .incbin "maps/areas/039_MinishCracks/rooms/14_E/gAreaRoomMap_MinishCracks_E_top.bin.lz" +gAreaRoomMap_MinishCracks_F_bottom:: + .incbin "maps/areas/039_MinishCracks/rooms/15_F/gAreaRoomMap_MinishCracks_F_bottom.bin.lz" +gAreaRoomMap_MinishCracks_F_top:: + .incbin "maps/areas/039_MinishCracks/rooms/15_F/gAreaRoomMap_MinishCracks_F_top.bin.lz" +gAreaRoomMap_MinishCracks_10_bottom:: + .incbin "maps/areas/039_MinishCracks/rooms/16_10/gAreaRoomMap_MinishCracks_10_bottom.bin.lz" +gAreaRoomMap_MinishCracks_10_top:: + .incbin "maps/areas/039_MinishCracks/rooms/16_10/gAreaRoomMap_MinishCracks_10_top.bin.lz" +gAreaRoomMap_MinishCracks_11_bottom:: + .incbin "maps/areas/039_MinishCracks/rooms/17_11/gAreaRoomMap_MinishCracks_11_bottom.bin.lz" +gAreaRoomMap_MinishCracks_11_top:: + .incbin "maps/areas/039_MinishCracks/rooms/17_11/gAreaRoomMap_MinishCracks_11_top.bin.lz" +gAreaRoomMap_MinishRafters_Cafe_bottom:: + .incbin "maps/areas/046_MinishRafters/rooms/00_Cafe/gAreaRoomMap_MinishRafters_Cafe_bottom.bin.lz" +gAreaRoomMap_MinishRafters_Stockwell_bottom:: + .incbin "maps/areas/046_MinishRafters/rooms/01_Stockwell/gAreaRoomMap_MinishRafters_Stockwell_bottom.bin.lz" +gAreaRoomMap_MinishRafters_DrLeft_bottom:: + .incbin "maps/areas/046_MinishRafters/rooms/02_DrLeft/gAreaRoomMap_MinishRafters_DrLeft_bottom.bin.lz" +gAreaRoomMap_MinishRafters_Bakery_bottom:: + .incbin "maps/areas/046_MinishRafters/rooms/03_Bakery/gAreaRoomMap_MinishRafters_Bakery_bottom.bin.lz" +gAreaRoomMap_EzloCutscene_0_bottom:: + .incbin "maps/areas/056_EzloCutscene/rooms/00_0/gAreaRoomMap_EzloCutscene_0_bottom.bin.lz" +gAreaRoomMap_EzloCutscene_0_top:: + .incbin "maps/areas/056_EzloCutscene/rooms/00_0/gAreaRoomMap_EzloCutscene_0_top.bin.lz" +gAreaRoomMap_WindTribeTower_Entrance_bottom:: + .incbin "maps/areas/048_WindTribeTower/rooms/00_Entrance/gAreaRoomMap_WindTribeTower_Entrance_bottom.bin.lz" +gAreaRoomMap_WindTribeTower_Entrance_top:: + .incbin "maps/areas/048_WindTribeTower/rooms/00_Entrance/gAreaRoomMap_WindTribeTower_Entrance_top.bin.lz" +gAreaRoomMap_WindTribeTower_Floor1_bottom:: + .incbin "maps/areas/048_WindTribeTower/rooms/01_Floor1/gAreaRoomMap_WindTribeTower_Floor1_bottom.bin.lz" +gAreaRoomMap_WindTribeTower_Floor1_top:: + .incbin "maps/areas/048_WindTribeTower/rooms/01_Floor1/gAreaRoomMap_WindTribeTower_Floor1_top.bin.lz" +gAreaRoomMap_WindTribeTower_Floor2_bottom:: + .incbin "maps/areas/048_WindTribeTower/rooms/02_Floor2/gAreaRoomMap_WindTribeTower_Floor2_bottom.bin.lz" +gAreaRoomMap_WindTribeTower_Floor2_top:: + .incbin "maps/areas/048_WindTribeTower/rooms/02_Floor2/gAreaRoomMap_WindTribeTower_Floor2_top.bin.lz" +gAreaRoomMap_WindTribeTower_Floor3_bottom:: + .incbin "maps/areas/048_WindTribeTower/rooms/03_Floor3/gAreaRoomMap_WindTribeTower_Floor3_bottom.bin.lz" +gAreaRoomMap_WindTribeTower_Floor3_top:: + .incbin "maps/areas/048_WindTribeTower/rooms/03_Floor3/gAreaRoomMap_WindTribeTower_Floor3_top.bin.lz" +gAreaRoomMap_WindTribeTowerRoof_0_bottom:: + .incbin "maps/areas/049_WindTribeTowerRoof/rooms/00_0/gAreaRoomMap_WindTribeTowerRoof_0_bottom.bin.lz" +gAreaRoomMap_WindTribeTowerRoof_0_top:: + .incbin "maps/areas/049_WindTribeTowerRoof/rooms/00_0/gAreaRoomMap_WindTribeTowerRoof_0_top.bin.lz" +gRoomMapping_MinishHouseInteriors_GentariMain_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/00_GentariMain/gRoomMapping_MinishHouseInteriors_GentariMain_bottom.bin.lz" +gRoomCollisionMap_MinishHouseInteriors_GentariMain:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/00_GentariMain/gRoomCollisionMap_MinishHouseInteriors_GentariMain.bin.lz" +gRoomMapping_MinishHouseInteriors_GentariExit_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/01_GentariExit/gRoomMapping_MinishHouseInteriors_GentariExit_bottom.bin.lz" +gAreaTileSet_MinishHouseInteriors_0_0:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSets/0/gAreaTileSet_MinishHouseInteriors_0_0.8bpp.lz" +gRoomCollisionMap_MinishHouseInteriors_GentariExit:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/01_GentariExit/gRoomCollisionMap_MinishHouseInteriors_GentariExit.bin.lz" +gRoomMapping_MinishHouseInteriors_Festari_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/02_Festari/gRoomMapping_MinishHouseInteriors_Festari_bottom.bin.lz" +gAreaTileSet_MinishHouseInteriors_1_0:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSets/1/gAreaTileSet_MinishHouseInteriors_1_0.8bpp.lz" +gRoomCollisionMap_MinishHouseInteriors_Festari:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/02_Festari/gRoomCollisionMap_MinishHouseInteriors_Festari.bin.lz" +gRoomMapping_MinishHouseInteriors_Red_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/03_Red/gRoomMapping_MinishHouseInteriors_Red_bottom.bin.lz" +gAreaTileSet_MinishHouseInteriors_2_0:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSets/2/gAreaTileSet_MinishHouseInteriors_2_0.8bpp.lz" +gRoomCollisionMap_MinishHouseInteriors_Red:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/03_Red/gRoomCollisionMap_MinishHouseInteriors_Red.bin.lz" +gRoomMapping_MinishHouseInteriors_Green_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/04_Green/gRoomMapping_MinishHouseInteriors_Green_bottom.bin.lz" +gAreaTileSet_MinishHouseInteriors_3_0:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSets/3/gAreaTileSet_MinishHouseInteriors_3_0.8bpp.lz" +gRoomCollisionMap_MinishHouseInteriors_Green:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/04_Green/gRoomCollisionMap_MinishHouseInteriors_Green.bin.lz" +gRoomMapping_MinishHouseInteriors_Blue_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/05_Blue/gRoomMapping_MinishHouseInteriors_Blue_bottom.bin.lz" +gAreaTileSet_MinishHouseInteriors_4_0:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSets/4/gAreaTileSet_MinishHouseInteriors_4_0.8bpp.lz" +gRoomCollisionMap_MinishHouseInteriors_Blue:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/05_Blue/gRoomCollisionMap_MinishHouseInteriors_Blue.bin.lz" +gRoomMapping_MinishHouseInteriors_SideArea_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/06_SideArea/gRoomMapping_MinishHouseInteriors_SideArea_bottom.bin.lz" +gAreaTileSet_MinishHouseInteriors_5_0:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSets/5/gAreaTileSet_MinishHouseInteriors_5_0.8bpp.lz" +gRoomCollisionMap_MinishHouseInteriors_SideArea:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/06_SideArea/gRoomCollisionMap_MinishHouseInteriors_SideArea.bin.lz" +gRoomMapping_MinishHouseInteriors_ShoeMinish_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/07_ShoeMinish/gRoomMapping_MinishHouseInteriors_ShoeMinish_bottom.bin.lz" +gAreaTileSet_MinishHouseInteriors_6_0:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSets/6/gAreaTileSet_MinishHouseInteriors_6_0.8bpp.lz" +gRoomCollisionMap_MinishHouseInteriors_ShoeMinish:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/07_ShoeMinish/gRoomCollisionMap_MinishHouseInteriors_ShoeMinish.bin.lz" +gRoomMapping_MinishHouseInteriors_PotMinish_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/08_PotMinish/gRoomMapping_MinishHouseInteriors_PotMinish_bottom.bin.lz" +gAreaTileSet_MinishHouseInteriors_7_0:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSets/7/gAreaTileSet_MinishHouseInteriors_7_0.8bpp.lz" +gRoomCollisionMap_MinishHouseInteriors_PotMinish:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/08_PotMinish/gRoomCollisionMap_MinishHouseInteriors_PotMinish.bin.lz" +gRoomMapping_MinishHouseInteriors_BarrelMinish_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/09_BarrelMinish/gRoomMapping_MinishHouseInteriors_BarrelMinish_bottom.bin.lz" +gAreaTileSet_MinishHouseInteriors_8_0:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSets/8/gAreaTileSet_MinishHouseInteriors_8_0.8bpp.lz" +gRoomCollisionMap_MinishHouseInteriors_BarrelMinish:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/09_BarrelMinish/gRoomCollisionMap_MinishHouseInteriors_BarrelMinish.bin.lz" +gRoomMapping_MinishHouseInteriors_MelariMinesSouthwest_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/16_MelariMinesSouthwest/gRoomMapping_MinishHouseInteriors_MelariMinesSouthwest_bottom.bin.lz" +gAreaTileSet_MinishHouseInteriors_9_0:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSets/9/gAreaTileSet_MinishHouseInteriors_9_0.8bpp.lz" +gRoomCollisionMap_MinishHouseInteriors_MelariMinesSouthwest:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/16_MelariMinesSouthwest/gRoomCollisionMap_MinishHouseInteriors_MelariMinesSouthwest.bin.lz" +gRoomMapping_MinishHouseInteriors_MelariMinesSoutheast_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/17_MelariMinesSoutheast/gRoomMapping_MinishHouseInteriors_MelariMinesSoutheast_bottom.bin.lz" +gAreaTileSet_MinishHouseInteriors_10_0:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSets/10/gAreaTileSet_MinishHouseInteriors_10_0.8bpp.lz" +gRoomCollisionMap_MinishHouseInteriors_MelariMinesSoutheast:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/17_MelariMinesSoutheast/gRoomCollisionMap_MinishHouseInteriors_MelariMinesSoutheast.bin.lz" +gRoomMapping_MinishHouseInteriors_MelariMinesEast_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/18_MelariMinesEast/gRoomMapping_MinishHouseInteriors_MelariMinesEast_bottom.bin.lz" +gAreaTileSet_MinishHouseInteriors_11_0:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSets/11/gAreaTileSet_MinishHouseInteriors_11_0.8bpp.lz" +gRoomCollisionMap_MinishHouseInteriors_MelariMinesEast:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/18_MelariMinesEast/gRoomCollisionMap_MinishHouseInteriors_MelariMinesEast.bin.lz" unknown_28:: .incbin "assets/unknown_28.bin" -gAreaRoomMap_MinishHouseInteriors_13_2:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_13_2.bin" - .align 2 -gAreaTileset_MinishHouseInteriors_12_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_12_0.8bpp.lz" - .align 2 -gAreaRoomMap_MinishHouseInteriors_13_1:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_13_1.bin" - .align 2 -gAreaRoomMap_MinishHouseInteriors_14_2:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_14_2.bin" - .align 2 -gAreaTileset_MinishHouseInteriors_13_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_13_0.8bpp.lz" -gAreaRoomMap_MinishHouseInteriors_14_1:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_14_1.bin" - .align 2 -gAreaRoomMap_MinishHouseInteriors_15_2:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_15_2.bin" - .align 2 -gAreaTileset_MinishHouseInteriors_14_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_14_0.8bpp.lz" - .align 2 -gAreaRoomMap_MinishHouseInteriors_15_1:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_15_1.bin" -gAreaRoomMap_MinishHouseInteriors_16_2:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_16_2.bin" -gAreaTileset_MinishHouseInteriors_15_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_15_0.8bpp.lz" - .align 2 -gAreaRoomMap_MinishHouseInteriors_16_1:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_16_1.bin" - .align 2 -gAreaRoomMap_MinishHouseInteriors_17_2:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_17_2.bin" - .align 2 -gAreaTileset_MinishHouseInteriors_16_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_16_0.8bpp.lz" -gAreaRoomMap_MinishHouseInteriors_17_1:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_17_1.bin" - .align 2 -gAreaRoomMap_MinishHouseInteriors_18_2:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_18_2.bin" - .align 2 -gAreaTileset_MinishHouseInteriors_17_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_17_0.8bpp.lz" -gAreaRoomMap_MinishHouseInteriors_18_1:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_18_1.bin" - .align 2 -gAreaRoomMap_MinishHouseInteriors_19_2:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_19_2.bin" -gAreaTileset_MinishHouseInteriors_18_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_18_0.8bpp.lz" -gAreaRoomMap_MinishHouseInteriors_19_1:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_19_1.bin" - .align 2 -gAreaRoomMap_MinishHouseInteriors_20_2:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_20_2.bin" - .align 2 -gAreaTileset_MinishHouseInteriors_19_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_19_0.8bpp.lz" - .align 2 -gAreaRoomMap_MinishHouseInteriors_20_1:: - .incbin "assets/gAreaRoomMap_MinishHouseInteriors_20_1.bin" - .align 2 -gAreaRoomMap_TownMinishHoles_0_2:: - .incbin "assets/gAreaRoomMap_TownMinishHoles_0_2.bin" - .align 2 -gAreaTileset_TownMinishHoles_0_0:: - .incbin "tilesets/gAreaTileset_TownMinishHoles_0_0.8bpp.lz" - .align 2 -gAreaRoomMap_TownMinishHoles_0_1:: - .incbin "assets/gAreaRoomMap_TownMinishHoles_0_1.bin" - .align 2 -gAreaRoomMap_TownMinishHoles_1_2:: - .incbin "assets/gAreaRoomMap_TownMinishHoles_1_2.bin" - .align 2 -gAreaTileset_TownMinishHoles_1_0:: - .incbin "tilesets/gAreaTileset_TownMinishHoles_1_0.8bpp.lz" - .align 2 -gAreaRoomMap_TownMinishHoles_1_1:: - .incbin "assets/gAreaRoomMap_TownMinishHoles_1_1.bin" - .align 2 -gAreaRoomMap_TownMinishHoles_2_2:: - .incbin "assets/gAreaRoomMap_TownMinishHoles_2_2.bin" - .align 2 -gAreaTileset_TownMinishHoles_2_0:: - .incbin "tilesets/gAreaTileset_TownMinishHoles_2_0.8bpp.lz" - .align 2 -gAreaRoomMap_TownMinishHoles_2_1:: - .incbin "assets/gAreaRoomMap_TownMinishHoles_2_1.bin" - .align 2 -gAreaRoomMap_TownMinishHoles_3_2:: - .incbin "assets/gAreaRoomMap_TownMinishHoles_3_2.bin" - .align 2 -gAreaTileset_TownMinishHoles_3_0:: - .incbin "tilesets/gAreaTileset_TownMinishHoles_3_0.8bpp.lz" - .align 2 -gAreaRoomMap_TownMinishHoles_3_1:: - .incbin "assets/gAreaRoomMap_TownMinishHoles_3_1.bin" - .align 2 -gAreaRoomMap_TownMinishHoles_4_2:: - .incbin "assets/gAreaRoomMap_TownMinishHoles_4_2.bin" - .align 2 -gAreaTileset_TownMinishHoles_4_0:: - .incbin "tilesets/gAreaTileset_TownMinishHoles_4_0.8bpp.lz" - .align 2 -gAreaRoomMap_TownMinishHoles_4_1:: - .incbin "assets/gAreaRoomMap_TownMinishHoles_4_1.bin" -gAreaRoomMap_TownMinishHoles_5_2:: - .incbin "assets/gAreaRoomMap_TownMinishHoles_5_2.bin" -gAreaTileset_TownMinishHoles_5_0:: - .incbin "tilesets/gAreaTileset_TownMinishHoles_5_0.8bpp.lz" - .align 2 -gAreaRoomMap_TownMinishHoles_5_1:: - .incbin "assets/gAreaRoomMap_TownMinishHoles_5_1.bin" -gAreaRoomMap_TownMinishHoles_6_2:: - .incbin "assets/gAreaRoomMap_TownMinishHoles_6_2.bin" - .align 2 -gAreaTileset_TownMinishHoles_6_0:: - .incbin "tilesets/gAreaTileset_TownMinishHoles_6_0.8bpp.lz" - .align 2 -gAreaRoomMap_TownMinishHoles_6_1:: - .incbin "assets/gAreaRoomMap_TownMinishHoles_6_1.bin" - .align 2 -gAreaRoomMap_TownMinishHoles_7_2:: - .incbin "assets/gAreaRoomMap_TownMinishHoles_7_2.bin" -gAreaTileset_TownMinishHoles_7_0:: - .incbin "tilesets/gAreaTileset_TownMinishHoles_7_0.8bpp.lz" -gAreaRoomMap_TownMinishHoles_7_1:: - .incbin "assets/gAreaRoomMap_TownMinishHoles_7_1.bin" - .align 2 -gAreaRoomMap_TownMinishHoles_8_2:: - .incbin "assets/gAreaRoomMap_TownMinishHoles_8_2.bin" - .align 2 -gAreaTileset_TownMinishHoles_8_0:: - .incbin "tilesets/gAreaTileset_TownMinishHoles_8_0.8bpp.lz" - .align 2 -gAreaRoomMap_TownMinishHoles_8_1:: - .incbin "assets/gAreaRoomMap_TownMinishHoles_8_1.bin" - .align 2 -gAreaTileset_SimonsSimulation_0_0:: - .incbin "tilesets/gAreaTileset_SimonsSimulation_0_0.4bpp.lz" - .align 2 -gAreaTileset_SimonsSimulation_0_1:: - .incbin "tilesets/gAreaTileset_SimonsSimulation_0_1.4bpp.lz" -gAreaTileset_SimonsSimulation_0_2:: - .incbin "tilesets/gAreaTileset_SimonsSimulation_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_HyruleTownUnderground_0:: - .incbin "assets/gAreaMetatiles_HyruleTownUnderground_0.bin" - .align 2 -gAreaMetatiles_HyruleTownUnderground_1:: - .incbin "assets/gAreaMetatiles_HyruleTownUnderground_1.bin" - .align 2 -gAreaMetatiles_HyruleTownUnderground_2:: - .incbin "assets/gAreaMetatiles_HyruleTownUnderground_2.bin" -gAreaMetatiles_HyruleTownUnderground_3:: - .incbin "assets/gAreaMetatiles_HyruleTownUnderground_3.bin" -gAreaRoomMap_40_0_0:: - .incbin "assets/gAreaRoomMap_40_0_0.bin" -gAreaRoomMap_40_0_1:: - .incbin "assets/gAreaRoomMap_40_0_1.bin" - .align 2 -gAreaRoomMap_40_1_0:: - .incbin "assets/gAreaRoomMap_40_1_0.bin" - .align 2 -gAreaRoomMap_40_1_1:: - .incbin "assets/gAreaRoomMap_40_1_1.bin" - .align 2 -gAreaRoomMap_40_2_0:: - .incbin "assets/gAreaRoomMap_40_2_0.bin" - .align 2 -gAreaRoomMap_40_2_1:: - .incbin "assets/gAreaRoomMap_40_2_1.bin" -gAreaRoomMap_40_3_0:: - .incbin "assets/gAreaRoomMap_40_3_0.bin" - .align 2 -gAreaRoomMap_40_3_1:: - .incbin "assets/gAreaRoomMap_40_3_1.bin" - .align 2 -gAreaRoomMap_40_4_0:: - .incbin "assets/gAreaRoomMap_40_4_0.bin" -gAreaRoomMap_40_4_1:: - .incbin "assets/gAreaRoomMap_40_4_1.bin" -gAreaRoomMap_40_5_0:: - .incbin "assets/gAreaRoomMap_40_5_0.bin" - .align 2 -gAreaRoomMap_40_5_1:: - .incbin "assets/gAreaRoomMap_40_5_1.bin" - .align 2 -gAreaRoomMap_40_6_0:: - .incbin "assets/gAreaRoomMap_40_6_0.bin" - .align 2 -gAreaRoomMap_40_6_1:: - .incbin "assets/gAreaRoomMap_40_6_1.bin" - .align 2 -gAreaRoomMap_40_7_0:: - .incbin "assets/gAreaRoomMap_40_7_0.bin" - .align 2 -gAreaRoomMap_40_7_1:: - .incbin "assets/gAreaRoomMap_40_7_1.bin" - .align 2 -gAreaRoomMap_40_8_0:: - .incbin "assets/gAreaRoomMap_40_8_0.bin" - .align 2 -gAreaRoomMap_40_8_1:: - .incbin "assets/gAreaRoomMap_40_8_1.bin" - .align 2 -gAreaRoomMap_HyruleTownUnderground_0_0:: - .incbin "assets/gAreaRoomMap_HyruleTownUnderground_0_0.bin" - .align 2 -gAreaRoomMap_HyruleTownUnderground_0_1:: - .incbin "assets/gAreaRoomMap_HyruleTownUnderground_0_1.bin" -gAreaRoomMap_HyruleTownUnderground_1_0:: - .incbin "assets/gAreaRoomMap_HyruleTownUnderground_1_0.bin" -gAreaRoomMap_HyruleTownUnderground_1_1:: - .incbin "assets/gAreaRoomMap_HyruleTownUnderground_1_1.bin" - .align 2 -gAreaRoomMap_GardenFountains_0_0:: - .incbin "assets/gAreaRoomMap_GardenFountains_0_0.bin" - .align 2 -gAreaRoomMap_GardenFountains_0_1:: - .incbin "assets/gAreaRoomMap_GardenFountains_0_1.bin" - .align 2 -gAreaRoomMap_GardenFountains_1_0:: - .incbin "assets/gAreaRoomMap_GardenFountains_1_0.bin" - .align 2 -gAreaRoomMap_GardenFountains_1_1:: - .incbin "assets/gAreaRoomMap_GardenFountains_1_1.bin" - .align 2 -gAreaRoomMap_HyruleCastleCellar_0_0:: - .incbin "assets/gAreaRoomMap_HyruleCastleCellar_0_0.bin" - .align 2 -gAreaRoomMap_HyruleCastleCellar_0_1:: - .incbin "assets/gAreaRoomMap_HyruleCastleCellar_0_1.bin" - .align 2 -gAreaRoomMap_HyruleCastleCellar_1_0:: - .incbin "assets/gAreaRoomMap_HyruleCastleCellar_1_0.bin" -gAreaRoomMap_HyruleCastleCellar_1_1:: - .incbin "assets/gAreaRoomMap_HyruleCastleCellar_1_1.bin" - .align 2 -gAreaRoomMap_SimonsSimulation_0_0:: - .incbin "assets/gAreaRoomMap_SimonsSimulation_0_0.bin" - .align 2 -gAreaRoomMap_SimonsSimulation_0_1:: - .incbin "assets/gAreaRoomMap_SimonsSimulation_0_1.bin" - .align 2 -gAreaTileset_DeepwoodShrine_0_0:: - .incbin "tilesets/gAreaTileset_DeepwoodShrine_0_0.4bpp.lz" -gAreaTileset_DeepwoodShrine_0_1:: - .incbin "tilesets/gAreaTileset_DeepwoodShrine_0_1.4bpp.lz" - .align 2 -gAreaTileset_DeepwoodShrine_0_2:: - .incbin "tilesets/gAreaTileset_DeepwoodShrine_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_DeepwoodShrine_0:: - .incbin "assets/gAreaMetatiles_DeepwoodShrine_0.bin" - .align 2 -gAreaMetatiles_DeepwoodShrine_1:: - .incbin "assets/gAreaMetatiles_DeepwoodShrine_1.bin" -gAreaMetatiles_DeepwoodShrine_2:: - .incbin "assets/gAreaMetatiles_DeepwoodShrine_2.bin" -gAreaMetatiles_DeepwoodShrine_3:: - .incbin "assets/gAreaMetatiles_DeepwoodShrine_3.bin" - .align 2 -gAreaTileset_DeepwoodShrineBoss_0_0:: - .incbin "tilesets/gAreaTileset_DeepwoodShrineBoss_0_0.4bpp.lz" - .align 2 -gAreaTileset_DeepwoodShrineBoss_0_1:: - .incbin "tilesets/gAreaTileset_DeepwoodShrineBoss_0_1.4bpp.lz" - .align 2 -gAreaTileset_DeepwoodShrineBoss_0_2:: - .incbin "tilesets/gAreaTileset_DeepwoodShrineBoss_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_DeepwoodShrineBoss_0:: - .incbin "assets/gAreaMetatiles_DeepwoodShrineBoss_0.bin" - .align 2 -gAreaMetatiles_DeepwoodShrineBoss_1:: - .incbin "assets/gAreaMetatiles_DeepwoodShrineBoss_1.bin" - .align 2 -gAreaMetatiles_DeepwoodShrineBoss_2:: - .incbin "assets/gAreaMetatiles_DeepwoodShrineBoss_2.bin" - .align 2 -gAreaMetatiles_DeepwoodShrineBoss_3:: - .incbin "assets/gAreaMetatiles_DeepwoodShrineBoss_3.bin" - .align 2 -gAreaTileset_DeepwoodShrineEntry_0_0:: - .incbin "tilesets/gAreaTileset_DeepwoodShrineEntry_0_0.4bpp.lz" - .align 2 -gAreaTileset_DeepwoodShrineEntry_0_1:: - .incbin "tilesets/gAreaTileset_DeepwoodShrineEntry_0_1.4bpp.lz" - .align 2 -gAreaTileset_DeepwoodShrineEntry_0_2:: - .incbin "tilesets/gAreaTileset_DeepwoodShrineEntry_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_DeepwoodShrineEntry_0:: - .incbin "assets/gAreaMetatiles_DeepwoodShrineEntry_0.bin" - .align 2 -gAreaMetatiles_DeepwoodShrineEntry_1:: - .incbin "assets/gAreaMetatiles_DeepwoodShrineEntry_1.bin" - .align 2 -gAreaMetatiles_DeepwoodShrineEntry_2:: - .incbin "assets/gAreaMetatiles_DeepwoodShrineEntry_2.bin" - .align 2 -gAreaMetatiles_DeepwoodShrineEntry_3:: - .incbin "assets/gAreaMetatiles_DeepwoodShrineEntry_3.bin" - .align 2 -gAreaRoomMap_DeepwoodShrine_0_0:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_0_0.bin" - .align 2 -gAreaRoomMap_DeepwoodShrine_0_1:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_0_1.bin" - .align 2 -unknown_29:: - .incbin "assets/unknown_29.bin" -gAreaRoomMap_DeepwoodShrine_1_0:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_1_0.bin" - .align 2 -gAreaRoomMap_DeepwoodShrine_1_1:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_1_1.bin" - .align 2 -unknown_30:: - .incbin "assets/unknown_30.bin" -gAreaRoomMap_DeepwoodShrine_2_0:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_2_0.bin" - .align 2 -gAreaRoomMap_DeepwoodShrine_2_1:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_2_1.bin" - .align 2 -unknown_31:: - .incbin "assets/unknown_31.bin" -gAreaRoomMap_DeepwoodShrine_3_0:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_3_0.bin" - .align 2 -gAreaRoomMap_DeepwoodShrine_3_1:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_3_1.bin" - .align 2 -unknown_32:: - .incbin "assets/unknown_32.bin" -gAreaRoomMap_DeepwoodShrine_4_0:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_4_0.bin" -gAreaRoomMap_DeepwoodShrine_4_1:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_4_1.bin" - .align 2 -unknown_33:: - .incbin "assets/unknown_33.bin" -gAreaRoomMap_DeepwoodShrine_5_0:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_5_0.bin" - .align 2 -gAreaRoomMap_DeepwoodShrine_5_1:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_5_1.bin" - .align 2 -unknown_34:: - .incbin "assets/unknown_34.bin" -gAreaRoomMap_DeepwoodShrine_6_0:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_6_0.bin" -gAreaRoomMap_DeepwoodShrine_6_1:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_6_1.bin" - .align 2 -unknown_35:: - .incbin "assets/unknown_35.bin" -gAreaRoomMap_DeepwoodShrine_7_0:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_7_0.bin" - .align 2 -gAreaRoomMap_DeepwoodShrine_7_1:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_7_1.bin" - .align 2 -unknown_36:: - .incbin "assets/unknown_36.bin" -gAreaRoomMap_DeepwoodShrine_8_0:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_8_0.bin" -gAreaRoomMap_DeepwoodShrine_8_1:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_8_1.bin" - .align 2 -unknown_37:: - .incbin "assets/unknown_37.bin" -gAreaRoomMap_DeepwoodShrine_9_0:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_9_0.bin" - .align 2 -gAreaRoomMap_DeepwoodShrine_9_1:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_9_1.bin" - .align 2 -unknown_38:: - .incbin "assets/unknown_38.bin" -gAreaRoomMap_DeepwoodShrine_10_0:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_10_0.bin" - .align 2 -gAreaRoomMap_DeepwoodShrine_10_1:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_10_1.bin" - .align 2 -unknown_39:: - .incbin "assets/unknown_39.bin" -gAreaRoomMap_DeepwoodShrine_11_0:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_11_0.bin" - .align 2 -gAreaRoomMap_DeepwoodShrine_11_1:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_11_1.bin" - .align 2 -unknown_40:: - .incbin "assets/unknown_40.bin" -gAreaRoomMap_DeepwoodShrine_12_0:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_12_0.bin" - .align 2 -gAreaRoomMap_DeepwoodShrine_12_1:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_12_1.bin" - .align 2 -unknown_41:: - .incbin "assets/unknown_41.bin" -gAreaRoomMap_DeepwoodShrine_13_0:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_13_0.bin" -gAreaRoomMap_DeepwoodShrine_13_1:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_13_1.bin" - .align 2 -unknown_42:: - .incbin "assets/unknown_42.bin" -gAreaRoomMap_DeepwoodShrine_14_0:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_14_0.bin" -gAreaRoomMap_DeepwoodShrine_14_1:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_14_1.bin" - .align 2 -unknown_43:: - .incbin "assets/unknown_43.bin" -gAreaRoomMap_DeepwoodShrine_15_0:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_15_0.bin" - .align 2 -gAreaRoomMap_DeepwoodShrine_15_1:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_15_1.bin" - .align 2 -unknown_44:: - .incbin "assets/unknown_44.bin" -gAreaRoomMap_DeepwoodShrine_16_0:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_16_0.bin" - .align 2 -gAreaRoomMap_DeepwoodShrine_16_1:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_16_1.bin" - .align 2 -unknown_45:: - .incbin "assets/unknown_45.bin" -gAreaRoomMap_DeepwoodShrine_17_0:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_17_0.bin" - .align 2 -gAreaRoomMap_DeepwoodShrine_17_1:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_17_1.bin" - .align 2 -unknown_46:: - .incbin "assets/unknown_46.bin" -gAreaRoomMap_DeepwoodShrineBoss_0_0:: - .incbin "assets/gAreaRoomMap_DeepwoodShrineBoss_0_0.bin" -gAreaRoomMap_DeepwoodShrineBoss_0_1:: - .incbin "assets/gAreaRoomMap_DeepwoodShrineBoss_0_1.bin" - .align 2 -unknown_47:: - .incbin "assets/unknown_47.bin" -gAreaRoomMap_DeepwoodShrine_18_0:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_18_0.bin" - .align 2 -gAreaRoomMap_DeepwoodShrine_18_1:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_18_1.bin" - .align 2 -unknown_48:: - .incbin "assets/unknown_48.bin" -gAreaRoomMap_DeepwoodShrine_19_0:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_19_0.bin" - .align 2 -gAreaRoomMap_DeepwoodShrine_19_1:: - .incbin "assets/gAreaRoomMap_DeepwoodShrine_19_1.bin" - .align 2 -unknown_49:: - .incbin "assets/unknown_49.bin" -gAreaRoomMap_DeepwoodShrineEntry_0_0:: - .incbin "assets/gAreaRoomMap_DeepwoodShrineEntry_0_0.bin" - .align 2 -gAreaRoomMap_DeepwoodShrineEntry_0_1:: - .incbin "assets/gAreaRoomMap_DeepwoodShrineEntry_0_1.bin" -gAreaTileset_CaveOfFlames_0_0:: - .incbin "tilesets/gAreaTileset_CaveOfFlames_0_0.4bpp.lz" - .align 2 -gAreaTileset_CaveOfFlames_0_1:: - .incbin "tilesets/gAreaTileset_CaveOfFlames_0_1.4bpp.lz" - .align 2 -gAreaTileset_CaveOfFlames_0_2:: - .incbin "tilesets/gAreaTileset_CaveOfFlames_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_CaveOfFlames_0:: - .incbin "assets/gAreaMetatiles_CaveOfFlames_0.bin" - .align 2 -gAreaMetatiles_CaveOfFlames_1:: - .incbin "assets/gAreaMetatiles_CaveOfFlames_1.bin" -gAreaMetatiles_CaveOfFlames_2:: - .incbin "assets/gAreaMetatiles_CaveOfFlames_2.bin" - .align 2 -gAreaMetatiles_CaveOfFlames_3:: - .incbin "assets/gAreaMetatiles_CaveOfFlames_3.bin" - .align 2 -gAreaTileset_CaveOfFlamesBoss_0_0:: - .incbin "tilesets/gAreaTileset_CaveOfFlamesBoss_0_0.4bpp.lz" - .align 2 -gAreaTileset_CaveOfFlamesBoss_0_1:: - .incbin "tilesets/gAreaTileset_CaveOfFlamesBoss_0_1.4bpp.lz" - .align 2 -gAreaTileset_CaveOfFlamesBoss_0_2:: - .incbin "tilesets/gAreaTileset_CaveOfFlamesBoss_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_CaveOfFlamesBoss_0:: - .incbin "assets/gAreaMetatiles_CaveOfFlamesBoss_0.bin" - .align 2 -gAreaMetatiles_CaveOfFlamesBoss_1:: - .incbin "assets/gAreaMetatiles_CaveOfFlamesBoss_1.bin" - .align 2 -gAreaMetatiles_CaveOfFlamesBoss_2:: - .incbin "assets/gAreaMetatiles_CaveOfFlamesBoss_2.bin" - .align 2 -gAreaMetatiles_CaveOfFlamesBoss_3:: - .incbin "assets/gAreaMetatiles_CaveOfFlamesBoss_3.bin" - .align 2 -gAreaTileset_CaveOfFlames_0_3:: - .incbin "assets/gAreaTileset_CaveOfFlames_0_3.bin" - .align 2 -gAreaRoomMap_CaveOfFlames_0_0:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_0_0.bin" - .align 2 -gAreaRoomMap_CaveOfFlames_0_1:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_0_1.bin" - .align 2 -unknown_50:: - .incbin "assets/unknown_50.bin" -gAreaRoomMap_CaveOfFlames_1_0:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_1_0.bin" -gAreaRoomMap_CaveOfFlames_1_1:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_1_1.bin" - .align 2 -unknown_51:: - .incbin "assets/unknown_51.bin" -gAreaRoomMap_CaveOfFlames_2_0:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_2_0.bin" - .align 2 -gAreaRoomMap_CaveOfFlames_2_1:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_2_1.bin" - .align 2 -unknown_52:: - .incbin "assets/unknown_52.bin" -gAreaRoomMap_CaveOfFlames_3_0:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_3_0.bin" -gAreaRoomMap_CaveOfFlames_3_1:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_3_1.bin" - .align 2 -unknown_53:: - .incbin "assets/unknown_53.bin" -gAreaRoomMap_CaveOfFlames_4_0:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_4_0.bin" - .align 2 -gAreaRoomMap_CaveOfFlames_4_1:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_4_1.bin" - .align 2 -unknown_54:: - .incbin "assets/unknown_54.bin" -gAreaRoomMap_CaveOfFlames_5_0:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_5_0.bin" -gAreaRoomMap_CaveOfFlames_5_1:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_5_1.bin" - .align 2 -unknown_55:: - .incbin "assets/unknown_55.bin" -gAreaRoomMap_CaveOfFlames_6_0:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_6_0.bin" - .align 2 -gAreaRoomMap_CaveOfFlames_6_1:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_6_1.bin" - .align 2 -unknown_56:: - .incbin "assets/unknown_56.bin" -gAreaRoomMap_CaveOfFlames_7_0:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_7_0.bin" -gAreaRoomMap_CaveOfFlames_7_1:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_7_1.bin" - .align 2 -unknown_57:: - .incbin "assets/unknown_57.bin" -gAreaRoomMap_CaveOfFlames_8_0:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_8_0.bin" -gAreaRoomMap_CaveOfFlames_8_1:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_8_1.bin" - .align 2 -unknown_58:: - .incbin "assets/unknown_58.bin" -gAreaRoomMap_CaveOfFlames_9_0:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_9_0.bin" - .align 2 -gAreaRoomMap_CaveOfFlames_9_1:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_9_1.bin" - .align 2 -unknown_59:: - .incbin "assets/unknown_59.bin" -gAreaRoomMap_CaveOfFlames_10_0:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_10_0.bin" -gAreaRoomMap_CaveOfFlames_10_1:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_10_1.bin" - .align 2 -unknown_60:: - .incbin "assets/unknown_60.bin" -gAreaRoomMap_CaveOfFlames_11_0:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_11_0.bin" -gAreaRoomMap_CaveOfFlames_11_1:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_11_1.bin" - .align 2 -unknown_61:: - .incbin "assets/unknown_61.bin" -gAreaRoomMap_CaveOfFlames_12_0:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_12_0.bin" -gAreaRoomMap_CaveOfFlames_12_1:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_12_1.bin" - .align 2 -unknown_62:: - .incbin "assets/unknown_62.bin" -gAreaRoomMap_CaveOfFlames_13_0:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_13_0.bin" - .align 2 -gAreaRoomMap_CaveOfFlames_13_1:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_13_1.bin" - .align 2 -unknown_63:: - .incbin "assets/unknown_63.bin" -gAreaRoomMap_CaveOfFlames_14_0:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_14_0.bin" -gAreaRoomMap_CaveOfFlames_14_1:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_14_1.bin" - .align 2 -unknown_64:: - .incbin "assets/unknown_64.bin" -gAreaRoomMap_CaveOfFlames_15_0:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_15_0.bin" - .align 2 -gAreaRoomMap_CaveOfFlames_15_1:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_15_1.bin" - .align 2 -unknown_65:: - .incbin "assets/unknown_65.bin" -gAreaRoomMap_CaveOfFlames_16_0:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_16_0.bin" - .align 2 -gAreaRoomMap_CaveOfFlames_16_1:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_16_1.bin" - .align 2 -unknown_66:: - .incbin "assets/unknown_66.bin" -gAreaRoomMap_CaveOfFlames_17_0:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_17_0.bin" - .align 2 -gAreaRoomMap_CaveOfFlames_17_1:: - .incbin "assets/gAreaRoomMap_CaveOfFlames_17_1.bin" - .align 2 -unknown_67:: - .incbin "assets/unknown_67.bin" -gAreaRoomMap_CaveOfFlamesBoss_0_0:: - .incbin "assets/gAreaRoomMap_CaveOfFlamesBoss_0_0.bin" -gAreaRoomMap_CaveOfFlamesBoss_0_1:: - .incbin "assets/gAreaRoomMap_CaveOfFlamesBoss_0_1.bin" - .align 2 -unknown_68:: - .incbin "assets/unknown_68.bin" -gAreaTileset_CastorDarknut_0_0:: - .incbin "tilesets/gAreaTileset_CastorDarknut_0_0.4bpp.lz" - .align 2 -gAreaTileset_CastorDarknut_0_1:: - .incbin "tilesets/gAreaTileset_CastorDarknut_0_1.4bpp.lz" - .align 2 -gAreaTileset_CastorDarknut_0_2:: - .incbin "tilesets/gAreaTileset_CastorDarknut_0_2.4bpp.lz" -gAreaMetatiles_FortressOfWinds_0:: - .incbin "assets/gAreaMetatiles_FortressOfWinds_0.bin" - .align 2 -gAreaMetatiles_FortressOfWinds_1:: - .incbin "assets/gAreaMetatiles_FortressOfWinds_1.bin" - .align 2 -gAreaMetatiles_FortressOfWinds_2:: - .incbin "assets/gAreaMetatiles_FortressOfWinds_2.bin" - .align 2 -gAreaMetatiles_FortressOfWinds_3:: - .incbin "assets/gAreaMetatiles_FortressOfWinds_3.bin" - .align 2 -gAreaTileset_InnerMazaal_0_0:: - .incbin "tilesets/gAreaTileset_InnerMazaal_0_0.4bpp.lz" - .align 2 -gAreaTileset_InnerMazaal_0_1:: - .incbin "tilesets/gAreaTileset_InnerMazaal_0_1.4bpp.lz" - .align 2 -gAreaTileset_InnerMazaal_0_2:: - .incbin "tilesets/gAreaTileset_InnerMazaal_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_InnerMazaal_0:: - .incbin "assets/gAreaMetatiles_InnerMazaal_0.bin" - .align 2 -gAreaMetatiles_InnerMazaal_1:: - .incbin "assets/gAreaMetatiles_InnerMazaal_1.bin" - .align 2 -gAreaMetatiles_InnerMazaal_2:: - .incbin "assets/gAreaMetatiles_InnerMazaal_2.bin" - .align 2 -gAreaMetatiles_InnerMazaal_3:: - .incbin "assets/gAreaMetatiles_InnerMazaal_3.bin" - .align 2 -gAreaTileset_FortressOfWindsTop_0_0:: - .incbin "tilesets/gAreaTileset_FortressOfWindsTop_0_0.4bpp.lz" - .align 2 -gAreaTileset_FortressOfWindsTop_0_1:: - .incbin "tilesets/gAreaTileset_FortressOfWindsTop_0_1.4bpp.lz" - .align 2 -gAreaTileset_FortressOfWindsTop_0_2:: - .incbin "tilesets/gAreaTileset_FortressOfWindsTop_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_FortressOfWindsTop_0:: - .incbin "assets/gAreaMetatiles_FortressOfWindsTop_0.bin" - .align 2 -gAreaMetatiles_FortressOfWindsTop_1:: - .incbin "assets/gAreaMetatiles_FortressOfWindsTop_1.bin" - .align 2 -gAreaMetatiles_FortressOfWindsTop_2:: - .incbin "assets/gAreaMetatiles_FortressOfWindsTop_2.bin" -gAreaMetatiles_FortressOfWindsTop_3:: - .incbin "assets/gAreaMetatiles_FortressOfWindsTop_3.bin" - .align 2 -gAreaRoomMap_FortressOfWinds_0_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_0_0.bin" - .align 2 -gAreaRoomMap_FortressOfWinds_0_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_0_1.bin" - .align 2 -unknown_69:: - .incbin "assets/unknown_69.bin" -gAreaRoomMap_FortressOfWinds_1_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_1_0.bin" - .align 2 -gAreaRoomMap_FortressOfWinds_1_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_1_1.bin" - .align 2 -unknown_70:: - .incbin "assets/unknown_70.bin" -gAreaRoomMap_FortressOfWinds_2_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_2_0.bin" - .align 2 -gAreaRoomMap_FortressOfWinds_2_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_2_1.bin" - .align 2 -unknown_71:: - .incbin "assets/unknown_71.bin" -gAreaRoomMap_FortressOfWinds_3_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_3_0.bin" - .align 2 -gAreaRoomMap_FortressOfWinds_3_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_3_1.bin" - .align 2 -unknown_72:: - .incbin "assets/unknown_72.bin" -gAreaRoomMap_FortressOfWinds_4_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_4_0.bin" -gAreaRoomMap_FortressOfWinds_4_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_4_1.bin" - .align 2 -unknown_73:: - .incbin "assets/unknown_73.bin" -gAreaRoomMap_FortressOfWinds_5_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_5_0.bin" -gAreaRoomMap_FortressOfWinds_5_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_5_1.bin" - .align 2 -unknown_74:: - .incbin "assets/unknown_74.bin" -gAreaRoomMap_FortressOfWinds_6_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_6_0.bin" - .align 2 -gAreaRoomMap_FortressOfWinds_6_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_6_1.bin" - .align 2 -unknown_75:: - .incbin "assets/unknown_75.bin" -gAreaRoomMap_FortressOfWinds_7_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_7_0.bin" -gAreaRoomMap_FortressOfWinds_7_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_7_1.bin" - .align 2 -unknown_76:: - .incbin "assets/unknown_76.bin" -gAreaRoomMap_FortressOfWinds_8_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_8_0.bin" -gAreaRoomMap_FortressOfWinds_8_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_8_1.bin" - .align 2 -unknown_77:: - .incbin "assets/unknown_77.bin" -gAreaRoomMap_FortressOfWinds_9_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_9_0.bin" - .align 2 -gAreaRoomMap_FortressOfWinds_9_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_9_1.bin" - .align 2 -unknown_78:: - .incbin "assets/unknown_78.bin" -gAreaRoomMap_FortressOfWinds_10_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_10_0.bin" -gAreaRoomMap_FortressOfWinds_10_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_10_1.bin" - .align 2 -unknown_79:: - .incbin "assets/unknown_79.bin" -gAreaRoomMap_FortressOfWinds_11_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_11_0.bin" -gAreaRoomMap_FortressOfWinds_11_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_11_1.bin" - .align 2 -unknown_80:: - .incbin "assets/unknown_80.bin" -gAreaRoomMap_FortressOfWinds_12_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_12_0.bin" - .align 2 -gAreaRoomMap_FortressOfWinds_12_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_12_1.bin" - .align 2 -unknown_81:: - .incbin "assets/unknown_81.bin" -gAreaRoomMap_FortressOfWinds_13_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_13_0.bin" - .align 2 -gAreaRoomMap_FortressOfWinds_13_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_13_1.bin" - .align 2 -unknown_82:: - .incbin "assets/unknown_82.bin" -gAreaRoomMap_FortressOfWinds_14_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_14_0.bin" - .align 2 -gAreaRoomMap_FortressOfWinds_14_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_14_1.bin" - .align 2 -unknown_83:: - .incbin "assets/unknown_83.bin" -gAreaRoomMap_FortressOfWinds_15_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_15_0.bin" -gAreaRoomMap_FortressOfWinds_15_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_15_1.bin" - .align 2 -unknown_84:: - .incbin "assets/unknown_84.bin" -gAreaRoomMap_FortressOfWinds_16_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_16_0.bin" - .align 2 -gAreaRoomMap_FortressOfWinds_16_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_16_1.bin" - .align 2 -unknown_85:: - .incbin "assets/unknown_85.bin" -gAreaRoomMap_FortressOfWinds_17_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_17_0.bin" -gAreaRoomMap_FortressOfWinds_17_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_17_1.bin" - .align 2 -unknown_86:: - .incbin "assets/unknown_86.bin" -gAreaRoomMap_FortressOfWinds_18_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_18_0.bin" -gAreaRoomMap_FortressOfWinds_18_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_18_1.bin" - .align 2 -unknown_87:: - .incbin "assets/unknown_87.bin" -gAreaRoomMap_FortressOfWinds_19_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_19_0.bin" - .align 2 -gAreaRoomMap_FortressOfWinds_19_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_19_1.bin" - .align 2 -unknown_88:: - .incbin "assets/unknown_88.bin" -gAreaRoomMap_FortressOfWinds_20_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_20_0.bin" -gAreaRoomMap_FortressOfWinds_20_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_20_1.bin" - .align 2 -unknown_89:: - .incbin "assets/unknown_89.bin" -gAreaRoomMap_FortressOfWinds_21_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_21_0.bin" - .align 2 -gAreaRoomMap_FortressOfWinds_21_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_21_1.bin" - .align 2 -unknown_90:: - .incbin "assets/unknown_90.bin" -gAreaRoomMap_FortressOfWinds_22_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_22_0.bin" -gAreaRoomMap_FortressOfWinds_22_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_22_1.bin" - .align 2 -unknown_91:: - .incbin "assets/unknown_91.bin" -gAreaRoomMap_FortressOfWinds_23_0:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_23_0.bin" - .align 2 -gAreaRoomMap_FortressOfWinds_23_1:: - .incbin "assets/gAreaRoomMap_FortressOfWinds_23_1.bin" - .align 2 -unknown_92:: - .incbin "assets/unknown_92.bin" -gAreaRoomMap_InnerMazaal_0_0:: - .incbin "assets/gAreaRoomMap_InnerMazaal_0_0.bin" - .align 2 -gAreaRoomMap_InnerMazaal_0_1:: - .incbin "assets/gAreaRoomMap_InnerMazaal_0_1.bin" - .align 2 -gAreaRoomMap_InnerMazaal_1_0:: - .incbin "assets/gAreaRoomMap_InnerMazaal_1_0.bin" - .align 2 -gAreaRoomMap_InnerMazaal_1_1:: - .incbin "assets/gAreaRoomMap_InnerMazaal_1_1.bin" - .align 2 -gAreaRoomMap_FortressOfWindsTop_0_0:: - .incbin "assets/gAreaRoomMap_FortressOfWindsTop_0_0.bin" -gAreaRoomMap_FortressOfWindsTop_0_1:: - .incbin "assets/gAreaRoomMap_FortressOfWindsTop_0_1.bin" -gAreaTileset_HyruleTownMinishCaves_0_0:: - .incbin "tilesets/gAreaTileset_HyruleTownMinishCaves_0_0.4bpp.lz" -gAreaTileset_HyruleTownMinishCaves_0_1:: - .incbin "tilesets/gAreaTileset_HyruleTownMinishCaves_0_1.4bpp.lz" - .align 2 -gAreaTileset_HyruleTownMinishCaves_0_2:: - .incbin "tilesets/gAreaTileset_HyruleTownMinishCaves_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_TempleOfDroplets_0:: - .incbin "assets/gAreaMetatiles_TempleOfDroplets_0.bin" - .align 2 -gAreaMetatiles_TempleOfDroplets_1:: - .incbin "assets/gAreaMetatiles_TempleOfDroplets_1.bin" - .align 2 -gAreaMetatiles_TempleOfDroplets_2:: - .incbin "assets/gAreaMetatiles_TempleOfDroplets_2.bin" - .align 2 -gAreaMetatiles_TempleOfDroplets_3:: - .incbin "assets/gAreaMetatiles_TempleOfDroplets_3.bin" -gAreaTileset_61_0_0:: - .incbin "tilesets/gAreaTileset_61_0_0.4bpp.lz" -gAreaTileset_61_0_1:: - .incbin "tilesets/gAreaTileset_61_0_1.4bpp.lz" - .align 2 -gAreaTileset_61_0_2:: - .incbin "tilesets/gAreaTileset_61_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_61_0:: - .incbin "assets/gAreaMetatiles_61_0.bin" - .align 2 -gAreaMetatiles_61_1:: - .incbin "assets/gAreaMetatiles_61_1.bin" - .align 2 -gAreaMetatiles_61_2:: - .incbin "assets/gAreaMetatiles_61_2.bin" - .align 2 -gAreaMetatiles_61_3:: - .incbin "assets/gAreaMetatiles_61_3.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_0_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_0_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_0_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_0_1.bin" - .align 2 -unknown_93:: - .incbin "assets/unknown_93.bin" -gAreaRoomMap_TempleOfDroplets_1_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_1_0.bin" -gAreaRoomMap_TempleOfDroplets_1_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_1_1.bin" - .align 2 -unknown_94:: - .incbin "assets/unknown_94.bin" -gAreaRoomMap_TempleOfDroplets_2_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_2_0.bin" -gAreaRoomMap_TempleOfDroplets_2_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_2_1.bin" - .align 2 -unknown_95:: - .incbin "assets/unknown_95.bin" -gAreaRoomMap_TempleOfDroplets_3_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_3_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_3_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_3_1.bin" - .align 2 -unknown_96:: - .incbin "assets/unknown_96.bin" -gAreaRoomMap_TempleOfDroplets_4_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_4_0.bin" -gAreaRoomMap_TempleOfDroplets_4_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_4_1.bin" - .align 2 -unknown_97:: - .incbin "assets/unknown_97.bin" -gAreaRoomMap_TempleOfDroplets_5_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_5_0.bin" -gAreaRoomMap_TempleOfDroplets_5_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_5_1.bin" - .align 2 -unknown_98:: - .incbin "assets/unknown_98.bin" -gAreaRoomMap_TempleOfDroplets_6_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_6_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_6_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_6_1.bin" - .align 2 -unknown_99:: - .incbin "assets/unknown_99.bin" -gAreaRoomMap_TempleOfDroplets_7_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_7_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_7_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_7_1.bin" - .align 2 -unknown_100:: - .incbin "assets/unknown_100.bin" -gAreaRoomMap_TempleOfDroplets_8_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_8_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_8_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_8_1.bin" - .align 2 -unknown_101:: - .incbin "assets/unknown_101.bin" -gAreaRoomMap_TempleOfDroplets_9_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_9_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_9_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_9_1.bin" - .align 2 -unknown_102:: - .incbin "assets/unknown_102.bin" -gAreaRoomMap_TempleOfDroplets_10_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_10_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_10_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_10_1.bin" - .align 2 -unknown_103:: - .incbin "assets/unknown_103.bin" -gAreaRoomMap_TempleOfDroplets_11_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_11_0.bin" -gAreaRoomMap_TempleOfDroplets_11_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_11_1.bin" - .align 2 -unknown_104:: - .incbin "assets/unknown_104.bin" -gAreaRoomMap_TempleOfDroplets_12_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_12_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_12_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_12_1.bin" - .align 2 -unknown_105:: - .incbin "assets/unknown_105.bin" -gAreaRoomMap_TempleOfDroplets_13_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_13_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_13_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_13_1.bin" - .align 2 -unknown_106:: - .incbin "assets/unknown_106.bin" -gAreaRoomMap_TempleOfDroplets_14_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_14_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_14_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_14_1.bin" - .align 2 -unknown_107:: - .incbin "assets/unknown_107.bin" -gAreaRoomMap_TempleOfDroplets_15_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_15_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_15_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_15_1.bin" - .align 2 -unknown_108:: - .incbin "assets/unknown_108.bin" -gAreaRoomMap_TempleOfDroplets_16_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_16_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_16_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_16_1.bin" - .align 2 -unknown_109:: - .incbin "assets/unknown_109.bin" -gAreaRoomMap_TempleOfDroplets_17_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_17_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_17_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_17_1.bin" - .align 2 -unknown_110:: - .incbin "assets/unknown_110.bin" -gAreaRoomMap_TempleOfDroplets_18_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_18_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_18_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_18_1.bin" - .align 2 -unknown_111:: - .incbin "assets/unknown_111.bin" -gAreaRoomMap_TempleOfDroplets_19_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_19_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_19_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_19_1.bin" - .align 2 -unknown_112:: - .incbin "assets/unknown_112.bin" -gAreaRoomMap_TempleOfDroplets_20_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_20_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_20_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_20_1.bin" - .align 2 -unknown_113:: - .incbin "assets/unknown_113.bin" -gAreaRoomMap_TempleOfDroplets_21_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_21_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_21_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_21_1.bin" - .align 2 -unknown_114:: - .incbin "assets/unknown_114.bin" -gAreaRoomMap_TempleOfDroplets_22_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_22_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_22_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_22_1.bin" - .align 2 -unknown_115:: - .incbin "assets/unknown_115.bin" -gAreaRoomMap_TempleOfDroplets_23_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_23_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_23_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_23_1.bin" - .align 2 -unknown_116:: - .incbin "assets/unknown_116.bin" -gAreaRoomMap_TempleOfDroplets_24_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_24_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_24_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_24_1.bin" - .align 2 -unknown_117:: - .incbin "assets/unknown_117.bin" -gAreaRoomMap_TempleOfDroplets_25_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_25_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_25_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_25_1.bin" - .align 2 -unknown_118:: - .incbin "assets/unknown_118.bin" -gAreaRoomMap_TempleOfDroplets_26_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_26_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_26_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_26_1.bin" - .align 2 -unknown_119:: - .incbin "assets/unknown_119.bin" -gAreaRoomMap_TempleOfDroplets_27_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_27_0.bin" -gAreaRoomMap_TempleOfDroplets_27_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_27_1.bin" - .align 2 -unknown_120:: - .incbin "assets/unknown_120.bin" -gAreaRoomMap_TempleOfDroplets_28_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_28_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_28_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_28_1.bin" - .align 2 -unknown_121:: - .incbin "assets/unknown_121.bin" -gAreaRoomMap_TempleOfDroplets_29_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_29_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_29_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_29_1.bin" - .align 2 -unknown_122:: - .incbin "assets/unknown_122.bin" -gAreaRoomMap_TempleOfDroplets_30_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_30_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_30_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_30_1.bin" - .align 2 -unknown_123:: - .incbin "assets/unknown_123.bin" -gAreaRoomMap_TempleOfDroplets_31_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_31_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_31_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_31_1.bin" - .align 2 -unknown_124:: - .incbin "assets/unknown_124.bin" -gAreaRoomMap_TempleOfDroplets_32_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_32_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_32_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_32_1.bin" - .align 2 -unknown_125:: - .incbin "assets/unknown_125.bin" -gAreaRoomMap_TempleOfDroplets_33_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_33_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_33_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_33_1.bin" - .align 2 -unknown_126:: - .incbin "assets/unknown_126.bin" -gAreaRoomMap_TempleOfDroplets_34_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_34_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_34_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_34_1.bin" - .align 2 -unknown_127:: - .incbin "assets/unknown_127.bin" -gAreaRoomMap_TempleOfDroplets_35_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_35_0.bin" -gAreaRoomMap_TempleOfDroplets_35_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_35_1.bin" - .align 2 -unknown_128:: - .incbin "assets/unknown_128.bin" -gAreaRoomMap_TempleOfDroplets_36_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_36_0.bin" -gAreaRoomMap_TempleOfDroplets_36_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_36_1.bin" - .align 2 -unknown_129:: - .incbin "assets/unknown_129.bin" -gAreaRoomMap_TempleOfDroplets_37_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_37_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_37_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_37_1.bin" - .align 2 -unknown_130:: - .incbin "assets/unknown_130.bin" -gAreaRoomMap_TempleOfDroplets_38_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_38_0.bin" -gAreaRoomMap_TempleOfDroplets_38_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_38_1.bin" - .align 2 -unknown_131:: - .incbin "assets/unknown_131.bin" -gAreaRoomMap_TempleOfDroplets_39_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_39_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_39_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_39_1.bin" - .align 2 -unknown_132:: - .incbin "assets/unknown_132.bin" -gAreaRoomMap_TempleOfDroplets_40_0:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_40_0.bin" - .align 2 -gAreaRoomMap_TempleOfDroplets_40_1:: - .incbin "assets/gAreaRoomMap_TempleOfDroplets_40_1.bin" - .align 2 -unknown_133:: - .incbin "assets/unknown_133.bin" -gAreaRoomMap_61_0_0:: - .incbin "assets/gAreaRoomMap_61_0_0.bin" - .align 2 -gAreaRoomMap_61_0_1:: - .incbin "assets/gAreaRoomMap_61_0_1.bin" -gAreaRoomMap_HyruleTownMinishCaves_0_0:: - .incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_0_0.bin" - .align 2 -gAreaRoomMap_HyruleTownMinishCaves_0_1:: - .incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_0_1.bin" - .align 2 -gAreaRoomMap_HyruleTownMinishCaves_1_0:: - .incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_1_0.bin" - .align 2 -gAreaRoomMap_HyruleTownMinishCaves_1_1:: - .incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_1_1.bin" - .align 2 -gAreaRoomMap_HyruleTownMinishCaves_2_0:: - .incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_2_0.bin" - .align 2 -gAreaRoomMap_HyruleTownMinishCaves_2_1:: - .incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_2_1.bin" - .align 2 -gAreaRoomMap_HyruleTownMinishCaves_3_0:: - .incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_3_0.bin" -gAreaRoomMap_HyruleTownMinishCaves_3_1:: - .incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_3_1.bin" - .align 2 -gAreaRoomMap_HyruleTownMinishCaves_4_0:: - .incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_4_0.bin" - .align 2 -gAreaRoomMap_HyruleTownMinishCaves_4_1:: - .incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_4_1.bin" - .align 2 -gAreaRoomMap_HyruleTownMinishCaves_5_0:: - .incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_5_0.bin" - .align 2 -gAreaRoomMap_HyruleTownMinishCaves_5_1:: - .incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_5_1.bin" - .align 2 -gAreaRoomMap_HyruleTownMinishCaves_6_0:: - .incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_6_0.bin" - .align 2 -gAreaRoomMap_HyruleTownMinishCaves_6_1:: - .incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_6_1.bin" -gAreaRoomMap_HyruleTownMinishCaves_7_0:: - .incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_7_0.bin" -gAreaRoomMap_HyruleTownMinishCaves_7_1:: - .incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_7_1.bin" - .align 2 -gAreaRoomMap_HyruleTownMinishCaves_8_0:: - .incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_8_0.bin" - .align 2 -gAreaRoomMap_HyruleTownMinishCaves_8_1:: - .incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_8_1.bin" - .align 2 -gAreaRoomMap_HyruleTownMinishCaves_9_0:: - .incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_9_0.bin" -gAreaRoomMap_HyruleTownMinishCaves_9_1:: - .incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_9_1.bin" - .align 2 -gAreaRoomMap_HyruleTownMinishCaves_10_0:: - .incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_10_0.bin" - .align 2 -gAreaRoomMap_HyruleTownMinishCaves_10_1:: - .incbin "assets/gAreaRoomMap_HyruleTownMinishCaves_10_1.bin" - .align 2 -gAreaTileset_RoyalCrypt_0_0:: - .incbin "tilesets/gAreaTileset_RoyalCrypt_0_0.4bpp.lz" - .align 2 -gAreaTileset_RoyalCrypt_0_1:: - .incbin "tilesets/gAreaTileset_RoyalCrypt_0_1.4bpp.lz" - .align 2 -gAreaTileset_RoyalCrypt_0_2:: - .incbin "tilesets/gAreaTileset_RoyalCrypt_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_RoyalCrypt_0:: - .incbin "assets/gAreaMetatiles_RoyalCrypt_0.bin" - .align 2 -gAreaMetatiles_RoyalCrypt_1:: - .incbin "assets/gAreaMetatiles_RoyalCrypt_1.bin" - .align 2 -gAreaMetatiles_RoyalCrypt_2:: - .incbin "assets/gAreaMetatiles_RoyalCrypt_2.bin" - .align 2 -gAreaMetatiles_RoyalCrypt_3:: - .incbin "assets/gAreaMetatiles_RoyalCrypt_3.bin" - .align 2 -gAreaRoomMap_RoyalCrypt_0_0:: - .incbin "assets/gAreaRoomMap_RoyalCrypt_0_0.bin" - .align 2 -gAreaRoomMap_RoyalCrypt_0_1:: - .incbin "assets/gAreaRoomMap_RoyalCrypt_0_1.bin" -gAreaRoomMap_RoyalCrypt_1_0:: - .incbin "assets/gAreaRoomMap_RoyalCrypt_1_0.bin" - .align 2 -gAreaRoomMap_RoyalCrypt_1_1:: - .incbin "assets/gAreaRoomMap_RoyalCrypt_1_1.bin" - .align 2 -gAreaRoomMap_RoyalCrypt_2_0:: - .incbin "assets/gAreaRoomMap_RoyalCrypt_2_0.bin" - .align 2 -gAreaRoomMap_RoyalCrypt_2_1:: - .incbin "assets/gAreaRoomMap_RoyalCrypt_2_1.bin" -gAreaRoomMap_RoyalCrypt_3_0:: - .incbin "assets/gAreaRoomMap_RoyalCrypt_3_0.bin" - .align 2 -gAreaRoomMap_RoyalCrypt_3_1:: - .incbin "assets/gAreaRoomMap_RoyalCrypt_3_1.bin" - .align 2 -gAreaRoomMap_RoyalCrypt_4_0:: - .incbin "assets/gAreaRoomMap_RoyalCrypt_4_0.bin" -gAreaRoomMap_RoyalCrypt_4_1:: - .incbin "assets/gAreaRoomMap_RoyalCrypt_4_1.bin" -gAreaRoomMap_RoyalCrypt_5_0:: - .incbin "assets/gAreaRoomMap_RoyalCrypt_5_0.bin" -gAreaRoomMap_RoyalCrypt_5_1:: - .incbin "assets/gAreaRoomMap_RoyalCrypt_5_1.bin" - .align 2 -gAreaRoomMap_RoyalCrypt_6_0:: - .incbin "assets/gAreaRoomMap_RoyalCrypt_6_0.bin" - .align 2 -gAreaRoomMap_RoyalCrypt_6_1:: - .incbin "assets/gAreaRoomMap_RoyalCrypt_6_1.bin" -gAreaRoomMap_RoyalCrypt_7_0:: - .incbin "assets/gAreaRoomMap_RoyalCrypt_7_0.bin" - .align 2 -gAreaRoomMap_RoyalCrypt_7_1:: - .incbin "assets/gAreaRoomMap_RoyalCrypt_7_1.bin" -gAreaRoomMap_RoyalCrypt_8_0:: - .incbin "assets/gAreaRoomMap_RoyalCrypt_8_0.bin" -gAreaRoomMap_RoyalCrypt_8_1:: - .incbin "assets/gAreaRoomMap_RoyalCrypt_8_1.bin" - .align 2 -gAreaTileset_PalaceOfWinds_GyorgTornado_0:: - .incbin "tilesets/gAreaTileset_PalaceOfWinds_GyorgTornado_0.4bpp.lz" -gAreaTileset_PalaceOfWinds_GyorgTornado_1:: - .incbin "tilesets/gAreaTileset_PalaceOfWinds_GyorgTornado_1.4bpp.lz" - .align 2 -gAreaTileset_PalaceOfWinds_GyorgTornado_2:: - .incbin "tilesets/gAreaTileset_PalaceOfWinds_GyorgTornado_2.4bpp.lz" - .align 2 -gAreaMetatiles_PalaceOfWinds_GyorgTornado:: - .incbin "assets/gAreaMetatiles_PalaceOfWinds_GyorgTornado.bin" - .align 2 -gAreaMetatiles_PalaceOfWinds_BossKey:: - .incbin "assets/gAreaMetatiles_PalaceOfWinds_BossKey.bin" -gAreaMetatiles_PalaceOfWinds_BeforeBallAndChainSoldiers:: - .incbin "assets/gAreaMetatiles_PalaceOfWinds_BeforeBallAndChainSoldiers.bin" -gAreaMetatiles_PalaceOfWinds_GyorgBossDoor:: - .incbin "assets/gAreaMetatiles_PalaceOfWinds_GyorgBossDoor.bin" - .align 2 -gAreaTileset_PalaceOfWinds_GyorgTornado_3:: - .incbin "assets/gAreaTileset_PalaceOfWinds_GyorgTornado_3.bin" -gAreaTileset_PalaceOfWindsBoss_0_0:: - .incbin "tilesets/gAreaTileset_PalaceOfWindsBoss_0_0.4bpp.lz" - .align 2 -gAreaTileset_PalaceOfWindsBoss_0_1:: - .incbin "tilesets/gAreaTileset_PalaceOfWindsBoss_0_1.4bpp.lz" - .align 2 -gAreaMetatiles_PalaceOfWindsBoss_0:: - .incbin "assets/gAreaMetatiles_PalaceOfWindsBoss_0.bin" - .align 2 -gAreaMetatiles_PalaceOfWindsBoss_1:: - .incbin "assets/gAreaMetatiles_PalaceOfWindsBoss_1.bin" - .align 2 -unknown_134:: - .incbin "assets/unknown_134.bin" -gAreaTileset_PalaceOfWindsBoss_0_2:: - .incbin "assets/gAreaTileset_PalaceOfWindsBoss_0_2.bin" -gAreaRoomMap_PalaceOfWinds_GyorgTornado_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_GyorgTornado_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_GyorgTornado_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_GyorgTornado_1.bin" - .align 2 -unknown_135:: - .incbin "assets/unknown_135.bin" -gAreaRoomMap_PalaceOfWinds_BossKey_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_BossKey_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_BossKey_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_BossKey_1.bin" - .align 2 -unknown_136:: - .incbin "assets/unknown_136.bin" -gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_0.bin" -gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_1.bin" - .align 2 -unknown_137:: - .incbin "assets/unknown_137.bin" -gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_1.bin" - .align 2 -unknown_138:: - .incbin "assets/unknown_138.bin" -gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_1.bin" - .align 2 -unknown_139:: - .incbin "assets/unknown_139.bin" -gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_1.bin" - .align 2 -unknown_140:: - .incbin "assets/unknown_140.bin" -gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_1.bin" - .align 2 -unknown_141:: - .incbin "assets/unknown_141.bin" -gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_1.bin" - .align 2 -unknown_142:: - .incbin "assets/unknown_142.bin" -gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_1.bin" - .align 2 -unknown_143:: - .incbin "assets/unknown_143.bin" -gAreaRoomMap_PalaceOfWinds_BombarossaPath_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_BombarossaPath_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_BombarossaPath_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_BombarossaPath_1.bin" - .align 2 -unknown_144:: - .incbin "assets/unknown_144.bin" -gAreaRoomMap_PalaceOfWinds_HoleToDarknut_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_HoleToDarknut_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_HoleToDarknut_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_HoleToDarknut_1.bin" - .align 2 -unknown_145:: - .incbin "assets/unknown_145.bin" -gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_1.bin" - .align 2 -unknown_146:: - .incbin "assets/unknown_146.bin" -gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_1.bin" - .align 2 -unknown_147:: - .incbin "assets/unknown_147.bin" -gAreaRoomMap_PalaceOfWinds_BombWallInside_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_BombWallInside_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_BombWallInside_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_BombWallInside_1.bin" - .align 2 -unknown_148:: - .incbin "assets/unknown_148.bin" -gAreaRoomMap_PalaceOfWinds_BombWallOutside_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_BombWallOutside_0.bin" -gAreaRoomMap_PalaceOfWinds_BombWallOutside_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_BombWallOutside_1.bin" - .align 2 -unknown_149:: - .incbin "assets/unknown_149.bin" -gAreaRoomMap_PalaceOfWinds_CloudJumps_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_CloudJumps_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_CloudJumps_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_CloudJumps_1.bin" - .align 2 -unknown_150:: - .incbin "assets/unknown_150.bin" -gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_1.bin" - .align 2 -unknown_151:: - .incbin "assets/unknown_151.bin" -gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_1.bin" - .align 2 -unknown_152:: - .incbin "assets/unknown_152.bin" -gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_1.bin" - .align 2 -unknown_153:: - .incbin "assets/unknown_153.bin" -gAreaRoomMap_PalaceOfWinds_FanBridge_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_FanBridge_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_FanBridge_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_FanBridge_1.bin" - .align 2 -unknown_154:: - .incbin "assets/unknown_154.bin" -gAreaRoomMap_PalaceOfWinds_ToFanBridge_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_ToFanBridge_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_ToFanBridge_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_ToFanBridge_1.bin" - .align 2 -unknown_155:: - .incbin "assets/unknown_155.bin" -gAreaRoomMap_PalaceOfWinds_RedWarpHall_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_RedWarpHall_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_RedWarpHall_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_RedWarpHall_1.bin" - .align 2 -unknown_156:: - .incbin "assets/unknown_156.bin" -gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_0.bin" -gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_1.bin" - .align 2 -unknown_157:: - .incbin "assets/unknown_157.bin" -gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_1.bin" - .align 2 -unknown_158:: - .incbin "assets/unknown_158.bin" -gAreaRoomMap_PalaceOfWinds_CrowRide_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_CrowRide_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_CrowRide_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_CrowRide_1.bin" - .align 2 -unknown_159:: - .incbin "assets/unknown_159.bin" -gAreaRoomMap_PalaceOfWinds_GratePlatformRide_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_GratePlatformRide_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_GratePlatformRide_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_GratePlatformRide_1.bin" - .align 2 -unknown_160:: - .incbin "assets/unknown_160.bin" -gAreaRoomMap_PalaceOfWinds_PotPush_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_PotPush_0.bin" -gAreaRoomMap_PalaceOfWinds_PotPush_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_PotPush_1.bin" - .align 2 -unknown_161:: - .incbin "assets/unknown_161.bin" -gAreaRoomMap_PalaceOfWinds_FloormasterLever_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_FloormasterLever_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_FloormasterLever_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_FloormasterLever_1.bin" - .align 2 -unknown_162:: - .incbin "assets/unknown_162.bin" -gAreaRoomMap_PalaceOfWinds_Map_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_Map_0.bin" -gAreaRoomMap_PalaceOfWinds_Map_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_Map_1.bin" - .align 2 -unknown_163:: - .incbin "assets/unknown_163.bin" -gAreaRoomMap_PalaceOfWinds_CornerToMap_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_CornerToMap_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_CornerToMap_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_CornerToMap_1.bin" - .align 2 -unknown_164:: - .incbin "assets/unknown_164.bin" -gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_1.bin" - .align 2 -unknown_165:: - .incbin "assets/unknown_165.bin" -gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_1.bin" - .align 2 -unknown_166:: - .incbin "assets/unknown_166.bin" -gAreaRoomMap_PalaceOfWinds_KeyArrowButton_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_KeyArrowButton_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_KeyArrowButton_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_KeyArrowButton_1.bin" - .align 2 -unknown_167:: - .incbin "assets/unknown_167.bin" -gAreaRoomMap_PalaceOfWinds_GratesTo3F_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_GratesTo3F_0.bin" -gAreaRoomMap_PalaceOfWinds_GratesTo3F_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_GratesTo3F_1.bin" - .align 2 -unknown_168:: - .incbin "assets/unknown_168.bin" -gAreaRoomMap_PalaceOfWinds_SpinyFight_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_SpinyFight_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_SpinyFight_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_SpinyFight_1.bin" - .align 2 -unknown_169:: - .incbin "assets/unknown_169.bin" -gAreaRoomMap_PalaceOfWinds_PeahatSwitch_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_PeahatSwitch_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_PeahatSwitch_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_PeahatSwitch_1.bin" - .align 2 -unknown_170:: - .incbin "assets/unknown_170.bin" -gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_1.bin" - .align 2 -unknown_171:: - .incbin "assets/unknown_171.bin" -gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_1.bin" - .align 2 -unknown_172:: - .incbin "assets/unknown_172.bin" -gAreaRoomMap_PalaceOfWinds_StalfosFireborHole_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_StalfosFireborHole_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_StalfosFireborHole_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_StalfosFireborHole_1.bin" - .align 2 -unknown_173:: - .incbin "assets/unknown_173.bin" -gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_0.bin" -gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_1.bin" - .align 2 -unknown_174:: - .incbin "assets/unknown_174.bin" -gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_1.bin" - .align 2 -unknown_175:: - .incbin "assets/unknown_175.bin" -gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_1.bin" - .align 2 -unknown_176:: - .incbin "assets/unknown_176.bin" -gAreaRoomMap_PalaceOfWinds_GibdoStairs_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_GibdoStairs_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_GibdoStairs_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_GibdoStairs_1.bin" - .align 2 -unknown_177:: - .incbin "assets/unknown_177.bin" -gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_1.bin" - .align 2 -unknown_178:: - .incbin "assets/unknown_178.bin" -gAreaRoomMap_PalaceOfWinds_RocCape_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_RocCape_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_RocCape_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_RocCape_1.bin" - .align 2 -unknown_179:: - .incbin "assets/unknown_179.bin" -gAreaRoomMap_PalaceOfWinds_FireBarGrates_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_FireBarGrates_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_FireBarGrates_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_FireBarGrates_1.bin" - .align 2 -unknown_180:: - .incbin "assets/unknown_180.bin" -gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_1.bin" - .align 2 -unknown_181:: - .incbin "assets/unknown_181.bin" -gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_1.bin" - .align 2 -unknown_182:: - .incbin "assets/unknown_182.bin" -gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_0.bin" -gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_1.bin" - .align 2 -unknown_183:: - .incbin "assets/unknown_183.bin" -gAreaRoomMap_PalaceOfWinds_EntranceRoom_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_EntranceRoom_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_EntranceRoom_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_EntranceRoom_1.bin" - .align 2 -unknown_184:: - .incbin "assets/unknown_184.bin" -gAreaRoomMap_PalaceOfWinds_DarkCompassHall_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_DarkCompassHall_0.bin" - .align 2 -gAreaRoomMap_PalaceOfWinds_DarkCompassHall_1:: - .incbin "assets/gAreaRoomMap_PalaceOfWinds_DarkCompassHall_1.bin" - .align 2 -unknown_185:: - .incbin "assets/unknown_185.bin" -gAreaRoomMap_PalaceOfWindsBoss_0_0:: - .incbin "assets/gAreaRoomMap_PalaceOfWindsBoss_0_0.bin" - .align 2 -unknown_186:: - .incbin "assets/unknown_186.bin" -gAreaTileset_Sanctuary_0_0:: - .incbin "tilesets/gAreaTileset_Sanctuary_0_0.4bpp.lz" - .align 2 -gAreaTileset_Sanctuary_0_1:: - .incbin "tilesets/gAreaTileset_Sanctuary_0_1.4bpp.lz" - .align 2 -gAreaTileset_Sanctuary_0_2:: - .incbin "tilesets/gAreaTileset_Sanctuary_0_2.4bpp.lz" -gAreaMetatiles_Sanctuary_0:: - .incbin "assets/gAreaMetatiles_Sanctuary_0.bin" - .align 2 -gAreaMetatiles_Sanctuary_1:: - .incbin "assets/gAreaMetatiles_Sanctuary_1.bin" - .align 2 -gAreaMetatiles_Sanctuary_2:: - .incbin "assets/gAreaMetatiles_Sanctuary_2.bin" - .align 2 -gAreaMetatiles_Sanctuary_3:: - .incbin "assets/gAreaMetatiles_Sanctuary_3.bin" -gAreaRoomMap_Sanctuary_0_0:: - .incbin "assets/gAreaRoomMap_Sanctuary_0_0.bin" - .align 2 -gAreaRoomMap_Sanctuary_0_1:: - .incbin "assets/gAreaRoomMap_Sanctuary_0_1.bin" - .align 2 -gAreaRoomMap_Sanctuary_1_0:: - .incbin "assets/gAreaRoomMap_Sanctuary_1_0.bin" - .align 2 -gAreaRoomMap_Sanctuary_1_1:: - .incbin "assets/gAreaRoomMap_Sanctuary_1_1.bin" - .align 2 -gAreaRoomMap_Sanctuary_2_0:: - .incbin "assets/gAreaRoomMap_Sanctuary_2_0.bin" - .align 2 -gAreaRoomMap_Sanctuary_2_1:: - .incbin "assets/gAreaRoomMap_Sanctuary_2_1.bin" - .align 2 -gAreaTileset_HyruleCastle_0_0:: - .incbin "tilesets/gAreaTileset_HyruleCastle_0_0.4bpp.lz" - .align 2 -gAreaTileset_HyruleCastle_0_1:: - .incbin "tilesets/gAreaTileset_HyruleCastle_0_1.4bpp.lz" - .align 2 -gAreaTileset_HyruleCastle_0_2:: - .incbin "tilesets/gAreaTileset_HyruleCastle_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_HyruleCastle_0:: - .incbin "assets/gAreaMetatiles_HyruleCastle_0.bin" - .align 2 -gAreaMetatiles_HyruleCastle_1:: - .incbin "assets/gAreaMetatiles_HyruleCastle_1.bin" - .align 2 -gAreaMetatiles_HyruleCastle_2:: - .incbin "assets/gAreaMetatiles_HyruleCastle_2.bin" - .align 2 -gAreaMetatiles_HyruleCastle_3:: - .incbin "assets/gAreaMetatiles_HyruleCastle_3.bin" -gAreaRoomMap_HyruleCastle_0_0:: - .incbin "assets/gAreaRoomMap_HyruleCastle_0_0.bin" - .align 2 -gAreaRoomMap_HyruleCastle_0_1:: - .incbin "assets/gAreaRoomMap_HyruleCastle_0_1.bin" -gAreaRoomMap_HyruleCastle_1_0:: - .incbin "assets/gAreaRoomMap_HyruleCastle_1_0.bin" - .align 2 -gAreaRoomMap_HyruleCastle_1_1:: - .incbin "assets/gAreaRoomMap_HyruleCastle_1_1.bin" -gAreaRoomMap_HyruleCastle_2_0:: - .incbin "assets/gAreaRoomMap_HyruleCastle_2_0.bin" - .align 2 -gAreaRoomMap_HyruleCastle_2_1:: - .incbin "assets/gAreaRoomMap_HyruleCastle_2_1.bin" - .align 2 -gAreaRoomMap_HyruleCastle_3_0:: - .incbin "assets/gAreaRoomMap_HyruleCastle_3_0.bin" - .align 2 -gAreaRoomMap_HyruleCastle_3_1:: - .incbin "assets/gAreaRoomMap_HyruleCastle_3_1.bin" - .align 2 -gAreaRoomMap_HyruleCastle_4_0:: - .incbin "assets/gAreaRoomMap_HyruleCastle_4_0.bin" - .align 2 -gAreaRoomMap_HyruleCastle_4_1:: - .incbin "assets/gAreaRoomMap_HyruleCastle_4_1.bin" -gAreaRoomMap_HyruleCastle_5_0:: - .incbin "assets/gAreaRoomMap_HyruleCastle_5_0.bin" - .align 2 -gAreaRoomMap_HyruleCastle_5_1:: - .incbin "assets/gAreaRoomMap_HyruleCastle_5_1.bin" - .align 2 -gAreaRoomMap_HyruleCastle_6_0:: - .incbin "assets/gAreaRoomMap_HyruleCastle_6_0.bin" - .align 2 -gAreaRoomMap_HyruleCastle_6_1:: - .incbin "assets/gAreaRoomMap_HyruleCastle_6_1.bin" - .align 2 +gRoomMapping_MinishHouseInteriors_HyruleFieldSouthwest_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/32_HyruleFieldSouthwest/gRoomMapping_MinishHouseInteriors_HyruleFieldSouthwest_bottom.bin.lz" +gAreaTileSet_MinishHouseInteriors_12_0:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSets/12/gAreaTileSet_MinishHouseInteriors_12_0.8bpp.lz" +gRoomCollisionMap_MinishHouseInteriors_HyruleFieldSouthwest:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/32_HyruleFieldSouthwest/gRoomCollisionMap_MinishHouseInteriors_HyruleFieldSouthwest.bin.lz" +gRoomMapping_MinishHouseInteriors_SouthHyruleField_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/33_SouthHyruleField/gRoomMapping_MinishHouseInteriors_SouthHyruleField_bottom.bin.lz" +gAreaTileSet_MinishHouseInteriors_13_0:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSets/13/gAreaTileSet_MinishHouseInteriors_13_0.8bpp.lz" +gRoomCollisionMap_MinishHouseInteriors_SouthHyruleField:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/33_SouthHyruleField/gRoomCollisionMap_MinishHouseInteriors_SouthHyruleField.bin.lz" +gRoomMapping_MinishHouseInteriors_NextToKnuckle_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/34_NextToKnuckle/gRoomMapping_MinishHouseInteriors_NextToKnuckle_bottom.bin.lz" +gAreaTileSet_MinishHouseInteriors_14_0:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSets/14/gAreaTileSet_MinishHouseInteriors_14_0.8bpp.lz" +gRoomCollisionMap_MinishHouseInteriors_NextToKnuckle:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/34_NextToKnuckle/gRoomCollisionMap_MinishHouseInteriors_NextToKnuckle.bin.lz" +gRoomMapping_MinishHouseInteriors_Librari_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/35_Librari/gRoomMapping_MinishHouseInteriors_Librari_bottom.bin.lz" +gAreaTileSet_MinishHouseInteriors_15_0:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSets/15/gAreaTileSet_MinishHouseInteriors_15_0.8bpp.lz" +gRoomCollisionMap_MinishHouseInteriors_Librari:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/35_Librari/gRoomCollisionMap_MinishHouseInteriors_Librari.bin.lz" +gRoomMapping_MinishHouseInteriors_HyruleFieldExit_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/36_HyruleFieldExit/gRoomMapping_MinishHouseInteriors_HyruleFieldExit_bottom.bin.lz" +gAreaTileSet_MinishHouseInteriors_16_0:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSets/16/gAreaTileSet_MinishHouseInteriors_16_0.8bpp.lz" +gRoomCollisionMap_MinishHouseInteriors_HyruleFieldExit:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/36_HyruleFieldExit/gRoomCollisionMap_MinishHouseInteriors_HyruleFieldExit.bin.lz" +gRoomMapping_MinishHouseInteriors_HyruleTown_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/37_HyruleTown/gRoomMapping_MinishHouseInteriors_HyruleTown_bottom.bin.lz" +gAreaTileSet_MinishHouseInteriors_17_0:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSets/17/gAreaTileSet_MinishHouseInteriors_17_0.8bpp.lz" +gRoomCollisionMap_MinishHouseInteriors_HyruleTown:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/37_HyruleTown/gRoomCollisionMap_MinishHouseInteriors_HyruleTown.bin.lz" +gRoomMapping_MinishHouseInteriors_MinishWoodsBomb_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/38_MinishWoodsBomb/gRoomMapping_MinishHouseInteriors_MinishWoodsBomb_bottom.bin.lz" +gAreaTileSet_MinishHouseInteriors_18_0:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSets/18/gAreaTileSet_MinishHouseInteriors_18_0.8bpp.lz" +gRoomCollisionMap_MinishHouseInteriors_MinishWoodsBomb:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/38_MinishWoodsBomb/gRoomCollisionMap_MinishHouseInteriors_MinishWoodsBomb.bin.lz" +gRoomMapping_MinishHouseInteriors_LakeHyliaOcarina_bottom:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/39_LakeHyliaOcarina/gRoomMapping_MinishHouseInteriors_LakeHyliaOcarina_bottom.bin.lz" +gAreaTileSet_MinishHouseInteriors_19_0:: + .incbin "maps/areas/032_MinishHouseInteriors/tileSets/19/gAreaTileSet_MinishHouseInteriors_19_0.8bpp.lz" +gRoomCollisionMap_MinishHouseInteriors_LakeHyliaOcarina:: + .incbin "maps/areas/032_MinishHouseInteriors/rooms/39_LakeHyliaOcarina/gRoomCollisionMap_MinishHouseInteriors_LakeHyliaOcarina.bin.lz" +gRoomMapping_TownMinishHoles_MayorsHouse_bottom:: + .incbin "maps/areas/045_TownMinishHoles/rooms/00_MayorsHouse/gRoomMapping_TownMinishHoles_MayorsHouse_bottom.bin.lz" +gAreaTileSet_TownMinishHoles_0_0:: + .incbin "maps/areas/045_TownMinishHoles/tileSets/0/gAreaTileSet_TownMinishHoles_0_0.8bpp.lz" +gRoomCollisionMap_TownMinishHoles_MayorsHouse:: + .incbin "maps/areas/045_TownMinishHoles/rooms/00_MayorsHouse/gRoomCollisionMap_TownMinishHoles_MayorsHouse.bin.lz" +gRoomMapping_TownMinishHoles_WestOracle_bottom:: + .incbin "maps/areas/045_TownMinishHoles/rooms/01_WestOracle/gRoomMapping_TownMinishHoles_WestOracle_bottom.bin.lz" +gAreaTileSet_TownMinishHoles_1_0:: + .incbin "maps/areas/045_TownMinishHoles/tileSets/1/gAreaTileSet_TownMinishHoles_1_0.8bpp.lz" +gRoomCollisionMap_TownMinishHoles_WestOracle:: + .incbin "maps/areas/045_TownMinishHoles/rooms/01_WestOracle/gRoomCollisionMap_TownMinishHoles_WestOracle.bin.lz" +gRoomMapping_TownMinishHoles_DrLeft_bottom:: + .incbin "maps/areas/045_TownMinishHoles/rooms/02_DrLeft/gRoomMapping_TownMinishHoles_DrLeft_bottom.bin.lz" +gAreaTileSet_TownMinishHoles_2_0:: + .incbin "maps/areas/045_TownMinishHoles/tileSets/2/gAreaTileSet_TownMinishHoles_2_0.8bpp.lz" +gRoomCollisionMap_TownMinishHoles_DrLeft:: + .incbin "maps/areas/045_TownMinishHoles/rooms/02_DrLeft/gRoomCollisionMap_TownMinishHoles_DrLeft.bin.lz" +gRoomMapping_TownMinishHoles_Carpenter_bottom:: + .incbin "maps/areas/045_TownMinishHoles/rooms/03_Carpenter/gRoomMapping_TownMinishHoles_Carpenter_bottom.bin.lz" +gAreaTileSet_TownMinishHoles_3_0:: + .incbin "maps/areas/045_TownMinishHoles/tileSets/3/gAreaTileSet_TownMinishHoles_3_0.8bpp.lz" +gRoomCollisionMap_TownMinishHoles_Carpenter:: + .incbin "maps/areas/045_TownMinishHoles/rooms/03_Carpenter/gRoomCollisionMap_TownMinishHoles_Carpenter.bin.lz" +gRoomMapping_TownMinishHoles_Cafe_bottom:: + .incbin "maps/areas/045_TownMinishHoles/rooms/04_Cafe/gRoomMapping_TownMinishHoles_Cafe_bottom.bin.lz" +gAreaTileSet_TownMinishHoles_4_0:: + .incbin "maps/areas/045_TownMinishHoles/tileSets/4/gAreaTileSet_TownMinishHoles_4_0.8bpp.lz" +gRoomCollisionMap_TownMinishHoles_Cafe:: + .incbin "maps/areas/045_TownMinishHoles/rooms/04_Cafe/gRoomCollisionMap_TownMinishHoles_Cafe.bin.lz" +gRoomMapping_TownMinishHoles_5_bottom:: + .incbin "maps/areas/045_TownMinishHoles/rooms/05_5/gRoomMapping_TownMinishHoles_5_bottom.bin.lz" +gAreaTileSet_TownMinishHoles_5_0:: + .incbin "maps/areas/045_TownMinishHoles/tileSets/5/gAreaTileSet_TownMinishHoles_5_0.8bpp.lz" +gRoomCollisionMap_TownMinishHoles_5:: + .incbin "maps/areas/045_TownMinishHoles/rooms/05_5/gRoomCollisionMap_TownMinishHoles_5.bin.lz" +gRoomMapping_TownMinishHoles_LibraryBookshelf_bottom:: + .incbin "maps/areas/045_TownMinishHoles/rooms/16_LibraryBookshelf/gRoomMapping_TownMinishHoles_LibraryBookshelf_bottom.bin.lz" +gAreaTileSet_TownMinishHoles_6_0:: + .incbin "maps/areas/045_TownMinishHoles/tileSets/6/gAreaTileSet_TownMinishHoles_6_0.8bpp.lz" +gRoomCollisionMap_TownMinishHoles_LibraryBookshelf:: + .incbin "maps/areas/045_TownMinishHoles/rooms/16_LibraryBookshelf/gRoomCollisionMap_TownMinishHoles_LibraryBookshelf.bin.lz" +gRoomMapping_TownMinishHoles_LibraryBooksHouse_bottom:: + .incbin "maps/areas/045_TownMinishHoles/rooms/17_LibraryBooksHouse/gRoomMapping_TownMinishHoles_LibraryBooksHouse_bottom.bin.lz" +gAreaTileSet_TownMinishHoles_7_0:: + .incbin "maps/areas/045_TownMinishHoles/tileSets/7/gAreaTileSet_TownMinishHoles_7_0.8bpp.lz" +gRoomCollisionMap_TownMinishHoles_LibraryBooksHouse:: + .incbin "maps/areas/045_TownMinishHoles/rooms/17_LibraryBooksHouse/gRoomCollisionMap_TownMinishHoles_LibraryBooksHouse.bin.lz" +gRoomMapping_TownMinishHoles_RemShoeShop_bottom:: + .incbin "maps/areas/045_TownMinishHoles/rooms/18_RemShoeShop/gRoomMapping_TownMinishHoles_RemShoeShop_bottom.bin.lz" +gAreaTileSet_TownMinishHoles_8_0:: + .incbin "maps/areas/045_TownMinishHoles/tileSets/8/gAreaTileSet_TownMinishHoles_8_0.8bpp.lz" +gRoomCollisionMap_TownMinishHoles_RemShoeShop:: + .incbin "maps/areas/045_TownMinishHoles/rooms/18_RemShoeShop/gRoomCollisionMap_TownMinishHoles_RemShoeShop.bin.lz" +gAreaTileSet_40_0_0:: + .incbin "maps/areas/064_40/tileSets/0/gAreaTileSet_40_0_0.4bpp.lz" +gAreaTileSet_40_0_1:: + .incbin "maps/areas/064_40/tileSets/0/gAreaTileSet_40_0_1.4bpp.lz" +gAreaTileSet_40_0_2:: + .incbin "maps/areas/064_40/tileSets/0/gAreaTileSet_40_0_2.4bpp.lz" +gAreaTileSet_40_bottom:: + .incbin "maps/areas/064_40/tileSet/gAreaTileSet_40_bottom.bin.lz" +gAreaTileSet_40_top:: + .incbin "maps/areas/064_40/tileSet/gAreaTileSet_40_top.bin.lz" +gAreaTileSetTypes_40_bottom:: + .incbin "maps/areas/064_40/tileSet/gAreaTileSetTypes_40_bottom.bin.lz" +gAreaTileSetTypes_40_top:: + .incbin "maps/areas/064_40/tileSet/gAreaTileSetTypes_40_top.bin.lz" +gAreaRoomMap_40_0_bottom:: + .incbin "maps/areas/064_40/rooms/00_0/gAreaRoomMap_40_0_bottom.bin.lz" +gAreaRoomMap_40_0_top:: + .incbin "maps/areas/064_40/rooms/00_0/gAreaRoomMap_40_0_top.bin.lz" +gAreaRoomMap_40_1_bottom:: + .incbin "maps/areas/064_40/rooms/01_1/gAreaRoomMap_40_1_bottom.bin.lz" +gAreaRoomMap_40_1_top:: + .incbin "maps/areas/064_40/rooms/01_1/gAreaRoomMap_40_1_top.bin.lz" +gAreaRoomMap_40_2_bottom:: + .incbin "maps/areas/064_40/rooms/02_2/gAreaRoomMap_40_2_bottom.bin.lz" +gAreaRoomMap_40_2_top:: + .incbin "maps/areas/064_40/rooms/02_2/gAreaRoomMap_40_2_top.bin.lz" +gAreaRoomMap_40_3_bottom:: + .incbin "maps/areas/064_40/rooms/03_3/gAreaRoomMap_40_3_bottom.bin.lz" +gAreaRoomMap_40_3_top:: + .incbin "maps/areas/064_40/rooms/03_3/gAreaRoomMap_40_3_top.bin.lz" +gAreaRoomMap_40_4_bottom:: + .incbin "maps/areas/064_40/rooms/04_4/gAreaRoomMap_40_4_bottom.bin.lz" +gAreaRoomMap_40_4_top:: + .incbin "maps/areas/064_40/rooms/04_4/gAreaRoomMap_40_4_top.bin.lz" +gAreaRoomMap_40_5_bottom:: + .incbin "maps/areas/064_40/rooms/05_5/gAreaRoomMap_40_5_bottom.bin.lz" +gAreaRoomMap_40_5_top:: + .incbin "maps/areas/064_40/rooms/05_5/gAreaRoomMap_40_5_top.bin.lz" +gAreaRoomMap_40_6_bottom:: + .incbin "maps/areas/064_40/rooms/06_6/gAreaRoomMap_40_6_bottom.bin.lz" +gAreaRoomMap_40_6_top:: + .incbin "maps/areas/064_40/rooms/06_6/gAreaRoomMap_40_6_top.bin.lz" +gAreaRoomMap_40_7_bottom:: + .incbin "maps/areas/064_40/rooms/07_7/gAreaRoomMap_40_7_bottom.bin.lz" +gAreaRoomMap_40_7_top:: + .incbin "maps/areas/064_40/rooms/07_7/gAreaRoomMap_40_7_top.bin.lz" +gAreaRoomMap_40_8_bottom:: + .incbin "maps/areas/064_40/rooms/08_8/gAreaRoomMap_40_8_bottom.bin.lz" +gAreaRoomMap_40_8_top:: + .incbin "maps/areas/064_40/rooms/08_8/gAreaRoomMap_40_8_top.bin.lz" +gAreaRoomMap_HyruleTownUnderground_0_bottom:: + .incbin "maps/areas/065_HyruleTownUnderground/rooms/00_0/gAreaRoomMap_HyruleTownUnderground_0_bottom.bin.lz" +gAreaRoomMap_HyruleTownUnderground_0_top:: + .incbin "maps/areas/065_HyruleTownUnderground/rooms/00_0/gAreaRoomMap_HyruleTownUnderground_0_top.bin.lz" +gAreaRoomMap_HyruleTownUnderground_1_bottom:: + .incbin "maps/areas/065_HyruleTownUnderground/rooms/01_1/gAreaRoomMap_HyruleTownUnderground_1_bottom.bin.lz" +gAreaRoomMap_HyruleTownUnderground_1_top:: + .incbin "maps/areas/065_HyruleTownUnderground/rooms/01_1/gAreaRoomMap_HyruleTownUnderground_1_top.bin.lz" +gAreaRoomMap_GardenFountains_East_bottom:: + .incbin "maps/areas/066_GardenFountains/rooms/00_East/gAreaRoomMap_GardenFountains_East_bottom.bin.lz" +gAreaRoomMap_GardenFountains_East_top:: + .incbin "maps/areas/066_GardenFountains/rooms/00_East/gAreaRoomMap_GardenFountains_East_top.bin.lz" +gAreaRoomMap_GardenFountains_West_bottom:: + .incbin "maps/areas/066_GardenFountains/rooms/01_West/gAreaRoomMap_GardenFountains_West_bottom.bin.lz" +gAreaRoomMap_GardenFountains_West_top:: + .incbin "maps/areas/066_GardenFountains/rooms/01_West/gAreaRoomMap_GardenFountains_West_top.bin.lz" +gAreaRoomMap_HyruleCastleCellar_0_bottom:: + .incbin "maps/areas/067_HyruleCastleCellar/rooms/00_0/gAreaRoomMap_HyruleCastleCellar_0_bottom.bin.lz" +gAreaRoomMap_HyruleCastleCellar_0_top:: + .incbin "maps/areas/067_HyruleCastleCellar/rooms/00_0/gAreaRoomMap_HyruleCastleCellar_0_top.bin.lz" +gAreaRoomMap_HyruleCastleCellar_1_bottom:: + .incbin "maps/areas/067_HyruleCastleCellar/rooms/01_1/gAreaRoomMap_HyruleCastleCellar_1_bottom.bin.lz" +gAreaRoomMap_HyruleCastleCellar_1_top:: + .incbin "maps/areas/067_HyruleCastleCellar/rooms/01_1/gAreaRoomMap_HyruleCastleCellar_1_top.bin.lz" +gAreaRoomMap_SimonsSimulation_0_bottom:: + .incbin "maps/areas/068_SimonsSimulation/rooms/00_0/gAreaRoomMap_SimonsSimulation_0_bottom.bin.lz" +gAreaRoomMap_SimonsSimulation_0_top:: + .incbin "maps/areas/068_SimonsSimulation/rooms/00_0/gAreaRoomMap_SimonsSimulation_0_top.bin.lz" +gAreaTileSet_DeepwoodShrine_0_0:: + .incbin "maps/areas/072_DeepwoodShrine/tileSets/0/gAreaTileSet_DeepwoodShrine_0_0.4bpp.lz" +gAreaTileSet_DeepwoodShrine_0_1:: + .incbin "maps/areas/072_DeepwoodShrine/tileSets/0/gAreaTileSet_DeepwoodShrine_0_1.4bpp.lz" +gAreaTileSet_DeepwoodShrine_0_2:: + .incbin "maps/areas/072_DeepwoodShrine/tileSets/0/gAreaTileSet_DeepwoodShrine_0_2.4bpp.lz" +gAreaTileSet_DeepwoodShrine_bottom:: + .incbin "maps/areas/072_DeepwoodShrine/tileSet/gAreaTileSet_DeepwoodShrine_bottom.bin.lz" +gAreaTileSet_DeepwoodShrine_top:: + .incbin "maps/areas/072_DeepwoodShrine/tileSet/gAreaTileSet_DeepwoodShrine_top.bin.lz" +gAreaTileSetTypes_DeepwoodShrine_bottom:: + .incbin "maps/areas/072_DeepwoodShrine/tileSet/gAreaTileSetTypes_DeepwoodShrine_bottom.bin.lz" +gAreaTileSetTypes_DeepwoodShrine_top:: + .incbin "maps/areas/072_DeepwoodShrine/tileSet/gAreaTileSetTypes_DeepwoodShrine_top.bin.lz" +gAreaTileSet_DeepwoodShrineBoss_0_0:: + .incbin "maps/areas/073_DeepwoodShrineBoss/tileSets/0/gAreaTileSet_DeepwoodShrineBoss_0_0.4bpp.lz" +gAreaTileSet_DeepwoodShrineBoss_0_1:: + .incbin "maps/areas/073_DeepwoodShrineBoss/tileSets/0/gAreaTileSet_DeepwoodShrineBoss_0_1.4bpp.lz" +gAreaTileSet_DeepwoodShrineBoss_0_2:: + .incbin "maps/areas/073_DeepwoodShrineBoss/tileSets/0/gAreaTileSet_DeepwoodShrineBoss_0_2.4bpp.lz" +gAreaTileSet_DeepwoodShrineBoss_bottom:: + .incbin "maps/areas/073_DeepwoodShrineBoss/tileSet/gAreaTileSet_DeepwoodShrineBoss_bottom.bin.lz" +gAreaTileSet_DeepwoodShrineBoss_top:: + .incbin "maps/areas/073_DeepwoodShrineBoss/tileSet/gAreaTileSet_DeepwoodShrineBoss_top.bin.lz" +gAreaTileSetTypes_DeepwoodShrineBoss_bottom:: + .incbin "maps/areas/073_DeepwoodShrineBoss/tileSet/gAreaTileSetTypes_DeepwoodShrineBoss_bottom.bin.lz" +gAreaTileSetTypes_DeepwoodShrineBoss_top:: + .incbin "maps/areas/073_DeepwoodShrineBoss/tileSet/gAreaTileSetTypes_DeepwoodShrineBoss_top.bin.lz" +gAreaTileSet_DeepwoodShrineEntry_0_0:: + .incbin "maps/areas/074_DeepwoodShrineEntry/tileSets/0/gAreaTileSet_DeepwoodShrineEntry_0_0.4bpp.lz" +gAreaTileSet_DeepwoodShrineEntry_0_1:: + .incbin "maps/areas/074_DeepwoodShrineEntry/tileSets/0/gAreaTileSet_DeepwoodShrineEntry_0_1.4bpp.lz" +gAreaTileSet_DeepwoodShrineEntry_0_2:: + .incbin "maps/areas/074_DeepwoodShrineEntry/tileSets/0/gAreaTileSet_DeepwoodShrineEntry_0_2.4bpp.lz" +gAreaTileSet_DeepwoodShrineEntry_bottom:: + .incbin "maps/areas/074_DeepwoodShrineEntry/tileSet/gAreaTileSet_DeepwoodShrineEntry_bottom.bin.lz" +gAreaTileSet_DeepwoodShrineEntry_top:: + .incbin "maps/areas/074_DeepwoodShrineEntry/tileSet/gAreaTileSet_DeepwoodShrineEntry_top.bin.lz" +gAreaTileSetTypes_DeepwoodShrineEntry_bottom:: + .incbin "maps/areas/074_DeepwoodShrineEntry/tileSet/gAreaTileSetTypes_DeepwoodShrineEntry_bottom.bin.lz" +gAreaTileSetTypes_DeepwoodShrineEntry_top:: + .incbin "maps/areas/074_DeepwoodShrineEntry/tileSet/gAreaTileSetTypes_DeepwoodShrineEntry_top.bin.lz" +gAreaRoomMap_DeepwoodShrine_Madderpillar_bottom:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/00_Madderpillar/gAreaRoomMap_DeepwoodShrine_Madderpillar_bottom.bin.lz" +gAreaRoomMap_DeepwoodShrine_Madderpillar_top:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/00_Madderpillar/gAreaRoomMap_DeepwoodShrine_Madderpillar_top.bin.lz" + gDungeonMaps_DeepwoodShrine_Madderpillar:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/00_Madderpillar/dungeon_map.bin" +gAreaRoomMap_DeepwoodShrine_BluePortal_bottom:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/01_BluePortal/gAreaRoomMap_DeepwoodShrine_BluePortal_bottom.bin.lz" +gAreaRoomMap_DeepwoodShrine_BluePortal_top:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/01_BluePortal/gAreaRoomMap_DeepwoodShrine_BluePortal_top.bin.lz" + gDungeonMaps_DeepwoodShrine_BluePortal:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/01_BluePortal/dungeon_map.bin" +gAreaRoomMap_DeepwoodShrine_StairsToB1_bottom:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/02_StairsToB1/gAreaRoomMap_DeepwoodShrine_StairsToB1_bottom.bin.lz" +gAreaRoomMap_DeepwoodShrine_StairsToB1_top:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/02_StairsToB1/gAreaRoomMap_DeepwoodShrine_StairsToB1_top.bin.lz" + gDungeonMaps_DeepwoodShrine_StairsToB1:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/02_StairsToB1/dungeon_map.bin" +gAreaRoomMap_DeepwoodShrine_PotBridge_bottom:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/03_PotBridge/gAreaRoomMap_DeepwoodShrine_PotBridge_bottom.bin.lz" +gAreaRoomMap_DeepwoodShrine_PotBridge_top:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/03_PotBridge/gAreaRoomMap_DeepwoodShrine_PotBridge_top.bin.lz" + gDungeonMaps_DeepwoodShrine_PotBridge:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/03_PotBridge/dungeon_map.bin" +gAreaRoomMap_DeepwoodShrine_DoubleStatue_bottom:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/04_DoubleStatue/gAreaRoomMap_DeepwoodShrine_DoubleStatue_bottom.bin.lz" +gAreaRoomMap_DeepwoodShrine_DoubleStatue_top:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/04_DoubleStatue/gAreaRoomMap_DeepwoodShrine_DoubleStatue_top.bin.lz" + gDungeonMaps_DeepwoodShrine_DoubleStatue:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/04_DoubleStatue/dungeon_map.bin" +gAreaRoomMap_DeepwoodShrine_Map_bottom:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/05_Map/gAreaRoomMap_DeepwoodShrine_Map_bottom.bin.lz" +gAreaRoomMap_DeepwoodShrine_Map_top:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/05_Map/gAreaRoomMap_DeepwoodShrine_Map_top.bin.lz" + gDungeonMaps_DeepwoodShrine_Map:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/05_Map/dungeon_map.bin" +gAreaRoomMap_DeepwoodShrine_Barrel_bottom:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/06_Barrel/gAreaRoomMap_DeepwoodShrine_Barrel_bottom.bin.lz" +gAreaRoomMap_DeepwoodShrine_Barrel_top:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/06_Barrel/gAreaRoomMap_DeepwoodShrine_Barrel_top.bin.lz" + gDungeonMaps_DeepwoodShrine_Barrel:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/06_Barrel/dungeon_map.bin" +gAreaRoomMap_DeepwoodShrine_Button_bottom:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/07_Button/gAreaRoomMap_DeepwoodShrine_Button_bottom.bin.lz" +gAreaRoomMap_DeepwoodShrine_Button_top:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/07_Button/gAreaRoomMap_DeepwoodShrine_Button_top.bin.lz" + gDungeonMaps_DeepwoodShrine_Button:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/07_Button/dungeon_map.bin" +gAreaRoomMap_DeepwoodShrine_Mulldozer_bottom:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/08_Mulldozer/gAreaRoomMap_DeepwoodShrine_Mulldozer_bottom.bin.lz" +gAreaRoomMap_DeepwoodShrine_Mulldozer_top:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/08_Mulldozer/gAreaRoomMap_DeepwoodShrine_Mulldozer_top.bin.lz" + gDungeonMaps_DeepwoodShrine_Mulldozer:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/08_Mulldozer/dungeon_map.bin" +gAreaRoomMap_DeepwoodShrine_Pillars_bottom:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/09_Pillars/gAreaRoomMap_DeepwoodShrine_Pillars_bottom.bin.lz" +gAreaRoomMap_DeepwoodShrine_Pillars_top:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/09_Pillars/gAreaRoomMap_DeepwoodShrine_Pillars_top.bin.lz" + gDungeonMaps_DeepwoodShrine_Pillars:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/09_Pillars/dungeon_map.bin" +gAreaRoomMap_DeepwoodShrine_Lever_bottom:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/10_Lever/gAreaRoomMap_DeepwoodShrine_Lever_bottom.bin.lz" +gAreaRoomMap_DeepwoodShrine_Lever_top:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/10_Lever/gAreaRoomMap_DeepwoodShrine_Lever_top.bin.lz" + gDungeonMaps_DeepwoodShrine_Lever:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/10_Lever/dungeon_map.bin" +gAreaRoomMap_DeepwoodShrine_Entrance_bottom:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/11_Entrance/gAreaRoomMap_DeepwoodShrine_Entrance_bottom.bin.lz" +gAreaRoomMap_DeepwoodShrine_Entrance_top:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/11_Entrance/gAreaRoomMap_DeepwoodShrine_Entrance_top.bin.lz" + gDungeonMaps_DeepwoodShrine_Entrance:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/11_Entrance/dungeon_map.bin" +gAreaRoomMap_DeepwoodShrine_Torches_bottom:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/16_Torches/gAreaRoomMap_DeepwoodShrine_Torches_bottom.bin.lz" +gAreaRoomMap_DeepwoodShrine_Torches_top:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/16_Torches/gAreaRoomMap_DeepwoodShrine_Torches_top.bin.lz" + gDungeonMaps_DeepwoodShrine_Torches:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/16_Torches/dungeon_map.bin" +gAreaRoomMap_DeepwoodShrine_BossKey_bottom:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/17_BossKey/gAreaRoomMap_DeepwoodShrine_BossKey_bottom.bin.lz" +gAreaRoomMap_DeepwoodShrine_BossKey_top:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/17_BossKey/gAreaRoomMap_DeepwoodShrine_BossKey_top.bin.lz" + gDungeonMaps_DeepwoodShrine_BossKey:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/17_BossKey/dungeon_map.bin" +gAreaRoomMap_DeepwoodShrine_Compass_bottom:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/18_Compass/gAreaRoomMap_DeepwoodShrine_Compass_bottom.bin.lz" +gAreaRoomMap_DeepwoodShrine_Compass_top:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/18_Compass/gAreaRoomMap_DeepwoodShrine_Compass_top.bin.lz" + gDungeonMaps_DeepwoodShrine_Compass:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/18_Compass/dungeon_map.bin" +gAreaRoomMap_DeepwoodShrine_13_bottom:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/19_13/gAreaRoomMap_DeepwoodShrine_13_bottom.bin.lz" +gAreaRoomMap_DeepwoodShrine_13_top:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/19_13/gAreaRoomMap_DeepwoodShrine_13_top.bin.lz" +gDungeonMaps_072_DeepwoodShrine_13_unused:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/19_13/dungeon_map.bin" +gAreaRoomMap_DeepwoodShrine_LilyPadWest_bottom:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/20_LilyPadWest/gAreaRoomMap_DeepwoodShrine_LilyPadWest_bottom.bin.lz" +gAreaRoomMap_DeepwoodShrine_LilyPadWest_top:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/20_LilyPadWest/gAreaRoomMap_DeepwoodShrine_LilyPadWest_top.bin.lz" + gDungeonMaps_DeepwoodShrine_LilyPadWest:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/20_LilyPadWest/dungeon_map.bin" +gAreaRoomMap_DeepwoodShrine_LilyPadEast_bottom:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/21_LilyPadEast/gAreaRoomMap_DeepwoodShrine_LilyPadEast_bottom.bin.lz" +gAreaRoomMap_DeepwoodShrine_LilyPadEast_top:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/21_LilyPadEast/gAreaRoomMap_DeepwoodShrine_LilyPadEast_top.bin.lz" + gDungeonMaps_DeepwoodShrine_LilyPadEast:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/21_LilyPadEast/dungeon_map.bin" +gAreaRoomMap_DeepwoodShrineBoss_Main_bottom:: + .incbin "maps/areas/073_DeepwoodShrineBoss/rooms/00_Main/gAreaRoomMap_DeepwoodShrineBoss_Main_bottom.bin.lz" +gAreaRoomMap_DeepwoodShrineBoss_Main_top:: + .incbin "maps/areas/073_DeepwoodShrineBoss/rooms/00_Main/gAreaRoomMap_DeepwoodShrineBoss_Main_top.bin.lz" + gDungeonMaps_DeepwoodShrineBoss_Main:: + .incbin "maps/areas/073_DeepwoodShrineBoss/rooms/00_Main/dungeon_map.bin" +gAreaRoomMap_DeepwoodShrine_BossDoor_bottom:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/23_BossDoor/gAreaRoomMap_DeepwoodShrine_BossDoor_bottom.bin.lz" +gAreaRoomMap_DeepwoodShrine_BossDoor_top:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/23_BossDoor/gAreaRoomMap_DeepwoodShrine_BossDoor_top.bin.lz" + gDungeonMaps_DeepwoodShrine_BossDoor:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/23_BossDoor/dungeon_map.bin" +gAreaRoomMap_DeepwoodShrine_InsideBarrel_bottom:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/32_InsideBarrel/gAreaRoomMap_DeepwoodShrine_InsideBarrel_bottom.bin.lz" +gAreaRoomMap_DeepwoodShrine_InsideBarrel_top:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/32_InsideBarrel/gAreaRoomMap_DeepwoodShrine_InsideBarrel_top.bin.lz" +gDungeonMaps_DeepwoodShrine_InsideBarrel_unused:: + .incbin "maps/areas/072_DeepwoodShrine/rooms/32_InsideBarrel/dungeon_map.bin" +gAreaRoomMap_DeepwoodShrineEntry_Main_bottom:: + .incbin "maps/areas/074_DeepwoodShrineEntry/rooms/00_Main/gAreaRoomMap_DeepwoodShrineEntry_Main_bottom.bin" +gAreaRoomMap_DeepwoodShrineEntry_Main_top:: + .incbin "maps/areas/074_DeepwoodShrineEntry/rooms/00_Main/gAreaRoomMap_DeepwoodShrineEntry_Main_top.bin.lz" +gAreaTileSet_CaveOfFlames_0_0:: + .incbin "maps/areas/080_CaveOfFlames/tileSets/0/gAreaTileSet_CaveOfFlames_0_0.4bpp.lz" +gAreaTileSet_CaveOfFlames_0_1:: + .incbin "maps/areas/080_CaveOfFlames/tileSets/0/gAreaTileSet_CaveOfFlames_0_1.4bpp.lz" +gAreaTileSet_CaveOfFlames_0_2:: + .incbin "maps/areas/080_CaveOfFlames/tileSets/0/gAreaTileSet_CaveOfFlames_0_2.4bpp.lz" +gAreaTileSet_CaveOfFlames_bottom:: + .incbin "maps/areas/080_CaveOfFlames/tileSet/gAreaTileSet_CaveOfFlames_bottom.bin.lz" +gAreaTileSet_CaveOfFlames_top:: + .incbin "maps/areas/080_CaveOfFlames/tileSet/gAreaTileSet_CaveOfFlames_top.bin.lz" +gAreaTileSetTypes_CaveOfFlames_bottom:: + .incbin "maps/areas/080_CaveOfFlames/tileSet/gAreaTileSetTypes_CaveOfFlames_bottom.bin.lz" +gAreaTileSetTypes_CaveOfFlames_top:: + .incbin "maps/areas/080_CaveOfFlames/tileSet/gAreaTileSetTypes_CaveOfFlames_top.bin.lz" +gAreaTileSet_CaveOfFlamesBoss_0_0:: + .incbin "maps/areas/081_CaveOfFlamesBoss/tileSets/0/gAreaTileSet_CaveOfFlamesBoss_0_0.4bpp.lz" +gAreaTileSet_CaveOfFlamesBoss_0_1:: + .incbin "maps/areas/081_CaveOfFlamesBoss/tileSets/0/gAreaTileSet_CaveOfFlamesBoss_0_1.4bpp.lz" +gAreaTileSet_CaveOfFlamesBoss_0_2:: + .incbin "maps/areas/081_CaveOfFlamesBoss/tileSets/0/gAreaTileSet_CaveOfFlamesBoss_0_2.4bpp.lz" +gAreaTileSet_CaveOfFlamesBoss_bottom:: + .incbin "maps/areas/081_CaveOfFlamesBoss/tileSet/gAreaTileSet_CaveOfFlamesBoss_bottom.bin.lz" +gAreaTileSet_CaveOfFlamesBoss_top:: + .incbin "maps/areas/081_CaveOfFlamesBoss/tileSet/gAreaTileSet_CaveOfFlamesBoss_top.bin.lz" +gAreaTileSetTypes_CaveOfFlamesBoss_bottom:: + .incbin "maps/areas/081_CaveOfFlamesBoss/tileSet/gAreaTileSetTypes_CaveOfFlamesBoss_bottom.bin.lz" +gAreaTileSetTypes_CaveOfFlamesBoss_top:: + .incbin "maps/areas/081_CaveOfFlamesBoss/tileSet/gAreaTileSetTypes_CaveOfFlamesBoss_top.bin.lz" +gAreaTileSet_CaveOfFlames_0_3:: + .incbin "maps/areas/080_CaveOfFlames/tileSets/0/gAreaTileSet_CaveOfFlames_0_3.4bpp.lz" +gAreaRoomMap_CaveOfFlames_AfterCane_bottom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/00_AfterCane/gAreaRoomMap_CaveOfFlames_AfterCane_bottom.bin.lz" +gAreaRoomMap_CaveOfFlames_AfterCane_top:: + .incbin "maps/areas/080_CaveOfFlames/rooms/00_AfterCane/gAreaRoomMap_CaveOfFlames_AfterCane_top.bin.lz" + gDungeonMaps_CaveOfFlames_AfterCane:: + .incbin "maps/areas/080_CaveOfFlames/rooms/00_AfterCane/dungeon_map.bin" +gAreaRoomMap_CaveOfFlames_SpinyChu_bottom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/01_SpinyChu/gAreaRoomMap_CaveOfFlames_SpinyChu_bottom.bin.lz" +gAreaRoomMap_CaveOfFlames_SpinyChu_top:: + .incbin "maps/areas/080_CaveOfFlames/rooms/01_SpinyChu/gAreaRoomMap_CaveOfFlames_SpinyChu_top.bin.lz" + gDungeonMaps_CaveOfFlames_SpinyChu:: + .incbin "maps/areas/080_CaveOfFlames/rooms/01_SpinyChu/dungeon_map.bin" +gAreaRoomMap_CaveOfFlames_CartToSpinyChu_bottom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/02_CartToSpinyChu/gAreaRoomMap_CaveOfFlames_CartToSpinyChu_bottom.bin.lz" +gAreaRoomMap_CaveOfFlames_CartToSpinyChu_top:: + .incbin "maps/areas/080_CaveOfFlames/rooms/02_CartToSpinyChu/gAreaRoomMap_CaveOfFlames_CartToSpinyChu_top.bin.lz" + gDungeonMaps_CaveOfFlames_CartToSpinyChu:: + .incbin "maps/areas/080_CaveOfFlames/rooms/02_CartToSpinyChu/dungeon_map.bin" +gAreaRoomMap_CaveOfFlames_Entrance_bottom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/03_Entrance/gAreaRoomMap_CaveOfFlames_Entrance_bottom.bin.lz" +gAreaRoomMap_CaveOfFlames_Entrance_top:: + .incbin "maps/areas/080_CaveOfFlames/rooms/03_Entrance/gAreaRoomMap_CaveOfFlames_Entrance_top.bin.lz" + gDungeonMaps_CaveOfFlames_Entrance:: + .incbin "maps/areas/080_CaveOfFlames/rooms/03_Entrance/dungeon_map.bin" +gAreaRoomMap_CaveOfFlames_MainCart_bottom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/04_MainCart/gAreaRoomMap_CaveOfFlames_MainCart_bottom.bin.lz" +gAreaRoomMap_CaveOfFlames_MainCart_top:: + .incbin "maps/areas/080_CaveOfFlames/rooms/04_MainCart/gAreaRoomMap_CaveOfFlames_MainCart_top.bin.lz" + gDungeonMaps_CaveOfFlames_MainCart:: + .incbin "maps/areas/080_CaveOfFlames/rooms/04_MainCart/dungeon_map.bin" +gAreaRoomMap_CaveOfFlames_NorthEntrance_bottom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/05_NorthEntrance/gAreaRoomMap_CaveOfFlames_NorthEntrance_bottom.bin.lz" +gAreaRoomMap_CaveOfFlames_NorthEntrance_top:: + .incbin "maps/areas/080_CaveOfFlames/rooms/05_NorthEntrance/gAreaRoomMap_CaveOfFlames_NorthEntrance_top.bin.lz" + gDungeonMaps_CaveOfFlames_NorthEntrance:: + .incbin "maps/areas/080_CaveOfFlames/rooms/05_NorthEntrance/dungeon_map.bin" +gAreaRoomMap_CaveOfFlames_CartWest_bottom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/06_CartWest/gAreaRoomMap_CaveOfFlames_CartWest_bottom.bin.lz" +gAreaRoomMap_CaveOfFlames_CartWest_top:: + .incbin "maps/areas/080_CaveOfFlames/rooms/06_CartWest/gAreaRoomMap_CaveOfFlames_CartWest_top.bin.lz" + gDungeonMaps_CaveOfFlames_CartWest:: + .incbin "maps/areas/080_CaveOfFlames/rooms/06_CartWest/dungeon_map.bin" +gAreaRoomMap_CaveOfFlames_HelmasaurFight_bottom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/07_HelmasaurFight/gAreaRoomMap_CaveOfFlames_HelmasaurFight_bottom.bin.lz" +gAreaRoomMap_CaveOfFlames_HelmasaurFight_top:: + .incbin "maps/areas/080_CaveOfFlames/rooms/07_HelmasaurFight/gAreaRoomMap_CaveOfFlames_HelmasaurFight_top.bin.lz" + gDungeonMaps_CaveOfFlames_HelmasaurFight:: + .incbin "maps/areas/080_CaveOfFlames/rooms/07_HelmasaurFight/dungeon_map.bin" +gAreaRoomMap_CaveOfFlames_RollobiteLavaRoom_bottom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/08_RollobiteLavaRoom/gAreaRoomMap_CaveOfFlames_RollobiteLavaRoom_bottom.bin.lz" +gAreaRoomMap_CaveOfFlames_RollobiteLavaRoom_top:: + .incbin "maps/areas/080_CaveOfFlames/rooms/08_RollobiteLavaRoom/gAreaRoomMap_CaveOfFlames_RollobiteLavaRoom_top.bin.lz" + gDungeonMaps_CaveOfFlames_RollobiteLavaRoom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/08_RollobiteLavaRoom/dungeon_map.bin" +gAreaRoomMap_CaveOfFlames_MinishLavaRoom_bottom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/09_MinishLavaRoom/gAreaRoomMap_CaveOfFlames_MinishLavaRoom_bottom.bin.lz" +gAreaRoomMap_CaveOfFlames_MinishLavaRoom_top:: + .incbin "maps/areas/080_CaveOfFlames/rooms/09_MinishLavaRoom/gAreaRoomMap_CaveOfFlames_MinishLavaRoom_top.bin.lz" + gDungeonMaps_CaveOfFlames_MinishLavaRoom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/09_MinishLavaRoom/dungeon_map.bin" +gAreaRoomMap_CaveOfFlames_MinishSpikes_bottom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/16_MinishSpikes/gAreaRoomMap_CaveOfFlames_MinishSpikes_bottom.bin.lz" +gAreaRoomMap_CaveOfFlames_MinishSpikes_top:: + .incbin "maps/areas/080_CaveOfFlames/rooms/16_MinishSpikes/gAreaRoomMap_CaveOfFlames_MinishSpikes_top.bin.lz" + gDungeonMaps_CaveOfFlames_MinishSpikes:: + .incbin "maps/areas/080_CaveOfFlames/rooms/16_MinishSpikes/dungeon_map.bin" +gAreaRoomMap_CaveOfFlames_TompasDoom_bottom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/17_TompasDoom/gAreaRoomMap_CaveOfFlames_TompasDoom_bottom.bin.lz" +gAreaRoomMap_CaveOfFlames_TompasDoom_top:: + .incbin "maps/areas/080_CaveOfFlames/rooms/17_TompasDoom/gAreaRoomMap_CaveOfFlames_TompasDoom_top.bin.lz" + gDungeonMaps_CaveOfFlames_TompasDoom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/17_TompasDoom/dungeon_map.bin" +gAreaRoomMap_CaveOfFlames_BeforeGleerok_bottom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/18_BeforeGleerok/gAreaRoomMap_CaveOfFlames_BeforeGleerok_bottom.bin.lz" +gAreaRoomMap_CaveOfFlames_BeforeGleerok_top:: + .incbin "maps/areas/080_CaveOfFlames/rooms/18_BeforeGleerok/gAreaRoomMap_CaveOfFlames_BeforeGleerok_top.bin.lz" + gDungeonMaps_CaveOfFlames_BeforeGleerok:: + .incbin "maps/areas/080_CaveOfFlames/rooms/18_BeforeGleerok/dungeon_map.bin" +gAreaRoomMap_CaveOfFlames_BosskeyPath1_bottom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/19_BosskeyPath1/gAreaRoomMap_CaveOfFlames_BosskeyPath1_bottom.bin.lz" +gAreaRoomMap_CaveOfFlames_BosskeyPath1_top:: + .incbin "maps/areas/080_CaveOfFlames/rooms/19_BosskeyPath1/gAreaRoomMap_CaveOfFlames_BosskeyPath1_top.bin.lz" + gDungeonMaps_CaveOfFlames_BosskeyPath1:: + .incbin "maps/areas/080_CaveOfFlames/rooms/19_BosskeyPath1/dungeon_map.bin" +gAreaRoomMap_CaveOfFlames_BosskeyPath2_bottom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/20_BosskeyPath2/gAreaRoomMap_CaveOfFlames_BosskeyPath2_bottom.bin.lz" +gAreaRoomMap_CaveOfFlames_BosskeyPath2_top:: + .incbin "maps/areas/080_CaveOfFlames/rooms/20_BosskeyPath2/gAreaRoomMap_CaveOfFlames_BosskeyPath2_top.bin.lz" + gDungeonMaps_CaveOfFlames_BosskeyPath2:: + .incbin "maps/areas/080_CaveOfFlames/rooms/20_BosskeyPath2/dungeon_map.bin" +gAreaRoomMap_CaveOfFlames_Compass_bottom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/21_Compass/gAreaRoomMap_CaveOfFlames_Compass_bottom.bin.lz" +gAreaRoomMap_CaveOfFlames_Compass_top:: + .incbin "maps/areas/080_CaveOfFlames/rooms/21_Compass/gAreaRoomMap_CaveOfFlames_Compass_top.bin.lz" + gDungeonMaps_CaveOfFlames_Compass:: + .incbin "maps/areas/080_CaveOfFlames/rooms/21_Compass/dungeon_map.bin" +gAreaRoomMap_CaveOfFlames_BobOmbWall_bottom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/22_BobOmbWall/gAreaRoomMap_CaveOfFlames_BobOmbWall_bottom.bin.lz" +gAreaRoomMap_CaveOfFlames_BobOmbWall_top:: + .incbin "maps/areas/080_CaveOfFlames/rooms/22_BobOmbWall/gAreaRoomMap_CaveOfFlames_BobOmbWall_top.bin.lz" + gDungeonMaps_CaveOfFlames_BobOmbWall:: + .incbin "maps/areas/080_CaveOfFlames/rooms/22_BobOmbWall/dungeon_map.bin" +gAreaRoomMap_CaveOfFlames_BossDoor_bottom:: + .incbin "maps/areas/080_CaveOfFlames/rooms/23_BossDoor/gAreaRoomMap_CaveOfFlames_BossDoor_bottom.bin.lz" +gAreaRoomMap_CaveOfFlames_BossDoor_top:: + .incbin "maps/areas/080_CaveOfFlames/rooms/23_BossDoor/gAreaRoomMap_CaveOfFlames_BossDoor_top.bin.lz" + gDungeonMaps_CaveOfFlames_BossDoor:: + .incbin "maps/areas/080_CaveOfFlames/rooms/23_BossDoor/dungeon_map.bin" +gAreaRoomMap_CaveOfFlamesBoss_0_bottom:: + .incbin "maps/areas/081_CaveOfFlamesBoss/rooms/00_0/gAreaRoomMap_CaveOfFlamesBoss_0_bottom.bin.lz" +gAreaRoomMap_CaveOfFlamesBoss_0_top:: + .incbin "maps/areas/081_CaveOfFlamesBoss/rooms/00_0/gAreaRoomMap_CaveOfFlamesBoss_0_top.bin.lz" + gDungeonMaps_CaveOfFlamesBoss_0:: + .incbin "maps/areas/081_CaveOfFlamesBoss/rooms/00_00_0/dungeon_map.bin" +gAreaTileSet_CastorDarknut_0_0:: + .incbin "maps/areas/043_CastorDarknut/tileSets/0/gAreaTileSet_CastorDarknut_0_0.4bpp.lz" +gAreaTileSet_CastorDarknut_0_1:: + .incbin "maps/areas/043_CastorDarknut/tileSets/0/gAreaTileSet_CastorDarknut_0_1.4bpp.lz" +gAreaTileSet_CastorDarknut_0_2:: + .incbin "maps/areas/043_CastorDarknut/tileSets/0/gAreaTileSet_CastorDarknut_0_2.4bpp.lz" +gAreaTileSet_CastorDarknut_bottom:: + .incbin "maps/areas/043_CastorDarknut/tileSet/gAreaTileSet_CastorDarknut_bottom.bin.lz" +gAreaTileSet_CastorDarknut_top:: + .incbin "maps/areas/043_CastorDarknut/tileSet/gAreaTileSet_CastorDarknut_top.bin.lz" +gAreaTileSetTypes_CastorDarknut_bottom:: + .incbin "maps/areas/043_CastorDarknut/tileSet/gAreaTileSetTypes_CastorDarknut_bottom.bin.lz" +gAreaTileSetTypes_CastorDarknut_top:: + .incbin "maps/areas/043_CastorDarknut/tileSet/gAreaTileSetTypes_CastorDarknut_top.bin.lz" +gAreaTileSet_InnerMazaal_0_0:: + .incbin "maps/areas/090_InnerMazaal/tileSets/0/gAreaTileSet_InnerMazaal_0_0.4bpp.lz" +gAreaTileSet_InnerMazaal_0_1:: + .incbin "maps/areas/090_InnerMazaal/tileSets/0/gAreaTileSet_InnerMazaal_0_1.4bpp.lz" +gAreaTileSet_InnerMazaal_0_2:: + .incbin "maps/areas/090_InnerMazaal/tileSets/0/gAreaTileSet_InnerMazaal_0_2.4bpp.lz" +gAreaTileSet_InnerMazaal_bottom:: + .incbin "maps/areas/090_InnerMazaal/tileSet/gAreaTileSet_InnerMazaal_bottom.bin.lz" +gAreaTileSet_InnerMazaal_top:: + .incbin "maps/areas/090_InnerMazaal/tileSet/gAreaTileSet_InnerMazaal_top.bin.lz" +gAreaTileSetTypes_InnerMazaal_bottom:: + .incbin "maps/areas/090_InnerMazaal/tileSet/gAreaTileSetTypes_InnerMazaal_bottom.bin.lz" +gAreaTileSetTypes_InnerMazaal_top:: + .incbin "maps/areas/090_InnerMazaal/tileSet/gAreaTileSetTypes_InnerMazaal_top.bin.lz" +gAreaTileSet_FortressOfWindsTop_0_0:: + .incbin "maps/areas/089_FortressOfWindsTop/tileSets/0/gAreaTileSet_FortressOfWindsTop_0_0.4bpp.lz" +gAreaTileSet_FortressOfWindsTop_0_1:: + .incbin "maps/areas/089_FortressOfWindsTop/tileSets/0/gAreaTileSet_FortressOfWindsTop_0_1.4bpp.lz" +gAreaTileSet_FortressOfWindsTop_0_2:: + .incbin "maps/areas/089_FortressOfWindsTop/tileSets/0/gAreaTileSet_FortressOfWindsTop_0_2.4bpp.lz" +gAreaTileSet_FortressOfWindsTop_bottom:: + .incbin "maps/areas/089_FortressOfWindsTop/tileSet/gAreaTileSet_FortressOfWindsTop_bottom.bin.lz" +gAreaTileSet_FortressOfWindsTop_top:: + .incbin "maps/areas/089_FortressOfWindsTop/tileSet/gAreaTileSet_FortressOfWindsTop_top.bin.lz" +gAreaTileSetTypes_FortressOfWindsTop_bottom:: + .incbin "maps/areas/089_FortressOfWindsTop/tileSet/gAreaTileSetTypes_FortressOfWindsTop_bottom.bin.lz" +gAreaTileSetTypes_FortressOfWindsTop_top:: + .incbin "maps/areas/089_FortressOfWindsTop/tileSet/gAreaTileSetTypes_FortressOfWindsTop_top.bin.lz" +gAreaRoomMap_FortressOfWinds_DoubleEyegore_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/00_DoubleEyegore/gAreaRoomMap_FortressOfWinds_DoubleEyegore_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_DoubleEyegore_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/00_DoubleEyegore/gAreaRoomMap_FortressOfWinds_DoubleEyegore_top.bin.lz" + gDungeonMaps_FortressOfWinds_DoubleEyegore:: + .incbin "maps/areas/088_FortressOfWinds/rooms/00_DoubleEyegore/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_BeforeMazaal_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/01_BeforeMazaal/gAreaRoomMap_FortressOfWinds_BeforeMazaal_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_BeforeMazaal_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/01_BeforeMazaal/gAreaRoomMap_FortressOfWinds_BeforeMazaal_top.bin.lz" + gDungeonMaps_FortressOfWinds_BeforeMazaal:: + .incbin "maps/areas/088_FortressOfWinds/rooms/01_BeforeMazaal/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_EastKeyLever_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/02_EastKeyLever/gAreaRoomMap_FortressOfWinds_EastKeyLever_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_EastKeyLever_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/02_EastKeyLever/gAreaRoomMap_FortressOfWinds_EastKeyLever_top.bin.lz" + gDungeonMaps_FortressOfWinds_EastKeyLever:: + .incbin "maps/areas/088_FortressOfWinds/rooms/02_EastKeyLever/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_PitPlatforms_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/03_PitPlatforms/gAreaRoomMap_FortressOfWinds_PitPlatforms_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_PitPlatforms_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/03_PitPlatforms/gAreaRoomMap_FortressOfWinds_PitPlatforms_top.bin.lz" + gDungeonMaps_FortressOfWinds_PitPlatforms:: + .incbin "maps/areas/088_FortressOfWinds/rooms/03_PitPlatforms/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_WestKeyLever_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/04_WestKeyLever/gAreaRoomMap_FortressOfWinds_WestKeyLever_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_WestKeyLever_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/04_WestKeyLever/gAreaRoomMap_FortressOfWinds_WestKeyLever_top.bin.lz" + gDungeonMaps_FortressOfWinds_WestKeyLever:: + .incbin "maps/areas/088_FortressOfWinds/rooms/04_WestKeyLever/dungeon_map.bin" + gDungeonMaps_FortressOfWinds_5:: + .incbin "maps/areas/088_FortressOfWinds/rooms/05_5/dungeon_map.bin" + gDungeonMaps_FortressOfWinds_6:: + .incbin "maps/areas/088_FortressOfWinds/rooms/06_6/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_DarknutRoom_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/16_DarknutRoom/gAreaRoomMap_FortressOfWinds_DarknutRoom_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_DarknutRoom_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/16_DarknutRoom/gAreaRoomMap_FortressOfWinds_DarknutRoom_top.bin.lz" + gDungeonMaps_FortressOfWinds_DarknutRoom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/16_DarknutRoom/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/17_ArrowEyeBridge/gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/17_ArrowEyeBridge/gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_top.bin.lz" + gDungeonMaps_FortressOfWinds_ArrowEyeBridge:: + .incbin "maps/areas/088_FortressOfWinds/rooms/17_ArrowEyeBridge/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_NorthSplitPathPit_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/18_NorthSplitPathPit/gAreaRoomMap_FortressOfWinds_NorthSplitPathPit_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_NorthSplitPathPit_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/18_NorthSplitPathPit/gAreaRoomMap_FortressOfWinds_NorthSplitPathPit_top.bin.lz" + gDungeonMaps_FortressOfWinds_NorthSplitPathPit:: + .incbin "maps/areas/088_FortressOfWinds/rooms/18_NorthSplitPathPit/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_WallmasterMinishPortal_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/19_WallmasterMinishPortal/gAreaRoomMap_FortressOfWinds_WallmasterMinishPortal_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_WallmasterMinishPortal_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/19_WallmasterMinishPortal/gAreaRoomMap_FortressOfWinds_WallmasterMinishPortal_top.bin.lz" + gDungeonMaps_FortressOfWinds_WallmasterMinishPortal:: + .incbin "maps/areas/088_FortressOfWinds/rooms/19_WallmasterMinishPortal/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_PillarCloneButtons_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/20_PillarCloneButtons/gAreaRoomMap_FortressOfWinds_PillarCloneButtons_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_PillarCloneButtons_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/20_PillarCloneButtons/gAreaRoomMap_FortressOfWinds_PillarCloneButtons_top.bin.lz" + gDungeonMaps_FortressOfWinds_PillarCloneButtons:: + .incbin "maps/areas/088_FortressOfWinds/rooms/20_PillarCloneButtons/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_RotatingSpikeTraps_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/21_RotatingSpikeTraps/gAreaRoomMap_FortressOfWinds_RotatingSpikeTraps_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_RotatingSpikeTraps_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/21_RotatingSpikeTraps/gAreaRoomMap_FortressOfWinds_RotatingSpikeTraps_top.bin.lz" + gDungeonMaps_FortressOfWinds_RotatingSpikeTraps:: + .incbin "maps/areas/088_FortressOfWinds/rooms/21_RotatingSpikeTraps/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_Mazaal_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/22_Mazaal/gAreaRoomMap_FortressOfWinds_Mazaal_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_Mazaal_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/22_Mazaal/gAreaRoomMap_FortressOfWinds_Mazaal_top.bin.lz" + gDungeonMaps_FortressOfWinds_Mazaal:: + .incbin "maps/areas/088_FortressOfWinds/rooms/22_Mazaal/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_Stalfos_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/23_Stalfos/gAreaRoomMap_FortressOfWinds_Stalfos_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_Stalfos_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/23_Stalfos/gAreaRoomMap_FortressOfWinds_Stalfos_top.bin.lz" + gDungeonMaps_FortressOfWinds_Stalfos:: + .incbin "maps/areas/088_FortressOfWinds/rooms/23_Stalfos/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/24_EntranceMoleMitts/gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/24_EntranceMoleMitts/gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_top.bin.lz" + gDungeonMaps_FortressOfWinds_EntranceMoleMitts:: + .incbin "maps/areas/088_FortressOfWinds/rooms/24_EntranceMoleMitts/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_Main2f_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/25_Main2f/gAreaRoomMap_FortressOfWinds_Main2f_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_Main2f_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/25_Main2f/gAreaRoomMap_FortressOfWinds_Main2f_top.bin.lz" + gDungeonMaps_FortressOfWinds_Main2f:: + .incbin "maps/areas/088_FortressOfWinds/rooms/25_Main2f/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_MinishHole_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/26_MinishHole/gAreaRoomMap_FortressOfWinds_MinishHole_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_MinishHole_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/26_MinishHole/gAreaRoomMap_FortressOfWinds_MinishHole_top.bin.lz" + gDungeonMaps_FortressOfWinds_MinishHole:: + .incbin "maps/areas/088_FortressOfWinds/rooms/26_MinishHole/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_BossKey_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/27_BossKey/gAreaRoomMap_FortressOfWinds_BossKey_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_BossKey_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/27_BossKey/gAreaRoomMap_FortressOfWinds_BossKey_top.bin.lz" + gDungeonMaps_FortressOfWinds_BossKey:: + .incbin "maps/areas/088_FortressOfWinds/rooms/27_BossKey/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_WestStairs2f_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/28_WestStairs2f/gAreaRoomMap_FortressOfWinds_WestStairs2f_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_WestStairs2f_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/28_WestStairs2f/gAreaRoomMap_FortressOfWinds_WestStairs2f_top.bin.lz" + gDungeonMaps_FortressOfWinds_WestStairs2f:: + .incbin "maps/areas/088_FortressOfWinds/rooms/28_WestStairs2f/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_EastStairs2f_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/29_EastStairs2f/gAreaRoomMap_FortressOfWinds_EastStairs2f_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_EastStairs2f_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/29_EastStairs2f/gAreaRoomMap_FortressOfWinds_EastStairs2f_top.bin.lz" + gDungeonMaps_FortressOfWinds_EastStairs2f:: + .incbin "maps/areas/088_FortressOfWinds/rooms/29_EastStairs2f/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_WestStairs1f_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/32_WestStairs1f/gAreaRoomMap_FortressOfWinds_WestStairs1f_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_WestStairs1f_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/32_WestStairs1f/gAreaRoomMap_FortressOfWinds_WestStairs1f_top.bin.lz" + gDungeonMaps_FortressOfWinds_WestStairs1f:: + .incbin "maps/areas/088_FortressOfWinds/rooms/32_WestStairs1f/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_CenterStairs1f_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/33_CenterStairs1f/gAreaRoomMap_FortressOfWinds_CenterStairs1f_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_CenterStairs1f_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/33_CenterStairs1f/gAreaRoomMap_FortressOfWinds_CenterStairs1f_top.bin.lz" + gDungeonMaps_FortressOfWinds_CenterStairs1f:: + .incbin "maps/areas/088_FortressOfWinds/rooms/33_CenterStairs1f/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_EastStairs1f_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/34_EastStairs1f/gAreaRoomMap_FortressOfWinds_EastStairs1f_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_EastStairs1f_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/34_EastStairs1f/gAreaRoomMap_FortressOfWinds_EastStairs1f_top.bin.lz" + gDungeonMaps_FortressOfWinds_EastStairs1f:: + .incbin "maps/areas/088_FortressOfWinds/rooms/34_EastStairs1f/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_Wizzrobe_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/35_Wizzrobe/gAreaRoomMap_FortressOfWinds_Wizzrobe_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_Wizzrobe_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/35_Wizzrobe/gAreaRoomMap_FortressOfWinds_Wizzrobe_top.bin.lz" + gDungeonMaps_FortressOfWinds_Wizzrobe:: + .incbin "maps/areas/088_FortressOfWinds/rooms/35_Wizzrobe/dungeon_map.bin" +gAreaRoomMap_FortressOfWinds_HeartPiece_bottom:: + .incbin "maps/areas/088_FortressOfWinds/rooms/36_HeartPiece/gAreaRoomMap_FortressOfWinds_HeartPiece_bottom.bin.lz" +gAreaRoomMap_FortressOfWinds_HeartPiece_top:: + .incbin "maps/areas/088_FortressOfWinds/rooms/36_HeartPiece/gAreaRoomMap_FortressOfWinds_HeartPiece_top.bin.lz" + gDungeonMaps_FortressOfWinds_HeartPiece:: + .incbin "maps/areas/088_FortressOfWinds/rooms/36_HeartPiece/dungeon_map.bin" +gAreaRoomMap_InnerMazaal_Main_bottom:: + .incbin "maps/areas/090_InnerMazaal/rooms/00_Main/gAreaRoomMap_InnerMazaal_Main_bottom.bin.lz" +gAreaRoomMap_InnerMazaal_Main_top:: + .incbin "maps/areas/090_InnerMazaal/rooms/00_Main/gAreaRoomMap_InnerMazaal_Main_top.bin.lz" +gAreaRoomMap_InnerMazaal_Phase1_bottom:: + .incbin "maps/areas/090_InnerMazaal/rooms/01_Phase1/gAreaRoomMap_InnerMazaal_Phase1_bottom.bin.lz" +gAreaRoomMap_InnerMazaal_Phase1_top:: + .incbin "maps/areas/090_InnerMazaal/rooms/01_Phase1/gAreaRoomMap_InnerMazaal_Phase1_top.bin.lz" +gAreaRoomMap_FortressOfWindsTop_Main_bottom:: + .incbin "maps/areas/089_FortressOfWindsTop/rooms/00_Main/gAreaRoomMap_FortressOfWindsTop_Main_bottom.bin.lz" +gAreaRoomMap_FortressOfWindsTop_Main_top:: + .incbin "maps/areas/089_FortressOfWindsTop/rooms/00_Main/gAreaRoomMap_FortressOfWindsTop_Main_top.bin.lz" +gAreaTileSet_TempleOfDroplets_0_0:: + .incbin "maps/areas/096_TempleOfDroplets/tileSets/0/gAreaTileSet_TempleOfDroplets_0_0.4bpp.lz" +gAreaTileSet_TempleOfDroplets_0_1:: + .incbin "maps/areas/096_TempleOfDroplets/tileSets/0/gAreaTileSet_TempleOfDroplets_0_1.4bpp.lz" +gAreaTileSet_TempleOfDroplets_0_2:: + .incbin "maps/areas/096_TempleOfDroplets/tileSets/0/gAreaTileSet_TempleOfDroplets_0_2.4bpp.lz" +gAreaTileSet_TempleOfDroplets_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/tileSet/gAreaTileSet_TempleOfDroplets_bottom.bin.lz" +gAreaTileSet_TempleOfDroplets_top:: + .incbin "maps/areas/096_TempleOfDroplets/tileSet/gAreaTileSet_TempleOfDroplets_top.bin.lz" +gAreaTileSetTypes_TempleOfDroplets_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/tileSet/gAreaTileSetTypes_TempleOfDroplets_bottom.bin.lz" +gAreaTileSetTypes_TempleOfDroplets_top:: + .incbin "maps/areas/096_TempleOfDroplets/tileSet/gAreaTileSetTypes_TempleOfDroplets_top.bin.lz" +gAreaTileSet_Null61_0_0:: + .incbin "maps/areas/097_Null61/tileSets/0/gAreaTileSet_Null61_0_0.4bpp.lz" +gAreaTileSet_Null61_0_1:: + .incbin "maps/areas/097_Null61/tileSets/0/gAreaTileSet_Null61_0_1.4bpp.lz" +gAreaTileSet_Null61_0_2:: + .incbin "maps/areas/097_Null61/tileSets/0/gAreaTileSet_Null61_0_2.4bpp.lz" +gAreaTileSet_Null61_bottom:: + .incbin "maps/areas/097_Null61/tileSet/gAreaTileSet_Null61_bottom.bin.lz" +gAreaTileSet_Null61_top:: + .incbin "maps/areas/097_Null61/tileSet/gAreaTileSet_Null61_top.bin.lz" +gAreaTileSetTypes_Null61_bottom:: + .incbin "maps/areas/097_Null61/tileSet/gAreaTileSetTypes_Null61_bottom.bin.lz" +gAreaTileSetTypes_Null61_top:: + .incbin "maps/areas/097_Null61/tileSet/gAreaTileSetTypes_Null61_top.bin.lz" +gAreaRoomMap_TempleOfDroplets_WestHole_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/00_WestHole/gAreaRoomMap_TempleOfDroplets_WestHole_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_WestHole_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/00_WestHole/gAreaRoomMap_TempleOfDroplets_WestHole_top.bin.lz" + gDungeonMaps_TempleOfDroplets_WestHole:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/00_WestHole/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_NorthSplitRoom_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/01_NorthSplitRoom/gAreaRoomMap_TempleOfDroplets_NorthSplitRoom_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_NorthSplitRoom_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/01_NorthSplitRoom/gAreaRoomMap_TempleOfDroplets_NorthSplitRoom_top.bin.lz" + gDungeonMaps_TempleOfDroplets_NorthSplitRoom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/01_NorthSplitRoom/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_EastHole_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/02_EastHole/gAreaRoomMap_TempleOfDroplets_EastHole_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_EastHole_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/02_EastHole/gAreaRoomMap_TempleOfDroplets_EastHole_top.bin.lz" + gDungeonMaps_TempleOfDroplets_EastHole:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/02_EastHole/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_Entrance_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/03_Entrance/gAreaRoomMap_TempleOfDroplets_Entrance_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_Entrance_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/03_Entrance/gAreaRoomMap_TempleOfDroplets_Entrance_top.bin.lz" + gDungeonMaps_TempleOfDroplets_Entrance:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/03_Entrance/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_NorthwestStairs_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/04_NorthwestStairs/gAreaRoomMap_TempleOfDroplets_NorthwestStairs_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_NorthwestStairs_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/04_NorthwestStairs/gAreaRoomMap_TempleOfDroplets_NorthwestStairs_top.bin.lz" + gDungeonMaps_TempleOfDroplets_NorthwestStairs:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/04_NorthwestStairs/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_ScissorsMiniboss_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/05_ScissorsMiniboss/gAreaRoomMap_TempleOfDroplets_ScissorsMiniboss_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_ScissorsMiniboss_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/05_ScissorsMiniboss/gAreaRoomMap_TempleOfDroplets_ScissorsMiniboss_top.bin.lz" + gDungeonMaps_TempleOfDroplets_ScissorsMiniboss:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/05_ScissorsMiniboss/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_WaterfallNorthwest_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/06_WaterfallNorthwest/gAreaRoomMap_TempleOfDroplets_WaterfallNorthwest_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_WaterfallNorthwest_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/06_WaterfallNorthwest/gAreaRoomMap_TempleOfDroplets_WaterfallNorthwest_top.bin.lz" + gDungeonMaps_TempleOfDroplets_WaterfallNorthwest:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/06_WaterfallNorthwest/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_WaterfallNortheast_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/07_WaterfallNortheast/gAreaRoomMap_TempleOfDroplets_WaterfallNortheast_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_WaterfallNortheast_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/07_WaterfallNortheast/gAreaRoomMap_TempleOfDroplets_WaterfallNortheast_top.bin.lz" + gDungeonMaps_TempleOfDroplets_WaterfallNortheast:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/07_WaterfallNortheast/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_Element_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/08_Element/gAreaRoomMap_TempleOfDroplets_Element_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_Element_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/08_Element/gAreaRoomMap_TempleOfDroplets_Element_top.bin.lz" + gDungeonMaps_TempleOfDroplets_Element:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/08_Element/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_IceCorner_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/09_IceCorner/gAreaRoomMap_TempleOfDroplets_IceCorner_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_IceCorner_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/09_IceCorner/gAreaRoomMap_TempleOfDroplets_IceCorner_top.bin.lz" + gDungeonMaps_TempleOfDroplets_IceCorner:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/09_IceCorner/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_IcePitMaze_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/10_IcePitMaze/gAreaRoomMap_TempleOfDroplets_IcePitMaze_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_IcePitMaze_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/10_IcePitMaze/gAreaRoomMap_TempleOfDroplets_IcePitMaze_top.bin.lz" + gDungeonMaps_TempleOfDroplets_IcePitMaze:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/10_IcePitMaze/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_HoleToBlueChuKey_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/11_HoleToBlueChuKey/gAreaRoomMap_TempleOfDroplets_HoleToBlueChuKey_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_HoleToBlueChuKey_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/11_HoleToBlueChuKey/gAreaRoomMap_TempleOfDroplets_HoleToBlueChuKey_top.bin.lz" + gDungeonMaps_TempleOfDroplets_HoleToBlueChuKey:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/11_HoleToBlueChuKey/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/12_WestWaterfallSoutheast/gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/12_WestWaterfallSoutheast/gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_top.bin.lz" + gDungeonMaps_TempleOfDroplets_WestWaterfallSoutheast:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/12_WestWaterfallSoutheast/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/13_WestWaterfallSouthwest/gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/13_WestWaterfallSouthwest/gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_top.bin.lz" + gDungeonMaps_TempleOfDroplets_WestWaterfallSouthwest:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/13_WestWaterfallSouthwest/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_BigOcto_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/14_BigOcto/gAreaRoomMap_TempleOfDroplets_BigOcto_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_BigOcto_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/14_BigOcto/gAreaRoomMap_TempleOfDroplets_BigOcto_top.bin.lz" + gDungeonMaps_TempleOfDroplets_BigOcto:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/14_BigOcto/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_ToBlueChu_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/15_ToBlueChu/gAreaRoomMap_TempleOfDroplets_ToBlueChu_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_ToBlueChu_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/15_ToBlueChu/gAreaRoomMap_TempleOfDroplets_ToBlueChu_top.bin.lz" + gDungeonMaps_TempleOfDroplets_ToBlueChu:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/15_ToBlueChu/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_BlueChu_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/16_BlueChu/gAreaRoomMap_TempleOfDroplets_BlueChu_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_BlueChu_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/16_BlueChu/gAreaRoomMap_TempleOfDroplets_BlueChu_top.bin.lz" + gDungeonMaps_TempleOfDroplets_BlueChu:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/16_BlueChu/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_BlueChuKey_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/17_BlueChuKey/gAreaRoomMap_TempleOfDroplets_BlueChuKey_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_BlueChuKey_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/17_BlueChuKey/gAreaRoomMap_TempleOfDroplets_BlueChuKey_top.bin.lz" + gDungeonMaps_TempleOfDroplets_BlueChuKey:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/17_BlueChuKey/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_BossKey_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/32_BossKey/gAreaRoomMap_TempleOfDroplets_BossKey_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_BossKey_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/32_BossKey/gAreaRoomMap_TempleOfDroplets_BossKey_top.bin.lz" + gDungeonMaps_TempleOfDroplets_BossKey:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/32_BossKey/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_NorthSmallKey_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/33_NorthSmallKey/gAreaRoomMap_TempleOfDroplets_NorthSmallKey_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_NorthSmallKey_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/33_NorthSmallKey/gAreaRoomMap_TempleOfDroplets_NorthSmallKey_top.bin.lz" + gDungeonMaps_TempleOfDroplets_NorthSmallKey:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/33_NorthSmallKey/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_BlockCloneButtonPuzzle_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/34_BlockCloneButtonPuzzle/gAreaRoomMap_TempleOfDroplets_BlockCloneButtonPuzzle_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_BlockCloneButtonPuzzle_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/34_BlockCloneButtonPuzzle/gAreaRoomMap_TempleOfDroplets_BlockCloneButtonPuzzle_top.bin.lz" + gDungeonMaps_TempleOfDroplets_BlockCloneButtonPuzzle:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/34_BlockCloneButtonPuzzle/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_BlockClonePuzzle_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/35_BlockClonePuzzle/gAreaRoomMap_TempleOfDroplets_BlockClonePuzzle_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_BlockClonePuzzle_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/35_BlockClonePuzzle/gAreaRoomMap_TempleOfDroplets_BlockClonePuzzle_top.bin.lz" + gDungeonMaps_TempleOfDroplets_BlockClonePuzzle:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/35_BlockClonePuzzle/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_BlockCloneIceBridge_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/36_BlockCloneIceBridge/gAreaRoomMap_TempleOfDroplets_BlockCloneIceBridge_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_BlockCloneIceBridge_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/36_BlockCloneIceBridge/gAreaRoomMap_TempleOfDroplets_BlockCloneIceBridge_top.bin.lz" + gDungeonMaps_TempleOfDroplets_BlockCloneIceBridge:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/36_BlockCloneIceBridge/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/37_StairsToScissorsMiniboss/gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/37_StairsToScissorsMiniboss/gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_top.bin.lz" + gDungeonMaps_TempleOfDroplets_StairsToScissorsMiniboss:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/37_StairsToScissorsMiniboss/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/38_SpikeBarFlipperRoom/gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/38_SpikeBarFlipperRoom/gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_top.bin.lz" + gDungeonMaps_TempleOfDroplets_SpikeBarFlipperRoom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/38_SpikeBarFlipperRoom/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_9Lanterns_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/39_9Lanterns/gAreaRoomMap_TempleOfDroplets_9Lanterns_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_9Lanterns_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/39_9Lanterns/gAreaRoomMap_TempleOfDroplets_9Lanterns_top.bin.lz" + gDungeonMaps_TempleOfDroplets_9Lanterns:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/39_9Lanterns/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_LilypadIceBlocks_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/40_LilypadIceBlocks/gAreaRoomMap_TempleOfDroplets_LilypadIceBlocks_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_LilypadIceBlocks_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/40_LilypadIceBlocks/gAreaRoomMap_TempleOfDroplets_LilypadIceBlocks_top.bin.lz" + gDungeonMaps_TempleOfDroplets_LilypadIceBlocks:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/40_LilypadIceBlocks/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_29_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/41_29/gAreaRoomMap_TempleOfDroplets_29_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_29_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/41_29/gAreaRoomMap_TempleOfDroplets_29_top.bin.lz" + gDungeonMaps_TempleOfDroplets_29:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/41_29/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_MulldozersFireBars_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/42_MulldozersFireBars/gAreaRoomMap_TempleOfDroplets_MulldozersFireBars_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_MulldozersFireBars_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/42_MulldozersFireBars/gAreaRoomMap_TempleOfDroplets_MulldozersFireBars_top.bin.lz" + gDungeonMaps_TempleOfDroplets_MulldozersFireBars:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/42_MulldozersFireBars/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_DarkMaze_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/43_DarkMaze/gAreaRoomMap_TempleOfDroplets_DarkMaze_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_DarkMaze_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/43_DarkMaze/gAreaRoomMap_TempleOfDroplets_DarkMaze_top.bin.lz" + gDungeonMaps_TempleOfDroplets_DarkMaze:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/43_DarkMaze/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_TwinMadderpillars_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/44_TwinMadderpillars/gAreaRoomMap_TempleOfDroplets_TwinMadderpillars_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_TwinMadderpillars_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/44_TwinMadderpillars/gAreaRoomMap_TempleOfDroplets_TwinMadderpillars_top.bin.lz" + gDungeonMaps_TempleOfDroplets_TwinMadderpillars:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/44_TwinMadderpillars/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_AfterTwinMadderpillars_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/45_AfterTwinMadderpillars/gAreaRoomMap_TempleOfDroplets_AfterTwinMadderpillars_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_AfterTwinMadderpillars_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/45_AfterTwinMadderpillars/gAreaRoomMap_TempleOfDroplets_AfterTwinMadderpillars_top.bin.lz" + gDungeonMaps_TempleOfDroplets_AfterTwinMadderpillars:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/45_AfterTwinMadderpillars/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/46_BlueChuKeyLever/gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/46_BlueChuKeyLever/gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_top.bin.lz" + gDungeonMaps_TempleOfDroplets_BlueChuKeyLever:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/46_BlueChuKeyLever/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_MulldozerKey_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/47_MulldozerKey/gAreaRoomMap_TempleOfDroplets_MulldozerKey_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_MulldozerKey_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/47_MulldozerKey/gAreaRoomMap_TempleOfDroplets_MulldozerKey_top.bin.lz" + gDungeonMaps_TempleOfDroplets_MulldozerKey:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/47_MulldozerKey/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_BeforeTwinMadderpillars_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/48_BeforeTwinMadderpillars/gAreaRoomMap_TempleOfDroplets_BeforeTwinMadderpillars_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_BeforeTwinMadderpillars_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/48_BeforeTwinMadderpillars/gAreaRoomMap_TempleOfDroplets_BeforeTwinMadderpillars_top.bin.lz" + gDungeonMaps_TempleOfDroplets_BeforeTwinMadderpillars:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/48_BeforeTwinMadderpillars/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_LilypadB2West_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/49_LilypadB2West/gAreaRoomMap_TempleOfDroplets_LilypadB2West_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_LilypadB2West_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/49_LilypadB2West/gAreaRoomMap_TempleOfDroplets_LilypadB2West_top.bin.lz" + gDungeonMaps_TempleOfDroplets_LilypadB2West:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/49_LilypadB2West/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_Compass_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/50_Compass/gAreaRoomMap_TempleOfDroplets_Compass_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_Compass_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/50_Compass/gAreaRoomMap_TempleOfDroplets_Compass_top.bin.lz" + gDungeonMaps_TempleOfDroplets_Compass:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/50_Compass/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_DarkScissorBeetles_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/51_DarkScissorBeetles/gAreaRoomMap_TempleOfDroplets_DarkScissorBeetles_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_DarkScissorBeetles_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/51_DarkScissorBeetles/gAreaRoomMap_TempleOfDroplets_DarkScissorBeetles_top.bin.lz" + gDungeonMaps_TempleOfDroplets_DarkScissorBeetles:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/51_DarkScissorBeetles/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_LilypadB2Middle_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/52_LilypadB2Middle/gAreaRoomMap_TempleOfDroplets_LilypadB2Middle_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_LilypadB2Middle_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/52_LilypadB2Middle/gAreaRoomMap_TempleOfDroplets_LilypadB2Middle_top.bin.lz" + gDungeonMaps_TempleOfDroplets_LilypadB2Middle:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/52_LilypadB2Middle/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_IceMadderpillar_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/53_IceMadderpillar/gAreaRoomMap_TempleOfDroplets_IceMadderpillar_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_IceMadderpillar_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/53_IceMadderpillar/gAreaRoomMap_TempleOfDroplets_IceMadderpillar_top.bin.lz" + gDungeonMaps_TempleOfDroplets_IceMadderpillar:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/53_IceMadderpillar/dungeon_map.bin" +gAreaRoomMap_TempleOfDroplets_FlamebarBlockPuzzle_bottom:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/54_FlamebarBlockPuzzle/gAreaRoomMap_TempleOfDroplets_FlamebarBlockPuzzle_bottom.bin.lz" +gAreaRoomMap_TempleOfDroplets_FlamebarBlockPuzzle_top:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/54_FlamebarBlockPuzzle/gAreaRoomMap_TempleOfDroplets_FlamebarBlockPuzzle_top.bin.lz" + gDungeonMaps_TempleOfDroplets_FlamebarBlockPuzzle:: + .incbin "maps/areas/096_TempleOfDroplets/rooms/54_FlamebarBlockPuzzle/dungeon_map.bin" +gAreaRoomMap_Null61_0_bottom:: + .incbin "maps/areas/097_Null61/rooms/00_0/gAreaRoomMap_Null61_0_bottom.bin.lz" +gAreaRoomMap_Null61_0_top:: + .incbin "maps/areas/097_Null61/rooms/00_0/gAreaRoomMap_Null61_0_top.bin.lz" +gAreaRoomMap_HyruleTownMinishCaves_0_bottom:: + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/00_0/gAreaRoomMap_HyruleTownMinishCaves_0_bottom.bin.lz" +gAreaRoomMap_HyruleTownMinishCaves_0_top:: + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/00_0/gAreaRoomMap_HyruleTownMinishCaves_0_top.bin.lz" +gAreaRoomMap_HyruleTownMinishCaves_1_bottom:: + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/01_1/gAreaRoomMap_HyruleTownMinishCaves_1_bottom.bin.lz" +gAreaRoomMap_HyruleTownMinishCaves_1_top:: + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/01_1/gAreaRoomMap_HyruleTownMinishCaves_1_top.bin.lz" +gAreaRoomMap_HyruleTownMinishCaves_2_bottom:: + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/02_2/gAreaRoomMap_HyruleTownMinishCaves_2_bottom.bin.lz" +gAreaRoomMap_HyruleTownMinishCaves_2_top:: + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/02_2/gAreaRoomMap_HyruleTownMinishCaves_2_top.bin.lz" +gAreaRoomMap_HyruleTownMinishCaves_3_bottom:: + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/03_3/gAreaRoomMap_HyruleTownMinishCaves_3_bottom.bin.lz" +gAreaRoomMap_HyruleTownMinishCaves_3_top:: + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/03_3/gAreaRoomMap_HyruleTownMinishCaves_3_top.bin.lz" +gAreaRoomMap_HyruleTownMinishCaves_4_bottom:: + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/04_4/gAreaRoomMap_HyruleTownMinishCaves_4_bottom.bin.lz" +gAreaRoomMap_HyruleTownMinishCaves_4_top:: + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/04_4/gAreaRoomMap_HyruleTownMinishCaves_4_top.bin.lz" +gAreaRoomMap_HyruleTownMinishCaves_Unused10_bottom:: + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/16_Unused10/gAreaRoomMap_HyruleTownMinishCaves_Unused10_bottom.bin.lz" +gAreaRoomMap_HyruleTownMinishCaves_Unused10_top:: + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/16_Unused10/gAreaRoomMap_HyruleTownMinishCaves_Unused10_top.bin.lz" +gAreaRoomMap_HyruleTownMinishCaves_6_bottom:: + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/17_6/gAreaRoomMap_HyruleTownMinishCaves_6_bottom.bin.lz" +gAreaRoomMap_HyruleTownMinishCaves_6_top:: + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/17_6/gAreaRoomMap_HyruleTownMinishCaves_6_top.bin.lz" +gAreaRoomMap_HyruleTownMinishCaves_7_bottom:: + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/18_7/gAreaRoomMap_HyruleTownMinishCaves_7_bottom.bin.lz" +gAreaRoomMap_HyruleTownMinishCaves_7_top:: + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/18_7/gAreaRoomMap_HyruleTownMinishCaves_7_top.bin.lz" +gAreaRoomMap_HyruleTownMinishCaves_8_bottom:: + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/19_8/gAreaRoomMap_HyruleTownMinishCaves_8_bottom.bin.lz" +gAreaRoomMap_HyruleTownMinishCaves_8_top:: + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/19_8/gAreaRoomMap_HyruleTownMinishCaves_8_top.bin.lz" +gAreaRoomMap_HyruleTownMinishCaves_9_bottom:: + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/20_9/gAreaRoomMap_HyruleTownMinishCaves_9_bottom.bin.lz" +gAreaRoomMap_HyruleTownMinishCaves_9_top:: + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/20_9/gAreaRoomMap_HyruleTownMinishCaves_9_top.bin.lz" +gAreaRoomMap_HyruleTownMinishCaves_10_bottom:: + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/21_10/gAreaRoomMap_HyruleTownMinishCaves_10_bottom.bin.lz" +gAreaRoomMap_HyruleTownMinishCaves_10_top:: + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/21_10/gAreaRoomMap_HyruleTownMinishCaves_10_top.bin.lz" +gAreaTileSet_RoyalCrypt_0_0:: + .incbin "maps/areas/104_RoyalCrypt/tileSets/0/gAreaTileSet_RoyalCrypt_0_0.4bpp.lz" +gAreaTileSet_RoyalCrypt_0_1:: + .incbin "maps/areas/104_RoyalCrypt/tileSets/0/gAreaTileSet_RoyalCrypt_0_1.4bpp.lz" +gAreaTileSet_RoyalCrypt_0_2:: + .incbin "maps/areas/104_RoyalCrypt/tileSets/0/gAreaTileSet_RoyalCrypt_0_2.4bpp.lz" +gAreaTileSet_RoyalCrypt_bottom:: + .incbin "maps/areas/104_RoyalCrypt/tileSet/gAreaTileSet_RoyalCrypt_bottom.bin.lz" +gAreaTileSet_RoyalCrypt_top:: + .incbin "maps/areas/104_RoyalCrypt/tileSet/gAreaTileSet_RoyalCrypt_top.bin.lz" +gAreaTileSetTypes_RoyalCrypt_bottom:: + .incbin "maps/areas/104_RoyalCrypt/tileSet/gAreaTileSetTypes_RoyalCrypt_bottom.bin.lz" +gAreaTileSetTypes_RoyalCrypt_top:: + .incbin "maps/areas/104_RoyalCrypt/tileSet/gAreaTileSetTypes_RoyalCrypt_top.bin.lz" +gAreaRoomMap_RoyalCrypt_0_bottom:: + .incbin "maps/areas/104_RoyalCrypt/rooms/00_0/gAreaRoomMap_RoyalCrypt_0_bottom.bin.lz" +gAreaRoomMap_RoyalCrypt_0_top:: + .incbin "maps/areas/104_RoyalCrypt/rooms/00_0/gAreaRoomMap_RoyalCrypt_0_top.bin.lz" +gAreaRoomMap_RoyalCrypt_WaterRope_bottom:: + .incbin "maps/areas/104_RoyalCrypt/rooms/01_WaterRope/gAreaRoomMap_RoyalCrypt_WaterRope_bottom.bin.lz" +gAreaRoomMap_RoyalCrypt_WaterRope_top:: + .incbin "maps/areas/104_RoyalCrypt/rooms/01_WaterRope/gAreaRoomMap_RoyalCrypt_WaterRope_top.bin.lz" +gAreaRoomMap_RoyalCrypt_Gibdo_bottom:: + .incbin "maps/areas/104_RoyalCrypt/rooms/02_Gibdo/gAreaRoomMap_RoyalCrypt_Gibdo_bottom.bin.lz" +gAreaRoomMap_RoyalCrypt_Gibdo_top:: + .incbin "maps/areas/104_RoyalCrypt/rooms/02_Gibdo/gAreaRoomMap_RoyalCrypt_Gibdo_top.bin.lz" +gAreaRoomMap_RoyalCrypt_3_bottom:: + .incbin "maps/areas/104_RoyalCrypt/rooms/03_3/gAreaRoomMap_RoyalCrypt_3_bottom.bin.lz" +gAreaRoomMap_RoyalCrypt_3_top:: + .incbin "maps/areas/104_RoyalCrypt/rooms/03_3/gAreaRoomMap_RoyalCrypt_3_top.bin.lz" +gAreaRoomMap_RoyalCrypt_KeyBlock_bottom:: + .incbin "maps/areas/104_RoyalCrypt/rooms/04_KeyBlock/gAreaRoomMap_RoyalCrypt_KeyBlock_bottom.bin.lz" +gAreaRoomMap_RoyalCrypt_KeyBlock_top:: + .incbin "maps/areas/104_RoyalCrypt/rooms/04_KeyBlock/gAreaRoomMap_RoyalCrypt_KeyBlock_top.bin.lz" +gAreaRoomMap_RoyalCrypt_5_bottom:: + .incbin "maps/areas/104_RoyalCrypt/rooms/05_5/gAreaRoomMap_RoyalCrypt_5_bottom.bin.lz" +gAreaRoomMap_RoyalCrypt_5_top:: + .incbin "maps/areas/104_RoyalCrypt/rooms/05_5/gAreaRoomMap_RoyalCrypt_5_top.bin.lz" +gAreaRoomMap_RoyalCrypt_6_bottom:: + .incbin "maps/areas/104_RoyalCrypt/rooms/06_6/gAreaRoomMap_RoyalCrypt_6_bottom.bin.lz" +gAreaRoomMap_RoyalCrypt_6_top:: + .incbin "maps/areas/104_RoyalCrypt/rooms/06_6/gAreaRoomMap_RoyalCrypt_6_top.bin.lz" +gAreaRoomMap_RoyalCrypt_MushroomPit_bottom:: + .incbin "maps/areas/104_RoyalCrypt/rooms/07_MushroomPit/gAreaRoomMap_RoyalCrypt_MushroomPit_bottom.bin.lz" +gAreaRoomMap_RoyalCrypt_MushroomPit_top:: + .incbin "maps/areas/104_RoyalCrypt/rooms/07_MushroomPit/gAreaRoomMap_RoyalCrypt_MushroomPit_top.bin.lz" +gAreaRoomMap_RoyalCrypt_Entrance_bottom:: + .incbin "maps/areas/104_RoyalCrypt/rooms/08_Entrance/gAreaRoomMap_RoyalCrypt_Entrance_bottom.bin.lz" +gAreaRoomMap_RoyalCrypt_Entrance_top:: + .incbin "maps/areas/104_RoyalCrypt/rooms/08_Entrance/gAreaRoomMap_RoyalCrypt_Entrance_top.bin.lz" +gAreaTileSet_PalaceOfWinds_0_0:: + .incbin "maps/areas/112_PalaceOfWinds/tileSets/0/gAreaTileSet_PalaceOfWinds_0_0.4bpp.lz" +gAreaTileSet_PalaceOfWinds_0_1:: + .incbin "maps/areas/112_PalaceOfWinds/tileSets/0/gAreaTileSet_PalaceOfWinds_0_1.4bpp.lz" +gAreaTileSet_PalaceOfWinds_0_2:: + .incbin "maps/areas/112_PalaceOfWinds/tileSets/0/gAreaTileSet_PalaceOfWinds_0_2.4bpp.lz" +gAreaTileSet_PalaceOfWinds_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/tileSet/gAreaTileSet_PalaceOfWinds_bottom.bin.lz" +gAreaTileSet_PalaceOfWinds_top:: + .incbin "maps/areas/112_PalaceOfWinds/tileSet/gAreaTileSet_PalaceOfWinds_top.bin.lz" +gAreaTileSetTypes_PalaceOfWinds_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/tileSet/gAreaTileSetTypes_PalaceOfWinds_bottom.bin.lz" +gAreaTileSetTypes_PalaceOfWinds_top:: + .incbin "maps/areas/112_PalaceOfWinds/tileSet/gAreaTileSetTypes_PalaceOfWinds_top.bin.lz" +gAreaTileSet_PalaceOfWinds_0_3:: + .incbin "maps/areas/112_PalaceOfWinds/tileSets/0/gAreaTileSet_PalaceOfWinds_0_3.4bpp.lz" +gAreaTileSet_PalaceOfWindsBoss_0_0:: + .incbin "maps/areas/113_PalaceOfWindsBoss/tileSets/0/gAreaTileSet_PalaceOfWindsBoss_0_0.4bpp.lz" +gAreaTileSet_PalaceOfWindsBoss_0_1:: + .incbin "maps/areas/113_PalaceOfWindsBoss/tileSets/0/gAreaTileSet_PalaceOfWindsBoss_0_1.4bpp.lz" +gAreaTileSet_PalaceOfWindsBoss_top:: + .incbin "maps/areas/113_PalaceOfWindsBoss/tileSet/gAreaTileSet_PalaceOfWindsBoss_top.bin.lz" +gAreaTileSetTypes_PalaceOfWindsBoss_top:: + .incbin "maps/areas/113_PalaceOfWindsBoss/tileSet/gAreaTileSetTypes_PalaceOfWindsBoss_top.bin.lz" +gyorgMapping_2_bottom:: + .incbin "maps/areas/113_PalaceOfWindsBoss/mappings/gyorgMapping_2_bottom.bin.lz" +gyorgMapping_3_bottom:: + .incbin "maps/areas/113_PalaceOfWindsBoss/mappings/gyorgMapping_3_bottom.bin.lz" +gyorgMapping_1_bottom:: + .incbin "maps/areas/113_PalaceOfWindsBoss/mappings/gyorgMapping_1_bottom.bin.lz" +gyorgMapping_0_bottom:: + .incbin "maps/areas/113_PalaceOfWindsBoss/mappings/gyorgMapping_0_bottom.bin.lz" +gAreaTileSet_PalaceOfWindsBoss_0_2:: + .incbin "maps/areas/113_PalaceOfWindsBoss/tileSets/0/gAreaTileSet_PalaceOfWindsBoss_0_2.4bpp.lz" +gAreaRoomMap_PalaceOfWinds_GyorgTornado_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/00_GyorgTornado/gAreaRoomMap_PalaceOfWinds_GyorgTornado_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_GyorgTornado_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/00_GyorgTornado/gAreaRoomMap_PalaceOfWinds_GyorgTornado_top.bin.lz" + gDungeonMaps_PalaceOfWinds_GyorgTornado:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/00_GyorgTornado/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_BossKey_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/01_BossKey/gAreaRoomMap_PalaceOfWinds_BossKey_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_BossKey_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/01_BossKey/gAreaRoomMap_PalaceOfWinds_BossKey_top.bin.lz" + gDungeonMaps_PalaceOfWinds_BossKey:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/01_BossKey/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/02_BeforeBallAndChainSoldiers/gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/02_BeforeBallAndChainSoldiers/gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_top.bin.lz" + gDungeonMaps_PalaceOfWinds_BeforeBallAndChainSoldiers:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/02_BeforeBallAndChainSoldiers/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/03_GyorgBossDoor/gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/03_GyorgBossDoor/gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_top.bin.lz" + gDungeonMaps_PalaceOfWinds_GyorgBossDoor:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/03_GyorgBossDoor/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/04_EastChestFromGyorgBossDoor/gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/04_EastChestFromGyorgBossDoor/gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_top.bin.lz" + gDungeonMaps_PalaceOfWinds_EastChestFromGyorgBossDoor:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/04_EastChestFromGyorgBossDoor/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/05_MoblinAndWizzrobeFight/gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/05_MoblinAndWizzrobeFight/gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_top.bin.lz" + gDungeonMaps_PalaceOfWinds_MoblinAndWizzrobeFight:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/05_MoblinAndWizzrobeFight/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/06_FourButtonStalfos/gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/06_FourButtonStalfos/gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_top.bin.lz" + gDungeonMaps_PalaceOfWinds_FourButtonStalfos:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/06_FourButtonStalfos/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/07_FanAndKeyToBossKey/gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/07_FanAndKeyToBossKey/gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_top.bin.lz" + gDungeonMaps_PalaceOfWinds_FanAndKeyToBossKey:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/07_FanAndKeyToBossKey/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/08_BallAndChainSoldiers/gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/08_BallAndChainSoldiers/gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_top.bin.lz" + gDungeonMaps_PalaceOfWinds_BallAndChainSoldiers:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/08_BallAndChainSoldiers/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_BombarossaPath_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/09_BombarossaPath/gAreaRoomMap_PalaceOfWinds_BombarossaPath_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_BombarossaPath_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/09_BombarossaPath/gAreaRoomMap_PalaceOfWinds_BombarossaPath_top.bin.lz" + gDungeonMaps_PalaceOfWinds_BombarossaPath:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/09_BombarossaPath/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_HoleToDarknut_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/10_HoleToDarknut/gAreaRoomMap_PalaceOfWinds_HoleToDarknut_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_HoleToDarknut_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/10_HoleToDarknut/gAreaRoomMap_PalaceOfWinds_HoleToDarknut_top.bin.lz" + gDungeonMaps_PalaceOfWinds_HoleToDarknut:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/10_HoleToDarknut/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/11_ToBombarossaPath/gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/11_ToBombarossaPath/gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_top.bin.lz" + gDungeonMaps_PalaceOfWinds_ToBombarossaPath:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/11_ToBombarossaPath/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/12_DarknutMiniboss/gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/12_DarknutMiniboss/gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_top.bin.lz" + gDungeonMaps_PalaceOfWinds_DarknutMiniboss:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/12_DarknutMiniboss/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_BombWallInside_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/13_BombWallInside/gAreaRoomMap_PalaceOfWinds_BombWallInside_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_BombWallInside_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/13_BombWallInside/gAreaRoomMap_PalaceOfWinds_BombWallInside_top.bin.lz" + gDungeonMaps_PalaceOfWinds_BombWallInside:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/13_BombWallInside/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_BombWallOutside_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/14_BombWallOutside/gAreaRoomMap_PalaceOfWinds_BombWallOutside_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_BombWallOutside_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/14_BombWallOutside/gAreaRoomMap_PalaceOfWinds_BombWallOutside_top.bin.lz" + gDungeonMaps_PalaceOfWinds_BombWallOutside:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/14_BombWallOutside/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_CloudJumps_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/15_CloudJumps/gAreaRoomMap_PalaceOfWinds_CloudJumps_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_CloudJumps_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/15_CloudJumps/gAreaRoomMap_PalaceOfWinds_CloudJumps_top.bin.lz" + gDungeonMaps_PalaceOfWinds_CloudJumps:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/15_CloudJumps/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/16_BlockMazeToBossDoor/gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/16_BlockMazeToBossDoor/gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_top.bin.lz" + gDungeonMaps_PalaceOfWinds_BlockMazeToBossDoor:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/16_BlockMazeToBossDoor/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/17_CrackedFloorLakitu/gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/17_CrackedFloorLakitu/gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_top.bin.lz" + gDungeonMaps_PalaceOfWinds_CrackedFloorLakitu:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/17_CrackedFloorLakitu/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/18_HeartPieceBridge/gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/18_HeartPieceBridge/gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_top.bin.lz" + gDungeonMaps_PalaceOfWinds_HeartPieceBridge:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/18_HeartPieceBridge/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_FanBridge_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/19_FanBridge/gAreaRoomMap_PalaceOfWinds_FanBridge_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_FanBridge_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/19_FanBridge/gAreaRoomMap_PalaceOfWinds_FanBridge_top.bin.lz" + gDungeonMaps_PalaceOfWinds_FanBridge:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/19_FanBridge/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_ToFanBridge_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/20_ToFanBridge/gAreaRoomMap_PalaceOfWinds_ToFanBridge_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_ToFanBridge_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/20_ToFanBridge/gAreaRoomMap_PalaceOfWinds_ToFanBridge_top.bin.lz" + gDungeonMaps_PalaceOfWinds_ToFanBridge:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/20_ToFanBridge/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_RedWarpHall_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/21_RedWarpHall/gAreaRoomMap_PalaceOfWinds_RedWarpHall_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_RedWarpHall_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/21_RedWarpHall/gAreaRoomMap_PalaceOfWinds_RedWarpHall_top.bin.lz" + gDungeonMaps_PalaceOfWinds_RedWarpHall:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/21_RedWarpHall/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/22_PlatformCloneRide/gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/22_PlatformCloneRide/gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_top.bin.lz" + gDungeonMaps_PalaceOfWinds_PlatformCloneRide:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/22_PlatformCloneRide/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/23_PitCornerAfterKey/gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/23_PitCornerAfterKey/gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_top.bin.lz" + gDungeonMaps_PalaceOfWinds_PitCornerAfterKey:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/23_PitCornerAfterKey/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_PlatformCrowRide_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/24_PlatformCrowRide/gAreaRoomMap_PalaceOfWinds_PlatformCrowRide_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_PlatformCrowRide_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/24_PlatformCrowRide/gAreaRoomMap_PalaceOfWinds_PlatformCrowRide_top.bin.lz" + gDungeonMaps_PalaceOfWinds_PlatformCrowRide:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/24_PlatformCrowRide/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_GratePlatformRide_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/25_GratePlatformRide/gAreaRoomMap_PalaceOfWinds_GratePlatformRide_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_GratePlatformRide_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/25_GratePlatformRide/gAreaRoomMap_PalaceOfWinds_GratePlatformRide_top.bin.lz" + gDungeonMaps_PalaceOfWinds_GratePlatformRide:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/25_GratePlatformRide/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_PotPush_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/26_PotPush/gAreaRoomMap_PalaceOfWinds_PotPush_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_PotPush_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/26_PotPush/gAreaRoomMap_PalaceOfWinds_PotPush_top.bin.lz" + gDungeonMaps_PalaceOfWinds_PotPush:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/26_PotPush/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_FloormasterLever_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/27_FloormasterLever/gAreaRoomMap_PalaceOfWinds_FloormasterLever_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_FloormasterLever_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/27_FloormasterLever/gAreaRoomMap_PalaceOfWinds_FloormasterLever_top.bin.lz" + gDungeonMaps_PalaceOfWinds_FloormasterLever:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/27_FloormasterLever/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_Map_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/28_Map/gAreaRoomMap_PalaceOfWinds_Map_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_Map_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/28_Map/gAreaRoomMap_PalaceOfWinds_Map_top.bin.lz" + gDungeonMaps_PalaceOfWinds_Map:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/28_Map/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_CornerToMap_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/29_CornerToMap/gAreaRoomMap_PalaceOfWinds_CornerToMap_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_CornerToMap_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/29_CornerToMap/gAreaRoomMap_PalaceOfWinds_CornerToMap_top.bin.lz" + gDungeonMaps_PalaceOfWinds_CornerToMap:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/29_CornerToMap/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/30_StairsAfterFloormaster/gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/30_StairsAfterFloormaster/gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_top.bin.lz" + gDungeonMaps_PalaceOfWinds_StairsAfterFloormaster:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/30_StairsAfterFloormaster/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/31_HoleToKinstoneWizzrobe/gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/31_HoleToKinstoneWizzrobe/gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_top.bin.lz" + gDungeonMaps_PalaceOfWinds_HoleToKinstoneWizzrobe:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/31_HoleToKinstoneWizzrobe/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_KeyArrowButton_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/32_KeyArrowButton/gAreaRoomMap_PalaceOfWinds_KeyArrowButton_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_KeyArrowButton_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/32_KeyArrowButton/gAreaRoomMap_PalaceOfWinds_KeyArrowButton_top.bin.lz" + gDungeonMaps_PalaceOfWinds_KeyArrowButton:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/32_KeyArrowButton/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_GratesTo3f_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/33_GratesTo3f/gAreaRoomMap_PalaceOfWinds_GratesTo3f_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_GratesTo3f_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/33_GratesTo3f/gAreaRoomMap_PalaceOfWinds_GratesTo3f_top.bin.lz" + gDungeonMaps_PalaceOfWinds_GratesTo3f:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/33_GratesTo3f/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_SpinyFight_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/34_SpinyFight/gAreaRoomMap_PalaceOfWinds_SpinyFight_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_SpinyFight_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/34_SpinyFight/gAreaRoomMap_PalaceOfWinds_SpinyFight_top.bin.lz" + gDungeonMaps_PalaceOfWinds_SpinyFight:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/34_SpinyFight/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_PeahatSwitch_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/35_PeahatSwitch/gAreaRoomMap_PalaceOfWinds_PeahatSwitch_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_PeahatSwitch_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/35_PeahatSwitch/gAreaRoomMap_PalaceOfWinds_PeahatSwitch_top.bin.lz" + gDungeonMaps_PalaceOfWinds_PeahatSwitch:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/35_PeahatSwitch/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/36_WhirlwindBombarossa/gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/36_WhirlwindBombarossa/gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_top.bin.lz" + gDungeonMaps_PalaceOfWinds_WhirlwindBombarossa:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/36_WhirlwindBombarossa/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/37_DoorToStalfosFirebar/gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/37_DoorToStalfosFirebar/gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_top.bin.lz" + gDungeonMaps_PalaceOfWinds_DoorToStalfosFirebar:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/37_DoorToStalfosFirebar/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_StalfosFirebarHole_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/38_StalfosFirebarHole/gAreaRoomMap_PalaceOfWinds_StalfosFirebarHole_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_StalfosFirebarHole_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/38_StalfosFirebarHole/gAreaRoomMap_PalaceOfWinds_StalfosFirebarHole_top.bin.lz" + gDungeonMaps_PalaceOfWinds_StalfosFirebarHole:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/38_StalfosFirebarHole/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/39_ShortcutDoorButtons/gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/39_ShortcutDoorButtons/gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_top.bin.lz" + gDungeonMaps_PalaceOfWinds_ShortcutDoorButtons:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/39_ShortcutDoorButtons/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/40_ToPeahatSwitch/gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/40_ToPeahatSwitch/gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_top.bin.lz" + gDungeonMaps_PalaceOfWinds_ToPeahatSwitch:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/40_ToPeahatSwitch/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/41_KinstoneWizzrobeFight/gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/41_KinstoneWizzrobeFight/gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_top.bin.lz" + gDungeonMaps_PalaceOfWinds_KinstoneWizzrobeFight:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/41_KinstoneWizzrobeFight/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_GibdoStairs_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/42_GibdoStairs/gAreaRoomMap_PalaceOfWinds_GibdoStairs_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_GibdoStairs_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/42_GibdoStairs/gAreaRoomMap_PalaceOfWinds_GibdoStairs_top.bin.lz" + gDungeonMaps_PalaceOfWinds_GibdoStairs:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/42_GibdoStairs/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/43_SpikeBarSmallKey/gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/43_SpikeBarSmallKey/gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_top.bin.lz" + gDungeonMaps_PalaceOfWinds_SpikeBarSmallKey:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/43_SpikeBarSmallKey/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_RocCape_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/44_RocCape/gAreaRoomMap_PalaceOfWinds_RocCape_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_RocCape_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/44_RocCape/gAreaRoomMap_PalaceOfWinds_RocCape_top.bin.lz" + gDungeonMaps_PalaceOfWinds_RocCape:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/44_RocCape/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_FireBarGrates_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/45_FireBarGrates/gAreaRoomMap_PalaceOfWinds_FireBarGrates_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_FireBarGrates_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/45_FireBarGrates/gAreaRoomMap_PalaceOfWinds_FireBarGrates_top.bin.lz" + gDungeonMaps_PalaceOfWinds_FireBarGrates:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/45_FireBarGrates/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/46_PlatformRideBombarossas/gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/46_PlatformRideBombarossas/gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_top.bin.lz" + gDungeonMaps_PalaceOfWinds_PlatformRideBombarossas:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/46_PlatformRideBombarossas/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/47_BridgeAfterDarknut/gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/47_BridgeAfterDarknut/gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_top.bin.lz" + gDungeonMaps_PalaceOfWinds_BridgeAfterDarknut:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/47_BridgeAfterDarknut/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/48_BridgeSwitchesCloneBlock/gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/48_BridgeSwitchesCloneBlock/gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_top.bin.lz" + gDungeonMaps_PalaceOfWinds_BridgeSwitchesCloneBlock:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/48_BridgeSwitchesCloneBlock/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_EntranceRoom_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/49_EntranceRoom/gAreaRoomMap_PalaceOfWinds_EntranceRoom_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_EntranceRoom_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/49_EntranceRoom/gAreaRoomMap_PalaceOfWinds_EntranceRoom_top.bin.lz" + gDungeonMaps_PalaceOfWinds_EntranceRoom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/49_EntranceRoom/dungeon_map.bin" +gAreaRoomMap_PalaceOfWinds_DarkCompassHall_bottom:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/50_DarkCompassHall/gAreaRoomMap_PalaceOfWinds_DarkCompassHall_bottom.bin.lz" +gAreaRoomMap_PalaceOfWinds_DarkCompassHall_top:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/50_DarkCompassHall/gAreaRoomMap_PalaceOfWinds_DarkCompassHall_top.bin.lz" + gDungeonMaps_PalaceOfWinds_DarkCompassHall:: + .incbin "maps/areas/112_PalaceOfWinds/rooms/50_DarkCompassHall/dungeon_map.bin" +gAreaRoomMap_PalaceOfWindsBoss_0_top:: + .incbin "maps/areas/113_PalaceOfWindsBoss/rooms/00_0/gAreaRoomMap_PalaceOfWindsBoss_0_top.bin.lz" +gyorgRoomMap_1_top:: + .incbin "maps/areas/113_PalaceOfWindsBoss/rooms/00_0/gyorgRoomMap_1_top.bin.lz" +gyorgRoomMap_2_top:: + .incbin "maps/areas/113_PalaceOfWindsBoss/rooms/00_0/gyorgRoomMap_2_top.bin.lz" +gyorgRoomMap_3_top:: + .incbin "maps/areas/113_PalaceOfWindsBoss/rooms/00_0/gyorgRoomMap_3_top.bin.lz" +gAreaTileSet_Sanctuary_0_0:: + .incbin "maps/areas/120_Sanctuary/tileSets/0/gAreaTileSet_Sanctuary_0_0.4bpp.lz" +gAreaTileSet_Sanctuary_0_1:: + .incbin "maps/areas/120_Sanctuary/tileSets/0/gAreaTileSet_Sanctuary_0_1.4bpp.lz" +gAreaTileSet_Sanctuary_0_2:: + .incbin "maps/areas/120_Sanctuary/tileSets/0/gAreaTileSet_Sanctuary_0_2.4bpp.lz" +gAreaTileSet_Sanctuary_bottom:: + .incbin "maps/areas/120_Sanctuary/tileSet/gAreaTileSet_Sanctuary_bottom.bin.lz" +gAreaTileSet_Sanctuary_top:: + .incbin "maps/areas/120_Sanctuary/tileSet/gAreaTileSet_Sanctuary_top.bin.lz" +gAreaTileSetTypes_Sanctuary_bottom:: + .incbin "maps/areas/120_Sanctuary/tileSet/gAreaTileSetTypes_Sanctuary_bottom.bin.lz" +gAreaTileSetTypes_Sanctuary_top:: + .incbin "maps/areas/120_Sanctuary/tileSet/gAreaTileSetTypes_Sanctuary_top.bin.lz" +gAreaRoomMap_Sanctuary_Hall_bottom:: + .incbin "maps/areas/120_Sanctuary/rooms/00_Hall/gAreaRoomMap_Sanctuary_Hall_bottom.bin.lz" +gAreaRoomMap_Sanctuary_Hall_top:: + .incbin "maps/areas/120_Sanctuary/rooms/00_Hall/gAreaRoomMap_Sanctuary_Hall_top.bin.lz" +gAreaRoomMap_Sanctuary_Main_bottom:: + .incbin "maps/areas/120_Sanctuary/rooms/01_Main/gAreaRoomMap_Sanctuary_Main_bottom.bin.lz" +gAreaRoomMap_Sanctuary_Main_top:: + .incbin "maps/areas/120_Sanctuary/rooms/01_Main/gAreaRoomMap_Sanctuary_Main_top.bin.lz" +gAreaRoomMap_Sanctuary_StainedGlass_bottom:: + .incbin "maps/areas/120_Sanctuary/rooms/02_StainedGlass/gAreaRoomMap_Sanctuary_StainedGlass_bottom.bin.lz" +gAreaRoomMap_Sanctuary_StainedGlass_top:: + .incbin "maps/areas/120_Sanctuary/rooms/02_StainedGlass/gAreaRoomMap_Sanctuary_StainedGlass_top.bin.lz" +gAreaTileSet_HyruleCastle_0_0:: + .incbin "maps/areas/128_HyruleCastle/tileSets/0/gAreaTileSet_HyruleCastle_0_0.4bpp.lz" +gAreaTileSet_HyruleCastle_0_1:: + .incbin "maps/areas/128_HyruleCastle/tileSets/0/gAreaTileSet_HyruleCastle_0_1.4bpp.lz" +gAreaTileSet_HyruleCastle_0_2:: + .incbin "maps/areas/128_HyruleCastle/tileSets/0/gAreaTileSet_HyruleCastle_0_2.4bpp.lz" +gAreaTileSet_HyruleCastle_bottom:: + .incbin "maps/areas/128_HyruleCastle/tileSet/gAreaTileSet_HyruleCastle_bottom.bin.lz" +gAreaTileSet_HyruleCastle_top:: + .incbin "maps/areas/128_HyruleCastle/tileSet/gAreaTileSet_HyruleCastle_top.bin.lz" +gAreaTileSetTypes_HyruleCastle_bottom:: + .incbin "maps/areas/128_HyruleCastle/tileSet/gAreaTileSetTypes_HyruleCastle_bottom.bin.lz" +gAreaTileSetTypes_HyruleCastle_top:: + .incbin "maps/areas/128_HyruleCastle/tileSet/gAreaTileSetTypes_HyruleCastle_top.bin.lz" +gAreaRoomMap_HyruleCastle_0_bottom:: + .incbin "maps/areas/128_HyruleCastle/rooms/00_0/gAreaRoomMap_HyruleCastle_0_bottom.bin.lz" +gAreaRoomMap_HyruleCastle_0_top:: + .incbin "maps/areas/128_HyruleCastle/rooms/00_0/gAreaRoomMap_HyruleCastle_0_top.bin.lz" +gAreaRoomMap_HyruleCastle_1_bottom:: + .incbin "maps/areas/128_HyruleCastle/rooms/01_1/gAreaRoomMap_HyruleCastle_1_bottom.bin.lz" +gAreaRoomMap_HyruleCastle_1_top:: + .incbin "maps/areas/128_HyruleCastle/rooms/01_1/gAreaRoomMap_HyruleCastle_1_top.bin.lz" +gAreaRoomMap_HyruleCastle_2_bottom:: + .incbin "maps/areas/128_HyruleCastle/rooms/02_2/gAreaRoomMap_HyruleCastle_2_bottom.bin.lz" +gAreaRoomMap_HyruleCastle_2_top:: + .incbin "maps/areas/128_HyruleCastle/rooms/02_2/gAreaRoomMap_HyruleCastle_2_top.bin.lz" +gAreaRoomMap_HyruleCastle_3_bottom:: + .incbin "maps/areas/128_HyruleCastle/rooms/03_3/gAreaRoomMap_HyruleCastle_3_bottom.bin.lz" +gAreaRoomMap_HyruleCastle_3_top:: + .incbin "maps/areas/128_HyruleCastle/rooms/03_3/gAreaRoomMap_HyruleCastle_3_top.bin.lz" +gAreaRoomMap_HyruleCastle_4_bottom:: + .incbin "maps/areas/128_HyruleCastle/rooms/04_4/gAreaRoomMap_HyruleCastle_4_bottom.bin.lz" +gAreaRoomMap_HyruleCastle_4_top:: + .incbin "maps/areas/128_HyruleCastle/rooms/04_4/gAreaRoomMap_HyruleCastle_4_top.bin.lz" +gAreaRoomMap_HyruleCastle_5_bottom:: + .incbin "maps/areas/128_HyruleCastle/rooms/05_5/gAreaRoomMap_HyruleCastle_5_bottom.bin.lz" +gAreaRoomMap_HyruleCastle_5_top:: + .incbin "maps/areas/128_HyruleCastle/rooms/05_5/gAreaRoomMap_HyruleCastle_5_top.bin.lz" +gAreaRoomMap_HyruleCastle_6_bottom:: + .incbin "maps/areas/128_HyruleCastle/rooms/06_6/gAreaRoomMap_HyruleCastle_6_bottom.bin.lz" +gAreaRoomMap_HyruleCastle_6_top:: + .incbin "maps/areas/128_HyruleCastle/rooms/06_6/gAreaRoomMap_HyruleCastle_6_top.bin.lz" unknown_187:: .incbin "assets/unknown_187.bin" -gAreaTileset_SanctuaryEntrance_0_0:: - .incbin "tilesets/gAreaTileset_SanctuaryEntrance_0_0.4bpp.lz" - .align 2 -gAreaTileset_SanctuaryEntrance_0_1:: - .incbin "tilesets/gAreaTileset_SanctuaryEntrance_0_1.4bpp.lz" - .align 2 -gAreaTileset_SanctuaryEntrance_0_2:: - .incbin "tilesets/gAreaTileset_SanctuaryEntrance_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_SanctuaryEntrance_0:: - .incbin "assets/gAreaMetatiles_SanctuaryEntrance_0.bin" - .align 2 -gAreaMetatiles_SanctuaryEntrance_1:: - .incbin "assets/gAreaMetatiles_SanctuaryEntrance_1.bin" - .align 2 -gAreaMetatiles_SanctuaryEntrance_2:: - .incbin "assets/gAreaMetatiles_SanctuaryEntrance_2.bin" - .align 2 -gAreaMetatiles_SanctuaryEntrance_3:: - .incbin "assets/gAreaMetatiles_SanctuaryEntrance_3.bin" - .align 2 -gAreaRoomMap_SanctuaryEntrance_0_0:: - .incbin "assets/gAreaRoomMap_SanctuaryEntrance_0_0.bin" - .align 2 -gAreaRoomMap_SanctuaryEntrance_0_1:: - .incbin "assets/gAreaRoomMap_SanctuaryEntrance_0_1.bin" - .align 2 -gAreaTileset_DarkHyruleCastle_1FEntrance_0:: - .incbin "tilesets/gAreaTileset_DarkHyruleCastle_1FEntrance_0.4bpp.lz" - .align 2 -gAreaTileset_DarkHyruleCastle_1FEntrance_1:: - .incbin "tilesets/gAreaTileset_DarkHyruleCastle_1FEntrance_1.4bpp.lz" - .align 2 -gAreaTileset_DarkHyruleCastle_1FEntrance_2:: - .incbin "tilesets/gAreaTileset_DarkHyruleCastle_1FEntrance_2.4bpp.lz" - .align 2 -gAreaMetatiles_DarkHyruleCastle_1FEntrance:: - .incbin "assets/gAreaMetatiles_DarkHyruleCastle_1FEntrance.bin" - .align 2 -gAreaMetatiles_DarkHyruleCastle_3FTopLeftTower:: - .incbin "assets/gAreaMetatiles_DarkHyruleCastle_3FTopLeftTower.bin" -gAreaMetatiles_DarkHyruleCastle_3FTopRightTower:: - .incbin "assets/gAreaMetatiles_DarkHyruleCastle_3FTopRightTower.bin" - .align 2 -gAreaMetatiles_DarkHyruleCastle_3FBottomLeftTower:: - .incbin "assets/gAreaMetatiles_DarkHyruleCastle_3FBottomLeftTower.bin" - .align 2 -gAreaTileset_DarkHyruleCastleBridge_0_0:: - .incbin "tilesets/gAreaTileset_DarkHyruleCastleBridge_0_0.4bpp.lz" - .align 2 -gAreaTileset_DarkHyruleCastleBridge_0_1:: - .incbin "tilesets/gAreaTileset_DarkHyruleCastleBridge_0_1.4bpp.lz" - .align 2 -gAreaTileset_DarkHyruleCastleBridge_0_2:: - .incbin "tilesets/gAreaTileset_DarkHyruleCastleBridge_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_DarkHyruleCastleBridge_0:: - .incbin "assets/gAreaMetatiles_DarkHyruleCastleBridge_0.bin" - .align 2 -gAreaMetatiles_DarkHyruleCastleBridge_1:: - .incbin "assets/gAreaMetatiles_DarkHyruleCastleBridge_1.bin" - .align 2 -gAreaMetatiles_DarkHyruleCastleBridge_2:: - .incbin "assets/gAreaMetatiles_DarkHyruleCastleBridge_2.bin" -gAreaMetatiles_DarkHyruleCastleBridge_3:: - .incbin "assets/gAreaMetatiles_DarkHyruleCastleBridge_3.bin" - .align 2 -gAreaTileset_Vaati3_0_0:: - .incbin "tilesets/gAreaTileset_Vaati3_0_0.4bpp.lz" - .align 2 -gAreaTileset_Vaati3_0_1:: - .incbin "tilesets/gAreaTileset_Vaati3_0_1.4bpp.lz" - .align 2 -gAreaTileset_Vaati3_0_2:: - .incbin "tilesets/gAreaTileset_Vaati3_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_Vaati3_0:: - .incbin "assets/gAreaMetatiles_Vaati3_0.bin" - .align 2 -gAreaMetatiles_Vaati3_1:: - .incbin "assets/gAreaMetatiles_Vaati3_1.bin" -gAreaMetatiles_Vaati3_2:: - .incbin "assets/gAreaMetatiles_Vaati3_2.bin" - .align 2 -gAreaMetatiles_Vaati3_3:: - .incbin "assets/gAreaMetatiles_Vaati3_3.bin" - .align 2 -gAreaTileset_Vaati2_0_0:: - .incbin "tilesets/gAreaTileset_Vaati2_0_0.4bpp.lz" -gAreaTileset_Vaati2_0_1:: - .incbin "tilesets/gAreaTileset_Vaati2_0_1.4bpp.lz" - .align 2 -gAreaTileset_Vaati2_0_2:: - .incbin "tilesets/gAreaTileset_Vaati2_0_2.4bpp.lz" -gAreaMetatiles_Vaati2_0:: - .incbin "assets/gAreaMetatiles_Vaati2_0.bin" - .align 2 -gAreaMetatiles_Vaati2_1:: - .incbin "assets/gAreaMetatiles_Vaati2_1.bin" - .align 2 -gAreaMetatiles_Vaati2_2:: - .incbin "assets/gAreaMetatiles_Vaati2_2.bin" - .align 2 -gAreaMetatiles_Vaati2_3:: - .incbin "assets/gAreaMetatiles_Vaati2_3.bin" - .align 2 -gAreaTileset_VaatisArms_0_0:: - .incbin "tilesets/gAreaTileset_VaatisArms_0_0.4bpp.lz" - .align 2 -gAreaTileset_VaatisArms_0_1:: - .incbin "tilesets/gAreaTileset_VaatisArms_0_1.4bpp.lz" - .align 2 -gAreaTileset_VaatisArms_0_2:: - .incbin "tilesets/gAreaTileset_VaatisArms_0_2.4bpp.lz" - .align 2 -gAreaMetatiles_VaatisArms_0:: - .incbin "assets/gAreaMetatiles_VaatisArms_0.bin" - .align 2 -gAreaMetatiles_VaatisArms_1:: - .incbin "assets/gAreaMetatiles_VaatisArms_1.bin" - .align 2 -gAreaMetatiles_VaatisArms_2:: - .incbin "assets/gAreaMetatiles_VaatisArms_2.bin" - .align 2 -gAreaMetatiles_VaatisArms_3:: - .incbin "assets/gAreaMetatiles_VaatisArms_3.bin" -gAreaRoomMap_DarkHyruleCastle_1FEntrance_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FEntrance_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_1FEntrance_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FEntrance_1.bin" - .align 2 -unknown_188:: - .incbin "assets/unknown_188.bin" -gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_1.bin" - .align 2 -unknown_189:: - .incbin "assets/unknown_189.bin" -gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_1.bin" - .align 2 -unknown_190:: - .incbin "assets/unknown_190.bin" -gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_1.bin" - .align 2 -unknown_191:: - .incbin "assets/unknown_191.bin" -gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_0.bin" -gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_1.bin" - .align 2 -unknown_192:: - .incbin "assets/unknown_192.bin" -gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_1.bin" - .align 2 -unknown_193:: - .incbin "assets/unknown_193.bin" -gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_0.bin" -gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_1.bin" - .align 2 -unknown_194:: - .incbin "assets/unknown_194.bin" -gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_1.bin" - .align 2 -unknown_195:: - .incbin "assets/unknown_195.bin" -gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_1.bin" - .align 2 -unknown_196:: - .incbin "assets/unknown_196.bin" -gAreaRoomMap_DarkHyruleCastle_2FBossKey_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBossKey_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_2FBossKey_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBossKey_1.bin" - .align 2 -unknown_197:: - .incbin "assets/unknown_197.bin" -gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_1.bin" - .align 2 -unknown_198:: - .incbin "assets/unknown_198.bin" -gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_1.bin" - .align 2 -unknown_199:: - .incbin "assets/unknown_199.bin" -gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_1.bin" - .align 2 -unknown_200:: - .incbin "assets/unknown_200.bin" -gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_1.bin" - .align 2 -unknown_201:: - .incbin "assets/unknown_201.bin" -gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_1.bin" - .align 2 -unknown_202:: - .incbin "assets/unknown_202.bin" -gAreaRoomMap_DarkHyruleCastle_2FSparks_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FSparks_0.bin" -gAreaRoomMap_DarkHyruleCastle_2FSparks_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FSparks_1.bin" - .align 2 -unknown_203:: - .incbin "assets/unknown_203.bin" -gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_1.bin" - .align 2 -unknown_204:: - .incbin "assets/unknown_204.bin" -gAreaRoomMap_DarkHyruleCastle_2FLeft_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FLeft_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_2FLeft_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FLeft_1.bin" - .align 2 -unknown_205:: - .incbin "assets/unknown_205.bin" -gAreaRoomMap_DarkHyruleCastle_2FRight_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FRight_0.bin" -gAreaRoomMap_DarkHyruleCastle_2FRight_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FRight_1.bin" - .align 2 -unknown_206:: - .incbin "assets/unknown_206.bin" -gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_1.bin" - .align 2 -unknown_207:: - .incbin "assets/unknown_207.bin" -gAreaRoomMap_DarkHyruleCastle_2FBossDoor_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBossDoor_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_2FBossDoor_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBossDoor_1.bin" - .align 2 -unknown_208:: - .incbin "assets/unknown_208.bin" -gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_0.bin" -gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_1.bin" - .align 2 -unknown_209:: - .incbin "assets/unknown_209.bin" -gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_1.bin" - .align 2 -unknown_210:: - .incbin "assets/unknown_210.bin" -gAreaRoomMap_DarkHyruleCastle_2FEntrance_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FEntrance_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_2FEntrance_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FEntrance_1.bin" - .align 2 -unknown_211:: - .incbin "assets/unknown_211.bin" -gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_1.bin" - .align 2 -unknown_212:: - .incbin "assets/unknown_212.bin" -gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_0.bin" -gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_1.bin" - .align 2 -unknown_213:: - .incbin "assets/unknown_213.bin" -gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_1.bin" - .align 2 -unknown_214:: - .incbin "assets/unknown_214.bin" -gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_0.bin" -gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_1.bin" - .align 2 -unknown_215:: - .incbin "assets/unknown_215.bin" -gAreaRoomMap_DarkHyruleCastle_B1Entrance_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Entrance_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_B1Entrance_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Entrance_1.bin" - .align 2 -unknown_216:: - .incbin "assets/unknown_216.bin" -gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_1.bin" - .align 2 -unknown_217:: - .incbin "assets/unknown_217.bin" -gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_0.bin" -gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_1.bin" - .align 2 -unknown_218:: - .incbin "assets/unknown_218.bin" -gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_1.bin" - .align 2 -unknown_219:: - .incbin "assets/unknown_219.bin" -gAreaRoomMap_DarkHyruleCastle_1FCompass_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FCompass_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_1FCompass_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FCompass_1.bin" - .align 2 -unknown_220:: - .incbin "assets/unknown_220.bin" -gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_1.bin" - .align 2 -unknown_221:: - .incbin "assets/unknown_221.bin" -gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_1.bin" - .align 2 -unknown_222:: - .incbin "assets/unknown_222.bin" -gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_0.bin" -gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_1.bin" - .align 2 -unknown_223:: - .incbin "assets/unknown_223.bin" -gAreaRoomMap_DarkHyruleCastle_1FLoopTop_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTop_0.bin" -gAreaRoomMap_DarkHyruleCastle_1FLoopTop_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTop_1.bin" - .align 2 -unknown_224:: - .incbin "assets/unknown_224.bin" -gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_0.bin" -gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_1.bin" - .align 2 -unknown_225:: - .incbin "assets/unknown_225.bin" -gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_0.bin" -gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_1.bin" - .align 2 -unknown_226:: - .incbin "assets/unknown_226.bin" -gAreaRoomMap_DarkHyruleCastle_1FLoopRight_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopRight_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_1FLoopRight_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopRight_1.bin" - .align 2 -unknown_227:: - .incbin "assets/unknown_227.bin" -gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_1.bin" - .align 2 -unknown_228:: - .incbin "assets/unknown_228.bin" -gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_1.bin" - .align 2 -unknown_229:: - .incbin "assets/unknown_229.bin" -gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_1.bin" - .align 2 -unknown_230:: - .incbin "assets/unknown_230.bin" -gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_1.bin" - .align 2 -unknown_231:: - .incbin "assets/unknown_231.bin" -gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_0.bin" -gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_1.bin" - .align 2 -unknown_232:: - .incbin "assets/unknown_232.bin" -gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_0.bin" -gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_1.bin" - .align 2 -unknown_233:: - .incbin "assets/unknown_233.bin" -gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_1.bin" - .align 2 -unknown_234:: - .incbin "assets/unknown_234.bin" -gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_0.bin" -gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_1.bin" - .align 2 -unknown_235:: - .incbin "assets/unknown_235.bin" -gAreaRoomMap_DarkHyruleCastle_B1ToPrison_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrison_0.bin" -gAreaRoomMap_DarkHyruleCastle_B1ToPrison_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrison_1.bin" - .align 2 -unknown_236:: - .incbin "assets/unknown_236.bin" -gAreaRoomMap_DarkHyruleCastle_B1BombWall_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BombWall_0.bin" -gAreaRoomMap_DarkHyruleCastle_B1BombWall_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1BombWall_1.bin" - .align 2 -unknown_237:: - .incbin "assets/unknown_237.bin" -gAreaRoomMap_DarkHyruleCastle_B1Keatons_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Keatons_0.bin" -gAreaRoomMap_DarkHyruleCastle_B1Keatons_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Keatons_1.bin" - .align 2 -unknown_238:: - .incbin "assets/unknown_238.bin" -gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_1.bin" - .align 2 -unknown_239:: - .incbin "assets/unknown_239.bin" -gAreaRoomMap_DarkHyruleCastle_B1Cannons_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Cannons_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_B1Cannons_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Cannons_1.bin" - .align 2 -unknown_240:: - .incbin "assets/unknown_240.bin" -gAreaRoomMap_DarkHyruleCastle_B1Left_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Left_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_B1Left_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Left_1.bin" - .align 2 -unknown_241:: - .incbin "assets/unknown_241.bin" -gAreaRoomMap_DarkHyruleCastle_B1Right_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Right_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_B1Right_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Right_1.bin" - .align 2 -unknown_242:: - .incbin "assets/unknown_242.bin" -gAreaRoomMap_DarkHyruleCastle_B1Map_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Map_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_B1Map_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B1Map_1.bin" - .align 2 -unknown_243:: - .incbin "assets/unknown_243.bin" -gAreaRoomMap_DarkHyruleCastle_B2ToPrison_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B2ToPrison_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_B2ToPrison_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B2ToPrison_1.bin" - .align 2 -unknown_244:: - .incbin "assets/unknown_244.bin" -gAreaRoomMap_DarkHyruleCastle_B2Prison_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B2Prison_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_B2Prison_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B2Prison_1.bin" - .align 2 -unknown_245:: - .incbin "assets/unknown_245.bin" -gAreaRoomMap_DarkHyruleCastle_B2Dropdown_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B2Dropdown_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastle_B2Dropdown_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_B2Dropdown_1.bin" - .align 2 -unknown_246:: - .incbin "assets/unknown_246.bin" -gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_0.bin" -gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_1.bin" - .align 2 -unknown_247:: - .incbin "assets/unknown_247.bin" -gAreaRoomMap_DarkHyruleCastleBridge_0_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastleBridge_0_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastleBridge_0_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastleBridge_0_1.bin" - .align 2 -unknown_248:: - .incbin "assets/unknown_248.bin" -gAreaRoomMap_Vaati3_0_0:: - .incbin "assets/gAreaRoomMap_Vaati3_0_0.bin" -gAreaRoomMap_Vaati3_0_1:: - .incbin "assets/gAreaRoomMap_Vaati3_0_1.bin" - .align 2 -gAreaRoomMap_Vaati3_1_0:: - .incbin "assets/gAreaRoomMap_Vaati3_1_0.bin" - .align 2 -gAreaRoomMap_Vaati3_1_1:: - .incbin "assets/gAreaRoomMap_Vaati3_1_1.bin" - .align 2 -gAreaRoomMap_Vaati2_0_0:: - .incbin "assets/gAreaRoomMap_Vaati2_0_0.bin" -gAreaRoomMap_Vaati2_0_1:: - .incbin "assets/gAreaRoomMap_Vaati2_0_1.bin" - .align 2 -gAreaRoomMap_VaatisArms_0_0:: - .incbin "assets/gAreaRoomMap_VaatisArms_0_0.bin" - .align 2 -gAreaRoomMap_VaatisArms_0_1:: - .incbin "assets/gAreaRoomMap_VaatisArms_0_1.bin" - .align 2 -gAreaRoomMap_VaatisArms_1_0:: - .incbin "assets/gAreaRoomMap_VaatisArms_1_0.bin" - .align 2 -gAreaRoomMap_VaatisArms_1_1:: - .incbin "assets/gAreaRoomMap_VaatisArms_1_1.bin" - .align 2 -gAreaRoomMap_VaatisArms_2_0:: - .incbin "assets/gAreaRoomMap_VaatisArms_2_0.bin" - .align 2 -gAreaRoomMap_VaatisArms_2_1:: - .incbin "assets/gAreaRoomMap_VaatisArms_2_1.bin" - .align 2 -gAreaTileset_Vaati2_0_3:: - .incbin "assets/gAreaTileset_Vaati2_0_3.bin" - .align 2 -gAreaTileset_DarkHyruleCastleOutside_0_0:: - .incbin "tilesets/gAreaTileset_DarkHyruleCastleOutside_0_0.4bpp.lz" - .align 2 -gAreaTileset_DarkHyruleCastleOutside_0_1:: - .incbin "tilesets/gAreaTileset_DarkHyruleCastleOutside_0_1.4bpp.lz" -gAreaTileset_DarkHyruleCastleOutside_0_2:: - .incbin "tilesets/gAreaTileset_DarkHyruleCastleOutside_0_2.4bpp.lz" -gAreaMetatiles_DarkHyruleCastleOutside_0:: - .incbin "assets/gAreaMetatiles_DarkHyruleCastleOutside_0.bin" -gAreaMetatiles_DarkHyruleCastleOutside_1:: - .incbin "assets/gAreaMetatiles_DarkHyruleCastleOutside_1.bin" - .align 2 -gAreaMetatiles_DarkHyruleCastleOutside_2:: - .incbin "assets/gAreaMetatiles_DarkHyruleCastleOutside_2.bin" - .align 2 -gAreaMetatiles_DarkHyruleCastleOutside_3:: - .incbin "assets/gAreaMetatiles_DarkHyruleCastleOutside_3.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastleOutside_0_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_0_0.bin" -gAreaRoomMap_DarkHyruleCastleOutside_0_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_0_1.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastleOutside_1_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_1_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastleOutside_1_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_1_1.bin" -gAreaRoomMap_DarkHyruleCastleOutside_2_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_2_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastleOutside_2_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_2_1.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastleOutside_3_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_3_0.bin" -gAreaRoomMap_DarkHyruleCastleOutside_3_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_3_1.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastleOutside_4_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_4_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastleOutside_4_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_4_1.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastleOutside_5_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_5_0.bin" -gAreaRoomMap_DarkHyruleCastleOutside_5_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_5_1.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastleOutside_6_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_6_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastleOutside_6_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_6_1.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastleOutside_7_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_7_0.bin" -gAreaRoomMap_DarkHyruleCastleOutside_7_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_7_1.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastleOutside_8_0:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_8_0.bin" - .align 2 -gAreaRoomMap_DarkHyruleCastleOutside_8_1:: - .incbin "assets/gAreaRoomMap_DarkHyruleCastleOutside_8_1.bin" - .align 2 -gAreaRoomMap_47_0_0:: - .incbin "assets/gAreaRoomMap_47_0_0.bin" - .align 2 -gAreaRoomMap_47_0_1:: - .incbin "assets/gAreaRoomMap_47_0_1.bin" - .align 2 -gAreaRoomMap_47_1_0:: - .incbin "assets/gAreaRoomMap_47_1_0.bin" -gAreaRoomMap_47_1_1:: - .incbin "assets/gAreaRoomMap_47_1_1.bin" - .align 2 -gAreaRoomMap_47_2_0:: - .incbin "assets/gAreaRoomMap_47_2_0.bin" -gAreaRoomMap_47_2_1:: - .incbin "assets/gAreaRoomMap_47_2_1.bin" - .align 2 -gAreaRoomMap_45_0_0:: - .incbin "assets/gAreaRoomMap_45_0_0.bin" - .align 2 -gAreaRoomMap_45_0_1:: - .incbin "assets/gAreaRoomMap_45_0_1.bin" -gAreaRoomMap_46_0_0:: - .incbin "assets/gAreaRoomMap_46_0_0.bin" - .align 2 -gAreaRoomMap_46_0_1:: - .incbin "assets/gAreaRoomMap_46_0_1.bin" -gAreaRoomMap_46_1_0:: - .incbin "assets/gAreaRoomMap_46_1_0.bin" - .align 2 -gAreaRoomMap_46_1_1:: - .incbin "assets/gAreaRoomMap_46_1_1.bin" - .align 2 -gAreaRoomMap_46_2_0:: - .incbin "assets/gAreaRoomMap_46_2_0.bin" - .align 2 -gAreaRoomMap_46_2_1:: - .incbin "assets/gAreaRoomMap_46_2_1.bin" -gAreaRoomMap_46_3_0:: - .incbin "assets/gAreaRoomMap_46_3_0.bin" - .align 2 -gAreaRoomMap_46_3_1:: - .incbin "assets/gAreaRoomMap_46_3_1.bin" -gAreaRoomMap_46_4_0:: - .incbin "assets/gAreaRoomMap_46_4_0.bin" - .align 2 -gAreaRoomMap_46_4_1:: - .incbin "assets/gAreaRoomMap_46_4_1.bin" - .align 2 -gAreaRoomMap_46_5_0:: - .incbin "assets/gAreaRoomMap_46_5_0.bin" - .align 2 -gAreaRoomMap_46_5_1:: - .incbin "assets/gAreaRoomMap_46_5_1.bin" - .align 2 -gAreaRoomMap_46_6_0:: - .incbin "assets/gAreaRoomMap_46_6_0.bin" - .align 2 -gAreaRoomMap_46_6_1:: - .incbin "assets/gAreaRoomMap_46_6_1.bin" - .align 2 -gAreaRoomMap_46_7_0:: - .incbin "assets/gAreaRoomMap_46_7_0.bin" -gAreaRoomMap_46_7_1:: - .incbin "assets/gAreaRoomMap_46_7_1.bin" - .align 2 +gAreaTileSet_SanctuaryEntrance_0_0:: + .incbin "maps/areas/129_SanctuaryEntrance/tileSets/0/gAreaTileSet_SanctuaryEntrance_0_0.4bpp.lz" +gAreaTileSet_SanctuaryEntrance_0_1:: + .incbin "maps/areas/129_SanctuaryEntrance/tileSets/0/gAreaTileSet_SanctuaryEntrance_0_1.4bpp.lz" +gAreaTileSet_SanctuaryEntrance_0_2:: + .incbin "maps/areas/129_SanctuaryEntrance/tileSets/0/gAreaTileSet_SanctuaryEntrance_0_2.4bpp.lz" +gAreaTileSet_SanctuaryEntrance_bottom:: + .incbin "maps/areas/129_SanctuaryEntrance/tileSet/gAreaTileSet_SanctuaryEntrance_bottom.bin.lz" +gAreaTileSet_SanctuaryEntrance_top:: + .incbin "maps/areas/129_SanctuaryEntrance/tileSet/gAreaTileSet_SanctuaryEntrance_top.bin.lz" +gAreaTileSetTypes_SanctuaryEntrance_bottom:: + .incbin "maps/areas/129_SanctuaryEntrance/tileSet/gAreaTileSetTypes_SanctuaryEntrance_bottom.bin.lz" +gAreaTileSetTypes_SanctuaryEntrance_top:: + .incbin "maps/areas/129_SanctuaryEntrance/tileSet/gAreaTileSetTypes_SanctuaryEntrance_top.bin.lz" +gAreaRoomMap_SanctuaryEntrance_Main_bottom:: + .incbin "maps/areas/129_SanctuaryEntrance/rooms/00_Main/gAreaRoomMap_SanctuaryEntrance_Main_bottom.bin.lz" +gAreaRoomMap_SanctuaryEntrance_Main_top:: + .incbin "maps/areas/129_SanctuaryEntrance/rooms/00_Main/gAreaRoomMap_SanctuaryEntrance_Main_top.bin.lz" +gAreaTileSet_DarkHyruleCastle_0_0:: + .incbin "maps/areas/136_DarkHyruleCastle/tileSets/0/gAreaTileSet_DarkHyruleCastle_0_0.4bpp.lz" +gAreaTileSet_DarkHyruleCastle_0_1:: + .incbin "maps/areas/136_DarkHyruleCastle/tileSets/0/gAreaTileSet_DarkHyruleCastle_0_1.4bpp.lz" +gAreaTileSet_DarkHyruleCastle_0_2:: + .incbin "maps/areas/136_DarkHyruleCastle/tileSets/0/gAreaTileSet_DarkHyruleCastle_0_2.4bpp.lz" +gAreaTileSet_DarkHyruleCastle_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/tileSet/gAreaTileSet_DarkHyruleCastle_bottom.bin.lz" +gAreaTileSet_DarkHyruleCastle_top:: + .incbin "maps/areas/136_DarkHyruleCastle/tileSet/gAreaTileSet_DarkHyruleCastle_top.bin.lz" +gAreaTileSetTypes_DarkHyruleCastle_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/tileSet/gAreaTileSetTypes_DarkHyruleCastle_bottom.bin.lz" +gAreaTileSetTypes_DarkHyruleCastle_top:: + .incbin "maps/areas/136_DarkHyruleCastle/tileSet/gAreaTileSetTypes_DarkHyruleCastle_top.bin.lz" +gAreaTileSet_DarkHyruleCastleBridge_0_0:: + .incbin "maps/areas/141_DarkHyruleCastleBridge/tileSets/0/gAreaTileSet_DarkHyruleCastleBridge_0_0.4bpp.lz" +gAreaTileSet_DarkHyruleCastleBridge_0_1:: + .incbin "maps/areas/141_DarkHyruleCastleBridge/tileSets/0/gAreaTileSet_DarkHyruleCastleBridge_0_1.4bpp.lz" +gAreaTileSet_DarkHyruleCastleBridge_0_2:: + .incbin "maps/areas/141_DarkHyruleCastleBridge/tileSets/0/gAreaTileSet_DarkHyruleCastleBridge_0_2.4bpp.lz" +gAreaTileSet_DarkHyruleCastleBridge_bottom:: + .incbin "maps/areas/141_DarkHyruleCastleBridge/tileSet/gAreaTileSet_DarkHyruleCastleBridge_bottom.bin.lz" +gAreaTileSet_DarkHyruleCastleBridge_top:: + .incbin "maps/areas/141_DarkHyruleCastleBridge/tileSet/gAreaTileSet_DarkHyruleCastleBridge_top.bin.lz" +gAreaTileSetTypes_DarkHyruleCastleBridge_bottom:: + .incbin "maps/areas/141_DarkHyruleCastleBridge/tileSet/gAreaTileSetTypes_DarkHyruleCastleBridge_bottom.bin.lz" +gAreaTileSetTypes_DarkHyruleCastleBridge_top:: + .incbin "maps/areas/141_DarkHyruleCastleBridge/tileSet/gAreaTileSetTypes_DarkHyruleCastleBridge_top.bin.lz" +gAreaTileSet_Vaati3_0_0:: + .incbin "maps/areas/139_Vaati3/tileSets/0/gAreaTileSet_Vaati3_0_0.4bpp.lz" +gAreaTileSet_Vaati3_0_1:: + .incbin "maps/areas/139_Vaati3/tileSets/0/gAreaTileSet_Vaati3_0_1.4bpp.lz" +gAreaTileSet_Vaati3_0_2:: + .incbin "maps/areas/139_Vaati3/tileSets/0/gAreaTileSet_Vaati3_0_2.4bpp.lz" +gAreaTileSet_Vaati3_bottom:: + .incbin "maps/areas/139_Vaati3/tileSet/gAreaTileSet_Vaati3_bottom.bin.lz" +gAreaTileSet_Vaati3_top:: + .incbin "maps/areas/139_Vaati3/tileSet/gAreaTileSet_Vaati3_top.bin.lz" +gAreaTileSetTypes_Vaati3_bottom:: + .incbin "maps/areas/139_Vaati3/tileSet/gAreaTileSetTypes_Vaati3_bottom.bin.lz" +gAreaTileSetTypes_Vaati3_top:: + .incbin "maps/areas/139_Vaati3/tileSet/gAreaTileSetTypes_Vaati3_top.bin.lz" +gAreaTileSet_Vaati2_0_0:: + .incbin "maps/areas/140_Vaati2/tileSets/0/gAreaTileSet_Vaati2_0_0.4bpp.lz" +gAreaTileSet_Vaati2_0_1:: + .incbin "maps/areas/140_Vaati2/tileSets/0/gAreaTileSet_Vaati2_0_1.4bpp.lz" +gAreaTileSet_Vaati2_0_2:: + .incbin "maps/areas/140_Vaati2/tileSets/0/gAreaTileSet_Vaati2_0_2.4bpp.lz" +gAreaTileSet_Vaati2_bottom:: + .incbin "maps/areas/140_Vaati2/tileSet/gAreaTileSet_Vaati2_bottom.bin.lz" +gAreaTileSet_Vaati2_top:: + .incbin "maps/areas/140_Vaati2/tileSet/gAreaTileSet_Vaati2_top.bin.lz" +gAreaTileSetTypes_Vaati2_bottom:: + .incbin "maps/areas/140_Vaati2/tileSet/gAreaTileSetTypes_Vaati2_bottom.bin.lz" +gAreaTileSetTypes_Vaati2_top:: + .incbin "maps/areas/140_Vaati2/tileSet/gAreaTileSetTypes_Vaati2_top.bin.lz" +gAreaTileSet_VaatisArms_0_0:: + .incbin "maps/areas/138_VaatisArms/tileSets/0/gAreaTileSet_VaatisArms_0_0.4bpp.lz" +gAreaTileSet_VaatisArms_0_1:: + .incbin "maps/areas/138_VaatisArms/tileSets/0/gAreaTileSet_VaatisArms_0_1.4bpp.lz" +gAreaTileSet_VaatisArms_0_2:: + .incbin "maps/areas/138_VaatisArms/tileSets/0/gAreaTileSet_VaatisArms_0_2.4bpp.lz" +gAreaTileSet_VaatisArms_bottom:: + .incbin "maps/areas/138_VaatisArms/tileSet/gAreaTileSet_VaatisArms_bottom.bin.lz" +gAreaTileSet_VaatisArms_top:: + .incbin "maps/areas/138_VaatisArms/tileSet/gAreaTileSet_VaatisArms_top.bin.lz" +gAreaTileSetTypes_VaatisArms_bottom:: + .incbin "maps/areas/138_VaatisArms/tileSet/gAreaTileSetTypes_VaatisArms_bottom.bin.lz" +gAreaTileSetTypes_VaatisArms_top:: + .incbin "maps/areas/138_VaatisArms/tileSet/gAreaTileSetTypes_VaatisArms_top.bin.lz" +gAreaRoomMap_DarkHyruleCastle_1fEntrance_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/00_1fEntrance/gAreaRoomMap_DarkHyruleCastle_1fEntrance_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_1fEntrance_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/00_1fEntrance/gAreaRoomMap_DarkHyruleCastle_1fEntrance_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_1fEntrance:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/00_1fEntrance/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_3fTopLeftTower_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/01_3fTopLeftTower/gAreaRoomMap_DarkHyruleCastle_3fTopLeftTower_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_3fTopLeftTower_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/01_3fTopLeftTower/gAreaRoomMap_DarkHyruleCastle_3fTopLeftTower_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_3fTopLeftTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/01_3fTopLeftTower/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_3fTopRightTower_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/02_3fTopRightTower/gAreaRoomMap_DarkHyruleCastle_3fTopRightTower_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_3fTopRightTower_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/02_3fTopRightTower/gAreaRoomMap_DarkHyruleCastle_3fTopRightTower_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_3fTopRightTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/02_3fTopRightTower/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_3fBottomLeftTower_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/03_3fBottomLeftTower/gAreaRoomMap_DarkHyruleCastle_3fBottomLeftTower_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_3fBottomLeftTower_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/03_3fBottomLeftTower/gAreaRoomMap_DarkHyruleCastle_3fBottomLeftTower_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_3fBottomLeftTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/03_3fBottomLeftTower/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_3fBottomRightTower_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/04_3fBottomRightTower/gAreaRoomMap_DarkHyruleCastle_3fBottomRightTower_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_3fBottomRightTower_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/04_3fBottomRightTower/gAreaRoomMap_DarkHyruleCastle_3fBottomRightTower_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_3fBottomRightTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/04_3fBottomRightTower/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_3fKeatonHallToVaati_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/05_3fKeatonHallToVaati/gAreaRoomMap_DarkHyruleCastle_3fKeatonHallToVaati_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_3fKeatonHallToVaati_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/05_3fKeatonHallToVaati/gAreaRoomMap_DarkHyruleCastle_3fKeatonHallToVaati_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_3fKeatonHallToVaati:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/05_3fKeatonHallToVaati/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_3fTripleDarknut_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/06_3fTripleDarknut/gAreaRoomMap_DarkHyruleCastle_3fTripleDarknut_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_3fTripleDarknut_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/06_3fTripleDarknut/gAreaRoomMap_DarkHyruleCastle_3fTripleDarknut_top.bin.lz" + + gDungeonMaps_DarkHyruleCastle_3fTripleDarknut:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/06_3fTripleDarknut/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_2fTopLeftTower_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/07_2fTopLeftTower/gAreaRoomMap_DarkHyruleCastle_2fTopLeftTower_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_2fTopLeftTower_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/07_2fTopLeftTower/gAreaRoomMap_DarkHyruleCastle_2fTopLeftTower_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_2fTopLeftTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/07_2fTopLeftTower/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_2fTopLeftCorner_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/08_2fTopLeftCorner/gAreaRoomMap_DarkHyruleCastle_2fTopLeftCorner_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_2fTopLeftCorner_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/08_2fTopLeftCorner/gAreaRoomMap_DarkHyruleCastle_2fTopLeftCorner_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_2fTopLeftCorner:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/08_2fTopLeftCorner/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_2fBossKey_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/09_2fBossKey/gAreaRoomMap_DarkHyruleCastle_2fBossKey_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_2fBossKey_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/09_2fBossKey/gAreaRoomMap_DarkHyruleCastle_2fBossKey_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_2fBossKey:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/09_2fBossKey/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_2fBlueWarp_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/10_2fBlueWarp/gAreaRoomMap_DarkHyruleCastle_2fBlueWarp_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_2fBlueWarp_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/10_2fBlueWarp/gAreaRoomMap_DarkHyruleCastle_2fBlueWarp_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_2fBlueWarp:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/10_2fBlueWarp/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerGhini_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/11_2fTopRightCornerGhini/gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerGhini_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerGhini_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/11_2fTopRightCornerGhini/gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerGhini_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_2fTopRightCornerGhini:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/11_2fTopRightCornerGhini/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerTorches_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/12_2fTopRightCornerTorches/gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerTorches_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerTorches_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/12_2fTopRightCornerTorches/gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerTorches_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_2fTopRightCornerTorches:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/12_2fTopRightCornerTorches/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_2fTopRightTower_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/13_2fTopRightTower/gAreaRoomMap_DarkHyruleCastle_2fTopRightTower_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_2fTopRightTower_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/13_2fTopRightTower/gAreaRoomMap_DarkHyruleCastle_2fTopRightTower_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_2fTopRightTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/13_2fTopRightTower/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_2fTopLeftDarknut_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/14_2fTopLeftDarknut/gAreaRoomMap_DarkHyruleCastle_2fTopLeftDarknut_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_2fTopLeftDarknut_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/14_2fTopLeftDarknut/gAreaRoomMap_DarkHyruleCastle_2fTopLeftDarknut_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_2fTopLeftDarknut:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/14_2fTopLeftDarknut/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_2fSparks_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/15_2fSparks/gAreaRoomMap_DarkHyruleCastle_2fSparks_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_2fSparks_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/15_2fSparks/gAreaRoomMap_DarkHyruleCastle_2fSparks_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_2fSparks:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/15_2fSparks/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_2fTopRightDarknuts_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/16_2fTopRightDarknuts/gAreaRoomMap_DarkHyruleCastle_2fTopRightDarknuts_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_2fTopRightDarknuts_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/16_2fTopRightDarknuts/gAreaRoomMap_DarkHyruleCastle_2fTopRightDarknuts_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_2fTopRightDarknuts:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/16_2fTopRightDarknuts/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_2fLeft_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/17_2fLeft/gAreaRoomMap_DarkHyruleCastle_2fLeft_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_2fLeft_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/17_2fLeft/gAreaRoomMap_DarkHyruleCastle_2fLeft_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_2fLeft:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/17_2fLeft/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_2fRight_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/18_2fRight/gAreaRoomMap_DarkHyruleCastle_2fRight_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_2fRight_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/18_2fRight/gAreaRoomMap_DarkHyruleCastle_2fRight_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_2fRight:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/18_2fRight/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_2fBottomLeftDarknuts_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/19_2fBottomLeftDarknuts/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftDarknuts_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_2fBottomLeftDarknuts_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/19_2fBottomLeftDarknuts/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftDarknuts_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_2fBottomLeftDarknuts:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/19_2fBottomLeftDarknuts/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_2fBossDoor_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/20_2fBossDoor/gAreaRoomMap_DarkHyruleCastle_2fBossDoor_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_2fBossDoor_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/20_2fBossDoor/gAreaRoomMap_DarkHyruleCastle_2fBossDoor_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_2fBossDoor:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/20_2fBossDoor/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_2fBottomRightDarknut_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/21_2fBottomRightDarknut/gAreaRoomMap_DarkHyruleCastle_2fBottomRightDarknut_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_2fBottomRightDarknut_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/21_2fBottomRightDarknut/gAreaRoomMap_DarkHyruleCastle_2fBottomRightDarknut_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_2fBottomRightDarknut:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/21_2fBottomRightDarknut/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_2fBottomLeftCornerPuzzle_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/22_2fBottomLeftCornerPuzzle/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftCornerPuzzle_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_2fBottomLeftCornerPuzzle_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/22_2fBottomLeftCornerPuzzle/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftCornerPuzzle_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_2fBottomLeftCornerPuzzle:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/22_2fBottomLeftCornerPuzzle/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_2fEntrance_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/23_2fEntrance/gAreaRoomMap_DarkHyruleCastle_2fEntrance_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_2fEntrance_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/23_2fEntrance/gAreaRoomMap_DarkHyruleCastle_2fEntrance_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_2fEntrance:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/23_2fEntrance/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_2fBottomRightCorner_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/24_2fBottomRightCorner/gAreaRoomMap_DarkHyruleCastle_2fBottomRightCorner_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_2fBottomRightCorner_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/24_2fBottomRightCorner/gAreaRoomMap_DarkHyruleCastle_2fBottomRightCorner_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_2fBottomRightCorner:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/24_2fBottomRightCorner/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_2fBottomLeftTower_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/25_2fBottomLeftTower/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftTower_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_2fBottomLeftTower_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/25_2fBottomLeftTower/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftTower_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_2fBottomLeftTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/25_2fBottomLeftTower/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_2fBottomLeftGhini_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/26_2fBottomLeftGhini/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftGhini_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_2fBottomLeftGhini_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/26_2fBottomLeftGhini/gAreaRoomMap_DarkHyruleCastle_2fBottomLeftGhini_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_2fBottomLeftGhini:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/26_2fBottomLeftGhini/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_1b_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/27_1b/gAreaRoomMap_DarkHyruleCastle_1b_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_1b_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/27_1b/gAreaRoomMap_DarkHyruleCastle_1b_top.bin.lz" +gDungeonMaps_DarkHyruleCastle_1b_unused:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/27_1b/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_B1Entrance_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/28_B1Entrance/gAreaRoomMap_DarkHyruleCastle_B1Entrance_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_B1Entrance_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/28_B1Entrance/gAreaRoomMap_DarkHyruleCastle_B1Entrance_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_B1Entrance:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/28_B1Entrance/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_2fBottomRightTower_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/29_2fBottomRightTower/gAreaRoomMap_DarkHyruleCastle_2fBottomRightTower_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_2fBottomRightTower_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/29_2fBottomRightTower/gAreaRoomMap_DarkHyruleCastle_2fBottomRightTower_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_2fBottomRightTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/29_2fBottomRightTower/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_1fTopLeftTower_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/30_1fTopLeftTower/gAreaRoomMap_DarkHyruleCastle_1fTopLeftTower_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_1fTopLeftTower_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/30_1fTopLeftTower/gAreaRoomMap_DarkHyruleCastle_1fTopLeftTower_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_1fTopLeftTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/30_1fTopLeftTower/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_1fThroneRoom_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/31_1fThroneRoom/gAreaRoomMap_DarkHyruleCastle_1fThroneRoom_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_1fThroneRoom_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/31_1fThroneRoom/gAreaRoomMap_DarkHyruleCastle_1fThroneRoom_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_1fThroneRoom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/31_1fThroneRoom/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_1fCompass_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/32_1fCompass/gAreaRoomMap_DarkHyruleCastle_1fCompass_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_1fCompass_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/32_1fCompass/gAreaRoomMap_DarkHyruleCastle_1fCompass_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_1fCompass:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/32_1fCompass/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_1fTopRightTower_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/33_1fTopRightTower/gAreaRoomMap_DarkHyruleCastle_1fTopRightTower_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_1fTopRightTower_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/33_1fTopRightTower/gAreaRoomMap_DarkHyruleCastle_1fTopRightTower_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_1fTopRightTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/33_1fTopRightTower/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_1fBeforeThrone_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/34_1fBeforeThrone/gAreaRoomMap_DarkHyruleCastle_1fBeforeThrone_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_1fBeforeThrone_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/34_1fBeforeThrone/gAreaRoomMap_DarkHyruleCastle_1fBeforeThrone_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_1fBeforeThrone:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/34_1fBeforeThrone/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_1fLoopTopLeft_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/35_1fLoopTopLeft/gAreaRoomMap_DarkHyruleCastle_1fLoopTopLeft_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_1fLoopTopLeft_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/35_1fLoopTopLeft/gAreaRoomMap_DarkHyruleCastle_1fLoopTopLeft_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_1fLoopTopLeft:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/35_1fLoopTopLeft/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_1fLoopTop_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/36_1fLoopTop/gAreaRoomMap_DarkHyruleCastle_1fLoopTop_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_1fLoopTop_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/36_1fLoopTop/gAreaRoomMap_DarkHyruleCastle_1fLoopTop_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_1fLoopTop:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/36_1fLoopTop/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/37_1fLoopTopRight/gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/37_1fLoopTopRight/gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_1fLoopTopRight:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/37_1fLoopTopRight/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_1fLoopLeft_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/38_1fLoopLeft/gAreaRoomMap_DarkHyruleCastle_1fLoopLeft_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_1fLoopLeft_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/38_1fLoopLeft/gAreaRoomMap_DarkHyruleCastle_1fLoopLeft_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_1fLoopLeft:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/38_1fLoopLeft/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_1fLoopRight_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/39_1fLoopRight/gAreaRoomMap_DarkHyruleCastle_1fLoopRight_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_1fLoopRight_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/39_1fLoopRight/gAreaRoomMap_DarkHyruleCastle_1fLoopRight_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_1fLoopRight:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/39_1fLoopRight/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_1fLoopBottomLeft_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/40_1fLoopBottomLeft/gAreaRoomMap_DarkHyruleCastle_1fLoopBottomLeft_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_1fLoopBottomLeft_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/40_1fLoopBottomLeft/gAreaRoomMap_DarkHyruleCastle_1fLoopBottomLeft_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_1fLoopBottomLeft:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/40_1fLoopBottomLeft/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_1fLoopBottom_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/41_1fLoopBottom/gAreaRoomMap_DarkHyruleCastle_1fLoopBottom_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_1fLoopBottom_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/41_1fLoopBottom/gAreaRoomMap_DarkHyruleCastle_1fLoopBottom_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_1fLoopBottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/41_1fLoopBottom/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/42_1fLoopBottomRight/gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/42_1fLoopBottomRight/gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_1fLoopBottomRight:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/42_1fLoopBottomRight/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_1fBottomLeftTower_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/43_1fBottomLeftTower/gAreaRoomMap_DarkHyruleCastle_1fBottomLeftTower_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_1fBottomLeftTower_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/43_1fBottomLeftTower/gAreaRoomMap_DarkHyruleCastle_1fBottomLeftTower_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_1fBottomLeftTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/43_1fBottomLeftTower/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_1fBottomRightTower_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/44_1fBottomRightTower/gAreaRoomMap_DarkHyruleCastle_1fBottomRightTower_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_1fBottomRightTower_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/44_1fBottomRightTower/gAreaRoomMap_DarkHyruleCastle_1fBottomRightTower_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_1fBottomRightTower:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/44_1fBottomRightTower/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/45_B1BelowThrone/gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/45_B1BelowThrone/gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_B1BelowThrone:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/45_B1BelowThrone/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/46_B1BelowCompass/gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/46_B1BelowCompass/gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_B1BelowCompass:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/46_B1BelowCompass/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/47_B1BeforeThrone/gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/47_B1BeforeThrone/gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_B1BeforeThrone:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/47_B1BeforeThrone/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_B1ToPrison_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/48_B1ToPrison/gAreaRoomMap_DarkHyruleCastle_B1ToPrison_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_B1ToPrison_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/48_B1ToPrison/gAreaRoomMap_DarkHyruleCastle_B1ToPrison_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_B1ToPrison:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/48_B1ToPrison/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_B1BombWall_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/49_B1BombWall/gAreaRoomMap_DarkHyruleCastle_B1BombWall_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_B1BombWall_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/49_B1BombWall/gAreaRoomMap_DarkHyruleCastle_B1BombWall_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_B1BombWall:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/49_B1BombWall/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_B1Keatons_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/50_B1Keatons/gAreaRoomMap_DarkHyruleCastle_B1Keatons_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_B1Keatons_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/50_B1Keatons/gAreaRoomMap_DarkHyruleCastle_B1Keatons_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_B1Keatons:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/50_B1Keatons/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/51_B1ToPrisonFirebar/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/51_B1ToPrisonFirebar/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_B1ToPrisonFirebar:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/51_B1ToPrisonFirebar/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_B1Cannons_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/52_B1Cannons/gAreaRoomMap_DarkHyruleCastle_B1Cannons_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_B1Cannons_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/52_B1Cannons/gAreaRoomMap_DarkHyruleCastle_B1Cannons_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_B1Cannons:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/52_B1Cannons/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_B1Left_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/53_B1Left/gAreaRoomMap_DarkHyruleCastle_B1Left_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_B1Left_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/53_B1Left/gAreaRoomMap_DarkHyruleCastle_B1Left_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_B1Left:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/53_B1Left/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_B1Right_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/54_B1Right/gAreaRoomMap_DarkHyruleCastle_B1Right_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_B1Right_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/54_B1Right/gAreaRoomMap_DarkHyruleCastle_B1Right_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_B1Right:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/54_B1Right/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_B1Map_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/55_B1Map/gAreaRoomMap_DarkHyruleCastle_B1Map_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_B1Map_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/55_B1Map/gAreaRoomMap_DarkHyruleCastle_B1Map_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_B1Map:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/55_B1Map/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_B2ToPrison_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/56_B2ToPrison/gAreaRoomMap_DarkHyruleCastle_B2ToPrison_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_B2ToPrison_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/56_B2ToPrison/gAreaRoomMap_DarkHyruleCastle_B2ToPrison_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_B2ToPrison:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/56_B2ToPrison/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_B2Prison_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/57_B2Prison/gAreaRoomMap_DarkHyruleCastle_B2Prison_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_B2Prison_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/57_B2Prison/gAreaRoomMap_DarkHyruleCastle_B2Prison_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_B2Prison:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/57_B2Prison/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_B2Dropdown_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/58_B2Dropdown/gAreaRoomMap_DarkHyruleCastle_B2Dropdown_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_B2Dropdown_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/58_B2Dropdown/gAreaRoomMap_DarkHyruleCastle_B2Dropdown_top.bin.lz" + gDungeonMaps_DarkHyruleCastle_B2Dropdown:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/58_B2Dropdown/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastle_3b_bottom:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/59_3b/gAreaRoomMap_DarkHyruleCastle_3b_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastle_3b_top:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/59_3b/gAreaRoomMap_DarkHyruleCastle_3b_top.bin.lz" +gDungeonMaps_DarkHyruleCastle_3b_unused:: + .incbin "maps/areas/136_DarkHyruleCastle/rooms/59_3b/dungeon_map.bin" +gAreaRoomMap_DarkHyruleCastleBridge_Main_bottom:: + .incbin "maps/areas/141_DarkHyruleCastleBridge/rooms/00_Main/gAreaRoomMap_DarkHyruleCastleBridge_Main_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastleBridge_Main_top:: + .incbin "maps/areas/141_DarkHyruleCastleBridge/rooms/00_Main/gAreaRoomMap_DarkHyruleCastleBridge_Main_top.bin.lz" +gDungeonMaps_DarkHyruleCastleBridge_Main_unused:: + .incbin "maps/areas/141_DarkHyruleCastleBridge/rooms/00_Main/dungeon_map.bin" +gAreaRoomMap_Vaati3_0_bottom:: + .incbin "maps/areas/139_Vaati3/rooms/00_0/gAreaRoomMap_Vaati3_0_bottom.bin.lz" +gAreaRoomMap_Vaati3_0_top:: + .incbin "maps/areas/139_Vaati3/rooms/00_0/gAreaRoomMap_Vaati3_0_top.bin.lz" +gAreaRoomMap_Vaati3_1_bottom:: + .incbin "maps/areas/139_Vaati3/rooms/01_1/gAreaRoomMap_Vaati3_1_bottom.bin.lz" +gAreaRoomMap_Vaati3_1_top:: + .incbin "maps/areas/139_Vaati3/rooms/01_1/gAreaRoomMap_Vaati3_1_top.bin.lz" +gAreaRoomMap_Vaati2_0_bottom:: + .incbin "maps/areas/140_Vaati2/rooms/00_0/gAreaRoomMap_Vaati2_0_bottom.bin.lz" +gAreaRoomMap_Vaati2_0_top:: + .incbin "maps/areas/140_Vaati2/rooms/00_0/gAreaRoomMap_Vaati2_0_top.bin.lz" +gAreaRoomMap_VaatisArms_First_bottom:: + .incbin "maps/areas/138_VaatisArms/rooms/00_First/gAreaRoomMap_VaatisArms_First_bottom.bin.lz" +gAreaRoomMap_VaatisArms_First_top:: + .incbin "maps/areas/138_VaatisArms/rooms/00_First/gAreaRoomMap_VaatisArms_First_top.bin.lz" +gAreaRoomMap_VaatisArms_Second_bottom:: + .incbin "maps/areas/138_VaatisArms/rooms/01_Second/gAreaRoomMap_VaatisArms_Second_bottom.bin.lz" +gAreaRoomMap_VaatisArms_Second_top:: + .incbin "maps/areas/138_VaatisArms/rooms/01_Second/gAreaRoomMap_VaatisArms_Second_top.bin.lz" +gAreaRoomMap_VaatisArms_3_bottom:: + .incbin "maps/areas/138_VaatisArms/rooms/02_3/gAreaRoomMap_VaatisArms_3_bottom.bin.lz" +gAreaRoomMap_VaatisArms_3_top:: + .incbin "maps/areas/138_VaatisArms/rooms/02_3/gAreaRoomMap_VaatisArms_3_top.bin.lz" +gAreaTileSet_Vaati2_0_3:: + .incbin "maps/areas/140_Vaati2/tileSets/0/gAreaTileSet_Vaati2_0_3.4bpp.lz" +gAreaTileSet_DarkHyruleCastleOutside_0_0:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/tileSets/0/gAreaTileSet_DarkHyruleCastleOutside_0_0.4bpp.lz" +gAreaTileSet_DarkHyruleCastleOutside_0_1:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/tileSets/0/gAreaTileSet_DarkHyruleCastleOutside_0_1.4bpp.lz" +gAreaTileSet_DarkHyruleCastleOutside_0_2:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/tileSets/0/gAreaTileSet_DarkHyruleCastleOutside_0_2.4bpp.lz" +gAreaTileSet_DarkHyruleCastleOutside_bottom:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/tileSet/gAreaTileSet_DarkHyruleCastleOutside_bottom.bin.lz" +gAreaTileSet_DarkHyruleCastleOutside_top:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/tileSet/gAreaTileSet_DarkHyruleCastleOutside_top.bin.lz" +gAreaTileSetTypes_DarkHyruleCastleOutside_bottom:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/tileSet/gAreaTileSetTypes_DarkHyruleCastleOutside_bottom.bin.lz" +gAreaTileSetTypes_DarkHyruleCastleOutside_top:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/tileSet/gAreaTileSetTypes_DarkHyruleCastleOutside_top.bin.lz" +gAreaRoomMap_DarkHyruleCastleOutside_ZeldaStatuePlatform_bottom:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/00_ZeldaStatuePlatform/gAreaRoomMap_DarkHyruleCastleOutside_ZeldaStatuePlatform_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastleOutside_ZeldaStatuePlatform_top:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/00_ZeldaStatuePlatform/gAreaRoomMap_DarkHyruleCastleOutside_ZeldaStatuePlatform_top.bin.lz" +gAreaRoomMap_DarkHyruleCastleOutside_Garden_bottom:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/01_Garden/gAreaRoomMap_DarkHyruleCastleOutside_Garden_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastleOutside_Garden_top:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/01_Garden/gAreaRoomMap_DarkHyruleCastleOutside_Garden_top.bin.lz" +gAreaRoomMap_DarkHyruleCastleOutside_Northwest_bottom:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/02_Northwest/gAreaRoomMap_DarkHyruleCastleOutside_Northwest_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastleOutside_Northwest_top:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/02_Northwest/gAreaRoomMap_DarkHyruleCastleOutside_Northwest_top.bin.lz" +gAreaRoomMap_DarkHyruleCastleOutside_Northeast_bottom:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/03_Northeast/gAreaRoomMap_DarkHyruleCastleOutside_Northeast_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastleOutside_Northeast_top:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/03_Northeast/gAreaRoomMap_DarkHyruleCastleOutside_Northeast_top.bin.lz" +gAreaRoomMap_DarkHyruleCastleOutside_East_bottom:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/04_East/gAreaRoomMap_DarkHyruleCastleOutside_East_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastleOutside_East_top:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/04_East/gAreaRoomMap_DarkHyruleCastleOutside_East_top.bin.lz" +gAreaRoomMap_DarkHyruleCastleOutside_Southwest_bottom:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/05_Southwest/gAreaRoomMap_DarkHyruleCastleOutside_Southwest_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastleOutside_Southwest_top:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/05_Southwest/gAreaRoomMap_DarkHyruleCastleOutside_Southwest_top.bin.lz" +gAreaRoomMap_DarkHyruleCastleOutside_South_bottom:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/06_South/gAreaRoomMap_DarkHyruleCastleOutside_South_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastleOutside_South_top:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/06_South/gAreaRoomMap_DarkHyruleCastleOutside_South_top.bin.lz" +gAreaRoomMap_DarkHyruleCastleOutside_Southeast_bottom:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/07_Southeast/gAreaRoomMap_DarkHyruleCastleOutside_Southeast_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastleOutside_Southeast_top:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/07_Southeast/gAreaRoomMap_DarkHyruleCastleOutside_Southeast_top.bin.lz" +gAreaRoomMap_DarkHyruleCastleOutside_8_bottom:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/08_8/gAreaRoomMap_DarkHyruleCastleOutside_8_bottom.bin.lz" +gAreaRoomMap_DarkHyruleCastleOutside_8_top:: + .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/08_8/gAreaRoomMap_DarkHyruleCastleOutside_8_top.bin.lz" +gAreaRoomMap_47_0_bottom:: + .incbin "maps/areas/071_47/rooms/00_0/gAreaRoomMap_47_0_bottom.bin.lz" +gAreaRoomMap_47_0_top:: + .incbin "maps/areas/071_47/rooms/00_0/gAreaRoomMap_47_0_top.bin.lz" +gAreaRoomMap_47_1_bottom:: + .incbin "maps/areas/071_47/rooms/01_1/gAreaRoomMap_47_1_bottom.bin.lz" +gAreaRoomMap_47_1_top:: + .incbin "maps/areas/071_47/rooms/01_1/gAreaRoomMap_47_1_top.bin.lz" +gAreaRoomMap_47_2_bottom:: + .incbin "maps/areas/071_47/rooms/02_2/gAreaRoomMap_47_2_bottom.bin.lz" +gAreaRoomMap_47_2_top:: + .incbin "maps/areas/071_47/rooms/02_2/gAreaRoomMap_47_2_top.bin.lz" +gAreaRoomMap_45_0_bottom:: + .incbin "maps/areas/069_45/rooms/00_0/gAreaRoomMap_45_0_bottom.bin.lz" +gAreaRoomMap_45_0_top:: + .incbin "maps/areas/069_45/rooms/00_0/gAreaRoomMap_45_0_top.bin.lz" +gAreaRoomMap_Null46_0_bottom:: + .incbin "maps/areas/070_Null46/rooms/00_0/gAreaRoomMap_Null46_0_bottom.bin.lz" +gAreaRoomMap_Null46_0_top:: + .incbin "maps/areas/070_Null46/rooms/00_0/gAreaRoomMap_Null46_0_top.bin.lz" +gAreaRoomMap_Null46_1_bottom:: + .incbin "maps/areas/070_Null46/rooms/01_1/gAreaRoomMap_Null46_1_bottom.bin.lz" +gAreaRoomMap_Null46_1_top:: + .incbin "maps/areas/070_Null46/rooms/01_1/gAreaRoomMap_Null46_1_top.bin.lz" +gAreaRoomMap_Null46_2_bottom:: + .incbin "maps/areas/070_Null46/rooms/02_2/gAreaRoomMap_Null46_2_bottom.bin.lz" +gAreaRoomMap_Null46_2_top:: + .incbin "maps/areas/070_Null46/rooms/02_2/gAreaRoomMap_Null46_2_top.bin.lz" +gAreaRoomMap_Null46_3_bottom:: + .incbin "maps/areas/070_Null46/rooms/03_3/gAreaRoomMap_Null46_3_bottom.bin.lz" +gAreaRoomMap_Null46_3_top:: + .incbin "maps/areas/070_Null46/rooms/03_3/gAreaRoomMap_Null46_3_top.bin.lz" +gAreaRoomMap_Null46_4_bottom:: + .incbin "maps/areas/070_Null46/rooms/04_4/gAreaRoomMap_Null46_4_bottom.bin.lz" +gAreaRoomMap_Null46_4_top:: + .incbin "maps/areas/070_Null46/rooms/04_4/gAreaRoomMap_Null46_4_top.bin.lz" +gAreaRoomMap_Null46_5_bottom:: + .incbin "maps/areas/070_Null46/rooms/05_5/gAreaRoomMap_Null46_5_bottom.bin.lz" +gAreaRoomMap_Null46_5_top:: + .incbin "maps/areas/070_Null46/rooms/05_5/gAreaRoomMap_Null46_5_top.bin.lz" +gAreaRoomMap_Null46_6_bottom:: + .incbin "maps/areas/070_Null46/rooms/06_6/gAreaRoomMap_Null46_6_bottom.bin.lz" +gAreaRoomMap_Null46_6_top:: + .incbin "maps/areas/070_Null46/rooms/06_6/gAreaRoomMap_Null46_6_top.bin.lz" +gAreaRoomMap_Null46_7_bottom:: + .incbin "maps/areas/070_Null46/rooms/07_7/gAreaRoomMap_Null46_7_bottom.bin.lz" +gAreaRoomMap_Null46_7_top:: + .incbin "maps/areas/070_Null46/rooms/07_7/gAreaRoomMap_Null46_7_top.bin.lz" gAreaRoomMap_08107870_0:: - .incbin "assets/gAreaRoomMap_08107870_0.bin" + .incbin "assets/gAreaRoomMap_08107870_0.bin.lz" gAreaRoomMap_08107870_1:: - .incbin "assets/gAreaRoomMap_08107870_1.bin" -gAreaRoomMap_4D_0_0:: - .incbin "assets/gAreaRoomMap_4D_0_0.bin" - .align 2 -gAreaRoomMap_4D_0_1:: - .incbin "assets/gAreaRoomMap_4D_0_1.bin" - .align 2 -gAreaRoomMap_57_0_0:: - .incbin "assets/gAreaRoomMap_57_0_0.bin" - .align 2 -gAreaRoomMap_57_0_1:: - .incbin "assets/gAreaRoomMap_57_0_1.bin" -gAreaRoomMap_5F_0_0:: - .incbin "assets/gAreaRoomMap_5F_0_0.bin" - .align 2 -gAreaRoomMap_5F_0_1:: - .incbin "assets/gAreaRoomMap_5F_0_1.bin" - .align 2 -gAreaRoomMap_67_0_0:: - .incbin "assets/gAreaRoomMap_67_0_0.bin" - .align 2 -gAreaRoomMap_67_0_1:: - .incbin "assets/gAreaRoomMap_67_0_1.bin" - .align 2 -gAreaRoomMap_6F_0_0:: - .incbin "assets/gAreaRoomMap_6F_0_0.bin" - .align 2 -gAreaRoomMap_6F_0_1:: - .incbin "assets/gAreaRoomMap_6F_0_1.bin" - .align 2 -gAreaRoomMap_77_0_0:: - .incbin "assets/gAreaRoomMap_77_0_0.bin" - .align 2 -gAreaRoomMap_77_0_1:: - .incbin "assets/gAreaRoomMap_77_0_1.bin" - .align 2 -gAreaRoomMap_7F_0_0:: - .incbin "assets/gAreaRoomMap_7F_0_0.bin" - .align 2 -gAreaRoomMap_7F_0_1:: - .incbin "assets/gAreaRoomMap_7F_0_1.bin" - .align 2 -gAreaRoomMap_87_0_0:: - .incbin "assets/gAreaRoomMap_87_0_0.bin" - .align 2 -gAreaRoomMap_87_0_1:: - .incbin "assets/gAreaRoomMap_87_0_1.bin" -gAreaRoomMap_8F_0_0:: - .incbin "assets/gAreaRoomMap_8F_0_0.bin" - .align 2 -gAreaRoomMap_8F_0_1:: - .incbin "assets/gAreaRoomMap_8F_0_1.bin" + .incbin "assets/gAreaRoomMap_08107870_1.bin.lz" +gAreaRoomMap_4d_0_bottom:: + .incbin "maps/areas/077_4d/rooms/00_0/gAreaRoomMap_4d_0_bottom.bin.lz" +gAreaRoomMap_4d_0_top:: + .incbin "maps/areas/077_4d/rooms/00_0/gAreaRoomMap_4d_0_top.bin.lz" +gAreaRoomMap_57_0_bottom:: + .incbin "maps/areas/087_57/rooms/00_0/gAreaRoomMap_57_0_bottom.bin.lz" +gAreaRoomMap_57_0_top:: + .incbin "maps/areas/087_57/rooms/00_0/gAreaRoomMap_57_0_top.bin.lz" +gAreaRoomMap_5f_0_bottom:: + .incbin "maps/areas/095_5f/rooms/00_0/gAreaRoomMap_5f_0_bottom.bin.lz" +gAreaRoomMap_5f_0_top:: + .incbin "maps/areas/095_5f/rooms/00_0/gAreaRoomMap_5f_0_top.bin.lz" +gAreaRoomMap_67_0_bottom:: + .incbin "maps/areas/103_67/rooms/00_0/gAreaRoomMap_67_0_bottom.bin.lz" +gAreaRoomMap_67_0_top:: + .incbin "maps/areas/103_67/rooms/00_0/gAreaRoomMap_67_0_top.bin.lz" +gAreaRoomMap_6f_0_bottom:: + .incbin "maps/areas/111_6f/rooms/00_0/gAreaRoomMap_6f_0_bottom.bin.lz" +gAreaRoomMap_6f_0_top:: + .incbin "maps/areas/111_6f/rooms/00_0/gAreaRoomMap_6f_0_top.bin.lz" +gAreaRoomMap_77_0_bottom:: + .incbin "maps/areas/119_77/rooms/00_0/gAreaRoomMap_77_0_bottom.bin.lz" +gAreaRoomMap_77_0_top:: + .incbin "maps/areas/119_77/rooms/00_0/gAreaRoomMap_77_0_top.bin.lz" +gAreaRoomMap_7f_0_bottom:: + .incbin "maps/areas/127_7f/rooms/00_0/gAreaRoomMap_7f_0_bottom.bin.lz" +gAreaRoomMap_7f_0_top:: + .incbin "maps/areas/127_7f/rooms/00_0/gAreaRoomMap_7f_0_top.bin.lz" +gAreaRoomMap_87_0_bottom:: + .incbin "maps/areas/135_87/rooms/00_0/gAreaRoomMap_87_0_bottom.bin.lz" +gAreaRoomMap_87_0_top:: + .incbin "maps/areas/135_87/rooms/00_0/gAreaRoomMap_87_0_top.bin.lz" +gAreaRoomMap_8f_0_bottom:: + .incbin "maps/areas/143_8f/rooms/00_0/gAreaRoomMap_8f_0_bottom.bin.lz" +gAreaRoomMap_8f_0_top:: + .incbin "maps/areas/143_8f/rooms/00_0/gAreaRoomMap_8f_0_top.bin.lz" diff --git a/data/map/map_headers.s b/data/map/map_headers.s index bda80cb2..32a60914 100755 --- a/data/map/map_headers.s +++ b/data/map/map_headers.s @@ -7,54 +7,54 @@ .include "map_offsets.inc" gAreaRoomMap_MinishWoods_0:: @ 081032DC - map_bottom offset_gAreaRoomMap_MinishWoods_0_0, 0x1F02, 1 - map_top offset_gAreaRoomMap_MinishWoods_0_1, 0x1F02, 1, 1 + map_bottom offset_gAreaRoomMap_MinishWoods_Main_bottom, 0x1F02, 1 + map_top offset_gAreaRoomMap_MinishWoods_Main_top, 0x1F02, 1, 1 gAreaRoomMaps_MinishWoods:: @ 081032F4 .4byte gAreaRoomMap_MinishWoods_0 gAreaRoomMap_LakeHylia_0:: @ 081032F8 - map_bottom offset_gAreaRoomMap_LakeHylia_0_0, 0x1680, 1 - map_top offset_gAreaRoomMap_LakeHylia_0_1, 0x1680, 1, 1 + map_bottom offset_gAreaRoomMap_LakeHylia_Main_bottom, 0x1680, 1 + map_top offset_gAreaRoomMap_LakeHylia_Main_top, 0x1680, 1, 1 gAreaRoomMap_LakeHylia_1:: @ 08103310 - map_bottom offset_gAreaRoomMap_LakeHylia_1_0, 0x5E8, 1 - map_top offset_gAreaRoomMap_LakeHylia_1_1, 0x5E8, 1, 1 + map_bottom offset_gAreaRoomMap_LakeHylia_Beanstalk_bottom, 0x5E8, 1 + map_top offset_gAreaRoomMap_LakeHylia_Beanstalk_top, 0x5E8, 1, 1 gAreaRoomMaps_LakeHylia:: @ 08103328 .4byte gAreaRoomMap_LakeHylia_0 .4byte gAreaRoomMap_LakeHylia_1 gAreaRoomMap_CastorWilds_0:: @ 08103330 - map_bottom offset_gAreaRoomMap_CastorWilds_0_0, 0x1D88, 1 - map_top offset_gAreaRoomMap_CastorWilds_0_1, 0x1D88, 1, 1 + map_bottom offset_gAreaRoomMap_CastorWilds_Main_bottom, 0x1D88, 1 + map_top offset_gAreaRoomMap_CastorWilds_Main_top, 0x1D88, 1, 1 gAreaRoomMaps_CastorWilds:: @ 08103348 .4byte gAreaRoomMap_CastorWilds_0 gAreaRoomMap_Ruins_0:: @ 0810334C - map_bottom offset_gAreaRoomMap_Ruins_0_0, 0x3DE, 1 - map_top offset_gAreaRoomMap_Ruins_0_1, 0x3DE, 1, 1 + map_bottom offset_gAreaRoomMap_Ruins_Entrance_bottom, 0x3DE, 1 + map_top offset_gAreaRoomMap_Ruins_Entrance_top, 0x3DE, 1, 1 gAreaRoomMap_Ruins_1:: @ 08103364 - map_bottom offset_gAreaRoomMap_Ruins_1_0, 0x186, 1 - map_top offset_gAreaRoomMap_Ruins_1_1, 0x186, 1, 1 + map_bottom offset_gAreaRoomMap_Ruins_Beanstalk_bottom, 0x186, 1 + map_top offset_gAreaRoomMap_Ruins_Beanstalk_top, 0x186, 1, 1 gAreaRoomMap_Ruins_2:: @ 0810337C - map_bottom offset_gAreaRoomMap_Ruins_2_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Ruins_2_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Ruins_Tektites_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Ruins_Tektites_top, 0x12C, 1, 1 gAreaRoomMap_Ruins_3:: @ 08103394 - map_bottom offset_gAreaRoomMap_Ruins_3_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Ruins_3_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Ruins_LadderToTektites_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Ruins_LadderToTektites_top, 0x12C, 1, 1 gAreaRoomMap_Ruins_4:: @ 081033AC - map_bottom offset_gAreaRoomMap_Ruins_4_0, 0x420, 1 - map_top offset_gAreaRoomMap_Ruins_4_1, 0x420, 1, 1 + map_bottom offset_gAreaRoomMap_Ruins_FortressEntrance_bottom, 0x420, 1 + map_top offset_gAreaRoomMap_Ruins_FortressEntrance_top, 0x420, 1, 1 gAreaRoomMap_Ruins_5:: @ 081033C4 - map_bottom offset_gAreaRoomMap_Ruins_5_0, 0x462, 1 - map_top offset_gAreaRoomMap_Ruins_5_1, 0x462, 1, 1 + map_bottom offset_gAreaRoomMap_Ruins_BelowFortressEntrance_bottom, 0x462, 1 + map_top offset_gAreaRoomMap_Ruins_BelowFortressEntrance_top, 0x462, 1, 1 gAreaRoomMaps_Ruins:: @ 081033DC .4byte gAreaRoomMap_Ruins_0 @@ -65,38 +65,38 @@ gAreaRoomMaps_Ruins:: @ 081033DC .4byte gAreaRoomMap_Ruins_5 gAreaRoomMap_HyruleTown_0:: @ 081033F4 - map_bottom offset_gAreaRoomMap_HyruleTown_0_0, 0x1D88, 1 - map_top offset_gAreaRoomMap_HyruleTown_0_1, 0x1D88, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleTown_Main_bottom, 0x1D88, 1 + map_top offset_gAreaRoomMap_HyruleTown_Main_top, 0x1D88, 1, 1 gAreaRoomMaps_HyruleTown:: @ 0810340C .4byte gAreaRoomMap_HyruleTown_0 gAreaRoomMap_FestivalTown_0:: @ 08103410 - map_bottom offset_gAreaRoomMap_FestivalTown_0_0, 0xBB8, 1 - map_top offset_gAreaRoomMap_FestivalTown_0_1, 0xBB8, 1, 1 + map_bottom offset_gAreaRoomMap_FestivalTown_Main_bottom, 0xBB8, 1 + map_top offset_gAreaRoomMap_FestivalTown_Main_top, 0xBB8, 1, 1 gAreaRoomMaps_FestivalTown:: @ 08103428 .4byte gAreaRoomMap_FestivalTown_0 gAreaRoomMap_MtCrenel_0:: @ 0810342C - map_bottom offset_gAreaRoomMap_MtCrenel_0_0, 0x6E4, 1 - map_top offset_gAreaRoomMap_MtCrenel_0_1, 0x6E4, 1, 1 + map_bottom offset_gAreaRoomMap_MtCrenel_Top_bottom, 0x6E4, 1 + map_top offset_gAreaRoomMap_MtCrenel_Top_top, 0x6E4, 1, 1 gAreaRoomMap_MtCrenel_1:: @ 08103444 - map_bottom offset_gAreaRoomMap_MtCrenel_1_0, 0x720, 1 - map_top offset_gAreaRoomMap_MtCrenel_1_1, 0x720, 1, 1 + map_bottom offset_gAreaRoomMap_MtCrenel_WallClimb_bottom, 0x720, 1 + map_top offset_gAreaRoomMap_MtCrenel_WallClimb_top, 0x720, 1, 1 gAreaRoomMap_MtCrenel_2:: @ 0810345C - map_bottom offset_gAreaRoomMap_MtCrenel_2_0, 0xB94, 1 - map_top offset_gAreaRoomMap_MtCrenel_2_1, 0xB94, 1, 1 + map_bottom offset_gAreaRoomMap_MtCrenel_CavernOfFlamesEntrance_bottom, 0xB94, 1 + map_top offset_gAreaRoomMap_MtCrenel_CavernOfFlamesEntrance_top, 0xB94, 1, 1 gAreaRoomMap_MtCrenel_3:: @ 08103474 - map_bottom offset_gAreaRoomMap_MtCrenel_3_0, 0xB52, 1 - map_top offset_gAreaRoomMap_MtCrenel_3_1, 0xB52, 1, 1 + map_bottom offset_gAreaRoomMap_MtCrenel_Center_bottom, 0xB52, 1 + map_top offset_gAreaRoomMap_MtCrenel_Center_top, 0xB52, 1, 1 gAreaRoomMap_MtCrenel_4:: @ 0810348C - map_bottom offset_gAreaRoomMap_MtCrenel_4_0, 0xEC4, 1 - map_top offset_gAreaRoomMap_MtCrenel_4_1, 0xEC4, 1, 1 + map_bottom offset_gAreaRoomMap_MtCrenel_Entrance_bottom, 0xEC4, 1 + map_top offset_gAreaRoomMap_MtCrenel_Entrance_top, 0xEC4, 1, 1 gAreaRoomMaps_MtCrenel:: @ 081034A4 .4byte gAreaRoomMap_MtCrenel_0 @@ -106,62 +106,62 @@ gAreaRoomMaps_MtCrenel:: @ 081034A4 .4byte gAreaRoomMap_MtCrenel_4 gAreaRoomMap_HyruleField_0:: @ 081034B8 - map_bottom offset_gAreaRoomMap_HyruleField_0_0, 0x30C, 1 - map_top offset_gAreaRoomMap_HyruleField_0_1, 0x30C, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleField_WesternWoodsSouth_bottom, 0x30C, 1 + map_top offset_gAreaRoomMap_HyruleField_WesternWoodsSouth_top, 0x30C, 1, 1 gAreaRoomMap_HyruleField_1:: @ 081034D0 - map_data offset_gAreaRoomMap_HyruleField_7_0, 0x6000000, 0x4000, 1 - map_data offset_gAreaRoomMap_HyruleField_7_1, 0x6008000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_0_2, 0x6008000, 0x4000, 1 .4byte 0x80000010, 0x0, 0x0 - map_bottom offset_gAreaRoomMap_HyruleField_1_3, 0x152A, 1 - map_top offset_gAreaRoomMap_HyruleField_1_4, 0x152A, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleField_SouthHyruleField_bottom, 0x152A, 1 + map_top offset_gAreaRoomMap_HyruleField_SouthHyruleField_top, 0x152A, 1, 1 gAreaRoomMap_HyruleField_2:: @ 0810350C - map_bottom offset_gAreaRoomMap_HyruleField_2_0, 0x30C, 1 - map_top offset_gAreaRoomMap_HyruleField_2_1, 0x30C, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleField_EasternHillsSouth_bottom, 0x30C, 1 + map_top offset_gAreaRoomMap_HyruleField_EasternHillsSouth_top, 0x30C, 1, 1 gAreaRoomMap_HyruleField_3:: @ 08103524 - map_data offset_gAreaRoomMap_HyruleField_7_0, 0x6000000, 0x4000, 1 - map_data offset_gAreaRoomMap_HyruleField_7_1, 0x6008000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_0_2, 0x6008000, 0x4000, 1 .4byte 0x80000010, 0x0, 0x0 - map_bottom offset_gAreaRoomMap_HyruleField_3_3, 0x3C0, 1 - map_top offset_gAreaRoomMap_HyruleField_3_4, 0x3C0, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleField_EasternHillsCenter_bottom, 0x3C0, 1 + map_top offset_gAreaRoomMap_HyruleField_EasternHillsCenter_top, 0x3C0, 1, 1 gAreaRoomMap_HyruleField_4:: @ 08103560 - map_data offset_gAreaRoomMap_HyruleField_5_0, 0x6000000, 0x4000, 1 - map_data offset_gAreaRoomMap_HyruleField_5_1, 0x6008000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_1_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_1_2, 0x6008000, 0x4000, 1 .4byte 0x80000043, 0x0, 0x0 - map_bottom offset_gAreaRoomMap_HyruleField_4_3, 0x7F8, 1 - map_top offset_gAreaRoomMap_HyruleField_4_4, 0x7F8, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleField_EasternHillsNorth_bottom, 0x7F8, 1 + map_top offset_gAreaRoomMap_HyruleField_EasternHillsNorth_top, 0x7F8, 1, 1 gAreaRoomMap_HyruleField_5:: @ 0810359C - map_data offset_gAreaRoomMap_HyruleField_5_0, 0x6000000, 0x4000, 1 - map_data offset_gAreaRoomMap_HyruleField_5_1, 0x6008000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_1_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_1_2, 0x6008000, 0x4000, 1 .4byte 0x80000043, 0x0, 0x0 - map_bottom offset_gAreaRoomMap_HyruleField_5_3, 0x1518, 1 - map_top offset_gAreaRoomMap_HyruleField_5_4, 0x1518, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleField_LonLonRanch_bottom, 0x1518, 1 + map_top offset_gAreaRoomMap_HyruleField_LonLonRanch_top, 0x1518, 1, 1 gAreaRoomMap_HyruleField_6:: @ 081035D8 - map_data offset_gAreaRoomMap_HyruleField_6_0, 0x6000000, 0x4000, 1 - map_data offset_gAreaRoomMap_HyruleField_6_1, 0x6008000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_2_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_2_2, 0x6008000, 0x4000, 1 .4byte 0x8000002E, 0x0, 0x0 - map_bottom offset_gAreaRoomMap_HyruleField_6_3, 0x189C, 1 - map_top offset_gAreaRoomMap_HyruleField_6_4, 0x189C, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleField_NorthHyruleField_bottom, 0x189C, 1 + map_top offset_gAreaRoomMap_HyruleField_NorthHyruleField_top, 0x189C, 1, 1 gAreaRoomMap_HyruleField_7:: @ 08103614 - map_data offset_gAreaRoomMap_HyruleField_7_0, 0x6000000, 0x4000, 1 - map_data offset_gAreaRoomMap_HyruleField_7_1, 0x6008000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_0_2, 0x6008000, 0x4000, 1 .4byte 0x80000010, 0x0, 0x0 - map_bottom offset_gAreaRoomMap_HyruleField_7_3, 0xE10, 1 - map_top offset_gAreaRoomMap_HyruleField_7_4, 0xE10, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleField_TrilbyHighlands_bottom, 0xE10, 1 + map_top offset_gAreaRoomMap_HyruleField_TrilbyHighlands_top, 0xE10, 1, 1 gAreaRoomMap_HyruleField_8:: @ 08103650 - map_bottom offset_gAreaRoomMap_HyruleField_8_0, 0x960, 1 - map_top offset_gAreaRoomMap_HyruleField_8_1, 0x960, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleField_WesternWoodsNorth_bottom, 0x960, 1 + map_top offset_gAreaRoomMap_HyruleField_WesternWoodsNorth_top, 0x960, 1, 1 gAreaRoomMap_HyruleField_9:: @ 08103668 - map_bottom offset_gAreaRoomMap_HyruleField_9_0, 0x258, 1 - map_top offset_gAreaRoomMap_HyruleField_9_1, 0x258, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleField_WesternWoodsCenter_bottom, 0x258, 1 + map_top offset_gAreaRoomMap_HyruleField_WesternWoodsCenter_top, 0x258, 1, 1 gAreaRoomMaps_HyruleField:: @ 08103680 .4byte gAreaRoomMap_HyruleField_0 @@ -176,23 +176,23 @@ gAreaRoomMaps_HyruleField:: @ 08103680 .4byte gAreaRoomMap_HyruleField_9 gAreaRoomMap_CastleGarden_0:: @ 081036A8 - map_bottom offset_gAreaRoomMap_CastleGarden_0_0, 0x103E, 1 - map_top offset_gAreaRoomMap_CastleGarden_0_1, 0x103E, 1, 1 + map_bottom offset_gAreaRoomMap_CastleGarden_Main_bottom, 0x103E, 1 + map_top offset_gAreaRoomMap_CastleGarden_Main_top, 0x103E, 1, 1 gAreaRoomMaps_CastleGarden:: @ 081036C0 .4byte gAreaRoomMap_CastleGarden_0 gAreaRoomMap_CloudTops_0:: @ 081036C4 - map_bottom offset_gAreaRoomMap_CloudTops_0_0, 0x1F02, 1 - map_top offset_gAreaRoomMap_CloudTops_0_1, 0x1F02, 1, 1 + map_bottom offset_gAreaRoomMap_CloudTops_CloudTops_bottom, 0x1F02, 1 + map_top offset_gAreaRoomMap_CloudTops_CloudTops_top, 0x1F02, 1, 1 gAreaRoomMap_CloudTops_1:: @ 081036DC - map_bottom offset_gAreaRoomMap_CloudTops_1_0, 0x1F02, 1 - map_top offset_gAreaRoomMap_CloudTops_1_1, 0x1F02, 1, 1 + map_bottom offset_gAreaRoomMap_CloudTops_CloudMiddles_bottom, 0x1F02, 1 + map_top offset_gAreaRoomMap_CloudTops_CloudMiddles_top, 0x1F02, 1, 1 gAreaRoomMap_CloudTops_2:: @ 081036F4 - map_bottom offset_gAreaRoomMap_CloudTops_2_0, 0x1F02, 1 - map_top offset_gAreaRoomMap_CloudTops_2_1, 0x1F02, 1, 1 + map_bottom offset_gAreaRoomMap_CloudTops_CloudBottoms_bottom, 0x1F02, 1 + map_top offset_gAreaRoomMap_CloudTops_CloudBottoms_top, 0x1F02, 1, 1 gAreaRoomMaps_CloudTops:: @ 0810370C .4byte gAreaRoomMap_CloudTops_0 @@ -200,49 +200,49 @@ gAreaRoomMaps_CloudTops:: @ 0810370C .4byte gAreaRoomMap_CloudTops_2 gAreaRoomMap_RoyalValley_0:: @ 08103718 - map_bottom offset_gAreaRoomMap_RoyalValley_0_0, 0xEC4, 1 - map_top offset_gAreaRoomMap_RoyalValley_0_1, 0xEC4, 1, 1 + map_bottom offset_gAreaRoomMap_RoyalValley_Main_bottom, 0xEC4, 1 + map_top offset_gAreaRoomMap_RoyalValley_Main_top, 0xEC4, 1, 1 gAreaRoomMap_RoyalValley_1:: @ 08103730 - map_bottom offset_gAreaRoomMap_RoyalValley_1_0, 0x12C, 1 - map_top offset_gAreaRoomMap_RoyalValley_1_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_RoyalValley_ForestMaze_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_RoyalValley_ForestMaze_top, 0x12C, 1, 1 gAreaRoomMaps_RoyalValley:: @ 08103748 .4byte gAreaRoomMap_RoyalValley_0 .4byte gAreaRoomMap_RoyalValley_1 gAreaRoomMap_VeilFalls_0:: @ 08103750 - map_bottom offset_gAreaRoomMap_VeilFalls_0_0, 0xEC4, 1 - map_top offset_gAreaRoomMap_VeilFalls_0_1, 0xEC4, 1, 1 + map_bottom offset_gAreaRoomMap_VeilFalls_Main_bottom, 0xEC4, 1 + map_top offset_gAreaRoomMap_VeilFalls_Main_top, 0xEC4, 1, 1 gAreaRoomMaps_VeilFalls:: @ 08103768 .4byte gAreaRoomMap_VeilFalls_0 gAreaRoomMap_VeilFallsTop_0:: @ 0810376C - map_bottom offset_gAreaRoomMap_VeilFallsTop_0_0, 0x2D0, 1 - map_top offset_gAreaRoomMap_VeilFallsTop_0_1, 0x2D0, 1, 1 + map_bottom offset_gAreaRoomMap_VeilFallsTop_0_bottom, 0x2D0, 1 + map_top offset_gAreaRoomMap_VeilFallsTop_0_top, 0x2D0, 1, 1 gAreaRoomMaps_VeilFallsTop:: @ 08103784 .4byte gAreaRoomMap_VeilFallsTop_0 gAreaRoomMap_Beanstalks_0:: @ 08103788 - map_bottom offset_gAreaRoomMap_Beanstalks_0_0, 0x12C, 0, 1 + map_bottom offset_gAreaRoomMap_Beanstalks_Crenel_bottom, 0x12C, 0, 1 gAreaRoomMap_Beanstalks_1:: @ 08103794 - map_bottom offset_gAreaRoomMap_Beanstalks_1_0, 0x12C, 0, 1 + map_bottom offset_gAreaRoomMap_Beanstalks_LakeHylia_bottom, 0x12C, 0, 1 gAreaRoomMap_Beanstalks_2:: @ 081037A0 - map_bottom offset_gAreaRoomMap_Beanstalks_2_0, 0x12C, 0, 1 + map_bottom offset_gAreaRoomMap_Beanstalks_Ruins_bottom, 0x12C, 0, 1 gAreaRoomMap_Beanstalks_3:: @ 081037AC - map_bottom offset_gAreaRoomMap_Beanstalks_3_0, 0x12C, 0, 1 + map_bottom offset_gAreaRoomMap_Beanstalks_EasternHills_bottom, 0x12C, 0, 1 gAreaRoomMap_Beanstalks_4:: @ 081037B8 - map_bottom offset_gAreaRoomMap_Beanstalks_4_0, 0x12C, 0, 1 + map_bottom offset_gAreaRoomMap_Beanstalks_WesternWoods_bottom, 0x12C, 0, 1 gAreaRoomMap_Beanstalks_5:: @ 081037C4 .4byte 0x80000000, gMapBottom+0x0004, 0x80002000 - map_top_special offset_gAreaRoomMap_Beanstalks_5_1, 0x800, 1, 1 + map_top_special offset_gRoomMapping_Beanstalks_CrenelClimb_top, 0x800, 1, 1 gAreaRoomMaps_Beanstalks:: @ 081037DC .4byte gAreaRoomMap_Beanstalks_0 @@ -279,72 +279,72 @@ gAreaRoomMaps_Beanstalks:: @ 081037DC .4byte gAreaRoomMap_Beanstalks_5 gAreaRoomMap_CrenelCaves_0:: @ 0810385C - map_bottom offset_gAreaRoomMap_CrenelCaves_0_0, 0xA8C, 1 - map_top offset_gAreaRoomMap_CrenelCaves_0_1, 0xA8C, 1, 1 + map_bottom offset_gAreaRoomMap_CrenelCaves_BlockPushing_bottom, 0xA8C, 1 + map_top offset_gAreaRoomMap_CrenelCaves_BlockPushing_top, 0xA8C, 1, 1 gAreaRoomMap_CrenelCaves_1:: @ 08103874 - map_bottom offset_gAreaRoomMap_CrenelCaves_1_0, 0x14A, 1 - map_top offset_gAreaRoomMap_CrenelCaves_1_1, 0x14A, 1, 1 + map_bottom offset_gAreaRoomMap_CrenelCaves_PillarCave_bottom, 0x14A, 1 + map_top offset_gAreaRoomMap_CrenelCaves_PillarCave_top, 0x14A, 1, 1 gAreaRoomMap_CrenelCaves_2:: @ 0810388C - map_bottom offset_gAreaRoomMap_CrenelCaves_2_0, 0x3A2, 1 - map_top offset_gAreaRoomMap_CrenelCaves_2_1, 0x3A2, 1, 1 + map_bottom offset_gAreaRoomMap_CrenelCaves_BridgeSwitch_bottom, 0x3A2, 1 + map_top offset_gAreaRoomMap_CrenelCaves_BridgeSwitch_top, 0x3A2, 1, 1 gAreaRoomMap_CrenelCaves_3:: @ 081038A4 - map_bottom offset_gAreaRoomMap_CrenelCaves_3_0, 0x168, 1 - map_top offset_gAreaRoomMap_CrenelCaves_3_1, 0x168, 1, 1 + map_bottom offset_gAreaRoomMap_CrenelCaves_ExitToMines_bottom, 0x168, 1 + map_top offset_gAreaRoomMap_CrenelCaves_ExitToMines_top, 0x168, 1, 1 gAreaRoomMap_CrenelCaves_4:: @ 081038BC - map_bottom offset_gAreaRoomMap_CrenelCaves_4_0, 0x12C, 1 - map_top offset_gAreaRoomMap_CrenelCaves_4_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_CrenelCaves_GripRing_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_CrenelCaves_GripRing_top, 0x12C, 1, 1 gAreaRoomMap_CrenelCaves_5:: @ 081038D4 - map_bottom offset_gAreaRoomMap_CrenelCaves_5_0, 0x12C, 1 - map_top offset_gAreaRoomMap_CrenelCaves_5_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_CrenelCaves_FairyFountain_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_CrenelCaves_FairyFountain_top, 0x12C, 1, 1 gAreaRoomMap_CrenelCaves_6:: @ 081038EC - map_bottom offset_gAreaRoomMap_CrenelCaves_6_0, 0x168, 1 - map_top offset_gAreaRoomMap_CrenelCaves_6_1, 0x168, 1, 1 + map_bottom offset_gAreaRoomMap_CrenelCaves_SpinyChuPuzzle_bottom, 0x168, 1 + map_top offset_gAreaRoomMap_CrenelCaves_SpinyChuPuzzle_top, 0x168, 1, 1 gAreaRoomMap_CrenelCaves_7:: @ 08103904 - map_bottom offset_gAreaRoomMap_CrenelCaves_7_0, 0x14A, 1 - map_top offset_gAreaRoomMap_CrenelCaves_7_1, 0x14A, 1, 1 + map_bottom offset_gAreaRoomMap_CrenelCaves_ChuchuPotChest_bottom, 0x14A, 1 + map_top offset_gAreaRoomMap_CrenelCaves_ChuchuPotChest_top, 0x14A, 1, 1 gAreaRoomMap_CrenelCaves_8:: @ 0810391C - map_bottom offset_gAreaRoomMap_CrenelCaves_8_0, 0x258, 1 - map_top offset_gAreaRoomMap_CrenelCaves_8_1, 0x258, 1, 1 + map_bottom offset_gAreaRoomMap_CrenelCaves_WaterHeartPiece_bottom, 0x258, 1 + map_top offset_gAreaRoomMap_CrenelCaves_WaterHeartPiece_top, 0x258, 1, 1 gAreaRoomMap_CrenelCaves_9:: @ 08103934 - map_bottom offset_gAreaRoomMap_CrenelCaves_9_0, 0x12C, 0 - map_top offset_gAreaRoomMap_CrenelCaves_9_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_CrenelCaves_RupeeFairyFouintain_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_CrenelCaves_RupeeFairyFouintain_top, 0x12C, 1, 1 gAreaRoomMap_CrenelCaves_10:: @ 0810394C - map_bottom offset_gAreaRoomMap_CrenelCaves_10_0, 0x2BC, 1 - map_top offset_gAreaRoomMap_CrenelCaves_10_1, 0x2BC, 1, 1 + map_bottom offset_gAreaRoomMap_CrenelCaves_HelmasaurHallway_bottom, 0x2BC, 1 + map_top offset_gAreaRoomMap_CrenelCaves_HelmasaurHallway_top, 0x2BC, 1, 1 gAreaRoomMap_CrenelCaves_11:: @ 08103964 - map_bottom offset_gAreaRoomMap_CrenelCaves_11_0, 0x294, 1 - map_top offset_gAreaRoomMap_CrenelCaves_11_1, 0x294, 1, 1 + map_bottom offset_gAreaRoomMap_CrenelCaves_MushroomKeese_bottom, 0x294, 1 + map_top offset_gAreaRoomMap_CrenelCaves_MushroomKeese_top, 0x294, 1, 1 gAreaRoomMap_CrenelCaves_12:: @ 0810397C - map_bottom offset_gAreaRoomMap_CrenelCaves_12_0, 0x12C, 1 - map_top offset_gAreaRoomMap_CrenelCaves_12_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_CrenelCaves_LadderToSpringWater_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_CrenelCaves_LadderToSpringWater_top, 0x12C, 1, 1 gAreaRoomMap_CrenelCaves_13:: @ 08103994 - map_bottom offset_gAreaRoomMap_CrenelCaves_13_0, 0x12C, 1 - map_top offset_gAreaRoomMap_CrenelCaves_13_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_CrenelCaves_BombBusinessScrub_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_CrenelCaves_BombBusinessScrub_top, 0x12C, 1, 1 gAreaRoomMap_CrenelCaves_14:: @ 081039AC - map_bottom offset_gAreaRoomMap_CrenelCaves_14_0, 0x12C, 1 - map_top offset_gAreaRoomMap_CrenelCaves_14_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_CrenelCaves_Hermit_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_CrenelCaves_Hermit_top, 0x12C, 1, 1 gAreaRoomMap_CrenelCaves_15:: @ 081039C4 - map_bottom offset_gAreaRoomMap_CrenelCaves_15_0, 0x12C, 1 - map_top offset_gAreaRoomMap_CrenelCaves_15_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_CrenelCaves_HintScrub_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_CrenelCaves_HintScrub_top, 0x12C, 1, 1 gAreaRoomMap_CrenelCaves_16:: @ 081039DC - map_bottom offset_gAreaRoomMap_CrenelCaves_16_0, 0x1FE, 1 - map_top offset_gAreaRoomMap_CrenelCaves_16_1, 0x1FE, 1, 1 + map_bottom offset_gAreaRoomMap_CrenelCaves_ToGrayblade_bottom, 0x1FE, 1 + map_top offset_gAreaRoomMap_CrenelCaves_ToGrayblade_top, 0x1FE, 1, 1 gAreaRoomMaps_CrenelCaves:: @ 081039F4 .4byte gAreaRoomMap_CrenelCaves_0 @@ -366,16 +366,16 @@ gAreaRoomMaps_CrenelCaves:: @ 081039F4 .4byte gAreaRoomMap_CrenelCaves_16 gAreaRoomMap_GreatFairies_0:: @ 08103A38 - map_bottom offset_gAreaRoomMap_GreatFairies_0_0, 0x21C, 1 - map_top offset_gAreaRoomMap_GreatFairies_0_1, 0x21C, 1, 1 + map_bottom offset_gAreaRoomMap_GreatFairies_Graveyard_bottom, 0x21C, 1 + map_top offset_gAreaRoomMap_GreatFairies_Graveyard_top, 0x21C, 1, 1 gAreaRoomMap_GreatFairies_1:: @ 08103A50 - map_bottom offset_gAreaRoomMap_GreatFairies_1_0, 0x21C, 1 - map_top offset_gAreaRoomMap_GreatFairies_1_1, 0x21C, 1, 1 + map_bottom offset_gAreaRoomMap_GreatFairies_MinishWoods_bottom, 0x21C, 1 + map_top offset_gAreaRoomMap_GreatFairies_MinishWoods_top, 0x21C, 1, 1 gAreaRoomMap_GreatFairies_2:: @ 08103A68 - map_bottom offset_gAreaRoomMap_GreatFairies_2_0, 0x21C, 1 - map_top offset_gAreaRoomMap_GreatFairies_2_1, 0x21C, 1, 1 + map_bottom offset_gAreaRoomMap_GreatFairies_Crenel_bottom, 0x21C, 1 + map_top offset_gAreaRoomMap_GreatFairies_Crenel_top, 0x21C, 1, 1 gAreaRoomMaps_GreatFairies:: @ 08103A80 .4byte gAreaRoomMap_GreatFairies_0 @@ -388,26 +388,26 @@ gAreaRoomMaps_GreatFairies:: @ 08103A80 .4byte gAreaRoomMap_Unused gAreaRoomMap_LakeWoodsCave_0:: @ 08103AA0 - map_bottom offset_gAreaRoomMap_LakeWoodsCave_0_0, 0x1F02, 1 - map_top offset_gAreaRoomMap_LakeWoodsCave_0_1, 0x1F02, 1, 1 + map_bottom offset_gAreaRoomMap_LakeWoodsCave_Main_bottom, 0x1F02, 1 + map_top offset_gAreaRoomMap_LakeWoodsCave_Main_top, 0x1F02, 1, 1 gAreaRoomMaps_LakeWoodsCave:: @ 08103AB8 .4byte gAreaRoomMap_LakeWoodsCave_0 gAreaRoomMap_HyruleDigCaves_0:: @ 08103ABC - map_bottom offset_gAreaRoomMap_HyruleDigCaves_0_0, 0x1D88, 1 - map_top offset_gAreaRoomMap_HyruleDigCaves_0_1, 0x1D88, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleDigCaves_Town_bottom, 0x1D88, 1 + map_top offset_gAreaRoomMap_HyruleDigCaves_Town_top, 0x1D88, 1, 1 gAreaRoomMaps_HyruleDigCaves:: @ 08103AD4 .4byte gAreaRoomMap_HyruleDigCaves_0 gAreaRoomMap_DigCaves_0:: @ 08103AD8 - map_bottom offset_gAreaRoomMap_DigCaves_0_0, 0x7F8, 1 - map_top offset_gAreaRoomMap_DigCaves_0_1, 0x7F8, 1, 1 + map_bottom offset_gAreaRoomMap_DigCaves_EasternHills_bottom, 0x7F8, 1 + map_top offset_gAreaRoomMap_DigCaves_EasternHills_top, 0x7F8, 1, 1 gAreaRoomMap_DigCaves_1:: @ 08103AF0 - map_bottom offset_gAreaRoomMap_DigCaves_1_0, 0xE10, 1 - map_top offset_gAreaRoomMap_DigCaves_1_1, 0xE10, 1, 1 + map_bottom offset_gAreaRoomMap_DigCaves_TrilbyHighlands_bottom, 0xE10, 1 + map_top offset_gAreaRoomMap_DigCaves_TrilbyHighlands_top, 0xE10, 1, 1 gAreaRoomMaps_DigCaves1:: @ 08103B08 .4byte gAreaRoomMap_DigCaves_0 @@ -416,45 +416,45 @@ gAreaRoomMaps_DigCaves1:: @ 08103B08 .4byte gAreaRoomMap_DigCaves_1 gAreaRoomMap_CrenelDigCave_0:: @ 08103B18 - map_bottom offset_gAreaRoomMap_CrenelDigCave_0_0, 0x7C0, 1 - map_top offset_gAreaRoomMap_CrenelDigCave_0_1, 0x7C0, 1, 1 + map_bottom offset_gAreaRoomMap_CrenelDigCave_0_bottom, 0x7C0, 1 + map_top offset_gAreaRoomMap_CrenelDigCave_0_top, 0x7C0, 1, 1 gAreaRoomMaps_CrenelDigCave:: @ 08103B30 .4byte gAreaRoomMap_CrenelDigCave_0 gAreaRoomMap_VeilFallsDigCave_0:: @ 08103B34 - map_bottom offset_gAreaRoomMap_VeilFallsDigCave_0_0, 0xEC4, 1 - map_top offset_gAreaRoomMap_VeilFallsDigCave_0_1, 0xEC4, 1, 1 + map_bottom offset_gAreaRoomMap_VeilFallsDigCave_0_bottom, 0xEC4, 1 + map_top offset_gAreaRoomMap_VeilFallsDigCave_0_top, 0xEC4, 1, 1 gAreaRoomMaps_VeilFallsDigCave:: @ 08103B4C .4byte gAreaRoomMap_VeilFallsDigCave_0 gAreaRoomMap_CastorWildsDigCave_0:: @ 08103B50 - map_bottom offset_gAreaRoomMap_CastorWildsDigCave_0_0, 0x1D88, 1 - map_top offset_gAreaRoomMap_CastorWildsDigCave_0_1, 0x1D88, 1, 1 + map_bottom offset_gAreaRoomMap_CastorWildsDigCave_0_bottom, 0x1D88, 1 + map_top offset_gAreaRoomMap_CastorWildsDigCave_0_top, 0x1D88, 1, 1 gAreaRoomMaps_CastorWildsDigCave:: @ 08103B68 .4byte gAreaRoomMap_CastorWildsDigCave_0 gAreaRoomMap_OuterFortressOfWinds_0:: @ 08103B6C - map_bottom offset_gAreaRoomMap_OuterFortressOfWinds_0_0, 0x5FE, 1 - map_top offset_gAreaRoomMap_OuterFortressOfWinds_0_1, 0x5FE, 1, 1 + map_bottom offset_gAreaRoomMap_OuterFortressOfWinds_EntranceHall_bottom, 0x5FE, 1 + map_top offset_gAreaRoomMap_OuterFortressOfWinds_EntranceHall_top, 0x5FE, 1, 1 gAreaRoomMap_OuterFortressOfWinds_1:: @ 08103B84 - map_bottom offset_gAreaRoomMap_OuterFortressOfWinds_1_0, 0x938, 1 - map_top offset_gAreaRoomMap_OuterFortressOfWinds_1_1, 0x938, 1, 1 + map_bottom offset_gAreaRoomMap_OuterFortressOfWinds_2f_bottom, 0x938, 1 + map_top offset_gAreaRoomMap_OuterFortressOfWinds_2f_top, 0x938, 1, 1 gAreaRoomMap_OuterFortressOfWinds_2:: @ 08103B9C - map_bottom offset_gAreaRoomMap_OuterFortressOfWinds_2_0, 0x5FE, 1 - map_top offset_gAreaRoomMap_OuterFortressOfWinds_2_1, 0x5FE, 1, 1 + map_bottom offset_gAreaRoomMap_OuterFortressOfWinds_3f_bottom, 0x5FE, 1 + map_top offset_gAreaRoomMap_OuterFortressOfWinds_3f_top, 0x5FE, 1, 1 gAreaRoomMap_OuterFortressOfWinds_3:: @ 08103BB4 - map_bottom offset_gAreaRoomMap_OuterFortressOfWinds_3_0, 0x1EE, 1 - map_top offset_gAreaRoomMap_OuterFortressOfWinds_3_1, 0x1EE, 1, 1 + map_bottom offset_gAreaRoomMap_OuterFortressOfWinds_MoleMitts_bottom, 0x1EE, 1 + map_top offset_gAreaRoomMap_OuterFortressOfWinds_MoleMitts_top, 0x1EE, 1, 1 gAreaRoomMap_OuterFortressOfWinds_4:: @ 08103BCC - map_bottom offset_gAreaRoomMap_OuterFortressOfWinds_4_0, 0x186, 1 - map_top offset_gAreaRoomMap_OuterFortressOfWinds_4_1, 0x186, 1, 1 + map_bottom offset_gAreaRoomMap_OuterFortressOfWinds_SmallKey_bottom, 0x186, 1 + map_top offset_gAreaRoomMap_OuterFortressOfWinds_SmallKey_top, 0x186, 1, 1 gAreaRoomMaps_OuterFortressOfWinds:: @ 08103BE4 .4byte gAreaRoomMap_OuterFortressOfWinds_0 @@ -464,58 +464,58 @@ gAreaRoomMaps_OuterFortressOfWinds:: @ 08103BE4 .4byte gAreaRoomMap_OuterFortressOfWinds_4 gAreaRoomMap_HyliaDigCaves_0:: @ 08103BF8 - map_bottom offset_gAreaRoomMap_HyliaDigCaves_0_0, 0x220, 1 - map_top offset_gAreaRoomMap_HyliaDigCaves_0_1, 0x220, 1, 1 + map_bottom offset_gAreaRoomMap_HyliaDigCaves_0_bottom, 0x220, 1 + map_top offset_gAreaRoomMap_HyliaDigCaves_0_top, 0x220, 1, 1 gAreaRoomMap_HyliaDigCaves_1:: @ 08103C10 - map_bottom offset_gAreaRoomMap_HyliaDigCaves_1_0, 0xD4A, 1 - map_top offset_gAreaRoomMap_HyliaDigCaves_1_1, 0xD4A, 1, 1 + map_bottom offset_gAreaRoomMap_HyliaDigCaves_1_bottom, 0xD4A, 1 + map_top offset_gAreaRoomMap_HyliaDigCaves_1_top, 0xD4A, 1, 1 gAreaRoomMaps_HyliaDigCaves:: @ 08103C28 .4byte gAreaRoomMap_HyliaDigCaves_0 .4byte gAreaRoomMap_HyliaDigCaves_1 gAreaRoomMap_Empty_0:: @ 08103C30 - map_bottom offset_gAreaRoomMap_Empty_0_0, 0x1F02, 1 - map_top offset_gAreaRoomMap_Empty_0_1, 0x1F02, 1, 1 + map_bottom offset_gAreaRoomMap_Empty_0_bottom, 0x1F02, 1 + map_top offset_gAreaRoomMap_Empty_0_top, 0x1F02, 1, 1 gAreaRoomMaps_Empty:: @ 08103C48 .4byte gAreaRoomMap_Empty_0 .4byte gAreaRoomMap_Empty_0 gAreaRoomMap_MinishVillage_0:: @ 08103C50 - map_bottom offset_gAreaRoomMap_MinishVillage_0_0, 0x1F02, 1 - map_top offset_gAreaRoomMap_MinishVillage_0_1, 0x1F02, 1, 1 + map_bottom offset_gAreaRoomMap_MinishVillage_Main_bottom, 0x1F02, 1 + map_top offset_gAreaRoomMap_MinishVillage_Main_top, 0x1F02, 1, 1 gAreaRoomMap_MinishVillage_1:: @ 08103C68 - map_bottom offset_gAreaRoomMap_MinishVillage_1_0, 0x618, 1 - map_top offset_gAreaRoomMap_MinishVillage_1_1, 0x618, 1, 1 + map_bottom offset_gAreaRoomMap_MinishVillage_SideHouseArea_bottom, 0x618, 1 + map_top offset_gAreaRoomMap_MinishVillage_SideHouseArea_top, 0x618, 1, 1 gAreaRoomMaps_MinishVillage:: @ 08103C80 .4byte gAreaRoomMap_MinishVillage_0 .4byte gAreaRoomMap_MinishVillage_1 gAreaRoomMap_MelarisMine_0:: @ 08103C88 - map_bottom offset_gAreaRoomMap_MelarisMine_0_0, 0xDB6, 1 - map_top offset_gAreaRoomMap_MelarisMine_0_1, 0xDB6, 1, 1 + map_bottom offset_gAreaRoomMap_MelarisMine_Main_bottom, 0xDB6, 1 + map_top offset_gAreaRoomMap_MelarisMine_Main_top, 0xDB6, 1, 1 gAreaRoomMaps_MelarisMine:: @ 08103CA0 .4byte gAreaRoomMap_MelarisMine_0 gAreaRoomMap_MinishPaths_0:: @ 08103CA4 - map_bottom offset_gAreaRoomMap_MinishPaths_0_0, 0x5DC, 1, 1 + map_bottom offset_gAreaRoomMap_MinishPaths_MinishVillage_bottom, 0x5DC, 1, 1 gAreaRoomMap_MinishPaths_1:: @ 08103CB0 - map_bottom offset_gAreaRoomMap_MinishPaths_1_0, 0x5DC, 1, 1 + map_bottom offset_gAreaRoomMap_MinishPaths_Bow_bottom, 0x5DC, 1, 1 gAreaRoomMap_MinishPaths_2:: @ 08103CBC - map_bottom offset_gAreaRoomMap_MinishPaths_2_0, 0x5DC, 1, 1 + map_bottom offset_gAreaRoomMap_MinishPaths_Schoolyard_bottom, 0x5DC, 1, 1 gAreaRoomMap_MinishPaths_3:: @ 08103CC8 - map_bottom offset_gAreaRoomMap_MinishPaths_3_0, 0x5DC, 1, 1 + map_bottom offset_gAreaRoomMap_MinishPaths_LonLonRanch_bottom, 0x5DC, 1, 1 gAreaRoomMap_MinishPaths_4:: @ 08103CD4 - map_bottom offset_gAreaRoomMap_MinishPaths_4_0, 0x5DC, 1, 1 + map_bottom offset_gAreaRoomMap_MinishPaths_LakeHylia_bottom, 0x5DC, 1, 1 gAreaRoomMaps_MinishPaths:: @ 08103CE0 .4byte gAreaRoomMap_MinishPaths_0 @@ -525,16 +525,16 @@ gAreaRoomMaps_MinishPaths:: @ 08103CE0 .4byte gAreaRoomMap_MinishPaths_4 gAreaRoomMap_CrenelMinishPaths_0:: @ 08103CF4 - map_bottom offset_gAreaRoomMap_CrenelMinishPaths_0_0, 0x5DC, 1, 1 + map_bottom offset_gAreaRoomMap_CrenelMinishPaths_Bean_bottom, 0x5DC, 1, 1 gAreaRoomMap_CrenelMinishPaths_1:: @ 08103D00 - map_bottom offset_gAreaRoomMap_CrenelMinishPaths_1_0, 0x5DC, 1, 1 + map_bottom offset_gAreaRoomMap_CrenelMinishPaths_SpringWater_bottom, 0x5DC, 1, 1 gAreaRoomMap_CrenelMinishPaths_2:: @ 08103D0C - map_bottom offset_gAreaRoomMap_CrenelMinishPaths_2_0, 0x4B0, 1, 1 + map_bottom offset_gAreaRoomMap_CrenelMinishPaths_Rain_bottom, 0x4B0, 1, 1 gAreaRoomMap_CrenelMinishPaths_3:: @ 08103D18 - map_bottom offset_gAreaRoomMap_CrenelMinishPaths_3_0, 0x4B0, 1, 1 + map_bottom offset_gAreaRoomMap_CrenelMinishPaths_Melari_bottom, 0x4B0, 1, 1 gAreaRoomMaps_CrenelMinishPaths:: @ 08103D24 .4byte gAreaRoomMap_CrenelMinishPaths_0 @@ -543,109 +543,109 @@ gAreaRoomMaps_CrenelMinishPaths:: @ 08103D24 .4byte gAreaRoomMap_CrenelMinishPaths_3 gAreaRoomMap_MinishHouseInteriors_0:: @ 08103D34 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_0_1, 0x96, 1 - map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_0_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_GentariMain, 0x96, 1 + map_bottom_special offset_gRoomMapping_MinishHouseInteriors_GentariMain_bottom, 0x800, 1, 1 gAreaRoomMap_MinishHouseInteriors_1:: @ 08103D58 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_1_1, 0x96, 1 - map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_1_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_GentariExit, 0x96, 1 + map_bottom_special offset_gRoomMapping_MinishHouseInteriors_GentariExit_bottom, 0x800, 1, 1 gAreaRoomMap_MinishHouseInteriors_2:: @ 08103D7C - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_2_1, 0x1D0, 1 - map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_2_2, 0x1000, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_Festari, 0x1D0, 1 + map_bottom_special offset_gRoomMapping_MinishHouseInteriors_Festari_bottom, 0x1000, 1, 1 gAreaRoomMap_MinishHouseInteriors_3:: @ 08103DA0 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_3_1, 0xA0, 1 - map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_3_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_Red, 0xA0, 1 + map_bottom_special offset_gRoomMapping_MinishHouseInteriors_Red_bottom, 0x800, 1, 1 gAreaRoomMap_MinishHouseInteriors_4:: @ 08103DC4 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_4_1, 0xA0, 1 - map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_4_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_Green, 0xA0, 1 + map_bottom_special offset_gRoomMapping_MinishHouseInteriors_Green_bottom, 0x800, 1, 1 gAreaRoomMap_MinishHouseInteriors_5:: @ 08103DE8 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_5_1, 0xA0, 1 - map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_5_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_Blue, 0xA0, 1 + map_bottom_special offset_gRoomMapping_MinishHouseInteriors_Blue_bottom, 0x800, 1, 1 gAreaRoomMap_MinishHouseInteriors_6:: @ 08103E0C - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_6_1, 0xA0, 1 - map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_6_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_SideArea, 0xA0, 1 + map_bottom_special offset_gRoomMapping_MinishHouseInteriors_SideArea_bottom, 0x800, 1, 1 gAreaRoomMap_MinishHouseInteriors_8:: @ 08103E30 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_8_1, 0xE1, 1 - map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_8_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_PotMinish, 0xE1, 1 + map_bottom_special offset_gRoomMapping_MinishHouseInteriors_PotMinish_bottom, 0x800, 1, 1 gAreaRoomMap_MinishHouseInteriors_7:: @ 08103E54 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_7_1, 0x96, 1 - map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_7_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_ShoeMinish, 0x96, 1 + map_bottom_special offset_gRoomMapping_MinishHouseInteriors_ShoeMinish_bottom, 0x800, 1, 1 gAreaRoomMap_MinishHouseInteriors_9:: @ 08103E78 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_9_1, 0x159, 1 - map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_9_2, 0x1000, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_BarrelMinish, 0x159, 1 + map_bottom_special offset_gRoomMapping_MinishHouseInteriors_BarrelMinish_bottom, 0x1000, 1, 1 gAreaRoomMap_MinishHouseInteriors_10:: @ 08103E9C - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_10_1, 0x96, 1 - map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_10_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_MelariMinesSouthwest, 0x96, 1 + map_bottom_special offset_gRoomMapping_MinishHouseInteriors_MelariMinesSouthwest_bottom, 0x800, 1, 1 gAreaRoomMap_MinishHouseInteriors_11:: @ 08103EC0 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_11_1, 0x96, 1 - map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_11_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_MelariMinesSoutheast, 0x96, 1 + map_bottom_special offset_gRoomMapping_MinishHouseInteriors_MelariMinesSoutheast_bottom, 0x800, 1, 1 gAreaRoomMap_MinishHouseInteriors_12:: @ 08103EE4 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_12_1, 0xDC, 1 - map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_12_2, 0x1000, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_MelariMinesEast, 0xDC, 1 + map_bottom_special offset_gRoomMapping_MinishHouseInteriors_MelariMinesEast_bottom, 0x1000, 1, 1 gAreaRoomMap_MinishHouseInteriors_13:: @ 08103F08 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_13_1, 0x96, 1 - map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_13_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_HyruleFieldSouthwest, 0x96, 1 + map_bottom_special offset_gRoomMapping_MinishHouseInteriors_HyruleFieldSouthwest_bottom, 0x800, 1, 1 gAreaRoomMap_MinishHouseInteriors_14:: @ 08103F2C - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_14_1, 0x96, 1 - map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_14_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_SouthHyruleField, 0x96, 1 + map_bottom_special offset_gRoomMapping_MinishHouseInteriors_SouthHyruleField_bottom, 0x800, 1, 1 gAreaRoomMap_MinishHouseInteriors_15:: @ 08103F50 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_15_1, 0x96, 1 - map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_15_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_NextToKnuckle, 0x96, 1 + map_bottom_special offset_gRoomMapping_MinishHouseInteriors_NextToKnuckle_bottom, 0x800, 1, 1 gAreaRoomMap_MinishHouseInteriors_16:: @ 08103F74 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_16_1, 0x96, 1 - map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_16_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_Librari, 0x96, 1 + map_bottom_special offset_gRoomMapping_MinishHouseInteriors_Librari_bottom, 0x800, 1, 1 gAreaRoomMap_MinishHouseInteriors_17:: @ 08103F98 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_17_1, 0x96, 1 - map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_17_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_HyruleFieldExit, 0x96, 1 + map_bottom_special offset_gRoomMapping_MinishHouseInteriors_HyruleFieldExit_bottom, 0x800, 1, 1 gAreaRoomMap_MinishHouseInteriors_18:: @ 08103FBC - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_18_1, 0x96, 1 - map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_18_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_HyruleTown, 0x96, 1 + map_bottom_special offset_gRoomMapping_MinishHouseInteriors_HyruleTown_bottom, 0x800, 1, 1 gAreaRoomMap_MinishHouseInteriors_19:: @ 08103FE0 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_19_1, 0x96, 1 - map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_19_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_MinishWoodsBomb, 0x96, 1 + map_bottom_special offset_gRoomMapping_MinishHouseInteriors_MinishWoodsBomb_bottom, 0x800, 1, 1 gAreaRoomMap_MinishHouseInteriors_20:: @ 08104004 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_MinishHouseInteriors_20_1, 0x96, 1 - map_bottom_special offset_gAreaRoomMap_MinishHouseInteriors_20_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_MinishHouseInteriors_LakeHyliaOcarina, 0x96, 1 + map_bottom_special offset_gRoomMapping_MinishHouseInteriors_LakeHyliaOcarina_bottom, 0x800, 1, 1 gAreaRoomMaps_MinishHouseInteriors:: @ 08104028 .4byte gAreaRoomMap_MinishHouseInteriors_0 @@ -690,49 +690,49 @@ gAreaRoomMaps_MinishHouseInteriors:: @ 08104028 .4byte gAreaRoomMap_MinishHouseInteriors_20 gAreaRoomMap_TownMinishHoles_0:: @ 081040C8 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_TownMinishHoles_0_1, 0x96, 1 - map_bottom_special offset_gAreaRoomMap_TownMinishHoles_0_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_TownMinishHoles_MayorsHouse, 0x96, 1 + map_bottom_special offset_gRoomMapping_TownMinishHoles_MayorsHouse_bottom, 0x800, 1, 1 gAreaRoomMap_TownMinishHoles_1:: @ 081040EC - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_TownMinishHoles_1_1, 0x96, 1 - map_bottom_special offset_gAreaRoomMap_TownMinishHoles_1_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_TownMinishHoles_WestOracle, 0x96, 1 + map_bottom_special offset_gRoomMapping_TownMinishHoles_WestOracle_bottom, 0x800, 1, 1 gAreaRoomMap_TownMinishHoles_2:: @ 08104110 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_TownMinishHoles_2_1, 0x96, 1 - map_bottom_special offset_gAreaRoomMap_TownMinishHoles_2_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_TownMinishHoles_DrLeft, 0x96, 1 + map_bottom_special offset_gRoomMapping_TownMinishHoles_DrLeft_bottom, 0x800, 1, 1 gAreaRoomMap_TownMinishHoles_3:: @ 08104134 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_TownMinishHoles_3_1, 0x96, 1 - map_bottom_special offset_gAreaRoomMap_TownMinishHoles_3_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_TownMinishHoles_Carpenter, 0x96, 1 + map_bottom_special offset_gRoomMapping_TownMinishHoles_Carpenter_bottom, 0x800, 1, 1 gAreaRoomMap_TownMinishHoles_4:: @ 08104158 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_TownMinishHoles_4_1, 0x96, 1 - map_bottom_special offset_gAreaRoomMap_TownMinishHoles_4_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_TownMinishHoles_Cafe, 0x96, 1 + map_bottom_special offset_gRoomMapping_TownMinishHoles_Cafe_bottom, 0x800, 1, 1 gAreaRoomMap_TownMinishHoles_5:: @ 0810417C - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_TownMinishHoles_5_1, 0x96, 1 - map_bottom_special offset_gAreaRoomMap_TownMinishHoles_5_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_TownMinishHoles_5, 0x96, 1 + map_bottom_special offset_gRoomMapping_TownMinishHoles_5_bottom, 0x800, 1, 1 gAreaRoomMap_TownMinishHoles_6:: @ 081041A0 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_TownMinishHoles_6_1, 0x24C, 1 - map_bottom_special offset_gAreaRoomMap_TownMinishHoles_6_2, 0x2000, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_TownMinishHoles_LibraryBookshelf, 0x24C, 1 + map_bottom_special offset_gRoomMapping_TownMinishHoles_LibraryBookshelf_bottom, 0x2000, 1, 1 gAreaRoomMap_TownMinishHoles_7:: @ 081041C4 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_TownMinishHoles_7_1, 0xE1, 1 - map_bottom_special offset_gAreaRoomMap_TownMinishHoles_7_2, 0x800, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_TownMinishHoles_LibraryBooksHouse, 0xE1, 1 + map_bottom_special offset_gRoomMapping_TownMinishHoles_LibraryBooksHouse_bottom, 0x800, 1, 1 gAreaRoomMap_TownMinishHoles_8:: @ 081041E8 - map_bottom offset_gAreaRoomMap_TownMinishHoles_8_0, 0x2000, 1 - collision_bottom offset_gAreaRoomMap_TownMinishHoles_8_1, 0x190, 1 - map_bottom_special offset_gAreaRoomMap_TownMinishHoles_8_2, 0x2000, 1, 1 + map_bottom offset_gAreaRoomMap_None, 0x2000, 1 + collision_bottom offset_gRoomCollisionMap_TownMinishHoles_RemShoeShop, 0x190, 1 + map_bottom_special offset_gRoomMapping_TownMinishHoles_RemShoeShop_bottom, 0x2000, 1, 1 gAreaRoomMaps_TownMinishHoles:: @ 0810420C .4byte gAreaRoomMap_TownMinishHoles_0 @@ -785,56 +785,56 @@ gAreaRoomMaps_TownMinishHoles:: @ 0810420C .4byte 0x0 gAreaRoomMap_HouseInteriors1_0:: @ 081042CC - map_bottom offset_gAreaRoomMap_HouseInteriors1_0_0, 0x198, 1 - map_top offset_gAreaRoomMap_HouseInteriors1_0_1, 0x198, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors1_Mayor_bottom, 0x198, 1 + map_top offset_gAreaRoomMap_HouseInteriors1_Mayor_top, 0x198, 1, 1 gAreaRoomMap_HouseInteriors1_1:: @ 081042E4 - map_bottom offset_gAreaRoomMap_HouseInteriors1_1_0, 0x14A, 1 - map_top offset_gAreaRoomMap_HouseInteriors1_1_1, 0x14A, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors1_PostOffice_bottom, 0x14A, 1 + map_top offset_gAreaRoomMap_HouseInteriors1_PostOffice_top, 0x14A, 1, 1 gAreaRoomMap_HouseInteriors1_2:: @ 081042FC - map_bottom offset_gAreaRoomMap_HouseInteriors1_2_0, 0x14A, 1 - map_top offset_gAreaRoomMap_HouseInteriors1_2_1, 0x14A, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors1_Library2f_bottom, 0x14A, 1 + map_top offset_gAreaRoomMap_HouseInteriors1_Library2f_top, 0x14A, 1, 1 gAreaRoomMap_HouseInteriors1_3:: @ 08104314 - map_bottom offset_gAreaRoomMap_HouseInteriors1_3_0, 0x2C0, 1 - map_top offset_gAreaRoomMap_HouseInteriors1_3_1, 0x2C0, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors1_Library1f_bottom, 0x2C0, 1 + map_top offset_gAreaRoomMap_HouseInteriors1_Library1f_top, 0x2C0, 1, 1 gAreaRoomMap_HouseInteriors1_4:: @ 0810432C - map_bottom offset_gAreaRoomMap_HouseInteriors1_4_0, 0x1A4, 1 - map_top offset_gAreaRoomMap_HouseInteriors1_4_1, 0x1A4, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors1_Inn1f_bottom, 0x1A4, 1 + map_top offset_gAreaRoomMap_HouseInteriors1_Inn1f_top, 0x1A4, 1, 1 gAreaRoomMap_HouseInteriors1_5:: @ 08104344 - map_bottom offset_gAreaRoomMap_HouseInteriors1_5_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors1_5_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors1_InnWestRoom_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors1_InnWestRoom_top, 0x12C, 1, 1 gAreaRoomMap_HouseInteriors1_6:: @ 0810435C - map_bottom offset_gAreaRoomMap_HouseInteriors1_6_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors1_6_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors1_InnMiddleRoom_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors1_InnMiddleRoom_top, 0x12C, 1, 1 gAreaRoomMap_HouseInteriors1_7:: @ 08104374 - map_bottom offset_gAreaRoomMap_HouseInteriors1_7_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors1_7_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors1_InnEastRoom_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors1_InnEastRoom_top, 0x12C, 1, 1 gAreaRoomMap_HouseInteriors1_8:: @ 0810438C - map_bottom offset_gAreaRoomMap_HouseInteriors1_8_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors1_8_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors1_InnWest2f_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors1_InnWest2f_top, 0x12C, 1, 1 gAreaRoomMap_HouseInteriors1_9:: @ 081043A4 - map_bottom offset_gAreaRoomMap_HouseInteriors1_9_0, 0x348, 1 - map_top offset_gAreaRoomMap_HouseInteriors1_9_1, 0x348, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors1_InnEast2f_bottom, 0x348, 1 + map_top offset_gAreaRoomMap_HouseInteriors1_InnEast2f_top, 0x348, 1, 1 gAreaRoomMap_HouseInteriors1_10:: @ 081043BC - map_bottom offset_gAreaRoomMap_HouseInteriors1_10_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors1_10_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_top, 0x12C, 1, 1 gAreaRoomMap_HouseInteriors1_11:: @ 081043D4 - map_bottom offset_gAreaRoomMap_HouseInteriors1_11_0, 0x1C2, 1 - map_top offset_gAreaRoomMap_HouseInteriors1_11_1, 0x1C2, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors1_SchoolWest_bottom, 0x1C2, 1 + map_top offset_gAreaRoomMap_HouseInteriors1_SchoolWest_top, 0x1C2, 1, 1 gAreaRoomMap_HouseInteriors1_12:: @ 081043EC - map_bottom offset_gAreaRoomMap_HouseInteriors1_12_0, 0x1B8, 1 - map_top offset_gAreaRoomMap_HouseInteriors1_12_1, 0x1B8, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors1_SchoolEast_bottom, 0x1B8, 1 + map_top offset_gAreaRoomMap_HouseInteriors1_SchoolEast_top, 0x1B8, 1, 1 gAreaRoomMaps_HouseInteriors1:: @ 08104404 .4byte gAreaRoomMap_HouseInteriors1_0 @@ -855,80 +855,80 @@ gAreaRoomMaps_HouseInteriors1:: @ 08104404 .4byte 0x0 gAreaRoomMap_HouseInteriors2_0:: @ 08104444 - map_bottom offset_gAreaRoomMap_HouseInteriors2_0_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors2_0_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors2_Stranger_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors2_Stranger_top, 0x12C, 1, 1 gAreaRoomMap_HouseInteriors2_1:: @ 0810445C - map_bottom offset_gAreaRoomMap_HouseInteriors2_1_0, 0x168, 1 - map_top offset_gAreaRoomMap_HouseInteriors2_1_1, 0x168, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors2_WestOracle_bottom, 0x168, 1 + map_top offset_gAreaRoomMap_HouseInteriors2_WestOracle_top, 0x168, 1, 1 gAreaRoomMap_HouseInteriors2_2:: @ 08104474 - map_bottom offset_gAreaRoomMap_HouseInteriors2_2_0, 0x168, 1 - map_top offset_gAreaRoomMap_HouseInteriors2_2_1, 0x168, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors2_2_bottom, 0x168, 1 + map_top offset_gAreaRoomMap_HouseInteriors2_2_top, 0x168, 1, 1 gAreaRoomMap_HouseInteriors2_3:: @ 0810448C - map_bottom offset_gAreaRoomMap_HouseInteriors2_3_0, 0x168, 1 - map_top offset_gAreaRoomMap_HouseInteriors2_3_1, 0x168, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors2_3_bottom, 0x168, 1 + map_top offset_gAreaRoomMap_HouseInteriors2_3_top, 0x168, 1, 1 gAreaRoomMap_HouseInteriors2_4:: @ 081044A4 - map_bottom offset_gAreaRoomMap_HouseInteriors2_4_0, 0x168, 1 - map_top offset_gAreaRoomMap_HouseInteriors2_4_1, 0x168, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors2_DrLeft_bottom, 0x168, 1 + map_top offset_gAreaRoomMap_HouseInteriors2_DrLeft_top, 0x168, 1, 1 gAreaRoomMap_HouseInteriors2_5:: @ 081044BC - map_bottom offset_gAreaRoomMap_HouseInteriors2_5_0, 0x14A, 1 - map_top offset_gAreaRoomMap_HouseInteriors2_5_1, 0x14A, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors2_5_bottom, 0x14A, 1 + map_top offset_gAreaRoomMap_HouseInteriors2_5_top, 0x14A, 1, 1 gAreaRoomMap_HouseInteriors2_6:: @ 081044D4 - map_bottom offset_gAreaRoomMap_HouseInteriors2_6_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors2_6_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors2_Romio_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors2_Romio_top, 0x12C, 1, 1 gAreaRoomMap_HouseInteriors2_7:: @ 081044EC - map_bottom offset_gAreaRoomMap_HouseInteriors2_7_0, 0x168, 1 - map_top offset_gAreaRoomMap_HouseInteriors2_7_1, 0x168, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors2_Julietta_bottom, 0x168, 1 + map_top offset_gAreaRoomMap_HouseInteriors2_Julietta_top, 0x168, 1, 1 gAreaRoomMap_HouseInteriors2_8:: @ 08104504 - map_bottom offset_gAreaRoomMap_HouseInteriors2_8_0, 0x14A, 1 - map_top offset_gAreaRoomMap_HouseInteriors2_8_1, 0x14A, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors2_Percy_bottom, 0x14A, 1 + map_top offset_gAreaRoomMap_HouseInteriors2_Percy_top, 0x14A, 1, 1 gAreaRoomMap_HouseInteriors2_9:: @ 0810451C - map_bottom offset_gAreaRoomMap_HouseInteriors2_9_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors2_9_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors2_EastOracle_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors2_EastOracle_top, 0x12C, 1, 1 gAreaRoomMap_HouseInteriors2_10:: @ 08104534 - map_bottom offset_gAreaRoomMap_HouseInteriors2_10_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors2_10_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors2_A_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors2_A_top, 0x12C, 1, 1 gAreaRoomMap_HouseInteriors2_11:: @ 0810454C - map_bottom offset_gAreaRoomMap_HouseInteriors2_11_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors2_11_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors2_B_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors2_B_top, 0x12C, 1, 1 gAreaRoomMap_HouseInteriors2_12:: @ 08104564 - map_bottom offset_gAreaRoomMap_HouseInteriors2_12_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors2_12_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors2_Cucco_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors2_Cucco_top, 0x12C, 1, 1 gAreaRoomMap_HouseInteriors2_13:: @ 0810457C - map_bottom offset_gAreaRoomMap_HouseInteriors2_13_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors2_13_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_top, 0x12C, 1, 1 gAreaRoomMap_HouseInteriors2_14:: @ 08104594 - map_bottom offset_gAreaRoomMap_HouseInteriors2_14_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors2_14_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors2_LinksHouseSmith_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors2_LinksHouseSmith_top, 0x12C, 1, 1 gAreaRoomMap_HouseInteriors2_15:: @ 081045AC - map_bottom offset_gAreaRoomMap_HouseInteriors2_15_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors2_15_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors2_Dampe_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors2_Dampe_top, 0x12C, 1, 1 gAreaRoomMap_HouseInteriors2_16:: @ 081045C4 - map_bottom offset_gAreaRoomMap_HouseInteriors2_16_0, 0x14A, 1 - map_top offset_gAreaRoomMap_HouseInteriors2_16_1, 0x14A, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors2_13_bottom, 0x14A, 1 + map_top offset_gAreaRoomMap_HouseInteriors2_13_top, 0x14A, 1, 1 gAreaRoomMap_HouseInteriors2_17:: @ 081045DC - map_bottom offset_gAreaRoomMap_HouseInteriors2_17_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors2_17_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_top, 0x12C, 1, 1 gAreaRoomMap_HouseInteriors2_18:: @ 081045F4 - map_bottom offset_gAreaRoomMap_HouseInteriors2_18_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors2_18_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_top, 0x12C, 1, 1 gAreaRoomMaps_HouseInteriors2:: @ 0810460C .4byte gAreaRoomMap_HouseInteriors2_0 @@ -981,28 +981,28 @@ gAreaRoomMaps_HouseInteriors2:: @ 0810460C .4byte gAreaRoomMap_HouseInteriors2_0 gAreaRoomMap_HouseInteriors4_0:: @ 081046CC - map_bottom offset_gAreaRoomMap_HouseInteriors4_0_0, 0x168, 1 - map_top offset_gAreaRoomMap_HouseInteriors4_0_1, 0x168, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors4_Carpenter_bottom, 0x168, 1 + map_top offset_gAreaRoomMap_HouseInteriors4_Carpenter_top, 0x168, 1, 1 gAreaRoomMap_HouseInteriors4_1:: @ 081046E4 - map_bottom offset_gAreaRoomMap_HouseInteriors4_1_0, 0x168, 1 - map_top offset_gAreaRoomMap_HouseInteriors4_1_1, 0x168, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors4_Swiftblade_bottom, 0x168, 1 + map_top offset_gAreaRoomMap_HouseInteriors4_Swiftblade_top, 0x168, 1, 1 gAreaRoomMap_HouseInteriors4_2:: @ 081046FC - map_bottom offset_gAreaRoomMap_HouseInteriors4_2_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors4_2_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors4_RanchHouseWest_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors4_RanchHouseWest_top, 0x12C, 1, 1 gAreaRoomMap_HouseInteriors4_3:: @ 08104714 - map_bottom offset_gAreaRoomMap_HouseInteriors4_3_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors4_3_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors4_RanchHouseEast_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors4_RanchHouseEast_top, 0x12C, 1, 1 gAreaRoomMap_HouseInteriors4_4:: @ 0810472C - map_bottom offset_gAreaRoomMap_HouseInteriors4_4_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors4_4_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors4_FarmHouse_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors4_FarmHouse_top, 0x12C, 1, 1 gAreaRoomMap_HouseInteriors4_5:: @ 08104744 - map_bottom offset_gAreaRoomMap_HouseInteriors4_5_0, 0x168, 1 - map_top offset_gAreaRoomMap_HouseInteriors4_5_1, 0x168, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors4_MayorLakeCabin_bottom, 0x168, 1 + map_top offset_gAreaRoomMap_HouseInteriors4_MayorLakeCabin_top, 0x168, 1, 1 gAreaRoomMaps_HouseInteriors4:: @ 0810475C .4byte gAreaRoomMap_HouseInteriors4_0 @@ -1023,40 +1023,40 @@ gAreaRoomMaps_HouseInteriors4:: @ 0810475C .4byte gAreaRoomMap_HouseInteriors4_0 gAreaRoomMap_HouseInteriors3_0:: @ 0810479C - map_bottom offset_gAreaRoomMap_HouseInteriors3_0_0, 0x186, 1 - map_top offset_gAreaRoomMap_HouseInteriors3_0_1, 0x186, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors3_StockwellShop_bottom, 0x186, 1 + map_top offset_gAreaRoomMap_HouseInteriors3_StockwellShop_top, 0x186, 1, 1 gAreaRoomMap_HouseInteriors3_1:: @ 081047B4 - map_bottom offset_gAreaRoomMap_HouseInteriors3_1_0, 0x186, 1 - map_top offset_gAreaRoomMap_HouseInteriors3_1_1, 0x186, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors3_Cafe_bottom, 0x186, 1 + map_top offset_gAreaRoomMap_HouseInteriors3_Cafe_top, 0x186, 1, 1 gAreaRoomMap_HouseInteriors3_2:: @ 081047CC - map_bottom offset_gAreaRoomMap_HouseInteriors3_2_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors3_2_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors3_RemShoeShop_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors3_RemShoeShop_top, 0x12C, 1, 1 gAreaRoomMap_HouseInteriors3_3:: @ 081047E4 - map_bottom offset_gAreaRoomMap_HouseInteriors3_3_0, 0x168, 1 - map_top offset_gAreaRoomMap_HouseInteriors3_3_1, 0x168, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors3_Bakery_bottom, 0x168, 1 + map_top offset_gAreaRoomMap_HouseInteriors3_Bakery_top, 0x168, 1, 1 gAreaRoomMap_HouseInteriors3_4:: @ 081047FC - map_bottom offset_gAreaRoomMap_HouseInteriors3_4_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors3_4_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors3_Simon_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors3_Simon_top, 0x12C, 1, 1 gAreaRoomMap_HouseInteriors3_5:: @ 08104814 - map_bottom offset_gAreaRoomMap_HouseInteriors3_5_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors3_5_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors3_FigurineHouse_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors3_FigurineHouse_top, 0x12C, 1, 1 gAreaRoomMap_HouseInteriors3_6:: @ 0810482C - map_bottom offset_gAreaRoomMap_HouseInteriors3_6_0, 0x14A, 1 - map_top offset_gAreaRoomMap_HouseInteriors3_6_1, 0x14A, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors3_BorlovEntrance_bottom, 0x14A, 1 + map_top offset_gAreaRoomMap_HouseInteriors3_BorlovEntrance_top, 0x14A, 1, 1 gAreaRoomMap_HouseInteriors3_7:: @ 08104844 - map_bottom offset_gAreaRoomMap_HouseInteriors3_7_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HouseInteriors3_7_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors3_Carlov_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HouseInteriors3_Carlov_top, 0x12C, 1, 1 gAreaRoomMap_HouseInteriors3_8:: @ 0810485C - map_bottom offset_gAreaRoomMap_HouseInteriors3_8_0, 0x140, 1 - map_top offset_gAreaRoomMap_HouseInteriors3_8_1, 0x140, 1, 1 + map_bottom offset_gAreaRoomMap_HouseInteriors3_Borlov_bottom, 0x140, 1 + map_top offset_gAreaRoomMap_HouseInteriors3_Borlov_top, 0x140, 1, 1 gAreaRoomMaps_HouseInteriors3:: @ 08104874 .4byte gAreaRoomMap_HouseInteriors3_0 @@ -1070,72 +1070,72 @@ gAreaRoomMaps_HouseInteriors3:: @ 08104874 .4byte gAreaRoomMap_HouseInteriors3_8 gAreaRoomMap_TreeInteriors_0:: @ 08104898 - map_bottom offset_gAreaRoomMap_TreeInteriors_0_0, 0x12C, 0 - map_top offset_gAreaRoomMap_TreeInteriors_0_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_TreeInteriors_WitchHut_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_TreeInteriors_WitchHut_top, 0x12C, 1, 1 gAreaRoomMap_TreeInteriors_1:: @ 081048B0 - map_bottom offset_gAreaRoomMap_TreeInteriors_1_0, 0x12C, 0 - map_top offset_gAreaRoomMap_TreeInteriors_1_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_TreeInteriors_StairsToCarlov_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_TreeInteriors_StairsToCarlov_top, 0x12C, 1, 1 gAreaRoomMap_TreeInteriors_2:: @ 081048C8 - map_bottom offset_gAreaRoomMap_TreeInteriors_2_0, 0x12C, 0 - map_top offset_gAreaRoomMap_TreeInteriors_2_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_TreeInteriors_PercysTreehouse_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_TreeInteriors_PercysTreehouse_top, 0x12C, 1, 1 gAreaRoomMap_TreeInteriors_3:: @ 081048E0 - map_bottom offset_gAreaRoomMap_TreeInteriors_3_0, 0x12C, 0 - map_top offset_gAreaRoomMap_TreeInteriors_3_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_TreeInteriors_SouthHyruleFieldHeartPiece_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_TreeInteriors_SouthHyruleFieldHeartPiece_top, 0x12C, 1, 1 gAreaRoomMap_TreeInteriors_4:: @ 081048F8 - map_bottom offset_gAreaRoomMap_TreeInteriors_4_0, 0x12C, 0 - map_top offset_gAreaRoomMap_TreeInteriors_4_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_TreeInteriors_Waveblade_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_TreeInteriors_Waveblade_top, 0x12C, 1, 1 gAreaRoomMap_TreeInteriors_5:: @ 08104910 - map_bottom offset_gAreaRoomMap_TreeInteriors_5_0, 0x12C, 0 - map_top offset_gAreaRoomMap_TreeInteriors_5_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_TreeInteriors_14_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_TreeInteriors_14_top, 0x12C, 1, 1 gAreaRoomMap_TreeInteriors_6:: @ 08104928 - map_bottom offset_gAreaRoomMap_TreeInteriors_6_0, 0x12C, 0 - map_top offset_gAreaRoomMap_TreeInteriors_6_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_TreeInteriors_BoomerangNorthwest_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_TreeInteriors_BoomerangNorthwest_top, 0x12C, 1, 1 gAreaRoomMap_TreeInteriors_7:: @ 08104940 - map_bottom offset_gAreaRoomMap_TreeInteriors_7_0, 0x12C, 0 - map_top offset_gAreaRoomMap_TreeInteriors_7_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_TreeInteriors_BoomerangNortheast_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_TreeInteriors_BoomerangNortheast_top, 0x12C, 1, 1 gAreaRoomMap_TreeInteriors_8:: @ 08104958 - map_bottom offset_gAreaRoomMap_TreeInteriors_8_0, 0x12C, 0 - map_top offset_gAreaRoomMap_TreeInteriors_8_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_TreeInteriors_BoomerangSouthwest_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_TreeInteriors_BoomerangSouthwest_top, 0x12C, 1, 1 gAreaRoomMap_TreeInteriors_9:: @ 08104970 - map_bottom offset_gAreaRoomMap_TreeInteriors_9_0, 0x12C, 0 - map_top offset_gAreaRoomMap_TreeInteriors_9_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_TreeInteriors_BoomerangSoutheast_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_TreeInteriors_BoomerangSoutheast_top, 0x12C, 1, 1 gAreaRoomMap_TreeInteriors_10:: @ 08104988 - map_bottom offset_gAreaRoomMap_TreeInteriors_10_0, 0x12C, 0 - map_top offset_gAreaRoomMap_TreeInteriors_10_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_TreeInteriors_WesternWoodsHeartPiece_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_TreeInteriors_WesternWoodsHeartPiece_top, 0x12C, 1, 1 gAreaRoomMap_TreeInteriors_11:: @ 081049A0 - map_bottom offset_gAreaRoomMap_TreeInteriors_11_0, 0x12C, 0 - map_top offset_gAreaRoomMap_TreeInteriors_11_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_TreeInteriors_NorthHyruleFieldFairyFountain_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_TreeInteriors_NorthHyruleFieldFairyFountain_top, 0x12C, 1, 1 gAreaRoomMap_TreeInteriors_12:: @ 081049B8 - map_bottom offset_gAreaRoomMap_TreeInteriors_12_0, 0x12C, 0 - map_top offset_gAreaRoomMap_TreeInteriors_12_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_TreeInteriors_MinishWoodsGreatFairy_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_TreeInteriors_MinishWoodsGreatFairy_top, 0x12C, 1, 1 gAreaRoomMap_TreeInteriors_13:: @ 081049D0 - map_bottom offset_gAreaRoomMap_TreeInteriors_13_0, 0x12C, 0 - map_top offset_gAreaRoomMap_TreeInteriors_13_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_TreeInteriors_1c_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_TreeInteriors_1c_top, 0x12C, 1, 1 gAreaRoomMap_TreeInteriors_14:: @ 081049E8 - map_bottom offset_gAreaRoomMap_TreeInteriors_14_0, 0x12C, 0 - map_top offset_gAreaRoomMap_TreeInteriors_14_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_TreeInteriors_MinishWoodsBusinessScrub_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_TreeInteriors_MinishWoodsBusinessScrub_top, 0x12C, 1, 1 gAreaRoomMap_TreeInteriors_15:: @ 08104A00 - map_bottom offset_gAreaRoomMap_TreeInteriors_15_0, 0x12C, 0 - map_top offset_gAreaRoomMap_TreeInteriors_15_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_TreeInteriors_1e_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_TreeInteriors_1e_top, 0x12C, 1, 1 gAreaRoomMap_TreeInteriors_16:: @ 08104A18 - map_bottom offset_gAreaRoomMap_TreeInteriors_16_0, 0x12C, 0 - map_top offset_gAreaRoomMap_TreeInteriors_16_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_TreeInteriors_UnusedHeartContainer_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_TreeInteriors_UnusedHeartContainer_top, 0x12C, 1, 1 gAreaRoomMaps_TreeInteriors:: @ 08104A30 .4byte gAreaRoomMap_TreeInteriors_0 @@ -1172,60 +1172,60 @@ gAreaRoomMaps_TreeInteriors:: @ 08104A30 .4byte gAreaRoomMap_TreeInteriors_16 gAreaRoomMap_Dojos_0:: @ 08104AB0 - map_bottom offset_gAreaRoomMap_Dojos_0_0, 0x168, 1 - map_top offset_gAreaRoomMap_Dojos_0_1, 0x168, 1, 1 + map_bottom offset_gAreaRoomMap_Dojos_Grayblade_bottom, 0x168, 1 + map_top offset_gAreaRoomMap_Dojos_Grayblade_top, 0x168, 1, 1 gAreaRoomMap_Dojos_1:: @ 08104AC8 - map_bottom offset_gAreaRoomMap_Dojos_1_0, 0x168, 1 - map_top offset_gAreaRoomMap_Dojos_1_1, 0x168, 1, 1 + map_bottom offset_gAreaRoomMap_Dojos_Splitblade_bottom, 0x168, 1 + map_top offset_gAreaRoomMap_Dojos_Splitblade_top, 0x168, 1, 1 gAreaRoomMap_Dojos_2:: @ 08104AE0 - map_bottom offset_gAreaRoomMap_Dojos_2_0, 0x168, 1 - map_top offset_gAreaRoomMap_Dojos_2_1, 0x168, 1, 1 + map_bottom offset_gAreaRoomMap_Dojos_Greatblade_bottom, 0x168, 1 + map_top offset_gAreaRoomMap_Dojos_Greatblade_top, 0x168, 1, 1 gAreaRoomMap_Dojos_3:: @ 08104AF8 - map_bottom offset_gAreaRoomMap_Dojos_3_0, 0x168, 1 - map_top offset_gAreaRoomMap_Dojos_3_1, 0x168, 1, 1 + map_bottom offset_gAreaRoomMap_Dojos_Scarblade_bottom, 0x168, 1 + map_top offset_gAreaRoomMap_Dojos_Scarblade_top, 0x168, 1, 1 gAreaRoomMap_Dojos_4:: @ 08104B10 - map_bottom offset_gAreaRoomMap_Dojos_4_0, 0x168, 1 - map_top offset_gAreaRoomMap_Dojos_4_1, 0x168, 1, 1 + map_bottom offset_gAreaRoomMap_Dojos_SwiftbladeI_bottom, 0x168, 1 + map_top offset_gAreaRoomMap_Dojos_SwiftbladeI_top, 0x168, 1, 1 gAreaRoomMap_Dojos_5:: @ 08104B28 - map_bottom offset_gAreaRoomMap_Dojos_5_0, 0x168, 1 - map_top offset_gAreaRoomMap_Dojos_5_1, 0x168, 1, 1 + map_bottom offset_gAreaRoomMap_Dojos_Grimblade_bottom, 0x168, 1 + map_top offset_gAreaRoomMap_Dojos_Grimblade_top, 0x168, 1, 1 gAreaRoomMap_Dojos_6:: @ 08104B40 - map_bottom offset_gAreaRoomMap_Dojos_6_0, 0x168, 1 - map_top offset_gAreaRoomMap_Dojos_6_1, 0x168, 1, 1 + map_bottom offset_gAreaRoomMap_Dojos_Waveblade_bottom, 0x168, 1 + map_top offset_gAreaRoomMap_Dojos_Waveblade_top, 0x168, 1, 1 gAreaRoomMap_Dojos_7:: @ 08104B58 - map_bottom offset_gAreaRoomMap_Dojos_7_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Dojos_7_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Dojos_7_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Dojos_7_top, 0x12C, 1, 1 gAreaRoomMap_Dojos_8:: @ 08104B70 - map_bottom offset_gAreaRoomMap_Dojos_8_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Dojos_8_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Dojos_8_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Dojos_8_top, 0x12C, 1, 1 gAreaRoomMap_Dojos_9:: @ 08104B88 - map_bottom offset_gAreaRoomMap_Dojos_9_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Dojos_9_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Dojos_9_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Dojos_9_top, 0x12C, 1, 1 gAreaRoomMap_Dojos_10:: @ 08104BA0 - map_bottom offset_gAreaRoomMap_Dojos_10_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Dojos_10_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Dojos_ToGrimblade_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Dojos_ToGrimblade_top, 0x12C, 1, 1 gAreaRoomMap_Dojos_11:: @ 08104BB8 - map_bottom offset_gAreaRoomMap_Dojos_11_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Dojos_11_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Dojos_ToSplitblade_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Dojos_ToSplitblade_top, 0x12C, 1, 1 gAreaRoomMap_Dojos_12:: @ 08104BD0 - map_bottom offset_gAreaRoomMap_Dojos_12_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Dojos_12_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Dojos_ToGreatblade_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Dojos_ToGreatblade_top, 0x12C, 1, 1 gAreaRoomMap_Dojos_13:: @ 08104BE8 - map_bottom offset_gAreaRoomMap_Dojos_13_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Dojos_13_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Dojos_ToScarblade_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Dojos_ToScarblade_top, 0x12C, 1, 1 gAreaRoomMaps_Dojos:: @ 08104C00 .4byte gAreaRoomMap_Dojos_0 @@ -1246,76 +1246,76 @@ gAreaRoomMaps_Dojos:: @ 08104C00 .4byte gAreaRoomMap_Dojos_0 gAreaRoomMap_MinishCracks_0:: @ 08104C40 - map_bottom offset_gAreaRoomMap_MinishCracks_0_0, 0x12C, 0 - map_top offset_gAreaRoomMap_MinishCracks_0_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCracks_LonLonRanchNorth_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_MinishCracks_LonLonRanchNorth_top, 0x12C, 1, 1 gAreaRoomMap_MinishCracks_1:: @ 08104C58 - map_bottom offset_gAreaRoomMap_MinishCracks_1_0, 0x12C, 0 - map_top offset_gAreaRoomMap_MinishCracks_1_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCracks_LakeHyliaEast_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_MinishCracks_LakeHyliaEast_top, 0x12C, 1, 1 gAreaRoomMap_MinishCracks_2:: @ 08104C70 - map_bottom offset_gAreaRoomMap_MinishCracks_2_0, 0x12C, 0 - map_top offset_gAreaRoomMap_MinishCracks_2_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCracks_HyruleCastleGarden_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_MinishCracks_HyruleCastleGarden_top, 0x12C, 1, 1 gAreaRoomMap_MinishCracks_3:: @ 08104C88 - map_bottom offset_gAreaRoomMap_MinishCracks_3_0, 0x12C, 0 - map_top offset_gAreaRoomMap_MinishCracks_3_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCracks_MtCrenel_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_MinishCracks_MtCrenel_top, 0x12C, 1, 1 gAreaRoomMap_MinishCracks_4:: @ 08104CA0 - map_bottom offset_gAreaRoomMap_MinishCracks_4_0, 0x12C, 0 - map_top offset_gAreaRoomMap_MinishCracks_4_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCracks_EastHyruleCastle_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_MinishCracks_EastHyruleCastle_top, 0x12C, 1, 1 gAreaRoomMap_MinishCracks_5:: @ 08104CB8 - map_bottom offset_gAreaRoomMap_MinishCracks_5_0, 0x12C, 1 - map_top offset_gAreaRoomMap_MinishCracks_5_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCracks_5_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_MinishCracks_5_top, 0x12C, 1, 1 gAreaRoomMap_MinishCracks_6:: @ 08104CD0 - map_bottom offset_gAreaRoomMap_MinishCracks_6_0, 0x12C, 0 - map_top offset_gAreaRoomMap_MinishCracks_6_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCracks_CastorWildsBow_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_MinishCracks_CastorWildsBow_top, 0x12C, 1, 1 gAreaRoomMap_MinishCracks_7:: @ 08104CE8 - map_bottom offset_gAreaRoomMap_MinishCracks_7_0, 0x12C, 0 - map_top offset_gAreaRoomMap_MinishCracks_7_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCracks_RuinsEntrance_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_MinishCracks_RuinsEntrance_top, 0x12C, 1, 1 gAreaRoomMap_MinishCracks_8:: @ 08104D00 - map_bottom offset_gAreaRoomMap_MinishCracks_8_0, 0x12C, 0 - map_top offset_gAreaRoomMap_MinishCracks_8_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCracks_MinishWoodsSouth_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_MinishCracks_MinishWoodsSouth_top, 0x12C, 1, 1 gAreaRoomMap_MinishCracks_9:: @ 08104D18 - map_bottom offset_gAreaRoomMap_MinishCracks_9_0, 0x12C, 0 - map_top offset_gAreaRoomMap_MinishCracks_9_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCracks_CastorWildsNorth_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_MinishCracks_CastorWildsNorth_top, 0x12C, 1, 1 gAreaRoomMap_MinishCracks_10:: @ 08104D30 - map_bottom offset_gAreaRoomMap_MinishCracks_10_0, 0x12C, 0 - map_top offset_gAreaRoomMap_MinishCracks_10_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCracks_CastorWildsWest_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_MinishCracks_CastorWildsWest_top, 0x12C, 1, 1 gAreaRoomMap_MinishCracks_11:: @ 08104D48 - map_bottom offset_gAreaRoomMap_MinishCracks_11_0, 0x12C, 0 - map_top offset_gAreaRoomMap_MinishCracks_11_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCracks_CastorWildsMiddle_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_MinishCracks_CastorWildsMiddle_top, 0x12C, 1, 1 gAreaRoomMap_MinishCracks_12:: @ 08104D60 - map_bottom offset_gAreaRoomMap_MinishCracks_12_0, 0x12C, 0 - map_top offset_gAreaRoomMap_MinishCracks_12_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCracks_RuinsTektite_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_MinishCracks_RuinsTektite_top, 0x12C, 1, 1 gAreaRoomMap_MinishCracks_13:: @ 08104D78 - map_bottom offset_gAreaRoomMap_MinishCracks_13_0, 0x12C, 0 - map_top offset_gAreaRoomMap_MinishCracks_13_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCracks_CastorWildsNextToBow_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_MinishCracks_CastorWildsNextToBow_top, 0x12C, 1, 1 gAreaRoomMap_MinishCracks_14:: @ 08104D90 - map_bottom offset_gAreaRoomMap_MinishCracks_14_0, 0x12C, 1 - map_top offset_gAreaRoomMap_MinishCracks_14_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCracks_E_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_MinishCracks_E_top, 0x12C, 1, 1 gAreaRoomMap_MinishCracks_15:: @ 08104DA8 - map_bottom offset_gAreaRoomMap_MinishCracks_15_0, 0x12C, 1 - map_top offset_gAreaRoomMap_MinishCracks_15_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCracks_F_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_MinishCracks_F_top, 0x12C, 1, 1 gAreaRoomMap_MinishCracks_16:: @ 08104DC0 - map_bottom offset_gAreaRoomMap_MinishCracks_16_0, 0x12C, 1 - map_top offset_gAreaRoomMap_MinishCracks_16_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCracks_10_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_MinishCracks_10_top, 0x12C, 1, 1 gAreaRoomMap_MinishCracks_17:: @ 08104DD8 - map_bottom offset_gAreaRoomMap_MinishCracks_17_0, 0x12C, 1 - map_top offset_gAreaRoomMap_MinishCracks_17_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCracks_11_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_MinishCracks_11_top, 0x12C, 1, 1 gAreaRoomMaps_MinishCracks:: @ 08104DF0 .4byte gAreaRoomMap_MinishCracks_0 @@ -1338,48 +1338,48 @@ gAreaRoomMaps_MinishCracks:: @ 08104DF0 .4byte gAreaRoomMap_MinishCracks_17 gAreaRoomMap_ArmosInteriors_0:: @ 08104E38 - map_bottom offset_gAreaRoomMap_ArmosInteriors_0_0, 0x12C, 0 - map_top offset_gAreaRoomMap_ArmosInteriors_0_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_ArmosInteriors_RuinsEntranceNorth_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_ArmosInteriors_RuinsEntranceNorth_top, 0x12C, 1, 1 gAreaRoomMap_ArmosInteriors_1:: @ 08104E50 - map_bottom offset_gAreaRoomMap_ArmosInteriors_1_0, 0x12C, 0 - map_top offset_gAreaRoomMap_ArmosInteriors_1_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_ArmosInteriors_RuinsEntranceSouth_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_ArmosInteriors_RuinsEntranceSouth_top, 0x12C, 1, 1 gAreaRoomMap_ArmosInteriors_2:: @ 08104E68 - map_bottom offset_gAreaRoomMap_ArmosInteriors_2_0, 0x12C, 0 - map_top offset_gAreaRoomMap_ArmosInteriors_2_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_ArmosInteriors_RuinsLeft_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_ArmosInteriors_RuinsLeft_top, 0x12C, 1, 1 gAreaRoomMap_ArmosInteriors_3:: @ 08104E80 - map_bottom offset_gAreaRoomMap_ArmosInteriors_3_0, 0x12C, 0 - map_top offset_gAreaRoomMap_ArmosInteriors_3_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_ArmosInteriors_RuinsMiddleLeft_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_ArmosInteriors_RuinsMiddleLeft_top, 0x12C, 1, 1 gAreaRoomMap_ArmosInteriors_4:: @ 08104E98 - map_bottom offset_gAreaRoomMap_ArmosInteriors_4_0, 0x12C, 0 - map_top offset_gAreaRoomMap_ArmosInteriors_4_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_ArmosInteriors_RuinsMiddleRight_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_ArmosInteriors_RuinsMiddleRight_top, 0x12C, 1, 1 gAreaRoomMap_ArmosInteriors_5:: @ 08104EB0 - map_bottom offset_gAreaRoomMap_ArmosInteriors_5_0, 0x12C, 0 - map_top offset_gAreaRoomMap_ArmosInteriors_5_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_ArmosInteriors_RuinsRight_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_ArmosInteriors_RuinsRight_top, 0x12C, 1, 1 gAreaRoomMap_ArmosInteriors_6:: @ 08104EC8 - map_bottom offset_gAreaRoomMap_ArmosInteriors_6_0, 0x12C, 0 - map_top offset_gAreaRoomMap_ArmosInteriors_6_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_ArmosInteriors_6_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_ArmosInteriors_6_top, 0x12C, 1, 1 gAreaRoomMap_ArmosInteriors_7:: @ 08104EE0 - map_bottom offset_gAreaRoomMap_ArmosInteriors_7_0, 0x12C, 0 - map_top offset_gAreaRoomMap_ArmosInteriors_7_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_ArmosInteriors_RuinsGrassPath_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_ArmosInteriors_RuinsGrassPath_top, 0x12C, 1, 1 gAreaRoomMap_ArmosInteriors_8:: @ 08104EF8 - map_bottom offset_gAreaRoomMap_ArmosInteriors_8_0, 0x12C, 0 - map_top offset_gAreaRoomMap_ArmosInteriors_8_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_ArmosInteriors_8_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_ArmosInteriors_8_top, 0x12C, 1, 1 gAreaRoomMap_ArmosInteriors_9:: @ 08104F10 - map_bottom offset_gAreaRoomMap_ArmosInteriors_9_0, 0x12C, 0 - map_top offset_gAreaRoomMap_ArmosInteriors_9_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_ArmosInteriors_FortressLeft_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_ArmosInteriors_FortressLeft_top, 0x12C, 1, 1 gAreaRoomMap_ArmosInteriors_10:: @ 08104F28 - map_bottom offset_gAreaRoomMap_ArmosInteriors_10_0, 0x12C, 0 - map_top offset_gAreaRoomMap_ArmosInteriors_10_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_ArmosInteriors_FortressRight_bottom, 0x12C, 0 + map_top offset_gAreaRoomMap_ArmosInteriors_FortressRight_top, 0x12C, 1, 1 gAreaRoomMaps_ArmosInteriors:: @ 08104F40 .4byte gAreaRoomMap_ArmosInteriors_0 @@ -1395,16 +1395,16 @@ gAreaRoomMaps_ArmosInteriors:: @ 08104F40 .4byte gAreaRoomMap_ArmosInteriors_10 gAreaRoomMap_MinishRafters_0:: @ 08104F6C - map_bottom offset_gAreaRoomMap_MinishRafters_0_0, 0x3E0, 1, 1 + map_bottom offset_gAreaRoomMap_MinishRafters_Cafe_bottom, 0x3E0, 1, 1 gAreaRoomMap_MinishRafters_1:: @ 08104F78 - map_bottom offset_gAreaRoomMap_MinishRafters_1_0, 0x3E0, 1, 1 + map_bottom offset_gAreaRoomMap_MinishRafters_Stockwell_bottom, 0x3E0, 1, 1 gAreaRoomMap_MinishRafters_2:: @ 08104F84 - map_bottom offset_gAreaRoomMap_MinishRafters_2_0, 0x3E0, 1, 1 + map_bottom offset_gAreaRoomMap_MinishRafters_DrLeft_bottom, 0x3E0, 1, 1 gAreaRoomMap_MinishRafters_3:: @ 08104F90 - map_bottom offset_gAreaRoomMap_MinishRafters_3_0, 0x3E0, 1, 1 + map_bottom offset_gAreaRoomMap_MinishRafters_Bakery_bottom, 0x3E0, 1, 1 gAreaRoomMaps_MinishRafters:: @ 08104F9C .4byte gAreaRoomMap_MinishRafters_0 @@ -1413,32 +1413,32 @@ gAreaRoomMaps_MinishRafters:: @ 08104F9C .4byte gAreaRoomMap_MinishRafters_3 gAreaRoomMap_GoronCave_0:: @ 08104FAC - map_bottom offset_gAreaRoomMap_GoronCave_0_0, 0x12C, 1 - map_top offset_gAreaRoomMap_GoronCave_0_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_GoronCave_Stairs_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_GoronCave_Stairs_top, 0x12C, 1, 1 gAreaRoomMap_GoronCave_1:: @ 08104FC4 - map_bottom offset_gAreaRoomMap_GoronCave_1_0, 0x546, 1 - map_top offset_gAreaRoomMap_GoronCave_1_1, 0x546, 1, 1 + map_bottom offset_gAreaRoomMap_GoronCave_Main_bottom, 0x546, 1 + map_top offset_gAreaRoomMap_GoronCave_Main_top, 0x546, 1, 1 gAreaRoomMaps_GoronCave:: @ 08104FDC .4byte gAreaRoomMap_GoronCave_0 .4byte gAreaRoomMap_GoronCave_1 gAreaRoomMap_WindTribeTower_0:: @ 08104FE4 - map_bottom offset_gAreaRoomMap_WindTribeTower_0_0, 0x276, 1 - map_top offset_gAreaRoomMap_WindTribeTower_0_1, 0x276, 1, 1 + map_bottom offset_gAreaRoomMap_WindTribeTower_Entrance_bottom, 0x276, 1 + map_top offset_gAreaRoomMap_WindTribeTower_Entrance_top, 0x276, 1, 1 gAreaRoomMap_WindTribeTower_1:: @ 08104FFC - map_bottom offset_gAreaRoomMap_WindTribeTower_1_0, 0x276, 1 - map_top offset_gAreaRoomMap_WindTribeTower_1_1, 0x276, 1, 1 + map_bottom offset_gAreaRoomMap_WindTribeTower_Floor1_bottom, 0x276, 1 + map_top offset_gAreaRoomMap_WindTribeTower_Floor1_top, 0x276, 1, 1 gAreaRoomMap_WindTribeTower_2:: @ 08105014 - map_bottom offset_gAreaRoomMap_WindTribeTower_2_0, 0x276, 1 - map_top offset_gAreaRoomMap_WindTribeTower_2_1, 0x276, 1, 1 + map_bottom offset_gAreaRoomMap_WindTribeTower_Floor2_bottom, 0x276, 1 + map_top offset_gAreaRoomMap_WindTribeTower_Floor2_top, 0x276, 1, 1 gAreaRoomMap_WindTribeTower_3:: @ 0810502C - map_bottom offset_gAreaRoomMap_WindTribeTower_3_0, 0x276, 1 - map_top offset_gAreaRoomMap_WindTribeTower_3_1, 0x276, 1, 1 + map_bottom offset_gAreaRoomMap_WindTribeTower_Floor3_bottom, 0x276, 1 + map_top offset_gAreaRoomMap_WindTribeTower_Floor3_top, 0x276, 1, 1 gAreaRoomMaps_WindTribeTower:: @ 08105044 .4byte gAreaRoomMap_WindTribeTower_0 @@ -1447,51 +1447,51 @@ gAreaRoomMaps_WindTribeTower:: @ 08105044 .4byte gAreaRoomMap_WindTribeTower_3 gAreaRoomMap_WindTribeTowerRoof_0:: @ 08105054 - map_bottom offset_gAreaRoomMap_WindTribeTowerRoof_0_0, 0x30C, 1 - map_top offset_gAreaRoomMap_WindTribeTowerRoof_0_1, 0x30C, 1, 1 + map_bottom offset_gAreaRoomMap_WindTribeTowerRoof_0_bottom, 0x30C, 1 + map_top offset_gAreaRoomMap_WindTribeTowerRoof_0_top, 0x30C, 1, 1 gAreaRoomMaps_WindTribeTowerRoof:: @ 0810506C .4byte gAreaRoomMap_WindTribeTowerRoof_0 gAreaRoomMap_MinishCaves_0:: @ 08105070 - map_bottom offset_gAreaRoomMap_MinishCaves_0_0, 0x474, 1 - map_top offset_gAreaRoomMap_MinishCaves_0_1, 0x474, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCaves_BeanPesto_bottom, 0x474, 1 + map_top offset_gAreaRoomMap_MinishCaves_BeanPesto_top, 0x474, 1, 1 gAreaRoomMap_MinishCaves_1:: @ 08105088 - map_bottom offset_gAreaRoomMap_MinishCaves_1_0, 0x41A, 1 - map_top offset_gAreaRoomMap_MinishCaves_1_1, 0x41A, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCaves_SoutheastWater1_bottom, 0x41A, 1 + map_top offset_gAreaRoomMap_MinishCaves_SoutheastWater1_top, 0x41A, 1, 1 gAreaRoomMap_MinishCaves_2:: @ 081050A0 - map_bottom offset_gAreaRoomMap_MinishCaves_2_0, 0x1FE, 1 - map_top offset_gAreaRoomMap_MinishCaves_2_1, 0x1FE, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCaves_2_bottom, 0x1FE, 1 + map_top offset_gAreaRoomMap_MinishCaves_2_top, 0x1FE, 1, 1 gAreaRoomMap_MinishCaves_3:: @ 081050B8 - map_bottom offset_gAreaRoomMap_MinishCaves_3_0, 0x4CE, 1 - map_top offset_gAreaRoomMap_MinishCaves_3_1, 0x4CE, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCaves_Ruins_bottom, 0x4CE, 1 + map_top offset_gAreaRoomMap_MinishCaves_Ruins_top, 0x4CE, 1, 1 gAreaRoomMap_MinishCaves_4:: @ 081050D0 - map_bottom offset_gAreaRoomMap_MinishCaves_4_0, 0x1C2, 1 - map_top offset_gAreaRoomMap_MinishCaves_4_1, 0x1C2, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCaves_OutsideLinksHouse_bottom, 0x1C2, 1 + map_top offset_gAreaRoomMap_MinishCaves_OutsideLinksHouse_top, 0x1C2, 1, 1 gAreaRoomMap_MinishCaves_5:: @ 081050E8 - map_bottom offset_gAreaRoomMap_MinishCaves_5_0, 0x258, 1 - map_top offset_gAreaRoomMap_MinishCaves_5_1, 0x258, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCaves_MinishWoodsNorth1_bottom, 0x258, 1 + map_top offset_gAreaRoomMap_MinishCaves_MinishWoodsNorth1_top, 0x258, 1, 1 gAreaRoomMap_MinishCaves_6:: @ 08105100 - map_bottom offset_gAreaRoomMap_MinishCaves_6_0, 0x258, 1 - map_top offset_gAreaRoomMap_MinishCaves_6_1, 0x258, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCaves_6_bottom, 0x258, 1 + map_top offset_gAreaRoomMap_MinishCaves_6_top, 0x258, 1, 1 gAreaRoomMap_MinishCaves_7:: @ 08105118 - map_bottom offset_gAreaRoomMap_MinishCaves_7_0, 0x744, 1 - map_top offset_gAreaRoomMap_MinishCaves_7_1, 0x744, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCaves_LakeHyliaNorth_bottom, 0x744, 1 + map_top offset_gAreaRoomMap_MinishCaves_LakeHyliaNorth_top, 0x744, 1, 1 gAreaRoomMap_MinishCaves_8:: @ 08105130 - map_bottom offset_gAreaRoomMap_MinishCaves_8_0, 0x4B0, 1 - map_top offset_gAreaRoomMap_MinishCaves_8_1, 0x4B0, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCaves_LakeHyliaLibrari_bottom, 0x4B0, 1 + map_top offset_gAreaRoomMap_MinishCaves_LakeHyliaLibrari_top, 0x4B0, 1, 1 gAreaRoomMap_MinishCaves_9:: @ 08105148 - map_bottom offset_gAreaRoomMap_MinishCaves_9_0, 0x618, 1 - map_top offset_gAreaRoomMap_MinishCaves_9_1, 0x618, 1, 1 + map_bottom offset_gAreaRoomMap_MinishCaves_MinishWoodsSouthwest_bottom, 0x618, 1 + map_top offset_gAreaRoomMap_MinishCaves_MinishWoodsSouthwest_top, 0x618, 1, 1 gAreaRoomMaps_MinishCaves:: @ 08105160 .4byte gAreaRoomMap_MinishCaves_0 @@ -1506,114 +1506,114 @@ gAreaRoomMaps_MinishCaves:: @ 08105160 .4byte gAreaRoomMap_MinishCaves_9 gAreaRoomMap_CastleGardenMinishHoles_0:: @ 08105188 - map_bottom offset_gAreaRoomMap_CastleGardenMinishHoles_0_0, 0x1C2, 1 - map_top offset_gAreaRoomMap_CastleGardenMinishHoles_0_1, 0x1C2, 1, 1 + map_bottom offset_gAreaRoomMap_CastleGardenMinishHoles_0_bottom, 0x1C2, 1 + map_top offset_gAreaRoomMap_CastleGardenMinishHoles_0_top, 0x1C2, 1, 1 gAreaRoomMap_CastleGardenMinishHoles_1:: @ 081051A0 - map_bottom offset_gAreaRoomMap_CastleGardenMinishHoles_1_0, 0x1C2, 1 - map_top offset_gAreaRoomMap_CastleGardenMinishHoles_1_1, 0x1C2, 1, 1 + map_bottom offset_gAreaRoomMap_CastleGardenMinishHoles_1_bottom, 0x1C2, 1 + map_top offset_gAreaRoomMap_CastleGardenMinishHoles_1_top, 0x1C2, 1, 1 gAreaRoomMaps_CastleGardenMinishHoles:: @ 081051B8 .4byte gAreaRoomMap_CastleGardenMinishHoles_0 .4byte gAreaRoomMap_CastleGardenMinishHoles_1 gAreaRoomMap_37_0:: @ 081051C0 - map_bottom offset_gAreaRoomMap_37_0_0, 0x1C2, 1 - map_top offset_gAreaRoomMap_37_0_1, 0x1C2, 1, 1 + map_bottom offset_gAreaRoomMap_37_0_bottom, 0x1C2, 1 + map_top offset_gAreaRoomMap_37_0_top, 0x1C2, 1, 1 gAreaRoomMap_37_1:: @ 081051D8 - map_bottom offset_gAreaRoomMap_37_1_0, 0x1C2, 1 - map_top offset_gAreaRoomMap_37_1_1, 0x1C2, 1, 1 + map_bottom offset_gAreaRoomMap_37_1_bottom, 0x1C2, 1 + map_top offset_gAreaRoomMap_37_1_top, 0x1C2, 1, 1 gAreaRoomMaps_37:: @ 081051F0 .4byte gAreaRoomMap_37_0 .4byte gAreaRoomMap_37_1 gAreaRoomMap_EzloCutscene_0:: @ 081051F8 - map_bottom offset_gAreaRoomMap_EzloCutscene_0_0, 0x258, 1 - map_top offset_gAreaRoomMap_EzloCutscene_0_1, 0x258, 1, 1 + map_bottom offset_gAreaRoomMap_EzloCutscene_0_bottom, 0x258, 1 + map_top offset_gAreaRoomMap_EzloCutscene_0_top, 0x258, 1, 1 gAreaRoomMaps_EzloCutscene:: @ 08105210 .4byte gAreaRoomMap_EzloCutscene_0 gAreaRoomMap_HyruleTownUnderground_0:: @ 08105214 - map_bottom offset_gAreaRoomMap_HyruleTownUnderground_0_0, 0xE10, 1 - map_top offset_gAreaRoomMap_HyruleTownUnderground_0_1, 0xE10, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleTownUnderground_0_bottom, 0xE10, 1 + map_top offset_gAreaRoomMap_HyruleTownUnderground_0_top, 0xE10, 1, 1 gAreaRoomMap_HyruleTownUnderground_1:: @ 0810522C - map_bottom offset_gAreaRoomMap_HyruleTownUnderground_1_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HyruleTownUnderground_1_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleTownUnderground_1_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HyruleTownUnderground_1_top, 0x12C, 1, 1 gAreaRoomMaps_HyruleTownUnderground:: @ 08105244 .4byte gAreaRoomMap_HyruleTownUnderground_0 .4byte gAreaRoomMap_HyruleTownUnderground_1 gAreaRoomMap_GardenFountains_0:: @ 0810524C - map_bottom offset_gAreaRoomMap_GardenFountains_0_0, 0x12C, 1 - map_top offset_gAreaRoomMap_GardenFountains_0_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_GardenFountains_East_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_GardenFountains_East_top, 0x12C, 1, 1 gAreaRoomMap_GardenFountains_1:: @ 08105264 - map_bottom offset_gAreaRoomMap_GardenFountains_1_0, 0x12C, 1 - map_top offset_gAreaRoomMap_GardenFountains_1_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_GardenFountains_West_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_GardenFountains_West_top, 0x12C, 1, 1 gAreaRoomMaps_GardenFountains:: @ 0810527C .4byte gAreaRoomMap_GardenFountains_0 .4byte gAreaRoomMap_GardenFountains_1 gAreaRoomMap_HyruleCastleCellar_0:: @ 08105284 - map_bottom offset_gAreaRoomMap_HyruleCastleCellar_0_0, 0x3C0, 1 - map_top offset_gAreaRoomMap_HyruleCastleCellar_0_1, 0x3C0, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleCastleCellar_0_bottom, 0x3C0, 1 + map_top offset_gAreaRoomMap_HyruleCastleCellar_0_top, 0x3C0, 1, 1 gAreaRoomMap_HyruleCastleCellar_1:: @ 0810529C - map_bottom offset_gAreaRoomMap_HyruleCastleCellar_1_0, 0x1E0, 1 - map_top offset_gAreaRoomMap_HyruleCastleCellar_1_1, 0x1E0, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleCastleCellar_1_bottom, 0x1E0, 1 + map_top offset_gAreaRoomMap_HyruleCastleCellar_1_top, 0x1E0, 1, 1 gAreaRoomMaps_HyruleCastleCellar:: @ 081052B4 .4byte gAreaRoomMap_HyruleCastleCellar_0 .4byte gAreaRoomMap_HyruleCastleCellar_1 gAreaRoomMap_SimonsSimulation_0:: @ 081052BC - map_bottom offset_gAreaRoomMap_SimonsSimulation_0_0, 0x23A, 1 - map_top offset_gAreaRoomMap_SimonsSimulation_0_1, 0x23A, 1, 1 + map_bottom offset_gAreaRoomMap_SimonsSimulation_0_bottom, 0x23A, 1 + map_top offset_gAreaRoomMap_SimonsSimulation_0_top, 0x23A, 1, 1 gAreaRoomMaps_SimonsSimulation:: @ 081052D4 .4byte gAreaRoomMap_SimonsSimulation_0 gAreaRoomMap_40_0:: @ 081052D8 - map_bottom offset_gAreaRoomMap_40_0_0, 0x286, 1 - map_top offset_gAreaRoomMap_40_0_1, 0x286, 1, 1 + map_bottom offset_gAreaRoomMap_40_0_bottom, 0x286, 1 + map_top offset_gAreaRoomMap_40_0_top, 0x286, 1, 1 gAreaRoomMap_40_1:: @ 081052F0 - map_bottom offset_gAreaRoomMap_40_1_0, 0x30E, 1 - map_top offset_gAreaRoomMap_40_1_1, 0x30E, 1, 1 + map_bottom offset_gAreaRoomMap_40_1_bottom, 0x30E, 1 + map_top offset_gAreaRoomMap_40_1_top, 0x30E, 1, 1 gAreaRoomMap_40_2:: @ 08105308 - map_bottom offset_gAreaRoomMap_40_2_0, 0x286, 1 - map_top offset_gAreaRoomMap_40_2_1, 0x286, 1, 1 + map_bottom offset_gAreaRoomMap_40_2_bottom, 0x286, 1 + map_top offset_gAreaRoomMap_40_2_top, 0x286, 1, 1 gAreaRoomMap_40_3:: @ 08105320 - map_bottom offset_gAreaRoomMap_40_3_0, 0x286, 1 - map_top offset_gAreaRoomMap_40_3_1, 0x286, 1, 1 + map_bottom offset_gAreaRoomMap_40_3_bottom, 0x286, 1 + map_top offset_gAreaRoomMap_40_3_top, 0x286, 1, 1 gAreaRoomMap_40_4:: @ 08105338 - map_bottom offset_gAreaRoomMap_40_4_0, 0x30E, 1 - map_top offset_gAreaRoomMap_40_4_1, 0x30E, 1, 1 + map_bottom offset_gAreaRoomMap_40_4_bottom, 0x30E, 1 + map_top offset_gAreaRoomMap_40_4_top, 0x30E, 1, 1 gAreaRoomMap_40_5:: @ 08105350 - map_bottom offset_gAreaRoomMap_40_5_0, 0x286, 1 - map_top offset_gAreaRoomMap_40_5_1, 0x286, 1, 1 + map_bottom offset_gAreaRoomMap_40_5_bottom, 0x286, 1 + map_top offset_gAreaRoomMap_40_5_top, 0x286, 1, 1 gAreaRoomMap_40_6:: @ 08105368 - map_bottom offset_gAreaRoomMap_40_6_0, 0x520, 1 - map_top offset_gAreaRoomMap_40_6_1, 0x520, 1, 1 + map_bottom offset_gAreaRoomMap_40_6_bottom, 0x520, 1 + map_top offset_gAreaRoomMap_40_6_top, 0x520, 1, 1 gAreaRoomMap_40_7:: @ 08105380 - map_bottom offset_gAreaRoomMap_40_7_0, 0x28A, 1 - map_top offset_gAreaRoomMap_40_7_1, 0x28A, 1, 1 + map_bottom offset_gAreaRoomMap_40_7_bottom, 0x28A, 1 + map_top offset_gAreaRoomMap_40_7_top, 0x28A, 1, 1 gAreaRoomMap_40_8:: @ 08105398 - map_bottom offset_gAreaRoomMap_40_8_0, 0x200, 1 - map_top offset_gAreaRoomMap_40_8_1, 0x200, 1, 1 + map_bottom offset_gAreaRoomMap_40_8_bottom, 0x200, 1 + map_top offset_gAreaRoomMap_40_8_top, 0x200, 1, 1 gAreaRoomMaps_40:: @ 081053B0 .4byte gAreaRoomMap_40_0 @@ -1627,92 +1627,92 @@ gAreaRoomMaps_40:: @ 081053B0 .4byte gAreaRoomMap_40_8 gAreaRoomMap_DeepwoodShrine_0:: @ 081053D4 - map_bottom offset_gAreaRoomMap_DeepwoodShrine_0_0, 0x1FE, 1 - map_top offset_gAreaRoomMap_DeepwoodShrine_0_1, 0x1FE, 1, 1 + map_bottom offset_gAreaRoomMap_DeepwoodShrine_Madderpillar_bottom, 0x1FE, 1 + map_top offset_gAreaRoomMap_DeepwoodShrine_Madderpillar_top, 0x1FE, 1, 1 gAreaRoomMap_DeepwoodShrine_1:: @ 081053EC - map_bottom offset_gAreaRoomMap_DeepwoodShrine_1_0, 0x2EE, 1 - map_top offset_gAreaRoomMap_DeepwoodShrine_1_1, 0x2EE, 1, 1 + map_bottom offset_gAreaRoomMap_DeepwoodShrine_BluePortal_bottom, 0x2EE, 1 + map_top offset_gAreaRoomMap_DeepwoodShrine_BluePortal_top, 0x2EE, 1, 1 gAreaRoomMap_DeepwoodShrine_2:: @ 08105404 - map_bottom offset_gAreaRoomMap_DeepwoodShrine_2_0, 0x276, 1 - map_top offset_gAreaRoomMap_DeepwoodShrine_2_1, 0x276, 1, 1 + map_bottom offset_gAreaRoomMap_DeepwoodShrine_StairsToB1_bottom, 0x276, 1 + map_top offset_gAreaRoomMap_DeepwoodShrine_StairsToB1_top, 0x276, 1, 1 gAreaRoomMap_DeepwoodShrine_3:: @ 0810541C - map_bottom offset_gAreaRoomMap_DeepwoodShrine_3_0, 0x1FE, 1 - map_top offset_gAreaRoomMap_DeepwoodShrine_3_1, 0x1FE, 1, 1 + map_bottom offset_gAreaRoomMap_DeepwoodShrine_PotBridge_bottom, 0x1FE, 1 + map_top offset_gAreaRoomMap_DeepwoodShrine_PotBridge_top, 0x1FE, 1, 1 gAreaRoomMap_DeepwoodShrine_4:: @ 08105434 - map_bottom offset_gAreaRoomMap_DeepwoodShrine_4_0, 0x154, 1 - map_top offset_gAreaRoomMap_DeepwoodShrine_4_1, 0x154, 1, 1 + map_bottom offset_gAreaRoomMap_DeepwoodShrine_DoubleStatue_bottom, 0x154, 1 + map_top offset_gAreaRoomMap_DeepwoodShrine_DoubleStatue_top, 0x154, 1, 1 gAreaRoomMap_DeepwoodShrine_5:: @ 0810544C - map_bottom offset_gAreaRoomMap_DeepwoodShrine_5_0, 0x352, 1 - map_top offset_gAreaRoomMap_DeepwoodShrine_5_1, 0x352, 1, 1 + map_bottom offset_gAreaRoomMap_DeepwoodShrine_Map_bottom, 0x352, 1 + map_top offset_gAreaRoomMap_DeepwoodShrine_Map_top, 0x352, 1, 1 gAreaRoomMap_DeepwoodShrine_6:: @ 08105464 - map_bottom offset_gAreaRoomMap_DeepwoodShrine_6_0, 0x5AA, 1 - map_top offset_gAreaRoomMap_DeepwoodShrine_6_1, 0x5AA, 1, 1 + map_bottom offset_gAreaRoomMap_DeepwoodShrine_Barrel_bottom, 0x5AA, 1 + map_top offset_gAreaRoomMap_DeepwoodShrine_Barrel_top, 0x5AA, 1, 1 gAreaRoomMap_DeepwoodShrine_7:: @ 0810547C - map_bottom offset_gAreaRoomMap_DeepwoodShrine_7_0, 0x352, 1 - map_top offset_gAreaRoomMap_DeepwoodShrine_7_1, 0x352, 1, 1 + map_bottom offset_gAreaRoomMap_DeepwoodShrine_Button_bottom, 0x352, 1 + map_top offset_gAreaRoomMap_DeepwoodShrine_Button_top, 0x352, 1, 1 gAreaRoomMap_DeepwoodShrine_8:: @ 08105494 - map_bottom offset_gAreaRoomMap_DeepwoodShrine_8_0, 0x198, 1 - map_top offset_gAreaRoomMap_DeepwoodShrine_8_1, 0x198, 1, 1 + map_bottom offset_gAreaRoomMap_DeepwoodShrine_Mulldozer_bottom, 0x198, 1 + map_top offset_gAreaRoomMap_DeepwoodShrine_Mulldozer_top, 0x198, 1, 1 gAreaRoomMap_DeepwoodShrine_9:: @ 081054AC - map_bottom offset_gAreaRoomMap_DeepwoodShrine_9_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DeepwoodShrine_9_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DeepwoodShrine_Pillars_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DeepwoodShrine_Pillars_top, 0x1BA, 1, 1 gAreaRoomMap_DeepwoodShrine_10:: @ 081054C4 - map_bottom offset_gAreaRoomMap_DeepwoodShrine_10_0, 0x2CA, 1 - map_top offset_gAreaRoomMap_DeepwoodShrine_10_1, 0x2CA, 1, 1 + map_bottom offset_gAreaRoomMap_DeepwoodShrine_Lever_bottom, 0x2CA, 1 + map_top offset_gAreaRoomMap_DeepwoodShrine_Lever_top, 0x2CA, 1, 1 gAreaRoomMap_DeepwoodShrine_11:: @ 081054DC - map_bottom offset_gAreaRoomMap_DeepwoodShrine_11_0, 0x2CA, 1 - map_top offset_gAreaRoomMap_DeepwoodShrine_11_1, 0x2CA, 1, 1 + map_bottom offset_gAreaRoomMap_DeepwoodShrine_Entrance_bottom, 0x2CA, 1 + map_top offset_gAreaRoomMap_DeepwoodShrine_Entrance_top, 0x2CA, 1, 1 gAreaRoomMap_DeepwoodShrine_12:: @ 081054F4 - map_bottom offset_gAreaRoomMap_DeepwoodShrine_12_0, 0x2CA, 1 - map_top offset_gAreaRoomMap_DeepwoodShrine_12_1, 0x2CA, 1, 1 + map_bottom offset_gAreaRoomMap_DeepwoodShrine_Torches_bottom, 0x2CA, 1 + map_top offset_gAreaRoomMap_DeepwoodShrine_Torches_top, 0x2CA, 1, 1 gAreaRoomMap_DeepwoodShrine_13:: @ 0810550C - map_bottom offset_gAreaRoomMap_DeepwoodShrine_13_0, 0x2EE, 1 - map_top offset_gAreaRoomMap_DeepwoodShrine_13_1, 0x2EE, 1, 1 + map_bottom offset_gAreaRoomMap_DeepwoodShrine_BossKey_bottom, 0x2EE, 1 + map_top offset_gAreaRoomMap_DeepwoodShrine_BossKey_top, 0x2EE, 1, 1 gAreaRoomMap_DeepwoodShrine_14:: @ 08105524 - map_bottom offset_gAreaRoomMap_DeepwoodShrine_14_0, 0x276, 1 - map_top offset_gAreaRoomMap_DeepwoodShrine_14_1, 0x276, 1, 1 + map_bottom offset_gAreaRoomMap_DeepwoodShrine_Compass_bottom, 0x276, 1 + map_top offset_gAreaRoomMap_DeepwoodShrine_Compass_top, 0x276, 1, 1 gAreaRoomMap_DeepwoodShrine_15:: @ 0810553C - map_bottom offset_gAreaRoomMap_DeepwoodShrine_15_0, 0x198, 1 - map_top offset_gAreaRoomMap_DeepwoodShrine_15_1, 0x198, 1, 1 + map_bottom offset_gAreaRoomMap_DeepwoodShrine_13_bottom, 0x198, 1 + map_top offset_gAreaRoomMap_DeepwoodShrine_13_top, 0x198, 1, 1 gAreaRoomMap_DeepwoodShrine_16:: @ 08105554 - map_bottom offset_gAreaRoomMap_DeepwoodShrine_16_0, 0x5AA, 1 - map_top offset_gAreaRoomMap_DeepwoodShrine_16_1, 0x5AA, 1, 1 + map_bottom offset_gAreaRoomMap_DeepwoodShrine_LilyPadWest_bottom, 0x5AA, 1 + map_top offset_gAreaRoomMap_DeepwoodShrine_LilyPadWest_top, 0x5AA, 1, 1 gAreaRoomMap_DeepwoodShrine_17:: @ 0810556C - map_bottom offset_gAreaRoomMap_DeepwoodShrine_17_0, 0x264, 1 - map_top offset_gAreaRoomMap_DeepwoodShrine_17_1, 0x264, 1, 1 + map_bottom offset_gAreaRoomMap_DeepwoodShrine_LilyPadEast_bottom, 0x264, 1 + map_top offset_gAreaRoomMap_DeepwoodShrine_LilyPadEast_top, 0x264, 1, 1 gAreaRoomMap_DeepwoodShrineBoss_0:: @ 08105584 - map_bottom offset_gAreaRoomMap_DeepwoodShrineBoss_0_0, 0x1FE, 1 - map_top offset_gAreaRoomMap_DeepwoodShrineBoss_0_1, 0x1FE, 1, 1 + map_bottom offset_gAreaRoomMap_DeepwoodShrineBoss_Main_bottom, 0x1FE, 1 + map_top offset_gAreaRoomMap_DeepwoodShrineBoss_Main_top, 0x1FE, 1, 1 gAreaRoomMap_DeepwoodShrine_18:: @ 0810559C - map_bottom offset_gAreaRoomMap_DeepwoodShrine_18_0, 0x2CA, 1 - map_top offset_gAreaRoomMap_DeepwoodShrine_18_1, 0x2CA, 1, 1 + map_bottom offset_gAreaRoomMap_DeepwoodShrine_BossDoor_bottom, 0x2CA, 1 + map_top offset_gAreaRoomMap_DeepwoodShrine_BossDoor_top, 0x2CA, 1, 1 gAreaRoomMap_DeepwoodShrine_19:: @ 081055B4 - map_bottom offset_gAreaRoomMap_DeepwoodShrine_19_0, 0x12C, 1 - map_top offset_gAreaRoomMap_DeepwoodShrine_19_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_DeepwoodShrine_InsideBarrel_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_DeepwoodShrine_InsideBarrel_top, 0x12C, 1, 1 gAreaRoomMap_DeepwoodShrineEntry_0:: @ 081055CC - map_bottom offset_gAreaRoomMap_DeepwoodShrineEntry_0_0, 0x1C2, 0 - map_top offset_gAreaRoomMap_DeepwoodShrineEntry_0_1, 0x1C2, 1, 1 + map_bottom offset_gAreaRoomMap_DeepwoodShrineEntry_Main_bottom, 0x1C2, 0 + map_top offset_gAreaRoomMap_DeepwoodShrineEntry_Main_top, 0x1C2, 1, 1 gAreaRoomMaps_DeepwoodShrine:: @ 081055E4 .4byte gAreaRoomMap_DeepwoodShrine_0 @@ -1756,76 +1756,76 @@ gAreaRoomMaps_DeepwoodShrineEntry:: @ 0810566C .4byte gAreaRoomMap_DeepwoodShrineEntry_0 gAreaRoomMap_CaveOfFlames_0:: @ 08105670 - map_bottom offset_gAreaRoomMap_CaveOfFlames_0_0, 0x30E, 1 - map_top offset_gAreaRoomMap_CaveOfFlames_0_1, 0x30E, 1, 1 + map_bottom offset_gAreaRoomMap_CaveOfFlames_AfterCane_bottom, 0x30E, 1 + map_top offset_gAreaRoomMap_CaveOfFlames_AfterCane_top, 0x30E, 1, 1 gAreaRoomMap_CaveOfFlames_1:: @ 08105688 - map_bottom offset_gAreaRoomMap_CaveOfFlames_1_0, 0x30E, 1 - map_top offset_gAreaRoomMap_CaveOfFlames_1_1, 0x30E, 1, 1 + map_bottom offset_gAreaRoomMap_CaveOfFlames_SpinyChu_bottom, 0x30E, 1 + map_top offset_gAreaRoomMap_CaveOfFlames_SpinyChu_top, 0x30E, 1, 1 gAreaRoomMap_CaveOfFlames_2:: @ 081056A0 - map_bottom offset_gAreaRoomMap_CaveOfFlames_2_0, 0x4AC, 1 - map_top offset_gAreaRoomMap_CaveOfFlames_2_1, 0x4AC, 1, 1 + map_bottom offset_gAreaRoomMap_CaveOfFlames_CartToSpinyChu_bottom, 0x4AC, 1 + map_top offset_gAreaRoomMap_CaveOfFlames_CartToSpinyChu_top, 0x4AC, 1, 1 gAreaRoomMap_CaveOfFlames_3:: @ 081056B8 - map_bottom offset_gAreaRoomMap_CaveOfFlames_3_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_CaveOfFlames_3_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_CaveOfFlames_Entrance_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_CaveOfFlames_Entrance_top, 0x1BA, 1, 1 gAreaRoomMap_CaveOfFlames_4:: @ 081056D0 - map_bottom offset_gAreaRoomMap_CaveOfFlames_4_0, 0x74E, 1 - map_top offset_gAreaRoomMap_CaveOfFlames_4_1, 0x74E, 1, 1 + map_bottom offset_gAreaRoomMap_CaveOfFlames_MainCart_bottom, 0x74E, 1 + map_top offset_gAreaRoomMap_CaveOfFlames_MainCart_top, 0x74E, 1, 1 gAreaRoomMap_CaveOfFlames_5:: @ 081056E8 - map_bottom offset_gAreaRoomMap_CaveOfFlames_5_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_CaveOfFlames_5_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_CaveOfFlames_NorthEntrance_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_CaveOfFlames_NorthEntrance_top, 0x1BA, 1, 1 gAreaRoomMap_CaveOfFlames_6:: @ 08105700 - map_bottom offset_gAreaRoomMap_CaveOfFlames_6_0, 0x5B6, 1 - map_top offset_gAreaRoomMap_CaveOfFlames_6_1, 0x5B6, 1, 1 + map_bottom offset_gAreaRoomMap_CaveOfFlames_CartWest_bottom, 0x5B6, 1 + map_top offset_gAreaRoomMap_CaveOfFlames_CartWest_top, 0x5B6, 1, 1 gAreaRoomMap_CaveOfFlames_7:: @ 08105718 - map_bottom offset_gAreaRoomMap_CaveOfFlames_7_0, 0x1FE, 1 - map_top offset_gAreaRoomMap_CaveOfFlames_7_1, 0x1FE, 1, 1 + map_bottom offset_gAreaRoomMap_CaveOfFlames_HelmasaurFight_bottom, 0x1FE, 1 + map_top offset_gAreaRoomMap_CaveOfFlames_HelmasaurFight_top, 0x1FE, 1, 1 gAreaRoomMap_CaveOfFlames_8:: @ 08105730 - map_bottom offset_gAreaRoomMap_CaveOfFlames_8_0, 0x508, 1 - map_top offset_gAreaRoomMap_CaveOfFlames_8_1, 0x508, 1, 1 + map_bottom offset_gAreaRoomMap_CaveOfFlames_RollobiteLavaRoom_bottom, 0x508, 1 + map_top offset_gAreaRoomMap_CaveOfFlames_RollobiteLavaRoom_top, 0x508, 1, 1 gAreaRoomMap_CaveOfFlames_9:: @ 08105748 - map_bottom offset_gAreaRoomMap_CaveOfFlames_9_0, 0x508, 1 - map_top offset_gAreaRoomMap_CaveOfFlames_9_1, 0x508, 1, 1 + map_bottom offset_gAreaRoomMap_CaveOfFlames_MinishLavaRoom_bottom, 0x508, 1 + map_top offset_gAreaRoomMap_CaveOfFlames_MinishLavaRoom_top, 0x508, 1, 1 gAreaRoomMap_CaveOfFlames_10:: @ 08105760 - map_bottom offset_gAreaRoomMap_CaveOfFlames_10_0, 0x9D8, 1 - map_top offset_gAreaRoomMap_CaveOfFlames_10_1, 0x9D8, 1, 1 + map_bottom offset_gAreaRoomMap_CaveOfFlames_MinishSpikes_bottom, 0x9D8, 1 + map_top offset_gAreaRoomMap_CaveOfFlames_MinishSpikes_top, 0x9D8, 1, 1 gAreaRoomMap_CaveOfFlames_11:: @ 08105778 - map_bottom offset_gAreaRoomMap_CaveOfFlames_11_0, 0x4EC, 1 - map_top offset_gAreaRoomMap_CaveOfFlames_11_1, 0x4EC, 1, 1 + map_bottom offset_gAreaRoomMap_CaveOfFlames_TompasDoom_bottom, 0x4EC, 1 + map_top offset_gAreaRoomMap_CaveOfFlames_TompasDoom_top, 0x4EC, 1, 1 gAreaRoomMap_CaveOfFlames_12:: @ 08105790 - map_bottom offset_gAreaRoomMap_CaveOfFlames_12_0, 0x276, 1 - map_top offset_gAreaRoomMap_CaveOfFlames_12_1, 0x276, 1, 1 + map_bottom offset_gAreaRoomMap_CaveOfFlames_BeforeGleerok_bottom, 0x276, 1 + map_top offset_gAreaRoomMap_CaveOfFlames_BeforeGleerok_top, 0x276, 1, 1 gAreaRoomMap_CaveOfFlames_13:: @ 081057A8 - map_bottom offset_gAreaRoomMap_CaveOfFlames_13_0, 0x276, 1 - map_top offset_gAreaRoomMap_CaveOfFlames_13_1, 0x276, 1, 1 + map_bottom offset_gAreaRoomMap_CaveOfFlames_BosskeyPath1_bottom, 0x276, 1 + map_top offset_gAreaRoomMap_CaveOfFlames_BosskeyPath1_top, 0x276, 1, 1 gAreaRoomMap_CaveOfFlames_14:: @ 081057C0 - map_bottom offset_gAreaRoomMap_CaveOfFlames_14_0, 0x276, 1 - map_top offset_gAreaRoomMap_CaveOfFlames_14_1, 0x276, 1, 1 + map_bottom offset_gAreaRoomMap_CaveOfFlames_BosskeyPath2_bottom, 0x276, 1 + map_top offset_gAreaRoomMap_CaveOfFlames_BosskeyPath2_top, 0x276, 1, 1 gAreaRoomMap_CaveOfFlames_15:: @ 081057D8 - map_bottom offset_gAreaRoomMap_CaveOfFlames_15_0, 0x186, 1 - map_top offset_gAreaRoomMap_CaveOfFlames_15_1, 0x186, 1, 1 + map_bottom offset_gAreaRoomMap_CaveOfFlames_Compass_bottom, 0x186, 1 + map_top offset_gAreaRoomMap_CaveOfFlames_Compass_top, 0x186, 1, 1 gAreaRoomMap_CaveOfFlames_16:: @ 081057F0 - map_bottom offset_gAreaRoomMap_CaveOfFlames_16_0, 0x186, 1 - map_top offset_gAreaRoomMap_CaveOfFlames_16_1, 0x186, 1, 1 + map_bottom offset_gAreaRoomMap_CaveOfFlames_BobOmbWall_bottom, 0x186, 1 + map_top offset_gAreaRoomMap_CaveOfFlames_BobOmbWall_top, 0x186, 1, 1 gAreaRoomMap_CaveOfFlames_17:: @ 08105808 - map_bottom offset_gAreaRoomMap_CaveOfFlames_17_0, 0x9D8, 1 - map_top offset_gAreaRoomMap_CaveOfFlames_17_1, 0x9D8, 1, 1 + map_bottom offset_gAreaRoomMap_CaveOfFlames_BossDoor_bottom, 0x9D8, 1 + map_top offset_gAreaRoomMap_CaveOfFlames_BossDoor_top, 0x9D8, 1, 1 gAreaRoomMaps_CaveOfFlames:: @ 08105820 .4byte gAreaRoomMap_CaveOfFlames_0 @@ -1854,107 +1854,107 @@ gAreaRoomMaps_CaveOfFlames:: @ 08105820 .4byte gAreaRoomMap_CaveOfFlames_17 gAreaRoomMap_CaveOfFlamesBoss_0:: @ 08105880 - map_bottom offset_gAreaRoomMap_CaveOfFlamesBoss_0_0, 0x360, 1 - map_top offset_gAreaRoomMap_CaveOfFlamesBoss_0_1, 0x360, 1, 1 + map_bottom offset_gAreaRoomMap_CaveOfFlamesBoss_0_bottom, 0x360, 1 + map_top offset_gAreaRoomMap_CaveOfFlamesBoss_0_top, 0x360, 1, 1 gAreaRoomMaps_CaveOfFlamesBoss:: @ 08105898 .4byte gAreaRoomMap_CaveOfFlamesBoss_0 gAreaRoomMap_FortressOfWinds_0:: @ 0810589C - map_bottom offset_gAreaRoomMap_FortressOfWinds_0_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_0_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_DoubleEyegore_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_DoubleEyegore_top, 0x1BA, 1, 1 gAreaRoomMap_FortressOfWinds_1:: @ 081058B4 - map_bottom offset_gAreaRoomMap_FortressOfWinds_1_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_1_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_BeforeMazaal_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_BeforeMazaal_top, 0x1BA, 1, 1 gAreaRoomMap_FortressOfWinds_2:: @ 081058CC - map_bottom offset_gAreaRoomMap_FortressOfWinds_2_0, 0x804, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_2_1, 0x804, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_EastKeyLever_bottom, 0x804, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_EastKeyLever_top, 0x804, 1, 1 gAreaRoomMap_FortressOfWinds_3:: @ 081058E4 - map_bottom offset_gAreaRoomMap_FortressOfWinds_3_0, 0x1DC, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_3_1, 0x1DC, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_PitPlatforms_bottom, 0x1DC, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_PitPlatforms_top, 0x1DC, 1, 1 gAreaRoomMap_FortressOfWinds_4:: @ 081058FC - map_bottom offset_gAreaRoomMap_FortressOfWinds_4_0, 0x364, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_4_1, 0x364, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_WestKeyLever_bottom, 0x364, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_WestKeyLever_top, 0x364, 1, 1 gAreaRoomMap_FortressOfWinds_5:: @ 08105914 - map_bottom offset_gAreaRoomMap_FortressOfWinds_5_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_5_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_DarknutRoom_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_DarknutRoom_top, 0x1BA, 1, 1 gAreaRoomMap_FortressOfWinds_6:: @ 0810592C - map_bottom offset_gAreaRoomMap_FortressOfWinds_6_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_6_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_top, 0x1BA, 1, 1 gAreaRoomMap_FortressOfWinds_7:: @ 08105944 - map_bottom offset_gAreaRoomMap_FortressOfWinds_7_0, 0x374, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_7_1, 0x374, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_NorthSplitPathPit_bottom, 0x374, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_NorthSplitPathPit_top, 0x374, 1, 1 gAreaRoomMap_FortressOfWinds_8:: @ 0810595C - map_bottom offset_gAreaRoomMap_FortressOfWinds_8_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_8_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_WallmasterMinishPortal_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_WallmasterMinishPortal_top, 0x1BA, 1, 1 gAreaRoomMap_FortressOfWinds_9:: @ 08105974 - map_bottom offset_gAreaRoomMap_FortressOfWinds_9_0, 0x374, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_9_1, 0x374, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_PillarCloneButtons_bottom, 0x374, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_PillarCloneButtons_top, 0x374, 1, 1 gAreaRoomMap_FortressOfWinds_10:: @ 0810598C - map_bottom offset_gAreaRoomMap_FortressOfWinds_10_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_10_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_RotatingSpikeTraps_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_RotatingSpikeTraps_top, 0x1BA, 1, 1 gAreaRoomMap_FortressOfWinds_11:: @ 081059A4 - map_bottom offset_gAreaRoomMap_FortressOfWinds_11_0, 0x256, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_11_1, 0x256, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_Mazaal_bottom, 0x256, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_Mazaal_top, 0x256, 1, 1 gAreaRoomMap_FortressOfWinds_12:: @ 081059BC - map_bottom offset_gAreaRoomMap_FortressOfWinds_12_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_12_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_Stalfos_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_Stalfos_top, 0x1BA, 1, 1 gAreaRoomMap_FortressOfWinds_13:: @ 081059D4 - map_bottom offset_gAreaRoomMap_FortressOfWinds_13_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_13_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_top, 0x1BA, 1, 1 gAreaRoomMap_FortressOfWinds_14:: @ 081059EC - map_bottom offset_gAreaRoomMap_FortressOfWinds_14_0, 0x374, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_14_1, 0x374, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_Main2f_bottom, 0x374, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_Main2f_top, 0x374, 1, 1 gAreaRoomMap_FortressOfWinds_15:: @ 08105A04 - map_bottom offset_gAreaRoomMap_FortressOfWinds_15_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_15_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_MinishHole_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_MinishHole_top, 0x1BA, 1, 1 gAreaRoomMap_FortressOfWinds_16:: @ 08105A1C - map_bottom offset_gAreaRoomMap_FortressOfWinds_16_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_16_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_BossKey_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_BossKey_top, 0x1BA, 1, 1 gAreaRoomMap_FortressOfWinds_17:: @ 08105A34 - map_bottom offset_gAreaRoomMap_FortressOfWinds_17_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_17_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_WestStairs2f_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_WestStairs2f_top, 0x1BA, 1, 1 gAreaRoomMap_FortressOfWinds_18:: @ 08105A4C - map_bottom offset_gAreaRoomMap_FortressOfWinds_18_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_18_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_EastStairs2f_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_EastStairs2f_top, 0x1BA, 1, 1 gAreaRoomMap_FortressOfWinds_19:: @ 08105A64 - map_bottom offset_gAreaRoomMap_FortressOfWinds_19_0, 0x186, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_19_1, 0x186, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_WestStairs1f_bottom, 0x186, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_WestStairs1f_top, 0x186, 1, 1 gAreaRoomMap_FortressOfWinds_20:: @ 08105A7C - map_bottom offset_gAreaRoomMap_FortressOfWinds_20_0, 0x186, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_20_1, 0x186, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_CenterStairs1f_bottom, 0x186, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_CenterStairs1f_top, 0x186, 1, 1 gAreaRoomMap_FortressOfWinds_21:: @ 08105A94 - map_bottom offset_gAreaRoomMap_FortressOfWinds_21_0, 0x186, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_21_1, 0x186, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_EastStairs1f_bottom, 0x186, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_EastStairs1f_top, 0x186, 1, 1 gAreaRoomMap_FortressOfWinds_22:: @ 08105AAC - map_bottom offset_gAreaRoomMap_FortressOfWinds_22_0, 0x186, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_22_1, 0x186, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_Wizzrobe_bottom, 0x186, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_Wizzrobe_top, 0x186, 1, 1 gAreaRoomMap_FortressOfWinds_23:: @ 08105AC4 - map_bottom offset_gAreaRoomMap_FortressOfWinds_23_0, 0x1A0, 1 - map_top offset_gAreaRoomMap_FortressOfWinds_23_1, 0x1A0, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWinds_HeartPiece_bottom, 0x1A0, 1 + map_top offset_gAreaRoomMap_FortressOfWinds_HeartPiece_top, 0x1A0, 1, 1 gAreaRoomMaps_FortressOfWinds:: @ 08105ADC .4byte gAreaRoomMap_FortressOfWinds_0 @@ -1996,187 +1996,187 @@ gAreaRoomMaps_FortressOfWinds:: @ 08105ADC .4byte gAreaRoomMap_FortressOfWinds_23 gAreaRoomMap_FortressOfWindsTop_0:: @ 08105B70 - map_bottom offset_gAreaRoomMap_FortressOfWindsTop_0_0, 0x4B0, 1 - map_top offset_gAreaRoomMap_FortressOfWindsTop_0_1, 0x4B0, 1, 1 + map_bottom offset_gAreaRoomMap_FortressOfWindsTop_Main_bottom, 0x4B0, 1 + map_top offset_gAreaRoomMap_FortressOfWindsTop_Main_top, 0x4B0, 1, 1 gAreaRoomMaps_FortressOfWindsTop:: @ 08105B88 .4byte gAreaRoomMap_FortressOfWindsTop_0 gAreaRoomMap_InnerMazaal_0:: @ 08105B8C - map_bottom offset_gAreaRoomMap_InnerMazaal_0_0, 0x286, 1 - map_top offset_gAreaRoomMap_InnerMazaal_0_1, 0x286, 1, 1 + map_bottom offset_gAreaRoomMap_InnerMazaal_Main_bottom, 0x286, 1 + map_top offset_gAreaRoomMap_InnerMazaal_Main_top, 0x286, 1, 1 gAreaRoomMap_InnerMazaal_1:: @ 08105BA4 - map_bottom offset_gAreaRoomMap_InnerMazaal_1_0, 0x286, 1 - map_top offset_gAreaRoomMap_InnerMazaal_1_1, 0x286, 1, 1 + map_bottom offset_gAreaRoomMap_InnerMazaal_Phase1_bottom, 0x286, 1 + map_top offset_gAreaRoomMap_InnerMazaal_Phase1_top, 0x286, 1, 1 gAreaRoomMaps_InnerMazaal:: @ 08105BBC .4byte gAreaRoomMap_InnerMazaal_0 .4byte gAreaRoomMap_InnerMazaal_1 gAreaRoomMap_TempleOfDroplets_0:: @ 08105BC4 - map_bottom offset_gAreaRoomMap_TempleOfDroplets_0_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_0_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_WestHole_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_WestHole_top, 0x1BA, 1, 1 gAreaRoomMap_TempleOfDroplets_1:: @ 08105BDC - map_bottom offset_gAreaRoomMap_TempleOfDroplets_1_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_1_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_NorthSplitRoom_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_NorthSplitRoom_top, 0x1BA, 1, 1 gAreaRoomMap_TempleOfDroplets_2:: @ 08105BF4 - map_bottom offset_gAreaRoomMap_TempleOfDroplets_2_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_2_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_EastHole_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_EastHole_top, 0x1BA, 1, 1 gAreaRoomMap_TempleOfDroplets_3:: @ 08105C0C - map_bottom offset_gAreaRoomMap_TempleOfDroplets_3_0, 0x6B4, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_3_1, 0x6B4, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_Entrance_bottom, 0x6B4, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_Entrance_top, 0x6B4, 1, 1 gAreaRoomMap_TempleOfDroplets_4:: @ 08105C24 - map_bottom offset_gAreaRoomMap_TempleOfDroplets_4_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_4_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_NorthwestStairs_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_NorthwestStairs_top, 0x1BA, 1, 1 gAreaRoomMap_TempleOfDroplets_5:: @ 08105C3C - map_bottom offset_gAreaRoomMap_TempleOfDroplets_5_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_5_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_ScissorsMiniboss_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_ScissorsMiniboss_top, 0x1BA, 1, 1 gAreaRoomMap_TempleOfDroplets_6:: @ 08105C54 - map_bottom offset_gAreaRoomMap_TempleOfDroplets_6_0, 0x30C, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_6_1, 0x30C, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_WaterfallNorthwest_bottom, 0x30C, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_WaterfallNorthwest_top, 0x30C, 1, 1 gAreaRoomMap_TempleOfDroplets_7:: @ 08105C6C - map_bottom offset_gAreaRoomMap_TempleOfDroplets_7_0, 0x374, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_7_1, 0x374, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_WaterfallNortheast_bottom, 0x374, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_WaterfallNortheast_top, 0x374, 1, 1 gAreaRoomMap_TempleOfDroplets_8:: @ 08105C84 - map_bottom offset_gAreaRoomMap_TempleOfDroplets_8_0, 0x948, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_8_1, 0x948, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_Element_bottom, 0x948, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_Element_top, 0x948, 1, 1 gAreaRoomMap_TempleOfDroplets_9:: @ 08105C9C - map_bottom offset_gAreaRoomMap_TempleOfDroplets_9_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_9_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_IceCorner_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_IceCorner_top, 0x1BA, 1, 1 gAreaRoomMap_TempleOfDroplets_10:: @ 08105CB4 - map_bottom offset_gAreaRoomMap_TempleOfDroplets_10_0, 0x492, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_10_1, 0x492, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_IcePitMaze_bottom, 0x492, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_IcePitMaze_top, 0x492, 1, 1 gAreaRoomMap_TempleOfDroplets_11:: @ 08105CCC - map_bottom offset_gAreaRoomMap_TempleOfDroplets_11_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_11_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_HoleToBlueChuKey_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_HoleToBlueChuKey_top, 0x1BA, 1, 1 gAreaRoomMap_TempleOfDroplets_12:: @ 08105CE4 - map_bottom offset_gAreaRoomMap_TempleOfDroplets_12_0, 0x186, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_12_1, 0x186, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_bottom, 0x186, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_top, 0x186, 1, 1 gAreaRoomMap_TempleOfDroplets_13:: @ 08105CFC - map_bottom offset_gAreaRoomMap_TempleOfDroplets_13_0, 0x374, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_13_1, 0x374, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_bottom, 0x374, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_top, 0x374, 1, 1 gAreaRoomMap_TempleOfDroplets_14:: @ 08105D14 - map_bottom offset_gAreaRoomMap_TempleOfDroplets_14_0, 0x420, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_14_1, 0x420, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_BigOcto_bottom, 0x420, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_BigOcto_top, 0x420, 1, 1 gAreaRoomMap_TempleOfDroplets_15:: @ 08105D2C - map_bottom offset_gAreaRoomMap_TempleOfDroplets_15_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_15_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_ToBlueChu_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_ToBlueChu_top, 0x1BA, 1, 1 gAreaRoomMap_TempleOfDroplets_16:: @ 08105D44 - map_bottom offset_gAreaRoomMap_TempleOfDroplets_16_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_16_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_BlueChu_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_BlueChu_top, 0x1BA, 1, 1 gAreaRoomMap_TempleOfDroplets_17:: @ 08105D5C - map_bottom offset_gAreaRoomMap_TempleOfDroplets_17_0, 0x186, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_17_1, 0x186, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_BlueChuKey_bottom, 0x186, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_BlueChuKey_top, 0x186, 1, 1 gAreaRoomMap_TempleOfDroplets_18:: @ 08105D74 - map_bottom offset_gAreaRoomMap_TempleOfDroplets_18_0, 0x374, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_18_1, 0x374, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_BossKey_bottom, 0x374, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_BossKey_top, 0x374, 1, 1 gAreaRoomMap_TempleOfDroplets_19:: @ 08105D8C - map_bottom offset_gAreaRoomMap_TempleOfDroplets_19_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_19_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_NorthSmallKey_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_NorthSmallKey_top, 0x1BA, 1, 1 gAreaRoomMap_TempleOfDroplets_20:: @ 08105DA4 - map_bottom offset_gAreaRoomMap_TempleOfDroplets_20_0, 0x35A, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_20_1, 0x35A, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_BlockCloneButtonPuzzle_bottom, 0x35A, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_BlockCloneButtonPuzzle_top, 0x35A, 1, 1 gAreaRoomMap_TempleOfDroplets_21:: @ 08105DBC - map_bottom offset_gAreaRoomMap_TempleOfDroplets_21_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_21_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_BlockClonePuzzle_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_BlockClonePuzzle_top, 0x1BA, 1, 1 gAreaRoomMap_TempleOfDroplets_22:: @ 08105DD4 - map_bottom offset_gAreaRoomMap_TempleOfDroplets_22_0, 0x374, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_22_1, 0x374, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_BlockCloneIceBridge_bottom, 0x374, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_BlockCloneIceBridge_top, 0x374, 1, 1 gAreaRoomMap_TempleOfDroplets_23:: @ 08105DEC - map_bottom offset_gAreaRoomMap_TempleOfDroplets_23_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_23_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_top, 0x1BA, 1, 1 gAreaRoomMap_TempleOfDroplets_24:: @ 08105E04 - map_bottom offset_gAreaRoomMap_TempleOfDroplets_24_0, 0x4B0, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_24_1, 0x4B0, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_bottom, 0x4B0, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_top, 0x4B0, 1, 1 gAreaRoomMap_TempleOfDroplets_25:: @ 08105E1C - map_bottom offset_gAreaRoomMap_TempleOfDroplets_25_0, 0x1A4, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_25_1, 0x1A4, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_9Lanterns_bottom, 0x1A4, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_9Lanterns_top, 0x1A4, 1, 1 gAreaRoomMap_TempleOfDroplets_26:: @ 08105E34 - map_bottom offset_gAreaRoomMap_TempleOfDroplets_26_0, 0xA0E, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_26_1, 0xA0E, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_LilypadIceBlocks_bottom, 0xA0E, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_LilypadIceBlocks_top, 0xA0E, 1, 1 gAreaRoomMap_TempleOfDroplets_27:: @ 08105E4C - map_bottom offset_gAreaRoomMap_TempleOfDroplets_27_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_27_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_29_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_29_top, 0x1BA, 1, 1 gAreaRoomMap_TempleOfDroplets_28:: @ 08105E64 - map_bottom offset_gAreaRoomMap_TempleOfDroplets_28_0, 0x186, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_28_1, 0x186, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_MulldozersFireBars_bottom, 0x186, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_MulldozersFireBars_top, 0x186, 1, 1 gAreaRoomMap_TempleOfDroplets_29:: @ 08105E7C - map_bottom offset_gAreaRoomMap_TempleOfDroplets_29_0, 0x492, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_29_1, 0x492, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_DarkMaze_bottom, 0x492, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_DarkMaze_top, 0x492, 1, 1 gAreaRoomMap_TempleOfDroplets_30:: @ 08105E94 - map_bottom offset_gAreaRoomMap_TempleOfDroplets_30_0, 0x186, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_30_1, 0x186, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_TwinMadderpillars_bottom, 0x186, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_TwinMadderpillars_top, 0x186, 1, 1 gAreaRoomMap_TempleOfDroplets_31:: @ 08105EAC - map_bottom offset_gAreaRoomMap_TempleOfDroplets_31_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_31_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_AfterTwinMadderpillars_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_AfterTwinMadderpillars_top, 0x1BA, 1, 1 gAreaRoomMap_TempleOfDroplets_32:: @ 08105EC4 - map_bottom offset_gAreaRoomMap_TempleOfDroplets_32_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_32_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_top, 0x1BA, 1, 1 gAreaRoomMap_TempleOfDroplets_33:: @ 08105EDC - map_bottom offset_gAreaRoomMap_TempleOfDroplets_33_0, 0x186, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_33_1, 0x186, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_MulldozerKey_bottom, 0x186, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_MulldozerKey_top, 0x186, 1, 1 gAreaRoomMap_TempleOfDroplets_34:: @ 08105EF4 - map_bottom offset_gAreaRoomMap_TempleOfDroplets_34_0, 0x186, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_34_1, 0x186, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_BeforeTwinMadderpillars_bottom, 0x186, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_BeforeTwinMadderpillars_top, 0x186, 1, 1 gAreaRoomMap_TempleOfDroplets_35:: @ 08105F0C - map_bottom offset_gAreaRoomMap_TempleOfDroplets_35_0, 0x396, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_35_1, 0x396, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_LilypadB2West_bottom, 0x396, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_LilypadB2West_top, 0x396, 1, 1 gAreaRoomMap_TempleOfDroplets_36:: @ 08105F24 - map_bottom offset_gAreaRoomMap_TempleOfDroplets_36_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_36_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_Compass_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_Compass_top, 0x1BA, 1, 1 gAreaRoomMap_TempleOfDroplets_37:: @ 08105F3C - map_bottom offset_gAreaRoomMap_TempleOfDroplets_37_0, 0x186, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_37_1, 0x186, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_DarkScissorBeetles_bottom, 0x186, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_DarkScissorBeetles_top, 0x186, 1, 1 gAreaRoomMap_TempleOfDroplets_38:: @ 08105F54 - map_bottom offset_gAreaRoomMap_TempleOfDroplets_38_0, 0x39C, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_38_1, 0x39C, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_LilypadB2Middle_bottom, 0x39C, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_LilypadB2Middle_top, 0x39C, 1, 1 gAreaRoomMap_TempleOfDroplets_39:: @ 08105F6C - map_bottom offset_gAreaRoomMap_TempleOfDroplets_39_0, 0x1DC, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_39_1, 0x1DC, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_IceMadderpillar_bottom, 0x1DC, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_IceMadderpillar_top, 0x1DC, 1, 1 gAreaRoomMap_TempleOfDroplets_40:: @ 08105F84 - map_bottom offset_gAreaRoomMap_TempleOfDroplets_40_0, 0x1A0, 1 - map_top offset_gAreaRoomMap_TempleOfDroplets_40_1, 0x1A0, 1, 1 + map_bottom offset_gAreaRoomMap_TempleOfDroplets_FlamebarBlockPuzzle_bottom, 0x1A0, 1 + map_top offset_gAreaRoomMap_TempleOfDroplets_FlamebarBlockPuzzle_top, 0x1A0, 1, 1 gAreaRoomMaps_TempleOfDroplets:: @ 08105F9C .4byte gAreaRoomMap_TempleOfDroplets_0 @@ -2236,55 +2236,55 @@ gAreaRoomMaps_TempleOfDroplets:: @ 08105F9C .4byte gAreaRoomMap_TempleOfDroplets_40 gAreaRoomMap_61_0:: @ 08106078 - map_bottom offset_gAreaRoomMap_61_0_0, 0x1C2, 1 - map_top offset_gAreaRoomMap_61_0_1, 0x1C2, 1, 1 + map_bottom offset_gAreaRoomMap_Null61_0_bottom, 0x1C2, 1 + map_top offset_gAreaRoomMap_Null61_0_top, 0x1C2, 1, 1 gAreaRoomMaps_61:: @ 08106090 .4byte gAreaRoomMap_61_0 gAreaRoomMap_HyruleTownMinishCaves_0:: @ 08106094 - map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_0_0, 0x330, 1 - map_top offset_gAreaRoomMap_HyruleTownMinishCaves_0_1, 0x330, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_0_bottom, 0x330, 1 + map_top offset_gAreaRoomMap_HyruleTownMinishCaves_0_top, 0x330, 1, 1 gAreaRoomMap_HyruleTownMinishCaves_1:: @ 081060AC - map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_1_0, 0x2D0, 1 - map_top offset_gAreaRoomMap_HyruleTownMinishCaves_1_1, 0x2D0, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_1_bottom, 0x2D0, 1 + map_top offset_gAreaRoomMap_HyruleTownMinishCaves_1_top, 0x2D0, 1, 1 gAreaRoomMap_HyruleTownMinishCaves_2:: @ 081060C4 - map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_2_0, 0x242, 1 - map_top offset_gAreaRoomMap_HyruleTownMinishCaves_2_1, 0x242, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_2_bottom, 0x242, 1 + map_top offset_gAreaRoomMap_HyruleTownMinishCaves_2_top, 0x242, 1, 1 gAreaRoomMap_HyruleTownMinishCaves_3:: @ 081060DC - map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_3_0, 0x1FE, 1 - map_top offset_gAreaRoomMap_HyruleTownMinishCaves_3_1, 0x1FE, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_3_bottom, 0x1FE, 1 + map_top offset_gAreaRoomMap_HyruleTownMinishCaves_3_top, 0x1FE, 1, 1 gAreaRoomMap_HyruleTownMinishCaves_4:: @ 081060F4 - map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_4_0, 0x1C2, 1 - map_top offset_gAreaRoomMap_HyruleTownMinishCaves_4_1, 0x1C2, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_4_bottom, 0x1C2, 1 + map_top offset_gAreaRoomMap_HyruleTownMinishCaves_4_top, 0x1C2, 1, 1 gAreaRoomMap_HyruleTownMinishCaves_5:: @ 0810610C - map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_5_0, 0x222, 1 - map_top offset_gAreaRoomMap_HyruleTownMinishCaves_5_1, 0x222, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_Unused10_bottom, 0x222, 1 + map_top offset_gAreaRoomMap_HyruleTownMinishCaves_Unused10_top, 0x222, 1, 1 gAreaRoomMap_HyruleTownMinishCaves_6:: @ 08106124 - map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_6_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_HyruleTownMinishCaves_6_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_6_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_HyruleTownMinishCaves_6_top, 0x1BA, 1, 1 gAreaRoomMap_HyruleTownMinishCaves_7:: @ 0810613C - map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_7_0, 0x186, 1 - map_top offset_gAreaRoomMap_HyruleTownMinishCaves_7_1, 0x186, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_7_bottom, 0x186, 1 + map_top offset_gAreaRoomMap_HyruleTownMinishCaves_7_top, 0x186, 1, 1 gAreaRoomMap_HyruleTownMinishCaves_8:: @ 08106154 - map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_8_0, 0x24C, 1 - map_top offset_gAreaRoomMap_HyruleTownMinishCaves_8_1, 0x24C, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_8_bottom, 0x24C, 1 + map_top offset_gAreaRoomMap_HyruleTownMinishCaves_8_top, 0x24C, 1, 1 gAreaRoomMap_HyruleTownMinishCaves_9:: @ 0810616C - map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_9_0, 0x1DC, 1 - map_top offset_gAreaRoomMap_HyruleTownMinishCaves_9_1, 0x1DC, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_9_bottom, 0x1DC, 1 + map_top offset_gAreaRoomMap_HyruleTownMinishCaves_9_top, 0x1DC, 1, 1 gAreaRoomMap_HyruleTownMinishCaves_10:: @ 08106184 - map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_10_0, 0x348, 1 - map_top offset_gAreaRoomMap_HyruleTownMinishCaves_10_1, 0x348, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleTownMinishCaves_10_bottom, 0x348, 1 + map_top offset_gAreaRoomMap_HyruleTownMinishCaves_10_top, 0x348, 1, 1 gAreaRoomMaps_HyruleTownMinishCaves:: @ 0810619C .4byte gAreaRoomMap_HyruleTownMinishCaves_0 @@ -2311,40 +2311,40 @@ gAreaRoomMaps_HyruleTownMinishCaves:: @ 0810619C .4byte gAreaRoomMap_HyruleTownMinishCaves_10 gAreaRoomMap_RoyalCrypt_0:: @ 081061F4 - map_bottom offset_gAreaRoomMap_RoyalCrypt_0_0, 0x532, 1 - map_top offset_gAreaRoomMap_RoyalCrypt_0_1, 0x532, 1, 1 + map_bottom offset_gAreaRoomMap_RoyalCrypt_0_bottom, 0x532, 1 + map_top offset_gAreaRoomMap_RoyalCrypt_0_top, 0x532, 1, 1 gAreaRoomMap_RoyalCrypt_1:: @ 0810620C - map_bottom offset_gAreaRoomMap_RoyalCrypt_1_0, 0x1DC, 1 - map_top offset_gAreaRoomMap_RoyalCrypt_1_1, 0x1DC, 1, 1 + map_bottom offset_gAreaRoomMap_RoyalCrypt_WaterRope_bottom, 0x1DC, 1 + map_top offset_gAreaRoomMap_RoyalCrypt_WaterRope_top, 0x1DC, 1, 1 gAreaRoomMap_RoyalCrypt_2:: @ 08106224 - map_bottom offset_gAreaRoomMap_RoyalCrypt_2_0, 0x348, 1 - map_top offset_gAreaRoomMap_RoyalCrypt_2_1, 0x348, 1, 1 + map_bottom offset_gAreaRoomMap_RoyalCrypt_Gibdo_bottom, 0x348, 1 + map_top offset_gAreaRoomMap_RoyalCrypt_Gibdo_top, 0x348, 1, 1 gAreaRoomMap_RoyalCrypt_3:: @ 0810623C - map_bottom offset_gAreaRoomMap_RoyalCrypt_3_0, 0x2F4, 1 - map_top offset_gAreaRoomMap_RoyalCrypt_3_1, 0x2F4, 1, 1 + map_bottom offset_gAreaRoomMap_RoyalCrypt_3_bottom, 0x2F4, 1 + map_top offset_gAreaRoomMap_RoyalCrypt_3_top, 0x2F4, 1, 1 gAreaRoomMap_RoyalCrypt_4:: @ 08106254 - map_bottom offset_gAreaRoomMap_RoyalCrypt_4_0, 0x6F0, 1 - map_top offset_gAreaRoomMap_RoyalCrypt_4_1, 0x6F0, 1, 1 + map_bottom offset_gAreaRoomMap_RoyalCrypt_KeyBlock_bottom, 0x6F0, 1 + map_top offset_gAreaRoomMap_RoyalCrypt_KeyBlock_top, 0x6F0, 1, 1 gAreaRoomMap_RoyalCrypt_5:: @ 0810626C - map_bottom offset_gAreaRoomMap_RoyalCrypt_5_0, 0x2E4, 1 - map_top offset_gAreaRoomMap_RoyalCrypt_5_1, 0x2E4, 1, 1 + map_bottom offset_gAreaRoomMap_RoyalCrypt_5_bottom, 0x2E4, 1 + map_top offset_gAreaRoomMap_RoyalCrypt_5_top, 0x2E4, 1, 1 gAreaRoomMap_RoyalCrypt_6:: @ 08106284 - map_bottom offset_gAreaRoomMap_RoyalCrypt_6_0, 0x2E4, 1 - map_top offset_gAreaRoomMap_RoyalCrypt_6_1, 0x2E4, 1, 1 + map_bottom offset_gAreaRoomMap_RoyalCrypt_6_bottom, 0x2E4, 1 + map_top offset_gAreaRoomMap_RoyalCrypt_6_top, 0x2E4, 1, 1 gAreaRoomMap_RoyalCrypt_7:: @ 0810629C - map_bottom offset_gAreaRoomMap_RoyalCrypt_7_0, 0x2EC, 1 - map_top offset_gAreaRoomMap_RoyalCrypt_7_1, 0x2EC, 1, 1 + map_bottom offset_gAreaRoomMap_RoyalCrypt_MushroomPit_bottom, 0x2EC, 1 + map_top offset_gAreaRoomMap_RoyalCrypt_MushroomPit_top, 0x2EC, 1, 1 gAreaRoomMap_RoyalCrypt_8:: @ 081062B4 - map_bottom offset_gAreaRoomMap_RoyalCrypt_8_0, 0x154, 1 - map_top offset_gAreaRoomMap_RoyalCrypt_8_1, 0x154, 1, 1 + map_bottom offset_gAreaRoomMap_RoyalCrypt_Entrance_bottom, 0x154, 1 + map_top offset_gAreaRoomMap_RoyalCrypt_Entrance_top, 0x154, 1, 1 gAreaRoomMaps_RoyalCrypt:: @ 081062CC .4byte gAreaRoomMap_RoyalCrypt_0 @@ -2365,208 +2365,208 @@ gAreaRoomMaps_RoyalCrypt:: @ 081062CC .4byte 0x0 gAreaRoomMap_PalaceOfWinds_GyorgTornado:: @ 0810630C - map_bottom offset_gAreaRoomMap_PalaceOfWinds_GyorgTornado_0, 0xA8C, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_GyorgTornado_1, 0xA8C, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_GyorgTornado_bottom, 0xA8C, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_GyorgTornado_top, 0xA8C, 1, 1 gAreaRoomMap_PalaceOfWinds_BossKey:: @ 08106324 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_BossKey_0, 0x12C, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_BossKey_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_BossKey_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_BossKey_top, 0x12C, 1, 1 gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers:: @ 0810633C - map_bottom offset_gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_0, 0x1A4, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_1, 0x1A4, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_bottom, 0x1A4, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_BeforeBallAndChainSoldiers_top, 0x1A4, 1, 1 gAreaRoomMap_PalaceOfWinds_GyorgBossDoor:: @ 08106354 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_0, 0x384, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_1, 0x384, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_bottom, 0x384, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_GyorgBossDoor_top, 0x384, 1, 1 gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor:: @ 0810636C - map_bottom offset_gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_0, 0x12C, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_EastChestFromGyorgBossDoor_top, 0x12C, 1, 1 gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight:: @ 08106384 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_0, 0x384, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_1, 0x384, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_bottom, 0x384, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_MoblinAndWizzrobeFight_top, 0x384, 1, 1 gAreaRoomMap_PalaceOfWinds_FourButtonStalfos:: @ 0810639C - map_bottom offset_gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_0, 0x384, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_1, 0x384, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_bottom, 0x384, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_FourButtonStalfos_top, 0x384, 1, 1 gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey:: @ 081063B4 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_0, 0x384, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_1, 0x384, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_bottom, 0x384, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_FanAndKeyToBossKey_top, 0x384, 1, 1 gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers:: @ 081063CC - map_bottom offset_gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_0, 0x258, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_1, 0x258, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_bottom, 0x258, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_BallAndChainSoldiers_top, 0x258, 1, 1 gAreaRoomMap_PalaceOfWinds_BombarossaPath:: @ 081063E4 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_BombarossaPath_0, 0x12C, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_BombarossaPath_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_BombarossaPath_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_BombarossaPath_top, 0x12C, 1, 1 gAreaRoomMap_PalaceOfWinds_HoleToDarknut:: @ 081063FC - map_bottom offset_gAreaRoomMap_PalaceOfWinds_HoleToDarknut_0, 0x186, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_HoleToDarknut_1, 0x186, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_HoleToDarknut_bottom, 0x186, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_HoleToDarknut_top, 0x186, 1, 1 gAreaRoomMap_PalaceOfWinds_ToBombarossaPath:: @ 08106414 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_0, 0x12C, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_ToBombarossaPath_top, 0x12C, 1, 1 gAreaRoomMap_PalaceOfWinds_DarknutMiniboss:: @ 0810642C - map_bottom offset_gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_0, 0x1E0, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_1, 0x1E0, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_bottom, 0x1E0, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_DarknutMiniboss_top, 0x1E0, 1, 1 gAreaRoomMap_PalaceOfWinds_BombWallInside:: @ 08106444 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_BombWallInside_0, 0x12C, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_BombWallInside_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_BombWallInside_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_BombWallInside_top, 0x12C, 1, 1 gAreaRoomMap_PalaceOfWinds_BombWallOutside:: @ 0810645C - map_bottom offset_gAreaRoomMap_PalaceOfWinds_BombWallOutside_0, 0x258, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_BombWallOutside_1, 0x258, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_BombWallOutside_bottom, 0x258, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_BombWallOutside_top, 0x258, 1, 1 gAreaRoomMap_PalaceOfWinds_CloudJumps:: @ 08106474 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_CloudJumps_0, 0x708, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_CloudJumps_1, 0x708, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_CloudJumps_bottom, 0x708, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_CloudJumps_top, 0x708, 1, 1 gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor:: @ 0810648C - map_bottom offset_gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_0, 0xA8C, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_1, 0xA8C, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_bottom, 0xA8C, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_BlockMazeToBossDoor_top, 0xA8C, 1, 1 gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu:: @ 081064A4 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_0, 0x384, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_1, 0x384, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_bottom, 0x384, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_CrackedFloorLakitu_top, 0x384, 1, 1 gAreaRoomMap_PalaceOfWinds_HeartPieceBridge:: @ 081064BC - map_bottom offset_gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_0, 0x258, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_1, 0x258, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_bottom, 0x258, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_HeartPieceBridge_top, 0x258, 1, 1 gAreaRoomMap_PalaceOfWinds_FanBridge:: @ 081064D4 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_FanBridge_0, 0x4B0, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_FanBridge_1, 0x4B0, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_FanBridge_bottom, 0x4B0, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_FanBridge_top, 0x4B0, 1, 1 gAreaRoomMap_PalaceOfWinds_ToFanBridge:: @ 081064EC - map_bottom offset_gAreaRoomMap_PalaceOfWinds_ToFanBridge_0, 0x258, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_ToFanBridge_1, 0x258, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_ToFanBridge_bottom, 0x258, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_ToFanBridge_top, 0x258, 1, 1 gAreaRoomMap_PalaceOfWinds_RedWarpHall:: @ 08106504 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_RedWarpHall_0, 0x708, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_RedWarpHall_1, 0x708, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_RedWarpHall_bottom, 0x708, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_RedWarpHall_top, 0x708, 1, 1 gAreaRoomMap_PalaceOfWinds_PlatformCloneRide:: @ 0810651C - map_bottom offset_gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_0, 0x4B0, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_1, 0x4B0, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_bottom, 0x4B0, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_PlatformCloneRide_top, 0x4B0, 1, 1 gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey:: @ 08106534 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_0, 0x258, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_1, 0x258, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_bottom, 0x258, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_PitCornerAfterKey_top, 0x258, 1, 1 gAreaRoomMap_PalaceOfWinds_CrowRide:: @ 0810654C - map_bottom offset_gAreaRoomMap_PalaceOfWinds_CrowRide_0, 0x4B0, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_CrowRide_1, 0x4B0, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_PlatformCrowRide_bottom, 0x4B0, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_PlatformCrowRide_top, 0x4B0, 1, 1 gAreaRoomMap_PalaceOfWinds_GratePlatformRide:: @ 08106564 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_GratePlatformRide_0, 0x4B0, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_GratePlatformRide_1, 0x4B0, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_GratePlatformRide_bottom, 0x4B0, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_GratePlatformRide_top, 0x4B0, 1, 1 gAreaRoomMap_PalaceOfWinds_PotPush:: @ 0810657C - map_bottom offset_gAreaRoomMap_PalaceOfWinds_PotPush_0, 0x4B0, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_PotPush_1, 0x4B0, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_PotPush_bottom, 0x4B0, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_PotPush_top, 0x4B0, 1, 1 gAreaRoomMap_PalaceOfWinds_FloormasterLever:: @ 08106594 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_FloormasterLever_0, 0x12C, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_FloormasterLever_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_FloormasterLever_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_FloormasterLever_top, 0x12C, 1, 1 gAreaRoomMap_PalaceOfWinds_Map:: @ 081065AC - map_bottom offset_gAreaRoomMap_PalaceOfWinds_Map_0, 0x12C, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_Map_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_Map_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_Map_top, 0x12C, 1, 1 gAreaRoomMap_PalaceOfWinds_CornerToMap:: @ 081065C4 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_CornerToMap_0, 0x12C, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_CornerToMap_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_CornerToMap_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_CornerToMap_top, 0x12C, 1, 1 gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster:: @ 081065DC - map_bottom offset_gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_0, 0x12C, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_StairsAfterFloormaster_top, 0x12C, 1, 1 gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe:: @ 081065F4 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_0, 0x12C, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_HoleToKinstoneWizzrobe_top, 0x12C, 1, 1 gAreaRoomMap_PalaceOfWinds_KeyArrowButton:: @ 0810660C - map_bottom offset_gAreaRoomMap_PalaceOfWinds_KeyArrowButton_0, 0x12C, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_KeyArrowButton_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_KeyArrowButton_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_KeyArrowButton_top, 0x12C, 1, 1 gAreaRoomMap_PalaceOfWinds_GratesTo3F:: @ 08106624 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_GratesTo3F_0, 0xA8C, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_GratesTo3F_1, 0xA8C, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_GratesTo3f_bottom, 0xA8C, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_GratesTo3f_top, 0xA8C, 1, 1 gAreaRoomMap_PalaceOfWinds_SpinyFight:: @ 0810663C - map_bottom offset_gAreaRoomMap_PalaceOfWinds_SpinyFight_0, 0x708, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_SpinyFight_1, 0x708, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_SpinyFight_bottom, 0x708, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_SpinyFight_top, 0x708, 1, 1 gAreaRoomMap_PalaceOfWinds_PeahatSwitch:: @ 08106654 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_PeahatSwitch_0, 0x258, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_PeahatSwitch_1, 0x258, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_PeahatSwitch_bottom, 0x258, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_PeahatSwitch_top, 0x258, 1, 1 gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa:: @ 0810666C - map_bottom offset_gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_0, 0x4B0, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_1, 0x4B0, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_bottom, 0x4B0, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_WhirlwindBombarossa_top, 0x4B0, 1, 1 gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar:: @ 08106684 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_0, 0x12C, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_DoorToStalfosFirebar_top, 0x12C, 1, 1 gAreaRoomMap_PalaceOfWinds_StalfosFireborHole:: @ 0810669C - map_bottom offset_gAreaRoomMap_PalaceOfWinds_StalfosFireborHole_0, 0x12C, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_StalfosFireborHole_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_StalfosFirebarHole_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_StalfosFirebarHole_top, 0x12C, 1, 1 gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons:: @ 081066B4 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_0, 0x12C, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_ShortcutDoorButtons_top, 0x12C, 1, 1 gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch:: @ 081066CC - map_bottom offset_gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_0, 0x12C, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_ToPeahatSwitch_top, 0x12C, 1, 1 gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight:: @ 081066E4 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_0, 0x12C, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_KinstoneWizzrobeFight_top, 0x12C, 1, 1 gAreaRoomMap_PalaceOfWinds_GibdoStairs:: @ 081066FC - map_bottom offset_gAreaRoomMap_PalaceOfWinds_GibdoStairs_0, 0x12C, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_GibdoStairs_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_GibdoStairs_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_GibdoStairs_top, 0x12C, 1, 1 gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey:: @ 08106714 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_0, 0x258, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_1, 0x258, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_bottom, 0x258, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_SpikeBarSmallKey_top, 0x258, 1, 1 gAreaRoomMap_PalaceOfWinds_RocCape:: @ 0810672C - map_bottom offset_gAreaRoomMap_PalaceOfWinds_RocCape_0, 0x708, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_RocCape_1, 0x708, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_RocCape_bottom, 0x708, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_RocCape_top, 0x708, 1, 1 gAreaRoomMap_PalaceOfWinds_FireBarGrates:: @ 08106744 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_FireBarGrates_0, 0x708, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_FireBarGrates_1, 0x708, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_FireBarGrates_bottom, 0x708, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_FireBarGrates_top, 0x708, 1, 1 gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas:: @ 0810675C - map_bottom offset_gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_0, 0x550, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_1, 0x550, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_bottom, 0x550, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_PlatformRideBombarossas_top, 0x550, 1, 1 gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut:: @ 08106774 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_0, 0x12C, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_BridgeAfterDarknut_top, 0x12C, 1, 1 gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock:: @ 0810678C - map_bottom offset_gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_0, 0x500, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_1, 0x500, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_bottom, 0x500, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_BridgeSwitchesCloneBlock_top, 0x500, 1, 1 gAreaRoomMap_PalaceOfWinds_EntranceRoom:: @ 081067A4 - map_bottom offset_gAreaRoomMap_PalaceOfWinds_EntranceRoom_0, 0x3DE, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_EntranceRoom_1, 0x3DE, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_EntranceRoom_bottom, 0x3DE, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_EntranceRoom_top, 0x3DE, 1, 1 gAreaRoomMap_PalaceOfWinds_DarkCompassHall:: @ 081067BC - map_bottom offset_gAreaRoomMap_PalaceOfWinds_DarkCompassHall_0, 0x708, 1 - map_top offset_gAreaRoomMap_PalaceOfWinds_DarkCompassHall_1, 0x708, 1, 1 + map_bottom offset_gAreaRoomMap_PalaceOfWinds_DarkCompassHall_bottom, 0x708, 1 + map_top offset_gAreaRoomMap_PalaceOfWinds_DarkCompassHall_top, 0x708, 1, 1 gAreaRoomMaps_PalaceOfWinds:: @ 081067D4 .4byte gAreaRoomMap_PalaceOfWinds_GyorgTornado @@ -2622,21 +2622,21 @@ gAreaRoomMaps_PalaceOfWinds:: @ 081067D4 .4byte gAreaRoomMap_PalaceOfWinds_DarkCompassHall gAreaRoomMap_PalaceOfWindsBoss_0:: @ 081068A0 - map_top offset_gAreaRoomMap_PalaceOfWindsBoss_0_0, 0x1F80, 1, 1 + map_top offset_gAreaRoomMap_PalaceOfWindsBoss_0_top, 0x1F80, 1, 1 gAreaRoomMaps_PalaceOfWindsBoss:: @ 081068AC .4byte gAreaRoomMap_PalaceOfWindsBoss_0 gAreaRoomMap_Sanctuary_0:: @ 081068B0 - map_bottom offset_gAreaRoomMap_Sanctuary_0_0, 0x6D6, 1 - map_top offset_gAreaRoomMap_Sanctuary_0_1, 0x6D6, 1, 1 + map_bottom offset_gAreaRoomMap_Sanctuary_Hall_bottom, 0x6D6, 1 + map_top offset_gAreaRoomMap_Sanctuary_Hall_top, 0x6D6, 1, 1 gAreaRoomMap_Sanctuary_1:: @ 081068C8 - map_bottom offset_gAreaRoomMap_Sanctuary_1_0, 0x910, 1 - map_top offset_gAreaRoomMap_Sanctuary_1_1, 0x910, 1, 1 + map_bottom offset_gAreaRoomMap_Sanctuary_Main_bottom, 0x910, 1 + map_top offset_gAreaRoomMap_Sanctuary_Main_top, 0x910, 1, 1 gAreaRoomMap_Sanctuary_2:: @ 081068E0 - map_bottom offset_gAreaRoomMap_Sanctuary_2_0, 0x344, 1 - map_top offset_gAreaRoomMap_Sanctuary_2_1, 0x344, 1, 1 + map_bottom offset_gAreaRoomMap_Sanctuary_StainedGlass_bottom, 0x344, 1 + map_top offset_gAreaRoomMap_Sanctuary_StainedGlass_top, 0x344, 1, 1 gAreaRoomMaps_Sanctuary:: @ 081068F8 .4byte gAreaRoomMap_Sanctuary_0 @@ -2649,32 +2649,32 @@ gAreaRoomMaps_Sanctuary:: @ 081068F8 .4byte 0x0 gAreaRoomMap_HyruleCastle_0:: @ 08106918 - map_bottom offset_gAreaRoomMap_HyruleCastle_0_0, 0x7CE, 1 - map_top offset_gAreaRoomMap_HyruleCastle_0_1, 0x7CE, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleCastle_0_bottom, 0x7CE, 1 + map_top offset_gAreaRoomMap_HyruleCastle_0_top, 0x7CE, 1, 1 gAreaRoomMap_HyruleCastle_1:: @ 08106930 - map_bottom offset_gAreaRoomMap_HyruleCastle_1_0, 0x7FE, 1 - map_top offset_gAreaRoomMap_HyruleCastle_1_1, 0x7FE, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleCastle_1_bottom, 0x7FE, 1 + map_top offset_gAreaRoomMap_HyruleCastle_1_top, 0x7FE, 1, 1 gAreaRoomMap_HyruleCastle_2:: @ 08106948 - map_bottom offset_gAreaRoomMap_HyruleCastle_2_0, 0x2EC, 1 - map_top offset_gAreaRoomMap_HyruleCastle_2_1, 0x2EC, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleCastle_2_bottom, 0x2EC, 1 + map_top offset_gAreaRoomMap_HyruleCastle_2_top, 0x2EC, 1, 1 gAreaRoomMap_HyruleCastle_3:: @ 08106960 - map_bottom offset_gAreaRoomMap_HyruleCastle_3_0, 0xC94, 1 - map_top offset_gAreaRoomMap_HyruleCastle_3_1, 0xC94, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleCastle_3_bottom, 0xC94, 1 + map_top offset_gAreaRoomMap_HyruleCastle_3_top, 0xC94, 1, 1 gAreaRoomMap_HyruleCastle_4:: @ 08106978 - map_bottom offset_gAreaRoomMap_HyruleCastle_4_0, 0x1FE, 1 - map_top offset_gAreaRoomMap_HyruleCastle_4_1, 0x1FE, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleCastle_4_bottom, 0x1FE, 1 + map_top offset_gAreaRoomMap_HyruleCastle_4_top, 0x1FE, 1, 1 gAreaRoomMap_HyruleCastle_5:: @ 08106990 - map_bottom offset_gAreaRoomMap_HyruleCastle_5_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HyruleCastle_5_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleCastle_5_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HyruleCastle_5_top, 0x12C, 1, 1 gAreaRoomMap_HyruleCastle_6:: @ 081069A8 - map_bottom offset_gAreaRoomMap_HyruleCastle_6_0, 0x12C, 1 - map_top offset_gAreaRoomMap_HyruleCastle_6_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_HyruleCastle_6_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_HyruleCastle_6_top, 0x12C, 1, 1 gAreaRoomMaps_HyruleCastle:: @ 081069C0 .4byte gAreaRoomMap_HyruleCastle_0 @@ -2695,251 +2695,251 @@ gAreaRoomMaps_HyruleCastle:: @ 081069C0 .4byte 0x0 gAreaRoomMap_SanctuaryEntrance_0:: @ 08106A00 - map_bottom offset_gAreaRoomMap_SanctuaryEntrance_0_0, 0x396, 1 - map_top offset_gAreaRoomMap_SanctuaryEntrance_0_1, 0x396, 1, 1 + map_bottom offset_gAreaRoomMap_SanctuaryEntrance_Main_bottom, 0x396, 1 + map_top offset_gAreaRoomMap_SanctuaryEntrance_Main_top, 0x396, 1, 1 gAreaRoomMaps_SanctuaryEntrance:: @ 08106A18 .4byte gAreaRoomMap_SanctuaryEntrance_0 gAreaRoomMap_DarkHyruleCastle_1FEntrance:: @ 08106A1C - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FEntrance_0, 0xE58, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_1FEntrance_1, 0xE58, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fEntrance_bottom, 0xE58, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_1fEntrance_top, 0xE58, 1, 1 gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower:: @ 08106A34 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_3FTopLeftTower_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3fTopLeftTower_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_3fTopLeftTower_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_3FTopRightTower:: @ 08106A4C - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_3FTopRightTower_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3fTopRightTower_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_3fTopRightTower_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower:: @ 08106A64 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_3FBottomLeftTower_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3fBottomLeftTower_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_3fBottomLeftTower_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower:: @ 08106A7C - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_3FBottomRightTower_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3fBottomRightTower_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_3fBottomRightTower_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati:: @ 08106A94 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_0, 0x444, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati_1, 0x444, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3fKeatonHallToVaati_bottom, 0x444, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_3fKeatonHallToVaati_top, 0x444, 1, 1 gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut:: @ 08106AAC - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_0, 0x2A0, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_3FTripleDarknut_1, 0x2A0, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3fTripleDarknut_bottom, 0x2A0, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_3fTripleDarknut_top, 0x2A0, 1, 1 gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower:: @ 08106AC4 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_0, 0x374, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_2FTopLeftTower_1, 0x374, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fTopLeftTower_bottom, 0x374, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_2fTopLeftTower_top, 0x374, 1, 1 gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner:: @ 08106ADC - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_0, 0x374, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_2FTopLeftCorner_1, 0x374, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fTopLeftCorner_bottom, 0x374, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_2fTopLeftCorner_top, 0x374, 1, 1 gAreaRoomMap_DarkHyruleCastle_2FBossKey:: @ 08106AF4 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBossKey_0, 0x1FE, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBossKey_1, 0x1FE, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fBossKey_bottom, 0x1FE, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_2fBossKey_top, 0x1FE, 1, 1 gAreaRoomMap_DarkHyruleCastle_2FBlueWarp:: @ 08106B0C - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBlueWarp_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fBlueWarp_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_2fBlueWarp_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini:: @ 08106B24 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerGhini_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerGhini_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerGhini_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches:: @ 08106B3C - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightCornerTorches_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerTorches_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_2fTopRightCornerTorches_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_2FTopRightTower:: @ 08106B54 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightTower_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fTopRightTower_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_2fTopRightTower_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut:: @ 08106B6C - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_2FTopLeftDarknut_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fTopLeftDarknut_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_2fTopLeftDarknut_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_2FSparks:: @ 08106B84 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FSparks_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_2FSparks_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fSparks_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_2fSparks_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts:: @ 08106B9C - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_2FTopRightDarknuts_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fTopRightDarknuts_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_2fTopRightDarknuts_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_2FLeft:: @ 08106BB4 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FLeft_0, 0x2A8, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_2FLeft_1, 0x2A8, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fLeft_bottom, 0x2A8, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_2fLeft_top, 0x2A8, 1, 1 gAreaRoomMap_DarkHyruleCastle_2FRight:: @ 08106BCC - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FRight_0, 0x2A8, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_2FRight_1, 0x2A8, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fRight_bottom, 0x2A8, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_2fRight_top, 0x2A8, 1, 1 gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts:: @ 08106BE4 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftDarknuts_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fBottomLeftDarknuts_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_2fBottomLeftDarknuts_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_2FBossDoor:: @ 08106BFC - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBossDoor_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBossDoor_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fBossDoor_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_2fBossDoor_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut:: @ 08106C14 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBottomRightDarknut_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fBottomRightDarknut_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_2fBottomRightDarknut_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle:: @ 08106C2C - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCornerPuzzle_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fBottomLeftCornerPuzzle_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_2fBottomLeftCornerPuzzle_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_2FEntrance:: @ 08106C44 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FEntrance_0, 0x374, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_2FEntrance_1, 0x374, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fEntrance_bottom, 0x374, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_2fEntrance_top, 0x374, 1, 1 gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner:: @ 08106C5C - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_0, 0x374, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftCorner_1, 0x374, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fBottomRightCorner_bottom, 0x374, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_2fBottomRightCorner_top, 0x374, 1, 1 gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower:: @ 08106C74 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftTower_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fBottomLeftTower_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_2fBottomLeftTower_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini:: @ 08106C8C - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBottomLeftGhini_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fBottomLeftGhini_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_2fBottomLeftGhini_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7:: @ 08106CA4 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_3FTopRightTower7_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1b_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_1b_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_B1Entrance:: @ 08106CBC - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Entrance_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Entrance_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Entrance_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Entrance_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower:: @ 08106CD4 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_0, 0x374, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_2FBottomRightTower_1, 0x374, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_2fBottomRightTower_bottom, 0x374, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_2fBottomRightTower_top, 0x374, 1, 1 gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower:: @ 08106CEC - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_1FTopLeftTower_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fTopLeftTower_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_1fTopLeftTower_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_1FThroneRoom:: @ 08106D04 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_1FThroneRoom_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fThroneRoom_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_1fThroneRoom_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_1FCompass:: @ 08106D1C - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FCompass_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_1FCompass_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fCompass_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_1fCompass_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_1FTopRightTower:: @ 08106D34 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_1FTopRightTower_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fTopRightTower_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_1fTopRightTower_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone:: @ 08106D4C - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_1FBeforeThrone_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fBeforeThrone_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_1fBeforeThrone_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft:: @ 08106D64 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopTopLeft_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fLoopTopLeft_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_1fLoopTopLeft_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_1FLoopTop:: @ 08106D7C - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopTop_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopTop_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fLoopTop_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_1fLoopTop_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight:: @ 08106D94 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopTopRight_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_1FLoopLeft:: @ 08106DAC - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_0, 0x2A8, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopLeft_1, 0x2A8, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fLoopLeft_bottom, 0x2A8, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_1fLoopLeft_top, 0x2A8, 1, 1 gAreaRoomMap_DarkHyruleCastle_1FLoopRight:: @ 08106DC4 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopRight_0, 0x2A8, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopRight_1, 0x2A8, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fLoopRight_bottom, 0x2A8, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_1fLoopRight_top, 0x2A8, 1, 1 gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft:: @ 08106DDC - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopBottomLeft_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fLoopBottomLeft_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_1fLoopBottomLeft_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_1FLoopBottom:: @ 08106DF4 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopBottom_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fLoopBottom_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_1fLoopBottom_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight:: @ 08106E0C - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_1FLoopBottomRight_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower:: @ 08106E24 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_1FBottomLeftTower_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fBottomLeftTower_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_1fBottomLeftTower_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower:: @ 08106E3C - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_1FBottomRightTower_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_1fBottomRightTower_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_1fBottomRightTower_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_B1BelowThrone:: @ 08106E54 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_B1BelowThrone_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_B1BelowCompass:: @ 08106E6C - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_B1BelowCompass_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone:: @ 08106E84 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_B1BeforeThrone_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_B1ToPrison:: @ 08106E9C - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1ToPrison_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_B1ToPrison_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1ToPrison_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_B1ToPrison_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_B1BombWall:: @ 08106EB4 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1BombWall_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_B1BombWall_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1BombWall_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_B1BombWall_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_B1Keatons:: @ 08106ECC - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Keatons_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Keatons_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Keatons_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Keatons_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar:: @ 08106EE4 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_0, 0x2A8, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_1, 0x2A8, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_bottom, 0x2A8, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_top, 0x2A8, 1, 1 gAreaRoomMap_DarkHyruleCastle_B1Cannons:: @ 08106EFC - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Cannons_0, 0x2A8, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Cannons_1, 0x2A8, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Cannons_bottom, 0x2A8, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Cannons_top, 0x2A8, 1, 1 gAreaRoomMap_DarkHyruleCastle_B1Left:: @ 08106F14 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Left_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Left_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Left_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Left_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_B1Right:: @ 08106F2C - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Right_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Right_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Right_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Right_top, 0x1BA, 1, 1 gAreaRoomMap_DarkHyruleCastle_B1Map:: @ 08106F44 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Map_0, 0xA5C, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Map_1, 0xA5C, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B1Map_bottom, 0xA5C, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_B1Map_top, 0xA5C, 1, 1 gAreaRoomMap_DarkHyruleCastle_B2ToPrison:: @ 08106F5C - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B2ToPrison_0, 0x1FE, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_B2ToPrison_1, 0x1FE, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B2ToPrison_bottom, 0x1FE, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_B2ToPrison_top, 0x1FE, 1, 1 gAreaRoomMap_DarkHyruleCastle_B2Prison:: @ 08106F74 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B2Prison_0, 0x3FC, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_B2Prison_1, 0x3FC, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B2Prison_bottom, 0x3FC, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_B2Prison_top, 0x3FC, 1, 1 gAreaRoomMap_DarkHyruleCastle_B2Dropdown:: @ 08106F8C - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B2Dropdown_0, 0x264, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_B2Dropdown_1, 0x264, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_B2Dropdown_bottom, 0x264, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_B2Dropdown_top, 0x264, 1, 1 gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9:: @ 08106FA4 - map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastle_3b_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastle_3b_top, 0x1BA, 1, 1 gAreaRoomMaps_DarkHyruleCastle:: @ 08106FBC .4byte gAreaRoomMap_DarkHyruleCastle_1FEntrance @@ -3004,40 +3004,40 @@ gAreaRoomMaps_DarkHyruleCastle:: @ 08106FBC .4byte gAreaRoomMap_DarkHyruleCastle_3FKeatonHallToVaati9 gAreaRoomMap_DarkHyruleCastleOutside_0:: @ 081070AC - map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_0_0, 0x2EE, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_0_1, 0x2EE, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_ZeldaStatuePlatform_bottom, 0x2EE, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_ZeldaStatuePlatform_top, 0x2EE, 1, 1 gAreaRoomMap_DarkHyruleCastleOutside_1:: @ 081070C4 - map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_1_0, 0x396, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_1_1, 0x396, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_Garden_bottom, 0x396, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_Garden_top, 0x396, 1, 1 gAreaRoomMap_DarkHyruleCastleOutside_2:: @ 081070DC - map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_2_0, 0x374, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_2_1, 0x374, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_Northwest_bottom, 0x374, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_Northwest_top, 0x374, 1, 1 gAreaRoomMap_DarkHyruleCastleOutside_3:: @ 081070F4 - map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_3_0, 0x52E, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_3_1, 0x52E, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_Northeast_bottom, 0x52E, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_Northeast_top, 0x52E, 1, 1 gAreaRoomMap_DarkHyruleCastleOutside_4:: @ 0810710C - map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_4_0, 0x2A8, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_4_1, 0x2A8, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_East_bottom, 0x2A8, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_East_top, 0x2A8, 1, 1 gAreaRoomMap_DarkHyruleCastleOutside_5:: @ 08107124 - map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_5_0, 0x374, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_5_1, 0x374, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_Southwest_bottom, 0x374, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_Southwest_top, 0x374, 1, 1 gAreaRoomMap_DarkHyruleCastleOutside_6:: @ 0810713C - map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_6_0, 0xA5C, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_6_1, 0xA5C, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_South_bottom, 0xA5C, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_South_top, 0xA5C, 1, 1 gAreaRoomMap_DarkHyruleCastleOutside_7:: @ 08107154 - map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_7_0, 0x6E8, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_7_1, 0x6E8, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_Southeast_bottom, 0x6E8, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_Southeast_top, 0x6E8, 1, 1 gAreaRoomMap_DarkHyruleCastleOutside_8:: @ 0810716C - map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_8_0, 0x630, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_8_1, 0x630, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastleOutside_8_bottom, 0x630, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastleOutside_8_top, 0x630, 1, 1 gAreaRoomMaps_DarkHyruleCastleOutside:: @ 08107184 .4byte gAreaRoomMap_DarkHyruleCastleOutside_0 @@ -3051,23 +3051,23 @@ gAreaRoomMaps_DarkHyruleCastleOutside:: @ 08107184 .4byte gAreaRoomMap_DarkHyruleCastleOutside_8 gAreaRoomMap_DarkHyruleCastleBridge_0:: @ 081071A8 - map_bottom offset_gAreaRoomMap_DarkHyruleCastleBridge_0_0, 0x2A8, 1 - map_top offset_gAreaRoomMap_DarkHyruleCastleBridge_0_1, 0x2A8, 1, 1 + map_bottom offset_gAreaRoomMap_DarkHyruleCastleBridge_Main_bottom, 0x2A8, 1 + map_top offset_gAreaRoomMap_DarkHyruleCastleBridge_Main_top, 0x2A8, 1, 1 gAreaRoomMaps_DarkHyruleCastleBridge:: @ 081071C0 .4byte gAreaRoomMap_DarkHyruleCastleBridge_0 gAreaRoomMap_VaatisArms_0:: @ 081071C4 - map_bottom offset_gAreaRoomMap_VaatisArms_0_0, 0x214, 1 - map_top offset_gAreaRoomMap_VaatisArms_0_1, 0x214, 1, 1 + map_bottom offset_gAreaRoomMap_VaatisArms_First_bottom, 0x214, 1 + map_top offset_gAreaRoomMap_VaatisArms_First_top, 0x214, 1, 1 gAreaRoomMap_VaatisArms_1:: @ 081071DC - map_bottom offset_gAreaRoomMap_VaatisArms_1_0, 0x214, 1 - map_top offset_gAreaRoomMap_VaatisArms_1_1, 0x214, 1, 1 + map_bottom offset_gAreaRoomMap_VaatisArms_Second_bottom, 0x214, 1 + map_top offset_gAreaRoomMap_VaatisArms_Second_top, 0x214, 1, 1 gAreaRoomMap_VaatisArms_2:: @ 081071F4 - map_bottom offset_gAreaRoomMap_VaatisArms_2_0, 0x214, 1 - map_top offset_gAreaRoomMap_VaatisArms_2_1, 0x214, 1, 1 + map_bottom offset_gAreaRoomMap_VaatisArms_3_bottom, 0x214, 1 + map_top offset_gAreaRoomMap_VaatisArms_3_top, 0x214, 1, 1 gAreaRoomMaps_VaatisArms:: @ 0810720C .4byte gAreaRoomMap_VaatisArms_0 @@ -3075,35 +3075,35 @@ gAreaRoomMaps_VaatisArms:: @ 0810720C .4byte gAreaRoomMap_VaatisArms_2 gAreaRoomMap_Vaati3_0:: @ 08107218 - map_bottom offset_gAreaRoomMap_Vaati3_0_0, 0x294, 1 - map_top offset_gAreaRoomMap_Vaati3_0_1, 0x294, 1, 1 + map_bottom offset_gAreaRoomMap_Vaati3_0_bottom, 0x294, 1 + map_top offset_gAreaRoomMap_Vaati3_0_top, 0x294, 1, 1 gAreaRoomMap_Vaati3_1:: @ 08107230 - map_bottom offset_gAreaRoomMap_Vaati3_1_0, 0x210, 1 - map_top offset_gAreaRoomMap_Vaati3_1_1, 0x210, 1, 1 + map_bottom offset_gAreaRoomMap_Vaati3_1_bottom, 0x210, 1 + map_top offset_gAreaRoomMap_Vaati3_1_top, 0x210, 1, 1 gAreaRoomMaps_Vaati3:: @ 08107248 .4byte gAreaRoomMap_Vaati3_0 .4byte gAreaRoomMap_Vaati3_1 gAreaRoomMap_Vaati2_0:: @ 08107250 - map_bottom offset_gAreaRoomMap_Vaati2_0_0, 0x294, 1 - map_top offset_gAreaRoomMap_Vaati2_0_1, 0x294, 1, 1 + map_bottom offset_gAreaRoomMap_Vaati2_0_bottom, 0x294, 1 + map_top offset_gAreaRoomMap_Vaati2_0_top, 0x294, 1, 1 gAreaRoomMaps_Vaati2:: @ 08107268 .4byte gAreaRoomMap_Vaati2_0 gAreaRoomMap_47_0:: @ 0810726C - map_bottom offset_gAreaRoomMap_47_0_0, 0x256, 1 - map_top offset_gAreaRoomMap_47_0_1, 0x256, 1, 1 + map_bottom offset_gAreaRoomMap_47_0_bottom, 0x256, 1 + map_top offset_gAreaRoomMap_47_0_top, 0x256, 1, 1 gAreaRoomMap_47_1:: @ 08107284 - map_bottom offset_gAreaRoomMap_47_1_0, 0x2B2, 1 - map_top offset_gAreaRoomMap_47_1_1, 0x2B2, 1, 1 + map_bottom offset_gAreaRoomMap_47_1_bottom, 0x2B2, 1 + map_top offset_gAreaRoomMap_47_1_top, 0x2B2, 1, 1 gAreaRoomMap_47_2:: @ 0810729C - map_bottom offset_gAreaRoomMap_47_2_0, 0x47E, 1 - map_top offset_gAreaRoomMap_47_2_1, 0x47E, 1, 1 + map_bottom offset_gAreaRoomMap_47_2_bottom, 0x47E, 1 + map_top offset_gAreaRoomMap_47_2_top, 0x47E, 1, 1 gAreaRoomMaps_47:: @ 081072B4 .4byte gAreaRoomMap_47_0 @@ -3111,24 +3111,24 @@ gAreaRoomMaps_47:: @ 081072B4 .4byte gAreaRoomMap_47_2 gAreaRoomMap_CastorCaves_0:: @ 081072C0 - map_bottom offset_gAreaRoomMap_CastorCaves_0_0, 0x168, 1 - map_top offset_gAreaRoomMap_CastorCaves_0_1, 0x168, 1, 1 + map_bottom offset_gAreaRoomMap_CastorCaves_South_bottom, 0x168, 1 + map_top offset_gAreaRoomMap_CastorCaves_South_top, 0x168, 1, 1 gAreaRoomMap_CastorCaves_1:: @ 081072D8 - map_bottom offset_gAreaRoomMap_CastorCaves_1_0, 0x1B8, 1 - map_top offset_gAreaRoomMap_CastorCaves_1_1, 0x1B8, 1, 1 + map_bottom offset_gAreaRoomMap_CastorCaves_North_bottom, 0x1B8, 1 + map_top offset_gAreaRoomMap_CastorCaves_North_top, 0x1B8, 1, 1 gAreaRoomMap_CastorCaves_2:: @ 081072F0 - map_bottom offset_gAreaRoomMap_CastorCaves_2_0, 0x12C, 1 - map_top offset_gAreaRoomMap_CastorCaves_2_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_CastorCaves_WindRuins_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_CastorCaves_WindRuins_top, 0x12C, 1, 1 gAreaRoomMap_CastorCaves_3:: @ 08107308 - map_bottom offset_gAreaRoomMap_CastorCaves_3_0, 0x12C, 1 - map_top offset_gAreaRoomMap_CastorCaves_3_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_CastorCaves_Darknut_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_CastorCaves_Darknut_top, 0x12C, 1, 1 gAreaRoomMap_CastorCaves_4:: @ 08107320 - map_bottom offset_gAreaRoomMap_CastorCaves_4_0, 0x12C, 1 - map_top offset_gAreaRoomMap_CastorCaves_4_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_CastorCaves_HeartPiece_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_CastorCaves_HeartPiece_top, 0x12C, 1, 1 gAreaRoomMaps_CastorCaves:: @ 08107338 .4byte gAreaRoomMap_CastorCaves_0 @@ -3138,112 +3138,112 @@ gAreaRoomMaps_CastorCaves:: @ 08107338 .4byte gAreaRoomMap_CastorCaves_4 gAreaRoomMap_CastorDarknut_0:: @ 0810734C - map_bottom offset_gAreaRoomMap_CastorDarknut_0_0, 0x1BA, 1 - map_top offset_gAreaRoomMap_CastorDarknut_0_1, 0x1BA, 1, 1 + map_bottom offset_gAreaRoomMap_CastorDarknut_Main_bottom, 0x1BA, 1 + map_top offset_gAreaRoomMap_CastorDarknut_Main_top, 0x1BA, 1, 1 gAreaRoomMap_CastorDarknut_1:: @ 08107364 - map_bottom offset_gAreaRoomMap_CastorDarknut_1_0, 0x280, 1 - map_top offset_gAreaRoomMap_CastorDarknut_1_1, 0x280, 1, 1 + map_bottom offset_gAreaRoomMap_CastorDarknut_Hall_bottom, 0x280, 1 + map_top offset_gAreaRoomMap_CastorDarknut_Hall_top, 0x280, 1, 1 gAreaRoomMaps_CastorDarknut:: @ 0810737C .4byte gAreaRoomMap_CastorDarknut_0 .4byte gAreaRoomMap_CastorDarknut_1 gAreaRoomMap_Caves_0:: @ 08107384 - map_bottom offset_gAreaRoomMap_Caves_0_0, 0x372, 1 - map_top offset_gAreaRoomMap_Caves_0_1, 0x372, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_Boomerang_bottom, 0x372, 1 + map_top offset_gAreaRoomMap_Caves_Boomerang_top, 0x372, 1, 1 gAreaRoomMap_Caves_1:: @ 0810739C - map_bottom offset_gAreaRoomMap_Caves_1_0, 0x2B2, 1 - map_top offset_gAreaRoomMap_Caves_1_1, 0x2B2, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_ToGraveyard_bottom, 0x2B2, 1 + map_top offset_gAreaRoomMap_Caves_ToGraveyard_top, 0x2B2, 1, 1 gAreaRoomMap_Caves_2:: @ 081073B4 - map_bottom offset_gAreaRoomMap_Caves_2_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Caves_2_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_2_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Caves_2_top, 0x12C, 1, 1 gAreaRoomMap_Caves_3:: @ 081073CC - map_bottom offset_gAreaRoomMap_Caves_3_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Caves_3_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_3_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Caves_3_top, 0x12C, 1, 1 gAreaRoomMap_Caves_4:: @ 081073E4 - map_bottom offset_gAreaRoomMap_Caves_4_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Caves_4_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_4_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Caves_4_top, 0x12C, 1, 1 gAreaRoomMap_Caves_5:: @ 081073FC - map_bottom offset_gAreaRoomMap_Caves_5_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Caves_5_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_5_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Caves_5_top, 0x12C, 1, 1 gAreaRoomMap_Caves_6:: @ 08107414 - map_bottom offset_gAreaRoomMap_Caves_6_0, 0x1A4, 1 - map_top offset_gAreaRoomMap_Caves_6_1, 0x1A4, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_6_bottom, 0x1A4, 1 + map_top offset_gAreaRoomMap_Caves_6_top, 0x1A4, 1, 1 gAreaRoomMap_Caves_7:: @ 0810742C - map_bottom offset_gAreaRoomMap_Caves_7_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Caves_7_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_TrilbyKeeseChest_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Caves_TrilbyKeeseChest_top, 0x12C, 1, 1 gAreaRoomMap_Caves_8:: @ 08107444 - map_bottom offset_gAreaRoomMap_Caves_8_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Caves_8_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_TrilbyFairyFountain_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Caves_TrilbyFairyFountain_top, 0x12C, 1, 1 gAreaRoomMap_Caves_9:: @ 0810745C - map_bottom offset_gAreaRoomMap_Caves_9_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Caves_9_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_SouthHyruleFieldFairyFountain_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Caves_SouthHyruleFieldFairyFountain_top, 0x12C, 1, 1 gAreaRoomMap_Caves_10:: @ 08107474 - map_bottom offset_gAreaRoomMap_Caves_10_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Caves_10_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_A_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Caves_A_top, 0x12C, 1, 1 gAreaRoomMap_Caves_11:: @ 0810748C - map_bottom offset_gAreaRoomMap_Caves_11_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Caves_11_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_HyruleTownWaterfall_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Caves_HyruleTownWaterfall_top, 0x12C, 1, 1 gAreaRoomMap_Caves_12:: @ 081074A4 - map_bottom offset_gAreaRoomMap_Caves_12_0, 0x1E0, 1 - map_top offset_gAreaRoomMap_Caves_12_1, 0x1E0, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_LonLonRanch_bottom, 0x1E0, 1 + map_top offset_gAreaRoomMap_Caves_LonLonRanch_top, 0x1E0, 1, 1 gAreaRoomMap_Caves_13:: @ 081074BC - map_bottom offset_gAreaRoomMap_Caves_13_0, 0x1E0, 1 - map_top offset_gAreaRoomMap_Caves_13_1, 0x1E0, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_LonLonRanchSecret_bottom, 0x1E0, 1 + map_top offset_gAreaRoomMap_Caves_LonLonRanchSecret_top, 0x1E0, 1, 1 gAreaRoomMap_Caves_14:: @ 081074D4 - map_bottom offset_gAreaRoomMap_Caves_14_0, 0x208, 1 - map_top offset_gAreaRoomMap_Caves_14_1, 0x208, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_TrilbyHighlands_bottom, 0x208, 1 + map_top offset_gAreaRoomMap_Caves_TrilbyHighlands_top, 0x208, 1, 1 gAreaRoomMap_Caves_15:: @ 081074EC - map_bottom offset_gAreaRoomMap_Caves_15_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Caves_15_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_LonLonRanchWallet_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Caves_LonLonRanchWallet_top, 0x12C, 1, 1 gAreaRoomMap_Caves_16:: @ 08107504 - map_bottom offset_gAreaRoomMap_Caves_16_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Caves_16_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_SouthHyruleFieldRupee_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Caves_SouthHyruleFieldRupee_top, 0x12C, 1, 1 gAreaRoomMap_Caves_17:: @ 0810751C - map_bottom offset_gAreaRoomMap_Caves_17_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Caves_17_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_TrilbyRupee_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Caves_TrilbyRupee_top, 0x12C, 1, 1 gAreaRoomMap_Caves_18:: @ 08107534 - map_bottom offset_gAreaRoomMap_Caves_18_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Caves_18_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_TrilbyMittsFairyFountain_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Caves_TrilbyMittsFairyFountain_top, 0x12C, 1, 1 gAreaRoomMap_Caves_19:: @ 0810754C - map_bottom offset_gAreaRoomMap_Caves_19_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Caves_19_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_HillsKeeseChest_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Caves_HillsKeeseChest_top, 0x12C, 1, 1 gAreaRoomMap_Caves_20:: @ 08107564 - map_bottom offset_gAreaRoomMap_Caves_20_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Caves_20_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_BottleBusinessScrub_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Caves_BottleBusinessScrub_top, 0x12C, 1, 1 gAreaRoomMap_Caves_21:: @ 0810757C - map_bottom offset_gAreaRoomMap_Caves_21_0, 0x1C2, 1 - map_top offset_gAreaRoomMap_Caves_21_1, 0x1C2, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_HeartPieceHallway_bottom, 0x1C2, 1 + map_top offset_gAreaRoomMap_Caves_HeartPieceHallway_top, 0x1C2, 1, 1 gAreaRoomMap_Caves_22:: @ 08107594 - map_bottom offset_gAreaRoomMap_Caves_22_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Caves_22_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_NorthHyruleFieldFairyFountain_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Caves_NorthHyruleFieldFairyFountain_top, 0x12C, 1, 1 gAreaRoomMap_Caves_23:: @ 081075AC - map_bottom offset_gAreaRoomMap_Caves_23_0, 0x12C, 1 - map_top offset_gAreaRoomMap_Caves_23_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_Caves_KinstoneBusinessScrub_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_Caves_KinstoneBusinessScrub_top, 0x12C, 1, 1 gAreaRoomMaps_Caves:: @ 081075C4 .4byte gAreaRoomMap_Caves_0 @@ -3272,44 +3272,44 @@ gAreaRoomMaps_Caves:: @ 081075C4 .4byte gAreaRoomMap_Caves_23 gAreaRoomMap_VeilFallsCaves_0:: @ 08107624 - map_bottom offset_gAreaRoomMap_VeilFallsCaves_0_0, 0x1A4, 1 - map_top offset_gAreaRoomMap_VeilFallsCaves_0_1, 0x1A4, 1, 1 + map_bottom offset_gAreaRoomMap_VeilFallsCaves_Hallway2f_bottom, 0x1A4, 1 + map_top offset_gAreaRoomMap_VeilFallsCaves_Hallway2f_top, 0x1A4, 1, 1 gAreaRoomMap_VeilFallsCaves_1:: @ 0810763C - map_bottom offset_gAreaRoomMap_VeilFallsCaves_1_0, 0x2D0, 1 - map_top offset_gAreaRoomMap_VeilFallsCaves_1_1, 0x2D0, 1, 1 + map_bottom offset_gAreaRoomMap_VeilFallsCaves_Hallway1f_bottom, 0x2D0, 1 + map_top offset_gAreaRoomMap_VeilFallsCaves_Hallway1f_top, 0x2D0, 1, 1 gAreaRoomMap_VeilFallsCaves_2:: @ 08107654 - map_bottom offset_gAreaRoomMap_VeilFallsCaves_2_0, 0x186, 1 - map_top offset_gAreaRoomMap_VeilFallsCaves_2_1, 0x186, 1, 1 + map_bottom offset_gAreaRoomMap_VeilFallsCaves_HallwaySecretRoom_bottom, 0x186, 1 + map_top offset_gAreaRoomMap_VeilFallsCaves_HallwaySecretRoom_top, 0x186, 1, 1 gAreaRoomMap_VeilFallsCaves_3:: @ 0810766C - map_bottom offset_gAreaRoomMap_VeilFallsCaves_3_0, 0x1E0, 1 - map_top offset_gAreaRoomMap_VeilFallsCaves_3_1, 0x1E0, 1, 1 + map_bottom offset_gAreaRoomMap_VeilFallsCaves_Entrance_bottom, 0x1E0, 1 + map_top offset_gAreaRoomMap_VeilFallsCaves_Entrance_top, 0x1E0, 1, 1 gAreaRoomMap_VeilFallsCaves_4:: @ 08107684 - map_bottom offset_gAreaRoomMap_VeilFallsCaves_4_0, 0x12C, 1 - map_top offset_gAreaRoomMap_VeilFallsCaves_4_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_VeilFallsCaves_Exit_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_VeilFallsCaves_Exit_top, 0x12C, 1, 1 gAreaRoomMap_VeilFallsCaves_5:: @ 0810769C - map_bottom offset_gAreaRoomMap_VeilFallsCaves_5_0, 0x12C, 1 - map_top offset_gAreaRoomMap_VeilFallsCaves_5_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_VeilFallsCaves_SecretChest_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_VeilFallsCaves_SecretChest_top, 0x12C, 1, 1 gAreaRoomMap_VeilFallsCaves_6:: @ 081076B4 - map_bottom offset_gAreaRoomMap_VeilFallsCaves_6_0, 0x12C, 1 - map_top offset_gAreaRoomMap_VeilFallsCaves_6_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_VeilFallsCaves_HallwaySecretStaircase_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_VeilFallsCaves_HallwaySecretStaircase_top, 0x12C, 1, 1 gAreaRoomMap_VeilFallsCaves_7:: @ 081076CC - map_bottom offset_gAreaRoomMap_VeilFallsCaves_7_0, 0x258, 1 - map_top offset_gAreaRoomMap_VeilFallsCaves_7_1, 0x258, 1, 1 + map_bottom offset_gAreaRoomMap_VeilFallsCaves_HallwayBlockPuzzle_bottom, 0x258, 1 + map_top offset_gAreaRoomMap_VeilFallsCaves_HallwayBlockPuzzle_top, 0x258, 1, 1 gAreaRoomMap_VeilFallsCaves_8:: @ 081076E4 - map_bottom offset_gAreaRoomMap_VeilFallsCaves_8_0, 0x258, 1 - map_top offset_gAreaRoomMap_VeilFallsCaves_8_1, 0x258, 1, 1 + map_bottom offset_gAreaRoomMap_VeilFallsCaves_HallwayRupeePath_bottom, 0x258, 1 + map_top offset_gAreaRoomMap_VeilFallsCaves_HallwayRupeePath_top, 0x258, 1, 1 gAreaRoomMap_VeilFallsCaves_9:: @ 081076FC - map_bottom offset_gAreaRoomMap_VeilFallsCaves_9_0, 0x12C, 1 - map_top offset_gAreaRoomMap_VeilFallsCaves_9_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_VeilFallsCaves_HallwayHeartPiece_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_VeilFallsCaves_HallwayHeartPiece_top, 0x12C, 1, 1 gAreaRoomMaps_VeilFallsCaves:: @ 08107714 .4byte gAreaRoomMap_VeilFallsCaves_0 @@ -3324,55 +3324,55 @@ gAreaRoomMaps_VeilFallsCaves:: @ 08107714 .4byte gAreaRoomMap_VeilFallsCaves_9 gAreaRoomMap_RoyalValleyGraves_0:: @ 0810773C - map_bottom offset_gAreaRoomMap_RoyalValleyGraves_0_0, 0x12C, 1 - map_top offset_gAreaRoomMap_RoyalValleyGraves_0_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_RoyalValleyGraves_HeartPiece_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_RoyalValleyGraves_HeartPiece_top, 0x12C, 1, 1 gAreaRoomMap_RoyalValleyGraves_1:: @ 08107754 - map_bottom offset_gAreaRoomMap_RoyalValleyGraves_1_0, 0x258, 1 - map_top offset_gAreaRoomMap_RoyalValleyGraves_1_1, 0x258, 1, 1 + map_bottom offset_gAreaRoomMap_RoyalValleyGraves_Gina_bottom, 0x258, 1 + map_top offset_gAreaRoomMap_RoyalValleyGraves_Gina_top, 0x258, 1, 1 gAreaRoomMaps_RoyalValleyGraves:: @ 0810776C .4byte gAreaRoomMap_RoyalValleyGraves_0 .4byte gAreaRoomMap_RoyalValleyGraves_1 gAreaRoomMap_45_0:: @ 08107774 - map_bottom offset_gAreaRoomMap_45_0_0, 0x1FE, 1 - map_top offset_gAreaRoomMap_45_0_1, 0x1FE, 1, 1 + map_bottom offset_gAreaRoomMap_45_0_bottom, 0x1FE, 1 + map_top offset_gAreaRoomMap_45_0_top, 0x1FE, 1, 1 gAreaRoomMaps_45:: @ 0810778C .4byte gAreaRoomMap_45_0 gAreaRoomMap_46_0:: @ 08107790 - map_bottom offset_gAreaRoomMap_46_0_0, 0x286, 1 - map_top offset_gAreaRoomMap_46_0_1, 0x286, 1, 1 + map_bottom offset_gAreaRoomMap_Null46_0_bottom, 0x286, 1 + map_top offset_gAreaRoomMap_Null46_0_top, 0x286, 1, 1 gAreaRoomMap_46_1:: @ 081077A8 - map_bottom offset_gAreaRoomMap_46_1_0, 0x30E, 1 - map_top offset_gAreaRoomMap_46_1_1, 0x30E, 1, 1 + map_bottom offset_gAreaRoomMap_Null46_1_bottom, 0x30E, 1 + map_top offset_gAreaRoomMap_Null46_1_top, 0x30E, 1, 1 gAreaRoomMap_46_2:: @ 081077C0 - map_bottom offset_gAreaRoomMap_46_2_0, 0x286, 1 - map_top offset_gAreaRoomMap_46_2_1, 0x286, 1, 1 + map_bottom offset_gAreaRoomMap_Null46_2_bottom, 0x286, 1 + map_top offset_gAreaRoomMap_Null46_2_top, 0x286, 1, 1 gAreaRoomMap_46_3:: @ 081077D8 - map_bottom offset_gAreaRoomMap_46_3_0, 0x286, 1 - map_top offset_gAreaRoomMap_46_3_1, 0x286, 1, 1 + map_bottom offset_gAreaRoomMap_Null46_3_bottom, 0x286, 1 + map_top offset_gAreaRoomMap_Null46_3_top, 0x286, 1, 1 gAreaRoomMap_46_4:: @ 081077F0 - map_bottom offset_gAreaRoomMap_46_4_0, 0x30E, 1 - map_top offset_gAreaRoomMap_46_4_1, 0x30E, 1, 1 + map_bottom offset_gAreaRoomMap_Null46_4_bottom, 0x30E, 1 + map_top offset_gAreaRoomMap_Null46_4_top, 0x30E, 1, 1 gAreaRoomMap_46_5:: @ 08107808 - map_bottom offset_gAreaRoomMap_46_5_0, 0x286, 1 - map_top offset_gAreaRoomMap_46_5_1, 0x286, 1, 1 + map_bottom offset_gAreaRoomMap_Null46_5_bottom, 0x286, 1 + map_top offset_gAreaRoomMap_Null46_5_top, 0x286, 1, 1 gAreaRoomMap_46_6:: @ 08107820 - map_bottom offset_gAreaRoomMap_46_6_0, 0x720, 1 - map_top offset_gAreaRoomMap_46_6_1, 0x720, 1, 1 + map_bottom offset_gAreaRoomMap_Null46_6_bottom, 0x720, 1 + map_top offset_gAreaRoomMap_Null46_6_top, 0x720, 1, 1 gAreaRoomMap_46_7:: @ 08107838 - map_bottom offset_gAreaRoomMap_46_7_0, 0x2F2, 1 - map_top offset_gAreaRoomMap_46_7_1, 0x2F2, 1, 1 + map_bottom offset_gAreaRoomMap_Null46_7_bottom, 0x2F2, 1 + map_top offset_gAreaRoomMap_Null46_7_top, 0x2F2, 1, 1 gAreaRoomMaps_46:: @ 08107850 .4byte gAreaRoomMap_46_0 @@ -3392,64 +3392,64 @@ gAreaRoomMap_08107870:: @ 08107870 .4byte gAreaRoomMap_08107870 gAreaRoomMap_4D_0:: @ 0810788C - map_bottom offset_gAreaRoomMap_4D_0_0, 0xCD0, 1 - map_top offset_gAreaRoomMap_4D_0_1, 0xCD0, 1, 1 + map_bottom offset_gAreaRoomMap_4d_0_bottom, 0xCD0, 1 + map_top offset_gAreaRoomMap_4d_0_top, 0xCD0, 1, 1 gAreaRoomMaps_4D:: @ 081078A4 .4byte gAreaRoomMap_4D_0 gAreaRoomMap_57_0:: @ 081078A8 - map_bottom offset_gAreaRoomMap_57_0_0, 0xC80, 1 - map_top offset_gAreaRoomMap_57_0_1, 0xC80, 1, 1 + map_bottom offset_gAreaRoomMap_57_0_bottom, 0xC80, 1 + map_top offset_gAreaRoomMap_57_0_top, 0xC80, 1, 1 gAreaRoomMaps_57:: @ 081078C0 .4byte gAreaRoomMap_57_0 gAreaRoomMap_5F_0:: @ 081078C4 - map_bottom offset_gAreaRoomMap_5F_0_0, 0xC80, 1 - map_top offset_gAreaRoomMap_5F_0_1, 0xC80, 1, 1 + map_bottom offset_gAreaRoomMap_5f_0_bottom, 0xC80, 1 + map_top offset_gAreaRoomMap_5f_0_top, 0xC80, 1, 1 gAreaRoomMaps_5F:: @ 081078DC .4byte gAreaRoomMap_5F_0 gAreaRoomMap_67_0:: @ 081078E0 - map_bottom offset_gAreaRoomMap_67_0_0, 0x12C, 1 - map_top offset_gAreaRoomMap_67_0_1, 0x12C, 1, 1 + map_bottom offset_gAreaRoomMap_67_0_bottom, 0x12C, 1 + map_top offset_gAreaRoomMap_67_0_top, 0x12C, 1, 1 gAreaRoomMaps_67:: @ 081078F8 .4byte gAreaRoomMap_67_0 gAreaRoomMap_6F_0:: @ 081078FC - map_bottom offset_gAreaRoomMap_6F_0_0, 0xC80, 1 - map_top offset_gAreaRoomMap_6F_0_1, 0xC80, 1, 1 + map_bottom offset_gAreaRoomMap_6f_0_bottom, 0xC80, 1 + map_top offset_gAreaRoomMap_6f_0_top, 0xC80, 1, 1 gAreaRoomMaps_6F:: @ 08107914 .4byte gAreaRoomMap_6F_0 gAreaRoomMap_77_0:: @ 08107918 - map_bottom offset_gAreaRoomMap_77_0_0, 0x1040, 1 - map_top offset_gAreaRoomMap_77_0_1, 0x1040, 1, 1 + map_bottom offset_gAreaRoomMap_77_0_bottom, 0x1040, 1 + map_top offset_gAreaRoomMap_77_0_top, 0x1040, 1, 1 gAreaRoomMaps_77:: @ 08107930 .4byte gAreaRoomMap_77_0 gAreaRoomMap_7F_0:: @ 08107934 - map_bottom offset_gAreaRoomMap_7F_0_0, 0xC80, 1 - map_top offset_gAreaRoomMap_7F_0_1, 0xC80, 1, 1 + map_bottom offset_gAreaRoomMap_7f_0_bottom, 0xC80, 1 + map_top offset_gAreaRoomMap_7f_0_top, 0xC80, 1, 1 gAreaRoomMaps_7F:: @ 0810794C .4byte gAreaRoomMap_7F_0 gAreaRoomMap_87_0:: @ 08107950 - map_bottom offset_gAreaRoomMap_87_0_0, 0xF3C, 1 - map_top offset_gAreaRoomMap_87_0_1, 0xF3C, 1, 1 + map_bottom offset_gAreaRoomMap_87_0_bottom, 0xF3C, 1 + map_top offset_gAreaRoomMap_87_0_top, 0xF3C, 1, 1 gAreaRoomMaps_87:: @ 08107968 .4byte gAreaRoomMap_87_0 gAreaRoomMap_8F_0:: @ 0810796C - map_bottom offset_gAreaRoomMap_8F_0_0, 0xFA0, 1 - map_top offset_gAreaRoomMap_8F_0_1, 0xFA0, 1, 1 + map_bottom offset_gAreaRoomMap_8f_0_bottom, 0xFA0, 1 + map_top offset_gAreaRoomMap_8f_0_top, 0xFA0, 1, 1 gAreaRoomMaps_8F:: @ 08107984 .4byte gAreaRoomMap_8F_0 diff --git a/data/map/metatile_headers.s b/data/map/metatile_headers.s deleted file mode 100755 index d5fbf8ff..00000000 --- a/data/map/metatile_headers.s +++ /dev/null @@ -1,476 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - - .include "map_offsets.inc" - -gAreaMetatiles_MinishWoods:: @ 081026AC - metatiles_bottom offset_gAreaMetatiles_MinishWoods_0, 0x4000, 1 - metatiles_top offset_gAreaMetatiles_MinishWoods_1, 0x3FF0, 1 - metatile_types_bottom offset_gAreaMetatiles_MinishWoods_2, 0x1000, 1 - metatile_types_top offset_gAreaMetatiles_MinishWoods_3, 0xFFC, 1, 1 - -gAreaMetatiles_LakeHylia:: @ 081026DC - metatiles_bottom offset_gAreaMetatiles_LakeHylia_0, 0x4000, 1 - metatiles_top offset_gAreaMetatiles_LakeHylia_1, 0x3FF0, 1 - metatile_types_bottom offset_gAreaMetatiles_LakeHylia_2, 0x1000, 1 - metatile_types_top offset_gAreaMetatiles_LakeHylia_3, 0xFFC, 1, 1 - -gAreaMetatiles_CastorWilds:: @ 0810270C - metatiles_bottom offset_gAreaMetatiles_CastorWilds_0, 0x4000, 1 - metatiles_top offset_gAreaMetatiles_CastorWilds_1, 0x3FF0, 1 - metatile_types_bottom offset_gAreaMetatiles_CastorWilds_2, 0x1000, 1 - metatile_types_top offset_gAreaMetatiles_CastorWilds_3, 0xFFC, 1, 1 - -gAreaMetatiles_HyruleTown:: @ 0810273C - metatiles_bottom offset_gAreaMetatiles_HyruleTown_0, 0x4000, 1 - metatiles_top offset_gAreaMetatiles_HyruleTown_1, 0x3FF0, 1 - metatile_types_bottom offset_gAreaMetatiles_HyruleTown_2, 0x1000, 1 - metatile_types_top offset_gAreaMetatiles_HyruleTown_3, 0xFFC, 1, 1 - -gAreaMetatiles_MtCrenel:: @ 0810276C - metatiles_bottom offset_gAreaMetatiles_MtCrenel_0, 0x4000, 1 - metatiles_top offset_gAreaMetatiles_MtCrenel_1, 0x3FF0, 1 - metatile_types_bottom offset_gAreaMetatiles_MtCrenel_2, 0x1000, 1 - metatile_types_top offset_gAreaMetatiles_MtCrenel_3, 0xFFC, 1, 1 - -gAreaMetatiles_HyruleField:: @ 0810279C - metatiles_bottom offset_gAreaMetatiles_HyruleField_0, 0x4000, 1 - metatiles_top offset_gAreaMetatiles_HyruleField_1, 0x3FF0, 1 - metatile_types_bottom offset_gAreaMetatiles_HyruleField_2, 0x1000, 1 - metatile_types_top offset_gAreaMetatiles_HyruleField_3, 0xFFC, 1, 1 - -gAreaMetatiles_CastleGarden:: @ 081027CC - metatiles_bottom offset_gAreaMetatiles_CastleGarden_0, 0x3000, 1 - metatiles_top offset_gAreaMetatiles_CastleGarden_1, 0x3FF0, 1 - metatile_types_bottom offset_gAreaMetatiles_CastleGarden_2, 0xC00, 1 - metatile_types_top offset_gAreaMetatiles_CastleGarden_3, 0xFFC, 1, 1 - -gAreaMetatiles_CloudTops:: @ 081027FC - metatiles_bottom offset_gAreaMetatiles_CloudTops_0, 0x3FB0, 1 - metatiles_top offset_gAreaMetatiles_CloudTops_1, 0x3FF0, 1 - metatile_types_bottom offset_gAreaMetatiles_CloudTops_2, 0xFEC, 1 - metatile_types_top offset_gAreaMetatiles_CloudTops_3, 0xFFC, 1, 1 - -gAreaMetatiles_RoyalValley:: @ 0810282C - metatiles_bottom offset_gAreaMetatiles_RoyalValley_0, 0x4000, 1 - metatiles_top offset_gAreaMetatiles_RoyalValley_1, 0x3FF0, 1 - metatile_types_bottom offset_gAreaMetatiles_RoyalValley_2, 0x1000, 1 - metatile_types_top offset_gAreaMetatiles_RoyalValley_3, 0xFFC, 1, 1 - -gAreaMetatiles_Beanstalks:: @ 0810285C - metatiles_bottom offset_gAreaMetatiles_Beanstalks_0, 0x5A8, 1 - metatile_types_bottom offset_gAreaMetatiles_Beanstalks_1, 0x16A, 1, 1 - -gAreaMetatiles_CrenelCaves:: @ 08102874 - metatiles_bottom offset_gAreaMetatiles_CrenelCaves_0, 0x3F80, 1 - metatiles_top offset_gAreaMetatiles_CrenelCaves_1, 0x3F40, 1 - metatile_types_bottom offset_gAreaMetatiles_CrenelCaves_2, 0xFE0, 1 - metatile_types_top offset_gAreaMetatiles_CrenelCaves_3, 0xFD0, 1, 1 - -gAreaMetatiles_GreatFairies:: @ 081028A4 - metatiles_bottom offset_gAreaMetatiles_GreatFairies_0, 0x17A8, 1 - metatiles_top offset_gAreaMetatiles_GreatFairies_1, 0x1070, 1 - metatile_types_bottom offset_gAreaMetatiles_GreatFairies_2, 0x5EA, 1 - metatile_types_top offset_gAreaMetatiles_GreatFairies_3, 0x41C, 1, 1 - -gAreaMetatiles_MinishVillage:: @ 081028D4 - metatiles_bottom offset_gAreaMetatiles_MinishVillage_0, 0x35A8, 1 - metatiles_top offset_gAreaMetatiles_MinishVillage_1, 0x3228, 1 - metatile_types_bottom offset_gAreaMetatiles_MinishVillage_2, 0xD6A, 1 - metatile_types_top offset_gAreaMetatiles_MinishVillage_3, 0xC8A, 1, 1 - -gAreaMetatiles_MelarisMine:: @ 08102904 - metatiles_bottom offset_gAreaMetatiles_MelarisMine_0, 0x27C0, 1 - metatiles_top offset_gAreaMetatiles_MelarisMine_1, 0x308, 1 - metatile_types_bottom offset_gAreaMetatiles_MelarisMine_2, 0x9F0, 1 - metatile_types_top offset_gAreaMetatiles_MelarisMine_3, 0xC2, 1, 1 - -gAreaMetatiles_MnishPaths1:: @ 08102934 - metatiles_bottom offset_gAreaMetatiles_MnishPaths1_0, 0x1420, 1 - metatile_types_bottom offset_gAreaMetatiles_MnishPaths1_1, 0x508, 1, 1 - -gAreaMetatiles_CrenelMinishPaths:: @ 0810294C - metatiles_bottom offset_gAreaMetatiles_CrenelMinishPaths_0, 0x1EB8, 1 - metatile_types_bottom offset_gAreaMetatiles_CrenelMinishPaths_1, 0x7AE, 1, 1 - -gAreaMetatiles_MinishHouseInteriors:: @ 08102964 - metatiles_bottom offset_gAreaMetatiles_CrenelCaves_0, 0x3F80, 1 - metatiles_top offset_gAreaMetatiles_CrenelCaves_1, 0x3F40, 1 - metatile_types_bottom offset_gAreaMetatiles_CrenelCaves_2, 0xFE0, 1 - metatile_types_top offset_gAreaMetatiles_CrenelCaves_3, 0xFD0, 1, 1 - -gAreaMetatiles_HouseInteriors1:: @ 08102994 - metatiles_bottom offset_gAreaMetatiles_HouseInteriors1_0, 0x3188, 1 - metatiles_top offset_gAreaMetatiles_EzloCutscene_1, 0x3FF0, 1 - metatile_types_bottom offset_gAreaMetatiles_HouseInteriors1_2, 0xC62, 1 - metatile_types_top offset_gAreaMetatiles_EzloCutscene_3, 0xFFC, 1, 1 - -gAreaMetatiles_HouseInteriors2:: @ 081029C4 - metatiles_bottom offset_gAreaMetatiles_HouseInteriors2_0, 0x33A0, 1 - metatiles_top offset_gAreaMetatiles_EzloCutscene_1, 0x3FF0, 1 - metatile_types_bottom offset_gAreaMetatiles_HouseInteriors2_2, 0xCE8, 1 - metatile_types_top offset_gAreaMetatiles_EzloCutscene_3, 0xFFC, 1, 1 - -gAreaMetatiles_HouseInteriors4:: @ 081029F4 - metatiles_bottom offset_gAreaMetatiles_HouseInteriors4_0, 0x33A0, 1 - metatiles_top offset_gAreaMetatiles_EzloCutscene_1, 0x3FF0, 1 - metatile_types_bottom offset_gAreaMetatiles_HouseInteriors4_2, 0xCE8, 1 - metatile_types_top offset_gAreaMetatiles_EzloCutscene_3, 0xFFC, 1, 1 - -gAreaMetatiles_HouseInteriors3:: @ 08102A24 - metatiles_bottom offset_gAreaMetatiles_HouseInteriors3_0, 0x2F20, 1 - metatiles_top offset_gAreaMetatiles_EzloCutscene_1, 0x3FF0, 1 - metatile_types_bottom offset_gAreaMetatiles_HouseInteriors3_2, 0xBC8, 1 - metatile_types_top offset_gAreaMetatiles_EzloCutscene_3, 0xFFC, 1, 1 - -gAreaMetatiles_TreeInteriors:: @ 08102A54 - metatiles_bottom offset_gAreaMetatiles_TreeInteriors_0, 0x3000, 1 - metatiles_top offset_gAreaMetatiles_EzloCutscene_1, 0x3FF0, 1 - metatile_types_bottom offset_gAreaMetatiles_TreeInteriors_2, 0xC00, 1 - metatile_types_top offset_gAreaMetatiles_EzloCutscene_3, 0xFFC, 1, 1 - -gAreaMetatiles_Dojos:: @ 08102A84 - metatiles_bottom offset_gAreaMetatiles_Dojos_0, 0x33A0, 1 - metatiles_top offset_gAreaMetatiles_EzloCutscene_1, 0x3FF0, 1 - metatile_types_bottom offset_gAreaMetatiles_Dojos_2, 0xCE8, 1 - metatile_types_top offset_gAreaMetatiles_EzloCutscene_3, 0xFFC, 1, 1 - -gAreaMetatiles_MinishCracks:: @ 08102AB4 - metatiles_bottom offset_gAreaMetatiles_MinishCracks_0, 0x3180, 1 - metatiles_top offset_gAreaMetatiles_EzloCutscene_1, 0x3FF0, 1 - metatile_types_bottom offset_gAreaMetatiles_MinishCracks_2, 0xC60, 1 - metatile_types_top offset_gAreaMetatiles_EzloCutscene_3, 0xFFC, 1, 1 - -gAreaMetatiles_ArmosInteriors:: @ 08102AE4 - metatiles_bottom offset_gAreaMetatiles_ArmosInteriors_0, 0xC50, 1 - metatiles_top offset_gAreaMetatiles_ArmosInteriors_1, 0xC50, 1 - metatile_types_bottom offset_gAreaMetatiles_ArmosInteriors_2, 0x314, 1 - metatile_types_top offset_gAreaMetatiles_ArmosInteriors_3, 0x314, 1, 1 - -gAreaMetatiles_MinishRafters:: @ 08102B14 - metatiles_bottom offset_gAreaMetatiles_MinishRafters_0, 0x1A30, 1 - metatiles_top offset_gAreaMetatiles_EzloCutscene_1, 0x3FF0, 1 - metatile_types_bottom offset_gAreaMetatiles_MinishRafters_2, 0x68C, 1 - metatile_types_top offset_gAreaMetatiles_EzloCutscene_3, 0xFFC, 1, 1 - -gAreaMetatiles_GoronCave:: @ 08102B44 - metatiles_bottom offset_gAreaMetatiles_GoronCave_0, 0x3F80, 1 - metatiles_top offset_gAreaMetatiles_GoronCave_1, 0x3400, 1 - metatile_types_bottom offset_gAreaMetatiles_GoronCave_2, 0xFE0, 1 - metatile_types_top offset_gAreaMetatiles_GoronCave_3, 0xD00, 1, 1 - -gAreaMetatiles_WindTribeTower:: @ 08102B74 - metatiles_bottom offset_gAreaMetatiles_WindTribeTower_0, 0x2EB0, 1 - metatiles_top offset_gAreaMetatiles_EzloCutscene_1, 0x3FF0, 1 - metatile_types_bottom offset_gAreaMetatiles_WindTribeTower_2, 0xBAC, 1 - metatile_types_top offset_gAreaMetatiles_EzloCutscene_3, 0xFFC, 1, 1 - -gAreaMetatiles_WindTribeTowerRoof:: @ 08102BA4 - metatiles_bottom offset_gAreaMetatiles_WindTribeTowerRoof_0, 0xBC0, 1 - metatiles_top offset_gAreaMetatiles_WindTribeTowerRoof_1, 0xBC0, 1 - metatile_types_bottom offset_gAreaMetatiles_WindTribeTowerRoof_2, 0x2F0, 1 - metatile_types_top offset_gAreaMetatiles_WindTribeTowerRoof_3, 0x2F0, 1, 1 - -gAreaMetatiles_MinishCaves:: @ 08102BD4 - metatiles_bottom offset_gAreaMetatiles_MinishCaves_0, 0x3F80, 1 - metatiles_top offset_gAreaMetatiles_MinishCaves_1, 0x3F80, 1 - metatile_types_bottom offset_gAreaMetatiles_MinishCaves_2, 0xFE0, 1 - metatile_types_top offset_gAreaMetatiles_MinishCaves_3, 0xFE0, 1, 1 - -gAreaMetatiles_CastleGardenMinishHoles:: @ 08102C04 - metatiles_bottom offset_gAreaMetatiles_CastleGardenMinishHoles_0, 0x13A8, 1 - metatiles_top offset_gAreaMetatiles_CastleGardenMinishHoles_1, 0x1680, 1 - metatile_types_bottom offset_gAreaMetatiles_CastleGardenMinishHoles_2, 0x4EA, 1 - metatile_types_top offset_gAreaMetatiles_CastleGardenMinishHoles_3, 0x5A0, 1, 1 - -gAreaMetatiles_EzloCutscene:: @ 08102C34 - metatiles_bottom offset_gAreaMetatiles_EzloCutscene_0, 0x1A20, 1 - metatiles_top offset_gAreaMetatiles_EzloCutscene_1, 0x3FF0, 1 - metatile_types_bottom offset_gAreaMetatiles_EzloCutscene_2, 0x688, 1 - metatile_types_top offset_gAreaMetatiles_EzloCutscene_3, 0xFFC, 1, 1 - -gAreaMetatiles_HyruleTownUnderground:: @ 08102C64 - metatiles_bottom offset_gAreaMetatiles_HyruleTownUnderground_0, 0x3E80, 1 - metatiles_top offset_gAreaMetatiles_HyruleTownUnderground_1, 0x3610, 1 - metatile_types_bottom offset_gAreaMetatiles_HyruleTownUnderground_2, 0xFA0, 1 - metatile_types_top offset_gAreaMetatiles_HyruleTownUnderground_3, 0xD84, 1, 1 - -gAreaMetatiles_DeepwoodShrine:: @ 08102C94 - metatiles_bottom offset_gAreaMetatiles_DeepwoodShrine_0, 0x3B28, 1 - metatiles_top offset_gAreaMetatiles_DeepwoodShrine_1, 0x3620, 1 - metatile_types_bottom offset_gAreaMetatiles_DeepwoodShrine_2, 0xECA, 1 - metatile_types_top offset_gAreaMetatiles_DeepwoodShrine_3, 0xD88, 1, 1 - -gAreaMetatiles_DeepwoodShrineBoss:: @ 08102CC4 - metatiles_bottom offset_gAreaMetatiles_DeepwoodShrineBoss_0, 0x3620, 1 - metatiles_top offset_gAreaMetatiles_DeepwoodShrineBoss_1, 0x11F8, 1 - metatile_types_bottom offset_gAreaMetatiles_DeepwoodShrineBoss_2, 0xD88, 1 - metatile_types_top offset_gAreaMetatiles_DeepwoodShrineBoss_3, 0x47E, 1, 1 - -gAreaMetatiles_DeepwoodShrineEntry:: @ 08102CF4 - metatiles_bottom offset_gAreaMetatiles_DeepwoodShrineEntry_0, 0xD08, 1 - metatiles_top offset_gAreaMetatiles_DeepwoodShrineEntry_1, 0x9F8, 1 - metatile_types_bottom offset_gAreaMetatiles_DeepwoodShrineEntry_2, 0x342, 1 - metatile_types_top offset_gAreaMetatiles_DeepwoodShrineEntry_3, 0x27E, 1, 1 - -gAreaMetatiles_CaveOfFlames:: @ 08102D24 - metatiles_bottom offset_gAreaMetatiles_CaveOfFlames_0, 0x3B08, 1 - metatiles_top offset_gAreaMetatiles_CaveOfFlames_1, 0x3F28, 1 - metatile_types_bottom offset_gAreaMetatiles_CaveOfFlames_2, 0xEC2, 1 - metatile_types_top offset_gAreaMetatiles_CaveOfFlames_3, 0xFCA, 1, 1 - -gAreaMetatiles_CaveOfFlamesBoss:: @ 08102D54 - metatiles_bottom offset_gAreaMetatiles_CaveOfFlamesBoss_0, 0x3B08, 1 - metatiles_top offset_gAreaMetatiles_CaveOfFlamesBoss_1, 0x3610, 1 - metatile_types_bottom offset_gAreaMetatiles_CaveOfFlamesBoss_2, 0xEC2, 1 - metatile_types_top offset_gAreaMetatiles_CaveOfFlamesBoss_3, 0xD84, 1, 1 - -gAreaMetatiles_FortressOfWinds:: @ 08102D84 - metatiles_bottom offset_gAreaMetatiles_FortressOfWinds_0, 0x3868, 1 - metatiles_top offset_gAreaMetatiles_FortressOfWinds_1, 0x3850, 1 - metatile_types_bottom offset_gAreaMetatiles_FortressOfWinds_2, 0xE1A, 1 - metatile_types_top offset_gAreaMetatiles_FortressOfWinds_3, 0xE14, 1, 1 - -gAreaMetatiles_FortressOfWindsTop:: @ 08102DB4 - metatiles_bottom offset_gAreaMetatiles_FortressOfWindsTop_0, 0x1440, 1 - metatiles_top offset_gAreaMetatiles_FortressOfWindsTop_1, 0x1368, 1 - metatile_types_bottom offset_gAreaMetatiles_FortressOfWindsTop_2, 0x510, 1 - metatile_types_top offset_gAreaMetatiles_FortressOfWindsTop_3, 0x4DA, 1, 1 - -gAreaMetatiles_InnerMazaal:: @ 08102DE4 - metatiles_bottom offset_gAreaMetatiles_InnerMazaal_0, 0x3C00, 1 - metatiles_top offset_gAreaMetatiles_InnerMazaal_1, 0x3E70, 1 - metatile_types_bottom offset_gAreaMetatiles_InnerMazaal_2, 0xF00, 1 - metatile_types_top offset_gAreaMetatiles_InnerMazaal_3, 0xF9C, 1, 1 - -gAreaMetatiles_TempleOfDroplets:: @ 08102E14 - metatiles_bottom offset_gAreaMetatiles_TempleOfDroplets_0, 0x3D68, 1 - metatiles_top offset_gAreaMetatiles_TempleOfDroplets_1, 0x4000, 1 - metatile_types_bottom offset_gAreaMetatiles_TempleOfDroplets_2, 0xF5A, 1 - metatile_types_top offset_gAreaMetatiles_TempleOfDroplets_3, 0x1000, 1, 1 - -gAreaMetatiles_61:: @ 08102E44 - metatiles_bottom offset_gAreaMetatiles_61_0, 0x600, 1 - metatiles_top offset_gAreaMetatiles_61_1, 0x398, 1 - metatile_types_bottom offset_gAreaMetatiles_61_2, 0x180, 1 - metatile_types_top offset_gAreaMetatiles_61_3, 0xE6, 1, 1 - -gAreaMetatiles_RoyalCrypt:: @ 08102E74 - metatiles_bottom offset_gAreaMetatiles_RoyalCrypt_0, 0x3610, 1 - metatiles_top offset_gAreaMetatiles_RoyalCrypt_1, 0x3610, 1 - metatile_types_bottom offset_gAreaMetatiles_RoyalCrypt_2, 0xD84, 1 - metatile_types_top offset_gAreaMetatiles_RoyalCrypt_3, 0xD84, 1, 1 - -gAreaMetatiles_PalaceOfWinds:: @ 08102EA4 - metatiles_bottom offset_gAreaMetatiles_PalaceOfWinds_GyorgTornado, 0x3620, 1 - metatiles_top offset_gAreaMetatiles_PalaceOfWinds_BossKey, 0x3620, 1 - metatile_types_bottom offset_gAreaMetatiles_PalaceOfWinds_BeforeBallAndChainSoldiers, 0xD88, 1 - metatile_types_top offset_gAreaMetatiles_PalaceOfWinds_GyorgBossDoor, 0xD88, 1, 1 - -gAreaMetatiles_PalaceOfWindsBoss:: @ 08102ED4 - metatiles_top offset_gAreaMetatiles_PalaceOfWindsBoss_0, 0x108, 1 - metatile_types_top offset_gAreaMetatiles_PalaceOfWindsBoss_1, 0x42, 1, 1 - -gAreaMetatiles_Sanctuary:: @ 08102EEC - metatiles_bottom offset_gAreaMetatiles_Sanctuary_0, 0x3620, 1 - metatiles_top offset_gAreaMetatiles_Sanctuary_1, 0x3620, 1 - metatile_types_bottom offset_gAreaMetatiles_Sanctuary_2, 0xD88, 1 - metatile_types_top offset_gAreaMetatiles_Sanctuary_3, 0xD88, 1, 1 - -gAreaMetatiles_HyruleCastle:: @ 08102F1C - metatiles_bottom offset_gAreaMetatiles_HyruleCastle_0, 0x37C0, 1 - metatiles_top offset_gAreaMetatiles_HyruleCastle_1, 0x3610, 1 - metatile_types_bottom offset_gAreaMetatiles_HyruleCastle_2, 0xDF0, 1 - metatile_types_top offset_gAreaMetatiles_HyruleCastle_3, 0xD84, 1, 1 - -gAreaMetatiles_SanctuaryEntrance:: @ 08102F4C - metatiles_bottom offset_gAreaMetatiles_SanctuaryEntrance_0, 0x1478, 1 - metatiles_top offset_gAreaMetatiles_SanctuaryEntrance_1, 0xFF0, 1 - metatile_types_bottom offset_gAreaMetatiles_SanctuaryEntrance_2, 0x51E, 1 - metatile_types_top offset_gAreaMetatiles_SanctuaryEntrance_3, 0x3FC, 1, 1 - -gAreaMetatiles_DarkHyruleCastle:: @ 08102F7C - metatiles_bottom offset_gAreaMetatiles_DarkHyruleCastle_1FEntrance, 0x3FD8, 1 - metatiles_top offset_gAreaMetatiles_DarkHyruleCastle_3FTopLeftTower, 0x37C0, 1 - metatile_types_bottom offset_gAreaMetatiles_DarkHyruleCastle_3FTopRightTower, 0xFF6, 1 - metatile_types_top offset_gAreaMetatiles_DarkHyruleCastle_3FBottomLeftTower, 0xDF0, 1, 1 - -gAreaMetatiles_DarkHyruleCastleOutside:: @ 08102FAC - metatiles_bottom offset_gAreaMetatiles_DarkHyruleCastleOutside_0, 0x3340, 1 - metatiles_top offset_gAreaMetatiles_DarkHyruleCastleOutside_1, 0x1EF0, 1 - metatile_types_bottom offset_gAreaMetatiles_DarkHyruleCastleOutside_2, 0xCD0, 1 - metatile_types_top offset_gAreaMetatiles_DarkHyruleCastleOutside_3, 0x7BC, 1, 1 - -gAreaMetatiles_DarkHyruleCastleBridge:: @ 08102FDC - metatiles_bottom offset_gAreaMetatiles_DarkHyruleCastleBridge_0, 0x3610, 1 - metatiles_top offset_gAreaMetatiles_DarkHyruleCastleBridge_1, 0x3610, 1 - metatile_types_bottom offset_gAreaMetatiles_DarkHyruleCastleBridge_2, 0xD84, 1 - metatile_types_top offset_gAreaMetatiles_DarkHyruleCastleBridge_3, 0xD84, 1, 1 - -gAreaMetatiles_VaatisArms:: @ 0810300C - metatiles_bottom offset_gAreaMetatiles_VaatisArms_0, 0x17C8, 1 - metatiles_top offset_gAreaMetatiles_VaatisArms_1, 0xBC0, 1 - metatile_types_bottom offset_gAreaMetatiles_VaatisArms_2, 0x5F2, 1 - metatile_types_top offset_gAreaMetatiles_VaatisArms_3, 0x2F0, 1, 1 - -gAreaMetatiles_Vaati3:: @ 0810303C - metatiles_bottom offset_gAreaMetatiles_Vaati3_0, 0xE80, 1 - metatiles_top offset_gAreaMetatiles_Vaati3_1, 0x9B8, 1 - metatile_types_bottom offset_gAreaMetatiles_Vaati3_2, 0x3A0, 1 - metatile_types_top offset_gAreaMetatiles_Vaati3_3, 0x26E, 1, 1 - -gAreaMetatiles_Vaati2:: @ 0810306C - metatiles_bottom offset_gAreaMetatiles_Vaati2_0, 0x850, 1 - metatiles_top offset_gAreaMetatiles_Vaati2_1, 0x298, 1 - metatile_types_bottom offset_gAreaMetatiles_Vaati2_2, 0x214, 1 - metatile_types_top offset_gAreaMetatiles_Vaati2_3, 0xA6, 1, 1 - - -gAreaMetatiles:: @ 0810309C - .4byte gAreaMetatiles_MinishWoods @ 0x0 - .4byte gAreaMetatiles_MinishVillage @ 0x1 - .4byte gAreaMetatiles_HyruleTown @ 0x2 - .4byte gAreaMetatiles_HyruleField @ 0x3 - .4byte gAreaMetatiles_CastorWilds @ 0x4 - .4byte gAreaMetatiles_CastorWilds @ 0x5 - .4byte gAreaMetatiles_MtCrenel @ 0x6 - .4byte gAreaMetatiles_CastleGarden @ 0x7 - .4byte gAreaMetatiles_CloudTops @ 0x8 - .4byte gAreaMetatiles_RoyalValley @ 0x9 - .4byte gAreaMetatiles_MtCrenel @ 0xA - .4byte gAreaMetatiles_LakeHylia @ 0xB - .4byte gAreaMetatiles_MinishWoods @ 0xC - .4byte gAreaMetatiles_Beanstalks @ 0xD - .4byte gAreaMetatiles_MinishWoods @ 0xE - .4byte gAreaMetatiles_HyruleTown @ 0xF - .4byte gAreaMetatiles_MelarisMine @ 0x10 - .4byte gAreaMetatiles_MnishPaths1 @ 0x11 - .4byte gAreaMetatiles_CrenelMinishPaths @ 0x12 - .4byte gAreaMetatiles_HyruleField @ 0x13 - .4byte gAreaMetatiles_MtCrenel @ 0x14 - .4byte gAreaMetatiles_HyruleTown @ 0x15 - .4byte gAreaMetatiles_MtCrenel @ 0x16 - .4byte gAreaMetatiles_CastorWilds @ 0x17 - .4byte gAreaMetatiles_CastorWilds @ 0x18 - .4byte gAreaMetatiles_LakeHylia @ 0x19 - .4byte gAreaMetatiles_MtCrenel @ 0x1A - .4byte gAreaMetatiles_Unused @ 0x1B - .4byte gAreaMetatiles_Unused @ 0x1C - .4byte gAreaMetatiles_HyruleField @ 0x1D - .4byte gAreaMetatiles_MinishWoods @ 0x1E - .4byte gAreaMetatiles_HyruleField @ 0x1F - .4byte gAreaMetatiles_MinishHouseInteriors @ 0x20 - .4byte gAreaMetatiles_HouseInteriors1 @ 0x21 - .4byte gAreaMetatiles_HouseInteriors2 @ 0x22 - .4byte gAreaMetatiles_HouseInteriors3 @ 0x23 - .4byte gAreaMetatiles_TreeInteriors @ 0x24 - .4byte gAreaMetatiles_Dojos @ 0x25 - .4byte gAreaMetatiles_CrenelCaves @ 0x26 - .4byte gAreaMetatiles_MinishCracks @ 0x27 - .4byte gAreaMetatiles_HouseInteriors4 @ 0x28 - .4byte gAreaMetatiles_GreatFairies @ 0x29 - .4byte gAreaMetatiles_CrenelCaves @ 0x2A - .4byte gAreaMetatiles_FortressOfWinds @ 0x2B - .4byte gAreaMetatiles_ArmosInteriors @ 0x2C - .4byte gAreaMetatiles_MinishHouseInteriors @ 0x2D - .4byte gAreaMetatiles_MinishRafters @ 0x2E - .4byte gAreaMetatiles_GoronCave @ 0x2F - .4byte gAreaMetatiles_WindTribeTower @ 0x30 - .4byte gAreaMetatiles_WindTribeTowerRoof @ 0x31 - .4byte gAreaMetatiles_CrenelCaves @ 0x32 - .4byte gAreaMetatiles_CrenelCaves @ 0x33 - .4byte gAreaMetatiles_CrenelCaves @ 0x34 - .4byte gAreaMetatiles_MinishCaves @ 0x35 - .4byte gAreaMetatiles_CastleGardenMinishHoles @ 0x36 - .4byte gAreaMetatiles_CastleGardenMinishHoles @ 0x37 - .4byte gAreaMetatiles_EzloCutscene @ 0x38 - .4byte gAreaMetatiles_Unused @ 0x39 - .4byte gAreaMetatiles_Unused @ 0x3A - .4byte gAreaMetatiles_Unused @ 0x3B - .4byte gAreaMetatiles_Unused @ 0x3C - .4byte gAreaMetatiles_Unused @ 0x3D - .4byte gAreaMetatiles_Unused @ 0x3E - .4byte gAreaMetatiles_Unused @ 0x3F - .4byte gAreaMetatiles_HyruleTownUnderground @ 0x40 - .4byte gAreaMetatiles_HyruleTownUnderground @ 0x41 - .4byte gAreaMetatiles_HyruleTownUnderground @ 0x42 - .4byte gAreaMetatiles_HyruleTownUnderground @ 0x43 - .4byte gAreaMetatiles_HyruleTownUnderground @ 0x44 - .4byte gAreaMetatiles_CrenelCaves @ 0x45 - .4byte gAreaMetatiles_CrenelCaves @ 0x46 - .4byte gAreaMetatiles_CrenelCaves @ 0x47 - .4byte gAreaMetatiles_DeepwoodShrine @ 0x48 - .4byte gAreaMetatiles_DeepwoodShrineBoss @ 0x49 - .4byte gAreaMetatiles_DeepwoodShrineEntry @ 0x4A - .4byte gAreaMetatiles_Unused @ 0x4B - .4byte gAreaMetatiles_Unused @ 0x4C - .4byte gAreaMetatiles_DeepwoodShrine @ 0x4D - .4byte gAreaMetatiles_DeepwoodShrine @ 0x4E - .4byte gAreaMetatiles_DeepwoodShrineBoss @ 0x4F - .4byte gAreaMetatiles_CaveOfFlames @ 0x50 - .4byte gAreaMetatiles_CaveOfFlamesBoss @ 0x51 - .4byte gAreaMetatiles_Unused @ 0x52 - .4byte gAreaMetatiles_Unused @ 0x53 - .4byte gAreaMetatiles_Unused @ 0x54 - .4byte gAreaMetatiles_Unused @ 0x55 - .4byte gAreaMetatiles_CaveOfFlames @ 0x56 - .4byte gAreaMetatiles_CaveOfFlames @ 0x57 - .4byte gAreaMetatiles_FortressOfWinds @ 0x58 - .4byte gAreaMetatiles_FortressOfWindsTop @ 0x59 - .4byte gAreaMetatiles_InnerMazaal @ 0x5A - .4byte gAreaMetatiles_Unused @ 0x5B - .4byte gAreaMetatiles_Unused @ 0x5C - .4byte gAreaMetatiles_Unused @ 0x5D - .4byte gAreaMetatiles_Unused @ 0x5E - .4byte gAreaMetatiles_FortressOfWinds @ 0x5F - .4byte gAreaMetatiles_TempleOfDroplets @ 0x60 - .4byte gAreaMetatiles_61 @ 0x61 - .4byte gAreaMetatiles_TempleOfDroplets @ 0x62 - .4byte gAreaMetatiles_Unused @ 0x63 - .4byte gAreaMetatiles_Unused @ 0x64 - .4byte gAreaMetatiles_Unused @ 0x65 - .4byte gAreaMetatiles_Unused @ 0x66 - .4byte gAreaMetatiles_TempleOfDroplets @ 0x67 - .4byte gAreaMetatiles_RoyalCrypt @ 0x68 - .4byte gAreaMetatiles_Unused @ 0x69 - .4byte gAreaMetatiles_Unused @ 0x6A - .4byte gAreaMetatiles_Unused @ 0x6B - .4byte gAreaMetatiles_Unused @ 0x6C - .4byte gAreaMetatiles_Unused @ 0x6D - .4byte gAreaMetatiles_Unused @ 0x6E - .4byte gAreaMetatiles_RoyalCrypt @ 0x6F - .4byte gAreaMetatiles_PalaceOfWinds @ 0x70 - .4byte gAreaMetatiles_PalaceOfWindsBoss @ 0x71 - .4byte gAreaMetatiles_Unused @ 0x72 - .4byte gAreaMetatiles_Unused @ 0x73 - .4byte gAreaMetatiles_Unused @ 0x74 - .4byte gAreaMetatiles_Unused @ 0x75 - .4byte gAreaMetatiles_Unused @ 0x76 - .4byte gAreaMetatiles_PalaceOfWinds @ 0x77 - .4byte gAreaMetatiles_Sanctuary @ 0x78 - .4byte gAreaMetatiles_Unused @ 0x79 - .4byte gAreaMetatiles_Unused @ 0x7A - .4byte gAreaMetatiles_Unused @ 0x7B - .4byte gAreaMetatiles_Unused @ 0x7C - .4byte gAreaMetatiles_Unused @ 0x7D - .4byte gAreaMetatiles_Unused @ 0x7E - .4byte gAreaMetatiles_Sanctuary @ 0x7F - .4byte gAreaMetatiles_HyruleCastle @ 0x80 - .4byte gAreaMetatiles_SanctuaryEntrance @ 0x81 - .4byte gAreaMetatiles_Unused @ 0x82 - .4byte gAreaMetatiles_Unused @ 0x83 - .4byte gAreaMetatiles_Unused @ 0x84 - .4byte gAreaMetatiles_Unused @ 0x85 - .4byte gAreaMetatiles_Unused @ 0x86 - .4byte gAreaMetatiles_HyruleCastle @ 0x87 - .4byte gAreaMetatiles_DarkHyruleCastle @ 0x88 - .4byte gAreaMetatiles_DarkHyruleCastleOutside @ 0x89 - .4byte gAreaMetatiles_VaatisArms @ 0x8A - .4byte gAreaMetatiles_Vaati3 @ 0x8B - .4byte gAreaMetatiles_Vaati2 @ 0x8C - .4byte gAreaMetatiles_DarkHyruleCastleBridge @ 0x8D - .4byte gAreaMetatiles_Unused @ 0x8E - .4byte gAreaMetatiles_DarkHyruleCastle @ 0x8F diff --git a/data/map/room_headers.s b/data/map/room_headers.s index e17d0b16..8da74883 100755 --- a/data/map/room_headers.s +++ b/data/map/room_headers.s @@ -5,7 +5,7 @@ .align 2 -@ x, y, width, height, tileset_id +@ x, y, width, height, tileSet_id gAreaRoomHeaders_MinishWoods:: @ 0811C488 room_header 0xBA, 0x87, 0x3F0, 0x3F0, 0 diff --git a/data/map/tile_headers.s b/data/map/tile_headers.s new file mode 100755 index 00000000..93b9b6e3 --- /dev/null +++ b/data/map/tile_headers.s @@ -0,0 +1,476 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + + .include "map_offsets.inc" + +gAreaTiles_MinishWoods:: @ 081026AC + tiles_bottom offset_gAreaTileSet_MinishWoods_bottom, 0x4000, 1 + tiles_top offset_gAreaTileSet_MinishWoods_top, 0x3FF0, 1 + tile_types_bottom offset_gAreaTileSetTypes_MinishWoods_bottom, 0x1000, 1 + tile_types_top offset_gAreaTileSetTypes_MinishWoods_top, 0xFFC, 1, 1 + +gAreaTiles_LakeHylia:: @ 081026DC + tiles_bottom offset_gAreaTileSet_LakeHylia_bottom, 0x4000, 1 + tiles_top offset_gAreaTileSet_LakeHylia_top, 0x3FF0, 1 + tile_types_bottom offset_gAreaTileSetTypes_LakeHylia_bottom, 0x1000, 1 + tile_types_top offset_gAreaTileSetTypes_LakeHylia_top, 0xFFC, 1, 1 + +gAreaTiles_CastorWilds:: @ 0810270C + tiles_bottom offset_gAreaTileSet_CastorWilds_bottom, 0x4000, 1 + tiles_top offset_gAreaTileSet_CastorWilds_top, 0x3FF0, 1 + tile_types_bottom offset_gAreaTileSetTypes_CastorWilds_bottom, 0x1000, 1 + tile_types_top offset_gAreaTileSetTypes_CastorWilds_top, 0xFFC, 1, 1 + +gAreaTiles_HyruleTown:: @ 0810273C + tiles_bottom offset_gAreaTileSet_HyruleTown_bottom, 0x4000, 1 + tiles_top offset_gAreaTileSet_HyruleTown_top, 0x3FF0, 1 + tile_types_bottom offset_gAreaTileSetTypes_HyruleTown_bottom, 0x1000, 1 + tile_types_top offset_gAreaTileSetTypes_HyruleTown_top, 0xFFC, 1, 1 + +gAreaTiles_MtCrenel:: @ 0810276C + tiles_bottom offset_gAreaTileSet_MtCrenel_bottom, 0x4000, 1 + tiles_top offset_gAreaTileSet_MtCrenel_top, 0x3FF0, 1 + tile_types_bottom offset_gAreaTileSetTypes_MtCrenel_bottom, 0x1000, 1 + tile_types_top offset_gAreaTileSetTypes_MtCrenel_top, 0xFFC, 1, 1 + +gAreaTiles_HyruleField:: @ 0810279C + tiles_bottom offset_gAreaTileSet_HyruleField_bottom, 0x4000, 1 + tiles_top offset_gAreaTileSet_HyruleField_top, 0x3FF0, 1 + tile_types_bottom offset_gAreaTileSetTypes_HyruleField_bottom, 0x1000, 1 + tile_types_top offset_gAreaTileSetTypes_HyruleField_top, 0xFFC, 1, 1 + +gAreaTiles_CastleGarden:: @ 081027CC + tiles_bottom offset_gAreaTileSet_CastleGarden_bottom, 0x3000, 1 + tiles_top offset_gAreaTileSet_CastleGarden_top, 0x3FF0, 1 + tile_types_bottom offset_gAreaTileSetTypes_CastleGarden_bottom, 0xC00, 1 + tile_types_top offset_gAreaTileSetTypes_CastleGarden_top, 0xFFC, 1, 1 + +gAreaTiles_CloudTops:: @ 081027FC + tiles_bottom offset_gAreaTileSet_CloudTops_bottom, 0x3FB0, 1 + tiles_top offset_gAreaTileSet_CloudTops_top, 0x3FF0, 1 + tile_types_bottom offset_gAreaTileSetTypes_CloudTops_bottom, 0xFEC, 1 + tile_types_top offset_gAreaTileSetTypes_CloudTops_top, 0xFFC, 1, 1 + +gAreaTiles_RoyalValley:: @ 0810282C + tiles_bottom offset_gAreaTileSet_RoyalValley_bottom, 0x4000, 1 + tiles_top offset_gAreaTileSet_RoyalValley_top, 0x3FF0, 1 + tile_types_bottom offset_gAreaTileSetTypes_RoyalValley_bottom, 0x1000, 1 + tile_types_top offset_gAreaTileSetTypes_RoyalValley_top, 0xFFC, 1, 1 + +gAreaTiles_Beanstalks:: @ 0810285C + tiles_bottom offset_gAreaTileSet_Beanstalks_bottom, 0x5A8, 1 + tile_types_bottom offset_gAreaTileSetTypes_Beanstalks_bottom, 0x16A, 1, 1 + +gAreaTiles_CrenelCaves:: @ 08102874 + tiles_bottom offset_gAreaTileSet_MinishHouseInteriors_bottom, 0x3F80, 1 + tiles_top offset_gAreaTileSet_MinishHouseInteriors_top, 0x3F40, 1 + tile_types_bottom offset_gAreaTileSetTypes_MinishHouseInteriors_bottom, 0xFE0, 1 + tile_types_top offset_gAreaTileSetTypes_MinishHouseInteriors_top, 0xFD0, 1, 1 + +gAreaTiles_GreatFairies:: @ 081028A4 + tiles_bottom offset_gAreaTileSet_GreatFairies_bottom, 0x17A8, 1 + tiles_top offset_gAreaTileSet_GreatFairies_top, 0x1070, 1 + tile_types_bottom offset_gAreaTileSetTypes_GreatFairies_bottom, 0x5EA, 1 + tile_types_top offset_gAreaTileSetTypes_GreatFairies_top, 0x41C, 1, 1 + +gAreaTiles_MinishVillage:: @ 081028D4 + tiles_bottom offset_gAreaTileSet_MinishVillage_bottom, 0x35A8, 1 + tiles_top offset_gAreaTileSet_MinishVillage_top, 0x3228, 1 + tile_types_bottom offset_gAreaTileSetTypes_MinishVillage_bottom, 0xD6A, 1 + tile_types_top offset_gAreaTileSetTypes_MinishVillage_top, 0xC8A, 1, 1 + +gAreaTiles_MelarisMine:: @ 08102904 + tiles_bottom offset_gAreaTileSet_MelarisMine_bottom, 0x27C0, 1 + tiles_top offset_gAreaTileSet_MelarisMine_top, 0x308, 1 + tile_types_bottom offset_gAreaTileSetTypes_MelarisMine_bottom, 0x9F0, 1 + tile_types_top offset_gAreaTileSetTypes_MelarisMine_top, 0xC2, 1, 1 + +gAreaTiles_MnishPaths1:: @ 08102934 + tiles_bottom offset_gAreaTileSet_MinishPaths_bottom, 0x1420, 1 + tile_types_bottom offset_gAreaTileSetTypes_MinishPaths_bottom, 0x508, 1, 1 + +gAreaTiles_CrenelMinishPaths:: @ 0810294C + tiles_bottom offset_gAreaTileSet_CrenelMinishPaths_bottom, 0x1EB8, 1 + tile_types_bottom offset_gAreaTileSetTypes_CrenelMinishPaths_bottom, 0x7AE, 1, 1 + +gAreaTiles_MinishHouseInteriors:: @ 08102964 + tiles_bottom offset_gAreaTileSet_MinishHouseInteriors_bottom, 0x3F80, 1 + tiles_top offset_gAreaTileSet_MinishHouseInteriors_top, 0x3F40, 1 + tile_types_bottom offset_gAreaTileSetTypes_MinishHouseInteriors_bottom, 0xFE0, 1 + tile_types_top offset_gAreaTileSetTypes_MinishHouseInteriors_top, 0xFD0, 1, 1 + +gAreaTiles_HouseInteriors1:: @ 08102994 + tiles_bottom offset_gAreaTileSet_HouseInteriors1_bottom, 0x3188, 1 + tiles_top offset_gAreaTileSet_HouseInteriors1_top, 0x3FF0, 1 + tile_types_bottom offset_gAreaTileSetTypes_HouseInteriors1_bottom, 0xC62, 1 + tile_types_top offset_gAreaTileSetTypes_HouseInteriors1_top, 0xFFC, 1, 1 + +gAreaTiles_HouseInteriors2:: @ 081029C4 + tiles_bottom offset_gAreaTileSet_HouseInteriors2_bottom, 0x33A0, 1 + tiles_top offset_gAreaTileSet_HouseInteriors1_top, 0x3FF0, 1 + tile_types_bottom offset_gAreaTileSetTypes_HouseInteriors2_bottom, 0xCE8, 1 + tile_types_top offset_gAreaTileSetTypes_HouseInteriors1_top, 0xFFC, 1, 1 + +gAreaTiles_HouseInteriors4:: @ 081029F4 + tiles_bottom offset_gAreaTileSet_HouseInteriors4_bottom, 0x33A0, 1 + tiles_top offset_gAreaTileSet_HouseInteriors1_top, 0x3FF0, 1 + tile_types_bottom offset_gAreaTileSetTypes_HouseInteriors4_bottom, 0xCE8, 1 + tile_types_top offset_gAreaTileSetTypes_HouseInteriors1_top, 0xFFC, 1, 1 + +gAreaTiles_HouseInteriors3:: @ 08102A24 + tiles_bottom offset_gAreaTileSet_HouseInteriors3_bottom, 0x2F20, 1 + tiles_top offset_gAreaTileSet_HouseInteriors1_top, 0x3FF0, 1 + tile_types_bottom offset_gAreaTileSetTypes_HouseInteriors3_bottom, 0xBC8, 1 + tile_types_top offset_gAreaTileSetTypes_HouseInteriors1_top, 0xFFC, 1, 1 + +gAreaTiles_TreeInteriors:: @ 08102A54 + tiles_bottom offset_gAreaTileSet_TreeInteriors_bottom, 0x3000, 1 + tiles_top offset_gAreaTileSet_HouseInteriors1_top, 0x3FF0, 1 + tile_types_bottom offset_gAreaTileSetTypes_TreeInteriors_bottom, 0xC00, 1 + tile_types_top offset_gAreaTileSetTypes_HouseInteriors1_top, 0xFFC, 1, 1 + +gAreaTiles_Dojos:: @ 08102A84 + tiles_bottom offset_gAreaTileSet_Dojos_bottom, 0x33A0, 1 + tiles_top offset_gAreaTileSet_HouseInteriors1_top, 0x3FF0, 1 + tile_types_bottom offset_gAreaTileSetTypes_Dojos_bottom, 0xCE8, 1 + tile_types_top offset_gAreaTileSetTypes_HouseInteriors1_top, 0xFFC, 1, 1 + +gAreaTiles_MinishCracks:: @ 08102AB4 + tiles_bottom offset_gAreaTileSet_MinishCracks_bottom, 0x3180, 1 + tiles_top offset_gAreaTileSet_HouseInteriors1_top, 0x3FF0, 1 + tile_types_bottom offset_gAreaTileSetTypes_MinishCracks_bottom, 0xC60, 1 + tile_types_top offset_gAreaTileSetTypes_HouseInteriors1_top, 0xFFC, 1, 1 + +gAreaTiles_ArmosInteriors:: @ 08102AE4 + tiles_bottom offset_gAreaTileSet_ArmosInteriors_bottom, 0xC50, 1 + tiles_top offset_gAreaTileSet_ArmosInteriors_top, 0xC50, 1 + tile_types_bottom offset_gAreaTileSetTypes_ArmosInteriors_bottom, 0x314, 1 + tile_types_top offset_gAreaTileSetTypes_ArmosInteriors_top, 0x314, 1, 1 + +gAreaTiles_MinishRafters:: @ 08102B14 + tiles_bottom offset_gAreaTileSet_MinishRafters_bottom, 0x1A30, 1 + tiles_top offset_gAreaTileSet_HouseInteriors1_top, 0x3FF0, 1 + tile_types_bottom offset_gAreaTileSetTypes_MinishRafters_bottom, 0x68C, 1 + tile_types_top offset_gAreaTileSetTypes_HouseInteriors1_top, 0xFFC, 1, 1 + +gAreaTiles_GoronCave:: @ 08102B44 + tiles_bottom offset_gAreaTileSet_GoronCave_bottom, 0x3F80, 1 + tiles_top offset_gAreaTileSet_GoronCave_top, 0x3400, 1 + tile_types_bottom offset_gAreaTileSetTypes_GoronCave_bottom, 0xFE0, 1 + tile_types_top offset_gAreaTileSetTypes_GoronCave_top, 0xD00, 1, 1 + +gAreaTiles_WindTribeTower:: @ 08102B74 + tiles_bottom offset_gAreaTileSet_WindTribeTower_bottom, 0x2EB0, 1 + tiles_top offset_gAreaTileSet_HouseInteriors1_top, 0x3FF0, 1 + tile_types_bottom offset_gAreaTileSetTypes_WindTribeTower_bottom, 0xBAC, 1 + tile_types_top offset_gAreaTileSetTypes_HouseInteriors1_top, 0xFFC, 1, 1 + +gAreaTiles_WindTribeTowerRoof:: @ 08102BA4 + tiles_bottom offset_gAreaTileSet_WindTribeTowerRoof_bottom, 0xBC0, 1 + tiles_top offset_gAreaTileSet_WindTribeTowerRoof_top, 0xBC0, 1 + tile_types_bottom offset_gAreaTileSetTypes_WindTribeTowerRoof_bottom, 0x2F0, 1 + tile_types_top offset_gAreaTileSetTypes_WindTribeTowerRoof_top, 0x2F0, 1, 1 + +gAreaTiles_MinishCaves:: @ 08102BD4 + tiles_bottom offset_gAreaTileSet_MinishCaves_bottom, 0x3F80, 1 + tiles_top offset_gAreaTileSet_MinishCaves_top, 0x3F80, 1 + tile_types_bottom offset_gAreaTileSetTypes_MinishCaves_bottom, 0xFE0, 1 + tile_types_top offset_gAreaTileSetTypes_MinishCaves_top, 0xFE0, 1, 1 + +gAreaTiles_CastleGardenMinishHoles:: @ 08102C04 + tiles_bottom offset_gAreaTileSet_CastleGardenMinishHoles_bottom, 0x13A8, 1 + tiles_top offset_gAreaTileSet_CastleGardenMinishHoles_top, 0x1680, 1 + tile_types_bottom offset_gAreaTileSetTypes_CastleGardenMinishHoles_bottom, 0x4EA, 1 + tile_types_top offset_gAreaTileSetTypes_CastleGardenMinishHoles_top, 0x5A0, 1, 1 + +gAreaTiles_EzloCutscene:: @ 08102C34 + tiles_bottom offset_gAreaTileSet_EzloCutscene_bottom, 0x1A20, 1 + tiles_top offset_gAreaTileSet_HouseInteriors1_top, 0x3FF0, 1 + tile_types_bottom offset_gAreaTileSetTypes_EzloCutscene_bottom, 0x688, 1 + tile_types_top offset_gAreaTileSetTypes_HouseInteriors1_top, 0xFFC, 1, 1 + +gAreaTiles_HyruleTownUnderground:: @ 08102C64 + tiles_bottom offset_gAreaTileSet_40_bottom, 0x3E80, 1 + tiles_top offset_gAreaTileSet_40_top, 0x3610, 1 + tile_types_bottom offset_gAreaTileSetTypes_40_bottom, 0xFA0, 1 + tile_types_top offset_gAreaTileSetTypes_40_top, 0xD84, 1, 1 + +gAreaTiles_DeepwoodShrine:: @ 08102C94 + tiles_bottom offset_gAreaTileSet_DeepwoodShrine_bottom, 0x3B28, 1 + tiles_top offset_gAreaTileSet_DeepwoodShrine_top, 0x3620, 1 + tile_types_bottom offset_gAreaTileSetTypes_DeepwoodShrine_bottom, 0xECA, 1 + tile_types_top offset_gAreaTileSetTypes_DeepwoodShrine_top, 0xD88, 1, 1 + +gAreaTiles_DeepwoodShrineBoss:: @ 08102CC4 + tiles_bottom offset_gAreaTileSet_DeepwoodShrineBoss_bottom, 0x3620, 1 + tiles_top offset_gAreaTileSet_DeepwoodShrineBoss_top, 0x11F8, 1 + tile_types_bottom offset_gAreaTileSetTypes_DeepwoodShrineBoss_bottom, 0xD88, 1 + tile_types_top offset_gAreaTileSetTypes_DeepwoodShrineBoss_top, 0x47E, 1, 1 + +gAreaTiles_DeepwoodShrineEntry:: @ 08102CF4 + tiles_bottom offset_gAreaTileSet_DeepwoodShrineEntry_bottom, 0xD08, 1 + tiles_top offset_gAreaTileSet_DeepwoodShrineEntry_top, 0x9F8, 1 + tile_types_bottom offset_gAreaTileSetTypes_DeepwoodShrineEntry_bottom, 0x342, 1 + tile_types_top offset_gAreaTileSetTypes_DeepwoodShrineEntry_top, 0x27E, 1, 1 + +gAreaTiles_CaveOfFlames:: @ 08102D24 + tiles_bottom offset_gAreaTileSet_CaveOfFlames_bottom, 0x3B08, 1 + tiles_top offset_gAreaTileSet_CaveOfFlames_top, 0x3F28, 1 + tile_types_bottom offset_gAreaTileSetTypes_CaveOfFlames_bottom, 0xEC2, 1 + tile_types_top offset_gAreaTileSetTypes_CaveOfFlames_top, 0xFCA, 1, 1 + +gAreaTiles_CaveOfFlamesBoss:: @ 08102D54 + tiles_bottom offset_gAreaTileSet_CaveOfFlamesBoss_bottom, 0x3B08, 1 + tiles_top offset_gAreaTileSet_CaveOfFlamesBoss_top, 0x3610, 1 + tile_types_bottom offset_gAreaTileSetTypes_CaveOfFlamesBoss_bottom, 0xEC2, 1 + tile_types_top offset_gAreaTileSetTypes_CaveOfFlamesBoss_top, 0xD84, 1, 1 + +gAreaTiles_FortressOfWinds:: @ 08102D84 + tiles_bottom offset_gAreaTileSet_CastorDarknut_bottom, 0x3868, 1 + tiles_top offset_gAreaTileSet_CastorDarknut_top, 0x3850, 1 + tile_types_bottom offset_gAreaTileSetTypes_CastorDarknut_bottom, 0xE1A, 1 + tile_types_top offset_gAreaTileSetTypes_CastorDarknut_top, 0xE14, 1, 1 + +gAreaTiles_FortressOfWindsTop:: @ 08102DB4 + tiles_bottom offset_gAreaTileSet_FortressOfWindsTop_bottom, 0x1440, 1 + tiles_top offset_gAreaTileSet_FortressOfWindsTop_top, 0x1368, 1 + tile_types_bottom offset_gAreaTileSetTypes_FortressOfWindsTop_bottom, 0x510, 1 + tile_types_top offset_gAreaTileSetTypes_FortressOfWindsTop_top, 0x4DA, 1, 1 + +gAreaTiles_InnerMazaal:: @ 08102DE4 + tiles_bottom offset_gAreaTileSet_InnerMazaal_bottom, 0x3C00, 1 + tiles_top offset_gAreaTileSet_InnerMazaal_top, 0x3E70, 1 + tile_types_bottom offset_gAreaTileSetTypes_InnerMazaal_bottom, 0xF00, 1 + tile_types_top offset_gAreaTileSetTypes_InnerMazaal_top, 0xF9C, 1, 1 + +gAreaTiles_TempleOfDroplets:: @ 08102E14 + tiles_bottom offset_gAreaTileSet_TempleOfDroplets_bottom, 0x3D68, 1 + tiles_top offset_gAreaTileSet_TempleOfDroplets_top, 0x4000, 1 + tile_types_bottom offset_gAreaTileSetTypes_TempleOfDroplets_bottom, 0xF5A, 1 + tile_types_top offset_gAreaTileSetTypes_TempleOfDroplets_top, 0x1000, 1, 1 + +gAreaTiles_61:: @ 08102E44 + tiles_bottom offset_gAreaTileSet_Null61_bottom, 0x600, 1 + tiles_top offset_gAreaTileSet_Null61_top, 0x398, 1 + tile_types_bottom offset_gAreaTileSetTypes_Null61_bottom, 0x180, 1 + tile_types_top offset_gAreaTileSetTypes_Null61_top, 0xE6, 1, 1 + +gAreaTiles_RoyalCrypt:: @ 08102E74 + tiles_bottom offset_gAreaTileSet_RoyalCrypt_bottom, 0x3610, 1 + tiles_top offset_gAreaTileSet_RoyalCrypt_top, 0x3610, 1 + tile_types_bottom offset_gAreaTileSetTypes_RoyalCrypt_bottom, 0xD84, 1 + tile_types_top offset_gAreaTileSetTypes_RoyalCrypt_top, 0xD84, 1, 1 + +gAreaTiles_PalaceOfWinds:: @ 08102EA4 + tiles_bottom offset_gAreaTileSet_PalaceOfWinds_bottom, 0x3620, 1 + tiles_top offset_gAreaTileSet_PalaceOfWinds_top, 0x3620, 1 + tile_types_bottom offset_gAreaTileSetTypes_PalaceOfWinds_bottom, 0xD88, 1 + tile_types_top offset_gAreaTileSetTypes_PalaceOfWinds_top, 0xD88, 1, 1 + +gAreaTiles_PalaceOfWindsBoss:: @ 08102ED4 + tiles_top offset_gAreaTileSet_PalaceOfWindsBoss_top, 0x108, 1 + tile_types_top offset_gAreaTileSetTypes_PalaceOfWindsBoss_top, 0x42, 1, 1 + +gAreaTiles_Sanctuary:: @ 08102EEC + tiles_bottom offset_gAreaTileSet_Sanctuary_bottom, 0x3620, 1 + tiles_top offset_gAreaTileSet_Sanctuary_top, 0x3620, 1 + tile_types_bottom offset_gAreaTileSetTypes_Sanctuary_bottom, 0xD88, 1 + tile_types_top offset_gAreaTileSetTypes_Sanctuary_top, 0xD88, 1, 1 + +gAreaTiles_HyruleCastle:: @ 08102F1C + tiles_bottom offset_gAreaTileSet_HyruleCastle_bottom, 0x37C0, 1 + tiles_top offset_gAreaTileSet_HyruleCastle_top, 0x3610, 1 + tile_types_bottom offset_gAreaTileSetTypes_HyruleCastle_bottom, 0xDF0, 1 + tile_types_top offset_gAreaTileSetTypes_HyruleCastle_top, 0xD84, 1, 1 + +gAreaTiles_SanctuaryEntrance:: @ 08102F4C + tiles_bottom offset_gAreaTileSet_SanctuaryEntrance_bottom, 0x1478, 1 + tiles_top offset_gAreaTileSet_SanctuaryEntrance_top, 0xFF0, 1 + tile_types_bottom offset_gAreaTileSetTypes_SanctuaryEntrance_bottom, 0x51E, 1 + tile_types_top offset_gAreaTileSetTypes_SanctuaryEntrance_top, 0x3FC, 1, 1 + +gAreaTiles_DarkHyruleCastle:: @ 08102F7C + tiles_bottom offset_gAreaTileSet_DarkHyruleCastle_bottom, 0x3FD8, 1 + tiles_top offset_gAreaTileSet_DarkHyruleCastle_top, 0x37C0, 1 + tile_types_bottom offset_gAreaTileSetTypes_DarkHyruleCastle_bottom, 0xFF6, 1 + tile_types_top offset_gAreaTileSetTypes_DarkHyruleCastle_top, 0xDF0, 1, 1 + +gAreaTiles_DarkHyruleCastleOutside:: @ 08102FAC + tiles_bottom offset_gAreaTileSet_DarkHyruleCastleOutside_bottom, 0x3340, 1 + tiles_top offset_gAreaTileSet_DarkHyruleCastleOutside_top, 0x1EF0, 1 + tile_types_bottom offset_gAreaTileSetTypes_DarkHyruleCastleOutside_bottom, 0xCD0, 1 + tile_types_top offset_gAreaTileSetTypes_DarkHyruleCastleOutside_top, 0x7BC, 1, 1 + +gAreaTiles_DarkHyruleCastleBridge:: @ 08102FDC + tiles_bottom offset_gAreaTileSet_DarkHyruleCastleBridge_bottom, 0x3610, 1 + tiles_top offset_gAreaTileSet_DarkHyruleCastleBridge_top, 0x3610, 1 + tile_types_bottom offset_gAreaTileSetTypes_DarkHyruleCastleBridge_bottom, 0xD84, 1 + tile_types_top offset_gAreaTileSetTypes_DarkHyruleCastleBridge_top, 0xD84, 1, 1 + +gAreaTiles_VaatisArms:: @ 0810300C + tiles_bottom offset_gAreaTileSet_VaatisArms_bottom, 0x17C8, 1 + tiles_top offset_gAreaTileSet_VaatisArms_top, 0xBC0, 1 + tile_types_bottom offset_gAreaTileSetTypes_VaatisArms_bottom, 0x5F2, 1 + tile_types_top offset_gAreaTileSetTypes_VaatisArms_top, 0x2F0, 1, 1 + +gAreaTiles_Vaati3:: @ 0810303C + tiles_bottom offset_gAreaTileSet_Vaati3_bottom, 0xE80, 1 + tiles_top offset_gAreaTileSet_Vaati3_top, 0x9B8, 1 + tile_types_bottom offset_gAreaTileSetTypes_Vaati3_bottom, 0x3A0, 1 + tile_types_top offset_gAreaTileSetTypes_Vaati3_top, 0x26E, 1, 1 + +gAreaTiles_Vaati2:: @ 0810306C + tiles_bottom offset_gAreaTileSet_Vaati2_bottom, 0x850, 1 + tiles_top offset_gAreaTileSet_Vaati2_top, 0x298, 1 + tile_types_bottom offset_gAreaTileSetTypes_Vaati2_bottom, 0x214, 1 + tile_types_top offset_gAreaTileSetTypes_Vaati2_top, 0xA6, 1, 1 + + +gAreaTiles:: @ 0810309C + .4byte gAreaTiles_MinishWoods @ 0x0 + .4byte gAreaTiles_MinishVillage @ 0x1 + .4byte gAreaTiles_HyruleTown @ 0x2 + .4byte gAreaTiles_HyruleField @ 0x3 + .4byte gAreaTiles_CastorWilds @ 0x4 + .4byte gAreaTiles_CastorWilds @ 0x5 + .4byte gAreaTiles_MtCrenel @ 0x6 + .4byte gAreaTiles_CastleGarden @ 0x7 + .4byte gAreaTiles_CloudTops @ 0x8 + .4byte gAreaTiles_RoyalValley @ 0x9 + .4byte gAreaTiles_MtCrenel @ 0xA + .4byte gAreaTiles_LakeHylia @ 0xB + .4byte gAreaTiles_MinishWoods @ 0xC + .4byte gAreaTiles_Beanstalks @ 0xD + .4byte gAreaTiles_MinishWoods @ 0xE + .4byte gAreaTiles_HyruleTown @ 0xF + .4byte gAreaTiles_MelarisMine @ 0x10 + .4byte gAreaTiles_MnishPaths1 @ 0x11 + .4byte gAreaTiles_CrenelMinishPaths @ 0x12 + .4byte gAreaTiles_HyruleField @ 0x13 + .4byte gAreaTiles_MtCrenel @ 0x14 + .4byte gAreaTiles_HyruleTown @ 0x15 + .4byte gAreaTiles_MtCrenel @ 0x16 + .4byte gAreaTiles_CastorWilds @ 0x17 + .4byte gAreaTiles_CastorWilds @ 0x18 + .4byte gAreaTiles_LakeHylia @ 0x19 + .4byte gAreaTiles_MtCrenel @ 0x1A + .4byte gAreaTiles_Unused @ 0x1B + .4byte gAreaTiles_Unused @ 0x1C + .4byte gAreaTiles_HyruleField @ 0x1D + .4byte gAreaTiles_MinishWoods @ 0x1E + .4byte gAreaTiles_HyruleField @ 0x1F + .4byte gAreaTiles_MinishHouseInteriors @ 0x20 + .4byte gAreaTiles_HouseInteriors1 @ 0x21 + .4byte gAreaTiles_HouseInteriors2 @ 0x22 + .4byte gAreaTiles_HouseInteriors3 @ 0x23 + .4byte gAreaTiles_TreeInteriors @ 0x24 + .4byte gAreaTiles_Dojos @ 0x25 + .4byte gAreaTiles_CrenelCaves @ 0x26 + .4byte gAreaTiles_MinishCracks @ 0x27 + .4byte gAreaTiles_HouseInteriors4 @ 0x28 + .4byte gAreaTiles_GreatFairies @ 0x29 + .4byte gAreaTiles_CrenelCaves @ 0x2A + .4byte gAreaTiles_FortressOfWinds @ 0x2B + .4byte gAreaTiles_ArmosInteriors @ 0x2C + .4byte gAreaTiles_MinishHouseInteriors @ 0x2D + .4byte gAreaTiles_MinishRafters @ 0x2E + .4byte gAreaTiles_GoronCave @ 0x2F + .4byte gAreaTiles_WindTribeTower @ 0x30 + .4byte gAreaTiles_WindTribeTowerRoof @ 0x31 + .4byte gAreaTiles_CrenelCaves @ 0x32 + .4byte gAreaTiles_CrenelCaves @ 0x33 + .4byte gAreaTiles_CrenelCaves @ 0x34 + .4byte gAreaTiles_MinishCaves @ 0x35 + .4byte gAreaTiles_CastleGardenMinishHoles @ 0x36 + .4byte gAreaTiles_CastleGardenMinishHoles @ 0x37 + .4byte gAreaTiles_EzloCutscene @ 0x38 + .4byte gAreaTiles_Unused @ 0x39 + .4byte gAreaTiles_Unused @ 0x3A + .4byte gAreaTiles_Unused @ 0x3B + .4byte gAreaTiles_Unused @ 0x3C + .4byte gAreaTiles_Unused @ 0x3D + .4byte gAreaTiles_Unused @ 0x3E + .4byte gAreaTiles_Unused @ 0x3F + .4byte gAreaTiles_HyruleTownUnderground @ 0x40 + .4byte gAreaTiles_HyruleTownUnderground @ 0x41 + .4byte gAreaTiles_HyruleTownUnderground @ 0x42 + .4byte gAreaTiles_HyruleTownUnderground @ 0x43 + .4byte gAreaTiles_HyruleTownUnderground @ 0x44 + .4byte gAreaTiles_CrenelCaves @ 0x45 + .4byte gAreaTiles_CrenelCaves @ 0x46 + .4byte gAreaTiles_CrenelCaves @ 0x47 + .4byte gAreaTiles_DeepwoodShrine @ 0x48 + .4byte gAreaTiles_DeepwoodShrineBoss @ 0x49 + .4byte gAreaTiles_DeepwoodShrineEntry @ 0x4A + .4byte gAreaTiles_Unused @ 0x4B + .4byte gAreaTiles_Unused @ 0x4C + .4byte gAreaTiles_DeepwoodShrine @ 0x4D + .4byte gAreaTiles_DeepwoodShrine @ 0x4E + .4byte gAreaTiles_DeepwoodShrineBoss @ 0x4F + .4byte gAreaTiles_CaveOfFlames @ 0x50 + .4byte gAreaTiles_CaveOfFlamesBoss @ 0x51 + .4byte gAreaTiles_Unused @ 0x52 + .4byte gAreaTiles_Unused @ 0x53 + .4byte gAreaTiles_Unused @ 0x54 + .4byte gAreaTiles_Unused @ 0x55 + .4byte gAreaTiles_CaveOfFlames @ 0x56 + .4byte gAreaTiles_CaveOfFlames @ 0x57 + .4byte gAreaTiles_FortressOfWinds @ 0x58 + .4byte gAreaTiles_FortressOfWindsTop @ 0x59 + .4byte gAreaTiles_InnerMazaal @ 0x5A + .4byte gAreaTiles_Unused @ 0x5B + .4byte gAreaTiles_Unused @ 0x5C + .4byte gAreaTiles_Unused @ 0x5D + .4byte gAreaTiles_Unused @ 0x5E + .4byte gAreaTiles_FortressOfWinds @ 0x5F + .4byte gAreaTiles_TempleOfDroplets @ 0x60 + .4byte gAreaTiles_61 @ 0x61 + .4byte gAreaTiles_TempleOfDroplets @ 0x62 + .4byte gAreaTiles_Unused @ 0x63 + .4byte gAreaTiles_Unused @ 0x64 + .4byte gAreaTiles_Unused @ 0x65 + .4byte gAreaTiles_Unused @ 0x66 + .4byte gAreaTiles_TempleOfDroplets @ 0x67 + .4byte gAreaTiles_RoyalCrypt @ 0x68 + .4byte gAreaTiles_Unused @ 0x69 + .4byte gAreaTiles_Unused @ 0x6A + .4byte gAreaTiles_Unused @ 0x6B + .4byte gAreaTiles_Unused @ 0x6C + .4byte gAreaTiles_Unused @ 0x6D + .4byte gAreaTiles_Unused @ 0x6E + .4byte gAreaTiles_RoyalCrypt @ 0x6F + .4byte gAreaTiles_PalaceOfWinds @ 0x70 + .4byte gAreaTiles_PalaceOfWindsBoss @ 0x71 + .4byte gAreaTiles_Unused @ 0x72 + .4byte gAreaTiles_Unused @ 0x73 + .4byte gAreaTiles_Unused @ 0x74 + .4byte gAreaTiles_Unused @ 0x75 + .4byte gAreaTiles_Unused @ 0x76 + .4byte gAreaTiles_PalaceOfWinds @ 0x77 + .4byte gAreaTiles_Sanctuary @ 0x78 + .4byte gAreaTiles_Unused @ 0x79 + .4byte gAreaTiles_Unused @ 0x7A + .4byte gAreaTiles_Unused @ 0x7B + .4byte gAreaTiles_Unused @ 0x7C + .4byte gAreaTiles_Unused @ 0x7D + .4byte gAreaTiles_Unused @ 0x7E + .4byte gAreaTiles_Sanctuary @ 0x7F + .4byte gAreaTiles_HyruleCastle @ 0x80 + .4byte gAreaTiles_SanctuaryEntrance @ 0x81 + .4byte gAreaTiles_Unused @ 0x82 + .4byte gAreaTiles_Unused @ 0x83 + .4byte gAreaTiles_Unused @ 0x84 + .4byte gAreaTiles_Unused @ 0x85 + .4byte gAreaTiles_Unused @ 0x86 + .4byte gAreaTiles_HyruleCastle @ 0x87 + .4byte gAreaTiles_DarkHyruleCastle @ 0x88 + .4byte gAreaTiles_DarkHyruleCastleOutside @ 0x89 + .4byte gAreaTiles_VaatisArms @ 0x8A + .4byte gAreaTiles_Vaati3 @ 0x8B + .4byte gAreaTiles_Vaati2 @ 0x8C + .4byte gAreaTiles_DarkHyruleCastleBridge @ 0x8D + .4byte gAreaTiles_Unused @ 0x8E + .4byte gAreaTiles_DarkHyruleCastle @ 0x8F diff --git a/data/map/tileset_headers.s b/data/map/tileset_headers.s index e213fadd..08533896 100755 --- a/data/map/tileset_headers.s +++ b/data/map/tileset_headers.s @@ -6,1145 +6,1145 @@ .include "map_offsets.inc" -gAreaTileset_Unused_0:: @ 08100CE4 -gAreaMetatiles_Unused:: +gAreaTileSet_Unused_0:: @ 08100CE4 +gAreaTiles_Unused:: gAreaRoomMap_Unused:: - tileset_palette_set 0, 1 + tileSet_palette_set 0, 1 -gAreaTilesets_Unused:: @ 08100CF0 +gAreaTileSets_Unused:: @ 08100CF0 gAreaRoomMaps_Unused:: - .4byte gAreaTileset_Unused_0 - -gTileset_MinishWoods_0:: @ 08100CF4 - tileset_tiles offset_gAreaTileset_LakeWoodsCave_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_LakeWoodsCave_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_LakeWoodsCave_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 28, 1 - -gTileset_MinishWoods_1:: @ 08100D24 - tileset_tiles offset_gAreaTileset_LakeWoodsCave_0_3, 0x6000000, 0x2000, 1 - tileset_tiles offset_gAreaTileset_LakeWoodsCave_0_4, 0x6008000, 0x2000, 1 - tileset_palette_set 21, 1 - -gAreaTilesets_MinishWoods:: @ 08100D48 - .4byte gTileset_MinishWoods_0 - .4byte gTileset_MinishWoods_1 - -gAreaTileset_LakeHylia_0:: @ 08100D50 - tileset_tiles offset_gAreaTileset_HyliaDigCaves_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyliaDigCaves_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyliaDigCaves_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 39, 1 - -gAreaTilesets_LakeHylia:: @ 08100D80 - .4byte gAreaTileset_LakeHylia_0 - -gAreaTileset_CastorWilds_0:: @ 08100D84 - tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 19, 1 - -gAreaTilesets_CastorWilds:: @ 08100DB4 - .4byte gAreaTileset_CastorWilds_0 - -gAreaTileset_Ruins_0:: @ 08100DB8 - tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 29, 1 - -gAreaTilesets_Ruins:: @ 08100DE8 - .4byte gAreaTileset_Ruins_0 - -gAreaTileset_HyruleTown_0:: @ 08100DEC - tileset_tiles offset_gAreaTileset_HyruleDigCaves_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyruleDigCaves_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyruleDigCaves_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 27, 1 - -gAreaTilesets_HyruleTown:: @ 08100E1C - .4byte gAreaTileset_HyruleTown_0 - -gAreaTileset_FestivalTown_0:: @ 08100E20 - tileset_tiles offset_gAreaTileset_FestivalTown_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_FestivalTown_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_FestivalTown_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 170, 1 - -gAreaTilesets_FestivalTown:: @ 08100E50 - .4byte gAreaTileset_FestivalTown_0 - -gAreaTileset_MtCrenel_0:: @ 08100E54 - tileset_tiles offset_gAreaTileset_CrenelDigCave_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_CrenelDigCave_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_CrenelDigCave_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 30, 1 - -gAreaTilesets_MtCrenel:: @ 08100E84 - .4byte gAreaTileset_MtCrenel_0 - -gAreaTileset_HyruleField_0:: @ 08100E88 - tileset_tiles offset_gAreaRoomMap_HyruleField_7_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_DigCaves1_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaRoomMap_HyruleField_7_1, 0x6008000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyruleField_2_3, 0x600F000, 0x800, 1 - tileset_palette_set 16, 1 - -gAreaTileset_HyruleField_1:: @ 08100EC4 - tileset_tiles offset_gAreaRoomMap_HyruleField_5_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyruleField_1_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaRoomMap_HyruleField_5_1, 0x6008000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyruleField_2_3, 0x600F000, 0x800, 1 - tileset_palette_set 67, 1 - -gAreaTileset_HyruleField_2:: @ 08100F00 - tileset_tiles offset_gAreaRoomMap_HyruleField_6_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyruleField_2_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaRoomMap_HyruleField_6_1, 0x6008000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyruleField_2_3, 0x600F000, 0x800, 1 - tileset_palette_set 46, 1 - -gAreaTilesets_HyruleField:: @ 08100F3C - .4byte gAreaTileset_HyruleField_0 - .4byte gAreaTileset_HyruleField_1 - .4byte gAreaTileset_HyruleField_2 - -gAreaTileset_CastleGarden_0:: @ 08100F48 - tileset_tiles offset_gAreaTileset_CastleGarden_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_CastleGarden_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_CastleGarden_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 31, 1 - -gAreaTilesets_CastleGarden:: @ 08100F78 - .4byte gAreaTileset_CastleGarden_0 - -gAreaTileset_CloudTops_0:: @ 08100F7C - tileset_tiles offset_gAreaTileset_CloudTops_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_CloudTops_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_CloudTops_0_2, 0x6008000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_CloudTops_0_3, 0x600F000, 0x800, 1 - tileset_palette_set 32, 1 - -gAreaTilesets_CloudTops:: @ 08100FB8 - .4byte gAreaTileset_CloudTops_0 - -gAreaTileset_RoyalValley_0:: @ 08100FBC - tileset_tiles offset_gAreaTileset_RoyalValley_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_RoyalValley_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_RoyalValley_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 38, 1 - -gAreaTilesets_RoyalValley:: @ 08100FEC - .4byte gAreaTileset_RoyalValley_0 - -gAreaTileset_VeilFalls_0:: @ 08100FF0 - tileset_tiles offset_gAreaTileset_VeilFallsTop_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_VeilFallsTop_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_VeilFallsDigCave_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 44, 1 - -gAreaTilesets_VeilFalls:: @ 08101020 - .4byte gAreaTileset_VeilFalls_0 - -gAreaTileset_VeilFallsTop_0:: @ 08101024 - tileset_tiles offset_gAreaTileset_VeilFallsTop_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_VeilFallsTop_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_VeilFallsTop_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 44, 1 - -gAreaTilesets_VeilFallsTop:: @ 08101054 - .4byte gAreaTileset_VeilFallsTop_0 - -gAreaTileset_Beanstalks_0:: @ 08101058 - tileset_tiles offset_gAreaTileset_Beanstalks_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_Beanstalks_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_Beanstalks_0_2, 0x6008000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_Beanstalks_0_3, 0x600F000, 0x800, 1 - tileset_palette_set 41, 1 - -gAreaTilesets_Beanstalks:: @ 08101094 - .4byte gAreaTileset_Beanstalks_0 - -gAreaTileset_CrenelCaves_0:: @ 08101098 - tileset_tiles offset_gAreaTileset_45_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_45_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_45_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 62, 1 - -gAreaTilesets_CrenelCaves:: @ 081010C8 - .4byte gAreaTileset_CrenelCaves_0 - -gAreaTileset_GreatFairies_0:: @ 081010CC - tileset_tiles offset_gAreaTileset_GreatFairies_2_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_GreatFairies_2_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_GreatFairies_2_2, 0x6008000, 0x4000, 1 - tileset_palette_set 92, 1 - -gAreaTileset_GreatFairies_1:: @ 081010FC - tileset_tiles offset_gAreaTileset_GreatFairies_2_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_GreatFairies_2_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_GreatFairies_2_2, 0x6008000, 0x4000, 1 - tileset_palette_set 102, 1 - -gAreaTileset_GreatFairies_2:: @ 0810112C - tileset_tiles offset_gAreaTileset_GreatFairies_2_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_GreatFairies_2_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_GreatFairies_2_2, 0x6008000, 0x4000, 1 - tileset_palette_set 103, 1 - -gAreaTilesets_GreatFairies:: @ 0810115C - .4byte gAreaTileset_GreatFairies_0 - .4byte gAreaTileset_GreatFairies_1 - .4byte gAreaTileset_GreatFairies_2 - -gAreaTileset_LakeWoodsCave_0:: @ 08101168 - tileset_tiles offset_gAreaTileset_LakeWoodsCave_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_LakeWoodsCave_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_LakeWoodsCave_0_2, 0x6008000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_LakeWoodsCave_0_3, 0x6001000, 0x2000, 1 - tileset_tiles offset_gAreaTileset_LakeWoodsCave_0_4, 0x6009000, 0x2000, 1 - tileset_palette_set 21, 1 - -gAreaTilesets_LakeWoodsCave:: @ 081011B0 - .4byte gAreaTileset_LakeWoodsCave_0 - -gAreaTileset_HyruleDigCaves_0:: @ 081011B4 - tileset_tiles offset_gAreaTileset_HyruleDigCaves_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyruleDigCaves_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyruleDigCaves_0_2, 0x6008000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyruleDigCaves_0_3, 0x6001000, 0x2000, 1 - tileset_tiles offset_gAreaTileset_HyruleDigCaves_0_4, 0x6009000, 0x2000, 1 - tileset_palette_set 54, 1 - -gAreaTilesets_HyruleDigCaves:: @ 081011FC - .4byte gAreaTileset_HyruleDigCaves_0 - -gAreaTileset_DigCaves1_0:: @ 08101200 - tileset_tiles offset_gAreaRoomMap_HyruleField_7_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_DigCaves1_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaRoomMap_HyruleField_7_1, 0x6008000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_DigCaves1_0_3, 0x6001000, 0x2000, 1 - tileset_tiles offset_gAreaTileset_DigCaves1_0_4, 0x6009000, 0x2000, 1 - tileset_palette_set 85, 1 - -gAreaTilesets_DigCaves1:: @ 08101248 - .4byte gAreaTileset_DigCaves1_0 - -gAreaTileset_CrenelDigCave_0:: @ 0810124C - tileset_tiles offset_gAreaTileset_CrenelDigCave_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_CrenelDigCave_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_CrenelDigCave_0_2, 0x6008000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_VeilFallsDigCave_0_3, 0x6001000, 0x2000, 1 - tileset_tiles offset_gAreaTileset_VeilFallsDigCave_0_4, 0x6009000, 0x2000, 1 - tileset_palette_set 33, 1 - -gAreaTilesets_CrenelDigCave:: @ 08101294 - .4byte gAreaTileset_CrenelDigCave_0 - -gAreaTileset_VeilFallsDigCave_0:: @ 08101298 - tileset_tiles offset_gAreaTileset_VeilFallsTop_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_VeilFallsTop_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_VeilFallsDigCave_0_2, 0x6008000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_VeilFallsDigCave_0_3, 0x6001000, 0x2000, 1 - tileset_tiles offset_gAreaTileset_VeilFallsDigCave_0_4, 0x6009000, 0x2000, 1 - tileset_palette_set 99, 1 - -gAreaTilesets_VeilFallsDigCave:: @ 081012E0 - .4byte gAreaTileset_VeilFallsDigCave_0 - -gAreaTileset_CastorWildsDigCave_0:: @ 081012E4 - tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_2, 0x6008000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_3, 0x6001000, 0x2000, 1 - tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_4, 0x6009000, 0x2000, 1 - tileset_palette_set 100, 1 - -gAreaTilesets_CastorWildsDigCave:: @ 0810132C - .4byte gAreaTileset_CastorWildsDigCave_0 - -gAreaTileset_OuterFortressOfWinds_0:: @ 08101330 - tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_2, 0x6008000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_3, 0x6001000, 0x2000, 1 - tileset_tiles offset_gAreaTileset_OuterFortressOfWinds_0_4, 0x6009000, 0x2000, 1 - tileset_palette_set 167, 1 - -gAreaTilesets_OuterFortressOfWinds:: @ 08101378 - .4byte gAreaTileset_OuterFortressOfWinds_0 - -gAreaTileset_HyliaDigCaves_0:: @ 0810137C - tileset_tiles offset_gAreaTileset_HyliaDigCaves_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyliaDigCaves_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyliaDigCaves_0_2, 0x6008000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyliaDigCaves_0_3, 0x6001000, 0x2000, 1 - tileset_tiles offset_gAreaTileset_HyliaDigCaves_0_4, 0x6009000, 0x2000, 1 - tileset_palette_set 20, 1 - -gAreaTilesets_HyliaDigCaves:: @ 081013C4 - .4byte gAreaTileset_HyliaDigCaves_0 - -gAreaTileset_MinishVillage_0:: @ 081013C8 - tileset_tiles offset_gAreaTileset_MinishVillage_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_MinishVillage_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_MinishVillage_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 14, 1 - -gAreaTileset_MinishVillage_1:: @ 081013F8 - tileset_tiles offset_gAreaTileset_MinishVillage_1_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_MinishVillage_1_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_MinishVillage_1_2, 0x6008000, 0x4000, 1 - tileset_palette_set 25, 1 - -gAreaTilesets_MinishVillage:: @ 08101428 - .4byte gAreaTileset_MinishVillage_0 - .4byte gAreaTileset_MinishVillage_1 - -gAreaTileset_MelarisMine_0:: @ 08101430 - tileset_tiles offset_gAreaTileset_MelarisMine_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_MelarisMine_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_MelarisMine_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 61, 1 - -gAreaTilesets_MelarisMine:: @ 08101460 - .4byte gAreaTileset_MelarisMine_0 - -gAreaTileset_MinishPaths_0:: @ 08101464 - tileset_tiles offset_gAreaTileset_MinishPaths_2_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_MinishPaths_2_1, 0x6004000, 0x4000, 1 - tileset_palette_set 18, 1 - -gAreaTileset_MinishPaths_1:: @ 08101488 - tileset_tiles offset_gAreaTileset_MinishPaths_2_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_MinishPaths_2_1, 0x6004000, 0x4000, 1 - tileset_palette_set 63, 1 - -gAreaTileset_MinishPaths_2:: @ 081014AC - tileset_tiles offset_gAreaTileset_MinishPaths_2_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_MinishPaths_2_1, 0x6004000, 0x4000, 1 - tileset_palette_set 64, 1 - -gAreaTilesets_MinishPaths:: @ 081014D0 - .4byte gAreaTileset_MinishPaths_0 - .4byte gAreaTileset_MinishPaths_1 - .4byte gAreaTileset_MinishPaths_2 - -gAreaTileset_CrenelMinishPaths_0:: @ 081014DC - tileset_tiles offset_gAreaTileset_CrenelMinishPaths_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_CrenelMinishPaths_0_1, 0x6004000, 0x4000, 1 - tileset_palette_set 65, 1 - -gAreaTileset_CrenelMinishPaths_1:: @ 08101500 - tileset_tiles offset_gAreaTileset_CrenelMinishPaths_2_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_CrenelMinishPaths_2_1, 0x6004000, 0x4000, 1 - tileset_palette_set 66, 1 - -gAreaTileset_CrenelMinishPaths_2:: @ 08101524 - tileset_tiles offset_gAreaTileset_CrenelMinishPaths_2_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_CrenelMinishPaths_2_1, 0x6004000, 0x4000, 1 - tileset_palette_set 93, 1 - -gAreaTilesets_CrenelMinishPaths:: @ 08101548 - .4byte gAreaTileset_CrenelMinishPaths_0 - .4byte gAreaTileset_CrenelMinishPaths_1 - .4byte gAreaTileset_CrenelMinishPaths_2 - -gAreaTileset_MinishHouseInteriors_0:: @ 08101554 - tileset_tiles offset_gAreaTileset_MinishHouseInteriors_0_0, 0x6000000, 0x8740, 1 - tileset_palette_set 68, 1 - -gAreaTileset_MinishHouseInteriors_1:: @ 0810156C - tileset_tiles offset_gAreaTileset_MinishHouseInteriors_1_0, 0x6000000, 0x7540, 1 - tileset_palette_set 69, 1 - -gAreaTileset_MinishHouseInteriors_2:: @ 08101584 - tileset_tiles offset_gAreaTileset_MinishHouseInteriors_2_0, 0x6000000, 0x4B40, 1 - tileset_palette_set 70, 1 - -gAreaTileset_MinishHouseInteriors_3:: @ 0810159C - tileset_tiles offset_gAreaTileset_MinishHouseInteriors_3_0, 0x6000000, 0x4A40, 1 - tileset_palette_set 71, 1 - -gAreaTileset_MinishHouseInteriors_4:: @ 081015B4 - tileset_tiles offset_gAreaTileset_MinishHouseInteriors_4_0, 0x6000000, 0x4980, 1 - tileset_palette_set 72, 1 - -gAreaTileset_MinishHouseInteriors_5:: @ 081015CC - tileset_tiles offset_gAreaTileset_MinishHouseInteriors_5_0, 0x6000000, 0x4D80, 1 - tileset_palette_set 73, 1 - -gAreaTileset_MinishHouseInteriors_6:: @ 081015E4 - tileset_tiles offset_gAreaTileset_MinishHouseInteriors_6_0, 0x6000000, 0x8E40, 1 - tileset_palette_set 74, 1 - -gAreaTileset_MinishHouseInteriors_7:: @ 081015FC - tileset_tiles offset_gAreaTileset_MinishHouseInteriors_7_0, 0x6000000, 0x7E00, 1 - tileset_palette_set 75, 1 - -gAreaTileset_MinishHouseInteriors_8:: @ 08101614 - tileset_tiles offset_gAreaTileset_MinishHouseInteriors_8_0, 0x6000000, 0x9F40, 1 - tileset_palette_set 76, 1 - -gAreaTileset_MinishHouseInteriors_9:: @ 0810162C - tileset_tiles offset_gAreaTileset_MinishHouseInteriors_9_0, 0x6000000, 0x7980, 1 - tileset_palette_set 86, 1 - -gAreaTileset_MinishHouseInteriors_10:: @ 08101644 - tileset_tiles offset_gAreaTileset_MinishHouseInteriors_10_0, 0x6000000, 0x7B40, 1 - tileset_palette_set 87, 1 - -gAreaTileset_MinishHouseInteriors_11:: @ 0810165C - tileset_tiles offset_gAreaTileset_MinishHouseInteriors_11_0, 0x6000000, 0x69C0, 1 - tileset_palette_set 88, 1 - -gAreaTileset_MinishHouseInteriors_12:: @ 08101674 - tileset_tiles offset_gAreaTileset_MinishHouseInteriors_12_0, 0x6000000, 0x5D80, 1 - tileset_palette_set 77, 1 - -gAreaTileset_MinishHouseInteriors_13:: @ 0810168C - tileset_tiles offset_gAreaTileset_MinishHouseInteriors_13_0, 0x6000000, 0x5CC0, 1 - tileset_palette_set 78, 1 - -gAreaTileset_MinishHouseInteriors_14:: @ 081016A4 - tileset_tiles offset_gAreaTileset_MinishHouseInteriors_14_0, 0x6000000, 0x5B00, 1 - tileset_palette_set 79, 1 - -gAreaTileset_MinishHouseInteriors_15:: @ 081016BC - tileset_tiles offset_gAreaTileset_MinishHouseInteriors_15_0, 0x6000000, 0x5240, 1 - tileset_palette_set 80, 1 - -gAreaTileset_MinishHouseInteriors_16:: @ 081016D4 - tileset_tiles offset_gAreaTileset_MinishHouseInteriors_16_0, 0x6000000, 0x5C40, 1 - tileset_palette_set 81, 1 - -gAreaTileset_MinishHouseInteriors_17:: @ 081016EC - tileset_tiles offset_gAreaTileset_MinishHouseInteriors_17_0, 0x6000000, 0x5740, 1 - tileset_palette_set 82, 1 - -gAreaTileset_MinishHouseInteriors_18:: @ 08101704 - tileset_tiles offset_gAreaTileset_MinishHouseInteriors_18_0, 0x6000000, 0x6180, 1 - tileset_palette_set 83, 1 - -gAreaTileset_MinishHouseInteriors_19:: @ 0810171C - tileset_tiles offset_gAreaTileset_MinishHouseInteriors_19_0, 0x6000000, 0x5C80, 1 - tileset_palette_set 84, 1 - -gAreaTilesets_MinishHouseInteriors:: @ 08101734 - .4byte gAreaTileset_MinishHouseInteriors_0 - .4byte gAreaTileset_MinishHouseInteriors_1 - .4byte gAreaTileset_MinishHouseInteriors_2 - .4byte gAreaTileset_MinishHouseInteriors_3 - .4byte gAreaTileset_MinishHouseInteriors_4 - .4byte gAreaTileset_MinishHouseInteriors_5 - .4byte gAreaTileset_MinishHouseInteriors_6 - .4byte gAreaTileset_MinishHouseInteriors_7 - .4byte gAreaTileset_MinishHouseInteriors_8 - .4byte gAreaTileset_MinishHouseInteriors_9 - .4byte gAreaTileset_MinishHouseInteriors_10 - .4byte gAreaTileset_MinishHouseInteriors_11 - .4byte gAreaTileset_MinishHouseInteriors_12 - .4byte gAreaTileset_MinishHouseInteriors_13 - .4byte gAreaTileset_MinishHouseInteriors_14 - .4byte gAreaTileset_MinishHouseInteriors_15 - .4byte gAreaTileset_MinishHouseInteriors_16 - .4byte gAreaTileset_MinishHouseInteriors_17 - .4byte gAreaTileset_MinishHouseInteriors_18 - .4byte gAreaTileset_MinishHouseInteriors_19 - -gAreaTileset_TownMinishHoles_0:: @ 08101784 - tileset_tiles offset_gAreaTileset_TownMinishHoles_0_0, 0x6000000, 0x6100, 1 - tileset_palette_set 115, 1 - -gAreaTileset_TownMinishHoles_1:: @ 0810179C - tileset_tiles offset_gAreaTileset_TownMinishHoles_1_0, 0x6000000, 0x7DC0, 1 - tileset_palette_set 116, 1 - -gAreaTileset_TownMinishHoles_2:: @ 081017B4 - tileset_tiles offset_gAreaTileset_TownMinishHoles_2_0, 0x6000000, 0x70C0, 1 - tileset_palette_set 117, 1 - -gAreaTileset_TownMinishHoles_3:: @ 081017CC - tileset_tiles offset_gAreaTileset_TownMinishHoles_3_0, 0x6000000, 0x7E40, 1 - tileset_palette_set 118, 1 - -gAreaTileset_TownMinishHoles_4:: @ 081017E4 - tileset_tiles offset_gAreaTileset_TownMinishHoles_4_0, 0x6000000, 0x7240, 1 - tileset_palette_set 119, 1 - -gAreaTileset_TownMinishHoles_5:: @ 081017FC - tileset_tiles offset_gAreaTileset_TownMinishHoles_5_0, 0x6000000, 0x8900, 1 - tileset_palette_set 129, 1 - -gAreaTileset_TownMinishHoles_6:: @ 08101814 - tileset_tiles offset_gAreaTileset_TownMinishHoles_6_0, 0x6000000, 0xBEC0, 1 - tileset_palette_set 124, 1 - -gAreaTileset_TownMinishHoles_7:: @ 0810182C - tileset_tiles offset_gAreaTileset_TownMinishHoles_7_0, 0x6000000, 0xA480, 1 - tileset_palette_set 123, 1 - -gAreaTileset_TownMinishHoles_8:: @ 08101844 - tileset_tiles offset_gAreaTileset_TownMinishHoles_8_0, 0x6000000, 0xB0C0, 1 - tileset_palette_set 122, 1 - -gAreaTilesets_TownMinishHoles:: @ 0810185C - .4byte gAreaTileset_TownMinishHoles_0 - .4byte gAreaTileset_TownMinishHoles_1 - .4byte gAreaTileset_TownMinishHoles_2 - .4byte gAreaTileset_TownMinishHoles_3 - .4byte gAreaTileset_TownMinishHoles_4 - .4byte gAreaTileset_TownMinishHoles_5 - .4byte gAreaTileset_TownMinishHoles_6 - .4byte gAreaTileset_TownMinishHoles_7 - .4byte gAreaTileset_TownMinishHoles_8 - -gAreaTileset_HouseInteriors1_0:: @ 08101880 - tileset_tiles offset_gAreaTileset_HouseInteriors1_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HouseInteriors1_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 51, 1 - -gAreaTilesets_HouseInteriors1:: @ 081018B0 - .4byte gAreaTileset_HouseInteriors1_0 - -gAreaTileset_HouseInteriors2_0:: @ 081018B4 - tileset_tiles offset_gAreaTileset_HouseInteriors2_2_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HouseInteriors2_2_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 52, 1 - -gAreaTileset_HouseInteriors2_1:: @ 081018E4 - tileset_tiles offset_gAreaTileset_HouseInteriors2_2_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HouseInteriors2_2_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 168, 1 - -gAreaTileset_HouseInteriors2_2:: @ 08101914 - tileset_tiles offset_gAreaTileset_HouseInteriors2_2_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HouseInteriors2_2_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 157, 1 - -gAreaTilesets_HouseInteriors2:: @ 08101944 - .4byte gAreaTileset_HouseInteriors2_0 - .4byte gAreaTileset_HouseInteriors2_1 - .4byte gAreaTileset_HouseInteriors2_2 - -gAreaTileset_HouseInteriors4_0:: @ 08101950 - tileset_tiles offset_gAreaTileset_HouseInteriors4_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HouseInteriors4_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 89, 1 - -gAreaTilesets_HouseInteriors4:: @ 08101980 - .4byte gAreaTileset_HouseInteriors4_0 - -gAreaTileset_HouseInteriors3_0:: @ 08101984 - tileset_tiles offset_gAreaTileset_HouseInteriors3_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HouseInteriors3_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 53, 1 - -gAreaTilesets_HouseInteriors3:: @ 081019B4 - .4byte gAreaTileset_HouseInteriors3_0 - -gAreaTileset_TreeInteriors_0:: @ 081019B8 - tileset_tiles offset_gAreaTileset_TreeInteriors_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_TreeInteriors_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 13, 1 - -gAreaTilesets_TreeInteriors:: @ 081019E8 - .4byte gAreaTileset_TreeInteriors_0 - -gAreaTileset_Dojos_0:: @ 081019EC - tileset_tiles offset_gAreaTileset_Dojos_5_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_Dojos_5_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 150, 1 - -gAreaTileset_Dojos_1:: @ 08101A1C - tileset_tiles offset_gAreaTileset_Dojos_5_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_Dojos_5_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 149, 1 - -gAreaTileset_Dojos_2:: @ 08101A4C - tileset_tiles offset_gAreaTileset_Dojos_5_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_Dojos_5_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 148, 1 - -gAreaTileset_Dojos_3:: @ 08101A7C - tileset_tiles offset_gAreaTileset_Dojos_5_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_Dojos_5_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 146, 1 - -gAreaTileset_Dojos_4:: @ 08101AAC - tileset_tiles offset_gAreaTileset_Dojos_5_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_Dojos_5_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 147, 1 - -gAreaTileset_Dojos_5:: @ 08101ADC - tileset_tiles offset_gAreaTileset_Dojos_5_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_Dojos_5_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 45, 1 - -gAreaTilesets_Dojos:: @ 08101B0C - .4byte gAreaTileset_Dojos_0 - .4byte gAreaTileset_Dojos_1 - .4byte gAreaTileset_Dojos_2 - .4byte gAreaTileset_Dojos_3 - .4byte gAreaTileset_Dojos_4 - .4byte gAreaTileset_Dojos_5 - -gAreaTileset_MinishCracks_0:: @ 08101B24 - tileset_tiles offset_gAreaTileset_MinishCracks_4_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_MinishCracks_4_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 153, 1 - -gAreaTileset_MinishCracks_1:: @ 08101B54 - tileset_tiles offset_gAreaTileset_MinishCracks_4_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_MinishCracks_4_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 152, 1 - -gAreaTileset_MinishCracks_2:: @ 08101B84 - tileset_tiles offset_gAreaTileset_MinishCracks_4_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_MinishCracks_4_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 154, 1 - -gAreaTileset_MinishCracks_3:: @ 08101BB4 - tileset_tiles offset_gAreaTileset_MinishCracks_4_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_MinishCracks_4_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 34, 1 - -gAreaTileset_MinishCracks_4:: @ 08101BE4 - tileset_tiles offset_gAreaTileset_MinishCracks_4_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_MinishCracks_4_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 151, 1 - -gAreaTilesets_MinishCracks:: @ 08101C14 - .4byte gAreaTileset_MinishCracks_0 - .4byte gAreaTileset_MinishCracks_1 - .4byte gAreaTileset_MinishCracks_2 - .4byte gAreaTileset_MinishCracks_3 - .4byte gAreaTileset_MinishCracks_4 - -gAreaTileset_ArmosInteriors_0:: @ 08101C28 - tileset_tiles offset_gAreaTileset_ArmosInteriors_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_ArmosInteriors_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_ArmosInteriors_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 110, 1 - -gAreaTilesets_ArmosInteriors:: @ 08101C58 - .4byte gAreaTileset_ArmosInteriors_0 - -gAreaTileset_MinishRafters_0:: @ 08101C5C - tileset_tiles offset_gAreaTileset_MinishRafters_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_MinishRafters_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 121, 1 - -gAreaTilesets_MinishRafters:: @ 08101C8C - .4byte gAreaTileset_MinishRafters_0 - -gAreaTileset_GoronCave_0:: @ 08101C90 - tileset_tiles offset_gAreaTileset_GoronCave_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_GoronCave_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_GoronCave_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 125, 1 - -gAreaTilesets_GoronCave:: @ 08101CC0 - .4byte gAreaTileset_GoronCave_0 - -gAreaTileset_WindTribeTower_0:: @ 08101CC4 - tileset_tiles offset_gAreaTileset_WindTribeTower_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_WindTribeTower_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 126, 1 - -gAreaTilesets_WindTribeTower:: @ 08101CF4 - .4byte gAreaTileset_WindTribeTower_0 - -gAreaTileset_WindTribeTowerRoof_0:: @ 08101CF8 - tileset_tiles offset_gAreaTileset_WindTribeTowerRoof_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_WindTribeTowerRoof_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_WindTribeTowerRoof_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 127, 1 - -gAreaTilesets_WindTribeTowerRoof:: @ 08101D28 - .4byte gAreaTileset_WindTribeTowerRoof_0 - -gAreaTileset_MinishCaves_0:: @ 08101D2C - tileset_tiles offset_gAreaTileset_MinishCaves_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_MinishCaves_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_MinishCaves_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 158, 1 - -gAreaTilesets_MinishCaves:: @ 08101D5C - .4byte gAreaTileset_MinishCaves_0 - -gAreaTileset_CastleGardenMinishHoles_0:: @ 08101D60 - tileset_tiles offset_gAreaTileset_37_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_37_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_37_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 159, 1 - -gAreaTilesets_CastleGardenMinishHoles:: @ 08101D90 - .4byte gAreaTileset_CastleGardenMinishHoles_0 - -gAreaTileset_37_0:: @ 08101D94 - tileset_tiles offset_gAreaTileset_37_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_37_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_37_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 160, 1 - -gAreaTilesets_37:: @ 08101DC4 - .4byte gAreaTileset_37_0 - -gAreaTileset_EzloCutscene_0:: @ 08101DC8 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_EzloCutscene_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 161, 1 - -gAreaTilesets_EzloCutscene:: @ 08101DF8 - .4byte gAreaTileset_EzloCutscene_0 - -gAreaTileset_HyruleTownUnderground_0:: @ 08101DFC - tileset_tiles offset_gAreaTileset_SimonsSimulation_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_SimonsSimulation_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_SimonsSimulation_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 109, 1 - -gAreaTilesets_HyruleTownUnderground:: @ 08101E2C - .4byte gAreaTileset_HyruleTownUnderground_0 - -gAreaTileset_SimonsSimulation_0:: @ 08101E30 - tileset_tiles offset_gAreaTileset_SimonsSimulation_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_SimonsSimulation_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_SimonsSimulation_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 15, 1 - -gAreaTilesets_SimonsSimulation:: @ 08101E60 - .4byte gAreaTileset_SimonsSimulation_0 - -gAreaTileset_40_0:: @ 08101E64 - tileset_tiles offset_gAreaTileset_SimonsSimulation_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_SimonsSimulation_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_SimonsSimulation_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 15, 1 - -gAreaTilesets_40:: @ 08101E94 - .4byte gAreaTileset_40_0 - -gAreaTileset_DeepwoodShrine_0:: @ 08101E98 - tileset_tiles offset_gAreaTileset_DeepwoodShrine_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_DeepwoodShrine_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_DeepwoodShrine_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 17, 1 - -gAreaTilesets_DeepwoodShrine:: @ 08101EC8 - .4byte gAreaTileset_DeepwoodShrine_0 - -gAreaTileset_DeepwoodShrineBoss_0:: @ 08101ECC - tileset_tiles offset_gAreaTileset_DeepwoodShrineBoss_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_DeepwoodShrineBoss_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_DeepwoodShrineBoss_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 17, 1 - -gAreaTilesets_DeepwoodShrineBoss:: @ 08101EFC - .4byte gAreaTileset_DeepwoodShrineBoss_0 - -gAreaTileset_DeepwoodShrineEntry_0:: @ 08101F00 - tileset_tiles offset_gAreaTileset_DeepwoodShrineEntry_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_DeepwoodShrineEntry_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_DeepwoodShrineEntry_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 90, 1 - -gAreaTilesets_DeepwoodShrineEntry:: @ 08101F30 - .4byte gAreaTileset_DeepwoodShrineEntry_0 - -gAreaTileset_CaveOfFlames_0:: @ 08101F34 - tileset_tiles offset_gAreaTileset_CaveOfFlames_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_CaveOfFlames_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_CaveOfFlames_0_2, 0x6008000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_CaveOfFlames_0_3, 0x600F000, 0x800, 1 - tileset_palette_set 36, 1 - -gAreaTilesets_CaveOfFlames:: @ 08101F70 - .4byte gAreaTileset_CaveOfFlames_0 - -gAreaTileset_CaveOfFlamesBoss_0:: @ 08101F74 - tileset_tiles offset_gAreaTileset_CaveOfFlamesBoss_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_CaveOfFlamesBoss_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_CaveOfFlamesBoss_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 36, 1 - -gAreaTilesets_CaveOfFlamesBoss:: @ 08101FA4 - .4byte gAreaTileset_CaveOfFlamesBoss_0 - -gAreaTileset_CastorDarknut_0:: @ 08101FA8 - tileset_tiles offset_gAreaTileset_CastorDarknut_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_CastorDarknut_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_CastorDarknut_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 37, 1 - -gAreaTilesets_FortressOfWinds:: @ 08101FD8 - .4byte gAreaTileset_CastorDarknut_0 - -gAreaTileset_FortressOfWindsTop_0:: @ 08101FDC - tileset_tiles offset_gAreaTileset_FortressOfWindsTop_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_FortressOfWindsTop_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_FortressOfWindsTop_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 94, 1 - -gAreaTilesets_FortressOfWindsTop:: @ 0810200C - .4byte gAreaTileset_FortressOfWindsTop_0 - -gAreaTileset_InnerMazaal_0:: @ 08102010 - tileset_tiles offset_gAreaTileset_InnerMazaal_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_InnerMazaal_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_InnerMazaal_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 128, 1 - -gAreaTilesets_InnerMazaal:: @ 08102040 - .4byte gAreaTileset_InnerMazaal_0 - -gAreaTileset_TempleOfDroplets_0:: @ 08102044 - tileset_tiles offset_gAreaTileset_HyruleTownMinishCaves_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyruleTownMinishCaves_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyruleTownMinishCaves_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 55, 1 - -gAreaTilesets_TempleOfDroplets:: @ 08102074 - .4byte gAreaTileset_TempleOfDroplets_0 - -gAreaTileset_61_0:: @ 08102078 - tileset_tiles offset_gAreaTileset_61_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_61_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_61_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 104, 1 - -gAreaTilesets_61:: @ 081020A8 - .4byte gAreaTileset_61_0 - -gAreaTileset_HyruleTownMinishCaves_0:: @ 081020AC - tileset_tiles offset_gAreaTileset_HyruleTownMinishCaves_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyruleTownMinishCaves_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyruleTownMinishCaves_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 130, 1 - -gAreaTilesets_HyruleTownMinishCaves:: @ 081020DC - .4byte gAreaTileset_HyruleTownMinishCaves_0 - -gAreaTileset_RoyalCrypt_0:: @ 081020E0 - tileset_tiles offset_gAreaTileset_RoyalCrypt_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_RoyalCrypt_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_RoyalCrypt_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 60, 1 - -gAreaTilesets_RoyalCrypt:: @ 08102110 - .4byte gAreaTileset_RoyalCrypt_0 - -gAreaTileset_PalaceOfWinds_GyorgTornado:: @ 08102114 - tileset_tiles offset_gAreaTileset_PalaceOfWinds_GyorgTornado_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_PalaceOfWinds_GyorgTornado_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_PalaceOfWinds_GyorgTornado_2, 0x6008000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_PalaceOfWinds_GyorgTornado_3, 0x600F000, 0x800, 1 - tileset_palette_set 56, 1 - -gAreaTilesets_PalaceOfWinds:: @ 08102150 - .4byte gAreaTileset_PalaceOfWinds_GyorgTornado - -gAreaTileset_PalaceOfWindsBoss_0:: @ 08102154 - tileset_tiles offset_gAreaTileset_PalaceOfWindsBoss_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_PalaceOfWindsBoss_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_PalaceOfWindsBoss_0_2, 0x600F000, 0x800, 1 - tileset_palette_set 162, 1 - -gAreaTilesets_PalaceOfWindsBoss:: @ 08102184 - .4byte gAreaTileset_PalaceOfWindsBoss_0 - -gAreaTileset_Sanctuary_0:: @ 08102188 - tileset_tiles offset_gAreaTileset_Sanctuary_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_Sanctuary_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_Sanctuary_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 57, 1 - -gAreaTilesets_Sanctuary:: @ 081021B8 - .4byte gAreaTileset_Sanctuary_0 - -gAreaTileset_HyruleCastle_0:: @ 081021BC - tileset_tiles offset_gAreaTileset_HyruleCastle_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyruleCastle_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_HyruleCastle_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 58, 1 - -gAreaTilesets_HyruleCastle:: @ 081021EC - .4byte gAreaTileset_HyruleCastle_0 - -gAreaTileset_SanctuaryEntrance_0:: @ 081021F0 - tileset_tiles offset_gAreaTileset_SanctuaryEntrance_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_SanctuaryEntrance_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_SanctuaryEntrance_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 145, 1 - -gAreaTilesets_SanctuaryEntrance:: @ 08102220 - .4byte gAreaTileset_SanctuaryEntrance_0 - -gAreaTileset_DarkHyruleCastle_1FEntrance:: @ 08102224 - tileset_tiles offset_gAreaTileset_DarkHyruleCastle_1FEntrance_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_DarkHyruleCastle_1FEntrance_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_DarkHyruleCastle_1FEntrance_2, 0x6008000, 0x4000, 1 - tileset_palette_set 59, 1 - -gAreaTilesets_DarkHyruleCastle:: @ 08102254 - .4byte gAreaTileset_DarkHyruleCastle_1FEntrance - -gAreaTileset_DarkHyruleCastleOutside_0:: @ 08102258 - tileset_tiles offset_gAreaTileset_DarkHyruleCastleOutside_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_DarkHyruleCastleOutside_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_DarkHyruleCastleOutside_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 144, 1 - -gAreaTilesets_DarkHyruleCastleOutside:: @ 08102288 - .4byte gAreaTileset_DarkHyruleCastleOutside_0 - -gAreaTileset_DarkHyruleCastleBridge_0:: @ 0810228C - tileset_tiles offset_gAreaTileset_DarkHyruleCastleBridge_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_DarkHyruleCastleBridge_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_DarkHyruleCastleBridge_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 180, 1 - -gAreaTilesets_DarkHyruleCastleBridge:: @ 081022BC - .4byte gAreaTileset_DarkHyruleCastleBridge_0 - -gAreaTileset_VaatisArms_0:: @ 081022C0 - tileset_tiles offset_gAreaTileset_VaatisArms_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_VaatisArms_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_VaatisArms_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 155, 1 - -gAreaTilesets_VaatisArms:: @ 081022F0 - .4byte gAreaTileset_VaatisArms_0 - -gAreaTileset_Vaati3_0:: @ 081022F4 - tileset_tiles offset_gAreaTileset_Vaati3_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_Vaati3_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_Vaati3_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 156, 1 - -gAreaTilesets_Vaati3:: @ 08102324 - .4byte gAreaTileset_Vaati3_0 - -gAreaTileset_Vaati2_0:: @ 08102328 - tileset_tiles offset_gAreaTileset_Vaati2_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_Vaati2_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_Vaati2_0_2, 0x6008000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_Vaati2_0_3, 0x600F000, 0x800, 1 - tileset_palette_set 169, 1 - -gAreaTilesets_Vaati2:: @ 08102364 - .4byte gAreaTileset_Vaati2_0 - -gAreaTileset_45_0:: @ 08102368 - tileset_tiles offset_gAreaTileset_45_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_45_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_45_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 35, 1 - -gAreaTilesets_45:: @ 08102398 - .4byte gAreaTileset_45_0 - -gAreaTileset_CastorCaves_0:: @ 0810239C - tileset_tiles offset_gAreaTileset_45_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_45_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_45_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 101, 1 - -gAreaTilesets_CastorCaves:: @ 081023CC - .4byte gAreaTileset_CastorCaves_0 - -gAreaTileset_Caves_0:: @ 081023D0 - tileset_tiles offset_gAreaTileset_45_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_45_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_45_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 131, 1 - -gAreaTilesets_Caves:: @ 08102400 - .4byte gAreaTileset_Caves_0 - -gAreaTileset_VeilFallsCaves_0:: @ 08102404 - tileset_tiles offset_gAreaTileset_45_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_45_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_45_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 132, 1 - -gAreaTilesets_VeilFallsCaves:: @ 08102434 - .4byte gAreaTileset_VeilFallsCaves_0 - -gAreaTileset_RoyalValleyGraves_0:: @ 08102438 - tileset_tiles offset_gAreaTileset_45_0_0, 0x6000000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_45_0_1, 0x6004000, 0x4000, 1 - tileset_tiles offset_gAreaTileset_45_0_2, 0x6008000, 0x4000, 1 - tileset_palette_set 133, 1 - -gAreaTilesets_RoyalValleyGraves:: @ 08102468 - .4byte gAreaTileset_RoyalValleyGraves_0 - -gAreaTilesets:: @ 0810246C - .4byte gAreaTilesets_MinishWoods @ 0x0 - .4byte gAreaTilesets_MinishVillage @ 0x1 - .4byte gAreaTilesets_HyruleTown @ 0x2 - .4byte gAreaTilesets_HyruleField @ 0x3 - .4byte gAreaTilesets_CastorWilds @ 0x4 - .4byte gAreaTilesets_Ruins @ 0x5 - .4byte gAreaTilesets_MtCrenel @ 0x6 - .4byte gAreaTilesets_CastleGarden @ 0x7 - .4byte gAreaTilesets_CloudTops @ 0x8 - .4byte gAreaTilesets_RoyalValley @ 0x9 - .4byte gAreaTilesets_VeilFalls @ 0xA - .4byte gAreaTilesets_LakeHylia @ 0xB - .4byte gAreaTilesets_LakeWoodsCave @ 0xC - .4byte gAreaTilesets_Beanstalks @ 0xD - .4byte gAreaTilesets_MinishWoods @ 0xE - .4byte gAreaTilesets_HyruleDigCaves @ 0xF - .4byte gAreaTilesets_MelarisMine @ 0x10 - .4byte gAreaTilesets_MinishPaths @ 0x11 - .4byte gAreaTilesets_CrenelMinishPaths @ 0x12 - .4byte gAreaTilesets_DigCaves1 @ 0x13 - .4byte gAreaTilesets_CrenelDigCave @ 0x14 - .4byte gAreaTilesets_FestivalTown @ 0x15 - .4byte gAreaTilesets_VeilFallsDigCave @ 0x16 - .4byte gAreaTilesets_CastorWildsDigCave @ 0x17 - .4byte gAreaTilesets_OuterFortressOfWinds @ 0x18 - .4byte gAreaTilesets_HyliaDigCaves @ 0x19 - .4byte gAreaTilesets_VeilFallsTop @ 0x1A - .4byte gAreaTilesets_Unused @ 0x1B - .4byte gAreaTilesets_Unused @ 0x1C - .4byte gAreaTilesets_Unused @ 0x1D - .4byte gAreaTilesets_Unused @ 0x1E - .4byte gAreaTilesets_Unused @ 0x1F - .4byte gAreaTilesets_MinishHouseInteriors @ 0x20 - .4byte gAreaTilesets_HouseInteriors1 @ 0x21 - .4byte gAreaTilesets_HouseInteriors2 @ 0x22 - .4byte gAreaTilesets_HouseInteriors3 @ 0x23 - .4byte gAreaTilesets_TreeInteriors @ 0x24 - .4byte gAreaTilesets_Dojos @ 0x25 - .4byte gAreaTilesets_CrenelCaves @ 0x26 - .4byte gAreaTilesets_MinishCracks @ 0x27 - .4byte gAreaTilesets_HouseInteriors4 @ 0x28 - .4byte gAreaTilesets_GreatFairies @ 0x29 - .4byte gAreaTilesets_CastorCaves @ 0x2A - .4byte gAreaTilesets_FortressOfWinds @ 0x2B - .4byte gAreaTilesets_ArmosInteriors @ 0x2C - .4byte gAreaTilesets_TownMinishHoles @ 0x2D - .4byte gAreaTilesets_MinishRafters @ 0x2E - .4byte gAreaTilesets_GoronCave @ 0x2F - .4byte gAreaTilesets_WindTribeTower @ 0x30 - .4byte gAreaTilesets_WindTribeTowerRoof @ 0x31 - .4byte gAreaTilesets_Caves @ 0x32 - .4byte gAreaTilesets_VeilFallsCaves @ 0x33 - .4byte gAreaTilesets_RoyalValleyGraves @ 0x34 - .4byte gAreaTilesets_MinishCaves @ 0x35 - .4byte gAreaTilesets_CastleGardenMinishHoles @ 0x36 - .4byte gAreaTilesets_37 @ 0x37 - .4byte gAreaTilesets_EzloCutscene @ 0x38 - .4byte gAreaTilesets_Unused @ 0x39 - .4byte gAreaTilesets_Unused @ 0x3A - .4byte gAreaTilesets_Unused @ 0x3B - .4byte gAreaTilesets_Unused @ 0x3C - .4byte gAreaTilesets_Unused @ 0x3D - .4byte gAreaTilesets_Unused @ 0x3E - .4byte gAreaTilesets_Unused @ 0x3F - .4byte gAreaTilesets_40 @ 0x40 - .4byte gAreaTilesets_HyruleTownUnderground @ 0x41 - .4byte gAreaTilesets_40 @ 0x42 - .4byte gAreaTilesets_40 @ 0x43 - .4byte gAreaTilesets_SimonsSimulation @ 0x44 - .4byte gAreaTilesets_45 @ 0x45 - .4byte gAreaTilesets_45 @ 0x46 - .4byte gAreaTilesets_45 @ 0x47 - .4byte gAreaTilesets_DeepwoodShrine @ 0x48 - .4byte gAreaTilesets_DeepwoodShrineBoss @ 0x49 - .4byte gAreaTilesets_DeepwoodShrineEntry @ 0x4A - .4byte gAreaTilesets_Unused @ 0x4B - .4byte gAreaTilesets_Unused @ 0x4C - .4byte gAreaTilesets_DeepwoodShrine @ 0x4D - .4byte gAreaTilesets_DeepwoodShrine @ 0x4E - .4byte gAreaTilesets_DeepwoodShrineBoss @ 0x4F - .4byte gAreaTilesets_CaveOfFlames @ 0x50 - .4byte gAreaTilesets_CaveOfFlamesBoss @ 0x51 - .4byte gAreaTilesets_Unused @ 0x52 - .4byte gAreaTilesets_Unused @ 0x53 - .4byte gAreaTilesets_Unused @ 0x54 - .4byte gAreaTilesets_Unused @ 0x55 - .4byte gAreaTilesets_CaveOfFlames @ 0x56 - .4byte gAreaTilesets_CaveOfFlames @ 0x57 - .4byte gAreaTilesets_FortressOfWinds @ 0x58 - .4byte gAreaTilesets_FortressOfWindsTop @ 0x59 - .4byte gAreaTilesets_InnerMazaal @ 0x5A - .4byte gAreaTilesets_Unused @ 0x5B - .4byte gAreaTilesets_Unused @ 0x5C - .4byte gAreaTilesets_Unused @ 0x5D - .4byte gAreaTilesets_Unused @ 0x5E - .4byte gAreaTilesets_FortressOfWinds @ 0x5F - .4byte gAreaTilesets_TempleOfDroplets @ 0x60 - .4byte gAreaTilesets_61 @ 0x61 - .4byte gAreaTilesets_HyruleTownMinishCaves @ 0x62 - .4byte gAreaTilesets_Unused @ 0x63 - .4byte gAreaTilesets_Unused @ 0x64 - .4byte gAreaTilesets_Unused @ 0x65 - .4byte gAreaTilesets_Unused @ 0x66 - .4byte gAreaTilesets_TempleOfDroplets @ 0x67 - .4byte gAreaTilesets_RoyalCrypt @ 0x68 - .4byte gAreaTilesets_Unused @ 0x69 - .4byte gAreaTilesets_Unused @ 0x6A - .4byte gAreaTilesets_Unused @ 0x6B - .4byte gAreaTilesets_Unused @ 0x6C - .4byte gAreaTilesets_Unused @ 0x6D - .4byte gAreaTilesets_Unused @ 0x6E - .4byte gAreaTilesets_RoyalCrypt @ 0x6F - .4byte gAreaTilesets_PalaceOfWinds @ 0x70 - .4byte gAreaTilesets_PalaceOfWindsBoss @ 0x71 - .4byte gAreaTilesets_Unused @ 0x72 - .4byte gAreaTilesets_Unused @ 0x73 - .4byte gAreaTilesets_Unused @ 0x74 - .4byte gAreaTilesets_Unused @ 0x75 - .4byte gAreaTilesets_Unused @ 0x76 - .4byte gAreaTilesets_PalaceOfWinds @ 0x77 - .4byte gAreaTilesets_Sanctuary @ 0x78 - .4byte gAreaTilesets_Unused @ 0x79 - .4byte gAreaTilesets_Unused @ 0x7A - .4byte gAreaTilesets_Unused @ 0x7B - .4byte gAreaTilesets_Unused @ 0x7C - .4byte gAreaTilesets_Unused @ 0x7D - .4byte gAreaTilesets_Unused @ 0x7E - .4byte gAreaTilesets_Sanctuary @ 0x7F - .4byte gAreaTilesets_HyruleCastle @ 0x80 - .4byte gAreaTilesets_SanctuaryEntrance @ 0x81 - .4byte gAreaTilesets_Unused @ 0x82 - .4byte gAreaTilesets_Unused @ 0x83 - .4byte gAreaTilesets_Unused @ 0x84 - .4byte gAreaTilesets_Unused @ 0x85 - .4byte gAreaTilesets_Unused @ 0x86 - .4byte gAreaTilesets_HyruleCastle @ 0x87 - .4byte gAreaTilesets_DarkHyruleCastle @ 0x88 - .4byte gAreaTilesets_DarkHyruleCastleOutside @ 0x89 - .4byte gAreaTilesets_VaatisArms @ 0x8A - .4byte gAreaTilesets_Vaati3 @ 0x8B - .4byte gAreaTilesets_Vaati2 @ 0x8C - .4byte gAreaTilesets_DarkHyruleCastleBridge @ 0x8D - .4byte gAreaTilesets_Unused @ 0x8E - .4byte gAreaTilesets_DarkHyruleCastle @ 0x8F + .4byte gAreaTileSet_Unused_0 + +gAreaTileSet_MinishWoods_0:: @ 08100CF4 + tileSet_tiles offset_gAreaTileSet_MinishWoods_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MinishWoods_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MinishWoods_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 28, 1 + +gAreaTileSet_MinishWoods_1:: @ 08100D24 + tileSet_tiles offset_gAreaTileSet_MinishWoods_1_0, 0x6000000, 0x2000, 1 + tileSet_tiles offset_gAreaTileSet_MinishWoods_1_1, 0x6008000, 0x2000, 1 + tileSet_palette_set 21, 1 + +gAreaTileSets_MinishWoods:: @ 08100D48 + .4byte gAreaTileSet_MinishWoods_0 + .4byte gAreaTileSet_MinishWoods_1 + +gAreaTileSet_LakeHylia_0:: @ 08100D50 + tileSet_tiles offset_gAreaTileSet_LakeHylia_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_LakeHylia_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_LakeHylia_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 39, 1 + +gAreaTileSets_LakeHylia:: @ 08100D80 + .4byte gAreaTileSet_LakeHylia_0 + +gAreaTileSet_CastorWilds_0:: @ 08100D84 + tileSet_tiles offset_gAreaTileSet_CastorWilds_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CastorWilds_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CastorWilds_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 19, 1 + +gAreaTileSets_CastorWilds:: @ 08100DB4 + .4byte gAreaTileSet_CastorWilds_0 + +gAreaTileSet_Ruins_0:: @ 08100DB8 + tileSet_tiles offset_gAreaTileSet_CastorWilds_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CastorWilds_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CastorWilds_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 29, 1 + +gAreaTileSets_Ruins:: @ 08100DE8 + .4byte gAreaTileSet_Ruins_0 + +gAreaTileSet_HyruleTown_0:: @ 08100DEC + tileSet_tiles offset_gAreaTileSet_HyruleTown_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleTown_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleTown_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 27, 1 + +gAreaTileSets_HyruleTown:: @ 08100E1C + .4byte gAreaTileSet_HyruleTown_0 + +gAreaTileSet_FestivalTown_0:: @ 08100E20 + tileSet_tiles offset_gAreaTileSet_FestivalTown_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_FestivalTown_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_FestivalTown_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 170, 1 + +gAreaTileSets_FestivalTown:: @ 08100E50 + .4byte gAreaTileSet_FestivalTown_0 + +gAreaTileSet_MtCrenel_0:: @ 08100E54 + tileSet_tiles offset_gAreaTileSet_MtCrenel_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MtCrenel_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MtCrenel_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 30, 1 + +gAreaTileSets_MtCrenel:: @ 08100E84 + .4byte gAreaTileSet_MtCrenel_0 + +gAreaTileSet_HyruleField_0:: @ 08100E88 + tileSet_tiles offset_gAreaTileSet_HyruleField_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_0_2, 0x6008000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_0_3, 0x600F000, 0x800, 1 + tileSet_palette_set 16, 1 + +gAreaTileSet_HyruleField_1:: @ 08100EC4 + tileSet_tiles offset_gAreaTileSet_HyruleField_1_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_1_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_1_2, 0x6008000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_0_3, 0x600F000, 0x800, 1 + tileSet_palette_set 67, 1 + +gAreaTileSet_HyruleField_2:: @ 08100F00 + tileSet_tiles offset_gAreaTileSet_HyruleField_2_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_2_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_2_2, 0x6008000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_0_3, 0x600F000, 0x800, 1 + tileSet_palette_set 46, 1 + +gAreaTileSets_HyruleField:: @ 08100F3C + .4byte gAreaTileSet_HyruleField_0 + .4byte gAreaTileSet_HyruleField_1 + .4byte gAreaTileSet_HyruleField_2 + +gAreaTileSet_CastleGarden_0:: @ 08100F48 + tileSet_tiles offset_gAreaTileSet_CastleGarden_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CastleGarden_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CastleGarden_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 31, 1 + +gAreaTileSets_CastleGarden:: @ 08100F78 + .4byte gAreaTileSet_CastleGarden_0 + +gAreaTileSet_CloudTops_0:: @ 08100F7C + tileSet_tiles offset_gAreaTileSet_CloudTops_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CloudTops_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CloudTops_0_2, 0x6008000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CloudTops_0_3, 0x600F000, 0x800, 1 + tileSet_palette_set 32, 1 + +gAreaTileSets_CloudTops:: @ 08100FB8 + .4byte gAreaTileSet_CloudTops_0 + +gAreaTileSet_RoyalValley_0:: @ 08100FBC + tileSet_tiles offset_gAreaTileSet_RoyalValley_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_RoyalValley_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_RoyalValley_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 38, 1 + +gAreaTileSets_RoyalValley:: @ 08100FEC + .4byte gAreaTileSet_RoyalValley_0 + +gAreaTileSet_VeilFalls_0:: @ 08100FF0 + tileSet_tiles offset_gAreaTileSet_VeilFalls_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_VeilFalls_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_VeilFalls_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 44, 1 + +gAreaTileSets_VeilFalls:: @ 08101020 + .4byte gAreaTileSet_VeilFalls_0 + +gAreaTileSet_VeilFallsTop_0:: @ 08101024 + tileSet_tiles offset_gAreaTileSet_VeilFalls_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_VeilFalls_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_VeilFallsTop_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 44, 1 + +gAreaTileSets_VeilFallsTop:: @ 08101054 + .4byte gAreaTileSet_VeilFallsTop_0 + +gAreaTileSet_Beanstalks_0:: @ 08101058 + tileSet_tiles offset_gAreaTileSet_Beanstalks_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_Beanstalks_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_Beanstalks_0_2, 0x6008000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_Beanstalks_0_3, 0x600F000, 0x800, 1 + tileSet_palette_set 41, 1 + +gAreaTileSets_Beanstalks:: @ 08101094 + .4byte gAreaTileSet_Beanstalks_0 + +gAreaTileSet_CrenelCaves_0:: @ 08101098 + tileSet_tiles offset_gAreaTileSet_CrenelCaves_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CrenelCaves_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CrenelCaves_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 62, 1 + +gAreaTileSets_CrenelCaves:: @ 081010C8 + .4byte gAreaTileSet_CrenelCaves_0 + +gAreaTileSet_GreatFairies_0:: @ 081010CC + tileSet_tiles offset_gAreaTileSet_GreatFairies_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_GreatFairies_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_GreatFairies_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 92, 1 + +gAreaTileSet_GreatFairies_1:: @ 081010FC + tileSet_tiles offset_gAreaTileSet_GreatFairies_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_GreatFairies_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_GreatFairies_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 102, 1 + +gAreaTileSet_GreatFairies_2:: @ 0810112C + tileSet_tiles offset_gAreaTileSet_GreatFairies_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_GreatFairies_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_GreatFairies_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 103, 1 + +gAreaTileSets_GreatFairies:: @ 0810115C + .4byte gAreaTileSet_GreatFairies_0 + .4byte gAreaTileSet_GreatFairies_1 + .4byte gAreaTileSet_GreatFairies_2 + +gAreaTileSet_LakeWoodsCave_0:: @ 08101168 + tileSet_tiles offset_gAreaTileSet_MinishWoods_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MinishWoods_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MinishWoods_0_2, 0x6008000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MinishWoods_1_0, 0x6001000, 0x2000, 1 + tileSet_tiles offset_gAreaTileSet_MinishWoods_1_1, 0x6009000, 0x2000, 1 + tileSet_palette_set 21, 1 + +gAreaTileSets_LakeWoodsCave:: @ 081011B0 + .4byte gAreaTileSet_LakeWoodsCave_0 + +gAreaTileSet_HyruleDigCaves_0:: @ 081011B4 + tileSet_tiles offset_gAreaTileSet_HyruleTown_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleTown_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleTown_0_2, 0x6008000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleDigCaves_0_3, 0x6001000, 0x2000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleDigCaves_0_4, 0x6009000, 0x2000, 1 + tileSet_palette_set 54, 1 + +gAreaTileSets_HyruleDigCaves:: @ 081011FC + .4byte gAreaTileSet_HyruleDigCaves_0 + +gAreaTileSet_DigCaves1_0:: @ 08101200 + tileSet_tiles offset_gAreaTileSet_HyruleField_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleField_0_2, 0x6008000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_DigCaves_0_3, 0x6001000, 0x2000, 1 + tileSet_tiles offset_gAreaTileSet_DigCaves_0_4, 0x6009000, 0x2000, 1 + tileSet_palette_set 85, 1 + +gAreaTileSets_DigCaves1:: @ 08101248 + .4byte gAreaTileSet_DigCaves1_0 + +gAreaTileSet_CrenelDigCave_0:: @ 0810124C + tileSet_tiles offset_gAreaTileSet_MtCrenel_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MtCrenel_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MtCrenel_0_2, 0x6008000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CrenelDigCave_0_3, 0x6001000, 0x2000, 1 + tileSet_tiles offset_gAreaTileSet_CrenelDigCave_0_4, 0x6009000, 0x2000, 1 + tileSet_palette_set 33, 1 + +gAreaTileSets_CrenelDigCave:: @ 08101294 + .4byte gAreaTileSet_CrenelDigCave_0 + +gAreaTileSet_VeilFallsDigCave_0:: @ 08101298 + tileSet_tiles offset_gAreaTileSet_VeilFalls_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_VeilFalls_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_VeilFalls_0_2, 0x6008000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CrenelDigCave_0_3, 0x6001000, 0x2000, 1 + tileSet_tiles offset_gAreaTileSet_CrenelDigCave_0_4, 0x6009000, 0x2000, 1 + tileSet_palette_set 99, 1 + +gAreaTileSets_VeilFallsDigCave:: @ 081012E0 + .4byte gAreaTileSet_VeilFallsDigCave_0 + +gAreaTileSet_CastorWildsDigCave_0:: @ 081012E4 + tileSet_tiles offset_gAreaTileSet_CastorWilds_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CastorWilds_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CastorWilds_0_2, 0x6008000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CastorWildsDigCave_0_3, 0x6001000, 0x2000, 1 + tileSet_tiles offset_gAreaTileSet_CastorWildsDigCave_0_4, 0x6009000, 0x2000, 1 + tileSet_palette_set 100, 1 + +gAreaTileSets_CastorWildsDigCave:: @ 0810132C + .4byte gAreaTileSet_CastorWildsDigCave_0 + +gAreaTileSet_OuterFortressOfWinds_0:: @ 08101330 + tileSet_tiles offset_gAreaTileSet_CastorWilds_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CastorWilds_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CastorWilds_0_2, 0x6008000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CastorWildsDigCave_0_3, 0x6001000, 0x2000, 1 + tileSet_tiles offset_gAreaTileSet_CastorWildsDigCave_0_4, 0x6009000, 0x2000, 1 + tileSet_palette_set 167, 1 + +gAreaTileSets_OuterFortressOfWinds:: @ 08101378 + .4byte gAreaTileSet_OuterFortressOfWinds_0 + +gAreaTileSet_HyliaDigCaves_0:: @ 0810137C + tileSet_tiles offset_gAreaTileSet_LakeHylia_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_LakeHylia_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_LakeHylia_0_2, 0x6008000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyliaDigCaves_0_3, 0x6001000, 0x2000, 1 + tileSet_tiles offset_gAreaTileSet_HyliaDigCaves_0_4, 0x6009000, 0x2000, 1 + tileSet_palette_set 20, 1 + +gAreaTileSets_HyliaDigCaves:: @ 081013C4 + .4byte gAreaTileSet_HyliaDigCaves_0 + +gAreaTileSet_MinishVillage_0:: @ 081013C8 + tileSet_tiles offset_gAreaTileSet_MinishVillage_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MinishVillage_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MinishVillage_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 14, 1 + +gAreaTileSet_MinishVillage_1:: @ 081013F8 + tileSet_tiles offset_gAreaTileSet_MinishVillage_1_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MinishVillage_1_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MinishVillage_1_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 25, 1 + +gAreaTileSets_MinishVillage:: @ 08101428 + .4byte gAreaTileSet_MinishVillage_0 + .4byte gAreaTileSet_MinishVillage_1 + +gAreaTileSet_MelarisMine_0:: @ 08101430 + tileSet_tiles offset_gAreaTileSet_MelarisMine_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MelarisMine_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MelarisMine_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 61, 1 + +gAreaTileSets_MelarisMine:: @ 08101460 + .4byte gAreaTileSet_MelarisMine_0 + +gAreaTileSet_MinishPaths_0:: @ 08101464 + tileSet_tiles offset_gAreaTileSet_MinishPaths_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MinishPaths_0_1, 0x6004000, 0x4000, 1 + tileSet_palette_set 18, 1 + +gAreaTileSet_MinishPaths_1:: @ 08101488 + tileSet_tiles offset_gAreaTileSet_MinishPaths_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MinishPaths_0_1, 0x6004000, 0x4000, 1 + tileSet_palette_set 63, 1 + +gAreaTileSet_MinishPaths_2:: @ 081014AC + tileSet_tiles offset_gAreaTileSet_MinishPaths_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MinishPaths_0_1, 0x6004000, 0x4000, 1 + tileSet_palette_set 64, 1 + +gAreaTileSets_MinishPaths:: @ 081014D0 + .4byte gAreaTileSet_MinishPaths_0 + .4byte gAreaTileSet_MinishPaths_1 + .4byte gAreaTileSet_MinishPaths_2 + +gAreaTileSet_CrenelMinishPaths_0:: @ 081014DC + tileSet_tiles offset_gAreaTileSet_CrenelMinishPaths_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CrenelMinishPaths_0_1, 0x6004000, 0x4000, 1 + tileSet_palette_set 65, 1 + +gAreaTileSet_CrenelMinishPaths_1:: @ 08101500 + tileSet_tiles offset_gAreaTileSet_CrenelMinishPaths_1_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CrenelMinishPaths_1_1, 0x6004000, 0x4000, 1 + tileSet_palette_set 66, 1 + +gAreaTileSet_CrenelMinishPaths_2:: @ 08101524 + tileSet_tiles offset_gAreaTileSet_CrenelMinishPaths_1_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CrenelMinishPaths_1_1, 0x6004000, 0x4000, 1 + tileSet_palette_set 93, 1 + +gAreaTileSets_CrenelMinishPaths:: @ 08101548 + .4byte gAreaTileSet_CrenelMinishPaths_0 + .4byte gAreaTileSet_CrenelMinishPaths_1 + .4byte gAreaTileSet_CrenelMinishPaths_2 + +gAreaTileSet_MinishHouseInteriors_0:: @ 08101554 + tileSet_tiles offset_gAreaTileSet_MinishHouseInteriors_0_0, 0x6000000, 0x8740, 1 + tileSet_palette_set 68, 1 + +gAreaTileSet_MinishHouseInteriors_1:: @ 0810156C + tileSet_tiles offset_gAreaTileSet_MinishHouseInteriors_1_0, 0x6000000, 0x7540, 1 + tileSet_palette_set 69, 1 + +gAreaTileSet_MinishHouseInteriors_2:: @ 08101584 + tileSet_tiles offset_gAreaTileSet_MinishHouseInteriors_2_0, 0x6000000, 0x4B40, 1 + tileSet_palette_set 70, 1 + +gAreaTileSet_MinishHouseInteriors_3:: @ 0810159C + tileSet_tiles offset_gAreaTileSet_MinishHouseInteriors_3_0, 0x6000000, 0x4A40, 1 + tileSet_palette_set 71, 1 + +gAreaTileSet_MinishHouseInteriors_4:: @ 081015B4 + tileSet_tiles offset_gAreaTileSet_MinishHouseInteriors_4_0, 0x6000000, 0x4980, 1 + tileSet_palette_set 72, 1 + +gAreaTileSet_MinishHouseInteriors_5:: @ 081015CC + tileSet_tiles offset_gAreaTileSet_MinishHouseInteriors_5_0, 0x6000000, 0x4D80, 1 + tileSet_palette_set 73, 1 + +gAreaTileSet_MinishHouseInteriors_6:: @ 081015E4 + tileSet_tiles offset_gAreaTileSet_MinishHouseInteriors_6_0, 0x6000000, 0x8E40, 1 + tileSet_palette_set 74, 1 + +gAreaTileSet_MinishHouseInteriors_7:: @ 081015FC + tileSet_tiles offset_gAreaTileSet_MinishHouseInteriors_7_0, 0x6000000, 0x7E00, 1 + tileSet_palette_set 75, 1 + +gAreaTileSet_MinishHouseInteriors_8:: @ 08101614 + tileSet_tiles offset_gAreaTileSet_MinishHouseInteriors_8_0, 0x6000000, 0x9F40, 1 + tileSet_palette_set 76, 1 + +gAreaTileSet_MinishHouseInteriors_9:: @ 0810162C + tileSet_tiles offset_gAreaTileSet_MinishHouseInteriors_9_0, 0x6000000, 0x7980, 1 + tileSet_palette_set 86, 1 + +gAreaTileSet_MinishHouseInteriors_10:: @ 08101644 + tileSet_tiles offset_gAreaTileSet_MinishHouseInteriors_10_0, 0x6000000, 0x7B40, 1 + tileSet_palette_set 87, 1 + +gAreaTileSet_MinishHouseInteriors_11:: @ 0810165C + tileSet_tiles offset_gAreaTileSet_MinishHouseInteriors_11_0, 0x6000000, 0x69C0, 1 + tileSet_palette_set 88, 1 + +gAreaTileSet_MinishHouseInteriors_12:: @ 08101674 + tileSet_tiles offset_gAreaTileSet_MinishHouseInteriors_12_0, 0x6000000, 0x5D80, 1 + tileSet_palette_set 77, 1 + +gAreaTileSet_MinishHouseInteriors_13:: @ 0810168C + tileSet_tiles offset_gAreaTileSet_MinishHouseInteriors_13_0, 0x6000000, 0x5CC0, 1 + tileSet_palette_set 78, 1 + +gAreaTileSet_MinishHouseInteriors_14:: @ 081016A4 + tileSet_tiles offset_gAreaTileSet_MinishHouseInteriors_14_0, 0x6000000, 0x5B00, 1 + tileSet_palette_set 79, 1 + +gAreaTileSet_MinishHouseInteriors_15:: @ 081016BC + tileSet_tiles offset_gAreaTileSet_MinishHouseInteriors_15_0, 0x6000000, 0x5240, 1 + tileSet_palette_set 80, 1 + +gAreaTileSet_MinishHouseInteriors_16:: @ 081016D4 + tileSet_tiles offset_gAreaTileSet_MinishHouseInteriors_16_0, 0x6000000, 0x5C40, 1 + tileSet_palette_set 81, 1 + +gAreaTileSet_MinishHouseInteriors_17:: @ 081016EC + tileSet_tiles offset_gAreaTileSet_MinishHouseInteriors_17_0, 0x6000000, 0x5740, 1 + tileSet_palette_set 82, 1 + +gAreaTileSet_MinishHouseInteriors_18:: @ 08101704 + tileSet_tiles offset_gAreaTileSet_MinishHouseInteriors_18_0, 0x6000000, 0x6180, 1 + tileSet_palette_set 83, 1 + +gAreaTileSet_MinishHouseInteriors_19:: @ 0810171C + tileSet_tiles offset_gAreaTileSet_MinishHouseInteriors_19_0, 0x6000000, 0x5C80, 1 + tileSet_palette_set 84, 1 + +gAreaTileSets_MinishHouseInteriors:: @ 08101734 + .4byte gAreaTileSet_MinishHouseInteriors_0 + .4byte gAreaTileSet_MinishHouseInteriors_1 + .4byte gAreaTileSet_MinishHouseInteriors_2 + .4byte gAreaTileSet_MinishHouseInteriors_3 + .4byte gAreaTileSet_MinishHouseInteriors_4 + .4byte gAreaTileSet_MinishHouseInteriors_5 + .4byte gAreaTileSet_MinishHouseInteriors_6 + .4byte gAreaTileSet_MinishHouseInteriors_7 + .4byte gAreaTileSet_MinishHouseInteriors_8 + .4byte gAreaTileSet_MinishHouseInteriors_9 + .4byte gAreaTileSet_MinishHouseInteriors_10 + .4byte gAreaTileSet_MinishHouseInteriors_11 + .4byte gAreaTileSet_MinishHouseInteriors_12 + .4byte gAreaTileSet_MinishHouseInteriors_13 + .4byte gAreaTileSet_MinishHouseInteriors_14 + .4byte gAreaTileSet_MinishHouseInteriors_15 + .4byte gAreaTileSet_MinishHouseInteriors_16 + .4byte gAreaTileSet_MinishHouseInteriors_17 + .4byte gAreaTileSet_MinishHouseInteriors_18 + .4byte gAreaTileSet_MinishHouseInteriors_19 + +gAreaTileSet_TownMinishHoles_0:: @ 08101784 + tileSet_tiles offset_gAreaTileSet_TownMinishHoles_0_0, 0x6000000, 0x6100, 1 + tileSet_palette_set 115, 1 + +gAreaTileSet_TownMinishHoles_1:: @ 0810179C + tileSet_tiles offset_gAreaTileSet_TownMinishHoles_1_0, 0x6000000, 0x7DC0, 1 + tileSet_palette_set 116, 1 + +gAreaTileSet_TownMinishHoles_2:: @ 081017B4 + tileSet_tiles offset_gAreaTileSet_TownMinishHoles_2_0, 0x6000000, 0x70C0, 1 + tileSet_palette_set 117, 1 + +gAreaTileSet_TownMinishHoles_3:: @ 081017CC + tileSet_tiles offset_gAreaTileSet_TownMinishHoles_3_0, 0x6000000, 0x7E40, 1 + tileSet_palette_set 118, 1 + +gAreaTileSet_TownMinishHoles_4:: @ 081017E4 + tileSet_tiles offset_gAreaTileSet_TownMinishHoles_4_0, 0x6000000, 0x7240, 1 + tileSet_palette_set 119, 1 + +gAreaTileSet_TownMinishHoles_5:: @ 081017FC + tileSet_tiles offset_gAreaTileSet_TownMinishHoles_5_0, 0x6000000, 0x8900, 1 + tileSet_palette_set 129, 1 + +gAreaTileSet_TownMinishHoles_6:: @ 08101814 + tileSet_tiles offset_gAreaTileSet_TownMinishHoles_6_0, 0x6000000, 0xBEC0, 1 + tileSet_palette_set 124, 1 + +gAreaTileSet_TownMinishHoles_7:: @ 0810182C + tileSet_tiles offset_gAreaTileSet_TownMinishHoles_7_0, 0x6000000, 0xA480, 1 + tileSet_palette_set 123, 1 + +gAreaTileSet_TownMinishHoles_8:: @ 08101844 + tileSet_tiles offset_gAreaTileSet_TownMinishHoles_8_0, 0x6000000, 0xB0C0, 1 + tileSet_palette_set 122, 1 + +gAreaTileSets_TownMinishHoles:: @ 0810185C + .4byte gAreaTileSet_TownMinishHoles_0 + .4byte gAreaTileSet_TownMinishHoles_1 + .4byte gAreaTileSet_TownMinishHoles_2 + .4byte gAreaTileSet_TownMinishHoles_3 + .4byte gAreaTileSet_TownMinishHoles_4 + .4byte gAreaTileSet_TownMinishHoles_5 + .4byte gAreaTileSet_TownMinishHoles_6 + .4byte gAreaTileSet_TownMinishHoles_7 + .4byte gAreaTileSet_TownMinishHoles_8 + +gAreaTileSet_HouseInteriors1_0:: @ 08101880 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 51, 1 + +gAreaTileSets_HouseInteriors1:: @ 081018B0 + .4byte gAreaTileSet_HouseInteriors1_0 + +gAreaTileSet_HouseInteriors2_0:: @ 081018B4 + tileSet_tiles offset_gAreaTileSet_HouseInteriors2_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors2_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 52, 1 + +gAreaTileSet_HouseInteriors2_1:: @ 081018E4 + tileSet_tiles offset_gAreaTileSet_HouseInteriors2_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors2_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 168, 1 + +gAreaTileSet_HouseInteriors2_2:: @ 08101914 + tileSet_tiles offset_gAreaTileSet_HouseInteriors2_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors2_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 157, 1 + +gAreaTileSets_HouseInteriors2:: @ 08101944 + .4byte gAreaTileSet_HouseInteriors2_0 + .4byte gAreaTileSet_HouseInteriors2_1 + .4byte gAreaTileSet_HouseInteriors2_2 + +gAreaTileSet_HouseInteriors4_0:: @ 08101950 + tileSet_tiles offset_gAreaTileSet_HouseInteriors4_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors4_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 89, 1 + +gAreaTileSets_HouseInteriors4:: @ 08101980 + .4byte gAreaTileSet_HouseInteriors4_0 + +gAreaTileSet_HouseInteriors3_0:: @ 08101984 + tileSet_tiles offset_gAreaTileSet_HouseInteriors3_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors3_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 53, 1 + +gAreaTileSets_HouseInteriors3:: @ 081019B4 + .4byte gAreaTileSet_HouseInteriors3_0 + +gAreaTileSet_TreeInteriors_0:: @ 081019B8 + tileSet_tiles offset_gAreaTileSet_TreeInteriors_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_TreeInteriors_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 13, 1 + +gAreaTileSets_TreeInteriors:: @ 081019E8 + .4byte gAreaTileSet_TreeInteriors_0 + +gAreaTileSet_Dojos_0:: @ 081019EC + tileSet_tiles offset_gAreaTileSet_Dojos_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_Dojos_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 150, 1 + +gAreaTileSet_Dojos_1:: @ 08101A1C + tileSet_tiles offset_gAreaTileSet_Dojos_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_Dojos_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 149, 1 + +gAreaTileSet_Dojos_2:: @ 08101A4C + tileSet_tiles offset_gAreaTileSet_Dojos_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_Dojos_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 148, 1 + +gAreaTileSet_Dojos_3:: @ 08101A7C + tileSet_tiles offset_gAreaTileSet_Dojos_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_Dojos_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 146, 1 + +gAreaTileSet_Dojos_4:: @ 08101AAC + tileSet_tiles offset_gAreaTileSet_Dojos_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_Dojos_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 147, 1 + +gAreaTileSet_Dojos_5:: @ 08101ADC + tileSet_tiles offset_gAreaTileSet_Dojos_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_Dojos_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 45, 1 + +gAreaTileSets_Dojos:: @ 08101B0C + .4byte gAreaTileSet_Dojos_0 + .4byte gAreaTileSet_Dojos_1 + .4byte gAreaTileSet_Dojos_2 + .4byte gAreaTileSet_Dojos_3 + .4byte gAreaTileSet_Dojos_4 + .4byte gAreaTileSet_Dojos_5 + +gAreaTileSet_MinishCracks_0:: @ 08101B24 + tileSet_tiles offset_gAreaTileSet_MinishCracks_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MinishCracks_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 153, 1 + +gAreaTileSet_MinishCracks_1:: @ 08101B54 + tileSet_tiles offset_gAreaTileSet_MinishCracks_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MinishCracks_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 152, 1 + +gAreaTileSet_MinishCracks_2:: @ 08101B84 + tileSet_tiles offset_gAreaTileSet_MinishCracks_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MinishCracks_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 154, 1 + +gAreaTileSet_MinishCracks_3:: @ 08101BB4 + tileSet_tiles offset_gAreaTileSet_MinishCracks_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MinishCracks_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 34, 1 + +gAreaTileSet_MinishCracks_4:: @ 08101BE4 + tileSet_tiles offset_gAreaTileSet_MinishCracks_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MinishCracks_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 151, 1 + +gAreaTileSets_MinishCracks:: @ 08101C14 + .4byte gAreaTileSet_MinishCracks_0 + .4byte gAreaTileSet_MinishCracks_1 + .4byte gAreaTileSet_MinishCracks_2 + .4byte gAreaTileSet_MinishCracks_3 + .4byte gAreaTileSet_MinishCracks_4 + +gAreaTileSet_ArmosInteriors_0:: @ 08101C28 + tileSet_tiles offset_gAreaTileSet_ArmosInteriors_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_ArmosInteriors_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_ArmosInteriors_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 110, 1 + +gAreaTileSets_ArmosInteriors:: @ 08101C58 + .4byte gAreaTileSet_ArmosInteriors_0 + +gAreaTileSet_MinishRafters_0:: @ 08101C5C + tileSet_tiles offset_gAreaTileSet_MinishRafters_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MinishRafters_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 121, 1 + +gAreaTileSets_MinishRafters:: @ 08101C8C + .4byte gAreaTileSet_MinishRafters_0 + +gAreaTileSet_GoronCave_0:: @ 08101C90 + tileSet_tiles offset_gAreaTileSet_GoronCave_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_GoronCave_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_GoronCave_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 125, 1 + +gAreaTileSets_GoronCave:: @ 08101CC0 + .4byte gAreaTileSet_GoronCave_0 + +gAreaTileSet_WindTribeTower_0:: @ 08101CC4 + tileSet_tiles offset_gAreaTileSet_WindTribeTower_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_WindTribeTower_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 126, 1 + +gAreaTileSets_WindTribeTower:: @ 08101CF4 + .4byte gAreaTileSet_WindTribeTower_0 + +gAreaTileSet_WindTribeTowerRoof_0:: @ 08101CF8 + tileSet_tiles offset_gAreaTileSet_WindTribeTowerRoof_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_WindTribeTowerRoof_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_WindTribeTowerRoof_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 127, 1 + +gAreaTileSets_WindTribeTowerRoof:: @ 08101D28 + .4byte gAreaTileSet_WindTribeTowerRoof_0 + +gAreaTileSet_MinishCaves_0:: @ 08101D2C + tileSet_tiles offset_gAreaTileSet_MinishCaves_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MinishCaves_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_MinishCaves_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 158, 1 + +gAreaTileSets_MinishCaves:: @ 08101D5C + .4byte gAreaTileSet_MinishCaves_0 + +gAreaTileSet_CastleGardenMinishHoles_0:: @ 08101D60 + tileSet_tiles offset_gAreaTileSet_CastleGardenMinishHoles_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CastleGardenMinishHoles_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CastleGardenMinishHoles_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 159, 1 + +gAreaTileSets_CastleGardenMinishHoles:: @ 08101D90 + .4byte gAreaTileSet_CastleGardenMinishHoles_0 + +gAreaTileSet_37_0:: @ 08101D94 + tileSet_tiles offset_gAreaTileSet_CastleGardenMinishHoles_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CastleGardenMinishHoles_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CastleGardenMinishHoles_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 160, 1 + +gAreaTileSets_37:: @ 08101DC4 + .4byte gAreaTileSet_37_0 + +gAreaTileSet_EzloCutscene_0:: @ 08101DC8 + tileSet_tiles offset_gAreaTileSet_EzloCutscene_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_EzloCutscene_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HouseInteriors1_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 161, 1 + +gAreaTileSets_EzloCutscene:: @ 08101DF8 + .4byte gAreaTileSet_EzloCutscene_0 + +gAreaTileSet_HyruleTownUnderground_0:: @ 08101DFC + tileSet_tiles offset_gAreaTileSet_40_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_40_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_40_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 109, 1 + +gAreaTileSets_HyruleTownUnderground:: @ 08101E2C + .4byte gAreaTileSet_HyruleTownUnderground_0 + +gAreaTileSet_SimonsSimulation_0:: @ 08101E30 + tileSet_tiles offset_gAreaTileSet_40_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_40_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_40_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 15, 1 + +gAreaTileSets_SimonsSimulation:: @ 08101E60 + .4byte gAreaTileSet_SimonsSimulation_0 + +gAreaTileSet_40_0:: @ 08101E64 + tileSet_tiles offset_gAreaTileSet_40_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_40_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_40_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 15, 1 + +gAreaTileSets_40:: @ 08101E94 + .4byte gAreaTileSet_40_0 + +gAreaTileSet_DeepwoodShrine_0:: @ 08101E98 + tileSet_tiles offset_gAreaTileSet_DeepwoodShrine_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_DeepwoodShrine_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_DeepwoodShrine_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 17, 1 + +gAreaTileSets_DeepwoodShrine:: @ 08101EC8 + .4byte gAreaTileSet_DeepwoodShrine_0 + +gAreaTileSet_DeepwoodShrineBoss_0:: @ 08101ECC + tileSet_tiles offset_gAreaTileSet_DeepwoodShrineBoss_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_DeepwoodShrineBoss_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_DeepwoodShrineBoss_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 17, 1 + +gAreaTileSets_DeepwoodShrineBoss:: @ 08101EFC + .4byte gAreaTileSet_DeepwoodShrineBoss_0 + +gAreaTileSet_DeepwoodShrineEntry_0:: @ 08101F00 + tileSet_tiles offset_gAreaTileSet_DeepwoodShrineEntry_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_DeepwoodShrineEntry_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_DeepwoodShrineEntry_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 90, 1 + +gAreaTileSets_DeepwoodShrineEntry:: @ 08101F30 + .4byte gAreaTileSet_DeepwoodShrineEntry_0 + +gAreaTileSet_CaveOfFlames_0:: @ 08101F34 + tileSet_tiles offset_gAreaTileSet_CaveOfFlames_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CaveOfFlames_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CaveOfFlames_0_2, 0x6008000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CaveOfFlames_0_3, 0x600F000, 0x800, 1 + tileSet_palette_set 36, 1 + +gAreaTileSets_CaveOfFlames:: @ 08101F70 + .4byte gAreaTileSet_CaveOfFlames_0 + +gAreaTileSet_CaveOfFlamesBoss_0:: @ 08101F74 + tileSet_tiles offset_gAreaTileSet_CaveOfFlamesBoss_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CaveOfFlamesBoss_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CaveOfFlamesBoss_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 36, 1 + +gAreaTileSets_CaveOfFlamesBoss:: @ 08101FA4 + .4byte gAreaTileSet_CaveOfFlamesBoss_0 + +gAreaTileSet_CastorDarknut_0:: @ 08101FA8 + tileSet_tiles offset_gAreaTileSet_CastorDarknut_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CastorDarknut_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CastorDarknut_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 37, 1 + +gAreaTileSets_FortressOfWinds:: @ 08101FD8 + .4byte gAreaTileSet_CastorDarknut_0 + +gAreaTileSet_FortressOfWindsTop_0:: @ 08101FDC + tileSet_tiles offset_gAreaTileSet_FortressOfWindsTop_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_FortressOfWindsTop_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_FortressOfWindsTop_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 94, 1 + +gAreaTileSets_FortressOfWindsTop:: @ 0810200C + .4byte gAreaTileSet_FortressOfWindsTop_0 + +gAreaTileSet_InnerMazaal_0:: @ 08102010 + tileSet_tiles offset_gAreaTileSet_InnerMazaal_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_InnerMazaal_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_InnerMazaal_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 128, 1 + +gAreaTileSets_InnerMazaal:: @ 08102040 + .4byte gAreaTileSet_InnerMazaal_0 + +gAreaTileSet_TempleOfDroplets_0:: @ 08102044 + tileSet_tiles offset_gAreaTileSet_TempleOfDroplets_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_TempleOfDroplets_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_TempleOfDroplets_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 55, 1 + +gAreaTileSets_TempleOfDroplets:: @ 08102074 + .4byte gAreaTileSet_TempleOfDroplets_0 + +gAreaTileSet_61_0:: @ 08102078 + tileSet_tiles offset_gAreaTileSet_Null61_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_Null61_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_Null61_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 104, 1 + +gAreaTileSets_61:: @ 081020A8 + .4byte gAreaTileSet_61_0 + +gAreaTileSet_HyruleTownMinishCaves_0:: @ 081020AC + tileSet_tiles offset_gAreaTileSet_TempleOfDroplets_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_TempleOfDroplets_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_TempleOfDroplets_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 130, 1 + +gAreaTileSets_HyruleTownMinishCaves:: @ 081020DC + .4byte gAreaTileSet_HyruleTownMinishCaves_0 + +gAreaTileSet_RoyalCrypt_0:: @ 081020E0 + tileSet_tiles offset_gAreaTileSet_RoyalCrypt_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_RoyalCrypt_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_RoyalCrypt_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 60, 1 + +gAreaTileSets_RoyalCrypt:: @ 08102110 + .4byte gAreaTileSet_RoyalCrypt_0 + +gAreaTileSet_PalaceOfWinds_GyorgTornado:: @ 08102114 + tileSet_tiles offset_gAreaTileSet_PalaceOfWinds_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_PalaceOfWinds_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_PalaceOfWinds_0_2, 0x6008000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_PalaceOfWinds_0_3, 0x600F000, 0x800, 1 + tileSet_palette_set 56, 1 + +gAreaTileSets_PalaceOfWinds:: @ 08102150 + .4byte gAreaTileSet_PalaceOfWinds_GyorgTornado + +gAreaTileSet_PalaceOfWindsBoss_0:: @ 08102154 + tileSet_tiles offset_gAreaTileSet_PalaceOfWindsBoss_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_PalaceOfWindsBoss_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_PalaceOfWindsBoss_0_2, 0x600F000, 0x800, 1 + tileSet_palette_set 162, 1 + +gAreaTileSets_PalaceOfWindsBoss:: @ 08102184 + .4byte gAreaTileSet_PalaceOfWindsBoss_0 + +gAreaTileSet_Sanctuary_0:: @ 08102188 + tileSet_tiles offset_gAreaTileSet_Sanctuary_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_Sanctuary_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_Sanctuary_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 57, 1 + +gAreaTileSets_Sanctuary:: @ 081021B8 + .4byte gAreaTileSet_Sanctuary_0 + +gAreaTileSet_HyruleCastle_0:: @ 081021BC + tileSet_tiles offset_gAreaTileSet_HyruleCastle_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleCastle_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_HyruleCastle_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 58, 1 + +gAreaTileSets_HyruleCastle:: @ 081021EC + .4byte gAreaTileSet_HyruleCastle_0 + +gAreaTileSet_SanctuaryEntrance_0:: @ 081021F0 + tileSet_tiles offset_gAreaTileSet_SanctuaryEntrance_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_SanctuaryEntrance_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_SanctuaryEntrance_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 145, 1 + +gAreaTileSets_SanctuaryEntrance:: @ 08102220 + .4byte gAreaTileSet_SanctuaryEntrance_0 + +gAreaTileSet_DarkHyruleCastle_1FEntrance:: @ 08102224 + tileSet_tiles offset_gAreaTileSet_DarkHyruleCastle_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_DarkHyruleCastle_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_DarkHyruleCastle_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 59, 1 + +gAreaTileSets_DarkHyruleCastle:: @ 08102254 + .4byte gAreaTileSet_DarkHyruleCastle_1FEntrance + +gAreaTileSet_DarkHyruleCastleOutside_0:: @ 08102258 + tileSet_tiles offset_gAreaTileSet_DarkHyruleCastleOutside_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_DarkHyruleCastleOutside_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_DarkHyruleCastleOutside_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 144, 1 + +gAreaTileSets_DarkHyruleCastleOutside:: @ 08102288 + .4byte gAreaTileSet_DarkHyruleCastleOutside_0 + +gAreaTileSet_DarkHyruleCastleBridge_0:: @ 0810228C + tileSet_tiles offset_gAreaTileSet_DarkHyruleCastleBridge_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_DarkHyruleCastleBridge_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_DarkHyruleCastleBridge_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 180, 1 + +gAreaTileSets_DarkHyruleCastleBridge:: @ 081022BC + .4byte gAreaTileSet_DarkHyruleCastleBridge_0 + +gAreaTileSet_VaatisArms_0:: @ 081022C0 + tileSet_tiles offset_gAreaTileSet_VaatisArms_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_VaatisArms_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_VaatisArms_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 155, 1 + +gAreaTileSets_VaatisArms:: @ 081022F0 + .4byte gAreaTileSet_VaatisArms_0 + +gAreaTileSet_Vaati3_0:: @ 081022F4 + tileSet_tiles offset_gAreaTileSet_Vaati3_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_Vaati3_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_Vaati3_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 156, 1 + +gAreaTileSets_Vaati3:: @ 08102324 + .4byte gAreaTileSet_Vaati3_0 + +gAreaTileSet_Vaati2_0:: @ 08102328 + tileSet_tiles offset_gAreaTileSet_Vaati2_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_Vaati2_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_Vaati2_0_2, 0x6008000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_Vaati2_0_3, 0x600F000, 0x800, 1 + tileSet_palette_set 169, 1 + +gAreaTileSets_Vaati2:: @ 08102364 + .4byte gAreaTileSet_Vaati2_0 + +gAreaTileSet_45_0:: @ 08102368 + tileSet_tiles offset_gAreaTileSet_CrenelCaves_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CrenelCaves_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CrenelCaves_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 35, 1 + +gAreaTileSets_45:: @ 08102398 + .4byte gAreaTileSet_45_0 + +gAreaTileSet_CastorCaves_0:: @ 0810239C + tileSet_tiles offset_gAreaTileSet_CrenelCaves_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CrenelCaves_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CrenelCaves_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 101, 1 + +gAreaTileSets_CastorCaves:: @ 081023CC + .4byte gAreaTileSet_CastorCaves_0 + +gAreaTileSet_Caves_0:: @ 081023D0 + tileSet_tiles offset_gAreaTileSet_CrenelCaves_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CrenelCaves_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CrenelCaves_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 131, 1 + +gAreaTileSets_Caves:: @ 08102400 + .4byte gAreaTileSet_Caves_0 + +gAreaTileSet_VeilFallsCaves_0:: @ 08102404 + tileSet_tiles offset_gAreaTileSet_CrenelCaves_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CrenelCaves_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CrenelCaves_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 132, 1 + +gAreaTileSets_VeilFallsCaves:: @ 08102434 + .4byte gAreaTileSet_VeilFallsCaves_0 + +gAreaTileSet_RoyalValleyGraves_0:: @ 08102438 + tileSet_tiles offset_gAreaTileSet_CrenelCaves_0_0, 0x6000000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CrenelCaves_0_1, 0x6004000, 0x4000, 1 + tileSet_tiles offset_gAreaTileSet_CrenelCaves_0_2, 0x6008000, 0x4000, 1 + tileSet_palette_set 133, 1 + +gAreaTileSets_RoyalValleyGraves:: @ 08102468 + .4byte gAreaTileSet_RoyalValleyGraves_0 + +gAreaTileSets:: @ 0810246C + .4byte gAreaTileSets_MinishWoods @ 0x0 + .4byte gAreaTileSets_MinishVillage @ 0x1 + .4byte gAreaTileSets_HyruleTown @ 0x2 + .4byte gAreaTileSets_HyruleField @ 0x3 + .4byte gAreaTileSets_CastorWilds @ 0x4 + .4byte gAreaTileSets_Ruins @ 0x5 + .4byte gAreaTileSets_MtCrenel @ 0x6 + .4byte gAreaTileSets_CastleGarden @ 0x7 + .4byte gAreaTileSets_CloudTops @ 0x8 + .4byte gAreaTileSets_RoyalValley @ 0x9 + .4byte gAreaTileSets_VeilFalls @ 0xA + .4byte gAreaTileSets_LakeHylia @ 0xB + .4byte gAreaTileSets_LakeWoodsCave @ 0xC + .4byte gAreaTileSets_Beanstalks @ 0xD + .4byte gAreaTileSets_MinishWoods @ 0xE + .4byte gAreaTileSets_HyruleDigCaves @ 0xF + .4byte gAreaTileSets_MelarisMine @ 0x10 + .4byte gAreaTileSets_MinishPaths @ 0x11 + .4byte gAreaTileSets_CrenelMinishPaths @ 0x12 + .4byte gAreaTileSets_DigCaves1 @ 0x13 + .4byte gAreaTileSets_CrenelDigCave @ 0x14 + .4byte gAreaTileSets_FestivalTown @ 0x15 + .4byte gAreaTileSets_VeilFallsDigCave @ 0x16 + .4byte gAreaTileSets_CastorWildsDigCave @ 0x17 + .4byte gAreaTileSets_OuterFortressOfWinds @ 0x18 + .4byte gAreaTileSets_HyliaDigCaves @ 0x19 + .4byte gAreaTileSets_VeilFallsTop @ 0x1A + .4byte gAreaTileSets_Unused @ 0x1B + .4byte gAreaTileSets_Unused @ 0x1C + .4byte gAreaTileSets_Unused @ 0x1D + .4byte gAreaTileSets_Unused @ 0x1E + .4byte gAreaTileSets_Unused @ 0x1F + .4byte gAreaTileSets_MinishHouseInteriors @ 0x20 + .4byte gAreaTileSets_HouseInteriors1 @ 0x21 + .4byte gAreaTileSets_HouseInteriors2 @ 0x22 + .4byte gAreaTileSets_HouseInteriors3 @ 0x23 + .4byte gAreaTileSets_TreeInteriors @ 0x24 + .4byte gAreaTileSets_Dojos @ 0x25 + .4byte gAreaTileSets_CrenelCaves @ 0x26 + .4byte gAreaTileSets_MinishCracks @ 0x27 + .4byte gAreaTileSets_HouseInteriors4 @ 0x28 + .4byte gAreaTileSets_GreatFairies @ 0x29 + .4byte gAreaTileSets_CastorCaves @ 0x2A + .4byte gAreaTileSets_FortressOfWinds @ 0x2B + .4byte gAreaTileSets_ArmosInteriors @ 0x2C + .4byte gAreaTileSets_TownMinishHoles @ 0x2D + .4byte gAreaTileSets_MinishRafters @ 0x2E + .4byte gAreaTileSets_GoronCave @ 0x2F + .4byte gAreaTileSets_WindTribeTower @ 0x30 + .4byte gAreaTileSets_WindTribeTowerRoof @ 0x31 + .4byte gAreaTileSets_Caves @ 0x32 + .4byte gAreaTileSets_VeilFallsCaves @ 0x33 + .4byte gAreaTileSets_RoyalValleyGraves @ 0x34 + .4byte gAreaTileSets_MinishCaves @ 0x35 + .4byte gAreaTileSets_CastleGardenMinishHoles @ 0x36 + .4byte gAreaTileSets_37 @ 0x37 + .4byte gAreaTileSets_EzloCutscene @ 0x38 + .4byte gAreaTileSets_Unused @ 0x39 + .4byte gAreaTileSets_Unused @ 0x3A + .4byte gAreaTileSets_Unused @ 0x3B + .4byte gAreaTileSets_Unused @ 0x3C + .4byte gAreaTileSets_Unused @ 0x3D + .4byte gAreaTileSets_Unused @ 0x3E + .4byte gAreaTileSets_Unused @ 0x3F + .4byte gAreaTileSets_40 @ 0x40 + .4byte gAreaTileSets_HyruleTownUnderground @ 0x41 + .4byte gAreaTileSets_40 @ 0x42 + .4byte gAreaTileSets_40 @ 0x43 + .4byte gAreaTileSets_SimonsSimulation @ 0x44 + .4byte gAreaTileSets_45 @ 0x45 + .4byte gAreaTileSets_45 @ 0x46 + .4byte gAreaTileSets_45 @ 0x47 + .4byte gAreaTileSets_DeepwoodShrine @ 0x48 + .4byte gAreaTileSets_DeepwoodShrineBoss @ 0x49 + .4byte gAreaTileSets_DeepwoodShrineEntry @ 0x4A + .4byte gAreaTileSets_Unused @ 0x4B + .4byte gAreaTileSets_Unused @ 0x4C + .4byte gAreaTileSets_DeepwoodShrine @ 0x4D + .4byte gAreaTileSets_DeepwoodShrine @ 0x4E + .4byte gAreaTileSets_DeepwoodShrineBoss @ 0x4F + .4byte gAreaTileSets_CaveOfFlames @ 0x50 + .4byte gAreaTileSets_CaveOfFlamesBoss @ 0x51 + .4byte gAreaTileSets_Unused @ 0x52 + .4byte gAreaTileSets_Unused @ 0x53 + .4byte gAreaTileSets_Unused @ 0x54 + .4byte gAreaTileSets_Unused @ 0x55 + .4byte gAreaTileSets_CaveOfFlames @ 0x56 + .4byte gAreaTileSets_CaveOfFlames @ 0x57 + .4byte gAreaTileSets_FortressOfWinds @ 0x58 + .4byte gAreaTileSets_FortressOfWindsTop @ 0x59 + .4byte gAreaTileSets_InnerMazaal @ 0x5A + .4byte gAreaTileSets_Unused @ 0x5B + .4byte gAreaTileSets_Unused @ 0x5C + .4byte gAreaTileSets_Unused @ 0x5D + .4byte gAreaTileSets_Unused @ 0x5E + .4byte gAreaTileSets_FortressOfWinds @ 0x5F + .4byte gAreaTileSets_TempleOfDroplets @ 0x60 + .4byte gAreaTileSets_61 @ 0x61 + .4byte gAreaTileSets_HyruleTownMinishCaves @ 0x62 + .4byte gAreaTileSets_Unused @ 0x63 + .4byte gAreaTileSets_Unused @ 0x64 + .4byte gAreaTileSets_Unused @ 0x65 + .4byte gAreaTileSets_Unused @ 0x66 + .4byte gAreaTileSets_TempleOfDroplets @ 0x67 + .4byte gAreaTileSets_RoyalCrypt @ 0x68 + .4byte gAreaTileSets_Unused @ 0x69 + .4byte gAreaTileSets_Unused @ 0x6A + .4byte gAreaTileSets_Unused @ 0x6B + .4byte gAreaTileSets_Unused @ 0x6C + .4byte gAreaTileSets_Unused @ 0x6D + .4byte gAreaTileSets_Unused @ 0x6E + .4byte gAreaTileSets_RoyalCrypt @ 0x6F + .4byte gAreaTileSets_PalaceOfWinds @ 0x70 + .4byte gAreaTileSets_PalaceOfWindsBoss @ 0x71 + .4byte gAreaTileSets_Unused @ 0x72 + .4byte gAreaTileSets_Unused @ 0x73 + .4byte gAreaTileSets_Unused @ 0x74 + .4byte gAreaTileSets_Unused @ 0x75 + .4byte gAreaTileSets_Unused @ 0x76 + .4byte gAreaTileSets_PalaceOfWinds @ 0x77 + .4byte gAreaTileSets_Sanctuary @ 0x78 + .4byte gAreaTileSets_Unused @ 0x79 + .4byte gAreaTileSets_Unused @ 0x7A + .4byte gAreaTileSets_Unused @ 0x7B + .4byte gAreaTileSets_Unused @ 0x7C + .4byte gAreaTileSets_Unused @ 0x7D + .4byte gAreaTileSets_Unused @ 0x7E + .4byte gAreaTileSets_Sanctuary @ 0x7F + .4byte gAreaTileSets_HyruleCastle @ 0x80 + .4byte gAreaTileSets_SanctuaryEntrance @ 0x81 + .4byte gAreaTileSets_Unused @ 0x82 + .4byte gAreaTileSets_Unused @ 0x83 + .4byte gAreaTileSets_Unused @ 0x84 + .4byte gAreaTileSets_Unused @ 0x85 + .4byte gAreaTileSets_Unused @ 0x86 + .4byte gAreaTileSets_HyruleCastle @ 0x87 + .4byte gAreaTileSets_DarkHyruleCastle @ 0x88 + .4byte gAreaTileSets_DarkHyruleCastleOutside @ 0x89 + .4byte gAreaTileSets_VaatisArms @ 0x8A + .4byte gAreaTileSets_Vaati3 @ 0x8B + .4byte gAreaTileSets_Vaati2 @ 0x8C + .4byte gAreaTileSets_DarkHyruleCastleBridge @ 0x8D + .4byte gAreaTileSets_Unused @ 0x8E + .4byte gAreaTileSets_DarkHyruleCastle @ 0x8F diff --git a/data/scripts/castorWilds/script_CutsceneOrchestrator.inc b/data/scripts/castorWilds/script_CutsceneOrchestrator.inc index d64f1ee5..c90e2862 100644 --- a/data/scripts/castorWilds/script_CutsceneOrchestrator.inc +++ b/data/scripts/castorWilds/script_CutsceneOrchestrator.inc @@ -11,7 +11,7 @@ script_0800B216: Call DisablePauseMenuAndPutAwayItems MoveEntityToPlayer CameraTargetEntity - _0807EDD4 0x0068, 0x0380 + MoveTo 0x0068, 0x0380 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 Call EnablePauseMenu diff --git a/data/scripts/castorWilds/script_PlayerAtDarknutFight.inc b/data/scripts/castorWilds/script_PlayerAtDarknutFight.inc index c09e6ed0..e73e1517 100644 --- a/data/scripts/castorWilds/script_PlayerAtDarknutFight.inc +++ b/data/scripts/castorWilds/script_PlayerAtDarknutFight.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerAtDarknutFight EndBlock WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x00e0 - _0807EDD4 0x0088, 0x0090 + MoveTo 0x0088, 0x0090 ClearLocalFlag 0x0039 DoPostScriptAction 0x0000 DoPostScriptAction 0x0004 diff --git a/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc b/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc index 135e95c0..30c270a4 100644 --- a/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc +++ b/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc @@ -13,7 +13,7 @@ SCRIPT_START script_CutsceneOrchestratorGreatWhirlwindRevealed WaitForSyncFlagAndClear 0x00000004 SetSyncFlag 0x0000000a WaitForSyncFlagAndClear 0x00000004 - _0807EEB4 + MoveToPlayer SetScrollSpeed 4 CameraTargetPlayer Call sub_0807FBCC diff --git a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc index 3ed822d7..dd31993b 100644 --- a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc +++ b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc @@ -26,7 +26,7 @@ script_0800D650: SetEntitySpeed 0x0700 SetScrollSpeed 7 CameraTargetEntity - _0807EDD4 0x01e8, 0x01b8 + MoveTo 0x01e8, 0x01b8 Wait 0x003c Call NPC4E_SetPinwheelFlag Wait 0x0078 diff --git a/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc index f4372344..e9766d70 100644 --- a/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc +++ b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc @@ -1,6 +1,6 @@ @ Cloud Tops NPC4E after Kinstone has been fused SCRIPT_START script_Npc4EKinstoneFused - _0807EEB4 + MoveToPlayer SetScrollSpeed 4 CameraTargetPlayer Call sub_0807FBCC diff --git a/data/scripts/cloudTops/script_PlayerAtSiroc.inc b/data/scripts/cloudTops/script_PlayerAtSiroc.inc index ebdfb81b..a6c2bd7b 100644 --- a/data/scripts/cloudTops/script_PlayerAtSiroc.inc +++ b/data/scripts/cloudTops/script_PlayerAtSiroc.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtSiroc BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0078, 0x0040 + MoveTo 0x0078, 0x0040 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cloudTops/script_WindTribespeople3.inc b/data/scripts/cloudTops/script_WindTribespeople3.inc index ba5b01cc..7eee45f5 100644 --- a/data/scripts/cloudTops/script_WindTribespeople3.inc +++ b/data/scripts/cloudTops/script_WindTribespeople3.inc @@ -19,7 +19,7 @@ script_080149DE: SetLocalFlag 0x00b1 DoPostScriptAction 0x000b DoPostScriptAction 0x0001 - _0807EDD4 0x0068, 0x00f8 + MoveTo 0x0068, 0x00f8 PlaySound SFX_SECRET FacePlayer DoPostScriptAction 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc index c5d77432..56c3be62 100644 --- a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc +++ b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc @@ -12,7 +12,7 @@ SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed1 Wait 0x003c PlaySound SFX_123 CallWithArg sub_0807F464, 0x000001e0 - _0807EDD4 0x01e0, 0x01d8 + MoveTo 0x01e0, 0x01d8 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 diff --git a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc index 76862484..ef4f7130 100644 --- a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc +++ b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc @@ -7,12 +7,12 @@ SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed2 SetEntitySpeed 0x0100 EndBlock WaitForSyncFlagAndClear 0x00000002 - _0807EDD4 0x01f0, 0x01d8 + MoveTo 0x01f0, 0x01d8 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 script_0800D80C: SetEntitySpeed 0x0100 - _0807EEF4 0x0000, -32 + MoveToOffset 0x0000, -32 DoPostScriptAction 0x000e Call sub_0806CA5C SetEntityVelocity 0x00040000 diff --git a/data/scripts/cutscene/ezlo/script_EzloCap.inc b/data/scripts/cutscene/ezlo/script_EzloCap.inc index 0c5328b2..9bd3aed2 100644 --- a/data/scripts/cutscene/ezlo/script_EzloCap.inc +++ b/data/scripts/cutscene/ezlo/script_EzloCap.inc @@ -225,7 +225,7 @@ script_08012A3E: SetEntitySpeed 0x0080 Call sub_0806D8A0 script_08012A74: - _0807EE30 + MoveTowardsTarget JumpIfNot script_08012A74 SetAnimation 0x001f WaitUntilTextboxCloses diff --git a/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc b/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc index eaa33a4c..9e784a5c 100644 --- a/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc +++ b/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerDefeatedOctoroks SetEntitySpeed 0x0100 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x0388, 0x0180 + MoveTo 0x0388, 0x0180 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/intro/script_IntroCameraTarget.inc b/data/scripts/cutscene/intro/script_IntroCameraTarget.inc index 3c3d8b38..98e7accd 100644 --- a/data/scripts/cutscene/intro/script_IntroCameraTarget.inc +++ b/data/scripts/cutscene/intro/script_IntroCameraTarget.inc @@ -8,10 +8,10 @@ SCRIPT_START script_IntroCameraTarget SetFadeTime 0x0002 @ Fade in SetFade4 - WaitForFadeFinish @ TODO wait for fade to be finished + WaitForFadeFinish Wait 0x0078 SetSyncFlag 0x00000004 Call sub_08053648 @ Move camera target down - _0807EDD4 0x0240, 0x0228 + MoveTo 0x0240, 0x0228 SCRIPT_END diff --git a/data/scripts/cutscene/intro/script_PlayerMoveToSmith.inc b/data/scripts/cutscene/intro/script_PlayerMoveToSmith.inc index 8bec701d..0f441d0d 100644 --- a/data/scripts/cutscene/intro/script_PlayerMoveToSmith.inc +++ b/data/scripts/cutscene/intro/script_PlayerMoveToSmith.inc @@ -7,8 +7,8 @@ SCRIPT_START script_PlayerMoveToSmith SetSyncFlag 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c - _0807EDD4 0x0040, 0x0060 - _0807EDD4 0x0060, 0x0068 + MoveTo 0x0040, 0x0060 + MoveTo 0x0060, 0x0068 SetSyncFlag 0x00000004 DoPostScriptAction 0x0000 _0807E8E4_0 @@ -18,7 +18,7 @@ SCRIPT_START script_PlayerMoveToSmith Wait 0x001e SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000002 - _0807EDD4 0x0070, 0x005c + MoveTo 0x0070, 0x005c _0807E8E4_1 DoPostScriptAction 0x0000 Wait 0x000f diff --git a/data/scripts/cutscene/intro/script_SmithIntro.inc b/data/scripts/cutscene/intro/script_SmithIntro.inc index fe1ac39c..bdc21562 100644 --- a/data/scripts/cutscene/intro/script_SmithIntro.inc +++ b/data/scripts/cutscene/intro/script_SmithIntro.inc @@ -24,7 +24,7 @@ SCRIPT_START script_SmithIntro WaitForSyncFlagAndClear 0x00000008 SetAction 0x0001 SetAnimationState 0x0004 - _0807EDD4 0x00b8, 0x005c + MoveTo 0x00b8, 0x005c SetAnimationState 0x0006 DoPostScriptAction 0x0001 MessageFromTarget TEXT_PROLOGUE, 0x04 diff --git a/data/scripts/cutscene/intro/script_SmithIntro2.inc b/data/scripts/cutscene/intro/script_SmithIntro2.inc index ca938451..b5362248 100644 --- a/data/scripts/cutscene/intro/script_SmithIntro2.inc +++ b/data/scripts/cutscene/intro/script_SmithIntro2.inc @@ -14,7 +14,7 @@ SCRIPT_START script_SmithIntro2 StartPlayerScript script_PlayerMoveToSmith Call DisablePauseMenuAndPutAwayItems WaitForSyncFlagAndClear 0x00000008 - _0807EDD4 0x0080, 0x005c + MoveTo 0x0080, 0x005c SetAnimationState 0x0006 DoPostScriptAction 0x0000 Wait 0x000f @@ -32,10 +32,10 @@ SCRIPT_START script_SmithIntro2 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000008 - _0807EDD4 0x007c, 0x005c + MoveTo 0x007c, 0x005c Wait 0x000f DoPostScriptAction 0x000d - _0807EDD4 0x0084, 0x005c + MoveTo 0x0084, 0x005c SetAnimationState 0x0006 DoPostScriptAction 0x000c DoPostScriptAction 0x0000 diff --git a/data/scripts/cutscene/intro/script_ZeldaIntro.inc b/data/scripts/cutscene/intro/script_ZeldaIntro.inc index 9d82ffad..990afc63 100644 --- a/data/scripts/cutscene/intro/script_ZeldaIntro.inc +++ b/data/scripts/cutscene/intro/script_ZeldaIntro.inc @@ -8,7 +8,7 @@ SCRIPT_START script_ZeldaIntro EndBlock WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0007 - _0807EDD4 0x0068, 0x0060 + MoveTo 0x0068, 0x0060 Wait 0x000f MessageFromTarget TEXT_PROLOGUE, 0x01 WaitUntilTextboxCloses diff --git a/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc b/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc index 0b496f45..738d55a5 100644 --- a/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc +++ b/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc @@ -4,12 +4,12 @@ SCRIPT_START script_ZeldaLeaveLinksHouse SetEntitySpeed 0x0100 SetAnimationState 0x0006 EndBlock - _0807EDD4 0x0078, 0x0060 - _0807EDD4 0x0078, 0x007c + MoveTo 0x0078, 0x0060 + MoveTo 0x0078, 0x007c Wait 0x001e Call sub_0805368C Wait 0x0008 - _0807EDD4 0x0078, 0x0098 + MoveTo 0x0078, 0x0098 DoPostScriptAction 0x0008 SetFadeTime 0x0010 SetFade5 diff --git a/data/scripts/cutscene/intro/script_ZeldaMoveToLinksHouse.inc b/data/scripts/cutscene/intro/script_ZeldaMoveToLinksHouse.inc index d86a142b..f6dc08b1 100644 --- a/data/scripts/cutscene/intro/script_ZeldaMoveToLinksHouse.inc +++ b/data/scripts/cutscene/intro/script_ZeldaMoveToLinksHouse.inc @@ -7,23 +7,23 @@ SCRIPT_START script_ZeldaMoveToLinksHouse EndBlock WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0007 - _0807EDD4 0x01e8, 0x0200 - _0807EDD4 0x01f8, 0x0218 - _0807EDD4 0x0220, 0x0228 - _0807EDD4 0x0240, 0x0228 + MoveTo 0x01e8, 0x0200 + MoveTo 0x01f8, 0x0218 + MoveTo 0x0220, 0x0228 + MoveTo 0x0240, 0x0228 @ Now the camera follows Zelda CameraTargetEntity - _0807EDD4 0x0290, 0x0228 - _0807EDD4 0x0290, 0x01f8 + MoveTo 0x0290, 0x0228 + MoveTo 0x0290, 0x01f8 SetEntitySpeed 0x0080 - _0807EDD4 0x0290, 0x01c8 + MoveTo 0x0290, 0x01c8 SetEntitySpeed 0x00c0 - _0807EDD4 0x0290, 0x0198 + MoveTo 0x0290, 0x0198 Wait 0x001e @ Door is opening SetSyncFlag 0x00000010 @ Send signal to door - _0807EDD4 0x0290, 0x0190 + MoveTo 0x0290, 0x0190 DoPostScriptAction 0x0008 - _0807EDD4 0x0290, 0x0188 + MoveTo 0x0290, 0x0188 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc b/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc index 16bebcaf..67a5eefc 100644 --- a/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc +++ b/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc @@ -27,8 +27,8 @@ SCRIPT_START script_ZeldaTalkToSmith WaitUntilTextboxCloses DoPostScriptAction 0x0000 @ Leave room - _0807EDD4 0x0028, 0x0060 - _0807EDD4 0x0000, 0x0060 + MoveTo 0x0028, 0x0060 + MoveTo 0x0000, 0x0060 Call sub_080536A8 Wait 0x001e BeginBlock diff --git a/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc b/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc index daa91183..9f2a8bfe 100644 --- a/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc +++ b/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc @@ -4,13 +4,13 @@ SCRIPT_START script_PlayerEnters SetEntitySpeed 0x0100 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x00b8, 0x0090 + MoveTo 0x00b8, 0x0090 SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000040 DoPostScriptAction 0x0001 - _0807EDD4 0x0088, 0x0078 + MoveTo 0x0088, 0x0078 SetAnimationState 0x0000 DoPostScriptAction 0x0000 Wait 0x000f diff --git a/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc b/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc index e971d99d..68a3e12c 100644 --- a/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc @@ -40,7 +40,7 @@ SCRIPT_START script_SmithAtAssembly WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 - _0807EDD4 0x0098, 0x0078 + MoveTo 0x0098, 0x0078 FacePlayer DoPostScriptAction 0x0000 DoPostScriptAction 0x0001 diff --git a/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc b/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc index 28987c7e..6e0017f9 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc @@ -4,7 +4,7 @@ SCRIPT_START script_08015B14 SetAnimation 0x0018 SetEntitySpeed 0x0300 EndBlock - _0807EDD4 0x0248, 0x0218 + MoveTo 0x0248, 0x0218 SetSyncFlag 0x00000020 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc index f5475ac2..3021ba57 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc @@ -1,7 +1,7 @@ @ Player at intro outside castle 1? SCRIPT_START script_PlayerIntroBusinessScrub1 SetEntitySpeed 0x0100 - _0807EDD4 0x0218, 0x0238 + MoveTo 0x0218, 0x0238 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc index 3f6979a5..aeae6cf6 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc @@ -1,7 +1,7 @@ @ Player at intro outside castle SCRIPT_START script_PlayerIntroBusinessScrub2 SetEntitySpeed 0x0100 - _0807EDD4 0x0238, 0x0228 + MoveTo 0x0238, 0x0228 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc index b9ea15ff..28a713d3 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc @@ -1,7 +1,7 @@ @ Intro Outside Castle Player SCRIPT_START script_PlayerIntroBusinessScrub3 SetEntitySpeed 0x0100 - _0807EDD4 0x0248, 0x0208 + MoveTo 0x0248, 0x0208 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 diff --git a/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc b/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc index 0e44b4ea..a83b2580 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc @@ -13,12 +13,12 @@ SCRIPT_START script_ZeldaIntroBusinessScrub EndBlock DoPostScriptAction 0x0007 FacePlayer - _0807EDD4 0x01f8, 0x02f8 + MoveTo 0x01f8, 0x02f8 SetAnimationState 0x0004 DoPostScriptAction 0x0000 MessageFromTargetPos TEXT_PROLOGUE, 0x11, 0x0002 WaitUntilTextboxCloses - _0807EDD4 0x01f8, 0x0268 + MoveTo 0x01f8, 0x0268 SetEntityPositionRelative 0x0248, 0x0218 SetAnimationState 0x0006 DoPostScriptAction 0x0000 @@ -43,7 +43,7 @@ SCRIPT_START script_ZeldaIntroBusinessScrub SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0100 - _0807EDD4 0x0238, 0x0238 + MoveTo 0x0238, 0x0238 SetAnimationState 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a diff --git a/data/scripts/cutscene/introCeremony/script_08011890.inc b/data/scripts/cutscene/introCeremony/script_08011890.inc index b6f22f79..5b03f447 100644 --- a/data/scripts/cutscene/introCeremony/script_08011890.inc +++ b/data/scripts/cutscene/introCeremony/script_08011890.inc @@ -8,7 +8,7 @@ SCRIPT_START script_08011890 EndBlock Wait 0x00f0 Call sub_08094B6C - _0807EDD4 0x01f8, 0x0088 + MoveTo 0x01f8, 0x0088 Call sub_08094B80 PlaySound SFX_1CC SetSyncFlag 0x10000000 diff --git a/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc b/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc index 826ad37f..ac1fba62 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc @@ -17,8 +17,8 @@ SCRIPT_START script_GuardBottomRight Wait 0x003c SetAnimation 0x0014 SetEntitySpeed 0x0100 - _0807EDD4 0x0200, 0x0098 - _0807EDD4 0x0200, 0x00c8 + MoveTo 0x0200, 0x0098 + MoveTo 0x0200, 0x00c8 SetAnimation 0x0013 SetSyncFlag 0x00004000 WaitForSyncFlagAndClear 0x00002000 diff --git a/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc b/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc index a2cdf5ff..1d859822 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc @@ -37,8 +37,8 @@ script_08011312: Wait 0x003c SetAnimation 0x0014 SetEntitySpeed 0x0100 - _0807EDD4 0x01f0, 0x0098 - _0807EDD4 0x01f0, 0x00c8 + MoveTo 0x01f0, 0x0098 + MoveTo 0x01f0, 0x00c8 SetAnimation 0x0013 SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 diff --git a/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc b/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc index b92edbd5..1b10d516 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc @@ -20,16 +20,16 @@ SCRIPT_START script_GuardTopLeft WaitForSyncFlagAndClear 0x00008000 SetAnimation 0x0014 SetEntitySpeed 0x0100 - _0807EDD4 0x01e8, 0x0098 + MoveTo 0x01e8, 0x0098 SetEntitySpeed 0x0040 - _0807EEF4 0x0000, 0x0010 + MoveToOffset 0x0000, 0x0010 SetAnimation 0x0013 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 DoPostScriptAction 0x000d SetAnimation 0x0014 SetEntitySpeed 0x0020 - _0807EEF4 0x0000, 0xfff0 + MoveToOffset 0x0000, 0xfff0 SetAnimation 0x0013 DoPostScriptAction 0x0010 SetSyncFlag 0x00010000 diff --git a/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc b/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc index 5a29854c..b6fb34c5 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc @@ -20,16 +20,16 @@ SCRIPT_START script_GuardTopRight WaitForSyncFlagAndClear 0x00020000 SetAnimation 0x0014 SetEntitySpeed 0x0100 - _0807EDD4 0x0208, 0x0098 + MoveTo 0x0208, 0x0098 SetEntitySpeed 0x0040 - _0807EEF4 0x0000, 0x0010 + MoveToOffset 0x0000, 0x0010 SetAnimation 0x0013 SetSyncFlag 0x00040000 WaitForSyncFlagAndClear 0x00020000 DoPostScriptAction 0x000d SetAnimation 0x0014 SetEntitySpeed 0x0020 - _0807EEF4 0x0000, 0xfff0 + MoveToOffset 0x0000, 0xfff0 SetAnimation 0x0013 DoPostScriptAction 0x0010 SetSyncFlag 0x00040000 diff --git a/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc b/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc index afefc1f7..aed20525 100644 --- a/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc +++ b/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc @@ -10,7 +10,7 @@ SCRIPT_START script_KingDaltusIntroCeremony DoPostScriptAction 0x0007 DoPostScriptAction 0x0001 SetEntitySpeed 0x0040 - _0807EDD4 0x01f8, 0x0048 + MoveTo 0x01f8, 0x0048 DoPostScriptAction 0x0000 SetSyncFlag 0x00000080 WaitForSyncFlagAndClear 0x00000040 diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc index eb566324..e378d0f2 100644 --- a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc +++ b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc @@ -30,7 +30,7 @@ SCRIPT_START script_Npc4EMonsters Call NPC4E_SaveEquippedItems Call SetPlayerActionNormal CallWithArg EquipItem, ITEM_SHIELD - CallWithArg SetPlayerMacro, gUnk_080049F6 + CallWithArg SetPlayerMacro, gPlayerMacroProtectWithShield SetScrollSpeed 1 SetEntityPositionRelative 0x01f8, 0x0068 SetSyncFlag 0x00000004 @@ -41,7 +41,7 @@ SCRIPT_START script_Npc4EMonsters PlaySound SFX_1C3 SetSyncFlag 0x20000000 Wait 0x0078 - CallWithArg SetPlayerMacro, 0x00000000 + CallWithArg SetPlayerMacro, 0 Call NPC4E_RestoreEquippedItems SetSyncFlag 0x40000000 SetSyncFlag 0x00000010 diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc index d9a9df96..0ce97624 100644 --- a/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc +++ b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc @@ -10,11 +10,11 @@ SCRIPT_START script_Npc4EVaatiAttacking Call NPC4E_SaveEquippedItems Call SetPlayerActionNormal CallWithArg EquipItem, ITEM_SHIELD - CallWithArg SetPlayerMacro, gUnk_080049F6 + CallWithArg SetPlayerMacro, gPlayerMacroProtectWithShield Wait 0x001e SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000200 - CallWithArg SetPlayerMacro, 0x00000000 + CallWithArg SetPlayerMacro, 0 Call NPC4E_RestoreEquippedItems Wait 0x003c SetSyncFlag 0x08000000 diff --git a/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc b/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc index 124fe933..9ffed96c 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerIntroCastle BeginBlock SetEntitySpeed 0x0080 EndBlock - _0807EDD4 0x01e8, 0x0050 + MoveTo 0x01e8, 0x0050 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000400 diff --git a/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc b/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc index 13efecf9..0860ba5f 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerProtectingZelda EndBlock SetEntitySpeed 0x0200 DoPostScriptAction 0x0001 - _0807EDD4 0x01d8, 0x0068 + MoveTo 0x01d8, 0x0068 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000400 diff --git a/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc b/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc index 24b9f903..47a5a071 100644 --- a/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc +++ b/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc @@ -8,9 +8,9 @@ SCRIPT_START script_VaatiDarkMagic EndBlock WaitForSyncFlagAndClear 0x08000000 Call sub_08094B6C - _0807EDD4 0x01d8, 0x0078 + MoveTo 0x01d8, 0x0078 StartPlayerScript script_PlayerFainting - _0807EDD4 0x01d8, 0x0058 + MoveTo 0x01d8, 0x0058 Call sub_08094B80 PlaySound SFX_VO_ZELDA7 PlaySound SFX_1C6 diff --git a/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc b/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc index d34dd18e..9e3c5845 100644 --- a/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc +++ b/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc @@ -7,7 +7,7 @@ SCRIPT_START script_VaatiIntroCeremony Call DeleteHitbox WaitForSyncFlagAndClear 0x00000100 DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x00d0 + MoveTo 0x01f8, 0x00d0 DoPostScriptAction 0x0000 SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00000100 @@ -44,7 +44,7 @@ SCRIPT_START script_VaatiIntroCeremony WaitForSyncFlagAndClear 0x00000100 SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 - _0807EDD4 0x01d8, 0x00a8 + MoveTo 0x01d8, 0x00a8 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000200 @@ -64,7 +64,7 @@ SCRIPT_START script_VaatiIntroCeremony WaitForSyncFlagAndClear 0x00000100 SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x0098 + MoveTo 0x01f8, 0x0098 SetAnimationState 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x0004 diff --git a/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc b/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc index 9ccd1167..71d1229a 100644 --- a/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc +++ b/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc @@ -17,20 +17,20 @@ script_080111F6: script_08011206: DoPostScriptAction 0x0007 DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x0050 + MoveTo 0x01f8, 0x0050 FacePlayer DoPostScriptAction 0x0000 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x0020 + MoveTo 0x01f8, 0x0020 DoPostScriptAction 0x0008 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0007 DoPostScriptAction 0x0001 SetEntitySpeed 0x0040 - _0807EDD4 0x01e8, 0x0040 + MoveTo 0x01e8, 0x0040 DoPostScriptAction 0x0000 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 @@ -38,7 +38,7 @@ script_08011206: SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0001 - _0807EDD4 0x01d8, 0x0058 + MoveTo 0x01d8, 0x0058 DoPostScriptAction 0x0000 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc index 0884bbc7..936f7c59 100644 --- a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc @@ -74,7 +74,7 @@ SCRIPT_START script_Npc4EIntroCastle SetSyncFlag 0x00000100 SetEntityPositionRelative 0x01f8, 0x0220 SetEntitySpeed 0x0100 - _0807EDD4 0x01f8, 0x0098 + MoveTo 0x01f8, 0x0098 Wait 0x003c WaitForSyncFlagAndClear 0x00000200 SetSyncFlag 0x00280000 diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc index 14a92e0c..0b1e0424 100644 --- a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc @@ -152,14 +152,14 @@ SCRIPT_START script_Npc4EIntroTown CallWithArg EquipItem, ITEM_SHIELD SetIntVariable 0x000000ff Call sub_0807F5B0 - CallWithArg SetPlayerMacro, gUnk_080049D6 + CallWithArg SetPlayerMacro, gPlayerMacroTryOutShield Wait 0x00b7 SetIntVariable 0x00000000 Call sub_0807F5B0 MessageFromTargetPos TEXT_PROLOGUE, 0x2c, 0x0000 WaitUntilTextboxCloses @ Give control back to the player - CallWithArg SetPlayerMacro, 0x00000000 + CallWithArg SetPlayerMacro, 0 Call NPC4E_RestoreEquippedItems SetScrollSpeed 4 CameraTargetPlayer diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro2.inc b/data/scripts/cutscene/introTown/script_PlayerIntro2.inc index 02058ebd..d13433e5 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro2.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro2.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerIntro2 BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x00a0, 0x0278 + MoveTo 0x00a0, 0x0278 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro3.inc b/data/scripts/cutscene/introTown/script_PlayerIntro3.inc index 2ee42514..5bb61b0a 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro3.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro3.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerIntro3 BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0078, 0x01c0 + MoveTo 0x0078, 0x01c0 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro4.inc b/data/scripts/cutscene/introTown/script_PlayerIntro4.inc index ad1b34dd..83a20961 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro4.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro4.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerIntro4 BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0108, 0x01c8 + MoveTo 0x0108, 0x01c8 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro5.inc b/data/scripts/cutscene/introTown/script_PlayerIntro5.inc index f1393d94..3f0be7a3 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro5.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro5.inc @@ -10,7 +10,7 @@ script_0800FAFC: script_0800FB06: CallWithArg sub_0807F464, 0x000000e8 script_0800FB10: - _0807EDD4 0x00e8, 0x0270 + MoveTo 0x00e8, 0x0270 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc b/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc index a9d511f9..d4a8caf7 100644 --- a/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc +++ b/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc @@ -18,7 +18,7 @@ script_0800FB6C: SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 - _0807EDD4 0x00b8, 0x0318 + MoveTo 0x00b8, 0x0318 SetEntityPositionRelative 0x00a0, 0x0260 SetAnimationState 0x0000 DoPostScriptAction 0x0001 @@ -36,9 +36,9 @@ script_0800FBAE: SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 - _0807EDD4 0x00a0, 0x0268 - _0807EDD4 0x0070, 0x0268 - _0807EDD4 0x0070, 0x0208 + MoveTo 0x00a0, 0x0268 + MoveTo 0x0070, 0x0268 + MoveTo 0x0070, 0x0208 SetEntityPositionRelative 0x0078, 0x01a8 SetAnimationState 0x0000 DoPostScriptAction 0x0001 @@ -55,7 +55,7 @@ script_0800FC06: SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 - _0807EDD4 0x00f8, 0x01a8 + MoveTo 0x00f8, 0x01a8 SetEntityPositionRelative 0x0118, 0x01c8 SetAnimationState 0x0002 DoPostScriptAction 0x0001 @@ -72,7 +72,7 @@ script_0800FC52: SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 - _0807EDD4 0x0118, 0x0260 + MoveTo 0x0118, 0x0260 SetEntityPositionRelative 0x00f8, 0x0270 SetAnimationState 0x0000 DoPostScriptAction 0x0001 diff --git a/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc index 101f2432..1ee344ce 100644 --- a/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc @@ -9,9 +9,9 @@ SCRIPT_START script_HurdyGurdyManFirstKinstone SetAnimationState 0x0002 WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 - _0807EDD4 0x01b8, 0x0328 + MoveTo 0x01b8, 0x0328 SetSyncFlag 0x00000040 - _0807EDD4 0x01f8, 0x0328 + MoveTo 0x01f8, 0x0328 SetAnimationState 0x0004 SetAnimation 0x0008 _0807E8E4_0 @@ -108,7 +108,7 @@ script_0800F314: WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 SetAnimationState 0x0002 - _0807EEF4 0x00c0, 0x0000 + MoveToOffset 0x00c0, 0x0000 SetSyncFlag 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone1.inc b/data/scripts/cutscene/kinstones/script_KidKinstone1.inc index 747f8a64..53d49396 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone1.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone1.inc @@ -11,9 +11,9 @@ SCRIPT_START script_KidKinstone1 Call SetPriorityMessage WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0007 - _0807EDD4 0x01f8, 0x0318 - _0807EDD4 0x0208, 0x0318 - _0807EDD4 0x0208, 0x0338 + MoveTo 0x01f8, 0x0318 + MoveTo 0x0208, 0x0318 + MoveTo 0x0208, 0x0338 SetAnimationState 0x0006 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a @@ -37,7 +37,7 @@ script_0800F402: Wait 0x0010 SetEntitySpeed 0x0100 WalkNorth 0x0010 - _0807EDD4 0x0288, 0x0328 + MoveTo 0x0288, 0x0328 SetSyncFlag 0x00000080 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone2.inc b/data/scripts/cutscene/kinstones/script_KidKinstone2.inc index e181fe47..820b1f79 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone2.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone2.inc @@ -11,8 +11,8 @@ SCRIPT_START script_KidKinstone2 Call SetPriorityMessage WaitForSyncFlagAndClear 0x00000008 DoPostScriptAction 0x0007 - _0807EDD4 0x01d8, 0x0328 - _0807EDD4 0x01f8, 0x0348 + MoveTo 0x01d8, 0x0328 + MoveTo 0x01f8, 0x0348 SetAnimationState 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a @@ -37,7 +37,7 @@ script_0800F490: SetEntitySpeed 0x0100 WalkEast 0x0010 WalkNorth 0x0020 - _0807EDD4 0x0288, 0x0328 + MoveTo 0x0288, 0x0328 SetSyncFlag 0x00000100 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone3.inc b/data/scripts/cutscene/kinstones/script_KidKinstone3.inc index 18cb648c..7fec2ebb 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone3.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone3.inc @@ -11,8 +11,8 @@ SCRIPT_START script_KidKinstone3 Call SetPriorityMessage WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0007 - _0807EDD4 0x01c8, 0x0328 - _0807EDD4 0x01e8, 0x0338 + MoveTo 0x01c8, 0x0328 + MoveTo 0x01e8, 0x0338 SetAnimationState 0x0002 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a @@ -36,7 +36,7 @@ script_0800F524: Wait 0x0028 SetEntitySpeed 0x0100 WalkNorth 0x0010 - _0807EDD4 0x0288, 0x0328 + MoveTo 0x0288, 0x0328 SetSyncFlag 0x00000200 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc index 937cf7a9..36f40dcf 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc @@ -8,7 +8,7 @@ SCRIPT_START script_PlayerAtFirstKinstone DoPostScriptAction 0x0004 Wait 0x003c DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x0338 + MoveTo 0x01f8, 0x0338 SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc index f0e29084..028538fa 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc @@ -9,7 +9,7 @@ SCRIPT_START script_ForestMinish5 EndBlock WaitForSyncFlagAndClear 0x00000200 DoPostScriptAction 0x0007 - _0807EDD4 0x0208, 0x0308 + MoveTo 0x0208, 0x0308 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000400 @@ -22,13 +22,13 @@ SCRIPT_START script_ForestMinish5 WaitForSyncFlagAndClear 0x00000200 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f - _0807EDD4 0x0208, 0x0328 + MoveTo 0x0208, 0x0328 DoPostScriptAction 0x0000 SetSyncFlag 0x00000400 WaitForSyncFlagAndClear 0x00000200 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f - _0807EDD4 0x0208, 0x02b0 + MoveTo 0x0208, 0x02b0 SetSyncFlag 0x00000400 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc index ea9e43fd..d58f9983 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc @@ -11,20 +11,20 @@ SCRIPT_START script_ForestMinish6 DoPostScriptAction 0x0007 SetAnimationState 0x0002 DoPostScriptAction 0x0001 - _0807EDD4 0x01a8, 0x0330 + MoveTo 0x01a8, 0x0330 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f - _0807EDD4 0x01f8, 0x0348 + MoveTo 0x01f8, 0x0348 DoPostScriptAction 0x0000 SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f - _0807EDD4 0x0178, 0x0328 + MoveTo 0x0178, 0x0328 SetSyncFlag 0x00001000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc index db6366f1..a38ea170 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc @@ -9,14 +9,14 @@ SCRIPT_START script_ForestMinish7 EndBlock WaitForSyncFlagAndClear 0x00002000 DoPostScriptAction 0x0007 - _0807EDD4 0x0258, 0x0330 + MoveTo 0x0258, 0x0330 SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00004000 WaitForSyncFlagAndClear 0x00002000 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f - _0807EDD4 0x0218, 0x0340 + MoveTo 0x0218, 0x0340 DoPostScriptAction 0x0000 SetSyncFlag 0x00004000 WaitForSyncFlagAndClear 0x00002000 @@ -28,7 +28,7 @@ SCRIPT_START script_ForestMinish7 WaitForSyncFlagAndClear 0x00002000 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f - _0807EDD4 0x0288, 0x02d8 + MoveTo 0x0288, 0x02d8 SetSyncFlag 0x00004000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc index 302f4367..b0058910 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc @@ -9,14 +9,14 @@ SCRIPT_START script_ForestMinish8 EndBlock WaitForSyncFlagAndClear 0x00008000 DoPostScriptAction 0x0007 - _0807EDD4 0x01b8, 0x0320 + MoveTo 0x01b8, 0x0320 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f - _0807EDD4 0x01f8, 0x0330 + MoveTo 0x01f8, 0x0330 DoPostScriptAction 0x0000 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 @@ -28,7 +28,7 @@ SCRIPT_START script_ForestMinish8 WaitForSyncFlagAndClear 0x00008000 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f - _0807EDD4 0x0188, 0x02d8 + MoveTo 0x0188, 0x02d8 SetSyncFlag 0x00010000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc index 38805f14..e07a448d 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc @@ -9,20 +9,20 @@ SCRIPT_START script_ForestMinish9 EndBlock WaitForSyncFlagAndClear 0x00020000 DoPostScriptAction 0x0007 - _0807EDD4 0x0268, 0x0338 + MoveTo 0x0268, 0x0338 SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00040000 WaitForSyncFlagAndClear 0x00020000 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f - _0807EDD4 0x0218, 0x0350 + MoveTo 0x0218, 0x0350 DoPostScriptAction 0x0000 SetSyncFlag 0x00040000 WaitForSyncFlagAndClear 0x00020000 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f - _0807EDD4 0x02a8, 0x0328 + MoveTo 0x02a8, 0x0328 SetSyncFlag 0x00040000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc b/data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc index 2e9cc5ce..8598a952 100644 --- a/data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc +++ b/data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc @@ -4,9 +4,9 @@ SCRIPT_START script_PlayerAtVillageIntro SetEntitySpeed 0x0100 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x0208, 0x0358 + MoveTo 0x0208, 0x0358 SetEntitySpeed 0x0080 - _0807EDD4 0x0208, 0x0340 + MoveTo 0x0208, 0x0340 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 Call SetPlayerActionNormal diff --git a/data/scripts/cutscene/originStory/script_CutsceneMiscObjectDarkMagic.inc b/data/scripts/cutscene/originStory/script_CutsceneMiscObjectDarkMagic.inc index 4055742b..ecb017bb 100644 --- a/data/scripts/cutscene/originStory/script_CutsceneMiscObjectDarkMagic.inc +++ b/data/scripts/cutscene/originStory/script_CutsceneMiscObjectDarkMagic.inc @@ -8,13 +8,13 @@ SCRIPT_START script_CutsceneMiscObjectDarkMagic Wait 0x0078 PlaySound SFX_1C5 Call sub_08094B6C - _0807EDD4 0x0078, 0x00b8 + MoveTo 0x0078, 0x00b8 PlaySound SFX_1C6 Call sub_08094B80 SetSyncFlag 0x00020000 SetEntitySpeed 0x0080 WaitForSyncFlagAndClear 0x00040000 - _0807EDD4 0x0078, 0x00c8 + MoveTo 0x0078, 0x00c8 SetSyncFlag 0x00080000 WaitForSyncFlagAndClear 0x00040000 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/originStory/script_CutsceneMiscObjectMinishCap.inc b/data/scripts/cutscene/originStory/script_CutsceneMiscObjectMinishCap.inc index b835a4ce..9bd8a859 100644 --- a/data/scripts/cutscene/originStory/script_CutsceneMiscObjectMinishCap.inc +++ b/data/scripts/cutscene/originStory/script_CutsceneMiscObjectMinishCap.inc @@ -8,7 +8,7 @@ SCRIPT_START script_CutsceneMiscObjectMinishCap WaitForSyncFlagAndClear 0x00000080 CallWithArg CreateRepeatedSoundManager, 0x00000003 Call sub_08094B0C - _0807EDD4 0x0078, 0x0068 + MoveTo 0x0078, 0x0068 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 _0807EF3C -128, 0x0000 diff --git a/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc b/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc index cbdf8c8b..591e30c7 100644 --- a/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc +++ b/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc @@ -13,7 +13,7 @@ SCRIPT_START script_EzloCapExplainingOriginStory SetAnimation 0x0018 Call sub_0806D8A0 script_080153C2: - _0807EE30 + MoveTowardsTarget JumpIfNot script_080153C2 SetAnimation 0x001f StartPlayerScript script_PlayerReceivedExposition diff --git a/data/scripts/cutscene/originStory/script_MinishEzlo.inc b/data/scripts/cutscene/originStory/script_MinishEzlo.inc index 7b5e52c9..631bacb8 100644 --- a/data/scripts/cutscene/originStory/script_MinishEzlo.inc +++ b/data/scripts/cutscene/originStory/script_MinishEzlo.inc @@ -9,7 +9,7 @@ SCRIPT_START script_MinishEzlo CallWithArg sub_0806AF60, 0x00000000 WaitForSyncFlagAndClear 0x00008000 CallWithArg sub_0806AF60, 0x00000004 - _0807EDD4 0x0078, 0x00b8 + MoveTo 0x0078, 0x00b8 SetAnimationState 0x0000 CallWithArg sub_0806AF60, 0x00000000 SetSyncFlag 0x00010000 @@ -17,7 +17,7 @@ SCRIPT_START script_MinishEzlo DoPostScriptAction 0x000d SetAnimationState 0x0000 CallWithArg sub_0806AF60, 0x00000004 - _0807EDD4 0x0078, 0x00c8 + MoveTo 0x0078, 0x00c8 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 SetAnimationState 0x0000 diff --git a/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc b/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc index 6269f54b..5bdd4252 100644 --- a/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc +++ b/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtVaatisAppearance SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x00b8 + MoveTo 0x01f8, 0x00b8 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc b/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc index 88e9a2fd..18c67273 100644 --- a/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc +++ b/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerDefeatedMoblins SetEntitySpeed 0x0100 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x0148 + MoveTo 0x01f8, 0x0148 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc b/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc index 42f14dc0..06615df8 100644 --- a/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc +++ b/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerTryToFollowVaati SetEntitySpeed 0x0200 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x0148 + MoveTo 0x01f8, 0x0148 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/outro/script_CutsceneMiscObjectMinishCapOutro.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectMinishCapOutro.inc index 6888f3eb..11974a0b 100644 --- a/data/scripts/cutscene/outro/script_CutsceneMiscObjectMinishCapOutro.inc +++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectMinishCapOutro.inc @@ -13,7 +13,7 @@ SCRIPT_START script_CutsceneMiscObjectMinishCapOutro CallWithArg sub_080960C4, script_CutsceneMiscObjectEzloDismounting SetAnimation 0x0002 Call sub_08094B0C - _0807EDD4 0x0068, 0x0088 + MoveTo 0x0068, 0x0088 Call sub_08094B80 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000008 diff --git a/data/scripts/cutscene/outro/script_EzloCapOutro.inc b/data/scripts/cutscene/outro/script_EzloCapOutro.inc index 5d0daa98..b4c39e81 100644 --- a/data/scripts/cutscene/outro/script_EzloCapOutro.inc +++ b/data/scripts/cutscene/outro/script_EzloCapOutro.inc @@ -17,7 +17,7 @@ SCRIPT_START script_EzloCapOutro ClearSyncFlag 0x00000800 CallWithArg sub_080960C4, script_CutsceneMiscObjectEzloDismounting Wait 0x003c - _0807EDD4 0x0088, 0x0068 + MoveTo 0x0088, 0x0068 Wait 0x0078 SetSyncFlag 0x00000800 PlaySound SFX_143 diff --git a/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc b/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc index abe8787a..91afc910 100644 --- a/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc +++ b/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc @@ -47,12 +47,12 @@ SCRIPT_START script_MinishEzloGoodbye SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0080 - _0807EEF4 0x0000, 0xfff0 + MoveToOffset 0x0000, 0xfff0 Wait 0x003c - _0807EEF4 0x0000, 0xfff0 + MoveToOffset 0x0000, 0xfff0 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 - _0807EDD4 0x0088, 0x0040 + MoveTo 0x0088, 0x0040 SetSyncFlag 0x00000004 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc b/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc index 1959b1e5..b3d28b53 100644 --- a/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc +++ b/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtEzlo BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0088, 0x0080 + MoveTo 0x0088, 0x0080 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/reveal/script_08013494.inc b/data/scripts/cutscene/reveal/script_08013494.inc index 9eb632de..d3141e52 100644 --- a/data/scripts/cutscene/reveal/script_08013494.inc +++ b/data/scripts/cutscene/reveal/script_08013494.inc @@ -8,7 +8,7 @@ SCRIPT_START script_08013494 EndBlock Wait 0x005a Call sub_08094B6C - _0807EDD4 0x0098, 0x0080 + MoveTo 0x0098, 0x0080 BeginBlock Call sub_08094B80 PlaySound SFX_1CC diff --git a/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc b/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc index 106508d6..d63a6fec 100644 --- a/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc +++ b/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtPicture SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x0098, 0x0058 + MoveTo 0x0098, 0x0058 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 diff --git a/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc b/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc index 423e3ed9..2a585822 100644 --- a/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc +++ b/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtTakeover SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x0168, 0x0058 + MoveTo 0x0168, 0x0058 SetAnimationState 0x0004 DoPostScriptAction 0x0000 CallWithArg SetPlayerAnimation2, ANIM_EZLO_SEARCH diff --git a/data/scripts/dhc/script_GuardStone2.inc b/data/scripts/dhc/script_GuardStone2.inc index 77848677..b67d32d2 100644 --- a/data/scripts/dhc/script_GuardStone2.inc +++ b/data/scripts/dhc/script_GuardStone2.inc @@ -61,10 +61,10 @@ script_0800E2AE: EndBlock SetAnimationState 0x0000 CallWithArg sub_0807F3D8, 0x00000004 - _0807EDD4 0x0088, 0x0168 + MoveTo 0x0088, 0x0168 SetAnimationState 0x0006 CallWithArg sub_0807F3D8, 0x00000004 - _0807EDD4 0x0070, 0x0168 + MoveTo 0x0070, 0x0168 FacePlayer CallWithArg sub_0807F3D8, 0x00000000 _0807E9D4 diff --git a/data/scripts/dhc/script_PlayerCastleCollapsing.inc b/data/scripts/dhc/script_PlayerCastleCollapsing.inc index 5ee0ccfe..e2a4b720 100644 --- a/data/scripts/dhc/script_PlayerCastleCollapsing.inc +++ b/data/scripts/dhc/script_PlayerCastleCollapsing.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerCastleCollapsing EndBlock SetAnimationState 0x0004 DoPostScriptAction 0x0000 - _0807EEF4 0x0000, 0x0080 + MoveToOffset 0x0000, 0x0080 SetSyncFlag 0x00000004 Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerCastleEscape.inc b/data/scripts/dhc/script_PlayerCastleEscape.inc index 45468213..12dffdf3 100644 --- a/data/scripts/dhc/script_PlayerCastleEscape.inc +++ b/data/scripts/dhc/script_PlayerCastleEscape.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerCastleEscape BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0198, 0x01c8 + MoveTo 0x0198, 0x01c8 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/dhc/script_PlayerRescuedZelda.inc b/data/scripts/dhc/script_PlayerRescuedZelda.inc index b792296a..b5dce732 100644 --- a/data/scripts/dhc/script_PlayerRescuedZelda.inc +++ b/data/scripts/dhc/script_PlayerRescuedZelda.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerRescuedZelda SetEntitySpeed 0x0100 EndBlock CallWithArg sub_0807F4F8, 0x000000a0 - _0807EDD4 0x0078, 0x00a0 + MoveTo 0x0078, 0x00a0 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 diff --git a/data/scripts/dhc/script_PlayerV2Defeated.inc b/data/scripts/dhc/script_PlayerV2Defeated.inc index f16621e5..aae5682c 100644 --- a/data/scripts/dhc/script_PlayerV2Defeated.inc +++ b/data/scripts/dhc/script_PlayerV2Defeated.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerV2Defeated EndBlock WaitForSyncFlagAndClear 0x00000001 DoPostScriptAction 0x0001 - _0807EDD4 0x00a8, 0x002c + MoveTo 0x00a8, 0x002c SetSyncFlag 0x00000002 Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc b/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc index bad68ee4..e7e5d0f8 100644 --- a/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc +++ b/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc @@ -39,7 +39,7 @@ script_0800DCD0: SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0100 - _0807EEF4 0x0000, 0x0008 + MoveToOffset 0x0000, 0x0008 SetAnimationState 0x0004 DoPostScriptAction 0x0000 Wait 0x001e @@ -64,6 +64,6 @@ script_0800DCD0: SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0100 - _0807EEF4 0x0000, 0x0080 + MoveToOffset 0x0000, 0x0080 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_ZeldaCastleEscape.inc b/data/scripts/dhc/script_ZeldaCastleEscape.inc index f8150ad9..3647fd75 100644 --- a/data/scripts/dhc/script_ZeldaCastleEscape.inc +++ b/data/scripts/dhc/script_ZeldaCastleEscape.inc @@ -12,7 +12,7 @@ SCRIPT_START script_ZeldaCastleEscape SetEntityPositionRelative 0x0198, 0x0148 DoPostScriptAction 0x0007 EndBlock - _0807EDD4 0x0198, 0x01a8 + MoveTo 0x0198, 0x01a8 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 diff --git a/data/scripts/fow/script_PlayerAtMazaal.inc b/data/scripts/fow/script_PlayerAtMazaal.inc index d71de158..91c4da4b 100644 --- a/data/scripts/fow/script_PlayerAtMazaal.inc +++ b/data/scripts/fow/script_PlayerAtMazaal.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtMazaal SetAnimationState 0x0000 SetEntitySpeed 0x0140 EndBlock - _0807EDD4 0x00b8, 0x0094 + MoveTo 0x00b8, 0x0094 Wait 0x0008 DoPostScriptAction 0x0000 Wait 0x0008 diff --git a/data/scripts/fow/script_PlayerDefeatedMazaal.inc b/data/scripts/fow/script_PlayerDefeatedMazaal.inc index 89fb8ba8..221c85d6 100644 --- a/data/scripts/fow/script_PlayerDefeatedMazaal.inc +++ b/data/scripts/fow/script_PlayerDefeatedMazaal.inc @@ -15,6 +15,6 @@ SCRIPT_START script_PlayerDefeatedMazaal SetAnimationState 0x0004 Wait 0x0008 SetSyncFlag 0x00000002 - _0807EDD4 0x0088, 0x0158 + MoveTo 0x0088, 0x0158 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/graveyard/script_CutsceneMiscObjectKingsGravestone.inc b/data/scripts/graveyard/script_CutsceneMiscObjectKingsGravestone.inc index 21c7d682..39ed9170 100644 --- a/data/scripts/graveyard/script_CutsceneMiscObjectKingsGravestone.inc +++ b/data/scripts/graveyard/script_CutsceneMiscObjectKingsGravestone.inc @@ -9,7 +9,7 @@ SCRIPT_START script_CutsceneMiscObjectKingsGravestone Wait 0x003c SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 - _0807EDD4 0x0118, 0x0060 + MoveTo 0x0118, 0x0060 SetSyncFlag 0x00000002 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/graveyard/script_KeyStealingTakkuriFirstCrow.inc b/data/scripts/graveyard/script_KeyStealingTakkuriFirstCrow.inc index 267d3ca2..5c8ba697 100644 --- a/data/scripts/graveyard/script_KeyStealingTakkuriFirstCrow.inc +++ b/data/scripts/graveyard/script_KeyStealingTakkuriFirstCrow.inc @@ -12,7 +12,7 @@ SCRIPT_START script_CameraTarget7FirstCrow script_08009816: EndBlock BeginBlock - _0807EE30 + MoveTowardsTarget JumpIfNot script_08009816 EndBlock SetSyncFlag 0x00000004 diff --git a/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc b/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc index 99931985..6a1f2ee4 100644 --- a/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc +++ b/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc @@ -2,7 +2,7 @@ SCRIPT_START script_PlayerAtGraveyardHouseDoor SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 - _0807EDD4 0x01a0, 0x01b0 + MoveTo 0x01a0, 0x01b0 SetAnimationState 0x0000 DoPostScriptAction 0x0000 Wait 0x000a diff --git a/data/scripts/graveyard/script_PlayerAtKingGustav.inc b/data/scripts/graveyard/script_PlayerAtKingGustav.inc index 96b9a99e..6385c175 100644 --- a/data/scripts/graveyard/script_PlayerAtKingGustav.inc +++ b/data/scripts/graveyard/script_PlayerAtKingGustav.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtKingGustav SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x0118, 0x0060 + MoveTo 0x0118, 0x0060 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/hyruleTown/script_CafeGuy.inc b/data/scripts/hyruleTown/script_CafeGuy.inc index 751e6e01..4346d346 100644 --- a/data/scripts/hyruleTown/script_CafeGuy.inc +++ b/data/scripts/hyruleTown/script_CafeGuy.inc @@ -11,7 +11,7 @@ SCRIPT_START script_CafeGuy script_0800ECAC: SetAnimationState 0x0006 SetAnimation 0x0007 - _0807EDD4 0x0028, 0x0050 + MoveTo 0x0028, 0x0050 Wait 0x001e SetAnimationState 0x0004 SetAnimation 0x0002 @@ -21,7 +21,7 @@ script_0800ECAC: Wait 0x001e SetAnimationState 0x0002 SetAnimation 0x0005 - _0807EDD4 0x0048, 0x0050 + MoveTo 0x0048, 0x0050 Wait 0x001e SetAnimationState 0x0004 SetAnimation 0x0002 diff --git a/data/scripts/hyruleTown/script_Carlov.inc b/data/scripts/hyruleTown/script_Carlov.inc index 756fd845..d0bbe0bc 100644 --- a/data/scripts/hyruleTown/script_Carlov.inc +++ b/data/scripts/hyruleTown/script_Carlov.inc @@ -50,7 +50,7 @@ script_080144C8: Wait 0x0018 SetRoomFlag 0x0000 SetLocalFlag 0x0092 - _0807EEF4 0x0000, -96 + MoveToOffset 0x0000, -96 Call DisablePauseMenu Jump script_080144FC script_080144F0: diff --git a/data/scripts/hyruleTown/script_GormanCats.inc b/data/scripts/hyruleTown/script_GormanCats.inc index cad4d713..8451e8bb 100644 --- a/data/scripts/hyruleTown/script_GormanCats.inc +++ b/data/scripts/hyruleTown/script_GormanCats.inc @@ -16,7 +16,7 @@ script_0800FE66: BeginBlock Call sub_08069ACC JumpIf script_0800FE7E - _0807EE30 + MoveTowardsTarget JumpIfNot script_0800FE66 Jump script_0800FE5A script_0800FE7E: diff --git a/data/scripts/hyruleTown/script_GormanSecondHouse.inc b/data/scripts/hyruleTown/script_GormanSecondHouse.inc index f223d84c..cd0a269e 100644 --- a/data/scripts/hyruleTown/script_GormanSecondHouse.inc +++ b/data/scripts/hyruleTown/script_GormanSecondHouse.inc @@ -16,7 +16,7 @@ script_0800FDEE: BeginBlock Call sub_08069ACC JumpIf script_0800FE06 - _0807EE30 + MoveTowardsTarget JumpIfNot script_0800FDEE Jump script_0800FDE2 script_0800FE06: diff --git a/data/scripts/hyruleTown/script_GuardWest.inc b/data/scripts/hyruleTown/script_GuardWest.inc index 26ad9095..fbf3ca77 100644 --- a/data/scripts/hyruleTown/script_GuardWest.inc +++ b/data/scripts/hyruleTown/script_GuardWest.inc @@ -60,7 +60,7 @@ script_08010014: SetAnimationState 0x0004 CallWithArg sub_0807F3D8, 0x0000000c SetEntitySpeed 0x0100 - _0807EDD4 0x0018, 0x0108 + MoveTo 0x0018, 0x0108 SetAnimationState 0x0002 CallWithArg sub_0807F3D8, 0x00000008 SetLocalFlag MACHI_02_HEISHI diff --git a/data/scripts/hyruleTown/script_Kid3.inc b/data/scripts/hyruleTown/script_Kid3.inc index 99f6a116..9592452b 100644 --- a/data/scripts/hyruleTown/script_Kid3.inc +++ b/data/scripts/hyruleTown/script_Kid3.inc @@ -10,37 +10,37 @@ script_08010314: CallWithArg GetRandomInt, 0x00000009 JumpTable script_08010340, script_0801034A, script_08010354, script_0801035E, script_08010368, script_08010372, script_0801037C, script_08010386, script_08010390 script_08010340: - _0807EE04 0x0358, 0x0078 + LookAt 0x0358, 0x0078 Jump script_08010396 script_0801034A: - _0807EE04 0x0390, 0x0078 + LookAt 0x0390, 0x0078 Jump script_08010396 script_08010354: - _0807EE04 0x03c8, 0x0078 + LookAt 0x03c8, 0x0078 Jump script_08010396 script_0801035E: - _0807EE04 0x0358, 0x0098 + LookAt 0x0358, 0x0098 Jump script_08010396 script_08010368: - _0807EE04 0x0390, 0x0098 + LookAt 0x0390, 0x0098 Jump script_08010396 script_08010372: - _0807EE04 0x03c8, 0x0098 + LookAt 0x03c8, 0x0098 Jump script_08010396 script_0801037C: - _0807EE04 0x0358, 0x00b8 + LookAt 0x0358, 0x00b8 Jump script_08010396 script_08010386: - _0807EE04 0x0390, 0x00b8 + LookAt 0x0390, 0x00b8 Jump script_08010396 script_08010390: - _0807EE04 0x03c8, 0x00b8 + LookAt 0x03c8, 0x00b8 script_08010396: EndBlock BeginBlock Call sub_080626C0 JumpIf script_08010314 - _0807EE30 + MoveTowardsTarget JumpIfNot script_08010396 Jump script_08010314 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_KidInn.inc b/data/scripts/hyruleTown/script_KidInn.inc index 1ba953ad..1fcdc2e1 100644 --- a/data/scripts/hyruleTown/script_KidInn.inc +++ b/data/scripts/hyruleTown/script_KidInn.inc @@ -11,22 +11,22 @@ script_0800D5AC: CallWithArg GetRandomInt, 0x00000004 JumpTable script_0800D5CE, script_0800D5D8, script_0800D5E2, script_0800D5EC script_0800D5CE: - _0807EE04 0x0038, 0x0098 + LookAt 0x0038, 0x0098 Jump script_0800D5F2 script_0800D5D8: - _0807EE04 0x0058, 0x0098 + LookAt 0x0058, 0x0098 Jump script_0800D5F2 script_0800D5E2: - _0807EE04 0x0038, 0x00c8 + LookAt 0x0038, 0x00c8 Jump script_0800D5F2 script_0800D5EC: - _0807EE04 0x0058, 0x00c8 + LookAt 0x0058, 0x00c8 script_0800D5F2: EndBlock BeginBlock Call sub_080626C0 JumpIf script_0800D5AC - _0807EE30 + MoveTowardsTarget JumpIfNot script_0800D5F2 Jump script_0800D5AC .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_PlayerAtCarlov.inc b/data/scripts/hyruleTown/script_PlayerAtCarlov.inc index 1b37c9d3..d93ecabd 100644 --- a/data/scripts/hyruleTown/script_PlayerAtCarlov.inc +++ b/data/scripts/hyruleTown/script_PlayerAtCarlov.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtCarlov EndBlock WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x00e0 - _0807EDD4 0x0078, 0x0068 + MoveTo 0x0078, 0x0068 DoPostScriptAction 0x0000 Wait 0x0010 SetSyncFlag 0x00000001 diff --git a/data/scripts/hyruleTown/script_PlayerAtRem.inc b/data/scripts/hyruleTown/script_PlayerAtRem.inc index 3dab6b77..c241c0ec 100644 --- a/data/scripts/hyruleTown/script_PlayerAtRem.inc +++ b/data/scripts/hyruleTown/script_PlayerAtRem.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtRem SetAnimationState 0x0006 SetEntitySpeed 0x0140 EndBlock - _0807EDD4 0x00a8, 0x0060 + MoveTo 0x00a8, 0x0060 Wait 0x0008 DoPostScriptAction 0x0000 Wait 0x0008 diff --git a/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc b/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc index bc6ae225..49a6425f 100644 --- a/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc +++ b/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerStepOnTrap SetEntitySpeed 0x0100 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x0078, 0x0080 + MoveTo 0x0078, 0x0080 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call SetPlayerActionNormal diff --git a/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc b/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc index 9e17ee23..59813b25 100644 --- a/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc +++ b/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerWhenLeavingCarlovAlreadyPaid EndBlock WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x00e0 - _0807EDD4 0x0078, 0x0078 + MoveTo 0x0078, 0x0078 DoPostScriptAction 0x0000 Wait 0x0010 SetSyncFlag 0x00000002 diff --git a/data/scripts/hyruleTown/script_Postman.inc b/data/scripts/hyruleTown/script_Postman.inc index 36f3a400..ee05632e 100644 --- a/data/scripts/hyruleTown/script_Postman.inc +++ b/data/scripts/hyruleTown/script_Postman.inc @@ -25,7 +25,7 @@ script_08010B22: CallWithArg sub_080608E4, 0x00000000 JumpIf script_08010B44 script_08010B3A: - _0807EE30 + MoveTowardsTarget JumpIfNot script_08010B22 Jump script_08010B10 script_08010B44: diff --git a/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc b/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc index d3b1b690..bebab8d5 100644 --- a/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc +++ b/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc @@ -13,26 +13,26 @@ SCRIPT_START script_SturgeonAllBooksCollected WaitUntilTextboxCloses DoPostScriptAction 0x0007 Call sub_08064D08 - _0807EDD4 0x0068, 0x0078 + MoveTo 0x0068, 0x0078 Call sub_08064D10 Wait 0x000f SetAnimationState 0x0002 Wait 0x000f Call sub_08064D08 - _0807EDD4 0x0098, 0x0078 + MoveTo 0x0098, 0x0078 Call sub_08064D10 Wait 0x000f SetAnimationState 0x0004 PlaySound SFX_PLY_LIFT Wait 0x000f SetAnimationState 0x0002 - _0807EDD4 0x00ac, 0x0078 + MoveTo 0x00ac, 0x0078 Wait 0x000f SetAnimationState 0x0004 PlaySound SFX_PLY_LIFT Wait 0x000f SetAnimationState 0x0002 - _0807EDD4 0x00c0, 0x0078 + MoveTo 0x00c0, 0x0078 Wait 0x000f SetAnimationState 0x0004 PlaySound SFX_PLY_LIFT @@ -40,13 +40,13 @@ SCRIPT_START script_SturgeonAllBooksCollected SetAnimationState 0x0006 Wait 0x001e Call sub_08064D08 - _0807EDD4 0x0068, 0x0078 + MoveTo 0x0068, 0x0078 Call sub_08064D10 Wait 0x000f SetAnimationState 0x0000 Wait 0x000f Call sub_08064D08 - _0807EDD4 0x0068, 0x0018 + MoveTo 0x0068, 0x0018 Call sub_08064D10 PlaySound SFX_STAIRS SetSyncFlag 0x00000001 diff --git a/data/scripts/hyruleTown/script_TownMinish3.inc b/data/scripts/hyruleTown/script_TownMinish3.inc index 3edddfec..51d7093e 100644 --- a/data/scripts/hyruleTown/script_TownMinish3.inc +++ b/data/scripts/hyruleTown/script_TownMinish3.inc @@ -35,12 +35,12 @@ script_0800E7BA: SetAnimationState 0x0002 CallWithArg sub_0806AF60, 0x00000004 Call sub_0806AF70 - _0807EE04 0x0188, 0x0058 + LookAt 0x0188, 0x0058 script_0800E7D8: EndBlock BeginBlock Call sub_0806AF78 - _0807EE30 + MoveTowardsTarget JumpIfNot script_0800E7D8 EntityHasHeight JumpIf script_0800E7D8 diff --git a/data/scripts/hyruleTown/script_TownMinish6.inc b/data/scripts/hyruleTown/script_TownMinish6.inc index c02ceb81..a897e7e5 100644 --- a/data/scripts/hyruleTown/script_TownMinish6.inc +++ b/data/scripts/hyruleTown/script_TownMinish6.inc @@ -21,7 +21,7 @@ script_0800EFFE: Wait 0x0004 SetAnimationState 0x0002 CallWithArg sub_0806AF60, 0x00000004 - _0807EDD4 0x0088, 0x0040 + MoveTo 0x0088, 0x0040 DoPostScriptAction 0x000a SetAnimationState 0x0002 CallWithArg sub_0806AF60, 0x00000008 @@ -34,7 +34,7 @@ script_0800EFFE: Wait 0x0004 SetAnimationState 0x0006 CallWithArg sub_0806AF60, 0x00000004 - _0807EDD4 0x0068, 0x0040 + MoveTo 0x0068, 0x0040 DoPostScriptAction 0x000a CheckLocalFlag 0x007b JumpIf script_0800F082 diff --git a/data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc b/data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc index 592035a3..c9385e0c 100644 --- a/data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc +++ b/data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc @@ -1,10 +1,10 @@ @ BigGoron Kinstone cutscene 4 SCRIPT_START script_BigGoronKinstone4 - _0807EEF4 0xfff8, 0x0000 - _0807EEF4 0x0010, 0x0000 - _0807EEF4 0xfff0, 0x0000 - _0807EEF4 0x0010, 0x0000 - _0807EEF4 0xfff8, 0x0000 + MoveToOffset 0xfff8, 0x0000 + MoveToOffset 0x0010, 0x0000 + MoveToOffset 0xfff0, 0x0000 + MoveToOffset 0x0010, 0x0000 + MoveToOffset 0xfff8, 0x0000 _0807F0C8 0x0000, 0x0000 Wait 0x001e MessageNoOverlap TEXT_GORONS, 0x00 diff --git a/data/scripts/kinstoneFusion/script_BigGoronKinstone5.inc b/data/scripts/kinstoneFusion/script_BigGoronKinstone5.inc index 4bd86b55..117294d4 100644 --- a/data/scripts/kinstoneFusion/script_BigGoronKinstone5.inc +++ b/data/scripts/kinstoneFusion/script_BigGoronKinstone5.inc @@ -1,7 +1,7 @@ @ BigGoron Kinstone Cutscene 5 SCRIPT_START script_BigGoronKinstone5 SetEntitySpeed 0x0080 - _0807EEF4 0x0000, -208 + MoveToOffset 0x0000, -208 _0807F0C8 0x0000, 0x0000 Wait 0x00b4 Call sub_08054968 diff --git a/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc b/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc index 70417b22..b47146bd 100644 --- a/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc +++ b/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc @@ -9,13 +9,13 @@ SCRIPT_START script_GormanFirstAppearance script_0800BA8E: CheckRoomFlag 0x00ff JumpIfNot script_0800BA8E - _0807EDD4 0x02f8, 0x0350 + MoveTo 0x02f8, 0x0350 Wait 0x001e DoPostScriptAction 0x0004 Wait 0x003c SetAnimationState 0x0006 Wait 0x001e - _0807EDD4 0x02f0, 0x0350 + MoveTo 0x02f0, 0x0350 Wait 0x001e MessageNoOverlap TEXT_KINSTONE, 0x00 WaitUntilTextboxCloses diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc index 87ce4e77..b6b03859 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc @@ -34,5 +34,5 @@ script_0800BD1C: SetAnimationState 0x0002 WaitForSyncFlagAndClear 0x00000004 SetEntitySpeed 0x0080 - _0807EEF4 0x0000, -32 + MoveToOffset 0x0000, -32 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc index 226eb90c..282e9164 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc @@ -16,7 +16,7 @@ SCRIPT_START script_Goron2Kinstone2 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 - _0807EDD4 0x0088, 0x0228 + MoveTo 0x0088, 0x0228 Wait 0x000f SetSyncFlag 0x00000004 DoPostScriptAction 0x000f @@ -31,6 +31,6 @@ SCRIPT_START script_Goron2Kinstone2 SetAnimationState 0x0006 SetSyncFlag 0x00000004 SetEntitySpeed 0x0080 - _0807EEF4 0x0000, -32 + MoveToOffset 0x0000, -32 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc index b65e77f2..11b910ec 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc @@ -36,5 +36,5 @@ script_0800BFA8: Wait 0x003c Call sub_08054F64 SetEntitySpeed 0x0080 - _0807EEF4 0x0000, -32 + MoveToOffset 0x0000, -32 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc index 62165e7f..fc5550a9 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc @@ -36,5 +36,5 @@ script_0800C248: Wait 0x003c Call sub_08054F64 SetEntitySpeed 0x0080 - _0807EEF4 0x0000, -32 + MoveToOffset 0x0000, -32 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc b/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc index 14f1657f..45505c7d 100644 --- a/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc +++ b/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc @@ -16,7 +16,7 @@ SCRIPT_START script_Goron3Kinstone3 SetSyncFlag 0x0000000c WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 - _0807EDD4 0x0088, 0x0178 + MoveTo 0x0088, 0x0178 Wait 0x000f SetSyncFlag 0x0000000c DoPostScriptAction 0x000f diff --git a/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc b/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc index 3a632fca..da2cc67c 100644 --- a/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc +++ b/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc @@ -16,9 +16,9 @@ SCRIPT_START script_Goron4Kinstone4 SetSyncFlag 0x0000001c WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 - _0807EDD4 0x0088, 0x0188 - _0807EDD4 0x00a8, 0x0188 - _0807EDD4 0x00a8, 0x0178 + MoveTo 0x0088, 0x0188 + MoveTo 0x00a8, 0x0188 + MoveTo 0x00a8, 0x0178 Wait 0x000f SetSyncFlag 0x0000001c DoPostScriptAction 0x000f @@ -32,6 +32,6 @@ SCRIPT_START script_Goron4Kinstone4 Wait 0x003c SetSyncFlag 0x0000001c SetEntitySpeed 0x0080 - _0807EEF4 0x0000, -32 + MoveToOffset 0x0000, -32 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc b/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc index 78e04c52..2f051b60 100644 --- a/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc +++ b/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc @@ -16,9 +16,9 @@ SCRIPT_START script_Goron5Kinstone5 SetSyncFlag 0x0000003c WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 - _0807EDD4 0x0098, 0x00e8 - _0807EDD4 0x00a8, 0x00e8 - _0807EDD4 0x00a8, 0x00d8 + MoveTo 0x0098, 0x00e8 + MoveTo 0x00a8, 0x00e8 + MoveTo 0x00a8, 0x00d8 Wait 0x000f SetSyncFlag 0x0000003c DoPostScriptAction 0x000f diff --git a/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc b/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc index 4eaed958..900cc470 100644 --- a/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc +++ b/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc @@ -16,9 +16,9 @@ SCRIPT_START script_Goron6Kindstone6 SetSyncFlag 0x0000007c WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 - _0807EDD4 0x0098, 0x00e8 - _0807EDD4 0x00c8, 0x00e8 - _0807EDD4 0x00c8, 0x00d8 + MoveTo 0x0098, 0x00e8 + MoveTo 0x00c8, 0x00e8 + MoveTo 0x00c8, 0x00d8 Wait 0x000f SetSyncFlag 0x0000007c DoPostScriptAction 0x000f @@ -32,6 +32,6 @@ SCRIPT_START script_Goron6Kindstone6 Wait 0x003c SetSyncFlag 0x0000007c SetEntitySpeed 0x0080 - _0807EEF4 0x0000, -32 + MoveToOffset 0x0000, -32 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc b/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc index b5385222..bc8b2b0f 100644 --- a/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc +++ b/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc @@ -9,11 +9,11 @@ SCRIPT_START script_GoronMerchantArriving script_0800BB7A: CheckRoomFlag 0x00ff JumpIfNot script_0800BB7A - _0807EDD4 0x03a0, 0x00f8 + MoveTo 0x03a0, 0x00f8 Wait 0x001e MessageNoOverlap TEXT_KINSTONE, 0x06 WaitUntilTextboxCloses Wait 0x000f - _0807EDD4 0x0380, 0x00f8 + MoveTo 0x0380, 0x00f8 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSpark.inc b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSpark.inc index 944bc020..070a8685 100644 --- a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSpark.inc +++ b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSpark.inc @@ -9,7 +9,7 @@ SCRIPT_START script_KinstoneSparkKinstoneSpark DoPostScriptAction 0x0007 PlaySound SFX_136 script_0800C47A: - _0807EE30 + MoveTowardsTarget JumpIfNot script_0800C47A Wait 0x003c SetRoomFlag 0x00ff diff --git a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkFromBottom.inc b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkFromBottom.inc index cd7f7c5e..2bf2003a 100644 --- a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkFromBottom.inc +++ b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkFromBottom.inc @@ -7,9 +7,9 @@ SCRIPT_START script_KinstoneSparkKinstoneSparkFromBottom Wait 0x000a DoPostScriptAction 0x0007 PlaySound SFX_136 - _0807EEF4 0x0000, -112 + MoveToOffset 0x0000, -112 Wait 0x001e - _0807EEF4 0x0000, -80 + MoveToOffset 0x0000, -80 Wait 0x003c SetRoomFlag 0x00ff SetAnimation 0x0005 diff --git a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoron.inc b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoron.inc index 21d715b9..0cab3d53 100644 --- a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoron.inc +++ b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoron.inc @@ -10,9 +10,9 @@ SCRIPT_START script_KinstoneSparkKinstoneSparkGoron Wait 0x000a DoPostScriptAction 0x0007 PlaySound SFX_136 - _0807EEF4 0x0000, 0x0060 + MoveToOffset 0x0000, 0x0060 Wait 0x003c - _0807EEF4 0x0000, 0x0060 + MoveToOffset 0x0000, 0x0060 Wait 0x001e SetRoomFlag 0x00ff SetAnimation 0x0005 diff --git a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoronMerchang.inc b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoronMerchang.inc index 3a9aada3..442079e0 100644 --- a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoronMerchang.inc +++ b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoronMerchang.inc @@ -8,9 +8,9 @@ SCRIPT_START script_KinstoneSparkKinstoneSparkGoronMerchang Wait 0x000a DoPostScriptAction 0x0007 PlaySound SFX_136 - _0807EEF4 0x00c0, 0x0000 + MoveToOffset 0x00c0, 0x0000 Wait 0x001e - _0807EEF4 0x0070, 0x0000 + MoveToOffset 0x0070, 0x0000 Wait 0x003c SetRoomFlag 0x00ff SetAnimation 0x0005 diff --git a/data/scripts/lakeHylia/script_ShopwellsDog.inc b/data/scripts/lakeHylia/script_ShopwellsDog.inc index eaa7c31e..9a165e75 100644 --- a/data/scripts/lakeHylia/script_ShopwellsDog.inc +++ b/data/scripts/lakeHylia/script_ShopwellsDog.inc @@ -6,7 +6,7 @@ SCRIPT_START script_ShopwellsDog EndBlock Wait 0x001e PlaySound SFX_VO_DOG - _0807EDD4 0x008a, 0x005a + MoveTo 0x008a, 0x005a Wait 0x000a Call sub_08069EE8 SCRIPT_END diff --git a/data/scripts/lonLonRanch/script_MalonLostKey.inc b/data/scripts/lonLonRanch/script_MalonLostKey.inc index 951b43ae..6646d6c0 100644 --- a/data/scripts/lonLonRanch/script_MalonLostKey.inc +++ b/data/scripts/lonLonRanch/script_MalonLostKey.inc @@ -26,12 +26,12 @@ script_0800B4D4: script_0800B4F0: EndBlock ClearSyncFlag 0x00000008 - _0807EDD4 0x0134, 0x0288 + MoveTo 0x0134, 0x0288 SetAnimationState 0x0004 WaitForSyncFlagAndClear 0x00000008 MessageFromTarget TEXT_LON_LON, 0x16 WaitUntilTextboxCloses - _0807EDD4 0x0158, 0x0288 + MoveTo 0x0158, 0x0288 DoPostScriptAction 0x0000 SetAnimationState 0x0000 Wait 0x000a diff --git a/data/scripts/lonLonRanch/script_PlayerGiveKey.inc b/data/scripts/lonLonRanch/script_PlayerGiveKey.inc index 5ca5f8f0..ba2c47e0 100644 --- a/data/scripts/lonLonRanch/script_PlayerGiveKey.inc +++ b/data/scripts/lonLonRanch/script_PlayerGiveKey.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerGiveKey BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0128, 0x0298 + MoveTo 0x0128, 0x0298 Wait 0x000a SetAnimationState 0x0002 DoPostScriptAction 0x0000 diff --git a/data/scripts/lonLonRanch/script_TalonGotKey.inc b/data/scripts/lonLonRanch/script_TalonGotKey.inc index 7cb713e4..2d95cd9b 100644 --- a/data/scripts/lonLonRanch/script_TalonGotKey.inc +++ b/data/scripts/lonLonRanch/script_TalonGotKey.inc @@ -11,7 +11,7 @@ SCRIPT_START script_TalonGotKey DoPostScriptAction 0x0004 SetSyncFlag 0x00000008 StartPlayerScript script_PlayerGiveKey - _0807EDD4 0x0140, 0x0298 + MoveTo 0x0140, 0x0298 FacePlayer WaitForSyncFlagAndClear 0x00000004 FacePlayer @@ -23,12 +23,12 @@ SCRIPT_START script_TalonGotKey MessageFromTarget TEXT_LON_LON, 0x0c WaitUntilTextboxCloses Wait 0x0014 - _0807EDD4 0x0158, 0x0290 + MoveTo 0x0158, 0x0290 Wait 0x000a - _0807EDD4 0x0158, 0x0288 + MoveTo 0x0158, 0x0288 Wait 0x0014 SetSyncFlag 0x00000010 - _0807EDD4 0x0158, 0x0280 + MoveTo 0x0158, 0x0280 Wait 0x000a DoPostScriptAction 0x0008 SetSyncFlag 0x00000010 diff --git a/data/scripts/lonLonRanch/script_TalonLostKey.inc b/data/scripts/lonLonRanch/script_TalonLostKey.inc index 0a5463c6..9500c940 100644 --- a/data/scripts/lonLonRanch/script_TalonLostKey.inc +++ b/data/scripts/lonLonRanch/script_TalonLostKey.inc @@ -9,14 +9,14 @@ SCRIPT_START script_TalonLostKey SetIntVariable 0x0000200a EndBlock script_0800B3C4: - _0807EDD4 0x0158, 0x0290 + MoveTo 0x0158, 0x0290 Call sub_08065780 Call sub_08065780 Call sub_08065780 Call sub_08065780 Call sub_08065780 Call sub_08065780 - _0807EDD4 0x0128, 0x0290 + MoveTo 0x0128, 0x0290 Call sub_08065780 Call sub_08065780 Call sub_08065780 diff --git a/data/scripts/minishWoods/script_Gentari.inc b/data/scripts/minishWoods/script_Gentari.inc index 0a534bc4..50205186 100644 --- a/data/scripts/minishWoods/script_Gentari.inc +++ b/data/scripts/minishWoods/script_Gentari.inc @@ -57,7 +57,7 @@ script_0800C824: MessageFromTarget TEXT_FINDING_EZLO, 0x35 WaitUntilTextboxCloses SetEntitySpeed 0x0040 - _0807EDD4 0x0038, 0x0044 + MoveTo 0x0038, 0x0044 DoPostScriptAction 0x0000 Wait 0x000f SetLocalFlag 0x0083 diff --git a/data/scripts/minishWoods/script_PlayerAtBombMinish.inc b/data/scripts/minishWoods/script_PlayerAtBombMinish.inc index 89e06331..5c7e43fe 100644 --- a/data/scripts/minishWoods/script_PlayerAtBombMinish.inc +++ b/data/scripts/minishWoods/script_PlayerAtBombMinish.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtBombMinish SetEntitySpeed 0x0100 EndBlock WalkSouth 0x0010 - _0807EDD4 0x0078, 0x0060 + MoveTo 0x0078, 0x0060 SetAnimationState 0x0000 Wait 0x000f DoPostScriptAction 0x0000 diff --git a/data/scripts/minishWoods/script_PlayerAtFestari.inc b/data/scripts/minishWoods/script_PlayerAtFestari.inc index ac2f94c3..45220e22 100644 --- a/data/scripts/minishWoods/script_PlayerAtFestari.inc +++ b/data/scripts/minishWoods/script_PlayerAtFestari.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtFestari BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x00e8, 0x0068 + MoveTo 0x00e8, 0x0068 SetAnimationState 0x0000 Wait 0x000f DoPostScriptAction 0x0000 diff --git a/data/scripts/minishWoods/script_PlayerAtGentari.inc b/data/scripts/minishWoods/script_PlayerAtGentari.inc index 0804180c..16d1aca2 100644 --- a/data/scripts/minishWoods/script_PlayerAtGentari.inc +++ b/data/scripts/minishWoods/script_PlayerAtGentari.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtGentari SetEntitySpeed 0x0100 EndBlock WalkSouth 0x0010 - _0807EDD4 0x0078, 0x0058 + MoveTo 0x0078, 0x0058 SetAnimationState 0x0000 Wait 0x000f DoPostScriptAction 0x0000 diff --git a/data/scripts/mtCrenel/script_MountainMinish4.inc b/data/scripts/mtCrenel/script_MountainMinish4.inc index 1716194d..04340d41 100644 --- a/data/scripts/mtCrenel/script_MountainMinish4.inc +++ b/data/scripts/mtCrenel/script_MountainMinish4.inc @@ -30,7 +30,7 @@ script_0800D372: script_0800D3B2: SetAnimationState 0x0002 SetAnimation 0x0005 - _0807EDD4 0x00a0, 0x0130 + MoveTo 0x00a0, 0x0130 SetAnimationState 0x0006 SetAnimation 0x0003 SetIntVariable 0x00000004 diff --git a/data/scripts/mtCrenel/script_MountainMinish5.inc b/data/scripts/mtCrenel/script_MountainMinish5.inc index 2d54f64e..c1d44127 100644 --- a/data/scripts/mtCrenel/script_MountainMinish5.inc +++ b/data/scripts/mtCrenel/script_MountainMinish5.inc @@ -21,7 +21,7 @@ script_0800D426: SetAnimationState 0x0006 SetIntVariable 0x00000004 Call sub_0806AF60 - _0807EDD4 0x00a8, 0x01e8 + MoveTo 0x00a8, 0x01e8 SetAnimationState 0x0006 SetIntVariable 0x00000000 Call sub_0806AF60 @@ -37,7 +37,7 @@ script_0800D426: SetAnimationState 0x0002 SetIntVariable 0x00000004 Call sub_0806AF60 - _0807EDD4 0x0228, 0x01e8 + MoveTo 0x0228, 0x01e8 Jump script_0800D426 .2byte 0x0000 BeginBlock @@ -52,31 +52,31 @@ script_0800D4E4: CallWithArg GetRandomInt, 0x00000009 JumpTable script_0800D510, script_0800D51A, script_0800D524, script_0800D52E, script_0800D538, script_0800D542, script_0800D54C, script_0800D556, script_0800D560 script_0800D510: - _0807EE04 0x0038, 0x0068 + LookAt 0x0038, 0x0068 Jump script_0800D566 script_0800D51A: - _0807EE04 0x0078, 0x0068 + LookAt 0x0078, 0x0068 Jump script_0800D566 script_0800D524: - _0807EE04 0x00b8, 0x0068 + LookAt 0x00b8, 0x0068 Jump script_0800D566 script_0800D52E: - _0807EE04 0x0038, 0x0090 + LookAt 0x0038, 0x0090 Jump script_0800D566 script_0800D538: - _0807EE04 0x0078, 0x0090 + LookAt 0x0078, 0x0090 Jump script_0800D566 script_0800D542: - _0807EE04 0x00b8, 0x0090 + LookAt 0x00b8, 0x0090 Jump script_0800D566 script_0800D54C: - _0807EE04 0x0038, 0x00b8 + LookAt 0x0038, 0x00b8 Jump script_0800D566 script_0800D556: - _0807EE04 0x0078, 0x00b8 + LookAt 0x0078, 0x00b8 Jump script_0800D566 script_0800D560: - _0807EE04 0x00b8, 0x00b8 + LookAt 0x00b8, 0x00b8 script_0800D566: EndBlock BeginBlock @@ -84,7 +84,7 @@ script_0800D566: JumpIf script_0800D4E4 CheckEntityInteractType JumpIf script_0800D584 - _0807EE30 + MoveTowardsTarget JumpIfNot script_0800D566 Jump script_0800D4E4 script_0800D584: diff --git a/data/scripts/mtCrenel/script_PlayerAtMelari.inc b/data/scripts/mtCrenel/script_PlayerAtMelari.inc index b4560caa..3241a3ee 100644 --- a/data/scripts/mtCrenel/script_PlayerAtMelari.inc +++ b/data/scripts/mtCrenel/script_PlayerAtMelari.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtMelari BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0170, 0x0140 + MoveTo 0x0170, 0x0140 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000008 diff --git a/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc b/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc index fad1fc4f..aaca4421 100644 --- a/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc +++ b/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc @@ -3,8 +3,8 @@ SCRIPT_START script_PlayerPlaceBrokenSword BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0170, 0x0120 - _0807EDD4 0x01a8, 0x0120 + MoveTo 0x0170, 0x0120 + MoveTo 0x01a8, 0x0120 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000008 diff --git a/data/scripts/northHyruleField/script_CutsceneOrchestratorFixBridge.inc b/data/scripts/northHyruleField/script_CutsceneOrchestratorFixBridge.inc index 4d285787..3fc1ff44 100644 --- a/data/scripts/northHyruleField/script_CutsceneOrchestratorFixBridge.inc +++ b/data/scripts/northHyruleField/script_CutsceneOrchestratorFixBridge.inc @@ -11,11 +11,11 @@ SCRIPT_START script_CutsceneOrchestratorFixBridge _0807E8E4_2 Call CreatePlayerExclamationMark Wait 0x001e - _0807EDD4 0x00b8, 0x0258 + MoveTo 0x00b8, 0x0258 Wait 0x001e SetRoomFlag 0x0065 Wait 0x0078 - _0807EEB4 + MoveToPlayer CameraTargetPlayer EnablePlayerControl DoPostScriptAction 0x0006 diff --git a/data/scripts/npc/script_08012C48.inc b/data/scripts/npc/script_08012C48.inc index 18ba3fce..9b299444 100644 --- a/data/scripts/npc/script_08012C48.inc +++ b/data/scripts/npc/script_08012C48.inc @@ -4,7 +4,7 @@ SCRIPT_START script_08012C48 DoPostScriptAction 0x0007 SetEntitySpeed 0x0280 EndBlock - _0807EDD4 0x0388, 0x0168 + MoveTo 0x0388, 0x0168 SetSyncFlag 0x00000100 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/npc/script_ForestMinish17.inc b/data/scripts/npc/script_ForestMinish17.inc index 376c28db..fb76c3a1 100644 --- a/data/scripts/npc/script_ForestMinish17.inc +++ b/data/scripts/npc/script_ForestMinish17.inc @@ -2,16 +2,16 @@ SCRIPT_START script_ForestMinish17 SetEntitySpeed 0x0100 script_080166BC: - _0807EDD4 0x0055, 0x0039 + MoveTo 0x0055, 0x0039 Wait 0x0008 - _0807EDD4 0x0075, 0x0076 + MoveTo 0x0075, 0x0076 Wait 0x0008 - _0807EDD4 0x0105, 0x006c + MoveTo 0x0105, 0x006c Wait 0x0008 - _0807EDD4 0x018e, 0x007a + MoveTo 0x018e, 0x007a Wait 0x0008 - _0807EDD4 0x0173, 0x0023 + MoveTo 0x0173, 0x0023 Wait 0x0008 - _0807EDD4 0x00d8, 0x003f + MoveTo 0x00d8, 0x003f Wait 0x0008 Jump script_080166BC diff --git a/data/scripts/npc/script_PlayerAtBladeBrothers.inc b/data/scripts/npc/script_PlayerAtBladeBrothers.inc index 319170e6..d67a60e8 100644 --- a/data/scripts/npc/script_PlayerAtBladeBrothers.inc +++ b/data/scripts/npc/script_PlayerAtBladeBrothers.inc @@ -1,7 +1,7 @@ @ Player at Blade Brothers SCRIPT_START script_PlayerAtBladeBrothers SetEntitySpeed 0x0100 - _0807EDD4 0x0078, 0x0050 + MoveTo 0x0078, 0x0050 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/sanctuary/script_CutsceneMiscObjectEarthElementFloating.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectEarthElementFloating.inc index 29d74646..0a40c1bb 100644 --- a/data/scripts/sanctuary/script_CutsceneMiscObjectEarthElementFloating.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectEarthElementFloating.inc @@ -5,7 +5,7 @@ SCRIPT_START script_CutsceneMiscObjectEarthElementFloating SetAnimation 0x0000 EndBlock SetEntitySpeed 0x0080 - _0807EDD4 0x00b0, 0x00f8 + MoveTo 0x00b0, 0x00f8 SetAnimation 0x0001 SetSyncFlag 0x08000000 SCRIPT_END diff --git a/data/scripts/sanctuary/script_CutsceneMiscObjectFireElementFloating.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectFireElementFloating.inc index b45d6891..1e476e77 100644 --- a/data/scripts/sanctuary/script_CutsceneMiscObjectFireElementFloating.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectFireElementFloating.inc @@ -5,7 +5,7 @@ SCRIPT_START script_CutsceneMiscObjectFireElementFloating SetAnimation 0x0002 EndBlock SetEntitySpeed 0x0080 - _0807EDD4 0x0120, 0x00f8 + MoveTo 0x0120, 0x00f8 SetAnimation 0x0003 SetSyncFlag 0x10000000 SCRIPT_END diff --git a/data/scripts/sanctuary/script_CutsceneMiscObjectWaterElementFloating.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectWaterElementFloating.inc index 6d52dba8..57afa54a 100644 --- a/data/scripts/sanctuary/script_CutsceneMiscObjectWaterElementFloating.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectWaterElementFloating.inc @@ -5,7 +5,7 @@ SCRIPT_START script_CutsceneMiscObjectWaterElementFloating SetAnimation 0x0004 EndBlock SetEntitySpeed 0x0080 - _0807EDD4 0x0120, 0x0168 + MoveTo 0x0120, 0x0168 SetAnimation 0x0005 SetSyncFlag 0x20000000 SCRIPT_END diff --git a/data/scripts/sanctuary/script_CutsceneMiscObjectWindElementFloating.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectWindElementFloating.inc index c764dc05..16dc2fdd 100644 --- a/data/scripts/sanctuary/script_CutsceneMiscObjectWindElementFloating.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectWindElementFloating.inc @@ -5,7 +5,7 @@ SCRIPT_START script_CutsceneMiscObjectWindElementFloating SetAnimation 0x0006 EndBlock SetEntitySpeed 0x0080 - _0807EDD4 0x00b0, 0x0168 + MoveTo 0x00b0, 0x0168 SetAnimation 0x0007 SetSyncFlag 0x40000000 SCRIPT_END diff --git a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc index ffb033f9..3e99529d 100644 --- a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc +++ b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc @@ -85,9 +85,9 @@ script_080138D0: .endif Call NPC4E_SaveEquippedItems CallWithArg EquipItem, 0x00010001 - CallWithArg SetPlayerMacro, gUnk_080049FE + CallWithArg SetPlayerMacro, gPlayerMacroSanctuary Wait 0x00c8 - CallWithArg SetPlayerMacro, 0x00000000 + CallWithArg SetPlayerMacro, 0 Call NPC4E_RestoreEquippedItems script_08013A8E: .ifndef EU diff --git a/data/scripts/sanctuary/script_PlayerAtPedestal.inc b/data/scripts/sanctuary/script_PlayerAtPedestal.inc index 6f85106d..866d3499 100644 --- a/data/scripts/sanctuary/script_PlayerAtPedestal.inc +++ b/data/scripts/sanctuary/script_PlayerAtPedestal.inc @@ -10,7 +10,7 @@ script_080136F0: script_080136FA: CallWithArg sub_0807F4F8, 0x00000124 script_08013704: - _0807EDD4 0x00e8, 0x0124 + MoveTo 0x00e8, 0x0124 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc b/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc index 69391d04..7a437e50 100644 --- a/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc +++ b/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtSanctuaryEntrance BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0088, 0x0068 + MoveTo 0x0088, 0x0068 SetAnimationState 0x0000 DoPostScriptAction 0x0000 Wait 0x001e diff --git a/data/scripts/sanctuary/script_PlayerGetElement.inc b/data/scripts/sanctuary/script_PlayerGetElement.inc index c73af53c..bfe5d187 100644 --- a/data/scripts/sanctuary/script_PlayerGetElement.inc +++ b/data/scripts/sanctuary/script_PlayerGetElement.inc @@ -9,7 +9,7 @@ SCRIPT_START script_PlayerGetElement PlayBgm BGM_ELEMENT_THEME Call sub_080A0464 script_0800A0D2: - _0807EE30 + MoveTowardsTarget JumpIfNot script_0800A0D2 _0807E8E4_0 Wait 0x0008 diff --git a/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc b/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc index 516cef54..e587d4b1 100644 --- a/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc +++ b/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerTextBoardAppears BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x00e8, 0x00a8 + MoveTo 0x00e8, 0x00a8 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 diff --git a/data/scripts/unused/script_08016482.inc b/data/scripts/unused/script_08016482.inc index 7ffcc08a..e315c61a 100644 --- a/data/scripts/unused/script_08016482.inc +++ b/data/scripts/unused/script_08016482.inc @@ -54,11 +54,11 @@ SCRIPT_START script_08016482 WalkSouth 0x0040 WalkWest 0x0050 _0807ED24 0x0000, 0x0000, 0x0000 - _0807EDD4 0x0000, 0x0000 - _0807EE04 0x0000, 0x0000 - _0807EE30 - _0807EEB4 - _0807EEF4 0xfff0, 0x0014 + MoveTo 0x0000, 0x0000 + LookAt 0x0000, 0x0000 + MoveTowardsTarget + MoveToPlayer + MoveToOffset 0xfff0, 0x0014 DoPostScriptAction 0x0000 DoPostScriptAction2 0x0001 PlaySound SFX_METAL_CLINK diff --git a/data/scripts/veilFalls/script_BigGoronHiding.inc b/data/scripts/veilFalls/script_BigGoronHiding.inc index 237d4470..b2e5063d 100644 --- a/data/scripts/veilFalls/script_BigGoronHiding.inc +++ b/data/scripts/veilFalls/script_BigGoronHiding.inc @@ -5,7 +5,7 @@ SCRIPT_START script_BigGoronHiding SetEntitySpeed 0x0010 EndBlock script_0800932E: - _0807EEF4 -8, 0x0000 - _0807EEF4 0x0008, 0x0000 + MoveToOffset -8, 0x0000 + MoveToOffset 0x0008, 0x0000 Jump script_0800932E SCRIPT_END diff --git a/data/scripts/veilFalls/script_CutsceneMiscObjectMirrorShield.inc b/data/scripts/veilFalls/script_CutsceneMiscObjectMirrorShield.inc index bc49bebb..28aa819c 100644 --- a/data/scripts/veilFalls/script_CutsceneMiscObjectMirrorShield.inc +++ b/data/scripts/veilFalls/script_CutsceneMiscObjectMirrorShield.inc @@ -8,7 +8,7 @@ SCRIPT_START script_CutsceneMiscObjectMirrorShield SetEntityVelocity 0x00018000 Call sub_0806D858 script_080094EA: - _0807EE30 + MoveTowardsTarget JumpIfNot script_080094EA Wait 0x001e DoPostScriptAction 0x0006 diff --git a/data/scripts/veilFalls/script_CutsceneMiscObjectVeilFallsTop.inc b/data/scripts/veilFalls/script_CutsceneMiscObjectVeilFallsTop.inc index 051cfe84..6809a172 100644 --- a/data/scripts/veilFalls/script_CutsceneMiscObjectVeilFallsTop.inc +++ b/data/scripts/veilFalls/script_CutsceneMiscObjectVeilFallsTop.inc @@ -7,7 +7,7 @@ SCRIPT_START script_CutsceneMiscObjectVeilFallsTop Wait 0x003c SetEntityVelocity 0x00018000 script_080094BC: - _0807EE30 + MoveTowardsTarget JumpIfNot script_080094BC Wait 0x003c DoPostScriptAction 0x0006 diff --git a/data/scripts/windRuins/script_PlayerAtTextboard.inc b/data/scripts/windRuins/script_PlayerAtTextboard.inc index c85f6145..739d42e9 100644 --- a/data/scripts/windRuins/script_PlayerAtTextboard.inc +++ b/data/scripts/windRuins/script_PlayerAtTextboard.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtTextboard SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x00a0, 0x0078 + MoveTo 0x00a0, 0x0078 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/include/area.h b/include/area.h index a21ee5b0..0bfbf919 100644 --- a/include/area.h +++ b/include/area.h @@ -2,6 +2,7 @@ #define AREA_H #include "global.h" +#include "map.h" #include "transitions.h" #define MAX_ROOMS 64 @@ -21,9 +22,9 @@ typedef struct { u16 pixel_height; u16 map_x; u16 map_y; - void* tileset; - void* map; - void* metatiles; + MapDataDefinition* tileSet; + MapDataDefinition* map; + MapDataDefinition* tiles; void* bg_anim; const Transition* exits; void** properties; @@ -81,7 +82,7 @@ typedef struct { u16 map_y; u16 pixel_width; u16 pixel_height; - u16 tileset_id; + u16 tileSet_id; } FORCE_WORD_ALIGNED RoomHeader; static_assert(sizeof(RoomHeader) == 0xa); extern RoomHeader* gAreaRoomHeaders[]; @@ -90,9 +91,20 @@ typedef struct { u8 flags; u8 location; u8 flag_bank; - u8 _3; + u8 queueBgm; } AreaHeader; -extern AreaHeader gAreaMetadata[]; +extern const AreaHeader gAreaMetadata[]; + +typedef enum { + AR_IS_OVERWORLD = 0x1, + AR_HAS_KEYS = 0x2, + AR_IS_DUNGEON = 0x4, /**< Causes the area to have a red name. */ + AR_HAS_MAP = 0x8, + AR_HAS_ENEMIES = 0x10, + AR_IS_MOLE_CAVE = 0x20, + AR_HAS_NO_ENEMIES = 0x40, + AR_ALLOWS_WARP = 0x80, /**< Not used in EU. Allows to warp in areas that do not have AR_OVERWORLD set. */ +} AreaFlags; typedef enum { AREA_MINISH_WOODS, diff --git a/include/asm.h b/include/asm.h index d42458ee..c73f1c8d 100644 --- a/include/asm.h +++ b/include/asm.h @@ -6,14 +6,12 @@ extern u32 Random(void); extern u32 GetRandomByWeight(const u8*); extern void CloneTile(u32, u32, u32); -extern u32 GetTileTypeByEntity(struct Entity_*); -extern u32 GetTileTypeByPos(s32 x, s32 y, u32 layer); -extern u32 GetTileType(u32 position, u32 layer); -extern void SetBottomTile(u32 index, u32 position, u32 layer); + +extern void SetTile(u32 tileIndex, u32 tilePos, u32 layer); + extern void UpdateScrollVram(void); -extern u32 sub_080B1B0C(struct Entity_*); extern u32 sub_080B1BA4(u32, u32, u32); -extern void LoadResourceAsync(const void*, u32, u32); +extern void LoadResourceAsync(const void* src, u32 dest, u32 size); extern void GenericConfused(struct Entity_*); extern void sub_08001290(struct Entity_*, u32); extern void GenericKnockback(struct Entity_*); @@ -39,23 +37,72 @@ extern void ResetCollisionLayer(struct Entity_*); extern void sub_08004596(struct Entity_*, u32); extern u32 sub_080045B4(struct Entity_*, u32, u32); extern u32 CalculateDirectionTo(u32, u32, u32, u32); -extern u32 CalcOffsetAngle(s32, s32); +extern u32 CalculateDirectionFromOffsets(s32, s32); extern u32 sub_080086B4(u32, u32, const u8*); extern u32 ResolveCollisionLayer(struct Entity_*); extern void sub_0800417E(struct Entity_*, u32); extern u32 sub_0800442E(struct Entity_*); -extern u32 ActTileToTile(u32, const u16*); extern void SoundReqClipped(struct Entity_*, u32); extern u32 sub_0800132C(struct Entity_*, struct Entity_*); -extern u32 sub_080B1B44(u32, u32); -extern u32 sub_080B1A48(u32, u32, u32); -extern u32 sub_080B1B18(s32, s32, u32); -extern u32 sub_080B1AE0(u16, u8); -extern u32 GetActTile(struct Entity_*); + extern u32 sub_0800445C(struct Entity_*); -extern u32 sub_080B1AF0(struct Entity_*, s32, s32); -extern u32 GetActTileRelative(struct Entity_*, u32, u32); -extern bool32 sub_080B1B54(u32); extern u32 CheckRectOnScreen(s32, s32, u32, u32); +extern u32 GetTileTypeRelativeToEntity(struct Entity_* entity, s32 xOffset, s32 yOffset); +extern u32 GetTileTypeAtEntity(struct Entity_* entity); +extern u32 GetTileTypeAtWorldCoords(s32 worldX, s32 worldY, u32 layer); +extern u32 GetTileTypeAtRoomCoords(u32 roomX, u32 roomY, u32 layer); +extern u32 GetTileTypeAtTilePos(u32 tilePos, u32 layer); + +extern u32 GetActTileRelativeToEntity(struct Entity_* entity, s32 xOffset, s32 yOffset); +extern u32 GetActTileAtEntity(struct Entity_* entity); +extern u32 GetActTileAtWorldCoords(u32 worldX, u32 worldY, u32 layer); +extern u32 GetActTileAtRoomCoords(u32 roomX, u32 roomY, u32 layer); +extern u32 GetActTileAtRoomTile(u32 roomTileX, u32 roomTileY, u32 layer); +extern u32 GetActTileAtTilePos(u16 tilePos, u8 layer); + +/** + * Sets actTile for a tilePos. + */ +extern void SetActTileAtTilePos(u32 actTile, u32 tilePos, u32 layer); + +// Get CollisionData for entity (relative to entity?) +extern u32 GetCollisionDataRelativeTo(struct Entity_* entity, s32 xOffset, s32 yOffset); + +extern u32 GetCollisionDataAtEntity(struct Entity_* entity); +/** + * Returns the collision data for one tile. (x, y in pixels relative to the world) + */ +extern u32 GetCollisionDataAtWorldCoords(u32 worldX, u32 worldY, u32 layer); +/** + * Returns the collision data for one tile. (x, y in pixels relative to the room) + */ +extern u32 GetCollisionDataAtRoomCoords(u32 roomX, u32 roomY, u32 layer); +/** + * Returns the collision data for one tile. (x, y in tiles relative to the room) + */ +extern u32 GetCollisionDataAtRoomTile(u32 roomTileX, u32 roomTileY, u32 layer); +/** + * Returns the collision data for one tile. + */ +extern u32 GetCollisionDataAtTilePos(u32 tilePos, u32 layer); + +/** + * Sets the collision data for one tile. + */ +extern void SetCollisionData(u32 collisionData, u32 tilePos, u32 layer); + +extern u32 GetActTileForTileType(u32 tileType); + +typedef struct { + u16 key; + u16 value; +} KeyValuePair ALIGNED(2); + +/** + * Searches for a KeyValuePair with the key in the keyValuePairList and returns its value. + * Returns 0 if the key is not found. + */ +extern u32 FindValueForKey(u32 key, const KeyValuePair* keyValuePairList); + #endif // ASM_H diff --git a/include/backgroundAnimations.h b/include/backgroundAnimations.h index 104044ed..4c3ad5c8 100644 --- a/include/backgroundAnimations.h +++ b/include/backgroundAnimations.h @@ -3,7 +3,7 @@ #include "global.h" -enum { +typedef enum { BG_ANIM_DEFAULT = 0, BG_ANIM_PALETTE = 16, BG_ANIM_MULTIPLE = 128, diff --git a/include/beanstalkSubtask.h b/include/beanstalkSubtask.h index 3f7d452c..f7bebbaf 100644 --- a/include/beanstalkSubtask.h +++ b/include/beanstalkSubtask.h @@ -2,26 +2,30 @@ #define BEANSTALKSUBTASK_H #include "global.h" +#include "map.h" /* tiles 0x4000 and above create an entry here - */ -#define MAX_0200B240 0x100 +*/ +#define MAX_SPECIAL_TILES 0x100 typedef struct { - u16 position; // (layer << 0xc) | position - u16 data; -} struct_0200B240; -extern struct_0200B240 gUnk_0200B240[MAX_0200B240]; + u16 tilePosAndLayer; // (layer << 12) | position + u16 tileIndex; +} SpecialTileEntry; +extern SpecialTileEntry gTilesForSpecialTiles[MAX_SPECIAL_TILES]; typedef struct { u16 collision; u16 tileIndex; } struct_080B44D0; -typedef struct { - u32 src; - void* dest; - u32 size; -} struct_08109194; +void LoadMapData(MapDataDefinition* dataDefinition); + +/** + * Renders a tileMap with 16x16 tiles into a subTileMap with 8x8 tiles. + * + * Takes into account the special tile indicess >= 0x4000 using GetTileSetIndexForSpecialTile. + */ +void RenderMapLayerToSubTileMap(u16* tileMap, MapLayer* mapLayer); #endif // BEANSTALKSUBTASK_H diff --git a/include/collision.h b/include/collision.h index 465d3e9f..f2d50367 100644 --- a/include/collision.h +++ b/include/collision.h @@ -42,13 +42,29 @@ typedef enum { RESULT_COLLISION_WITHOUT_SET = 2, } CollisionResult; -bool32 IsTileCollision(const u8*, s32, s32, u32); +/** + * @brief + * + * @param collisionData + * @param x x world coordinate + * @param y y world coordinate + * @param collisionType @see CollisionType + * @return bool32 + */ +bool32 IsTileCollision(const u8* collisionData, s32 x, s32 y, u32 collisionType); bool32 IsColliding(Entity*, Entity*); bool32 IsCollidingPlayer(Entity*); -void CalculateEntityTileCollisions(Entity*, u32, u32); +/** + * @brief Calculates the collisions with the tiles around the entity and stores the result in Entity.collisions. + * + * @param this + * @param direction + * @param collisionType @see CollisionType + */ +void CalculateEntityTileCollisions(Entity* this, u32 direction, u32 collisionType); bool32 ProcessMovementInternal(Entity*, s32, s32, u32); u32 sub_080176E4(Entity*); -extern const u8 gUnk_080B37A0[]; // unkData3 for tileType? +extern const u8 gMapTileTypeToActTile[]; // actTile for tileType? #endif // COLLISION_H diff --git a/include/common.h b/include/common.h index c9200c98..5f620c23 100644 --- a/include/common.h +++ b/include/common.h @@ -127,12 +127,20 @@ u32 sub_0801DB94(void); u32 GetRandomSharedFusion(u8*); typedef struct { - u8 unk_0; - u8 unk_1; + u8 numFloors; + u8 highestFloor; u8 unk_2; // u8 pad; -} struct_080C9C6C; +} DungeonFloorMetadata; -extern const struct_080C9C6C gUnk_080C9C6C[]; +extern const DungeonFloorMetadata gDungeonFloorMetadatas[]; + +typedef struct { + u8 area; + u8 room; + u8 unk_2; // TODO u16 pad? + u8 unk_3; + u32 mapDataOffset; +} DungeonLayout; #endif // COMMON_H diff --git a/include/enemy/wizzrobe.h b/include/enemy/wizzrobe.h index 0c8e0f0a..0677b161 100644 --- a/include/enemy/wizzrobe.h +++ b/include/enemy/wizzrobe.h @@ -17,7 +17,7 @@ typedef struct { /*0x81*/ u8 timer1; /*0x82*/ u8 timer2; /*0x83*/ u8 unk_83; - /*0x84*/ u16 tilePosition; + /*0x84*/ u16 tilePos; /*0x86*/ u16 tileIndex; } WizzrobeEntity; diff --git a/include/entity.h b/include/entity.h index 455761c0..d1d08517 100644 --- a/include/entity.h +++ b/include/entity.h @@ -222,7 +222,7 @@ typedef struct Entity_ { /*0x24*/ s16 speed; /**< Magnitude of speed. */ /*0x26*/ u8 spriteAnimation[3]; /*0x29*/ SpritePriority spritePriority; - /*0x2a*/ u16 collisions; /**< Collision flags for each direction. */ + /*0x2a*/ u16 collisions; /**< Collision flags for each direction. @see Collisions*/ /*0x2c*/ union SplitWord x; /**< X position, fixed point Q16.16. */ /*0x30*/ union SplitWord y; /**< Y position, fixed point Q16.16. */ /*0x34*/ union SplitWord z; /**< Z position, fixed point Q16.16. */ @@ -558,6 +558,8 @@ extern u8 gManagerCount; /** @name Tile Macros */ /// @{ #define TILE(x, y) (((((x)-gRoomControls.origin_x) >> 4) & 0x3F) | ((((y)-gRoomControls.origin_y) >> 4) & 0x3F) << 6) +// Calculate tilePos from x and y coordinates where x and y are already relative to the current room. +#define TILE_LOCAL(x, y) ((((x) >> 4) & 0x3F) | (((y) >> 4) & 0x3F) << 6) #define TILE_POS(x, y) (x + (y << 6)) #define TILE_POS_X_COMPONENT 0x3f #define TILE_POS_Y_COMPONENT 0xfc0 diff --git a/include/fileselect.h b/include/fileselect.h index 9c17bad7..704fb1b1 100644 --- a/include/fileselect.h +++ b/include/fileselect.h @@ -49,11 +49,11 @@ typedef struct { /*0x0b*/ SaveFile saves[3]; } struct_02019EE0; extern struct_02019EE0 gMapDataBottomSpecial; -// TODO size: 0x8000 from ClearTilemaps? +// TODO size: 0x8000 from ClearTileMaps? extern void sub_08056FEC(u32, struct_020227E8*); extern u32 ShowTextBox(u32 textIndexOrPtr, const Font* font); -extern void ClearTilemaps(void); +extern void ClearTileMaps(void); extern void ResetSaveFile(u32); extern WStruct* sub_0805F2C8(void); extern u32 sub_0805F7DC(u32, WStruct*); @@ -66,8 +66,6 @@ extern void CreateDialogBox(u32, u32); extern const Font gUnk_080FC844; extern const u16 gUnk_080FC85C[][3]; extern void (*const gUnk_080FC908[])(void); -extern const u8 gGlobalGfxAndPalettes[]; -extern u32 gUsedPalettes; extern u8 gTextGfxBuffer[]; #endif // FILESELECT_H \ No newline at end of file diff --git a/include/flags.h b/include/flags.h index fd176a55..acafabee 100644 --- a/include/flags.h +++ b/include/flags.h @@ -5,27 +5,27 @@ // clang-format off -bool32 CheckFlags(u32); -bool32 CheckGlobalFlag(u32); -bool32 CheckGlobalFlags(u32, u32); +bool32 CheckFlags(u32 flags); +bool32 CheckGlobalFlag(u32 flag); +bool32 CheckGlobalFlags(u32 flag, u32 count); extern bool32 CheckLocalFlag(u32 flag); extern bool32 CheckLocalFlagByBank(u32 bank, u32 flag); -bool32 CheckLocalFlags(u32, u32); -bool32 CheckLocalFlagsByBank(u32, u32, u32); -bool32 CheckRoomFlag(u32); -bool32 CheckRoomFlags(u32, u32); +bool32 CheckLocalFlags(u32 flag, u32 count); +bool32 CheckLocalFlagsByBank(u32 offset, u32 flag, u32 count); +bool32 CheckRoomFlag(u32 flag); +bool32 CheckRoomFlags(u32 flag, u32 count); -void ClearFlag(u32); -void ClearGlobalFlag(u32); -void ClearLocalFlag(u32); -void ClearLocalFlagByBank(u32, u32); -void ClearRoomFlag(u32); +void ClearFlag(u32 flag); +void ClearGlobalFlag(u32 flag); +void ClearLocalFlag(u32 flag); +void ClearLocalFlagByBank(u32 offset, u32 flag); +void ClearRoomFlag(u32 flag); -void SetFlag(u32); -void SetGlobalFlag(u32); -void SetLocalFlag(u32); -void SetLocalFlagByBank(u32, u32); -void SetRoomFlag(u32); +void SetFlag(u32 flag); +void SetGlobalFlag(u32 flag); +void SetLocalFlag(u32 flag); +void SetLocalFlagByBank(u32 offset, u32 flag); +void SetRoomFlag(u32 flag); extern u32 ReadBit(void*, u32); extern u32 CheckBits(void*, u32, u32); diff --git a/include/functions.h b/include/functions.h index 5d4b01fe..d0eace75 100644 --- a/include/functions.h +++ b/include/functions.h @@ -23,9 +23,7 @@ extern void CreateMinishEntrance(u32 tile); extern u32 CreateRandomItemDrop(Entity*, u32); extern void DrawDirect(u32 spriteIndex, u32 frameIndex); extern void DrawEntities(void); -extern bool32 EntityWithinDistance(Entity*, s32, s32, s32); extern void FlushSprites(void); -extern LayerStruct* GetTileBuffer(u32); extern u32 GetTileIndex(u32 tilePos, u32 layer); extern u32 GiveItem(u32, u32); extern bool32 LoadFixedGFX(Entity*, u32); @@ -49,12 +47,6 @@ extern void ClearBgAnimations(void); extern void SetBGDefaults(void); // Unidentified -extern void sub_08000148(u32, u32, u32); -extern u32 sub_080B1A0C(Entity*, s32, s32); -extern u32 sub_080B1AE0(u16, u8); -extern u32 sub_080B1AF0(Entity*, s32, s32); -extern u32 sub_080B1B18(s32, s32, u32); -extern u32 sub_080B1B44(u32, u32); extern s32 sub_080012DC(Entity*); extern void sub_08001318(Entity*); extern void LinearMoveDirectionOLD(Entity*, u32, u32); diff --git a/include/game.h b/include/game.h index 62584fe1..9e1bc655 100644 --- a/include/game.h +++ b/include/game.h @@ -212,7 +212,7 @@ void RoomExitCallback(void); * * @param a1 */ -void RestoreGameTask(u32 a1); +void RestoreGameTask(bool32 loadGfx); /** * Check if an Ezlo message can be displayed. @@ -290,14 +290,15 @@ typedef enum { } EGameMainState; typedef struct { - u8 _0; - u8 _1; - u8 _2; - u8 _3; - u8 _4; - u16 _6; -} struct_08127F94; -extern struct_08127F94 gUnk_08127F94[]; + u8 minX; + u8 minY; + u8 maxX; + u8 maxY; + u8 windcrestId; /**< Id to set in gSave.windcrests when the user entered a room in the boundaries specified above.*/ + // u8 pad; + u16 textIndex; /**< The text to show for this area.*/ +} OverworldLocation; +extern const OverworldLocation gOverworldLocations[]; typedef struct { const Font* font; diff --git a/include/gba/gba.h b/include/gba/gba.h index 259bb9c8..dc3c3f87 100644 --- a/include/gba/gba.h +++ b/include/gba/gba.h @@ -1,5 +1,5 @@ -#ifndef GUARD_GBA_GBA_H -#define GUARD_GBA_GBA_H +#ifndef GBA_H +#define GBA_H #include #include "defines.h" @@ -10,4 +10,4 @@ #include "macro.h" #include "isagbprint.h" -#endif // GUARD_GBA_GBA_H +#endif // GBA_H diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index a66467f0..acd985e9 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -529,11 +529,11 @@ // BGCNT #define BGCNT_PRIORITY(n) (n) // Values 0 - 3. Lower priority BGs will be drawn on top of higher priority BGs. -#define BGCNT_CHARBASE(n) ((n) << 2) // Values 0 - 3. Base block for tile pixel data. +#define BGCNT_CHARBASE(n) ((n) << 2) // Values 0 - 3. Base block for sub tile pixel data. #define BGCNT_MOSAIC 0x0040 #define BGCNT_16COLOR 0x0000 // 4 bits per pixel #define BGCNT_256COLOR 0x0080 // 8 bits per pixel -#define BGCNT_SCREENBASE(n) ((n) << 8) // Values 0 - 31. Base block for tile map. +#define BGCNT_SCREENBASE(n) ((n) << 8) // Values 0 - 31. Base block for sub tile map. #define BGCNT_WRAP 0x2000 // Only affects affine BGs. Text BGs wrap by default. #define BGCNT_TXT256x256 0x0000 // Internal screen size size of text mode BG in pixels. #define BGCNT_TXT512x256 0x4000 diff --git a/include/kinstone.h b/include/kinstone.h index 18910ee3..c50ba857 100644 --- a/include/kinstone.h +++ b/include/kinstone.h @@ -227,8 +227,8 @@ typedef struct { u16 offsetY; /**< Scroll offset Y from the room origin. */ u16 x; /**< X position of the actual event. */ u16 y; /**< Y position of the actual event. */ - u16 _c; // see sub_080A6A80, related to _0 and _2 of gUnk_08127F94 - u16 _e; // see sub_080A6A80, related to _1 and _3 of gUnk_08127F94 + u16 _c; // see GetOverworldLocation, related to _0 and _2 of gOverworldLocations + u16 _e; // see GetOverworldLocation, related to _1 and _3 of gOverworldLocations u8 condition; // TODO some sort of flag determining what type the bank&flag are? see UpdateVisibleFusionMapMarkers u8 bank; /**< @see LocalBanks */ u16 flag; diff --git a/include/main.h b/include/main.h index 4d70beb7..f2a229ea 100644 --- a/include/main.h +++ b/include/main.h @@ -64,13 +64,14 @@ typedef struct { u8 pauseFrames; /**< Number of frames to pause. */ u8 pauseCount; /**< Number of pauses to make. */ u8 pauseInterval; /**< Number of frames to play between each pause. */ - u8 pad; - u16 ticks; /**< Current time. */ + u8 pad; // TODO actually used in CopyOAM() + u16 ticks; /**< Current time. */ } Main; /** * HUD structure. */ +// TODO Rather a structure more generally about gfx? typedef struct { /*0x000*/ u8 nextToLoad; /*0x001*/ u8 _1; @@ -78,7 +79,7 @@ typedef struct { /*0x003*/ u8 field_0x3; /*0x004*/ u8 state; /*0x005*/ u8 field_0x5; - /*0x006*/ u8 field_0x6; + /*0x006*/ bool8 loadGfxOnRestore; // used in Subtask_FadeOut to determine the loadGfx parameter of RestoreGameTask. /*0x007*/ u8 pauseFadeIn; /*0x008*/ u16 fadeType; /*0x00A*/ u16 fadeInTime; diff --git a/include/manager.h b/include/manager.h index f95029b0..c96a1785 100644 --- a/include/manager.h +++ b/include/manager.h @@ -96,7 +96,7 @@ extern void MinishPortalManager_Main(); extern void DiggingCaveEntranceManager_Main(); extern void BridgeManager_Main(); extern void SpecialWarpManager_Main(); -extern void MinishVillageTilesetManager_Main(); +extern void MinishVillageTileSetManager_Main(); extern void HorizontalMinishPathBackgroundManager_Main(); extern void MinishRaftersBackgroundManager_Main(); extern void EzloHintManager_Main(); @@ -107,7 +107,7 @@ extern void EntitySpawnManager_Main(); extern void MiscManager_Main(); extern void WeatherChangeManager_Main(); extern void FlagAndOperatorManager_Main(); -extern void HyruleTownTilesetManager_Main(); +extern void HyruleTownTileSetManager_Main(); extern void HouseSignManager_Main(); extern void SteamOverlayManager_Main(); extern void TempleOfDropletsManager_Main(); diff --git a/include/manager/bombableWallManager.h b/include/manager/bombableWallManager.h index 8d41bde4..c024f532 100644 --- a/include/manager/bombableWallManager.h +++ b/include/manager/bombableWallManager.h @@ -6,13 +6,13 @@ typedef struct { Manager base; u8 field_0x20[0x15]; - u8 field_0x35; + u8 layer; u8 field_0x36; u8 field_0x37; s16 x; u16 y; - u16 tile; - u16 field_0x3e; + u16 tilePos; + u16 flag; } BombableWallManager; #endif // BOMBABLEWALLMANAGER_H diff --git a/include/manager/diggingCaveEntranceManager.h b/include/manager/diggingCaveEntranceManager.h index 6f9c8914..3c8c7090 100644 --- a/include/manager/diggingCaveEntranceManager.h +++ b/include/manager/diggingCaveEntranceManager.h @@ -7,13 +7,36 @@ typedef struct { Manager base; } DiggingCaveEntranceManager; +enum DiggingCaveEntranceType { + CAVE_LAKE_WOODS_ENTER, + CAVE_LAKE_WOODS_LEAVE, + CAVE_HYRULE_TOWN_ENTER, + CAVE_HYRULE_TOWN_LEAVE, + CAVE_EASTERN_HILL_ENTER, + CAVE_EASTERN_HILL_LEAVE, + CAVE_CRENEL_ENTER, + CAVE_CRENEL_LEAVE, + CAVE_VEIL_FALLS_ENTER, + CAVE_VEIL_FALLS_LEAVE, + CAVE_TRILBY_HIGHLANDS_ENTER, + CAVE_TRILBY_HIGHLANDS_LEAVE, + CAVE_CASTOR_WILDS_ENTER, + CAVE_CASTOR_WILDS_LEAVE, + CAVE_LAKE_HYLIA_NORTH_ENTER, + CAVE_LAKE_HYLIA_NORTH_LEAVE, + CAVE_LON_LON_RANCH_ENTER, + CAVE_LON_LON_RANCH_LEAVE, + CAVE_LAKE_HYLIA_CENTER_ENTER, + CAVE_LAKE_HYLIA_CENTER_LEAVE, +}; + typedef struct { - u16 sourceTilePosition; /**< Tile position for the entrance in the source room. */ - u8 sourceRoom; - u8 type; // TODO some sort of type that is used to index gUnk_08109194 - u8 targetArea; - u8 targetRoom; - u16 targetTilePosition; /**< Tile position for the entrance in the target room. */ + u16 sourceTilePos; /**< Tile position for the entrance in the source room. */ + u8 sourceRoom; /**< @see RoomID */ + u8 type; /**< @see DiggingCaveEntranceType */ + u8 targetArea; /**< @see AreaID */ + u8 targetRoom; /**< @see RoomID */ + u16 targetTilePos; /**< Tile position for the entrance in the target room. */ } DiggingCaveEntrance; typedef struct { diff --git a/include/manager/flameManager.h b/include/manager/flameManager.h index 2c5ebe7c..d5749cbb 100644 --- a/include/manager/flameManager.h +++ b/include/manager/flameManager.h @@ -6,8 +6,8 @@ typedef struct { struct Manager base; u8 field_0x20[0x18]; - s16 field_0x38; - s16 field_0x3a; + s16 x; // After loading this stores the tilePos. + s16 y; } FlameManager; #endif // FLAMEMANAGER_H diff --git a/include/manager/hyruleTownTilesetManager.h b/include/manager/hyruleTownTileSetManager.h similarity index 88% rename from include/manager/hyruleTownTilesetManager.h rename to include/manager/hyruleTownTileSetManager.h index 8e269355..ee908238 100644 --- a/include/manager/hyruleTownTilesetManager.h +++ b/include/manager/hyruleTownTileSetManager.h @@ -8,6 +8,6 @@ typedef struct { u8 field_0x20; u8 field_0x21; u8 field_0x22; -} HyruleTownTilesetManager; +} HyruleTownTileSetManager; #endif // HYRULETOWNTILESETMANAGER_H diff --git a/include/manager/manager29.h b/include/manager/manager29.h index a26f291c..c7d99b69 100644 --- a/include/manager/manager29.h +++ b/include/manager/manager29.h @@ -9,7 +9,7 @@ typedef struct { u16* unk_28; u16* unk_2c; u8 filler[0x4]; - u8 unk_34; + u8 layer; u8 unk_35; u8 unk_36; u8 unk_37; diff --git a/include/manager/minishVillageTilesetManager.h b/include/manager/minishVillageTileSetManager.h similarity index 87% rename from include/manager/minishVillageTilesetManager.h rename to include/manager/minishVillageTileSetManager.h index 50c01f54..748be3c5 100644 --- a/include/manager/minishVillageTilesetManager.h +++ b/include/manager/minishVillageTileSetManager.h @@ -7,6 +7,6 @@ typedef struct { Manager base; u8 unk_20; u8 unk_21[0x1F]; -} MinishVillageTilesetManager; +} MinishVillageTileSetManager; #endif // MINISHVILLAGETILESETMANAGER_H diff --git a/include/manager/miscManager.h b/include/manager/miscManager.h index bde8388b..44047584 100644 --- a/include/manager/miscManager.h +++ b/include/manager/miscManager.h @@ -6,8 +6,8 @@ typedef struct { Manager base; u8 unk_20[0x18]; - s16 unk_38; - s16 unk_3a; + s16 x; + s16 y; u16 unk_3c; u16 flags; } MiscManager; diff --git a/include/manager/railIntersectionManager.h b/include/manager/railIntersectionManager.h index 9de3c0ad..9717c363 100644 --- a/include/manager/railIntersectionManager.h +++ b/include/manager/railIntersectionManager.h @@ -6,9 +6,9 @@ typedef struct { Manager base; u8 field_0x20[0x16]; - u8 field_0x36; + u8 layer; u8 field_0x37; - s16 field_0x38; + s16 tilePos; u16 field_0x3a; u8 field_0x3c; u8 field_0x3d; diff --git a/include/manager/tileChangeObserveManager.h b/include/manager/tileChangeObserveManager.h index fda2c35a..c56864ff 100644 --- a/include/manager/tileChangeObserveManager.h +++ b/include/manager/tileChangeObserveManager.h @@ -25,7 +25,7 @@ typedef struct { u8 field_0x35; u8 field_0x36; u8 field_0x37; - u16 tilePosition; + u16 tilePos; u16 field_0x3a; u8 field_0x3c; u8 field_0x3d; diff --git a/include/map.h b/include/map.h index 9859fa39..42008f6b 100644 --- a/include/map.h +++ b/include/map.h @@ -1,23 +1,124 @@ #ifndef MAP_H #define MAP_H -#include "global.h" #include "screen.h" +/** + * @page TileMap Tile Map + * @brief The map consists of tiles to create the world. + * + * GBA graphics are made out of tiles with a size of 8px by 8px. We call those tiles *subTiles*. + * Four of those subTiles are combined together to form a bigger 16px by 16px tile (usually called metaTile). We call + * these *tiles*. + * + * Each map can be up to 64 * 64 tiles big. The map consists of two layers of tiles gMapTop and gMapBottom. + * To access the map array the tilePos index can be used which goes from 0 to 64 * 64 = 4096. + * Each value in the MapLayer.mapData is a tileIndex which defined which tile of the tileSet should be used. + * The tileSet contains tiles from 0 to 2048. Special tileIndex from 0x4000 to 0x4096 can be used to denote special + * tiles. + * + * A tile is created from four subTiles. The subTiles for each tile in the tileSet are stored in MapLayer.subTiles. This + * is loaded for the current area from gAreaTileSets_*. The subTiles can also be flipped or the palette changed. This is + * stored in bits 0xa to 0xf, see https://www.coranac.com/tonc/text/regbg.htm#sec-map. + * + * Each tile in the tileSet also has a tileType defined. This is stored in MapLayer.tileTypes and loaded from + * gAreaTileSetTypes_*. The inverse dictionary from tileType to tileIndex is stored in MapLayer.tileIndices. + * + * The map also stores the collision for each tile in the tileMap layer in MapLayer.collisionData. By default this is + * filled from gMapTileTypeToCollisionData based on the tileType of the tiles. But it can also be loaded from + * gRoomCollisionMap_*. In MapLayer.actTiles some additional type for each tile is stored which is filled from + * gMapTileTypeToActTile based on the tileType of the tiles. + */ + +// Maximum width or height of a map in tiles. +#define MAX_MAP_SIZE 64 +// Maximum amount of tiles in a tileSet. +#define TILESET_SIZE 2048 + +/** + * @brief Layer of the TileMap. + * @ingroup TileMap + */ typedef struct { /*0x0000*/ BgSettings* bgSettings; - /*0x0004*/ u16 mapData[0x1000]; // tilemap data? <-- gMapDataTop / gMapDataBottom - /*0x2004*/ u8 collisionData[0x1000]; // more tilemap data? <-- gUnk_0200D654 / gUnk_02027EB4 - /*0x3004*/ u16 mapDataOriginal[0x1000]; // more tilemap data? <-- gUnk_0200E654 / gUnk_02028EB4 - /*0x5004*/ u16 metatileTypes[0x800]; // gMetatileTypesTop, gMetatileTypesBottom - /*0x6004*/ u16 unkData2[0x800]; // gUnk_02011654,gUnk_0202BEB4 - /*0x7004*/ u16 metatiles[0x2000]; // gMetatilesTop, gMetatilesBottom - /*0xb004*/ u8 unkData3[0x1000]; // gUnk_02016654, gUnk_02030EB4 -} LayerStruct; + /** + * tileIndex for each tile on the current layer. + */ + /*0x0004*/ u16 mapData[MAX_MAP_SIZE * MAX_MAP_SIZE]; + /** + * Collision data for each tile on the current layer. + * @see CollisionData + */ + /*0x2004*/ u8 collisionData[MAX_MAP_SIZE * MAX_MAP_SIZE]; + /** + * Copy of the map data. + * @see mapData + */ + /*0x3004*/ u16 mapDataOriginal[MAX_MAP_SIZE * MAX_MAP_SIZE]; + /** + * Maps from the tileIndex to the tileType. + * @see TileType + */ + /*0x5004*/ u16 tileTypes[TILESET_SIZE]; + /** + * Maps from a tileType to a tileIndex. Inverse of @see tileTypes. + * @see TileType + */ + /*0x6004*/ u16 tileIndices[TILESET_SIZE]; + /** + * Maps from a tile index to the four sub tiles (with attributes) it consists of. + * @see https://www.coranac.com/tonc/text/regbg.htm#sec-map + */ + /*0x7004*/ u16 subTiles[TILESET_SIZE * 4]; + /** + * Some sort of special behavior for tiles? Falling into holes or jumping off walls does not work when this is all + * zero. + * @see ActTile + */ + /*0xb004*/ u8 actTiles[MAX_MAP_SIZE * MAX_MAP_SIZE]; +} MapLayer; -extern LayerStruct gMapTop; -extern LayerStruct gMapBottom; +extern MapLayer gMapTop; +extern MapLayer gMapBottom; -LayerStruct* GetTileBuffer(u32); +typedef enum { + LAYER_BOTTOM = 1, + LAYER_TOP = 2, +} LayerIndex; + +/** + * Returns the MapLayer for a layer of the map. + * + * @param layer @see LayerIndex + */ +extern MapLayer* GetLayerByIndex(u32 layer); + +// There is another map data definition following. +#define MAP_MULTIPLE 0x80000000 +// The src is compressed. +#define MAP_COMPRESSED 0x80000000 + +/** + * Definition where some map data is found and where it should be copied to. + * Defined using the map_data asm macro, e.g. in map_headers.s + */ +typedef struct { + /** + * @brief Source offset from gMapData. + * + * MAP_MULTIPLE bit is set if there is another MapDataDefinition following. + */ + u32 src; + /** + * Target pointer where to load or decompress the map data to. + */ + void* dest; + /** + * @brief Size of the map data in bytes. + * + * MAP_COMPRESSED bit is set if the map data is compressed. + */ + u32 size; +} MapDataDefinition; #endif // MAP_H diff --git a/include/physics.h b/include/physics.h index 36b6e594..dc6460cc 100644 --- a/include/physics.h +++ b/include/physics.h @@ -21,7 +21,7 @@ void SortEntityBelow(Entity* above_ent, Entity* below_ent); void LinearMoveDirection(Entity* ent, u32 a, u32 b); void LinearMoveAngle(Entity* ent, u32 a, u32 b); -bool32 EntityWithinDistance(Entity*, s32, s32, s32); +bool32 EntityWithinDistance(Entity* entity, s32 x, s32 y, s32 distance); u32 sub_0806FCA0(Entity*, Entity*); u32 sub_0806F58C(Entity*, Entity*); u32 PointInsideRadius(s32 x, s32 y, s32 radius); diff --git a/include/player.h b/include/player.h index dbd1f923..05f550d3 100644 --- a/include/player.h +++ b/include/player.h @@ -183,8 +183,8 @@ enum PlayerItemId { typedef enum { SURFACE_NORMAL, SURFACE_PIT, - SURFACE_2, - SURFACE_3, + SURFACE_2, // nulled + SURFACE_3, // nulled SURFACE_SLOPE_GNDGND_V, SURFACE_SLOPE_GNDGND_H, SURFACE_6, @@ -194,10 +194,10 @@ typedef enum { SURFACE_A, SURFACE_B, SURFACE_SLOPE_GNDWATER, - SURFACE_D, - SURFACE_E, - SURFACE_F, - SURFACE_10, + SURFACE_D, // SurfaceAction_ConveyerNorth + SURFACE_E, // SurfaceAction_ConveyerSouth + SURFACE_F, // SurfaceAction_ConveyerWest + SURFACE_10, // SurfaceAction_ConveyerEast SURFACE_SWAMP, SURFACE_DOOR, SURFACE_DOOR_13, @@ -214,18 +214,19 @@ typedef enum { SURFACE_LADDER, SURFACE_1F, // nulled SURFACE_20, - SURFACE_21, + SURFACE_21, // reuses SurfaceAction_16 SURFACE_22, - SURFACE_EDGE, - SURFACE_24, + SURFACE_EDGE, // reuses SurfaceAction_6 + SURFACE_24, // reuses SurfaceAction_6 SURFACE_DUST, SURFACE_26, SURFACE_HOLE, - SURFACE_LIGHT_GRADE, - SURFACE_29, + SURFACE_LIGHT_GRADE, // reuses SurfaceAction_SlopeGndGndVertical + SURFACE_29, // reuses SurfaceAction_SlopeGndGndHorizontal SURFACE_AUTO_LADDER, SURFACE_CLIMB_WALL, SURFACE_2C, + SURFACE_2D, // reuses SurfaceAction_Dust SURFACE_FF = 0xff, } SurfaceType; @@ -256,8 +257,8 @@ typedef struct { typedef struct { u16 flags; - u16 keys; -} PlayerMacroEntry; + u16 keys; /**< GBA keys bitmask, see io_reg.h */ +} PlayerMacroEntry ALIGNED(2); typedef enum { INPUT_USE_ITEM1 = 0x1, // A @@ -502,8 +503,8 @@ typedef struct { /*0x0f*/ u8 hurtBlinkSpeed; /*0x10*/ u8 field_0x10; /*0x11*/ u8 surfacePositionSameTimer; - /*0x12*/ u8 floor_type; - /*0x13*/ u8 floor_type_last; + /*0x12*/ u8 floor_type; /**< @see SurfaceType */ + /*0x13*/ u8 floor_type_last; /**< @see SurfaceType */ /*0x14*/ u8 field_0x14; /*0x15*/ u8 field_0x15; /*0x16*/ u16 startPosX; @@ -515,7 +516,7 @@ typedef struct { /*0x1e*/ u8 dash_state; /*0x1f*/ u8 field_0x1f[2]; /*0x21*/ u8 bow_state; - /*0x22*/ u16 tilePosition; + /*0x22*/ u16 tilePos; /*0x24*/ u16 tileType; /*0x26*/ u8 swim_state; /**< Is the player swimming? 0x80 for diving */ /*0x27*/ u8 field_0x27[5]; @@ -695,7 +696,7 @@ u32 sub_08079B24(void); void sub_08079708(Entity*); void sub_08079744(Entity*); void PlayerUpdateSwimming(Entity*); -u32 GetCollisionTileInFront(Entity*); +u32 GetActTileInFront(Entity* player); u32 sub_080797C4(void); void CheckPlayerVelocity(void); void sub_0807B068(Entity*); @@ -717,14 +718,13 @@ void sub_08078D60(void); void PlayerSetNormalAndCollide(void); bool32 PlayerTryDropObject(ItemBehavior* arg0, u32 unk); void InitItemGetSequence(u32, u32, u32); -void sub_0807B7D8(u32, u32, u32); +void sub_0807B7D8(u32 tileType, u32 tilePos, u32 layer); void SetInteractableObjectCollision(Entity*, u32, u32, const void*); void sub_08079D84(void); u32 sub_0807953C(void); void sub_0807BB68(const s16*, u32, u32); -void sub_0807B9B8(u32, u32, u32); -void sub_0807B7D8(u32, u32, u32); -void RestorePrevTileEntity(u32, u32); +void SetTileByIndex(u32 tileIndex, u32 tilePos, u32 layer); +void RestorePrevTileEntity(u32 tilePos, u32 layer); void UpdateItemAnim(ItemBehavior*); void PlayerCancelHoldItem(ItemBehavior*, u32); void RegisterCarryEntity(Entity*); diff --git a/include/room.h b/include/room.h index f9201826..09d2b2fb 100644 --- a/include/room.h +++ b/include/room.h @@ -1,9 +1,9 @@ #ifndef ROOM_H #define ROOM_H -#include "global.h" #include "entity.h" #include "droptables.h" +#include "map.h" enum RoomTransition { TRANSITION_DEFAULT, @@ -24,7 +24,7 @@ enum RoomReloadType { }; typedef struct { - /*0x00*/ u16 reload_flags; + /*0x00*/ u16 reload_flags; // anything except for 0x1 prevents the screen from reloading when tiles are changed. /*0x02*/ u8 scrollAction; /*0x03*/ u8 scrollSubAction; /*0x04*/ u8 area; @@ -34,7 +34,8 @@ typedef struct { /*0x0A*/ s16 scroll_x; /*0x0C*/ s16 scroll_y; /*0x0E*/ u8 scrollSpeed; /**< Pixels per frame that the camera can scroll. */ - /*0x0F*/ u8 scroll_flags; // 0x2 = ??, 0x4 = camera scrolling + /*0x0F*/ u8 scroll_flags; // 0x2 = ?? (apply collision value on bottom map no matter the layer SetTileType is + // called for), 0x4 = camera scrolling /*0x10*/ u8 scroll_direction; /*0x11*/ s8 oam_offset_x; /*0x12*/ s8 oam_offset_y; @@ -45,8 +46,8 @@ typedef struct { /*0x18*/ u16 unk_18; // progress during transition in same area? /*0x1A*/ u16 unk_1a; // calculated from unk_18 /*0x1C*/ u16 unk_1c; // 0, 0xff - /*0x1E*/ u16 width; - /*0x20*/ u16 height; + /*0x1E*/ u16 width; /**< Width in pixels. */ + /*0x20*/ u16 height; /**< Height in pixels. */ /*0x22*/ u16 unk_22; // so far always 0xffff /*0x24*/ s8 aff_x; /*0x25*/ s8 aff_y; @@ -55,7 +56,7 @@ typedef struct { /*0x28*/ union SplitWord bg3OffsetX; /*0x2C*/ union SplitWord bg3OffsetY; /*0x30*/ Entity* camera_target; - /*0x34*/ u32 unk_34; + /*0x34*/ u32 tileSet; // TODO Should be MapDataDefinition*, but then LoadRoomTileSet does not match. } RoomControls; extern RoomControls gRoomControls; @@ -72,7 +73,7 @@ typedef struct { /* 0x09 */ u8 fight_bgm; /* 0x0a */ u8 needHealthDrop; /* 0x0c */ s16 lightLevel; - /* 0x0e */ u16 tileEntityCount; + /* 0x0e */ u16 tileEntityCount; // Number of previous values for special tiles stored in gTilesForSpecialTiles /* 0x10 */ u8 graphicsGroups[4]; /* 0x14 */ u8 flags[52]; /* 0x48 */ Droptable currentAreaDroptable; @@ -88,7 +89,8 @@ typedef struct { u8 area; u8 room; u16 unk_02; - u32 enemyBits; + u32 enemyBits; /**< Flags that can be set on the tracked rooms. Used e.g. by the door mimic. (TODO probably to start + in the discovered state?)*/ } RoomMemory; extern RoomMemory* gCurrentRoomMemory; @@ -149,7 +151,7 @@ typedef struct { /* 0x06 */ u16 field_0x6; /* 0x08 */ bool8 transitioningOut; /* 0x09 */ u8 type; // transition when changing areas - /* 0x0a */ u16 stairs_idx; // seems to be a tile type + /* 0x0a */ u16 stairs_idx; // seems to be a tile type @see TileType, set in UpdateDoorTransition() /* 0x0c */ PlayerRoomStatus player_status; /* 0x2c */ u8 entity_update_type; // differentiates entity priority on kinstone menu? /* 0x2d */ u8 field2d; @@ -232,7 +234,7 @@ typedef enum { extern void** gCurrentRoomProperties; -void SetTileType(u32 tileType, u32 position, u32 layer); +void SetTileType(u32 tileType, u32 tilePos, u32 layer); void InitScreenShake(u32 time, u32 magnitude); void CallRoomProp5And7(void); diff --git a/include/roomid.h b/include/roomid.h index 14bc46c9..84a64c39 100644 --- a/include/roomid.h +++ b/include/roomid.h @@ -14,9 +14,9 @@ typedef enum { // AREA_HYRULE_FIELD ROOM_HYRULE_FIELD_WESTERN_WOODS_SOUTH = 0, ROOM_HYRULE_FIELD_SOUTH_HYRULE_FIELD, - ROOM_HYRULE_FIELD_EASTERN_HILLLS_SOUTH, - ROOM_HYRULE_FIELD_EASTERN_HILLLS_CENTER, - ROOM_HYRULE_FIELD_EASTERN_HILLLS_NORTH, + ROOM_HYRULE_FIELD_EASTERN_HILLS_SOUTH, + ROOM_HYRULE_FIELD_EASTERN_HILLS_CENTER, + ROOM_HYRULE_FIELD_EASTERN_HILLS_NORTH, ROOM_HYRULE_FIELD_LON_LON_RANCH, ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD, ROOM_HYRULE_FIELD_TRILBY_HIGHLANDS, diff --git a/include/screen.h b/include/screen.h index f6eedfd4..a1391401 100644 --- a/include/screen.h +++ b/include/screen.h @@ -16,7 +16,7 @@ typedef struct { u16 xOffset; u16 yOffset; u16 updated; - void* tilemap; + void* subTileMap; } BgSettings; typedef struct { @@ -24,7 +24,7 @@ typedef struct { s16 xOffset; s16 yOffset; u16 updated; - void* tilemap; + void* subTileMap; } BgAffSettings; typedef struct { diff --git a/include/script.h b/include/script.h index 4fbb2eef..6a0688d6 100644 --- a/include/script.h +++ b/include/script.h @@ -54,7 +54,7 @@ void StartPlayerScript(Script* script); void InitScriptForNPC(Entity* entity); void sub_0807DD64(Entity* entity); void sub_0807DD80(Entity* entity, Script* script); -void sub_0807DEDC(Entity*, ScriptExecutionContext*, u32, u32); +void LookAt(Entity*, ScriptExecutionContext*, u32, u32); ScriptExecutionContext* StartCutscene(Entity* entity, Script* script); void ExecuteScriptForEntity(Entity* entity, void (*postScriptCallback)(Entity*, ScriptExecutionContext*)); diff --git a/include/structures.h b/include/structures.h index f4dc51cd..97233eea 100644 --- a/include/structures.h +++ b/include/structures.h @@ -90,9 +90,23 @@ typedef struct { u32* firstTile; } UIElement; +typedef enum { + HUD_HIDE_NONE, + HUD_HIDE_1 = 0x1, // A + HUD_HIDE_2 = 0x2, // B + HUD_HIDE_4 = 0x4, // R + HUD_HIDE_8 = 0x8, + HUD_HIDE_HEARTS = 0x10, + HUD_HIDE_CHARGE_BAR = 0x20, + HUD_HIDE_RUPEES = 0x40, + HUD_HIDE_KEYS = 0x80, + + HUD_HIDE_ALL = 0xff +} HUDHideFlags; + typedef struct { u8 unk_0; - u8 unk_1; + u8 hideFlags; u8 unk_2; u8 health; u8 maxHealth; @@ -124,8 +138,8 @@ typedef struct { u8 buttonText[3]; u8 unk_33; UIElement elements[MAX_UI_ELEMENTS]; -} struct_0200AF00; -extern struct_0200AF00 gUnk_0200AF00; +} HUD; +extern HUD gHUD; #define MAX_GFX_SLOTS 44 @@ -338,8 +352,8 @@ typedef struct { extern struct_02018EB0 gUnk_02018EB0; typedef struct { - s16 tile; - s16 position; + s16 tileIndex; + s16 tilePosOffset; } TileData; typedef struct { @@ -360,4 +374,25 @@ typedef struct { u8 frame; u8 frameIndex; } PACKED FrameStruct; + +typedef struct { + /*0x0*/ u8 menuType; + /*0x1*/ u16 font; + /*0x3*/ u8 unk_3; // TODO padding? + /*0x4*/ u16 transitionTimer; + /*0x6*/ u16 gfxEntry; + /*0x8*/ u16 bg2XOffset; + /*0xa*/ u16 sm_unk_14; +} PACKED StaffrollEntry; + +static_assert(sizeof(StaffrollEntry) == 0xc); + +typedef struct { + u8 paletteGroup; + u8 gfxGroup; +} PACKED StaffrollGfxEntry; + +extern const u8 gGlobalGfxAndPalettes[]; +extern u32 gUsedPalettes; + #endif // STRUCTURES_H diff --git a/include/subtask.h b/include/subtask.h index 73bf9bb9..e1d98a16 100644 --- a/include/subtask.h +++ b/include/subtask.h @@ -89,11 +89,11 @@ void sub_080A4DB8(u32); void sub_080A6290(void); void sub_080A66D0(); void sub_080A67C4(u32); -void sub_080A6FB4(u32, u32); +void ShowAreaName(u32 id, u32 type); void sub_080A698C(u32 param_1, u32 param_2, u32 param_3, u32 param_4); u32 sub_080A6F40(); s32 sub_080A69E0(); -struct_08127F94* sub_080A6A80(u32 param_1, u32 param_2); +const OverworldLocation* GetOverworldLocation(u32 x, u32 y); void sub_080A6498(void); void sub_080A71F4(const ScreenTransitionData* exitTransition); void sub_080A6F6C(u32 textIndexOrPtr); diff --git a/include/tileMap.h b/include/tileMap.h new file mode 100644 index 00000000..fb1fbc2e --- /dev/null +++ b/include/tileMap.h @@ -0,0 +1,13 @@ +#ifndef TILEMAP_H +#define TILEMAP_H + +#include "global.h" + +// gMapDataTopSpecial and gMapDataBottomSpecial are tileMaps of 8x8 pixels. But they are also reused for other data in +// other parts of the game. + +// Rendered tileMaps https://www.coranac.com/tonc/text/regbg.htm#sec-map +extern u16 gMapDataTopSpecial[0x4000]; +extern u16 gMapDataBottomSpecial[0x4000]; + +#endif // TILEMAP_H diff --git a/include/tiles.h b/include/tiles.h index 2dd6783a..1c37ebff 100644 --- a/include/tiles.h +++ b/include/tiles.h @@ -2,43 +2,1783 @@ #define TILES_H typedef enum { - TILE_ACT_CUT = 0x0, - TILE_ACT_ROCKBREAKER = 0x1, - TILE_ACT_BOOMERANG = 0x2, - TILE_ACT_BOMB = 0x3, - TILE_ACT_ARROW = 0x4, - TILE_ACT_GUST = 0x5, - TILE_ACT_LIFT = 0x6, - TILE_ACT_FIRE = 0x7, - TILE_ACT_PLAYER_WALK = 0x8, - TILE_ACT_ENEMY_WALK = 0x9, - TILE_ACT_PACCI = 0xA, - TILE_ACT_SWORDBEAM = 0xC, - TILE_ACT_DIG = 0xD, - TILE_ACT_MINIGUST = 0xE, -} TileInteraction; + TILE_TYPE_0 = 0x0, + TILE_TYPE_1 = 0x1, + TILE_TYPE_2 = 0x2, + TILE_TYPE_3 = 0x3, + TILE_TYPE_4 = 0x4, + TILE_TYPE_5 = 0x5, + TILE_TYPE_6 = 0x6, + TILE_TYPE_7 = 0x7, + TILE_TYPE_8 = 0x8, + TILE_TYPE_9 = 0x9, + TILE_TYPE_10 = 0xa, + TILE_TYPE_11 = 0xb, + TILE_TYPE_12 = 0xc, + TILE_TYPE_13 = 0xd, + TILE_TYPE_14 = 0xe, + TILE_TYPE_15 = 0xf, + TILE_TYPE_16 = 0x10, + TILE_TYPE_17 = 0x11, + TILE_TYPE_18 = 0x12, + TILE_TYPE_19 = 0x13, + TILE_TYPE_20 = 0x14, + TILE_TYPE_21 = 0x15, + TILE_TYPE_22 = 0x16, + TILE_TYPE_23 = 0x17, + TILE_TYPE_24 = 0x18, + TILE_TYPE_25 = 0x19, + TILE_TYPE_26 = 0x1a, + TILE_TYPE_27 = 0x1b, + TILE_TYPE_28 = 0x1c, // CUT_BUSH + TILE_TYPE_29 = 0x1d, // CUT_GRASS + TILE_TYPE_30 = 0x1e, // CUT_SIGNPOST + TILE_TYPE_31 = 0x1f, // CUT_TREE + TILE_TYPE_32 = 0x20, + TILE_TYPE_33 = 0x21, + TILE_TYPE_34 = 0x22, + TILE_TYPE_35 = 0x23, + TILE_TYPE_36 = 0x24, + TILE_TYPE_37 = 0x25, + TILE_TYPE_38 = 0x26, + TILE_TYPE_39 = 0x27, + TILE_TYPE_40 = 0x28, + TILE_TYPE_41 = 0x29, + TILE_TYPE_42 = 0x2a, + TILE_TYPE_43 = 0x2b, + TILE_TYPE_44 = 0x2c, + TILE_TYPE_45 = 0x2d, + TILE_TYPE_46 = 0x2e, + TILE_TYPE_47 = 0x2f, + TILE_TYPE_48 = 0x30, + TILE_TYPE_49 = 0x31, + TILE_TYPE_50 = 0x32, + TILE_TYPE_51 = 0x33, + TILE_TYPE_52 = 0x34, + TILE_TYPE_53 = 0x35, + TILE_TYPE_54 = 0x36, + TILE_TYPE_55 = 0x37, + TILE_TYPE_56 = 0x38, + TILE_TYPE_57 = 0x39, + TILE_TYPE_58 = 0x3a, + TILE_TYPE_59 = 0x3b, + TILE_TYPE_60 = 0x3c, + TILE_TYPE_61 = 0x3d, + TILE_TYPE_62 = 0x3e, + TILE_TYPE_63 = 0x3f, + TILE_TYPE_64 = 0x40, + TILE_TYPE_65 = 0x41, + TILE_TYPE_66 = 0x42, + TILE_TYPE_67 = 0x43, + TILE_TYPE_68 = 0x44, + TILE_TYPE_69 = 0x45, + TILE_TYPE_70 = 0x46, + TILE_TYPE_71 = 0x47, + TILE_TYPE_72 = 0x48, + TILE_TYPE_73 = 0x49, + TILE_TYPE_74 = 0x4a, + TILE_TYPE_75 = 0x4b, + TILE_TYPE_76 = 0x4c, + TILE_TYPE_77 = 0x4d, + TILE_TYPE_78 = 0x4e, + TILE_TYPE_79 = 0x4f, + TILE_TYPE_80 = 0x50, + TILE_TYPE_81 = 0x51, + TILE_TYPE_82 = 0x52, + TILE_TYPE_83 = 0x53, + TILE_TYPE_84 = 0x54, + TILE_TYPE_85 = 0x55, // ROCK + TILE_TYPE_86 = 0x56, + TILE_TYPE_87 = 0x57, + TILE_TYPE_88 = 0x58, + TILE_TYPE_89 = 0x59, + TILE_TYPE_90 = 0x5a, + TILE_TYPE_91 = 0x5b, + TILE_TYPE_92 = 0x5c, + TILE_TYPE_93 = 0x5d, + TILE_TYPE_94 = 0x5e, + TILE_TYPE_95 = 0x5f, + TILE_TYPE_96 = 0x60, + TILE_TYPE_97 = 0x61, + TILE_TYPE_98 = 0x62, + TILE_TYPE_99 = 0x63, + TILE_TYPE_100 = 0x64, + TILE_TYPE_101 = 0x65, + TILE_TYPE_102 = 0x66, + TILE_TYPE_103 = 0x67, + TILE_TYPE_104 = 0x68, + TILE_TYPE_105 = 0x69, + TILE_TYPE_106 = 0x6a, + TILE_TYPE_107 = 0x6b, + TILE_TYPE_108 = 0x6c, + TILE_TYPE_109 = 0x6d, + TILE_TYPE_110 = 0x6e, + TILE_TYPE_111 = 0x6f, + TILE_TYPE_112 = 0x70, + TILE_TYPE_113 = 0x71, + TILE_TYPE_114 = 0x72, + TILE_TYPE_115 = 0x73, // CHEST + TILE_TYPE_116 = 0x74, // CHEST_OPEN + TILE_TYPE_117 = 0x75, + TILE_TYPE_118 = 0x76, // TORCH + TILE_TYPE_119 = 0x77, // TORCH_LIT + TILE_TYPE_120 = 0x78, // PRESSURE_BUTTON + TILE_TYPE_121 = 0x79, // PRESSURE_BUTTON_PRESSED + TILE_TYPE_122 = 0x7a, // PRESSURE_SQUARE + TILE_TYPE_123 = 0x7b, // PRESSURE_SQUARE_PRESSED + TILE_TYPE_124 = 0x7c, + TILE_TYPE_125 = 0x7d, + TILE_TYPE_126 = 0x7e, + TILE_TYPE_127 = 0x7f, + TILE_TYPE_128 = 0x80, + TILE_TYPE_129 = 0x81, + TILE_TYPE_130 = 0x82, + TILE_TYPE_131 = 0x83, + TILE_TYPE_132 = 0x84, + TILE_TYPE_133 = 0x85, + TILE_TYPE_134 = 0x86, + TILE_TYPE_135 = 0x87, + TILE_TYPE_136 = 0x88, + TILE_TYPE_137 = 0x89, + TILE_TYPE_138 = 0x8a, + TILE_TYPE_139 = 0x8b, + TILE_TYPE_140 = 0x8c, + TILE_TYPE_141 = 0x8d, + TILE_TYPE_142 = 0x8e, + TILE_TYPE_143 = 0x8f, + TILE_TYPE_144 = 0x90, + TILE_TYPE_145 = 0x91, + TILE_TYPE_146 = 0x92, // STAIRS_UP + TILE_TYPE_147 = 0x93, // STAIRS_DOWN + TILE_TYPE_148 = 0x94, + TILE_TYPE_149 = 0x95, + TILE_TYPE_150 = 0x96, + TILE_TYPE_151 = 0x97, + TILE_TYPE_152 = 0x98, + TILE_TYPE_153 = 0x99, + TILE_TYPE_154 = 0x9a, + TILE_TYPE_155 = 0x9b, + TILE_TYPE_156 = 0x9c, + TILE_TYPE_157 = 0x9d, + TILE_TYPE_158 = 0x9e, + TILE_TYPE_159 = 0x9f, + TILE_TYPE_160 = 0xa0, + TILE_TYPE_161 = 0xa1, + TILE_TYPE_162 = 0xa2, + TILE_TYPE_163 = 0xa3, + TILE_TYPE_164 = 0xa4, + TILE_TYPE_165 = 0xa5, + TILE_TYPE_166 = 0xa6, + TILE_TYPE_167 = 0xa7, + TILE_TYPE_168 = 0xa8, + TILE_TYPE_169 = 0xa9, + TILE_TYPE_170 = 0xaa, + TILE_TYPE_171 = 0xab, + TILE_TYPE_172 = 0xac, + TILE_TYPE_173 = 0xad, + TILE_TYPE_174 = 0xae, + TILE_TYPE_175 = 0xaf, + TILE_TYPE_176 = 0xb0, + TILE_TYPE_177 = 0xb1, + TILE_TYPE_178 = 0xb2, + TILE_TYPE_179 = 0xb3, + TILE_TYPE_180 = 0xb4, + TILE_TYPE_181 = 0xb5, + TILE_TYPE_182 = 0xb6, + TILE_TYPE_183 = 0xb7, + TILE_TYPE_184 = 0xb8, + TILE_TYPE_185 = 0xb9, + TILE_TYPE_186 = 0xba, + TILE_TYPE_187 = 0xbb, + TILE_TYPE_188 = 0xbc, + TILE_TYPE_189 = 0xbd, + TILE_TYPE_190 = 0xbe, + TILE_TYPE_191 = 0xbf, + TILE_TYPE_192 = 0xc0, + TILE_TYPE_193 = 0xc1, + TILE_TYPE_194 = 0xc2, + TILE_TYPE_195 = 0xc3, + TILE_TYPE_196 = 0xc4, + TILE_TYPE_197 = 0xc5, + TILE_TYPE_198 = 0xc6, + TILE_TYPE_199 = 0xc7, + TILE_TYPE_200 = 0xc8, + TILE_TYPE_201 = 0xc9, + TILE_TYPE_202 = 0xca, + TILE_TYPE_203 = 0xcb, + TILE_TYPE_204 = 0xcc, + TILE_TYPE_205 = 0xcd, + TILE_TYPE_206 = 0xce, + TILE_TYPE_207 = 0xcf, + TILE_TYPE_208 = 0xd0, + TILE_TYPE_209 = 0xd1, + TILE_TYPE_210 = 0xd2, + TILE_TYPE_211 = 0xd3, + TILE_TYPE_212 = 0xd4, + TILE_TYPE_213 = 0xd5, + TILE_TYPE_214 = 0xd6, + TILE_TYPE_215 = 0xd7, + TILE_TYPE_216 = 0xd8, + TILE_TYPE_217 = 0xd9, + TILE_TYPE_218 = 0xda, + TILE_TYPE_219 = 0xdb, + TILE_TYPE_220 = 0xdc, + TILE_TYPE_221 = 0xdd, + TILE_TYPE_222 = 0xde, + TILE_TYPE_223 = 0xdf, + TILE_TYPE_224 = 0xe0, + TILE_TYPE_225 = 0xe1, + TILE_TYPE_226 = 0xe2, + TILE_TYPE_227 = 0xe3, + TILE_TYPE_228 = 0xe4, + TILE_TYPE_229 = 0xe5, + TILE_TYPE_230 = 0xe6, + TILE_TYPE_231 = 0xe7, + TILE_TYPE_232 = 0xe8, + TILE_TYPE_233 = 0xe9, + TILE_TYPE_234 = 0xea, + TILE_TYPE_235 = 0xeb, + TILE_TYPE_236 = 0xec, + TILE_TYPE_237 = 0xed, + TILE_TYPE_238 = 0xee, + TILE_TYPE_239 = 0xef, + TILE_TYPE_240 = 0xf0, + TILE_TYPE_241 = 0xf1, + TILE_TYPE_242 = 0xf2, + TILE_TYPE_243 = 0xf3, + TILE_TYPE_244 = 0xf4, + TILE_TYPE_245 = 0xf5, + TILE_TYPE_246 = 0xf6, + TILE_TYPE_247 = 0xf7, + TILE_TYPE_248 = 0xf8, + TILE_TYPE_249 = 0xf9, + TILE_TYPE_250 = 0xfa, + TILE_TYPE_251 = 0xfb, + TILE_TYPE_252 = 0xfc, + TILE_TYPE_253 = 0xfd, + TILE_TYPE_254 = 0xfe, + TILE_TYPE_255 = 0xff, + TILE_TYPE_256 = 0x100, + TILE_TYPE_257 = 0x101, + TILE_TYPE_258 = 0x102, + TILE_TYPE_259 = 0x103, + TILE_TYPE_260 = 0x104, + TILE_TYPE_261 = 0x105, + TILE_TYPE_262 = 0x106, + TILE_TYPE_263 = 0x107, + TILE_TYPE_264 = 0x108, + TILE_TYPE_265 = 0x109, + TILE_TYPE_266 = 0x10a, + TILE_TYPE_267 = 0x10b, + TILE_TYPE_268 = 0x10c, + TILE_TYPE_269 = 0x10d, + TILE_TYPE_270 = 0x10e, + TILE_TYPE_271 = 0x10f, + TILE_TYPE_272 = 0x110, + TILE_TYPE_273 = 0x111, + TILE_TYPE_274 = 0x112, + TILE_TYPE_275 = 0x113, + TILE_TYPE_276 = 0x114, + TILE_TYPE_277 = 0x115, + TILE_TYPE_278 = 0x116, + TILE_TYPE_279 = 0x117, + TILE_TYPE_280 = 0x118, + TILE_TYPE_281 = 0x119, + TILE_TYPE_282 = 0x11a, + TILE_TYPE_283 = 0x11b, + TILE_TYPE_284 = 0x11c, + TILE_TYPE_285 = 0x11d, + TILE_TYPE_286 = 0x11e, + TILE_TYPE_287 = 0x11f, + TILE_TYPE_288 = 0x120, + TILE_TYPE_289 = 0x121, + TILE_TYPE_290 = 0x122, + TILE_TYPE_291 = 0x123, + TILE_TYPE_292 = 0x124, + TILE_TYPE_293 = 0x125, + TILE_TYPE_294 = 0x126, + TILE_TYPE_295 = 0x127, + TILE_TYPE_296 = 0x128, + TILE_TYPE_297 = 0x129, + TILE_TYPE_298 = 0x12a, + TILE_TYPE_299 = 0x12b, + TILE_TYPE_300 = 0x12c, + TILE_TYPE_301 = 0x12d, + TILE_TYPE_302 = 0x12e, + TILE_TYPE_303 = 0x12f, + TILE_TYPE_304 = 0x130, + TILE_TYPE_305 = 0x131, + TILE_TYPE_306 = 0x132, + TILE_TYPE_307 = 0x133, + TILE_TYPE_308 = 0x134, + TILE_TYPE_309 = 0x135, + TILE_TYPE_310 = 0x136, + TILE_TYPE_311 = 0x137, + TILE_TYPE_312 = 0x138, + TILE_TYPE_313 = 0x139, + TILE_TYPE_314 = 0x13a, + TILE_TYPE_315 = 0x13b, + TILE_TYPE_316 = 0x13c, + TILE_TYPE_317 = 0x13d, + TILE_TYPE_318 = 0x13e, + TILE_TYPE_319 = 0x13f, + TILE_TYPE_320 = 0x140, + TILE_TYPE_321 = 0x141, + TILE_TYPE_322 = 0x142, + TILE_TYPE_323 = 0x143, + TILE_TYPE_324 = 0x144, + TILE_TYPE_325 = 0x145, + TILE_TYPE_326 = 0x146, + TILE_TYPE_327 = 0x147, + TILE_TYPE_328 = 0x148, + TILE_TYPE_329 = 0x149, + TILE_TYPE_330 = 0x14a, + TILE_TYPE_331 = 0x14b, + TILE_TYPE_332 = 0x14c, + TILE_TYPE_333 = 0x14d, + TILE_TYPE_334 = 0x14e, + TILE_TYPE_335 = 0x14f, + TILE_TYPE_336 = 0x150, + TILE_TYPE_337 = 0x151, + TILE_TYPE_338 = 0x152, + TILE_TYPE_339 = 0x153, + TILE_TYPE_340 = 0x154, + TILE_TYPE_341 = 0x155, + TILE_TYPE_342 = 0x156, + TILE_TYPE_343 = 0x157, + TILE_TYPE_344 = 0x158, + TILE_TYPE_345 = 0x159, + TILE_TYPE_346 = 0x15a, + TILE_TYPE_347 = 0x15b, + TILE_TYPE_348 = 0x15c, + TILE_TYPE_349 = 0x15d, + TILE_TYPE_350 = 0x15e, + TILE_TYPE_351 = 0x15f, + TILE_TYPE_352 = 0x160, + TILE_TYPE_353 = 0x161, + TILE_TYPE_354 = 0x162, + TILE_TYPE_355 = 0x163, + TILE_TYPE_356 = 0x164, + TILE_TYPE_357 = 0x165, + TILE_TYPE_358 = 0x166, + TILE_TYPE_359 = 0x167, + TILE_TYPE_360 = 0x168, + TILE_TYPE_361 = 0x169, + TILE_TYPE_362 = 0x16a, + TILE_TYPE_363 = 0x16b, + TILE_TYPE_364 = 0x16c, + TILE_TYPE_365 = 0x16d, + TILE_TYPE_366 = 0x16e, + TILE_TYPE_367 = 0x16f, + TILE_TYPE_368 = 0x170, + TILE_TYPE_369 = 0x171, + TILE_TYPE_370 = 0x172, + TILE_TYPE_371 = 0x173, + TILE_TYPE_372 = 0x174, + TILE_TYPE_373 = 0x175, + TILE_TYPE_374 = 0x176, // SIGNPOST + TILE_TYPE_375 = 0x177, + TILE_TYPE_376 = 0x178, + TILE_TYPE_377 = 0x179, + TILE_TYPE_378 = 0x17a, + TILE_TYPE_379 = 0x17b, + TILE_TYPE_380 = 0x17c, + TILE_TYPE_381 = 0x17d, + TILE_TYPE_382 = 0x17e, + TILE_TYPE_383 = 0x17f, + TILE_TYPE_384 = 0x180, + TILE_TYPE_385 = 0x181, + TILE_TYPE_386 = 0x182, + TILE_TYPE_387 = 0x183, + TILE_TYPE_388 = 0x184, + TILE_TYPE_389 = 0x185, + TILE_TYPE_390 = 0x186, + TILE_TYPE_391 = 0x187, + TILE_TYPE_392 = 0x188, + TILE_TYPE_393 = 0x189, + TILE_TYPE_394 = 0x18a, + TILE_TYPE_395 = 0x18b, + TILE_TYPE_396 = 0x18c, + TILE_TYPE_397 = 0x18d, + TILE_TYPE_398 = 0x18e, + TILE_TYPE_399 = 0x18f, + TILE_TYPE_400 = 0x190, + TILE_TYPE_401 = 0x191, + TILE_TYPE_402 = 0x192, + TILE_TYPE_403 = 0x193, + TILE_TYPE_404 = 0x194, + TILE_TYPE_405 = 0x195, + TILE_TYPE_406 = 0x196, + TILE_TYPE_407 = 0x197, + TILE_TYPE_408 = 0x198, + TILE_TYPE_409 = 0x199, + TILE_TYPE_410 = 0x19a, + TILE_TYPE_411 = 0x19b, + TILE_TYPE_412 = 0x19c, + TILE_TYPE_413 = 0x19d, + TILE_TYPE_414 = 0x19e, + TILE_TYPE_415 = 0x19f, + TILE_TYPE_416 = 0x1a0, + TILE_TYPE_417 = 0x1a1, + TILE_TYPE_418 = 0x1a2, + TILE_TYPE_419 = 0x1a3, + TILE_TYPE_420 = 0x1a4, + TILE_TYPE_421 = 0x1a5, + TILE_TYPE_422 = 0x1a6, + TILE_TYPE_423 = 0x1a7, + TILE_TYPE_424 = 0x1a8, + TILE_TYPE_425 = 0x1a9, + TILE_TYPE_426 = 0x1aa, + TILE_TYPE_427 = 0x1ab, + TILE_TYPE_428 = 0x1ac, + TILE_TYPE_429 = 0x1ad, + TILE_TYPE_430 = 0x1ae, + TILE_TYPE_431 = 0x1af, + TILE_TYPE_432 = 0x1b0, + TILE_TYPE_433 = 0x1b1, + TILE_TYPE_434 = 0x1b2, + TILE_TYPE_435 = 0x1b3, + TILE_TYPE_436 = 0x1b4, + TILE_TYPE_437 = 0x1b5, + TILE_TYPE_438 = 0x1b6, + TILE_TYPE_439 = 0x1b7, + TILE_TYPE_440 = 0x1b8, + TILE_TYPE_441 = 0x1b9, + TILE_TYPE_442 = 0x1ba, + TILE_TYPE_443 = 0x1bb, + TILE_TYPE_444 = 0x1bc, + TILE_TYPE_445 = 0x1bd, + TILE_TYPE_446 = 0x1be, + TILE_TYPE_447 = 0x1bf, + TILE_TYPE_448 = 0x1c0, + TILE_TYPE_449 = 0x1c1, + TILE_TYPE_450 = 0x1c2, + TILE_TYPE_451 = 0x1c3, + TILE_TYPE_452 = 0x1c4, + TILE_TYPE_453 = 0x1c5, + TILE_TYPE_454 = 0x1c6, + TILE_TYPE_455 = 0x1c7, + TILE_TYPE_456 = 0x1c8, + TILE_TYPE_457 = 0x1c9, + TILE_TYPE_458 = 0x1ca, + TILE_TYPE_459 = 0x1cb, + TILE_TYPE_460 = 0x1cc, + TILE_TYPE_461 = 0x1cd, + TILE_TYPE_462 = 0x1ce, + TILE_TYPE_463 = 0x1cf, + TILE_TYPE_464 = 0x1d0, + TILE_TYPE_465 = 0x1d1, + TILE_TYPE_466 = 0x1d2, + TILE_TYPE_467 = 0x1d3, // PERMA_ROCK + TILE_TYPE_468 = 0x1d4, // PERMA_ROCK2 + TILE_TYPE_469 = 0x1d5, // PERMA_ROCK3 + TILE_TYPE_470 = 0x1d6, // PERMA_ROCK4 + TILE_TYPE_471 = 0x1d7, + TILE_TYPE_472 = 0x1d8, + TILE_TYPE_473 = 0x1d9, + TILE_TYPE_474 = 0x1da, + TILE_TYPE_475 = 0x1db, + TILE_TYPE_476 = 0x1dc, + TILE_TYPE_477 = 0x1dd, + TILE_TYPE_478 = 0x1de, + TILE_TYPE_479 = 0x1df, + TILE_TYPE_480 = 0x1e0, + TILE_TYPE_481 = 0x1e1, + TILE_TYPE_482 = 0x1e2, + TILE_TYPE_483 = 0x1e3, + TILE_TYPE_484 = 0x1e4, + TILE_TYPE_485 = 0x1e5, + TILE_TYPE_486 = 0x1e6, + TILE_TYPE_487 = 0x1e7, + TILE_TYPE_488 = 0x1e8, + TILE_TYPE_489 = 0x1e9, + TILE_TYPE_490 = 0x1ea, + TILE_TYPE_491 = 0x1eb, + TILE_TYPE_492 = 0x1ec, + TILE_TYPE_493 = 0x1ed, + TILE_TYPE_494 = 0x1ee, + TILE_TYPE_495 = 0x1ef, + TILE_TYPE_496 = 0x1f0, + TILE_TYPE_497 = 0x1f1, + TILE_TYPE_498 = 0x1f2, + TILE_TYPE_499 = 0x1f3, + TILE_TYPE_500 = 0x1f4, + TILE_TYPE_501 = 0x1f5, + TILE_TYPE_502 = 0x1f6, + TILE_TYPE_503 = 0x1f7, + TILE_TYPE_504 = 0x1f8, + TILE_TYPE_505 = 0x1f9, + TILE_TYPE_506 = 0x1fa, + TILE_TYPE_507 = 0x1fb, + TILE_TYPE_508 = 0x1fc, + TILE_TYPE_509 = 0x1fd, + TILE_TYPE_510 = 0x1fe, + TILE_TYPE_511 = 0x1ff, + TILE_TYPE_512 = 0x200, + TILE_TYPE_513 = 0x201, + TILE_TYPE_514 = 0x202, + TILE_TYPE_515 = 0x203, + TILE_TYPE_516 = 0x204, + TILE_TYPE_517 = 0x205, + TILE_TYPE_518 = 0x206, + TILE_TYPE_519 = 0x207, + TILE_TYPE_520 = 0x208, + TILE_TYPE_521 = 0x209, + TILE_TYPE_522 = 0x20a, + TILE_TYPE_523 = 0x20b, + TILE_TYPE_524 = 0x20c, + TILE_TYPE_525 = 0x20d, + TILE_TYPE_526 = 0x20e, + TILE_TYPE_527 = 0x20f, + TILE_TYPE_528 = 0x210, + TILE_TYPE_529 = 0x211, + TILE_TYPE_530 = 0x212, + TILE_TYPE_531 = 0x213, + TILE_TYPE_532 = 0x214, + TILE_TYPE_533 = 0x215, + TILE_TYPE_534 = 0x216, + TILE_TYPE_535 = 0x217, + TILE_TYPE_536 = 0x218, + TILE_TYPE_537 = 0x219, + TILE_TYPE_538 = 0x21a, + TILE_TYPE_539 = 0x21b, + TILE_TYPE_540 = 0x21c, + TILE_TYPE_541 = 0x21d, + TILE_TYPE_542 = 0x21e, + TILE_TYPE_543 = 0x21f, + TILE_TYPE_544 = 0x220, + TILE_TYPE_545 = 0x221, + TILE_TYPE_546 = 0x222, + TILE_TYPE_547 = 0x223, + TILE_TYPE_548 = 0x224, + TILE_TYPE_549 = 0x225, + TILE_TYPE_550 = 0x226, + TILE_TYPE_551 = 0x227, + TILE_TYPE_552 = 0x228, + TILE_TYPE_553 = 0x229, + TILE_TYPE_554 = 0x22a, + TILE_TYPE_555 = 0x22b, + TILE_TYPE_556 = 0x22c, + TILE_TYPE_557 = 0x22d, + TILE_TYPE_558 = 0x22e, + TILE_TYPE_559 = 0x22f, + TILE_TYPE_560 = 0x230, + TILE_TYPE_561 = 0x231, + TILE_TYPE_562 = 0x232, + TILE_TYPE_563 = 0x233, + TILE_TYPE_564 = 0x234, + TILE_TYPE_565 = 0x235, + TILE_TYPE_566 = 0x236, + TILE_TYPE_567 = 0x237, + TILE_TYPE_568 = 0x238, + TILE_TYPE_569 = 0x239, + TILE_TYPE_570 = 0x23a, + TILE_TYPE_571 = 0x23b, + TILE_TYPE_572 = 0x23c, + TILE_TYPE_573 = 0x23d, + TILE_TYPE_574 = 0x23e, + TILE_TYPE_575 = 0x23f, + TILE_TYPE_576 = 0x240, + TILE_TYPE_577 = 0x241, + TILE_TYPE_578 = 0x242, + TILE_TYPE_579 = 0x243, + TILE_TYPE_580 = 0x244, + TILE_TYPE_581 = 0x245, + TILE_TYPE_582 = 0x246, + TILE_TYPE_583 = 0x247, + TILE_TYPE_584 = 0x248, + TILE_TYPE_585 = 0x249, + TILE_TYPE_586 = 0x24a, + TILE_TYPE_587 = 0x24b, + TILE_TYPE_588 = 0x24c, + TILE_TYPE_589 = 0x24d, + TILE_TYPE_590 = 0x24e, + TILE_TYPE_591 = 0x24f, + TILE_TYPE_592 = 0x250, + TILE_TYPE_593 = 0x251, + TILE_TYPE_594 = 0x252, + TILE_TYPE_595 = 0x253, + TILE_TYPE_596 = 0x254, + TILE_TYPE_597 = 0x255, + TILE_TYPE_598 = 0x256, + TILE_TYPE_599 = 0x257, + TILE_TYPE_600 = 0x258, + TILE_TYPE_601 = 0x259, + TILE_TYPE_602 = 0x25a, + TILE_TYPE_603 = 0x25b, + TILE_TYPE_604 = 0x25c, + TILE_TYPE_605 = 0x25d, + TILE_TYPE_606 = 0x25e, + TILE_TYPE_607 = 0x25f, + TILE_TYPE_608 = 0x260, + TILE_TYPE_609 = 0x261, + TILE_TYPE_610 = 0x262, + TILE_TYPE_611 = 0x263, + TILE_TYPE_612 = 0x264, + TILE_TYPE_613 = 0x265, + TILE_TYPE_614 = 0x266, + TILE_TYPE_615 = 0x267, + TILE_TYPE_616 = 0x268, + TILE_TYPE_617 = 0x269, + TILE_TYPE_618 = 0x26a, + TILE_TYPE_619 = 0x26b, + TILE_TYPE_620 = 0x26c, + TILE_TYPE_621 = 0x26d, + TILE_TYPE_622 = 0x26e, + TILE_TYPE_623 = 0x26f, + TILE_TYPE_624 = 0x270, + TILE_TYPE_625 = 0x271, + TILE_TYPE_626 = 0x272, + TILE_TYPE_627 = 0x273, + TILE_TYPE_628 = 0x274, + TILE_TYPE_629 = 0x275, + TILE_TYPE_630 = 0x276, + TILE_TYPE_631 = 0x277, + TILE_TYPE_632 = 0x278, + TILE_TYPE_633 = 0x279, + TILE_TYPE_634 = 0x27a, + TILE_TYPE_635 = 0x27b, + TILE_TYPE_636 = 0x27c, + TILE_TYPE_637 = 0x27d, + TILE_TYPE_638 = 0x27e, + TILE_TYPE_639 = 0x27f, + TILE_TYPE_640 = 0x280, + TILE_TYPE_641 = 0x281, + TILE_TYPE_642 = 0x282, + TILE_TYPE_643 = 0x283, + TILE_TYPE_644 = 0x284, + TILE_TYPE_645 = 0x285, + TILE_TYPE_646 = 0x286, + TILE_TYPE_647 = 0x287, + TILE_TYPE_648 = 0x288, + TILE_TYPE_649 = 0x289, + TILE_TYPE_650 = 0x28a, + TILE_TYPE_651 = 0x28b, + TILE_TYPE_652 = 0x28c, + TILE_TYPE_653 = 0x28d, + TILE_TYPE_654 = 0x28e, + TILE_TYPE_655 = 0x28f, + TILE_TYPE_656 = 0x290, + TILE_TYPE_657 = 0x291, + TILE_TYPE_658 = 0x292, + TILE_TYPE_659 = 0x293, + TILE_TYPE_660 = 0x294, + TILE_TYPE_661 = 0x295, + TILE_TYPE_662 = 0x296, + TILE_TYPE_663 = 0x297, + TILE_TYPE_664 = 0x298, + TILE_TYPE_665 = 0x299, + TILE_TYPE_666 = 0x29a, + TILE_TYPE_667 = 0x29b, + TILE_TYPE_668 = 0x29c, + TILE_TYPE_669 = 0x29d, + TILE_TYPE_670 = 0x29e, + TILE_TYPE_671 = 0x29f, + TILE_TYPE_672 = 0x2a0, + TILE_TYPE_673 = 0x2a1, + TILE_TYPE_674 = 0x2a2, + TILE_TYPE_675 = 0x2a3, + TILE_TYPE_676 = 0x2a4, + TILE_TYPE_677 = 0x2a5, + TILE_TYPE_678 = 0x2a6, + TILE_TYPE_679 = 0x2a7, + TILE_TYPE_680 = 0x2a8, + TILE_TYPE_681 = 0x2a9, + TILE_TYPE_682 = 0x2aa, + TILE_TYPE_683 = 0x2ab, + TILE_TYPE_684 = 0x2ac, + TILE_TYPE_685 = 0x2ad, + TILE_TYPE_686 = 0x2ae, + TILE_TYPE_687 = 0x2af, + TILE_TYPE_688 = 0x2b0, + TILE_TYPE_689 = 0x2b1, + TILE_TYPE_690 = 0x2b2, + TILE_TYPE_691 = 0x2b3, + TILE_TYPE_692 = 0x2b4, + TILE_TYPE_693 = 0x2b5, + TILE_TYPE_694 = 0x2b6, + TILE_TYPE_695 = 0x2b7, + TILE_TYPE_696 = 0x2b8, + TILE_TYPE_697 = 0x2b9, + TILE_TYPE_698 = 0x2ba, + TILE_TYPE_699 = 0x2bb, + TILE_TYPE_700 = 0x2bc, + TILE_TYPE_701 = 0x2bd, + TILE_TYPE_702 = 0x2be, + TILE_TYPE_703 = 0x2bf, + TILE_TYPE_704 = 0x2c0, + TILE_TYPE_705 = 0x2c1, + TILE_TYPE_706 = 0x2c2, + TILE_TYPE_707 = 0x2c3, + TILE_TYPE_708 = 0x2c4, + TILE_TYPE_709 = 0x2c5, + TILE_TYPE_710 = 0x2c6, + TILE_TYPE_711 = 0x2c7, + TILE_TYPE_712 = 0x2c8, + TILE_TYPE_713 = 0x2c9, + TILE_TYPE_714 = 0x2ca, + TILE_TYPE_715 = 0x2cb, + TILE_TYPE_716 = 0x2cc, + TILE_TYPE_717 = 0x2cd, + TILE_TYPE_718 = 0x2ce, + TILE_TYPE_719 = 0x2cf, + TILE_TYPE_720 = 0x2d0, + TILE_TYPE_721 = 0x2d1, + TILE_TYPE_722 = 0x2d2, + TILE_TYPE_723 = 0x2d3, + TILE_TYPE_724 = 0x2d4, + TILE_TYPE_725 = 0x2d5, + TILE_TYPE_726 = 0x2d6, + TILE_TYPE_727 = 0x2d7, + TILE_TYPE_728 = 0x2d8, + TILE_TYPE_729 = 0x2d9, + TILE_TYPE_730 = 0x2da, + TILE_TYPE_731 = 0x2db, + TILE_TYPE_732 = 0x2dc, + TILE_TYPE_733 = 0x2dd, + TILE_TYPE_734 = 0x2de, + TILE_TYPE_735 = 0x2df, + TILE_TYPE_736 = 0x2e0, + TILE_TYPE_737 = 0x2e1, + TILE_TYPE_738 = 0x2e2, + TILE_TYPE_739 = 0x2e3, + TILE_TYPE_740 = 0x2e4, + TILE_TYPE_741 = 0x2e5, + TILE_TYPE_742 = 0x2e6, + TILE_TYPE_743 = 0x2e7, + TILE_TYPE_744 = 0x2e8, + TILE_TYPE_745 = 0x2e9, + TILE_TYPE_746 = 0x2ea, + TILE_TYPE_747 = 0x2eb, + TILE_TYPE_748 = 0x2ec, + TILE_TYPE_749 = 0x2ed, + TILE_TYPE_750 = 0x2ee, + TILE_TYPE_751 = 0x2ef, + TILE_TYPE_752 = 0x2f0, + TILE_TYPE_753 = 0x2f1, + TILE_TYPE_754 = 0x2f2, + TILE_TYPE_755 = 0x2f3, + TILE_TYPE_756 = 0x2f4, + TILE_TYPE_757 = 0x2f5, + TILE_TYPE_758 = 0x2f6, + TILE_TYPE_759 = 0x2f7, + TILE_TYPE_760 = 0x2f8, + TILE_TYPE_761 = 0x2f9, + TILE_TYPE_762 = 0x2fa, + TILE_TYPE_763 = 0x2fb, + TILE_TYPE_764 = 0x2fc, + TILE_TYPE_765 = 0x2fd, + TILE_TYPE_766 = 0x2fe, + TILE_TYPE_767 = 0x2ff, + TILE_TYPE_768 = 0x300, + TILE_TYPE_769 = 0x301, + TILE_TYPE_770 = 0x302, + TILE_TYPE_771 = 0x303, + TILE_TYPE_772 = 0x304, + TILE_TYPE_773 = 0x305, + TILE_TYPE_774 = 0x306, + TILE_TYPE_775 = 0x307, + TILE_TYPE_776 = 0x308, + TILE_TYPE_777 = 0x309, + TILE_TYPE_778 = 0x30a, + TILE_TYPE_779 = 0x30b, + TILE_TYPE_780 = 0x30c, + TILE_TYPE_781 = 0x30d, + TILE_TYPE_782 = 0x30e, + TILE_TYPE_783 = 0x30f, + TILE_TYPE_784 = 0x310, + TILE_TYPE_785 = 0x311, + TILE_TYPE_786 = 0x312, + TILE_TYPE_787 = 0x313, + TILE_TYPE_788 = 0x314, + TILE_TYPE_789 = 0x315, + TILE_TYPE_790 = 0x316, + TILE_TYPE_791 = 0x317, // RED_TILE + TILE_TYPE_792 = 0x318, // BLUE_TILE + TILE_TYPE_793 = 0x319, + TILE_TYPE_794 = 0x31a, + TILE_TYPE_795 = 0x31b, + TILE_TYPE_796 = 0x31c, + TILE_TYPE_797 = 0x31d, + TILE_TYPE_798 = 0x31e, + TILE_TYPE_799 = 0x31f, + TILE_TYPE_800 = 0x320, + TILE_TYPE_801 = 0x321, + TILE_TYPE_802 = 0x322, + TILE_TYPE_803 = 0x323, + TILE_TYPE_804 = 0x324, + TILE_TYPE_805 = 0x325, + TILE_TYPE_806 = 0x326, + TILE_TYPE_807 = 0x327, + TILE_TYPE_808 = 0x328, + TILE_TYPE_809 = 0x329, + TILE_TYPE_810 = 0x32a, + TILE_TYPE_811 = 0x32b, + TILE_TYPE_812 = 0x32c, + TILE_TYPE_813 = 0x32d, + TILE_TYPE_814 = 0x32e, + TILE_TYPE_815 = 0x32f, + TILE_TYPE_816 = 0x330, + TILE_TYPE_817 = 0x331, + TILE_TYPE_818 = 0x332, + TILE_TYPE_819 = 0x333, + TILE_TYPE_820 = 0x334, + TILE_TYPE_821 = 0x335, + TILE_TYPE_822 = 0x336, + TILE_TYPE_823 = 0x337, + TILE_TYPE_824 = 0x338, + TILE_TYPE_825 = 0x339, + TILE_TYPE_826 = 0x33a, + TILE_TYPE_827 = 0x33b, + TILE_TYPE_828 = 0x33c, + TILE_TYPE_829 = 0x33d, + TILE_TYPE_830 = 0x33e, + TILE_TYPE_831 = 0x33f, + TILE_TYPE_832 = 0x340, + TILE_TYPE_833 = 0x341, + TILE_TYPE_834 = 0x342, + TILE_TYPE_835 = 0x343, + TILE_TYPE_836 = 0x344, + TILE_TYPE_837 = 0x345, + TILE_TYPE_838 = 0x346, + TILE_TYPE_839 = 0x347, + TILE_TYPE_840 = 0x348, + TILE_TYPE_841 = 0x349, + TILE_TYPE_842 = 0x34a, + TILE_TYPE_843 = 0x34b, + TILE_TYPE_844 = 0x34c, + TILE_TYPE_845 = 0x34d, + TILE_TYPE_846 = 0x34e, + TILE_TYPE_847 = 0x34f, + TILE_TYPE_848 = 0x350, + TILE_TYPE_849 = 0x351, + TILE_TYPE_850 = 0x352, + TILE_TYPE_851 = 0x353, + TILE_TYPE_852 = 0x354, + TILE_TYPE_853 = 0x355, + TILE_TYPE_854 = 0x356, + TILE_TYPE_855 = 0x357, + TILE_TYPE_856 = 0x358, + TILE_TYPE_857 = 0x359, + TILE_TYPE_858 = 0x35a, + TILE_TYPE_859 = 0x35b, + TILE_TYPE_860 = 0x35c, + TILE_TYPE_861 = 0x35d, + TILE_TYPE_862 = 0x35e, + TILE_TYPE_863 = 0x35f, + TILE_TYPE_864 = 0x360, + TILE_TYPE_865 = 0x361, + TILE_TYPE_866 = 0x362, + TILE_TYPE_867 = 0x363, + TILE_TYPE_868 = 0x364, + TILE_TYPE_869 = 0x365, + TILE_TYPE_870 = 0x366, + TILE_TYPE_871 = 0x367, + TILE_TYPE_872 = 0x368, + TILE_TYPE_873 = 0x369, + TILE_TYPE_874 = 0x36a, + TILE_TYPE_875 = 0x36b, + TILE_TYPE_876 = 0x36c, + TILE_TYPE_877 = 0x36d, + TILE_TYPE_878 = 0x36e, + TILE_TYPE_879 = 0x36f, + TILE_TYPE_880 = 0x370, + TILE_TYPE_881 = 0x371, + TILE_TYPE_882 = 0x372, + TILE_TYPE_883 = 0x373, + TILE_TYPE_884 = 0x374, + TILE_TYPE_885 = 0x375, + TILE_TYPE_886 = 0x376, + TILE_TYPE_887 = 0x377, + TILE_TYPE_888 = 0x378, + TILE_TYPE_889 = 0x379, + TILE_TYPE_890 = 0x37a, + TILE_TYPE_891 = 0x37b, + TILE_TYPE_892 = 0x37c, + TILE_TYPE_893 = 0x37d, + TILE_TYPE_894 = 0x37e, + TILE_TYPE_895 = 0x37f, + TILE_TYPE_896 = 0x380, + TILE_TYPE_897 = 0x381, + TILE_TYPE_898 = 0x382, + TILE_TYPE_899 = 0x383, + TILE_TYPE_900 = 0x384, + TILE_TYPE_901 = 0x385, + TILE_TYPE_902 = 0x386, + TILE_TYPE_903 = 0x387, + TILE_TYPE_904 = 0x388, + TILE_TYPE_905 = 0x389, + TILE_TYPE_906 = 0x38a, + TILE_TYPE_907 = 0x38b, + TILE_TYPE_908 = 0x38c, + TILE_TYPE_909 = 0x38d, + TILE_TYPE_910 = 0x38e, + TILE_TYPE_911 = 0x38f, + TILE_TYPE_912 = 0x390, + TILE_TYPE_913 = 0x391, + TILE_TYPE_914 = 0x392, + TILE_TYPE_915 = 0x393, + TILE_TYPE_916 = 0x394, + TILE_TYPE_917 = 0x395, + TILE_TYPE_918 = 0x396, + TILE_TYPE_919 = 0x397, + TILE_TYPE_920 = 0x398, + TILE_TYPE_921 = 0x399, + TILE_TYPE_922 = 0x39a, + TILE_TYPE_923 = 0x39b, + TILE_TYPE_924 = 0x39c, + TILE_TYPE_925 = 0x39d, + TILE_TYPE_926 = 0x39e, + TILE_TYPE_927 = 0x39f, + TILE_TYPE_928 = 0x3a0, + TILE_TYPE_929 = 0x3a1, + TILE_TYPE_930 = 0x3a2, + TILE_TYPE_931 = 0x3a3, + TILE_TYPE_932 = 0x3a4, + TILE_TYPE_933 = 0x3a5, + TILE_TYPE_934 = 0x3a6, + TILE_TYPE_935 = 0x3a7, + TILE_TYPE_936 = 0x3a8, + TILE_TYPE_937 = 0x3a9, + TILE_TYPE_938 = 0x3aa, + TILE_TYPE_939 = 0x3ab, + TILE_TYPE_940 = 0x3ac, + TILE_TYPE_941 = 0x3ad, + TILE_TYPE_942 = 0x3ae, + TILE_TYPE_943 = 0x3af, + TILE_TYPE_944 = 0x3b0, + TILE_TYPE_945 = 0x3b1, + TILE_TYPE_946 = 0x3b2, + TILE_TYPE_947 = 0x3b3, + TILE_TYPE_948 = 0x3b4, + TILE_TYPE_949 = 0x3b5, + TILE_TYPE_950 = 0x3b6, + TILE_TYPE_951 = 0x3b7, + TILE_TYPE_952 = 0x3b8, + TILE_TYPE_953 = 0x3b9, + TILE_TYPE_954 = 0x3ba, + TILE_TYPE_955 = 0x3bb, + TILE_TYPE_956 = 0x3bc, + TILE_TYPE_957 = 0x3bd, + TILE_TYPE_958 = 0x3be, + TILE_TYPE_959 = 0x3bf, + TILE_TYPE_960 = 0x3c0, + TILE_TYPE_961 = 0x3c1, + TILE_TYPE_962 = 0x3c2, + TILE_TYPE_963 = 0x3c3, + TILE_TYPE_964 = 0x3c4, + TILE_TYPE_965 = 0x3c5, + TILE_TYPE_966 = 0x3c6, + TILE_TYPE_967 = 0x3c7, + TILE_TYPE_968 = 0x3c8, + TILE_TYPE_969 = 0x3c9, + TILE_TYPE_970 = 0x3ca, + TILE_TYPE_971 = 0x3cb, + TILE_TYPE_972 = 0x3cc, + TILE_TYPE_973 = 0x3cd, + TILE_TYPE_974 = 0x3ce, + TILE_TYPE_975 = 0x3cf, + TILE_TYPE_976 = 0x3d0, + TILE_TYPE_977 = 0x3d1, + TILE_TYPE_978 = 0x3d2, + TILE_TYPE_979 = 0x3d3, + TILE_TYPE_980 = 0x3d4, + TILE_TYPE_981 = 0x3d5, + TILE_TYPE_982 = 0x3d6, + TILE_TYPE_983 = 0x3d7, + TILE_TYPE_984 = 0x3d8, + TILE_TYPE_985 = 0x3d9, + TILE_TYPE_986 = 0x3da, + TILE_TYPE_987 = 0x3db, + TILE_TYPE_988 = 0x3dc, + TILE_TYPE_989 = 0x3dd, + TILE_TYPE_990 = 0x3de, + TILE_TYPE_991 = 0x3df, + TILE_TYPE_992 = 0x3e0, + TILE_TYPE_993 = 0x3e1, + TILE_TYPE_994 = 0x3e2, + TILE_TYPE_995 = 0x3e3, + TILE_TYPE_996 = 0x3e4, + TILE_TYPE_997 = 0x3e5, + TILE_TYPE_998 = 0x3e6, + TILE_TYPE_999 = 0x3e7, + TILE_TYPE_1000 = 0x3e8, + TILE_TYPE_1001 = 0x3e9, + TILE_TYPE_1002 = 0x3ea, + TILE_TYPE_1003 = 0x3eb, + TILE_TYPE_1004 = 0x3ec, + TILE_TYPE_1005 = 0x3ed, + TILE_TYPE_1006 = 0x3ee, + TILE_TYPE_1007 = 0x3ef, + TILE_TYPE_1008 = 0x3f0, + TILE_TYPE_1009 = 0x3f1, + TILE_TYPE_1010 = 0x3f2, + TILE_TYPE_1011 = 0x3f3, + TILE_TYPE_1012 = 0x3f4, + TILE_TYPE_1013 = 0x3f5, + TILE_TYPE_1014 = 0x3f6, + TILE_TYPE_1015 = 0x3f7, + TILE_TYPE_1016 = 0x3f8, + TILE_TYPE_1017 = 0x3f9, + TILE_TYPE_1018 = 0x3fa, + TILE_TYPE_1019 = 0x3fb, + TILE_TYPE_1020 = 0x3fc, + TILE_TYPE_1021 = 0x3fd, + TILE_TYPE_1022 = 0x3fe, + TILE_TYPE_1023 = 0x3ff, + TILE_TYPE_1024 = 0x400, + TILE_TYPE_1025 = 0x401, + TILE_TYPE_1026 = 0x402, + TILE_TYPE_1027 = 0x403, + TILE_TYPE_1028 = 0x404, + TILE_TYPE_1029 = 0x405, + TILE_TYPE_1030 = 0x406, + TILE_TYPE_1031 = 0x407, + TILE_TYPE_1032 = 0x408, + TILE_TYPE_1033 = 0x409, + TILE_TYPE_1034 = 0x40a, + TILE_TYPE_1035 = 0x40b, + TILE_TYPE_1036 = 0x40c, + TILE_TYPE_1037 = 0x40d, + TILE_TYPE_1038 = 0x40e, + TILE_TYPE_1039 = 0x40f, + TILE_TYPE_1040 = 0x410, + TILE_TYPE_1041 = 0x411, + TILE_TYPE_1042 = 0x412, + TILE_TYPE_1043 = 0x413, + TILE_TYPE_1044 = 0x414, + TILE_TYPE_1045 = 0x415, + TILE_TYPE_1046 = 0x416, + TILE_TYPE_1047 = 0x417, + TILE_TYPE_1048 = 0x418, + TILE_TYPE_1049 = 0x419, + TILE_TYPE_1050 = 0x41a, + TILE_TYPE_1051 = 0x41b, + TILE_TYPE_1052 = 0x41c, + TILE_TYPE_1053 = 0x41d, + TILE_TYPE_1054 = 0x41e, + TILE_TYPE_1055 = 0x41f, + TILE_TYPE_1056 = 0x420, + TILE_TYPE_1057 = 0x421, + TILE_TYPE_1058 = 0x422, + TILE_TYPE_1059 = 0x423, + TILE_TYPE_1060 = 0x424, + TILE_TYPE_1061 = 0x425, + TILE_TYPE_1062 = 0x426, + TILE_TYPE_1063 = 0x427, + TILE_TYPE_1064 = 0x428, + TILE_TYPE_1065 = 0x429, + TILE_TYPE_1066 = 0x42a, + TILE_TYPE_1067 = 0x42b, + TILE_TYPE_1068 = 0x42c, + TILE_TYPE_1069 = 0x42d, + TILE_TYPE_1070 = 0x42e, + TILE_TYPE_1071 = 0x42f, + TILE_TYPE_1072 = 0x430, + TILE_TYPE_1073 = 0x431, + TILE_TYPE_1074 = 0x432, + TILE_TYPE_1075 = 0x433, + TILE_TYPE_1076 = 0x434, + TILE_TYPE_1077 = 0x435, + TILE_TYPE_1078 = 0x436, + TILE_TYPE_1079 = 0x437, + TILE_TYPE_1080 = 0x438, + TILE_TYPE_1081 = 0x439, + TILE_TYPE_1082 = 0x43a, + TILE_TYPE_1083 = 0x43b, + TILE_TYPE_1084 = 0x43c, + TILE_TYPE_1085 = 0x43d, + TILE_TYPE_1086 = 0x43e, + TILE_TYPE_1087 = 0x43f, + TILE_TYPE_1088 = 0x440, + TILE_TYPE_1089 = 0x441, + TILE_TYPE_1090 = 0x442, + TILE_TYPE_1091 = 0x443, + TILE_TYPE_1092 = 0x444, + TILE_TYPE_1093 = 0x445, + TILE_TYPE_1094 = 0x446, + TILE_TYPE_1095 = 0x447, + TILE_TYPE_1096 = 0x448, + TILE_TYPE_1097 = 0x449, + TILE_TYPE_1098 = 0x44a, + TILE_TYPE_1099 = 0x44b, + TILE_TYPE_1100 = 0x44c, + TILE_TYPE_1101 = 0x44d, + TILE_TYPE_1102 = 0x44e, + TILE_TYPE_1103 = 0x44f, + TILE_TYPE_1104 = 0x450, + TILE_TYPE_1105 = 0x451, + TILE_TYPE_1106 = 0x452, + TILE_TYPE_1107 = 0x453, + TILE_TYPE_1108 = 0x454, + TILE_TYPE_1109 = 0x455, + TILE_TYPE_1110 = 0x456, + TILE_TYPE_1111 = 0x457, + TILE_TYPE_1112 = 0x458, + TILE_TYPE_1113 = 0x459, + TILE_TYPE_1114 = 0x45a, + TILE_TYPE_1115 = 0x45b, + TILE_TYPE_1116 = 0x45c, + TILE_TYPE_1117 = 0x45d, + TILE_TYPE_1118 = 0x45e, + TILE_TYPE_1119 = 0x45f, + TILE_TYPE_1120 = 0x460, + TILE_TYPE_1121 = 0x461, + TILE_TYPE_1122 = 0x462, + TILE_TYPE_1123 = 0x463, + TILE_TYPE_1124 = 0x464, + TILE_TYPE_1125 = 0x465, + TILE_TYPE_1126 = 0x466, + TILE_TYPE_1127 = 0x467, + TILE_TYPE_1128 = 0x468, + TILE_TYPE_1129 = 0x469, + TILE_TYPE_1130 = 0x46a, + TILE_TYPE_1131 = 0x46b, + TILE_TYPE_1132 = 0x46c, + TILE_TYPE_1133 = 0x46d, + TILE_TYPE_1134 = 0x46e, + TILE_TYPE_1135 = 0x46f, + TILE_TYPE_1136 = 0x470, + TILE_TYPE_1137 = 0x471, + TILE_TYPE_1138 = 0x472, + TILE_TYPE_1139 = 0x473, + TILE_TYPE_1140 = 0x474, + TILE_TYPE_1141 = 0x475, + TILE_TYPE_1142 = 0x476, + TILE_TYPE_1143 = 0x477, + TILE_TYPE_1144 = 0x478, + TILE_TYPE_1145 = 0x479, + TILE_TYPE_1146 = 0x47a, + TILE_TYPE_1147 = 0x47b, + TILE_TYPE_1148 = 0x47c, + TILE_TYPE_1149 = 0x47d, + TILE_TYPE_1150 = 0x47e, + TILE_TYPE_1151 = 0x47f, + TILE_TYPE_1152 = 0x480, + TILE_TYPE_1153 = 0x481, + TILE_TYPE_1154 = 0x482, + TILE_TYPE_1155 = 0x483, + TILE_TYPE_1156 = 0x484, + TILE_TYPE_1157 = 0x485, + TILE_TYPE_1158 = 0x486, + TILE_TYPE_1159 = 0x487, + TILE_TYPE_1160 = 0x488, + TILE_TYPE_1161 = 0x489, + TILE_TYPE_1162 = 0x48a, + TILE_TYPE_1163 = 0x48b, + TILE_TYPE_1164 = 0x48c, + TILE_TYPE_1165 = 0x48d, + TILE_TYPE_1166 = 0x48e, + TILE_TYPE_1167 = 0x48f, + TILE_TYPE_1168 = 0x490, + TILE_TYPE_1169 = 0x491, + TILE_TYPE_1170 = 0x492, + TILE_TYPE_1171 = 0x493, + TILE_TYPE_1172 = 0x494, + TILE_TYPE_1173 = 0x495, + TILE_TYPE_1174 = 0x496, + TILE_TYPE_1175 = 0x497, + TILE_TYPE_1176 = 0x498, + TILE_TYPE_1177 = 0x499, + TILE_TYPE_1178 = 0x49a, + TILE_TYPE_1179 = 0x49b, + TILE_TYPE_1180 = 0x49c, + TILE_TYPE_1181 = 0x49d, + TILE_TYPE_1182 = 0x49e, + TILE_TYPE_1183 = 0x49f, + TILE_TYPE_1184 = 0x4a0, + TILE_TYPE_1185 = 0x4a1, + TILE_TYPE_1186 = 0x4a2, + TILE_TYPE_1187 = 0x4a3, + TILE_TYPE_1188 = 0x4a4, + TILE_TYPE_1189 = 0x4a5, + TILE_TYPE_1190 = 0x4a6, + TILE_TYPE_1191 = 0x4a7, + TILE_TYPE_1192 = 0x4a8, + TILE_TYPE_1193 = 0x4a9, + TILE_TYPE_1194 = 0x4aa, + TILE_TYPE_1195 = 0x4ab, + TILE_TYPE_1196 = 0x4ac, + TILE_TYPE_1197 = 0x4ad, + TILE_TYPE_1198 = 0x4ae, + TILE_TYPE_1199 = 0x4af, + TILE_TYPE_1200 = 0x4b0, + TILE_TYPE_1201 = 0x4b1, + TILE_TYPE_1202 = 0x4b2, + TILE_TYPE_1203 = 0x4b3, + TILE_TYPE_1204 = 0x4b4, + TILE_TYPE_1205 = 0x4b5, + TILE_TYPE_1206 = 0x4b6, + TILE_TYPE_1207 = 0x4b7, + TILE_TYPE_1208 = 0x4b8, + TILE_TYPE_1209 = 0x4b9, + TILE_TYPE_1210 = 0x4ba, + TILE_TYPE_1211 = 0x4bb, + TILE_TYPE_1212 = 0x4bc, + TILE_TYPE_1213 = 0x4bd, + TILE_TYPE_1214 = 0x4be, + TILE_TYPE_1215 = 0x4bf, + TILE_TYPE_1216 = 0x4c0, + TILE_TYPE_1217 = 0x4c1, + TILE_TYPE_1218 = 0x4c2, + TILE_TYPE_1219 = 0x4c3, + TILE_TYPE_1220 = 0x4c4, + TILE_TYPE_1221 = 0x4c5, + TILE_TYPE_1222 = 0x4c6, + TILE_TYPE_1223 = 0x4c7, + TILE_TYPE_1224 = 0x4c8, + TILE_TYPE_1225 = 0x4c9, + TILE_TYPE_1226 = 0x4ca, + TILE_TYPE_1227 = 0x4cb, + TILE_TYPE_1228 = 0x4cc, + TILE_TYPE_1229 = 0x4cd, + TILE_TYPE_1230 = 0x4ce, + TILE_TYPE_1231 = 0x4cf, + TILE_TYPE_1232 = 0x4d0, + TILE_TYPE_1233 = 0x4d1, + TILE_TYPE_1234 = 0x4d2, + TILE_TYPE_1235 = 0x4d3, + TILE_TYPE_1236 = 0x4d4, + TILE_TYPE_1237 = 0x4d5, + TILE_TYPE_1238 = 0x4d6, + TILE_TYPE_1239 = 0x4d7, + TILE_TYPE_1240 = 0x4d8, + TILE_TYPE_1241 = 0x4d9, + TILE_TYPE_1242 = 0x4da, + TILE_TYPE_1243 = 0x4db, + TILE_TYPE_1244 = 0x4dc, + TILE_TYPE_1245 = 0x4dd, + TILE_TYPE_1246 = 0x4de, + TILE_TYPE_1247 = 0x4df, + TILE_TYPE_1248 = 0x4e0, + TILE_TYPE_1249 = 0x4e1, + TILE_TYPE_1250 = 0x4e2, + TILE_TYPE_1251 = 0x4e3, + TILE_TYPE_1252 = 0x4e4, + TILE_TYPE_1253 = 0x4e5, + TILE_TYPE_1254 = 0x4e6, + TILE_TYPE_1255 = 0x4e7, + TILE_TYPE_1256 = 0x4e8, + TILE_TYPE_1257 = 0x4e9, + TILE_TYPE_1258 = 0x4ea, + TILE_TYPE_1259 = 0x4eb, + TILE_TYPE_1260 = 0x4ec, + TILE_TYPE_1261 = 0x4ed, + TILE_TYPE_1262 = 0x4ee, + TILE_TYPE_1263 = 0x4ef, + TILE_TYPE_1264 = 0x4f0, + TILE_TYPE_1265 = 0x4f1, + TILE_TYPE_1266 = 0x4f2, + TILE_TYPE_1267 = 0x4f3, + TILE_TYPE_1268 = 0x4f4, + TILE_TYPE_1269 = 0x4f5, + TILE_TYPE_1270 = 0x4f6, + TILE_TYPE_1271 = 0x4f7, + TILE_TYPE_1272 = 0x4f8, + TILE_TYPE_1273 = 0x4f9, + TILE_TYPE_1274 = 0x4fa, + TILE_TYPE_1275 = 0x4fb, + TILE_TYPE_1276 = 0x4fc, + TILE_TYPE_1277 = 0x4fd, + TILE_TYPE_1278 = 0x4fe, + TILE_TYPE_1279 = 0x4ff, + TILE_TYPE_1280 = 0x500, + TILE_TYPE_1281 = 0x501, + TILE_TYPE_1282 = 0x502, + TILE_TYPE_1283 = 0x503, + TILE_TYPE_1284 = 0x504, + TILE_TYPE_1285 = 0x505, + TILE_TYPE_1286 = 0x506, + TILE_TYPE_1287 = 0x507, + TILE_TYPE_1288 = 0x508, + TILE_TYPE_1289 = 0x509, + TILE_TYPE_1290 = 0x50a, + TILE_TYPE_1291 = 0x50b, + TILE_TYPE_1292 = 0x50c, + TILE_TYPE_1293 = 0x50d, + TILE_TYPE_1294 = 0x50e, + TILE_TYPE_1295 = 0x50f, + TILE_TYPE_1296 = 0x510, + TILE_TYPE_1297 = 0x511, + TILE_TYPE_1298 = 0x512, + TILE_TYPE_1299 = 0x513, + TILE_TYPE_1300 = 0x514, + TILE_TYPE_1301 = 0x515, + TILE_TYPE_1302 = 0x516, + TILE_TYPE_1303 = 0x517, + TILE_TYPE_1304 = 0x518, + TILE_TYPE_1305 = 0x519, + TILE_TYPE_1306 = 0x51a, + TILE_TYPE_1307 = 0x51b, + TILE_TYPE_1308 = 0x51c, + TILE_TYPE_1309 = 0x51d, + TILE_TYPE_1310 = 0x51e, + TILE_TYPE_1311 = 0x51f, + TILE_TYPE_1312 = 0x520, + TILE_TYPE_1313 = 0x521, + TILE_TYPE_1314 = 0x522, + TILE_TYPE_1315 = 0x523, + TILE_TYPE_1316 = 0x524, + TILE_TYPE_1317 = 0x525, + TILE_TYPE_1318 = 0x526, + TILE_TYPE_1319 = 0x527, + TILE_TYPE_1320 = 0x528, + TILE_TYPE_1321 = 0x529, + TILE_TYPE_1322 = 0x52a, + TILE_TYPE_1323 = 0x52b, + TILE_TYPE_1324 = 0x52c, + TILE_TYPE_1325 = 0x52d, + TILE_TYPE_1326 = 0x52e, + TILE_TYPE_1327 = 0x52f, + TILE_TYPE_1328 = 0x530, + TILE_TYPE_1329 = 0x531, + TILE_TYPE_1330 = 0x532, + TILE_TYPE_1331 = 0x533, + TILE_TYPE_1332 = 0x534, + TILE_TYPE_1333 = 0x535, + TILE_TYPE_1334 = 0x536, + TILE_TYPE_1335 = 0x537, + TILE_TYPE_1336 = 0x538, + TILE_TYPE_1337 = 0x539, + TILE_TYPE_1338 = 0x53a, + TILE_TYPE_1339 = 0x53b, + TILE_TYPE_1340 = 0x53c, + TILE_TYPE_1341 = 0x53d, + TILE_TYPE_1342 = 0x53e, + TILE_TYPE_1343 = 0x53f, + TILE_TYPE_1344 = 0x540, + TILE_TYPE_1345 = 0x541, + TILE_TYPE_1346 = 0x542, + TILE_TYPE_1347 = 0x543, + TILE_TYPE_1348 = 0x544, + TILE_TYPE_1349 = 0x545, + TILE_TYPE_1350 = 0x546, + TILE_TYPE_1351 = 0x547, + TILE_TYPE_1352 = 0x548, + TILE_TYPE_1353 = 0x549, + TILE_TYPE_1354 = 0x54a, + TILE_TYPE_1355 = 0x54b, + TILE_TYPE_1356 = 0x54c, + TILE_TYPE_1357 = 0x54d, + TILE_TYPE_1358 = 0x54e, + TILE_TYPE_1359 = 0x54f, + TILE_TYPE_1360 = 0x550, + TILE_TYPE_1361 = 0x551, + TILE_TYPE_1362 = 0x552, + TILE_TYPE_1363 = 0x553, + TILE_TYPE_1364 = 0x554, + TILE_TYPE_1365 = 0x555, + TILE_TYPE_1366 = 0x556, + TILE_TYPE_1367 = 0x557, + TILE_TYPE_1368 = 0x558, + TILE_TYPE_1369 = 0x559, + TILE_TYPE_1370 = 0x55a, + TILE_TYPE_1371 = 0x55b, + TILE_TYPE_1372 = 0x55c, + TILE_TYPE_1373 = 0x55d, + TILE_TYPE_1374 = 0x55e, + TILE_TYPE_1375 = 0x55f, + TILE_TYPE_1376 = 0x560, + TILE_TYPE_1377 = 0x561, + TILE_TYPE_1378 = 0x562, + TILE_TYPE_1379 = 0x563, + TILE_TYPE_1380 = 0x564, + TILE_TYPE_1381 = 0x565, + TILE_TYPE_1382 = 0x566, + TILE_TYPE_1383 = 0x567, + TILE_TYPE_1384 = 0x568, + TILE_TYPE_1385 = 0x569, + TILE_TYPE_1386 = 0x56a, + TILE_TYPE_1387 = 0x56b, + TILE_TYPE_1388 = 0x56c, + TILE_TYPE_1389 = 0x56d, + TILE_TYPE_1390 = 0x56e, + TILE_TYPE_1391 = 0x56f, + TILE_TYPE_1392 = 0x570, + TILE_TYPE_1393 = 0x571, + TILE_TYPE_1394 = 0x572, + TILE_TYPE_1395 = 0x573, +} TileType; typedef enum { - CUT_BUSH = 0x1C, - CUT_GRASS = 0x1D, - CUT_SIGNPOST = 0x1E, - CUT_TREE = 0x1F, - ROCK = 0x55, - CHEST = 0x73, - CHEST_OPEN = 0x74, - TORCH = 0x76, - TORCH_LIT = 0x77, - PRESSURE_BUTTON = 0x78, - PRESSURE_BUTTON_PRESSED = 0x79, - PRESSURE_SQUARE = 0x7a, - PRESSURE_SQUARE_PRESSED = 0x7b, - STAIRS_UP = 0x92, - STAIRS_DOWN = 0x93, - SIGNPOST = 0x176, - PERMA_ROCK = 0x1D3, - PERMA_ROCK2 = 0x1D4, - PERMA_ROCK3 = 0x1D5, - PERMA_ROCK4 = 0x1D6, -} Tile; + SPECIAL_TILE_0 = 0x4000, // Pots + SPECIAL_TILE_1 = 0x4001, // Move Pot Up + SPECIAL_TILE_2 = 0x4002, // Move Pot Right + SPECIAL_TILE_3 = 0x4003, // Move Pot Down + SPECIAL_TILE_4 = 0x4004, // Move Pot Left + SPECIAL_TILE_5 = 0x4005, + SPECIAL_TILE_6 = 0x4006, + SPECIAL_TILE_7 = 0x4007, + SPECIAL_TILE_8 = 0x4008, + SPECIAL_TILE_9 = 0x4009, + SPECIAL_TILE_10 = 0x400a, + SPECIAL_TILE_11 = 0x400b, // Statues/ Pillar Gates + SPECIAL_TILE_12 = 0x400c, // Move Statue Up + SPECIAL_TILE_13 = 0x400d, // Move Statue Right + SPECIAL_TILE_14 = 0x400e, // Move Statue Down + SPECIAL_TILE_15 = 0x400f, // Move Statue Left + SPECIAL_TILE_16 = 0x4010, + SPECIAL_TILE_17 = 0x4011, + SPECIAL_TILE_18 = 0x4012, + SPECIAL_TILE_19 = 0x4013, + SPECIAL_TILE_20 = 0x4014, // Beanstalk/Ladder Top (Transition) + SPECIAL_TILE_21 = 0x4015, // Boulder in Hole + SPECIAL_TILE_22 = 0x4016, + SPECIAL_TILE_23 = 0x4017, // Beanstalk/Ladder + SPECIAL_TILE_24 = 0x4018, + SPECIAL_TILE_25 = 0x4019, + SPECIAL_TILE_26 = 0x401a, + SPECIAL_TILE_27 = 0x401b, // Boulder + SPECIAL_TILE_28 = 0x401c, // Move Bolder Up + SPECIAL_TILE_29 = 0x401d, // Move Bolder Right + SPECIAL_TILE_30 = 0x401e, // Move Bolder Down + SPECIAL_TILE_31 = 0x401f, // Move Bolder Left + SPECIAL_TILE_32 = 0x4020, // Spring hole (Cane shot hole) + SPECIAL_TILE_33 = 0x4021, + SPECIAL_TILE_34 = 0x4022, // Furniture Center Locked Door/Frozen Element/Octo/O Shaped Ice (ToD) Big Chest + // Closed (ToD) Gust Jar Mushrooms (ToD) Perhaps this is just tiles that change on + // interaction? + SPECIAL_TILE_35 = 0x4023, // Object Top + SPECIAL_TILE_36 = 0x4024, // Object Left + SPECIAL_TILE_37 = 0x4025, // Object Right + SPECIAL_TILE_38 = 0x4026, // Object Bottom + SPECIAL_TILE_39 = 0x4027, // Object Top Left Corner + SPECIAL_TILE_40 = 0x4028, // Object Top Right Corner + SPECIAL_TILE_41 = 0x4029, // Object Bottom Left Corner + SPECIAL_TILE_42 = 0x402a, // Object Bottom Right Corner + SPECIAL_TILE_43 = 0x402b, // Push Object Either (1 off) + SPECIAL_TILE_44 = 0x402c, // Push Object Left (1 off) + SPECIAL_TILE_45 = 0x402d, // Push Object Right (1 off) + SPECIAL_TILE_46 = 0x402e, // Push Object Either + SPECIAL_TILE_47 = 0x402f, + SPECIAL_TILE_48 = 0x4030, + SPECIAL_TILE_49 = 0x4031, // Pushed Object + SPECIAL_TILE_50 = 0x4032, // Blue Bean in Hole + SPECIAL_TILE_51 = 0x4033, + SPECIAL_TILE_52 = 0x4034, + SPECIAL_TILE_53 = 0x4035, + SPECIAL_TILE_54 = 0x4036, // Pillar w/ Object + SPECIAL_TILE_55 = 0x4037, // Move pillar Up + SPECIAL_TILE_56 = 0x4038, // Move pillar Right + SPECIAL_TILE_57 = 0x4039, // Move pillar Down + SPECIAL_TILE_58 = 0x403a, // Move pillar Left + SPECIAL_TILE_59 = 0x403b, // Green Bean in Hole + SPECIAL_TILE_60 = 0x403c, + SPECIAL_TILE_61 = 0x403d, // Minish Path Under Stick, Stone over hole in light rooms (ToD), Object Blocking + // Town doors + SPECIAL_TILE_62 = 0x403e, // Grave + SPECIAL_TILE_63 = 0x403f, + SPECIAL_TILE_64 = 0x4040, // Portal Top Left + SPECIAL_TILE_65 = 0x4041, // Portal Top + SPECIAL_TILE_66 = 0x4042, // Portal Top Right + SPECIAL_TILE_67 = 0x4043, // Portal Left + SPECIAL_TILE_68 = 0x4044, // Portal Center + SPECIAL_TILE_69 = 0x4045, // Portal Right + SPECIAL_TILE_70 = 0x4046, // Portal Bottom Left + SPECIAL_TILE_71 = 0x4047, // Portal Bottom + SPECIAL_TILE_72 = 0x4048, // Portal Bottom Right + SPECIAL_TILE_73 = 0x4049, + SPECIAL_TILE_74 = 0x404a, // Push Box + SPECIAL_TILE_75 = 0x404b, // Move Block Up + SPECIAL_TILE_76 = 0x404c, // Move Block Right + SPECIAL_TILE_77 = 0x404d, // Move Block Down + SPECIAL_TILE_78 = 0x404e, // Push Box Locked + SPECIAL_TILE_79 = 0x404f, + SPECIAL_TILE_80 = 0x4050, // Impact Switch + SPECIAL_TILE_81 = 0x4051, + SPECIAL_TILE_82 = 0x4052, // Lever (facing left) + SPECIAL_TILE_83 = 0x4053, // Lever (facing up) + SPECIAL_TILE_84 = 0x4054, // After Lever push (facing left) + SPECIAL_TILE_85 = 0x4055, // Big lever (facing left inside) + SPECIAL_TILE_86 = 0x4056, // Big lever (facing left outside) + SPECIAL_TILE_87 = 0x4057, // Big lever (facing up inside) + SPECIAL_TILE_88 = 0x4058, // Big lever (facing up outside) + SPECIAL_TILE_89 = 0x4059, + SPECIAL_TILE_90 = 0x405a, // Ice Blocks + SPECIAL_TILE_91 = 0x405b, // Move Block Up + SPECIAL_TILE_92 = 0x405c, // Move Block Right + SPECIAL_TILE_93 = 0x405d, // Move Block Down + SPECIAL_TILE_94 = 0x405e, // Move Block Left + SPECIAL_TILE_95 = 0x405f, + SPECIAL_TILE_96 = 0x4060, // Skull + SPECIAL_TILE_97 = 0x4061, // Lit Fireplace + SPECIAL_TILE_98 = 0x4062, + SPECIAL_TILE_99 = 0x4063, + SPECIAL_TILE_100 = 0x4064, + SPECIAL_TILE_101 = 0x4065, // Tree Thorns Right + SPECIAL_TILE_102 = 0x4066, // Tree Thorns Left + SPECIAL_TILE_103 = 0x4067, + SPECIAL_TILE_104 = 0x4068, // Hot Ash Covering Objects + SPECIAL_TILE_105 = 0x4069, // Loading Zone + SPECIAL_TILE_106 = 0x406a, + SPECIAL_TILE_107 = 0x406b, + SPECIAL_TILE_108 = 0x406c, // Acorn Top Left + SPECIAL_TILE_109 = 0x406d, // Acorn Top Right + SPECIAL_TILE_110 = 0x406e, // Acorn Bottom Left + SPECIAL_TILE_111 = 0x406f, // Acorn Bottom Right + SPECIAL_TILE_112 = 0x4070, // Link in a hole + SPECIAL_TILE_113 = 0x4071, + SPECIAL_TILE_114 = 0x4072, // Blocking Library, all kinds of objects? + SPECIAL_TILE_115 = 0x4073, + SPECIAL_TILE_116 = 0x4074, // Leaf + SPECIAL_TILE_117 = 0x4075, // Chest Ice Block Top Left + SPECIAL_TILE_118 = 0x4076, // Chest Ice Block Top Right + SPECIAL_TILE_119 = 0x4077, // Chest Ice Block Top + SPECIAL_TILE_120 = 0x4078, // Chest Ice Block Bottom Left + SPECIAL_TILE_121 = 0x4079, // Chest Ice Block Left + SPECIAL_TILE_122 = 0x407a, // Chest Ice Block Bottom Right + SPECIAL_TILE_123 = 0x407b, // Chest Ice Block Right + SPECIAL_TILE_124 = 0x407c, // Chest Ice Block Bottom + SPECIAL_TILE_125 = 0x407d, // Town Well + SPECIAL_TILE_126 = 0x407e, + SPECIAL_TILE_127 = 0x407f, + SPECIAL_TILE_128 = 0x4080, // Dig Cave Outside + SPECIAL_TILE_129 = 0x4081, + SPECIAL_TILE_130 = 0x4082, // Bookshelf slider + SPECIAL_TILE_131 = 0x4083, // Minish House doorways + SPECIAL_TILE_132 = 0x4084, + SPECIAL_TILE_133 = 0x4085, + SPECIAL_TILE_134 = 0x4086, + SPECIAL_TILE_135 = 0x4087, + SPECIAL_TILE_136 = 0x4088, + SPECIAL_TILE_137 = 0x4089, // Shallow Water Outside ToD + SPECIAL_TILE_138 = 0x408a, // Shallow Water Outside ToD + SPECIAL_TILE_139 = 0x408b, // Shallow Water Outside ToD + SPECIAL_TILE_140 = 0x408c, // Shallow Water Outside ToD + SPECIAL_TILE_141 = 0x408d, + SPECIAL_TILE_142 = 0x408e, // Climb Wall Down, Library book ladder, Rock Boost + SPECIAL_TILE_143 = 0x408f, // Climb Wall Up, Rock Boost + SPECIAL_TILE_144 = 0x4090, + SPECIAL_TILE_145 = 0x4091, // Shallow Water Outside ToD + SPECIAL_TILE_146 = 0x4092, // Minish Pot Top Left Flipping + SPECIAL_TILE_147 = 0x4093, // Minish Pot Top Right Flipping + SPECIAL_TILE_148 = 0x4094, // Minish Pot Bottom Left Flipping + SPECIAL_TILE_149 = 0x4095, // Minish Pot Botom Right Flipping + SPECIAL_TILE_150 = 0x4096, +} SpecialTile; +typedef enum { + ACT_TILE_0 = 0x0, // TILE_ACT_CUT + ACT_TILE_1 = 0x1, // TILE_ACT_ROCKBREAKER + ACT_TILE_2 = 0x2, // TILE_ACT_BOOMERANG + ACT_TILE_3 = 0x3, // TILE_ACT_BOMB + ACT_TILE_4 = 0x4, // TILE_ACT_ARROW + ACT_TILE_5 = 0x5, // TILE_ACT_GUST + ACT_TILE_6 = 0x6, // TILE_ACT_LIFT + ACT_TILE_7 = 0x7, // TILE_ACT_FIRE + ACT_TILE_8 = 0x8, // TILE_ACT_PLAYER_WALK -> SURFACE_7 + ACT_TILE_9 = 0x9, // TILE_ACT_ENEMY_WALK sub_0801FDE4(leever) + ACT_TILE_10 = 0xa, // TILE_ACT_PACCI sub_0801FDE4(leever), sub_08025AB8(puffstool) + ACT_TILE_11 = 0xb, // sub_0801FDE4(leever) + ACT_TILE_12 = 0xc, // TILE_ACT_SWORDBEAM sub_0801FDE4(leever) + ACT_TILE_13 = + 0xd, // TILE_ACT_DIG -> SURFACE_PIT, sub_08094E30(cutsceneMiscObject), sub_08085B40(lilypadLarge), Pot_Action1, + // sub_080AD040(playerItemHeldObject), UpdatePlayerCollision, sub_0807B434(playerUtils), FX_FALL_DOWN + ACT_TILE_14 = 0xe, // TILE_ACT_MINIGUST -> SURFACE_SLOPE_GNDWATER + ACT_TILE_15 = 0xf, // -> SURFACE_SHALLOW_WATER, SPECIAL_TILE_145 + ACT_TILE_16 = 0x10, // -> SURFACE_WATER, CheckWaterTile(chuchu), PlayerItemBottle_UseEmptyBottle, SPECIAL_TILE_137 - + // 140, sub_080AD040(playerItemHeldObject), FX_WATER_SPLASH + ACT_TILE_17 = + 0x11, // -> SURFACE_14, sub_08085A44(lilypadLarge), sub_080AD040(playerItemHeldObject), FX_WATER_SPLASH + ACT_TILE_18 = 0x12, // -> SURFACE_ICE, SPECIAL_TILE_117 - 124 + ACT_TILE_19 = 0x13, // -> SURFACE_SWAMP, sub_0803163C(rope), sub_080AD040(playerItemHeldObject), FX_GREEN_SPLASH + ACT_TILE_20 = 0x14, + ACT_TILE_21 = 0x15, + ACT_TILE_22 = 0x16, // -> SURFACE_DUST + ACT_TILE_23 = 0x17, // -> SURFACE_2D + ACT_TILE_24 = 0x18, // -> SURFACE_16 + ACT_TILE_25 = 0x19, // -> SURFACE_HOLE, CrenelBeanSprout_Action1, sub_08097144(objectOnPillar), + // sub_0808A644(pushableRock), sub_080701F8(playerItemPacciCaneProjectile) + ACT_TILE_26 = 0x1a, + ACT_TILE_27 = 0x1b, // -> SURFACE_BUTTON + ACT_TILE_28 = 0x1c, + ACT_TILE_29 = 0x1d, // -> SURFACE_BUTTON + ACT_TILE_30 = 0x1e, + ACT_TILE_31 = 0x1f, // -> SURFACE_MINISH_DOOR_FRONT + ACT_TILE_32 = 0x20, // -> SURFACE_MINISH_DOOR_BACK + ACT_TILE_33 = 0x21, // -> SURFACE_A + ACT_TILE_34 = 0x22, // -> SURFACE_B + ACT_TILE_35 = 0x23, // SPECIAL_TILE_130 + ACT_TILE_36 = 0x24, + ACT_TILE_37 = 0x25, + ACT_TILE_38 = 0x26, // -> SURFACE_SLOPE_GNDGND_V + ACT_TILE_39 = 0x27, // -> SURFACE_SLOPE_GNDGND_H + ACT_TILE_40 = 0x28, // -> SURFACE_DOOR_13, SPECIAL_TILE_105, sub_080732D0(player), UpdateDoorTransition + ACT_TILE_41 = 0x29, // -> SURFACE_DOOR, sub_08076DF4(itemGustJar), Minecart_Action3, sub_080896B0(pushableStatue), + // SPECIAL_TILE_128, SPECIAL_TILE_131 - 136, SPECIAL_TILE_141, sub_080724DC(player), + // UpdateDoorTransition + ACT_TILE_42 = 0x2a, // -> SURFACE_E, sub_080611D4(npc5) + ACT_TILE_43 = 0x2b, // -> SURFACE_D, sub_080611D4(npc5) + ACT_TILE_44 = 0x2c, // -> SURFACE_10, sub_080611D4(npc5) + ACT_TILE_45 = 0x2d, // -> SURFACE_F, sub_080611D4(npc5) + ACT_TILE_46 = 0x2e, // BombableWallManager_Action1, sub_080878CC(smokeParticle), sub_080A7A84(playerItemSword) + ACT_TILE_47 = 0x2f, + ACT_TILE_48 = 0x30, // -> SURFACE_22 + ACT_TILE_49 = 0x31, // -> SURFACE_22 + ACT_TILE_50 = 0x32, // -> SURFACE_22 + ACT_TILE_51 = 0x33, // -> SURFACE_22 + ACT_TILE_52 = 0x34, // -> SURFACE_LIGHT_GRADE + ACT_TILE_53 = 0x35, // -> SURFACE_29 + ACT_TILE_54 = 0x36, + ACT_TILE_55 = 0x37, + ACT_TILE_56 = 0x38, + ACT_TILE_57 = 0x39, + ACT_TILE_58 = 0x3a, // SPECIAL_TILE_81 + ACT_TILE_59 = 0x3b, + ACT_TILE_60 = 0x3c, + ACT_TILE_61 = 0x3d, // MinishPortalManager_Main, SPECIAL_TILE_64 - 72 + ACT_TILE_62 = 0x3e, // sub_080AA544(removableDust) + ACT_TILE_63 = 0x3f, // -> SURFACE_AUTO_LADDER, FurnitureInit(for STAIRCASE), UpdateDoorTransition + ACT_TILE_64 = 0x40, // -> SURFACE_E + ACT_TILE_65 = 0x41, // -> SURFACE_D + ACT_TILE_66 = 0x42, // -> SURFACE_10 + ACT_TILE_67 = 0x43, // -> SURFACE_F + ACT_TILE_68 = 0x44, // -> SURFACE_D + ACT_TILE_69 = 0x45, // -> SURFACE_E + ACT_TILE_70 = 0x46, // -> SURFACE_D + ACT_TILE_71 = 0x47, // -> SURFACE_E + ACT_TILE_72 = 0x48, // -> SURFACE_10 + ACT_TILE_73 = 0x49, // -> SURFACE_D + ACT_TILE_74 = 0x4a, // -> SURFACE_E + ACT_TILE_75 = 0x4b, // -> SURFACE_D + ACT_TILE_76 = 0x4c, + ACT_TILE_77 = 0x4d, + ACT_TILE_78 = 0x4e, + ACT_TILE_79 = 0x4f, + ACT_TILE_80 = 0x50, // -> SURFACE_CLIMB_WALL, SPECIAL_TILE_142 + ACT_TILE_81 = 0x51, // -> SURFACE_2C, SPECIAL_TILE_143 + ACT_TILE_82 = 0x52, // -> SURFACE_26 + ACT_TILE_83 = 0x53, // -> SURFACE_LADDER, SPECIAL_TILE_23 + ACT_TILE_84 = 0x54, // TreeHidingPortal_Action1 + ACT_TILE_85 = 0x55, + ACT_TILE_86 = 0x56, // sub_080774A0(itemMoleMitts), sub_0807B464(playerUtils) + ACT_TILE_87 = 0x57, // -> SURFACE_CLONE_TILE, sub_0806B0E0(townMinish) + ACT_TILE_88 = 0x58, + ACT_TILE_89 = 0x59, + ACT_TILE_90 = 0x5a, // -> SURFACE_1C, sub_080AD040(playerItemHeldObject), FX_LAVA_SPLASH + ACT_TILE_91 = 0x5b, + ACT_TILE_92 = 0x5c, + ACT_TILE_93 = 0x5d, + ACT_TILE_94 = 0x5e, + ACT_TILE_95 = 0x5f, + ACT_TILE_96 = 0x60, + ACT_TILE_97 = 0x61, // -> SURFACE_1B + ACT_TILE_98 = 0x62, // -> SURFACE_21 + ACT_TILE_99 = 0x63, // -> SURFACE_24 + ACT_TILE_100 = 0x64, // Minecart_Action3 + ACT_TILE_101 = 0x65, // -> SURFACE_6, Minecart_Action3 + ACT_TILE_102 = 0x66, // -> SURFACE_6, Minecart_Action3 + ACT_TILE_103 = 0x67, // -> SURFACE_6, Minecart_Action3 + ACT_TILE_104 = 0x68, // -> SURFACE_6, Minecart_Action3 + ACT_TILE_105 = 0x69, // -> SURFACE_6, Minecart_Action3 + ACT_TILE_106 = 0x6a, // -> SURFACE_6, Minecart_Action3 + ACT_TILE_107 = 0x6b, // -> SURFACE_6 + ACT_TILE_108 = 0x6c, // -> SURFACE_6, Minecart_Action3 + ACT_TILE_109 = 0x6d, // -> SURFACE_6, Minecart_Action3 + ACT_TILE_110 = 0x6e, // -> SURFACE_6, Minecart_Action3 + ACT_TILE_111 = 0x6f, // -> SURFACE_6, Minecart_Action3 + ACT_TILE_112 = 0x70, + ACT_TILE_113 = 0x71, + ACT_TILE_114 = 0x72, + ACT_TILE_115 = 0x73, + ACT_TILE_116 = 0x74, // -> SURFACE_EDGE, SPECIAL_TILE_126, SPECIAL_TILE_127, sub_08018E68(playerItemGustBig), + // sub_080AD040(playerItemHeldObject) + ACT_TILE_117 = 0x75, + ACT_TILE_240 = 0xf0, // -> SURFACE_HOLE, sub_0802F300(tektite), sub_0808A644(pushableRock), SPECIAL_TILE_32 + ACT_TILE_241 = 0xf1, // -> SURFACE_LADDER, sub_0802F300(tektite), SPECIAL_TILE_20, UpdateDoorTransition + ACT_TILE_242 = 0xf2, // sub_0802F300(tektite), Minecart_Action3, SPECIAL_TILE_24 + ACT_TILE_243 = 0xf3, // sub_0802F300(tektite), Minecart_Action3, SPECIAL_TILE_25 + // up to ACT_TILE_255 -> sub_0802F300(tektite) +} ActTile; + +typedef enum { + COLLISION_DATA_0 = 0x0, + COLLISION_DATA_1 = 0x1, + COLLISION_DATA_2 = 0x2, + COLLISION_DATA_3 = 0x3, + COLLISION_DATA_4 = 0x4, + COLLISION_DATA_5 = 0x5, + COLLISION_DATA_6 = 0x6, + COLLISION_DATA_7 = 0x7, + COLLISION_DATA_8 = 0x8, + COLLISION_DATA_9 = 0x9, + COLLISION_DATA_10 = 0xa, + COLLISION_DATA_11 = 0xb, + COLLISION_DATA_12 = 0xc, + COLLISION_DATA_13 = 0xd, + COLLISION_DATA_14 = 0xe, + COLLISION_DATA_15 = 0xf, + COLLISION_DATA_16 = 0x10, + COLLISION_DATA_17 = 0x11, + COLLISION_DATA_18 = 0x12, + COLLISION_DATA_19 = 0x13, + COLLISION_DATA_20 = 0x14, + COLLISION_DATA_21 = 0x15, + COLLISION_DATA_23 = 0x17, + COLLISION_DATA_24 = 0x18, + COLLISION_DATA_25 = 0x19, + COLLISION_DATA_26 = 0x1a, + COLLISION_DATA_27 = 0x1b, + COLLISION_DATA_28 = 0x1c, + COLLISION_DATA_29 = 0x1d, + COLLISION_DATA_32 = 0x20, + COLLISION_DATA_33 = 0x21, // FX_FALL_DOWN + COLLISION_DATA_34 = 0x22, + COLLISION_DATA_35 = 0x23, + COLLISION_DATA_36 = 0x24, // FX_WATER_SPLASH + COLLISION_DATA_37 = 0x25, // FX_LAVA_SPLASH + COLLISION_DATA_38 = 0x26, + COLLISION_DATA_39 = 0x27, + COLLISION_DATA_40 = 0x28, + COLLISION_DATA_41 = 0x29, + COLLISION_DATA_42 = 0x2a, + COLLISION_DATA_43 = 0x2b, + COLLISION_DATA_44 = 0x2c, + COLLISION_DATA_45 = 0x2d, + COLLISION_DATA_46 = 0x2e, + COLLISION_DATA_47 = 0x2f, + COLLISION_DATA_48 = 0x30, // FX_WATER_SPLASH + COLLISION_DATA_49 = 0x31, + COLLISION_DATA_50 = 0x32, + COLLISION_DATA_58 = 0x3a, + COLLISION_DATA_60 = 0x3c, + COLLISION_DATA_63 = 0x3f, + COLLISION_DATA_66 = 0x42, + COLLISION_DATA_67 = 0x43, + COLLISION_DATA_68 = 0x44, + COLLISION_DATA_69 = 0x45, + COLLISION_DATA_70 = 0x46, + COLLISION_DATA_71 = 0x47, + COLLISION_DATA_72 = 0x48, + COLLISION_DATA_74 = 0x4a, + COLLISION_DATA_75 = 0x4b, + COLLISION_DATA_80 = 0x50, + COLLISION_DATA_81 = 0x51, + COLLISION_DATA_82 = 0x52, + COLLISION_DATA_83 = 0x53, + COLLISION_DATA_84 = 0x54, + COLLISION_DATA_85 = 0x55, + COLLISION_DATA_87 = 0x57, + COLLISION_DATA_88 = 0x58, + COLLISION_DATA_89 = 0x59, + COLLISION_DATA_90 = 0x5a, + COLLISION_DATA_91 = 0x5b, + COLLISION_DATA_92 = 0x5c, + COLLISION_DATA_93 = 0x5d, + COLLISION_DATA_94 = 0x5e, + COLLISION_DATA_95 = 0x5f, + COLLISION_DATA_96 = 0x60, + COLLISION_DATA_97 = 0x61, + COLLISION_DATA_98 = 0x62, + COLLISION_DATA_99 = 0x63, + COLLISION_DATA_100 = 0x64, + COLLISION_DATA_101 = 0x65, + COLLISION_DATA_102 = 0x66, + COLLISION_DATA_103 = 0x67, + COLLISION_DATA_104 = 0x68, + COLLISION_DATA_105 = 0x69, + COLLISION_DATA_106 = 0x6a, + COLLISION_DATA_107 = 0x6b, + COLLISION_DATA_255 = 0xff, +} CollisionData; #endif // TILES_H diff --git a/linker.ld b/linker.ld index eb2a4578..4ed6e5b1 100644 --- a/linker.ld +++ b/linker.ld @@ -31,27 +31,23 @@ SECTIONS { . = 0x00002A40; gSave = .; . = 0x00002F00; gMapDataTopSpecial = .; . = 0x00006F00; gUnk_02006F00 = .; - . = 0x0000AF00; gUnk_0200AF00 = .; + . = 0x0000AF00; gHUD = .; . = 0x0000AF34; gUnk_0200AF34 = .; - . = 0x0000B240; gUnk_0200B240 = .; + . = 0x0000B240; gTilesForSpecialTiles = .; . = 0x0000B640; gUnk_0200B640 = .; . = 0x0000B644; gUsedPalettes = .; . = 0x0000B650; gMapTop = .; . = 0x00017654; gCurrentRoomProperties = .; . = 0x00017660; gSmallChests = .; . = 0x000176A0; gPaletteBuffer = .; - . = 0x000176E0; gUnk_020176E0 = .; - . = 0x00017700; gUnk_02017700 = .; - . = 0x00017760; gUnk_02017760 = .; . = 0x00017830; gUnk_02017830 = .; - . = 0x000178E0; gUnk_020178E0 = .; . = 0x00017AA0; gUnk_02017AA0 = .; . = 0x00017BA0; gUnk_02017BA0 = .; . = 0x00018EA0; gUnk_02018EA0 = .; . = 0x00018EB0; gUnk_02018EB0 = .; . = 0x00018EE0; gUnk_02018EE0 = .; . = 0x00019EE0; gMapDataBottomSpecial = .; - . = 0x0001AEE0; gUnk_0201AEE0 = .; + . = 0x0001AEE0; gDungeonMap = .; . = 0x00021EE0; gSoundPlayingInfo = .; . = 0x00021F00; gUnk_02021F00 = .; . = 0x00021F20; gUnk_02021F20 = .; @@ -163,25 +159,25 @@ SECTIONS { . = 0x00005760; ram_sub_080B19EC = .; . = 0x00005770; ram_sub_080B19FC = .; . = 0x00005778; ram_sub_080B1A04 = .; - . = 0x00005780; ram_sub_080B1A0C = .; - . = 0x0000579C; ram_GetTileTypeByEntity = .; - . = 0x000057A8; ram_GetTileTypeByPos = .; - . = 0x000057BC; ram_sub_080B1A48 = .; - . = 0x000057CC; ram_sub_080B1A58 = .; + . = 0x00005780; ram_GetTileTypeRelativeToEntity = .; + . = 0x0000579C; ram_GetTileTypeAtEntity = .; + . = 0x000057A8; ram_GetTileTypeAtWorldCoords = .; + . = 0x000057BC; ram_GetTileTypeAtRoomCoords = .; + . = 0x000057CC; ram_GetTileTypeAtRoomTile = .; . = 0x000057D4; ram_GetTileType = .; - . = 0x00005800; ram_GetActTileRelative = .; - . = 0x0000581C; ram_GetActTile = .; - . = 0x00005828; ram_sub_080B1AB4 = .; - . = 0x0000583C; ram_sub_080B1AC8 = .; - . = 0x0000584C; ram_sub_080B1AD8 = .; - . = 0x00005854; ram_sub_080B1AE0 = .; - . = 0x00005864; ram_sub_080B1AF0 = .; - . = 0x00005880; ram_sub_080B1B0C = .; - . = 0x0000588C; ram_sub_080B1B18 = .; - . = 0x000058A0; ram_sub_080B1B2C = .; - . = 0x000058B0; ram_sub_080B1B3C = .; - . = 0x000058B8; ram_sub_080B1B44 = .; - . = 0x000058C8; ram_sub_080B1B54 = .; + . = 0x00005800; ram_GetActTileRelativeToEntity = .; + . = 0x0000581C; ram_GetActTileAtEntity = .; + . = 0x00005828; ram_GetActTileAtWorldCoords = .; + . = 0x0000583C; ram_GetActTileAtRoomCoords = .; + . = 0x0000584C; ram_GetActTileAtRoomTile = .; + . = 0x00005854; ram_GetActTileAtTilePos = .; + . = 0x00005864; ram_GetCollisionDataRelativeTo = .; + . = 0x00005880; ram_GetCollisionDataAtEntity = .; + . = 0x0000588C; ram_GetCollisionDataAtWorldCoords = .; + . = 0x000058A0; ram_GetCollisionDataAtRoomCoords = .; + . = 0x000058B0; ram_GetCollisionDataAtRoomTile = .; + . = 0x000058B8; ram_GetCollisionDataAtTilePos = .; + . = 0x000058C8; ram_GetActTileForTileType = .; . = 0x000058DC; ram_sub_080B1B68 = .; . = 0x000058F8; ram_sub_080B1B84 = .; . = 0x00005918; ram_sub_080B1BA4 = .; @@ -246,7 +242,9 @@ SECTIONS { data/gfx/sprite_ptrs.o(.rodata); asm/src/code_08003FC4.o(.text); asm/src/code_080043E8.o(.text); + src/data/data_080046A4.o(.rodata); data/gfx/link_animations.o(.rodata); + src/data/mapActTileToSurfaceType.o(.rodata); asm/src/code_08007CAC.o(.text); data/data_08007DF4.o(.rodata); asm/src/player.o(.text); @@ -432,7 +430,7 @@ SECTIONS { src/manager/diggingCaveEntranceManager.o(.text); src/manager/bridgeManager.o(.text); src/manager/specialWarpManager.o(.text); - src/manager/minishVillageTilesetManager.o(.text); + src/manager/minishVillageTileSetManager.o(.text); src/manager/horizontalMinishPathBackgroundManager.o(.text); src/manager/minishRaftersBackgroundManager.o(.text); src/manager/ezloHintManager.o(.text); @@ -443,7 +441,7 @@ SECTIONS { src/manager/miscManager.o(.text); src/manager/weatherChangeManager.o(.text); src/manager/flagAndOperatorManager.o(.text); - src/manager/hyruleTownTilesetManager.o(.text); + src/manager/hyruleTownTileSetManager.o(.text); src/manager/houseSignManager.o(.text); src/manager/steamOverlayManager.o(.text); src/manager/templeOfDropletsManager.o(.text); @@ -601,7 +599,7 @@ SECTIONS { src/playerUtils.o(.text); src/flags.o(.text); src/save.o(.text); - src/screenTilemap.o(.text); + src/screenTileMap.o(.text); src/script.o(.text); src/scroll.o(.text); /* objects */ @@ -890,12 +888,10 @@ SECTIONS { src/playerItem/playerItemBoomerang.o(.rodata); src/playerItem/playerItemDashSword.o(.rodata); src/playerItem/playerItemBottle.o(.rodata); - data/const/playerItem/playerItemCellOverwriteSet.o(.rodata); src/playerItem/playerItemCellOverwriteSet.o(.rodata); data/const/collisionMatrix.o(.rodata); data/const/ui.o(.rodata); src/sineTable.o(.rodata); - data/const/common.o(.rodata); src/common.o(.rodata); src/enemy/octorok.o(.rodata); data/animations/enemy/octorok.o(.rodata); @@ -1126,7 +1122,7 @@ SECTIONS { data/gfx/gfx_groups.o(.rodata); src/main.o(.rodata); data/map/tileset_headers.o(.rodata); - data/map/metatile_headers.o(.rodata); + data/map/tile_headers.o(.rodata); data/map/map_headers.o(.rodata); src/message.o(.rodata); . = ALIGN(4); @@ -1134,7 +1130,7 @@ SECTIONS { src/manager/minishPortalManager.o(.rodata); src/manager/diggingCaveEntranceManager.o(.rodata); src/manager/bridgeManager.o(.rodata); - src/manager/minishVillageTilesetManager.o(.rodata); + src/manager/minishVillageTileSetManager.o(.rodata); . = ALIGN(4); src/manager/minishRaftersBackgroundManager.o(.rodata); src/manager/ezloHintManager.o(.rodata); @@ -1143,7 +1139,7 @@ SECTIONS { src/manager/tileChangeObserveManager.o(.rodata); src/manager/miscManager.o(.rodata); src/manager/weatherChangeManager.o(.rodata); - src/manager/hyruleTownTilesetManager.o(.rodata); + src/manager/hyruleTownTileSetManager.o(.rodata); src/manager/houseSignManager.o(.rodata); src/manager/steamOverlayManager.o(.rodata); src/manager/templeOfDropletsManager.o(.rodata); @@ -1172,7 +1168,7 @@ SECTIONS { src/manager/floatingPlatformManager.o(.rodata); src/manager/enterRoomTextboxManager.o(.rodata); data/const/manager/enterRoomTextboxManager.o(.rodata); - data/const/entity.o(.rodata); + src/data/caveBorderMapData.o(.rodata); src/entity.o(.rodata); src/code_0805EC04.o(.rodata); data/const/text.o(.rodata); @@ -1603,6 +1599,7 @@ SECTIONS { #endif src/staffroll.o(.rodata); data/const/staffroll.o(.rodata); + src/data/areaMetadata.o(.rodata); src/menu/kinstoneMenu.o(.rodata); src/menu/figurineMenu.o(.rodata); data/gfx/figurines.o(.rodata); diff --git a/src/backgroundAnimations.c b/src/backgroundAnimations.c index 6e48fbe4..c944b205 100644 --- a/src/backgroundAnimations.c +++ b/src/backgroundAnimations.c @@ -8,7 +8,6 @@ #include "asm.h" #include "assets/gfx_offsets.h" #include "common.h" -#include "fileselect.h" #include "functions.h" void LoadBgAnimationGfx(const BgAnimationGfx*); @@ -2519,4 +2518,5 @@ const u16* const gUnk_080B755C[] = { NULL, NULL, NULL, NULL, NULL, NULL, }; +// TODO gMapTop.bgSettings->control values const u16 gUnk_080B77C0[] = { 0x1c42, 0x1d45, 0x1d46, 0x1e03 }; diff --git a/src/beanstalkSubtask.c b/src/beanstalkSubtask.c index 2eb16f89..9da2f7eb 100644 --- a/src/beanstalkSubtask.c +++ b/src/beanstalkSubtask.c @@ -15,11 +15,12 @@ #include "screen.h" #include "scroll.h" #include "structures.h" +#include "tiles.h" extern void sub_0807C898(void); extern void sub_0805BB74(s32); extern void LoadRoomGfx(void); -extern void sub_0807BFD0(void); +extern void LoadRoomTileSet(void); extern void sub_0807C4F8(void); extern void gMapData; @@ -53,9 +54,9 @@ extern const Data gUnk_080B44C2[]; void sub_0801AD6C(const Data*, u32); bool32 sub_0801A4F8(void); bool32 sub_0801AA58(Entity*, u32, u32); -void sub_0801AB08(u16*, LayerStruct*); +void RenderMapLayerToSubTileMap(u16* subTileMap, MapLayer* mapLayer); -u32 sub_0801AC68(u32 position, u32 data); +u32 GetTileSetIndexForSpecialTile(u32 position, u32 tileIndex); extern u32 sub_0807BDB8(Entity* this, u32 param_2); extern void sub_0804B388(u32 a1, u32 a2); @@ -68,13 +69,12 @@ extern const s16 gUnk_080B4490[]; extern const s16 gUnk_080B4468[]; extern const s16 gUnk_080B4478[]; -bool32 sub_0801A2B0(LayerStruct* layer, u32 position, u32 collisionType); +bool32 sub_0801A2B0(MapLayer* mapLayer, u32 position, u32 collisionType); bool32 sub_0801A9F0(u32 param_1, u32 param_2, u32 param_3); u32 sub_0801A570(Entity*, u32); -bool32 sub_0801A458(LayerStruct* layer, u32 position, u32 collisionType); -bool32 sub_0801A370(LayerStruct* layer, u32 position); +bool32 sub_0801A458(MapLayer* mapLayer, u32 position, u32 collisionType); +bool32 sub_0801A370(MapLayer* mapLayer, u32 position); u32 sub_0801A8D0(Entity* this, u32 param_2); -extern void sub_080001D0(u32, u32, u32); void sub_0801967C(void) { gUnk_080B4458[gMenu.overlayType](); @@ -132,37 +132,37 @@ void SetBGDefaults(void) { gMapTop.bgSettings->control = gUnk_080B77C0[1]; } -void sub_080197D4(struct_08109194* param_1) { +void LoadMapData(MapDataDefinition* dataDefinition) { u32 uVar1; u8* src; void* dest; do { - dest = param_1->dest; + dest = dataDefinition->dest; if (dest != NULL) { - src = &gMapData + (param_1->src & 0x7fffffff); - if ((param_1->size & 0x80000000) != 0) { + src = &gMapData + (dataDefinition->src & 0x7fffffff); + if ((dataDefinition->size & MAP_COMPRESSED) != 0) { if ((u32)dest >> 0x18 == 6) { LZ77UnCompVram(src, dest); } else { LZ77UnCompWram(src, dest); } } else { - MemCopy(src, dest, param_1->size); + MemCopy(src, dest, dataDefinition->size); } } else { - LoadPaletteGroup(*(u16*)param_1); + LoadPaletteGroup(*(u16*)dataDefinition); sub_080533CC(); } - param_1++; - } while (((param_1 - 1)->src & 0x80000000) != 0); + dataDefinition++; + } while (((dataDefinition - 1)->src & MAP_MULTIPLE) != 0); } // Has ifdefs for other variants u32 UpdatePlayerCollision(void) { u32 direction; u32 tileType; - LayerStruct* layer; + MapLayer* mapLayer; Transition* transition; Entity* pushedBlock; Entity* player; @@ -202,8 +202,8 @@ u32 UpdatePlayerCollision(void) { index = sub_0807BDB8(&gPlayerEntity.base, direction >> 2); if (index != 0xff && (gRoomControls.scroll_flags & 4) == 0) { ptr1 = &gUnk_080B4490[index * 2]; - if (sub_080B1B44(COORD_TO_TILE_OFFSET(&gPlayerEntity.base, -ptr1[0], -ptr1[1]), - gPlayerEntity.base.collisionLayer) == 0xff) { + if (GetCollisionDataAtTilePos(COORD_TO_TILE_OFFSET(&gPlayerEntity.base, -ptr1[0], -ptr1[1]), + gPlayerEntity.base.collisionLayer) == COLLISION_DATA_255) { if ((((gPlayerState.flags & (PL_FLAGS10000 | PL_FLAGS2)) != 0) || ((gPlayerState.sword_state & 0x10) != 0)) || ((sub_080806BC(gPlayerEntity.base.x.HALF.HI - gRoomControls.origin_x, @@ -217,12 +217,12 @@ u32 UpdatePlayerCollision(void) { } } } - layer = GetTileBuffer(gPlayerEntity.base.collisionLayer); + mapLayer = GetLayerByIndex(gPlayerEntity.base.collisionLayer); ptr1 = &gUnk_080B4468[gPlayerEntity.base.animationState & 6]; position = COORD_TO_TILE_OFFSET(&gPlayerEntity.base, -ptr1[0], -ptr1[1]); - tileType = GetTileType(position, gPlayerEntity.base.collisionLayer); + tileType = GetTileTypeAtTilePos(position, gPlayerEntity.base.collisionLayer); if (tileType < 0x4000) { - direction = sub_080B1B54(tileType); + direction = GetActTileForTileType(tileType); } else { direction = tileType; } @@ -230,11 +230,11 @@ u32 UpdatePlayerCollision(void) { animationState2 = animationState1 & 0xff; switch (direction) { - case 0x4000: - if (sub_0801A458(layer, position, 2) == 0) { + case SPECIAL_TILE_0: + if (sub_0801A458(mapLayer, position, 2) == 0) { return 0; } - layer->mapData[position] = 0x4001 + (gPlayerEntity.base.animationState >> 1); + mapLayer->mapData[position] = 0x4001 + (gPlayerEntity.base.animationState >> 1); if ((gPlayerState.flags & PL_MINISH) != 0) { gPlayerState.pushedObject = 0xc0; } else { @@ -246,7 +246,7 @@ u32 UpdatePlayerCollision(void) { gPlayerEntity.base.y.HALF.LO = 0; gPlayerEntity.base.direction = Direction8FromAnimationState(gPlayerEntity.base.animationState); return 1; - case 0x28: + case ACT_TILE_40: if ((gPlayerState.flags & PL_MINISH) != 0) { return 0; } @@ -261,7 +261,7 @@ u32 UpdatePlayerCollision(void) { if ((gPlayerEntity.base.direction & DIR_NOT_MOVING_CHECK) != 0) { return 0; } - if (sub_080B1B44(position, gPlayerEntity.base.collisionLayer) != 0xf) { + if (GetCollisionDataAtTilePos(position, gPlayerEntity.base.collisionLayer) != COLLISION_DATA_15) { return 0; } if (sub_08079778() == 0) { @@ -281,11 +281,12 @@ u32 UpdatePlayerCollision(void) { } sub_08078AC0(4, 0, 1); return 0; - case 0x401b: - if (sub_0801A2B0(layer, position, 0xb) == 0) { + case SPECIAL_TILE_27: + if (sub_0801A2B0(mapLayer, position, 0xb) == 0) { return 0; } - layer->mapData[position] = 0x401c + (gPlayerEntity.base.animationState >> 1); + // Start moving the boulder. + mapLayer->mapData[position] = SPECIAL_TILE_28 + (gPlayerEntity.base.animationState / 2); gPlayerState.pushedObject = 0xa0; gPlayerState.queued_action = PLAYER_PUSH; gPlayerState.flags |= PL_BUSY; @@ -294,7 +295,7 @@ u32 UpdatePlayerCollision(void) { gPlayerEntity.base.direction = Direction8FromAnimationState(gPlayerEntity.base.animationState); gPlayerEntity.base.type = 1; return 1; - case 0x70: + case ACT_TILE_112: if ((gPlayerState.field_0x35 & 0x80) == 0) { if ((gPlayerEntity.base.frame & 1) != 0) { if (sub_0801A9F0(gPlayerState.field_0x35 << 2, tileType, position) != 0) { @@ -303,49 +304,49 @@ u32 UpdatePlayerCollision(void) { } } return 0; - case 0x3a: - case 0x5b: - case 0x4051: + case ACT_TILE_58: + case ACT_TILE_91: + case SPECIAL_TILE_81: if (gPlayerState.flags & PL_MINISH) { return 0; } if (gPlayerEntity.base.animationState != IdleNorth) { return 0; } - gUnk_0200AF00.rActionInteractTile = R_ACTION_READ; + gHUD.rActionInteractTile = R_ACTION_READ; if ((gPlayerState.playerInput.newInput & (INPUT_ACTION | INPUT_40)) == 0) { return 0; } gPlayerState.mobility = 1; sub_080A7CFC(position, gPlayerEntity.base.collisionLayer); return 1; - case 0x1a: + case ACT_TILE_26: if ((animationState1 & 0xff) != 0) { return 0; } if ((gPlayerState.flags & (PL_DRUGGED | PL_MINISH)) != 0) { return 0; } - gUnk_0200AF00.rActionInteractTile = R_ACTION_OPEN; + gHUD.rActionInteractTile = R_ACTION_OPEN; if ((gPlayerState.playerInput.newInput & (INPUT_ACTION | INPUT_INTERACT)) == 0) { return 0; } gPlayerState.mobility = 1; OpenSmallChest(position, gPlayerEntity.base.collisionLayer); return 2; - case 0x71: + case ACT_TILE_113: if (HasDungeonSmallKey() == 0) { return 0; } - gUnk_0200AF00.rActionInteractTile = R_ACTION_OPEN; + gHUD.rActionInteractTile = R_ACTION_OPEN; if ((gPlayerState.playerInput.newInput & (INPUT_ACTION | INPUT_INTERACT)) == 0) { return 0; } gPlayerState.mobility = 1; sub_0804B388(position, gPlayerEntity.base.collisionLayer); return 2; - case 0x3d: - case 0x4040 ... 0x4048: + case ACT_TILE_61: + case SPECIAL_TILE_64 ... SPECIAL_TILE_72: if ((gPlayerState.flags & PL_DRUGGED) != 0) { return 0; } @@ -373,14 +374,14 @@ u32 UpdatePlayerCollision(void) { gPlayerEntity.base.zVelocity = 0x20000; COLLISION_OFF(&gPlayerEntity.base); return 1; - case 0x400b: - if (sub_0801A2B0(layer, position, 8) == 0) { + case SPECIAL_TILE_11: + if (sub_0801A2B0(mapLayer, position, 8) == 0) { return 0; } - if ((gPlayerEntity.base.collisionLayer == 3) && (gMapTop.mapData[position] == 0x400b)) { - gMapTop.mapData[position] = 0x400c + (gPlayerEntity.base.animationState >> 1); + if ((gPlayerEntity.base.collisionLayer == 3) && (gMapTop.mapData[position] == SPECIAL_TILE_11)) { + gMapTop.mapData[position] = SPECIAL_TILE_12 + (gPlayerEntity.base.animationState >> 1); } else { - layer->mapData[position] = 0x400c + (gPlayerEntity.base.animationState >> 1); + mapLayer->mapData[position] = SPECIAL_TILE_12 + (gPlayerEntity.base.animationState >> 1); } gPlayerState.pushedObject = 0xa0; gPlayerState.queued_action = PLAYER_PUSH; @@ -389,11 +390,12 @@ u32 UpdatePlayerCollision(void) { gPlayerEntity.base.y.HALF.LO = 0; gPlayerEntity.base.direction = Direction8FromAnimationState(gPlayerEntity.base.animationState); return 1; - case 0x405a: - if (sub_0801A2B0(layer, position, 2) == 0) { + case SPECIAL_TILE_90: + if (sub_0801A2B0(mapLayer, position, 2) == 0) { return 0; } - layer->mapData[position] = 0x405b + (gPlayerEntity.base.animationState >> 1); + // Move ice block. + mapLayer->mapData[position] = SPECIAL_TILE_91 + (gPlayerEntity.base.animationState >> 1); gPlayerState.pushedObject = 0x98; gPlayerState.queued_action = PLAYER_PUSH; gPlayerState.flags |= PL_BUSY; @@ -401,11 +403,11 @@ u32 UpdatePlayerCollision(void) { gPlayerEntity.base.y.HALF.LO = 0; gPlayerEntity.base.direction = Direction8FromAnimationState(gPlayerEntity.base.animationState); return 1; - case 0x4036: - if (sub_0801A2B0(layer, position, 0xb) == 0) { + case SPECIAL_TILE_54: + if (sub_0801A2B0(mapLayer, position, 0xb) == 0) { return 0; } - layer->mapData[position] = 0x4037 + (gPlayerEntity.base.animationState >> 1); + mapLayer->mapData[position] = SPECIAL_TILE_55 + (gPlayerEntity.base.animationState >> 1); gPlayerState.pushedObject = 0xa0; gPlayerState.queued_action = PLAYER_PUSH; gPlayerState.flags |= PL_BUSY; @@ -413,7 +415,7 @@ u32 UpdatePlayerCollision(void) { gPlayerEntity.base.y.HALF.LO = 0; gPlayerEntity.base.direction = Direction8FromAnimationState(gPlayerEntity.base.animationState); return 1; - case 0x403e: + case SPECIAL_TILE_62: if ((animationState1 & 0xff) != 0) { return 0; } @@ -423,7 +425,7 @@ u32 UpdatePlayerCollision(void) { if ((gPlayerEntity.base.frame & 2) == 0) { return 0; } - layer->mapData[position] = 0x403f; + mapLayer->mapData[position] = SPECIAL_TILE_63; gPlayerState.pushedObject = 0x82; gPlayerState.queued_action = PLAYER_PUSH; gPlayerState.flags |= PL_BUSY; @@ -431,7 +433,7 @@ u32 UpdatePlayerCollision(void) { gPlayerEntity.base.y.HALF.LO = 0; gPlayerEntity.base.direction = Direction8FromAnimationState(gPlayerEntity.base.animationState); return 1; - case 0x72: + case ACT_TILE_114: if ((gPlayerState.field_0x35 & 0x80) != 0) { return 0; } @@ -472,9 +474,9 @@ u32 UpdatePlayerCollision(void) { gPlayerEntity.base.y.HALF.LO = 0; gPlayerEntity.base.direction = pushedBlock->direction; return 1; - case 0x402b ... 0x402d: - if (sub_0801A370(layer, position) != 0) { - layer->mapData[position] = 0x4030 + ((gPlayerEntity.base.animationState & 4) >> 2); + case SPECIAL_TILE_43 ... SPECIAL_TILE_45: + if (sub_0801A370(mapLayer, position) != 0) { + mapLayer->mapData[position] = SPECIAL_TILE_48 + ((gPlayerEntity.base.animationState & 4) >> 2); if ((gPlayerState.flags & PL_MINISH) != 0) { gPlayerState.pushedObject = 0xa0; } else { @@ -489,11 +491,11 @@ u32 UpdatePlayerCollision(void) { } else { return 0; } - case 0x404a: - if (sub_0801A458(layer, position, 8) == 0) { + case SPECIAL_TILE_74: + if (sub_0801A458(mapLayer, position, 8) == 0) { return 0; } - layer->mapData[position] = 0x404b + (gPlayerEntity.base.animationState >> 1); + mapLayer->mapData[position] = SPECIAL_TILE_75 + (gPlayerEntity.base.animationState >> 1); if ((gPlayerState.flags & PL_MINISH) != 0) { gPlayerState.pushedObject = 0xc0; } else { @@ -505,22 +507,22 @@ u32 UpdatePlayerCollision(void) { gPlayerEntity.base.y.HALF.LO = 0; gPlayerEntity.base.direction = Direction8FromAnimationState(gPlayerEntity.base.animationState); return 1; - case 0x4052: + case SPECIAL_TILE_82: if (gPlayerState.field_0x35 != 0) { return 0; } - SetBottomTile(0x4054, position, gPlayerEntity.base.collisionLayer); + SetTile(SPECIAL_TILE_84, position, gPlayerEntity.base.collisionLayer); return 4; - case 0x4053: + case SPECIAL_TILE_83: if (gPlayerState.field_0x35 != 6) { return 0; } - SetBottomTile(0x4054, position, gPlayerEntity.base.collisionLayer); + SetTile(SPECIAL_TILE_84, position, gPlayerEntity.base.collisionLayer); return 4; - case 0x4055: + case SPECIAL_TILE_85: position--; // fallthrough - case 0x4056: + case SPECIAL_TILE_86: if (gPlayerState.field_0x35 != 0) { return 0; } @@ -529,15 +531,15 @@ u32 UpdatePlayerCollision(void) { } for (index = 0; index < 3; index++) { if (sub_0801A8D0(gPlayerClones[index], 0) == position) { - SetBottomTile(0x4059, position, gPlayerEntity.base.collisionLayer); + SetTile(SPECIAL_TILE_89, position, gPlayerEntity.base.collisionLayer); return 4; } } return 0; - case 0x4057: + case SPECIAL_TILE_87: position -= 0x40; // fallthrough - case 0x4058: + case SPECIAL_TILE_88: if (gPlayerState.field_0x35 != 6) { return 0; } @@ -546,12 +548,12 @@ u32 UpdatePlayerCollision(void) { } for (index = 0; index < 3; index++) { if (sub_0801A8D0(gPlayerClones[index], 6) == position) { - SetBottomTile(0x4059, position, gPlayerEntity.base.collisionLayer); + SetTile(SPECIAL_TILE_89, position, gPlayerEntity.base.collisionLayer); return 4; } } return 0; - case 0x405f: + case SPECIAL_TILE_95: animationState3 = 2; animationState3 &= animationState1; if (animationState3 == 0) { @@ -563,7 +565,7 @@ u32 UpdatePlayerCollision(void) { if ((gPlayerEntity.base.frame & 1) == 0) { return 0; } - SetBottomTile(0x4074, position, gPlayerEntity.base.collisionLayer); + SetTile(SPECIAL_TILE_116, position, gPlayerEntity.base.collisionLayer); gPlayerState.pushedObject = 0xa0; gPlayerState.queued_action = PLAYER_PUSH; gPlayerState.flags |= PL_BUSY; @@ -571,7 +573,7 @@ u32 UpdatePlayerCollision(void) { gPlayerEntity.base.y.HALF.LO = 0; gPlayerEntity.base.direction = Direction8FromAnimationState(gPlayerEntity.base.animationState); return 1; - case 0x407d: + case SPECIAL_TILE_125: animationState3 = gPlayerEntity.base.animationState; if ((animationState2) != 4) { return 0; @@ -582,15 +584,15 @@ u32 UpdatePlayerCollision(void) { if ((gPlayerEntity.base.frame & 1) == 0) { return 0; } - SetBottomTile(0x4074, position, gPlayerEntity.base.collisionLayer); - sub_080001D0(0xd, position, gPlayerEntity.base.collisionLayer); + SetTile(SPECIAL_TILE_116, position, gPlayerEntity.base.collisionLayer); + SetActTileAtTilePos(ACT_TILE_13, position, gPlayerEntity.base.collisionLayer); return 1; default: return 0; } } -bool32 sub_0801A2B0(LayerStruct* layer, u32 position, u32 collisionType) { +bool32 sub_0801A2B0(MapLayer* mapLayer, u32 position, u32 collisionType) { u16 uVar1; s16 x; s16 y; @@ -600,7 +602,7 @@ bool32 sub_0801A2B0(LayerStruct* layer, u32 position, u32 collisionType) { if ((((gPlayerState.field_0x35 | gPlayerState.direction) & DIR_NOT_MOVING_CHECK) == 0) && ((gPlayerEntity.base.frame & 1) != 0)) { position = (u16)(position - (-uVar1)); // necessary for match - temp4 = sub_080B1B54(GetTileType(position, gPlayerEntity.base.collisionLayer)); + temp4 = GetActTileForTileType(GetTileTypeAtTilePos(position, gPlayerEntity.base.collisionLayer)); switch (temp4) { case 0x52: break; @@ -612,10 +614,10 @@ bool32 sub_0801A2B0(LayerStruct* layer, u32 position, u32 collisionType) { case 0x74: return FALSE; default: - if ((layer->collisionData[(position)] != 0x28)) { + if ((mapLayer->collisionData[(position)] != 0x28)) { x = (((position & 0x3f) * 0x10 + (u32)gRoomControls.origin_x)); y = (((position >> 6) * 0x10 + (u32)gRoomControls.origin_y)); - if ((!IsTileCollision(layer->collisionData, x, y, collisionType))) { + if ((!IsTileCollision(mapLayer->collisionData, x, y, collisionType))) { return TRUE; } } @@ -625,8 +627,8 @@ bool32 sub_0801A2B0(LayerStruct* layer, u32 position, u32 collisionType) { return FALSE; } -bool32 sub_0801A370(LayerStruct* layer, u32 position) { - LayerStruct* topLayer; +bool32 sub_0801A370(MapLayer* mapLayer, u32 position) { + MapLayer* topLayer; u32 tileType; u32 pos; s32 offset; @@ -638,21 +640,21 @@ bool32 sub_0801A370(LayerStruct* layer, u32 position) { if (!sub_0801A4F8()) { return FALSE; } - topLayer = GetTileBuffer(2); + topLayer = GetLayerByIndex(LAYER_TOP); offset = gUnk_080B4488[gPlayerEntity.base.animationState >> 1]; pos = position + offset; - tileType = GetTileType(pos, gPlayerEntity.base.collisionLayer); + tileType = GetTileTypeAtTilePos(pos, gPlayerEntity.base.collisionLayer); switch (tileType) { - case 0x402b: + case SPECIAL_TILE_43: pos += offset; break; - case 0x402c ... 0x402f: + case SPECIAL_TILE_44 ... SPECIAL_TILE_47: return TRUE; } if (topLayer->collisionData[pos - 0x80] == 0x46) { return FALSE; } - switch ((u16)sub_080B1B54(GetTileType(pos, gPlayerEntity.base.collisionLayer))) { + switch ((u16)GetActTileForTileType(GetTileTypeAtTilePos(pos, gPlayerEntity.base.collisionLayer))) { case 0x52: return FALSE; case 0x26: @@ -663,7 +665,7 @@ bool32 sub_0801A370(LayerStruct* layer, u32 position) { case 0x74: return FALSE; } - switch (temp = layer->collisionData[pos]) { + switch (temp = mapLayer->collisionData[pos]) { case 0: return TRUE; case 5: @@ -682,14 +684,14 @@ bool32 sub_0801A370(LayerStruct* layer, u32 position) { return FALSE; } -bool32 sub_0801A458(LayerStruct* layer, u32 position, u32 collisionType) { +bool32 sub_0801A458(MapLayer* mapLayer, u32 position, u32 collisionType) { u32 tileType; u32 pos; s32 offset = gUnk_080B4488[gPlayerEntity.base.animationState >> 1]; if (sub_0801A4F8()) { pos = position + offset; - tileType = GetTileType(pos, gPlayerEntity.base.collisionLayer); - switch (sub_080B1B54(tileType)) { + tileType = GetTileTypeAtTilePos(pos, gPlayerEntity.base.collisionLayer); + switch (GetActTileForTileType(tileType)) { case 0x52: case 0x26: case 0x27: @@ -697,10 +699,10 @@ bool32 sub_0801A458(LayerStruct* layer, u32 position, u32 collisionType) { case 0x74: return FALSE; default: - if (((layer->collisionData[pos] != 0x28) && - (!IsTileCollision(layer->collisionData, (pos & 0x3f) * 0x10 + gRoomControls.origin_x, + if (((mapLayer->collisionData[pos] != 0x28) && + (!IsTileCollision(mapLayer->collisionData, (pos & 0x3f) * 0x10 + gRoomControls.origin_x, (pos >> 6) * 0x10 + gRoomControls.origin_y, collisionType))) && - (0xe < (u32)layer->collisionData[pos] - 1)) { + (0xe < (u32)mapLayer->collisionData[pos] - 1)) { return TRUE; } break; @@ -737,19 +739,19 @@ bool32 sub_0801A4F8(void) { } u32 sub_0801A570(Entity* this, u32 param_2) { - LayerStruct* layer; + MapLayer* layer; u32 tileType; u32 position; u32 index1; u32 index2; - u16* metatileTypes; + u16* tileTypes; u8* collisionData; if (this == NULL) { return 0xffff; } - layer = GetTileBuffer(this->collisionLayer); - metatileTypes = layer->metatileTypes; + layer = GetLayerByIndex(this->collisionLayer); + tileTypes = layer->tileTypes; index1 = 4; index2 = 2; switch (this->animationState >> 1) { @@ -757,7 +759,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { default: position = COORD_TO_TILE_OFFSET(this, 0, 10); do { - if (metatileTypes[layer->mapData[position]] == 0x370) + if (tileTypes[layer->mapData[position]] == 0x370) break; position--; index1--; @@ -765,7 +767,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { position = position - 0x40; do { - if (metatileTypes[layer->mapData[(position)]] != 0x374) + if (tileTypes[layer->mapData[(position)]] != 0x374) break; index2++; position -= 0x40; @@ -775,7 +777,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { return position; } - index1 = GetTileType(position, this->collisionLayer); + index1 = GetTileTypeAtTilePos(position, this->collisionLayer); if ((index1 - 0x369) > 1) { position = 0xffff; } else { @@ -791,7 +793,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { case 1: position = COORD_TO_TILE_OFFSET(this, -10, 0); do { - if (layer->metatileTypes[layer->mapData[position]] == 0x370) + if (layer->tileTypes[layer->mapData[position]] == 0x370) break; position += 0x40; index1--; @@ -799,7 +801,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { position = position - 0x40; do { - if (metatileTypes[layer->mapData[(position)]] != 0x374) + if (tileTypes[layer->mapData[(position)]] != 0x374) break; index2++; position -= 0x40; @@ -809,7 +811,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { return position; } - index1 = GetTileType(position, this->collisionLayer); + index1 = GetTileTypeAtTilePos(position, this->collisionLayer); if (!(index1 == 0x369) && !(index1 == 0x36d)) position = 0xffff; else { @@ -825,7 +827,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { case 2: position = COORD_TO_TILE_OFFSET(this, 0, -10); do { - if (layer->metatileTypes[layer->mapData[position]] == 0x36f) + if (layer->tileTypes[layer->mapData[position]] == 0x36f) break; position++; index1--; @@ -833,7 +835,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { position = position - 1; do { - if (metatileTypes[layer->mapData[position]] != 0x372) + if (tileTypes[layer->mapData[position]] != 0x372) break; index2++; position--; @@ -843,7 +845,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { return position; } - index1 = GetTileType(position, this->collisionLayer); + index1 = GetTileTypeAtTilePos(position, this->collisionLayer); if (!(index1 == 0x369) && !(index1 == 0x36b)) position = 0xffff; else { @@ -859,7 +861,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { case 3: position = COORD_TO_TILE_OFFSET(this, 10, 0); do { - if (layer->metatileTypes[layer->mapData[position]] == 0x36f) + if (layer->tileTypes[layer->mapData[position]] == 0x36f) break; position -= 0x40; index1--; @@ -867,7 +869,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { position = position - 1; do { - if (metatileTypes[layer->mapData[position]] != 0x372) + if (tileTypes[layer->mapData[position]] != 0x372) break; index2++; position--; @@ -877,7 +879,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { return position; } - index1 = GetTileType(position, this->collisionLayer); + index1 = GetTileTypeAtTilePos(position, this->collisionLayer); if (!(index1 == 0x369) && !(index1 == 0x36c)) position = 0xffff; else { @@ -898,29 +900,29 @@ u32 sub_0801A570(Entity* this, u32 param_2) { u32 sub_0801A8D0(Entity* this, u32 param_2) { u16* mapData; - u32 tile; + u32 tileIndex; u32 position; if (this == NULL) return 0xffff; - mapData = GetTileBuffer(this->collisionLayer)->mapData; + mapData = GetLayerByIndex(this->collisionLayer)->mapData; if (param_2 == 0) { position = COORD_TO_TILE_OFFSET(this, 0, 8); - tile = mapData[position]; - if (tile == 0x4055) { + tileIndex = mapData[position]; + if (tileIndex == SPECIAL_TILE_85) { return position - 1; } - if (tile == 0x4056) { + if (tileIndex == SPECIAL_TILE_86) { return position; } } else { position = COORD_TO_TILE_OFFSET(this, 8, 0); - tile = mapData[position]; - if (tile == 0x4057) { + tileIndex = mapData[position]; + if (tileIndex == SPECIAL_TILE_87) { return position - 0x40; } - if (tile == 0x4058) { + if (tileIndex == SPECIAL_TILE_88) { return position; } } @@ -930,12 +932,12 @@ u32 sub_0801A8D0(Entity* this, u32 param_2) { bool32 sub_0801A980(void) { u16 tileType; const s16* ptr; - GetTileBuffer(gPlayerEntity.base.collisionLayer); + GetLayerByIndex(gPlayerEntity.base.collisionLayer); // TODO result unused? ptr = &gUnk_080B44A8[gPlayerEntity.base.animationState & 6]; - tileType = - GetTileType(COORD_TO_TILE_OFFSET(&gPlayerEntity.base, -ptr[0], -ptr[1]), gPlayerEntity.base.collisionLayer); + tileType = GetTileTypeAtTilePos(COORD_TO_TILE_OFFSET(&gPlayerEntity.base, -ptr[0], -ptr[1]), + gPlayerEntity.base.collisionLayer); if (tileType < 0x4000) { - sub_080B1B54(tileType); + GetActTileForTileType(tileType); } return FALSE; } @@ -978,13 +980,13 @@ bool32 sub_0801A9F0(u32 param_1, u32 param_2, u32 param_3) { } bool32 sub_0801AA58(Entity* this, u32 param_2, u32 param_3) { - LayerStruct* layer; + MapLayer* mapLayer; Entity* object; u32 temp; - layer = GetTileBuffer(this->collisionLayer); - if (((layer->collisionData[param_2 + gUnk_080B4488[param_3 >> 3]] == 0) || - ((u8)(layer->collisionData[param_2 + gUnk_080B4488[param_3 >> 3]] - 0x20) < 0x20))) { + mapLayer = GetLayerByIndex(this->collisionLayer); + if (((mapLayer->collisionData[param_2 + gUnk_080B4488[param_3 >> 3]] == 0) || + ((u8)(mapLayer->collisionData[param_2 + gUnk_080B4488[param_3 >> 3]] - 0x20) < 0x20))) { object = CreateObject(PUSHED_BLOCK, 0, 0); if (object != NULL) { @@ -1004,93 +1006,99 @@ bool32 sub_0801AA58(Entity* this, u32 param_2, u32 param_3) { return FALSE; } -void sub_0801AB08(u16* specialData, LayerStruct* layer) { - u16* metatiles; +void RenderMapLayerToSubTileMap(u16* subTileMap, MapLayer* mapLayer) { + u16* subTiles; u16* mapData; u16* mapDataOriginal; - u16 index; - u16 innerIndex; - u32 tmp2; - u32 tmp3; - u32 tmp1; + u16 tileY; + u16 tileX; + u32 tilePosAndLayer; + u32 layerIndex; + // Index into the tileSet at MapLayer.tiles + u32 tileSetIndex; - if (layer == &gMapBottom) { - tmp3 = 1; + if (mapLayer == &gMapBottom) { + layerIndex = 1; } else { - tmp3 = 2; + layerIndex = 2; } - tmp2 = tmp3 << 0xc; - mapDataOriginal = layer->mapDataOriginal; - mapData = layer->mapData; + tilePosAndLayer = layerIndex << 0xc; + mapDataOriginal = mapLayer->mapDataOriginal; + mapData = mapLayer->mapData; + + for (tileY = 0; tileY < 0x40; tileY++) { + for (tileX = 0; tileX < 0x10; tileX++) { + // inner loop seems to be unrolled four times for some reason? - for (index = 0; index < 0x40; index++) { - for (innerIndex = 0; innerIndex < 0x10; innerIndex++) { if (mapData[0] < 0x4000) { - tmp1 = mapData[0] << 2; + tileSetIndex = mapData[0] * 4; } else { - tmp1 = sub_0801AC68(tmp2, mapDataOriginal[0]); + tileSetIndex = GetTileSetIndexForSpecialTile(tilePosAndLayer, mapDataOriginal[0]); } - metatiles = layer->metatiles + tmp1; - specialData[0] = metatiles[0]; - specialData[1] = metatiles[1]; - specialData[0x80 + 0] = metatiles[2]; - specialData[0x80 + 1] = metatiles[3]; - specialData += 2; + subTiles = mapLayer->subTiles + tileSetIndex; + subTileMap[0] = subTiles[0]; + subTileMap[1] = subTiles[1]; + subTileMap[0x80 + 0] = subTiles[2]; + subTileMap[0x80 + 1] = subTiles[3]; + subTileMap += 2; + if (mapData[1] < 0x4000) { - tmp1 = mapData[1] << 2; + tileSetIndex = mapData[1] * 4; } else { - tmp1 = sub_0801AC68(tmp2 + 1, mapDataOriginal[1]); + tileSetIndex = GetTileSetIndexForSpecialTile(tilePosAndLayer + 1, mapDataOriginal[1]); } - metatiles = layer->metatiles + tmp1; - specialData[0] = metatiles[0]; - specialData[1] = metatiles[1]; - specialData[0x80 + 0] = metatiles[2]; - specialData[0x80 + 1] = metatiles[3]; - specialData += 2; + subTiles = mapLayer->subTiles + tileSetIndex; + subTileMap[0] = subTiles[0]; + subTileMap[1] = subTiles[1]; + subTileMap[0x80 + 0] = subTiles[2]; + subTileMap[0x80 + 1] = subTiles[3]; + subTileMap += 2; + if (mapData[2] < 0x4000) { - tmp1 = mapData[2] << 2; + tileSetIndex = mapData[2] * 4; } else { - tmp1 = sub_0801AC68(tmp2 + 2, mapDataOriginal[2]); + tileSetIndex = GetTileSetIndexForSpecialTile(tilePosAndLayer + 2, mapDataOriginal[2]); } - metatiles = layer->metatiles + tmp1; - specialData[0] = metatiles[0]; - specialData[1] = metatiles[1]; - specialData[0x80 + 0] = metatiles[2]; - specialData[0x80 + 1] = metatiles[3]; - specialData += 2; + subTiles = mapLayer->subTiles + tileSetIndex; + subTileMap[0] = subTiles[0]; + subTileMap[1] = subTiles[1]; + subTileMap[0x80 + 0] = subTiles[2]; + subTileMap[0x80 + 1] = subTiles[3]; + subTileMap += 2; + if (mapData[3] < 0x4000) { - tmp1 = mapData[3] << 2; + tileSetIndex = mapData[3] * 4; } else { - tmp1 = sub_0801AC68(tmp2 + 3, mapDataOriginal[3]); + tileSetIndex = GetTileSetIndexForSpecialTile(tilePosAndLayer + 3, mapDataOriginal[3]); } - metatiles = layer->metatiles + tmp1; - specialData[0] = metatiles[0]; - specialData[1] = metatiles[1]; - specialData[0x80 + 0] = metatiles[2]; - specialData[0x80 + 1] = metatiles[3]; - specialData += 2; + subTiles = mapLayer->subTiles + tileSetIndex; + subTileMap[0] = subTiles[0]; + subTileMap[1] = subTiles[1]; + subTileMap[0x80 + 0] = subTiles[2]; + subTileMap[0x80 + 1] = subTiles[3]; + subTileMap += 2; mapData += 4; mapDataOriginal += 4; - tmp2 = (u16)(tmp2 + 4); + tilePosAndLayer = (u16)(tilePosAndLayer + 4); } - specialData = specialData + 0x80; + subTileMap = subTileMap + 0x80; } } -u32 sub_0801AC68(u32 position, u32 data) { +u32 GetTileSetIndexForSpecialTile(u32 tilePosAndLayer, u32 tileIndex) { u32 index; - struct_0200B240* ptr; - u32 end; + SpecialTileEntry* ptr; + u32 count; - ptr = gUnk_0200B240; - end = gRoomVars.tileEntityCount; - for (index = 0; index < end; ptr++, index++) { - if (position == ptr->position) { - return ptr->data << 2; + ptr = gTilesForSpecialTiles; + count = gRoomVars.tileEntityCount; + for (index = 0; index < count; ptr++, index++) { + if (tilePosAndLayer == ptr->tilePosAndLayer) { + return ptr->tileIndex * 4; } } - return data << 2; + return tileIndex * 4; } void sub_0801AC98(void) { @@ -1108,7 +1116,7 @@ void sub_0801AC98(void) { for (indexY = 0; indexY < height; indexY++) { for (indexX = 0; indexX < width; indexX++, position++) { for (ptr = gUnk_080B44C0; ptr->tileType != 0xffff; ptr++) { - if (ptr->tileType == GetTileType(position, 1)) { + if (ptr->tileType == GetTileTypeAtTilePos(position, 1)) { if (gUnk_080B44B8[ptr->unk_a] != 0) { sub_0801AD6C(ptr, position); break; @@ -1117,7 +1125,7 @@ void sub_0801AC98(void) { } for (ptr = gUnk_080B44C2; ptr->tileType != 0xffff; ptr++) { - if (ptr->tileType == GetTileType(position, 2)) { + if (ptr->tileType == GetTileTypeAtTilePos(position, 2)) { if (gUnk_080B44B8[ptr->unk_a] != 0) { sub_0801AD6C(ptr, position); break; @@ -1129,7 +1137,7 @@ void sub_0801AC98(void) { } } -void sub_0801AD6C(const Data* param_1, u32 tilePosition) { +void sub_0801AD6C(const Data* param_1, u32 tilePos) { Entity* entity; Manager* manager; s32 tmpX1; @@ -1144,9 +1152,9 @@ void sub_0801AD6C(const Data* param_1, u32 tilePosition) { entity->id = (u8)param_1->id; entity->type = (u8)param_1->type; entity->type2 = (u8)param_1->type2; - tmpX1 = ((u16)tilePosition & 0x3f) * 0x10 + 8; + tmpX1 = ((u16)tilePos & 0x3f) * 0x10 + 8; entity->x.HALF.HI = tmpX1 + gRoomControls.origin_x; - tmpY1 = (s16)((tilePosition & 0xfc0) >> 2) + 8; + tmpY1 = (s16)((tilePos & 0xfc0) >> 2) + 8; entity->y.HALF.HI = tmpY1 + gRoomControls.origin_y; entity->collisionLayer = 0; ResolveCollisionLayer(entity); @@ -1160,9 +1168,9 @@ void sub_0801AD6C(const Data* param_1, u32 tilePosition) { manager->type = (u8)param_1->type; manager->type2 = (u8)param_1->type2; // TODO are these fields common for all managers or does this usually create managers of certain types? - tmpX2 = ((u16)tilePosition & 0x3f) * 0x10 + 8; + tmpX2 = ((u16)tilePos & 0x3f) * 0x10 + 8; *(u16*)(&manager[1].timer + 10) = tmpX2 + gRoomControls.origin_x; - tmpY2 = (s16)((tilePosition & 0xfc0) >> 2) + 8; + tmpY2 = (s16)((tilePos & 0xfc0) >> 2) + 8; *(u16*)(&manager[1].timer + 12) = tmpY2 + gRoomControls.origin_y; AppendEntityToList((Entity*)manager, gEntityListLUT[manager->kind]); } @@ -1179,8 +1187,8 @@ u32 sub_0801AE34(void) { void sub_0801AE44(bool32 loadGfx) { void (*func)(void); - gRoomControls.unk_34 = 0; - sub_0807BFD0(); + gRoomControls.tileSet = (u32)NULL; + LoadRoomTileSet(); if (loadGfx != 0) { LoadRoomGfx(); } @@ -1202,10 +1210,10 @@ void sub_0801AE44(bool32 loadGfx) { } if ((gRoomControls.scroll_flags & 1) == 0) { if (gMapBottom.bgSettings != NULL) { - sub_0801AB08(gMapDataBottomSpecial, &gMapBottom); + RenderMapLayerToSubTileMap(gMapDataBottomSpecial, &gMapBottom); } if (gMapTop.bgSettings != NULL) { - sub_0801AB08(gMapDataTopSpecial, &gMapTop); + RenderMapLayerToSubTileMap(gMapDataTopSpecial, &gMapTop); } } else { sub_0807C4F8(); @@ -1214,34 +1222,34 @@ void sub_0801AE44(bool32 loadGfx) { } void SetMultipleTiles(const TileData* tileData, u32 basePosition, u32 layer) { - while (tileData->tile != -1) { - SetBottomTile((u16)tileData->tile, basePosition + tileData->position, layer); + while (tileData->tileIndex != -1) { + SetTile((u16)tileData->tileIndex, basePosition + tileData->tilePosOffset, layer); tileData++; } } -// Add a new entry at the end of gUnk_0200B240 -void RegisterInteractTile(u32 data, u32 position, u32 layer) { +// Add a new entry at the end of gTilesForSpecialTiles +void RegisterInteractTile(u32 tileIndex, u32 tilePos, u32 layer) { u32 index; - if ((data < 0x4000) && (gRoomTransition.field30 == 0)) { + if ((tileIndex < 0x4000) && (gRoomTransition.field30 == 0)) { index = gRoomVars.tileEntityCount; if (index < 0x100) { - gUnk_0200B240[index].data = data; - gUnk_0200B240[index].position = (layer << 0xc) | position; + gTilesForSpecialTiles[index].tileIndex = tileIndex; + gTilesForSpecialTiles[index].tilePosAndLayer = (layer << 12) | tilePos; gRoomVars.tileEntityCount = index + 1; } } } -void UnregisterInteractTile(u32 position, s32 layer) { +void UnregisterInteractTile(u32 tilePos, s32 layer) { u32 count; - struct_0200B240* ptr; - u32 positionLayer; + SpecialTileEntry* ptr; + u32 tilePosAndLayer; u32 t; layer = layer << 12; - positionLayer = position | layer; - ptr = gUnk_0200B240; + tilePosAndLayer = tilePos | layer; + ptr = gTilesForSpecialTiles; count = gRoomVars.tileEntityCount; t = 0; @@ -1249,13 +1257,13 @@ void UnregisterInteractTile(u32 position, s32 layer) { return; } - if (positionLayer == ptr->position) { + if (tilePosAndLayer == ptr->tilePosAndLayer) { count--; gRoomVars.tileEntityCount = count; ptr[0] = ptr[count]; return; } - while (positionLayer != ptr->position) { + while (tilePosAndLayer != ptr->tilePosAndLayer) { ptr++; t++; if (t >= count) { @@ -1264,13 +1272,13 @@ void UnregisterInteractTile(u32 position, s32 layer) { } count--; gRoomVars.tileEntityCount = count; - ptr = gUnk_0200B240; + ptr = gTilesForSpecialTiles; ptr[t] = ptr[count]; } const struct_080B44D0 gUnk_080B44D0[] = { - { 0x67, 0x4084 }, { 0x68, 0x4085 }, { 0x69, 0x4086 }, { 0x6a, 0x4087 }, - { 0x6b, 0x4088 }, { 0x27, 0x4083 }, { 0x23, 0x408d }, { 0x0, 0x0 }, + { 0x67, SPECIAL_TILE_132 }, { 0x68, SPECIAL_TILE_133 }, { 0x69, SPECIAL_TILE_134 }, { 0x6a, SPECIAL_TILE_135 }, + { 0x6b, SPECIAL_TILE_136 }, { 0x27, SPECIAL_TILE_131 }, { 0x23, SPECIAL_TILE_141 }, { 0x0, 0x0 }, }; // used for minish houses, seems to overwrite all tiles with certain collision values on layer 1 for them? @@ -1283,13 +1291,13 @@ void sub_0801AFE4(void) { u32 height; collisionData = gMapBottom.collisionData; - width = gRoomControls.width >> 4; - height = gRoomControls.height >> 4; + width = gRoomControls.width / 16; + height = gRoomControls.height / 16; for (y = 0; y < height; y++) { for (x = 0; x < width; x++) { for (ptr = gUnk_080B44D0; ptr->collision != 0; ptr++) { if (ptr->collision == *collisionData) { - SetBottomTile(ptr->tileIndex, y * 0x40 + x, 1); + SetTile(ptr->tileIndex, y * 0x40 + x, LAYER_BOTTOM); break; } } diff --git a/src/code_08049CD4.c b/src/code_08049CD4.c index 4dddb214..077c5745 100644 --- a/src/code_08049CD4.c +++ b/src/code_08049CD4.c @@ -4,8 +4,8 @@ extern void MemFill32(u32, void*, u32); -void sub_08049DCC(RoomMemory*); -RoomMemory* sub_08049D88(void); +void UpdateCurrentRoom(RoomMemory*); +RoomMemory* AddCurrentRoom(void); void ClearRoomMemory(void) { MemFill32(0xFFFFFFFF, gRoomMemory, 0x40); @@ -19,8 +19,8 @@ void EnemyDisableRespawn(Enemy* ent) { } } -u32 EnemyEnableRespawn(u32 arg0) { - u32 bitmask = gCurrentRoomMemory->enemyBits >> arg0; +u32 EnemyEnableRespawn(u32 enemyIdx) { + u32 bitmask = gCurrentRoomMemory->enemyBits >> enemyIdx; u32 output = 1; output &= ~bitmask; return output; @@ -31,16 +31,16 @@ void UpdateRoomTracker(void) { do { if (gCurrentRoomMemory->area == gRoomControls.area && gCurrentRoomMemory->room == gRoomControls.room) { - sub_08049DCC(gCurrentRoomMemory); + UpdateCurrentRoom(gCurrentRoomMemory); return; } gCurrentRoomMemory++; } while (gCurrentRoomMemory < gRoomMemory + 8); - gCurrentRoomMemory = sub_08049D88(); + gCurrentRoomMemory = AddCurrentRoom(); } -RoomMemory* sub_08049D88(void) { +RoomMemory* AddCurrentRoom(void) { RoomMemory* rm = gRoomMemory; RoomMemory* r1 = rm + 1; @@ -57,12 +57,12 @@ RoomMemory* sub_08049D88(void) { rm->unk_02 = 0xFFFF; rm->enemyBits = 0; - sub_08049DCC(rm); + UpdateCurrentRoom(rm); return rm; } -void sub_08049DCC(RoomMemory* rm) { +void UpdateCurrentRoom(RoomMemory* rm) { RoomMemory* r1 = gRoomMemory; do { diff --git a/src/code_08049DF4.c b/src/code_08049DF4.c index c72da0d8..b2004f1a 100644 --- a/src/code_08049DF4.c +++ b/src/code_08049DF4.c @@ -136,11 +136,11 @@ u32 sub_0804A024(Entity* ent, u32 arg1, u32 arg2) { } } -u32 sub_0804A168(Entity*, Entity*, LayerStruct*); -u32 sub_0804A318(Entity*, Entity*, LayerStruct*); +u32 sub_0804A168(Entity*, Entity*, MapLayer* mapLayer); +u32 sub_0804A318(Entity*, Entity*, MapLayer* mapLayer); u32 sub_0804A044(Entity* entA, Entity* entB, u32 arg2) { - LayerStruct* layer; + MapLayer* mapLayer; s32 ret; s32 yDiff; s32 xDiff; @@ -167,7 +167,7 @@ u32 sub_0804A044(Entity* entA, Entity* entB, u32 arg2) { //! @bug flags & 5 can never equal 0xA if (flags && ((flags & 5) != 0xA)) { - layer = GetTileBuffer(entA->collisionLayer); + mapLayer = GetLayerByIndex(entA->collisionLayer); if (xDiff < 0) { xDiff = -xDiff; } @@ -176,7 +176,7 @@ u32 sub_0804A044(Entity* entA, Entity* entB, u32 arg2) { } if (xDiff < yDiff) { if (flags & 1) { - ret = sub_0804A168(entA, entB, layer); + ret = sub_0804A168(entA, entB, mapLayer); if (ret != 0xFF) { return ret; } @@ -184,10 +184,10 @@ u32 sub_0804A044(Entity* entA, Entity* entB, u32 arg2) { if (!(flags & 4)) { return 0xFF; } - ret = sub_0804A318(entA, entB, layer); + ret = sub_0804A318(entA, entB, mapLayer); } else { if (flags & 4) { - ret = sub_0804A318(entA, entB, layer); + ret = sub_0804A318(entA, entB, mapLayer); if (ret != 0xFF) { return ret; } @@ -195,7 +195,7 @@ u32 sub_0804A044(Entity* entA, Entity* entB, u32 arg2) { if (!(flags & 1)) { return 0xFF; } - ret = sub_0804A168(entA, entB, layer); + ret = sub_0804A168(entA, entB, mapLayer); } if (ret != 0xFF) { return ret; @@ -205,9 +205,9 @@ u32 sub_0804A044(Entity* entA, Entity* entB, u32 arg2) { return 0xFF; } -bool32 sub_0804A4BC(u8* arg0, u8* arg1, s32 arg2, u32 arg3); +bool32 sub_0804A4BC(u8* from, u8* to, s32 step, u32 bitmask); -u32 sub_0804A168(Entity* entA, Entity* entB, LayerStruct* layer) { +u32 sub_0804A168(Entity* entA, Entity* entB, MapLayer* mapLayer) { u32 uVar2; u32 uVar3; u32 tile1; @@ -219,13 +219,13 @@ u32 sub_0804A168(Entity* entA, Entity* entB, LayerStruct* layer) { tile1 = TILE(uVar2, entA->y.HALF.HI + 10); tile2 = TILE(uVar2, entB->y.HALF.HI); - if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], 0x40, uVar3)) { + if (sub_0804A4BC(&mapLayer->collisionData[tile1], &mapLayer->collisionData[tile2], 0x40, uVar3)) { uVar2 = entA->x.HALF.HI + 4; uVar3 ^= 0xF; tile1 = TILE(uVar2, entA->y.HALF.HI + 10); tile2 = TILE(uVar2, entB->y.HALF.HI); - if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], 0x40, uVar3)) { + if (sub_0804A4BC(&mapLayer->collisionData[tile1], &mapLayer->collisionData[tile2], 0x40, uVar3)) { return 0x10; } } @@ -235,13 +235,13 @@ u32 sub_0804A168(Entity* entA, Entity* entB, LayerStruct* layer) { tile1 = TILE(uVar2, entA->y.HALF.HI - 10); tile2 = TILE(uVar2, entB->y.HALF.HI); - if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], -0x40, uVar3)) { + if (sub_0804A4BC(&mapLayer->collisionData[tile1], &mapLayer->collisionData[tile2], -0x40, uVar3)) { uVar2 = entA->x.HALF.HI + 4; uVar3 ^= 0xF; tile1 = TILE(uVar2, entA->y.HALF.HI - 10); tile2 = TILE(uVar2, entB->y.HALF.HI); - if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], -0x40, uVar3)) { + if (sub_0804A4BC(&mapLayer->collisionData[tile1], &mapLayer->collisionData[tile2], -0x40, uVar3)) { return 0; } } @@ -249,7 +249,7 @@ u32 sub_0804A168(Entity* entA, Entity* entB, LayerStruct* layer) { return 0xFF; } -u32 sub_0804A318(Entity* entA, Entity* entB, LayerStruct* layer) { +u32 sub_0804A318(Entity* entA, Entity* entB, MapLayer* mapLayer) { u32 uVar2; u32 uVar3; u32 tile1; @@ -261,13 +261,13 @@ u32 sub_0804A318(Entity* entA, Entity* entB, LayerStruct* layer) { tile1 = TILE(entA->x.HALF.HI + 10, uVar2); tile2 = TILE(entB->x.HALF.HI, uVar2); - if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], 1, uVar3)) { + if (sub_0804A4BC(&mapLayer->collisionData[tile1], &mapLayer->collisionData[tile2], 1, uVar3)) { uVar2 = entA->y.HALF.HI + 4; uVar3 ^= 0xF; tile1 = TILE(entA->x.HALF.HI + 10, uVar2); tile2 = TILE(entB->x.HALF.HI, uVar2); - if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], 1, uVar3)) { + if (sub_0804A4BC(&mapLayer->collisionData[tile1], &mapLayer->collisionData[tile2], 1, uVar3)) { return 8; } } @@ -277,12 +277,12 @@ u32 sub_0804A318(Entity* entA, Entity* entB, LayerStruct* layer) { tile1 = TILE(entA->x.HALF.HI - 10, uVar2); tile2 = TILE(entB->x.HALF.HI, uVar2); - if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], -1, uVar3)) { + if (sub_0804A4BC(&mapLayer->collisionData[tile1], &mapLayer->collisionData[tile2], -1, uVar3)) { uVar2 = entA->y.HALF.HI + 4; uVar3 ^= 0xF; tile1 = TILE(entA->x.HALF.HI - 10, uVar2); tile2 = TILE(entB->x.HALF.HI, uVar2); - if (sub_0804A4BC(&layer->collisionData[tile1], &layer->collisionData[tile2], -1, uVar3)) { + if (sub_0804A4BC(&mapLayer->collisionData[tile1], &mapLayer->collisionData[tile2], -1, uVar3)) { return 0x18; } } @@ -290,21 +290,21 @@ u32 sub_0804A318(Entity* entA, Entity* entB, LayerStruct* layer) { return 0xFF; } -bool32 sub_0804A4BC(u8* arg0, u8* arg1, s32 arg2, u32 arg3) { - while (arg0 != arg1) { - u8 r0 = *arg0; +bool32 sub_0804A4BC(u8* from, u8* to, s32 step, u32 bitmask) { + while (from != to) { + u8 r0 = *from; if (r0 != 0) { if (r0 > 0xF) { return FALSE; } - r0 &= arg3; + r0 &= bitmask; if (r0 != 0) { return FALSE; } } - arg0 += arg2; + from += step; } return TRUE; diff --git a/src/code_0805EC04.c b/src/code_0805EC04.c index 4d584da9..09b0c6dd 100644 --- a/src/code_0805EC04.c +++ b/src/code_0805EC04.c @@ -85,17 +85,17 @@ void UpdatePlayerInput(void) { if (playerInput->playerMacroWaiting == 0) { // Execute next macro entry. do { flags = playerMacro->flags >> 0xe; - if (flags == 1) + if (flags == 1) // PLAYER_MACRO_JUMPTO (u8*)playerMacro += ((s16)playerMacro->keys); else { - if (flags == 3) { + if (flags == 3) { // PLAYER_MACRO_END playerInput->playerMacroWaiting = 0; playerInput->playerMacroHeldKeys = 0; playerMacro = NULL; playerInput->playerMacro = playerMacro; break; } else { - if (flags != 2) { + if (flags != 2) { // !PLAYER_MACRO_IGNORE playerInput->playerMacroWaiting = playerMacro->flags; playerInput->playerMacroHeldKeys = playerMacro->keys; } @@ -104,7 +104,6 @@ void UpdatePlayerInput(void) { break; } } - } while (TRUE); } playerInput->playerMacroWaiting--; diff --git a/src/collision.c b/src/collision.c index b8c0bbd3..a13d28cf 100644 --- a/src/collision.c +++ b/src/collision.c @@ -10,6 +10,7 @@ #include "object.h" #include "player.h" #include "save.h" +#include "tiles.h" extern u8 gCollidableCount; extern u8 gUnk_080B3740[]; @@ -788,135 +789,1464 @@ CollisionResult CollisionDefault(Entity* org, Entity* tgt, u32 direction, ColSet return RESULT_COLLISION; } -// unkData3 for tileType? - +// actTile for tileType? +const u8 gMapTileTypeToActTile[] = { + ACT_TILE_0, // TILE_TYPE_0 + ACT_TILE_1, // TILE_TYPE_1 + ACT_TILE_2, // TILE_TYPE_2 + ACT_TILE_3, // TILE_TYPE_3 + ACT_TILE_4, // TILE_TYPE_4 + ACT_TILE_5, // TILE_TYPE_5 + ACT_TILE_6, // TILE_TYPE_6 + ACT_TILE_7, // TILE_TYPE_7 + ACT_TILE_8, // TILE_TYPE_8 + ACT_TILE_9, // TILE_TYPE_9 + ACT_TILE_9, // TILE_TYPE_10 + ACT_TILE_10, // TILE_TYPE_11 + ACT_TILE_9, // TILE_TYPE_12 + ACT_TILE_9, // TILE_TYPE_13 + ACT_TILE_9, // TILE_TYPE_14 + ACT_TILE_9, // TILE_TYPE_15 + ACT_TILE_9, // TILE_TYPE_16 + ACT_TILE_9, // TILE_TYPE_17 + ACT_TILE_11, // TILE_TYPE_18 + ACT_TILE_12, // TILE_TYPE_19 + ACT_TILE_11, // TILE_TYPE_20 + ACT_TILE_11, // TILE_TYPE_21 + ACT_TILE_11, // TILE_TYPE_22 + ACT_TILE_11, // TILE_TYPE_23 + ACT_TILE_11, // TILE_TYPE_24 + ACT_TILE_11, // TILE_TYPE_25 + ACT_TILE_10, // TILE_TYPE_26 + ACT_TILE_10, // TILE_TYPE_27 + ACT_TILE_10, // TILE_TYPE_28 + ACT_TILE_10, // TILE_TYPE_29 + ACT_TILE_10, // TILE_TYPE_30 + ACT_TILE_10, // TILE_TYPE_31 + ACT_TILE_10, // TILE_TYPE_32 + ACT_TILE_10, // TILE_TYPE_33 + ACT_TILE_10, // TILE_TYPE_34 + ACT_TILE_10, // TILE_TYPE_35 + ACT_TILE_10, // TILE_TYPE_36 + ACT_TILE_10, // TILE_TYPE_37 + ACT_TILE_10, // TILE_TYPE_38 + ACT_TILE_10, // TILE_TYPE_39 + ACT_TILE_10, // TILE_TYPE_40 + ACT_TILE_12, // TILE_TYPE_41 + ACT_TILE_12, // TILE_TYPE_42 + ACT_TILE_12, // TILE_TYPE_43 + ACT_TILE_12, // TILE_TYPE_44 + ACT_TILE_12, // TILE_TYPE_45 + ACT_TILE_12, // TILE_TYPE_46 + ACT_TILE_12, // TILE_TYPE_47 + ACT_TILE_12, // TILE_TYPE_48 + ACT_TILE_12, // TILE_TYPE_49 + ACT_TILE_12, // TILE_TYPE_50 + ACT_TILE_12, // TILE_TYPE_51 + ACT_TILE_12, // TILE_TYPE_52 + ACT_TILE_13, // TILE_TYPE_53 + ACT_TILE_14, // TILE_TYPE_54 + ACT_TILE_14, // TILE_TYPE_55 + ACT_TILE_15, // TILE_TYPE_56 + ACT_TILE_16, // TILE_TYPE_57 + ACT_TILE_15, // TILE_TYPE_58 + ACT_TILE_14, // TILE_TYPE_59 + ACT_TILE_17, // TILE_TYPE_60 + ACT_TILE_18, // TILE_TYPE_61 + ACT_TILE_19, // TILE_TYPE_62 + ACT_TILE_20, // TILE_TYPE_63 + ACT_TILE_20, // TILE_TYPE_64 + ACT_TILE_20, // TILE_TYPE_65 + ACT_TILE_20, // TILE_TYPE_66 + ACT_TILE_20, // TILE_TYPE_67 + ACT_TILE_20, // TILE_TYPE_68 + ACT_TILE_20, // TILE_TYPE_69 + ACT_TILE_20, // TILE_TYPE_70 + ACT_TILE_20, // TILE_TYPE_71 + ACT_TILE_20, // TILE_TYPE_72 + ACT_TILE_20, // TILE_TYPE_73 + ACT_TILE_20, // TILE_TYPE_74 + ACT_TILE_20, // TILE_TYPE_75 + ACT_TILE_20, // TILE_TYPE_76 + ACT_TILE_20, // TILE_TYPE_77 + ACT_TILE_20, // TILE_TYPE_78 + ACT_TILE_20, // TILE_TYPE_79 + ACT_TILE_20, // TILE_TYPE_80 + ACT_TILE_20, // TILE_TYPE_81 + ACT_TILE_20, // TILE_TYPE_82 + ACT_TILE_20, // TILE_TYPE_83 + ACT_TILE_20, // TILE_TYPE_84 + ACT_TILE_21, // TILE_TYPE_85 + ACT_TILE_21, // TILE_TYPE_86 + ACT_TILE_21, // TILE_TYPE_87 + ACT_TILE_21, // TILE_TYPE_88 + ACT_TILE_21, // TILE_TYPE_89 + ACT_TILE_21, // TILE_TYPE_90 + ACT_TILE_21, // TILE_TYPE_91 + ACT_TILE_21, // TILE_TYPE_92 + ACT_TILE_21, // TILE_TYPE_93 + ACT_TILE_21, // TILE_TYPE_94 + ACT_TILE_21, // TILE_TYPE_95 + ACT_TILE_21, // TILE_TYPE_96 + ACT_TILE_22, // TILE_TYPE_97 + ACT_TILE_22, // TILE_TYPE_98 + ACT_TILE_22, // TILE_TYPE_99 + ACT_TILE_22, // TILE_TYPE_100 + ACT_TILE_22, // TILE_TYPE_101 + ACT_TILE_22, // TILE_TYPE_102 + ACT_TILE_22, // TILE_TYPE_103 + ACT_TILE_22, // TILE_TYPE_104 + ACT_TILE_23, // TILE_TYPE_105 + ACT_TILE_23, // TILE_TYPE_106 + ACT_TILE_24, // TILE_TYPE_107 + ACT_TILE_24, // TILE_TYPE_108 + ACT_TILE_24, // TILE_TYPE_109 + ACT_TILE_24, // TILE_TYPE_110 + ACT_TILE_0, // TILE_TYPE_111 + ACT_TILE_0, // TILE_TYPE_112 + ACT_TILE_25, // TILE_TYPE_113 + ACT_TILE_25, // TILE_TYPE_114 + ACT_TILE_26, // TILE_TYPE_115 + ACT_TILE_0, // TILE_TYPE_116 + ACT_TILE_0, // TILE_TYPE_117 + ACT_TILE_0, // TILE_TYPE_118 + ACT_TILE_27, // TILE_TYPE_119 + ACT_TILE_28, // TILE_TYPE_120 + ACT_TILE_29, // TILE_TYPE_121 + ACT_TILE_30, // TILE_TYPE_122 + ACT_TILE_31, // TILE_TYPE_123 + ACT_TILE_32, // TILE_TYPE_124 + ACT_TILE_33, // TILE_TYPE_125 + ACT_TILE_34, // TILE_TYPE_126 + ACT_TILE_35, // TILE_TYPE_127 + ACT_TILE_36, // TILE_TYPE_128 + ACT_TILE_0, // TILE_TYPE_129 + ACT_TILE_36, // TILE_TYPE_130 + ACT_TILE_36, // TILE_TYPE_131 + ACT_TILE_36, // TILE_TYPE_132 + ACT_TILE_36, // TILE_TYPE_133 + ACT_TILE_37, // TILE_TYPE_134 + ACT_TILE_38, // TILE_TYPE_135 + ACT_TILE_38, // TILE_TYPE_136 + ACT_TILE_39, // TILE_TYPE_137 + ACT_TILE_39, // TILE_TYPE_138 + ACT_TILE_40, // TILE_TYPE_139 + ACT_TILE_40, // TILE_TYPE_140 + ACT_TILE_40, // TILE_TYPE_141 + ACT_TILE_40, // TILE_TYPE_142 + ACT_TILE_40, // TILE_TYPE_143 + ACT_TILE_40, // TILE_TYPE_144 + ACT_TILE_40, // TILE_TYPE_145 + ACT_TILE_40, // TILE_TYPE_146 + ACT_TILE_40, // TILE_TYPE_147 + ACT_TILE_40, // TILE_TYPE_148 + ACT_TILE_40, // TILE_TYPE_149 + ACT_TILE_40, // TILE_TYPE_150 + ACT_TILE_40, // TILE_TYPE_151 + ACT_TILE_40, // TILE_TYPE_152 + ACT_TILE_40, // TILE_TYPE_153 + ACT_TILE_40, // TILE_TYPE_154 + ACT_TILE_40, // TILE_TYPE_155 + ACT_TILE_40, // TILE_TYPE_156 + ACT_TILE_41, // TILE_TYPE_157 + ACT_TILE_41, // TILE_TYPE_158 + ACT_TILE_40, // TILE_TYPE_159 + ACT_TILE_40, // TILE_TYPE_160 + ACT_TILE_42, // TILE_TYPE_161 + ACT_TILE_41, // TILE_TYPE_162 + ACT_TILE_40, // TILE_TYPE_163 + ACT_TILE_43, // TILE_TYPE_164 + ACT_TILE_41, // TILE_TYPE_165 + ACT_TILE_40, // TILE_TYPE_166 + ACT_TILE_44, // TILE_TYPE_167 + ACT_TILE_41, // TILE_TYPE_168 + ACT_TILE_40, // TILE_TYPE_169 + ACT_TILE_45, // TILE_TYPE_170 + ACT_TILE_0, // TILE_TYPE_171 + ACT_TILE_0, // TILE_TYPE_172 + ACT_TILE_0, // TILE_TYPE_173 + ACT_TILE_0, // TILE_TYPE_174 + ACT_TILE_46, // TILE_TYPE_175 + ACT_TILE_0, // TILE_TYPE_176 + ACT_TILE_0, // TILE_TYPE_177 #ifdef EU -const u8 gUnk_080B37A0[] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 9, 10, 9, 9, 9, 9, 9, 9, 11, 12, 11, 11, 11, - 11, 11, 11, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 12, 12, 12, 12, 12, - 12, 12, 12, 12, 12, 12, 12, 13, 14, 14, 15, 16, 15, 14, 17, 18, 19, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 21, 21, 21, 21, 21, 21, 21, - 21, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 24, 24, 24, 24, 0, 0, 25, 25, - 26, 0, 0, 0, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 0, 36, 36, 36, 36, 37, 38, 38, 39, - 39, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 41, 41, 40, 40, - 42, 41, 40, 43, 41, 40, 44, 41, 40, 45, 0, 0, 0, 0, 46, 0, 0, 0, 0, 0, 0, 40, 0, - 42, 42, 42, 0, 0, 0, 0, 46, 0, 0, 0, 0, 0, 0, 40, 0, 42, 42, 42, 0, 46, 0, 0, - 0, 0, 0, 0, 40, 0, 0, 0, 0, 43, 43, 43, 0, 0, 0, 0, 46, 0, 0, 0, 0, 0, 0, - 40, 0, 44, 44, 44, 0, 46, 0, 0, 0, 0, 0, 0, 40, 0, 0, 0, 0, 45, 45, 45, 0, 0, - 0, 0, 46, 0, 0, 0, 0, 0, 46, 0, 0, 46, 0, 0, 0, 0, 0, 0, 0, 46, 0, 0, 0, - 0, 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 47, 47, 47, 0, 0, 40, 0, 40, 48, 49, 50, 51, 52, 52, 53, - 53, 54, 55, 0, 56, 57, 58, 59, 0, 0, 60, 60, 60, 60, 0, 0, 0, 0, 61, 61, 62, 9, 9, - 9, 9, 9, 9, 61, 61, 61, 9, 9, 61, 61, 61, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 63, - 0, 0, 0, 0, 0, 0, 0, 0, 63, 0, 0, 0, 0, 0, 42, 43, 44, 45, 0, 0, 0, 0, 64, - 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 63, 0, 63, 83, - 83, 0, 0, 43, 43, 43, 0, 21, 21, 21, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, - 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 86, 0, 0, 86, 0, 0, - 41, 0, 0, 41, 40, 0, 0, 0, 0, 0, 86, 0, 0, 86, 0, 0, 41, 0, 0, 41, 40, 0, 0, - 0, 0, 0, 86, 0, 0, 86, 0, 0, 0, 0, 0, 0, 40, 0, 0, 0, 0, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 10, 9, 10, 10, 13, - 0, 0, 0, 0, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, - 16, 0, 12, 0, 0, 1, 24, 87, 88, 89, 89, 90, 91, 92, 93, 94, 95, 96, 0, 0, 0, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 13, 13, 12, 12, 12, 12, 12, 12, 97, 97, 97, 97, 98, 98, 0, 0, 99, 99, 99, 99, - 100, 0, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 112, 112, 112, 112, 0, 113, 46, 46, 114, - 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 115, 115, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 43, 44, 45, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 116, 116, 116, 0, 0, 0, 0, 43, 42, 45, 44, 117, 0, 82, - 0, 0, 0, 0, 0, 0, 43, 42, 0, 0, 44, 0, 0, 45, 0, 0, 0, 0, 41, 40, 38, 38, 116, - 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 90, 41, 41, 41, 12, 0, 12, 12, 41, 41, 116, - 0, 0, 10, 0, 0, 0, 0, 0, 0, 40, 0, 0, 0, 40, 0, 10, 10, 10, 10, 10, 10, 10, 40, - 40, 84, 84, 84, 84, 0, 61, 61, 61, 61, 61, 61, 61, 61, 62, 62, 62, 62, 62, 62, 62, 62, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 42, 10, 10, 10, 10, 10, 10, - 15, 10, 42, 13, 0, 42, 0, 0, 0, 0, 16, 16, 16, 16, 16, 16, 16, 16, 16, 9, 9, 9, 56, - 10, 42, 0, 10, 79, 77, 0, 0, 0, 0, 10, 0, 0, 0, 78, 78, 12, 12, 12, 12, 61, 61, 61, - 40, 12, 40, 10, 10, 10, 0, 0, 39, 39, 39, 39, 39, 39, 38, 38, 52, 52, 12, 55, 0, 0, 0, - 0, 0, 54, 0, 0, 0, 0, 40, 53, 53, 40, 55, 12, 0, 12, 12, 12, 12, 12, 54, 13, 40, 0, - 0, 0, 52, 52, 52, 10, 10, 0, 0, 0, 0, 40, 15, 15, 51, 16, 10, 10, 16, 16, 10, 10, 10, - 10, 0, 0, 15, 9, 14, 15, 14, 15, 15, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 116, 116, - 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 15, 40, 15, 40, 40, 15, 12, 12, 12, 12, 12, 25, - 40, 40, 40, 0, 16, 16, 116, 0, 0, 12, 45, 0, 40, 40, 43, 25, 0, 10, 0, 40, 0, 43, 43, - 43, 0, 42, 42, 42, 42, 0, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 44, 42, 42, 0, 38, - 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, 83, 0, 0, 0, 0, 38, 38, 40, 12, 12, 12, 12, - 12, 12, 12, 12, 12, 12, 12, 41, 41, 38, 38, 12, 12, 41, 41, 12, 12, 116, 116, 116, 116, 116, 0, - 0, 40, 0, 0, 43, 42, 0, 0, 44, 13, 40, 40, 42, 44, 45, 44, 45, 44, 45, 42, 42, 42, 43, - 43, 43, 100, 101, 104, 106, 102, 107, 105, 103, 0, 14, 14, 41, 40, 0, 0, 40, 0, 40, 0, 17, 15, - 0, 116, 43, 63, 35, 35, 35, 35, 116, 116, 0, 42, 42, 0, 0, 0, 10, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 0, 0, 44, 43, 40, 40, 40, 116, 0, 0, -}; + ACT_TILE_0, // TILE_TYPE_178 #else -const u8 gUnk_080B37A0[] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 9, 10, 9, 9, 9, 9, 9, 9, 11, 12, 11, 11, 11, - 11, 11, 11, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 12, 12, 12, 12, 12, - 12, 12, 12, 12, 12, 12, 12, 13, 14, 14, 15, 16, 15, 14, 17, 18, 19, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 21, 21, 21, 21, 21, 21, 21, - 21, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 24, 24, 24, 24, 0, 0, 25, 25, - 26, 0, 0, 0, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 0, 36, 36, 36, 36, 37, 38, 38, 39, - 39, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 41, 41, 40, 40, - 42, 41, 40, 43, 41, 40, 44, 41, 40, 45, 0, 0, 0, 0, 46, 0, 0, 41, 0, 0, 41, 40, 0, - 42, 42, 42, 0, 0, 0, 0, 46, 0, 0, 41, 0, 0, 41, 40, 0, 42, 42, 42, 0, 46, 0, 0, - 0, 0, 0, 41, 40, 0, 0, 41, 0, 43, 43, 43, 0, 0, 0, 0, 46, 0, 0, 41, 0, 0, 41, - 40, 0, 44, 44, 44, 0, 46, 0, 0, 0, 0, 0, 41, 40, 0, 0, 41, 0, 45, 45, 45, 0, 0, - 0, 0, 46, 0, 0, 0, 0, 0, 46, 0, 0, 46, 0, 0, 0, 0, 0, 0, 0, 46, 0, 0, 0, - 0, 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 47, 47, 47, 0, 0, 40, 0, 40, 48, 49, 50, 51, 52, 52, 53, - 53, 54, 55, 0, 56, 57, 58, 59, 0, 0, 60, 60, 60, 60, 0, 0, 0, 0, 61, 61, 62, 9, 9, - 9, 9, 9, 9, 61, 61, 61, 9, 9, 61, 61, 61, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 63, - 0, 0, 0, 0, 0, 0, 0, 0, 63, 0, 0, 0, 0, 0, 42, 43, 44, 45, 0, 0, 0, 0, 64, - 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 63, 0, 63, 83, - 83, 0, 0, 43, 43, 43, 0, 21, 21, 21, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, - 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0, 86, 0, 0, 86, 0, 0, - 41, 0, 0, 41, 40, 0, 0, 0, 0, 0, 86, 0, 0, 86, 0, 0, 41, 0, 0, 41, 40, 0, 0, - 0, 0, 0, 86, 0, 0, 86, 0, 0, 41, 0, 0, 41, 40, 0, 0, 0, 0, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 10, 9, 10, 10, 13, - 0, 0, 0, 0, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, - 16, 0, 12, 0, 0, 1, 24, 87, 88, 89, 89, 90, 91, 92, 93, 94, 95, 96, 0, 0, 0, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 13, 13, 12, 12, 12, 12, 12, 12, 97, 97, 97, 97, 98, 98, 0, 0, 99, 99, 99, 99, - 100, 0, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 112, 112, 112, 112, 0, 113, 46, 46, 114, - 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, 115, 115, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 43, 44, 45, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 116, 116, 116, 0, 0, 0, 0, 43, 42, 45, 44, 117, 0, 82, - 0, 0, 0, 0, 0, 0, 43, 42, 0, 0, 44, 0, 0, 45, 0, 0, 0, 0, 41, 40, 38, 38, 116, - 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 90, 41, 41, 41, 12, 0, 12, 12, 41, 41, 116, - 0, 0, 10, 0, 0, 0, 0, 0, 0, 40, 0, 0, 0, 40, 0, 10, 10, 10, 10, 10, 10, 10, 40, - 40, 84, 84, 84, 84, 0, 61, 61, 61, 61, 61, 61, 61, 61, 62, 62, 62, 62, 62, 62, 62, 62, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 42, 10, 10, 10, 10, 10, 10, - 15, 10, 42, 13, 0, 42, 0, 0, 0, 0, 16, 16, 16, 16, 16, 16, 16, 16, 16, 9, 9, 9, 56, - 10, 42, 0, 10, 79, 77, 0, 0, 0, 0, 10, 0, 0, 0, 78, 78, 12, 12, 12, 12, 61, 61, 61, - 40, 12, 40, 10, 10, 10, 0, 0, 39, 39, 39, 39, 39, 39, 38, 38, 52, 52, 12, 55, 0, 0, 0, - 0, 0, 54, 0, 0, 0, 0, 40, 53, 53, 40, 55, 12, 0, 12, 12, 12, 12, 12, 54, 13, 40, 0, - 0, 0, 52, 52, 52, 10, 10, 0, 0, 0, 0, 40, 15, 15, 51, 16, 10, 10, 16, 16, 10, 10, 10, - 10, 0, 0, 15, 9, 14, 15, 14, 15, 15, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 116, 116, - 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 15, 40, 15, 40, 40, 15, 12, 12, 12, 12, 12, 25, - 40, 40, 40, 0, 16, 16, 116, 0, 0, 12, 45, 0, 40, 40, 43, 25, 0, 10, 0, 40, 0, 43, 43, - 43, 0, 42, 42, 42, 42, 0, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 44, 42, 42, 0, 38, - 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, 83, 0, 0, 0, 0, 38, 38, 40, 12, 12, 12, 12, - 12, 12, 12, 12, 12, 12, 12, 41, 41, 38, 38, 12, 12, 41, 41, 12, 12, 116, 116, 116, 116, 116, 0, - 0, 40, 0, 0, 43, 42, 0, 0, 44, 13, 40, 40, 42, 44, 45, 44, 45, 44, 45, 42, 42, 42, 43, - 43, 43, 100, 101, 104, 106, 102, 107, 105, 103, 0, 14, 14, 41, 40, 41, 41, 40, 41, 40, 41, 17, 15, - 0, 116, 43, 63, 35, 35, 35, 35, 116, 116, 0, 42, 42, 0, 0, 0, 10, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 0, 0, 44, 43, 40, 40, 40, 116, 0, 0, -}; - + ACT_TILE_41, // TILE_TYPE_178 #endif + ACT_TILE_0, // TILE_TYPE_179 + ACT_TILE_0, // TILE_TYPE_180 +#ifdef EU + ACT_TILE_0, // TILE_TYPE_181 +#else + ACT_TILE_41, // TILE_TYPE_181 +#endif + ACT_TILE_40, // TILE_TYPE_182 + ACT_TILE_0, // TILE_TYPE_183 + ACT_TILE_42, // TILE_TYPE_184 + ACT_TILE_42, // TILE_TYPE_185 + ACT_TILE_42, // TILE_TYPE_186 + ACT_TILE_0, // TILE_TYPE_187 + ACT_TILE_0, // TILE_TYPE_188 + ACT_TILE_0, // TILE_TYPE_189 + ACT_TILE_0, // TILE_TYPE_190 + ACT_TILE_46, // TILE_TYPE_191 + ACT_TILE_0, // TILE_TYPE_192 + ACT_TILE_0, // TILE_TYPE_193 +#ifdef EU + ACT_TILE_0, // TILE_TYPE_194 +#else + ACT_TILE_41, // TILE_TYPE_194 +#endif + ACT_TILE_0, // TILE_TYPE_195 + ACT_TILE_0, // TILE_TYPE_196 +#ifdef EU + ACT_TILE_0, // TILE_TYPE_197 +#else + ACT_TILE_41, // TILE_TYPE_197 +#endif + ACT_TILE_40, // TILE_TYPE_198 + ACT_TILE_0, // TILE_TYPE_199 + ACT_TILE_42, // TILE_TYPE_200 + ACT_TILE_42, // TILE_TYPE_201 + ACT_TILE_42, // TILE_TYPE_202 + ACT_TILE_0, // TILE_TYPE_203 + ACT_TILE_46, // TILE_TYPE_204 + ACT_TILE_0, // TILE_TYPE_205 + ACT_TILE_0, // TILE_TYPE_206 + ACT_TILE_0, // TILE_TYPE_207 + ACT_TILE_0, // TILE_TYPE_208 + ACT_TILE_0, // TILE_TYPE_209 +#ifdef EU + ACT_TILE_0, // TILE_TYPE_210 +#else + ACT_TILE_41, // TILE_TYPE_210 +#endif + ACT_TILE_40, // TILE_TYPE_211 + ACT_TILE_0, // TILE_TYPE_212 + ACT_TILE_0, // TILE_TYPE_213 +#ifdef EU + ACT_TILE_0, // TILE_TYPE_214 +#else + ACT_TILE_41, // TILE_TYPE_214 +#endif + ACT_TILE_0, // TILE_TYPE_215 + ACT_TILE_43, // TILE_TYPE_216 + ACT_TILE_43, // TILE_TYPE_217 + ACT_TILE_43, // TILE_TYPE_218 + ACT_TILE_0, // TILE_TYPE_219 + ACT_TILE_0, // TILE_TYPE_220 + ACT_TILE_0, // TILE_TYPE_221 + ACT_TILE_0, // TILE_TYPE_222 + ACT_TILE_46, // TILE_TYPE_223 + ACT_TILE_0, // TILE_TYPE_224 + ACT_TILE_0, // TILE_TYPE_225 +#ifdef EU + ACT_TILE_0, // TILE_TYPE_226 +#else + ACT_TILE_41, // TILE_TYPE_226 +#endif + ACT_TILE_0, // TILE_TYPE_227 + ACT_TILE_0, // TILE_TYPE_228 +#ifdef EU + ACT_TILE_0, // TILE_TYPE_229 +#else + ACT_TILE_41, // TILE_TYPE_229 +#endif + ACT_TILE_40, // TILE_TYPE_230 + ACT_TILE_0, // TILE_TYPE_231 + ACT_TILE_44, // TILE_TYPE_232 + ACT_TILE_44, // TILE_TYPE_233 + ACT_TILE_44, // TILE_TYPE_234 + ACT_TILE_0, // TILE_TYPE_235 + ACT_TILE_46, // TILE_TYPE_236 + ACT_TILE_0, // TILE_TYPE_237 + ACT_TILE_0, // TILE_TYPE_238 + ACT_TILE_0, // TILE_TYPE_239 + ACT_TILE_0, // TILE_TYPE_240 + ACT_TILE_0, // TILE_TYPE_241 +#ifdef EU + ACT_TILE_0, // TILE_TYPE_242 +#else + ACT_TILE_41, // TILE_TYPE_242 +#endif + ACT_TILE_40, // TILE_TYPE_243 + ACT_TILE_0, // TILE_TYPE_244 + ACT_TILE_0, // TILE_TYPE_245 +#ifdef EU + ACT_TILE_0, // TILE_TYPE_246 +#else + ACT_TILE_41, // TILE_TYPE_246 +#endif + ACT_TILE_0, // TILE_TYPE_247 + ACT_TILE_45, // TILE_TYPE_248 + ACT_TILE_45, // TILE_TYPE_249 + ACT_TILE_45, // TILE_TYPE_250 + ACT_TILE_0, // TILE_TYPE_251 + ACT_TILE_0, // TILE_TYPE_252 + ACT_TILE_0, // TILE_TYPE_253 + ACT_TILE_0, // TILE_TYPE_254 + ACT_TILE_46, // TILE_TYPE_255 + ACT_TILE_0, // TILE_TYPE_256 + ACT_TILE_0, // TILE_TYPE_257 + ACT_TILE_0, // TILE_TYPE_258 + ACT_TILE_0, // TILE_TYPE_259 + ACT_TILE_0, // TILE_TYPE_260 + ACT_TILE_46, // TILE_TYPE_261 + ACT_TILE_0, // TILE_TYPE_262 + ACT_TILE_0, // TILE_TYPE_263 + ACT_TILE_46, // TILE_TYPE_264 + ACT_TILE_0, // TILE_TYPE_265 + ACT_TILE_0, // TILE_TYPE_266 + ACT_TILE_0, // TILE_TYPE_267 + ACT_TILE_0, // TILE_TYPE_268 + ACT_TILE_0, // TILE_TYPE_269 + ACT_TILE_0, // TILE_TYPE_270 + ACT_TILE_0, // TILE_TYPE_271 + ACT_TILE_46, // TILE_TYPE_272 + ACT_TILE_0, // TILE_TYPE_273 + ACT_TILE_0, // TILE_TYPE_274 + ACT_TILE_0, // TILE_TYPE_275 + ACT_TILE_0, // TILE_TYPE_276 + ACT_TILE_46, // TILE_TYPE_277 + ACT_TILE_0, // TILE_TYPE_278 + ACT_TILE_0, // TILE_TYPE_279 + ACT_TILE_0, // TILE_TYPE_280 + ACT_TILE_0, // TILE_TYPE_281 + ACT_TILE_0, // TILE_TYPE_282 + ACT_TILE_0, // TILE_TYPE_283 + ACT_TILE_0, // TILE_TYPE_284 + ACT_TILE_0, // TILE_TYPE_285 + ACT_TILE_0, // TILE_TYPE_286 + ACT_TILE_0, // TILE_TYPE_287 + ACT_TILE_0, // TILE_TYPE_288 + ACT_TILE_0, // TILE_TYPE_289 + ACT_TILE_0, // TILE_TYPE_290 + ACT_TILE_0, // TILE_TYPE_291 + ACT_TILE_0, // TILE_TYPE_292 + ACT_TILE_0, // TILE_TYPE_293 + ACT_TILE_0, // TILE_TYPE_294 + ACT_TILE_0, // TILE_TYPE_295 + ACT_TILE_0, // TILE_TYPE_296 + ACT_TILE_0, // TILE_TYPE_297 + ACT_TILE_0, // TILE_TYPE_298 + ACT_TILE_0, // TILE_TYPE_299 + ACT_TILE_0, // TILE_TYPE_300 + ACT_TILE_0, // TILE_TYPE_301 + ACT_TILE_0, // TILE_TYPE_302 + ACT_TILE_0, // TILE_TYPE_303 + ACT_TILE_0, // TILE_TYPE_304 + ACT_TILE_0, // TILE_TYPE_305 + ACT_TILE_0, // TILE_TYPE_306 + ACT_TILE_0, // TILE_TYPE_307 + ACT_TILE_0, // TILE_TYPE_308 + ACT_TILE_0, // TILE_TYPE_309 + ACT_TILE_0, // TILE_TYPE_310 + ACT_TILE_0, // TILE_TYPE_311 + ACT_TILE_0, // TILE_TYPE_312 + ACT_TILE_0, // TILE_TYPE_313 + ACT_TILE_0, // TILE_TYPE_314 + ACT_TILE_0, // TILE_TYPE_315 + ACT_TILE_0, // TILE_TYPE_316 + ACT_TILE_0, // TILE_TYPE_317 + ACT_TILE_0, // TILE_TYPE_318 + ACT_TILE_0, // TILE_TYPE_319 + ACT_TILE_0, // TILE_TYPE_320 + ACT_TILE_0, // TILE_TYPE_321 + ACT_TILE_0, // TILE_TYPE_322 + ACT_TILE_0, // TILE_TYPE_323 + ACT_TILE_0, // TILE_TYPE_324 + ACT_TILE_0, // TILE_TYPE_325 + ACT_TILE_0, // TILE_TYPE_326 + ACT_TILE_0, // TILE_TYPE_327 + ACT_TILE_0, // TILE_TYPE_328 + ACT_TILE_0, // TILE_TYPE_329 + ACT_TILE_0, // TILE_TYPE_330 + ACT_TILE_0, // TILE_TYPE_331 + ACT_TILE_0, // TILE_TYPE_332 + ACT_TILE_0, // TILE_TYPE_333 + ACT_TILE_0, // TILE_TYPE_334 + ACT_TILE_0, // TILE_TYPE_335 + ACT_TILE_0, // TILE_TYPE_336 + ACT_TILE_0, // TILE_TYPE_337 + ACT_TILE_0, // TILE_TYPE_338 + ACT_TILE_0, // TILE_TYPE_339 + ACT_TILE_0, // TILE_TYPE_340 + ACT_TILE_0, // TILE_TYPE_341 + ACT_TILE_0, // TILE_TYPE_342 + ACT_TILE_0, // TILE_TYPE_343 + ACT_TILE_0, // TILE_TYPE_344 + ACT_TILE_0, // TILE_TYPE_345 + ACT_TILE_0, // TILE_TYPE_346 + ACT_TILE_0, // TILE_TYPE_347 + ACT_TILE_0, // TILE_TYPE_348 + ACT_TILE_0, // TILE_TYPE_349 + ACT_TILE_0, // TILE_TYPE_350 + ACT_TILE_0, // TILE_TYPE_351 + ACT_TILE_0, // TILE_TYPE_352 + ACT_TILE_47, // TILE_TYPE_353 + ACT_TILE_47, // TILE_TYPE_354 + ACT_TILE_47, // TILE_TYPE_355 + ACT_TILE_0, // TILE_TYPE_356 + ACT_TILE_0, // TILE_TYPE_357 + ACT_TILE_40, // TILE_TYPE_358 + ACT_TILE_0, // TILE_TYPE_359 + ACT_TILE_40, // TILE_TYPE_360 + ACT_TILE_48, // TILE_TYPE_361 + ACT_TILE_49, // TILE_TYPE_362 + ACT_TILE_50, // TILE_TYPE_363 + ACT_TILE_51, // TILE_TYPE_364 + ACT_TILE_52, // TILE_TYPE_365 + ACT_TILE_52, // TILE_TYPE_366 + ACT_TILE_53, // TILE_TYPE_367 + ACT_TILE_53, // TILE_TYPE_368 + ACT_TILE_54, // TILE_TYPE_369 + ACT_TILE_55, // TILE_TYPE_370 + ACT_TILE_0, // TILE_TYPE_371 + ACT_TILE_56, // TILE_TYPE_372 + ACT_TILE_57, // TILE_TYPE_373 + ACT_TILE_58, // TILE_TYPE_374 + ACT_TILE_59, // TILE_TYPE_375 + ACT_TILE_0, // TILE_TYPE_376 + ACT_TILE_0, // TILE_TYPE_377 + ACT_TILE_60, // TILE_TYPE_378 + ACT_TILE_60, // TILE_TYPE_379 + ACT_TILE_60, // TILE_TYPE_380 + ACT_TILE_60, // TILE_TYPE_381 + ACT_TILE_0, // TILE_TYPE_382 + ACT_TILE_0, // TILE_TYPE_383 + ACT_TILE_0, // TILE_TYPE_384 + ACT_TILE_0, // TILE_TYPE_385 + ACT_TILE_61, // TILE_TYPE_386 + ACT_TILE_61, // TILE_TYPE_387 + ACT_TILE_62, // TILE_TYPE_388 + ACT_TILE_9, // TILE_TYPE_389 + ACT_TILE_9, // TILE_TYPE_390 + ACT_TILE_9, // TILE_TYPE_391 + ACT_TILE_9, // TILE_TYPE_392 + ACT_TILE_9, // TILE_TYPE_393 + ACT_TILE_9, // TILE_TYPE_394 + ACT_TILE_61, // TILE_TYPE_395 + ACT_TILE_61, // TILE_TYPE_396 + ACT_TILE_61, // TILE_TYPE_397 + ACT_TILE_9, // TILE_TYPE_398 + ACT_TILE_9, // TILE_TYPE_399 + ACT_TILE_61, // TILE_TYPE_400 + ACT_TILE_61, // TILE_TYPE_401 + ACT_TILE_61, // TILE_TYPE_402 + ACT_TILE_9, // TILE_TYPE_403 + ACT_TILE_9, // TILE_TYPE_404 + ACT_TILE_9, // TILE_TYPE_405 + ACT_TILE_9, // TILE_TYPE_406 + ACT_TILE_9, // TILE_TYPE_407 + ACT_TILE_9, // TILE_TYPE_408 + ACT_TILE_0, // TILE_TYPE_409 + ACT_TILE_0, // TILE_TYPE_410 + ACT_TILE_0, // TILE_TYPE_411 + ACT_TILE_0, // TILE_TYPE_412 + ACT_TILE_63, // TILE_TYPE_413 + ACT_TILE_0, // TILE_TYPE_414 + ACT_TILE_0, // TILE_TYPE_415 + ACT_TILE_0, // TILE_TYPE_416 + ACT_TILE_0, // TILE_TYPE_417 + ACT_TILE_0, // TILE_TYPE_418 + ACT_TILE_0, // TILE_TYPE_419 + ACT_TILE_0, // TILE_TYPE_420 + ACT_TILE_0, // TILE_TYPE_421 + ACT_TILE_63, // TILE_TYPE_422 + ACT_TILE_0, // TILE_TYPE_423 + ACT_TILE_0, // TILE_TYPE_424 + ACT_TILE_0, // TILE_TYPE_425 + ACT_TILE_0, // TILE_TYPE_426 + ACT_TILE_0, // TILE_TYPE_427 + ACT_TILE_42, // TILE_TYPE_428 + ACT_TILE_43, // TILE_TYPE_429 + ACT_TILE_44, // TILE_TYPE_430 + ACT_TILE_45, // TILE_TYPE_431 + ACT_TILE_0, // TILE_TYPE_432 + ACT_TILE_0, // TILE_TYPE_433 + ACT_TILE_0, // TILE_TYPE_434 + ACT_TILE_0, // TILE_TYPE_435 + ACT_TILE_64, // TILE_TYPE_436 + ACT_TILE_65, // TILE_TYPE_437 + ACT_TILE_66, // TILE_TYPE_438 + ACT_TILE_67, // TILE_TYPE_439 + ACT_TILE_68, // TILE_TYPE_440 + ACT_TILE_69, // TILE_TYPE_441 + ACT_TILE_70, // TILE_TYPE_442 + ACT_TILE_71, // TILE_TYPE_443 + ACT_TILE_72, // TILE_TYPE_444 + ACT_TILE_73, // TILE_TYPE_445 + ACT_TILE_74, // TILE_TYPE_446 + ACT_TILE_75, // TILE_TYPE_447 + ACT_TILE_76, // TILE_TYPE_448 + ACT_TILE_77, // TILE_TYPE_449 + ACT_TILE_78, // TILE_TYPE_450 + ACT_TILE_79, // TILE_TYPE_451 + ACT_TILE_80, // TILE_TYPE_452 + ACT_TILE_81, // TILE_TYPE_453 + ACT_TILE_82, // TILE_TYPE_454 + ACT_TILE_83, // TILE_TYPE_455 + ACT_TILE_63, // TILE_TYPE_456 + ACT_TILE_0, // TILE_TYPE_457 + ACT_TILE_63, // TILE_TYPE_458 + ACT_TILE_83, // TILE_TYPE_459 + ACT_TILE_83, // TILE_TYPE_460 + ACT_TILE_0, // TILE_TYPE_461 + ACT_TILE_0, // TILE_TYPE_462 + ACT_TILE_43, // TILE_TYPE_463 + ACT_TILE_43, // TILE_TYPE_464 + ACT_TILE_43, // TILE_TYPE_465 + ACT_TILE_0, // TILE_TYPE_466 + ACT_TILE_21, // TILE_TYPE_467 + ACT_TILE_21, // TILE_TYPE_468 + ACT_TILE_21, // TILE_TYPE_469 + ACT_TILE_21, // TILE_TYPE_470 + ACT_TILE_0, // TILE_TYPE_471 + ACT_TILE_0, // TILE_TYPE_472 + ACT_TILE_0, // TILE_TYPE_473 + ACT_TILE_0, // TILE_TYPE_474 + ACT_TILE_0, // TILE_TYPE_475 + ACT_TILE_0, // TILE_TYPE_476 + ACT_TILE_0, // TILE_TYPE_477 + ACT_TILE_0, // TILE_TYPE_478 + ACT_TILE_0, // TILE_TYPE_479 + ACT_TILE_0, // TILE_TYPE_480 + ACT_TILE_0, // TILE_TYPE_481 + ACT_TILE_0, // TILE_TYPE_482 + ACT_TILE_0, // TILE_TYPE_483 + ACT_TILE_0, // TILE_TYPE_484 + ACT_TILE_0, // TILE_TYPE_485 + ACT_TILE_0, // TILE_TYPE_486 + ACT_TILE_84, // TILE_TYPE_487 + ACT_TILE_0, // TILE_TYPE_488 + ACT_TILE_0, // TILE_TYPE_489 + ACT_TILE_0, // TILE_TYPE_490 + ACT_TILE_0, // TILE_TYPE_491 + ACT_TILE_0, // TILE_TYPE_492 + ACT_TILE_0, // TILE_TYPE_493 + ACT_TILE_0, // TILE_TYPE_494 + ACT_TILE_0, // TILE_TYPE_495 + ACT_TILE_0, // TILE_TYPE_496 + ACT_TILE_0, // TILE_TYPE_497 + ACT_TILE_0, // TILE_TYPE_498 + ACT_TILE_0, // TILE_TYPE_499 + ACT_TILE_0, // TILE_TYPE_500 + ACT_TILE_0, // TILE_TYPE_501 + ACT_TILE_0, // TILE_TYPE_502 + ACT_TILE_0, // TILE_TYPE_503 + ACT_TILE_0, // TILE_TYPE_504 + ACT_TILE_0, // TILE_TYPE_505 + ACT_TILE_0, // TILE_TYPE_506 + ACT_TILE_0, // TILE_TYPE_507 + ACT_TILE_0, // TILE_TYPE_508 + ACT_TILE_0, // TILE_TYPE_509 + ACT_TILE_0, // TILE_TYPE_510 + ACT_TILE_0, // TILE_TYPE_511 + ACT_TILE_0, // TILE_TYPE_512 + ACT_TILE_0, // TILE_TYPE_513 + ACT_TILE_0, // TILE_TYPE_514 + ACT_TILE_0, // TILE_TYPE_515 + ACT_TILE_0, // TILE_TYPE_516 + ACT_TILE_0, // TILE_TYPE_517 + ACT_TILE_0, // TILE_TYPE_518 + ACT_TILE_0, // TILE_TYPE_519 + ACT_TILE_0, // TILE_TYPE_520 + ACT_TILE_0, // TILE_TYPE_521 + ACT_TILE_0, // TILE_TYPE_522 + ACT_TILE_0, // TILE_TYPE_523 + ACT_TILE_40, // TILE_TYPE_524 + ACT_TILE_0, // TILE_TYPE_525 + ACT_TILE_0, // TILE_TYPE_526 + ACT_TILE_0, // TILE_TYPE_527 + ACT_TILE_0, // TILE_TYPE_528 + ACT_TILE_0, // TILE_TYPE_529 + ACT_TILE_0, // TILE_TYPE_530 + ACT_TILE_0, // TILE_TYPE_531 + ACT_TILE_0, // TILE_TYPE_532 + ACT_TILE_0, // TILE_TYPE_533 + ACT_TILE_0, // TILE_TYPE_534 + ACT_TILE_0, // TILE_TYPE_535 + ACT_TILE_0, // TILE_TYPE_536 + ACT_TILE_0, // TILE_TYPE_537 + ACT_TILE_0, // TILE_TYPE_538 + ACT_TILE_0, // TILE_TYPE_539 + ACT_TILE_0, // TILE_TYPE_540 + ACT_TILE_0, // TILE_TYPE_541 + ACT_TILE_0, // TILE_TYPE_542 + ACT_TILE_0, // TILE_TYPE_543 + ACT_TILE_0, // TILE_TYPE_544 + ACT_TILE_0, // TILE_TYPE_545 + ACT_TILE_0, // TILE_TYPE_546 + ACT_TILE_0, // TILE_TYPE_547 + ACT_TILE_0, // TILE_TYPE_548 + ACT_TILE_40, // TILE_TYPE_549 + ACT_TILE_0, // TILE_TYPE_550 + ACT_TILE_0, // TILE_TYPE_551 + ACT_TILE_0, // TILE_TYPE_552 + ACT_TILE_0, // TILE_TYPE_553 + ACT_TILE_0, // TILE_TYPE_554 + ACT_TILE_0, // TILE_TYPE_555 + ACT_TILE_0, // TILE_TYPE_556 + ACT_TILE_0, // TILE_TYPE_557 + ACT_TILE_0, // TILE_TYPE_558 + ACT_TILE_0, // TILE_TYPE_559 + ACT_TILE_0, // TILE_TYPE_560 + ACT_TILE_0, // TILE_TYPE_561 + ACT_TILE_16, // TILE_TYPE_562 + ACT_TILE_16, // TILE_TYPE_563 + ACT_TILE_16, // TILE_TYPE_564 + ACT_TILE_16, // TILE_TYPE_565 + ACT_TILE_16, // TILE_TYPE_566 + ACT_TILE_16, // TILE_TYPE_567 + ACT_TILE_16, // TILE_TYPE_568 + ACT_TILE_16, // TILE_TYPE_569 + ACT_TILE_16, // TILE_TYPE_570 + ACT_TILE_16, // TILE_TYPE_571 + ACT_TILE_16, // TILE_TYPE_572 + ACT_TILE_16, // TILE_TYPE_573 + ACT_TILE_16, // TILE_TYPE_574 + ACT_TILE_16, // TILE_TYPE_575 + ACT_TILE_16, // TILE_TYPE_576 + ACT_TILE_16, // TILE_TYPE_577 + ACT_TILE_16, // TILE_TYPE_578 + ACT_TILE_16, // TILE_TYPE_579 + ACT_TILE_16, // TILE_TYPE_580 + ACT_TILE_16, // TILE_TYPE_581 + ACT_TILE_16, // TILE_TYPE_582 + ACT_TILE_16, // TILE_TYPE_583 + ACT_TILE_16, // TILE_TYPE_584 + ACT_TILE_16, // TILE_TYPE_585 + ACT_TILE_16, // TILE_TYPE_586 + ACT_TILE_16, // TILE_TYPE_587 + ACT_TILE_16, // TILE_TYPE_588 + ACT_TILE_16, // TILE_TYPE_589 + ACT_TILE_85, // TILE_TYPE_590 + ACT_TILE_85, // TILE_TYPE_591 + ACT_TILE_85, // TILE_TYPE_592 + ACT_TILE_85, // TILE_TYPE_593 + ACT_TILE_85, // TILE_TYPE_594 + ACT_TILE_85, // TILE_TYPE_595 + ACT_TILE_85, // TILE_TYPE_596 + ACT_TILE_85, // TILE_TYPE_597 + ACT_TILE_85, // TILE_TYPE_598 + ACT_TILE_0, // TILE_TYPE_599 + ACT_TILE_0, // TILE_TYPE_600 + ACT_TILE_0, // TILE_TYPE_601 + ACT_TILE_0, // TILE_TYPE_602 + ACT_TILE_0, // TILE_TYPE_603 + ACT_TILE_0, // TILE_TYPE_604 + ACT_TILE_0, // TILE_TYPE_605 + ACT_TILE_0, // TILE_TYPE_606 + ACT_TILE_0, // TILE_TYPE_607 + ACT_TILE_0, // TILE_TYPE_608 + ACT_TILE_0, // TILE_TYPE_609 + ACT_TILE_9, // TILE_TYPE_610 + ACT_TILE_9, // TILE_TYPE_611 + ACT_TILE_0, // TILE_TYPE_612 + ACT_TILE_0, // TILE_TYPE_613 + ACT_TILE_0, // TILE_TYPE_614 + ACT_TILE_86, // TILE_TYPE_615 + ACT_TILE_0, // TILE_TYPE_616 + ACT_TILE_0, // TILE_TYPE_617 + ACT_TILE_86, // TILE_TYPE_618 + ACT_TILE_0, // TILE_TYPE_619 + ACT_TILE_0, // TILE_TYPE_620 + ACT_TILE_41, // TILE_TYPE_621 + ACT_TILE_0, // TILE_TYPE_622 + ACT_TILE_0, // TILE_TYPE_623 + ACT_TILE_41, // TILE_TYPE_624 + ACT_TILE_40, // TILE_TYPE_625 + ACT_TILE_0, // TILE_TYPE_626 + ACT_TILE_0, // TILE_TYPE_627 + ACT_TILE_0, // TILE_TYPE_628 + ACT_TILE_0, // TILE_TYPE_629 + ACT_TILE_0, // TILE_TYPE_630 + ACT_TILE_86, // TILE_TYPE_631 + ACT_TILE_0, // TILE_TYPE_632 + ACT_TILE_0, // TILE_TYPE_633 + ACT_TILE_86, // TILE_TYPE_634 + ACT_TILE_0, // TILE_TYPE_635 + ACT_TILE_0, // TILE_TYPE_636 + ACT_TILE_41, // TILE_TYPE_637 + ACT_TILE_0, // TILE_TYPE_638 + ACT_TILE_0, // TILE_TYPE_639 + ACT_TILE_41, // TILE_TYPE_640 + ACT_TILE_40, // TILE_TYPE_641 + ACT_TILE_0, // TILE_TYPE_642 + ACT_TILE_0, // TILE_TYPE_643 + ACT_TILE_0, // TILE_TYPE_644 + ACT_TILE_0, // TILE_TYPE_645 + ACT_TILE_0, // TILE_TYPE_646 + ACT_TILE_86, // TILE_TYPE_647 + ACT_TILE_0, // TILE_TYPE_648 + ACT_TILE_0, // TILE_TYPE_649 + ACT_TILE_86, // TILE_TYPE_650 + ACT_TILE_0, // TILE_TYPE_651 + ACT_TILE_0, // TILE_TYPE_652 +#ifdef EU + ACT_TILE_0, // TILE_TYPE_653 +#else + ACT_TILE_41, // TILE_TYPE_653 +#endif + ACT_TILE_0, // TILE_TYPE_654 + ACT_TILE_0, // TILE_TYPE_655 +#ifdef EU + ACT_TILE_0, // TILE_TYPE_656 +#else + ACT_TILE_41, // TILE_TYPE_656 +#endif + ACT_TILE_40, // TILE_TYPE_657 + ACT_TILE_0, // TILE_TYPE_658 + ACT_TILE_0, // TILE_TYPE_659 + ACT_TILE_0, // TILE_TYPE_660 + ACT_TILE_0, // TILE_TYPE_661 + ACT_TILE_86, // TILE_TYPE_662 + ACT_TILE_86, // TILE_TYPE_663 + ACT_TILE_86, // TILE_TYPE_664 + ACT_TILE_86, // TILE_TYPE_665 + ACT_TILE_86, // TILE_TYPE_666 + ACT_TILE_86, // TILE_TYPE_667 + ACT_TILE_86, // TILE_TYPE_668 + ACT_TILE_86, // TILE_TYPE_669 + ACT_TILE_86, // TILE_TYPE_670 + ACT_TILE_86, // TILE_TYPE_671 + ACT_TILE_86, // TILE_TYPE_672 + ACT_TILE_86, // TILE_TYPE_673 + ACT_TILE_86, // TILE_TYPE_674 + ACT_TILE_86, // TILE_TYPE_675 + ACT_TILE_86, // TILE_TYPE_676 + ACT_TILE_86, // TILE_TYPE_677 + ACT_TILE_86, // TILE_TYPE_678 + ACT_TILE_86, // TILE_TYPE_679 + ACT_TILE_86, // TILE_TYPE_680 + ACT_TILE_86, // TILE_TYPE_681 + ACT_TILE_86, // TILE_TYPE_682 + ACT_TILE_86, // TILE_TYPE_683 + ACT_TILE_86, // TILE_TYPE_684 + ACT_TILE_86, // TILE_TYPE_685 + ACT_TILE_86, // TILE_TYPE_686 + ACT_TILE_86, // TILE_TYPE_687 + ACT_TILE_86, // TILE_TYPE_688 + ACT_TILE_86, // TILE_TYPE_689 + ACT_TILE_86, // TILE_TYPE_690 + ACT_TILE_86, // TILE_TYPE_691 + ACT_TILE_86, // TILE_TYPE_692 + ACT_TILE_86, // TILE_TYPE_693 + ACT_TILE_86, // TILE_TYPE_694 + ACT_TILE_86, // TILE_TYPE_695 + ACT_TILE_86, // TILE_TYPE_696 + ACT_TILE_86, // TILE_TYPE_697 + ACT_TILE_86, // TILE_TYPE_698 + ACT_TILE_86, // TILE_TYPE_699 + ACT_TILE_86, // TILE_TYPE_700 + ACT_TILE_86, // TILE_TYPE_701 + ACT_TILE_86, // TILE_TYPE_702 + ACT_TILE_86, // TILE_TYPE_703 + ACT_TILE_86, // TILE_TYPE_704 + ACT_TILE_86, // TILE_TYPE_705 + ACT_TILE_86, // TILE_TYPE_706 + ACT_TILE_86, // TILE_TYPE_707 + ACT_TILE_86, // TILE_TYPE_708 + ACT_TILE_86, // TILE_TYPE_709 + ACT_TILE_86, // TILE_TYPE_710 + ACT_TILE_86, // TILE_TYPE_711 + ACT_TILE_86, // TILE_TYPE_712 + ACT_TILE_86, // TILE_TYPE_713 + ACT_TILE_86, // TILE_TYPE_714 + ACT_TILE_86, // TILE_TYPE_715 + ACT_TILE_86, // TILE_TYPE_716 + ACT_TILE_86, // TILE_TYPE_717 + ACT_TILE_86, // TILE_TYPE_718 + ACT_TILE_86, // TILE_TYPE_719 + ACT_TILE_86, // TILE_TYPE_720 + ACT_TILE_86, // TILE_TYPE_721 + ACT_TILE_86, // TILE_TYPE_722 + ACT_TILE_86, // TILE_TYPE_723 + ACT_TILE_86, // TILE_TYPE_724 + ACT_TILE_86, // TILE_TYPE_725 + ACT_TILE_86, // TILE_TYPE_726 + ACT_TILE_86, // TILE_TYPE_727 + ACT_TILE_86, // TILE_TYPE_728 + ACT_TILE_86, // TILE_TYPE_729 + ACT_TILE_86, // TILE_TYPE_730 + ACT_TILE_86, // TILE_TYPE_731 + ACT_TILE_86, // TILE_TYPE_732 + ACT_TILE_86, // TILE_TYPE_733 + ACT_TILE_86, // TILE_TYPE_734 + ACT_TILE_86, // TILE_TYPE_735 + ACT_TILE_86, // TILE_TYPE_736 + ACT_TILE_86, // TILE_TYPE_737 + ACT_TILE_86, // TILE_TYPE_738 + ACT_TILE_86, // TILE_TYPE_739 + ACT_TILE_86, // TILE_TYPE_740 + ACT_TILE_86, // TILE_TYPE_741 + ACT_TILE_86, // TILE_TYPE_742 + ACT_TILE_86, // TILE_TYPE_743 + ACT_TILE_86, // TILE_TYPE_744 + ACT_TILE_86, // TILE_TYPE_745 + ACT_TILE_86, // TILE_TYPE_746 + ACT_TILE_86, // TILE_TYPE_747 + ACT_TILE_86, // TILE_TYPE_748 + ACT_TILE_86, // TILE_TYPE_749 + ACT_TILE_86, // TILE_TYPE_750 + ACT_TILE_86, // TILE_TYPE_751 + ACT_TILE_86, // TILE_TYPE_752 + ACT_TILE_86, // TILE_TYPE_753 + ACT_TILE_10, // TILE_TYPE_754 + ACT_TILE_9, // TILE_TYPE_755 + ACT_TILE_10, // TILE_TYPE_756 + ACT_TILE_10, // TILE_TYPE_757 + ACT_TILE_13, // TILE_TYPE_758 + ACT_TILE_0, // TILE_TYPE_759 + ACT_TILE_0, // TILE_TYPE_760 + ACT_TILE_0, // TILE_TYPE_761 + ACT_TILE_0, // TILE_TYPE_762 + ACT_TILE_63, // TILE_TYPE_763 + ACT_TILE_0, // TILE_TYPE_764 + ACT_TILE_0, // TILE_TYPE_765 + ACT_TILE_0, // TILE_TYPE_766 + ACT_TILE_0, // TILE_TYPE_767 + ACT_TILE_0, // TILE_TYPE_768 + ACT_TILE_0, // TILE_TYPE_769 + ACT_TILE_0, // TILE_TYPE_770 + ACT_TILE_0, // TILE_TYPE_771 + ACT_TILE_0, // TILE_TYPE_772 + ACT_TILE_0, // TILE_TYPE_773 + ACT_TILE_0, // TILE_TYPE_774 + ACT_TILE_0, // TILE_TYPE_775 + ACT_TILE_0, // TILE_TYPE_776 + ACT_TILE_0, // TILE_TYPE_777 + ACT_TILE_0, // TILE_TYPE_778 + ACT_TILE_0, // TILE_TYPE_779 + ACT_TILE_0, // TILE_TYPE_780 + ACT_TILE_16, // TILE_TYPE_781 + ACT_TILE_16, // TILE_TYPE_782 + ACT_TILE_0, // TILE_TYPE_783 + ACT_TILE_12, // TILE_TYPE_784 + ACT_TILE_0, // TILE_TYPE_785 + ACT_TILE_0, // TILE_TYPE_786 + ACT_TILE_1, // TILE_TYPE_787 + ACT_TILE_24, // TILE_TYPE_788 + ACT_TILE_87, // TILE_TYPE_789 + ACT_TILE_88, // TILE_TYPE_790 + ACT_TILE_89, // TILE_TYPE_791 + ACT_TILE_89, // TILE_TYPE_792 + ACT_TILE_90, // TILE_TYPE_793 + ACT_TILE_91, // TILE_TYPE_794 + ACT_TILE_92, // TILE_TYPE_795 + ACT_TILE_93, // TILE_TYPE_796 + ACT_TILE_94, // TILE_TYPE_797 + ACT_TILE_95, // TILE_TYPE_798 + ACT_TILE_96, // TILE_TYPE_799 + ACT_TILE_0, // TILE_TYPE_800 + ACT_TILE_0, // TILE_TYPE_801 + ACT_TILE_0, // TILE_TYPE_802 + ACT_TILE_13, // TILE_TYPE_803 + ACT_TILE_13, // TILE_TYPE_804 + ACT_TILE_13, // TILE_TYPE_805 + ACT_TILE_13, // TILE_TYPE_806 + ACT_TILE_13, // TILE_TYPE_807 + ACT_TILE_13, // TILE_TYPE_808 + ACT_TILE_13, // TILE_TYPE_809 + ACT_TILE_13, // TILE_TYPE_810 + ACT_TILE_13, // TILE_TYPE_811 + ACT_TILE_13, // TILE_TYPE_812 + ACT_TILE_13, // TILE_TYPE_813 + ACT_TILE_13, // TILE_TYPE_814 + ACT_TILE_13, // TILE_TYPE_815 + ACT_TILE_13, // TILE_TYPE_816 + ACT_TILE_13, // TILE_TYPE_817 + ACT_TILE_13, // TILE_TYPE_818 + ACT_TILE_13, // TILE_TYPE_819 + ACT_TILE_13, // TILE_TYPE_820 + ACT_TILE_13, // TILE_TYPE_821 + ACT_TILE_13, // TILE_TYPE_822 + ACT_TILE_13, // TILE_TYPE_823 + ACT_TILE_13, // TILE_TYPE_824 + ACT_TILE_13, // TILE_TYPE_825 + ACT_TILE_13, // TILE_TYPE_826 + ACT_TILE_13, // TILE_TYPE_827 + ACT_TILE_13, // TILE_TYPE_828 + ACT_TILE_13, // TILE_TYPE_829 + ACT_TILE_13, // TILE_TYPE_830 + ACT_TILE_13, // TILE_TYPE_831 + ACT_TILE_13, // TILE_TYPE_832 + ACT_TILE_12, // TILE_TYPE_833 + ACT_TILE_12, // TILE_TYPE_834 + ACT_TILE_12, // TILE_TYPE_835 + ACT_TILE_12, // TILE_TYPE_836 + ACT_TILE_12, // TILE_TYPE_837 + ACT_TILE_12, // TILE_TYPE_838 + ACT_TILE_97, // TILE_TYPE_839 + ACT_TILE_97, // TILE_TYPE_840 + ACT_TILE_97, // TILE_TYPE_841 + ACT_TILE_97, // TILE_TYPE_842 + ACT_TILE_98, // TILE_TYPE_843 + ACT_TILE_98, // TILE_TYPE_844 + ACT_TILE_0, // TILE_TYPE_845 + ACT_TILE_0, // TILE_TYPE_846 + ACT_TILE_99, // TILE_TYPE_847 + ACT_TILE_99, // TILE_TYPE_848 + ACT_TILE_99, // TILE_TYPE_849 + ACT_TILE_99, // TILE_TYPE_850 + ACT_TILE_100, // TILE_TYPE_851 + ACT_TILE_0, // TILE_TYPE_852 + ACT_TILE_101, // TILE_TYPE_853 + ACT_TILE_102, // TILE_TYPE_854 + ACT_TILE_103, // TILE_TYPE_855 + ACT_TILE_104, // TILE_TYPE_856 + ACT_TILE_105, // TILE_TYPE_857 + ACT_TILE_106, // TILE_TYPE_858 + ACT_TILE_107, // TILE_TYPE_859 + ACT_TILE_108, // TILE_TYPE_860 + ACT_TILE_109, // TILE_TYPE_861 + ACT_TILE_110, // TILE_TYPE_862 + ACT_TILE_111, // TILE_TYPE_863 + ACT_TILE_112, // TILE_TYPE_864 + ACT_TILE_112, // TILE_TYPE_865 + ACT_TILE_112, // TILE_TYPE_866 + ACT_TILE_112, // TILE_TYPE_867 + ACT_TILE_112, // TILE_TYPE_868 + ACT_TILE_0, // TILE_TYPE_869 + ACT_TILE_113, // TILE_TYPE_870 + ACT_TILE_46, // TILE_TYPE_871 + ACT_TILE_46, // TILE_TYPE_872 + ACT_TILE_114, // TILE_TYPE_873 + ACT_TILE_114, // TILE_TYPE_874 + ACT_TILE_114, // TILE_TYPE_875 + ACT_TILE_114, // TILE_TYPE_876 + ACT_TILE_114, // TILE_TYPE_877 + ACT_TILE_114, // TILE_TYPE_878 + ACT_TILE_114, // TILE_TYPE_879 + ACT_TILE_114, // TILE_TYPE_880 + ACT_TILE_114, // TILE_TYPE_881 + ACT_TILE_114, // TILE_TYPE_882 + ACT_TILE_114, // TILE_TYPE_883 + ACT_TILE_114, // TILE_TYPE_884 + ACT_TILE_114, // TILE_TYPE_885 + ACT_TILE_114, // TILE_TYPE_886 + ACT_TILE_115, // TILE_TYPE_887 + ACT_TILE_115, // TILE_TYPE_888 + ACT_TILE_0, // TILE_TYPE_889 + ACT_TILE_0, // TILE_TYPE_890 + ACT_TILE_0, // TILE_TYPE_891 + ACT_TILE_0, // TILE_TYPE_892 + ACT_TILE_0, // TILE_TYPE_893 + ACT_TILE_0, // TILE_TYPE_894 + ACT_TILE_0, // TILE_TYPE_895 + ACT_TILE_0, // TILE_TYPE_896 + ACT_TILE_0, // TILE_TYPE_897 + ACT_TILE_0, // TILE_TYPE_898 + ACT_TILE_0, // TILE_TYPE_899 + ACT_TILE_0, // TILE_TYPE_900 + ACT_TILE_0, // TILE_TYPE_901 + ACT_TILE_0, // TILE_TYPE_902 + ACT_TILE_0, // TILE_TYPE_903 + ACT_TILE_0, // TILE_TYPE_904 + ACT_TILE_0, // TILE_TYPE_905 + ACT_TILE_0, // TILE_TYPE_906 + ACT_TILE_0, // TILE_TYPE_907 + ACT_TILE_0, // TILE_TYPE_908 + ACT_TILE_0, // TILE_TYPE_909 + ACT_TILE_0, // TILE_TYPE_910 + ACT_TILE_0, // TILE_TYPE_911 + ACT_TILE_0, // TILE_TYPE_912 + ACT_TILE_0, // TILE_TYPE_913 + ACT_TILE_0, // TILE_TYPE_914 + ACT_TILE_0, // TILE_TYPE_915 + ACT_TILE_42, // TILE_TYPE_916 + ACT_TILE_43, // TILE_TYPE_917 + ACT_TILE_44, // TILE_TYPE_918 + ACT_TILE_45, // TILE_TYPE_919 + ACT_TILE_0, // TILE_TYPE_920 + ACT_TILE_0, // TILE_TYPE_921 + ACT_TILE_0, // TILE_TYPE_922 + ACT_TILE_0, // TILE_TYPE_923 + ACT_TILE_0, // TILE_TYPE_924 + ACT_TILE_0, // TILE_TYPE_925 + ACT_TILE_0, // TILE_TYPE_926 + ACT_TILE_0, // TILE_TYPE_927 + ACT_TILE_0, // TILE_TYPE_928 + ACT_TILE_116, // TILE_TYPE_929 + ACT_TILE_116, // TILE_TYPE_930 + ACT_TILE_116, // TILE_TYPE_931 + ACT_TILE_0, // TILE_TYPE_932 + ACT_TILE_0, // TILE_TYPE_933 + ACT_TILE_0, // TILE_TYPE_934 + ACT_TILE_0, // TILE_TYPE_935 + ACT_TILE_43, // TILE_TYPE_936 + ACT_TILE_42, // TILE_TYPE_937 + ACT_TILE_45, // TILE_TYPE_938 + ACT_TILE_44, // TILE_TYPE_939 + ACT_TILE_117, // TILE_TYPE_940 + ACT_TILE_0, // TILE_TYPE_941 + ACT_TILE_82, // TILE_TYPE_942 + ACT_TILE_0, // TILE_TYPE_943 + ACT_TILE_0, // TILE_TYPE_944 + ACT_TILE_0, // TILE_TYPE_945 + ACT_TILE_0, // TILE_TYPE_946 + ACT_TILE_0, // TILE_TYPE_947 + ACT_TILE_0, // TILE_TYPE_948 + ACT_TILE_43, // TILE_TYPE_949 + ACT_TILE_42, // TILE_TYPE_950 + ACT_TILE_0, // TILE_TYPE_951 + ACT_TILE_0, // TILE_TYPE_952 + ACT_TILE_44, // TILE_TYPE_953 + ACT_TILE_0, // TILE_TYPE_954 + ACT_TILE_0, // TILE_TYPE_955 + ACT_TILE_45, // TILE_TYPE_956 + ACT_TILE_0, // TILE_TYPE_957 + ACT_TILE_0, // TILE_TYPE_958 + ACT_TILE_0, // TILE_TYPE_959 + ACT_TILE_0, // TILE_TYPE_960 + ACT_TILE_41, // TILE_TYPE_961 + ACT_TILE_40, // TILE_TYPE_962 + ACT_TILE_38, // TILE_TYPE_963 + ACT_TILE_38, // TILE_TYPE_964 + ACT_TILE_116, // TILE_TYPE_965 + ACT_TILE_116, // TILE_TYPE_966 + ACT_TILE_116, // TILE_TYPE_967 + ACT_TILE_116, // TILE_TYPE_968 + ACT_TILE_116, // TILE_TYPE_969 + ACT_TILE_116, // TILE_TYPE_970 + ACT_TILE_116, // TILE_TYPE_971 + ACT_TILE_116, // TILE_TYPE_972 + ACT_TILE_116, // TILE_TYPE_973 + ACT_TILE_116, // TILE_TYPE_974 + ACT_TILE_116, // TILE_TYPE_975 + ACT_TILE_116, // TILE_TYPE_976 + ACT_TILE_116, // TILE_TYPE_977 + ACT_TILE_90, // TILE_TYPE_978 + ACT_TILE_41, // TILE_TYPE_979 + ACT_TILE_41, // TILE_TYPE_980 + ACT_TILE_41, // TILE_TYPE_981 + ACT_TILE_12, // TILE_TYPE_982 + ACT_TILE_0, // TILE_TYPE_983 + ACT_TILE_12, // TILE_TYPE_984 + ACT_TILE_12, // TILE_TYPE_985 + ACT_TILE_41, // TILE_TYPE_986 + ACT_TILE_41, // TILE_TYPE_987 + ACT_TILE_116, // TILE_TYPE_988 + ACT_TILE_0, // TILE_TYPE_989 + ACT_TILE_0, // TILE_TYPE_990 + ACT_TILE_10, // TILE_TYPE_991 + ACT_TILE_0, // TILE_TYPE_992 + ACT_TILE_0, // TILE_TYPE_993 + ACT_TILE_0, // TILE_TYPE_994 + ACT_TILE_0, // TILE_TYPE_995 + ACT_TILE_0, // TILE_TYPE_996 + ACT_TILE_0, // TILE_TYPE_997 + ACT_TILE_40, // TILE_TYPE_998 + ACT_TILE_0, // TILE_TYPE_999 + ACT_TILE_0, // TILE_TYPE_1000 + ACT_TILE_0, // TILE_TYPE_1001 + ACT_TILE_40, // TILE_TYPE_1002 + ACT_TILE_0, // TILE_TYPE_1003 + ACT_TILE_10, // TILE_TYPE_1004 + ACT_TILE_10, // TILE_TYPE_1005 + ACT_TILE_10, // TILE_TYPE_1006 + ACT_TILE_10, // TILE_TYPE_1007 + ACT_TILE_10, // TILE_TYPE_1008 + ACT_TILE_10, // TILE_TYPE_1009 + ACT_TILE_10, // TILE_TYPE_1010 + ACT_TILE_40, // TILE_TYPE_1011 + ACT_TILE_40, // TILE_TYPE_1012 + ACT_TILE_84, // TILE_TYPE_1013 + ACT_TILE_84, // TILE_TYPE_1014 + ACT_TILE_84, // TILE_TYPE_1015 + ACT_TILE_84, // TILE_TYPE_1016 + ACT_TILE_0, // TILE_TYPE_1017 + ACT_TILE_61, // TILE_TYPE_1018 + ACT_TILE_61, // TILE_TYPE_1019 + ACT_TILE_61, // TILE_TYPE_1020 + ACT_TILE_61, // TILE_TYPE_1021 + ACT_TILE_61, // TILE_TYPE_1022 + ACT_TILE_61, // TILE_TYPE_1023 + ACT_TILE_61, // TILE_TYPE_1024 + ACT_TILE_61, // TILE_TYPE_1025 + ACT_TILE_62, // TILE_TYPE_1026 + ACT_TILE_62, // TILE_TYPE_1027 + ACT_TILE_62, // TILE_TYPE_1028 + ACT_TILE_62, // TILE_TYPE_1029 + ACT_TILE_62, // TILE_TYPE_1030 + ACT_TILE_62, // TILE_TYPE_1031 + ACT_TILE_62, // TILE_TYPE_1032 + ACT_TILE_62, // TILE_TYPE_1033 + ACT_TILE_9, // TILE_TYPE_1034 + ACT_TILE_9, // TILE_TYPE_1035 + ACT_TILE_9, // TILE_TYPE_1036 + ACT_TILE_9, // TILE_TYPE_1037 + ACT_TILE_9, // TILE_TYPE_1038 + ACT_TILE_9, // TILE_TYPE_1039 + ACT_TILE_9, // TILE_TYPE_1040 + ACT_TILE_9, // TILE_TYPE_1041 + ACT_TILE_9, // TILE_TYPE_1042 + ACT_TILE_9, // TILE_TYPE_1043 + ACT_TILE_9, // TILE_TYPE_1044 + ACT_TILE_9, // TILE_TYPE_1045 + ACT_TILE_9, // TILE_TYPE_1046 + ACT_TILE_9, // TILE_TYPE_1047 + ACT_TILE_9, // TILE_TYPE_1048 + ACT_TILE_9, // TILE_TYPE_1049 + ACT_TILE_9, // TILE_TYPE_1050 + ACT_TILE_42, // TILE_TYPE_1051 + ACT_TILE_10, // TILE_TYPE_1052 + ACT_TILE_10, // TILE_TYPE_1053 + ACT_TILE_10, // TILE_TYPE_1054 + ACT_TILE_10, // TILE_TYPE_1055 + ACT_TILE_10, // TILE_TYPE_1056 + ACT_TILE_10, // TILE_TYPE_1057 + ACT_TILE_15, // TILE_TYPE_1058 + ACT_TILE_10, // TILE_TYPE_1059 + ACT_TILE_42, // TILE_TYPE_1060 + ACT_TILE_13, // TILE_TYPE_1061 + ACT_TILE_0, // TILE_TYPE_1062 + ACT_TILE_42, // TILE_TYPE_1063 + ACT_TILE_0, // TILE_TYPE_1064 + ACT_TILE_0, // TILE_TYPE_1065 + ACT_TILE_0, // TILE_TYPE_1066 + ACT_TILE_0, // TILE_TYPE_1067 + ACT_TILE_16, // TILE_TYPE_1068 + ACT_TILE_16, // TILE_TYPE_1069 + ACT_TILE_16, // TILE_TYPE_1070 + ACT_TILE_16, // TILE_TYPE_1071 + ACT_TILE_16, // TILE_TYPE_1072 + ACT_TILE_16, // TILE_TYPE_1073 + ACT_TILE_16, // TILE_TYPE_1074 + ACT_TILE_16, // TILE_TYPE_1075 + ACT_TILE_16, // TILE_TYPE_1076 + ACT_TILE_9, // TILE_TYPE_1077 + ACT_TILE_9, // TILE_TYPE_1078 + ACT_TILE_9, // TILE_TYPE_1079 + ACT_TILE_56, // TILE_TYPE_1080 + ACT_TILE_10, // TILE_TYPE_1081 + ACT_TILE_42, // TILE_TYPE_1082 + ACT_TILE_0, // TILE_TYPE_1083 + ACT_TILE_10, // TILE_TYPE_1084 + ACT_TILE_79, // TILE_TYPE_1085 + ACT_TILE_77, // TILE_TYPE_1086 + ACT_TILE_0, // TILE_TYPE_1087 + ACT_TILE_0, // TILE_TYPE_1088 + ACT_TILE_0, // TILE_TYPE_1089 + ACT_TILE_0, // TILE_TYPE_1090 + ACT_TILE_10, // TILE_TYPE_1091 + ACT_TILE_0, // TILE_TYPE_1092 + ACT_TILE_0, // TILE_TYPE_1093 + ACT_TILE_0, // TILE_TYPE_1094 + ACT_TILE_78, // TILE_TYPE_1095 + ACT_TILE_78, // TILE_TYPE_1096 + ACT_TILE_12, // TILE_TYPE_1097 + ACT_TILE_12, // TILE_TYPE_1098 + ACT_TILE_12, // TILE_TYPE_1099 + ACT_TILE_12, // TILE_TYPE_1100 + ACT_TILE_61, // TILE_TYPE_1101 + ACT_TILE_61, // TILE_TYPE_1102 + ACT_TILE_61, // TILE_TYPE_1103 + ACT_TILE_40, // TILE_TYPE_1104 + ACT_TILE_12, // TILE_TYPE_1105 + ACT_TILE_40, // TILE_TYPE_1106 + ACT_TILE_10, // TILE_TYPE_1107 + ACT_TILE_10, // TILE_TYPE_1108 + ACT_TILE_10, // TILE_TYPE_1109 + ACT_TILE_0, // TILE_TYPE_1110 + ACT_TILE_0, // TILE_TYPE_1111 + ACT_TILE_39, // TILE_TYPE_1112 + ACT_TILE_39, // TILE_TYPE_1113 + ACT_TILE_39, // TILE_TYPE_1114 + ACT_TILE_39, // TILE_TYPE_1115 + ACT_TILE_39, // TILE_TYPE_1116 + ACT_TILE_39, // TILE_TYPE_1117 + ACT_TILE_38, // TILE_TYPE_1118 + ACT_TILE_38, // TILE_TYPE_1119 + ACT_TILE_52, // TILE_TYPE_1120 + ACT_TILE_52, // TILE_TYPE_1121 + ACT_TILE_12, // TILE_TYPE_1122 + ACT_TILE_55, // TILE_TYPE_1123 + ACT_TILE_0, // TILE_TYPE_1124 + ACT_TILE_0, // TILE_TYPE_1125 + ACT_TILE_0, // TILE_TYPE_1126 + ACT_TILE_0, // TILE_TYPE_1127 + ACT_TILE_0, // TILE_TYPE_1128 + ACT_TILE_54, // TILE_TYPE_1129 + ACT_TILE_0, // TILE_TYPE_1130 + ACT_TILE_0, // TILE_TYPE_1131 + ACT_TILE_0, // TILE_TYPE_1132 + ACT_TILE_0, // TILE_TYPE_1133 + ACT_TILE_40, // TILE_TYPE_1134 + ACT_TILE_53, // TILE_TYPE_1135 + ACT_TILE_53, // TILE_TYPE_1136 + ACT_TILE_40, // TILE_TYPE_1137 + ACT_TILE_55, // TILE_TYPE_1138 + ACT_TILE_12, // TILE_TYPE_1139 + ACT_TILE_0, // TILE_TYPE_1140 + ACT_TILE_12, // TILE_TYPE_1141 + ACT_TILE_12, // TILE_TYPE_1142 + ACT_TILE_12, // TILE_TYPE_1143 + ACT_TILE_12, // TILE_TYPE_1144 + ACT_TILE_12, // TILE_TYPE_1145 + ACT_TILE_54, // TILE_TYPE_1146 + ACT_TILE_13, // TILE_TYPE_1147 + ACT_TILE_40, // TILE_TYPE_1148 + ACT_TILE_0, // TILE_TYPE_1149 + ACT_TILE_0, // TILE_TYPE_1150 + ACT_TILE_0, // TILE_TYPE_1151 + ACT_TILE_52, // TILE_TYPE_1152 + ACT_TILE_52, // TILE_TYPE_1153 + ACT_TILE_52, // TILE_TYPE_1154 + ACT_TILE_10, // TILE_TYPE_1155 + ACT_TILE_10, // TILE_TYPE_1156 + ACT_TILE_0, // TILE_TYPE_1157 + ACT_TILE_0, // TILE_TYPE_1158 + ACT_TILE_0, // TILE_TYPE_1159 + ACT_TILE_0, // TILE_TYPE_1160 + ACT_TILE_40, // TILE_TYPE_1161 + ACT_TILE_15, // TILE_TYPE_1162 + ACT_TILE_15, // TILE_TYPE_1163 + ACT_TILE_51, // TILE_TYPE_1164 + ACT_TILE_16, // TILE_TYPE_1165 + ACT_TILE_10, // TILE_TYPE_1166 + ACT_TILE_10, // TILE_TYPE_1167 + ACT_TILE_16, // TILE_TYPE_1168 + ACT_TILE_16, // TILE_TYPE_1169 + ACT_TILE_10, // TILE_TYPE_1170 + ACT_TILE_10, // TILE_TYPE_1171 + ACT_TILE_10, // TILE_TYPE_1172 + ACT_TILE_10, // TILE_TYPE_1173 + ACT_TILE_0, // TILE_TYPE_1174 + ACT_TILE_0, // TILE_TYPE_1175 + ACT_TILE_15, // TILE_TYPE_1176 + ACT_TILE_9, // TILE_TYPE_1177 + ACT_TILE_14, // TILE_TYPE_1178 + ACT_TILE_15, // TILE_TYPE_1179 + ACT_TILE_14, // TILE_TYPE_1180 + ACT_TILE_15, // TILE_TYPE_1181 + ACT_TILE_15, // TILE_TYPE_1182 + ACT_TILE_15, // TILE_TYPE_1183 + ACT_TILE_0, // TILE_TYPE_1184 + ACT_TILE_0, // TILE_TYPE_1185 + ACT_TILE_0, // TILE_TYPE_1186 + ACT_TILE_0, // TILE_TYPE_1187 + ACT_TILE_0, // TILE_TYPE_1188 + ACT_TILE_0, // TILE_TYPE_1189 + ACT_TILE_0, // TILE_TYPE_1190 + ACT_TILE_0, // TILE_TYPE_1191 + ACT_TILE_0, // TILE_TYPE_1192 + ACT_TILE_0, // TILE_TYPE_1193 + ACT_TILE_116, // TILE_TYPE_1194 + ACT_TILE_116, // TILE_TYPE_1195 + ACT_TILE_116, // TILE_TYPE_1196 + ACT_TILE_116, // TILE_TYPE_1197 + ACT_TILE_116, // TILE_TYPE_1198 + ACT_TILE_116, // TILE_TYPE_1199 + ACT_TILE_116, // TILE_TYPE_1200 + ACT_TILE_116, // TILE_TYPE_1201 + ACT_TILE_116, // TILE_TYPE_1202 + ACT_TILE_116, // TILE_TYPE_1203 + ACT_TILE_116, // TILE_TYPE_1204 + ACT_TILE_116, // TILE_TYPE_1205 + ACT_TILE_116, // TILE_TYPE_1206 + ACT_TILE_15, // TILE_TYPE_1207 + ACT_TILE_40, // TILE_TYPE_1208 + ACT_TILE_15, // TILE_TYPE_1209 + ACT_TILE_40, // TILE_TYPE_1210 + ACT_TILE_40, // TILE_TYPE_1211 + ACT_TILE_15, // TILE_TYPE_1212 + ACT_TILE_12, // TILE_TYPE_1213 + ACT_TILE_12, // TILE_TYPE_1214 + ACT_TILE_12, // TILE_TYPE_1215 + ACT_TILE_12, // TILE_TYPE_1216 + ACT_TILE_12, // TILE_TYPE_1217 + ACT_TILE_25, // TILE_TYPE_1218 + ACT_TILE_40, // TILE_TYPE_1219 + ACT_TILE_40, // TILE_TYPE_1220 + ACT_TILE_40, // TILE_TYPE_1221 + ACT_TILE_0, // TILE_TYPE_1222 + ACT_TILE_16, // TILE_TYPE_1223 + ACT_TILE_16, // TILE_TYPE_1224 + ACT_TILE_116, // TILE_TYPE_1225 + ACT_TILE_0, // TILE_TYPE_1226 + ACT_TILE_0, // TILE_TYPE_1227 + ACT_TILE_12, // TILE_TYPE_1228 + ACT_TILE_45, // TILE_TYPE_1229 + ACT_TILE_0, // TILE_TYPE_1230 + ACT_TILE_40, // TILE_TYPE_1231 + ACT_TILE_40, // TILE_TYPE_1232 + ACT_TILE_43, // TILE_TYPE_1233 + ACT_TILE_25, // TILE_TYPE_1234 + ACT_TILE_0, // TILE_TYPE_1235 + ACT_TILE_10, // TILE_TYPE_1236 + ACT_TILE_0, // TILE_TYPE_1237 + ACT_TILE_40, // TILE_TYPE_1238 + ACT_TILE_0, // TILE_TYPE_1239 + ACT_TILE_43, // TILE_TYPE_1240 + ACT_TILE_43, // TILE_TYPE_1241 + ACT_TILE_43, // TILE_TYPE_1242 + ACT_TILE_0, // TILE_TYPE_1243 + ACT_TILE_42, // TILE_TYPE_1244 + ACT_TILE_42, // TILE_TYPE_1245 + ACT_TILE_42, // TILE_TYPE_1246 + ACT_TILE_42, // TILE_TYPE_1247 + ACT_TILE_0, // TILE_TYPE_1248 + ACT_TILE_116, // TILE_TYPE_1249 + ACT_TILE_116, // TILE_TYPE_1250 + ACT_TILE_116, // TILE_TYPE_1251 + ACT_TILE_116, // TILE_TYPE_1252 + ACT_TILE_116, // TILE_TYPE_1253 + ACT_TILE_116, // TILE_TYPE_1254 + ACT_TILE_116, // TILE_TYPE_1255 + ACT_TILE_116, // TILE_TYPE_1256 + ACT_TILE_116, // TILE_TYPE_1257 + ACT_TILE_116, // TILE_TYPE_1258 + ACT_TILE_116, // TILE_TYPE_1259 + ACT_TILE_44, // TILE_TYPE_1260 + ACT_TILE_42, // TILE_TYPE_1261 + ACT_TILE_42, // TILE_TYPE_1262 + ACT_TILE_0, // TILE_TYPE_1263 + ACT_TILE_38, // TILE_TYPE_1264 + ACT_TILE_38, // TILE_TYPE_1265 + ACT_TILE_0, // TILE_TYPE_1266 + ACT_TILE_0, // TILE_TYPE_1267 + ACT_TILE_0, // TILE_TYPE_1268 + ACT_TILE_0, // TILE_TYPE_1269 + ACT_TILE_0, // TILE_TYPE_1270 + ACT_TILE_0, // TILE_TYPE_1271 + ACT_TILE_0, // TILE_TYPE_1272 + ACT_TILE_0, // TILE_TYPE_1273 + ACT_TILE_0, // TILE_TYPE_1274 + ACT_TILE_63, // TILE_TYPE_1275 + ACT_TILE_83, // TILE_TYPE_1276 + ACT_TILE_0, // TILE_TYPE_1277 + ACT_TILE_0, // TILE_TYPE_1278 + ACT_TILE_0, // TILE_TYPE_1279 + ACT_TILE_0, // TILE_TYPE_1280 + ACT_TILE_38, // TILE_TYPE_1281 + ACT_TILE_38, // TILE_TYPE_1282 + ACT_TILE_40, // TILE_TYPE_1283 + ACT_TILE_12, // TILE_TYPE_1284 + ACT_TILE_12, // TILE_TYPE_1285 + ACT_TILE_12, // TILE_TYPE_1286 + ACT_TILE_12, // TILE_TYPE_1287 + ACT_TILE_12, // TILE_TYPE_1288 + ACT_TILE_12, // TILE_TYPE_1289 + ACT_TILE_12, // TILE_TYPE_1290 + ACT_TILE_12, // TILE_TYPE_1291 + ACT_TILE_12, // TILE_TYPE_1292 + ACT_TILE_12, // TILE_TYPE_1293 + ACT_TILE_12, // TILE_TYPE_1294 + ACT_TILE_41, // TILE_TYPE_1295 + ACT_TILE_41, // TILE_TYPE_1296 + ACT_TILE_38, // TILE_TYPE_1297 + ACT_TILE_38, // TILE_TYPE_1298 + ACT_TILE_12, // TILE_TYPE_1299 + ACT_TILE_12, // TILE_TYPE_1300 + ACT_TILE_41, // TILE_TYPE_1301 + ACT_TILE_41, // TILE_TYPE_1302 + ACT_TILE_12, // TILE_TYPE_1303 + ACT_TILE_12, // TILE_TYPE_1304 + ACT_TILE_116, // TILE_TYPE_1305 + ACT_TILE_116, // TILE_TYPE_1306 + ACT_TILE_116, // TILE_TYPE_1307 + ACT_TILE_116, // TILE_TYPE_1308 + ACT_TILE_116, // TILE_TYPE_1309 + ACT_TILE_0, // TILE_TYPE_1310 + ACT_TILE_0, // TILE_TYPE_1311 + ACT_TILE_40, // TILE_TYPE_1312 + ACT_TILE_0, // TILE_TYPE_1313 + ACT_TILE_0, // TILE_TYPE_1314 + ACT_TILE_43, // TILE_TYPE_1315 + ACT_TILE_42, // TILE_TYPE_1316 + ACT_TILE_0, // TILE_TYPE_1317 + ACT_TILE_0, // TILE_TYPE_1318 + ACT_TILE_44, // TILE_TYPE_1319 + ACT_TILE_13, // TILE_TYPE_1320 + ACT_TILE_40, // TILE_TYPE_1321 + ACT_TILE_40, // TILE_TYPE_1322 + ACT_TILE_42, // TILE_TYPE_1323 + ACT_TILE_44, // TILE_TYPE_1324 + ACT_TILE_45, // TILE_TYPE_1325 + ACT_TILE_44, // TILE_TYPE_1326 + ACT_TILE_45, // TILE_TYPE_1327 + ACT_TILE_44, // TILE_TYPE_1328 + ACT_TILE_45, // TILE_TYPE_1329 + ACT_TILE_42, // TILE_TYPE_1330 + ACT_TILE_42, // TILE_TYPE_1331 + ACT_TILE_42, // TILE_TYPE_1332 + ACT_TILE_43, // TILE_TYPE_1333 + ACT_TILE_43, // TILE_TYPE_1334 + ACT_TILE_43, // TILE_TYPE_1335 + ACT_TILE_100, // TILE_TYPE_1336 + ACT_TILE_101, // TILE_TYPE_1337 + ACT_TILE_104, // TILE_TYPE_1338 + ACT_TILE_106, // TILE_TYPE_1339 + ACT_TILE_102, // TILE_TYPE_1340 + ACT_TILE_107, // TILE_TYPE_1341 + ACT_TILE_105, // TILE_TYPE_1342 + ACT_TILE_103, // TILE_TYPE_1343 + ACT_TILE_0, // TILE_TYPE_1344 + ACT_TILE_14, // TILE_TYPE_1345 + ACT_TILE_14, // TILE_TYPE_1346 + ACT_TILE_41, // TILE_TYPE_1347 + ACT_TILE_40, // TILE_TYPE_1348 +#ifdef EU + ACT_TILE_0, // TILE_TYPE_1349 + ACT_TILE_0, // TILE_TYPE_1350 +#else + ACT_TILE_41, // TILE_TYPE_1349 + ACT_TILE_41, // TILE_TYPE_1350 +#endif + ACT_TILE_40, // TILE_TYPE_1351 +#ifdef EU + ACT_TILE_0, // TILE_TYPE_1352 +#else + ACT_TILE_41, // TILE_TYPE_1352 +#endif + ACT_TILE_40, // TILE_TYPE_1353 +#ifdef EU + ACT_TILE_0, // TILE_TYPE_1354 +#else + ACT_TILE_41, // TILE_TYPE_1354 +#endif + ACT_TILE_17, // TILE_TYPE_1355 + ACT_TILE_15, // TILE_TYPE_1356 + ACT_TILE_0, // TILE_TYPE_1357 + ACT_TILE_116, // TILE_TYPE_1358 + ACT_TILE_43, // TILE_TYPE_1359 + ACT_TILE_63, // TILE_TYPE_1360 + ACT_TILE_35, // TILE_TYPE_1361 + ACT_TILE_35, // TILE_TYPE_1362 + ACT_TILE_35, // TILE_TYPE_1363 + ACT_TILE_35, // TILE_TYPE_1364 + ACT_TILE_116, // TILE_TYPE_1365 + ACT_TILE_116, // TILE_TYPE_1366 + ACT_TILE_0, // TILE_TYPE_1367 + ACT_TILE_42, // TILE_TYPE_1368 + ACT_TILE_42, // TILE_TYPE_1369 + ACT_TILE_0, // TILE_TYPE_1370 + ACT_TILE_0, // TILE_TYPE_1371 + ACT_TILE_0, // TILE_TYPE_1372 + ACT_TILE_10, // TILE_TYPE_1373 + ACT_TILE_40, // TILE_TYPE_1374 + ACT_TILE_40, // TILE_TYPE_1375 + ACT_TILE_40, // TILE_TYPE_1376 + ACT_TILE_40, // TILE_TYPE_1377 + ACT_TILE_40, // TILE_TYPE_1378 + ACT_TILE_40, // TILE_TYPE_1379 + ACT_TILE_40, // TILE_TYPE_1380 + ACT_TILE_40, // TILE_TYPE_1381 + ACT_TILE_40, // TILE_TYPE_1382 + ACT_TILE_40, // TILE_TYPE_1383 + ACT_TILE_40, // TILE_TYPE_1384 + ACT_TILE_40, // TILE_TYPE_1385 + ACT_TILE_0, // TILE_TYPE_1386 + ACT_TILE_0, // TILE_TYPE_1387 + ACT_TILE_44, // TILE_TYPE_1388 + ACT_TILE_43, // TILE_TYPE_1389 + ACT_TILE_40, // TILE_TYPE_1390 + ACT_TILE_40, // TILE_TYPE_1391 + ACT_TILE_40, // TILE_TYPE_1392 + ACT_TILE_116, // TILE_TYPE_1393 + ACT_TILE_0, // TILE_TYPE_1394 + ACT_TILE_0, // TILE_TYPE_1395 + +}; diff --git a/src/color.c b/src/color.c index 1f725095..26afadf3 100644 --- a/src/color.c +++ b/src/color.c @@ -240,18 +240,18 @@ void ChangeObjPalette(Entity* entity, u32 objPaletteId) { void LoadObjPaletteAtIndex(u32 objPaletteId, u32 a2) { u16* buffer; - gUsedPalettes |= 1 << (a2 + 0x10); + gUsedPalettes |= 1 << (a2 + 16); if (objPaletteId > 5) { if (objPaletteId == 0x15) { buffer = gPaletteBuffer; - MemFill16(buffer[0x3C], buffer + (a2 + 0x10) * 0x10, 0x20); + MemFill16(buffer[0x3C], buffer + (a2 + 16) * 16, 0x20); } else if (objPaletteId < 0x15) { - LoadPalettes((u8*)(gPaletteBuffer + (objPaletteId - 6) * 0x10), a2 + 0x10, 1); + LoadPalettes((u8*)(gPaletteBuffer + (objPaletteId - 6) * 16), a2 + 16, 1); } else { u32 offset = gUnk_08133368[(objPaletteId - 0x16)].WORD_U; u32 numPalettes = (offset >> 0x18) & 0xf; offset &= 0xffffff; - LoadPalettes(gGlobalGfxAndPalettes + offset, a2 + 0x10, numPalettes); + LoadPalettes(gGlobalGfxAndPalettes + offset, a2 + 16, numPalettes); } } } @@ -361,5 +361,6 @@ void sub_0801D48C(u32 a1, u32 a2) { } while (iVar2 != -1); } - gUsedPalettes |= 0xffff0000; + gUsedPalettes |= 1 << 16 | 1 << 17 | 1 << 18 | 1 << 19 | 1 << 20 | 1 << 21 | 1 << 22 | 1 << 23 | 1 << 24 | 1 << 25 | + 1 << 26 | 1 << 27 | 1 << 28 | 1 << 29 | 1 << 30 | 1 << 31; } diff --git a/src/common.c b/src/common.c index 83d194ca..8c863d85 100644 --- a/src/common.c +++ b/src/common.c @@ -1,6 +1,8 @@ +#include "common.h" + +#include "assets/map_offsets.h" #include "area.h" #include "asm.h" -#include "common.h" #include "flags.h" #include "functions.h" #include "game.h" @@ -15,18 +17,10 @@ #include "sound.h" #include "structures.h" -typedef struct { - u8 area; - u8 room; - u8 unk_2; - u8 unk_3; - u32 mapDataOffset; -} DungeonLayout; - extern u8 gUnk_03003DE0; extern u8 gzHeap[0x1000]; extern u8 gUnk_02035542[]; -extern u32 gUnk_0201AEE0[0x800]; +extern u32 gDungeonMap[0x800]; extern s16 gUnk_02018EE0[]; extern void (*const gFuseActions[])(void); @@ -77,14 +71,14 @@ void SortKinstoneBag(void); extern void* GetRoomProperty(u32, u32, u32); extern u8 gMapData; -extern const DungeonLayout** const gUnk_080C9C50[]; +extern const DungeonLayout* const* const gDungeonLayouts[]; extern u8 gMapDataBottomSpecial[]; u32 sub_0801DF10(const DungeonLayout* lyt); bool32 IsRoomVisited(TileEntity* tileEntity, u32 bank); u32 sub_0801DF60(u32 a1, u8* p); u32 sub_0801DF78(u32 a1, u32 a2); -void sub_0801DF28(u32 x, u32 y, s32 color); +void DrawMapPixel(u32 x, u32 y, s32 color); void sub_0801E64C(s32 x1, s32 y1, s32 x2, s32 y2, s32 offset); extern void* GetRoomProperty(u32, u32, u32); @@ -107,7 +101,7 @@ typedef struct { u32 DecToHex(u32 value) { u32 result; - register u32 r1 asm("r1"); + FORCE_REGISTER(u32 r1, r1); if (value >= 100000000) { return 0x99999999; @@ -453,23 +447,23 @@ void* zMalloc(u32 size) { void zFree(void* ptr) { u32 uVar1; u32 i; - u16* puVar3; - s32 uVar5; - u16* ptr2; + u16* entryPtr; + s32 numEntries; + u16* lastEntryPtr; uVar1 = (int)ptr - (int)gzHeap; if (uVar1 < 0x1000) { - puVar3 = (u16*)gzHeap; - uVar5 = *puVar3++; + entryPtr = (u16*)gzHeap; + numEntries = *entryPtr++; - for (i = 0; i < uVar5; puVar3 += 2, i++) { - if (*puVar3 == uVar1) { - ptr2 = &((u16*)(gzHeap - 2))[uVar5 * 2]; - *puVar3 = *ptr2; - *ptr2++ = 0; - *(puVar3 + 1) = *ptr2; - *ptr2 = 0; - *(u16*)(gzHeap) = uVar5 - 1; + for (i = 0; i < numEntries; entryPtr += 2, i++) { + if (*entryPtr == uVar1) { + lastEntryPtr = &((u16*)(gzHeap - 2))[numEntries * 2]; + *entryPtr = *lastEntryPtr; + *lastEntryPtr++ = 0; + *(entryPtr + 1) = *lastEntryPtr; + *lastEntryPtr = 0; + *(u16*)(gzHeap) = numEntries - 1; break; } } @@ -509,13 +503,13 @@ void ClearOAM(void) { void ResetScreenRegs(void) { MemClear(&gScreen, sizeof(gScreen)); - gScreen.bg0.tilemap = &gBG0Buffer; + gScreen.bg0.subTileMap = &gBG0Buffer; gScreen.bg0.control = 0x1F0C; - gScreen.bg1.tilemap = &gBG1Buffer; + gScreen.bg1.subTileMap = &gBG1Buffer; gScreen.bg1.control = 0x1C01; - gScreen.bg2.tilemap = &gBG2Buffer; + gScreen.bg2.subTileMap = &gBG2Buffer; gScreen.bg2.control = 0x1D02; - gScreen.bg3.tilemap = &gBG3Buffer; + gScreen.bg3.subTileMap = &gBG3Buffer; gScreen.bg3.control = 0x1E03; gScreen.lcd.displayControl = 0x140; gScreen.lcd.displayControlMask = 0xffff; @@ -538,7 +532,7 @@ void DrawDungeonMap(u32 floor, DungeonMapObject* specialData, u32 size) { specialData->x = (gRoomTransition.player_status.dungeon_map_x >> 4) & 0x7f; specialData->y = (gRoomTransition.player_status.dungeon_map_y >> 4) & 0x7f; specialData++; - floorMapData = (DungeonLayout*)gUnk_080C9C50[gArea.dungeon_idx][floor]; + floorMapData = (DungeonLayout*)gDungeonLayouts[gArea.dungeon_idx][floor]; while (floorMapData->area != 0) { tileEntity = (TileEntity*)GetRoomProperty(floorMapData->area, floorMapData->room, 3); if (tileEntity == NULL) { @@ -602,7 +596,7 @@ void sub_0801DD58(u32 area, u32 room) { } void LoadDungeonMap(void) { - LoadResourceAsync(gUnk_0201AEE0, 0x6006000, sizeof(gUnk_0201AEE0)); + LoadResourceAsync(gDungeonMap, 0x6006000, sizeof(gDungeonMap)); } void DrawDungeonFeatures(u32 floor, void* data, u32 size) { @@ -628,7 +622,7 @@ void DrawDungeonFeatures(u32 floor, void* data, u32 size) { if (!AreaHasMap()) { return; } - layout = gUnk_080C9C50[gArea.dungeon_idx][floor]; + layout = gDungeonLayouts[gArea.dungeon_idx][floor]; MemClear(gMapDataBottomSpecial, 0x8000); while (layout->area != 0) { // ROOM_VISIT_MARKER has to be first TileEntity in the room. @@ -650,6 +644,7 @@ void DrawDungeonFeatures(u32 floor, void* data, u32 size) { } nextLayout = layout + 1; if (features != 0) { + // Copies 0x400 bytes even though the data is less most of the time. DmaCopy32(3, &gMapData + layout->mapDataOffset, &gMapDataBottomSpecial, 0x400); roomHeader = gAreaRoomHeaders[layout->area] + layout->room; @@ -666,7 +661,7 @@ void DrawDungeonFeatures(u32 floor, void* data, u32 size) { for (x = 0; x < width; x++) { tmp2 = mapX + x; color = sub_0801DF78(sub_0801DF60(x, ptr), features); - sub_0801DF28(tmp2, mapY + y, color); + DrawMapPixel(tmp2, mapY + y, color); } } } @@ -684,10 +679,10 @@ u32 sub_0801DF10(const DungeonLayout* layout) { return offset; } -void sub_0801DF28(u32 x, u32 y, s32 color) { +void DrawMapPixel(u32 x, u32 y, s32 color) { u32* ptr; u32 tmp; - ptr = &gUnk_0201AEE0[(((y >> 3) * 0x10 + (x >> 3)) * 8)]; + ptr = &gDungeonMap[(((y >> 3) * 0x10 + (x >> 3)) * 8)]; ptr = &ptr[(y & 7)]; tmp = (color << ((x & 7) * 4)); ptr[0] = (ptr[0] & gUnk_080C9460[x & 7]) | tmp; @@ -1287,7 +1282,500 @@ KinstoneId GetFusionToOffer(Entity* entity) { return offeredFusion; } -const struct_080C9C6C gUnk_080C9C6C[] = { +const u16 gUnk_080C93E0[] = { + 3, 9, 16, 22, 28, 35, 41, 48, 54, 61, 67, 74, 81, 88, 95, 102, + 110, 117, 125, 133, 141, 149, 158, 167, 176, 185, 195, 205, 215, 226, 238, 250, + 262, 276, 290, 304, 320, 336, 354, 373, 394, 415, 439, 465, 493, 525, 559, 597, + 640, 689, 744, 808, 883, 971, 1078, 1209, 1375, 1591, 1885, 2308, 2973, 4167, 6950, 20860 +}; + +const u32 gUnk_080C9460[] = { + 0xfffffff0, 0xffffff0f, 0xfffff0ff, 0xffff0fff, 0xfff0ffff, 0xff0fffff, 0xf0ffffff, 0xfffffff, +}; + +const DungeonLayout gDungeonLayouts_None_None[] = { + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout* const gDungeonLayouts_None[] = { + gDungeonLayouts_None_None, +}; + +const DungeonLayout gDungeonLayouts_DeepwoodShrine_1F[] = { + { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BOSS_DOOR, 0, 0, offset_gDungeonMaps_DeepwoodShrine_BossDoor }, + { AREA_DEEPWOOD_SHRINE_BOSS, ROOM_DEEPWOOD_SHRINE_BOSS_MAIN, 2, 0, offset_gDungeonMaps_DeepwoodShrineBoss_Main }, + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout gDungeonLayouts_DeepwoodShrine_B1[] = { + { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_MADDERPILLAR, 0, 0, offset_gDungeonMaps_DeepwoodShrine_Madderpillar }, + { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BLUE_PORTAL, 0, 0, offset_gDungeonMaps_DeepwoodShrine_BluePortal }, + { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_STAIRS_TO_B1, 0, 0, offset_gDungeonMaps_DeepwoodShrine_StairsToB1 }, + { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_POT_BRIDGE, 0, 0, offset_gDungeonMaps_DeepwoodShrine_PotBridge }, + { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_DOUBLE_STATUE, 0, 0, offset_gDungeonMaps_DeepwoodShrine_DoubleStatue }, + { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_MAP, 0, 0, offset_gDungeonMaps_DeepwoodShrine_Map }, + { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BARREL, 0, 0, offset_gDungeonMaps_DeepwoodShrine_Barrel }, + { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BUTTON, 0, 0, offset_gDungeonMaps_DeepwoodShrine_Button }, + { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_MULLDOZER, 0, 0, offset_gDungeonMaps_DeepwoodShrine_Mulldozer }, + { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_PILLARS, 0, 0, offset_gDungeonMaps_DeepwoodShrine_Pillars }, + { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_LEVER, 0, 0, offset_gDungeonMaps_DeepwoodShrine_Lever }, + { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_ENTRANCE, 0, 0, offset_gDungeonMaps_DeepwoodShrine_Entrance }, + { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_TORCHES, 0, 0, offset_gDungeonMaps_DeepwoodShrine_Torches }, + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout gDungeonLayouts_DeepwoodShrine_B2[] = { + { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_BOSS_KEY, 0, 0, offset_gDungeonMaps_DeepwoodShrine_BossKey }, + { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_COMPASS, 0, 0, offset_gDungeonMaps_DeepwoodShrine_Compass }, + { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_LILY_PAD_WEST, 0, 0, offset_gDungeonMaps_DeepwoodShrine_LilyPadWest }, + { AREA_DEEPWOOD_SHRINE, ROOM_DEEPWOOD_SHRINE_LILY_PAD_EAST, 0, 0, offset_gDungeonMaps_DeepwoodShrine_LilyPadEast }, + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout* const gDungeonLayouts_DeepwoodShrine[] = { + gDungeonLayouts_DeepwoodShrine_1F, + gDungeonLayouts_DeepwoodShrine_B1, + gDungeonLayouts_DeepwoodShrine_B2, +}; + +const DungeonLayout gDungeonLayouts_CaveOfFlames_1F[] = { + { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_ENTRANCE, 0, 0, offset_gDungeonMaps_CaveOfFlames_Entrance }, + { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_NORTH_ENTRANCE, 0, 0, offset_gDungeonMaps_CaveOfFlames_NorthEntrance }, + { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_COMPASS, 0, 0, offset_gDungeonMaps_CaveOfFlames_Compass }, + { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_BOB_OMB_WALL, 0, 0, offset_gDungeonMaps_CaveOfFlames_BobOmbWall }, + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout gDungeonLayouts_CaveOfFlames_B1[] = { + { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_AFTER_CANE, 0, 0, offset_gDungeonMaps_CaveOfFlames_AfterCane }, + { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_SPINY_CHU, 0, 0, offset_gDungeonMaps_CaveOfFlames_SpinyChu }, + { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_CART_TO_SPINY_CHU, 0, 0, + offset_gDungeonMaps_CaveOfFlames_CartToSpinyChu }, + { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MAIN_CART, 0, 0, offset_gDungeonMaps_CaveOfFlames_MainCart }, + { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_CART_WEST, 0, 0, offset_gDungeonMaps_CaveOfFlames_CartWest }, + { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_HELMASAUR_FIGHT, 0, 0, offset_gDungeonMaps_CaveOfFlames_HelmasaurFight }, + { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_ROLLOBITE_LAVA_ROOM, 0, 0, + offset_gDungeonMaps_CaveOfFlames_RollobiteLavaRoom }, + { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MINISH_LAVA_ROOM, 0, 0, + offset_gDungeonMaps_CaveOfFlames_MinishLavaRoom }, + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout gDungeonLayouts_CaveOfFlames_B2[] = { + { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_MINISH_SPIKES, 0, 0, offset_gDungeonMaps_CaveOfFlames_MinishSpikes }, + { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_TOMPAS_DOOM, 0, 0, offset_gDungeonMaps_CaveOfFlames_TompasDoom }, + { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_BEFORE_GLEEROK, 0, 0, offset_gDungeonMaps_CaveOfFlames_BeforeGleerok }, + { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_BOSSKEY_PATH1, 0, 0, offset_gDungeonMaps_CaveOfFlames_BosskeyPath1 }, + { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_BOSSKEY_PATH2, 0, 0, offset_gDungeonMaps_CaveOfFlames_BosskeyPath2 }, + { AREA_CAVE_OF_FLAMES, ROOM_CAVE_OF_FLAMES_BOSS_DOOR, 0, 0, offset_gDungeonMaps_CaveOfFlames_BossDoor }, + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout gDungeonLayouts_CaveOfFlames_B3[] = { + { AREA_CAVE_OF_FLAMES_BOSS, ROOM_CAVE_OF_FLAMES_BOSS_0, 2, 0, offset_gDungeonMaps_CaveOfFlamesBoss_0 }, + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout* const gDungeonLayouts_CaveOfFlames[] = { + gDungeonLayouts_CaveOfFlames_1F, + gDungeonLayouts_CaveOfFlames_B1, + gDungeonLayouts_CaveOfFlames_B2, + gDungeonLayouts_CaveOfFlames_B3, +}; + +const DungeonLayout gDungeonLayouts_FortressOfWinds_3F[] = { + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_DOUBLE_EYEGORE, 0, 0, + offset_gDungeonMaps_FortressOfWinds_DoubleEyegore }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_KEY_LEVER, 0, 0, + offset_gDungeonMaps_FortressOfWinds_EastKeyLever }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_PIT_PLATFORMS, 0, 0, + offset_gDungeonMaps_FortressOfWinds_PitPlatforms }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WEST_KEY_LEVER, 0, 0, + offset_gDungeonMaps_FortressOfWinds_WestKeyLever }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MAZAAL, 2, 0, offset_gDungeonMaps_FortressOfWinds_Mazaal }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_BEFORE_MAZAAL, 0, 0, + offset_gDungeonMaps_FortressOfWinds_BeforeMazaal }, + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout gDungeonLayouts_FortressOfWinds_2F[] = { + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_DARKNUT_ROOM, 0, 0, + offset_gDungeonMaps_FortressOfWinds_DarknutRoom }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_ARROW_EYE_BRIDGE, 0, 0, + offset_gDungeonMaps_FortressOfWinds_ArrowEyeBridge }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_NORTH_SPLIT_PATH_PIT, 0, 0, + offset_gDungeonMaps_FortressOfWinds_NorthSplitPathPit }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WALLMASTER_MINISH_PORTAL, 0, 0, + offset_gDungeonMaps_FortressOfWinds_WallmasterMinishPortal }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_PILLAR_CLONE_BUTTONS, 0, 0, + offset_gDungeonMaps_FortressOfWinds_PillarCloneButtons }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_ROTATING_SPIKE_TRAPS, 0, 0, + offset_gDungeonMaps_FortressOfWinds_RotatingSpikeTraps }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_STALFOS, 0, 0, offset_gDungeonMaps_FortressOfWinds_Stalfos }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_ENTRANCE_MOLE_MITTS, 0, 0, + offset_gDungeonMaps_FortressOfWinds_EntranceMoleMitts }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MAIN_2F, 0, 0, offset_gDungeonMaps_FortressOfWinds_Main2f }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_MINISH_HOLE, 0, 0, + offset_gDungeonMaps_FortressOfWinds_MinishHole }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_BOSS_KEY, 0, 0, offset_gDungeonMaps_FortressOfWinds_BossKey }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WEST_STAIRS_2F, 0, 0, + offset_gDungeonMaps_FortressOfWinds_WestStairs2f }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_STAIRS_2F, 0, 0, + offset_gDungeonMaps_FortressOfWinds_EastStairs2f }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_5, 1, 1, offset_gDungeonMaps_FortressOfWinds_5 }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_6, 1, 1, offset_gDungeonMaps_FortressOfWinds_6 }, + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout gDungeonLayouts_FortressOfWinds_1F[] = { + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WEST_STAIRS_1F, 0, 0, + offset_gDungeonMaps_FortressOfWinds_WestStairs1f }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_CENTER_STAIRS_1F, 0, 0, + offset_gDungeonMaps_FortressOfWinds_CenterStairs1f }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_EAST_STAIRS_1F, 0, 0, + offset_gDungeonMaps_FortressOfWinds_EastStairs1f }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_WIZZROBE, 0, 0, offset_gDungeonMaps_FortressOfWinds_Wizzrobe }, + { AREA_FORTRESS_OF_WINDS, ROOM_FORTRESS_OF_WINDS_HEART_PIECE, 0, 0, + offset_gDungeonMaps_FortressOfWinds_HeartPiece }, + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout* const gDungeonLayouts_FortressOfWinds[] = { + gDungeonLayouts_FortressOfWinds_3F, + gDungeonLayouts_FortressOfWinds_2F, + gDungeonLayouts_FortressOfWinds_1F, +}; + +const DungeonLayout gDungeonLayouts_TempleOfDroplets_B1[] = { + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_WEST_HOLE, 0, 0, offset_gDungeonMaps_TempleOfDroplets_WestHole }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_NORTH_SPLIT_ROOM, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_NorthSplitRoom }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_EAST_HOLE, 0, 0, offset_gDungeonMaps_TempleOfDroplets_EastHole }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ENTRANCE, 0, 0, offset_gDungeonMaps_TempleOfDroplets_Entrance }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_NORTHWEST_STAIRS, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_NorthwestStairs }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_SCISSORS_MINIBOSS, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_ScissorsMiniboss }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_WATERFALL_NORTHWEST, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_WaterfallNorthwest }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_WATERFALL_NORTHEAST, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_WaterfallNortheast }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ELEMENT, 0, 0, offset_gDungeonMaps_TempleOfDroplets_Element }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ICE_CORNER, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_IceCorner }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ICE_PIT_MAZE, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_IcePitMaze }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_HOLE_TO_BLUE_CHU_KEY, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_HoleToBlueChuKey }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_WEST_WATERFALL_SOUTHEAST, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_WestWaterfallSoutheast }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_WEST_WATERFALL_SOUTHWEST, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_WestWaterfallSouthwest }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BIG_OCTO, 2, 0, offset_gDungeonMaps_TempleOfDroplets_BigOcto }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_TO_BLUE_CHU, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_ToBlueChu }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU, 0, 0, offset_gDungeonMaps_TempleOfDroplets_BlueChu }, + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout gDungeonLayouts_TempleOfDroplets_B2[] = { + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BOSS_KEY, 0, 0, offset_gDungeonMaps_TempleOfDroplets_BossKey }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_NORTH_SMALL_KEY, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_NorthSmallKey }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BLOCK_CLONE_BUTTON_PUZZLE, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_BlockCloneButtonPuzzle }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BLOCK_CLONE_PUZZLE, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_BlockClonePuzzle }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BLOCK_CLONE_ICE_BRIDGE, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_BlockCloneIceBridge }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_STAIRS_TO_SCISSORS_MINIBOSS, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_StairsToScissorsMiniboss }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_SPIKE_BAR_FLIPPER_ROOM, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_SpikeBarFlipperRoom }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_9_LANTERNS, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_9Lanterns }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_LILYPAD_ICE_BLOCKS, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_LilypadIceBlocks }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_29, 0, 0, offset_gDungeonMaps_TempleOfDroplets_29 }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_MULLDOZERS_FIRE_BARS, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_MulldozersFireBars }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_DARK_MAZE, 0, 0, offset_gDungeonMaps_TempleOfDroplets_DarkMaze }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_TWIN_MADDERPILLARS, 1, 0, + offset_gDungeonMaps_TempleOfDroplets_TwinMadderpillars }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_AFTER_TWIN_MADDERPILLARS, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_AfterTwinMadderpillars }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU_KEY_LEVER, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_BlueChuKeyLever }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_MULLDOZER_KEY, 1, 0, + offset_gDungeonMaps_TempleOfDroplets_MulldozerKey }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BEFORE_TWIN_MADDERPILLARS, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_BeforeTwinMadderpillars }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_LILYPAD_B2_WEST, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_LilypadB2West }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_COMPASS, 0, 0, offset_gDungeonMaps_TempleOfDroplets_Compass }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_DARK_SCISSOR_BEETLES, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_DarkScissorBeetles }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_LILYPAD_B2_MIDDLE, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_LilypadB2Middle }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_ICE_MADDERPILLAR, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_IceMadderpillar }, + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_FLAMEBAR_BLOCK_PUZZLE, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_FlamebarBlockPuzzle }, + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout gDungeonLayouts_TempleOfDroplets_B3[] = { + { AREA_TEMPLE_OF_DROPLETS, ROOM_TEMPLE_OF_DROPLETS_BLUE_CHU_KEY, 0, 0, + offset_gDungeonMaps_TempleOfDroplets_BlueChuKey }, + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout* const gDungeonLayouts_TempleOfDroplets[] = { + gDungeonLayouts_TempleOfDroplets_B1, + gDungeonLayouts_TempleOfDroplets_B2, + gDungeonLayouts_TempleOfDroplets_B3, +}; + +const DungeonLayout gDungeonLayouts_PalaceOfWinds_5F[] = { + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_GYORG_TORNADO, 2, 0, offset_gDungeonMaps_PalaceOfWinds_GyorgTornado }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_BOSS_KEY, 0, 0, offset_gDungeonMaps_PalaceOfWinds_BossKey }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_BEFORE_BALL_AND_CHAIN_SOLDIERS, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_BeforeBallAndChainSoldiers }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_GYORG_BOSS_DOOR, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_GyorgBossDoor }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_EAST_CHEST_FROM_GYORG_BOSS_DOOR, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_EastChestFromGyorgBossDoor }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_MOBLIN_AND_WIZZROBE_FIGHT, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_MoblinAndWizzrobeFight }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_FOUR_BUTTON_STALFOS, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_FourButtonStalfos }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_FAN_AND_KEY_TO_BOSS_KEY, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_FanAndKeyToBossKey }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_BALL_AND_CHAIN_SOLDIERS, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_BallAndChainSoldiers }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_BOMBAROSSA_PATH, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_BombarossaPath }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_HOLE_TO_DARKNUT, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_HoleToDarknut }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_TO_BOMBAROSSA_PATH, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_ToBombarossaPath }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_BOMB_WALL_INSIDE, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_BombWallInside }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_BOMB_WALL_OUTSIDE, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_BombWallOutside }, + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout gDungeonLayouts_PalaceOfWinds_4F[] = { + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_CLOUD_JUMPS, 0, 0, offset_gDungeonMaps_PalaceOfWinds_CloudJumps }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_BLOCK_MAZE_TO_BOSS_DOOR, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_BlockMazeToBossDoor }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_CRACKED_FLOOR_LAKITU, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_CrackedFloorLakitu }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_HEART_PIECE_BRIDGE, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_HeartPieceBridge }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_FAN_BRIDGE, 0, 0, offset_gDungeonMaps_PalaceOfWinds_FanBridge }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_TO_FAN_BRIDGE, 0, 0, offset_gDungeonMaps_PalaceOfWinds_ToFanBridge }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_RED_WARP_HALL, 0, 0, offset_gDungeonMaps_PalaceOfWinds_RedWarpHall }, + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout gDungeonLayouts_PalaceOfWinds_3F[] = { + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_PLATFORM_CLONE_RIDE, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_PlatformCloneRide }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_PIT_CORNER_AFTER_KEY, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_PitCornerAfterKey }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_PLATFORM_CROW_RIDE, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_PlatformCrowRide }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_GRATE_PLATFORM_RIDE, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_GratePlatformRide }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_POT_PUSH, 0, 0, offset_gDungeonMaps_PalaceOfWinds_PotPush }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_FLOORMASTER_LEVER, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_FloormasterLever }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_MAP, 0, 0, offset_gDungeonMaps_PalaceOfWinds_Map }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_CORNER_TO_MAP, 0, 0, offset_gDungeonMaps_PalaceOfWinds_CornerToMap }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_STAIRS_AFTER_FLOORMASTER, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_StairsAfterFloormaster }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_HOLE_TO_KINSTONE_WIZZROBE, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_HoleToKinstoneWizzrobe }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_KEY_ARROW_BUTTON, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_KeyArrowButton }, + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout gDungeonLayouts_PalaceOfWinds_2F[] = { + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_GRATES_TO_3F, 0, 0, offset_gDungeonMaps_PalaceOfWinds_GratesTo3f }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_SPINY_FIGHT, 0, 0, offset_gDungeonMaps_PalaceOfWinds_SpinyFight }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_PEAHAT_SWITCH, 0, 0, offset_gDungeonMaps_PalaceOfWinds_PeahatSwitch }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_WHIRLWIND_BOMBAROSSA, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_WhirlwindBombarossa }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_DOOR_TO_STALFOS_FIREBAR, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_DoorToStalfosFirebar }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_STALFOS_FIREBAR_HOLE, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_StalfosFirebarHole }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_SHORTCUT_DOOR_BUTTONS, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_ShortcutDoorButtons }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_TO_PEAHAT_SWITCH, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_ToPeahatSwitch }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_KINSTONE_WIZZROBE_FIGHT, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_KinstoneWizzrobeFight }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_GIBDO_STAIRS, 0, 0, offset_gDungeonMaps_PalaceOfWinds_GibdoStairs }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_SPIKE_BAR_SMALL_KEY, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_SpikeBarSmallKey }, + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout gDungeonLayouts_PalaceOfWinds_1F[] = { + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_DARKNUT_MINIBOSS, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_DarknutMiniboss }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_ROC_CAPE, 0, 0, offset_gDungeonMaps_PalaceOfWinds_RocCape }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_FIRE_BAR_GRATES, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_FireBarGrates }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_PLATFORM_RIDE_BOMBAROSSAS, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_PlatformRideBombarossas }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_BRIDGE_AFTER_DARKNUT, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_BridgeAfterDarknut }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_BRIDGE_SWITCHES_CLONE_BLOCK, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_BridgeSwitchesCloneBlock }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_ENTRANCE_ROOM, 0, 0, offset_gDungeonMaps_PalaceOfWinds_EntranceRoom }, + { AREA_PALACE_OF_WINDS, ROOM_PALACE_OF_WINDS_DARK_COMPASS_HALL, 0, 0, + offset_gDungeonMaps_PalaceOfWinds_DarkCompassHall }, + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout* const gDungeonLayouts_PalaceOfWinds[] = { + gDungeonLayouts_PalaceOfWinds_5F, gDungeonLayouts_PalaceOfWinds_4F, gDungeonLayouts_PalaceOfWinds_3F, + gDungeonLayouts_PalaceOfWinds_2F, gDungeonLayouts_PalaceOfWinds_1F, +}; + +const DungeonLayout gDungeonLayouts_DarkHyruleCastle_3F[] = { + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_TOP_LEFT_TOWER, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_3fTopLeftTower }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_TOP_RIGHT_TOWER, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_3fTopRightTower }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_BOTTOM_LEFT_TOWER, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_3fBottomLeftTower }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_BOTTOM_RIGHT_TOWER, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_3fBottomRightTower }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_KEATON_HALL_TO_VAATI, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_3fKeatonHallToVaati }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_3F_TRIPLE_DARKNUT, 2, 0, + offset_gDungeonMaps_DarkHyruleCastle_3fTripleDarknut }, + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout gDungeonLayouts_DarkHyruleCastle_2F[] = { + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_TOWER, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_2fTopLeftTower }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_CORNER, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_2fTopLeftCorner }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOSS_KEY, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_2fBossKey }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BLUE_WARP, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_2fBlueWarp }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_CORNER_GHINI, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_2fTopRightCornerGhini }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_CORNER_TORCHES, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_2fTopRightCornerTorches }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_TOWER, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_2fTopRightTower }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_LEFT_DARKNUT, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_2fTopLeftDarknut }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_SPARKS, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fSparks }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_TOP_RIGHT_DARKNUTS, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_2fTopRightDarknuts }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_LEFT, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fLeft }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_RIGHT, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_2fRight }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_DARKNUTS, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_2fBottomLeftDarknuts }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOSS_DOOR, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_2fBossDoor }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_DARKNUT, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_2fBottomRightDarknut }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_CORNER_PUZZLE, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_2fBottomLeftCornerPuzzle }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_ENTRANCE, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_2fEntrance }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_CORNER, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_2fBottomRightCorner }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_TOWER, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_2fBottomLeftTower }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_LEFT_GHINI, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_2fBottomLeftGhini }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_2F_BOTTOM_RIGHT_TOWER, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_2fBottomRightTower }, + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout gDungeonLayouts_DarkHyruleCastle_1F[] = { + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_ENTRANCE, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_1fEntrance }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_TOP_LEFT_TOWER, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_1fTopLeftTower }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_THRONE_ROOM, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_1fThroneRoom }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_COMPASS, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_1fCompass }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_TOP_RIGHT_TOWER, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_1fTopRightTower }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_BEFORE_THRONE, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_1fBeforeThrone }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_LOOP_TOP_LEFT, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_1fLoopTopLeft }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_LOOP_TOP, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_1fLoopTop }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_LOOP_TOP_RIGHT, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_1fLoopTopRight }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_LOOP_LEFT, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_1fLoopLeft }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_LOOP_RIGHT, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_1fLoopRight }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_LOOP_BOTTOM_LEFT, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_1fLoopBottomLeft }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_LOOP_BOTTOM, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_1fLoopBottom }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_LOOP_BOTTOM_RIGHT, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_1fLoopBottomRight }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_BOTTOM_LEFT_TOWER, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_1fBottomLeftTower }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_1F_BOTTOM_RIGHT_TOWER, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_1fBottomRightTower }, + { 0, 0, 0, 0, 0 }, +}; + +const DungeonLayout gDungeonLayouts_DarkHyruleCastle_B1[] = { + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_ENTRANCE, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_B1Entrance }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_BELOW_THRONE, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_B1BelowThrone }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_BELOW_COMPASS, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_B1BelowCompass }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_BEFORE_THRONE, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_B1BeforeThrone }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_TO_PRISON, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_B1ToPrison }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_BOMB_WALL, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_B1BombWall }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_KEATONS, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_B1Keatons }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_TO_PRISON_FIREBAR, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_B1ToPrisonFirebar }, + { + AREA_DARK_HYRULE_CASTLE, + ROOM_DARK_HYRULE_CASTLE_B1_CANNONS, + 0, + 0, + offset_gDungeonMaps_DarkHyruleCastle_B1Cannons, + }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_LEFT, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_B1Left }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_RIGHT, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_B1Right }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B1_MAP, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_B1Map }, + { 0, 0, 0, 0, 0 }, +}; +const DungeonLayout gDungeonLayouts_DarkHyruleCastle_B2[] = { + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B2_TO_PRISON, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_B2ToPrison }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B2_PRISON, 0, 0, offset_gDungeonMaps_DarkHyruleCastle_B2Prison }, + { AREA_DARK_HYRULE_CASTLE, ROOM_DARK_HYRULE_CASTLE_B2_DROPDOWN, 0, 0, + offset_gDungeonMaps_DarkHyruleCastle_B2Dropdown }, + { 0, 0, 0, 0, 0 }, +}; + +const DungeonLayout* const gDungeonLayouts_DarkHyruleCastle[] = { + gDungeonLayouts_DarkHyruleCastle_3F, gDungeonLayouts_DarkHyruleCastle_2F, gDungeonLayouts_DarkHyruleCastle_1F, + gDungeonLayouts_DarkHyruleCastle_B1, gDungeonLayouts_DarkHyruleCastle_B2, +}; + +const DungeonLayout* const* const gDungeonLayouts[] = { + gDungeonLayouts_None, + gDungeonLayouts_DeepwoodShrine, + gDungeonLayouts_CaveOfFlames, + gDungeonLayouts_FortressOfWinds, + gDungeonLayouts_TempleOfDroplets, + gDungeonLayouts_PalaceOfWinds, + gDungeonLayouts_DarkHyruleCastle, +}; + +const DungeonFloorMetadata gDungeonFloorMetadatas[] = { { 1, 2, 2 }, { 3, 3, 3 }, { 4, 3, 0 }, { 3, 5, 5 }, { 3, 2, 2 }, { 5, 7, 7 }, { 5, 5, 5 }, { 1, 3, 3 }, { 1, 3, 3 }, { 1, 3, 3 }, { 1, 3, 3 }, { 1, 3, 3 }, { 1, 3, 3 }, { 1, 3, 3 }, { 1, 3, 3 }, { 1, 3, 3 }, }; diff --git a/src/cutscene.c b/src/cutscene.c index bb1f7187..ef5a0ef6 100644 --- a/src/cutscene.c +++ b/src/cutscene.c @@ -15,6 +15,7 @@ #include "npc.h" #include "object.h" #include "screen.h" +#include "tiles.h" void sub_08051F78(void); void sub_08051FF0(void); @@ -43,7 +44,7 @@ void CutsceneMain_Init(void) { void sub_080535AC(void) { gMenu.overlayType = 1; gMenu.transitionTimer = 120; - gUI.field_0x6 = 1; + gUI.loadGfxOnRestore = TRUE; gUpdateVisibleTiles = 1; gScreen.lcd.displayControl &= 0xfeff; LoadRoomEntityList(gUnk_080FCB94); @@ -216,7 +217,7 @@ void sub_08053758(void) { gMenu.transitionTimer = 120; gMenu.field_0xa = 0x1e; *((u8*)&gMenu + 0x10) = 0; // TODO - gUI.field_0x6 = 1; + gUI.loadGfxOnRestore = TRUE; gMapBottom.bgSettings = NULL; gMapTop.bgSettings = NULL; gRoomControls.camera_target = NULL; @@ -595,10 +596,10 @@ void sub_08053D34(void) { if (gMenu.field_0xa != 0) { gMenu.field_0xa = 0; if (CheckLocalFlagByBank(FLAG_BANK_7, 0x3d)) { - SetTileType(0x74, 0xc4, 1); + SetTileType(TILE_TYPE_116, TILE_POS(4, 3), LAYER_BOTTOM); } if (CheckLocalFlagByBank(FLAG_BANK_7, 0x3e)) { - SetTileType(0x74, 0xcc, 1); + SetTileType(TILE_TYPE_116, TILE_POS(12, 3), LAYER_BOTTOM); } } if (gFadeControl.active == 0) { diff --git a/src/data/areaMetadata.c b/src/data/areaMetadata.c new file mode 100644 index 00000000..cee56ea9 --- /dev/null +++ b/src/data/areaMetadata.c @@ -0,0 +1,187 @@ +#include "flags.h" +#include "game.h" +#include "message.h" +#include "sound.h" + +#ifdef EU +#define OVERWORLD_FLAGS AR_IS_OVERWORLD +#else +#define OVERWORLD_FLAGS AR_IS_OVERWORLD | AR_ALLOWS_WARP +#endif + +const AreaHeader gAreaMetadata[] = { + { OVERWORLD_FLAGS, 18, LOCAL_BANK_1, BGM_MINISH_WOODS }, + { 0, 20, LOCAL_BANK_2, BGM_MINISH_VILLAGE }, + { OVERWORLD_FLAGS, 10, LOCAL_BANK_1, BGM_HYRULE_TOWN }, + { OVERWORLD_FLAGS, 0, LOCAL_BANK_1, BGM_HYRULE_FIELD }, + { OVERWORLD_FLAGS, 3, LOCAL_BANK_1, BGM_CASTOR_WILDS }, + { OVERWORLD_FLAGS, 4, LOCAL_BANK_1, BGM_WIND_RUINS }, + { OVERWORLD_FLAGS, 1, LOCAL_BANK_1, BGM_MT_CRENEL }, + { OVERWORLD_FLAGS, 8, LOCAL_BANK_1, BGM_HYRULE_CASTLE }, + { OVERWORLD_FLAGS, 16, LOCAL_BANK_1, BGM_CLOUD_TOPS }, + { OVERWORLD_FLAGS, 5, LOCAL_BANK_1, BGM_ROYAL_VALLEY }, + { OVERWORLD_FLAGS, 13, LOCAL_BANK_1, BGM_HYRULE_FIELD }, + { OVERWORLD_FLAGS, 17, LOCAL_BANK_1, BGM_HYRULE_FIELD }, + { AR_IS_MOLE_CAVE, 0, LOCAL_BANK_3, BGM_DIGGING_CAVE }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_3, BGM_CLOUD_TOPS }, + { 0, 0, 0, 0 }, + { AR_IS_MOLE_CAVE, 0, LOCAL_BANK_3, BGM_DIGGING_CAVE }, + { 0, 21, LOCAL_BANK_2, BGM_MINISH_VILLAGE }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_3, BGM_HYRULE_FIELD }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_3, BGM_HYRULE_FIELD }, + { AR_IS_MOLE_CAVE, 0, LOCAL_BANK_3, BGM_DIGGING_CAVE }, + { AR_IS_MOLE_CAVE, 0, LOCAL_BANK_3, BGM_DIGGING_CAVE }, + { OVERWORLD_FLAGS, 10, LOCAL_BANK_1, BGM_PICORI_FESTIVAL }, + { AR_IS_MOLE_CAVE, 0, LOCAL_BANK_3, BGM_DIGGING_CAVE }, + { AR_IS_MOLE_CAVE, 0, LOCAL_BANK_3, BGM_DIGGING_CAVE }, + { AR_HAS_KEYS | AR_IS_MOLE_CAVE, 26, LOCAL_BANK_3, BGM_FORTRESS_OF_WINDS }, + { AR_IS_MOLE_CAVE, 0, LOCAL_BANK_3, BGM_DIGGING_CAVE }, + { OVERWORLD_FLAGS, 12, LOCAL_BANK_1, BGM_HYRULE_FIELD }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, LOCAL_BANK_2, BGM_HOUSE }, + { AR_HAS_ENEMIES, 0, LOCAL_BANK_2, BGM_HOUSE }, + { AR_HAS_ENEMIES, 0, LOCAL_BANK_2, BGM_HOUSE }, + { AR_HAS_ENEMIES, 0, LOCAL_BANK_2, BGM_HOUSE }, + { AR_HAS_ENEMIES, 0, LOCAL_BANK_2, BGM_HOUSE }, + { AR_HAS_ENEMIES, 0, LOCAL_BANK_4, BGM_HOUSE }, + { AR_HAS_ENEMIES, 0, LOCAL_BANK_4, BGM_DUNGEON }, + { AR_HAS_ENEMIES, 0, LOCAL_BANK_2, BGM_HOUSE }, + { AR_HAS_ENEMIES, 0, LOCAL_BANK_2, BGM_HOUSE }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_2, BGM_FAIRY_FOUNTAIN }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_4, BGM_DUNGEON }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_4, BGM_DUNGEON }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_3, BGM_DUNGEON }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_2, BGM_HOUSE }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_3, BGM_HOUSE }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_4, BGM_DUNGEON }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_2, BGM_HOUSE }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_2, BGM_ELEMENT_THEME }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_4, BGM_DUNGEON }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_4, BGM_DUNGEON }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_4, BGM_DUNGEON }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_4, BGM_DUNGEON }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_4, BGM_DUNGEON }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_4, BGM_DUNGEON }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_2, BGM_HOUSE }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { AR_IS_DUNGEON, 0, LOCAL_BANK_3, BGM_DUNGEON }, + { AR_IS_DUNGEON, 0, LOCAL_BANK_3, BGM_DUNGEON }, + { AR_IS_DUNGEON, 0, LOCAL_BANK_3, BGM_SECRET_CASTLE_ENTRANCE }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_G, BGM_SECRET_CASTLE_ENTRANCE }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_G, BGM_SECRET_CASTLE_ENTRANCE }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_G, BGM_SECRET_CASTLE_ENTRANCE }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_G, BGM_SECRET_CASTLE_ENTRANCE }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP, 24, LOCAL_BANK_5, BGM_DEEPWOOD_SHRINE }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP, 24, LOCAL_BANK_5, BGM_DEEPWOOD_SHRINE }, + { 0, 0, LOCAL_BANK_5, BGM_MINISH_WOODS }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_5, BGM_DEEPWOOD_SHRINE }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP, 25, LOCAL_BANK_6, BGM_CAVE_OF_FLAMES }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP, 25, LOCAL_BANK_6, BGM_CAVE_OF_FLAMES }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP, 25, LOCAL_BANK_6, BGM_CAVE_OF_FLAMES }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP, 26, LOCAL_BANK_7, BGM_FORTRESS_OF_WINDS }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP | AR_HAS_NO_ENEMIES, 26, LOCAL_BANK_7, BGM_FORTRESS_OF_WINDS }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP | AR_HAS_NO_ENEMIES, 26, LOCAL_BANK_7, BGM_BOSS_THEME }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP, 26, LOCAL_BANK_7, BGM_FORTRESS_OF_WINDS }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP, 27, LOCAL_BANK_8, BGM_TEMPLE_OF_DROPLETS }, + { 0, 0, 0, 0 }, + { AR_IS_DUNGEON, 0, LOCAL_BANK_3, BGM_DUNGEON }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP, 27, LOCAL_BANK_8, BGM_TEMPLE_OF_DROPLETS }, + { AR_HAS_KEYS | AR_IS_DUNGEON, 30, LOCAL_BANK_3, BGM_ROYAL_CRYPT }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { AR_HAS_KEYS | AR_IS_DUNGEON, 30, LOCAL_BANK_3, BGM_ROYAL_CRYPT }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP, 28, LOCAL_BANK_9, BGM_PALACE_OF_WINDS }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP | AR_HAS_NO_ENEMIES, 28, LOCAL_BANK_9, BGM_BOSS_THEME }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP, 28, LOCAL_BANK_9, BGM_PALACE_OF_WINDS }, + { AR_HAS_NO_ENEMIES, 19, LOCAL_BANK_3, BGM_ELEMENTAL_SANCTUARY }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_3, BGM_ELEMENTAL_SANCTUARY }, + { AR_HAS_NO_ENEMIES, 22, LOCAL_BANK_1, BGM_HYRULE_CASTLE }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_1, BGM_HYRULE_CASTLE }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, + { AR_HAS_NO_ENEMIES, 0, LOCAL_BANK_3, BGM_HYRULE_CASTLE }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP, 29, LOCAL_BANK_10, BGM_DARK_HYRULE_CASTLE }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP | AR_HAS_NO_ENEMIES, 29, LOCAL_BANK_10, BGM_DARK_HYRULE_CASTLE }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP | AR_HAS_NO_ENEMIES, 29, LOCAL_BANK_10, BGM_VAATI_WRATH }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP | AR_HAS_NO_ENEMIES, 29, LOCAL_BANK_10, BGM_VAATI_WRATH }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP | AR_HAS_NO_ENEMIES, 29, LOCAL_BANK_10, BGM_VAATI_TRANSFIGURED }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP | AR_HAS_NO_ENEMIES, 29, LOCAL_BANK_10, BGM_DARK_HYRULE_CASTLE }, + { 0, 0, 0, 0 }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP, 29, LOCAL_BANK_3, BGM_DARK_HYRULE_CASTLE }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP, 0, LOCAL_BANK_12, BGM_ROYAL_CRYPT }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP, 0, LOCAL_BANK_12, BGM_ROYAL_CRYPT }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP, 0, LOCAL_BANK_12, BGM_ROYAL_CRYPT }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP, 0, LOCAL_BANK_12, BGM_ROYAL_CRYPT }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP, 0, LOCAL_BANK_12, BGM_ROYAL_CRYPT }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP, 0, LOCAL_BANK_12, BGM_ROYAL_CRYPT }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP, 0, LOCAL_BANK_12, BGM_ROYAL_CRYPT }, + { AR_HAS_KEYS | AR_IS_DUNGEON | AR_HAS_MAP, 0, LOCAL_BANK_12, BGM_ROYAL_CRYPT }, + { 0, 0, 0, 0 }, +}; + +const OverworldLocation gOverworldLocations[] = { + { 0, 0, 62, 74, 0, TEXT_INDEX(TEXT_WINDCRESTS, 0x0b) }, + { 0, 75, 62, 104, 1, TEXT_INDEX(TEXT_WINDCRESTS, 0x0c) }, + { 0, 105, 62, 164, 2, TEXT_INDEX(TEXT_WINDCRESTS, 0x0d) }, + { 0, 165, 62, 197, 3, TEXT_INDEX(TEXT_WINDCRESTS, 0x0e) }, + { 63, 0, 92, 74, 4, TEXT_INDEX(TEXT_WINDCRESTS, 0x0f) }, + { 63, 75, 92, 134, 5, TEXT_INDEX(TEXT_WINDCRESTS, 0x10) }, + { 63, 135, 92, 197, 6, TEXT_INDEX(TEXT_WINDCRESTS, 0x11) }, + { 93, 0, 155, 44, 7, TEXT_INDEX(TEXT_WINDCRESTS, 0x12) }, + { 93, 45, 155, 94, 8, TEXT_INDEX(TEXT_WINDCRESTS, 0x13) }, + { 93, 95, 155, 154, 9, TEXT_INDEX(TEXT_WINDCRESTS, 0x14) }, + { 93, 155, 155, 197, 10, TEXT_INDEX(TEXT_WINDCRESTS, 0x15) }, + { 156, 0, 185, 74, 11, TEXT_INDEX(TEXT_WINDCRESTS, 0x17) }, + { 156, 75, 200, 134, 12, TEXT_INDEX(TEXT_WINDCRESTS, 0x18) }, + { 156, 135, 185, 197, 13, TEXT_INDEX(TEXT_WINDCRESTS, 0x19) }, + { 186, 0, 248, 62, 14, TEXT_INDEX(TEXT_WINDCRESTS, 0x1a) }, + { 186, 63, 248, 134, 15, TEXT_INDEX(TEXT_WINDCRESTS, 0x1b) }, + { 186, 135, 248, 197, 16, TEXT_INDEX(TEXT_WINDCRESTS, 0x1c) }, + { 255, 255, 255, 255, 99, TEXT_INDEX(TEXT_WINDCRESTS, 0x0b) }, +}; diff --git a/src/data/caveBorderMapData.c b/src/data/caveBorderMapData.c new file mode 100644 index 00000000..40a0c62a --- /dev/null +++ b/src/data/caveBorderMapData.c @@ -0,0 +1,247 @@ +#include "assets/map_offsets.h" +#include "map.h" + +/* +Tiles for the borders of the cave that are loaded during the transition. +When the player goes inside a cave during the start of the enter transition the border tileMap is loaded and at the +end the tileMap for the cave is loaded. When the player goes out of a cave during the start of the leave transition +the border tileMap is loaded and at the end the tileMap for the outside is loaded. +*/ + +const MapDataDefinition gCaveBorder_LakeWoods_enter_start[] = { + { offset_gCaveBorder_LakeWoods_outside, gMapTop.mapData, MAP_COMPRESSED | 7938 }, +}; +const MapDataDefinition gCaveBorder_LakeWoods_enter_end[] = { + { MAP_MULTIPLE | offset_gAreaRoomMap_LakeWoodsCave_Main_bottom, gMapBottom.mapData, MAP_COMPRESSED | 7938 }, + { offset_gAreaRoomMap_LakeWoodsCave_Main_top, gMapTop.mapData, MAP_COMPRESSED | 7938 }, +}; +const MapDataDefinition* const gCaveBorder_LakeWoods_enter[] = { + gCaveBorder_LakeWoods_enter_start, + gCaveBorder_LakeWoods_enter_end, +}; + +const MapDataDefinition gCaveBorder_LakeWoods_leave_start[] = { + { offset_gCaveBorder_LakeWoods_inside, gMapTop.mapData, MAP_COMPRESSED | 7938 }, +}; +const MapDataDefinition gCaveBorder_LakeWoods_leave_end[] = { + { MAP_MULTIPLE | offset_gAreaRoomMap_MinishWoods_Main_bottom, gMapBottom.mapData, MAP_COMPRESSED | 7938 }, + { offset_gAreaRoomMap_MinishWoods_Main_top, gMapTop.mapData, MAP_COMPRESSED | 7938 }, +}; +const MapDataDefinition* const gCaveBorder_LakeWoods_leave[] = { + gCaveBorder_LakeWoods_leave_start, + gCaveBorder_LakeWoods_leave_end, +}; + +const MapDataDefinition gCaveBorder_HyruleTown_enter_start[] = { + { offset_gCaveBorder_HyruleTown_outside, gMapTop.mapData, MAP_COMPRESSED | 7560 }, +}; +const MapDataDefinition gCaveBorder_HyruleTown_enter_end[] = { + { MAP_MULTIPLE | offset_gAreaRoomMap_HyruleDigCaves_Town_bottom, gMapBottom.mapData, MAP_COMPRESSED | 7560 }, + { offset_gAreaRoomMap_HyruleDigCaves_Town_top, gMapTop.mapData, MAP_COMPRESSED | 7560 }, +}; +const MapDataDefinition* const gCaveBorder_HyruleTown_enter[] = { + gCaveBorder_HyruleTown_enter_start, + gCaveBorder_HyruleTown_enter_end, +}; + +const MapDataDefinition gCaveBorder_HyruleTown_leave_start[] = { + { offset_gCaveBorder_HyruleTown_inside, gMapTop.mapData, MAP_COMPRESSED | 7560 }, +}; +const MapDataDefinition gCaveBorder_HyruleTown_leave_end[] = { + { MAP_MULTIPLE | offset_gAreaRoomMap_HyruleTown_Main_bottom, gMapBottom.mapData, MAP_COMPRESSED | 7560 }, + { offset_gAreaRoomMap_HyruleTown_Main_top, gMapTop.mapData, MAP_COMPRESSED | 7560 }, +}; +const MapDataDefinition* const gCaveBorder_HyruleTown_leave[] = { + gCaveBorder_HyruleTown_leave_start, + gCaveBorder_HyruleTown_leave_end, +}; + +const MapDataDefinition gCaveBorder_EasternHills_enter_start[] = { + { offset_gCaveBorder_EasternHills_outside, gMapTop.mapData, MAP_COMPRESSED | 2040 }, +}; +const MapDataDefinition gCaveBorder_EasternHills_enter_end[] = { + { MAP_MULTIPLE | offset_gAreaRoomMap_DigCaves_EasternHills_bottom, gMapBottom.mapData, MAP_COMPRESSED | 2040 }, + { offset_gAreaRoomMap_DigCaves_EasternHills_top, gMapTop.mapData, MAP_COMPRESSED | 2040 }, +}; +const MapDataDefinition* const gCaveBorder_EasternHills_enter[] = { + gCaveBorder_EasternHills_enter_start, + gCaveBorder_EasternHills_enter_end, +}; + +const MapDataDefinition gCaveBorder_EasternHills_leave_start[] = { + { offset_gCaveBorder_EasternHills_inside, gMapTop.mapData, MAP_COMPRESSED | 2040 }, +}; +const MapDataDefinition gCaveBorder_EasternHills_leave_end[] = { + { MAP_MULTIPLE | offset_gAreaRoomMap_HyruleField_EasternHillsNorth_bottom, gMapBottom.mapData, + MAP_COMPRESSED | 2040 }, + { offset_gAreaRoomMap_HyruleField_EasternHillsNorth_top, gMapTop.mapData, MAP_COMPRESSED | 2040 }, +}; +const MapDataDefinition* const gCaveBorder_EasternHills_leave[] = { + gCaveBorder_EasternHills_leave_start, + gCaveBorder_EasternHills_leave_end, +}; + +const MapDataDefinition gCaveBorder_Crenel_enter_start[] = { + { offset_gCaveBorder_Crenel_outside, gMapTop.mapData, MAP_COMPRESSED | 1824 }, +}; +const MapDataDefinition gCaveBorder_Crenel_enter_end[] = { + { MAP_MULTIPLE | offset_gAreaRoomMap_CrenelDigCave_0_bottom, gMapBottom.mapData, MAP_COMPRESSED | 1984 }, + { offset_gAreaRoomMap_CrenelDigCave_0_top, gMapTop.mapData, MAP_COMPRESSED | 1984 }, +}; +const MapDataDefinition* const gCaveBorder_Crenel_enter[] = { + gCaveBorder_Crenel_enter_start, + gCaveBorder_Crenel_enter_end, +}; + +const MapDataDefinition gCaveBorder_Crenel_leave_start[] = { + { offset_gCaveBorder_Crenel_inside, gMapTop.mapData, MAP_COMPRESSED | 1984 }, +}; +const MapDataDefinition gCaveBorder_Crenel_leave_end[] = { + { MAP_MULTIPLE | offset_gAreaRoomMap_MtCrenel_WallClimb_bottom, gMapBottom.mapData, MAP_COMPRESSED | 1824 }, + { offset_gAreaRoomMap_MtCrenel_WallClimb_top, gMapTop.mapData, MAP_COMPRESSED | 1824 }, +}; +const MapDataDefinition* const gCaveBorder_Crenel_leave[] = { + gCaveBorder_Crenel_leave_start, + gCaveBorder_Crenel_leave_end, +}; + +const MapDataDefinition gCaveBorder_VeilFalls_enter_start[] = { + { offset_gCaveBorder_VeilFalls_outside, gMapTop.mapData, MAP_COMPRESSED | 3780 }, +}; +const MapDataDefinition gCaveBorder_VeilFalls_enter_end[] = { + { MAP_MULTIPLE | offset_gAreaRoomMap_VeilFallsDigCave_0_bottom, gMapBottom.mapData, MAP_COMPRESSED | 3780 }, + { offset_gAreaRoomMap_VeilFallsDigCave_0_top, gMapTop.mapData, MAP_COMPRESSED | 3780 }, +}; +const MapDataDefinition* const gCaveBorder_VeilFalls_enter[] = { + gCaveBorder_VeilFalls_enter_start, + gCaveBorder_VeilFalls_enter_end, +}; + +const MapDataDefinition gCaveBorder_VeilFalls_leave_start[] = { + { offset_gCaveBorder_VeilFalls_inside, gMapTop.mapData, MAP_COMPRESSED | 3780 }, +}; +const MapDataDefinition gCaveBorder_VeilFalls_leave_end[] = { + { MAP_MULTIPLE | offset_gAreaRoomMap_VeilFalls_Main_bottom, gMapBottom.mapData, MAP_COMPRESSED | 3780 }, + { offset_gAreaRoomMap_VeilFalls_Main_top, gMapTop.mapData, MAP_COMPRESSED | 3780 }, +}; +const MapDataDefinition* const gCaveBorder_VeilFalls_leave[] = { + gCaveBorder_VeilFalls_leave_start, + gCaveBorder_VeilFalls_leave_end, +}; + +const MapDataDefinition gCaveBorder_TrilbyHighlands_enter_start[] = { + { offset_gCaveBorder_TrilbyHighlands_outside, gMapTop.mapData, MAP_COMPRESSED | 3600 }, +}; +const MapDataDefinition gCaveBorder_TrilbyHighlands_enter_end[] = { + { MAP_MULTIPLE | offset_gAreaRoomMap_DigCaves_TrilbyHighlands_bottom, gMapBottom.mapData, MAP_COMPRESSED | 3600 }, + { offset_gAreaRoomMap_DigCaves_TrilbyHighlands_top, gMapTop.mapData, MAP_COMPRESSED | 3600 }, +}; +const MapDataDefinition* const gCaveBorder_TrilbyHighlands_enter[] = { + gCaveBorder_TrilbyHighlands_enter_start, + gCaveBorder_TrilbyHighlands_enter_end, +}; + +const MapDataDefinition gCaveBorder_TrilbyHighlands_leave_start[] = { + { offset_gCaveBorder_TrilbyHighlands_inside, gMapTop.mapData, MAP_COMPRESSED | 3600 }, +}; +const MapDataDefinition gCaveBorder_TrilbyHighlands_leave_end[] = { + { MAP_MULTIPLE | offset_gAreaRoomMap_HyruleField_TrilbyHighlands_bottom, gMapBottom.mapData, + MAP_COMPRESSED | 3600 }, + { offset_gAreaRoomMap_HyruleField_TrilbyHighlands_top, gMapTop.mapData, MAP_COMPRESSED | 3600 }, +}; +const MapDataDefinition* const gCaveBorder_TrilbyHighlands_leave[] = { + gCaveBorder_TrilbyHighlands_leave_start, + gCaveBorder_TrilbyHighlands_leave_end, +}; + +const MapDataDefinition gCaveBorder_CastorWilds_enter_start[] = { + { offset_gCaveBorder_CastorWilds_outside, gMapTop.mapData, MAP_COMPRESSED | 7560 }, +}; +const MapDataDefinition gCaveBorder_CastorWilds_enter_end[] = { + { MAP_MULTIPLE | offset_gAreaRoomMap_CastorWildsDigCave_0_bottom, gMapBottom.mapData, MAP_COMPRESSED | 7560 }, + { offset_gAreaRoomMap_CastorWildsDigCave_0_top, gMapTop.mapData, MAP_COMPRESSED | 7560 }, +}; +const MapDataDefinition* const gCaveBorder_CastorWilds_enter[] = { + gCaveBorder_CastorWilds_enter_start, + gCaveBorder_CastorWilds_enter_end, +}; + +const MapDataDefinition gCaveBorder_CastorWilds_leave_start[] = { + { offset_gCaveBorder_CastorWilds_inside, gMapTop.mapData, MAP_COMPRESSED | 7560 }, +}; +const MapDataDefinition gCaveBorder_CastorWilds_leave_end[] = { + { MAP_MULTIPLE | offset_gAreaRoomMap_CastorWilds_Main_bottom, gMapBottom.mapData, MAP_COMPRESSED | 7560 }, + { offset_gAreaRoomMap_CastorWilds_Main_top, gMapTop.mapData, MAP_COMPRESSED | 7560 }, +}; +const MapDataDefinition* const gCaveBorder_CastorWilds_leave[] = { + gCaveBorder_CastorWilds_leave_start, + gCaveBorder_CastorWilds_leave_end, +}; + +const MapDataDefinition gCaveBorder_LakeHyliaNorth_enter_start[] = { + { offset_gCaveBorder_LakeHyliaNorth_outside, gMapTop.mapData, MAP_COMPRESSED | 5760 }, +}; +const MapDataDefinition gCaveBorder_LakeHyliaNorth_enter_end[] = { + { MAP_MULTIPLE | offset_gAreaRoomMap_HyliaDigCaves_1_bottom, gMapBottom.mapData, MAP_COMPRESSED | 3402 }, + { offset_gAreaRoomMap_HyliaDigCaves_1_top, gMapTop.mapData, MAP_COMPRESSED | 3402 }, +}; +const MapDataDefinition* const gCaveBorder_LakeHyliaNorth_enter[] = { + gCaveBorder_LakeHyliaNorth_enter_start, + gCaveBorder_LakeHyliaNorth_enter_end, +}; + +const MapDataDefinition gCaveBorder_LakeHyliaNorth_leave_start[] = { + { offset_gCaveBorder_LakeHyliaNorth_inside, gMapTop.mapData, MAP_COMPRESSED | 3402 }, +}; +const MapDataDefinition gCaveBorder_LakeHyliaNorth_leave_end[] = { + { MAP_MULTIPLE | offset_gAreaRoomMap_LakeHylia_Main_bottom, gMapBottom.mapData, MAP_COMPRESSED | 5760 }, + { offset_gAreaRoomMap_LakeHylia_Main_top, gMapTop.mapData, MAP_COMPRESSED | 5760 }, +}; +const MapDataDefinition* const gCaveBorder_LakeHyliaNorth_leave[] = { + gCaveBorder_LakeHyliaNorth_leave_start, + gCaveBorder_LakeHyliaNorth_leave_end, +}; + +const MapDataDefinition gCaveBorder_LonLonRanch_enter_start[] = { + { offset_gCaveBorder_LonLonRanch_outside, gMapTop.mapData, MAP_COMPRESSED | 7938 }, +}; +const MapDataDefinition* const gCaveBorder_LonLonRanch_enter[] = { + gCaveBorder_LonLonRanch_enter_start, + gCaveBorder_LakeHyliaNorth_enter_end, +}; + +const MapDataDefinition gCaveBorder_LonLonRanch_leave_end[] = { + { MAP_MULTIPLE | offset_gAreaRoomMap_HyruleField_LonLonRanch_bottom, gMapBottom.mapData, MAP_COMPRESSED | 5400 }, + { offset_gAreaRoomMap_HyruleField_LonLonRanch_top, gMapTop.mapData, MAP_COMPRESSED | 5400 }, +}; +const MapDataDefinition* const gCaveBorder_LonLonRanch_leave[] = { + gCaveBorder_LakeHyliaNorth_leave_start, + gCaveBorder_LonLonRanch_leave_end, +}; + +const MapDataDefinition gCaveBorder_LakeHyliaCenter_enter_end[] = { + { MAP_MULTIPLE | offset_gAreaRoomMap_HyliaDigCaves_0_bottom, gMapBottom.mapData, MAP_COMPRESSED | 544 }, + { offset_gAreaRoomMap_HyliaDigCaves_0_top, gMapTop.mapData, MAP_COMPRESSED | 544 }, +}; +const MapDataDefinition* const gCaveBorder_LakeHyliaCenter_enter[] = { + gCaveBorder_LakeHyliaNorth_enter_start, + gCaveBorder_LakeHyliaCenter_enter_end, +}; + +const MapDataDefinition gCaveBorder_LakeHyliaCenter_leave_start[] = { + { offset_gCaveBorder_LakeHyliaCenter_inside, gMapTop.mapData, MAP_COMPRESSED | 544 }, +}; +const MapDataDefinition* const gCaveBorder_LakeHyliaCenter_leave[] = { + gCaveBorder_LakeHyliaCenter_leave_start, + gCaveBorder_LakeHyliaNorth_leave_end, +}; + +const MapDataDefinition* const* const gCaveBorderMapData[] = { + gCaveBorder_LakeWoods_enter, gCaveBorder_LakeWoods_leave, gCaveBorder_HyruleTown_enter, + gCaveBorder_HyruleTown_leave, gCaveBorder_EasternHills_enter, gCaveBorder_EasternHills_leave, + gCaveBorder_Crenel_enter, gCaveBorder_Crenel_leave, gCaveBorder_VeilFalls_enter, + gCaveBorder_VeilFalls_leave, gCaveBorder_TrilbyHighlands_enter, gCaveBorder_TrilbyHighlands_leave, + gCaveBorder_CastorWilds_enter, gCaveBorder_CastorWilds_leave, gCaveBorder_LakeHyliaNorth_enter, + gCaveBorder_LakeHyliaNorth_leave, gCaveBorder_LonLonRanch_enter, gCaveBorder_LonLonRanch_leave, + gCaveBorder_LakeHyliaCenter_enter, gCaveBorder_LakeHyliaCenter_leave, +}; diff --git a/src/data/data_080046A4.c b/src/data/data_080046A4.c new file mode 100644 index 00000000..f72179c1 --- /dev/null +++ b/src/data/data_080046A4.c @@ -0,0 +1,99 @@ +#include "asm.h" +#include "player.h" + +const KeyValuePair gUnk_080046A4[] = { + { 63, 1 }, { 80, 2 }, { 69, 8 }, { 70, 9 }, { 71, 10 }, { 72, 11 }, { 73, 12 }, { 74, 13 }, + { 75, 14 }, { 76, 15 }, { 77, 16 }, { 65, 1 }, { 82, 2 }, { 68, 17 }, { 79, 18 }, { 372, 19 }, + { 117, 23 }, { 67, 3 }, { 66, 4 }, { 64, 5 }, { 81, 6 }, { 85, 20 }, { 92, 21 }, { 87, 20 }, + { 94, 21 }, { 86, 28 }, { 93, 29 }, { 88, 30 }, { 89, 31 }, { 90, 32 }, { 91, 22 }, { 9, 36 }, + { 12, 37 }, { 13, 36 }, { 15, 38 }, { 14, 39 }, { 16, 36 }, { 17, 36 }, { 18, 36 }, { 20, 37 }, + { 21, 36 }, { 23, 38 }, { 22, 39 }, { 24, 36 }, { 25, 36 }, { 10, 40 }, { 39, 40 }, { 28, 36 }, + { 42, 36 }, { 29, 36 }, { 43, 36 }, { 97, 44 }, { 101, 45 }, { 353, 47 }, { 355, 48 }, { 16384, 25 }, + { 16480, 26 }, { 374, 49 }, { 843, 33 }, { 844, 34 }, { 375, 50 }, { 871, 51 }, { 872, 52 }, { 16490, 24 }, + { 105, 41 }, { 106, 42 }, { 111, 43 }, { 109, 53 }, { 110, 54 }, { 78, 7 }, { 389, 36 }, { 390, 36 }, + { 391, 36 }, { 392, 36 }, { 393, 36 }, { 394, 36 }, { 398, 36 }, { 399, 36 }, { 403, 36 }, { 404, 36 }, + { 405, 36 }, { 406, 36 }, { 407, 36 }, { 408, 36 }, +}; +const u16 gUnk_080046A4End = 0; + +const u16 gUnk_080047F6[] = { + 0, 255, 65280, 0, 65247, 783, 0, 28, 65247, 783, 0, 42, 65247, 783, 0, 121, + 65247, 783, 0, 119, 65247, 783, 0, 53, 65247, 783, 0, 53, 64735, 783, 0, 39, + 65247, 783, 0, 418, 65247, 783, 0, 419, 65247, 783, 0, 420, 65247, 783, 0, 421, + 65247, 783, 0, 422, 65247, 783, 0, 423, 65247, 783, 0, 424, 65247, 783, 0, 425, + 65247, 783, 0, 426, 65247, 783, 0, 360, 65247, 783, 0, 40, 39563, 15119, 65280, 31, + 59074, 1039, 256, 29, 59074, 1039, 256, 43, 59074, 1039, 256, 789, 34816, 298, 65280, 118, + 34816, 298, 65280, 16491, 33666, 255, 65280, 16389, 33666, 255, 65280, 16499, 33439, 4879, 65280, 53, + 59074, 1039, 256, 53, 59074, 1039, 256, 53, 59074, 1039, 256, 119, 59074, 1039, 256, 121, + 59074, 1039, 256, 360, 49323, 5647, 1024, 38, 49323, 5647, 1024, 52, 32768, 255, 65280, 804, + 40960, 255, 65280, 26, 40960, 255, 65280, 53, 40960, 255, 65280, 119, 40960, 255, 65280, 121, + 40960, 255, 65280, 27, 49192, 801, 768, 38, 49192, 801, 768, 789, 49192, 801, 768, 29, + 49192, 33, 768, 38, 49192, 33, 768, 121, 32832, 783, 0, 113, 43019, 5903, 65280, 29, + 43019, 5903, 65280, 53, 33859, 11535, 512, 30, 32776, 1039, 65280, 29, 32776, 1039, 65280, 38, + 32776, 1039, 65280, 52, 32779, 21263, 65280, 19, 32779, 21263, 65280, 789, 0, 30, 2, 18, + 64, 8, 0, 1, 128, 10, 0, 1, 128, 8, 384, 10, 128, 30, 1, 49152 +}; + +#define PLAYER_MACRO_JUMPTO 0x4000 // Jump +#define PLAYER_MACRO_IGNORE 0x8000 // Do not set playerMacroWaiting and playerMacroHeldKeys? +#define PLAYER_MACRO_END 0xC000 // End // 49152 + +// Link tries out the shield. +const PlayerMacroEntry gPlayerMacroTryOutShield[] = { + { 4, DPAD_LEFT }, { 1, DPAD_DOWN }, { 60, A_BUTTON }, { 1, DPAD_LEFT }, + { 60, A_BUTTON }, { 1, DPAD_RIGHT }, { 60, A_BUTTON }, { PLAYER_MACRO_JUMPTO, -4 }, +}; + +// Link holding his shield when the monsters escape or vaati attacks zelda. +const PlayerMacroEntry gPlayerMacroProtectWithShield[] = { + { 0, A_BUTTON }, + { PLAYER_MACRO_JUMPTO, -4 }, +}; + +const PlayerMacroEntry gPlayerMacroSanctuary[] = { + { 1, DPAD_UP }, + { 120, B_BUTTON }, + { 60, 0 }, +}; +const u16 gPlayerMacroSanctuaryEnd = PLAYER_MACRO_END; + +const PlayerMacroEntry gPlayerMacroBladeBrothers0[] = { + { 120, B_BUTTON }, + { 60, 0 }, +}; +const u16 gPlayerMacroBladeBrothers0End = PLAYER_MACRO_END; +const PlayerMacroEntry gPlayerMacroBladeBrothers1[] = { + { 60, DPAD_RIGHT }, + { 4, B_BUTTON }, + { 60, 0 }, +}; +const u16 gPlayerMacroBladeBrothers1End = PLAYER_MACRO_END; +const PlayerMacroEntry gPlayerMacroBladeBrothers2[] = { + { 4, DPAD_LEFT }, + { 120, A_BUTTON }, + { 60, 0 }, +}; +const u16 gPlayerMacroBladeBrothers2End = PLAYER_MACRO_END; +const PlayerMacroEntry gPlayerMacroBladeBrothers3[] = { + { 1, DPAD_DOWN }, { 4, A_BUTTON }, { 10, 0 }, { 10, B_BUTTON }, { 60, 0 }, +}; +const u16 gPlayerMacroBladeBrothers3End = PLAYER_MACRO_END; +const PlayerMacroEntry gPlayerMacroBladeBrothers4[] = { + { 4, DPAD_RIGHT }, { 8, R_BUTTON + DPAD_RIGHT }, { 30, 0 }, { 1, DPAD_LEFT }, { 30, 0 }, + { 4, DPAD_LEFT }, { 4, R_BUTTON + DPAD_LEFT }, { 20, 0 }, { 6, B_BUTTON }, { 60, 0 }, +}; +const u16 gPlayerMacroBladeBrothers4End = PLAYER_MACRO_END; +const PlayerMacroEntry gPlayerMacroBladeBrothers5[] = { + { 1, DPAD_LEFT }, { 30, 0 }, { 4, B_BUTTON }, { 60, 0 }, { 4, B_BUTTON }, { 60, 0 }, +}; +const u16 gPlayerMacroBladeBrothers5End = PLAYER_MACRO_END; +const PlayerMacroEntry gPlayerMacroBladeBrothers6[] = { + { 1, DPAD_LEFT }, { 30, 0 }, { 4, B_BUTTON }, { 60, 0 }, { 4, B_BUTTON }, { 60, 0 }, +}; +const u16 gPlayerMacroBladeBrothers6End = PLAYER_MACRO_END; +const PlayerMacroEntry gPlayerMacroBladeBrothers7[] = { + { 1, DPAD_LEFT }, { 120, B_BUTTON }, { 10, 0 }, { 4, B_BUTTON }, { 4, 0 }, { 4, B_BUTTON }, + { 4, 0 }, { 4, B_BUTTON }, { 4, 0 }, { 4, B_BUTTON }, { 4, 0 }, { 4, B_BUTTON }, + { 4, 0 }, { 4, B_BUTTON }, { 4, 0 }, { 4, B_BUTTON }, { 30, 0 }, +}; +const u16 gPlayerMacroBladeBrothers7End = PLAYER_MACRO_END; diff --git a/src/data/mapActTileToSurfaceType.c b/src/data/mapActTileToSurfaceType.c new file mode 100644 index 00000000..e821a766 --- /dev/null +++ b/src/data/mapActTileToSurfaceType.c @@ -0,0 +1,75 @@ +#include "asm.h" +#include "player.h" +#include "tiles.h" + +const KeyValuePair gMapActTileToSurfaceType[] = { + { ACT_TILE_13, SURFACE_PIT }, + { ACT_TILE_38, SURFACE_SLOPE_GNDGND_V }, + { ACT_TILE_39, SURFACE_SLOPE_GNDGND_H }, + { ACT_TILE_82, SURFACE_26 }, + { ACT_TILE_99, SURFACE_24 }, + { ACT_TILE_116, SURFACE_EDGE }, + { ACT_TILE_8, SURFACE_7 }, + { ACT_TILE_31, SURFACE_MINISH_DOOR_FRONT }, + { ACT_TILE_32, SURFACE_MINISH_DOOR_BACK }, + { ACT_TILE_33, SURFACE_A }, + { ACT_TILE_34, SURFACE_B }, + { ACT_TILE_24, SURFACE_16 }, + { ACT_TILE_18, SURFACE_ICE }, + { ACT_TILE_15, SURFACE_SHALLOW_WATER }, + { ACT_TILE_14, SURFACE_SLOPE_GNDWATER }, + { ACT_TILE_16, SURFACE_WATER }, + { ACT_TILE_27, SURFACE_BUTTON }, + { ACT_TILE_29, SURFACE_BUTTON }, + { ACT_TILE_97, SURFACE_1B }, + { ACT_TILE_90, SURFACE_1C }, + { ACT_TILE_17, SURFACE_14 }, + { ACT_TILE_98, SURFACE_21 }, + { ACT_TILE_101, SURFACE_6 }, + { ACT_TILE_102, SURFACE_6 }, + { ACT_TILE_103, SURFACE_6 }, + { ACT_TILE_104, SURFACE_6 }, + { ACT_TILE_105, SURFACE_6 }, + { ACT_TILE_106, SURFACE_6 }, + { ACT_TILE_108, SURFACE_6 }, + { ACT_TILE_109, SURFACE_6 }, + { ACT_TILE_110, SURFACE_6 }, + { ACT_TILE_111, SURFACE_6 }, + { ACT_TILE_107, SURFACE_6 }, + { ACT_TILE_48, SURFACE_22 }, + { ACT_TILE_49, SURFACE_22 }, + { ACT_TILE_50, SURFACE_22 }, + { ACT_TILE_51, SURFACE_22 }, + { ACT_TILE_22, SURFACE_DUST }, + { ACT_TILE_25, SURFACE_HOLE }, + { ACT_TILE_240, SURFACE_HOLE }, + { ACT_TILE_87, SURFACE_CLONE_TILE }, + { ACT_TILE_83, SURFACE_LADDER }, + { ACT_TILE_241, SURFACE_LADDER }, + { ACT_TILE_63, SURFACE_AUTO_LADDER }, + { ACT_TILE_80, SURFACE_CLIMB_WALL }, + { ACT_TILE_81, SURFACE_2C }, + { ACT_TILE_52, SURFACE_LIGHT_GRADE }, + { ACT_TILE_53, SURFACE_29 }, + { ACT_TILE_42, SURFACE_E }, + { ACT_TILE_43, SURFACE_D }, + { ACT_TILE_44, SURFACE_10 }, + { ACT_TILE_45, SURFACE_F }, + { ACT_TILE_64, SURFACE_E }, + { ACT_TILE_65, SURFACE_D }, + { ACT_TILE_66, SURFACE_10 }, + { ACT_TILE_67, SURFACE_F }, + { ACT_TILE_72, SURFACE_10 }, + { ACT_TILE_74, SURFACE_E }, + { ACT_TILE_69, SURFACE_E }, + { ACT_TILE_71, SURFACE_E }, + { ACT_TILE_70, SURFACE_D }, + { ACT_TILE_73, SURFACE_D }, + { ACT_TILE_68, SURFACE_D }, + { ACT_TILE_75, SURFACE_D }, + { ACT_TILE_19, SURFACE_SWAMP }, + { ACT_TILE_41, SURFACE_DOOR }, + { ACT_TILE_23, SURFACE_2D }, + { ACT_TILE_40, SURFACE_DOOR_13 }, +}; +// const u16 gMapActTileToSurfaceTypeEnd = 0; diff --git a/src/data/transitions.c b/src/data/transitions.c index 4d600a86..38f0ae33 100644 --- a/src/data/transitions.c +++ b/src/data/transitions.c @@ -46,9 +46,9 @@ const Transition gExitList_MinishWoods_Main[] = { { WARP_TYPE_AREA, 0x00, 0x0088, 0x0218, 0x0218, 0x0118, 0x00, AREA_MINISH_CAVES, ROOM_MINISH_CAVES_MINISH_WOODS_SOUTHWEST, 1, TRANSITION_TYPE_NORMAL, 0x00, 0x00, 0x00, 0x00, 0x00 }, { WARP_TYPE_BORDER, 0x00, 0x0000, 0x0000, 0x01d8, 0x0fff, 0x40, AREA_HYRULE_FIELD, - ROOM_HYRULE_FIELD_EASTERN_HILLLS_NORTH, 1, TRANSITION_TYPE_NORMAL, 0x06, 0x00, 0x00, 0x00, 0x00 }, + ROOM_HYRULE_FIELD_EASTERN_HILLS_NORTH, 1, TRANSITION_TYPE_NORMAL, 0x06, 0x00, 0x00, 0x00, 0x00 }, { WARP_TYPE_BORDER, 0x00, 0x0000, 0x0000, 0x01d8, 0x00a0, 0x80, AREA_HYRULE_FIELD, - ROOM_HYRULE_FIELD_EASTERN_HILLLS_SOUTH, 1, TRANSITION_TYPE_NORMAL, 0x06, 0x00, 0x00, 0x00, 0x00 }, + ROOM_HYRULE_FIELD_EASTERN_HILLS_SOUTH, 1, TRANSITION_TYPE_NORMAL, 0x06, 0x00, 0x00, 0x00, 0x00 }, { WARP_TYPE_BORDER, 0x00, 0x0000, 0x0000, 0x0fff, 0x03b8, 0x01, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 1, TRANSITION_TYPE_NORMAL, 0x00, 0x00, 0x00, 0x00, 0x00 }, { WARP_TYPE_BORDER, 0x00, 0x0000, 0x0000, 0x0fff, 0x03ac, 0x02, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 1, @@ -446,9 +446,9 @@ const Transition gExitList_HyruleField_WesternWoodsCenter[] = { const Transition* const gExitLists_HyruleField[] = { [ROOM_HYRULE_FIELD_WESTERN_WOODS_SOUTH] = gExitList_HyruleField_WesternWoodSouth, [ROOM_HYRULE_FIELD_SOUTH_HYRULE_FIELD] = gExitList_HyruleField_SouthHyruleField, - [ROOM_HYRULE_FIELD_EASTERN_HILLLS_SOUTH] = gExitList_HyruleField_EasternHillsSouth, - [ROOM_HYRULE_FIELD_EASTERN_HILLLS_CENTER] = gExitList_HyruleField_EasternHillsCenter, - [ROOM_HYRULE_FIELD_EASTERN_HILLLS_NORTH] = gExitList_HyruleField_EasternHillsNorth, + [ROOM_HYRULE_FIELD_EASTERN_HILLS_SOUTH] = gExitList_HyruleField_EasternHillsSouth, + [ROOM_HYRULE_FIELD_EASTERN_HILLS_CENTER] = gExitList_HyruleField_EasternHillsCenter, + [ROOM_HYRULE_FIELD_EASTERN_HILLS_NORTH] = gExitList_HyruleField_EasternHillsNorth, [ROOM_HYRULE_FIELD_LON_LON_RANCH] = gExitList_HyruleField_LonLonRanch, [ROOM_HYRULE_FIELD_NORTH_HYRULE_FIELD] = gExitList_HyruleField_NorthHyruleField, [ROOM_HYRULE_FIELD_TRILBY_HIGHLANDS] = gExitList_HyruleField_TrilbyHighlands, @@ -628,7 +628,7 @@ const Transition gExitList_Beanstalks_RuinsClimb[] = { const Transition gExitList_Beanstalks_EasternHillsClimb[] = { { WARP_TYPE_BORDER, 0x0, 0x0, 0x0, 0x58, 0x68, 0x3, AREA_BEANSTALKS, ROOM_BEANSTALKS_EASTERN_HILLS, 1, TRANSITION_TYPE_NORMAL, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { WARP_TYPE_BORDER, 0x0, 0x0, 0x0, 0x48, 0x18, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLLS_CENTER, + { WARP_TYPE_BORDER, 0x0, 0x0, 0x0, 0x48, 0x18, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLS_CENTER, 1, TRANSITION_TYPE_NORMAL, 0x0, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -923,7 +923,7 @@ const Transition gExitList_MinishHouseInteriors_Librari[] = { TransitionListEnd, }; const Transition gExitList_MinishHouseInteriors_HyruleFieldExit[] = { - { WARP_TYPE_BORDER, 0x0, 0x0, 0x0, 0x38, 0x35, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLLS_SOUTH, + { WARP_TYPE_BORDER, 0x0, 0x0, 0x0, 0x38, 0x35, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLS_SOUTH, 1, TRANSITION_TYPE_INSTANT_MINISH, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -1108,7 +1108,7 @@ const Transition gExitList_HouseInteriors2_DrLeft[] = { TransitionListEnd, }; const Transition gExitList_HouseInteriors2_NULL1[] = { - { WARP_TYPE_BORDER, 0x0, 0x0, 0x0, 0x40, 0x5c, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLLS_NORTH, + { WARP_TYPE_BORDER, 0x0, 0x0, 0x0, 0x40, 0x5c, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLS_NORTH, 1, TRANSITION_TYPE_NORMAL, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -1244,7 +1244,7 @@ const Transition gExitList_HouseInteriors4_RanchHouseEast[] = { TransitionListEnd, }; const Transition gExitList_HouseInteriors4_FarmHouse[] = { - { WARP_TYPE_BORDER, 0x0, 0x0, 0x0, 0x40, 0x5c, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLLS_NORTH, + { WARP_TYPE_BORDER, 0x0, 0x0, 0x0, 0x40, 0x5c, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLS_NORTH, 1, TRANSITION_TYPE_NORMAL, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; @@ -2273,7 +2273,7 @@ const Transition gExitList_Caves_TrilbyMittsFairyFountain[] = { TransitionListEnd, }; const Transition gExitList_Caves_HillsKeeseChest[] = { - { WARP_TYPE_BORDER, 0x0, 0x0, 0x0, 0xa8, 0xa8, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLLS_CENTER, + { WARP_TYPE_BORDER, 0x0, 0x0, 0x0, 0xa8, 0xa8, 0x30, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLS_CENTER, 1, TRANSITION_TYPE_NORMAL, 0x4, 0x0, 0x0, 0x0, 0x0 }, TransitionListEnd, }; diff --git a/src/demo.c b/src/demo.c index 0cb7d039..aea3f7ea 100644 --- a/src/demo.c +++ b/src/demo.c @@ -24,7 +24,6 @@ void sub_080A2F8C(void); extern u8 gUnk_02000004; void sub_080A3198(u32, u32); -extern u8 gUnk_02017760[]; extern u8 gUnk_08A05751[]; // sprite_table @@ -59,8 +58,8 @@ void sub_080A2E40(void) { LoadGfxGroups(); LoadPaletteGroup(0xb5); LoadGfxGroup(0x56); - MemCopy(&gUnk_089FD1B4, &gUnk_02017760[0], 0x100); - MemCopy(&gUnk_089FD1B4, &gUnk_02017760[0x200], 0x100); + MemCopy(&gUnk_089FD1B4, gPaletteBuffer + 96, 0x100); + MemCopy(&gUnk_089FD1B4, gPaletteBuffer + 352, 0x100); MemCopy(&gUnk_089FD2F4, (void*)0x6000000, 0x8000); MemCopy(&gUnk_089FD2F4, (void*)0x6010000, 0x8000); MemCopy(&gUnk_08A05751, &gBG1Buffer, 0x800); diff --git a/src/enemy/acroBandits.c b/src/enemy/acroBandits.c index f2e7c201..4e6854b9 100644 --- a/src/enemy/acroBandits.c +++ b/src/enemy/acroBandits.c @@ -190,11 +190,11 @@ void AcroBandit_Type0Action1(AcroBanditEntity* this) { if (super->timer != 0) { super->timer--; } else { - if (sub_08049FDC(super, 1)) { + if (sub_08049FDC(super, 1) != 0) { rand = Random(); x = this->unk_74.HWORD + ((s32)rand % 5) * 0x10 - 0x20; y = this->unk_76.HWORD + ((s32)(rand >> 4) % 5) * 0x10 - 0x20; - if (sub_080B1B18(x, y, super->collisionLayer) == 0) { + if (GetCollisionDataAtWorldCoords(x, y, super->collisionLayer) == 0) { super->action = 2; super->spriteSettings.draw = 1; super->x.HALF.HI = x; diff --git a/src/enemy/armos.c b/src/enemy/armos.c index 99fe9517..94236dee 100644 --- a/src/enemy/armos.c +++ b/src/enemy/armos.c @@ -9,7 +9,9 @@ #include "enemy.h" #include "flags.h" #include "functions.h" +#include "global.h" #include "hitbox.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -401,19 +403,18 @@ void sub_080307D4(ArmosEntity* this) { } void sub_080307EC(ArmosEntity* this) { - u32 position = COORD_TO_TILE(super); - this->unk_78 = GetTileIndex(position, super->collisionLayer); - SetBottomTile(0x4022, position, (u32)super->collisionLayer); + u32 tilePos = COORD_TO_TILE(super); + this->unk_78 = GetTileIndex(tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos, (u32)super->collisionLayer); } void sub_08030834(ArmosEntity* this) { - SetBottomTile(this->unk_78, COORD_TO_TILE(super), super->collisionLayer); + SetTile(this->unk_78, COORD_TO_TILE(super), super->collisionLayer); } bool32 sub_0803086C(ArmosEntity* this) { u32 uVar2; - u32 pos; - u32 pos2; + u32 tilePos; u16 centerY; u16 centerX; FORCE_REGISTER(u32 r2, r2); @@ -423,10 +424,10 @@ bool32 sub_0803086C(ArmosEntity* this) { centerX = super->x.HALF_U.HI - gRoomControls.origin_x; centerY = super->y.HALF_U.HI - gRoomControls.origin_y; // TODO for some reason the 0x3f of COORD_TO_TILE(super) needs to be forced to r2 here. - pos = ((((((super)->x.HALF.HI) - gRoomControls.origin_x) >> 4) & (r2 = 0x3f)) | - (((((super)->y.HALF.HI) - gRoomControls.origin_y) >> 4) & r2) << 6); + tilePos = ((((((super)->x.HALF.HI) - gRoomControls.origin_x) >> 4) & (r2 = 0x3f)) | + (((((super)->y.HALF.HI) - gRoomControls.origin_y) >> 4) & r2) << 6); - if (GetTileType(pos, super->collisionLayer) == 0x4049) { + if (GetTileTypeAtTilePos(tilePos, super->collisionLayer) == SPECIAL_TILE_73) { if (CheckPlayerInRegion(centerX, centerY, 2, 0xc) != 0) { if (CheckPlayerInRegion(centerX, centerY - 4, 2, 4) != 0) { gPlayerEntity.base.spritePriority.b0 = 3; @@ -435,11 +436,11 @@ bool32 sub_0803086C(ArmosEntity* this) { return TRUE; } } else { - SetBottomTile(0x4022, pos, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos, super->collisionLayer); } } else { if (CheckPlayerInRegion(centerX, centerY + 6, 2, 5) != 0) { - SetBottomTile(0x4049, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_73, COORD_TO_TILE(super), super->collisionLayer); } } } diff --git a/src/enemy/bombPeahat.c b/src/enemy/bombPeahat.c index 64bff4f2..5993dfb2 100644 --- a/src/enemy/bombPeahat.c +++ b/src/enemy/bombPeahat.c @@ -212,7 +212,7 @@ void sub_0802AAC0(BombPeahatEntity* this) { super->child = NULL; #ifdef EU } else if (entity->timer == 0) { - if (sub_080B1B44(COORD_TO_TILE(super), 1) == 0) { + if (GetCollisionDataAtTilePos(COORD_TO_TILE(super), 1) == 0) { if (EntityInRectRadius(super, &gPlayerEntity.base, 0x10, 0x10) && entity->subtimer <= 0x50) { this->unk_81 = 0; } @@ -685,7 +685,7 @@ void sub_0802B204(BombPeahatEntity* this) { bool32 sub_0802B234(BombPeahatEntity* this) { bool32 ret = FALSE; - if (GetTileTypeByEntity(super) - 0x1c4 > 1) + if (GetTileTypeAtEntity(super) - 0x1c4 > 1) ret = TRUE; return ret; } diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c index 5a2f0d9b..3f2c5c74 100644 --- a/src/enemy/businessScrub.c +++ b/src/enemy/businessScrub.c @@ -13,6 +13,7 @@ #include "message.h" #include "npc.h" #include "save.h" +#include "tiles.h" struct SalesOffering { u8 field_0x0; @@ -442,7 +443,7 @@ void sub_08028FFC(BusinessScrubEntity* this) { super->x.HALF.HI = this->unk_78; super->y.HALF.HI = this->unk_7a; InitializeAnimation(super, 0); - SetBottomTile(0x4022, this->unk_76, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_76, super->collisionLayer); } void sub_08029078(BusinessScrubEntity* this) { @@ -456,7 +457,7 @@ void sub_08029078(BusinessScrubEntity* this) { super->spriteIndex = 0xd0; sub_08028FDC(this); sub_080290E0(this, 1); - SetBottomTile(this->unk_74, this->unk_76, super->collisionLayer); + SetTile(this->unk_74, this->unk_76, super->collisionLayer); } } diff --git a/src/enemy/chuchu.c b/src/enemy/chuchu.c index 95a08744..7f3186bb 100644 --- a/src/enemy/chuchu.c +++ b/src/enemy/chuchu.c @@ -7,6 +7,7 @@ #include "asm.h" #include "enemy.h" #include "functions.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -714,11 +715,11 @@ void sub_0801FB68(ChuchuEntity* this) { super->zVelocity = 0; } -u32 CheckWaterTile(ChuchuEntity* this) { - if (GetActTile(super) == 0x10) { - return 1; +bool32 CheckWaterTile(ChuchuEntity* this) { + if (GetActTileAtEntity(super) == ACT_TILE_16) { + return TRUE; } else { - return 0; + return FALSE; } } diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c index d5502a80..a558134a 100644 --- a/src/enemy/chuchuBoss.c +++ b/src/enemy/chuchuBoss.c @@ -7,6 +7,7 @@ #include "enemy.h" #include "functions.h" #include "object.h" +#include "tiles.h" typedef struct { u8 unk_00; @@ -561,7 +562,7 @@ void sub_080262A8(ChuchuBossEntity* this) { gPlayerEntity.base.animationState = 0; gRoomControls.camera_target = super; gRoomControls.scrollSpeed = 1; - SetBottomTile(0x4022, 0x2c8, 1); + SetTile(SPECIAL_TILE_34, TILE_POS(8, 11), LAYER_BOTTOM); } } diff --git a/src/enemy/cloudPiranha.c b/src/enemy/cloudPiranha.c index 74f4be6b..389237c4 100644 --- a/src/enemy/cloudPiranha.c +++ b/src/enemy/cloudPiranha.c @@ -8,6 +8,7 @@ #include "enemy.h" #include "functions.h" #include "physics.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -238,18 +239,18 @@ void sub_080387F0(CloudPiranhaEntity* this) { }; u8 bVar1; u8 bVar2; - s32 iVar4; + s32 collisionData; const s8* ptr; if ((super->action != 4) && (this->unk_82 == 0)) { - iVar4 = sub_080B1B44(COORD_TO_TILE(super), super->collisionLayer); - if ((iVar4 == 0xf) || (iVar4 == 0x2a)) { + collisionData = GetCollisionDataAtTilePos(COORD_TO_TILE(super), super->collisionLayer); + if ((collisionData == COLLISION_DATA_15) || (collisionData == COLLISION_DATA_42)) { this->unk_82 = 0x20; } ptr = &gUnk_080CF520[super->direction >> 1]; bVar1 = super->direction; - iVar4 = sub_080B1AF0(super, ptr[0], ptr[1]); - if ((iVar4 == 0xf) || (iVar4 == 0x2a)) { + collisionData = GetCollisionDataRelativeTo(super, ptr[0], ptr[1]); + if ((collisionData == COLLISION_DATA_15) || (collisionData == COLLISION_DATA_42)) { super->direction = (super->direction + 0x10) & 0x1f; } else { if (super->collisions != COL_NONE) { diff --git a/src/enemy/doorMimic.c b/src/enemy/doorMimic.c index b7c57037..46972dc8 100644 --- a/src/enemy/doorMimic.c +++ b/src/enemy/doorMimic.c @@ -7,6 +7,7 @@ #include "enemy.h" #include "functions.h" #include "sound.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -48,7 +49,7 @@ void DoorMimic_OnCollision(DoorMimicEntity* this) { } void DoorMimic_OnDeath(DoorMimicEntity* this) { - SetBottomTile(this->unk_7c, this->unk_7e, super->collisionLayer); + SetTile(this->unk_7c, this->unk_7e, super->collisionLayer); CreateFx(super, FX_POT_SHATTER, 0); EnemyDisableRespawn(super); DeleteThisEntity(); @@ -122,10 +123,10 @@ void sub_08022198(DoorMimicEntity* this) { } void sub_080221C0(DoorMimicEntity* this) { - u32 tile = COORD_TO_TILE(super) + gUnk_080B4488[super->type2]; - this->unk_7e = tile; - this->unk_7c = GetTileIndex(tile, super->collisionLayer); - SetBottomTile(gUnk_080CB79C[super->type2], tile, super->collisionLayer); + u32 tilePos = COORD_TO_TILE(super) + gUnk_080B4488[super->type2]; + this->unk_7e = tilePos; + this->unk_7c = GetTileIndex(tilePos, super->collisionLayer); + SetTile(gUnk_080CB79C[super->type2], tilePos, super->collisionLayer); } // clang-format off @@ -190,10 +191,10 @@ const PosOffset gUnk_080CB76C[][6] = { }; const u16 gUnk_080CB79C[] = { - 0x4023, - 0x4025, - 0x4026, - 0x4024, + SPECIAL_TILE_35, + SPECIAL_TILE_37, + SPECIAL_TILE_38, + SPECIAL_TILE_36, }; diff --git a/src/enemy/enemy64.c b/src/enemy/enemy64.c index 41566f7b..c7e561cd 100644 --- a/src/enemy/enemy64.c +++ b/src/enemy/enemy64.c @@ -7,6 +7,7 @@ #include "enemy.h" #include "fade.h" #include "functions.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -85,16 +86,16 @@ void Enemy64_Init(Enemy64Entity* this) { Entity* tail; if (CheckFlags(0x7c)) { - SetBottomTile(0x4081, 10, 2); - SetBottomTile(0x4081, 0x4a, 2); - SetBottomTile(0x4081, 0x8a, 2); - SetBottomTile(0x4081, 0xca, 2); + SetTile(SPECIAL_TILE_129, TILE_POS(10, 0), LAYER_TOP); + SetTile(SPECIAL_TILE_129, TILE_POS(10, 1), LAYER_TOP); + SetTile(SPECIAL_TILE_129, TILE_POS(10, 2), LAYER_TOP); + SetTile(SPECIAL_TILE_129, TILE_POS(10, 3), LAYER_TOP); DeleteThisEntity(); } else { - sub_0807B7D8(0x323, 10, 1); - sub_0807B7D8(0x323, 0x4a, 1); - sub_0807B7D8(0x323, 0x8a, 1); - sub_0807B7D8(0x323, 0xca, 1); + sub_0807B7D8(0x323, TILE_POS(10, 0), LAYER_BOTTOM); + sub_0807B7D8(0x323, TILE_POS(10, 1), LAYER_BOTTOM); + sub_0807B7D8(0x323, TILE_POS(10, 2), LAYER_BOTTOM); + sub_0807B7D8(0x323, TILE_POS(10, 3), LAYER_BOTTOM); } tail = CreateProjectile(GYORG_TAIL); if (tail != NULL) { @@ -189,7 +190,7 @@ void Enemy64_Action2_SubAction0(Enemy64Entity* this) { } void Enemy64_Action2_SubAction1(Enemy64Entity* this) { - u32 tmp = CalcOffsetAngle(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); + u32 tmp = CalculateDirectionFromOffsets(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); if (4 < (((super->direction - tmp) + 2) & 0xff)) { if (((tmp - super->direction) & 0x80) != 0) { super->direction--; @@ -290,8 +291,8 @@ void Enemy64_Action3(Enemy64Entity* this) { } void Enemy64_Action3_SubAction0(Enemy64Entity* this) { - u32 tmp = CalcOffsetAngle(gRoomControls.origin_x + 0xa8 - super->x.HALF.HI, - gRoomControls.origin_y + 0x80 - super->y.HALF.HI); + u32 tmp = CalculateDirectionFromOffsets(gRoomControls.origin_x + 0xa8 - super->x.HALF.HI, + gRoomControls.origin_y + 0x80 - super->y.HALF.HI); if (tmp != super->direction) { if (((tmp - super->direction) & 0x80) != 0) { super->direction--; @@ -439,20 +440,20 @@ void Enemy64_Action4_SubAction7(Enemy64Entity* this) { if (--super->timer == 0) { DeleteThisEntity(); } else if (super->timer == 16) { - sub_0807B7D8(0x36, 0xca, 1); - SetBottomTile(0x4081, 0xca, 2); + sub_0807B7D8(0x36, TILE_POS(10, 3), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_129, TILE_POS(10, 3), LAYER_TOP); SoundReq(SFX_HEART_GET); } else if (super->timer == 24) { - sub_0807B7D8(0x36, 0x8a, 1); - SetBottomTile(0x4081, 0x8a, 2); + sub_0807B7D8(0x36, TILE_POS(10, 2), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_129, TILE_POS(10, 2), LAYER_TOP); SoundReq(SFX_HEART_GET); } else if (super->timer == 32) { - sub_0807B7D8(0x36, 0x4a, 1); - SetBottomTile(0x4081, 0x4a, 2); + sub_0807B7D8(0x36, TILE_POS(10, 1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_129, TILE_POS(10, 1), LAYER_TOP); SoundReq(SFX_HEART_GET); } else if (super->timer == 40) { - sub_0807B7D8(0x36, 10, 1); - SetBottomTile(0x4081, 10, 2); + sub_0807B7D8(0x36, TILE_POS(10, 0), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_129, TILE_POS(10, 0), LAYER_TOP); SoundReq(SFX_HEART_GET); } } @@ -490,8 +491,8 @@ void sub_080499F0(Enemy64Entity* this) { ((this->unk_7c & 1) == 0)) { if (EntityWithinDistance(&gPlayerEntity.base, super->x.HALF.HI, super->y.HALF.HI, 0x24) && ((this->unk_7c & 2) == 0)) { - tmp = CalcOffsetAngle((s32)gPlayerEntity.base.x.HALF.HI - super->x.HALF.HI, - (s32)gPlayerEntity.base.y.HALF.HI - super->y.HALF.HI); + tmp = CalculateDirectionFromOffsets((s32)gPlayerEntity.base.x.HALF.HI - super->x.HALF.HI, + (s32)gPlayerEntity.base.y.HALF.HI - super->y.HALF.HI); gPlayerEntity.base.x.WORD = super->x.WORD + gSineTable[tmp] * 0x2400; gPlayerEntity.base.y.WORD = super->y.WORD + gSineTable[tmp + 0x40] * -0x2400; } diff --git a/src/enemy/eyegore.c b/src/enemy/eyegore.c index 1ccf4e78..03b1c90e 100644 --- a/src/enemy/eyegore.c +++ b/src/enemy/eyegore.c @@ -9,6 +9,7 @@ #include "functions.h" #include "hitbox.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -24,16 +25,16 @@ typedef struct { /*0x7c*/ u16 unk_7c; /*0x7e*/ u8 unk_7e; /*0x7f*/ u8 unk_7f; - /*0x80*/ u16 unk_80; - /*0x82*/ u16 unk_82; - /*0x84*/ u16 unk_84; - /*0x86*/ u16 unk_86; + /*0x80*/ u16 tileIndex1; + /*0x82*/ u16 tileIndex2; + /*0x84*/ u16 tileIndex3; + /*0x86*/ u16 tileIndex4; } EyegoreEntity; extern Entity* sub_08017A90(Entity*, Entity*); extern Entity* gUnk_020000B0; -extern const u8 gUnk_080B3E80[]; +extern const u8 gMapTileTypeToCollisionData[]; void sub_08031344(EyegoreEntity*); void sub_08031344(EyegoreEntity*); @@ -326,27 +327,27 @@ void sub_08030E80(EyegoreEntity* this) { } void sub_08030F00(EyegoreEntity* this) { - u32 position = COORD_TO_TILE_OFFSET(super, 8, 0x14); - u16 tileIndex = GetTileIndex(position, super->collisionLayer); - this->unk_80 = tileIndex; - tileIndex = GetTileIndex(position + 1, super->collisionLayer); - this->unk_82 = tileIndex; - tileIndex = GetTileIndex(position + 0x40, super->collisionLayer); - this->unk_84 = tileIndex; - tileIndex = GetTileIndex(position + 0x41, super->collisionLayer); - this->unk_86 = tileIndex; - SetBottomTile(0x4022, position, super->collisionLayer); - SetBottomTile(0x4022, position + 1, super->collisionLayer); - SetBottomTile(0x4022, position + 0x40, super->collisionLayer); - SetBottomTile(0x4022, position + 0x41, super->collisionLayer); + u32 tilePos = COORD_TO_TILE_OFFSET(super, 8, 20); + u16 tileIndex = GetTileIndex(tilePos + TILE_POS(0, 0), super->collisionLayer); + this->tileIndex1 = tileIndex; + tileIndex = GetTileIndex(tilePos + TILE_POS(1, 0), super->collisionLayer); + this->tileIndex2 = tileIndex; + tileIndex = GetTileIndex(tilePos + TILE_POS(0, 1), super->collisionLayer); + this->tileIndex3 = tileIndex; + tileIndex = GetTileIndex(tilePos + TILE_POS(1, 1), super->collisionLayer); + this->tileIndex4 = tileIndex; + SetTile(SPECIAL_TILE_34, tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos + 1, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos + TILE_POS(0, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos + TILE_POS(1, 1), super->collisionLayer); } void sub_08030FB4(EyegoreEntity* this) { - u32 position = COORD_TO_TILE_OFFSET(super, 8, 0x14); - SetBottomTile(this->unk_80, position, super->collisionLayer); - SetBottomTile(this->unk_82, position + 1, super->collisionLayer); - SetBottomTile(this->unk_84, position + 0x40, super->collisionLayer); - SetBottomTile(this->unk_86, position + 0x41, super->collisionLayer); + u32 tilePos = COORD_TO_TILE_OFFSET(super, 8, 20); + SetTile(this->tileIndex1, tilePos + TILE_POS(0, 0), super->collisionLayer); + SetTile(this->tileIndex2, tilePos + TILE_POS(1, 0), super->collisionLayer); + SetTile(this->tileIndex3, tilePos + TILE_POS(0, 1), super->collisionLayer); + SetTile(this->tileIndex4, tilePos + TILE_POS(1, 1), super->collisionLayer); } void sub_08031024(EyegoreEntity* this) { @@ -399,11 +400,11 @@ void sub_08031024(EyegoreEntity* this) { } } else { tmp2 = this->unk_7b >> 1; - uVar5 = GetTileTypeByPos(super->x.HALF.HI + gUnk_080CE2C0[tmp2], - super->y.HALF.HI + gUnk_080CE2C0[tmp2 + 1], super->collisionLayer); - uVar8 = GetTileTypeByPos(super->x.HALF.HI + gUnk_080CE2C0[tmp2 + 2], - super->y.HALF.HI + gUnk_080CE2C0[tmp2 + 3], super->collisionLayer); - if (!(((gUnk_080B3E80[uVar5] == 0) && (gUnk_080B3E80[uVar8] == 0)) || + uVar5 = GetTileTypeAtWorldCoords(super->x.HALF.HI + gUnk_080CE2C0[tmp2], + super->y.HALF.HI + gUnk_080CE2C0[tmp2 + 1], super->collisionLayer); + uVar8 = GetTileTypeAtWorldCoords(super->x.HALF.HI + gUnk_080CE2C0[tmp2 + 2], + super->y.HALF.HI + gUnk_080CE2C0[tmp2 + 3], super->collisionLayer); + if (!(((gMapTileTypeToCollisionData[uVar5] == 0) && (gMapTileTypeToCollisionData[uVar8] == 0)) || ((this->unk_7b | 1) & 1) == 0)) { if (super->direction >> 3 == super->animationState) { this->unk_78 |= 0x20; diff --git a/src/enemy/flyingPot.c b/src/enemy/flyingPot.c index 46490d61..9c7a8348 100644 --- a/src/enemy/flyingPot.c +++ b/src/enemy/flyingPot.c @@ -9,6 +9,7 @@ #include "functions.h" #include "player.h" #include "room.h" +#include "tiles.h" extern Hitbox gUnk_080FD34C; @@ -38,26 +39,26 @@ enum FlyingPotSubActions { }; // Functions -void FlyingPot_OnTick(FlyingPotEntity*); // 0803708C -void FlyingPot_OnCollision(FlyingPotEntity*); // 080370A4 -void FlyingPot_OnGrabbed(FlyingPotEntity*); // 0803712C +void FlyingPot_OnTick(FlyingPotEntity*); +void FlyingPot_OnCollision(FlyingPotEntity*); +void FlyingPot_OnGrabbed(FlyingPotEntity*); // Subactions -void FlyingPot_SubAction0(FlyingPotEntity*); // 08037144 -void FlyingPot_SubAction1(FlyingPotEntity*); // 0803715C -void FlyingPot_SubAction2(FlyingPotEntity*); // 0803718C -void FlyingPot_SubAction3(FlyingPotEntity*); // 080371F8 +void FlyingPot_SubAction0(FlyingPotEntity*); +void FlyingPot_SubAction1(FlyingPotEntity*); +void FlyingPot_SubAction2(FlyingPotEntity*); +void FlyingPot_SubAction3(FlyingPotEntity*); void FlyingPot_SubActionDoNothing(FlyingPotEntity*); -void FlyingPot_SubAction5(FlyingPotEntity*); // 08037218 +void FlyingPot_SubAction5(FlyingPotEntity*); // Actions -void FlyingPot_Init(FlyingPotEntity*); // ? // 08037220 -void FlyingPot_Action1(FlyingPotEntity*); // 08037280 -void FlyingPot_Action2(FlyingPotEntity*); // 080372E8 -void FlyingPot_Action3(FlyingPotEntity*); // 0803737C -void FlyingPot_Action4(FlyingPotEntity*); // 080373B0 -void FlyingPot_Action5(FlyingPotEntity*); // 080373C8 -void FlyingPot_Action6(FlyingPotEntity*); // 080373E0 +void FlyingPot_Init(FlyingPotEntity*); +void FlyingPot_Action1(FlyingPotEntity*); +void FlyingPot_Action2(FlyingPotEntity*); +void FlyingPot_Action3(FlyingPotEntity*); +void FlyingPot_Action4(FlyingPotEntity*); +void FlyingPot_Action5(FlyingPotEntity*); +void FlyingPot_Action6(FlyingPotEntity*); void sub_08037408(FlyingPotEntity*); void sub_08037418(FlyingPotEntity*); @@ -99,7 +100,7 @@ void FlyingPot_OnCollision(FlyingPotEntity* this) { super->zVelocity = Q_16_16(2.625); super->spritePriority.b1 = 1; - SetBottomTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); + SetTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); } else if (super->z.HALF.HI != 0) { sub_08037408(this); } @@ -145,7 +146,7 @@ void FlyingPot_SubAction2(FlyingPotEntity* this) { COLLISION_OFF(super); super->spriteOffsetX = 0; - SetBottomTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); + SetTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); } if (sub_0806F520(super)) { @@ -169,23 +170,23 @@ void FlyingPot_SubAction5(FlyingPotEntity* this) { } void FlyingPot_Init(FlyingPotEntity* this) { - u32 tile; + u32 tilePos; super->action = FLYING_POT_ACTION_1; super->gustJarFlags = 2; super->y.HALF.HI += 3; - tile = TILE(super->x.HALF.HI, super->y.HALF.HI); - this->tileIndex = GetTileIndex(tile, super->collisionLayer); - SetBottomTile(0x4000, tile, super->collisionLayer); + tilePos = TILE(super->x.HALF.HI, super->y.HALF.HI); + this->tileIndex = GetTileIndex(tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_0, tilePos, super->collisionLayer); InitializeAnimation(super, 5); } void FlyingPot_Action1(FlyingPotEntity* this) { sub_08037418(this); - if (GetTileTypeByEntity(super) != 0x4000) { - SetBottomTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); + if (GetTileTypeAtEntity(super) != SPECIAL_TILE_0) { + SetTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); sub_08037408(this); } @@ -210,7 +211,7 @@ void FlyingPot_Action2(FlyingPotEntity* this) { super->collisionMask = 0xF; super->hitbox = &gUnk_080FD34C; - SetBottomTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); + SetTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); } } @@ -254,10 +255,10 @@ void sub_08037408(FlyingPotEntity* this) { } void sub_08037418(FlyingPotEntity* this) { - u32 tile = COORD_TO_TILE(super); + u32 tilePos = COORD_TO_TILE(super); - if (GetTileIndex(tile, super->collisionLayer) == 0x4067) { - SetBottomTile(this->tileIndex, tile, super->collisionLayer); + if (GetTileIndex(tilePos, super->collisionLayer) == SPECIAL_TILE_103) { + SetTile(this->tileIndex, tilePos, super->collisionLayer); DeleteThisEntity(); } } diff --git a/src/enemy/flyingSkull.c b/src/enemy/flyingSkull.c index 4af30c9f..2366f56d 100644 --- a/src/enemy/flyingSkull.c +++ b/src/enemy/flyingSkull.c @@ -9,11 +9,12 @@ #include "entity.h" #include "functions.h" #include "hitbox.h" +#include "tiles.h" typedef struct { Entity base; u8 filler[0xc]; - u16 unk_0x74; + u16 tileIndex; u8 unk_0x76; } FlyingSkullEntity; @@ -50,7 +51,7 @@ void FlyingSkull_OnCollision(FlyingSkullEntity* this) { COLLISION_OFF(super); super->zVelocity = Q_16_16(2.625); super->spritePriority.b1 = 1; - SetBottomTile(this->unk_0x74, COORD_TO_TILE(super), super->collisionLayer); + SetTile(this->tileIndex, COORD_TO_TILE(super), super->collisionLayer); } else if (super->z.HALF.HI) { sub_0803A0E0(this); } @@ -89,7 +90,7 @@ void sub_08039CE0(FlyingSkullEntity* this) { super->timer = 1; super->z.HALF.HI = -1; super->spriteOffsetX = 0; - SetBottomTile(this->unk_0x74, COORD_TO_TILE(super), super->collisionLayer); + SetTile(this->tileIndex, COORD_TO_TILE(super), super->collisionLayer); } if (sub_0806F520(super)) { @@ -113,15 +114,15 @@ void sub_08039D6C(FlyingSkullEntity* this) { } void sub_08039D74(FlyingSkullEntity* this) { - u32 tmp; + u32 tilePos; super->action = 1; super->gustJarFlags = 2; super->carryFlags = 0; super->y.HALF.HI += 3; - tmp = COORD_TO_TILE(super); - this->unk_0x74 = GetTileIndex(tmp, super->collisionLayer); - SetBottomTile(0x4060, tmp, super->collisionLayer); + tilePos = COORD_TO_TILE(super); + this->tileIndex = GetTileIndex(tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_96, tilePos, super->collisionLayer); InitializeAnimation(super, 0); } @@ -129,8 +130,8 @@ void sub_08039DD8(FlyingSkullEntity* this) { sub_0803A100(this); if (super->type == 0) { - if (GetTileTypeByEntity(super) == 0x4073) { - SetBottomTile(this->unk_0x74, COORD_TO_TILE(super), super->collisionLayer); + if (GetTileTypeAtEntity(super) == SPECIAL_TILE_115) { + SetTile(this->tileIndex, COORD_TO_TILE(super), super->collisionLayer); sub_0803A0E0(this); } @@ -147,7 +148,7 @@ void sub_08039DD8(FlyingSkullEntity* this) { if (player != NULL) { player->type2 = 1; CopyPosition(super, player); - SetBottomTile(this->unk_0x74, COORD_TO_TILE(super), super->collisionLayer); + SetTile(this->tileIndex, COORD_TO_TILE(super), super->collisionLayer); DeleteEntity(super); } } @@ -167,7 +168,7 @@ void sub_08039EE4(FlyingSkullEntity* this) { super->hitbox = (Hitbox*)&gUnk_080FD340; gPlayerEntity.base.animationState; this->unk_0x76 = gPlayerEntity.base.animationState; - SetBottomTile(this->unk_0x74, COORD_TO_TILE(super), super->collisionLayer); + SetTile(this->tileIndex, COORD_TO_TILE(super), super->collisionLayer); } void sub_08039F4C(FlyingSkullEntity* this) { @@ -200,7 +201,7 @@ void sub_08039FAC(FlyingSkullEntity* this) { super->hitType = 0xa0; super->collisionMask = 0xf; super->hitbox = (Hitbox*)&gUnk_080FD34C; - SetBottomTile(this->unk_0x74, COORD_TO_TILE(super), super->collisionLayer); + SetTile(this->tileIndex, COORD_TO_TILE(super), super->collisionLayer); } } @@ -247,9 +248,9 @@ void sub_0803A0E0(FlyingSkullEntity* this) { } void sub_0803A100(FlyingSkullEntity* this) { - u32 tile = COORD_TO_TILE(super); - if (GetTileIndex(tile, super->collisionLayer) == 0x4067) { - SetBottomTile(this->unk_0x74, tile, super->collisionLayer); + u32 tilePos = COORD_TO_TILE(super); + if (GetTileIndex(tilePos, super->collisionLayer) == SPECIAL_TILE_103) { + SetTile(this->tileIndex, tilePos, super->collisionLayer); DeleteThisEntity(); } } diff --git a/src/enemy/gyorgFemale.c b/src/enemy/gyorgFemale.c index baa1105b..034e8eb4 100644 --- a/src/enemy/gyorgFemale.c +++ b/src/enemy/gyorgFemale.c @@ -5,20 +5,20 @@ * @brief Gyorg Female enemy */ #include "asm.h" +#include "beanstalkSubtask.h" #include "collision.h" #include "enemy.h" #include "enemy/gyorg.h" #include "entity.h" #include "functions.h" #include "sound.h" +#include "assets/map_offsets.h" extern u8 gEntCount; extern u8 gMapDataTopSpecial[]; extern u16 gMapDataBottomSpecial[]; -extern void sub_080197D4(const void*); - extern u32 sub_08000E62(u32); extern void RegisterTransitionManager(void*, void (*)(), void (*)()); @@ -33,12 +33,12 @@ void sub_08046518(void); void sub_080467DC(GyorgFemaleEntity*); extern u8 gUpdateVisibleTiles; -extern u8 gUnk_080B3E80[]; +extern u8 gMapTileTypeToCollisionData[]; -extern const u8 gUnk_080D1A94[]; -extern const u8 gUnk_080D1AAC[]; -extern const u8 gUnk_080D1AC4[]; -extern const u8 gUnk_080D1ADC[]; +extern const MapDataDefinition gGyorgMapping0[]; +extern const MapDataDefinition gGyorgMapping1[]; +extern const MapDataDefinition gGyorgMapping2[]; +extern const MapDataDefinition gGyorgMapping3[]; void GyorgFemale_Setup(GyorgFemaleEntity* this); void GyorgFemale_Action1(GyorgFemaleEntity* this); @@ -225,16 +225,16 @@ void sub_08046498(GyorgFemaleEntity* this) { #endif void sub_080464C0(GyorgFemaleEntity* this) { - static const void* const gUnk_080D1A74[] = { - gUnk_080D1A94, - gUnk_080D1AAC, - gUnk_080D1AC4, - gUnk_080D1ADC, + static const MapDataDefinition* const gyorgMappings[] = { + gGyorgMapping0, + gGyorgMapping1, + gGyorgMapping2, + gGyorgMapping3, }; s32 i; u8* src; u8* dst; - sub_080197D4(gUnk_080D1A74[super->animationState >> 6]); + LoadMapData((MapDataDefinition*)gyorgMappings[super->animationState >> 6]); sub_08046518(); for (i = 0x20, src = ((u8*)&gMapDataBottomSpecial), dst = ((u8*)&gMapDataBottomSpecial) + 0x3260; i != 0; i--) { MemCopy(src, dst, 0x40); @@ -248,25 +248,25 @@ void sub_080464C0(GyorgFemaleEntity* this) { #define sub_08046518_offset 0x658 void sub_08046518(void) { - u16* ptr = gMapTop.metatileTypes; - u16* sl = &gMapTop.mapData[sub_08046518_offset]; - u16* stack1 = &gMapTop.mapDataOriginal[sub_08046518_offset]; - u8* stack2 = &gMapTop.unkData3[sub_08046518_offset]; - u8* r6 = &gMapTop.collisionData[sub_08046518_offset]; + u16* tileTypes = gMapTop.tileTypes; + u16* mapData = &gMapTop.mapData[sub_08046518_offset]; + u16* mapDataOriginal = &gMapTop.mapDataOriginal[sub_08046518_offset]; + u8* actTiles = &gMapTop.actTiles[sub_08046518_offset]; + u8* collisionData = &gMapTop.collisionData[sub_08046518_offset]; u32 i; for (i = 0x10; i != 0; i--) { u32 j; for (j = 0x10; j != 0; j--) { - u16 new_var; - stack1[j] = sl[j]; - new_var = ptr[sl[j]]; - stack2[j] = gUnk_080B37A0[new_var]; - r6[j] = gUnk_080B3E80[new_var]; + u16 tileType; + mapDataOriginal[j] = mapData[j]; + tileType = tileTypes[mapData[j]]; + actTiles[j] = gMapTileTypeToActTile[tileType]; + collisionData[j] = gMapTileTypeToCollisionData[tileType]; } - sl += 0x40; - stack1 += 0x40; - stack2 += 0x40; - r6 += 0x40; + mapData += 0x40; + mapDataOriginal += 0x40; + actTiles += 0x40; + collisionData += 0x40; } } @@ -290,81 +290,24 @@ void sub_0804660C(GyorgFemaleEntity* this, u32 unk1) { super->y.HALF.HI = p[1] + gRoomControls.origin_y; } -// todo: correct type -const u8 gUnk_080D1A94[] = { -#if defined(JP) || defined(DEMO_JP) - 0x7C, -#elif defined(EU) - 0x50, -#else - 0x08, -#endif - 0x41, 0x22, 0x80, 0xE0, 0x9E, 0x01, 0x02, 0x00, 0x08, 0x00, 0x80, -#if defined(JP) || defined(DEMO_JP) - 0x2C, 0xD3, -#elif defined(EU) - 0x00, 0xD3, -#else - 0xB8, 0xD2, -#endif - 0x22, 0x00, 0x54, 0xB6, 0x00, 0x02, 0x80, 0x1F, 0x00, 0x80, +const MapDataDefinition gGyorgMapping0[] = { + { MAP_MULTIPLE | offset_gyorgMapping_0_bottom, gMapDataBottomSpecial, MAP_COMPRESSED | 2048 }, + { offset_gAreaRoomMap_PalaceOfWindsBoss_0_top, gMapTop.mapData, MAP_COMPRESSED | 8064 }, }; -const u8 gUnk_080D1AAC[] = { -#if defined(JP) || defined(DEMO_JP) - 0xFC, -#elif defined(EU) - 0xD0, -#else - 0x88, -#endif - 0x3D, 0x22, 0x80, 0xE0, 0x9E, 0x01, 0x02, 0x00, 0x08, 0x00, 0x80, -#if defined(JP) || defined(DEMO_JP) - 0xF8, -#elif defined(EU) - 0xCC, -#else - 0x84, -#endif - 0xD6, 0x22, 0x00, 0x54, 0xB6, 0x00, 0x02, 0x80, 0x1F, 0x00, 0x80, +const MapDataDefinition gGyorgMapping1[] = { + { MAP_MULTIPLE | offset_gyorgMapping_1_bottom, gMapDataBottomSpecial, MAP_COMPRESSED | 2048 }, + { offset_gyorgRoomMap_1_top, gMapTop.mapData, MAP_COMPRESSED | 8064 }, }; -const u8 gUnk_080D1AC4[] = { -#if defined(JP) || defined(DEMO_JP) - 0xE4, -#elif defined(EU) - 0xB8, -#else - 0x70, -#endif - 0x36, 0x22, 0x80, 0xE0, 0x9E, 0x01, 0x02, 0x00, 0x08, 0x00, 0x80, -#if defined(JP) || defined(DEMO_JP) - 0xC0, -#elif defined(EU) - 0x94, -#else - 0x4C, -#endif - 0xDA, 0x22, 0x00, 0x54, 0xB6, 0x00, 0x02, 0x80, 0x1F, 0x00, 0x80, +const MapDataDefinition gGyorgMapping2[] = { + { MAP_MULTIPLE | offset_gyorgMapping_2_bottom, gMapDataBottomSpecial, MAP_COMPRESSED | 2048 }, + { offset_gyorgRoomMap_2_top, gMapTop.mapData, MAP_COMPRESSED | 8064 }, }; -const u8 gUnk_080D1ADC[] = { -#if defined(JP) || defined(DEMO_JP) - 0x78, -#elif defined(EU) - 0x4C, -#else - 0x04, -#endif - 0x3A, 0x22, 0x80, 0xE0, 0x9E, 0x01, 0x02, 0x00, 0x08, 0x00, 0x80, -#if defined(JP) || defined(DEMO_JP) - 0x88, -#elif defined(EU) - 0x5C, -#else - 0x14, -#endif - 0xDE, 0x22, 0x00, 0x54, 0xB6, 0x00, 0x02, 0x80, 0x1F, 0x00, 0x80, +const MapDataDefinition gGyorgMapping3[] = { + { MAP_MULTIPLE | offset_gyorgMapping_3_bottom, gMapDataBottomSpecial, MAP_COMPRESSED | 2048 }, + { offset_gyorgRoomMap_3_top, gMapTop.mapData, MAP_COMPRESSED | 8064 }, }; void GyorgFemale_SpawnChildren(GyorgFemaleEntity* this, bool32 unlimit_tmp) { diff --git a/src/enemy/gyorgMale.c b/src/enemy/gyorgMale.c index 70598f81..d4d52e95 100644 --- a/src/enemy/gyorgMale.c +++ b/src/enemy/gyorgMale.c @@ -260,7 +260,7 @@ void sub_08046AE8(GyorgMaleEntity* this) { } void sub_08046B18(GyorgMaleEntity* this) { - u32 tmp = CalcOffsetAngle(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); + u32 tmp = CalculateDirectionFromOffsets(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); if (tmp != super->direction) { if (((tmp - super->direction) & 0xFF) > 0x80) { this->unk_76 -= 0x100; @@ -283,13 +283,14 @@ void sub_08046B8C(GyorgMaleEntity* this) { this->unk_82 = gRoomControls.origin_y + 0x210; sub_08047D88(this); } else { - super->direction = CalcOffsetAngle(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); + super->direction = + CalculateDirectionFromOffsets(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); sub_08047DF0(this, ((0x100 - super->direction) & 0xFF) << 8); } } void sub_08046C04(GyorgMaleEntity* this) { - u32 tmp = CalcOffsetAngle(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); + u32 tmp = CalculateDirectionFromOffsets(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); if (tmp != super->direction) { if (((tmp - super->direction) & 0xFF) > 0x80) { this->unk_76 -= 0x100; @@ -311,7 +312,8 @@ void sub_08046C88(GyorgMaleEntity* this) { sub_08048178(this, sub_08048158(this->unk_70)); sub_08047D88(this); } else { - super->direction = CalcOffsetAngle(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); + super->direction = + CalculateDirectionFromOffsets(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); sub_08047DF0(this, ((0x100 - super->direction) & 0xFF) << 8); } } @@ -348,7 +350,7 @@ void sub_08046D44(GyorgMaleEntity* this) { } void sub_08046D98(GyorgMaleEntity* this) { - u32 tmp = CalcOffsetAngle(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); + u32 tmp = CalculateDirectionFromOffsets(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); if (tmp != super->direction) { if (((tmp - super->direction) & 0xFF) > 0x80) { this->unk_76 -= 0x100; @@ -369,7 +371,8 @@ void sub_08046E0C(GyorgMaleEntity* this) { this->unk_76 = super->direction << 8; sub_08047D88(this); } else { - super->direction = CalcOffsetAngle(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); + super->direction = + CalculateDirectionFromOffsets(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); sub_08047DF0(this, ((0x100 - super->direction) & 0xFF) << 8); } } @@ -456,7 +459,7 @@ void sub_08046FE8(GyorgMaleEntity* this) { } void sub_0804702C(GyorgMaleEntity* this) { - u32 tmp = CalcOffsetAngle(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); + u32 tmp = CalculateDirectionFromOffsets(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); if (((super->direction - tmp + 2) & 0xFF) > 4) { if ((tmp - super->direction) & 0x80) { super->direction--; @@ -607,7 +610,7 @@ void sub_080473B8(GyorgMaleEntity* this) { } void sub_080473F0(GyorgMaleEntity* this) { - u32 tmp = CalcOffsetAngle(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); + u32 tmp = CalculateDirectionFromOffsets(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); if (((super->direction - tmp + 2) & 0xFF) > 4) { s32 tmp2 = tmp - super->direction; if (tmp2 & 0x80) { @@ -791,7 +794,7 @@ void sub_080477F0(GyorgMaleEntity* this) { if (super->speed < 0x300) { super->speed += 8; } - super->direction = CalcOffsetAngle(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); + super->direction = CalculateDirectionFromOffsets(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); sub_08047E48(this); if (!EntityWithinDistance(super, gPlayerEntity.base.x.HALF.HI, gPlayerEntity.base.y.HALF.HI, 0x80)) { super->action = 2; @@ -896,7 +899,7 @@ void sub_08047978(GyorgMaleEntity* this) { void sub_08047B08(GyorgMaleEntity* this) { sub_08047D88(this); - super->direction = CalcOffsetAngle(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); + super->direction = CalculateDirectionFromOffsets(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); super->speed = 0x200; sub_08047E58(this); if (!EntityWithinDistance(super, this->unk_80, this->unk_82, 4)) @@ -1066,8 +1069,9 @@ void sub_08047EA4(GyorgMaleEntity* this, u32 unk1) { return; if (this->unk_7c & 1) { tmp2 = sub_08047F68(this) << 8; - dir = CalcOffsetAngle(gPlayerEntity.base.x.HALF.HI - super->x.HALF.HI, - gPlayerEntity.base.y.HALF.HI - super->y.HALF.HI); + dir = CalculateDirectionFromOffsets(gPlayerEntity.base.x.HALF.HI - super->x.HALF.HI, + + gPlayerEntity.base.y.HALF.HI - super->y.HALF.HI); tmp = dir - (tmp / 256); tmp &= 0xFF; gPlayerEntity.base.x.WORD += (gSineTable[tmp] - gSineTable[dir]) * tmp2; @@ -1149,8 +1153,8 @@ void sub_08048004(GyorgMaleEntity* this) { if (b != 3) { if (EntityWithinDistance(&gPlayerEntity.base, super->x.HALF.HI, super->y.HALF.HI, 0x24)) { if (!(this->unk_7c & 2)) { - u32 tmp = CalcOffsetAngle(gPlayerEntity.base.x.HALF.HI - super->x.HALF.HI, - gPlayerEntity.base.y.HALF.HI - super->y.HALF.HI); + u32 tmp = CalculateDirectionFromOffsets(gPlayerEntity.base.x.HALF.HI - super->x.HALF.HI, + gPlayerEntity.base.y.HALF.HI - super->y.HALF.HI); gPlayerEntity.base.x.WORD = super->x.WORD + (gSineTable[tmp] * 9216); gPlayerEntity.base.y.WORD = super->y.WORD - (gSineTable[tmp + 0x40] * 9216); } diff --git a/src/enemy/helmasaur.c b/src/enemy/helmasaur.c index 6a929ab6..9de3ac59 100644 --- a/src/enemy/helmasaur.c +++ b/src/enemy/helmasaur.c @@ -344,15 +344,15 @@ bool32 sub_0802C0E8(HelmasaurEntity* this) { s32 y = super->y.HALF.HI + super->hitbox->offset_y + ptr[1] * 6; u8* layer = super->collisionLayer == 2 ? gMapTop.collisionData : gMapBottom.collisionData; - u32 ret = FALSE; + u32 result = FALSE; if (!sub_0806FC24(TILE(x, y), 9)) { if (IsTileCollision(layer, x, y, 0)) { - ret = 1; + result = TRUE; } else { - ret = 0; + result = FALSE; } } - return ret; + return result; } } diff --git a/src/enemy/leever.c b/src/enemy/leever.c index 17745ecb..6b12cf8e 100644 --- a/src/enemy/leever.c +++ b/src/enemy/leever.c @@ -4,8 +4,10 @@ * * @brief Leever enemy */ +#include "asm.h" #include "enemy.h" #include "physics.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -13,9 +15,6 @@ typedef struct { /*0x74*/ u16 unk_74; } LeeverEntity; -extern u32 sub_080B1B18(s32, s32, u32); -extern u32 sub_080B1AB4(s32, s32, u32); - extern Entity* gUnk_020000B0; bool32 Leever_PlayerInRange(Entity*, s32); @@ -126,23 +125,23 @@ void Leever_DigDown(LeeverEntity* this) { } } -u32 sub_0801FDE4(Entity* entity, s32 x, s32 y) { - u32 uVar3; +bool32 sub_0801FDE4(Entity* entity, s32 x, s32 y) { + u32 actTile; const u16* puVar4; - if (sub_080B1B18(x, y, gUnk_020000B0->collisionLayer) != 0) { - return 0; + if (GetCollisionDataAtWorldCoords(x, y, gUnk_020000B0->collisionLayer) != 0) { + return FALSE; } else { - uVar3 = sub_080B1AB4(x, y, gUnk_020000B0->collisionLayer); + actTile = GetActTileAtWorldCoords(x, y, gUnk_020000B0->collisionLayer); for (puVar4 = gUnk_080CA4CA; *puVar4 != (u16)-1;) { - if (*puVar4++ == uVar3) { + if (*puVar4++ == actTile) { entity->x.HALF.HI = (x & 0xfff0) + 8; entity->y.HALF.HI = (y & 0xfff0) + 8; entity->collisionLayer = gUnk_020000B0->collisionLayer; - return 1; + return TRUE; } } - return 0; + return FALSE; } } @@ -212,10 +211,10 @@ const s8 gLeeverDrift[] = { }; const u16 gUnk_080CA4CA[] = { - 0x000A, - 0x0009, - 0x000C, - 0x000B, + ACT_TILE_10, + ACT_TILE_9, + ACT_TILE_12, + ACT_TILE_11, 0xFFFF, }; // clang-format on diff --git a/src/enemy/madderpillar.c b/src/enemy/madderpillar.c index 387740b9..7df20a7d 100644 --- a/src/enemy/madderpillar.c +++ b/src/enemy/madderpillar.c @@ -345,7 +345,7 @@ void sub_08029DE4(MadderpillarEntity* this) { } void sub_08029E0C(MadderpillarEntity* this) { - u32 tile; + u32 tilePos; s32 uVar4; s32 iVar3; u32 i; @@ -358,10 +358,10 @@ void sub_08029E0C(MadderpillarEntity* this) { ptr = &gUnk_080CCDC8[uVar2]; uVar4 = (Random() & 1) * 2 - 1; iVar3 = ((s32)Random() & 0xf) % 3; - tile = COORD_TO_TILE(super); + tilePos = COORD_TO_TILE(super); for (i = 0; i < 3; i++) { dir = ptr[iVar3]; - if (sub_080B1B44(gUnk_080B4488[dir >> 3] + tile, super->collisionLayer) == 0) { + if (GetCollisionDataAtTilePos(gUnk_080B4488[dir >> 3] + tilePos, super->collisionLayer) == 0) { local_24 = dir; if (super->direction - this->unk_74 != dir - super->direction) break; diff --git a/src/enemy/mazaalMacro.c b/src/enemy/mazaalMacro.c index ef417421..2f6f330f 100644 --- a/src/enemy/mazaalMacro.c +++ b/src/enemy/mazaalMacro.c @@ -9,6 +9,7 @@ #include "screenTransitions.h" #include "script.h" #include "structures.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -96,7 +97,7 @@ void sub_08034CC4(MazaalMacroEntity* this) { this->unk_78 = 0x4b0; sub_08034F70(this); InitializeAnimation(super, super->type); - SetBottomTile(0x4022, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_34, COORD_TO_TILE(super), super->collisionLayer); entity = CreateEnemy(MAZAAL_MACRO, 2); if (entity != NULL) { super->child = entity; @@ -284,11 +285,11 @@ u32 sub_08035084(MazaalMacroEntity* this) { } void sub_08035120(MazaalMacroEntity* this) { - s32 tile; + s32 tilePos; u32 i; - tile = COORD_TO_TILE(super); + tilePos = COORD_TO_TILE(super); for (i = 0; i < 0x18; i++) { - sub_0807B600(tile + gUnk_080CEED8[i]); + sub_0807B600(tilePos + gUnk_080CEED8[i]); } } diff --git a/src/enemy/moldworm.c b/src/enemy/moldworm.c index a09275f1..f5e2dc05 100644 --- a/src/enemy/moldworm.c +++ b/src/enemy/moldworm.c @@ -7,6 +7,7 @@ #include "collision.h" #include "enemy.h" #include "functions.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -36,7 +37,7 @@ typedef struct { } MoldwormEntity; extern void SoundReqClipped(Entity*, u32); -extern bool32 sub_08023A38(u32); +extern bool32 sub_08023A38(u32 tileType); void sub_08023990(MoldwormEntity*, u32, u32); void sub_08023A88(MoldwormEntity*, u32); @@ -185,7 +186,7 @@ void sub_08023288(MoldwormEntity* this) { for (i = 0; i < 0x10; i++) { u32 x = gPlayerEntity.base.x.HALF.HI + gUnk_080CBC70[idx + 0]; u32 y = gPlayerEntity.base.y.HALF.HI + gUnk_080CBC70[idx + 1]; - if (sub_08023A38(GetTileTypeByPos(x, y, gPlayerEntity.base.collisionLayer))) { + if (sub_08023A38(GetTileTypeAtWorldCoords(x, y, gPlayerEntity.base.collisionLayer))) { sub_08023990(this, x, y); return; } @@ -220,7 +221,7 @@ void sub_08023398(MoldwormEntity* this) { } if (--this->unk_78.HWORD == 0) { - if (sub_08023A38(GetTileTypeByEntity(super))) { + if (sub_08023A38(GetTileTypeAtEntity(super))) { super->action = 5; this->unk_7f = 0; COLLISION_OFF(super); @@ -513,11 +514,11 @@ void sub_080239F0(MoldwormEntity* this) { } bool32 sub_08023A38(u32 tileType) { - if (tileType == 0x1a || tileType == 0x29) { + if (tileType == TILE_TYPE_26 || tileType == TILE_TYPE_41) { return TRUE; } else { - tileType = gUnk_080B37A0[tileType]; - if (tileType == 9 || tileType == 11 || tileType == 10 || tileType == 12) { + tileType = gMapTileTypeToActTile[tileType]; + if (tileType == ACT_TILE_9 || tileType == ACT_TILE_11 || tileType == ACT_TILE_10 || tileType == ACT_TILE_12) { return TRUE; } else { return FALSE; diff --git a/src/enemy/octorokBoss.c b/src/enemy/octorokBoss.c index 1e0f70c7..e0d377f8 100644 --- a/src/enemy/octorokBoss.c +++ b/src/enemy/octorokBoss.c @@ -167,12 +167,13 @@ void OctorokBoss_Hit_SubAction1(OctorokBossEntity* this) { if (diffX > 8 || diffY > 8) { this->heap->field_0x2 = 1; #if defined(JP) || defined(DEMO_JP) || defined(EU) - super->direction = ((s32)CalcOffsetAngle((((gRoomControls.origin_x + 0x108) << 0x10) - super->x.WORD), - (((gRoomControls.origin_y + 0x88) << 0x10) - super->y.WORD))) >> - 3; + super->direction = + ((s32)CalculateDirectionFromOffsets((((gRoomControls.origin_x + 0x108) << 0x10) - super->x.WORD), + (((gRoomControls.origin_y + 0x88) << 0x10) - super->y.WORD))) >> + 3; #else - super->direction = ((s32)CalcOffsetAngle(gRoomControls.origin_x + 0x108 - super->x.HALF.HI, - gRoomControls.origin_y + 0x88 - super->y.HALF.HI)) >> + super->direction = ((s32)CalculateDirectionFromOffsets(gRoomControls.origin_x + 0x108 - super->x.HALF.HI, + gRoomControls.origin_y + 0x88 - super->y.HALF.HI)) >> 3; #endif super->speed = 0x100; @@ -689,7 +690,8 @@ void OctorokBoss_Action1_AimTowardsPlayer(OctorokBossEntity* this) { s32 tmp1; s32 tmp2; - tmp1 = (u8)(CalcOffsetAngle(gPlayerEntity.base.x.WORD - super->x.WORD, gPlayerEntity.base.y.WORD - super->y.WORD) - + tmp1 = (u8)(CalculateDirectionFromOffsets(gPlayerEntity.base.x.WORD - super->x.WORD, + gPlayerEntity.base.y.WORD - super->y.WORD) - (((u8)(-this->angle.HALF.HI) ^ 0x80))); if (IS_FROZEN(this) == FALSE) { tmp2 = 8; @@ -898,7 +900,9 @@ void OctorokBoss_ExecuteAttackVacuum(OctorokBossEntity* this) { if (this->unk_80 == 0) { super->direction = - CalcOffsetAngle(gPlayerEntity.base.x.WORD - super->x.WORD, gPlayerEntity.base.y.WORD - super->y.WORD); + + CalculateDirectionFromOffsets(gPlayerEntity.base.x.WORD - super->x.WORD, + gPlayerEntity.base.y.WORD - super->y.WORD); tmp = ((u8) - (this->angle.HALF.HI + 0x80)) - super->direction; if (tmp < 0) { tmp = -tmp; @@ -911,9 +915,9 @@ void OctorokBoss_ExecuteAttackVacuum(OctorokBossEntity* this) { if (sub_0806FC80(super, &gPlayerEntity.base, 0x48) != 0) { this->unk_80 = 1; this->timer = 2; - this->heap->targetAngle = - CalcOffsetAngle((gRoomControls.origin_x + 0x108) * 0x10000 - super->x.WORD, - (gRoomControls.origin_y + 0x88) * 0x10000 - super->y.WORD); + this->heap->targetAngle = CalculateDirectionFromOffsets( + (gRoomControls.origin_x + 0x108) * 0x10000 - super->x.WORD, + (gRoomControls.origin_y + 0x88) * 0x10000 - super->y.WORD); this->heap->targetAngle = (u8) - (this->heap->targetAngle + 0x80); SoundReq(SFX_ED); } @@ -956,7 +960,8 @@ void OctorokBoss_ExecuteAttackVacuum(OctorokBossEntity* this) { } else { this->timer--; if ((gPlayerState.flags == PL_FROZEN) && (this->timer == 0x3c)) { - tmp = CalcOffsetAngle(gPlayerEntity.base.x.WORD - super->x.WORD, gPlayerEntity.base.y.WORD - super->y.WORD); + tmp = CalculateDirectionFromOffsets(gPlayerEntity.base.x.WORD - super->x.WORD, + gPlayerEntity.base.y.WORD - super->y.WORD); if ((u8)((tmp - ((u8) - this->angle.HALF.HI ^ 0x80))) > 0x80) { this->heap->targetAngle = this->angle.HALF.HI + 0x30; } else { @@ -1111,7 +1116,6 @@ void sub_08036998(OctorokBossEntity* this) { s32 tmp3; s32 a, b; - // TODO regalloc in this awful structure here tmp2 = &this->timer; tmp = super->subtimer + (tmp3 = (u8)*tmp2); *tmp2 = tmp; @@ -1177,9 +1181,9 @@ void sub_08036AF0(OctorokBossEntity* this, s32 radius, s32 angleSpeed) { heap->tailObjects[index - 1]->base.y.HALF.HI)) { continue; } else { - heap->tailObjects[index - 1]->angle.HALF.HI = - CalcOffsetAngle(heap->tailObjects[index - 1]->base.x.WORD - heap->tailObjects[index]->base.x.WORD, - heap->tailObjects[index - 1]->base.y.WORD - heap->tailObjects[index]->base.y.WORD); + heap->tailObjects[index - 1]->angle.HALF.HI = CalculateDirectionFromOffsets( + heap->tailObjects[index - 1]->base.x.WORD - heap->tailObjects[index]->base.x.WORD, + heap->tailObjects[index - 1]->base.y.WORD - heap->tailObjects[index]->base.y.WORD); tmp = FixedMul(gSineTable[heap->tailObjects[index - 1]->angle.HALF.HI], radius << 4); tmp = FixedDiv(tmp, 0x100); heap->tailObjects[index - 1]->base.x.WORD = heap->tailObjects[index]->base.x.WORD + ((s32)tmp << 8); diff --git a/src/enemy/octorokGolden.c b/src/enemy/octorokGolden.c index 0d6e6ddf..23b92aa5 100644 --- a/src/enemy/octorokGolden.c +++ b/src/enemy/octorokGolden.c @@ -112,16 +112,16 @@ static void sub_08037D54(Entity* this) { void sub_08037E14(Entity* this) { u32 dir; - u8* layer; + u8* collisionData; const s8* ptr; s32 x, y; this->timer = 8; dir = (GetFacingDirection(this, &gPlayerEntity.base) + 4) & 0x18; - layer = (u8*)GetTileBuffer(this->collisionLayer)->collisionData; + collisionData = GetLayerByIndex(this->collisionLayer)->collisionData; ptr = gUnk_080CF498 + (dir >> 2); x = this->x.HALF.HI + *ptr; y = this->y.HALF.HI + *(ptr + 1); - if (IsTileCollision(layer, x, y, 0)) { + if (IsTileCollision(collisionData, x, y, 0)) { this->direction = Random() & 0x18; } else { this->direction = dir; diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c index 05e38286..37bc230a 100644 --- a/src/enemy/pesto.c +++ b/src/enemy/pesto.c @@ -352,7 +352,7 @@ void sub_080244E8(PestoEntity* this) { switch (this->unk_80) { case 0: if (--super->timer == 0) { - if (sub_080B1B44(COORD_TO_TILE(super), 1) == 0) { + if (GetCollisionDataAtTilePos(COORD_TO_TILE(super), 1) == 0) { this->unk_80++; this->unk_82++; super->subtimer = 0; @@ -446,8 +446,7 @@ void sub_080244E8(PestoEntity* this) { super->timer = 12; this->unk_83 &= ~0x80; entity = super->child; - SetBottomTile(((PestoEntity*)entity)->unk_70, COORD_TO_TILE(entity), - entity->collisionLayer); + SetTile(((PestoEntity*)entity)->unk_70, COORD_TO_TILE(entity), entity->collisionLayer); DeleteEntity(entity); super->z.HALF.HI -= 0xe; this->unk_78 -= 0xe; diff --git a/src/enemy/puffstool.c b/src/enemy/puffstool.c index 7018c562..cf40c24c 100644 --- a/src/enemy/puffstool.c +++ b/src/enemy/puffstool.c @@ -7,6 +7,7 @@ #include "collision.h" #include "enemy.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -21,10 +22,10 @@ typedef struct { /*0x82*/ u8 unk_82; /*0x83*/ u8 unused2[1]; /*0x84*/ u16 unk_84; - /*0x86*/ u16 unk_86; + /*0x86*/ u16 tilePos; } PuffstoolEntity; -extern u8 gUnk_080B3E80[]; +extern u8 gMapTileTypeToCollisionData[]; bool32 sub_080258C4(PuffstoolEntity*); void sub_08025B18(PuffstoolEntity*); @@ -182,7 +183,7 @@ void sub_08025230(PuffstoolEntity* this) { if (sub_0802571C(this)) { super->action = 2; super->timer = 240; - this->unk_86 = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); } } else { this->unk_78--; @@ -190,20 +191,20 @@ void sub_08025230(PuffstoolEntity* this) { } void sub_080252E0(PuffstoolEntity* this) { - u32 tile; + u32 tilePos; super->direction = CalculateDirectionTo(super->x.HALF.HI, super->y.HALF.HI, this->unk_7c, this->unk_7e); sub_08025C44(this); GetNextFrame(super); - tile = COORD_TO_TILE(super); - if (tile == this->unk_86) { + tilePos = COORD_TO_TILE(super); + if (tilePos == this->tilePos) { if (--super->timer == 0) { sub_080256B4(this); } } else { - this->unk_86 = tile; + this->tilePos = tilePos; super->timer = 240; } @@ -400,14 +401,14 @@ void sub_080256B4(PuffstoolEntity* this) { bool32 sub_0802571C(PuffstoolEntity* this) { RoomControls* ctrl = &gRoomControls; - u16 xDiff = (super->x.HALF.HI - ctrl->origin_x + 8) & -0x10; - u16 yDiff = (super->y.HALF.HI - ctrl->origin_y + 8) & -0x10; + u16 roomX = (super->x.HALF.HI - ctrl->origin_x + 8) & -0x10; + u16 roomY = (super->y.HALF.HI - ctrl->origin_y + 8) & -0x10; u16 unk = this->unk_7a; u16 i; for (i = 0; i < 4; i++) { - u16 sVar3 = xDiff + gUnk_080CC020[unk + 0]; - u16 sVar4 = yDiff + gUnk_080CC020[unk + 1]; + u16 sVar3 = roomX + gUnk_080CC020[unk + 0]; + u16 sVar4 = roomY + gUnk_080CC020[unk + 1]; if (sub_080257EC(this, sVar3, sVar4)) { this->unk_7c = sVar3 + ctrl->origin_x; @@ -427,23 +428,27 @@ bool32 sub_0802571C(PuffstoolEntity* this) { } bool32 sub_080257EC(PuffstoolEntity* this, u32 x, u32 y) { - u16 tileType = sub_080B1A48(x - 0x00, y - 0x00, super->collisionLayer); - if (tileType != 0x312 && gUnk_080B37A0[tileType] != 0x16 && gUnk_080B3E80[tileType] == 0) { + u16 tileType = GetTileTypeAtRoomCoords(x - 0x00, y - 0x00, super->collisionLayer); + if (tileType != TILE_TYPE_786 && gMapTileTypeToActTile[tileType] != ACT_TILE_22 && + gMapTileTypeToCollisionData[tileType] == 0) { return TRUE; } - tileType = sub_080B1A48(x - 0x10, y - 0x00, super->collisionLayer); - if (tileType != 0x312 && gUnk_080B37A0[tileType] != 0x16 && gUnk_080B3E80[tileType] == 0) { + tileType = GetTileTypeAtRoomCoords(x - 0x10, y - 0x00, super->collisionLayer); + if (tileType != TILE_TYPE_786 && gMapTileTypeToActTile[tileType] != ACT_TILE_22 && + gMapTileTypeToCollisionData[tileType] == 0) { return TRUE; } - tileType = sub_080B1A48(x - 0x00, y - 0x10, super->collisionLayer); - if (tileType != 0x312 && gUnk_080B37A0[tileType] != 0x16 && gUnk_080B3E80[tileType] == 0) { + tileType = GetTileTypeAtRoomCoords(x - 0x00, y - 0x10, super->collisionLayer); + if (tileType != TILE_TYPE_786 && gMapTileTypeToActTile[tileType] != ACT_TILE_22 && + gMapTileTypeToCollisionData[tileType] == 0) { return TRUE; } - tileType = sub_080B1A48(x - 0x10, y - 0x10, super->collisionLayer); - if (tileType != 0x312 && gUnk_080B37A0[tileType] != 0x16 && gUnk_080B3E80[tileType] == 0) { + tileType = GetTileTypeAtRoomCoords(x - 0x10, y - 0x10, super->collisionLayer); + if (tileType != TILE_TYPE_786 && gMapTileTypeToActTile[tileType] != ACT_TILE_22 && + gMapTileTypeToCollisionData[tileType] == 0) { return TRUE; } @@ -477,37 +482,36 @@ bool32 sub_080258C4(PuffstoolEntity* this) { } } -// regalloc bool32 sub_0802594C(PuffstoolEntity* this, u32 param_2) { s16 xDiff; s16 yDiff; - s16 iVar9; - u32 uVar1; + s16 x; + u32 layer; const s8* unk = gUnk_080CC090[param_2]; - uVar1 = super->collisionLayer; + layer = super->collisionLayer; xDiff = (super->x.HALF.HI - gRoomControls.origin_x + 8) & -0x10; yDiff = (super->y.HALF.HI - gRoomControls.origin_y + 8) & -0x10; do { u8 bVar7; u8 bVar4; - s16 iVar11; + s16 y; u8 bVar5; u8 bVar6; - iVar9 = xDiff + unk[0]; - iVar11 = yDiff + unk[1]; - bVar4 = sub_080B1B18(iVar9 - 0x00, iVar11 - 0x00, uVar1); - bVar5 = sub_080B1B18(iVar9 - 0x10, iVar11 - 0x00, uVar1); - bVar6 = sub_080B1B18(iVar9 - 0x00, iVar11 - 0x10, uVar1); - bVar7 = sub_080B1B18(iVar9 - 0x10, iVar11 - 0x10, uVar1); + x = xDiff + unk[0]; + y = yDiff + unk[1]; + bVar4 = GetCollisionDataAtWorldCoords(x - 0x00, y - 0x00, layer); + bVar5 = GetCollisionDataAtWorldCoords(x - 0x10, y - 0x00, layer); + bVar6 = GetCollisionDataAtWorldCoords(x - 0x00, y - 0x10, layer); + bVar7 = GetCollisionDataAtWorldCoords(x - 0x10, y - 0x10, layer); if ((bVar4 | bVar5 | bVar6 | bVar7) == 0) { - this->unk_7c = gRoomControls.origin_x + iVar9; - this->unk_7e = gRoomControls.origin_y + iVar11; + this->unk_7c = gRoomControls.origin_x + x; + this->unk_7e = gRoomControls.origin_y + y; return TRUE; } unk += 2; } while (unk[0] != 0x7f); - return 0; + return FALSE; } void sub_08025A54(PuffstoolEntity* this) { @@ -523,12 +527,12 @@ void sub_08025A54(PuffstoolEntity* this) { } } -bool32 sub_08025AB8(u32 tile, u32 layer) { - if (sub_080B1B44(tile, layer)) +bool32 sub_08025AB8(u32 tilePos, u32 layer) { + if (GetCollisionDataAtTilePos(tilePos, layer)) return FALSE; - if (sub_080B1AE0(tile, layer) == 10) { - sub_0807B7D8(0x61, tile, layer); + if (GetActTileAtTilePos(tilePos, layer) == ACT_TILE_10) { + sub_0807B7D8(0x61, tilePos, layer); return TRUE; } diff --git a/src/enemy/rollobite.c b/src/enemy/rollobite.c index deb60f26..e2a372a8 100644 --- a/src/enemy/rollobite.c +++ b/src/enemy/rollobite.c @@ -9,6 +9,7 @@ #include "physics.h" #include "player.h" #include "room.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -249,11 +250,11 @@ void sub_08020A30(RollobiteEntity* this) { } void sub_08020A7C(RollobiteEntity* this) { - int tmp = Random(); + s32 tmp = Random(); u32 state = DirectionRound(super->direction + gUnk_080CA6D4[tmp % 3]); if (sub_08049FA0(super) == 0) { - int tmp = DirectionRoundUp(sub_08049EE4(super)); + u32 tmp = DirectionRoundUp(sub_08049EE4(super)); if ((state ^ DirectionSouth) == tmp) state ^= DirectionSouth; } @@ -265,9 +266,9 @@ void sub_08020A7C(RollobiteEntity* this) { bool32 Rollobite_TryToHoleUp(RollobiteEntity* this) { if (Rollobite_IsRolledUp(this) && super->z.HALF.HI == 0) { - int tile = COORD_TO_TILE(super); - int iVar1 = GetTileType(tile, super->collisionLayer); - if ((iVar1 * 0x10000 - 0x710000U) >> 0x10 < 2) { + u32 tilePos = COORD_TO_TILE(super); + u32 tileType = GetTileTypeAtTilePos(tilePos, super->collisionLayer); + if ((tileType * 0x10000 - 0x710000U) >> 0x10 < 2) { super->action = 6; COLLISION_OFF(super); super->x.HALF.HI &= 0xfff0; @@ -276,7 +277,7 @@ bool32 Rollobite_TryToHoleUp(RollobiteEntity* this) { super->y.HALF.HI += 13; super->zVelocity = Q_16_16(2.0); InitializeAnimation(super, super->animationState + 0x14); - SetBottomTile(0x4034, tile, super->collisionLayer); + SetTile(SPECIAL_TILE_52, tilePos, super->collisionLayer); return TRUE; } } diff --git a/src/enemy/rope.c b/src/enemy/rope.c index 51e71250..74c77066 100644 --- a/src/enemy/rope.c +++ b/src/enemy/rope.c @@ -6,6 +6,7 @@ */ #include "enemy.h" #include "physics.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -208,7 +209,7 @@ void sub_08031600(RopeEntity* this) { u32 sub_0803163C(RopeEntity* this) { u32 h; - if (GetActTile(super) == 0x13) { + if (GetActTileAtEntity(super) == ACT_TILE_19) { h = this->unk_7a / 2; } else { h = this->unk_7a; diff --git a/src/enemy/slime.c b/src/enemy/slime.c index 813a6026..536eec67 100644 --- a/src/enemy/slime.c +++ b/src/enemy/slime.c @@ -143,21 +143,21 @@ void sub_080450A8(SlimeEntity* this) { DeleteEntity(super); } -void sub_08045178(SlimeEntity* this, Entity* child, int h, int v) { +void sub_08045178(SlimeEntity* this, Entity* child, int offsetX, int offsetY) { int x, y; if (child == NULL) return; EnemyCopyParams(super, child); - if (sub_080B1AF0(child, h, v)) + if (GetCollisionDataRelativeTo(child, offsetX, offsetY)) return; - x = child->x.HALF.HI + h; + x = child->x.HALF.HI + offsetX; if (0 <= x && x < (gRoomControls.origin_x + gRoomControls.width)) child->x.HALF.HI = x; - y = child->y.HALF.HI + v; + y = child->y.HALF.HI + offsetY; if (0 <= y && y < (gRoomControls.origin_y + gRoomControls.height)) child->y.HALF.HI = y; } diff --git a/src/enemy/spinyBeetle.c b/src/enemy/spinyBeetle.c index 3bd9b0da..ff5df9ae 100644 --- a/src/enemy/spinyBeetle.c +++ b/src/enemy/spinyBeetle.c @@ -8,11 +8,12 @@ #include "entity.h" #include "functions.h" #include "object.h" +#include "tiles.h" typedef struct { Entity base; u8 filler[0xc]; - u16 tile; + u16 tilePos; u16 tileIndex; u8 unk_78; u8 unk_79; @@ -92,9 +93,9 @@ void SpinyBeetle_Init(SpinyBeetleEntity* this) { this->unk_7a = 0; this->unk_78 = 0; this->unk_7b = 0; - this->tile = COORD_TO_TILE(super); - this->tileIndex = GetTileIndex(this->tile, super->collisionLayer); - SetBottomTile(0x4022, this->tile, super->collisionLayer); + this->tilePos = COORD_TO_TILE(super); + this->tileIndex = GetTileIndex(this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos, super->collisionLayer); obj = CreateObject(OBJECT_ON_BEETLE, super->type, 0); if (obj == NULL) { @@ -116,7 +117,7 @@ void sub_08033958(SpinyBeetleEntity* this) { u32 direction; if (sub_08033DF0(this)) { sub_08033E1C(this); - sub_0807B9B8(this->tileIndex, this->tile, super->collisionLayer); + SetTileByIndex(this->tileIndex, this->tilePos, super->collisionLayer); return; } @@ -165,7 +166,7 @@ void sub_08033958(SpinyBeetleEntity* this) { COLLISION_ON(super); super->y.WORD = (super->y.WORD & 0xfff00000) | 0xC0000; - sub_0807B9B8(this->tileIndex, this->tile, super->collisionLayer); + SetTileByIndex(this->tileIndex, this->tilePos, super->collisionLayer); InitializeAnimation(super, 2); } @@ -236,10 +237,10 @@ void sub_08033B44(SpinyBeetleEntity* this) { this->unk_80 = super->y.WORD; super->spritePriority.b1 = 0; this->unk_7b = 0x78; - this->tile = COORD_TO_TILE(super); - this->tileIndex = GetTileIndex(this->tile, super->collisionLayer); + this->tilePos = COORD_TO_TILE(super); + this->tileIndex = GetTileIndex(this->tilePos, super->collisionLayer); - if (this->tileIndex != 0x4022) { + if (this->tileIndex != SPECIAL_TILE_34) { stop++; } else { switch (DirectionRound(super->direction) >> 2) { @@ -259,7 +260,7 @@ void sub_08033B44(SpinyBeetleEntity* this) { } } - SetBottomTile(0x4022, this->tile, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos, super->collisionLayer); InitializeAnimation(super, 0); } @@ -318,17 +319,17 @@ void sub_08033C94(SpinyBeetleEntity* this) { void sub_08033D78(SpinyBeetleEntity* this) { u32 dir = DirectionRound(super->direction) >> 2; const s8* ptr = gUnk_080CEC1C + dir; - s32 tile; + s32 tilePos; u32 type; - tile = COORD_TO_TILE_OFFSET(super, -ptr[0], -ptr[1]); - type = GetTileType(tile, super->collisionLayer); + tilePos = COORD_TO_TILE_OFFSET(super, -ptr[0], -ptr[1]); + type = GetTileTypeAtTilePos(tilePos, super->collisionLayer); switch (type) { case 0x1c4: case 0x1c5: break; default: - if (sub_080B1B44(tile, super->collisionLayer) - 1 > 0x3e) + if (GetCollisionDataAtTilePos(tilePos, super->collisionLayer) - 1 > 0x3e) ProcessMovement0(super); break; } diff --git a/src/enemy/stalfos.c b/src/enemy/stalfos.c index 4bb4b5c1..3a54a8c2 100644 --- a/src/enemy/stalfos.c +++ b/src/enemy/stalfos.c @@ -7,6 +7,7 @@ #include "collision.h" #include "enemy.h" #include "functions.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -437,7 +438,7 @@ void sub_08039AD4(StalfosEntity* this) { super->action = 0xb; super->child = projectile; InitAnimationForceUpdate(super, super->animationState + 0x18); - SetBottomTile(0x4067, position, super->collisionLayer); + SetTile(SPECIAL_TILE_103, position, super->collisionLayer); return; } } @@ -455,7 +456,7 @@ u32 sub_08039B28(StalfosEntity* this) { } ptr2 = &gUnk_080CF930[super->animationState * 2]; pos = COORD_TO_TILE_OFFSET(super, -ptr2[0], -ptr2[1]); - tileType = GetTileType(pos, (u32)super->collisionLayer); + tileType = GetTileTypeAtTilePos(pos, (u32)super->collisionLayer); ptr = gUnk_080CF938; do { diff --git a/src/enemy/tektite.c b/src/enemy/tektite.c index be3e79e4..fbc4c756 100644 --- a/src/enemy/tektite.c +++ b/src/enemy/tektite.c @@ -164,7 +164,7 @@ void sub_0802F300(TektiteEntity* this) { return; } else if (super->collisions != COL_NONE) { sub_0800417E(super, super->collisions); - } else if ((GetActTile(super) & 0xf0) == 0x50) { + } else if ((GetActTileAtEntity(super) & 0xf0) == 0x50) { // ACT_TILE_240 and ACT_TILE_241? super->direction = (super->direction + 0x10) & (0x3 | DirectionNorthWest); } diff --git a/src/enemy/tektiteGolden.c b/src/enemy/tektiteGolden.c index 61737644..047b449f 100644 --- a/src/enemy/tektiteGolden.c +++ b/src/enemy/tektiteGolden.c @@ -137,7 +137,7 @@ void sub_08038048(TektiteGoldenEntity* this) { return; } else if (super->collisions != COL_NONE) { sub_0800417E(super, super->collisions); - } else if ((GetActTile(super) & 0xf0) == 0x50) { + } else if ((GetActTileAtEntity(super) & 0xf0) == 0x50) { // ACT_TILE_240 and ACT_TILE_241? super->direction = (super->direction + 0x10) & (0x3 | DirectionNorthWest); } diff --git a/src/enemy/torchTrap.c b/src/enemy/torchTrap.c index f0604697..e34e2caa 100644 --- a/src/enemy/torchTrap.c +++ b/src/enemy/torchTrap.c @@ -9,11 +9,12 @@ #include "physics.h" #include "player.h" #include "room.h" +#include "tiles.h" typedef struct { Entity base; u8 filler[0xc]; - u16 unk_74; + u16 tilePos; u16 filler2; u16 unk_78; u16 projectileTimer; @@ -45,7 +46,7 @@ void TorchTrap_Init(TorchTrapEntity* this) { this->unk_84 &= 0xfff; sub_0804A720(super); super->action = 1; - this->unk_74 = this->unk_82 & 0xfff; + this->tilePos = this->unk_82 & 0xfff; super->x.HALF.HI = ((this->unk_82 & 0x3f) << 4) + 8 + gRoomControls.origin_x; super->y.HALF.HI = ((this->unk_82 & 0xfc0) >> 2) + (gRoomControls.origin_y + 8); super->direction = ((s16)this->unk_82 & 0xf000) >> 10; @@ -75,7 +76,7 @@ void sub_0803CF38(TorchTrapEntity* this) { } void sub_0803CF94(TorchTrapEntity* this) { - if (GetTileType(this->unk_74, super->collisionLayer) == 0x76) { + if (GetTileTypeAtTilePos(this->tilePos, super->collisionLayer) == TILE_TYPE_118) { this->unk_80 = 0; TorchTrap_Reset(this); } else if (this->unk_7c && sub_0803CFD8(this)) { @@ -84,35 +85,34 @@ void sub_0803CF94(TorchTrapEntity* this) { } bool32 sub_0803CFD8(TorchTrapEntity* this) { - u32 rv; + u32 result; if (this->unk_7c == 0) { - rv = 1; + result = TRUE; } else { - rv = CheckFlags(this->unk_7c); + result = CheckFlags(this->unk_7c); } - return rv; + return result; } bool32 sub_0803CFF0(TorchTrapEntity* this) { - u32 rv; + u32 result; if (this->unk_80 != 0) { if (this->unk_80 == this->unk_7c) { u32 val = CheckFlags(this->unk_80); - rv = 0; + result = FALSE; if (val == 0) { - rv = 1; + result = TRUE; } - return rv; + return result; } else { return CheckFlags(this->unk_80); } } - return 0; + return FALSE; } void TorchTrap_Reset(TorchTrapEntity* this) { - u32 val; super->action = 2; if (this->unk_78) { this->projectileTimer = this->unk_78; @@ -141,7 +141,7 @@ void TorchTrap_CreateProjectile(TorchTrapEntity* this) { void sub_0803D0B0(TorchTrapEntity* this) { super->action = 3; - sub_0807B7D8(0x75, this->unk_74, super->collisionLayer); + sub_0807B7D8(TILE_TYPE_117, this->tilePos, super->collisionLayer); } void (*const gTorchTrapActions[])(TorchTrapEntity*) = { @@ -152,12 +152,12 @@ void (*const gTorchTrapActions[])(TorchTrapEntity*) = { }; const u16 gTorchTrapTimerLengths[] = { - 0x3c, 0x3c, 0x5a, 0x5a, 0x5a, 0x78, 0x78, 0x96, + 60, 60, 90, 90, 90, 120, 120, 150, }; const u16 gTorchTrapProjectileSpeeds[] = { - 0x80, - 0x100, - 0x180, - 0x200, + 128, + 256, + 384, + 512, }; diff --git a/src/enemy/treeItem.c b/src/enemy/treeItem.c index 0d8dd476..2e1e9a34 100644 --- a/src/enemy/treeItem.c +++ b/src/enemy/treeItem.c @@ -5,6 +5,7 @@ * @brief Tree Item enemy */ #include "enemy.h" +#include "functions.h" #include "item.h" #include "object.h" @@ -15,8 +16,6 @@ typedef struct { static bool32 ShouldSpawnTreeItem(TreeItemEntity*); -extern void EnemyDisableRespawn(Entity*); - const u8 gTreeItemDropTables[][16] = { { 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, { 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, diff --git a/src/enemy/vaatiEyesMacro.c b/src/enemy/vaatiEyesMacro.c index 92cf62c5..e1c11638 100644 --- a/src/enemy/vaatiEyesMacro.c +++ b/src/enemy/vaatiEyesMacro.c @@ -231,7 +231,7 @@ void sub_0802EFB8(VaatiEyesMacroEntity* this) { u32 uVar1; u32 rand; u32 uVar3; - int iVar4; + u32 collisionData; rand = Random(); if ((rand >> 0x10 & 3) != 0) { @@ -240,8 +240,9 @@ void sub_0802EFB8(VaatiEyesMacroEntity* this) { uVar3 = GetFacingDirection(&gPlayerEntity.base, super); uVar1 = (uVar3 + 4) & 0x18; } - iVar4 = sub_080B1B44(TILE(super->x.HALF.HI, super->y.HALF.HI) + gUnk_080B4488[((uVar1) >> 3)], 1); - if (iVar4 != 0) { + collisionData = + GetCollisionDataAtTilePos(TILE(super->x.HALF.HI, super->y.HALF.HI) + gUnk_080B4488[((uVar1) >> 3)], 1); + if (collisionData != 0) { super->direction = DIR_NONE; } else { super->timer = (rand & 3) + 1; diff --git a/src/enemy/vaatiProjectile.c b/src/enemy/vaatiProjectile.c index 7a27a6eb..71c84c44 100644 --- a/src/enemy/vaatiProjectile.c +++ b/src/enemy/vaatiProjectile.c @@ -7,6 +7,7 @@ #include "enemy.h" #include "functions.h" #include "screenTransitions.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -281,10 +282,8 @@ bool32 sub_0803E4A0(VaatiProjectileEntity* this) { } void sub_0803E4D8(VaatiProjectileEntity* this) { - u32 tile; - - tile = TILE(super->x.HALF.HI, super->y.HALF.HI + 8); - if (sub_080B1B44(tile, gPlayerEntity.base.collisionLayer) != 0xff) { - SetBottomTile(0x4074, tile, gPlayerEntity.base.collisionLayer); + u32 tilePos = TILE(super->x.HALF.HI, super->y.HALF.HI + 8); + if (GetCollisionDataAtTilePos(tilePos, gPlayerEntity.base.collisionLayer) != COLLISION_DATA_255) { + SetTile(SPECIAL_TILE_116, tilePos, gPlayerEntity.base.collisionLayer); } } diff --git a/src/enemy/wizzrobeFire.c b/src/enemy/wizzrobeFire.c index b4c6656c..638b16cf 100644 --- a/src/enemy/wizzrobeFire.c +++ b/src/enemy/wizzrobeFire.c @@ -26,7 +26,7 @@ void WizzrobeFire_OnCollision(WizzrobeEntity* this) { } EnemyFunctionHandlerAfterCollision(super, WizzrobeFire_Functions); if (super->health == 0) { - SetBottomTile(this->tileIndex, this->tilePosition, super->collisionLayer); + SetTile(this->tileIndex, this->tilePos, super->collisionLayer); } } @@ -111,7 +111,7 @@ void WizzrobeFire_Action2(WizzrobeEntity* this) { super->timer = 40; super->subtimer = 0; super->flags &= ~0x80; - SetBottomTile(this->tileIndex, this->tilePosition, super->collisionLayer); + SetTile(this->tileIndex, this->tilePos, super->collisionLayer); EnqueueSFX(SFX_156); InitializeAnimation(super, super->direction >> 3); } diff --git a/src/enemy/wizzrobeIce.c b/src/enemy/wizzrobeIce.c index 364d56bd..d9af54c3 100644 --- a/src/enemy/wizzrobeIce.c +++ b/src/enemy/wizzrobeIce.c @@ -35,7 +35,7 @@ void WizzrobeIce_OnCollision(WizzrobeEntity* this) { } } if (super->health == 0) { - SetBottomTile(this->tileIndex, this->tilePosition, super->collisionLayer); + SetTile(this->tileIndex, this->tilePos, super->collisionLayer); } } @@ -118,7 +118,7 @@ void WizzrobeIce_Action2(WizzrobeEntity* this) { super->timer = 40; super->subtimer = 0; super->flags &= ~0x80; - SetBottomTile(this->tileIndex, this->tilePosition, super->collisionLayer); + SetTile(this->tileIndex, this->tilePos, super->collisionLayer); EnqueueSFX(SFX_156); InitializeAnimation(super, super->direction >> 3); } diff --git a/src/enemy/wizzrobeWind.c b/src/enemy/wizzrobeWind.c index 92afac49..91687000 100644 --- a/src/enemy/wizzrobeWind.c +++ b/src/enemy/wizzrobeWind.c @@ -5,10 +5,12 @@ * @brief Wizzrobe Wind enemy */ #include "enemy/wizzrobe.h" + #include "collision.h" #include "enemy.h" #include "functions.h" #include "object.h" +#include "tiles.h" extern void (*const WizzrobeWind_Functions[])(WizzrobeEntity*); extern void (*const WizzrobeWind_Actions[])(WizzrobeEntity*); @@ -42,7 +44,7 @@ void WizzrobeWind_OnCollision(WizzrobeEntity* this) { } } if (super->health == 0) { - SetBottomTile(this->tileIndex, this->tilePosition, super->collisionLayer); + SetTile(this->tileIndex, this->tilePos, super->collisionLayer); } } @@ -135,7 +137,7 @@ void WizzrobeWind_Action2(WizzrobeEntity* this) { super->subtimer = 0; super->flags &= ~0x80; EnqueueSFX(SFX_156); - SetBottomTile(this->tileIndex, this->tilePosition, super->collisionLayer); + SetTile(this->tileIndex, this->tilePos, super->collisionLayer); InitializeAnimation(super, super->direction >> 3); } break; @@ -206,15 +208,15 @@ void WizzrobeWind_Action3(WizzrobeEntity* this) { void sub_0802F888(WizzrobeEntity* this) { super->direction = (sub_08049F84(super, 3) + 4) & 0x18; - this->tilePosition = COORD_TO_TILE(super); - this->tileIndex = GetTileIndex(this->tilePosition, super->collisionLayer); - SetBottomTile(0x4071, this->tilePosition, super->collisionLayer); + this->tilePos = COORD_TO_TILE(super); + this->tileIndex = GetTileIndex(this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_113, this->tilePos, super->collisionLayer); } void sub_0802F8E4(WizzrobeEntity* this) { u16 uVar1; s32 iVar4; - u32 uVar6; + u32 tilePos; u32 uVar7; u32 uVar8; @@ -232,9 +234,9 @@ void sub_0802F8E4(WizzrobeEntity* this) { uVar1 = this->unk_72; iVar4 = ((s32)(rand)&0x7ff0) % (this->unk_6f << 3); uVar7 = (uVar1 + iVar4) | 8; - uVar6 = TILE(uVar8, uVar7); - if ((sub_080B1B44(uVar6, super->collisionLayer) == 0) && - (GetTileIndex(uVar6, super->collisionLayer) != 0x4071)) { + tilePos = TILE(uVar8, uVar7); + if ((GetCollisionDataAtTilePos(tilePos, super->collisionLayer) == 0) && + (GetTileIndex(tilePos, super->collisionLayer) != SPECIAL_TILE_113)) { super->x.HALF.HI = (s16)uVar8; super->y.HALF.HI = (s16)uVar7; if (sub_08049FA0(super) != 0) { diff --git a/src/enterPortalSubtask.c b/src/enterPortalSubtask.c index 3d445fd6..e3e7021c 100644 --- a/src/enterPortalSubtask.c +++ b/src/enterPortalSubtask.c @@ -20,8 +20,6 @@ extern void ClearArmosData(void); extern void sub_080300C4(void); -extern u8 gUnk_02017700[]; - bool32 sub_0804AD18(void); void sub_0804AD6C(RoomControls*); bool32 sub_0804ACA8(void); @@ -185,8 +183,8 @@ void Subtask_PortalCutscene_0(void) { ptr = &gUnk_080D4138[portalId]; LoadPaletteGroup(ptr->paletteGroup); LoadGfxGroup(ptr->gfxGroup); - MemCopy(&gUnk_02017700, gUnk_02017700 + 0x240, 0x20); - gUsedPalettes |= 0x200000; + MemCopy(gPaletteBuffer + 3 * 16, gPaletteBuffer + 21 * 16, 16 * 2); + gUsedPalettes |= 1 << 21; EraseAllEntities(); LoadRoomEntityList(gUnk_080D4110[portalId]); ClearEventPriority(); diff --git a/src/entity.c b/src/entity.c index 7297982a..a5b84baf 100644 --- a/src/entity.c +++ b/src/entity.c @@ -10,6 +10,7 @@ typedef struct Temp { void* next; u8 _0[0x38]; } Temp; +#include "tiles.h" extern u8 gUpdateVisibleTiles; extern Manager gUnk_02033290; @@ -46,29 +47,29 @@ const u8 gEntityListLUT[] = { // TODO: wrong file, maybe an "enter.c" according to lexicographical order void sub_0805E248(void) { - s32 idx; + s32 tilePos; - idx = gDiggingCaveEntranceTransition.entrance->targetTilePosition; + tilePos = gDiggingCaveEntranceTransition.entrance->targetTilePos; if (gRoomControls.area == AREA_VEIL_FALLS || gRoomControls.area == AREA_VEIL_FALLS_DIG_CAVE) { - SetTileType(0x27c, idx + TILE_POS(-1, -1), 1); - SetTileType(0x283, idx + TILE_POS(-1, -1), 2); - SetTileType(0x27d, idx + TILE_POS(0, -1), 1); - SetTileType(0x284, idx + TILE_POS(0, -1), 2); - SetTileType(0x27e, idx + TILE_POS(1, -1), 1); - SetTileType(0x285, idx + TILE_POS(1, -1), 2); - SetTileType(0x27f, idx + TILE_POS(-1, 0), 1); - SetTileType(0x280, idx + TILE_POS(0, 0), 1); - SetTileType(0x282, idx + TILE_POS(1, 0), 1); + SetTileType(TILE_TYPE_636, tilePos + TILE_POS(-1, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_643, tilePos + TILE_POS(-1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_637, tilePos + TILE_POS(0, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_644, tilePos + TILE_POS(0, -1), LAYER_TOP); + SetTileType(TILE_TYPE_638, tilePos + TILE_POS(1, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_645, tilePos + TILE_POS(1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_639, tilePos + TILE_POS(-1, 0), LAYER_BOTTOM); + SetTileType(TILE_TYPE_640, tilePos + TILE_POS(0, 0), LAYER_BOTTOM); + SetTileType(TILE_TYPE_642, tilePos + TILE_POS(1, 0), LAYER_BOTTOM); } else { - SetTileType(0x26c, idx + TILE_POS(-1, -1), 1); - SetTileType(0x273, idx + TILE_POS(-1, -1), 2); - SetTileType(0x26d, idx + TILE_POS(0, -1), 1); - SetTileType(0x274, idx + TILE_POS(0, -1), 2); - SetTileType(0x26e, idx + TILE_POS(1, -1), 1); - SetTileType(0x275, idx + TILE_POS(1, -1), 2); - SetTileType(0x26f, idx + TILE_POS(-1, 0), 1); - SetTileType(0x270, idx + TILE_POS(0, 0), 1); - SetTileType(0x272, idx + TILE_POS(1, 0), 1); + SetTileType(TILE_TYPE_620, tilePos + TILE_POS(-1, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_627, tilePos + TILE_POS(-1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_621, tilePos + TILE_POS(0, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_628, tilePos + TILE_POS(0, -1), LAYER_TOP); + SetTileType(TILE_TYPE_622, tilePos + TILE_POS(1, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_629, tilePos + TILE_POS(1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_623, tilePos + TILE_POS(-1, 0), LAYER_BOTTOM); + SetTileType(TILE_TYPE_624, tilePos + TILE_POS(0, 0), LAYER_BOTTOM); + SetTileType(TILE_TYPE_626, tilePos + TILE_POS(1, 0), LAYER_BOTTOM); } gUpdateVisibleTiles = 0; } diff --git a/src/fileselect.c b/src/fileselect.c index cf275fe1..3257c807 100644 --- a/src/fileselect.c +++ b/src/fileselect.c @@ -350,7 +350,7 @@ void LoadOptionsFromSave(u32 idx) { gSaveHeader->msg_speed = msg_speed; gSaveHeader->brightness = brightness; - gUsedPalettes = 0xFFFFFFFF; + gUsedPalettes = 0xffffffff; } void SetActiveSave(u32 idx) { @@ -400,10 +400,10 @@ static void HandleFileScreenEnter(void) { MemClear((void*)VRAM, 0x80); // clear palettes MessageInitialize(); EraseAllEntities(); - ClearTilemaps(); + ClearTileMaps(); ResetPalettes(); ResetPaletteTable(0); - MemClear(&gUnk_0200AF00, sizeof(gUnk_0200AF00)); + MemClear(&gHUD, sizeof(gHUD)); MemClear(&gMapDataBottomSpecial, sizeof(gMapDataBottomSpecial)); gMapDataBottomSpecial.unk3 = 7; gMapDataBottomSpecial.unk6 = gSaveHeader->language > LANGUAGE_EN ? 3 : 0; @@ -542,13 +542,13 @@ void sub_08050790(void) { } static void HideButtonR(void) { - gUnk_0200AF00.buttonX[2] = 0x140; - gUnk_0200AF00.buttonY[2] = 0x24; + gHUD.buttonX[2] = 0x140; + gHUD.buttonY[2] = 0x24; } static void ShowButtonR(void) { - gUnk_0200AF00.buttonX[2] = 0xD0; - gUnk_0200AF00.buttonY[2] = 0x24; + gHUD.buttonX[2] = 0xD0; + gHUD.buttonY[2] = 0x24; } static void HandleFileSelect(void) { diff --git a/src/flags.c b/src/flags.c index 17395102..e2111de1 100644 --- a/src/flags.c +++ b/src/flags.c @@ -40,20 +40,20 @@ u32 CheckRoomFlag(u32 flag) { return ReadBit(&gRoomVars.flags, flag); } -u32 CheckLocalFlagsByBank(u32 offset, u32 flag, u32 length) { - return CheckBits(gSave.flags, offset + flag, length); +u32 CheckLocalFlagsByBank(u32 offset, u32 flag, u32 count) { + return CheckBits(gSave.flags, offset + flag, count); } -u32 CheckLocalFlags(u32 flag, u32 length) { - return CheckLocalFlagsByBank(gArea.localFlagOffset, flag, length); +u32 CheckLocalFlags(u32 flag, u32 count) { + return CheckLocalFlagsByBank(gArea.localFlagOffset, flag, count); } -u32 CheckGlobalFlags(u32 flag, u32 length) { - return CheckLocalFlagsByBank(FLAG_BANK_0, flag, length); +u32 CheckGlobalFlags(u32 flag, u32 count) { + return CheckLocalFlagsByBank(FLAG_BANK_0, flag, count); } -u32 CheckRoomFlags(u32 flag, u32 length) { - return CheckBits(&gRoomVars.flags, flag, length); +u32 CheckRoomFlags(u32 flag, u32 count) { + return CheckBits(&gRoomVars.flags, flag, count); } void SetLocalFlagByBank(u32 offset, u32 flag) { diff --git a/src/game.c b/src/game.c index 138ae634..34a9930c 100644 --- a/src/game.c +++ b/src/game.c @@ -138,7 +138,7 @@ static void GameTask_Init(void) { MemClear(&gUI, sizeof(gUI)); EraseAllEntities(); SetBGDefaults(); - ClearTilemaps(); + ClearTileMaps(); ResetPalettes(); ResetPaletteTable(1); sub_0806FD8C(); @@ -384,7 +384,7 @@ static void sub_08051DCC(void) { static void UpdateWindcrests(void) { if (AreaIsOverworld()) { - struct_08127F94* i; + const OverworldLocation* location; u32 hi_x, hi_y; s32 x, y; @@ -398,9 +398,9 @@ static void UpdateWindcrests(void) { y += 0xf; hi_y = y >> 4; - for (i = gUnk_08127F94; i->_0 != 0xFF; i++) { - if (i->_0 <= hi_x && i->_2 >= hi_x && i->_1 <= hi_y && i->_3 >= hi_y) { - gSave.windcrests |= 1 << i->_4; + for (location = gOverworldLocations; location->minX != 0xFF; location++) { + if (location->minX <= hi_x && location->maxX >= hi_x && location->minY <= hi_y && location->maxY >= hi_y) { + gSave.windcrests |= 1 << location->windcrestId; break; } } diff --git a/src/gameData.c b/src/gameData.c index 581e7eff..c7ed4cf1 100644 --- a/src/gameData.c +++ b/src/gameData.c @@ -85,7 +85,7 @@ const WorldEvent gWorldEvents[] = { OUGONTEKI_B }, { WORLD_EVENT_TYPE_1, 2, AREA_CASTOR_WILDS, ROOM_CASTOR_WILDS_MAIN, 480, 80, 600, 168, 600, 1848, CND_1, LOCAL_BANK_0, OUGONTEKI_C }, - { WORLD_EVENT_TYPE_1, 3, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLLS_NORTH, 0, 352, 120, 440, 2616, 2600, + { WORLD_EVENT_TYPE_1, 3, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLS_NORTH, 0, 352, 120, 440, 2616, 2600, CND_1, LOCAL_BANK_0, OUGONTEKI_D }, { WORLD_EVENT_TYPE_1, 4, AREA_CASTLE_GARDEN, ROOM_CASTLE_GARDEN_MAIN, 768, 160, 936, 248, 2424, 440, CND_1, LOCAL_BANK_0, OUGONTEKI_E }, @@ -97,7 +97,7 @@ const WorldEvent gWorldEvents[] = { LOCAL_BANK_0, OUGONTEKI_H }, { WORLD_EVENT_TYPE_1, 8, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_WESTERN_WOODS_CENTER, 176, 0, 312, 88, 1320, 2888, CND_1, LOCAL_BANK_0, OUGONTEKI_I }, - { WORLD_EVENT_TYPE_2, 0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLLS_NORTH, 80, 288, 200, 376, 2696, 2536, + { WORLD_EVENT_TYPE_2, 0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLS_NORTH, 80, 288, 200, 376, 2696, 2536, CND_1, LOCAL_BANK_1, KAKERA_TAKARA_A }, { WORLD_EVENT_TYPE_2, 0, AREA_CRENEL_MINISH_PATHS, ROOM_CRENEL_MINISH_PATHS_RAIN, 272, 16, 392, 88, 744, 152, CND_1, LOCAL_BANK_3, KAKERA_TAKARA_B }, @@ -228,7 +228,7 @@ const WorldEvent gWorldEvents[] = { LOCAL_BANK_1, BEANDEMO_01 }, // uses different flags due to CND_6 { WORLD_EVENT_TYPE_BEANSTALK, 0, AREA_RUINS, ROOM_RUINS_BEANSTALK, 0, 0, 72, 72, 312, 2712, CND_7, LOCAL_BANK_1, BEANDEMO_02 }, // uses different flags due to CND_7 - { WORLD_EVENT_TYPE_BEANSTALK, 0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLLS_CENTER, 0, 0, 72, 56, 2568, + { WORLD_EVENT_TYPE_BEANSTALK, 0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLS_CENTER, 0, 0, 72, 56, 2568, 2760, CND_8, LOCAL_BANK_1, BEANDEMO_03 }, // uses different flags due to CND_8 { WORLD_EVENT_TYPE_BEANSTALK, 0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_WESTERN_WOODS_SOUTH, 0, 0, 56, 56, 1064, 3016, CND_9, LOCAL_BANK_1, BEANDEMO_04 }, // uses different flags due to CND_9 @@ -245,7 +245,7 @@ const WorldEvent gWorldEvents[] = { LOCAL_BANK_1, BEANDEMO_01 }, // uses different flags due to CND_6 { WORLD_EVENT_TYPE_BEANSTALK, 0, AREA_RUINS, ROOM_RUINS_BEANSTALK, 0, 0, 72, 72, 312, 2712, CND_0, LOCAL_BANK_1, BEANDEMO_02 }, // uses different flags due to CND_7 - { WORLD_EVENT_TYPE_BEANSTALK, 0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLLS_CENTER, 0, 0, 72, 56, 2568, + { WORLD_EVENT_TYPE_BEANSTALK, 0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLS_CENTER, 0, 0, 72, 56, 2568, 2760, CND_0, LOCAL_BANK_1, BEANDEMO_03 }, // uses different flags due to CND_8 { WORLD_EVENT_TYPE_BEANSTALK, 0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_WESTERN_WOODS_SOUTH, 0, 0, 56, 56, 1064, 3016, CND_0, LOCAL_BANK_1, BEANDEMO_04 }, // uses different flags due to CND_9 @@ -341,7 +341,7 @@ const WorldEvent gWorldEvents[] = { LOCAL_BANK_1, BEANDEMO_01 }, // uses different flags due to CND_6 { WORLD_EVENT_TYPE_BEANSTALK, 0, AREA_RUINS, ROOM_RUINS_BEANSTALK, 0, 0, 72, 72, 312, 2712, CND_7, LOCAL_BANK_1, BEANDEMO_02 }, // uses different flags due to CND_7 - { WORLD_EVENT_TYPE_BEANSTALK, 0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLLS_CENTER, 0, 0, 72, 56, 2568, + { WORLD_EVENT_TYPE_BEANSTALK, 0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLS_CENTER, 0, 0, 72, 56, 2568, 2760, CND_8, LOCAL_BANK_1, BEANDEMO_03 }, // uses different flags due to CND_8 { WORLD_EVENT_TYPE_BEANSTALK, 0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_WESTERN_WOODS_SOUTH, 0, 0, 56, 56, 1064, 3016, CND_9, LOCAL_BANK_1, BEANDEMO_04 }, // uses different flags due to CND_9 diff --git a/src/gameUtils.c b/src/gameUtils.c index da2afc41..2f54867d 100644 --- a/src/gameUtils.c +++ b/src/gameUtils.c @@ -3,6 +3,7 @@ * * @brief Game Utils */ +#include "area.h" #include "backgroundAnimations.h" #include "enemy.h" #include "entity.h" @@ -32,9 +33,9 @@ void InitRoomResInfo(RoomResInfo* info, RoomHeader* hdr, u32 area, u32 room); void sub_080532E4(void); void ResetTimerFlags(void); -extern void** gAreaTilesets[]; +extern void** gAreaTileSets[]; extern void** gAreaRoomMaps[]; -extern void* gAreaMetatiles[]; +extern void* gAreaTiles[]; extern void** gAreaTable[]; typedef struct { @@ -162,17 +163,17 @@ void InitializePlayer(void) { bool32 AreaIsOverworld(void) { #ifdef EU - return gArea.areaMetadata == 0x01; + return gArea.areaMetadata == AR_IS_OVERWORLD; #else - return gArea.areaMetadata == 0x81; + return gArea.areaMetadata == (AR_ALLOWS_WARP | AR_IS_OVERWORLD); #endif } bool32 CheckAreaOverworld(u32 area) { #if EU - return gAreaMetadata[area].flags == 0x01; + return gAreaMetadata[area].flags == AR_IS_OVERWORLD; #else - return gAreaMetadata[area].flags == 0x81; + return gAreaMetadata[area].flags == (AR_ALLOWS_WARP | AR_IS_OVERWORLD); #endif } @@ -272,20 +273,20 @@ bool32 HasDungeonMap(void) { } extern u8 gPaletteBufferBackup[]; -void RestoreGameTask(u32 a1) { +void RestoreGameTask(bool32 loadGfx) { LoadGfxGroups(); #ifndef EU CleanUpGFXSlots(); #endif sub_080ADE24(); InitUI(TRUE); - sub_0801AE44(a1); + sub_0801AE44(loadGfx); MemCopy(gPaletteBufferBackup, gPaletteBuffer, 1024); gUsedPalettes = 0xffffffff; } void LoadRoomBgm(void) { - gArea.queued_bgm = gAreaMetadata[gRoomControls.area]._3; + gArea.queued_bgm = gAreaMetadata[gRoomControls.area].queueBgm; if (CheckLocalFlagByBank(FLAG_BANK_10, LV6_KANE_START)) { gArea.queued_bgm = BGM_FIGHT_THEME2; } @@ -429,7 +430,7 @@ bool32 CanDispEzloMessage(void) { s32 tmp = PL_STATE_WALK; if (!(gInput.heldKeys & SELECT_BUTTON) || gPlayerState.controlMode != CONTROL_ENABLED || - gPauseMenuOptions.disabled || gUnk_0200AF00.unk_1) + gPauseMenuOptions.disabled || gHUD.hideFlags != HUD_HIDE_NONE) return FALSE; if ((gPlayerState.flags & (PL_NO_CAP | PL_CAPTURED | PL_DISABLE_ITEMS)) || (gPlayerState.framestate_last > tmp) || @@ -510,7 +511,7 @@ void SetDungeonMapPos(u32 area, u32 room, u32 x, u32 y) { } void InitRoom(void) { - AreaHeader* a_hdr = NULL; + const AreaHeader* a_hdr = NULL; MemClear(&gArea, sizeof gArea); a_hdr = &gAreaMetadata[gRoomControls.area]; @@ -526,7 +527,7 @@ void InitRoom(void) { } u32 GetFlagBankOffset(u32 idx) { - AreaHeader* a_hdr = &gAreaMetadata[idx]; + const AreaHeader* a_hdr = &gAreaMetadata[idx]; return gLocalFlagBanks[a_hdr->flag_bank]; } @@ -543,7 +544,7 @@ void InitAllRoomResInfo(void) { RoomResInfo* info = gArea.roomResInfos; u32 i; for (i = 0; i < MAX_ROOMS && *(u16*)r_hdr != 0xFFFF; i++, r_hdr++) { - if (r_hdr->tileset_id != 0xFFFF) + if (r_hdr->tileSet_id != 0xFFFF) InitRoomResInfo(info, r_hdr, gRoomControls.area, i); info++; } @@ -555,9 +556,9 @@ void InitRoomResInfo(RoomResInfo* info, RoomHeader* r_hdr, u32 area, u32 room) { info->map_y = r_hdr->map_y; info->pixel_width = r_hdr->pixel_width; info->pixel_height = r_hdr->pixel_height; - info->tileset = *(gAreaTilesets[area] + r_hdr->tileset_id); + info->tileSet = *(gAreaTileSets[area] + r_hdr->tileSet_id); info->map = *(gAreaRoomMaps[area] + room); - info->metatiles = gAreaMetatiles[area]; + info->tiles = gAreaTiles[area]; info->bg_anim = (void*)gUnk_080B755C[area]; info->exits = gExitLists[area][room]; if (gAreaTable[area] != NULL) { @@ -586,7 +587,7 @@ void sub_08052EA0(void) { } u32 sub_08052EF4(s32 idx) { - AreaHeader* a_hdr = NULL; + const AreaHeader* a_hdr = NULL; u32 i = idx < 0 ? gRoomControls.area : idx; a_hdr = &gAreaMetadata[i]; return gLocalFlagBanks[a_hdr->flag_bank]; @@ -647,7 +648,7 @@ void LoadAuxiliaryRoom(u32 area, u32 room) { void sub_08052FF4(u32 area, u32 room) { RoomHeader* r_hdr = NULL; - ClearTilemaps(); + ClearTileMaps(); SetBGDefaults(); gRoomControls.area = area; gRoomControls.room = room; @@ -659,9 +660,9 @@ void sub_08052FF4(u32 area, u32 room) { gArea.currentRoomInfo.map_y = r_hdr->map_y; gArea.currentRoomInfo.pixel_width = r_hdr->pixel_width; gArea.currentRoomInfo.pixel_height = r_hdr->pixel_height; - gArea.currentRoomInfo.tileset = *(gAreaTilesets[area] + r_hdr->tileset_id); + gArea.currentRoomInfo.tileSet = *(gAreaTileSets[area] + r_hdr->tileSet_id); gArea.currentRoomInfo.map = *(gAreaRoomMaps[area] + room); - gArea.currentRoomInfo.metatiles = gAreaMetatiles[area]; + gArea.currentRoomInfo.tiles = gAreaTiles[area]; gArea.currentRoomInfo.bg_anim = (void*)gUnk_080B755C[area]; } @@ -817,16 +818,15 @@ void LoadItemGfx(void) { LoadGfxGroup(GetInventoryValue(ITEM_MAGIC_BOOMERANG) ? 28 : 27); } -extern u16 gUnk_020178E0[]; void sub_080533CC(void) { - u16* p1 = gUnk_020178E0; - u16* p2 = gUnk_020178E0 - 0x100; + u16* p1 = gPaletteBuffer + 288; + u16* p2 = gPaletteBuffer + 32; *p2++ = *p1++; *p2++ = *p1++; *p2++ = *p1++; *p2++ = *p1++; *p2++ = *p1++; - gUsedPalettes |= 8; + gUsedPalettes |= 1 << 3; } void UpdateTimerCallbacks(void) { @@ -848,7 +848,7 @@ void DummyHandler(u32* timer) { } void DarknutTimerHandler(u32* timer) { - if (gArea.locationIndex == 29 && *timer) { + if (gArea.locationIndex == 29 && *timer) { // AREA_DARK_HYRULE_CASTLE if (!--*timer) { ResetTimerFlags(); MenuFadeIn(5, 6); diff --git a/src/interrupts.c b/src/interrupts.c index 828a6537..a9aad690 100644 --- a/src/interrupts.c +++ b/src/interrupts.c @@ -87,11 +87,11 @@ void UpdateDisplayControls(void) { } void sub_08016CA8(BgSettings* bg) { - if (bg->updated && bg->tilemap != NULL) { + if (bg->updated && bg->subTileMap != NULL) { u32 dest; bg->updated = 0; dest = bg->control; - DmaCopy32(3, bg->tilemap, ((dest << 3) & 0xF800) + VRAM, gUnk_080B2CD8[dest >> 14]); + DmaCopy32(3, bg->subTileMap, ((dest << 3) & 0xF800) + VRAM, gUnk_080B2CD8[dest >> 14]); } } @@ -233,9 +233,9 @@ void PlayerUpdate(PlayerEntity* this) { static void HandlePlayerLife(Entity* this) { u32 threshold; - gUnk_0200AF00.rActionPlayerState = R_ACTION_NONE; - gUnk_0200AF00.rActionInteractTile = R_ACTION_NONE; - gUnk_0200AF00.rActionGrabbing = R_ACTION_NONE; + gHUD.rActionPlayerState = R_ACTION_NONE; + gHUD.rActionInteractTile = R_ACTION_NONE; + gHUD.rActionGrabbing = R_ACTION_NONE; if ((gPlayerEntity.base.contactFlags & CONTACT_NOW) && (gPlayerEntity.base.iframes > 0)) SoundReq(SFX_86); @@ -263,7 +263,7 @@ static void HandlePlayerLife(Entity* this) { return; #ifdef EU - if ((gUnk_0200AF00.unk_1 == 0) && gRoomTransition.frameCount % 90 == 0) { + if ((gHUD.hideFlags == HUD_HIDE_NONE) && gRoomTransition.frameCount % 90 == 0) { threshold = gSave.stats.maxHealth / 4; if (threshold > 24) threshold = 24; @@ -285,7 +285,7 @@ static void HandlePlayerLife(Entity* this) { if (gSave.stats.health <= threshold) { gRoomVars.needHealthDrop = TRUE; - if ((gUnk_0200AF00.unk_1 == 0) && gRoomTransition.frameCount % 90 == 0) { + if ((gHUD.hideFlags == HUD_HIDE_NONE) && gRoomTransition.frameCount % 90 == 0) { EnqueueSFX(SFX_LOW_HEALTH); } } @@ -332,7 +332,7 @@ static void sub_080171F0(void) { sub_080028E0(&gPlayerEntity.base); if (gPlayerState.flags & PL_CLONING) - gUnk_0200AF00.rActionPlayerState = R_ACTION_CANCEL; + gHUD.rActionPlayerState = R_ACTION_CANCEL; DetermineRButtonInteraction(); gPlayerState.field_0x7 &= ~0x80; diff --git a/src/item/itemGustJar.c b/src/item/itemGustJar.c index ea2da874..40fdd034 100644 --- a/src/item/itemGustJar.c +++ b/src/item/itemGustJar.c @@ -2,6 +2,7 @@ #include "functions.h" #include "item.h" #include "playeritem.h" +#include "tiles.h" void (*const ItemGustJar_StateFunctions[])(ItemBehavior* this, u32); @@ -11,7 +12,7 @@ void ItemGustJar(ItemBehavior* this, u32 index) { } void sub_08076DF4(ItemBehavior* this, u32 index) { - if (GetCollisionTileInFront(&gPlayerEntity.base) != 0x29 && gPlayerState.floor_type != SURFACE_DOOR && + if (GetActTileInFront(&gPlayerEntity.base) != ACT_TILE_41 && gPlayerState.floor_type != SURFACE_DOOR && gPlayerState.floor_type != SURFACE_DOOR_13 && gPlayerState.jump_status == 0) { sub_08077D38(this, index); this->timer = 0; diff --git a/src/item/itemMoleMitts.c b/src/item/itemMoleMitts.c index 6940a95b..8f535bdb 100644 --- a/src/item/itemMoleMitts.c +++ b/src/item/itemMoleMitts.c @@ -1,9 +1,10 @@ -#include "item.h" -#include "functions.h" -#include "sound.h" #include "effects.h" +#include "functions.h" +#include "item.h" #include "object.h" +#include "sound.h" +#include "tiles.h" s32 sub_080774A0(void); extern s32 DoItemTileInteraction(Entity*, u32, ItemBehavior*); @@ -175,19 +176,19 @@ void sub_08077448(ItemBehavior* this, u32 index) { s32 sub_080774A0(void) { static const s8 gUnk_0811BE1E[] = { 0, -13, 13, 0, 0, 16, -13, 0, 0, 0 }; - u32 iVar2; - u32 uVar3; + u32 collisionData; + u32 tilePos; - uVar3 = COORD_TO_TILE_OFFSET((&gPlayerEntity.base), -gUnk_0811BE1E[gPlayerEntity.base.animationState & 6], - -gUnk_0811BE1E[(gPlayerEntity.base.animationState & 6) + 1]); + tilePos = COORD_TO_TILE_OFFSET((&gPlayerEntity.base), -gUnk_0811BE1E[gPlayerEntity.base.animationState & 6], + -gUnk_0811BE1E[(gPlayerEntity.base.animationState & 6) + 1]); - iVar2 = sub_080B1B44(uVar3, gPlayerEntity.base.collisionLayer); + collisionData = GetCollisionDataAtTilePos(tilePos, gPlayerEntity.base.collisionLayer); - if (iVar2 > 0x16) + if (collisionData > 0x16) return 0; - if (iVar2 < 0xf) + if (collisionData < 0xf) return 0; - if (sub_080B1AE0(uVar3, gPlayerEntity.base.collisionLayer) != 0x56) { + if (GetActTileAtTilePos(tilePos, gPlayerEntity.base.collisionLayer) != ACT_TILE_86) { return 1; } else { return 0x56; diff --git a/src/item/itemTryPickupObject.c b/src/item/itemTryPickupObject.c index c6122f1f..c87c4838 100644 --- a/src/item/itemTryPickupObject.c +++ b/src/item/itemTryPickupObject.c @@ -100,7 +100,7 @@ void ItemPickupCheck(ItemBehavior* this, u32 index) { carried->subAction = 5; gPlayerState.framestate = PL_STATE_THROW; sub_080762C4(this, carried, 2, index); - gUnk_0200AF00.rActionGrabbing = R_ACTION_GRAB; + gHUD.rActionGrabbing = R_ACTION_GRAB; SoundReq(SFX_102); break; case 1: @@ -157,7 +157,7 @@ void sub_080762D8(ItemBehavior* this, u32 index) { } gPlayerState.framestate = PL_STATE_THROW; - gUnk_0200AF00.rActionGrabbing = 8; + gHUD.rActionGrabbing = 8; } else { if (this->field_0x18 != NULL) { this->field_0x18->subAction = 6; diff --git a/src/itemUtils.c b/src/itemUtils.c index e1794ede..1de52066 100644 --- a/src/itemUtils.c +++ b/src/itemUtils.c @@ -309,8 +309,8 @@ void ForceEquipItem(u32 itemId, u32 equipSlot) { } gSave.stats.equipped[equipSlot] = itemId; gSave.stats.equipped[otherItemSlot] = otherItem; - gUnk_0200AF00.unk_13 = 0x7f; - gUnk_0200AF00.unk_14 = 0x7f; + gHUD.unk_13 = 0x7f; + gHUD.unk_14 = 0x7f; } } diff --git a/src/kinstone.c b/src/kinstone.c index 08d10e67..4d203fc4 100644 --- a/src/kinstone.c +++ b/src/kinstone.c @@ -2,7 +2,6 @@ #include "asm.h" #include "common.h" #include "flags.h" -#include "global.h" #include "item.h" #include "kinstone.h" #include "manager.h" @@ -10,6 +9,7 @@ #include "player.h" #include "room.h" #include "subtask.h" +#include "tiles.h" extern const struct_gUnk_080B3D20 gUnk_080B3D20[]; extern const EntityData gUnk_080FEC28[]; @@ -335,7 +335,7 @@ void sub_0801876C(u32 worldEventId, bool32 isKinstoneFused) { if (isKinstoneFused == 0) { return; } - SetTileType(0x168, (ptr->x >> 4 & 0x3f) | (ptr->y >> 4 & 0x3f) << 6, 1); + SetTileType(TILE_TYPE_360, (ptr->x >> 4 & 0x3f) | (ptr->y >> 4 & 0x3f) << 6, LAYER_BOTTOM); break; case WORLD_EVENT_TYPE_11: if (isKinstoneFused != 0) { @@ -354,12 +354,12 @@ void sub_0801876C(u32 worldEventId, bool32 isKinstoneFused) { *(u16*)&ent->gustJarState = ptr->y + gRoomControls.origin_y; } if (ptr->entity_idx == 0) { - SetTileType(0x8d, (ptr->x >> 4 & 0x3f) | (ptr->y >> 4 & 0x3f) << 6, 1); + SetTileType(TILE_TYPE_141, (ptr->x >> 4 & 0x3f) | (ptr->y >> 4 & 0x3f) << 6, LAYER_BOTTOM); } else { uVar5 = (ptr->x >> 4 & 0x3f) | (ptr->y >> 4 & 0x3f) << 6; - SetTileType(0x8c, uVar5 - 1, 1); - uVar3 = 0x8e; - SetTileType(uVar3, uVar5, 1); + SetTileType(TILE_TYPE_140, uVar5 - 1, LAYER_BOTTOM); + uVar3 = TILE_TYPE_142; + SetTileType(uVar3, uVar5, LAYER_BOTTOM); } break; case WORLD_EVENT_TYPE_24: @@ -390,67 +390,67 @@ void sub_0801876C(u32 worldEventId, bool32 isKinstoneFused) { void sub_080189EC(u32 worldEventId) { u32 i; int iVar1; - int tilePosition; + int tilePos; const WorldEvent* ptr; ptr = &gWorldEvents[worldEventId]; - tilePosition = (ptr->x >> 4) & 0x3f; - tilePosition |= ((ptr->y >> 4) & 0x3f) << 6; - tilePosition -= 0x42; + tilePos = (ptr->x >> 4) & 0x3f; + tilePos |= ((ptr->y >> 4) & 0x3f) << 6; + tilePos -= TILE_POS(2, 1); for (i = 0; i < 4; i++) { - SetTileType(i + 0x1df, tilePosition + i, 2); + SetTileType(i + TILE_TYPE_479, tilePos + i, LAYER_TOP); } - tilePosition += 0x40; + tilePos += TILE_POS(0, 1); for (i = 0; i < 4; i++) { - SetTileType(i + 0x1e3, tilePosition + i, 2); - SetTileType(i + 0x1db, tilePosition + i, 1); + SetTileType(i + TILE_TYPE_483, tilePos + i, LAYER_TOP); + SetTileType(i + TILE_TYPE_475, tilePos + i, LAYER_BOTTOM); } } void sub_08018A58(u32 worldEventId) { u32 i; - int iVar2; + int tileType; u32 j; - int tilePosition; + int tilePos; const WorldEvent* ptr; ptr = &gWorldEvents[worldEventId]; - tilePosition = (ptr->x >> 4) & 0x3f; - tilePosition |= ((ptr->y >> 4) & 0x3f) << 6; - tilePosition -= 0x43; - iVar2 = 0x232; + tilePos = (ptr->x >> 4) & 0x3f; + tilePos |= ((ptr->y >> 4) & 0x3f) << 6; + tilePos -= TILE_POS(3, 1); + tileType = TILE_TYPE_562; - for (i = 0; i < 4; tilePosition += 0x40, i++) { + for (i = 0; i < 4; tilePos += TILE_POS(0, 1), i++) { for (j = 0; j < 7; j++) { - SetTileType(iVar2++, tilePosition + j, 1); + SetTileType(tileType++, tilePos + j, LAYER_BOTTOM); } } } -void sub_08018AB4(int param_1) { +void sub_08018AB4(int tilePos) { u32 i; int iVar2; u32 j; int iVar6; - iVar2 = 0x1e8; - iVar6 = 500; + iVar2 = TILE_TYPE_488; + iVar6 = TILE_TYPE_500; for (i = 0; i < 3; i++) { j = 0; for (; j < 4; j++) { - SetTileType(iVar2++, param_1 + j, 1); - SetTileType(iVar6++, param_1 - 0x40 + j, 2); + SetTileType(iVar2++, tilePos + j, LAYER_BOTTOM); + SetTileType(iVar6++, tilePos + TILE_POS(0, -1) + j, LAYER_TOP); } - param_1 += 0x40; + tilePos += TILE_POS(0, 1); } } -void sub_08018B10(int param_1) { +void sub_08018B10(int tilePos) { int iVar1; u32 index; int iVar3; @@ -459,34 +459,34 @@ void sub_08018B10(int param_1) { iVar4 = 0x1f0; iVar3 = 0x1fc; index = 0; - iVar1 = param_1 - 0x40; + iVar1 = tilePos - TILE_POS(0, 1); for (; index < 4; iVar1++, index++) { - SetTileType(iVar4++, param_1 + index, 1); - SetTileType(iVar3++, iVar1, 2); + SetTileType(iVar4++, tilePos + index, LAYER_BOTTOM); + SetTileType(iVar3++, iVar1, LAYER_TOP); } } void sub_08018B50(u32 worldEventId) { u32 i; - int iVar2; + int tileType; u32 j; - int tilePosition; + int tilePos; const WorldEvent* ptr; ptr = &gWorldEvents[worldEventId]; if ((ptr->entity_idx & 0x80) == 0) { - iVar2 = 0x200; + tileType = TILE_TYPE_512; } else { - iVar2 = 0x219; + tileType = TILE_TYPE_537; } - tilePosition = (ptr->x >> 4) & 0x3f; - tilePosition |= ((ptr->y >> 4) & 0x3f) << 6; - tilePosition -= 0x82; + tilePos = (ptr->x >> 4) & 0x3f; + tilePos |= ((ptr->y >> 4) & 0x3f) << 6; + tilePos -= TILE_POS(2, 2); - for (i = 0; i < 5; tilePosition += 0x40, i++) { + for (i = 0; i < 5; tilePos += 0x40, i++) { for (j = 0; j < 5; j++) { - SetTileType(iVar2++, tilePosition + j, 1); + SetTileType(tileType++, tilePos + j, LAYER_BOTTOM); } } } @@ -494,22 +494,22 @@ void sub_08018B50(u32 worldEventId) { // TODO world event that loads tile entity void sub_08018BB4(u32 worldEventId) { u32 layer; - TileEntity tile; + TileEntity tileEntity; const WorldEvent* ptr; u32 position; - MemCopy(gUnk_080FEAC8 + worldEventId, &tile, sizeof(TileEntity)); + MemCopy(gUnk_080FEAC8 + worldEventId, &tileEntity, sizeof(TileEntity)); ptr = &gWorldEvents[worldEventId]; - tile.tilePos = (ptr->x >> 4 & 0x3f) | (((ptr->y) >> 4 & 0x3f) << 6); - LoadSmallChestTile2(&tile); - if (CheckLocalFlag(tile.localFlag) == 0) { - position = tile.tilePos; - if ((tile._6 & 1) == 0) { + tileEntity.tilePos = (ptr->x >> 4 & 0x3f) | (((ptr->y) >> 4 & 0x3f) << 6); + LoadSmallChestTile2(&tileEntity); + if (CheckLocalFlag(tileEntity.localFlag) == 0) { + position = tileEntity.tilePos; + if ((tileEntity._6 & 1) == 0) { layer = 1; } else { layer = 2; } - SetTileType(0x73, position, layer); + SetTileType(TILE_TYPE_115, position, layer); } } @@ -519,7 +519,7 @@ void CreateMinishEntrance(u32 tilePos) { for (y = 0; y <= 3; y++) { for (x = 0; x <= 4; x++) { - SetTileType(tileID++, tilePos + x, 1); + SetTileType(tileID++, tilePos + x, LAYER_BOTTOM); } tilePos += 0x40; } @@ -529,7 +529,7 @@ void sub_08018C58(u32 tilePos) { u32 i; for (i = 0; i < 6; i += 2, tilePos += 0x40) { - SetTileType(0x260 + i, tilePos, 1); - SetTileType(0x261 + i, tilePos + 1, 1); + SetTileType(TILE_TYPE_608 + i, tilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_609 + i, tilePos + 1, LAYER_BOTTOM); } } diff --git a/src/manager.c b/src/manager.c index 6c649a9c..9572e769 100644 --- a/src/manager.c +++ b/src/manager.c @@ -1,64 +1,66 @@ #include "manager.h" // TODO: change all manager arguments to be Entity* and cast to specific type later. -void (*const gMiscManagerunctions[])() = { NULL, - LightRayManager_Main, - VerticalMinishPathBackgroundManager_Main, - MinishPortalManager_Main, - DiggingCaveEntranceManager_Main, - BridgeManager_Main, - SpecialWarpManager_Main, - MinishVillageTilesetManager_Main, - HorizontalMinishPathBackgroundManager_Main, - MinishRaftersBackgroundManager_Main, - EzloHintManager_Main, - FightManager_Main, - RollingBarrelManager_Main, - TileChangeObserveManager_Main, - EntitySpawnManager_Main, - MiscManager_Main, - WeatherChangeManager_Main, - FlagAndOperatorManager_Main, - HyruleTownTilesetManager_Main, - HouseSignManager_Main, - SteamOverlayManager_Main, - TempleOfDropletsManager_Main, - DelayedEntityLoadManager_Main, - FallingItemManager_Main, - CloudOverlayManager_Main, - PowBackgroundManager_Main, - HoleManager_Main, - StaticBackgroundManager_Main, - RainfallManager_Main, - AnimatedBackgroundManager_Main, - RegionTriggerManager_Main, - RailIntersectionManager_Main, - MoveableObjectManager_Main, - MinishSizedEntranceManager_Main, - LightManager_Main, - LightLevelSetManager_Main, - BombableWallManager_Main, - FlameManager_Main, - PushableFurnitureManager_Main, - ArmosInteriorManager_Main, - EnemyInteractionManager_Main, - Manager29_Main, - DestructibleTileObserveManager_Main, - AngryStatueManager_Main, - CloudStaircaseTransitionManager_Main, - WaterfallBottomManager_Main, - SecretManager_Main, - Vaati3BackgroundManager_Main, - TilePuzzleManager_Main, - GoronMerchantShopManager_Main, - VaatiAppearingManager_Main, - HyruleTownBellManager_Main, - Vaati3InsideArmManager_Main, - CameraTargetManager_Main, - RepeatedSoundManager_Main, - Vaati3StartManager_Main, - FloatingPlatformManager_Main, - EnterRoomTextboxManager_Main }; +void (*const gMiscManagerunctions[])() = { + NULL, + LightRayManager_Main, + VerticalMinishPathBackgroundManager_Main, + MinishPortalManager_Main, + DiggingCaveEntranceManager_Main, + BridgeManager_Main, + SpecialWarpManager_Main, + MinishVillageTileSetManager_Main, + HorizontalMinishPathBackgroundManager_Main, + MinishRaftersBackgroundManager_Main, + EzloHintManager_Main, + FightManager_Main, + RollingBarrelManager_Main, + TileChangeObserveManager_Main, + EntitySpawnManager_Main, + MiscManager_Main, + WeatherChangeManager_Main, + FlagAndOperatorManager_Main, + HyruleTownTileSetManager_Main, + HouseSignManager_Main, + SteamOverlayManager_Main, + TempleOfDropletsManager_Main, + DelayedEntityLoadManager_Main, + FallingItemManager_Main, + CloudOverlayManager_Main, + PowBackgroundManager_Main, + HoleManager_Main, + StaticBackgroundManager_Main, + RainfallManager_Main, + AnimatedBackgroundManager_Main, + RegionTriggerManager_Main, + RailIntersectionManager_Main, + MoveableObjectManager_Main, + MinishSizedEntranceManager_Main, + LightManager_Main, + LightLevelSetManager_Main, + BombableWallManager_Main, + FlameManager_Main, + PushableFurnitureManager_Main, + ArmosInteriorManager_Main, + EnemyInteractionManager_Main, + Manager29_Main, + DestructibleTileObserveManager_Main, + AngryStatueManager_Main, + CloudStaircaseTransitionManager_Main, + WaterfallBottomManager_Main, + SecretManager_Main, + Vaati3BackgroundManager_Main, + TilePuzzleManager_Main, + GoronMerchantShopManager_Main, + VaatiAppearingManager_Main, + HyruleTownBellManager_Main, + Vaati3InsideArmManager_Main, + CameraTargetManager_Main, + RepeatedSoundManager_Main, + Vaati3StartManager_Main, + FloatingPlatformManager_Main, + EnterRoomTextboxManager_Main, +}; void ManagerUpdate(Entity* this) { if (!EntityDisabled(this)) diff --git a/src/manager/bombableWallManager.c b/src/manager/bombableWallManager.c index 52d018bd..e0343063 100644 --- a/src/manager/bombableWallManager.c +++ b/src/manager/bombableWallManager.c @@ -11,21 +11,20 @@ #include "game.h" #include "object.h" #include "sound.h" +#include "tiles.h" -u32 sub_0805BFC4(u32, u32); -void sub_0805C02C(BombableWallManager*); - -extern u32 sub_080B1AE0(u16, u8); +u32 BombableWallManager_GetBombableType(u32 tilePos, u32 layer); +void BombableWallManager_DestroyWall(BombableWallManager*); u32 getArchwayType(void); void BombableWallManager_Init(BombableWallManager*); void BombableWallManager_Action1(BombableWallManager*); void BombableWallManager_Action2(BombableWallManager*); -void sub_0805C050(u32, u32); -void sub_0805C178(u32, u32); -void sub_0805C294(u32, u32); -void sub_0805C3B4(u32, u32); -void sub_0805C4E0(u32, u32); +void BombableWallManager_DestroyWall0(u32, u32); +void BombableWallManager_DestroyWall1(u32, u32); +void BombableWallManager_DestroyWall2(u32, u32); +void BombableWallManager_DestroyWall3(u32, u32); +void BombableWallManager_DestroyWall4(u32, u32); void BombableWallManager_Main(BombableWallManager* this) { static void (*const BombableWallManager_Actions[])(BombableWallManager*) = { @@ -38,20 +37,20 @@ void BombableWallManager_Main(BombableWallManager* this) { void BombableWallManager_Init(BombableWallManager* this) { super->action = 1; - this->tile = (this->x >> 4 & 0x3fU) | (((this->y << 0x10) >> 0x14 & 0x3fU) << 6); - super->type = sub_0805BFC4(this->tile, this->field_0x35); - if (CheckLocalFlag(this->field_0x3e) != 0) { - sub_0805C02C(this); + this->tilePos = (this->x >> 4 & 0x3fU) | (((this->y << 0x10) >> 0x14 & 0x3fU) << 6); + super->type = BombableWallManager_GetBombableType(this->tilePos, this->layer); + if (CheckLocalFlag(this->flag) != 0) { + BombableWallManager_DestroyWall(this); DeleteManager(super); } } void BombableWallManager_Action1(BombableWallManager* this) { - if (sub_080B1AE0(this->tile, this->field_0x35) != 0x2e) { + if (GetActTileAtTilePos(this->tilePos, this->layer) != ACT_TILE_46) { super->action = 2; super->timer = 90; - sub_0805C02C(this); - SetLocalFlag(this->field_0x3e); + BombableWallManager_DestroyWall(this); + SetLocalFlag(this->flag); } } @@ -62,155 +61,155 @@ void BombableWallManager_Action2(BombableWallManager* this) { } } -u32 sub_0805BFC4(u32 pos, u32 layer) { - u32 tileType = GetTileType(pos, layer); +u32 BombableWallManager_GetBombableType(u32 tilePos, u32 layer) { + u32 tileType = GetTileTypeAtTilePos(tilePos, layer); switch (tileType) { - case 0xec: + case TILE_TYPE_236: return 1; - case 0xbf: + case TILE_TYPE_191: return 4; - case 0xaf: + case TILE_TYPE_175: return 0; - case 0xcc: + case TILE_TYPE_204: return 2; - case 0xdf: + case TILE_TYPE_223: return 3; - case 0xff: + case TILE_TYPE_255: return 0; - case 0x115: + case TILE_TYPE_277: return 1; - case 0x108: + case TILE_TYPE_264: return 2; - case 0x110: + case TILE_TYPE_272: return 3; - case 0x105: + case TILE_TYPE_261: return 4; } return 0xff; } -void sub_0805C02C(BombableWallManager* this) { +void BombableWallManager_DestroyWall(BombableWallManager* this) { static void (*const gUnk_08108CE8[])(u32, u32) = { - sub_0805C050, sub_0805C178, sub_0805C294, sub_0805C3B4, sub_0805C4E0, + BombableWallManager_DestroyWall0, BombableWallManager_DestroyWall1, BombableWallManager_DestroyWall2, + BombableWallManager_DestroyWall3, BombableWallManager_DestroyWall4, }; if (super->type != 0xff) { - gUnk_08108CE8[super->type](this->tile, this->field_0x35); + gUnk_08108CE8[super->type](this->tilePos, this->layer); } } -void sub_0805C050(u32 pos, u32 layer) { - SetTileType(0xb1, pos - 0x41, layer); - SetTileType(0xb2, pos - 0x40, layer); - SetTileType(0xb3, pos - 0x3f, layer); - SetTileType(0xb4, pos - 1, layer); - SetTileType(0xb7, pos + 1, layer); - if (layer == 1) { - if (AreaHasEnemies() != 0) { +void BombableWallManager_DestroyWall0(u32 tilePos, u32 layer) { + SetTileType(TILE_TYPE_177, tilePos + TILE_POS(-1, -1), layer); + SetTileType(TILE_TYPE_178, tilePos + TILE_POS(0, -1), layer); + SetTileType(TILE_TYPE_179, tilePos + TILE_POS(1, -1), layer); + SetTileType(TILE_TYPE_180, tilePos + TILE_POS(-1, 0), layer); + SetTileType(TILE_TYPE_183, tilePos + TILE_POS(1, 0), layer); + if (layer == LAYER_BOTTOM) { + if (AreaHasEnemies()) { Entity* object = CreateObject(ARCHWAY, 0xe, 0); if (object != NULL) { - object->x.HALF.HI = ((pos & 0x3f) << 4) + 8 + gRoomControls.origin_x; - object->y.HALF.HI = ((pos & 0xfc0) >> 2) - 8 + gRoomControls.origin_y; + object->x.HALF.HI = ((tilePos & 0x3f) << 4) + 8 + gRoomControls.origin_x; + object->y.HALF.HI = ((tilePos & 0xfc0) >> 2) - 8 + gRoomControls.origin_y; } - SetTileType(0xb5, pos, 1); + SetTileType(TILE_TYPE_181, tilePos, LAYER_BOTTOM); } else { - if (AreaIsDungeon() != 0) { - SetTileType(0xb5, pos, 1); + if (AreaIsDungeon()) { + SetTileType(TILE_TYPE_181, tilePos, LAYER_BOTTOM); } else { - SetTileType(0xb6, pos, 1); + SetTileType(TILE_TYPE_182, tilePos, LAYER_BOTTOM); } } - SetTileType(0xb8, pos - 0x41, 2); - SetTileType(0xb9, pos - 0x40, 2); - SetTileType(0xba, pos - 0x3f, 2); + SetTileType(TILE_TYPE_184, tilePos + TILE_POS(-1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_185, tilePos + TILE_POS(0, -1), LAYER_TOP); + SetTileType(TILE_TYPE_186, tilePos + TILE_POS(1, -1), LAYER_TOP); } else { Entity* object; - SetTileType(0xb5, pos, 2); - if (AreaIsDungeon() == 0) { + SetTileType(TILE_TYPE_181, tilePos, LAYER_TOP); + if (!AreaIsDungeon()) { return; } object = CreateObject(ARCHWAY, getArchwayType(), 6); if (object == NULL) { return; } - object->x.HALF.HI = ((pos & 0x3f) << 4) + 8 + gRoomControls.origin_x; - object->y.HALF.HI = ((pos & 0xfc0) >> 2) - 0x10 + gRoomControls.origin_y; - object->collisionLayer = 2; + object->x.HALF.HI = ((tilePos & 0x3f) << 4) + 8 + gRoomControls.origin_x; + object->y.HALF.HI = ((tilePos & 0xfc0) >> 2) - 0x10 + gRoomControls.origin_y; + object->collisionLayer = LAYER_TOP; } } -void sub_0805C178(u32 pos, u32 layer) { +void BombableWallManager_DestroyWall1(u32 tilePos, u32 layer) { Entity* object; - SetTileType(0xf1, pos - 0x40, layer); - SetTileType(0xf5, pos - 0x3f, layer); - SetTileType(0xf6, pos + 1, layer); - SetTileType(0xf4, pos + 0x40, layer); - SetTileType(0xf7, pos + 0x41, layer); - if (layer == 1) { - - if (AreaHasEnemies() != 0) { + SetTileType(TILE_TYPE_241, tilePos + TILE_POS(0, -1), layer); + SetTileType(TILE_TYPE_245, tilePos + TILE_POS(1, -1), layer); + SetTileType(TILE_TYPE_246, tilePos + TILE_POS(1, 0), layer); + SetTileType(TILE_TYPE_244, tilePos + TILE_POS(0, 1), layer); + SetTileType(TILE_TYPE_247, tilePos + TILE_POS(1, 1), layer); + if (layer == LAYER_BOTTOM) { + if (AreaHasEnemies()) { object = CreateObject(ARCHWAY, 0xe, 1); if (object != NULL) { - object->x.HALF.HI = ((pos & 0x3f) << 4) + 0x18 + gRoomControls.origin_x; - object->y.HALF.HI = ((pos & 0xfc0) >> 2) + 8 + gRoomControls.origin_y; + object->x.HALF.HI = ((tilePos & 0x3f) << 4) + 0x18 + gRoomControls.origin_x; + object->y.HALF.HI = ((tilePos & 0xfc0) >> 2) + 8 + gRoomControls.origin_y; } - SetTileType(0xf2, pos, 1); + SetTileType(TILE_TYPE_242, tilePos, LAYER_BOTTOM); } else { - if (AreaIsDungeon() != 0) { - SetTileType(0xf2, pos, 1); + if (AreaIsDungeon()) { + SetTileType(TILE_TYPE_242, tilePos, LAYER_BOTTOM); } else { - SetTileType(0xf3, pos, 1); + SetTileType(TILE_TYPE_243, tilePos, LAYER_BOTTOM); } } - SetTileType(0xf8, pos - 0x3f, 2); - SetTileType(0xf9, pos + 1, 2); - SetTileType(0xfa, pos + 0x41, 2); + SetTileType(TILE_TYPE_248, tilePos + TILE_POS(1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_249, tilePos + 1, LAYER_TOP); + SetTileType(TILE_TYPE_250, tilePos + TILE_POS(1, 1), LAYER_TOP); } else { - SetTileType(0xf2, pos, 2); - if (AreaIsDungeon() == 0) { + SetTileType(TILE_TYPE_242, tilePos, LAYER_TOP); + if (!AreaIsDungeon()) { return; } object = CreateObject(ARCHWAY, getArchwayType(), 7); if (object == NULL) { return; } - object->x.HALF.HI = ((pos & 0x3f) << 4) + 0x20 + gRoomControls.origin_x; - object->y.HALF.HI = ((pos & 0xfc0) >> 2) + 8 + gRoomControls.origin_y; - object->collisionLayer = 2; + object->x.HALF.HI = ((tilePos & 0x3f) << 4) + 0x20 + gRoomControls.origin_x; + object->y.HALF.HI = ((tilePos & 0xfc0) >> 2) + 8 + gRoomControls.origin_y; + object->collisionLayer = LAYER_TOP; } } -void sub_0805C294(u32 pos, u32 layer) { +void BombableWallManager_DestroyWall2(u32 tilePos, u32 layer) { Entity* object; - SetTileType(0xd1, pos - 1, layer); - SetTileType(0xd4, pos + 1, layer); - SetTileType(0xd5, pos + 0x3f, layer); - SetTileType(0xd6, pos + 0x40, layer); - SetTileType(0xd7, pos + 0x41, layer); - if (layer == 1) { - if (AreaHasEnemies() != 0) { + SetTileType(TILE_TYPE_209, tilePos + TILE_POS(-1, 0), layer); + SetTileType(TILE_TYPE_212, tilePos + TILE_POS(1, 0), layer); + SetTileType(TILE_TYPE_213, tilePos + TILE_POS(-1, 1), layer); + SetTileType(TILE_TYPE_214, tilePos + TILE_POS(0, 1), layer); + SetTileType(TILE_TYPE_215, tilePos + TILE_POS(1, 1), layer); + if (layer == LAYER_BOTTOM) { + if (AreaHasEnemies()) { object = CreateObject(ARCHWAY, 0xe, 2); if (object != NULL) { - object->x.HALF.HI = ((pos & 0x3f) << 4) + 8 + gRoomControls.origin_x; - object->y.HALF.HI = ((pos & 0xfc0) >> 2) + 0x20 + gRoomControls.origin_y; + object->x.HALF.HI = ((tilePos & 0x3f) << 4) + 8 + gRoomControls.origin_x; + object->y.HALF.HI = ((tilePos & 0xfc0) >> 2) + 0x20 + gRoomControls.origin_y; } - SetTileType(0xd2, pos, 1); + SetTileType(TILE_TYPE_210, tilePos, LAYER_BOTTOM); } else { - if (AreaIsDungeon() != 0) { - SetTileType(0xd2, pos, 1); + if (AreaIsDungeon()) { + SetTileType(TILE_TYPE_210, tilePos, LAYER_BOTTOM); } else { - SetTileType(0xd3, pos, 1); + SetTileType(TILE_TYPE_211, tilePos, LAYER_BOTTOM); } } - SetTileType(0xd8, pos + 0x3f, 2); - SetTileType(0xd9, pos + 0x40, 2); - SetTileType(0xda, pos + 0x41, 2); + SetTileType(TILE_TYPE_216, tilePos + TILE_POS(-1, 1), LAYER_TOP); + SetTileType(TILE_TYPE_217, tilePos + TILE_POS(0, 1), LAYER_TOP); + SetTileType(TILE_TYPE_218, tilePos + TILE_POS(1, 1), LAYER_TOP); } else { - SetTileType(0xd2, pos, 2); + SetTileType(TILE_TYPE_210, tilePos, LAYER_TOP); if (AreaIsDungeon() == 0) { return; } @@ -218,41 +217,41 @@ void sub_0805C294(u32 pos, u32 layer) { if (object == NULL) { return; } - object->x.HALF.HI = ((pos & 0x3f) << 4) + 8 + gRoomControls.origin_x; - object->y.HALF.HI = ((pos & 0xfc0) >> 2) + 0x20 + gRoomControls.origin_y; - object->collisionLayer = 2; + object->x.HALF.HI = ((tilePos & 0x3f) << 4) + 8 + gRoomControls.origin_x; + object->y.HALF.HI = ((tilePos & 0xfc0) >> 2) + 0x20 + gRoomControls.origin_y; + object->collisionLayer = LAYER_TOP; } } -void sub_0805C3B4(u32 pos, u32 layer) { +void BombableWallManager_DestroyWall3(u32 tilePos, u32 layer) { Entity* object; - SetTileType(0xe1, pos - 0x41, layer); - SetTileType(0xe4, pos - 0x40, layer); - SetTileType(0xe2, pos - 1, layer); - SetTileType(0xe3, pos + 0x3f, layer); - SetTileType(0xe7, pos + 0x40, layer); - if (layer == 1) { - if (AreaHasEnemies() != 0) { + SetTileType(TILE_TYPE_225, tilePos + TILE_POS(-1, -1), layer); + SetTileType(TILE_TYPE_228, tilePos + TILE_POS(0, -1), layer); + SetTileType(TILE_TYPE_226, tilePos + TILE_POS(-1, 0), layer); + SetTileType(TILE_TYPE_227, tilePos + TILE_POS(-1, 1), layer); + SetTileType(TILE_TYPE_231, tilePos + TILE_POS(0, 1), layer); + if (layer == LAYER_BOTTOM) { + if (AreaHasEnemies()) { object = CreateObject(ARCHWAY, 0xe, 3); if (object != NULL) { - object->x.HALF.HI = ((pos & 0x3f) << 4) + -0x10 + gRoomControls.origin_x; - object->y.HALF.HI = ((pos & 0xfc0) >> 2) + 8 + gRoomControls.origin_y; + object->x.HALF.HI = ((tilePos & 0x3f) << 4) + -0x10 + gRoomControls.origin_x; + object->y.HALF.HI = ((tilePos & 0xfc0) >> 2) + 8 + gRoomControls.origin_y; } - SetTileType(0xe5, pos, 1); + SetTileType(TILE_TYPE_229, tilePos, LAYER_BOTTOM); } else { - if (AreaIsDungeon() != 0) { - SetTileType(0xe5, pos, 1); + if (AreaIsDungeon()) { + SetTileType(TILE_TYPE_229, tilePos, LAYER_BOTTOM); } else { - SetTileType(0xe6, pos, 1); + SetTileType(TILE_TYPE_230, tilePos, LAYER_BOTTOM); } } - SetTileType(0xe8, pos - 0x41, 2); - SetTileType(0xe9, pos - 1, 2); - SetTileType(0xea, pos + 0x3f, 2); + SetTileType(TILE_TYPE_232, tilePos + TILE_POS(-1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_233, tilePos + TILE_POS(-1, 0), LAYER_TOP); + SetTileType(TILE_TYPE_234, tilePos + TILE_POS(-1, 1), LAYER_TOP); } else { - SetTileType(0xe5, pos, 2); - if (AreaIsDungeon() == 0) { + SetTileType(TILE_TYPE_229, tilePos, LAYER_TOP); + if (!AreaIsDungeon()) { return; } @@ -260,41 +259,41 @@ void sub_0805C3B4(u32 pos, u32 layer) { if (object == NULL) { return; } - object->x.HALF.HI = ((pos & 0x3f) << 4) + -0x10 + gRoomControls.origin_x; - object->y.HALF.HI = ((pos & 0xfc0) >> 2) + 8 + gRoomControls.origin_y; - object->collisionLayer = 2; + object->x.HALF.HI = ((tilePos & 0x3f) << 4) + -0x10 + gRoomControls.origin_x; + object->y.HALF.HI = ((tilePos & 0xfc0) >> 2) + 8 + gRoomControls.origin_y; + object->collisionLayer = LAYER_TOP; } } -void sub_0805C4E0(u32 pos, u32 layer) { +void BombableWallManager_DestroyWall4(u32 tilePos, u32 layer) { Entity* object; - SetTileType(0xc1, pos - 0x41, layer); - SetTileType(0xc2, pos - 0x40, layer); - SetTileType(0xc3, pos - 0x3f, layer); - SetTileType(0xc4, pos - 1, layer); - SetTileType(0xc7, pos + 1, layer); - if (layer == 1) { - if (AreaHasEnemies() != 0) { + SetTileType(TILE_TYPE_193, tilePos + TILE_POS(-1, -1), layer); + SetTileType(TILE_TYPE_194, tilePos + TILE_POS(0, -1), layer); + SetTileType(TILE_TYPE_195, tilePos + TILE_POS(1, -1), layer); + SetTileType(TILE_TYPE_196, tilePos + TILE_POS(-1, 0), layer); + SetTileType(TILE_TYPE_199, tilePos + TILE_POS(1, 0), layer); + if (layer == LAYER_BOTTOM) { + if (AreaHasEnemies()) { object = CreateObject(ARCHWAY, 0xe, 0); if (object != NULL) { - object->x.HALF.HI = ((pos & 0x3f) << 4) + 8 + gRoomControls.origin_x; - object->y.HALF.HI = ((pos & 0xfc0) >> 2) + -0x10 + gRoomControls.origin_y; + object->x.HALF.HI = ((tilePos & 0x3f) << 4) + 8 + gRoomControls.origin_x; + object->y.HALF.HI = ((tilePos & 0xfc0) >> 2) + -0x10 + gRoomControls.origin_y; } - SetTileType(0xc5, pos, 1); + SetTileType(TILE_TYPE_197, tilePos, LAYER_BOTTOM); } else { - if (AreaIsDungeon() != 0) { - SetTileType(0xc5, pos, 1); + if (AreaIsDungeon()) { + SetTileType(TILE_TYPE_197, tilePos, LAYER_BOTTOM); } else { - SetTileType(0xc6, pos, 1); + SetTileType(TILE_TYPE_198, tilePos, LAYER_BOTTOM); } } - SetTileType(0xc8, pos - 0x41, 2); - SetTileType(0xc9, pos - 0x40, 2); - SetTileType(0xca, pos - 0x3f, 2); + SetTileType(TILE_TYPE_200, tilePos + TILE_POS(-1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_201, tilePos + TILE_POS(0, -1), LAYER_TOP); + SetTileType(TILE_TYPE_202, tilePos + TILE_POS(1, -1), LAYER_TOP); } else { - SetTileType(0xc5, pos, 2); - if (AreaIsDungeon() == 0) { + SetTileType(TILE_TYPE_197, tilePos, LAYER_TOP); + if (!AreaIsDungeon()) { return; } @@ -302,9 +301,9 @@ void sub_0805C4E0(u32 pos, u32 layer) { if (object == NULL) { return; } - object->x.HALF.HI = ((pos & 0x3f) << 4) + 8 + gRoomControls.origin_x; - object->y.HALF.HI = ((pos & 0xfc0) >> 2) + -0x10 + gRoomControls.origin_y; - object->collisionLayer = 2; + object->x.HALF.HI = ((tilePos & 0x3f) << 4) + 8 + gRoomControls.origin_x; + object->y.HALF.HI = ((tilePos & 0xfc0) >> 2) + -0x10 + gRoomControls.origin_y; + object->collisionLayer = LAYER_TOP; } } diff --git a/src/manager/destructibleTileObserveManager.c b/src/manager/destructibleTileObserveManager.c index 81a8ef05..89a0ac36 100644 --- a/src/manager/destructibleTileObserveManager.c +++ b/src/manager/destructibleTileObserveManager.c @@ -29,7 +29,7 @@ void DestructibleTileObserveManager_Main(DestructibleTileObserveManager* this) { void sub_0805CFF0(DestructibleTileObserveManager_unk* param_1) { if (!CheckLocalFlag(param_1->flag)) { - u32 tileType = GetTileType(param_1->tilePos, param_1->tileLayer); + u32 tileType = GetTileTypeAtTilePos(param_1->tilePos, param_1->tileLayer); if (param_1->tileType == tileType) { SetLocalFlag(param_1->flag); } diff --git a/src/manager/diggingCaveEntranceManager.c b/src/manager/diggingCaveEntranceManager.c index 8698db9e..ce428a2b 100644 --- a/src/manager/diggingCaveEntranceManager.c +++ b/src/manager/diggingCaveEntranceManager.c @@ -11,6 +11,7 @@ #include "player.h" #include "room.h" #include "scroll.h" +#include "tiles.h" void DiggingCaveEntranceManager_Main(DiggingCaveEntranceManager*); void DiggingCaveEntranceManager_Init(DiggingCaveEntranceManager*); @@ -31,7 +32,7 @@ void DiggingCaveEntranceManager_Init(DiggingCaveEntranceManager* this) { const DiggingCaveEntrance* entrance; u8 room; u8 area; - u16 tile = 0x81 << 7; + u16 tileIndex = SPECIAL_TILE_128; UpdateIsDiggingCave(); if (gDiggingCaveEntranceTransition.isDiggingCave) { if (gDiggingCaveEntranceTransition.entrance == NULL) { @@ -50,12 +51,12 @@ void DiggingCaveEntranceManager_Init(DiggingCaveEntranceManager* this) { } room = gRoomControls.room; entrance = diggingCaveEntrances[gRoomControls.area]; - tile = 0x81 << 7; // 0x4080 + tileIndex = SPECIAL_TILE_128; for (entrance = GetDiggingCaveEntranceForRoom(entrance, room); entrance != 0; entrance = GetDiggingCaveEntranceForRoom(entrance, room)) { - SetBottomTile(tile, entrance->sourceTilePosition + TILE_POS(-1, 1), 1); - SetBottomTile(tile, entrance->sourceTilePosition + TILE_POS(0, 1), 1); - SetBottomTile(tile, entrance->sourceTilePosition + TILE_POS(1, 1), 1); + SetTile(tileIndex, entrance->sourceTilePos + TILE_POS(-1, 1), LAYER_BOTTOM); + SetTile(tileIndex, entrance->sourceTilePos + TILE_POS(0, 1), LAYER_BOTTOM); + SetTile(tileIndex, entrance->sourceTilePos + TILE_POS(1, 1), LAYER_BOTTOM); entrance++; } } @@ -79,8 +80,8 @@ bool32 DiggingCaveEntranceManager_CheckEnterEntrance(DiggingCaveEntranceManager* if (gDiggingCaveEntranceTransition.isDiggingCave) { offsetX = gPlayerEntity.base.x.HALF.HI - gRoomControls.origin_x; offsetY = gPlayerEntity.base.y.HALF.HI - gRoomControls.origin_y; - offsetX2 = (entr->sourceTilePosition & TILE_POS_X_COMPONENT) * 16 + 8; - offsetY2 = ((entr->sourceTilePosition & TILE_POS_Y_COMPONENT) >> 6) * 16 + 0x18; + offsetX2 = (entr->sourceTilePos & TILE_POS_X_COMPONENT) * 16 + 8; + offsetY2 = ((entr->sourceTilePos & TILE_POS_Y_COMPONENT) >> 6) * 16 + 0x18; tmp = offsetX - offsetX2; if (tmp + 0x18 > 0x30 || offsetY - offsetY2 + 8 > 0x10U) return FALSE; @@ -89,9 +90,9 @@ bool32 DiggingCaveEntranceManager_CheckEnterEntrance(DiggingCaveEntranceManager* DiggingCaveEntranceManager_EnterEntrance(this, entr); return TRUE; } else { - if (COORD_TO_TILE(&gPlayerEntity.base) != entr->sourceTilePosition) + if (COORD_TO_TILE(&gPlayerEntity.base) != entr->sourceTilePos) return FALSE; - offsetY2 = gRoomControls.origin_y + ((entr->sourceTilePosition >> 6) << 4) + 6; + offsetY2 = gRoomControls.origin_y + ((entr->sourceTilePos >> 6) << 4) + 6; if (gPlayerEntity.base.y.HALF.HI >= offsetY2) return FALSE; DiggingCaveEntranceManager_EnterEntrance(this, entr); @@ -109,10 +110,10 @@ void DiggingCaveEntranceManager_EnterEntrance(DiggingCaveEntranceManager* this, gRoomControls.area = entr->targetArea; gRoomControls.room = entr->targetRoom; gDiggingCaveEntranceTransition.entrance = entr; - gDiggingCaveEntranceTransition.offsetX = gPlayerEntity.base.x.HALF.HI - gRoomControls.origin_x - - ((entr->sourceTilePosition & TILE_POS_X_COMPONENT) * 16); - gDiggingCaveEntranceTransition.offsetY = gPlayerEntity.base.y.HALF.HI - gRoomControls.origin_y - - ((entr->sourceTilePosition & TILE_POS_Y_COMPONENT) >> 2); + gDiggingCaveEntranceTransition.offsetX = + gPlayerEntity.base.x.HALF.HI - gRoomControls.origin_x - ((entr->sourceTilePos & TILE_POS_X_COMPONENT) * 16); + gDiggingCaveEntranceTransition.offsetY = + gPlayerEntity.base.y.HALF.HI - gRoomControls.origin_y - ((entr->sourceTilePos & TILE_POS_Y_COMPONENT) >> 2); #ifndef EU isDiggingCave = gDiggingCaveEntranceTransition.isDiggingCave; @@ -129,7 +130,7 @@ void DiggingCaveEntranceManager_EnterEntrance(DiggingCaveEntranceManager* this, } const DiggingCaveEntrance* GetDiggingCaveEntranceForRoom(const DiggingCaveEntrance* entr, int room) { - for (; entr->sourceTilePosition != 0xffff; entr++) { + for (; entr->sourceTilePos != 0xffff; entr++) { if (entr->sourceRoom == room) return entr; } @@ -141,85 +142,94 @@ const DiggingCaveEntrance* GetDiggingCaveEntranceForRoom(const DiggingCaveEntran static const DiggingCaveEntrance diggingCaveEntrancesEmpty[] = { END_OF_LIST }; static const DiggingCaveEntrance diggingCaveEntrancesMinishWoods[] = { - { TILE_POS(37, 19), ROOM_MINISH_WOODS_MAIN, 0x0, AREA_LAKE_WOODS_CAVE, ROOM_LAKE_WOODS_CAVE_MAIN, + { TILE_POS(37, 19), ROOM_MINISH_WOODS_MAIN, CAVE_LAKE_WOODS_ENTER, AREA_LAKE_WOODS_CAVE, ROOM_LAKE_WOODS_CAVE_MAIN, TILE_POS(37, 51) }, - { TILE_POS(31, 15), ROOM_MINISH_WOODS_MAIN, 0x0, AREA_LAKE_WOODS_CAVE, ROOM_LAKE_WOODS_CAVE_MAIN, + { TILE_POS(31, 15), ROOM_MINISH_WOODS_MAIN, CAVE_LAKE_WOODS_ENTER, AREA_LAKE_WOODS_CAVE, ROOM_LAKE_WOODS_CAVE_MAIN, TILE_POS(31, 47) }, END_OF_LIST }; static const DiggingCaveEntrance diggingCaveEntrancesHyruleField[] = { - { TILE_POS(3, 11), ROOM_HYRULE_FIELD_EASTERN_HILLLS_NORTH, 0x4, AREA_DIG_CAVES, ROOM_DIG_CAVES_EASTERN_HILLS, - TILE_POS(3, 11) }, - { TILE_POS(35, 5), ROOM_HYRULE_FIELD_LON_LON_RANCH, 0x10, AREA_HYLIA_DIG_CAVES, ROOM_HYLIA_DIG_CAVES_1, - TILE_POS(8, 17) }, - { TILE_POS(5, 14), ROOM_HYRULE_FIELD_TRILBY_HIGHLANDS, 0xa, AREA_DIG_CAVES, ROOM_DIG_CAVES_TRILBY_HIGHLANDS, - TILE_POS(5, 14) }, - { TILE_POS(16, 14), ROOM_HYRULE_FIELD_TRILBY_HIGHLANDS, 0xa, AREA_DIG_CAVES, ROOM_DIG_CAVES_TRILBY_HIGHLANDS, - TILE_POS(16, 14) }, + { TILE_POS(3, 11), ROOM_HYRULE_FIELD_EASTERN_HILLS_NORTH, CAVE_EASTERN_HILL_ENTER, AREA_DIG_CAVES, + ROOM_DIG_CAVES_EASTERN_HILLS, TILE_POS(3, 11) }, + { TILE_POS(35, 5), ROOM_HYRULE_FIELD_LON_LON_RANCH, CAVE_LON_LON_RANCH_ENTER, AREA_HYLIA_DIG_CAVES, + ROOM_HYLIA_DIG_CAVES_1, TILE_POS(8, 17) }, + { TILE_POS(5, 14), ROOM_HYRULE_FIELD_TRILBY_HIGHLANDS, CAVE_TRILBY_HIGHLANDS_ENTER, AREA_DIG_CAVES, + ROOM_DIG_CAVES_TRILBY_HIGHLANDS, TILE_POS(5, 14) }, + { TILE_POS(16, 14), ROOM_HYRULE_FIELD_TRILBY_HIGHLANDS, CAVE_TRILBY_HIGHLANDS_ENTER, AREA_DIG_CAVES, + ROOM_DIG_CAVES_TRILBY_HIGHLANDS, TILE_POS(16, 14) }, END_OF_LIST }; -static const DiggingCaveEntrance diggingCaveEntrancesHyruleTown[] = { { TILE_POS(45, 24), ROOM_HYRULE_TOWN_MAIN, 0x2, - AREA_HYRULE_DIG_CAVES, +static const DiggingCaveEntrance diggingCaveEntrancesHyruleTown[] = { { TILE_POS(45, 24), ROOM_HYRULE_TOWN_MAIN, + CAVE_HYRULE_TOWN_ENTER, AREA_HYRULE_DIG_CAVES, ROOM_HYRULE_DIG_CAVES_TOWN, TILE_POS(45, 40) }, END_OF_LIST }; -static const DiggingCaveEntrance diggingCaveEntrancesMtCrenel[] = { - { TILE_POS(3, 5), ROOM_MT_CRENEL_WALL_CLIMB, 0x6, AREA_CRENEL_DIG_CAVE, ROOM_CRENEL_DIG_CAVE_0, TILE_POS(3, 25) }, - END_OF_LIST -}; +static const DiggingCaveEntrance diggingCaveEntrancesMtCrenel[] = { { TILE_POS(3, 5), ROOM_MT_CRENEL_WALL_CLIMB, + CAVE_CRENEL_ENTER, AREA_CRENEL_DIG_CAVE, + ROOM_CRENEL_DIG_CAVE_0, TILE_POS(3, 25) }, + END_OF_LIST }; static const DiggingCaveEntrance diggingCaveEntrancesVeilFalls[] = { - { TILE_POS(26, 37), ROOM_VEIL_FALLS_MAIN, 0x8, AREA_VEIL_FALLS_DIG_CAVE, ROOM_VEIL_FALLS_DIG_CAVE_0, - TILE_POS(26, 37) }, - { TILE_POS(14, 39), ROOM_VEIL_FALLS_MAIN, 0x8, AREA_VEIL_FALLS_DIG_CAVE, ROOM_VEIL_FALLS_DIG_CAVE_0, - TILE_POS(14, 39) }, + { TILE_POS(26, 37), ROOM_VEIL_FALLS_MAIN, CAVE_VEIL_FALLS_ENTER, AREA_VEIL_FALLS_DIG_CAVE, + ROOM_VEIL_FALLS_DIG_CAVE_0, TILE_POS(26, 37) }, + { TILE_POS(14, 39), ROOM_VEIL_FALLS_MAIN, CAVE_VEIL_FALLS_ENTER, AREA_VEIL_FALLS_DIG_CAVE, + ROOM_VEIL_FALLS_DIG_CAVE_0, TILE_POS(14, 39) }, END_OF_LIST }; static const DiggingCaveEntrance diggingCaveEntrancesCastorWilds[] = { - { TILE_POS(48, 25), ROOM_CASTOR_WILDS_MAIN, 0xc, AREA_CASTOR_WILDS_DIG_CAVE, ROOM_CASTOR_WILDS_DIG_CAVE_0, - TILE_POS(48, 25) }, + { TILE_POS(48, 25), ROOM_CASTOR_WILDS_MAIN, CAVE_CASTOR_WILDS_ENTER, AREA_CASTOR_WILDS_DIG_CAVE, + ROOM_CASTOR_WILDS_DIG_CAVE_0, TILE_POS(48, 25) }, END_OF_LIST }; static const DiggingCaveEntrance diggingCaveEntrancesLakeHylia[] = { - { TILE_POS(30, 5), ROOM_LAKE_HYLIA_MAIN, 0xe, AREA_HYLIA_DIG_CAVES, ROOM_HYLIA_DIG_CAVES_1, TILE_POS(46, 17) }, - { TILE_POS(30, 30), ROOM_LAKE_HYLIA_MAIN, 0x12, AREA_HYLIA_DIG_CAVES, ROOM_HYLIA_DIG_CAVES_0, TILE_POS(8, 9) }, + { TILE_POS(30, 5), ROOM_LAKE_HYLIA_MAIN, CAVE_LAKE_HYLIA_NORTH_ENTER, AREA_HYLIA_DIG_CAVES, ROOM_HYLIA_DIG_CAVES_1, + TILE_POS(46, 17) }, + { TILE_POS(30, 30), ROOM_LAKE_HYLIA_MAIN, CAVE_LAKE_HYLIA_CENTER_ENTER, AREA_HYLIA_DIG_CAVES, + ROOM_HYLIA_DIG_CAVES_0, TILE_POS(8, 9) }, END_OF_LIST }; static const DiggingCaveEntrance diggingCaveEntrancesLakeWoodsCave[] = { - { TILE_POS(37, 51), ROOM_LAKE_WOODS_CAVE_MAIN, 0x1, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, TILE_POS(37, 19) }, - { TILE_POS(31, 47), ROOM_LAKE_WOODS_CAVE_MAIN, 0x1, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, TILE_POS(31, 15) }, + { TILE_POS(37, 51), ROOM_LAKE_WOODS_CAVE_MAIN, CAVE_LAKE_WOODS_LEAVE, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, + TILE_POS(37, 19) }, + { TILE_POS(31, 47), ROOM_LAKE_WOODS_CAVE_MAIN, CAVE_LAKE_WOODS_LEAVE, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, + TILE_POS(31, 15) }, END_OF_LIST }; static const DiggingCaveEntrance diggingCaveEntrancesHyruleDigCaves[] = { - { TILE_POS(45, 40), ROOM_HYRULE_DIG_CAVES_TOWN, 0x3, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, TILE_POS(45, 24) }, + { TILE_POS(45, 40), ROOM_HYRULE_DIG_CAVES_TOWN, CAVE_HYRULE_TOWN_LEAVE, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, + TILE_POS(45, 24) }, END_OF_LIST }; static const DiggingCaveEntrance diggingCaveEntrancesAreaDigCaves[] = { - { TILE_POS(3, 11), ROOM_DIG_CAVES_EASTERN_HILLS, 0x5, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_EASTERN_HILLLS_NORTH, - TILE_POS(3, 11) }, - { TILE_POS(5, 14), ROOM_DIG_CAVES_TRILBY_HIGHLANDS, 0xb, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_TRILBY_HIGHLANDS, - TILE_POS(5, 14) }, - { TILE_POS(16, 14), ROOM_DIG_CAVES_TRILBY_HIGHLANDS, 0xb, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_TRILBY_HIGHLANDS, - TILE_POS(16, 14) }, - END_OF_LIST -}; -static const DiggingCaveEntrance diggingCaveEntrancesCrenelDigCave[] = { - { TILE_POS(3, 25), ROOM_CRENEL_DIG_CAVE_0, 0x7, AREA_MT_CRENEL, ROOM_MT_CRENEL_WALL_CLIMB, TILE_POS(3, 5) }, + { TILE_POS(3, 11), ROOM_DIG_CAVES_EASTERN_HILLS, CAVE_EASTERN_HILL_LEAVE, AREA_HYRULE_FIELD, + ROOM_HYRULE_FIELD_EASTERN_HILLS_NORTH, TILE_POS(3, 11) }, + { TILE_POS(5, 14), ROOM_DIG_CAVES_TRILBY_HIGHLANDS, CAVE_TRILBY_HIGHLANDS_LEAVE, AREA_HYRULE_FIELD, + ROOM_HYRULE_FIELD_TRILBY_HIGHLANDS, TILE_POS(5, 14) }, + { TILE_POS(16, 14), ROOM_DIG_CAVES_TRILBY_HIGHLANDS, CAVE_TRILBY_HIGHLANDS_LEAVE, AREA_HYRULE_FIELD, + ROOM_HYRULE_FIELD_TRILBY_HIGHLANDS, TILE_POS(16, 14) }, END_OF_LIST }; +static const DiggingCaveEntrance diggingCaveEntrancesCrenelDigCave[] = { { TILE_POS(3, 25), ROOM_CRENEL_DIG_CAVE_0, + CAVE_CRENEL_LEAVE, AREA_MT_CRENEL, + ROOM_MT_CRENEL_WALL_CLIMB, TILE_POS(3, 5) }, + END_OF_LIST }; static const DiggingCaveEntrance diggingCaveEntrancesVeilFallsDigCave[] = { - { TILE_POS(26, 37), ROOM_VEIL_FALLS_DIG_CAVE_0, 0x9, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, TILE_POS(26, 37) }, - { TILE_POS(14, 39), ROOM_VEIL_FALLS_DIG_CAVE_0, 0x9, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, TILE_POS(14, 39) }, + { TILE_POS(26, 37), ROOM_VEIL_FALLS_DIG_CAVE_0, CAVE_VEIL_FALLS_LEAVE, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, + TILE_POS(26, 37) }, + { TILE_POS(14, 39), ROOM_VEIL_FALLS_DIG_CAVE_0, CAVE_VEIL_FALLS_LEAVE, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, + TILE_POS(14, 39) }, END_OF_LIST }; static const DiggingCaveEntrance diggingCaveEntrancesCastorWildsDigCave[] = { - { TILE_POS(48, 25), ROOM_CASTOR_WILDS_DIG_CAVE_0, 0xd, AREA_CASTOR_WILDS, ROOM_CASTOR_WILDS_MAIN, - TILE_POS(48, 25) }, + { TILE_POS(48, 25), ROOM_CASTOR_WILDS_DIG_CAVE_0, CAVE_CASTOR_WILDS_LEAVE, AREA_CASTOR_WILDS, + ROOM_CASTOR_WILDS_MAIN, TILE_POS(48, 25) }, END_OF_LIST }; static const DiggingCaveEntrance diggingCaveEntrancesHyliaDigCaves[] = { - { TILE_POS(46, 17), ROOM_HYLIA_DIG_CAVES_1, 0xf, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, TILE_POS(30, 5) }, - { TILE_POS(8, 17), ROOM_HYLIA_DIG_CAVES_1, 0x11, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_LON_LON_RANCH, - TILE_POS(35, 5) }, - { TILE_POS(8, 9), ROOM_HYLIA_DIG_CAVES_0, 0x13, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, TILE_POS(30, 30) }, + { TILE_POS(46, 17), ROOM_HYLIA_DIG_CAVES_1, CAVE_LAKE_HYLIA_NORTH_LEAVE, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, + TILE_POS(30, 5) }, + { TILE_POS(8, 17), ROOM_HYLIA_DIG_CAVES_1, CAVE_LON_LON_RANCH_LEAVE, AREA_HYRULE_FIELD, + ROOM_HYRULE_FIELD_LON_LON_RANCH, TILE_POS(35, 5) }, + { TILE_POS(8, 9), ROOM_HYLIA_DIG_CAVES_0, CAVE_LAKE_HYLIA_CENTER_LEAVE, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, + TILE_POS(30, 30) }, END_OF_LIST }; diff --git a/src/manager/flameManager.c b/src/manager/flameManager.c index 46d2ad32..a363ebe0 100644 --- a/src/manager/flameManager.c +++ b/src/manager/flameManager.c @@ -10,23 +10,24 @@ #include "asm.h" #include "functions.h" #include "room.h" +#include "tiles.h" void FlameManager_Main(FlameManager* this) { if (super->action == 0) { - this->field_0x38 = TILE(this->field_0x38, this->field_0x3a); - if (GetTileType(this->field_0x38, 2) == 0x75) { + this->x = TILE(this->x, this->y); + if (GetTileTypeAtTilePos(this->x, LAYER_TOP) == TILE_TYPE_117) { super->action = 1; - SetBottomTile(0x406a, this->field_0x38, 1); + SetTile(SPECIAL_TILE_106, this->x, LAYER_BOTTOM); } else { DeleteThisEntity(); } } - if (GetTileType(this->field_0x38, 1) == 0x406b) { - sub_0807B7D8(0x76, this->field_0x38, 2); + if (GetTileTypeAtTilePos(this->x, LAYER_BOTTOM) == SPECIAL_TILE_107) { + sub_0807B7D8(TILE_TYPE_118, this->x, LAYER_TOP); DeleteThisEntity(); } - if (GetTileType(this->field_0x38, 2) == 0x76) { - SetBottomTile(0x406b, this->field_0x38, 1); + if (GetTileTypeAtTilePos(this->x, LAYER_TOP) == TILE_TYPE_118) { + SetTile(SPECIAL_TILE_107, this->x, LAYER_BOTTOM); DeleteThisEntity(); } } diff --git a/src/manager/holeManager.c b/src/manager/holeManager.c index ea7ce0ad..c83ed3ea 100644 --- a/src/manager/holeManager.c +++ b/src/manager/holeManager.c @@ -14,8 +14,6 @@ extern void (*const HoleManager_Actions[])(HoleManager*); -extern u8 gGlobalGfxAndPalettes[]; - void HoleManager_Main(HoleManager* this) { HoleManager_Actions[super->action](this); } diff --git a/src/manager/horizontalMinishPathBackgroundManager.c b/src/manager/horizontalMinishPathBackgroundManager.c index a407e50e..5d5d1ae7 100644 --- a/src/manager/horizontalMinishPathBackgroundManager.c +++ b/src/manager/horizontalMinishPathBackgroundManager.c @@ -42,7 +42,7 @@ void sub_08057F20(HorizontalMinishPathBackgroundManager* this) { tmp = tmp + (tmp >> 3) + ((0x400 - gRoomControls.width) / 2); gScreen.bg3.xOffset = tmp & 0xF; gScreen.bg3.yOffset = 0x30 - ((0x30 - (gRoomControls.scroll_y - gRoomControls.origin_y)) >> 2); - gScreen.bg3.tilemap = gBG3Buffer; + gScreen.bg3.subTileMap = gBG3Buffer; sub_08058004(tmp, gUnk_02006F00, gBG3Buffer); tmp = ((tmp >> 4) << 1); if (this->unk_38 != tmp) { @@ -53,7 +53,7 @@ void sub_08057F20(HorizontalMinishPathBackgroundManager* this) { tmp = tmp + (tmp >> 2) + ((0x400 - gRoomControls.width) / 2); gScreen.bg1.xOffset = tmp & 0xF; gScreen.bg1.yOffset = 0x30 - ((0x30 - (gRoomControls.scroll_y - gRoomControls.origin_y)) >> 1); - gScreen.bg1.tilemap = gBG3Buffer + 0x400; + gScreen.bg1.subTileMap = gBG3Buffer + 0x400; sub_08058004(tmp, gUnk_02006F00 + 0x2000, gBG3Buffer + 0x400); tmp = ((tmp >> 4) << 1); if (this->unk_3c != tmp) { @@ -111,7 +111,7 @@ void sub_080580B0(u32 unk1) { gScreen.bg3.xOffset = tmp & 0xF; gScreen.bg3.yOffset = 0x30 - ((0x30 - (gRoomControls.scroll_y - gRoomControls.origin_y)) >> 1); //? gScreen.bg3.control = 0x1D09; - gScreen.bg3.tilemap = gBG3Buffer; + gScreen.bg3.subTileMap = gBG3Buffer; gScreen.bg3.updated = 1; tmp = gRoomControls.scroll_x - gRoomControls.origin_x; tmp = tmp + (tmp >> 2) + (0x400 - gRoomControls.width) / 2; @@ -119,7 +119,7 @@ void sub_080580B0(u32 unk1) { gScreen.bg1.xOffset = tmp & 0xF; gScreen.bg1.yOffset = 0x30 - ((0x30 - (gRoomControls.scroll_y - gRoomControls.origin_y)) >> 1); //? gScreen.bg1.control = 0x1E09; - gScreen.bg1.tilemap = gBG3Buffer + 0x400; + gScreen.bg1.subTileMap = gBG3Buffer + 0x400; gScreen.bg1.updated = 1; gScreen.controls.layerFXControl = 0x3C48; gScreen.controls.alphaBlend = 0x609; diff --git a/src/manager/hyruleTownTilesetManager.c b/src/manager/hyruleTownTileSetManager.c similarity index 80% rename from src/manager/hyruleTownTilesetManager.c rename to src/manager/hyruleTownTileSetManager.c index b3ce85a5..118d2f14 100644 --- a/src/manager/hyruleTownTilesetManager.c +++ b/src/manager/hyruleTownTileSetManager.c @@ -1,19 +1,20 @@ /** - * @file hyruleTownTilesetManager.c + * @file hyruleTownTileSetManager.c * @ingroup Managers * - * @brief Swap tileset data in hyrule town depending on the position. + * @brief Swap tileSet data in hyrule town depending on the position. */ -#include "manager/hyruleTownTilesetManager.h" +#include "manager/hyruleTownTileSetManager.h" #include "area.h" #include "asm.h" #include "flags.h" #include "functions.h" #include "main.h" #include "room.h" +#include "tiles.h" -void sub_08059A58(HyruleTownTilesetManager*); -void sub_08059A2C(HyruleTownTilesetManager*); +void sub_08059A58(HyruleTownTileSetManager*); +void sub_08059A2C(HyruleTownTileSetManager*); static const u16 gUnk_08108398[] = { 0x0, 0x0, 0x0, 0x3f0, 0x200, 0x1, 0x0, 0x280, 0x3f0, 0x140, 0xff }; static const u16 gUnk_081083AE[] = { 0x2, 0x0, 0x0, 0x180, 0x3c0, 0x3, 0x280, 0x0, 0x170, 0x3c0, 0xff }; @@ -24,7 +25,7 @@ static const u16 gUnk_081083F2[] = { 0x5, 0x0, 0x1b0, 0x190, 0x140, 0x4, 0x0, 0x void sub_08059CC0(u32, u32); void sub_08059B18(void); -bool32 sub_08059C8C(HyruleTownTilesetManager*, u32, u8*, const u16*); +bool32 sub_08059C8C(HyruleTownTileSetManager*, u32, u8*, const u16*); extern u32 gUnk_086E8460; @@ -59,7 +60,7 @@ static const Unknown gUnk_08108468[] = { }; extern const u8 gGlobalGfxAndPalettes[]; -void HyruleTownTilesetManager_Main(HyruleTownTilesetManager* this) { +void HyruleTownTileSetManager_Main(HyruleTownTileSetManager* this) { if (super->action == 0) { super->action = 1; this->field_0x22 = 0xff; @@ -71,7 +72,7 @@ void HyruleTownTilesetManager_Main(HyruleTownTilesetManager* this) { sub_08059A58(this); } -void sub_08059A2C(HyruleTownTilesetManager* this) { +void sub_08059A2C(HyruleTownTileSetManager* this) { gRoomVars.graphicsGroups[2] = 0xff; gRoomVars.graphicsGroups[1] = 0xff; gRoomVars.graphicsGroups[0] = 0xff; @@ -81,7 +82,7 @@ void sub_08059A2C(HyruleTownTilesetManager* this) { sub_08059A58(this); } -void sub_08059A58(HyruleTownTilesetManager* this) { +void sub_08059A58(HyruleTownTileSetManager* this) { if (gRoomControls.area != AREA_FESTIVAL_TOWN) { if (sub_08059C8C(this, 0, &this->field_0x20, gUnk_08108398) != 0) { sub_08059CC0(0, (u32)this->field_0x20); @@ -113,37 +114,37 @@ void sub_08059B18(void) { if (CheckGlobalFlag(TATEKAKE_HOUSE) != 0) { for (loopVar = 0; loopVar < 4; ++loopVar) { for (innerLoopVar = 0; innerLoopVar < 4; ++innerLoopVar) { - sub_0807B9B8(loopVar * 0x10 + 0x4ab + innerLoopVar, COMMON(0x28 + 0x10 * innerLoopVar, loopVar * 0x10), - 1); + SetTileByIndex(loopVar * 0x10 + TILE_TYPE_1195 + innerLoopVar, + COMMON(0x28 + 0x10 * innerLoopVar, loopVar * 0x10), 1); } } for (loopVar = 0; loopVar < 3; ++loopVar) { for (innerLoopVar = 0; innerLoopVar < 4; ++innerLoopVar) { - sub_0807B9B8(loopVar * 0x10 + 0x440 + innerLoopVar, COMMON(0x28 + 0x10 * innerLoopVar, loopVar * 0x10), - 2); + SetTileByIndex(loopVar * 0x10 + TILE_TYPE_1088 + innerLoopVar, + COMMON(0x28 + 0x10 * innerLoopVar, loopVar * 0x10), 2); } } - sub_0807B9B8(0xd6, 0x5c2, 2); - sub_0807B9B8(0xd7, 0x5c3, 2); + SetTileByIndex(TILE_TYPE_214, TILE_POS(2, 23), LAYER_TOP); + SetTileByIndex(TILE_TYPE_215, TILE_POS(3, 23), LAYER_TOP); LoadResourceAsync(&gUnk_086E8460, 0x6001800, 0x800); } else { if (CheckGlobalFlag(TATEKAKE_TOCHU) != 0) { for (loopVar = 0; loopVar < 5; ++loopVar) { for (innerLoopVar = 0; innerLoopVar < 4; ++innerLoopVar) { - sub_0807B9B8(loopVar * 0x10 + 0x4a6 + innerLoopVar, - COMMON(0x28 + 0x10 * innerLoopVar, loopVar * 0x10), 1); + SetTileByIndex(loopVar * 0x10 + TILE_TYPE_1190 + innerLoopVar, + COMMON(0x28 + 0x10 * innerLoopVar, loopVar * 0x10), 1); } } - sub_0807B9B8(0x444, 0x602, 2); - sub_0807B9B8(0x445, 0x605, 2); - sub_0807B9B8(0x454, 0x642, 2); - sub_0807B9B8(0x455, 0x645, 2); + SetTileByIndex(TILE_TYPE_1092, TILE_POS(2, 24), LAYER_TOP); + SetTileByIndex(TILE_TYPE_1093, TILE_POS(5, 24), LAYER_TOP); + SetTileByIndex(TILE_TYPE_1108, TILE_POS(2, 25), LAYER_TOP); + SetTileByIndex(TILE_TYPE_1109, TILE_POS(5, 25), LAYER_TOP); } } } -bool32 sub_08059C8C(HyruleTownTilesetManager* this, u32 param_2, u8* param_3, const u16* param_4) { +bool32 sub_08059C8C(HyruleTownTileSetManager* this, u32 param_2, u8* param_3, const u16* param_4) { bool32 bVar2; *param_3 = CheckRegionsOnScreen(param_4); diff --git a/src/manager/lightLevelSetManager.c b/src/manager/lightLevelSetManager.c index c111e3f7..26350020 100644 --- a/src/manager/lightLevelSetManager.c +++ b/src/manager/lightLevelSetManager.c @@ -10,6 +10,7 @@ #include "game.h" #include "object.h" #include "room.h" +#include "tiles.h" void sub_0805BE94(LightLevelSetManager*); void sub_0805BEC4(LightLevelSetManager*); @@ -17,7 +18,7 @@ void LightLevelSetManager_Type0(LightLevelSetManager*); void LightLevelSetManager_Type1(LightLevelSetManager*); void LightLevelSetManager_Type2(LightLevelSetManager*); void LightLevelSetManager_Type3(LightLevelSetManager*); -void sub_0805BE70(LightLevelSetManager*, u32); +void sub_0805BE70(LightLevelSetManager* this, u32 tileType); void LightLevelSetManager_Main(Manager* this) { static void (*const LightLevelSetManager_Types[])(LightLevelSetManager*) = { @@ -49,7 +50,7 @@ void LightLevelSetManager_Type1(LightLevelSetManager* this) { super->action = 1; super->subtimer = 30; if (CheckFlags(this->field_0x3e) != 0) { - sub_0805BE70(this, 0x75); + sub_0805BE70(this, TILE_TYPE_117); super->action = 2; } break; @@ -57,13 +58,13 @@ void LightLevelSetManager_Type1(LightLevelSetManager* this) { if (CheckFlags(this->field_0x3e) != 0 && --super->subtimer == 0) { super->subtimer = 30; sub_0805BEC4(this); - sub_0805BE70(this, 0x76); + sub_0805BE70(this, TILE_TYPE_118); } break; case 2: if (CheckFlags(this->field_0x3e) == 0 && --super->subtimer == 0) { super->subtimer = 30; - sub_0805BE70(this, 0x75); + sub_0805BE70(this, TILE_TYPE_117); } break; } @@ -78,7 +79,7 @@ void LightLevelSetManager_Type2(LightLevelSetManager* this) { ((s16)this->field_0x38 >> 4 & 0x3fU) | ((s32)((this->field_0x3a << 0x10) >> 0x14 & 0x3fU) << 6); super->action = 1; } else { - if (GetTileType(this->field_0x20, super->type2) == 0x76) { + if (GetTileTypeAtTilePos(this->field_0x20, super->type2) == TILE_TYPE_118) { SetFlag(this->field_0x3e); ChangeLightLevel(super->timer); DeleteThisEntity(); @@ -102,7 +103,7 @@ void LightLevelSetManager_Type3(LightLevelSetManager* this) { break; case 1: - if (GetTileType(this->field_0x20, super->type2) != 0x76) { + if (GetTileTypeAtTilePos(this->field_0x20, super->type2) != TILE_TYPE_118) { return; } SetFlag(this->field_0x3e); @@ -130,14 +131,15 @@ void LightLevelSetManager_Type3(LightLevelSetManager* this) { } } -void sub_0805BE70(LightLevelSetManager* this, u32 param_2) { - SetTileType(param_2, +void sub_0805BE70(LightLevelSetManager* this, u32 tileType) { + SetTileType(tileType, ((this->field_0x38 << 0x10) >> 0x14 & 0x3fU) | ((this->field_0x3a << 0x10) >> 0x14 & 0x3fU) << 6, super->type2); } void sub_0805BE94(LightLevelSetManager* this) { - SetTileType(0x76, ((this->field_0x38 << 0x10) >> 0x14 & 0x3fU) | ((this->field_0x3a << 0x10) >> 0x14 & 0x3fU) << 6, + SetTileType(TILE_TYPE_118, + ((this->field_0x38 << 0x10) >> 0x14 & 0x3fU) | ((this->field_0x3a << 0x10) >> 0x14 & 0x3fU) << 6, super->type2); ChangeLightLevel(super->timer); DeleteThisEntity(); diff --git a/src/manager/lightRayManager.c b/src/manager/lightRayManager.c index 8a6a75b9..4a6c4227 100644 --- a/src/manager/lightRayManager.c +++ b/src/manager/lightRayManager.c @@ -215,9 +215,9 @@ void sub_08057450(LightRayManager* this) { y >>= 2; gScreen.bg3.yOffset = y & 0x3f; - gScreen.bg3.tilemap = &gBG3Buffer[(y / 0x40) << 8]; - if (this->unk_34 != gScreen.bg3.tilemap) { - this->unk_34 = gScreen.bg3.tilemap; + gScreen.bg3.subTileMap = &gBG3Buffer[(y / 0x40) << 8]; + if (this->unk_34 != gScreen.bg3.subTileMap) { + this->unk_34 = gScreen.bg3.subTileMap; gScreen.bg3.updated = 1; } diff --git a/src/manager/manager29.c b/src/manager/manager29.c index 55a5548f..133d3944 100644 --- a/src/manager/manager29.c +++ b/src/manager/manager29.c @@ -27,15 +27,15 @@ void Manager29_Main(Manager29* this) { } void sub_0805CBD0(Manager29* this) { - LayerStruct* layer; + MapLayer* mapLayer; super->action = 1; this->unk_38 = (this->unk_38 >> 4 & 0x3fU) | (((this->unk_3a << 0x10) >> 0x14 & 0x3fU) << 6); this->unk_3a = (this->unk_3c >> 4 & 0x3f) | (((this->unk_36 + this->unk_37 * 0x100) >> 4 & 0x3fU) << 6); - this->unk_3c = GetTileType(this->unk_38, this->unk_34); - layer = GetTileBuffer(this->unk_34); - this->unk_28 = (u16*)layer->metatileTypes; - this->unk_2c = &layer->mapData[(s16)this->unk_3a]; + this->unk_3c = GetTileTypeAtTilePos(this->unk_38, this->layer); + mapLayer = GetLayerByIndex(this->layer); + this->unk_28 = (u16*)mapLayer->tileTypes; + this->unk_2c = &mapLayer->mapData[(s16)this->unk_3a]; } void sub_0805CC3C(Manager29* this) { @@ -46,7 +46,7 @@ void sub_0805CC3C(Manager29* this) { iVar3 = this->unk_38; iVar2 = (short)this->unk_3a; - if (this->unk_34 == 1) { + if (this->layer == 1) { uVar4 = 0x321; } else { uVar4 = 0x322; @@ -54,74 +54,74 @@ void sub_0805CC3C(Manager29* this) { switch (super->type) { default: - sub_0807B7D8(uVar4, iVar3, this->unk_34); - sub_0807B7D8(0x365, iVar2, this->unk_34); + sub_0807B7D8(uVar4, iVar3, this->layer); + sub_0807B7D8(0x365, iVar2, this->layer); break; case 1: - sub_0807B7D8(uVar4, iVar3, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 1, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 0x40, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 0x41, this->unk_34); - sub_0807B7D8(this->unk_3c, iVar2, this->unk_34); - sub_0807B7D8(0x36f, iVar2 + 1, this->unk_34); - sub_0807B7D8(0x370, iVar2 + 0x40, this->unk_34); - sub_0807B7D8(0x371, iVar2 + 0x41, this->unk_34); + sub_0807B7D8(uVar4, iVar3, this->layer); + sub_0807B7D8(uVar4, iVar3 + 1, this->layer); + sub_0807B7D8(uVar4, iVar3 + 0x40, this->layer); + sub_0807B7D8(uVar4, iVar3 + 0x41, this->layer); + sub_0807B7D8(this->unk_3c, iVar2, this->layer); + sub_0807B7D8(0x36f, iVar2 + 1, this->layer); + sub_0807B7D8(0x370, iVar2 + 0x40, this->layer); + sub_0807B7D8(0x371, iVar2 + 0x41, this->layer); break; case 2: - sub_0807B7D8(uVar4, iVar3, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 1, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 2, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 0x40, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 0x41, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 0x42, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 0x80, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 0x81, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 0x82, this->unk_34); - sub_0807B7D8(this->unk_3c, iVar2, this->unk_34); - sub_0807B7D8(0x372, iVar2 + 1, this->unk_34); - sub_0807B7D8(0x36f, iVar2 + 2, this->unk_34); - sub_0807B7D8(0x374, iVar2 + 0x40, this->unk_34); - sub_0807B7D8(0x376, iVar2 + 0x41, this->unk_34); - sub_0807B7D8(0x375, iVar2 + 0x42, this->unk_34); - sub_0807B7D8(0x370, iVar2 + 0x80, this->unk_34); - sub_0807B7D8(0x373, iVar2 + 0x81, this->unk_34); - sub_0807B7D8(0x371, iVar2 + 0x82, this->unk_34); + sub_0807B7D8(uVar4, iVar3, this->layer); + sub_0807B7D8(uVar4, iVar3 + 1, this->layer); + sub_0807B7D8(uVar4, iVar3 + 2, this->layer); + sub_0807B7D8(uVar4, iVar3 + 0x40, this->layer); + sub_0807B7D8(uVar4, iVar3 + 0x41, this->layer); + sub_0807B7D8(uVar4, iVar3 + 0x42, this->layer); + sub_0807B7D8(uVar4, iVar3 + 0x80, this->layer); + sub_0807B7D8(uVar4, iVar3 + 0x81, this->layer); + sub_0807B7D8(uVar4, iVar3 + 0x82, this->layer); + sub_0807B7D8(this->unk_3c, iVar2, this->layer); + sub_0807B7D8(0x372, iVar2 + 1, this->layer); + sub_0807B7D8(0x36f, iVar2 + 2, this->layer); + sub_0807B7D8(0x374, iVar2 + 0x40, this->layer); + sub_0807B7D8(0x376, iVar2 + 0x41, this->layer); + sub_0807B7D8(0x375, iVar2 + 0x42, this->layer); + sub_0807B7D8(0x370, iVar2 + 0x80, this->layer); + sub_0807B7D8(0x373, iVar2 + 0x81, this->layer); + sub_0807B7D8(0x371, iVar2 + 0x82, this->layer); break; case 3: - sub_0807B7D8(uVar4, iVar3, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 1, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 2, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 3, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 0x40, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 0x41, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 0x42, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 0x43, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 0x80, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 0x81, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 0x82, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 0x83, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 0xc0, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 0xc1, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 0xc2, this->unk_34); - sub_0807B7D8(uVar4, iVar3 + 0xc3, this->unk_34); - sub_0807B7D8(this->unk_3c, iVar2, this->unk_34); - sub_0807B7D8(0x372, iVar2 + 1, this->unk_34); - sub_0807B7D8(0x372, iVar2 + 2, this->unk_34); - sub_0807B7D8(0x36f, iVar2 + 3, this->unk_34); - sub_0807B7D8(0x374, iVar2 + 0x40, this->unk_34); - sub_0807B7D8(0x376, iVar2 + 0x41, this->unk_34); - sub_0807B7D8(0x376, iVar2 + 0x42, this->unk_34); - sub_0807B7D8(0x375, iVar2 + 0x43, this->unk_34); - sub_0807B7D8(0x374, iVar2 + 0x80, this->unk_34); - sub_0807B7D8(0x376, iVar2 + 0x81, this->unk_34); - sub_0807B7D8(0x376, iVar2 + 0x82, this->unk_34); - sub_0807B7D8(0x375, iVar2 + 0x83, this->unk_34); - sub_0807B7D8(0x370, iVar2 + 0xc0, this->unk_34); - sub_0807B7D8(0x373, iVar2 + 0xc1, this->unk_34); - sub_0807B7D8(0x373, iVar2 + 0xc2, this->unk_34); - sub_0807B7D8(0x371, iVar2 + 0xc3, this->unk_34); + sub_0807B7D8(uVar4, iVar3, this->layer); + sub_0807B7D8(uVar4, iVar3 + 1, this->layer); + sub_0807B7D8(uVar4, iVar3 + 2, this->layer); + sub_0807B7D8(uVar4, iVar3 + 3, this->layer); + sub_0807B7D8(uVar4, iVar3 + 0x40, this->layer); + sub_0807B7D8(uVar4, iVar3 + 0x41, this->layer); + sub_0807B7D8(uVar4, iVar3 + 0x42, this->layer); + sub_0807B7D8(uVar4, iVar3 + 0x43, this->layer); + sub_0807B7D8(uVar4, iVar3 + 0x80, this->layer); + sub_0807B7D8(uVar4, iVar3 + 0x81, this->layer); + sub_0807B7D8(uVar4, iVar3 + 0x82, this->layer); + sub_0807B7D8(uVar4, iVar3 + 0x83, this->layer); + sub_0807B7D8(uVar4, iVar3 + 0xc0, this->layer); + sub_0807B7D8(uVar4, iVar3 + 0xc1, this->layer); + sub_0807B7D8(uVar4, iVar3 + 0xc2, this->layer); + sub_0807B7D8(uVar4, iVar3 + 0xc3, this->layer); + sub_0807B7D8(this->unk_3c, iVar2, this->layer); + sub_0807B7D8(0x372, iVar2 + 1, this->layer); + sub_0807B7D8(0x372, iVar2 + 2, this->layer); + sub_0807B7D8(0x36f, iVar2 + 3, this->layer); + sub_0807B7D8(0x374, iVar2 + 0x40, this->layer); + sub_0807B7D8(0x376, iVar2 + 0x41, this->layer); + sub_0807B7D8(0x376, iVar2 + 0x42, this->layer); + sub_0807B7D8(0x375, iVar2 + 0x43, this->layer); + sub_0807B7D8(0x374, iVar2 + 0x80, this->layer); + sub_0807B7D8(0x376, iVar2 + 0x81, this->layer); + sub_0807B7D8(0x376, iVar2 + 0x82, this->layer); + sub_0807B7D8(0x375, iVar2 + 0x83, this->layer); + sub_0807B7D8(0x370, iVar2 + 0xc0, this->layer); + sub_0807B7D8(0x373, iVar2 + 0xc1, this->layer); + sub_0807B7D8(0x373, iVar2 + 0xc2, this->layer); + sub_0807B7D8(0x371, iVar2 + 0xc3, this->layer); break; } } diff --git a/src/manager/minishPortalManager.c b/src/manager/minishPortalManager.c index 21855b00..2d13eb1e 100644 --- a/src/manager/minishPortalManager.c +++ b/src/manager/minishPortalManager.c @@ -13,8 +13,7 @@ #include "player.h" #include "room.h" #include "sound.h" - -extern u32 sub_080B1AC8(u16, u16, u8); +#include "tiles.h" bool32 PortalReadyForMinish(void); @@ -43,7 +42,7 @@ void MinishPortalManager_Main(MinishPortalManager* this) { gArea.portal_mode = 3; } } - if (sub_080B1AC8(this->unk_38, this->unk_3a, super->timer) == 0x3d) { + if (GetActTileAtRoomCoords(this->unk_38, this->unk_3a, super->timer) == ACT_TILE_61) { CreateMagicSparkles(this->unk_38 + gRoomControls.origin_x, this->unk_3a + gRoomControls.origin_y, super->timer); if (super->subtimer == 0) { diff --git a/src/manager/minishRaftersBackgroundManager.c b/src/manager/minishRaftersBackgroundManager.c index 8bc52447..f92470d6 100644 --- a/src/manager/minishRaftersBackgroundManager.c +++ b/src/manager/minishRaftersBackgroundManager.c @@ -87,7 +87,7 @@ void sub_08058324(u32 unk) { sub_080582D0(); sub_080582A0(sub_08058244(unk), gUnk_02006F00, gBG3Buffer); gScreen.bg1.control = 0x1D47; - gScreen.bg1.tilemap = gBG3Buffer; + gScreen.bg1.subTileMap = gBG3Buffer; gScreen.bg1.updated = 1; gScreen.lcd.displayControl |= 0x200; } diff --git a/src/manager/minishVillageTilesetManager.c b/src/manager/minishVillageTileSetManager.c similarity index 93% rename from src/manager/minishVillageTilesetManager.c rename to src/manager/minishVillageTileSetManager.c index 055e78b0..88671417 100644 --- a/src/manager/minishVillageTilesetManager.c +++ b/src/manager/minishVillageTileSetManager.c @@ -1,17 +1,17 @@ /** - * @file minishVillageTilesetManager.c + * @file minishVillageTileSetManager.c * @ingroup Managers * - * @brief Swap tileset data in minish village depending on the position + * @brief Swap tileSet data in minish village depending on the position */ -#include "manager/minishVillageTilesetManager.h" +#include "manager/minishVillageTileSetManager.h" #include "asm.h" #include "common.h" #include "functions.h" #include "main.h" void sub_08057E30(void*); -bool32 sub_08057E40(MinishVillageTilesetManager*); +bool32 sub_08057E40(MinishVillageTileSetManager*); void sub_08057E7C(u32); extern const u8 gGlobalGfxAndPalettes[]; @@ -54,7 +54,7 @@ const u32 gUnk_081080A4[0x50] = { const u8 gUnk_081081E4[] = { 0x16, 0x17, 0x17, 0x18, 0x18 }; #ifdef EU -void MinishVillageTilesetManager_Main(MinishVillageTilesetManager* this) { +void MinishVillageTileSetManager_Main(MinishVillageTileSetManager* this) { u32 tmp; const u32* tmp2; s32 tmp3; @@ -103,7 +103,7 @@ void MinishVillageTilesetManager_Main(MinishVillageTilesetManager* this) { } } #else -void MinishVillageTilesetManager_Main(MinishVillageTilesetManager* this) { +void MinishVillageTileSetManager_Main(MinishVillageTileSetManager* this) { u32 tmp; const u32* tmp2; if (super->action == 0) { @@ -156,7 +156,7 @@ void sub_08057E30(void* this) { sub_08057E7C(gRoomVars.graphicsGroups[0]); } -bool32 sub_08057E40(MinishVillageTilesetManager* this) { +bool32 sub_08057E40(MinishVillageTileSetManager* this) { u32 tmp = CheckRegionsOnScreen(gUnk_08108050); if (tmp != 0xFF) { gRoomVars.graphicsGroups[0] = tmp; diff --git a/src/manager/miscManager.c b/src/manager/miscManager.c index 60bed46c..1adf595d 100644 --- a/src/manager/miscManager.c +++ b/src/manager/miscManager.c @@ -121,9 +121,9 @@ void MiscManager_Type0(MiscManager* this) { void sub_08058F44(u32 x, u32 y, u32 flag) { if (CheckRoomFlag(flag)) return; - if (sub_080B1A48(x, y, 1) != 0x61) + if (GetTileTypeAtRoomCoords(x, y, LAYER_BOTTOM) != TILE_TYPE_97) return; - SetTileType(0x26, ((x >> 4) & 0x3F) | (((y >> 4) & 0x3F) << 6), 1); + SetTileType(TILE_TYPE_38, ((x >> 4) & 0x3F) | (((y >> 4) & 0x3F) << 6), LAYER_BOTTOM); sub_08058F84(x, y); } @@ -179,13 +179,13 @@ void MiscManager_Type1(MiscManager* this) { } void sub_08059064(MiscManager* this) { - Entity* tmp; - tmp = CreateObject(GROUND_ITEM, ITEM_SMALL_KEY, 0); - if (!tmp) + Entity* key; + key = CreateObject(GROUND_ITEM, ITEM_SMALL_KEY, 0); + if (!key) return; - tmp->timer = 2; - tmp->x.HALF.HI = this->unk_38 + gRoomControls.origin_x; - tmp->y.HALF.HI = this->unk_3a + gRoomControls.origin_y; + key->timer = 2; + key->x.HALF.HI = this->x + gRoomControls.origin_x; + key->y.HALF.HI = this->y + gRoomControls.origin_y; } void MiscManager_Type3(MiscManager* this) { @@ -229,8 +229,8 @@ void MiscManager_Type5(MiscManager* this) { switch (super->action) { default: if (!--super->timer) { - CreateDustAt(this->unk_38, this->unk_3a, super->type2); - RestorePrevTileEntity(((this->unk_38 >> 4) & 0x3f) | ((this->unk_3a >> 4) & 0x3f) << 6, super->type2); + CreateDustAt(this->x, this->y, super->type2); + RestorePrevTileEntity(TILE_LOCAL(this->x, this->y), super->type2); SoundReq(SFX_TASK_COMPLETE); DeleteThisEntity(); } @@ -240,7 +240,7 @@ void MiscManager_Type5(MiscManager* this) { DeleteThisEntity(); } super->action = 1; - SetTileType(0x365, ((this->unk_38 >> 4) & 0x3f) | ((this->unk_3a >> 4) & 0x3f) << 6, super->type2); + SetTileType(TILE_TYPE_869, TILE_LOCAL(this->x, this->y), super->type2); break; case 1: if (CheckFlags(this->flags)) { @@ -256,18 +256,18 @@ void MiscManager_Type6(MiscManager* this) { super->action = 1; super->type2 = CheckFlags(this->flags); if (super->type2) { - gRoomVars.lightLevel = this->unk_3a; + gRoomVars.lightLevel = this->y; } else { - gRoomVars.lightLevel = this->unk_38; + gRoomVars.lightLevel = this->x; } } else { u32 tmp = CheckFlags(this->flags); if (super->type2 != tmp) { super->type2 = tmp; if (tmp) { - gRoomVars.lightLevel = this->unk_3a; + gRoomVars.lightLevel = this->y; } else { - gRoomVars.lightLevel = this->unk_38; + gRoomVars.lightLevel = this->x; } } } @@ -321,7 +321,7 @@ void MiscManager_Type9(MiscManager* this) { } void sub_080592EC(MiscManager* this) { - SetDirtTile(((this->unk_38 >> 4) & 0x3F) | (((this->unk_3a >> 4) & 0x3F) << 6)); + SetDirtTile(TILE_LOCAL(this->x, this->y)); } void sub_0805930C(MiscManager* this) { @@ -333,15 +333,15 @@ void sub_0805930C(MiscManager* this) { #endif if (!tmp) return; - tmp->x.HALF.HI = this->unk_38 + gRoomControls.origin_x; - tmp->y.HALF.HI = this->unk_3a + gRoomControls.origin_y; + tmp->x.HALF.HI = this->x + gRoomControls.origin_x; + tmp->y.HALF.HI = this->y + gRoomControls.origin_y; tmp->collisionLayer = 1; } -void SetDirtTile(u32 tile) { - SetTileType(CUT_GRASS, tile, 1); - SetTileType(0, tile, 2); - SetTileType(0, tile - 0x40, 2); +void SetDirtTile(u32 tilePos) { + SetTileType(TILE_TYPE_29, tilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_0, tilePos, LAYER_TOP); + SetTileType(TILE_TYPE_0, tilePos + TILE_POS(0, -1), LAYER_TOP); } void MiscManager_TypeA(MiscManager* this) { @@ -355,7 +355,7 @@ void MiscManager_TypeA(MiscManager* this) { void MiscManager_TypeB(MiscManager* this) { if (sub_080593CC(this)) { if (++super->timer >= 8) { - sub_080806BC(this->unk_38 - gRoomControls.origin_x, this->unk_3a - gRoomControls.origin_y, 0xFF, 0xA); + sub_080806BC(this->x - gRoomControls.origin_x, this->y - gRoomControls.origin_y, 0xFF, 0xA); } } else { super->timer = 0; @@ -365,7 +365,7 @@ void MiscManager_TypeB(MiscManager* this) { bool32 sub_080593CC(MiscManager* this) { if (!(gPlayerState.flags & PL_MINISH) && gPlayerState.swim_state != 0 && gPlayerEntity.base.animationState == 0 && (gPlayerState.playerInput.heldInput & INPUT_ANY_DIRECTION) == INPUT_UP) { - return EntityWithinDistance(&gPlayerEntity.base, this->unk_38, this->unk_3a + 0xC, 6); + return EntityWithinDistance(&gPlayerEntity.base, this->x, this->y + 12, 6); } return FALSE; } @@ -381,8 +381,8 @@ void MiscManager_TypeC(MiscManager* this) { if (!tmp) return; tmp->collisionLayer = 2; - tmp->x.HALF.HI = this->unk_38 + gRoomControls.origin_x; - tmp->y.HALF.HI = this->unk_3a + gRoomControls.origin_y; + tmp->x.HALF.HI = this->x + gRoomControls.origin_x; + tmp->y.HALF.HI = this->y + gRoomControls.origin_y; EnqueueSFX(SFX_1B0); DeleteThisEntity(); } diff --git a/src/manager/railIntersectionManager.c b/src/manager/railIntersectionManager.c index 68a16d2e..b06aab83 100644 --- a/src/manager/railIntersectionManager.c +++ b/src/manager/railIntersectionManager.c @@ -7,6 +7,7 @@ #include "manager/railIntersectionManager.h" #include "flags.h" #include "room.h" +#include "tiles.h" void sub_0805B778(RailIntersectionManager*); void RailIntersectionManager_Init(RailIntersectionManager*); @@ -25,7 +26,7 @@ void RailIntersectionManager_Init(RailIntersectionManager* this) { super->type2 = 1; } super->action = 1; - this->field_0x38 = (this->field_0x38 >> 4 & 0x3fU) | (((this->field_0x3a << 0x10) >> 0x14 & 0x3fU) << 6); + this->tilePos = (this->tilePos >> 4 & 0x3fU) | (((this->field_0x3a << 0x10) >> 0x14 & 0x3fU) << 6); sub_0805B778(this); } @@ -44,6 +45,7 @@ void RailIntersectionManager_Action1(RailIntersectionManager* this) { } void sub_0805B778(RailIntersectionManager* this) { - static const u16 gUnk_08108C9C[] = { 0x358, 0x359, 0x356, 0x35a, 0x35a, 0x357 }; - SetTileType(gUnk_08108C9C[super->type * 2 + super->type2], this->field_0x38, this->field_0x36); + static const u16 gUnk_08108C9C[] = { TILE_TYPE_856, TILE_TYPE_857, TILE_TYPE_854, + TILE_TYPE_858, TILE_TYPE_858, TILE_TYPE_855 }; + SetTileType(gUnk_08108C9C[super->type * 2 + super->type2], this->tilePos, this->layer); } diff --git a/src/manager/rollingBarrelManager.c b/src/manager/rollingBarrelManager.c index e309f017..7f44557b 100644 --- a/src/manager/rollingBarrelManager.c +++ b/src/manager/rollingBarrelManager.c @@ -19,7 +19,6 @@ extern struct BgAffineDstData gUnk_02017AA0[]; extern struct BgAffineDstData gUnk_02017BA0[]; -extern u8 gUnk_02017700[]; extern u8 gUpdateVisibleTiles; extern u32 gUsedPalettes; @@ -261,8 +260,8 @@ void sub_08058D34(void) { u16 tmp; u32 tmp2; LoadPaletteGroup(0x28); - MemCopy(gUnk_02017700, gUnk_02017700 + 0x240, 0x20); - gUsedPalettes |= 0x200000; + MemCopy(gPaletteBuffer + 3 * 16, gPaletteBuffer + 21 * 16, 16 * 2); + gUsedPalettes |= 1 << 21; LoadGfxGroup(0x16); tmp = gScreen.lcd.displayControl; tmp2 = 0; diff --git a/src/manager/templeOfDropletsManager.c b/src/manager/templeOfDropletsManager.c index 4082f884..19d8f07a 100644 --- a/src/manager/templeOfDropletsManager.c +++ b/src/manager/templeOfDropletsManager.c @@ -480,7 +480,7 @@ void sub_0805A9CC(TempleOfDropletsManager* this) { tmp1 = gRoomControls.scroll_y - this->unk_26 + this->unk_36; gScreen.bg3.yOffset = tmp1 & 0x3F; tmp3 = (&gBG3Buffer[((tmp1 / 0x40) << 8)]); - gScreen.bg3.tilemap = (u32*)tmp3; + gScreen.bg3.subTileMap = (u32*)tmp3; gScreen.controls.window1VerticalDimensions = DISPLAY_HEIGHT; if (this->unk_28 == tmp3) return; @@ -522,7 +522,7 @@ void sub_0805AAF0(u32 unk0) { gScreen.controls.layerFXControl = 0x3E48; gScreen.controls.alphaBlend = BLDALPHA_BLEND(8, 16); gScreen.bg3.control = BGCNT_SCREENBASE(30) | BGCNT_CHARBASE(1); - gScreen.bg3.tilemap = &gBG3Buffer; + gScreen.bg3.subTileMap = &gBG3Buffer; gScreen.bg3.xOffset = 0; gScreen.bg3.yOffset = 0; gScreen.bg3.updated = 1; diff --git a/src/manager/tileChangeObserveManager.c b/src/manager/tileChangeObserveManager.c index 77c24677..7a05a853 100644 --- a/src/manager/tileChangeObserveManager.c +++ b/src/manager/tileChangeObserveManager.c @@ -26,14 +26,14 @@ void TileChangeObserveManager_Main(TileChangeObserveManager* this) { } void TileChangeObserveManager_Init(TileChangeObserveManager* this) { - u16* tile; + u16* tileIndex; if (CheckFlags(this->flag) != 0) { DeleteThisEntity(); } else { super->action = 1; - tile = &GetTileBuffer(this->field_0x3a)->mapData[this->tilePosition]; - this->observedTile = tile; - this->initialTile = tile[0]; + tileIndex = &GetLayerByIndex(this->field_0x3a)->mapData[this->tilePos]; + this->observedTile = tileIndex; + this->initialTile = tileIndex[0]; } } diff --git a/src/manager/tilePuzzleManager.c b/src/manager/tilePuzzleManager.c index d85b92bd..766e2c6d 100644 --- a/src/manager/tilePuzzleManager.c +++ b/src/manager/tilePuzzleManager.c @@ -12,6 +12,7 @@ #include "flags.h" #include "functions.h" #include "sound.h" +#include "tiles.h" enum { INIT, IN_PROGRESS, FAILED, SUCCEEDED }; @@ -30,16 +31,16 @@ void TilePuzzleManager_Main(TilePuzzleManager* this) { this->player_current_tile = COORD_TO_TILE((&gPlayerEntity.base)); if (this->player_current_tile != this->player_previous_tile) { this->player_previous_tile = this->player_current_tile; - switch (GetTileType(this->player_current_tile, super->type2)) { - case 0x317: + switch (GetTileTypeAtTilePos(this->player_current_tile, super->type2)) { + case TILE_TYPE_791: // stepped on a red tile again super->action = FAILED; SoundReq(SFX_MENU_ERROR); break; - case 0x318: + case TILE_TYPE_792: // stepped on a blue tile // turn the tile into a red tile - sub_0807B7D8(0x317, this->player_current_tile, super->type2); + sub_0807B7D8(TILE_TYPE_791, this->player_current_tile, super->type2); SoundReq(SFX_6B); // decrease the number of remaining tiles and check if we're done if (--super->timer == 0) { diff --git a/src/manager/verticalMinishPathBackgroundManager.c b/src/manager/verticalMinishPathBackgroundManager.c index e67cde8d..645118fc 100644 --- a/src/manager/verticalMinishPathBackgroundManager.c +++ b/src/manager/verticalMinishPathBackgroundManager.c @@ -30,17 +30,17 @@ void sub_0805754C(VerticalMinishPathBackgroundManager* this) { bgOffset = (gRoomControls.scroll_y - gRoomControls.origin_y); bgOffset += bgOffset >> 3; gScreen.bg3.yOffset = bgOffset & 0x3f; - gScreen.bg3.tilemap = gMapDataTopSpecial + (bgOffset / 0x40) * 0x200; - if (this->field_0x38 != gScreen.bg3.tilemap) { - this->field_0x38 = gScreen.bg3.tilemap; + gScreen.bg3.subTileMap = gMapDataTopSpecial + (bgOffset / 0x40) * 0x200; + if (this->field_0x38 != gScreen.bg3.subTileMap) { + this->field_0x38 = gScreen.bg3.subTileMap; gScreen.bg3.updated = 1; } bgOffset = (gRoomControls.scroll_y - gRoomControls.origin_y); bgOffset += bgOffset >> 2; gScreen.bg1.yOffset = bgOffset & 0x3f; - gScreen.bg1.tilemap = gMapDataTopSpecial + 0x2000 + (bgOffset / 0x40) * 0x200; - if (this->field_0x3c != gScreen.bg1.tilemap) { - this->field_0x3c = gScreen.bg1.tilemap; + gScreen.bg1.subTileMap = gMapDataTopSpecial + 0x2000 + (bgOffset / 0x40) * 0x200; + if (this->field_0x3c != gScreen.bg1.subTileMap) { + this->field_0x3c = gScreen.bg1.subTileMap; gScreen.bg1.updated = 1; } } @@ -57,7 +57,7 @@ void sub_080575C8(u32 param) { bgOffset += bgOffset >> 3; gScreen.bg3.yOffset = bgOffset & 0x3f; gScreen.bg3.xOffset = 0; - gScreen.bg3.tilemap = &gMapDataTopSpecial[(bgOffset / 0x40) * 0x200]; + gScreen.bg3.subTileMap = &gMapDataTopSpecial[(bgOffset / 0x40) * 0x200]; gScreen.bg3.control = BGCNT_SCREENBASE(29) | BGCNT_PRIORITY(1) | BGCNT_CHARBASE(2) | BGCNT_MOSAIC; gScreen.bg3.updated = 1; @@ -65,7 +65,7 @@ void sub_080575C8(u32 param) { bgOffset += bgOffset >> 2; gScreen.bg1.yOffset = bgOffset & 0x3f; gScreen.bg1.xOffset = 0; - gScreen.bg1.tilemap = &gMapDataTopSpecial[0x2000 + (bgOffset / 0x40) * 0x200]; + gScreen.bg1.subTileMap = &gMapDataTopSpecial[0x2000 + (bgOffset / 0x40) * 0x200]; gScreen.bg1.control = BGCNT_SCREENBASE(30) | BGCNT_PRIORITY(1) | BGCNT_CHARBASE(2) | BGCNT_MOSAIC; gScreen.bg1.updated = 1; gScreen.controls.layerFXControl = diff --git a/src/manager/waterfallBottomManager.c b/src/manager/waterfallBottomManager.c index 11b93c99..a9e7196e 100644 --- a/src/manager/waterfallBottomManager.c +++ b/src/manager/waterfallBottomManager.c @@ -8,9 +8,10 @@ #include "asm.h" #include "entity.h" #include "functions.h" +#include "tiles.h" void WaterfallBottomManager_Main(WaterfallBottomManager* this) { - SetBottomTile(0x4014, 0x5c3, 1); + SetTile(SPECIAL_TILE_20, TILE_POS(3, 23), LAYER_BOTTOM); if ((gRoomControls.origin_y + 200 < gPlayerEntity.base.y.HALF.HI) && ((u32)(gPlayerEntity.base.x.HALF.HI - gRoomControls.origin_x) - 0x30 < 0x11)) { gPlayerEntity.base.collisionLayer = 3; diff --git a/src/manager/weatherChangeManager.c b/src/manager/weatherChangeManager.c index 0528f36d..995716a0 100644 --- a/src/manager/weatherChangeManager.c +++ b/src/manager/weatherChangeManager.c @@ -10,6 +10,7 @@ #include "common.h" #include "fileselect.h" #include "functions.h" +#include "main.h" #include "room.h" #include "screen.h" #include "sound.h" @@ -21,16 +22,13 @@ void sub_080596E0(WeatherChangeManager*); u32 sub_08059844(void); u32 sub_0805986C(void); void sub_08059894(const u16*, const u16*, u32); -u32 sub_080598F8(u32, u32, u32); -void sub_08059960(const u16*, const u16*, u16*, u8); +u32 MixColors(u32, u32, u32); +void MixPalettes(const u16*, const u16*, u16*, u8); const u8 gUnk_08108390[6] = { 0x0F, 0x1E, 0x2D, 0x3C, 0x01, 0x01, }; -extern u16 gUnk_020176E0[]; -extern u8 gUnk_02017700[]; - extern const u16 gPalette_549[]; void WeatherChangeManager_Main(WeatherChangeManager* this) { @@ -160,54 +158,56 @@ u32 sub_0805986C(void) { return gPlayerEntity.base.x.HALF.HI - gRoomControls.origin_x > 0x200; } -void sub_08059894(const u16* unk1, const u16* unk2, u32 unk3) { +void sub_08059894(const u16* palette1, const u16* palette2, u32 factor) { const u16* tmp1; const u16* tmp2; u16* tmp3; u32 tmp4; u32 i; - tmp1 = unk1; - tmp2 = unk2; - tmp3 = gUnk_020176E0; + tmp1 = palette1; + tmp2 = palette2; + tmp3 = gPaletteBuffer + 2 * 16; for (i = 0; i < 13; i++) { - sub_08059960(tmp1, tmp2, tmp3, unk3); + MixPalettes(tmp1, tmp2, tmp3, factor); tmp1 += 0x10; tmp2 += 0x10; tmp3 += 0x10; } - MemCopy(gUnk_02017700, gUnk_02017700 + 0x240, 0x20); - gUsedPalettes |= 0x207ffc; + MemCopy(gPaletteBuffer + 3 * 16, gPaletteBuffer + 21 * 16, 16 * 2); + // Use palettes 2 to 14 and 21. + gUsedPalettes |= 1 << 2 | 1 << 3 | 1 << 4 | 1 << 5 | 1 << 6 | 1 << 7 | 1 << 8 | 1 << 9 | 1 << 10 | 1 << 11 | + 1 << 12 | 1 << 13 | 1 << 14 | 1 << 21; } -u32 sub_080598F8(u32 unk1, u32 unk2, u32 unk3) { +u32 MixColors(u32 color1, u32 color2, u32 factor) { u32 tmp1, tmp2, tmp3; u32 tmp4, tmp5, tmp6; - tmp1 = (unk1 & 0x1F) << 8; - tmp1 = (tmp1 * unk3) >> 5; - tmp4 = (unk2 & 0x1F) << 8; - tmp4 = (tmp4 * (0x20 - unk3)) >> 5; + tmp1 = (color1 & 0x1F) << 8; + tmp1 = (tmp1 * factor) >> 5; + tmp4 = (color2 & 0x1F) << 8; + tmp4 = (tmp4 * (0x20 - factor)) >> 5; tmp1 = (tmp1 + tmp4) >> 8; - tmp2 = (unk1 & 0x3E0) << 3; - tmp2 = (tmp2 * unk3) >> 5; - tmp5 = (unk2 & 0x3E0) << 3; - tmp5 = (tmp5 * (0x20 - unk3)) >> 5; + tmp2 = (color1 & 0x3E0) << 3; + tmp2 = (tmp2 * factor) >> 5; + tmp5 = (color2 & 0x3E0) << 3; + tmp5 = (tmp5 * (0x20 - factor)) >> 5; tmp2 = (tmp2 + tmp5) >> 8; - tmp3 = (unk1 & 0x7C00) >> 2; - tmp3 = (tmp3 * unk3) >> 5; - tmp6 = (unk2 & 0x7C00) >> 2; - tmp6 = (tmp6 * (0x20 - unk3)) >> 5; + tmp3 = (color1 & 0x7C00) >> 2; + tmp3 = (tmp3 * factor) >> 5; + tmp6 = (color2 & 0x7C00) >> 2; + tmp6 = (tmp6 * (0x20 - factor)) >> 5; tmp3 = (tmp3 + tmp6) >> 8; return tmp1 | (tmp2 << 5) | (tmp3 << 10); } -void sub_08059960(const u16* unk1, const u16* unk2, u16* unk3, u8 unk4) { +void MixPalettes(const u16* srcPalette1, const u16* srcPalette2, u16* destPalette, u8 factor) { u32 i; for (i = 0; i < 0x10; i++) { - *unk3++ = sub_080598F8(*unk1++, *unk2++, unk4); + *destPalette++ = MixColors(*srcPalette1++, *srcPalette2++, factor); } } diff --git a/src/menu/figurineMenu.c b/src/menu/figurineMenu.c index f76389fd..88c289f7 100644 --- a/src/menu/figurineMenu.c +++ b/src/menu/figurineMenu.c @@ -98,8 +98,8 @@ void FigurineMenu_080A4608(void) { SetBgmVolume(0x80); sub_080A4DA8(3); - SetColor(0, gPaletteBuffer[0xfb]); - SetColor(0x15c, gPaletteBuffer[0xd3]); + SetColor(0, gPaletteBuffer[251]); + SetColor(0x15c, gPaletteBuffer[211]); MemClear(&gBG0Buffer, sizeof(gBG0Buffer)); MemClear(&gBG3Buffer, sizeof(gBG3Buffer)); gScreen.controls.window0HorizontalDimensions = DISPLAY_WIDTH; @@ -592,7 +592,7 @@ void sub_080A4DB8(u32 param_1) { MemClear(&gBG0Buffer, sizeof(gBG0Buffer)); MemClear(&gBG1Buffer, sizeof(gBG1Buffer)); MemClear(&gBG2Buffer, sizeof(gBG2Buffer)); - MemClear(gUnk_0200AF00.elements, sizeof(gUnk_0200AF00.elements)); + MemClear(gHUD.elements, sizeof(gHUD.elements)); MemClear(&gFigurineMenu, sizeof(gFigurineMenu)); gFigurineMenu.unk2e = -1; gMenu.field_0x3 = gPauseMenuOptions.unk2[param_1]; diff --git a/src/menu/pauseMenu.c b/src/menu/pauseMenu.c index ab90f23b..3877c689 100644 --- a/src/menu/pauseMenu.c +++ b/src/menu/pauseMenu.c @@ -57,14 +57,12 @@ void Subtask_PauseMenu(void) { } } -struct_08127F94* sub_080A6A80(u32, u32); - extern u8 gUnk_02034492[]; void UpdateVisibleFusionMapMarkers(void); s32 sub_080A50A0(s32); void PauseMenu_Variant0(void) { - struct_08127F94* ptr; + const OverworldLocation* location; int r0, r1; UpdateVisibleFusionMapMarkers(); @@ -74,9 +72,9 @@ void PauseMenu_Variant0(void) { gUnk_02034492[r1] = 0; r1++; } while (r1 <= 0xd); - ptr = sub_080A6A80((u16)gRoomTransition.player_status.overworld_map_x, - (u16)gRoomTransition.player_status.overworld_map_y); - gPauseMenuOptions.unk2[4] = ptr->_4; + location = GetOverworldLocation((u16)gRoomTransition.player_status.overworld_map_x, + (u16)gRoomTransition.player_status.overworld_map_y); + gPauseMenuOptions.unk2[4] = location->windcrestId; gPauseMenuOptions.unk2[5] = sub_0801DB94(); if (IsItemEquipped(ITEM_LANTERN_ON) != EQUIP_SLOT_NONE) { r1 = 0x10; @@ -582,9 +580,8 @@ extern u32 gUnk_085C4620[]; extern void (*const gUnk_08128D58[])(void); extern KeyButtonLayout gUnk_08128D60; -void sub_080A5D1C(); +void DrawDungeonMapActually(); void sub_080A5CFC(u32, void*, u32); -void sub_080A6FB4(u32, u32); void DrawDungeonFeatures(u32, void*, u32); extern void DrawDungeonMap(u32 floor, struct_02019EE0* data, u32 size); extern void LoadDungeonMap(void); @@ -766,13 +763,13 @@ void sub_080A56A0(void) { case 0: case 2: if (gGenericMenu.unk10.a[gMenu.field_0x3] != 0) { - gUnk_0200AF00.buttonY[0] = 0x10; + gHUD.buttonY[0] = 0x10; } else { - gUnk_0200AF00.buttonY[0] = 0xfff0; + gHUD.buttonY[0] = 0xfff0; } break; default: - gUnk_0200AF00.buttonY[0] = 0xfff0; + gHUD.buttonY[0] = 0xfff0; break; } @@ -1064,17 +1061,19 @@ void sub_080A5BB8(void) { void PauseMenu_Screen_5(void) { extern void (*const gUnk_08128D30[])(void); - u32 uVar1; - u32 temp; + u32 paletteColor; + u32 ticks; gUnk_08128D30[gMenu.menuType](); - sub_080A5D1C(); - temp = gMain.ticks; - if ((temp & 7) == 0) { - uVar1 = *gUnk_02017830; - MemCopy(gUnk_02017830 + 1, gUnk_02017830, 0xe); - gUnk_02017830[7] = uVar1; - gUsedPalettes |= 0x1000; + DrawDungeonMapActually(); + ticks = gMain.ticks; + // TODO gUnk_02017830 is gPaletteBuffer[200] + if ((ticks & 7) == 0) { + // Rotate these 8 palette colors. + paletteColor = *gUnk_02017830; + MemCopy(gUnk_02017830 + 1, gUnk_02017830, 7 * 2); + gUnk_02017830[7] = paletteColor; + gUsedPalettes |= 1 << 12; } } @@ -1083,7 +1082,7 @@ void sub_080A5C44(u32 param_1, u32 param_2, u32 param_3) { gMenu.field_0xc = gUnk_08128D38; sub_080A5CFC(gMenu.field_0x3, &gMenu, param_3); LoadGfxGroup(0x81); - sub_080A6FB4(gArea.dungeon_idx, 1); + ShowAreaName(gArea.dungeon_idx, 1); SetMenuType(1); ptr = &gUnk_08128D43[(u32)gArea.dungeon_idx * 2]; gScreen.bg1.xOffset += ptr[0]; @@ -1092,10 +1091,10 @@ void sub_080A5C44(u32 param_1, u32 param_2, u32 param_3) { void sub_080A5C9C(void) { s32 newChoice; - const struct_080C9C6C* ptr; + const DungeonFloorMetadata* floorMetadata; if (sub_080A51F4()) { - ptr = &gUnk_080C9C6C[gArea.dungeon_idx]; + floorMetadata = &gDungeonFloorMetadatas[gArea.dungeon_idx]; newChoice = gMenu.field_0x3; switch (gInput.newKeys) { case DPAD_UP: @@ -1104,7 +1103,7 @@ void sub_080A5C9C(void) { } break; case DPAD_DOWN: - if (ptr->unk_0 - 1 > newChoice) { + if (floorMetadata->numFloors - 1 > newChoice) { newChoice++; } break; @@ -1130,7 +1129,7 @@ void sub_080A5CFC(u32 menuType, void* param_2, u32 param_3) { #endif // Actually draw the sprites for the dungeon map. -void sub_080A5D1C(void) { +void DrawDungeonMapActually(void) { extern u8 gUnk_08128D3C[]; u32 bVar1; int frameIndex; @@ -1138,10 +1137,10 @@ void sub_080A5D1C(void) { u32 uVar6; u32 index; u8* puVar8; - const struct_080C9C6C* pbVar9; + const DungeonFloorMetadata* pbVar9; - pbVar9 = &gUnk_080C9C6C[gArea.dungeon_idx]; - bVar1 = gUnk_08128D3C[pbVar9->unk_0]; + pbVar9 = &gDungeonFloorMetadatas[gArea.dungeon_idx]; + bVar1 = gUnk_08128D3C[pbVar9->numFloors]; uVar4 = sub_0801DB94(); gOamCmd._4 = 0x400; gOamCmd._6 = 0; @@ -1172,7 +1171,7 @@ void sub_080A5D1C(void) { if (sub_080A5F24()) { gOamCmd._8 = 0; gOamCmd.x = 0x46; - gOamCmd.y = bVar1 + (pbVar9->unk_1 - pbVar9->unk_2) * 0xc; + gOamCmd.y = bVar1 + (pbVar9->highestFloor - pbVar9->unk_2) * 0xc; if ((gMain.ticks & 0x20) != 0) { uVar6 = 0x7a; } else { @@ -1184,9 +1183,10 @@ void sub_080A5D1C(void) { gOamCmd._8 = 0; gOamCmd.x = 0x34; gOamCmd.y = bVar1; - frameIndex = pbVar9->unk_1 + 0x82; + frameIndex = pbVar9->highestFloor + 0x82; - for (index = 0; index < pbVar9->unk_0; index++) { + // Floor number sprites? + for (index = 0; index < pbVar9->numFloors; index++) { DrawDirect(DRAW_DIRECT_SPRITE_INDEX, frameIndex); frameIndex--; gOamCmd.y = gOamCmd.y + 0xc; @@ -1460,7 +1460,7 @@ void sub_080A62E0(void) { gMenu.field_0x3 = windcrest; SoundReq(SFX_TEXTBOX_CHOICE); } - sub_080A6FB4(gMenu.field_0x3, 0); + ShowAreaName(gMenu.field_0x3, 0); } void sub_080A6378(void) { diff --git a/src/menu/pauseMenuScreen6.c b/src/menu/pauseMenuScreen6.c index 89ef214b..e36ef549 100644 --- a/src/menu/pauseMenuScreen6.c +++ b/src/menu/pauseMenuScreen6.c @@ -75,7 +75,7 @@ void sub_080A667C(void) { } gMenu.field_0xa = uVar2; - sub_080A6FB4(gMenu.field_0x3, 0); + ShowAreaName(gMenu.field_0x3, 0); } void sub_080A66D0(void) { @@ -217,7 +217,7 @@ void sub_080A698C(u32 param_1, u32 param_2, u32 param_3, u32 param_4) { int iVar1; iVar1 = sub_080A69E0(param_1, param_2); - if (0 < iVar1) { + if (iVar1 > 0) { ((struct_sub_080A698C*)&gMapDataBottomSpecial)[gGenericMenu.unk2d].unk0 = param_4 >> 8; ((struct_sub_080A698C*)&gMapDataBottomSpecial)[gGenericMenu.unk2d].unk1 = param_4; ((struct_sub_080A698C*)&gMapDataBottomSpecial)[gGenericMenu.unk2d].unk2 = param_3; @@ -228,17 +228,17 @@ void sub_080A698C(u32 param_1, u32 param_2, u32 param_3, u32 param_4) { } s32 sub_080A69E0(u32 param_1, u32 param_2) { - const struct_08127F94* pbVar1; + const OverworldLocation* location; int iVar3; if ((param_1 | param_2) == 0) return -1; - pbVar1 = sub_080A6A80(param_1, param_2); - if (pbVar1 == NULL) + location = GetOverworldLocation(param_1, param_2); + if (location == NULL) return -1; - if (gMenu.field_0x3 != pbVar1->_4) + if (gMenu.field_0x3 != location->windcrestId) return -1; switch (gMenu.field_0x3) { @@ -257,19 +257,19 @@ s32 sub_080A69E0(u32 param_1, u32 param_2) { break; } - param_1 = (s32)((param_1 - pbVar1->_0 * 0x10) * 100) / 0x23a; - param_2 = (s32)((param_2 - pbVar1->_1 * 0x10) * 100) / 0x23a; + param_1 = (s32)((param_1 - location->minX * 0x10) * 100) / 0x23a; + param_2 = (s32)((param_2 - location->minY * 0x10) * 100) / 0x23a; return (param_2 << 0x10) | param_1; } -struct_08127F94* sub_080A6A80(u32 param_1, u32 param_2) { - struct_08127F94* pbVar1; - param_1 >>= 4; - param_2 >>= 4; +const OverworldLocation* GetOverworldLocation(u32 x, u32 y) { + const OverworldLocation* location; + x >>= 4; + y >>= 4; - for (pbVar1 = gUnk_08127F94; pbVar1->_0 != 0xff; pbVar1++) { - if (pbVar1->_0 <= param_1 && pbVar1->_2 >= param_1 && pbVar1->_1 <= param_2 && pbVar1->_3 >= param_2) { - return pbVar1; + for (location = gOverworldLocations; location->minX != 0xff; location++) { + if (location->minX <= x && location->maxX >= x && location->minY <= y && location->maxY >= y) { + return location; } } return NULL; diff --git a/src/movement.c b/src/movement.c index f166c5b0..3bd0d134 100644 --- a/src/movement.c +++ b/src/movement.c @@ -1603,7 +1603,7 @@ bool32 IsTileCollision(const u8* collisionData, s32 x, s32 y, u32 collisionType) } void CalculateEntityTileCollisions(Entity* this, u32 direction, u32 collisionType) { - u8* layer; + u8* collisionData; u32 colResult; Hitbox* hb; s32 xMin; @@ -1612,7 +1612,7 @@ void CalculateEntityTileCollisions(Entity* this, u32 direction, u32 collisionTyp u32 hitboxUnkX; u32 hitboxUnkY; - layer = GetTileBuffer(this->collisionLayer)->collisionData; + collisionData = GetLayerByIndex(this->collisionLayer)->collisionData; hb = this->hitbox; xMin = this->x.HALF.HI + hb->offset_x; yMin = this->y.HALF.HI + hb->offset_y; @@ -1621,35 +1621,35 @@ void CalculateEntityTileCollisions(Entity* this, u32 direction, u32 collisionTyp if ((direction & 0xf) != 0) { if (0xf >= direction) { temp = xMin + hitboxUnkX; - colResult = IsTileCollision(layer, temp, yMin, collisionType); + colResult = IsTileCollision(collisionData, temp, yMin, collisionType); colResult <<= 1; - colResult |= IsTileCollision(layer, temp, yMin + hitboxUnkY, collisionType); + colResult |= IsTileCollision(collisionData, temp, yMin + hitboxUnkY, collisionType); colResult <<= 1; - colResult |= IsTileCollision(layer, temp, yMin - hitboxUnkY, collisionType); + colResult |= IsTileCollision(collisionData, temp, yMin - hitboxUnkY, collisionType); colResult <<= 6; } else { temp = xMin - hitboxUnkX; - colResult = IsTileCollision(layer, temp, yMin, collisionType); + colResult = IsTileCollision(collisionData, temp, yMin, collisionType); colResult <<= 1; - colResult |= IsTileCollision(layer, temp, yMin + hitboxUnkY, collisionType); + colResult |= IsTileCollision(collisionData, temp, yMin + hitboxUnkY, collisionType); colResult <<= 1; - colResult |= IsTileCollision(layer, temp, yMin - hitboxUnkY, collisionType); + colResult |= IsTileCollision(collisionData, temp, yMin - hitboxUnkY, collisionType); colResult <<= 2; } } else { temp = xMin + hitboxUnkX; - colResult = IsTileCollision(layer, temp, yMin, collisionType); + colResult = IsTileCollision(collisionData, temp, yMin, collisionType); colResult <<= 1; - colResult |= IsTileCollision(layer, temp, yMin + hitboxUnkY, collisionType); + colResult |= IsTileCollision(collisionData, temp, yMin + hitboxUnkY, collisionType); colResult <<= 1; - colResult |= IsTileCollision(layer, temp, yMin - hitboxUnkY, collisionType); + colResult |= IsTileCollision(collisionData, temp, yMin - hitboxUnkY, collisionType); colResult <<= 2; temp = xMin - hitboxUnkX; - colResult |= IsTileCollision(layer, temp, yMin, collisionType); + colResult |= IsTileCollision(collisionData, temp, yMin, collisionType); colResult <<= 1; - colResult |= IsTileCollision(layer, temp, yMin + hitboxUnkY, collisionType); + colResult |= IsTileCollision(collisionData, temp, yMin + hitboxUnkY, collisionType); colResult <<= 1; - colResult |= IsTileCollision(layer, temp, yMin - hitboxUnkY, collisionType); + colResult |= IsTileCollision(collisionData, temp, yMin - hitboxUnkY, collisionType); colResult <<= 2; } @@ -1660,36 +1660,36 @@ void CalculateEntityTileCollisions(Entity* this, u32 direction, u32 collisionTyp if (((direction)&0xf) != 0) { if (direction < 0x10) { temp = yMin + hitboxUnkY; - colResult |= IsTileCollision(layer, xMin, temp, collisionType); + colResult |= IsTileCollision(collisionData, xMin, temp, collisionType); colResult <<= 1; - colResult |= IsTileCollision(layer, xMin + hitboxUnkX, temp, collisionType); + colResult |= IsTileCollision(collisionData, xMin + hitboxUnkX, temp, collisionType); colResult <<= 1; - colResult |= IsTileCollision(layer, xMin - hitboxUnkX, temp, collisionType); + colResult |= IsTileCollision(collisionData, xMin - hitboxUnkX, temp, collisionType); colResult <<= 5; } else { temp = yMin - hitboxUnkY; colResult <<= 4; - colResult |= IsTileCollision(layer, xMin, temp, collisionType); + colResult |= IsTileCollision(collisionData, xMin, temp, collisionType); colResult <<= 1; - colResult |= IsTileCollision(layer, xMin + hitboxUnkX, temp, collisionType); + colResult |= IsTileCollision(collisionData, xMin + hitboxUnkX, temp, collisionType); colResult <<= 1; - colResult |= IsTileCollision(layer, xMin - hitboxUnkX, temp, collisionType); + colResult |= IsTileCollision(collisionData, xMin - hitboxUnkX, temp, collisionType); colResult <<= 1; } } else { temp = yMin + hitboxUnkY; - colResult |= IsTileCollision(layer, xMin, temp, collisionType); + colResult |= IsTileCollision(collisionData, xMin, temp, collisionType); colResult <<= 1; - colResult |= IsTileCollision(layer, xMin + hitboxUnkX, temp, collisionType); + colResult |= IsTileCollision(collisionData, xMin + hitboxUnkX, temp, collisionType); colResult <<= 1; - colResult |= IsTileCollision(layer, xMin - hitboxUnkX, temp, collisionType); + colResult |= IsTileCollision(collisionData, xMin - hitboxUnkX, temp, collisionType); colResult <<= 2; temp = yMin - hitboxUnkY; - colResult |= IsTileCollision(layer, xMin, temp, collisionType); + colResult |= IsTileCollision(collisionData, xMin, temp, collisionType); colResult <<= 1; - colResult |= IsTileCollision(layer, xMin + hitboxUnkX, temp, collisionType); + colResult |= IsTileCollision(collisionData, xMin + hitboxUnkX, temp, collisionType); colResult <<= 1; - colResult |= IsTileCollision(layer, xMin - hitboxUnkX, temp, collisionType); + colResult |= IsTileCollision(collisionData, xMin - hitboxUnkX, temp, collisionType); colResult <<= 1; } this->collisions = colResult; @@ -2162,7 +2162,7 @@ bool32 ProcessMovement3(Entity* this) { } bool32 sub_080AF0C8(Entity* this) { - u32 tileType = GetTileTypeByEntity(this); + u32 tileType = GetTileTypeAtEntity(this); switch (tileType) { case 0x87: if (((this->direction + 7) & (0x3 | DIR_DIAGONAL | DirectionNorth | DirectionEast | DirectionSouth | diff --git a/src/npc/bigGoron.c b/src/npc/bigGoron.c index 87b4884b..9a134cfe 100644 --- a/src/npc/bigGoron.c +++ b/src/npc/bigGoron.c @@ -153,7 +153,7 @@ void sub_0806D0B0(Entity* this) { sub_0806D164(this); } gScreen.bg1.control = 0x1d47; - gScreen.bg1.tilemap = &gMapDataTopSpecial; + gScreen.bg1.subTileMap = &gMapDataTopSpecial; gScreen.bg1.updated = 1; } @@ -546,7 +546,7 @@ void sub_0806D7C4(Entity* this, ScriptExecutionContext* context) { this->y.HALF.HI = gPlayerEntity.base.y.HALF.HI - 0x18; entity = FindEntity(NPC, BIG_GORON, 7, 2, 0); if (entity != NULL) { - sub_0807DEDC(this, context, entity->x.HALF.HI, entity->y.HALF.HI); + LookAt(this, context, entity->x.HALF.HI, entity->y.HALF.HI); } } @@ -557,7 +557,7 @@ void sub_0806D804(Entity* this, ScriptExecutionContext* context) { this->y.HALF.HI = entity->y.HALF.HI - 0x10; this->spritePriority.b1 = 0; } - sub_0807DEDC(this, context, gPlayerEntity.base.x.HALF.HI, gPlayerEntity.base.y.HALF.HI - 0x10); + LookAt(this, context, gPlayerEntity.base.x.HALF.HI, gPlayerEntity.base.y.HALF.HI - 0x10); } void sub_0806D858(Entity* this) { diff --git a/src/npc/bladeBrothers.c b/src/npc/bladeBrothers.c index 6926a87a..58a0ed2c 100644 --- a/src/npc/bladeBrothers.c +++ b/src/npc/bladeBrothers.c @@ -44,18 +44,26 @@ void (*const gUnk_081115D0[])(BladeBrothersEntity*) = { const u16 gUnk_081115DC[] = { 183, 184, 185, 186, 187, 188, 189, 190 }; -// TODO extract macros -extern const PlayerMacroEntry gUnk_08004A0C; -extern const PlayerMacroEntry gUnk_08004A16; -extern const PlayerMacroEntry gUnk_08004A24; -extern const PlayerMacroEntry gUnk_08004A32; -extern const PlayerMacroEntry gUnk_08004A48; -extern const PlayerMacroEntry gUnk_08004A72; -extern const PlayerMacroEntry gUnk_08004A8C; -extern const PlayerMacroEntry gUnk_08004AA6; +extern const PlayerMacroEntry gPlayerMacroBladeBrothers0; +extern const PlayerMacroEntry gPlayerMacroBladeBrothers1; +extern const PlayerMacroEntry gPlayerMacroBladeBrothers2; +extern const PlayerMacroEntry gPlayerMacroBladeBrothers3; +extern const PlayerMacroEntry gPlayerMacroBladeBrothers4; +extern const PlayerMacroEntry gPlayerMacroBladeBrothers5; +extern const PlayerMacroEntry gPlayerMacroBladeBrothers6; +extern const PlayerMacroEntry gPlayerMacroBladeBrothers7; const PlayerMacroEntry* const BladeBrothers_PlayerMacros[] = { - &gUnk_08004A0C, &gUnk_08004A16, &gUnk_08004A24, &gUnk_08004A32, &gUnk_08004A48, &gUnk_08004A72, - &gUnk_08004A8C, &gUnk_08004AA6, NULL, NULL, NULL, + &gPlayerMacroBladeBrothers0, + &gPlayerMacroBladeBrothers1, + &gPlayerMacroBladeBrothers2, + &gPlayerMacroBladeBrothers3, + &gPlayerMacroBladeBrothers4, + &gPlayerMacroBladeBrothers5, + &gPlayerMacroBladeBrothers6, + &gPlayerMacroBladeBrothers7, + NULL, + NULL, + NULL, }; const u8 BladeBrothers_EquippedItem[] = { diff --git a/src/npc/castorWildsStatue.c b/src/npc/castorWildsStatue.c index 1d0c6b07..5043c0f0 100644 --- a/src/npc/castorWildsStatue.c +++ b/src/npc/castorWildsStatue.c @@ -11,6 +11,8 @@ #include "npc.h" #include "script.h" #include "sound.h" +#include "tiles.h" + typedef struct { /*0x00*/ Entity base; /*0x68*/ u8 unused[12]; @@ -78,20 +80,20 @@ void sub_08067418(CastorWildsStatueEntity* this) { this->tilePos = COORD_TO_TILE(super); if (super->type == 0) { super->hitbox = (Hitbox*)&gUnk_08110E94; - SetBottomTile(0x4022, this->tilePos - 1, super->collisionLayer); - SetBottomTile(0x4022, this->tilePos, super->collisionLayer); - SetBottomTile(0x4022, this->tilePos + 0x3f, super->collisionLayer); - SetBottomTile(0x4022, this->tilePos + 0x40, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + 0x3f, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + 0x40, super->collisionLayer); } else { super->collisionLayer = 3; super->spriteOrientation.flipY = 1; super->spriteRendering.b3 = 1; super->spritePriority.b0 = 2; if (CheckLocalFlag(HIKYOU_00_SEKIZOU) == 0) { - SetBottomTile(0x4022, 0xe81, 1); - SetBottomTile(0x4022, 0xe82, 1); - SetBottomTile(0x4022, 0xe83, 1); - SetBottomTile(0x4022, 0xec3, 1); + SetTile(SPECIAL_TILE_34, TILE_POS(1, 58), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, TILE_POS(2, 58), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, TILE_POS(3, 58), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, TILE_POS(3, 59), LAYER_BOTTOM); } } InitScriptForNPC(super); diff --git a/src/npc/clothesRack.c b/src/npc/clothesRack.c index aa6ae533..ddf8903d 100644 --- a/src/npc/clothesRack.c +++ b/src/npc/clothesRack.c @@ -5,6 +5,7 @@ * @brief Clothes Rack NPC */ #include "npc.h" +#include "tiles.h" void sub_0806DD90(Entity*); void sub_0806DEC8(Entity*); @@ -36,12 +37,12 @@ void sub_0806DD90(Entity* this) { InitializeAnimation(this, animIndex); x = this->x.HALF.HI; y = this->y.HALF.HI; - SetBottomTile(0x4072, TILE(x - 0x18, y - 0x10), this->collisionLayer); - SetBottomTile(0x4072, TILE(x - 0x18, y), this->collisionLayer); - SetBottomTile(0x4072, TILE(x - 0x18, y + 0x10), this->collisionLayer); - SetBottomTile(0x4072, TILE(x + 0x18, y - 0x10), this->collisionLayer); - SetBottomTile(0x4072, TILE(x + 0x18, y), this->collisionLayer); - SetBottomTile(0x4072, TILE(x + 0x18, y + 0x10), this->collisionLayer); + SetTile(SPECIAL_TILE_114, TILE(x - 24, y - 16), this->collisionLayer); + SetTile(SPECIAL_TILE_114, TILE(x - 24, y), this->collisionLayer); + SetTile(SPECIAL_TILE_114, TILE(x - 24, y + 16), this->collisionLayer); + SetTile(SPECIAL_TILE_114, TILE(x + 24, y - 16), this->collisionLayer); + SetTile(SPECIAL_TILE_114, TILE(x + 24, y), this->collisionLayer); + SetTile(SPECIAL_TILE_114, TILE(x + 24, y + 16), this->collisionLayer); } void sub_0806DEC8(Entity* this) { diff --git a/src/npc/dampe.c b/src/npc/dampe.c index 31866c7e..62a39909 100644 --- a/src/npc/dampe.c +++ b/src/npc/dampe.c @@ -7,10 +7,12 @@ #include "entity.h" #include "flags.h" #include "item.h" +#include "map.h" #include "message.h" #include "npc.h" #include "player.h" #include "room.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -104,10 +106,10 @@ void sub_0806BEC8(Entity* this, ScriptExecutionContext* context) { } void sub_0806BEFC(void) { - SetTileType(0x17E, 0x58E, 1); - SetTileType(0x17F, 0x58F, 1); - SetTileType(0x180, 0x5CE, 1); - SetTileType(0x181, 0x5CF, 1); + SetTileType(TILE_TYPE_382, TILE_POS(14, 22), LAYER_BOTTOM); + SetTileType(TILE_TYPE_383, TILE_POS(15, 22), LAYER_BOTTOM); + SetTileType(TILE_TYPE_384, TILE_POS(14, 23), LAYER_BOTTOM); + SetTileType(TILE_TYPE_385, TILE_POS(15, 23), LAYER_BOTTOM); } void sub_0806BF44(Entity* this, ScriptExecutionContext* context) { diff --git a/src/npc/dog.c b/src/npc/dog.c index a6c7c0fe..628e56d8 100644 --- a/src/npc/dog.c +++ b/src/npc/dog.c @@ -9,6 +9,7 @@ #include "functions.h" #include "item.h" #include "npc.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -235,7 +236,7 @@ void sub_08069B44(DogEntity* this) { super->action = 4; } if ((super->type == 2) && (CheckLocalFlag(MACHI_02_DOG) == 0)) { - SetBottomTile(0x4072, TILE(super->x.HALF.HI, super->y.HALF.HI - 8), super->collisionLayer); + SetTile(SPECIAL_TILE_114, TILE(super->x.HALF.HI, super->y.HALF.HI - 8), super->collisionLayer); } } } diff --git a/src/npc/ezlo.c b/src/npc/ezlo.c index 26de89ef..c8012395 100644 --- a/src/npc/ezlo.c +++ b/src/npc/ezlo.c @@ -38,7 +38,7 @@ void sub_0806D8A0(Entity* this, ScriptExecutionContext* context) { context->y.HALF.HI = yOffset; xOffset -= this->x.HALF.HI; - this->direction = CalcOffsetAngle(xOffset, yOffset - this->y.HALF.HI); + this->direction = CalculateDirectionFromOffsets(xOffset, yOffset - this->y.HALF.HI); this->animationState = (this->animationState & 0x80) | gUnk_08114134[this->direction >> 4]; } diff --git a/src/npc/gorman.c b/src/npc/gorman.c index bb679c80..576ef99b 100644 --- a/src/npc/gorman.c +++ b/src/npc/gorman.c @@ -154,7 +154,7 @@ void sub_0806991C(GormanEntity* this, ScriptExecutionContext* context) { context->unk_19 = 8; context->postScriptActions |= 2; context->condition = 0; - tmp = CalcOffsetAngle(context->x.HALF.HI - super->x.HALF.HI, context->y.HALF.HI - super->y.HALF.HI); + tmp = CalculateDirectionFromOffsets(context->x.HALF.HI - super->x.HALF.HI, context->y.HALF.HI - super->y.HALF.HI); super->direction = tmp; super->animationState = (super->animationState & 0x80) | gUnk_08111C74[(tmp << 0x18) >> 0x1c]; gActiveScriptInfo.flags |= 1; @@ -170,7 +170,7 @@ void sub_080699AC(GormanEntity* this, ScriptExecutionContext* context) { context->unk_19 = 8; context->postScriptActions |= 2; context->condition = 0; - tmp = CalcOffsetAngle(context->x.HALF.HI - super->x.HALF.HI, context->y.HALF.HI - super->y.HALF.HI); + tmp = CalculateDirectionFromOffsets(context->x.HALF.HI - super->x.HALF.HI, context->y.HALF.HI - super->y.HALF.HI); super->direction = tmp; super->animationState = (super->animationState & 0x80) | gUnk_08111C8C[(tmp << 0x18) >> 0x1c]; gActiveScriptInfo.flags |= 1; diff --git a/src/npc/kid.c b/src/npc/kid.c index fd51fd2f..678ff84b 100644 --- a/src/npc/kid.c +++ b/src/npc/kid.c @@ -7,6 +7,7 @@ #include "functions.h" #include "message.h" #include "npc.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -524,7 +525,8 @@ void sub_080626E0(Entity* this, ScriptExecutionContext* context) { } if (--context->unk_19 == 0) { context->unk_19 = 10; - uVar4 = CalcOffsetAngle(context->x.HALF.HI - this->x.HALF.HI, context->y.HALF.HI - this->y.HALF.HI); + uVar4 = + CalculateDirectionFromOffsets(context->x.HALF.HI - this->x.HALF.HI, context->y.HALF.HI - this->y.HALF.HI); this->direction = (u8)uVar4; uVar4 = Random(); this->direction = (this->direction + uVar4 % 0xb) - 5; @@ -539,21 +541,21 @@ void sub_080626E0(Entity* this, ScriptExecutionContext* context) { } void sub_08062788(Entity* this, ScriptExecutionContext* context) { - SetBottomTile(0x4072, 0x60b, 1); - SetBottomTile(0x4072, 0x60c, 1); - SetBottomTile(0x4072, 0x60d, 1); - SetBottomTile(0x4072, 0x64b, 1); - SetBottomTile(0x4072, 0x64c, 1); - SetBottomTile(0x4072, 0x64d, 1); + SetTile(SPECIAL_TILE_114, TILE_POS(11, 24), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_114, TILE_POS(12, 24), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_114, TILE_POS(13, 24), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_114, TILE_POS(11, 25), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_114, TILE_POS(12, 25), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_114, TILE_POS(13, 25), LAYER_BOTTOM); } void sub_080627E8(Entity* this, ScriptExecutionContext* context) { - RestorePrevTileEntity(0x60b, 1); - RestorePrevTileEntity(0x60c, 1); - RestorePrevTileEntity(0x60d, 1); - RestorePrevTileEntity(0x64b, 1); - RestorePrevTileEntity(0x64c, 1); - RestorePrevTileEntity(0x64d, 1); + RestorePrevTileEntity(TILE_POS(11, 24), LAYER_BOTTOM); + RestorePrevTileEntity(TILE_POS(12, 24), LAYER_BOTTOM); + RestorePrevTileEntity(TILE_POS(13, 24), LAYER_BOTTOM); + RestorePrevTileEntity(TILE_POS(11, 25), LAYER_BOTTOM); + RestorePrevTileEntity(TILE_POS(12, 25), LAYER_BOTTOM); + RestorePrevTileEntity(TILE_POS(13, 25), LAYER_BOTTOM); } void Kid_Head(Entity* this) { diff --git a/src/npc/npc4E.c b/src/npc/npc4E.c index fa1f823f..2fae4b91 100644 --- a/src/npc/npc4E.c +++ b/src/npc/npc4E.c @@ -16,6 +16,7 @@ #include "save.h" #include "screenTransitions.h" #include "sound.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -197,18 +198,18 @@ void NPC4E_RestoreEquippedItems(NPC4EEntity* this) { void sub_0806DC7C(void) { const u16* tiles = gUnk_081141F4; while (*tiles != 0) { - u32 tile = *tiles; + u32 tilePos = *tiles; tiles = tiles + 1; - SetTileType(0x4072, tile, 1); + SetTileType(SPECIAL_TILE_114, tilePos, LAYER_BOTTOM); } } void sub_0806DCA0(void) { const u16* tiles = gUnk_081141F4; while (*tiles != 0) { - u32 tile = *tiles; + u32 tilePos = *tiles; tiles = tiles + 1; - RestorePrevTileEntity(tile, 1); + RestorePrevTileEntity(tilePos, LAYER_BOTTOM); } } diff --git a/src/npc/npc5.c b/src/npc/npc5.c index d266d96c..27c865d6 100644 --- a/src/npc/npc5.c +++ b/src/npc/npc5.c @@ -9,6 +9,7 @@ #include "hitbox.h" #include "message.h" #include "npc.h" +#include "tiles.h" #define kFollowDistance 32 // distance to follow player #define kPoiDistance 4 // point of interest distance @@ -422,7 +423,7 @@ bool32 CheckDirectPathUnblocked(Entity* this, u32 target_x, u32 target_y) { x = this->x.HALF.HI; y = this->y.HALF.HI; - angle = CalcOffsetAngle(target_x - x, target_y - y); + angle = CalculateDirectionFromOffsets(target_x - x, target_y - y); x <<= 8; y <<= 8; @@ -529,10 +530,12 @@ u32 CalcJumpDirection(Entity* this) { }; static const u8 sTable[] = { - 0x2b, DirectionSouth, 0x2a, DirectionNorth, 0x2d, DirectionEast, 0x2c, DirectionWest, 0x0, + // actTile, animationState + ACT_TILE_43, DirectionSouth, ACT_TILE_42, DirectionNorth, ACT_TILE_45, DirectionEast, + ACT_TILE_44, DirectionWest, 0x0, }; - u32 tile; + u32 actTile; u32 x; s32 x_offset; s32 y_offset; @@ -542,11 +545,11 @@ u32 CalcJumpDirection(Entity* this) { ptr = (s8*)sOffsets; x_offset = ptr[x]; y_offset = ptr[x + 1]; - tile = GetActTileRelative(this, x_offset, y_offset); + actTile = GetActTileRelativeToEntity(this, x_offset, y_offset); ptr2 = sTable; do { - if (*ptr2 != tile || this->animationState != (ptr2[1] >> 2)) { + if (*ptr2 != actTile || this->animationState != (ptr2[1] >> 2)) { continue; } diff --git a/src/npc/postman.c b/src/npc/postman.c index 3d434f77..05f0d906 100644 --- a/src/npc/postman.c +++ b/src/npc/postman.c @@ -328,7 +328,7 @@ void sub_08060700(PostmanEntity* this, ScriptExecutionContext* context) { const Coords* coords = &gUnk_0810A66C[var0[(s8)this->unk_69]]; u32 x = coords->HALF.x + gRoomControls.origin_x; u32 y = coords->HALF.y + gRoomControls.origin_y; - sub_0807DEDC(super, context, x, y); + LookAt(super, context, x, y); gActiveScriptInfo.flags |= 1; } diff --git a/src/npc/simon.c b/src/npc/simon.c index 7551d73d..480897ee 100644 --- a/src/npc/simon.c +++ b/src/npc/simon.c @@ -13,6 +13,7 @@ #include "screenTransitions.h" #include "script.h" #include "sound.h" +#include "tiles.h" typedef struct { u8 filler[4]; @@ -35,7 +36,7 @@ void sub_0806C224(void) { void Simon_CreateChest(Entity* this) { CreateObjectWithParent(this, SPECIAL_FX, FX_BIG_EXPLOSION2, 0); - SetTileType(0x73, COORD_TO_TILE(this), this->collisionLayer); + SetTileType(TILE_TYPE_115, COORD_TO_TILE(this), this->collisionLayer); SoundReq(SFX_SECRET_BIG); } diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c index 273da662..b0f3fc68 100644 --- a/src/npc/townMinish.c +++ b/src/npc/townMinish.c @@ -4,10 +4,12 @@ * * @brief Town Minish NPC */ +#include "asm.h" #include "entity.h" #include "functions.h" #include "item.h" #include "npc.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -808,8 +810,9 @@ void sub_0806B0E0(Entity* this, ScriptExecutionContext* context) { static const u16 gUnk_08112C5C[2] = { TEXT_INDEX(TEXT_TOWN_MINISH2, 0x25), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x26) }; int idx = 0; - if (sub_080B1AC8(0x38, 0xb8, 1) == 0x57 && sub_080B1AC8(0x48, 0xb8, 1) == 0x57 && - sub_080B1AC8(0x38, 200, 1) == 0x57 && sub_080B1AC8(0x48, 200, 1) == 0x57) { + // Checks if the dust is gone at these four tiles. + if (GetActTileAtRoomCoords(56, 184, 1) == ACT_TILE_87 && GetActTileAtRoomCoords(72, 184, 1) == ACT_TILE_87 && + GetActTileAtRoomCoords(56, 200, 1) == ACT_TILE_87 && GetActTileAtRoomCoords(72, 200, 1) == ACT_TILE_87) { idx = 1; } diff --git a/src/npc/zelda.c b/src/npc/zelda.c index eee18150..e740296f 100644 --- a/src/npc/zelda.c +++ b/src/npc/zelda.c @@ -10,6 +10,7 @@ #include "functions.h" #include "npc.h" #include "sound.h" +#include "tiles.h" void ZeldaFollower_Hide(Entity*, Entity*); void ZeldaFollower_Show(Entity*, Entity*); @@ -171,14 +172,14 @@ static const u16 gUnk_08110BE0[] = { }; void sub_08066F94(void) { - u16 uVar1; + u16 tilePos; const u16* puVar2; puVar2 = gUnk_08110BE0; while (*puVar2 != 0) { - uVar1 = *puVar2; + tilePos = *puVar2; puVar2++; - SetTileType(16498, uVar1, 1); + SetTileType(SPECIAL_TILE_114, tilePos, LAYER_BOTTOM); } } diff --git a/src/object/angryStatue.c b/src/object/angryStatue.c index 687d32d9..be83f7dd 100644 --- a/src/object/angryStatue.c +++ b/src/object/angryStatue.c @@ -11,6 +11,7 @@ #include "projectile.h" #include "room.h" #include "sound.h" +#include "tiles.h" void AngryStatue_Init(Entity*); void AngryStatue_Action1(Entity*); @@ -29,7 +30,7 @@ void AngryStatue(Entity* this) { void AngryStatue_Init(Entity* this) { this->action = 1; this->hitbox = (Hitbox*)&gUnk_080FD178; - SetBottomTile(0x4022, COORD_TO_TILE(this), this->collisionLayer); + SetTile(SPECIAL_TILE_34, COORD_TO_TILE(this), this->collisionLayer); InitializeAnimation(this, this->type); } diff --git a/src/object/bakerOven.c b/src/object/bakerOven.c index 9a593e32..1add5b41 100644 --- a/src/object/bakerOven.c +++ b/src/object/bakerOven.c @@ -6,6 +6,7 @@ */ #include "functions.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -101,18 +102,18 @@ void BakerOven_Action2(BakerOvenEntity* this) { } void sub_0809CDF0(BakerOvenEntity* this) { - u32 y; + u32 tilePos; this->unk_80 = (((super->x.HALF.HI - gRoomControls.origin_x) >> 4) & 0x3f) | (((super->y.HALF.HI - gRoomControls.origin_y) >> 4 & 0x3f) << 6); - y = this->unk_80; - SetBottomTile(0x402e, y - 0x01, super->collisionLayer); - SetBottomTile(0x4022, y - 0x00, super->collisionLayer); - SetBottomTile(0x4022, y + 0x01, super->collisionLayer); - SetBottomTile(0x4026, y - 0x41, super->collisionLayer); - SetBottomTile(0x4026, y - 0x40, super->collisionLayer); - SetBottomTile(0x4024, y - 0x3f, super->collisionLayer); - SetBottomTile(0x4026, y - 0x81, super->collisionLayer); - SetBottomTile(0x4026, y - 0x80, super->collisionLayer); + tilePos = this->unk_80; + SetTile(SPECIAL_TILE_46, tilePos + TILE_POS(-1, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos + TILE_POS(0, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos + TILE_POS(1, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_38, tilePos + TILE_POS(-1, -1), super->collisionLayer); + SetTile(SPECIAL_TILE_38, tilePos + TILE_POS(0, -1), super->collisionLayer); + SetTile(SPECIAL_TILE_36, tilePos + TILE_POS(1, -1), super->collisionLayer); + SetTile(SPECIAL_TILE_38, tilePos + TILE_POS(-1, -2), super->collisionLayer); + SetTile(SPECIAL_TILE_38, tilePos + TILE_POS(0, -2), super->collisionLayer); } diff --git a/src/object/beanstalk.c b/src/object/beanstalk.c index db00d5d0..e445d415 100644 --- a/src/object/beanstalk.c +++ b/src/object/beanstalk.c @@ -6,12 +6,13 @@ */ #include "functions.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; /*0x68*/ u8 unk_68[4]; /*0x6c*/ u32 unk_6c; - /*0x70*/ u16 unk_70; + /*0x70*/ u16 tilePos; /*0x72*/ u16 unk_72; } BeanstalkEntity; @@ -254,11 +255,11 @@ void Beanstalk_Action1Type7(BeanstalkEntity* this) { return; } this->unk_6c = gRoomControls.origin_y; - this->unk_70 = TILE(super->x.HALF.HI, this->unk_6c); + this->tilePos = TILE(super->x.HALF.HI, this->unk_6c); while (TRUE) { - this->unk_70 = TILE(super->x.HALF.HI, this->unk_6c); - SetBottomTile(0x4017, this->unk_70, 2); - SetBottomTile(0x4017, this->unk_70, 1); + this->tilePos = TILE(super->x.HALF.HI, this->unk_6c); + SetTile(SPECIAL_TILE_23, this->tilePos, LAYER_TOP); + SetTile(SPECIAL_TILE_23, this->tilePos, LAYER_BOTTOM); this->unk_6c += 0x10; if (this->unk_6c >= gRoomControls.origin_y + gRoomControls.height) break; @@ -306,8 +307,8 @@ void Beanstalk_Action1Type8SubAction0(BeanstalkEntity* this) { Entity* obj; super->spriteOrientation.flipY = 2; - this->unk_70 = COORD_TO_TILE(super); - SetBottomTile(0x4017, this->unk_70, 1); + this->tilePos = COORD_TO_TILE(super); + SetTile(SPECIAL_TILE_23, this->tilePos, LAYER_BOTTOM); super->subAction = 1; obj = CreateObjectWithParent(super, CHUCHU_BOSS_PARTICLE, 0, 0); if (obj != NULL) { @@ -332,19 +333,19 @@ void Beanstalk_Action1Type9(BeanstalkEntity* this) { if (super->subAction == 0) { super->subAction = 1; super->y.HALF.HI += 0x28; - this->unk_72 = sub_080B1A0C(super, 0, -0x18); + this->unk_72 = GetTileTypeRelativeToEntity(super, 0, -24); } super->spriteOrientation.flipY = gPlayerEntity.base.spriteOrientation.flipY; super->spriteRendering.b3 = gPlayerEntity.base.spriteRendering.b3; if (gPlayerState.floor_type == SURFACE_LADDER) { super->spritePriority.b0 = 0; - if (sub_080B1A0C(super, 0, -0x18) != 0x4014) { - SetBottomTile(0x4014, COORD_TO_TILE_OFFSET(super, 0, 0x18), 1); + if (GetTileTypeRelativeToEntity(super, 0, -24) != SPECIAL_TILE_20) { + SetTile(SPECIAL_TILE_20, COORD_TO_TILE_OFFSET(super, 0, 24), LAYER_BOTTOM); } } else { super->spritePriority.b0 = 5; - if (this->unk_72 != sub_080B1A0C(super, 0, -0x18)) { - SetBottomTile(this->unk_72, COORD_TO_TILE_OFFSET(super, 0, 0x18), 1); + if (this->unk_72 != GetTileTypeRelativeToEntity(super, 0, -24)) { + SetTile(this->unk_72, COORD_TO_TILE_OFFSET(super, 0, 24), LAYER_BOTTOM); } } } diff --git a/src/object/bench.c b/src/object/bench.c index ead81b3b..2b72fc56 100644 --- a/src/object/bench.c +++ b/src/object/bench.c @@ -4,6 +4,7 @@ * * @brief Bench object */ +#include "asm.h" #include "entity.h" #include "functions.h" #include "player.h" @@ -37,7 +38,7 @@ void Bench_Init(BenchEntity* this) { super->collisionLayer = 1; } UpdateSpriteForCollisionLayer(super); - sub_08000148(0x47, this->tilePos - 0x40, 1); + SetCollisionData(0x47, this->tilePos - 0x40, 1); } void Bench_Action1(BenchEntity* this) { diff --git a/src/object/bigBarrel.c b/src/object/bigBarrel.c index 0dd13f8f..74f13c50 100644 --- a/src/object/bigBarrel.c +++ b/src/object/bigBarrel.c @@ -8,10 +8,12 @@ #include "common.h" #include "entity.h" #include "flags.h" +#include "map.h" #include "object.h" #include "room.h" #include "save.h" #include "sound.h" +#include "tiles.h" typedef struct { Entity base; @@ -292,7 +294,7 @@ void BigBarrel_Type4(BigBarrelEntity* this) { flame->collisionLayer = 2; flame->spritePriority.b0 = 2; } - SetTileType(0x76, COORD_TO_TILE(super), 2); + SetTileType(TILE_TYPE_118, COORD_TO_TILE(super), LAYER_TOP); break; case 2: if (--super->timer) { diff --git a/src/object/bigIceBlock.c b/src/object/bigIceBlock.c index 0cc856b9..dd204c78 100644 --- a/src/object/bigIceBlock.c +++ b/src/object/bigIceBlock.c @@ -8,6 +8,7 @@ #include "hitbox.h" #include "item.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -126,129 +127,129 @@ void sub_08099880(BigIceBlockEntity* this) { void sub_08099910(BigIceBlockEntity* this) { u32 uVar2; - s32 iVar1; - u32 uVar3; - u32 position; + s32 actTile; + u32 tileIndex; + u32 tilePos; - position = COORD_TO_TILE(super); - this->unk_6e = position; + tilePos = COORD_TO_TILE(super); + this->unk_6e = tilePos; uVar2 = (((super->x.HALF.HI & 8)) >> 0x3) + ((super->y.HALF.HI & 8) >> 2); this->unk_6c = uVar2; switch (uVar2) { default: - SetBottomTile(0x4022, position - 0x41, super->collisionLayer); - SetBottomTile(0x4022, position - 0x40, super->collisionLayer); - SetBottomTile(0x4022, position - 1, super->collisionLayer); - SetBottomTile(0x4022, position, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos - 0x41, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos - 0x40, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos, super->collisionLayer); break; case 1: - iVar1 = sub_080B1AE0(position - 0x41, super->collisionLayer); - uVar3 = 0x4024; - if (iVar1 == 0x12) { - uVar3 = 0x4079; + actTile = GetActTileAtTilePos(tilePos - 0x41, super->collisionLayer); + tileIndex = SPECIAL_TILE_36; + if (actTile == ACT_TILE_18) { + tileIndex = SPECIAL_TILE_121; } - SetBottomTile(uVar3, position - 0x41, super->collisionLayer); - SetBottomTile(0x4022, position - 0x40, super->collisionLayer); - iVar1 = sub_080B1AE0(position - 0x3f, super->collisionLayer); - uVar3 = 0x4025; - if (iVar1 == 0x12) { - uVar3 = 0x407b; + SetTile(tileIndex, tilePos - 0x41, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos - 0x40, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos - 0x3f, super->collisionLayer); + tileIndex = SPECIAL_TILE_37; + if (actTile == ACT_TILE_18) { + tileIndex = SPECIAL_TILE_123; } - SetBottomTile(uVar3, position - 0x3f, super->collisionLayer); - iVar1 = sub_080B1AE0(position - 1, super->collisionLayer); - uVar3 = 0x4024; - if (iVar1 == 0x12) { - uVar3 = 0x4079; + SetTile(tileIndex, tilePos - 0x3f, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos - 1, super->collisionLayer); + tileIndex = SPECIAL_TILE_36; + if (actTile == ACT_TILE_18) { + tileIndex = SPECIAL_TILE_121; } - SetBottomTile(uVar3, position - 1, super->collisionLayer); - SetBottomTile(0x4022, position, super->collisionLayer); - iVar1 = sub_080B1AE0(position + 1, super->collisionLayer); - uVar3 = 0x4025; - if (iVar1 == 0x12) { - uVar3 = 0x407b; + SetTile(tileIndex, tilePos - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos + 1, super->collisionLayer); + tileIndex = SPECIAL_TILE_37; + if (actTile == ACT_TILE_18) { + tileIndex = SPECIAL_TILE_123; } - SetBottomTile(uVar3, position + 1, super->collisionLayer); + SetTile(tileIndex, tilePos + 1, super->collisionLayer); return; break; case 2: - iVar1 = sub_080B1AE0(position - 0x41, super->collisionLayer); - uVar3 = 0x4023; - if (iVar1 == 0x12) { - uVar3 = 0x4077; + actTile = GetActTileAtTilePos(tilePos - 0x41, super->collisionLayer); + tileIndex = SPECIAL_TILE_35; + if (actTile == ACT_TILE_18) { + tileIndex = SPECIAL_TILE_119; } - SetBottomTile(uVar3, position - 0x41, super->collisionLayer); - iVar1 = sub_080B1AE0(position - 0x40, super->collisionLayer); - uVar3 = 0x4023; - if (iVar1 == 0x12) { - uVar3 = 0x4077; + SetTile(tileIndex, tilePos - 0x41, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos - 0x40, super->collisionLayer); + tileIndex = SPECIAL_TILE_35; + if (actTile == ACT_TILE_18) { + tileIndex = SPECIAL_TILE_119; } - SetBottomTile(uVar3, position - 0x40, super->collisionLayer); - SetBottomTile(0x4022, position - 1, super->collisionLayer); - SetBottomTile(0x4022, position, super->collisionLayer); - iVar1 = sub_080B1AE0(position + 0x3f, super->collisionLayer); - uVar3 = 0x4026; - if (iVar1 == 0x12) { - uVar3 = 0x407c; + SetTile(tileIndex, tilePos - 0x40, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos + 0x3f, super->collisionLayer); + tileIndex = SPECIAL_TILE_38; + if (actTile == ACT_TILE_18) { + tileIndex = SPECIAL_TILE_124; } - SetBottomTile(uVar3, position + 0x3f, super->collisionLayer); - iVar1 = sub_080B1AE0(position + 0x40, super->collisionLayer); - uVar3 = 0x4026; - if (iVar1 == 0x12) { - uVar3 = 0x407c; + SetTile(tileIndex, tilePos + 0x3f, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos + 0x40, super->collisionLayer); + tileIndex = SPECIAL_TILE_38; + if (actTile == ACT_TILE_18) { + tileIndex = SPECIAL_TILE_124; } - SetBottomTile(uVar3, position + 0x40, super->collisionLayer); + SetTile(tileIndex, tilePos + 0x40, super->collisionLayer); break; case 3: - iVar1 = sub_080B1AE0(position - 0x41, super->collisionLayer); - uVar3 = 0x4027; - if (iVar1 == 0x12) { - uVar3 = 0x4075; + actTile = GetActTileAtTilePos(tilePos - 0x41, super->collisionLayer); + tileIndex = SPECIAL_TILE_39; + if (actTile == ACT_TILE_18) { + tileIndex = SPECIAL_TILE_117; } - SetBottomTile(uVar3, position - 0x41, super->collisionLayer); - iVar1 = sub_080B1AE0(position - 0x40, super->collisionLayer); - uVar3 = 0x4023; - if (iVar1 == 0x12) { - uVar3 = 0x4077; + SetTile(tileIndex, tilePos - 0x41, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos - 0x40, super->collisionLayer); + tileIndex = SPECIAL_TILE_35; + if (actTile == ACT_TILE_18) { + tileIndex = SPECIAL_TILE_119; } - SetBottomTile(uVar3, position - 0x40, super->collisionLayer); - iVar1 = sub_080B1AE0(position - 0x3f, super->collisionLayer); - uVar3 = 0x4028; - if (iVar1 == 0x12) { - uVar3 = 0x4076; + SetTile(tileIndex, tilePos - 0x40, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos - 0x3f, super->collisionLayer); + tileIndex = SPECIAL_TILE_40; + if (actTile == ACT_TILE_18) { + tileIndex = SPECIAL_TILE_118; } - SetBottomTile(uVar3, position - 0x3f, super->collisionLayer); - iVar1 = sub_080B1AE0(position - 1, super->collisionLayer); - uVar3 = 0x4024; - if (iVar1 == 0x12) { - uVar3 = 0x4079; + SetTile(tileIndex, tilePos - 0x3f, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos - 1, super->collisionLayer); + tileIndex = SPECIAL_TILE_36; + if (actTile == ACT_TILE_18) { + tileIndex = SPECIAL_TILE_121; } - SetBottomTile(uVar3, position - 1, super->collisionLayer); - SetBottomTile(0x4022, position, super->collisionLayer); - iVar1 = sub_080B1AE0(position + 1, super->collisionLayer); - uVar3 = 0x4025; - if (iVar1 == 0x12) { - uVar3 = 0x407b; + SetTile(tileIndex, tilePos - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos + 1, super->collisionLayer); + tileIndex = SPECIAL_TILE_37; + if (actTile == ACT_TILE_18) { + tileIndex = SPECIAL_TILE_123; } - SetBottomTile(uVar3, position + 1, super->collisionLayer); - iVar1 = sub_080B1AE0(position + 0x3f, super->collisionLayer); - uVar3 = 0x4029; - if (iVar1 == 0x12) { - uVar3 = 0x4078; + SetTile(tileIndex, tilePos + 1, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos + 0x3f, super->collisionLayer); + tileIndex = SPECIAL_TILE_41; + if (actTile == ACT_TILE_18) { + tileIndex = SPECIAL_TILE_120; } - SetBottomTile(uVar3, position + 0x3f, super->collisionLayer); - iVar1 = sub_080B1AE0(position + 0x40, super->collisionLayer); - uVar3 = 0x4026; - if (iVar1 == 0x12) { - uVar3 = 0x407c; + SetTile(tileIndex, tilePos + 0x3f, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos + 0x40, super->collisionLayer); + tileIndex = SPECIAL_TILE_38; + if (actTile == ACT_TILE_18) { + tileIndex = SPECIAL_TILE_124; } - SetBottomTile(uVar3, position + 0x40, super->collisionLayer); - iVar1 = sub_080B1AE0(position + 0x41, super->collisionLayer); - uVar3 = 0x402a; - if (iVar1 == 0x12) { - uVar3 = 0x407a; + SetTile(tileIndex, tilePos + 0x40, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos + 0x41, super->collisionLayer); + tileIndex = SPECIAL_TILE_42; + if (actTile == ACT_TILE_18) { + tileIndex = SPECIAL_TILE_122; } - SetBottomTile(uVar3, position + 0x41, super->collisionLayer); + SetTile(tileIndex, tilePos + 0x41, super->collisionLayer); break; } } diff --git a/src/object/bigPushableLever.c b/src/object/bigPushableLever.c index 10dc9367..e7efcd56 100644 --- a/src/object/bigPushableLever.c +++ b/src/object/bigPushableLever.c @@ -6,12 +6,13 @@ */ #include "functions.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; /*0x68*/ u8 unk_68[8]; - /*0x70*/ u16 tilePositionUpper; - /*0x72*/ u16 tilePositionLower; + /*0x70*/ u16 tilePosUpper; + /*0x72*/ u16 tilePosLower; /*0x74*/ u16 tileIndexUpper; /*0x76*/ u16 tileIndexLower; /*0x78*/ u8 unk_78[12]; @@ -35,9 +36,6 @@ bool32 BigPushableLever_ShouldStartPushing(BigPushableLeverEntity*); void BigPushableLever_SetTiles(BigPushableLeverEntity*); void BigPushableLever_CalculateSpriteOffsets(BigPushableLeverEntity*); -#define TILE_INITIAL 0x4058 -#define TILE_PUSHED 0x4056 - void BigPushableLever(BigPushableLeverEntity* this) { BigPushableLever_Actions[super->action](this); } @@ -50,8 +48,8 @@ void BigPushableLever_Init(BigPushableLeverEntity* this) { void BigPushableLever_Idle(BigPushableLeverEntity* this) { if (BigPushableLever_ShouldStartPushing(this)) { super->action = PUSHING; - SetBottomTile(this->tileIndexUpper, this->tilePositionUpper, super->collisionLayer); - SetBottomTile(this->tileIndexLower, this->tilePositionLower, super->collisionLayer); + SetTile(this->tileIndexUpper, this->tilePosUpper, super->collisionLayer); + SetTile(this->tileIndexLower, this->tilePosLower, super->collisionLayer); EnqueueSFX(SFX_132); RequestPriorityDuration(super, 30); if (PlayerCanBeMoved()) { @@ -86,32 +84,32 @@ void BigPushableLever_SetIdle(BigPushableLeverEntity* this) { void BigPushableLever_SetTiles(BigPushableLeverEntity* this) { if (!CheckFlags(this->pushedFlag)) { super->type2 = 0; - this->tilePositionUpper = COORD_TO_TILE_OFFSET(super, 0, 0x10); - this->tilePositionLower = this->tilePositionUpper - 0x40; - this->tileIndexUpper = GetTileIndex(this->tilePositionUpper, super->collisionLayer); - this->tileIndexLower = GetTileIndex(this->tilePositionLower, super->collisionLayer); - SetBottomTile(0x4057, this->tilePositionUpper, super->collisionLayer); - SetBottomTile(0x4058, this->tilePositionLower, super->collisionLayer); + this->tilePosUpper = COORD_TO_TILE_OFFSET(super, 0, 0x10); + this->tilePosLower = this->tilePosUpper - 0x40; + this->tileIndexUpper = GetTileIndex(this->tilePosUpper, super->collisionLayer); + this->tileIndexLower = GetTileIndex(this->tilePosLower, super->collisionLayer); + SetTile(SPECIAL_TILE_87, this->tilePosUpper, super->collisionLayer); + SetTile(SPECIAL_TILE_88, this->tilePosLower, super->collisionLayer); InitializeAnimation(super, 1); } else { super->type2 = 1; - this->tilePositionUpper = COORD_TO_TILE_OFFSET(super, 0x10, 0); - this->tilePositionLower = this->tilePositionUpper - 1; - this->tileIndexUpper = GetTileIndex(this->tilePositionUpper, super->collisionLayer); - this->tileIndexLower = GetTileIndex(this->tilePositionLower, super->collisionLayer); - SetBottomTile(0x4055, this->tilePositionUpper, super->collisionLayer); - SetBottomTile(0x4056, this->tilePositionLower, super->collisionLayer); + this->tilePosUpper = COORD_TO_TILE_OFFSET(super, 0x10, 0); + this->tilePosLower = this->tilePosUpper - 1; + this->tileIndexUpper = GetTileIndex(this->tilePosUpper, super->collisionLayer); + this->tileIndexLower = GetTileIndex(this->tilePosLower, super->collisionLayer); + SetTile(SPECIAL_TILE_85, this->tilePosUpper, super->collisionLayer); + SetTile(SPECIAL_TILE_86, this->tilePosLower, super->collisionLayer); InitializeAnimation(super, 0); } } bool32 BigPushableLever_ShouldStartPushing(BigPushableLeverEntity* this) { - if (GetTileIndex(this->tilePositionLower, super->collisionLayer) == 0x4059) { + if (GetTileIndex(this->tilePosLower, super->collisionLayer) == SPECIAL_TILE_89) { if (--this->timer == 0) { return TRUE; } BigPushableLever_CalculateSpriteOffsets(this); - SetBottomTile(gUnk_081236E8[super->type2], this->tilePositionLower, super->collisionLayer); + SetTile(gUnk_081236E8[super->type2], this->tilePosLower, super->collisionLayer); } else { this->timer = 60; super->spriteOffsetX = 0; @@ -141,8 +139,8 @@ void (*const BigPushableLever_Actions[])(BigPushableLeverEntity*) = { BigPushableLever_Pushing, }; const u16 gUnk_081236E8[] = { - TILE_INITIAL, - TILE_PUSHED, + SPECIAL_TILE_88, + SPECIAL_TILE_86, }; const u8 BigPushableLever_InitialOffsets[] = { 0, 0, 0, 0, 255, 0, 0, 0, diff --git a/src/object/bird.c b/src/object/bird.c index 3f1bca18..638d2c52 100644 --- a/src/object/bird.c +++ b/src/object/bird.c @@ -378,6 +378,7 @@ void Bird_Type10(BirdEntity* this) { } void CreateBird(Entity* this) { + // EU only allows warp from the overworld. This prevents warping from the rooftop of the Wind Tribe's tower. #ifndef EU if (AreaAllowsWarp()) { #else diff --git a/src/object/blockPushed.c b/src/object/blockPushed.c index b7173736..85f45ce9 100644 --- a/src/object/blockPushed.c +++ b/src/object/blockPushed.c @@ -4,8 +4,10 @@ * * @brief Block Pushed object */ +#include "area.h" #include "functions.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -24,11 +26,11 @@ void BlockPushed(BlockPushedEntity* this) { void BlockPushed_Init(BlockPushedEntity* this) { u16 tmp; - u32 pos; + u32 tilePos; - if (gRoomControls.area == 0x11) { + if (gRoomControls.area == AREA_MINISH_PATHS) { UnloadGFXSlots(super); - if (LoadFixedGFX(super, 0x1c1) == 0) { + if (LoadFixedGFX(super, 449) == 0) { super->spriteSettings.draw = 0; return; } @@ -38,50 +40,50 @@ void BlockPushed_Init(BlockPushedEntity* this) { super->timer = 32; super->speed = 0x80; super->spritePriority.b0 = 6; - pos = COORD_TO_TILE(super); + tilePos = COORD_TO_TILE(super); tmp = super->type * 8; super->x.HALF.HI += tmp; super->y.HALF.HI += tmp; super->hitbox = (Hitbox*)gUnk_0811F64C[super->type]; - this->unk_68 = GetTileType(pos, (u32)super->collisionLayer); + this->unk_68 = GetTileTypeAtTilePos(tilePos, super->collisionLayer); switch (super->type) { case 0: - sub_080832D8(pos, this); + sub_080832D8(tilePos, this); break; case 1: - sub_080832D8(pos, this); - sub_080832D8(pos + 1, this); - sub_080832D8(pos + 0x40, this); - sub_080832D8(pos + 0x41, this); + sub_080832D8(tilePos, this); + sub_080832D8(tilePos + 1, this); + sub_080832D8(tilePos + 0x40, this); + sub_080832D8(tilePos + 0x41, this); break; case 2: - sub_080832D8(pos, this); - sub_080832D8(pos + 1, this); - sub_080832D8(pos + 2, this); - sub_080832D8(pos + 0x40, this); - sub_080832D8(pos + 0x41, this); - sub_080832D8(pos + 0x42, this); - sub_080832D8(pos + 0x80, this); - sub_080832D8(pos + 0x81, this); - sub_080832D8(pos + 0x82, this); + sub_080832D8(tilePos, this); + sub_080832D8(tilePos + 1, this); + sub_080832D8(tilePos + 2, this); + sub_080832D8(tilePos + 0x40, this); + sub_080832D8(tilePos + 0x41, this); + sub_080832D8(tilePos + 0x42, this); + sub_080832D8(tilePos + 0x80, this); + sub_080832D8(tilePos + 0x81, this); + sub_080832D8(tilePos + 0x82, this); break; default: - sub_080832D8(pos, this); - sub_080832D8(pos + 1, this); - sub_080832D8(pos + 2, this); - sub_080832D8(pos + 3, this); - sub_080832D8(pos + 0x40, this); - sub_080832D8(pos + 0x41, this); - sub_080832D8(pos + 0x42, this); - sub_080832D8(pos + 0x43, this); - sub_080832D8(pos + 0x80, this); - sub_080832D8(pos + 0x81, this); - sub_080832D8(pos + 0x82, this); - sub_080832D8(pos + 0x83, this); - sub_080832D8(pos + 0xc0, this); - sub_080832D8(pos + 0xc1, this); - sub_080832D8(pos + 0xc2, this); - sub_080832D8(pos + 0xc3, this); + sub_080832D8(tilePos, this); + sub_080832D8(tilePos + 1, this); + sub_080832D8(tilePos + 2, this); + sub_080832D8(tilePos + 3, this); + sub_080832D8(tilePos + 0x40, this); + sub_080832D8(tilePos + 0x41, this); + sub_080832D8(tilePos + 0x42, this); + sub_080832D8(tilePos + 0x43, this); + sub_080832D8(tilePos + 0x80, this); + sub_080832D8(tilePos + 0x81, this); + sub_080832D8(tilePos + 0x82, this); + sub_080832D8(tilePos + 0x83, this); + sub_080832D8(tilePos + 0xc0, this); + sub_080832D8(tilePos + 0xc1, this); + sub_080832D8(tilePos + 0xc2, this); + sub_080832D8(tilePos + 0xc3, this); break; } EnqueueSFX(SFX_10F); @@ -145,18 +147,18 @@ void sub_080830B8(BlockPushedEntity* this) { DeleteEntity(super); } -void sub_080832D8(u32 param_1, BlockPushedEntity* this) { +void sub_080832D8(u32 tilePos, BlockPushedEntity* this) { if (super->collisionLayer != 2) { if ((super->direction & 8) != 0) { - sub_0807B7D8(0x21, param_1, super->collisionLayer); + sub_0807B7D8(TILE_TYPE_33, tilePos, super->collisionLayer); } else { - sub_0807B7D8(0x20, param_1, super->collisionLayer); + sub_0807B7D8(TILE_TYPE_32, tilePos, super->collisionLayer); } } else { if ((super->direction & 8) != 0) { - sub_0807B7D8(0x2f, param_1, super->collisionLayer); + sub_0807B7D8(TILE_TYPE_47, tilePos, super->collisionLayer); } else { - sub_0807B7D8(0x2e, param_1, super->collisionLayer); + sub_0807B7D8(TILE_TYPE_46, tilePos, super->collisionLayer); } } } diff --git a/src/object/board.c b/src/object/board.c index be77640a..a05b42e4 100644 --- a/src/object/board.c +++ b/src/object/board.c @@ -9,6 +9,7 @@ #include "functions.h" #include "player.h" #include "room.h" +#include "tiles.h" typedef struct { Entity base; @@ -17,7 +18,7 @@ typedef struct { u16 y; u16 unk7c; u16 unk7e; - u16 tile; + u16 tilePos; u8 width; u8 height; } BoardEntity; @@ -48,12 +49,12 @@ void Board_Init(BoardEntity* this) { this->height = size[1]; this->x = super->x.HALF.HI - (this->width >> 1); this->y = super->y.HALF.HI - (this->height >> 1); - this->tile = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); super->collisionLayer = 1; UpdateSpriteForCollisionLayer(super); super->spritePriority.b0 = 6; if (super->type == 0) { - SetBottomTile(0x4074, this->tile - 0x40, super->collisionLayer); + SetTile(SPECIAL_TILE_116, this->tilePos + TILE_POS(0, -1), super->collisionLayer); } sub_08098BE8(this); } @@ -66,7 +67,7 @@ void sub_08098BE8(BoardEntity* this) { if ((gPlayerState.flags & PL_MINISH) && sub_08098C30(this, &gPlayerEntity.base) && PlayerCanBeMoved() && gPlayerEntity.base.z.HALF.HI == 0) { gPlayerState.field_0x14 = 1; - sub_0807AAF8(&gPlayerEntity.base, this->tile); + sub_0807AAF8(&gPlayerEntity.base, this->tilePos); } } diff --git a/src/object/bollard.c b/src/object/bollard.c index b21636c5..43286546 100644 --- a/src/object/bollard.c +++ b/src/object/bollard.c @@ -10,13 +10,14 @@ #include "functions.h" #include "room.h" #include "sound.h" +#include "tiles.h" typedef struct { Entity base; u8 filler[0x8]; - u16 tile; + u16 tilePos; u16 tileIndex; - u8 unk74; + u8 collisionData; u8 unk75; u8 filler2[0x10]; u16 flags; @@ -58,7 +59,7 @@ void Bollard_Action1(BollardEntity* this) { } super->action = 2; InitializeAnimation(super, 3); - SetBottomTile(this->tileIndex, this->tile, super->collisionLayer); + SetTile(this->tileIndex, this->tilePos, super->collisionLayer); EnqueueSFX(SFX_1A5); } @@ -92,10 +93,10 @@ void Bollard_Action4(BollardEntity* this) { void sub_0808B3AC(BollardEntity* this) { super->spritePriority.b0 = 4; - this->tile = COORD_TO_TILE(super); - this->tileIndex = GetTileIndex(this->tile, super->collisionLayer); - this->unk74 = sub_080B1B44(this->tile, super->collisionLayer); - SetBottomTile(0x400b, this->tile, super->collisionLayer); + this->tilePos = COORD_TO_TILE(super); + this->tileIndex = GetTileIndex(this->tilePos, super->collisionLayer); + this->collisionData = GetCollisionDataAtTilePos(this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_11, this->tilePos, super->collisionLayer); } void sub_0808B41C(BollardEntity* this) { diff --git a/src/object/bossDoor.c b/src/object/bossDoor.c index 0a408f4e..fab846b9 100644 --- a/src/object/bossDoor.c +++ b/src/object/bossDoor.c @@ -7,6 +7,7 @@ #include "functions.h" #include "hitbox.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -177,28 +178,28 @@ void sub_0808C500(BossDoorEntity* this) { this->unk_78 = GetTileIndex(this->unk_74 - 1, super->collisionLayer); this->unk_7a = GetTileIndex(this->unk_74, super->collisionLayer); this->unk_7c = GetTileIndex(this->unk_74 + 1, super->collisionLayer); - SetBottomTile(0x4022, this->unk_74 - 1, super->collisionLayer); - SetBottomTile(0x4022, this->unk_74, super->collisionLayer); - SetBottomTile(0x4022, this->unk_74 + 1, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_74 - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_74, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_74 + 1, super->collisionLayer); } else { this->unk_78 = GetTileIndex(this->unk_74 - 0x40, super->collisionLayer); this->unk_7a = GetTileIndex(this->unk_74, super->collisionLayer); this->unk_7c = GetTileIndex(this->unk_74 + 0x40, super->collisionLayer); - SetBottomTile(0x4022, this->unk_74 - 0x40, super->collisionLayer); - SetBottomTile(0x4022, this->unk_74, super->collisionLayer); - SetBottomTile(0x4022, this->unk_74 + 0x40, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_74 - 0x40, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_74, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_74 + 0x40, super->collisionLayer); } } void sub_0808C5D0(BossDoorEntity* this) { if ((this->unk_76 == 0) || (this->unk_76 == 2)) { - SetBottomTile(this->unk_78, this->unk_74 - 1, super->collisionLayer); - SetBottomTile(this->unk_7a, this->unk_74, super->collisionLayer); - SetBottomTile(this->unk_7c, this->unk_74 + 1, super->collisionLayer); + SetTile(this->unk_78, this->unk_74 - 1, super->collisionLayer); + SetTile(this->unk_7a, this->unk_74, super->collisionLayer); + SetTile(this->unk_7c, this->unk_74 + 1, super->collisionLayer); } else { - SetBottomTile(this->unk_78, this->unk_74 - 0x40, super->collisionLayer); - SetBottomTile(this->unk_7a, this->unk_74, super->collisionLayer); - SetBottomTile(this->unk_7c, this->unk_74 + 0x40, super->collisionLayer); + SetTile(this->unk_78, this->unk_74 - 0x40, super->collisionLayer); + SetTile(this->unk_7a, this->unk_74, super->collisionLayer); + SetTile(this->unk_7c, this->unk_74 + 0x40, super->collisionLayer); } } diff --git a/src/object/bush.c b/src/object/bush.c index 895e6747..a83a2aec 100644 --- a/src/object/bush.c +++ b/src/object/bush.c @@ -7,6 +7,7 @@ #include "functions.h" #include "hitbox.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -68,7 +69,7 @@ void Bush_Init(BushEntity* this) { super->hitbox = (Hitbox*)&gUnk_081205B4; this->unk_72 = 0; this->unk_70 = GetTileIndex(COORD_TO_TILE(super), super->collisionLayer); - SetBottomTile(0x4022, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_34, COORD_TO_TILE(super), super->collisionLayer); InitializeAnimation(super, gUnk_08120588[super->type].unk_0); } @@ -106,7 +107,7 @@ void Bush_Action2SubAction2(BushEntity* this) { if (this->unk_72 == 0) { this->unk_72 = 1; super->spriteOffsetX = 0; - sub_0807B9B8(this->unk_70, COORD_TO_TILE(super), super->collisionLayer); + SetTileByIndex(this->unk_70, COORD_TO_TILE(super), super->collisionLayer); } if (((gPlayerState.gustJarState & 0xf) != 1) || ((super->contactFlags & 0x7f) != 0x13)) { Bush_Action2SubAction5(this); diff --git a/src/object/button.c b/src/object/button.c index f0192ac7..d72e176f 100644 --- a/src/object/button.c +++ b/src/object/button.c @@ -5,6 +5,7 @@ * @brief Button object */ #include "functions.h" +#include "tiles.h" #include "object.h" typedef struct { @@ -12,7 +13,7 @@ typedef struct { /*0x68*/ u8 unused1[8]; /*0x70*/ u16 unk_70; /*0x72*/ u16 unk_72; - /*0x74*/ u16 unk_74; + /*0x74*/ u16 tilePos; /*0x76*/ u8 unused2[14]; /*0x84*/ u16 unk_84; /*0x86*/ u16 unk_86; @@ -41,12 +42,12 @@ void Button_Init(ButtonEntity* this) { if (this->unk_84 != 0) { super->collisionLayer = this->unk_84; } - this->unk_74 = (((super->x.HALF.HI - gRoomControls.origin_x) >> 4) & 0x3F) | - ((((super->y.HALF.HI - gRoomControls.origin_y) >> 4) & 0x3F) << 6); - this->unk_72 = GetTileType(this->unk_74, super->collisionLayer); + this->tilePos = (((super->x.HALF.HI - gRoomControls.origin_x) >> 4) & 0x3F) | + ((((super->y.HALF.HI - gRoomControls.origin_y) >> 4) & 0x3F) << 6); + this->unk_72 = GetTileTypeAtTilePos(this->tilePos, super->collisionLayer); if (super->type == 0 && CheckFlags(this->unk_86)) { super->action = 5; - SetTileType(0x7A, this->unk_74, super->collisionLayer); + SetTileType(TILE_TYPE_122, this->tilePos, super->collisionLayer); } else { if (sub_08081E3C(this)) { super->action = 2; @@ -59,7 +60,7 @@ void Button_Init(ButtonEntity* this) { void Button_Action1(ButtonEntity* this) { if (sub_08081E3C(this)) { super->action = 2; - this->unk_72 = GetTileType(this->unk_74, super->collisionLayer); + this->unk_72 = GetTileTypeAtTilePos(this->tilePos, super->collisionLayer); } } @@ -80,12 +81,12 @@ void Button_Action2(ButtonEntity* this) { } } -u32 sub_08081F7C(ButtonEntity*, u32); +u32 sub_08081F7C(ButtonEntity*, u32 tileType); u32 sub_08081D28(ButtonEntity*); void sub_08081E6C(ButtonEntity*); void Button_Action3(ButtonEntity* this) { - if (!sub_08081F7C(this, 0x78)) + if (!sub_08081F7C(this, TILE_TYPE_120)) return; if (!sub_08081D28(this)) { super->action = 4; @@ -105,7 +106,7 @@ void Button_Action4(ButtonEntity* this) { super->timer--; if (super->subtimer != 0) { super->subtimer = 0; - SetBottomTile(0x4035, this->unk_74, super->collisionLayer); + SetTile(SPECIAL_TILE_53, this->tilePos, super->collisionLayer); } if (sub_08081CB0(this)) { super->action = 3; @@ -114,13 +115,13 @@ void Button_Action4(ButtonEntity* this) { } else { super->action = 2; ClearFlag(this->unk_86); - SetTileType(0x77, this->unk_74, super->collisionLayer); + SetTileType(TILE_TYPE_119, this->tilePos, super->collisionLayer); SoundReq(SFX_BUTTON_PRESS); } } void Button_Action5(ButtonEntity* this) { - if (sub_08081F7C(this, 0x7a)) { + if (sub_08081F7C(this, TILE_TYPE_122)) { sub_08081E6C(this); } } @@ -128,17 +129,17 @@ void Button_Action5(ButtonEntity* this) { Entity* sub_08081D74(ButtonEntity*); bool32 sub_08081CB0(ButtonEntity* this) { - u16 tmp; + u16 tileType; if (sub_08081D74(this)) { this->unk_70 = -1; - if (GetTileType(this->unk_74, super->collisionLayer) == 0x4035) { - sub_0807B7D8(0x78, this->unk_74, super->collisionLayer); + if (GetTileTypeAtTilePos(this->tilePos, super->collisionLayer) == SPECIAL_TILE_53) { + sub_0807B7D8(0x78, this->tilePos, super->collisionLayer); } return TRUE; } else { - tmp = GetTileType(this->unk_74, super->collisionLayer); - if (tmp != 0x77 && tmp != 0x79 && tmp != 0x4035) { - this->unk_70 = GetTileIndex(this->unk_74, super->collisionLayer); + tileType = GetTileTypeAtTilePos(this->tilePos, super->collisionLayer); + if (tileType != 0x77 && tileType != 0x79 && tileType != SPECIAL_TILE_53) { + this->unk_70 = GetTileIndex(this->tilePos, super->collisionLayer); return TRUE; } } @@ -153,7 +154,7 @@ bool32 sub_08081D28(ButtonEntity* this) { if (this->unk_70 == 0xFFFF) { return FALSE; } - if (GetTileIndex(this->unk_74, super->collisionLayer) != this->unk_70) { + if (GetTileIndex(this->tilePos, super->collisionLayer) != this->unk_70) { return FALSE; } } @@ -165,8 +166,8 @@ u32 sub_08081E0C(Entity*); Entity* sub_08081D74(ButtonEntity* this) { Entity* ent; - if (sub_080B1B44(this->unk_74, super->collisionLayer) == 0xF) { - return 0; + if (GetCollisionDataAtTilePos(this->tilePos, super->collisionLayer) == COLLISION_DATA_15) { + return NULL; } ent = 0; if (sub_08081E0C(super)) { @@ -203,7 +204,7 @@ u32 sub_08081E3C(ButtonEntity* this) { }; const u16* tmp1; s32 tmp2; - tmp2 = GetTileType(this->unk_74, super->collisionLayer); + tmp2 = GetTileTypeAtTilePos(this->tilePos, super->collisionLayer); tmp1 = gUnk_0811EE50; do { if (*tmp1 == tmp2) @@ -219,35 +220,36 @@ extern u16 gMapDataTopSpecial[0x2000]; extern u16 gMapDataBottomSpecial[]; void sub_08081E6C(ButtonEntity* this) { - u32 r4; - LayerStruct* r1; + u32 tileType; + MapLayer* mapLayer; u16* tmp2; - u16* tmp; + u16* subTiles; u16* tmp3; - u32 r6 = this->unk_74; - u32 r5 = super->collisionLayer; - u32 tile = GetTileType(r6, r5); + u32 tilePos = this->tilePos; + u32 layer = super->collisionLayer; + u32 specialTile = GetTileTypeAtTilePos(tilePos, layer); - if (tile < 0x4000) + if (specialTile < 0x4000) return; - r1 = GetTileBuffer(r5); - r4 = (super->type == 0 ? 0x7a : 0x78); - tmp = r1->metatiles; - tmp = tmp + (r1->unkData2[r4] << 2); - tmp2 = (r5 == 2 ? gMapDataTopSpecial : gMapDataBottomSpecial); - tmp2 += (((0x3f & r6) << 1) + ((0xfc0 & r6) << 2)); - if (sub_08081F00((u32*)tmp2, (u32*)tmp)) + mapLayer = GetLayerByIndex(layer); + tileType = (super->type == 0 ? TILE_TYPE_122 : TILE_TYPE_120); + subTiles = mapLayer->subTiles; + subTiles = subTiles + (mapLayer->tileIndices[tileType] << 2); + tmp2 = (layer == 2 ? gMapDataTopSpecial : gMapDataBottomSpecial); + tmp2 += (((0x3f & tilePos) << 1) + ((0xfc0 & tilePos) << 2)); + if (sub_08081F00((u32*)tmp2, (u32*)subTiles)) return; - SetTileType(r4, r6, r5); - SetBottomTile(tile, r6, r5); + SetTileType(tileType, tilePos, layer); + SetTile(specialTile, tilePos, layer); } -u32 sub_08081F00(u32* unk1, u32* unk2) { - if (*unk1 != *unk2) - return 0; - if (unk1[0x40] != unk2[1]) - return 0; - return 1; +// Are the two tiles already set to the correct one +bool32 sub_08081F00(u32* screenblock, u32* tileList) { + if (screenblock[0] != tileList[0]) + return FALSE; + if (screenblock[0x40] != tileList[1]) + return FALSE; + return TRUE; } void sub_08081F24(Entity* this) { @@ -265,7 +267,7 @@ void sub_08081F24(Entity* this) { } } -bool32 sub_08081F7C(ButtonEntity* this, u32 r7) { +bool32 sub_08081F7C(ButtonEntity* this, u32 tileType) { u16 tmp; if (super->timer == 0) return TRUE; @@ -275,11 +277,11 @@ bool32 sub_08081F7C(ButtonEntity* this, u32 r7) { } else { if (super->timer == 6) { SetFlag(this->unk_86); - SetTileType(r7, this->unk_74, super->collisionLayer); + SetTileType(tileType, this->tilePos, super->collisionLayer); sub_08081F24(super); SoundReq(SFX_BUTTON_PRESS); if (this->unk_70 != 0xFFFF) - SetBottomTile(this->unk_70, this->unk_74, super->collisionLayer); + SetTile(this->unk_70, this->tilePos, super->collisionLayer); return FALSE; } } diff --git a/src/object/cabinFurniture.c b/src/object/cabinFurniture.c index 2a9979ab..0c37cb14 100644 --- a/src/object/cabinFurniture.c +++ b/src/object/cabinFurniture.c @@ -8,11 +8,12 @@ #include "entity.h" #include "flags.h" #include "room.h" +#include "tiles.h" typedef struct { Entity base; u8 filler[0x18]; - u16 tile; + u16 tilePos; } CabinFurnitureEntity; void CabinFurniture_Init(CabinFurnitureEntity* this); @@ -30,51 +31,51 @@ void CabinFurniture(Entity* this) { } void CabinFurniture_Init(CabinFurnitureEntity* this) { - u32 uVar1; + u32 layer; u32 uVar6; u32 uVar7; - this->tile = COORD_TO_TILE(super); - uVar1 = super->collisionLayer; + this->tilePos = COORD_TO_TILE(super); + layer = super->collisionLayer; UpdateSpriteForCollisionLayer(super); switch (super->type) { case 0: super->action = 2; super->spritePriority.b0 = 6; - uVar7 = this->tile; + uVar7 = this->tilePos; uVar6 = uVar7 - 1; - SetBottomTile(0x4022, uVar6, uVar1); - SetBottomTile(0x4022, uVar7, uVar1); - SetBottomTile(0x4022, uVar7 + 1, uVar1); - SetBottomTile(0x4022, uVar7 + 0x3f, uVar1); - SetBottomTile(0x4022, uVar7 + 0x40, uVar1); - SetBottomTile(0x4022, uVar7 + 0x41, uVar1); - SetBottomTile(0x403d, uVar7 - 0x41, uVar1); - SetBottomTile(0x403d, uVar7 - 0x40, uVar1); - SetBottomTile(0x4026, uVar7 - 0x3f, uVar1); - SetBottomTile(0x4026, uVar7 - 0x81, uVar1); - SetBottomTile(0x4026, uVar7 - 0x80, uVar1); + SetTile(SPECIAL_TILE_34, uVar6, layer); + SetTile(SPECIAL_TILE_34, uVar7, layer); + SetTile(SPECIAL_TILE_34, uVar7 + 1, layer); + SetTile(SPECIAL_TILE_34, uVar7 + 0x3f, layer); + SetTile(SPECIAL_TILE_34, uVar7 + 0x40, layer); + SetTile(SPECIAL_TILE_34, uVar7 + 0x41, layer); + SetTile(SPECIAL_TILE_61, uVar7 - 0x41, layer); + SetTile(SPECIAL_TILE_61, uVar7 - 0x40, layer); + SetTile(SPECIAL_TILE_38, uVar7 - 0x3f, layer); + SetTile(SPECIAL_TILE_38, uVar7 - 0x81, layer); + SetTile(SPECIAL_TILE_38, uVar7 - 0x80, layer); break; case 1: super->action = 1; - uVar6 = this->tile; - SetBottomTile(0x4022, uVar6, uVar1); - SetBottomTile(0x4022, uVar6 + 0x40, uVar1); - SetBottomTile(0x4025, uVar6 + 0x41, uVar1); + uVar6 = this->tilePos; + SetTile(SPECIAL_TILE_34, uVar6, layer); + SetTile(SPECIAL_TILE_34, uVar6 + 0x40, layer); + SetTile(SPECIAL_TILE_37, uVar6 + 0x41, layer); if (CheckLocalFlag(0x4f) == 0) { - SetBottomTile(0x402f, uVar6 + 1, uVar1); + SetTile(SPECIAL_TILE_47, uVar6 + 1, layer); } else { - SetBottomTile(0x402d, uVar6 + 1, uVar1); + SetTile(SPECIAL_TILE_45, uVar6 + 1, layer); } break; case 2: super->action = 1; - uVar7 = this->tile; + uVar7 = this->tilePos; uVar6 = uVar7 - 0x41; - SetBottomTile(0x4022, uVar6, uVar1); - SetBottomTile(0x4022, uVar7 - 0x40, uVar1); - SetBottomTile(0x4022, uVar7 - 1, uVar1); - SetBottomTile(0x4022, uVar7, uVar1); + SetTile(SPECIAL_TILE_34, uVar6, layer); + SetTile(SPECIAL_TILE_34, uVar7 - 0x40, layer); + SetTile(SPECIAL_TILE_34, uVar7 - 1, layer); + SetTile(SPECIAL_TILE_34, uVar7, layer); break; } } diff --git a/src/object/carlovObject.c b/src/object/carlovObject.c index ea7d30a6..23873a92 100644 --- a/src/object/carlovObject.c +++ b/src/object/carlovObject.c @@ -6,6 +6,7 @@ */ #include "functions.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -97,7 +98,7 @@ void CarlovObject_Type1Init(CarlovObjectEntity* this) { if (super->timer == 0) { super->action = 1; super->subtimer = 120; - SetBottomTile(0x4022, this->unk_76, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_76, super->collisionLayer); } else { super->action = 3; super->spriteSettings.draw = 0; @@ -111,7 +112,7 @@ void CarlovObject_Type1Action1(CarlovObjectEntity* this) { super->action = 2; super->timer = 7; super->direction = 0; - SetBottomTile(this->unk_74, this->unk_76, super->collisionLayer); + SetTile(this->unk_74, this->unk_76, super->collisionLayer); EnqueueSFX(SFX_10B); } } @@ -140,7 +141,7 @@ void CarlovObject_Type1Action4(CarlovObjectEntity* this) { super->action = 5; sub_08083814(super, 2); EnqueueSFX(SFX_10B); - SetBottomTile(0x4022, this->unk_76, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_76, super->collisionLayer); } } diff --git a/src/object/chestSpawner.c b/src/object/chestSpawner.c index f40a7b1a..7ea08cda 100644 --- a/src/object/chestSpawner.c +++ b/src/object/chestSpawner.c @@ -9,11 +9,12 @@ #include "object.h" #include "screen.h" #include "structures.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; /*0x68*/ u8 unk_68[8]; - /*0x70*/ u16 tilePosition; + /*0x70*/ u16 tilePos; /*0x72*/ u16 unk_72; /*0x74*/ u8 unk_74[0x12]; /*0x86*/ u16 unk_86; @@ -26,7 +27,7 @@ void sub_080842D8(ChestSpawnerEntity*); void AddInteractableChest(ChestSpawnerEntity*); void sub_08083E20(ChestSpawnerEntity*); void sub_08084074(u32); -void sub_080840A8(s32, s32); +void sub_080840A8(s32 x, s32 y); void ChestSpawner_Type0(ChestSpawnerEntity*); void ChestSpawner_Type2(ChestSpawnerEntity*); void ChestSpawner_Type0Init(ChestSpawnerEntity*); @@ -161,7 +162,7 @@ void ChestSpawner_Type2Action4(ChestSpawnerEntity* this) { GetNextFrame(super); if ((super->frame & ANIM_DONE) != 0) { if (--super->subtimer == 0) { - if (super->timer == 0x18) { + if (super->timer == 24) { super->action = 6; super->timer = 8; super->subtimer = 16; @@ -186,20 +187,20 @@ void sub_08084074(u32 flag) { } } -void sub_080840A8(s32 param_1, s32 param_2) { +void sub_080840A8(s32 x, s32 y) { static const u8 gUnk_0811F838[] = { ITEM_RUPEE1, ITEM_RUPEE1, ITEM_RUPEE1, ITEM_RUPEE1, ITEM_RUPEE5, ITEM_RUPEE5, ITEM_RUPEE5, ITEM_RUPEE20, }; - static const s32 gUnk_0811F840[] = { 393216, 458752, 524288, 589824 }; - static const s8 gUnk_0811F850[] = { -6, 0, 0, 6 }; + static const s32 zVelocities[] = { 0x60000, 0x70000, 0x80000, 0x90000 }; + static const s8 xOffsets[] = { -6, 0, 0, 6 }; Entity* obj = CreateObject(GROUND_ITEM, gUnk_0811F838[Random() & 7], 0); if (obj != NULL) { obj->timer = 6; obj->direction = ((Random() & 7) + 0xc) | 0x80; obj->speed = (Random() & 0xf) * 2 + 0x20; - obj->zVelocity = gUnk_0811F840[Random() & 3]; - obj->x.HALF.HI = gUnk_0811F850[Random() & 3] + param_1; - obj->y.HALF.HI = param_2 + 1; + obj->zVelocity = zVelocities[Random() & 3]; + obj->x.HALF.HI = xOffsets[Random() & 3] + x; + obj->y.HALF.HI = y + 1; obj->z.HALF.HI = -8; ResolveCollisionLayer(obj); obj = CreateFx(obj, FX_DASH, 0); @@ -229,14 +230,14 @@ void ChestSpawner_Type2Action7(ChestSpawnerEntity* this) { void ChestSpawner_Type0Init(ChestSpawnerEntity* this) { super->action++; - this->tilePosition = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); super->hitbox = (Hitbox*)&gUnk_0811F8A8; - if (GetTileTypeByEntity(super) == 0x74) { + if (GetTileTypeAtEntity(super) == TILE_TYPE_116) { DeleteThisEntity(); } if (CheckFlags(this->unk_86)) { super->action = 3; - sub_0807B7D8(0x73, this->tilePosition, super->collisionLayer); + sub_0807B7D8(0x73, this->tilePos, super->collisionLayer); if ((super->type & 1) == 0) { DeleteThisEntity(); } @@ -250,7 +251,7 @@ void ChestSpawner_Type0Action1(ChestSpawnerEntity* this) { } void ChestSpawner_Type0Action2(ChestSpawnerEntity* this) { - sub_0807B7D8(0x73, this->tilePosition, super->collisionLayer); + sub_0807B7D8(0x73, this->tilePos, super->collisionLayer); switch (super->type) { case 6: case 7: @@ -270,7 +271,7 @@ void ChestSpawner_Type0Action2(ChestSpawnerEntity* this) { void ChestSpawner_Type0Action3(ChestSpawnerEntity* this) { if ((super->type == 1) || (super->type == 7)) { - if (GetTileTypeByEntity(super) == 0x74) { + if (GetTileTypeAtEntity(super) == TILE_TYPE_116) { DeleteEntity(super); } else { if (!CheckFlags(this->unk_86)) { @@ -278,7 +279,7 @@ void ChestSpawner_Type0Action3(ChestSpawnerEntity* this) { this->unk_72--; } else { super->action = 1; - RestorePrevTileEntity(this->tilePosition, super->collisionLayer); + RestorePrevTileEntity(this->tilePos, super->collisionLayer); CreateDust(super); } } diff --git a/src/object/crenelBeanSprout.c b/src/object/crenelBeanSprout.c index b6512f06..b57c4c8c 100644 --- a/src/object/crenelBeanSprout.c +++ b/src/object/crenelBeanSprout.c @@ -4,9 +4,11 @@ * * @brief Crenel Bean Sprout object */ +#include "asm.h" #include "functions.h" #include "hitbox.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -15,8 +17,6 @@ typedef struct { /*0x72*/ u16 unk_72; } CrenelBeanSproutEntity; -extern u32 sub_080B1AB4(s32, s32, u32); - void sub_080969A4(CrenelBeanSproutEntity*); void sub_08096A78(CrenelBeanSproutEntity*); void CrenelBeanSprout_Init(CrenelBeanSproutEntity*); @@ -54,13 +54,13 @@ void CrenelBeanSprout_Init(CrenelBeanSproutEntity* this) { if (CheckGlobalFlag(WATERBEAN_OUT)) { if (CheckGlobalFlag(WATERBEAN_PUT) == 0) { PositionRelative(&gPlayerEntity.base, super, 0, 0x10000); - SetBottomTile(0x4022, 0xdc, super->collisionLayer); + SetTile(SPECIAL_TILE_34, 0xdc, super->collisionLayer); } else { if (CheckLocalFlag(super->type2) == 0) { InitializeAnimation(super, 10); super->y.HALF.HI += 4; super->action = 4; - SetBottomTile(0x403b, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_59, COORD_TO_TILE(super), super->collisionLayer); return; } super->type2 = 0; @@ -107,7 +107,7 @@ void CrenelBeanSprout_Init(CrenelBeanSproutEntity* this) { InitializeAnimation(super, 0xb); super->y.HALF.HI += 4; super->action = 4; - SetBottomTile(0x4032, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_50, COORD_TO_TILE(super), super->collisionLayer); return; } else { super->type2 = 0; @@ -168,20 +168,20 @@ void CrenelBeanSprout_Action1(CrenelBeanSproutEntity* this) { tmp = gPlayerEntity.base.animationState & 6; this->unk_70 = ((super->x.HALF.HI + (s8)gUnk_08123184[tmp]) & -0x10) | 8; this->unk_72 = ((super->y.HALF.HI + (s8)gUnk_08123184[(tmp) + 1]) & -0x10) | 8; - if (sub_080B1AB4(this->unk_70, this->unk_72, super->collisionLayer) == 0x19) { - gUnk_0200AF00.rActionPlayerState = R_ACTION_THROW; + if (GetActTileAtWorldCoords(this->unk_70, this->unk_72, super->collisionLayer) == ACT_TILE_25) { + gHUD.rActionPlayerState = R_ACTION_THROW; } else { - gUnk_0200AF00.rActionPlayerState = R_ACTION_NONE; + gHUD.rActionPlayerState = R_ACTION_NONE; } PositionRelative(&gPlayerEntity.base, super, 0, 0x10000); - if (GetActTile(super) == 0x19) { + if (GetActTileAtEntity(super) == ACT_TILE_25) { RestorePrevTileEntity(0xdc, super->collisionLayer); sub_08096A78(this); } if ((gPlayerState.playerInput.newInput & (INPUT_ACTION | INPUT_40)) == 0) { return; } - if (gUnk_0200AF00.rActionPlayerState != R_ACTION_THROW) { + if (gHUD.rActionPlayerState != R_ACTION_THROW) { return; } gPlayerState.heldObject = 0; @@ -232,8 +232,8 @@ void CrenelBeanSprout_Action3(CrenelBeanSproutEntity* this) { } void CrenelBeanSprout_Action4(CrenelBeanSproutEntity* this) { - static const u16 gUnk_0812319C[] = { 0x403c, 0x4033 }; - if (gUnk_0812319C[super->type >> 1] == GetTileTypeByEntity(super)) { + static const u16 gUnk_0812319C[] = { SPECIAL_TILE_60, SPECIAL_TILE_51 }; + if (gUnk_0812319C[super->type >> 1] == GetTileTypeAtEntity(super)) { GetNextFrame(super); gPlayerState.keepFacing |= 0x80; gPlayerState.field_0xa |= 0x80; @@ -329,5 +329,5 @@ void sub_08096A78(CrenelBeanSproutEntity* this) { SnapToTile(super); super->y.HALF.HI += 4; super->action = 3; - SetBottomTile(0x403b, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_59, COORD_TO_TILE(super), super->collisionLayer); } diff --git a/src/object/cuccoMinigame.c b/src/object/cuccoMinigame.c index d1da7c44..ae866925 100644 --- a/src/object/cuccoMinigame.c +++ b/src/object/cuccoMinigame.c @@ -13,6 +13,7 @@ #include "npc.h" #include "object.h" #include "script.h" +#include "tiles.h" typedef struct { Entity base; @@ -366,17 +367,17 @@ void CuccoMinigame_TellObjective(void) { } void sub_080A1648(void) { - SetTileType(0x407f, 0xd36, 1); - SetTileType(0x407f, 0xd37, 1); - SetTileType(0x407f, 0xd38, 1); - SetTileType(0x407e, 0xd75, 1); - SetTileType(0x407e, 0xe75, 1); + SetTileType(SPECIAL_TILE_127, TILE_POS(54, 52), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_127, TILE_POS(55, 52), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_127, TILE_POS(56, 52), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_126, TILE_POS(53, 53), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_126, TILE_POS(53, 57), LAYER_BOTTOM); } void sub_080A169C(void) { - RestorePrevTileEntity(0xd36, 1); - RestorePrevTileEntity(0xd37, 1); - RestorePrevTileEntity(0xd38, 1); - RestorePrevTileEntity(0xd75, 1); - RestorePrevTileEntity(0xe75, 1); + RestorePrevTileEntity(TILE_POS(54, 52), LAYER_BOTTOM); + RestorePrevTileEntity(TILE_POS(55, 52), LAYER_BOTTOM); + RestorePrevTileEntity(TILE_POS(56, 52), LAYER_BOTTOM); + RestorePrevTileEntity(TILE_POS(53, 53), LAYER_BOTTOM); + RestorePrevTileEntity(TILE_POS(53, 57), LAYER_BOTTOM); } diff --git a/src/object/cutsceneMiscObject.c b/src/object/cutsceneMiscObject.c index fa787b35..2427c370 100644 --- a/src/object/cutsceneMiscObject.c +++ b/src/object/cutsceneMiscObject.c @@ -11,6 +11,7 @@ #include "object.h" #include "screen.h" #include "script.h" +#include "tiles.h" extern u8 gUnk_08122AE0[]; extern u16 gUnk_08122AE8[]; @@ -331,7 +332,7 @@ void CutsceneMiscObject_Type5(CutsceneMiscObjectEntity* this) { super->zVelocity = 0; SetEntityPriority(super, PRIO_PLAYER_EVENT); InitializeAnimation(super, 0); - if (GetActTile(super) == 13) { + if (GetActTileAtEntity(super) == ACT_TILE_13) { super->action = 3; } break; @@ -710,7 +711,8 @@ void sub_0809567C(CutsceneMiscObjectEntity* this) { super->action = 3; super->subAction = 1; super->speed = 0x400; - super->direction = CalcOffsetAngle(super->x.WORD - ((s16)this->px << 16), super->y.WORD - ((s16)this->py << 16)); + super->direction = + CalculateDirectionFromOffsets(super->x.WORD - ((s16)this->px << 16), super->y.WORD - ((s16)this->py << 16)); } void CutsceneMiscObject_Type15(CutsceneMiscObjectEntity* this) { diff --git a/src/object/doubleBookshelf.c b/src/object/doubleBookshelf.c index d1b0c1fe..33519589 100644 --- a/src/object/doubleBookshelf.c +++ b/src/object/doubleBookshelf.c @@ -6,11 +6,12 @@ */ #include "functions.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; /*0x68*/ u8 unk_68[0x18]; - /*0x80*/ u16 unk_80; + /*0x80*/ u16 tilePos; /*0x82*/ u16 unk_82; /*0x84*/ u8 unk_84; /*0x85*/ u8 unk_85; @@ -41,7 +42,7 @@ void DoubleBookshelf(DoubleBookshelfEntity* this) { void DoubleBookshelf_Init(DoubleBookshelfEntity* this) { DoubleBookshelfEntity* child; super->frameIndex = super->type; - this->unk_80 = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); if (super->type != 0) { super->action = 1; if (this->unk_84 == 0) { @@ -72,7 +73,7 @@ void DoubleBookshelf_Init(DoubleBookshelfEntity* this) { } void DoubleBookshelf_Action1(DoubleBookshelfEntity* this) { - GetTileType(this->unk_82, super->collisionLayer); + GetTileTypeAtTilePos(this->unk_82, super->collisionLayer); sub_0809B234(this); } @@ -80,7 +81,7 @@ void DoubleBookshelf_Action2(DoubleBookshelfEntity* this) { LinearMoveUpdate(super); if (--super->timer == 0) { super->action = 1; - this->unk_80 = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); SetPlayerControl(CONTROL_ENABLED); sub_0809B0B0(this); EnqueueSFX(SFX_BUTTON_PRESS); @@ -92,45 +93,45 @@ void DoubleBookshelf_Action3(DoubleBookshelfEntity* this) { } void sub_0809B0B0(DoubleBookshelfEntity* this) { - u32 position = this->unk_80 - 1; + u32 tilePos = this->tilePos - 1; u32 layer = super->collisionLayer; switch (super->subAction) { case 0: this->unk_84 = 0; - this->unk_82 = position + 2; - SetBottomTile(0x4082, position - 1, layer); - SetBottomTile(0x4022, position, layer); - SetBottomTile(0x4022, position + 1, layer); - SetBottomTile(0x4022, position + 2, layer); + this->unk_82 = tilePos + 2; + SetTile(SPECIAL_TILE_130, tilePos - 1, layer); + SetTile(SPECIAL_TILE_34, tilePos, layer); + SetTile(SPECIAL_TILE_34, tilePos + 1, layer); + SetTile(SPECIAL_TILE_34, tilePos + 2, layer); break; case 1: this->unk_84 = 1; - this->unk_82 = position; - SetBottomTile(0x405f, position, layer); - SetBottomTile(0x4022, position + 1, layer); - SetBottomTile(0x4022, position + 2, layer); - SetBottomTile(0x4082, position + 3, layer); + this->unk_82 = tilePos; + SetTile(SPECIAL_TILE_95, tilePos, layer); + SetTile(SPECIAL_TILE_34, tilePos + 1, layer); + SetTile(SPECIAL_TILE_34, tilePos + 2, layer); + SetTile(SPECIAL_TILE_130, tilePos + 3, layer); break; case 2: this->unk_84 = 1; - this->unk_82 = position; - SetBottomTile(0x4082, position + 3, layer); - SetBottomTile(0x4022, position + 2, layer); - SetBottomTile(0x405f, position, layer); + this->unk_82 = tilePos; + SetTile(SPECIAL_TILE_130, tilePos + 3, layer); + SetTile(SPECIAL_TILE_34, tilePos + 2, layer); + SetTile(SPECIAL_TILE_95, tilePos, layer); SetFlag(((DoubleBookshelfEntity*)super->parent)->unk_86); break; case 3: this->unk_84 = 0; - this->unk_82 = position + 2; - SetBottomTile(0x4082, position - 1, layer); - SetBottomTile(0x4022, position, layer); - SetBottomTile(0x405f, position + 2, layer); + this->unk_82 = tilePos + 2; + SetTile(SPECIAL_TILE_130, tilePos - 1, layer); + SetTile(SPECIAL_TILE_34, tilePos, layer); + SetTile(SPECIAL_TILE_95, tilePos + 2, layer); ClearFlag(((DoubleBookshelfEntity*)super->parent)->unk_86); break; case 4: - SetBottomTile(0x4022, position, layer); - SetBottomTile(0x4022, position + 1, layer); - SetBottomTile(0x4022, position + 2, layer); + SetTile(SPECIAL_TILE_34, tilePos, layer); + SetTile(SPECIAL_TILE_34, tilePos + 1, layer); + SetTile(SPECIAL_TILE_34, tilePos + 2, layer); break; } } @@ -157,7 +158,7 @@ void sub_0809B274(DoubleBookshelfEntity* this) { case 1: if (player->x.HALF.HI + 0x1c > super->x.HALF.HI) { this->unk_84 = 2; - SetBottomTile(0x4022, this->unk_80 + 2, 1); + SetTile(SPECIAL_TILE_34, this->tilePos + 2, LAYER_BOTTOM); sub_0809B358((DoubleBookshelfEntity*)super->child); return; } @@ -172,7 +173,7 @@ void sub_0809B274(DoubleBookshelfEntity* this) { return; } this->unk_84 = 1; - RestorePrevTileEntity(this->unk_80 + 2, 1); + RestorePrevTileEntity(this->tilePos + 2, 1); sub_0809B38C((DoubleBookshelfEntity*)super->child); return; } @@ -180,33 +181,33 @@ void sub_0809B274(DoubleBookshelfEntity* this) { void sub_0809B334(DoubleBookshelfEntity* this) { s32 index; - u32 position = this->unk_80 - 0x81; - for (index = 2; index >= 0; index--, position++) { - SetBottomTile(0x4026, position, 1); + u32 tilePos = this->tilePos - 0x81; + for (index = 2; index >= 0; index--, tilePos++) { + SetTile(SPECIAL_TILE_38, tilePos, LAYER_BOTTOM); } } void sub_0809B358(DoubleBookshelfEntity* this) { - static const u16 gUnk_08123D68[] = { - 0x4022, 0x4022, 0x4074, 0x4026, 0x4074, 0x4074, 0x4026, 0x4074, 0x4022, 0x4022 - }; + static const u16 gUnk_08123D68[] = { SPECIAL_TILE_34, SPECIAL_TILE_34, SPECIAL_TILE_116, SPECIAL_TILE_38, + SPECIAL_TILE_116, SPECIAL_TILE_116, SPECIAL_TILE_38, SPECIAL_TILE_116, + SPECIAL_TILE_34, SPECIAL_TILE_34 }; s32 index; const u16* array = &gUnk_08123D68[this->unk_84]; - u32 position = this->unk_80 - 0x82; + u32 tilePos = this->tilePos + TILE_POS(-2, -2); for (index = 4; index >= 0;) { - SetBottomTile(*array, position, 1); + SetTile(*array, tilePos, LAYER_BOTTOM); index--; - position++; + tilePos++; array += 2; } } void sub_0809B38C(DoubleBookshelfEntity* this) { s32 index; - u32 uVar1 = this->unk_80 - 0x82; + u32 tilePos = this->tilePos + TILE_POS(-2, -2); for (index = 4; index >= 0;) { - RestorePrevTileEntity(uVar1, 1); + RestorePrevTileEntity(tilePos, 1); index--; - uVar1++; + tilePos++; } } diff --git a/src/object/evilSpirit.c b/src/object/evilSpirit.c index 2ab38f90..bec6e328 100644 --- a/src/object/evilSpirit.c +++ b/src/object/evilSpirit.c @@ -82,13 +82,14 @@ void EvilSpirit_Action1(EvilSpiritEntity* this) { this->unk76 = this->unk7c; this->unk7a = this->unk7c; super->speed = 0x300; - super->direction = - CalcOffsetAngle(super->parent->x.WORD - super->x.WORD, super->parent->y.WORD - super->y.WORD) ^ 0x80; + super->direction = CalculateDirectionFromOffsets(super->parent->x.WORD - super->x.WORD, + super->parent->y.WORD - super->y.WORD) ^ + 0x80; } else { super->speed = 0x600; - dir = - CalcOffsetAngle(gPlayerEntity.base.x.WORD - super->x.WORD, gPlayerEntity.base.y.WORD - super->y.WORD) ^ - 0x80; + dir = CalculateDirectionFromOffsets(gPlayerEntity.base.x.WORD - super->x.WORD, + gPlayerEntity.base.y.WORD - super->y.WORD) ^ + 0x80; if (dir != super->direction) { if ((u8)(dir - super->direction) > 0x80) { super->direction += 3; @@ -179,7 +180,7 @@ void EvilSpirit_Action3(EvilSpiritEntity* this) { short iVar4; int iVar6; - super->direction = CalcOffsetAngle(this->x - super->x.WORD, this->y - super->y.WORD); + super->direction = CalculateDirectionFromOffsets(this->x - super->x.WORD, this->y - super->y.WORD); if ((super->contactFlags & 0x7f) == 0x13) { super->speed = 0x100; super->gustJarTolerance--; diff --git a/src/object/figurineDevice.c b/src/object/figurineDevice.c index d21c51cd..6c553dc0 100644 --- a/src/object/figurineDevice.c +++ b/src/object/figurineDevice.c @@ -12,6 +12,7 @@ #include "message.h" #include "object.h" #include "screen.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -305,9 +306,9 @@ void sub_08087F58(FigurineDeviceEntity* this) { switch (super->type) { case 0: case 1: - SetBottomTile(0x4022, this->unk_78 - 1, 1); - SetBottomTile(0x4022, this->unk_78, 1); - SetBottomTile(0x4022, this->unk_78 + 1, 1); + SetTile(SPECIAL_TILE_34, this->unk_78 - 1, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, this->unk_78, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, this->unk_78 + 1, LAYER_BOTTOM); break; } } diff --git a/src/object/fileScreenObjects.c b/src/object/fileScreenObjects.c index 19842f23..3b01e789 100644 --- a/src/object/fileScreenObjects.c +++ b/src/object/fileScreenObjects.c @@ -557,7 +557,7 @@ static u32 sub_0808EF6C(FileScreenObjectsEntity* this) { var7 = this->unk_6c; } super->speed = var7; - super->direction = CalcOffsetAngle(var0, var2) >> 3; + super->direction = CalculateDirectionFromOffsets(var0, var2) >> 3; LinearMoveUpdate(super); return 1; } diff --git a/src/object/fireplace.c b/src/object/fireplace.c index 4e463979..4fd32aec 100644 --- a/src/object/fireplace.c +++ b/src/object/fireplace.c @@ -6,6 +6,7 @@ */ #include "functions.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -35,7 +36,7 @@ void Fireplace_Init(FireplaceEntity* this) { DeleteThisEntity(); } else { sub_0807B7D8(0x30b, TILE(super->x.HALF.HI, super->y.HALF.HI), 2); - SetBottomTile(0x4061, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); + SetTile(SPECIAL_TILE_97, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); } Fireplace_Action1(this); } @@ -49,14 +50,14 @@ void Fireplace_Action1(FireplaceEntity* this) { } void sub_0809B7C0(FireplaceEntity* this) { - u32 tileType = GetTileTypeByEntity(super); - if (tileType != 0x4061 && tileType != 0x4062) { + u32 tileType = GetTileTypeAtEntity(super); + if (tileType != SPECIAL_TILE_97 && tileType != SPECIAL_TILE_98) { sub_0809B7DC(this); } } void sub_0809B7DC(FireplaceEntity* this) { sub_0807B7D8(0xc3 << 2, TILE(super->x.HALF.HI, super->y.HALF.HI), 2); - SetBottomTile(0x4062, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); + SetTile(SPECIAL_TILE_98, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); super->timer = 1; } diff --git a/src/object/fourElements.c b/src/object/fourElements.c index b8d9ea50..e364d7cb 100644 --- a/src/object/fourElements.c +++ b/src/object/fourElements.c @@ -163,6 +163,6 @@ void sub_080A0444(FourElementsEntity* this) { void sub_080A0464(FourElementsEntity* this, ScriptExecutionContext* context) { Entity* element = FindEntityByID(6, FOUR_ELEMENTS, 6); if (element != NULL) { - sub_0807DEDC(super, context, element->x.HALF.HI, element->y.HALF.HI + 0x18); + LookAt(super, context, element->x.HALF.HI, element->y.HALF.HI + 0x18); } } diff --git a/src/object/frozenWaterElement.c b/src/object/frozenWaterElement.c index e9588e4e..848964b3 100644 --- a/src/object/frozenWaterElement.c +++ b/src/object/frozenWaterElement.c @@ -6,6 +6,7 @@ */ #include "functions.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -113,62 +114,62 @@ void FrozenWaterElement_Action2(FrozenWaterElementEntity* this) { void sub_0809C0A8(FrozenWaterElementEntity* this) { u32 position = COORD_TO_TILE(super); - SetBottomTile(0x4022, position - 0x41, super->collisionLayer); - SetBottomTile(0x4022, position - 0x40, super->collisionLayer); - SetBottomTile(0x4022, position - 0x3f, super->collisionLayer); - SetBottomTile(0x4022, position - 2, super->collisionLayer); - SetBottomTile(0x4022, position - 1, super->collisionLayer); - SetBottomTile(0x4022, position, super->collisionLayer); - SetBottomTile(0x4022, position + 1, super->collisionLayer); - SetBottomTile(0x4022, position + 2, super->collisionLayer); - SetBottomTile(0x4022, position + 0x3e, super->collisionLayer); - SetBottomTile(0x4022, position + 0x3f, super->collisionLayer); - SetBottomTile(0x4022, position + 0x40, super->collisionLayer); - SetBottomTile(0x4022, position + 0x41, super->collisionLayer); - SetBottomTile(0x4022, position + 0x42, super->collisionLayer); - SetBottomTile(0x4022, position + 0x7f, super->collisionLayer); - SetBottomTile(0x4022, position + 0x80, super->collisionLayer); - SetBottomTile(0x4022, position + 0x81, super->collisionLayer); - SetBottomTile(0x4022, position + 0x13f, super->collisionLayer); - SetBottomTile(0x4022, position + 0x140, super->collisionLayer); - SetBottomTile(0x4022, position + 0x141, super->collisionLayer); - SetBottomTile(0x4022, position + 0x17f, super->collisionLayer); - SetBottomTile(0x4022, position + 0x181, super->collisionLayer); - SetBottomTile(0x4022, position + 0x1bd, super->collisionLayer); - SetBottomTile(0x4022, position + 0x1be, super->collisionLayer); - SetBottomTile(0x4022, position + 0x1bf, super->collisionLayer); - SetBottomTile(0x4022, position + 0x1c1, super->collisionLayer); - SetBottomTile(0x4022, position + 0x1c2, super->collisionLayer); - SetBottomTile(0x4022, position + 0x1c3, super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, -1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(0, -1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(1, -1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-2, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(0, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(1, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(2, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-2, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(0, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(2, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(0, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(1, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, 5), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(0, 5), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(1, 5), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, 6), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(1, 6), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-3, 7), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-2, 7), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, 7), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(1, 7), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(2, 7), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(3, 7), super->collisionLayer); } void sub_0809C23C(FrozenWaterElementEntity* this) { u32 position = COORD_TO_TILE(super); - RestorePrevTileEntity(position - 0x41, super->collisionLayer); - RestorePrevTileEntity(position - 0x40, super->collisionLayer); - RestorePrevTileEntity(position - 0x3f, super->collisionLayer); - RestorePrevTileEntity(position - 2, super->collisionLayer); - RestorePrevTileEntity(position - 1, super->collisionLayer); - RestorePrevTileEntity(position, super->collisionLayer); - RestorePrevTileEntity(position + 1, super->collisionLayer); - RestorePrevTileEntity(position + 2, super->collisionLayer); - RestorePrevTileEntity(position + 0x3e, super->collisionLayer); - RestorePrevTileEntity(position + 0x3f, super->collisionLayer); - RestorePrevTileEntity(position + 0x40, super->collisionLayer); - RestorePrevTileEntity(position + 0x41, super->collisionLayer); - RestorePrevTileEntity(position + 0x42, super->collisionLayer); - RestorePrevTileEntity(position + 0x7f, super->collisionLayer); - RestorePrevTileEntity(position + 0x80, super->collisionLayer); - RestorePrevTileEntity(position + 0x81, super->collisionLayer); - RestorePrevTileEntity(position + 0x13f, super->collisionLayer); - RestorePrevTileEntity(position + 0x140, super->collisionLayer); - RestorePrevTileEntity(position + 0x141, super->collisionLayer); - RestorePrevTileEntity(position + 0x17f, super->collisionLayer); - RestorePrevTileEntity(position + 0x181, super->collisionLayer); - RestorePrevTileEntity(position + 0x1bd, super->collisionLayer); - RestorePrevTileEntity(position + 0x1be, super->collisionLayer); - RestorePrevTileEntity(position + 0x1bf, super->collisionLayer); - RestorePrevTileEntity(position + 0x1c1, super->collisionLayer); - RestorePrevTileEntity(position + 0x1c2, super->collisionLayer); - RestorePrevTileEntity(position + 0x1c3, super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(-1, -1), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(0, -1), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(1, -1), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(-2, 0), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(-1, 0), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(0, 0), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(1, 0), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(2, 0), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(-2, 1), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(-1, 1), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(0, 1), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(1, 1), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(2, 1), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(-1, 2), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(0, 2), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(1, 2), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(-1, 5), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(0, 5), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(1, 5), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(-1, 6), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(1, 6), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(-3, 7), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(-2, 7), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(-1, 7), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(1, 7), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(2, 7), super->collisionLayer); + RestorePrevTileEntity(position + TILE_POS(3, 7), super->collisionLayer); } diff --git a/src/object/furniture.c b/src/object/furniture.c index 7a185287..ddcec22f 100644 --- a/src/object/furniture.c +++ b/src/object/furniture.c @@ -8,8 +8,7 @@ #include "functions.h" #include "object.h" #include "room.h" - -extern void sub_080001D0(u32, u32, u32); +#include "tiles.h" enum { FURNITURE_INIT, @@ -99,7 +98,7 @@ typedef enum { typedef struct { Entity base; /* 0x68 */ u8 pad[0x10]; - /* 0x78 */ u16 tile; + /* 0x78 */ u16 tilePos; /* 0x7a */ u16 unk1; /* 0x7c */ u16 unk2; /* 0x7e */ u16 unk3; @@ -202,11 +201,11 @@ void Furniture(Entity* this) { } static void FurnitureInit(FurnitureEntity* this) { - u32 i, tile, cnt; + u32 i, tilePos, cnt; Entity* e; super->action = FURNITURE_UPDATE; - this->tile = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); sub_08090DC4(this); switch (this->flags & 0x7fff) { case 0x100: @@ -217,14 +216,14 @@ static void FurnitureInit(FurnitureEntity* this) { break; case 0x40: super->y.HALF.HI = (super->y.HALF.HI & ~0xF) | 4; - SetBottomTile(0x4017, this->tile - 128, 1); - SetBottomTile(0x4017, this->tile - 64, 1); + SetTile(SPECIAL_TILE_23, this->tilePos - 128, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_23, this->tilePos - 64, LAYER_BOTTOM); break; case 0x80: super->frameIndex = 0; super->y.HALF.HI = (super->y.HALF.HI & ~0xF) | 6; - this->tile = COORD_TO_TILE(super); - SetBottomTile(0x4026, this->tile, super->collisionLayer); + this->tilePos = COORD_TO_TILE(super); + SetTile(SPECIAL_TILE_38, this->tilePos, super->collisionLayer); break; case 0x200: break; @@ -242,14 +241,14 @@ static void FurnitureInit(FurnitureEntity* this) { if (this->height != 16) { switch (this->height & 0x70) { case 0x30: - this->tile -= 64; + this->tilePos -= 64; sub_08090B6C(this); - this->tile = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); case 0x20: - this->tile += 64; + this->tilePos += 64; sub_08090B6C(this); } - this->tile = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); } switch (this->flags & 0x7fff) { @@ -257,12 +256,12 @@ static void FurnitureInit(FurnitureEntity* this) { ChangeObjPalette(super, 0x7E); break; case 0x2: - tile = this->tile - 129; + tilePos = this->tilePos - 129; cnt = super->type != 26 ? 3 : 2; - for (i = 0; i < cnt; ++i, ++tile) { - SetBottomTile(0x4026, tile, 2); - SetBottomTile(0x4026, tile, 1); - sub_080001D0(0, tile + 64, 1); + for (i = 0; i < cnt; ++i, ++tilePos) { + SetTile(SPECIAL_TILE_38, tilePos, LAYER_TOP); + SetTile(SPECIAL_TILE_38, tilePos, LAYER_BOTTOM); + SetActTileAtTilePos(ACT_TILE_0, tilePos + TILE_POS(0, 1), 1); } break; } @@ -282,27 +281,27 @@ static void FurnitureInit(FurnitureEntity* this) { } break; case SHOE_DESK: - sub_0807B7D8(774, this->tile + 65, 2); + sub_0807B7D8(774, this->tilePos + 65, 2); break; case STAIRCASE: super->collisionLayer = 1; super->spriteOrientation.flipY = 2; - SetBottomTile(0x4074, this->tile - 64, super->collisionLayer); - sub_080001D0(63, this->tile - 64, super->collisionLayer); - SetBottomTile(0x4017, this->tile, super->collisionLayer); - SetBottomTile(0x4017, this->tile + 64, super->collisionLayer); + SetTile(SPECIAL_TILE_116, this->tilePos - 64, super->collisionLayer); + SetActTileAtTilePos(ACT_TILE_63, this->tilePos - 64, super->collisionLayer); + SetTile(SPECIAL_TILE_23, this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_23, this->tilePos + 64, super->collisionLayer); break; case MINISH_CHEESE: if (super->type2 != 0) super->spriteOffsetX = -4; break; case WOODEN_TABLE: - SetBottomTile(0x4023, this->tile - 65, super->collisionLayer); - SetBottomTile(0x4023, this->tile - 64, super->collisionLayer); - SetBottomTile(0x4023, this->tile - 63, super->collisionLayer); + SetTile(SPECIAL_TILE_35, this->tilePos - 65, super->collisionLayer); + SetTile(SPECIAL_TILE_35, this->tilePos - 64, super->collisionLayer); + SetTile(SPECIAL_TILE_35, this->tilePos - 63, super->collisionLayer); break; case LOW_BOOKSHELF: - SetBottomTile(0x4022, this->tile + 65, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + 65, super->collisionLayer); } } @@ -339,20 +338,20 @@ static void FurnitureUpdate(FurnitureEntity* this) { break; case 0x80: if (gPlayerEntity.base.y.HALF.HI < super->y.HALF.HI + 8) { - if (gPlayerState.floor_type != SURFACE_LADDER && GetTileTypeByEntity(super) == 0x4017) { - SetBottomTile(0x4026, this->tile, super->collisionLayer); - SetBottomTile(0x403D, this->tile - 64, super->collisionLayer); - SetBottomTile(0x403D, this->tile - 128, super->collisionLayer); + if (gPlayerState.floor_type != SURFACE_LADDER && GetTileTypeAtEntity(super) == SPECIAL_TILE_23) { + SetTile(SPECIAL_TILE_38, this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos + TILE_POS(0, -1), super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos + TILE_POS(0, -2), super->collisionLayer); } } else { if (gPlayerEntity.base.collisionLayer & 2) { gPlayerEntity.base.collisionLayer = 1; UpdateSpriteForCollisionLayer(&gPlayerEntity.base); } - if (GetTileTypeByEntity(super) != 0x4017) { - SetBottomTile(0x4017, this->tile, super->collisionLayer); - SetBottomTile(0x4017, this->tile - 64, super->collisionLayer); - SetBottomTile(0x4014, this->tile - 128, super->collisionLayer); + if (GetTileTypeAtEntity(super) != SPECIAL_TILE_23) { + SetTile(SPECIAL_TILE_23, this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_23, this->tilePos + TILE_POS(0, -1), super->collisionLayer); + SetTile(SPECIAL_TILE_20, this->tilePos + TILE_POS(0, -2), super->collisionLayer); } } break; @@ -366,8 +365,8 @@ static void sub_08090B6C(FurnitureEntity* this) { if (width != 0) { u8 w2 = width / 8; u32 px = super->x.HALF.HI & 0xF; - u32 tile = this->tile; - u32 cl = super->collisionLayer; + u32 tilePos = this->tilePos; + u32 layer = super->collisionLayer; int i; switch ((u32)w2 & 3) { @@ -377,104 +376,103 @@ static void sub_08090B6C(FurnitureEntity* this) { num = 2; } for (i = -num; i <= num; ++i) { - SetBottomTile(0x4022, tile + i, cl); + SetTile(SPECIAL_TILE_34, tilePos + i, layer); } if (px & 8) { - sub_08090CDC(0x4024, tile - i, cl); - sub_08090CDC(0x4025, tile + i, cl); + sub_08090CDC(SPECIAL_TILE_36, tilePos - i, layer); + sub_08090CDC(SPECIAL_TILE_37, tilePos + i, layer); } else { - SetBottomTile(0x4022, tile - i, cl); + SetTile(SPECIAL_TILE_34, tilePos - i, layer); } break; case 1: num = w2 / 8; for (i = -num; i <= num; i++) { - SetBottomTile(0x4022, tile + i, cl); + SetTile(SPECIAL_TILE_34, tilePos + i, layer); } if (px & 8) { - sub_08090CDC(0x4024, tile - i, cl); + sub_08090CDC(SPECIAL_TILE_36, tilePos - i, layer); if (i != 0) { - SetBottomTile(0x4022, tile + i, cl); + SetTile(SPECIAL_TILE_34, tilePos + i, layer); } } else { if (i != 0) { - SetBottomTile(0x4022, tile - i, cl); + SetTile(SPECIAL_TILE_34, tilePos - i, layer); } - sub_08090CDC(0x4025, tile + i, cl); + sub_08090CDC(SPECIAL_TILE_37, tilePos + i, layer); } break; case 2: num = w2 / 4; for (i = -num; i < num; ++i) { - SetBottomTile(0x4022, tile + i, cl); + SetTile(SPECIAL_TILE_34, tilePos + i, layer); } if (px & 8) { - SetBottomTile(0x4022, tile + i, cl); + SetTile(SPECIAL_TILE_34, tilePos + i, layer); } else { - sub_08090CDC(0x4024, tile - i - 1, cl); - sub_08090CDC(0x4025, tile + i, cl); + sub_08090CDC(SPECIAL_TILE_36, tilePos - i - 1, layer); + sub_08090CDC(SPECIAL_TILE_37, tilePos + i, layer); } break; case 3: num = w2 / 4; for (i = -num; i <= num; ++i) { - SetBottomTile(0x4022, tile + i, cl); + SetTile(SPECIAL_TILE_34, tilePos + i, layer); } if (px & 8) { - sub_08090CDC(0x4025, tile + i, cl); + sub_08090CDC(SPECIAL_TILE_37, tilePos + i, layer); } else { - sub_08090CDC(0x4024, tile - i, cl); + sub_08090CDC(SPECIAL_TILE_36, tilePos - i, layer); } break; } } } -static void sub_08090CDC(u32 id, u32 pos, u32 layer) { - u16 cur = GetTileIndex(pos, layer); +static void sub_08090CDC(u32 tileIndex, u32 tilePos, u32 layer) { + u16 cur = GetTileIndex(tilePos, layer); u32 next = cur; - u32 id2; if ((cur & 0x4000) == 0) { - SetBottomTile(id, pos, layer); + SetTile(tileIndex, tilePos, layer); } else { switch (cur) { - case 0x4025: - if (id == 0x4024) - next = 0x4022; - if (id == 0x402c) - next = 0x4022; + case SPECIAL_TILE_37: + if (tileIndex == SPECIAL_TILE_36) + next = SPECIAL_TILE_34; + if (tileIndex == SPECIAL_TILE_44) + next = SPECIAL_TILE_34; break; - case 0x402D: - if (id == 0x402c) - next = 0x402b; - if (id == 0x4024) - next = 0x4022; + case SPECIAL_TILE_45: + if (tileIndex == SPECIAL_TILE_44) + next = SPECIAL_TILE_43; + if (tileIndex == SPECIAL_TILE_36) + next = SPECIAL_TILE_34; break; - case 0x4024: - if (id == 0x4025) - next = 0x4022; - if (id == 0x402d) - next = 0x4022; + case SPECIAL_TILE_36: + if (tileIndex == SPECIAL_TILE_37) + next = SPECIAL_TILE_34; + if (tileIndex == SPECIAL_TILE_45) + next = SPECIAL_TILE_34; break; - case 0x402C: - if (id == 0x402d) - next = 0x402b; - if (id == 0x4025) - next = 0x4022; + case SPECIAL_TILE_44: + if (tileIndex == SPECIAL_TILE_45) + next = SPECIAL_TILE_43; + if (tileIndex == SPECIAL_TILE_37) + next = SPECIAL_TILE_34; break; - case 0x4022: - case 0x4023: - case 0x4026: - case 0x4027: - case 0x4028: - case 0x4029: - case 0x402a: - case 0x402b: + case SPECIAL_TILE_34: + case SPECIAL_TILE_35: + case SPECIAL_TILE_38: + case SPECIAL_TILE_39: + case SPECIAL_TILE_40: + case SPECIAL_TILE_41: + case SPECIAL_TILE_42: + case SPECIAL_TILE_43: default: return; } - SetBottomTile(next, pos, layer); + SetTile(next, tilePos, layer); } } diff --git a/src/object/gentariCurtain.c b/src/object/gentariCurtain.c index a4c5e2a6..97c3aad0 100644 --- a/src/object/gentariCurtain.c +++ b/src/object/gentariCurtain.c @@ -10,12 +10,13 @@ #include "functions.h" #include "object.h" #include "room.h" +#include "tiles.h" typedef struct { Entity base; u8 filler[0x8]; - u16 tile; - u16 tile2; + u16 tilePos; + u16 tilePos2; u16 tileIndex; u16 tileIndex2; u8 filler2[0xe]; @@ -55,12 +56,12 @@ void GentariCurtain_Init(GentariCurtainEntity* this) { super->spritePriority.b0 = 6; super->x.HALF.HI += 2; UpdateSpriteForCollisionLayer(super); - this->tile = COORD_TO_TILE_OFFSET(super, 0, 8); - this->tile2 = COORD_TO_TILE_OFFSET(super, 0, -8); - this->tileIndex = GetTileIndex(this->tile, 1); - this->tileIndex2 = GetTileIndex(this->tile2, 1); - SetBottomTile(0x4022, this->tile, 1); - SetBottomTile(0x4022, this->tile2, 1); + this->tilePos = COORD_TO_TILE_OFFSET(super, 0, 8); + this->tilePos2 = COORD_TO_TILE_OFFSET(super, 0, -8); + this->tileIndex = GetTileIndex(this->tilePos, LAYER_BOTTOM); + this->tileIndex2 = GetTileIndex(this->tilePos2, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, this->tilePos, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, this->tilePos2, LAYER_BOTTOM); InitAnimationForceUpdate(super, 0); } else { super->action = 1; @@ -80,8 +81,8 @@ void GentariCurtain_Action2(GentariCurtainEntity* this) { UpdateAnimationSingleFrame(super); if ((super->frame & ANIM_DONE) != 0) { super->action = 3; - SetBottomTile(this->tileIndex, this->tile, 1); - SetBottomTile(this->tileIndex2, this->tile2, 1); + SetTile(this->tileIndex, this->tilePos, LAYER_BOTTOM); + SetTile(this->tileIndex2, this->tilePos2, LAYER_BOTTOM); sub_08092214(this); sub_0809223C(this); InitAnimationForceUpdate(super, 1); diff --git a/src/object/giantBookLadder.c b/src/object/giantBookLadder.c index fb808a1b..5f18d1b4 100644 --- a/src/object/giantBookLadder.c +++ b/src/object/giantBookLadder.c @@ -4,8 +4,10 @@ * * @brief Giant Book Ladder object */ -#include "object.h" #include "manager.h" +#include "map.h" +#include "object.h" +#include "tiles.h" typedef struct { Entity base; @@ -43,43 +45,43 @@ void sub_0808E55C(GiantBookLadderEntity* this) { u32 uVar4; u32 unaff_r9; u32 uVar5; - u32 position; + u32 tilePos; switch (super->type) { case 0: case 2: - position = this->unk74; - unaff_r9 = position - 0x101; - SetBottomTile(0x408f, unaff_r9, super->collisionLayer); - SetBottomTile(0x408f, position - 0x100, super->collisionLayer); - SetBottomTile(0x406c, position - 0x102, super->collisionLayer); - SetBottomTile(0x406d, position - 0xff, super->collisionLayer); + tilePos = this->unk74; + unaff_r9 = tilePos + TILE_POS(-1, -4); + SetTile(SPECIAL_TILE_143, unaff_r9, super->collisionLayer); + SetTile(SPECIAL_TILE_143, tilePos + TILE_POS(0, -4), super->collisionLayer); + SetTile(SPECIAL_TILE_108, tilePos + TILE_POS(-2, -4), super->collisionLayer); + SetTile(SPECIAL_TILE_109, tilePos + TILE_POS(1, -4), super->collisionLayer); type = super->type; uVar5 = 6; if (type != 0) { uVar5 = 4; - SetBottomTile(0x4072, position + 0x3f, super->collisionLayer); - SetBottomTile(0x4072, position + 0x40, super->collisionLayer); - SetBottomTile(0x4072, position + 0x7f, super->collisionLayer); - SetBottomTile(0x4072, position + 0x80, super->collisionLayer); + SetTile(SPECIAL_TILE_114, tilePos + TILE_POS(-1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_114, tilePos + TILE_POS(0, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_114, tilePos + TILE_POS(-1, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_114, tilePos + TILE_POS(0, 2), super->collisionLayer); } break; case 1: - position = this->unk74; - unaff_r9 = position - 1; - SetBottomTile(0x408e, unaff_r9, super->collisionLayer); - SetBottomTile(0x408e, position, super->collisionLayer); + tilePos = this->unk74; + unaff_r9 = tilePos - 1; + SetTile(SPECIAL_TILE_142, unaff_r9, super->collisionLayer); + SetTile(SPECIAL_TILE_142, tilePos, super->collisionLayer); uVar5 = 2; break; } for (uVar4 = 0; uVar4 < uVar5; uVar4++) { unaff_r9 += 0x40; - SetBottomTile(0x408e, unaff_r9, super->collisionLayer); - SetBottomTile(0x408e, unaff_r9 + 1, super->collisionLayer); + SetTile(SPECIAL_TILE_142, unaff_r9, super->collisionLayer); + SetTile(SPECIAL_TILE_142, unaff_r9 + 1, super->collisionLayer); } } u32 sub_0808E670(GiantBookLadderEntity* this) { - return GetTileType(this->unk74 - 0x101, 1); + return GetTileTypeAtTilePos(this->unk74 - 0x101, LAYER_BOTTOM); } diff --git a/src/object/giantLeaf.c b/src/object/giantLeaf.c index 3ef82f75..6293a9d0 100644 --- a/src/object/giantLeaf.c +++ b/src/object/giantLeaf.c @@ -4,6 +4,7 @@ * * @brief Giant Leaf object */ +#include "map.h" #include "object.h" void sub_0808D618(Entity* this); @@ -35,6 +36,6 @@ void sub_0808D618(Entity* this) { ((((this->y.HALF.HI - gRoomControls.origin_y) >> 4) & 0x3F) * 64); for (i = 0; i < 13; i++) { - SetBottomTile(16500, tilePos + arr[i], 1); + SetTile(16500, tilePos + arr[i], LAYER_BOTTOM); } } diff --git a/src/object/giantRock2.c b/src/object/giantRock2.c index 4370663b..ea4a9efd 100644 --- a/src/object/giantRock2.c +++ b/src/object/giantRock2.c @@ -7,11 +7,12 @@ #include "asm.h" #include "entity.h" #include "room.h" +#include "tiles.h" typedef struct { Entity base; u8 filler[0xC]; - u16 tile; + u16 tilePos; } GiantRock2Entity; void GiantRock2_Init(GiantRock2Entity* this); @@ -27,22 +28,22 @@ void GiantRock2(Entity* this) { void GiantRock2_Init(GiantRock2Entity* this) { u32 collisionLayer; - u16 position; + u16 tilePos; int index; u32 tileIndex; super->action = 1; - this->tile = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); collisionLayer = super->collisionLayer; super->spritePriority.b0 = 7; - position = (this->tile - 0x80); - tileIndex = 0x4022; + tilePos = (this->tilePos - TILE_POS(0, 2)); + tileIndex = SPECIAL_TILE_34; for (index = 4; index > -1; index--) { - SetBottomTile(tileIndex, position - 2, collisionLayer); - SetBottomTile(tileIndex, position - 1, collisionLayer); - SetBottomTile(tileIndex, position, collisionLayer); - SetBottomTile(tileIndex, position + 1, collisionLayer); - position += 0x40; + SetTile(tileIndex, tilePos - 2, collisionLayer); + SetTile(tileIndex, tilePos - 1, collisionLayer); + SetTile(tileIndex, tilePos, collisionLayer); + SetTile(tileIndex, tilePos + 1, collisionLayer); + tilePos += TILE_POS(0, 1); } } diff --git a/src/object/giantTwig.c b/src/object/giantTwig.c index a308adf0..00beda17 100644 --- a/src/object/giantTwig.c +++ b/src/object/giantTwig.c @@ -6,11 +6,12 @@ */ #include "functions.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; /*0x68*/ u8 unk_68[0xe]; - /*0x76*/ u16 tilePosition; + /*0x76*/ u16 tilePos; /*0x78*/ u16 unk_78; /*0x7a*/ u16 unk_7a; } GiantTwigEntity; @@ -69,7 +70,7 @@ void GiantTwig(GiantTwigEntity* this) { void GiantTwig_Type0Init(GiantTwigEntity* this) { Entity* obj; super->action = 1; - this->tilePosition = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); switch (super->type) { case 0: super->frameIndex = 1; @@ -115,7 +116,7 @@ void GiantTwig_Type1Init(GiantTwigEntity* this) { super->action = 1; super->frameIndex = (super->type2 & 1) + 3; super->spritePriority.b0 = 7; - this->tilePosition = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); sub_08093A1C(this); } @@ -127,7 +128,7 @@ void GiantTwig_Type2Init(GiantTwigEntity* this) { super->frameIndex = (super->type2 & 1) + 5; super->spriteRendering.b3 = 3; super->spritePriority.b0 = 7; - this->tilePosition = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); if ((super->type2 & 1) != 0) { super->spriteOffsetX = 8; } @@ -140,22 +141,28 @@ void GiantTwig_Type2Idle(GiantTwigEntity* this) { void sub_08093984(GiantTwigEntity* this) { u32 index; - const s16* array; + const s16* tileOffsets; if (super->type2 != 0) { static const s16 gUnk_081228F8[] = { - -130, -129, -128, -127, -66, -65, -64, -63, -62, -2, -1, 0, 1, 2, 63, 64, 65, 66, 67, + TILE_POS(-2, -2), TILE_POS(-1, -2), TILE_POS(0, -2), TILE_POS(1, -2), TILE_POS(-2, -1), + TILE_POS(-1, -1), TILE_POS(0, -1), TILE_POS(1, -1), TILE_POS(2, -1), TILE_POS(-2, 0), + TILE_POS(-1, 0), TILE_POS(0, 0), TILE_POS(1, 0), TILE_POS(2, 0), TILE_POS(-1, 1), + TILE_POS(0, 1), TILE_POS(1, 1), TILE_POS(2, 1), TILE_POS(3, 1), }; - array = gUnk_081228F8; + tileOffsets = gUnk_081228F8; } else { static const s16 gUnk_0812291E[] = { - -129, -128, -127, -126, -66, -65, -64, -63, -62, -2, -1, 0, 1, 2, 61, 62, 63, 64, 65, + TILE_POS(-1, -2), TILE_POS(0, -2), TILE_POS(1, -2), TILE_POS(2, -2), TILE_POS(-2, -1), + TILE_POS(-1, -1), TILE_POS(0, -1), TILE_POS(1, -1), TILE_POS(2, -1), TILE_POS(-2, 0), + TILE_POS(-1, 0), TILE_POS(0, 0), TILE_POS(1, 0), TILE_POS(2, 0), TILE_POS(-3, 1), + TILE_POS(-2, 1), TILE_POS(-1, 1), TILE_POS(0, 1), TILE_POS(1, 1), }; - array = gUnk_0812291E; + tileOffsets = gUnk_0812291E; } for (index = 0; index < 0x13; index++) { - SetBottomTile(0x4074, array[index] + this->tilePosition, 1); + SetTile(SPECIAL_TILE_116, tileOffsets[index] + this->tilePos, LAYER_BOTTOM); } } @@ -163,7 +170,7 @@ void GiantTwig_Type3Init(GiantTwigEntity* this) { super->action = 1; super->frameIndex = (super->type2 & 3) + 7; super->spritePriority.b0 = 7; - this->tilePosition = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); sub_08093A1C(this); ChangeObjPalette(super, 0x7a); } @@ -174,47 +181,47 @@ void GiantTwig_Type3Idle(GiantTwigEntity* this) { void sub_08093A1C(GiantTwigEntity* this) { switch (super->type) { case 0: - SetBottomTile(0x4024, this->tilePosition + 0x3c, super->collisionLayer); - SetBottomTile(0x4022, this->tilePosition + 0x3d, super->collisionLayer); - SetBottomTile(0x4022, this->tilePosition + 0x3e, super->collisionLayer); - SetBottomTile(0x4029, this->tilePosition + 0x7c, super->collisionLayer); - SetBottomTile(0x4026, this->tilePosition + 0x7d, super->collisionLayer); - SetBottomTile(0x4026, this->tilePosition + 0x7e, super->collisionLayer); - SetBottomTile(0x403d, this->tilePosition + 0x40, super->collisionLayer); - SetBottomTile(0x403d, this->tilePosition + 0x80, super->collisionLayer); - SetBottomTile(0x4027, this->tilePosition + 0x41, super->collisionLayer); - SetBottomTile(0x4023, this->tilePosition + 0x42, super->collisionLayer); - SetBottomTile(0x406d, this->tilePosition + 0x43, super->collisionLayer); - SetBottomTile(0x4029, this->tilePosition + 0x81, super->collisionLayer); - SetBottomTile(0x4026, this->tilePosition + 0x82, super->collisionLayer); - SetBottomTile(0x4026, this->tilePosition + 0x83, super->collisionLayer); + SetTile(SPECIAL_TILE_36, this->tilePos + TILE_POS(-4, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + TILE_POS(-3, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + TILE_POS(-2, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_41, this->tilePos + TILE_POS(-4, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_38, this->tilePos + TILE_POS(-3, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_38, this->tilePos + TILE_POS(-2, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos + TILE_POS(0, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos + TILE_POS(0, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_39, this->tilePos + TILE_POS(1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_35, this->tilePos + TILE_POS(2, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_109, this->tilePos + TILE_POS(3, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_41, this->tilePos + TILE_POS(1, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_38, this->tilePos + TILE_POS(2, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_38, this->tilePos + TILE_POS(3, 2), super->collisionLayer); break; case 1: if ((super->type2 & 1) != 0) { - SetBottomTile(0x406d, this->tilePosition - 0x81, super->collisionLayer); - SetBottomTile(0x4022, this->tilePosition - 0x41, super->collisionLayer); - SetBottomTile(0x4029, this->tilePosition - 2, super->collisionLayer); - SetBottomTile(0x4026, this->tilePosition - 1, super->collisionLayer); - SetBottomTile(0x4022, this->tilePosition, super->collisionLayer); - SetBottomTile(0x406d, this->tilePosition + 1, super->collisionLayer); - SetBottomTile(0x406e, this->tilePosition + 0x40, super->collisionLayer); - SetBottomTile(0x4022, this->tilePosition + 0x41, super->collisionLayer); - SetBottomTile(0x406d, this->tilePosition + 0x42, super->collisionLayer); + SetTile(SPECIAL_TILE_109, this->tilePos + TILE_POS(-1, -2), super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + TILE_POS(-1, -1), super->collisionLayer); + SetTile(SPECIAL_TILE_41, this->tilePos + TILE_POS(-2, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_38, this->tilePos + TILE_POS(-1, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + TILE_POS(0, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_109, this->tilePos + TILE_POS(1, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_110, this->tilePos + TILE_POS(0, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + TILE_POS(1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_109, this->tilePos + TILE_POS(2, 1), super->collisionLayer); } else { - SetBottomTile(0x406c, this->tilePosition - 0x7f, super->collisionLayer); - SetBottomTile(0x4022, this->tilePosition - 0x3f, super->collisionLayer); - SetBottomTile(0x406c, this->tilePosition - 1, super->collisionLayer); - SetBottomTile(0x4022, this->tilePosition, super->collisionLayer); - SetBottomTile(0x4026, this->tilePosition + 1, super->collisionLayer); - SetBottomTile(0x402a, this->tilePosition + 2, super->collisionLayer); - SetBottomTile(0x406c, this->tilePosition + 0x3e, super->collisionLayer); - SetBottomTile(0x4022, this->tilePosition + 0x3f, super->collisionLayer); - SetBottomTile(0x406f, this->tilePosition + 0x40, super->collisionLayer); + SetTile(SPECIAL_TILE_108, this->tilePos + TILE_POS(1, -2), super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + TILE_POS(1, -1), super->collisionLayer); + SetTile(SPECIAL_TILE_108, this->tilePos + TILE_POS(-1, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + TILE_POS(0, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_38, this->tilePos + TILE_POS(1, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_42, this->tilePos + TILE_POS(2, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_108, this->tilePos + TILE_POS(-2, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + TILE_POS(-1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_111, this->tilePos + TILE_POS(0, 1), super->collisionLayer); return; } break; case 3: - SetBottomTile(0x4022, this->tilePosition, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos, super->collisionLayer); break; } } @@ -223,12 +230,12 @@ void sub_08093C70(GiantTwigEntity* this) { if (this->unk_78 != 0) { if (gPlayerState.heldObject != 0) { this->unk_78 = 0; - SetBottomTile(0x4022, this->tilePosition + 0x3f, super->collisionLayer); - SetBottomTile(0x4022, this->tilePosition + 0x40, super->collisionLayer); - SetBottomTile(0x4022, this->tilePosition + 0x41, super->collisionLayer); - SetBottomTile(0x4026, this->tilePosition + 0x7f, super->collisionLayer); - SetBottomTile(0x4026, this->tilePosition + 0x80, super->collisionLayer); - SetBottomTile(0x4026, this->tilePosition + 0x81, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + TILE_POS(-1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + TILE_POS(0, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + TILE_POS(1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_38, this->tilePos + TILE_POS(-1, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_38, this->tilePos + TILE_POS(0, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_38, this->tilePos + TILE_POS(1, 2), super->collisionLayer); } } else { @@ -236,12 +243,12 @@ void sub_08093C70(GiantTwigEntity* this) { if (--this->unk_7a == 0) { this->unk_78++; this->unk_7a = 0x3c; - SetBottomTile(0x403d, this->tilePosition + 0x3f, super->collisionLayer); - SetBottomTile(0x403d, this->tilePosition + 0x40, super->collisionLayer); - SetBottomTile(0x4027, this->tilePosition + 0x41, super->collisionLayer); - SetBottomTile(0x403d, this->tilePosition + 0x7f, super->collisionLayer); - SetBottomTile(0x403d, this->tilePosition + 0x80, super->collisionLayer); - SetBottomTile(0x4029, this->tilePosition + 0x81, super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos + TILE_POS(-1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos + TILE_POS(0, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_39, this->tilePos + TILE_POS(1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos + TILE_POS(-1, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos + TILE_POS(0, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_41, this->tilePos + TILE_POS(1, 2), super->collisionLayer); } } } diff --git a/src/object/hiddenLadderDown.c b/src/object/hiddenLadderDown.c index 5b12f8a6..dd7ed7d5 100644 --- a/src/object/hiddenLadderDown.c +++ b/src/object/hiddenLadderDown.c @@ -8,6 +8,7 @@ #include "entity.h" #include "flags.h" #include "functions.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -41,20 +42,20 @@ void HiddenLadderDown_Init(HiddenLadderDownEntity* this) { if (CheckFlags(this->unk_86) != 0) { super->action = 2; super->spriteSettings.draw = TRUE; - SetTileType(0x1a2, *puVar3 - 0x41, super->collisionLayer); - SetTileType(0x1a3, *puVar3 - 0x40, super->collisionLayer); - SetTileType(0x1a4, *puVar3 - 0x3f, super->collisionLayer); - SetTileType(0x1a5, *puVar3 - 1, super->collisionLayer); - SetTileType(0x1a6, *puVar3, super->collisionLayer); - SetTileType(0x1a7, *puVar3 + 1, super->collisionLayer); - SetTileType(0x1a8, *puVar3 + 0x3f, super->collisionLayer); - SetTileType(0x1a9, *puVar3 + 0x40, super->collisionLayer); - SetTileType(0x1aa, *puVar3 + 0x41, super->collisionLayer); + SetTileType(TILE_TYPE_418, *puVar3 + TILE_POS(-1, -1), super->collisionLayer); + SetTileType(TILE_TYPE_419, *puVar3 + TILE_POS(0, -1), super->collisionLayer); + SetTileType(TILE_TYPE_420, *puVar3 + TILE_POS(1, -1), super->collisionLayer); + SetTileType(TILE_TYPE_421, *puVar3 + TILE_POS(-1, 0), super->collisionLayer); + SetTileType(TILE_TYPE_422, *puVar3 + TILE_POS(0, 0), super->collisionLayer); + SetTileType(TILE_TYPE_423, *puVar3 + TILE_POS(1, 0), super->collisionLayer); + SetTileType(TILE_TYPE_424, *puVar3 + TILE_POS(-1, 1), super->collisionLayer); + SetTileType(TILE_TYPE_425, *puVar3 + TILE_POS(0, 1), super->collisionLayer); + SetTileType(TILE_TYPE_426, *puVar3 + TILE_POS(1, 1), super->collisionLayer); } } void HiddenLadderDown_Action1(HiddenLadderDownEntity* this) { - if (GetTileType(this->unk_70, super->collisionLayer) == 0x1a6) { + if (GetTileTypeAtTilePos(this->unk_70, super->collisionLayer) == 0x1a6) { super->action = 2; super->spriteSettings.draw = TRUE; SetFlag(this->unk_86); diff --git a/src/object/itemForSale.c b/src/object/itemForSale.c index 60cfe8f2..cb37efd5 100644 --- a/src/object/itemForSale.c +++ b/src/object/itemForSale.c @@ -75,7 +75,7 @@ void ItemForSale_Init(ItemForSaleEntity* this) { void ItemForSale_Action1(ItemForSaleEntity* this) { if (super->subAction != 0) { super->action = 2; - gUnk_0200AF00.rActionPlayerState = 2; + gHUD.rActionPlayerState = 2; } else { if (super->type == 0x36) { if (super->interactType != INTERACTION_NONE) { @@ -92,7 +92,7 @@ void ItemForSale_Action1(ItemForSaleEntity* this) { ResetActiveItems(); gPlayerState.heldObject = 4; gPlayerEntity.carriedEntity = super; - gUnk_0200AF00.rActionPlayerState = R_ACTION_DROP; + gHUD.rActionPlayerState = R_ACTION_DROP; MessageClose(); } } @@ -102,13 +102,13 @@ void ItemForSale_Action1(ItemForSaleEntity* this) { void ItemForSale_Action2(ItemForSaleEntity* this) { void* ptr; - gUnk_0200AF00.rActionPlayerState = R_ACTION_DROP; + gHUD.rActionPlayerState = R_ACTION_DROP; super->spriteSettings.draw = gPlayerEntity.base.spriteSettings.draw; if ((gPlayerState.heldObject == 0) || (super != gPlayerEntity.carriedEntity)) { sub_080819B4(this); } else { ptr = sub_080784E4(); - if (((*(int*)(ptr + 8) == 0) || ((*(u8*)(ptr + 1) != 1 || (gUnk_0200AF00.rActionPlayerState = R_ACTION_SPEAK, + if (((*(int*)(ptr + 8) == 0) || ((*(u8*)(ptr + 1) != 1 || (gHUD.rActionPlayerState = R_ACTION_SPEAK, (gPlayerState.playerInput.newInput & (INPUT_ACTION | INPUT_INTERACT)) == 0)))) && ((gPlayerState.playerInput.newInput & (INPUT_ACTION | INPUT_CANCEL | INPUT_INTERACT)) != 0)) { @@ -120,7 +120,7 @@ void ItemForSale_Action2(ItemForSaleEntity* this) { void sub_080819B4(ItemForSaleEntity* this) { Entity* parent; u8* puVar2; - struct_0200AF00* ptr; + HUD* hud; if (gRoomVars.shopItemType == 0) { if (super->parent != NULL) { @@ -130,10 +130,10 @@ void sub_080819B4(ItemForSaleEntity* this) { } gPlayerState.heldObject = 0; gPlayerEntity.carriedEntity = 0; - ptr = &gUnk_0200AF00; + hud = &gHUD; gRoomVars.shopItemType = 0; - ptr->rActionInteractObject = R_ACTION_NONE; - ptr->rActionPlayerState = R_ACTION_NONE; + hud->rActionInteractObject = R_ACTION_NONE; + hud->rActionPlayerState = R_ACTION_NONE; gRoomVars.shopItemType2 = 0; super->x.HALF.HI = this->unk_80 + gRoomControls.origin_x; super->y.HALF.HI = this->unk_82 + gRoomControls.origin_y; diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c index 8080b14c..7d627de4 100644 --- a/src/object/itemOnGround.c +++ b/src/object/itemOnGround.c @@ -15,6 +15,7 @@ #include "object.h" #include "player.h" #include "sound.h" +#include "tiles.h" void sub_08081150(ItemOnGroundEntity* this); u8 sub_0808147C(u32); @@ -217,7 +218,7 @@ void sub_08081188(ItemOnGroundEntity* this) { void sub_080811AC(ItemOnGroundEntity* this) { super->action = 2; super->spriteSettings.draw = 0; - this->unk_6e = GetTileTypeByEntity(super); + this->unk_6e = GetTileTypeAtEntity(super); } void sub_080811C8(ItemOnGroundEntity* this) { @@ -283,7 +284,7 @@ void sub_080812A0(ItemOnGroundEntity* this) { } void sub_080812A8(ItemOnGroundEntity* this) { - if (sub_080B1B0C(super) != 0xF && this->unk_6e != GetTileTypeByEntity(super)) { + if (GetCollisionDataAtEntity(super) != COLLISION_DATA_15 && this->unk_6e != GetTileTypeAtEntity(super)) { super->direction = 0; super->speed = 0; super->spriteSettings.draw = 1; diff --git a/src/object/jailBars.c b/src/object/jailBars.c index 814a7bff..b244af4e 100644 --- a/src/object/jailBars.c +++ b/src/object/jailBars.c @@ -9,6 +9,7 @@ #include "functions.h" #include "room.h" #include "sound.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -66,10 +67,36 @@ void JailBars_Action3(JailBarsEntity* this) { } static void SetJailBarTiles(JailBarsEntity* this, u32 arg1) { - static const s16 gUnk_08124960[] = { 0x4023, -0x3, 0x4023, -0x2, 0x4023, -0x1, 0x4023, - 0x0, 0x4023, 0x1, 0x4023, 0x2, -0x1 }; - static const s16 gUnk_0812497A[] = { 0x4023, -0x3, 0x4023, -0x2, 0x4088, -0x1, 0x4087, - 0x0, 0x4023, 0x1, 0x4023, 0x2, -0x1 }; + static const s16 gUnk_08124960[] = { + SPECIAL_TILE_35, + -0x3, + SPECIAL_TILE_35, + -0x2, + SPECIAL_TILE_35, + -0x1, + SPECIAL_TILE_35, + 0x0, + SPECIAL_TILE_35, + 0x1, + SPECIAL_TILE_35, + 0x2, + -0x1, + }; + static const s16 gUnk_0812497A[] = { + SPECIAL_TILE_35, + -0x3, + SPECIAL_TILE_35, + -0x2, + SPECIAL_TILE_136, + -0x1, + SPECIAL_TILE_135, + 0x0, + SPECIAL_TILE_35, + 0x1, + SPECIAL_TILE_35, + 0x2, + -0x1, + }; const s16* puVar1; puVar1 = gUnk_08124960; diff --git a/src/object/jarPortal.c b/src/object/jarPortal.c index 83c47a0d..99341c30 100644 --- a/src/object/jarPortal.c +++ b/src/object/jarPortal.c @@ -7,6 +7,7 @@ #include "area.h" #include "functions.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -24,7 +25,7 @@ void JarPortal_Action1(JarPortalEntity* this); void JarPortal_Action2(JarPortalEntity* this); void JarPortal_Action3(JarPortalEntity* this); void JarPortal_Action4(JarPortalEntity* this); -void sub_0808C148(JarPortalEntity* this, u32); +void sub_0808C148(JarPortalEntity* this, bool32); void sub_0808C01C(JarPortalEntity* this, u32); void JarPortal(JarPortalEntity* this) { @@ -69,7 +70,7 @@ void JarPortal_Action1(JarPortalEntity* this) { } else { ClearLocalFlag(super->type); } - sub_0808C148(this, 0); + sub_0808C148(this, FALSE); } sub_0808C01C(this, 0); } @@ -96,7 +97,7 @@ void JarPortal_Action2(JarPortalEntity* this) { ++super->action; super->subtimer = 0; InitAnimationForceUpdate(super, 1); - sub_0808C148(this, 1); + sub_0808C148(this, TRUE); } break; } @@ -110,7 +111,7 @@ void JarPortal_Action3(JarPortalEntity* this) { ClearLocalFlag(super->type); else SetLocalFlag(super->type); - sub_0808C148(this, 0); + sub_0808C148(this, FALSE); } sub_0808C01C(this, 1); } @@ -163,7 +164,7 @@ void JarPortal_Action4(JarPortalEntity* this) { if (!super->z.HALF.HI) { super->action = 1; InitAnimationForceUpdate(super, 0); - sub_0808C148(this, 1); + sub_0808C148(this, TRUE); } break; } @@ -178,19 +179,17 @@ void sub_0808C13C(JarPortalEntity* this) { super->zVelocity = Q_16_16(2.5); } -void sub_0808C148(JarPortalEntity* this, u32 a2) { - u32 pos; - - pos = COORD_TO_TILE(super); - if (!a2) { - SetBottomTile(16530, pos - 1, super->collisionLayer); - SetBottomTile(16531, pos, super->collisionLayer); - SetBottomTile(16532, pos + 63, super->collisionLayer); - SetBottomTile(16533, pos + 64, super->collisionLayer); +void sub_0808C148(JarPortalEntity* this, bool32 setTiles) { + u32 tilePos = COORD_TO_TILE(super); + if (!setTiles) { + SetTile(SPECIAL_TILE_146, tilePos + TILE_POS(-1, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_147, tilePos + TILE_POS(0, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_148, tilePos + TILE_POS(-1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_149, tilePos + TILE_POS(0, 1), super->collisionLayer); } else { - RestorePrevTileEntity(pos - 1, super->collisionLayer); - RestorePrevTileEntity(pos, super->collisionLayer); - RestorePrevTileEntity(pos + 63, super->collisionLayer); - RestorePrevTileEntity(pos + 64, super->collisionLayer); + RestorePrevTileEntity(tilePos + TILE_POS(-1, 0), super->collisionLayer); + RestorePrevTileEntity(tilePos + 0, super->collisionLayer); + RestorePrevTileEntity(tilePos + TILE_POS(-1, 1), super->collisionLayer); + RestorePrevTileEntity(tilePos + TILE_POS(0, 1), super->collisionLayer); } } diff --git a/src/object/keyStealingTakkuri.c b/src/object/keyStealingTakkuri.c index 2fceaa87..dfd35e6a 100644 --- a/src/object/keyStealingTakkuri.c +++ b/src/object/keyStealingTakkuri.c @@ -417,7 +417,7 @@ void sub_0809E0D4(KeyStealingTakkuriEntity* this, ScriptExecutionContext* contex entity = &gPlayerEntity.base; } context->unk_18++; - sub_0807DEDC(super, context, entity->x.HALF.HI, entity->y.HALF.HI); + LookAt(super, context, entity->x.HALF.HI, entity->y.HALF.HI); SoundReq(SFX_123); gActiveScriptInfo.commandSize = 0; } else { @@ -433,7 +433,7 @@ void sub_0809E0D4(KeyStealingTakkuriEntity* this, ScriptExecutionContext* contex varY2 = varY; if (--context->unk_19 == 0) { context->unk_19 = 8; - super->direction = CalcOffsetAngle(varX2 - super->x.HALF.HI, varY2 - super->y.HALF.HI); + super->direction = CalculateDirectionFromOffsets(varX2 - super->x.HALF.HI, varY2 - super->y.HALF.HI); } varX3 = super->x.HALF.HI - varX2; varY3 = super->y.HALF.HI - varY2; diff --git a/src/object/kinstoneSpark.c b/src/object/kinstoneSpark.c index ad596c89..b32609f2 100644 --- a/src/object/kinstoneSpark.c +++ b/src/object/kinstoneSpark.c @@ -80,7 +80,7 @@ void sub_080A0AF0(Entity* this) { } void sub_080A0B28(Entity* this, ScriptExecutionContext* context) { - sub_0807DEDC(this, context, this->x.HALF.HI, this->y.HALF.HI); + LookAt(this, context, this->x.HALF.HI, this->y.HALF.HI); this->y.HALF.HI -= 0xb0; this->spriteSettings.draw = 0; } diff --git a/src/object/ladderUp.c b/src/object/ladderUp.c index 7bd66824..8dcd7e67 100644 --- a/src/object/ladderUp.c +++ b/src/object/ladderUp.c @@ -11,6 +11,7 @@ #include "player.h" #include "room.h" #include "sound.h" +#include "tiles.h" void LadderUp(Entity* this) { Entity* fxEnt; @@ -37,7 +38,7 @@ void LadderUp(Entity* this) { return; } this->y.HALF.HI = (this->y.HALF.HI & 0xfff0) + 0xc; - SetBottomTile(0x4023, COORD_TO_TILE(this), this->collisionLayer); + SetTile(SPECIAL_TILE_35, COORD_TO_TILE(this), this->collisionLayer); break; case 1: if (GravityUpdate(this, Q_8_8(16.0)) == 0) { @@ -65,17 +66,17 @@ void LadderUp(Entity* this) { default: if (this->type2 == 0) { if (gPlayerEntity.base.y.HALF.HI < this->y.HALF.HI) { - if (gPlayerState.floor_type != SURFACE_LADDER && (GetTileTypeByEntity(this) == 0x4017)) { - SetBottomTile(0x4023, COORD_TO_TILE(this), this->collisionLayer); - RestorePrevTileEntity(COORD_TO_TILE_OFFSET(this, 0, 0x10), this->collisionLayer); + if (gPlayerState.floor_type != SURFACE_LADDER && (GetTileTypeAtEntity(this) == SPECIAL_TILE_23)) { + SetTile(SPECIAL_TILE_35, COORD_TO_TILE(this), this->collisionLayer); + RestorePrevTileEntity(COORD_TO_TILE_OFFSET(this, 0, 16), this->collisionLayer); } } else { - if (GetTileTypeByEntity(this) != 0x4017) { - SetBottomTile(0x4017, COORD_TO_TILE(this), this->collisionLayer); + if (GetTileTypeAtEntity(this) != SPECIAL_TILE_23) { + SetTile(SPECIAL_TILE_23, COORD_TO_TILE(this), this->collisionLayer); if (this->type == 0) { - SetBottomTile(0x4017, COORD_TO_TILE_OFFSET(this, 0, 0x10), this->collisionLayer); + SetTile(SPECIAL_TILE_23, COORD_TO_TILE_OFFSET(this, 0, 16), this->collisionLayer); } else { - SetBottomTile(0x4014, COORD_TO_TILE_OFFSET(this, 0, 0x10), this->collisionLayer); + SetTile(SPECIAL_TILE_20, COORD_TO_TILE_OFFSET(this, 0, 16), this->collisionLayer); } } } diff --git a/src/object/lightDoor.c b/src/object/lightDoor.c index 5062c26f..3bb41e19 100644 --- a/src/object/lightDoor.c +++ b/src/object/lightDoor.c @@ -7,6 +7,7 @@ #include "functions.h" #include "object.h" #include "screen.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -85,15 +86,15 @@ void LightDoor_Action4(LightDoorEntity* this) { } void sub_080850FC(LightDoorEntity* this) { - u32 position = COORD_TO_TILE(super); + u32 tilePos = COORD_TO_TILE(super); u32 layer = super->collisionLayer; - SetBottomTile(0x403d, position - 0x41, layer); - SetBottomTile(0x403d, position - 0x40, layer); - SetBottomTile(0x403d, position - 0x3f, layer); - SetBottomTile(0x403d, position - 1, layer); - SetBottomTile(0x403d, position, layer); - SetBottomTile(0x403d, position + 1, layer); - SetBottomTile(0x403d, position + 0x3f, layer); - SetBottomTile(0x403d, position + 0x40, layer); - SetBottomTile(0x403d, position + 0x41, layer); + SetTile(SPECIAL_TILE_61, tilePos + TILE_POS(-1, -1), layer); + SetTile(SPECIAL_TILE_61, tilePos + TILE_POS(0, -1), layer); + SetTile(SPECIAL_TILE_61, tilePos + TILE_POS(1, -1), layer); + SetTile(SPECIAL_TILE_61, tilePos + TILE_POS(-1, 0), layer); + SetTile(SPECIAL_TILE_61, tilePos + TILE_POS(0, 0), layer); + SetTile(SPECIAL_TILE_61, tilePos + TILE_POS(1, 0), layer); + SetTile(SPECIAL_TILE_61, tilePos + TILE_POS(-1, 1), layer); + SetTile(SPECIAL_TILE_61, tilePos + TILE_POS(0, 1), layer); + SetTile(SPECIAL_TILE_61, tilePos + TILE_POS(1, 1), layer); } diff --git a/src/object/lightableSwitch.c b/src/object/lightableSwitch.c index a6f0427f..e8f22525 100644 --- a/src/object/lightableSwitch.c +++ b/src/object/lightableSwitch.c @@ -12,6 +12,7 @@ #include "object.h" #include "room.h" #include "sound.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -99,7 +100,7 @@ static void sub_0809EAD8(LightableSwitchEntity* this) { UpdateRailMovement(super, (u16**)&super->child, &this->unk_74); } else { - SetBottomTile(0x4050, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_80, COORD_TO_TILE(super), super->collisionLayer); } } diff --git a/src/object/lilypadLarge.c b/src/object/lilypadLarge.c index b34360a2..03cca48a 100644 --- a/src/object/lilypadLarge.c +++ b/src/object/lilypadLarge.c @@ -9,6 +9,8 @@ #include "functions.h" #include "item.h" #include "object.h" +#include "map.h" +#include "tiles.h" extern s8 gUnk_08126EE4[]; @@ -48,7 +50,7 @@ void LilypadLarge_Init(LilypadLargeEntity* this) { super->type = 0; } if (super->type != 0) { - if (gArea.locationIndex == 0x1b) { + if (gArea.locationIndex == 27) { // AREA_TEMPLE_OF_DROPLETS if (CheckLocalFlag(super->type2) == 0) { DeleteThisEntity(); } @@ -329,10 +331,10 @@ void LilypadLarge_Action2(LilypadLargeEntity* this) { void sub_08085A44(LilypadLargeEntity* this) { super->speed = 0x200; - if (GetActTileRelative(super, 0x10, 0x18) != 0x11) { + if (GetActTileRelativeToEntity(super, 0x10, 0x18) != ACT_TILE_17) { super->direction = 0x18; } else { - if (GetActTileRelative(super, -0x10, 0x18) != 0x11) { + if (GetActTileRelativeToEntity(super, -0x10, 0x18) != ACT_TILE_17) { super->direction = 8; } else { super->direction = 0x10; @@ -353,9 +355,9 @@ void sub_08085A98(LilypadLargeEntity* this) { this->unk_78.WORD -= 0x20000; SetAffineInfo(super, this->unk_78.HALF_U.HI, this->unk_78.HALF_U.HI, this->unk_7c.HALF_U.HI); } - if (GetActTileRelative(super, 0, 0x18) != 0x11) { + if (GetActTileRelativeToEntity(super, 0, 0x18) != ACT_TILE_17) { super->subAction = 2; - if (gArea.locationIndex == 0x1b) { + if (gArea.locationIndex == 27) { // AREA_TEMPLE_OF_DROPLETS super->y.HALF.HI += 0xd0; super->z.HALF.HI = -0xd0; this->unk_82 = 0x46; @@ -378,7 +380,7 @@ void sub_08085B40(LilypadLargeEntity* this) { SetAffineInfo(super, this->unk_78.HALF_U.HI, this->unk_78.HALF_U.HI, this->unk_7c.HALF_U.HI); } gPlayerEntity.base.y.HALF.HI = (super->y.HALF.HI + super->z.HALF.HI) - this->unk_74; - if (gArea.locationIndex == 0x1b) { + if (gArea.locationIndex == 27) { // AREA_TEMPLE_OF_DROPLETS gPlayerEntity.base.z.HALF.HI = super->y.HALF.HI - this->unk_74 - 0xd0 - gPlayerEntity.base.y.HALF.HI; } else { gPlayerEntity.base.z.HALF.HI = super->y.HALF.HI - this->unk_74 - 0x40 - gPlayerEntity.base.y.HALF.HI; @@ -386,7 +388,7 @@ void sub_08085B40(LilypadLargeEntity* this) { } } else { ResetCollisionLayer(super); - if (GetActTile(super) == 0xd) { + if (GetActTileAtEntity(super) == ACT_TILE_13) { ResetCollisionLayer(&gPlayerEntity.base); LilypadLarge_Action4(this); super->direction = GetFacingDirection(&gPlayerEntity.base, super); @@ -408,7 +410,7 @@ void sub_08085B40(LilypadLargeEntity* this) { super->timer |= 0x80; this->unk_70 = 0; this->unk_6c = 0; - if (GetActTile(super) == 0xd) { + if (GetActTileAtEntity(super) == ACT_TILE_13) { super->action = 4; } } @@ -456,7 +458,7 @@ void LilypadLarge_Action5(LilypadLargeEntity* this) { void sub_08085D28(LilypadLargeEntity* this) { if (((gPlayerState.framestate != PL_STATE_TALKEZLO) && ((gPlayerState.flags & PL_FLAGS2) != 0)) && - (GetActTileRelative(super, 0, 0x18) == 0x11)) { + (GetActTileRelativeToEntity(super, 0, 0x18) == ACT_TILE_17)) { super->action = 2; super->subAction = 0; PausePlayer(); @@ -494,7 +496,7 @@ void sub_08085D60(LilypadLargeEntity* this) { tmp = r4 >> 2; tmpX = gUnk_08120638[tmp]; tmpY = gUnk_08120638[tmp + 1]; - if (sub_080B1AF0(super, tmpX, tmpY) == 0xff) { + if (GetCollisionDataRelativeTo(super, tmpX, tmpY) == COLLISION_DATA_255) { if (sub_080806BC((super->x.HALF.HI - gRoomControls.origin_x) + tmpX, (super->y.HALF.HI - gRoomControls.origin_y) + tmpY, r4, 5) == 0) { @@ -513,7 +515,7 @@ void sub_08085D60(LilypadLargeEntity* this) { tmp = r6 >> 2; tmpX2 = gUnk_08120638[tmp]; tmpY2 = gUnk_08120638[tmp + 1]; - if (sub_080B1AF0(super, tmpX2, tmpY2) == 0xff) { + if (GetCollisionDataRelativeTo(super, tmpX2, tmpY2) == COLLISION_DATA_255) { if (sub_0807BD14(&gPlayerEntity.base, r6 >> 3) != 0) { super->direction = (u8)r6; sub_08085E74(this); diff --git a/src/object/linkEmptyingBottle.c b/src/object/linkEmptyingBottle.c index 0c47f3a8..0b4200a7 100644 --- a/src/object/linkEmptyingBottle.c +++ b/src/object/linkEmptyingBottle.c @@ -8,13 +8,14 @@ #include "functions.h" #include "item.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; /*0x68*/ u8 unk_68; } LinkEmptyingBottleEntity; -extern u32 sub_080B1A0C(Entity*, s32, s32); +extern u32 GetTileTypeRelativeToEntity(Entity*, s32, s32); void LinkEmptyingBottle_Init(LinkEmptyingBottleEntity*); void LinkEmptyingBottle_Action1(LinkEmptyingBottleEntity*); @@ -44,8 +45,8 @@ void LinkEmptyingBottle_Init(LinkEmptyingBottleEntity* this) { gUnk_08122A18[gPlayerEntity.base.animationState | 1] << 0x10); } CopyPosition(super->child, super); - sub_08094980(this, 0x4032, 0x4033); - sub_08094980(this, 0x4061, 0x4022); + sub_08094980(this, SPECIAL_TILE_50, SPECIAL_TILE_51); + sub_08094980(this, SPECIAL_TILE_97, SPECIAL_TILE_34); break; case 1: effect = CreateFx(super, FX_GREEN_SPLASH2, 0); @@ -60,8 +61,8 @@ void LinkEmptyingBottle_Init(LinkEmptyingBottleEntity* this) { super->timer = 0; super->spritePriority.b0 = 0; super->spriteRendering.b3 = 0; - sub_08094980(this, 0x403b, 0x403c); - sub_08094980(this, 0x4061, 0x4022); + sub_08094980(this, SPECIAL_TILE_59, SPECIAL_TILE_60); + sub_08094980(this, SPECIAL_TILE_97, SPECIAL_TILE_34); return; } break; @@ -117,9 +118,9 @@ void sub_08094980(LinkEmptyingBottleEntity* this, u32 searchTileIndex, u32 repla while (index < 10) { xOffset = gUnk_08122A28[index]; yOffset = gUnk_08122A28[index + 1]; - if (searchTileIndex == sub_080B1A0C(super, xOffset, yOffset)) { - SetBottomTile(replaceTileIndex, TILE(super->x.HALF.HI + xOffset, super->y.HALF.HI + yOffset), - super->collisionLayer); + if (searchTileIndex == GetTileTypeRelativeToEntity(super, xOffset, yOffset)) { + SetTile(replaceTileIndex, TILE(super->x.HALF.HI + xOffset, super->y.HALF.HI + yOffset), + super->collisionLayer); } index += 2; } diff --git a/src/object/lockedDoor.c b/src/object/lockedDoor.c index 8f4bcbc3..f4af4b0e 100644 --- a/src/object/lockedDoor.c +++ b/src/object/lockedDoor.c @@ -13,6 +13,7 @@ #include "game.h" #include "hitbox.h" #include "sound.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -162,7 +163,7 @@ void LockedDoor_Action1(LockedDoorEntity* this) { if (--super->timer == 0) { super->action = 2; super->timer = 7; - SetBottomTile(this->unk_74, this->unk_76, super->collisionLayer); + SetTile(this->unk_74, this->unk_76, super->collisionLayer); EnqueueSFX(SFX_10B); } } @@ -262,12 +263,12 @@ void sub_080836A0(LockedDoorEntity* this) { super->spriteSettings.draw = 1; super->x.HALF.HI = this->unk_70; super->y.HALF.HI = this->unk_72; - SetBottomTile(0x4022, this->unk_76, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_76, super->collisionLayer); } void sub_080836DC(Entity* this, u32 unk_0, u32 unk_1) { const struct_0811F680* tmp; - SetBottomTile(0x4022, unk_1, this->collisionLayer); + SetTile(SPECIAL_TILE_34, unk_1, this->collisionLayer); this->timer = 7; this->spriteSettings.draw = 1; this->direction = (unk_0 << 3) ^ DirectionSouth; diff --git a/src/object/macroAcorn.c b/src/object/macroAcorn.c index 4997cb1f..76773942 100644 --- a/src/object/macroAcorn.c +++ b/src/object/macroAcorn.c @@ -5,8 +5,10 @@ * @brief Macro Acorn object */ #include "entity.h" +#include "map.h" #include "object.h" #include "physics.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -74,38 +76,38 @@ void sub_0809E5F0(MacroAcornEntity* this) { this->unk_80 = position; switch (super->type) { case 2: - SetBottomTile(0x4022, position - 0x3d, 1); - SetBottomTile(0x406d, position - 0x3c, 1); + SetTile(SPECIAL_TILE_34, position + TILE_POS(3, -1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_109, position + TILE_POS(4, -1), LAYER_BOTTOM); case 0: - SetBottomTile(0x406c, position - 0x42, 1); - SetBottomTile(0x4022, position - 0x41, 1); - SetBottomTile(0x4022, position - 0x40, 1); - SetBottomTile(0x4022, position - 0x3f, 1); - SetBottomTile(0x4022, position - 2, 1); - SetBottomTile(0x4022, position - 1, 1); - SetBottomTile(0x4022, position, 1); - SetBottomTile(0x4022, position + 1, 1); - SetBottomTile(0x406e, position + 0x3e, 1); - SetBottomTile(0x4022, position + 0x3f, 1); - SetBottomTile(0x4022, position + 0x40, 1); - SetBottomTile(0x406f, position + 0x41, 1); + SetTile(SPECIAL_TILE_108, position + TILE_POS(-2, -1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, -1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(0, -1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(1, -1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-2, 0), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, 0), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(0, 0), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(1, 0), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_110, position + TILE_POS(-2, 1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, 1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(0, 1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_111, position + TILE_POS(1, 1), LAYER_BOTTOM); break; case 3: - SetBottomTile(0x4022, position - 0x44, 1); - SetBottomTile(0x406c, position - 0x45, 1); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-4, -1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_108, position + TILE_POS(-5, -1), LAYER_BOTTOM); case 1: - SetBottomTile(0x4022, position - 0x42, 1); - SetBottomTile(0x4022, position - 0x41, 1); - SetBottomTile(0x4022, position - 0x40, 1); - SetBottomTile(0x406d, position - 0x3f, 1); - SetBottomTile(0x4022, position - 2, 1); - SetBottomTile(0x4022, position - 1, 1); - SetBottomTile(0x4022, position, 1); - SetBottomTile(0x4022, position + 1, 1); - SetBottomTile(0x406e, position + 0x3e, 1); - SetBottomTile(0x4022, position + 0x3f, 1); - SetBottomTile(0x4022, position + 0x40, 1); - SetBottomTile(0x406f, position + 0x41, 1); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-2, -1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, -1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(0, -1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_109, position + TILE_POS(1, -1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-2, 0), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, 0), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(0, 0), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(1, 0), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_110, position + TILE_POS(-2, 1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, 1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(0, 1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_111, position + TILE_POS(1, 1), LAYER_BOTTOM); break; } } diff --git a/src/object/macroBook.c b/src/object/macroBook.c index 0fe65615..2b43af8b 100644 --- a/src/object/macroBook.c +++ b/src/object/macroBook.c @@ -9,6 +9,7 @@ #include "flags.h" #include "functions.h" #include "npc.h" +#include "tiles.h" typedef struct { Entity base; @@ -135,8 +136,26 @@ void MacroBook_Action3(MacroBookEntity* this) { void sub_0809A958(MacroBookEntity* this) { static const u16 tileIndices[] = { - 0x4074, 0x4074, 0x4074, 0x4074, 0x4074, 0x4074, 0x4074, 0x4074, 0x4074, 0x4074, - 0x4074, 0x4074, 0x4074, 0x4074, 0x4074, 0x4074, 0, 0, 0x4022, 0x4022, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + 0, + 0, + SPECIAL_TILE_34, + SPECIAL_TILE_34, }; int index; int index2; @@ -150,7 +169,7 @@ void sub_0809A958(MacroBookEntity* this) { for (index = 0; index < 5; index++, tilePos += 0x40) { for (index2 = 0; index2 < 4; index2++, tileIndexPtr++) { if ((*tileIndexPtr & 0x4000) != 0) { - SetBottomTile(*tileIndexPtr, tilePos + index2, 1); + SetTile(*tileIndexPtr, tilePos + index2, LAYER_BOTTOM); } } } diff --git a/src/object/macroDecorations.c b/src/object/macroDecorations.c index c6142185..457dce52 100644 --- a/src/object/macroDecorations.c +++ b/src/object/macroDecorations.c @@ -6,7 +6,9 @@ */ #include "asm.h" #include "entity.h" +#include "map.h" #include "room.h" +#include "tiles.h" typedef struct { Entity base; @@ -80,14 +82,16 @@ void MacroDecoration_Action1(MacroDecorationEntity* this) { void sub_08097EB8(MacroDecorationEntity* this) { static const s16 tilePosArray[] = { - 0xff7e, 0x4089, 0xff7f, 0x4022, 0xff80, 0x4022, 0xff81, 0x408a, 0xffbe, 0x4022, 0xffbf, 0x4022, 0xffc0, 0x4022, - 0xffc1, 0x4022, 0xfffe, 0x4022, 0xffff, 0x4022, 0, 0x4022, 1, 0x4022, 2, 0x408b, 0x3e, 0x4022, - 0x3f, 0x4022, 0x40, 0x4026, 0x41, 0x4022, 0x7e, 0x408c, 0x7f, 0x408c, 0x7fff, 0xffff, + 0xff7e, SPECIAL_TILE_137, 0xff7f, SPECIAL_TILE_34, 0xff80, SPECIAL_TILE_34, 0xff81, SPECIAL_TILE_138, + 0xffbe, SPECIAL_TILE_34, 0xffbf, SPECIAL_TILE_34, 0xffc0, SPECIAL_TILE_34, 0xffc1, SPECIAL_TILE_34, + 0xfffe, SPECIAL_TILE_34, 0xffff, SPECIAL_TILE_34, 0, SPECIAL_TILE_34, 1, SPECIAL_TILE_34, + 2, SPECIAL_TILE_139, 0x3e, SPECIAL_TILE_34, 0x3f, SPECIAL_TILE_34, 0x40, SPECIAL_TILE_38, + 0x41, SPECIAL_TILE_34, 0x7e, SPECIAL_TILE_140, 0x7f, SPECIAL_TILE_140, 0x7fff, 0xffff, }; const s16* tilePosPtr; - u16 tile = COORD_TO_TILE(super); + u16 tilePos = COORD_TO_TILE(super); for (tilePosPtr = tilePosArray; *tilePosPtr != 0x7fff; tilePosPtr += 2) { - SetBottomTile((u16)tilePosPtr[1], tile + tilePosPtr[0], 1); + SetTile((u16)tilePosPtr[1], tilePos + tilePosPtr[0], LAYER_BOTTOM); } } diff --git a/src/object/macroShoe.c b/src/object/macroShoe.c index 574fcf20..77c02cf9 100644 --- a/src/object/macroShoe.c +++ b/src/object/macroShoe.c @@ -6,6 +6,8 @@ */ #include "asm.h" #include "entity.h" +#include "tiles.h" +#include "map.h" void MacroShoe_Init(Entity*); void MacroShoe_Idle(Entity*); @@ -39,9 +41,9 @@ void MacroShoe_Init(Entity* this) { this->action = 1; this->hitbox = (Hitbox*)MacroShoe_TypeHitboxes[this->type]; if (this->type2 == 1) { - SetBottomTile(0x4024, 0x410, 1); - SetBottomTile(0x4026, 0x411, 1); - SetBottomTile(0x4025, 0x412, 1); + SetTile(SPECIAL_TILE_36, TILE_POS(16, 16), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_38, TILE_POS(17, 16), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_37, TILE_POS(18, 16), LAYER_BOTTOM); } } diff --git a/src/object/mask.c b/src/object/mask.c index e517a8bb..9246fda1 100644 --- a/src/object/mask.c +++ b/src/object/mask.c @@ -6,6 +6,7 @@ */ #include "functions.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -70,11 +71,11 @@ void Mask_Init(MaskEntity* this) { super->frameIndex = super->type2 & 0x3f; this->unk_7e = COORD_TO_TILE(super); - this->unk_7c = GetTileIndex(this->unk_7e, 1); + this->unk_7c = GetTileIndex(this->unk_7e, LAYER_BOTTOM); - this->unk_7a = sub_080B1B44(this->unk_7e, 1); + this->unk_7a = GetCollisionDataAtTilePos(this->unk_7e, LAYER_BOTTOM); - SetBottomTile(0x4022, this->unk_7e, 1); + SetTile(SPECIAL_TILE_34, this->unk_7e, LAYER_BOTTOM); } // Probably related to knocking it down @@ -99,9 +100,9 @@ void Mask_Action1(MaskEntity* this) { } // Presumably, make the mask fall - SetBottomTile(this->unk_7c, this->unk_7e, 1); + SetTile(this->unk_7c, this->unk_7e, LAYER_BOTTOM); - sub_08000148(this->unk_7a, this->unk_7e, 1); + SetCollisionData(this->unk_7a, this->unk_7e, 1); super->action = 2; diff --git a/src/object/metalDoor.c b/src/object/metalDoor.c index c0bbc874..95f7f9a1 100644 --- a/src/object/metalDoor.c +++ b/src/object/metalDoor.c @@ -12,6 +12,7 @@ #include "hitbox.h" #include "room.h" #include "sound.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -27,6 +28,7 @@ typedef struct { /*0x86*/ u16 unk_86; } MetalDoorEntity; +extern u32 sub_08083734(Entity*, u32); void sub_080A080C(MetalDoorEntity* this); void sub_080A0870(MetalDoorEntity* this); void MetalDoor_Init(MetalDoorEntity* this); @@ -118,13 +120,13 @@ void sub_080A080C(MetalDoorEntity* this) { this->unk_76 = GetTileIndex(this->unk_74 - 1, super->collisionLayer); this->unk_78 = GetTileIndex(this->unk_74, super->collisionLayer); this->unk_7a = GetTileIndex(this->unk_74 + 1, super->collisionLayer); - SetBottomTile(0x4022, this->unk_74 - 1, super->collisionLayer); - SetBottomTile(0x4022, this->unk_74, super->collisionLayer); - SetBottomTile(0x4022, this->unk_74 + 1, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_74 - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_74, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_74 + 1, super->collisionLayer); } void sub_080A0870(MetalDoorEntity* this) { - SetBottomTile(this->unk_76, this->unk_74 - 1, super->collisionLayer); - SetBottomTile(this->unk_78, this->unk_74, super->collisionLayer); - SetBottomTile(this->unk_7a, this->unk_74 + 1, super->collisionLayer); + SetTile(this->unk_76, this->unk_74 - 1, super->collisionLayer); + SetTile(this->unk_78, this->unk_74, super->collisionLayer); + SetTile(this->unk_7a, this->unk_74 + 1, super->collisionLayer); } diff --git a/src/object/minecart.c b/src/object/minecart.c index 58138b3b..6d101de6 100644 --- a/src/object/minecart.c +++ b/src/object/minecart.c @@ -7,6 +7,7 @@ #include "functions.h" #include "hitbox.h" #include "object.h" +#include "tiles.h" typedef struct { Entity base; @@ -26,7 +27,7 @@ void Minecart_Action5(MinecartEntity* this); void Minecart_Action6(MinecartEntity* this); void Minecart_Action7(MinecartEntity* this); -extern const u16* const gUnk_081223D8[]; +extern const KeyValuePair* const gUnk_081223D8[]; void Minecart(Entity* this) { static void (*const Minecart_Actions[])(MinecartEntity*) = { @@ -59,7 +60,7 @@ void Minecart_Init(MinecartEntity* this) { super->speed = 0x700; super->spritePriority.b1 = 3; InitAnimationForceUpdate(super, super->type2 + 4 + super->animationState); - SetBottomTile(0x4022, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_34, COORD_TO_TILE(super), super->collisionLayer); } void Minecart_Action1(MinecartEntity* this) { @@ -105,7 +106,7 @@ void Minecart_Action2(MinecartEntity* this) { if (gPlayerEntity.base.zVelocity >= 0) { return; } - gPlayerEntity.base.animationState = super->animationState << 1; + gPlayerEntity.base.animationState = super->animationState * 2; gPlayerState.flags = (gPlayerState.flags ^ PL_ENTER_MINECART) | PL_IN_MINECART; super->action++; super->subtimer = 1; @@ -128,10 +129,9 @@ void Minecart_Action2(MinecartEntity* this) { } void Minecart_Action3(MinecartEntity* this) { - static const s8 gUnk_081223C8[] = { 0, -7, 7, 0, 0, 7, -7, 0 }; + static const s8 offsetCoords[] = { 0, -7, 7, 0, 0, 7, -7, 0 }; - u32 iVar2; - u32 uVar3; + u32 actTile; gRoomControls.scrollSpeed = 7; if ((gPlayerState.flags & PL_IN_MINECART) == 0) { @@ -163,15 +163,14 @@ void Minecart_Action3(MinecartEntity* this) { super->subtimer = 60; } - uVar3 = GetActTileRelative(super, gUnk_081223C8[super->animationState * 2], - gUnk_081223C8[super->animationState * 2 + 1]); - iVar2 = ActTileToTile(uVar3, gUnk_081223D8[super->animationState]); - if (iVar2 == 0) { + actTile = GetActTileRelativeToEntity(super, offsetCoords[super->animationState * 2], + offsetCoords[super->animationState * 2 + 1]); + if (FindValueForKey(actTile, gUnk_081223D8[super->animationState]) == 0) { super->direction = DirectionTurnAround(super->direction); super->animationState = AnimationStateFlip90(super->animationState); } else { - switch (uVar3) { - case 0x64: + switch (actTile) { + case ACT_TILE_100: super->flags &= ~ENT_PERSIST; super->hitType = 1; super->collisionFlags = 0x47; @@ -183,7 +182,7 @@ void Minecart_Action3(MinecartEntity* this) { gPlayerState.flags = (gPlayerState.flags ^ PL_IN_MINECART) | PL_ENTER_MINECART; gPlayerEntity.base.zVelocity = Q_16_16(2.0); gPlayerEntity.base.speed = 0x200; - gPlayerEntity.base.animationState = super->animationState << 1; + gPlayerEntity.base.animationState = super->animationState * 2; gPlayerEntity.base.direction = super->direction; gPlayerEntity.base.flags |= PL_MINISH; SnapToTile(super); @@ -191,15 +190,15 @@ void Minecart_Action3(MinecartEntity* this) { SoundReq(SFX_PLY_VO4); SoundReq(SFX_139); return; - case 0x67: - case 0x68: - case 0x69: - case 0x6a: - case 0x6c: - case 0x6d: - case 0x6e: - case 0x6f: - if (uVar3 == GetActTile(super)) { + case ACT_TILE_103: + case ACT_TILE_104: + case ACT_TILE_105: + case ACT_TILE_106: + case ACT_TILE_108: + case ACT_TILE_109: + case ACT_TILE_110: + case ACT_TILE_111: + if (actTile == GetActTileAtEntity(super)) { Minecart_Action4(this); gPlayerEntity.base.animationState = super->animationState << 1; return; @@ -221,8 +220,8 @@ void Minecart_Action3(MinecartEntity* this) { void Minecart_Action4(MinecartEntity* this) { SnapToTile(super); CopyPosition(super, &gPlayerEntity.base); - switch (GetActTile(super)) { - case 0x67: + switch (GetActTileAtEntity(super)) { + case ACT_TILE_103: if (super->direction == DirectionWest) { super->direction = DirectionNorth; super->animationState = 0; @@ -231,7 +230,7 @@ void Minecart_Action4(MinecartEntity* this) { super->animationState = 1; } break; - case 0x68: + case ACT_TILE_104: if (super->direction == DirectionEast) { super->direction = DirectionSouth; super->animationState = 2; @@ -240,7 +239,7 @@ void Minecart_Action4(MinecartEntity* this) { super->animationState = 3; } break; - case 0x69: + case ACT_TILE_105: if (super->direction == DirectionEast) { super->direction = DirectionNorth; super->animationState = 0; @@ -249,7 +248,7 @@ void Minecart_Action4(MinecartEntity* this) { super->animationState = 3; } break; - case 0x6a: + case ACT_TILE_106: if (super->direction == DirectionWest) { super->direction = DirectionSouth; super->animationState = 2; @@ -264,7 +263,7 @@ void Minecart_Action4(MinecartEntity* this) { } super->action = 3; - gPlayerEntity.base.animationState = super->animationState << 1; + gPlayerEntity.base.animationState = super->animationState * 2; } void Minecart_Action5(MinecartEntity* this) { @@ -290,7 +289,7 @@ void Minecart_Action6(MinecartEntity* this) { minecartData->room = gRoomControls.room; minecartData->animationState = super->animationState; InitAnimationForceUpdate(super, super->animationState + 0x10); - SetBottomTile(0x4022, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_34, COORD_TO_TILE(super), super->collisionLayer); } else { UpdateAnimationSingleFrame(super); gPlayerEntity.base.spritePriority.b0 = super->spritePriority.b0 - 1; @@ -311,8 +310,8 @@ void Minecart_Action7(MinecartEntity* this) { bool32 sub_08091DDC(MinecartEntity* this) { static const s8 gUnk_081223D0[] = { 0, -8, 8, 0, 0, 8, -8, 0 }; - if ((sub_080B1AF0(super, gUnk_081223D0[super->animationState * 2], gUnk_081223D0[super->animationState * 2 + 1]) == - 0xff) && + if ((GetCollisionDataRelativeTo(super, gUnk_081223D0[super->animationState * 2], + gUnk_081223D0[super->animationState * 2 + 1]) == COLLISION_DATA_255) && (sub_0807BD14(&gPlayerEntity.base, super->animationState))) { super->updatePriority = 6; super->action = 5; @@ -331,3 +330,35 @@ bool32 sub_08091DDC(MinecartEntity* this) { return 0; } } + +extern const KeyValuePair gUnk_081223E8[]; +extern const KeyValuePair gUnk_08122402[]; +extern const KeyValuePair gUnk_0812241C[]; +extern const KeyValuePair gUnk_08122436[]; + +const KeyValuePair* const gUnk_081223D8[] = { + gUnk_081223E8, + gUnk_08122402, + gUnk_0812241C, + gUnk_08122436, +}; +const KeyValuePair gUnk_081223E8[] = { + { ACT_TILE_242, 1 }, { ACT_TILE_101, 1 }, { ACT_TILE_104, 1 }, + { ACT_TILE_106, 1 }, { ACT_TILE_100, 1 }, { ACT_TILE_41, 1 }, +}; +const u16 gUnk_081223E8End = 0; +const KeyValuePair gUnk_08122402[] = { + { ACT_TILE_243, 1 }, { ACT_TILE_102, 1 }, { ACT_TILE_104, 1 }, + { ACT_TILE_105, 1 }, { ACT_TILE_100, 1 }, { ACT_TILE_41, 1 }, +}; +const u16 gUnk_08122402End = 0; +const KeyValuePair gUnk_0812241C[] = { + { ACT_TILE_242, 1 }, { ACT_TILE_101, 1 }, { ACT_TILE_103, 1 }, + { ACT_TILE_105, 1 }, { ACT_TILE_100, 1 }, { ACT_TILE_41, 1 }, +}; +const u16 gUnk_0812241CEnd = 0; +const KeyValuePair gUnk_08122436[] = { + { ACT_TILE_243, 1 }, { ACT_TILE_102, 1 }, { ACT_TILE_106, 1 }, + { ACT_TILE_103, 1 }, { ACT_TILE_100, 1 }, { ACT_TILE_41, 1 }, +}; +const u16 gUnk_08122436End = 0; diff --git a/src/object/minecartDoor.c b/src/object/minecartDoor.c index c74e1109..37667af6 100644 --- a/src/object/minecartDoor.c +++ b/src/object/minecartDoor.c @@ -6,14 +6,15 @@ */ #include "functions.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; /*0x68*/ u8 unk_68[8]; /*0x70*/ u16 unk_70; /*0x72*/ u16 unk_72; - /*0x74*/ u16 unk_74; - /*0x76*/ u16 unk_76; + /*0x74*/ u16 tileIndex; + /*0x76*/ u16 tilePos; /*0x78*/ u8 unk_78[0x6]; /*0x7e*/ u8 unk_7e; /*0x7f*/ u8 unk_7f[0x7]; @@ -51,8 +52,8 @@ void MinecartDoor_Init(MinecartDoorEntity* this) { this->unk_70 = super->x.HALF.HI; this->unk_72 = super->y.HALF.HI; super->spritePriority.b0 = 5; - this->unk_76 = COORD_TO_TILE(super); - this->unk_74 = GetTileIndex(this->unk_76, super->collisionLayer); + this->tilePos = COORD_TO_TILE(super); + this->tileIndex = GetTileIndex(this->tilePos, super->collisionLayer); super->frameIndex = super->type; if (sub_08096CEC(this)) { if (this->unk_7e != 0) { @@ -63,7 +64,7 @@ void MinecartDoor_Init(MinecartDoorEntity* this) { } else { super->action = 1; super->spriteSettings.draw = 1; - SetBottomTile(0x4022, this->unk_76, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos, super->collisionLayer); } } } @@ -73,7 +74,7 @@ void MinecartDoor_Action1(MinecartDoorEntity* this) { super->action = 2; super->timer = 7; super->direction = super->type << 3; - SetBottomTile(this->unk_74, this->unk_76, super->collisionLayer); + SetTile(this->tileIndex, this->tilePos, super->collisionLayer); EnqueueSFX(SFX_10B); } } @@ -111,7 +112,7 @@ void MinecartDoor_Action3(MinecartDoorEntity* this) { } if (bVar3 == FALSE) { super->action = 4; - sub_080836DC(super, super->type, this->unk_76); + sub_080836DC(super, super->type, this->tilePos); } } diff --git a/src/object/minishVillageObject.c b/src/object/minishVillageObject.c index a4a3e48c..b7d09356 100644 --- a/src/object/minishVillageObject.c +++ b/src/object/minishVillageObject.c @@ -7,88 +7,93 @@ #include "functions.h" #include "object.h" #include "screen.h" +#include "tiles.h" -void MinishVillageObject_Type0(Entity*); -void MinishVillageObject_Type1(Entity*); -void MinishVillageObject_Type3(Entity*); -void MinishVillageObject_Type4(Entity*); -void MinishVillageObject_Type5(Entity*); -void MinishVillageObject_Type6(Entity*); -void MinishVillageObject_Type7(Entity*); -void MinishVillageObject_Type8(Entity*); -void MinishVillageObject_Type8_Init(Entity*); -void MinishVillageObject_Type8_Action1(Entity*); -void MinishVillageObject_Type8_Action2(Entity*); +typedef struct { + /*0x00*/ Entity base; +} MinishVillageObjectEntity; -void MinishVillageObject(Entity* this) { - static void (*const MinishVillageObject_Types[])(Entity*) = { +void MinishVillageObject_Type0(MinishVillageObjectEntity*); +void MinishVillageObject_Type1(MinishVillageObjectEntity*); +void MinishVillageObject_Type3(MinishVillageObjectEntity*); +void MinishVillageObject_Type4(MinishVillageObjectEntity*); +void MinishVillageObject_Type5(MinishVillageObjectEntity*); +void MinishVillageObject_Type6(MinishVillageObjectEntity*); +void MinishVillageObject_Type7(MinishVillageObjectEntity*); +void MinishVillageObject_Type8(MinishVillageObjectEntity*); +void MinishVillageObject_Type8_Init(MinishVillageObjectEntity*); +void MinishVillageObject_Type8_Action1(MinishVillageObjectEntity*); +void MinishVillageObject_Type8_Action2(MinishVillageObjectEntity*); + +void MinishVillageObject(MinishVillageObjectEntity* this) { + static void (*const MinishVillageObject_Types[])(MinishVillageObjectEntity*) = { MinishVillageObject_Type0, MinishVillageObject_Type1, MinishVillageObject_Type1, MinishVillageObject_Type3, MinishVillageObject_Type4, MinishVillageObject_Type5, MinishVillageObject_Type6, MinishVillageObject_Type7, MinishVillageObject_Type8, MinishVillageObject_Type1, }; - MinishVillageObject_Types[this->type](this); + MinishVillageObject_Types[super->type](this); } -void MinishVillageObject_Type0(Entity* this) { +void MinishVillageObject_Type0(MinishVillageObjectEntity* this) { u32 tmp; u32 tmp2; - switch (this->action) { + switch (super->action) { case 0: - this->action = 1; - this->timer = 64 - (Random() & 0x1F); - this->frameIndex = 0; - this->animationState = 0; - this->spriteRendering.b3 = 3; - this->spritePriority.b0 = 7; - this->collisionLayer = 1; + super->action = 1; + super->timer = 64 - (Random() & 0x1F); + super->frameIndex = 0; + super->animationState = 0; + super->spriteRendering.b3 = 3; + super->spritePriority.b0 = 7; + super->collisionLayer = 1; break; case 1: - if (--this->timer == 0) { - this->timer = 8; - this->subtimer = 4; - this->action = 2; - this->animationState = Random() & 3; + if (--super->timer == 0) { + super->timer = 8; + super->subtimer = 4; + super->action = 2; + super->animationState = Random() & 3; } break; case 2: - if (--this->timer == 0) { - if (--this->subtimer == 0) { - this->frameIndex = 0; - this->action = 1; - this->timer = 64 - (Random() & 0x1F); + if (--super->timer == 0) { + if (--super->subtimer == 0) { + super->frameIndex = 0; + super->action = 1; + super->timer = 64 - (Random() & 0x1F); } else { - this->timer = 8; - tmp2 = this->animationState; - if (this->frameIndex != tmp2) { + super->timer = 8; + tmp2 = super->animationState; + if (super->frameIndex != tmp2) { tmp = tmp2; } else { tmp = 0; } - this->frameIndex = tmp; + super->frameIndex = tmp; } } break; } } -void MinishVillageObject_Type1(Entity* this) { +void MinishVillageObject_Type1(MinishVillageObjectEntity* this) { static const u16 gUnk_08121704[] = { 0x12d, 0x12e, 0x12f, 0x130, 0x131, 0x132, 0x133, 0x132, 0x131, 0x130, 0x12f, 0x12e, 0x12d, 0, }; - switch (this->action) { + switch (super->action) { case 0: - this->action = 1; - this->timer = 8; - this->subtimer = 0; - this->frameIndex = 0; - this->spritePriority.b0 = 7; - SetBottomTile(0x4069, COORD_TO_TILE(this) - 0x40, 1); + super->action = 1; + super->timer = 8; + super->subtimer = 0; + super->frameIndex = 0; + super->spritePriority.b0 = 7; + SetTile(SPECIAL_TILE_105, COORD_TO_TILE(super) - TILE_POS(0, 1), LAYER_BOTTOM); break; case 2: if ((gRoomTransition.frameCount & 3U) == 0) { - gScreen.controls.alphaBlend = (this->subAction << 8) | (0x10 - this->subAction); - this->subAction++; + gScreen.controls.alphaBlend = (super->subAction << 8) | (0x10 - super->subAction); + super->subAction++; if (gScreen.controls.alphaBlend == 0x1000) { gScreen.controls.layerFXControl = 0; DeleteThisEntity(); @@ -98,14 +103,14 @@ void MinishVillageObject_Type1(Entity* this) { case 1: break; } - if (--this->timer == 0) { - this->timer = 8; - if (this->type == 9) { - this->timer = 2; + if (--super->timer == 0) { + super->timer = 8; + if (super->type == 9) { + super->timer = 2; } - ChangeObjPalette(this, gUnk_08121704[this->subtimer++]); - if (gUnk_08121704[this->subtimer] == 0) { - this->subtimer = 0; + ChangeObjPalette(super, gUnk_08121704[super->subtimer++]); + if (gUnk_08121704[super->subtimer] == 0) { + super->subtimer = 0; } } } @@ -130,120 +135,120 @@ void sub_0808D2CC(void) { } } -void MinishVillageObject_Type3(Entity* this) { +void MinishVillageObject_Type3(MinishVillageObjectEntity* this) { } -void MinishVillageObject_Type4(Entity* this) { +void MinishVillageObject_Type4(MinishVillageObjectEntity* this) { s32 tmp; - if (this->action == 0) { - this->action = 0; - this->frameIndex = 0; - this->spritePriority.b0 = 7; - sub_0807DD64(this); + if (super->action == 0) { + super->action = 0; + super->frameIndex = 0; + super->spritePriority.b0 = 7; + sub_0807DD64(super); } - tmp = this->x.HALF.HI; - ExecuteScriptForEntity(this, NULL); - HandleEntity0x82Actions(this); - if (((gRoomControls.shake_duration != 0) && (tmp != this->x.HALF.HI)) && ((gRoomTransition.frameCount & 8) == 0)) { + tmp = super->x.HALF.HI; + ExecuteScriptForEntity(super, NULL); + HandleEntity0x82Actions(super); + if (((gRoomControls.shake_duration != 0) && (tmp != super->x.HALF.HI)) && ((gRoomTransition.frameCount & 8) == 0)) { SoundReq(SFX_10F); } } -void MinishVillageObject_Type5(Entity* this) { - if (this->action == 0) { - this->action = 0; - this->frameIndex = 1; - this->spritePriority.b0 = 7; - sub_0807DD64(this); +void MinishVillageObject_Type5(MinishVillageObjectEntity* this) { + if (super->action == 0) { + super->action = 0; + super->frameIndex = 1; + super->spritePriority.b0 = 7; + sub_0807DD64(super); } - ExecuteScriptForEntity(this, NULL); - HandleEntity0x82Actions(this); + ExecuteScriptForEntity(super, NULL); + HandleEntity0x82Actions(super); } -void MinishVillageObject_Type6(Entity* this) { +void MinishVillageObject_Type6(MinishVillageObjectEntity* this) { static const u16 gUnk_08121720[] = { 0x149, 0x14a, 0x14b, 0x14a, 0, 0 }; - if (this->action == 0) { - this->action = 1; - this->timer = 8; - this->spritePriority.b0 = 7; + if (super->action == 0) { + super->action = 1; + super->timer = 8; + super->spritePriority.b0 = 7; gScreen.controls.layerFXControl = 0x640; gScreen.controls.alphaBlend = 0x1003; } - if (--this->timer == 0) { - this->timer = 2; - sub_0801D28C(this, gUnk_08121720[this->subtimer++]); - if (gUnk_08121720[this->subtimer] == 0) { - this->subtimer = 0; + if (--super->timer == 0) { + super->timer = 2; + sub_0801D28C(super, gUnk_08121720[super->subtimer++]); + if (gUnk_08121720[super->subtimer] == 0) { + super->subtimer = 0; } } } -void MinishVillageObject_Type7(Entity* this) { - if (this->action == 0) { - this->action = 1; - this->spriteRendering.b3 = 3; - this->spritePriority.b0 = 7; - this->spriteRendering.alphaBlend = 1; - this->frameIndex = this->type2; - SetAffineInfo(this, (1 - this->type2) * 0x200 + 0x100, 0xffffff40, 0); +void MinishVillageObject_Type7(MinishVillageObjectEntity* this) { + if (super->action == 0) { + super->action = 1; + super->spriteRendering.b3 = 3; + super->spritePriority.b0 = 7; + super->spriteRendering.alphaBlend = 1; + super->frameIndex = super->type2; + SetAffineInfo(super, (1 - super->type2) * 0x200 + 0x100, 0xffffff40, 0); } } -void MinishVillageObject_Type8(Entity* this) { - static void (*const MinishVillageObject_Type8_Actions[])(Entity*) = { +void MinishVillageObject_Type8(MinishVillageObjectEntity* this) { + static void (*const MinishVillageObject_Type8_Actions[])(MinishVillageObjectEntity*) = { MinishVillageObject_Type8_Init, MinishVillageObject_Type8_Action1, MinishVillageObject_Type8_Action2, }; - MinishVillageObject_Type8_Actions[this->action](this); + MinishVillageObject_Type8_Actions[super->action](this); } -void MinishVillageObject_Type8_Init(Entity* this) { - u32 tilePosition; - this->spritePriority.b0 = 7; - this->frameIndex = this->type2; - this->action = 2; - if ((this->type2 == 0) && (CheckLocalFlag(0x7c) == 0)) { - this->action = 1; - this->timer = 0; - this->spriteRendering.alphaBlend = 1; +void MinishVillageObject_Type8_Init(MinishVillageObjectEntity* this) { + u32 tilePos; + super->spritePriority.b0 = 7; + super->frameIndex = super->type2; + super->action = 2; + if ((super->type2 == 0) && (CheckLocalFlag(0x7c) == 0)) { + super->action = 1; + super->timer = 0; + super->spriteRendering.alphaBlend = 1; gScreen.controls.layerFXControl = 0x640; gScreen.controls.alphaBlend = 0x1000; SoundReq(SFX_179); } else { - this->timer = 8; - tilePosition = COORD_TO_TILE(this); - if (this->type2 != 0) { - tilePosition -= 0x40; + super->timer = 8; + tilePos = COORD_TO_TILE(super); + if (super->type2 != 0) { + tilePos -= 0x40; } - SetBottomTile(0x4069, tilePosition, this->collisionLayer); + SetTile(SPECIAL_TILE_105, tilePos, super->collisionLayer); } } -void MinishVillageObject_Type8_Action1(Entity* this) { +void MinishVillageObject_Type8_Action1(MinishVillageObjectEntity* this) { if ((gRoomTransition.frameCount & 3U) == 0) { - gScreen.controls.alphaBlend = ((0x10 - this->timer) * 0x100) | this->timer; - this->timer++; + gScreen.controls.alphaBlend = ((0x10 - super->timer) * 0x100) | super->timer; + super->timer++; if (gScreen.controls.alphaBlend == 0x10) { - this->action = 2; - this->timer = 8; - this->spriteRendering.alphaBlend = 0; + super->action = 2; + super->timer = 8; + super->spriteRendering.alphaBlend = 0; gScreen.controls.layerFXControl = 0; - SetBottomTile(0x4069, COORD_TO_TILE(this), this->collisionLayer); + SetTile(SPECIAL_TILE_105, COORD_TO_TILE(super), super->collisionLayer); } } } -void MinishVillageObject_Type8_Action2(Entity* this) { +void MinishVillageObject_Type8_Action2(MinishVillageObjectEntity* this) { static const u16 gUnk_08121738[] = { 0x14c, 0x14d, 0x14e, 0x14f, 0x150, 0x151, 0x150, 0x14f, 0x14e, 0x14d, 0x14c, 0, }; - if (--this->timer == 0) { - this->timer = 8; - ChangeObjPalette(this, gUnk_08121738[this->subtimer++]); - if (gUnk_08121738[this->subtimer] == 0) { - this->subtimer = 0; + if (--super->timer == 0) { + super->timer = 8; + ChangeObjPalette(super, gUnk_08121738[super->subtimer++]); + if (gUnk_08121738[super->subtimer] == 0) { + super->subtimer = 0; } } } diff --git a/src/object/moleMittsParticle.c b/src/object/moleMittsParticle.c index 125a679d..f83472bc 100644 --- a/src/object/moleMittsParticle.c +++ b/src/object/moleMittsParticle.c @@ -37,7 +37,7 @@ void MoleMittsParticle_Init(Entity* this) { } sub_08087640(this); } else { - if (gArea.locationIndex == 0x10) { + if (gArea.locationIndex == 16) { // AREA_CLOUD_TOPS palette = 0x16a; } else { palette = 4; diff --git a/src/object/object1F.c b/src/object/object1F.c index 1843e02e..444f616a 100644 --- a/src/object/object1F.c +++ b/src/object/object1F.c @@ -9,6 +9,7 @@ #include "entity.h" #include "functions.h" #include "player.h" +#include "tiles.h" typedef struct { Entity base; @@ -80,18 +81,16 @@ void Object1F_Action1(Object1FEntity* this) { } void Object1F_Action2(Object1FEntity* this) { - u8 bVar1; - - bVar1 = sub_080B1B0C(super); - switch (bVar1) { - case 0x21: + u8 collisionData = GetCollisionDataAtEntity(super); + switch (collisionData) { + case COLLISION_DATA_33: CreateFx(super, FX_FALL_DOWN, 0); break; - case 0x25: + case COLLISION_DATA_37: CreateFx(super, FX_LAVA_SPLASH, 0); break; - case 0x24: - case 0x30: + case COLLISION_DATA_36: + case COLLISION_DATA_48: CreateFx(super, FX_WATER_SPLASH, 0); break; default: diff --git a/src/object/object30.c b/src/object/object30.c index 7d2acb49..3f31e5e3 100644 --- a/src/object/object30.c +++ b/src/object/object30.c @@ -36,12 +36,12 @@ void Object30(Object30Entity* this) { } void Object30_Init(Object30Entity* this) { - LayerStruct* data; + MapLayer* mapLayer; const u16* ptr; switch (super->type) { case 0: - data = GetTileBuffer(super->collisionLayer); - ptr = &data->mapData[sub_0806F798(super)]; + mapLayer = GetLayerByIndex(super->collisionLayer); + ptr = &mapLayer->mapData[sub_0806F798(super)]; this->unk_6c = (u16*)ptr; this->unk_68 = ptr[0]; super->action = 1; diff --git a/src/object/object37.c b/src/object/object37.c index e0b08edc..35f32e93 100644 --- a/src/object/object37.c +++ b/src/object/object37.c @@ -34,7 +34,7 @@ void Object37(Entity* this) { void Object37_Init(Object37Entity* this) { u16* puVar1; - puVar1 = GetTileBuffer(super->collisionLayer)->mapData + sub_0806F798(super); + puVar1 = GetLayerByIndex(super->collisionLayer)->mapData + sub_0806F798(super); this->unk78 = puVar1; this->unk70 = *puVar1; super->action = 1; diff --git a/src/object/objectA.c b/src/object/objectA.c index 2d4eb4c3..ac45f99f 100644 --- a/src/object/objectA.c +++ b/src/object/objectA.c @@ -11,6 +11,7 @@ #include "hitbox.h" #include "object.h" #include "room.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -28,10 +29,10 @@ void ObjectA(ObjectAEntity* this) { if (super->action == 0) { super->action = 1; super->hitbox = (Hitbox*)&gHitbox_2; - if (super->collisionLayer == 1) { - uVar2 = 0x26; + if (super->collisionLayer == LAYER_BOTTOM) { + uVar2 = TILE_TYPE_38; } else { - uVar2 = 0x34; + uVar2 = TILE_TYPE_52; } this->unk_70 = uVar2; if (CheckFlags(this->unk_86) != 0) { diff --git a/src/object/objectA2.c b/src/object/objectA2.c index 9e82aeb3..d73db1f5 100644 --- a/src/object/objectA2.c +++ b/src/object/objectA2.c @@ -117,5 +117,5 @@ void sub_0809F448(Entity* this) { break; } this->speed = (tmp > 0 ? tmp : -tmp) / (tmp2->unk_1 << 8); - this->direction = CalcOffsetAngle(tmp, 0) >> 3; + this->direction = CalculateDirectionFromOffsets(tmp, 0) >> 3; } diff --git a/src/object/objectBlockingStairs.c b/src/object/objectBlockingStairs.c index 83c6e976..76ff017f 100644 --- a/src/object/objectBlockingStairs.c +++ b/src/object/objectBlockingStairs.c @@ -11,6 +11,7 @@ #include "functions.h" #include "object.h" #include "sound.h" +#include "tiles.h" typedef struct { Entity base; @@ -107,14 +108,14 @@ void ObjectBlockingStairs_Action1(ObjectBlockingStairsEntity* this) { } if (this->unk7b & 0x40) { - tileType = (u32)GetTileType(this->tilePos - 1, super->collisionLayer); + tileType = (u32)GetTileTypeAtTilePos(this->tilePos - 1, super->collisionLayer); } else { - tileType = (u32)GetTileType(this->tilePos + 1, super->collisionLayer); + tileType = (u32)GetTileTypeAtTilePos(this->tilePos + 1, super->collisionLayer); } switch (tileType) { - case 0x4030: - case 0x4031: + case SPECIAL_TILE_48: + case SPECIAL_TILE_49: super->action = 3; super->direction = Direction8FromAnimationState(gPlayerEntity.base.animationState); super->speed = 0x80; @@ -133,23 +134,23 @@ void ObjectBlockingStairs_Action1(ObjectBlockingStairsEntity* this) { if (this->unk7b & 0x80) { this->unk7b &= ~0x80; if ((this->unk7b & 0x40) != 0) { - SetBottomTile(0x402c, this->tilePos - 1, super->collisionLayer); - SetBottomTile(0x403d, this->tilePos + 1, super->collisionLayer); + SetTile(SPECIAL_TILE_44, this->tilePos - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos + 1, super->collisionLayer); } else { - SetBottomTile(0x403d, this->tilePos - 1, super->collisionLayer); - SetBottomTile(0x402d, this->tilePos + 1, super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_45, this->tilePos + 1, super->collisionLayer); } } else if (this->unk7b & 0x40) { if (xDist >= 5) { this->unk7b &= ~(0x40 | 0x80); - SetBottomTile(0x403d, this->tilePos - 1, super->collisionLayer); - SetBottomTile(0x402d, this->tilePos + 1, super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_45, this->tilePos + 1, super->collisionLayer); } } else { if (-xDist > 4) { this->unk7b |= 0x40; - SetBottomTile(0x402c, this->tilePos - 1, super->collisionLayer); - SetBottomTile(0x403d, this->tilePos + 1, super->collisionLayer); + SetTile(SPECIAL_TILE_44, this->tilePos - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos + 1, super->collisionLayer); } } } @@ -190,10 +191,18 @@ void ObjectBlockingStairs_Action4(ObjectBlockingStairsEntity* this) { } void sub_080931A4(ObjectBlockingStairsEntity* this, u32 param_2) { - static const u16 gUnk_08122850[] = { 0x4027, 0x4023, 0x4028, 0x402c, 0x402b, 0x402d, 0x4029, 0x4026, 0x402a }; - static const u16 gUnk_08122862[] = { 0x4027, 0x4023, 0x4028, 0x4024, 0x4022, 0x4025, 0x4029, 0x4026, 0x402a }; - static const u16 gUnk_08122874[] = { 0x4027, 0x4023, 0x4023, 0x4024, 0x4022, 0x4022, 0x4029, 0x4026, 0x4026 }; - static const u16 gUnk_08122886[] = { 0x4023, 0x4023, 0x4028, 0x4022, 0x4022, 0x4025, 0x4026, 0x4026, 0x402a }; + static const u16 gUnk_08122850[] = { SPECIAL_TILE_39, SPECIAL_TILE_35, SPECIAL_TILE_40, + SPECIAL_TILE_44, SPECIAL_TILE_43, SPECIAL_TILE_45, + SPECIAL_TILE_41, SPECIAL_TILE_38, SPECIAL_TILE_42 }; + static const u16 gUnk_08122862[] = { SPECIAL_TILE_39, SPECIAL_TILE_35, SPECIAL_TILE_40, + SPECIAL_TILE_36, SPECIAL_TILE_34, SPECIAL_TILE_37, + SPECIAL_TILE_41, SPECIAL_TILE_38, SPECIAL_TILE_42 }; + static const u16 gUnk_08122874[] = { SPECIAL_TILE_39, SPECIAL_TILE_35, SPECIAL_TILE_35, + SPECIAL_TILE_36, SPECIAL_TILE_34, SPECIAL_TILE_34, + SPECIAL_TILE_41, SPECIAL_TILE_38, SPECIAL_TILE_38 }; + static const u16 gUnk_08122886[] = { SPECIAL_TILE_35, SPECIAL_TILE_35, SPECIAL_TILE_40, + SPECIAL_TILE_34, SPECIAL_TILE_34, SPECIAL_TILE_37, + SPECIAL_TILE_38, SPECIAL_TILE_38, SPECIAL_TILE_42 }; u32 collisionLayer; const u16* pTileTypes; @@ -223,7 +232,7 @@ void sub_080931A4(ObjectBlockingStairsEntity* this, u32 param_2) { for (index = 0, iVar5 = 0; index < 9; index++) { u32 pos = tilePos + iVar5 + index - 1; - SetBottomTile(pTileTypes[index], pos, collisionLayer); + SetTile(pTileTypes[index], pos, collisionLayer); switch (index) { case 2: iVar5 = 0x3d; diff --git a/src/object/objectOnPillar.c b/src/object/objectOnPillar.c index f0525f1d..f48d7bcd 100644 --- a/src/object/objectOnPillar.c +++ b/src/object/objectOnPillar.c @@ -7,13 +7,14 @@ #include "functions.h" #include "hitbox.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; /*0x68*/ u8 unk_68[8]; /*0x70*/ u16 tileIndex; /*0x72*/ u16 unk_72; - /*0x74*/ u16 tilePosition; + /*0x74*/ u16 tilePos; /*0x76*/ u16 unk_76; /*0x78*/ u8 unk_78[0x4]; /*0x7c*/ u8 unk_7c; @@ -22,7 +23,7 @@ typedef struct { /*0x7f*/ u8 unk_7f; /*0x80*/ u8 unk_80[0x4]; /*0x84*/ u16 hitFlag; - /*0x86*/ u16 unk_86; + /*0x86*/ u16 flag; } ObjectOnPillarEntity; extern bool32 sub_080896B0(void); // pushableStatue @@ -35,11 +36,6 @@ typedef struct { /*0x86*/ u16 hitFlag; } EntityWithHitFlag; -typedef struct { - u16 key; - u16 value; -} KeyValuePair; - void sub_080970F4(ObjectOnPillarEntity*); void sub_080971E0(ObjectOnPillarEntity*); bool32 sub_08097194(ObjectOnPillarEntity*); @@ -68,7 +64,7 @@ void ObjectOnPillar_Init(ObjectOnPillarEntity* this) { static const u8 gUnk_08123264[] = { 0, 2, 4, 3, 7, 5, 0, 0, }; - if (CheckFlags(this->unk_86) == 0) { + if (CheckFlags(this->flag) == 0) { super->action = 1; super->speed = 0x80; super->updatePriority = 3; @@ -152,8 +148,8 @@ void ObjectOnPillar_Action4(ObjectOnPillarEntity* this) { bool32 sub_08097008(ObjectOnPillarEntity* this) { Entity* effect; - u32 tileType = GetTileType(this->tilePosition, super->collisionLayer); - if (tileType != 0x4036) { + u32 tileType = GetTileTypeAtTilePos(this->tilePos, super->collisionLayer); + if (tileType != SPECIAL_TILE_54) { switch (sub_08097074(tileType)) { case 1: super->direction = (((tileType - 0x37) & 3) << 3); @@ -177,8 +173,10 @@ bool32 sub_08097008(ObjectOnPillarEntity* this) { u32 sub_08097074(u32 tileType) { static const KeyValuePair gUnk_0812327C[] = { - { 0x4037, 1 }, { 0x4038, 1 }, { 0x4039, 1 }, { 0x403a, 1 }, { 0x7a, 2 }, { 0x78, 2 }, { 0, 0 }, + { SPECIAL_TILE_55, 1 }, { SPECIAL_TILE_56, 1 }, { SPECIAL_TILE_57, 1 }, + { SPECIAL_TILE_58, 1 }, { TILE_TYPE_122, 2 }, { TILE_TYPE_120, 2 }, }; + static const u16 gUnk_0812327CEnd = 0; const KeyValuePair* entry = gUnk_0812327C; for (; entry->key != 0; entry++) { if (entry->key == tileType) { @@ -192,23 +190,23 @@ void sub_08097098(ObjectOnPillarEntity* this) { u16 tileType; this->unk_76 = 0x20; EnqueueSFX(SFX_10F); - SetBottomTile(this->tileIndex, this->tilePosition, super->collisionLayer); - tileType = GetTileType(gUnk_080B4488[super->direction >> 3] + this->tilePosition, super->collisionLayer); + SetTile(this->tileIndex, this->tilePos, super->collisionLayer); + tileType = GetTileTypeAtTilePos(gUnk_080B4488[super->direction >> 3] + this->tilePos, super->collisionLayer); if ((tileType == 0x79) || tileType == 0x77) { super->spriteOffsetY = 2; } } void sub_080970F4(ObjectOnPillarEntity* this) { - this->tilePosition = COORD_TO_TILE(super); - this->tileIndex = GetTileIndex(this->tilePosition, super->collisionLayer); - SetBottomTile(0x4036, this->tilePosition, super->collisionLayer); + this->tilePos = COORD_TO_TILE(super); + this->tileIndex = GetTileIndex(this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_54, this->tilePos, super->collisionLayer); } bool32 sub_08097144(ObjectOnPillarEntity* this) { LinearMoveUpdate(super); sub_0800445C(super); - if (GetActTile(super) == 0x19) { + if (GetActTileAtEntity(super) == ACT_TILE_25) { super->spriteOffsetY = 2; } if ((--this->unk_76 == 0) && sub_08097194(this) == FALSE) { @@ -224,9 +222,9 @@ bool32 sub_08097194(ObjectOnPillarEntity* this) { if (sub_0800442E(super)) { return TRUE; } else { - u32 tileType = GetTileTypeByEntity(super); - if (tileType == 0x71 || tileType == 0x72 || (tileType == 0x4020)) { - SetFlag(this->unk_86); + u32 tileType = GetTileTypeAtEntity(super); + if (tileType == TILE_TYPE_113 || tileType == TILE_TYPE_114 || tileType == SPECIAL_TILE_32) { + SetFlag(this->flag); EnqueueSFX(SFX_10B); sub_080971E0(this); return TRUE; @@ -239,7 +237,7 @@ bool32 sub_08097194(ObjectOnPillarEntity* this) { void sub_080971E0(ObjectOnPillarEntity* this) { EntityWithHitFlag* entity; - u32 tilePosition; + u32 tilePos; entity = (EntityWithHitFlag*)CreateObject(SPECIAL_FX, FX_DASH, 0x40); if (entity != NULL) { @@ -255,13 +253,13 @@ void sub_080971E0(ObjectOnPillarEntity* this) { super->action = 4; super->frameIndex = 1; super->spritePriority.b0 = 7; - SetBottomTile(0, COORD_TO_TILE(super), super->collisionLayer); + SetTile(0, COORD_TO_TILE(super), super->collisionLayer); DeleteThisEntity(); break; case 1: - tilePosition = COORD_TO_TILE(super); - if (sub_08097348(tilePosition) == 0) { - SetTileType(0x73, tilePosition, super->collisionLayer); + tilePos = COORD_TO_TILE(super); + if (sub_08097348(tilePos) == 0) { + SetTileType(TILE_TYPE_115, tilePos, super->collisionLayer); } DeleteThisEntity(); break; @@ -288,11 +286,11 @@ void sub_080971E0(ObjectOnPillarEntity* this) { } } -bool32 sub_08097348(u32 tilePosition) { +bool32 sub_08097348(u32 tilePos) { u32 index; TileEntity* tileEntity = gSmallChests; for (index = 0; index < ARRAY_COUNT(gSmallChests); index++, tileEntity++) { - if (tileEntity->tilePos == tilePosition) { + if (tileEntity->tilePos == tilePos) { return CheckLocalFlag(tileEntity->localFlag); } } diff --git a/src/object/octorokBossObject.c b/src/object/octorokBossObject.c index 075c858f..ed704166 100644 --- a/src/object/octorokBossObject.c +++ b/src/object/octorokBossObject.c @@ -181,8 +181,9 @@ void OctorokBossObject_Action1(OctorokBossObjectEntity* this) { return; } case 1: - super->direction = CalcOffsetAngle(this->helper->tailObjects[super->timer]->x.WORD - super->x.WORD, - this->helper->tailObjects[super->timer]->y.WORD - super->y.WORD); + super->direction = + CalculateDirectionFromOffsets(this->helper->tailObjects[super->timer]->x.WORD - super->x.WORD, + this->helper->tailObjects[super->timer]->y.WORD - super->y.WORD); LinearMoveAngle(super, super->speed, super->direction); if (EntityInRectRadius(super, this->helper->tailObjects[super->timer], 2, 2) == 0) { return; @@ -207,7 +208,8 @@ void OctorokBossObject_Action1(OctorokBossObjectEntity* this) { case 2: if (super->parent->type2 == 3) { Entity* object = ((OctorokBossObjectEntity*)super->parent)->helper->mouthObject; - super->direction = CalcOffsetAngle(object->x.WORD - super->x.WORD, object->y.WORD - super->y.WORD); + super->direction = + CalculateDirectionFromOffsets(object->x.WORD - super->x.WORD, object->y.WORD - super->y.WORD); LinearMoveAngle(super, 0x280, super->direction); if (sub_0806FC80(super, super->parent, 0x48) == 0) { return; @@ -349,7 +351,8 @@ bool32 sub_0809A6F8(u32 param_1, u32 param_2, u32 param_3, u32 param_4) { if (sub_0809A758(param_1, param_2) != 0) { if (gUnk_081238A0[param_3] != 0) { if ((param_4 & 1) != 0) { - sub_0807B9B8(gUnk_081238A0[param_3], (param_1 >> 4 & 0x3f) | (param_2 >> 4 & 0x3f) << 6, 1); + SetTileByIndex(gUnk_081238A0[param_3], (param_1 >> 4 & 0x3f) | (param_2 >> 4 & 0x3f) << 6, + LAYER_BOTTOM); } else { RestorePrevTileEntity((param_1 >> 4 & 0x3f) | (param_2 >> 4 & 0x3f) << 6, 1); } diff --git a/src/object/palaceArchway.c b/src/object/palaceArchway.c index 77ca2a74..bcf23fb2 100644 --- a/src/object/palaceArchway.c +++ b/src/object/palaceArchway.c @@ -5,6 +5,7 @@ * @brief Palace Archway object */ #include "object.h" +#include "tiles.h" void PalaceArchway_Init(Entity*); void PalaceArchway_Action1(Entity*); @@ -22,7 +23,7 @@ void PalaceArchway_Init(Entity* this) { this->frameIndex = this->type2; this->spriteRendering.b3 = 3; this->spritePriority.b0 = 7; - SetBottomTile(0x4069, COORD_TO_TILE(this), this->collisionLayer); + SetTile(SPECIAL_TILE_105, COORD_TO_TILE(this), this->collisionLayer); } void PalaceArchway_Action1(Entity* this) { diff --git a/src/object/paper.c b/src/object/paper.c index 541d86a5..eb2af45d 100644 --- a/src/object/paper.c +++ b/src/object/paper.c @@ -5,7 +5,9 @@ * @brief Paper object */ #include "functions.h" +#include "map.h" #include "object.h" +#include "tiles.h" void Paper_Init(Entity*); void Paper_Action1(Entity*); @@ -40,7 +42,7 @@ void Paper_Type0(Entity* this) { } this->spriteSettings.draw = 0; } - SetBottomTile(0x4051, COORD_TO_TILE(this), 1); + SetTile(SPECIAL_TILE_81, COORD_TO_TILE(this), LAYER_BOTTOM); } void Paper_Type1(Entity* this) { @@ -60,8 +62,8 @@ void Paper_Type2(Entity* this) { this->action = 1; this->y.HALF.HI++; this->spriteOffsetY = -1; - SetBottomTile(0x4051, COORD_TO_TILE(this) - 1, 1); - SetBottomTile(0x4051, COORD_TO_TILE(this), 1); + SetTile(SPECIAL_TILE_81, COORD_TO_TILE(this) - 1, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_81, COORD_TO_TILE(this), LAYER_BOTTOM); } void Paper_Action1(Entity* this) { diff --git a/src/object/playerClone.c b/src/object/playerClone.c index f6767e07..174b7a1d 100644 --- a/src/object/playerClone.c +++ b/src/object/playerClone.c @@ -12,6 +12,7 @@ #include "player.h" #include "room.h" #include "sound.h" +#include "tiles.h" typedef struct { Entity base; @@ -51,7 +52,7 @@ void PlayerClone_Init(PlayerCloneEntity* this) { super->y.HALF.HI = (super->y.HALF.HI & 0xfff0) | 8; this->tilePos = COORD_TO_TILE(super); InitializeAnimation(super, 8); - SetBottomTile(0x4016, this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_22, this->tilePos, super->collisionLayer); SoundReq(SFX_112); } @@ -77,7 +78,7 @@ void PlayerClone_Action1(PlayerCloneEntity* this) { if ((this->unk78 != 0) && (this->unk7a != 0)) { ((PlayerCloneEntity*)gPlayerClones[super->type])->unk70 = 1; } - CloneTile(0x315, this->tilePos, super->collisionLayer); + CloneTile(TILE_TYPE_789, this->tilePos, super->collisionLayer); super->child = sub_08077CF8(1, super->type + 1, 0, ((GenericEntity*)gPlayerState.item)->field_0x68.HALF.LO); if (super->child != NULL) { super->child->parent = super; @@ -86,7 +87,7 @@ void PlayerClone_Action1(PlayerCloneEntity* this) { sub_0806FDA0(super); PlayerClone_Action2(this); } else if (gPlayerState.chargeState.action != 4) { - CloneTile(0x315, this->tilePos, super->collisionLayer); + CloneTile(TILE_TYPE_789, this->tilePos, super->collisionLayer); gPlayerClones[super->type] = NULL; DeleteThisEntity(); } else { @@ -109,7 +110,7 @@ void PlayerClone_Action2(PlayerCloneEntity* this) { if (gPlayerEntity.base.iframes >= 1) { gPlayerState.chargeState.action = 1; } else { - GetActTile(super); // leftover from debugging? + GetActTileAtEntity(super); // TODO why is the return value not used? // leftover from debugging? sub_08084B1C(this); super->x.HALF.HI = gPlayerEntity.base.x.HALF.HI + this->unk78; super->y.HALF.HI = gPlayerEntity.base.y.HALF.HI + this->unk7a; @@ -190,7 +191,8 @@ void sub_08084CAC(PlayerCloneEntity* this) { if (((PlayerCloneEntity*)gPlayerClones[super->type])->unk70 == 0) { ptr = &gUnk_080B4468[super->animationState & 6]; - if (sub_080B1B54(GetTileType(COORD_TO_TILE_OFFSET(super, -ptr[0], -ptr[1]), super->collisionLayer)) == 0x72) { + if (GetActTileForTileType(GetTileTypeAtTilePos(COORD_TO_TILE_OFFSET(super, -ptr[0], -ptr[1]), + super->collisionLayer)) == ACT_TILE_114) { ((PlayerCloneEntity*)gPlayerClones[0])->unk6c |= (1 << super->type); } else { ((PlayerCloneEntity*)gPlayerClones[0])->unk6c &= ~(1 << super->type); diff --git a/src/object/pot.c b/src/object/pot.c index 150705f2..adfcb75d 100644 --- a/src/object/pot.c +++ b/src/object/pot.c @@ -13,6 +13,7 @@ #include "player.h" #include "room.h" #include "sound.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -79,11 +80,11 @@ void Pot_Init(PotEntity* this) { } this->unk_70 = GetTileIndex(COORD_TO_TILE(super), super->collisionLayer); - if (this->unk_70 == 0x4000) { + if (this->unk_70 == SPECIAL_TILE_0) { DeleteThisEntity(); } - SetBottomTile(0x4000, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_0, COORD_TO_TILE(super), super->collisionLayer); InitializeAnimation(super, 5); } @@ -96,7 +97,7 @@ void Pot_Action1(PotEntity* this) { super->subAction = 0; break; case 0x1D: - SetBottomTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); + SetTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); super->action = 5; super->zVelocity = Q_16_16(2.625); super->spriteOffsetY = 0; @@ -106,33 +107,33 @@ void Pot_Action1(PotEntity* this) { Pot_Action5(this); break; default: - tileType = GetTileTypeByEntity(super); + tileType = GetTileTypeAtEntity(super); if (tileType != 0x4000) { switch (tileType) { - case 0x4004: - case 0x4003: - case 0x4002: - case 0x4001: - super->direction = (tileType - 0x4001) * 8; + case SPECIAL_TILE_4: + case SPECIAL_TILE_3: + case SPECIAL_TILE_2: + case SPECIAL_TILE_1: + super->direction = (tileType - SPECIAL_TILE_1) * 8; super->timer = 32; super->action = 4; if (gPlayerState.flags & PL_MINISH) { super->speed >>= 1; super->timer = 64; } - SetBottomTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); + SetTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); EnqueueSFX(SFX_10F); break; - case 0x4067: - SetBottomTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); + case SPECIAL_TILE_103: + SetTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); DeleteThisEntity(); break; default: - if (GetActTile(super) == 13) { + if (GetActTileAtEntity(super) == ACT_TILE_13) { CreateFx(super, FX_FALL_DOWN, 0); - } else if (tileType == 0x4005) { + } else if (tileType == SPECIAL_TILE_5) { gPlayerState.lastSwordMove = SWORD_MOVE_BREAK_POT; - SetBottomTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); + SetTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); } BreakPot(this, NULL); break; @@ -158,7 +159,7 @@ void sub_08082510(PotEntity* this) { super->hitType = 1; super->collisionMask = gPlayerEntity.base.collisionMask; super->spriteOffsetY = 0; - SetBottomTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); + SetTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); super->subAction++; } @@ -223,14 +224,14 @@ void Pot_Action4(PotEntity* this) { } this->unk_70 = GetTileIndex(COORD_TO_TILE(super), super->collisionLayer); - tileType = GetTileTypeByEntity(super); + tileType = GetTileTypeAtEntity(super); switch (tileType) { case 0x71: case 0x72: BreakPot(this, NULL); break; default: - SetBottomTile(0x4000, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_0, COORD_TO_TILE(super), super->collisionLayer); RegisterCarryEntity(super); break; } @@ -253,7 +254,7 @@ void sub_0808270C(PotEntity* this) { if ((gPlayerState.gustJarState & 0xF) != 0x1 || (super->contactFlags & 0x7F) != 0x13) { super->spriteOffsetX = 0; super->action = 1; - SetBottomTile(0x4000, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_0, COORD_TO_TILE(super), super->collisionLayer); } else { sub_0806F4E8(super); } @@ -264,7 +265,7 @@ void sub_08082778(PotEntity* this) { super->timer = 1; super->spriteOffsetX = 0; super->spriteOffsetY = -2; - SetBottomTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); + SetTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); } if ((gPlayerState.gustJarState & 0xF) != 0x1 || (super->contactFlags & 0x7F) != 0x13) { diff --git a/src/object/pullableLever.c b/src/object/pullableLever.c index 991f7c2e..c8f9b086 100644 --- a/src/object/pullableLever.c +++ b/src/object/pullableLever.c @@ -111,7 +111,7 @@ void PullableLever_HandleSubAction0(PullableLeverEntity* this) { if (-player->animationState + super->type2 * 2 == 0) { x = gUnk_081222B8[super->type2 * 2] + super->x.HALF_U.HI; y = gUnk_081222B8[super->type2 * 2 + 1] + super->y.HALF_U.HI; - if (0x10 < sub_080B1B18(x, y, player->collisionLayer) - 0xf) { + if (0x10 < GetCollisionDataAtWorldCoords(x, y, player->collisionLayer) - 0xf) { player->x.HALF.HI = x; player->y.HALF.HI = y; } diff --git a/src/object/pullableMushroom.c b/src/object/pullableMushroom.c index 17333ae3..44d17deb 100644 --- a/src/object/pullableMushroom.c +++ b/src/object/pullableMushroom.c @@ -8,6 +8,7 @@ #include "game.h" #include "hitbox.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -59,7 +60,7 @@ void PullableMushroom_Init(PullableMushroomEntity* this) { super->spritePriority.b0 = 4; super->hitbox = (Hitbox*)&gUnk_080FD224; super->carryFlags = 1; - SetBottomTile(0x4022, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_34, COORD_TO_TILE(super), super->collisionLayer); super->health = 1; super->collisionFlags = 7; super->hitType = 0x6e; diff --git a/src/object/pushableFurniture.c b/src/object/pushableFurniture.c index ec391f0c..4a0dfda7 100644 --- a/src/object/pushableFurniture.c +++ b/src/object/pushableFurniture.c @@ -7,6 +7,7 @@ #include "object/pushableFurniture.h" #include "functions.h" +#include "tiles.h" extern const s16 gUnk_080B4488[]; @@ -150,8 +151,8 @@ void PushableFurniture_Action1(PushableFurnitureEntity* this) { void sub_0808FB68(PushableFurnitureEntity* this) { u32 tileIndex = GetTileIndex(this->unk_70, super->collisionLayer); switch (tileIndex) { - case 0x4030: - case 0x4031: + case SPECIAL_TILE_48: + case SPECIAL_TILE_49: super->action = 2; super->direction = (((tileIndex - 0x30) & 1) << 4) | 8; SetPlayerControl(CONTROL_1); @@ -160,8 +161,8 @@ void sub_0808FB68(PushableFurnitureEntity* this) { default: tileIndex = GetTileIndex(this->unk_72, super->collisionLayer); switch (tileIndex) { - case 0x4030: - case 0x4031: + case SPECIAL_TILE_48: + case SPECIAL_TILE_49: super->action = 2; super->direction = (((tileIndex - 0x30) & 1) << 4) | 8; SetPlayerControl(CONTROL_1); @@ -175,7 +176,7 @@ void sub_0808FB68(PushableFurnitureEntity* this) { void sub_0808FBFC(PushableFurnitureEntity* this) { u32 tileIndex = GetTileIndex(this->unk_7c, super->collisionLayer); - if (tileIndex != 0x404a) { + if (tileIndex != SPECIAL_TILE_74) { super->action = 2; super->direction = ((tileIndex - 0x4bU) & 3) << 3; SetPlayerControl(CONTROL_1); @@ -202,7 +203,7 @@ bool32 sub_0808FC5C(PushableFurnitureEntity* this) { } else { super->spriteOffsetY = 0; } - if (sub_080B1B0C(super)) { + if (GetCollisionDataAtEntity(super)) { return 0; } if (super->subtimer == 0) { @@ -288,32 +289,32 @@ void sub_0808FD44(PushableFurnitureEntity* this, u32 param_2) { void sub_0808FDE8(PushableFurnitureEntity* this) { u32 uVar1; s32 iVar2; - u32 uVar3; + u32 tilePos; - uVar3 = (u32)this->unk_70; - uVar1 = sub_080B1B44(uVar3 - 1, 1); - iVar2 = GetTileIndex(uVar3, 1); - if (iVar2 == 0x402e) { + tilePos = (u32)this->unk_70; + uVar1 = GetCollisionDataAtTilePos(tilePos - 1, LAYER_BOTTOM); + iVar2 = GetTileIndex(tilePos, LAYER_BOTTOM); + if (iVar2 == SPECIAL_TILE_46) { if ((((uVar1 & 0xf0) != 0) && ((uVar1 & 0xf0) != 0x50)) || ((uVar1 & 5) == 0)) { - SetBottomTile(0x402c, uVar3, 1); + SetTile(SPECIAL_TILE_44, tilePos, LAYER_BOTTOM); } } else { - iVar2 = sub_080B1B44(uVar3, 1); + iVar2 = GetCollisionDataAtTilePos(tilePos, LAYER_BOTTOM); if ((iVar2 == 5) && ((((uVar1 & 0xf0) == 0 || ((uVar1 & 0xf0) == 0x50)) && ((uVar1 & 5) != 0)))) { - SetBottomTile(0x402e, uVar3, 1); + SetTile(SPECIAL_TILE_46, tilePos, LAYER_BOTTOM); } } - uVar3 = (u32)this->unk_72; - uVar1 = sub_080B1B44(uVar3 + 1, 1); - iVar2 = GetTileIndex(uVar3, 1); - if (iVar2 == 0x402f) { + tilePos = (u32)this->unk_72; + uVar1 = GetCollisionDataAtTilePos(tilePos + 1, LAYER_BOTTOM); + iVar2 = GetTileIndex(tilePos, LAYER_BOTTOM); + if (iVar2 == SPECIAL_TILE_47) { if ((((uVar1 & 0xf0) != 0) && ((uVar1 & 0xf0) != 0x50)) || ((uVar1 & 10) == 0)) { - SetBottomTile(0x402d, uVar3, 1); + SetTile(SPECIAL_TILE_45, tilePos, LAYER_BOTTOM); } } else { - iVar2 = sub_080B1B44(uVar3, 1); + iVar2 = GetCollisionDataAtTilePos(tilePos, LAYER_BOTTOM); if (((iVar2 == 10) && (((uVar1 & 0xf0) == 0 || ((uVar1 & 0xf0) == 0x50)))) && ((uVar1 & 10) != 0)) { - SetBottomTile(0x402f, uVar3, 1); + SetTile(SPECIAL_TILE_47, tilePos, LAYER_BOTTOM); } } } @@ -360,24 +361,24 @@ void sub_0808FF50(PushableFurnitureEntity* this) { switch (this->unk_80) { case 0: this->unk_70 = tmp; - this->unk_74 = GetTileIndex(this->unk_70, 1); - SetBottomTile(0x404a, tmp, 1); + this->unk_74 = GetTileIndex(this->unk_70, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_74, tmp, LAYER_BOTTOM); break; case 1: if ((tmp2 & 8) != 0) { this->unk_70 = this->unk_7c; - this->unk_74 = GetTileIndex(this->unk_70, 1); - SetBottomTile(gUnk_08121EE4[this->unk_81], position, 1); + this->unk_74 = GetTileIndex(this->unk_70, LAYER_BOTTOM); + SetTile(gUnk_08121EE4[this->unk_81], position, LAYER_BOTTOM); this->unk_72 = tmp + 1; - this->unk_76 = GetTileIndex(this->unk_72, 1); + this->unk_76 = GetTileIndex(this->unk_72, LAYER_BOTTOM); sub_08090094(this, gUnk_08121EE4[this->unk_81 + 4], this->unk_72); sub_0809028C(this, 1); } else { this->unk_72 = this->unk_7c; - this->unk_76 = GetTileIndex(this->unk_72, 1); - SetBottomTile(gUnk_08121EE4[this->unk_81], position, 1); + this->unk_76 = GetTileIndex(this->unk_72, LAYER_BOTTOM); + SetTile(gUnk_08121EE4[this->unk_81], position, LAYER_BOTTOM); this->unk_70 = tmp - 1; - this->unk_74 = GetTileIndex(this->unk_70, 1); + this->unk_74 = GetTileIndex(this->unk_70, LAYER_BOTTOM); sub_08090094(this, gUnk_08121EE4[this->unk_81 + 2], this->unk_70); sub_0809028C(this, 0); } @@ -385,98 +386,98 @@ void sub_0808FF50(PushableFurnitureEntity* this) { } } -void sub_08090094(PushableFurnitureEntity* this, u32 param_2, u32 tilePos) { +void sub_08090094(PushableFurnitureEntity* this, u32 tileIndex, u32 tilePos) { FORCE_REGISTER(u32 tmp1, r4); - u32 index; + u32 newTileIndex; u32 tmp2; - tmp1 = sub_080B1B44(tilePos, 1); - index = GetTileIndex(tilePos, 1); - if ((index & 0x4000) == 0) { - index = param_2; - switch (index) { - case 0x4025: + tmp1 = GetCollisionDataAtTilePos(tilePos, 1); + newTileIndex = GetTileIndex(tilePos, LAYER_BOTTOM); + if ((newTileIndex & 0x4000) == 0) { + newTileIndex = tileIndex; + switch (newTileIndex) { + case SPECIAL_TILE_37: if (tmp1 == 5) { - index = 0x4022; + newTileIndex = SPECIAL_TILE_34; } - SetBottomTile(index, tilePos, 1); + SetTile(newTileIndex, tilePos, LAYER_BOTTOM); return; - case 0x402d: - case 0x402f: + case SPECIAL_TILE_45: + case SPECIAL_TILE_47: if (tmp1 == 5) { - index = 0x4022; + newTileIndex = SPECIAL_TILE_34; } - SetBottomTile(index, tilePos, 1); + SetTile(newTileIndex, tilePos, LAYER_BOTTOM); return; - case 0x4024: - case 0x402c: - case 0x402e: + case SPECIAL_TILE_36: + case SPECIAL_TILE_44: + case SPECIAL_TILE_46: if (tmp1 == 10) { - index = 0x4022; + newTileIndex = SPECIAL_TILE_34; } - SetBottomTile(index, tilePos, 1); + SetTile(newTileIndex, tilePos, LAYER_BOTTOM); return; default: - SetBottomTile(index, tilePos, 1); + SetTile(newTileIndex, tilePos, LAYER_BOTTOM); return; } } - switch (index) { - case 0x4022: + switch (newTileIndex) { + case SPECIAL_TILE_34: default: return; - case 0x4025: - if (param_2 == 0x4024) { - index = 0x4022; + case SPECIAL_TILE_37: + if (tileIndex == SPECIAL_TILE_36) { + newTileIndex = SPECIAL_TILE_34; this->unk_83 |= 0x10; } - if (param_2 == 0x402c) { - index = 0x4022; + if (tileIndex == SPECIAL_TILE_44) { + newTileIndex = SPECIAL_TILE_34; this->unk_83 |= 0x10; } break; - case 0x402d: - case 0x402f: - if (param_2 == 0x402c) { - index = 0x402b; + case SPECIAL_TILE_45: + case SPECIAL_TILE_47: + if (tileIndex == SPECIAL_TILE_44) { + newTileIndex = SPECIAL_TILE_43; this->unk_83 |= 0x10; } - if (param_2 == 0x4024) { - index = 0x4022; + if (tileIndex == SPECIAL_TILE_36) { + newTileIndex = SPECIAL_TILE_34; this->unk_83 |= 0x10; } break; - case 0x4024: - if (param_2 == 0x4025) { - index = 0x4022; + case SPECIAL_TILE_36: + if (tileIndex == SPECIAL_TILE_37) { + newTileIndex = SPECIAL_TILE_34; this->unk_83 |= 0x20; } - if (param_2 == 0x402d) { - index = 0x4022; + if (tileIndex == SPECIAL_TILE_45) { + newTileIndex = SPECIAL_TILE_34; this->unk_83 |= 0x20; } break; - case 0x402c: - case 0x402e: - if (param_2 == 0x402d) { - index = 0x402b; + case SPECIAL_TILE_44: + case SPECIAL_TILE_46: + if (tileIndex == SPECIAL_TILE_45) { + newTileIndex = SPECIAL_TILE_43; this->unk_83 |= 0x20; } - if (param_2 == 0x4025) { - index = 0x4022; + if (tileIndex == SPECIAL_TILE_37) { + newTileIndex = SPECIAL_TILE_34; this->unk_83 |= 0x20; } break; } - SetBottomTile(index, tilePos, 1); + SetTile(newTileIndex, tilePos, LAYER_BOTTOM); } void sub_08090254(PushableFurnitureEntity* this) { - sub_0807B9B8(this->unk_74, this->unk_70, super->collisionLayer); + SetTileByIndex(this->unk_74, this->unk_70, super->collisionLayer); if (this->unk_80 == 1) { - sub_0807B9B8(this->unk_76, this->unk_72, super->collisionLayer); + SetTileByIndex(this->unk_76, this->unk_72, super->collisionLayer); } } @@ -491,7 +492,7 @@ void sub_0809028C(PushableFurnitureEntity* this, u32 param_2) { if ((this->unk_83 & 0x20) != 0) { sub_08090480(0, uVar2 + 1); } else { - switch (GetTileType(uVar2, 2)) { + switch (GetTileTypeAtTilePos(uVar2, 2)) { case 0x301: this->unk_83 |= 8; break; @@ -505,7 +506,7 @@ void sub_0809028C(PushableFurnitureEntity* this, u32 param_2) { sub_08090480(0, uVar2); } if ((this->unk_83 & 0x10) != 0) { - switch (GetTileType(pos - 1, 1)) { + switch (GetTileTypeAtTilePos(pos - 1, 1)) { case 0x300: break; default: @@ -515,7 +516,7 @@ void sub_0809028C(PushableFurnitureEntity* this, u32 param_2) { } return; } - switch (GetTileType(pos - 1, 2)) { + switch (GetTileTypeAtTilePos(pos - 1, 2)) { case 0x300: this->unk_83 |= 4; break; @@ -532,7 +533,7 @@ void sub_0809028C(PushableFurnitureEntity* this, u32 param_2) { if ((this->unk_83 & 0x10) != 0) { sub_08090480(0, pos - 1); } else { - switch (GetTileType(pos, 2)) { + switch (GetTileTypeAtTilePos(pos, 2)) { case 0x302: this->unk_83 |= 4; break; @@ -546,7 +547,7 @@ void sub_0809028C(PushableFurnitureEntity* this, u32 param_2) { sub_08090480(0, uVar2); } if ((this->unk_83 & 0x20) != 0) { - switch (GetTileType(uVar2 + 1, 1)) { + switch (GetTileTypeAtTilePos(uVar2 + 1, 1)) { case 0x300: break; default: @@ -556,7 +557,7 @@ void sub_0809028C(PushableFurnitureEntity* this, u32 param_2) { } return; } - switch (GetTileType(uVar2 + 1, 2)) { + switch (GetTileTypeAtTilePos(uVar2 + 1, 2)) { case 0x300: this->unk_83 |= 8; break; @@ -571,20 +572,20 @@ void sub_0809028C(PushableFurnitureEntity* this, u32 param_2) { } } -void sub_08090480(u32 param_1, u32 param_2) { - SetBottomTile(gUnk_08121EF0[param_1], param_2, 1); +void sub_08090480(u32 param_1, u32 tilePos) { + SetTile(gUnk_08121EF0[param_1], tilePos, LAYER_BOTTOM); } void sub_08090498(PushableFurnitureEntity* this) { u32 tmp = this->unk_70 - 0x80; RestorePrevTileEntity(tmp, 1); - if (((this->unk_83 & 1) != 0) && (GetTileType(tmp, 2) == 0x306)) { - sub_08000148(0x62, tmp, 1); + if (((this->unk_83 & 1) != 0) && (GetTileTypeAtTilePos(tmp, 2) == 0x306)) { + SetCollisionData(0x62, tmp, 1); } tmp = this->unk_72 - 0x80; RestorePrevTileEntity(tmp, 1); - if (((this->unk_83 & 2) != 0) && (GetTileType(tmp, 2) == 0x308)) { - sub_08000148(99, tmp, 1); + if (((this->unk_83 & 2) != 0) && (GetTileTypeAtTilePos(tmp, 2) == 0x308)) { + SetCollisionData(99, tmp, 1); } } @@ -617,11 +618,11 @@ void (*const PushableFurniture_Actions[])(PushableFurnitureEntity*) = { PushableFurniture_Action2, }; const u16 gUnk_08121EE4[] = { - 0x402b, 0x4022, 0x402c, 0x4024, 0x402d, 0x4025, + SPECIAL_TILE_43, SPECIAL_TILE_34, SPECIAL_TILE_44, SPECIAL_TILE_36, SPECIAL_TILE_45, SPECIAL_TILE_37, }; const u16 gUnk_08121EF0[] = { - 0x4026, - 0x4065, - 0x4066, + SPECIAL_TILE_38, + SPECIAL_TILE_101, + SPECIAL_TILE_102, 0, }; diff --git a/src/object/pushableGrave.c b/src/object/pushableGrave.c index 75fe9463..4ba81982 100644 --- a/src/object/pushableGrave.c +++ b/src/object/pushableGrave.c @@ -7,6 +7,7 @@ #include "functions.h" #include "hitbox.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -37,22 +38,22 @@ void PushableGrave(PushableGraveEntity* this) { } void PushableGrave_Init(PushableGraveEntity* this) { - u32 tilePosition; + u32 tilePos; u32 tileIndex; super->spriteSettings.draw = 1; super->frameIndex = super->type; super->updatePriority = 3; - tilePosition = COORD_TO_TILE(super); - this->unk_6a = GetTileIndex(tilePosition - 0x41, super->collisionLayer); - this->unk_6c = GetTileIndex(tilePosition - 0x40, super->collisionLayer); - this->unk_6e = GetTileIndex(tilePosition - 0x3f, super->collisionLayer); - this->unk_70 = GetTileIndex(tilePosition - 1, super->collisionLayer); - this->unk_72 = GetTileIndex(tilePosition, super->collisionLayer); - this->unk_74 = GetTileIndex(tilePosition + 1, super->collisionLayer); - this->unk_76 = GetTileIndex(tilePosition + 0x3f, super->collisionLayer); - this->unk_78 = GetTileIndex(tilePosition + 0x40, super->collisionLayer); - this->unk_7a = GetTileIndex(tilePosition + 0x41, super->collisionLayer); + tilePos = COORD_TO_TILE(super); + this->unk_6a = GetTileIndex(tilePos - 0x41, super->collisionLayer); + this->unk_6c = GetTileIndex(tilePos - 0x40, super->collisionLayer); + this->unk_6e = GetTileIndex(tilePos - 0x3f, super->collisionLayer); + this->unk_70 = GetTileIndex(tilePos - 1, super->collisionLayer); + this->unk_72 = GetTileIndex(tilePos, super->collisionLayer); + this->unk_74 = GetTileIndex(tilePos + 1, super->collisionLayer); + this->unk_76 = GetTileIndex(tilePos + 0x3f, super->collisionLayer); + this->unk_78 = GetTileIndex(tilePos + 0x40, super->collisionLayer); + this->unk_7a = GetTileIndex(tilePos + 0x41, super->collisionLayer); if (sub_0809798C(this)) { if (super->type == 0) { super->y.HALF.HI -= 0x16; @@ -63,19 +64,19 @@ void PushableGrave_Init(PushableGraveEntity* this) { } else { super->action = 1; - tilePosition = COORD_TO_TILE(super); - this->unk_68 = tilePosition; + tilePos = COORD_TO_TILE(super); + this->unk_68 = tilePos; tileIndex = PushableGrave_Tiles[super->type2]; if (super->type == 0) { super->hitbox = (Hitbox*)&gUnk_080FD578; - SetBottomTile(tileIndex, tilePosition - 1, super->collisionLayer); - SetBottomTile(tileIndex, tilePosition, super->collisionLayer); + SetTile(tileIndex, tilePos - 1, super->collisionLayer); + SetTile(tileIndex, tilePos, super->collisionLayer); super->y.HALF.HI += 2; } else { super->hitbox = (Hitbox*)&gUnk_080FD570; - SetBottomTile(tileIndex, tilePosition, super->collisionLayer); + SetTile(tileIndex, tilePos, super->collisionLayer); if (super->type2 == 2) { - SetMultipleTiles((TileData*)gUnk_081232C0, tilePosition, super->collisionLayer); + SetMultipleTiles((TileData*)gUnk_081232C0, tilePos, super->collisionLayer); } } } @@ -129,13 +130,13 @@ void PushableGrave_Action4(PushableGraveEntity* this) { } void sub_080977F4(PushableGraveEntity* this) { - u32 tilePosition; + u32 tilePos; super->action = 4; super->spriteOffsetY = 0; - tilePosition = COORD_TO_TILE(super); - SetBottomTile(0x4022, tilePosition, super->collisionLayer); + tilePos = COORD_TO_TILE(super); + SetTile(SPECIAL_TILE_34, tilePos, super->collisionLayer); if (super->type == 0) { - SetBottomTile(0x4022, tilePosition - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos - 1, super->collisionLayer); } if (this->pushedFlag != 0) { SetFlag(this->pushedFlag); @@ -143,27 +144,28 @@ void sub_080977F4(PushableGraveEntity* this) { } bool32 sub_0809785C(PushableGraveEntity* this) { - u32 tilePosition; + u32 tilePos; if (super->type != 0) { if (super->type2 != 0) { - if ((CheckFlags(this->pushedFlag) != 0) || GetTileType(this->unk_68, super->collisionLayer) == 0x403f) { + if ((CheckFlags(this->pushedFlag) != 0) || + GetTileTypeAtTilePos(this->unk_68, super->collisionLayer) == SPECIAL_TILE_63) { super->action = 3; super->timer = 64; super->subtimer = 0; super->direction = 0; super->speed = 0x40; - tilePosition = this->unk_68; - sub_0807B9B8(this->unk_72, tilePosition, super->collisionLayer); + tilePos = this->unk_68; + SetTileByIndex(this->unk_72, tilePos, super->collisionLayer); if (super->type2 == 2) { - sub_0807B9B8(this->unk_6a, tilePosition - 0x41, super->collisionLayer); - sub_0807B9B8(this->unk_6c, tilePosition - 0x40, super->collisionLayer); - sub_0807B9B8(this->unk_6e, tilePosition - 0x3f, super->collisionLayer); - sub_0807B9B8(this->unk_70, tilePosition - 1, super->collisionLayer); - sub_0807B9B8(this->unk_74, tilePosition + 1, super->collisionLayer); - sub_0807B9B8(this->unk_76, tilePosition + 0x3f, super->collisionLayer); - sub_0807B9B8(this->unk_78, tilePosition + 0x40, super->collisionLayer); - sub_0807B9B8(this->unk_7a, tilePosition + 0x41, super->collisionLayer); + SetTileByIndex(this->unk_6a, tilePos + TILE_POS(-1, -1), super->collisionLayer); + SetTileByIndex(this->unk_6c, tilePos + TILE_POS(0, -1), super->collisionLayer); + SetTileByIndex(this->unk_6e, tilePos + TILE_POS(1, -1), super->collisionLayer); + SetTileByIndex(this->unk_70, tilePos + TILE_POS(-1, 0), super->collisionLayer); + SetTileByIndex(this->unk_74, tilePos + TILE_POS(1, 0), super->collisionLayer); + SetTileByIndex(this->unk_76, tilePos + TILE_POS(-1, 1), super->collisionLayer); + SetTileByIndex(this->unk_78, tilePos + TILE_POS(0, 1), super->collisionLayer); + SetTileByIndex(this->unk_7a, tilePos + TILE_POS(1, 1), super->collisionLayer); } SoundReq(SFX_10F); return TRUE; @@ -204,7 +206,7 @@ const u8 gUnk_081232C0[] = { 255, 61, 64, 1, 0, 61, 64, 63, 0, 61, 64, 65, 0, 255, 255, }; const u16 PushableGrave_Tiles[] = { - 0x4022, - 0x403e, - 0x403e, + SPECIAL_TILE_34, + SPECIAL_TILE_62, + SPECIAL_TILE_62, }; diff --git a/src/object/pushableLever.c b/src/object/pushableLever.c index f7633eae..592a51e2 100644 --- a/src/object/pushableLever.c +++ b/src/object/pushableLever.c @@ -6,11 +6,12 @@ */ #include "functions.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; /*0x68*/ u8 unk_68[8]; - /*0x70*/ u16 tilePosition; + /*0x70*/ u16 tilePos; /*0x72*/ u16 tileIndex; /*0x74*/ u16 timer; /*0x76*/ u8 unk_76[16]; @@ -33,9 +34,6 @@ bool32 PushableLever_ShouldStartPushing(PushableLeverEntity* this); void PushableLever_SetTiles(PushableLeverEntity*); void PushableLever_CalculateSpriteOffsets(PushableLeverEntity*); -#define TILE_INITIAL 0x4053 -#define TILE_PUSHED 0x4052 - void PushableLever(PushableLeverEntity* this) { PushableLever_Actions[super->action](this); } @@ -50,7 +48,7 @@ void PushableLever_Idle(PushableLeverEntity* this) { super->action = PUSHING; super->spriteOffsetX = 0; super->spriteOffsetY = 0; - SetBottomTile(this->tileIndex, this->tilePosition, super->collisionLayer); + SetTile(this->tileIndex, this->tilePos, super->collisionLayer); EnqueueSFX(SFX_16A); RequestPriorityDuration(super, 30); if (PlayerCanBeMoved()) { @@ -85,26 +83,26 @@ void PushableLever_SetIdle(PushableLeverEntity* this) { void PushableLever_SetTiles(PushableLeverEntity* this) { if (CheckFlags(this->pushedFlag) == FALSE) { super->type2 = 0; - this->tilePosition = COORD_TO_TILE_OFFSET(super, 0, 0x10); - this->tileIndex = GetTileIndex(this->tilePosition, super->collisionLayer); - SetBottomTile(TILE_INITIAL, this->tilePosition, super->collisionLayer); + this->tilePos = COORD_TO_TILE_OFFSET(super, 0, 0x10); + this->tileIndex = GetTileIndex(this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_83, this->tilePos, super->collisionLayer); InitializeAnimation(super, 1); } else { super->type2 = 1; - this->tilePosition = COORD_TO_TILE_OFFSET(super, 0x10, 0); - this->tileIndex = GetTileIndex(this->tilePosition, super->collisionLayer); - SetBottomTile(TILE_PUSHED, this->tilePosition, super->collisionLayer); + this->tilePos = COORD_TO_TILE_OFFSET(super, 0x10, 0); + this->tileIndex = GetTileIndex(this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_82, this->tilePos, super->collisionLayer); InitializeAnimation(super, 0); } } bool32 PushableLever_ShouldStartPushing(PushableLeverEntity* this) { - if (GetTileIndex(this->tilePosition, super->collisionLayer) == 0x4054) { + if (GetTileIndex(this->tilePos, super->collisionLayer) == SPECIAL_TILE_84) { if (--this->timer == 0) { return TRUE; } PushableLever_CalculateSpriteOffsets(this); - SetBottomTile(PushableLever_Tiles[super->type2], this->tilePosition, super->collisionLayer); + SetTile(PushableLever_Tiles[super->type2], this->tilePos, super->collisionLayer); } else { this->timer = 60; super->spriteOffsetX = 0; @@ -134,8 +132,8 @@ void (*const PushableLever_Actions[])(PushableLeverEntity*) = { PushableLever_Pushing, }; const u16 PushableLever_Tiles[] = { - TILE_INITIAL, - TILE_PUSHED, + SPECIAL_TILE_83, + SPECIAL_TILE_82, }; const u8 PushableLever_InitialOffsets[] = { 0, 0, 0, 0, 255, 0, 0, 0, diff --git a/src/object/pushableRock.c b/src/object/pushableRock.c index f008712b..f58afa79 100644 --- a/src/object/pushableRock.c +++ b/src/object/pushableRock.c @@ -6,14 +6,15 @@ */ #include "functions.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; /*0x68*/ u8 unk_68[8]; /*0x70*/ u16 tileIndex; - /*0x72*/ u8 unk_72; + /*0x72*/ u8 collisionData; /*0x73*/ u8 unk_73; - /*0x74*/ u16 tilePosition; + /*0x74*/ u16 tilePos; /*0x76*/ u8 unk_76[0x10]; /*0x86*/ u16 pushedFlag; } PushableRockEntity; @@ -40,12 +41,12 @@ void PushableRock_Action1(PushableRockEntity* this) { u32 tileType; u32 tmp; - tileType = GetTileType(this->tilePosition, super->collisionLayer); + tileType = GetTileTypeAtTilePos(this->tilePos, super->collisionLayer); switch (tileType) { - case 0x401c: - case 0x401d: - case 0x401e: - case 0x401f: + case SPECIAL_TILE_28: + case SPECIAL_TILE_29: + case SPECIAL_TILE_30: + case SPECIAL_TILE_31: tmp = (tileType - 0x1c); super->animationState = tmp * 2; super->direction = tmp * 8; @@ -54,7 +55,7 @@ void PushableRock_Action1(PushableRockEntity* this) { } else { super->spriteSettings.flipX = 0; } - SetBottomTile(this->tileIndex, this->tilePosition, super->collisionLayer); + SetTile(this->tileIndex, this->tilePos, super->collisionLayer); super->action = 2; InitializeAnimation(super, (super->animationState >> 1) + 1); EnqueueSFX(SFX_10F); @@ -86,13 +87,13 @@ void PushableRock_Action3(PushableRockEntity* this) { } void sub_0808A644(PushableRockEntity* this) { - u32 tmp; - this->tilePosition = COORD_TO_TILE(super); - this->tileIndex = GetTileIndex(this->tilePosition, super->collisionLayer); - this->unk_72 = sub_080B1B44(this->tilePosition, super->collisionLayer); - tmp = sub_080B1AE0(this->tilePosition, super->collisionLayer); - if ((tmp == 0x19) || (tmp == 0xf0)) { - SetBottomTile(0x4015, this->tilePosition, super->collisionLayer); + u32 actTile; + this->tilePos = COORD_TO_TILE(super); + this->tileIndex = GetTileIndex(this->tilePos, super->collisionLayer); + this->collisionData = GetCollisionDataAtTilePos(this->tilePos, super->collisionLayer); + actTile = GetActTileAtTilePos(this->tilePos, super->collisionLayer); + if ((actTile == ACT_TILE_25) || (actTile == ACT_TILE_240)) { + SetTile(SPECIAL_TILE_21, this->tilePos, super->collisionLayer); super->action = 3; if (!CheckFlags(this->pushedFlag)) { SetFlag(this->pushedFlag); @@ -102,7 +103,7 @@ void sub_0808A644(PushableRockEntity* this) { InitializeAnimation(super, 6); } } else { - SetBottomTile(0x401b, this->tilePosition, super->collisionLayer); + SetTile(SPECIAL_TILE_27, this->tilePos, super->collisionLayer); } } diff --git a/src/object/pushableStatue.c b/src/object/pushableStatue.c index 5da8d0e8..35fbb3bd 100644 --- a/src/object/pushableStatue.c +++ b/src/object/pushableStatue.c @@ -4,9 +4,11 @@ * * @brief Pushable Statue object */ +#include "area.h" #include "functions.h" #include "hitbox.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -28,7 +30,7 @@ extern const u16 gUnk_08120CBC[]; extern const u16 gUnk_08120CCC[]; extern const u16 gUnk_08120D6C[]; -u32 sub_0808968C(u32); +u32 sub_0808968C(u32 tileType); bool32 sub_0808965C(PushableStatueEntity*); void sub_08089454(PushableStatueEntity*); void sub_080894C8(PushableStatueEntity*); @@ -60,8 +62,8 @@ void PushableStatue_Action1(PushableStatueEntity* this) { Entity* obj; if (sub_0800442E(super) == 0) { - tileType = GetTileType(this->unk_84, super->collisionLayer); - if (tileType != 0x400b) { + tileType = GetTileTypeAtTilePos(this->unk_84, super->collisionLayer); + if (tileType != SPECIAL_TILE_11) { switch (sub_0808968C(tileType)) { case 1: super->action = 3; @@ -108,8 +110,8 @@ void PushableStatue_SubAction0(PushableStatueEntity* this) { ptr = &gUnk_08120CB4[index]; PositionRelative(super, &gPlayerEntity.base, Q_16_16(ptr[0]), Q_16_16(ptr[1])); } - tileType = GetTileType(this->unk_84, super->collisionLayer); - if (tileType != 0x400b) { + tileType = GetTileTypeAtTilePos(this->unk_84, super->collisionLayer); + if (tileType != SPECIAL_TILE_11) { switch (sub_0808968C(tileType)) { case 1: super->direction = DirectionFromAnimationState((tileType - 0xc) & 3); @@ -155,7 +157,7 @@ void PushableStatue_Action4(PushableStatueEntity* this) { } else { super->spriteSettings.draw = 1; super->action = 1; - SetBottomTile(0x400b, this->unk_84, super->collisionLayer); + SetTile(SPECIAL_TILE_11, this->unk_84, super->collisionLayer); sub_080894C8(this); } } @@ -163,9 +165,9 @@ void PushableStatue_Action4(PushableStatueEntity* this) { void sub_08089454(PushableStatueEntity* this) { this->unk_84 = COORD_TO_TILE(super); this->unk_80 = GetTileIndex(this->unk_84, super->collisionLayer); - SetBottomTile(0x400b, this->unk_84, super->collisionLayer); - if (super->collisionLayer == 2 && GetTileType(this->unk_84, 1) == 0x310) { - SetBottomTile(0x400b, this->unk_84, 1); + SetTile(SPECIAL_TILE_11, this->unk_84, super->collisionLayer); + if (super->collisionLayer == 2 && GetTileTypeAtTilePos(this->unk_84, 1) == 0x310) { + SetTile(SPECIAL_TILE_11, this->unk_84, LAYER_BOTTOM); } } @@ -194,29 +196,29 @@ void sub_08089538(PushableStatueEntity* this) { u16 tileType; this->unk_86 = 0x20; EnqueueSFX(SFX_10F); - SetBottomTile(this->unk_80, this->unk_84, super->collisionLayer); - if ((super->collisionLayer == 2) && (GetTileType(this->unk_84, 1) == 0x400b)) { - CloneTile(0x310, this->unk_84, 1); + SetTile(this->unk_80, this->unk_84, super->collisionLayer); + if ((super->collisionLayer == 2) && (GetTileTypeAtTilePos(this->unk_84, LAYER_BOTTOM) == SPECIAL_TILE_11)) { + CloneTile(TILE_TYPE_784, this->unk_84, 1); } - tileType = GetTileType(this->unk_84 + gUnk_080B4488[super->direction >> 3], super->collisionLayer); - if ((tileType == 0x79) || (tileType == 0x77)) { + tileType = GetTileTypeAtTilePos(this->unk_84 + gUnk_080B4488[super->direction >> 3], super->collisionLayer); + if ((tileType == TILE_TYPE_121) || (tileType == TILE_TYPE_119)) { super->spriteOffsetY = -2; } } bool32 sub_080895C0(PushableStatueEntity* this) { - Entity* obj; + Entity* rockFx; LinearMoveUpdate(super); if ((--this->unk_86 == 0) && (sub_0800442E(super) == 0)) { super->spriteOffsetY = 0; - if (!sub_080B1B0C(super)) { + if (GetCollisionDataAtEntity(super) == 0) { sub_08089454(this); return TRUE; } - obj = CreateObject(SPECIAL_FX, FX_ROCK, 0); - if (obj != NULL) { - CopyPosition(super, obj); + rockFx = CreateObject(SPECIAL_FX, FX_ROCK, 0); + if (rockFx != NULL) { + CopyPosition(super, rockFx); } super->spriteSettings.draw = 0; super->x.HALF.HI += gUnk_08120CBC[super->direction >> 2]; @@ -230,18 +232,18 @@ bool32 sub_080895C0(PushableStatueEntity* this) { } bool32 sub_0808965C(PushableStatueEntity* this) { - if (gRoomControls.area < 0x40) { - return LoadFixedGFX(super, 0xe9); + if (gRoomControls.area < AREA_40) { + return LoadFixedGFX(super, 233); } else { - return LoadFixedGFX(super, gUnk_08120CCC[gRoomControls.area - 0x40]); + return LoadFixedGFX(super, gUnk_08120CCC[gRoomControls.area - AREA_40]); } } -u32 sub_0808968C(u32 param_1) { +u32 sub_0808968C(u32 tileType) { const u16* it; for (it = gUnk_08120D6C; *it != 0; it += 2) { - if (*it == param_1) { + if (*it == tileType) { return it[1]; } } @@ -251,23 +253,23 @@ u32 sub_0808968C(u32 param_1) { bool32 sub_080896B0(void) { s16 uVar1; s16 iVar2; - LayerStruct* layer; + MapLayer* mapLayer; s32 uVar4; const s16* ptr; u32 tmp1; u32 tmp2; - u32 val; + u32 actTile; if (((gPlayerState.heldObject & 0x1f) == 0x12) && ((gPlayerEntity.base.frame & 1) != 0)) { ptr = &gUnk_080B4468[gPlayerEntity.base.animationState & 6]; uVar1 = gUnk_080B4488[gPlayerEntity.base.animationState >> 1]; uVar4 = COORD_TO_TILE_OFFSET(&gPlayerEntity.base, -ptr[0], -ptr[1]) - uVar1; - val = sub_080B1AE0(uVar4, gPlayerEntity.base.collisionLayer); - if ((val - 0x26 > 1) && (val != 0x29)) { - layer = GetTileBuffer(gPlayerEntity.base.collisionLayer); + actTile = GetActTileAtTilePos(uVar4, gPlayerEntity.base.collisionLayer); + if ((actTile - 0x26 > 1) && (actTile != ACT_TILE_41)) { + mapLayer = GetLayerByIndex(gPlayerEntity.base.collisionLayer); iVar2 = (uVar4 * 0x10000) >> 0x10; - tmp1 = layer->collisionData[iVar2]; - tmp2 = layer->collisionData[(iVar2 - uVar1)]; + tmp1 = mapLayer->collisionData[iVar2]; + tmp2 = mapLayer->collisionData[(iVar2 - uVar1)]; if ((tmp1 == 0) && (tmp2 == 0)) { return TRUE; } @@ -295,5 +297,17 @@ const u16 gUnk_08120CCC[] = { 78, 78, 79, 79, 79, 79, 79, 79, 79, 79, 80, 80, 80, 80, 80, 80, 80, 80, 81, 81, 81, 81, 81, 81, 81, 81, }; const u16 gUnk_08120D6C[] = { - 0x400c, 1, 0x400d, 1, 0x400e, 1, 0x400f, 1, 0x7a, 2, 0x78, 2, 0, + SPECIAL_TILE_12, + 1, + SPECIAL_TILE_13, + 1, + SPECIAL_TILE_14, + 1, + SPECIAL_TILE_15, + 1, + TILE_TYPE_122, + 2, + TILE_TYPE_120, + 2, + 0, }; diff --git a/src/object/railtrack.c b/src/object/railtrack.c index 63172e5a..f5ceab8d 100644 --- a/src/object/railtrack.c +++ b/src/object/railtrack.c @@ -10,6 +10,7 @@ #include "functions.h" #include "room.h" #include "sound.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -65,7 +66,7 @@ void Railtrack_Init(RailtrackEntity* this) { } } InitializeAnimation(super, super->animationState); - this->unk_70 = &GetTileBuffer(super->collisionLayer)->mapData[COORD_TO_TILE(super)]; + this->unk_70 = &GetLayerByIndex(super->collisionLayer)->mapData[COORD_TO_TILE(super)]; sub_08085394(this); } @@ -126,39 +127,39 @@ void Railtrack_Action3(RailtrackEntity* this) { } } -static const u16 gUnk_081205E0[] = { 0x4018, 0x4019 }; +static const u16 gUnk_081205E0[] = { SPECIAL_TILE_24, SPECIAL_TILE_25 }; void sub_08085394(RailtrackEntity* this) { - u32 uVar1; + u32 specialTile; u16* layerData; - u32 tile; - s8 offset; + u32 tilePos; + s8 offsetset; - uVar1 = gUnk_081205E0[super->animationState / 2]; - offset = gUnk_080B4488[super->animationState / 2][0]; + specialTile = gUnk_081205E0[super->animationState / 2]; + offsetset = gUnk_080B4488[super->animationState / 2][0]; layerData = this->unk_70; - tile = COORD_TO_TILE(super); + tilePos = COORD_TO_TILE(super); - this->unk_74 = *(layerData - offset); - SetBottomTile(uVar1, tile - offset, super->collisionLayer); + this->unk_74 = *(layerData - offsetset); + SetTile(specialTile, tilePos - offsetset, super->collisionLayer); this->unk_76 = layerData[0x0]; - SetBottomTile(uVar1, tile - 0x0, super->collisionLayer); + SetTile(specialTile, tilePos, super->collisionLayer); - this->unk_78 = layerData[offset]; - SetBottomTile(uVar1, tile + offset, super->collisionLayer); + this->unk_78 = layerData[offsetset]; + SetTile(specialTile, tilePos + offsetset, super->collisionLayer); } void sub_0808543C(RailtrackEntity* this) { s8* cVar1; - u32 uVar2; - s8 temp; + u32 tilePos; + s8 offset; - temp = gUnk_080B4488[super->animationState / 2][0]; - uVar2 = COORD_TO_TILE(super); - SetBottomTile(this->unk_74, uVar2 - temp, super->collisionLayer); - SetBottomTile(this->unk_76, uVar2, super->collisionLayer); - SetBottomTile(this->unk_78, uVar2 + temp, super->collisionLayer); + offset = gUnk_080B4488[super->animationState / 2][0]; + tilePos = COORD_TO_TILE(super); + SetTile(this->unk_74, tilePos - offset, super->collisionLayer); + SetTile(this->unk_76, tilePos, super->collisionLayer); + SetTile(this->unk_78, tilePos + offset, super->collisionLayer); } u32 sub_080854A8(RailtrackEntity* this) { diff --git a/src/object/rotatingTrapdoor.c b/src/object/rotatingTrapdoor.c index f8e05f49..3351b1d7 100644 --- a/src/object/rotatingTrapdoor.c +++ b/src/object/rotatingTrapdoor.c @@ -31,7 +31,7 @@ void RotatingTrapdoor_Init(Entity* this) { this->action = 1; x = 0; y = 0; - switch (GetTileTypeByEntity(this)) { + switch (GetTileTypeAtEntity(this)) { case 0x343: x = 0x10; case 0x344: diff --git a/src/object/smallIceBlock.c b/src/object/smallIceBlock.c index f6e6e7b3..8aab1f91 100644 --- a/src/object/smallIceBlock.c +++ b/src/object/smallIceBlock.c @@ -9,13 +9,14 @@ #include "hitbox.h" #include "item.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; /*0x68*/ u8 unk_68[0x4]; /*0x6c*/ u16 unk_6c; /*0x6e*/ u8 unk_6e[0x2]; - /*0x70*/ u16 unk_70; + /*0x70*/ u16 tilePos; /*0x72*/ u8 unk_72[0x14]; /*0x86*/ u16 unk_86; } SmallIceBlockEntity; @@ -84,8 +85,8 @@ void SmallIceBlock_Action1(SmallIceBlockEntity* this) { } } else { if (!sub_0800442E(super)) { - tileType = GetTileType(this->unk_70, super->collisionLayer); - if (tileType != 0x405a) { + tileType = GetTileTypeAtTilePos(this->tilePos, super->collisionLayer); + if (tileType != SPECIAL_TILE_90) { switch (sub_08099618(tileType)) { case 1: super->action = 2; @@ -99,7 +100,7 @@ void SmallIceBlock_Action1(SmallIceBlockEntity* this) { if (obj != NULL) { CopyPosition(super, obj); } - SetBottomTile(this->unk_6c, this->unk_70, super->collisionLayer); + SetTile(this->unk_6c, this->tilePos, super->collisionLayer); DeleteEntity(super); break; @@ -158,7 +159,7 @@ void SmallIceBlock_Action4(SmallIceBlockEntity* this) { DeleteThisEntity(); } else { if (super->timer == 0x30) { - SetBottomTile(this->unk_6c, this->unk_70, super->collisionLayer); + SetTile(this->unk_6c, this->tilePos, super->collisionLayer); } SetAffineInfo(super, 0x100, (0x3c - super->timer) * 0x20 + 0x100, 0); if ((super->timer & 1) != 0) { @@ -175,20 +176,20 @@ void SmallIceBlock_Action4(SmallIceBlockEntity* this) { } void sub_08099468(SmallIceBlockEntity* this) { - this->unk_70 = COORD_TO_TILE(super); - this->unk_6c = GetTileIndex(this->unk_70, super->collisionLayer); - SetBottomTile(0x405a, this->unk_70, super->collisionLayer); + this->tilePos = COORD_TO_TILE(super); + this->unk_6c = GetTileIndex(this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_90, this->tilePos, super->collisionLayer); } void sub_080994B8(SmallIceBlockEntity* this) { u16 tileType; EnqueueSFX(SFX_ICE_BLOCK_SLIDE); - SetBottomTile(this->unk_6c, this->unk_70, super->collisionLayer); - if ((super->collisionLayer == 2) && (GetTileType(this->unk_70, 1) == 0x405a)) { - CloneTile(0x310, this->unk_70, 1); + SetTile(this->unk_6c, this->tilePos, super->collisionLayer); + if ((super->collisionLayer == 2) && (GetTileTypeAtTilePos(this->tilePos, 1) == SPECIAL_TILE_90)) { + CloneTile(TILE_TYPE_784, this->tilePos, 1); } - tileType = GetTileType(this->unk_70 + gUnk_080B4488[super->direction >> 3], super->collisionLayer); + tileType = GetTileTypeAtTilePos(this->tilePos + gUnk_080B4488[super->direction >> 3], super->collisionLayer); if (tileType == 0x79 || tileType == 0x77) { super->spriteOffsetY = -2; } @@ -325,5 +326,17 @@ const u16 gUnk_08123748[] = { 277, }; const u16 gUnk_08123750[] = { - 0x405b, 1, 0x405c, 1, 0x405d, 1, 0x405e, 1, 0x7a, 2, 0x78, 2, 0, + SPECIAL_TILE_91, + 1, + SPECIAL_TILE_92, + 1, + SPECIAL_TILE_93, + 1, + SPECIAL_TILE_94, + 1, + TILE_TYPE_122, + 2, + TILE_TYPE_120, + 2, + 0, }; diff --git a/src/object/smokeParticle.c b/src/object/smokeParticle.c index b6b2305d..ac05de1f 100644 --- a/src/object/smokeParticle.c +++ b/src/object/smokeParticle.c @@ -6,6 +6,7 @@ */ #include "functions.h" #include "object.h" +#include "tiles.h" void SmokeParticle_Init(Entity*); void SmokeParticle_Action1(Entity*); @@ -62,22 +63,22 @@ void sub_080878CC(Entity* this) { s32 itX; s32 itY; u32 layer; - u32 pos; + u32 tilePos; x = this->x.HALF.HI; y = this->y.HALF.HI; layer = this->collisionLayer; for (itX = -0x10; itX < 0x11; itX += 0x10) { for (itY = -0x10; itY < 0x11; itY += 0x10) { - pos = TILE((u32)x + itX, (u32)y + itY); - if (sub_080B1AE0(pos, (u8)layer) == 0x2e) { - switch (GetTileType(pos, layer)) { + tilePos = TILE((u32)x + itX, (u32)y + itY); + if (GetActTileAtTilePos(tilePos, (u8)layer) == ACT_TILE_46) { + switch (GetTileTypeAtTilePos(tilePos, layer)) { case 0x368: case 0x367: DoTileInteraction(this, 3, x + itX, y + itY); break; default: - SetBottomTile(0x4022, pos, layer); + SetTile(SPECIAL_TILE_34, tilePos, layer); break; } } else { diff --git a/src/object/specialFx.c b/src/object/specialFx.c index 622aa059..cdd72a0b 100644 --- a/src/object/specialFx.c +++ b/src/object/specialFx.c @@ -199,7 +199,8 @@ void sub_080845DC(SpecialFxObject* this) { void sub_080845F8(SpecialFxObject* this) { if (((8 - (super->x.HALF.HI & 0xF)) | (8 - (super->y.HALF.HI & 0xF))) != 0) { - super->direction = CalcOffsetAngle((8 - (super->x.HALF.HI & 0xF)), (8 - (super->y.HALF.HI & 0xF))) >> 3; + super->direction = + CalculateDirectionFromOffsets((8 - (super->x.HALF.HI & 0xF)), (8 - (super->y.HALF.HI & 0xF))) >> 3; LinearMoveUpdate(super); } sub_08084630(this); diff --git a/src/object/stoneTablet.c b/src/object/stoneTablet.c index 06049ca9..99e45cbe 100644 --- a/src/object/stoneTablet.c +++ b/src/object/stoneTablet.c @@ -7,6 +7,7 @@ #include "entity.h" #include "functions.h" #include "room.h" +#include "tiles.h" void StoneTablet_Init(Entity*); void StoneTablet_Action1(Entity*); @@ -22,9 +23,12 @@ void StoneTablet(Entity* this) { void StoneTablet_Init(Entity* this) { // TODO recreate as TileData[] - static const u16 gUnk_081232EC[] = { 0x4022, -2, 0x4022, -1, 0x4022, 0, 0x4022, 1, 0xffff }; + static const u16 gUnk_081232EC[] = { + SPECIAL_TILE_34, -2, SPECIAL_TILE_34, -1, SPECIAL_TILE_34, 0, SPECIAL_TILE_34, 1, 0xffff, + }; static const u16 gUnk_081232FE[] = { - 0x4065, -65, 0x4022, -64, 0x4066, -63, 0x4029, -1, 0x4026, 0, 0x402a, 1, 0xffff + SPECIAL_TILE_101, -65, SPECIAL_TILE_34, -64, SPECIAL_TILE_102, -63, SPECIAL_TILE_41, -1, + SPECIAL_TILE_38, 0, SPECIAL_TILE_42, 1, 0xffff, }; this->action = 1; this->spriteSettings.draw = 1; diff --git a/src/object/treeHidingPortal.c b/src/object/treeHidingPortal.c index dc1792c3..283d64be 100644 --- a/src/object/treeHidingPortal.c +++ b/src/object/treeHidingPortal.c @@ -12,6 +12,7 @@ #include "player.h" #include "room.h" #include "sound.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -59,7 +60,7 @@ void TreeHidingPortal_Action1(TreeHidingPortalEntity* this) { } } } - if (sub_0809E9A0() == 0x54) { + if (sub_0809E9A0() == ACT_TILE_84) { super->action = 2; super->timer = 15; SetPlayerControl(1); @@ -109,15 +110,15 @@ static void sub_0809E96C(TreeHidingPortalEntity* this) { } static u32 sub_0809E9A0(void) { - u32 rv; + u32 actTile; const s16* ptr; if (gPlayerEntity.base.action != PLAYER_BOUNCE) { - rv = 0; + actTile = ACT_TILE_0; } else { ptr = &gUnk_080B4468[gPlayerEntity.base.animationState & 6]; - rv = sub_080B1AE0(COORD_TO_TILE_OFFSET(&gPlayerEntity.base, -ptr[0], -ptr[1]), 1); + actTile = GetActTileAtTilePos(COORD_TO_TILE_OFFSET(&gPlayerEntity.base, -ptr[0], -ptr[1]), 1); } - return rv; + return actTile; } diff --git a/src/object/treeThorns.c b/src/object/treeThorns.c index 1af83621..3fe27355 100644 --- a/src/object/treeThorns.c +++ b/src/object/treeThorns.c @@ -9,6 +9,7 @@ #include "object.h" #include "physics.h" #include "room.h" +#include "tiles.h" void TreeThorns(Entity* this) { Entity* ent; @@ -29,8 +30,8 @@ void TreeThorns(Entity* this) { this->collisionMask = 1; this->hitbox = (Hitbox*)&gHitbox_1; tilePos = COORD_TO_TILE(this); - SetBottomTile(0x4066, tilePos - 1, *layer); - SetBottomTile(0x4065, tilePos, *layer); + SetTile(SPECIAL_TILE_102, tilePos - 1, *layer); + SetTile(SPECIAL_TILE_101, tilePos, *layer); UpdateSpriteForCollisionLayer(this); ent = CreateObject(TREE_THORNS, 1, 0); if (ent != NULL) { diff --git a/src/object/unusedSkull.c b/src/object/unusedSkull.c index 038472d2..6bfb48a5 100644 --- a/src/object/unusedSkull.c +++ b/src/object/unusedSkull.c @@ -7,6 +7,7 @@ #include "functions.h" #include "hitbox.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -38,7 +39,7 @@ void UnusedSkull_Init(UnusedSkullEntity* this) { super->hurtType = 0x47; super->collisionMask = 2; super->hitbox = (Hitbox*)&gHitbox_4; - SetBottomTile(0x4050, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_80, COORD_TO_TILE(super), super->collisionLayer); if (super->type == 1 || CheckFlags(this->unk_86)) { super->action = 3; SetFlag(this->unk_86); diff --git a/src/object/waterfallOpening.c b/src/object/waterfallOpening.c index 47baad61..c63c937a 100644 --- a/src/object/waterfallOpening.c +++ b/src/object/waterfallOpening.c @@ -10,6 +10,7 @@ #include "menu.h" #include "room.h" #include "sound.h" +#include "tiles.h" typedef struct { Entity base; @@ -76,7 +77,7 @@ void WaterfallOpening(Entity* this) { case 2: if ((this->subAction == 0)) { this->subAction = 1; - SetTileType(0x39, COORD_TO_TILE(this), 1); + SetTileType(TILE_TYPE_57, COORD_TO_TILE(this), LAYER_BOTTOM); } } diff --git a/src/object/well.c b/src/object/well.c index fbf85d13..0e19e21a 100644 --- a/src/object/well.c +++ b/src/object/well.c @@ -9,6 +9,7 @@ #include "functions.h" #include "player.h" #include "room.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -33,12 +34,12 @@ void Well_Init(WellEntity* this) { super->action = 1; tilePos = COORD_TO_TILE(super); this->unk_80 = tilePos; - SetBottomTile(16509, this->unk_80, 1); + SetTile(SPECIAL_TILE_125, this->unk_80, LAYER_BOTTOM); } void Well_Action1(WellEntity* this) { - u32 tileIndex = GetTileType(this->unk_80, 1); - if (tileIndex != 0x407D) { + u32 tileIndex = GetTileTypeAtTilePos(this->unk_80, LAYER_BOTTOM); + if (tileIndex != SPECIAL_TILE_125) { PausePlayer(); gPlayerEntity.base.x.WORD = super->x.WORD; gPlayerEntity.base.y.HALF.HI = super->y.HALF.HI + 4; diff --git a/src/physics.c b/src/physics.c index 7daea2e3..99bc50df 100644 --- a/src/physics.c +++ b/src/physics.c @@ -16,7 +16,7 @@ const u8 gMapDirectionToAnimationState4[]; extern u16 gExtraFrameOffsets[]; extern s8 gUnk_08126EE4[]; -extern const u16 gUnk_080046A4[]; +extern const KeyValuePair gUnk_080046A4[]; extern const u16 gUnk_080047F6[]; static void sub_0806FEE8(struct_gUnk_020000C0_1*, u32, u32, u32); @@ -113,6 +113,7 @@ void sub_0806F4E8(Entity* ent) { } } +// TODO isSuckedInByGustJar? bool32 sub_0806F520(Entity* ent) { if (ent->contactFlags == (CONTACT_NOW | 0x13)) return 1; @@ -232,8 +233,8 @@ bool32 sub_0806F854(Entity* ent, s32 x, s32 y) { bool32 sub_0806F8DC(Entity* ent) { if (ent->collisionLayer & 2) return FALSE; - if (!GetTileTypeByPos(ent->x.HALF.HI, ent->y.HALF.HI - 4, 2)) { - GetTileTypeByPos(ent->x.HALF.HI, ent->y.HALF.HI - 4, ent->collisionLayer); + if (!GetTileTypeAtWorldCoords(ent->x.HALF.HI, ent->y.HALF.HI - 4, 2)) { + GetTileTypeAtWorldCoords(ent->x.HALF.HI, ent->y.HALF.HI - 4, ent->collisionLayer); ent->spriteRendering.b3 = 1; ent->spriteOrientation.flipY = 1; return FALSE; @@ -402,7 +403,7 @@ bool32 CheckPlayerProximity(u32 x, u32 y, u32 distX, u32 DistY) { } bool32 sub_0806FC24(u32 param_1, u32 param_2) { - u32 val = ActTileToTile(param_1, gUnk_080046A4); + u32 val = FindValueForKey(param_1, gUnk_080046A4); if (!val) return 0; @@ -411,7 +412,7 @@ bool32 sub_0806FC24(u32 param_1, u32 param_2) { const u16* sub_0806FC50(u32 param_1, u32 param_2) { const u16* rv; - u32 val = ActTileToTile(param_1, gUnk_080046A4); + u32 val = FindValueForKey(param_1, gUnk_080046A4); if (!val || ((gUnk_080047F6[val << 2] >> param_2) & 0x1) == 0) { rv = 0; } else { @@ -440,8 +441,8 @@ u32 sub_0806FCAC(Entity* this, Entity* other) { return GetAnimationStateForDirection8(GetFacingDirection(this, other)); } -bool32 EntityWithinDistance(Entity* ent, s32 x, s32 y, s32 distance) { - return PointInsideRadius(ent->x.HALF.HI - x, ent->y.HALF.HI - y, distance); +bool32 EntityWithinDistance(Entity* entity, s32 x, s32 y, s32 distance) { + return PointInsideRadius(entity->x.HALF.HI - x, entity->y.HALF.HI - y, distance); } bool32 PointInsideRadius(s32 x, s32 y, s32 distance) { diff --git a/src/player.c b/src/player.c index 2ffa311e..c394ea0d 100644 --- a/src/player.c +++ b/src/player.c @@ -24,6 +24,7 @@ #include "screen.h" #include "screenTransitions.h" #include "sound.h" +#include "tiles.h" #define kGravityRate Q_8_8(32) #define kWalkSpeedSlopeSubtractor Q_8_8(0.3125) @@ -1831,7 +1832,7 @@ static void PlayerPull(PlayerEntity* this) { gPlayerState.framestate = PL_STATE_PULL; sPlayerPullStates[super->subAction](this); - gUnk_0200AF00.rActionGrabbing = R_ACTION_GRAB; + gHUD.rActionGrabbing = R_ACTION_GRAB; } static void sub_08072214(PlayerEntity* this) { @@ -1975,7 +1976,7 @@ static void PlayerRoomTransition(PlayerEntity* this) { static void sub_080724DC(PlayerEntity* this) { super->knockbackDuration = 0; DeleteClones(); - if (GetActTile(super) != 0x29) { + if (GetActTileAtEntity(super) != ACT_TILE_41) { if ((gPlayerState.remainingDiveTime == 0) && (gPlayerState.swim_state != 0)) { PlayerUpdateSwimming(super); } @@ -2001,7 +2002,7 @@ static void sub_080724DC(PlayerEntity* this) { static void sub_0807258C(PlayerEntity* this) { if (gRoomControls.reload_flags == 0) { - if (GetCollisionTileInFront(super) == 0x29) { + if (GetActTileInFront(super) == ACT_TILE_41) { UpdatePlayerMovement(); if (sub_080797C4() != 0) { gPlayerState.startPosX = gPlayerEntity.base.x.HALF.HI; @@ -2190,11 +2191,11 @@ static void PlayerInHoleInit(PlayerEntity* this) { gPlayerState.animation = ANIM_FALL_IN_HOLE_NOCAP; } else { gPlayerState.animation = ANIM_FALL_IN_HOLE; - if (GetTileIndex(COORD_TO_TILE(super), super->collisionLayer) == 0x4020) { + if (GetTileIndex(COORD_TO_TILE(super), super->collisionLayer) == SPECIAL_TILE_32) { super->timer = 1; } } - SetBottomTile(0x4070, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_112, COORD_TO_TILE(super), super->collisionLayer); ResetActiveItems(); PlayerInHoleUpdate(this); SoundReq(SFX_81); @@ -2251,7 +2252,7 @@ static void sub_08072B5C(PlayerEntity* this) { return; } - SetBottomTile(0x4021, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_33, COORD_TO_TILE(super), super->collisionLayer); super->direction = Direction8FromAnimationState(super->animationState); temp = sub_0807A2F8(1); if (!temp) { @@ -2340,15 +2341,21 @@ static void sub_08072CFC(PlayerEntity* this) { ResetActiveItems(); } -static const u16 sTiles[] = { - 0x1AD, 1, 0, 0x1AE, 1, 0, 0x1AC, 1, 0, 0x1AF, 1, 0, -}; +// TODO Why would this use FindValueForKey just to do a normal comparison? +static const KeyValuePair sTiles0 = { 0x1AD, 1 }; +static const u16 sTiles0End = 0; +static const KeyValuePair sTiles1 = { 0x1AE, 1 }; +static const u16 sTiles1End = 0; +static const KeyValuePair sTiles2 = { 0x1AC, 1 }; +static const u16 sTiles2End = 0; +static const KeyValuePair sTiles3 = { 0x1AF, 1 }; +static const u16 sTiles3End = 0; -static const u16* const sTileTable[] = { - sTiles, - sTiles + 3, - sTiles + 6, - sTiles + 9, +static const KeyValuePair* const sTileTable[] = { + &sTiles0, + &sTiles1, + &sTiles2, + &sTiles3, }; static void sub_08072D54(PlayerEntity* this) { @@ -2360,16 +2367,16 @@ static void sub_08072D54(PlayerEntity* this) { LinearMoveUpdate(super); super->timer--; } else { - uVar2 = GetTileType(sub_0806F730(super), super->collisionLayer); + uVar2 = GetTileTypeAtTilePos(sub_0806F730(super), super->collisionLayer); switch (super->subtimer) { case 0: - if (ActTileToTile(uVar2, sTileTable[gPlayerEntity.base.animationState >> 1])) { + if (FindValueForKey(uVar2, sTileTable[gPlayerEntity.base.animationState >> 1])) { super->timer = 1; super->subtimer = 1; } break; case 1: - if (ActTileToTile(uVar2, sTileTable[gPlayerEntity.base.animationState >> 1])) { + if (FindValueForKey(uVar2, sTileTable[gPlayerEntity.base.animationState >> 1])) { super->timer = 1; } else { super->subtimer = 2; @@ -2377,7 +2384,7 @@ static void sub_08072D54(PlayerEntity* this) { break; case 2: super->animationState ^= 4; - if (ActTileToTile(uVar2, sTileTable[gPlayerEntity.base.animationState >> 1]) != 0) { + if (FindValueForKey(uVar2, sTileTable[gPlayerEntity.base.animationState >> 1]) != 0) { super->timer = 1; super->subtimer = 3; } @@ -2385,7 +2392,7 @@ static void sub_08072D54(PlayerEntity* this) { break; case 3: super->animationState ^= 4; - if (ActTileToTile(uVar2, sTileTable[gPlayerEntity.base.animationState >> 1])) { + if (FindValueForKey(uVar2, sTileTable[gPlayerEntity.base.animationState >> 1])) { super->timer = 1; } else { super->subtimer = 4; @@ -2620,7 +2627,7 @@ static void PlayerUseStairs(PlayerEntity* this) { static void sub_080732D0(PlayerEntity* this) { UpdateAnimationSingleFrame(super); - if (GetActTile(super) != 40) { + if (GetActTileAtEntity(super) != ACT_TILE_40) { super->direction = DirectionNorth; LinearMoveUpdate(super); } else { @@ -2761,7 +2768,7 @@ static void sub_08073584(PlayerEntity* this) { return; } - gUnk_0200AF00.rActionPlayerState = R_ACTION_CANCEL; + gHUD.rActionPlayerState = R_ACTION_CANCEL; if (sub_0807A2F8(0)) { super->subAction++; super->direction = 4 * (super->animationState & IdleWest); @@ -2769,7 +2776,7 @@ static void sub_08073584(PlayerEntity* this) { return; } - if (gArea.locationIndex == 16) + if (gArea.locationIndex == 16) // AREA_CLOUD_TOPS super->speed = 0x100; else super->speed = 0x80; @@ -2833,7 +2840,7 @@ static void sub_08073584(PlayerEntity* this) { } if (sAnims1[idx] == gPlayerState.animation) { - if (gArea.locationIndex == 16) + if (gArea.locationIndex == 16) // AREA_CLOUD_TOPS sub_080042BA(super, 2); else UpdateAnimationSingleFrame(super); @@ -2886,7 +2893,7 @@ static void sub_080737BC(PlayerEntity* this) { pos = super->y.HALF.HI; tmp = 0xf; tmp &= pos; - if (tmp == 8 && !sub_080B1B0C(super)) { + if (tmp == 8 && GetCollisionDataAtEntity(super) == 0) { gPlayerState.jump_status |= 0x40; PlayerSetNormalAndCollide(); } @@ -3711,7 +3718,7 @@ void SurfaceAction_20(PlayerEntity* this) { if (e != NULL) { e->timer = 1; UpdateSpriteForCollisionLayer(e); - CloneTile(57, gPlayerState.tilePosition, super->collisionLayer); + CloneTile(TILE_TYPE_57, gPlayerState.tilePos, super->collisionLayer); } } SurfaceAction_Water(this); @@ -4107,7 +4114,7 @@ void sub_0807529C(PlayerEntity* this) { void sub_080752AC(PlayerEntity* this, ScriptExecutionContext* ctx) { LinearMoveUpdate(super); if (!ctx->unk_18) { - if (GetActTile(super) != 41) { + if (GetActTileAtEntity(super) != ACT_TILE_41) { ctx->unk_18 = 1; ctx->unk_19 = 6; } diff --git a/src/playerItem/playerItemBottle.c b/src/playerItem/playerItemBottle.c index c8cb3ad7..47eeed56 100644 --- a/src/playerItem/playerItemBottle.c +++ b/src/playerItem/playerItemBottle.c @@ -11,6 +11,7 @@ #include "object.h" #include "save.h" #include "sound.h" +#include "tiles.h" void PlayerItemBottle_UseEmptyBottle(Entity*); void PlayerItemBottle_Action1(PlayerItemBottleEntity*); @@ -279,7 +280,7 @@ void PlayerItemBottle_UseEmptyBottle(Entity* this) { if (this->spriteSettings.flipX != 0) { iVar2 = -iVar2; } - if (GetActTileRelative(this, iVar2, (s8)ptr2[1]) == 0x10) { + if (GetActTileRelativeToEntity(this, iVar2, (s8)ptr2[1]) == ACT_TILE_16) { this->type2 = ITEM_BOTTLE_WATER; } } diff --git a/src/playerItem/playerItemBow.c b/src/playerItem/playerItemBow.c index 0c3932a8..fec8aea4 100644 --- a/src/playerItem/playerItemBow.c +++ b/src/playerItem/playerItemBow.c @@ -12,6 +12,7 @@ #include "playeritem.h" #include "save.h" #include "sound.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -269,66 +270,1402 @@ void sub_08019468(PlayerItemBowEntity* this) { // Probably belongs to collision.c, but needs to be placed at the end of playerItemBow.c or start of // playerItemSwordBeam.c -const u8 gUnk_080B3E80[] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 0, 255, 255, 255, - 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 255, - 0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 48, 34, 34, 36, 0, 0, 29, 29, 29, 255, 255, 29, - 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 255, 255, 255, 255, 255, 29, 29, 29, 255, 255, 29, 29, - 255, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 15, 32, 32, - 15, 15, 15, 15, 0, 0, 0, 0, 21, 21, 20, 20, 95, 255, 255, 255, 255, 255, 255, 15, 41, 41, 41, - 41, 0, 36, 36, 36, 15, 15, 15, 15, 255, 255, 255, 255, 255, 255, 15, 15, 15, 15, 39, 39, 15, 15, - 15, 39, 15, 15, 35, 15, 15, 35, 15, 15, 15, 15, 15, 15, 15, 15, 15, 39, 15, 15, 39, 39, 15, - 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 39, 15, 15, 255, 39, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 39, 39, 15, 15, 39, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 35, 15, 15, 35, - 35, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 35, 35, 15, 15, 35, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 15, 15, 15, 15, 15, 15, 95, 255, 255, 15, 15, 21, 15, 0, 0, 0, 255, 12, 0, 0, 12, - 12, 66, 96, 15, 29, 255, 15, 15, 15, 0, 15, 15, 15, 15, 10, 5, 10, 5, 1, 1, 1, 0, 0, - 0, 0, 0, 0, 5, 15, 10, 0, 0, 5, 15, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, - 10, 4, 12, 8, 0, 0, 0, 5, 0, 10, 4, 12, 8, 15, 15, 15, 15, 15, 16, 17, 17, 16, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 27, 25, 28, 26, 43, 43, 97, 23, 23, 84, 23, 23, - 23, 0, 0, 84, 15, 15, 15, 15, 15, 15, 15, 0, 0, 0, 0, 18, 15, 15, 19, 15, 15, 15, 15, - 15, 15, 15, 15, 5, 0, 0, 0, 0, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 0, 0, 0, 0, 0, 0, 1, 3, 2, 0, 0, 5, 15, 10, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 15, 15, 71, 15, 15, 15, 1, 3, 2, 15, 15, 5, 15, 10, 15, - 15, 4, 0, 8, 15, 12, 12, 0, 12, 12, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 16, 15, 17, 15, 15, 15, 15, 15, - 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 15, 0, 0, 5, 15, 15, 15, 15, 15, 15, 15, 15, - 39, 15, 15, 39, 255, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 39, 15, 15, 39, 255, 15, 15, - 15, 15, 255, 255, 255, 255, 255, 255, 15, 39, 15, 15, 255, 39, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, - 0, 0, 0, 5, 0, 10, 4, 12, 8, 70, 75, 74, 72, 71, 96, 98, 97, 99, 100, 102, 15, 80, 48, - 48, 255, 0, 255, 0, 0, 0, 0, 255, 0, 0, 37, 15, 255, 255, 255, 255, 255, 255, 0, 0, 33, 33, - 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, - 33, 33, 33, 33, 33, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 255, 255, 255, 255, 255, - 40, 255, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 21, 20, 20, - 15, 15, 15, 15, 15, 15, 15, 15, 255, 1, 1, 1, 255, 255, 255, 255, 24, 24, 24, 24, 38, 15, 0, - 28, 26, 27, 25, 255, 0, 15, 21, 15, 15, 15, 19, 18, 15, 15, 15, 18, 19, 35, 39, 0, 0, 2, - 14, 13, 12, 3, 9, 6, 4, 8, 11, 7, 10, 5, 3, 107, 103, 106, 15, 12, 20, 21, 15, 0, 15, - 40, 95, 15, 5, 10, 16, 17, 18, 19, 71, 12, 13, 14, 71, 20, 92, 13, 5, 4, 8, 1, 2, 10, - 5, 10, 15, 4, 8, 15, 3, 2, 5, 15, 10, 4, 12, 8, 3, 2, 5, 15, 10, 4, 12, 8, 92, - 84, 81, 83, 81, 82, 83, 90, 87, 91, 95, 84, 88, 92, 85, 93, 94, 39, 88, 85, 10, 83, 90, 81, - 15, 89, 0, 0, 69, 71, 67, 70, 0, 3, 15, 1, 2, 3, 10, 12, 5, 4, 8, 4, 1, 3, 15, - 95, 97, 0, 3, 28, 27, 21, 69, 3, 96, 12, 102, 100, 101, 26, 25, 18, 17, 19, 16, 2, 4, 8, - 14, 15, 11, 84, 69, 68, 4, 13, 0, 0, 12, 12, 15, 15, 10, 5, 10, 5, 12, 97, 10, 5, 11, - 7, 67, 69, 1, 2, 4, 8, 13, 3, 3, 7, 15, 3, 0, 2, 84, 92, 88, 12, 67, 0, 0, 8, - 1, 2, 87, 95, 91, 82, 14, 18, 19, 10, 5, 0, 10, 5, 3, 63, 19, 18, 47, 46, 17, 16, 11, - 7, 15, 0, 3, 15, 15, 1, 8, 12, 12, 15, 1, 3, 2, 5, 10, 4, 12, 8, 9, 39, 2, 14, - 13, 12, 3, 6, 9, 4, 8, 11, 7, 10, 5, 34, 35, 4, 12, 3, 3, 1, 5, 10, 4, 8, 0, - 107, 103, 106, 18, 45, 44, 0, 15, 41, 40, 0, 0, 0, 0, 0, 0, 0, 20, 33, 39, 67, 4, 8, - 12, 3, 3, 1, 2, 0, 12, 3, 2, 5, 10, 14, 13, 4, 8, 11, 7, 12, 0, 0, 39, 1, 2, - 1, 2, 4, 12, 7, 11, 4, 8, 16, 17, 43, 43, 18, 19, 10, 5, 2, 1, 35, 1, 3, 2, 5, - 10, 14, 13, 11, 7, 4, 8, 10, 5, 10, 5, 13, 14, 8, 4, 7, 11, 0, 9, 6, 0, 15, 7, - 11, 3, 33, 33, 33, 33, 33, 33, 33, 15, 5, 10, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 0, 3, 48, 48, 0, 0, 0, 0, 0, 0, 48, 48, - 33, 33, 0, 15, 83, 92, 85, 90, 96, 97, 95, 18, 19, 16, 10, 10, 35, 10, 5, 14, 13, 11, 7, - 10, 5, 14, 13, 11, 7, 0, 0, 3, 0, 39, 12, 12, 33, 0, 0, +// maps tileType to collisionData +const u8 gMapTileTypeToCollisionData[] = { + COLLISION_DATA_0, // TILE_TYPE_0 + COLLISION_DATA_0, // TILE_TYPE_1 + COLLISION_DATA_0, // TILE_TYPE_2 + COLLISION_DATA_0, // TILE_TYPE_3 + COLLISION_DATA_0, // TILE_TYPE_4 + COLLISION_DATA_0, // TILE_TYPE_5 + COLLISION_DATA_0, // TILE_TYPE_6 + COLLISION_DATA_0, // TILE_TYPE_7 + COLLISION_DATA_0, // TILE_TYPE_8 + COLLISION_DATA_0, // TILE_TYPE_9 + COLLISION_DATA_0, // TILE_TYPE_10 + COLLISION_DATA_0, // TILE_TYPE_11 + COLLISION_DATA_255, // TILE_TYPE_12 + COLLISION_DATA_255, // TILE_TYPE_13 + COLLISION_DATA_255, // TILE_TYPE_14 + COLLISION_DATA_255, // TILE_TYPE_15 + COLLISION_DATA_255, // TILE_TYPE_16 + COLLISION_DATA_255, // TILE_TYPE_17 + COLLISION_DATA_255, // TILE_TYPE_18 + COLLISION_DATA_0, // TILE_TYPE_19 + COLLISION_DATA_255, // TILE_TYPE_20 + COLLISION_DATA_255, // TILE_TYPE_21 + COLLISION_DATA_255, // TILE_TYPE_22 + COLLISION_DATA_255, // TILE_TYPE_23 + COLLISION_DATA_255, // TILE_TYPE_24 + COLLISION_DATA_255, // TILE_TYPE_25 + COLLISION_DATA_0, // TILE_TYPE_26 + COLLISION_DATA_0, // TILE_TYPE_27 + COLLISION_DATA_0, // TILE_TYPE_28 + COLLISION_DATA_0, // TILE_TYPE_29 + COLLISION_DATA_0, // TILE_TYPE_30 + COLLISION_DATA_0, // TILE_TYPE_31 + COLLISION_DATA_0, // TILE_TYPE_32 + COLLISION_DATA_0, // TILE_TYPE_33 + COLLISION_DATA_0, // TILE_TYPE_34 + COLLISION_DATA_0, // TILE_TYPE_35 + COLLISION_DATA_0, // TILE_TYPE_36 + COLLISION_DATA_0, // TILE_TYPE_37 + COLLISION_DATA_0, // TILE_TYPE_38 + COLLISION_DATA_0, // TILE_TYPE_39 + COLLISION_DATA_0, // TILE_TYPE_40 + COLLISION_DATA_0, // TILE_TYPE_41 + COLLISION_DATA_255, // TILE_TYPE_42 + COLLISION_DATA_0, // TILE_TYPE_43 + COLLISION_DATA_0, // TILE_TYPE_44 + COLLISION_DATA_255, // TILE_TYPE_45 + COLLISION_DATA_0, // TILE_TYPE_46 + COLLISION_DATA_0, // TILE_TYPE_47 + COLLISION_DATA_0, // TILE_TYPE_48 + COLLISION_DATA_0, // TILE_TYPE_49 + COLLISION_DATA_0, // TILE_TYPE_50 + COLLISION_DATA_0, // TILE_TYPE_51 + COLLISION_DATA_0, // TILE_TYPE_52 + COLLISION_DATA_33, // TILE_TYPE_53 + COLLISION_DATA_0, // TILE_TYPE_54 + COLLISION_DATA_0, // TILE_TYPE_55 + COLLISION_DATA_0, // TILE_TYPE_56 + COLLISION_DATA_48, // TILE_TYPE_57 + COLLISION_DATA_34, // TILE_TYPE_58 + COLLISION_DATA_34, // TILE_TYPE_59 + COLLISION_DATA_36, // TILE_TYPE_60 + COLLISION_DATA_0, // TILE_TYPE_61 + COLLISION_DATA_0, // TILE_TYPE_62 + COLLISION_DATA_29, // TILE_TYPE_63 + COLLISION_DATA_29, // TILE_TYPE_64 + COLLISION_DATA_29, // TILE_TYPE_65 + COLLISION_DATA_255, // TILE_TYPE_66 + COLLISION_DATA_255, // TILE_TYPE_67 + COLLISION_DATA_29, // TILE_TYPE_68 + COLLISION_DATA_29, // TILE_TYPE_69 + COLLISION_DATA_29, // TILE_TYPE_70 + COLLISION_DATA_29, // TILE_TYPE_71 + COLLISION_DATA_29, // TILE_TYPE_72 + COLLISION_DATA_29, // TILE_TYPE_73 + COLLISION_DATA_29, // TILE_TYPE_74 + COLLISION_DATA_29, // TILE_TYPE_75 + COLLISION_DATA_29, // TILE_TYPE_76 + COLLISION_DATA_29, // TILE_TYPE_77 + COLLISION_DATA_29, // TILE_TYPE_78 + COLLISION_DATA_29, // TILE_TYPE_79 + COLLISION_DATA_255, // TILE_TYPE_80 + COLLISION_DATA_255, // TILE_TYPE_81 + COLLISION_DATA_255, // TILE_TYPE_82 + COLLISION_DATA_255, // TILE_TYPE_83 + COLLISION_DATA_255, // TILE_TYPE_84 + COLLISION_DATA_29, // TILE_TYPE_85 + COLLISION_DATA_29, // TILE_TYPE_86 + COLLISION_DATA_29, // TILE_TYPE_87 + COLLISION_DATA_255, // TILE_TYPE_88 + COLLISION_DATA_255, // TILE_TYPE_89 + COLLISION_DATA_29, // TILE_TYPE_90 + COLLISION_DATA_29, // TILE_TYPE_91 + COLLISION_DATA_255, // TILE_TYPE_92 + COLLISION_DATA_255, // TILE_TYPE_93 + COLLISION_DATA_255, // TILE_TYPE_94 + COLLISION_DATA_255, // TILE_TYPE_95 + COLLISION_DATA_255, // TILE_TYPE_96 + COLLISION_DATA_0, // TILE_TYPE_97 + COLLISION_DATA_0, // TILE_TYPE_98 + COLLISION_DATA_0, // TILE_TYPE_99 + COLLISION_DATA_0, // TILE_TYPE_100 + COLLISION_DATA_0, // TILE_TYPE_101 + COLLISION_DATA_0, // TILE_TYPE_102 + COLLISION_DATA_0, // TILE_TYPE_103 + COLLISION_DATA_0, // TILE_TYPE_104 + COLLISION_DATA_0, // TILE_TYPE_105 + COLLISION_DATA_0, // TILE_TYPE_106 + COLLISION_DATA_0, // TILE_TYPE_107 + COLLISION_DATA_0, // TILE_TYPE_108 + COLLISION_DATA_0, // TILE_TYPE_109 + COLLISION_DATA_0, // TILE_TYPE_110 + COLLISION_DATA_15, // TILE_TYPE_111 + COLLISION_DATA_15, // TILE_TYPE_112 + COLLISION_DATA_32, // TILE_TYPE_113 + COLLISION_DATA_32, // TILE_TYPE_114 + COLLISION_DATA_15, // TILE_TYPE_115 + COLLISION_DATA_15, // TILE_TYPE_116 + COLLISION_DATA_15, // TILE_TYPE_117 + COLLISION_DATA_15, // TILE_TYPE_118 + COLLISION_DATA_0, // TILE_TYPE_119 + COLLISION_DATA_0, // TILE_TYPE_120 + COLLISION_DATA_0, // TILE_TYPE_121 + COLLISION_DATA_0, // TILE_TYPE_122 + COLLISION_DATA_21, // TILE_TYPE_123 + COLLISION_DATA_21, // TILE_TYPE_124 + COLLISION_DATA_20, // TILE_TYPE_125 + COLLISION_DATA_20, // TILE_TYPE_126 + COLLISION_DATA_95, // TILE_TYPE_127 + COLLISION_DATA_255, // TILE_TYPE_128 + COLLISION_DATA_255, // TILE_TYPE_129 + COLLISION_DATA_255, // TILE_TYPE_130 + COLLISION_DATA_255, // TILE_TYPE_131 + COLLISION_DATA_255, // TILE_TYPE_132 + COLLISION_DATA_255, // TILE_TYPE_133 + COLLISION_DATA_15, // TILE_TYPE_134 + COLLISION_DATA_41, // TILE_TYPE_135 + COLLISION_DATA_41, // TILE_TYPE_136 + COLLISION_DATA_41, // TILE_TYPE_137 + COLLISION_DATA_41, // TILE_TYPE_138 + COLLISION_DATA_0, // TILE_TYPE_139 + COLLISION_DATA_36, // TILE_TYPE_140 + COLLISION_DATA_36, // TILE_TYPE_141 + COLLISION_DATA_36, // TILE_TYPE_142 + COLLISION_DATA_15, // TILE_TYPE_143 + COLLISION_DATA_15, // TILE_TYPE_144 + COLLISION_DATA_15, // TILE_TYPE_145 + COLLISION_DATA_15, // TILE_TYPE_146 + COLLISION_DATA_255, // TILE_TYPE_147 + COLLISION_DATA_255, // TILE_TYPE_148 + COLLISION_DATA_255, // TILE_TYPE_149 + COLLISION_DATA_255, // TILE_TYPE_150 + COLLISION_DATA_255, // TILE_TYPE_151 + COLLISION_DATA_255, // TILE_TYPE_152 + COLLISION_DATA_15, // TILE_TYPE_153 + COLLISION_DATA_15, // TILE_TYPE_154 + COLLISION_DATA_15, // TILE_TYPE_155 + COLLISION_DATA_15, // TILE_TYPE_156 + COLLISION_DATA_39, // TILE_TYPE_157 + COLLISION_DATA_39, // TILE_TYPE_158 + COLLISION_DATA_15, // TILE_TYPE_159 + COLLISION_DATA_15, // TILE_TYPE_160 + COLLISION_DATA_15, // TILE_TYPE_161 + COLLISION_DATA_39, // TILE_TYPE_162 + COLLISION_DATA_15, // TILE_TYPE_163 + COLLISION_DATA_15, // TILE_TYPE_164 + COLLISION_DATA_35, // TILE_TYPE_165 + COLLISION_DATA_15, // TILE_TYPE_166 + COLLISION_DATA_15, // TILE_TYPE_167 + COLLISION_DATA_35, // TILE_TYPE_168 + COLLISION_DATA_15, // TILE_TYPE_169 + COLLISION_DATA_15, // TILE_TYPE_170 + COLLISION_DATA_15, // TILE_TYPE_171 + COLLISION_DATA_15, // TILE_TYPE_172 + COLLISION_DATA_15, // TILE_TYPE_173 + COLLISION_DATA_15, // TILE_TYPE_174 + COLLISION_DATA_15, // TILE_TYPE_175 + COLLISION_DATA_15, // TILE_TYPE_176 + COLLISION_DATA_15, // TILE_TYPE_177 + COLLISION_DATA_39, // TILE_TYPE_178 + COLLISION_DATA_15, // TILE_TYPE_179 + COLLISION_DATA_15, // TILE_TYPE_180 + COLLISION_DATA_39, // TILE_TYPE_181 + COLLISION_DATA_39, // TILE_TYPE_182 + COLLISION_DATA_15, // TILE_TYPE_183 + COLLISION_DATA_15, // TILE_TYPE_184 + COLLISION_DATA_15, // TILE_TYPE_185 + COLLISION_DATA_15, // TILE_TYPE_186 + COLLISION_DATA_15, // TILE_TYPE_187 + COLLISION_DATA_15, // TILE_TYPE_188 + COLLISION_DATA_15, // TILE_TYPE_189 + COLLISION_DATA_15, // TILE_TYPE_190 + COLLISION_DATA_15, // TILE_TYPE_191 + COLLISION_DATA_15, // TILE_TYPE_192 + COLLISION_DATA_15, // TILE_TYPE_193 + COLLISION_DATA_39, // TILE_TYPE_194 + COLLISION_DATA_15, // TILE_TYPE_195 + COLLISION_DATA_15, // TILE_TYPE_196 + COLLISION_DATA_255, // TILE_TYPE_197 + COLLISION_DATA_39, // TILE_TYPE_198 + COLLISION_DATA_15, // TILE_TYPE_199 + COLLISION_DATA_15, // TILE_TYPE_200 + COLLISION_DATA_15, // TILE_TYPE_201 + COLLISION_DATA_15, // TILE_TYPE_202 + COLLISION_DATA_15, // TILE_TYPE_203 + COLLISION_DATA_15, // TILE_TYPE_204 + COLLISION_DATA_15, // TILE_TYPE_205 + COLLISION_DATA_15, // TILE_TYPE_206 + COLLISION_DATA_15, // TILE_TYPE_207 + COLLISION_DATA_15, // TILE_TYPE_208 + COLLISION_DATA_15, // TILE_TYPE_209 + COLLISION_DATA_39, // TILE_TYPE_210 + COLLISION_DATA_39, // TILE_TYPE_211 + COLLISION_DATA_15, // TILE_TYPE_212 + COLLISION_DATA_15, // TILE_TYPE_213 + COLLISION_DATA_39, // TILE_TYPE_214 + COLLISION_DATA_15, // TILE_TYPE_215 + COLLISION_DATA_15, // TILE_TYPE_216 + COLLISION_DATA_15, // TILE_TYPE_217 + COLLISION_DATA_15, // TILE_TYPE_218 + COLLISION_DATA_15, // TILE_TYPE_219 + COLLISION_DATA_15, // TILE_TYPE_220 + COLLISION_DATA_15, // TILE_TYPE_221 + COLLISION_DATA_15, // TILE_TYPE_222 + COLLISION_DATA_15, // TILE_TYPE_223 + COLLISION_DATA_15, // TILE_TYPE_224 + COLLISION_DATA_15, // TILE_TYPE_225 + COLLISION_DATA_35, // TILE_TYPE_226 + COLLISION_DATA_15, // TILE_TYPE_227 + COLLISION_DATA_15, // TILE_TYPE_228 + COLLISION_DATA_35, // TILE_TYPE_229 + COLLISION_DATA_35, // TILE_TYPE_230 + COLLISION_DATA_15, // TILE_TYPE_231 + COLLISION_DATA_15, // TILE_TYPE_232 + COLLISION_DATA_15, // TILE_TYPE_233 + COLLISION_DATA_15, // TILE_TYPE_234 + COLLISION_DATA_15, // TILE_TYPE_235 + COLLISION_DATA_15, // TILE_TYPE_236 + COLLISION_DATA_15, // TILE_TYPE_237 + COLLISION_DATA_15, // TILE_TYPE_238 + COLLISION_DATA_15, // TILE_TYPE_239 + COLLISION_DATA_15, // TILE_TYPE_240 + COLLISION_DATA_15, // TILE_TYPE_241 + COLLISION_DATA_35, // TILE_TYPE_242 + COLLISION_DATA_35, // TILE_TYPE_243 + COLLISION_DATA_15, // TILE_TYPE_244 + COLLISION_DATA_15, // TILE_TYPE_245 + COLLISION_DATA_35, // TILE_TYPE_246 + COLLISION_DATA_15, // TILE_TYPE_247 + COLLISION_DATA_15, // TILE_TYPE_248 + COLLISION_DATA_15, // TILE_TYPE_249 + COLLISION_DATA_15, // TILE_TYPE_250 + COLLISION_DATA_15, // TILE_TYPE_251 + COLLISION_DATA_15, // TILE_TYPE_252 + COLLISION_DATA_15, // TILE_TYPE_253 + COLLISION_DATA_15, // TILE_TYPE_254 + COLLISION_DATA_15, // TILE_TYPE_255 + COLLISION_DATA_15, // TILE_TYPE_256 + COLLISION_DATA_15, // TILE_TYPE_257 + COLLISION_DATA_15, // TILE_TYPE_258 + COLLISION_DATA_15, // TILE_TYPE_259 + COLLISION_DATA_15, // TILE_TYPE_260 + COLLISION_DATA_15, // TILE_TYPE_261 + COLLISION_DATA_15, // TILE_TYPE_262 + COLLISION_DATA_15, // TILE_TYPE_263 + COLLISION_DATA_15, // TILE_TYPE_264 + COLLISION_DATA_15, // TILE_TYPE_265 + COLLISION_DATA_15, // TILE_TYPE_266 + COLLISION_DATA_15, // TILE_TYPE_267 + COLLISION_DATA_15, // TILE_TYPE_268 + COLLISION_DATA_15, // TILE_TYPE_269 + COLLISION_DATA_15, // TILE_TYPE_270 + COLLISION_DATA_15, // TILE_TYPE_271 + COLLISION_DATA_15, // TILE_TYPE_272 + COLLISION_DATA_15, // TILE_TYPE_273 + COLLISION_DATA_15, // TILE_TYPE_274 + COLLISION_DATA_15, // TILE_TYPE_275 + COLLISION_DATA_15, // TILE_TYPE_276 + COLLISION_DATA_15, // TILE_TYPE_277 + COLLISION_DATA_15, // TILE_TYPE_278 + COLLISION_DATA_15, // TILE_TYPE_279 + COLLISION_DATA_15, // TILE_TYPE_280 + COLLISION_DATA_15, // TILE_TYPE_281 + COLLISION_DATA_15, // TILE_TYPE_282 + COLLISION_DATA_15, // TILE_TYPE_283 + COLLISION_DATA_15, // TILE_TYPE_284 + COLLISION_DATA_15, // TILE_TYPE_285 + COLLISION_DATA_15, // TILE_TYPE_286 + COLLISION_DATA_15, // TILE_TYPE_287 + COLLISION_DATA_15, // TILE_TYPE_288 + COLLISION_DATA_15, // TILE_TYPE_289 + COLLISION_DATA_15, // TILE_TYPE_290 + COLLISION_DATA_15, // TILE_TYPE_291 + COLLISION_DATA_15, // TILE_TYPE_292 + COLLISION_DATA_15, // TILE_TYPE_293 + COLLISION_DATA_15, // TILE_TYPE_294 + COLLISION_DATA_15, // TILE_TYPE_295 + COLLISION_DATA_15, // TILE_TYPE_296 + COLLISION_DATA_15, // TILE_TYPE_297 + COLLISION_DATA_15, // TILE_TYPE_298 + COLLISION_DATA_15, // TILE_TYPE_299 + COLLISION_DATA_15, // TILE_TYPE_300 + COLLISION_DATA_15, // TILE_TYPE_301 + COLLISION_DATA_15, // TILE_TYPE_302 + COLLISION_DATA_15, // TILE_TYPE_303 + COLLISION_DATA_15, // TILE_TYPE_304 + COLLISION_DATA_15, // TILE_TYPE_305 + COLLISION_DATA_15, // TILE_TYPE_306 + COLLISION_DATA_15, // TILE_TYPE_307 + COLLISION_DATA_15, // TILE_TYPE_308 + COLLISION_DATA_15, // TILE_TYPE_309 + COLLISION_DATA_15, // TILE_TYPE_310 + COLLISION_DATA_15, // TILE_TYPE_311 + COLLISION_DATA_15, // TILE_TYPE_312 + COLLISION_DATA_15, // TILE_TYPE_313 + COLLISION_DATA_15, // TILE_TYPE_314 + COLLISION_DATA_15, // TILE_TYPE_315 + COLLISION_DATA_15, // TILE_TYPE_316 + COLLISION_DATA_15, // TILE_TYPE_317 + COLLISION_DATA_15, // TILE_TYPE_318 + COLLISION_DATA_15, // TILE_TYPE_319 + COLLISION_DATA_15, // TILE_TYPE_320 + COLLISION_DATA_15, // TILE_TYPE_321 + COLLISION_DATA_15, // TILE_TYPE_322 + COLLISION_DATA_15, // TILE_TYPE_323 + COLLISION_DATA_15, // TILE_TYPE_324 + COLLISION_DATA_15, // TILE_TYPE_325 + COLLISION_DATA_15, // TILE_TYPE_326 + COLLISION_DATA_15, // TILE_TYPE_327 + COLLISION_DATA_15, // TILE_TYPE_328 + COLLISION_DATA_0, // TILE_TYPE_329 + COLLISION_DATA_0, // TILE_TYPE_330 + COLLISION_DATA_0, // TILE_TYPE_331 + COLLISION_DATA_0, // TILE_TYPE_332 + COLLISION_DATA_0, // TILE_TYPE_333 + COLLISION_DATA_0, // TILE_TYPE_334 + COLLISION_DATA_0, // TILE_TYPE_335 + COLLISION_DATA_0, // TILE_TYPE_336 + COLLISION_DATA_0, // TILE_TYPE_337 + COLLISION_DATA_0, // TILE_TYPE_338 + COLLISION_DATA_0, // TILE_TYPE_339 + COLLISION_DATA_0, // TILE_TYPE_340 + COLLISION_DATA_0, // TILE_TYPE_341 + COLLISION_DATA_0, // TILE_TYPE_342 + COLLISION_DATA_0, // TILE_TYPE_343 + COLLISION_DATA_0, // TILE_TYPE_344 + COLLISION_DATA_0, // TILE_TYPE_345 + COLLISION_DATA_0, // TILE_TYPE_346 + COLLISION_DATA_15, // TILE_TYPE_347 + COLLISION_DATA_15, // TILE_TYPE_348 + COLLISION_DATA_15, // TILE_TYPE_349 + COLLISION_DATA_15, // TILE_TYPE_350 + COLLISION_DATA_15, // TILE_TYPE_351 + COLLISION_DATA_15, // TILE_TYPE_352 + COLLISION_DATA_95, // TILE_TYPE_353 + COLLISION_DATA_255, // TILE_TYPE_354 + COLLISION_DATA_255, // TILE_TYPE_355 + COLLISION_DATA_15, // TILE_TYPE_356 + COLLISION_DATA_15, // TILE_TYPE_357 + COLLISION_DATA_21, // TILE_TYPE_358 + COLLISION_DATA_15, // TILE_TYPE_359 + COLLISION_DATA_0, // TILE_TYPE_360 + COLLISION_DATA_0, // TILE_TYPE_361 + COLLISION_DATA_0, // TILE_TYPE_362 + COLLISION_DATA_255, // TILE_TYPE_363 + COLLISION_DATA_12, // TILE_TYPE_364 + COLLISION_DATA_0, // TILE_TYPE_365 + COLLISION_DATA_0, // TILE_TYPE_366 + COLLISION_DATA_12, // TILE_TYPE_367 + COLLISION_DATA_12, // TILE_TYPE_368 + COLLISION_DATA_66, // TILE_TYPE_369 + COLLISION_DATA_96, // TILE_TYPE_370 + COLLISION_DATA_15, // TILE_TYPE_371 + COLLISION_DATA_29, // TILE_TYPE_372 + COLLISION_DATA_255, // TILE_TYPE_373 + COLLISION_DATA_15, // TILE_TYPE_374 + COLLISION_DATA_15, // TILE_TYPE_375 + COLLISION_DATA_15, // TILE_TYPE_376 + COLLISION_DATA_0, // TILE_TYPE_377 + COLLISION_DATA_15, // TILE_TYPE_378 + COLLISION_DATA_15, // TILE_TYPE_379 + COLLISION_DATA_15, // TILE_TYPE_380 + COLLISION_DATA_15, // TILE_TYPE_381 + COLLISION_DATA_10, // TILE_TYPE_382 + COLLISION_DATA_5, // TILE_TYPE_383 + COLLISION_DATA_10, // TILE_TYPE_384 + COLLISION_DATA_5, // TILE_TYPE_385 + COLLISION_DATA_1, // TILE_TYPE_386 + COLLISION_DATA_1, // TILE_TYPE_387 + COLLISION_DATA_1, // TILE_TYPE_388 + COLLISION_DATA_0, // TILE_TYPE_389 + COLLISION_DATA_0, // TILE_TYPE_390 + COLLISION_DATA_0, // TILE_TYPE_391 + COLLISION_DATA_0, // TILE_TYPE_392 + COLLISION_DATA_0, // TILE_TYPE_393 + COLLISION_DATA_0, // TILE_TYPE_394 + COLLISION_DATA_5, // TILE_TYPE_395 + COLLISION_DATA_15, // TILE_TYPE_396 + COLLISION_DATA_10, // TILE_TYPE_397 + COLLISION_DATA_0, // TILE_TYPE_398 + COLLISION_DATA_0, // TILE_TYPE_399 + COLLISION_DATA_5, // TILE_TYPE_400 + COLLISION_DATA_15, // TILE_TYPE_401 + COLLISION_DATA_10, // TILE_TYPE_402 + COLLISION_DATA_0, // TILE_TYPE_403 + COLLISION_DATA_0, // TILE_TYPE_404 + COLLISION_DATA_0, // TILE_TYPE_405 + COLLISION_DATA_0, // TILE_TYPE_406 + COLLISION_DATA_0, // TILE_TYPE_407 + COLLISION_DATA_0, // TILE_TYPE_408 + COLLISION_DATA_0, // TILE_TYPE_409 + COLLISION_DATA_0, // TILE_TYPE_410 + COLLISION_DATA_0, // TILE_TYPE_411 + COLLISION_DATA_5, // TILE_TYPE_412 + COLLISION_DATA_0, // TILE_TYPE_413 + COLLISION_DATA_10, // TILE_TYPE_414 + COLLISION_DATA_4, // TILE_TYPE_415 + COLLISION_DATA_12, // TILE_TYPE_416 + COLLISION_DATA_8, // TILE_TYPE_417 + COLLISION_DATA_0, // TILE_TYPE_418 + COLLISION_DATA_0, // TILE_TYPE_419 + COLLISION_DATA_0, // TILE_TYPE_420 + COLLISION_DATA_5, // TILE_TYPE_421 + COLLISION_DATA_0, // TILE_TYPE_422 + COLLISION_DATA_10, // TILE_TYPE_423 + COLLISION_DATA_4, // TILE_TYPE_424 + COLLISION_DATA_12, // TILE_TYPE_425 + COLLISION_DATA_8, // TILE_TYPE_426 + COLLISION_DATA_15, // TILE_TYPE_427 + COLLISION_DATA_15, // TILE_TYPE_428 + COLLISION_DATA_15, // TILE_TYPE_429 + COLLISION_DATA_15, // TILE_TYPE_430 + COLLISION_DATA_15, // TILE_TYPE_431 + COLLISION_DATA_16, // TILE_TYPE_432 + COLLISION_DATA_17, // TILE_TYPE_433 + COLLISION_DATA_17, // TILE_TYPE_434 + COLLISION_DATA_16, // TILE_TYPE_435 + COLLISION_DATA_42, // TILE_TYPE_436 + COLLISION_DATA_42, // TILE_TYPE_437 + COLLISION_DATA_42, // TILE_TYPE_438 + COLLISION_DATA_42, // TILE_TYPE_439 + COLLISION_DATA_42, // TILE_TYPE_440 + COLLISION_DATA_42, // TILE_TYPE_441 + COLLISION_DATA_42, // TILE_TYPE_442 + COLLISION_DATA_42, // TILE_TYPE_443 + COLLISION_DATA_42, // TILE_TYPE_444 + COLLISION_DATA_42, // TILE_TYPE_445 + COLLISION_DATA_42, // TILE_TYPE_446 + COLLISION_DATA_42, // TILE_TYPE_447 + COLLISION_DATA_27, // TILE_TYPE_448 + COLLISION_DATA_25, // TILE_TYPE_449 + COLLISION_DATA_28, // TILE_TYPE_450 + COLLISION_DATA_26, // TILE_TYPE_451 + COLLISION_DATA_43, // TILE_TYPE_452 + COLLISION_DATA_43, // TILE_TYPE_453 + COLLISION_DATA_97, // TILE_TYPE_454 + COLLISION_DATA_23, // TILE_TYPE_455 + COLLISION_DATA_23, // TILE_TYPE_456 + COLLISION_DATA_84, // TILE_TYPE_457 + COLLISION_DATA_23, // TILE_TYPE_458 + COLLISION_DATA_23, // TILE_TYPE_459 + COLLISION_DATA_23, // TILE_TYPE_460 + COLLISION_DATA_0, // TILE_TYPE_461 + COLLISION_DATA_0, // TILE_TYPE_462 + COLLISION_DATA_84, // TILE_TYPE_463 + COLLISION_DATA_15, // TILE_TYPE_464 + COLLISION_DATA_15, // TILE_TYPE_465 + COLLISION_DATA_15, // TILE_TYPE_466 + COLLISION_DATA_15, // TILE_TYPE_467 + COLLISION_DATA_15, // TILE_TYPE_468 + COLLISION_DATA_15, // TILE_TYPE_469 + COLLISION_DATA_15, // TILE_TYPE_470 + COLLISION_DATA_0, // TILE_TYPE_471 + COLLISION_DATA_0, // TILE_TYPE_472 + COLLISION_DATA_0, // TILE_TYPE_473 + COLLISION_DATA_0, // TILE_TYPE_474 + COLLISION_DATA_18, // TILE_TYPE_475 + COLLISION_DATA_15, // TILE_TYPE_476 + COLLISION_DATA_15, // TILE_TYPE_477 + COLLISION_DATA_19, // TILE_TYPE_478 + COLLISION_DATA_15, // TILE_TYPE_479 + COLLISION_DATA_15, // TILE_TYPE_480 + COLLISION_DATA_15, // TILE_TYPE_481 + COLLISION_DATA_15, // TILE_TYPE_482 + COLLISION_DATA_15, // TILE_TYPE_483 + COLLISION_DATA_15, // TILE_TYPE_484 + COLLISION_DATA_15, // TILE_TYPE_485 + COLLISION_DATA_15, // TILE_TYPE_486 + COLLISION_DATA_5, // TILE_TYPE_487 + COLLISION_DATA_0, // TILE_TYPE_488 + COLLISION_DATA_0, // TILE_TYPE_489 + COLLISION_DATA_0, // TILE_TYPE_490 + COLLISION_DATA_0, // TILE_TYPE_491 + COLLISION_DATA_15, // TILE_TYPE_492 + COLLISION_DATA_15, // TILE_TYPE_493 + COLLISION_DATA_15, // TILE_TYPE_494 + COLLISION_DATA_15, // TILE_TYPE_495 + COLLISION_DATA_15, // TILE_TYPE_496 + COLLISION_DATA_15, // TILE_TYPE_497 + COLLISION_DATA_15, // TILE_TYPE_498 + COLLISION_DATA_15, // TILE_TYPE_499 + COLLISION_DATA_15, // TILE_TYPE_500 + COLLISION_DATA_15, // TILE_TYPE_501 + COLLISION_DATA_15, // TILE_TYPE_502 + COLLISION_DATA_15, // TILE_TYPE_503 + COLLISION_DATA_15, // TILE_TYPE_504 + COLLISION_DATA_15, // TILE_TYPE_505 + COLLISION_DATA_15, // TILE_TYPE_506 + COLLISION_DATA_15, // TILE_TYPE_507 + COLLISION_DATA_15, // TILE_TYPE_508 + COLLISION_DATA_15, // TILE_TYPE_509 + COLLISION_DATA_15, // TILE_TYPE_510 + COLLISION_DATA_15, // TILE_TYPE_511 + COLLISION_DATA_0, // TILE_TYPE_512 + COLLISION_DATA_0, // TILE_TYPE_513 + COLLISION_DATA_0, // TILE_TYPE_514 + COLLISION_DATA_0, // TILE_TYPE_515 + COLLISION_DATA_0, // TILE_TYPE_516 + COLLISION_DATA_0, // TILE_TYPE_517 + COLLISION_DATA_1, // TILE_TYPE_518 + COLLISION_DATA_3, // TILE_TYPE_519 + COLLISION_DATA_2, // TILE_TYPE_520 + COLLISION_DATA_0, // TILE_TYPE_521 + COLLISION_DATA_0, // TILE_TYPE_522 + COLLISION_DATA_5, // TILE_TYPE_523 + COLLISION_DATA_15, // TILE_TYPE_524 + COLLISION_DATA_10, // TILE_TYPE_525 + COLLISION_DATA_0, // TILE_TYPE_526 + COLLISION_DATA_0, // TILE_TYPE_527 + COLLISION_DATA_0, // TILE_TYPE_528 + COLLISION_DATA_0, // TILE_TYPE_529 + COLLISION_DATA_0, // TILE_TYPE_530 + COLLISION_DATA_0, // TILE_TYPE_531 + COLLISION_DATA_0, // TILE_TYPE_532 + COLLISION_DATA_0, // TILE_TYPE_533 + COLLISION_DATA_0, // TILE_TYPE_534 + COLLISION_DATA_0, // TILE_TYPE_535 + COLLISION_DATA_0, // TILE_TYPE_536 + COLLISION_DATA_15, // TILE_TYPE_537 + COLLISION_DATA_15, // TILE_TYPE_538 + COLLISION_DATA_71, // TILE_TYPE_539 + COLLISION_DATA_15, // TILE_TYPE_540 + COLLISION_DATA_15, // TILE_TYPE_541 + COLLISION_DATA_15, // TILE_TYPE_542 + COLLISION_DATA_1, // TILE_TYPE_543 + COLLISION_DATA_3, // TILE_TYPE_544 + COLLISION_DATA_2, // TILE_TYPE_545 + COLLISION_DATA_15, // TILE_TYPE_546 + COLLISION_DATA_15, // TILE_TYPE_547 + COLLISION_DATA_5, // TILE_TYPE_548 + COLLISION_DATA_15, // TILE_TYPE_549 + COLLISION_DATA_10, // TILE_TYPE_550 + COLLISION_DATA_15, // TILE_TYPE_551 + COLLISION_DATA_15, // TILE_TYPE_552 + COLLISION_DATA_4, // TILE_TYPE_553 + COLLISION_DATA_0, // TILE_TYPE_554 + COLLISION_DATA_8, // TILE_TYPE_555 + COLLISION_DATA_15, // TILE_TYPE_556 + COLLISION_DATA_12, // TILE_TYPE_557 + COLLISION_DATA_12, // TILE_TYPE_558 + COLLISION_DATA_0, // TILE_TYPE_559 + COLLISION_DATA_12, // TILE_TYPE_560 + COLLISION_DATA_12, // TILE_TYPE_561 + COLLISION_DATA_48, // TILE_TYPE_562 + COLLISION_DATA_48, // TILE_TYPE_563 + COLLISION_DATA_48, // TILE_TYPE_564 + COLLISION_DATA_48, // TILE_TYPE_565 + COLLISION_DATA_48, // TILE_TYPE_566 + COLLISION_DATA_48, // TILE_TYPE_567 + COLLISION_DATA_48, // TILE_TYPE_568 + COLLISION_DATA_48, // TILE_TYPE_569 + COLLISION_DATA_48, // TILE_TYPE_570 + COLLISION_DATA_48, // TILE_TYPE_571 + COLLISION_DATA_48, // TILE_TYPE_572 + COLLISION_DATA_48, // TILE_TYPE_573 + COLLISION_DATA_48, // TILE_TYPE_574 + COLLISION_DATA_48, // TILE_TYPE_575 + COLLISION_DATA_48, // TILE_TYPE_576 + COLLISION_DATA_48, // TILE_TYPE_577 + COLLISION_DATA_48, // TILE_TYPE_578 + COLLISION_DATA_48, // TILE_TYPE_579 + COLLISION_DATA_48, // TILE_TYPE_580 + COLLISION_DATA_48, // TILE_TYPE_581 + COLLISION_DATA_48, // TILE_TYPE_582 + COLLISION_DATA_48, // TILE_TYPE_583 + COLLISION_DATA_48, // TILE_TYPE_584 + COLLISION_DATA_48, // TILE_TYPE_585 + COLLISION_DATA_48, // TILE_TYPE_586 + COLLISION_DATA_48, // TILE_TYPE_587 + COLLISION_DATA_48, // TILE_TYPE_588 + COLLISION_DATA_48, // TILE_TYPE_589 + COLLISION_DATA_16, // TILE_TYPE_590 + COLLISION_DATA_15, // TILE_TYPE_591 + COLLISION_DATA_17, // TILE_TYPE_592 + COLLISION_DATA_15, // TILE_TYPE_593 + COLLISION_DATA_15, // TILE_TYPE_594 + COLLISION_DATA_15, // TILE_TYPE_595 + COLLISION_DATA_15, // TILE_TYPE_596 + COLLISION_DATA_15, // TILE_TYPE_597 + COLLISION_DATA_15, // TILE_TYPE_598 + COLLISION_DATA_0, // TILE_TYPE_599 + COLLISION_DATA_0, // TILE_TYPE_600 + COLLISION_DATA_0, // TILE_TYPE_601 + COLLISION_DATA_0, // TILE_TYPE_602 + COLLISION_DATA_0, // TILE_TYPE_603 + COLLISION_DATA_0, // TILE_TYPE_604 + COLLISION_DATA_0, // TILE_TYPE_605 + COLLISION_DATA_0, // TILE_TYPE_606 + COLLISION_DATA_0, // TILE_TYPE_607 + COLLISION_DATA_5, // TILE_TYPE_608 + COLLISION_DATA_15, // TILE_TYPE_609 + COLLISION_DATA_0, // TILE_TYPE_610 + COLLISION_DATA_0, // TILE_TYPE_611 + COLLISION_DATA_5, // TILE_TYPE_612 + COLLISION_DATA_15, // TILE_TYPE_613 + COLLISION_DATA_15, // TILE_TYPE_614 + COLLISION_DATA_15, // TILE_TYPE_615 + COLLISION_DATA_15, // TILE_TYPE_616 + COLLISION_DATA_15, // TILE_TYPE_617 + COLLISION_DATA_15, // TILE_TYPE_618 + COLLISION_DATA_15, // TILE_TYPE_619 + COLLISION_DATA_15, // TILE_TYPE_620 + COLLISION_DATA_39, // TILE_TYPE_621 + COLLISION_DATA_15, // TILE_TYPE_622 + COLLISION_DATA_15, // TILE_TYPE_623 + COLLISION_DATA_39, // TILE_TYPE_624 + COLLISION_DATA_255, // TILE_TYPE_625 + COLLISION_DATA_15, // TILE_TYPE_626 + COLLISION_DATA_15, // TILE_TYPE_627 + COLLISION_DATA_15, // TILE_TYPE_628 + COLLISION_DATA_15, // TILE_TYPE_629 + COLLISION_DATA_15, // TILE_TYPE_630 + COLLISION_DATA_15, // TILE_TYPE_631 + COLLISION_DATA_15, // TILE_TYPE_632 + COLLISION_DATA_15, // TILE_TYPE_633 + COLLISION_DATA_15, // TILE_TYPE_634 + COLLISION_DATA_15, // TILE_TYPE_635 + COLLISION_DATA_15, // TILE_TYPE_636 + COLLISION_DATA_39, // TILE_TYPE_637 + COLLISION_DATA_15, // TILE_TYPE_638 + COLLISION_DATA_15, // TILE_TYPE_639 + COLLISION_DATA_39, // TILE_TYPE_640 + COLLISION_DATA_255, // TILE_TYPE_641 + COLLISION_DATA_15, // TILE_TYPE_642 + COLLISION_DATA_15, // TILE_TYPE_643 + COLLISION_DATA_15, // TILE_TYPE_644 + COLLISION_DATA_15, // TILE_TYPE_645 + COLLISION_DATA_255, // TILE_TYPE_646 + COLLISION_DATA_255, // TILE_TYPE_647 + COLLISION_DATA_255, // TILE_TYPE_648 + COLLISION_DATA_255, // TILE_TYPE_649 + COLLISION_DATA_255, // TILE_TYPE_650 + COLLISION_DATA_255, // TILE_TYPE_651 + COLLISION_DATA_15, // TILE_TYPE_652 + COLLISION_DATA_39, // TILE_TYPE_653 + COLLISION_DATA_15, // TILE_TYPE_654 + COLLISION_DATA_15, // TILE_TYPE_655 + COLLISION_DATA_255, // TILE_TYPE_656 + COLLISION_DATA_39, // TILE_TYPE_657 + COLLISION_DATA_15, // TILE_TYPE_658 + COLLISION_DATA_15, // TILE_TYPE_659 + COLLISION_DATA_15, // TILE_TYPE_660 + COLLISION_DATA_15, // TILE_TYPE_661 + COLLISION_DATA_15, // TILE_TYPE_662 + COLLISION_DATA_15, // TILE_TYPE_663 + COLLISION_DATA_15, // TILE_TYPE_664 + COLLISION_DATA_15, // TILE_TYPE_665 + COLLISION_DATA_15, // TILE_TYPE_666 + COLLISION_DATA_15, // TILE_TYPE_667 + COLLISION_DATA_15, // TILE_TYPE_668 + COLLISION_DATA_15, // TILE_TYPE_669 + COLLISION_DATA_15, // TILE_TYPE_670 + COLLISION_DATA_15, // TILE_TYPE_671 + COLLISION_DATA_15, // TILE_TYPE_672 + COLLISION_DATA_15, // TILE_TYPE_673 + COLLISION_DATA_15, // TILE_TYPE_674 + COLLISION_DATA_15, // TILE_TYPE_675 + COLLISION_DATA_15, // TILE_TYPE_676 + COLLISION_DATA_15, // TILE_TYPE_677 + COLLISION_DATA_15, // TILE_TYPE_678 + COLLISION_DATA_15, // TILE_TYPE_679 + COLLISION_DATA_15, // TILE_TYPE_680 + COLLISION_DATA_15, // TILE_TYPE_681 + COLLISION_DATA_15, // TILE_TYPE_682 + COLLISION_DATA_15, // TILE_TYPE_683 + COLLISION_DATA_15, // TILE_TYPE_684 + COLLISION_DATA_15, // TILE_TYPE_685 + COLLISION_DATA_15, // TILE_TYPE_686 + COLLISION_DATA_15, // TILE_TYPE_687 + COLLISION_DATA_15, // TILE_TYPE_688 + COLLISION_DATA_15, // TILE_TYPE_689 + COLLISION_DATA_15, // TILE_TYPE_690 + COLLISION_DATA_15, // TILE_TYPE_691 + COLLISION_DATA_15, // TILE_TYPE_692 + COLLISION_DATA_15, // TILE_TYPE_693 + COLLISION_DATA_0, // TILE_TYPE_694 + COLLISION_DATA_0, // TILE_TYPE_695 + COLLISION_DATA_0, // TILE_TYPE_696 + COLLISION_DATA_0, // TILE_TYPE_697 + COLLISION_DATA_0, // TILE_TYPE_698 + COLLISION_DATA_0, // TILE_TYPE_699 + COLLISION_DATA_0, // TILE_TYPE_700 + COLLISION_DATA_0, // TILE_TYPE_701 + COLLISION_DATA_0, // TILE_TYPE_702 + COLLISION_DATA_0, // TILE_TYPE_703 + COLLISION_DATA_0, // TILE_TYPE_704 + COLLISION_DATA_0, // TILE_TYPE_705 + COLLISION_DATA_0, // TILE_TYPE_706 + COLLISION_DATA_0, // TILE_TYPE_707 + COLLISION_DATA_0, // TILE_TYPE_708 + COLLISION_DATA_0, // TILE_TYPE_709 + COLLISION_DATA_0, // TILE_TYPE_710 + COLLISION_DATA_0, // TILE_TYPE_711 + COLLISION_DATA_0, // TILE_TYPE_712 + COLLISION_DATA_0, // TILE_TYPE_713 + COLLISION_DATA_0, // TILE_TYPE_714 + COLLISION_DATA_0, // TILE_TYPE_715 + COLLISION_DATA_0, // TILE_TYPE_716 + COLLISION_DATA_0, // TILE_TYPE_717 + COLLISION_DATA_0, // TILE_TYPE_718 + COLLISION_DATA_0, // TILE_TYPE_719 + COLLISION_DATA_0, // TILE_TYPE_720 + COLLISION_DATA_0, // TILE_TYPE_721 + COLLISION_DATA_0, // TILE_TYPE_722 + COLLISION_DATA_0, // TILE_TYPE_723 + COLLISION_DATA_0, // TILE_TYPE_724 + COLLISION_DATA_0, // TILE_TYPE_725 + COLLISION_DATA_0, // TILE_TYPE_726 + COLLISION_DATA_0, // TILE_TYPE_727 + COLLISION_DATA_0, // TILE_TYPE_728 + COLLISION_DATA_0, // TILE_TYPE_729 + COLLISION_DATA_0, // TILE_TYPE_730 + COLLISION_DATA_0, // TILE_TYPE_731 + COLLISION_DATA_0, // TILE_TYPE_732 + COLLISION_DATA_0, // TILE_TYPE_733 + COLLISION_DATA_0, // TILE_TYPE_734 + COLLISION_DATA_0, // TILE_TYPE_735 + COLLISION_DATA_0, // TILE_TYPE_736 + COLLISION_DATA_0, // TILE_TYPE_737 + COLLISION_DATA_0, // TILE_TYPE_738 + COLLISION_DATA_0, // TILE_TYPE_739 + COLLISION_DATA_0, // TILE_TYPE_740 + COLLISION_DATA_0, // TILE_TYPE_741 + COLLISION_DATA_0, // TILE_TYPE_742 + COLLISION_DATA_0, // TILE_TYPE_743 + COLLISION_DATA_0, // TILE_TYPE_744 + COLLISION_DATA_0, // TILE_TYPE_745 + COLLISION_DATA_0, // TILE_TYPE_746 + COLLISION_DATA_0, // TILE_TYPE_747 + COLLISION_DATA_0, // TILE_TYPE_748 + COLLISION_DATA_0, // TILE_TYPE_749 + COLLISION_DATA_0, // TILE_TYPE_750 + COLLISION_DATA_0, // TILE_TYPE_751 + COLLISION_DATA_0, // TILE_TYPE_752 + COLLISION_DATA_0, // TILE_TYPE_753 + COLLISION_DATA_3, // TILE_TYPE_754 + COLLISION_DATA_0, // TILE_TYPE_755 + COLLISION_DATA_0, // TILE_TYPE_756 + COLLISION_DATA_0, // TILE_TYPE_757 + COLLISION_DATA_0, // TILE_TYPE_758 + COLLISION_DATA_0, // TILE_TYPE_759 + COLLISION_DATA_0, // TILE_TYPE_760 + COLLISION_DATA_0, // TILE_TYPE_761 + COLLISION_DATA_5, // TILE_TYPE_762 + COLLISION_DATA_0, // TILE_TYPE_763 + COLLISION_DATA_10, // TILE_TYPE_764 + COLLISION_DATA_4, // TILE_TYPE_765 + COLLISION_DATA_12, // TILE_TYPE_766 + COLLISION_DATA_8, // TILE_TYPE_767 + COLLISION_DATA_70, // TILE_TYPE_768 + COLLISION_DATA_75, // TILE_TYPE_769 + COLLISION_DATA_74, // TILE_TYPE_770 + COLLISION_DATA_72, // TILE_TYPE_771 + COLLISION_DATA_71, // TILE_TYPE_772 + COLLISION_DATA_96, // TILE_TYPE_773 + COLLISION_DATA_98, // TILE_TYPE_774 + COLLISION_DATA_97, // TILE_TYPE_775 + COLLISION_DATA_99, // TILE_TYPE_776 + COLLISION_DATA_100, // TILE_TYPE_777 + COLLISION_DATA_102, // TILE_TYPE_778 + COLLISION_DATA_15, // TILE_TYPE_779 + COLLISION_DATA_80, // TILE_TYPE_780 + COLLISION_DATA_48, // TILE_TYPE_781 + COLLISION_DATA_48, // TILE_TYPE_782 + COLLISION_DATA_255, // TILE_TYPE_783 + COLLISION_DATA_0, // TILE_TYPE_784 + COLLISION_DATA_255, // TILE_TYPE_785 + COLLISION_DATA_0, // TILE_TYPE_786 + COLLISION_DATA_0, // TILE_TYPE_787 + COLLISION_DATA_0, // TILE_TYPE_788 + COLLISION_DATA_0, // TILE_TYPE_789 + COLLISION_DATA_255, // TILE_TYPE_790 + COLLISION_DATA_0, // TILE_TYPE_791 + COLLISION_DATA_0, // TILE_TYPE_792 + COLLISION_DATA_37, // TILE_TYPE_793 + COLLISION_DATA_15, // TILE_TYPE_794 + COLLISION_DATA_255, // TILE_TYPE_795 + COLLISION_DATA_255, // TILE_TYPE_796 + COLLISION_DATA_255, // TILE_TYPE_797 + COLLISION_DATA_255, // TILE_TYPE_798 + COLLISION_DATA_255, // TILE_TYPE_799 + COLLISION_DATA_255, // TILE_TYPE_800 + COLLISION_DATA_0, // TILE_TYPE_801 + COLLISION_DATA_0, // TILE_TYPE_802 + COLLISION_DATA_33, // TILE_TYPE_803 + COLLISION_DATA_33, // TILE_TYPE_804 + COLLISION_DATA_33, // TILE_TYPE_805 + COLLISION_DATA_33, // TILE_TYPE_806 + COLLISION_DATA_33, // TILE_TYPE_807 + COLLISION_DATA_33, // TILE_TYPE_808 + COLLISION_DATA_33, // TILE_TYPE_809 + COLLISION_DATA_33, // TILE_TYPE_810 + COLLISION_DATA_33, // TILE_TYPE_811 + COLLISION_DATA_33, // TILE_TYPE_812 + COLLISION_DATA_33, // TILE_TYPE_813 + COLLISION_DATA_33, // TILE_TYPE_814 + COLLISION_DATA_33, // TILE_TYPE_815 + COLLISION_DATA_33, // TILE_TYPE_816 + COLLISION_DATA_33, // TILE_TYPE_817 + COLLISION_DATA_33, // TILE_TYPE_818 + COLLISION_DATA_33, // TILE_TYPE_819 + COLLISION_DATA_33, // TILE_TYPE_820 + COLLISION_DATA_33, // TILE_TYPE_821 + COLLISION_DATA_33, // TILE_TYPE_822 + COLLISION_DATA_33, // TILE_TYPE_823 + COLLISION_DATA_33, // TILE_TYPE_824 + COLLISION_DATA_33, // TILE_TYPE_825 + COLLISION_DATA_33, // TILE_TYPE_826 + COLLISION_DATA_33, // TILE_TYPE_827 + COLLISION_DATA_33, // TILE_TYPE_828 + COLLISION_DATA_33, // TILE_TYPE_829 + COLLISION_DATA_33, // TILE_TYPE_830 + COLLISION_DATA_33, // TILE_TYPE_831 + COLLISION_DATA_33, // TILE_TYPE_832 + COLLISION_DATA_0, // TILE_TYPE_833 + COLLISION_DATA_12, // TILE_TYPE_834 + COLLISION_DATA_0, // TILE_TYPE_835 + COLLISION_DATA_0, // TILE_TYPE_836 + COLLISION_DATA_0, // TILE_TYPE_837 + COLLISION_DATA_0, // TILE_TYPE_838 + COLLISION_DATA_0, // TILE_TYPE_839 + COLLISION_DATA_0, // TILE_TYPE_840 + COLLISION_DATA_0, // TILE_TYPE_841 + COLLISION_DATA_0, // TILE_TYPE_842 + COLLISION_DATA_0, // TILE_TYPE_843 + COLLISION_DATA_0, // TILE_TYPE_844 + COLLISION_DATA_15, // TILE_TYPE_845 + COLLISION_DATA_255, // TILE_TYPE_846 + COLLISION_DATA_255, // TILE_TYPE_847 + COLLISION_DATA_255, // TILE_TYPE_848 + COLLISION_DATA_255, // TILE_TYPE_849 + COLLISION_DATA_255, // TILE_TYPE_850 + COLLISION_DATA_40, // TILE_TYPE_851 + COLLISION_DATA_255, // TILE_TYPE_852 + COLLISION_DATA_40, // TILE_TYPE_853 + COLLISION_DATA_40, // TILE_TYPE_854 + COLLISION_DATA_40, // TILE_TYPE_855 + COLLISION_DATA_40, // TILE_TYPE_856 + COLLISION_DATA_40, // TILE_TYPE_857 + COLLISION_DATA_40, // TILE_TYPE_858 + COLLISION_DATA_40, // TILE_TYPE_859 + COLLISION_DATA_40, // TILE_TYPE_860 + COLLISION_DATA_40, // TILE_TYPE_861 + COLLISION_DATA_40, // TILE_TYPE_862 + COLLISION_DATA_40, // TILE_TYPE_863 + COLLISION_DATA_15, // TILE_TYPE_864 + COLLISION_DATA_15, // TILE_TYPE_865 + COLLISION_DATA_15, // TILE_TYPE_866 + COLLISION_DATA_15, // TILE_TYPE_867 + COLLISION_DATA_15, // TILE_TYPE_868 + COLLISION_DATA_15, // TILE_TYPE_869 + COLLISION_DATA_15, // TILE_TYPE_870 + COLLISION_DATA_15, // TILE_TYPE_871 + COLLISION_DATA_15, // TILE_TYPE_872 + COLLISION_DATA_15, // TILE_TYPE_873 + COLLISION_DATA_15, // TILE_TYPE_874 + COLLISION_DATA_15, // TILE_TYPE_875 + COLLISION_DATA_15, // TILE_TYPE_876 + COLLISION_DATA_15, // TILE_TYPE_877 + COLLISION_DATA_15, // TILE_TYPE_878 + COLLISION_DATA_15, // TILE_TYPE_879 + COLLISION_DATA_15, // TILE_TYPE_880 + COLLISION_DATA_15, // TILE_TYPE_881 + COLLISION_DATA_15, // TILE_TYPE_882 + COLLISION_DATA_15, // TILE_TYPE_883 + COLLISION_DATA_15, // TILE_TYPE_884 + COLLISION_DATA_15, // TILE_TYPE_885 + COLLISION_DATA_15, // TILE_TYPE_886 + COLLISION_DATA_15, // TILE_TYPE_887 + COLLISION_DATA_15, // TILE_TYPE_888 + COLLISION_DATA_15, // TILE_TYPE_889 + COLLISION_DATA_15, // TILE_TYPE_890 + COLLISION_DATA_15, // TILE_TYPE_891 + COLLISION_DATA_15, // TILE_TYPE_892 + COLLISION_DATA_15, // TILE_TYPE_893 + COLLISION_DATA_15, // TILE_TYPE_894 + COLLISION_DATA_15, // TILE_TYPE_895 + COLLISION_DATA_15, // TILE_TYPE_896 + COLLISION_DATA_15, // TILE_TYPE_897 + COLLISION_DATA_15, // TILE_TYPE_898 + COLLISION_DATA_15, // TILE_TYPE_899 + COLLISION_DATA_15, // TILE_TYPE_900 + COLLISION_DATA_15, // TILE_TYPE_901 + COLLISION_DATA_15, // TILE_TYPE_902 + COLLISION_DATA_15, // TILE_TYPE_903 + COLLISION_DATA_15, // TILE_TYPE_904 + COLLISION_DATA_15, // TILE_TYPE_905 + COLLISION_DATA_15, // TILE_TYPE_906 + COLLISION_DATA_15, // TILE_TYPE_907 + COLLISION_DATA_15, // TILE_TYPE_908 + COLLISION_DATA_15, // TILE_TYPE_909 + COLLISION_DATA_15, // TILE_TYPE_910 + COLLISION_DATA_15, // TILE_TYPE_911 + COLLISION_DATA_15, // TILE_TYPE_912 + COLLISION_DATA_15, // TILE_TYPE_913 + COLLISION_DATA_15, // TILE_TYPE_914 + COLLISION_DATA_15, // TILE_TYPE_915 + COLLISION_DATA_15, // TILE_TYPE_916 + COLLISION_DATA_21, // TILE_TYPE_917 + COLLISION_DATA_20, // TILE_TYPE_918 + COLLISION_DATA_20, // TILE_TYPE_919 + COLLISION_DATA_15, // TILE_TYPE_920 + COLLISION_DATA_15, // TILE_TYPE_921 + COLLISION_DATA_15, // TILE_TYPE_922 + COLLISION_DATA_15, // TILE_TYPE_923 + COLLISION_DATA_15, // TILE_TYPE_924 + COLLISION_DATA_15, // TILE_TYPE_925 + COLLISION_DATA_15, // TILE_TYPE_926 + COLLISION_DATA_15, // TILE_TYPE_927 + COLLISION_DATA_255, // TILE_TYPE_928 + COLLISION_DATA_1, // TILE_TYPE_929 + COLLISION_DATA_1, // TILE_TYPE_930 + COLLISION_DATA_1, // TILE_TYPE_931 + COLLISION_DATA_255, // TILE_TYPE_932 + COLLISION_DATA_255, // TILE_TYPE_933 + COLLISION_DATA_255, // TILE_TYPE_934 + COLLISION_DATA_255, // TILE_TYPE_935 + COLLISION_DATA_24, // TILE_TYPE_936 + COLLISION_DATA_24, // TILE_TYPE_937 + COLLISION_DATA_24, // TILE_TYPE_938 + COLLISION_DATA_24, // TILE_TYPE_939 + COLLISION_DATA_38, // TILE_TYPE_940 + COLLISION_DATA_15, // TILE_TYPE_941 + COLLISION_DATA_0, // TILE_TYPE_942 + COLLISION_DATA_28, // TILE_TYPE_943 + COLLISION_DATA_26, // TILE_TYPE_944 + COLLISION_DATA_27, // TILE_TYPE_945 + COLLISION_DATA_25, // TILE_TYPE_946 + COLLISION_DATA_255, // TILE_TYPE_947 + COLLISION_DATA_0, // TILE_TYPE_948 + COLLISION_DATA_15, // TILE_TYPE_949 + COLLISION_DATA_21, // TILE_TYPE_950 + COLLISION_DATA_15, // TILE_TYPE_951 + COLLISION_DATA_15, // TILE_TYPE_952 + COLLISION_DATA_15, // TILE_TYPE_953 + COLLISION_DATA_19, // TILE_TYPE_954 + COLLISION_DATA_18, // TILE_TYPE_955 + COLLISION_DATA_15, // TILE_TYPE_956 + COLLISION_DATA_15, // TILE_TYPE_957 + COLLISION_DATA_15, // TILE_TYPE_958 + COLLISION_DATA_18, // TILE_TYPE_959 + COLLISION_DATA_19, // TILE_TYPE_960 + COLLISION_DATA_35, // TILE_TYPE_961 + COLLISION_DATA_39, // TILE_TYPE_962 + COLLISION_DATA_0, // TILE_TYPE_963 + COLLISION_DATA_0, // TILE_TYPE_964 + COLLISION_DATA_2, // TILE_TYPE_965 + COLLISION_DATA_14, // TILE_TYPE_966 + COLLISION_DATA_13, // TILE_TYPE_967 + COLLISION_DATA_12, // TILE_TYPE_968 + COLLISION_DATA_3, // TILE_TYPE_969 + COLLISION_DATA_9, // TILE_TYPE_970 + COLLISION_DATA_6, // TILE_TYPE_971 + COLLISION_DATA_4, // TILE_TYPE_972 + COLLISION_DATA_8, // TILE_TYPE_973 + COLLISION_DATA_11, // TILE_TYPE_974 + COLLISION_DATA_7, // TILE_TYPE_975 + COLLISION_DATA_10, // TILE_TYPE_976 + COLLISION_DATA_5, // TILE_TYPE_977 + COLLISION_DATA_3, // TILE_TYPE_978 + COLLISION_DATA_107, // TILE_TYPE_979 + COLLISION_DATA_103, // TILE_TYPE_980 + COLLISION_DATA_106, // TILE_TYPE_981 + COLLISION_DATA_15, // TILE_TYPE_982 + COLLISION_DATA_12, // TILE_TYPE_983 + COLLISION_DATA_20, // TILE_TYPE_984 + COLLISION_DATA_21, // TILE_TYPE_985 + COLLISION_DATA_15, // TILE_TYPE_986 + COLLISION_DATA_0, // TILE_TYPE_987 + COLLISION_DATA_15, // TILE_TYPE_988 + COLLISION_DATA_40, // TILE_TYPE_989 + COLLISION_DATA_95, // TILE_TYPE_990 + COLLISION_DATA_15, // TILE_TYPE_991 + COLLISION_DATA_5, // TILE_TYPE_992 + COLLISION_DATA_10, // TILE_TYPE_993 + COLLISION_DATA_16, // TILE_TYPE_994 + COLLISION_DATA_17, // TILE_TYPE_995 + COLLISION_DATA_18, // TILE_TYPE_996 + COLLISION_DATA_19, // TILE_TYPE_997 + COLLISION_DATA_71, // TILE_TYPE_998 + COLLISION_DATA_12, // TILE_TYPE_999 + COLLISION_DATA_13, // TILE_TYPE_1000 + COLLISION_DATA_14, // TILE_TYPE_1001 + COLLISION_DATA_71, // TILE_TYPE_1002 + COLLISION_DATA_20, // TILE_TYPE_1003 + COLLISION_DATA_92, // TILE_TYPE_1004 + COLLISION_DATA_13, // TILE_TYPE_1005 + COLLISION_DATA_5, // TILE_TYPE_1006 + COLLISION_DATA_4, // TILE_TYPE_1007 + COLLISION_DATA_8, // TILE_TYPE_1008 + COLLISION_DATA_1, // TILE_TYPE_1009 + COLLISION_DATA_2, // TILE_TYPE_1010 + COLLISION_DATA_10, // TILE_TYPE_1011 + COLLISION_DATA_5, // TILE_TYPE_1012 + COLLISION_DATA_10, // TILE_TYPE_1013 + COLLISION_DATA_15, // TILE_TYPE_1014 + COLLISION_DATA_4, // TILE_TYPE_1015 + COLLISION_DATA_8, // TILE_TYPE_1016 + COLLISION_DATA_15, // TILE_TYPE_1017 + COLLISION_DATA_3, // TILE_TYPE_1018 + COLLISION_DATA_2, // TILE_TYPE_1019 + COLLISION_DATA_5, // TILE_TYPE_1020 + COLLISION_DATA_15, // TILE_TYPE_1021 + COLLISION_DATA_10, // TILE_TYPE_1022 + COLLISION_DATA_4, // TILE_TYPE_1023 + COLLISION_DATA_12, // TILE_TYPE_1024 + COLLISION_DATA_8, // TILE_TYPE_1025 + COLLISION_DATA_3, // TILE_TYPE_1026 + COLLISION_DATA_2, // TILE_TYPE_1027 + COLLISION_DATA_5, // TILE_TYPE_1028 + COLLISION_DATA_15, // TILE_TYPE_1029 + COLLISION_DATA_10, // TILE_TYPE_1030 + COLLISION_DATA_4, // TILE_TYPE_1031 + COLLISION_DATA_12, // TILE_TYPE_1032 + COLLISION_DATA_8, // TILE_TYPE_1033 + COLLISION_DATA_92, // TILE_TYPE_1034 + COLLISION_DATA_84, // TILE_TYPE_1035 + COLLISION_DATA_81, // TILE_TYPE_1036 + COLLISION_DATA_83, // TILE_TYPE_1037 + COLLISION_DATA_81, // TILE_TYPE_1038 + COLLISION_DATA_82, // TILE_TYPE_1039 + COLLISION_DATA_83, // TILE_TYPE_1040 + COLLISION_DATA_90, // TILE_TYPE_1041 + COLLISION_DATA_87, // TILE_TYPE_1042 + COLLISION_DATA_91, // TILE_TYPE_1043 + COLLISION_DATA_95, // TILE_TYPE_1044 + COLLISION_DATA_84, // TILE_TYPE_1045 + COLLISION_DATA_88, // TILE_TYPE_1046 + COLLISION_DATA_92, // TILE_TYPE_1047 + COLLISION_DATA_85, // TILE_TYPE_1048 + COLLISION_DATA_93, // TILE_TYPE_1049 + COLLISION_DATA_94, // TILE_TYPE_1050 + COLLISION_DATA_39, // TILE_TYPE_1051 + COLLISION_DATA_88, // TILE_TYPE_1052 + COLLISION_DATA_85, // TILE_TYPE_1053 + COLLISION_DATA_10, // TILE_TYPE_1054 + COLLISION_DATA_83, // TILE_TYPE_1055 + COLLISION_DATA_90, // TILE_TYPE_1056 + COLLISION_DATA_81, // TILE_TYPE_1057 + COLLISION_DATA_15, // TILE_TYPE_1058 + COLLISION_DATA_89, // TILE_TYPE_1059 + COLLISION_DATA_0, // TILE_TYPE_1060 + COLLISION_DATA_0, // TILE_TYPE_1061 + COLLISION_DATA_69, // TILE_TYPE_1062 + COLLISION_DATA_71, // TILE_TYPE_1063 + COLLISION_DATA_67, // TILE_TYPE_1064 + COLLISION_DATA_70, // TILE_TYPE_1065 + COLLISION_DATA_0, // TILE_TYPE_1066 + COLLISION_DATA_3, // TILE_TYPE_1067 + COLLISION_DATA_15, // TILE_TYPE_1068 + COLLISION_DATA_1, // TILE_TYPE_1069 + COLLISION_DATA_2, // TILE_TYPE_1070 + COLLISION_DATA_3, // TILE_TYPE_1071 + COLLISION_DATA_10, // TILE_TYPE_1072 + COLLISION_DATA_12, // TILE_TYPE_1073 + COLLISION_DATA_5, // TILE_TYPE_1074 + COLLISION_DATA_4, // TILE_TYPE_1075 + COLLISION_DATA_8, // TILE_TYPE_1076 + COLLISION_DATA_4, // TILE_TYPE_1077 + COLLISION_DATA_1, // TILE_TYPE_1078 + COLLISION_DATA_3, // TILE_TYPE_1079 + COLLISION_DATA_15, // TILE_TYPE_1080 + COLLISION_DATA_95, // TILE_TYPE_1081 + COLLISION_DATA_97, // TILE_TYPE_1082 + COLLISION_DATA_0, // TILE_TYPE_1083 + COLLISION_DATA_3, // TILE_TYPE_1084 + COLLISION_DATA_28, // TILE_TYPE_1085 + COLLISION_DATA_27, // TILE_TYPE_1086 + COLLISION_DATA_21, // TILE_TYPE_1087 + COLLISION_DATA_69, // TILE_TYPE_1088 + COLLISION_DATA_3, // TILE_TYPE_1089 + COLLISION_DATA_96, // TILE_TYPE_1090 + COLLISION_DATA_12, // TILE_TYPE_1091 + COLLISION_DATA_102, // TILE_TYPE_1092 + COLLISION_DATA_100, // TILE_TYPE_1093 + COLLISION_DATA_101, // TILE_TYPE_1094 + COLLISION_DATA_26, // TILE_TYPE_1095 + COLLISION_DATA_25, // TILE_TYPE_1096 + COLLISION_DATA_18, // TILE_TYPE_1097 + COLLISION_DATA_17, // TILE_TYPE_1098 + COLLISION_DATA_19, // TILE_TYPE_1099 + COLLISION_DATA_16, // TILE_TYPE_1100 + COLLISION_DATA_2, // TILE_TYPE_1101 + COLLISION_DATA_4, // TILE_TYPE_1102 + COLLISION_DATA_8, // TILE_TYPE_1103 + COLLISION_DATA_14, // TILE_TYPE_1104 + COLLISION_DATA_15, // TILE_TYPE_1105 + COLLISION_DATA_11, // TILE_TYPE_1106 + COLLISION_DATA_84, // TILE_TYPE_1107 + COLLISION_DATA_69, // TILE_TYPE_1108 + COLLISION_DATA_68, // TILE_TYPE_1109 + COLLISION_DATA_4, // TILE_TYPE_1110 + COLLISION_DATA_13, // TILE_TYPE_1111 + COLLISION_DATA_0, // TILE_TYPE_1112 + COLLISION_DATA_0, // TILE_TYPE_1113 + COLLISION_DATA_12, // TILE_TYPE_1114 + COLLISION_DATA_12, // TILE_TYPE_1115 + COLLISION_DATA_15, // TILE_TYPE_1116 + COLLISION_DATA_15, // TILE_TYPE_1117 + COLLISION_DATA_10, // TILE_TYPE_1118 + COLLISION_DATA_5, // TILE_TYPE_1119 + COLLISION_DATA_10, // TILE_TYPE_1120 + COLLISION_DATA_5, // TILE_TYPE_1121 + COLLISION_DATA_12, // TILE_TYPE_1122 + COLLISION_DATA_97, // TILE_TYPE_1123 + COLLISION_DATA_10, // TILE_TYPE_1124 + COLLISION_DATA_5, // TILE_TYPE_1125 + COLLISION_DATA_11, // TILE_TYPE_1126 + COLLISION_DATA_7, // TILE_TYPE_1127 + COLLISION_DATA_67, // TILE_TYPE_1128 + COLLISION_DATA_69, // TILE_TYPE_1129 + COLLISION_DATA_1, // TILE_TYPE_1130 + COLLISION_DATA_2, // TILE_TYPE_1131 + COLLISION_DATA_4, // TILE_TYPE_1132 + COLLISION_DATA_8, // TILE_TYPE_1133 + COLLISION_DATA_13, // TILE_TYPE_1134 + COLLISION_DATA_3, // TILE_TYPE_1135 + COLLISION_DATA_3, // TILE_TYPE_1136 + COLLISION_DATA_7, // TILE_TYPE_1137 + COLLISION_DATA_15, // TILE_TYPE_1138 + COLLISION_DATA_3, // TILE_TYPE_1139 + COLLISION_DATA_0, // TILE_TYPE_1140 + COLLISION_DATA_2, // TILE_TYPE_1141 + COLLISION_DATA_84, // TILE_TYPE_1142 + COLLISION_DATA_92, // TILE_TYPE_1143 + COLLISION_DATA_88, // TILE_TYPE_1144 + COLLISION_DATA_12, // TILE_TYPE_1145 + COLLISION_DATA_67, // TILE_TYPE_1146 + COLLISION_DATA_0, // TILE_TYPE_1147 + COLLISION_DATA_0, // TILE_TYPE_1148 + COLLISION_DATA_8, // TILE_TYPE_1149 + COLLISION_DATA_1, // TILE_TYPE_1150 + COLLISION_DATA_2, // TILE_TYPE_1151 + COLLISION_DATA_87, // TILE_TYPE_1152 + COLLISION_DATA_95, // TILE_TYPE_1153 + COLLISION_DATA_91, // TILE_TYPE_1154 + COLLISION_DATA_82, // TILE_TYPE_1155 + COLLISION_DATA_14, // TILE_TYPE_1156 + COLLISION_DATA_18, // TILE_TYPE_1157 + COLLISION_DATA_19, // TILE_TYPE_1158 + COLLISION_DATA_10, // TILE_TYPE_1159 + COLLISION_DATA_5, // TILE_TYPE_1160 + COLLISION_DATA_0, // TILE_TYPE_1161 + COLLISION_DATA_10, // TILE_TYPE_1162 + COLLISION_DATA_5, // TILE_TYPE_1163 + COLLISION_DATA_3, // TILE_TYPE_1164 + COLLISION_DATA_63, // TILE_TYPE_1165 + COLLISION_DATA_19, // TILE_TYPE_1166 + COLLISION_DATA_18, // TILE_TYPE_1167 + COLLISION_DATA_47, // TILE_TYPE_1168 + COLLISION_DATA_46, // TILE_TYPE_1169 + COLLISION_DATA_17, // TILE_TYPE_1170 + COLLISION_DATA_16, // TILE_TYPE_1171 + COLLISION_DATA_11, // TILE_TYPE_1172 + COLLISION_DATA_7, // TILE_TYPE_1173 + COLLISION_DATA_15, // TILE_TYPE_1174 + COLLISION_DATA_0, // TILE_TYPE_1175 + COLLISION_DATA_3, // TILE_TYPE_1176 + COLLISION_DATA_15, // TILE_TYPE_1177 + COLLISION_DATA_15, // TILE_TYPE_1178 + COLLISION_DATA_1, // TILE_TYPE_1179 + COLLISION_DATA_8, // TILE_TYPE_1180 + COLLISION_DATA_12, // TILE_TYPE_1181 + COLLISION_DATA_12, // TILE_TYPE_1182 + COLLISION_DATA_15, // TILE_TYPE_1183 + COLLISION_DATA_1, // TILE_TYPE_1184 + COLLISION_DATA_3, // TILE_TYPE_1185 + COLLISION_DATA_2, // TILE_TYPE_1186 + COLLISION_DATA_5, // TILE_TYPE_1187 + COLLISION_DATA_10, // TILE_TYPE_1188 + COLLISION_DATA_4, // TILE_TYPE_1189 + COLLISION_DATA_12, // TILE_TYPE_1190 + COLLISION_DATA_8, // TILE_TYPE_1191 + COLLISION_DATA_9, // TILE_TYPE_1192 + COLLISION_DATA_39, // TILE_TYPE_1193 + COLLISION_DATA_2, // TILE_TYPE_1194 + COLLISION_DATA_14, // TILE_TYPE_1195 + COLLISION_DATA_13, // TILE_TYPE_1196 + COLLISION_DATA_12, // TILE_TYPE_1197 + COLLISION_DATA_3, // TILE_TYPE_1198 + COLLISION_DATA_6, // TILE_TYPE_1199 + COLLISION_DATA_9, // TILE_TYPE_1200 + COLLISION_DATA_4, // TILE_TYPE_1201 + COLLISION_DATA_8, // TILE_TYPE_1202 + COLLISION_DATA_11, // TILE_TYPE_1203 + COLLISION_DATA_7, // TILE_TYPE_1204 + COLLISION_DATA_10, // TILE_TYPE_1205 + COLLISION_DATA_5, // TILE_TYPE_1206 + COLLISION_DATA_34, // TILE_TYPE_1207 + COLLISION_DATA_35, // TILE_TYPE_1208 + COLLISION_DATA_4, // TILE_TYPE_1209 + COLLISION_DATA_12, // TILE_TYPE_1210 + COLLISION_DATA_3, // TILE_TYPE_1211 + COLLISION_DATA_3, // TILE_TYPE_1212 + COLLISION_DATA_1, // TILE_TYPE_1213 + COLLISION_DATA_5, // TILE_TYPE_1214 + COLLISION_DATA_10, // TILE_TYPE_1215 + COLLISION_DATA_4, // TILE_TYPE_1216 + COLLISION_DATA_8, // TILE_TYPE_1217 + COLLISION_DATA_0, // TILE_TYPE_1218 + COLLISION_DATA_107, // TILE_TYPE_1219 + COLLISION_DATA_103, // TILE_TYPE_1220 + COLLISION_DATA_106, // TILE_TYPE_1221 + COLLISION_DATA_18, // TILE_TYPE_1222 + COLLISION_DATA_45, // TILE_TYPE_1223 + COLLISION_DATA_44, // TILE_TYPE_1224 + COLLISION_DATA_0, // TILE_TYPE_1225 + COLLISION_DATA_15, // TILE_TYPE_1226 + COLLISION_DATA_41, // TILE_TYPE_1227 + COLLISION_DATA_40, // TILE_TYPE_1228 + COLLISION_DATA_0, // TILE_TYPE_1229 + COLLISION_DATA_0, // TILE_TYPE_1230 + COLLISION_DATA_0, // TILE_TYPE_1231 + COLLISION_DATA_0, // TILE_TYPE_1232 + COLLISION_DATA_0, // TILE_TYPE_1233 + COLLISION_DATA_0, // TILE_TYPE_1234 + COLLISION_DATA_0, // TILE_TYPE_1235 + COLLISION_DATA_20, // TILE_TYPE_1236 + COLLISION_DATA_33, // TILE_TYPE_1237 + COLLISION_DATA_39, // TILE_TYPE_1238 + COLLISION_DATA_67, // TILE_TYPE_1239 + COLLISION_DATA_4, // TILE_TYPE_1240 + COLLISION_DATA_8, // TILE_TYPE_1241 + COLLISION_DATA_12, // TILE_TYPE_1242 + COLLISION_DATA_3, // TILE_TYPE_1243 + COLLISION_DATA_3, // TILE_TYPE_1244 + COLLISION_DATA_1, // TILE_TYPE_1245 + COLLISION_DATA_2, // TILE_TYPE_1246 + COLLISION_DATA_0, // TILE_TYPE_1247 + COLLISION_DATA_12, // TILE_TYPE_1248 + COLLISION_DATA_3, // TILE_TYPE_1249 + COLLISION_DATA_2, // TILE_TYPE_1250 + COLLISION_DATA_5, // TILE_TYPE_1251 + COLLISION_DATA_10, // TILE_TYPE_1252 + COLLISION_DATA_14, // TILE_TYPE_1253 + COLLISION_DATA_13, // TILE_TYPE_1254 + COLLISION_DATA_4, // TILE_TYPE_1255 + COLLISION_DATA_8, // TILE_TYPE_1256 + COLLISION_DATA_11, // TILE_TYPE_1257 + COLLISION_DATA_7, // TILE_TYPE_1258 + COLLISION_DATA_12, // TILE_TYPE_1259 + COLLISION_DATA_0, // TILE_TYPE_1260 + COLLISION_DATA_0, // TILE_TYPE_1261 + COLLISION_DATA_39, // TILE_TYPE_1262 + COLLISION_DATA_1, // TILE_TYPE_1263 + COLLISION_DATA_2, // TILE_TYPE_1264 + COLLISION_DATA_1, // TILE_TYPE_1265 + COLLISION_DATA_2, // TILE_TYPE_1266 + COLLISION_DATA_4, // TILE_TYPE_1267 + COLLISION_DATA_12, // TILE_TYPE_1268 + COLLISION_DATA_7, // TILE_TYPE_1269 + COLLISION_DATA_11, // TILE_TYPE_1270 + COLLISION_DATA_4, // TILE_TYPE_1271 + COLLISION_DATA_8, // TILE_TYPE_1272 + COLLISION_DATA_16, // TILE_TYPE_1273 + COLLISION_DATA_17, // TILE_TYPE_1274 + COLLISION_DATA_43, // TILE_TYPE_1275 + COLLISION_DATA_43, // TILE_TYPE_1276 + COLLISION_DATA_18, // TILE_TYPE_1277 + COLLISION_DATA_19, // TILE_TYPE_1278 + COLLISION_DATA_10, // TILE_TYPE_1279 + COLLISION_DATA_5, // TILE_TYPE_1280 + COLLISION_DATA_2, // TILE_TYPE_1281 + COLLISION_DATA_1, // TILE_TYPE_1282 + COLLISION_DATA_35, // TILE_TYPE_1283 + COLLISION_DATA_1, // TILE_TYPE_1284 + COLLISION_DATA_3, // TILE_TYPE_1285 + COLLISION_DATA_2, // TILE_TYPE_1286 + COLLISION_DATA_5, // TILE_TYPE_1287 + COLLISION_DATA_10, // TILE_TYPE_1288 + COLLISION_DATA_14, // TILE_TYPE_1289 + COLLISION_DATA_13, // TILE_TYPE_1290 + COLLISION_DATA_11, // TILE_TYPE_1291 + COLLISION_DATA_7, // TILE_TYPE_1292 + COLLISION_DATA_4, // TILE_TYPE_1293 + COLLISION_DATA_8, // TILE_TYPE_1294 + COLLISION_DATA_10, // TILE_TYPE_1295 + COLLISION_DATA_5, // TILE_TYPE_1296 + COLLISION_DATA_10, // TILE_TYPE_1297 + COLLISION_DATA_5, // TILE_TYPE_1298 + COLLISION_DATA_13, // TILE_TYPE_1299 + COLLISION_DATA_14, // TILE_TYPE_1300 + COLLISION_DATA_8, // TILE_TYPE_1301 + COLLISION_DATA_4, // TILE_TYPE_1302 + COLLISION_DATA_7, // TILE_TYPE_1303 + COLLISION_DATA_11, // TILE_TYPE_1304 + COLLISION_DATA_0, // TILE_TYPE_1305 + COLLISION_DATA_9, // TILE_TYPE_1306 + COLLISION_DATA_6, // TILE_TYPE_1307 + COLLISION_DATA_0, // TILE_TYPE_1308 + COLLISION_DATA_15, // TILE_TYPE_1309 + COLLISION_DATA_7, // TILE_TYPE_1310 + COLLISION_DATA_11, // TILE_TYPE_1311 + COLLISION_DATA_3, // TILE_TYPE_1312 + COLLISION_DATA_33, // TILE_TYPE_1313 + COLLISION_DATA_33, // TILE_TYPE_1314 + COLLISION_DATA_33, // TILE_TYPE_1315 + COLLISION_DATA_33, // TILE_TYPE_1316 + COLLISION_DATA_33, // TILE_TYPE_1317 + COLLISION_DATA_33, // TILE_TYPE_1318 + COLLISION_DATA_33, // TILE_TYPE_1319 + COLLISION_DATA_15, // TILE_TYPE_1320 + COLLISION_DATA_5, // TILE_TYPE_1321 + COLLISION_DATA_10, // TILE_TYPE_1322 + COLLISION_DATA_96, // TILE_TYPE_1323 + COLLISION_DATA_0, // TILE_TYPE_1324 + COLLISION_DATA_0, // TILE_TYPE_1325 + COLLISION_DATA_0, // TILE_TYPE_1326 + COLLISION_DATA_0, // TILE_TYPE_1327 + COLLISION_DATA_0, // TILE_TYPE_1328 + COLLISION_DATA_0, // TILE_TYPE_1329 + COLLISION_DATA_0, // TILE_TYPE_1330 + COLLISION_DATA_0, // TILE_TYPE_1331 + COLLISION_DATA_0, // TILE_TYPE_1332 + COLLISION_DATA_0, // TILE_TYPE_1333 + COLLISION_DATA_0, // TILE_TYPE_1334 + COLLISION_DATA_0, // TILE_TYPE_1335 + COLLISION_DATA_0, // TILE_TYPE_1336 + COLLISION_DATA_0, // TILE_TYPE_1337 + COLLISION_DATA_0, // TILE_TYPE_1338 + COLLISION_DATA_0, // TILE_TYPE_1339 + COLLISION_DATA_0, // TILE_TYPE_1340 + COLLISION_DATA_0, // TILE_TYPE_1341 + COLLISION_DATA_0, // TILE_TYPE_1342 + COLLISION_DATA_0, // TILE_TYPE_1343 + COLLISION_DATA_48, // TILE_TYPE_1344 + COLLISION_DATA_0, // TILE_TYPE_1345 + COLLISION_DATA_3, // TILE_TYPE_1346 + COLLISION_DATA_48, // TILE_TYPE_1347 + COLLISION_DATA_48, // TILE_TYPE_1348 + COLLISION_DATA_0, // TILE_TYPE_1349 + COLLISION_DATA_0, // TILE_TYPE_1350 + COLLISION_DATA_0, // TILE_TYPE_1351 + COLLISION_DATA_0, // TILE_TYPE_1352 + COLLISION_DATA_0, // TILE_TYPE_1353 + COLLISION_DATA_0, // TILE_TYPE_1354 + COLLISION_DATA_48, // TILE_TYPE_1355 + COLLISION_DATA_48, // TILE_TYPE_1356 + COLLISION_DATA_33, // TILE_TYPE_1357 + COLLISION_DATA_33, // TILE_TYPE_1358 + COLLISION_DATA_0, // TILE_TYPE_1359 + COLLISION_DATA_15, // TILE_TYPE_1360 + COLLISION_DATA_83, // TILE_TYPE_1361 + COLLISION_DATA_92, // TILE_TYPE_1362 + COLLISION_DATA_85, // TILE_TYPE_1363 + COLLISION_DATA_90, // TILE_TYPE_1364 + COLLISION_DATA_96, // TILE_TYPE_1365 + COLLISION_DATA_97, // TILE_TYPE_1366 + COLLISION_DATA_95, // TILE_TYPE_1367 + COLLISION_DATA_18, // TILE_TYPE_1368 + COLLISION_DATA_19, // TILE_TYPE_1369 + COLLISION_DATA_16, // TILE_TYPE_1370 + COLLISION_DATA_10, // TILE_TYPE_1371 + COLLISION_DATA_10, // TILE_TYPE_1372 + COLLISION_DATA_35, // TILE_TYPE_1373 + COLLISION_DATA_10, // TILE_TYPE_1374 + COLLISION_DATA_5, // TILE_TYPE_1375 + COLLISION_DATA_14, // TILE_TYPE_1376 + COLLISION_DATA_13, // TILE_TYPE_1377 + COLLISION_DATA_11, // TILE_TYPE_1378 + COLLISION_DATA_7, // TILE_TYPE_1379 + COLLISION_DATA_10, // TILE_TYPE_1380 + COLLISION_DATA_5, // TILE_TYPE_1381 + COLLISION_DATA_14, // TILE_TYPE_1382 + COLLISION_DATA_13, // TILE_TYPE_1383 + COLLISION_DATA_11, // TILE_TYPE_1384 + COLLISION_DATA_7, // TILE_TYPE_1385 + COLLISION_DATA_0, // TILE_TYPE_1386 + COLLISION_DATA_0, // TILE_TYPE_1387 + COLLISION_DATA_3, // TILE_TYPE_1388 + COLLISION_DATA_0, // TILE_TYPE_1389 + COLLISION_DATA_39, // TILE_TYPE_1390 + COLLISION_DATA_12, // TILE_TYPE_1391 + COLLISION_DATA_12, // TILE_TYPE_1392 + COLLISION_DATA_33, // TILE_TYPE_1393 + COLLISION_DATA_0, // TILE_TYPE_1394 + COLLISION_DATA_0, // TILE_TYPE_1395 }; diff --git a/src/playerItem/playerItemCellOverwriteSet.c b/src/playerItem/playerItemCellOverwriteSet.c index cf841e9f..77680a1a 100644 --- a/src/playerItem/playerItemCellOverwriteSet.c +++ b/src/playerItem/playerItemCellOverwriteSet.c @@ -9,6 +9,7 @@ #include "entity.h" #include "player.h" #include "room.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -16,28 +17,345 @@ typedef struct { /*0x6c*/ u16 tileType; } PlayerItemCellOverwriteSetEntity; -extern const u8 gUnk_080B7910[]; -extern const u8 gUnk_080B79A7[]; -extern const u8 gUnk_080B7A3E[]; // TODO figure out type from arm_sub_080B1B84 and arm_sub_080B1BA4 +// actTile for specialTile +const u8 gMapSpecialTileToActTile[] = { + 0, // SPECIAL_TILE_0 + 0, // SPECIAL_TILE_1 + 0, // SPECIAL_TILE_2 + 0, // SPECIAL_TILE_3 + 0, // SPECIAL_TILE_4 + 0, // SPECIAL_TILE_5 + 0, // SPECIAL_TILE_6 + 0, // SPECIAL_TILE_7 + 0, // SPECIAL_TILE_8 + 0, // SPECIAL_TILE_9 + 0, // SPECIAL_TILE_10 + 0, // SPECIAL_TILE_11 + 0, // SPECIAL_TILE_12 + 0, // SPECIAL_TILE_13 + 0, // SPECIAL_TILE_14 + 0, // SPECIAL_TILE_15 + 0, // SPECIAL_TILE_16 + 0, // SPECIAL_TILE_17 + 0, // SPECIAL_TILE_18 + 0, // SPECIAL_TILE_19 + ACT_TILE_241, // SPECIAL_TILE_20 + 0, // SPECIAL_TILE_21 + 0, // SPECIAL_TILE_22 + ACT_TILE_83, // SPECIAL_TILE_23 + ACT_TILE_242, // SPECIAL_TILE_24 + ACT_TILE_243, // SPECIAL_TILE_25 + 0, // SPECIAL_TILE_26 + 0, // SPECIAL_TILE_27 + 0, // SPECIAL_TILE_28 + 0, // SPECIAL_TILE_29 + 0, // SPECIAL_TILE_30 + 0, // SPECIAL_TILE_31 + ACT_TILE_240, // SPECIAL_TILE_32 + 0, // SPECIAL_TILE_33 + 0, // SPECIAL_TILE_34 + 0, // SPECIAL_TILE_35 + 0, // SPECIAL_TILE_36 + 0, // SPECIAL_TILE_37 + 0, // SPECIAL_TILE_38 + 0, // SPECIAL_TILE_39 + 0, // SPECIAL_TILE_40 + 0, // SPECIAL_TILE_41 + 0, // SPECIAL_TILE_42 + 0, // SPECIAL_TILE_43 + 0, // SPECIAL_TILE_44 + 0, // SPECIAL_TILE_45 + 0, // SPECIAL_TILE_46 + 0, // SPECIAL_TILE_47 + 0, // SPECIAL_TILE_48 + 0, // SPECIAL_TILE_49 + 0, // SPECIAL_TILE_50 + 0, // SPECIAL_TILE_51 + 0, // SPECIAL_TILE_52 + 0, // SPECIAL_TILE_53 + 0, // SPECIAL_TILE_54 + 0, // SPECIAL_TILE_55 + 0, // SPECIAL_TILE_56 + 0, // SPECIAL_TILE_57 + 0, // SPECIAL_TILE_58 + 0, // SPECIAL_TILE_59 + 0, // SPECIAL_TILE_60 + 0, // SPECIAL_TILE_61 + 0, // SPECIAL_TILE_62 + 0, // SPECIAL_TILE_63 + ACT_TILE_61, // SPECIAL_TILE_64 + ACT_TILE_61, // SPECIAL_TILE_65 + ACT_TILE_61, // SPECIAL_TILE_66 + ACT_TILE_61, // SPECIAL_TILE_67 + ACT_TILE_61, // SPECIAL_TILE_68 + ACT_TILE_61, // SPECIAL_TILE_69 + ACT_TILE_61, // SPECIAL_TILE_70 + ACT_TILE_61, // SPECIAL_TILE_71 + ACT_TILE_61, // SPECIAL_TILE_72 + 0, // SPECIAL_TILE_73 + 0, // SPECIAL_TILE_74 + 0, // SPECIAL_TILE_75 + 0, // SPECIAL_TILE_76 + 0, // SPECIAL_TILE_77 + 0, // SPECIAL_TILE_78 + 0, // SPECIAL_TILE_79 + 0, // SPECIAL_TILE_80 + ACT_TILE_58, // SPECIAL_TILE_81 + 0, // SPECIAL_TILE_82 + 0, // SPECIAL_TILE_83 + 0, // SPECIAL_TILE_84 + 0, // SPECIAL_TILE_85 + 0, // SPECIAL_TILE_86 + 0, // SPECIAL_TILE_87 + 0, // SPECIAL_TILE_88 + 0, // SPECIAL_TILE_89 + 0, // SPECIAL_TILE_90 + 0, // SPECIAL_TILE_91 + 0, // SPECIAL_TILE_92 + 0, // SPECIAL_TILE_93 + 0, // SPECIAL_TILE_94 + 0, // SPECIAL_TILE_95 + 0, // SPECIAL_TILE_96 + 0, // SPECIAL_TILE_97 + 0, // SPECIAL_TILE_98 + 0, // SPECIAL_TILE_99 + 0, // SPECIAL_TILE_100 + 0, // SPECIAL_TILE_101 + 0, // SPECIAL_TILE_102 + 0, // SPECIAL_TILE_103 + 0, // SPECIAL_TILE_104 + ACT_TILE_40, // SPECIAL_TILE_105 + 0, // SPECIAL_TILE_106 + 0, // SPECIAL_TILE_107 + 0, // SPECIAL_TILE_108 + 0, // SPECIAL_TILE_109 + 0, // SPECIAL_TILE_110 + 0, // SPECIAL_TILE_111 + 0, // SPECIAL_TILE_112 + 0, // SPECIAL_TILE_113 + 0, // SPECIAL_TILE_114 + 0, // SPECIAL_TILE_115 + 0, // SPECIAL_TILE_116 + ACT_TILE_18, // SPECIAL_TILE_117 + ACT_TILE_18, // SPECIAL_TILE_118 + ACT_TILE_18, // SPECIAL_TILE_119 + ACT_TILE_18, // SPECIAL_TILE_120 + ACT_TILE_18, // SPECIAL_TILE_121 + ACT_TILE_18, // SPECIAL_TILE_122 + ACT_TILE_18, // SPECIAL_TILE_123 + ACT_TILE_18, // SPECIAL_TILE_124 + 0, // SPECIAL_TILE_125 + ACT_TILE_116, // SPECIAL_TILE_126 + ACT_TILE_116, // SPECIAL_TILE_127 + ACT_TILE_41, // SPECIAL_TILE_128 + 0, // SPECIAL_TILE_129 + ACT_TILE_35, // SPECIAL_TILE_130 + ACT_TILE_41, // SPECIAL_TILE_131 + ACT_TILE_41, // SPECIAL_TILE_132 + ACT_TILE_41, // SPECIAL_TILE_133 + ACT_TILE_41, // SPECIAL_TILE_134 + ACT_TILE_41, // SPECIAL_TILE_135 + ACT_TILE_41, // SPECIAL_TILE_136 + ACT_TILE_16, // SPECIAL_TILE_137 + ACT_TILE_16, // SPECIAL_TILE_138 + ACT_TILE_16, // SPECIAL_TILE_139 + ACT_TILE_16, // SPECIAL_TILE_140 + ACT_TILE_41, // SPECIAL_TILE_141 + ACT_TILE_80, // SPECIAL_TILE_142 + ACT_TILE_81, // SPECIAL_TILE_143 + 0, // SPECIAL_TILE_144 + ACT_TILE_15, // SPECIAL_TILE_145 + 0, // SPECIAL_TILE_146 + 0, // SPECIAL_TILE_147 + 0, // SPECIAL_TILE_148 + 0, // SPECIAL_TILE_149 + 0, // SPECIAL_TILE_150 +}; + +// collisionData for specialTile +const u8 gMapSpecialTileToCollisionData[] = { + COLLISION_DATA_29, // SPECIAL_TILE_0 + 0, // SPECIAL_TILE_1 + 0, // SPECIAL_TILE_2 + 0, // SPECIAL_TILE_3 + 0, // SPECIAL_TILE_4 + 0, // SPECIAL_TILE_5 + COLLISION_DATA_15, // SPECIAL_TILE_6 + 0, // SPECIAL_TILE_7 + 0, // SPECIAL_TILE_8 + 0, // SPECIAL_TILE_9 + 0, // SPECIAL_TILE_10 + COLLISION_DATA_15, // SPECIAL_TILE_11 + 0, // SPECIAL_TILE_12 + 0, // SPECIAL_TILE_13 + 0, // SPECIAL_TILE_14 + 0, // SPECIAL_TILE_15 + 0, // SPECIAL_TILE_16 + 0, // SPECIAL_TILE_17 + 0, // SPECIAL_TILE_18 + 0, // SPECIAL_TILE_19 + 0, // SPECIAL_TILE_20 + 0, // SPECIAL_TILE_21 + 0, // SPECIAL_TILE_22 + COLLISION_DATA_23, // SPECIAL_TILE_23 + COLLISION_DATA_40, // SPECIAL_TILE_24 + COLLISION_DATA_40, // SPECIAL_TILE_25 + COLLISION_DATA_40, // SPECIAL_TILE_26 + COLLISION_DATA_15, // SPECIAL_TILE_27 + 0, // SPECIAL_TILE_28 + 0, // SPECIAL_TILE_29 + 0, // SPECIAL_TILE_30 + 0, // SPECIAL_TILE_31 + COLLISION_DATA_32, // SPECIAL_TILE_32 + 0, // SPECIAL_TILE_33 + COLLISION_DATA_15, // SPECIAL_TILE_34 + COLLISION_DATA_3, // SPECIAL_TILE_35 + COLLISION_DATA_5, // SPECIAL_TILE_36 + COLLISION_DATA_10, // SPECIAL_TILE_37 + COLLISION_DATA_12, // SPECIAL_TILE_38 + COLLISION_DATA_1, // SPECIAL_TILE_39 + COLLISION_DATA_2, // SPECIAL_TILE_40 + COLLISION_DATA_4, // SPECIAL_TILE_41 + COLLISION_DATA_8, // SPECIAL_TILE_42 + COLLISION_DATA_15, // SPECIAL_TILE_43 + COLLISION_DATA_5, // SPECIAL_TILE_44 + COLLISION_DATA_10, // SPECIAL_TILE_45 + COLLISION_DATA_69, // SPECIAL_TILE_46 + COLLISION_DATA_68, // SPECIAL_TILE_47 + 0, // SPECIAL_TILE_48 + 0, // SPECIAL_TILE_49 + COLLISION_DATA_15, // SPECIAL_TILE_50 + 0, // SPECIAL_TILE_51 + 0, // SPECIAL_TILE_52 + 0, // SPECIAL_TILE_53 + COLLISION_DATA_15, // SPECIAL_TILE_54 + 0, // SPECIAL_TILE_55 + 0, // SPECIAL_TILE_56 + 0, // SPECIAL_TILE_57 + 0, // SPECIAL_TILE_58 + COLLISION_DATA_15, // SPECIAL_TILE_59 + 0, // SPECIAL_TILE_60 + 0, // SPECIAL_TILE_61 + COLLISION_DATA_15, // SPECIAL_TILE_62 + 0, // SPECIAL_TILE_63 + COLLISION_DATA_1, // SPECIAL_TILE_64 + COLLISION_DATA_3, // SPECIAL_TILE_65 + COLLISION_DATA_2, // SPECIAL_TILE_66 + COLLISION_DATA_5, // SPECIAL_TILE_67 + COLLISION_DATA_15, // SPECIAL_TILE_68 + COLLISION_DATA_10, // SPECIAL_TILE_69 + COLLISION_DATA_4, // SPECIAL_TILE_70 + COLLISION_DATA_12, // SPECIAL_TILE_71 + COLLISION_DATA_8, // SPECIAL_TILE_72 + COLLISION_DATA_71, // SPECIAL_TILE_73 + COLLISION_DATA_15, // SPECIAL_TILE_74 + 0, // SPECIAL_TILE_75 + 0, // SPECIAL_TILE_76 + 0, // SPECIAL_TILE_77 + 0, // SPECIAL_TILE_78 + 0, // SPECIAL_TILE_79 + COLLISION_DATA_15, // SPECIAL_TILE_80 + COLLISION_DATA_15, // SPECIAL_TILE_81 + COLLISION_DATA_3, // SPECIAL_TILE_82 + COLLISION_DATA_5, // SPECIAL_TILE_83 + 0, // SPECIAL_TILE_84 + COLLISION_DATA_13, // SPECIAL_TILE_85 + COLLISION_DATA_12, // SPECIAL_TILE_86 + COLLISION_DATA_11, // SPECIAL_TILE_87 + COLLISION_DATA_10, // SPECIAL_TILE_88 + 0, // SPECIAL_TILE_89 + COLLISION_DATA_15, // SPECIAL_TILE_90 + COLLISION_DATA_15, // SPECIAL_TILE_91 + COLLISION_DATA_15, // SPECIAL_TILE_92 + COLLISION_DATA_15, // SPECIAL_TILE_93 + COLLISION_DATA_15, // SPECIAL_TILE_94 + COLLISION_DATA_15, // SPECIAL_TILE_95 + COLLISION_DATA_15, // SPECIAL_TILE_96 + COLLISION_DATA_15, // SPECIAL_TILE_97 + COLLISION_DATA_80, // SPECIAL_TILE_98 + COLLISION_DATA_7, // SPECIAL_TILE_99 + COLLISION_DATA_11, // SPECIAL_TILE_100 + COLLISION_DATA_13, // SPECIAL_TILE_101 + COLLISION_DATA_14, // SPECIAL_TILE_102 + COLLISION_DATA_15, // SPECIAL_TILE_103 + COLLISION_DATA_15, // SPECIAL_TILE_104 + COLLISION_DATA_39, // SPECIAL_TILE_105 + COLLISION_DATA_15, // SPECIAL_TILE_106 + COLLISION_DATA_15, // SPECIAL_TILE_107 + COLLISION_DATA_16, // SPECIAL_TILE_108 + COLLISION_DATA_17, // SPECIAL_TILE_109 + COLLISION_DATA_18, // SPECIAL_TILE_110 + COLLISION_DATA_19, // SPECIAL_TILE_111 + 0, // SPECIAL_TILE_112 + 0, // SPECIAL_TILE_113 + COLLISION_DATA_15, // SPECIAL_TILE_114 + COLLISION_DATA_15, // SPECIAL_TILE_115 + 0, // SPECIAL_TILE_116 + COLLISION_DATA_1, // SPECIAL_TILE_117 + COLLISION_DATA_2, // SPECIAL_TILE_118 + COLLISION_DATA_3, // SPECIAL_TILE_119 + COLLISION_DATA_4, // SPECIAL_TILE_120 + COLLISION_DATA_5, // SPECIAL_TILE_121 + COLLISION_DATA_8, // SPECIAL_TILE_122 + COLLISION_DATA_10, // SPECIAL_TILE_123 + COLLISION_DATA_12, // SPECIAL_TILE_124 + COLLISION_DATA_15, // SPECIAL_TILE_125 + COLLISION_DATA_5, // SPECIAL_TILE_126 + COLLISION_DATA_12, // SPECIAL_TILE_127 + 0, // SPECIAL_TILE_128 + 0, // SPECIAL_TILE_129 + COLLISION_DATA_95, // SPECIAL_TILE_130 + COLLISION_DATA_39, // SPECIAL_TILE_131 + COLLISION_DATA_103, // SPECIAL_TILE_132 + COLLISION_DATA_104, // SPECIAL_TILE_133 + COLLISION_DATA_105, // SPECIAL_TILE_134 + COLLISION_DATA_106, // SPECIAL_TILE_135 + COLLISION_DATA_107, // SPECIAL_TILE_136 + COLLISION_DATA_49, // SPECIAL_TILE_137 + COLLISION_DATA_50, // SPECIAL_TILE_138 + COLLISION_DATA_58, // SPECIAL_TILE_139 + COLLISION_DATA_60, // SPECIAL_TILE_140 + COLLISION_DATA_35, // SPECIAL_TILE_141 + COLLISION_DATA_43, // SPECIAL_TILE_142 + COLLISION_DATA_43, // SPECIAL_TILE_143 + COLLISION_DATA_5, // SPECIAL_TILE_144 + COLLISION_DATA_34, // SPECIAL_TILE_145 + COLLISION_DATA_1, // SPECIAL_TILE_146 + COLLISION_DATA_2, // SPECIAL_TILE_147 + COLLISION_DATA_4, // SPECIAL_TILE_148 + COLLISION_DATA_8, // SPECIAL_TILE_149 + COLLISION_DATA_12, // SPECIAL_TILE_150 +}; + +const u16 gUnk_080B7A3E[] = { + 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 129, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 16, 0, 64, 0, 3, 3, 3, 3, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 34, 0, 0, 0, 0, 0, +}; // TODO no need to store this in an u16? +// TODO figure out type from arm_sub_080B1B84 and arm_sub_080B1BA4, also related to specialTiles void PlayerItemCellOverwriteSet(PlayerItemCellOverwriteSetEntity* this) { - static const s8 gUnk_080B7B6C[] = { 0x0, -0x10, 0x10, 0x0, 0x0, 0x10, -0x10, 0x0 }; + static const s8 offsetByDirection[] = { 0, -16, 16, 0, 0, 16, -16, 0 }; u32 tmp; Entity* player = &gPlayerEntity.base; if (super->action == 0) { - this->tileType = GetTileType(TILE(player->x.HALF.HI + gUnk_080B7B6C[player->animationState & 0xe], - player->y.HALF.HI + gUnk_080B7B6C[(player->animationState & 0xe) + 1]), - super->collisionLayer); + this->tileType = + GetTileTypeAtTilePos(TILE(player->x.HALF.HI + offsetByDirection[player->animationState & 0xe], + player->y.HALF.HI + offsetByDirection[(player->animationState & 0xe) + 1]), + super->collisionLayer); super->action++; } gPlayerState.mobility |= 0x80; tmp = gInput.heldKeys & R_BUTTON; if ((gInput.heldKeys & A_BUTTON) != 0) { if ((gInput.newKeys & R_BUTTON) != 0) { - this->tileType = GetTileType(TILE(player->x.HALF.HI + gUnk_080B7B6C[player->animationState & 0xe], - player->y.HALF.HI + gUnk_080B7B6C[(player->animationState & 0xe) + 1]), - super->collisionLayer); + this->tileType = + GetTileTypeAtTilePos(TILE(player->x.HALF.HI + offsetByDirection[player->animationState & 0xe], + player->y.HALF.HI + offsetByDirection[(player->animationState & 0xe) + 1]), + super->collisionLayer); } if ((gInput.heldKeys & R_BUTTON) != 0) { player->iframes = 2; @@ -64,20 +382,24 @@ void PlayerItemCellOverwriteSet(PlayerItemCellOverwriteSetEntity* this) { } } else { sub_0807B7D8(this->tileType, - TILE(player->x.HALF.HI + gUnk_080B7B6C[player->animationState & 0xe], - player->y.HALF.HI + gUnk_080B7B6C[(player->animationState & 0xe) + 1]), + TILE(player->x.HALF.HI + offsetByDirection[player->animationState & 0xe], + player->y.HALF.HI + offsetByDirection[(player->animationState & 0xe) + 1]), super->collisionLayer); gPlayerState.mobility &= ~0x80; DeleteThisEntity(); } if ((gInput.heldKeys & B_BUTTON) != 0) { - sub_0807B7D8(this->tileType, TILE(player->x.HALF.HI + gUnk_080B7B6C[0], player->y.HALF.HI + gUnk_080B7B6C[1]), + sub_0807B7D8(this->tileType, + TILE(player->x.HALF.HI + offsetByDirection[0], player->y.HALF.HI + offsetByDirection[1]), super->collisionLayer); - sub_0807B7D8(this->tileType, TILE(player->x.HALF.HI + gUnk_080B7B6C[2], player->y.HALF.HI + gUnk_080B7B6C[3]), + sub_0807B7D8(this->tileType, + TILE(player->x.HALF.HI + offsetByDirection[2], player->y.HALF.HI + offsetByDirection[3]), super->collisionLayer); - sub_0807B7D8(this->tileType, TILE(player->x.HALF.HI + gUnk_080B7B6C[4], player->y.HALF.HI + gUnk_080B7B6C[5]), + sub_0807B7D8(this->tileType, + TILE(player->x.HALF.HI + offsetByDirection[4], player->y.HALF.HI + offsetByDirection[5]), super->collisionLayer); - sub_0807B7D8(this->tileType, TILE(player->x.HALF.HI + gUnk_080B7B6C[6], player->y.HALF.HI + gUnk_080B7B6C[7]), + sub_0807B7D8(this->tileType, + TILE(player->x.HALF.HI + offsetByDirection[6], player->y.HALF.HI + offsetByDirection[7]), super->collisionLayer); } } diff --git a/src/playerItem/playerItemGustBig.c b/src/playerItem/playerItemGustBig.c index 566ef948..7281139d 100644 --- a/src/playerItem/playerItemGustBig.c +++ b/src/playerItem/playerItemGustBig.c @@ -10,6 +10,7 @@ #include "global.h" #include "player.h" #include "sound.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -25,8 +26,6 @@ extern void PlayerItemGustBig_Action1(PlayerItemGustBigEntity* this); extern void PlayerItemGustBig_Action2(PlayerItemGustBigEntity* this); extern void PlayerItemGustBig_Action3(PlayerItemGustBigEntity* this); -extern u32 ActTileToTile(u32, const u16*); - extern const u8 gUnk_08003E44[]; void PlayerItemGustBig(PlayerItemGustBigEntity* this) { @@ -53,9 +52,11 @@ static const Hitbox* const gUnk_080B3DE8[] = { &gUnk_080B3E20, &gUnk_080B3E28, }; -static const u16 gUnk_080B3DF4[] = { - 0x75, 0x1, 0x76, 0x1, 0x3ac, 0x1, 0x4050, 0x1, 0x377, 0x1, 0x378, 0x1, 0x71, 0x1, 0x72, 0x1, 0, 0, +static const KeyValuePair gUnk_080B3DF4[] = { + { TILE_TYPE_117, 1 }, { TILE_TYPE_118, 1 }, { TILE_TYPE_940, 1 }, { SPECIAL_TILE_80, 1 }, + { TILE_TYPE_887, 1 }, { TILE_TYPE_888, 1 }, { TILE_TYPE_113, 1 }, { TILE_TYPE_114, 1 }, }; +static const u16 gUnk_080B3DF4End = 0; static const Hitbox gUnk_080B3E18 = { 0, 0, { 6, 3, 3, 6 }, 6, 6 }; static const Hitbox gUnk_080B3E20 = { 0, 0, { 6, 3, 3, 6 }, 8, 8 }; @@ -171,10 +172,10 @@ void PlayerItemGustBig_Action2(PlayerItemGustBigEntity* this) { if (super->type2 == 0) { sub_0800451C(super); } - if (ActTileToTile(sub_080B1A0C(super, x, y), gUnk_080B3DF4) != 0) { + if (FindValueForKey(GetTileTypeRelativeToEntity(super, x, y), gUnk_080B3DF4)) { return; } - if (GetActTileRelative(super, x, y) == 0x74) { + if (GetActTileRelativeToEntity(super, x, y) == ACT_TILE_116) { return; } if (sub_080040D8(super, (u8*)gUnk_08003E44, super->x.HALF.HI + x, super->y.HALF.HI + y) == 0) { diff --git a/src/playerItem/playerItemHeldObject.c b/src/playerItem/playerItemHeldObject.c index f20236d4..0783cd04 100644 --- a/src/playerItem/playerItemHeldObject.c +++ b/src/playerItem/playerItemHeldObject.c @@ -10,6 +10,7 @@ #include "functions.h" #include "player.h" #include "sound.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -105,7 +106,7 @@ void PlayerItemHeldObject_SubAction2(PlayerItemHeldObjectEntity* this) { 0, -6, 6, 0, 0, 6, -6, 0, }; PlayerItemHeldObjectEntity* child; - u32 tile; + u32 data; u32 tmp; child = (PlayerItemHeldObjectEntity*)super->child; @@ -121,12 +122,12 @@ void PlayerItemHeldObject_SubAction2(PlayerItemHeldObjectEntity* this) { super->direction = super->knockbackDirection; super->knockbackDuration = 0; } - if (GetActTileRelative(super, gUnk_081320C4[super->direction >> 2], - gUnk_081320C4[(super->direction >> 2) + 1]) == 0x74) { + if (GetActTileRelativeToEntity(super, gUnk_081320C4[super->direction >> 2], + gUnk_081320C4[(super->direction >> 2) + 1]) == ACT_TILE_116) { LinearMoveUpdate(super); } else { - tile = sub_080B1B0C(super); - if ((tile != 0x24) && (tile != 0x26)) { + data = GetCollisionDataAtEntity(super); + if ((data != COLLISION_DATA_36) && (data != COLLISION_DATA_38)) { ProcessMovement10(super); } } @@ -135,27 +136,27 @@ void PlayerItemHeldObject_SubAction2(PlayerItemHeldObjectEntity* this) { (child->base).x = super->x; (child->base).y = super->y; (child->base).z = super->z; - tile = GetActTile(super); - switch (tile) { - case 0xd: - case 0x10: - case 0x11: - case 0x13: - case 0x5a: + data = GetActTileAtEntity(super); + switch (data) { + case ACT_TILE_13: + case ACT_TILE_16: + case ACT_TILE_17: + case ACT_TILE_19: + case ACT_TILE_90: if (child == this) { - switch (tile) { - case 0xd: + switch (data) { + case ACT_TILE_13: CreateFx(super, FX_FALL_DOWN, 0); break; - case 0x5a: + case ACT_TILE_90: CreateFx(super, FX_LAVA_SPLASH, 0); break; - case 0x10: - case 0x11: + case ACT_TILE_16: + case ACT_TILE_17: CreateFx(super, FX_WATER_SPLASH, 0); break; - case 0x13: + case ACT_TILE_19: CreateFx(super, FX_GREEN_SPLASH, 0); break; } diff --git a/src/playerItem/playerItemPacciCaneProjectile.c b/src/playerItem/playerItemPacciCaneProjectile.c index cb6cdfb5..251274c9 100644 --- a/src/playerItem/playerItemPacciCaneProjectile.c +++ b/src/playerItem/playerItemPacciCaneProjectile.c @@ -9,6 +9,7 @@ #include "functions.h" #include "object.h" #include "sound.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -127,7 +128,7 @@ void PlayerItemPacciCaneProjectile_Action1(PlayerItemPacciCaneProjectileEntity* } if (sub_080B1BA4(COORD_TO_TILE(super), gPlayerEntity.base.collisionLayer, 0x80) == 0) { if (sub_080040D8(super, &gUnk_08003E44, super->x.HALF.HI, super->y.HALF.HI) == 0) { - if (GetActTile(super) == 0x19) { + if (GetActTileAtEntity(super) == ACT_TILE_25) { super->action = 4; COLLISION_OFF(super); super->x.HALF.HI = (super->x.HALF.HI & 0xfff0) | 8; @@ -135,7 +136,7 @@ void PlayerItemPacciCaneProjectile_Action1(PlayerItemPacciCaneProjectileEntity* super->spritePriority.b0 = 7; this->unk_7c = GetTileIndex(COORD_TO_TILE(super), super->collisionLayer); InitializeAnimation(super, 0x14); - SetBottomTile(0x4020, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_32, COORD_TO_TILE(super), super->collisionLayer); return; } } else { @@ -170,12 +171,12 @@ void PlayerItemPacciCaneProjectile_Action4(PlayerItemPacciCaneProjectileEntity* this->unk_7c = 0; sub_08070458(this); break; - case 0x4021: + case SPECIAL_TILE_33: sub_08070458(this); break; - case 0x4070: + case SPECIAL_TILE_112: this->unk_78 = 0xff; - case 0x4020: + case SPECIAL_TILE_32: if (--(this->unk_78) == -1) { sub_08070458(this); } else { @@ -197,7 +198,7 @@ void sub_08070458(PlayerItemPacciCaneProjectileEntity* this) { COLLISION_OFF(super); super->speed = 0; if (this->unk_7c != 0) { - SetBottomTile(this->unk_7c, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); + SetTile(this->unk_7c, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); } InitializeAnimation(super, 0x13); sub_08017744(super); diff --git a/src/playerItem/playerItemSword.c b/src/playerItem/playerItemSword.c index 13d96c42..1bf1d9e7 100644 --- a/src/playerItem/playerItemSword.c +++ b/src/playerItem/playerItemSword.c @@ -10,6 +10,7 @@ #include "functions.h" #include "object.h" #include "sound.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -345,35 +346,35 @@ void sub_080A7A54(PlayerItemSwordEntity* this) { void sub_080A7A84(PlayerItemSwordEntity* this) { u32 one; Entity* effect; - s16 new_var; + s16 xOffset; s32 uVar3; - Entity* new_var2; + Entity* entity; const s8* ptr; u32 tmp; u32 tmp2; - u32 r5; + u32 yOffset; if ((gPlayerEntity.base.frame & 0xf) != 0) { uVar3 = gUnk_08129072[((gPlayerEntity.base.frame & 0xf) - 1)][0]; one = 1; - r5 = gUnk_08129072[(gPlayerEntity.base.frame & 0xf) - 1][one]; + yOffset = gUnk_08129072[(gPlayerEntity.base.frame & 0xf) - 1][one]; if (((gPlayerState.sword_state & 0xc0) == 0) && (gPlayerEntity.base.spriteSettings.flipX == 1)) { uVar3 = -uVar3; } if (super->type != 0) { - DoTileInteraction(super, 0, super->x.HALF.HI + uVar3, super->y.HALF.HI + r5); + DoTileInteraction(super, 0, super->x.HALF.HI + uVar3, super->y.HALF.HI + yOffset); } else if (super->z.WORD == 0) { if (gPlayerState.skills & SKILL_ROCK_BREAKER) { tmp2 = 1; } else { tmp2 = 0; } - new_var = uVar3; - if (((DoTileInteraction(super, tmp2, super->x.HALF.HI + new_var, super->y.HALF.HI + r5) == NULL) && + xOffset = uVar3; + if (((DoTileInteraction(super, tmp2, super->x.HALF.HI + xOffset, super->y.HALF.HI + yOffset) == NULL) && (gPlayerState.sword_state != 0)) && ((gPlayerState.sword_state & 0xc0) == 0)) { - new_var2 = super; - if (GetActTileRelative(new_var2, new_var, r5) == 0x2e) { + entity = super; + if (GetActTileRelativeToEntity(entity, xOffset, yOffset) == ACT_TILE_46) { SoundReqClipped(&gPlayerEntity.base, SFX_ITEM_GLOVES_KNOCKBACK); } else { SoundReqClipped(&gPlayerEntity.base, SFX_METAL_CLINK); @@ -381,10 +382,10 @@ void sub_080A7A84(PlayerItemSwordEntity* this) { effect = CreateObject(SPECIAL_FX, FX_LIGHTNING, 0); if (effect != NULL) { ptr = gUnk_0812908E; - effect->x.HALF.HI = new_var2->x.HALF.HI + ptr[new_var2->animationState]; - tmp = new_var2->animationState + 1; - effect->y.HALF.HI = new_var2->y.HALF.HI + ptr[tmp]; - effect->z = new_var2->z; + effect->x.HALF.HI = entity->x.HALF.HI + ptr[entity->animationState]; + tmp = entity->animationState + 1; + effect->y.HALF.HI = entity->y.HALF.HI + ptr[tmp]; + effect->z = entity->z; } } } diff --git a/src/playerUtils.c b/src/playerUtils.c index ba020870..906595f3 100644 --- a/src/playerUtils.c +++ b/src/playerUtils.c @@ -1,5 +1,6 @@ #include "area.h" #include "asm.h" +#include "beanstalkSubtask.h" #include "collision.h" #include "common.h" #include "entity.h" @@ -17,6 +18,8 @@ #include "save.h" #include "screen.h" #include "screenTransitions.h" +#include "tileMap.h" +#include "tiles.h" static void sub_08077E54(ItemBehavior* beh); @@ -26,12 +29,11 @@ extern void sub_0809D738(Entity*); extern s32 Mod(s32, s32); extern u32 sub_08003FDE(Entity*, Entity*, u32, u32); extern u32 sub_080B1B84(u32, u32); -extern void sub_08080BC4(void); +extern void UpdateScreenShake(void); void sub_080790E4(Entity* this); void sub_08079064(Entity*); extern u8 gMapData; -extern const u8 gUnk_020176E0[]; extern const u8 gUnk_0800851C[]; extern const u8 gUnk_080084BC[]; extern const u8 gUnk_0800845C[]; @@ -61,15 +63,13 @@ extern ItemBehavior* (*const gCreateItemsFuncs[])(Item); extern void UnregisterInteractTile(u32, u32); -extern const u8 gUnk_080B3E80[]; // collisionData for tileType? +extern const u8 gMapTileTypeToCollisionData[]; // collisionData for tileType? extern u8 gUpdateVisibleTiles; -extern u16 gMapDataTopSpecial[]; -extern u16 gMapDataBottomSpecial[]; bool32 sub_0807BF88(u32, u32, RoomResInfo*); -void sub_0807BFD0(void); +void LoadRoomTileSet(void); void ForceSetPlayerState(u32 framestate); InteractableObject* sub_080784E4(void); @@ -77,7 +77,7 @@ InteractableObject* sub_080784E4(void); u32 sub_08079778(void); u32 GetPlayerTilePos(void); -extern const u16 gUnk_08007CAC[]; +extern const KeyValuePair gMapActTileToSurfaceType[]; u32 sub_0807BEEC(u32 param_1, u32 param_2, u32 param_3); @@ -105,46 +105,40 @@ extern const u16* sub_0806FC50(u32 param_1, u32 param_2); bool32 sub_08079F48(u32 param_1, u32 param_2); -extern void sub_08080B60(LayerStruct*); -extern void sub_0801AB08(u16*, LayerStruct*); +extern void FillActTileForLayer(MapLayer* mapLayer); -extern u8 gUnk_02006F00[]; extern u16 gUnk_080B77C0[]; void sub_0807BFA8(void); -void sub_080197D4(const void*); void sub_0807C8B0(u16*, u32, u32); void sub_0807C69C(u8*, u32, u32); void sub_0807C460(void); void sub_0807BBE4(void); -void sub_0807BC84(void); +void CreateCollisionDataBorderAroundRoom(void); void sub_0807C5F4(u16*, u16*); void sub_0807C5B0(void); -// collisions for metatiles < 0x4000 -extern const u8 gUnk_080B3E80[]; +// collisions for tiles < 0x4000 +extern const u8 gMapTileTypeToCollisionData[]; // collisions for tiles > 0x4000 -extern const u8 gUnk_080B79A7[]; +extern const u8 gMapSpecialTileToCollisionData[]; -extern void sub_0801AB08(u16*, LayerStruct*); - -extern u8 gUnk_02006F00[]; extern u16 gUnk_080B77C0[]; void sub_0807BFA8(void); -void sub_080197D4(const void*); void sub_0807C8B0(u16*, u32, u32); void sub_0807C69C(u8*, u32, u32); void sub_0807C460(void); void sub_0807BBE4(void); -void sub_0807BC84(void); +void CreateCollisionDataBorderAroundRoom(void); void sub_0807C5F4(u16*, u16*); void sub_0807C5B0(void); extern u8 gUnk_080082DC[]; extern u32 sub_08004202(Entity*, u8*, u32); -extern u32 gUnk_02022830[]; +// This just reuses the first 12 bytes of gUnk_02022830 to store a MapDataDefinition there temporarily. +extern MapDataDefinition gUnk_02022830; extern u16* gUnk_0800823C[]; extern bool32 sub_0806FC24(u32, u32); @@ -161,7 +155,6 @@ u32 sub_0807A180(Entity*, Entity*, u32, u32); extern u32 gUsedPalettes; extern void ClearBgAnimations(void); -extern void sub_080197D4(const void*); extern void LoadBgAnimations(u16*); void sub_0807BFA8(void); @@ -229,7 +222,7 @@ bool32 IsPreventedFromUsingItem(void) { } return FALSE; default: - if ((((gUnk_0200AF00.rActionInteractObject == R_ACTION_ROLL) && (gPlayerState.gustJarState == 0)) && + if ((((gHUD.rActionInteractObject == R_ACTION_ROLL) && (gPlayerState.gustJarState == 0)) && (gPlayerState.floor_type != SURFACE_SWAMP)) && ((((gPlayerState.playerInput.heldInput & INPUT_ANY_DIRECTION) != 0 && ((gPlayerState.flags & (PL_BURNING | PL_ROLLING)) == 0)) && @@ -756,7 +749,7 @@ void SurfaceAction_AutoLadder(Entity*); void SurfaceAction_ClimbWall(Entity*); void SurfaceAction_2C(Entity*); -void (*const gUnk_0811C120[])(Entity*) = { +void (*const gSurfaceActions[])(Entity*) = { SurfaceAction_DoNothing, SurfaceAction_Pit, NULL, @@ -805,37 +798,47 @@ void (*const gUnk_0811C120[])(Entity*) = { SurfaceAction_Dust, }; -const u16 gUnk_0811C240[]; -const u16 gUnk_0811C24A[]; -const u16 gUnk_0811C254[]; -const u16 gUnk_0811C25E[]; -const u16 gUnk_0811C1F8[]; -const u16 gUnk_0811C20A[]; -const u16 gUnk_0811C21C[]; -const u16 gUnk_0811C22E[]; +const KeyValuePair gUnk_0811C240[]; +const KeyValuePair gUnk_0811C24A[]; +const KeyValuePair gUnk_0811C254[]; +const KeyValuePair gUnk_0811C25E[]; +const KeyValuePair gUnk_0811C1F8[]; +const KeyValuePair gUnk_0811C20A[]; +const KeyValuePair gUnk_0811C21C[]; +const KeyValuePair gUnk_0811C22E[]; -const u16* const gUnk_0811C1D8[] = { +const KeyValuePair* const gUnk_0811C1D8[] = { gUnk_0811C240, gUnk_0811C24A, gUnk_0811C254, gUnk_0811C25E, }; -const u16* const gUnk_0811C1E8[] = { +const KeyValuePair* const gUnk_0811C1E8[] = { gUnk_0811C1F8, gUnk_0811C20A, gUnk_0811C21C, gUnk_0811C22E, }; -const u16 gUnk_0811C1F8[] = { 43, 1, 65, 1, 78, 8, 76, 2, 0 }; -const u16 gUnk_0811C20A[] = { 44, 3, 66, 3, 76, 2, 77, 4, 0 }; -const u16 gUnk_0811C21C[] = { 42, 5, 64, 5, 79, 6, 77, 4, 0 }; -const u16 gUnk_0811C22E[] = { 45, 7, 67, 7, 78, 8, 79, 6, 0 }; -const u16 gUnk_0811C240[] = { 42, 1, 38, 1, 0 }; -const u16 gUnk_0811C24A[] = { 45, 1, 39, 1, 0 }; -const u16 gUnk_0811C254[] = { 43, 1, 38, 1, 0 }; -const u16 gUnk_0811C25E[] = { 44, 1, 39, 1, 0 }; -const u16 gUnk_0811C268[] = { 16, 1, 90, 1, 17, 1, 19, 1, 0, 0 }; +const KeyValuePair gUnk_0811C1F8[] = { { 43, 1 }, { 65, 1 }, { 78, 8 }, { 76, 2 } }; +const u16 gUnk_0811C1F8End = 0; +const KeyValuePair gUnk_0811C20A[] = { { 44, 3 }, { 66, 3 }, { 76, 2 }, { 77, 4 } }; +const u16 gUnk_0811C20AEnd = 0; +const KeyValuePair gUnk_0811C21C[] = { { 42, 5 }, { 64, 5 }, { 79, 6 }, { 77, 4 } }; +const u16 gUnk_0811C21CEnd = 0; +const KeyValuePair gUnk_0811C22E[] = { { 45, 7 }, { 67, 7 }, { 78, 8 }, { 79, 6 } }; +const u16 gUnk_0811C22EEnd = 0; +const KeyValuePair gUnk_0811C240[] = { { 42, 1 }, { 38, 1 } }; +const u16 gUnk_0811C240End = 0; +const KeyValuePair gUnk_0811C24A[] = { { 45, 1 }, { 39, 1 } }; +const u16 gUnk_0811C24AEnd = 0; +const KeyValuePair gUnk_0811C254[] = { { 43, 1 }, { 38, 1 } }; +const u16 gUnk_0811C254End = 0; +const KeyValuePair gUnk_0811C25E[] = { { 44, 1 }, { 39, 1 } }; +const u16 gUnk_0811C25EEnd = 0; +const KeyValuePair gUnk_0811C268[] = { { ACT_TILE_16, 1 }, { ACT_TILE_90, 1 }, { ACT_TILE_17, 1 }, { ACT_TILE_19, 1 } }; +const u16 gUnk_0811C268EEnd = 0; + void sub_0807B114(PlayerEntity*); void sub_0807B128(PlayerEntity*); void (*const gUnk_0811C27C[])(PlayerEntity*) = { @@ -872,14 +875,32 @@ const u16 gUnk_0811C2EC[] = { 748, 10, 1, 749, 6, 1, 750, 12, 1, 751, 2, 1, 752, 8, 1, 753, 4, 1, 0, }; const s16 gUnk_0811C456[] = { 0, -13, 13, 0, 0, 16, -13, 0 }; -const u16 gUnk_0811C466[] = { 803, 819, 822, 825, 820, 828, 826, 829, 821, 823, 831, 830, 824, 827, 832, 53, 0 }; +const u16 gUnk_0811C466[] = { TILE_TYPE_803, + TILE_TYPE_819, + TILE_TYPE_822, + TILE_TYPE_825, + TILE_TYPE_820, + TILE_TYPE_828, + TILE_TYPE_826, + TILE_TYPE_829, + TILE_TYPE_821, + TILE_TYPE_823, + TILE_TYPE_831, + TILE_TYPE_830, + TILE_TYPE_824, + TILE_TYPE_827, + TILE_TYPE_832, + TILE_TYPE_53, + 0 }; void sub_08077F84(void) { Entity* obj; if ((gPlayerEntity.base.collisionLayer & 2) == 0) { - u32 tile = GetTileTypeByPos(gPlayerEntity.base.x.HALF.HI, gPlayerEntity.base.y.HALF.HI - 12, 2); - if (tile == 0x343 || tile == 0x344 || tile == 0x345 || tile == 0x346) { + u32 tileType = + GetTileTypeAtWorldCoords(gPlayerEntity.base.x.HALF.HI, gPlayerEntity.base.y.HALF.HI - 12, LAYER_TOP); + if (tileType == TILE_TYPE_835 || tileType == TILE_TYPE_836 || tileType == TILE_TYPE_837 || + tileType == TILE_TYPE_838) { sub_0807AA80(&gPlayerEntity.base); gPlayerState.jump_status |= 8; obj = CreateObject(ROTATING_TRAPDOOR, 0, 0); @@ -993,21 +1014,21 @@ void DetermineRButtonInteraction(void) { u8 rAction; InteractableObject* interaction; - if (gUnk_0200AF00.rActionPlayerState != R_ACTION_NONE) + if (gHUD.rActionPlayerState != R_ACTION_NONE) return; rAction = R_ACTION_NONE; if ((gPlayerState.jump_status == 0) && ((gPlayerState.flags & (PL_IN_HOLE | PL_FROZEN | PL_BURNING | PL_DISABLE_ITEMS | PL_DRUGGED)) == 0)) { if ((u8)(gPlayerState.heldObject - 1) < 4) { - if (gUnk_0200AF00.rActionGrabbing != R_ACTION_NONE) { - rAction = gUnk_0200AF00.rActionGrabbing; + if (gHUD.rActionGrabbing != R_ACTION_NONE) { + rAction = gHUD.rActionGrabbing; } else { rAction = R_ACTION_THROW; } } else { - if (gUnk_0200AF00.rActionInteractTile != R_ACTION_NONE) { - rAction = gUnk_0200AF00.rActionInteractTile; + if (gHUD.rActionInteractTile != R_ACTION_NONE) { + rAction = gHUD.rActionInteractTile; } else { interaction = sub_080784E4(); if (interaction->entity->interactType == INTERACTION_NONE) { @@ -1057,7 +1078,7 @@ void DetermineRButtonInteraction(void) { } } } - gUnk_0200AF00.rActionInteractObject = rAction; + gHUD.rActionInteractObject = rAction; } bool32 sub_080782C0(void) { @@ -1433,7 +1454,7 @@ u32 sub_080789A8(void) { return (u32)gCarriedEntity.unk_1; if (!(gPlayerState.flags & PL_MINISH)) { - uVar4 = sub_080B1B0C(&gPlayerEntity.base); + uVar4 = GetCollisionDataAtEntity(&gPlayerEntity.base); if (uVar4 >= 0x10 && (gUnk_080084BC[uVar4 - 0x10] == 0xf)) return 0; if (gPlayerState.floor_type == 0x12) @@ -1457,7 +1478,7 @@ u32 sub_080789A8(void) { } ptr = &gUnk_08007DF4[gPlayerEntity.base.animationState & 6]; - gCarriedEntity.unk_4 = uVar2 = sub_080B1A0C(&gPlayerEntity.base, (s8)ptr[0], (s8)ptr[1]); + gCarriedEntity.unk_4 = uVar2 = GetTileTypeRelativeToEntity(&gPlayerEntity.base, (s8)ptr[0], (s8)ptr[1]); if (!sub_0806FC24(uVar2, 6)) return 0; @@ -1554,7 +1575,7 @@ void ClearPlayerState(void) { gPlayerState.field_0x1f[0] = 0; gPlayerState.field_0x1f[1] = 0; gPlayerState.bow_state = 0; - gPlayerState.tilePosition = 0; + gPlayerState.tilePos = 0; gPlayerState.tileType = 0; gPlayerState.swim_state = 0; gPlayerState.item = NULL; @@ -1696,7 +1717,7 @@ void ResetPlayerVelocity(void) { bool32 sub_08078F74(Entity* this) { if ((gArea.portal_mode == 3) && (gPlayerState.field_0x35 != 0xff)) { gPlayerState.jump_status = 0x81; - this->action = 0x15; + this->action = PLAYER_USEPORTAL; this->subAction = 0; this->zVelocity = Q_16_16(2.0); return TRUE; @@ -1949,7 +1970,8 @@ void RespawnPlayer(void) { } else { u32 i; for (i = 0; i <= 0xf && gPlayerState.path_memory[i] != -1; i++) { - if (sub_080B1B44((u16)gPlayerState.path_memory[i], gPlayerState.path_memory[i] >> 0x1e) != 0xf) { + if (GetCollisionDataAtTilePos((u16)gPlayerState.path_memory[i], gPlayerState.path_memory[i] >> 0x1e) != + COLLISION_DATA_15) { gPlayerEntity.base.collisionLayer = gPlayerState.path_memory[i] >> 0x1e; gPlayerEntity.base.x.HALF.HI = gRoomControls.origin_x + (gPlayerState.path_memory[i] & 0x3f) * 16 + 8; @@ -2003,11 +2025,11 @@ bool32 sub_08079550(void) { tilePos2 = COORD_TO_TILE_OFFSET(&gPlayerEntity.base, (gPlayerEntity.base.hitbox)->unk2[2], -ptr[1]); } - uVar3 = sub_080B1AE0(tilePos1, gPlayerEntity.base.collisionLayer); - uVar3 = ActTileToTile(uVar3, gUnk_0811C1E8[gPlayerEntity.base.animationState >> 1]); + uVar3 = GetActTileAtTilePos(tilePos1, gPlayerEntity.base.collisionLayer); + uVar3 = FindValueForKey(uVar3, gUnk_0811C1E8[gPlayerEntity.base.animationState >> 1]); if (uVar3 != 0) { - uVar3 = sub_080B1AE0(tilePos2, gPlayerEntity.base.collisionLayer); - uVar3 = ActTileToTile(uVar3, gUnk_0811C1E8[gPlayerEntity.base.animationState >> 1]); + uVar3 = GetActTileAtTilePos(tilePos2, gPlayerEntity.base.collisionLayer); + uVar3 = FindValueForKey(uVar3, gUnk_0811C1E8[gPlayerEntity.base.animationState >> 1]); if (uVar3 != 0) { gPlayerState.pushedObject |= 0x80; if (gPlayerState.dash_state == 0 && (++gPlayerEntity.base.subtimer <= 5)) { @@ -2015,7 +2037,7 @@ bool32 sub_08079550(void) { } gPlayerEntity.base.animationState = uVar3 - 1; - gPlayerEntity.base.action = 4; + gPlayerEntity.base.action = PLAYER_JUMP; gPlayerEntity.base.subAction = 0; COLLISION_OFF(&gPlayerEntity.base); gPlayerState.jump_status = 0x81; @@ -2099,7 +2121,8 @@ void sub_080797EC(void) { } else { animation = ANIM_SWORD_CHARGE_WALK; if (sub_080793E4(0)) { - if (sub_080B1B44(GetPlayerTilePos(), gPlayerEntity.base.collisionLayer) != 0xff) { + if (GetCollisionDataAtTilePos(GetPlayerTilePos(), gPlayerEntity.base.collisionLayer) != + COLLISION_DATA_255) { gPlayerState.sword_state &= ~8; animation = ANIM_SWORD_CHARGE_BUMP; } @@ -2133,7 +2156,8 @@ void sub_080797EC(void) { } else if (gPlayerState.sword_state) { animation = ANIM_SWORD_CHARGE_WALK; if (sub_080793E4(0)) { - if (sub_080B1B44(GetPlayerTilePos(), (u32)gPlayerEntity.base.collisionLayer) != 0xff) { + if (GetCollisionDataAtTilePos(GetPlayerTilePos(), (u32)gPlayerEntity.base.collisionLayer) != + COLLISION_DATA_255) { gPlayerState.sword_state &= ~8; animation = ANIM_SWORD_CHARGE_BUMP; } @@ -2317,7 +2341,7 @@ void sub_08079BD8(Entity* this) { this->spritePriority.b0 = gPlayerEntity.base.spritePriority.b0; } -bool32 sub_08079C30(Entity* param_1) { +bool32 sub_08079C30(Entity* player) { if (gPlayerState.field_0x14 == 0 && (gPlayerState.flags & PL_FLAGS2) == 0) { if ((gPlayerState.flags & PL_MINISH) != 0) { return TRUE; @@ -2333,13 +2357,16 @@ bool32 sub_08079C30(Entity* param_1) { return TRUE; } - if (gPlayerState.floor_type != ActTileToTile(GetActTileRelative(param_1, 0, -1), (u16*)gUnk_08007CAC)) + if (gPlayerState.floor_type != + FindValueForKey(GetActTileRelativeToEntity(player, 0, -1), gMapActTileToSurfaceType)) return FALSE; - if (gPlayerState.floor_type != ActTileToTile(GetActTileRelative(param_1, 2, 0), (u16*)gUnk_08007CAC)) + if (gPlayerState.floor_type != + FindValueForKey(GetActTileRelativeToEntity(player, 2, 0), gMapActTileToSurfaceType)) return FALSE; - if (gPlayerState.floor_type == ActTileToTile(GetActTileRelative(param_1, -2, 0), (u16*)gUnk_08007CAC)) { + if (gPlayerState.floor_type == + FindValueForKey(GetActTileRelativeToEntity(player, -2, 0), gMapActTileToSurfaceType)) { return TRUE; } } @@ -2351,7 +2378,7 @@ bool32 sub_08079D48(void) { return TRUE; } else { if (!PlayerCheckNEastTile()) { - if (!ActTileToTile((u16)GetActTile(&gPlayerEntity.base), gUnk_0811C268)) { + if (!FindValueForKey((u16)GetActTileAtEntity(&gPlayerEntity.base), gUnk_0811C268)) { return TRUE; } } @@ -2402,7 +2429,7 @@ void sub_08079E58(s32 speed, u32 direction) { sub_0807A5B8(direction); } -bool32 sub_08079E90(u32 param_1) { +bool32 sub_08079E90(u32 direction) { s16 tmp1; s16 tmp2; @@ -2421,24 +2448,24 @@ bool32 sub_08079E90(u32 param_1) { tmp1 = -gPlayerEntity.base.hitbox->unk2[3]; } } - if (!sub_08079F48(param_1, sub_080B1AF0(&gPlayerEntity.base, tmp2, tmp1))) { + if (!sub_08079F48(direction, GetCollisionDataRelativeTo(&gPlayerEntity.base, tmp2, tmp1))) { if ((gPlayerEntity.base.direction & DirectionSouth) != 0) { tmp1 = -tmp1; } else { tmp2 = -tmp2; } - if (!sub_08079F48(param_1, sub_080B1AF0(&gPlayerEntity.base, tmp2, tmp1))) { + if (!sub_08079F48(direction, GetCollisionDataRelativeTo(&gPlayerEntity.base, tmp2, tmp1))) { return FALSE; } } return TRUE; } -bool32 sub_08079F48(u32 param_1, u32 param_2) { - if (gUnk_0811C118[param_1 >> 2] == param_2) { +bool32 sub_08079F48(u32 direction, u32 collisionData) { + if (gUnk_0811C118[direction >> 2] == collisionData) { gPlayerEntity.base.direction = (gPlayerEntity.base.direction + 4) & 0x1f; } else { - if (gUnk_0811C118[(param_1 >> 2) + 1] != param_2) { + if (gUnk_0811C118[(direction >> 2) + 1] != collisionData) { return FALSE; } gPlayerEntity.base.direction = (gPlayerEntity.base.direction - 4) & 0x1f; @@ -2464,13 +2491,13 @@ u32 sub_08079FC4(u32 param_1) { } u32 sub_08079FD4(Entity* this, u32 param_2) { - u32 tilePosition; + u32 tilePos; u8* collisionData; u32 collision; u32 index; u8 auStack20[4]; - tilePosition = COORD_TO_TILE(this) * 2; + tilePos = COORD_TO_TILE(this) * 2; collisionData = gMapBottom.collisionData; if (param_2 == 2) { collisionData = gMapTop.collisionData; @@ -2479,8 +2506,8 @@ u32 sub_08079FD4(Entity* this, u32 param_2) { while (TRUE) { do { index++; - tilePosition = sub_08004202(this, auStack20, tilePosition); - collision = collisionData[tilePosition / 2]; + tilePos = sub_08004202(this, auStack20, tilePos); + collision = collisionData[tilePos / 2]; if (collision < 0xf) { return index; } @@ -2567,17 +2594,18 @@ u32 sub_0807A180(Entity* param_1, Entity* param_2, u32 param_3, u32 param_4) { void UpdateFloorType(void) { gPlayerState.floor_type = GetSurfaceCalcType(&gPlayerEntity.base, 0, 0); - gUnk_0811C120[gPlayerState.floor_type](&gPlayerEntity.base); + gSurfaceActions[gPlayerState.floor_type](&gPlayerEntity.base); } SurfaceType GetSurfaceCalcType(Entity* param_1, s32 x, s32 y) { u32 position = TILE(param_1->x.HALF.HI + (u32)x, param_1->y.HALF.HI + y); - u32 tileType = GetTileTypeByPos(param_1->x.HALF.HI + x, param_1->y.HALF.HI + y, gPlayerEntity.base.collisionLayer); + u32 tileType = + GetTileTypeAtWorldCoords(param_1->x.HALF.HI + x, param_1->y.HALF.HI + y, gPlayerEntity.base.collisionLayer); if (tileType != gPlayerState.tileType) { gPlayerState.surfaceTimer = 0; } - if ((tileType != gPlayerState.tileType) || (position != gPlayerState.tilePosition)) { - gPlayerState.tilePosition = position; + if ((tileType != gPlayerState.tileType) || (position != gPlayerState.tilePos)) { + gPlayerState.tilePos = position; gPlayerState.tileType = tileType; gPlayerState.surfacePositionSameTimer = 0; } @@ -2589,8 +2617,8 @@ SurfaceType GetSurfaceCalcType(Entity* param_1, s32 x, s32 y) { gPlayerState.surfaceTimer++; } gPlayerState.floor_type_last = gPlayerState.floor_type; - tileType = GetActTileRelative(param_1, x, y); - return ActTileToTile(tileType, (u16*)gUnk_08007CAC); + tileType = GetActTileRelativeToEntity(param_1, x, y); // tileType is a actTile here + return FindValueForKey(tileType, gMapActTileToSurfaceType); } void EnablePlayerDraw(Entity* this) { @@ -2633,9 +2661,9 @@ u32 sub_0807A2F8(u32 param_1) { for (uVar5 = 0; uVar5 < 2; uVar5++) { iVar4 = 0; uVar2 = sub_08004202(&gPlayerEntity.base, auStack36, uVar2); - if (sub_080B1B44(uVar2 >> 1, 1)) { - if (!ActTileToTile((u16)sub_080B1AE0((u16)(uVar2 >> 1), gPlayerEntity.base.collisionLayer), - gUnk_0811C1D8[gPlayerEntity.base.animationState >> 1])) { + if (GetCollisionDataAtTilePos(uVar2 >> 1, LAYER_BOTTOM)) { + if (!FindValueForKey((u16)GetActTileAtTilePos((u16)(uVar2 >> 1), gPlayerEntity.base.collisionLayer), + gUnk_0811C1D8[gPlayerEntity.base.animationState >> 1])) { break; } } else { @@ -2643,9 +2671,9 @@ u32 sub_0807A2F8(u32 param_1) { } uVar1 = sub_08004202(&gPlayerEntity.base, auStack36, uVar1); - if (sub_080B1B44(uVar1 >> 1, 1)) { - if (!ActTileToTile((u16)sub_080B1AE0((uVar1 >> 1), gPlayerEntity.base.collisionLayer), - gUnk_0811C1D8[gPlayerEntity.base.animationState >> 1])) { + if (GetCollisionDataAtTilePos(uVar1 >> 1, LAYER_BOTTOM)) { + if (!FindValueForKey((u16)GetActTileAtTilePos((uVar1 >> 1), gPlayerEntity.base.collisionLayer), + gUnk_0811C1D8[gPlayerEntity.base.animationState >> 1])) { break; } } else { @@ -2662,9 +2690,9 @@ u32 sub_0807A2F8(u32 param_1) { if (uVar5 != 0) { if (AreaIsDungeon()) { uVar2 = sub_08004202(&gPlayerEntity.base, auStack36, uVar2); - if (!sub_080B1B44(uVar2 >> 1, 2)) { + if (!GetCollisionDataAtTilePos(uVar2 >> 1, LAYER_TOP)) { uVar1 = sub_08004202(&gPlayerEntity.base, auStack36, uVar1); - if (sub_080B1B44(uVar1 >> 1, 2)) { + if (GetCollisionDataAtTilePos(uVar1 >> 1, LAYER_TOP)) { return 0; } } else { @@ -2674,11 +2702,11 @@ u32 sub_0807A2F8(u32 param_1) { if (uVar5 == 2) { uVar2 = sub_08004202(&gPlayerEntity.base, auStack36, uVar2); } - if (sub_080B1B44(uVar2 >> 1, 1) == 0) { + if (GetCollisionDataAtTilePos(uVar2 >> 1, LAYER_BOTTOM) == 0) { if (uVar5 == 2) { uVar1 = sub_08004202(&gPlayerEntity.base, auStack36, uVar1); } - if (sub_080B1B44(uVar1 >> 1, 1)) { + if (GetCollisionDataAtTilePos(uVar1 >> 1, LAYER_BOTTOM)) { return 0; } } else { @@ -2776,7 +2804,8 @@ void sub_0807A750(u32 param_1, u32 param_2, const u8* param_3, u32 param_4) { index = param_1 % 16; } if ((index != 0) && (index != 0xf)) { - uVar2 = sub_080B1B44((param_1 >> 4 & 0x3f) | (param_2 >> 4 & 0x3f) << 6, gPlayerEntity.base.collisionLayer); + uVar2 = GetCollisionDataAtTilePos((param_1 >> 4 & 0x3f) | (param_2 >> 4 & 0x3f) << 6, + gPlayerEntity.base.collisionLayer); if (uVar2 > 0xf) { if (uVar2 != 0xff) { uVar2 = param_3[uVar2 - 0x10]; @@ -2833,7 +2862,7 @@ void sub_0807A750(u32 param_1, u32 param_2, const u8* param_3, u32 param_4) { } } -u32 GetCollisionTileInFront(Entity* this) { +u32 GetActTileInFront(Entity* this) { s32 x; s32 y; switch (this->direction) { @@ -2858,7 +2887,7 @@ u32 GetCollisionTileInFront(Entity* this) { x = 0; break; } - return GetActTileRelative(this, x, y); + return GetActTileRelativeToEntity(this, x, y); } void nullsub_505(void) { @@ -2925,10 +2954,11 @@ void sub_0807AAF8(Entity* this, u32 tilePos) { } } +// TODO some sort of flame spreading? void sub_0807AB44(Entity* this, s32 xOffset, s32 yOffset) { Entity* object; const u16* ptr = - sub_0806FC50(GetTileType(COORD_TO_TILE_OFFSET(this, -xOffset, -yOffset), this->collisionLayer), 0xb); + sub_0806FC50(GetTileTypeAtTilePos(COORD_TO_TILE_OFFSET(this, -xOffset, -yOffset), this->collisionLayer), 0xb); if (ptr != NULL) { if (ptr[3] == 0x76) { object = CreateObject(FLAME, 1, 0); @@ -2942,7 +2972,7 @@ void sub_0807AB44(Entity* this, s32 xOffset, s32 yOffset) { if (object != NULL) { PositionRelative(this, object, xOffset << 0x10, yOffset << 0x10); object->child = (Entity*)ptr; - SetBottomTile(0x404f, COORD_TO_TILE(object), object->collisionLayer); + SetTile(SPECIAL_TILE_79, COORD_TO_TILE(object), object->collisionLayer); } } } @@ -2958,7 +2988,7 @@ bool32 sub_0807AC54(Entity* this) { this->x.HALF.HI = (this->x.HALF.HI & 0xfff0) | 8; // fallthrough case SURFACE_CLIMB_WALL: - this->action = 0x1d; + this->action = PLAYER_CLIMB; this->subAction = 0; this->y.HALF.LO = 0; gPlayerState.animation = ANIM_CLIMB1_UP; @@ -2967,7 +2997,7 @@ bool32 sub_0807AC54(Entity* this) { this->x.HALF.HI = (this->x.HALF.HI & 0xfff0) | 8; // fallthrough case SURFACE_2C: - this->action = 0x1d; + this->action = PLAYER_CLIMB; this->subAction = 1; this->y.HALF.LO = 0; return TRUE; @@ -3034,7 +3064,8 @@ bool32 ToggleDiving(Entity* this) { } void PlayerUpdateSwimming(Entity* this) { - if ((((this->action != 0x17) || (gPlayerState.field_0xa == 0)) && (gRoomControls.reload_flags == 0)) && + if ((((this->action != PLAYER_ROOMTRANSITION) || (gPlayerState.field_0xa == 0)) && + (gRoomControls.reload_flags == 0)) && ((gPlayerState.playerInput.newInput & INPUT_INTERACT) != 0)) { if (GetInventoryValue(ITEM_SWIM_BUTTERFLY) == 1) { this->speed = 0x1c0; @@ -3256,59 +3287,63 @@ void sub_0807B2F8(PlayerEntity* this) { } } -void SetTileType(u32 tileType, u32 position, u32 layer) { +// tileType < 0x800 : set the TileType +// tileType >= 0x4000 : call SetTile directly +// else : restore the previous tile entity +void SetTileType(u32 tileType, u32 tilePos, u32 layer) { u8 collisionData; - u16 metatile; - LayerStruct* data; - u16* src; + u16 tileIndex; + MapLayer* mapLayer; + u16* subTiles; u16* dest; if (tileType < 0x800) { - UnregisterInteractTile(position, layer); - data = GetTileBuffer(layer); - metatile = data->unkData2[tileType]; - data->mapData[position] = metatile; - collisionData = gUnk_080B3E80[tileType]; - data->collisionData[position] = collisionData; + UnregisterInteractTile(tilePos, layer); + mapLayer = GetLayerByIndex(layer); + tileIndex = mapLayer->tileIndices[tileType]; + mapLayer->mapData[tilePos] = tileIndex; + collisionData = gMapTileTypeToCollisionData[tileType]; + mapLayer->collisionData[tilePos] = collisionData; if ((gRoomControls.scroll_flags & 2) != 0) { - gMapBottom.collisionData[position] = collisionData; + gMapBottom.collisionData[tilePos] = collisionData; } - data->unkData3[position] = gUnk_080B37A0[tileType]; + mapLayer->actTiles[tilePos] = gMapTileTypeToActTile[tileType]; if ((gRoomControls.scroll_flags & 1) == 0) { - u32 offset = (position & 0x3f) * 2 + (position & 0xfc0) * 4; + u32 offset = (tilePos & 0x3f) * 2 + (tilePos & 0xfc0) * 4; if (layer != 2) { dest = gMapDataBottomSpecial + offset; } else { dest = gMapDataTopSpecial + offset; } - src = data->metatiles + metatile * 4; - *dest = *src; - dest[1] = src[1]; - dest[0x80] = src[2]; - dest[0x81] = src[3]; + subTiles = mapLayer->subTiles + tileIndex * 4; + // Copy over the tileMap entries (tile_attrs) to the special map data but in a different order. + dest[0] = subTiles[0]; + dest[1] = subTiles[1]; + dest[0x80] = subTiles[2]; + dest[0x81] = subTiles[3]; if (gRoomControls.reload_flags != 1) { gUpdateVisibleTiles = 1; } } } else if (tileType >= 0x4000) { // The tile type actually directly is a tileIndex - SetBottomTile(tileType, position, layer); + SetTile(tileType, tilePos, layer); } else { - RestorePrevTileEntity(position, layer); + RestorePrevTileEntity(tilePos, layer); } } -bool32 sub_0807B434(u32 position, u32 layer) { - switch (GetTileType(position, layer)) { - case 0x36: - case 0x37: +bool32 sub_0807B434(u32 tilePos, u32 layer) { + switch (GetTileTypeAtTilePos(tilePos, layer)) { + case TILE_TYPE_54: + case TILE_TYPE_55: return FALSE; default: - return sub_080B1AE0(position, layer) != 0xd; + return GetActTileAtTilePos(tilePos, layer) != ACT_TILE_13; } } -bool32 sub_0807B464(u32 param_1, u32 param_2) { - return sub_080B1AE0(param_1, param_2) == 0x56; +bool32 sub_0807B464(u32 tilePos, u32 layer) { + return GetActTileAtTilePos(tilePos, layer) == ACT_TILE_86; } void sub_0807B480(u32 tilePos, u32 param_2) { @@ -3318,18 +3353,18 @@ void sub_0807B480(u32 tilePos, u32 param_2) { u16 tileType; const u16* ptr; - if (sub_0807B464(tilePos, 2)) { - tmp1 = sub_0807B464(tilePos - 0x40, 2); - tmp1 |= sub_0807B464(tilePos + 1, 2) << 1; - tmp1 |= sub_0807B464(tilePos + 0x40, 2) << 2; - tmp1 |= sub_0807B464(tilePos - 1, 2) << 3; - tmp1 |= sub_0807B464(tilePos + 0x41, 1) << 1; - tmp1 |= sub_0807B464(tilePos + 0x3f, 1) << 3; - if (GetTileType(tilePos + 0x40, 2) != 0) { - tmp1 |= sub_0807B464(tilePos + 0x80, 1) << 2; + if (sub_0807B464(tilePos, LAYER_TOP)) { + tmp1 = sub_0807B464(tilePos - 0x40, LAYER_TOP); + tmp1 |= sub_0807B464(tilePos + 1, LAYER_TOP) << 1; + tmp1 |= sub_0807B464(tilePos + 0x40, LAYER_TOP) << 2; + tmp1 |= sub_0807B464(tilePos - 1, LAYER_TOP) << 3; + tmp1 |= sub_0807B464(tilePos + 0x41, LAYER_BOTTOM) << 1; + tmp1 |= sub_0807B464(tilePos + 0x3f, LAYER_BOTTOM) << 3; + if (GetTileTypeAtTilePos(tilePos + 0x40, LAYER_TOP) != 0) { + tmp1 |= sub_0807B464(tilePos + 0x80, LAYER_BOTTOM) << 2; } tmp2 = gUnk_0811C2CC[tmp1]; - tileType = GetTileType(tilePos, 2); + tileType = GetTileTypeAtTilePos(tilePos, LAYER_TOP); ptr = gUnk_0811C2EC; tmp3 = 0; for (; *ptr != 0; ptr = ptr + 3) { @@ -3345,7 +3380,7 @@ void sub_0807B480(u32 tilePos, u32 param_2) { break; } } - SetTileType(tmp2, tilePos, 2); + SetTileType(tmp2, tilePos, LAYER_TOP); } } @@ -3365,172 +3400,172 @@ bool32 sub_0807B5B0(Entity* this) { -gUnk_0811C456[(this->animationState & 6) + 1])); } -u32 sub_0807B600(u32 param_1) { +u32 sub_0807B600(u32 tilePos) { u32 tileType; - u32 tile; + u32 tilePos2; - tile = param_1 - 0x40; - if (sub_080B1AE0(param_1, 1) != 0x56) { + tilePos2 = tilePos - 0x40; + if (GetActTileAtTilePos(tilePos, LAYER_BOTTOM) != ACT_TILE_86) { return FALSE; } else { - tileType = GetTileType(param_1, 1); - if (tileType == 0x26a) { - sub_0807B820(param_1); - } else if (tileType == 0x267) { - sub_0807B820(param_1 + 0x40); - } else if (tileType == 0x27a) { - sub_0807B8A8(param_1); - } else if (tileType == 0x277) { - sub_0807B8A8(param_1 + 0x40); - } else if (tileType == 0x28a) { - sub_0807B930(param_1); - } else if (tileType == 0x287) { - sub_0807B930(param_1 + 0x40); + tileType = GetTileTypeAtTilePos(tilePos, LAYER_BOTTOM); + if (tileType == TILE_TYPE_618) { + sub_0807B820(tilePos); + } else if (tileType == TILE_TYPE_615) { + sub_0807B820(tilePos + 0x40); + } else if (tileType == TILE_TYPE_634) { + sub_0807B8A8(tilePos); + } else if (tileType == TILE_TYPE_631) { + sub_0807B8A8(tilePos + 0x40); + } else if (tileType == TILE_TYPE_650) { + sub_0807B930(tilePos); + } else if (tileType == TILE_TYPE_647) { + sub_0807B930(tilePos + 0x40); } else { - if (GetTileType(param_1, 2) != 0) { - SetTileType(0x2f2, param_1, 1); - if (sub_080B1B44(tile, 1) == 3) { - SetTileType(0x2f4, tile, 1); + if (GetTileTypeAtTilePos(tilePos, LAYER_TOP) != 0) { + SetTileType(TILE_TYPE_754, tilePos, LAYER_BOTTOM); + if (GetCollisionDataAtTilePos(tilePos2, LAYER_BOTTOM) == COLLISION_DATA_3) { + SetTileType(TILE_TYPE_756, tilePos2, LAYER_BOTTOM); } - if (sub_080B1B44(param_1 + 0x40, 1) == 3) { - SetTileType(0x2f4, param_1, 1); + if (GetCollisionDataAtTilePos(tilePos + 0x40, LAYER_BOTTOM) == COLLISION_DATA_3) { + SetTileType(TILE_TYPE_756, tilePos, LAYER_BOTTOM); } } else { - SetTileType(0x2f4, param_1, 1); + SetTileType(TILE_TYPE_756, tilePos, LAYER_BOTTOM); } - if (sub_0807B464(tile, 2)) { - SetTileType(0, tile, 2); - if (GetTileType(tile, 1) == 0x2f2) { - SetTileType(0x2f4, tile, 1); + if (sub_0807B464(tilePos2, LAYER_TOP)) { + SetTileType(0, tilePos2, LAYER_TOP); + if (GetTileTypeAtTilePos(tilePos2, LAYER_BOTTOM) == TILE_TYPE_754) { + SetTileType(TILE_TYPE_756, tilePos2, LAYER_BOTTOM); } - sub_0807B55C(param_1 + 1, 1, (u16*)&gUnk_0811C2AC); - sub_0807B55C(param_1 - 1, 1, (u16*)&gUnk_0811C2AC); - sub_0807B55C(tile, 1, (u16*)&gUnk_0811C2AC); + sub_0807B55C(tilePos + 1, 1, (u16*)&gUnk_0811C2AC); + sub_0807B55C(tilePos - 1, 1, (u16*)&gUnk_0811C2AC); + sub_0807B55C(tilePos2, 1, (u16*)&gUnk_0811C2AC); } - sub_0807B480(tile + 1, 3); - sub_0807B480(tile - 1, 1); - sub_0807B480(tile + 0x40, 0); - sub_0807B480(tile - 0x40, 2); + sub_0807B480(tilePos2 + 1, 3); + sub_0807B480(tilePos2 - 1, 1); + sub_0807B480(tilePos2 + 0x40, 0); + sub_0807B480(tilePos2 - 0x40, 2); } return TRUE; } } -void sub_0807B778(u32 position, u32 layer) { +void sub_0807B778(u32 tilePos, u32 layer) { u32 tmp; - if (sub_080B1AE0(position, layer) == 0xd) { - tmp = sub_0807B434(position - 0x40, layer); - tmp |= sub_0807B434(position + 1, layer) << 1; - tmp |= sub_0807B434(position + 0x40, layer) << 2; - tmp |= sub_0807B434(position - 1, layer) << 3; - SetTileType(gUnk_0811C466[tmp], position, layer); + if (GetActTileAtTilePos(tilePos, layer) == ACT_TILE_13) { + tmp = sub_0807B434(tilePos + TILE_POS(0, -1), layer); + tmp |= sub_0807B434(tilePos + TILE_POS(1, 0), layer) << 1; + tmp |= sub_0807B434(tilePos + TILE_POS(0, 1), layer) << 2; + tmp |= sub_0807B434(tilePos + TILE_POS(-1, 0), layer) << 3; + SetTileType(gUnk_0811C466[tmp], tilePos, layer); } } -void sub_0807B7D8(u32 type, u32 pos, u32 layer) { - if (type == 53) { - CloneTile(53, pos, layer); - sub_0807B778(pos, layer); - sub_0807B778(pos + 1, layer); - sub_0807B778(pos - 1, layer); - sub_0807B778(pos + 64, layer); - sub_0807B778(pos - 64, layer); +void sub_0807B7D8(u32 tileType, u32 tilePos, u32 layer) { + if (tileType == TILE_TYPE_53) { + CloneTile(TILE_TYPE_53, tilePos, layer); + sub_0807B778(tilePos, layer); + sub_0807B778(tilePos + TILE_POS(1, 0), layer); + sub_0807B778(tilePos + TILE_POS(-1, 0), layer); + sub_0807B778(tilePos + TILE_POS(0, 1), layer); + sub_0807B778(tilePos + TILE_POS(0, -1), layer); } else { - SetTileType(type, pos, layer); + SetTileType(tileType, tilePos, layer); } } -void sub_0807B820(u32 position) { - SetTileType(0x26c, position + TILE_POS(-1, -1), 1); - SetTileType(0x273, position + TILE_POS(-1, -1), 2); - SetTileType(0x26d, position + TILE_POS(0, -1), 1); - SetTileType(0x274, position + TILE_POS(0, -1), 2); - SetTileType(0x26e, position + TILE_POS(1, -1), 1); - SetTileType(0x275, position + TILE_POS(1, -1), 2); - SetTileType(0x26f, position + TILE_POS(-1, 0), 1); - SetTileType(0x270, position, 1); - SetTileType(0x272, position + TILE_POS(1, 0), 1); +void sub_0807B820(u32 tilePos) { + SetTileType(TILE_TYPE_620, tilePos + TILE_POS(-1, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_627, tilePos + TILE_POS(-1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_621, tilePos + TILE_POS(0, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_628, tilePos + TILE_POS(0, -1), LAYER_TOP); + SetTileType(TILE_TYPE_622, tilePos + TILE_POS(1, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_629, tilePos + TILE_POS(1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_623, tilePos + TILE_POS(-1, 0), LAYER_BOTTOM); + SetTileType(TILE_TYPE_624, tilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_626, tilePos + TILE_POS(1, 0), LAYER_BOTTOM); } -void sub_0807B8A8(u32 position) { - SetTileType(0x27c, position + TILE_POS(-1, -1), 1); - SetTileType(0x283, position + TILE_POS(-1, -1), 2); - SetTileType(0x27d, position + TILE_POS(0, -1), 1); - SetTileType(0x284, position + TILE_POS(0, -1), 2); - SetTileType(0x27e, position + TILE_POS(1, -1), 1); - SetTileType(0x285, position + TILE_POS(1, -1), 2); - SetTileType(0x27f, position + TILE_POS(-1, 0), 1); - SetTileType(0x280, position, 1); - SetTileType(0x282, position + TILE_POS(1, 0), 1); +void sub_0807B8A8(u32 tilePos) { + SetTileType(TILE_TYPE_636, tilePos + TILE_POS(-1, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_643, tilePos + TILE_POS(-1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_637, tilePos + TILE_POS(0, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_644, tilePos + TILE_POS(0, -1), LAYER_TOP); + SetTileType(TILE_TYPE_638, tilePos + TILE_POS(1, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_645, tilePos + TILE_POS(1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_639, tilePos + TILE_POS(-1, 0), LAYER_BOTTOM); + SetTileType(TILE_TYPE_640, tilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_642, tilePos + TILE_POS(1, 0), LAYER_BOTTOM); } -void sub_0807B930(u32 position) { - SetTileType(0x28c, position + TILE_POS(-1, -1), 1); - SetTileType(0x293, position + TILE_POS(-1, -1), 2); - SetTileType(0x28d, position + TILE_POS(0, -1), 1); - SetTileType(0x294, position + TILE_POS(0, -1), 2); - SetTileType(0x28e, position + TILE_POS(1, -1), 1); - SetTileType(0x295, position + TILE_POS(1, -1), 2); - SetTileType(0x28f, position + TILE_POS(-1, 0), 1); - SetTileType(0x290, position, 1); - SetTileType(0x292, position + TILE_POS(1, 0), 1); +void sub_0807B930(u32 tilePos) { + SetTileType(TILE_TYPE_652, tilePos + TILE_POS(-1, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_659, tilePos + TILE_POS(-1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_653, tilePos + TILE_POS(0, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_660, tilePos + TILE_POS(0, -1), LAYER_TOP); + SetTileType(TILE_TYPE_654, tilePos + TILE_POS(1, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_661, tilePos + TILE_POS(1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_655, tilePos + TILE_POS(-1, 0), LAYER_BOTTOM); + SetTileType(TILE_TYPE_656, tilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_658, tilePos + TILE_POS(1, 0), LAYER_BOTTOM); } -void sub_0807B9B8(u32 tileIndex, u32 position, u32 layer) { - LayerStruct* data; - u16* src; +void SetTileByIndex(u32 tileIndex, u32 tilePos, u32 layer) { + MapLayer* mapLayer; + u16* subTiles; u16* dest; u16 tileType; - UnregisterInteractTile(position, layer); - data = GetTileBuffer(layer); - data->mapData[position] = tileIndex; - tileType = data->metatileTypes[tileIndex]; - data->collisionData[position] = gUnk_080B3E80[tileType]; - data->unkData3[position] = gUnk_080B37A0[tileType]; + UnregisterInteractTile(tilePos, layer); + mapLayer = GetLayerByIndex(layer); + mapLayer->mapData[tilePos] = tileIndex; + tileType = mapLayer->tileTypes[tileIndex]; + mapLayer->collisionData[tilePos] = gMapTileTypeToCollisionData[tileType]; + mapLayer->actTiles[tilePos] = gMapTileTypeToActTile[tileType]; if ((gRoomControls.scroll_flags & 1) == 0) { - u32 offset = (position & 0x3f) * 2 + (position & 0xfc0) * 4; + u32 offset = (tilePos & 0x3f) * 2 + (tilePos & 0xfc0) * 4; if (layer != 2) { dest = gMapDataBottomSpecial + offset; } else { dest = gMapDataTopSpecial + offset; } - src = data->metatiles + tileIndex * 4; - *dest = *src; - dest[1] = src[1]; - dest[0x80] = src[2]; - dest[0x81] = src[3]; + subTiles = mapLayer->subTiles + tileIndex * 4; + *dest = *subTiles; + dest[1] = subTiles[1]; + dest[0x80] = subTiles[2]; + dest[0x81] = subTiles[3]; if (gRoomControls.reload_flags != 1) { gUpdateVisibleTiles = 1; } } } -void RestorePrevTileEntity(u32 position, u32 layer) { +void RestorePrevTileEntity(u32 tilePos, u32 layer) { u32 tileIndex; u32 tileType; - LayerStruct* data; + MapLayer* mapLayer; u16* dest; - u16* src; + u16* subTiles; - UnregisterInteractTile(position, layer); - data = GetTileBuffer(layer); - data->mapData[position] = tileIndex = data->mapDataOriginal[position]; - tileType = data->metatileTypes[tileIndex]; - data->collisionData[position] = gUnk_080B3E80[tileType]; - data->unkData3[position] = gUnk_080B37A0[tileType]; + UnregisterInteractTile(tilePos, layer); + mapLayer = GetLayerByIndex(layer); + mapLayer->mapData[tilePos] = tileIndex = mapLayer->mapDataOriginal[tilePos]; + tileType = mapLayer->tileTypes[tileIndex]; + mapLayer->collisionData[tilePos] = gMapTileTypeToCollisionData[tileType]; + mapLayer->actTiles[tilePos] = gMapTileTypeToActTile[tileType]; if ((gRoomControls.scroll_flags & 1) == 0) { - u32 offset = (position & 0x3f) * 2 + (position & 0xfc0) * 4; + u32 offset = (tilePos & 0x3f) * 2 + (tilePos & 0xfc0) * 4; if (layer != 2) { dest = gMapDataBottomSpecial + offset; } else { dest = gMapDataTopSpecial + offset; } - src = &data->metatiles[tileIndex * 4]; - dest[0] = src[0]; - dest[1] = src[1]; - dest[0x80] = src[2]; - dest[0x81] = src[3]; + subTiles = &mapLayer->subTiles[tileIndex * 4]; + dest[0] = subTiles[0]; + dest[1] = subTiles[1]; + dest[0x80] = subTiles[2]; + dest[0x81] = subTiles[3]; if (gRoomControls.reload_flags != 1) { gUpdateVisibleTiles = 1; } @@ -3549,24 +3584,24 @@ void sub_0807BB98(s32 basePosition, u32 layer, u32 width, u32 height) { u32 x; for (y = 0; y < height; y++) { for (x = 0; x < width; x++) { - SetBottomTile(0x4072, basePosition + x, layer); + SetTile(SPECIAL_TILE_114, basePosition + x, layer); } basePosition += 0x40; } } void sub_0807BBE4(void) { - u32 tile; + u32 tileIndex; u8* topCollision; u8* bottomCollision; u32 index; u16* topMap; u16* bottomMap; - u16* bottomMetatiles; - u16* topMetatiles; + u16* bottomTiles; + u16* topTiles; - bottomMetatiles = gMapBottom.metatileTypes; - topMetatiles = gMapTop.metatileTypes; + bottomTiles = gMapBottom.tileTypes; + topTiles = gMapTop.tileTypes; bottomMap = gMapBottom.mapData; topMap = gMapTop.mapData; @@ -3574,26 +3609,27 @@ void sub_0807BBE4(void) { topCollision = gMapTop.collisionData; index = 0; for (index = 0; index < 0x40 * 0x40; index++) { - tile = *bottomMap; + tileIndex = *bottomMap; bottomMap++; - if (tile < 0x4000) { - *bottomCollision = gUnk_080B3E80[bottomMetatiles[tile]]; + if (tileIndex < 0x4000) { + *bottomCollision = gMapTileTypeToCollisionData[bottomTiles[tileIndex]]; } else { - *bottomCollision = gUnk_080B79A7[tile - 0x4000]; + *bottomCollision = gMapSpecialTileToCollisionData[tileIndex - 0x4000]; } bottomCollision++; - tile = (u32)*topMap; + tileIndex = (u32)*topMap; topMap++; - if (tile < 0x4000) { - *topCollision = gUnk_080B3E80[topMetatiles[tile]]; + if (tileIndex < 0x4000) { + *topCollision = gMapTileTypeToCollisionData[topTiles[tileIndex]]; } else { - *topCollision = gUnk_080B79A7[tile - 0x4000]; + *topCollision = gMapSpecialTileToCollisionData[tileIndex - 0x4000]; } topCollision++; } } -void sub_0807BC84(void) { +// Set collisionData at the room bounds (?) to 0xff? +void CreateCollisionDataBorderAroundRoom(void) { s32 height; u32 width; u8* puVar3; @@ -3784,58 +3820,60 @@ void sub_0807BFA8(void) { gRoomControls.height = (gArea.pCurrentRoomInfo)->pixel_height; } -void sub_0807BFD0(void) { +void LoadRoomTileSet(void) { s32 index; - u16* puVar2; - u16* puVar3; - u16* ptr; - typeof(gMapTop)* newptr; + u16* tileTypes; + u16* tileIndices; + u16* paletteBuffer; ClearBgAnimations(); sub_0807BFA8(); - MemFill16(0xffff, gMapBottom.metatileTypes, 0x1000); - gMapBottom.metatileTypes[0] = 0; - MemFill16(0xffff, gMapTop.metatileTypes, 0x1000); - gMapTop.metatileTypes[0] = 0; + MemFill16(0xffff, gMapBottom.tileTypes, 0x1000); + gMapBottom.tileTypes[0] = 0; + MemFill16(0xffff, gMapTop.tileTypes, 0x1000); + gMapTop.tileTypes[0] = 0; - if ((void*)gRoomControls.unk_34 != (gArea.pCurrentRoomInfo)->tileset) { - gRoomControls.unk_34 = (u32)(gArea.pCurrentRoomInfo)->tileset; - sub_080197D4((gArea.pCurrentRoomInfo)->tileset); + if ((void*)gRoomControls.tileSet != (gArea.pCurrentRoomInfo)->tileSet) { + gRoomControls.tileSet = (u32)(gArea.pCurrentRoomInfo)->tileSet; + LoadMapData((gArea.pCurrentRoomInfo)->tileSet); } - sub_080197D4((gArea.pCurrentRoomInfo)->metatiles); - ptr = gPaletteBuffer; - MemCopy(&ptr[0x30], &ptr[0x150], 0x20); + LoadMapData((gArea.pCurrentRoomInfo)->tiles); + paletteBuffer = gPaletteBuffer; + MemCopy(&paletteBuffer[0x30], &paletteBuffer[0x150], 0x20); gUsedPalettes |= 0x200000; if ((gArea.pCurrentRoomInfo)->bg_anim != NULL) { LoadBgAnimations((gArea.pCurrentRoomInfo)->bg_anim); } - puVar2 = gMapBottom.metatileTypes; - puVar3 = gMapBottom.unkData2; - MemFill16(0xffff, puVar3, 0x1000); + tileTypes = gMapBottom.tileTypes; + tileIndices = gMapBottom.tileIndices; + MemFill16(0xffff, tileIndices, 0x1000); - for (index = 0; index < 0x800; index++, puVar2++) { - if ((*puVar2 < 0x800) && (puVar3[*puVar2] == 0xffff)) { - puVar3[*puVar2] = index; + for (index = 0; index < 0x800; index++, tileTypes++) { + if ((*tileTypes < 0x800) && (tileIndices[*tileTypes] == 0xffff)) { + tileIndices[*tileTypes] = index; } } - puVar2 = gMapTop.metatileTypes; - puVar3 = gMapTop.unkData2; - MemFill16(0xffff, puVar3, 0x1000); + tileTypes = gMapTop.tileTypes; + tileIndices = gMapTop.tileIndices; + MemFill16(0xffff, tileIndices, 0x1000); - for (index = 0; index < 0x800; index++, puVar2++) { - if ((*puVar2 < 0x800) && (puVar3[*puVar2] == 0xffff)) { - puVar3[*puVar2] = index; + for (index = 0; index < 0x800; index++, tileTypes++) { + if ((*tileTypes < 0x800) && (tileIndices[*tileTypes] == 0xffff)) { + tileIndices[*tileTypes] = index; } } } void LoadRoomGfx(void) { RoomControls* roomControls; - bool32 tmp; + bool32 clearBottomMap; // TODO maybe if it is a 256 bit background? + // So the first u16 being 0xffff indicates this and the rest of the background does not matter? + // Or is it used anywhere else? + // Probaby rather is some sort of different scroll mode where only a small part of the map is used? sub_0807BFA8(); roomControls = &gRoomControls; @@ -3844,74 +3882,78 @@ void LoadRoomGfx(void) { MemClear(gMapTop.collisionData, sizeof(gMapTop.collisionData)); MemClear(&gMapDataBottomSpecial, 0x8000); MemClear(&gMapDataTopSpecial, 0x8000); - sub_080197D4((gArea.pCurrentRoomInfo)->map); + LoadMapData((gArea.pCurrentRoomInfo)->map); if (gMapBottom.mapData[0] != 0xffff) { - sub_0807C8B0(gMapBottom.mapData, roomControls->width >> 4, roomControls->height >> 4); - sub_0807C8B0(gMapTop.mapData, roomControls->width >> 4, roomControls->height >> 4); - tmp = FALSE; + sub_0807C8B0(gMapBottom.mapData, roomControls->width / 16, roomControls->height / 16); + sub_0807C8B0(gMapTop.mapData, roomControls->width / 16, roomControls->height / 16); + clearBottomMap = FALSE; } else { MemClear(gMapBottom.mapData, sizeof(gMapBottom.mapData)); - tmp = TRUE; + clearBottomMap = TRUE; } if (gRoomTransition.field2d == 0) { MemCopy(gMapBottom.mapData, gMapBottom.mapDataOriginal, sizeof(gMapBottom.mapData)); MemCopy(gMapTop.mapData, gMapTop.mapDataOriginal, sizeof(gMapBottom.mapData)); } else if (gRoomTransition.field2d == 2) { - MemCopy(gMapBottom.mapData, gMapBottom.unkData3, 0x1000); + MemCopy(gMapBottom.mapData, gMapBottom.actTiles, 0x1000); MemCopy(gMapBottom.mapDataOriginal, gMapBottom.mapData, 0x1000); - MemCopy(gMapBottom.unkData3, gMapBottom.mapDataOriginal, 0x1000); - MemCopy(gMapBottom.mapData + 0x800, gMapBottom.unkData3, 0x1000); + MemCopy(gMapBottom.actTiles, gMapBottom.mapDataOriginal, 0x1000); + MemCopy(gMapBottom.mapData + 0x800, gMapBottom.actTiles, 0x1000); MemCopy(gMapBottom.mapDataOriginal + 0x800, gMapBottom.mapData + 0x800, 0x1000); - MemCopy(gMapBottom.unkData3, gMapBottom.mapDataOriginal + 0x800, 0x1000); - MemCopy(gMapTop.mapData, gMapTop.unkData3, 0x1000); + MemCopy(gMapBottom.actTiles, gMapBottom.mapDataOriginal + 0x800, 0x1000); + MemCopy(gMapTop.mapData, gMapTop.actTiles, 0x1000); MemCopy(gMapTop.mapDataOriginal, gMapTop.mapData, 0x1000); - MemCopy(gMapTop.unkData3, gMapTop.mapDataOriginal, 0x1000); - MemCopy(gMapTop.mapData + 0x800, gMapTop.unkData3, 0x1000); + MemCopy(gMapTop.actTiles, gMapTop.mapDataOriginal, 0x1000); + MemCopy(gMapTop.mapData + 0x800, gMapTop.actTiles, 0x1000); MemCopy(gMapTop.mapDataOriginal + 0x800, gMapTop.mapData + 0x800, 0x1000); - MemCopy(gMapTop.unkData3, gMapTop.mapDataOriginal + 0x800, 0x1000); + MemCopy(gMapTop.actTiles, gMapTop.mapDataOriginal + 0x800, 0x1000); } - if (!tmp) { + if (!clearBottomMap) { sub_0807BBE4(); } else { sub_0807C69C(gMapBottom.collisionData, roomControls->width >> 4, roomControls->height >> 4); sub_0807C69C(gMapTop.collisionData, roomControls->width >> 4, roomControls->height >> 4); sub_0807C460(); } - sub_0807BC84(); - sub_08080B60(&gMapBottom); - sub_08080B60(&gMapTop); - if (!tmp) { - sub_0801AB08((u16*)&gMapDataBottomSpecial, &gMapBottom); - sub_0801AB08((u16*)&gMapDataTopSpecial, &gMapTop); + CreateCollisionDataBorderAroundRoom(); + FillActTileForLayer(&gMapBottom); + FillActTileForLayer(&gMapTop); + if (!clearBottomMap) { + // Render the complete bottom and top tileMaps into the tileMaps. + RenderMapLayerToSubTileMap(gMapDataBottomSpecial, &gMapBottom); + RenderMapLayerToSubTileMap(gMapDataTopSpecial, &gMapTop); } else { + // Copy first half to second half. + // Then copy the room back to the first half? + // Then clear the second half. MemCopy(&gMapDataBottomSpecial, &gMapDataBottomSpecial[0x2000], 0x4000); // TODO - sub_0807C5F4((u16*)&gMapDataBottomSpecial, &gMapDataBottomSpecial[0x2000]); + sub_0807C5F4(gMapDataBottomSpecial, &gMapDataBottomSpecial[0x2000]); MemClear(&gMapDataBottomSpecial[0x2000], 0x4000); MemCopy(&gMapDataTopSpecial, &gMapDataTopSpecial[0x2000], 0x4000); - sub_0807C5F4((u16*)&gMapDataTopSpecial, (u16*)&gMapDataTopSpecial[0x2000]); + sub_0807C5F4(gMapDataTopSpecial, &gMapDataTopSpecial[0x2000]); MemClear(&gMapDataTopSpecial[0x2000], 0x4000); } - if (tmp || roomControls->area == 0x71) { + if (clearBottomMap || roomControls->area == AREA_PALACE_OF_WINDS_BOSS) { roomControls->scroll_flags |= 1; } switch (roomControls->area) { - case 0x20: - case 0x2d: + case AREA_MINISH_HOUSE_INTERIORS: + case AREA_TOWN_MINISH_HOLES: if (gMapBottom.bgSettings != NULL) { gMapBottom.bgSettings->control |= 0x80; } gScreen.lcd.displayControl &= 0xfdff; break; - case 0x21: - case 0x22: - case 0x23: - case 0x24: - case 0x25: - case 0x27: - case 0x28: - case 0x30: - case 0x38: + case AREA_HOUSE_INTERIORS_1: + case AREA_HOUSE_INTERIORS_2: + case AREA_HOUSE_INTERIORS_3: + case AREA_TREE_INTERIORS: + case AREA_DOJOS: + case AREA_MINISH_CRACKS: + case AREA_HOUSE_INTERIORS_4: + case AREA_WIND_TRIBE_TOWER: + case AREA_EZLO_CUTSCENE: if (gMapTop.bgSettings != NULL) { gMapTop.bgSettings->control = gUnk_080B77C0[2]; } @@ -3947,10 +3989,10 @@ void sub_0807C460(void) { for (y = 0; y < height; y++) { for (x = 0; x < width; x++) { if (*mapBottom > 0x3fff) { - SetBottomTile(*mapBottom, position, 1); + SetTile(*mapBottom, position, LAYER_BOTTOM); } if (*mapTop > 0x3fff) { - SetBottomTile(*mapTop, position, 2); + SetTile(*mapTop, position, LAYER_TOP); } mapBottom++; mapTop++; @@ -3963,24 +4005,27 @@ void sub_0807C460(void) { } void sub_0807C4F8(void) { - u32* puVar1; - u32* ptr; + MapDataDefinition* ptr1; + MapDataDefinition* ptr2; - if (gRoomControls.area != 0x71) { + if (gRoomControls.area != AREA_PALACE_OF_WINDS_BOSS) { MemClear(gMapDataBottomSpecial, 0x8000); - MemClear(&gMapDataTopSpecial, 0x8000); - ptr = gUnk_02022830; - puVar1 = (u32*)(gArea.pCurrentRoomInfo)->map; - puVar1 -= 3; + MemClear(gMapDataTopSpecial, 0x8000); + ptr1 = &gUnk_02022830; + ptr2 = (MapDataDefinition*)(gArea.pCurrentRoomInfo)->map; + ptr2 -= 1; do { - puVar1 += 3; - if (((u16*)puVar1[1] == gMapDataBottomSpecial) || ((u16*)puVar1[1] == (u16*)&gMapDataTopSpecial)) { - ptr[0] = puVar1[0] & 0x7fffffff; - ptr[1] = puVar1[1]; - ptr[2] = puVar1[2]; - sub_080197D4(ptr); + ptr2 += 1; + // TODO why does this not match with ptr2->dest? + if (((u16*)((u32*)ptr2)[1] == gMapDataBottomSpecial) || + ((u16*)((u32*)ptr2)[1] == (u16*)&gMapDataTopSpecial)) { + // only load the map data definitions for bitmap backgrounds? + ptr1->src = ptr2->src & 0x7fffffff; + ptr1->dest = ptr2->dest; + ptr1->size = ptr2->size; + LoadMapData(ptr1); } - } while ((s32)*puVar1 < 0); + } while ((s32)ptr2->src < 0); MemCopy(gMapDataBottomSpecial, gMapDataBottomSpecial + 0x2000, 0x4000); sub_0807C5F4(gMapDataBottomSpecial, gMapDataBottomSpecial + 0x2000); @@ -4017,55 +4062,55 @@ void sub_0807C5B0(void) { roomControls->scroll_flags |= 2; } -void sub_0807C5F4(u16* param_1, u16* param_2) { - s32 iVar1; - u16* puVar2; - u16* puVar3; - u32 uVar4; - u32 index; - u32 innerIndex; +// Copies parts over +// 0x20 * 0x20 chunk if gRoomControls.width <= 0xff +// more up to 0x40 * 0x40 if the room is bigger +void sub_0807C5F4(u16* dest, u16* src) { + s32 index1; + u32 index2; + u16* ptr; - puVar2 = param_1; - for (iVar1 = 0x20; iVar1 != 0; iVar1--) { - for (uVar4 = 0; uVar4 < 0x20; uVar4++) { - *puVar2 = *param_2; - param_2++; - puVar2++; + ptr = dest; + for (index1 = 0x20; index1 != 0; index1--) { + for (index2 = 0; index2 < 0x20; index2++) { + *ptr = *src; + src++; + ptr++; } - puVar2 += 0x60; + ptr += 0x60; } if (gRoomControls.width > 0xff) { - puVar2 = param_1 + 0x20; - for (iVar1 = 0x20; iVar1 != 0; iVar1--) { - for (uVar4 = 0; uVar4 < 0x20; uVar4++) { - *puVar2 = *param_2; - param_2++; - puVar2++; + ptr = dest + 0x20; + for (index1 = 0x20; index1 != 0; index1--) { + for (index2 = 0; index2 < 0x20; index2++) { + *ptr = *src; + src++; + ptr++; } - puVar2 += 0x60; + ptr += 0x60; } } if (gRoomControls.height > 0xff) { - puVar2 = param_1 + 0x1000; - for (iVar1 = 0x20; iVar1 != 0; iVar1--) { - for (uVar4 = 0; uVar4 < 0x20; uVar4++) { - *puVar2 = *param_2; - param_2++; - puVar2++; + ptr = dest + 0x1000; + for (index1 = 0x20; index1 != 0; index1--) { + for (index2 = 0; index2 < 0x20; index2++) { + *ptr = *src; + src++; + ptr++; } - puVar2 += 0x60; + ptr += 0x60; } } if (gRoomControls.width > 0xff && gRoomControls.height > 0xff) { - param_1 += 0x1020; - puVar2 = param_1; + dest += 0x1020; + ptr = dest; - for (iVar1 = 0x20; iVar1 != 0; iVar1--) { - for (uVar4 = 0; uVar4 < 0x20; uVar4++) { - *puVar2++ = *param_2++; + for (index1 = 0x20; index1 != 0; index1--) { + for (index2 = 0; index2 < 0x20; index2++) { + *ptr++ = *src++; } - puVar2 += 0x60; + ptr += 0x60; } } } @@ -4114,7 +4159,7 @@ void InitializeCamera() { u32 tmp1; u32 tmp2; - sub_0807BFD0(); + LoadRoomTileSet(); LoadRoomGfx(); roomControls = &gRoomControls; target = gRoomControls.camera_target; @@ -4167,19 +4212,19 @@ void InitializeCamera() { } } roomControls->scroll_flags &= 0xfb; - sub_08080BC4(); + UpdateScreenShake(); } void sub_0807C810(void) { DiggingCaveEntranceTransition* ptr; Entity* player; RoomControls* ctrls; - sub_0807BFD0(); + LoadRoomTileSet(); ptr = &gDiggingCaveEntranceTransition; player = &gPlayerEntity.base; ctrls = &gRoomControls; - player->x.HALF.HI = ((ptr->entrance)->targetTilePosition & 0x3f) * 0x10 + ctrls->origin_x + ptr->offsetX; - player->y.HALF.HI = (((ptr->entrance)->targetTilePosition & 0xfc0) >> 2) + ctrls->origin_y + ptr->offsetY; + player->x.HALF.HI = ((ptr->entrance)->targetTilePos & 0x3f) * 0x10 + ctrls->origin_x + ptr->offsetX; + player->y.HALF.HI = (((ptr->entrance)->targetTilePos & 0xfc0) >> 2) + ctrls->origin_y + ptr->offsetY; sub_080809D4(); gUpdateVisibleTiles = 0; } @@ -4252,11 +4297,11 @@ void LoadCompressedMapData(void* dest, u32 offset) { } } -void sub_0807C998(u32* a1) { - LoadCompressedMapData(&gMapBottom.metatiles, a1[0]); - LoadCompressedMapData(&gMapBottom.metatileTypes, a1[1]); - LoadCompressedMapData(&gMapTop.metatiles, a1[2]); - LoadCompressedMapData(&gMapTop.metatileTypes, a1[3]); +void sub_0807C998(u32* dest) { + LoadCompressedMapData(&gMapBottom.subTiles, dest[0]); + LoadCompressedMapData(&gMapBottom.tileTypes, dest[1]); + LoadCompressedMapData(&gMapTop.subTiles, dest[2]); + LoadCompressedMapData(&gMapTop.tileTypes, dest[3]); } void sub_0807C9D8(u32* a1) { @@ -4266,8 +4311,8 @@ void sub_0807C9D8(u32* a1) { LoadCompressedMapData((u8*)0x6004000, *a1); LoadCompressedMapData((u8*)0x6000000, v1[1]); LoadCompressedMapData((u8*)0x6008000, v1[2]); - LoadCompressedMapData((u8*)gUnk_020176E0, v1[3]); - LoadPalettes(gUnk_020176E0, 2, 13); + LoadCompressedMapData((u8*)(gPaletteBuffer + 32), v1[3]); + LoadPalettes((u8*)(gPaletteBuffer + 32), 2, 13); } u32 FinalizeSave(void) { diff --git a/src/projectile/gleerokProjectile.c b/src/projectile/gleerokProjectile.c index 2b01180f..3fd4bbf5 100644 --- a/src/projectile/gleerokProjectile.c +++ b/src/projectile/gleerokProjectile.c @@ -151,7 +151,7 @@ void sub_080A90D8(GleerokProjectileEntity* this) { if (this->unk_74 != TILE(super->x.HALF.HI, super->y.HALF.HI)) { this->unk_74 = TILE(super->x.HALF.HI, super->y.HALF.HI); - tmp = GetTileTypeByEntity(super); + tmp = GetTileTypeAtEntity(super); if ((tmp == 0x13) || (tmp == 0x34)) { sub_0807B7D8(0x34c, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); } diff --git a/src/projectile/mandiblesProjectile.c b/src/projectile/mandiblesProjectile.c index 2b6f67a3..99ceb48b 100644 --- a/src/projectile/mandiblesProjectile.c +++ b/src/projectile/mandiblesProjectile.c @@ -10,6 +10,7 @@ #include "game.h" #include "hitbox.h" #include "physics.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -117,8 +118,8 @@ void MandiblesProjectile_Action2(MandiblesProjectileEntity* this) { EnqueueSFX(SFX_15D); } this->unk_78 = TILE(super->x.HALF.HI, super->y.HALF.HI); - if (GetTileType(this->unk_78, super->collisionLayer) == 0x4000) { - SetBottomTile(0x4005, this->unk_78, super->collisionLayer); + if (GetTileTypeAtTilePos(this->unk_78, super->collisionLayer) == SPECIAL_TILE_0) { + SetTile(SPECIAL_TILE_5, this->unk_78, super->collisionLayer); } } @@ -299,7 +300,6 @@ void sub_080AA320(MandiblesProjectileEntity* this) { parent->unk_80 = 0x50; parent->base.speed = 0; parent->base.direction = sub_08049F84(&parent->base, 0); - // TODO regalloc uVar2 = Direction8Round(parent->base.direction + 4); super->animationState = uVar2 >> 2; parent->base.animationState = DirectionRound(uVar2) >> 2; diff --git a/src/projectile/projectile5.c b/src/projectile/projectile5.c index 4fa9a3d8..f84d2a7b 100644 --- a/src/projectile/projectile5.c +++ b/src/projectile/projectile5.c @@ -4,6 +4,7 @@ * * @brief Projectile 5 */ +#include "asm.h" #include "enemy.h" #include "entity.h" #include "physics.h" @@ -16,8 +17,6 @@ typedef struct { /*0x83*/ u8 unk_83; } Projectile5Entity; -extern u32 sub_080B1B44(u32, u32); - extern void (*const Projectile5_Functions[])(Entity*); extern void (*const Projectile5_Actions[])(Entity*); @@ -40,7 +39,8 @@ void Projectile5_OnCollision(Entity* this) { pbVar2 = &((Projectile5Entity*)this->parent)->unk_83; if ((((Projectile5Entity*)this->parent)->unk_83 & 0x3f) == 3) { if (gPlayerState.hurtBlinkSpeed != 0) { - if (sub_080B1B44(TILE(this->x.HALF.HI, this->y.HALF.HI), gPlayerEntity.base.collisionLayer) == 0) { + if (GetCollisionDataAtTilePos(TILE(this->x.HALF.HI, this->y.HALF.HI), + gPlayerEntity.base.collisionLayer) == 0) { if (this->contactFlags == CONTACT_NOW) { *pbVar2 = *pbVar2 & 0x7f; DeleteThisEntity(); diff --git a/src/projectile/removableDust.c b/src/projectile/removableDust.c index 49da5582..c6b7a5ff 100644 --- a/src/projectile/removableDust.c +++ b/src/projectile/removableDust.c @@ -10,6 +10,7 @@ #include "object.h" #include "physics.h" #include "room.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -18,8 +19,6 @@ typedef struct { /*0x86*/ u16 unk_86; } RemovableDustEntity; -extern u32 sub_080B1AE0(u16, u8); - extern void (*const RemovableDust_Functions[])(RemovableDustEntity*); extern const u16 gUnk_08129FD0[]; extern const u16 gUnk_08129FE4[]; @@ -75,7 +74,7 @@ void sub_080AA494(RemovableDustEntity* this) { u32 index; index = 0; - tileType = GetTileTypeByEntity(super); + tileType = GetTileTypeAtEntity(super); iterator = gUnk_08129FD0; while (*iterator != 0) { if (*(iterator++) == tileType) { @@ -91,7 +90,7 @@ void sub_080AA494(RemovableDustEntity* this) { } super->type2 = index; super->spritePriority.b0 = 7; - SetBottomTile(0x4068, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); + SetTile(SPECIAL_TILE_104, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); } void sub_080AA534(Entity* this) { @@ -101,21 +100,21 @@ void sub_080AA534(Entity* this) { void sub_080AA544(RemovableDustEntity* this) { u8* pbVar1; - s32 iVar2; + s32 actTile; u32 uVar3; s32 iVar4; const u16* puVar5; - u32 param; + u32 tilePos; const s8* tmp; if (super->type2 < 9) { tmp = gUnk_08129FF8; - param = TILE(super->x.HALF.HI, super->y.HALF.HI) + tmp[super->type2]; + tilePos = TILE(super->x.HALF.HI, super->y.HALF.HI) + tmp[super->type2]; uVar3 = 0; iVar4 = 0; do { - iVar2 = sub_080B1AE0((param - tmp[uVar3]) & 0xffff, super->collisionLayer); - if (iVar2 == 0x3e) { + actTile = GetActTileAtTilePos((tilePos - tmp[uVar3]) & 0xffff, super->collisionLayer); + if (actTile == ACT_TILE_62) { iVar4++; } uVar3++; @@ -125,14 +124,14 @@ void sub_080AA544(RemovableDustEntity* this) { uVar3 = 0; puVar5 = gUnk_08129FD0; do { - sub_0807B7D8((u32)*puVar5, param - tmp[uVar3], super->collisionLayer); + sub_0807B7D8((u32)*puVar5, tilePos - tmp[uVar3], super->collisionLayer); puVar5++; uVar3++; } while (uVar3 < 9); - sub_080AA654(this, param); + sub_080AA654(this, tilePos); SetFlag((u16)super->speed); } else { - sub_0807B7D8(gUnk_08129FE4[super->type2], param - tmp[super->type2], super->collisionLayer); + sub_0807B7D8(gUnk_08129FE4[super->type2], tilePos - tmp[super->type2], super->collisionLayer); } } else { RestorePrevTileEntity(TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); diff --git a/src/projectile/spiderWeb.c b/src/projectile/spiderWeb.c index b749caf4..6a386f64 100644 --- a/src/projectile/spiderWeb.c +++ b/src/projectile/spiderWeb.c @@ -9,6 +9,7 @@ #include "functions.h" #include "hitbox.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; @@ -177,7 +178,7 @@ void SpiderWeb_SubAction0(SpiderWebEntity* this) { if (tmp * 2 - entity->animationState == 0) { x = gUnk_0812A064[tmp * 2] + super->x.HALF.HI; y = gUnk_0812A064[tmp * 2 + 1] + super->y.HALF.HI; - if (sub_080B1B18(x, y, entity->collisionLayer) == 0) { + if (GetCollisionDataAtWorldCoords(x, y, entity->collisionLayer) == 0) { entity->x.HALF.HI = x; entity->y.HALF.HI = y; } @@ -245,8 +246,8 @@ void sub_080AA9E0(Entity* this) { } void sub_080AAA68(Entity* this) { - static const u16 typeTiles[] = { 16419, 16421, 16422, 16420 }; - SetBottomTile(typeTiles[this->type], TILE(this->x.HALF.HI, this->y.HALF.HI), this->collisionLayer); + static const u16 typeTiles[] = { SPECIAL_TILE_35, SPECIAL_TILE_37, SPECIAL_TILE_38, SPECIAL_TILE_36 }; + SetTile(typeTiles[this->type], TILE(this->x.HALF.HI, this->y.HALF.HI), this->collisionLayer); } void sub_080AAAA8(SpiderWebEntity* this) { diff --git a/src/projectile/v1FireProjectile.c b/src/projectile/v1FireProjectile.c index 9fa0260f..bdf914bf 100644 --- a/src/projectile/v1FireProjectile.c +++ b/src/projectile/v1FireProjectile.c @@ -12,7 +12,7 @@ typedef struct { /*0x00*/ Entity base; /*0x68*/ u8 unused1[14]; - /*0x76*/ u16 unk_76; + /*0x76*/ u16 tilePos; } V1FireProjectileEntity; extern void (*const V1FireProjectile_Functions[])(V1FireProjectileEntity*); @@ -50,7 +50,7 @@ void V1FireProjectile_Init(V1FireProjectileEntity* this) { super->action = 1; super->zVelocity = Q_16_16(-1.0); - this->unk_76 = TILE(super->x.HALF.HI, super->y.HALF.HI); + this->tilePos = TILE(super->x.HALF.HI, super->y.HALF.HI); CopyPosition(super->parent, super); LinearMoveDirection(super, 0x1000, super->direction); super->spritePriority.b0 = 1; @@ -112,17 +112,17 @@ void V1FireProjectile_Action3(V1FireProjectileEntity* this) { } void sub_080AB4A4(V1FireProjectileEntity* this) { - u32 tmp; - u16 tile; + u32 oldTilePos; + u32 tilePos; - tmp = this->unk_76; - tile = TILE(super->x.HALF.HI, super->y.HALF.HI); - if (tmp != tile) { - this->unk_76 = tile; - switch (GetTileTypeByEntity(super)) { + oldTilePos = this->tilePos; + tilePos = TILE(super->x.HALF.HI, super->y.HALF.HI); + if (oldTilePos != tilePos) { + this->tilePos = tilePos; + switch (GetTileTypeAtEntity(super)) { case 0x13: case 0x34: - sub_0807B7D8(0x34c, this->unk_76, super->collisionLayer); + sub_0807B7D8(0x34c, this->tilePos, super->collisionLayer); break; } } diff --git a/src/projectile/v2Projectile.c b/src/projectile/v2Projectile.c index 68759c91..b96a2be5 100644 --- a/src/projectile/v2Projectile.c +++ b/src/projectile/v2Projectile.c @@ -8,12 +8,13 @@ #include "entity.h" #include "functions.h" #include "object.h" +#include "tiles.h" typedef struct { /*0x00*/ Entity base; /*0x68*/ u8 unused1[12]; - /*0x74*/ u16 unk_74; - /*0x76*/ u16 unk_76; + /*0x74*/ u16 tilePos; + /*0x76*/ u16 tileType; } V2ProjectileEntity; extern void (*const V2Projectile_Functions[])(V2ProjectileEntity*); @@ -103,8 +104,8 @@ void sub_080ABCC4(V2ProjectileEntity* this) { super->timer = (Random() & 0x3f) + 48; super->subtimer = 0; super->direction = Random() & 0x1f; - this->unk_74 = TILE(super->x.HALF.HI, super->y.HALF.HI); - this->unk_76 = GetTileType(this->unk_74, 2); + this->tilePos = TILE(super->x.HALF.HI, super->y.HALF.HI); + this->tileType = GetTileTypeAtTilePos(this->tilePos, LAYER_TOP); super->spritePriority.b0 = 2; InitializeAnimation(super, 0); SoundReq(SFX_14B); @@ -125,15 +126,15 @@ void sub_080ABD70(V2ProjectileEntity* this) { if ((super->frame & 0x10) != 0) { super->frame &= 0xef; super->speed = 0; - this->unk_74 = TILE(super->x.HALF.HI, super->y.HALF.HI); - this->unk_76 = GetTileType(this->unk_74, 2); - tmp = this->unk_76; + this->tilePos = TILE(super->x.HALF.HI, super->y.HALF.HI); + this->tileType = GetTileTypeAtTilePos(this->tilePos, LAYER_TOP); + tmp = this->tileType; if (tmp != 0x13) { if (tmp == 0x315) { - SetTileType(0x6e, this->unk_74, 2); + SetTileType(TILE_TYPE_110, this->tilePos, LAYER_TOP); } } else { - SetTileType(0x6d, this->unk_74, 2); + SetTileType(TILE_TYPE_109, this->tilePos, LAYER_TOP); } } if ((super->frame & ANIM_DONE) != 0) { diff --git a/src/projectile/winder.c b/src/projectile/winder.c index b8caaefb..d8b5c5d8 100644 --- a/src/projectile/winder.c +++ b/src/projectile/winder.c @@ -117,14 +117,14 @@ void Winder_SetPositions(WinderEntity* this) { } bool32 Winder_CheckForRailings(WinderEntity* this, u32 dir) { - u32 tile; + u32 tilePos; u32 val; - LayerStruct* layer = GetTileBuffer(super->collisionLayer); + MapLayer* mapLayer = GetLayerByIndex(super->collisionLayer); u32 collisionData; - tile = TILE(super->x.HALF.HI, super->y.HALF.HI); - tile += gUnk_080B4488[dir >> 3]; - collisionData = layer->collisionData[tile]; + tilePos = TILE(super->x.HALF.HI, super->y.HALF.HI); + tilePos += gUnk_080B4488[dir >> 3]; + collisionData = mapLayer->collisionData[tilePos]; if (collisionData <= 0x1F) { return FALSE; diff --git a/src/room.c b/src/room.c index 5a3a1129..a75c098a 100644 --- a/src/room.c +++ b/src/room.c @@ -2,14 +2,15 @@ #include "area.h" #include "common.h" +#include "enemy.h" #include "flags.h" #include "functions.h" #include "game.h" -#include "global.h" #include "manager/bombableWallManager.h" +#include "map.h" #include "object.h" #include "room.h" -#include "enemy.h" +#include "tiles.h" static void sub_0804B058(EntityData* dat); extern void sub_0801AC98(void); @@ -200,7 +201,8 @@ static void sub_0804B058(EntityData* dat) { if (EnemyEnableRespawn(uVar2) != 0) { ent = LoadRoomEntity(dat); if ((ent != NULL) && (ent->kind == ENEMY)) { - ((Enemy*)ent)->idx = uVar2 | 0x80; + ((Enemy*)ent)->idx = uVar2 | 0x80; // TODO Set the room tracker flag that can be set by the + // enemy so it does not appear next time the room is visited? } } } else { @@ -212,8 +214,8 @@ static void sub_0804B058(EntityData* dat) { } } -void sub_0804B0B0(u32 arg0, u32 arg1) { - LoadRoomEntityList(GetRoomProperty(arg0, arg1, 1)); +void sub_0804B0B0(u32 area, u32 room) { + LoadRoomEntityList(GetRoomProperty(area, room, 1)); } void SetCurrentRoomPropertyList(u32 area, u32 room) { @@ -223,11 +225,11 @@ void SetCurrentRoomPropertyList(u32 area, u32 room) { } } -void sub_0804B0E8(u32 arg0, u32 arg1) { +void sub_0804B0E8(u32 area, u32 room) { void (*func)(void); // init function at index 4 of room data - func = (void (*)())GetRoomProperty(arg0, arg1, 4); + func = (void (*)())GetRoomProperty(area, room, 4); if (func != NULL) { func(); } @@ -249,7 +251,7 @@ void* GetCurrentRoomProperty(u32 idx) { if (gCurrentRoomProperties == NULL) return NULL; - if (idx >= 0x80) { + if (idx >= 0x80) { // TODO different kind of room properties? return gRoomVars.entityRails[idx & 7]; } else if (idx <= 7) { return gRoomVars.properties[idx]; @@ -259,12 +261,12 @@ void* GetCurrentRoomProperty(u32 idx) { } void sub_0804B16C(void) { - TileEntity* tile = gSmallChests; + TileEntity* tileEntity = gSmallChests; do { - if (tile->tilePos != 0 && CheckLocalFlag(tile->localFlag)) { - SetTileType(0x74, tile->tilePos, tile->_6 & 1 ? 2 : 1); + if (tileEntity->tilePos != 0 && CheckLocalFlag(tileEntity->localFlag)) { + SetTileType(TILE_TYPE_116, tileEntity->tilePos, tileEntity->_6 & 1 ? LAYER_TOP : LAYER_BOTTOM); } - } while (++tile < gSmallChests + 8); + } while (++tileEntity < gSmallChests + 8); } void LoadRoomTileEntities(TileEntity* list) { @@ -306,25 +308,25 @@ void LoadRoomTileEntities(TileEntity* list) { } } -static void LoadGrassDropTile(TileEntity* tile) { - MemCopy(&gAreaDroptables[tile->localFlag], &gRoomVars.currentAreaDroptable, 0x20); +static void LoadGrassDropTile(TileEntity* tileEntity) { + MemCopy(&gAreaDroptables[tileEntity->localFlag], &gRoomVars.currentAreaDroptable, 0x20); } -static void LoadLocationTile(TileEntity* tile) { - gArea.locationIndex = tile->localFlag; +static void LoadLocationTile(TileEntity* tileEntity) { + gArea.locationIndex = tileEntity->localFlag; sub_08054524(); } -static void LoadRoomVisitTile(TileEntity* tile) { - SetLocalFlag(tile->localFlag); +static void LoadRoomVisitTile(TileEntity* tileEntity) { + SetLocalFlag(tileEntity->localFlag); } -static void LoadSmallChestTile(TileEntity* tile) { +static void LoadSmallChestTile(TileEntity* tileEntity) { TileEntity* t = gSmallChests; u32 i = 0; for (i = 0; i < 8; ++i, ++t) { if (!t->tilePos) { - MemCopy(tile, t, sizeof(TileEntity)); + MemCopy(tileEntity, t, sizeof(TileEntity)); if ((t->_6 & 1) && (gRoomControls.scroll_flags & 2) && !CheckLocalFlag(t->localFlag)) { Entity* e = CreateObject(SPECIAL_CHEST, t->localFlag, 0); if (e != NULL) { @@ -336,26 +338,26 @@ static void LoadSmallChestTile(TileEntity* tile) { } } -static void LoadBombableWallTile(TileEntity* tile) { +static void LoadBombableWallTile(TileEntity* tileEntity) { BombableWallManager* mgr = (BombableWallManager*)GetEmptyManager(); if (mgr != NULL) { mgr->base.kind = MANAGER; mgr->base.id = BOMBABLE_WALL_MANAGER; - mgr->x = tile->tilePos; - mgr->y = *(u16*)&tile->_6; - mgr->field_0x35 = tile->_2; - mgr->field_0x3e = tile->localFlag; + mgr->x = tileEntity->tilePos; + mgr->y = *(u16*)&tileEntity->_6; + mgr->layer = tileEntity->_2; + mgr->flag = tileEntity->localFlag; AppendEntityToList((Entity*)mgr, 6); } } -static void LoadDarknessTile(TileEntity* tile) { - sub_0805BB00(tile->_3, 1); +static void LoadDarknessTile(TileEntity* tileEntity) { + sub_0805BB00(tileEntity->_3, 1); } -static void LoadDestructibleTile(TileEntity* tile) { - if (CheckLocalFlag(*(u16*)&tile->_2)) { - SetTileType(*(u16*)&tile->_6, tile->tilePos, tile->localFlag); +static void LoadDestructibleTile(TileEntity* tileEntity) { + if (CheckLocalFlag(*(u16*)&tileEntity->_2)) { + SetTileType(*(u16*)&tileEntity->_6, tileEntity->tilePos, tileEntity->localFlag); } else if (!gRoomVars.destructableManagerLoaded) { Manager* mgr; gRoomVars.destructableManagerLoaded = TRUE; @@ -379,6 +381,6 @@ void sub_0804B388(u32 a1, u32 a2) { ModDungeonKeys(-1); } -void LoadSmallChestTile2(TileEntity* tile) { - LoadSmallChestTile(tile); +void LoadSmallChestTile2(TileEntity* tileEntity) { + LoadSmallChestTile(tileEntity); } diff --git a/src/roomInit.c b/src/roomInit.c index 8c1b6899..4c5dbfa7 100644 --- a/src/roomInit.c +++ b/src/roomInit.c @@ -13,6 +13,7 @@ #include "screen.h" #include "screenTransitions.h" #include "sound.h" +#include "tiles.h" #include "windcrest.h" extern u32 sub_08060354(void); @@ -119,7 +120,7 @@ u32 sub_unk3_ArmosInteriors_FortressOfWindsLeft(void) { void sub_StateChange_ArmosInteriors_FortressOfWindsLeft(void) { sub_08030118(9); gArea.dungeon_idx = 3; - gArea.areaMetadata = 0x4e; + gArea.areaMetadata = AR_HAS_NO_ENEMIES | AR_HAS_MAP | AR_IS_DUNGEON | AR_HAS_KEYS; } u32 sub_unk3_ArmosInteriors_FortressOfWindsRight(void) { @@ -129,7 +130,7 @@ u32 sub_unk3_ArmosInteriors_FortressOfWindsRight(void) { void sub_StateChange_ArmosInteriors_FortressOfWindsRight(void) { sub_08030118(10); gArea.dungeon_idx = 3; - gArea.areaMetadata = 0x4e; + gArea.areaMetadata = AR_HAS_NO_ENEMIES | AR_HAS_MAP | AR_IS_DUNGEON | AR_HAS_KEYS; } u32 sub_unk3_CrenelMinishPaths_CrenelBean(void) { @@ -807,10 +808,10 @@ extern EntityData gUnk_080D7D34; void sub_StateChange_GreatFairies_Exit(void) { if (GetInventoryValue(ITEM_FOURSWORD)) { - SetBottomTile(0x4072, 0x14d, 1); - SetBottomTile(0x4072, 0x10c, 1); - SetBottomTile(0x4090, 0x14c, 1); - SetBottomTile(0x4090, 0x18c, 1); + SetTile(SPECIAL_TILE_114, TILE_POS(13, 5), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_114, TILE_POS(12, 4), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_144, TILE_POS(12, 5), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_144, TILE_POS(12, 6), LAYER_BOTTOM); LoadRoomEntityList(&gUnk_080D7D34); } } @@ -861,8 +862,8 @@ void sub_StateChange_Dojos_Grimblade(void) { LoadRoomEntityList(&gUnk_080D827C); } else { sub_0805BC4C(); - SetTileType(0x76, 0x82, 2); - SetTileType(0x76, 0x8c, 2); + SetTileType(TILE_TYPE_118, TILE_POS(2, 2), LAYER_TOP); + SetTileType(TILE_TYPE_118, TILE_POS(12, 2), LAYER_TOP); } } @@ -1043,16 +1044,16 @@ void sub_StateChange_RoyalValley_Main(void) { if (GetInventoryValue(ITEM_QST_GRAVEYARD_KEY) != 2) { LoadRoomEntityList(&gUnk_080D9098); - SetTileType(0x17a, 0x58e, 1); - SetTileType(0x17b, 0x58f, 1); - SetTileType(0x17c, 0x5ce, 1); - SetTileType(0x17d, 0x5cf, 1); + SetTileType(TILE_TYPE_378, TILE_POS(14, 22), LAYER_BOTTOM); + SetTileType(TILE_TYPE_379, TILE_POS(15, 22), LAYER_BOTTOM); + SetTileType(TILE_TYPE_380, TILE_POS(14, 23), LAYER_BOTTOM); + SetTileType(TILE_TYPE_381, TILE_POS(15, 23), LAYER_BOTTOM); } EnableRandomDrops(); sub_08059278(); - SetBottomTile(0x4072, 0xa47, 1); - SetBottomTile(0x4072, 0xc47, 1); + SetTile(SPECIAL_TILE_114, TILE_POS(7, 41), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_114, TILE_POS(7, 49), LAYER_BOTTOM); if (CheckGlobalFlag(MAZE_CLEAR)) if (gRoomTransition.player_status.start_pos_x == 0x78 && gRoomTransition.player_status.start_pos_y == 0x278) @@ -1066,7 +1067,7 @@ u32 sub_unk3_RoyalValley_ForestMaze(void) { } void sub_StateChange_RoyalValley_ForestMaze(void) { - gArea.areaMetadata |= 0x40; + gArea.areaMetadata |= AR_HAS_NO_ENEMIES; gArea.unk_0c_0 = 1; sub_0804C128(); } @@ -1110,7 +1111,7 @@ static void sub_0804C128(void) { if (gArea.unk_0c_4 == 6) { sub_080AF250(1); if (CheckLocalFlag(HAKA_01_T0) == 0) { - SetTileType(0x73, 0x107, 1); + SetTileType(TILE_TYPE_115, TILE_POS(7, 4), LAYER_BOTTOM); } LoadRoomTileEntities(gUnk_080D9328); SetGlobalFlag(MAZE_CLEAR); @@ -1145,7 +1146,7 @@ void sub_0804C290(void) { if (gArea.unk_0c_1) { iVar1 = gArea.unk_0c_1; - SetTileType((gUnk_080D9348 + iVar1)->unk0, (gUnk_080D9348 + iVar1)->unk2, 1); + SetTileType((gUnk_080D9348 + iVar1)->unk0, (gUnk_080D9348 + iVar1)->unk2, LAYER_BOTTOM); } } @@ -1687,9 +1688,9 @@ void sub_StateChange_TownMinishHoles_RemShoeShop(void) { LoadRoomEntityList(&gUnk_080DBAD0); } if (!CheckLocalFlag(KOBITO_DOUKUTU_05_T0)) { - tilePos = 0x140; - for (i = 0; i < 0x13; i++, tilePos++) { - SetTileType(0x4072, tilePos, 1); + tilePos = TILE_POS(0, 5); + for (i = 0; i < 19; i++, tilePos++) { + SetTileType(SPECIAL_TILE_114, tilePos, LAYER_BOTTOM); } } LoadRoomEntityList(&gUnk_080DBB90); @@ -2152,11 +2153,11 @@ void sub_StateChange_DeepwoodShrine_StairsToB1(void) { } else { if (!CheckLocalFlag(0x4c)) { LoadRoomEntityList(&gUnk_additional_8_DeepwoodShrine_StairsToB1); - SetTileType(0x79, 0x285, 1); + SetTileType(TILE_TYPE_121, TILE_POS(5, 10), LAYER_BOTTOM); } else { - SetTileType(0x7a, 0x285, 1); + SetTileType(TILE_TYPE_122, TILE_POS(5, 10), LAYER_BOTTOM); if (!CheckLocalFlag(0x24)) { - SetTileType(0x73, 0x205, 1); + SetTileType(TILE_TYPE_115, TILE_POS(5, 8), LAYER_BOTTOM); } } } @@ -2191,21 +2192,21 @@ void sub_StateChange_DeepwoodShrine_Barrel(void) { switch (gSave.dws_barrel_state) { case 0: default: - SetTileType(0x90, 0x20b, 1); - SetTileType(0x90, 0x411, 1); + SetTileType(TILE_TYPE_144, TILE_POS(11, 8), LAYER_BOTTOM); + SetTileType(TILE_TYPE_144, TILE_POS(17, 16), LAYER_BOTTOM); break; case 2: - SetTileType(0x90, 0x211, 1); - SetTileType(0x90, 0x40b, 1); + SetTileType(TILE_TYPE_144, TILE_POS(17, 8), LAYER_BOTTOM); + SetTileType(TILE_TYPE_144, TILE_POS(11, 16), LAYER_BOTTOM); break; } if (CheckLocalFlag(0x15)) { - SetTileType(0x76, 0x304, 2); + SetTileType(TILE_TYPE_118, TILE_POS(4, 12), LAYER_TOP); } if (CheckLocalFlag(0x16)) { - SetTileType(0x76, 0x318, 2); + SetTileType(TILE_TYPE_118, TILE_POS(24, 12), LAYER_TOP); } } @@ -2249,9 +2250,9 @@ void sub_StateChange_DeepwoodShrine_Entrance(void) { if (GetInventoryValue(ITEM_EARTH_ELEMENT) == 0) { #endif #endif - SetTileType(0x365, 0x349, 1); - SetTileType(0x365, 0x34a, 1); - SetTileType(0x365, 0x34b, 1); + SetTileType(TILE_TYPE_869, TILE_POS(9, 13), LAYER_BOTTOM); + SetTileType(TILE_TYPE_869, TILE_POS(10, 13), LAYER_BOTTOM); + SetTileType(TILE_TYPE_869, TILE_POS(11, 13), LAYER_BOTTOM); } } #else @@ -2342,7 +2343,7 @@ u32 sub_unk3_DeepwoodShrine_InsideBarrel(void) { void sub_StateChange_DeepwoodShrine_InsideBarrel(void) { sub_08058D34(); - gArea.areaMetadata |= 0x40; + gArea.areaMetadata |= AR_HAS_NO_ENEMIES; gMain.substate = GAMEMAIN_BARRELUPDATE; } @@ -2386,9 +2387,9 @@ u32 sub_unk3_CaveOfFlames_Entrance(void) { #ifdef DEMO_USA void sub_StateChange_CaveOfFlames_Entrance(void) { if (GetInventoryValue(ITEM_FIRE_ELEMENT) == 0) { - SetTileType(0x365, 0x287, 2); - SetTileType(0x365, 0x288, 2); - SetTileType(0x365, 0x289, 2); + SetTileType(TILE_TYPE_869, TILE_POS(7, 10), LAYER_TOP); + SetTileType(TILE_TYPE_869, TILE_POS(8, 10), LAYER_TOP); + SetTileType(TILE_TYPE_869, TILE_POS(9, 10), LAYER_TOP); } } #else @@ -3141,7 +3142,7 @@ extern EntityData gUnk_080E718C; extern EntityData gUnk_080E71AC; void sub_StateChange_RoyalCrypt_Entrance(void) { - SetTileType(0x312, 0x108, 1); + SetTileType(TILE_TYPE_786, TILE_POS(8, 4), LAYER_BOTTOM); EnableRandomDrops(); if (!CheckLocalFlag(0xc4)) { LoadRoomEntityList(&gUnk_080E718C); @@ -3641,8 +3642,8 @@ void sub_StateChange_DarkHyruleCastleOutside_ZeldaStatuePlatform(void) { LoadRoomEntityList(&gUnk_080EAD68); } else if (!CheckLocalFlag(0x79)) { LoadRoomEntityList(&gUnk_080EADB8); - SetTileType(0x4072, 0x145, 1); - SetTileType(0x4072, 0x149, 1); + SetTileType(SPECIAL_TILE_114, TILE_POS(5, 5), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(9, 5), LAYER_BOTTOM); gArea.queued_bgm = SFX_NONE; } } @@ -3657,7 +3658,7 @@ void sub_0804D7EC(void) { while (*tilePos != 0) { temp = *tilePos; tilePos++; - SetTileType(0x4072, temp, 1); + SetTileType(SPECIAL_TILE_114, temp, LAYER_BOTTOM); } } @@ -3682,7 +3683,7 @@ extern EntityData gUnk_080EAEC0; extern EntityData gUnk_080EAF20; void sub_StateChange_DarkHyruleCastleOutside_Garden(void) { - gArea.areaMetadata = 0x40; + gArea.areaMetadata = AR_HAS_NO_ENEMIES; gArea.locationIndex = 0; if (CheckGlobalFlag(ENDING)) { if (!CheckLocalFlag(0x7f)) { @@ -4353,7 +4354,7 @@ void sub_StateChange_HyruleTown_0(void) { EnableRandomDrops(); TryLoadPrologueHyruleTown(); #if defined(USA) || defined(DEMO_USA) || defined(DEMO_JP) - SetTileType(0x176, 0x66b, 1); + SetTileType(TILE_TYPE_374, TILE_POS(43, 25), LAYER_BOTTOM); #endif if (gSave.global_progress == 1) { sub_0801D000(0); @@ -4446,7 +4447,7 @@ void sub_0804E150(void) { uVar3 = 1 << gSave.global_progress; for (; pTileData[1] != 0; pTileData += 3) { if ((pTileData[0] & uVar3) != 0) { - SetBottomTile(pTileData[2], pTileData[1], 1); + SetTile(pTileData[2], pTileData[1], LAYER_BOTTOM); } } if (CheckLocalFlag(SHOP05_OPEN) == 0) { @@ -4454,7 +4455,7 @@ void sub_0804E150(void) { uVar3 = 1 << gSave.global_progress; for (; pTileData[0] != 0; pTileData += 3) { if ((pTileData[0] & uVar3) != 0) { - SetBottomTile(pTileData[2], pTileData[1], 1); + SetTile(pTileData[2], pTileData[1], LAYER_BOTTOM); } } } @@ -4463,7 +4464,7 @@ void sub_0804E150(void) { uVar3 = 1 << gSave.global_progress; for (; pTileData[0] != 0; pTileData += 3) { if ((pTileData[0] & uVar3) != 0) { - SetBottomTile(pTileData[2], pTileData[1], 1); + SetTile(pTileData[2], pTileData[1], LAYER_BOTTOM); } } } @@ -4597,16 +4598,16 @@ void sub_StateChange_CastleGarden_Main(void) { } if (!CheckLocalFlag(SOUGEN_08_TORITSUKI)) { LoadRoomEntityList(&gUnk_080F0800); - SetTileType(0x4072, 600, 1); - SetTileType(0x4072, 0x298, 1); - SetTileType(0x4072, 0x266, 1); - SetTileType(0x4072, 0x2a6, 1); + SetTileType(SPECIAL_TILE_114, TILE_POS(24, 9), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(24, 10), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(38, 9), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(38, 10), LAYER_BOTTOM); } else { if (!GetInventoryValue(ITEM_FOURSWORD)) { LoadRoomEntityList(&gUnk_080F08F0); - SetTileType(0x4072, 0x9e, 1); - SetTileType(0x4072, 0x9f, 1); - SetTileType(0x4072, 0xa0, 1); + SetTileType(SPECIAL_TILE_114, TILE_POS(30, 2), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(31, 2), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(32, 2), LAYER_BOTTOM); } LoadRoomEntityList(&gUnk_080F0850); if (!GetInventoryValue(ITEM_WATER_ELEMENT)) { @@ -4614,8 +4615,8 @@ void sub_StateChange_CastleGarden_Main(void) { } else { LoadRoomEntityList(&gUnk_080F0890); } - SetTileType(0x4072, 600, 1); - SetTileType(0x4072, 0x298, 1); + SetTileType(SPECIAL_TILE_114, TILE_POS(24, 9), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(24, 10), LAYER_BOTTOM); if (CheckLocalFlag(MAENIWA_00_WARP)) { LoadRoomEntityList(&gUnk_080F0920); ClearLocalFlag(MAENIWA_00_WARP); @@ -4954,10 +4955,10 @@ extern EntityData gUnk_080F3260; void sub_StateChange_HouseInteriors4_Carpenter(void) { if (GetInventoryValue(ITEM_PACCI_CANE)) { LoadRoomEntityList(&gUnk_080F3260); - SetTileType(0x4072, 0x202, 1); - SetTileType(0x4072, 0x242, 1); - SetTileType(0x4072, 0x204, 1); - SetTileType(0x4072, 0x244, 1); + SetTileType(SPECIAL_TILE_114, TILE_POS(2, 8), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(2, 9), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(4, 8), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(4, 9), LAYER_BOTTOM); } } @@ -5043,22 +5044,22 @@ void sub_StateChange_LakeHylia_Main(void) { if ((gSave.global_progress > 3) && CheckGlobalFlag(TINGLE_TALK1ST)) { LoadRoomEntityList(&gUnk_080F3C44); } - SetBottomTile(0x4091, 0x590, 1); - SetBottomTile(0x4091, 0x591, 1); - SetBottomTile(0x4091, 0x592, 1); - SetBottomTile(0x4091, 0x593, 1); - SetBottomTile(0x4091, 0x594, 1); - SetBottomTile(0x4091, 0x5d0, 1); - SetBottomTile(0x4091, 0x610, 1); - SetBottomTile(0x4091, 0x650, 1); - SetBottomTile(0x4091, 0x5d4, 1); - SetBottomTile(0x4091, 0x614, 1); - SetBottomTile(0x4091, 0x654, 1); - SetBottomTile(0x4091, 0x690, 1); - SetBottomTile(0x4091, 0x691, 1); - SetBottomTile(0x4091, 0x692, 1); - SetBottomTile(0x4091, 0x693, 1); - SetBottomTile(0x4091, 0x694, 1); + SetTile(SPECIAL_TILE_145, TILE_POS(16, 22), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(17, 22), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(18, 22), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(19, 22), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(20, 22), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(16, 23), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(16, 24), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(16, 25), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(20, 23), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(20, 24), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(20, 25), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(16, 26), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(17, 26), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(18, 26), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(19, 26), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(20, 26), LAYER_BOTTOM); } u32 sub_unk3_LakeHylia_Beanstalk(void) { @@ -5132,7 +5133,7 @@ void sub_StateChange_VeilFallsDigCave_Main(void) { } u32 sub_unk3_OuterFortressOfWinds_EntranceHall(void) { - gArea.areaMetadata |= 0x48; + gArea.areaMetadata |= AR_HAS_NO_ENEMIES | AR_HAS_MAP; return 1; } @@ -5140,7 +5141,7 @@ void sub_StateChange_OuterFortressOfWinds_EntranceHall(void) { } u32 sub_unk3_OuterFortressOfWinds_2F(void) { - gArea.areaMetadata |= 0x48; + gArea.areaMetadata |= AR_HAS_NO_ENEMIES | AR_HAS_MAP; return 1; } @@ -5148,7 +5149,7 @@ void sub_StateChange_OuterFortressOfWinds_2F(void) { } u32 sub_unk3_OuterFortressOfWinds_3F(void) { - gArea.areaMetadata |= 0x48; + gArea.areaMetadata |= AR_HAS_NO_ENEMIES | AR_HAS_MAP; return 1; } @@ -5157,7 +5158,7 @@ void sub_StateChange_OuterFortressOfWinds_3F(void) { u32 sub_unk3_OuterFortressOfWinds_MoleMitts(void) { sub_0801DD58(0x58, 5); - gArea.areaMetadata |= 0x48; + gArea.areaMetadata |= AR_HAS_NO_ENEMIES | AR_HAS_MAP; return 1; } @@ -5166,7 +5167,7 @@ void sub_StateChange_OuterFortressOfWinds_MoleMitts(void) { u32 sub_unk3_OuterFortressOfWinds_SmallKey(void) { sub_0801DD58(0x58, 6); - gArea.areaMetadata |= 0x48; + gArea.areaMetadata |= AR_HAS_NO_ENEMIES | AR_HAS_MAP; return 1; } @@ -5212,8 +5213,8 @@ void sub_StateChange_MinishWoods_Main(void) { LoadRoomEntityList(&gUnk_080F4E10); } #ifdef DEMO_USA - SetTileType(0x177, 0x5b4, 1); - SetTileType(0x177, 0x5f4, 1); + SetTileType(TILE_TYPE_375, TILE_POS(52, 22), LAYER_BOTTOM); + SetTileType(TILE_TYPE_375, TILE_POS(52, 23), LAYER_BOTTOM); #endif } @@ -5492,8 +5493,8 @@ void sub_StateChange_WindTribeTower_Entrance(void) { LoadRoomEntityList(&gUnk_080F61BC); } if (!CheckGlobalFlag(WARP_EVENT_END)) { - SetTileType(0x4072, 0x4c7, 1); - SetTileType(0x4072, 0x507, 1); + SetTileType(SPECIAL_TILE_114, TILE_POS(7, 19), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(7, 20), LAYER_BOTTOM); } SetWorldMapPos(8, 0, 0x1e8, 0x158); } @@ -5550,7 +5551,7 @@ void sub_StateChange_WindTribeTowerRoof_Main(void) { } SetWorldMapPos(8, 0, 0x1e8, 0x158); #ifndef EU - gArea.areaMetadata |= 0x80; + gArea.areaMetadata |= AR_ALLOWS_WARP; #endif } @@ -5702,10 +5703,10 @@ void sub_StateChange_HyruleField_EasternHillsNorth(void) { } if (GetInventoryValue(ITEM_GUST_JAR) && !GetInventoryValue(ITEM_PACCI_CANE)) { LoadRoomEntityList(&gUnk_080F7550); - SetTileType(0x4072, 0x311, 1); - SetTileType(0x4072, 0x351, 1); - SetTileType(0x4072, 0x3d9, 1); - SetTileType(0x4072, 0x419, 1); + SetTileType(SPECIAL_TILE_114, TILE_POS(17, 12), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(17, 13), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(25, 15), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(25, 16), LAYER_BOTTOM); } } @@ -5733,8 +5734,8 @@ void sub_StateChange_HyruleField_LonLonRanch(void) { } if (!CheckKinstoneFused(KINSTONE_29)) { LoadRoomEntityList(&gUnk_080F7860); - SetBottomTile(0x4072, 0xd88, 1); - SetBottomTile(0x4096, 0xdc8, 1); + SetTile(SPECIAL_TILE_114, TILE_POS(8, 54), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_150, TILE_POS(8, 55), LAYER_BOTTOM); } if ((gSave.global_progress > 3) && CheckGlobalFlag(TINGLE_TALK1ST)) { LoadRoomEntityList(&gUnk_080F78A0); @@ -5775,11 +5776,11 @@ void sub_StateChange_HyruleField_OutsideCastle(void) { sub_0804F4E4(); if (!CheckLocalFlag(SOUGEN_06_AKINDO)) { LoadRoomEntityList(&gUnk_080F7D70); - SetTileType(0x174, 0x7a2, 1); - SetTileType(0x174, 0x7a3, 1); - SetTileType(0x174, 0x7a5, 1); - SetTileType(0x174, 0x7a6, 1); - SetTileType(0x174, 0x7a7, 1); + SetTileType(TILE_TYPE_372, TILE_POS(34, 30), LAYER_BOTTOM); + SetTileType(TILE_TYPE_372, TILE_POS(35, 30), LAYER_BOTTOM); + SetTileType(TILE_TYPE_372, TILE_POS(37, 30), LAYER_BOTTOM); + SetTileType(TILE_TYPE_372, TILE_POS(38, 30), LAYER_BOTTOM); + SetTileType(TILE_TYPE_372, TILE_POS(39, 30), LAYER_BOTTOM); } if (!CheckGlobalFlag(TABIDACHI)) { #ifdef EU @@ -5796,26 +5797,26 @@ static void sub_0804F578(void) { if (!CheckLocalFlag(SOUGEN_06_SLIDE)) { LoadRoomEntityList(&gUnk_080F7DC0); } else { - SetTileType(0x37, 0x94a, 1); - SetTileType(0x37, 0x94b, 1); - SetTileType(0x37, 0x94c, 1); - SetTileType(0x37, 0x98a, 1); - SetTileType(0x37, 0x98b, 1); - SetTileType(0x37, 0x98c, 1); + SetTileType(TILE_TYPE_55, TILE_POS(10, 37), LAYER_BOTTOM); + SetTileType(TILE_TYPE_55, TILE_POS(11, 37), LAYER_BOTTOM); + SetTileType(TILE_TYPE_55, TILE_POS(12, 37), LAYER_BOTTOM); + SetTileType(TILE_TYPE_55, TILE_POS(10, 38), LAYER_BOTTOM); + SetTileType(TILE_TYPE_55, TILE_POS(11, 38), LAYER_BOTTOM); + SetTileType(TILE_TYPE_55, TILE_POS(12, 38), LAYER_BOTTOM); } } void sub_0804F5E8(void) { sub_0804F4E4(); - SetTileType(0x1d3, 0xbde, 1); - SetTileType(0x1d6, 0xbe2, 1); - SetTileType(0x1d4, 0xc1f, 1); - SetTileType(0x1d5, 0xc20, 1); - SetTileType(0x1d6, 0xc5e, 1); - SetTileType(0x4072, 0xb9b, 1); - SetTileType(0x4072, 0xbdb, 1); - SetTileType(0x4072, 0xaa4, 1); - SetTileType(0x4072, 0xae4, 1); + SetTileType(TILE_TYPE_467, TILE_POS(30, 47), LAYER_BOTTOM); + SetTileType(TILE_TYPE_470, TILE_POS(34, 47), LAYER_BOTTOM); + SetTileType(TILE_TYPE_468, TILE_POS(31, 48), LAYER_BOTTOM); + SetTileType(TILE_TYPE_469, TILE_POS(32, 48), LAYER_BOTTOM); + SetTileType(TILE_TYPE_470, TILE_POS(30, 49), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(27, 46), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(27, 47), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(36, 42), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(36, 43), LAYER_BOTTOM); } void sub_0804F680(Entity* parent, s32 x, s32 y) { @@ -5876,66 +5877,67 @@ void sub_0804F79C(Entity* parent) { } } +// Stones being spawned by vaati outside the castle. void sub_0804F808(void) { - SetTileType(0x1d3, 0x41d, 1); - SetTileType(0x1d3, 0x621, 1); + SetTileType(TILE_TYPE_467, TILE_POS(29, 16), LAYER_BOTTOM); + SetTileType(TILE_TYPE_467, TILE_POS(33, 24), LAYER_BOTTOM); } void sub_0804F830(void) { - SetTileType(0x1d4, 0x41e, 1); - SetTileType(0x1d4, 0x620, 1); + SetTileType(TILE_TYPE_468, TILE_POS(30, 16), LAYER_BOTTOM); + SetTileType(TILE_TYPE_468, TILE_POS(32, 24), LAYER_BOTTOM); } void sub_0804F854(void) { - SetTileType(0x1d5, 0x41f, 1); - SetTileType(0x1d4, 0x4e5, 1); - SetTileType(0x1d5, 0x61f, 1); - SetTileType(0x1d4, 0x559, 1); + SetTileType(TILE_TYPE_469, TILE_POS(31, 16), LAYER_BOTTOM); + SetTileType(TILE_TYPE_468, TILE_POS(37, 19), LAYER_BOTTOM); + SetTileType(TILE_TYPE_469, TILE_POS(31, 24), LAYER_BOTTOM); + SetTileType(TILE_TYPE_468, TILE_POS(25, 21), LAYER_BOTTOM); } void sub_0804F89C(void) { - SetTileType(0x1d6, 0x420, 1); - SetTileType(0x1d5, 0x525, 1); - SetTileType(0x1d6, 0x61e, 1); - SetTileType(0x1d5, 0x519, 1); + SetTileType(TILE_TYPE_470, TILE_POS(32, 16), LAYER_BOTTOM); + SetTileType(TILE_TYPE_469, TILE_POS(37, 20), LAYER_BOTTOM); + SetTileType(TILE_TYPE_470, TILE_POS(30, 24), LAYER_BOTTOM); + SetTileType(TILE_TYPE_469, TILE_POS(25, 20), LAYER_BOTTOM); } void sub_0804F8E0(void) { - SetTileType(0x1d3, 0x421, 1); - SetTileType(0x1d6, 0x565, 1); - SetTileType(0x1d3, 0x61d, 1); - SetTileType(0x1d6, 0x4d9, 1); + SetTileType(TILE_TYPE_467, TILE_POS(33, 16), LAYER_BOTTOM); + SetTileType(TILE_TYPE_470, TILE_POS(37, 21), LAYER_BOTTOM); + SetTileType(TILE_TYPE_467, TILE_POS(29, 24), LAYER_BOTTOM); + SetTileType(TILE_TYPE_470, TILE_POS(25, 19), LAYER_BOTTOM); } void sub_0804F928(void) { - RestorePrevTileEntity(0x41d, 1); - RestorePrevTileEntity(0x621, 1); + RestorePrevTileEntity(TILE_POS(29, 16), LAYER_BOTTOM); + RestorePrevTileEntity(TILE_POS(33, 24), LAYER_BOTTOM); } void sub_0804F944(void) { - RestorePrevTileEntity(0x41e, 1); - RestorePrevTileEntity(0x620, 1); + RestorePrevTileEntity(TILE_POS(30, 16), LAYER_BOTTOM); + RestorePrevTileEntity(TILE_POS(32, 24), LAYER_BOTTOM); } void sub_0804F960(void) { - RestorePrevTileEntity(0x41f, 1); - RestorePrevTileEntity(0x4e5, 1); - RestorePrevTileEntity(0x61f, 1); - RestorePrevTileEntity(0x559, 1); + RestorePrevTileEntity(TILE_POS(31, 16), LAYER_BOTTOM); + RestorePrevTileEntity(TILE_POS(37, 19), LAYER_BOTTOM); + RestorePrevTileEntity(TILE_POS(31, 24), LAYER_BOTTOM); + RestorePrevTileEntity(TILE_POS(25, 21), LAYER_BOTTOM); } void sub_0804F994(void) { - RestorePrevTileEntity(0x420, 1); - RestorePrevTileEntity(0x525, 1); - RestorePrevTileEntity(0x61e, 1); - RestorePrevTileEntity(0x519, 1); + RestorePrevTileEntity(TILE_POS(32, 16), LAYER_BOTTOM); + RestorePrevTileEntity(TILE_POS(37, 20), LAYER_BOTTOM); + RestorePrevTileEntity(TILE_POS(30, 24), LAYER_BOTTOM); + RestorePrevTileEntity(TILE_POS(25, 20), LAYER_BOTTOM); } void sub_0804F9C8(void) { - RestorePrevTileEntity(0x421, 1); - RestorePrevTileEntity(0x565, 1); - RestorePrevTileEntity(0x61d, 1); - RestorePrevTileEntity(0x4d9, 1); + RestorePrevTileEntity(TILE_POS(33, 16), LAYER_BOTTOM); + RestorePrevTileEntity(TILE_POS(37, 21), LAYER_BOTTOM); + RestorePrevTileEntity(TILE_POS(29, 24), LAYER_BOTTOM); + RestorePrevTileEntity(TILE_POS(25, 19), LAYER_BOTTOM); } u32 sub_unk3_HyruleField_TrilbyHighlands(void) { @@ -6089,7 +6091,7 @@ void sub_StateChange_Caves_LonLonRanchSecret(void) { SetRoomFlag(1); ChangeLightLevel(0x100); if (!CheckLocalFlag(0x12)) { - SetTileType(0x73, 0xcb, 1); + SetTileType(TILE_TYPE_115, TILE_POS(11, 3), LAYER_BOTTOM); } } } @@ -6609,7 +6611,7 @@ u32 sub_unk3_MtCrenel_Entrance(void) { void sub_StateChange_MtCrenel_Entrance(void) { #if defined(USA) || defined(DEMO_USA) || defined(DEMO_JP) - SetTileType(0x176, 0x66f, 1); + SetTileType(TILE_TYPE_374, TILE_POS(47, 25), LAYER_BOTTOM); #endif } diff --git a/src/screenTilemap.c b/src/screenTileMap.c similarity index 99% rename from src/screenTilemap.c rename to src/screenTileMap.c index 55ad4a55..4c8e02ee 100644 --- a/src/screenTilemap.c +++ b/src/screenTileMap.c @@ -1,6 +1,7 @@ #include "global.h" #include "room.h" +// Called when gUpdateVisibleTiles == 2 void sub_0807D280(u16* mapspecial, u16* bgbuffer) { u32 unk_18; s32 tmp1, tmp2, tmp3, tmp4, tmp5, tmp6; @@ -80,6 +81,7 @@ void sub_0807D280(u16* mapspecial, u16* bgbuffer) { } } +// Called when gUpdateVisibleTiles == 3 void sub_0807D46C(u16* mapSpecial, u16* bgBuffer) { s32 index, r0, r1, r2, r5, r8, r12; u16 *r4, *r6; @@ -211,6 +213,7 @@ void sub_0807D46C(u16* mapSpecial, u16* bgBuffer) { } } +// Called when gUpdateVisibleTiles == 4 void sub_0807D6D8(u16* mapSpecial, u16* bgBuffer) { s32 Unk1a; s32 SquaredUnk18; diff --git a/src/script.c b/src/script.c index 3a826a34..bb2cfe75 100644 --- a/src/script.c +++ b/src/script.c @@ -127,11 +127,11 @@ void ScriptCommand_WalkEast(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_WalkSouth(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_WalkWest(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807ED24(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807EDD4(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807EE04(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807EE30(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807EEB4(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807EEF4(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_MoveTo(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_LookAt(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_MoveTowardsTarget(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_MoveToPlayer(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_MoveToOffset(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807EF3C(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_DoPostScriptAction(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_DoPostScriptAction2(Entity* entity, ScriptExecutionContext* context); @@ -424,7 +424,7 @@ void sub_0807DE80(Entity* entity) { sub_080042BA(entity, local1); } -void sub_0807DEDC(Entity* entity, ScriptExecutionContext* context, u32 x, u32 y) { +void LookAt(Entity* entity, ScriptExecutionContext* context, u32 x, u32 y) { static const u8 sDirectionTable[] = { 0, 0, 2, 2, 2, 2, 4, 4, 4, 4, 6, 6, 6, 6, 0, 0 }; int direction; s32 xOffset, yOffset; @@ -436,7 +436,7 @@ void sub_0807DEDC(Entity* entity, ScriptExecutionContext* context, u32 x, u32 y) context->y.HALF.HI = y; xOffset = context->x.HALF.HI - entity->x.HALF.HI; yOffset = context->y.HALF.HI - entity->y.HALF.HI; - direction = CalcOffsetAngle(xOffset, yOffset); + direction = CalculateDirectionFromOffsets(xOffset, yOffset); entity->direction = direction; entity->animationState = (entity->animationState & 0x80) | sDirectionTable[(u8)direction >> 4]; } @@ -448,13 +448,13 @@ void DisablePauseMenuAndPutAwayItems(void) { } void DisablePauseMenu(void) { - gUnk_0200AF00.unk_1 = 0xff; + gHUD.hideFlags = HUD_HIDE_ALL; gPauseMenuOptions.disabled = 0xff; } void EnablePauseMenu(void) { gPauseMenuOptions.disabled = 0; - gUnk_0200AF00.unk_1 = 0; + gHUD.hideFlags = HUD_HIDE_NONE; RecoverUI(0, 0); ResetPlayerAnimationAndAction(); PlayerDropHeldObject(); @@ -577,11 +577,11 @@ void ExecuteScript(Entity* entity, ScriptExecutionContext* context) { ScriptCommand_WalkSouth, ScriptCommand_WalkWest, ScriptCommand_0807ED24, - ScriptCommand_0807EDD4, - ScriptCommand_0807EE04, - ScriptCommand_0807EE30, - ScriptCommand_0807EEB4, - ScriptCommand_0807EEF4, + ScriptCommand_MoveTo, + ScriptCommand_LookAt, + ScriptCommand_MoveTowardsTarget, + ScriptCommand_MoveToPlayer, + ScriptCommand_MoveToOffset, ScriptCommand_0807EF3C, ScriptCommand_DoPostScriptAction, ScriptCommand_DoPostScriptAction2, @@ -1372,29 +1372,30 @@ void ScriptCommand_0807ED24(Entity* entity, ScriptExecutionContext* context) { } // player movement? -void ScriptCommand_0807EDD4(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_MoveTo(Entity* entity, ScriptExecutionContext* context) { if (!context->unk_18) { context->unk_18 = 1; - ScriptCommand_0807EE04(entity, context); + ScriptCommand_LookAt(entity, context); } - ScriptCommand_0807EE30(entity, context); + ScriptCommand_MoveTowardsTarget(entity, context); + // Repeat this command until we are at the target. if (!context->condition) { gActiveScriptInfo.commandSize = 0; } } -void ScriptCommand_0807EE04(Entity* entity, ScriptExecutionContext* context) { - sub_0807DEDC(entity, context, context->scriptInstructionPointer[1] + gRoomControls.origin_x, - context->scriptInstructionPointer[2] + gRoomControls.origin_y); +void ScriptCommand_LookAt(Entity* entity, ScriptExecutionContext* context) { + LookAt(entity, context, context->scriptInstructionPointer[1] + gRoomControls.origin_x, + context->scriptInstructionPointer[2] + gRoomControls.origin_y); gActiveScriptInfo.flags |= 1; } -void ScriptCommand_0807EE30(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_MoveTowardsTarget(Entity* entity, ScriptExecutionContext* context) { s32 tmp, tmp2; if (!--context->unk_19) { context->unk_19 = 8; - entity->direction = - CalcOffsetAngle(context->x.HALF.HI - entity->x.HALF.HI, context->y.HALF.HI - entity->y.HALF.HI); + entity->direction = CalculateDirectionFromOffsets(context->x.HALF.HI - entity->x.HALF.HI, + context->y.HALF.HI - entity->y.HALF.HI); } tmp = entity->x.HALF.HI - context->x.HALF.HI; tmp2 = entity->y.HALF.HI - context->y.HALF.HI; @@ -1410,24 +1411,26 @@ void ScriptCommand_0807EE30(Entity* entity, ScriptExecutionContext* context) { } } -void ScriptCommand_0807EEB4(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_MoveToPlayer(Entity* entity, ScriptExecutionContext* context) { if (!context->unk_18) { context->unk_18 = 1; - sub_0807DEDC(entity, context, gPlayerEntity.base.x.HALF.HI, gPlayerEntity.base.y.HALF.HI); + LookAt(entity, context, gPlayerEntity.base.x.HALF.HI, gPlayerEntity.base.y.HALF.HI); } - ScriptCommand_0807EE30(entity, context); + ScriptCommand_MoveTowardsTarget(entity, context); + // Repeat this command until we are at the target. if (!context->condition) { gActiveScriptInfo.commandSize = 0; } } -void ScriptCommand_0807EEF4(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_MoveToOffset(Entity* entity, ScriptExecutionContext* context) { if (!context->unk_18) { context->unk_18 = 1; - sub_0807DEDC(entity, context, entity->x.HALF.HI + ((s16)context->scriptInstructionPointer[1]), - entity->y.HALF.HI + ((s16)context->scriptInstructionPointer[2])); + LookAt(entity, context, entity->x.HALF.HI + ((s16)context->scriptInstructionPointer[1]), + entity->y.HALF.HI + ((s16)context->scriptInstructionPointer[2])); } - ScriptCommand_0807EE30(entity, context); + ScriptCommand_MoveTowardsTarget(entity, context); + // Repeat this command until we are at the target. if (!context->condition) { gActiveScriptInfo.commandSize = 0; } @@ -1578,7 +1581,7 @@ void sub_0807F190(Entity* entity, ScriptExecutionContext* context) { } void sub_0807F1A0(Entity* entity, ScriptExecutionContext* context) { - sub_0807DEDC(entity, context, gPlayerEntity.base.x.HALF.HI, gPlayerEntity.base.y.HALF.HI); + LookAt(entity, context, gPlayerEntity.base.x.HALF.HI, gPlayerEntity.base.y.HALF.HI); gActiveScriptInfo.flags |= 1; } diff --git a/src/scroll.c b/src/scroll.c index 3baf20fb..973bfcbd 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -1,11 +1,11 @@ #include "scroll.h" #include "asm.h" +#include "beanstalkSubtask.h" #include "collision.h" #include "common.h" #include "effects.h" #include "entity.h" -#include "fileselect.h" #include "functions.h" #include "game.h" #include "kinstone.h" @@ -14,47 +14,47 @@ #include "object.h" #include "screen.h" #include "structures.h" +#include "tileMap.h" +#include "tiles.h" -extern void sub_08080BC4(void); -extern void sub_080197D4(const void*); +extern void UpdateScreenShake(void); extern void sub_0807C8B0(u16*, u32, u32); -extern void sub_0801AB08(u8*, LayerStruct*); extern void sub_0807C810(); extern void DeleteSleepingEntities(void); extern void sub_0807BBE4(); -extern void sub_0807BC84(); +extern void CreateCollisionDataBorderAroundRoom(); extern void sub_0805E248(); extern u8 gUpdateVisibleTiles; extern u16 gUnk_0200B640; -extern u32** gUnk_08109194[]; -extern u32 gUnk_02022830[]; -extern u16 gUnk_020246B0[]; -extern u8 gUnk_080B7910[]; +extern MapDataDefinition** gCaveBorderMapData[]; +extern u16 gUnk_02022830[0xc00]; +extern u16 gUnk_020246B0[0xc00]; +extern u8 gMapSpecialTileToActTile[]; -void sub_0807FC64(RoomControls*); -void sub_0807FC7C(RoomControls*); -void sub_0807FDB0(RoomControls*); -void sub_0807FEF0(RoomControls*); -void sub_0807FF54(RoomControls*); -void sub_0807FDC8(RoomControls*); -void sub_0807FDE4(RoomControls*); -void sub_0807FDF8(RoomControls*); +void Scroll0(RoomControls*); +void Scroll1(RoomControls*); +void Scroll2(RoomControls*); +void Scroll4(RoomControls*); +void Scroll5(RoomControls*); +void Scroll2Sub0(RoomControls*); +void Scroll2Sub1(RoomControls*); +void Scroll2Sub2(RoomControls*); void sub_0807FEC8(RoomControls*); -void sub_0807FF08(RoomControls*); -void sub_0807FF1C(RoomControls*); +void Scroll4Sub0(RoomControls*); +void Scroll4Sub1(RoomControls*); -void sub_0807FF6C(RoomControls*); -void sub_0807FFE4(RoomControls*); -void sub_08080040(RoomControls*); -void sub_08080108(RoomControls*); -void sub_08080198(RoomControls*); -void sub_080801BC(RoomControls*); +void Scroll5Sub0(RoomControls*); +void Scroll5Sub1(RoomControls*); +void Scroll5Sub2(RoomControls*); +void Scroll5Sub3(RoomControls*); +void Scroll5Sub4(RoomControls*); +void Scroll5Sub5(RoomControls*); u32 sub_080803D0(); u32 sub_08080278(); -void sub_08080C80(u32*); +void sub_08080C80(MapDataDefinition*); void sub_08080368(); -void sub_08080B60(LayerStruct*); +void FillActTileForLayer(MapLayer* mapLayer); bool32 sub_08080794(const Transition* transition, u32 param_2, u32 param_3, u32 param_4); bool32 sub_08080808(const Transition* transition, u32 param_2, u32 param_3, u32 param_4); void sub_080808D8(s32); @@ -62,48 +62,48 @@ void sub_080808E4(s32); void sub_08080904(s32); void sub_08080910(s32); -extern u8 gMapDataTopSpecial[]; - extern const s8 gShakeOffsets[]; void UpdateScroll(void) { static void (*const gUnk_0811E768[])(RoomControls*) = { - sub_0807FC64, sub_0807FC7C, sub_0807FDB0, NULL, sub_0807FEF0, sub_0807FF54, + Scroll0, Scroll1, Scroll2, NULL, Scroll4, Scroll5, }; gRoomControls.scroll_flags &= 0xfb; gUnk_0811E768[gRoomControls.scrollAction](&gRoomControls); } -void sub_0807FC64(RoomControls* controls) { +void Scroll0(RoomControls* controls) { controls->scrollAction = 1; controls->reload_flags = 0; controls->scrollSpeed = 4; - sub_0807FC7C(controls); + Scroll1(controls); UpdateIsDiggingCave(); } -void sub_0807FC7C(RoomControls* controls) { +// Scroll until target is at the center of the screen. +void Scroll1(RoomControls* controls) { s32 uVar2; - s32 uVar3; - s32 iVar4; + s32 diff; + s32 unused; s32 uVar5; - s32 temp; + s32 targetValue; if (controls->camera_target != NULL) { - iVar4 = controls->scroll_x; - temp = controls->camera_target->x.HALF.HI - 0x78; - uVar3 = controls->scroll_x - temp; - if (uVar3 != 0) { + // Scroll in x direction. + unused = controls->scroll_x; + targetValue = controls->camera_target->x.HALF.HI - 0x78; + diff = controls->scroll_x - targetValue; + if (diff != 0) { uVar5 = controls->scroll_x & 7; - if (uVar3 >= 1) { + if (diff >= 1) { if (controls->origin_x < controls->scroll_x) { - if (controls->scrollSpeed <= uVar3) { - uVar3 = controls->scrollSpeed; + if (controls->scrollSpeed <= diff) { + diff = controls->scrollSpeed; controls->scroll_flags |= 4; } - controls->scroll_x = controls->scroll_x - uVar3; - if (uVar5 - uVar3 < 1) { + controls->scroll_x = controls->scroll_x - diff; + if (uVar5 - diff < 1) { gUpdateVisibleTiles = 1; } if (controls->origin_x >= controls->scroll_x) { @@ -113,12 +113,12 @@ void sub_0807FC7C(RoomControls* controls) { } else { uVar2 = controls->origin_x + controls->width - 0xf0; if (controls->scroll_x < uVar2) { - if (-controls->scrollSpeed >= uVar3) { - uVar3 = -controls->scrollSpeed; + if (-controls->scrollSpeed >= diff) { + diff = -controls->scrollSpeed; controls->scroll_flags |= 4; } - controls->scroll_x -= uVar3; - if (uVar5 - uVar3 > 7) { + controls->scroll_x -= diff; + if (uVar5 - diff > 7) { gUpdateVisibleTiles = 1; } if (controls->scroll_x >= uVar2) { @@ -128,19 +128,20 @@ void sub_0807FC7C(RoomControls* controls) { } } - iVar4 = controls->scroll_y; - temp = controls->camera_target->y.HALF.HI - 0x50; - uVar3 = controls->scroll_y - (temp); - if (uVar3 != 0) { + // Scroll in y direction. + unused = controls->scroll_y; + targetValue = controls->camera_target->y.HALF.HI - 0x50; + diff = controls->scroll_y - (targetValue); + if (diff != 0) { uVar5 = controls->scroll_y & 7; - if (uVar3 >= 1) { + if (diff >= 1) { if (controls->origin_y < controls->scroll_y) { - if (controls->scrollSpeed <= uVar3) { - uVar3 = controls->scrollSpeed; + if (controls->scrollSpeed <= diff) { + diff = controls->scrollSpeed; controls->scroll_flags |= 4; } - controls->scroll_y = controls->scroll_y - uVar3; - if (uVar5 - uVar3 < 1) { + controls->scroll_y = controls->scroll_y - diff; + if (uVar5 - diff < 1) { gUpdateVisibleTiles = 1; } if (controls->origin_y >= controls->scroll_y) { @@ -150,12 +151,12 @@ void sub_0807FC7C(RoomControls* controls) { } else { uVar2 = controls->origin_y + controls->height - DISPLAY_HEIGHT; if (controls->scroll_y < uVar2) { - if (-controls->scrollSpeed >= uVar3) { - uVar3 = -controls->scrollSpeed; + if (-controls->scrollSpeed >= diff) { + diff = -controls->scrollSpeed; controls->scroll_flags |= 4; } - controls->scroll_y -= uVar3; - if (uVar5 - uVar3 > 7) { + controls->scroll_y -= diff; + if (uVar5 - diff > 7) { gUpdateVisibleTiles = 1; } if (controls->scroll_y >= uVar2) { @@ -165,44 +166,42 @@ void sub_0807FC7C(RoomControls* controls) { } } } - sub_08080BC4(); + UpdateScreenShake(); } -void sub_0807FDB0(RoomControls* controls) { - static void (*const gUnk_0811E780[])(RoomControls*) = { - sub_0807FDC8, - sub_0807FDE4, - sub_0807FDF8, +void Scroll2(RoomControls* controls) { + static void (*const Scroll2_SubActions[])(RoomControls*) = { + Scroll2Sub0, + Scroll2Sub1, + Scroll2Sub2, }; - gUnk_0811E780[controls->scrollSubAction](controls); + Scroll2_SubActions[controls->scrollSubAction](controls); } -void sub_0807FDC8(RoomControls* controls) { +void Scroll2Sub0(RoomControls* controls) { gUpdateVisibleTiles = 1; UpdateScrollVram(); controls->scrollSubAction = 1; gUpdateVisibleTiles = 0; } -void sub_0807FDE4(RoomControls* controls) { +void Scroll2Sub1(RoomControls* controls) { controls->scrollSubAction = 2; controls->unk_18 = 0; gUpdateVisibleTiles = 2; } -void sub_0807FDF8(RoomControls* controls) { - u32 bVar1; - Entity* pEVar2; - s32 iVar3; +void Scroll2Sub2(RoomControls* controls) { + Entity* target; gUpdateVisibleTiles = 2; controls->unk_18++; switch (controls->scroll_direction) { case 0: controls->scroll_y -= 4; - pEVar2 = controls->camera_target; - if (pEVar2 == &gPlayerEntity.base) { - pEVar2->y.WORD = gPlayerEntity.base.y.WORD - Q_16_16(0.375); + target = controls->camera_target; + if (target == &gPlayerEntity.base) { + target->y.WORD = gPlayerEntity.base.y.WORD - Q_16_16(0.375); } if (controls->unk_18 == 0x28) { sub_0807FEC8(controls); @@ -219,9 +218,9 @@ void sub_0807FDF8(RoomControls* controls) { break; case 2: controls->scroll_y = controls->scroll_y + 4; - pEVar2 = controls->camera_target; - if (pEVar2 == &gPlayerEntity.base) { - pEVar2->y.WORD = gPlayerEntity.base.y.WORD + Q_16_16(0.375); + target = controls->camera_target; + if (target == &gPlayerEntity.base) { + target->y.WORD = gPlayerEntity.base.y.WORD + Q_16_16(0.375); } if (controls->unk_18 == 0x28) { sub_0807FEC8(controls); @@ -239,7 +238,7 @@ void sub_0807FDF8(RoomControls* controls) { } controls->shake_duration = 0; - sub_08080BC4(); + UpdateScreenShake(); } void sub_0807FEC8(RoomControls* controls) { @@ -249,21 +248,21 @@ void sub_0807FEC8(RoomControls* controls) { gPlayerState.startPosY = controls->camera_target->y.HALF.HI; } -void sub_0807FEF0(RoomControls* controls) { - static void (*const gUnk_0811E78C[])(RoomControls*) = { - sub_0807FF08, - sub_0807FF1C, +void Scroll4(RoomControls* controls) { + static void (*const Scroll4_SubActions[])(RoomControls*) = { + Scroll4Sub0, + Scroll4Sub1, }; - gUnk_0811E78C[controls->scrollSubAction](controls); + Scroll4_SubActions[controls->scrollSubAction](controls); } -void sub_0807FF08(RoomControls* controls) { +void Scroll4Sub0(RoomControls* controls) { controls->scrollSubAction = 1; controls->unk_18 = 0; gUpdateVisibleTiles = 3; } -void sub_0807FF1C(RoomControls* controls) { +void Scroll4Sub1(RoomControls* controls) { if ((gRoomTransition.frameCount & 1U) == 0) { gUpdateVisibleTiles = 3; if (++controls->unk_18 > 0x13) { @@ -273,14 +272,15 @@ void sub_0807FF1C(RoomControls* controls) { } } -void sub_0807FF54(RoomControls* controls) { - static void (*const gUnk_0811E794[])(RoomControls*) = { - sub_0807FF6C, sub_0807FFE4, sub_08080040, sub_08080108, sub_08080198, sub_080801BC, +// Circular screen transition when entering a diggingCaveEntrance. +void Scroll5(RoomControls* controls) { + static void (*const Scroll5_SubActions[])(RoomControls*) = { + Scroll5Sub0, Scroll5Sub1, Scroll5Sub2, Scroll5Sub3, Scroll5Sub4, Scroll5Sub5, }; - gUnk_0811E794[controls->scrollSubAction](controls); + Scroll5_SubActions[controls->scrollSubAction](controls); } -void sub_0807FF6C(RoomControls* controls) { +void Scroll5Sub0(RoomControls* controls) { controls->scrollSubAction = 1; gScreen.lcd.displayControl |= DISPCNT_WIN1_ON; gScreen.controls.windowInsideControl = (u8)gScreen.controls.windowInsideControl | 0x1700; @@ -297,74 +297,74 @@ void sub_0807FF6C(RoomControls* controls) { sub_080809D4(); } -void sub_0807FFE4(RoomControls* controls) { +void Scroll5Sub1(RoomControls* controls) { controls->scrollSubAction = 2; controls->unk_18 = sub_080803D0() + 6; gUnk_0200B640 = sub_08080278(); - sub_080197D4(*gUnk_08109194[gDiggingCaveEntranceTransition.entrance->type]); + LoadMapData(gCaveBorderMapData[gDiggingCaveEntranceTransition.entrance->type][0]); sub_0807C8B0(gMapTop.mapData, controls->width >> 4, controls->height >> 4); - sub_0801AB08(gMapDataTopSpecial, &gMapTop); + RenderMapLayerToSubTileMap(gMapDataTopSpecial, &gMapTop); } -void sub_08080040(RoomControls* controls) { - s32 iVar2; - s32 iVar3; - s32 uVar5; - s32 uVar6; - s32 iVar7; - s32 temp; +void Scroll5Sub2(RoomControls* controls) { + s32 diffX; + s32 diffY; + s32 left; + s32 right; + s32 bottom; + s32 top; controls->unk_18 -= 6; - controls->unk_1a = (controls->unk_18 << 1) / 3; - if (0x2a < controls->unk_18) { - iVar2 = controls->camera_target->x.HALF.HI - controls->scroll_x; - uVar6 = (iVar2 - controls->unk_18) + 8; - if (uVar6 < 0) { - uVar6 = 0; + controls->unk_1a = (controls->unk_18 * 2) / 3; + if (controls->unk_18 > 0x2a) { + diffX = controls->camera_target->x.HALF.HI - controls->scroll_x; + left = (diffX - controls->unk_18) + 8; + if (left < 0) { + left = 0; } - iVar7 = iVar2 + controls->unk_18 - 8; - if (DISPLAY_WIDTH < iVar7) { - iVar7 = DISPLAY_WIDTH; + right = diffX + controls->unk_18 - 8; + if (right > DISPLAY_WIDTH) { + right = DISPLAY_WIDTH; } - temp = controls->camera_target->y.HALF.HI - controls->scroll_y; - uVar5 = (temp - controls->unk_1a) + 8; - if (uVar5 < 0) { - uVar5 = 0; + diffY = controls->camera_target->y.HALF.HI - controls->scroll_y; + bottom = (diffY - controls->unk_1a) + 8; + if (bottom < 0) { + bottom = 0; } - iVar3 = temp + controls->unk_1a - 8; - if (DISPLAY_HEIGHT < iVar3) { - iVar3 = DISPLAY_HEIGHT; + top = diffY + controls->unk_1a - 8; + if (top > DISPLAY_HEIGHT) { + top = DISPLAY_HEIGHT; } - gScreen.controls.window1HorizontalDimensions = ((uVar6 & 0xff) << 8) | (iVar7 & 0xff); - gScreen.controls.window1VerticalDimensions = ((uVar5 & 0xff) << 8) | (iVar3 & 0xff); + gScreen.controls.window1HorizontalDimensions = ((left & 0xff) << 8) | (right & 0xff); + gScreen.controls.window1VerticalDimensions = ((bottom & 0xff) << 8) | (top & 0xff); } if (controls->unk_18 == 0) { controls->scrollSubAction = 3; DeleteSleepingEntities(); sub_0807C810(); - sub_08080C80(*(gUnk_08109194[gDiggingCaveEntranceTransition.entrance->type] + 1)); + sub_08080C80(gCaveBorderMapData[gDiggingCaveEntranceTransition.entrance->type][1]); } else { gUpdateVisibleTiles = 4; } } -void sub_08080108(RoomControls* controls) { +void Scroll5Sub3(RoomControls* controls) { controls->scrollSubAction = 4; MemCopy(gMapBottom.mapData, gMapBottom.mapDataOriginal, sizeof(gMapBottom.mapData)); MemCopy(gMapTop.mapData, gMapTop.mapDataOriginal, sizeof(gMapTop.mapData)); sub_08080368(); gUnk_02034480.unk_00 = gUnk_0200B640; MemCopy(gUnk_02022830, gUnk_020246B0, 0x1800); - sub_08080B60(&gMapBottom); - sub_08080B60(&gMapTop); + FillActTileForLayer(&gMapBottom); + FillActTileForLayer(&gMapTop); sub_0807BBE4(); - sub_0807BC84(); + CreateCollisionDataBorderAroundRoom(); sub_0805E248(); - sub_0801AB08((u8*)&gMapDataBottomSpecial, &gMapBottom); - sub_0801AB08(gMapDataTopSpecial, &gMapTop); + RenderMapLayerToSubTileMap(gMapDataBottomSpecial, &gMapBottom); + RenderMapLayerToSubTileMap(gMapDataTopSpecial, &gMapTop); } -void sub_08080198(RoomControls* controls) { +void Scroll5Sub4(RoomControls* controls) { controls->scrollSubAction = 5; controls->unk_1c = 0xff; LoadRoom(); @@ -373,37 +373,37 @@ void sub_08080198(RoomControls* controls) { UpdateIsDiggingCave(); } -void sub_080801BC(RoomControls* controls) { - s32 iVar2; - s32 iVar3; - s32 uVar5; - s32 uVar6; - s32 iVar7; - s32 temp; +void Scroll5Sub5(RoomControls* controls) { + s32 diffX; + s32 diffY; + s32 left; + s32 right; + s32 bottom; + s32 top; controls->unk_18 += 6; - controls->unk_1a = (controls->unk_18 << 1) / 3; - if (0x1e < controls->unk_18) { - iVar2 = controls->camera_target->x.HALF.HI - controls->scroll_x; - uVar6 = (iVar2 - controls->unk_18); - if (uVar6 < 0) { - uVar6 = 0; + controls->unk_1a = (controls->unk_18 * 2) / 3; + if (controls->unk_18 > 0x1e) { + diffX = controls->camera_target->x.HALF.HI - controls->scroll_x; + left = (diffX - controls->unk_18); + if (left < 0) { + left = 0; } - iVar7 = iVar2 + controls->unk_18; - if (DISPLAY_WIDTH < iVar7) { - iVar7 = DISPLAY_WIDTH; + right = diffX + controls->unk_18; + if (right > DISPLAY_WIDTH) { + right = DISPLAY_WIDTH; } - temp = controls->camera_target->y.HALF.HI - controls->scroll_y; - uVar5 = (temp - controls->unk_1a); - if (uVar5 < 0) { - uVar5 = 0; + diffY = controls->camera_target->y.HALF.HI - controls->scroll_y; + bottom = (diffY - controls->unk_1a); + if (bottom < 0) { + bottom = 0; } - iVar3 = temp + controls->unk_1a; - if (DISPLAY_HEIGHT < iVar3) { - iVar3 = DISPLAY_HEIGHT; + top = diffY + controls->unk_1a; + if (top > DISPLAY_HEIGHT) { + top = DISPLAY_HEIGHT; } - gScreen.controls.window1HorizontalDimensions = ((uVar6 & 0xff) << 8) | (iVar7 & 0xff); - gScreen.controls.window1VerticalDimensions = ((uVar5 & 0xff) << 8) | (iVar3 & 0xff); + gScreen.controls.window1HorizontalDimensions = ((left & 0xff) << 8) | (right & 0xff); + gScreen.controls.window1VerticalDimensions = ((bottom & 0xff) << 8) | (top & 0xff); } if (controls->unk_1c == 0) { controls->scrollAction = 0; @@ -473,7 +473,7 @@ void sub_08080368(void) { tmp = gUnk_02034480.unk_00 << 1; index = 0; while (index < tmp) { - sub_0807B9B8(ptr[1], ptr[0] & 0xfff, (ptr[0] >> 0xe)); + SetTileByIndex(ptr[1], ptr[0] & 0xfff, (ptr[0] >> 0xe)); ptr += 2; index += 2; } @@ -582,7 +582,7 @@ void UpdateIsDiggingCave(void) { gDiggingCaveEntranceTransition.isDiggingCave = 0; } -void ClearTilemaps(void) { +void ClearTileMaps(void) { MemClear(&gRoomControls, sizeof(gRoomControls)); MemClear(&gDiggingCaveEntranceTransition, sizeof(gDiggingCaveEntranceTransition)); gRoomControls.unk_22 = 0xffff; @@ -592,7 +592,7 @@ void ClearTilemaps(void) { MemClear(&gMapDataTopSpecial, 0x8000); } -bool32 sub_080806BC(u32 param_1, u32 param_2, u32 param_3, u32 param_4) { +bool32 sub_080806BC(u32 x, u32 y, u32 param_3, u32 param_4) { static bool32 (*const gUnk_0811E7AC[])(const Transition*, u32, u32, u32) = { sub_08080794, sub_08080808, @@ -606,7 +606,7 @@ bool32 sub_080806BC(u32 param_1, u32 param_2, u32 param_3, u32 param_4) { puVar3 = (gArea.pCurrentRoomInfo->exits); while (*(u16*)puVar3 != 0xffff) { u32 uVar3 = *(u16*)puVar3; - if ((((1 << uVar3) & param_4) != 0) && (gUnk_0811E7AC[uVar3](puVar3, param_1, param_2, param_3))) { + if ((((1 << uVar3) & param_4) != 0) && (gUnk_0811E7AC[uVar3](puVar3, x, y, param_3))) { DoExitTransition((const ScreenTransitionData*)puVar3); return 1; } @@ -632,49 +632,49 @@ const Transition* sub_08080734(u32 param_1, u32 param_2) { return NULL; } -bool32 sub_08080794(const Transition* transition, u32 param_2, u32 param_3, u32 param_4) { - u32 bVar1; +bool32 sub_08080794(const Transition* transition, u32 x, u32 y, u32 param_4) { + u32 shapeBitmask; switch (param_4) { default: return 0; case 0: - if (gRoomControls.width >> 1 < param_2) { - bVar1 = 2; + if (gRoomControls.width / 2 < x) { + shapeBitmask = 2; } else { - bVar1 = 1; + shapeBitmask = 1; } break; case 1: - if (gRoomControls.height >> 1 < param_3) { - bVar1 = 8; + if (gRoomControls.height / 2 < y) { + shapeBitmask = 8; } else { - bVar1 = 4; + shapeBitmask = 4; } break; case 2: - if (gRoomControls.width >> 1 < param_2) { - bVar1 = 0x20; + if (gRoomControls.width / 2 < x) { + shapeBitmask = 0x20; } else { - bVar1 = 0x10; + shapeBitmask = 0x10; } break; case 3: - if (gRoomControls.height >> 1 < param_3) { - bVar1 = 0x80; + if (gRoomControls.height / 2 < y) { + shapeBitmask = 0x80; } else { - bVar1 = 0x40; + shapeBitmask = 0x40; } break; } - if ((transition->shape & bVar1) != 0) { - return 1; + if ((transition->shape & shapeBitmask) != 0) { + return TRUE; } - return 0; + return FALSE; } -bool32 sub_08080808(const Transition* param_1, u32 param_2, u32 param_3, u32 param_4) { +bool32 sub_08080808(const Transition* param_1, u32 x, u32 y, u32 param_4) { static const u8 gUnk_0811E7BC[] = { 6, 6, 6, 14, 14, 6, 22, 6 }; const u8* ptr; u32 temp; @@ -683,10 +683,10 @@ bool32 sub_08080808(const Transition* param_1, u32 param_2, u32 param_3, u32 par u32 temp4; ptr = &gUnk_0811E7BC[param_1->shape * 2]; temp = ptr[0]; - temp2 = param_2 - param_1->startX; + temp2 = x - param_1->startX; if ((temp2 + temp <= ptr[0] * 2)) { temp3 = ptr[1]; - temp4 = param_3 - param_1->startY; + temp4 = y - param_1->startY; if (temp4 + temp3 <= ptr[1] * 2) { return TRUE; } else { @@ -761,8 +761,8 @@ void sub_08080930(u32 unused) { SetInitializationPriority(); } -LayerStruct* GetTileBuffer(u32 param_1) { - if (param_1 == 2) { +MapLayer* GetLayerByIndex(u32 layerIndex) { + if (layerIndex == LAYER_TOP) { return &gMapTop; } else { return &gMapBottom; @@ -838,14 +838,14 @@ void sub_080809D4(void) { roomControls->scroll_y = var1 - 80; } - sub_08080BC4(); + UpdateScreenShake(); gUpdateVisibleTiles = 1; } void UpdateDoorTransition() { - u32 uVar1; - u32 uVar3; - u32 uVar4; + u32 actTile; + u32 x; + u32 y; RoomControls* controls = &gRoomControls; if (gRoomControls.camera_target != &gPlayerEntity.base) { return; @@ -862,77 +862,76 @@ void UpdateDoorTransition() { case 9: case 0x18: case 0x1d: - uVar4 = controls->camera_target->y.HALF.HI - controls->origin_y; - uVar3 = controls->camera_target->x.HALF.HI - controls->origin_x; - uVar1 = sub_080B1AE0((((controls->camera_target->x.HALF.HI - controls->origin_x) >> 4) & 0x3F) | - ((((controls->camera_target->y.HALF.HI - controls->origin_y) >> 4) & 0x3F) << 6), - controls->camera_target->collisionLayer); - gRoomTransition.stairs_idx = sub_080B1A48(uVar3, uVar4, controls->camera_target->collisionLayer); - switch (uVar1) { - case 0x3f: - case 0xf1: - case 0x28: - case 0x29: - sub_080806BC(uVar3, uVar4, 0xff, 10); + y = controls->camera_target->y.HALF.HI - controls->origin_y; + x = controls->camera_target->x.HALF.HI - controls->origin_x; + actTile = GetActTileAtTilePos( + (((controls->camera_target->x.HALF.HI - controls->origin_x) >> 4) & 0x3F) | + ((((controls->camera_target->y.HALF.HI - controls->origin_y) >> 4) & 0x3F) << 6), + controls->camera_target->collisionLayer); + gRoomTransition.stairs_idx = GetTileTypeAtRoomCoords(x, y, controls->camera_target->collisionLayer); + switch (actTile) { + case ACT_TILE_63: + case ACT_TILE_241: + case ACT_TILE_40: + case ACT_TILE_41: + sub_080806BC(x, y, 0xff, 10); break; } } } -void sub_08080B60(LayerStruct* layer) { - u32 index; - u16* metatileTypes = layer->metatileTypes; - const u8* ptr = gUnk_080B37A0; - u8* ptr3 = layer->unkData3; - u16* mapData = layer->mapData; - for (index = 0; index < 0x1000; index++) { - u16 val = mapData[index]; - if (val < 0x4000) { - layer->unkData3[index] = ptr[metatileTypes[val]]; +// fill the actTile for the whole layer +void FillActTileForLayer(MapLayer* mapLayer) { + u32 tilePos; + u16* tileTypes = mapLayer->tileTypes; + const u8* ptr = gMapTileTypeToActTile; + u8* actTiles = mapLayer->actTiles; + u16* mapData = mapLayer->mapData; + for (tilePos = 0; tilePos < 0x40 * 0x40; tilePos++) { + u16 tileIndex = mapData[tilePos]; + if (tileIndex < 0x4000) { + mapLayer->actTiles[tilePos] = ptr[tileTypes[tileIndex]]; } else { - layer->unkData3[index] = gUnk_080B7910[val - 0x4000]; + mapLayer->actTiles[tilePos] = gMapSpecialTileToActTile[tileIndex - 0x4000]; } } } -void sub_08080BC4(void) { - const s8* ptr; - s32 tmpX; - s32 tmpY; - - tmpX = (gRoomControls.scroll_x - gRoomControls.origin_x) & 0xf; - tmpY = ((gRoomControls.scroll_y - gRoomControls.origin_y) & 0xf) + 8; +void UpdateScreenShake(void) { + const s8* screenShakeOffset; + s32 roomOffsetX = (gRoomControls.scroll_x - gRoomControls.origin_x) & 0xf; + s32 roomOffsetY = ((gRoomControls.scroll_y - gRoomControls.origin_y) & 0xf) + 8; if (gRoomControls.shake_duration != 0) { gRoomControls.shake_duration--; - ptr = &gShakeOffsets[gRoomControls.shake_magnitude * 0x10 + (gRoomControls.shake_duration & 0xe)]; + screenShakeOffset = &gShakeOffsets[gRoomControls.shake_magnitude * 0x10 + (gRoomControls.shake_duration & 0xe)]; if (gMapBottom.bgSettings != NULL) { - gMapBottom.bgSettings->xOffset = ptr[0] + tmpX; - gMapBottom.bgSettings->yOffset = ptr[1] + tmpY; + gMapBottom.bgSettings->xOffset = screenShakeOffset[0] + roomOffsetX; + gMapBottom.bgSettings->yOffset = screenShakeOffset[1] + roomOffsetY; } if (gMapTop.bgSettings != NULL) { - gMapTop.bgSettings->xOffset = ptr[0] + tmpX; - gMapTop.bgSettings->yOffset = ptr[1] + tmpY; + gMapTop.bgSettings->xOffset = screenShakeOffset[0] + roomOffsetX; + gMapTop.bgSettings->yOffset = screenShakeOffset[1] + roomOffsetY; } - gRoomControls.aff_x = ptr[0]; - gRoomControls.aff_y = ptr[1]; + gRoomControls.aff_x = screenShakeOffset[0]; + gRoomControls.aff_y = screenShakeOffset[1]; } else { if (gMapBottom.bgSettings != NULL) { - gMapBottom.bgSettings->xOffset = tmpX; - gMapBottom.bgSettings->yOffset = tmpY; + gMapBottom.bgSettings->xOffset = roomOffsetX; + gMapBottom.bgSettings->yOffset = roomOffsetY; } if (gMapTop.bgSettings != NULL) { - gMapTop.bgSettings->xOffset = tmpX; - gMapTop.bgSettings->yOffset = tmpY; + gMapTop.bgSettings->xOffset = roomOffsetX; + gMapTop.bgSettings->yOffset = roomOffsetY; } gRoomControls.aff_x = 0; gRoomControls.aff_y = 0; } } -void sub_08080C80(u32* param_1) { - sub_080197D4(param_1); - sub_0807C8B0(gMapBottom.mapData, gRoomControls.width >> 4, gRoomControls.height >> 4); - sub_0807C8B0(gMapTop.mapData, gRoomControls.width >> 4, gRoomControls.height >> 4); +void sub_08080C80(MapDataDefinition* dataDefinition) { + LoadMapData(dataDefinition); + sub_0807C8B0(gMapBottom.mapData, gRoomControls.width / 16, gRoomControls.height / 16); + sub_0807C8B0(gMapTop.mapData, gRoomControls.width / 16, gRoomControls.height / 16); } void sub_08080CB4(Entity* this) { diff --git a/src/staffroll.c b/src/staffroll.c index dcd0fad7..f0ff11ae 100644 --- a/src/staffroll.c +++ b/src/staffroll.c @@ -17,13 +17,13 @@ typedef struct { /*0x00*/ Menu base; - s16 unk_10; - u16 unk_12; + s16 gfxEntry; + u16 bg2XOffset; u16 unk_14; u8 unk_16; u8 unk_17; u8 unk_18; - u8 unk_19; + u8 font; u8 bgmMusicStarted; u8 unk_1b[0x14]; u8 unk_2f; @@ -43,7 +43,7 @@ const Font gUnk_081272C8 = { &gBG1Buffer[0x1cf], BG_TILE_ADDR(0x188), gTextGfxBuffer, 0, 61472, 240, 1, 0, 0, 0, 0, 5, 0, 1, 0 }; -const Font* const gUnk_081272E0[] = { +const Font* const gStaffrollFonts[] = { &gUnk_08127280, &gUnk_08127298, &gUnk_081272B0, @@ -51,10 +51,10 @@ const Font* const gUnk_081272E0[] = { }; // TODO figure out structure of gStaffrollMenu.base.field_0xc -extern u8 gUnk_081272F0[]; -extern u8 gUnk_08127644[]; -extern u8 gUnk_08127998[]; -extern const u8 gUnk_08127CEC[]; +extern StaffrollEntry gUnk_081272F0[]; +extern StaffrollEntry gUnk_08127644[]; +extern StaffrollEntry gUnk_08127998[]; +extern const StaffrollGfxEntry gUnk_08127CEC[]; extern void (*const gUnk_08127D00[])(void); extern void (*const gUnk_08127D10[])(void); @@ -74,13 +74,13 @@ void StaffrollTask_State0(void) { gStaffrollMenu.unk_16 = 5; gStaffrollMenu.unk_17 = 4; gStaffrollMenu.bgmMusicStarted = 0; - if (gSaveHeader->language >= 2) { - gStaffrollMenu.base.field_0xc = gUnk_08127998; + if (gSaveHeader->language >= LANGUAGE_FR) { // European + gStaffrollMenu.base.field_0xc = (void*)gUnk_08127998; } else { - if (gSaveHeader->language == 1) { - gStaffrollMenu.base.field_0xc = gUnk_08127644; - } else { - gStaffrollMenu.base.field_0xc = gUnk_081272F0; + if (gSaveHeader->language == LANGUAGE_EN) { // English + gStaffrollMenu.base.field_0xc = (void*)gUnk_08127644; + } else { // Japanese + gStaffrollMenu.base.field_0xc = (void*)gUnk_081272F0; } } DispReset(0); @@ -109,12 +109,12 @@ void StaffrollTask_State1MenuType0(void) { void StaffrollTask_State1MenuType1(void) { if (gFadeControl.active == 0) { - const u8* ptr = &gUnk_08127CEC[gStaffrollMenu.unk_10 * 2]; - LoadPaletteGroup(ptr[0]); - LoadGfxGroup(ptr[1]); + const StaffrollGfxEntry* ptr = &gUnk_08127CEC[gStaffrollMenu.gfxEntry]; + LoadPaletteGroup(ptr->paletteGroup); + LoadGfxGroup(ptr->gfxGroup); MemClear(&gBG1Buffer, sizeof(gBG1Buffer)); gScreen.bg1.updated = 1; - gScreen.bg2.xOffset = gStaffrollMenu.unk_12; + gScreen.bg2.xOffset = gStaffrollMenu.bg2XOffset; gScreen.controls.alphaBlend = 0x1000; gStaffrollMenu.base.menuType = 0; if (gStaffrollMenu.bgmMusicStarted == 0) { @@ -130,7 +130,7 @@ void StaffrollTask_State1MenuType2(void) { switch (gStaffrollMenu.base.overlayType) { case 0: MemClear(&gBG1Buffer, sizeof(gBG1Buffer)); - ShowTextBox(gStaffrollMenu.unk_10, gUnk_081272E0[gStaffrollMenu.unk_19]); + ShowTextBox(gStaffrollMenu.gfxEntry, gStaffrollFonts[gStaffrollMenu.font]); gScreen.bg1.updated = 1; gStaffrollMenu.base.overlayType++; gStaffrollMenu.unk_18 = 0; @@ -225,11 +225,11 @@ void sub_080A3954(void) { pbVar4 = gStaffrollMenu.base.field_0xc + 1; gStaffrollMenu.base.menuType = *gStaffrollMenu.base.field_0xc; gStaffrollMenu.base.overlayType = 0; - gStaffrollMenu.unk_10 = *puVar1; + gStaffrollMenu.gfxEntry = *puVar1; gStaffrollMenu.base.transitionTimer = *(u16*)(gStaffrollMenu.base.field_0xc + 4); - gStaffrollMenu.unk_12 = *puVar2; + gStaffrollMenu.bg2XOffset = *puVar2; gStaffrollMenu.unk_14 = *puVar3; - gStaffrollMenu.unk_19 = *pbVar4; + gStaffrollMenu.font = *pbVar4; gStaffrollMenu.base.field_0xc += 0xc; } diff --git a/src/subtask.c b/src/subtask.c index ab9a4500..3bc20af4 100644 --- a/src/subtask.c +++ b/src/subtask.c @@ -62,26 +62,30 @@ void sub_080A6F6C(u32 textIndexOrPtr) { gScreen.bg0.yOffset = 2; } -void sub_080A6FB4(WindcrestID windcrest, u32 param_2) { - extern u16 gUnk_08128FF0[]; +/* +Show area name in a textbox. +param_2: 0: visited overworld area name + 2: overworld area name + 1: dungeon name +*/ +void ShowAreaName(WindcrestID windcrest, u32 type) { + extern u16 gDungeonNames[]; extern Font gUnk_08128FD8; extern Font gUnk_08128FC0; u32 textIndexOrPtr; Font* font; textIndexOrPtr = 0; - switch (param_2) { + switch (type) { case 0: if (!IS_BIT_SET(gSave.windcrests, windcrest)) break; case 2: - // TODO this probably references later data with index param_1-24 - textIndexOrPtr = gUnk_08127F94[windcrest]._6; + textIndexOrPtr = gOverworldLocations[windcrest].textIndex; font = &gUnk_08128FC0; break; case 1: - // TODO this probably references later data with index param_1-24 - textIndexOrPtr = gUnk_08128FF0[windcrest]; + textIndexOrPtr = gDungeonNames[windcrest]; font = &gUnk_08128FD8; break; default: @@ -114,18 +118,18 @@ void sub_080A7040(u32 param_1) { } void sub_080A70AC(const KeyButtonLayout* layout) { - MemClear(&gUnk_0200AF00.elements, 0x300); - gUnk_0200AF00.unk_13 = 0x7f; - gUnk_0200AF00.unk_14 = 0x7f; - gUnk_0200AF00.buttonX[0] = layout->aButtonX; - gUnk_0200AF00.buttonY[0] = (s8)layout->aButtonY; - gUnk_0200AF00.buttonText[0] = layout->aButtonText; - gUnk_0200AF00.buttonX[1] = layout->bButtonX; - gUnk_0200AF00.buttonY[1] = (s8)layout->bButtonY; - gUnk_0200AF00.buttonText[1] = layout->bButtonText; - gUnk_0200AF00.buttonX[2] = layout->rButtonX; - gUnk_0200AF00.buttonY[2] = (s8)layout->rButtonY; - gUnk_0200AF00.buttonText[2] = layout->rButtonText; + MemClear(&gHUD.elements, 0x300); + gHUD.unk_13 = 0x7f; + gHUD.unk_14 = 0x7f; + gHUD.buttonX[0] = layout->aButtonX; + gHUD.buttonY[0] = (s8)layout->aButtonY; + gHUD.buttonText[0] = layout->aButtonText; + gHUD.buttonX[1] = layout->bButtonX; + gHUD.buttonY[1] = (s8)layout->bButtonY; + gHUD.buttonText[1] = layout->bButtonText; + gHUD.buttonX[2] = layout->rButtonX; + gHUD.buttonY[2] = (s8)layout->rButtonY; + gHUD.buttonText[2] = layout->rButtonText; layout++; do { CreateUIElement(layout->aButtonX, layout->aButtonY); @@ -154,7 +158,7 @@ void MenuFadeIn(u32 param_1, u32 param_2) { gUI.field_0x5 = param_2; gUI.nextToLoad = 1; // Subtask_Init } - gUI.field_0x6 = 0; + gUI.loadGfxOnRestore = FALSE; gUI.fadeType = -1; gUI.fadeInTime = 0x20; gMain.substate = GAMEMAIN_SUBTASK; @@ -259,7 +263,7 @@ void Subtask_FadeOut(void) { MemCopy(&gUnk_03001020, &gScreen, sizeof(Screen)); gArea.localFlagOffset = GetFlagBankOffset(gRoomControls.area); gArea.pCurrentRoomInfo = GetCurrentRoomInfo(); - RestoreGameTask(gUI.field_0x6); + RestoreGameTask(gUI.loadGfxOnRestore); sub_0801D000(gUI.unk_d != 0); sub_080A74F4(); if (gUI.fadeType != 0xffff) { diff --git a/src/subtask/subtaskLocalMapHint.c b/src/subtask/subtaskLocalMapHint.c index 7a86d5e4..357e3f7e 100644 --- a/src/subtask/subtaskLocalMapHint.c +++ b/src/subtask/subtaskLocalMapHint.c @@ -41,11 +41,11 @@ void sub_080A6B04(void) { bVar1 = ptr->mapMarkerIcon; uVar3 = ptr2->_c; uVar4 = ptr2->_e; - uVar2 = sub_080A6A80(uVar3, uVar4)->_4; + uVar2 = GetOverworldLocation(uVar3, uVar4)->windcrestId; gMenu.field_0x3 = uVar2; gGenericMenu.unk2b = 1; sub_080A67C4(uVar2); - sub_080A6FB4(uVar2, 2); + ShowAreaName(uVar2, 2); SetColor(0, 0x475f); SetColor(0x5f, 0x475f); MemFill16(0x5001, &gBG3Buffer, sizeof(gBG3Buffer)); diff --git a/src/subtask/subtaskMapHint.c b/src/subtask/subtaskMapHint.c index 201a8638..1bbe2670 100644 --- a/src/subtask/subtaskMapHint.c +++ b/src/subtask/subtaskMapHint.c @@ -36,7 +36,7 @@ void Subtask_MapHint_0(void) { sub_080A4DB8(4); sub_080A6290(); gScreen.lcd.displayControl = gScreen.lcd.displayControl & 0xf7ff; - SetColor(0, gPaletteBuffer[0x51]); + SetColor(0, gPaletteBuffer[81]); val = gUnk_08128F4C[gUI.field_0x3]; gSave.map_hints |= val; gGenericMenu.unk10.h[1] = val & gGenericMenu.unk10.h[0]; diff --git a/src/ui.c b/src/ui.c index b983b0b3..e1c17292 100644 --- a/src/ui.c +++ b/src/ui.c @@ -1,14 +1,15 @@ -#include "global.h" -#include "sound.h" -#include "message.h" -#include "functions.h" -#include "screen.h" -#include "common.h" -#include "save.h" -#include "player.h" #include "area.h" +#include "common.h" +#include "functions.h" #include "game.h" +#include "global.h" #include "item.h" +#include "message.h" +#include "player.h" +#include "save.h" +#include "screen.h" +#include "sound.h" +#include "structures.h" extern void sub_0805ECEC(u32, u32, u32, u32); extern u32 sub_08000E44(u32); @@ -58,7 +59,7 @@ void UpdateUIElements(void) { UIElement* element; const UIElementDefinition* definition; for (index = 0; index < MAX_UI_ELEMENTS; index++) { - element = &gUnk_0200AF00.elements[index]; + element = &gHUD.elements[index]; if (element->used != 0) { definition = &gUIElementDefinitions[element->type]; definition->updateFunction(element); @@ -72,7 +73,7 @@ void DrawUIElements(void) { UIElementDefinition* definition; for (index = 0; index < MAX_UI_ELEMENTS; index++) { - element = &gUnk_0200AF00.elements[index]; + element = &gHUD.elements[index]; if (element->used == 1 && element->unk_0_1 == 1) { gOamCmd.x = element->x; gOamCmd.y = element->y; @@ -91,7 +92,7 @@ void sub_0801C25C(void) { UIElement* element; for (index = 0; index < MAX_UI_ELEMENTS; index++) { - element = &gUnk_0200AF00.elements[index]; + element = &gHUD.elements[index]; if (((element->used) == 1) && ((element->unk_0_1) == 1)) { u8 temp = element->unk_0_2; if (temp == 1) { @@ -100,14 +101,14 @@ void sub_0801C25C(void) { } } } - if (gUnk_0200AF00.unk_13 < 0) { - tmp = gUnk_0200AF00.unk_13 & 0x7f; - gUnk_0200AF00.unk_13 = tmp; + if (gHUD.unk_13 < 0) { + tmp = gHUD.unk_13 & 0x7f; + gHUD.unk_13 = tmp; sub_0801C2F0(0x11a, tmp); } - if (gUnk_0200AF00.unk_14 < 0) { - tmp = gUnk_0200AF00.unk_14 & 0x7f; - gUnk_0200AF00.unk_14 = tmp; + if (gHUD.unk_14 < 0) { + tmp = gHUD.unk_14 & 0x7f; + gHUD.unk_14 = tmp; sub_0801C2F0(0x126, tmp); } } @@ -127,12 +128,12 @@ void sub_0801C2F0(u32 param_1, u32 param_2) { } void DrawUI(void) { - gUnk_0200AF00.unk_0 &= ~gUnk_0200AF00.unk_1; + gHUD.unk_0 &= ~gHUD.hideFlags; DrawHearts(); DrawChargeBar(); DrawRupees(); DrawKeys(); - gUnk_0200AF00.unk_0 = 0; + gHUD.unk_0 = 0; UpdateUIElements(); } @@ -144,37 +145,37 @@ void InitUI(bool32 keepHealthAndRupees) { health = gSave.stats.health >> 1; rupees = gSave.stats.rupees; } else { - health = gUnk_0200AF00.health; - rupees = gUnk_0200AF00.rupees; + health = gHUD.health; + rupees = gHUD.rupees; } - MemClear(&gUnk_0200AF00, sizeof(struct_0200AF00)); - gUnk_0200AF00.health = health; - gUnk_0200AF00.rupees = rupees; - gUnk_0200AF00.maxHealth = gSave.stats.maxHealth >> 1; + MemClear(&gHUD, sizeof(HUD)); + gHUD.health = health; + gHUD.rupees = rupees; + gHUD.maxHealth = gSave.stats.maxHealth >> 1; LoadPaletteGroup(0xc); LoadGfxGroup(0x10); MemClear(&gBG0Buffer, sizeof(gBG0Buffer)); - gScreen.bg0.tilemap = &gBG0Buffer; + gScreen.bg0.subTileMap = &gBG0Buffer; gScreen.bg0.control = 0x1f0c; gScreen.lcd.displayControl |= 0x100; gOAMControls.unk[0].unk7 = 1; gOAMControls.unk[0].unk6 = 1; gOAMControls.unk[1].unk6 = 1; - gUnk_0200AF00.unk_13 = 0x7f; - gUnk_0200AF00.unk_14 = 0x7f; - gUnk_0200AF00.unk_8 = 0x7f; + gHUD.unk_13 = 0x7f; + gHUD.unk_14 = 0x7f; + gHUD.unk_8 = 0x7f; DrawHearts(); DrawRupees(); DrawChargeBar(); DrawKeys(); - gUnk_0200AF00.buttonX[0] = 0xd0; - gUnk_0200AF00.buttonX[1] = 0xb8; - gUnk_0200AF00.buttonX[2] = 0xd8; - gUnk_0200AF00.buttonY[0] = 0x1c; - gUnk_0200AF00.buttonY[1] = 0x1c; - gUnk_0200AF00.buttonY[2] = 0xe; + gHUD.buttonX[0] = 0xd0; + gHUD.buttonX[1] = 0xb8; + gHUD.buttonX[2] = 0xd8; + gHUD.buttonY[0] = 0x1c; + gHUD.buttonY[1] = 0x1c; + gHUD.buttonY[2] = 0xe; // TODO why is this array cleared again? Is it filled by the function calls in the mean time? - MemClear(gUnk_0200AF00.elements, sizeof(gUnk_0200AF00.elements)); + MemClear(gHUD.elements, sizeof(gHUD.elements)); CreateUIElement(UI_ELEMENT_TEXT_R, 9); CreateUIElement(UI_ELEMENT_ITEM_A, 0); CreateUIElement(UI_ELEMENT_ITEM_B, 0); @@ -190,9 +191,9 @@ void RefreshUI(void) { } void RecoverUI(u32 bottomPt, u32 topPt) { - gUnk_0200AF00.unk_2 = 0; - gUnk_0200AF00.unk_10 = 0; - gUnk_0200AF00.unk_a = 0; + gHUD.unk_2 = 0; + gHUD.unk_10 = 0; + gHUD.unk_a = 0; } void DrawRupees(void) { @@ -202,9 +203,9 @@ void DrawRupees(void) { u16* row1; u16* row2; - if ((gUnk_0200AF00.unk_1 & 0x40) != 0) { - if (gUnk_0200AF00.unk_a != 0) { - gUnk_0200AF00.unk_a = 0; + if (gHUD.hideFlags & HUD_HIDE_RUPEES) { + if (gHUD.unk_a != 0) { + gHUD.unk_a = 0; row1 = &gBG0Buffer[0x258]; row1[0] = 0; row1[1] = 0; @@ -220,8 +221,8 @@ void DrawRupees(void) { gScreen.bg0.updated = 1; } } else { - if (gUnk_0200AF00.unk_a == 0) { - gUnk_0200AF00.unk_a = 2; + if (gHUD.unk_a == 0) { + gHUD.unk_a = 2; row1 = &gBG0Buffer[0x258]; row2 = &gBG0Buffer[0x278]; row1[0] = temp2 = gWalletSizes[gSave.stats.walletType].iconStartTile; @@ -241,32 +242,34 @@ void DrawRupees(void) { cVar1 = 0; } - if (gUnk_0200AF00.rupees != gSave.stats.rupees) { - if (gUnk_0200AF00.rupees < gSave.stats.rupees) { - gUnk_0200AF00.rupees++; + if (gHUD.rupees != gSave.stats.rupees) { + if (gHUD.rupees < gSave.stats.rupees) { + gHUD.rupees++; } else { - gUnk_0200AF00.rupees--; + gHUD.rupees--; } cVar1 = 2; } switch (cVar1) { case 2: - temp = gUnk_0200AF00.unk_c; + temp = gHUD.unk_c; temp &= 3; if ((temp) == 0) { SoundReq(SFX_RUPEE_GET); } case 1: - RenderDigits(0x70, gUnk_0200AF00.rupees, - gWalletSizes[(u32)gSave.stats.walletType].size <= gUnk_0200AF00.rupees, 3); - cVar1 = gUnk_0200AF00.unk_c + 1; + RenderDigits(0x70, gHUD.rupees, gWalletSizes[(u32)gSave.stats.walletType].size <= gHUD.rupees, 3); + cVar1 = gHUD.unk_c + 1; default: - gUnk_0200AF00.unk_c = cVar1; + gHUD.unk_c = cVar1; break; } } } +/** + * Draw icon with text for rupees or keys + */ void RenderDigits(u32 iconVramIndex, u32 count, u32 isTextYellow, u32 digits) { int iVar2; int iVar3; @@ -302,9 +305,9 @@ void EraseHearts(void) { u32* ptr; s32 index; - if (gUnk_0200AF00.unk_2 != 0) { - gUnk_0200AF00.unk_2 = 0; - if (gUnk_0200AF00.maxHealth > 10 * 4) { + if (gHUD.unk_2 != 0) { + gHUD.unk_2 = 0; + if (gHUD.maxHealth > 10 * 4) { index = 2; } else { index = 1; @@ -333,14 +336,14 @@ void DrawHearts(void) { s32 tmp1; u16* ptr; - if ((gUnk_0200AF00.unk_1 & 0x10) != 0) { + if (gHUD.hideFlags & HUD_HIDE_HEARTS) { EraseChargeBar(); EraseHearts(); return; } maxHealth = gSave.stats.maxHealth / 2; - if (maxHealth != gUnk_0200AF00.maxHealth) { - gUnk_0200AF00.maxHealth = maxHealth; + if (maxHealth != gHUD.maxHealth) { + gHUD.maxHealth = maxHealth; EraseChargeBar(); EraseHearts(); } @@ -353,35 +356,35 @@ void DrawHearts(void) { health = maxHealth; } maxHealth = 0; - if (health != gUnk_0200AF00.health) { + if (health != gHUD.health) { maxHealth = 1; - if (health > gUnk_0200AF00.health) { + if (health > gHUD.health) { maxHealth = 2; } } switch (maxHealth) { case 2: - uVar1 = gUnk_0200AF00.unk_5++; + uVar1 = gHUD.unk_5++; if ((uVar1 & 1) == 0) { if ((uVar1 & 7) == 0) { SoundReq(SFX_HEART_GET); } - gUnk_0200AF00.health++; + gHUD.health++; } else { maxHealth = 0; } break; case 1: - gUnk_0200AF00.health--; + gHUD.health--; // fallthough default: - gUnk_0200AF00.unk_5 = 0; + gHUD.unk_5 = 0; break; } - if ((gUnk_0200AF00.unk_2 == 0) || (maxHealth != 0)) { - gUnk_0200AF00.unk_2 = 2; - uVar2 = gUnk_0200AF00.health >> 2; + if ((gHUD.unk_2 == 0) || (maxHealth != 0)) { + gHUD.unk_2 = 2; + uVar2 = gHUD.health / 4; if (uVar2 > 10) { tmp1 = 10; uVar6 = uVar2 - 10; @@ -390,7 +393,7 @@ void DrawHearts(void) { uVar6 = 0; } - maxHealth = gUnk_0200AF00.maxHealth >> 2; + maxHealth = gHUD.maxHealth / 4; uVar1 = maxHealth; if (maxHealth > 10) { maxHealth = 10; @@ -406,12 +409,12 @@ void DrawHearts(void) { DmaSet(3, gUnk_080C8F2C + (10 - tmp1), ptr + 1, maxHealth | 0x80000000); - if ((gUnk_0200AF00.health & 3) != 0) { + if ((gHUD.health & 3) != 0) { if (9 < uVar2) { uVar2 -= 10; ptr += 0x20; } - ptr[uVar2 + 1] = ((gUnk_0200AF00.health & 3) + 0x11) | 0xf000; + ptr[uVar2 + 1] = ((gHUD.health & 3) + 0x11) | 0xf000; } gScreen.bg0.updated = 1; } @@ -420,9 +423,9 @@ void DrawHearts(void) { void EraseChargeBar(void) { u32* ptr; - if (gUnk_0200AF00.unk_6 != 0) { - gUnk_0200AF00.unk_6 = 0; - if (gUnk_0200AF00.maxHealth > 10 * 4) { + if (gHUD.unk_6 != 0) { + gHUD.unk_6 = 0; + if (gHUD.maxHealth > 10 * 4) { ptr = (u32*)&gBG0Buffer[0x60]; } else { ptr = (u32*)&gBG0Buffer[0x40]; @@ -446,14 +449,14 @@ void DrawChargeBar(void) { u32 tmp5; tmp1 = FALSE; - if ((gUnk_0200AF00.unk_1 & 0x20) == 0) { + if ((gHUD.hideFlags & HUD_HIDE_CHARGE_BAR) == 0) { tmp1 = gPlayerState.chargeState.action != 0; } if (!tmp1) return EraseChargeBar(); - if (gUnk_0200AF00.maxHealth > 10 * 4) { + if (gHUD.maxHealth > 10 * 4) { ptr1 = &gBG0Buffer[0x60]; } else { ptr1 = &gBG0Buffer[0x40]; @@ -463,9 +466,9 @@ void DrawChargeBar(void) { if (tmp2 > 40) { tmp2 = 40; } - if (gUnk_0200AF00.unk_6 == 0 || gUnk_0200AF00.unk_7 != tmp2) { - gUnk_0200AF00.unk_6 = 1; - gUnk_0200AF00.unk_7 = tmp2; + if (gHUD.unk_6 == 0 || gHUD.unk_7 != tmp2) { + gHUD.unk_6 = 1; + gHUD.unk_7 = tmp2; tmp3 = Div(tmp2, 4); tmp5 = rem; ptr1[0] = 0xf016; @@ -480,16 +483,16 @@ void DrawChargeBar(void) { switch (gPlayerState.chargeState.action) { case 4: case 5: - gUnk_0200AF00.unk_9 += (gPlayerState.chargeState.action == 4) ? 2 : 1; - tmp3 = gUnk_0200AF00.unk_9 >> 4 & 3; + gHUD.unk_9 += (gPlayerState.chargeState.action == 4) ? 2 : 1; + tmp3 = gHUD.unk_9 >> 4 & 3; break; default: tmp3 = 0; break; } - if (tmp3 != gUnk_0200AF00.unk_8) { - gUnk_0200AF00.unk_8 = tmp3; + if (tmp3 != gHUD.unk_8) { + gHUD.unk_8 = tmp3; ptr1 = (u16*)0x600c2c0; DmaSet(3, gUnk_080C8F7C[tmp3], ptr1, 0x84000030); } @@ -500,9 +503,9 @@ void DrawKeys(void) { u16* row2; u32 temp; - if (!(((gUnk_0200AF00.unk_1 & 0x80) == 0) && (AreaHasKeys()))) { - if (gUnk_0200AF00.unk_10 != 0) { - gUnk_0200AF00.unk_10 = 0; + if (!(((gHUD.hideFlags & HUD_HIDE_KEYS) == 0) && (AreaHasKeys()))) { + if (gHUD.unk_10 != 0) { + gHUD.unk_10 = 0; row1 = &gBG0Buffer[0x219]; row1[0] = 0; row1[1] = 0; @@ -515,7 +518,7 @@ void DrawKeys(void) { gScreen.bg0.updated = 1; } } else { - if (gUnk_0200AF00.unk_10 == 0) { + if (gHUD.unk_10 == 0) { row1 = &gBG0Buffer[0x219]; row2 = &gBG0Buffer[0x239]; temp = 0xf01c; @@ -530,10 +533,10 @@ void DrawKeys(void) { row2[3] = temp + 3; gScreen.bg0.updated = 1; } - if ((gUnk_0200AF00.dungeonKeys != gSave.dungeonKeys[gArea.dungeon_idx]) || (gUnk_0200AF00.unk_10 == 0)) { - gUnk_0200AF00.unk_10 = 2; - gUnk_0200AF00.dungeonKeys = gSave.dungeonKeys[gArea.dungeon_idx]; - RenderDigits(0x76, gUnk_0200AF00.dungeonKeys, 0, 2); + if ((gHUD.dungeonKeys != gSave.dungeonKeys[gArea.dungeon_idx]) || (gHUD.unk_10 == 0)) { + gHUD.unk_10 = 2; + gHUD.dungeonKeys = gSave.dungeonKeys[gArea.dungeon_idx]; + RenderDigits(0x76, gHUD.dungeonKeys, 0, 2); } } } @@ -544,7 +547,7 @@ void CreateUIElement(u32 type, u32 type2) { for (index = 0; index < MAX_UI_ELEMENTS; index++) { - element = gUnk_0200AF00.elements; + element = gHUD.elements; element += index; if (!element->used) { @@ -610,8 +613,8 @@ void ButtonUIElement(UIElement* element) { } void ButtonUIElement_Action0(UIElement* element) { - element->x = gUnk_0200AF00.buttonX[element->type]; - element->y = gUnk_0200AF00.buttonY[element->type] - 0x20; + element->x = gHUD.buttonX[element->type]; + element->y = gHUD.buttonY[element->type] - 0x20; element->action = 1; element->unk_0_1 = 1; sub_0801CAFC(element, element->type); @@ -626,11 +629,10 @@ void ButtonUIElement_Action1(UIElement* element) { MAX_MOVEMENT = (!element->type2) ? 4 : 8; - if (element->type2 == 0 && - (((gUnk_0200AF00.unk_1 >> element->type) & 1) || (gMessage.state & MESSAGE_ACTIVE) != 0)) { - y = (s16)gUnk_0200AF00.buttonY[element->type] - 0x28; + if (element->type2 == 0 && (((gHUD.hideFlags >> element->type) & 1) || (gMessage.state & MESSAGE_ACTIVE) != 0)) { + y = (s16)gHUD.buttonY[element->type] - 0x28; } else { - y = (s16)gUnk_0200AF00.buttonY[element->type]; + y = (s16)gHUD.buttonY[element->type]; } y -= (s16)element->y; @@ -646,7 +648,7 @@ void ButtonUIElement_Action1(UIElement* element) { element->y += y_diff; } - x = (short)gUnk_0200AF00.buttonX[element->type]; + x = (short)gHUD.buttonX[element->type]; x -= (short)element->x; x_diff = (x < 0) ? -x : x; @@ -697,9 +699,9 @@ void ItemUIElement(UIElement* element) { uiElementType = 0; } - psVar8 = &gUnk_0200AF00.unk_13; + psVar8 = &gHUD.unk_13; if (uiElementType != 0) { - psVar8 = &gUnk_0200AF00.unk_14; + psVar8 = &gHUD.unk_14; } switch ((s32)element->unk_8) { @@ -744,7 +746,7 @@ void TextUIElement(UIElement* element) { u32 frameIndex; if (element->type2 == 9) { - frameIndex = gUnk_0200AF00.rActionPlayerState; + frameIndex = gHUD.rActionPlayerState; if (frameIndex == R_ACTION_NONE) { switch (gArea.portal_mode) { case 2: @@ -754,13 +756,13 @@ void TextUIElement(UIElement* element) { frameIndex = R_ACTION_GROW; break; default: - frameIndex = gUnk_0200AF00.rActionInteractObject; + frameIndex = gHUD.rActionInteractObject; break; } } - gUnk_0200AF00.buttonText[2] = frameIndex; + gHUD.buttonText[2] = frameIndex; } - frameIndex = gUnk_0200AF00.buttonText[element->buttonElementId]; + frameIndex = gHUD.buttonText[element->buttonElementId]; element->unk_0_1 = 0; if (frameIndex != 0) { frameIndex += gUnk_080C9044[((SaveHeader*)0x2000000)->language]; @@ -778,7 +780,7 @@ UIElement* FindUIElement(u32 type) { UIElement* element; u32 index; for (index = 0; index < MAX_UI_ELEMENTS; index++) { - element = &gUnk_0200AF00.elements[index]; + element = &gHUD.elements[index]; if (element->used != 0 && type == element->type) { return element; } @@ -793,8 +795,8 @@ void HeartUIElement(UIElement* element) { u32 health; u32 frameIndex; element->unk_0_1 = 0; - if (((gUnk_0200AF00.unk_1 & 0x10) == 0) && ((gMessage.state & MESSAGE_ACTIVE) == 0)) { - health = gUnk_0200AF00.health; + if (((gHUD.hideFlags & HUD_HIDE_HEARTS) == 0) && ((gMessage.state & MESSAGE_ACTIVE) == 0)) { + health = gHUD.health; if (health != 0) { element->unk_0_1 = 1; // Calculate the position for this heart. @@ -822,8 +824,8 @@ void EzloNagUIElement(UIElement* element) { } void EzloNagUIElement_Action0(UIElement* element) { - if (gUnk_0200AF00.ezloNagFuncIndex == 1) { - gUnk_0200AF00.ezloNagFuncIndex = 2; + if (gHUD.ezloNagFuncIndex == 1) { + gHUD.ezloNagFuncIndex = 2; element->x = 0x10; element->y = 0x90; element->unk_6 = 0; @@ -840,19 +842,19 @@ void EzloNagUIElement_Action1(UIElement* element) { if (tmp == 0) { element->action = 2; element->type = UI_ELEMENT_EZLONAGACTIVE; - gUnk_0200AF00.ezloNagFuncIndex = 3; + gHUD.ezloNagFuncIndex = 3; SoundReq(SFX_EZLO_UI); } } void EzloNagUIElement_Action2(UIElement* element) { - if (gUnk_0200AF00.ezloNagFuncIndex >= 5 || (gMessage.state & MESSAGE_ACTIVE)) { + if (gHUD.ezloNagFuncIndex >= 5 || (gMessage.state & MESSAGE_ACTIVE)) { element->action = 0; element->unk_0_1 = 0; return; } sub_0801CAD0(element); if (element->frameSettings == 1) { - gUnk_0200AF00.ezloNagFuncIndex = 4; + gHUD.ezloNagFuncIndex = 4; } } diff --git a/src/vram.c b/src/vram.c index 73a2b0e8..68b1433c 100644 --- a/src/vram.c +++ b/src/vram.c @@ -294,28 +294,28 @@ void SetGFXSlotStatus(GfxSlot* slot, u32 status) { } /** - * Finds slotCount continous free slots and returns the index of the first slot or 0 if not enough free slots could be + * Finds slotCount continuos free slots and returns the index of the first slot or 0 if not enough free slots could be * found. */ u32 FindFreeGFXSlots(u32 slotCount) { u32 index; - u32 continuousFreeSlots = 0; + u32 continuosFreeSlots = 0; - // First search for enough continous free slots. + // First search for enough continuos free slots. for (index = 4; index < MAX_GFX_SLOTS; index++) { if (gGFXSlots.slots[index].status == GFX_SLOT_FREE) { - continuousFreeSlots++; - if (slotCount <= continuousFreeSlots) { - return (index - continuousFreeSlots) + 1; + continuosFreeSlots++; + if (slotCount <= continuosFreeSlots) { + return (index - continuosFreeSlots) + 1; } } else { - continuousFreeSlots = 0; + continuosFreeSlots = 0; } } - // Now also search for enough continous free or unused slots. - continuousFreeSlots = 0; + // Now also search for enough continuos free or unused slots. + continuosFreeSlots = 0; index = 4; for (index = 4; index < MAX_GFX_SLOTS; index++) { #ifdef EU @@ -323,12 +323,12 @@ u32 FindFreeGFXSlots(u32 slotCount) { #else if (gGFXSlots.slots[index].status == GFX_SLOT_FREE || gGFXSlots.slots[index].status == GFX_SLOT_UNLOADED) { #endif - continuousFreeSlots++; - if (slotCount <= continuousFreeSlots) { - return (index - continuousFreeSlots) + 1; + continuosFreeSlots++; + if (slotCount <= continuosFreeSlots) { + return (index - continuosFreeSlots) + 1; } } else { - continuousFreeSlots = 0; + continuosFreeSlots = 0; } } return 0; diff --git a/src/worldEvent/worldEvent17.c b/src/worldEvent/worldEvent17.c index 3541626d..0be153e6 100644 --- a/src/worldEvent/worldEvent17.c +++ b/src/worldEvent/worldEvent17.c @@ -12,6 +12,7 @@ #include "script.h" #include "subtask.h" #include "manager/bombableWallManager.h" +#include "tiles.h" // Called Goron Kinstone Fusion Script void sub_08054EB8(Entity* this, ScriptExecutionContext* context) { @@ -21,11 +22,11 @@ void sub_08054EB8(Entity* this, ScriptExecutionContext* context) { manager->base.id = BOMBABLE_WALL_MANAGER; manager->x = this->x.HALF.HI - gRoomControls.origin_x; manager->y = (this->y.HALF.HI - gRoomControls.origin_y) - 0x10; - manager->field_0x35 = 1; + manager->layer = LAYER_BOTTOM; #if defined(EU) || defined(JP) || defined(DEMO_JP) - manager->field_0x3e = 0x77; + manager->flag = 0x77; #else - manager->field_0x3e = 0x79; + manager->flag = 0x79; #endif AppendEntityToList((Entity*)manager, 6); } @@ -33,9 +34,9 @@ void sub_08054EB8(Entity* this, ScriptExecutionContext* context) { void sub_08054EFC(Entity* this, ScriptExecutionContext* context) { Entity* effect; - u32 tmp = COORD_TO_TILE(this) - 0x40; - SetBottomTile(0x4074, tmp, 1); - this->collisionLayer = 2; + u32 tilePos = COORD_TO_TILE(this) - 0x40; + SetTile(SPECIAL_TILE_116, tilePos, LAYER_BOTTOM); + this->collisionLayer = LAYER_TOP; UpdateSpriteForCollisionLayer(this); effect = CreateFx(this, FX_BIG_EXPLOSION, 0); if (effect != NULL) { @@ -156,6 +157,6 @@ void WorldEvent_17_0(void) { void WorldEvent_17_1(void) { if (gMenu.field_0xa != 0) { gMenu.field_0xa = 0; - SetTileType(0x74, 0x407, 1); + SetTileType(TILE_TYPE_116, TILE_POS(7, 16), LAYER_BOTTOM); } } diff --git a/src/worldEvent/worldEvent2.c b/src/worldEvent/worldEvent2.c index aa347001..d7b87459 100644 --- a/src/worldEvent/worldEvent2.c +++ b/src/worldEvent/worldEvent2.c @@ -6,10 +6,12 @@ */ #include "fade.h" #include "flags.h" +#include "map.h" #include "menu.h" #include "room.h" #include "sound.h" #include "subtask.h" +#include "tiles.h" void sub_08055994(void); @@ -54,12 +56,12 @@ void sub_08055994(void) { u32 layer; TileEntity* ptr = &gUnk_080FEAC8[gMenu.field_0x4]; if ((ptr->_6 & 1) != 0) { - layer = 2; + layer = LAYER_TOP; } else { - layer = 1; + layer = LAYER_BOTTOM; } - SetTileType(0x73, (*(u16*)(gMenu.field_0xc + 8) >> 4 & 0x3f) | (*(u16*)(gMenu.field_0xc + 10) >> 4 & 0x3f) << 6, - layer); + SetTileType(TILE_TYPE_115, + (*(u16*)(gMenu.field_0xc + 8) >> 4 & 0x3f) | (*(u16*)(gMenu.field_0xc + 10) >> 4 & 0x3f) << 6, layer); sub_080553E0((u32)gMenu.field_0x4); SoundReq(SFX_SECRET_BIG); } diff --git a/src/worldEvent/worldEvent22.c b/src/worldEvent/worldEvent22.c index 367c47da..3fc0a672 100644 --- a/src/worldEvent/worldEvent22.c +++ b/src/worldEvent/worldEvent22.c @@ -1,5 +1,5 @@ /** - * @file worldEvent.c + * @file worldEvent22.c * @ingroup WorldEvents * * @brief World Event 22 diff --git a/tools/src/asset_processor/assets/asset.h b/tools/src/asset_processor/assets/asset.h index f34485a2..1b29c03c 100644 --- a/tools/src/asset_processor/assets/asset.h +++ b/tools/src/asset_processor/assets/asset.h @@ -49,7 +49,7 @@ class BaseAsset { } // Returns the base of the filename of the asset. - [[nodiscard]] std::string getSymbol() const { + [[nodiscard]] virtual std::string getSymbol() const { // Need to get the stem twice to remove both of the .4bpp.lz extensions. return (path.stem()).stem(); } diff --git a/tools/src/asset_processor/assets/dungeonmap.cpp b/tools/src/asset_processor/assets/dungeonmap.cpp new file mode 100644 index 00000000..96b42210 --- /dev/null +++ b/tools/src/asset_processor/assets/dungeonmap.cpp @@ -0,0 +1,108 @@ +#include "dungeonmap.h" +#include "util.h" +#include +#include +#include +#include + +std::filesystem::path DungeonMapAsset::generateAssetPath() { + std::filesystem::path txtPath = path; + txtPath.replace_extension(".txt"); + return txtPath; +} + +void DungeonMapAsset::convertToHumanReadable(const std::vector& baserom) { + (void)baserom; + const char characters[] = {' ', '#', '.', '-'}; + + std::ifstream file(path.string(), std::ios::binary | std::ios::ate); + auto fileSize = file.tellg(); + file.seekg(0, std::ios::beg); + + std::vector data(static_cast(fileSize)); + if (!file.read(data.data(), fileSize)) { + fmt::print(stderr, "Can not read dungeon map {}\n", path.string()); + std::exit(1); + } + file.close(); + + auto output_file = util::open_file(assetPath, "w"); + + size_t width = asset["options"]["width"]; + width *= 4; + size_t height = asset["options"]["height"]; + size_t bytesPerRow = (width + 3) / 4; + + for (size_t y = 0; y < height; y++) { + for (size_t x = 0; x < width; x +=4) { + size_t offset = y * bytesPerRow + x / 4; + char byte = data[offset]; + for (size_t i = 0; i < 4; i++) { + int color = (byte >> (6 - i*2)) & 3; + std::fputc(characters[color], output_file.get()); + } + } + std::fputc('\n', output_file.get()); + } +} + +void DungeonMapAsset::buildToBinary() { + std::ifstream file(assetPath.string(), std::ios::binary | std::ios::ate); + auto fileSize = file.tellg(); + file.seekg(0, std::ios::beg); + + std::vector data(static_cast(fileSize)); + if (!file.read(data.data(), fileSize)) { + fmt::print(stderr, "Can not read dungeon map {}\n", assetPath.string()); + std::exit(1); + } + file.close(); + + auto output_file = util::open_file(buildPath, "w"); + int byte = 0; + size_t pixels = 0; + for (size_t i = 0; i < static_cast(fileSize); i++) { + switch (data[i]) { + case '\n': + continue; + case ' ': + byte <<= 2; + pixels++; + break; + case '#': + byte <<= 2; + byte |= 1; + pixels++; + break; + case '.': + byte <<= 2; + byte |= 2; + pixels++; + break; + case '-': + byte <<= 2; + byte |= 3; + pixels++; + break; + default: + fmt::print(stderr, "Unexpected character {}\n", data[i]); + std::exit(1); + break; + } + + if (pixels % 4 == 0) { + std::fputc(byte, output_file.get()); + byte = 0; + } + } + + // Pad to two bytes. + while ((pixels / 4) % 4 != 0) { + std::fputc(0, output_file.get()); + pixels += 4; + } +} + +std::string DungeonMapAsset::getSymbol() const { + return asset["name"]; +} \ No newline at end of file diff --git a/tools/src/asset_processor/assets/dungeonmap.h b/tools/src/asset_processor/assets/dungeonmap.h new file mode 100644 index 00000000..1c669636 --- /dev/null +++ b/tools/src/asset_processor/assets/dungeonmap.h @@ -0,0 +1,17 @@ +#ifndef DUNGEONMAP_H +#define DUNGEONMAP_H + +#include "asset.h" + +class DungeonMapAsset : public BaseAsset { + public: + using BaseAsset::BaseAsset; + virtual void convertToHumanReadable(const std::vector& baserom); + virtual void buildToBinary(); + virtual std::string getSymbol() const; + + private: + virtual std::filesystem::path generateAssetPath(); +}; + +#endif // DUNGEONMAP_H diff --git a/tools/src/asset_processor/assets/gfx.cpp b/tools/src/asset_processor/assets/gfx.cpp index 39a11e3c..ffceefc0 100644 --- a/tools/src/asset_processor/assets/gfx.cpp +++ b/tools/src/asset_processor/assets/gfx.cpp @@ -16,8 +16,21 @@ void GfxAsset::convertToHumanReadable(const std::vector& baserom) { std::filesystem::path toolsPath = "tools"; std::vector cmd; + + std::filesystem::path decompressedPath = path; + + if (isCompressed()) { + // First decompress. + decompressedPath.replace_extension(""); + cmd.push_back(toolsPath / "bin" / "gbagfx"); + cmd.push_back(path); + cmd.push_back(decompressedPath); + check_call(cmd); + cmd.clear(); + } + cmd.push_back(toolsPath / "bin" / "gbagfx"); - cmd.push_back(path); + cmd.push_back(decompressedPath); cmd.push_back(assetPath); if (asset.contains("options")) { for (const auto& it : asset["options"].items()) { @@ -31,8 +44,27 @@ void GfxAsset::convertToHumanReadable(const std::vector& baserom) { void GfxAsset::buildToBinary() { std::filesystem::path toolsPath = "tools"; std::vector cmd; + + std::filesystem::path decompressedPath = path; + if (isCompressed()) { + decompressedPath.replace_extension(""); + } + cmd.push_back(toolsPath / "bin" / "gbagfx"); cmd.push_back(assetPath); - cmd.push_back(path); + cmd.push_back(decompressedPath); check_call(cmd); + + if (isCompressed()) { + cmd.clear(); + // Compress. + cmd.push_back(toolsPath / "bin" / "gbagfx"); + cmd.push_back(decompressedPath); + cmd.push_back(path); + check_call(cmd); + } +} + +bool GfxAsset::isCompressed() { + return path.extension() == ".lz"; } \ No newline at end of file diff --git a/tools/src/asset_processor/assets/gfx.h b/tools/src/asset_processor/assets/gfx.h index 394961ea..2e9db49c 100644 --- a/tools/src/asset_processor/assets/gfx.h +++ b/tools/src/asset_processor/assets/gfx.h @@ -8,4 +8,5 @@ class GfxAsset : public BaseAsset { private: virtual std::filesystem::path generateAssetPath(); + bool isCompressed(); }; \ No newline at end of file diff --git a/tools/src/asset_processor/assets/map.cpp b/tools/src/asset_processor/assets/map.cpp new file mode 100644 index 00000000..2d5a0bca --- /dev/null +++ b/tools/src/asset_processor/assets/map.cpp @@ -0,0 +1,44 @@ +#include "map.h" +#include "util.h" +#include + +std::filesystem::path MapAsset::generateAssetPath() { + std::filesystem::path decompressedPath = path; + if (isCompressed()) { + if (decompressedPath.extension() == ".lz") { + decompressedPath.replace_extension(""); + } + } + return decompressedPath; +} + + +void MapAsset::convertToHumanReadable(const std::vector& baserom) { + (void)baserom; + if (isCompressed()) { + std::filesystem::path toolsPath = "tools"; + std::vector cmd; + // Decompress. + cmd.push_back(toolsPath / "bin" / "gbagfx"); + cmd.push_back(path); + cmd.push_back(assetPath); + check_call(cmd); + } +} + +void MapAsset::buildToBinary() { + if (isCompressed()) { + std::filesystem::path toolsPath = "tools"; + std::vector cmd; + // Compress. + cmd.push_back(toolsPath / "bin" / "gbagfx"); + cmd.push_back(assetPath); + cmd.push_back(path); + check_call(cmd); + } + +} + +bool MapAsset::isCompressed() { + return path.extension() == ".lz"; +} \ No newline at end of file diff --git a/tools/src/asset_processor/assets/map.h b/tools/src/asset_processor/assets/map.h new file mode 100644 index 00000000..075af0bf --- /dev/null +++ b/tools/src/asset_processor/assets/map.h @@ -0,0 +1,17 @@ +#ifndef MAP_H +#define MAP_H + +#include "asset.h" + +class MapAsset : public BaseAsset { + public: + using BaseAsset::BaseAsset; + virtual void convertToHumanReadable(const std::vector& baserom); + virtual void buildToBinary(); + + private: + virtual std::filesystem::path generateAssetPath(); + bool isCompressed(); +}; + +#endif // MAP_H diff --git a/tools/src/asset_processor/assets/subtileset.cpp b/tools/src/asset_processor/assets/subtileset.cpp new file mode 100644 index 00000000..c8e2a8c2 --- /dev/null +++ b/tools/src/asset_processor/assets/subtileset.cpp @@ -0,0 +1,66 @@ +#include "subtileset.h" +#include "util.h" + +std::filesystem::path SubTileSetAsset::generateAssetPath() { + std::filesystem::path pngPath = path; + if (pngPath.extension() == ".lz") { + pngPath.replace_extension(""); + } + pngPath.replace_extension(".png"); + return pngPath; +} + +void SubTileSetAsset::convertToHumanReadable(const std::vector& baserom) { + (void)baserom; + + std::filesystem::path toolsPath = "tools"; + std::vector cmd; + + std::filesystem::path decompressedPath = path; + + if (isCompressed()) { + // First decompress. + decompressedPath.replace_extension(""); + cmd.push_back(toolsPath / "bin" / "gbagfx"); + cmd.push_back(path); + cmd.push_back(decompressedPath); + check_call(cmd); + cmd.clear(); + } + + cmd.push_back(toolsPath / "bin" / "gbagfx"); + cmd.push_back(decompressedPath); + cmd.push_back(assetPath); + // This creates a better looking tileMap but in some cases not all tiles are used, so it adds additional data when converting back to binary. + //cmd.push_back("-mwidth"); + //cmd.push_back("32"); + check_call(cmd); +} + +void SubTileSetAsset::buildToBinary() { + std::filesystem::path toolsPath = "tools"; + std::vector cmd; + + std::filesystem::path decompressedPath = path; + if (isCompressed()) { + decompressedPath.replace_extension(""); + } + + cmd.push_back(toolsPath / "bin" / "gbagfx"); + cmd.push_back(assetPath); + cmd.push_back(decompressedPath); + check_call(cmd); + + if (isCompressed()) { + // Compress. + cmd.clear(); + cmd.push_back(toolsPath / "bin" / "gbagfx"); + cmd.push_back(decompressedPath); + cmd.push_back(path); + check_call(cmd); + } +} + +bool SubTileSetAsset::isCompressed() { + return path.extension() == ".lz"; +} \ No newline at end of file diff --git a/tools/src/asset_processor/assets/tileset.h b/tools/src/asset_processor/assets/subtileset.h similarity index 77% rename from tools/src/asset_processor/assets/tileset.h rename to tools/src/asset_processor/assets/subtileset.h index 0affdf4d..0e80e9bd 100644 --- a/tools/src/asset_processor/assets/tileset.h +++ b/tools/src/asset_processor/assets/subtileset.h @@ -1,6 +1,6 @@ #include "asset.h" -class TilesetAsset : public BaseAsset { +class SubTileSetAsset : public BaseAsset { public: using BaseAsset::BaseAsset; virtual void convertToHumanReadable(const std::vector& baserom); @@ -8,4 +8,5 @@ class TilesetAsset : public BaseAsset { private: virtual std::filesystem::path generateAssetPath(); + bool isCompressed(); }; \ No newline at end of file diff --git a/tools/src/asset_processor/assets/tileset.cpp b/tools/src/asset_processor/assets/tileset.cpp deleted file mode 100644 index cd564f33..00000000 --- a/tools/src/asset_processor/assets/tileset.cpp +++ /dev/null @@ -1,33 +0,0 @@ -#include "tileset.h" -#include "util.h" - -std::filesystem::path TilesetAsset::generateAssetPath() { - std::filesystem::path pngPath = path; - if (pngPath.extension() == ".lz") { - pngPath.replace_extension(""); - } - pngPath.replace_extension(".png"); - return pngPath; -} - -void TilesetAsset::convertToHumanReadable(const std::vector& baserom) { - (void)baserom; - - std::filesystem::path toolsPath = "tools"; - std::vector cmd; - cmd.push_back(toolsPath / "bin" / "gbagfx"); - cmd.push_back(path); - cmd.push_back(assetPath); - cmd.push_back("-mwidth"); - cmd.push_back("32"); - check_call(cmd); -} - -void TilesetAsset::buildToBinary() { - std::filesystem::path toolsPath = "tools"; - std::vector cmd; - cmd.push_back(toolsPath / "bin" / "gbagfx"); - cmd.push_back(assetPath); - cmd.push_back(path); - check_call(cmd); -} \ No newline at end of file diff --git a/tools/src/asset_processor/main.cpp b/tools/src/asset_processor/main.cpp index c1bb66cf..40b10bd3 100644 --- a/tools/src/asset_processor/main.cpp +++ b/tools/src/asset_processor/main.cpp @@ -1,12 +1,14 @@ #include "main.h" #include "assets/aif.h" #include "assets/animation.h" +#include "assets/dungeonmap.h" #include "assets/frameobjlists.h" #include "assets/gfx.h" +#include "assets/map.h" #include "assets/midi.h" #include "assets/palette.h" #include "assets/spriteframe.h" -#include "assets/tileset.h" +#include "assets/subtileset.h" #include "offsets.h" #include #include @@ -262,8 +264,8 @@ std::unique_ptr getAssetHandlerByType(const std::filesystem::path& pa } std::unique_ptr assetHandler; - if (type == "tileset") { - assetHandler = std::make_unique(path, start, size, asset); + if (type == "subTileSet") { + assetHandler = std::make_unique(path, start, size, asset); } else if (type == "animation") { assetHandler = std::make_unique(path, start, size, asset); } else if (type == "sprite_frame") { @@ -278,17 +280,21 @@ std::unique_ptr getAssetHandlerByType(const std::filesystem::path& pa assetHandler = std::make_unique(path, start, size, asset); } else if (type == "palette") { assetHandler = std::make_unique(path, start, size, asset); - } else if (type == "map_gfx" || type == "map_layer1" || type == "map_layer2" || type == "metatiles_tile_types1" || - type == "metatiles_tile_types2" || type == "metatiles_tileset1" || type == "metatiles_tileset2" || - type == "map_mapping1" || type == "map_mapping2" || type == "tileset_mapping3" || - type == "map_collision" || type == "unknown") { + } else if (type == "tileMap" || + type == "tileSet_types" || type == "tileSet" || + type == "map_mapping1" || type == "map_mapping2" || + type == "map_collision") { + assetHandler = std::make_unique(path, start, size, asset); + } else if (type == "dungeon_map") { + assetHandler = std::make_unique(path, start, size, asset); + } else if (type == "unknown") { // TODO implement conversions assetHandler = std::make_unique(path, start, size, asset); } else if (type.empty()) { // Unknown binary asset assetHandler = std::make_unique(path, start, size, asset); } else { - fmt::print(stderr, "Error: Unimplemented asset type \"{}\"", type); + fmt::print(stderr, "Error: Unimplemented asset type \"{}\"\n", type); std::exit(1); } assetHandler->setup(); diff --git a/tools/src/gbagfx/gfx.c b/tools/src/gbagfx/gfx.c index f16dd8ac..21b46ee1 100644 --- a/tools/src/gbagfx/gfx.c +++ b/tools/src/gbagfx/gfx.c @@ -18,35 +18,35 @@ #define DOWNCONVERT_BIT_DEPTH(x) ((x) / 8) -static void AdvanceMetatilePosition(int* subTileX, int* subTileY, int* metatileX, int* metatileY, int metatilesWide, - int metatileWidth, int metatileHeight) { +static void AdvanceTilePosition(int* subTileX, int* subTileY, int* tileX, int* tileY, int tilesWide, + int tileWidth, int tileHeight) { (*subTileX)++; - if (*subTileX == metatileWidth) { + if (*subTileX == tileWidth) { *subTileX = 0; (*subTileY)++; - if (*subTileY == metatileHeight) { + if (*subTileY == tileHeight) { *subTileY = 0; - (*metatileX)++; - if (*metatileX == metatilesWide) { - *metatileX = 0; - (*metatileY)++; + (*tileX)++; + if (*tileX == tilesWide) { + *tileX = 0; + (*tileY)++; } } } } -static void ConvertFromTiles1Bpp(unsigned char* src, unsigned char* dest, int numTiles, int metatilesWide, - int metatileWidth, int metatileHeight, bool invertColors) { +static void ConvertFromTiles1Bpp(unsigned char* src, unsigned char* dest, int numTiles, int tilesWide, + int tileWidth, int tileHeight, bool invertColors) { int subTileX = 0; int subTileY = 0; - int metatileX = 0; - int metatileY = 0; - int pitch = metatilesWide * metatileWidth; + int tileX = 0; + int tileY = 0; + int pitch = tilesWide * tileWidth; for (int i = 0; i < numTiles; i++) { for (int j = 0; j < 8; j++) { - int destY = (metatileY * metatileHeight + subTileY) * 8 + j; - int destX = metatileX * metatileWidth + subTileX; + int destY = (tileY * tileHeight + subTileY) * 8 + j; + int destX = tileX * tileWidth + subTileX; unsigned char srcPixelOctet = *src++; unsigned char* destPixelOctet = &dest[destY * pitch + destX]; @@ -57,25 +57,25 @@ static void ConvertFromTiles1Bpp(unsigned char* src, unsigned char* dest, int nu } } - AdvanceMetatilePosition(&subTileX, &subTileY, &metatileX, &metatileY, metatilesWide, metatileWidth, - metatileHeight); + AdvanceTilePosition(&subTileX, &subTileY, &tileX, &tileY, tilesWide, tileWidth, + tileHeight); } } -static void ConvertFromTiles4Bpp(unsigned char* src, unsigned char* dest, int numTiles, int metatilesWide, - int metatileWidth, int metatileHeight, bool invertColors) { +static void ConvertFromTiles4Bpp(unsigned char* src, unsigned char* dest, int numTiles, int tilesWide, + int tileWidth, int tileHeight, bool invertColors) { int subTileX = 0; int subTileY = 0; - int metatileX = 0; - int metatileY = 0; - int pitch = (metatilesWide * metatileWidth) * 4; + int tileX = 0; + int tileY = 0; + int pitch = (tilesWide * tileWidth) * 4; for (int i = 0; i < numTiles; i++) { for (int j = 0; j < 8; j++) { - int destY = (metatileY * metatileHeight + subTileY) * 8 + j; + int destY = (tileY * tileHeight + subTileY) * 8 + j; for (int k = 0; k < 4; k++) { - int destX = (metatileX * metatileWidth + subTileX) * 4 + k; + int destX = (tileX * tileWidth + subTileX) * 4 + k; unsigned char srcPixelPair = *src++; unsigned char leftPixel = srcPixelPair & 0xF; unsigned char rightPixel = srcPixelPair >> 4; @@ -89,25 +89,25 @@ static void ConvertFromTiles4Bpp(unsigned char* src, unsigned char* dest, int nu } } - AdvanceMetatilePosition(&subTileX, &subTileY, &metatileX, &metatileY, metatilesWide, metatileWidth, - metatileHeight); + AdvanceTilePosition(&subTileX, &subTileY, &tileX, &tileY, tilesWide, tileWidth, + tileHeight); } } -static void ConvertFromTiles8Bpp(unsigned char* src, unsigned char* dest, int numTiles, int metatilesWide, - int metatileWidth, int metatileHeight, bool invertColors) { +static void ConvertFromTiles8Bpp(unsigned char* src, unsigned char* dest, int numTiles, int tilesWide, + int tileWidth, int tileHeight, bool invertColors) { int subTileX = 0; int subTileY = 0; - int metatileX = 0; - int metatileY = 0; - int pitch = (metatilesWide * metatileWidth) * 8; + int tileX = 0; + int tileY = 0; + int pitch = (tilesWide * tileWidth) * 8; for (int i = 0; i < numTiles; i++) { for (int j = 0; j < 8; j++) { - int destY = (metatileY * metatileHeight + subTileY) * 8 + j; + int destY = (tileY * tileHeight + subTileY) * 8 + j; for (int k = 0; k < 8; k++) { - int destX = (metatileX * metatileWidth + subTileX) * 8 + k; + int destX = (tileX * tileWidth + subTileX) * 8 + k; unsigned char srcPixel = *src++; if (invertColors) @@ -117,23 +117,23 @@ static void ConvertFromTiles8Bpp(unsigned char* src, unsigned char* dest, int nu } } - AdvanceMetatilePosition(&subTileX, &subTileY, &metatileX, &metatileY, metatilesWide, metatileWidth, - metatileHeight); + AdvanceTilePosition(&subTileX, &subTileY, &tileX, &tileY, tilesWide, tileWidth, + tileHeight); } } -static void ConvertToTiles1Bpp(unsigned char* src, unsigned char* dest, int numTiles, int metatilesWide, - int metatileWidth, int metatileHeight, bool invertColors) { +static void ConvertToTiles1Bpp(unsigned char* src, unsigned char* dest, int numTiles, int tilesWide, + int tileWidth, int tileHeight, bool invertColors) { int subTileX = 0; int subTileY = 0; - int metatileX = 0; - int metatileY = 0; - int pitch = metatilesWide * metatileWidth; + int tileX = 0; + int tileY = 0; + int pitch = tilesWide * tileWidth; for (int i = 0; i < numTiles; i++) { for (int j = 0; j < 8; j++) { - int srcY = (metatileY * metatileHeight + subTileY) * 8 + j; - int srcX = metatileX * metatileWidth + subTileX; + int srcY = (tileY * tileHeight + subTileY) * 8 + j; + int srcX = tileX * tileWidth + subTileX; unsigned char srcPixelOctet = src[srcY * pitch + srcX]; unsigned char* destPixelOctet = dest++; @@ -144,25 +144,25 @@ static void ConvertToTiles1Bpp(unsigned char* src, unsigned char* dest, int numT } } - AdvanceMetatilePosition(&subTileX, &subTileY, &metatileX, &metatileY, metatilesWide, metatileWidth, - metatileHeight); + AdvanceTilePosition(&subTileX, &subTileY, &tileX, &tileY, tilesWide, tileWidth, + tileHeight); } } -static void ConvertToTiles4Bpp(unsigned char* src, unsigned char* dest, int numTiles, int metatilesWide, - int metatileWidth, int metatileHeight, bool invertColors) { +static void ConvertToTiles4Bpp(unsigned char* src, unsigned char* dest, int numTiles, int tilesWide, + int tileWidth, int tileHeight, bool invertColors) { int subTileX = 0; int subTileY = 0; - int metatileX = 0; - int metatileY = 0; - int pitch = (metatilesWide * metatileWidth) * 4; + int tileX = 0; + int tileY = 0; + int pitch = (tilesWide * tileWidth) * 4; for (int i = 0; i < numTiles; i++) { for (int j = 0; j < 8; j++) { - int srcY = (metatileY * metatileHeight + subTileY) * 8 + j; + int srcY = (tileY * tileHeight + subTileY) * 8 + j; for (int k = 0; k < 4; k++) { - int srcX = (metatileX * metatileWidth + subTileX) * 4 + k; + int srcX = (tileX * tileWidth + subTileX) * 4 + k; unsigned char srcPixelPair = src[srcY * pitch + srcX]; unsigned char leftPixel = srcPixelPair >> 4; unsigned char rightPixel = srcPixelPair & 0xF; @@ -176,25 +176,25 @@ static void ConvertToTiles4Bpp(unsigned char* src, unsigned char* dest, int numT } } - AdvanceMetatilePosition(&subTileX, &subTileY, &metatileX, &metatileY, metatilesWide, metatileWidth, - metatileHeight); + AdvanceTilePosition(&subTileX, &subTileY, &tileX, &tileY, tilesWide, tileWidth, + tileHeight); } } -static void ConvertToTiles8Bpp(unsigned char* src, unsigned char* dest, int numTiles, int metatilesWide, - int metatileWidth, int metatileHeight, bool invertColors) { +static void ConvertToTiles8Bpp(unsigned char* src, unsigned char* dest, int numTiles, int tilesWide, + int tileWidth, int tileHeight, bool invertColors) { int subTileX = 0; int subTileY = 0; - int metatileX = 0; - int metatileY = 0; - int pitch = (metatilesWide * metatileWidth) * 8; + int tileX = 0; + int tileY = 0; + int pitch = (tilesWide * tileWidth) * 8; for (int i = 0; i < numTiles; i++) { for (int j = 0; j < 8; j++) { - int srcY = (metatileY * metatileHeight + subTileY) * 8 + j; + int srcY = (tileY * tileHeight + subTileY) * 8 + j; for (int k = 0; k < 8; k++) { - int srcX = (metatileX * metatileWidth + subTileX) * 8 + k; + int srcX = (tileX * tileWidth + subTileX) * 8 + k; unsigned char srcPixel = src[srcY * pitch + srcX]; if (invertColors) @@ -204,12 +204,12 @@ static void ConvertToTiles8Bpp(unsigned char* src, unsigned char* dest, int numT } } - AdvanceMetatilePosition(&subTileX, &subTileY, &metatileX, &metatileY, metatilesWide, metatileWidth, - metatileHeight); + AdvanceTilePosition(&subTileX, &subTileY, &tileX, &tileY, tilesWide, tileWidth, + tileHeight); } } -void ReadImage(char* path, int tilesWidth, int bitDepth, int metatileWidth, int metatileHeight, struct Image* image, +void ReadImage(char* path, int tilesWidth, int bitDepth, int tileWidth, int tileHeight, struct Image* image, bool invertColors) { int tileSize = bitDepth * 8; @@ -220,13 +220,13 @@ void ReadImage(char* path, int tilesWidth, int bitDepth, int metatileWidth, int int tilesHeight = (numTiles + tilesWidth - 1) / tilesWidth; - if (tilesWidth % metatileWidth != 0) - FATAL_ERROR("The width in tiles (%d) isn't a multiple of the specified metatile width (%d)", tilesWidth, - metatileWidth); + if (tilesWidth % tileWidth != 0) + FATAL_ERROR("The width in tiles (%d) isn't a multiple of the specified tile width (%d)", tilesWidth, + tileWidth); - if (tilesHeight % metatileHeight != 0) - FATAL_ERROR("The height in tiles (%d) isn't a multiple of the specified metatile height (%d)", tilesHeight, - metatileHeight); + if (tilesHeight % tileHeight != 0) + FATAL_ERROR("The height in tiles (%d) isn't a multiple of the specified tile height (%d)", tilesHeight, + tileHeight); image->width = tilesWidth * 8; image->height = tilesHeight * 8; @@ -236,19 +236,19 @@ void ReadImage(char* path, int tilesWidth, int bitDepth, int metatileWidth, int if (image->pixels == NULL) FATAL_ERROR("Failed to allocate memory for pixels.\n"); - int metatilesWide = tilesWidth / metatileWidth; + int tilesWide = tilesWidth / tileWidth; switch (bitDepth) { case 1: - ConvertFromTiles1Bpp(buffer, image->pixels, numTiles, metatilesWide, metatileWidth, metatileHeight, + ConvertFromTiles1Bpp(buffer, image->pixels, numTiles, tilesWide, tileWidth, tileHeight, invertColors); break; case 4: - ConvertFromTiles4Bpp(buffer, image->pixels, numTiles, metatilesWide, metatileWidth, metatileHeight, + ConvertFromTiles4Bpp(buffer, image->pixels, numTiles, tilesWide, tileWidth, tileHeight, invertColors); break; case 8: - ConvertFromTiles8Bpp(buffer, image->pixels, numTiles, metatilesWide, metatileWidth, metatileHeight, + ConvertFromTiles8Bpp(buffer, image->pixels, numTiles, tilesWide, tileWidth, tileHeight, invertColors); break; } @@ -256,7 +256,7 @@ void ReadImage(char* path, int tilesWidth, int bitDepth, int metatileWidth, int free(buffer); } -void WriteImage(char* path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image* image, +void WriteImage(char* path, int numTiles, int bitDepth, int tileWidth, int tileHeight, struct Image* image, bool invertColors) { int tileSize = bitDepth * 8; @@ -269,13 +269,13 @@ void WriteImage(char* path, int numTiles, int bitDepth, int metatileWidth, int m int tilesWidth = image->width / 8; int tilesHeight = image->height / 8; - if (tilesWidth % metatileWidth != 0) - FATAL_ERROR("The width in tiles (%d) isn't a multiple of the specified metatile width (%d)", tilesWidth, - metatileWidth); + if (tilesWidth % tileWidth != 0) + FATAL_ERROR("The width in tiles (%d) isn't a multiple of the specified tile width (%d)", tilesWidth, + tileWidth); - if (tilesHeight % metatileHeight != 0) - FATAL_ERROR("The height in tiles (%d) isn't a multiple of the specified metatile height (%d)", tilesHeight, - metatileHeight); + if (tilesHeight % tileHeight != 0) + FATAL_ERROR("The height in tiles (%d) isn't a multiple of the specified tile height (%d)", tilesHeight, + tileHeight); int maxNumTiles = tilesWidth * tilesHeight; @@ -291,19 +291,19 @@ void WriteImage(char* path, int numTiles, int bitDepth, int metatileWidth, int m if (buffer == NULL) FATAL_ERROR("Failed to allocate memory for pixels.\n"); - int metatilesWide = tilesWidth / metatileWidth; + int tilesWide = tilesWidth / tileWidth; switch (bitDepth) { case 1: - ConvertToTiles1Bpp(image->pixels, buffer, numTiles, metatilesWide, metatileWidth, metatileHeight, + ConvertToTiles1Bpp(image->pixels, buffer, numTiles, tilesWide, tileWidth, tileHeight, invertColors); break; case 4: - ConvertToTiles4Bpp(image->pixels, buffer, numTiles, metatilesWide, metatileWidth, metatileHeight, + ConvertToTiles4Bpp(image->pixels, buffer, numTiles, tilesWide, tileWidth, tileHeight, invertColors); break; case 8: - ConvertToTiles8Bpp(image->pixels, buffer, numTiles, metatilesWide, metatileWidth, metatileHeight, + ConvertToTiles8Bpp(image->pixels, buffer, numTiles, tilesWide, tileWidth, tileHeight, invertColors); break; } diff --git a/tools/src/gbagfx/gfx.h b/tools/src/gbagfx/gfx.h index 6b3aff3a..d7dc5e66 100644 --- a/tools/src/gbagfx/gfx.h +++ b/tools/src/gbagfx/gfx.h @@ -27,9 +27,9 @@ struct Image { bool hasTransparency; }; -void ReadImage(char* path, int tilesWidth, int bitDepth, int metatileWidth, int metatileHeight, struct Image* image, +void ReadImage(char* path, int tilesWidth, int bitDepth, int tileWidth, int tileHeight, struct Image* image, bool invertColors); -void WriteImage(char* path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image* image, +void WriteImage(char* path, int numTiles, int bitDepth, int tileWidth, int tileHeight, struct Image* image, bool invertColors); void FreeImage(struct Image* image); void ReadGbaPalette(char* path, struct Palette* palette); diff --git a/tools/src/gbagfx/lz.c b/tools/src/gbagfx/lz.c index 97168917..6e8cf520 100644 --- a/tools/src/gbagfx/lz.c +++ b/tools/src/gbagfx/lz.c @@ -37,7 +37,7 @@ unsigned char* LZDecompress(unsigned char* src, int srcSize, int* uncompressedSi int blockPos = destPos - blockDistance; - // Some Ruby/Sapphire tilesets overflow. + // Some Ruby/Sapphire tileSets overflow. if (destPos + blockSize > destSize) { blockSize = destSize - destPos; fprintf(stderr, "Destination buffer overflow.\n"); diff --git a/tools/src/gbagfx/main.c b/tools/src/gbagfx/main.c index d353e2b4..1e557ce4 100644 --- a/tools/src/gbagfx/main.c +++ b/tools/src/gbagfx/main.c @@ -30,7 +30,7 @@ void ConvertGbaToPng(char* inputPath, char* outputPath, struct GbaToPngOptions* image.hasPalette = false; } - ReadImage(inputPath, options->width, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, + ReadImage(inputPath, options->width, options->bitDepth, options->tileWidth, options->tileHeight, &image, !image.hasPalette); image.hasTransparency = options->hasTransparency; @@ -47,7 +47,7 @@ void ConvertPngToGba(char* inputPath, char* outputPath, struct PngToGbaOptions* ReadPng(inputPath, &image); - WriteImage(outputPath, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, + WriteImage(outputPath, options->numTiles, options->bitDepth, options->tileWidth, options->tileHeight, &image, !image.hasPalette); FreeImage(&image); @@ -60,8 +60,8 @@ void HandleGbaToPngCommand(char* inputPath, char* outputPath, int argc, char** a options.bitDepth = inputFileExtension[0] - '0'; options.hasTransparency = false; options.width = 1; - options.metatileWidth = 1; - options.metatileHeight = 1; + options.tileWidth = 1; + options.tileHeight = 1; for (int i = 3; i < argc; i++) { char* option = argv[i]; @@ -88,33 +88,33 @@ void HandleGbaToPngCommand(char* inputPath, char* outputPath, int argc, char** a FATAL_ERROR("Width must be positive.\n"); } else if (strcmp(option, "-mwidth") == 0) { if (i + 1 >= argc) - FATAL_ERROR("No metatile width value following \"-mwidth\".\n"); + FATAL_ERROR("No tile width value following \"-mwidth\".\n"); i++; - if (!ParseNumber(argv[i], NULL, 10, &options.metatileWidth)) - FATAL_ERROR("Failed to parse metatile width.\n"); + if (!ParseNumber(argv[i], NULL, 10, &options.tileWidth)) + FATAL_ERROR("Failed to parse tile width.\n"); - if (options.metatileWidth < 1) - FATAL_ERROR("metatile width must be positive.\n"); + if (options.tileWidth < 1) + FATAL_ERROR("tile width must be positive.\n"); } else if (strcmp(option, "-mheight") == 0) { if (i + 1 >= argc) - FATAL_ERROR("No metatile height value following \"-mheight\".\n"); + FATAL_ERROR("No tile height value following \"-mheight\".\n"); i++; - if (!ParseNumber(argv[i], NULL, 10, &options.metatileHeight)) - FATAL_ERROR("Failed to parse metatile height.\n"); + if (!ParseNumber(argv[i], NULL, 10, &options.tileHeight)) + FATAL_ERROR("Failed to parse tile height.\n"); - if (options.metatileHeight < 1) - FATAL_ERROR("metatile height must be positive.\n"); + if (options.tileHeight < 1) + FATAL_ERROR("tile height must be positive.\n"); } else { FATAL_ERROR("Unrecognized option \"%s\".\n", option); } } - if (options.metatileWidth > options.width) - options.width = options.metatileWidth; + if (options.tileWidth > options.width) + options.width = options.tileWidth; ConvertGbaToPng(inputPath, outputPath, &options); } @@ -125,8 +125,8 @@ void HandlePngToGbaCommand(char* inputPath, char* outputPath, int argc, char** a struct PngToGbaOptions options; options.numTiles = 0; options.bitDepth = bitDepth; - options.metatileWidth = 1; - options.metatileHeight = 1; + options.tileWidth = 1; + options.tileHeight = 1; for (int i = 3; i < argc; i++) { char* option = argv[i]; @@ -144,26 +144,26 @@ void HandlePngToGbaCommand(char* inputPath, char* outputPath, int argc, char** a FATAL_ERROR("Number of tiles must be positive.\n"); } else if (strcmp(option, "-mwidth") == 0) { if (i + 1 >= argc) - FATAL_ERROR("No metatile width value following \"-mwidth\".\n"); + FATAL_ERROR("No tile width value following \"-mwidth\".\n"); i++; - if (!ParseNumber(argv[i], NULL, 10, &options.metatileWidth)) - FATAL_ERROR("Failed to parse metatile width.\n"); + if (!ParseNumber(argv[i], NULL, 10, &options.tileWidth)) + FATAL_ERROR("Failed to parse tile width.\n"); - if (options.metatileWidth < 1) - FATAL_ERROR("metatile width must be positive.\n"); + if (options.tileWidth < 1) + FATAL_ERROR("tile width must be positive.\n"); } else if (strcmp(option, "-mheight") == 0) { if (i + 1 >= argc) - FATAL_ERROR("No metatile height value following \"-mheight\".\n"); + FATAL_ERROR("No tile height value following \"-mheight\".\n"); i++; - if (!ParseNumber(argv[i], NULL, 10, &options.metatileHeight)) - FATAL_ERROR("Failed to parse metatile height.\n"); + if (!ParseNumber(argv[i], NULL, 10, &options.tileHeight)) + FATAL_ERROR("Failed to parse tile height.\n"); - if (options.metatileHeight < 1) - FATAL_ERROR("metatile height must be positive.\n"); + if (options.tileHeight < 1) + FATAL_ERROR("tile height must be positive.\n"); } else { FATAL_ERROR("Unrecognized option \"%s\".\n", option); } @@ -312,7 +312,7 @@ void HandleLZCompressCommand(char* inputPath, char* outputPath, int argc, char** } } - // The overflow option allows a quirk in some of Ruby/Sapphire's tilesets + // The overflow option allows a quirk in some of Ruby/Sapphire's tileSets // to be reproduced. It works by appending a number of zeros to the data // before compressing it and then amending the LZ header's size field to // reflect the expected size. This will cause an overflow when decompressing diff --git a/tools/src/gbagfx/options.h b/tools/src/gbagfx/options.h index 29536621..e8e20b8a 100644 --- a/tools/src/gbagfx/options.h +++ b/tools/src/gbagfx/options.h @@ -10,15 +10,15 @@ struct GbaToPngOptions { int bitDepth; bool hasTransparency; int width; - int metatileWidth; - int metatileHeight; + int tileWidth; + int tileHeight; }; struct PngToGbaOptions { int numTiles; int bitDepth; - int metatileWidth; - int metatileHeight; + int tileWidth; + int tileHeight; }; #endif // OPTIONS_H