summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/battle_anim_80CA710.s174
-rw-r--r--asm/battle_anim_81258BC.s4
-rw-r--r--asm/battle_anim_812C144.s44
-rw-r--r--asm/battle_anim_813F0F4.s2
-rw-r--r--include/battle.h17
-rw-r--r--include/battle_anim.h3
-rw-r--r--src/battle/battle_7.c10
-rw-r--r--src/battle/battle_anim.c71
-rw-r--r--src/battle/battle_anim_807B69C.c2
-rw-r--r--src/battle/battle_anim_80A7E7C.c4
-rw-r--r--src/battle/battle_controller_linkopponent.c4
-rw-r--r--src/battle/battle_controller_linkpartner.c4
-rw-r--r--src/battle/battle_controller_opponent.c4
-rw-r--r--src/battle/battle_controller_player.c4
-rw-r--r--src/battle/battle_controller_wally.c4
-rw-r--r--src/rom_8077ABC.c54
16 files changed, 202 insertions, 203 deletions
diff --git a/asm/battle_anim_80CA710.s b/asm/battle_anim_80CA710.s
index 7b506ac24..92ad421bb 100644
--- a/asm/battle_anim_80CA710.s
+++ b/asm/battle_anim_80CA710.s
@@ -757,7 +757,7 @@ sub_80CACEC: @ 80CACEC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080CAD06
@@ -1329,7 +1329,7 @@ _080CB13C:
sub_80CB144: @ 80CB144
push {r4,lr}
adds r4, r0, 0
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080CB170
@@ -2521,7 +2521,7 @@ _080CBA6C:
adds r0, r6, 0
adds r0, 0xA
strh r0, [r5, 0x3C]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080CBA84
@@ -2721,7 +2721,7 @@ sub_80CBBF0: @ 80CBBF0
ldrsh r0, [r4, r1]
cmp r0, 0
bne _080CBC84
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080CBC18
@@ -2917,7 +2917,7 @@ _080CBD44:
movs r1, 0xFF
ands r0, r1
strh r0, [r4, 0x30]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080CBD92
@@ -4233,7 +4233,7 @@ _080CC74C:
bl sub_80790F0
lsls r0, 16
lsrs r4, r0, 16
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080CC7AE
@@ -4968,7 +4968,7 @@ _080CCD1C:
sub_80CCD24: @ 80CCD24
push {r4-r6,lr}
adds r5, r0, 0
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080CCD3A
@@ -5000,7 +5000,7 @@ _080CCD3A:
lsls r0, 24
cmp r0, 0
beq _080CCD78
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080CCDA0
@@ -7569,7 +7569,7 @@ sub_80CE09C: @ 80CE09C
ldrh r5, [r5, 0x2]
adds r0, r5
strh r0, [r6, 0x22]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080CE0E0
@@ -7872,7 +7872,7 @@ _080CE308: .4byte gNoOfAllBanks
sub_80CE30C: @ 80CE30C
push {r4,lr}
adds r4, r0, 0
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080CE322
@@ -8359,7 +8359,7 @@ _080CE68E:
ldrh r1, [r5, 0x20]
strh r1, [r5, 0x3A]
strh r0, [r5, 0x3C]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080CE700
@@ -8953,7 +8953,7 @@ _080CEB48:
strh r1, [r5, 0x32]
ldrh r0, [r4, 0x4]
strh r0, [r5, 0x34]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080CEB6C
@@ -10477,7 +10477,7 @@ sub_80CF6DC: @ 80CF6DC
push {r7}
sub sp, 0x4
adds r5, r0, 0
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080CF700
@@ -10550,7 +10550,7 @@ _080CF722:
lsls r1, 24
adds r0, r1
lsrs r4, r0, 16
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080CF794
@@ -11031,7 +11031,7 @@ sub_80CFB04: @ 80CFB04
mov r4, sp
adds r4, 0x2
strh r1, [r4]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
mov r10, r4
cmp r0, 0
@@ -15162,7 +15162,7 @@ _080D1AF4:
cmp r5, 0x4
ble _080D1AF4
ldr r4, _080D1B3C @ =gBattleAnimSpritePalette_206
- bl IsContest
+ bl NotInBattle
lsls r0, 24
ldr r1, _080D1B40 @ =0x02018000
cmp r0, 0
@@ -15175,7 +15175,7 @@ _080D1B1C:
movs r5, 0
_080D1B24:
lsls r4, r5, 5
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080D1B4C
@@ -15390,7 +15390,7 @@ sub_80D1CD0: @ 80D1CD0
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl IsContest
+ bl NotInBattle
lsls r0, 24
movs r2, 0xF0
cmp r0, 0
@@ -15943,7 +15943,7 @@ sub_80D2100: @ 80D2100
movs r0, 0x3F
ands r0, r1
strb r0, [r4, 0x1]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080D2144
@@ -15987,7 +15987,7 @@ _080D2144:
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080D21A4
@@ -16200,7 +16200,7 @@ _080D230E:
ldr r1, _080D23A4 @ =0x85000200
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080D235C
@@ -16280,7 +16280,7 @@ sub_80D23B4: @ 80D23B4
movs r0, 0x3F
ands r0, r1
strb r0, [r4, 0x1]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080D23FE
@@ -16313,7 +16313,7 @@ _080D23FE:
ldr r0, _080D2454 @ =0x85000400
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080D245C
@@ -16359,7 +16359,7 @@ _080D2488:
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080D24B6
@@ -16564,7 +16564,7 @@ _080D25FE:
ldr r1, _080D2694 @ =0x85000200
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080D264C
@@ -18730,7 +18730,7 @@ sub_80D3698: @ 80D3698
bl sub_8079E90
lsls r0, 24
lsrs r5, r0, 24
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080D36F2
@@ -19068,7 +19068,7 @@ _080D3920:
ldr r1, _080D399C @ =0x85000400
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080D39B8
@@ -19174,7 +19174,7 @@ _080D3A0E:
lsls r0, 5
strh r0, [r7, 0xA]
strh r0, [r7, 0xC]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -19502,7 +19502,7 @@ _080D3CAA:
ldr r1, _080D3D58 @ =0x85000400
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080D3D02
@@ -21104,7 +21104,7 @@ sub_80D48F4: @ 80D48F4
movs r1, 0x1
_080D4938:
strh r1, [r5, 0x16]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080D494C
@@ -28400,7 +28400,7 @@ sub_80D80E0: @ 80D80E0
movs r0, 0x3F
ands r0, r1
strb r0, [r4, 0x1]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080D812A
@@ -28448,7 +28448,7 @@ _080D812A:
lsls r1, 4
movs r2, 0x20
bl LoadPalette
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080D8190
@@ -28679,7 +28679,7 @@ _080D832A:
ldr r1, _080D83C8 @ =0x85000200
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080D8378
@@ -28792,7 +28792,7 @@ sub_80D8414: @ 80D8414
movs r0, 0x3F
ands r0, r1
strb r0, [r4, 0x1]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080D845E
@@ -28840,7 +28840,7 @@ _080D845E:
lsls r1, 4
movs r2, 0x20
bl LoadPalette
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080D84C4
@@ -29061,7 +29061,7 @@ _080D864A:
ldr r1, _080D86E8 @ =0x85000200
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080D8698
@@ -29274,7 +29274,7 @@ _080D8824:
ldrh r1, [r5, 0x3C]
orrs r0, r1
strh r0, [r5, 0x3C]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080D8858
@@ -30348,7 +30348,7 @@ _080D9074: .4byte gBattleAnimBankAttacker
sub_80D9078: @ 80D9078
push {r4,lr}
adds r4, r0, 0
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080D9094
@@ -31652,7 +31652,7 @@ _080D9A82:
ands r0, r2
orrs r0, r1
strb r0, [r5, 0x5]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080D9ABC
@@ -31828,7 +31828,7 @@ _080D9BF0:
movs r1, 0
bl sub_8078764
_080D9BF8:
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080D9C0C
@@ -32631,7 +32631,7 @@ sub_80DA208: @ 80DA208
negs r0, r0
strh r0, [r1, 0x6]
_080DA234:
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080DA24C
@@ -35427,7 +35427,7 @@ sub_80DB74C: @ 80DB74C
lsls r0, 24
cmp r0, 0
beq _080DB768
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080DB77E
@@ -35444,7 +35444,7 @@ _080DB768:
movs r0, 0xC8
strb r0, [r1]
_080DB77E:
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080DB7DA
@@ -35485,7 +35485,7 @@ _080DB7BC:
adds r1, r5, 0
bl sub_8076034
_080DB7DA:
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080DB810
@@ -35540,7 +35540,7 @@ _080DB826:
adds r0, r4
_080DB84A:
strh r0, [r6, 0x22]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080DB85C
@@ -35679,7 +35679,7 @@ sub_80DB92C: @ 80DB92C
negs r1, r1
cmp r0, r1
bne _080DB9CC
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080DB9BC
@@ -35754,7 +35754,7 @@ _080DB9E0: .4byte sub_80DB9E4
sub_80DB9E4: @ 80DB9E4
push {r4-r6,lr}
adds r6, r0, 0
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080DBA3C
@@ -35816,7 +35816,7 @@ sub_80DBA4C: @ 80DBA4C
bne _080DBA66
movs r6, 0x1
_080DBA66:
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080DBAAE
@@ -36651,7 +36651,7 @@ sub_80DC0B0: @ 80DC0B0
lsls r1, 3
ldr r0, _080DC10C @ =gTasks
adds r5, r1, r0
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080DC154
@@ -37474,7 +37474,7 @@ _080DC720:
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080DC74E
@@ -37594,7 +37594,7 @@ _080DC820: .4byte REG_BLDCNT
sub_80DC824: @ 80DC824
push {r4-r6,lr}
adds r6, r0, 0
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080DC850
@@ -37690,7 +37690,7 @@ _080DC8F0: .4byte move_anim_8072740
sub_80DC8F4: @ 80DC8F4
push {r4-r6,lr}
adds r6, r0, 0
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080DC918
@@ -37770,7 +37770,7 @@ _080DC99C: .4byte move_anim_8072740
sub_80DC9A0: @ 80DC9A0
push {r4,r5,lr}
adds r5, r0, 0
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080DC9BC
@@ -38063,7 +38063,7 @@ sub_80DCBCC: @ 80DCBCC
push {r4-r7,lr}
sub sp, 0x4
adds r7, r0, 0
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080DCBEC
@@ -38092,7 +38092,7 @@ _080DCBEC:
negs r0, r0
strh r0, [r1, 0x6]
_080DCC0E:
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080DCC5E
@@ -38668,7 +38668,7 @@ do_boulder_dust: @ 80DD078
movs r0, 0x3F
ands r0, r1
strb r0, [r4, 0x1]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080DD0C4
@@ -38710,7 +38710,7 @@ _080DD0C4:
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080DD120
@@ -38972,7 +38972,7 @@ _080DD2F6:
ldr r1, _080DD394 @ =0x85000200
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080DD344
@@ -41857,7 +41857,7 @@ sub_80DE918: @ 80DE918
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x8]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080DE988
@@ -42296,7 +42296,7 @@ sub_80DECB0: @ 80DECB0
lsls r0, 24
cmp r0, 0
bne _080DECF4
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080DED0C
@@ -44938,7 +44938,7 @@ _080E015E:
ldr r0, _080E01BC @ =REG_BG1VOFS
str r0, [sp]
movs r7, 0x2
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080E01F4
@@ -44967,7 +44967,7 @@ _080E01C4:
ldr r0, _080E0284 @ =REG_BG2VOFS
str r0, [sp]
movs r7, 0x4
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080E01F4
@@ -45235,7 +45235,7 @@ _080E03EC:
.4byte _080E053C
.4byte _080E05A4
_080E0400:
- bl IsContest
+ bl NotInBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -46092,7 +46092,7 @@ sub_80E0A4C: @ 80E0A4C
movs r0, 0x3F
ands r0, r1
strb r0, [r5, 0x1]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080E0AC4
@@ -46108,7 +46108,7 @@ _080E0AC4:
lsls r0, 24
cmp r0, 0
beq _080E0B40
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080E0B40
@@ -46163,7 +46163,7 @@ _080E0AF4:
strb r0, [r5]
movs r7, 0x1
_080E0B40:
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080E0B84
@@ -46379,7 +46379,7 @@ sub_80E0CD0: @ 80E0CD0
strh r1, [r0]
adds r0, 0x2
strh r1, [r0]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080E0D40
@@ -49932,7 +49932,7 @@ sub_80E2838: @ 80E2838
lsls r0, 24
cmp r0, 0
beq _080E285C
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080E285C
@@ -50880,7 +50880,7 @@ sub_80E2F2C: @ 80E2F2C
movs r1, 0x20
orrs r0, r1
strb r0, [r4, 0x1]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080E2FAC
@@ -50896,7 +50896,7 @@ _080E2FAC:
lsls r0, 24
cmp r0, 0
beq _080E3028
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080E3028
@@ -50951,7 +50951,7 @@ _080E2FDC:
strb r0, [r4]
movs r7, 0x1
_080E3028:
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080E306C
@@ -51033,7 +51033,7 @@ _080E30B4:
ldr r0, [r2, 0x8]
ldr r0, _080E3174 @ =gUnknown_08D20A30
bl LZDecompressVram
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080E3106
@@ -51150,7 +51150,7 @@ sub_80E3194: @ 80E3194
strh r1, [r0]
adds r0, 0x2
strh r1, [r0]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080E3208
@@ -51358,7 +51358,7 @@ _080E3392:
mov r2, r8
eors r2, r0
mov r8, r2
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080E33BC
@@ -51420,7 +51420,7 @@ _080E33C0:
movs r1, 0x20
orrs r0, r1
strb r0, [r4, 0x1]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080E3432
@@ -51487,7 +51487,7 @@ _080E345E:
movs r2, 0x1
str r2, [sp, 0x20]
_080E34A4:
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080E34E4
@@ -51581,7 +51581,7 @@ _080E3578:
ldr r1, [sp, 0x4]
bl LZDecompressVram
_080E3580:
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080E3598
@@ -51884,7 +51884,7 @@ _080E378E:
strh r1, [r0]
adds r0, 0x2
strh r1, [r0]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080E37E8
@@ -52505,7 +52505,7 @@ sub_80E3C4C: @ 80E3C4C
movs r0, 0x2
adds r6, r7, 0
eors r6, r0
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080E3CAE
@@ -52565,7 +52565,7 @@ _080E3CB2:
movs r1, 0x20
orrs r0, r1
strb r0, [r4, 0x1]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080E3D22
@@ -52577,7 +52577,7 @@ _080E3CB2:
orrs r1, r0
strb r1, [r4]
_080E3D22:
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080E3D58
@@ -52651,7 +52651,7 @@ _080E3DC0:
ldr r1, [sp, 0x4]
ldr r0, [sp, 0x50]
bl LZDecompressVram
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080E3DE6
@@ -52865,7 +52865,7 @@ _080E3F32:
strh r1, [r0]
adds r0, 0x2
strh r1, [r0]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _080E3F90
@@ -53003,7 +53003,7 @@ _080E4084:
movs r1, 0x2
ldrsh r0, [r0, r1]
lsls r5, r0, 5
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080E40A8
@@ -53093,7 +53093,7 @@ _080E412C:
movs r1, 0x2
ldrsh r0, [r0, r1]
lsls r4, r0, 5
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080E4158
@@ -53197,7 +53197,7 @@ sub_80E4200: @ 80E4200
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl IsContest
+ bl NotInBattle
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -53326,7 +53326,7 @@ sub_80E4300: @ 80E4300
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _080E4318
diff --git a/asm/battle_anim_81258BC.s b/asm/battle_anim_81258BC.s
index 69b95b703..a42f7693e 100644
--- a/asm/battle_anim_81258BC.s
+++ b/asm/battle_anim_81258BC.s
@@ -377,7 +377,7 @@ sub_812B18C: @ 812B18C
bl sub_8076F98
lsls r0, 24
lsrs r6, r0, 24
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _0812B1CC
@@ -524,7 +524,7 @@ sub_812B2B8: @ 812B2B8
bl sub_8076F98
lsls r0, 24
lsrs r4, r0, 24
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _0812B2DC
diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s
index 4562ad2f5..2ff8bc1ca 100644
--- a/asm/battle_anim_812C144.s
+++ b/asm/battle_anim_812C144.s
@@ -241,7 +241,7 @@ sub_812C2BC: @ 812C2BC
lsls r1, 23
adds r0, r1
lsrs r4, r0, 16
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _0812C31A
@@ -954,7 +954,7 @@ sub_812C848: @ 812C848
ldrsh r1, [r5, r2]
adds r0, r4, 0
bl sub_807867C
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _0812C89C
@@ -1473,7 +1473,7 @@ sub_812CC44: @ 812CC44
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _0812CC7A
@@ -1518,7 +1518,7 @@ sub_812CCA8: @ 812CCA8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _0812CCCA
@@ -3125,7 +3125,7 @@ _0812D8C4:
ldrb r1, [r5]
mov r0, sp
bl sub_8078954
- bl IsContest
+ bl NotInBattle
lsls r0, 24
mov r9, r4
cmp r0, 0
@@ -3159,7 +3159,7 @@ _0812D906:
ldr r1, _0812D9DC @ =0x84000200
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _0812DA20
@@ -3350,7 +3350,7 @@ _0812DAAE:
negs r0, r0
ands r0, r1
strb r0, [r2]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _0812DAF4
@@ -3507,7 +3507,7 @@ _0812DBD0:
movs r1, 0x1
orrs r0, r1
strb r0, [r4]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _0812DC12
@@ -3542,7 +3542,7 @@ _0812DC12:
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _0812DC9C
@@ -3786,7 +3786,7 @@ _0812DE0C:
ldr r1, _0812DE98 @ =0x85000200
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _0812DE5A
@@ -4226,7 +4226,7 @@ _0812E194:
movs r1, 0x1
orrs r0, r1
strb r0, [r4]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _0812E1D4
@@ -4261,7 +4261,7 @@ _0812E1D4:
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _0812E260
@@ -4529,7 +4529,7 @@ _0812E420:
ldr r0, _0812E484 @ =0x85000200
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _0812E450
@@ -5513,7 +5513,7 @@ _0812EBC2:
bl obj_id_set_rotscale
adds r0, r5, 0
bl sub_8079A64
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _0812EBE8
@@ -6047,7 +6047,7 @@ sub_812EFC8: @ 812EFC8
str r0, [sp, 0x10]
movs r0, 0
bl GetAnimBankSpriteId
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _0812F004
@@ -8382,7 +8382,7 @@ sub_81301EC: @ 81301EC
lsls r1, 3
ldr r0, _08130218 @ =gTasks
adds r6, r1, r0
- bl IsContest
+ bl NotInBattle
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -9863,7 +9863,7 @@ sub_8130D20: @ 8130D20
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x26]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _08130DA8
@@ -10557,7 +10557,7 @@ sub_8131264: @ 8131264
lsls r0, 24
cmp r0, 0
beq _08131290
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _081312A8
@@ -10690,7 +10690,7 @@ _08131384:
ldrb r0, [r4]
movs r1, 0
bl refresh_graphics_maybe
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _081313C6
@@ -11140,7 +11140,7 @@ sub_81316F8: @ 81316F8
lsls r0, 24
lsrs r4, r0, 24
mov r10, r4
- bl IsContest
+ bl NotInBattle
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0
@@ -11560,7 +11560,7 @@ _08131A2E:
_08131A3C: .4byte gSprites
_08131A40: .4byte gTasks
_08131A44:
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
beq _08131A74
@@ -12151,7 +12151,7 @@ _08131ECA:
lsrs r0, 24
cmp r0, 0x1
bne _08131FF4
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _08131FF4
diff --git a/asm/battle_anim_813F0F4.s b/asm/battle_anim_813F0F4.s
index ab8a222df..6fa77321f 100644
--- a/asm/battle_anim_813F0F4.s
+++ b/asm/battle_anim_813F0F4.s
@@ -368,7 +368,7 @@ _0813F3AC:
strh r1, [r0]
adds r0, 0x2
strh r1, [r0]
- bl IsContest
+ bl NotInBattle
lsls r0, 24
cmp r0, 0
bne _0813F406
diff --git a/include/battle.h b/include/battle.h
index 2b268c3c8..95dba4897 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -692,20 +692,21 @@ extern u8 ewram[];
// The compiler wont allow us to locally declare ptr in this macro; some
// functions that invoke this macro will not match without this egregeous
-// assumption about the variable names.
-#define BAD_MEMSET(data, c, size, var, ptr) \
+// assumption about the variable names, so in order to avoid this assumption,
+// we opt to pass the variables themselves, even though it is likely that
+// Sogabe assumed the variables were named src and dest.
+#define BAD_MEMSET(data, c, size, var, dest) \
{ \
- ptr = (u8 *)data; \
+ dest = (u8 *)data; \
for(var = 0; var < (u32)size; var++) \
- ptr[var] = c; \
+ dest[var] = c; \
} \
-// TODO: Try to combine these macros.
-#define BAD_MEMSET_REVERSE(data, ptr2, size, var, ptr) \
+#define BAD_MEMCPY(data, dest, size, var, src) \
{ \
- ptr = (u8 *)data; \
+ src = (u8 *)data; \
for(var = 0; var < (u32)size; var++) \
- ptr2[var] = ptr[var]; \
+ dest[var] = src[var]; \
} \
typedef void (*BattleCmdFunc)(void);
diff --git a/include/battle_anim.h b/include/battle_anim.h
index 2386c515c..a9405068d 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -55,13 +55,12 @@ struct UnknownStruct3
void DoMoveAnim(const u8 *const moveAnims[], u16 b, u8 c);
bool8 IsAnimBankSpriteVisible(u8 a);
void sub_8076034(u8, u8);
-bool8 IsContest(void);
+bool8 NotInBattle(void);
void battle_anim_clear_some_data(void);
void move_anim_8072740(struct Sprite *sprite);
void DestroyAnimVisualTask(u8 task);
void DestroyAnimVisualTask(u8 task);
bool8 IsAnimBankSpriteVisible(u8);
-u8 IsContest();
#endif
diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c
index ad96510cf..1d68386aa 100644
--- a/src/battle/battle_7.c
+++ b/src/battle/battle_7.c
@@ -637,7 +637,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
const void *src;
void *dst;
- if (IsContest())
+ if (NotInBattle())
{
r10 = 0;
species = ewram19348.unk2;
@@ -702,7 +702,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
}
BlendPalette(paletteOffset, 16, 6, 0x7FFF);
CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
- if (!IsContest())
+ if (!NotInBattle())
{
ewram17800[a].transformedSpecies = species;
gBattleMonForms[a] = gBattleMonForms[b];
@@ -722,11 +722,11 @@ void BattleLoadSubstituteSprite(u8 a, u8 b)
if (b == 0)
{
- if (IsContest())
+ if (NotInBattle())
r4 = 0;
else
r4 = GetBankIdentity(a);
- if (IsContest())
+ if (NotInBattle())
LZDecompressVram(gSubstituteDollTilemap, gUnknown_081FAF4C[r4]);
else if (GetBankSide(a) != 0)
LZDecompressVram(gSubstituteDollGfx, gUnknown_081FAF4C[r4]);
@@ -742,7 +742,7 @@ void BattleLoadSubstituteSprite(u8 a, u8 b)
}
else
{
- if (!IsContest())
+ if (!NotInBattle())
{
if (GetBankSide(a) != 0)
BattleLoadOpponentMonSprite(&gEnemyParty[gBattlePartyID[a]], a);
diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c
index 111d72813..5790cffe4 100644
--- a/src/battle/battle_anim.c
+++ b/src/battle/battle_anim.c
@@ -217,7 +217,7 @@ void DoMoveAnim(const u8 *const moveAnims[], u16 move, u8 c)
{
s32 i;
- if (IsContest() == 0)
+ if (NotInBattle() == 0)
{
sub_8079E24();
sub_8043EB4(0);
@@ -654,7 +654,7 @@ static void ScriptCmd_end(void)
if (continuousAnim == FALSE) // may have been used for debug?
{
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256);
- if (IsContest() == 0)
+ if (NotInBattle() == 0)
{
sub_8079E24();
sub_8043EB4(1);
@@ -693,7 +693,7 @@ static void ScriptCmd_monbg(void)
{
r0 = GetBankIdentity(r5);
r0 += 0xFF;
- if (r0 <= 1 || IsContest() != 0)
+ if (r0 <= 1 || NotInBattle() != 0)
r7 = 0;
else
r7 = 1;
@@ -723,7 +723,7 @@ static void ScriptCmd_monbg(void)
{
r0 = GetBankIdentity(r5);
r0 += 0xFF;
- if (r0 <= 1 || IsContest() != 0)
+ if (r0 <= 1 || NotInBattle() != 0)
r7 = 0;
else
r7 = 1;
@@ -753,7 +753,7 @@ static void ScriptCmd_monbg(void)
#ifdef NONMATCHING
bool8 IsAnimBankSpriteVisible(u8 a)
{
- if (IsContest())
+ if (NotInBattle())
{
if (a == gBattleAnimBankAttacker)
return TRUE;
@@ -762,7 +762,7 @@ bool8 IsAnimBankSpriteVisible(u8 a)
}
if (!AnimBankSpriteExists(a))
return FALSE;
- if (IsContest())
+ if (NotInBattle())
return TRUE; // this line wont ever be reached.
if (!(EWRAM_17800[a].unk0 & 1))
return TRUE;
@@ -779,7 +779,7 @@ bool8 IsAnimBankSpriteVisible(u8 a)
lsls r0, 24\n\
lsrs r4, r0, 24\n\
adds r5, r4, 0\n\
- bl IsContest\n\
+ bl NotInBattle\n\
lsls r0, 24\n\
cmp r0, 0\n\
beq _08075FDC\n\
@@ -796,7 +796,7 @@ _08075FDC:\n\
lsls r0, 24\n\
cmp r0, 0\n\
beq _0807602C\n\
- bl IsContest\n\
+ bl NotInBattle\n\
lsls r0, 24\n\
cmp r0, 0\n\
bne _0807601C\n\
@@ -877,7 +877,7 @@ void sub_8076034(u8 a, u8 b)
spriteId = gObjectBankIDs[a];
gUnknown_030042C0 = -(gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x) + 32;
- if (IsContest() != 0 && sub_80AEB1C(EWRAM_19348) != 0)
+ if (NotInBattle() != 0 && sub_80AEB1C(EWRAM_19348) != 0)
gUnknown_030042C0--;
gUnknown_030041B4 = -(gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) + 32;
gSprites[gObjectBankIDs[a]].invisible = TRUE;
@@ -889,12 +889,12 @@ void sub_8076034(u8 a, u8 b)
addr3 = (u16 *)PLTT + s.unk8 * 16;
DmaCopy32(3, gPlttBufferUnfaded + 0x100 + a * 16, addr3, 32);
- if (IsContest() != 0)
+ if (NotInBattle() != 0)
r2 = 0;
else
r2 = GetBankIdentity(a);
sub_80E4EF8(0, 0, r2, s.unk8, (u32)s.unk0, (((s32)s.unk4 - VRAM) / 2048), REG_BG1CNT_BITFIELD.charBaseBlock);
- if (IsContest() != 0)
+ if (NotInBattle() != 0)
sub_8076380();
}
else
@@ -996,7 +996,7 @@ void sub_8076464(u8 a)
struct UnknownStruct2 s;
sub_8078914(&s);
- if (a == 0 || IsContest() != 0)
+ if (a == 0 || NotInBattle() != 0)
{
u16 *addr2;
@@ -1121,7 +1121,7 @@ static void sub_807672C(u8 taskId)
{
var = GetBankIdentity(gTasks[taskId].data[2]);
var += 0xFF;
- if (var <= 1 || IsContest() != 0)
+ if (var <= 1 || NotInBattle() != 0)
r4 = 0;
else
r4 = 1;
@@ -1162,7 +1162,7 @@ static void ScriptCmd_monbg_22(void)
{
r0 = GetBankIdentity(r4);
r0 += 0xFF;
- if (r0 <= 1 || IsContest() != 0)
+ if (r0 <= 1 || NotInBattle() != 0)
r1 = 0;
else
r1 = 1;
@@ -1174,7 +1174,7 @@ static void ScriptCmd_monbg_22(void)
{
r0 = GetBankIdentity(r4);
r0 += 0xFF;
- if (r0 <= 1 || IsContest() != 0)
+ if (r0 <= 1 || NotInBattle() != 0)
r1 = 0;
else
r1 = 1;
@@ -1224,7 +1224,7 @@ static void sub_80769A4(u8 taskId)
r4 = gTasks[taskId].data[2];
r0 = GetBankIdentity(r4);
r0 += 0xFF;
- if (r0 <= 1 || IsContest() != 0)
+ if (r0 <= 1 || NotInBattle() != 0)
r5 = 0;
else
r5 = 1;
@@ -1334,8 +1334,7 @@ static void ScriptCmd_jump(void)
gBattleAnimScriptPtr = (u8 *)addr;
}
-// Uses of this function that rely on a TRUE return are expecting inBattle to not be ticked as defined in contest behavior. As a result, if misused, this function cannot reliably discern between field and contest status and could result in undefined behavior.
-bool8 IsContest(void)
+bool8 NotInBattle(void)
{
if (!gMain.inBattle)
return TRUE;
@@ -1369,7 +1368,7 @@ static void ScriptCmd_fadetobg_25(void)
r6 = gBattleAnimScriptPtr[2];
gBattleAnimScriptPtr += 3;
taskId = CreateTask(task_p5_load_battle_screen_elements, 5);
- if (IsContest() != 0)
+ if (NotInBattle() != 0)
gTasks[taskId].data[0] = r6;
else if (GetBankSide(gBattleAnimBankTarget) == 0)
gTasks[taskId].data[0] = r7;
@@ -1416,15 +1415,15 @@ static void task_p5_load_battle_screen_elements(u8 taskId)
static void sub_8076DB8(u16 a)
{
- if (IsContest())
+ if (NotInBattle())
{
void *tilemap = gBattleAnimBackgroundTable[a].tilemap;
void *dmaSrc;
void *dmaDest;
- LZDecompressWram(tilemap, IsContest() ? EWRAM_14800 : EWRAM_18000);
- sub_80763FC(sub_80789BC(), IsContest() ? EWRAM_14800 : EWRAM_18000, 0x100, 0);
- dmaSrc = IsContest() ? EWRAM_14800 : EWRAM_18000;
+ LZDecompressWram(tilemap, NotInBattle() ? EWRAM_14800 : EWRAM_18000);
+ sub_80763FC(sub_80789BC(), NotInBattle() ? EWRAM_14800 : EWRAM_18000, 0x100, 0);
+ dmaSrc = NotInBattle() ? EWRAM_14800 : EWRAM_18000;
dmaDest = (void *)(VRAM + 0xD000);
DmaCopy32(3, dmaSrc, dmaDest, 0x800);
LZDecompressVram(gBattleAnimBackgroundTable[a].image, (void *)(VRAM + 0x2000));
@@ -1440,7 +1439,7 @@ static void sub_8076DB8(u16 a)
static void dp01t_11_3_message_for_player_only(void)
{
- if (IsContest())
+ if (NotInBattle())
sub_80AB2AC();
else
sub_800D7B8();
@@ -1493,14 +1492,14 @@ static void ScriptCmd_changebg(void)
/*
s8 sub_8076F98(s8 a)
{
- if (!IsContest() && (EWRAM_17810[gBattleAnimBankAttacker].unk0 & 0x10))
+ if (!NotInBattle() && (EWRAM_17810[gBattleAnimBankAttacker].unk0 & 0x10))
{
a = GetBankSide(gBattleAnimBankAttacker) ? 0xC0 : 0x3F;
}
//_08076FDC
else
{
- if (IsContest())
+ if (NotInBattle())
{
if (gBattleAnimBankAttacker == gBattleAnimBankTarget && gBattleAnimBankAttacker == 2
&& a == 0x3F)
@@ -1536,7 +1535,7 @@ s8 sub_8076F98(s8 a)
push {r4,lr}\n\
lsls r0, 24\n\
lsrs r4, r0, 24\n\
- bl IsContest\n\
+ bl NotInBattle\n\
lsls r0, 24\n\
cmp r0, 0\n\
bne _08076FDC\n\
@@ -1564,7 +1563,7 @@ s8 sub_8076F98(s8 a)
_08076FD4: .4byte gBattleAnimBankAttacker\n\
_08076FD8: .4byte 0x02017810\n\
_08076FDC:\n\
- bl IsContest\n\
+ bl NotInBattle\n\
lsls r0, 24\n\
cmp r0, 0\n\
beq _08077004\n\
@@ -1661,7 +1660,7 @@ _08077088:\n\
s8 sub_8077094(s8 a)
{
- if (!IsContest() && (EWRAM_17810[gBattleAnimBankAttacker].unk0 & 0x10))
+ if (!NotInBattle() && (EWRAM_17810[gBattleAnimBankAttacker].unk0 & 0x10))
{
if (GetBankSide(gBattleAnimBankAttacker) != 0)
a = 0x3F;
@@ -1670,7 +1669,7 @@ s8 sub_8077094(s8 a)
}
else
{
- if (GetBankSide(gBattleAnimBankAttacker) != 0 || IsContest() != 0)
+ if (GetBankSide(gBattleAnimBankAttacker) != 0 || NotInBattle() != 0)
a = -a;
}
return a;
@@ -2108,7 +2107,7 @@ static void ScriptCmd_jumpunkcond(void)
u8 *addr;
gBattleAnimScriptPtr++;
- if (IsContest())
+ if (NotInBattle())
{
addr = (u8 *)SCRIPT_READ_32(gBattleAnimScriptPtr);
gBattleAnimScriptPtr = addr;
@@ -2132,7 +2131,7 @@ static void ScriptCmd_monbgprio_28(void)
else
r0 = gBattleAnimBankAttacker;
r4 = GetBankIdentity(r0);
- if (!IsContest() && (r4 == 0 || r4 == 3))
+ if (!NotInBattle() && (r4 == 0 || r4 == 3))
{
REG_BG1CNT_BITFIELD.priority = 1;
REG_BG2CNT_BITFIELD.priority = 2;
@@ -2142,7 +2141,7 @@ static void ScriptCmd_monbgprio_28(void)
static void ScriptCmd_monbgprio_29(void)
{
gBattleAnimScriptPtr++;
- if (!IsContest())
+ if (!NotInBattle())
{
REG_BG1CNT_BITFIELD.priority = 1;
REG_BG2CNT_BITFIELD.priority = 2;
@@ -2164,7 +2163,7 @@ static void ScriptCmd_monbgprio_2A(void)
else
r0 = gBattleAnimBankAttacker;
r4 = GetBankIdentity(r0);
- if (!IsContest() && (r4 == 0 || r4 == 3))
+ if (!NotInBattle() && (r4 == 0 || r4 == 3))
{
REG_BG1CNT_BITFIELD.priority = 1;
REG_BG2CNT_BITFIELD.priority = 2;
@@ -2208,7 +2207,7 @@ static void ScriptCmd_doublebattle_2D(void)
r7 = SCRIPT_READ_8(gBattleAnimScriptPtr + 1);
gBattleAnimScriptPtr += 2;
- if (!IsContest() && IsDoubleBattle()
+ if (!NotInBattle() && IsDoubleBattle()
&& GetBankSide(gBattleAnimBankAttacker) == GetBankSide(gBattleAnimBankTarget))
{
if (r7 == 0)
@@ -2242,7 +2241,7 @@ static void ScriptCmd_doublebattle_2E(void)
r7 = SCRIPT_READ_8(gBattleAnimScriptPtr + 1);
gBattleAnimScriptPtr += 2;
- if (!IsContest() && IsDoubleBattle()
+ if (!NotInBattle() && IsDoubleBattle()
&& GetBankSide(gBattleAnimBankAttacker) == GetBankSide(gBattleAnimBankTarget))
{
if (r7 == 0)
diff --git a/src/battle/battle_anim_807B69C.c b/src/battle/battle_anim_807B69C.c
index bf3eb7ef1..9acc7bd46 100644
--- a/src/battle/battle_anim_807B69C.c
+++ b/src/battle/battle_anim_807B69C.c
@@ -183,7 +183,7 @@ void sub_807B920(u8 taskId)
s16 y = sub_8077ABC(gBattleAnimBankTarget, 3) - 36;
u8 spriteId;
- if (IsContest())
+ if (NotInBattle())
x -= 6;
REG_BLDCNT = 0x3F40;
REG_BLDALPHA = 0x1000;
diff --git a/src/battle/battle_anim_80A7E7C.c b/src/battle/battle_anim_80A7E7C.c
index e0c79dc8e..19ac7143e 100644
--- a/src/battle/battle_anim_80A7E7C.c
+++ b/src/battle/battle_anim_80A7E7C.c
@@ -769,7 +769,7 @@ void sub_80A8E04(u8 taskId)
TASK.data[4] = gBattleAnimArgs[1];
TASK.data[5] = spriteId;
TASK.data[6] = gBattleAnimArgs[3];
- if (IsContest())
+ if (NotInBattle())
{
TASK.data[7] = 1;
}
@@ -786,7 +786,7 @@ void sub_80A8E04(u8 taskId)
}
if (TASK.data[7])
{
- if (!IsContest())
+ if (!NotInBattle())
{
TASK.data[3] *= -1;
TASK.data[4] *= -1;
diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c
index 7b7c7ed82..70cd636bd 100644
--- a/src/battle/battle_controller_linkopponent.c
+++ b/src/battle/battle_controller_linkopponent.c
@@ -638,7 +638,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon__(u8 a, u8 *buffer)
StringCopy10(battlePokemon.nickname, nickname);
GetMonData(&gEnemyParty[a], MON_DATA_OT_NAME, battlePokemon.otName);
- BAD_MEMSET_REVERSE(&battlePokemon, buffer, sizeof(battlePokemon), size, src)
+ BAD_MEMCPY(&battlePokemon, buffer, sizeof(battlePokemon), size, src)
break;
case 1:
data16 = GetMonData(&gEnemyParty[a], MON_DATA_SPECIES);
@@ -659,7 +659,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon__(u8 a, u8 *buffer)
moveData.pp[size] = GetMonData(&gEnemyParty[a], MON_DATA_PP1 + size);
}
moveData.ppBonuses = GetMonData(&gEnemyParty[a], MON_DATA_PP_BONUSES);
- BAD_MEMSET_REVERSE(&moveData, buffer, sizeof(moveData), size, src)
+ BAD_MEMCPY(&moveData, buffer, sizeof(moveData), size, src)
break;
case 4:
case 5:
diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c
index 7f3cf9d37..718afa6bd 100644
--- a/src/battle/battle_controller_linkpartner.c
+++ b/src/battle/battle_controller_linkpartner.c
@@ -593,7 +593,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *buffer)
GetMonData(&gPlayerParty[a], MON_DATA_NICKNAME, nickname);
StringCopy10(battlePokemon.nickname, nickname);
GetMonData(&gPlayerParty[a], MON_DATA_OT_NAME, battlePokemon.otName);
- BAD_MEMSET_REVERSE(&battlePokemon, buffer, sizeof(battlePokemon), size, src)
+ BAD_MEMCPY(&battlePokemon, buffer, sizeof(battlePokemon), size, src)
break;
case 1:
data16 = GetMonData(&gPlayerParty[a], MON_DATA_SPECIES);
@@ -614,7 +614,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *buffer)
moveData.pp[size] = GetMonData(&gPlayerParty[a], MON_DATA_PP1 + size);
}
moveData.ppBonuses = GetMonData(&gPlayerParty[a], MON_DATA_PP_BONUSES);
- BAD_MEMSET_REVERSE(&moveData, buffer, sizeof(moveData), size, src)
+ BAD_MEMCPY(&moveData, buffer, sizeof(moveData), size, src)
break;
case 4:
case 5:
diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c
index d9f24e6c2..c36f5fd82 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
@@ -601,7 +601,7 @@ u32 sub_8033598(u8 a, u8 *buffer)
GetMonData(&gEnemyParty[a], MON_DATA_NICKNAME, nickname);
StringCopy10(battlePokemon.nickname, nickname);
GetMonData(&gEnemyParty[a], MON_DATA_OT_NAME, battlePokemon.otName);
- BAD_MEMSET_REVERSE(&battlePokemon, buffer, sizeof(battlePokemon), size, src)
+ BAD_MEMCPY(&battlePokemon, buffer, sizeof(battlePokemon), size, src)
break;
case 1:
data16 = GetMonData(&gEnemyParty[a], MON_DATA_SPECIES);
@@ -622,7 +622,7 @@ u32 sub_8033598(u8 a, u8 *buffer)
moveData.pp[size] = GetMonData(&gEnemyParty[a], MON_DATA_PP1 + size);
}
moveData.ppBonuses = GetMonData(&gEnemyParty[a], MON_DATA_PP_BONUSES);
- BAD_MEMSET_REVERSE(&moveData, buffer, sizeof(moveData), size, src)
+ BAD_MEMCPY(&moveData, buffer, sizeof(moveData), size, src)
break;
case 4:
case 5:
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index 62da661f0..70eeed5f7 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -1773,7 +1773,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon_(u8 a, u8 *buffer)
GetMonData(&gPlayerParty[a], MON_DATA_NICKNAME, nickname);
StringCopy10(battlePokemon.nickname, nickname);
GetMonData(&gPlayerParty[a], MON_DATA_OT_NAME, battlePokemon.otName);
- BAD_MEMSET_REVERSE(&battlePokemon, buffer, sizeof(battlePokemon), size, src)
+ BAD_MEMCPY(&battlePokemon, buffer, sizeof(battlePokemon), size, src)
break;
case 1:
data16 = GetMonData(&gPlayerParty[a], MON_DATA_SPECIES);
@@ -1794,7 +1794,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon_(u8 a, u8 *buffer)
moveData.pp[size] = GetMonData(&gPlayerParty[a], MON_DATA_PP1 + size);
}
moveData.ppBonuses = GetMonData(&gPlayerParty[a], MON_DATA_PP_BONUSES);
- BAD_MEMSET_REVERSE(&moveData, buffer, sizeof(moveData), size, src)
+ BAD_MEMCPY(&moveData, buffer, sizeof(moveData), size, src)
break;
case 4:
case 5:
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index d2baa293b..eefdc5e50 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -569,7 +569,7 @@ u32 sub_8137A84(u8 a, u8 *buffer)
GetMonData(&gPlayerParty[a], MON_DATA_NICKNAME, nickname);
StringCopy10(battlePokemon.nickname, nickname);
GetMonData(&gPlayerParty[a], MON_DATA_OT_NAME, battlePokemon.otName);
- BAD_MEMSET_REVERSE(&battlePokemon, buffer, sizeof(battlePokemon), size, src)
+ BAD_MEMCPY(&battlePokemon, buffer, sizeof(battlePokemon), size, src)
break;
case 1:
data16 = GetMonData(&gPlayerParty[a], MON_DATA_SPECIES);
@@ -590,7 +590,7 @@ u32 sub_8137A84(u8 a, u8 *buffer)
moveData.pp[size] = GetMonData(&gPlayerParty[a], MON_DATA_PP1 + size);
}
moveData.ppBonuses = GetMonData(&gPlayerParty[a], MON_DATA_PP_BONUSES);
- BAD_MEMSET_REVERSE(&moveData, buffer, sizeof(moveData), size, src)
+ BAD_MEMCPY(&moveData, buffer, sizeof(moveData), size, src)
break;
case 4:
case 5:
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c
index ef9eb36a8..285c992ca 100644
--- a/src/rom_8077ABC.c
+++ b/src/rom_8077ABC.c
@@ -187,7 +187,7 @@ u8 sub_8077ABC(u8 slot, u8 a2) {
u16 species;
struct TransformStatus *transform;
- if (IsContest()) {
+ if (NotInBattle()) {
if (a2 == 3 && slot == 3) {
a2 = 1;
}
@@ -203,7 +203,7 @@ u8 sub_8077ABC(u8 slot, u8 a2) {
case 3:
case 4:
default:
- if (IsContest()) {
+ if (NotInBattle()) {
if (unk_2019348.field_4 & 1) {
species = unk_2019348.field_2;
} else {
@@ -243,9 +243,9 @@ u8 sub_8077BFC(u8 slot, u16 species) {
u8 ret;
u16 var;
- if (!GetBankSide(slot) || IsContest()) {
+ if (!GetBankSide(slot) || NotInBattle()) {
if (species == SPECIES_UNOWN) {
- if (IsContest()) {
+ if (NotInBattle()) {
if (unk_2019348.field_4 & 1) {
personality = unk_2019348.field_10;
} else {
@@ -302,7 +302,7 @@ u8 sub_8077BFC(u8 slot, u16 species) {
u8 sub_8077DD8(u8 slot, u16 species) {
u8 ret = 0;
if (GetBankSide(slot) == 1) {
- if (!IsContest()) {
+ if (!NotInBattle()) {
if (species == SPECIES_CASTFORM) {
ret = gCastformElevations[gBattleMonForms[slot]];
} else if (species > NUM_SPECIES) {
@@ -318,7 +318,7 @@ u8 sub_8077DD8(u8 slot, u16 species) {
u8 sub_8077E44(u8 slot, u16 species, u8 a3) {
u16 offset;
u8 y;
- if (GetBankSide(slot) == 0 || IsContest()) {
+ if (GetBankSide(slot) == 0 || NotInBattle()) {
offset = sub_8077BFC(slot, species);
} else {
offset = sub_8077BFC(slot, species);
@@ -338,7 +338,7 @@ u8 sub_8077EE4(u8 slot, u8 a2) {
u16 species;
struct TransformStatus *transform;
if (a2 == 3 || a2 == 4) {
- if (IsContest()) {
+ if (NotInBattle()) {
if (unk_2019348.field_4 & 1) {
species = unk_2019348.field_2;
} else {
@@ -381,7 +381,7 @@ u8 sub_8077FC0(u8 slot) {
u8 r6;
struct TransformStatus *transform;
r6 = sub_8077ABC(slot, 1);
- if (!IsContest()) {
+ if (!NotInBattle()) {
if (GetBankSide(slot)) {
transform = &gTransformStatuses[slot];
if (!transform->species) {
@@ -752,7 +752,7 @@ u8 GetBankByPlayerAI(u8 slot) {
}
bool8 AnimBankSpriteExists(u8 slot) {
- if (IsContest()) {
+ if (NotInBattle()) {
if (gBattleAnimBankAttacker == slot) {
return TRUE;
}
@@ -782,7 +782,7 @@ bool8 IsDoubleBattle() {
}
void sub_8078914(struct Struct_sub_8078914 *unk) {
- if (IsContest()) {
+ if (NotInBattle()) {
unk->field_0 = (u8 *)0x6008000;
unk->field_4 = (u8 *)0x600f000;
unk->field_8 = 0xe;
@@ -794,7 +794,7 @@ void sub_8078914(struct Struct_sub_8078914 *unk) {
}
void sub_8078954(struct Struct_sub_8078914 *unk) {
- if (IsContest()) {
+ if (NotInBattle()) {
unk->field_0 = (u8 *)0x6008000;
unk->field_4 = (u8 *)0x600f000;
unk->field_8 = 0xe;
@@ -810,7 +810,7 @@ void sub_8078954(struct Struct_sub_8078914 *unk) {
}
u8 sub_80789BC() {
- if (IsContest()) {
+ if (NotInBattle()) {
return 1;
}
return 2;
@@ -820,7 +820,7 @@ void sub_80789D4(bool8 a1) {
if (!a1) {
BG3CNT.size = 0;
BG3CNT.overflow = 1;
- } else if (IsContest()) {
+ } else if (NotInBattle()) {
BG3CNT.size = 0;
BG3CNT.overflow = 1;
} else {
@@ -1025,7 +1025,7 @@ void obj_id_set_rotscale(u8 sprite, s16 xScale, s16 yScale, u16 rotation) {
}
bool8 sub_8078E38() {
- if (IsContest()) {
+ if (NotInBattle()) {
if (gSprites[GetAnimBankSpriteId(0)].data2 == 0xc9 /* XXX SPECIES_UNOWN? */) {
return FALSE;
}
@@ -1037,12 +1037,12 @@ bool8 sub_8078E38() {
void sub_8078E70(u8 sprite, u8 a2) {
struct Struct_2017810 *unk;
u8 r7 = gSprites[sprite].data0;
- if (IsContest() || IsAnimBankSpriteVisible(r7)) {
+ if (NotInBattle() || IsAnimBankSpriteVisible(r7)) {
gSprites[sprite].invisible = FALSE;
}
gSprites[sprite].oam.objMode = a2;
gSprites[sprite].affineAnimPaused = TRUE;
- if (!IsContest() && !gSprites[sprite].oam.affineMode) {
+ if (!NotInBattle() && !gSprites[sprite].oam.affineMode) {
unk = &unk_2017810[r7];
gSprites[sprite].oam.matrixNum = unk->field_6;
}
@@ -1135,7 +1135,7 @@ u32 sub_80791A8(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) {
u32 var = 0;
u32 shift;
if (a1) {
- if (!IsContest()) {
+ if (!NotInBattle()) {
var = 0xe;
} else {
var = 1 << sub_80789BC();
@@ -1162,14 +1162,14 @@ u32 sub_80791A8(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) {
}
}
if (a6) {
- if (!IsContest()) {
+ if (!NotInBattle()) {
var |= 0x100;
} else {
var |= 0x4000;
}
}
if (a7) {
- if (!IsContest()) {
+ if (!NotInBattle()) {
var |= 0x200;
}
}
@@ -1179,7 +1179,7 @@ u32 sub_80791A8(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) {
u32 sub_80792C0(u8 a1, u8 a2, u8 a3, u8 a4) {
u32 var = 0;
u32 shift;
- if (IsContest()) {
+ if (NotInBattle()) {
if (a1) {
var |= 1 << 18;
return var;
@@ -1540,7 +1540,7 @@ u16 sub_8079B10(u8 sprite) {
u16 i;
for (i = 0; i < (sizeof(gBattleMonSprites) / sizeof(u8)); i++) {
if (gBattleMonSprites[i] == sprite) {
- if (IsContest()) {
+ if (NotInBattle()) {
species = unk_2019348.field_0;
return gMonBackPicCoords[species].y_offset;
} else {
@@ -1653,7 +1653,7 @@ void sub_8079E24() {
u8 sub_8079E90(u8 slot) {
u8 status;
u8 ret;
- if (IsContest()) {
+ if (NotInBattle()) {
if (slot == 2) {
return 30;
} else {
@@ -1676,7 +1676,7 @@ u8 sub_8079E90(u8 slot) {
u8 sub_8079ED4(u8 slot) {
u8 status = GetBankIdentity(slot);
- if (IsContest()) {
+ if (NotInBattle()) {
return 2;
}
if (status == 0 || status == 3) {
@@ -1688,7 +1688,7 @@ u8 sub_8079ED4(u8 slot) {
u8 GetBankIdentity_permutated(u8 slot) {
u8 status;
- if (!IsContest()) {
+ if (!NotInBattle()) {
status = GetBankIdentity(slot);
if (status == 0 || status == 3) {
return 2;
@@ -1744,7 +1744,7 @@ u8 sub_8079F44(u16 species, u8 isBackpic, u8 a3, s16 a4, s16 a5, u8 a6, u32 a7,
} else {
sprite = CreateSprite(&gSpriteTemplate_837F5B0[a3], a4, a5 + gMonBackPicCoords[species].y_offset, a6);
}
- if (IsContest()) {
+ if (NotInBattle()) {
gSprites[sprite].affineAnims = &gSpriteAffineAnimTable_81E7C18;
StartSpriteAffineAnim(&gSprites[sprite], 0);
}
@@ -1763,7 +1763,7 @@ int sub_807A100(u8 slot, u8 a2) {
int ret;
const struct MonCoords *coords;
struct TransformStatus *transform;
- if (IsContest()) {
+ if (NotInBattle()) {
if (unk_2019348.field_4 & 1) {
species = unk_2019348.field_2;
personality = unk_2019348.field_10;
@@ -1870,7 +1870,7 @@ void sub_807A3FC(u8 slot, u8 a2, s16 *a3, s16 *a4) {
}
v3 = sub_8077ABC(slot, v1);
v4 = sub_8077ABC(slot, v2);
- if (IsDoubleBattle() && !IsContest()) {
+ if (IsDoubleBattle() && !NotInBattle()) {
v5 = sub_8077ABC(slot ^ 2, v1);
v6 = sub_8077ABC(slot ^ 2, v2);
} else {
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 17:01:42 +0000