diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-26 16:19:44 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-26 16:19:44 -0500 |
| commit | cf84c5406bf9b08950722d90ba4eba3bd8606080 (patch) | |
| tree | 0140b0b3cb4b1b0b523cd39a71fd775d911c65d0 /asm/ice.s | |
| parent | 2d70a16fa09eb545b0e236313be6daaa6d17964a (diff) | |
| parent | 4e7e4cf467e6243994d19971d7cbee33c2f7bd25 (diff) | |
merge
Diffstat (limited to 'asm/ice.s')
| -rwxr-xr-x | asm/ice.s | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1382,7 +1382,7 @@ _080D812A: ldr r2, _080D81CC @ =0x80000400 str r2, [r0, 0x8] ldr r0, [r0, 0x8] - ldr r0, _080D81D0 @ =gWeatherFog1Tilemap + ldr r0, _080D81D0 @ =gBattleAnimFogTilemap bl LZDecompressVram ldr r0, _080D81D4 @ =gUnknown_083970E8 mov r1, sp @@ -1423,7 +1423,7 @@ _080D81C0: .4byte 0x040000d4 _080D81C4: .4byte 0x85000400 _080D81C8: .4byte gWeatherFog1Tiles _080D81CC: .4byte 0x80000400 -_080D81D0: .4byte gWeatherFog1Tilemap +_080D81D0: .4byte gBattleAnimFogTilemap _080D81D4: .4byte gUnknown_083970E8 _080D81D8: .4byte gTasks _080D81DC: .4byte sub_80D81E0 @@ -1774,7 +1774,7 @@ _080D845E: ldr r2, _080D8504 @ =0x80000400 str r2, [r0, 0x8] ldr r0, [r0, 0x8] - ldr r0, _080D8508 @ =gWeatherFog1Tilemap + ldr r0, _080D8508 @ =gBattleAnimFogTilemap bl LZDecompressVram ldr r0, _080D850C @ =gUnknown_083970E8 mov r1, sp @@ -1817,7 +1817,7 @@ _080D84F8: .4byte 0x040000d4 _080D84FC: .4byte 0x85000400 _080D8500: .4byte gWeatherFog1Tiles _080D8504: .4byte 0x80000400 -_080D8508: .4byte gWeatherFog1Tilemap +_080D8508: .4byte gBattleAnimFogTilemap _080D850C: .4byte gUnknown_083970E8 _080D8510: .4byte gTasks _080D8514: .4byte 0x0000ffff |