mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-11 21:19:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zeldaret:master' into master

Browse Source
This commit is contained in:
Tony Jih
2024-01-17 15:06:40 +08:00
committed by GitHub
parent 88338832f9 b429a7b66f
commit 9cd0ee4967
454 changed files with 24625 additions and 20992 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/lib/libgcc.s
+3 -3
View File
@@ -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
asm/macros/entity.inc
+2 -2
View File
@@ -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
asm/macros/map.inc
+18 -18
View File
@@ -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
asm/macros/scripts.inc
+5 -5
View File
@@ -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
asm/src/code_08000F10.s
+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
asm/src/code_08003FC4.s
+4 -4
View File
@@ -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
asm/src/code_080043E8.s
+3 -44
View File
@@ -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"
asm/src/code_08007CAC.s
+31 -37
View File
@@ -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
asm/src/intr.s
+52 -51
View File
@@ -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
asm/src/player.s
+8 -8
View File
@@ -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
asm/src/script.s
+4 -4
View File
@@ -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
asm/src/veneer.s
+158 -155
View File
@@ -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
assets/assets.json
+1 -2156
View File
File diff suppressed because it is too large Load Diff
assets/gfx.json
+1 -3
View File
@@ -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"
assets/map.json
+5906 -4751
View File
File diff suppressed because it is too large Load Diff
data/animations/npc/kid.s
+3
View File
@@ -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
data/animations/object/minecart.s
-17
View File
@@ -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"
data/const/common.s
-336
View File
@@ -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
data/const/entity.s
-380
View File
@@ -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
data/const/playerItem/playerItemCellOverwriteSet.s
-21
View File
@@ -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"
data/const/staffroll.s
-14
View File
@@ -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"
data/const/subtask.s
+2 -2
View File
@@ -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"
data/gfx/palette_groups.s
+551 -551
View File
File diff suppressed because it is too large Load Diff
data/map/map_data.s
+3669 -4853
View File
File diff suppressed because it is too large Load Diff
data/map/map_headers.s
+1222 -1222
View File
File diff suppressed because it is too large Load Diff
data/map/metatile_headers.s
-476
View File
@@ -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
data/map/room_headers.s
+1 -1
View File
@@ -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
data/map/tile_headers.s
Executable
+476
View File
@@ -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
data/map/tileset_headers.s
+1139 -1139
View File
File diff suppressed because it is too large Load Diff
data/scripts/castorWilds/script_CutsceneOrchestrator.inc
+1 -1
View File
@@ -11,7 +11,7 @@ script_0800B216:
Call DisablePauseMenuAndPutAwayItems
MoveEntityToPlayer
CameraTargetEntity
_0807EDD4 0x0068, 0x0380
MoveTo 0x0068, 0x0380
SetSyncFlag 0x00000002
WaitForSyncFlagAndClear 0x00000001
Call EnablePauseMenu
data/scripts/castorWilds/script_PlayerAtDarknutFight.inc
+1 -1
View File
@@ -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
data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc
+1 -1
View File
@@ -13,7 +13,7 @@ SCRIPT_START script_CutsceneOrchestratorGreatWhirlwindRevealed
WaitForSyncFlagAndClear 0x00000004
SetSyncFlag 0x0000000a
WaitForSyncFlagAndClear 0x00000004
_0807EEB4
MoveToPlayer
SetScrollSpeed 4
CameraTargetPlayer
Call sub_0807FBCC
data/scripts/cloudTops/script_Npc4EFirstCloud.inc
+1 -1
View File
@@ -26,7 +26,7 @@ script_0800D650:
SetEntitySpeed 0x0700
SetScrollSpeed 7
CameraTargetEntity
_0807EDD4 0x01e8, 0x01b8
MoveTo 0x01e8, 0x01b8
Wait 0x003c
Call NPC4E_SetPinwheelFlag
Wait 0x0078
data/scripts/cloudTops/script_Npc4EKinstoneFused.inc
+1 -1
View File
@@ -1,6 +1,6 @@
@ Cloud Tops NPC4E after Kinstone has been fused
SCRIPT_START script_Npc4EKinstoneFused
_0807EEB4
MoveToPlayer
SetScrollSpeed 4
CameraTargetPlayer
Call sub_0807FBCC
data/scripts/cloudTops/script_PlayerAtSiroc.inc
+1 -1
View File
@@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtSiroc
BeginBlock
SetEntitySpeed 0x0100
EndBlock
_0807EDD4 0x0078, 0x0040
MoveTo 0x0078, 0x0040
SetAnimationState 0x0000
DoPostScriptAction 0x0000
SetSyncFlag 0x00000001
data/scripts/cloudTops/script_WindTribespeople3.inc
+1 -1
View File
@@ -19,7 +19,7 @@ script_080149DE:
SetLocalFlag 0x00b1
DoPostScriptAction 0x000b
DoPostScriptAction 0x0001
_0807EDD4 0x0068, 0x00f8
MoveTo 0x0068, 0x00f8
PlaySound SFX_SECRET
FacePlayer
DoPostScriptAction 0x0000
data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc
+1 -1
View File
@@ -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
data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc
+2 -2
View File
@@ -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
data/scripts/cutscene/ezlo/script_EzloCap.inc
+1 -1
View File
@@ -225,7 +225,7 @@ script_08012A3E:
SetEntitySpeed 0x0080
Call sub_0806D8A0
script_08012A74:
_0807EE30
MoveTowardsTarget
JumpIfNot script_08012A74
SetAnimation 0x001f
WaitUntilTextboxCloses
data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/intro/script_IntroCameraTarget.inc
+2 -2
View File
@@ -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
data/scripts/cutscene/intro/script_PlayerMoveToSmith.inc
+3 -3
View File
@@ -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
data/scripts/cutscene/intro/script_SmithIntro.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/intro/script_SmithIntro2.inc
+3 -3
View File
@@ -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
data/scripts/cutscene/intro/script_ZeldaIntro.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc
+3 -3
View File
@@ -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
data/scripts/cutscene/intro/script_ZeldaMoveToLinksHouse.inc
+10 -10
View File
@@ -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
data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc
+2 -2
View File
@@ -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
data/scripts/cutscene/introAssembly/script_PlayerEnters.inc
+2 -2
View File
@@ -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
data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/introBusinessScrub/script_08015B14.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc
+3 -3
View File
@@ -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
data/scripts/cutscene/introCeremony/script_08011890.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc
+2 -2
View File
@@ -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
data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc
+2 -2
View File
@@ -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
data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc
+3 -3
View File
@@ -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
data/scripts/cutscene/introCeremony/script_GuardTopRight.inc
+3 -3
View File
@@ -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
data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc
+2 -2
View File
@@ -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
data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc
+2 -2
View File
@@ -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
data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc
+1 -1
View File
@@ -3,7 +3,7 @@ SCRIPT_START script_PlayerIntroCastle
BeginBlock
SetEntitySpeed 0x0080
EndBlock
_0807EDD4 0x01e8, 0x0050
MoveTo 0x01e8, 0x0050
SetAnimationState 0x0000
DoPostScriptAction 0x0000
SetSyncFlag 0x00000400
data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc
+2 -2
View File
@@ -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
data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc
+3 -3
View File
@@ -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
data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc
+4 -4
View File
@@ -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
data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc
+2 -2
View File
@@ -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
data/scripts/cutscene/introTown/script_PlayerIntro2.inc
+1 -1
View File
@@ -3,7 +3,7 @@ SCRIPT_START script_PlayerIntro2
BeginBlock
SetEntitySpeed 0x0100
EndBlock
_0807EDD4 0x00a0, 0x0278
MoveTo 0x00a0, 0x0278
SetAnimationState 0x0000
DoPostScriptAction 0x0000
SetSyncFlag 0x00000001
data/scripts/cutscene/introTown/script_PlayerIntro3.inc
+1 -1
View File
@@ -3,7 +3,7 @@ SCRIPT_START script_PlayerIntro3
BeginBlock
SetEntitySpeed 0x0100
EndBlock
_0807EDD4 0x0078, 0x01c0
MoveTo 0x0078, 0x01c0
SetAnimationState 0x0000
DoPostScriptAction 0x0000
SetSyncFlag 0x00000001
data/scripts/cutscene/introTown/script_PlayerIntro4.inc
+1 -1
View File
@@ -3,7 +3,7 @@ SCRIPT_START script_PlayerIntro4
BeginBlock
SetEntitySpeed 0x0100
EndBlock
_0807EDD4 0x0108, 0x01c8
MoveTo 0x0108, 0x01c8
SetAnimationState 0x0002
DoPostScriptAction 0x0000
SetSyncFlag 0x00000001
data/scripts/cutscene/introTown/script_PlayerIntro5.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc
+6 -6
View File
@@ -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
data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc
+3 -3
View File
@@ -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
data/scripts/cutscene/kinstones/script_KidKinstone1.inc
+4 -4
View File
@@ -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
data/scripts/cutscene/kinstones/script_KidKinstone2.inc
+3 -3
View File
@@ -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
data/scripts/cutscene/kinstones/script_KidKinstone3.inc
+3 -3
View File
@@ -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
data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/minishVillage/script_ForestMinish5.inc
+3 -3
View File
@@ -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
data/scripts/cutscene/minishVillage/script_ForestMinish6.inc
+3 -3
View File
@@ -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
data/scripts/cutscene/minishVillage/script_ForestMinish7.inc
+3 -3
View File
@@ -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
data/scripts/cutscene/minishVillage/script_ForestMinish8.inc
+3 -3
View File
@@ -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
data/scripts/cutscene/minishVillage/script_ForestMinish9.inc
+3 -3
View File
@@ -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
data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc
+2 -2
View File
@@ -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
data/scripts/cutscene/originStory/script_CutsceneMiscObjectDarkMagic.inc
+2 -2
View File
@@ -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
data/scripts/cutscene/originStory/script_CutsceneMiscObjectMinishCap.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/originStory/script_MinishEzlo.inc
+2 -2
View File
@@ -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
data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/outro/script_CutsceneMiscObjectMinishCapOutro.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/outro/script_EzloCapOutro.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc
+3 -3
View File
@@ -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
data/scripts/cutscene/outro/script_PlayerAtEzlo.inc
+1 -1
View File
@@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtEzlo
BeginBlock
SetEntitySpeed 0x0100
EndBlock
_0807EDD4 0x0088, 0x0080
MoveTo 0x0088, 0x0080
SetAnimationState 0x0000
DoPostScriptAction 0x0000
SetSyncFlag 0x00000001
data/scripts/cutscene/reveal/script_08013494.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/reveal/script_PlayerAtPicture.inc
+1 -1
View File
@@ -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
data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc
+1 -1
View File
@@ -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

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