GenerateCrossroadsFloor

This commit is contained in:
DizzyEggg
2024-11-08 22:40:16 +01:00
parent 76d710229e
commit 2a5e97ca89
2 changed files with 486 additions and 1130 deletions

View File

@@ -6,433 +6,8 @@
.text
thumb_func_start CreateRoomsAndAnchors
CreateRoomsAndAnchors:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x38
str r0, [sp]
str r1, [sp, 0x4]
str r2, [sp, 0x8]
str r3, [sp, 0xC]
movs r0, 0
str r0, [sp, 0x10]
movs r1, 0
str r1, [sp, 0x14]
cmp r1, r2
blt _0804D2F2
b _0804D520
_0804D2F2:
movs r2, 0
mov r10, r2
ldr r3, [sp, 0x14]
adds r3, 0x1
str r3, [sp, 0x28]
ldr r4, [sp, 0x4]
cmp r10, r4
blt _0804D304
b _0804D514
_0804D304:
ldr r5, [sp, 0x14]
lsls r5, 5
str r5, [sp, 0x1C]
_0804D30A:
mov r1, r10
lsls r0, r1, 2
ldr r2, [sp, 0xC]
adds r0, r2
ldr r3, [r0]
adds r4, r3, 0x2
mov r9, r4
ldr r5, [sp, 0x14]
lsls r1, r5, 2
ldr r2, [sp, 0x58]
adds r1, r2
ldr r2, [r1]
adds r4, r2, 0x2
str r4, [sp, 0x18]
ldr r0, [r0, 0x4]
subs r0, r3
subs r4, r0, 0x4
ldr r0, [r1, 0x4]
subs r0, r2
subs r0, 0x3
mov r8, r0
mov r5, r10
lsls r1, r5, 4
subs r0, r1, r5
lsls r0, 5
ldr r2, [sp]
adds r0, r2
ldr r3, [sp, 0x1C]
adds r7, r3, r0
ldrb r0, [r7, 0x8]
str r1, [sp, 0x2C]
adds r5, 0x1
str r5, [sp, 0x24]
cmp r0, 0
beq _0804D352
b _0804D508
_0804D352:
ldrb r0, [r7, 0xA]
cmp r0, 0
bne _0804D35A
b _0804D48C
_0804D35A:
movs r0, 0x5
adds r1, r4, 0
bl DungeonRandRange
adds r6, r0, 0
movs r0, 0x4
mov r1, r8
bl DungeonRandRange
adds r5, r0, 0
movs r1, 0x1
adds r0, r6, 0
orrs r0, r1
cmp r0, r4
bge _0804D37A
adds r6, r0, 0
_0804D37A:
adds r0, r5, 0
orrs r0, r1
cmp r0, r8
bge _0804D384
adds r5, r0, 0
_0804D384:
lsls r0, r5, 1
adds r0, r5
lsrs r1, r0, 31
adds r0, r1
asrs r0, 1
cmp r6, r0
ble _0804D394
adds r6, r0, 0
_0804D394:
lsls r0, r6, 1
adds r0, r6
lsrs r1, r0, 31
adds r0, r1
asrs r0, 1
cmp r5, r0
ble _0804D3A4
adds r5, r0, 0
_0804D3A4:
subs r0, r4, r6
bl DungeonRandInt
adds r4, r0, 0
add r4, r9
mov r1, r8
subs r0, r1, r5
bl DungeonRandInt
ldr r2, [sp, 0x18]
adds r0, r2
mov r8, r0
adds r3, r4, r6
adds r6, r0, r5
strh r4, [r7]
strh r3, [r7, 0x4]
mov r5, r8
strh r5, [r7, 0x2]
strh r6, [r7, 0x6]
ldr r0, [sp, 0x10]
adds r0, 0x1
str r0, [sp, 0x20]
cmp r4, r3
bge _0804D412
_0804D3D4:
mov r5, r8
adds r7, r4, 0x1
cmp r5, r6
bge _0804D40C
ldr r1, _0804D484
mov r9, r1
_0804D3E0:
adds r0, r4, 0
adds r1, r5, 0
str r3, [sp, 0x34]
bl GetTileSafe
ldrh r1, [r0]
mov r2, r9
ands r1, r2
movs r2, 0x1
orrs r1, r2
strh r1, [r0]
adds r0, r4, 0
adds r1, r5, 0
bl GetTileSafe
mov r1, sp
ldrb r1, [r1, 0x10]
strb r1, [r0, 0x9]
adds r5, 0x1
ldr r3, [sp, 0x34]
cmp r5, r6
blt _0804D3E0
_0804D40C:
adds r4, r7, 0
cmp r4, r3
blt _0804D3D4
_0804D412:
movs r5, 0x1
movs r0, 0x64
bl DungeonRandInt
movs r1, 0
cmp r0, 0x4F
bgt _0804D422
movs r1, 0x1
_0804D422:
adds r4, r1, 0
ldr r0, _0804D488
ldr r0, [r0]
cmp r0, 0
bne _0804D42E
movs r4, 0
_0804D42E:
movs r0, 0x4
ldr r2, [sp, 0x5C]
ands r0, r2
cmp r0, 0
bne _0804D43A
movs r5, 0
_0804D43A:
cmp r5, 0
beq _0804D466
cmp r4, 0
beq _0804D44E
movs r0, 0x64
bl DungeonRandInt
cmp r0, 0x31
ble _0804D466
movs r4, 0
_0804D44E:
cmp r5, 0
beq _0804D466
ldr r3, [sp, 0x2C]
mov r5, r10
subs r0, r3, r5
lsls r0, 5
ldr r1, [sp]
adds r0, r1
ldr r2, [sp, 0x1C]
adds r0, r2, r0
movs r1, 0x1
strb r1, [r0, 0x1C]
_0804D466:
cmp r4, 0
beq _0804D47E
ldr r3, [sp, 0x2C]
mov r4, r10
subs r0, r3, r4
lsls r0, 5
ldr r5, [sp]
adds r0, r5
ldr r1, [sp, 0x1C]
adds r0, r1, r0
movs r1, 0x1
strb r1, [r0, 0x1D]
_0804D47E:
ldr r2, [sp, 0x20]
str r2, [sp, 0x10]
b _0804D508
.align 2, 0
_0804D484: .4byte 0x0000fffc
_0804D488: .4byte gUnknown_202F1C8
_0804D48C:
movs r1, 0x2
movs r3, 0x4
movs r6, 0x2
movs r2, 0x4
mov r5, r10
cmp r5, 0
bne _0804D49C
movs r1, 0x1
_0804D49C:
ldr r0, [sp, 0x14]
cmp r0, 0
bne _0804D4A4
movs r6, 0x1
_0804D4A4:
ldr r0, [sp, 0x4]
subs r0, 0x1
cmp r10, r0
bne _0804D4AE
movs r3, 0x2
_0804D4AE:
ldr r0, [sp, 0x8]
subs r0, 0x1
ldr r5, [sp, 0x14]
cmp r5, r0
bne _0804D4BA
movs r2, 0x2
_0804D4BA:
mov r5, r9
adds r0, r5, r1
adds r1, r5, r4
subs r1, r3
str r2, [sp, 0x30]
bl DungeonRandRange
adds r5, r0, 0
ldr r1, [sp, 0x18]
adds r0, r1, r6
add r1, r8
ldr r2, [sp, 0x30]
subs r1, r2
bl DungeonRandRange
adds r4, r0, 0
strh r5, [r7]
adds r0, r5, 0x1
strh r0, [r7, 0x4]
strh r4, [r7, 0x2]
adds r0, r4, 0x1
strh r0, [r7, 0x6]
adds r0, r5, 0
adds r1, r4, 0
bl GetTileSafe
ldrh r1, [r0]
ldr r3, _0804D530
adds r2, r3, 0
ands r1, r2
movs r2, 0x1
orrs r1, r2
strh r1, [r0]
adds r0, r5, 0
adds r1, r4, 0
bl GetTileSafe
movs r1, 0xFE
strb r1, [r0, 0x9]
_0804D508:
ldr r4, [sp, 0x24]
mov r10, r4
ldr r5, [sp, 0x4]
cmp r10, r5
bge _0804D514
b _0804D30A
_0804D514:
ldr r0, [sp, 0x28]
str r0, [sp, 0x14]
ldr r1, [sp, 0x8]
cmp r0, r1
bge _0804D520
b _0804D2F2
_0804D520:
add sp, 0x38
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0804D530: .4byte 0x0000fffc
thumb_func_end CreateRoomsAndAnchors
thumb_func_start GenerateSecondaryStructures
GenerateSecondaryStructures:
push {r4-r7,lr}
mov r7, r9
mov r6, r8
push {r6,r7}
sub sp, 0x4
adds r3, r0, 0
adds r7, r1, 0
mov r9, r2
movs r1, 0
cmp r1, r9
bge _0804D5A0
_0804D54A:
adds r0, r1, 0x1
mov r8, r0
cmp r7, 0
ble _0804D59A
lsls r1, 5
adds r0, r1, 0
adds r0, 0x8
adds r4, r3, r0
adds r5, r3, r1
adds r6, r7, 0
_0804D55E:
ldrb r0, [r4]
cmp r0, 0
bne _0804D58C
ldrb r0, [r4, 0x6]
cmp r0, 0
bne _0804D58C
ldrb r0, [r4, 0xA]
cmp r0, 0
bne _0804D58C
ldrb r0, [r4, 0x2]
cmp r0, 0
beq _0804D58C
ldrb r0, [r4, 0x14]
cmp r0, 0
bne _0804D58C
ldrb r0, [r4, 0x15]
cmp r0, 0
beq _0804D58C
adds r0, r5, 0
str r3, [sp]
bl sub_804F694
ldr r3, [sp]
_0804D58C:
movs r0, 0xF0
lsls r0, 1
adds r4, r0
adds r5, r0
subs r6, 0x1
cmp r6, 0
bne _0804D55E
_0804D59A:
mov r1, r8
cmp r1, r9
blt _0804D54A
_0804D5A0:
add sp, 0x4
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end GenerateSecondaryStructures
thumb_func_start sub_804D5B0
sub_804D5B0:
push {r4-r6,lr}
mov r6, r9
mov r5, r8
push {r5,r6}
sub sp, 0x8
mov r9, r0
adds r4, r1, 0
adds r5, r2, 0
adds r6, r3, 0
adds r0, r4, 0
bl DungeonRandInt
mov r8, r0
adds r0, r5, 0
bl DungeonRandInt
str r0, [sp]
str r6, [sp, 0x4]
mov r0, r9
adds r1, r4, 0
adds r2, r5, 0
mov r3, r8
bl sub_804D5F0
add sp, 0x8
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_804D5B0
thumb_func_start sub_804D5F0
sub_804D5F0:
thumb_func_start AssignGridCellConnections
AssignGridCellConnections:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -841,7 +416,7 @@ _0804D8B8:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_804D5F0
thumb_func_end AssignGridCellConnections
thumb_func_start CreateGridCellConnections
CreateGridCellConnections:
@@ -4922,8 +4497,8 @@ _0804F686:
bx r1
thumb_func_end sub_804F61C
thumb_func_start sub_804F694
sub_804F694:
thumb_func_start GenerateSecondaryStructure
GenerateSecondaryStructure:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -5572,6 +5147,6 @@ _0804FBD6:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_804F694
thumb_func_end GenerateSecondaryStructure
.align 2,0

File diff suppressed because it is too large Load Diff