Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-09-11 10:36:34 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

clean up some datastructures in asm

Browse Source
This commit is contained in:
red031000
2023-01-15 11:00:48 +00:00
parent 246ae84646
commit 51971d7946
3 changed files with 101 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arm9/asm/unk_020557F4.s
View File

@@ -10,13 +10,11 @@ UNK_020F5D1C: ; 0x020F5D1C
.global UNK_020F5D34
UNK_020F5D34: ; 0x020F5D34
.word FUN_020548F0
.global UNK_020F5D38
UNK_020F5D38: ; 0x020F5D38
.word 0x00000001, FUN_020549FC, 0x00000002, FUN_02054A24
.word 0x00000003, FUN_02054A30, 0x00000004, 0x00000000
.word 0x00000006
.word FUN_020548F0, 0x00000001
.word FUN_020549FC, 0x00000002
.word FUN_02054A24, 0x00000003
.word FUN_02054A30, 0x00000004
.word 0x00000000, 0x00000006
.text
@@ -537,7 +535,7 @@ _02055C24:
blx r1
cmp r0, #0x1
bne _02055C36
ldr r0, _02055C48 ; =UNK_020F5D38
ldr r0, _02055C48 ; =UNK_020F5D34 + 4
lsl r1, r4, #0x3
ldr r0, [r0, r1]
pop {r3-r7, pc}
@@ -551,7 +549,7 @@ _02055C36:
pop {r3-r7, pc}
.balign 4
_02055C44: .word UNK_020F5D34
_02055C48: .word UNK_020F5D38
_02055C48: .word UNK_020F5D34 + 4
thumb_func_start FUN_02055C4C
FUN_02055C4C: ; 0x02055C4C

97
arm9/asm/unk_020603B0.s
View File

@@ -1,3 +1,5 @@
#include "constants/maps.h"
#include "constants/roamer.h"
.include "asm/macros.inc"
.include "global.inc"
@@ -5,46 +7,67 @@
.global UNK_020F7460
UNK_020F7460: ; 0x020F7460
.word 0x00000156, 0x00000157, 0x00000158, 0x00000159
.word 0x0000015A, 0x0000015B, 0x0000015D, 0x0000015E
.word 0x00000161, 0x00000162, 0x00000164, 0x0000016A
.word 0x0000016B, 0x0000016D, 0x0000016E, 0x0000016F
.word 0x00000173, 0x00000175, 0x0000017C, 0x0000017E
.word 0x0000017F, 0x00000181, 0x00000184, 0x00000187
.word 0x000001D3, 0x00000188, 0x0000018B, 0x000000C8
.word 0x000000CC
.word MAP_R201
.word MAP_R202
.word MAP_R203
.word MAP_R204A
.word MAP_R204B
.word MAP_R205A
.word MAP_R205B
.word MAP_R206
.word MAP_R207
.word MAP_R208
.word MAP_R209
.word MAP_R210A
.word MAP_R210B
.word MAP_R211A
.word MAP_R211B
.word MAP_R212A
.word MAP_R212B
.word MAP_R213
.word MAP_R214
.word MAP_R215
.word MAP_R216
.word MAP_R217
.word MAP_R218
.word MAP_R219
.word MAP_W220
.word MAP_R221
.word MAP_R222
.word MAP_D02
.word MAP_D04
.global UNK_020F74D4
UNK_020F74D4: ; 0x020F74D4
.short 2, 0x0001, 0x0017, 0xFFFF, 0xFFFF, 0xFFFF
.short 5, 0x0000, 0x0002, 0x0003, 0x0016, 0x0017
.short 4, 0x0001, 0x0003, 0x0008, 0x0016, 0xFFFF
.short 4, 0x0001, 0x0002, 0x0004, 0x0016, 0xFFFF
.short 2, 0x0003, 0x0005, 0xFFFF, 0xFFFF, 0xFFFF
.short 4, 0x0004, 0x0006, 0x001B, 0x001C, 0xFFFF
.short 3, 0x0005, 0x0007, 0x0009, 0xFFFF, 0xFFFF
.short 3, 0x0006, 0x0008, 0x000D, 0xFFFF, 0xFFFF
.short 3, 0x0002, 0x0007, 0x0009, 0xFFFF, 0xFFFF
.short 3, 0x0008, 0x000A, 0x000F, 0xFFFF, 0xFFFF
.short 3, 0x0009, 0x000B, 0x000F, 0xFFFF, 0xFFFF
.short 3, 0x000A, 0x000C, 0x0013, 0xFFFF, 0xFFFF
.short 2, 0x000B, 0x000E, 0xFFFF, 0xFFFF, 0xFFFF
.short 4, 0x0006, 0x0007, 0x000E, 0x0014, 0xFFFF
.short 3, 0x000C, 0x000D, 0x0014, 0xFFFF, 0x0000
.short 3, 0x0009, 0x000A, 0x0010, 0xFFFF, 0xFFFF
.short 2, 0x000F, 0x0011, 0xFFFF, 0xFFFF, 0xFFFF
.short 3, 0x0010, 0x0012, 0x001A, 0xFFFF, 0xFFFF
.short 3, 0x0011, 0x0013, 0x001A, 0xFFFF, 0xFFFF
.short 2, 0x000B, 0x0012, 0xFFFF, 0xFFFF, 0xFFFF
.short 3, 0x000D, 0x000E, 0x0015, 0xFFFF, 0xFFFF
.short 1, 0x0014, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
.short 3, 0x0001, 0x0002, 0x0003, 0xFFFF, 0xFFFF
.short 3, 0x0000, 0x0001, 0x0018, 0xFFFF, 0xFFFF
.short 2, 0x0017, 0x0019, 0xFFFF, 0xFFFF, 0xFFFF
.short 1, 0x0018, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
.short 2, 0x0011, 0x0012, 0xFFFF, 0xFFFF, 0xFFFF
.short 1, 0x0005, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
.short 1, 0x0005, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
.short 2, ROAMER_LOC_R202, ROAMER_LOC_R219, 0xFFFF, 0xFFFF, 0xFFFF
.short 5, ROAMER_LOC_R201, ROAMER_LOC_R203, ROAMER_LOC_R204A, ROAMER_LOC_R218, ROAMER_LOC_R219
.short 4, ROAMER_LOC_R202, ROAMER_LOC_R204A, ROAMER_LOC_R207, ROAMER_LOC_R218, 0xFFFF
.short 4, ROAMER_LOC_R202, ROAMER_LOC_R203, ROAMER_LOC_R204B, ROAMER_LOC_R218, 0xFFFF
.short 2, ROAMER_LOC_R204A, ROAMER_LOC_R205A, 0xFFFF, 0xFFFF, 0xFFFF
.short 4, ROAMER_LOC_R204B, ROAMER_LOC_R205B, ROAMER_LOC_D02, ROAMER_LOC_D04, 0xFFFF
.short 3, ROAMER_LOC_R205A, ROAMER_LOC_R206, ROAMER_LOC_R208, 0xFFFF, 0xFFFF
.short 3, ROAMER_LOC_R205B, ROAMER_LOC_R207, ROAMER_LOC_R211A, 0xFFFF, 0xFFFF
.short 3, ROAMER_LOC_R203, ROAMER_LOC_R206, ROAMER_LOC_R208, 0xFFFF, 0xFFFF
.short 3, ROAMER_LOC_R207, ROAMER_LOC_R209, ROAMER_LOC_R212A, 0xFFFF, 0xFFFF
.short 3, ROAMER_LOC_R208, ROAMER_LOC_R210A, ROAMER_LOC_R212A, 0xFFFF, 0xFFFF
.short 3, ROAMER_LOC_R209, ROAMER_LOC_R210B, ROAMER_LOC_R215, 0xFFFF, 0xFFFF
.short 2, ROAMER_LOC_R210A, ROAMER_LOC_R211B, 0xFFFF, 0xFFFF, 0xFFFF
.short 4, ROAMER_LOC_R205B, ROAMER_LOC_R206, ROAMER_LOC_R211B, ROAMER_LOC_R216, 0xFFFF
.short 3, ROAMER_LOC_R210B, ROAMER_LOC_R211A, ROAMER_LOC_R216, 0xFFFF, ROAMER_LOC_R201
.short 3, ROAMER_LOC_R208, ROAMER_LOC_R209, ROAMER_LOC_R212B, 0xFFFF, 0xFFFF
.short 2, ROAMER_LOC_R212A, ROAMER_LOC_R213, 0xFFFF, 0xFFFF, 0xFFFF
.short 3, ROAMER_LOC_R212B, ROAMER_LOC_R214, ROAMER_LOC_R222, 0xFFFF, 0xFFFF
.short 3, ROAMER_LOC_R213, ROAMER_LOC_R215, ROAMER_LOC_R222, 0xFFFF, 0xFFFF
.short 2, ROAMER_LOC_R210A, ROAMER_LOC_R214, 0xFFFF, 0xFFFF, 0xFFFF
.short 3, ROAMER_LOC_R211A, ROAMER_LOC_R211B, ROAMER_LOC_R217, 0xFFFF, 0xFFFF
.short 1, ROAMER_LOC_R216, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
.short 3, ROAMER_LOC_R202, ROAMER_LOC_R203, ROAMER_LOC_R204A, 0xFFFF, 0xFFFF
.short 3, ROAMER_LOC_R201, ROAMER_LOC_R202, ROAMER_LOC_W220, 0xFFFF, 0xFFFF
.short 2, ROAMER_LOC_R219, ROAMER_LOC_R221, 0xFFFF, 0xFFFF, 0xFFFF
.short 1, ROAMER_LOC_W220, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
.short 2, ROAMER_LOC_R213, ROAMER_LOC_R214, 0xFFFF, 0xFFFF, 0xFFFF
.short 1, ROAMER_LOC_R205A, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
.short 1, ROAMER_LOC_R205A, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
.text

34
include/constants/roamer.h Normal file
View File

@@ -0,0 +1,34 @@
#ifndef POKEDIAMOND_CONSTANTS_ROAMER_H
#define POKEDIAMOND_CONSTANTS_ROAMER_H
#define ROAMER_LOC_R201 0
#define ROAMER_LOC_R202 1
#define ROAMER_LOC_R203 2
#define ROAMER_LOC_R204A 3
#define ROAMER_LOC_R204B 4
#define ROAMER_LOC_R205A 5
#define ROAMER_LOC_R205B 6
#define ROAMER_LOC_R206 7
#define ROAMER_LOC_R207 8
#define ROAMER_LOC_R208 9
#define ROAMER_LOC_R209 10
#define ROAMER_LOC_R210A 11
#define ROAMER_LOC_R210B 12
#define ROAMER_LOC_R211A 13
#define ROAMER_LOC_R211B 14
#define ROAMER_LOC_R212A 15
#define ROAMER_LOC_R212B 16
#define ROAMER_LOC_R213 17
#define ROAMER_LOC_R214 18
#define ROAMER_LOC_R215 19
#define ROAMER_LOC_R216 20
#define ROAMER_LOC_R217 21
#define ROAMER_LOC_R218 22
#define ROAMER_LOC_R219 23
#define ROAMER_LOC_W220 24
#define ROAMER_LOC_R221 25
#define ROAMER_LOC_R222 26
#define ROAMER_LOC_D02 27
#define ROAMER_LOC_D04 28
#endif // POKEDIAMOND_CONSTANTS_ROAMER_H