summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_3.s2
-rw-r--r--asm/credits.s4
-rw-r--r--asm/evolution_graphics.s10
-rw-r--r--asm/intro.s24
-rw-r--r--asm/pokedex.s8
-rw-r--r--asm/pokedex_cry_screen.s2
-rw-r--r--asm/rom_8034C54.s8
-rw-r--r--asm/sprite.s12
-rw-r--r--asm/wallclock.s4
9 files changed, 37 insertions, 37 deletions
diff --git a/asm/battle_3.s b/asm/battle_3.s
index b0cc747b5..e540d67bb 100644
--- a/asm/battle_3.s
+++ b/asm/battle_3.s
@@ -10392,7 +10392,7 @@ sub_80458B4: @ 80458B4
ldr r0, [r0]
cmp r0, 0
bne _080458D0
- ldr r1, =gUnknown_0831BD10
+ ldr r1, =gBattleScriptingCommandsTable
ldr r0, =gBattlescriptCurrInstr
ldr r0, [r0]
ldrb r0, [r0]
diff --git a/asm/credits.s b/asm/credits.s
index 8ba828710..b98092f36 100644
--- a/asm/credits.s
+++ b/asm/credits.s
@@ -3329,7 +3329,7 @@ _081770B4:
adds r0, r4, 0
movs r2, 0
movs r3, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
adds r2, r5, 0
adds r2, 0x3E
ldrb r1, [r2]
@@ -3364,7 +3364,7 @@ _0817710E:
adds r0, r4, 0
movs r2, 0
movs r3, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
b _0817714A
_08177144:
ldrh r0, [r5, 0x2E]
diff --git a/asm/evolution_graphics.s b/asm/evolution_graphics.s
index 3c01c71d4..a836217d1 100644
--- a/asm/evolution_graphics.s
+++ b/asm/evolution_graphics.s
@@ -27,7 +27,7 @@ _0817BA4C:
str r1, [sp]
movs r2, 0
movs r3, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -1260,7 +1260,7 @@ _0817C3BA:
movs r0, 0x1E
movs r2, 0
movs r3, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
movs r0, 0x10
ldrsh r1, [r6, r0]
adds r0, r4, 0
@@ -1272,7 +1272,7 @@ _0817C3BA:
movs r0, 0x1F
movs r2, 0
movs r3, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
ldr r1, =gSprites
mov r9, r1
lsls r2, r5, 4
@@ -1547,7 +1547,7 @@ _0817C626:
movs r0, 0x1E
movs r2, 0
movs r3, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
movs r3, 0x10
ldrsh r1, [r5, r3]
adds r0, r4, 0
@@ -1559,7 +1559,7 @@ _0817C626:
movs r0, 0x1F
movs r2, 0
movs r3, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
cmp r6, 0x2
bne _0817C670
ldr r0, =sub_817C510
diff --git a/asm/intro.s b/asm/intro.s
index fe387280f..6130b920a 100644
--- a/asm/intro.s
+++ b/asm/intro.s
@@ -4519,7 +4519,7 @@ _0816F336:
str r1, [sp]
movs r2, 0
movs r3, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
movs r0, 0x32
ldrsh r1, [r4, r0]
lsls r0, r1, 1
@@ -4795,7 +4795,7 @@ _0816F550:
adds r1, r4, 0
movs r2, 0
movs r3, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
ldrh r0, [r7, 0x30]
adds r0, 0x1
lsls r0, 24
@@ -4808,7 +4808,7 @@ _0816F550:
str r6, [sp]
mov r1, r8
mov r2, r9
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
ldrh r0, [r7, 0x30]
adds r0, 0x2
lsls r0, 24
@@ -4821,7 +4821,7 @@ _0816F550:
mov r1, r8
mov r2, r9
adds r3, r5, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
_0816F59E:
add sp, 0x4
pop {r3-r5}
@@ -4849,7 +4849,7 @@ sub_816F5B4: @ 816F5B4
str r1, [sp]
movs r2, 0
movs r3, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
ldrh r0, [r4, 0x30]
adds r0, 0x1
lsls r0, 24
@@ -4861,7 +4861,7 @@ sub_816F5B4: @ 816F5B4
str r1, [sp]
movs r2, 0
movs r3, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
ldrh r0, [r4, 0x30]
adds r0, 0x2
lsls r0, 24
@@ -4873,7 +4873,7 @@ sub_816F5B4: @ 816F5B4
str r1, [sp]
movs r2, 0
movs r3, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
ldrh r1, [r4, 0x36]
movs r2, 0x36
ldrsh r0, [r4, r2]
@@ -5320,7 +5320,7 @@ _0816F8A0:
adds r1, r4, 0
movs r2, 0
movs r3, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
mov r0, r9
lsls r0, 24
lsrs r0, 24
@@ -5329,7 +5329,7 @@ _0816F8A0:
adds r1, r4, 0
movs r2, 0
movs r3, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
mov r1, r8
lsls r1, 24
lsrs r1, 24
@@ -5341,7 +5341,7 @@ _0816F8A0:
adds r1, r4, 0
movs r2, 0
movs r3, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
ldr r0, [sp, 0x10]
add sp, 0x14
pop {r3-r5}
@@ -6045,7 +6045,7 @@ _0816FF38:
adds r3, r5, 0
str r1, [sp]
movs r0, 0x1
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
_0816FF48:
movs r2, 0x2E
ldrsh r0, [r4, r2]
@@ -6259,7 +6259,7 @@ _081700BE:
movs r0, 0x12
movs r2, 0
movs r3, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
add sp, 0x4
pop {r4,r5}
pop {r0}
diff --git a/asm/pokedex.s b/asm/pokedex.s
index 3880dd213..bebfb9ade 100644
--- a/asm/pokedex.s
+++ b/asm/pokedex.s
@@ -5706,7 +5706,7 @@ _080BE55C:
str r2, [sp]
movs r2, 0
movs r3, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
adds r1, r6, 0x1
movs r0, 0x1F
ands r1, r0
@@ -6009,7 +6009,7 @@ _080BE7AC:
negs r3, r3
lsrs r3, 16
str r1, [sp]
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
ldr r1, [r7]
adds r1, r5
ldrh r0, [r6, 0x30]
@@ -7972,7 +7972,7 @@ _080BF982:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
ldr r0, =gUnknown_0856E610
ldrb r1, [r4, 0x5]
lsrs r1, 4
@@ -8041,7 +8041,7 @@ _080BFA34:
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
ldr r0, =gUnknown_0856E610
ldrb r1, [r4, 0x5]
lsrs r1, 4
diff --git a/asm/pokedex_cry_screen.s b/asm/pokedex_cry_screen.s
index c12c4c195..50c438e59 100644
--- a/asm/pokedex_cry_screen.s
+++ b/asm/pokedex_cry_screen.s
@@ -935,7 +935,7 @@ _08145A82:
ldrh r0, [r4, 0x6]
str r0, [sp]
movs r0, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
ldr r2, =gSineTable
ldr r0, [r6]
ldrb r0, [r0]
diff --git a/asm/rom_8034C54.s b/asm/rom_8034C54.s
index 6c4380407..420be2a3b 100644
--- a/asm/rom_8034C54.s
+++ b/asm/rom_8034C54.s
@@ -14522,7 +14522,7 @@ _0803CCB4:
ands r0, r1
cmp r0, 0
bne _0803CCFA
- ldr r0, =gUnknown_0831BD10
+ ldr r0, =gBattleScriptingCommandsTable
ldrb r1, [r4]
lsls r1, 2
adds r1, r0
@@ -16400,7 +16400,7 @@ _0803DE10:
ldr r0, [r0]
cmp r0, 0
bne _0803DE2A
- ldr r1, =gUnknown_0831BD10
+ ldr r1, =gBattleScriptingCommandsTable
ldr r0, =gBattlescriptCurrInstr
ldr r0, [r0]
ldrb r0, [r0]
@@ -16651,7 +16651,7 @@ _0803E060:
ldr r0, [r0]
cmp r0, 0
bne _0803E07A
- ldr r1, =gUnknown_0831BD10
+ ldr r1, =gBattleScriptingCommandsTable
ldr r0, =gBattlescriptCurrInstr
ldr r0, [r0]
ldrb r0, [r0]
@@ -16672,7 +16672,7 @@ sub_803E08C: @ 803E08C
ldr r0, [r0]
cmp r0, 0
bne _0803E0A8
- ldr r1, =gUnknown_0831BD10
+ ldr r1, =gBattleScriptingCommandsTable
ldr r0, =gBattlescriptCurrInstr
ldr r0, [r0]
ldrb r0, [r0]
diff --git a/asm/sprite.s b/asm/sprite.s
index 4ff7de4ee..3073edc2a 100644
--- a/asm/sprite.s
+++ b/asm/sprite.s
@@ -1142,9 +1142,9 @@ _08007204:
.pool
thumb_func_end ResetOamMatrices
- thumb_func_start SetSpriteTransformationMatrix
-@ void SetSpriteTransformationMatrix(u8 index, u16 a, u16 b, u16 c, u16 d)
-SetSpriteTransformationMatrix: @ 8007224
+ thumb_func_start SetOamMatrix
+@ void SetOamMatrix(u8 index, u16 a, u16 b, u16 c, u16 d)
+SetOamMatrix: @ 8007224
push {r4,r5,lr}
ldr r5, [sp, 0xC]
lsls r0, 24
@@ -1159,13 +1159,13 @@ SetSpriteTransformationMatrix: @ 8007224
pop {r0}
bx r0
.pool
- thumb_func_end SetSpriteTransformationMatrix
+ thumb_func_end SetOamMatrix
thumb_func_start ResetSprite
@ void ResetSprite(struct obj *object)
ResetSprite: @ 8007244
push {lr}
- ldr r1, =gUnknown_082EC64C
+ ldr r1, =sDummySprite
movs r2, 0x44
bl memcpy
pop {r0}
@@ -3617,7 +3617,7 @@ _08008406:
adds r0, r2, 0
movs r2, 0
movs r3, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
add sp, 0x4
pop {r0}
bx r0
diff --git a/asm/wallclock.s b/asm/wallclock.s
index 0d0c6c65a..cfe048a54 100644
--- a/asm/wallclock.s
+++ b/asm/wallclock.s
@@ -1222,7 +1222,7 @@ _081351E8:
lsrs r3, 16
str r1, [sp]
movs r0, 0
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
ldr r1, =gUnknown_085B22D0
lsls r2, r7, 1
adds r0, r2, r1
@@ -1300,7 +1300,7 @@ _08135280:
lsrs r3, 16
str r1, [sp]
movs r0, 0x1
- bl SetSpriteTransformationMatrix
+ bl SetOamMatrix
ldr r1, =gUnknown_085B22D0
lsls r2, r7, 1
adds r0, r2, r1
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-31 18:49:37 +0000