diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-04-29 20:39:04 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-04-30 08:01:00 -0400 |
| commit | b690b4601022e930e177b1d68b5286444e5d4085 (patch) | |
| tree | c4cefd1a09dc206fb5ef503f73400c4a609225dd | |
| parent | 2a17eb5b7f088ce93f9c64d5b46ad019d057eab6 (diff) | |
Fix pool loads in arm7/itcm.s
| -rw-r--r-- | .travis.yml | 21 | ||||
| -rw-r--r-- | arm7/asm/itcm.s | 16 |
2 files changed, 21 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml index 61a9a4d3..bf0c9a04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,16 @@ dist: bionic sudo: false language: c -apt: - - gcc-multilib - - linux-libc-dev - - binutils-arm-none-eabi - - wine +addons: + apt: + packages: + - gcc-multilib + - linux-libc-dev + - binutils-arm-none-eabi + - wine32 + - wine-stable +cache: + apt: true install: # These files are only accessible from Travis CI IP Addresses to prevent piracy. - wget http://private.martmists.com/mwccarm.zip @@ -14,9 +19,9 @@ install: - unzip mwccarm.zip - mv mwccarm tools - unzip nitro.zip - - mv Nitro\ SDK\ 3.0/tools/bin tools - - mv Nitro\ SDK\ 3.0/include/nitro/specfiles/ARM7-TS.lcf.template arm7 - - mv Nitro\ SDK\ 3.0/include/nitro/specfiles/ARM9-TS.lcf.template arm9 + - mv NITRO\ SDK\ v3.0/tools/bin tools + - mv NITRO\ SDK\ v3.0/include/nitro/specfiles/ARM7-TS.lcf.template arm7 + - mv NITRO\ SDK\ v3.0/include/nitro/specfiles/ARM9-TS.lcf.template arm9 script: - export LM_LICENSE_FILE="$(pwd)/tools/mwccarm/license.dat" diff --git a/arm7/asm/itcm.s b/arm7/asm/itcm.s index 6f2996be..32f4cf3d 100644 --- a/arm7/asm/itcm.s +++ b/arm7/asm/itcm.s @@ -6,9 +6,9 @@ arm_func_start FUN_027E0000 FUN_027E0000: ; 0x027E0000 load at 0x023801B0 stmdb sp!, {r4, r5, r6, lr} - ldr r6, [pc, #180] ; 0x270 - ldr r3, [pc, #180] ; 0x274 - ldr r0, [pc, #180] ; 0x278 + ldr r6, _027E00C0 ; =0x023801B0 + ldr r3, _027E00C4 ; =0x023A92F8 + ldr r0, _027E00C8 ; =0x023A931C b _027E00B0 _027E0014: mov r2, r3 @@ -19,19 +19,19 @@ _027E0014: ldr r1, [r2] cmp r1, #100663296 ; 0x6000000 bne _027E00AC - ldr r3, [pc, #144] ; 0x27c - ldr r0, [pc, #144] ; 0x280 + ldr r3, _027E00CC ; =0x027E00DC + ldr r0, _027E00D0 ; =0x0380A3F4 str r3, [r0] add r2, r5, r4 - ldr r0, [pc, #136] ; 0x284 + ldr r0, _027E00D4 ; =0x0380A3FC str r2, [r0] - ldr r1, [pc, #132] ; 0x288 + ldr r1, _027E00D8 ; =0x027FAFCC add r0, r3, r2 cmp r1, r0 beq _027E0060 bl FUN_037FB1F0 _027E0060: - ldr r0, [pc, #104] ; 0x280 + ldr r0, _027E00D0 ; =0x0380A3F4 ldr r3, [r0] mov r2, #0 mov r1, r5, lsr #2 |