Use more macros

This commit is contained in:
octorock
2021-11-01 16:38:19 +01:00
parent 9c3ac2ecbf
commit 1a0f416bac
31 changed files with 6134 additions and 3407 deletions
+14 -14
View File
@@ -494,7 +494,7 @@ _080A50E4:
_080A50E8:
strh r0, [r4, #2]
_080A50EA:
ldr r0, _080A5190 @ =gSpriteAnimation_322
ldr r0, _080A5190 @ =gSpriteAnimations_322
lsls r1, r1, #2
adds r1, r1, r0
ldr r0, [r1]
@@ -578,7 +578,7 @@ _080A5188:
mov sb, r4
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A5190: .4byte gSpriteAnimation_322
_080A5190: .4byte gSpriteAnimations_322
_080A5194: .4byte 0x00000141
_080A5198: .4byte gChooseFileState
_080A519C: .4byte gOamCmd
@@ -700,7 +700,7 @@ _080A58D0:
_080A58D4:
strh r0, [r4, #2]
_080A58D6:
ldr r0, _080A5980 @ =gSpriteAnimation_322
ldr r0, _080A5980 @ =gSpriteAnimations_322
lsls r1, r1, #2
adds r1, r1, r0
ldr r0, [r1]
@@ -785,7 +785,7 @@ _080A5976:
mov sb, r4
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A5980: .4byte gSpriteAnimation_322
_080A5980: .4byte gSpriteAnimations_322
_080A5984: .4byte gMenu
_080A5988: .4byte gOamCmd
_080A598C: .4byte gSave
@@ -1349,7 +1349,7 @@ _080A558C:
beq _080A55BE
movs r0, #0x18
strh r0, [r5]
ldr r0, _080A56A8 @ =gSpriteAnimation_322
ldr r0, _080A56A8 @ =gSpriteAnimations_322
movs r1, #0xa0
lsls r1, r1, #1
adds r0, r0, r1
@@ -1364,7 +1364,7 @@ _080A55BE:
beq _080A55DE
movs r0, #0x2e
strh r0, [r5]
ldr r0, _080A56A8 @ =gSpriteAnimation_322
ldr r0, _080A56A8 @ =gSpriteAnimations_322
movs r1, #0xa4
lsls r1, r1, #1
adds r0, r0, r1
@@ -1382,7 +1382,7 @@ _080A55DE:
movs r0, #0xe0
lsls r0, r0, #2
strh r0, [r5, #8]
ldr r0, _080A56A8 @ =gSpriteAnimation_322
ldr r0, _080A56A8 @ =gSpriteAnimations_322
movs r1, #0xa2
lsls r1, r1, #1
adds r0, r0, r1
@@ -1469,7 +1469,7 @@ _080A5698EU: .4byte gUnk_08128D3C
_080A569CEU: .4byte gOamCmd
_080A56A0: .4byte gChooseFileState
_080A56A4: .4byte gMain
_080A56A8: .4byte gSpriteAnimation_322
_080A56A8: .4byte gSpriteAnimations_322
_080A56ACEU: .4byte 0x00000143
_080A56B0: .4byte gUnk_02019EE0
_080A56B4: .4byte gScreen
@@ -1605,7 +1605,7 @@ _080A5D9A:
beq _080A5DCC
movs r0, #0x18
strh r0, [r5]
ldr r0, _080A5EB4 @ =gSpriteAnimation_322
ldr r0, _080A5EB4 @ =gSpriteAnimations_322
movs r1, #0xa0
lsls r1, r1, #1
adds r0, r0, r1
@@ -1621,7 +1621,7 @@ _080A5DCC:
beq _080A5DEE
movs r0, #0x2e
strh r0, [r5]
ldr r0, _080A5EB4 @ =gSpriteAnimation_322
ldr r0, _080A5EB4 @ =gSpriteAnimations_322
movs r1, #0xa4
lsls r1, r1, #1
adds r0, r0, r1
@@ -1640,7 +1640,7 @@ _080A5DEE:
movs r0, #0xe0
lsls r0, r0, #2
strh r0, [r5, #8]
ldr r1, _080A5EB4 @ =gSpriteAnimation_322
ldr r1, _080A5EB4 @ =gSpriteAnimations_322
movs r0, #0xa2
lsls r0, r0, #1
adds r1, r1, r0
@@ -1725,7 +1725,7 @@ _080A5EA4: .4byte gOamCmd
_080A5EA8: .4byte gMenu
_080A5EAC: .4byte gMain
_080A5EB0: .4byte 0x000001FB
_080A5EB4: .4byte gSpriteAnimation_322
_080A5EB4: .4byte gSpriteAnimations_322
_080A5EB8: .4byte gUnk_02019EE0
_080A5EBC: .4byte gScreen
_080A5EC0:
@@ -1822,7 +1822,7 @@ _080A5F5C:
lsls r0, r1, #5
ldr r1, _080A5FA0 @ =0x06010000
adds r5, r0, r1
ldr r1, _080A5FA4 @ =gSpriteAnimation_322
ldr r1, _080A5FA4 @ =gSpriteAnimations_322
lsls r0, r4, #2
adds r0, r0, r1
ldr r0, [r0]
@@ -1853,7 +1853,7 @@ _080A5F5C:
.align 2, 0
_080A5F9C: .4byte gSave
_080A5FA0: .4byte 0x06010000
_080A5FA4: .4byte gSpriteAnimation_322
_080A5FA4: .4byte gSpriteAnimations_322
_080A5FA8: .4byte gMoreSpritePtrs
_080A5FAC: .4byte 0x040000D4
_080A5FB0: .4byte 0x84000040