mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-16 21:18:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Dump and label room headers

Browse Source
This commit is contained in:
Marcus Huderle
2020-08-23 16:03:18 -05:00
parent 6550bf3f04
commit e9c3dfcd53
9 changed files with 2195 additions and 1294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/code_0801D79C.s
+8 -8
View File
@@ -491,7 +491,7 @@ _0801DC26:
ldr r3, [sp]
cmp r0, #0
bne _0801DCA6
ldr r0, _0801DC88 @ =gAreas
ldr r0, _0801DC88 @ =gAreaRoomHeaders
ldrb r2, [r6]
lsls r2, r2, #2
adds r2, r2, r0
@@ -526,7 +526,7 @@ _0801DC26:
b _0801DC9E
.align 2, 0
_0801DC84: .4byte 0x000007FF
_0801DC88: .4byte gAreas
_0801DC88: .4byte gAreaRoomHeaders
_0801DC8C:
ldrh r0, [r2]
ands r0, r7
@@ -562,7 +562,7 @@ _0801DCAE:
bl CheckGlobalFlag
cmp r0, #0
bne _0801DD16
ldr r0, _0801DD50 @ =gAreas
ldr r0, _0801DD50 @ =gAreaRoomHeaders
ldrb r2, [r6]
lsls r2, r2, #2
adds r2, r2, r0
@@ -632,12 +632,12 @@ _0801DD42:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0801DD4C: .4byte gArea
_0801DD50: .4byte gAreas
_0801DD50: .4byte gAreaRoomHeaders
_0801DD54: .4byte gScreenTransition
thumb_func_start sub_0801DD58
sub_0801DD58: @ 0x0801DD58
ldr r2, _0801DD7C @ =gAreas
ldr r2, _0801DD7C @ =gAreaRoomHeaders
lsls r0, r0, #2
adds r0, r0, r2
lsls r2, r1, #2
@@ -656,7 +656,7 @@ sub_0801DD58: @ 0x0801DD58
strh r0, [r1, #6]
bx lr
.align 2, 0
_0801DD7C: .4byte gAreas
_0801DD7C: .4byte gAreaRoomHeaders
_0801DD80: .4byte gArea
_0801DD84: .4byte 0x0000085C
@@ -770,7 +770,7 @@ _0801DE46:
ldr r0, _0801DF04 @ =0x84000100
str r0, [r2, #8]
ldr r0, [r2, #8]
ldr r0, _0801DF08 @ =gAreas
ldr r0, _0801DF08 @ =gAreaRoomHeaders
ldrb r2, [r4]
lsls r2, r2, #2
adds r2, r2, r0
@@ -850,7 +850,7 @@ _0801DEF8: .4byte 0x040000D4
_0801DEFC: .4byte gUnk_08324AE4
_0801DF00: .4byte gUnk_02019EE0
_0801DF04: .4byte 0x84000100
_0801DF08: .4byte gAreas
_0801DF08: .4byte gAreaRoomHeaders
_0801DF0C: .4byte 0x000007FF
thumb_func_start sub_0801DF10
asm/code_080526F8.s
+10 -10
View File
@@ -742,7 +742,7 @@ _08052CA0: .4byte gPlayerEntity
thumb_func_start sub_08052CA4
sub_08052CA4: @ 0x08052CA4
push {r4, lr}
ldr r4, _08052CC8 @ =gAreas
ldr r4, _08052CC8 @ =gAreaRoomHeaders
lsls r0, r0, #2
adds r0, r0, r4
lsls r4, r1, #2
@@ -759,13 +759,13 @@ sub_08052CA4: @ 0x08052CA4
strh r0, [r4, #0x22]
pop {r4, pc}
.align 2, 0
_08052CC8: .4byte gAreas
_08052CC8: .4byte gAreaRoomHeaders
_08052CCC: .4byte gScreenTransition
thumb_func_start sub_08052CD0
sub_08052CD0: @ 0x08052CD0
push {r4, lr}
ldr r4, _08052CF4 @ =gAreas
ldr r4, _08052CF4 @ =gAreaRoomHeaders
lsls r0, r0, #2
adds r0, r0, r4
lsls r4, r1, #2
@@ -782,7 +782,7 @@ sub_08052CD0: @ 0x08052CD0
strh r0, [r4, #0x1e]
pop {r4, pc}
.align 2, 0
_08052CF4: .4byte gAreas
_08052CF4: .4byte gAreaRoomHeaders
_08052CF8: .4byte gScreenTransition
thumb_func_start sub_08052CFC
@@ -871,7 +871,7 @@ _08052DA4: .4byte 0x0000088C
thumb_func_start sub_08052DA8
sub_08052DA8: @ 0x08052DA8
push {r4, r5, r6, r7, lr}
ldr r1, _08052DF8 @ =gAreas
ldr r1, _08052DF8 @ =gAreaRoomHeaders
ldr r0, _08052DFC @ =gRoomControls
ldrb r0, [r0, #4]
lsls r0, r0, #2
@@ -911,7 +911,7 @@ _08052DE8:
str r0, [r1]
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08052DF8: .4byte gAreas
_08052DF8: .4byte gAreaRoomHeaders
_08052DFC: .4byte gRoomControls
_08052E00: .4byte gUnk_02033ACC
_08052E04: .4byte 0x0000FFFF
@@ -1180,7 +1180,7 @@ sub_08052FF4: @ 0x08052FF4
movs r1, #0x20
bl _DmaZero
str r5, [r5, #0x20]
ldr r0, _08053078 @ =gAreas
ldr r0, _08053078 @ =gAreaRoomHeaders
lsls r6, r6, #2
adds r0, r6, r0
lsls r2, r4, #2
@@ -1223,7 +1223,7 @@ sub_08052FF4: @ 0x08052FF4
_0805306C: .4byte gRoomControls
_08053070: .4byte gScreen
_08053074: .4byte gUnk_020342CC
_08053078: .4byte gAreas
_08053078: .4byte gAreaRoomHeaders
_0805307C: .4byte gAreaTilesets
_08053080: .4byte gUnk_08107988
_08053084: .4byte gAreaMetatiles
@@ -1533,7 +1533,7 @@ _080532E0:
thumb_func_start sub_080532E4
sub_080532E4: @ 0x080532E4
ldr r0, _08053318 @ =gAreas
ldr r0, _08053318 @ =gAreaRoomHeaders
movs r1, #0xb0
lsls r1, r1, #1
adds r0, r0, r1
@@ -1560,7 +1560,7 @@ sub_080532E4: @ 0x080532E4
strh r0, [r1, #0x1e]
bx lr
.align 2, 0
_08053318: .4byte gAreas
_08053318: .4byte gAreaRoomHeaders
_0805331C: .4byte gScreenTransition
thumb_func_start sub_08053320
asm/code_080A5574.s
+4 -4
View File
@@ -2632,7 +2632,7 @@ _080A6A26:
bne _080A6A30
movs r2, #9
_080A6A30:
ldr r1, _080A6A40 @ =gAreas
ldr r1, _080A6A40 @ =gAreaRoomHeaders
lsls r0, r2, #2
adds r0, r0, r1
ldr r0, [r0]
@@ -2640,7 +2640,7 @@ _080A6A30:
subs r6, r6, r0
b _080A6A48
.align 2, 0
_080A6A40: .4byte gAreas
_080A6A40: .4byte gAreaRoomHeaders
_080A6A44:
ldr r0, _080A6A78 @ =0xFFFFFEF8
adds r7, r7, r0
@@ -3233,7 +3233,7 @@ sub_080A6EE0: @ 0x080A6EE0
adds r1, r1, r0
ldrh r3, [r1, #6]
ldrh r4, [r1, #8]
ldr r0, _080A6F38 @ =gAreas
ldr r0, _080A6F38 @ =gAreaRoomHeaders
ldrb r2, [r1, #0xb]
lsls r2, r2, #2
adds r2, r2, r0
@@ -3267,7 +3267,7 @@ sub_080A6EE0: @ 0x080A6EE0
pop {r4, r5, r6, pc}
.align 2, 0
_080A6F34: .4byte gUnk_08128024
_080A6F38: .4byte gAreas
_080A6F38: .4byte gAreaRoomHeaders
_080A6F3C: .4byte gUnk_03001010
thumb_func_start sub_080A6F40
asm/macros.inc
+1
View File
@@ -1,3 +1,4 @@
.include "asm/macros/asm.inc"
.include "asm/macros/function.inc"
.include "asm/macros/m4a.inc"
.include "asm/macros/map.inc"
asm/macros/map.inc
Executable
+12
View File
@@ -0,0 +1,12 @@
.ifndef GUARD_ASM_MACROS_MAP_INC
.set GUARD_ASM_MACROS_MAP_INC, 1
.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
.endm
.endif @ GUARD_ASM_MACROS_MAP_INC