ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

start decompiling battle2

Browse Source
This commit is contained in:
DizzyEggg 2017-10-01 01:12:42 +02:00
parent 13017a3b19
commit 729f4e10ed
66 changed files with 2143 additions and 3906 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
asm/battle_1.s
View File

@ -1667,8 +1667,8 @@ _08035A8A:
.pool .pool
thumb_func_end load_battle_oval_graphics thumb_func_end load_battle_oval_graphics
thumb_func_start sub_8035AA4 thumb_func_start LoadBattleTextboxAndBackground
sub_8035AA4: @ 8035AA4 LoadBattleTextboxAndBackground: @ 8035AA4
push {lr} push {lr}
ldr r0, =gUnknown_08C00000 ldr r0, =gUnknown_08C00000
movs r1, 0xC0 movs r1, 0xC0
@ -1690,7 +1690,7 @@ sub_8035AA4: @ 8035AA4
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_8035AA4 thumb_func_end LoadBattleTextboxAndBackground
thumb_func_start sub_8035AE4 thumb_func_start sub_8035AE4
sub_8035AE4: @ 8035AE4 sub_8035AE4: @ 8035AE4
@ -2457,8 +2457,8 @@ _08036138:
.pool .pool
thumb_func_end task00_0800F6FC thumb_func_end task00_0800F6FC
thumb_func_start sub_8036154 thumb_func_start LoadBattleEntryBackground
sub_8036154: @ 8036154 LoadBattleEntryBackground: @ 8036154
push {r4,r5,lr} push {r4,r5,lr}
ldr r0, =gBattleTypeFlags ldr r0, =gBattleTypeFlags
ldr r1, [r0] ldr r1, [r0]
@ -2668,7 +2668,7 @@ _080363AC:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_8036154 thumb_func_end LoadBattleEntryBackground
thumb_func_start sub_80363C4 thumb_func_start sub_80363C4
sub_80363C4: @ 80363C4 sub_80363C4: @ 80363C4

3235
asm/battle_2.s
View File

File diff suppressed because it is too large Load Diff

6
asm/battle_5.s
View File

@ -6,8 +6,8 @@
.text .text
thumb_func_start sub_8056F28 thumb_func_start AllocateBattleResrouces
sub_8056F28: @ 8056F28 AllocateBattleResrouces: @ 8056F28
push {r4-r6,lr} push {r4-r6,lr}
ldr r5, =gBattleResources ldr r5, =gBattleResources
ldr r6, =gBattleTypeFlags ldr r6, =gBattleTypeFlags
@ -102,7 +102,7 @@ _08056FFA:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_8056F28 thumb_func_end AllocateBattleResrouces
thumb_func_start sub_8057028 thumb_func_start sub_8057028
sub_8057028: @ 8057028 sub_8057028: @ 8057028

56
asm/battle_7.s
View File

@ -5,8 +5,8 @@
.text .text
thumb_func_start dp11_init thumb_func_start AllocateBattleSpritesData
dp11_init: @ 805D118 AllocateBattleSpritesData: @ 805D118
push {r4,lr} push {r4,lr}
ldr r4, =gUnknown_020244D0 ldr r4, =gUnknown_020244D0
movs r0, 0x10 movs r0, 0x10
@ -32,7 +32,7 @@ dp11_init: @ 805D118
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end dp11_init thumb_func_end AllocateBattleSpritesData
thumb_func_start dp11_free thumb_func_start dp11_free
dp11_free: @ 805D158 dp11_free: @ 805D158
@ -1371,7 +1371,7 @@ _0805DC58:
lsls r2, r5, 3 lsls r2, r5, 3
ldr r1, =gMonFrontPicTable ldr r1, =gMonFrontPicTable
adds r2, r1 adds r2, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
lsrs r0, 22 lsrs r0, 22
adds r1, 0x4 adds r1, 0x4
@ -1543,7 +1543,7 @@ _0805DE00:
lsls r0, r5, 3 lsls r0, r5, 3
ldr r1, =gMonBackPicTable ldr r1, =gMonBackPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
lsls r2, r7, 2 lsls r2, r7, 2
adds r1, 0x4 adds r1, 0x4
@ -1558,7 +1558,7 @@ _0805DE2C:
lsls r0, r5, 3 lsls r0, r5, 3
ldr r1, =gMonBackPicTable ldr r1, =gMonBackPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
lsls r2, r7, 2 lsls r2, r7, 2
adds r1, 0x4 adds r1, 0x4
@ -1684,7 +1684,7 @@ sub_805DF38: @ 805DF38
lsls r4, 3 lsls r4, 3
ldr r2, =gTrainerFrontPicTable ldr r2, =gTrainerFrontPicTable
adds r2, r4, r2 adds r2, r4, r2
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
lsrs r0, 22 lsrs r0, 22
adds r1, 0x4 adds r1, 0x4
@ -1718,7 +1718,7 @@ sub_805DF84: @ 805DF84
lsls r5, 3 lsls r5, 3
ldr r2, =gTrainerBackPicTable ldr r2, =gTrainerBackPicTable
adds r2, r5, r2 adds r2, r5, r2
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
lsrs r0, 22 lsrs r0, 22
adds r1, 0x4 adds r1, 0x4
@ -1959,7 +1959,7 @@ _0805E1AE:
load_gfxc_health_bar: @ 805E1B8 load_gfxc_health_bar: @ 805E1B8
push {lr} push {lr}
ldr r0, =gUnknown_08C093F0 ldr r0, =gUnknown_08C093F0
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
movs r2, 0xBA movs r2, 0xBA
lsls r2, 1 lsls r2, 1
@ -1971,8 +1971,8 @@ load_gfxc_health_bar: @ 805E1B8
.pool .pool
thumb_func_end load_gfxc_health_bar thumb_func_end load_gfxc_health_bar
thumb_func_start battle_load_something thumb_func_start BattleInitAllSprites
battle_load_something: @ 805E1D8 BattleInitAllSprites: @ 805E1D8
push {r4-r6,lr} push {r4-r6,lr}
adds r5, r0, 0 adds r5, r0, 0
adds r4, r1, 0 adds r4, r1, 0
@ -2136,7 +2136,7 @@ _0805E346:
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end battle_load_something thumb_func_end BattleInitAllSprites
thumb_func_start sub_805E350 thumb_func_start sub_805E350
sub_805E350: @ 805E350 sub_805E350: @ 805E350
@ -2364,7 +2364,7 @@ _0805E51C:
lsls r0, r1, 3 lsls r0, r1, 3
ldr r1, =gMonBackPicTable ldr r1, =gMonBackPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
ldr r1, [r1, 0x4] ldr r1, [r1, 0x4]
ldr r3, [r2, 0x10] ldr r3, [r2, 0x10]
@ -2434,7 +2434,7 @@ _0805E59C:
lsls r0, r1, 3 lsls r0, r1, 3
ldr r1, =gMonBackPicTable ldr r1, =gMonBackPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
mov r3, r10 mov r3, r10
lsls r2, r3, 2 lsls r2, r3, 2
@ -2472,7 +2472,7 @@ _0805E618:
lsls r0, r1, 3 lsls r0, r1, 3
ldr r1, =gMonFrontPicTable ldr r1, =gMonFrontPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
mov r3, r10 mov r3, r10
lsls r2, r3, 2 lsls r2, r3, 2
@ -2486,7 +2486,7 @@ _0805E618:
mov r2, r8 mov r2, r8
bl HandleLoadSpecialPokePic_DontHandleDeoxys bl HandleLoadSpecialPokePic_DontHandleDeoxys
_0805E662: _0805E662:
ldr r0, =gBattleSpritesGfx ldr r0, =gMonSpritesGfxPtr
ldr r0, [r0] ldr r0, [r0]
mov r2, r10 mov r2, r10
lsls r1, r2, 2 lsls r1, r2, 2
@ -2666,7 +2666,7 @@ _0805E814:
beq _0805E83C beq _0805E83C
ldr r0, =gUnknown_08C2CEE0 ldr r0, =gUnknown_08C2CEE0
_0805E822: _0805E822:
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
lsls r4, 2 lsls r4, 2
adds r1, 0x4 adds r1, 0x4
@ -2677,7 +2677,7 @@ _0805E822:
.pool .pool
_0805E83C: _0805E83C:
ldr r0, =gUnknown_08C2D120 ldr r0, =gUnknown_08C2D120
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
lsls r4, 2 lsls r4, 2
adds r1, 0x4 adds r1, 0x4
@ -2688,7 +2688,7 @@ _0805E84E:
movs r3, 0x1 movs r3, 0x1
lsls r6, r5, 4 lsls r6, r5, 4
ldr r7, =gUnknown_08C2CEBC ldr r7, =gUnknown_08C2CEBC
ldr r0, =gBattleSpritesGfx ldr r0, =gMonSpritesGfxPtr
ldr r0, [r0] ldr r0, [r0]
adds r0, 0x4 adds r0, 0x4
adds r4, r0, r4 adds r4, r0, r4
@ -3600,15 +3600,15 @@ _0805EFAC:
.pool .pool
thumb_func_end sub_805EF84 thumb_func_end sub_805EF84
thumb_func_start init_uns_table_pokemon_copy thumb_func_start AllocateMonSpritesGfx
init_uns_table_pokemon_copy: @ 805EFBC AllocateMonSpritesGfx: @ 805EFBC
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
mov r5, r8 mov r5, r8
push {r5-r7} push {r5-r7}
movs r6, 0 movs r6, 0
ldr r4, =gBattleSpritesGfx ldr r4, =gMonSpritesGfxPtr
str r6, [r4] str r6, [r4]
movs r0, 0xC0 movs r0, 0xC0
lsls r0, 1 lsls r0, 1
@ -3620,7 +3620,7 @@ init_uns_table_pokemon_copy: @ 805EFBC
ldr r1, [r4] ldr r1, [r4]
str r0, [r1] str r0, [r1]
_0805EFE2: _0805EFE2:
ldr r0, =gBattleSpritesGfx ldr r0, =gMonSpritesGfxPtr
ldr r1, [r0] ldr r1, [r0]
lsls r4, r6, 2 lsls r4, r6, 2
adds r2, r1, 0x4 adds r2, r1, 0x4
@ -3649,7 +3649,7 @@ _0805EFE2:
mov r12, r8 mov r12, r8
adds r7, r4, 0 adds r7, r4, 0
_0805F01A: _0805F01A:
ldr r2, =gBattleSpritesGfx ldr r2, =gMonSpritesGfxPtr
ldr r1, [r2] ldr r1, [r2]
lsls r4, r5, 3 lsls r4, r5, 3
add r4, r12 add r4, r12
@ -3672,7 +3672,7 @@ _0805F01A:
lsrs r5, r0, 24 lsrs r5, r0, 24
cmp r5, 0x3 cmp r5, 0x3
bls _0805F01A bls _0805F01A
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r2, [r1] ldr r2, [r1]
mov r5, r9 mov r5, r9
adds r0, r5, r6 adds r0, r5, r6
@ -3692,7 +3692,7 @@ _0805F01A:
movs r0, 0x80 movs r0, 0x80
lsls r0, 5 lsls r0, 5
bl AllocZeroed bl AllocZeroed
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
movs r2, 0xBA movs r2, 0xBA
lsls r2, 1 lsls r2, 1
@ -3706,12 +3706,12 @@ _0805F01A:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end init_uns_table_pokemon_copy thumb_func_end AllocateMonSpritesGfx
thumb_func_start sub_805F094 thumb_func_start sub_805F094
sub_805F094: @ 805F094 sub_805F094: @ 805F094
push {r4-r6,lr} push {r4-r6,lr}
ldr r6, =gBattleSpritesGfx ldr r6, =gMonSpritesGfxPtr
ldr r0, [r6] ldr r0, [r6]
cmp r0, 0 cmp r0, 0
beq _0805F106 beq _0805F106

8
asm/battle_anim.s
View File

@ -264,14 +264,14 @@ _080A3BAA:
movs r2, 0x80 movs r2, 0x80
bl m4aMPlayVolumeControl bl m4aMPlayVolumeControl
_080A3BC2: _080A3BC2:
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E26 ldr r0, =gBattle_WIN0V
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E28 ldr r0, =gBattle_WIN1H
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E2A ldr r0, =gBattle_WIN1V
strh r1, [r0] strh r1, [r0]
add sp, 0x4 add sp, 0x4
pop {r3-r5} pop {r3-r5}

152
asm/battle_anim_80FE840.s
View File

@ -14561,7 +14561,7 @@ _08105CCC:
lsls r0, 6 lsls r0, 6
bl AllocZeroed bl AllocZeroed
adds r1, r0, 0 adds r1, r0, 0
ldr r0, =gBattleSpritesGfx ldr r0, =gMonSpritesGfxPtr
ldr r0, [r0] ldr r0, [r0]
movs r2, 0xBE movs r2, 0xBE
lsls r2, 1 lsls r2, 1
@ -14571,7 +14571,7 @@ _08105CCC:
bl LZDecompressWram bl LZDecompressWram
movs r4, 0 movs r4, 0
_08105D00: _08105D00:
ldr r5, =gBattleSpritesGfx ldr r5, =gMonSpritesGfxPtr
ldr r0, [r5] ldr r0, [r5]
movs r1, 0xBE movs r1, 0xBE
lsls r1, 1 lsls r1, 1
@ -14785,9 +14785,9 @@ sub_8105EB0: @ 8105EB0
movs r6, 0x98 movs r6, 0x98
_08105EC4: _08105EC4:
movs r5, 0 movs r5, 0
ldr r1, =gUnknown_02022E24 ldr r1, =gBattle_WIN0H
strh r6, [r1] strh r6, [r1]
ldr r4, =gUnknown_02022E26 ldr r4, =gBattle_WIN0V
movs r0, 0xA0 movs r0, 0xA0
strh r0, [r4] strh r0, [r4]
ldrh r1, [r1] ldrh r1, [r1]
@ -14845,7 +14845,7 @@ sub_8105F30: @ 8105F30
lsls r0, r2, 16 lsls r0, r2, 16
cmp r1, r0 cmp r1, r0
blt _08105F70 blt _08105F70
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =sub_8105F84 ldr r0, =sub_8105F84
@ -14853,7 +14853,7 @@ sub_8105F30: @ 8105F30
b _08105F78 b _08105F78
.pool .pool
_08105F70: _08105F70:
ldr r1, =gUnknown_02022E24 ldr r1, =gBattle_WIN0H
lsls r0, r4, 8 lsls r0, r4, 8
orrs r2, r0 orrs r2, r0
strh r2, [r1] strh r2, [r1]
@ -14905,9 +14905,9 @@ sub_8105F84: @ 8105F84
_08105FD8: _08105FD8:
cmp r0, 0x4 cmp r0, 0x4
ble _0810600C ble _0810600C
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
strh r4, [r0] strh r4, [r0]
ldr r0, =gUnknown_02022E26 ldr r0, =gBattle_WIN0V
strh r4, [r0] strh r4, [r0]
ldr r4, =0x00003f3f ldr r4, =0x00003f3f
movs r0, 0x48 movs r0, 0x48
@ -30154,7 +30154,7 @@ _0810DB50:
strh r0, [r2] strh r0, [r2]
adds r7, r2, 0 adds r7, r2, 0
_0810DB60: _0810DB60:
ldr r3, =gUnknown_02022E22 ldr r3, =gBattle_BG3_Y
ldrh r2, [r4, 0x1C] ldrh r2, [r4, 0x1C]
lsls r0, r2, 16 lsls r0, r2, 16
asrs r0, 24 asrs r0, 24
@ -37347,7 +37347,7 @@ sub_811152C: @ 811152C
movs r0, 0xC8 movs r0, 0xC8
strh r0, [r5, 0xA] strh r0, [r5, 0xA]
_0811154E: _0811154E:
ldr r4, =gUnknown_02022E22 ldr r4, =gBattle_BG3_Y
movs r1, 0xA movs r1, 0xA
ldrsh r0, [r5, r1] ldrsh r0, [r5, r1]
movs r1, 0xA movs r1, 0xA
@ -37396,7 +37396,7 @@ sub_8111590: @ 8111590
ldrh r0, [r4, 0x8] ldrh r0, [r4, 0x8]
adds r0, 0x1 adds r0, 0x1
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
ldr r0, =gUnknown_02022E22 ldr r0, =gBattle_BG3_Y
ldrh r0, [r0] ldrh r0, [r0]
strh r0, [r4, 0xC] strh r0, [r4, 0xC]
_081115BC: _081115BC:
@ -37405,7 +37405,7 @@ _081115BC:
movs r1, 0xFF movs r1, 0xFF
ands r0, r1 ands r0, r1
strh r0, [r4, 0xA] strh r0, [r4, 0xA]
ldr r6, =gUnknown_02022E22 ldr r6, =gBattle_BG3_Y
movs r2, 0xA movs r2, 0xA
ldrsh r1, [r4, r2] ldrsh r1, [r4, r2]
movs r0, 0x4 movs r0, 0x4
@ -39577,10 +39577,10 @@ sub_8112758: @ 8112758
push {r4-r7,lr} push {r4-r7,lr}
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E26 ldr r0, =gBattle_WIN0V
strh r1, [r0] strh r1, [r0]
ldr r1, =0x00003f3f ldr r1, =0x00003f3f
movs r0, 0x48 movs r0, 0x48
@ -39611,13 +39611,13 @@ _081127A0:
_081127B8: _081127B8:
movs r6, 0xC8 movs r6, 0xC8
_081127BA: _081127BA:
ldr r1, =gUnknown_02022E24 ldr r1, =gBattle_WIN0H
lsls r3, r6, 16 lsls r3, r6, 16
asrs r2, r3, 16 asrs r2, r3, 16
lsls r0, r2, 8 lsls r0, r2, 8
orrs r0, r2 orrs r0, r2
strh r0, [r1] strh r0, [r1]
ldr r1, =gUnknown_02022E26 ldr r1, =gBattle_WIN0V
movs r5, 0x28 movs r5, 0x28
ldr r0, =0x00002828 ldr r0, =0x00002828
strh r0, [r1] strh r0, [r1]
@ -39798,12 +39798,12 @@ _08112938:
ldr r0, _08112988 @=sub_8112994 ldr r0, _08112988 @=sub_8112994
str r0, [r4] str r0, [r4]
_08112966: _08112966:
ldr r1, _0811298C @=gUnknown_02022E24 ldr r1, _0811298C @=gBattle_WIN0H
mov r2, r9 mov r2, r9
lsls r0, r2, 8 lsls r0, r2, 8
orrs r7, r0 orrs r7, r0
strh r7, [r1] strh r7, [r1]
ldr r1, _08112990 @=gUnknown_02022E26 ldr r1, _08112990 @=gBattle_WIN0V
lsls r0, r6, 8 lsls r0, r6, 8
orrs r5, r0 orrs r5, r0
strh r5, [r1] strh r5, [r1]
@ -39819,9 +39819,9 @@ _08112966:
_08112988: _08112988:
.4byte sub_8112994 .4byte sub_8112994
_0811298C: _0811298C:
.4byte gUnknown_02022E24 .4byte gBattle_WIN0H
_08112990: _08112990:
.4byte gUnknown_02022E26 .4byte gBattle_WIN0V
thumb_func_end sub_811280C thumb_func_end sub_811280C
thumb_func_start sub_8112994 thumb_func_start sub_8112994
@ -39837,9 +39837,9 @@ sub_8112994: @ 8112994
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0 cmp r1, 0
bne _081129DA bne _081129DA
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E26 ldr r0, =gBattle_WIN0V
strh r1, [r0] strh r1, [r0]
ldr r4, =0x00003f3f ldr r4, =0x00003f3f
movs r0, 0x48 movs r0, 0x48
@ -40042,10 +40042,10 @@ sub_8112B44: @ 8112B44
movs r0, 0x52 movs r0, 0x52
movs r1, 0 movs r1, 0
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E26 ldr r0, =gBattle_WIN0V
strh r1, [r0] strh r1, [r0]
adds r0, r4, 0 adds r0, r4, 0
bl move_anim_8072740 bl move_anim_8072740
@ -42202,13 +42202,13 @@ _08113CDC:
ldr r1, =0x00003f3f ldr r1, =0x00003f3f
movs r0, 0x48 movs r0, 0x48
bl SetGpuReg bl SetGpuReg
ldr r2, =gUnknown_02022E24 ldr r2, =gBattle_WIN0H
ldrh r0, [r5, 0x24] ldrh r0, [r5, 0x24]
lsls r0, 8 lsls r0, 8
ldrh r1, [r5, 0x26] ldrh r1, [r5, 0x26]
orrs r0, r1 orrs r0, r1
strh r0, [r2] strh r0, [r2]
ldr r1, =gUnknown_02022E26 ldr r1, =gBattle_WIN0V
movs r0, 0xA0 movs r0, 0xA0
strh r0, [r1] strh r0, [r1]
ldr r0, =sub_8113D60 ldr r0, =sub_8113D60
@ -42331,7 +42331,7 @@ _08113E1C:
blt _08113E3E blt _08113E3E
strh r2, [r4, 0x24] strh r2, [r4, 0x24]
_08113E3E: _08113E3E:
ldr r3, =gUnknown_02022E24 ldr r3, =gBattle_WIN0H
ldrh r2, [r4, 0x24] ldrh r2, [r4, 0x24]
lsls r0, r2, 8 lsls r0, r2, 8
ldrh r1, [r4, 0x26] ldrh r1, [r4, 0x26]
@ -42398,10 +42398,10 @@ _08113EBC:
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
bne _08113EF8 bne _08113EF8
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E26 ldr r0, =gBattle_WIN0V
strh r1, [r0] strh r1, [r0]
ldr r4, =0x00003f3f ldr r4, =0x00003f3f
movs r0, 0x48 movs r0, 0x48
@ -42588,13 +42588,13 @@ _08114078:
ldr r1, =0x00003f3f ldr r1, =0x00003f3f
movs r0, 0x48 movs r0, 0x48
bl SetGpuReg bl SetGpuReg
ldr r2, =gUnknown_02022E24 ldr r2, =gBattle_WIN0H
ldrh r0, [r5, 0x24] ldrh r0, [r5, 0x24]
lsls r0, 8 lsls r0, 8
ldrh r1, [r5, 0x26] ldrh r1, [r5, 0x26]
orrs r0, r1 orrs r0, r1
strh r0, [r2] strh r0, [r2]
ldr r1, =gUnknown_02022E26 ldr r1, =gBattle_WIN0V
movs r0, 0xA0 movs r0, 0xA0
strh r0, [r1] strh r0, [r1]
movs r0, 0 movs r0, 0
@ -42686,7 +42686,7 @@ _08114150:
movs r0, 0x1 movs r0, 0x1
strh r0, [r4, 0xA] strh r0, [r4, 0xA]
_08114154: _08114154:
ldr r2, =gUnknown_02022E24 ldr r2, =gBattle_WIN0H
ldrh r0, [r4, 0x24] ldrh r0, [r4, 0x24]
lsls r0, 8 lsls r0, 8
ldrh r1, [r4, 0x26] ldrh r1, [r4, 0x26]
@ -42782,10 +42782,10 @@ _08114204:
b _08114232 b _08114232
.pool .pool
_08114210: _08114210:
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E26 ldr r0, =gBattle_WIN0V
strh r1, [r0] strh r1, [r0]
ldr r4, =0x00003f3f ldr r4, =0x00003f3f
movs r0, 0x48 movs r0, 0x48
@ -43157,9 +43157,9 @@ sub_81144F8: @ 81144F8
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
movs r6, 0 movs r6, 0
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
strh r6, [r0] strh r6, [r0]
ldr r0, =gUnknown_02022E26 ldr r0, =gBattle_WIN0V
strh r6, [r0] strh r6, [r0]
ldr r1, =0x00003f3f ldr r1, =0x00003f3f
movs r0, 0x48 movs r0, 0x48
@ -43485,9 +43485,9 @@ _081147B8:
_08114824: _08114824:
cmp r0, 0x3 cmp r0, 0x3
bne _08114886 bne _08114886
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
strh r5, [r0] strh r5, [r0]
ldr r0, =gUnknown_02022E26 ldr r0, =gBattle_WIN0V
strh r5, [r0] strh r5, [r0]
ldr r4, =0x00003f3f ldr r4, =0x00003f3f
movs r0, 0x48 movs r0, 0x48
@ -45266,7 +45266,7 @@ _0811565A:
ldr r2, =gBattle_BG3_X ldr r2, =gBattle_BG3_X
ldrh r0, [r4, 0xA] ldrh r0, [r4, 0xA]
strh r0, [r2] strh r0, [r2]
ldr r0, =gUnknown_02022E22 ldr r0, =gBattle_BG3_Y
strh r1, [r0] strh r1, [r0]
ldrh r0, [r6, 0x4] ldrh r0, [r6, 0x4]
strh r0, [r4, 0xE] strh r0, [r4, 0xE]
@ -45298,7 +45298,7 @@ sub_81156D0: @ 81156D0
ldr r0, =gBattle_BG3_X ldr r0, =gBattle_BG3_X
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E22 ldr r0, =gBattle_BG3_Y
strh r1, [r0] strh r1, [r0]
adds r0, r3, 0 adds r0, r3, 0
bl DestroyTask bl DestroyTask
@ -45308,7 +45308,7 @@ _08115710:
ldr r1, =gBattle_BG3_X ldr r1, =gBattle_BG3_X
ldrh r0, [r2, 0xA] ldrh r0, [r2, 0xA]
strh r0, [r1] strh r0, [r1]
ldr r1, =gUnknown_02022E22 ldr r1, =gBattle_BG3_Y
ldrh r0, [r2, 0xC] ldrh r0, [r2, 0xC]
strh r0, [r1] strh r0, [r1]
_0811571C: _0811571C:
@ -46557,7 +46557,7 @@ _081160E2:
b _081160F6 b _081160F6
.pool .pool
_081160EC: _081160EC:
ldr r1, =gUnknown_02022E22 ldr r1, =gBattle_BG3_Y
b _081160F6 b _081160F6
.pool .pool
_081160F4: _081160F4:
@ -46796,7 +46796,7 @@ sub_81162A4: @ 81162A4
ldr r4, =gBattle_BG3_X ldr r4, =gBattle_BG3_X
ldrh r1, [r3] ldrh r1, [r3]
strh r1, [r4] strh r1, [r4]
ldr r4, =gUnknown_02022E22 ldr r4, =gBattle_BG3_Y
ldrh r1, [r3, 0x2] ldrh r1, [r3, 0x2]
strh r1, [r4] strh r1, [r4]
ldr r1, =sub_81162F8 ldr r1, =sub_81162F8
@ -46839,7 +46839,7 @@ _08116330:
ldrh r0, [r3, 0x8] ldrh r0, [r3, 0x8]
_08116332: _08116332:
strh r0, [r6] strh r0, [r6]
ldr r2, =gUnknown_02022E22 ldr r2, =gBattle_BG3_Y
ldrh r3, [r2] ldrh r3, [r2]
lsls r1, r5, 2 lsls r1, r5, 2
adds r0, r1, r5 adds r0, r1, r5
@ -47805,9 +47805,9 @@ sub_8116B14: @ 8116B14
lsrs r0, 24 lsrs r0, 24
mov r9, r0 mov r9, r0
movs r7, 0 movs r7, 0
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
strh r7, [r0] strh r7, [r0]
ldr r0, =gUnknown_02022E26 ldr r0, =gBattle_WIN0V
strh r7, [r0] strh r7, [r0]
ldr r1, =0x00003f3f ldr r1, =0x00003f3f
movs r0, 0x48 movs r0, 0x48
@ -48072,10 +48072,10 @@ sub_8116D64: @ 8116D64
bne _08116E86 bne _08116E86
movs r0, 0 movs r0, 0
bl sub_80A477C bl sub_80A477C
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
mov r1, r8 mov r1, r8
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E26 ldr r0, =gBattle_WIN0V
strh r1, [r0] strh r1, [r0]
ldr r4, =0x00003f3f ldr r4, =0x00003f3f
movs r0, 0x48 movs r0, 0x48
@ -48256,10 +48256,10 @@ _08116F56:
movs r0, 0 movs r0, 0
strh r0, [r1, 0xA] strh r0, [r1, 0xA]
_08116F5C: _08116F5C:
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E26 ldr r0, =gBattle_WIN0V
strh r1, [r0] strh r1, [r0]
ldr r1, =0x00003f3f ldr r1, =0x00003f3f
movs r0, 0x48 movs r0, 0x48
@ -48746,10 +48746,10 @@ _081173AE:
strh r0, [r5, 0x26] strh r0, [r5, 0x26]
b _08117478 b _08117478
_081173B6: _081173B6:
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E26 ldr r0, =gBattle_WIN0V
strh r1, [r0] strh r1, [r0]
ldr r4, =0x00003f3f ldr r4, =0x00003f3f
movs r0, 0x48 movs r0, 0x48
@ -49158,7 +49158,7 @@ sub_81176D8: @ 81176D8
ldrh r4, [r6] ldrh r4, [r6]
adds r0, r4 adds r0, r4
strh r0, [r6] strh r0, [r6]
ldr r4, =gUnknown_02022E22 ldr r4, =gBattle_BG3_Y
lsls r0, r2, 16 lsls r0, r2, 16
asrs r0, 24 asrs r0, 24
ldrh r7, [r4] ldrh r7, [r4]
@ -49363,10 +49363,10 @@ _081178B6:
movs r2, 0 movs r2, 0
mov r8, r2 mov r8, r2
_081178BA: _081178BA:
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E26 ldr r0, =gBattle_WIN0V
strh r1, [r0] strh r1, [r0]
ldr r1, =0x00003f3f ldr r1, =0x00003f3f
movs r0, 0x48 movs r0, 0x48
@ -49676,9 +49676,9 @@ _08117B34:
bne _08117C0C bne _08117C0C
movs r0, 0 movs r0, 0
bl sub_80A477C bl sub_80A477C
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
strh r4, [r0] strh r4, [r0]
ldr r0, =gUnknown_02022E26 ldr r0, =gBattle_WIN0V
strh r4, [r0] strh r4, [r0]
ldr r4, =0x00003f3f ldr r4, =0x00003f3f
movs r0, 0x48 movs r0, 0x48
@ -49777,7 +49777,7 @@ sub_8117C44: @ 8117C44
movs r0, 0x80 movs r0, 0x80
lsls r0, 6 lsls r0, 6
bl AllocZeroed bl AllocZeroed
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
movs r2, 0xBE movs r2, 0xBE
lsls r2, 1 lsls r2, 1
@ -49797,7 +49797,7 @@ sub_8117C70: @ 8117C70
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r6, =gBattleSpritesGfx ldr r6, =gMonSpritesGfxPtr
ldr r0, [r6] ldr r0, [r6]
movs r5, 0xBE movs r5, 0xBE
lsls r5, 1 lsls r5, 1
@ -49866,7 +49866,7 @@ _08117CF6:
adds r4, r0, 0 adds r4, r0, 0
adds r4, 0x10 adds r4, 0x10
_08117CFC: _08117CFC:
ldr r0, =gBattleSpritesGfx ldr r0, =gMonSpritesGfxPtr
ldr r1, [r0] ldr r1, [r0]
ldr r0, =gBattleAnimArgs ldr r0, =gBattleAnimArgs
movs r2, 0x2 movs r2, 0x2
@ -49944,7 +49944,7 @@ _08117D98:
lsls r0, r4, 5 lsls r0, r4, 5
ldr r1, =gPlttBufferUnfaded ldr r1, =gPlttBufferUnfaded
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r2, [r1] ldr r2, [r1]
ldr r1, =gBattleAnimArgs ldr r1, =gBattleAnimArgs
movs r3, 0x2 movs r3, 0x2
@ -50646,7 +50646,7 @@ _0811838C:
bl SetGpuReg bl SetGpuReg
b _0811852A b _0811852A
_0811839C: _0811839C:
ldr r1, =gUnknown_02022E26 ldr r1, =gBattle_WIN0V
ldrh r0, [r1] ldrh r0, [r1]
subs r0, 0xFF subs r0, 0xFF
strh r0, [r1] strh r0, [r1]
@ -50715,7 +50715,7 @@ _08118420:
_0811842C: _0811842C:
strh r0, [r2] strh r0, [r2]
_0811842E: _0811842E:
ldr r2, =gUnknown_02022E26 ldr r2, =gBattle_WIN0V
ldrh r1, [r2] ldrh r1, [r2]
movs r0, 0xFF movs r0, 0xFF
lsls r0, 8 lsls r0, 8
@ -50988,7 +50988,7 @@ _08118662:
b _0811881A b _0811881A
.pool .pool
_08118678: _08118678:
ldr r1, =gUnknown_02022E26 ldr r1, =gBattle_WIN0V
ldrh r0, [r1] ldrh r0, [r1]
subs r0, 0xFF subs r0, 0xFF
strh r0, [r1] strh r0, [r1]
@ -51065,7 +51065,7 @@ _08118708:
movs r0, 0x4 movs r0, 0x4
strh r0, [r1, 0x12] strh r0, [r1, 0x12]
_08118728: _08118728:
ldr r2, =gUnknown_02022E26 ldr r2, =gBattle_WIN0V
ldrh r1, [r2] ldrh r1, [r2]
movs r0, 0xFF movs r0, 0xFF
lsls r0, 8 lsls r0, 8
@ -51288,7 +51288,7 @@ _08118908:
b _08118A96 b _08118A96
.pool .pool
_0811891C: _0811891C:
ldr r1, =gUnknown_02022E26 ldr r1, =gBattle_WIN0V
ldrh r0, [r1] ldrh r0, [r1]
subs r0, 0xFF subs r0, 0xFF
strh r0, [r1] strh r0, [r1]
@ -51354,7 +51354,7 @@ _08118986:
movs r0, 0x6 movs r0, 0x6
strh r0, [r2, 0x12] strh r0, [r2, 0x12]
_081189A6: _081189A6:
ldr r2, =gUnknown_02022E26 ldr r2, =gBattle_WIN0V
ldrh r1, [r2] ldrh r1, [r2]
movs r0, 0xFF movs r0, 0xFF
lsls r0, 8 lsls r0, 8
@ -51652,7 +51652,7 @@ _08118BA8:
b _08118D5A b _08118D5A
.pool .pool
_08118C38: _08118C38:
ldr r1, =gUnknown_02022E26 ldr r1, =gBattle_WIN0V
ldrh r0, [r1] ldrh r0, [r1]
subs r0, 0xFF subs r0, 0xFF
strh r0, [r1] strh r0, [r1]
@ -51683,7 +51683,7 @@ _08118C50:
b _08118D5A b _08118D5A
.pool .pool
_08118C7C: _08118C7C:
ldr r2, =gUnknown_02022E26 ldr r2, =gBattle_WIN0V
ldrh r1, [r2] ldrh r1, [r2]
movs r0, 0xFF movs r0, 0xFF
lsls r0, 8 lsls r0, 8
@ -51874,7 +51874,7 @@ _08118DD4:
ldr r1, =0x00003f3f ldr r1, =0x00003f3f
movs r0, 0x4A movs r0, 0x4A
bl SetGpuReg bl SetGpuReg
ldr r1, =gUnknown_02022E16 ldr r1, =gBattle_BG0_Y
ldr r2, =0x0000ffd0 ldr r2, =0x0000ffd0
adds r0, r2, 0 adds r0, r2, 0
strh r0, [r1] strh r0, [r1]
@ -51888,7 +51888,7 @@ _08118DD4:
b _08118FB2 b _08118FB2
.pool .pool
_08118E4C: _08118E4C:
ldr r2, =gUnknown_02022E26 ldr r2, =gBattle_WIN0V
ldrh r3, [r2] ldrh r3, [r2]
movs r1, 0x80 movs r1, 0x80
lsls r1, 1 lsls r1, 1
@ -51932,7 +51932,7 @@ _08118E7E:
b _08118FB2 b _08118FB2
.pool .pool
_08118EA8: _08118EA8:
ldr r3, =gUnknown_02022E26 ldr r3, =gBattle_WIN0V
ldrh r2, [r3] ldrh r2, [r3]
movs r0, 0xFF movs r0, 0xFF
lsls r0, 8 lsls r0, 8
@ -51973,7 +51973,7 @@ _08118ED8:
b _08118FB2 b _08118FB2
.pool .pool
_08118F00: _08118F00:
ldr r1, =gUnknown_02022E16 ldr r1, =gBattle_BG0_Y
ldrh r0, [r1] ldrh r0, [r1]
adds r3, r0, 0x2 adds r3, r0, 0x2
strh r3, [r1] strh r3, [r1]
@ -51981,7 +51981,7 @@ _08118F00:
ldrh r0, [r1] ldrh r0, [r1]
adds r0, 0x2 adds r0, 0x2
strh r0, [r1] strh r0, [r1]
ldr r5, =gUnknown_02022E26 ldr r5, =gBattle_WIN0V
ldrh r2, [r5] ldrh r2, [r5]
movs r0, 0xFF movs r0, 0xFF
lsls r0, 8 lsls r0, 8
@ -52081,7 +52081,7 @@ sub_8118FBC: @ 8118FBC
bl GetBankByIdentity bl GetBankByIdentity
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r2, [r1] ldr r2, [r1]
lsls r4, 2 lsls r4, 2
adds r2, 0x4 adds r2, 0x4
@ -52189,7 +52189,7 @@ sub_8119094: @ 8119094
lsls r0, 24 lsls r0, 24
mov r9, r0 mov r9, r0
ldr r4, =0x040000d4 ldr r4, =0x040000d4
ldr r0, =gBattleSpritesGfx ldr r0, =gMonSpritesGfxPtr
ldr r0, [r0] ldr r0, [r0]
lsrs r2, 22 lsrs r2, 22
adds r0, 0x4 adds r0, 0x4

26
asm/battle_anim_815A0D4.s
View File

@ -1077,10 +1077,10 @@ sub_815A934: @ 815A934
lsls r1, 8 lsls r1, 8
movs r0, 0 movs r0, 0
bl SetGpuRegBits bl SetGpuRegBits
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r4, =gUnknown_02022E26 ldr r4, =gBattle_WIN0V
strh r1, [r4] strh r1, [r4]
movs r0, 0x40 movs r0, 0x40
movs r1, 0 movs r1, 0
@ -1416,18 +1416,18 @@ sub_815ABEC: @ 815ABEC
ldr r1, =0x00001f3f ldr r1, =0x00001f3f
movs r0, 0x48 movs r0, 0x48
bl SetGpuReg bl SetGpuReg
ldr r1, =gUnknown_02022E28 ldr r1, =gBattle_WIN1H
ldr r2, =0x000098f0 ldr r2, =0x000098f0
adds r0, r2, 0 adds r0, r2, 0
strh r0, [r1] strh r0, [r1]
ldr r1, =gUnknown_02022E2A ldr r1, =gBattle_WIN1V
movs r0, 0xA0 movs r0, 0xA0
strh r0, [r1] strh r0, [r1]
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x42 movs r0, 0x42
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02022E26 ldr r0, =gBattle_WIN0V
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x46 movs r0, 0x46
bl SetGpuReg bl SetGpuReg
@ -1437,10 +1437,10 @@ _0815AC40:
ldr r1, =0x00001f3f ldr r1, =0x00001f3f
movs r0, 0x48 movs r0, 0x48
bl SetGpuReg bl SetGpuReg
ldr r1, =gUnknown_02022E28 ldr r1, =gBattle_WIN1H
movs r0, 0xF0 movs r0, 0xF0
strh r0, [r1] strh r0, [r1]
ldr r4, =gUnknown_02022E2A ldr r4, =gBattle_WIN1V
ldr r1, =0x000078a0 ldr r1, =0x000078a0
adds r0, r1, 0 adds r0, r1, 0
strh r0, [r4] strh r0, [r4]
@ -1471,10 +1471,10 @@ sub_815AC8C: @ 815AC8C
ldr r1, =0x00003f3f ldr r1, =0x00003f3f
movs r0, 0x48 movs r0, 0x48
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02022E28 ldr r0, =gBattle_WIN1H
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E2A ldr r0, =gBattle_WIN1V
strh r1, [r0] strh r1, [r0]
bl IsContest bl IsContest
lsls r0, 24 lsls r0, 24
@ -3024,7 +3024,7 @@ _0815B8E0:
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
_0815B8EA: _0815B8EA:
ldr r0, =gBattleSpritesGfx ldr r0, =gMonSpritesGfxPtr
ldr r2, [r0] ldr r2, [r0]
lsls r0, r1, 2 lsls r0, r1, 2
adds r2, 0x4 adds r2, 0x4
@ -5397,10 +5397,10 @@ sub_815CC94: @ 815CC94
lsls r1, 8 lsls r1, 8
movs r0, 0 movs r0, 0
bl SetGpuRegBits bl SetGpuRegBits
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r4, =gUnknown_02022E26 ldr r4, =gBattle_WIN0V
strh r1, [r4] strh r1, [r4]
movs r0, 0x40 movs r0, 0x40
movs r1, 0 movs r1, 0

8
asm/battle_anim_8170478.s
View File

@ -18,10 +18,10 @@ sub_8170478: @ 8170478
str r0, [sp, 0x10] str r0, [sp, 0x10]
ldr r0, =gAnimationBankAttacker ldr r0, =gAnimationBankAttacker
ldrb r4, [r0] ldrb r4, [r0]
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E26 ldr r0, =gBattle_WIN0V
strh r1, [r0] strh r1, [r0]
ldr r1, =0x00003f3f ldr r1, =0x00003f3f
movs r0, 0x48 movs r0, 0x48
@ -317,9 +317,9 @@ _08170708:
bne _08170814 bne _08170814
movs r0, 0 movs r0, 0
bl sub_80A477C bl sub_80A477C
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
strh r4, [r0] strh r4, [r0]
ldr r0, =gUnknown_02022E26 ldr r0, =gBattle_WIN0V
strh r4, [r0] strh r4, [r0]
ldr r4, =0x00003f3f ldr r4, =0x00003f3f
movs r0, 0x48 movs r0, 0x48

4
asm/battle_controller_linkopponent.s
View File

@ -5031,10 +5031,10 @@ _08066FE4:
thumb_func_start sub_8066FF4 thumb_func_start sub_8066FF4
sub_8066FF4: @ 8066FF4 sub_8066FF4: @ 8066FF4
push {r4,r5,lr} push {r4,r5,lr}
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r1, [r0] strh r1, [r0]
ldr r5, =gActiveBank ldr r5, =gActiveBank
ldrb r4, [r5] ldrb r4, [r5]

4
asm/battle_controller_linkpartner.s
View File

@ -4340,10 +4340,10 @@ _0814D580:
thumb_func_start sub_814D590 thumb_func_start sub_814D590
sub_814D590: @ 814D590 sub_814D590: @ 814D590
push {r4,r5,lr} push {r4,r5,lr}
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r1, [r0] strh r1, [r0]
ldr r5, =gActiveBank ldr r5, =gActiveBank
ldrb r4, [r5] ldrb r4, [r5]

6
asm/battle_controller_opponent.s
View File

@ -5171,10 +5171,10 @@ _08061F24:
thumb_func_start sub_8061F34 thumb_func_start sub_8061F34
sub_8061F34: @ 8061F34 sub_8061F34: @ 8061F34
push {r4,r5,lr} push {r4,r5,lr}
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r1, [r0] strh r1, [r0]
ldr r5, =gActiveBank ldr r5, =gActiveBank
ldrb r4, [r5] ldrb r4, [r5]
@ -6655,7 +6655,7 @@ sub_8062BB0: @ 8062BB0
negs r0, r0 negs r0, r0
ands r0, r1 ands r0, r1
strb r0, [r3] strb r0, [r3]
ldr r0, =gUnknown_03005D00 ldr r0, =gPreBattleCallback1
ldr r0, [r0] ldr r0, [r0]
str r0, [r2] str r0, [r2]
ldr r0, [r2, 0x8] ldr r0, [r2, 0x8]

28
asm/battle_controller_player.s
View File

@ -1287,10 +1287,10 @@ _08057FD6:
beq _08057FF8 beq _08057FF8
movs r0, 0x5 movs r0, 0x5
bl PlaySE bl PlaySE
ldr r1, =gUnknown_02022E14 ldr r1, =gBattle_BG0_X
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
ldr r1, =gUnknown_02022E16 ldr r1, =gBattle_BG0_Y
movs r2, 0xA0 movs r2, 0xA0
lsls r2, 1 lsls r2, 1
adds r0, r2, 0 adds r0, r2, 0
@ -2123,7 +2123,7 @@ sub_80586F8: @ 80586F8
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _0805875C bne _0805875C
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _08058798 bne _08058798
@ -2137,7 +2137,7 @@ sub_80586F8: @ 80586F8
negs r0, r0 negs r0, r0
ands r0, r1 ands r0, r1
strb r0, [r2] strb r0, [r2]
ldr r0, =gUnknown_03005D00 ldr r0, =gPreBattleCallback1
ldr r0, [r0] ldr r0, [r0]
str r0, [r3] str r0, [r3]
ldr r0, =sub_8038D64 ldr r0, =sub_8038D64
@ -2166,7 +2166,7 @@ _0805875C:
negs r0, r0 negs r0, r0
ands r0, r1 ands r0, r1
strb r0, [r2] strb r0, [r2]
ldr r0, =gUnknown_03005D00 ldr r0, =gPreBattleCallback1
ldr r0, [r0] ldr r0, [r0]
str r0, [r3] str r0, [r3]
ldr r0, =sub_8038D64 ldr r0, =sub_8038D64
@ -2233,7 +2233,7 @@ _08058810:
negs r0, r0 negs r0, r0
ands r0, r1 ands r0, r1
strb r0, [r3] strb r0, [r3]
ldr r0, =gUnknown_03005D00 ldr r0, =gPreBattleCallback1
ldr r0, [r0] ldr r0, [r0]
str r0, [r2] str r0, [r2]
ldr r0, [r2, 0x8] ldr r0, [r2, 0x8]
@ -4711,10 +4711,10 @@ b_link_standby_message: @ 8059DC0
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _08059DE0 beq _08059DE0
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r1, [r0] strh r1, [r0]
ldr r0, =gText_LinkStandby ldr r0, =gText_LinkStandby
movs r1, 0 movs r1, 0
@ -8444,10 +8444,10 @@ _0805BF70:
thumb_func_start sub_805BF80 thumb_func_start sub_805BF80
sub_805BF80: @ 805BF80 sub_805BF80: @ 805BF80
push {r4,r5,lr} push {r4,r5,lr}
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r1, [r0] strh r1, [r0]
ldr r5, =gActiveBank ldr r5, =gActiveBank
ldrb r4, [r5] ldrb r4, [r5]
@ -8503,9 +8503,9 @@ sub_805C004: @ 805C004
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0 cmp r1, 0
bne _0805C02A bne _0805C02A
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
strh r1, [r0] strh r1, [r0]
ldr r1, =gUnknown_02022E16 ldr r1, =gBattle_BG0_Y
movs r0, 0xA0 movs r0, 0xA0
strh r0, [r1] strh r0, [r1]
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
@ -8611,9 +8611,9 @@ sub_805C114: @ 805C114
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0 cmp r1, 0
bne _0805C13E bne _0805C13E
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
strh r1, [r0] strh r1, [r0]
ldr r1, =gUnknown_02022E16 ldr r1, =gBattle_BG0_Y
movs r2, 0xA0 movs r2, 0xA0
lsls r2, 1 lsls r2, 1
adds r0, r2, 0 adds r0, r2, 0

4
asm/battle_controller_player_partner.s
View File

@ -4952,10 +4952,10 @@ _081BDA3C:
thumb_func_start sub_81BDA4C thumb_func_start sub_81BDA4C
sub_81BDA4C: @ 81BDA4C sub_81BDA4C: @ 81BDA4C
push {r4,lr} push {r4,lr}
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r1, [r0] strh r1, [r0]
ldr r4, =gActiveBank ldr r4, =gActiveBank
ldrb r0, [r4] ldrb r0, [r4]

4
asm/battle_controller_recorded_opponent.s
View File

@ -4708,10 +4708,10 @@ _08188E80:
thumb_func_start sub_8188E90 thumb_func_start sub_8188E90
sub_8188E90: @ 8188E90 sub_8188E90: @ 8188E90
push {r4,lr} push {r4,lr}
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r1, [r0] strh r1, [r0]
ldr r4, =gActiveBank ldr r4, =gActiveBank
ldrb r0, [r4] ldrb r0, [r4]

4
asm/battle_controller_recorded_player.s
View File

@ -4808,10 +4808,10 @@ _0818C42C:
thumb_func_start sub_818C43C thumb_func_start sub_818C43C
sub_818C43C: @ 818C43C sub_818C43C: @ 818C43C
push {r4,lr} push {r4,lr}
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r1, [r0] strh r1, [r0]
ldr r4, =gActiveBank ldr r4, =gActiveBank
ldrb r0, [r4] ldrb r0, [r4]

10
asm/battle_controller_safari.s
View File

@ -318,7 +318,7 @@ sub_81595E4: @ 81595E4
negs r0, r0 negs r0, r0
ands r0, r1 ands r0, r1
strb r0, [r3] strb r0, [r3]
ldr r0, =gUnknown_03005D00 ldr r0, =gPreBattleCallback1
ldr r0, [r0] ldr r0, [r0]
str r0, [r2] str r0, [r2]
ldr r0, [r2, 0x8] ldr r0, [r2, 0x8]
@ -778,10 +778,10 @@ sub_81599D0: @ 81599D0
thumb_func_start dp01t_10_6_message thumb_func_start dp01t_10_6_message
dp01t_10_6_message: @ 81599DC dp01t_10_6_message: @ 81599DC
push {r4,lr} push {r4,lr}
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r1, [r0] strh r1, [r0]
ldr r4, =gActiveBank ldr r4, =gActiveBank
ldrb r0, [r4] ldrb r0, [r4]
@ -832,9 +832,9 @@ sub_8159A54: @ 8159A54
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0 cmp r1, 0
bne _08159A7A bne _08159A7A
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
strh r1, [r0] strh r1, [r0]
ldr r1, =gUnknown_02022E16 ldr r1, =gBattle_BG0_Y
movs r0, 0xA0 movs r0, 0xA0
strh r0, [r1] strh r0, [r1]
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc

12
asm/battle_controller_wally.s
View File

@ -3592,10 +3592,10 @@ _0816A3AC:
thumb_func_start sub_816A3B8 thumb_func_start sub_816A3B8
sub_816A3B8: @ 816A3B8 sub_816A3B8: @ 816A3B8
push {r4,lr} push {r4,lr}
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r1, [r0] strh r1, [r0]
ldr r4, =gActiveBank ldr r4, =gActiveBank
ldrb r0, [r4] ldrb r0, [r4]
@ -3646,9 +3646,9 @@ sub_816A430: @ 816A430
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0 cmp r1, 0
bne _0816A456 bne _0816A456
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
strh r1, [r0] strh r1, [r0]
ldr r1, =gUnknown_02022E16 ldr r1, =gBattle_BG0_Y
movs r0, 0xA0 movs r0, 0xA0
strh r0, [r1] strh r0, [r1]
ldr r1, =gBattleBankFunc ldr r1, =gBattleBankFunc
@ -3749,9 +3749,9 @@ _0816A522:
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0 cmp r1, 0
bne _0816A574 bne _0816A574
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
strh r1, [r0] strh r1, [r0]
ldr r1, =gUnknown_02022E16 ldr r1, =gBattle_BG0_Y
movs r2, 0xA0 movs r2, 0xA0
lsls r2, 1 lsls r2, 1
adds r0, r2, 0 adds r0, r2, 0

74
asm/battle_frontier_1.s
View File

@ -3161,9 +3161,9 @@ _0819044E:
ldr r0, =gUnknown_0860CEB4 ldr r0, =gUnknown_0860CEB4
bl InitWindows bl InitWindows
bl DeactivateAllTextPrinters bl DeactivateAllTextPrinters
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
strh r4, [r0] strh r4, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r4, [r0] strh r4, [r0]
ldr r0, =gBattle_BG1_X ldr r0, =gBattle_BG1_X
strh r4, [r0] strh r4, [r0]
@ -3171,7 +3171,7 @@ _0819044E:
strh r4, [r0] strh r4, [r0]
ldr r0, =gBattle_BG3_X ldr r0, =gBattle_BG3_X
strh r4, [r0] strh r4, [r0]
ldr r0, =gUnknown_02022E22 ldr r0, =gBattle_BG3_Y
strh r4, [r0] strh r4, [r0]
mov r2, r9 mov r2, r9
cmp r2, 0x2 cmp r2, 0x2
@ -4366,10 +4366,10 @@ _08190E98:
ldrsh r2, [r0, r5] ldrsh r2, [r0, r5]
cmp r2, 0 cmp r2, 0
beq _08190ED4 beq _08190ED4
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r1, [r0] strh r1, [r0]
ldr r0, =gBattle_BG1_X ldr r0, =gBattle_BG1_X
strh r1, [r0] strh r1, [r0]
@ -4379,9 +4379,9 @@ _08190E98:
b _08190EE6 b _08190EE6
.pool .pool
_08190ED4: _08190ED4:
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
strh r2, [r0] strh r2, [r0]
ldr r1, =gUnknown_02022E16 ldr r1, =gBattle_BG0_Y
movs r0, 0xA0 movs r0, 0xA0
strh r0, [r1] strh r0, [r1]
ldr r0, =gBattle_BG1_X ldr r0, =gBattle_BG1_X
@ -4765,10 +4765,10 @@ _08191234:
ldrsh r2, [r0, r5] ldrsh r2, [r0, r5]
cmp r2, 0 cmp r2, 0
beq _08191278 beq _08191278
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r1, [r0] strh r1, [r0]
ldr r0, =gBattle_BG1_X ldr r0, =gBattle_BG1_X
strh r1, [r0] strh r1, [r0]
@ -4779,9 +4779,9 @@ _08191234:
b _0819128C b _0819128C
.pool .pool
_08191278: _08191278:
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
strh r2, [r0] strh r2, [r0]
ldr r1, =gUnknown_02022E16 ldr r1, =gBattle_BG0_Y
ldr r3, =0x0000ff60 ldr r3, =0x0000ff60
adds r0, r3, 0 adds r0, r3, 0
strh r0, [r1] strh r0, [r1]
@ -5157,10 +5157,10 @@ _081915CC:
ldrsh r2, [r0, r5] ldrsh r2, [r0, r5]
cmp r2, 0 cmp r2, 0
beq _0819160C beq _0819160C
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r1, [r0] strh r1, [r0]
ldr r2, =gBattle_BG1_X ldr r2, =gBattle_BG1_X
movs r6, 0x80 movs r6, 0x80
@ -5172,12 +5172,12 @@ _081915CC:
b _08191622 b _08191622
.pool .pool
_0819160C: _0819160C:
ldr r1, =gUnknown_02022E14 ldr r1, =gBattle_BG0_X
movs r3, 0x80 movs r3, 0x80
lsls r3, 1 lsls r3, 1
adds r0, r3, 0 adds r0, r3, 0
strh r0, [r1] strh r0, [r1]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r2, [r0] strh r2, [r0]
ldr r0, =gBattle_BG1_X ldr r0, =gBattle_BG1_X
strh r2, [r0] strh r2, [r0]
@ -5457,10 +5457,10 @@ _0819187C:
ldrsh r2, [r0, r5] ldrsh r2, [r0, r5]
cmp r2, 0 cmp r2, 0
beq _081918BC beq _081918BC
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r1, [r0] strh r1, [r0]
ldr r2, =gBattle_BG1_X ldr r2, =gBattle_BG1_X
movs r6, 0x80 movs r6, 0x80
@ -5472,12 +5472,12 @@ _0819187C:
b _081918D2 b _081918D2
.pool .pool
_081918BC: _081918BC:
ldr r1, =gUnknown_02022E14 ldr r1, =gBattle_BG0_X
movs r3, 0x80 movs r3, 0x80
lsls r3, 1 lsls r3, 1
adds r0, r3, 0 adds r0, r3, 0
strh r0, [r1] strh r0, [r1]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r2, [r0] strh r2, [r0]
ldr r0, =gBattle_BG1_X ldr r0, =gBattle_BG1_X
strh r2, [r0] strh r2, [r0]
@ -5744,10 +5744,10 @@ _08191B08:
ldrsh r2, [r0, r5] ldrsh r2, [r0, r5]
cmp r2, 0 cmp r2, 0
beq _08191B48 beq _08191B48
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r1, [r0] strh r1, [r0]
ldr r2, =gBattle_BG1_X ldr r2, =gBattle_BG1_X
movs r6, 0xFF movs r6, 0xFF
@ -5759,12 +5759,12 @@ _08191B08:
b _08191B5E b _08191B5E
.pool .pool
_08191B48: _08191B48:
ldr r1, =gUnknown_02022E14 ldr r1, =gBattle_BG0_X
movs r3, 0xFF movs r3, 0xFF
lsls r3, 8 lsls r3, 8
adds r0, r3, 0 adds r0, r3, 0
strh r0, [r1] strh r0, [r1]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r2, [r0] strh r2, [r0]
ldr r0, =gBattle_BG1_X ldr r0, =gBattle_BG1_X
strh r2, [r0] strh r2, [r0]
@ -6011,10 +6011,10 @@ _08191D68:
ldrsh r2, [r0, r5] ldrsh r2, [r0, r5]
cmp r2, 0 cmp r2, 0
beq _08191DA8 beq _08191DA8
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r1, [r0] strh r1, [r0]
ldr r2, =gBattle_BG1_X ldr r2, =gBattle_BG1_X
movs r6, 0xFF movs r6, 0xFF
@ -6026,12 +6026,12 @@ _08191D68:
b _08191DBE b _08191DBE
.pool .pool
_08191DA8: _08191DA8:
ldr r1, =gUnknown_02022E14 ldr r1, =gBattle_BG0_X
movs r3, 0xFF movs r3, 0xFF
lsls r3, 8 lsls r3, 8
adds r0, r3, 0 adds r0, r3, 0
strh r0, [r1] strh r0, [r1]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r2, [r0] strh r2, [r0]
ldr r0, =gBattle_BG1_X ldr r0, =gBattle_BG1_X
strh r2, [r0] strh r2, [r0]
@ -6306,7 +6306,7 @@ _08191FF8:
asrs r0, 16 asrs r0, 16
cmp r0, 0x29 cmp r0, 0x29
beq _08192100 beq _08192100
ldr r1, =gUnknown_02022E16 ldr r1, =gBattle_BG0_Y
ldrh r0, [r1] ldrh r0, [r1]
subs r0, 0x4 subs r0, 0x4
strh r0, [r1] strh r0, [r1]
@ -6331,7 +6331,7 @@ _08192038:
asrs r0, 16 asrs r0, 16
cmp r0, 0x29 cmp r0, 0x29
beq _08192100 beq _08192100
ldr r1, =gUnknown_02022E16 ldr r1, =gBattle_BG0_Y
ldrh r0, [r1] ldrh r0, [r1]
adds r0, 0x4 adds r0, 0x4
strh r0, [r1] strh r0, [r1]
@ -6356,7 +6356,7 @@ _08192078:
asrs r0, 16 asrs r0, 16
cmp r0, 0x41 cmp r0, 0x41
beq _08192100 beq _08192100
ldr r1, =gUnknown_02022E14 ldr r1, =gBattle_BG0_X
ldrh r0, [r1] ldrh r0, [r1]
subs r0, 0x4 subs r0, 0x4
strh r0, [r1] strh r0, [r1]
@ -6385,7 +6385,7 @@ _081920BC:
asrs r0, 16 asrs r0, 16
cmp r0, 0x41 cmp r0, 0x41
beq _08192100 beq _08192100
ldr r1, =gUnknown_02022E14 ldr r1, =gBattle_BG0_X
ldrh r0, [r1] ldrh r0, [r1]
adds r0, 0x4 adds r0, 0x4
strh r0, [r1] strh r0, [r1]
@ -10400,9 +10400,9 @@ _0819427C:
ldr r0, =gUnknown_0860CE94 ldr r0, =gUnknown_0860CE94
bl InitWindows bl InitWindows
bl DeactivateAllTextPrinters bl DeactivateAllTextPrinters
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
strh r4, [r0] strh r4, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r4, [r0] strh r4, [r0]
ldr r0, =gBattle_BG1_X ldr r0, =gBattle_BG1_X
strh r4, [r0] strh r4, [r0]
@ -11358,11 +11358,11 @@ sub_8194B70: @ 8194B70
movs r1, 0x80 movs r1, 0x80
movs r2, 0x2 movs r2, 0x2
bl ChangeBgY bl ChangeBgY
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x10 movs r0, 0x10
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x12 movs r0, 0x12
bl SetGpuReg bl SetGpuReg
@ -11486,11 +11486,11 @@ _08194CD4:
thumb_func_start sub_8194CE4 thumb_func_start sub_8194CE4
sub_8194CE4: @ 8194CE4 sub_8194CE4: @ 8194CE4
push {lr} push {lr}
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x10 movs r0, 0x10
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x12 movs r0, 0x12
bl SetGpuReg bl SetGpuReg

4
asm/battle_frontier_2.s
View File

@ -20533,10 +20533,10 @@ _081A52A4:
lsls r1, 1 lsls r1, 1
movs r2, 0x20 movs r2, 0x20
bl LoadCompressedPalette bl LoadCompressedPalette
ldr r1, =gUnknown_02022E24 ldr r1, =gBattle_WIN0H
movs r0, 0xFF movs r0, 0xFF
strh r0, [r1] strh r0, [r1]
ldr r1, =gUnknown_02022E26 ldr r1, =gBattle_WIN0V
movs r0, 0x70 movs r0, 0x70
strh r0, [r1] strh r0, [r1]
b _081A553E b _081A553E

16
asm/battle_interface.s
View File

@ -1317,7 +1317,7 @@ _08072D86:
movs r2, 0x1 movs r2, 0x1
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r0, =gBattleSpritesGfx ldr r0, =gMonSpritesGfxPtr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0xBA movs r1, 0xBA
lsls r1, 1 lsls r1, 1
@ -1333,7 +1333,7 @@ _08072D86:
lsls r0, 2 lsls r0, 2
adds r5, r0, r1 adds r5, r0, r1
_08072DB8: _08072DB8:
ldr r0, =gBattleSpritesGfx ldr r0, =gMonSpritesGfxPtr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0xBA movs r1, 0xBA
lsls r1, 1 lsls r1, 1
@ -1536,7 +1536,7 @@ _08072F52:
ldr r1, =gText_Slash ldr r1, =gText_Slash
bl StringCopy bl StringCopy
_08072F82: _08072F82:
ldr r0, =gBattleSpritesGfx ldr r0, =gMonSpritesGfxPtr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0xBA movs r1, 0xBA
lsls r1, 1 lsls r1, 1
@ -1556,7 +1556,7 @@ _08072F82:
_08072FA6: _08072FA6:
cmp r4, 0x2 cmp r4, 0x2
bhi _08072FF0 bhi _08072FF0
ldr r0, =gBattleSpritesGfx ldr r0, =gMonSpritesGfxPtr
ldr r0, [r0] ldr r0, [r0]
movs r2, 0xBA movs r2, 0xBA
lsls r2, 1 lsls r2, 1
@ -1579,7 +1579,7 @@ _08072FA6:
b _0807301A b _0807301A
.pool .pool
_08072FF0: _08072FF0:
ldr r0, =gBattleSpritesGfx ldr r0, =gMonSpritesGfxPtr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0xBA movs r1, 0xBA
lsls r1, 1 lsls r1, 1
@ -1609,7 +1609,7 @@ _08073024:
mov r3, r8 mov r3, r8
cmp r3, 0 cmp r3, 0
bne _08073084 bne _08073084
ldr r0, =gBattleSpritesGfx ldr r0, =gMonSpritesGfxPtr
ldr r0, [r0] ldr r0, [r0]
movs r1, 0xBA movs r1, 0xBA
lsls r1, 1 lsls r1, 1
@ -1702,7 +1702,7 @@ sub_80730D4: @ 80730D4
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl GetBankIdentity bl GetBankIdentity
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r2, [r1] ldr r2, [r1]
movs r3, 0xBA movs r3, 0xBA
lsls r3, 1 lsls r3, 1
@ -1877,7 +1877,7 @@ _08073236:
strb r0, [r1, 0x5] strb r0, [r1, 0x5]
movs r0, 0xBA movs r0, 0xBA
strb r0, [r1, 0x8] strb r0, [r1, 0x8]
ldr r5, =gBattleSpritesGfx ldr r5, =gMonSpritesGfxPtr
ldr r0, [r5] ldr r0, [r5]
movs r2, 0xBA movs r2, 0xBA
lsls r2, 1 lsls r2, 1

10
asm/battle_setup.s
View File

@ -41,7 +41,7 @@ _080B062E:
cmp r0, 0x1 cmp r0, 0x1
bne _080B0652 bne _080B0652
bl overworld_free_bg_tilemaps bl overworld_free_bg_tilemaps
ldr r0, =sub_8036760 ldr r0, =CB2_InitBattle
bl SetMainCallback2 bl SetMainCallback2
bl prev_quest_postbuffer_cursor_backup_reset bl prev_quest_postbuffer_cursor_backup_reset
bl overworld_poison_timer_set bl overworld_poison_timer_set
@ -638,8 +638,8 @@ _080B0BC6:
.pool .pool
thumb_func_end sub_80B0B6C thumb_func_end sub_80B0B6C
thumb_func_start sub_80B0BD0 thumb_func_start BattleSetup_GetTerrainId
sub_80B0BD0: @ 80B0BD0 BattleSetup_GetTerrainId: @ 80B0BD0
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x4 sub sp, 0x4
mov r4, sp mov r4, sp
@ -798,7 +798,7 @@ _080B0D1A:
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80B0BD0 thumb_func_end BattleSetup_GetTerrainId
thumb_func_start sub_80B0D24 thumb_func_start sub_80B0D24
sub_80B0D24: @ 80B0D24 sub_80B0D24: @ 80B0D24
@ -1387,7 +1387,7 @@ sub_80B11A8: @ 80B11A8
ldr r0, =sub_80B1204 ldr r0, =sub_80B1204
str r0, [r1, 0x8] str r0, [r1, 0x8]
bl FreeAllWindowBuffers bl FreeAllWindowBuffers
ldr r0, =sub_8036760 ldr r0, =CB2_InitBattle
bl SetMainCallback2 bl SetMainCallback2
bl prev_quest_postbuffer_cursor_backup_reset bl prev_quest_postbuffer_cursor_backup_reset
bl overworld_poison_timer_set bl overworld_poison_timer_set

22
asm/battle_tower.s
View File

@ -3194,7 +3194,7 @@ sub_8163A8C: @ 8163A8C
ldr r0, =gMain ldr r0, =gMain
ldr r1, =sub_81639AC ldr r1, =sub_81639AC
str r1, [r0, 0x8] str r1, [r0, 0x8]
ldr r0, =sub_8036760 ldr r0, =CB2_InitBattle
bl SetMainCallback2 bl SetMainCallback2
adds r0, r4, 0 adds r0, r4, 0
bl DestroyTask bl DestroyTask
@ -5125,21 +5125,21 @@ _08164C18:
lsrs r0, 24 lsrs r0, 24
mov r1, sp mov r1, sp
movs r2, 0x4 movs r2, 0x4
bl link_0800A448 bl SendBlock
ldr r1, =gScriptResult ldr r1, =gScriptResult
movs r0, 0x1 movs r0, 0x1
b _08164DB4 b _08164DB4
.pool .pool
_08164C3C: _08164C3C:
bl sub_800A550 bl GetBlockReceivedStatus
movs r1, 0x3 movs r1, 0x3
ands r1, r0 ands r1, r0
cmp r1, 0x3 cmp r1, 0x3
beq _08164C4A beq _08164C4A
b _08164DB6 b _08164DB6
_08164C4A: _08164C4A:
bl sub_800A5B4 bl ResetBlockReceivedFlags
ldr r1, =gUnknown_020223C4 ldr r1, =gBlockRecvBuffer
movs r0, 0x80 movs r0, 0x80
lsls r0, 1 lsls r0, 1
adds r2, r1, r0 adds r2, r1, r0
@ -5221,23 +5221,23 @@ _08164CE0:
ldr r3, =0x00000cb4 ldr r3, =0x00000cb4
adds r1, r3 adds r1, r3
movs r2, 0x28 movs r2, 0x28
bl link_0800A448 bl SendBlock
ldr r1, =gScriptResult ldr r1, =gScriptResult
movs r0, 0x3 movs r0, 0x3
b _08164DB4 b _08164DB4
.pool .pool
_08164D14: _08164D14:
bl sub_800A550 bl GetBlockReceivedStatus
movs r1, 0x3 movs r1, 0x3
ands r1, r0 ands r1, r0
cmp r1, 0x3 cmp r1, 0x3
bne _08164DB6 bne _08164DB6
bl sub_800A5B4 bl ResetBlockReceivedFlags
ldr r4, =gSaveBlock2Ptr ldr r4, =gSaveBlock2Ptr
ldr r0, [r4] ldr r0, [r4]
ldr r5, =0x00000cb4 ldr r5, =0x00000cb4
adds r0, r5 adds r0, r5
ldr r1, =gUnknown_020223C4 ldr r1, =gBlockRecvBuffer
movs r2, 0x28 movs r2, 0x28
bl memcpy bl memcpy
ldr r2, =gTrainerBattleOpponent_A ldr r2, =gTrainerBattleOpponent_A
@ -5260,7 +5260,7 @@ _08164D14:
ldrh r0, [r4] ldrh r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl sub_8162614 bl sub_8162614
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _08164DB0 beq _08164DB0
@ -5279,7 +5279,7 @@ _08164D98:
b _08164DB4 b _08164DB4
.pool .pool
_08164DA8: _08164DA8:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _08164DB6 bne _08164DB6

12
asm/battle_transition.s
View File

@ -9513,11 +9513,11 @@ sub_814ABE4: @ 814ABE4
strh r0, [r6, 0xC] strh r0, [r6, 0xC]
cmp r0, 0 cmp r0, 0
bne _0814AC24 bne _0814AC24
ldr r5, =gUnknown_02022E14 ldr r5, =gBattle_BG0_X
ldrh r1, [r5] ldrh r1, [r5]
movs r0, 0x12 movs r0, 0x12
bl SetGpuReg bl SetGpuReg
ldr r4, =gUnknown_02022E16 ldr r4, =gBattle_BG0_Y
ldrh r1, [r4] ldrh r1, [r4]
movs r0, 0x10 movs r0, 0x10
bl SetGpuReg bl SetGpuReg
@ -9562,9 +9562,9 @@ sub_814AC38: @ 814AC38
movs r1, 0xF0 movs r1, 0xF0
movs r2, 0x20 movs r2, 0x20
bl LoadPalette bl LoadPalette
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
strh r5, [r0] strh r5, [r0]
ldr r4, =gUnknown_02022E16 ldr r4, =gBattle_BG0_Y
strh r5, [r4] strh r5, [r4]
movs r0, 0x12 movs r0, 0x12
movs r1, 0 movs r1, 0
@ -9781,10 +9781,10 @@ sub_814AE40: @ 814AE40
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x8 sub sp, 0x8
adds r5, r0, 0 adds r5, r0, 0
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r4, =gUnknown_02022E16 ldr r4, =gBattle_BG0_Y
strh r1, [r4] strh r1, [r4]
movs r0, 0x12 movs r0, 0x12
movs r1, 0 movs r1, 0

48
asm/berry_blender.s
View File

@ -512,7 +512,7 @@ _0807FBBE:
adds r4, 0x1 adds r4, 0x1
cmp r4, 0x3 cmp r4, 0x3
ble _0807FBBE ble _0807FBBE
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _0807FC14 beq _0807FC14
@ -1116,7 +1116,7 @@ _08080126:
adds r5, 0x1 adds r5, 0x1
cmp r5, 0x3 cmp r5, 0x3
ble _08080126 ble _08080126
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _0808016A bne _0808016A
@ -1213,7 +1213,7 @@ _08080248:
bne _08080254 bne _08080254
b _08080546 b _08080546
_08080254: _08080254:
bl sub_800A5B4 bl ResetBlockReceivedFlags
bl GetMultiplayerId bl GetMultiplayerId
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
@ -1239,7 +1239,7 @@ _08080282:
movs r0, 0x4 movs r0, 0x4
movs r1, 0x1 movs r1, 0x1
bl sub_8197DF8 bl sub_8197DF8
bl sub_800A550 bl GetBlockReceivedStatus
adds r4, r0, 0 adds r4, r0, 0
bl sub_800A9D8 bl sub_800A9D8
lsls r4, 24 lsls r4, 24
@ -1260,7 +1260,7 @@ _080802AC:
adds r0, r4, r0 adds r0, r4, r0
adds r0, r6 adds r0, r6
lsls r1, r5, 8 lsls r1, r5, 8
ldr r2, =gUnknown_020223C4 ldr r2, =gBlockRecvBuffer
adds r1, r2 adds r1, r2
movs r2, 0x10 movs r2, 0x10
bl memcpy bl memcpy
@ -1280,7 +1280,7 @@ _080802D4:
lsrs r0, 24 lsrs r0, 24
cmp r5, r0 cmp r5, r0
blt _080802AC blt _080802AC
bl sub_800A5B4 bl ResetBlockReceivedFlags
b _080804F8 b _080804F8
.pool .pool
_080802EC: _080802EC:
@ -1876,7 +1876,7 @@ sub_80807BC: @ 80807BC
sub sp, 0x1C sub sp, 0x1C
movs r0, 0 movs r0, 0
mov r10, r0 mov r10, r0
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080807DE beq _080807DE
@ -3330,7 +3330,7 @@ sub_80814B0: @ 80814B0
lsrs r1, 16 lsrs r1, 16
lsls r2, 16 lsls r2, 16
lsrs r2, 16 lsrs r2, 16
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080814E4 beq _080814E4
@ -3633,7 +3633,7 @@ sub_8081744: @ 8081744
push {r4-r6,lr} push {r4-r6,lr}
movs r4, 0 movs r4, 0
movs r6, 0 movs r6, 0
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _0808175A beq _0808175A
@ -4702,7 +4702,7 @@ _08081F7C:
sub_8081F94: @ 8081F94 sub_8081F94: @ 8081F94
push {lr} push {lr}
adds r1, r0, 0 adds r1, r0, 0
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _08081FB8 beq _08081FB8
@ -4810,7 +4810,7 @@ _08082078:
adds r1, 0x4C adds r1, 0x4C
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080820B0 beq _080820B0
@ -4848,7 +4848,7 @@ _080820E0:
bne _080820EC bne _080820EC
b _0808249E b _0808249E
_080820EC: _080820EC:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _0808218C beq _0808218C
@ -4911,7 +4911,7 @@ _08082132:
adds r1, r4 adds r1, r4
movs r0, 0 movs r0, 0
movs r2, 0x20 movs r2, 0x20
bl link_0800A448 bl SendBlock
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08082172 bne _08082172
@ -4941,7 +4941,7 @@ _0808218C:
strh r2, [r0] strh r2, [r0]
movs r0, 0 movs r0, 0
movs r2, 0x28 movs r2, 0x28
bl link_0800A448 bl SendBlock
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080821BE bne _080821BE
@ -4951,20 +4951,20 @@ _080821BE:
b _0808245C b _0808245C
.pool .pool
_080821C8: _080821C8:
bl sub_800A550 bl GetBlockReceivedStatus
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080821D4 bne _080821D4
b _0808249E b _0808249E
_080821D4: _080821D4:
bl sub_800A5B4 bl ResetBlockReceivedFlags
ldr r5, =gUnknown_020322A4 ldr r5, =gUnknown_020322A4
ldr r1, [r5] ldr r1, [r5]
adds r1, 0x63 adds r1, 0x63
ldrb r0, [r1] ldrb r0, [r1]
adds r0, 0x1 adds r0, 0x1
strb r0, [r1] strb r0, [r1]
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _08082254 beq _08082254
@ -4972,7 +4972,7 @@ _080821D4:
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _08082254 beq _08082254
ldr r2, =gUnknown_020223C4 ldr r2, =gBlockRecvBuffer
ldr r3, [r5] ldr r3, [r5]
ldrh r0, [r2, 0x4] ldrh r0, [r2, 0x4]
adds r1, r3, 0 adds r1, r3, 0
@ -5016,7 +5016,7 @@ _08082220:
b _0808249E b _0808249E
.pool .pool
_08082254: _08082254:
ldr r2, =gUnknown_020223C4 ldr r2, =gBlockRecvBuffer
ldr r0, =gUnknown_020322A4 ldr r0, =gUnknown_020322A4
ldr r3, [r0] ldr r3, [r0]
ldrh r0, [r2, 0x4] ldrh r0, [r2, 0x4]
@ -5748,7 +5748,7 @@ _080828BC:
strb r0, [r1] strb r0, [r1]
b _080828DC b _080828DC
_080828C6: _080828C6:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r4, [r0] ldrb r4, [r0]
cmp r4, 0 cmp r4, 0
bne _080828DC bne _080828DC
@ -5966,7 +5966,7 @@ _08082A92:
thumb_func_start sub_8082AD4 thumb_func_start sub_8082AD4
sub_8082AD4: @ 8082AD4 sub_8082AD4: @ 8082AD4
push {r4-r7,lr} push {r4-r7,lr}
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _08082AE0 bne _08082AE0
@ -6242,7 +6242,7 @@ sub_8082D18: @ 8082D18
sub_8082D28: @ 8082D28 sub_8082D28: @ 8082D28
push {r4,lr} push {r4,lr}
movs r1, 0 movs r1, 0
ldr r4, =gUnknown_03003124 ldr r4, =gReceivedRemoteLinkPlayers
ldrb r0, [r4] ldrb r0, [r4]
cmp r0, 0 cmp r0, 0
beq _08082D3C beq _08082D3C
@ -7909,7 +7909,7 @@ _08083A80:
cmp r5, r0 cmp r5, r0
bcc _08083A80 bcc _08083A80
_08083A9E: _08083A9E:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _08083AB4 bne _08083AB4
@ -8514,7 +8514,7 @@ sub_8083F94: @ 8083F94
strb r0, [r7, 0xC] strb r0, [r7, 0xC]
movs r0, 0xFF movs r0, 0xFF
strb r0, [r7] strb r0, [r7]
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080840C4 beq _080840C4

34
asm/cable_club.s
View File

@ -1030,7 +1030,7 @@ sub_80B2C30: @ 80B2C30
bl sub_80B24F8 bl sub_80B24F8
cmp r0, 0x1 cmp r0, 0x1
beq _080B2C9C beq _080B2C9C
bl sub_800A550 bl GetBlockReceivedStatus
adds r4, r0, 0 adds r4, r0, 0
bl sub_800A9A8 bl sub_800A9A8
lsls r4, 24 lsls r4, 24
@ -1047,7 +1047,7 @@ _080B2C5C:
ldr r1, =gUnknown_02039B58 ldr r1, =gUnknown_02039B58
adds r0, r1 adds r0, r1
lsls r1, r4, 8 lsls r1, r4, 8
ldr r2, =gUnknown_020223C4 ldr r2, =gBlockRecvBuffer
adds r1, r2 adds r1, r2
lsls r2, r4, 3 lsls r2, r4, 3
subs r2, r4 subs r2, r4
@ -1066,7 +1066,7 @@ _080B2C7E:
bcc _080B2C5C bcc _080B2C5C
movs r0, 0 movs r0, 0
bl sub_800B330 bl sub_800B330
bl sub_800A5B4 bl ResetBlockReceivedFlags
ldr r0, =gScriptResult ldr r0, =gScriptResult
adds r1, r5, 0 adds r1, r5, 0
bl task_map_chg_seq_0807EC34 bl task_map_chg_seq_0807EC34
@ -1082,7 +1082,7 @@ sub_80B2CB0: @ 80B2CB0
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _080B2CDE bne _080B2CDE
@ -1434,7 +1434,7 @@ _080B2FA8:
bl DestroyTask bl DestroyTask
b _080B2FC6 b _080B2FC6
_080B2FB4: _080B2FB4:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _080B2FC6 bne _080B2FC6
@ -1706,7 +1706,7 @@ sub_80B3220: @ 80B3220
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0x1 cmp r0, 0x1
bne _080B3248 bne _080B3248
@ -1836,7 +1836,7 @@ _080B3338:
bl sub_800AC34 bl sub_800AC34
b _080B3346 b _080B3346
_080B333E: _080B333E:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
_080B3342: _080B3342:
cmp r0, 0 cmp r0, 0
@ -1872,7 +1872,7 @@ _080B3378:
lsls r2, 4 lsls r2, 4
adds r0, r2, 0 adds r0, r2, 0
strh r0, [r1] strh r0, [r1]
ldr r0, =sub_8036760 ldr r0, =CB2_InitBattle
bl SetMainCallback2 bl SetMainCallback2
ldr r1, =gMain ldr r1, =gMain
ldr r0, =sub_80B360C ldr r0, =sub_80B360C
@ -1948,13 +1948,13 @@ _080B3444:
ldr r1, =gUnknown_020229CC ldr r1, =gUnknown_020229CC
movs r0, 0 movs r0, 0
movs r2, 0x1C movs r2, 0x1C
bl link_0800A448 bl SendBlock
movs r0, 0x3 movs r0, 0x3
strh r0, [r6] strh r0, [r6]
b _080B3532 b _080B3532
.pool .pool
_080B3458: _080B3458:
bl sub_800A550 bl GetBlockReceivedStatus
adds r4, r0, 0 adds r4, r0, 0
bl sub_800A9D8 bl sub_800A9D8
lsls r4, 24 lsls r4, 24
@ -1967,7 +1967,7 @@ _080B3458:
.pool .pool
_080B3474: _080B3474:
lsls r1, r4, 8 lsls r1, r4, 8
ldr r2, =gUnknown_020223C4 ldr r2, =gBlockRecvBuffer
adds r0, r5, 0 adds r0, r5, 0
adds r1, r2 adds r1, r2
ldm r1!, {r2,r3,r7} ldm r1!, {r2,r3,r7}
@ -2045,7 +2045,7 @@ _080B3504:
lsls r3, 4 lsls r3, 4
adds r0, r3, 0 adds r0, r3, 0
strh r0, [r1] strh r0, [r1]
ldr r0, =sub_8036760 ldr r0, =CB2_InitBattle
bl SetMainCallback2 bl SetMainCallback2
ldr r1, =gMain ldr r1, =gMain
ldr r0, =sub_80B360C ldr r0, =sub_80B360C
@ -2128,7 +2128,7 @@ _080B35C8:
b _080B35FE b _080B35FE
.pool .pool
_080B35E0: _080B35E0:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _080B35FE bne _080B35FE
@ -2425,7 +2425,7 @@ _080B3864:
b _080B3884 b _080B3884
.pool .pool
_080B3870: _080B3870:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _080B3884 bne _080B3884
@ -2657,7 +2657,7 @@ task00_08081A90: @ 80B3A30
adds r0, r4, 0 adds r0, r4, 0
bl DestroyTask bl DestroyTask
_080B3A62: _080B3A62:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080B3AA6 beq _080B3AA6
@ -2691,7 +2691,7 @@ sub_80B3AAC: @ 80B3AAC
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _080B3AC4 bne _080B3AC4
@ -2804,7 +2804,7 @@ _080B3B96:
strh r0, [r5] strh r0, [r5]
b _080B3BB8 b _080B3BB8
_080B3B9E: _080B3B9E:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0x1 cmp r0, 0x1
bne _080B3BB8 bne _080B3BB8

48
asm/contest.s
View File

@ -45,10 +45,10 @@ sub_80D7678: @ 80D7678
lsls r1, 7 lsls r1, 7
movs r0, 0 movs r0, 0
bl SetGpuRegBits bl SetGpuRegBits
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r1, [r0] strh r1, [r0]
ldr r0, =gBattle_BG1_X ldr r0, =gBattle_BG1_X
strh r1, [r0] strh r1, [r0]
@ -60,15 +60,15 @@ sub_80D7678: @ 80D7678
strh r1, [r0] strh r1, [r0]
ldr r0, =gBattle_BG3_X ldr r0, =gBattle_BG3_X
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E22 ldr r0, =gBattle_BG3_Y
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E26 ldr r0, =gBattle_WIN0V
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E28 ldr r0, =gBattle_WIN1H
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E2A ldr r0, =gBattle_WIN1V
strh r1, [r0] strh r1, [r0]
pop {r4} pop {r4}
pop {r0} pop {r0}
@ -546,8 +546,8 @@ _080D7B4E:
ldr r0, =gUnknown_02039F38 ldr r0, =gUnknown_02039F38
strb r5, [r0] strb r5, [r0]
bl sub_80D7988 bl sub_80D7988
bl init_uns_table_pokemon_copy bl AllocateMonSpritesGfx
ldr r4, =gBattleSpritesGfx ldr r4, =gMonSpritesGfxPtr
ldr r0, [r4] ldr r0, [r4]
ldr r0, [r0] ldr r0, [r0]
bl Free bl Free
@ -1316,11 +1316,11 @@ _080D8266:
thumb_func_start vblank_cb_battle thumb_func_start vblank_cb_battle
vblank_cb_battle: @ 80D827C vblank_cb_battle: @ 80D827C
push {lr} push {lr}
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x10 movs r0, 0x10
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x12 movs r0, 0x12
bl SetGpuReg bl SetGpuReg
@ -1344,23 +1344,23 @@ vblank_cb_battle: @ 80D827C
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x1C movs r0, 0x1C
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02022E22 ldr r0, =gBattle_BG3_Y
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x1E movs r0, 0x1E
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x40 movs r0, 0x40
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02022E26 ldr r0, =gBattle_WIN0V
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x44 movs r0, 0x44
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02022E28 ldr r0, =gBattle_WIN1H
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x42 movs r0, 0x42
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02022E2A ldr r0, =gBattle_WIN1V
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x46 movs r0, 0x46
bl SetGpuReg bl SetGpuReg
@ -1387,7 +1387,7 @@ sub_80D833C: @ 80D833C
ldrsh r1, [r4, r0] ldrsh r1, [r4, r0]
cmp r1, 0 cmp r1, 0
bne _080D840C bne _080D840C
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r1, [r0] strh r1, [r0]
ldr r0, =gBattle_BG2_Y ldr r0, =gBattle_BG2_Y
strh r1, [r0] strh r1, [r0]
@ -1517,7 +1517,7 @@ sub_80D8490: @ 80D8490
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r9, r0 mov r9, r0
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
movs r1, 0xA0 movs r1, 0xA0
strh r1, [r0] strh r1, [r0]
ldr r0, =gBattle_BG2_Y ldr r0, =gBattle_BG2_Y
@ -1770,7 +1770,7 @@ _080D86E4:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_80DEC30 bl sub_80DEC30
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gBattle_BG2_Y ldr r0, =gBattle_BG2_Y
@ -2041,7 +2041,7 @@ sub_80D895C: @ 80D895C
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
bl sub_80DB89C bl sub_80DB89C
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gBattle_BG2_Y ldr r0, =gBattle_BG2_Y
@ -5322,7 +5322,7 @@ sub_80DA5E8: @ 80DA5E8
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gBattle_BG2_Y ldr r0, =gBattle_BG2_Y
@ -6741,7 +6741,7 @@ sub_80DB174: @ 80DB174
lsls r0, r5, 3 lsls r0, r5, 3
ldr r1, =gMonBackPicTable ldr r1, =gMonBackPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
ldr r1, [r1, 0x4] ldr r1, [r1, 0x4]
adds r2, r5, 0 adds r2, r5, 0
@ -6753,7 +6753,7 @@ _080DB1B8:
lsls r0, r5, 3 lsls r0, r5, 3
ldr r1, =gMonBackPicTable ldr r1, =gMonBackPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
ldr r1, [r1, 0x4] ldr r1, [r1, 0x4]
adds r2, r5, 0 adds r2, r5, 0
@ -8516,7 +8516,7 @@ _080DBF62:
thumb_func_start sub_80DBF68 thumb_func_start sub_80DBF68
sub_80DBF68: @ 80DBF68 sub_80DBF68: @ 80DBF68
push {lr} push {lr}
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gBattle_BG2_Y ldr r0, =gBattle_BG2_Y

60
asm/contest_link_80F57C4.s
View File

@ -92,10 +92,10 @@ _080F57E0:
lsls r1, 8 lsls r1, 8
movs r0, 0 movs r0, 0
bl SetGpuRegBits bl SetGpuRegBits
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r1, [r0] strh r1, [r0]
ldr r0, =gBattle_BG1_X ldr r0, =gBattle_BG1_X
strh r1, [r0] strh r1, [r0]
@ -107,15 +107,15 @@ _080F57E0:
strh r1, [r0] strh r1, [r0]
ldr r0, =gBattle_BG3_X ldr r0, =gBattle_BG3_X
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E22 ldr r0, =gBattle_BG3_Y
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E26 ldr r0, =gBattle_WIN0V
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E28 ldr r0, =gBattle_WIN1H
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E2A ldr r0, =gBattle_WIN1V
strh r1, [r0] strh r1, [r0]
pop {r4} pop {r4}
pop {r0} pop {r0}
@ -387,10 +387,10 @@ sub_80F5B00: @ 80F5B00
strb r0, [r1, 0x2] strb r0, [r1, 0x2]
ldr r0, =sub_80F5C00 ldr r0, =sub_80F5C00
bl SetMainCallback2 bl SetMainCallback2
ldr r1, =gUnknown_02022E28 ldr r1, =gBattle_WIN1H
movs r0, 0xF0 movs r0, 0xF0
strh r0, [r1] strh r0, [r1]
ldr r1, =gUnknown_02022E2A ldr r1, =gBattle_WIN1V
ldr r2, =0x000080a0 ldr r2, =0x000080a0
adds r0, r2, 0 adds r0, r2, 0
strh r0, [r1] strh r0, [r1]
@ -441,11 +441,11 @@ sub_80F5C00: @ 80F5C00
thumb_func_start sub_80F5C24 thumb_func_start sub_80F5C24
sub_80F5C24: @ 80F5C24 sub_80F5C24: @ 80F5C24
push {lr} push {lr}
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x10 movs r0, 0x10
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x12 movs r0, 0x12
bl SetGpuReg bl SetGpuReg
@ -469,23 +469,23 @@ sub_80F5C24: @ 80F5C24
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x1C movs r0, 0x1C
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02022E22 ldr r0, =gBattle_BG3_Y
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x1E movs r0, 0x1E
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02022E24 ldr r0, =gBattle_WIN0H
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x40 movs r0, 0x40
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02022E26 ldr r0, =gBattle_WIN0V
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x44 movs r0, 0x44
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02022E28 ldr r0, =gBattle_WIN1H
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x42 movs r0, 0x42
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02022E2A ldr r0, =gBattle_WIN1V
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x46 movs r0, 0x46
bl SetGpuReg bl SetGpuReg
@ -702,7 +702,7 @@ sub_80F5ED8: @ 80F5ED8
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080F5EFC beq _080F5EFC
@ -1347,10 +1347,10 @@ _080F643C:
.4byte _080F6638 .4byte _080F6638
.4byte _080F667C .4byte _080F667C
_080F6454: _080F6454:
ldr r1, =gUnknown_02022E24 ldr r1, =gBattle_WIN0H
movs r0, 0xF0 movs r0, 0xF0
strh r0, [r1] strh r0, [r1]
ldr r1, =gUnknown_02022E26 ldr r1, =gBattle_WIN0V
ldr r3, =0x00005050 ldr r3, =0x00005050
adds r0, r3, 0 adds r0, r3, 0
strh r0, [r1] strh r0, [r1]
@ -1364,7 +1364,7 @@ _080F6454:
mov r9, r4 mov r9, r4
ldr r4, =gMonFrontPicTable ldr r4, =gMonFrontPicTable
mov r12, r4 mov r12, r4
ldr r4, =gBattleSpritesGfx ldr r4, =gMonSpritesGfxPtr
mov r8, r4 mov r8, r4
cmp r0, 0 cmp r0, 0
beq _080F648C beq _080F648C
@ -1494,7 +1494,7 @@ _080F65A4:
strh r0, [r4, 0xC] strh r0, [r4, 0xC]
_080F65BA: _080F65BA:
ldrb r2, [r4, 0xC] ldrb r2, [r4, 0xC]
ldr r3, =gUnknown_02022E26 ldr r3, =gBattle_WIN0V
movs r0, 0x50 movs r0, 0x50
subs r0, r2 subs r0, r2
lsls r0, 8 lsls r0, 8
@ -1556,7 +1556,7 @@ _080F6638:
ldrb r0, [r0, 0x6] ldrb r0, [r0, 0x6]
cmp r0, 0x2 cmp r0, 0x2
bne _080F669C bne _080F669C
ldr r3, =gUnknown_02022E26 ldr r3, =gBattle_WIN0V
ldrh r0, [r3] ldrh r0, [r3]
lsrs r2, r0, 8 lsrs r2, r0, 8
adds r0, r2, 0x2 adds r0, r2, 0x2
@ -1706,7 +1706,7 @@ sub_80F677C: @ 80F677C
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _080F67AC bne _080F67AC
@ -1842,7 +1842,7 @@ sub_80F68B4: @ 80F68B4
ldrh r3, [r2] ldrh r3, [r2]
adds r0, r3, 0x2 adds r0, r3, 0x2
strh r0, [r2] strh r0, [r2]
ldr r4, =gUnknown_02022E22 ldr r4, =gBattle_BG3_Y
ldrh r5, [r4] ldrh r5, [r4]
adds r1, r5, 0x1 adds r1, r5, 0x1
strh r1, [r4] strh r1, [r4]
@ -2870,10 +2870,10 @@ _080F70BE:
adds r5, 0x1 adds r5, 0x1
cmp r5, 0x2 cmp r5, 0x2
ble _080F70BE ble _080F70BE
ldr r1, =gUnknown_02022E24 ldr r1, =gBattle_WIN0H
movs r0, 0xF0 movs r0, 0xF0
strh r0, [r1] strh r0, [r1]
ldr r2, =gUnknown_02022E26 ldr r2, =gBattle_WIN0V
ldrh r1, [r4, 0x22] ldrh r1, [r4, 0x22]
adds r0, r1, 0 adds r0, r1, 0
subs r0, 0x10 subs r0, 0x10
@ -2910,8 +2910,8 @@ sub_80F7144: @ 80F7144
orrs r0, r1 orrs r0, r1
mov r1, r12 mov r1, r12
strb r0, [r1] strb r0, [r1]
ldr r7, =gUnknown_02022E24 ldr r7, =gBattle_WIN0H
ldr r6, =gUnknown_02022E26 ldr r6, =gBattle_WIN0V
adds r5, r3, 0 adds r5, r3, 0
movs r4, 0x4 movs r4, 0x4
adds r2, 0x2E adds r2, 0x2E
@ -4522,7 +4522,7 @@ sub_80F7DF4: @ 80F7DF4
bl AllocZeroed bl AllocZeroed
ldr r1, [r4] ldr r1, [r4]
str r0, [r1, 0x1C] str r0, [r1, 0x1C]
bl init_uns_table_pokemon_copy bl AllocateMonSpritesGfx
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
@ -5633,7 +5633,7 @@ sub_80F87B4: @ 80F87B4
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _080F87D0 bne _080F87D0

40
asm/contest_link_80FC4F4.s
View File

@ -21,7 +21,7 @@ sub_80FC4F4: @ 80FC4F4
lsrs r0, 24 lsrs r0, 24
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl link_0800A448 bl SendBlock
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080FC528 bne _080FC528
@ -45,7 +45,7 @@ sub_80FC530: @ 80FC530
lsls r4, 17 lsls r4, 17
lsls r4, r5 lsls r4, r5
lsrs r4, 24 lsrs r4, 24
bl sub_800A550 bl GetBlockReceivedStatus
ands r4, r0 ands r4, r0
cmp r4, 0 cmp r4, 0
beq _080FC552 beq _080FC552
@ -64,7 +64,7 @@ _080FC554:
thumb_func_start sub_80FC55C thumb_func_start sub_80FC55C
sub_80FC55C: @ 80FC55C sub_80FC55C: @ 80FC55C
push {r4,lr} push {r4,lr}
bl sub_800A550 bl GetBlockReceivedStatus
adds r4, r0, 0 adds r4, r0, 0
bl sub_800A9D8 bl sub_800A9D8
lsls r4, 24 lsls r4, 24
@ -74,7 +74,7 @@ sub_80FC55C: @ 80FC55C
movs r0, 0 movs r0, 0
b _080FC57A b _080FC57A
_080FC574: _080FC574:
bl sub_800A5B4 bl ResetBlockReceivedFlags
movs r0, 0x1 movs r0, 0x1
_080FC57A: _080FC57A:
pop {r4} pop {r4}
@ -90,7 +90,7 @@ sub_80FC580: @ 80FC580
movs r1, 0 movs r1, 0
ldr r5, =gTasks ldr r5, =gTasks
ldr r6, =sub_80FC5C0 ldr r6, =sub_80FC5C0
ldr r4, =gUnknown_020223C4 ldr r4, =gBlockRecvBuffer
movs r3, 0xFF movs r3, 0xFF
_080FC590: _080FC590:
lsls r0, r1, 8 lsls r0, r1, 8
@ -134,7 +134,7 @@ sub_80FC5DC: @ 80FC5DC
push {r4-r7,lr} push {r4-r7,lr}
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080FC650 beq _080FC650
@ -324,7 +324,7 @@ _080FC770:
ldr r0, =gUnknown_02039E00 ldr r0, =gUnknown_02039E00
adds r4, r0 adds r4, r0
lsls r1, r5, 8 lsls r1, r5, 8
ldr r0, =gUnknown_020223C4 ldr r0, =gBlockRecvBuffer
adds r1, r0 adds r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x40 movs r2, 0x40
@ -430,7 +430,7 @@ _080FC858:
cmp r0, 0 cmp r0, 0
beq _080FC880 beq _080FC880
ldr r0, =gRngValue ldr r0, =gRngValue
ldr r4, =gUnknown_020223C4 ldr r4, =gBlockRecvBuffer
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x4 movs r2, 0x4
bl memcpy bl memcpy
@ -517,7 +517,7 @@ _080FC90C:
ldrb r0, [r1] ldrb r0, [r1]
cmp r3, r0 cmp r3, r0
bge _080FC93A bge _080FC93A
ldr r4, =gUnknown_020223C4 ldr r4, =gBlockRecvBuffer
adds r0, r7, 0x2 adds r0, r7, 0x2
adds r2, r5, r0 adds r2, r5, r0
movs r5, 0x80 movs r5, 0x80
@ -690,7 +690,7 @@ _080FCA68:
bge _080FCAA4 bge _080FCAA4
ldr r1, =gUnknown_02039F34 ldr r1, =gUnknown_02039F34
mov r8, r1 mov r8, r1
ldr r4, =gUnknown_020223C4 ldr r4, =gBlockRecvBuffer
movs r3, 0 movs r3, 0
movs r7, 0x80 movs r7, 0x80
lsls r7, 1 lsls r7, 1
@ -784,7 +784,7 @@ _080FCB50:
ldr r1, =gUnknown_02039F2B ldr r1, =gUnknown_02039F2B
ldrb r1, [r1] ldrb r1, [r1]
lsls r1, 8 lsls r1, 8
ldr r2, =gUnknown_020223C4 ldr r2, =gBlockRecvBuffer
adds r1, r2 adds r1, r2
movs r2, 0x8 movs r2, 0x8
b _080FCC50 b _080FCC50
@ -827,7 +827,7 @@ _080FCBA4:
ldr r1, =gUnknown_02039F2B ldr r1, =gUnknown_02039F2B
ldrb r1, [r1] ldrb r1, [r1]
lsls r1, 8 lsls r1, 8
ldr r2, =gUnknown_020223C4 ldr r2, =gBlockRecvBuffer
adds r1, r2 adds r1, r2
movs r2, 0x8 movs r2, 0x8
b _080FCC50 b _080FCC50
@ -850,7 +850,7 @@ _080FCBE0:
ldr r1, =gUnknown_02039F2B ldr r1, =gUnknown_02039F2B
ldrb r1, [r1] ldrb r1, [r1]
lsls r1, 8 lsls r1, 8
ldr r2, =gUnknown_020223C4 ldr r2, =gBlockRecvBuffer
adds r1, r2 adds r1, r2
movs r2, 0x8 movs r2, 0x8
b _080FCC50 b _080FCC50
@ -885,7 +885,7 @@ _080FCC38:
ldr r1, =gUnknown_02039F2B ldr r1, =gUnknown_02039F2B
ldrb r1, [r1] ldrb r1, [r1]
lsls r1, 8 lsls r1, 8
ldr r2, =gUnknown_020223C4 ldr r2, =gBlockRecvBuffer
adds r1, r2 adds r1, r2
movs r2, 0x4 movs r2, 0x4
_080FCC50: _080FCC50:
@ -974,7 +974,7 @@ _080FCD10:
ldr r1, =gUnknown_02039F2B ldr r1, =gUnknown_02039F2B
ldrb r1, [r1] ldrb r1, [r1]
lsls r1, 8 lsls r1, 8
ldr r2, =gUnknown_020223C4 ldr r2, =gBlockRecvBuffer
adds r1, r2 adds r1, r2
movs r2, 0x70 movs r2, 0x70
b _080FCE10 b _080FCE10
@ -1021,7 +1021,7 @@ _080FCD6C:
ldr r1, =gUnknown_02039F2B ldr r1, =gUnknown_02039F2B
ldrb r1, [r1] ldrb r1, [r1]
lsls r1, 8 lsls r1, 8
ldr r2, =gUnknown_020223C4 ldr r2, =gBlockRecvBuffer
adds r1, r2 adds r1, r2
movs r2, 0x14 movs r2, 0x14
b _080FCE10 b _080FCE10
@ -1078,7 +1078,7 @@ _080FCE04:
ldr r1, =gUnknown_02039F2B ldr r1, =gUnknown_02039F2B
ldrb r1, [r1] ldrb r1, [r1]
lsls r1, 8 lsls r1, 8
ldr r2, =gUnknown_020223C4 ldr r2, =gBlockRecvBuffer
adds r1, r2 adds r1, r2
movs r2, 0x4 movs r2, 0x4
_080FCE10: _080FCE10:
@ -1169,7 +1169,7 @@ _080FCEC0:
beq _080FCF2E beq _080FCF2E
mov r1, r8 mov r1, r8
mov r8, r9 mov r8, r9
ldr r4, =gUnknown_020223C4 ldr r4, =gBlockRecvBuffer
adds r0, r7, 0 adds r0, r7, 0
adds r0, 0xA adds r0, 0xA
adds r2, r5, r0 adds r2, r5, r0
@ -1278,7 +1278,7 @@ _080FCF9C:
ldr r1, =gUnknown_02039F2B ldr r1, =gUnknown_02039F2B
ldrb r1, [r1] ldrb r1, [r1]
lsls r1, 8 lsls r1, 8
ldr r2, =gUnknown_020223C4 ldr r2, =gBlockRecvBuffer
adds r1, r2 adds r1, r2
movs r2, 0x8 movs r2, 0x8
bl memcpy bl memcpy
@ -1344,7 +1344,7 @@ _080FD02C:
ldr r1, =gUnknown_02039F2B ldr r1, =gUnknown_02039F2B
ldrb r1, [r1] ldrb r1, [r1]
lsls r1, 8 lsls r1, 8
ldr r2, =gUnknown_020223C4 ldr r2, =gBlockRecvBuffer
adds r1, r2 adds r1, r2
movs r2, 0x4 movs r2, 0x4
bl memcpy bl memcpy

10
asm/contest_link_81D9DE4.s
View File

@ -469,7 +469,7 @@ _081DA1EC:
ldr r0, =gUnknown_02039E00 ldr r0, =gUnknown_02039E00
adds r4, r0 adds r4, r0
lsls r1, r5, 8 lsls r1, r5, 8
ldr r0, =gUnknown_020223C4 ldr r0, =gBlockRecvBuffer
adds r1, r0 adds r1, r0
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x40 movs r2, 0x40
@ -554,7 +554,7 @@ _081DA2AC:
cmp r0, 0 cmp r0, 0
beq _081DA2D4 beq _081DA2D4
ldr r0, =gRngValue ldr r0, =gRngValue
ldr r4, =gUnknown_020223C4 ldr r4, =gBlockRecvBuffer
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x4 movs r2, 0x4
bl memcpy bl memcpy
@ -641,7 +641,7 @@ _081DA35A:
mov r0, r8 mov r0, r8
adds r0, 0xA adds r0, 0xA
adds r3, r5, r0 adds r3, r5, r0
ldr r4, =gUnknown_020223C4 ldr r4, =gBlockRecvBuffer
mov r2, sp mov r2, sp
movs r5, 0x80 movs r5, 0x80
lsls r5, 1 lsls r5, 1
@ -744,7 +744,7 @@ _081DA42A:
mov r0, r8 mov r0, r8
adds r0, 0x2 adds r0, 0x2
adds r3, r5, r0 adds r3, r5, r0
ldr r4, =gUnknown_020223C4 ldr r4, =gBlockRecvBuffer
mov r2, sp mov r2, sp
movs r5, 0x80 movs r5, 0x80
lsls r5, 1 lsls r5, 1
@ -849,7 +849,7 @@ _081DA50C:
lsls r0, r3, 6 lsls r0, r3, 6
ldr r5, =gUnknown_02039E00 ldr r5, =gUnknown_02039E00
adds r0, r5 adds r0, r5
ldr r1, =gUnknown_020223C4 ldr r1, =gBlockRecvBuffer
movs r2, 0x4 movs r2, 0x4
subs r2, r3 subs r2, r3
lsls r2, 6 lsls r2, 6

6
asm/contest_painting.s
View File

@ -110,7 +110,7 @@ _0812FE94:
bl remove_some_task bl remove_some_task
movs r0, 0 movs r0, 0
bl SetVBlankCallback bl SetVBlankCallback
bl init_uns_table_pokemon_copy bl AllocateMonSpritesGfx
ldr r1, =gUnknown_030061C0 ldr r1, =gUnknown_030061C0
ldr r0, =gUnknown_02039F3C ldr r0, =gUnknown_02039F3C
str r0, [r1] str r0, [r1]
@ -581,7 +581,7 @@ sub_81302E8: @ 81302E8
lsls r0, r5, 3 lsls r0, r5, 3
ldr r1, =gMonFrontPicTable ldr r1, =gMonFrontPicTable
adds r0, r1 adds r0, r1
ldr r4, =gBattleSpritesGfx ldr r4, =gMonSpritesGfxPtr
ldr r1, [r4] ldr r1, [r4]
ldr r1, [r1, 0x8] ldr r1, [r1, 0x8]
ldr r2, [r6] ldr r2, [r6]
@ -600,7 +600,7 @@ _08130348:
lsls r0, r5, 3 lsls r0, r5, 3
ldr r1, =gMonBackPicTable ldr r1, =gMonBackPicTable
adds r0, r1 adds r0, r1
ldr r4, =gBattleSpritesGfx ldr r4, =gMonSpritesGfxPtr
ldr r1, [r4] ldr r1, [r4]
ldr r1, [r1, 0x4] ldr r1, [r1, 0x4]
ldr r2, [r6] ldr r2, [r6]

54
asm/evolution_scene.s
View File

@ -165,10 +165,10 @@ evolution_cutscene: @ 813DA8C
movs r1, 0 movs r1, 0
bl SetGpuReg bl SetGpuReg
bl ResetPaletteFade bl ResetPaletteFade
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
movs r2, 0 movs r2, 0
strh r2, [r0] strh r2, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r2, [r0] strh r2, [r0]
ldr r0, =gBattle_BG1_X ldr r0, =gBattle_BG1_X
strh r2, [r0] strh r2, [r0]
@ -183,14 +183,14 @@ evolution_cutscene: @ 813DA8C
lsls r2, 1 lsls r2, 1
adds r0, r2, 0 adds r0, r2, 0
strh r0, [r1] strh r0, [r1]
ldr r0, =gUnknown_02022E22 ldr r0, =gBattle_BG3_Y
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r1, =gBattleTerrain ldr r1, =gBattleTerrain
movs r0, 0x9 movs r0, 0x9
strb r0, [r1] strb r0, [r1]
bl c2_berry_program_update_menu bl c2_berry_program_update_menu
bl sub_8035AA4 bl LoadBattleTextboxAndBackground
bl ResetSpriteData bl ResetSpriteData
bl remove_some_task bl remove_some_task
bl ResetTasks bl ResetTasks
@ -202,7 +202,7 @@ evolution_cutscene: @ 813DA8C
bl AllocZeroed bl AllocZeroed
ldr r1, =gUnknown_0203AB80 ldr r1, =gUnknown_0203AB80
str r0, [r1] str r0, [r1]
bl init_uns_table_pokemon_copy bl AllocateMonSpritesGfx
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x2 movs r1, 0x2
mov r2, sp mov r2, sp
@ -235,7 +235,7 @@ evolution_cutscene: @ 813DA8C
lsls r0, r5, 3 lsls r0, r5, 3
ldr r1, =gMonFrontPicTable ldr r1, =gMonFrontPicTable
adds r0, r1 adds r0, r1
ldr r2, =gBattleSpritesGfx ldr r2, =gMonSpritesGfxPtr
ldr r1, [r2] ldr r1, [r2]
ldr r1, [r1, 0x8] ldr r1, [r1, 0x8]
adds r2, r5, 0 adds r2, r5, 0
@ -291,7 +291,7 @@ evolution_cutscene: @ 813DA8C
lsls r0, r1, 3 lsls r0, r1, 3
ldr r2, =gMonFrontPicTable ldr r2, =gMonFrontPicTable
adds r0, r2 adds r0, r2
ldr r2, =gBattleSpritesGfx ldr r2, =gMonSpritesGfxPtr
ldr r1, [r2] ldr r1, [r2]
ldr r1, [r1, 0x10] ldr r1, [r1, 0x10]
mov r2, r10 mov r2, r10
@ -460,9 +460,9 @@ sub_813DD7C: @ 813DD7C
movs r1, 0 movs r1, 0
bl SetGpuReg bl SetGpuReg
bl ResetPaletteFade bl ResetPaletteFade
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
strh r4, [r0] strh r4, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r4, [r0] strh r4, [r0]
ldr r0, =gBattle_BG1_X ldr r0, =gBattle_BG1_X
strh r4, [r0] strh r4, [r0]
@ -477,13 +477,13 @@ sub_813DD7C: @ 813DD7C
lsls r2, 1 lsls r2, 1
adds r0, r2, 0 adds r0, r2, 0
strh r0, [r1] strh r0, [r1]
ldr r0, =gUnknown_02022E22 ldr r0, =gBattle_BG3_Y
strh r4, [r0] strh r4, [r0]
ldr r1, =gBattleTerrain ldr r1, =gBattleTerrain
movs r0, 0x9 movs r0, 0x9
strb r0, [r1] strb r0, [r1]
bl c2_berry_program_update_menu bl c2_berry_program_update_menu
bl sub_8035AA4 bl LoadBattleTextboxAndBackground
bl ResetSpriteData bl ResetSpriteData
bl FreeAllSpritePalettes bl FreeAllSpritePalettes
ldr r1, =gReservedSpritePaletteCount ldr r1, =gReservedSpritePaletteCount
@ -492,7 +492,7 @@ sub_813DD7C: @ 813DD7C
lsls r0, r5, 3 lsls r0, r5, 3
ldr r1, =gMonFrontPicTable ldr r1, =gMonFrontPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
ldr r1, [r1, 0x10] ldr r1, [r1, 0x10]
adds r2, r5, 0 adds r2, r5, 0
@ -629,10 +629,10 @@ _0813DFE0:
ldr r1, =gReservedSpritePaletteCount ldr r1, =gReservedSpritePaletteCount
movs r0, 0x4 movs r0, 0x4
strb r0, [r1] strb r0, [r1]
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r1, [r0] strh r1, [r0]
ldr r0, =gBattle_BG1_X ldr r0, =gBattle_BG1_X
strh r1, [r0] strh r1, [r0]
@ -647,7 +647,7 @@ _0813DFE0:
lsls r3, 1 lsls r3, 1
adds r0, r3, 0 adds r0, r3, 0
strh r0, [r2] strh r0, [r2]
ldr r0, =gUnknown_02022E22 ldr r0, =gBattle_BG3_Y
strh r1, [r0] strh r1, [r0]
b _0813E180 b _0813E180
.pool .pool
@ -697,7 +697,7 @@ _0813E0A8:
lsls r0, r6, 3 lsls r0, r6, 3
ldr r1, =gMonFrontPicTable ldr r1, =gMonFrontPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
ldr r1, [r1, 0x10] ldr r1, [r1, 0x10]
adds r2, r6, 0 adds r2, r6, 0
@ -867,7 +867,7 @@ sub_813E1D4: @ 813E1D4
lsls r0, r5, 3 lsls r0, r5, 3
ldr r1, =gMonFrontPicTable ldr r1, =gMonFrontPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
ldr r1, [r1, 0x8] ldr r1, [r1, 0x8]
adds r2, r5, 0 adds r2, r5, 0
@ -941,9 +941,9 @@ sub_813E1D4: @ 813E1D4
mov r1, sp mov r1, sp
ldrh r1, [r1, 0x14] ldrh r1, [r1, 0x14]
strh r1, [r0, 0x1C] strh r1, [r0, 0x1C]
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
strh r4, [r0] strh r4, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r4, [r0] strh r4, [r0]
ldr r0, =gBattle_BG1_X ldr r0, =gBattle_BG1_X
strh r4, [r0] strh r4, [r0]
@ -958,7 +958,7 @@ sub_813E1D4: @ 813E1D4
lsls r2, 1 lsls r2, 1
adds r0, r2, 0 adds r0, r2, 0
strh r0, [r1] strh r0, [r1]
ldr r0, =gUnknown_02022E22 ldr r0, =gBattle_BG3_Y
strh r4, [r0] strh r4, [r0]
ldr r2, =gTextFlags ldr r2, =gTextFlags
ldrb r0, [r2] ldrb r0, [r2]
@ -3630,11 +3630,11 @@ nullsub_83: @ 813FCD8
thumb_func_start sub_813FCDC thumb_func_start sub_813FCDC
sub_813FCDC: @ 813FCDC sub_813FCDC: @ 813FCDC
push {lr} push {lr}
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x10 movs r0, 0x10
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x12 movs r0, 0x12
bl SetGpuReg bl SetGpuReg
@ -3658,7 +3658,7 @@ sub_813FCDC: @ 813FCDC
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x1C movs r0, 0x1C
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02022E22 ldr r0, =gBattle_BG3_Y
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x1E movs r0, 0x1E
bl SetGpuReg bl SetGpuReg
@ -3674,11 +3674,11 @@ sub_813FCDC: @ 813FCDC
thumb_func_start sub_813FD64 thumb_func_start sub_813FD64
sub_813FD64: @ 813FD64 sub_813FD64: @ 813FD64
push {lr} push {lr}
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x10 movs r0, 0x10
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x12 movs r0, 0x12
bl SetGpuReg bl SetGpuReg
@ -3702,7 +3702,7 @@ sub_813FD64: @ 813FD64
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x1C movs r0, 0x1C
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_02022E22 ldr r0, =gBattle_BG3_Y
ldrh r1, [r0] ldrh r1, [r0]
movs r0, 0x1E movs r0, 0x1E
bl SetGpuReg bl SetGpuReg
@ -3871,7 +3871,7 @@ sub_813FEE8: @ 813FEE8
.pool .pool
_0813FF28: _0813FF28:
ldr r7, =gBattle_BG3_X ldr r7, =gBattle_BG3_X
ldr r6, =gUnknown_02022E22 ldr r6, =gBattle_BG3_Y
_0813FF2C: _0813FF2C:
lsls r4, r5, 2 lsls r4, r5, 2
adds r4, r5 adds r4, r5

2
asm/field_screen.s
View File

@ -9010,7 +9010,7 @@ _080AF9C8:
strh r0, [r4] strh r0, [r4]
b _080AF9E8 b _080AF9E8
_080AF9D0: _080AF9D0:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _080AF9E8 bne _080AF9E8

298
asm/link.s
View File

File diff suppressed because it is too large Load Diff

2
asm/menu_helpers.s
View File

@ -533,7 +533,7 @@ sub_81221AC: @ 81221AC
bl is_c1_link_related_active bl is_c1_link_related_active
cmp r0, 0x1 cmp r0, 0x1
beq _081221BE beq _081221BE
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0x1 cmp r0, 0x1
bne _081221C8 bne _081221C8

8
asm/mystery_event_menu.s
View File

@ -337,7 +337,7 @@ _08178C54:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08178D00 beq _08178D00
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _08178C68 bne _08178C68
@ -435,13 +435,13 @@ _08178D28:
_08178D36: _08178D36:
b _08178E34 b _08178E34
_08178D38: _08178D38:
bl sub_800A550 bl GetBlockReceivedStatus
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08178D44 bne _08178D44
b _08178E58 b _08178E58
_08178D44: _08178D44:
bl sub_800A5B4 bl ResetBlockReceivedFlags
ldr r1, =gMain ldr r1, =gMain
movs r2, 0x87 movs r2, 0x87
lsls r2, 3 lsls r2, 3
@ -462,7 +462,7 @@ _08178D60:
b _08178E3C b _08178E3C
.pool .pool
_08178D74: _08178D74:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r6, [r0] ldrb r6, [r0]
cmp r6, 0 cmp r6, 0
bne _08178E58 bne _08178E58

4
asm/pokeblock_feed.s
View File

@ -95,7 +95,7 @@ _08179C48:
bl FreeAllSpritePalettes bl FreeAllSpritePalettes
b _08179D32 b _08179D32
_08179C4E: _08179C4E:
bl init_uns_table_pokemon_copy bl AllocateMonSpritesGfx
ldr r1, =gMain ldr r1, =gMain
movs r2, 0x87 movs r2, 0x87
lsls r2, 3 lsls r2, 3
@ -322,7 +322,7 @@ _08179E48:
lsls r0, r5, 3 lsls r0, r5, 3
ldr r1, =gMonFrontPicTable ldr r1, =gMonFrontPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
ldr r1, [r1, 0x8] ldr r1, [r1, 0x8]
adds r2, r5, 0 adds r2, r5, 0

10
asm/pokemon_summary_screen.s
View File

@ -127,7 +127,7 @@ _081BF9EE:
strb r1, [r0] strb r1, [r0]
movs r0, 0xFF movs r0, 0xFF
bl sub_81C488C bl sub_81C488C
ldr r0, =gBattleSpritesGfx ldr r0, =gMonSpritesGfxPtr
ldr r0, [r0] ldr r0, [r0]
cmp r0, 0 cmp r0, 0
bne _081BFA12 bne _081BFA12
@ -1284,7 +1284,7 @@ sub_81C0484: @ 81C0484
movs r2, 0x80 movs r2, 0x80
lsls r2, 1 lsls r2, 1
bl m4aMPlayVolumeControl bl m4aMPlayVolumeControl
ldr r0, =gBattleSpritesGfx ldr r0, =gMonSpritesGfxPtr
ldr r0, [r0] ldr r0, [r0]
cmp r0, 0 cmp r0, 0
bne _081C04E2 bne _081C04E2
@ -8807,7 +8807,7 @@ _081C4620:
lsls r0, r2, 3 lsls r0, r2, 3
ldr r1, =gMonFrontPicTable ldr r1, =gMonFrontPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
ldr r1, [r1, 0x8] ldr r1, [r1, 0x8]
b _081C46D6 b _081C46D6
@ -8817,12 +8817,12 @@ _081C4668:
lsls r0, r2, 3 lsls r0, r2, 3
ldr r1, =gMonFrontPicTable ldr r1, =gMonFrontPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
b _081C46B0 b _081C46B0
.pool .pool
_081C4680: _081C4680:
ldr r0, =gBattleSpritesGfx ldr r0, =gMonSpritesGfxPtr
ldr r3, [r0] ldr r3, [r0]
adds r4, r0, 0 adds r4, r0, 0
cmp r3, 0 cmp r3, 0

10
asm/pokenav.s
View File

@ -28252,7 +28252,7 @@ _081D4FB6:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _081D500C beq _081D500C
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _081D4FE6 beq _081D4FE6
@ -28280,7 +28280,7 @@ _081D4FEC:
strb r0, [r4] strb r0, [r4]
b _081D500C b _081D500C
_081D4FF8: _081D4FF8:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _081D500C bne _081D500C
@ -28673,13 +28673,13 @@ _081D5374:
bl sub_80097E8 bl sub_80097E8
b _081D53C0 b _081D53C0
_081D537A: _081D537A:
bl sub_800A550 bl GetBlockReceivedStatus
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _081D5386 bne _081D5386
b _081D548A b _081D548A
_081D5386: _081D5386:
bl sub_800A5B4 bl ResetBlockReceivedFlags
movs r0, 0xF movs r0, 0xF
strb r0, [r4, 0x8] strb r0, [r4, 0x8]
b _081D548A b _081D548A
@ -28694,7 +28694,7 @@ _081D5390:
b _081D548A b _081D548A
.pool .pool
_081D53A8: _081D53A8:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _081D548A bne _081D548A

8
asm/record_mixing.s
View File

@ -849,7 +849,7 @@ _080E745A:
strh r0, [r5, 0x20] strh r0, [r5, 0x20]
b _080E7566 b _080E7566
_080E7464: _080E7464:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _080E746E bne _080E746E
@ -1066,7 +1066,7 @@ sub_80E7630: @ 80E7630
ldr r1, =gTasks ldr r1, =gTasks
adds r0, r1 adds r0, r1
mov r10, r0 mov r10, r0
bl sub_800A550 bl GetBlockReceivedStatus
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [sp, 0x4] str r0, [sp, 0x4]
@ -1302,7 +1302,7 @@ sub_80E7810: @ 80E7810
sub_80E7820: @ 80E7820 sub_80E7820: @ 80E7820
lsls r0, 24 lsls r0, 24
lsrs r0, 16 lsrs r0, 16
ldr r1, =gUnknown_020223C4 ldr r1, =gBlockRecvBuffer
adds r0, r1 adds r0, r1
bx lr bx lr
.pool .pool
@ -2368,7 +2368,7 @@ _080E807C:
bl sub_800AC34 bl sub_800AC34
b _080E80F2 b _080E80F2
_080E8090: _080E8090:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _080E810A bne _080E810A

10
asm/recorded_battle.s
View File

@ -95,7 +95,7 @@ sub_8184E58: @ 8184E58
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0x1 cmp r0, 0x1
bne _08184EA0 bne _08184EA0
ldr r1, =gUnknown_0203BD2C ldr r1, =gRecordedBattleRngSeed
ldr r0, =gRngValue ldr r0, =gRngValue
ldr r0, [r0] ldr r0, [r0]
str r0, [r1] str r0, [r1]
@ -112,7 +112,7 @@ _08184EA0:
cmp r0, 0x2 cmp r0, 0x2
bne _08184EAC bne _08184EAC
ldr r0, =gRngValue ldr r0, =gRngValue
ldr r1, =gUnknown_0203BD2C ldr r1, =gRecordedBattleRngSeed
ldr r1, [r1] ldr r1, [r1]
str r1, [r0] str r1, [r0]
_08184EAC: _08184EAC:
@ -779,7 +779,7 @@ _081853BA:
movs r4, 0x9D movs r4, 0x9D
lsls r4, 3 lsls r4, 3
adds r1, r7, r4 adds r1, r7, r4
ldr r5, =gUnknown_0203BD2C ldr r5, =gRecordedBattleRngSeed
ldr r0, [r5] ldr r0, [r5]
str r0, [r1] str r0, [r1]
ldr r0, =gUnknown_0203C7B8 ldr r0, =gUnknown_0203C7B8
@ -1576,7 +1576,7 @@ sub_8185B1C: @ 8185B1C
ldr r0, =gMain ldr r0, =gMain
ldr r1, =sub_8185AB0 ldr r1, =sub_8185AB0
str r1, [r0, 0x8] str r1, [r0, 0x8]
ldr r0, =sub_8036760 ldr r0, =CB2_InitBattle
bl SetMainCallback2 bl SetMainCallback2
adds r0, r4, 0 adds r0, r4, 0
bl DestroyTask bl DestroyTask
@ -1701,7 +1701,7 @@ _08185C2A:
adds r6, 0x1 adds r6, 0x1
cmp r6, 0x3 cmp r6, 0x3
ble _08185BBE ble _08185BBE
ldr r1, =gUnknown_0203BD2C ldr r1, =gRecordedBattleRngSeed
movs r3, 0x9D movs r3, 0x9D
lsls r3, 3 lsls r3, 3
adds r0, r7, r3 adds r0, r7, r3

10
asm/reshow_battle_screen.s
View File

@ -98,10 +98,10 @@ _080A93B0:
movs r0, 0x3 movs r0, 0x3
bl ShowBg bl ShowBg
bl ResetPaletteFade bl ResetPaletteFade
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
strh r1, [r0] strh r1, [r0]
ldr r0, =gBattle_BG1_X ldr r0, =gBattle_BG1_X
strh r1, [r0] strh r1, [r0]
@ -113,7 +113,7 @@ _080A93B0:
strh r1, [r0] strh r1, [r0]
ldr r0, =gBattle_BG3_X ldr r0, =gBattle_BG3_X
strh r1, [r0] strh r1, [r0]
ldr r0, =gUnknown_02022E22 ldr r0, =gBattle_BG3_Y
strh r1, [r0] strh r1, [r0]
b _080A95D2 b _080A95D2
.pool .pool
@ -128,7 +128,7 @@ _080A942C:
b _080A95D2 b _080A95D2
.pool .pool
_080A9444: _080A9444:
bl sub_8035AA4 bl LoadBattleTextboxAndBackground
b _080A95D2 b _080A95D2
_080A944A: _080A944A:
bl ResetSpriteData bl ResetSpriteData
@ -275,7 +275,7 @@ _080A955C:
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080A95D2 beq _080A95D2
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080A95D2 beq _080A95D2

26
asm/rom3.s
View File

@ -5,8 +5,8 @@
.text .text
thumb_func_start battle_wireless_setup_if_required_maybe thumb_func_start HandleLinkBattleSetup
battle_wireless_setup_if_required_maybe: @ 8032654 HandleLinkBattleSetup: @ 8032654
push {lr} push {lr}
ldr r0, =gBattleTypeFlags ldr r0, =gBattleTypeFlags
ldr r0, [r0] ldr r0, [r0]
@ -20,7 +20,7 @@ battle_wireless_setup_if_required_maybe: @ 8032654
beq _0803266E beq _0803266E
bl sub_800B488 bl sub_800B488
_0803266E: _0803266E:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _0803267A bne _0803267A
@ -34,10 +34,10 @@ _08032686:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end battle_wireless_setup_if_required_maybe thumb_func_end HandleLinkBattleSetup
thumb_func_start sub_803269C thumb_func_start SetUpBattleVarsAndBirchZigzagoon
sub_803269C: @ 803269C SetUpBattleVarsAndBirchZigzagoon: @ 803269C
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x14 sub sp, 0x14
ldr r0, =gBattleMainFunc ldr r0, =gBattleMainFunc
@ -71,7 +71,7 @@ _080326B8:
adds r1, r0, 0 adds r1, r0, 0
cmp r1, 0x3 cmp r1, 0x3
ble _080326B8 ble _080326B8
bl battle_wireless_setup_if_required_maybe bl HandleLinkBattleSetup
ldr r0, =gBattleExecBuffer ldr r0, =gBattleExecBuffer
movs r5, 0 movs r5, 0
str r5, [r0] str r5, [r0]
@ -112,7 +112,7 @@ _08032728:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_803269C thumb_func_end SetUpBattleVarsAndBirchZigzagoon
thumb_func_start sub_8032768 thumb_func_start sub_8032768
sub_8032768: @ 8032768 sub_8032768: @ 8032768
@ -1790,7 +1790,7 @@ _080335A0:
ldr r1, [r5] ldr r1, [r5]
adds r1, r2 adds r1, r2
adds r2, r6, 0 adds r2, r6, 0
bl link_0800A448 bl SendBlock
ldrh r0, [r4, 0x1E] ldrh r0, [r4, 0x1E]
adds r0, 0x1 adds r0, 0x1
strh r0, [r4, 0x1E] strh r0, [r4, 0x1E]
@ -1857,7 +1857,7 @@ sub_8033648: @ 8033648
mov r6, r9 mov r6, r9
mov r5, r8 mov r5, r8
push {r5-r7} push {r5-r7}
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _08033738 beq _08033738
@ -1869,12 +1869,12 @@ sub_8033648: @ 8033648
beq _08033738 beq _08033738
bl sub_8011BD0 bl sub_8011BD0
movs r4, 0 movs r4, 0
ldr r0, =gUnknown_020223C4 ldr r0, =gBlockRecvBuffer
mov r10, r0 mov r10, r0
b _0803372C b _0803372C
.pool .pool
_08033680: _08033680:
bl sub_800A550 bl GetBlockReceivedStatus
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gBitTable ldr r2, =gBitTable
@ -1891,7 +1891,7 @@ _08033680:
lsls r0, r4, 8 lsls r0, r4, 8
mov r4, r10 mov r4, r10
adds r3, r0, r4 adds r3, r0, r4
ldr r1, =gUnknown_020223C8 ldr r1, =gBlockRecvBuffer + 4
adds r0, r1 adds r0, r1
ldrh r6, [r0] ldrh r6, [r0]
ldr r7, =gTasks ldr r7, =gTasks

14
asm/rom6.s
View File

@ -11564,7 +11564,7 @@ sub_813B534: @ 813B534
str r0, [r2] str r0, [r2]
movs r0, 0 movs r0, 0
str r0, [r1] str r0, [r1]
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _0813B552 bne _0813B552
@ -11651,11 +11651,11 @@ _0813B5FE:
lsrs r0, 24 lsrs r0, 24
ldr r1, =gSpecialVar_0x8004 ldr r1, =gSpecialVar_0x8004
movs r2, 0x2 movs r2, 0x2
bl link_0800A448 bl SendBlock
b _0813B708 b _0813B708
.pool .pool
_0813B614: _0813B614:
bl sub_800A550 bl GetBlockReceivedStatus
movs r1, 0x2 movs r1, 0x2
ands r1, r0 ands r1, r0
cmp r1, 0 cmp r1, 0
@ -11669,7 +11669,7 @@ _0813B622:
b _0813B790 b _0813B790
_0813B62E: _0813B62E:
ldr r5, =gSpecialVar_0x8005 ldr r5, =gSpecialVar_0x8005
ldr r0, =gUnknown_020223C4 ldr r0, =gBlockRecvBuffer
movs r1, 0x80 movs r1, 0x80
lsls r1, 1 lsls r1, 1
adds r0, r1 adds r0, r1
@ -11738,11 +11738,11 @@ _0813B6C2:
lsrs r0, 24 lsrs r0, 24
ldr r1, =gScriptResult ldr r1, =gScriptResult
movs r2, 0x2 movs r2, 0x2
bl link_0800A448 bl SendBlock
b _0813B708 b _0813B708
.pool .pool
_0813B6E4: _0813B6E4:
bl sub_800A550 bl GetBlockReceivedStatus
movs r1, 0x1 movs r1, 0x1
ands r1, r0 ands r1, r0
cmp r1, 0 cmp r1, 0
@ -11752,7 +11752,7 @@ _0813B6E4:
cmp r0, 0 cmp r0, 0
beq _0813B790 beq _0813B790
ldr r1, =gScriptResult ldr r1, =gScriptResult
ldr r0, =gUnknown_020223C4 ldr r0, =gBlockRecvBuffer
ldrh r0, [r0] ldrh r0, [r0]
strh r0, [r1] strh r0, [r1]
movs r0, 0 movs r0, 0

12
asm/rom_80A5C6C.s
View File

@ -5155,7 +5155,7 @@ sub_80A8394: @ 80A8394
bl AllocSpritePalette bl AllocSpritePalette
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r4, =gBattleSpritesGfx ldr r4, =gMonSpritesGfxPtr
ldr r0, [r4] ldr r0, [r4]
cmp r0, 0 cmp r0, 0
beq _080A8412 beq _080A8412
@ -5213,7 +5213,7 @@ _080A845E:
lsls r0, r6, 3 lsls r0, r6, 3
ldr r1, =gMonFrontPicTable ldr r1, =gMonFrontPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
movs r3, 0xBE movs r3, 0xBE
lsls r3, 1 lsls r3, 1
@ -5226,7 +5226,7 @@ _080A8488:
lsls r0, r6, 3 lsls r0, r6, 3
ldr r1, =gMonFrontPicTable ldr r1, =gMonFrontPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
movs r2, 0xBE movs r2, 0xBE
lsls r2, 1 lsls r2, 1
@ -5276,7 +5276,7 @@ _080A84F6:
lsls r0, r6, 3 lsls r0, r6, 3
ldr r1, =gMonBackPicTable ldr r1, =gMonBackPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
movs r2, 0xBE movs r2, 0xBE
lsls r2, 1 lsls r2, 1
@ -5294,7 +5294,7 @@ _080A8524:
lsls r0, r6, 3 lsls r0, r6, 3
ldr r1, =gMonBackPicTable ldr r1, =gMonBackPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
movs r3, 0xBE movs r3, 0xBE
lsls r3, 1 lsls r3, 1
@ -5305,7 +5305,7 @@ _080A8524:
mov r3, r8 mov r3, r8
bl LoadSpecialPokePic_2 bl LoadSpecialPokePic_2
_080A8540: _080A8540:
ldr r5, =gBattleSpritesGfx ldr r5, =gMonSpritesGfxPtr
ldr r0, [r5] ldr r0, [r5]
movs r4, 0xBE movs r4, 0xBE
lsls r4, 1 lsls r4, 1

10
asm/script_pokemon_util_80F87D8.s
View File

@ -670,7 +670,7 @@ sub_80F8D28: @ 80F8D28
beq _080F8D44 beq _080F8D44
b _080F8E9C b _080F8E9C
_080F8D44: _080F8D44:
bl init_uns_table_pokemon_copy bl AllocateMonSpritesGfx
movs r0, 0xA movs r0, 0xA
mov r9, r0 mov r9, r0
movs r1, 0x3 movs r1, 0x3
@ -710,7 +710,7 @@ _080F8D44:
lsls r0, r6, 3 lsls r0, r6, 3
ldr r1, =gMonFrontPicTable ldr r1, =gMonFrontPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
ldr r1, [r1, 0x8] ldr r1, [r1, 0x8]
adds r2, r6, 0 adds r2, r6, 0
@ -722,7 +722,7 @@ _080F8DC4:
lsls r0, r6, 3 lsls r0, r6, 3
ldr r1, =gMonFrontPicTable ldr r1, =gMonFrontPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
ldr r1, [r1, 0x8] ldr r1, [r1, 0x8]
adds r2, r6, 0 adds r2, r6, 0
@ -1093,7 +1093,7 @@ sub_80F90DC: @ 80F90DC
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _080F90FE beq _080F90FE
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080F90FE beq _080F90FE
@ -1116,7 +1116,7 @@ sub_80F910C: @ 80F910C
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _080F9126 beq _080F9126
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080F9126 beq _080F9126

66
asm/trade.s
View File

@ -18,7 +18,7 @@ sub_8077170: @ 8077170
lsrs r2, 16 lsrs r2, 16
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
bl link_0800A448 bl SendBlock
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
b _080771A2 b _080771A2
@ -83,7 +83,7 @@ _080771F8:
thumb_func_start sub_8077200 thumb_func_start sub_8077200
sub_8077200: @ 8077200 sub_8077200: @ 8077200
push {lr} push {lr}
bl sub_800A550 bl GetBlockReceivedStatus
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
pop {r1} pop {r1}
@ -103,7 +103,7 @@ sub_8077210: @ 8077210
b _08077230 b _08077230
.pool .pool
_0807722C: _0807722C:
bl sub_800A5B4 bl ResetBlockReceivedFlags
_08077230: _08077230:
pop {r0} pop {r0}
bx r0 bx r0
@ -397,7 +397,7 @@ _080774B2:
bl sub_807A19C bl sub_807A19C
movs r0, 0 movs r0, 0
bl ShowBg bl ShowBg
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r2, [r0] ldrb r2, [r0]
cmp r2, 0 cmp r2, 0
bne _0807754C bne _0807754C
@ -504,7 +504,7 @@ _080775D8:
b _08077B22 b _08077B22
.pool .pool
_080775E8: _080775E8:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0x1 cmp r0, 0x1
beq _080775F2 beq _080775F2
@ -1832,7 +1832,7 @@ sub_80781C8: @ 80781C8
b _08078244 b _08078244
.pool .pool
_08078220: _08078220:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r4, [r0] ldrb r4, [r0]
cmp r4, 0 cmp r4, 0
bne _08078244 bne _08078244
@ -2198,7 +2198,7 @@ _08078552:
adds r1, r5, 0 adds r1, r5, 0
eors r1, r2 eors r1, r2
lsls r1, 8 lsls r1, 8
ldr r2, =gUnknown_020223C4 ldr r2, =gBlockRecvBuffer
adds r1, r2 adds r1, r2
movs r2, 0xC8 movs r2, 0xC8
bl sub_8078438 bl sub_8078438
@ -2237,7 +2237,7 @@ _080785B6:
adds r1, r5, 0 adds r1, r5, 0
eors r1, r2 eors r1, r2
lsls r1, 8 lsls r1, 8
ldr r2, =gUnknown_020223C4 ldr r2, =gBlockRecvBuffer
adds r1, r2 adds r1, r2
movs r2, 0xC8 movs r2, 0xC8
bl sub_8078438 bl sub_8078438
@ -2276,7 +2276,7 @@ _0807861A:
adds r1, r5, 0 adds r1, r5, 0
eors r1, r2 eors r1, r2
lsls r1, 8 lsls r1, 8
ldr r2, =gUnknown_020223C4 ldr r2, =gBlockRecvBuffer
adds r1, r2 adds r1, r2
movs r2, 0xC8 movs r2, 0xC8
bl sub_8078438 bl sub_8078438
@ -2318,7 +2318,7 @@ _0807868A:
adds r1, r5, 0 adds r1, r5, 0
eors r1, r2 eors r1, r2
lsls r1, 8 lsls r1, 8
ldr r2, =gUnknown_020223C4 ldr r2, =gBlockRecvBuffer
adds r1, r2 adds r1, r2
movs r2, 0xD8 movs r2, 0xD8
bl sub_8078438 bl sub_8078438
@ -2360,7 +2360,7 @@ _080786F0:
adds r1, r5, 0 adds r1, r5, 0
eors r1, r2 eors r1, r2
lsls r1, 8 lsls r1, 8
ldr r2, =gUnknown_020223C4 ldr r2, =gBlockRecvBuffer
adds r1, r2 adds r1, r2
movs r2, 0xB movs r2, 0xB
bl sub_8078438 bl sub_8078438
@ -2467,7 +2467,7 @@ sub_80787E0: @ 80787E0
ands r0, r2 ands r0, r2
cmp r0, 0 cmp r0, 0
beq _08078864 beq _08078864
ldr r0, =gUnknown_020223C4 ldr r0, =gBlockRecvBuffer
ldrh r1, [r0] ldrh r1, [r0]
ldr r0, =0x0000bbbb ldr r0, =0x0000bbbb
cmp r1, r0 cmp r1, r0
@ -2521,7 +2521,7 @@ _08078864:
ands r0, r2 ands r0, r2
cmp r0, 0 cmp r0, 0
beq _080788F6 beq _080788F6
ldr r3, =gUnknown_020223C4 ldr r3, =gBlockRecvBuffer
movs r1, 0x80 movs r1, 0x80
lsls r1, 1 lsls r1, 1
adds r0, r3, r1 adds r0, r3, r1
@ -2597,7 +2597,7 @@ sub_8078900: @ 8078900
ands r0, r5 ands r0, r5
cmp r0, 0 cmp r0, 0
beq _080789E2 beq _080789E2
ldr r2, =gUnknown_020223C4 ldr r2, =gBlockRecvBuffer
ldrh r1, [r2] ldrh r1, [r2]
ldr r0, =0x0000ddee ldr r0, =0x0000ddee
cmp r1, r0 cmp r1, r0
@ -4052,7 +4052,7 @@ sub_80794CC: @ 80794CC
b _0807953A b _0807953A
.pool .pool
_08079518: _08079518:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _0807953A bne _0807953A
@ -6279,7 +6279,7 @@ _0807A718:
thumb_func_start sub_807A728 thumb_func_start sub_807A728
sub_807A728: @ 807A728 sub_807A728: @ 807A728
push {r4-r7,lr} push {r4-r7,lr}
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _0807A7B4 beq _0807A7B4
@ -7054,7 +7054,7 @@ _0807ACC4:
thumb_func_start sub_807ACDC thumb_func_start sub_807ACDC
sub_807ACDC: @ 807ACDC sub_807ACDC: @ 807ACDC
push {lr} push {lr}
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _0807ACF0 bne _0807ACF0
@ -7128,7 +7128,7 @@ _0807AD58:
lsls r0, r5, 3 lsls r0, r5, 3
ldr r1, =gMonFrontPicTable ldr r1, =gMonFrontPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
ldr r1, [r1, 0x8] ldr r1, [r1, 0x8]
adds r2, r5, 0 adds r2, r5, 0
@ -7141,7 +7141,7 @@ _0807AD94:
lsls r0, r5, 3 lsls r0, r5, 3
ldr r1, =gMonFrontPicTable ldr r1, =gMonFrontPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r2, [r1] ldr r2, [r1]
lsls r4, r6, 1 lsls r4, r6, 1
adds r1, r4, 0x1 adds r1, r4, 0x1
@ -7254,7 +7254,7 @@ _0807AE78:
.4byte _0807B0D4 .4byte _0807B0D4
.4byte _0807B0F0 .4byte _0807B0F0
_0807AEAC: _0807AEAC:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _0807AEC0 bne _0807AEC0
@ -7270,7 +7270,7 @@ _0807AEC0:
adds r0, r5, 0 adds r0, r5, 0
bl AllocZeroed bl AllocZeroed
str r0, [r4] str r0, [r4]
bl init_uns_table_pokemon_copy bl AllocateMonSpritesGfx
bl ResetTasks bl ResetTasks
bl ResetSpriteData bl ResetSpriteData
bl FreeAllSpritePalettes bl FreeAllSpritePalettes
@ -7321,7 +7321,7 @@ _0807AEC0:
b _0807B116 b _0807B116
.pool .pool
_0807AF58: _0807AF58:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r5, [r0] ldrb r5, [r0]
cmp r5, 0 cmp r5, 0
bne _0807AF90 bne _0807AF90
@ -7401,7 +7401,7 @@ _0807B000:
b _0807B116 b _0807B116
_0807B006: _0807B006:
bl sub_807AC64 bl sub_807AC64
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0x1 cmp r0, 0x1
beq _0807B014 beq _0807B014
@ -7729,7 +7729,7 @@ _0807B2D0:
adds r0, r5, 0 adds r0, r5, 0
bl AllocZeroed bl AllocZeroed
str r0, [r4] str r0, [r4]
bl init_uns_table_pokemon_copy bl AllocateMonSpritesGfx
bl ResetTasks bl ResetTasks
bl ResetSpriteData bl ResetSpriteData
bl FreeAllSpritePalettes bl FreeAllSpritePalettes
@ -7989,7 +7989,7 @@ _0807B566:
_0807B57C: _0807B57C:
mov r0, r9 mov r0, r9
bl sub_807B464 bl sub_807B464
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _0807B58E beq _0807B58E
@ -8029,7 +8029,7 @@ _0807B5D0:
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x74 adds r1, 0x74
movs r2, 0x14 movs r2, 0x14
bl link_0800A448 bl SendBlock
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x93 adds r1, 0x93
ldrb r0, [r1] ldrb r0, [r1]
@ -10369,7 +10369,7 @@ _0807CCEE:
lsls r0, r2, 3 lsls r0, r2, 3
ldr r1, =gMonFrontPicTable ldr r1, =gMonFrontPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
ldr r1, [r1, 0x10] ldr r1, [r1, 0x10]
ldr r3, [r3, 0x6C] ldr r3, [r3, 0x6C]
@ -12474,7 +12474,7 @@ _0807E13A:
lsls r0, r2, 3 lsls r0, r2, 3
ldr r1, =gMonFrontPicTable ldr r1, =gMonFrontPicTable
adds r0, r1 adds r0, r1
ldr r1, =gBattleSpritesGfx ldr r1, =gMonSpritesGfxPtr
ldr r1, [r1] ldr r1, [r1]
ldr r1, [r1, 0x10] ldr r1, [r1, 0x10]
ldr r3, [r3, 0x6C] ldr r3, [r3, 0x6C]
@ -12877,7 +12877,7 @@ _0807E4C2:
sub_807E4DC: @ 807E4DC sub_807E4DC: @ 807E4DC
push {r4-r6,lr} push {r4-r6,lr}
bl sub_807ACDC bl sub_807ACDC
bl sub_800A550 bl GetBlockReceivedStatus
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
movs r6, 0x1 movs r6, 0x1
@ -12885,7 +12885,7 @@ sub_807E4DC: @ 807E4DC
ands r0, r6 ands r0, r6
cmp r0, 0 cmp r0, 0
beq _0807E51A beq _0807E51A
ldr r4, =gUnknown_020223C4 ldr r4, =gBlockRecvBuffer
ldrh r1, [r4] ldrh r1, [r4]
ldr r0, =0x0000dcba ldr r0, =0x0000dcba
cmp r1, r0 cmp r1, r0
@ -12909,7 +12909,7 @@ _0807E51A:
ands r0, r5 ands r0, r5
cmp r0, 0 cmp r0, 0
beq _0807E542 beq _0807E542
ldr r0, =gUnknown_020223C4 ldr r0, =gBlockRecvBuffer
movs r1, 0x80 movs r1, 0x80
lsls r1, 1 lsls r1, 1
adds r0, r1 adds r0, r1
@ -13600,7 +13600,7 @@ _0807EAEC:
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x74 adds r1, 0x74
movs r2, 0x14 movs r2, 0x14
bl link_0800A448 bl SendBlock
ldr r0, [r4] ldr r0, [r4]
adds r0, 0x72 adds r0, 0x72
movs r1, 0x2 movs r1, 0x2
@ -14090,7 +14090,7 @@ _0807EFF0:
b _0807F03A b _0807F03A
.pool .pool
_0807F028: _0807F028:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r1, [r0] ldrb r1, [r0]
cmp r1, 0 cmp r1, 0
bne _0807F03A bne _0807F03A

20
asm/trainer_card.s
View File

@ -191,7 +191,7 @@ _080C2836:
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0x1 cmp r0, 0x1
bne _080C2852 bne _080C2852
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0x1 cmp r0, 0x1
bne _080C2852 bne _080C2852
@ -261,7 +261,7 @@ _080C28D8:
b _080C2ACA b _080C2ACA
.pool .pool
_080C28E4: _080C28E4:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r5, [r0] ldrb r5, [r0]
cmp r5, 0 cmp r5, 0
bne _080C290A bne _080C290A
@ -301,7 +301,7 @@ _080C293C:
bne _080C2946 bne _080C2946
b _080C2ACA b _080C2ACA
_080C2946: _080C2946:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080C2960 beq _080C2960
@ -346,7 +346,7 @@ _080C299C:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _080C29F4 beq _080C29F4
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080C29DC beq _080C29DC
@ -358,7 +358,7 @@ _080C299C:
cmp r0, 0x1 cmp r0, 0x1
beq _080C2A14 beq _080C2A14
_080C29C0: _080C29C0:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080C29DC beq _080C29DC
@ -382,7 +382,7 @@ _080C29F4:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _080C2ACA beq _080C2ACA
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080C2A20 beq _080C2A20
@ -430,7 +430,7 @@ _080C2A2C:
b _080C2ACA b _080C2ACA
.pool .pool
_080C2A68: _080C2A68:
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
bne _080C2ACA bne _080C2ACA
@ -1403,7 +1403,7 @@ sub_80C3278: @ 80C3278
movs r0, 0x40 movs r0, 0x40
movs r1, 0xF0 movs r1, 0xF0
bl SetGpuReg bl SetGpuReg
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080C32E0 beq _080C32E0
@ -4267,7 +4267,7 @@ _080C4BF6:
ldrb r0, [r1, 0x4] ldrb r0, [r1, 0x4]
adds r0, 0x1 adds r0, 0x1
strb r0, [r1, 0x4] strb r0, [r1, 0x4]
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080C4B20 beq _080C4B20
@ -4745,7 +4745,7 @@ sub_80C4FF0: @ 80C4FF0
bl InUnionRoom bl InUnionRoom
cmp r0, 0x1 cmp r0, 0x1
bne _080C5060 bne _080C5060
ldr r0, =gUnknown_03003124 ldr r0, =gReceivedRemoteLinkPlayers
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0x1 cmp r0, 0x1
bne _080C5060 bne _080C5060

6
asm/unknown_task.s
View File

@ -267,11 +267,11 @@ _080BA1D8:
.4byte _080BA250 .4byte _080BA250
.4byte _080BA24C .4byte _080BA24C
_080BA214: _080BA214:
ldr r0, =gUnknown_02022E14 ldr r0, =gBattle_BG0_X
b _080BA24E b _080BA24E
.pool .pool
_080BA21C: _080BA21C:
ldr r0, =gUnknown_02022E16 ldr r0, =gBattle_BG0_Y
b _080BA24E b _080BA24E
.pool .pool
_080BA224: _080BA224:
@ -295,7 +295,7 @@ _080BA244:
b _080BA24E b _080BA24E
.pool .pool
_080BA24C: _080BA24C:
ldr r0, =gUnknown_02022E22 ldr r0, =gBattle_BG3_Y
_080BA24E: _080BA24E:
ldrh r6, [r0] ldrh r6, [r0]
_080BA250: _080BA250:

39
include/battle.h
View File

@ -55,6 +55,8 @@
#define BATTLE_TYPE_KYORGE 0x20000000 #define BATTLE_TYPE_KYORGE 0x20000000
#define BATTLE_TYPE_RAYQUAZA 0x40000000 #define BATTLE_TYPE_RAYQUAZA 0x40000000
#define TRAINER_OPPONENT_C00 0xC00
#define TRAINER_OPPONENT_800 0x800
#define STEVEN_PARTNER_ID 0xC03 #define STEVEN_PARTNER_ID 0xC03
#define SECRET_BASE_OPPONENT 0x400 #define SECRET_BASE_OPPONENT 0x400
@ -215,11 +217,14 @@
#define BATTLE_TERRAIN_POND 5 #define BATTLE_TERRAIN_POND 5
#define BATTLE_TERRAIN_ROCK 6 #define BATTLE_TERRAIN_ROCK 6
#define BATTLE_TERRAIN_CAVE 7 #define BATTLE_TERRAIN_CAVE 7
#define BATTLE_TERRAIN_INSIDE 8
// array entries for battle communication // array entries for battle communication
#define MULTIUSE_STATE 0x0 #define MULTIUSE_STATE 0x0
#define CURSOR_POSITION 0x1 #define CURSOR_POSITION 0x1
#define TASK_ID 0x1 // task Id and cursor position share the same field #define TASK_ID 0x1 // task Id and cursor position share the same field
#define SPRITES_INIT_STATE1 0x1 // shares the Id as well
#define SPRITES_INIT_STATE2 0x2
#define MOVE_EFFECT_BYTE 0x3 #define MOVE_EFFECT_BYTE 0x3
#define MULTISTRING_CHOOSER 0x5 #define MULTISTRING_CHOOSER 0x5
#define MSG_DISPLAY 0x7 #define MSG_DISPLAY 0x7
@ -633,15 +638,13 @@ struct BattleStruct
u8 field_A5; u8 field_A5;
u8 field_A6; u8 field_A6;
u8 field_A7; u8 field_A7;
u16 hpOnSwitchout[4]; u16 hpOnSwitchout[2];
u32 savedBattleTypeFlags;
u8 field_B0; u8 field_B0;
u8 hpScale; u8 hpScale;
u8 synchronizeMoveEffect; u8 synchronizeMoveEffect;
u8 field_B3; u8 field_B3;
u8 field_B4; void (*savedCallback)(void);
u8 field_B5;
u8 field_B6;
u8 field_B7;
u16 usedHeldItems[BATTLE_BANKS_COUNT]; u16 usedHeldItems[BATTLE_BANKS_COUNT];
u8 field_C0[8]; u8 field_C0[8];
u16 choicedMove[BATTLE_BANKS_COUNT]; u16 choicedMove[BATTLE_BANKS_COUNT];
@ -654,7 +657,11 @@ struct BattleStruct
u8 field_DF; u8 field_DF;
u8 mirrorMoveArrays[32]; u8 mirrorMoveArrays[32];
u16 castformPalette[4][16]; u16 castformPalette[4][16];
u8 field_180[32]; u8 field_180;
u8 field_181;
u8 field_182;
u8 field_183;
struct BattleEnigmaBerry battleEnigmaBerry;
u8 field_1A0; u8 field_1A0;
u8 field_1A1; u8 field_1A1;
u8 filler1A2; u8 filler1A2;
@ -842,13 +849,24 @@ struct BattleScripting
u8 atk6C_state; u8 atk6C_state;
u8 learnMoveState; u8 learnMoveState;
u8 field_20; u8 field_20;
u8 field_21;
u8 field_22;
u8 field_23;
u8 field_24;
u8 multiplayerId;
}; };
extern struct BattleScripting gBattleScripting; extern struct BattleScripting gBattleScripting;
// functions // functions
// battle_1
void LoadBattleTextboxAndBackground(void);
void LoadBattleEntryBackground(void);
void task00_0800F6FC(u8 taskId);
// battle_2 // battle_2
void CB2_InitBattle(void);
void CancelMultiTurnMoves(u8 bank); void CancelMultiTurnMoves(u8 bank);
void PressurePPLose(u8 bankAtk, u8 bankDef, u16 move); void PressurePPLose(u8 bankAtk, u8 bankDef, u16 move);
void PrepareStringBattle(u16 stringId, u8 bank); void PrepareStringBattle(u16 stringId, u8 bank);
@ -914,13 +932,18 @@ extern void (* const gBattleScriptingCommandsTable[])(void);
extern const u8 gUnknown_0831C494[]; extern const u8 gUnknown_0831C494[];
// battle_5 // battle_5
void AllocateBattleResrouces(void);
void AdjustFriendshipOnBattleFaint(u8 bank); void AdjustFriendshipOnBattleFaint(u8 bank);
void sub_80571DC(u8 bank, u8 arg1); void sub_80571DC(u8 bank, u8 arg1);
u32 sub_805725C(u8 bank); u32 sub_805725C(u8 bank);
// battle 7 // battle 7
void AllocateBattleSpritesData(void);
void BattleMusicStop(void); void BattleMusicStop(void);
void sub_805E990(struct Pokemon* mon, u8 bank); void sub_805E990(struct Pokemon* mon, u8 bank);
void AllocateMonSpritesGfx(void);
void sub_805EF14(void);
bool8 BattleInitAllSprites(u8 *state1, u8 *state2);
// rom_80A5C6C // rom_80A5C6C
u8 GetBankSide(u8 bank); u8 GetBankSide(u8 bank);
@ -931,13 +954,13 @@ u8 GetBankByIdentity(u8 bank);
#include "sprite.h" #include "sprite.h"
struct BattleSpritesGfx struct MonSpritesGfx
{ {
void* firstDecompressed; // ptr to the decompressed sprite of the first pokemon void* firstDecompressed; // ptr to the decompressed sprite of the first pokemon
void* sprites[4]; void* sprites[4];
struct SpriteTemplate templates[4]; struct SpriteTemplate templates[4];
}; };
extern struct BattleSpritesGfx* gBattleSpritesGfx; extern struct MonSpritesGfx* gMonSpritesGfxPtr;
#endif // GUARD_BATTLE_H #endif // GUARD_BATTLE_H

6
include/battle_setup.h Normal file
View File

@ -0,0 +1,6 @@
#ifndef GUARD_BATTLE_SETUP_H
#define GUARD_BATTLE_SETUP_H
u8 BattleSetup_GetTerrainId(void);
#endif // GUARD_BATTLE_SETUP_H

2
include/flags.h
View File

@ -84,6 +84,8 @@
#define SYS_CTRL_OBJ_DELETE CODE_FLAGS + 0x61 #define SYS_CTRL_OBJ_DELETE CODE_FLAGS + 0x61
#define SYS_RESET_RTC_ENABLE CODE_FLAGS + 0x62 #define SYS_RESET_RTC_ENABLE CODE_FLAGS + 0x62
#define SYS_FRONTIER_PASS CODE_FLAGS + 0x72
#define SYS_STORAGE_UNKNOWN_FLAG CODE_FLAGS + 0x77 #define SYS_STORAGE_UNKNOWN_FLAG CODE_FLAGS + 0x77
#define SYS_MYSTERY_GIFT_ENABLE CODE_FLAGS + 0x7B #define SYS_MYSTERY_GIFT_ENABLE CODE_FLAGS + 0x7B

13
include/global.berry.h
View File

@ -1,9 +1,12 @@
#ifndef GUARD_GLOBAL_BERRY_H #ifndef GUARD_GLOBAL_BERRY_H
#define GUARD_GLOBAL_BERRY_H #define GUARD_GLOBAL_BERRY_H
#define BERRY_NAME_COUNT 7
#define BERRY_ITEM_EFFECT_COUNT 18
struct Berry struct Berry
{ {
const u8 name[7]; const u8 name[BERRY_NAME_COUNT];
u8 firmness; u8 firmness;
u16 size; u16 size;
u8 maxYield; u8 maxYield;
@ -23,7 +26,7 @@ struct Berry
struct Berry2 struct Berry2
{ {
u8 name[7]; u8 name[BERRY_NAME_COUNT];
u8 firmness; u8 firmness;
u16 size; u16 size;
u8 maxYield; u8 maxYield;
@ -42,7 +45,7 @@ struct Berry2
struct EnigmaBerry struct EnigmaBerry
{ {
struct Berry2 berry; struct Berry2 berry;
u8 itemEffect[18]; u8 itemEffect[BERRY_ITEM_EFFECT_COUNT];
u8 holdEffect; u8 holdEffect;
u8 holdEffectParam; u8 holdEffectParam;
u32 checksum; u32 checksum;
@ -50,9 +53,9 @@ struct EnigmaBerry
struct BattleEnigmaBerry struct BattleEnigmaBerry
{ {
/*0x00*/ u8 name[7]; /*0x00*/ u8 name[BERRY_NAME_COUNT];
/*0x07*/ u8 holdEffect; /*0x07*/ u8 holdEffect;
/*0x08*/ u8 itemEffect[18]; /*0x08*/ u8 itemEffect[BERRY_ITEM_EFFECT_COUNT];
/*0x1A*/ u8 holdEffectParam; /*0x1A*/ u8 holdEffectParam;
}; };

9
include/global.h
View File

@ -198,8 +198,13 @@ struct SaveBlock2
// All below could be a one giant struct // All below could be a one giant struct
/*0x64C*/ u8 field_64C[1629]; /*0x64C*/ u8 field_64C[1629];
/*0xCA9*/ u8 frontierChosenLvl : 2; /*0xCA9*/ u8 frontierChosenLvl : 2; // 0x1, 0x2 -> 0x3
/*0xCA9*/ u8 field_CA9_a : 6; /*0xCA9*/ u8 field_CA9_a : 1; // 0x4
/*0xCA9*/ u8 field_CA9_b : 1; // 0x8
/*0xCA9*/ u8 field_CA9_c : 1; // 0x10
/*0xCA9*/ u8 field_CA9_d : 1; // 0x20
/*0xCA9*/ u8 field_CA9_e : 1; // 0x40
/*0xCA9*/ u8 field_CA9_f : 1; // 0x80
/*0xCAA*/ u8 field_CAA[368]; /*0xCAA*/ u8 field_CAA[368];
/*0xE1A*/ u16 battlePyramidFloor; // possibly? /*0xE1A*/ u16 battlePyramidFloor; // possibly?
/*0xE1C*/ u8 field_E1C[16]; /*0xE1C*/ u8 field_E1C[16];

18
include/link.h
View File

@ -143,7 +143,6 @@ extern u16 word_3002910[];
extern bool8 gReceivedRemoteLinkPlayers; extern bool8 gReceivedRemoteLinkPlayers;
void Task_DestroySelf(u8); void Task_DestroySelf(u8);
void sub_8007270(u8);
void OpenLink(void); void OpenLink(void);
void CloseLink(void); void CloseLink(void);
u16 LinkMain2(u16 *); u16 LinkMain2(u16 *);
@ -162,24 +161,12 @@ void sub_8007E4C(void);
u8 GetMultiplayerId(void); u8 GetMultiplayerId(void);
u8 bitmask_all_link_players_but_self(void); u8 bitmask_all_link_players_but_self(void);
bool8 SendBlock(u8, void *, u16); bool8 SendBlock(u8, void *, u16);
bool8 sub_8007E9C(u8);
bool8 sub_8007ECC(void);
u8 GetBlockReceivedStatus(void); u8 GetBlockReceivedStatus(void);
void ResetBlockReceivedFlags(void); void ResetBlockReceivedFlags(void);
void ResetBlockReceivedFlag(u8); void ResetBlockReceivedFlag(u8);
void sub_8007F4C(void);
void SetLinkDebugValues(u32, u32); void SetLinkDebugValues(u32, u32);
u8 sub_8008198(void);
void sub_80081C8(u8);
u8 sub_800820C(void);
u8 sub_8008218(void);
void sub_800826C(void);
void sub_80082EC(void);
u8 GetLinkPlayerCount_2(void); u8 GetLinkPlayerCount_2(void);
bool8 IsLinkMaster(void); bool8 IsLinkMaster(void);
void sub_800832C(void);
void sub_8008480(void);
void sub_80084A4(void);
void CB2_LinkError(void); void CB2_LinkError(void);
u8 GetSioMultiSI(void); u8 GetSioMultiSI(void);
bool8 IsLinkConnectionEstablished(void); bool8 IsLinkConnectionEstablished(void);
@ -191,4 +178,9 @@ void LinkVSync(void);
void Timer3Intr(void); void Timer3Intr(void);
void SerialCB(void); void SerialCB(void);
void sub_800E0E8(void);
bool8 sub_800A520(void);
bool8 sub_8010500(void);
void sub_800DFB4(u8, u8);
#endif // GUARD_LINK_H #endif // GUARD_LINK_H

1
include/load_save.h
View File

@ -19,5 +19,6 @@ void LoadSerializedGame(void);
void LoadPlayerBag(void); void LoadPlayerBag(void);
void SavePlayerBag(void); void SavePlayerBag(void);
void SetSaveBlocksPointers(u16); void SetSaveBlocksPointers(u16);
void MoveSaveBlocks_ResetHeap(void);
#endif // GUARD_LOAD_SAVE_H #endif // GUARD_LOAD_SAVE_H

1
include/pokemon.h
View File

@ -632,6 +632,7 @@ void HandleSetPokedexFlag(u16 nationalNum, u8 caseId, u32 personality);
s32 sub_806D864(u16 a1); s32 sub_806D864(u16 a1);
bool16 sub_806D82C(u8 id); bool16 sub_806D82C(u8 id);
u16 MonTryLearningNewMove(struct Pokemon* mon, bool8); u16 MonTryLearningNewMove(struct Pokemon* mon, bool8);
void sub_8068AA4(void); // sets stats for deoxys
#include "sprite.h" #include "sprite.h"

5
include/recorded_battle.h
View File

@ -1,6 +1,11 @@
#ifndef GUARD_RECORDED_BATTLE_H #ifndef GUARD_RECORDED_BATTLE_H
#define GUARD_RECORDED_BATTLE_H #define GUARD_RECORDED_BATTLE_H
extern u32 gRecordedBattleRngSeed;
void sub_8185F84(void);
void sub_8184E58(void);
void RecordedBattle_SetBankAction(u8 bank, u8 action); void RecordedBattle_SetBankAction(u8 bank, u8 action);
void sub_8185F90(u16 arg0);
#endif // GUARD_RECORDED_BATTLE_H #endif // GUARD_RECORDED_BATTLE_H

10
include/unknown_task.h
View File

@ -2,10 +2,20 @@
#define GUARD_unknown_task_H #define GUARD_unknown_task_H
// Exported type declarations // Exported type declarations
struct UnknownTaskStruct
{
volatile void *dest;
u32 control;
u8 unk8;
u8 unk9;
};
extern struct UnknownTaskStruct gUnknown_0831AC70;
// Exported RAM declarations // Exported RAM declarations
// Exported ROM declarations // Exported ROM declarations
void remove_some_task(void); void remove_some_task(void);
void sub_80BA038(struct UnknownTaskStruct arg0);
#endif // GUARD_unknown_task_H #endif // GUARD_unknown_task_H

1
ld_script.txt
View File

@ -57,6 +57,7 @@ SECTIONS {
asm/rom3.o(.text); asm/rom3.o(.text);
src/decompress.o(.text); src/decompress.o(.text);
asm/battle_1.o(.text); asm/battle_1.o(.text);
src/battle_2.o(.text);
asm/battle_2.o(.text); asm/battle_2.o(.text);
src/battle_3.o(.text); src/battle_3.o(.text);
src/battle_script_commands.o(.text); src/battle_script_commands.o(.text);

1343
src/battle_2.c Normal file
View File

File diff suppressed because it is too large Load Diff

3
src/battle_script_commands.c
View File

@ -146,7 +146,6 @@ extern u8 sav1_map_get_light_level(void);
extern u8 sub_813B21C(void); extern u8 sub_813B21C(void);
extern u16 get_unknown_box_id(void); extern u16 get_unknown_box_id(void);
extern void c2_berry_program_update_menu(void); extern void c2_berry_program_update_menu(void);
extern void sub_8035AA4(void);
// BattleScripts // BattleScripts
extern const u8 BattleScript_MoveEnd[]; extern const u8 BattleScript_MoveEnd[];
@ -11218,7 +11217,7 @@ static void atkF2_display_dex_info(void)
break; break;
case 3: case 3:
c2_berry_program_update_menu(); c2_berry_program_update_menu();
sub_8035AA4(); LoadBattleTextboxAndBackground();
gBattle_BG3_X = 0x100; gBattle_BG3_X = 0x100;
gBattleCommunication[0]++; gBattleCommunication[0]++;
break; break;

6
src/egg_hatch.c
View File

@ -64,7 +64,7 @@ extern void sub_806A068(u16, u8);
extern void fade_screen(u8, u8); extern void fade_screen(u8, u8);
extern void overworld_free_bg_tilemaps(void); extern void overworld_free_bg_tilemaps(void);
extern void sub_80AF168(void); extern void sub_80AF168(void);
extern void init_uns_table_pokemon_copy(void); extern void AllocateMonSpritesGfx(void);
extern void sub_805F094(void); extern void sub_805F094(void);
extern void remove_some_task(void); extern void remove_some_task(void);
extern void reset_temp_tile_data_buffers(void); extern void reset_temp_tile_data_buffers(void);
@ -439,7 +439,7 @@ static u8 EggHatchCreateMonSprite(u8 a0, u8 switchID, u8 pokeID, u16* speciesLoc
u16 species = GetMonData(mon, MON_DATA_SPECIES); u16 species = GetMonData(mon, MON_DATA_SPECIES);
u32 pid = GetMonData(mon, MON_DATA_PERSONALITY); u32 pid = GetMonData(mon, MON_DATA_PERSONALITY);
HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[species], HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[species],
gBattleSpritesGfx->sprites[(a0 * 2) + 1], gMonSpritesGfxPtr->sprites[(a0 * 2) + 1],
species, pid); species, pid);
LoadCompressedObjectPalette(sub_806E794(mon)); LoadCompressedObjectPalette(sub_806E794(mon));
*speciesLoc = species; *speciesLoc = species;
@ -488,7 +488,7 @@ static void CB2_EggHatch_0(void)
SetGpuReg(REG_OFFSET_DISPCNT, 0); SetGpuReg(REG_OFFSET_DISPCNT, 0);
sEggHatchData = Alloc(sizeof(struct EggHatchData)); sEggHatchData = Alloc(sizeof(struct EggHatchData));
init_uns_table_pokemon_copy(); AllocateMonSpritesGfx();
sEggHatchData->eggPartyID = gSpecialVar_0x8004; sEggHatchData->eggPartyID = gSpecialVar_0x8004;
sEggHatchData->eggShardVelocityID = 0; sEggHatchData->eggShardVelocityID = 0;

12
src/pokemon_2.c
View File

@ -152,8 +152,8 @@ u8 GetGenderFromSpeciesAndPersonality(u16 species, u32 personality)
void sub_806A068(u16 species, u8 bankIdentity) void sub_806A068(u16 species, u8 bankIdentity)
{ {
if (gBattleSpritesGfx != NULL) if (gMonSpritesGfxPtr != NULL)
gUnknown_0202499C = gBattleSpritesGfx->templates[bankIdentity]; gUnknown_0202499C = gMonSpritesGfxPtr->templates[bankIdentity];
else if (gUnknown_020249B4[0]) else if (gUnknown_020249B4[0])
gUnknown_0202499C = gUnknown_020249B4[0]->templates[bankIdentity]; gUnknown_0202499C = gUnknown_020249B4[0]->templates[bankIdentity];
else if (gUnknown_020249B4[1]) else if (gUnknown_020249B4[1])
@ -180,8 +180,8 @@ void sub_806A12C(u16 trainerSpriteId, u8 bankIdentity)
} }
else else
{ {
if (gBattleSpritesGfx != NULL) if (gMonSpritesGfxPtr != NULL)
gUnknown_0202499C = gBattleSpritesGfx->templates[bankIdentity]; gUnknown_0202499C = gMonSpritesGfxPtr->templates[bankIdentity];
else else
gUnknown_0202499C = gUnknown_08329D98[bankIdentity]; gUnknown_0202499C = gUnknown_08329D98[bankIdentity];
gUnknown_0202499C.anims = gUnknown_0830536C[trainerSpriteId]; gUnknown_0202499C.anims = gUnknown_0830536C[trainerSpriteId];
@ -190,8 +190,8 @@ void sub_806A12C(u16 trainerSpriteId, u8 bankIdentity)
void sub_806A1C0(u16 arg0, u8 bankIdentity) void sub_806A1C0(u16 arg0, u8 bankIdentity)
{ {
if (gBattleSpritesGfx != NULL) if (gMonSpritesGfxPtr != NULL)
gUnknown_0202499C = gBattleSpritesGfx->templates[bankIdentity]; gUnknown_0202499C = gMonSpritesGfxPtr->templates[bankIdentity];
else else
gUnknown_0202499C = gUnknown_08329D98[bankIdentity]; gUnknown_0202499C = gUnknown_08329D98[bankIdentity];
gUnknown_0202499C.paletteTag = arg0; gUnknown_0202499C.paletteTag = arg0;

4
src/pokemon_3.c
View File

@ -486,8 +486,8 @@ u16 SpeciesToCryId(u16 species)
void sub_806D544(u16 species, u32 personality, u8 *dest) void sub_806D544(u16 species, u32 personality, u8 *dest)
{ {
if (species == SPECIES_SPINDA if (species == SPECIES_SPINDA
&& dest != gBattleSpritesGfx->sprites[0] && dest != gMonSpritesGfxPtr->sprites[0]
&& dest != gBattleSpritesGfx->sprites[2]) && dest != gMonSpritesGfxPtr->sprites[2])
{ {
int i; int i;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)

4
sym_common.txt
View File

@ -117,7 +117,7 @@ gUnknown_03003110: @ 3003110
gUnknown_03003120: @ 3003120 gUnknown_03003120: @ 3003120
.space 0x4 .space 0x4
gUnknown_03003124: @ 3003124 gReceivedRemoteLinkPlayers: @ 3003124
.space 0xC .space 0xC
gUnknown_03003130: @ 3003130 gUnknown_03003130: @ 3003130
@ -203,7 +203,7 @@ gUnknown_03005CDE: @ 3005CDE
.include "rtc.o" .include "rtc.o"
gUnknown_03005D00: @ 3005D00 gPreBattleCallback1: @ 3005D00
.space 0x4 .space 0x4
gBattleMainFunc: @ 3005D04 gBattleMainFunc: @ 3005D04

25
sym_ewram.txt
View File

@ -31,11 +31,8 @@ gUnknown_020223BD: @ 20223BD
gUnknown_020223C0: @ 20223C0 gUnknown_020223C0: @ 20223C0
.space 0x4 .space 0x4
gUnknown_020223C4: @ 20223C4 gBlockRecvBuffer: @ 20223C4
.space 0x4 .space 0x500
gUnknown_020223C8: @ 20223C8
.space 0x4FC
gUnknown_020228C4: @ 20228C4 gBlockSendBuffer gUnknown_020228C4: @ 20228C4 gBlockSendBuffer
.space 0x100 .space 0x100
@ -205,10 +202,10 @@ gUnknown_02022D10: @ 2022D10
gUnknown_02022E10: @ 2022E10 gUnknown_02022E10: @ 2022E10
.space 0x4 .space 0x4
gUnknown_02022E14: @ 2022E14 gBattle_BG0_X: @ 2022E14
.space 0x2 .space 0x2
gUnknown_02022E16: @ 2022E16 gBattle_BG0_Y: @ 2022E16
.space 0x2 .space 0x2
gBattle_BG1_X: @ 2022E18 gBattle_BG1_X: @ 2022E18
@ -226,19 +223,19 @@ gBattle_BG2_Y: @ 2022E1E
gBattle_BG3_X: @ 2022E20 gBattle_BG3_X: @ 2022E20
.space 0x2 .space 0x2
gUnknown_02022E22: @ 2022E22 gBattle_BG3_Y: @ 2022E22
.space 0x2 .space 0x2
gUnknown_02022E24: @ 2022E24 gBattle_WIN0H: @ 2022E24
.space 0x2 .space 0x2
gUnknown_02022E26: @ 2022E26 gBattle_WIN0V: @ 2022E26
.space 0x2 .space 0x2
gUnknown_02022E28: @ 2022E28 gBattle_WIN1H: @ 2022E28
.space 0x2 .space 0x2
gUnknown_02022E2A: @ 2022E2A gBattle_WIN1V: @ 2022E2A
.space 0x2 .space 0x2
gDisplayedStringBattle: @ 2022E2C gDisplayedStringBattle: @ 2022E2C
@ -526,7 +523,7 @@ gUnknown_020244CC: @ 20244CC
gUnknown_020244D0: @ 20244D0 gUnknown_020244D0: @ 20244D0
.space 0x4 .space 0x4
gBattleSpritesGfx: @ 20244D4 gMonSpritesGfxPtr: @ 20244D4
.space 0x4 .space 0x4
gUnknown_020244D8: @ 20244D8 gUnknown_020244D8: @ 20244D8
@ -1671,7 +1668,7 @@ gUnknown_0203BD26: @ 203BD26
gUnknown_0203BD28: @ 203BD28 gUnknown_0203BD28: @ 203BD28
.space 0x4 .space 0x4
gUnknown_0203BD2C: @ 203BD2C gRecordedBattleRngSeed: @ 203BD2C
.space 0x4 .space 0x4
gUnknown_0203BD30: @ 203BD30 gUnknown_0203BD30: @ 203BD30