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

battle 4 up to a8

Browse Source
This commit is contained in:
DizzyEggg 2017-09-26 22:39:59 +02:00
parent 52a951276f
commit d769ec1374
52 changed files with 3497 additions and 8242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
asm/battle_1.s
View File

@ -2236,7 +2236,7 @@ _08035F64:
ldrsh r0, [r5, r1]
cmp r0, 0
beq _08035FCC
ldr r4, =gUnknown_02022E18
ldr r4, =gBattle_BG1_X
ldrh r0, [r5, 0xA]
bl Sin2
lsls r0, 16
@ -2251,7 +2251,7 @@ _08035F7E:
adds r0, r2, 0
subs r0, r1
strh r0, [r4]
ldr r4, =gUnknown_02022E1C
ldr r4, =gBattle_BG2_X
ldrh r0, [r5, 0xC]
bl Sin2
lsls r0, 16
@ -2266,16 +2266,16 @@ _08035F9C:
adds r0, r3, 0
subs r0, r1
strh r0, [r4]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldr r2, =0x0000ffdc
adds r1, r2, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
b _08036038
.pool
_08035FCC:
ldr r4, =gUnknown_02022E18
ldr r4, =gBattle_BG1_X
ldrh r0, [r5, 0xA]
bl Sin2
lsls r0, 16
@ -2290,7 +2290,7 @@ _08035FDE:
adds r0, r3, 0
subs r0, r1
strh r0, [r4]
ldr r4, =gUnknown_02022E1A
ldr r4, =gBattle_BG1_Y
ldrh r0, [r5, 0xA]
bl Cos2
lsls r0, 16
@ -2302,7 +2302,7 @@ _08035FFC:
asrs r0, 5
subs r0, 0xA4
strh r0, [r4]
ldr r4, =gUnknown_02022E1C
ldr r4, =gBattle_BG2_X
ldrh r0, [r5, 0xC]
bl Sin2
lsls r0, 16
@ -2317,7 +2317,7 @@ _08036014:
adds r0, r2, 0
subs r0, r1
strh r0, [r4]
ldr r4, =gUnknown_02022E1E
ldr r4, =gBattle_BG2_Y
ldrh r0, [r5, 0xC]
bl Cos2
lsls r0, 16
@ -2504,11 +2504,11 @@ sub_8036154: @ 8036154
movs r0, 0x4A
movs r1, 0x36
bl SetGpuReg
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldr r2, =0x0000ff5c
adds r1, r2, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
ldr r0, =gUnknown_0831AA00
bl LoadCompressedObjectPicUsingHeap

124
asm/battle_2.s
View File

@ -157,13 +157,13 @@ _080368BE:
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E20
strh r1, [r0]
@ -3925,19 +3925,19 @@ _08038A3A:
ldrh r1, [r0]
movs r0, 0x12
bl SetGpuReg
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r1, [r0]
movs r0, 0x18
bl SetGpuReg
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
ldrh r1, [r0]
movs r0, 0x1A
bl SetGpuReg
@ -4371,13 +4371,13 @@ _08038E1A:
strh r4, [r0]
ldr r0, =gUnknown_02022E16
strh r4, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r4, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r4, [r0]
ldr r0, =gUnknown_02022E20
strh r4, [r0]
@ -4842,13 +4842,13 @@ sub_80392A8: @ 80392A8
strh r4, [r0]
ldr r0, =gUnknown_02022E16
strh r4, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r4, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r4, [r0]
ldr r0, =gUnknown_02022E20
strh r4, [r0]
@ -5215,7 +5215,7 @@ _08039678:
bl PlaySE
ldr r0, =gText_BattleRecordedOnPass
_08039686:
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
@ -7806,7 +7806,7 @@ _0803ABD4:
movs r0, 0
movs r1, 0
movs r2, 0
bl EmitGetAttributes
bl EmitGetMonData
ldrb r0, [r4]
bl MarkBufferBankForExecution
ldrb r0, [r5]
@ -7849,7 +7849,7 @@ bc_load_battlefield: @ 803AC34
cmp r5, 0
bne _0803AC64
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r4, =gActiveBank
strb r0, [r4]
ldr r0, =gUnknown_02022FF0
@ -8274,7 +8274,7 @@ _0803AFFA:
cmp r7, 0x5
ble _0803AFAA
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r4, =gActiveBank
strb r0, [r4]
movs r0, 0
@ -8326,7 +8326,7 @@ _0803B072:
cmp r7, 0x5
ble _0803B026
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r4, =gActiveBank
strb r0, [r4]
movs r0, 0
@ -8404,7 +8404,7 @@ bc_battle_begin_message: @ 803B120
cmp r0, 0
bne _0803B142
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gActiveBank
strb r0, [r1]
ldrb r1, [r1]
@ -8468,7 +8468,7 @@ sub_803B180: @ 803B180
_0803B1B8:
movs r0, 0x1
_0803B1BA:
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@ -8738,7 +8738,7 @@ _0803B3F6:
cmp r0, 0
bne _0803B412
adds r0, r3, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@ -9241,7 +9241,7 @@ _0803B7EA:
ldr r1, =gBattleMainFunc
ldr r0, =sub_803BE74
str r0, [r1]
bl sub_803F988
bl ResetSentPokesToOpponentValue
ldr r1, =gBattleCommunication
movs r2, 0
adds r0, r1, 0x7
@ -9588,8 +9588,8 @@ _0803BB78:
.pool
thumb_func_end BattleTurnPassed
thumb_func_start sub_803BB88
sub_803BB88: @ 803BB88
thumb_func_start IsRunningFromBattleImpossible
IsRunningFromBattleImpossible: @ 803BB88
push {r4-r7,lr}
sub sp, 0x4
ldr r1, =gBattleMons
@ -9830,7 +9830,7 @@ _0803BD92:
pop {r1}
bx r1
.pool
thumb_func_end sub_803BB88
thumb_func_end IsRunningFromBattleImpossible
thumb_func_start sub_803BDA0
sub_803BDA0: @ 803BDA0
@ -10013,7 +10013,7 @@ _0803BF0C:
beq _0803BF68
eors r5, r1
adds r0, r5, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, [r4]
adds r1, 0x91
ldrb r1, [r1]
@ -10027,7 +10027,7 @@ _0803BF0C:
bne _0803BF68
ldr r4, =gBattleCommunication
adds r0, r5, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r0, r4
@ -10612,7 +10612,7 @@ _0803C4B4:
eors r0, r6
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r0, r4
@ -10625,7 +10625,7 @@ _0803C4B4:
eors r0, r6
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBattleMons
lsls r0, 24
lsrs r0, 24
@ -10645,7 +10645,7 @@ _0803C4B4:
eors r0, r6
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
muls r0, r7
@ -10670,7 +10670,7 @@ _0803C550:
eors r0, r6
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r0, r4
@ -10682,7 +10682,7 @@ _0803C550:
eors r0, r6
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
@ -10695,7 +10695,7 @@ _0803C590:
eors r0, r6
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r0, r4
@ -10712,7 +10712,7 @@ _0803C5B6:
eors r0, r6
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r0, r4
@ -10725,7 +10725,7 @@ _0803C5B6:
eors r0, r6
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 20
adds r0, r4
@ -10739,7 +10739,7 @@ _0803C5B6:
eors r0, r6
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@ -10771,7 +10771,7 @@ _0803C628:
eors r0, r5
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r0, r4
@ -10788,7 +10788,7 @@ _0803C628:
_0803C668:
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@ -10803,7 +10803,7 @@ _0803C690:
eors r0, r1
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
movs r1, 0x3
@ -10873,7 +10873,7 @@ _0803C720:
b _0803CC20
.pool
_0803C760:
bl sub_803BB88
bl IsRunningFromBattleImpossible
lsls r0, 24
cmp r0, 0
beq _0803C7C4
@ -11271,7 +11271,7 @@ _0803CAFA:
bne _0803CB3C
adds r0, r5, 0
eors r0, r1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBattleStruct
ldr r1, [r1]
adds r1, 0x91
@ -12870,7 +12870,7 @@ sub_803D8C0: @ 803D8C0
ldrb r0, [r4]
strb r0, [r1]
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBankAttacker
strb r0, [r1]
ldr r1, =gBattlescriptCurrInstr
@ -13075,7 +13075,7 @@ _0803DB44:
ldrb r0, [r4]
strb r0, [r1]
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBankAttacker
strb r0, [r1]
ldr r1, =gBattlescriptCurrInstr
@ -14124,7 +14124,7 @@ _0803E548:
_0803E558:
movs r0, 0x2
_0803E55A:
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBankTarget
strb r0, [r1]
b _0803E578
@ -14173,7 +14173,7 @@ _0803E5C4:
eors r0, r1
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
strb r0, [r5]
ldrb r1, [r7]
ldrb r2, [r5]
@ -14257,7 +14257,7 @@ _0803E684:
_0803E694:
movs r0, 0x2
_0803E696:
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBankTarget
strb r0, [r1]
ldr r0, =gAbsentBankFlags
@ -14323,7 +14323,7 @@ _0803E730:
eors r0, r1
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
strb r0, [r5]
ldrb r1, [r6]
ldrb r2, [r5]
@ -14341,7 +14341,7 @@ _0803E758:
eors r0, r1
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
strb r0, [r5]
_0803E76A:
ldr r0, =gBattleTypeFlags
@ -14823,8 +14823,8 @@ _0803EBF6:
.pool
thumb_func_end sub_803E90C
thumb_func_start sub_803EC20
sub_803EC20: @ 803EC20
thumb_func_start CanRunFromBattle
CanRunFromBattle: @ 803EC20
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@ -15069,7 +15069,7 @@ _0803EE24:
pop {r1}
bx r1
.pool
thumb_func_end sub_803EC20
thumb_func_end CanRunFromBattle
thumb_func_start sub_803EE48
sub_803EE48: @ 803EE48
@ -15157,7 +15157,7 @@ _0803EF0C:
cmp r0, 0
bne _0803EF4C
ldrb r0, [r4]
bl sub_803EC20
bl CanRunFromBattle
lsls r0, 24
cmp r0, 0
bne _0803EF98
@ -15690,7 +15690,7 @@ _0803F46C:
_0803F470:
movs r0, 0x3
_0803F472:
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
_0803F47A:
@ -15786,7 +15786,7 @@ _0803F4DE:
movs r0, 0
movs r2, 0
movs r3, 0x1
bl EmitSetAttributes
bl EmitSetMonData
ldrb r0, [r4]
bl MarkBufferBankForExecution
_0803F532:
@ -15933,7 +15933,7 @@ _0803F5F0:
movs r0, 0
movs r2, 0
movs r3, 0x1
bl EmitSetAttributes
bl EmitSetMonData
ldrb r0, [r4]
bl MarkBufferBankForExecution
_0803F658:
@ -16065,7 +16065,7 @@ _0803F6FE:
movs r0, 0
movs r2, 0
movs r3, 0x1
bl EmitSetAttributes
bl EmitSetMonData
ldrb r0, [r4]
bl MarkBufferBankForExecution
_0803F762:
@ -16319,8 +16319,8 @@ PrepareStringBattle: @ 803F964
.pool
thumb_func_end PrepareStringBattle
thumb_func_start sub_803F988
sub_803F988: @ 803F988
thumb_func_start ResetSentPokesToOpponentValue
ResetSentPokesToOpponentValue: @ 803F988
push {r4-r6,lr}
movs r3, 0
ldr r0, =gSentPokesToOpponent
@ -16368,7 +16368,7 @@ _0803F9D6:
pop {r0}
bx r0
.pool
thumb_func_end sub_803F988
thumb_func_end ResetSentPokesToOpponentValue
thumb_func_start sub_803F9EC
sub_803F9EC: @ 803F9EC

7498
asm/battle_4.s
View File

File diff suppressed because it is too large Load Diff

8
asm/battle_5.s
View File

@ -195,11 +195,11 @@ AdjustFriendshipOnBattleFaint: @ 80570F4
cmp r0, 0
beq _08057140
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x3
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r3, r0, 24
ldr r2, =gBattleMons
@ -220,7 +220,7 @@ AdjustFriendshipOnBattleFaint: @ 80570F4
.pool
_08057140:
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
_0805714A:
@ -562,7 +562,7 @@ _08057406:
movs r1, 0x28
movs r2, 0
movs r3, 0x4
bl EmitSetAttributes
bl EmitSetMonData
ldrb r0, [r4]
bl MarkBufferBankForExecution
_08057430:

18
asm/battle_7.s
View File

@ -428,7 +428,7 @@ _0805D470:
movs r0, 0x1
ands r0, r1
eors r0, r2
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 16
_0805D48A:
@ -579,7 +579,7 @@ sub_805D5F4: @ 805D5F4
cmp r0, 0
bne _0805D630
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
mov r8, r0
@ -588,13 +588,13 @@ sub_805D5F4: @ 805D5F4
.pool
_0805D630:
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
mov r8, r0
movs r0, 0x2
_0805D63E:
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r7, r0, 24
ldr r1, =gBattleMons
@ -2941,7 +2941,7 @@ _0805EA5A:
BattleMusicStop: @ 805EA60
push {r4-r6,lr}
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
ldr r5, =gUnknown_020244D0
@ -3020,12 +3020,12 @@ sub_805EAE8: @ 805EAE8
cmp r0, 0
beq _0805EB7E
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
mov r8, r0
movs r0, 0x2
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
mov r9, r0
@ -3203,7 +3203,7 @@ sub_805EC84: @ 805EC84
ldr r0, =gUnknown_0831C6A0
bl LoadCompressedObjectPic
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@ -3252,7 +3252,7 @@ sub_805EC84: @ 805EC84
cmp r0, 0
beq _0805ED56
movs r0, 0x3
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24

34
asm/battle_9.s
View File

@ -74,7 +74,7 @@ _08062C72:
lsrs r0, 24
mov r10, r0
ldr r4, =gBattleMons
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
movs r1, 0x58
@ -87,7 +87,7 @@ _08062C72:
b _08062E2C
_08062C9E:
mov r0, r10
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r2, r0, 24
movs r6, 0
@ -223,7 +223,7 @@ _08062D74:
movs r1, 0x2E
bl GetMonData
mov r0, r10
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r2, r0, 24
movs r4, 0
@ -347,7 +347,7 @@ _08062EB0:
eors r0, r4
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gAbsentBankFlags
ldrb r1, [r1]
ldr r2, =gBitTable
@ -367,7 +367,7 @@ _08062F04:
eors r0, r4
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r7, r0, 24
b _08062F1E
@ -705,7 +705,7 @@ ai_has_super_effective_move_on_field: @ 80631BC
lsls r0, 24
lsrs r0, 24
mov r10, r0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r3, r0, 24
ldr r0, =gAbsentBankFlags
@ -779,7 +779,7 @@ _0806327C:
movs r1, 0x2
mov r0, r10
eors r0, r1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r3, r0, 24
ldr r0, =gAbsentBankFlags
@ -951,7 +951,7 @@ _080633B8:
eors r0, r4
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gAbsentBankFlags
ldrb r1, [r1]
ldr r2, =gBitTable
@ -972,7 +972,7 @@ _08063414:
eors r0, r4
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
mov r10, r0
@ -1308,7 +1308,7 @@ _080636C4:
eors r0, r5
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gAbsentBankFlags
ldrb r1, [r1]
ldr r2, =gBitTable
@ -1328,7 +1328,7 @@ _08063718:
eors r0, r5
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r6, r0, 24
b _08063732
@ -1542,7 +1542,7 @@ _080638C2:
cmp r0, 0
bne _08063910
adds r0, r6, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
@ -1550,13 +1550,13 @@ _080638C2:
.pool
_08063910:
adds r0, r5, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0x2
eors r5, r0
adds r0, r5, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r5, r0, 24
_08063928:
@ -1789,7 +1789,7 @@ _08063AE0:
eors r0, r5
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gAbsentBankFlags
ldrb r1, [r1]
ldr r2, =gBitTable
@ -1810,7 +1810,7 @@ _08063B20:
eors r0, r5
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x14]
@ -1844,7 +1844,7 @@ _08063B6C:
eors r0, r1
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x4]

34
asm/battle_anim.s
View File

@ -949,17 +949,17 @@ _080A4148:
ldrsh r0, [r6, r3]
cmp r0, 0
bne _080A4190
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r1, 0xE]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
b _080A4198
.pool
_080A4190:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r0, [r0]
strh r0, [r1, 0xE]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
_080A4198:
ldrh r0, [r0]
strh r0, [r1, 0x10]
@ -1266,7 +1266,7 @@ _080A43F8:
ldr r0, =gBankSpriteIds
adds r0, r6, r0
ldrb r4, [r0]
ldr r5, =gUnknown_02022E18
ldr r5, =gBattle_BG1_X
ldr r0, =gSprites
lsls r1, r4, 4
adds r1, r4
@ -1294,7 +1294,7 @@ _080A43F8:
subs r0, 0x1
strh r0, [r5]
_080A447A:
ldr r5, =gUnknown_02022E1A
ldr r5, =gBattle_BG1_Y
ldr r2, =gSprites
lsls r1, r4, 4
adds r1, r4
@ -1322,7 +1322,7 @@ _080A447A:
orrs r1, r2
strb r1, [r0]
_080A44B0:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
@ -1431,7 +1431,7 @@ _080A455E:
ldr r0, =gBankSpriteIds
adds r2, r5, r0
ldrb r4, [r2]
ldr r5, =gUnknown_02022E1C
ldr r5, =gBattle_BG2_X
ldr r3, =gSprites
lsls r1, r4, 4
adds r1, r4
@ -1443,7 +1443,7 @@ _080A455E:
negs r0, r0
adds r0, 0x20
strh r0, [r5]
ldr r4, =gUnknown_02022E1E
ldr r4, =gBattle_BG2_Y
ldrh r0, [r1, 0x26]
ldrh r1, [r1, 0x22]
adds r0, r1
@ -1653,19 +1653,19 @@ sub_80A477C: @ 80A477C
_080A479C:
movs r0, 0x1
bl sub_80A6C68
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
b _080A47C6
.pool
_080A47B8:
movs r0, 0x2
bl sub_80A6C68
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r4, [r0]
_080A47C6:
add sp, 0x10
@ -1714,13 +1714,13 @@ task_pA_ma0A_obj_to_bg_pal: @ 80A47D8
ldrsh r0, [r5, r1]
cmp r0, 0
bne _080A4870
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
lsls r0, r3, 16
asrs r0, 16
ldrh r3, [r5, 0xE]
adds r0, r3
strh r0, [r1]
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
lsls r0, r2, 16
asrs r0, 16
ldrh r5, [r5, 0x10]
@ -1740,13 +1740,13 @@ task_pA_ma0A_obj_to_bg_pal: @ 80A47D8
b _080A4896
.pool
_080A4870:
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
lsls r0, r3, 16
asrs r0, 16
ldrh r3, [r5, 0xE]
adds r0, r3
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
lsls r0, r2, 16
asrs r0, 16
ldrh r5, [r5, 0x10]

2
asm/battle_anim_80D51AC.s
View File

@ -200,7 +200,7 @@ _080D5320:
_080D5324:
movs r0, 0x3
_080D5326:
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0

202
asm/battle_anim_80FE840.s
View File

@ -12782,14 +12782,14 @@ sub_8104E74: @ 8104E74
lsrs r0, 24
cmp r0, 0x1
bne _08104ED4
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r5, 0x14]
ldr r0, =0x04000014
b _08104EDC
.pool
_08104ED4:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r0, [r0]
strh r0, [r5, 0x14]
ldr r0, =0x04000018
@ -15305,10 +15305,10 @@ sub_81062E8: @ 81062E8
movs r2, 0x1
bl lcd_bg_operations
_0810632A:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r4, =gUnknown_02022E1A
ldr r4, =gBattle_BG1_Y
strh r1, [r4]
movs r0, 0x14
movs r1, 0
@ -15540,10 +15540,10 @@ sub_81064F8: @ 81064F8
movs r2, 0x1
bl lcd_bg_operations
_0810653A:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r4, =gUnknown_02022E1A
ldr r4, =gBattle_BG1_Y
strh r1, [r4]
movs r0, 0x14
movs r1, 0
@ -18159,11 +18159,11 @@ _08107A32:
beq _08107AB4
ldr r1, =0x0000ffb0
adds r0, r1, 0
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
strh r0, [r2]
adds r1, 0x20
adds r0, r1, 0
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
strh r0, [r2]
movs r0, 0x2
strh r0, [r6, 0x8]
@ -18183,12 +18183,12 @@ _08107AB4:
bne _08107AF8
ldr r2, =0x0000ff20
adds r0, r2, 0
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
strh r0, [r2]
movs r2, 0x80
lsls r2, 1
adds r0, r2, 0
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
strh r0, [r2]
movs r0, 0x2
strh r0, [r6, 0x8]
@ -18198,11 +18198,11 @@ _08107AB4:
b _08107B0E
.pool
_08107AF8:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r4, [r0]
ldr r1, =0x0000ffd0
adds r0, r1, 0
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
strh r0, [r2]
ldr r0, =0x0000fffe
strh r0, [r6, 0x8]
@ -18210,11 +18210,11 @@ _08107AF8:
strh r0, [r6, 0xA]
strh r4, [r7, 0xE]
_08107B0E:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
ldrh r1, [r2]
movs r0, 0x16
bl SetGpuReg
@ -18264,8 +18264,8 @@ sub_8107B84: @ 8107B84
sub sp, 0x10
lsls r0, 24
lsrs r5, r0, 24
ldr r1, =gUnknown_02022E18
ldr r2, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_X
ldr r2, =gBattle_BG1_Y
ldr r0, =gTasks
lsls r4, r5, 2
adds r4, r5
@ -18425,8 +18425,8 @@ sub_8107CC4: @ 8107CC4
lsls r0, 24
lsrs r0, 24
adds r5, r0, 0
ldr r7, =gUnknown_02022E18
ldr r0, =gUnknown_02022E1A
ldr r7, =gBattle_BG1_X
ldr r0, =gBattle_BG1_Y
mov r8, r0
ldr r6, =gTasks
lsls r0, r5, 2
@ -21049,14 +21049,14 @@ sub_8109198: @ 8109198
cmp r4, r0
bne _081091DE
movs r0, 0x2
bl GetBankByPlayerAI
bl GetBankByIdentity
ldrb r1, [r5]
lsls r0, 24
lsrs r0, 24
cmp r1, r0
beq _081091D6
movs r0, 0x3
bl GetBankByPlayerAI
bl GetBankByIdentity
ldrb r1, [r5]
lsls r0, 24
lsrs r0, 24
@ -26948,10 +26948,10 @@ sub_810C0A0: @ 810C0A0
movs r2, 0x1
bl lcd_bg_operations
_0810C0E2:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r4, =gUnknown_02022E1A
ldr r4, =gBattle_BG1_Y
strh r1, [r4]
movs r0, 0x14
movs r1, 0
@ -26999,7 +26999,7 @@ sub_810C164: @ 810C164
sub sp, 0x10
lsls r0, 24
lsrs r4, r0, 24
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldr r2, =0x0000ffff
adds r0, r2, 0
ldrh r2, [r1]
@ -27150,10 +27150,10 @@ _0810C29C:
movs r2, 0
bl lcd_bg_operations
_0810C2B0:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
movs r0, 0x50
movs r1, 0
@ -27230,10 +27230,10 @@ sub_810C324: @ 810C324
movs r2, 0x1
bl lcd_bg_operations
_0810C366:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r4, =gUnknown_02022E1A
ldr r4, =gBattle_BG1_Y
strh r1, [r4]
movs r0, 0x14
movs r1, 0
@ -27283,7 +27283,7 @@ sub_810C3F0: @ 810C3F0
sub sp, 0x10
lsls r0, 24
lsrs r4, r0, 24
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
ldr r3, =gTasks
lsls r1, r4, 2
adds r1, r4
@ -27422,10 +27422,10 @@ _0810C50C:
movs r2, 0
bl lcd_bg_operations
_0810C520:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
movs r0, 0x50
movs r1, 0
@ -28050,7 +28050,7 @@ sub_810C9E4: @ 810C9E4
ldrh r0, [r4, 0x2]
lsls r0, 20
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r5, r0, 24
adds r0, r5, 0
@ -33064,7 +33064,7 @@ _0810F212:
bne _0810F2B8
_0810F22E:
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
adds r7, r4, 0
@ -33193,7 +33193,7 @@ sub_810F340: @ 810F340
push {r4,r5,lr}
adds r5, r0, 0
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
movs r1, 0x3C
@ -33370,7 +33370,7 @@ sub_810F46C: @ 810F46C
cmp r0, 0
bne _0810F502
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
@ -33441,7 +33441,7 @@ sub_810F524: @ 810F524
cmp r0, 0
bne _0810F57C
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
@ -34597,14 +34597,14 @@ _0810FE92:
lsrs r0, 24
cmp r0, 0x1
bne _0810FEB8
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r4, 0x1C]
ldr r0, =0x04000014
b _0810FEC0
.pool
_0810FEB8:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r0, [r0]
strh r0, [r4, 0x1C]
ldr r0, =0x04000018
@ -36221,9 +36221,9 @@ sub_8110BCC: @ 8110BCC
movs r2, 0x1
bl lcd_bg_operations
_08110C10:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r5, [r0]
ldr r4, =gUnknown_02022E1A
ldr r4, =gBattle_BG1_Y
strh r5, [r4]
movs r0, 0x14
movs r1, 0
@ -36293,7 +36293,7 @@ sub_8110CB0: @ 8110CB0
adds r2, r1, 0
cmp r0, 0
bne _08110CE4
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldr r3, =0x0000fffa
adds r0, r3, 0
ldrh r3, [r1]
@ -36301,12 +36301,12 @@ sub_8110CB0: @ 8110CB0
b _08110CEA
.pool
_08110CE4:
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldrh r0, [r1]
adds r0, 0x6
_08110CEA:
strh r0, [r1]
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
ldr r3, =0x0000ffff
adds r0, r3, 0
ldrh r3, [r1]
@ -36442,10 +36442,10 @@ _08110DFC:
movs r2, 0
bl lcd_bg_operations
_08110E10:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
movs r0, 0x50
movs r1, 0
@ -41115,13 +41115,13 @@ sub_81133E8: @ 81133E8
bne _08113424
ldr r0, =0x04000014
str r0, [sp]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
b _0811342A
.pool
_08113424:
ldr r0, =0x04000018
str r0, [sp]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
_0811342A:
ldrh r0, [r0]
strh r0, [r4, 0xC]
@ -42107,7 +42107,7 @@ _08113C1E:
add r4, sp, 0xC
adds r0, r4, 0
bl sub_80A6B30
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r0, [r0]
strh r0, [r5, 0x1C]
ldr r1, =0x00003f42
@ -42125,11 +42125,11 @@ _08113C1E:
lsls r0, 24
cmp r0, 0
bne _08113CB0
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
b _08113CAA
.pool
_08113C80:
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
ldrh r0, [r0]
strh r0, [r5, 0x1C]
ldr r1, =0x00003f44
@ -42146,7 +42146,7 @@ _08113C80:
lsls r0, 24
cmp r0, 0
bne _08113CB0
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
_08113CAA:
ldrh r0, [r1]
adds r0, 0xF0
@ -42426,14 +42426,14 @@ _08113EF8:
ldr r1, =0x00003f42
movs r0, 0x50
bl SetGpuReg
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
b _08113F2E
.pool
_08113F24:
ldr r1, =0x00003f44
movs r0, 0x50
bl SetGpuReg
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
_08113F2E:
ldrh r0, [r1]
adds r0, 0xF0
@ -42447,7 +42447,7 @@ _08113F40:
bne _08113F68
mov r0, sp
bl sub_80A6B30
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r0, [r0]
strh r0, [r5, 0x1C]
mov r0, sp
@ -42459,7 +42459,7 @@ _08113F40:
b _08113F78
.pool
_08113F68:
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
ldrh r0, [r0]
strh r0, [r5, 0x1C]
movs r0, 0
@ -43324,7 +43324,7 @@ _0811465C:
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
ldr r0, =gSprites
lsls r1, r4, 4
adds r1, r4
@ -43334,7 +43334,7 @@ _0811465C:
negs r0, r0
adds r0, 0x60
strh r0, [r2]
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
ldrh r0, [r1, 0x22]
negs r0, r0
adds r0, 0x20
@ -43399,7 +43399,7 @@ sub_8114748: @ 8114748
adds r0, 0x4
movs r5, 0
strh r0, [r4, 0x1C]
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
ldrh r3, [r2]
subs r1, r3, 0x4
strh r1, [r2]
@ -43586,7 +43586,7 @@ _08114902:
beq _0811492E
_08114908:
adds r0, r4, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
@ -44104,17 +44104,17 @@ _08114D3C:
strh r0, [r4, 0x1E]
cmp r0, 0x1
bne _08114D70
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r4, 0x20]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
b _08114D78
.pool
_08114D70:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r0, [r0]
strh r0, [r4, 0x20]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
_08114D78:
ldrh r0, [r0]
strh r0, [r4, 0x22]
@ -44189,11 +44189,11 @@ _08114DF6:
ldrsh r0, [r4, r1]
cmp r0, 0x1
bne _08114E20
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
b _08114E22
.pool
_08114E20:
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
_08114E22:
ldrh r0, [r4, 0x22]
subs r0, r2
@ -44210,11 +44210,11 @@ _08114E22:
ldrsh r0, [r4, r3]
cmp r0, 0x1
bne _08114E4C
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
b _08114E4E
.pool
_08114E4C:
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
_08114E4E:
ldrh r0, [r4, 0x22]
subs r0, r2
@ -44296,11 +44296,11 @@ sub_8114EB4: @ 8114EB4
lsrs r0, 24
cmp r0, 0x1
bne _08114F00
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
b _08114F02
.pool
_08114F00:
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
_08114F02:
strh r4, [r0]
adds r0, r5, 0
@ -44450,11 +44450,11 @@ _08115018:
strh r0, [r4, 0x1E]
cmp r0, 0x1
bne _08115044
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
b _08115046
.pool
_08115044:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
_08115046:
ldrh r0, [r0]
strh r0, [r4, 0x20]
@ -44540,13 +44540,13 @@ sub_81150E0: @ 81150E0
lsrs r4, r2, 16
cmp r0, 0x1
bne _08115104
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r3, [r0]
ldr r0, =0x04000014
b _0811510A
.pool
_08115104:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r3, [r0]
ldr r0, =0x04000018
_0811510A:
@ -47996,7 +47996,7 @@ _08116CAC:
adds r1, 0x1
movs r2, 0x2
bl LoadPalette
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
ldr r0, =gSprites
lsls r1, r4, 4
adds r1, r4
@ -48006,7 +48006,7 @@ _08116CAC:
negs r0, r0
adds r0, 0x20
strh r0, [r2]
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
ldrh r0, [r1, 0x22]
negs r0, r0
adds r0, 0x20
@ -48050,7 +48050,7 @@ sub_8116D64: @ 8116D64
movs r1, 0
mov r8, r1
strh r0, [r5, 0x1C]
ldr r7, =gUnknown_02022E1A
ldr r7, =gBattle_BG1_Y
ldrh r2, [r7]
subs r1, r2, 0x4
strh r1, [r7]
@ -48537,10 +48537,10 @@ _081171F8:
movs r2, 0x20
bl LoadCompressedPalette
_08117206:
ldr r3, =gUnknown_02022E18
ldr r3, =gBattle_BG1_X
movs r2, 0
strh r2, [r3]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r2, [r0]
ldr r1, =gUnknown_0203A110
ldr r0, [r1]
@ -48645,7 +48645,7 @@ sub_81172EC: @ 81172EC
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
ldr r1, =gTasks
lsls r0, r6, 2
adds r0, r6
@ -49497,10 +49497,10 @@ _081179CC:
ldr r0, [sp, 0x5C]
movs r2, 0x20
bl LoadCompressedPalette
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
ldr r1, =gTasks
mov r2, r9
@ -49563,7 +49563,7 @@ _08117A7E:
ldrsh r0, [r3, r1]
cmp r0, 0
bge _08117AA4
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
lsls r1, r4, 16
asrs r1, 24
ldrh r0, [r2]
@ -49572,7 +49572,7 @@ _08117A7E:
b _08117AB0
.pool
_08117AA4:
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
lsls r0, r4, 16
asrs r0, 24
ldrh r2, [r1]
@ -50529,14 +50529,14 @@ sub_811828C: @ 811828C
lsls r0, 24
lsrs r0, 24
bl DestroyTask
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
movs r0, 0x50
movs r1, 0
@ -50569,7 +50569,7 @@ task_battle_intro_80BC47C: @ 81182EC
sub sp, 0x4
lsls r0, 24
lsrs r4, r0, 24
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldrh r0, [r1]
adds r0, 0x6
strh r0, [r1]
@ -50697,7 +50697,7 @@ _08118400:
ldrsh r0, [r2, r1]
cmp r0, 0x1
bne _08118420
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
ldrh r1, [r2]
ldr r0, =0x0000ffb0
cmp r1, r0
@ -50706,7 +50706,7 @@ _08118400:
b _0811842C
.pool
_08118420:
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
ldrh r1, [r2]
ldr r0, =0x0000ffc8
cmp r1, r0
@ -50861,13 +50861,13 @@ _08118568:
cmp r0, 0x4
bne _08118580
_0811856C:
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldrh r0, [r1]
adds r0, 0x8
b _0811857E
.pool
_08118578:
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldrh r0, [r1]
adds r0, 0x6
_0811857E:
@ -50882,7 +50882,7 @@ _08118580:
adds r6, r0, 0
cmp r1, 0x4
bne _081185E4
ldr r7, =gUnknown_02022E1A
ldr r7, =gBattle_BG1_Y
ldrh r0, [r4, 0x14]
bl Cos2
lsls r0, 16
@ -51202,7 +51202,7 @@ task_battle_intro_anim: @ 8118844
sub sp, 0x4
lsls r0, 24
lsrs r5, r0, 24
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldrh r0, [r1]
adds r0, 0x8
strh r0, [r1]
@ -51505,7 +51505,7 @@ task00_battle_intro_wireless: @ 8118AC0
ldrsh r0, [r7, r2]
cmp r0, 0
bne _08118B36
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
ldrh r1, [r2]
movs r0, 0x80
lsls r0, 8
@ -51519,7 +51519,7 @@ task00_battle_intro_wireless: @ 8118AC0
_08118AFE:
adds r0, r1, 0x3
strh r0, [r2]
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
ldrh r0, [r1]
subs r0, 0x3
strh r0, [r1]
@ -51878,10 +51878,10 @@ _08118DD4:
ldr r2, =0x0000ffd0
adds r0, r2, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
movs r0, 0xF0
strh r0, [r1]
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
subs r2, 0xC0
adds r0, r2, 0
strh r0, [r1]
@ -51958,10 +51958,10 @@ _08118EC2:
subs r0, r1, 0x2
strh r0, [r3, 0xC]
_08118ED8:
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldrh r0, [r3, 0xC]
strh r0, [r1]
ldr r2, =gUnknown_02022E1C
ldr r2, =gBattle_BG2_X
negs r1, r0
strh r1, [r2]
lsls r0, 16
@ -51977,7 +51977,7 @@ _08118F00:
ldrh r0, [r1]
adds r3, r0, 0x2
strh r3, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
ldrh r0, [r1]
adds r0, 0x2
strh r0, [r1]
@ -52078,7 +52078,7 @@ sub_8118FBC: @ 8118FBC
lsls r5, 16
lsrs r5, 16
adds r0, r4, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
ldr r1, =gBattleSpritesGfx

66
asm/battle_anim_815A0D4.s
View File

@ -1655,11 +1655,11 @@ _0815AE08:
strh r2, [r5, 0x16]
cmp r7, 0x1
bne _0815AE30
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
b _0815AE32
.pool
_0815AE30:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
_0815AE32:
ldrh r2, [r0]
strh r2, [r5, 0x18]
@ -3385,7 +3385,7 @@ _0815BC02:
lsls r0, 24
cmp r0, 0
beq _0815BC34
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldr r3, =0x0000ffc8
b _0815BC5C
.pool
@ -3396,19 +3396,19 @@ _0815BC34:
lsls r0, 24
cmp r0, 0
beq _0815BC58
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldr r2, =0x0000ff79
adds r0, r2, 0
b _0815BC5E
.pool
_0815BC58:
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldr r3, =0x0000fff6
_0815BC5C:
adds r0, r3, 0
_0815BC5E:
strh r0, [r1]
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
movs r0, 0
strh r0, [r1]
mov r0, sp
@ -3428,10 +3428,10 @@ _0815BC5E:
adds r1, r4
lsls r1, 3
adds r1, r0
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r1, 0x1C]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r0, [r0]
strh r0, [r1, 0x1E]
ldrh r0, [r1, 0x8]
@ -3507,7 +3507,7 @@ _0815BD20:
ldrsh r0, [r4, r2]
cmp r0, 0
bne _0815BDF2
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
ldr r1, =gUnknown_085CE460
movs r3, 0xC
ldrsh r0, [r4, r3]
@ -3577,10 +3577,10 @@ _0815BDC8:
movs r1, 0x4
movs r2, 0x1
bl lcd_bg_operations
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
movs r0, 0x50
movs r1, 0
@ -3990,7 +3990,7 @@ _0815C124:
lsls r0, 24
cmp r0, 0
beq _0815C15C
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldr r3, =0x0000ffc8
adds r0, r3, 0
b _0815C1CA
@ -4008,48 +4008,48 @@ _0815C15C:
bne _0815C1B4
cmp r4, 0x1
bne _0815C180
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldr r2, =0x0000ff65
adds r0, r2, 0
strh r0, [r1]
_0815C180:
cmp r4, 0x3
bne _0815C18C
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldr r3, =0x0000ff8d
adds r0, r3, 0
strh r0, [r1]
_0815C18C:
cmp r4, 0
bne _0815C196
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
movs r0, 0xE
strh r0, [r1]
_0815C196:
cmp r4, 0x2
bne _0815C1CC
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldr r2, =0x0000ffec
b _0815C1C8
.pool
_0815C1B4:
cmp r4, 0x1
bne _0815C1C0
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldr r3, =0x0000ff79
adds r0, r3, 0
strh r0, [r1]
_0815C1C0:
cmp r4, 0
bne _0815C1CC
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldr r2, =0x0000fff6
_0815C1C8:
adds r0, r2, 0
_0815C1CA:
strh r0, [r1]
_0815C1CC:
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
movs r0, 0
strh r0, [r1]
mov r0, sp
@ -4069,10 +4069,10 @@ _0815C1CC:
adds r1, r6
lsls r1, 3
adds r1, r0
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r1, 0x1C]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r0, [r0]
strh r0, [r1, 0x1E]
b _0815C2A4
@ -4092,7 +4092,7 @@ _0815C224:
lsrs r0, 24
cmp r0, 0x1
bne _0815C268
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
ldr r1, =gUnknown_085CE4A4
movs r3, 0xC
ldrsh r0, [r5, r3]
@ -4105,7 +4105,7 @@ _0815C224:
b _0815C27A
.pool
_0815C268:
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
ldr r1, =gUnknown_085CE4A4
movs r3, 0xC
ldrsh r0, [r5, r3]
@ -4235,10 +4235,10 @@ _0815C36C:
movs r1, 0x4
movs r2, 0x1
bl lcd_bg_operations
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
movs r0, 0x50
movs r1, 0
@ -6133,9 +6133,9 @@ _0815D2B4:
ldr r1, =0x00003f42
movs r0, 0x50
bl SetGpuReg
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r5, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
b _0815D316
.pool
_0815D304:
@ -6144,9 +6144,9 @@ _0815D304:
ldr r1, =0x00003f44
movs r0, 0x50
bl SetGpuReg
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r5, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
_0815D316:
ldrh r3, [r0]
movs r7, 0
@ -6223,17 +6223,17 @@ sub_815D398: @ 815D398
lsrs r0, 24
cmp r0, 0x1
bne _0815D3D8
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r0, [r0]
str r0, [sp, 0x4]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
b _0815D3E0
.pool
_0815D3D8:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r0, [r0]
str r0, [sp, 0x4]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
_0815D3E0:
ldrh r0, [r0]
str r0, [sp, 0x8]

26
asm/battle_anim_8170478.s
View File

@ -168,12 +168,12 @@ sub_8170478: @ 8170478
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldrh r0, [r7, 0x20]
negs r0, r0
adds r0, 0x20
strh r0, [r1]
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
ldrh r0, [r7, 0x22]
negs r0, r0
subs r0, 0x20
@ -225,7 +225,7 @@ sub_8170660: @ 8170660
adds r1, r0
movs r3, 0
strh r1, [r5, 0x22]
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
lsls r0, r1, 16
lsrs r0, 24
ldrh r4, [r2]
@ -1283,7 +1283,7 @@ _08170F54:
lsls r4, 24
lsrs r4, 24
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
bl sub_80A82E4
@ -1335,7 +1335,7 @@ _08170F54:
ldr r0, =SpriteCallbackDummy
str r0, [r4]
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBankSpriteIds
lsls r0, 24
lsrs r0, 24
@ -1371,7 +1371,7 @@ sub_8171030: @ 8171030
lsrs r5, r0, 24
ldr r6, =gSprites
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBankSpriteIds
lsls r0, 24
lsrs r0, 24
@ -1422,7 +1422,7 @@ sub_81710A8: @ 81710A8
lsrs r5, r0, 24
ldr r6, =gSprites
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r4, =gBankSpriteIds
lsls r0, 24
lsrs r0, 24
@ -1438,7 +1438,7 @@ sub_81710A8: @ 81710A8
cmp r0, 0
bge _081710F4
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r0, r4
@ -5575,7 +5575,7 @@ sub_817330C: @ 817330C
movs r0, 0x1E
strh r0, [r4, 0x2E]
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
movs r1, 0
@ -5587,7 +5587,7 @@ sub_817330C: @ 817330C
adds r0, r1
strh r0, [r4, 0x32]
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@ -5732,7 +5732,7 @@ sub_817345C: @ 817345C
.pool
_08173478:
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gAnimationBankAttacker
strb r0, [r1]
movs r0, 0x1
@ -5740,12 +5740,12 @@ _08173478:
.pool
_0817348C:
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gAnimationBankAttacker
strb r0, [r1]
movs r0, 0
_08173498:
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gAnimationBankTarget
strb r0, [r1]
_081734A0:

14
asm/battle_controller_opponent.s
View File

@ -5323,7 +5323,7 @@ _08062062:
cmp r0, 0
beq _0806209C
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r5, =gBankTarget
strb r0, [r5]
ldr r0, =gAbsentBankFlags
@ -5337,7 +5337,7 @@ _08062062:
cmp r1, 0
beq _0806209C
movs r0, 0x2
bl GetBankByPlayerAI
bl GetBankByIdentity
strb r0, [r5]
_0806209C:
ldr r0, =gBankTarget
@ -5394,7 +5394,7 @@ _08062108:
lsls r1, 24
lsrs r1, 24
adds r0, r1, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 16
@ -5406,7 +5406,7 @@ _08062108:
.pool
_0806213C:
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 16
@ -5468,7 +5468,7 @@ sub_8062188: @ 8062188
cmp r0, 0
bne _080621D4
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r5, r0, 24
adds r7, r5, 0
@ -5476,11 +5476,11 @@ sub_8062188: @ 8062188
.pool
_080621D4:
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r7, r0, 24
movs r0, 0x3
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r5, r0, 24
_080621E8:

18
asm/battle_controller_player.s
View File

@ -358,7 +358,7 @@ _0805775A:
cmp r0, 0x2
bne _080577E8
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gAbsentBankFlags
ldrb r1, [r1]
ldr r2, =gBitTable
@ -622,7 +622,7 @@ _080579F0:
mov r1, sp
adds r0, r1, r4
ldrb r0, [r0]
bl GetBankByPlayerAI
bl GetBankByIdentity
strb r0, [r5]
ldr r1, =gNoOfAllBanks
lsls r0, 24
@ -750,7 +750,7 @@ _08057B14:
mov r1, sp
adds r0, r1, r4
ldrb r0, [r0]
bl GetBankByPlayerAI
bl GetBankByIdentity
strb r0, [r5]
ldr r1, =gNoOfAllBanks
lsls r0, 24
@ -942,7 +942,7 @@ _08057CC4:
movs r0, 0x1
ands r0, r1
eors r0, r2
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gUnknown_03005D74
strb r0, [r1]
_08057CDE:
@ -1035,7 +1035,7 @@ _08057D80:
.pool
_08057DA8:
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gAbsentBankFlags
ldrb r1, [r1]
ldr r2, =gBitTable
@ -1052,7 +1052,7 @@ _08057DA8:
_08057DD0:
movs r0, 0x1
_08057DD2:
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gUnknown_03005D74
_08057DD8:
strb r0, [r1]
@ -8024,7 +8024,7 @@ sub_805BBC4: @ 805BBC4
ldr r5, =gActiveBank
ldrb r4, [r5]
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@ -8063,7 +8063,7 @@ sub_805BC18: @ 805BC18
strb r0, [r1]
ldrb r4, [r5]
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@ -8551,7 +8551,7 @@ _0805C062:
movs r1, 0
bl sub_8059CB4
ldr r0, =gText_WhatWillPkmnDo
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0x1
bl sub_814F9EC

8
asm/battle_controller_player_partner.s
View File

@ -5045,7 +5045,7 @@ _081BDB02:
cmp r0, 0
beq _081BDB3C
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r4, =gBankTarget
strb r0, [r4]
ldr r0, =gAbsentBankFlags
@ -5059,7 +5059,7 @@ _081BDB02:
cmp r1, 0
beq _081BDB3C
movs r0, 0x3
bl GetBankByPlayerAI
bl GetBankByIdentity
strb r0, [r4]
_081BDB3C:
ldr r0, =gBankTarget
@ -5093,11 +5093,11 @@ sub_81BDB7C: @ 81BDB7C
cmp r4, 0x6
bne _081BDBD0
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0x2
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0x3

6
asm/battle_controller_safari.s
View File

@ -700,7 +700,7 @@ sub_8159910: @ 8159910
ldr r5, =gActiveBank
ldrb r4, [r5]
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@ -739,7 +739,7 @@ sub_8159964: @ 8159964
strb r0, [r1]
ldrb r4, [r5]
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@ -879,7 +879,7 @@ _08159AAE:
movs r1, 0
bl sub_8059CB4
ldr r0, =gText_WhatWillPkmnDo2
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0x1
bl sub_814F9EC

6
asm/battle_controller_wally.s
View File

@ -3232,7 +3232,7 @@ sub_816A084: @ 816A084
ldr r5, =gActiveBank
ldrb r4, [r5]
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@ -3271,7 +3271,7 @@ sub_816A0D8: @ 816A0D8
strb r0, [r1]
ldrb r4, [r5]
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@ -3693,7 +3693,7 @@ _0816A48A:
movs r1, 0
bl sub_8059CB4
ldr r0, =gText_WhatWillWallyDo
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0x1
bl sub_814F9EC

164
asm/battle_frontier_1.s
View File

@ -3165,9 +3165,9 @@ _0819044E:
strh r4, [r0]
ldr r0, =gUnknown_02022E16
strh r4, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r4, [r0]
ldr r0, =gUnknown_02022E20
strh r4, [r0]
@ -3176,16 +3176,16 @@ _0819044E:
mov r2, r9
cmp r2, 0x2
bne _081904DC
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r4, [r0]
b _081904E6
.pool
_081904DC:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r4, [r0]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0xA0
strh r0, [r1]
_081904E6:
@ -4371,9 +4371,9 @@ _08190E98:
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r1, [r0]
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
movs r0, 0xA0
strh r0, [r1]
b _08190EE6
@ -4384,9 +4384,9 @@ _08190ED4:
ldr r1, =gUnknown_02022E16
movs r0, 0xA0
strh r0, [r1]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r2, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r2, [r0]
_08190EE6:
cmp r6, 0x1
@ -4396,9 +4396,9 @@ _08190EE6:
ldrb r1, [r0, 0x10]
cmp r1, 0
bne _08190F50
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r1, [r0]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r6, 0xA0
lsls r6, 1
adds r0, r6, 0
@ -4424,12 +4424,12 @@ _08190EE6:
b _08191084
.pool
_08190F50:
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r6, 0x80
lsls r6, 1
adds r0, r6, 0
strh r0, [r1]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
movs r4, 0
strh r4, [r0]
ldr r3, =gUnknown_0860D080
@ -4473,9 +4473,9 @@ _08190F9C:
lsrs r0, 24
adds r1, 0x11
bl sub_8192F08
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r5, [r0]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r3, 0xA0
lsls r3, 1
adds r0, r3, 0
@ -4508,10 +4508,10 @@ _08190FF8:
lsrs r0, 24
adds r1, 0x11
bl sub_8192F08
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r0, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r2, 0xA0
lsls r2, 1
adds r0, r2, 0
@ -4529,12 +4529,12 @@ _08190FF8:
b _08191084
.pool
_0819104C:
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r3, 0x80
lsls r3, 1
adds r0, r3, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0xA0
strh r0, [r1]
ldr r1, =gTasks
@ -4770,9 +4770,9 @@ _08191234:
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r1, [r0]
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
ldr r2, =0x0000ff60
adds r0, r2, 0
strh r0, [r1]
@ -4785,9 +4785,9 @@ _08191278:
ldr r3, =0x0000ff60
adds r0, r3, 0
strh r0, [r1]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r2, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r2, [r0]
_0819128C:
cmp r6, 0x2
@ -4797,9 +4797,9 @@ _0819128C:
ldrb r1, [r0, 0x10]
cmp r1, 0
bne _081912F4
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r1, [r0]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0xA0
strh r0, [r1]
ldr r3, =gUnknown_0860D080
@ -4823,10 +4823,10 @@ _0819128C:
b _0819141C
.pool
_081912F4:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
movs r4, 0
strh r4, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r4, [r0]
ldr r3, =gUnknown_0860D080
ldr r2, =gTasks
@ -4869,9 +4869,9 @@ _0819133C:
lsrs r0, 24
adds r1, 0x11
bl sub_8192F08
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r5, [r0]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0xA0
strh r0, [r1]
ldr r2, [r6]
@ -4902,10 +4902,10 @@ _08191394:
lsrs r0, 24
adds r1, 0x11
bl sub_8192F08
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r0, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0xA0
strh r0, [r1]
ldr r2, [r6]
@ -4921,12 +4921,12 @@ _08191394:
b _0819141C
.pool
_081913E4:
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r4, 0x80
lsls r4, 1
adds r0, r4, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0
strh r0, [r1]
ldr r1, =gTasks
@ -5162,12 +5162,12 @@ _081915CC:
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
movs r6, 0x80
lsls r6, 1
adds r0, r6, 0
strh r0, [r2]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
b _08191622
.pool
@ -5179,9 +5179,9 @@ _0819160C:
strh r0, [r1]
ldr r0, =gUnknown_02022E16
strh r2, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r2, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r2, [r0]
_08191622:
ldr r0, =gUnknown_0203CD78
@ -5189,12 +5189,12 @@ _08191622:
ldrb r0, [r4, 0x10]
cmp r0, 0
bne _08191688
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r4, 0x80
lsls r4, 1
adds r0, r4, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0xA0
strh r0, [r1]
ldr r3, =gUnknown_0860D080
@ -5218,12 +5218,12 @@ _08191622:
b _081916C6
.pool
_08191688:
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r6, 0x80
lsls r6, 1
adds r0, r6, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0
strh r0, [r1]
ldr r3, =gUnknown_0860D15C
@ -5462,12 +5462,12 @@ _0819187C:
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
movs r6, 0x80
lsls r6, 1
adds r0, r6, 0
strh r0, [r2]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
b _081918D2
.pool
@ -5479,9 +5479,9 @@ _081918BC:
strh r0, [r1]
ldr r0, =gUnknown_02022E16
strh r2, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r2, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r2, [r0]
_081918D2:
ldr r0, =gUnknown_0203CD78
@ -5489,12 +5489,12 @@ _081918D2:
ldrb r0, [r2, 0x10]
cmp r0, 0
bne _08191924
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r4, 0x80
lsls r4, 1
adds r0, r4, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0xA0
strh r0, [r1]
ldr r1, =gTasks
@ -5510,10 +5510,10 @@ _081918D2:
b _08191958
.pool
_08191924:
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r0, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0xA0
strh r0, [r1]
ldr r1, =gTasks
@ -5749,12 +5749,12 @@ _08191B08:
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
movs r6, 0xFF
lsls r6, 8
adds r0, r6, 0
strh r0, [r2]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
b _08191B5E
.pool
@ -5766,9 +5766,9 @@ _08191B48:
strh r0, [r1]
ldr r0, =gUnknown_02022E16
strh r2, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r2, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r2, [r0]
_08191B5E:
ldr r0, =gUnknown_0203CD78
@ -5776,19 +5776,19 @@ _08191B5E:
ldrb r0, [r0, 0x10]
cmp r0, 0x1
bne _08191B94
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r0, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0xA0
strh r0, [r1]
b _08191B9E
.pool
_08191B94:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
_08191B9E:
ldr r4, =gUnknown_0860D15C
@ -6016,12 +6016,12 @@ _08191D68:
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r2, =gUnknown_02022E18
ldr r2, =gBattle_BG1_X
movs r6, 0xFF
lsls r6, 8
adds r0, r6, 0
strh r0, [r2]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
b _08191DBE
.pool
@ -6033,9 +6033,9 @@ _08191DA8:
strh r0, [r1]
ldr r0, =gUnknown_02022E16
strh r2, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r2, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r2, [r0]
_08191DBE:
ldr r0, =gUnknown_0203CD78
@ -6043,12 +6043,12 @@ _08191DBE:
ldrb r0, [r2, 0x10]
cmp r0, 0x2
bne _08191E10
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r4, 0x80
lsls r4, 1
adds r0, r4, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0xA0
strh r0, [r1]
ldr r1, =gTasks
@ -6064,10 +6064,10 @@ _08191DBE:
b _08191E44
.pool
_08191E10:
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
movs r0, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
movs r0, 0xA0
strh r0, [r1]
ldr r1, =gTasks
@ -6310,11 +6310,11 @@ _08191FF8:
ldrh r0, [r1]
subs r0, 0x4
strh r0, [r1]
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
ldrh r0, [r1]
subs r0, 0x4
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
b _081920A4
.pool
_08192038:
@ -6335,11 +6335,11 @@ _08192038:
ldrh r0, [r1]
adds r0, 0x4
strh r0, [r1]
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
ldrh r0, [r1]
adds r0, 0x4
strh r0, [r1]
ldr r1, =gUnknown_02022E1E
ldr r1, =gBattle_BG2_Y
b _081920E8
.pool
_08192078:
@ -6360,11 +6360,11 @@ _08192078:
ldrh r0, [r1]
subs r0, 0x4
strh r0, [r1]
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldrh r0, [r1]
subs r0, 0x4
strh r0, [r1]
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
_081920A4:
ldrh r0, [r1]
subs r0, 0x4
@ -6389,11 +6389,11 @@ _081920BC:
ldrh r0, [r1]
adds r0, 0x4
strh r0, [r1]
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
ldrh r0, [r1]
adds r0, 0x4
strh r0, [r1]
ldr r1, =gUnknown_02022E1C
ldr r1, =gBattle_BG2_X
_081920E8:
ldrh r0, [r1]
adds r0, 0x4
@ -10404,9 +10404,9 @@ _0819427C:
strh r4, [r0]
ldr r0, =gUnknown_02022E16
strh r4, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r4, [r0]
movs r0, 0x2
movs r1, 0
@ -11366,19 +11366,19 @@ sub_8194B70: @ 8194B70
ldrh r1, [r0]
movs r0, 0x12
bl SetGpuReg
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r1, [r0]
movs r0, 0x18
bl SetGpuReg
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
ldrh r1, [r0]
movs r0, 0x1A
bl SetGpuReg
@ -11494,11 +11494,11 @@ sub_8194CE4: @ 8194CE4
ldrh r1, [r0]
movs r0, 0x12
bl SetGpuReg
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg

8
asm/battle_frontier_2.s
View File

@ -20578,7 +20578,7 @@ _081A5328:
negs r0, r0
strb r0, [r1, 0x1]
ldr r0, =gText_JapaneseHonorific
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r4, =gDisplayedStringBattle
adds r0, r4, 0
movs r1, 0xF
@ -20587,7 +20587,7 @@ _081A5328:
movs r1, 0x10
bl sub_814F9EC
ldr r0, =gText_RivalBuffer
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
adds r0, r4, 0
movs r1, 0x11
bl sub_814F9EC
@ -20601,7 +20601,7 @@ _081A5328:
movs r1, 0x14
bl sub_814F9EC
ldr r0, =gText_Judgement
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
adds r0, r4, 0
movs r1, 0x15
bl sub_814F9EC
@ -20685,7 +20685,7 @@ _081A5464:
movs r3, 0x1
bl sub_81A5558
ldr r0, =gText_Judgement
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0x15
bl sub_814F9EC

24
asm/battle_message.s
View File

@ -687,7 +687,7 @@ _0814E6CC:
ldr r7, [r0]
_0814E6D8:
adds r0, r7, 0
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
_0814E6DE:
pop {r3-r5}
mov r8, r3
@ -699,15 +699,15 @@ _0814E6DE:
.pool
thumb_func_end BufferStringBattle
thumb_func_start StrCpyDecodeToDisplayedStringBattle
StrCpyDecodeToDisplayedStringBattle: @ 814E6F0
thumb_func_start BattleStringExpandPlaceholdersToDisplayedString
BattleStringExpandPlaceholdersToDisplayedString: @ 814E6F0
push {lr}
ldr r1, =gDisplayedStringBattle
bl BattleStringExpandPlaceholders
pop {r1}
bx r1
.pool
thumb_func_end StrCpyDecodeToDisplayedStringBattle
thumb_func_end BattleStringExpandPlaceholdersToDisplayedString
thumb_func_start AppendStatusString
AppendStatusString: @ 814E700
@ -924,7 +924,7 @@ _0814E920:
.pool
_0814E92C:
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
@ -943,7 +943,7 @@ _0814E92C:
.pool
_0814E960:
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
@ -962,7 +962,7 @@ _0814E960:
.pool
_0814E994:
movs r0, 0x2
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
@ -981,7 +981,7 @@ _0814E994:
.pool
_0814E9C8:
movs r0, 0x3
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
@ -1126,7 +1126,7 @@ _0814EB36:
adds r1, r0, 0
movs r0, 0x1
ands r0, r1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
@ -1147,7 +1147,7 @@ _0814EB74:
adds r1, r0, 0
movs r0, 0x1
ands r0, r1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
@ -1177,7 +1177,7 @@ _0814EBB0:
adds r1, r0, 0
movs r0, 0x1
ands r0, r1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23
@ -1199,7 +1199,7 @@ _0814EBF8:
adds r1, r0, 0
movs r0, 0x1
ands r0, r1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBattlePartyID
lsls r0, 24
lsrs r0, 23

56
asm/contest.s
View File

@ -50,13 +50,13 @@ sub_80D7678: @ 80D7678
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E20
strh r1, [r0]
@ -611,10 +611,10 @@ _080D7BF6:
.pool
_080D7C04:
bl sub_80DE224
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
movs r0, 0x2
bl BeginFastPaletteFade
@ -1190,7 +1190,7 @@ _080D814C:
strh r0, [r4, 0x8]
b _080D822C
_080D8176:
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
ldrh r0, [r1]
adds r0, 0x7
strh r0, [r1]
@ -1324,19 +1324,19 @@ vblank_cb_battle: @ 80D827C
ldrh r1, [r0]
movs r0, 0x12
bl SetGpuReg
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r1, [r0]
movs r0, 0x18
bl SetGpuReg
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
ldrh r1, [r0]
movs r0, 0x1A
bl SetGpuReg
@ -1389,7 +1389,7 @@ sub_80D833C: @ 80D833C
bne _080D840C
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
bl sub_80DCD48
ldr r1, =gPlttBufferUnfaded
@ -1520,7 +1520,7 @@ sub_80D8490: @ 80D8490
ldr r0, =gUnknown_02022E16
movs r1, 0xA0
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
movs r6, 0
ldr r0, =gUnknown_02039F25
@ -1773,7 +1773,7 @@ _080D86E4:
ldr r0, =gUnknown_02022E16
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
ldr r1, =gTasks
lsls r0, r7, 2
@ -2044,7 +2044,7 @@ sub_80D895C: @ 80D895C
ldr r0, =gUnknown_02022E16
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
movs r0, 0
bl sub_80DC490
@ -5325,7 +5325,7 @@ sub_80DA5E8: @ 80DA5E8
ldr r0, =gUnknown_02022E16
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
ldr r4, =gUnknown_02039F34
movs r3, 0
@ -5404,9 +5404,9 @@ sub_80DA6B4: @ 80DA6B4
cmp r4, 0
bne _080DA6EA
bl sub_80DE224
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r4, [r0]
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
movs r0, 0xA0
strh r0, [r1]
movs r0, 0x62
@ -5432,7 +5432,7 @@ sub_80DA700: @ 80DA700
push {lr}
lsls r0, 24
lsrs r3, r0, 24
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
ldrh r0, [r1]
subs r0, 0x7
strh r0, [r1]
@ -8519,7 +8519,7 @@ sub_80DBF68: @ 80DBF68
ldr r0, =gUnknown_02022E16
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
bl sub_80DB89C
ldr r0, =gUnknown_0827E8DA
@ -12881,10 +12881,10 @@ sub_80DE224: @ 80DE224
ldrh r1, [r5]
movs r0, 0xC
bl SetGpuReg
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
movs r0, 0xF0
strh r0, [r1]
ldr r4, =gUnknown_02022E1A
ldr r4, =gBattle_BG1_Y
movs r0, 0xA0
strh r0, [r4]
movs r0, 0x14
@ -13004,9 +13004,9 @@ sub_80DE350: @ 80DE350
ldrh r1, [r3]
movs r0, 0xA
bl SetGpuReg
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r5, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r5, [r0]
ldr r7, =gSprites
_080DE3CA:
@ -13051,10 +13051,10 @@ sub_80DE424: @ 80DE424
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
movs r0, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
movs r0, 0xA0
strh r0, [r1]
movs r0, 0x62
@ -13078,7 +13078,7 @@ sub_80DE464: @ 80DE464
push {lr}
lsls r0, 24
lsrs r3, r0, 24
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
ldrh r0, [r1]
subs r0, 0x7
strh r0, [r1]
@ -13233,7 +13233,7 @@ sub_80DE5C0: @ 80DE5C0
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
ldrh r0, [r1]
adds r0, 0x7
strh r0, [r1]

18
asm/contest_link_80F57C4.s
View File

@ -97,13 +97,13 @@ _080F57E0:
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E20
strh r1, [r0]
@ -449,19 +449,19 @@ sub_80F5C24: @ 80F5C24
ldrh r1, [r0]
movs r0, 0x12
bl SetGpuReg
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r1, [r0]
movs r0, 0x18
bl SetGpuReg
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
ldrh r1, [r0]
movs r0, 0x1A
bl SetGpuReg
@ -1989,7 +1989,7 @@ sub_80F69B8: @ 80F69B8
_080F69DE:
adds r0, r7, 0
ldr r1, [sp, 0x28]
bl sub_80D2EDC
bl GetMonIconPtr
adds r3, r0, 0
lsls r0, r5, 9
adds r0, 0x80

114
asm/evolution_scene.s
View File

@ -170,13 +170,13 @@ evolution_cutscene: @ 813DA8C
strh r2, [r0]
ldr r0, =gUnknown_02022E16
strh r2, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r2, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r2, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r2, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r2, [r0]
ldr r1, =gUnknown_02022E20
movs r2, 0x80
@ -464,13 +464,13 @@ sub_813DD7C: @ 813DD7C
strh r4, [r0]
ldr r0, =gUnknown_02022E16
strh r4, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r4, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r4, [r0]
ldr r1, =gUnknown_02022E20
movs r2, 0x80
@ -634,13 +634,13 @@ _0813DFE0:
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
ldr r2, =gUnknown_02022E20
movs r3, 0x80
@ -945,13 +945,13 @@ sub_813E1D4: @ 813E1D4
strh r4, [r0]
ldr r0, =gUnknown_02022E16
strh r4, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r4, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r4, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r4, [r0]
ldr r1, =gUnknown_02022E20
movs r2, 0x80
@ -1892,12 +1892,12 @@ _0813EC1E:
beq _0813EC2A
b _0813F1A4
_0813EC2A:
bl sub_804F574
bl BufferMoveToLearnIntoBattleTextBuff2
ldr r0, =0x0000016f
bl PlayFanfare
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0xC]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
@ -1991,10 +1991,10 @@ _0813ED0A:
beq _0813ED16
b _0813F1A4
_0813ED16:
bl sub_804F574
bl BufferMoveToLearnIntoBattleTextBuff2
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x10]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
@ -2023,7 +2023,7 @@ _0813ED56:
_0813ED62:
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x14]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
@ -2048,7 +2048,7 @@ _0813ED90:
bne _0813EDCE
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x18]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
@ -2289,7 +2289,7 @@ _0813EFC8:
ldr r3, =0x000004cc
adds r0, r3
ldr r0, [r0]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
@ -2338,7 +2338,7 @@ _0813F05C:
lsls r1, 2
adds r0, r1
ldr r0, [r0]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
@ -2367,7 +2367,7 @@ _0813F09E:
_0813F0AA:
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x1C]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
@ -2395,7 +2395,7 @@ _0813F0D8:
lsls r1, 2
adds r0, r1
ldr r0, [r0]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
@ -2411,7 +2411,7 @@ _0813F0D8:
_0813F120:
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x20]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
@ -2431,7 +2431,7 @@ _0813F120:
_0813F154:
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x24]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0
bl sub_814F9EC
@ -3059,12 +3059,12 @@ _0813F756:
beq _0813F762
b _0813FCC4
_0813F762:
bl sub_804F574
bl BufferMoveToLearnIntoBattleTextBuff2
ldr r0, =0x0000016f
bl PlayFanfare
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0xC]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@ -3160,10 +3160,10 @@ _0813F846:
beq _0813F852
b _0813FCC4
_0813F852:
bl sub_804F574
bl BufferMoveToLearnIntoBattleTextBuff2
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x10]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@ -3193,7 +3193,7 @@ _0813F892:
_0813F89E:
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x14]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@ -3219,7 +3219,7 @@ _0813F8CC:
bne _0813F90C
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x18]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@ -3299,7 +3299,7 @@ _0813F98C:
lsls r1, 3
adds r0, r1
ldr r0, [r0]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@ -3336,7 +3336,7 @@ _0813F9E4:
lsls r1, 3
adds r0, r1
ldr r0, [r0]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@ -3441,7 +3441,7 @@ _0813FAEC:
ldr r1, =0x000004cc
adds r0, r1
ldr r0, [r0]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@ -3481,7 +3481,7 @@ _0813FB3C:
lsls r1, 2
adds r0, r1
ldr r0, [r0]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@ -3511,7 +3511,7 @@ _0813FBB2:
_0813FBBE:
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x1C]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@ -3540,7 +3540,7 @@ _0813FBEC:
lsls r1, 2
adds r0, r1
ldr r0, [r0]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@ -3557,7 +3557,7 @@ _0813FBEC:
_0813FC38:
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x20]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@ -3578,7 +3578,7 @@ _0813FC38:
_0813FC70:
ldr r0, =gBattleStringsTable
ldr r0, [r0, 0x24]
bl StrCpyDecodeToDisplayedStringBattle
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r1, =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
@ -3638,19 +3638,19 @@ sub_813FCDC: @ 813FCDC
ldrh r1, [r0]
movs r0, 0x12
bl SetGpuReg
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r1, [r0]
movs r0, 0x18
bl SetGpuReg
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
ldrh r1, [r0]
movs r0, 0x1A
bl SetGpuReg
@ -3682,19 +3682,19 @@ sub_813FD64: @ 813FD64
ldrh r1, [r0]
movs r0, 0x12
bl SetGpuReg
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r1, [r0]
movs r0, 0x18
bl SetGpuReg
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
ldrh r1, [r0]
movs r0, 0x1A
bl SetGpuReg
@ -3852,9 +3852,9 @@ sub_813FEE8: @ 813FEE8
push {r6,r7}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
mov r8, r0
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
mov r9, r1
ldr r1, =gTasks
lsls r0, r5, 2
@ -3865,8 +3865,8 @@ sub_813FEE8: @ 813FEE8
ldrsh r0, [r0, r2]
cmp r0, 0
bne _0813FF28
ldr r7, =gUnknown_02022E1C
ldr r6, =gUnknown_02022E1E
ldr r7, =gBattle_BG2_X
ldr r6, =gBattle_BG2_Y
b _0813FF2C
.pool
_0813FF28:
@ -4130,12 +4130,12 @@ sub_8140174: @ 8140174
movs r0, 0x50
movs r1, 0
bl SetGpuReg
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r1, [r0]
movs r0, 0x1
movs r1, 0x5

4
asm/menu.s
View File

@ -5201,7 +5201,7 @@ sub_819A25C: @ 819A25C
lsrs r4, 24
lsls r0, 16
lsrs r0, 16
bl sub_80D30B0
bl GetValidMonIconPalettePtr
adds r1, r4, 0
movs r2, 0x20
bl LoadPalette
@ -5228,7 +5228,7 @@ sub_819A27C: @ 819A27C
lsls r5, 16
lsrs r5, 16
movs r2, 0x1
bl sub_80D2EDC
bl GetMonIconPtr
adds r1, r0, 0
movs r0, 0x20
str r0, [sp]

12
asm/party_menu.s
View File

@ -16228,7 +16228,7 @@ _081B8CBE:
bne _081B8CFC
movs r5, 0x1
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
mov r2, sp
ldr r1, =gBattlePartyID
lsls r0, 24
@ -16255,7 +16255,7 @@ _081B8CF0:
_081B8CFC:
movs r5, 0x2
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
mov r1, sp
ldr r4, =gBattlePartyID
lsls r0, 24
@ -16264,7 +16264,7 @@ _081B8CFC:
ldrh r0, [r0]
strb r0, [r1]
movs r0, 0x2
bl GetBankByPlayerAI
bl GetBankByIdentity
mov r1, sp
lsls r0, 24
lsrs r0, 23
@ -16344,19 +16344,19 @@ sub_81B8D88: @ 81B8D88
cmp r0, 0
bne _081B8DB0
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x2
b _081B8DBC
_081B8DB0:
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x3
_081B8DBC:
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r6, r0, 24
bl sub_81B1250

14
asm/pokeball.s
View File

@ -185,7 +185,7 @@ _08075548:
.pool
_08075584:
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
ldr r1, =gBankTarget
strb r0, [r1]
movs r0, 0x1
@ -1199,13 +1199,13 @@ _08075DD4:
lsrs r0, 16
mov r9, r0
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
cmp r5, r0
beq _08075E00
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
cmp r5, r0
@ -1261,13 +1261,13 @@ _08075E70:
.pool
_08075E80:
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
cmp r5, r0
beq _08075E9C
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
cmp r5, r0
@ -1830,7 +1830,7 @@ _080762F8:
movs r0, 0x3A
ldrsh r4, [r5, r0]
movs r0, 0x2
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@ -1903,7 +1903,7 @@ sub_8076398: @ 8076398
movs r0, 0x3A
ldrsh r4, [r5, r0]
movs r0, 0x3
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
cmp r4, r0

16
asm/pokemon_icon.s
View File

@ -32,7 +32,7 @@ sub_80D2CC4: @ 80D2CC4
str r0, [sp, 0x18]
adds r0, r4, 0
adds r2, r5, 0
bl sub_80D2EDC
bl GetMonIconPtr
str r0, [sp, 0x1C]
ldr r0, =gUnknown_0857C5B4
str r0, [sp, 0x20]
@ -271,9 +271,9 @@ _080D2ED2:
bx r1
thumb_func_end sub_80D2E84
thumb_func_start sub_80D2EDC
@ void *sub_80D2EDC(u16 speciesId, u32 personality, bool32)
sub_80D2EDC: @ 80D2EDC
thumb_func_start GetMonIconPtr
@ void *GetMonIconPtr(u16 speciesId, u32 personality, bool32)
GetMonIconPtr: @ 80D2EDC
push {r4,lr}
adds r4, r2, 0
lsls r0, 16
@ -286,7 +286,7 @@ sub_80D2EDC: @ 80D2EDC
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_80D2EDC
thumb_func_end GetMonIconPtr
thumb_func_start sub_80D2EF8
sub_80D2EF8: @ 80D2EF8
@ -534,8 +534,8 @@ sub_80D30A0: @ 80D30A0
.pool
thumb_func_end sub_80D30A0
thumb_func_start sub_80D30B0
sub_80D30B0: @ 80D30B0
thumb_func_start GetValidMonIconPalettePtr
GetValidMonIconPalettePtr: @ 80D30B0
push {lr}
lsls r0, 16
lsrs r2, r0, 16
@ -556,7 +556,7 @@ _080D30C2:
pop {r1}
bx r1
.pool
thumb_func_end sub_80D30B0
thumb_func_end GetValidMonIconPalettePtr
thumb_func_start sub_80D30DC
sub_80D30DC: @ 80D30DC

2
asm/pokemon_item_effect.s
View File

@ -1155,7 +1155,7 @@ _0806C6AE:
movs r0, 0
movs r1, 0
movs r2, 0
bl EmitGetAttributes
bl EmitGetMonData
ldrb r0, [r4]
bl MarkBufferBankForExecution
strb r5, [r4]

2
asm/pokemon_storage_system.s
View File

@ -17910,7 +17910,7 @@ sub_80D07B0: @ 80D07B0
beq _080D0828
adds r0, r5, 0
movs r2, 0x1
bl sub_80D2EDC
bl GetMonIconPtr
adds r4, r0, 0
adds r0, r5, 0
bl sub_80D3080

12
asm/reshow_battle_screen.s
View File

@ -103,13 +103,13 @@ _080A93B0:
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E20
strh r1, [r0]
@ -223,7 +223,7 @@ _080A94F0:
_080A94F8:
bl sub_805EC84
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@ -247,7 +247,7 @@ _080A94F8:
cmp r0, 0
beq _080A955C
movs r0, 0x3
bl GetBankByPlayerAI
bl GetBankByIdentity
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24

30
asm/rom3.s
View File

@ -2134,8 +2134,8 @@ _0803389C:
.pool
thumb_func_end sub_803375C
thumb_func_start EmitGetAttributes
EmitGetAttributes: @ 80338B4
thumb_func_start EmitGetMonData
EmitGetMonData: @ 80338B4
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
@ -2152,7 +2152,7 @@ EmitGetAttributes: @ 80338B4
pop {r0}
bx r0
.pool
thumb_func_end EmitGetAttributes
thumb_func_end EmitGetMonData
thumb_func_start dp01_build_cmdbuf_x01_a_b_0
dp01_build_cmdbuf_x01_a_b_0: @ 80338D8
@ -2175,8 +2175,8 @@ dp01_build_cmdbuf_x01_a_b_0: @ 80338D8
.pool
thumb_func_end dp01_build_cmdbuf_x01_a_b_0
thumb_func_start EmitSetAttributes
EmitSetAttributes: @ 8033900
thumb_func_start EmitSetMonData
EmitSetMonData: @ 8033900
push {r4-r6,lr}
ldr r4, [sp, 0x10]
lsls r0, 24
@ -2209,7 +2209,7 @@ _0803392E:
pop {r0}
bx r0
.pool
thumb_func_end EmitSetAttributes
thumb_func_end EmitSetMonData
thumb_func_start sub_8033940
sub_8033940: @ 8033940
@ -2809,8 +2809,8 @@ dp01_build_cmdbuf_x12_a_bb: @ 8033DE4
.pool
thumb_func_end dp01_build_cmdbuf_x12_a_bb
thumb_func_start sub_8033E10
sub_8033E10: @ 8033E10
thumb_func_start EmitCmd13
EmitCmd13: @ 8033E10
push {lr}
lsls r0, 24
lsrs r0, 24
@ -2825,7 +2825,7 @@ sub_8033E10: @ 8033E10
pop {r0}
bx r0
.pool
thumb_func_end sub_8033E10
thumb_func_end EmitCmd13
thumb_func_start sub_8033E30
sub_8033E30: @ 8033E30
@ -2995,8 +2995,8 @@ EmitExpUpdate: @ 8033F34
.pool
thumb_func_end EmitExpUpdate
thumb_func_start dp01_build_cmdbuf_x1A_aaaa_bbbb
dp01_build_cmdbuf_x1A_aaaa_bbbb: @ 8033F68
thumb_func_start EmitStatusIconUpdate
EmitStatusIconUpdate: @ 8033F68
push {r4-r6,lr}
adds r4, r1, 0
lsls r0, 24
@ -3036,7 +3036,7 @@ dp01_build_cmdbuf_x1A_aaaa_bbbb: @ 8033F68
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x1A_aaaa_bbbb
thumb_func_end EmitStatusIconUpdate
thumb_func_start EmitStatusAnimation
EmitStatusAnimation: @ 8033FBC
@ -3718,8 +3718,8 @@ _08034490:
.pool
thumb_func_end EmitLinkStandbyMsg
thumb_func_start dp01_build_cmdbuf_x38_a
dp01_build_cmdbuf_x38_a: @ 80344A8
thumb_func_start EmitResetActionMoveSelection
EmitResetActionMoveSelection: @ 80344A8
push {lr}
adds r3, r1, 0
lsls r0, 24
@ -3733,7 +3733,7 @@ dp01_build_cmdbuf_x38_a: @ 80344A8
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x38_a
thumb_func_end EmitResetActionMoveSelection
thumb_func_start Emit_x37
Emit_x37: @ 80344C8

24
asm/rom_80A5C6C.s
View File

@ -1830,8 +1830,8 @@ GetBankIdentity: @ 80A6A44
.pool
thumb_func_end GetBankIdentity
thumb_func_start GetBankByPlayerAI
GetBankByPlayerAI: @ 80A6A54
thumb_func_start GetBankByIdentity
GetBankByIdentity: @ 80A6A54
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
@ -1860,7 +1860,7 @@ _080A6A7E:
pop {r1}
bx r1
.pool
thumb_func_end GetBankByPlayerAI
thumb_func_end GetBankByIdentity
thumb_func_start sub_80A6A90
sub_80A6A90: @ 80A6A90
@ -3496,7 +3496,7 @@ _080A76F2:
cmp r5, 0
beq _080A771A
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
bl b_side_obj__get_some_boolean
@ -3504,7 +3504,7 @@ _080A76F2:
cmp r0, 0
beq _080A771A
movs r0, 0
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r0, 0x10
@ -3514,7 +3514,7 @@ _080A771A:
cmp r6, 0
beq _080A7746
movs r0, 0x2
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
bl b_side_obj__get_some_boolean
@ -3522,7 +3522,7 @@ _080A771A:
cmp r0, 0
beq _080A7746
movs r0, 0x2
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@ -3534,7 +3534,7 @@ _080A7746:
cmp r7, 0
beq _080A7772
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
bl b_side_obj__get_some_boolean
@ -3542,7 +3542,7 @@ _080A7746:
cmp r0, 0
beq _080A7772
movs r0, 0x1
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@ -3555,7 +3555,7 @@ _080A7772:
cmp r0, 0
beq _080A77A0
movs r0, 0x3
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
bl b_side_obj__get_some_boolean
@ -3563,7 +3563,7 @@ _080A7772:
cmp r0, 0
beq _080A77A0
movs r0, 0x3
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@ -3592,7 +3592,7 @@ sub_80A77B4: @ 80A77B4
push {lr}
lsls r0, 24
lsrs r0, 24
bl GetBankByPlayerAI
bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
pop {r1}

6
asm/title_screen.s
View File

@ -468,7 +468,7 @@ title_screen_vblank_callback: @ 80AA780
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg
@ -1156,14 +1156,14 @@ _080AAE30:
ldrh r0, [r3, 0x10]
adds r0, 0x1
strh r0, [r3, 0x10]
ldr r2, =gUnknown_02022E1A
ldr r2, =gBattle_BG1_Y
movs r1, 0x10
ldrsh r0, [r3, r1]
lsrs r1, r0, 31
adds r0, r1
asrs r0, 1
strh r0, [r2]
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
movs r0, 0
strh r0, [r1]
_080AAE72:

8
asm/unknown_task.s
View File

@ -275,19 +275,19 @@ _080BA21C:
b _080BA24E
.pool
_080BA224:
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
b _080BA24E
.pool
_080BA22C:
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
b _080BA24E
.pool
_080BA234:
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
b _080BA24E
.pool
_080BA23C:
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
b _080BA24E
.pool
_080BA244:

51
data/battle_4.s
View File

@ -5,51 +5,6 @@
.section .rodata
gMoveEffectBS_Ptrs:: @ 831C224
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB386
.4byte gUnknown_082DB395
.4byte gUnknown_082DB3A4
.4byte gUnknown_082DB3B3
.4byte gUnknown_082DB3C9
.4byte gUnknown_082DB3E6
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB3C2
.4byte gUnknown_082DB3D6
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB3DD
.4byte gUnknown_082DB3F4
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB36A
.4byte gUnknown_082DB3F4
.align 2
window_template 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x003f
.align 2
gUnknown_0831C2C8:: @ 831C2C8
.incbin "graphics/battle_interface/unk_battlebox.gbapal"
@ -66,21 +21,21 @@ gUnknown_0831C3B8:: @ 831C3B8
.byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_0831C3C0:: @ 831C3C0
SpriteTemplate_MonIconOnLvlUpBox:: @ 831C3C0
.2byte 0xd75a @ tileTag
.2byte 0xd75a @ paletteTag
.4byte gUnknown_0831C3B8
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_804F450
.4byte SpriteCB_MonIconOnLvlUpBox
.align 2
sProtectSuccessRates:: @ 831C3D8
.2byte 0xffff, 0x7fff, 0x3fff, 0x1fff
.align 2
gUnknown_0831C3E0:: @ 831C3E0
gMovesForbiddenToCopy:: @ 831C3E0
.2byte MOVE_METRONOME, MOVE_STRUGGLE, MOVE_SKETCH, MOVE_MIMIC
.2byte 0xfffe, MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_PROTECT
.2byte MOVE_DETECT, MOVE_ENDURE, MOVE_DESTINY_BOND, MOVE_SLEEP_TALK

38
data/battle_scripts_1.s
View File

@ -30,7 +30,7 @@ gUnknown_082D9EE1:: @ 82D9EE1
gUnknown_082D9EFB:: @ 82D9EFB
.incbin "baserom.gba", 0x2d9efb, 0x21
gUnknown_082D9F1C:: @ 82D9F1C
BattleScript_ButItFailed:: @ 82D9F1C
.incbin "baserom.gba", 0x2d9f1c, 0x88e
BattleScript_FaintAttacker:: @ 82DA7AA
@ -135,7 +135,7 @@ BattleScript_BideNoEnergyToAttack:: @ 82DADC4
gUnknown_082DADD8:: @ 82DADD8
.incbin "baserom.gba", 0x2dadd8, 0x2b
gUnknown_082DAE03:: @ 82DAE03
BattleScript_MistProtected:: @ 82DAE03
.incbin "baserom.gba", 0x2dae03, 0xa
BattleScript_RageIsBuilding:: @ 82DAE0D
@ -300,7 +300,7 @@ BattleScript_MoveUsedIsConfused:: @ 82DB2BD
BattleScript_MoveUsedIsConfusedNoMore:: @ 82DB300
.incbin "baserom.gba", 0x2db300, 0x7
gUnknown_082DB307:: @ 82DB307
BattleScript_PrintPayDayMoneyString:: @ 82DB307
.incbin "baserom.gba", 0x2db307, 0x7
BattleScript_WrapTurnDmg:: @ 82DB30E
@ -324,40 +324,40 @@ BattleScript_CurseTurnDmg:: @ 82DB350
BattleScript_TargetPRLZHeal:: @ 82DB361
.incbin "baserom.gba", 0x2db361, 0x9
gUnknown_082DB36A:: @ 82DB36A
BattleScript_MoveEffectSleep:: @ 82DB36A
.incbin "baserom.gba", 0x2db36A, 0xE
BattleScript_YawnMakesAsleep:: @ 82DB378
.incbin "baserom.gba", 0x2db378, 0xE
gUnknown_082DB386:: @ 82DB386
BattleScript_MoveEffectPoison:: @ 82DB386
.incbin "baserom.gba", 0x2db386, 0xF
gUnknown_082DB395:: @ 82DB395
BattleScript_MoveEffectBurn:: @ 82DB395
.incbin "baserom.gba", 0x2db395, 0xF
gUnknown_082DB3A4:: @ 82DB3A4
BattleScript_MoveEffectFreeze:: @ 82DB3A4
.incbin "baserom.gba", 0x2db3A4, 0xF
gUnknown_082DB3B3:: @ 82DB3B3
BattleScript_MoveEffectParalysis:: @ 82DB3B3
.incbin "baserom.gba", 0x2db3B3, 0xF
gUnknown_082DB3C2:: @ 82DB3C2
BattleScript_MoveEffectUproar:: @ 82DB3C2
.incbin "baserom.gba", 0x2db3C2, 0x7
gUnknown_082DB3C9:: @ 82DB3C9
BattleScript_MoveEffectToxic:: @ 82DB3C9
.incbin "baserom.gba", 0x2db3C9, 0xD
gUnknown_082DB3D6:: @ 82DB3D6
BattleScript_MoveEffectPayDay:: @ 82DB3D6
.incbin "baserom.gba", 0x2db3D6, 0x7
gUnknown_082DB3DD:: @ 82DB3DD
BattleScript_MoveEffectWrap:: @ 82DB3DD
.incbin "baserom.gba", 0x2db3DD, 0x9
gUnknown_082DB3E6:: @ 82DB3E6
BattleScript_MoveEffectConfusion:: @ 82DB3E6
.incbin "baserom.gba", 0x2db3E6, 0xE
gUnknown_082DB3F4:: @ 82DB3F4
BattleScript_MoveEffectRecoil33:: @ 82DB3F4
.incbin "baserom.gba", 0x2db3F4, 0x2e
BattleScript_ItemSteal:: @ 82DB422
@ -396,10 +396,10 @@ BattleScript_DroughtActivates:: @ 82DB52A
BattleScript_TookAttack:: @ 82DB53E
.incbin "baserom.gba", 0x2db53e, 0x14
gUnknown_082DB552:: @ 82DB552
BattleScript_SturdyPreventsOHKO:: @ 82DB552
.incbin "baserom.gba", 0x2db552, 0xe
gUnknown_082DB560:: @ 82DB560
BattleScript_DampStopsExplosion:: @ 82DB560
.incbin "baserom.gba", 0x2db560, 0xe
BattleScript_MoveHPDrain_PPLoss:: @ 82DB56E
@ -420,7 +420,7 @@ BattleScript_FlashFireBoost_PPLoss:: @ 82DB5A7
BattleScript_FlashFireBoost:: @ 82DB5A8
.incbin "baserom.gba", 0x2db5a8, 0x1f
gUnknown_082DB5C7:: @ 82DB5C7
BattleScript_AbilityNoStatLoss:: @ 82DB5C7
.incbin "baserom.gba", 0x2db5c7, 0xa
BattleScript_BRNPrevention:: @ 82DB5D1
@ -432,7 +432,7 @@ BattleScript_PRLZPrevention:: @ 82DB5DD
BattleScript_PSNPrevention:: @ 82DB5E9
.incbin "baserom.gba", 0x2db5e9, 0xc
gUnknown_082DB5F5:: @ 82DB5F5
BattleScript_ObliviousPreventsAttraction:: @ 82DB5F5
.incbin "baserom.gba", 0x2db5f5, 0xe
BattleScript_FlinchPrevention:: @ 82DB603
@ -441,7 +441,7 @@ BattleScript_FlinchPrevention:: @ 82DB603
BattleScript_SoundproofProtected:: @ 82DB61F
.incbin "baserom.gba", 0x2db61f, 0x10
gUnknown_082DB62F:: @ 82DB62F
BattleScript_AbilityNoSpecificStatLoss:: @ 82DB62F
.incbin "baserom.gba", 0x2db62f, 0x10
BattleScript_StickyHoldOnKnockOff:: @ 82DB63F

106
include/battle.h
View File

@ -1,8 +1,28 @@
#ifndef GUARD_BATTLE_H
#define GUARD_BATTLE_H
/*
Banks are a name given to what could be called a 'battlerId' or 'monControllerId'.
Each bank has a value consisting of two bits.
0x1 bit is responsible for the side, 0 = player's side, 1 = opponent's side.
0x2 bit is responsible for the id of sent out pokemon. 0 means it's the first sent out pokemon, 1 it's the second one. (Triple battle didn't exist at the time yet.)
*/
#define BATTLE_BANKS_COUNT 4
#define IDENTITY_PLAYER_MON1 0
#define IDENTITY_OPPONENT_MON1 1
#define IDENTITY_PLAYER_MON2 2
#define IDENTITY_OPPONENT_MON2 3
#define SIDE_PLAYER 0x0
#define SIDE_OPPONENT 0x1
#define BIT_SIDE 0x1
#define BIT_MON 0x2
#define GET_BANK_SIDE(bank)((GetBankIdentity(bank) & BIT_SIDE))
#define BATTLE_TYPE_DOUBLE 0x0001
#define BATTLE_TYPE_LINK 0x0002
#define BATTLE_TYPE_WILD 0x0004
@ -40,9 +60,6 @@
#define BATTLE_TYPE_FRONTIER (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_x100000 | BATTLE_TYPE_PYRAMID)
#define SIDE_PLAYER 0x0
#define SIDE_OPPONENT 0x1
#define BATTLE_WON 0x1
#define BATTLE_LOST 0x2
#define BATTLE_DREW 0x3
@ -66,11 +83,12 @@
#define STATUS2_CONFUSION 0x00000007
#define STATUS2_FLINCHED 0x00000008
#define STATUS2_UPROAR 0x00000070
#define STATUS2_BIDE 0x00000300 //two bits 0x100 0x200
#define STATUS2_BIDE 0x00000300 // two bits 0x100, 0x200
#define STATUS2_LOCK_CONFUSE 0x00000C00
#define STATUS2_MULTIPLETURNS 0x00001000
#define STATUS2_WRAPPED 0x0000E000
#define STATUS2_INFATUATION 0x000F0000
#define STATUS2_INFATUATION 0x000F0000 // 4 bits, one for every bank
#define STATUS2_INFATUATED_WITH(bank)((gBitTable[bank] << 16))
#define STATUS2_FOCUS_ENERGY 0x00100000
#define STATUS2_TRANSFORMED 0x00200000
#define STATUS2_RECHARGE 0x00400000
@ -188,17 +206,6 @@
#define WEATHER_HAIL (1 << 7)
#define WEATHER_HAIL_ANY ((WEATHER_HAIL))
#define REQUEST_ALL_BATTLE 0x0
#define REQUEST_SPECIES_BATTLE 0x1
#define REQUEST_HELDITEM_BATTLE 0x2
#define REQUEST_MOVES_PP_BATTLE 0x3
#define REQUEST_PPMOVE1_BATTLE 0x9
#define REQUEST_PPMOVE2_BATTLE 0xA
#define REQUEST_PPMOVE3_BATTLE 0xB
#define REQUEST_PPMOVE4_BATTLE 0xC
#define REQUEST_STATUS_BATTLE 0x28
#define REQUEST_HP_BATTLE 0x2A
// array entries for battle communication
#define CURSOR_POSITION 0x1
#define MOVE_EFFECT_BYTE 0x3
@ -222,6 +229,7 @@
#define BS_GET_TARGET 0
#define BS_GET_ATTACKER 1
#define BS_GET_EFFECT_BANK 2
#define BS_ATTACKER_WITH_PARTNER 4 // for atk98_status_icon_update
#define BS_GET_ATTACKER_SIDE 8 // for atk1E_jumpifability
#define BS_GET_NOT_ATTACKER_SIDE 9 // for atk1E_jumpifability
#define BS_GET_SCRIPTING_BANK 10
@ -384,11 +392,11 @@ extern struct ProtectStruct gProtectStructs[BATTLE_BANKS_COUNT];
struct SpecialStatus
{
u8 statLowered : 1;
u8 lightningRodRedirected : 1;
u8 restoredBankSprite: 1;
u8 intimidatedPoke : 1;
u8 traced : 1;
u8 statLowered : 1; // 0x1
u8 lightningRodRedirected : 1; // 0x2
u8 restoredBankSprite: 1; // 0x4
u8 intimidatedPoke : 1; // 0x8
u8 traced : 1; // 0x10
u8 flag20 : 1;
u8 flag40 : 1;
u8 focusBanded : 1;
@ -690,6 +698,7 @@ struct BattleStruct
u8 field_298[8];
u8 field_2A0;
u8 field_2A1;
u8 field_2A2;
};
extern struct BattleStruct* gBattleStruct;
@ -709,6 +718,13 @@ extern struct BattleStruct* gBattleStruct;
varName = (u16*)(((void*)(*memes1) + (u32)(memes2))); \
}
#define GET_USED_ITEM_PTR_VIA_MEME_ACCESS(bank, varName) \
{ \
void** memes1 = (void**)(&gBattleStruct); \
void* memes2 = (void*)((u32)(bank * 2 + offsetof(struct BattleStruct, usedHeldItems))); \
varName = (u16*)(((void*)(*memes1) + (u32)(memes2))); \
}
#define GET_HP_SWITCHOUT_PTR_VIA_MEME_ACCESS(bank, varName) \
{ \
void** memes1 = (void**)(&gBattleStruct); \
@ -724,8 +740,6 @@ extern struct BattleStruct* gBattleStruct;
typeArg = gBattleMoves[move].type; \
}
#define GET_BANK_SIDE(bank)((GetBankIdentity(bank) & 1))
#define MOVE_EFFECT_SLEEP 0x1
#define MOVE_EFFECT_POISON 0x2
#define MOVE_EFFECT_BURN 0x3
@ -832,26 +846,39 @@ extern struct BattleStruct* gBattleStruct;
#define ATK4F_DONT_CHECK_STATUSES 0x80
#define VARIOUS_CANCEL_MULTI_TURN_MOVES 0
#define VARIOUS_SET_MAGIC_COAT_TARGET 1
#define VARIOUS_GET_MOVE_TARGET 3
#define VARIOUS_RESET_INTIMIDATE_TRACE_BITS 5
#define VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP 6
#define VARIOUS_WAIT_CRY 18
#define VARIOUS_RETURN_OPPONENT_MON1 19
#define VARIOUS_RETURN_OPPONENT_MON2 20
#define VARIOUS_SET_TELEPORT_OUTCOME 25
#define VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC 26
#define ATK80_DMG_CHANGE_SIGN 0
#define ATK80_DMG_HALF_BY_TWO_NOT_MORE_THAN_HALF_MAX_HP 1
#define ATK80_DMG_DOUBLED 2
#define GET_STAT_BUFF_ID(n)((n & 0xF)) // first four bits 0x1, 0x2, 0x4, 0x8
#define GET_STAT_BUFF_VALUE(n)((n & 0xF0) >> 4) // 0x10, 0x20, 0x40
#define GET_STAT_BUFF_VALUE(n)(((n >> 4) & 7)) // 0x10, 0x20, 0x40
#define STAT_BUFF_NEGATIVE 0x80 // 0x80, the sign bit
#define STAT_CHANGE_BS_PTR 0x1
#define STAT_CHANGE_NOT_PROTECT_AFFECTED 0x20
#define STAT_CHANGE_WORKED 0
#define STAT_CHANGE_DIDNT_WORK 1
#define SET_STAT_BUFF_ID(n)((n & 0xF))
#define SET_STAT_BUFF_VALUE(n)(((s8)(((s8)(n) << 4)) & 0xF0))
struct BattleScripting
{
u8 field_0;
u8 field_1;
u8 field_2;
u8 field_3;
u32 bideDmg;
u8 field_8;
u8 field_9;
u8 field_A;
u8 field_B;
u8 field_C;
u8 field_D;
s32 painSplitHp;
s32 bideDmg;
u8 multihitString[6];
u8 dmgMultiplier;
u8 field_F;
u8 animArg1;
@ -868,7 +895,7 @@ struct BattleScripting
u8 field_1B;
u8 atk23_state;
u8 field_1D;
u8 field_1E;
u8 atk6C_state;
u8 learnMoveState;
};
@ -887,6 +914,9 @@ void SwitchInClearStructs(void);
void sub_803BDA0(u8 bank);
void sub_803FA70(u8 bank);
void BattleMainCB2(void);
void ResetSentPokesToOpponentValue(void);
bool8 CanRunFromBattle(u8 bank);
bool8 IsRunningFromBattleImpossible(void);
// battle_3
void BattleScriptPush(const u8* bsPtr);
@ -920,10 +950,12 @@ u8 AI_TypeCalc(u16 move, u16 species, u8 ability);
u8 BankGetTurnOrder(u8 bank);
void BattleDestroyCursorAt(u8 cursorPosition);
void BattleCreateCursorAt(u8 cursorPosition);
void BufferMoveToLearnIntoBattleTextBuff2(void);
// battle_5
void AdjustFriendshipOnBattleFaint(u8 bank);
void sub_80571DC(u8 bank, u8 arg1);
u32 sub_805725C(u8 bank);
// battle 7
void BattleMusicStop(void);
@ -932,7 +964,7 @@ void sub_805E990(struct Pokemon* mon, u8 bank);
// rom_80A5C6C
u8 GetBankSide(u8 bank);
u8 GetBankIdentity(u8 bank);
u8 GetBankByPlayerAI(u8 bank);
u8 GetBankByIdentity(u8 bank);
// Move this somewhere else

29
include/battle_controllers.h
View File

@ -7,8 +7,26 @@ struct HpAndStatus
u32 status;
};
struct MovePpInfo
{
u16 move[4];
u8 pp[4];
u8 ppBonuses;
};
#define REQUEST_ALL_BATTLE 0x0
#define REQUEST_SPECIES_BATTLE 0x1
#define REQUEST_HELDITEM_BATTLE 0x2
#define REQUEST_MOVES_PP_BATTLE 0x3
#define REQUEST_PPMOVE1_BATTLE 0x9
#define REQUEST_PPMOVE2_BATTLE 0xA
#define REQUEST_PPMOVE3_BATTLE 0xB
#define REQUEST_PPMOVE4_BATTLE 0xC
#define REQUEST_STATUS_BATTLE 0x28
#define REQUEST_HP_BATTLE 0x2A
// rom3.s, emitters
void EmitSetAttributes(u8 bufferId, u8 request, u8 c, u8 bytes, void *data);
void EmitSetMonData(u8 bufferId, u8 request, u8 c, u8 bytes, void *data);
void EmitMoveAnimation(u8 bufferId, u16 move, u8 turnOfMove, u16 movePower, s32 dmg, u8 friendship, struct DisableStruct* disableStructPtr, u8 multihit);
void EmitHealthBarUpdate(u8 bufferId, u16 hpValue);
void EmitEffectivenessSound(u8 bufferId, u16 songId);
@ -20,7 +38,7 @@ void EmitExpUpdate(u8 bufferId, u8 partyId, u16 expPoints);
void EmitBattleAnimation(u8 bufferId, u8 animationId, u16 argument);
void EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible);
void EmitReturnPokeToBall(u8 bufferId, u8 arg1);
void EmitGetAttributes(u8 bufferId, u8 arg1, u8 arg2);
void EmitGetMonData(u8 bufferId, u8 arg1, u8 arg2);
void EmitSwitchInAnim(u8 bufferId, u8 partyId, bool8 dontClearSubstituteBit);
void EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, const u8* arg4);
void EmitLinkStandbyMsg(u8 bufferId, u8 arg1, u8 arg2);
@ -31,6 +49,13 @@ void EmitHitAnimation(u8 bufferId);
void EmitCmd48(u8 bufferId, struct HpAndStatus* hpAndStatus, u8 arg2);
void EmitCmd49(u8 bufferId);
void EmitStatusAnimation(u8 bufferId, bool8 status2, u32 status);
void EmitCmd13(u8 bufferId);
void EmitStatusIconUpdate(u8 bufferId, u32 status1, u32 status2);
void EmitResetActionMoveSelection(u8 bufferId, u8 caseId);
#define RESET_ACTION_MOVE_SELECTION 0
#define RESET_ACTION_SELECTION 1
#define RESET_MOVE_SELECTION 2
void MarkBufferBankForExecution(u8 bank);

29
include/battle_message.h
View File

@ -74,6 +74,22 @@
#define B_BUFF_PLACEHOLDER_BEGIN 0xFD
#define B_BUFF_EOS 0xFF
#define PREPARE_STAT_BUFFER(textVar, statId) \
{ \
textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \
textVar[1] = B_BUFF_STAT; \
textVar[2] = statId; \
textVar[3] = B_BUFF_EOS; \
}
#define PREPARE_TYPE_BUFFER(textVar, typeId) \
{ \
textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \
textVar[1] = B_BUFF_TYPE; \
textVar[2] = typeId; \
textVar[3] = B_BUFF_EOS; \
}
#define PREPARE_BYTE_NUMBER_BUFFER(textVar, maxDigits, number) \
{ \
textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \
@ -84,6 +100,17 @@
textVar[5] = B_BUFF_EOS; \
}
#define PREPARE_HWORD_NUMBER_BUFFER(textVar, maxDigits, number) \
{ \
textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \
textVar[1] = B_BUFF_NUMBER; \
textVar[2] = 2; \
textVar[3] = maxDigits; \
textVar[4] = (number); \
textVar[5] = (number & 0x0000FF00) >> 8; \
textVar[6] = B_BUFF_EOS; \
}
#define PREPARE_WORD_NUMBER_BUFFER(textVar, maxDigits, number) \
{ \
textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \
@ -158,7 +185,7 @@ struct StringInfoBattle
};
void BufferStringBattle(u16 stringID);
u32 StrCpyDecodeToDisplayedStringBattle(const u8* src);
u32 BattleStringExpandPlaceholdersToDisplayedString(const u8* src);
u32 BattleStringExpandPlaceholders(const u8* src, u8* dst);
void sub_814F9EC(const u8* text, u8 arg1);

2
include/moves.h
View File

@ -360,4 +360,6 @@ enum
MOVE_PSYCHO_BOOST,
};
#define LAST_MOVE_INDEX MOVE_PSYCHO_BOOST
#endif // GUARD_MOVES_H

7
include/pokemon.h
View File

@ -126,6 +126,8 @@
#define TYPE_DRAGON 0x10
#define TYPE_DARK 0x11
#define NUMBER_OF_MON_TYPES 0x12
#define PARTY_SIZE 6
#define MAX_TOTAL_EVS 510
#define NUM_STATS 6
@ -333,6 +335,8 @@ struct UnknownPokemonStruct
u8 friendship;
};
#define BATTLE_STATS_NO 8
struct BattlePokemon
{
/*0x00*/ u16 species;
@ -350,7 +354,7 @@ struct BattlePokemon
/*0x17*/ u32 spDefenseIV:5;
/*0x17*/ u32 isEgg:1;
/*0x17*/ u32 altAbility:1;
/*0x18*/ s8 statStages[8];
/*0x18*/ s8 statStages[BATTLE_STATS_NO];
/*0x20*/ u8 ability;
/*0x21*/ u8 type1;
/*0x22*/ u8 type2;
@ -521,6 +525,7 @@ extern struct PokemonStorage* gPokemonStoragePtr;
extern const u32 gExperienceTables[][MAX_MON_LEVEL + 1];
extern const u16 *const gLevelUpLearnsets[];
u8 CountAliveMonsInBattle(u8 caseId);
#define BATTLE_ALIVE_EXCEPT_ACTIVE 0
#define BATTLE_ALIVE_ATK_SIDE 1
#define BATTLE_ALIVE_DEF_SIDE 2

7
include/pokemon_icon.h Normal file
View File

@ -0,0 +1,7 @@
#ifndef GUARD_POKEMON_ICON_H
#define GUARD_POKEMON_ICON_H
const u8 *GetMonIconPtr(u16 speciesId, u32 personality, u32 frameNo);
const u16 *GetValidMonIconPalettePtr(u16 speciesId);
#endif // GUARD_POKEMON_ICON_H

8
include/pokemon_item_effects.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef GUARD_POKEMON_ITEM_EFFECTS
#define GUARD_POKEMON_ITEM_EFFECTS
#include "pokemon.h"
bool8 ExecuteTableBasedItemEffect(struct Pokemon *mon, u16 itemId, u8 partyId, u8 monMoveIndex, u8 a5);
#endif // GUARD_POKEMON_ITEM_EFFECTS

14
include/text.h
View File

@ -65,6 +65,7 @@
#define CHAR_x 0xEC
#define CHAR_y 0xED
#define CHAR_z 0xEE
#define CHAR_SPECIAL_F9 0xF9
#define CHAR_COLON 0xF0
#define CHAR_PROMPT_SCROLL 0xFA // waits for button press and scrolls dialog
#define CHAR_PROMPT_CLEAR 0xFB // waits for button press and clears dialog
@ -73,6 +74,10 @@
#define CHAR_NEWLINE 0xFE
#define EOS 0xFF // end of string
#define TEXT_COLOR_TRANSPARENT 0x0
#define TEXT_COLOR_WHITE 0x1
#define TEXT_COLOR_DARK_GREY 0x2
// battle placeholders are located in battle_message.h
#define EXT_CTRL_CODE_JPN 0x15
@ -80,9 +85,8 @@
#define NUM_TEXT_PRINTERS 32
struct TextPrinter
struct TextSubPrinter // TODO: Better name
{
struct TextSubPrinter { // TODO: Better name
u8* current_text_offset;
u8 windowId;
u8 fontId;
@ -96,7 +100,11 @@ struct TextPrinter
u8 fontColor_h:4;
u8 bgColor:4;
u8 shadowColor:4;
} subPrinter;
};
struct TextPrinter
{
struct TextSubPrinter subPrinter;
void (*callback)(struct TextSubPrinter *, u16); // 0x10

2
include/window.h
View File

@ -55,7 +55,7 @@ void PutWindowRectTilemap(u8 windowId, u8 x, u8 y, u8 width, u8 height);
void BlitBitmapToWindow(u8 windowId, u8 *pixels, u16 x, u16 y, u16 width, u16 height);
void BlitBitmapRectToWindow(u8 windowId, const u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight);
void FillWindowPixelRect(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16 height);
void CopyToWindowPixelBuffer(u8 windowId, u8 *src, u16 size, u16 tileOffset);
void CopyToWindowPixelBuffer(u8 windowId, const u8 *src, u16 size, u16 tileOffset);
void FillWindowPixelBuffer(u8 windowId, u8 fillValue);
void ScrollWindow(u8 windowId, u8 direction, u8 distance, u8 fillValue);
void CallWindowFunction(u8 windowId, void ( *func)(u8, u8, u8, u8, u8, u8));

52
src/battle_3.c
View File

@ -831,7 +831,7 @@ u8 TurnBasedEffects(void)
gBattleCommunication[MULTISTRING_CHOOSER] = 1;
b_call_bc_move_exec(gUnknown_082DB234);
gActiveBank = gBankAttacker;
EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
MarkBufferBankForExecution(gActiveBank);
break;
}
@ -956,7 +956,7 @@ u8 TurnBasedEffects(void)
{
CancelMultiTurnMoves(gActiveBank);
gBattleMons[gActiveBank].status1 |= (Random() & 3) + 2;
EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
MarkBufferBankForExecution(gActiveBank);
gEffectBank = gActiveBank;
b_call_bc_move_exec(BattleScript_YawnMakesAsleep);
@ -1446,7 +1446,7 @@ u8 AtkCanceller_UnableToUseMove(void)
if (effect == 2)
{
gActiveBank = gBankAttacker;
EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
MarkBufferBankForExecution(gActiveBank);
}
return effect;
@ -1539,14 +1539,14 @@ bool8 sub_80423F4(u8 bank, u8 r1, u8 r2)
{
if (GetBankSide(bank) == SIDE_OPPONENT)
{
r7 = GetBankByPlayerAI(1);
r6 = GetBankByPlayerAI(3);
r7 = GetBankByIdentity(1);
r6 = GetBankByIdentity(3);
party = gEnemyParty;
}
else
{
r7 = GetBankByPlayerAI(0);
r6 = GetBankByPlayerAI(2);
r7 = GetBankByIdentity(0);
r6 = GetBankByIdentity(2);
party = gPlayerParty;
}
if (r1 == 6)
@ -1835,7 +1835,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE); // fix nighmare glitch
gBattleScripting.bank = gActiveBank = bank;
b_push_move_exec(BattleScript_ShedSkinActivates);
EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[bank].status1);
EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[bank].status1);
MarkBufferBankForExecution(gActiveBank);
effect++;
}
@ -2156,7 +2156,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
gBattlescriptCurrInstr = gUnknown_082DB68C;
gBattleScripting.bank = i;
gActiveBank = i;
EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
MarkBufferBankForExecution(gActiveBank);
return effect;
}
@ -2235,14 +2235,14 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
if (gBattleMons[i].ability == ABILITY_TRACE && (gStatuses3[i] & STATUS3_TRACE))
{
u8 opposite = (GetBankIdentity(i) ^ 1) & 1;
u8 target1 = GetBankByPlayerAI(opposite);
u8 target2 = GetBankByPlayerAI(opposite + 2);
u8 target1 = GetBankByIdentity(opposite);
u8 target2 = GetBankByIdentity(opposite + 2);
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
{
if (gBattleMons[target1].ability != 0 && gBattleMons[target1].hp != 0
&& gBattleMons[target2].ability != 0 && gBattleMons[target2].hp != 0)
{
gActiveBank = GetBankByPlayerAI(((Random() & 1) * 2) | opposite);
gActiveBank = GetBankByIdentity(((Random() & 1) * 2) | opposite);
gBattleMons[i].ability = gBattleMons[gActiveBank].ability;
gLastUsedAbility = gBattleMons[gActiveBank].ability;
effect++;
@ -3106,7 +3106,7 @@ _08042E24:\n\
movs r1, 0x28\n\
movs r2, 0\n\
movs r3, 0x4\n\
bl EmitSetAttributes\n\
bl EmitSetMonData\n\
ldrb r0, [r4]\n\
bl MarkBufferBankForExecution\n\
bl _080443D0\n\
@ -4500,7 +4500,7 @@ _08043BFC:\n\
movs r1, 0x28\n\
movs r2, 0\n\
movs r3, 0x4\n\
bl EmitSetAttributes\n\
bl EmitSetMonData\n\
ldrb r0, [r4]\n\
bl MarkBufferBankForExecution\n\
bl _0804443A\n\
@ -4744,11 +4744,11 @@ _08043E42:\n\
eors r5, r1\n\
ands r5, r1\n\
adds r0, r5, 0\n\
bl GetBankByPlayerAI\n\
bl GetBankByIdentity\n\
lsls r0, 24\n\
lsrs r6, r0, 24\n\
adds r0, r5, 0x2\n\
bl GetBankByPlayerAI\n\
bl GetBankByIdentity\n\
lsls r0, 24\n\
lsrs r7, r0, 24\n\
ldr r0, =gBattleTypeFlags\n\
@ -4792,7 +4792,7 @@ _08043E74:\n\
lsls r1, 1\n\
orrs r5, r1\n\
adds r0, r5, 0\n\
bl GetBankByPlayerAI\n\
bl GetBankByIdentity\n\
mov r2, r8\n\
strb r0, [r2]\n\
ldrb r0, [r2]\n\
@ -5609,7 +5609,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
gBattleTextBuff1[3] = move >> 8;
gBattleTextBuff1[4] = 0xFF;
b_call_bc_move_exec(BattleScript_BerryPPHealEnd2);
EmitSetAttributes(0, i + REQUEST_PPMOVE1_BATTLE, 0, 1, &changedPP);
EmitSetMonData(0, i + REQUEST_PPMOVE1_BATTLE, 0, 1, &changedPP);
MarkBufferBankForExecution(gActiveBank);
effect = ITEM_PP_CHANGE;
}
@ -5993,7 +5993,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
switch (effect)
{
case ITEM_STATUS_CHANGE:
EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[bank].status1);
EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[bank].status1);
MarkBufferBankForExecution(gActiveBank);
break;
case ITEM_PP_CHANGE:
@ -6148,7 +6148,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
gBattleScripting.bank = bank;
gStringBank = bank;
gActiveBank = bank;
EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
MarkBufferBankForExecution(gActiveBank);
break;
}
@ -6251,7 +6251,7 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget)
case MOVE_TARGET_BOTH:
case MOVE_TARGET_FOES_AND_ALLY:
case MOVE_TARGET_OPPONENTS_FIELD:
targetBank = GetBankByPlayerAI((GetBankIdentity(gBankAttacker) & 1) ^ 1);
targetBank = GetBankByIdentity((GetBankIdentity(gBankAttacker) & 1) ^ 1);
if (gAbsentBankFlags & gBitTable[targetBank])
targetBank ^= 2;
break;
@ -6264,22 +6264,22 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget)
if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
{
if (Random() & 1)
targetBank = GetBankByPlayerAI(1);
targetBank = GetBankByIdentity(1);
else
targetBank = GetBankByPlayerAI(3);
targetBank = GetBankByIdentity(3);
}
else
{
if (Random() & 1)
targetBank = GetBankByPlayerAI(0);
targetBank = GetBankByIdentity(0);
else
targetBank = GetBankByPlayerAI(2);
targetBank = GetBankByIdentity(2);
}
if (gAbsentBankFlags & gBitTable[targetBank])
targetBank ^= 2;
}
else
targetBank = GetBankByPlayerAI((GetBankIdentity(gBankAttacker) & 1) ^ 1);
targetBank = GetBankByIdentity((GetBankIdentity(gBankAttacker) & 1) ^ 1);
break;
case MOVE_TARGET_USER:
case MOVE_TARGET_x10:

2739
src/battle_4.c
View File

File diff suppressed because it is too large Load Diff

2
src/battle_ai.c
View File

@ -1802,7 +1802,7 @@ static void BattleAICmd_count_alive_pokemon(void)
u32 status;
bankOnField1 = gBattlePartyID[index];
status = GetBankIdentity(index) ^ 2;
bankOnField2 = gBattlePartyID[GetBankByPlayerAI(status)];
bankOnField2 = gBattlePartyID[GetBankByIdentity(status)];
}
else // in singles there's only one bank by side
{

1
src/calculate_base_damage.c
View File

@ -19,7 +19,6 @@ extern struct BattleEnigmaBerry gEnigmaBerries[];
extern u16 gBattleMovePower;
extern u16 gTrainerBattleOpponent_A;
u8 CountAliveMonsInBattle(u8);
bool8 ShouldGetStatBadgeBoost(u16 flagId, u8 bank);
extern const struct BattleMove gBattleMoves[];

10
src/pokemon_2.c
View File

@ -35,7 +35,7 @@ extern const u8 gText_BadEgg[];
extern const u8 gText_EggNickname[];
extern u8 GetBankSide(u8 bank);
extern u8 GetBankByPlayerAI(u8 bank);
extern u8 GetBankByIdentity(u8 bank);
extern u8 GetBankIdentity(u8 bank);
u8 CountAliveMonsInBattle(u8 caseId)
@ -90,7 +90,7 @@ u8 sub_8069F34(u8 bank)
status ^= 1;
if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
return GetBankByPlayerAI(status);
return GetBankByIdentity(status);
if (CountAliveMonsInBattle(BATTLE_ALIVE_EXCEPT_ACTIVE) > 1)
{
u8 val;
@ -99,14 +99,14 @@ u8 sub_8069F34(u8 bank)
val = status ^ 2;
else
val = status;
return GetBankByPlayerAI(val);
return GetBankByIdentity(val);
}
else
{
if ((gAbsentBankFlags & gBitTable[status]))
return GetBankByPlayerAI(status ^ 2);
return GetBankByIdentity(status ^ 2);
else
return GetBankByPlayerAI(status);
return GetBankByIdentity(status);
}
}

6
src/pokemon_3.c
View File

@ -216,7 +216,7 @@ void sub_806CF24(s32 stat)
gBankTarget = gBankInMenu;
StringCopy(gBattleTextBuff1, gStatNamesTable[gUnknown_08329EC8[stat]]);
StringCopy(gBattleTextBuff2, gText_StatRose);
StrCpyDecodeToDisplayedStringBattle(gText_PkmnsStatChanged2);
BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnsStatChanged2);
}
u8 *sub_806CF78(u16 itemId)
@ -251,7 +251,7 @@ u8 *sub_806CF78(u16 itemId)
else
{
gBankAttacker = gBankInMenu;
StrCpyDecodeToDisplayedStringBattle(gText_PkmnGettingPumped);
BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnGettingPumped);
}
}
}
@ -259,7 +259,7 @@ u8 *sub_806CF78(u16 itemId)
if (itemEffect[3] & 0x80)
{
gBankAttacker = gBankInMenu;
StrCpyDecodeToDisplayedStringBattle(gText_PkmnShroudedInMist);
BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnShroudedInMist);
}
return gDisplayedStringBattle;

2
src/window.c
View File

@ -451,7 +451,7 @@ void FillWindowPixelRect(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16
FillBitmapRect4Bit(&pixelRect, x, y, width, height, fillValue);
}
void CopyToWindowPixelBuffer(u8 windowId, u8 *src, u16 size, u16 tileOffset)
void CopyToWindowPixelBuffer(u8 windowId, const u8 *src, u16 size, u16 tileOffset)
{
if (size != 0)
CpuCopy16(src, gWindows[windowId].tileData + (0x20 * tileOffset), size);

8
sym_ewram.txt
View File

@ -211,16 +211,16 @@ gUnknown_02022E14: @ 2022E14
gUnknown_02022E16: @ 2022E16
.space 0x2
gUnknown_02022E18: @ 2022E18
gBattle_BG1_X: @ 2022E18
.space 0x2
gUnknown_02022E1A: @ 2022E1A
gBattle_BG1_Y: @ 2022E1A
.space 0x2
gUnknown_02022E1C: @ 2022E1C
gBattle_BG2_X: @ 2022E1C
.space 0x2
gUnknown_02022E1E: @ 2022E1E
gBattle_BG2_Y: @ 2022E1E
.space 0x2
gUnknown_02022E20: @ 2022E20