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

ported documentation of battle_util.s

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-07-30 12:10:40 +08:00
parent 1f986e6543
commit 035df4d7a4
12 changed files with 2910 additions and 2910 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_2.s
+367 -367
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_special.s
+2 -2
View File
@@ -6192,7 +6192,7 @@ sub_80F1CE4: @ 80F1CE4
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
ldr r2, _080F1CF8 @ =gUnknown_2023E82 ldr r2, _080F1CF8 @ =gBattleCommunication
ldrb r0, [r2, 0x5] ldrb r0, [r2, 0x5]
cmp r0, 0x2 cmp r0, 0x2
bls _080F1D00 bls _080F1D00
@@ -6200,7 +6200,7 @@ sub_80F1CE4: @ 80F1CE4
movs r0, 0 movs r0, 0
b _080F1D04 b _080F1D04
.align 2, 0 .align 2, 0
_080F1CF8: .4byte gUnknown_2023E82 _080F1CF8: .4byte gBattleCommunication
_080F1CFC: .4byte gBattleAnimArgs _080F1CFC: .4byte gBattleAnimArgs
_080F1D00: _080F1D00:
ldr r1, _080F1D10 @ =gBattleAnimArgs ldr r1, _080F1D10 @ =gBattleAnimArgs
asm/battle_controller_oak.s
+2 -2
View File
@@ -2136,7 +2136,7 @@ _080E86DC: .4byte gActiveBattler
_080E86E0: _080E86E0:
bl OpponentBufferExecCompleted bl OpponentBufferExecCompleted
_080E86E4: _080E86E4:
ldr r0, _080E86FC @ =gUnknown_2023E82 ldr r0, _080E86FC @ =gBattleCommunication
movs r1, 0 movs r1, 0
strb r1, [r0, 0x7] strb r1, [r0, 0x7]
ldr r0, _080E8700 @ =gBattleStruct ldr r0, _080E8700 @ =gBattleStruct
@@ -2149,7 +2149,7 @@ _080E86F2:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080E86FC: .4byte gUnknown_2023E82 _080E86FC: .4byte gBattleCommunication
_080E8700: .4byte gBattleStruct _080E8700: .4byte gBattleStruct
thumb_func_end sub_80E85D4 thumb_func_end sub_80E85D4
asm/battle_script_commands.s
+1637 -1637
View File
File diff suppressed because it is too large Load Diff
asm/battle_util.s
+725 -725
View File
File diff suppressed because it is too large Load Diff
asm/evolution_scene.s
+50 -50
View File
@@ -1337,7 +1337,7 @@ sub_80CE8DC: @ 80CE8DC
strh r0, [r5, 0x8] strh r0, [r5, 0x8]
movs r2, 0x1 movs r2, 0x1
strh r2, [r5, 0x1A] strh r2, [r5, 0x1A]
ldr r0, _080CE944 @ =gUnknown_2023E82 ldr r0, _080CE944 @ =gBattleCommunication
ldrb r1, [r0, 0x2] ldrb r1, [r0, 0x2]
lsls r0, r1, 2 lsls r0, r1, 2
adds r0, r1 adds r0, r1
@@ -1349,7 +1349,7 @@ sub_80CE8DC: @ 80CE8DC
.align 2, 0 .align 2, 0
_080CE93C: .4byte gTasks _080CE93C: .4byte gTasks
_080CE940: .4byte gPlayerParty _080CE940: .4byte gPlayerParty
_080CE944: .4byte gUnknown_2023E82 _080CE944: .4byte gBattleCommunication
_080CE948: _080CE948:
ldr r0, _080CE9A0 @ =gMain ldr r0, _080CE9A0 @ =gMain
ldrh r1, [r0, 0x2C] ldrh r1, [r0, 0x2C]
@@ -1367,7 +1367,7 @@ _080CE948:
ldrsh r0, [r2, r3] ldrsh r0, [r2, r3]
cmp r0, 0x8 cmp r0, 0x8
bne _080CE9AC bne _080CE9AC
ldr r4, _080CE9A8 @ =gUnknown_2023E82 ldr r4, _080CE9A8 @ =gBattleCommunication
ldrb r0, [r4, 0x2] ldrb r0, [r4, 0x2]
lsls r1, r0, 2 lsls r1, r0, 2
adds r1, r0 adds r1, r0
@@ -1395,7 +1395,7 @@ _080CE948:
.align 2, 0 .align 2, 0
_080CE9A0: .4byte gMain _080CE9A0: .4byte gMain
_080CE9A4: .4byte gTasks _080CE9A4: .4byte gTasks
_080CE9A8: .4byte gUnknown_2023E82 _080CE9A8: .4byte gBattleCommunication
_080CE9AC: _080CE9AC:
mov r1, r8 mov r1, r8
adds r0, r1, r7 adds r0, r1, r7
@@ -1584,7 +1584,7 @@ _080CEB68:
bl InitMovingBackgroundTask bl InitMovingBackgroundTask
movs r0, 0x11 movs r0, 0x11
bl LaunchTask_PreEvoSparklesSet1 bl LaunchTask_PreEvoSparklesSet1
ldr r1, _080CEB88 @ =gUnknown_2023E82 ldr r1, _080CEB88 @ =gBattleCommunication
strb r0, [r1, 0x2] strb r0, [r1, 0x2]
ldr r0, _080CEB8C @ =gTasks ldr r0, _080CEB8C @ =gTasks
mov r2, r8 mov r2, r8
@@ -1594,10 +1594,10 @@ _080CEB68:
b _080CEFDE b _080CEFDE
.align 2, 0 .align 2, 0
_080CEB84: .4byte gPaletteFade _080CEB84: .4byte gPaletteFade
_080CEB88: .4byte gUnknown_2023E82 _080CEB88: .4byte gBattleCommunication
_080CEB8C: .4byte gTasks _080CEB8C: .4byte gTasks
_080CEB90: _080CEB90:
ldr r4, _080CEBC8 @ =gUnknown_2023E82 ldr r4, _080CEBC8 @ =gBattleCommunication
ldrb r0, [r4, 0x2] ldrb r0, [r4, 0x2]
lsls r1, r0, 2 lsls r1, r0, 2
adds r1, r0 adds r1, r0
@@ -1623,10 +1623,10 @@ _080CEBA6:
strb r0, [r4, 0x2] strb r0, [r4, 0x2]
bl _080CF528 bl _080CF528
.align 2, 0 .align 2, 0
_080CEBC8: .4byte gUnknown_2023E82 _080CEBC8: .4byte gBattleCommunication
_080CEBCC: .4byte gUnknown_2039A20 _080CEBCC: .4byte gUnknown_2039A20
_080CEBD0: _080CEBD0:
ldr r4, _080CEC00 @ =gUnknown_2023E82 ldr r4, _080CEC00 @ =gBattleCommunication
ldrb r0, [r4, 0x2] ldrb r0, [r4, 0x2]
lsls r1, r0, 2 lsls r1, r0, 2
adds r1, r0 adds r1, r0
@@ -1649,7 +1649,7 @@ _080CEBE6:
add r1, r10 add r1, r10
b _080CEFDE b _080CEFDE
.align 2, 0 .align 2, 0
_080CEC00: .4byte gUnknown_2023E82 _080CEC00: .4byte gBattleCommunication
_080CEC04: .4byte gUnknown_2039A20 _080CEC04: .4byte gUnknown_2039A20
_080CEC08: _080CEC08:
ldr r2, _080CEC44 @ =gUnknown_2039A20 ldr r2, _080CEC44 @ =gUnknown_2039A20
@@ -1665,7 +1665,7 @@ _080CEC1C:
ldr r1, [r2] ldr r1, [r2]
movs r0, 0x3 movs r0, 0x3
strb r0, [r1, 0x3] strb r0, [r1, 0x3]
ldr r0, _080CEC48 @ =gUnknown_2023E82 ldr r0, _080CEC48 @ =gBattleCommunication
ldrb r1, [r0, 0x2] ldrb r1, [r0, 0x2]
lsls r0, r1, 2 lsls r0, r1, 2
adds r0, r1 adds r0, r1
@@ -1683,10 +1683,10 @@ _080CEC38:
b _080CEFDE b _080CEFDE
.align 2, 0 .align 2, 0
_080CEC44: .4byte gUnknown_2039A20 _080CEC44: .4byte gUnknown_2039A20
_080CEC48: .4byte gUnknown_2023E82 _080CEC48: .4byte gBattleCommunication
_080CEC4C: _080CEC4C:
bl sub_80F5F74 bl sub_80F5F74
ldr r1, _080CEC60 @ =gUnknown_2023E82 ldr r1, _080CEC60 @ =gBattleCommunication
strb r0, [r1, 0x2] strb r0, [r1, 0x2]
ldr r0, _080CEC64 @ =gTasks ldr r0, _080CEC64 @ =gTasks
mov r3, r8 mov r3, r8
@@ -1695,10 +1695,10 @@ _080CEC4C:
adds r1, r0 adds r1, r0
b _080CEFDE b _080CEFDE
.align 2, 0 .align 2, 0
_080CEC60: .4byte gUnknown_2023E82 _080CEC60: .4byte gBattleCommunication
_080CEC64: .4byte gTasks _080CEC64: .4byte gTasks
_080CEC68: _080CEC68:
ldr r6, _080CEC90 @ =gUnknown_2023E82 ldr r6, _080CEC90 @ =gBattleCommunication
ldrb r0, [r6, 0x2] ldrb r0, [r6, 0x2]
lsls r1, r0, 2 lsls r1, r0, 2
adds r1, r0 adds r1, r0
@@ -1718,9 +1718,9 @@ _080CEC7E:
strb r0, [r6, 0x2] strb r0, [r6, 0x2]
b _080CEF2E b _080CEF2E
.align 2, 0 .align 2, 0
_080CEC90: .4byte gUnknown_2023E82 _080CEC90: .4byte gBattleCommunication
_080CEC94: _080CEC94:
ldr r0, _080CECBC @ =gUnknown_2023E82 ldr r0, _080CECBC @ =gBattleCommunication
ldrb r1, [r0, 0x2] ldrb r1, [r0, 0x2]
lsls r0, r1, 2 lsls r0, r1, 2
adds r0, r1 adds r0, r1
@@ -1739,7 +1739,7 @@ _080CECAA:
add r1, r10 add r1, r10
b _080CEFDE b _080CEFDE
.align 2, 0 .align 2, 0
_080CECBC: .4byte gUnknown_2023E82 _080CECBC: .4byte gBattleCommunication
_080CECC0: _080CECC0:
bl IsSEPlaying bl IsSEPlaying
lsls r0, 24 lsls r0, 24
@@ -1971,7 +1971,7 @@ _080CEEC4: .4byte gPaletteFade
_080CEEC8: .4byte gUnknown_2039A20 _080CEEC8: .4byte gUnknown_2039A20
_080CEECC: .4byte gUnknown_300537C _080CEECC: .4byte gUnknown_300537C
_080CEED0: _080CEED0:
ldr r0, _080CEF04 @ =gUnknown_2023E82 ldr r0, _080CEF04 @ =gBattleCommunication
ldrb r1, [r0, 0x2] ldrb r1, [r0, 0x2]
lsls r0, r1, 2 lsls r0, r1, 2
adds r0, r1 adds r0, r1
@@ -1996,7 +1996,7 @@ _080CEEE4:
add r1, r10 add r1, r10
b _080CEFDE b _080CEFDE
.align 2, 0 .align 2, 0
_080CEF04: .4byte gUnknown_2023E82 _080CEF04: .4byte gBattleCommunication
_080CEF08: .4byte 0x0006001c _080CEF08: .4byte 0x0006001c
_080CEF0C: .4byte 0x00007fff _080CEF0C: .4byte 0x00007fff
_080CEF10: _080CEF10:
@@ -2299,7 +2299,7 @@ _080CF176:
adds r0, 0x1 adds r0, 0x1
movs r2, 0 movs r2, 0
strh r0, [r1, 0x14] strh r0, [r1, 0x14]
ldr r0, _080CF1B8 @ =gUnknown_2023E82 ldr r0, _080CF1B8 @ =gBattleCommunication
strb r2, [r0, 0x1] strb r2, [r0, 0x1]
bl sub_802DCB8 bl sub_802DCB8
b _080CF528 b _080CF528
@@ -2308,7 +2308,7 @@ _080CF1A8: .4byte gUnknown_83FDF3C
_080CF1AC: .4byte gDisplayedStringBattle _080CF1AC: .4byte gDisplayedStringBattle
_080CF1B0: .4byte gTasks _080CF1B0: .4byte gTasks
_080CF1B4: .4byte gUnknown_83FE791 _080CF1B4: .4byte gUnknown_83FE791
_080CF1B8: .4byte gUnknown_2023E82 _080CF1B8: .4byte gBattleCommunication
_080CF1BC: _080CF1BC:
ldr r0, _080CF244 @ =gMain ldr r0, _080CF244 @ =gMain
ldrh r1, [r0, 0x2E] ldrh r1, [r0, 0x2E]
@@ -2316,7 +2316,7 @@ _080CF1BC:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _080CF1E2 beq _080CF1E2
ldr r4, _080CF248 @ =gUnknown_2023E82 ldr r4, _080CF248 @ =gBattleCommunication
ldrb r0, [r4, 0x1] ldrb r0, [r4, 0x1]
cmp r0, 0 cmp r0, 0
beq _080CF1E2 beq _080CF1E2
@@ -2333,7 +2333,7 @@ _080CF1E2:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _080CF208 beq _080CF208
ldr r4, _080CF248 @ =gUnknown_2023E82 ldr r4, _080CF248 @ =gBattleCommunication
ldrb r0, [r4, 0x1] ldrb r0, [r4, 0x1]
cmp r0, 0 cmp r0, 0
bne _080CF208 bne _080CF208
@@ -2359,7 +2359,7 @@ _080CF208:
bl sub_802DB7C bl sub_802DB7C
movs r0, 0x5 movs r0, 0x5
bl PlaySE bl PlaySE
ldr r0, _080CF248 @ =gUnknown_2023E82 ldr r0, _080CF248 @ =gBattleCommunication
ldrb r2, [r0, 0x1] ldrb r2, [r0, 0x1]
cmp r2, 0 cmp r2, 0
beq _080CF250 beq _080CF250
@@ -2373,7 +2373,7 @@ _080CF208:
b _080CF276 b _080CF276
.align 2, 0 .align 2, 0
_080CF244: .4byte gMain _080CF244: .4byte gMain
_080CF248: .4byte gUnknown_2023E82 _080CF248: .4byte gBattleCommunication
_080CF24C: .4byte gTasks _080CF24C: .4byte gTasks
_080CF250: _080CF250:
ldr r0, _080CF2AC @ =gTasks ldr r0, _080CF2AC @ =gTasks
@@ -2751,7 +2751,7 @@ sub_80CF53C: @ 80CF53C
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
movs r2, 0x1 movs r2, 0x1
strh r2, [r4, 0x1A] strh r2, [r4, 0x1A]
ldr r0, _080CF5C4 @ =gUnknown_2023E82 ldr r0, _080CF5C4 @ =gBattleCommunication
ldrb r1, [r0, 0x2] ldrb r1, [r0, 0x2]
lsls r0, r1, 2 lsls r0, r1, 2
adds r0, r1 adds r0, r1
@@ -2784,7 +2784,7 @@ _080CF5B2:
.align 2, 0 .align 2, 0
_080CF5BC: .4byte gTasks _080CF5BC: .4byte gTasks
_080CF5C0: .4byte gPlayerParty _080CF5C0: .4byte gPlayerParty
_080CF5C4: .4byte gUnknown_2023E82 _080CF5C4: .4byte gBattleCommunication
_080CF5C8: .4byte _080CF5CC _080CF5C8: .4byte _080CF5CC
.align 2, 0 .align 2, 0
_080CF5CC: _080CF5CC:
@@ -2911,7 +2911,7 @@ _080CF6E0:
adds r5, 0x10 adds r5, 0x10
adds r0, r5, 0 adds r0, r5, 0
bl LaunchTask_PreEvoSparklesSet1 bl LaunchTask_PreEvoSparklesSet1
ldr r1, _080CF730 @ =gUnknown_2023E82 ldr r1, _080CF730 @ =gBattleCommunication
strb r0, [r1, 0x2] strb r0, [r1, 0x2]
ldr r0, _080CF734 @ =gTasks ldr r0, _080CF734 @ =gTasks
adds r1, r7, r6 adds r1, r7, r6
@@ -2928,11 +2928,11 @@ _080CF6E0:
_080CF724: .4byte gPaletteFade _080CF724: .4byte gPaletteFade
_080CF728: .4byte gSprites _080CF728: .4byte gSprites
_080CF72C: .4byte gUnknown_2039A20 _080CF72C: .4byte gUnknown_2039A20
_080CF730: .4byte gUnknown_2023E82 _080CF730: .4byte gBattleCommunication
_080CF734: .4byte gTasks _080CF734: .4byte gTasks
_080CF738: .4byte 0x00000603 _080CF738: .4byte 0x00000603
_080CF73C: _080CF73C:
ldr r4, _080CF770 @ =gUnknown_2023E82 ldr r4, _080CF770 @ =gBattleCommunication
ldrb r0, [r4, 0x2] ldrb r0, [r4, 0x2]
lsls r1, r0, 2 lsls r1, r0, 2
adds r1, r0 adds r1, r0
@@ -2957,10 +2957,10 @@ _080CF752:
strb r0, [r4, 0x2] strb r0, [r4, 0x2]
bl _080D003A bl _080D003A
.align 2, 0 .align 2, 0
_080CF770: .4byte gUnknown_2023E82 _080CF770: .4byte gBattleCommunication
_080CF774: .4byte gUnknown_2039A20 _080CF774: .4byte gUnknown_2039A20
_080CF778: _080CF778:
ldr r4, _080CF7A4 @ =gUnknown_2023E82 ldr r4, _080CF7A4 @ =gBattleCommunication
ldrb r0, [r4, 0x2] ldrb r0, [r4, 0x2]
lsls r1, r0, 2 lsls r1, r0, 2
adds r1, r0 adds r1, r0
@@ -2982,7 +2982,7 @@ _080CF78E:
adds r1, r5 adds r1, r5
b _080CFB1A b _080CFB1A
.align 2, 0 .align 2, 0
_080CF7A4: .4byte gUnknown_2023E82 _080CF7A4: .4byte gBattleCommunication
_080CF7A8: .4byte gUnknown_2039A20 _080CF7A8: .4byte gUnknown_2039A20
_080CF7AC: _080CF7AC:
ldr r2, _080CF7E4 @ =gUnknown_2039A20 ldr r2, _080CF7E4 @ =gUnknown_2039A20
@@ -2998,7 +2998,7 @@ _080CF7C0:
ldr r1, [r2] ldr r1, [r2]
movs r0, 0x3 movs r0, 0x3
strb r0, [r1, 0x3] strb r0, [r1, 0x3]
ldr r0, _080CF7E8 @ =gUnknown_2023E82 ldr r0, _080CF7E8 @ =gBattleCommunication
ldrb r1, [r0, 0x2] ldrb r1, [r0, 0x2]
lsls r0, r1, 2 lsls r0, r1, 2
adds r0, r1 adds r0, r1
@@ -3015,10 +3015,10 @@ _080CF7DC:
b _080CFB1A b _080CFB1A
.align 2, 0 .align 2, 0
_080CF7E4: .4byte gUnknown_2039A20 _080CF7E4: .4byte gUnknown_2039A20
_080CF7E8: .4byte gUnknown_2023E82 _080CF7E8: .4byte gBattleCommunication
_080CF7EC: _080CF7EC:
bl sub_80F5F74 bl sub_80F5F74
ldr r1, _080CF800 @ =gUnknown_2023E82 ldr r1, _080CF800 @ =gBattleCommunication
strb r0, [r1, 0x2] strb r0, [r1, 0x2]
ldr r0, _080CF804 @ =gTasks ldr r0, _080CF804 @ =gTasks
adds r1, r7, r6 adds r1, r7, r6
@@ -3026,10 +3026,10 @@ _080CF7EC:
adds r1, r0 adds r1, r0
b _080CFB1A b _080CFB1A
.align 2, 0 .align 2, 0
_080CF800: .4byte gUnknown_2023E82 _080CF800: .4byte gBattleCommunication
_080CF804: .4byte gTasks _080CF804: .4byte gTasks
_080CF808: _080CF808:
ldr r0, _080CF834 @ =gUnknown_2023E82 ldr r0, _080CF834 @ =gBattleCommunication
mov r8, r0 mov r8, r0
ldrb r0, [r0, 0x2] ldrb r0, [r0, 0x2]
lsls r1, r0, 2 lsls r1, r0, 2
@@ -3050,9 +3050,9 @@ _080CF820:
strb r0, [r1, 0x2] strb r0, [r1, 0x2]
b _080CFA90 b _080CFA90
.align 2, 0 .align 2, 0
_080CF834: .4byte gUnknown_2023E82 _080CF834: .4byte gBattleCommunication
_080CF838: _080CF838:
ldr r0, _080CF85C @ =gUnknown_2023E82 ldr r0, _080CF85C @ =gBattleCommunication
ldrb r1, [r0, 0x2] ldrb r1, [r0, 0x2]
lsls r0, r1, 2 lsls r0, r1, 2
adds r0, r1 adds r0, r1
@@ -3070,7 +3070,7 @@ _080CF84E:
adds r1, r5 adds r1, r5
b _080CFB1A b _080CFB1A
.align 2, 0 .align 2, 0
_080CF85C: .4byte gUnknown_2023E82 _080CF85C: .4byte gBattleCommunication
_080CF860: _080CF860:
bl IsSEPlaying bl IsSEPlaying
lsls r0, 24 lsls r0, 24
@@ -3261,7 +3261,7 @@ _080CFA08: .4byte gUnknown_2039A20
_080CFA0C: .4byte gTextFlags _080CFA0C: .4byte gTextFlags
_080CFA10: .4byte gUnknown_300537C _080CFA10: .4byte gUnknown_300537C
_080CFA14: _080CFA14:
ldr r0, _080CFA60 @ =gUnknown_2023E82 ldr r0, _080CFA60 @ =gBattleCommunication
ldrb r1, [r0, 0x2] ldrb r1, [r0, 0x2]
lsls r0, r1, 2 lsls r0, r1, 2
adds r0, r1 adds r0, r1
@@ -3299,7 +3299,7 @@ _080CFA28:
adds r1, r5 adds r1, r5
b _080CFB1A b _080CFB1A
.align 2, 0 .align 2, 0
_080CFA60: .4byte gUnknown_2023E82 _080CFA60: .4byte gBattleCommunication
_080CFA64: .4byte gSprites _080CFA64: .4byte gSprites
_080CFA68: .4byte gUnknown_2039A20 _080CFA68: .4byte gUnknown_2039A20
_080CFA6C: .4byte 0x0004001c _080CFA6C: .4byte 0x0004001c
@@ -3578,7 +3578,7 @@ _080CFCAE:
movs r2, 0 movs r2, 0
movs r3, 0x2 movs r3, 0x2
bl CreateYesNoMenu bl CreateYesNoMenu
ldr r3, _080CFCF8 @ =gUnknown_2023E82 ldr r3, _080CFCF8 @ =gBattleCommunication
strb r4, [r3, 0x1] strb r4, [r3, 0x1]
ldr r0, _080CFCF0 @ =gTasks ldr r0, _080CFCF0 @ =gTasks
adds r1, r7, r6 adds r1, r7, r6
@@ -3595,7 +3595,7 @@ _080CFCE8: .4byte gUnknown_83FDF3C
_080CFCEC: .4byte gDisplayedStringBattle _080CFCEC: .4byte gDisplayedStringBattle
_080CFCF0: .4byte gTasks _080CFCF0: .4byte gTasks
_080CFCF4: .4byte gUnknown_826D1CC _080CFCF4: .4byte gUnknown_826D1CC
_080CFCF8: .4byte gUnknown_2023E82 _080CFCF8: .4byte gBattleCommunication
_080CFCFC: _080CFCFC:
bl Menu_ProcessInputNoWrapClearOnChoose bl Menu_ProcessInputNoWrapClearOnChoose
lsls r0, 24 lsls r0, 24
@@ -3614,7 +3614,7 @@ _080CFD16:
beq _080CFD70 beq _080CFD70
b _080D003A b _080D003A
_080CFD1C: _080CFD1C:
ldr r0, _080CFD60 @ =gUnknown_2023E82 ldr r0, _080CFD60 @ =gBattleCommunication
strb r4, [r0, 0x1] strb r4, [r0, 0x1]
ldr r0, _080CFD64 @ =gUnknown_83FDF3C ldr r0, _080CFD64 @ =gUnknown_83FDF3C
movs r3, 0x92 movs r3, 0x92
@@ -3648,12 +3648,12 @@ _080CFD56:
bl BeginNormalPaletteFade bl BeginNormalPaletteFade
b _080D003A b _080D003A
.align 2, 0 .align 2, 0
_080CFD60: .4byte gUnknown_2023E82 _080CFD60: .4byte gBattleCommunication
_080CFD64: .4byte gUnknown_83FDF3C _080CFD64: .4byte gUnknown_83FDF3C
_080CFD68: .4byte gDisplayedStringBattle _080CFD68: .4byte gDisplayedStringBattle
_080CFD6C: .4byte gTasks _080CFD6C: .4byte gTasks
_080CFD70: _080CFD70:
ldr r1, _080CFD9C @ =gUnknown_2023E82 ldr r1, _080CFD9C @ =gBattleCommunication
movs r0, 0x1 movs r0, 0x1
strb r0, [r1, 0x1] strb r0, [r1, 0x1]
ldr r0, _080CFDA0 @ =gUnknown_83FDF3C ldr r0, _080CFDA0 @ =gUnknown_83FDF3C
@@ -3674,7 +3674,7 @@ _080CFD70:
strh r1, [r0, 0x14] strh r1, [r0, 0x14]
b _080D003A b _080D003A
.align 2, 0 .align 2, 0
_080CFD9C: .4byte gUnknown_2023E82 _080CFD9C: .4byte gBattleCommunication
_080CFDA0: .4byte gUnknown_83FDF3C _080CFDA0: .4byte gUnknown_83FDF3C
_080CFDA4: .4byte gDisplayedStringBattle _080CFDA4: .4byte gDisplayedStringBattle
_080CFDA8: .4byte gTasks _080CFDA8: .4byte gTasks
data/battle_scripts_1.s
+102 -102
View File
@@ -18,7 +18,7 @@ gUnknown_81D6BD1:: @ 81D6BD1
gUnknown_81D6C62:: @ 81D6C62 gUnknown_81D6C62:: @ 81D6C62
.incbin "baserom.gba", 0x1D6C62, 0x6E0 .incbin "baserom.gba", 0x1D6C62, 0x6E0
gUnknown_81D7342:: @ 81D7342 BattleScript_MoveUsedMustRecharge:: @ 81D7342
.incbin "baserom.gba", 0x1D7342, 0xA75 .incbin "baserom.gba", 0x1D7342, 0xA75
gUnknown_81D7DB7:: @ 81D7DB7 gUnknown_81D7DB7:: @ 81D7DB7
@@ -36,10 +36,10 @@ gUnknown_81D8674:: @ 81D8674
gUnknown_81D8684:: @ 81D8684 gUnknown_81D8684:: @ 81D8684
.incbin "baserom.gba", 0x1D8684, 0x10 .incbin "baserom.gba", 0x1D8684, 0x10
gUnknown_81D8694:: @ 81D8694 BattleScript_GiveExp:: @ 81D8694
.incbin "baserom.gba", 0x1D8694, 0x9 .incbin "baserom.gba", 0x1D8694, 0x9
gUnknown_81D869D:: @ 81D869D BattleScript_HandleFaintedMon:: @ 81D869D
.incbin "baserom.gba", 0x1D869D, 0x152 .incbin "baserom.gba", 0x1D869D, 0x152
gUnknown_81D87EF:: @ 81D87EF gUnknown_81D87EF:: @ 81D87EF
@@ -90,40 +90,40 @@ gUnknown_81D89F1:: @ 81D89F1
gUnknown_81D89F5:: @ 81D89F5 gUnknown_81D89F5:: @ 81D89F5
.incbin "baserom.gba", 0x1D89F5, 0x6F .incbin "baserom.gba", 0x1D89F5, 0x6F
gUnknown_81D8A64:: @ 81D8A64 BattleScript_RainContinuesOrEnds:: @ 81D8A64
.incbin "baserom.gba", 0x1D8A64, 0x1B .incbin "baserom.gba", 0x1D8A64, 0x1B
gUnknown_81D8A7F:: @ 81D8A7F BattleScript_DamagingWeatherContinues:: @ 81D8A7F
.incbin "baserom.gba", 0x1D8A7F, 0x82 .incbin "baserom.gba", 0x1D8A7F, 0x82
gUnknown_81D8B01:: @ 81D8B01 BattleScript_SandStormHailEnds:: @ 81D8B01
.incbin "baserom.gba", 0x1D8B01, 0x9 .incbin "baserom.gba", 0x1D8B01, 0x9
gUnknown_81D8B0A:: @ 81D8B0A BattleScript_SunlightContinues:: @ 81D8B0A
.incbin "baserom.gba", 0x1D8B0A, 0xE .incbin "baserom.gba", 0x1D8B0A, 0xE
gUnknown_81D8B18:: @ 81D8B18 BattleScript_SunlightFaded:: @ 81D8B18
.incbin "baserom.gba", 0x1D8B18, 0x7 .incbin "baserom.gba", 0x1D8B18, 0x7
gUnknown_81D8B1F:: @ 81D8B1F BattleScript_OverworldWeatherStarts:: @ 81D8B1F
.incbin "baserom.gba", 0x1D8B1F, 0x13 .incbin "baserom.gba", 0x1D8B1F, 0x13
gUnknown_81D8B32:: @ 81D8B32 BattleScript_SideStatusWoreOff:: @ 81D8B32
.incbin "baserom.gba", 0x1D8B32, 0x11 .incbin "baserom.gba", 0x1D8B32, 0x11
gUnknown_81D8B43:: @ 81D8B43 BattleScript_SafeguardEnds:: @ 81D8B43
.incbin "baserom.gba", 0x1D8B43, 0xA .incbin "baserom.gba", 0x1D8B43, 0xA
gUnknown_81D8B4D:: @ 81D8B4D BattleScript_LeechSeedTurnDrain:: @ 81D8B4D
.incbin "baserom.gba", 0x1D8B4D, 0x5C .incbin "baserom.gba", 0x1D8B4D, 0x5C
gUnknown_81D8BA9:: @ 81D8BA9 BattleScript_BideStoringEnergy:: @ 81D8BA9
.incbin "baserom.gba", 0x1D8BA9, 0xB .incbin "baserom.gba", 0x1D8BA9, 0xB
gUnknown_81D8BB4:: @ 81D8BB4 BattleScript_BideAttack:: @ 81D8BB4
.incbin "baserom.gba", 0x1D8BB4, 0x48 .incbin "baserom.gba", 0x1D8BB4, 0x48
gUnknown_81D8BFC:: @ 81D8BFC BattleScript_BideNoEnergyToAttack:: @ 81D8BFC
.incbin "baserom.gba", 0x1D8BFC, 0x14 .incbin "baserom.gba", 0x1D8BFC, 0x14
gUnknown_81D8C10:: @ 81D8C10 gUnknown_81D8C10:: @ 81D8C10
@@ -135,16 +135,16 @@ gUnknown_81D8C3E:: @ 81D8C3E
gUnknown_81D8C48:: @ 81D8C48 gUnknown_81D8C48:: @ 81D8C48
.incbin "baserom.gba", 0x1D8C48, 0x7 .incbin "baserom.gba", 0x1D8C48, 0x7
gUnknown_81D8C4F:: @ 81D8C4F BattleScript_MoveUsedIsDisabled:: @ 81D8C4F
.incbin "baserom.gba", 0x1D8C4F, 0xB .incbin "baserom.gba", 0x1D8C4F, 0xB
gUnknown_81D8C5A:: @ 81D8C5A BattleScript_SelectingDisabledMove:: @ 81D8C5A
.incbin "baserom.gba", 0x1D8C5A, 0x4 .incbin "baserom.gba", 0x1D8C5A, 0x4
gUnknown_81D8C5E:: @ 81D8C5E BattleScript_DisabledNoMore:: @ 81D8C5E
.incbin "baserom.gba", 0x1D8C5E, 0x7 .incbin "baserom.gba", 0x1D8C5E, 0x7
gUnknown_81D8C65:: @ 81D8C65 BattleScript_EncoredNoMore:: @ 81D8C65
.incbin "baserom.gba", 0x1D8C65, 0x7 .incbin "baserom.gba", 0x1D8C65, 0x7
gUnknown_81D8C6C:: @ 81D8C6C gUnknown_81D8C6C:: @ 81D8C6C
@@ -159,10 +159,10 @@ gUnknown_81D8CBE:: @ 81D8CBE
gUnknown_81D8CF5:: @ 81D8CF5 gUnknown_81D8CF5:: @ 81D8CF5
.incbin "baserom.gba", 0x1D8CF5, 0x3E .incbin "baserom.gba", 0x1D8CF5, 0x3E
gUnknown_81D8D33:: @ 81D8D33 BattleScript_PerishSongTakesLife:: @ 81D8D33
.incbin "baserom.gba", 0x1D8D33, 0x1B .incbin "baserom.gba", 0x1D8D33, 0x1B
gUnknown_81D8D4E:: @ 81D8D4E BattleScript_PerishSongCountGoesDown:: @ 81D8D4E
.incbin "baserom.gba", 0x1D8D4E, 0x7 .incbin "baserom.gba", 0x1D8D4E, 0x7
gUnknown_81D8D55:: @ 81D8D55 gUnknown_81D8D55:: @ 81D8D55
@@ -180,31 +180,31 @@ gUnknown_81D8E04:: @ 81D8E04
gUnknown_81D8E0B:: @ 81D8E0B gUnknown_81D8E0B:: @ 81D8E0B
.incbin "baserom.gba", 0x1D8E0B, 0x7 .incbin "baserom.gba", 0x1D8E0B, 0x7
gUnknown_81D8E12:: @ 81D8E12 BattleScript_MonTookFutureAttack:: @ 81D8E12
.incbin "baserom.gba", 0x1D8E12, 0x8E .incbin "baserom.gba", 0x1D8E12, 0x8E
gUnknown_81D8EA0:: @ 81D8EA0 gUnknown_81D8EA0:: @ 81D8EA0
.incbin "baserom.gba", 0x1D8EA0, 0x4 .incbin "baserom.gba", 0x1D8EA0, 0x4
gUnknown_81D8EA4:: @ 81D8EA4 BattleScript_SelectingMoveWithNoPP:: @ 81D8EA4
.incbin "baserom.gba", 0x1D8EA4, 0x4 .incbin "baserom.gba", 0x1D8EA4, 0x4
gUnknown_81D8EA8:: @ 81D8EA8 gUnknown_81D8EA8:: @ 81D8EA8
.incbin "baserom.gba", 0x1D8EA8, 0xF .incbin "baserom.gba", 0x1D8EA8, 0xF
gUnknown_81D8EB7:: @ 81D8EB7 BattleScript_SelectingTormentedMove:: @ 81D8EB7
.incbin "baserom.gba", 0x1D8EB7, 0xF .incbin "baserom.gba", 0x1D8EB7, 0xF
gUnknown_81D8EC6:: @ 81D8EC6 BattleScript_SelectingNotAllowedMoveTaunt:: @ 81D8EC6
.incbin "baserom.gba", 0x1D8EC6, 0x4 .incbin "baserom.gba", 0x1D8EC6, 0x4
gUnknown_81D8ECA:: @ 81D8ECA BattleScript_MoveUsedIsTaunted:: @ 81D8ECA
.incbin "baserom.gba", 0x1D8ECA, 0xB .incbin "baserom.gba", 0x1D8ECA, 0xB
gUnknown_81D8ED5:: @ 81D8ED5 BattleScript_WishComesTrue:: @ 81D8ED5
.incbin "baserom.gba", 0x1D8ED5, 0x37 .incbin "baserom.gba", 0x1D8ED5, 0x37
gUnknown_81D8F0C:: @ 81D8F0C BattleScript_IngrainTurnHeal:: @ 81D8F0C
.incbin "baserom.gba", 0x1D8F0C, 0x29 .incbin "baserom.gba", 0x1D8F0C, 0x29
gUnknown_81D8F35:: @ 81D8F35 gUnknown_81D8F35:: @ 81D8F35
@@ -213,10 +213,10 @@ gUnknown_81D8F35:: @ 81D8F35
gUnknown_81D8F86:: @ 81D8F86 gUnknown_81D8F86:: @ 81D8F86
.incbin "baserom.gba", 0x1D8F86, 0xE .incbin "baserom.gba", 0x1D8F86, 0xE
gUnknown_81D8F94:: @ 81D8F94 BattleScript_MoveUsedIsImprisoned:: @ 81D8F94
.incbin "baserom.gba", 0x1D8F94, 0xB .incbin "baserom.gba", 0x1D8F94, 0xB
gUnknown_81D8F9F:: @ 81D8F9F BattleScript_SelectingImprisonedMove:: @ 81D8F9F
.incbin "baserom.gba", 0x1D8F9F, 0x4 .incbin "baserom.gba", 0x1D8F9F, 0x4
gUnknown_81D8FA3:: @ 81D8FA3 gUnknown_81D8FA3:: @ 81D8FA3
@@ -240,67 +240,67 @@ gUnknown_81D8FEB:: @ 81D8FEB
gUnknown_81D9015:: @ 81D9015 gUnknown_81D9015:: @ 81D9015
.incbin "baserom.gba", 0x1D9015, 0x14 .incbin "baserom.gba", 0x1D9015, 0x14
gUnknown_81D9029:: @ 81D9029 BattleScript_MoveUsedIsAsleep:: @ 81D9029
.incbin "baserom.gba", 0x1D9029, 0xD .incbin "baserom.gba", 0x1D9029, 0xD
gUnknown_81D9036:: @ 81D9036 BattleScript_MoveUsedWokeUp:: @ 81D9036
.incbin "baserom.gba", 0x1D9036, 0x14 .incbin "baserom.gba", 0x1D9036, 0x14
gUnknown_81D904A:: @ 81D904A BattleScript_MonWokeUpInUproar:: @ 81D904A
.incbin "baserom.gba", 0x1D904A, 0x9 .incbin "baserom.gba", 0x1D904A, 0x9
gUnknown_81D9053:: @ 81D9053 BattleScript_PoisonTurnDmg:: @ 81D9053
.incbin "baserom.gba", 0x1D9053, 0x22 .incbin "baserom.gba", 0x1D9053, 0x22
gUnknown_81D9075:: @ 81D9075 BattleScript_BurnTurnDmg:: @ 81D9075
.incbin "baserom.gba", 0x1D9075, 0xB .incbin "baserom.gba", 0x1D9075, 0xB
gUnknown_81D9080:: @ 81D9080 BattleScript_MoveUsedIsFrozen:: @ 81D9080
.incbin "baserom.gba", 0x1D9080, 0xD .incbin "baserom.gba", 0x1D9080, 0xD
gUnknown_81D908D:: @ 81D908D BattleScript_MoveUsedUnfroze:: @ 81D908D
.incbin "baserom.gba", 0x1D908D, 0xB .incbin "baserom.gba", 0x1D908D, 0xB
gUnknown_81D9098:: @ 81D9098 gUnknown_81D9098:: @ 81D9098
.incbin "baserom.gba", 0x1D9098, 0x9 .incbin "baserom.gba", 0x1D9098, 0x9
gUnknown_81D90A1:: @ 81D90A1 BattleScript_MoveUsedIsParalyzed:: @ 81D90A1
.incbin "baserom.gba", 0x1D90A1, 0x10 .incbin "baserom.gba", 0x1D90A1, 0x10
gUnknown_81D90B1:: @ 81D90B1 BattleScript_MoveUsedFlinched:: @ 81D90B1
.incbin "baserom.gba", 0x1D90B1, 0xB .incbin "baserom.gba", 0x1D90B1, 0xB
gUnknown_81D90BC:: @ 81D90BC BattleScript_PrintUproarOverTurns:: @ 81D90BC
.incbin "baserom.gba", 0x1D90BC, 0x9 .incbin "baserom.gba", 0x1D90BC, 0x9
gUnknown_81D90C5:: @ 81D90C5 BattleScript_ThrashConfuses:: @ 81D90C5
.incbin "baserom.gba", 0x1D90C5, 0xE .incbin "baserom.gba", 0x1D90C5, 0xE
gUnknown_81D90D3:: @ 81D90D3 BattleScript_MoveUsedIsConfused:: @ 81D90D3
.incbin "baserom.gba", 0x1D90D3, 0x43 .incbin "baserom.gba", 0x1D90D3, 0x43
gUnknown_81D9116:: @ 81D9116 BattleScript_MoveUsedIsConfusedNoMore:: @ 81D9116
.incbin "baserom.gba", 0x1D9116, 0x7 .incbin "baserom.gba", 0x1D9116, 0x7
gUnknown_81D911D:: @ 81D911D gUnknown_81D911D:: @ 81D911D
.incbin "baserom.gba", 0x1D911D, 0x7 .incbin "baserom.gba", 0x1D911D, 0x7
gUnknown_81D9124:: @ 81D9124 BattleScript_WrapTurnDmg:: @ 81D9124
.incbin "baserom.gba", 0x1D9124, 0x12 .incbin "baserom.gba", 0x1D9124, 0x12
gUnknown_81D9136:: @ 81D9136 BattleScript_WrapEnds:: @ 81D9136
.incbin "baserom.gba", 0x1D9136, 0x7 .incbin "baserom.gba", 0x1D9136, 0x7
gUnknown_81D913D:: @ 81D913D BattleScript_MoveUsedIsInLove:: @ 81D913D
.incbin "baserom.gba", 0x1D913D, 0xD .incbin "baserom.gba", 0x1D913D, 0xD
gUnknown_81D914A:: @ 81D914A BattleScript_MoveUsedIsInLoveCantAttack:: @ 81D914A
.incbin "baserom.gba", 0x1D914A, 0xB .incbin "baserom.gba", 0x1D914A, 0xB
gUnknown_81D9155:: @ 81D9155 BattleScript_NightmareTurnDmg:: @ 81D9155
.incbin "baserom.gba", 0x1D9155, 0x11 .incbin "baserom.gba", 0x1D9155, 0x11
gUnknown_81D9166:: @ 81D9166 BattleScript_CurseTurnDmg:: @ 81D9166
.incbin "baserom.gba", 0x1D9166, 0x11 .incbin "baserom.gba", 0x1D9166, 0x11
gUnknown_81D9177:: @ 81D9177 gUnknown_81D9177:: @ 81D9177
@@ -315,40 +315,40 @@ gUnknown_81D9192:: @ 81D9192
gUnknown_81D91A1:: @ 81D91A1 gUnknown_81D91A1:: @ 81D91A1
.incbin "baserom.gba", 0x1D91A1, 0x26 .incbin "baserom.gba", 0x1D91A1, 0x26
gUnknown_81D91C7:: @ 81D91C7 BattleScript_YawnMakesAsleep:: @ 81D91C7
.incbin "baserom.gba", 0x1D91C7, 0xAA .incbin "baserom.gba", 0x1D91C7, 0xAA
gUnknown_81D9271:: @ 81D9271 gUnknown_81D9271:: @ 81D9271
.incbin "baserom.gba", 0x1D9271, 0xE .incbin "baserom.gba", 0x1D9271, 0xE
gUnknown_81D927F:: @ 81D927F BattleScript_DrizzleActivates:: @ 81D927F
.incbin "baserom.gba", 0x1D927F, 0x14 .incbin "baserom.gba", 0x1D927F, 0x14
gUnknown_81D9293:: @ 81D9293 BattleScript_SpeedBoostActivates:: @ 81D9293
.incbin "baserom.gba", 0x1D9293, 0xE .incbin "baserom.gba", 0x1D9293, 0xE
gUnknown_81D92A1:: @ 81D92A1 BattleScript_TraceActivates:: @ 81D92A1
.incbin "baserom.gba", 0x1D92A1, 0xA .incbin "baserom.gba", 0x1D92A1, 0xA
gUnknown_81D92AB:: @ 81D92AB BattleScript_RainDishActivates:: @ 81D92AB
.incbin "baserom.gba", 0x1D92AB, 0x14 .incbin "baserom.gba", 0x1D92AB, 0x14
gUnknown_81D92BF:: @ 81D92BF BattleScript_SandstreamActivates:: @ 81D92BF
.incbin "baserom.gba", 0x1D92BF, 0x14 .incbin "baserom.gba", 0x1D92BF, 0x14
gUnknown_81D92D3:: @ 81D92D3 BattleScript_ShedSkinActivates:: @ 81D92D3
.incbin "baserom.gba", 0x1D92D3, 0x25 .incbin "baserom.gba", 0x1D92D3, 0x25
gUnknown_81D92F8:: @ 81D92F8 BattleScript_CastformChange:: @ 81D92F8
.incbin "baserom.gba", 0x1D92F8, 0xF .incbin "baserom.gba", 0x1D92F8, 0xF
gUnknown_81D9307:: @ 81D9307 BattleScript_IntimidateActivatesEnd3:: @ 81D9307
.incbin "baserom.gba", 0x1D9307, 0x9 .incbin "baserom.gba", 0x1D9307, 0x9
gUnknown_81D9310:: @ 81D9310 BattleScript_IntimidateActivates:: @ 81D9310
.incbin "baserom.gba", 0x1D9310, 0x69 .incbin "baserom.gba", 0x1D9310, 0x69
gUnknown_81D9379:: @ 81D9379 BattleScript_DroughtActivates:: @ 81D9379
.incbin "baserom.gba", 0x1D9379, 0x14 .incbin "baserom.gba", 0x1D9379, 0x14
gUnknown_81D938D:: @ 81D938D gUnknown_81D938D:: @ 81D938D
@@ -360,22 +360,22 @@ gUnknown_81D93A1:: @ 81D93A1
gUnknown_81D93AF:: @ 81D93AF gUnknown_81D93AF:: @ 81D93AF
.incbin "baserom.gba", 0x1D93AF, 0xE .incbin "baserom.gba", 0x1D93AF, 0xE
gUnknown_81D93BD:: @ 81D93BD BattleScript_MoveHPDrain_PPLoss:: @ 81D93BD
.incbin "baserom.gba", 0x1D93BD, 0x1 .incbin "baserom.gba", 0x1D93BD, 0x1
gUnknown_81D93BE:: @ 81D93BE BattleScript_MoveHPDrain:: @ 81D93BE
.incbin "baserom.gba", 0x1D93BE, 0x22 .incbin "baserom.gba", 0x1D93BE, 0x22
gUnknown_81D93E0:: @ 81D93E0 BattleScript_MonMadeMoveUseless_PPLoss:: @ 81D93E0
.incbin "baserom.gba", 0x1D93E0, 0x1 .incbin "baserom.gba", 0x1D93E0, 0x1
gUnknown_81D93E1:: @ 81D93E1 BattleScript_MonMadeMoveUseless:: @ 81D93E1
.incbin "baserom.gba", 0x1D93E1, 0x15 .incbin "baserom.gba", 0x1D93E1, 0x15
gUnknown_81D93F6:: @ 81D93F6 BattleScript_FlashFireBoost_PPLoss:: @ 81D93F6
.incbin "baserom.gba", 0x1D93F6, 0x1 .incbin "baserom.gba", 0x1D93F6, 0x1
gUnknown_81D93F7:: @ 81D93F7 BattleScript_FlashFireBoost:: @ 81D93F7
.incbin "baserom.gba", 0x1D93F7, 0x1F .incbin "baserom.gba", 0x1D93F7, 0x1F
gUnknown_81D9416:: @ 81D9416 gUnknown_81D9416:: @ 81D9416
@@ -396,7 +396,7 @@ gUnknown_81D9444:: @ 81D9444
gUnknown_81D9452:: @ 81D9452 gUnknown_81D9452:: @ 81D9452
.incbin "baserom.gba", 0x1D9452, 0x1C .incbin "baserom.gba", 0x1D9452, 0x1C
gUnknown_81D946E:: @ 81D946E BattleScript_SoundproofProtected:: @ 81D946E
.incbin "baserom.gba", 0x1D946E, 0x10 .incbin "baserom.gba", 0x1D946E, 0x10
gUnknown_81D947E:: @ 81D947E gUnknown_81D947E:: @ 81D947E
@@ -405,115 +405,115 @@ gUnknown_81D947E:: @ 81D947E
gUnknown_81D948E:: @ 81D948E gUnknown_81D948E:: @ 81D948E
.incbin "baserom.gba", 0x1D948E, 0xE .incbin "baserom.gba", 0x1D948E, 0xE
gUnknown_81D949C:: @ 81D949C BattleScript_ColorChangeActivates:: @ 81D949C
.incbin "baserom.gba", 0x1D949C, 0x7 .incbin "baserom.gba", 0x1D949C, 0x7
gUnknown_81D94A3:: @ 81D94A3 BattleScript_RoughSkinActivates:: @ 81D94A3
.incbin "baserom.gba", 0x1D94A3, 0x1B .incbin "baserom.gba", 0x1D94A3, 0x1B
gUnknown_81D94BE:: @ 81D94BE BattleScript_CuteCharmActivates:: @ 81D94BE
.incbin "baserom.gba", 0x1D94BE, 0xD .incbin "baserom.gba", 0x1D94BE, 0xD
gUnknown_81D94CB:: @ 81D94CB BattleScript_ApplySecondaryEffect:: @ 81D94CB
.incbin "baserom.gba", 0x1D94CB, 0x3 .incbin "baserom.gba", 0x1D94CB, 0x3
gUnknown_81D94CE:: @ 81D94CE BattleScript_SynchronizeActivates:: @ 81D94CE
.incbin "baserom.gba", 0x1D94CE, 0x3 .incbin "baserom.gba", 0x1D94CE, 0x3
gUnknown_81D94D1:: @ 81D94D1 BattleScript_AbilityCuredStatus:: @ 81D94D1
.incbin "baserom.gba", 0x1D94D1, 0x9 .incbin "baserom.gba", 0x1D94D1, 0x9
gUnknown_81D94DA:: @ 81D94DA BattleScript_IgnoresWhileAsleep:: @ 81D94DA
.incbin "baserom.gba", 0x1D94DA, 0x10 .incbin "baserom.gba", 0x1D94DA, 0x10
gUnknown_81D94EA:: @ 81D94EA BattleScript_IgnoresAndUsesRandomMove:: @ 81D94EA
.incbin "baserom.gba", 0x1D94EA, 0x8 .incbin "baserom.gba", 0x1D94EA, 0x8
gUnknown_81D94F2:: @ 81D94F2 BattleScript_MoveUsedLoafingAround:: @ 81D94F2
.incbin "baserom.gba", 0x1D94F2, 0x12 .incbin "baserom.gba", 0x1D94F2, 0x12
gUnknown_81D9504:: @ 81D9504 BattleScript_IgnoresAndFallsAsleep:: @ 81D9504
.incbin "baserom.gba", 0x1D9504, 0x17 .incbin "baserom.gba", 0x1D9504, 0x17
gUnknown_81D951B:: @ 81D951B BattleScript_IgnoresAndHitsItself:: @ 81D951B
.incbin "baserom.gba", 0x1D951B, 0xB .incbin "baserom.gba", 0x1D951B, 0xB
gUnknown_81D9526:: @ 81D9526 gUnknown_81D9526:: @ 81D9526
.incbin "baserom.gba", 0x1D9526, 0xB .incbin "baserom.gba", 0x1D9526, 0xB
gUnknown_81D9531:: @ 81D9531 BattleScript_BerryCurePrlzEnd2:: @ 81D9531
.incbin "baserom.gba", 0x1D9531, 0x6 .incbin "baserom.gba", 0x1D9531, 0x6
gUnknown_81D9537:: @ 81D9537 BattleScript_BerryCureParRet:: @ 81D9537
.incbin "baserom.gba", 0x1D9537, 0x12 .incbin "baserom.gba", 0x1D9537, 0x12
gUnknown_81D9549:: @ 81D9549 BattleScript_BerryCurePsnEnd2:: @ 81D9549
.incbin "baserom.gba", 0x1D9549, 0x6 .incbin "baserom.gba", 0x1D9549, 0x6
gUnknown_81D954F:: @ 81D954F BattleScript_BerryCurePsnRet:: @ 81D954F
.incbin "baserom.gba", 0x1D954F, 0x12 .incbin "baserom.gba", 0x1D954F, 0x12
gUnknown_81D9561:: @ 81D9561 BattleScript_BerryCureBrnEnd2:: @ 81D9561
.incbin "baserom.gba", 0x1D9561, 0x6 .incbin "baserom.gba", 0x1D9561, 0x6
gUnknown_81D9567:: @ 81D9567 BattleScript_BerryCureBrnRet:: @ 81D9567
.incbin "baserom.gba", 0x1D9567, 0x12 .incbin "baserom.gba", 0x1D9567, 0x12
gUnknown_81D9579:: @ 81D9579 BattleScript_BerryCureFrzEnd2:: @ 81D9579
.incbin "baserom.gba", 0x1D9579, 0x6 .incbin "baserom.gba", 0x1D9579, 0x6
gUnknown_81D957F:: @ 81D957F BattleScript_BerryCureFrzRet:: @ 81D957F
.incbin "baserom.gba", 0x1D957F, 0x12 .incbin "baserom.gba", 0x1D957F, 0x12
gUnknown_81D9591:: @ 81D9591 BattleScript_BerryCureSlpEnd2:: @ 81D9591
.incbin "baserom.gba", 0x1D9591, 0x6 .incbin "baserom.gba", 0x1D9591, 0x6
gUnknown_81D9597:: @ 81D9597 BattleScript_BerryCureSlpRet:: @ 81D9597
.incbin "baserom.gba", 0x1D9597, 0x12 .incbin "baserom.gba", 0x1D9597, 0x12
gUnknown_81D95A9:: @ 81D95A9 BattleScript_BerryCureConfusionEnd2:: @ 81D95A9
.incbin "baserom.gba", 0x1D95A9, 0x6 .incbin "baserom.gba", 0x1D95A9, 0x6
gUnknown_81D95AF:: @ 81D95AF BattleScript_BerryCureConfusionRet:: @ 81D95AF
.incbin "baserom.gba", 0x1D95AF, 0x10 .incbin "baserom.gba", 0x1D95AF, 0x10
gUnknown_81D95BF:: @ 81D95BF BattleScript_BerryCureChosenStatusEnd2:: @ 81D95BF
.incbin "baserom.gba", 0x1D95BF, 0x6 .incbin "baserom.gba", 0x1D95BF, 0x6
gUnknown_81D95C5:: @ 81D95C5 BattleScript_BerryCureChosenStatusRet:: @ 81D95C5
.incbin "baserom.gba", 0x1D95C5, 0x14 .incbin "baserom.gba", 0x1D95C5, 0x14
gUnknown_81D95D9:: @ 81D95D9 BattleScript_WhiteHerbEnd2:: @ 81D95D9
.incbin "baserom.gba", 0x1D95D9, 0x6 .incbin "baserom.gba", 0x1D95D9, 0x6
gUnknown_81D95DF:: @ 81D95DF BattleScript_WhiteHerbRet:: @ 81D95DF
.incbin "baserom.gba", 0x1D95DF, 0x10 .incbin "baserom.gba", 0x1D95DF, 0x10
gUnknown_81D95EF:: @ 81D95EF BattleScript_ItemHealHP_RemoveItem:: @ 81D95EF
.incbin "baserom.gba", 0x1D95EF, 0x1D .incbin "baserom.gba", 0x1D95EF, 0x1D
gUnknown_81D960C:: @ 81D960C BattleScript_BerryPPHealEnd2:: @ 81D960C
.incbin "baserom.gba", 0x1D960C, 0x10 .incbin "baserom.gba", 0x1D960C, 0x10
gUnknown_81D961C:: @ 81D961C BattleScript_ItemHealHP_End2:: @ 81D961C
.incbin "baserom.gba", 0x1D961C, 0x6 .incbin "baserom.gba", 0x1D961C, 0x6
gUnknown_81D9622:: @ 81D9622 BattleScript_ItemHealHP_Ret:: @ 81D9622
.incbin "baserom.gba", 0x1D9622, 0x1B .incbin "baserom.gba", 0x1D9622, 0x1B
gUnknown_81D963D:: @ 81D963D BattleScript_SelectingNotAllowedMoveChoiceItem:: @ 81D963D
.incbin "baserom.gba", 0x1D963D, 0x4 .incbin "baserom.gba", 0x1D963D, 0x4
gUnknown_81D9641:: @ 81D9641 gUnknown_81D9641:: @ 81D9641
.incbin "baserom.gba", 0x1D9641, 0xE .incbin "baserom.gba", 0x1D9641, 0xE
gUnknown_81D964F:: @ 81D964F BattleScript_BerryConfuseHealEnd2:: @ 81D964F
.incbin "baserom.gba", 0x1D964F, 0x2A .incbin "baserom.gba", 0x1D964F, 0x2A
gUnknown_81D9679:: @ 81D9679 BattleScript_BerryStatRaiseEnd2:: @ 81D9679
.incbin "baserom.gba", 0x1D9679, 0x1B .incbin "baserom.gba", 0x1D9679, 0x1B
gUnknown_81D9694:: @ 81D9694 BattleScript_BerryFocusEnergyEnd2:: @ 81D9694
.incbin "baserom.gba", 0x1D9694, 0x10 .incbin "baserom.gba", 0x1D9694, 0x10
gUnknown_81D96A4:: @ 81D96A4 gUnknown_81D96A4:: @ 81D96A4
data/data.s
+1 -1
View File
@@ -278,7 +278,7 @@ gUnknown_82500C4:: @ 82500C4
gUnknown_82500CC:: @ 82500CC gUnknown_82500CC:: @ 82500CC
.incbin "baserom.gba", 0x2500CC, 0x38 .incbin "baserom.gba", 0x2500CC, 0x38
gUnknown_8250104:: @ 8250104 sSoundMovesTable:: @ 8250104
.incbin "baserom.gba", 0x250104, 0x18 .incbin "baserom.gba", 0x250104, 0x18
gUnknown_825011C:: @ 825011C gUnknown_825011C:: @ 825011C
include/battle_util.h
+5 -5
View File
@@ -54,8 +54,8 @@ u8 GetBattleBank(u8 caseId);
void PressurePPLose(u8 bankDef, u8 bankAtk, u16 move); void PressurePPLose(u8 bankDef, u8 bankAtk, u16 move);
void PressurePPLoseOnUsingPerishSong(u8 bankAtk); void PressurePPLoseOnUsingPerishSong(u8 bankAtk);
void PressurePPLoseOnUsingImprision(u8 bankAtk); void PressurePPLoseOnUsingImprision(u8 bankAtk);
void MarkAllBufferBanksForExecution(void); // unused void MarkAllBattlersForControllerExec(void); // unused
void MarkBufferBankForExecution(u8 bank); void MarkBattlerForControllerExec(u8 bank);
void sub_803F850(u8 arg0); void sub_803F850(u8 arg0);
void CancelMultiTurnMoves(u8 bank); void CancelMultiTurnMoves(u8 bank);
bool8 WasUnableToUseMove(u8 bank); bool8 WasUnableToUseMove(u8 bank);
@@ -70,8 +70,8 @@ u8 TrySetCantSelectMoveBattleScript(void);
u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check); u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check);
bool8 AreAllMovesUnusable(void); bool8 AreAllMovesUnusable(void);
u8 GetImprisonedMovesCount(u8 bank, u16 move); u8 GetImprisonedMovesCount(u8 bank, u16 move);
u8 UpdateTurnCounters(void); u8 DoFieldEndTurnEffects(void);
u8 TurnBasedEffects(void); u8 DoBattlerEndTurnEffects(void);
bool8 HandleWishPerishSongOnTurnEnd(void); bool8 HandleWishPerishSongOnTurnEnd(void);
bool8 HandleFaintedMonActions(void); bool8 HandleFaintedMonActions(void);
void TryClearRageStatuses(void); void TryClearRageStatuses(void);
@@ -86,7 +86,7 @@ void ClearFuryCutterDestinyBondGrudge(u8 bank);
void HandleAction_RunBattleScript(void); void HandleAction_RunBattleScript(void);
u8 GetMoveTarget(u16 move, u8 useMoveTarget); u8 GetMoveTarget(u16 move, u8 useMoveTarget);
u8 IsMonDisobedient(void); u8 IsMonDisobedient(void);
void MarkBufferBankForExecution(u8 battlerId); void MarkBattlerForControllerExec(u8 battlerId);
void sub_80174B8(u8 battlerId); void sub_80174B8(u8 battlerId);
void sub_8017298(u8 battlerId); void sub_8017298(u8 battlerId);
src/battle_ai_script_commands.c
+3 -3
View File
@@ -252,7 +252,7 @@ static const u16 sDiscouragedPowerfulMoveEffects[] =
extern u8 gBattlerAttacker; extern u8 gBattlerAttacker;
extern const u32 gBitTable[]; // util.h extern const u32 gBitTable[]; // util.h
extern u32 gStatuses3[]; // battle_2.h extern u32 gStatuses3[]; // battle_2.h
extern u16 gSideAffecting[2]; extern u16 gSideStatuses[2];
extern const struct BattleMove gBattleMoves[]; extern const struct BattleMove gBattleMoves[];
extern u16 gDynamicBasePower; extern u16 gDynamicBasePower;
extern u8 gMoveResultFlags; extern u8 gMoveResultFlags;
@@ -720,7 +720,7 @@ static void BattleAICmd_if_status4(void)
arg1 = GetBattlerPosition(index) & 1; arg1 = GetBattlerPosition(index) & 1;
arg2 = T1_READ_32(gAIScriptPtr + 2); arg2 = T1_READ_32(gAIScriptPtr + 2);
if ((gSideAffecting[arg1] & arg2) != 0) if ((gSideStatuses[arg1] & arg2) != 0)
gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6);
else else
gAIScriptPtr += 10; gAIScriptPtr += 10;
@@ -739,7 +739,7 @@ static void BattleAICmd_if_not_status4(void)
arg1 = GetBattlerPosition(index) & 1; arg1 = GetBattlerPosition(index) & 1;
arg2 = T1_READ_32(gAIScriptPtr + 2); arg2 = T1_READ_32(gAIScriptPtr + 2);
if ((gSideAffecting[arg1] & arg2) == 0) if ((gSideStatuses[arg1] & arg2) == 0)
gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6);
else else
gAIScriptPtr += 10; gAIScriptPtr += 10;
src/pokemon.c
+2 -2
View File
@@ -4170,7 +4170,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo
r5 = gActiveBattler; r5 = gActiveBattler;
gActiveBattler = sp34; gActiveBattler = sp34;
BtlController_EmitGetMonData(0, 0, 0); BtlController_EmitGetMonData(0, 0, 0);
MarkBufferBankForExecution(gActiveBattler); MarkBattlerForControllerExec(gActiveBattler);
gActiveBattler = r5; gActiveBattler = r5;
} }
} }
@@ -4709,7 +4709,7 @@ bool8 PokemonUseItemEffects2(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 m
r5 = gActiveBattler; r5 = gActiveBattler;
gActiveBattler = sp34; gActiveBattler = sp34;
BtlController_EmitGetMonData(0, 0, 0); BtlController_EmitGetMonData(0, 0, 0);
MarkBufferBankForExecution(gActiveBattler); MarkBattlerForControllerExec(gActiveBattler);
gActiveBattler = r5; gActiveBattler = r5;
} }
} }
sym_ewram.txt
+14 -14
View File
@@ -189,7 +189,7 @@ gBattlerPositions: @ 2023BD6
gUnknown_2023BDA: @ 2023BDA gUnknown_2023BDA: @ 2023BDA
.space 0x4 .space 0x4
gUnknown_2023BDE: @ 2023BDE gBattlerByTurnOrder: @ 2023BDE
.space 0x4 .space 0x4
gUnknown_2023BE2: @ 2023BE2 gUnknown_2023BE2: @ 2023BE2
@@ -216,7 +216,7 @@ gUnknown_2023C0C: @ 2023C0C
gUnknown_2023C30: @ 2023C30 gUnknown_2023C30: @ 2023C30
.space 0x4 .space 0x4
gUnknown_2023C34: @ 2023C34 gChosenMoveByBattler: @ 2023C34
.space 0x110 .space 0x110
gBattlerSpriteIds: @ 2023D44 gBattlerSpriteIds: @ 2023D44
@@ -243,7 +243,7 @@ gBattleMoveDamage: @ 2023D50
gUnknown_2023D54: @ 2023D54 gUnknown_2023D54: @ 2023D54
.space 0x4 .space 0x4
gUnknown_2023D58: @ 2023D58 gTakenDmg: @ 2023D58
.space 0x10 .space 0x10
gLastUsedItem: @ 2023D68 gLastUsedItem: @ 2023D68
@@ -258,7 +258,7 @@ gBattlerAttacker: @ 2023D6B
gBattlerTarget: @ 2023D6C gBattlerTarget: @ 2023D6C
.space 0x1 .space 0x1
gUnknown_2023D6D: @ 2023D6D gBattlerFainted: @ 2023D6D
.space 0x1 .space 0x1
gEffectBattler: @ 2023D6E gEffectBattler: @ 2023D6E
@@ -276,13 +276,13 @@ gCritMultiplier: @ 2023D71
gUnknown_2023D72: @ 2023D72 gUnknown_2023D72: @ 2023D72
.space 0x2 .space 0x2
gUnknown_2023D74: @ 2023D74 gBattlescriptCurrInstr: @ 2023D74
.space 0x8 .space 0x8
gUnknown_2023D7C: @ 2023D7C gUnknown_2023D7C: @ 2023D7C
.space 0x4 .space 0x4
gUnknown_2023D80: @ 2023D80 gSelectionBattleScripts: @ 2023D80
.space 0x10 .space 0x10
gUnknown_2023D90: @ 2023D90 gUnknown_2023D90: @ 2023D90
@@ -312,19 +312,19 @@ gUnknown_2023DC4: @ 2023DC4
gMoveResultFlags: @ 2023DCC gMoveResultFlags: @ 2023DCC
.space 0x4 .space 0x4
gUnknown_2023DD0: @ 2023DD0 gHitMarker: @ 2023DD0
.space 0x4 .space 0x4
gUnknown_2023DD4: @ 2023DD4 gUnknown_2023DD4: @ 2023DD4
.space 0x4 .space 0x4
gUnknown_2023DD8: @ 2023DD8 gTakenDmgByBattler: @ 2023DD8
.space 0x4 .space 0x4
gUnknown_2023DDC: @ 2023DDC gUnknown_2023DDC: @ 2023DDC
.space 0x2 .space 0x2
gSideAffecting: @ 2023DDE gSideStatuses: @ 2023DDE
.space 0x6 .space 0x6
gSideTimers: @ 2023DE4 gSideTimers: @ 2023DE4
@@ -345,7 +345,7 @@ gUnknown_2023E7E: @ 2023E7E
gUnknown_2023E80: @ 2023E80 gUnknown_2023E80: @ 2023E80
.space 0x2 .space 0x2
gUnknown_2023E82: @ 2023E82 gBattleCommunication: @ 2023E82
.space 0x1 .space 0x1
gUnknown_2023E83: @ 2023E83 gUnknown_2023E83: @ 2023E83
@@ -354,22 +354,22 @@ gUnknown_2023E83: @ 2023E83
gBattleOutcome: @ 2023E8A gBattleOutcome: @ 2023E8A
.space 0x2 .space 0x2
gUnknown_2023E8C: @ 2023E8C gProtectStructs: @ 2023E8C
.space 0x40 .space 0x40
gUnknown_2023ECC: @ 2023ECC gSpecialStatuses: @ 2023ECC
.space 0x50 .space 0x50
gBattleWeather: @ 2023F1C gBattleWeather: @ 2023F1C
.space 0x4 .space 0x4
gUnknown_2023F20: @ 2023F20 gWishFutureKnock: @ 2023F20
.space 0x2C .space 0x2C
gIntroSlideFlags: @ 2023F4C gIntroSlideFlags: @ 2023F4C
.space 0x2 .space 0x2
gUnknown_2023F4E: @ 2023F4E gSentPokesToOpponent: @ 2023F4E
.space 0x2 .space 0x2
gDynamicBasePower: @ 2023F50 gDynamicBasePower: @ 2023F50