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

ported battle_controller_opponent from pokeem and corrected lots of stuff

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-08-03 06:55:42 +08:00
parent 742a7ee1be
commit 6a063cf74a
41 changed files with 2096 additions and 7028 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_2.s
+3 -3
View File
@@ -4061,8 +4061,8 @@ _08011E98: .4byte nullsub_10
_08011E9C: .4byte gUnknown_2022AE8
thumb_func_end sub_8011E3C
thumb_func_start sub_8011EA0
sub_8011EA0: @ 8011EA0
thumb_func_start SpriteCB_FaintOpponentMon
SpriteCB_FaintOpponentMon: @ 8011EA0
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -4201,7 +4201,7 @@ _08011F8C:
.align 2, 0
_08011FAC: .4byte gUnknown_82349CC
_08011FB0: .4byte sub_8011FB4
thumb_func_end sub_8011EA0
thumb_func_end SpriteCB_FaintOpponentMon
thumb_func_start sub_8011FB4
sub_8011FB4: @ 8011FB4
asm/battle_ai_switch_items.s
+7 -7
View File
@@ -1379,8 +1379,8 @@ _08039C76:
bx r1
thumb_func_end sub_8039A80
thumb_func_start sub_8039C84
sub_8039C84: @ 8039C84
thumb_func_start AI_TrySwitchOrUseItem
AI_TrySwitchOrUseItem: @ 8039C84
push {r4-r6,lr}
ldr r5, _08039CDC @ =gBattleTypeFlags
ldr r0, [r5]
@@ -1406,7 +1406,7 @@ _08039C94:
ldrb r0, [r0]
cmp r0, 0x6
bne _08039D5A
bl sub_8039E3C
bl GetMostSuitableMonToSwitchInto
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x6
@@ -1525,7 +1525,7 @@ _08039DA8:
bx r0
.align 2, 0
_08039DB0: .4byte gActiveBattler
thumb_func_end sub_8039C84
thumb_func_end AI_TrySwitchOrUseItem
thumb_func_start sub_8039DB4
sub_8039DB4: @ 8039DB4
@@ -1600,8 +1600,8 @@ _08039E26:
_08039E38: .4byte gUnknown_824F050
thumb_func_end sub_8039DB4
thumb_func_start sub_8039E3C
sub_8039E3C: @ 8039E3C
thumb_func_start GetMostSuitableMonToSwitchInto
GetMostSuitableMonToSwitchInto: @ 8039E3C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2015,7 +2015,7 @@ _0803A188: .4byte gBattlerPartyIndexes
_0803A18C: .4byte gBattleMoveDamage
_0803A190: .4byte gActiveBattler
_0803A194: .4byte gBattleMoves
thumb_func_end sub_8039E3C
thumb_func_end GetMostSuitableMonToSwitchInto
thumb_func_start sub_803A198
sub_803A198: @ 803A198
asm/battle_anim.s
+2 -2
View File
@@ -28,7 +28,7 @@ ClearBattleAnimationVars: @ 80724C0
ldr r0, _0807256C @ =gAnimMovePower
movs r2, 0
strh r1, [r0]
ldr r0, _08072570 @ =gUnknown_2037EFE
ldr r0, _08072570 @ =gAnimFriendship
strb r2, [r0]
ldr r4, _08072574 @ =gUnknown_2037F14
ldr r5, _08072578 @ =gAnimMoveTurn
@@ -91,7 +91,7 @@ _08072560: .4byte gUnknown_2037EE3
_08072564: .4byte gAnimDisableStructPtr
_08072568: .4byte gAnimMoveDmg
_0807256C: .4byte gAnimMovePower
_08072570: .4byte gUnknown_2037EFE
_08072570: .4byte gAnimFriendship
_08072574: .4byte gUnknown_2037F14
_08072578: .4byte gAnimMoveTurn
_0807257C: .4byte gUnknown_2037F17
asm/battle_anim_effects_1.s
+10 -10
View File
@@ -113,7 +113,7 @@ sub_80A2388: @ 80A2388
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
ldr r0, _080A23D0 @ =sub_8075590
ldr r0, _080A23D0 @ =StartAnimLinearTranslation
str r0, [r4, 0x1C]
ldr r1, _080A23D4 @ =move_anim_8074EE0
adds r0, r4, 0
@@ -124,7 +124,7 @@ sub_80A2388: @ 80A2388
.align 2, 0
_080A23C8: .4byte gBattleAnimArgs
_080A23CC: .4byte gBattleAnimAttacker
_080A23D0: .4byte sub_8075590
_080A23D0: .4byte StartAnimLinearTranslation
_080A23D4: .4byte move_anim_8074EE0
thumb_func_end sub_80A2388
@@ -153,7 +153,7 @@ sub_80A23D8: @ 80A23D8
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
ldr r0, _080A2428 @ =sub_8075590
ldr r0, _080A2428 @ =StartAnimLinearTranslation
str r0, [r4, 0x1C]
ldr r1, _080A242C @ =DestroyAnimSprite
adds r0, r4, 0
@@ -164,7 +164,7 @@ sub_80A23D8: @ 80A23D8
.align 2, 0
_080A2420: .4byte gBattleAnimArgs
_080A2424: .4byte gBattleAnimTarget
_080A2428: .4byte sub_8075590
_080A2428: .4byte StartAnimLinearTranslation
_080A242C: .4byte DestroyAnimSprite
thumb_func_end sub_80A23D8
@@ -5903,7 +5903,7 @@ _080A5004:
asrs r0, 24
adds r4, r0
strh r4, [r5, 0x36]
ldr r0, _080A507C @ =sub_8075590
ldr r0, _080A507C @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080A5080 @ =sub_80A5084
adds r0, r5, 0
@@ -5931,7 +5931,7 @@ _080A506A:
bx r0
.align 2, 0
_080A5078: .4byte gUnknown_83E3548
_080A507C: .4byte sub_8075590
_080A507C: .4byte StartAnimLinearTranslation
_080A5080: .4byte sub_80A5084
thumb_func_end sub_80A4FD4
@@ -6048,7 +6048,7 @@ _080A5118:
lsrs r0, 24
adds r0, r6
strh r0, [r5, 0x36]
ldr r0, _080A516C @ =sub_8075590
ldr r0, _080A516C @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080A5170 @ =sub_80A5220
adds r0, r5, 0
@@ -6059,7 +6059,7 @@ _080A5160:
bx r0
.align 2, 0
_080A5168: .4byte gBattleAnimTarget
_080A516C: .4byte sub_8075590
_080A516C: .4byte StartAnimLinearTranslation
_080A5170: .4byte sub_80A5220
thumb_func_end sub_80A50B8
@@ -7711,7 +7711,7 @@ _080A5D90:
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
ldr r0, _080A5DD8 @ =sub_8075590
ldr r0, _080A5DD8 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080A5DDC @ =DestroyAnimSprite
adds r0, r5, 0
@@ -7722,7 +7722,7 @@ _080A5DCC:
bx r0
.align 2, 0
_080A5DD4: .4byte gBattleAnimAttacker
_080A5DD8: .4byte sub_8075590
_080A5DD8: .4byte StartAnimLinearTranslation
_080A5DDC: .4byte DestroyAnimSprite
thumb_func_end sub_80A5D7C
asm/battle_anim_effects_2.s
+15 -15
View File
@@ -286,14 +286,14 @@ sub_80A7058: @ 80A7058
ldrh r1, [r0, 0x22]
adds r1, 0xF
strh r1, [r0, 0x36]
ldr r1, _080A7078 @ =sub_8075590
ldr r1, _080A7078 @ =StartAnimLinearTranslation
str r1, [r0, 0x1C]
ldr r1, _080A707C @ =sub_80A7080
bl StoreSpriteCallbackInData6
pop {r0}
bx r0
.align 2, 0
_080A7078: .4byte sub_8075590
_080A7078: .4byte StartAnimLinearTranslation
_080A707C: .4byte sub_80A7080
thumb_func_end sub_80A7058
@@ -586,14 +586,14 @@ sub_80A72A0: @ 80A72A0
ldrh r1, [r0, 0x22]
subs r1, 0x20
strh r1, [r0, 0x36]
ldr r1, _080A72C0 @ =sub_8075590
ldr r1, _080A72C0 @ =StartAnimLinearTranslation
str r1, [r0, 0x1C]
ldr r1, _080A72C4 @ =DestroyAnimSprite
bl StoreSpriteCallbackInData6
pop {r0}
bx r0
.align 2, 0
_080A72C0: .4byte sub_8075590
_080A72C0: .4byte StartAnimLinearTranslation
_080A72C4: .4byte DestroyAnimSprite
thumb_func_end sub_80A72A0
@@ -698,7 +698,7 @@ _080A7380:
mov r0, r8
strh r0, [r5, 0x32]
strh r7, [r5, 0x36]
ldr r0, _080A73C4 @ =sub_8075590
ldr r0, _080A73C4 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080A73C8 @ =DestroyAnimSprite
adds r0, r5, 0
@@ -714,7 +714,7 @@ _080A73B4: .4byte gBattleAnimAttacker
_080A73B8: .4byte gBattleAnimArgs
_080A73BC: .4byte gBattleAnimTarget
_080A73C0: .4byte 0xffffa000
_080A73C4: .4byte sub_8075590
_080A73C4: .4byte StartAnimLinearTranslation
_080A73C8: .4byte DestroyAnimSprite
thumb_func_end sub_80A72C8
@@ -1764,7 +1764,7 @@ sub_80A7BC4: @ 80A7BC4
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
ldr r0, _080A7C14 @ =sub_8075590
ldr r0, _080A7C14 @ =StartAnimLinearTranslation
str r0, [r4, 0x1C]
adds r2, r4, 0
adds r2, 0x2C
@@ -1780,7 +1780,7 @@ sub_80A7BC4: @ 80A7BC4
bx r0
.align 2, 0
_080A7C10: .4byte gBattleAnimTarget
_080A7C14: .4byte sub_8075590
_080A7C14: .4byte StartAnimLinearTranslation
_080A7C18: .4byte sub_80A7C1C
thumb_func_end sub_80A7BC4
@@ -1998,7 +1998,7 @@ _080A7D90:
lsrs r0, 24
adds r0, r6
strh r0, [r5, 0x36]
ldr r0, _080A7DF0 @ =sub_8075590
ldr r0, _080A7DF0 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080A7DF4 @ =sub_80A7DF8
adds r0, r5, 0
@@ -2013,7 +2013,7 @@ _080A7DE0: .4byte 0x0000ffe0
_080A7DE4: .4byte 0x0000fff0
_080A7DE8: .4byte gBattleAnimArgs
_080A7DEC: .4byte gBattleAnimTarget
_080A7DF0: .4byte sub_8075590
_080A7DF0: .4byte StartAnimLinearTranslation
_080A7DF4: .4byte sub_80A7DF8
thumb_func_end sub_80A7D64
@@ -5442,7 +5442,7 @@ _080A9808:
ldrh r1, [r4, 0x6]
adds r0, r1
strh r0, [r5, 0x36]
ldr r0, _080A9858 @ =sub_8075590
ldr r0, _080A9858 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080A985C @ =DestroyAnimSprite
adds r0, r5, 0
@@ -5457,7 +5457,7 @@ _080A9808:
.align 2, 0
_080A9850: .4byte gBattleAnimAttacker
_080A9854: .4byte gBattleAnimArgs
_080A9858: .4byte sub_8075590
_080A9858: .4byte StartAnimLinearTranslation
_080A985C: .4byte DestroyAnimSprite
thumb_func_end sub_80A97E8
@@ -7733,7 +7733,7 @@ _080AA9C6:
str r0, [r6, 0x1C]
strh r5, [r6, 0x2E]
adds r0, r6, 0
bl oamt_add_pos2_onto_pos1
bl SetSpritePrimaryCoordsFromSecondaryCoords
movs r0, 0x5
strh r0, [r6, 0x32]
strh r5, [r6, 0x36]
@@ -7891,7 +7891,7 @@ _080AAB50:
ldrh r0, [r5, 0x22]
subs r0, 0x48
strh r0, [r5, 0x36]
ldr r0, _080AAB74 @ =sub_8075590
ldr r0, _080AAB74 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080AAB78 @ =DestroyAnimSprite
adds r0, r5, 0
@@ -7901,7 +7901,7 @@ _080AAB50:
bx r0
.align 2, 0
_080AAB70: .4byte gBattleAnimAttacker
_080AAB74: .4byte sub_8075590
_080AAB74: .4byte StartAnimLinearTranslation
_080AAB78: .4byte DestroyAnimSprite
thumb_func_end sub_80AAAE4
asm/battle_anim_effects_3.s
+8 -8
View File
@@ -265,7 +265,7 @@ _080DE49E:
strh r0, [r5, 0x2E]
strh r7, [r5, 0x32]
strh r6, [r5, 0x36]
ldr r0, _080DE4D4 @ =sub_8075590
ldr r0, _080DE4D4 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080DE4D8 @ =DestroyAnimSprite
adds r0, r5, 0
@@ -277,7 +277,7 @@ _080DE49E:
.align 2, 0
_080DE4CC: .4byte gBattleAnimTarget
_080DE4D0: .4byte gBattleAnimArgs
_080DE4D4: .4byte sub_8075590
_080DE4D4: .4byte StartAnimLinearTranslation
_080DE4D8: .4byte DestroyAnimSprite
thumb_func_end sub_80DE440
@@ -2404,7 +2404,7 @@ _080DF4C4:
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
ldr r0, _080DF520 @ =sub_8075590
ldr r0, _080DF520 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
_080DF510:
pop {r4,r5}
@@ -2413,7 +2413,7 @@ _080DF510:
.align 2, 0
_080DF518: .4byte DestroyAnimSprite
_080DF51C: .4byte gBattleAnimTarget
_080DF520: .4byte sub_8075590
_080DF520: .4byte StartAnimLinearTranslation
thumb_func_end sub_80DF468
thumb_func_start sub_80DF524
@@ -11173,7 +11173,7 @@ sub_80E38D8: @ 80E38D8
ldr r3, _080E3924 @ =gBattleAnimArgs
movs r2, 0
strh r2, [r3, 0xE]
ldr r1, _080E3928 @ =gUnknown_2037EFE
ldr r1, _080E3928 @ =gAnimFriendship
ldrb r0, [r1]
ldrb r1, [r1]
adds r0, r1, 0
@@ -11209,7 +11209,7 @@ _080E3918:
bx r0
.align 2, 0
_080E3924: .4byte gBattleAnimArgs
_080E3928: .4byte gUnknown_2037EFE
_080E3928: .4byte gAnimFriendship
thumb_func_end sub_80E38D8
thumb_func_start sub_80E392C
@@ -12703,7 +12703,7 @@ sub_80E44EC: @ 80E44EC
ldr r2, _080E4508 @ =gBattleAnimArgs
movs r0, 0
strh r0, [r2, 0xE]
ldr r0, _080E450C @ =gUnknown_2037F00
ldr r0, _080E450C @ =gWeatherMoveAnim
ldrh r1, [r0]
movs r0, 0x60
ands r0, r1
@@ -12713,7 +12713,7 @@ sub_80E44EC: @ 80E44EC
b _080E4532
.align 2, 0
_080E4508: .4byte gBattleAnimArgs
_080E450C: .4byte gUnknown_2037F00
_080E450C: .4byte gWeatherMoveAnim
_080E4510:
movs r0, 0x7
ands r0, r1
asm/battle_anim_mons.s
+14 -14
View File
@@ -1715,8 +1715,8 @@ _080750F6:
bx r1
thumb_func_end sub_80750C8
thumb_func_start oamt_add_pos2_onto_pos1
oamt_add_pos2_onto_pos1: @ 80750FC
thumb_func_start SetSpritePrimaryCoordsFromSecondaryCoords
SetSpritePrimaryCoordsFromSecondaryCoords: @ 80750FC
ldrh r1, [r0, 0x24]
ldrh r2, [r0, 0x20]
adds r1, r2
@@ -1729,7 +1729,7 @@ oamt_add_pos2_onto_pos1: @ 80750FC
strh r2, [r0, 0x24]
strh r2, [r0, 0x26]
bx lr
thumb_func_end oamt_add_pos2_onto_pos1
thumb_func_end SetSpritePrimaryCoordsFromSecondaryCoords
thumb_func_start sub_8075114
sub_8075114: @ 8075114
@@ -2347,8 +2347,8 @@ _08075574:
_0807558C: .4byte 0x0000fffe
thumb_func_end obj_translate_based_on_private_1_2_3_4
thumb_func_start sub_8075590
sub_8075590: @ 8075590
thumb_func_start StartAnimLinearTranslation
StartAnimLinearTranslation: @ 8075590
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x20]
@@ -2366,7 +2366,7 @@ sub_8075590: @ 8075590
bx r0
.align 2, 0
_080755B4: .4byte sub_807563C
thumb_func_end sub_8075590
thumb_func_end StartAnimLinearTranslation
thumb_func_start sub_80755B8
sub_80755B8: @ 80755B8
@@ -3547,7 +3547,7 @@ _08075E30:
ldrh r6, [r6, 0x6]
adds r0, r6
strh r0, [r5, 0x36]
ldr r0, _08075E78 @ =sub_8075590
ldr r0, _08075E78 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _08075E7C @ =DestroyAnimSprite
adds r0, r5, 0
@@ -3559,7 +3559,7 @@ _08075E30:
_08075E6C: .4byte gBattleAnimArgs
_08075E70: .4byte gBattleAnimAttacker
_08075E74: .4byte gBattleAnimTarget
_08075E78: .4byte sub_8075590
_08075E78: .4byte StartAnimLinearTranslation
_08075E7C: .4byte DestroyAnimSprite
thumb_func_end sub_8075DF4
@@ -3701,7 +3701,7 @@ _08075F62:
ldrh r4, [r4, 0x6]
adds r0, r4
strh r0, [r5, 0x36]
ldr r0, _08075FB4 @ =sub_8075590
ldr r0, _08075FB4 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _08075FB8 @ =DestroyAnimSprite
adds r0, r5, 0
@@ -3713,7 +3713,7 @@ _08075F62:
_08075FA8: .4byte gBattleAnimTarget
_08075FAC: .4byte gBattleAnimAttacker
_08075FB0: .4byte gBattleAnimArgs
_08075FB4: .4byte sub_8075590
_08075FB4: .4byte StartAnimLinearTranslation
_08075FB8: .4byte DestroyAnimSprite
thumb_func_end sub_8075F0C
@@ -4667,7 +4667,7 @@ sub_80766B8: @ 80766B8
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _080766E4 @ =gUnknown_2037EFE
ldr r0, _080766E4 @ =gAnimFriendship
ldrb r0, [r0]
movs r1, 0
cmp r0, 0x1E
@@ -4687,7 +4687,7 @@ _080766D6:
pop {r0}
bx r0
.align 2, 0
_080766E4: .4byte gUnknown_2037EFE
_080766E4: .4byte gAnimFriendship
_080766E8: .4byte gBattleAnimArgs
thumb_func_end sub_80766B8
@@ -6327,7 +6327,7 @@ _08077390:
subs r0, 0x50
_0807739E:
strh r0, [r4, 0x22]
ldr r0, _080773B4 @ =sub_8075590
ldr r0, _080773B4 @ =StartAnimLinearTranslation
str r0, [r4, 0x1C]
ldr r1, _080773B8 @ =DestroyAnimSprite
adds r0, r4, 0
@@ -6336,7 +6336,7 @@ _0807739E:
pop {r0}
bx r0
.align 2, 0
_080773B4: .4byte sub_8075590
_080773B4: .4byte StartAnimLinearTranslation
_080773B8: .4byte DestroyAnimSprite
thumb_func_end sub_8077350
asm/battle_controller_link_opponent.s
+30 -30
View File
@@ -807,7 +807,7 @@ CompleteOnHealthbarDone_4: @ 803ACCC
ldrb r1, [r1]
movs r2, 0
movs r3, 0
bl sub_8049FD8
bl MoveBattleBar
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -825,7 +825,7 @@ CompleteOnHealthbarDone_4: @ 803ACCC
adds r0, r5
ldrb r0, [r0]
movs r2, 0
bl sub_8048440
bl UpdateHpTextInHealthbox
b _0803AD18
.align 2, 0
_0803AD0C: .4byte gActiveBattler
@@ -4256,7 +4256,7 @@ _0803C992:
bl SetMultiuseSpriteTemplateToTrainerBack
ldr r5, _0803CAD0 @ =gMultiuseSpriteTemplate
adds r6, r7, 0
ldr r1, _0803CAD4 @ =gUnknown_823932C
ldr r1, _0803CAD4 @ =gTrainerFrontPicCoords
mov r2, r9
lsls r0, r2, 2
adds r0, r1
@@ -4391,7 +4391,7 @@ _0803C992:
_0803CAC8: .4byte gFacilityClassToPicIndex
_0803CACC: .4byte gActiveBattler
_0803CAD0: .4byte gMultiuseSpriteTemplate
_0803CAD4: .4byte gUnknown_823932C
_0803CAD4: .4byte gTrainerFrontPicCoords
_0803CAD8: .4byte gBattlerSpriteIds
_0803CADC: .4byte gSprites
_0803CAE0: .4byte 0x0000ff10
@@ -4425,7 +4425,7 @@ sub_803CB0C: @ 803CB0C
lsls r0, 2
ldr r5, _0803CBA4 @ =gSprites
adds r0, r5
bl oamt_add_pos2_onto_pos1
bl SetSpritePrimaryCoordsFromSecondaryCoords
ldrb r0, [r4]
adds r0, r6
ldrb r1, [r0]
@@ -4463,7 +4463,7 @@ sub_803CB0C: @ 803CB0C
adds r1, r5, 0
adds r1, 0x1C
adds r0, r1
ldr r1, _0803CBA8 @ =sub_8075590
ldr r1, _0803CBA8 @ =StartAnimLinearTranslation
str r1, [r0]
ldrb r0, [r4]
adds r0, r6
@@ -4487,7 +4487,7 @@ sub_803CB0C: @ 803CB0C
_0803CB9C: .4byte gBattlerSpriteIds
_0803CBA0: .4byte gActiveBattler
_0803CBA4: .4byte gSprites
_0803CBA8: .4byte sub_8075590
_0803CBA8: .4byte StartAnimLinearTranslation
_0803CBAC: .4byte SpriteCallbackDummy
_0803CBB0: .4byte gBattlerControllerFuncs
_0803CBB4: .4byte sub_803A70C
@@ -4557,7 +4557,7 @@ _0803CC0C:
lsls r0, 2
adds r2, 0x1C
adds r0, r2
ldr r1, _0803CC58 @ =sub_8011EA0
ldr r1, _0803CC58 @ =SpriteCB_FaintOpponentMon
str r1, [r0]
ldr r1, _0803CC5C @ =gBattlerControllerFuncs
ldrb r0, [r5]
@@ -4572,7 +4572,7 @@ _0803CC48:
.align 2, 0
_0803CC50: .4byte gSprites
_0803CC54: .4byte gBattlerSpriteIds
_0803CC58: .4byte sub_8011EA0
_0803CC58: .4byte SpriteCB_FaintOpponentMon
_0803CC5C: .4byte gBattlerControllerFuncs
_0803CC60: .4byte sub_803AD20
thumb_func_end sub_803CBB8
@@ -4679,7 +4679,7 @@ _0803CCA6:
lsls r1, 24
orrs r3, r1
str r3, [r4]
ldr r3, _0803CD8C @ =gUnknown_2037EFE
ldr r3, _0803CD8C @ =gAnimFriendship
ldrb r1, [r6]
lsls r1, 9
mov r2, r12
@@ -4687,7 +4687,7 @@ _0803CCA6:
adds r1, r2
ldrb r1, [r1]
strb r1, [r3]
ldr r4, _0803CD90 @ =gUnknown_2037F00
ldr r4, _0803CD90 @ =gWeatherMoveAnim
ldrb r2, [r6]
lsls r2, 9
mov r1, r12
@@ -4728,8 +4728,8 @@ _0803CD7C: .4byte gBattleBufferA
_0803CD80: .4byte gAnimMoveTurn
_0803CD84: .4byte gAnimMovePower
_0803CD88: .4byte gAnimMoveDmg
_0803CD8C: .4byte gUnknown_2037EFE
_0803CD90: .4byte gUnknown_2037F00
_0803CD8C: .4byte gAnimFriendship
_0803CD90: .4byte gWeatherMoveAnim
_0803CD94: .4byte gAnimDisableStructPtr
_0803CD98: .4byte gTransformedPersonalities
_0803CD9C:
@@ -5531,8 +5531,8 @@ _0803D3AC: .4byte gActiveBattler
_0803D3B0: .4byte gBattleBufferA
thumb_func_end RecordedOpponentHandlePlaySE
thumb_func_start LinkOpponentHandlecmd44
LinkOpponentHandlecmd44: @ 803D3B4
thumb_func_start LinkOpponentHandlePlayFanfare
LinkOpponentHandlePlayFanfare: @ 803D3B4
push {lr}
ldr r2, _0803D3DC @ =gBattleBufferA
ldr r0, _0803D3E0 @ =gActiveBattler
@@ -5553,7 +5553,7 @@ LinkOpponentHandlecmd44: @ 803D3B4
.align 2, 0
_0803D3DC: .4byte gBattleBufferA
_0803D3E0: .4byte gActiveBattler
thumb_func_end LinkOpponentHandlecmd44
thumb_func_end LinkOpponentHandlePlayFanfare
thumb_func_start RecordedOpponentHandleFaintingCry
RecordedOpponentHandleFaintingCry: @ 803D3E4
@@ -5622,7 +5622,7 @@ sub_803D454: @ 803D454
lsls r0, 2
ldr r4, _0803D53C @ =gSprites
adds r0, r4
bl oamt_add_pos2_onto_pos1
bl SetSpritePrimaryCoordsFromSecondaryCoords
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -5660,7 +5660,7 @@ sub_803D454: @ 803D454
adds r1, r4, 0
adds r1, 0x1C
adds r0, r1
ldr r1, _0803D540 @ =sub_8075590
ldr r1, _0803D540 @ =StartAnimLinearTranslation
str r1, [r0]
ldrb r0, [r6]
adds r0, r5
@@ -5696,14 +5696,14 @@ sub_803D454: @ 803D454
ands r0, r1
cmp r0, 0
beq _0803D516
ldr r0, _0803D554 @ =gUnknown_2024000
ldr r0, _0803D554 @ =gBattlerStatusSummaryTaskId
adds r0, r2, r0
ldrb r1, [r0]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r4
ldr r1, _0803D558 @ =sub_80491B0
ldr r1, _0803D558 @ =Task_HidePartyStatusSummary
str r1, [r0]
_0803D516:
ldr r0, [r3]
@@ -5725,13 +5725,13 @@ _0803D516:
_0803D534: .4byte gBattlerSpriteIds
_0803D538: .4byte gActiveBattler
_0803D53C: .4byte gSprites
_0803D540: .4byte sub_8075590
_0803D540: .4byte StartAnimLinearTranslation
_0803D544: .4byte sub_803D648
_0803D548: .4byte sub_803D564
_0803D54C: .4byte gTasks
_0803D550: .4byte gBattleSpritesDataPtr
_0803D554: .4byte gUnknown_2024000
_0803D558: .4byte sub_80491B0
_0803D554: .4byte gBattlerStatusSummaryTaskId
_0803D558: .4byte Task_HidePartyStatusSummary
_0803D55C: .4byte gBattlerControllerFuncs
_0803D560: .4byte nullsub_19
thumb_func_end sub_803D454
@@ -5957,8 +5957,8 @@ _0803D718:
subs r4, 0x2
adds r3, r4
ldrb r3, [r3]
bl sub_8048D14
ldr r2, _0803D780 @ =gUnknown_2024000
bl CreatePartyStatusSummarySprites
ldr r2, _0803D780 @ =gBattlerStatusSummaryTaskId
ldrb r1, [r5]
adds r1, r2
movs r3, 0
@@ -5999,7 +5999,7 @@ _0803D776:
bx r0
.align 2, 0
_0803D77C: .4byte gUnknown_2022BC8
_0803D780: .4byte gUnknown_2024000
_0803D780: .4byte gBattlerStatusSummaryTaskId
_0803D784: .4byte gBattleSpritesDataPtr
_0803D788: .4byte gBattlerControllerFuncs
_0803D78C: .4byte sub_803D790
@@ -6061,14 +6061,14 @@ RecordedOpponentHandleCmd49: @ 803D7D8
cmp r0, 0
beq _0803D80A
ldr r2, _0803D81C @ =gTasks
ldr r0, _0803D820 @ =gUnknown_2024000
ldr r0, _0803D820 @ =gBattlerStatusSummaryTaskId
adds r0, r3, r0
ldrb r1, [r0]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r2
ldr r1, _0803D824 @ =sub_80491B0
ldr r1, _0803D824 @ =Task_HidePartyStatusSummary
str r1, [r0]
_0803D80A:
bl RecordedOpponentBufferExecCompleted
@@ -6078,8 +6078,8 @@ _0803D80A:
_0803D814: .4byte gBattleSpritesDataPtr
_0803D818: .4byte gActiveBattler
_0803D81C: .4byte gTasks
_0803D820: .4byte gUnknown_2024000
_0803D824: .4byte sub_80491B0
_0803D820: .4byte gBattlerStatusSummaryTaskId
_0803D824: .4byte Task_HidePartyStatusSummary
thumb_func_end RecordedOpponentHandleCmd49
thumb_func_start sub_803D828
asm/battle_controller_link_partner.s
+23 -23
View File
@@ -495,7 +495,7 @@ sub_80D45D0: @ 80D45D0
ldrb r1, [r1]
movs r2, 0
movs r3, 0
bl sub_8049FD8
bl MoveBattleBar
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -513,7 +513,7 @@ sub_80D45D0: @ 80D45D0
adds r0, r6
ldrb r0, [r0]
movs r2, 0
bl sub_8048440
bl UpdateHpTextInHealthbox
b _080D4632
.align 2, 0
_080D4610: .4byte gActiveBattler
@@ -4016,7 +4016,7 @@ sub_80D6348: @ 80D6348
lsls r0, 2
ldr r5, _080D63DC @ =gSprites
adds r0, r5
bl oamt_add_pos2_onto_pos1
bl SetSpritePrimaryCoordsFromSecondaryCoords
ldrb r0, [r4]
adds r0, r6
ldrb r1, [r0]
@@ -4053,7 +4053,7 @@ sub_80D6348: @ 80D6348
adds r1, r5, 0
adds r1, 0x1C
adds r0, r1
ldr r1, _080D63E4 @ =sub_8075590
ldr r1, _080D63E4 @ =StartAnimLinearTranslation
str r1, [r0]
ldrb r0, [r4]
adds r0, r6
@@ -4078,7 +4078,7 @@ _080D63D4: .4byte gBattlerSpriteIds
_080D63D8: .4byte gActiveBattler
_080D63DC: .4byte gSprites
_080D63E0: .4byte 0x0000ffd8
_080D63E4: .4byte sub_8075590
_080D63E4: .4byte StartAnimLinearTranslation
_080D63E8: .4byte SpriteCallbackDummy
_080D63EC: .4byte gBattlerControllerFuncs
_080D63F0: .4byte sub_80D42A8
@@ -4300,7 +4300,7 @@ _080D6522:
lsls r1, 24
orrs r3, r1
str r3, [r4]
ldr r3, _080D6608 @ =gUnknown_2037EFE
ldr r3, _080D6608 @ =gAnimFriendship
ldrb r1, [r6]
lsls r1, 9
mov r2, r12
@@ -4308,7 +4308,7 @@ _080D6522:
adds r1, r2
ldrb r1, [r1]
strb r1, [r3]
ldr r4, _080D660C @ =gUnknown_2037F00
ldr r4, _080D660C @ =gWeatherMoveAnim
ldrb r2, [r6]
lsls r2, 9
mov r1, r12
@@ -4349,8 +4349,8 @@ _080D65F8: .4byte gBattleBufferA
_080D65FC: .4byte gAnimMoveTurn
_080D6600: .4byte gAnimMovePower
_080D6604: .4byte gAnimMoveDmg
_080D6608: .4byte gUnknown_2037EFE
_080D660C: .4byte gUnknown_2037F00
_080D6608: .4byte gAnimFriendship
_080D660C: .4byte gWeatherMoveAnim
_080D6610: .4byte gAnimDisableStructPtr
_080D6614: .4byte gTransformedPersonalities
_080D6618:
@@ -5244,7 +5244,7 @@ sub_80D6CD4: @ 80D6CD4
lsls r0, 2
ldr r4, _080D6DE4 @ =gSprites
adds r0, r4
bl oamt_add_pos2_onto_pos1
bl SetSpritePrimaryCoordsFromSecondaryCoords
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -5281,7 +5281,7 @@ sub_80D6CD4: @ 80D6CD4
adds r1, r4, 0
adds r1, 0x1C
adds r0, r1
ldr r1, _080D6DEC @ =sub_8075590
ldr r1, _080D6DEC @ =StartAnimLinearTranslation
str r1, [r0]
ldrb r2, [r6]
adds r0, r2, r5
@@ -5362,7 +5362,7 @@ _080D6DDC: .4byte gBattlerSpriteIds
_080D6DE0: .4byte gActiveBattler
_080D6DE4: .4byte gSprites
_080D6DE8: .4byte 0x0000ffd8
_080D6DEC: .4byte sub_8075590
_080D6DEC: .4byte StartAnimLinearTranslation
_080D6DF0: .4byte sub_80335F8
_080D6DF4: .4byte 0x0000d6f9
_080D6DF8: .4byte gLinkPlayers
@@ -5425,14 +5425,14 @@ _080D6E0C:
ands r0, r1
cmp r0, 0
beq _080D6E86
ldr r0, _080D6EC0 @ =gUnknown_2024000
ldr r0, _080D6EC0 @ =gBattlerStatusSummaryTaskId
adds r0, r2, r0
ldrb r1, [r0]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r4
ldr r1, _080D6EC4 @ =sub_80491B0
ldr r1, _080D6EC4 @ =Task_HidePartyStatusSummary
str r1, [r0]
_080D6E86:
ldr r0, [r3]
@@ -5458,8 +5458,8 @@ _080D6EB0: .4byte gActiveBattler
_080D6EB4: .4byte sub_80D6ED0
_080D6EB8: .4byte gTasks
_080D6EBC: .4byte gBattleSpritesDataPtr
_080D6EC0: .4byte gUnknown_2024000
_080D6EC4: .4byte sub_80491B0
_080D6EC0: .4byte gBattlerStatusSummaryTaskId
_080D6EC4: .4byte Task_HidePartyStatusSummary
_080D6EC8: .4byte gBattlerControllerFuncs
_080D6ECC: .4byte nullsub_77
thumb_func_end sub_80D6CD4
@@ -5638,8 +5638,8 @@ _080D700C:
subs r4, 0x2
adds r3, r4
ldrb r3, [r3]
bl sub_8048D14
ldr r2, _080D7094 @ =gUnknown_2024000
bl CreatePartyStatusSummarySprites
ldr r2, _080D7094 @ =gBattlerStatusSummaryTaskId
ldrb r1, [r5]
adds r1, r2
movs r3, 0
@@ -5681,7 +5681,7 @@ _080D7080:
_080D7088: .4byte gBattleSpritesDataPtr
_080D708C: .4byte gActiveBattler
_080D7090: .4byte gUnknown_2022BC8
_080D7094: .4byte gUnknown_2024000
_080D7094: .4byte gBattlerStatusSummaryTaskId
_080D7098: .4byte gBattlerControllerFuncs
_080D709C: .4byte sub_80D70A0
thumb_func_end sub_80D6FDC
@@ -5742,14 +5742,14 @@ sub_80D70E8: @ 80D70E8
cmp r0, 0
beq _080D711A
ldr r2, _080D712C @ =gTasks
ldr r0, _080D7130 @ =gUnknown_2024000
ldr r0, _080D7130 @ =gBattlerStatusSummaryTaskId
adds r0, r3, r0
ldrb r1, [r0]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r2
ldr r1, _080D7134 @ =sub_80491B0
ldr r1, _080D7134 @ =Task_HidePartyStatusSummary
str r1, [r0]
_080D711A:
bl sub_80D49E8
@@ -5759,8 +5759,8 @@ _080D711A:
_080D7124: .4byte gBattleSpritesDataPtr
_080D7128: .4byte gActiveBattler
_080D712C: .4byte gTasks
_080D7130: .4byte gUnknown_2024000
_080D7134: .4byte sub_80491B0
_080D7130: .4byte gBattlerStatusSummaryTaskId
_080D7134: .4byte Task_HidePartyStatusSummary
thumb_func_end sub_80D70E8
thumb_func_start sub_80D7138
asm/battle_controller_oak.s
+22 -22
View File
@@ -1362,7 +1362,7 @@ _080E807C:
adds r0, r7, 0
movs r2, 0x1
movs r3, 0
bl sub_8049FD8
bl MoveBattleBar
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -2371,7 +2371,7 @@ sub_80E88C0: @ 80E88C0
ldrb r1, [r1]
movs r2, 0
movs r3, 0
bl sub_8049FD8
bl MoveBattleBar
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -2389,7 +2389,7 @@ sub_80E88C0: @ 80E88C0
adds r0, r6
ldrb r0, [r0]
movs r2, 0
bl sub_8048440
bl UpdateHpTextInHealthbox
b _080E8922
.align 2, 0
_080E8900: .4byte gActiveBattler
@@ -5529,7 +5529,7 @@ sub_80EA2B8: @ 80EA2B8
lsls r1, 24
orrs r3, r1
str r3, [r4]
ldr r3, _080EA3A0 @ =gUnknown_2037EFE
ldr r3, _080EA3A0 @ =gAnimFriendship
ldrb r1, [r6]
lsls r1, 9
mov r2, r12
@@ -5537,7 +5537,7 @@ sub_80EA2B8: @ 80EA2B8
adds r1, r2
ldrb r1, [r1]
strb r1, [r3]
ldr r4, _080EA3A4 @ =gUnknown_2037F00
ldr r4, _080EA3A4 @ =gWeatherMoveAnim
ldrb r2, [r6]
lsls r2, 9
mov r1, r12
@@ -5578,8 +5578,8 @@ _080EA390: .4byte gActiveBattler
_080EA394: .4byte gAnimMoveTurn
_080EA398: .4byte gAnimMovePower
_080EA39C: .4byte gAnimMoveDmg
_080EA3A0: .4byte gUnknown_2037EFE
_080EA3A4: .4byte gUnknown_2037F00
_080EA3A0: .4byte gAnimFriendship
_080EA3A4: .4byte gWeatherMoveAnim
_080EA3A8: .4byte gAnimDisableStructPtr
_080EA3AC: .4byte gTransformedPersonalities
_080EA3B0:
@@ -6419,7 +6419,7 @@ _080EAA48:
ldrb r0, [r0]
movs r1, 0
movs r2, 0
bl sub_8048440
bl UpdateHpTextInHealthbox
_080EAA82:
ldr r1, _080EAAAC @ =gBattlerControllerFuncs
ldr r0, _080EAAB0 @ =gActiveBattler
@@ -6822,7 +6822,7 @@ _080EAD64:
lsls r0, 2
ldr r5, _080EAEAC @ =gSprites
adds r0, r5
bl oamt_add_pos2_onto_pos1
bl SetSpritePrimaryCoordsFromSecondaryCoords
ldrb r0, [r7]
adds r0, r6
ldrb r1, [r0]
@@ -6859,7 +6859,7 @@ _080EAD64:
adds r1, r5, 0
adds r1, 0x1C
adds r0, r1
ldr r1, _080EAEB4 @ =sub_8075590
ldr r1, _080EAEB4 @ =StartAnimLinearTranslation
str r1, [r0]
ldrb r2, [r7]
adds r0, r2, r6
@@ -6941,14 +6941,14 @@ _080EAD64:
ands r0, r1
cmp r0, 0
beq _080EAE84
ldr r0, _080EAED4 @ =gUnknown_2024000
ldr r0, _080EAED4 @ =gBattlerStatusSummaryTaskId
adds r0, r2, r0
ldrb r1, [r0]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r4
ldr r1, _080EAED8 @ =sub_80491B0
ldr r1, _080EAED8 @ =Task_HidePartyStatusSummary
str r1, [r0]
_080EAE84:
ldr r0, [r3]
@@ -6970,7 +6970,7 @@ _080EAEA4: .4byte gBattlerSpriteIds
_080EAEA8: .4byte gActiveBattler
_080EAEAC: .4byte gSprites
_080EAEB0: .4byte 0x0000ffd8
_080EAEB4: .4byte sub_8075590
_080EAEB4: .4byte StartAnimLinearTranslation
_080EAEB8: .4byte sub_80335F8
_080EAEBC: .4byte 0x0000d6f8
_080EAEC0: .4byte gUnknown_8239FD4
@@ -6978,8 +6978,8 @@ _080EAEC4: .4byte gSaveBlock2Ptr
_080EAEC8: .4byte sub_80EB0A8
_080EAECC: .4byte gTasks
_080EAED0: .4byte gBattleSpritesDataPtr
_080EAED4: .4byte gUnknown_2024000
_080EAED8: .4byte sub_80491B0
_080EAED4: .4byte gBattlerStatusSummaryTaskId
_080EAED8: .4byte Task_HidePartyStatusSummary
_080EAEDC: .4byte gBattlerControllerFuncs
_080EAEE0: .4byte nullsub_13
_080EAEE4:
@@ -6998,14 +6998,14 @@ _080EAEE4:
cmp r0, 0
beq _080EAF14
ldr r2, _080EAF28 @ =gTasks
ldr r0, _080EAF2C @ =gUnknown_2024000
ldr r0, _080EAF2C @ =gBattlerStatusSummaryTaskId
adds r0, r3, r0
ldrb r1, [r0]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r2
ldr r1, _080EAF30 @ =sub_80491B0
ldr r1, _080EAF30 @ =Task_HidePartyStatusSummary
str r1, [r0]
_080EAF14:
bl WallyBufferExecCompleted
@@ -7017,8 +7017,8 @@ _080EAF18:
_080EAF20: .4byte gBattleSpritesDataPtr
_080EAF24: .4byte gActiveBattler
_080EAF28: .4byte gTasks
_080EAF2C: .4byte gUnknown_2024000
_080EAF30: .4byte sub_80491B0
_080EAF2C: .4byte gBattlerStatusSummaryTaskId
_080EAF30: .4byte Task_HidePartyStatusSummary
thumb_func_end sub_80EAD54
thumb_func_start sub_80EAF34
@@ -7295,8 +7295,8 @@ _080EB14C:
subs r3, 0x2
adds r4, r3
ldrb r3, [r4]
bl sub_8048D14
ldr r2, _080EB19C @ =gUnknown_2024000
bl CreatePartyStatusSummarySprites
ldr r2, _080EB19C @ =gBattlerStatusSummaryTaskId
ldrb r1, [r5]
adds r1, r2
strb r0, [r1]
@@ -7309,7 +7309,7 @@ _080EB18A:
_080EB190: .4byte gBattleSpritesDataPtr
_080EB194: .4byte gActiveBattler
_080EB198: .4byte gUnknown_2022BC8
_080EB19C: .4byte gUnknown_2024000
_080EB19C: .4byte gBattlerStatusSummaryTaskId
thumb_func_end sub_80EB11C
thumb_func_start sub_80EB1A0
asm/battle_controller_opponent.s
-6736
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_player.s
+23 -23
View File
@@ -3317,7 +3317,7 @@ CompleteOnHealthbarDone: @ 802FE24
ldrb r1, [r1]
movs r2, 0
movs r3, 0
bl sub_8049FD8
bl MoveBattleBar
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -3335,7 +3335,7 @@ CompleteOnHealthbarDone: @ 802FE24
adds r0, r6
ldrb r0, [r0]
movs r2, 0
bl sub_8048440
bl UpdateHpTextInHealthbox
b _0802FE86
.align 2, 0
_0802FE64: .4byte gActiveBattler
@@ -3691,7 +3691,7 @@ _08030124:
adds r0, r7, 0
movs r2, 0x1
movs r3, 0
bl sub_8049FD8
bl MoveBattleBar
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -8084,7 +8084,7 @@ PlayerHandleTrainerSlideBack: @ 8032590
lsls r0, 2
ldr r4, _08032638 @ =gSprites
adds r0, r4
bl oamt_add_pos2_onto_pos1
bl SetSpritePrimaryCoordsFromSecondaryCoords
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -8121,7 +8121,7 @@ PlayerHandleTrainerSlideBack: @ 8032590
adds r1, r4, 0
adds r1, 0x1C
adds r0, r1
ldr r1, _08032640 @ =sub_8075590
ldr r1, _08032640 @ =StartAnimLinearTranslation
str r1, [r0]
ldrb r0, [r6]
adds r0, r5
@@ -8155,7 +8155,7 @@ _08032630: .4byte gBattlerSpriteIds
_08032634: .4byte gActiveBattler
_08032638: .4byte gSprites
_0803263C: .4byte 0x0000ffd8
_08032640: .4byte sub_8075590
_08032640: .4byte StartAnimLinearTranslation
_08032644: .4byte SpriteCallbackDummy
_08032648: .4byte gBattlerControllerFuncs
_0803264C: .4byte sub_802F7A0
@@ -8474,7 +8474,7 @@ _08032852:
lsls r1, 24
orrs r3, r1
str r3, [r4]
ldr r3, _08032938 @ =gUnknown_2037EFE
ldr r3, _08032938 @ =gAnimFriendship
ldrb r1, [r6]
lsls r1, 9
mov r2, r12
@@ -8482,7 +8482,7 @@ _08032852:
adds r1, r2
ldrb r1, [r1]
strb r1, [r3]
ldr r4, _0803293C @ =gUnknown_2037F00
ldr r4, _0803293C @ =gWeatherMoveAnim
ldrb r2, [r6]
lsls r2, 9
mov r1, r12
@@ -8523,8 +8523,8 @@ _08032928: .4byte gBattleBufferA
_0803292C: .4byte gAnimMoveTurn
_08032930: .4byte gAnimMovePower
_08032934: .4byte gAnimMoveDmg
_08032938: .4byte gUnknown_2037EFE
_0803293C: .4byte gUnknown_2037F00
_08032938: .4byte gAnimFriendship
_0803293C: .4byte gWeatherMoveAnim
_08032940: .4byte gAnimDisableStructPtr
_08032944: .4byte gTransformedPersonalities
_08032948:
@@ -9238,7 +9238,7 @@ _08032EDC:
ldrb r0, [r0]
movs r1, 0
movs r2, 0
bl sub_8048440
bl UpdateHpTextInHealthbox
_08032F16:
ldr r1, _08032F40 @ =gBattlerControllerFuncs
ldr r0, _08032F44 @ =gActiveBattler
@@ -9940,7 +9940,7 @@ PlayerHandleIntroTrainerBallThrow: @ 8033478
lsls r0, 2
ldr r5, _080335C0 @ =gSprites
adds r0, r5
bl oamt_add_pos2_onto_pos1
bl SetSpritePrimaryCoordsFromSecondaryCoords
ldrb r0, [r7]
adds r0, r6
ldrb r1, [r0]
@@ -10059,14 +10059,14 @@ PlayerHandleIntroTrainerBallThrow: @ 8033478
ands r0, r1
cmp r0, 0
beq _0803359A
ldr r0, _080335E8 @ =gUnknown_2024000
ldr r0, _080335E8 @ =gBattlerStatusSummaryTaskId
adds r0, r2, r0
ldrb r1, [r0]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r4
ldr r1, _080335EC @ =sub_80491B0
ldr r1, _080335EC @ =Task_HidePartyStatusSummary
str r1, [r0]
_0803359A:
ldr r0, [r3]
@@ -10097,8 +10097,8 @@ _080335D8: .4byte gSaveBlock2Ptr
_080335DC: .4byte task05_08033660
_080335E0: .4byte gTasks
_080335E4: .4byte gBattleSpritesDataPtr
_080335E8: .4byte gUnknown_2024000
_080335EC: .4byte sub_80491B0
_080335E8: .4byte gBattlerStatusSummaryTaskId
_080335EC: .4byte Task_HidePartyStatusSummary
_080335F0: .4byte gBattlerControllerFuncs
_080335F4: .4byte nullsub_13
thumb_func_end PlayerHandleIntroTrainerBallThrow
@@ -10323,8 +10323,8 @@ _0803379C:
subs r4, 0x2
adds r3, r4
ldrb r3, [r3]
bl sub_8048D14
ldr r2, _08033824 @ =gUnknown_2024000
bl CreatePartyStatusSummarySprites
ldr r2, _08033824 @ =gBattlerStatusSummaryTaskId
ldrb r1, [r5]
adds r1, r2
movs r3, 0
@@ -10366,7 +10366,7 @@ _08033810:
_08033818: .4byte gBattleSpritesDataPtr
_0803381C: .4byte gActiveBattler
_08033820: .4byte gUnknown_2022BC8
_08033824: .4byte gUnknown_2024000
_08033824: .4byte gBattlerStatusSummaryTaskId
_08033828: .4byte gBattlerControllerFuncs
_0803382C: .4byte sub_8033830
thumb_func_end PlayerHandleDrawPartyStatusSummary
@@ -10427,14 +10427,14 @@ PlayerHandleCmd49: @ 8033878
cmp r0, 0
beq _080338AA
ldr r2, _080338BC @ =gTasks
ldr r0, _080338C0 @ =gUnknown_2024000
ldr r0, _080338C0 @ =gBattlerStatusSummaryTaskId
adds r0, r3, r0
ldrb r1, [r0]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r2
ldr r1, _080338C4 @ =sub_80491B0
ldr r1, _080338C4 @ =Task_HidePartyStatusSummary
str r1, [r0]
_080338AA:
bl PlayerBufferExecCompleted
@@ -10444,8 +10444,8 @@ _080338AA:
_080338B4: .4byte gBattleSpritesDataPtr
_080338B8: .4byte gActiveBattler
_080338BC: .4byte gTasks
_080338C0: .4byte gUnknown_2024000
_080338C4: .4byte sub_80491B0
_080338C0: .4byte gBattlerStatusSummaryTaskId
_080338C4: .4byte Task_HidePartyStatusSummary
thumb_func_end PlayerHandleCmd49
thumb_func_start sub_80338C8
asm/battle_controller_pokedude.s
+22 -22
View File
@@ -1338,7 +1338,7 @@ _08156B54:
adds r0, r7, 0
movs r2, 0x1
movs r3, 0
bl sub_8049FD8
bl MoveBattleBar
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -1714,7 +1714,7 @@ sub_8156E78: @ 8156E78
ldrb r1, [r1]
movs r2, 0
movs r3, 0
bl sub_8049FD8
bl MoveBattleBar
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -1732,7 +1732,7 @@ sub_8156E78: @ 8156E78
adds r0, r6
ldrb r0, [r0]
movs r2, 0
bl sub_8048440
bl UpdateHpTextInHealthbox
b _08156EDA
.align 2, 0
_08156EB8: .4byte gActiveBattler
@@ -4258,7 +4258,7 @@ _081583F0:
movs r0, 0x84
bl SetMultiuseSpriteTemplateToTrainerBack
ldr r5, _08158510 @ =gMultiuseSpriteTemplate
ldr r0, _08158514 @ =gUnknown_823932C
ldr r0, _08158514 @ =gTrainerFrontPicCoords
movs r1, 0x84
mov r8, r1
movs r1, 0x84
@@ -4386,7 +4386,7 @@ _081584E2:
bx r0
.align 2, 0
_08158510: .4byte gMultiuseSpriteTemplate
_08158514: .4byte gUnknown_823932C
_08158514: .4byte gTrainerFrontPicCoords
_08158518: .4byte gBattlerSpriteIds
_0815851C: .4byte gSprites
_08158520: .4byte 0x0000ff10
@@ -4622,7 +4622,7 @@ _081586FC:
lsls r0, 2
adds r2, 0x1C
adds r0, r2
ldr r1, _08158738 @ =sub_8011EA0
ldr r1, _08158738 @ =SpriteCB_FaintOpponentMon
_0815871A:
str r1, [r0]
ldr r1, _0815873C @ =gBattlerControllerFuncs
@@ -4639,7 +4639,7 @@ _0815872A:
.align 2, 0
_08158730: .4byte gSprites
_08158734: .4byte gBattlerSpriteIds
_08158738: .4byte sub_8011EA0
_08158738: .4byte SpriteCB_FaintOpponentMon
_0815873C: .4byte gBattlerControllerFuncs
_08158740: .4byte gActiveBattler
_08158744: .4byte sub_8156DCC
@@ -4808,7 +4808,7 @@ sub_8158814: @ 8158814
lsls r1, 24
orrs r3, r1
str r3, [r4]
ldr r3, _081588FC @ =gUnknown_2037EFE
ldr r3, _081588FC @ =gAnimFriendship
ldrb r1, [r6]
lsls r1, 9
mov r2, r12
@@ -4816,7 +4816,7 @@ sub_8158814: @ 8158814
adds r1, r2
ldrb r1, [r1]
strb r1, [r3]
ldr r4, _08158900 @ =gUnknown_2037F00
ldr r4, _08158900 @ =gWeatherMoveAnim
ldrb r2, [r6]
lsls r2, 9
mov r1, r12
@@ -4857,8 +4857,8 @@ _081588EC: .4byte gActiveBattler
_081588F0: .4byte gAnimMoveTurn
_081588F4: .4byte gAnimMovePower
_081588F8: .4byte gAnimMoveDmg
_081588FC: .4byte gUnknown_2037EFE
_08158900: .4byte gUnknown_2037F00
_081588FC: .4byte gAnimFriendship
_08158900: .4byte gWeatherMoveAnim
_08158904: .4byte gAnimDisableStructPtr
_08158908: .4byte gTransformedPersonalities
_0815890C:
@@ -5550,7 +5550,7 @@ _08158E80:
ldrb r0, [r0]
movs r1, 0
movs r2, 0
bl sub_8048440
bl UpdateHpTextInHealthbox
_08158EA8:
ldr r1, _08158EC4 @ =gBattlerControllerFuncs
ldr r0, _08158EC8 @ =gActiveBattler
@@ -6129,7 +6129,7 @@ sub_8159304: @ 8159304
lsls r0, 2
ldr r5, _08159444 @ =gSprites
adds r0, r5
bl oamt_add_pos2_onto_pos1
bl SetSpritePrimaryCoordsFromSecondaryCoords
ldrb r0, [r7]
adds r0, r6
ldrb r1, [r0]
@@ -6166,7 +6166,7 @@ sub_8159304: @ 8159304
adds r1, r5, 0
adds r1, 0x1C
adds r0, r1
ldr r1, _0815944C @ =sub_8075590
ldr r1, _0815944C @ =StartAnimLinearTranslation
str r1, [r0]
ldrb r2, [r7]
adds r0, r2, r6
@@ -6243,14 +6243,14 @@ sub_8159304: @ 8159304
ands r0, r1
cmp r0, 0
beq _0815941C
ldr r0, _08159468 @ =gUnknown_2024000
ldr r0, _08159468 @ =gBattlerStatusSummaryTaskId
adds r0, r2, r0
ldrb r1, [r0]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r4
ldr r1, _0815946C @ =sub_80491B0
ldr r1, _0815946C @ =Task_HidePartyStatusSummary
str r1, [r0]
_0815941C:
ldr r0, [r3]
@@ -6273,15 +6273,15 @@ _0815943C: .4byte gBattlerSpriteIds
_08159440: .4byte gActiveBattler
_08159444: .4byte gSprites
_08159448: .4byte 0x0000ffd8
_0815944C: .4byte sub_8075590
_0815944C: .4byte StartAnimLinearTranslation
_08159450: .4byte sub_80335F8
_08159454: .4byte 0x0000d6f8
_08159458: .4byte gUnknown_8239FD4
_0815945C: .4byte sub_81595EC
_08159460: .4byte gTasks
_08159464: .4byte gBattleSpritesDataPtr
_08159468: .4byte gUnknown_2024000
_0815946C: .4byte sub_80491B0
_08159468: .4byte gBattlerStatusSummaryTaskId
_0815946C: .4byte Task_HidePartyStatusSummary
_08159470: .4byte gBattlerControllerFuncs
_08159474: .4byte nullsub_99
thumb_func_end sub_8159304
@@ -6560,8 +6560,8 @@ _08159690:
subs r3, 0x2
adds r4, r3
ldrb r3, [r4]
bl sub_8048D14
ldr r2, _081596E0 @ =gUnknown_2024000
bl CreatePartyStatusSummarySprites
ldr r2, _081596E0 @ =gBattlerStatusSummaryTaskId
ldrb r1, [r5]
adds r1, r2
strb r0, [r1]
@@ -6574,7 +6574,7 @@ _081596CE:
_081596D4: .4byte gBattleSpritesDataPtr
_081596D8: .4byte gActiveBattler
_081596DC: .4byte gUnknown_2022BC8
_081596E0: .4byte gUnknown_2024000
_081596E0: .4byte gBattlerStatusSummaryTaskId
thumb_func_end sub_8159660
thumb_func_start sub_81596E4
asm/battle_interface.s
+17 -17
View File
@@ -1201,8 +1201,8 @@ _08048424:
_0804843C: .4byte 0x06010400
thumb_func_end UpdateLvlInHealthbox
thumb_func_start sub_8048440
sub_8048440: @ 8048440
thumb_func_start UpdateHpTextInHealthbox
UpdateHpTextInHealthbox: @ 8048440
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1425,7 +1425,7 @@ _08048608: .4byte gMonSpritesGfxPtr
_0804860C: .4byte gSprites
_08048610: .4byte 0x06010000
_08048614: .4byte 0x04000008
thumb_func_end sub_8048440
thumb_func_end UpdateHpTextInHealthbox
thumb_func_start sub_8048618
sub_8048618: @ 8048618
@@ -2279,8 +2279,8 @@ _08048D0C: .4byte gHealthboxSpriteIds
_08048D10: .4byte gBattlersCount
thumb_func_end sub_8048A4C
thumb_func_start sub_8048D14
sub_8048D14: @ 8048D14
thumb_func_start CreatePartyStatusSummarySprites
CreatePartyStatusSummarySprites: @ 8048D14
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2866,10 +2866,10 @@ _08049172:
.align 2, 0
_080491A8: .4byte TaskDummy
_080491AC: .4byte gTasks
thumb_func_end sub_8048D14
thumb_func_end CreatePartyStatusSummarySprites
thumb_func_start sub_80491B0
sub_80491B0: @ 80491B0
thumb_func_start Task_HidePartyStatusSummary
Task_HidePartyStatusSummary: @ 80491B0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -3099,7 +3099,7 @@ _0804936E:
.align 2, 0
_08049380: .4byte gTasks
_08049384: .4byte sub_804948C
thumb_func_end sub_80491B0
thumb_func_end Task_HidePartyStatusSummary
thumb_func_start sub_8049388
sub_8049388: @ 8049388
@@ -4426,7 +4426,7 @@ _08049E0C:
asrs r1, 16
adds r0, r6, 0
movs r2, 0
bl sub_8048440
bl UpdateHpTextInHealthbox
_08049E26:
cmp r7, 0x2
beq _08049E2E
@@ -4441,7 +4441,7 @@ _08049E2E:
asrs r1, 16
adds r0, r6, 0
movs r2, 0x1
bl sub_8048440
bl UpdateHpTextInHealthbox
_08049E44:
cmp r7, 0x5
beq _08049E4C
@@ -4468,7 +4468,7 @@ _08049E4C:
adds r1, r6, 0
movs r2, 0
movs r3, 0
bl sub_8049FD8
bl MoveBattleBar
_08049E80:
bl IsDoubleBattle
lsls r0, 24
@@ -4530,7 +4530,7 @@ _08049E96:
adds r1, r6, 0
movs r2, 0x1
movs r3, 0
bl sub_8049FD8
bl MoveBattleBar
_08049F06:
cmp r7, 0x4
beq _08049F0E
@@ -4607,7 +4607,7 @@ _08049F74:
adds r1, r6, 0
movs r2, 0
movs r3, 0
bl sub_8049FD8
bl MoveBattleBar
_08049FA8:
cmp r7, 0x4
beq _08049FB0
@@ -4636,8 +4636,8 @@ _08049FC6:
bx r0
thumb_func_end UpdateHealthboxAttribute
thumb_func_start sub_8049FD8
sub_8049FD8: @ 8049FD8
thumb_func_start MoveBattleBar
MoveBattleBar: @ 8049FD8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -4765,7 +4765,7 @@ _0804A0BE:
bx r1
.align 2, 0
_0804A0D0: .4byte gBattleSpritesDataPtr
thumb_func_end sub_8049FD8
thumb_func_end MoveBattleBar
thumb_func_start sub_804A0D4
sub_804A0D4: @ 804A0D4
asm/battle_tower.s
+3 -3
View File
@@ -929,8 +929,8 @@ _080E6062:
_080E6074: .4byte gSaveBlock2Ptr
thumb_func_end sub_80E5E7C
thumb_func_start sub_80E6078
sub_80E6078: @ 80E6078
thumb_func_start GetBattleTowerTrainerFrontSpriteId
GetBattleTowerTrainerFrontSpriteId: @ 80E6078
push {lr}
ldr r0, _080E6094 @ =gSaveBlock2Ptr
ldr r3, [r0]
@@ -983,7 +983,7 @@ _080E60D6:
.align 2, 0
_080E60DC: .4byte gFacilityClassToPicIndex
_080E60E0: .4byte gUnknown_83FFAC4
thumb_func_end sub_80E6078
thumb_func_end GetBattleTowerTrainerFrontSpriteId
thumb_func_start sub_80E60E4
sub_80E60E4: @ 80E60E4
asm/bug.s
+6 -6
View File
@@ -86,7 +86,7 @@ _080B4008:
ldrh r4, [r4, 0x6]
adds r0, r4
strh r0, [r6, 0x36]
ldr r0, _080B4074 @ =sub_8075590
ldr r0, _080B4074 @ =StartAnimLinearTranslation
str r0, [r6, 0x1C]
ldr r1, _080B4078 @ =DestroyAnimSprite
adds r0, r6, 0
@@ -97,7 +97,7 @@ _080B4008:
.align 2, 0
_080B406C: .4byte gBattleAnimTarget
_080B4070: .4byte gBattleAnimArgs
_080B4074: .4byte sub_8075590
_080B4074: .4byte StartAnimLinearTranslation
_080B4078: .4byte DestroyAnimSprite
thumb_func_end sub_80B3FAC
@@ -166,7 +166,7 @@ _080B40BC:
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x36]
ldr r0, _080B4120 @ =sub_8075590
ldr r0, _080B4120 @ =StartAnimLinearTranslation
str r0, [r6, 0x1C]
ldr r1, _080B4124 @ =DestroyAnimSprite
adds r0, r6, 0
@@ -177,7 +177,7 @@ _080B40BC:
.align 2, 0
_080B4118: .4byte gBattleAnimTarget
_080B411C: .4byte gBattleAnimArgs
_080B4120: .4byte sub_8075590
_080B4120: .4byte StartAnimLinearTranslation
_080B4124: .4byte DestroyAnimSprite
thumb_func_end sub_80B407C
@@ -603,7 +603,7 @@ _080B43F6:
strh r0, [r7, 0x2E]
strh r4, [r7, 0x32]
strh r5, [r7, 0x36]
ldr r0, _080B448C @ =sub_8075590
ldr r0, _080B448C @ =StartAnimLinearTranslation
str r0, [r7, 0x1C]
ldr r1, _080B4490 @ =DestroyAnimSprite
adds r0, r7, 0
@@ -616,7 +616,7 @@ _080B43F6:
_080B4480: .4byte gBattleAnimAttacker
_080B4484: .4byte gBattleAnimArgs
_080B4488: .4byte gBattleAnimTarget
_080B448C: .4byte sub_8075590
_080B448C: .4byte StartAnimLinearTranslation
_080B4490: .4byte DestroyAnimSprite
thumb_func_end sub_80B4364
asm/dragon.s
+2 -2
View File
@@ -152,7 +152,7 @@ _080B7386:
ldr r0, _080B73A0 @ =gBattleAnimArgs
ldrh r0, [r0, 0x8]
strh r0, [r5, 0x2E]
ldr r0, _080B73A4 @ =sub_8075590
ldr r0, _080B73A4 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080B73A8 @ =move_anim_8074EE0
adds r0, r5, 0
@@ -162,7 +162,7 @@ _080B7386:
bx r0
.align 2, 0
_080B73A0: .4byte gBattleAnimArgs
_080B73A4: .4byte sub_8075590
_080B73A4: .4byte StartAnimLinearTranslation
_080B73A8: .4byte move_anim_8074EE0
thumb_func_end sub_80B72F8
asm/fighting.s
+6 -6
View File
@@ -399,7 +399,7 @@ _080B0BB6:
ldrh r0, [r4, 0x22]
subs r0, 0x14
strh r0, [r4, 0x36]
ldr r0, _080B0BD0 @ =sub_8075590
ldr r0, _080B0BD0 @ =StartAnimLinearTranslation
str r0, [r4, 0x1C]
ldr r1, _080B0BD4 @ =sub_80B0BD8
adds r0, r4, 0
@@ -408,7 +408,7 @@ _080B0BB6:
pop {r0}
bx r0
.align 2, 0
_080B0BD0: .4byte sub_8075590
_080B0BD0: .4byte StartAnimLinearTranslation
_080B0BD4: .4byte sub_80B0BD8
thumb_func_end sub_80B0B80
@@ -440,7 +440,7 @@ sub_80B0BD8: @ 80B0BD8
strh r1, [r5, 0x22]
strh r6, [r5, 0x26]
strh r6, [r5, 0x24]
ldr r0, _080B0C20 @ =sub_8075590
ldr r0, _080B0C20 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080B0C24 @ =DestroyAnimSprite
adds r0, r5, 0
@@ -450,7 +450,7 @@ _080B0C18:
pop {r0}
bx r0
.align 2, 0
_080B0C20: .4byte sub_8075590
_080B0C20: .4byte StartAnimLinearTranslation
_080B0C24: .4byte DestroyAnimSprite
thumb_func_end sub_80B0BD8
@@ -654,7 +654,7 @@ sub_80B0D7C: @ 80B0D7C
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
ldr r0, _080B0DCC @ =sub_8075590
ldr r0, _080B0DCC @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080B0DD0 @ =sub_80B0DD4
adds r0, r5, 0
@@ -665,7 +665,7 @@ _080B0DC0:
bx r0
.align 2, 0
_080B0DC8: .4byte gBattleAnimTarget
_080B0DCC: .4byte sub_8075590
_080B0DCC: .4byte StartAnimLinearTranslation
_080B0DD0: .4byte sub_80B0DD4
thumb_func_end sub_80B0D7C
asm/fire.s
+2 -2
View File
@@ -367,14 +367,14 @@ sub_80ACBB0: @ 80ACBB0
strh r1, [r0, 0x32]
movs r1, 0x50
strh r1, [r0, 0x36]
ldr r1, _080ACBD4 @ =sub_8075590
ldr r1, _080ACBD4 @ =StartAnimLinearTranslation
str r1, [r0, 0x1C]
ldr r1, _080ACBD8 @ =DestroyAnimSprite
bl StoreSpriteCallbackInData6
pop {r0}
bx r0
.align 2, 0
_080ACBD4: .4byte sub_8075590
_080ACBD4: .4byte StartAnimLinearTranslation
_080ACBD8: .4byte DestroyAnimSprite
thumb_func_end sub_80ACBB0
asm/flying.s
+2 -2
View File
@@ -376,7 +376,7 @@ _080B1B72:
ldrh r3, [r5, 0x36]
adds r0, r3
strh r0, [r5, 0x36]
ldr r0, _080B1BA8 @ =sub_8075590
ldr r0, _080B1BA8 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080B1BAC @ =DestroyAnimSprite
adds r0, r5, 0
@@ -390,7 +390,7 @@ _080B1B72:
.align 2, 0
_080B1BA0: .4byte gBattleAnimTarget
_080B1BA4: .4byte gBattleAnimArgs
_080B1BA8: .4byte sub_8075590
_080B1BA8: .4byte StartAnimLinearTranslation
_080B1BAC: .4byte DestroyAnimSprite
thumb_func_end sub_80B1AB8
asm/ground.s
+4 -4
View File
@@ -155,7 +155,7 @@ _080B8C74:
ldrh r4, [r4, 0x6]
adds r0, r4
strh r0, [r6, 0x36]
ldr r0, _080B8CC0 @ =sub_8075590
ldr r0, _080B8CC0 @ =StartAnimLinearTranslation
str r0, [r6, 0x1C]
ldr r1, _080B8CC4 @ =DestroyAnimSprite
adds r0, r6, 0
@@ -167,7 +167,7 @@ _080B8C74:
_080B8CB4: .4byte gBattleAnimAttacker
_080B8CB8: .4byte gBattleAnimArgs
_080B8CBC: .4byte gBattleAnimTarget
_080B8CC0: .4byte sub_8075590
_080B8CC0: .4byte StartAnimLinearTranslation
_080B8CC4: .4byte DestroyAnimSprite
thumb_func_end sub_80B8C54
@@ -222,7 +222,7 @@ _080B8D20:
strh r0, [r6, 0x32]
adds r0, r7, r4
strh r0, [r6, 0x36]
ldr r0, _080B8D50 @ =sub_8075590
ldr r0, _080B8D50 @ =StartAnimLinearTranslation
str r0, [r6, 0x1C]
ldr r1, _080B8D54 @ =move_anim_8074EE0
adds r0, r6, 0
@@ -235,7 +235,7 @@ _080B8D20:
.align 2, 0
_080B8D48: .4byte gBattleAnimTarget
_080B8D4C: .4byte gBattleAnimArgs
_080B8D50: .4byte sub_8075590
_080B8D50: .4byte StartAnimLinearTranslation
_080B8D54: .4byte move_anim_8074EE0
thumb_func_end sub_80B8CC8
asm/ice.s
+2 -2
View File
@@ -429,7 +429,7 @@ _080AF37A:
ldr r1, _080AF3B0 @ =DestroyAnimSprite
adds r0, r4, 0
bl StoreSpriteCallbackInData6
ldr r0, _080AF3B4 @ =sub_8075590
ldr r0, _080AF3B4 @ =StartAnimLinearTranslation
str r0, [r4, 0x1C]
pop {r4}
pop {r0}
@@ -438,7 +438,7 @@ _080AF37A:
_080AF3A8: .4byte gBattleAnimArgs
_080AF3AC: .4byte gBattleAnimTarget
_080AF3B0: .4byte DestroyAnimSprite
_080AF3B4: .4byte sub_8075590
_080AF3B4: .4byte StartAnimLinearTranslation
thumb_func_end sub_80AF330
thumb_func_start sub_80AF3B8
asm/poison.s
+2 -2
View File
@@ -253,7 +253,7 @@ _080B17F0:
strh r2, [r4, 0x32]
adds r1, r3
strh r1, [r4, 0x36]
ldr r0, _080B1830 @ =sub_8075590
ldr r0, _080B1830 @ =StartAnimLinearTranslation
str r0, [r4, 0x1C]
ldr r1, _080B1834 @ =DestroyAnimSprite
adds r0, r4, 0
@@ -265,7 +265,7 @@ _080B17F0:
_080B1824: .4byte gBattleAnimTarget
_080B1828: .4byte gBattleAnimAttacker
_080B182C: .4byte gBattleAnimArgs
_080B1830: .4byte sub_8075590
_080B1830: .4byte StartAnimLinearTranslation
_080B1834: .4byte DestroyAnimSprite
thumb_func_end sub_80B17C4
asm/rock.s
+2 -2
View File
@@ -682,7 +682,7 @@ sub_80B4B8C: @ 80B4B8C
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x36]
ldr r0, _080B4BC8 @ =sub_8075590
ldr r0, _080B4BC8 @ =StartAnimLinearTranslation
str r0, [r4, 0x1C]
ldr r1, _080B4BCC @ =DestroyAnimSprite
adds r0, r4, 0
@@ -692,7 +692,7 @@ sub_80B4B8C: @ 80B4B8C
bx r0
.align 2, 0
_080B4BC4: .4byte gBattleAnimArgs
_080B4BC8: .4byte sub_8075590
_080B4BC8: .4byte StartAnimLinearTranslation
_080B4BCC: .4byte DestroyAnimSprite
thumb_func_end sub_80B4B8C
asm/water.s
+4 -4
View File
@@ -891,7 +891,7 @@ _080AB27A:
ldrh r5, [r5, 0x6]
adds r0, r5
strh r0, [r6, 0x36]
ldr r0, _080AB2C4 @ =sub_8075590
ldr r0, _080AB2C4 @ =StartAnimLinearTranslation
str r0, [r6, 0x1C]
ldr r1, _080AB2C8 @ =DestroyAnimSprite
adds r0, r6, 0
@@ -903,7 +903,7 @@ _080AB27A:
_080AB2B8: .4byte gBattleAnimAttacker
_080AB2BC: .4byte gBattleAnimTarget
_080AB2C0: .4byte gBattleAnimArgs
_080AB2C4: .4byte sub_8075590
_080AB2C4: .4byte StartAnimLinearTranslation
_080AB2C8: .4byte DestroyAnimSprite
thumb_func_end sub_80AB1F8
@@ -923,7 +923,7 @@ sub_80AB2CC: @ 80AB2CC
ldrh r0, [r4, 0x22]
adds r1, r0
strh r1, [r4, 0x36]
ldr r0, _080AB300 @ =sub_8075590
ldr r0, _080AB300 @ =StartAnimLinearTranslation
str r0, [r4, 0x1C]
ldr r1, _080AB304 @ =DestroyAnimSprite
adds r0, r4, 0
@@ -933,7 +933,7 @@ sub_80AB2CC: @ 80AB2CC
bx r0
.align 2, 0
_080AB2FC: .4byte gBattleAnimArgs
_080AB300: .4byte sub_8075590
_080AB300: .4byte StartAnimLinearTranslation
_080AB304: .4byte DestroyAnimSprite
thumb_func_end sub_80AB2CC
data/data.s
+2 -3
View File
@@ -145,7 +145,7 @@ gMonShinyPaletteTable:: @ 82380CC
gTrainerFrontAnimsPtrTable:: @ 82390DC
.incbin "baserom.gba", 0x2390DC, 0x250
gUnknown_823932C:: @ 823932C
gTrainerFrontPicCoords:: @ 823932C
.incbin "baserom.gba", 0x23932C, 0x250
gTrainerFrontPicTable:: @ 823957C
@@ -350,8 +350,7 @@ gSpriteSheet_EnemyShadow:: @ 8250A0C
gSpriteTemplate_EnemyShadow:: @ 8250A1C
.incbin "baserom.gba", 0x250A1C, 0x18
gUnknown_8250A34:: @ 8250A34
.incbin "baserom.gba", 0x250A34, 0xEC
.section .rodata.8250B20
gUnknown_8250B20:: @ 8250B20
.incbin "baserom.gba", 0x250B20, 0xE4
include/battle.h
+18 -25
View File
@@ -2,8 +2,6 @@
#define GUARD_BATTLE_H
#include "global.h"
// should they be included here or included individually by every file?
#include "constants/battle.h"
#include "battle_util.h"
#include "battle_script_commands.h"
@@ -19,8 +17,6 @@
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
@@ -209,10 +205,10 @@ struct TrainerMonItemCustomMoves
union TrainerMonPtr
{
struct TrainerMonNoItemDefaultMoves* NoItemDefaultMoves;
struct TrainerMonNoItemCustomMoves* NoItemCustomMoves;
struct TrainerMonItemDefaultMoves* ItemDefaultMoves;
struct TrainerMonItemCustomMoves* ItemCustomMoves;
struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves;
struct TrainerMonNoItemCustomMoves *NoItemCustomMoves;
struct TrainerMonItemDefaultMoves *ItemDefaultMoves;
struct TrainerMonItemCustomMoves *ItemCustomMoves;
};
struct Trainer
@@ -278,7 +274,7 @@ struct DisableStruct
/*0x1A*/ u8 unk1A[2];
};
extern struct DisableStruct gDisableStructs[BATTLE_BANKS_COUNT];
extern struct DisableStruct gDisableStructs[MAX_BATTLERS_COUNT];
struct ProtectStruct
{
@@ -318,7 +314,7 @@ struct ProtectStruct
/* field_E */ u16 fieldE;
};
extern struct ProtectStruct gProtectStructs[BATTLE_BANKS_COUNT];
extern struct ProtectStruct gProtectStructs[MAX_BATTLERS_COUNT];
struct SpecialStatus
{
@@ -340,7 +336,7 @@ struct SpecialStatus
u8 field13;
};
extern struct SpecialStatus gSpecialStatuses[BATTLE_BANKS_COUNT];
extern struct SpecialStatus gSpecialStatuses[MAX_BATTLERS_COUNT];
struct SideTimer
{
@@ -463,7 +459,7 @@ struct BattleResources
struct BattleScriptsStack *AI_ScriptsStack;
};
extern struct BattleResources* gBattleResources;
extern struct BattleResources *gBattleResources;
#define BATTLESCRIPTS_STACK (gBattleResources->battleScriptsStack)
#define BATTLE_CALLBACKS_STACK (gBattleResources->battleCallbackStack)
@@ -546,15 +542,12 @@ struct BattleStruct
u8 field_8C;
u8 field_8D;
u8 stringMoveType;
u8 expGetterBank;
u8 expGetterBattlerId;
u8 field_90;
u8 field_91;
u8 field_92;
u8 field_93;
u8 wallyBattleState;
u8 wallyMovesState;
u8 wallyWaitFrames;
u8 wallyMoveFrames;
u8 AI_monToSwitchIntoId[MAX_BATTLERS_COUNT];
u8 field_96;
u8 field_97;
u8 lastTakenMove[MAX_BATTLERS_COUNT * 2 * 2]; // ask gamefreak why they declared it that way
u16 hpOnSwitchout[2];
u8 abilityPreventingSwitchout;
@@ -569,7 +562,6 @@ struct BattleStruct
u8 field_B5;
u8 field_B6;
u8 atkCancellerTracker;
// void (*savedCallback)(void);
u16 usedHeldItems[MAX_BATTLERS_COUNT];
u8 chosenItem[4]; // why is this an u8?
u8 AI_itemType[2];
@@ -859,8 +851,7 @@ struct BattleHealthboxInfo
u8 specialAnimActive : 1; //x40
u8 flag_x80 : 1;
u8 field_1_x1 : 1;
u8 field_1_x1E : 4;
u8 field_1_x20 : 1;
u8 field_1_x1E : 5;
u8 field_1_x40 : 1;
u8 field_1_x80 : 1;
u8 healthboxBounceSpriteId;
@@ -879,7 +870,7 @@ struct BattleBarInfo
{
u8 healthboxSpriteId;
s32 maxValue;
s32 currentValue;
s32 oldValue;
s32 receivedValue;
s32 currValue;
};
@@ -930,11 +921,11 @@ extern u16 gBattle_WIN0H;
extern u16 gBattle_WIN0V;
extern u16 gBattle_WIN1H;
extern u16 gBattle_WIN1V;
extern struct BattleSpritesGfx* gMonSpritesGfx;
extern struct BattleSpritesGfx *gMonSpritesGfx;
extern u8 gBattleOutcome;
extern u16 gLastUsedItem;
extern u32 gBattleTypeFlags;
extern struct MonSpritesGfx* gMonSpritesGfxPtr;
extern struct MonSpritesGfx *gMonSpritesGfxPtr;
extern u16 gTrainerBattleOpponent_A;
extern u16 gMoveToLearn;
extern u16 gBattleMovePower;
@@ -991,5 +982,7 @@ extern u8 gTakenDmgByBattler[MAX_BATTLERS_COUNT];
extern u8 gCurrentActionFuncId;
extern u8 gCurrMovePos;
extern u8 gChosenMovePos;
extern u8 gUnknown_3004FFC[MAX_BATTLERS_COUNT];
extern u8 gBattlerStatusSummaryTaskId[MAX_BATTLERS_COUNT];
#endif // GUARD_BATTLE_H
include/battle_2.h
+1 -1
View File
@@ -10,7 +10,6 @@ void CB2_QuitRecordedBattle(void);
void sub_8038528(struct Sprite* sprite);
void sub_8038A04(void); // unused
void VBlankCB_Battle(void);
void nullsub_17(void);
void sub_8038B74(struct Sprite *sprite);
void sub_8038D64(void);
u32 sub_80391E0(u8 arrayId, u8 caseId);
@@ -48,6 +47,7 @@ void sub_800FD9C(void);
void sub_80120C4(struct Sprite *);
void sub_8012100(struct Sprite *);
void nullsub_12(void);
void SpriteCB_FaintOpponentMon(struct Sprite *sprite);
extern const u8 gStatusConditionString_PoisonJpn[8];
extern const u8 gStatusConditionString_SleepJpn[8];
include/battle_ai_script_commands.h
+7 -1
View File
@@ -3,13 +3,19 @@
#include "global.h"
// return values for BattleAI_ChooseMoveOrAction
// 0 - 3 are move idx
#define AI_CHOICE_FLEE 4
#define AI_CHOICE_WATCH 5
void BattleAI_HandleItemUseBeforeAISetup(void);
void BattleAI_SetupAIData(u8 defaultScoreMoves);
void BattleAI_SetupAIData(void);
u8 BattleAI_ChooseMoveOrAction(void);
void ClearBankMoveHistory(u8 bank);
void RecordAbilityBattle(u8 bank, u8 abilityId);
void ClearBankAbilityHistory(u8 bank);
void RecordItemEffectBattle(u8 bank, u8 itemEffect);
void ClearBankItemEffectHistory(u8 bank);
u8 BattleAI_GetAIActionToUse(void);
#endif // GUARD_BATTLE_AI_SCRIPT_COMMANDS_H
include/battle_anim.h
+5 -1
View File
@@ -96,6 +96,9 @@ void sub_80A6B90(struct BattleAnimBgData *, u32 arg1);
u8 sub_80A82E4(u8 bank);
bool8 AnimateBallThrow(struct Sprite *sprite);
// battle_anim_special
void sub_80F1720(u8 battler, struct Pokemon *mon);
enum
{
BATTLER_COORD_X,
@@ -125,7 +128,7 @@ bool8 IsDoubleBattle(void);
u8 sub_80A6D94(void);
u8 sub_80A8364(u8);
void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite*));
void oamt_add_pos2_onto_pos1(struct Sprite *sprite);
void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite);
u8 GetBattlerSpriteDefault_Y(u8 bank);
u8 sub_80A82E4(u8 bank);
u8 GetSubstituteSpriteDefault_Y(u8 bank);
@@ -150,6 +153,7 @@ bool8 IsContest(void);
void sub_80759DC(u8 spriteId);
bool8 IsBattlerSpritePresent(u8 battlerId);
u8 GetBattlerSpriteSubpriority(u8 battlerId);
void StartAnimLinearTranslation(struct Sprite *sprite);
// battle_anim_mon_movement.c
void AnimTask_ShakeMon(u8 taskId);
include/battle_controllers.h
+7
View File
@@ -174,6 +174,7 @@ enum
CONTROLLER_CMDS_COUNT
};
extern struct UnusedControllerStruct gUnknown_2022870;
// general functions
void HandleLinkBattleSetup(void);
@@ -243,6 +244,7 @@ void SetControllerToRecordedPlayer(void);
// opponent controller
void SetControllerToOpponent(void);
void OpponentBufferExecCompleted(void);
// player partner controller
void SetControllerToPlayerPartner(void);
@@ -255,6 +257,11 @@ void SetControllerToPokedude(void);
// oak controller
void SetControllerToOakOrOldman(void);
bool8 sub_80EB2E0(u8);
void sub_80EB2F4(u8);
void sub_80E8570(void);
void sub_80E85C0(void);
void sub_80E8598(void);
// link opponent
void SetControllerToLinkOpponent(void);
include/battle_interface.h
+2
View File
@@ -61,6 +61,7 @@ enum
HEALTHBOX_SAFARI_BALLS_TEXT
};
void Task_HidePartyStatusSummary(u8 taskId);
u8 CreateBattlerHealthboxSprites(u8 bank);
u8 CreateSafariPlayerHealthboxSprites(void);
void SetBattleBarStruct(u8 bank, u8 healthboxSpriteId, s32 maxVal, s32 currVal, s32 receivedValue);
@@ -80,5 +81,6 @@ u8 GetScaledHPFraction(s16 hp, s16 maxhp, u8 scale);
u8 GetHPBarLevel(s16 hp, s16 maxhp);
void sub_80496C0(u8 spriteId, struct Pokemon *mon);
void sub_804981C(u8 spriteId, u8);
s32 MoveBattleBar(u8 battler, u8 healthboxSpriteId, u8 whichBar, u8 arg3);
#endif // GUARD_BATTLE_INTERFACE_H
include/battle_tower.h
+2
View File
@@ -6,5 +6,7 @@
u16 sub_8164FCC(u8, u8);
void sub_80E7524(u32 *);
void ValidateEReaderTrainer(void);
u8 GetBattleTowerTrainerFrontSpriteId(void);
u8 GetEreaderTrainerFrontSpriteId(void);
#endif //GUARD_BATTLE_TOWER_H
include/pokemon.h
+5 -5
View File
@@ -50,7 +50,7 @@
#define MON_DATA_SPATK_IV 43
#define MON_DATA_SPDEF_IV 44
#define MON_DATA_IS_EGG 45
#define MON_DATA_ALT_ABILITY 46
#define MON_DATA_ABILITY_NUM 46
#define MON_DATA_TOUGH 47
#define MON_DATA_SHEEN 48
#define MON_DATA_OT_GENDER 49
@@ -244,7 +244,7 @@ struct PokemonSubstruct3
/* 0x05 */ u32 spAttackIV:5;
/* 0x06 */ u32 spDefenseIV:5;
/* 0x07 */ u32 isEgg:1;
/* 0x07 */ u32 altAbility:1;
/* 0x07 */ u32 abilityNum:1;
/* 0x08 */ u32 coolRibbon:3;
/* 0x08 */ u32 beautyRibbon:3;
@@ -342,7 +342,7 @@ struct BattleTowerPokemon
u32 spAttackIV:5;
u32 spDefenseIV:5;
u32 gap:1;
u32 altAbility:1;
u32 abilityNum:1;
/*0x1C*/ u32 personality;
/*0x20*/ u8 nickname[POKEMON_NAME_LENGTH + 1];
/*0x2B*/ u8 friendship;
@@ -366,7 +366,7 @@ struct BattlePokemon
/*0x16*/ u32 spAttackIV:5;
/*0x17*/ u32 spDefenseIV:5;
/*0x17*/ u32 isEgg:1;
/*0x17*/ u32 altAbility:1;
/*0x17*/ u32 abilityNum:1;
/*0x18*/ s8 statStages[BATTLE_STATS_NO];
/*0x20*/ u8 ability;
/*0x21*/ u8 type1;
@@ -598,7 +598,7 @@ u8 GiveMonToPlayer(struct Pokemon *mon);
u8 CalculatePlayerPartyCount(void);
u8 CalculateEnemyPartyCount(void);
u8 GetMonsStateToDoubles(void);
u8 GetAbilityBySpecies(u16 species, bool8 altAbility);
u8 GetAbilityBySpecies(u16 species, bool8 abilityNum);
u8 GetMonAbility(struct Pokemon *mon);
u8 GetSecretBaseTrainerPicIndex(void);
u8 GetSecretBaseTrainerNameIndex(void);
include/trainer_tower.h
+1
View File
@@ -4,5 +4,6 @@
void PrintTrainerTowerRecords(void);
void InitTrainerTowerBattleStruct(void);
void FreeTrainerTowerBattleStruct(void);
u8 GetTrainerTowerTrainerFrontSpriteId(void);
#endif //GUARD_TRAINER_TOWER_H
ld_script.txt
+3 -1
View File
@@ -72,7 +72,7 @@ SECTIONS {
src/battle_util2.o(.text);
asm/battle_controller_player.o(.text);
src/battle_gfx_sfx_util.o(.text);
asm/battle_controller_opponent.o(.text);
src/battle_controller_opponent.o(.text);
asm/battle_ai_switch_items.o(.text);
asm/battle_controller_link_opponent.o(.text);
src/pokemon.o(.text);
@@ -382,6 +382,8 @@ SECTIONS {
data/data.o(.rodata);
src/battle_util.o(.rodata);
data/data.o(.rodata.825011C);
src/battle_controller_opponent.o(.rodata);
data/data.o(.rodata.8250B20);
src/pokemon.o(.rodata);
src/trig.o(.rodata);
src/util.o(.rodata);
src/battle_controller_opponent.c
+1788
View File
File diff suppressed because it is too large Load Diff
src/battle_controller_safari.c
+6 -6
View File
@@ -260,7 +260,7 @@ static void sub_80DD7B0(void)
}
}
static void CompleteOnSpecialAnimDone_0(void)
static void CompleteOnSpecialAnimDone(void)
{
if (!gDoingBattleAnim || !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
SafariBufferExecCompleted();
@@ -281,7 +281,7 @@ static void CompleteWhenChosePokeblock(void)
}
}
static void CompleteOnFinishedBattleAnimation_3(void)
static void CompleteOnFinishedBattleAnimation(void)
{
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animFromTableActive)
SafariBufferExecCompleted();
@@ -304,7 +304,7 @@ static void SafariBufferExecCompleted(void)
}
// not used
static void CompleteOnFinishedStatusAnimation_3(void)
static void CompleteOnFinishedStatusAnimation(void)
{
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].statusAnimActive)
SafariBufferExecCompleted();
@@ -385,7 +385,7 @@ static void SafariHandleSuccessBallThrowAnim(void)
gBattleSpritesDataPtr->animationData->ballThrowCaseId = BALL_3_SHAKES_SUCCESS;
gDoingBattleAnim = TRUE;
InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
gBattlerControllerFuncs[gActiveBattler] = CompleteOnSpecialAnimDone_0;
gBattlerControllerFuncs[gActiveBattler] = CompleteOnSpecialAnimDone;
}
static void SafariHandleBallThrowAnim(void)
@@ -395,7 +395,7 @@ static void SafariHandleBallThrowAnim(void)
gBattleSpritesDataPtr->animationData->ballThrowCaseId = ballThrowCaseId;
gDoingBattleAnim = TRUE;
InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
gBattlerControllerFuncs[gActiveBattler] = CompleteOnSpecialAnimDone_0;
gBattlerControllerFuncs[gActiveBattler] = CompleteOnSpecialAnimDone;
}
static void SafariHandlePause(void)
@@ -649,7 +649,7 @@ static void SafariHandleBattleAnimation(void)
if (TryHandleLaunchBattleTableAnimation(gActiveBattler, gActiveBattler, gActiveBattler, animationId, argument))
SafariBufferExecCompleted();
else
gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation_3;
gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
}
static void SafariHandleLinkStandbyMsg(void)
src/pokemon.c
+14 -14
View File
@@ -1791,7 +1791,7 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV,
if (gBaseStats[species].abilities[1])
{
value = personality & 1;
SetBoxMonData(boxMon, MON_DATA_ALT_ABILITY, &value);
SetBoxMonData(boxMon, MON_DATA_ABILITY_NUM, &value);
}
GiveBoxMonInitialMoveset(boxMon);
@@ -1940,8 +1940,8 @@ void CreateBattleTowerMon(struct Pokemon *mon, struct BattleTowerPokemon *src)
SetMonData(mon, MON_DATA_SPEED_EV, &src->speedEV);
SetMonData(mon, MON_DATA_SPATK_EV, &src->spAttackEV);
SetMonData(mon, MON_DATA_SPDEF_EV, &src->spDefenseEV);
value = src->altAbility;
SetMonData(mon, MON_DATA_ALT_ABILITY, &value);
value = src->abilityNum;
SetMonData(mon, MON_DATA_ABILITY_NUM, &value);
value = src->hpIV;
SetMonData(mon, MON_DATA_HP_IV, &value);
value = src->attackIV;
@@ -1997,7 +1997,7 @@ void sub_803E23C(struct Pokemon *mon, struct BattleTowerPokemon *dest)
dest->speedIV = GetMonData(mon, MON_DATA_SPEED_IV, NULL);
dest->spAttackIV = GetMonData(mon, MON_DATA_SPATK_IV, NULL);
dest->spDefenseIV = GetMonData(mon, MON_DATA_SPDEF_IV, NULL);
dest->altAbility = GetMonData(mon, MON_DATA_ALT_ABILITY, NULL);
dest->abilityNum = GetMonData(mon, MON_DATA_ABILITY_NUM, NULL);
dest->personality = GetMonData(mon, MON_DATA_PERSONALITY, NULL);
GetMonData(mon, MON_DATA_NICKNAME, dest->nickname);
}
@@ -3099,8 +3099,8 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data)
case MON_DATA_IS_EGG:
retVal = substruct3->isEgg;
break;
case MON_DATA_ALT_ABILITY:
retVal = substruct3->altAbility;
case MON_DATA_ABILITY_NUM:
retVal = substruct3->abilityNum;
break;
case MON_DATA_COOL_RIBBON:
retVal = substruct3->coolRibbon;
@@ -3502,8 +3502,8 @@ void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg)
else
boxMon->isEgg = 0;
break;
case MON_DATA_ALT_ABILITY:
SET8(substruct3->altAbility);
case MON_DATA_ABILITY_NUM:
SET8(substruct3->abilityNum);
break;
case MON_DATA_COOL_RIBBON:
SET8(substruct3->coolRibbon);
@@ -3698,9 +3698,9 @@ u8 GetMonsStateToDoubles(void)
return (aliveCount > 1) ? PLAYER_HAS_TWO_USABLE_MONS : PLAYER_HAS_ONE_USABLE_MON;
}
u8 GetAbilityBySpecies(u16 species, bool8 altAbility)
u8 GetAbilityBySpecies(u16 species, bool8 abilityNum)
{
if (altAbility)
if (abilityNum)
gLastUsedAbility = gBaseStats[species].abilities[1];
else
gLastUsedAbility = gBaseStats[species].abilities[0];
@@ -3711,8 +3711,8 @@ u8 GetAbilityBySpecies(u16 species, bool8 altAbility)
u8 GetMonAbility(struct Pokemon *mon)
{
u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL);
u8 altAbility = GetMonData(mon, MON_DATA_ALT_ABILITY, NULL);
return GetAbilityBySpecies(species, altAbility);
u8 abilityNum = GetMonData(mon, MON_DATA_ABILITY_NUM, NULL);
return GetAbilityBySpecies(species, abilityNum);
}
static void CreateSecretBaseEnemyParty(struct SecretBaseRecord *secretBaseRecord)
@@ -3858,11 +3858,11 @@ static void CopyPlayerPartyMonToBattleData(u8 battlerId, u8 partyIndex)
gBattleMons[battlerId].spAttack = GetMonData(&gPlayerParty[partyIndex], MON_DATA_SPATK, NULL);
gBattleMons[battlerId].spDefense = GetMonData(&gPlayerParty[partyIndex], MON_DATA_SPDEF, NULL);
gBattleMons[battlerId].isEgg = GetMonData(&gPlayerParty[partyIndex], MON_DATA_IS_EGG, NULL);
gBattleMons[battlerId].altAbility = GetMonData(&gPlayerParty[partyIndex], MON_DATA_ALT_ABILITY, NULL);
gBattleMons[battlerId].abilityNum = GetMonData(&gPlayerParty[partyIndex], MON_DATA_ABILITY_NUM, NULL);
gBattleMons[battlerId].otId = GetMonData(&gPlayerParty[partyIndex], MON_DATA_OT_ID, NULL);
gBattleMons[battlerId].type1 = gBaseStats[gBattleMons[battlerId].species].type1;
gBattleMons[battlerId].type2 = gBaseStats[gBattleMons[battlerId].species].type2;
gBattleMons[battlerId].ability = GetAbilityBySpecies(gBattleMons[battlerId].species, gBattleMons[battlerId].altAbility);
gBattleMons[battlerId].ability = GetAbilityBySpecies(gBattleMons[battlerId].species, gBattleMons[battlerId].abilityNum);
GetMonData(&gPlayerParty[partyIndex], MON_DATA_NICKNAME, nickname);
StringCopy10(gBattleMons[battlerId].nickname, nickname);
GetMonData(&gPlayerParty[partyIndex], MON_DATA_OT_NAME, gBattleMons[battlerId].otName);
src/trainer_tower.c
+1 -1
View File
@@ -626,7 +626,7 @@ void sub_815DA28(u8 * dest)
StringCopyN(dest, gUnknown_203F45C->unk_00, 11);
}
u8 sub_815DA3C(void)
u8 GetTrainerTowerTrainerFrontSpriteId(void)
{
return gFacilityClassToPicIndex[gUnknown_203F45C->unk_3D];
}
sym_ewram.txt
+3 -3
View File
@@ -405,7 +405,7 @@ gActionSelectionCursor: @ 2023FF8
gMoveSelectionCursor: @ 2023FFC
.space 0x4
gUnknown_2024000: @ 2024000
gBattlerStatusSummaryTaskId: @ 2024000
.space 0x4
gBattlerInMenuId: @ 2024004
@@ -717,10 +717,10 @@ gAnimMovePower: @ 2037EEC
gUnknown_2037EEE: @ 2037EEE
.space 0x10
gUnknown_2037EFE: @ 2037EFE
gAnimFriendship: @ 2037EFE
.space 0x2
gUnknown_2037F00: @ 2037F00
gWeatherMoveAnim: @ 2037F00
.space 0x2
gBattleAnimArgs: @ 2037F02