Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-10-01 12:56:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #215 from PikalaxALT/pikalax_work

Browse Source 
Renaming of identified routines in overlays
This commit is contained in:
Cleverking2003
2020-07-03 23:15:36 +03:00
committed by GitHub
parent 276f24f2b7 7eb53cf8e9
commit c2fcab9edd
20 changed files with 119 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arm9/asm/unk_0200AA80.s
View File

@@ -391,7 +391,7 @@ FUN_0200AD38: ; 0x0200AD38
add r2, r3, #0x0
ldr r0, [r5, #0xc]
ldr r3, [sp, #0x10]
bl FUN_02021B04
bl String16_FormatInteger
ldr r2, [r5, #0xc]
add r0, r5, #0x0
add r1, r4, #0x0
@@ -730,8 +730,8 @@ _0200AFF0:
pop {r3-r7, pc}
.balign 4
thumb_func_start FUN_0200AFF4
FUN_0200AFF4: ; 0x0200AFF4
thumb_func_start GetLandmarkName
GetLandmarkName: ; 0x0200AFF4
push {r3-r7, lr}
add r5, r0, #0x0
add r6, r2, #0x0

4
arm9/asm/unk_02021934.s
View File

@@ -269,8 +269,8 @@ _02021AFA:
nop
_02021B00: .word 0xB6F8D2EC
thumb_func_start FUN_02021B04
FUN_02021B04: ; 0x02021B04
thumb_func_start String16_FormatInteger
String16_FormatInteger: ; 0x02021B04
push {r3-r7, lr}
sub sp, #0x8
add r5, r0, #0x0

2
arm9/asm/unk_020377F0.s
View File

@@ -125,7 +125,7 @@ UNK_020F2D54: ; 0x020F2D54
.global UNK_020F2D64
UNK_020F2D64: ; 0x020F2D64
.word MOD69_0222D5C0, MOD69_0222D7F4, MOD69_0222D750, SDK_OVERLAY_MODULE_69_ID
.word HOF_OverlayInit, HOF_OverlayRun, HOF_OverlayTeardown, SDK_OVERLAY_MODULE_69_ID
.global UNK_020F2D74
UNK_020F2D74: ; 0x020F2D74

10
arm9/asm/unk_02060CCC.s
View File

@@ -1056,7 +1056,7 @@ FUN_0206139C: ; 0x0206139C
ldrh r2, [r4, #0x2]
add r0, r5, #0x0
mov r1, #0x0
bl FUN_0200AFF4
bl GetLandmarkName
add r0, r5, #0x0
mov r1, #0x1
add r2, r6, #0x0
@@ -1108,7 +1108,7 @@ FUN_02061404: ; 0x02061404
ldrh r2, [r4, #0x6]
add r0, r5, #0x0
mov r1, #0x1
bl FUN_0200AFF4
bl GetLandmarkName
add r0, r5, #0x0
mov r1, #0x0
add r2, r6, #0x0
@@ -2842,7 +2842,7 @@ _0206218C:
add r2, r0, #0x0
add r0, r7, #0x0
mov r1, #0x0
bl FUN_0200AFF4
bl GetLandmarkName
cmp r4, #0xb
bhi _0206222C
add r0, r4, r4
@@ -2953,7 +2953,7 @@ FUN_02062240: ; 0x02062240
add r2, r0, #0x0
add r0, r4, #0x0
mov r1, #0x0
bl FUN_0200AFF4
bl GetLandmarkName
add r2, sp, #0x0
ldrh r2, [r2, #0x0]
add r0, r4, #0x0
@@ -3180,7 +3180,7 @@ FUN_020623F4: ; 0x020623F4
add r2, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
bl FUN_0200AFF4
bl GetLandmarkName
add r0, r6, #0x0
add r1, r4, #0x0
bl FUN_02025238

10
arm9/global.inc
View File

@@ -563,7 +563,7 @@
.extern FUN_0200AF50
.extern FUN_0200AF88
.extern FUN_0200AFBC
.extern FUN_0200AFF4
.extern GetLandmarkName
.extern FUN_0200B02C
.extern FUN_0200B064
.extern FUN_0200B09C
@@ -1395,7 +1395,7 @@
.extern StringSetEmpty
.extern StringCopy
.extern StringDup
.extern FUN_02021B04
.extern String16_FormatInteger
.extern FUN_02021C38
.extern FUN_02021CE0
.extern FUN_02021D3C
@@ -7189,9 +7189,9 @@
.extern MOD68_021D74E0
.extern MOD68_021D75D8
.extern MOD68_021D762C
.extern MOD69_0222D5C0
.extern MOD69_0222D7F4
.extern MOD69_0222D750
.extern HOF_OverlayInit
.extern HOF_OverlayRun
.extern HOF_OverlayTeardown
.extern MOD69_0222EC60
.extern MOD70_021D74E0
.extern MOD70_021D758C

2
arm9/modules/05/asm/module_05.s
View File

@@ -35063,7 +35063,7 @@ MOD05_021E835C: ; 0x021E835C
ldr r2, [r4, #4]
mov r1, #0
add r5, r0, #0
bl FUN_0200AFF4
bl GetLandmarkName
ldr r2, [r4, #8]
add r0, r5, #0
mov r1, #1

2
arm9/modules/14/asm/module_14.s
View File

@@ -29199,7 +29199,7 @@ _021E5872:
ldr r0, [r5, #0x74]
mov r2, #3
mov r3, #0
bl FUN_02021B04
bl String16_FormatInteger
mov r0, #0
ldr r1, [r5, #0x74]
add r2, r0, #0

10
arm9/modules/16/asm/module_16.s
View File

@@ -1167,7 +1167,7 @@ MOD16_021D7D9C: ; 0x021D7D9C
mov r2, #3
mov r3, #2
add r4, r0, #0
bl FUN_02021B04
bl String16_FormatInteger
ldr r2, [sp, #0x10]
add r0, r7, #0
mov r1, #2
@@ -11571,7 +11571,7 @@ MOD16_021DC958: ; 0x021DC958
add r1, r7, #0
mov r2, #3
mov r3, #2
bl FUN_02021B04
bl String16_FormatInteger
mov r0, #0xaa
str r0, [sp]
mov r1, #0
@@ -11589,7 +11589,7 @@ MOD16_021DC958: ; 0x021DC958
add r0, r4, #0
mov r2, #3
mov r3, #2
bl FUN_02021B04
bl String16_FormatInteger
mov r0, #0xaa
str r0, [sp]
mov r1, #0
@@ -11651,7 +11651,7 @@ MOD16_021DCA2C: ; 0x021DCA2C
add r1, r7, #0
mov r2, #3
mov r3, #2
bl FUN_02021B04
bl String16_FormatInteger
mov r0, #0xaa
str r0, [sp]
mov r1, #0
@@ -12840,7 +12840,7 @@ MOD16_021DD370: ; 0x021DD370
add r0, r7, #0
mov r2, #3
mov r3, #2
bl FUN_02021B04
bl String16_FormatInteger
mov r1, #0
str r1, [sp]
mov r0, #0xff

106
arm9/modules/20/asm/module_20.s
View File

@@ -220,7 +220,7 @@ _022525B2:
ldrb r1, [r4]
add r0, r4, #0
lsl r2, r1, #2
ldr r1, _022525EC ; =0x022544CC
ldr r1, _022525EC ; =MOD20_022544CC
ldr r1, [r1, r2]
blx r1
pop {r3, r4, r5, pc}
@@ -299,7 +299,7 @@ _0225262E:
add r5, r0, #0
add r0, r4, #0
add r1, r5, #0
bl MOD20_022528B0
bl LoadPoketchApp
add r0, r4, #0
add r1, r5, #0
bl MOD20_02252918
@@ -504,7 +504,7 @@ _022527C0:
add r5, r0, #0
add r0, r4, #0
add r1, r5, #0
bl MOD20_022528B0
bl LoadPoketchApp
add r0, r4, #0
add r1, r5, #0
bl MOD20_02252918
@@ -620,8 +620,8 @@ _022528AC:
.align 2, 0
thumb_func_end MOD20_02252818
thumb_func_start MOD20_022528B0
MOD20_022528B0: ; 0x022528B0
thumb_func_start LoadPoketchApp
LoadPoketchApp: ; 0x022528B0
push {r4, r5, r6, lr}
add r5, r0, #0
add r4, r1, #0
@@ -636,13 +636,13 @@ _022528C0:
mvn r0, r0
cmp r1, r0
bne _022528F0
ldr r2, _022528F4 ; =0x022544DC
ldr r2, _022528F4 ; =sPoketchAppOverlayMapping
mov r1, #0
_022528CE:
ldr r0, [r2]
cmp r4, r0
bne _022528E8
ldr r0, _022528F8 ; =0x022544E0
ldr r0, _022528F8 ; =sPoketchAppOverlayMapping + 4
lsl r1, r1, #3
ldr r6, [r0, r1]
mov r1, #2
@@ -659,9 +659,9 @@ _022528E8:
_022528F0:
pop {r4, r5, r6, pc}
nop
_022528F4: .word MOD20_022544DC
_022528F8: .word MOD20_022544E0
thumb_func_end MOD20_022528B0
_022528F4: .word sPoketchAppOverlayMapping
_022528F8: .word sPoketchAppOverlayMapping + 4
thumb_func_end LoadPoketchApp
thumb_func_start MOD20_022528FC
MOD20_022528FC: ; 0x022528FC
@@ -806,7 +806,7 @@ MOD20_022529C4: ; 0x022529C4
add r4, r0, #0
mov r0, #7
str r0, [sp]
ldr r0, _02252A00 ; =0x022544C4
ldr r0, _02252A00 ; =MOD20_022544C4
ldr r2, _02252A04 ; =MOD20_02252A24
mov r1, #2
add r3, r4, #0
@@ -1469,7 +1469,7 @@ _02252E58:
MOD20_02252E5C: ; 0x02252E5C
push {r4, r5}
mov r2, #0xf
ldr r5, _02252E7C ; =0x022545EC
ldr r5, _02252E7C ; =MOD20_022545EC
mov r4, #0
lsl r2, r2, #0xc
_02252E66:
@@ -1499,7 +1499,7 @@ MOD20_02252E80: ; 0x02252E80
str r0, [sp, #4]
mov r0, #7
str r0, [sp, #8]
ldr r0, _02252EA0 ; =0x02254644
ldr r0, _02252EA0 ; =MOD20_02254644
ldr r3, [r2]
bl MOD20_022537E0
add sp, #0xc
@@ -1567,14 +1567,14 @@ MOD20_02252ED0: ; 0x02252ED0
mov r0, #6
lsl r0, r0, #6
ldr r0, [r4, r0]
ldr r2, _02252FE0 ; =0x022545B4
ldr r2, _02252FE0 ; =MOD20_022545B4
mov r1, #4
mov r3, #0
bl FUN_02016C18
mov r0, #6
lsl r0, r0, #6
ldr r0, [r4, r0]
ldr r2, _02252FE4 ; =0x022545D0
ldr r2, _02252FE4 ; =MOD20_022545D0
mov r1, #5
mov r3, #0
bl FUN_02016C18
@@ -2247,7 +2247,7 @@ MOD20_02253430: ; 0x02253430
bl MOD20_022534D4
add r2, r4, #0
ldr r0, [r4, #4]
ldr r1, _022534D0 ; =0x022545A4
ldr r1, _022534D0 ; =MOD20_022545A4
add r2, #8
bl MOD20_02253E74
str r0, [r4, #0x1c]
@@ -2255,7 +2255,7 @@ MOD20_02253430: ; 0x02253430
beq _022534CC
add r2, r4, #0
ldr r0, [r4, #4]
ldr r1, _022534D0 ; =0x022545A4
ldr r1, _022534D0 ; =MOD20_022545A4
add r2, #8
bl MOD20_02253E74
str r0, [r4, #0x20]
@@ -2922,7 +2922,7 @@ _02253910:
bls _02253948
mov r1, #3
_02253948:
ldr r0, _02253968 ; =0x0225470C
ldr r0, _02253968 ; =MOD20_0225470C
add r4, r4, #1
ldrb r0, [r0, r1]
lsl r0, r0, #1
@@ -3025,7 +3025,7 @@ MOD20_02253A04: ; 0x02253A04
str r0, [sp, #0xc]
add r6, r1, #0
str r2, [sp, #8]
ldr r2, _02253A9C ; =0x02254708
ldr r2, _02253A9C ; =MOD20_02254708
ldr r1, [sp, #0xc]
mov r0, #8
ldrh r1, [r2, r1]
@@ -3043,11 +3043,11 @@ MOD20_02253A04: ; 0x02253A04
ldr r0, [sp, #8]
cmp r0, #0
bls _02253A8C
ldr r1, _02253AA0 ; =0x02254704
ldr r1, _02253AA0 ; =MOD20_02254704
ldr r0, [sp, #0xc]
ldr r4, [sp, #0x18]
ldrh r5, [r1, r0]
ldr r1, _02253A9C ; =0x02254708
ldr r1, _02253A9C ; =MOD20_02254708
ldrh r0, [r1, r0]
str r0, [sp, #0x14]
ldr r0, [sp, #4]
@@ -4166,7 +4166,7 @@ _02254232:
mov r6, #0
cmp r1, #0
bls _02254278
ldr r7, _022542A8 ; =0x02254710
ldr r7, _022542A8 ; =MOD20_02254710
add r4, r6, #0
_0225423C:
ldr r3, [r5, #0x14]
@@ -4209,7 +4209,7 @@ _02254278:
bhs _022542A2
mov r0, #0xe
add r4, r6, #0
ldr r7, _022542A8 ; =0x02254710
ldr r7, _022542A8 ; =MOD20_02254710
mul r4, r0
_02254288:
ldr r3, [r5, #0x14]
@@ -4495,12 +4495,12 @@ _02254440:
blo _02254446
mov r4, #0
_02254446:
ldr r0, _02254458 ; =0x02254744
ldr r0, _02254458 ; =MOD20_02254744
lsl r1, r5, #1
ldrh r0, [r0, r1]
lsl r1, r4, #1
str r0, [r6]
ldr r0, _0225445C ; =0x02254780
ldr r0, _0225445C ; =MOD20_02254780
ldrh r0, [r0, r1]
str r0, [r7]
pop {r3, r4, r5, r6, r7, pc}
@@ -4519,11 +4519,11 @@ MOD20_02254460: ; 0x02254460
blo _02254470
bl ErrorHandling
_02254470:
ldr r0, _02254480 ; =0x02254724
ldr r0, _02254480 ; =MOD20_02254724
lsl r1, r5, #3
ldr r0, [r0, r1]
str r0, [r4]
ldr r0, _02254484 ; =0x02254728
ldr r0, _02254484 ; =MOD20_02254728
ldr r0, [r0, r1]
str r0, [r6]
pop {r4, r5, r6, pc}
@@ -4535,17 +4535,17 @@ _02254484: .word MOD20_02254728
thumb_func_start MOD20_02254488
MOD20_02254488: ; 0x02254488
push {r4, r5}
ldr r5, _022544B8 ; =0x022547C2
ldr r5, _022544B8 ; =MOD20_022547C2
mov r4, #0
_0225448E:
ldrh r3, [r5]
cmp r0, r3
bne _022544A8
ldr r0, _022544BC ; =0x022547C4
ldr r0, _022544BC ; =MOD20_022547C4
lsl r3, r4, #2
ldrb r0, [r0, r3]
str r0, [r1]
ldr r0, _022544C0 ; =0x022547C5
ldr r0, _022544C0 ; =MOD20_022547C5
ldrb r0, [r0, r3]
str r0, [r2]
mov r0, #1
@@ -4574,25 +4574,33 @@ MOD20_022544C4: ; 0x022544C4
MOD20_022544CC: ; 0x022544CC
.word MOD20_02252600, MOD20_02252688, MOD20_022527AC, MOD20_02252818
.global MOD20_022544DC
MOD20_022544DC: ; 0x022544DC
.byte 0x00, 0x00, 0x00, 0x00
.global MOD20_022544E0
MOD20_022544E0: ; 0x022544E0
.byte 0x15, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x17, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00
.byte 0x19, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
.byte 0x1B, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00
.byte 0x1D, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x1F, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00
.byte 0x24, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00
.byte 0x26, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00
.byte 0x28, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00
.byte 0x2A, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x2B, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00
.byte 0x2C, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x2D, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00
.byte 0x2F, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00
.byte 0x31, 0x00, 0x00, 0x00
.global sPoketchAppOverlayMapping
sPoketchAppOverlayMapping: ; 0x022544DC
.word 0, SDK_OVERLAY_MODULE_21_ID
.word 23, SDK_OVERLAY_MODULE_22_ID
.word 1, SDK_OVERLAY_MODULE_23_ID
.word 2, SDK_OVERLAY_MODULE_24_ID
.word 11, SDK_OVERLAY_MODULE_25_ID
.word 17, SDK_OVERLAY_MODULE_26_ID
.word 4, SDK_OVERLAY_MODULE_27_ID
.word 5, SDK_OVERLAY_MODULE_28_ID
.word 6, SDK_OVERLAY_MODULE_29_ID
.word 10, SDK_OVERLAY_MODULE_30_ID
.word 3, SDK_OVERLAY_MODULE_31_ID
.word 8, SDK_OVERLAY_MODULE_35_ID
.word 18, SDK_OVERLAY_MODULE_36_ID
.word 14, SDK_OVERLAY_MODULE_37_ID
.word 15, SDK_OVERLAY_MODULE_38_ID
.word 22, SDK_OVERLAY_MODULE_39_ID
.word 24, SDK_OVERLAY_MODULE_40_ID
.word 20, SDK_OVERLAY_MODULE_41_ID
.word 12, SDK_OVERLAY_MODULE_42_ID
.word 7, SDK_OVERLAY_MODULE_43_ID
.word 21, SDK_OVERLAY_MODULE_44_ID
.word 16, SDK_OVERLAY_MODULE_45_ID
.word 13, SDK_OVERLAY_MODULE_47_ID
.word 19, SDK_OVERLAY_MODULE_48_ID
.word 9, SDK_OVERLAY_MODULE_49_ID
.global MOD20_022545A4
MOD20_022545A4: ; 0x022545A4

2
arm9/modules/47/asm/module_47.s
View File

@@ -1453,7 +1453,7 @@ _0225532C:
ldr r0, [r5, #0x5c]
ldr r1, [r7]
add r3, r2, #0
bl FUN_02021B04
bl String16_FormatInteger
str r4, [sp]
mov r0, #0xff
str r0, [sp, #4]

2
arm9/modules/57/asm/module_57.s
View File

@@ -3380,7 +3380,7 @@ MOD57_021D8FD8: ; 0x021D8FD8
ldr r0, [sp, #0x28]
ldr r1, [sp, #0x2c]
ldr r3, [sp, #0x34]
bl FUN_02021B04
bl String16_FormatInteger
mov r0, #0
ldr r1, [sp, #0x28]
add r2, r0, #0

4
arm9/modules/62/asm/module_62.s
View File

@@ -3585,7 +3585,7 @@ _0222F0FE:
add r0, r4, #0
mov r2, #3
mov r3, #1
bl FUN_02021B04
bl String16_FormatInteger
mov r0, #0
str r0, [sp]
mov r0, #0xff
@@ -3653,7 +3653,7 @@ _0222F194:
ldr r0, [sp, #0x10]
mov r2, #3
str r3, [sp]
bl FUN_02021B04
bl String16_FormatInteger
mov r1, #0
str r1, [sp]
mov r0, #0xff

32
arm9/modules/67/asm/module_67.s
View File

@@ -1252,7 +1252,7 @@ _021D7E32:
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
bl FUN_0200AFF4
bl GetLandmarkName
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r4, #0
@@ -1778,7 +1778,7 @@ _021D82F2:
add r2, r0, #0
ldr r0, [r4, #0x54]
mov r1, #0
bl FUN_0200AFF4
bl GetLandmarkName
ldr r0, [r4, #0x54]
ldr r1, [r4, #0x58]
add r2, r5, #0
@@ -2427,7 +2427,7 @@ MOD67_021D87E4: ; 0x021D87E4
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
bl FUN_0200AFF4
bl GetLandmarkName
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
@@ -2482,7 +2482,7 @@ _021D886E:
ldr r0, [r5, #0x54]
mov r1, #0
add r2, r4, #0
bl FUN_0200AFF4
bl GetLandmarkName
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
@@ -2532,7 +2532,7 @@ _021D88D2:
ldr r0, [r5, #0x54]
ldr r2, [sp, #0x10]
mov r1, #0
bl FUN_0200AFF4
bl GetLandmarkName
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r6, #0
@@ -2678,7 +2678,7 @@ MOD67_021D89E0: ; 0x021D89E0
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
bl FUN_0200AFF4
bl GetLandmarkName
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
@@ -2721,7 +2721,7 @@ MOD67_021D8A3C: ; 0x021D8A3C
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
bl FUN_0200AFF4
bl GetLandmarkName
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
@@ -2764,7 +2764,7 @@ MOD67_021D8A98: ; 0x021D8A98
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
bl FUN_0200AFF4
bl GetLandmarkName
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
@@ -2807,7 +2807,7 @@ MOD67_021D8AF4: ; 0x021D8AF4
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
bl FUN_0200AFF4
bl GetLandmarkName
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
@@ -2850,7 +2850,7 @@ MOD67_021D8B50: ; 0x021D8B50
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
bl FUN_0200AFF4
bl GetLandmarkName
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
@@ -2893,7 +2893,7 @@ MOD67_021D8BAC: ; 0x021D8BAC
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
bl FUN_0200AFF4
bl GetLandmarkName
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
@@ -2936,7 +2936,7 @@ MOD67_021D8C08: ; 0x021D8C08
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
bl FUN_0200AFF4
bl GetLandmarkName
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
@@ -2979,7 +2979,7 @@ MOD67_021D8C64: ; 0x021D8C64
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
bl FUN_0200AFF4
bl GetLandmarkName
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
@@ -3022,7 +3022,7 @@ MOD67_021D8CC0: ; 0x021D8CC0
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
bl FUN_0200AFF4
bl GetLandmarkName
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
@@ -3065,7 +3065,7 @@ MOD67_021D8D1C: ; 0x021D8D1C
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
bl FUN_0200AFF4
bl GetLandmarkName
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
@@ -3108,7 +3108,7 @@ MOD67_021D8D78: ; 0x021D8D78
add r2, r0, #0
ldr r0, [r5, #0x54]
mov r1, #0
bl FUN_0200AFF4
bl GetLandmarkName
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0

32
arm9/modules/69/asm/module_69.s
View File

@@ -3,8 +3,8 @@
.section .text
.balign 4, 0
thumb_func_start MOD69_0222D5C0
MOD69_0222D5C0: ; 0x0222D5C0
thumb_func_start HOF_OverlayInit
HOF_OverlayInit: ; 0x0222D5C0
push {r3, r4, r5, r6, r7, lr}
add r5, r0, #0
mov r0, #0
@@ -169,8 +169,8 @@ _0222D744: .word MOD69_0222DB2C
_0222D748: .word 0x00001B34
_0222D74C: .word 0x00000493
thumb_func_start MOD69_0222D750
MOD69_0222D750: ; 0x0222D750
thumb_func_start HOF_OverlayTeardown
HOF_OverlayTeardown: ; 0x0222D750
push {r4, r5, r6, lr}
add r5, r1, #0
ldr r1, [r5]
@@ -236,8 +236,8 @@ _0222D7E8: .word 0x00001B54
_0222D7EC: .word 0x00001B58
_0222D7F0: .word 0x00001B5C
thumb_func_start MOD69_0222D7F4
MOD69_0222D7F4: ; 0x0222D7F4
thumb_func_start HOF_OverlayRun
HOF_OverlayRun: ; 0x0222D7F4
push {r3, r4, r5, lr}
add r5, r1, #0
bl FUN_02006278
@@ -2348,8 +2348,8 @@ _0222E8F2:
nop
_0222E8F8: .word 0x00010200
thumb_func_start MOD69_0222E8FC
MOD69_0222E8FC: ; 0x0222E8FC
thumb_func_start HOF_MonGetUIStrings
HOF_MonGetUIStrings: ; 0x0222E8FC
push {r4, lr}
sub sp, #8
add r4, r0, #0
@@ -2402,14 +2402,14 @@ _0222E95E:
add sp, #8
pop {r4, pc}
thumb_func_start MOD69_0222E96C
MOD69_0222E96C: ; 0x0222E96C
thumb_func_start HOF_MonGetMetLocationString
HOF_MonGetMetLocationString: ; 0x0222E96C
push {r3, r4, r5, lr}
add r5, r0, #0
ldr r0, [r5, #8]
ldr r1, [r5, #0x24]
ldr r2, [r5, #0x28]
bl MOD69_0222F6C4
bl HOF_MonGetMetLocationStringId
add r4, r0, #0
beq _0222E982
cmp r4, #1
@@ -2422,7 +2422,7 @@ _0222E982:
add r2, r0, #0
ldr r0, [r5, #0x14]
mov r1, #0
bl FUN_0200AFF4
bl GetLandmarkName
_0222E996:
ldr r0, [r5, #0x20]
ldr r2, [r5, #0x18]
@@ -2485,7 +2485,7 @@ _0222E9FC:
mov r1, #0x48
bl MOD69_0222E89C
add r0, r4, #0
bl MOD69_0222E8FC
bl HOF_MonGetUIStrings
add r0, r4, #0
mov r1, #0x58
bl MOD69_0222E89C
@@ -2516,7 +2516,7 @@ _0222EA2E:
mov r1, #0x78
bl MOD69_0222E89C
add r0, r4, #0
bl MOD69_0222E96C
bl HOF_MonGetMetLocationString
add r0, r4, #0
mov r1, #0x88
bl MOD69_0222E89C
@@ -4030,8 +4030,8 @@ MOD69_0222F6C0: ; 0x0222F6C0
ldr r0, [r0, #0x10]
bx lr
thumb_func_start MOD69_0222F6C4
MOD69_0222F6C4: ; 0x0222F6C4
thumb_func_start HOF_MonGetMetLocationStringId
HOF_MonGetMetLocationStringId: ; 0x0222F6C4
push {r3, r4, r5, r6, r7, lr}
add r4, r1, #0
add r5, r0, #0

2
arm9/modules/71/asm/module_71.s
View File

@@ -2940,7 +2940,7 @@ _0222EE14:
add r0, r7, #0
mov r2, #3
mov r3, #0
bl FUN_02021B04
bl String16_FormatInteger
mov r0, #0x1e
str r0, [sp]
ldr r0, [sp, #0x30]

2
arm9/modules/82/asm/module_82.s
View File

@@ -4265,7 +4265,7 @@ MOD82_0222F694: ; 0x0222F694
add r1, r6, #0
add r2, r7, #0
mov r3, #2
bl FUN_02021B04
bl String16_FormatInteger
mov r3, #1
ldr r0, _0222F6CC ; =0x00010200
str r3, [sp]

2
arm9/modules/83/asm/module_83.s
View File

@@ -17329,7 +17329,7 @@ _02235DAC:
mov r2, #3
add r4, r0, #0
str r3, [sp]
bl FUN_02021B04
bl String16_FormatInteger
mov r0, #0
mvn r0, r0
str r0, [sp, #0x60]

1
asm/macros.inc
View File

@@ -1 +0,0 @@
.include "asm/macros/function.inc"

24
asm/macros/function.inc
View File

@@ -1,24 +0,0 @@
.macro arm_func_start name
.balign 4, 0
.global \name
.arm
.endm
.macro arm_func_end name
.size \name, .-\name
.endm
.macro thumb_func_start name
.balign 4, 0
.global \name
.thumb
.endm
.macro non_word_aligned_thumb_func_start name
.global \name
.thumb
.endm
.macro thumb_func_end name
.size \name, .-\name
.endm

149
asm/rom_header.s
View File

@@ -1,149 +0,0 @@
/* ROM HEADER for Pokemon Diamond (US) */
.section .text
.balign 4
.global GameTitle
GameTitle:
.asciz "POKEMON D"
.balign 4
.global GameCode
GameCode:
.ascii "ADAE"
.global MakerCode
MakerCode:
.ascii "01"
.global UnitCode
UnitCode:
.byte 0
.global DeviceType
DeviceType:
.byte 0
.global DeviceCapacity
DeviceCapacity:
.byte 9
/*reserved*/
.space 9
.global RomVersion
RomVersion:
.byte 5
/*reserved*/
.space 1
.global ARM9ROMOffset
ARM9ROMOffset:
.word 0x00004000
.global ARM9EntryAddress
ARM9EntryAddress:
.word 0x02000800
.global ARM9RAMAddress
ARM9RAMAddress:
.word 0x02000000
.global ARM9CodeSize
ARM9CodeSize:
.word 0x00107724
.global ARM7ROMOffset
ARM7ROMOffset:
.word 0x0030D000
.global ARM7EntryAddress
ARM7EntryAddress:
.word 0x02380000
.global ARM7RAMAddress
ARM7RAMAddress:
.word 0x02380000
.global ARM7CodeSize
ARM7CodeSize:
.word 0x0002931C
.global FileNameTableOffset
FileNameTableOffset:
.word 0x00336400
.global FileNameTableSize
FileNameTableSize:
.word 0x157F
.global FATOffset
FATOffset:
.word 0x337A00
.global FATSize
FATSize:
.word 0xB20
.global ARM9OverlayOffset
ARM9OverlayOffset:
.word 0x10B800
.global ARM9OverlaySize
ARM9OverlaySize:
.word 0xAE0
.global ARM7OverlayOffset
ARM7OverlayOffset:
.word 0
.global ARM7OverlaySize
ARM7OverlaySize:
.word 0
.global ROMControlInfo1
ROMControlInfo1:
.byte 0x57, 0x66, 0x41, 0x00, 0xf8, 0x08, 0x18, 0x08
.global IconTitleOffset
IconTitleOffset:
.word 0x338600
.global SecureAreaCC
SecureAreaCC:
.short 0x5931
.global ROMControlInfo3
ROMControlInfo3:
.byte 0x7E, 0x0D
.global ARM9AutoLoadHook
ARM9AutoLoadHook:
.extern _start_AutoloadDoneCallback
.word _start_AutoloadDoneCallback
.global ARM7AutoLoadHook
ARM7AutoLoadHook:
.extern ARM7AutoLoad
.word ARM7AutoLoad
.global SecureAreaDisable
SecureAreaDisable:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ApplicationEndOffset
ApplicationEndOffset:
.word 0x03A55EC0
.global ROMHeaderSize
ROMHeaderSize:
.word 0x00004000
/* should be 36 bytes here but again theres stuff here. TODO: Identify */
.byte 0x68, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global PassMeAutobootDetect
PassMeAutobootDetect:
.word 0x00000000
/* reserved */
.space 16
.global NintendoLogo
NintendoLogo:
.byte 0x24, 0xFF, 0xAE, 0x51, 0x69, 0x9A, 0xA2, 0x21, 0x3D, 0x84, 0x82, 0x0A, 0x84, 0xE4, 0x09, 0xAD
.byte 0x11, 0x24, 0x8B, 0x98, 0xC0, 0x81, 0x7F, 0x21, 0xA3, 0x52, 0xBE, 0x19, 0x93, 0x09, 0xCE, 0x20
.byte 0x10, 0x46, 0x4A, 0x4A, 0xF8, 0x27, 0x31, 0xEC, 0x58, 0xC7, 0xE8, 0x33, 0x82, 0xE3, 0xCE, 0xBF
.byte 0x85, 0xF4, 0xDF, 0x94, 0xCE, 0x4B, 0x09, 0xC1, 0x94, 0x56, 0x8A, 0xC0, 0x13, 0x72, 0xA7, 0xFC
.byte 0x9F, 0x84, 0x4D, 0x73, 0xA3, 0xCA, 0x9A, 0x61, 0x58, 0x97, 0xA3, 0x27, 0xFC, 0x03, 0x98, 0x76
.byte 0x23, 0x1D, 0xC7, 0x61, 0x03, 0x04, 0xAE, 0x56, 0xBF, 0x38, 0x84, 0x00, 0x40, 0xA7, 0x0E, 0xFD
.byte 0xFF, 0x52, 0xFE, 0x03, 0x6F, 0x95, 0x30, 0xF1, 0x97, 0xFB, 0xC0, 0x85, 0x60, 0xD6, 0x80, 0x25
.byte 0xA9, 0x63, 0xBE, 0x03, 0x01, 0x4E, 0x38, 0xE2, 0xF9, 0xA2, 0x34, 0xFF, 0xBB, 0x3E, 0x03, 0x44
.byte 0x78, 0x00, 0x90, 0xCB, 0x88, 0x11, 0x3A, 0x94, 0x65, 0xC0, 0x7C, 0x63, 0x87, 0xF0, 0x3C, 0xAF
.byte 0xD6, 0x25, 0xE4, 0x8B, 0x38, 0x0A, 0xAC, 0x72, 0x21, 0xD4, 0xF8, 0x07
.global LogoCRC
LogoCRC:
.short 0xCF56
.global HeaderCRC
HeaderCRC:
.short 0xCA37
/* reserved */
.space 160 /* hack so it builds */