Rename metaTiles

Now the 16x16 tiles are just called tiles and the 8x8 tiles are called subTiles.
This commit is contained in:
octorock
2024-01-06 14:59:48 +01:00
parent c3b771a209
commit aced0bef69
195 changed files with 9739 additions and 9736 deletions
+1 -1
View File
@@ -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
+7 -7
View File
@@ -8,7 +8,7 @@
// TODO cannot add this at the end of mapVvvToSurfaceType.c due to alignment?
.2byte 0
// TODO unused?
// 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
@@ -20,18 +20,18 @@ sub_08007DCE:
pop {pc}
// Find the key in the map of u16 to u16
// r0: value
// r1: array of u16*
// 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 ActTileConv
bl FindEntryForKey
adds r0, r3, #0 // move the found value into r0
pop {pc}
thumb_func_start ActTileConv // TODO rename
ActTileConv: @ 0x08007DE0
thumb_func_start FindEntryForKey // TODO rename
FindEntryForKey: @ 0x08007DE0
subs r1, #4
_08007DE2:
adds r1, #4 // add +4 to r1 at the end of loop
+17 -17
View File
@@ -86,12 +86,12 @@ arm_sub_080B1A0C: @ 0x080B1A0C
add r1, r1, r2
ldrb r2, [r0, #0x38]
mov r0, r3
b arm_GetMetaTileTypeByPos
arm_GetMetaTileTypeByEntity: // GetCell
b arm_GetTileTypeByPos
arm_GetTileTypeByEntity: // GetCell
ldrb r2, [r0, #0x38]
ldrh r1, [r0, #0x32]
ldrh r0, [r0, #0x2e]
arm_GetMetaTileTypeByPos:
arm_GetTileTypeByPos:
ldr ip, _080B1C18 @ =gRoomControls
ldrh r3, [ip, #6]
sub r0, r0, r3
@@ -106,8 +106,8 @@ arm_sub_080B1A58:
add r0, r0, r1, lsl #6
mov r1, r2
arm_func_start arm_GetMetaTileType
arm_GetMetaTileType: @ 0x080B1A60
arm_func_start arm_GetTileType
arm_GetTileType: @ 0x080B1A60
ldr r2, _080B1C1C @ =gMapDataPtrs
_080B1A64:
add r2, r2, r1, lsl #3
@@ -150,7 +150,7 @@ arm_GetVvvAtRoomCoords: @ room pixel coordinates to room tile coordinates
arm_GetVvvAtRoomTile:
add r0, r0, r1, lsl #6
mov r1, r2 @ move layer to r1
arm_GetVvvAtMetaTilePos:
arm_GetVvvAtTilePos:
ldr r2, _080B1C24 @ =gVvvPtrs
ldr r2, [r2, r1, lsl #2]
ldrb r0, [r2, r0]
@@ -187,17 +187,17 @@ arm_GetCollisionDataAtRoomCoords:
arm_GetCollisionDataAtRoomTile:
add r0, r0, r1, lsl #6 @ convert coords to tile index
mov r1, r2
arm_GetCollisionDataAtMetaTilePos:
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_GetVvvForMetaTileType
arm_GetVvvForMetaTileType: @ 0x080B1B54
arm_func_start arm_GetVvvForTileType
arm_GetVvvForTileType: @ 0x080B1B54
lsls r0, r0, #0x12
ldrlo r1, _080B1C30 @ =gMapMetaTileTypeToVvv
ldrhs r1, _080B1C34 @ =gMapSpecialMetaTileToVvv
ldrlo r1, _080B1C30 @ =gMapTileTypeToVvv
ldrhs r1, _080B1C34 @ =gMapSpecialTileToVvv
ldrb r0, [r1, r0, lsr #18]
bx lr
@@ -205,7 +205,7 @@ arm_GetVvvForMetaTileType: @ 0x080B1B54
arm_sub_080B1B68: @ 0x080B1B68
lsrs r2, r0, #0xe
bxne lr
ldr r2, _080B1C38 @ =gMetatileTypesPtrs
ldr r2, _080B1C38 @ =gTileTypesPtrs
ldr r1, [r2, r1, lsl #3]
lsl r0, r0, #1
ldrh r0, [r1, r0]
@@ -214,7 +214,7 @@ arm_sub_080B1B68: @ 0x080B1B68
arm_func_start arm_sub_080B1B84
arm_sub_080B1B84: @ 0x080B1B84
mov ip, lr
bl arm_GetMetaTileType
bl arm_GetTileType
lsls r0, r0, #0x12
ldrlo r1, _080B1C3C @ =gUnk_08000360
ldrhs r1, _080B1C40 @ =gUnk_080B7A3E
@@ -226,7 +226,7 @@ arm_sub_080B1B84: @ 0x080B1B84
arm_sub_080B1BA4: @ 0x080B1BA4
mov ip, lr
mov r3, r2
bl arm_GetMetaTileType
bl arm_GetTileType
lsls r0, r0, #0x12
ldrlo r1, _080B1C44 @ =gUnk_08000360
ldrhs r1, _080B1C48 @ =gUnk_080B7A3E
@@ -263,9 +263,9 @@ _080B1C20: .4byte gRoomControls
_080B1C24: .4byte gVvvPtrs
_080B1C28: .4byte gRoomControls
_080B1C2C: .4byte gCollisionDataPtrs
_080B1C30: .4byte gMapMetaTileTypeToVvv
_080B1C34: .4byte gMapSpecialMetaTileToVvv
_080B1C38: .4byte gMetatileTypesPtrs
_080B1C30: .4byte gMapTileTypeToVvv
_080B1C34: .4byte gMapSpecialTileToVvv
_080B1C38: .4byte gTileTypesPtrs
_080B1C3C: .4byte gUnk_08000360
_080B1C40: .4byte gUnk_080B7A3E
_080B1C44: .4byte gUnk_08000360
+3 -3
View File
@@ -326,9 +326,9 @@ DoTileInteraction: @ 0x08008796
adds r1, r7, #0
movs r2, #0x38
ldrb r2, [r4, r2] // collision layer
bl GetMetaTileTypeByPos
bl GetTileTypeByPos
ldr r1, _080088D8 @ =gUnk_080046A4
bl ActTileConv
bl FindEntryForKey
beq _080087CE_return0
lsls r1, r3, #3
adds r3, r5, #0
@@ -764,7 +764,7 @@ CheckNEastTile: @ 0x08008B02
tst r0, r1
bne _08008B1E
ldr r1, =gMapVvvToSurfaceType
bl ActTileConv
bl FindEntryForKey
movs r2, #1
cmp r3, #1
beq _08008B20
+2 -2
View File
@@ -78,11 +78,11 @@ ResolveCollisionLayer::
ldrh r0, [r4, #0x2e]
ldrh r1, [r4, #0x32]
movs r2, #2
bl GetMetaTileTypeByPos
bl GetTileTypeByPos
movs r3, #1
cmp r0, #0
beq _08016A62
bl GetVvvForMetaTileType
bl GetVvvForTileType
movs r3, #2
add r1, pc, #0x40
_08016A54:
+69 -69
View File
@@ -55,45 +55,45 @@ CloneTile: @ 0x08000152
ldrh r0, [r3, r0]
lsrs r2, r2, #2
non_word_aligned_thumb_func_start SetMetaTile
SetMetaTile: @ 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 @ 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] @ r7 (oldMetaTile) = gMapBottom.mapData[metaTilePos]
strh r0, [r5, r6] @ gMapBottom.mapData[metaTilePos] = metaTile
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 @ jump if metaTile < 0x4000
blo tile_wrong_type @ jump if tileIndex < 0x4000
push {r1, r2}
subs r4, r0, r6 @ r4 = metaTile - 0x4000
ldr r3, _08000210 @ =gMapSpecialMetaTileToVvv
ldrb r0, [r3, r4] @ r0 = gMapSpecialMetaTileToVvv[metaTile - 0x4000]
bl SetVvvAtMetaTilePos
ldr r3, _08000214 @ =gMapSpecialMetaTileToCollisionData
ldrb r0, [r3, r4] @ r0 = gMapSpecialMetaTileToCollisionData[metaTile - 0x4000]
subs r4, r0, r6 @ r4 = tileIndex - 0x4000
ldr r3, _08000210 @ =gMapSpecialTileToVvv
ldrb r0, [r3, r4] @ r0 = gMapSpecialTileToVvv[tileIndex - 0x4000]
bl SetVvvAtTilePos
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 @ DeleteLoadedTileEntity(metaTilePos, layer)
adds r0, r7, #0 @ r0 = oldMetaTile
bl UnregisterInteractTile @ DeleteLoadedTileEntity(tilePos, layer)
adds r0, r7, #0 @ r0 = oldTile
pop {r1, r2}
bl RegisterInteractTile @ StoreMetaTileForSpecialTile(oldMetaTile, metaTilePos, layer)
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 @ r3 = layer * 8 + 4
ldr r4, [r4, r3]
lsls r0, r0, #1 @ r0 = metaTile * 2
ldrh r4, [r4, r0] @ r4 (metaTileType) = gMapBottom.metatileTypes[metaTile]
lsls r0, r0, #1 @ r0 = tileIndex * 2
ldrh r4, [r4, r0] @ r4 (tileType) = gMapBottom.tileTypes[tileIndex]
push {r1, r2}
ldr r3, _08000218 @ =gMapMetaTileTypeToVvv
ldrb r0, [r3, r4] @ r0 = gMapMetaTileTypeToVvv[metaTileType]
bl SetVvvAtMetaTilePos
ldr r3, _0800021C @ =gMapMetaTileTypeToCollisionData
ldrb r0, [r3, r4] @ r0 = gMapMetaTileTypeToCollisionData[metaTileType]
ldr r3, _08000218 @ =gMapTileTypeToVvv
ldrb r0, [r3, r4] @ r0 = gMapTileTypeToVvv[tileType]
bl SetVvvAtTilePos
ldr r3, _0800021C @ =gMapTileTypeToCollisionData
ldrb r0, [r3, r4] @ r0 = gMapTileTypeToCollisionData[tileType]
lsrs r2, r2, #2 @ r2 = layer
bl SetCollisionData
pop {r0, r1}
@@ -105,17 +105,17 @@ _080001C4: .4byte gMapBottom+0x6004
_080001C8: .4byte gMapTop+0x6004
_080001CC: .4byte gMapBottom+0x6004
@ r0: @see gMapSpecialMetaTileToVvv r1: metaTilePos, r2: layer
thumb_func_start SetVvvAtMetaTilePos
SetVvvAtMetaTilePos: @ 0x080001D0
@ r0: @see gMapSpecialTileToVvv r1: tilePos, r2: layer
thumb_func_start SetVvvAtTilePos
SetVvvAtTilePos: @ 0x080001D0
lsls r2, r2, #2
ldr r3, _08000220 @ =gVvvPtrs
ldr r3, [r3, r2] @ r3 = gMapBottom.vvv
strb r0, [r3, r1] @ gMapBottom.vvv[metaTilePos] = r0
strb r0, [r3, r1] @ gMapBottom.vvv[tilePos] = r0
bx lr
non_word_aligned_thumb_func_start GetMetaTileIndex
GetMetaTileIndex: @ 0x080001DA
non_word_aligned_thumb_func_start GetTileIndex
GetTileIndex: @ 0x080001DA
lsls r1, r1, #3
ldr r2, _08000224 @ =gMapDataPtrs
ldr r1, [r2, r1]
@@ -133,37 +133,37 @@ _08000200: .4byte gBG2Buffer+0x40
_08000204: .4byte gCollisionDataPtrs
_08000208: .4byte gMapDataPtrs
_0800020C: .4byte 0x00004000
_08000210: .4byte gMapSpecialMetaTileToVvv
_08000214: .4byte gMapSpecialMetaTileToCollisionData
_08000218: .4byte gMapMetaTileTypeToVvv
_0800021C: .4byte gMapMetaTileTypeToCollisionData
_08000210: .4byte gMapSpecialTileToVvv
_08000214: .4byte gMapSpecialTileToCollisionData
_08000218: .4byte gMapTileTypeToVvv
_0800021C: .4byte gMapTileTypeToCollisionData
_08000220: .4byte gVvvPtrs
_08000224: .4byte gMapDataPtrs
gMapDataPtrs::
.4byte BOTTOM_TILEDATA @ layer 0
gMetatileTypesPtrs::
.4byte BOTTOM_METATILETYPES
gTileTypesPtrs::
.4byte BOTTOM_TILETYPES
.4byte BOTTOM_TILEDATA @ layer 1
.4byte BOTTOM_METATILETYPES
.4byte BOTTOM_TILETYPES
.4byte TOP_TILEDATA @ layer 2
.4byte TOP_METATILETYPES
.4byte TOP_TILETYPES
.4byte BOTTOM_TILEDATA @ layer 3
.4byte BOTTOM_METATILETYPES
.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:: @ mapDataClone and metatileTypes
.4byte BOTTOM_TILEDATACLONE @ layer 0
.4byte BOTTOM_METATILETYPES
.4byte BOTTOM_TILEDATACLONE @ layer 1
.4byte BOTTOM_METATILETYPES
.4byte TOP_TILEDATACLONE @ layer 2
.4byte TOP_METATILETYPES
.4byte BOTTOM_TILEDATACLONE @ layer 3
.4byte BOTTOM_METATILETYPES
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
gVvvPtrs:: @ vvv for layers
.4byte BOTTOM_UNKDATA3 @ layer 0
.4byte BOTTOM_UNKDATA3 @ layer 1
@@ -222,9 +222,9 @@ sub_080B1A0C: @ 0x0800029C
@ call 0x080B1A28
@ r0: entity
@ return: u32 (tileType)
thumb_func_start GetMetaTileTypeByEntity
GetMetaTileTypeByEntity: @ 0x080002A0
ldr r3, _0800030C @ =ram_GetMetaTileTypeByEntity
thumb_func_start GetTileTypeByEntity
GetTileTypeByEntity: @ 0x080002A0
ldr r3, _0800030C @ =ram_GetTileTypeByEntity
bx r3
@ call 0x080B1A34
@@ -232,9 +232,9 @@ GetMetaTileTypeByEntity: @ 0x080002A0
@ r1: s32 (yPos)
@ r2: u32 (layer)
@ return: u32 (tileType)
thumb_func_start GetMetaTileTypeByPos
GetMetaTileTypeByPos: @ 0x080002A4
ldr r3, _08000310 @ =ram_GetMetaTileTypeByPos
thumb_func_start GetTileTypeByPos
GetTileTypeByPos: @ 0x080002A4
ldr r3, _08000310 @ =ram_GetTileTypeByPos
bx r3
@ call 0x080B1A48
@@ -259,9 +259,9 @@ sub_080B1A58: @ 0x080002AC
@ r0: u32 (tileIndex)
@ r1: u32 (layer)
@ return: u32 (tileType)
thumb_func_start GetMetaTileType
GetMetaTileType: @ 0x080002B0
ldr r3, _0800031C @ =ram_GetMetaTileType
thumb_func_start GetTileType
GetTileType: @ 0x080002B0
ldr r3, _0800031C @ =ram_GetTileType
bx r3
@ call 0x080B1A8C
@@ -318,9 +318,9 @@ GetVvvAtRoomTile: @ 0x080002C4
@ call 0x080B1AE0
@ r0: u32 (tileIndex)
@ r1: u32 (layer)
thumb_func_start GetVvvAtMetaTilePos
GetVvvAtMetaTilePos: @ 0x080002C8
ldr r3, _08000334 @ =ram_GetVvvAtMetaTilePos
thumb_func_start GetVvvAtTilePos
GetVvvAtTilePos: @ 0x080002C8
ldr r3, _08000334 @ =ram_GetVvvAtTilePos
bx r3
@ call 0x080B1AF0
@@ -365,16 +365,16 @@ GetCollisionDataAtRoomTile: @ 0x080002DC
bx r3
@ call 0x080B1B44
thumb_func_start GetCollisionDataAtMetaTilePos
GetCollisionDataAtMetaTilePos: @ 0x080002E0
ldr r3, _0800034C @ =ram_GetCollisionDataAtMetaTilePos
thumb_func_start GetCollisionDataAtTilePos
GetCollisionDataAtTilePos: @ 0x080002E0
ldr r3, _0800034C @ =ram_GetCollisionDataAtTilePos
bx r3
@ call 0x080B1B54
@ r0: u32 (tileIndex)
thumb_func_start GetVvvForMetaTileType
GetVvvForMetaTileType: @ 0x080002E4
ldr r3, _08000350 @ =ram_GetVvvForMetaTileType
thumb_func_start GetVvvForTileType
GetVvvForTileType: @ 0x080002E4
ldr r3, _08000350 @ =ram_GetVvvForTileType
bx r3
@ call 0x080B1B68
@@ -408,24 +408,24 @@ _080002FC: .4byte ram_sub_080B19EC
_08000300: .4byte ram_sub_080B19FC
_08000304: .4byte ram_sub_080B1A04
_08000308: .4byte ram_sub_080B1A0C
_0800030C: .4byte ram_GetMetaTileTypeByEntity
_08000310: .4byte ram_GetMetaTileTypeByPos
_0800030C: .4byte ram_GetTileTypeByEntity
_08000310: .4byte ram_GetTileTypeByPos
_08000314: .4byte ram_sub_080B1A48
_08000318: .4byte ram_sub_080B1A58
_0800031C: .4byte ram_GetMetaTileType
_0800031C: .4byte ram_GetTileType
_08000320: .4byte ram_GetVvvRelativeToEntity
_08000324: .4byte ram_GetVvvAtEntity
_08000328: .4byte ram_GetVvvAtWorldCoords
_0800032C: .4byte ram_GetVvvAtRoomCoords
_08000330: .4byte ram_GetVvvAtRoomTile
_08000334: .4byte ram_GetVvvAtMetaTilePos
_08000334: .4byte ram_GetVvvAtTilePos
_08000338: .4byte ram_GetCollisionDataRelativeTo
_0800033C: .4byte ram_GetCollisionDataAtEntity
_08000340: .4byte ram_GetCollisionDataAtWorldCoords
_08000344: .4byte ram_GetCollisionDataAtRoomCoords
_08000348: .4byte ram_GetCollisionDataAtRoomTile
_0800034C: .4byte ram_GetCollisionDataAtMetaTilePos
_08000350: .4byte ram_GetVvvForMetaTileType
_0800034C: .4byte ram_GetCollisionDataAtTilePos
_08000350: .4byte ram_GetVvvForTileType
_08000354: .4byte ram_sub_080B1B68
_08000358: .4byte ram_sub_080B1B84
_0800035C: .4byte ram_sub_080B1BA4