dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add battle terrain and transitions, replace more baserom

Browse Source
This commit is contained in:
paul
2018-10-13 21:43:22 +02:00
parent ad02552fbe
commit 0283aa99bf
73 changed files with 1367 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_1.s
+8 -8
View File
@@ -1152,13 +1152,13 @@ sub_800FAE0: @ 800FAE0
ands r0, r1
cmp r0, 0
beq _0800FB94
ldr r0, _0800FB68 @ =gUnknown_8E7737C
ldr r0, _0800FB68 @ =gFile_graphics_battle_transitions_vs_frame_sheet
ldr r1, _0800FB6C @ =0x06004000
bl LZDecompressVram
ldr r0, _0800FB70 @ =gUnknown_8E77598
ldr r0, _0800FB70 @ =gFile_graphics_battle_transitions_vs_sheet
ldr r1, _0800FB74 @ =0x06010000
bl LZDecompressVram
ldr r0, _0800FB78 @ =gUnknown_8E77570
ldr r0, _0800FB78 @ =gFile_graphics_battle_transitions_vs_frame_palette
movs r1, 0x60
movs r2, 0x20
bl LoadCompressedPalette
@@ -1169,7 +1169,7 @@ sub_800FAE0: @ 800FAE0
ldr r1, _0800FB7C @ =0x00005c04
movs r0, 0xA
bl SetGpuReg
ldr r4, _0800FB80 @ =gUnknown_8E77464
ldr r4, _0800FB80 @ =gFile_graphics_battle_transitions_vs_frame_tilemap
movs r0, 0x1
adds r1, r4, 0
movs r2, 0
@@ -1201,13 +1201,13 @@ sub_800FAE0: @ 800FAE0
b _0800FC26
.align 2, 0
_0800FB64: .4byte gBattleTypeFlags
_0800FB68: .4byte gUnknown_8E7737C
_0800FB68: .4byte gFile_graphics_battle_transitions_vs_frame_sheet
_0800FB6C: .4byte 0x06004000
_0800FB70: .4byte gUnknown_8E77598
_0800FB70: .4byte gFile_graphics_battle_transitions_vs_sheet
_0800FB74: .4byte 0x06010000
_0800FB78: .4byte gUnknown_8E77570
_0800FB78: .4byte gFile_graphics_battle_transitions_vs_frame_palette
_0800FB7C: .4byte 0x00005c04
_0800FB80: .4byte gUnknown_8E77464
_0800FB80: .4byte gFile_graphics_battle_transitions_vs_frame_tilemap
_0800FB84: .4byte gUnknown_202297A
_0800FB88: .4byte 0x0000ff5c
_0800FB8C: .4byte gUnknown_202297E
asm/battle_anim_80A22E8.s
+6 -6
View File
@@ -38100,15 +38100,15 @@ _080B4854:
bl sub_80752A0
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080B48F0 @ =gUnknown_8E79354
ldr r1, _080B48F0 @ =gFile_graphics_battle_anims_backgrounds_sandstorm_brew_tilemap
bl sub_807543C
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080B48F4 @ =gUnknown_8E794D0
ldr r1, _080B48F4 @ =gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet
mov r2, sp
ldrh r2, [r2, 0xA]
bl sub_80753B4
ldr r0, _080B48F8 @ =gUnknown_8E799FC
ldr r0, _080B48F8 @ =gFile_graphics_battle_anims_sprites_261_palette
mov r1, sp
ldrb r1, [r1, 0x8]
lsls r1, 4
@@ -38154,9 +38154,9 @@ _080B48CA:
_080B48E4: .4byte 0x00003f42
_080B48E8: .4byte gUnknown_2022978
_080B48EC: .4byte gUnknown_202297A
_080B48F0: .4byte gUnknown_8E79354
_080B48F4: .4byte gUnknown_8E794D0
_080B48F8: .4byte gUnknown_8E799FC
_080B48F0: .4byte gFile_graphics_battle_anims_backgrounds_sandstorm_brew_tilemap
_080B48F4: .4byte gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet
_080B48F8: .4byte gFile_graphics_battle_anims_sprites_261_palette
_080B48FC: .4byte gUnknown_2037F02
_080B4900: .4byte gUnknown_2037F1A
_080B4904: .4byte gTasks