diff options
author | red031000 <rubenru09@aol.com> | 2020-07-02 22:25:09 +0100 |
---|---|---|
committer | red031000 <rubenru09@aol.com> | 2020-07-02 22:25:22 +0100 |
commit | acf1483b983e9ca7b0759d9aaab77e153bfaaee4 (patch) | |
tree | 438c0bae7de31f0bb155becdc5af89db887f65ca | |
parent | 30694cdc38e8824d56f6e6b89da9753b01ccb17b (diff) |
module 14 fully shiftable
-rw-r--r-- | arm9/arm9.lsf | 4 | ||||
-rw-r--r-- | arm9/global.inc | 3 | ||||
-rw-r--r-- | arm9/modules/14/asm/module_14.s | 76 | ||||
-rw-r--r-- | arm9/modules/48/asm/module_48.s | 4 | ||||
-rw-r--r-- | arm9/modules/69/asm/module_69.s | 6 | ||||
-rw-r--r-- | arm9/modules/71/asm/module_71.s | 4 | ||||
-rw-r--r-- | arm9/modules/75/asm/module_75.s | 3 | ||||
-rw-r--r-- | arm9/modules/76/asm/module_76.s | 4 | ||||
-rw-r--r-- | arm9/modules/80/asm/module_80.s | 4 | ||||
-rw-r--r-- | arm9/modules/81/asm/module_81.s | 18 | ||||
-rw-r--r-- | arm9/modules/84/asm/module_84.s | 4 |
11 files changed, 68 insertions, 62 deletions
diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf index ab0075c6..b4f2b9ac 100644 --- a/arm9/arm9.lsf +++ b/arm9/arm9.lsf @@ -574,7 +574,7 @@ Overlay MODULE_13 Overlay MODULE_14 { - ### Menu? ### + ##PC## After arm9 Object module_14.o } @@ -587,7 +587,7 @@ Overlay MODULE_15 Overlay MODULE_16 { - ##Battle Graphics## + ##Pokedex/Battle Sprites## After arm9 Object module_16.o } diff --git a/arm9/global.inc b/arm9/global.inc index e33bd907..0128f86d 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -7225,6 +7225,7 @@ .extern MOD75_021E6BA0 .extern MOD75_021E6D6C .extern MOD75_021E6F00 +.extern MOD75_021EC68C .extern MOD76_021D74E0 .extern MOD76_021D7568 .extern MOD76_021D761C @@ -7760,6 +7761,7 @@ .extern UNK_020F2B7C .extern UNK_020F2B8C .extern UNK_020FA5FC +.extern UNK_020FA6E8 .extern UNK_020FB6F8 .extern UNK_020FB704 .extern UNK_020FB710 @@ -8087,3 +8089,4 @@ .extern MOD18_0224A7C8 .extern MOD06_0224CAAC .extern MOD06_0224CB54 +.extern gSineTable
\ No newline at end of file diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index 5cf8939b..2c5fb91b 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -5663,7 +5663,7 @@ _021DA2F2: bl MOD14_021D83E4 mov r1, #0x4b lsl r1, r1, #2 - ldr r0, _021DA394 ; =MOD14_020FA6E8 + ldr r0, _021DA394 ; =UNK_020FA6E8 add r1, r5, r1 mov r2, #9 bl FUN_02006234 @@ -5716,7 +5716,7 @@ _021DA374: _021DA390: pop {r3, r4, r5, pc} nop -_021DA394: .word 0x020FA6E8 +_021DA394: .word UNK_020FA6E8 _021DA398: .word MOD14_021D76E8 thumb_func_start MOD14_021DA39C @@ -5825,7 +5825,7 @@ _021DA41E: bl HandleLoadOverlay mov r1, #0x85 lsl r1, r1, #2 - ldr r0, _021DA5E0 ; =MOD14_021EC68C + ldr r0, _021DA5E0 ; =MOD75_021EC68C ldr r1, [r4, r1] mov r2, #9 bl FUN_02006234 @@ -5993,7 +5993,7 @@ _021DA5D6: .align 2, 0 _021DA5D8: .word MOD14_021E6264 _021DA5DC: .word SDK_OVERLAY_MODULE_75_ID -_021DA5E0: .word 0x021EC68C +_021DA5E0: .word MOD75_021EC68C _021DA5E4: .word MOD14_021E6A00 _021DA5E8: .word gUnknown21C48B8 _021DA5EC: .word 0x000005DD @@ -10424,13 +10424,13 @@ MOD14_021DC720: ; 0x021DC720 ldr r0, [r3, #0x10] sub r0, r2, r0 ldr r2, [r3, #0xc] - ldr r3, _021DC734 ; =MOD14_020C5668 + ldr r3, _021DC734 ; =FX_Atan2 sub r1, r1, r2 lsl r0, r0, #0xc lsl r1, r1, #0xc bx r3 nop -_021DC734: .word 0x020C5668 +_021DC734: .word FX_Atan2 thumb_func_start MOD14_021DC738 MOD14_021DC738: ; 0x021DC738 @@ -18844,10 +18844,10 @@ MOD14_021E0930: ; 0x021E0930 mov r3, #0x34 mul r3, r2 add r2, r3, #0 - ldr r3, _021E093C ; =MOD14_020CE210 + ldr r3, _021E093C ; =MIi_CpuCopy32 bx r3 nop -_021E093C: .word 0x020CE210 +_021E093C: .word MIi_CpuCopy32 thumb_func_start MOD14_021E0940 MOD14_021E0940: ; 0x021E0940 @@ -24466,7 +24466,7 @@ MOD14_021E3464: ; 0x021E3464 mov r3, #0x10 add r1, #0xe4 strb r3, [r1] - ldr r1, _021E34BC ; =MOD14_020EDF50 + ldr r1, _021E34BC ; =gSineTable mov r3, #1 lsl r4, r4, #8 mov r6, #0x10 @@ -24501,7 +24501,7 @@ _021E3480: pop {r4, r5, r6, r7} bx lr nop -_021E34BC: .word 0x020EDF50 +_021E34BC: .word gSineTable thumb_func_start MOD14_021E34C0 MOD14_021E34C0: ; 0x021E34C0 @@ -30485,36 +30485,36 @@ MOD14_021E63A4: ; 0x021E63A4 .global MOD14_021E63CC MOD14_021E63CC: ; 0x021E63CC - .byte 0x2D, 0xCC, 0x1D, 0x02 + .word MOD14_021DCC2C .global MOD14_021E63D0 MOD14_021E63D0: ; 0x021E63D0 - .byte 0x00, 0x00, 0x00, 0x00, 0xA1, 0xCC, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x05, 0xCD, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x61, 0xCD, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xA9, 0xCD, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x69, 0xCE, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xC5, 0xCE, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x41, 0xCF, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xCF, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0xBD, 0xCF, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xF9, 0xCF, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x35, 0xD0, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x71, 0xD0, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0xA1, 0xD0, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xF1, 0xD0, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x2D, 0xD1, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x75, 0xD1, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0xBD, 0xD1, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xF9, 0xD1, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x35, 0xD2, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xD2, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0xC5, 0xD2, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xD3, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x7D, 0xD3, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xCD, 0xD3, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0xF5, 0xD3, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD4, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x45, 0xD4, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x61, 0xD4, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x91, 0xD4, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xC1, 0xD4, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0xFD, 0xD4, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x35, 0xD5, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x71, 0xD5, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xAD, 0xD5, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x6D, 0xD6, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xBD, 0xD6, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x41, 0xD7, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xD7, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0xCD, 0xD7, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xFD, 0xD7, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x6D, 0xD8, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xA9, 0xD8, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0xC5, 0xD8, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xE1, 0xD8, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x05, 0xD9, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xD9, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x35, 0xD9, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x71, 0xD9, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x8D, 0xD9, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xA9, 0xD9, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0xE5, 0xD9, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00 + .word 0x00000000, MOD14_021DCCA0, 0x00000000, MOD14_021DCD04 + .word 0x00000000, MOD14_021DCD60, 0x00000000, MOD14_021DCDA8 + .word 0x00000000, MOD14_021DCE68, 0x00000000, MOD14_021DCEC4 + .word 0x00000000, MOD14_021DCF40, 0x00000000, MOD14_021DCFA0 + .word 0x00000000, MOD14_021DCFBC, 0x00000000, MOD14_021DCFF8 + .word 0x00000000, MOD14_021DD034, 0x00000000, MOD14_021DD070 + .word 0x00000000, MOD14_021DD0A0, 0x00000000, MOD14_021DD0F0 + .word 0x00000000, MOD14_021DD12C, 0x00000000, MOD14_021DD174 + .word 0x00000000, MOD14_021DD1BC, 0x00000000, MOD14_021DD1F8 + .word 0x00000000, MOD14_021DD234, 0x00000000, MOD14_021DD27C + .word 0x00000000, MOD14_021DD2C4, 0x00000000, MOD14_021DD30C + .word 0x00000000, MOD14_021DD37C, 0x00000000, MOD14_021DD3CC + .word 0x00000000, MOD14_021DD3F4, 0x00000000, MOD14_021DD428 + .word 0x00000000, MOD14_021DD444, 0x00000000, MOD14_021DD460 + .word 0x00000000, MOD14_021DD490, 0x00000000, MOD14_021DD4C0 + .word 0x00000000, MOD14_021DD4FC, 0x00000000, MOD14_021DD534 + .word 0x00000000, MOD14_021DD570, 0x00000000, MOD14_021DD5AC + .word 0x00000000, MOD14_021DD66C, 0x00000000, MOD14_021DD6BC + .word 0x00000000, MOD14_021DD740, 0x00000000, MOD14_021DD77C + .word 0x00000000, MOD14_021DD7CC, 0x00000000, MOD14_021DD7FC + .word 0x00000000, MOD14_021DD86C, 0x00000000, MOD14_021DD8A8 + .word 0x00000000, MOD14_021DD8C4, 0x00000000, MOD14_021DD8E0 + .word 0x00000000, MOD14_021DD904, 0x00000000, MOD14_021DD91C + .word 0x00000000, MOD14_021DD934, 0x00000000, MOD14_021DD970 + .word 0x00000000, MOD14_021DD98C, 0x00000000, MOD14_021DD9A8 + .word 0x00000000, MOD14_021DD9E4, 0x00000000 .global MOD14_021E656C MOD14_021E656C: ; 0x021E656C @@ -30554,7 +30554,7 @@ MOD14_021E6614: ; 0x021E6614 .global MOD14_021E6624 MOD14_021E6624: ; 0x021E6624 - .byte 0xE9, 0x24, 0x1E, 0x02, 0x15, 0x26, 0x1E, 0x02 + .word MOD14_021E24E8, MOD14_021E2614 .global MOD14_021E662C MOD14_021E662C: ; 0x021E662C diff --git a/arm9/modules/48/asm/module_48.s b/arm9/modules/48/asm/module_48.s index 5a117b74..b67ca546 100644 --- a/arm9/modules/48/asm/module_48.s +++ b/arm9/modules/48/asm/module_48.s @@ -626,7 +626,7 @@ _02254CC6: add r3, r4, r3 asr r3, r3, #0xc lsl r4, r3, #2 - ldr r3, _02254D28 ; =0x020EDF50 + ldr r3, _02254D28 ; =gSineTable add r0, #0x9c ldr r4, [r3, r4] add r1, #0xa4 @@ -658,7 +658,7 @@ _02254CFE: bl MOD48_02254B1C pop {r3, r4, r5, r6, r7, pc} nop -_02254D28: .word 0x020EDF50 +_02254D28: .word gSineTable thumb_func_end MOD48_02254C60 thumb_func_start MOD48_02254D2C diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index 152ad47d..d16a434a 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -3205,7 +3205,7 @@ _0222EFE4: add r0, r6, #0 add r0, #0x5a lsl r1, r0, #2 - ldr r0, _0222F104 ; =0x020EDF50 + ldr r0, _0222F104 ; =gSineTable mov r3, #0 ldr r0, [r0, r1] asr r1, r0, #0x1f @@ -3221,7 +3221,7 @@ _0222EFE4: orr r1, r0 add r4, r2, r1 mov r2, #0xa - ldr r0, _0222F104 ; =0x020EDF50 + ldr r0, _0222F104 ; =gSineTable lsl r1, r6, #2 ldr r0, [r0, r1] lsl r2, r2, #0xa @@ -3330,7 +3330,7 @@ _0222F0EC: .align 2, 0 _0222F0FC: .word MOD69_0222F940 _0222F100: .word 0x00000808 -_0222F104: .word 0x020EDF50 +_0222F104: .word gSineTable _0222F108: .word 0x00000818 _0222F10C: .word 0x0000081A _0222F110: .word 0x0000082C diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index 4c994929..09bca872 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -3934,7 +3934,7 @@ _0222F606: add r0, #0xc bl FUN_0207B000 add r1, r5, #0 - ldr r0, _0222F670 ; =0x020FA6E8 + ldr r0, _0222F670 ; =UNK_020FA6E8 add r1, #0xc mov r2, #0x1a bl FUN_02006234 @@ -3946,7 +3946,7 @@ _0222F660: .word 0x00002218 _0222F664: .word 0x0000221C _0222F668: .word 0x00002E14 _0222F66C: .word MOD71_022313C0 -_0222F670: .word 0x020FA6E8 +_0222F670: .word UNK_020FA6E8 thumb_func_end MOD71_0222F59C thumb_func_start MOD71_0222F674 diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index ba79d09b..6301dc22 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -11240,6 +11240,9 @@ MOD75_021EC674: ; 0x021EC674 MOD75_021EC67C: ; 0x021EC67C .byte 0x02, 0x0A, 0x05, 0x0F, 0x0A, 0x12, 0x11, 0x12 .byte 0x16, 0x0F, 0x19, 0x0A, 0x1A, 0x04, 0x00, 0x00 + + .global MOD75_021EC68C +MOD75_021EC68C: ; 0x021EC68C .word MOD75_021E6BA0, MOD75_021E6D6C, MOD75_021E6F00, 0xFFFFFFFF .global MOD75_021EC69C diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index 852b7592..1667166f 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -3162,7 +3162,7 @@ MOD76_021D8D5C: ; 0x021D8D5C bl FUN_0207B000 mov r1, #0x53 lsl r1, r1, #2 - ldr r0, _021D8DE8 ; =0x020FA6E8 + ldr r0, _021D8DE8 ; =UNK_020FA6E8 add r1, r4, r1 mov r2, #0x43 bl FUN_02006234 @@ -3174,7 +3174,7 @@ MOD76_021D8D5C: ; 0x021D8D5C pop {r3, r4, pc} nop _021D8DE4: .word MOD76_021D8E48 -_021D8DE8: .word 0x020FA6E8 +_021D8DE8: .word UNK_020FA6E8 thumb_func_end MOD76_021D8D5C thumb_func_start MOD76_021D8DEC diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index d99385a4..f1234b9a 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -17143,7 +17143,7 @@ MOD80_02235D34: ; 0x02235D34 add r0, #0x60 bl FUN_0207C2A4 add r1, r4, #0 - ldr r0, _02235DD0 ; =0x020FA6E8 + ldr r0, _02235DD0 ; =UNK_020FA6E8 add r1, #0x60 mov r2, #0x3e bl FUN_02006234 @@ -17155,7 +17155,7 @@ MOD80_02235D34: ; 0x02235D34 pop {r4, pc} nop _02235DCC: .word MOD80_022375E4 -_02235DD0: .word 0x020FA6E8 +_02235DD0: .word UNK_020FA6E8 thumb_func_end MOD80_02235D34 thumb_func_start MOD80_02235DD4 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 6ee359f9..33b046b7 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -4963,7 +4963,7 @@ _0223A4AE: add r0, r4, #0 add r0, #0x5a lsl r1, r0, #2 - ldr r0, _0223A578 ; =0x020EDF50 + ldr r0, _0223A578 ; =gSineTable ldr r2, [r5, #0x38] ldr r0, [r0, r1] asr r3, r2, #0x1f @@ -4981,7 +4981,7 @@ _0223A4AE: add r0, r2, r1 str r0, [r5, #0x14] ldr r2, [r5, #0x3c] - ldr r0, _0223A578 ; =0x020EDF50 + ldr r0, _0223A578 ; =gSineTable lsl r1, r4, #2 ldr r0, [r0, r1] asr r3, r2, #0x1f @@ -5063,7 +5063,7 @@ _0223A54A: strh r0, [r5, #0x24] pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0223A578: .word 0x020EDF50 +_0223A578: .word gSineTable thumb_func_end MOD81_0223A434 thumb_func_start MOD81_0223A57C @@ -6260,7 +6260,7 @@ _0223AEE4: add r0, r4, #0 add r0, #0x5a lsl r1, r0, #2 - ldr r0, _0223AF58 ; =0x020EDF50 + ldr r0, _0223AF58 ; =gSineTable ldr r2, [r5, #0x44] ldr r0, [r0, r1] asr r3, r2, #0x1f @@ -6276,7 +6276,7 @@ _0223AEE4: orr r1, r0 str r1, [r5, #0x1c] ldr r2, [r5, #0x48] - ldr r0, _0223AF58 ; =0x020EDF50 + ldr r0, _0223AF58 ; =gSineTable lsl r1, r4, #2 ldr r0, [r0, r1] asr r3, r2, #0x1f @@ -6311,7 +6311,7 @@ _0223AEE4: bl VEC_Add pop {r3, r4, r5, pc} nop -_0223AF58: .word 0x020EDF50 +_0223AF58: .word gSineTable thumb_func_end MOD81_0223AE90 thumb_func_start MOD81_0223AF5C @@ -7807,7 +7807,7 @@ _0223BB3C: add r0, r4, #0 add r0, #0x5a lsl r1, r0, #2 - ldr r0, _0223BBC4 ; =0x020EDF50 + ldr r0, _0223BBC4 ; =gSineTable ldr r2, [r5, #0x44] ldr r0, [r0, r1] asr r3, r2, #0x1f @@ -7823,7 +7823,7 @@ _0223BB3C: orr r1, r0 str r1, [r5, #0x1c] ldr r2, [r5, #0x48] - ldr r0, _0223BBC4 ; =0x020EDF50 + ldr r0, _0223BBC4 ; =gSineTable lsl r1, r4, #2 ldr r0, [r0, r1] asr r3, r2, #0x1f @@ -7868,7 +7868,7 @@ _0223BBAE: pop {r3, r4, r5, pc} nop _0223BBC0: .word MOD81_0223D3A0 -_0223BBC4: .word 0x020EDF50 +_0223BBC4: .word gSineTable thumb_func_end MOD81_0223BAD0 thumb_func_start MOD81_0223BBC8 diff --git a/arm9/modules/84/asm/module_84.s b/arm9/modules/84/asm/module_84.s index b710e7ca..b2dc368a 100644 --- a/arm9/modules/84/asm/module_84.s +++ b/arm9/modules/84/asm/module_84.s @@ -3645,7 +3645,7 @@ _021D9230: ldr r0, [r4, #0x34] asr r2, r2, #0xc lsl r3, r2, #2 - ldr r2, _021D9274 ; =0x020EDF50 + ldr r2, _021D9274 ; =gSineTable ldr r1, [r4, #0x30] ldr r2, [r2, r3] mul r2, r0 @@ -3674,7 +3674,7 @@ _021D9230: _021D9270: pop {r4, pc} nop -_021D9274: .word 0x020EDF50 +_021D9274: .word gSineTable thumb_func_end MOD84_021D920C thumb_func_start MOD84_021D9278 |